diff --git a/.eslintignore b/.eslintignore
index bc176cb8dbf6..5c9609917d0c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -12,11 +12,7 @@ firebase
 third_party
 test/coverage
 **/*.extern.js
-validator/dist
-validator/webui/dist
-validator/node_modules
-validator/nodejs/node_modules
-validator/webui/node_modules
+validator/
 eslint-rules
 babel.config.js
 karma.conf.js
diff --git a/.eslintrc b/.eslintrc
index 2fa82ef42bdd..1eeadacff7d2 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,6 +7,7 @@
     "google-camelcase",
     "jsdoc",
     "notice",
+    "prettier",
     "sort-imports-es6-autofix",
     "sort-requires"
   ],
@@ -76,19 +77,11 @@
     "amphtml-internal/todo-format": 0,
     "amphtml-internal/unused-private-field": 0,
     "amphtml-internal/vsync": 0,
-    "array-bracket-spacing": [2, "never"],
-    "arrow-parens": [2, "as-needed"],
-    "arrow-spacing": 2,
     "chai-expect/missing-assertion": 2,
     "chai-expect/no-inner-compare": 2,
     "chai-expect/terminating-properties": 2,
-    "comma-dangle": [2, "always-multiline"],
-    "computed-property-spacing": [2, "never"],
     "curly": 2,
-    "dot-location": [2, "property"],
-    "eol-last": 2,
     "google-camelcase/google-camelcase": 2,
-    "indent": [2, 2, { "SwitchCase": 1, "VariableDeclarator": 2, "MemberExpression": 2, "ObjectExpression": 1, "CallExpression": { "arguments": 2 } }],
     "jsdoc/check-param-names": 2,
     "jsdoc/check-tag-names": 2,
     "jsdoc/check-types": 2,
@@ -96,13 +89,6 @@
     "jsdoc/require-param-name": 2,
     "jsdoc/require-param-type": 2,
     "jsdoc/require-returns-type": 2,
-    "key-spacing": 2,
-    "max-len": [2, 80, 4, {
-      "ignoreTrailingComments": true,
-      "ignoreRegExpLiterals": true,
-      "ignorePattern": "^} from.*;|= require\\(.*;$|@typedef|@param|@return|@private|@const|@type|@implements",
-      "ignoreUrls": true
-    }],
     "no-alert": 2,
     "no-cond-assign": 2,
     "no-debugger": 2,
@@ -111,21 +97,17 @@
     "no-eval": 2,
     "no-extend-native": 2,
     "no-extra-bind": 2,
-    "no-extra-semi": 2,
     "no-implicit-coercion": [2, { "boolean": false }],
     "no-implied-eval": 2,
     "no-iterator": 2,
     "no-lone-blocks": 2,
-    "no-multi-spaces": 2,
     "no-native-reassign": 2,
     "no-redeclare": 2,
     "no-restricted-globals": [2, "error", "event"],
     "no-script-url": 2,
     "no-self-compare": 2,
     "no-sequences": 2,
-    "no-spaced-func": 2,
     "no-throw-literal": 2,
-    "no-trailing-spaces": 2,
     "no-unused-expressions": 0,
     "no-unused-vars": [2, {
       "argsIgnorePattern": "^(var_args$|opt_|unused)",
@@ -145,13 +127,14 @@
         }
       }
     ],
-    "object-curly-spacing": [2, "never", {
-      "objectsInObjects": false,
-      "arraysInObjects": false
-    }],
     "object-shorthand": [2, "properties", { "avoidQuotes": true }],
     "prefer-const": 2,
-    "quotes": [2, "single", "avoid-escape"],
+    "prettier/prettier": [2, {
+      "bracketSpacing": false,
+      "singleQuote": true,
+      "trailingComma": "es5",
+      "quoteProps": "preserve"
+    }],
     "radix": 2,
     "require-jsdoc": [2, {
       "require": {
@@ -162,20 +145,12 @@
         "FunctionExpression": false
       }
     }],
-    "semi": 2,
-    "keyword-spacing": [2, { "before": true, "after": true }],
     "sort-imports-es6-autofix/sort-imports-es6": [2, {
       "ignoreCase": false,
       "ignoreMemberSort": false,
       "memberSyntaxSortOrder": ["none", "all", "multiple", "single"]
     }],
-    "sort-requires/sort-requires": 2,
-    "space-before-blocks": 2,
-    "space-before-function-paren": [2, "never"],
-    "space-in-parens": 2,
-    "space-infix-ops": 2,
-    "space-unary-ops": [1, { "words": true, "nonwords": false }],
-    "wrap-iife": [2, "any"]
+    "sort-requires/sort-requires": 2
   },
   "overrides": [
     {
diff --git a/3p/3d-gltf/index.js b/3p/3d-gltf/index.js
index f893471cfff5..9ddf8f3db762 100644
--- a/3p/3d-gltf/index.js
+++ b/3p/3d-gltf/index.js
@@ -39,14 +39,15 @@ const loadThree = (global, cb) => {
   const loadScriptCb = url => cb => loadScript(global, url, cb);
   const loadThreeExample = examplePath =>
     loadScriptCb(
-        'https://cdn.jsdelivr.net/npm/three@0.91/examples/js/' + examplePath);
+      'https://cdn.jsdelivr.net/npm/three@0.91/examples/js/' + examplePath
+    );
 
   seq(
-      loadScriptCb(
-          'https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js'),
-      parallel(
-          loadThreeExample('loaders/GLTFLoader.js'),
-          loadThreeExample('controls/OrbitControls.js'))
+    loadScriptCb('https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js'),
+    parallel(
+      loadThreeExample('loaders/GLTFLoader.js'),
+      loadThreeExample('controls/OrbitControls.js')
+    )
   )(cb);
 };
 
@@ -65,16 +66,22 @@ export function gltfViewer(global) {
         if (!e.lengthComputable) {
           return;
         }
-        nonSensitiveDataPostMessage('progress', dict({
-          'total': e.total,
-          'loaded': e.loaded,
-        }));
+        nonSensitiveDataPostMessage(
+          'progress',
+          dict({
+            'total': e.total,
+            'loaded': e.loaded,
+          })
+        );
       },
       onerror: err => {
         user().error('3DGLTF', err);
-        nonSensitiveDataPostMessage('error', dict({
-          'error': (err || '').toString(),
-        }));
+        nonSensitiveDataPostMessage(
+          'error',
+          dict({
+            'error': (err || '').toString(),
+          })
+        );
       },
     });
     listenParent(global, 'action', msg => {
diff --git a/3p/3d-gltf/viewer.js b/3p/3d-gltf/viewer.js
index 438cfbad7e72..ea706f389725 100644
--- a/3p/3d-gltf/viewer.js
+++ b/3p/3d-gltf/viewer.js
@@ -21,8 +21,7 @@ import AnimationLoop from './animation-loop';
 
 const CAMERA_DISTANCE_FACTOR = 1;
 const CAMERA_FAR_FACTOR = 50;
-const CAMERA_NEAR_FACTOR = .1;
-
+const CAMERA_NEAR_FACTOR = 0.1;
 
 export default class GltfViewer {
   /**
@@ -45,8 +44,9 @@ export default class GltfViewer {
 
     /** @private */
     this.controls_ = new THREE.OrbitControls(
-        this.camera_,
-        this.renderer_.domElement);
+      this.camera_,
+      this.renderer_.domElement
+    );
 
     /** @private */
     this.scene_ = new THREE.Scene();
@@ -59,7 +59,7 @@ export default class GltfViewer {
 
     /** @private */
     this.ampInViewport_ =
-        options['initialIntersection']['intersectionRatio'] > 0;
+      options['initialIntersection']['intersectionRatio'] > 0;
 
     /** @private */
     this.setSize_ = this.setupSize_();
@@ -86,17 +86,20 @@ export default class GltfViewer {
    * @private
    */
   setModelRotation_(args) {
-    const xAngle = 'x' in args
-      ? this.getModelRotationOnAxis_(args, 'x')
-      : this.model_.rotation.x;
+    const xAngle =
+      'x' in args
+        ? this.getModelRotationOnAxis_(args, 'x')
+        : this.model_.rotation.x;
 
-    const yAngle = 'y' in args
-      ? this.getModelRotationOnAxis_(args, 'y')
-      : this.model_.rotation.y;
+    const yAngle =
+      'y' in args
+        ? this.getModelRotationOnAxis_(args, 'y')
+        : this.model_.rotation.y;
 
-    const zAngle = 'z' in args
-      ? this.getModelRotationOnAxis_(args, 'z')
-      : this.model_.rotation.z;
+    const zAngle =
+      'z' in args
+        ? this.getModelRotationOnAxis_(args, 'z')
+        : this.model_.rotation.z;
 
     this.model_.rotation.set(xAngle, yAngle, zAngle);
     this.animationLoop_.needsUpdate = true;
@@ -161,12 +164,12 @@ export default class GltfViewer {
    *
    * @private */
   setupLight_() {
-    const amb = new THREE.AmbientLight(0xEDECD5, .5);
+    const amb = new THREE.AmbientLight(0xedecd5, 0.5);
 
-    const dir1 = new THREE.DirectionalLight(0xFFFFFF, .5);
+    const dir1 = new THREE.DirectionalLight(0xffffff, 0.5);
     dir1.position.set(0, 5, 3);
 
-    const dir2 = new THREE.DirectionalLight(0xAECDD6, .4);
+    const dir2 = new THREE.DirectionalLight(0xaecdd6, 0.4);
     dir2.position.set(-1, -2, 4);
 
     const light = new THREE.Group();
@@ -188,12 +191,14 @@ export default class GltfViewer {
     this.renderer_.gammaOutput = true;
     this.renderer_.gammaFactor = 2.2;
     this.renderer_.setPixelRatio(
-        Math.min(
-            this.options_['rendererSettings']['maxPixelRatio'],
-            devicePixelRatio));
+      Math.min(
+        this.options_['rendererSettings']['maxPixelRatio'],
+        devicePixelRatio
+      )
+    );
     this.renderer_.setClearColor(
-        this.options_['rendererSettings']['clearColor'],
-        this.options_['rendererSettings']['clearAlpha']
+      this.options_['rendererSettings']['clearColor'],
+      this.options_['rendererSettings']['clearAlpha']
     );
   }
 
@@ -222,9 +227,9 @@ export default class GltfViewer {
     this.camera_.far = sizeLength * CAMERA_FAR_FACTOR;
     this.camera_.near = sizeLength * CAMERA_NEAR_FACTOR;
     this.camera_.position.lerpVectors(
-        center,
-        bbox.max,
-        1 + CAMERA_DISTANCE_FACTOR
+      center,
+      bbox.max,
+      1 + CAMERA_DISTANCE_FACTOR
     );
     this.camera_.lookAt(center);
 
@@ -240,23 +245,22 @@ export default class GltfViewer {
     loader.crossOrigin = true;
 
     loader.load(
-        this.options_['src'],
-        /** @param {{scene: !THREE.Scene}} gltfData */
-        gltfData => {
-          this.setupCameraForObject_(gltfData.scene);
-          gltfData.scene.children
-              .slice()
-              .forEach(child => {
-                this.model_.add(child);
-              });
-
-          this.scene_.add(this.model_);
-
-          this.animationLoop_.needsUpdate = true;
-          this.handlers_.onload();
-        },
-        this.handlers_.onprogress,
-        this.handlers_.onerror);
+      this.options_['src'],
+      /** @param {{scene: !THREE.Scene}} gltfData */
+      gltfData => {
+        this.setupCameraForObject_(gltfData.scene);
+        gltfData.scene.children.slice().forEach(child => {
+          this.model_.add(child);
+        });
+
+        this.scene_.add(this.model_);
+
+        this.animationLoop_.needsUpdate = true;
+        this.handlers_.onload();
+      },
+      this.handlers_.onprogress,
+      this.handlers_.onerror
+    );
   }
 
   /** @private */
diff --git a/3p/3p.js b/3p/3p.js
index 755c79e87538..2a825b5fa5e1 100644
--- a/3p/3p.js
+++ b/3p/3p.js
@@ -21,16 +21,13 @@
 
 // Note: loaded by 3p system. Cannot rely on babel polyfills.
 
-
 import {devAssert, rethrowAsync, userAssert} from '../src/log';
 import {hasOwn, map} from '../src/utils/object';
 import {isArray} from '../src/types';
 
-
 /** @typedef {function(!Window, !Object)}  */
 let ThirdPartyFunctionDef;
 
-
 /**
  * @const {!Object<ThirdPartyFunctionDef>}
  * @visibleForTesting
@@ -82,9 +79,10 @@ export function run(id, win, data) {
  * @param {function()=} opt_cb
  */
 export function writeScript(win, url, opt_cb) {
-  /*eslint no-useless-concat: 0*/
-  win.document
-      .write('<' + 'script src="' + encodeURI(url) + '"><' + '/script>');
+  win.document.write(
+    // eslint-disable-next-line no-useless-concat
+    '<' + 'script src="' + encodeURI(url) + '"><' + '/script>'
+  );
   if (opt_cb) {
     executeAfterWriteScript(win, opt_cb);
   }
@@ -120,7 +118,7 @@ export function loadScript(win, url, opt_cb, opt_errorCb) {
 export function nextTick(win, fn) {
   const P = win.Promise;
   if (P) {
-    P.resolve().then/*OK*/(fn);
+    P.resolve()./*OK*/ then(fn);
   } else {
     win.setTimeout(fn, 0);
   }
@@ -135,6 +133,7 @@ export function nextTick(win, fn) {
 function executeAfterWriteScript(win, fn) {
   const index = syncScriptLoads++;
   win['__runScript' + index] = fn;
+  // eslint-disable-next-line no-useless-concat
   win.document.write('<' + 'script>__runScript' + index + '()<' + '/script>');
 }
 
@@ -231,8 +230,12 @@ export function validateData(data, mandatoryFields, opt_optionalFields) {
       validateExactlyOne(data, field);
       allowedFields = allowedFields.concat(field);
     } else {
-      userAssert(data[field],
-          'Missing attribute for %s: %s.', data.type, field);
+      userAssert(
+        data[field],
+        'Missing attribute for %s: %s.',
+        data.type,
+        field
+      );
       allowedFields.push(field);
     }
   }
@@ -248,10 +251,12 @@ export function validateData(data, mandatoryFields, opt_optionalFields) {
  * @param {!Array<string>} alternativeFields
  */
 function validateExactlyOne(data, alternativeFields) {
-  userAssert(alternativeFields.filter(field => data[field]).length === 1,
-      '%s must contain exactly one of attributes: %s.',
-      data.type,
-      alternativeFields.join(', '));
+  userAssert(
+    alternativeFields.filter(field => data[field]).length === 1,
+    '%s must contain exactly one of attributes: %s.',
+    data.type,
+    alternativeFields.join(', ')
+  );
 }
 
 /**
diff --git a/3p/ampcontext-integration.js b/3p/ampcontext-integration.js
index fd75cbc36d8c..e71a05e86c5f 100644
--- a/3p/ampcontext-integration.js
+++ b/3p/ampcontext-integration.js
@@ -19,7 +19,6 @@ import {computeInMasterFrame} from './3p';
 import {dev, user, userAssert} from '../src/log';
 import {dict} from '../src/utils/object';
 
-
 /**
  * Returns the "master frame" for all widgets of a given type.
  * This frame should be used to e.g. fetch scripts that can
@@ -31,8 +30,8 @@ import {dict} from '../src/utils/object';
  */
 export function masterSelection(win, type) {
   type = type.toLowerCase();
-  const configType = adConfig[type] &&
-      adConfig[type]['masterFrameAccessibleType'];
+  const configType =
+    adConfig[type] && adConfig[type]['masterFrameAccessibleType'];
   // The master has a special name.
   const masterName = 'frame_' + (configType || type) + '_master';
   let master;
@@ -52,9 +51,7 @@ export function masterSelection(win, type) {
   return master;
 }
 
-
 export class IntegrationAmpContext extends AbstractAmpContext {
-
   /** @override */
   isAbstractImplementation_() {
     return false;
@@ -67,13 +64,14 @@ export class IntegrationAmpContext extends AbstractAmpContext {
   updateDimensionsEnabled_() {
     // Only make this available to selected embeds until the generic solution is
     // available.
-    return (this.embedType_ === 'facebook'
-        || this.embedType_ === 'twitter'
-        || this.embedType_ === 'github'
-        || this.embedType_ === 'mathml'
-        || this.embedType_ === 'reddit'
-        || this.embedType_ === 'yotpo'
-        || this.embedType_ === 'embedly'
+    return (
+      this.embedType_ === 'facebook' ||
+      this.embedType_ === 'twitter' ||
+      this.embedType_ === 'github' ||
+      this.embedType_ === 'mathml' ||
+      this.embedType_ === 'reddit' ||
+      this.embedType_ === 'yotpo' ||
+      this.embedType_ === 'embedly'
     );
   }
 
@@ -132,9 +130,12 @@ export class IntegrationAmpContext extends AbstractAmpContext {
    * @param {string} entityId See comment above for content.
    */
   reportRenderedEntityIdentifier(entityId) {
-    this.client_.sendMessage('entity-id', dict({
-      'id': user().assertString(entityId),
-    }));
+    this.client_.sendMessage(
+      'entity-id',
+      dict({
+        'id': user().assertString(entityId),
+      })
+    );
   }
 
   /**
diff --git a/3p/ampcontext-lib.js b/3p/ampcontext-lib.js
index ff691c82028f..84a8437f86a1 100644
--- a/3p/ampcontext-lib.js
+++ b/3p/ampcontext-lib.js
@@ -20,15 +20,12 @@ import './polyfills'; // eslint-disable-line sort-imports-es6-autofix/sort-impor
 import {AmpContext} from './ampcontext.js';
 import {initLogConstructor, setReportError} from '../src/log';
 
-
 initLogConstructor();
 
-
 // TODO(alanorozco): Refactor src/error.reportError so it does not contain big
 // transitive dependencies and can be included here.
 setReportError(() => {});
 
-
 /**
  *  If window.context does not exist, we must instantiate a replacement and
  *  assign it to window.context, to provide the creative with all the required
diff --git a/3p/ampcontext.js b/3p/ampcontext.js
index 3865d900d935..c8e9c5b2a0a1 100644
--- a/3p/ampcontext.js
+++ b/3p/ampcontext.js
@@ -24,13 +24,14 @@ import {parseUrlDeprecated} from '../src/url';
 import {tryParseJson} from '../src/json';
 
 export class AbstractAmpContext {
-
   /**
    *  @param {!Window} win The window that the instance is built inside.
    */
   constructor(win) {
-    devAssert(!this.isAbstractImplementation_(),
-        'Should not construct AbstractAmpContext instances directly');
+    devAssert(
+      !this.isAbstractImplementation_(),
+      'Should not construct AbstractAmpContext instances directly'
+    );
 
     /** @protected {!Window} */
     this.win_ = win;
@@ -128,12 +129,13 @@ export class AbstractAmpContext {
   /** Registers an general handler for page visibility. */
   listenForPageVisibility_() {
     this.client_.makeRequest(
-        MessageType.SEND_EMBED_STATE,
-        MessageType.EMBED_STATE,
-        data => {
-          this.hidden = data['pageHidden'];
-          this.dispatchVisibilityChangeEvent_();
-        });
+      MessageType.SEND_EMBED_STATE,
+      MessageType.EMBED_STATE,
+      data => {
+        this.hidden = data['pageHidden'];
+        this.dispatchVisibilityChangeEvent_();
+      }
+    );
   }
 
   /**
@@ -169,11 +171,12 @@ export class AbstractAmpContext {
    */
   observeIntersection(callback) {
     const unlisten = this.client_.makeRequest(
-        MessageType.SEND_INTERSECTIONS,
-        MessageType.INTERSECTION,
-        intersection => {
-          callback(intersection['changes']);
-        });
+      MessageType.SEND_INTERSECTIONS,
+      MessageType.INTERSECTION,
+      intersection => {
+        callback(intersection['changes']);
+      }
+    );
 
     if (!isExperimentOn('no-initial-intersection')) { // eslint-disable-line
       // Call the callback with the value that was transmitted when the
@@ -196,10 +199,14 @@ export class AbstractAmpContext {
    *  @param {function(*)} callback to be invoked with the HTML string
    */
   getHtml(selector, attributes, callback) {
-    this.client_.getData(MessageType.GET_HTML, dict({
-      'selector': selector,
-      'attributes': attributes,
-    }), callback);
+    this.client_.getData(
+      MessageType.GET_HTML,
+      dict({
+        'selector': selector,
+        'attributes': attributes,
+      }),
+      callback
+    );
   }
 
   /**
@@ -208,8 +215,7 @@ export class AbstractAmpContext {
    * @param {function(*)} callback
    */
   getConsentState(callback) {
-    this.client_.getData(
-        MessageType.GET_CONSENT_STATE, null, callback);
+    this.client_.getData(MessageType.GET_CONSENT_STATE, null, callback);
   }
 
   /**
@@ -220,11 +226,14 @@ export class AbstractAmpContext {
    *  @param {boolean=} hasOverflow Whether the ad handles its own overflow ele
    */
   requestResize(width, height, hasOverflow) {
-    this.client_.sendMessage(MessageType.EMBED_SIZE, dict({
-      'width': width,
-      'height': height,
-      'hasOverflow': hasOverflow,
-    }));
+    this.client_.sendMessage(
+      MessageType.EMBED_SIZE,
+      dict({
+        'width': width,
+        'height': height,
+        'hasOverflow': hasOverflow,
+      })
+    );
   }
 
   /**
@@ -236,7 +245,8 @@ export class AbstractAmpContext {
    */
   onResizeSuccess(callback) {
     this.client_.registerCallback(MessageType.EMBED_SIZE_CHANGED, obj => {
-      callback(obj['requestedHeight'], obj['requestedWidth']); });
+      callback(obj['requestedHeight'], obj['requestedWidth']);
+    });
   }
 
   /**
@@ -278,8 +288,9 @@ export class AbstractAmpContext {
   setupMetadata_(data) {
     // TODO(alanorozco): Use metadata utils in 3p/frame-metadata
     const dataObject = devAssert(
-        typeof data === 'string' ? tryParseJson(data) : data,
-        'Could not setup metadata.');
+      typeof data === 'string' ? tryParseJson(data) : data,
+      'Could not setup metadata.'
+    );
 
     const context = dataObject._context || dataObject.attributes._context;
 
@@ -327,7 +338,7 @@ export class AbstractAmpContext {
       // Add window keeping the top-most one at the front.
       ancestors.push(win.parent);
     }
-    return ancestors[(ancestors.length - 1) - depth];
+    return ancestors[ancestors.length - 1 - depth];
   }
 
   /**
@@ -341,7 +352,7 @@ export class AbstractAmpContext {
     // TODO(alanorozco): why the heck could AMP_CONTEXT_DATA be two different
     // types? FIX THIS.
     if (isObject(this.win_.sf_) && this.win_.sf_.cfg) {
-      this.setupMetadata_(/** @type {string}*/(this.win_.sf_.cfg));
+      this.setupMetadata_(/** @type {string}*/ (this.win_.sf_.cfg));
     } else if (this.win_.AMP_CONTEXT_DATA) {
       if (typeof this.win_.AMP_CONTEXT_DATA == 'string') {
         this.sentinel = this.win_.AMP_CONTEXT_DATA;
@@ -361,9 +372,12 @@ export class AbstractAmpContext {
     if (!e.message) {
       return;
     }
-    this.client_.sendMessage(MessageType.USER_ERROR_IN_IFRAME, dict({
-      'message': e.message,
-    }));
+    this.client_.sendMessage(
+      MessageType.USER_ERROR_IN_IFRAME,
+      dict({
+        'message': e.message,
+      })
+    );
   }
 }
 
diff --git a/3p/beopinion.js b/3p/beopinion.js
index c26bf1bd5509..394956c6a765 100644
--- a/3p/beopinion.js
+++ b/3p/beopinion.js
@@ -100,7 +100,7 @@ function getBeOpinionAsyncInit(global, accountId) {
       },
       onHeightChange: function(newHeight) {
         const c = global.document.getElementById('c');
-        const boundingClientRect = c./*REVIEW*/getBoundingClientRect();
+        const boundingClientRect = c./*REVIEW*/ getBoundingClientRect();
         context.onResizeDenied(context.requestResize.bind(context));
         context.requestResize(boundingClientRect.width, newHeight);
       },
diff --git a/3p/bodymovinanimation.js b/3p/bodymovinanimation.js
index da0029214407..55a58ce55321 100644
--- a/3p/bodymovinanimation.js
+++ b/3p/bodymovinanimation.js
@@ -34,9 +34,10 @@ let animationHandler;
  * @param {!Function} cb
  */
 function getBodymovinAnimationSdk(global, renderer, cb) {
-  const scriptToLoad = renderer === 'svg' ?
-    'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin_light.min.js' :
-    'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js';
+  const scriptToLoad =
+    renderer === 'svg'
+      ? 'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin_light.min.js'
+      : 'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js';
   loadScript(global, scriptToLoad, function() {
     cb(global.bodymovin);
   });
@@ -58,8 +59,9 @@ function parseMessage(event) {
     if (eventMessage['valueType'] === 'time') {
       animationHandler.goToAndStop(eventMessage['value']);
     } else {
-      const frameNumber =
-        Math.round(eventMessage['value'] * animationHandler.totalFrames);
+      const frameNumber = Math.round(
+        eventMessage['value'] * animationHandler.totalFrames
+      );
       animationHandler.goToAndStop(frameNumber, true);
     }
   }
@@ -89,11 +91,12 @@ export function bodymovinanimation(global) {
       autoplay: dataReceived['autoplay'],
       animationData: dataReceived['animationData'],
     });
-    const message = JSON.stringify(dict({
-      'action': 'ready',
-    }));
+    const message = JSON.stringify(
+      dict({
+        'action': 'ready',
+      })
+    );
     global.addEventListener('message', parseMessage, false);
-    global.parent. /*OK*/postMessage(message, '*');
+    global.parent./*OK*/ postMessage(message, '*');
   });
 }
-
diff --git a/3p/embedly.js b/3p/embedly.js
index 863933768c8e..aeaf9420bf72 100644
--- a/3p/embedly.js
+++ b/3p/embedly.js
@@ -84,10 +84,7 @@ export function embedly(global, data) {
   // Add whitelisted data attributes and values to card
   // when these are provided by component.
   for (const key in CardOptions) {
-    if (
-      hasOwn(CardOptions, key) &&
-      typeof data[key] !== 'undefined'
-    ) {
+    if (hasOwn(CardOptions, key) && typeof data[key] !== 'undefined') {
       card.setAttribute(`data-${CardOptions[key]}`, data[key]);
     }
   }
@@ -111,8 +108,8 @@ export function embedly(global, data) {
     // Use embedly SDK to listen to resize event from loaded card
     global.window['embedly']('on', RESIZE_EVENT_NAME, function(iframe) {
       context.requestResize(
-          iframe./*OK*/width,
-          parseInt(iframe./*OK*/height, 10) + /* margin */ 5
+        iframe./*OK*/ width,
+        parseInt(iframe./*OK*/ height, 10) + /* margin */ 5
       );
     });
   });
diff --git a/3p/environment.js b/3p/environment.js
index a1213667a97d..b531265ca4b9 100644
--- a/3p/environment.js
+++ b/3p/environment.js
@@ -43,7 +43,7 @@ export function manageWin(win) {
     manageWin_(win);
   } catch (e) {
     // We use a try block, because the ad integrations often swallow errors.
-    console./*OK*/error(e.message, e.stack);
+    console./*OK*/ error(e.message, e.stack);
   }
 }
 
@@ -65,7 +65,6 @@ function manageWin_(win) {
   blockSyncPopups(win);
 }
 
-
 /**
  * Add instrumentation code to doc.write.
  * @param {!Window} parent
@@ -115,15 +114,14 @@ function maybeInstrumentsNodes(win, addedNodes) {
       }
       const src = node.getAttribute('src');
       const srcdoc = node.getAttribute('srcdoc');
-      if (src == null || /^(about:|javascript:)/i.test(src.trim()) ||
-          srcdoc) {
+      if (src == null || /^(about:|javascript:)/i.test(src.trim()) || srcdoc) {
         if (node.contentWindow) {
           instrumentIframeWindow(node, win, node.contentWindow);
           node.addEventListener('load', () => {
             try {
               instrumentIframeWindow(node, win, node.contentWindow);
             } catch (e) {
-              console./*OK*/error(e.message, e.stack);
+              console./*OK*/ error(e.message, e.stack);
             }
           });
         } else if (srcdoc) {
@@ -131,7 +129,7 @@ function maybeInstrumentsNodes(win, addedNodes) {
         }
       }
     } catch (e) {
-      console./*OK*/error(e.message, e.stack);
+      console./*OK*/ error(e.message, e.stack);
     }
   }
 }
@@ -196,7 +194,7 @@ function instrumentEntryPoints(win) {
       next();
       if (typeof fn == 'string') {
         // Handle rare and dangerous string arg case.
-        return (0, win.eval/*NOT OK but whatcha gonna do.*/).call(win, fn); // lgtm [js/useless-expression]
+        return (0, win.eval /*NOT OK but whatcha gonna do.*/).call(win, fn); // lgtm [js/useless-expression]
       } else {
         return fn.apply(this, arguments);
       }
@@ -245,7 +243,7 @@ function blockSyncPopups(win) {
       return false;
     };
   } catch (e) {
-    console./*OK*/error(e.message, e.stack);
+    console./*OK*/ error(e.message, e.stack);
   }
 }
 
diff --git a/3p/facebook.js b/3p/facebook.js
index 7e08373c7357..067d5b0d0c37 100644
--- a/3p/facebook.js
+++ b/3p/facebook.js
@@ -32,9 +32,13 @@ import {userAssert} from '../src/log';
  * @param {string} locale
  */
 function getFacebookSdk(global, cb, locale) {
-  loadScript(global, 'https://connect.facebook.net/' + locale + '/sdk.js', () => {
-    cb(global.FB);
-  });
+  loadScript(
+    global,
+    'https://connect.facebook.net/' + locale + '/sdk.js',
+    () => {
+      cb(global.FB);
+    }
+  );
 }
 
 /**
@@ -100,8 +104,10 @@ function getCommentContainer(global, data) {
   const c = global.document.getElementById('c');
   const container = createContainer(global, 'comment-embed', data.href);
   container.setAttribute(
-      'data-include-parent', data.includeCommentParent || 'false');
-  container.setAttribute('data-width', c./*OK*/offsetWidth);
+    'data-include-parent',
+    data.includeCommentParent || 'false'
+  );
+  container.setAttribute('data-width', c./*OK*/ offsetWidth);
   return container;
 }
 
@@ -123,9 +129,12 @@ function getDefaultEmbedAs(href) {
 function getEmbedContainer(global, data) {
   const embedAs = data.embedAs || getDefaultEmbedAs(data.href);
 
-  userAssert(['post', 'video', 'comment'].indexOf(embedAs) !== -1,
-      'Attribute data-embed-as  for <amp-facebook> value is wrong, should be' +
-  ' "post", "video" or "comment" but was: %s', embedAs);
+  userAssert(
+    ['post', 'video', 'comment'].indexOf(embedAs) !== -1,
+    'Attribute data-embed-as  for <amp-facebook> value is wrong, should be' +
+      ' "post", "video" or "comment" but was: %s',
+    embedAs
+  );
 
   switch (embedAs) {
     case 'comment':
@@ -157,7 +166,7 @@ function getPageContainer(global, data) {
   // Note: The facebook embed  allows a maximum width of 500px.
   // If the container's width exceeds that, the embed's width will
   // be clipped to 500px.
-  container.setAttribute('data-width', c./*OK*/offsetWidth);
+  container.setAttribute('data-width', c./*OK*/ offsetWidth);
   return container;
 }
 
@@ -211,30 +220,36 @@ export function facebook(global, data) {
     container = getLikeContainer(global, data);
   } else if (extension === 'AMP-FACEBOOK-COMMENTS') {
     container = getCommentsContainer(global, data);
-  } else /*AMP-FACEBOOK */ {
+  } /*AMP-FACEBOOK */ else {
     container = getEmbedContainer(global, data);
   }
 
   global.document.getElementById('c').appendChild(container);
 
-  getFacebookSdk(global, FB => {
-    // Dimensions are given by the parent frame.
-    delete data.width;
-    delete data.height;
+  getFacebookSdk(
+    global,
+    FB => {
+      // Dimensions are given by the parent frame.
+      delete data.width;
+      delete data.height;
 
-    FB.Event.subscribe('xfbml.resize', event => {
-      context.updateDimensions(
+      FB.Event.subscribe('xfbml.resize', event => {
+        context.updateDimensions(
           parseInt(event.width, 10),
-          parseInt(event.height, 10) + /* margins */ 20);
-    });
-
-    FB.init({xfbml: true, version: 'v2.5'});
-
-    // Report to parent that the SDK has loaded and is ready to paint
-    const message = JSON.stringify(dict({
-      'action': 'ready',
-    }));
-    global.parent. /*OK*/postMessage(message, '*');
-
-  }, data.locale ? data.locale : dashToUnderline(window.navigator.language));
+          parseInt(event.height, 10) + /* margins */ 20
+        );
+      });
+
+      FB.init({xfbml: true, version: 'v2.5'});
+
+      // Report to parent that the SDK has loaded and is ready to paint
+      const message = JSON.stringify(
+        dict({
+          'action': 'ready',
+        })
+      );
+      global.parent./*OK*/ postMessage(message, '*');
+    },
+    data.locale ? data.locale : dashToUnderline(window.navigator.language)
+  );
 }
diff --git a/3p/frame-metadata.js b/3p/frame-metadata.js
index 3d101052e9e9..c1ba8732b3c7 100644
--- a/3p/frame-metadata.js
+++ b/3p/frame-metadata.js
@@ -21,7 +21,6 @@ import {once} from '../src/utils/function.js';
 import {parseJson} from '../src/json';
 import {parseUrlDeprecated} from '../src/url';
 
-
 /**
  * @typedef {{
  *  ampcontextFilepath: ?string,
@@ -46,7 +45,6 @@ import {parseUrlDeprecated} from '../src/url';
  */
 export let ContextStateDef;
 
-
 /** @const {!JsonObject} */
 const FALLBACK = dict({
   'attributes': dict({
@@ -54,7 +52,6 @@ const FALLBACK = dict({
   }),
 });
 
-
 /**
  * Gets metadata encoded in iframe name attribute.
  * @return {!JsonObject}
@@ -68,14 +65,12 @@ const allMetadata = once(() => {
     return parseJson(iframeName);
   } catch (err) {
     if (!getMode().test) {
-      dev().info(
-          'INTEGRATION', 'Could not parse context from:', iframeName);
+      dev().info('INTEGRATION', 'Could not parse context from:', iframeName);
     }
     return FALLBACK;
   }
 });
 
-
 /**
  * @return {{mode: !Object, experimentToggles: !Object}}
  */
@@ -88,7 +83,6 @@ export function getAmpConfig() {
   };
 }
 
-
 /**
  * @return {!JsonObject}
  */
@@ -103,7 +97,6 @@ const getAttributeDataImpl_ = once(() => {
   return data;
 });
 
-
 /**
  * @return {!JsonObject}
  */
@@ -112,7 +105,6 @@ export function getAttributeData() {
   return getAttributeDataImpl_();
 }
 
-
 /**
  * @return {!Location}
  */
@@ -121,7 +113,6 @@ const getLocationImpl_ = once(() => {
   return parseUrlDeprecated(href);
 });
 
-
 /**
  * @return {!Location}
  */
@@ -130,7 +121,6 @@ export function getLocation() {
   return getLocationImpl_();
 }
 
-
 /**
  * @return {!ContextStateDef}
  */
@@ -158,7 +148,6 @@ export function getContextState() {
   };
 }
 
-
 /**
  * @return {string}
  */
diff --git a/3p/github.js b/3p/github.js
index b7859ae6d721..b97a14ec3a5e 100644
--- a/3p/github.js
+++ b/3p/github.js
@@ -40,12 +40,13 @@ function getGistJs(global, scriptSource, cb) {
  */
 export function github(global, data) {
   userAssert(
-      data.gistid,
-      'The data-gistid attribute is required for <amp-gist> %s',
-      data.element);
+    data.gistid,
+    'The data-gistid attribute is required for <amp-gist> %s',
+    data.element
+  );
 
   let gistUrl =
-      'https://gist.github.com/' + encodeURIComponent(data.gistid) + '.js';
+    'https://gist.github.com/' + encodeURIComponent(data.gistid) + '.js';
 
   if (data.file) {
     gistUrl += '?file=' + encodeURIComponent(data.file);
@@ -65,8 +66,8 @@ export function github(global, data) {
     }
 
     context.updateDimensions(
-        gistContainer./*OK*/offsetWidth,
-        gistContainer./*OK*/offsetHeight
+      gistContainer./*OK*/ offsetWidth,
+      gistContainer./*OK*/ offsetHeight
     );
   });
 }
diff --git a/3p/iframe-messaging-client.js b/3p/iframe-messaging-client.js
index 9fc838a24a5f..cf2d13aa5b5d 100644
--- a/3p/iframe-messaging-client.js
+++ b/3p/iframe-messaging-client.js
@@ -26,7 +26,6 @@ import {getData} from '../src/event-helper';
 import {getMode} from '../src/mode';
 
 export class IframeMessagingClient {
-
   /**
    *  @param {!Window} win A window object.
    */
@@ -126,11 +125,15 @@ export class IframeMessagingClient {
    *  @param {JsonObject=} opt_payload The payload of message to send.
    */
   sendMessage(type, opt_payload) {
-    this.hostWindow_.postMessage/*OK*/(
-        serializeMessage(
-            type, dev().assertString(this.sentinel_),
-            opt_payload, this.rtvVersion_),
-        '*');
+    this.hostWindow_./*OK*/ postMessage(
+      serializeMessage(
+        type,
+        dev().assertString(this.sentinel_),
+        opt_payload,
+        this.rtvVersion_
+      ),
+      '*'
+    );
   }
 
   /**
diff --git a/3p/iframe-transport-client.js b/3p/iframe-transport-client.js
index a0c9fd9951ca..003cc842e3e5 100644
--- a/3p/iframe-transport-client.js
+++ b/3p/iframe-transport-client.js
@@ -27,7 +27,6 @@ const TAG_ = 'iframe-transport-client';
  * creatives.
  */
 export class IframeTransportClient {
-
   /** @param {!Window} win */
   constructor(win) {
     /** @private {!Window} */
@@ -39,47 +38,63 @@ export class IframeTransportClient {
     const parsedFrameName = tryParseJson(this.win_.name);
 
     /** @private {string} */
-    this.vendor_ = dev().assertString(parsedFrameName['type'],
-        'Parent frame must supply vendor name as type in ' +
-        this.win_.location.href);
+    this.vendor_ = dev().assertString(
+      parsedFrameName['type'],
+      'Parent frame must supply vendor name as type in ' +
+        this.win_.location.href
+    );
     // Note: amp-ad-exit will validate the vendor name before performing
     // variable substitution, so if the vendor name is not a valid one from
     // vendors.js, then its response messages will have no effect.
-    devAssert(this.vendor_.length, 'Vendor name cannot be empty in ' +
-        this.win_.location.href);
+    devAssert(
+      this.vendor_.length,
+      'Vendor name cannot be empty in ' + this.win_.location.href
+    );
 
     /** @protected {!IframeMessagingClient} */
     this.iframeMessagingClient_ = new IframeMessagingClient(win);
     this.iframeMessagingClient_.setHostWindow(this.win_.parent);
-    this.iframeMessagingClient_.setSentinel(dev().assertString(
+    this.iframeMessagingClient_.setSentinel(
+      dev().assertString(
         parsedFrameName['sentinel'],
-        'Invalid/missing sentinel on iframe name attribute' + this.win_.name));
+        'Invalid/missing sentinel on iframe name attribute' + this.win_.name
+      )
+    );
     this.iframeMessagingClient_.makeRequest(
-        MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
-        MessageType.IFRAME_TRANSPORT_EVENTS,
-        eventData => {
-          const events =
+      MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
+      MessageType.IFRAME_TRANSPORT_EVENTS,
+      eventData => {
+        const events =
           /**
            * @type
            *   {!Array<../src/3p-frame-messaging.IframeTransportEvent>}
            */
           (eventData['events']);
-          devAssert(events,
-              'Received malformed events list in ' + this.win_.location.href);
-          devAssert(events.length,
-              'Received empty events list in ' + this.win_.location.href);
-          events.forEach(event => {
-            try {
-              devAssert(event.creativeId,
-                  'Received malformed event in ' + this.win_.location.href);
-              this.contextFor_(event.creativeId).dispatch(event.message);
-            } catch (e) {
-              user().error(TAG_,
-                  'Exception in callback passed to onAnalyticsEvent',
-                  e);
-            }
-          });
+        devAssert(
+          events,
+          'Received malformed events list in ' + this.win_.location.href
+        );
+        devAssert(
+          events.length,
+          'Received empty events list in ' + this.win_.location.href
+        );
+        events.forEach(event => {
+          try {
+            devAssert(
+              event.creativeId,
+              'Received malformed event in ' + this.win_.location.href
+            );
+            this.contextFor_(event.creativeId).dispatch(event.message);
+          } catch (e) {
+            user().error(
+              TAG_,
+              'Exception in callback passed to onAnalyticsEvent',
+              e
+            );
+          }
         });
+      }
+    );
   }
 
   /**
@@ -90,10 +105,15 @@ export class IframeTransportClient {
    * @private
    */
   contextFor_(creativeId) {
-    return this.creativeIdToContext_[creativeId] ||
-        (this.creativeIdToContext_[creativeId] =
-            new IframeTransportContext(this.win_, this.iframeMessagingClient_,
-                creativeId, this.vendor_));
+    return (
+      this.creativeIdToContext_[creativeId] ||
+      (this.creativeIdToContext_[creativeId] = new IframeTransportContext(
+        this.win_,
+        this.iframeMessagingClient_,
+        creativeId,
+        this.vendor_
+      ))
+    );
   }
 
   /**
@@ -127,9 +147,11 @@ export class IframeTransportContext {
     /** @private {?function(string)} */
     this.listener_ = null;
 
-    userAssert(win['onNewContextInstance'] &&
+    userAssert(
+      win['onNewContextInstance'] &&
         typeof win['onNewContextInstance'] == 'function',
-    'Must implement onNewContextInstance in ' + win.location.href);
+      'Must implement onNewContextInstance in ' + win.location.href
+    );
     win['onNewContextInstance'](this);
   }
 
@@ -158,9 +180,10 @@ export class IframeTransportContext {
    * @param {!Object<string, string>} data
    */
   sendResponseToCreative(data) {
-    this.iframeMessagingClient_./*OK*/sendMessage(
-        MessageType.IFRAME_TRANSPORT_RESPONSE,
-        /** @type {!JsonObject} */
-        (Object.assign({message: data}, this.baseMessage_)));
+    this.iframeMessagingClient_./*OK*/ sendMessage(
+      MessageType.IFRAME_TRANSPORT_RESPONSE,
+      /** @type {!JsonObject} */
+      (Object.assign({message: data}, this.baseMessage_))
+    );
   }
 }
diff --git a/3p/integration.js b/3p/integration.js
index 649fc752485d..b3cf025ab7dd 100644
--- a/3p/integration.js
+++ b/3p/integration.js
@@ -25,16 +25,10 @@
 // src/polyfills.js must be the first import.
 import './polyfills'; // eslint-disable-line sort-imports-es6-autofix/sort-imports-es6
 
-import {
-  IntegrationAmpContext,
-} from './ampcontext-integration';
+import {IntegrationAmpContext} from './ampcontext-integration';
 import {dict} from '../src/utils/object.js';
 import {endsWith} from '../src/string';
-import {
-  getAmpConfig,
-  getEmbedType,
-  getLocation,
-} from './frame-metadata';
+import {getAmpConfig, getEmbedType, getLocation} from './frame-metadata';
 import {getMode} from '../src/mode';
 import {getSourceUrl, isProxyOrigin, parseUrlDeprecated} from '../src/url';
 import {
@@ -46,15 +40,10 @@ import {
 import {installEmbedStateListener, manageWin} from './environment';
 import {internalRuntimeVersion} from '../src/internal-version';
 import {parseJson} from '../src/json';
-import {
-  register,
-  run,
-  setExperimentToggles,
-} from './3p';
+import {register, run, setExperimentToggles} from './3p';
 import {startsWith} from '../src/string.js';
 import {urls} from '../src/config';
 
-
 // 3P - please keep in alphabetic order
 import {beopinion} from './beopinion';
 import {bodymovinanimation} from './bodymovinanimation';
@@ -304,7 +293,6 @@ const AMP_EMBED_ALLOWED = {
 
 init(window);
 
-
 if (getMode().test || getMode().localDev) {
   register('_ping_', _ping_);
 }
@@ -367,7 +355,7 @@ register('caprofitx', caprofitx);
 register('cedato', cedato);
 register('chargeads', chargeads);
 register('colombia', colombia);
-register('connatix',connatix);
+register('connatix', connatix);
 register('contentad', contentad);
 register('criteo', criteo);
 register('csa', csa);
@@ -507,7 +495,7 @@ register('weborama-display', weboramaDisplay);
 register('widespace', widespace);
 register('wisteria', wisteria);
 register('wpmedia', wpmedia);
-register('xlift' , xlift);
+register('xlift', xlift);
 register('yahoo', yahoo);
 register('yahoojp', yahoojp);
 register('yandex', yandex);
@@ -537,7 +525,6 @@ const defaultAllowedTypesInCustomFrame = [
   '_ping_',
 ];
 
-
 /**
  * Initialize 3p frame.
  * @param {!Window} win
@@ -554,7 +541,6 @@ function init(win) {
   setExperimentToggles(config.experimentToggles);
 }
 
-
 /**
  * Visible for testing.
  * Draws a 3p embed to the window. Expects the data to include the 3p type.
@@ -569,12 +555,15 @@ function init(win) {
 export function draw3p(win, data, configCallback) {
   const type = data['type'];
 
-  userAssert(isTagNameAllowed(type, win.context.tagName),
-      'Embed type %s not allowed with tag %s', type, win.context.tagName);
+  userAssert(
+    isTagNameAllowed(type, win.context.tagName),
+    'Embed type %s not allowed with tag %s',
+    type,
+    win.context.tagName
+  );
   if (configCallback) {
     configCallback(data, data => {
-      userAssert(data,
-          'Expected configuration to be passed as first argument');
+      userAssert(data, 'Expected configuration to be passed as first argument');
       run(type, win, data);
     });
   } else {
@@ -594,8 +583,11 @@ export function draw3p(win, data, configCallback) {
  * @param {!Array<string>=} opt_allowedEmbeddingOrigins List of domain suffixes
  *     that are allowed to embed this frame.
  */
-window.draw3p = function(opt_configCallback, opt_allowed3pTypes,
-  opt_allowedEmbeddingOrigins) {
+window.draw3p = function(
+  opt_configCallback,
+  opt_allowed3pTypes,
+  opt_allowedEmbeddingOrigins
+) {
   try {
     const location = getLocation();
 
@@ -613,9 +605,10 @@ window.draw3p = function(opt_configCallback, opt_allowed3pTypes,
     // and the compiler not being able to discern otherwise
     // TODO(alanorozco): Do this more elegantly once old impl is cleaned up.
     draw3p(
-        window,
-        (/** @type {!IntegrationAmpContext} */ (window.context)).data || {},
-        opt_configCallback);
+      window,
+      /** @type {!IntegrationAmpContext} */ (window.context).data || {},
+      opt_configCallback
+    );
 
     window.context.bootstrapLoaded();
   } catch (e) {
@@ -651,9 +644,12 @@ export function validateParentOrigin(window, parentLocation) {
   if (!ancestors || !ancestors.length) {
     return;
   }
-  userAssert(ancestors[0] == parentLocation.origin,
-      'Parent origin mismatch: %s, %s',
-      ancestors[0], parentLocation.origin);
+  userAssert(
+    ancestors[0] == parentLocation.origin,
+    'Parent origin mismatch: %s, %s',
+    ancestors[0],
+    parentLocation.origin
+  );
 }
 
 /**
@@ -679,8 +675,11 @@ export function validateAllowedTypes(window, type, allowedTypes) {
   if (defaultAllowedTypesInCustomFrame.indexOf(type) != -1) {
     return;
   }
-  userAssert(allowedTypes && allowedTypes.indexOf(type) != -1,
-      'Non-whitelisted 3p type for custom iframe: %s', type);
+  userAssert(
+    allowedTypes && allowedTypes.indexOf(type) != -1,
+    'Non-whitelisted 3p type for custom iframe: %s',
+    type
+  );
 }
 
 /**
@@ -703,7 +702,7 @@ export function validateAllowedEmbeddingOrigins(window, allowedHostnames) {
     // the referrer. The referrer is used because it should be
     // trustable.
     hostname = parseUrlDeprecated(getSourceUrl(window.document.referrer))
-        .hostname;
+      .hostname;
   }
   for (let i = 0; i < allowedHostnames.length; i++) {
     // Either the hostname is exactly as whitelisted…
@@ -715,8 +714,9 @@ export function validateAllowedEmbeddingOrigins(window, allowedHostnames) {
       return;
     }
   }
-  throw new Error('Invalid embedding hostname: ' + hostname + ' not in '
-      + allowedHostnames);
+  throw new Error(
+    'Invalid embedding hostname: ' + hostname + ' not in ' + allowedHostnames
+  );
 }
 
 /**
@@ -777,10 +777,16 @@ export function isTagNameAllowed(type, tagName) {
  * @param {boolean} isCanary
  */
 function lightweightErrorReport(e, isCanary) {
-  new Image().src = urls.errorReporting +
-      '?3p=1&v=' + encodeURIComponent(internalRuntimeVersion()) +
-      '&m=' + encodeURIComponent(e.message) +
-      '&ca=' + (isCanary ? 1 : 0) +
-      '&r=' + encodeURIComponent(document.referrer) +
-      '&s=' + encodeURIComponent(e.stack || '');
+  new Image().src =
+    urls.errorReporting +
+    '?3p=1&v=' +
+    encodeURIComponent(internalRuntimeVersion()) +
+    '&m=' +
+    encodeURIComponent(e.message) +
+    '&ca=' +
+    (isCanary ? 1 : 0) +
+    '&r=' +
+    encodeURIComponent(document.referrer) +
+    '&s=' +
+    encodeURIComponent(e.stack || '');
 }
diff --git a/3p/mathml.js b/3p/mathml.js
index 23c88934b2a7..ffe0d42133a8 100644
--- a/3p/mathml.js
+++ b/3p/mathml.js
@@ -40,43 +40,44 @@ function getMathmlJs(global, scriptSource, cb) {
  */
 export function mathml(global, data) {
   userAssert(
-      data.formula,
-      'The formula attribute is required for <amp-mathml> %s',
-      data.element);
+    data.formula,
+    'The formula attribute is required for <amp-mathml> %s',
+    data.element
+  );
 
   getMathmlJs(
-      global,
-      'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML',
-      mathjax => {
-        // Dimensions are given by the parent frame.
-        delete data.width;
-        delete data.height;
-        const div = document.createElement('div');
-        div.setAttribute('id', 'mathmlformula');
-        div.textContent = data.formula;
-        setStyle(div, 'visibility', 'hidden');
-        global.document.body.appendChild(div);
-        mathjax.Hub.Config({
-          showMathMenu: false,
-        });
-        mathjax.Hub.Queue(function() {
-          const rendered = document.getElementById('MathJax-Element-1-Frame');
-          // Remove built in mathjax margins.
-          let display = document.getElementsByClassName('MJXc-display');
-          if (!display[0]) {
-            const span = document.createElement('span');
-            span.setAttribute('class', 'mjx-chtml MJXc-display');
-            span.appendChild(rendered);
-            div.appendChild(span);
-            display = document.getElementsByClassName('MJXc-display');
-          }
-          display[0].setAttribute('style','margin-top:0;margin-bottom:0');
-          context.requestResize(
-              rendered./*OK*/offsetWidth,
-              rendered./*OK*/offsetHeight
-          );
-          setStyle(div, 'visibility', 'visible');
-        });
-      }
+    global,
+    'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML',
+    mathjax => {
+      // Dimensions are given by the parent frame.
+      delete data.width;
+      delete data.height;
+      const div = document.createElement('div');
+      div.setAttribute('id', 'mathmlformula');
+      div.textContent = data.formula;
+      setStyle(div, 'visibility', 'hidden');
+      global.document.body.appendChild(div);
+      mathjax.Hub.Config({
+        showMathMenu: false,
+      });
+      mathjax.Hub.Queue(function() {
+        const rendered = document.getElementById('MathJax-Element-1-Frame');
+        // Remove built in mathjax margins.
+        let display = document.getElementsByClassName('MJXc-display');
+        if (!display[0]) {
+          const span = document.createElement('span');
+          span.setAttribute('class', 'mjx-chtml MJXc-display');
+          span.appendChild(rendered);
+          div.appendChild(span);
+          display = document.getElementsByClassName('MJXc-display');
+        }
+        display[0].setAttribute('style', 'margin-top:0;margin-bottom:0');
+        context.requestResize(
+          rendered./*OK*/ offsetWidth,
+          rendered./*OK*/ offsetHeight
+        );
+        setStyle(div, 'visibility', 'visible');
+      });
+    }
   );
 }
diff --git a/3p/messaging.js b/3p/messaging.js
index fc72a450ec94..c7f3434da479 100644
--- a/3p/messaging.js
+++ b/3p/messaging.js
@@ -30,8 +30,7 @@ export function nonSensitiveDataPostMessage(type, opt_object) {
   const object = opt_object || /** @type {JsonObject} */ ({});
   object['type'] = type;
   object['sentinel'] = window.context.sentinel;
-  window.parent./*OK*/postMessage(object,
-      window.context.location.origin);
+  window.parent./*OK*/ postMessage(object, window.context.location.origin);
 }
 
 /**
@@ -76,15 +75,18 @@ function startListening(win) {
   win.addEventListener('message', function(event) {
     // Cheap operations first, so we don't parse JSON unless we have to.
     const eventData = getData(event);
-    if (event.source != win.parent ||
-        event.origin != win.context.location.origin ||
-        typeof eventData != 'string' ||
-        eventData.indexOf('amp-') != 0) {
+    if (
+      event.source != win.parent ||
+      event.origin != win.context.location.origin ||
+      typeof eventData != 'string' ||
+      eventData.indexOf('amp-') != 0
+    ) {
       return;
     }
     // Parse JSON only once per message.
-    const data = /** @type {!JsonObject} */ (
-      parseJson(/**@type {string} */ (getData(event)).substr(4)));
+    const data = /** @type {!JsonObject} */ (parseJson(
+      /**@type {string} */ (getData(event)).substr(4)
+    ));
     if (win.context.sentinel && data['sentinel'] != win.context.sentinel) {
       return;
     }
diff --git a/3p/polyfills.js b/3p/polyfills.js
index f302d5889893..9d2545379b7a 100644
--- a/3p/polyfills.js
+++ b/3p/polyfills.js
@@ -18,7 +18,6 @@
  * @fileoverview Loads all polyfills needed by the AMP 3p integration frame.
  */
 
-
 // This list should not get longer without a very good reason.
 import {install as installMathSign} from '../src/polyfills/math-sign';
 import {install as installObjectAssign} from '../src/polyfills/object-assign';
diff --git a/3p/recaptcha.js b/3p/recaptcha.js
index df94d94bb0da..8a88989dea92 100644
--- a/3p/recaptcha.js
+++ b/3p/recaptcha.js
@@ -17,8 +17,7 @@
 // src/polyfills.js must be the first import.
 import './polyfills'; // eslint-disable-line sort-imports-es6-autofix/sort-imports-es6
 
-import ampToolboxCacheUrl from
-  '../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
+import ampToolboxCacheUrl from '../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
 
 import {IframeMessagingClient} from './iframe-messaging-client';
 import {
@@ -57,10 +56,10 @@ const TAG = 'RECAPTCHA';
 /** @const {string} */
 const RECAPTCHA_API_URL = 'https://www.google.com/recaptcha/api.js?render=';
 
-/** {?IframeMessaginClient} **/
+/** {?IframeMessaginClient} */
 let iframeMessagingClient = null;
 
-/** {?string} **/
+/** {?string} */
 let sitekey = null;
 
 /**
@@ -79,7 +78,6 @@ init();
  * @param {string} recaptchaApiBaseUrl
  */
 export function initRecaptcha(recaptchaApiBaseUrl = RECAPTCHA_API_URL) {
-
   const win = window;
 
   /**
@@ -97,22 +95,27 @@ export function initRecaptcha(recaptchaApiBaseUrl = RECAPTCHA_API_URL) {
 
   // Get our sitekey from the iframe name attribute
   devAssert(
-      dataObject.sitekey,
-      'The sitekey is required for the <amp-recaptcha-input> iframe'
+    dataObject.sitekey,
+    'The sitekey is required for the <amp-recaptcha-input> iframe'
   );
   sitekey = dataObject.sitekey;
   const recaptchaApiUrl = recaptchaApiBaseUrl + sitekey;
 
-  loadScript(win, recaptchaApiUrl, function() {
-    const {grecaptcha} = win;
+  loadScript(
+    win,
+    recaptchaApiUrl,
+    function() {
+      const {grecaptcha} = win;
 
-    grecaptcha.ready(function() {
-      initializeIframeMessagingClient(win, grecaptcha, dataObject);
-      iframeMessagingClient./*OK*/sendMessage('amp-recaptcha-ready');
-    });
-  }, function() {
-    dev().error(TAG + ' Failed to load recaptcha api script');
-  });
+      grecaptcha.ready(function() {
+        initializeIframeMessagingClient(win, grecaptcha, dataObject);
+        iframeMessagingClient./*OK*/ sendMessage('amp-recaptcha-ready');
+      });
+    },
+    function() {
+      dev().error(TAG + ' Failed to load recaptcha api script');
+    }
+  );
 }
 window.initRecaptcha = initRecaptcha;
 
@@ -126,8 +129,8 @@ function initializeIframeMessagingClient(win, grecaptcha, dataObject) {
   iframeMessagingClient = new IframeMessagingClient(win);
   iframeMessagingClient.setSentinel(dataObject.sentinel);
   iframeMessagingClient.registerCallback(
-      'amp-recaptcha-action',
-      actionTypeHandler.bind(this, win, grecaptcha)
+    'amp-recaptcha-action',
+    actionTypeHandler.bind(this, win, grecaptcha)
   );
 }
 
@@ -144,27 +147,38 @@ function initializeIframeMessagingClient(win, grecaptcha, dataObject) {
  * @param {Object} data
  */
 function actionTypeHandler(win, grecaptcha, data) {
-  doesOriginDomainMatchIframeSrc(win, data).then(() => {
-    const executePromise = grecaptcha.execute(sitekey, {
-      action: data.action,
-    });
+  doesOriginDomainMatchIframeSrc(win, data)
+    .then(() => {
+      const executePromise = grecaptcha.execute(sitekey, {
+        action: data.action,
+      });
 
-    // .then() promise pollyfilled by recaptcha api script
-    executePromise./*OK*/then(function(token) {
-      iframeMessagingClient./*OK*/sendMessage('amp-recaptcha-token', dict({
-        'id': data.id,
-        'token': token,
-      }));
-    }, function(err) {
-      user().error(TAG, '%s', err.message);
-      iframeMessagingClient./*OK*/sendMessage('amp-recaptcha-error', dict({
-        'id': data.id,
-        'error': err.message,
-      }));
+      // .then() promise pollyfilled by recaptcha api script
+      executePromise./*OK*/ then(
+        function(token) {
+          iframeMessagingClient./*OK*/ sendMessage(
+            'amp-recaptcha-token',
+            dict({
+              'id': data.id,
+              'token': token,
+            })
+          );
+        },
+        function(err) {
+          user().error(TAG, '%s', err.message);
+          iframeMessagingClient./*OK*/ sendMessage(
+            'amp-recaptcha-error',
+            dict({
+              'id': data.id,
+              'error': err.message,
+            })
+          );
+        }
+      );
+    })
+    .catch(error => {
+      dev().error(TAG, '%s', error.message);
     });
-  }).catch(error => {
-    dev().error(TAG, '%s', error.message);
-  });
 }
 
 /**
@@ -175,11 +189,8 @@ function actionTypeHandler(win, grecaptcha, data) {
  * @return {!Promise}
  */
 export function doesOriginDomainMatchIframeSrc(win, data) {
-
   if (!data.origin) {
-    return Promise.reject(
-        new Error('Could not retreive the origin domain')
-    );
+    return Promise.reject(new Error('Could not retreive the origin domain'));
   }
 
   // Using the deprecated parseUrl here, as we don't have access
@@ -191,10 +202,11 @@ export function doesOriginDomainMatchIframeSrc(win, data) {
     return compareCurlsDomain(win, curlsSubdomain, data.origin);
   }
 
-  return ampToolboxCacheUrl.createCurlsSubdomain(data.origin)
-      .then(curlsSubdomain => {
-        return compareCurlsDomain(win, curlsSubdomain, data.origin);
-      });
+  return ampToolboxCacheUrl
+    .createCurlsSubdomain(data.origin)
+    .then(curlsSubdomain => {
+      return compareCurlsDomain(win, curlsSubdomain, data.origin);
+    });
 }
 
 /**
@@ -206,19 +218,18 @@ export function doesOriginDomainMatchIframeSrc(win, data) {
  * @return {!Promise}
  */
 function compareCurlsDomain(win, curlsSubdomain, origin) {
-
   // Get the hostname after the culrs subdomain of the current iframe window
-  const locationWithoutCurlsSubdomain =
-    win.location.hostname.split('.').slice(1).join('.');
-  const curlsHostname =
-    curlsSubdomain + '.' + locationWithoutCurlsSubdomain;
+  const locationWithoutCurlsSubdomain = win.location.hostname
+    .split('.')
+    .slice(1)
+    .join('.');
+  const curlsHostname = curlsSubdomain + '.' + locationWithoutCurlsSubdomain;
 
   if (curlsHostname === win.location.hostname) {
     return Promise.resolve();
   }
 
   return Promise.reject(
-      new Error('Origin domain does not match Iframe src: ' + origin)
+    new Error('Origin domain does not match Iframe src: ' + origin)
   );
 }
-
diff --git a/3p/reddit.js b/3p/reddit.js
index 2743e0aa1258..c1f4d81e8b2e 100644
--- a/3p/reddit.js
+++ b/3p/reddit.js
@@ -85,7 +85,8 @@ export function reddit(global, data) {
 
   global.addEventListener('resize', event => {
     global.context.updateDimensions(
-        event.target.outerWidth,
-        event.target.outerHeight);
+      event.target.outerWidth,
+      event.target.outerHeight
+    );
   });
 }
diff --git a/3p/twitter.js b/3p/twitter.js
index 16f0640243e5..f7b6c32eaf87 100644
--- a/3p/twitter.js
+++ b/3p/twitter.js
@@ -65,21 +65,24 @@ export function twitter(global, data) {
     delete data.height;
 
     if (data.tweetid) {
-      twttr.widgets.createTweet(cleanupTweetId_(data.tweetid), tweet, data)
-          ./*OK*/then(el => tweetCreated(twttr, el));
+      twttr.widgets
+        .createTweet(cleanupTweetId_(data.tweetid), tweet, data)
+        ./*OK*/ then(el => tweetCreated(twttr, el));
     } else if (data.momentid) {
-      twttr.widgets.createMoment(data.momentid, tweet, data)
-          ./*OK*/then(el => tweetCreated(twttr, el));
+      twttr.widgets
+        .createMoment(data.momentid, tweet, data)
+        ./*OK*/ then(el => tweetCreated(twttr, el));
     } else if (data.timelineSourceType) {
       // Extract properties starting with 'timeline'.
       const timelineData = Object.keys(data)
-          .filter(prop => startsWith(prop, 'timeline'))
-          .reduce((newData, prop) => {
-            newData[stripPrefixCamelCase(prop, 'timeline')] = data[prop];
-            return newData;
-          }, {});
-      twttr.widgets.createTimeline(timelineData, tweet, data)
-          ./*OK*/then(el => tweetCreated(twttr, el));
+        .filter(prop => startsWith(prop, 'timeline'))
+        .reduce((newData, prop) => {
+          newData[stripPrefixCamelCase(prop, 'timeline')] = data[prop];
+          return newData;
+        }, {});
+      twttr.widgets
+        .createTimeline(timelineData, tweet, data)
+        ./*OK*/ then(el => tweetCreated(twttr, el));
     }
   });
 
@@ -108,15 +111,16 @@ export function twitter(global, data) {
    * @param {!Element} container
    */
   function resize(container) {
-    const height = container./*OK*/offsetHeight;
+    const height = container./*OK*/ offsetHeight;
     // 0 height is always wrong and we should get another resize request
     // later.
     if (height == 0) {
       return;
     }
     context.updateDimensions(
-        container./*OK*/offsetWidth,
-        height + /* margins */ 20);
+      container./*OK*/ offsetWidth,
+      height + /* margins */ 20
+    );
   }
 
   /**
diff --git a/3p/viqeoplayer.js b/3p/viqeoplayer.js
index 0b7f2397aebf..787b930f3e17 100644
--- a/3p/viqeoplayer.js
+++ b/3p/viqeoplayer.js
@@ -56,9 +56,9 @@ function viqeoPlayerInitLoaded(global, VIQEO) {
    * @private
    */
   function subscribe(playerEventName, targetEventName) {
-    VIQEO['subscribeTracking'](
-        () => { sendMessage(targetEventName); },
-        `Player:${playerEventName}`);
+    VIQEO['subscribeTracking'](() => {
+      sendMessage(targetEventName);
+    }, `Player:${playerEventName}`);
   }
 
   /**
@@ -68,8 +68,8 @@ function viqeoPlayerInitLoaded(global, VIQEO) {
    */
   function subscribeTracking(eventsDescription) {
     VIQEO['subscribeTracking'](params => {
-      const name = params && params['trackingParams'] &&
-          params['trackingParams'].name;
+      const name =
+        params && params['trackingParams'] && params['trackingParams'].name;
       const targetEventName = eventsDescription[name];
       if (targetEventName) {
         sendMessage(targetEventName);
@@ -79,12 +79,12 @@ function viqeoPlayerInitLoaded(global, VIQEO) {
 
   const sendMessage = (eventName, value = null) => {
     const {parent} = global;
-    const message = /** @type {JsonObject} */({
+    const message = /** @type {JsonObject} */ ({
       source: 'ViqeoPlayer',
       action: eventName,
       value,
     });
-    parent./*OK*/postMessage(message, '*');
+    parent./*OK*/ postMessage(message, '*');
   };
 
   /**
@@ -121,16 +121,11 @@ export function viqeoplayer(global) {
 
   let scriptPlayerInit = data['script-url'];
   scriptPlayerInit =
-      (scriptPlayerInit
-          && tryDecodeUriComponent(scriptPlayerInit)
-      )
-      ||
-      (kindIsProd
-        ? 'https://cdn.viqeo.tv/js/vq_starter.js'
-        : 'https://static.viqeo.tv/js/vq_player_init.js?branch=dev1'
-      );
+    (scriptPlayerInit && tryDecodeUriComponent(scriptPlayerInit)) ||
+    (kindIsProd
+      ? 'https://cdn.viqeo.tv/js/vq_starter.js'
+      : 'https://static.viqeo.tv/js/vq_player_init.js?branch=dev1');
 
-  global['onViqeoLoad'] = VIQEO =>
-    viqeoPlayerInitLoaded(global, VIQEO);
+  global['onViqeoLoad'] = VIQEO => viqeoPlayerInitLoaded(global, VIQEO);
   loadScript(global, scriptPlayerInit);
 }
diff --git a/3p/yotpo.js b/3p/yotpo.js
index a6fe7b7927fc..ab52046da932 100644
--- a/3p/yotpo.js
+++ b/3p/yotpo.js
@@ -27,7 +27,7 @@ function getContainerScript(global, scriptSource, cb) {
     global.Yotpo = global.Yotpo || {};
     delete global.Yotpo.widgets['testimonials'];
     const yotpoWidget =
-      (typeof global.yotpo === 'undefined') ? undefined : global.yotpo;
+      typeof global.yotpo === 'undefined' ? undefined : global.yotpo;
     yotpoWidget.on('CssReady', function() {
       cb(yotpoWidget, 'cssLoaded');
     });
@@ -152,8 +152,8 @@ function getReviewsTabContainer(global) {
  */
 function getProductGalleryContainer(global, data) {
   const container = global.document.createElement('div');
-  container.className = 'yotpo yotpo-pictures-gallery yotpo-product-gallery ' +
-    'yotpo-size-6';
+  container.className =
+    'yotpo yotpo-pictures-gallery yotpo-product-gallery yotpo-size-6';
   container.setAttribute('data-product-id', data.productId);
   container.setAttribute('data-demo', data.demo);
   container.setAttribute('data-layout-rows', data.layoutRows);
@@ -170,7 +170,6 @@ function getProductGalleryContainer(global, data) {
   return container;
 }
 
-
 /**
  * Create DOM element for the Yotpo Visual UGC Gallery plugin:
  * @param {!Window} global
@@ -211,10 +210,14 @@ function getEmbeddedWidgetContainer(global, data) {
   embeddedWidget.setAttribute('data-width', data.width);
   embeddedWidget.setAttribute('data-reviews', data.reviews);
   embeddedWidget.setAttribute('data-header-text', data.headerText);
-  embeddedWidget.setAttribute('data-header-background-color',
-      data.headerBackgroundColor);
-  embeddedWidget.setAttribute('data-body-background-color',
-      data.bodyBackgroundColor);
+  embeddedWidget.setAttribute(
+    'data-header-background-color',
+    data.headerBackgroundColor
+  );
+  embeddedWidget.setAttribute(
+    'data-body-background-color',
+    data.bodyBackgroundColor
+  );
   embeddedWidget.setAttribute('data-font-size', data.fontSize);
   embeddedWidget.setAttribute('data-font-color', data.fontColor);
   embeddedWidget.setAttribute('data-yotpo-element-id', data.yotpoElementId);
@@ -250,7 +253,8 @@ function getPhotosCarouselContainer(global, data) {
  */
 function getPromotedProductsContainer(global, data) {
   const container = global.document.createElement('div');
-  container.className = 'yotpo yotpo-main-widget yotpo-promoted-product ' +
+  container.className =
+    'yotpo yotpo-main-widget yotpo-promoted-product ' +
     'yotpo-medium promoted-products-box';
 
   container.setAttribute('id', 'widget-div-id');
@@ -293,10 +297,10 @@ export function yotpo(global, data) {
 
   global.document.getElementById('c').appendChild(container);
 
-
   let cssLoaded = false;
   let batchLoaded = false;
-  const scriptSource = 'https://staticw2.yotpo.com/' + data.appKey + '/widget.js';
+  const scriptSource =
+    'https://staticw2.yotpo.com/' + data.appKey + '/widget.js';
   getContainerScript(global, scriptSource, (yotpoWidget, eventType) => {
     if (eventType === 'cssLoaded') {
       cssLoaded = true;
@@ -309,8 +313,9 @@ export function yotpo(global, data) {
       setTimeout(() => {
         if (yotpoWidget.widgets[0]) {
           context.updateDimensions(
-              yotpoWidget.widgets[0].element./*OK*/offsetWidth,
-              yotpoWidget.widgets[0].element./*OK*/offsetHeight);
+            yotpoWidget.widgets[0].element./*OK*/ offsetWidth,
+            yotpoWidget.widgets[0].element./*OK*/ offsetHeight
+          );
         }
       }, 100);
     }
diff --git a/README.md b/README.md
index af708de4a8c2..a62e37978c11 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 # AMP HTML ⚡
 
 [![Renovate enabled](https://img.shields.io/badge/renovate-enabled-brightgreen.svg)](https://renovateapp.com/)
+[![code style: prettier](https://img.shields.io/badge/code_style-prettier-ff69b4.svg?style=flat-square)](https://github.com/prettier/prettier)
 
 [AMP HTML](https://amp.dev) is a way to build web pages that render with reliable and fast performance. It is our attempt at fixing what many perceive as painfully slow page load times – especially when reading content on the mobile web.  AMP HTML is built on existing web technologies; an AMP page will load (quickly) in any modern browser.
 
diff --git a/ads/_a4a-config.js b/ads/_a4a-config.js
index dc89c85da5dc..15030ca0b3a1 100644
--- a/ads/_a4a-config.js
+++ b/ads/_a4a-config.js
@@ -14,22 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  adsenseIsA4AEnabled,
-} from '../extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config';
-import {
-  cloudflareIsA4AEnabled,
-} from
-  '../extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config';
-import {
-  gmosspIsA4AEnabled,
-} from
-  '../extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config';
+import {adsenseIsA4AEnabled} from '../extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config';
+import {cloudflareIsA4AEnabled} from '../extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config';
+import {gmosspIsA4AEnabled} from '../extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config';
 import {map} from '../src/utils/object';
-import {
-  tripleliftIsA4AEnabled,
-} from
-  '../extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config';
+import {tripleliftIsA4AEnabled} from '../extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config';
 
 /**
  * Registry for A4A (AMP Ads for AMPHTML pages) "is supported" predicates.
@@ -79,5 +68,6 @@ export const signingServerURLs = {
   'google': 'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
   'google-dev': 'https://cdn.ampproject.org/amp-ad-verifying-keyset-dev.json',
   'cloudflare': 'https://amp.cloudflare.com/amp-ad-verifying-keyset.json',
-  'cloudflare-dev': 'https://amp.cloudflare.com/amp-ad-verifying-keyset-dev.json',
+  'cloudflare-dev':
+    'https://amp.cloudflare.com/amp-ad-verifying-keyset-dev.json',
 };
diff --git a/ads/_config.js b/ads/_config.js
index 344ab1c42734..d561cec0314f 100644
--- a/ads/_config.js
+++ b/ads/_config.js
@@ -139,10 +139,7 @@ export const adConfig = {
 
   'admixer': {
     renderStartImplemented: true,
-    preconnect: [
-      'https://inv-nets.admixer.net',
-      'https://cdn.admixer.net',
-    ],
+    preconnect: ['https://inv-nets.admixer.net', 'https://cdn.admixer.net'],
   },
 
   'adocean': {
@@ -201,16 +198,11 @@ export const adConfig = {
 
   'adtech': {
     prefetch: 'https://s.aolcdn.com/os/ads/adsWrapper3.js',
-    preconnect: [
-      'https://mads.at.atwola.com',
-      'https://aka-cdn.adtechus.com',
-    ],
+    preconnect: ['https://mads.at.atwola.com', 'https://aka-cdn.adtechus.com'],
   },
 
   'adthrive': {
-    prefetch: [
-      'https://www.googletagservices.com/tag/js/gpt.js',
-    ],
+    prefetch: ['https://www.googletagservices.com/tag/js/gpt.js'],
     preconnect: [
       'https://partner.googleadservices.com',
       'https://securepubads.g.doubleclick.net',
@@ -220,34 +212,24 @@ export const adConfig = {
   },
 
   'adunity': {
-    preconnect: [
-      'https://content.adunity.com',
-    ],
+    preconnect: ['https://content.adunity.com'],
     renderStartImplemented: true,
   },
 
   'aduptech': {
     prefetch: 'https://s.d.adup-tech.com/jsapi',
-    preconnect: [
-      'https://d.adup-tech.com',
-      'https://m.adup-tech.com',
-    ],
+    preconnect: ['https://d.adup-tech.com', 'https://m.adup-tech.com'],
     renderStartImplemented: true,
   },
 
   'adventive': {
-    preconnect: [
-      'https://ads.adventive.com',
-      'https://amp.adventivedev.com',
-    ],
+    preconnect: ['https://ads.adventive.com', 'https://amp.adventivedev.com'],
     renderStartImplemented: true,
   },
 
   'adverline': {
     prefetch: 'https://ads.adverline.com/richmedias/amp.js',
-    preconnect: [
-      'https://adnext.fr',
-    ],
+    preconnect: ['https://adnext.fr'],
     renderStartImplemented: true,
   },
 
@@ -275,9 +257,7 @@ export const adConfig = {
       'https://cdn.as.amanad.adtdp.com/sdk/asot-amp.js',
       'https://cdn.as.amanad.adtdp.com/sdk/asot-v2.js',
     ],
-    preconnect: [
-      'https://ad.as.amanad.adtdp.com',
-    ],
+    preconnect: ['https://ad.as.amanad.adtdp.com'],
   },
 
   'appvador': {
@@ -292,10 +272,7 @@ export const adConfig = {
   },
 
   'amoad': {
-    prefetch: [
-      'https://j.amoad.com/js/a.js',
-      'https://j.amoad.com/js/n.js',
-    ],
+    prefetch: ['https://j.amoad.com/js/a.js', 'https://j.amoad.com/js/n.js'],
     preconnect: [
       'https://d.amoad.com',
       'https://i.amoad.com',
@@ -334,10 +311,7 @@ export const adConfig = {
 
   'bringhub': {
     renderStartImplemented: true,
-    preconnect: [
-      'https://static.bh-cdn.com',
-      'https://core-api.bringhub.io',
-    ],
+    preconnect: ['https://static.bh-cdn.com', 'https://core-api.bringhub.io'],
   },
 
   'broadstreetads': {
@@ -345,12 +319,8 @@ export const adConfig = {
   },
 
   'caajainfeed': {
-    prefetch: [
-      'https://cdn.amanad.adtdp.com/sdk/ajaamp.js',
-    ],
-    preconnect: [
-      'https://ad.amanad.adtdp.com',
-    ],
+    prefetch: ['https://cdn.amanad.adtdp.com/sdk/ajaamp.js'],
+    preconnect: ['https://ad.amanad.adtdp.com'],
   },
 
   'capirs': {
@@ -381,7 +351,6 @@ export const adConfig = {
 
   'contentad': {},
 
-
   'criteo': {
     prefetch: 'https://static.criteo.net/js/ld/publishertag.js',
     preconnect: 'https://cas.criteo.com',
@@ -548,9 +517,7 @@ export const adConfig = {
   },
 
   'ix': {
-    prefetch: [
-      'https://js-sec.indexww.com/apl/amp.js',
-    ],
+    prefetch: ['https://js-sec.indexww.com/apl/amp.js'],
     preconnect: 'https://as-sec.casalemedia.com',
     renderStartImplemented: true,
   },
@@ -668,10 +635,7 @@ export const adConfig = {
 
   'mixpo': {
     prefetch: 'https://cdn.mixpo.com/js/loader.js',
-    preconnect: [
-      'https://player1.mixpo.com',
-      'https://player2.mixpo.com',
-    ],
+    preconnect: ['https://player1.mixpo.com', 'https://player2.mixpo.com'],
   },
 
   'monetizer101': {
@@ -707,16 +671,11 @@ export const adConfig = {
 
   'nend': {
     prefetch: 'https://js1.nend.net/js/amp.js',
-    preconnect: [
-      'https://output.nend.net',
-      'https://img1.nend.net',
-    ],
+    preconnect: ['https://output.nend.net', 'https://img1.nend.net'],
   },
 
   'netletix': {
-    preconnect: [
-      'https://call.netzathleten-media.de',
-    ],
+    preconnect: ['https://call.netzathleten-media.de'],
     renderStartImplemented: true,
   },
 
@@ -758,9 +717,7 @@ export const adConfig = {
   'outbrain': {
     renderStartImplemented: true,
     prefetch: 'https://widgets.outbrain.com/widgetAMP/outbrainAMP.min.js',
-    preconnect: [
-      'https://odb.outbrain.com',
-    ],
+    preconnect: ['https://odb.outbrain.com'],
     consentHandlingOverride: true,
   },
 
@@ -804,9 +761,7 @@ export const adConfig = {
   },
 
   'pubmine': {
-    prefetch: [
-      'https://s.pubmine.com/head.js',
-    ],
+    prefetch: ['https://s.pubmine.com/head.js'],
     preconnect: 'https://delivery.g.switchadhub.com',
     renderStartImplemented: true,
   },
@@ -844,7 +799,8 @@ export const adConfig = {
   },
 
   'revcontent': {
-    prefetch: 'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js',
+    prefetch:
+      'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js',
     preconnect: [
       'https://trends.revcontent.com',
       'https://cdn.revcontent.com',
@@ -954,10 +910,7 @@ export const adConfig = {
 
   'swoop': {
     prefetch: 'https://www.swoop-amp.com/amp.js',
-    preconnect: [
-      'https://www.swpsvc.com',
-      'https://client.swpcld.com',
-    ],
+    preconnect: ['https://www.swpsvc.com', 'https://client.swpcld.com'],
     renderStartImplemented: true,
   },
 
@@ -998,9 +951,7 @@ export const adConfig = {
   },
 
   'uzou': {
-    preconnect: [
-      'https://speee-ad.akamaized.net',
-    ],
+    preconnect: ['https://speee-ad.akamaized.net'],
     renderStartImplemented: true,
   },
 
@@ -1033,19 +984,13 @@ export const adConfig = {
 
   'vmfive': {
     prefetch: 'https://man.vm5apis.com/dist/adn-web-sdk.js',
-    preconnect: [
-      'https://vawpro.vm5apis.com',
-      'https://vahfront.vm5apis.com',
-    ],
+    preconnect: ['https://vawpro.vm5apis.com', 'https://vahfront.vm5apis.com'],
     renderStartImplemented: true,
   },
 
   'webediads': {
     prefetch: 'https://eu1.wbdds.com/amp.min.js',
-    preconnect: [
-      'https://goutee.top',
-      'https://mediaathay.org.uk',
-    ],
+    preconnect: ['https://goutee.top', 'https://mediaathay.org.uk'],
     renderStartImplemented: true,
   },
 
@@ -1064,10 +1009,7 @@ export const adConfig = {
 
   'wpmedia': {
     prefetch: 'https://std.wpcdn.pl/wpjslib/wpjslib-amp.js',
-    preconnect: [
-      'https://www.wp.pl',
-      'https://v.wpimg.pl',
-    ],
+    preconnect: ['https://www.wp.pl', 'https://v.wpimg.pl'],
     renderStartImplemented: true,
   },
 
@@ -1108,10 +1050,7 @@ export const adConfig = {
 
   'yieldmo': {
     prefetch: 'https://static.yieldmo.com/ym.1.js',
-    preconnect: [
-      'https://s.yieldmo.com',
-      'https://ads.yieldmo.com',
-    ],
+    preconnect: ['https://s.yieldmo.com', 'https://ads.yieldmo.com'],
     renderStartImplemented: true,
   },
 
@@ -1131,9 +1070,7 @@ export const adConfig = {
 
   'zen': {
     prefetch: 'https://zen.yandex.ru/widget-loader',
-    preconnect: [
-      'https://yastatic.net/',
-    ],
+    preconnect: ['https://yastatic.net/'],
     renderStartImplemented: true,
   },
 
@@ -1152,5 +1089,4 @@ export const adConfig = {
     prefetch: 'https://dup.baidustatic.com/js/dm.js',
     renderStartImplemented: true,
   },
-
 };
diff --git a/ads/_ping_.js b/ads/_ping_.js
index e26d5dbaa294..61f82bea4184 100644
--- a/ads/_ping_.js
+++ b/ads/_ping_.js
@@ -28,8 +28,7 @@ export function _ping_(global, data) {
   // for testing only. see #10628
   global.networkIntegrationDataParamForTesting = data;
 
-  validateData(data, ['url'],
-      ['valid', 'adHeight', 'adWidth', 'enableIo']);
+  validateData(data, ['url'], ['valid', 'adHeight', 'adWidth', 'enableIo']);
   userAssert(!data['error'], 'Fake user error!');
   global.document.getElementById('c').textContent = data.ping;
   global.ping = Object.create(null);
@@ -43,8 +42,7 @@ export function _ping_(global, data) {
   });
 
   if (data.ad_container) {
-    devAssert(
-        global.context.container == data.ad_container, 'wrong container');
+    devAssert(global.context.container == data.ad_container, 'wrong container');
   }
   if (data.valid == 'false') {
     // Immediately send no-content for visual diff test
@@ -75,8 +73,11 @@ export function _ping_(global, data) {
     if (data.enableIo) {
       global.context.observeIntersection(function(changes) {
         changes.forEach(function(c) {
-          dev().info('AMP-AD', 'Intersection: (WxH)' +
-              `${c.intersectionRect.width}x${c.intersectionRect.height}`);
+          dev().info(
+            'AMP-AD',
+            'Intersection: (WxH)' +
+              `${c.intersectionRect.width}x${c.intersectionRect.height}`
+          );
         });
         // store changes to global.lastIO for testing purpose
         global.ping.lastIO = changes[changes.length - 1];
diff --git a/ads/a9.js b/ads/a9.js
index fa02df6cb3bf..c9a5deb759ef 100644
--- a/ads/a9.js
+++ b/ads/a9.js
@@ -19,24 +19,58 @@ import {loadScript, validateData, writeScript} from '../3p/3p';
 import {parseJson} from '../src/json';
 
 const mandatoryParams = [],
-    optionalParams = [
-      'ad_mode', 'placement', 'tracking_id', 'ad_type',
-      'marketplace', 'region', 'title',
-      'default_search_phrase', 'default_category', 'linkid',
-      'search_bar', 'search_bar_position', 'rows',
-      'design', 'asins', 'debug', 'aax_src_id',
-      'header_style', 'link_style', 'link_hover_style',
-      'text_style', 'random_permute', 'render_full_page',
-      'axf_exp_name', 'axf_treatment', 'disable_borders',
-      'attributes', 'carousel', 'feedback_enable',
-      'max_ads_in_a_row', 'list_price', 'prime',
-      'prime_position', 'widget_padding',
-      'strike_text_style', 'brand_text_link', 'brand_position',
-      'large_rating', 'rating_position', 'max_title_height',
-      'enable_swipe_on_mobile', 'overrides',
-      'ead', 'force_win_bid', 'fallback_mode', 'url',
-      'regionurl', 'divid', 'recomtype', 'adinstanceid',
-    ];
+  optionalParams = [
+    'ad_mode',
+    'placement',
+    'tracking_id',
+    'ad_type',
+    'marketplace',
+    'region',
+    'title',
+    'default_search_phrase',
+    'default_category',
+    'linkid',
+    'search_bar',
+    'search_bar_position',
+    'rows',
+    'design',
+    'asins',
+    'debug',
+    'aax_src_id',
+    'header_style',
+    'link_style',
+    'link_hover_style',
+    'text_style',
+    'random_permute',
+    'render_full_page',
+    'axf_exp_name',
+    'axf_treatment',
+    'disable_borders',
+    'attributes',
+    'carousel',
+    'feedback_enable',
+    'max_ads_in_a_row',
+    'list_price',
+    'prime',
+    'prime_position',
+    'widget_padding',
+    'strike_text_style',
+    'brand_text_link',
+    'brand_position',
+    'large_rating',
+    'rating_position',
+    'max_title_height',
+    'enable_swipe_on_mobile',
+    'overrides',
+    'ead',
+    'force_win_bid',
+    'fallback_mode',
+    'url',
+    'regionurl',
+    'divid',
+    'recomtype',
+    'adinstanceid',
+  ];
 const prefix = 'amzn_assoc_';
 
 /**
@@ -51,25 +85,22 @@ export function a9(global, data) {
 
   validateData(data, mandatoryParams, optionalParams);
 
-  const publisherUrl = global.context.canonicalUrl ||
-      global.context.sourceUrl;
+  const publisherUrl = global.context.canonicalUrl || global.context.sourceUrl;
 
   if (data.amzn_assoc_ad_mode) {
     if (data.amzn_assoc_ad_mode === 'auto') {
-      if (data.adinstanceid &&
-      (data.adinstanceid !== '')) {
+      if (data.adinstanceid && data.adinstanceid !== '') {
         loadRecTag(global, data, publisherUrl);
-      }
-      else {
+      } else {
         loadSearTag(global, data, publisherUrl);
       }
-    }
-    else if ((data.amzn_assoc_ad_mode === 'search')
-    || (data.amzn_assoc_ad_mode === 'manual')) {
+    } else if (
+      data.amzn_assoc_ad_mode === 'search' ||
+      data.amzn_assoc_ad_mode === 'manual'
+    ) {
       loadSearTag(global, data, publisherUrl);
     }
-  }
-  else {
+  } else {
     loadSearTag(global, data, publisherUrl);
   }
 }
@@ -79,7 +110,7 @@ export function a9(global, data) {
  */
 function getURL(data) {
   let url = 'https://z-na.amazon-adsystem.com/widgets/onejs?MarketPlace=US';
-  if (data.regionurl && (data.regionurl !== '')) {
+  if (data.regionurl && data.regionurl !== '') {
     url = data.regionurl;
   }
 
@@ -98,8 +129,7 @@ function loadRecTag(global, data, publisherUrl) {
 
   if (data['recomtype'] === 'sync') {
     writeScript(global, url);
-  }
-  else if (data['recomtype'] === 'async') {
+  } else if (data['recomtype'] === 'async') {
     const d = global.document.createElement('div');
     d.setAttribute('id', data['divid']);
     global.document.getElementById('c').appendChild(d);
@@ -114,9 +144,9 @@ function loadRecTag(global, data, publisherUrl) {
  */
 function loadSearTag(global, data, publisherUrl) {
   /**
-  * Sets macro type.
-  * @param {string} type
-  */
+   * Sets macro type.
+   * @param {string} type
+   */
   function setMacro(type) {
     if (!type) {
       return;
@@ -128,8 +158,8 @@ function loadSearTag(global, data, publisherUrl) {
   }
 
   /**
-  * Sets the params.
-  */
+   * Sets the params.
+   */
   function setParams() {
     const url = getURL(data);
     let i;
@@ -139,7 +169,7 @@ function loadSearTag(global, data, publisherUrl) {
     }
 
     if (data.amzn_assoc_fallback_mode) {
-      const str = (data.amzn_assoc_fallback_mode).split(',');
+      const str = data.amzn_assoc_fallback_mode.split(',');
       let types = str[0].split(':');
       let typev = str[1].split(':');
       types = parseJson(types[1]);
@@ -151,8 +181,7 @@ function loadSearTag(global, data, publisherUrl) {
     }
     if (data.amzn_assoc_url) {
       global['amzn_assoc_URL'] = data['amzn_assoc_url'];
-    }
-    else {
+    } else {
       global['amzn_assoc_URL'] = publisherUrl;
     }
 
diff --git a/ads/adagio.js b/ads/adagio.js
index 5360b3b4b84c..eb072bef4213 100755
--- a/ads/adagio.js
+++ b/ads/adagio.js
@@ -21,7 +21,6 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function adagio(global, data) {
-
   validateData(data, ['sid', 'loc']);
 
   const $neodata = global;
diff --git a/ads/adblade.js b/ads/adblade.js
index 859c8223f89e..495c63624d72 100644
--- a/ads/adblade.js
+++ b/ads/adblade.js
@@ -40,8 +40,8 @@ function addAdiantUnit(hostname, global, data) {
   global.document.getElementById('c').appendChild(ins);
 
   ins.parentNode.addEventListener(
-      'eventAdbladeRenderStart',
-      global.context.renderStart()
+    'eventAdbladeRenderStart',
+    global.context.renderStart()
   );
 
   // run our JavaScript code to display the ad unit
diff --git a/ads/adbutler.js b/ads/adbutler.js
index 11c89fcdc3fc..51efddaff521 100644
--- a/ads/adbutler.js
+++ b/ads/adbutler.js
@@ -20,11 +20,11 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Window} global
  * @param {!Object} data
  */
-export function adbutler(global,data) {
+export function adbutler(global, data) {
   validateData(
-      data,
-      ['account', 'zone', 'width', 'height'],
-      ['keyword', 'place']
+    data,
+    ['account', 'zone', 'width', 'height'],
+    ['keyword', 'place']
   );
 
   data['place'] = data['place'] || 0;
@@ -42,11 +42,11 @@ export function adbutler(global,data) {
   global.AdButler.ads.push({
     handler(opt) {
       global.AdButler.register(
-          data['account'],
-          data['zone'],
-          [data['width'], data['height']],
-          placeholderID,
-          opt
+        data['account'],
+        data['zone'],
+        [data['width'], data['height']],
+        placeholderID,
+        opt
       );
     },
     opt: {
diff --git a/ads/adfox.js b/ads/adfox.js
index 260cccc2fff3..402748482571 100644
--- a/ads/adfox.js
+++ b/ads/adfox.js
@@ -23,8 +23,9 @@ import {yandex} from './yandex';
  */
 export function adfox(global, data) {
   validateData(data, ['adfoxParams', 'ownerId']);
-  loadScript(global, 'https://yastatic.net/pcode/adfox/loader.js',
-      () => initAdFox(global, data));
+  loadScript(global, 'https://yastatic.net/pcode/adfox/loader.js', () =>
+    initAdFox(global, data)
+  );
 }
 
 /**
diff --git a/ads/adgeneration.js b/ads/adgeneration.js
index 40e683b56bb3..418db5efaef6 100644
--- a/ads/adgeneration.js
+++ b/ads/adgeneration.js
@@ -21,24 +21,27 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function adgeneration(global, data) {
-  validateData(data, ['id'],
-      ['targetid', 'displayid', 'adtype', 'option']);
+  validateData(data, ['id'], ['targetid', 'displayid', 'adtype', 'option']);
 
   // URL encoding
   const option = data.option ? encodeQueryValue(data.option) : null;
 
-  const url = 'https://i.socdm.com/sdk/js/adg-script-loader.js?' +
-      'id=' + encodeURIComponent(data.id) +
-      '&width=' + encodeURIComponent(data.width) +
-      '&height=' + encodeURIComponent(data.height) +
-      '&async=true' +
-      '&adType=' +
-      (validateAdType(data.adType)) +
-      '&displayid=' +
-      (data.displayid ? encodeURIComponent(data.displayid) : '1') +
-      '&tagver=2.0.0' +
-      (data.targetid ? '&targetID=' + encodeURIComponent(data.targetid) : '') +
-      (option ? '&' + option : '');
+  const url =
+    'https://i.socdm.com/sdk/js/adg-script-loader.js?' +
+    'id=' +
+    encodeURIComponent(data.id) +
+    '&width=' +
+    encodeURIComponent(data.width) +
+    '&height=' +
+    encodeURIComponent(data.height) +
+    '&async=true' +
+    '&adType=' +
+    validateAdType(data.adType) +
+    '&displayid=' +
+    (data.displayid ? encodeURIComponent(data.displayid) : '1') +
+    '&tagver=2.0.0' +
+    (data.targetid ? '&targetID=' + encodeURIComponent(data.targetid) : '') +
+    (option ? '&' + option : '');
   writeScript(global, url);
 }
 
@@ -48,11 +51,14 @@ export function adgeneration(global, data) {
  * @return {string}
  */
 function encodeQueryValue(str) {
-  return str.split('&').map(v => {
-    const key = v.split('=')[0],
+  return str
+    .split('&')
+    .map(v => {
+      const key = v.split('=')[0],
         val = v.split('=')[1];
-    return encodeURIComponent(key) + '=' + encodeURIComponent(val);
-  }).join('&');
+      return encodeURIComponent(key) + '=' + encodeURIComponent(val);
+    })
+    .join('&');
 }
 /**
  * If adtype is "RECTANGLE", replace it with "RECT"
diff --git a/ads/adhese.js b/ads/adhese.js
index 9e2ac8d99b06..0dddd3f5d984 100644
--- a/ads/adhese.js
+++ b/ads/adhese.js
@@ -21,7 +21,7 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function adhese(global, data) {
-  validateData(data, ['location','format', 'account', 'requestType']);
+  validateData(data, ['location', 'format', 'account', 'requestType']);
   let targetParam = '';
   if (data['targeting']) {
     const targetList = data['targeting'];
@@ -29,18 +29,27 @@ export function adhese(global, data) {
       targetParam += encodeURIComponent(category);
       const targets = targetList[category];
       for (let x = 0; x < targets.length; x++) {
-        targetParam += encodeURIComponent(targets[x]) +
-            (targets.length - 1 > x ? ';' : '');
+        targetParam +=
+          encodeURIComponent(targets[x]) + (targets.length - 1 > x ? ';' : '');
       }
       targetParam += '/';
     }
   }
   targetParam += '?t=' + Date.now();
-  writeScript(window, 'https://ads-' + encodeURIComponent(data['account']) +
-      '.adhese.com/' + encodeURIComponent(data['requestType']) + '/sl' +
+  writeScript(
+    window,
+    'https://ads-' +
+      encodeURIComponent(data['account']) +
+      '.adhese.com/' +
+      encodeURIComponent(data['requestType']) +
+      '/sl' +
       encodeURIComponent(data['location']) +
-      encodeURIComponent(data['position']) + '-' +
-      encodeURIComponent(data['format']) + '/' + targetParam);
+      encodeURIComponent(data['position']) +
+      '-' +
+      encodeURIComponent(data['format']) +
+      '/' +
+      targetParam
+  );
   const co = global.document.querySelector('#c');
   co.width = data['width'];
   co.height = data['height'];
@@ -52,13 +61,20 @@ export function adhese(global, data) {
  * @param {!Object} e
  */
 function getAdInfo(global, e) {
-  if (e.detail.isReady && e.detail.width == e.target.width &&
-      e.detail.height == e.target.height) {
+  if (
+    e.detail.isReady &&
+    e.detail.width == e.target.width &&
+    e.detail.height == e.target.height
+  ) {
     global.context.renderStart();
-  } else if (e.detail.isReady && (e.detail.width != e.target.width ||
-      e.detail.height != e.target.height)) {
-    global.context.renderStart({width: e.detail.width,
-      height: e.detail.height});
+  } else if (
+    e.detail.isReady &&
+    (e.detail.width != e.target.width || e.detail.height != e.target.height)
+  ) {
+    global.context.renderStart({
+      width: e.detail.width,
+      height: e.detail.height,
+    });
   } else {
     global.context.noContentAvailable();
   }
diff --git a/ads/adition.js b/ads/adition.js
index 475898336e26..92a258ccde88 100644
--- a/ads/adition.js
+++ b/ads/adition.js
@@ -23,6 +23,10 @@ import {validateData, writeScript} from '../3p/3p';
 export function adition(global, data) {
   validateData(data, ['version']);
   global.data = data;
-  writeScript(global, 'https://imagesrv.adition.com/js/amp/v'
-      + encodeURIComponent(data['version']) + '.js');
+  writeScript(
+    global,
+    'https://imagesrv.adition.com/js/amp/v' +
+      encodeURIComponent(data['version']) +
+      '.js'
+  );
 }
diff --git a/ads/admanmedia.js b/ads/admanmedia.js
index 2e67e0dcc35c..4a875550c0ea 100644
--- a/ads/admanmedia.js
+++ b/ads/admanmedia.js
@@ -24,12 +24,17 @@ export function admanmedia(global, data) {
   validateData(data, ['id']);
 
   const encodedId = encodeURIComponent(data.id);
-  loadScript(global, `https://mona.admanmedia.com/go?id=${encodedId}`, () => {
-    const pattern = `script[src$="id=${encodedId}"]`;
-    const scriptTag = global.document.querySelector(pattern);
-    scriptTag.setAttribute('id', `hybs-${encodedId}`);
-    global.context.renderStart();
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  loadScript(
+    global,
+    `https://mona.admanmedia.com/go?id=${encodedId}`,
+    () => {
+      const pattern = `script[src$="id=${encodedId}"]`;
+      const scriptTag = global.document.querySelector(pattern);
+      scriptTag.setAttribute('id', `hybs-${encodedId}`);
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/adocean.js b/ads/adocean.js
index c4e4dbd501d4..bb0bb884089c 100644
--- a/ads/adocean.js
+++ b/ads/adocean.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {CONSENT_POLICY_STATE} from '../src/consent-state';
 import {computeInMasterFrame, validateData, writeScript} from '../3p/3p';
 import {parseJson} from '../src/json';
@@ -43,7 +42,7 @@ function isFalseString(str) {
 function setupAdoConfig(mode, global, consent) {
   if (global['ado']) {
     const config = {
-      mode: (mode == 'sync') ? 'old' : 'new',
+      mode: mode == 'sync' ? 'old' : 'new',
       protocol: 'https:',
       fif: {
         enabled: mode != 'sync',
@@ -119,9 +118,10 @@ let runSyncCount = 0;
  */
 function runSync(global, cb) {
   global['__aoPrivFnct' + ++runSyncCount] = cb;
-  /*eslint no-useless-concat: 0*/
-  global.document
-      .write('<' + 'script>__aoPrivFnct' + runSyncCount + '();<' + '/script>');
+  global.document.write(
+    // eslint-disable-next-line no-useless-concat
+    '<' + 'script>__aoPrivFnct' + runSyncCount + '();<' + '/script>'
+  );
 }
 
 /**
@@ -201,15 +201,20 @@ function executeMaster(masterId, data, global, callback) {
 function requestCodes(masterId, data, global, callback) {
   const slaveId = data['aoId'];
 
-  computeInMasterFrame(global, 'ao-master-exec', done => {
-    executeMaster(masterId, data, global,codes => done(codes));
-  }, codes => {
-    const creative = codes[slaveId];
-    if (codes[slaveId + '_second_phase']) {
-      creative['code'] += '\n' + codes[slaveId + '_second_phase']['code'];
+  computeInMasterFrame(
+    global,
+    'ao-master-exec',
+    done => {
+      executeMaster(masterId, data, global, codes => done(codes));
+    },
+    codes => {
+      const creative = codes[slaveId];
+      if (codes[slaveId + '_second_phase']) {
+        creative['code'] += '\n' + codes[slaveId + '_second_phase']['code'];
+      }
+      callback(creative);
     }
-    callback(creative);
-  });
+  );
 }
 
 class AdoBuffer {
@@ -233,8 +238,8 @@ class AdoBuffer {
 
     if (this.global.document.readyState === 'loading') {
       this.global.document.addEventListener(
-          'DOMContentLoaded',
-          this._init.bind(this)
+        'DOMContentLoaded',
+        this._init.bind(this)
       );
     } else {
       this._init();
@@ -276,7 +281,6 @@ class AdoBuffer {
   }
 }
 
-
 /**
  *
  * @param {string} slaveId
@@ -297,7 +301,7 @@ function executeSlave(slaveId, config, global) {
     } else {
       const buffer = new AdoBuffer(placement, global);
       buffer.render(() => {
-        (new Function(config['sendHitsDef'] + config['code']))();
+        new Function(config['sendHitsDef'] + config['code'])();
       });
     }
   }
@@ -308,20 +312,14 @@ function executeSlave(slaveId, config, global) {
  * @param {!Object} data
  */
 export function adocean(global, data) {
-  validateData(data, [
-    'aoEmitter',
-    'aoId',
-  ], [
-    'aoMode',
-    'aoPreview',
-    'aoKeys',
-    'aoVars',
-    'aoClusters',
-    'aoMaster',
-  ]);
+  validateData(
+    data,
+    ['aoEmitter', 'aoId'],
+    ['aoMode', 'aoPreview', 'aoKeys', 'aoVars', 'aoClusters', 'aoMaster']
+  );
 
   const masterId = data['aoMaster'];
-  const mode = (data['aoMode'] !== 'sync' || masterId ? 'buffered' : 'sync');
+  const mode = data['aoMode'] !== 'sync' || masterId ? 'buffered' : 'sync';
   const adoUrl = 'https://' + data['aoEmitter'] + ADO_JS_PATHS[mode];
   const ctx = global.context;
 
@@ -329,11 +327,10 @@ export function adocean(global, data) {
    * INSUFFICIENT and UNKNOWN should be treated as INSUFFICIENT
    * not defined states should be treated as INSUFFICIENT
    */
-  const consent = (
+  const consent =
     ctx.initialConsentState === null /* tags without data-block-on-consent */ ||
     ctx.initialConsentState === CONSENT_POLICY_STATE.SUFFICIENT ||
-    ctx.initialConsentState === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
-  );
+    ctx.initialConsentState === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED;
 
   writeScript(global, adoUrl, () => {
     setupAdoConfig(mode, global, consent);
diff --git a/ads/adpicker.js b/ads/adpicker.js
index c54662fc497f..fd2e703db4b5 100644
--- a/ads/adpicker.js
+++ b/ads/adpicker.js
@@ -22,10 +22,12 @@ import {validateData, writeScript} from '../3p/3p';
  */
 export function adpicker(global, data) {
   validateData(data, ['ph']);
-  const url = 'https://cdn.adpicker.net' +
-      '/ads/main.js?et=amp' +
-      '&ph=' + encodeURIComponent(data.ph) +
-      '&cb=' + Math.floor(89999999 * Math.random() + 10000000);
+  const url =
+    'https://cdn.adpicker.net' +
+    '/ads/main.js?et=amp' +
+    '&ph=' +
+    encodeURIComponent(data.ph) +
+    '&cb=' +
+    Math.floor(89999999 * Math.random() + 10000000);
   writeScript(global, url);
 }
-
diff --git a/ads/adplugg.js b/ads/adplugg.js
index e0dafd854009..7e179e2647fe 100644
--- a/ads/adplugg.js
+++ b/ads/adplugg.js
@@ -22,15 +22,15 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Window} global
  * @param {!Object} data
  */
-export function adplugg(global,data) {
+export function adplugg(global, data) {
   // Load ad.js
   loadScript(global, 'https://www.adplugg.com/serve/js/ad.js');
 
   // Validate the amp-ad attributes.
   validateData(
-      data,
-      ['accessCode', 'width', 'height'], //required
-      ['zone'] //optional
+    data,
+    ['accessCode', 'width', 'height'], //required
+    ['zone'] //optional
   );
 
   // Get the amp wrapper element.
@@ -46,39 +46,31 @@ export function adplugg(global,data) {
   ampwrapper.appendChild(adTag);
 
   // Get a handle on the AdPlugg SDK.
-  global.AdPlugg = (global.AdPlugg || []);
+  global.AdPlugg = global.AdPlugg || [];
   const {AdPlugg} = global;
 
   // Register event listeners (via async wrapper).
   AdPlugg.push(function() {
     const {AdPlugg} = global;
     // Register the renderStart event listener.
-    AdPlugg.on(
-        adTag,
-        'adplugg:renderStart',
-        function(event) {
-          // Create the opt_data object.
-          const optData = {};
-          if (hasOwn(event, 'width')) {
-            optData.width = event.width;
-          }
-          if (hasOwn(event, 'height')) {
-            optData.height = event.height;
-          }
-          global.context.renderStart(optData);
-        }
-    );
+    AdPlugg.on(adTag, 'adplugg:renderStart', function(event) {
+      // Create the opt_data object.
+      const optData = {};
+      if (hasOwn(event, 'width')) {
+        optData.width = event.width;
+      }
+      if (hasOwn(event, 'height')) {
+        optData.height = event.height;
+      }
+      global.context.renderStart(optData);
+    });
 
     // Register the noContentAvailable event listener.
-    AdPlugg.on(adTag, 'adplugg:noContentAvailable',
-        function() {
-          global.context.noContentAvailable();
-        }
-    );
-
+    AdPlugg.on(adTag, 'adplugg:noContentAvailable', function() {
+      global.context.noContentAvailable();
+    });
   });
 
   // Fill the tag.
   AdPlugg.push({'command': 'run'});
-
 }
diff --git a/ads/adreactor.js b/ads/adreactor.js
index 806b9863aa6d..91c9844576ec 100644
--- a/ads/adreactor.js
+++ b/ads/adreactor.js
@@ -23,12 +23,18 @@ import {validateData, writeScript} from '../3p/3p';
 export function adreactor(global, data) {
   // TODO: check mandatory fields
   validateData(data, [], ['zid', 'pid', 'custom3']);
-  const url = 'https://adserver.adreactor.com' +
-      '/servlet/view/banner/javascript/zone?' +
-      'zid=' + encodeURIComponent(data.zid) +
-      '&pid=' + encodeURIComponent(data.pid) +
-      '&custom3=' + encodeURIComponent(data.custom3) +
-      '&random=' + Math.floor(89999999 * Math.random() + 10000000) +
-      '&millis=' + Date.now();
+  const url =
+    'https://adserver.adreactor.com' +
+    '/servlet/view/banner/javascript/zone?' +
+    'zid=' +
+    encodeURIComponent(data.zid) +
+    '&pid=' +
+    encodeURIComponent(data.pid) +
+    '&custom3=' +
+    encodeURIComponent(data.custom3) +
+    '&random=' +
+    Math.floor(89999999 * Math.random() + 10000000) +
+    '&millis=' +
+    Date.now();
   writeScript(global, url);
 }
diff --git a/ads/adsensor.js b/ads/adsensor.js
index c2687e166527..c15462c6e0b5 100644
--- a/ads/adsensor.js
+++ b/ads/adsensor.js
@@ -20,7 +20,8 @@ import {writeScript} from '../3p/3p';
  * @param {!Window} global
  */
 export function adsensor(global) {
-
-  writeScript(global, 'https://wfpscripts.webspectator.com/amp/adsensor-amp.js');
-
+  writeScript(
+    global,
+    'https://wfpscripts.webspectator.com/amp/adsensor-amp.js'
+  );
 }
diff --git a/ads/adspeed.js b/ads/adspeed.js
index bb33d4dbb05e..91b5f7e9be05 100644
--- a/ads/adspeed.js
+++ b/ads/adspeed.js
@@ -23,7 +23,13 @@ import {validateData, writeScript} from '../3p/3p';
 export function adspeed(global, data) {
   validateData(data, ['zone', 'client']);
 
-  const url = 'https://g.adspeed.net/ad.php?do=amphtml&zid=' + data.zone + '&oid=' + data.client + '&cb=' + Math.random();
+  const url =
+    'https://g.adspeed.net/ad.php?do=amphtml&zid=' +
+    data.zone +
+    '&oid=' +
+    data.client +
+    '&cb=' +
+    Math.random();
 
   writeScript(global, url);
 }
diff --git a/ads/adspirit.js b/ads/adspirit.js
index 05497a9e6ae3..9aa21cfa12ef 100644
--- a/ads/adspirit.js
+++ b/ads/adspirit.js
@@ -18,9 +18,9 @@ import {setStyles} from '../src/style';
 import {validateData} from '../3p/3p';
 
 /**
-  * @param {!Window} global
-  * @param {!Object} data
-  */
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function adspirit(global, data) {
   // TODO: check mandatory fields
   validateData(data, [], ['asmParams', 'asmHost']);
diff --git a/ads/adtech.js b/ads/adtech.js
index dc673bbe6d73..8df0e89190ee 100644
--- a/ads/adtech.js
+++ b/ads/adtech.js
@@ -32,11 +32,22 @@ export function adtech(global, data) {
     validateSrcContains('/addyn/', adsrc);
     writeScript(global, adsrc);
   } else {
-    validateData(data, ['atwmn', 'atwdiv'], [
-      'atwco', 'atwheight', 'atwhtnmat',
-      'atwmoat', 'atwnetid', 'atwothat', 'atwplid',
-      'atwpolar', 'atwsizes', 'atwwidth',
-    ]);
+    validateData(
+      data,
+      ['atwmn', 'atwdiv'],
+      [
+        'atwco',
+        'atwheight',
+        'atwhtnmat',
+        'atwmoat',
+        'atwnetid',
+        'atwothat',
+        'atwplid',
+        'atwpolar',
+        'atwsizes',
+        'atwwidth',
+      ]
+    );
     global.atwco = data.atwco;
     global.atwdiv = data.atwdiv;
     global.atwheight = data.atwheight;
@@ -49,6 +60,6 @@ export function adtech(global, data) {
     global.atwpolar = data.atwpolar;
     global.atwsizes = data.atwsizes;
     global.atwwidth = data.atwwidth;
-    writeScript(global,'https://s.aolcdn.com/os/ads/adsWrapper3.js');
+    writeScript(global, 'https://s.aolcdn.com/os/ads/adsWrapper3.js');
   }
 }
diff --git a/ads/adthrive.js b/ads/adthrive.js
index 6449bbd3ef21..ad2c047a29bc 100644
--- a/ads/adthrive.js
+++ b/ads/adthrive.js
@@ -22,6 +22,10 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function adthrive(global, data) {
   validateData(data, ['siteId', 'adUnit'], ['sizes']);
-  loadScript(global, 'https://ads.adthrive.com/sites/'
-      + encodeURIComponent(data.siteId) + '/amp.min.js');
+  loadScript(
+    global,
+    'https://ads.adthrive.com/sites/' +
+      encodeURIComponent(data.siteId) +
+      '/amp.min.js'
+  );
 }
diff --git a/ads/adunity.js b/ads/adunity.js
index f040016ce18b..67c33461b348 100644
--- a/ads/adunity.js
+++ b/ads/adunity.js
@@ -24,32 +24,31 @@ import {startsWith} from '../src/string';
 export function adunity(global, data) {
   const doc = global.document;
 
-  validateData(data, [
-    'auAccount',
-    'auSite',
-  ],
-  [
-    'auSection',
-    'auZone',
-    'auDemo',
-    'auIsdemo',
-    'auAd',
-    'auOrder',
-    'auSegment',
-    'auOptions',
-    'auSources',
-    'auAds',
-    'auTriggerFn',
-    'auTriggerVal',
-    'auCallbackVal',
-    'auCallbackFn',
-    'auPassbackFn',
-    'auPassbackVal',
-    'auClick',
-    'auDual',
-    'auImpression',
-    'auVideo',
-  ]
+  validateData(
+    data,
+    ['auAccount', 'auSite'],
+    [
+      'auSection',
+      'auZone',
+      'auDemo',
+      'auIsdemo',
+      'auAd',
+      'auOrder',
+      'auSegment',
+      'auOptions',
+      'auSources',
+      'auAds',
+      'auTriggerFn',
+      'auTriggerVal',
+      'auCallbackVal',
+      'auCallbackFn',
+      'auPassbackFn',
+      'auPassbackVal',
+      'auClick',
+      'auDual',
+      'auImpression',
+      'auVideo',
+    ]
   );
 
   //prepare tag structure
@@ -73,8 +72,7 @@ export function adunity(global, data) {
       if (startsWith(key, 'au')) {
         if (key == 'auVideo') {
           tag.setAttribute('class', 'au-video');
-        }
-        else {
+        } else {
           const auKey = key.substring(2).toLowerCase();
           tag.setAttribute('data-au-' + auKey, data[key]);
         }
@@ -104,7 +102,9 @@ export function adunity(global, data) {
  * @param {!Object} data
  */
 function renderTags(global, data) {
-  if (data == null) {return;}
+  if (data == null) {
+    return;
+  }
 
   global.context.renderStart({
     width: data.width,
diff --git a/ads/aduptech.js b/ads/aduptech.js
index 6cde94c6a128..b69e9d606ce2 100644
--- a/ads/aduptech.js
+++ b/ads/aduptech.js
@@ -30,7 +30,6 @@ export function aduptech(global, data) {
 
   // load aduptech js api
   loadScript(global, 'https://s.d.adup-tech.com/jsapi', () => {
-
     // force responsive ads for amp
     data.responsive = true;
 
diff --git a/ads/adventive.js b/ads/adventive.js
index 75fcaed58ddf..471069c87f5b 100644
--- a/ads/adventive.js
+++ b/ads/adventive.js
@@ -33,23 +33,23 @@ export function adventive(global, data) {
 }
 
 const adv = {
-      addInstance: () => {},
-      args: {},
-      isLibLoaded: false,
-      mode: {
-        dev: false,
-        live: false,
-        localDev: false,
-        preview: false,
-        prod: false,
-        testing: false,
-      },
+    addInstance: () => {},
+    args: {},
+    isLibLoaded: false,
+    mode: {
+      dev: false,
+      live: false,
+      localDev: false,
+      preview: false,
+      prod: false,
+      testing: false,
     },
-    requiredData = ['pid'],
-    optionalData = ['click', 'async', 'isDev'],
-    sld = {true: 'adventivedev', false: 'adventive'},
-    thld = {true: 'amp', false: 'ads'},
-    cacheTime = 5;
+  },
+  requiredData = ['pid'],
+  optionalData = ['click', 'async', 'isDev'],
+  sld = {true: 'adventivedev', false: 'adventive'},
+  thld = {true: 'amp', false: 'ads'},
+  cacheTime = 5;
 
 /**
  * Future data:
@@ -73,18 +73,23 @@ const adv = {
 function adventive_(global, data) {
   validateData(data, requiredData, optionalData);
 
-  if (!hasOwn(global, 'adventive')) { global.adventive = adv; }
+  if (!hasOwn(global, 'adventive')) {
+    global.adventive = adv;
+  }
   const ns = global.adventive;
-  if (!hasOwn(ns, 'context')) { ns.context = global.context; }
+  if (!hasOwn(ns, 'context')) {
+    ns.context = global.context;
+  }
 
   if (!Object.isFrozen(ns.mode)) {
     updateMode(ns.mode, global.context.location.hostname);
   }
 
   const cb = callback.bind(this, data.pid, ns),
-      url = getUrl(global.context, data, ns);
-  url ?
-    (hasOwn(data, 'async') ? loadScript : writeScript)(global, url, cb) : cb();
+    url = getUrl(global.context, data, ns);
+  url
+    ? (hasOwn(data, 'async') ? loadScript : writeScript)(global, url, cb)
+    : cb();
 }
 
 /**
@@ -106,7 +111,9 @@ function updateMode(mode, hostname) {
  * @param {string} id
  * @param {!Object} ns
  */
-function callback(id, ns) { ns.addInstance(id); }
+function callback(id, ns) {
+  ns.addInstance(id);
+}
 
 /**
  * @param {!Object} context
@@ -117,12 +124,13 @@ function callback(id, ns) { ns.addInstance(id); }
  */
 function getUrl(context, data, ns) {
   const {mode} = ns,
-      isDev = hasOwn(data, 'isDev'),
-      sld_ = sld[!mode.dev],
-      thld_ = thld[isDev && !mode.live],
-      search = reduceSearch(ns, data.pid, data.click, context.referrer),
-      url = search ?
-        addParamsToUrl(`https://${thld_}.${sld_}.com/ad`, search) : false;
+    isDev = hasOwn(data, 'isDev'),
+    sld_ = sld[!mode.dev],
+    thld_ = thld[isDev && !mode.live],
+    search = reduceSearch(ns, data.pid, data.click, context.referrer),
+    url = search
+      ? addParamsToUrl(`https://${thld_}.${sld_}.com/ad`, search)
+      : false;
   return url;
 }
 
@@ -143,15 +151,17 @@ function reduceSearch(ns, placementId, click, referrer) {
   let isRecipeStale = true;
   if (isRecipeLoaded) {
     const info = ns.args[placementId];
-    isRecipeStale = (Date.now() - info['requestTime']) > (60 * cacheTime);
+    isRecipeStale = Date.now() - info['requestTime'] > 60 * cacheTime;
   }
   const needsRequest = !isRecipeLoaded || isRecipeStale;
 
-  return !needsRequest ? null : dict({
-    'click': click,
-    'referrer': referrer,
-    'isAmp': '1',
-    'lib': !ns.isLibLoaded ? '1' : '', // may be prefetchable via _config
-    'pid': needsRequest ? placementId : '',
-  });
+  return !needsRequest
+    ? null
+    : dict({
+        'click': click,
+        'referrer': referrer,
+        'isAmp': '1',
+        'lib': !ns.isLibLoaded ? '1' : '', // may be prefetchable via _config
+        'pid': needsRequest ? placementId : '',
+      });
 }
diff --git a/ads/adverticum.js b/ads/adverticum.js
index fcc8a57c28b3..04f20a28683d 100644
--- a/ads/adverticum.js
+++ b/ads/adverticum.js
@@ -39,5 +39,4 @@ export function adverticum(global, data) {
     document.getElementById(zoneid).appendChild(v);
   }
   writeScript(global, '//ad.adverticum.net/g3.js');
-
 }
diff --git a/ads/advertserve.js b/ads/advertserve.js
index 03e07faafd19..54d2f3f3ade5 100644
--- a/ads/advertserve.js
+++ b/ads/advertserve.js
@@ -23,12 +23,19 @@ import {validateData, writeScript} from '../3p/3p';
 export function advertserve(global, data) {
   validateData(data, [], ['zid', 'pid', 'client']);
 
-  const url = 'https://' + data.client + '.advertserve.com' +
-      '/servlet/view/banner/javascript/zone?amp=true' +
-      '&zid=' + encodeURIComponent(data.zid) +
-      '&pid=' + encodeURIComponent(data.pid) +
-      '&random=' + Math.floor(89999999 * Math.random() + 10000000) +
-      '&millis=' + Date.now();
+  const url =
+    'https://' +
+    data.client +
+    '.advertserve.com' +
+    '/servlet/view/banner/javascript/zone?amp=true' +
+    '&zid=' +
+    encodeURIComponent(data.zid) +
+    '&pid=' +
+    encodeURIComponent(data.pid) +
+    '&random=' +
+    Math.floor(89999999 * Math.random() + 10000000) +
+    '&millis=' +
+    Date.now();
 
   writeScript(global, url);
 }
diff --git a/ads/aja.js b/ads/aja.js
index 689dce615a52..d28d599c6a4f 100644
--- a/ads/aja.js
+++ b/ads/aja.js
@@ -21,7 +21,6 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function aja(global, data) {
-
   validateData(data, ['asi']);
 
   const {document} = global;
@@ -33,5 +32,4 @@ export function aja(global, data) {
   document.getElementById('c').appendChild(d);
 
   loadScript(global, 'https://cdn.as.amanad.adtdp.com/sdk/asot-amp.js');
-
 }
diff --git a/ads/alp/handler.js b/ads/alp/handler.js
index 610a944a33b1..c37966123391 100644
--- a/ads/alp/handler.js
+++ b/ads/alp/handler.js
@@ -73,8 +73,11 @@ export function handleClick(e, opt_viewerNavigate) {
 
   // Tag the original href with &amp=1 and make it a fragment param with
   // name click.
-  const fragment = 'click=' + encodeURIComponent(
-      addParamToUrl(link.a.href, 'amp', '1', /* opt_addToFront */ true));
+  const fragment =
+    'click=' +
+    encodeURIComponent(
+      addParamToUrl(link.a.href, 'amp', '1', /* opt_addToFront */ true)
+    );
   let destination = link.eventualUrl;
   if (link.eventualUrl.indexOf('#') == -1) {
     destination += '#' + fragment;
@@ -85,8 +88,9 @@ export function handleClick(e, opt_viewerNavigate) {
   const ancestors = win.location.ancestorOrigins;
   if (ancestors && ancestors[ancestors.length - 1] == 'http://localhost:8000') {
     destination = destination.replace(
-        `${parseUrlDeprecated(link.eventualUrl).host}/c/`,
-        'http://localhost:8000/max/');
+      `${parseUrlDeprecated(link.eventualUrl).host}/c/`,
+      'http://localhost:8000/max/'
+    );
   }
   e.preventDefault();
   if (opt_viewerNavigate) {
@@ -134,8 +138,10 @@ function getEventualUrl(a) {
   if (!eventualUrl) {
     return;
   }
-  if (!isProxyOrigin(eventualUrl) ||
-      !startsWith(parseUrlDeprecated(eventualUrl).pathname, '/c/')) {
+  if (
+    !isProxyOrigin(eventualUrl) ||
+    !startsWith(parseUrlDeprecated(eventualUrl).pathname, '/c/')
+  ) {
     return;
   }
   return eventualUrl;
@@ -152,9 +158,15 @@ function navigateTo(win, a, url) {
   const target = (a.target || '_top').toLowerCase();
   const a2aAncestor = getA2AAncestor(win);
   if (a2aAncestor) {
-    a2aAncestor.win./*OK*/postMessage('a2a;' + JSON.stringify(dict({
-      'url': url,
-    })), a2aAncestor.origin);
+    a2aAncestor.win./*OK*/ postMessage(
+      'a2a;' +
+        JSON.stringify(
+          dict({
+            'url': url,
+          })
+        ),
+      a2aAncestor.origin
+    );
     return;
   }
   openWindowDialog(win, url, target);
@@ -171,7 +183,7 @@ export function warmupStatic(win) {
   // preconnects.
   new win.Image().src = `${urls.cdn}/preconnect.gif`;
   // Preload the primary AMP JS that is render blocking.
-  const linkRel = /*OK*/document.createElement('link');
+  const linkRel = /*OK*/ document.createElement('link');
   linkRel.rel = 'preload';
   linkRel.setAttribute('as', 'script');
   linkRel.href = `${urls.cdn}/v0.js`;
@@ -192,10 +204,10 @@ export function warmupDynamic(e) {
   // Preloading with empty as and newly specced value `fetch` meaning the same
   // thing. `document` would be the right value, but this is not yet supported
   // in browsers.
-  const linkRel0 = /*OK*/document.createElement('link');
+  const linkRel0 = /*OK*/ document.createElement('link');
   linkRel0.rel = 'preload';
   linkRel0.href = link.eventualUrl;
-  const linkRel1 = /*OK*/document.createElement('link');
+  const linkRel1 = /*OK*/ document.createElement('link');
   linkRel1.rel = 'preload';
   linkRel1.as = 'fetch';
   linkRel1.href = link.eventualUrl;
diff --git a/ads/aniview.js b/ads/aniview.js
index 85d3dc92f97b..fe19f0766f70 100644
--- a/ads/aniview.js
+++ b/ads/aniview.js
@@ -21,14 +21,10 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function aniview(global, data) {
-  const requiredParams = [
-    'publisherid',
-    'channelid',
-  ];
+  const requiredParams = ['publisherid', 'channelid'];
   validateData(data, requiredParams);
   global.avampdata = data;
   const scpdomain = data.scriptdomain || 'player.aniview.com';
   const scpurl = 'https://' + scpdomain + '/script/6.1/ampaniview.js';
   writeScript(global, scpurl);
-
 }
diff --git a/ads/appnexus.js b/ads/appnexus.js
index 8fa22599904d..508c59b820cc 100644
--- a/ads/appnexus.js
+++ b/ads/appnexus.js
@@ -56,7 +56,6 @@ export function appnexus(global, data) {
   }
 
   appnexusAst(global, data);
-
 }
 
 /**
@@ -66,7 +65,8 @@ export function appnexus(global, data) {
 function appnexusAst(global, data) {
   validateData(data, ['adUnits']);
   let apntag;
-  if (context.isMaster) { // in case we are in the master iframe, we load AST
+  if (context.isMaster) {
+    // in case we are in the master iframe, we load AST
     context.master.apntag = context.master.apntag || {};
     context.master.apntag.anq = context.master.apntag.anq || [];
     apntag = context.master.apntag;
@@ -83,7 +83,6 @@ function appnexusAst(global, data) {
       data.adUnits.forEach(adUnit => {
         apntag.defineTag(adUnit);
       });
-
     });
     loadScript(global, APPNEXUS_AST_URL, () => {
       apntag.anq.push(() => {
diff --git a/ads/appvador.js b/ads/appvador.js
index 5bd056f55a15..271f3abbddff 100644
--- a/ads/appvador.js
+++ b/ads/appvador.js
@@ -28,14 +28,19 @@ export function appvador(global, data) {
   apvDiv.setAttribute('id', 'apvad-' + data.id);
   container.appendChild(apvDiv);
 
-  const scriptUrl = data.customScriptSrc ? data.customScriptSrc :
-    'https://cdn.apvdr.com/js/' +
-    (data.jsType ? encodeURIComponent(data.jsType) : 'VastAdUnit') +
-    '.min.js';
-  const apvScript = 'new APV.' +
+  const scriptUrl = data.customScriptSrc
+    ? data.customScriptSrc
+    : 'https://cdn.apvdr.com/js/' +
+      (data.jsType ? encodeURIComponent(data.jsType) : 'VastAdUnit') +
+      '.min.js';
+  const apvScript =
+    'new APV.' +
     (data.jsType ? data.jsType : 'VASTAdUnit') +
-    '({s:"' + data.id + '",isAmpAd:true' +
-    (data.options ? (',' + data.options) : '') + '}).load();';
+    '({s:"' +
+    data.id +
+    '",isAmpAd:true' +
+    (data.options ? ',' + data.options : '') +
+    '}).load();';
 
   const cb = function() {
     const apvLoadScript = global.document.createElement('script');
diff --git a/ads/atomx.js b/ads/atomx.js
index d6fb63290890..b44185aa8f41 100644
--- a/ads/atomx.js
+++ b/ads/atomx.js
@@ -39,4 +39,3 @@ export function atomx(global, data) {
 
   writeScript(global, 'https://s.ato.mx/p.js#' + args.join('&'));
 }
-
diff --git a/ads/baidu.js b/ads/baidu.js
index 4af9a0817aa3..eecd54059af5 100644
--- a/ads/baidu.js
+++ b/ads/baidu.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
@@ -26,7 +23,11 @@ import {
 export function baidu(global, data) {
   validateData(data, ['cproid']);
 
-  const id = '_' + Math.random().toString(36).slice(2);
+  const id =
+    '_' +
+    Math.random()
+      .toString(36)
+      .slice(2);
   const container = global.document.createElement('div');
   container.id = id;
   global.document.getElementById('c').appendChild(container);
@@ -44,15 +45,15 @@ export function baidu(global, data) {
   });
 
   loadScript(
-      global,
-      'https://dup.baidustatic.com/js/dm.js',
-      () => {},
-      () => {
-        // noContentAvailable should be called,
-        // if parent iframe receives no message.
-        // setTimeout can work, but it's not that reliable.
-        // So, only the faliure of JS loading is dealed with for now.
-        global.context.noContentAvailable();
-      }
+    global,
+    'https://dup.baidustatic.com/js/dm.js',
+    () => {},
+    () => {
+      // noContentAvailable should be called,
+      // if parent iframe receives no message.
+      // setTimeout can work, but it's not that reliable.
+      // So, only the faliure of JS loading is dealed with for now.
+      global.context.noContentAvailable();
+    }
   );
 }
diff --git a/ads/bidtellect.js b/ads/bidtellect.js
index a05105db3c80..7950bbc485ec 100644
--- a/ads/bidtellect.js
+++ b/ads/bidtellect.js
@@ -33,7 +33,8 @@ export function bidtellect(global, data) {
     'videotypeid',
     'videocloseicon',
     'targetid',
-    'bustframe'];
+    'bustframe',
+  ];
   validateData(data, requiredParams, optionalParams);
   let params = '?t=' + encodeURIComponent(data.t);
   params += '&pid=' + encodeURIComponent(data.pid);
diff --git a/ads/brainy.js b/ads/brainy.js
index 15a746f28cc6..7647906f77b0 100644
--- a/ads/brainy.js
+++ b/ads/brainy.js
@@ -21,12 +21,14 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function brainy(global, data) {
-
   validateData(data, [], ['aid', 'slotId']);
 
-  const url = 'https://proparm.jp/ssp/p/js1'
-      + '?_aid=' + encodeURIComponent(data['aid'])
-      + '&amp;_slot=' + encodeURIComponent(data['slotId']);
+  const url =
+    'https://proparm.jp/ssp/p/js1' +
+    '?_aid=' +
+    encodeURIComponent(data['aid']) +
+    '&amp;_slot=' +
+    encodeURIComponent(data['slotId']);
 
   writeScript(global, url);
 }
diff --git a/ads/bringhub.js b/ads/bringhub.js
index 1cb93de7c41d..2a206aa85f66 100644
--- a/ads/bringhub.js
+++ b/ads/bringhub.js
@@ -21,14 +21,21 @@ import {loadScript, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function bringhub(global, data) {
-  (global._bringhub = global._bringhub || {
+  global._bringhub = global._bringhub || {
     viewId: global.context.pageViewId,
     htmlURL: data['htmlurl'] || global.context.canonicalUrl,
     ampURL: data['ampurl'] || global.context.sourceUrl,
     referrer: data['referrer'] || global.context.referrer,
-  });
+  };
 
-  writeScript(global, `https://static.bh-cdn.com/msf/amp-loader.js?v=${Date.now()}`, function() {
-    loadScript(global, `https://static.bh-cdn.com/msf/amp-widget.js?v=${global._bringhub.hash}`);
-  });
+  writeScript(
+    global,
+    `https://static.bh-cdn.com/msf/amp-loader.js?v=${Date.now()}`,
+    function() {
+      loadScript(
+        global,
+        `https://static.bh-cdn.com/msf/amp-widget.js?v=${global._bringhub.hash}`
+      );
+    }
+  );
 }
diff --git a/ads/broadstreetads.js b/ads/broadstreetads.js
index cf745330ae81..43942742cd08 100644
--- a/ads/broadstreetads.js
+++ b/ads/broadstreetads.js
@@ -20,11 +20,11 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Window} global
  * @param {!Object} data
  */
-export function broadstreetads(global,data) {
+export function broadstreetads(global, data) {
   validateData(
-      data,
-      ['network', 'zone', 'width', 'height'],
-      ['keywords', 'place']
+    data,
+    ['network', 'zone', 'width', 'height'],
+    ['keywords', 'place']
   );
 
   data.place = data.place || 0;
diff --git a/ads/caajainfeed.js b/ads/caajainfeed.js
index 68cd1136d2bd..ae07567aca7f 100644
--- a/ads/caajainfeed.js
+++ b/ads/caajainfeed.js
@@ -21,35 +21,33 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function caajainfeed(global, data) {
-
   validateData(
-      data,
-      [],
-      [
-        'adSpot',
-        'format',
-        'test',
-        'optout',
-        'offset',
-        'ipv4',
-        'ipv6',
-        'networkReachability',
-        'osName',
-        'osVersion',
-        'osLang',
-        'osTimezone',
-        'deviceVersion',
-        'appId',
-        'appVersion',
-        'kv',
-        'uids',
-        'template',
-        'protocol',
-        'fields',
-      ]
+    data,
+    [],
+    [
+      'adSpot',
+      'format',
+      'test',
+      'optout',
+      'offset',
+      'ipv4',
+      'ipv6',
+      'networkReachability',
+      'osName',
+      'osVersion',
+      'osLang',
+      'osTimezone',
+      'deviceVersion',
+      'appId',
+      'appVersion',
+      'kv',
+      'uids',
+      'template',
+      'protocol',
+      'fields',
+    ]
   );
 
   global.caAjaInfeedConfig = data;
   loadScript(global, 'https://cdn.amanad.adtdp.com/sdk/ajaamp.js');
-
 }
diff --git a/ads/capirs.js b/ads/capirs.js
index ebb00129edcc..085408757682 100644
--- a/ads/capirs.js
+++ b/ads/capirs.js
@@ -61,7 +61,9 @@ export function capirs(global, data) {
         const reportId = 'capirs-' + banner['banner_id'];
         global.context.reportRenderedEntityIdentifier(reportId);
       },
-      unexist: function() { global.context.noContentAvailable(); },
+      unexist: function() {
+        global.context.noContentAvailable();
+      },
     },
   };
 
@@ -78,8 +80,8 @@ function getWidth(global, banner) {
 
   if (isResponsiveAd(banner)) {
     width = Math.max(
-        global.document.documentElement./*OK*/clientWidth,
-        global.window./*OK*/innerWidth || 0
+      global.document.documentElement./*OK*/ clientWidth,
+      global.window./*OK*/ innerWidth || 0
     );
   } else {
     width = banner.width;
diff --git a/ads/caprofitx.js b/ads/caprofitx.js
index 9548ab3b09ac..759b28836622 100644
--- a/ads/caprofitx.js
+++ b/ads/caprofitx.js
@@ -21,7 +21,6 @@ import {loadScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function caprofitx(global, data) {
-
   global.caprofitxConfig = data;
   loadScript(global, 'https://cdn.caprofitx.com/tags/amp/profitx_amp.js');
 }
diff --git a/ads/cedato.js b/ads/cedato.js
index ba5bb2e12cdb..eff6ffc11f1d 100644
--- a/ads/cedato.js
+++ b/ads/cedato.js
@@ -39,8 +39,8 @@ export function cedato(global, data) {
   }
 
   const cb = Math.floor(Math.random() * 10000);
-  const domain = data.domain ||
-    parseUrlDeprecated(global.context.sourceUrl).origin;
+  const domain =
+    data.domain || parseUrlDeprecated(global.context.sourceUrl).origin;
 
   /* Create div for ad to target */
   const playerDiv = global.document.createElement('div');
@@ -50,19 +50,19 @@ export function cedato(global, data) {
     height: '100%',
   });
   const playerScript = global.document.createElement('script');
-  const servingDomain = data.servingDomain ?
-    encodeURIComponent(data.servingDomain) :
-    'algovid.com';
+  const servingDomain = data.servingDomain
+    ? encodeURIComponent(data.servingDomain)
+    : 'algovid.com';
   const srcParams = [
     'https://p.' + servingDomain + '/player/player.js',
     '?p=' + encodeURIComponent(data.id),
     '&cb=' + cb,
     '&w=' + encodeURIComponent(data.width),
     '&h=' + encodeURIComponent(data.height),
-    (data.version ? '&pv=' + encodeURIComponent(data.version) : ''),
-    (data.subid ? '&subid=' + encodeURIComponent(data.subid) : ''),
-    (domain ? '&d=' + encodeURIComponent(domain) : ''),
-    (data.extraParams || ''), // already encoded url query string
+    data.version ? '&pv=' + encodeURIComponent(data.version) : '',
+    data.subid ? '&subid=' + encodeURIComponent(data.subid) : '',
+    domain ? '&d=' + encodeURIComponent(domain) : '',
+    data.extraParams || '', // already encoded url query string
   ];
 
   playerScript.onload = () => {
diff --git a/ads/colombia.js b/ads/colombia.js
index 1f2ec93ffd8b..df7a3b32b487 100644
--- a/ads/colombia.js
+++ b/ads/colombia.js
@@ -22,8 +22,11 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function colombia(global, data) {
   validateData(data, [
-    'clmb_slot', 'clmb_position', 'clmb_section',
-    'clmb_divid', 'loadingStrategy',
+    'clmb_slot',
+    'clmb_position',
+    'clmb_section',
+    'clmb_divid',
+    'loadingStrategy',
   ]);
   // push the two object into the '_colombia' global
   (global._colombia = global._colombia || []).push({
@@ -43,5 +46,8 @@ export function colombia(global, data) {
       }
     });
   });
-  loadScript(global, 'https://static.clmbtech.com/ad/commons/js/colombia-amp.js');
+  loadScript(
+    global,
+    'https://static.clmbtech.com/ad/commons/js/colombia-amp.js'
+  );
 }
diff --git a/ads/connatix.js b/ads/connatix.js
index 271677b3c2fa..a80fc25b6e6e 100644
--- a/ads/connatix.js
+++ b/ads/connatix.js
@@ -23,7 +23,6 @@ import {validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function connatix(global, data) {
-
   validateData(data, ['connatix']);
 
   // Because 3p's loadScript does not allow for data attributes,
@@ -37,9 +36,13 @@ export function connatix(global, data) {
     }
   }
 
-  window.addEventListener('connatix_no_content', function() {
-    window.context.noContentAvailable();
-  }, false);
+  window.addEventListener(
+    'connatix_no_content',
+    function() {
+      window.context.noContentAvailable();
+    },
+    false
+  );
 
   script.onload = () => {
     global.context.renderStart();
diff --git a/ads/contentad.js b/ads/contentad.js
index e6bf8110d803..356906fca5dd 100644
--- a/ads/contentad.js
+++ b/ads/contentad.js
@@ -41,12 +41,18 @@ export function contentad(global, data) {
   }
 
   /* Build API URL */
-  const cadApi = 'https://api.content-ad.net/Scripts/widget2.aspx'
-    + '?id=' + encodeURIComponent(global.id)
-    + '&d=' + encodeURIComponent(global.d)
-    + '&wid=' + global.wid
-    + '&url=' + encodeURIComponent(sourceUrl)
-    + '&cb=' + Date.now();
+  const cadApi =
+    'https://api.content-ad.net/Scripts/widget2.aspx' +
+    '?id=' +
+    encodeURIComponent(global.id) +
+    '&d=' +
+    encodeURIComponent(global.d) +
+    '&wid=' +
+    global.wid +
+    '&url=' +
+    encodeURIComponent(sourceUrl) +
+    '&cb=' +
+    Date.now();
 
   /* Call Content.ad Widget */
   writeScript(global, cadApi);
diff --git a/ads/criteo.js b/ads/criteo.js
index e8cb79ea3f17..07442661bfa4 100644
--- a/ads/criteo.js
+++ b/ads/criteo.js
@@ -35,11 +35,17 @@ export function criteo(global, data) {
         integrationmode: 'amp',
       });
     } else if (data.tagtype === 'rta' || data.tagtype === 'standalone') {
-      dev().error(TAG, 'You are using a deprecated Criteo integration',
-          data.tagtype);
+      dev().error(
+        TAG,
+        'You are using a deprecated Criteo integration',
+        data.tagtype
+      );
     } else {
-      dev().error(TAG, 'You are using an unknown Criteo integration',
-          data.tagtype);
+      dev().error(
+        TAG,
+        'You are using an unknown Criteo integration',
+        data.tagtype
+      );
     }
   });
 }
diff --git a/ads/dable.js b/ads/dable.js
index 798b0c0d38f8..413c5b00be8a 100644
--- a/ads/dable.js
+++ b/ads/dable.js
@@ -24,11 +24,15 @@ export function dable(global, data) {
   // check required props
   validateData(data, ['widgetId']);
 
-  (global.dable = global.dable || function() {
-    (global.dable.q = global.dable.q || []).push(arguments);
-  });
-  global.dable('setService', data['serviceName'] ||
-      global.window.context.location.hostname);
+  global.dable =
+    global.dable ||
+    function() {
+      (global.dable.q = global.dable.q || []).push(arguments);
+    };
+  global.dable(
+    'setService',
+    data['serviceName'] || global.window.context.location.hostname
+  );
   global.dable('setURL', global.window.context.sourceUrl);
   global.dable('setRef', global.window.context.referrer);
 
diff --git a/ads/directadvert.js b/ads/directadvert.js
index 0e460ae8432b..d3e9f3083b54 100644
--- a/ads/directadvert.js
+++ b/ads/directadvert.js
@@ -23,13 +23,19 @@ import {loadScript, validateData} from '../3p/3p';
 export function directadvert(global, data) {
   validateData(data, ['blockId']);
 
-  const url = 'https://code.directadvert.ru/data/' +
-      encodeURIComponent(data['blockId']) + '.js?async=1&div=c';
-
-  loadScript(global, url, () => {
-    global.context.renderStart();
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  const url =
+    'https://code.directadvert.ru/data/' +
+    encodeURIComponent(data['blockId']) +
+    '.js?async=1&div=c';
 
+  loadScript(
+    global,
+    url,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/distroscale.js b/ads/distroscale.js
index d29a035cde0c..3ad830f2f4b0 100644
--- a/ads/distroscale.js
+++ b/ads/distroscale.js
@@ -40,12 +40,16 @@ export function distroscale(global, data) {
 
   src += '&f=' + encodeURIComponent(srcUrl);
 
-
   global.dsAMPCallbacks = {
     renderStart: global.context.renderStart,
     noContentAvailable: global.context.noContentAvailable,
   };
-  loadScript(global, src, () => {}, () => {
-    global.context.noContentAvailable();
-  });
+  loadScript(
+    global,
+    src,
+    () => {},
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/eadv.js b/ads/eadv.js
index a012355bfeb7..b61884465308 100644
--- a/ads/eadv.js
+++ b/ads/eadv.js
@@ -22,5 +22,8 @@ import {validateData, writeScript} from '../3p/3p';
  */
 export function eadv(global, data) {
   validateData(data, ['x', 'u'], []);
-  writeScript(global, 'https://www.eadv.it/track/?x=' + data.x + '&u=' + data.u);
+  writeScript(
+    global,
+    'https://www.eadv.it/track/?x=' + data.x + '&u=' + data.u
+  );
 }
diff --git a/ads/engageya.js b/ads/engageya.js
index 2197a46e48c4..8a8864b86695 100644
--- a/ads/engageya.js
+++ b/ads/engageya.js
@@ -21,10 +21,9 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function engageya(global, data) {
-
   validateData(data, ['widgetids']);
 
-  (global._engageya = global._engageya || {
+  global._engageya = global._engageya || {
     viewId: global.context.pageViewId,
     widgetIds: data['widgetids'],
     websiteId: data['websiteid'],
@@ -34,7 +33,7 @@ export function engageya(global, data) {
     mode: data['mode'] || 1,
     style: data['stylecss'] || '',
     referrer: global.context.referrer,
-  });
+  };
 
   loadScript(global, 'https://widget.engageya.com/engageya_amp_loader.js');
 }
diff --git a/ads/epeex.js b/ads/epeex.js
index 503049748ed9..160d3023d88f 100644
--- a/ads/epeex.js
+++ b/ads/epeex.js
@@ -21,14 +21,13 @@ import {loadScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function epeex(global, data) {
-
-  (global._epeex = global._epeex || {
+  global._epeex = global._epeex || {
     account: data['account'] || 'demoepeex',
     channel: data['channel'] || '1',
     htmlURL: data['htmlurl'] || encodeURIComponent(global.context.canonicalUrl),
     ampURL: data['ampurl'] || encodeURIComponent(global.context.sourceUrl),
     testMode: data['testmode'] || 'false',
-  });
+  };
 
   // load the epeex AMP remote js file
   loadScript(global, 'https://epeex.com/related/service/widget/amp/remote.js');
diff --git a/ads/eplanning.js b/ads/eplanning.js
index 04972711af23..7c50740779e1 100644
--- a/ads/eplanning.js
+++ b/ads/eplanning.js
@@ -22,7 +22,12 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function eplanning(global, data) {
   validateData(data, [
-    'epl_si', 'epl_isv', 'epl_sv', 'epl_sec', 'epl_kvs', 'epl_e',
+    'epl_si',
+    'epl_isv',
+    'epl_sv',
+    'epl_sec',
+    'epl_kvs',
+    'epl_e',
   ]);
   // push the two object into the '_eplanning' global
   (global._eplanning = global._eplanning || []).push({
diff --git a/ads/ezoic.js b/ads/ezoic.js
index 9f44b12aa291..f783c5777917 100644
--- a/ads/ezoic.js
+++ b/ads/ezoic.js
@@ -22,12 +22,16 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function ezoic(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [], ['slot','targeting','extras']);
+  validateData(data, [], ['slot', 'targeting', 'extras']);
   loadScript(global, 'https://g.ezoic.net/ezoic/ampad.js', () => {
-    loadScript(global, 'https://www.googletagservices.com/tag/js/gpt.js', () => {
-      global.googletag.cmd.push(() => {
-        new window.EzoicAmpAd(global,data).createAd();
-      });
-    });
+    loadScript(
+      global,
+      'https://www.googletagservices.com/tag/js/gpt.js',
+      () => {
+        global.googletag.cmd.push(() => {
+          new window.EzoicAmpAd(global, data).createAd();
+        });
+      }
+    );
   });
 }
diff --git a/ads/f1e.js b/ads/f1e.js
index 180ab3d69f4e..74fe9db6983d 100644
--- a/ads/f1e.js
+++ b/ads/f1e.js
@@ -21,7 +21,7 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function f1e(global, data) {
-  validateData(data, ['url','target'], []);
+  validateData(data, ['url', 'target'], []);
   global.f1eData = data;
   writeScript(global, 'https://img.ak.impact-ad.jp/util/f1e_amp.min.js');
 }
diff --git a/ads/f1h.js b/ads/f1h.js
index 0c38b485d6ba..942219b53faa 100644
--- a/ads/f1h.js
+++ b/ads/f1h.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
@@ -27,9 +24,8 @@ export function f1h(global, data) {
   validateData(data, ['sectionId', 'slot']);
 
   const scriptUrl =
-      data['debugsrc'] || 'https://img.ak.impact-ad.jp/fh/f1h_amp.js';
+    data['debugsrc'] || 'https://img.ak.impact-ad.jp/fh/f1h_amp.js';
 
   global.f1hData = data;
   loadScript(global, scriptUrl);
 }
-
diff --git a/ads/felmat.js b/ads/felmat.js
index dc7532c0833c..2bce7bf1ee79 100644
--- a/ads/felmat.js
+++ b/ads/felmat.js
@@ -23,5 +23,8 @@ import {validateData, writeScript} from '../3p/3p';
 export function felmat(global, data) {
   validateData(data, ['host', 'fmt', 'fmk', 'fmp']);
   global.fmParam = data;
-  writeScript(global, 'https://t.' + encodeURIComponent(data.host) + '/js/fmamp.js');
+  writeScript(
+    global,
+    'https://t.' + encodeURIComponent(data.host) + '/js/fmamp.js'
+  );
 }
diff --git a/ads/flite.js b/ads/flite.js
index 602842d3001f..95fbfbd91e4e 100644
--- a/ads/flite.js
+++ b/ads/flite.js
@@ -22,19 +22,34 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function flite(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [], ['guid','mixins']);
-  const {guid} = data, o = global, e = encodeURIComponent, x = 0;
-  let r = '', dep = '';
+  validateData(data, [], ['guid', 'mixins']);
+  const {guid} = data,
+    o = global,
+    e = encodeURIComponent,
+    x = 0;
+  let r = '',
+    dep = '';
   o.FLITE = o.FLITE || {};
   o.FLITE.config = o.FLITE.config || {};
   o.FLITE.config[guid] = o.FLITE.config[guid] || {};
   o.FLITE.config[guid].cb = Math.random();
-  o.FLITE.config[guid].ts = (+Number(new Date()));
+  o.FLITE.config[guid].ts = +Number(new Date());
   r = global.context.location.href;
   const m = r.match(new RegExp('[A-Za-z]+:[/][/][A-Za-z0-9.-]+'));
   dep = data.mixins ? '&dep=' + data.mixins : '';
-  const url = ['https://r.flite.com/syndication/uscript.js?i=',e(guid),
-    '&v=3',dep,'&x=us',x,'&cb=',o.FLITE.config[guid].cb,'&d=',
-    e((m && m[0]) || r), '&tz=', (new Date()).getTimezoneOffset()].join('');
+  const url = [
+    'https://r.flite.com/syndication/uscript.js?i=',
+    e(guid),
+    '&v=3',
+    dep,
+    '&x=us',
+    x,
+    '&cb=',
+    o.FLITE.config[guid].cb,
+    '&d=',
+    e((m && m[0]) || r),
+    '&tz=',
+    new Date().getTimezoneOffset(),
+  ].join('');
   loadScript(o, url);
 }
diff --git a/ads/fluct.js b/ads/fluct.js
index 4b0ddd7839a4..45863b78cc8a 100644
--- a/ads/fluct.js
+++ b/ads/fluct.js
@@ -24,9 +24,11 @@ import {validateData, writeScript} from '../3p/3p';
  */
 export function fluct(global, data) {
   validateData(data, ['g', 'u']);
-  writeScript(global,
-      `https://cdn-fluct.sh.adingo.jp/f.js?G=${encodeURIComponent(data['g'])}`,
-      function() {
-        adingoFluct.showAd(data['u']);
-      });
+  writeScript(
+    global,
+    `https://cdn-fluct.sh.adingo.jp/f.js?G=${encodeURIComponent(data['g'])}`,
+    function() {
+      adingoFluct.showAd(data['u']);
+    }
+  );
 }
diff --git a/ads/freewheel.js b/ads/freewheel.js
index f08d7dc92b4b..b0e0757ab56a 100644
--- a/ads/freewheel.js
+++ b/ads/freewheel.js
@@ -27,11 +27,25 @@ export function freewheel(global, data) {
   };
 
   validateData(
-      data,
-      ['zone'],
-      ['zone','gdpr','gdpr_consent','useCMP','zIndex','blurDisplay',
-        'timeline','soundButton','defaultMute','onOver','closeAction',
-        'errorAction','pauseRatio','label','vastUrlParams']
+    data,
+    ['zone'],
+    [
+      'zone',
+      'gdpr',
+      'gdpr_consent',
+      'useCMP',
+      'zIndex',
+      'blurDisplay',
+      'timeline',
+      'soundButton',
+      'defaultMute',
+      'onOver',
+      'closeAction',
+      'errorAction',
+      'pauseRatio',
+      'label',
+      'vastUrlParams',
+    ]
   );
 
   loadScript(global, 'https://cdn.stickyadstv.com/prime-time/fw-amp.min.js');
diff --git a/ads/fusion.js b/ads/fusion.js
index 5c3842281925..3c2bda914f72 100644
--- a/ads/fusion.js
+++ b/ads/fusion.js
@@ -24,10 +24,13 @@ function queryParametersToObject(input) {
   if (!input) {
     return undefined;
   }
-  return input.split('&').filter(_ => _).reduce((obj, val) => {
-    const kv = val.split('=');
-    return Object.assign(obj, {[kv[0]]: kv[1] || true});
-  }, {});
+  return input
+    .split('&')
+    .filter(_ => _)
+    .reduce((obj, val) => {
+      const kv = val.split('=');
+      return Object.assign(obj, {[kv[0]]: kv[1] || true});
+    }, {});
 }
 
 /**
@@ -35,8 +38,11 @@ function queryParametersToObject(input) {
  * @param {!Object} data
  */
 export function fusion(global, data) {
-  validateData(data, [],
-      ['mediaZone', 'layout', 'adServer', 'space', 'parameters']);
+  validateData(
+    data,
+    [],
+    ['mediaZone', 'layout', 'adServer', 'space', 'parameters']
+  );
 
   const container = global.document.getElementById('c');
   const ad = global.document.createElement('div');
@@ -44,14 +50,17 @@ export function fusion(global, data) {
   container.appendChild(ad);
   const parameters = queryParametersToObject(data.parameters);
 
-  writeScript(global,
-      'https://assets.adtomafusion.net/fusion/latest/fusion-amp.min.js', () => {
-        global.Fusion.apply(container, global.Fusion.loadAds(data, parameters));
+  writeScript(
+    global,
+    'https://assets.adtomafusion.net/fusion/latest/fusion-amp.min.js',
+    () => {
+      global.Fusion.apply(container, global.Fusion.loadAds(data, parameters));
 
-        global.Fusion.on.warning.run(ev => {
-          if (ev.msg === 'Space not present in response.') {
-            global.context.noContentAvailable();
-          }
-        });
+      global.Fusion.on.warning.run(ev => {
+        if (ev.msg === 'Space not present in response.') {
+          global.context.noContentAvailable();
+        }
       });
+    }
+  );
 }
diff --git a/ads/giraff.js b/ads/giraff.js
index 160a0a3e4250..4f317f3ffaa2 100644
--- a/ads/giraff.js
+++ b/ads/giraff.js
@@ -24,18 +24,26 @@ export function giraff(global, data) {
   validateData(data, ['blockName']);
 
   const serverName = data['serverName'] || 'code.giraff.io';
-  const url = '//' + encodeURIComponent(serverName) + '/data/widget-' +
-      encodeURIComponent(data['blockName']) + '.js';
+  const url =
+    '//' +
+    encodeURIComponent(serverName) +
+    '/data/widget-' +
+    encodeURIComponent(data['blockName']) +
+    '.js';
 
-  loadScript(global, url, () => {
-    global.context.renderStart();
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  loadScript(
+    global,
+    url,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 
   const anchorEl = global.document.createElement('div');
   const widgetId = data['widgetId'] ? '_' + data['widgetId'] : '';
   anchorEl.id = 'grf_' + data['blockName'] + widgetId;
   global.document.getElementById('c').appendChild(anchorEl);
-
 }
diff --git a/ads/google/a4a/experiment-utils.js b/ads/google/a4a/experiment-utils.js
index ba8a264bbd8a..1bf47146d353 100644
--- a/ads/google/a4a/experiment-utils.js
+++ b/ads/google/a4a/experiment-utils.js
@@ -20,9 +20,7 @@ import {
   getExperimentBranch,
   randomlySelectUnsetExperiments,
 } from '../../../src/experiments';
-import {
-  addExperimentIdToElement,
-} from './traffic-experiments';
+import {addExperimentIdToElement} from './traffic-experiments';
 
 /**
  * Attempts to select into experiment and forces branch if selected.
@@ -33,12 +31,23 @@ import {
  * @param {boolean=} optAddExpIdToElement
  */
 export function selectAndSetExperiments(
-  win, element, branches, expName, optAddExpIdToElement) {
+  win,
+  element,
+  branches,
+  expName,
+  optAddExpIdToElement
+) {
   const experimentId = expUtils.maybeSelectExperiment(
-      win, element, branches, expName);
+    win,
+    element,
+    branches,
+    expName
+  );
   if (!!experimentId) {
-    addExperimentIdToElement(optAddExpIdToElement ?
-      experimentId : undefined, element);
+    addExperimentIdToElement(
+      optAddExpIdToElement ? experimentId : undefined,
+      element
+    );
     forceExperimentBranch(win, expName, experimentId);
   }
   return experimentId;
@@ -51,10 +60,8 @@ export class ExperimentUtils {
    * @param {!Array<string>} selectionBranches
    * @param {string} experimentName
    */
-  maybeSelectExperiment(
-    win, element, selectionBranches, experimentName) {
-    const experimentInfoMap =
-    /** @type {!Object<string, !ExperimentInfo>} */ ({});
+  maybeSelectExperiment(win, element, selectionBranches, experimentName) {
+    const experimentInfoMap = /** @type {!Object<string, !ExperimentInfo>} */ ({});
     experimentInfoMap[experimentName] = {
       isTrafficEligible: () => true,
       branches: selectionBranches,
@@ -67,5 +74,5 @@ export class ExperimentUtils {
 /**
  * ExperimentUtils singleton.
  * @type {!ExperimentUtils}
-*/
+ */
 const expUtils = new ExperimentUtils();
diff --git a/ads/google/a4a/line-delimited-response-handler.js b/ads/google/a4a/line-delimited-response-handler.js
index df5ccaf09a23..99f35ef9c332 100644
--- a/ads/google/a4a/line-delimited-response-handler.js
+++ b/ads/google/a4a/line-delimited-response-handler.js
@@ -17,13 +17,13 @@
 import {tryParseJson} from '../../../src/json';
 
 /**
-  * Handles an XHR response by calling lineCallback for each line delineation.
-  * Uses streaming where possible otherwise falls back to text.
-  * @param {!Window} win
-  * @param {!Response} response
-  * @param {function(string, boolean)} lineCallback
-  * @private
-  */
+ * Handles an XHR response by calling lineCallback for each line delineation.
+ * Uses streaming where possible otherwise falls back to text.
+ * @param {!Window} win
+ * @param {!Response} response
+ * @param {function(string, boolean)} lineCallback
+ * @private
+ */
 export function lineDelimitedStreamer(win, response, lineCallback) {
   let line = '';
   /**
@@ -50,14 +50,15 @@ export function lineDelimitedStreamer(win, response, lineCallback) {
   }
 
   const decoder = new TextDecoder('utf-8');
-  const reader = /** @type !ReadableStreamDefaultReader */ (
-    response.body.getReader());
+  const reader = /** @type {!ReadableStreamDefaultReader} */ (response.body.getReader());
   reader.read().then(function chunk(result) {
     if (result.value) {
       streamer(
-          decoder.decode(
-              /** @type {!ArrayBuffer} */(result.value), {'stream': true}),
-          result.done);
+        decoder.decode(/** @type {!ArrayBuffer} */ (result.value), {
+          'stream': true,
+        }),
+        result.done
+      );
     }
     if (!result.done) {
       // More chunks to read.
@@ -67,22 +68,21 @@ export function lineDelimitedStreamer(win, response, lineCallback) {
 }
 
 /**
-  * Given each line, groups such that the first is JSON parsed and second
-  * html unescaped.
-  * @param {function(string, !Object<string, *>, boolean)} callback
-  * @private
-  */
+ * Given each line, groups such that the first is JSON parsed and second
+ * html unescaped.
+ * @param {function(string, !Object<string, *>, boolean)} callback
+ * @private
+ */
 export function metaJsonCreativeGrouper(callback) {
   let first;
   return function(line, done) {
     if (first) {
       const metadata =
-      /** @type {!Object<string, *>} */(tryParseJson(first) || {});
-      const lowerCasedMetadata =
-          Object.keys(metadata).reduce((newObj, key) => {
-            newObj[key.toLowerCase()] = metadata[key];
-            return newObj;
-          }, {});
+        /** @type {!Object<string, *>} */ (tryParseJson(first) || {});
+      const lowerCasedMetadata = Object.keys(metadata).reduce((newObj, key) => {
+        newObj[key.toLowerCase()] = metadata[key];
+        return newObj;
+      }, {});
       callback(unescapeLineDelimitedHtml_(line), lowerCasedMetadata, done);
       first = null;
     } else {
@@ -92,13 +92,13 @@ export function metaJsonCreativeGrouper(callback) {
 }
 
 /**
-  * Unescapes characters that are escaped in line-delimited JSON-HTML.
-  * @param {string} html An html snippet.
-  * @return {string}
-  * @private
-  */
+ * Unescapes characters that are escaped in line-delimited JSON-HTML.
+ * @param {string} html An html snippet.
+ * @return {string}
+ * @private
+ */
 function unescapeLineDelimitedHtml_(html) {
-  return html.replace(
-      /\\(n|r|\\)/g,
-      (_, match) => match == 'n' ? '\n' : match == 'r' ? '\r' : '\\');
+  return html.replace(/\\(n|r|\\)/g, (_, match) =>
+    match == 'n' ? '\n' : match == 'r' ? '\r' : '\\'
+  );
 }
diff --git a/ads/google/a4a/shared/content-recommendation.js b/ads/google/a4a/shared/content-recommendation.js
index d6f23e60a1c4..e5b85c7dc3b4 100644
--- a/ads/google/a4a/shared/content-recommendation.js
+++ b/ads/google/a4a/shared/content-recommendation.js
@@ -130,10 +130,11 @@ const LAYOUT_AD_WIDTH_MAP = {
 
 const PUB_CONTROL_LAYOUT_PREFIX = 'pub_control_';
 
-const PUB_CONTROL_EXAMPLE = '\n ' +
-  'data-matched-content-rows-num=\"4,2\"\n' +
-  'data-matched-content-columns-num=\"1,6\"\n' +
-  'data-matched-content-ui-type=\"image_stacked,image_card_sidebyside\"';
+const PUB_CONTROL_EXAMPLE =
+  '\n ' +
+  'data-matched-content-rows-num="4,2"\n' +
+  'data-matched-content-columns-num="1,6"\n' +
+  'data-matched-content-ui-type="image_stacked,image_card_sidebyside"';
 
 /**
  * Configuration of content recommendation unit for current slot. This is the
@@ -141,7 +142,8 @@ const PUB_CONTROL_EXAMPLE = '\n ' +
  * will be used in ad request.
  * @record
  */
-export class CoReConfig { // eslint-disable-line no-unused-vars
+export class CoReConfig {
+  // eslint-disable-line no-unused-vars
   /** see comment on class */
   constructor() {
     /** @const {number} */
@@ -195,7 +197,11 @@ export function getAutoConfig(availableWidth, isMobile) {
       const numColumns = 1;
       const numRows = 12;
       const slotSize = getLargerAdOneColumnSidebysideSize(
-          availableWidth, layoutType, numColumns, numRows);
+        availableWidth,
+        layoutType,
+        numColumns,
+        numRows
+      );
       return {
         slotWidth: slotSize.width,
         slotHeight: slotSize.height,
@@ -260,8 +266,10 @@ export function getPubControlConfig(availableWidth, rawPubControlParams) {
   }
 
   let index;
-  if (pubParams.layoutTypes.length === 2 &&
-    availableWidth >= MIN_PUB_CONTROL_WIDTH_OF_DESKTOP) {
+  if (
+    pubParams.layoutTypes.length === 2 &&
+    availableWidth >= MIN_PUB_CONTROL_WIDTH_OF_DESKTOP
+  ) {
     // Publisher provided settings for both mobile and desktop and screen is
     // wide - use desktop.
     index = 1;
@@ -273,11 +281,18 @@ export function getPubControlConfig(availableWidth, rawPubControlParams) {
 
   const layout = convertToPubControlLayoutType(pubParams.layoutTypes[index]);
   const numColumns = getOptimizedNumColumns(
-      availableWidth, pubParams.numberOfColumns[index], layout);
+    availableWidth,
+    pubParams.numberOfColumns[index],
+    layout
+  );
   const numRows = pubParams.numberOfRows[index];
 
-  const slotSize =
-    getPubControlSlotSize(availableWidth, numColumns, numRows, layout);
+  const slotSize = getPubControlSlotSize(
+    availableWidth,
+    numColumns,
+    numRows,
+    layout
+  );
   if (slotSize.sizeError) {
     return {
       slotWidth: 0,
@@ -323,24 +338,28 @@ function validateAndParsePubControlParams(params) {
   if (numberOfPubControlParams < 3) {
     return {
       validationError: `Tags ${ExternalCorePubVars.UI_TYPE}, ${
-        ExternalCorePubVars.COLUMNS_NUM} and ${
-        ExternalCorePubVars.ROWS_NUM} should be set together.`,
+        ExternalCorePubVars.COLUMNS_NUM
+      } and ${ExternalCorePubVars.ROWS_NUM} should be set together.`,
     };
   }
 
   const /** !Array<!LayoutType> */ layoutTypes = params.layoutType.split(',');
   const /** !Array<string> */ numberOfRows = params.numberOfRows.split(',');
-  const /** !Array<string> */ numberOfColumns =
-    params.numberOfColumns.split(',');
+  const /** !Array<string> */ numberOfColumns = params.numberOfColumns.split(
+      ','
+    );
 
   // Check all params have same length.
-  if (layoutTypes.length !== numberOfRows.length ||
-    layoutTypes.length !== numberOfColumns.length) {
+  if (
+    layoutTypes.length !== numberOfRows.length ||
+    layoutTypes.length !== numberOfColumns.length
+  ) {
     return {
       validationError: `Lengths of parameters ${ExternalCorePubVars.UI_TYPE}, ${
-        ExternalCorePubVars.COLUMNS_NUM} and ${
-        ExternalCorePubVars.ROWS_NUM} must match. Example: ${
-        PUB_CONTROL_EXAMPLE}`,
+        ExternalCorePubVars.COLUMNS_NUM
+      } and ${
+        ExternalCorePubVars.ROWS_NUM
+      } must match. Example: ${PUB_CONTROL_EXAMPLE}`,
     };
   }
 
@@ -348,12 +367,14 @@ function validateAndParsePubControlParams(params) {
     return {
       validationError:
         `The parameter length of attribute ${ExternalCorePubVars.UI_TYPE}, ${
-          ExternalCorePubVars.COLUMNS_NUM} and ${
-          ExternalCorePubVars
-              .ROWS_NUM} is too long. At most 2 parameters for each ` +
+          ExternalCorePubVars.COLUMNS_NUM
+        } and ${
+          ExternalCorePubVars.ROWS_NUM
+        } is too long. At most 2 parameters for each ` +
         'attribute are needed: one for mobile and one for desktop, while ' +
-        `you are providing ${layoutTypes.length} parameters. Example: ${
-          PUB_CONTROL_EXAMPLE}.`,
+        `you are providing ${
+          layoutTypes.length
+        } parameters. Example: ${PUB_CONTROL_EXAMPLE}.`,
     };
   }
 
@@ -364,7 +385,8 @@ function validateAndParsePubControlParams(params) {
     if (isNaN(row) || row === 0) {
       return {
         validationError: `Wrong value '${numberOfRows[i]}' for ${
-          ExternalCorePubVars.ROWS_NUM}.`,
+          ExternalCorePubVars.ROWS_NUM
+        }.`,
       };
     }
     numberOfRowsAsNumbers.push(row);
@@ -372,7 +394,8 @@ function validateAndParsePubControlParams(params) {
     if (isNaN(col) || col === 0) {
       return {
         validationError: `Wrong value '${numberOfColumns[i]}' for ${
-          ExternalCorePubVars.COLUMNS_NUM}.`,
+          ExternalCorePubVars.COLUMNS_NUM
+        }.`,
       };
     }
     numberOfColumnsAsNumbers.push(col);
@@ -409,8 +432,9 @@ function getAutoSlotSize(availableWidth) {
  * @return {number}
  */
 function getAdHeight(adWidth, layout) {
-  return adWidth * LAYOUT_ASPECT_RATIO_MAP[layout] +
-    LAYOUT_TEXT_HEIGHT_MAP[layout];
+  return (
+    adWidth * LAYOUT_ASPECT_RATIO_MAP[layout] + LAYOUT_TEXT_HEIGHT_MAP[layout]
+  );
 }
 
 /**
@@ -470,7 +494,6 @@ function getPubControlSlotSize(slotWidth, numColumns, numRows, layout) {
   return {width: slotWidth, height: slotHeight};
 }
 
-
 /**
  * @param {number} availableWidth
  * @param {!LayoutType} layoutType
@@ -479,7 +502,11 @@ function getPubControlSlotSize(slotWidth, numColumns, numRows, layout) {
  * @return {{width: number, height: number}}
  */
 function getLargerAdOneColumnSidebysideSize(
-  availableWidth, layoutType, numColumns, numRows) {
+  availableWidth,
+  layoutType,
+  numColumns,
+  numRows
+) {
   const adWidth = getAdWidth(availableWidth, numColumns);
   // The title height of first ad slot 70px, should be consistent with what we
   // define in rendering js.
@@ -498,9 +525,9 @@ function getLargerAdOneColumnSidebysideSize(
  * @return {!LayoutType} the new layout name with 'pub_control_' prefix.
  */
 function convertToPubControlLayoutType(layout) {
-  return layout.indexOf(PUB_CONTROL_LAYOUT_PREFIX) === 0 ?
-    layout :
-    /** @type {!LayoutType} */ (PUB_CONTROL_LAYOUT_PREFIX + layout);
+  return layout.indexOf(PUB_CONTROL_LAYOUT_PREFIX) === 0
+    ? layout
+    : /** @type {!LayoutType} */ (PUB_CONTROL_LAYOUT_PREFIX + layout);
 }
 
 /**
@@ -517,8 +544,10 @@ function convertToPubControlLayoutType(layout) {
 function getOptimizedNumColumns(availableWidth, numColumns, layout) {
   const minWidth = LAYOUT_AD_WIDTH_MAP[layout];
   let optimizedNumColumns = numColumns;
-  while (availableWidth / optimizedNumColumns < minWidth &&
-  optimizedNumColumns > 1) {
+  while (
+    availableWidth / optimizedNumColumns < minWidth &&
+    optimizedNumColumns > 1
+  ) {
     optimizedNumColumns--;
   }
   return optimizedNumColumns;
diff --git a/ads/google/a4a/shared/test/test-content-recommendation.js b/ads/google/a4a/shared/test/test-content-recommendation.js
index 88f4f04b8359..22594acdf895 100644
--- a/ads/google/a4a/shared/test/test-content-recommendation.js
+++ b/ads/google/a4a/shared/test/test-content-recommendation.js
@@ -23,106 +23,147 @@ import {
 describe('getAutoConfig', function() {
   it('should use image_stacked on wide slots', function() {
     const runTest = (availableWidth, expectedWidth, expectedHeight) => {
-      expect(getAutoConfig(availableWidth, /* isMobile= */ false))
-          .to.deep.equal({
-            layoutType: LayoutType.IMAGE_STACKED,
-            numberOfColumns: 4,
-            numberOfRows: 2,
-            slotWidth: expectedWidth,
-            slotHeight: expectedHeight,
-          });
+      expect(
+        getAutoConfig(availableWidth, /* isMobile= */ false)
+      ).to.deep.equal({
+        layoutType: LayoutType.IMAGE_STACKED,
+        numberOfColumns: 4,
+        numberOfRows: 2,
+        slotWidth: expectedWidth,
+        slotHeight: expectedHeight,
+      });
     };
     runTest(
-        /* availableWidth= */ 1440, /* expectedWidth= */ 1200,
-        /* expectedHeight= */ 600);
+      /* availableWidth= */ 1440,
+      /* expectedWidth= */ 1200,
+      /* expectedHeight= */ 600
+    );
     runTest(
-        /* availableWidth= */ 1200, /* expectedWidth= */ 1200,
-        /* expectedHeight= */ 600);
+      /* availableWidth= */ 1200,
+      /* expectedWidth= */ 1200,
+      /* expectedHeight= */ 600
+    );
     runTest(
-        /* availableWidth= */ 800, /* expectedWidth= */ 800,
-        /* expectedHeight= */ 480);
+      /* availableWidth= */ 800,
+      /* expectedWidth= */ 800,
+      /* expectedHeight= */ 480
+    );
     runTest(
-        /* availableWidth= */ 500, /* expectedWidth= */ 500,
-        /* expectedHeight= */ 350);
+      /* availableWidth= */ 500,
+      /* expectedWidth= */ 500,
+      /* expectedHeight= */ 350
+    );
     runTest(
-        /* availableWidth= */ 468, /* expectedWidth= */ 468,
-        /* expectedHeight= */ 327);
+      /* availableWidth= */ 468,
+      /* expectedWidth= */ 468,
+      /* expectedHeight= */ 327
+    );
   });
 
-  it('should use mobile_banner_image_sidebyside on narrow slots on mobile',
-      function() {
-        const runTest = (availableWidth, expectedWidth, expectedHeight) => {
-          expect(getAutoConfig(availableWidth, /* isMobile= */ true))
-              .to.deep.equal({
-                layoutType: LayoutType.MOBILE_BANNER_IMAGE_SIDEBYSIDE,
-                numberOfColumns: 1,
-                numberOfRows: 12,
-                slotWidth: expectedWidth,
-                slotHeight: expectedHeight,
-              });
-        };
-        runTest(
-        /* availableWidth= */ 467, /* expectedWidth= */ 467,
-            /* expectedHeight= */ 1700);
-        runTest(
-        /* availableWidth= */ 414, /* expectedWidth= */ 414,
-            /* expectedHeight= */ 1520);
-        runTest(
-        /* availableWidth= */ 360, /* expectedWidth= */ 360,
-            /* expectedHeight= */ 1336);
-        runTest(
-        /* availableWidth= */ 320, /* expectedWidth= */ 320,
-            /* expectedHeight= */ 1200);
-        runTest(
-        /* availableWidth= */ 300, /* expectedWidth= */ 300,
-            /* expectedHeight= */ 1131);
-        runTest(
-        /* availableWidth= */ 200, /* expectedWidth= */ 200,
-            /* expectedHeight= */ 791);
-        runTest(
-        /* availableWidth= */ 120, /* expectedWidth= */ 120,
-            /* expectedHeight= */ 519);
-      });
+  it('should use mobile_banner_image_sidebyside on narrow slots on mobile', function() {
+    const runTest = (availableWidth, expectedWidth, expectedHeight) => {
+      expect(getAutoConfig(availableWidth, /* isMobile= */ true)).to.deep.equal(
+        {
+          layoutType: LayoutType.MOBILE_BANNER_IMAGE_SIDEBYSIDE,
+          numberOfColumns: 1,
+          numberOfRows: 12,
+          slotWidth: expectedWidth,
+          slotHeight: expectedHeight,
+        }
+      );
+    };
+    runTest(
+      /* availableWidth= */ 467,
+      /* expectedWidth= */ 467,
+      /* expectedHeight= */ 1700
+    );
+    runTest(
+      /* availableWidth= */ 414,
+      /* expectedWidth= */ 414,
+      /* expectedHeight= */ 1520
+    );
+    runTest(
+      /* availableWidth= */ 360,
+      /* expectedWidth= */ 360,
+      /* expectedHeight= */ 1336
+    );
+    runTest(
+      /* availableWidth= */ 320,
+      /* expectedWidth= */ 320,
+      /* expectedHeight= */ 1200
+    );
+    runTest(
+      /* availableWidth= */ 300,
+      /* expectedWidth= */ 300,
+      /* expectedHeight= */ 1131
+    );
+    runTest(
+      /* availableWidth= */ 200,
+      /* expectedWidth= */ 200,
+      /* expectedHeight= */ 791
+    );
+    runTest(
+      /* availableWidth= */ 120,
+      /* expectedWidth= */ 120,
+      /* expectedHeight= */ 519
+    );
+  });
 
   it('should use image_sidebyside on narrow slots on desktop', function() {
     const runTest = (availableWidth, expectedWidth, expectedHeight) => {
-      expect(getAutoConfig(availableWidth, /* isMobile= */ false))
-          .to.deep.equal({
-            layoutType: LayoutType.IMAGE_SIDEBYSIDE,
-            numberOfColumns: 1,
-            numberOfRows: 13,
-            slotWidth: expectedWidth,
-            slotHeight: expectedHeight,
-          });
+      expect(
+        getAutoConfig(availableWidth, /* isMobile= */ false)
+      ).to.deep.equal({
+        layoutType: LayoutType.IMAGE_SIDEBYSIDE,
+        numberOfColumns: 1,
+        numberOfRows: 13,
+        slotWidth: expectedWidth,
+        slotHeight: expectedHeight,
+      });
     };
     runTest(
-        /* availableWidth= */ 467, /* expectedWidth= */ 467,
-        /* expectedHeight= */ 1606);
+      /* availableWidth= */ 467,
+      /* expectedWidth= */ 467,
+      /* expectedHeight= */ 1606
+    );
     runTest(
-        /* availableWidth= */ 414, /* expectedWidth= */ 414,
-        /* expectedHeight= */ 1424);
+      /* availableWidth= */ 414,
+      /* expectedWidth= */ 414,
+      /* expectedHeight= */ 1424
+    );
     runTest(
-        /* availableWidth= */ 360, /* expectedWidth= */ 360,
-        /* expectedHeight= */ 1238);
+      /* availableWidth= */ 360,
+      /* expectedWidth= */ 360,
+      /* expectedHeight= */ 1238
+    );
     runTest(
-        /* availableWidth= */ 320, /* expectedWidth= */ 320,
-        /* expectedHeight= */ 1100);
+      /* availableWidth= */ 320,
+      /* expectedWidth= */ 320,
+      /* expectedHeight= */ 1100
+    );
     runTest(
-        /* availableWidth= */ 300, /* expectedWidth= */ 300,
-        /* expectedHeight= */ 1032);
+      /* availableWidth= */ 300,
+      /* expectedWidth= */ 300,
+      /* expectedHeight= */ 1032
+    );
     runTest(
-        /* availableWidth= */ 250, /* expectedWidth= */ 250,
-        /* expectedHeight= */ 860);
+      /* availableWidth= */ 250,
+      /* expectedWidth= */ 250,
+      /* expectedHeight= */ 860
+    );
     runTest(
-        /* availableWidth= */ 200, /* expectedWidth= */ 200,
-        /* expectedHeight= */ 688);
+      /* availableWidth= */ 200,
+      /* expectedWidth= */ 200,
+      /* expectedHeight= */ 688
+    );
     runTest(
-        /* availableWidth= */ 120, /* expectedWidth= */ 120,
-        /* expectedHeight= */ 412);
+      /* availableWidth= */ 120,
+      /* expectedWidth= */ 120,
+      /* expectedHeight= */ 412
+    );
   });
 });
 
-
 describe('getPubControlConfig', function() {
   it('should use setting when only one provided', function() {
     const rawPubControlParams = {
@@ -131,80 +172,112 @@ describe('getPubControlConfig', function() {
       layoutType: LayoutType.IMAGE_STACKED,
     };
     const runTest = (availableWidth, expectedWidth, expectedHeight) => {
-      expect(getPubControlConfig(availableWidth, rawPubControlParams))
-          .to.deep.equal({
-            layoutType: LayoutType.PUB_CONTROL_IMAGE_STACKED,
-            numberOfColumns: 4,
-            numberOfRows: 2,
-            slotWidth: expectedWidth,
-            slotHeight: expectedHeight,
-          });
+      expect(
+        getPubControlConfig(availableWidth, rawPubControlParams)
+      ).to.deep.equal({
+        layoutType: LayoutType.PUB_CONTROL_IMAGE_STACKED,
+        numberOfColumns: 4,
+        numberOfRows: 2,
+        slotWidth: expectedWidth,
+        slotHeight: expectedHeight,
+      });
     };
     runTest(
-        /* availableWidth= */ 1300, /* expectedWidth= */ 1300,
-        /* expectedHeight= */ 513);
+      /* availableWidth= */ 1300,
+      /* expectedWidth= */ 1300,
+      /* expectedHeight= */ 513
+    );
     runTest(
-        /* availableWidth= */ 1200, /* expectedWidth= */ 1200,
-        /* expectedHeight= */ 487);
+      /* availableWidth= */ 1200,
+      /* expectedWidth= */ 1200,
+      /* expectedHeight= */ 487
+    );
     runTest(
-        /* availableWidth= */ 800, /* expectedWidth= */ 800,
-        /* expectedHeight= */ 382);
+      /* availableWidth= */ 800,
+      /* expectedWidth= */ 800,
+      /* expectedHeight= */ 382
+    );
     runTest(
-        /* availableWidth= */ 500, /* expectedWidth= */ 500,
-        /* expectedHeight= */ 304);
+      /* availableWidth= */ 500,
+      /* expectedWidth= */ 500,
+      /* expectedHeight= */ 304
+    );
     runTest(
-        /* availableWidth= */ 400, /* expectedWidth= */ 400,
-        /* expectedHeight= */ 278);
+      /* availableWidth= */ 400,
+      /* expectedWidth= */ 400,
+      /* expectedHeight= */ 278
+    );
   });
 
-  it('should use different settings for mobile and desktop when two provided',
-      function() {
-        const rawPubControlParams = {
-          numberOfColumns: '1,4',
-          numberOfRows: '3,2',
-          layoutType:
-          `${LayoutType.IMAGE_SIDEBYSIDE},${LayoutType.IMAGE_STACKED}`,
-        };
-        const expectedDesktopConfig = {
-          layoutType: LayoutType.PUB_CONTROL_IMAGE_STACKED,
-          numberOfColumns: 4,
-          numberOfRows: 2,
-        };
-        const expectedMobileConfig = {
-          layoutType: LayoutType.PUB_CONTROL_IMAGE_SIDEBYSIDE,
-          numberOfColumns: 1,
-          numberOfRows: 3,
-        };
-        const runTest =
-        (availableWidth, expectedWidth, expectedHeight, expectedConfig) => {
-          expectedConfig.slotWidth = expectedWidth;
-          expectedConfig.slotHeight = expectedHeight;
-          expect(getPubControlConfig(availableWidth, rawPubControlParams))
-              .to.deep.equal(expectedConfig);
-        };
+  it('should use different settings for mobile and desktop when two provided', function() {
+    const rawPubControlParams = {
+      numberOfColumns: '1,4',
+      numberOfRows: '3,2',
+      layoutType: `${LayoutType.IMAGE_SIDEBYSIDE},${LayoutType.IMAGE_STACKED}`,
+    };
+    const expectedDesktopConfig = {
+      layoutType: LayoutType.PUB_CONTROL_IMAGE_STACKED,
+      numberOfColumns: 4,
+      numberOfRows: 2,
+    };
+    const expectedMobileConfig = {
+      layoutType: LayoutType.PUB_CONTROL_IMAGE_SIDEBYSIDE,
+      numberOfColumns: 1,
+      numberOfRows: 3,
+    };
+    const runTest = (
+      availableWidth,
+      expectedWidth,
+      expectedHeight,
+      expectedConfig
+    ) => {
+      expectedConfig.slotWidth = expectedWidth;
+      expectedConfig.slotHeight = expectedHeight;
+      expect(
+        getPubControlConfig(availableWidth, rawPubControlParams)
+      ).to.deep.equal(expectedConfig);
+    };
 
-        // Above 468px the logic should use desktop setting.
-        runTest(
-        /* availableWidth= */ 1300, /* expectedWidth= */ 1300,
-            /* expectedHeight= */ 513, expectedDesktopConfig);
-        runTest(
-        /* availableWidth= */ 1200, /* expectedWidth= */ 1200,
-            /* expectedHeight= */ 487, expectedDesktopConfig);
-        runTest(
-        /* availableWidth= */ 800, /* expectedWidth= */ 800,
-            /* expectedHeight= */ 382, expectedDesktopConfig);
-        runTest(
-        /* availableWidth= */ 500, /* expectedWidth= */ 500,
-            /* expectedHeight= */ 304, expectedDesktopConfig);
+    // Above 468px the logic should use desktop setting.
+    runTest(
+      /* availableWidth= */ 1300,
+      /* expectedWidth= */ 1300,
+      /* expectedHeight= */ 513,
+      expectedDesktopConfig
+    );
+    runTest(
+      /* availableWidth= */ 1200,
+      /* expectedWidth= */ 1200,
+      /* expectedHeight= */ 487,
+      expectedDesktopConfig
+    );
+    runTest(
+      /* availableWidth= */ 800,
+      /* expectedWidth= */ 800,
+      /* expectedHeight= */ 382,
+      expectedDesktopConfig
+    );
+    runTest(
+      /* availableWidth= */ 500,
+      /* expectedWidth= */ 500,
+      /* expectedHeight= */ 304,
+      expectedDesktopConfig
+    );
 
-        // Below 468px the logic should use mobile setting.
-        runTest(
-        /* availableWidth= */ 400, /* expectedWidth= */ 400,
-            /* expectedHeight= */ 333, expectedMobileConfig);
-        runTest(
-        /* availableWidth= */ 300, /* expectedWidth= */ 300,
-            /* expectedHeight= */ 255, expectedMobileConfig);
-      });
+    // Below 468px the logic should use mobile setting.
+    runTest(
+      /* availableWidth= */ 400,
+      /* expectedWidth= */ 400,
+      /* expectedHeight= */ 333,
+      expectedMobileConfig
+    );
+    runTest(
+      /* availableWidth= */ 300,
+      /* expectedWidth= */ 300,
+      /* expectedHeight= */ 255,
+      expectedMobileConfig
+    );
+  });
 
   it('should return different sizes for different layouts', function() {
     // sanity check that when publisher provides different layouts we use
@@ -237,45 +310,53 @@ describe('getPubControlConfig', function() {
     };
     // One of pub control params is missing.
     runTest(
-        {numberOfRows: '1', numberOfColumns: '1'},
-        /Tags .* should be set together/);
+      {numberOfRows: '1', numberOfColumns: '1'},
+      /Tags .* should be set together/
+    );
     runTest(
-        {numberOfColumns: '1', layoutType: 'foo'},
-        /Tags .* should be set together/);
+      {numberOfColumns: '1', layoutType: 'foo'},
+      /Tags .* should be set together/
+    );
     runTest(
-        {numberOfRows: '1', layoutType: 'foo'},
-        /Tags .* should be set together/);
+      {numberOfRows: '1', layoutType: 'foo'},
+      /Tags .* should be set together/
+    );
 
     // Length of parameters doesn't match
     runTest(
-        {numberOfRows: '1', numberOfColumns: '1', layoutType: 'foo,bar'},
-        /Lengths of parameters .* must match/);
+      {numberOfRows: '1', numberOfColumns: '1', layoutType: 'foo,bar'},
+      /Lengths of parameters .* must match/
+    );
     runTest(
-        {numberOfRows: '1', numberOfColumns: '1,2', layoutType: 'foo'},
-        /Lengths of parameters .* must match/);
+      {numberOfRows: '1', numberOfColumns: '1,2', layoutType: 'foo'},
+      /Lengths of parameters .* must match/
+    );
     runTest(
-        {numberOfRows: '1,2', numberOfColumns: '1', layoutType: 'foo'},
-        /Lengths of parameters .* must match/);
+      {numberOfRows: '1,2', numberOfColumns: '1', layoutType: 'foo'},
+      /Lengths of parameters .* must match/
+    );
 
     // Length is more than 2.
     runTest(
-        {
-          numberOfRows: '1,2,3',
-          numberOfColumns: '1,2,3',
-          layoutType: 'foo,bar,baz',
-        },
-        /At most 2 parameters for each attribute are needed/);
+      {
+        numberOfRows: '1,2,3',
+        numberOfColumns: '1,2,3',
+        layoutType: 'foo,bar,baz',
+      },
+      /At most 2 parameters for each attribute are needed/
+    );
 
     // Passed non-number for rows/columns.
     runTest(
-        {numberOfRows: 'foo', numberOfColumns: '1', layoutType: 'foo'},
-        /Wrong value 'foo' for/);
+      {numberOfRows: 'foo', numberOfColumns: '1', layoutType: 'foo'},
+      /Wrong value 'foo' for/
+    );
     runTest(
-        {numberOfRows: '1', numberOfColumns: 'foo', layoutType: 'foo'},
-        /Wrong value 'foo' for/);
+      {numberOfRows: '1', numberOfColumns: 'foo', layoutType: 'foo'},
+      /Wrong value 'foo' for/
+    );
   });
 
-
   it('limits number of columns if publisher chose too many', function() {
     const rawPubControlParams = {
       numberOfColumns: '5', // want 5 columns.
diff --git a/ads/google/a4a/shared/test/test-url-builder.js b/ads/google/a4a/shared/test/test-url-builder.js
index 1904f5e24062..2c99a7300791 100644
--- a/ads/google/a4a/shared/test/test-url-builder.js
+++ b/ads/google/a4a/shared/test/test-url-builder.js
@@ -18,7 +18,8 @@ import {buildUrl} from '../url-builder';
 
 describe('buildUrl', () => {
   it('should build a simple URL', () => {
-    expect(buildUrl('https://example.com', {'key': 'value'}, Infinity))
-        .to.equal('https://example.com?key=value');
+    expect(
+      buildUrl('https://example.com', {'key': 'value'}, Infinity)
+    ).to.equal('https://example.com?key=value');
   });
 });
diff --git a/ads/google/a4a/shared/url-builder.js b/ads/google/a4a/shared/url-builder.js
index e60a04503f35..95a8e7daef35 100644
--- a/ads/google/a4a/shared/url-builder.js
+++ b/ads/google/a4a/shared/url-builder.js
@@ -29,15 +29,22 @@ export let QueryParameterDef;
  * @return {string} the fully constructed URL.
  */
 export function buildUrl(
-  baseUrl, queryParams, maxLength, opt_truncationQueryParam) {
+  baseUrl,
+  queryParams,
+  maxLength,
+  opt_truncationQueryParam
+) {
   const encodedParams = [];
   const encodedTruncationParam =
-      opt_truncationQueryParam &&
-      !(opt_truncationQueryParam.value == null ||
-      opt_truncationQueryParam.value === '') ?
-        encodeURIComponent(opt_truncationQueryParam.name) + '=' +
-      encodeURIComponent(String(opt_truncationQueryParam.value)) :
-        null;
+    opt_truncationQueryParam &&
+    !(
+      opt_truncationQueryParam.value == null ||
+      opt_truncationQueryParam.value === ''
+    )
+      ? encodeURIComponent(opt_truncationQueryParam.name) +
+        '=' +
+        encodeURIComponent(String(opt_truncationQueryParam.value))
+      : null;
   let capacity = maxLength - baseUrl.length;
   if (encodedTruncationParam) {
     capacity -= encodedTruncationParam.length + 1;
@@ -54,9 +61,9 @@ export function buildUrl(
     const fullLength = encodedNameAndSep.length + encodedValue.length + 1;
     if (fullLength > capacity) {
       const truncatedValue = encodedValue
-          .substr(0, capacity - encodedNameAndSep.length - 1)
-      // Don't end with a partially truncated escape sequence
-          .replace(/%\w?$/, '');
+        .substr(0, capacity - encodedNameAndSep.length - 1)
+        // Don't end with a partially truncated escape sequence
+        .replace(/%\w?$/, '');
       if (truncatedValue) {
         encodedParams.push(encodedNameAndSep + truncatedValue);
       }
diff --git a/ads/google/a4a/test/test-line-delimited-response-handler.js b/ads/google/a4a/test/test-line-delimited-response-handler.js
index 2742274b5eaf..029943ad6080 100644
--- a/ads/google/a4a/test/test-line-delimited-response-handler.js
+++ b/ads/google/a4a/test/test-line-delimited-response-handler.js
@@ -20,7 +20,6 @@ import {
 } from '../line-delimited-response-handler';
 
 describe('#line-delimited-response-handler', () => {
-
   let chunkHandlerStub;
   let slotData;
   let sandbox;
@@ -34,8 +33,10 @@ describe('#line-delimited-response-handler', () => {
     let slotDataString = '';
     slotData.forEach(slot => {
       // TODO: escape creative returns
-      const creative = slot.creative.replace(/\\/g, '\\\\')
-          .replace(/\n/g, '\\n').replace(/\r/g, '\\r');
+      const creative = slot.creative
+        .replace(/\\/g, '\\\\')
+        .replace(/\n/g, '\\n')
+        .replace(/\r/g, '\\r');
       slotDataString += `${JSON.stringify(slot.headers)}\n${creative}\n`;
     });
     return slotDataString;
@@ -45,7 +46,7 @@ describe('#line-delimited-response-handler', () => {
     // Streamed response calls chunk handlers after returning so need to
     // wait on chunks.
     let chunkResolver;
-    const chunkPromise = new Promise(resolver => chunkResolver = resolver);
+    const chunkPromise = new Promise(resolver => (chunkResolver = resolver));
     const chunkHandlerWrapper = (creative, metaData) => {
       chunkHandlerStub(creative, metaData);
       if (chunkHandlerStub.callCount == slotData.length) {
@@ -58,27 +59,35 @@ describe('#line-delimited-response-handler', () => {
       chunkResolver();
     }
     lineDelimitedStreamer(
-        win, response, metaJsonCreativeGrouper(chunkHandlerWrapper));
+      win,
+      response,
+      metaJsonCreativeGrouper(chunkHandlerWrapper)
+    );
     return chunkPromise.then(() => {
       expect(chunkHandlerStub.callCount).to.equal(slotData.length);
       // Could have duplicate responses so need to iterate and get counts.
       // TODO: can't use objects as keys :(
       const calls = {};
       slotData.forEach(slot => {
-        const normalizedHeaderNames =
-            Object.keys(slot.headers).map(s => [s.toLowerCase(), s]);
+        const normalizedHeaderNames = Object.keys(slot.headers).map(s => [
+          s.toLowerCase(),
+          s,
+        ]);
         slot.normalizedHeaders = {};
         normalizedHeaderNames.forEach(
-            namePair =>
-              slot.normalizedHeaders[namePair[0]] = slot.headers[namePair[1]]);
+          namePair =>
+            (slot.normalizedHeaders[namePair[0]] = slot.headers[namePair[1]])
+        );
         const key = slot.creative + JSON.stringify(slot.normalizedHeaders);
         calls[key] ? calls[key]++ : (calls[key] = 1);
       });
       slotData.forEach(slot => {
-        expect(chunkHandlerStub.withArgs(
-            slot.creative, slot.normalizedHeaders).callCount)
-            .to.equal(calls[slot.creative +
-                           JSON.stringify(slot.normalizedHeaders)]);
+        expect(
+          chunkHandlerStub.withArgs(slot.creative, slot.normalizedHeaders)
+            .callCount
+        ).to.equal(
+          calls[slot.creative + JSON.stringify(slot.normalizedHeaders)]
+        );
       });
     });
   }
@@ -99,7 +108,9 @@ describe('#line-delimited-response-handler', () => {
       };
       win = {
         // TextDecoder should exist but not be called
-        TextDecoder: () => { throw new Error('fail'); },
+        TextDecoder: () => {
+          throw new Error('fail');
+        },
       };
     });
 
@@ -119,8 +130,10 @@ describe('#line-delimited-response-handler', () => {
     it('should fallback to text if no TextDecoder', () => {
       slotData = [
         {headers: {foo: 'bar', hello: 'world'}, creative: '<html>baz\n</html>'},
-        {headers: {hello: 'world'},
-          creative: '\r\n<html>\nchunk\b me</html>\r\b\n\r'},
+        {
+          headers: {hello: 'world'},
+          creative: '\r\n<html>\nchunk\b me</html>\r\b\n\r',
+        },
         {headers: {foo: 'bar'}, creative: ''},
         {headers: {}, creative: '\r\n\r\b\n\r'},
       ];
@@ -138,8 +151,10 @@ describe('#line-delimited-response-handler', () => {
       const CHUNK_SIZE = 5;
       let chunk = 0;
       do {
-        const value = textEncoder.encode(responseString.substr(
-            chunk * CHUNK_SIZE, CHUNK_SIZE), {'stream': true});
+        const value = textEncoder.encode(
+          responseString.substr(chunk * CHUNK_SIZE, CHUNK_SIZE),
+          {'stream': true}
+        );
         const done = chunk * CHUNK_SIZE >= responseString.length - 1;
         readStub.onCall(chunk).returns(Promise.resolve({value, done}));
       } while (chunk++ * CHUNK_SIZE < responseString.length);
@@ -168,12 +183,14 @@ describe('#line-delimited-response-handler', () => {
     });
 
     // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should handle empty streamed ' +
-        'response properly', () => {
-      slotData = [];
-      setup();
-      return executeAndVerifyResponse();
-    });
+    it.configure().skipSafari(
+      'should handle empty streamed response properly',
+      () => {
+        slotData = [];
+        setup();
+        return executeAndVerifyResponse();
+      }
+    );
 
     // TODO(lannka, #15748): Fails on Safari 11.1.0.
     it.configure().skipSafari('should handle no fill response properly', () => {
@@ -183,31 +200,40 @@ describe('#line-delimited-response-handler', () => {
     });
 
     // TODO(lannka, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should handle multiple no fill responses ' +
-        'properly', () => {
-      slotData = [
-        {headers: {}, creative: ''},
-        {headers: {}, creative: ''},
-      ];
-      setup();
-      return executeAndVerifyResponse();
-    });
+    it.configure().skipSafari(
+      'should handle multiple no fill responses properly',
+      () => {
+        slotData = [{headers: {}, creative: ''}, {headers: {}, creative: ''}];
+        setup();
+        return executeAndVerifyResponse();
+      }
+    );
 
     // TODO(lannka, #15748): Fails on Safari 11.1.0.
     it.configure().skipSafari('should stream properly', () => {
       slotData = [
         {headers: {}, creative: ''},
-        {headers: {foo: 'bar', hello: 'world'},
-          creative: '\t\n\r<html>\bbaz\r</html>\n\n'},
-        {headers: {Foo: 'bar', hello: 'world'},
-          creative: '\t\n\r<html>\bbaz\r</html>\n\n'},
+        {
+          headers: {foo: 'bar', hello: 'world'},
+          creative: '\t\n\r<html>\bbaz\r</html>\n\n',
+        },
+        {
+          headers: {Foo: 'bar', hello: 'world'},
+          creative: '\t\n\r<html>\bbaz\r</html>\n\n',
+        },
         {headers: {}, creative: ''},
-        {headers: {Foo: 'bar', HELLO: 'Le Monde'},
-          creative: '\t\n\r<html>\bbaz\r</html>\n\n'},
-        {headers: {FOO: 'bar', Hello: 'Le Monde'},
-          creative: '\t\n\r<html>\bbaz\r</html>\n\n'},
-        {headers: {hello: 'world'},
-          creative: '<html>\nchu\nnk me</h\rtml\n\t>'},
+        {
+          headers: {Foo: 'bar', HELLO: 'Le Monde'},
+          creative: '\t\n\r<html>\bbaz\r</html>\n\n',
+        },
+        {
+          headers: {FOO: 'bar', Hello: 'Le Monde'},
+          creative: '\t\n\r<html>\bbaz\r</html>\n\n',
+        },
+        {
+          headers: {hello: 'world'},
+          creative: '<html>\nchu\nnk me</h\rtml\n\t>',
+        },
         {headers: {}, creative: ''},
       ];
       setup();
diff --git a/ads/google/a4a/test/test-traffic-experiments.js b/ads/google/a4a/test/test-traffic-experiments.js
index 416e4b671483..3c09a1ffdbe4 100644
--- a/ads/google/a4a/test/test-traffic-experiments.js
+++ b/ads/google/a4a/test/test-traffic-experiments.js
@@ -72,7 +72,8 @@ describe('all-traffic-experiments-tests', () => {
       element.setAttribute(EXPERIMENT_ATTRIBUTE, '99,77,11,0122345');
       addExperimentIdToElement('3', element);
       expect(element.getAttribute(EXPERIMENT_ATTRIBUTE)).to.equal(
-          '99,77,11,0122345,3');
+        '99,77,11,0122345,3'
+      );
     });
 
     it('should should replace existing invalid experiments', () => {
diff --git a/ads/google/a4a/test/test-utils.js b/ads/google/a4a/test/test-utils.js
index 624ddd8d1156..50b9e71a9bec 100644
--- a/ads/google/a4a/test/test-utils.js
+++ b/ads/google/a4a/test/test-utils.js
@@ -38,17 +38,13 @@ import {
   mergeExperimentIds,
 } from '../utils';
 import {CONSENT_POLICY_STATE} from '../../../../src/consent-state';
-import {
-  MockA4AImpl,
-} from '../../../../extensions/amp-a4a/0.1/test/utils';
+import {MockA4AImpl} from '../../../../extensions/amp-a4a/0.1/test/utils';
 import {Services} from '../../../../src/services';
 import {buildUrl} from '../shared/url-builder';
 import {createElementWithAttributes} from '../../../../src/dom';
 import {createIframePromise} from '../../../../testing/iframe';
 import {installDocService} from '../../../../src/service/ampdoc-impl';
-import {
-  installExtensionsService,
-} from '../../../../src/service/extensions-impl';
+import {installExtensionsService} from '../../../../src/service/extensions-impl';
 import {installXhrService} from '../../../../src/service/xhr-impl';
 import {toggleExperiment} from '../../../../src/experiments';
 
@@ -68,9 +64,19 @@ function setupForAdTesting(fixture) {
 // Because of the way the element is constructed, it doesn't have all of the
 // machinery that AMP expects it to have, so just no-op the irrelevant
 // functions.
-function noopMethods(impl, doc, sandbox, pageLayoutBox = {
-  top: 11, left: 12, right: 0, bottom: 0, width: 0, height: 0,
-}) {
+function noopMethods(
+  impl,
+  doc,
+  sandbox,
+  pageLayoutBox = {
+    top: 11,
+    left: 12,
+    right: 0,
+    bottom: 0,
+    width: 0,
+    height: 0,
+  }
+) {
   const noop = () => {};
   impl.element.build = noop;
   impl.element.getPlaceholder = noop;
@@ -80,7 +86,6 @@ function noopMethods(impl, doc, sandbox, pageLayoutBox = {
 }
 
 describe('Google A4A utils', () => {
-
   //TODO: Add tests for other utils functions.
 
   describe('#additionalDimensions', () => {
@@ -102,7 +107,8 @@ describe('Google A4A utils', () => {
         height: '101px',
       };
       return expect(additionalDimensions(fakeWin, fakeSize)).to.equal(
-          '3,4,1,2,11,12,5,6,100px,101px');
+        '3,4,1,2,11,12,5,6,100px,101px'
+      );
     });
   });
 
@@ -167,10 +173,12 @@ describe('Google A4A utils', () => {
         });
         const a4a = new MockA4AImpl(element);
         url = 'not an array';
-        allowConsoleError(() =>
-          expect(extractAmpAnalyticsConfig(a4a, headers)).to.not.be.ok);
-        allowConsoleError(() =>
-          expect(extractAmpAnalyticsConfig(a4a, headers)).to.be.null);
+        allowConsoleError(
+          () => expect(extractAmpAnalyticsConfig(a4a, headers)).to.not.be.ok
+        );
+        allowConsoleError(
+          () => expect(extractAmpAnalyticsConfig(a4a, headers)).to.be.null
+        );
         url = [];
         expect(extractAmpAnalyticsConfig(a4a, headers)).to.not.be.ok;
         expect(extractAmpAnalyticsConfig(a4a, headers)).to.be.null;
@@ -203,15 +211,21 @@ describe('Google A4A utils', () => {
       };
       const qqid = 'qqid_string';
       let newConfig = addCsiSignalsToAmpAnalyticsConfig(
-          window, mockElement, builtConfig, qqid,
-          /* isVerifiedAmpCreative */ true);
+        window,
+        mockElement,
+        builtConfig,
+        qqid,
+        /* isVerifiedAmpCreative */ true
+      );
 
       expect(newConfig.requests.iniLoadCsi).to.not.be.null;
       expect(newConfig.requests.renderStartCsi).to.not.be.null;
-      expect(newConfig.triggers.continuousVisibleIniLoad.request)
-          .to.equal('iniLoadCsi');
-      expect(newConfig.triggers.continuousVisibleRenderStart.request)
-          .to.equal('renderStartCsi');
+      expect(newConfig.triggers.continuousVisibleIniLoad.request).to.equal(
+        'iniLoadCsi'
+      );
+      expect(newConfig.triggers.continuousVisibleRenderStart.request).to.equal(
+        'renderStartCsi'
+      );
       const getRegExps = metricName => [
         /^https:\/\/csi\.gstatic\.com\/csi\?/,
         /(\?|&)s=a4a(&|$)/,
@@ -234,48 +248,62 @@ describe('Google A4A utils', () => {
         expect(newConfig.requests.renderStartCsi).to.match(regExp);
       });
       newConfig = addCsiSignalsToAmpAnalyticsConfig(
-          window, mockElement, builtConfig, qqid,
-          /* isVerifiedAmpCreative */ false,
-          /* lifecycle time events; not relevant here */ -1, -1);
+        window,
+        mockElement,
+        builtConfig,
+        qqid,
+        /* isVerifiedAmpCreative */ false,
+        /* lifecycle time events; not relevant here */ -1,
+        -1
+      );
       getRegExps('iniLoadCsiCrossDomain').forEach(regExp => {
         expect(newConfig.requests.iniLoadCsi).to.match(regExp);
       });
       getRegExps('renderStartCsiCrossDomain').forEach(regExp => {
         expect(newConfig.requests.renderStartCsi).to.match(regExp);
       });
-
     });
   });
 
   describe('#getAmpRuntimeTypeParameter', () => {
     it('should specify that this is canary', () => {
-      expect(getAmpRuntimeTypeParameter({
-        AMP_CONFIG: {type: 'canary'},
-        location: {origin: 'https://www-example-com.cdn.ampproject.org'},
-      })).to.equal('2');
+      expect(
+        getAmpRuntimeTypeParameter({
+          AMP_CONFIG: {type: 'canary'},
+          location: {origin: 'https://www-example-com.cdn.ampproject.org'},
+        })
+      ).to.equal('2');
     });
     it('should specify that this is control', () => {
-      expect(getAmpRuntimeTypeParameter({
-        AMP_CONFIG: {type: 'control'},
-        location: {origin: 'https://www-example-com.cdn.ampproject.org'},
-      })).to.equal('1');
+      expect(
+        getAmpRuntimeTypeParameter({
+          AMP_CONFIG: {type: 'control'},
+          location: {origin: 'https://www-example-com.cdn.ampproject.org'},
+        })
+      ).to.equal('1');
     });
     it('should not have `art` parameter when AMP_CONFIG is undefined', () => {
-      expect(getAmpRuntimeTypeParameter({
-        location: {origin: 'https://www-example-com.cdn.ampproject.org'},
-      })).to.be.null;
+      expect(
+        getAmpRuntimeTypeParameter({
+          location: {origin: 'https://www-example-com.cdn.ampproject.org'},
+        })
+      ).to.be.null;
     });
     it('should not have `art` parameter when binary type is production', () => {
-      expect(getAmpRuntimeTypeParameter({
-        AMP_CONFIG: {type: 'production'},
-        location: {origin: 'https://www-example-com.cdn.ampproject.org'},
-      })).to.be.null;
+      expect(
+        getAmpRuntimeTypeParameter({
+          AMP_CONFIG: {type: 'production'},
+          location: {origin: 'https://www-example-com.cdn.ampproject.org'},
+        })
+      ).to.be.null;
     });
     it('should not have `art` parameter when canonical', () => {
-      expect(getAmpRuntimeTypeParameter({
-        AMP_CONFIG: {type: 'canary'},
-        location: {origin: 'https://www.example.com'},
-      })).to.be.null;
+      expect(
+        getAmpRuntimeTypeParameter({
+          AMP_CONFIG: {type: 'canary'},
+          location: {origin: 'https://www.example.com'},
+        })
+      ).to.be.null;
     });
   });
 
@@ -325,8 +353,12 @@ describe('Google A4A utils', () => {
         });
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox);
-        const getRect = () => { return {'width': 100, 'height': 200}; };
-        const getSize = () => { return {'width': 100, 'height': 200}; };
+        const getRect = () => {
+          return {'width': 100, 'height': 200};
+        };
+        const getSize = () => {
+          return {'width': 100, 'height': 200};
+        };
         const getScrollLeft = () => 12;
         const getScrollTop = () => 34;
         const viewportStub = sandbox.stub(Services, 'viewportForDoc');
@@ -418,8 +450,10 @@ describe('Google A4A utils', () => {
         });
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox);
-        const createElementStub =
-          sandbox.stub(impl.win.document, 'createElement');
+        const createElementStub = sandbox.stub(
+          impl.win.document,
+          'createElement'
+        );
         createElementStub.withArgs('iframe').returns({
           sandbox: {
             supports: () => true,
@@ -427,7 +461,8 @@ describe('Google A4A utils', () => {
         });
         return fixture.addElement(elem).then(() => {
           return expect(googleAdUrl(impl, '', 0, {}, [])).to.eventually.match(
-              /[&?]bc=7[&$]/);
+            /[&?]bc=7[&$]/
+          );
         });
       });
     });
@@ -444,14 +479,17 @@ describe('Google A4A utils', () => {
         });
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox);
-        const createElementStub =
-          sandbox.stub(impl.win.document, 'createElement');
+        const createElementStub = sandbox.stub(
+          impl.win.document,
+          'createElement'
+        );
         createElementStub.withArgs('iframe').returns({
           sandbox: {},
         });
         return fixture.addElement(elem).then(() => {
           return expect(googleAdUrl(impl, '', 0, {}, [])).to.eventually.match(
-              /[&?]bc=1[&$]/);
+            /[&?]bc=1[&$]/
+          );
         });
       });
     });
@@ -469,8 +507,10 @@ describe('Google A4A utils', () => {
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox);
         impl.win.SVGElement = undefined;
-        const createElementStub =
-          sandbox.stub(impl.win.document, 'createElement');
+        const createElementStub = sandbox.stub(
+          impl.win.document,
+          'createElement'
+        );
         createElementStub.withArgs('iframe').returns({
           sandbox: {
             supports: () => false,
@@ -478,8 +518,8 @@ describe('Google A4A utils', () => {
         });
         return fixture.addElement(elem).then(() => {
           return expect(
-              googleAdUrl(impl, '', 0, {}, [])).to.eventually.not.match(
-              /[&?]bc=1[&$]/);
+            googleAdUrl(impl, '', 0, {}, [])
+          ).to.eventually.not.match(/[&?]bc=1[&$]/);
         });
       });
     });
@@ -496,10 +536,13 @@ describe('Google A4A utils', () => {
         });
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox);
-        sandbox.stub(Services.viewerForDoc(impl.getAmpDoc()), 'getReferrerUrl')
-            .returns(new Promise(() => {}));
-        const createElementStub =
-          sandbox.stub(impl.win.document, 'createElement');
+        sandbox
+          .stub(Services.viewerForDoc(impl.getAmpDoc()), 'getReferrerUrl')
+          .returns(new Promise(() => {}));
+        const createElementStub = sandbox.stub(
+          impl.win.document,
+          'createElement'
+        );
         createElementStub.withArgs('iframe').returns({
           sandbox: {
             supports: () => false,
@@ -508,8 +551,8 @@ describe('Google A4A utils', () => {
         expectAsyncConsoleError(/Referrer timeout/, 1);
         return fixture.addElement(elem).then(() => {
           return expect(
-              googleAdUrl(impl, '', 0, {}, [])).to.eventually.not.match(
-              /[&?]ref=[&$]/);
+            googleAdUrl(impl, '', 0, {}, [])
+          ).to.eventually.not.match(/[&?]ref=[&$]/);
         });
       });
     });
@@ -538,19 +581,27 @@ describe('Google A4A utils', () => {
         const elem = createElementWithAttributes(doc, 'amp-a4a', {});
         const impl = new MockA4AImpl(elem);
         noopMethods(impl, doc, sandbox, {
-          top: 0, left: 0, right: 0, bottom: 0, width: 0, height: 0,
+          top: 0,
+          left: 0,
+          right: 0,
+          bottom: 0,
+          width: 0,
+          height: 0,
         });
         return fixture.addElement(elem).then(() =>
           googleAdUrl(impl, '', Date.now(), [], []).then(url => {
             expect(url).to.match(/[&?]adx=0[&$]/);
             expect(url).to.match(/[&?]adx=0[&$]/);
             elem.setAttribute(
-                'data-experiment-id', `123,${ADX_ADY_EXP.experiment},789`,);
+              'data-experiment-id',
+              `123,${ADX_ADY_EXP.experiment},789`
+            );
             return googleAdUrl(impl, '', Date.now(), [], []).then(url => {
               expect(url).to.match(/[&?]adx=1[&$]/);
               expect(url).to.match(/[&?]adx=1[&$]/);
             });
-          }));
+          })
+        );
       });
     });
   });
@@ -560,12 +611,14 @@ describe('Google A4A utils', () => {
       expect(mergeExperimentIds(['12345'])).to.equal('12345');
     });
     it('should merge a single ID to a list', () => {
-      expect(mergeExperimentIds(['12345'], '3,4,5,6'))
-          .to.equal('3,4,5,6,12345');
+      expect(mergeExperimentIds(['12345'], '3,4,5,6')).to.equal(
+        '3,4,5,6,12345'
+      );
     });
     it('should merge multiple IDs into a list', () => {
-      expect(mergeExperimentIds(['12345','6789'], '3,4,5,6'))
-          .to.equal('3,4,5,6,12345,6789');
+      expect(mergeExperimentIds(['12345', '6789'], '3,4,5,6')).to.equal(
+        '3,4,5,6,12345,6789'
+      );
     });
     it('should discard invalid ID', () => {
       expect(mergeExperimentIds(['frob'], '3,4,5,6')).to.equal('3,4,5,6');
@@ -585,7 +638,11 @@ describe('Google A4A utils', () => {
     });
     it('should not append parameter if truncated', () => {
       const truncUrl = buildUrl(
-          'https://foo.com/bar', {hello: 'world'}, 15, TRUNCATION_PARAM);
+        'https://foo.com/bar',
+        {hello: 'world'},
+        15,
+        TRUNCATION_PARAM
+      );
       expect(truncUrl.indexOf(TRUNCATION_PARAM.name)).to.not.equal(-1);
       expect(maybeAppendErrorParameter(truncUrl, 'n')).to.not.be.ok;
     });
@@ -593,8 +650,10 @@ describe('Google A4A utils', () => {
 
   describes.realWin('#getEnclosingContainerTypes', {}, env => {
     it('should return empty if no containers', () => {
-      expect(getEnclosingContainerTypes(
-          env.win.document.createElement('amp-ad')).length).to.equal(0);
+      expect(
+        getEnclosingContainerTypes(env.win.document.createElement('amp-ad'))
+          .length
+      ).to.equal(0);
     });
 
     Object.keys(ValidAdContainerTypes).forEach(container => {
@@ -603,8 +662,9 @@ describe('Google A4A utils', () => {
         env.win.document.body.appendChild(containerElem);
         const ampAdElem = env.win.document.createElement('amp-ad');
         containerElem.appendChild(ampAdElem);
-        expect(getEnclosingContainerTypes(ampAdElem))
-            .to.deep.equal([ValidAdContainerTypes[container]]);
+        expect(getEnclosingContainerTypes(ampAdElem)).to.deep.equal([
+          ValidAdContainerTypes[container],
+        ]);
       });
     });
 
@@ -617,12 +677,14 @@ describe('Google A4A utils', () => {
       });
       const ampAdElem = env.win.document.createElement('amp-ad');
       prevContainer.appendChild(ampAdElem);
-      const ValidAdContainerTypeValues =
-          Object.keys(ValidAdContainerTypes).map(function(key) {
-            return ValidAdContainerTypes[key];
-          });
-      expect(getEnclosingContainerTypes(ampAdElem).sort())
-          .to.deep.equal(ValidAdContainerTypeValues.sort());
+      const ValidAdContainerTypeValues = Object.keys(ValidAdContainerTypes).map(
+        function(key) {
+          return ValidAdContainerTypes[key];
+        }
+      );
+      expect(getEnclosingContainerTypes(ampAdElem).sort()).to.deep.equal(
+        ValidAdContainerTypeValues.sort()
+      );
     });
   });
 
@@ -633,44 +695,49 @@ describe('Google A4A utils', () => {
       const documentInfoStub = sandbox.stub(Services, 'documentInfoForDoc');
       doc = {};
       fakeWin = {location: {}};
-      documentInfoStub.withArgs(doc)
-          .returns({canonicalUrl: 'http://f.blah.com?some_site'});
+      documentInfoStub
+        .withArgs(doc)
+        .returns({canonicalUrl: 'http://f.blah.com?some_site'});
     });
 
     it('should use google.com if at top', () => {
       fakeWin.top = fakeWin;
       fakeWin.location.ancestorOrigins = ['foo.google.com.eu'];
       expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-          'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com');
+        'https://adservice.google.com/adsid/integrator.json?' +
+          'domain=f.blah.com'
+      );
     });
 
     it('should use google.com if no ancestorOrigins', () => {
       expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-          'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com');
+        'https://adservice.google.com/adsid/integrator.json?' +
+          'domain=f.blah.com'
+      );
     });
 
     it('should use google.com if non-google top', () => {
       fakeWin.location.ancestorOrigins = ['foo.google2.com'];
       expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-          'https://adservice.google.com/adsid/integrator.json?' +
-          'domain=f.blah.com');
+        'https://adservice.google.com/adsid/integrator.json?' +
+          'domain=f.blah.com'
+      );
     });
 
     it('should use google ancestor origin based top domain', () => {
-      fakeWin.location.ancestorOrigins =
-          ['foo.google.eu', 'blah.google.fr'];
+      fakeWin.location.ancestorOrigins = ['foo.google.eu', 'blah.google.fr'];
       expect(getIdentityTokenRequestUrl(fakeWin, doc)).to.equal(
-          'https://adservice.google.fr/adsid/integrator.json?' +
-          'domain=f.blah.com');
+        'https://adservice.google.fr/adsid/integrator.json?' +
+          'domain=f.blah.com'
+      );
     });
 
     it('should use supplied domain', () => {
       fakeWin.location.ancestorOrigins = ['foo.google.fr'];
       expect(getIdentityTokenRequestUrl(fakeWin, doc, '.google.eu')).to.equal(
-          'https://adservice.google.eu/adsid/integrator.json?' +
-          'domain=f.blah.com');
+        'https://adservice.google.eu/adsid/integrator.json?' +
+          'domain=f.blah.com'
+      );
     });
   });
 
@@ -678,8 +745,9 @@ describe('Google A4A utils', () => {
     beforeEach(() => {
       installXhrService(env.win);
       const documentInfoStub = sandbox.stub(Services, 'documentInfoForDoc');
-      documentInfoStub.withArgs(env.ampdoc)
-          .returns({canonicalUrl: 'http://f.blah.com?some_site'});
+      documentInfoStub
+        .withArgs(env.ampdoc)
+        .returns({canonicalUrl: 'http://f.blah.com?some_site'});
     });
 
     afterEach(() => {
@@ -688,9 +756,11 @@ describe('Google A4A utils', () => {
     });
 
     const getUrl = domain => {
-      domain = domain || 'google\.com';
-      return `https:\/\/adservice\.${domain}\/adsid\/integrator\.json\?` +
-          'domain=f\.blah\.com';
+      domain = domain || 'google.com';
+      return (
+        `https:\/\/adservice\.${domain}\/adsid\/integrator\.json\?` +
+        'domain=f.blah.com'
+      );
     };
 
     it('should ignore response if required fields are missing', () => {
@@ -706,13 +776,16 @@ describe('Google A4A utils', () => {
     });
 
     it('should fetch full token as expected', () => {
-      env.expectFetch(getUrl(), JSON.stringify({
-        newToken: 'abc',
-        '1p_jar': 'some_jar',
-        pucrd: 'some_pucrd',
-        freshLifetimeSecs: '1234',
-        validLifetimeSecs: '5678',
-      }));
+      env.expectFetch(
+        getUrl(),
+        JSON.stringify({
+          newToken: 'abc',
+          '1p_jar': 'some_jar',
+          pucrd: 'some_pucrd',
+          freshLifetimeSecs: '1234',
+          validLifetimeSecs: '5678',
+        })
+      );
       return getIdentityToken(env.win, env.ampdoc).then(result => {
         expect(result.token).to.equal('abc');
         expect(result.jar).to.equal('some_jar');
@@ -725,11 +798,14 @@ describe('Google A4A utils', () => {
 
     it('should redirect as expected', () => {
       env.expectFetch(getUrl(), JSON.stringify({altDomain: '.google.fr'}));
-      env.expectFetch(getUrl('google\.fr'), JSON.stringify({
-        newToken: 'abc',
-        freshLifetimeSecs: '1234',
-        validLifetimeSecs: '5678',
-      }));
+      env.expectFetch(
+        getUrl('google.fr'),
+        JSON.stringify({
+          newToken: 'abc',
+          freshLifetimeSecs: '1234',
+          validLifetimeSecs: '5678',
+        })
+      );
       return getIdentityToken(env.win, env.ampdoc, '').then(result => {
         expect(result.token).to.equal('abc');
         expect(result.jar).to.equal('');
@@ -743,7 +819,9 @@ describe('Google A4A utils', () => {
     it('should stop after 1 redirect', () => {
       env.expectFetch(getUrl(), JSON.stringify({altDomain: '.google.fr'}));
       env.expectFetch(
-          getUrl('google\.fr'), JSON.stringify({altDomain: '.google.com'}));
+        getUrl('google.fr'),
+        JSON.stringify({altDomain: '.google.com'})
+      );
       return getIdentityToken(env.win, env.ampdoc).then(result => {
         expect(result.token).to.not.be.ok;
         expect(result.jar).to.not.be.ok;
@@ -759,49 +837,61 @@ describe('Google A4A utils', () => {
         validLifetimeSecs: '5678',
       };
       env.win['goog_identity_prom'] = Promise.resolve(ident);
-      return getIdentityToken(env.win, env.ampdoc)
-          .then(result => expect(result).to.jsonEqual(ident));
+      return getIdentityToken(env.win, env.ampdoc).then(result =>
+        expect(result).to.jsonEqual(ident)
+      );
     });
 
     it('should handle fetch error', () => {
-      sandbox.stub(Services, 'xhrFor').returns(
-          {fetchJson: () => Promise.reject('some network failure')});
-      return getIdentityToken(env.win, env.ampdoc)
-          .then(result => expect(result).to.jsonEqual({}));
+      sandbox
+        .stub(Services, 'xhrFor')
+        .returns({fetchJson: () => Promise.reject('some network failure')});
+      return getIdentityToken(env.win, env.ampdoc).then(result =>
+        expect(result).to.jsonEqual({})
+      );
     });
 
     it('should fetch if SUFFICIENT consent', () => {
-      env.expectFetch(getUrl(), JSON.stringify({
-        newToken: 'abc',
-        '1p_jar': 'some_jar',
-        pucrd: 'some_pucrd',
-        freshLifetimeSecs: '1234',
-        validLifetimeSecs: '5678',
-      }));
+      env.expectFetch(
+        getUrl(),
+        JSON.stringify({
+          newToken: 'abc',
+          '1p_jar': 'some_jar',
+          pucrd: 'some_pucrd',
+          freshLifetimeSecs: '1234',
+          validLifetimeSecs: '5678',
+        })
+      );
       sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
-          Promise.resolve({
-            whenPolicyResolved: () => CONSENT_POLICY_STATE.SUFFICIENT,
-          }));
-      return getIdentityToken(env.win, env.ampdoc, 'default').then(
-          result => expect(result.token).to.equal('abc'));
+        Promise.resolve({
+          whenPolicyResolved: () => CONSENT_POLICY_STATE.SUFFICIENT,
+        })
+      );
+      return getIdentityToken(env.win, env.ampdoc, 'default').then(result =>
+        expect(result.token).to.equal('abc')
+      );
     });
 
     it('should not fetch if INSUFFICIENT consent', () => {
       sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
-          Promise.resolve({
-            whenPolicyResolved: () => CONSENT_POLICY_STATE.INSUFFICIENT,
-          }));
-      return expect(getIdentityToken(env.win, env.ampdoc, 'default'))
-          .to.eventually.jsonEqual({});
+        Promise.resolve({
+          whenPolicyResolved: () => CONSENT_POLICY_STATE.INSUFFICIENT,
+        })
+      );
+      return expect(
+        getIdentityToken(env.win, env.ampdoc, 'default')
+      ).to.eventually.jsonEqual({});
     });
 
     it('should not fetch if UNKNOWN consent', () => {
       sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
-          Promise.resolve({
-            whenPolicyResolved: () => CONSENT_POLICY_STATE.UNKNOWN,
-          }));
-      return expect(getIdentityToken(env.win, env.ampdoc, 'default'))
-          .to.eventually.jsonEqual({});
+        Promise.resolve({
+          whenPolicyResolved: () => CONSENT_POLICY_STATE.UNKNOWN,
+        })
+      );
+      return expect(
+        getIdentityToken(env.win, env.ampdoc, 'default')
+      ).to.eventually.jsonEqual({});
     });
   });
 
@@ -851,8 +941,7 @@ describe('Google A4A utils', () => {
 
     it('should include scheduleTime for ad render start triggers', () => {
       a4a.element.layoutScheduleTime = 200;
-      const vars = getCsiAmpAnalyticsVariables(
-          'ad-render-start', a4a, null);
+      const vars = getCsiAmpAnalyticsVariables('ad-render-start', a4a, null);
       expect(vars['scheduleTime']).to.be.a('number');
       expect(vars['scheduleTime']).not.to.equal(0);
     });
@@ -892,7 +981,8 @@ describe('Google A4A utils', () => {
       {in: 'hello.com', out: 'hello.com'},
       {in: '', out: ''},
     ].forEach(test =>
-      it(test.in, () => expect(extractHost(test.in)).to.equal(test.out)));
+      it(test.in, () => expect(extractHost(test.in)).to.equal(test.out))
+    );
   });
 
   describes.realWin('#getCorrelator', {}, env => {
@@ -946,17 +1036,21 @@ describes.realWin('#groupAmpAdsByType', {amp: true}, env => {
   }
 
   it('should find amp-ad of only given type', () => {
-    const resources = [createResource({type: 'doubleclick'}),
-      createResource({type: 'blah'}), createResource({}, 'amp-foo')];
-    sandbox.stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
-        .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
+    const resources = [
+      createResource({type: 'doubleclick'}),
+      createResource({type: 'blah'}),
+      createResource({}, 'amp-foo'),
+    ];
+    sandbox
+      .stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
+      .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
     return groupAmpAdsByType(win, 'doubleclick', () => 'foo').then(result => {
       expect(Object.keys(result).length).to.equal(1);
       expect(result['foo']).to.be.ok;
       expect(result['foo'].length).to.equal(1);
       return result['foo'][0].then(baseElement =>
-        expect(baseElement.element.getAttribute('type'))
-            .to.equal('doubleclick'));
+        expect(baseElement.element.getAttribute('type')).to.equal('doubleclick')
+      );
     });
   });
 
@@ -967,49 +1061,63 @@ describes.realWin('#groupAmpAdsByType', {amp: true}, env => {
     // as its owned by amp-sticky-ad.  It will locate associated element
     // and block on whenUpgradedToCustomElement so override createdCallback
     // to cause it to return immediately.
-    const ampAdResource =
-      createResource({type: 'doubleclick'}, 'amp-ad', stickyResource.element);
+    const ampAdResource = createResource(
+      {type: 'doubleclick'},
+      'amp-ad',
+      stickyResource.element
+    );
     ampAdResource.element.createdCallback = true;
-    sandbox.stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
-        .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
-    return groupAmpAdsByType(win, 'doubleclick', () => 'foo').then(
-        result => {
-          expect(Object.keys(result).length).to.equal(1);
-          expect(result['foo']).to.be.ok;
-          expect(result['foo'].length).to.equal(1);
-          return result['foo'][0].then(baseElement =>
-            expect(baseElement.element.getAttribute('type'))
-                .to.equal('doubleclick'));
-        });
+    sandbox
+      .stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
+      .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
+    return groupAmpAdsByType(win, 'doubleclick', () => 'foo').then(result => {
+      expect(Object.keys(result).length).to.equal(1);
+      expect(result['foo']).to.be.ok;
+      expect(result['foo'].length).to.equal(1);
+      return result['foo'][0].then(baseElement =>
+        expect(baseElement.element.getAttribute('type')).to.equal('doubleclick')
+      );
+    });
   });
 
   it('should find and group multiple, some in containers', () => {
     const stickyResource = createResource({}, 'amp-sticky-ad');
-    const resources = [stickyResource, createResource({}, 'amp-foo'),
+    const resources = [
+      stickyResource,
+      createResource({}, 'amp-foo'),
       createResource({type: 'doubleclick', foo: 'bar'}),
-      createResource({type: 'doubleclick', foo: 'hello'})];
+      createResource({type: 'doubleclick', foo: 'hello'}),
+    ];
     // Do not expect ampAdResource to be returned by getMeasuredResources
     // as its owned by amp-sticky-ad.  It will locate associated element
     // and block on whenUpgradedToCustomElement so override createdCallback
     // to cause it to return immediately.
-    const ampAdResource = createResource({type: 'doubleclick', foo: 'bar'},
-        'amp-ad', stickyResource.element);
+    const ampAdResource = createResource(
+      {type: 'doubleclick', foo: 'bar'},
+      'amp-ad',
+      stickyResource.element
+    );
     ampAdResource.element.createdCallback = true;
-    sandbox.stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
-        .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
-    return groupAmpAdsByType(
-        win, 'doubleclick', element => element.getAttribute('foo')).then(
-        result => {
-          expect(Object.keys(result).length).to.equal(2);
-          expect(result['bar']).to.be.ok;
-          expect(result['bar'].length).to.equal(2);
-          expect(result['hello']).to.be.ok;
-          expect(result['hello'].length).to.equal(1);
-          return Promise.all(result['bar'].concat(result['hello'])).then(
-              baseElements => baseElements.forEach(baseElement =>
-                expect(baseElement.element.getAttribute('type'))
-                    .to.equal('doubleclick')));
-        });
+    sandbox
+      .stub(Services.resourcesForDoc(doc), 'getMeasuredResources')
+      .callsFake((doc, fn) => Promise.resolve(resources.filter(fn)));
+    return groupAmpAdsByType(win, 'doubleclick', element =>
+      element.getAttribute('foo')
+    ).then(result => {
+      expect(Object.keys(result).length).to.equal(2);
+      expect(result['bar']).to.be.ok;
+      expect(result['bar'].length).to.equal(2);
+      expect(result['hello']).to.be.ok;
+      expect(result['hello'].length).to.equal(1);
+      return Promise.all(result['bar'].concat(result['hello'])).then(
+        baseElements =>
+          baseElements.forEach(baseElement =>
+            expect(baseElement.element.getAttribute('type')).to.equal(
+              'doubleclick'
+            )
+          )
+      );
+    });
   });
 });
 
@@ -1021,7 +1129,11 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
   });
 
   function createResource(
-    config, layout, tagName = 'amp-ad', parent = doc.body) {
+    config,
+    layout,
+    tagName = 'amp-ad',
+    parent = doc.body
+  ) {
     config['layout'] = layout;
     const element = createElementWithAttributes(doc, tagName, config);
     parent.appendChild(element);
@@ -1062,7 +1174,7 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
-  it('should return parent\'s fixed width for FILL layout', () => {
+  it("should return parent's fixed width for FILL layout", () => {
     const parent = document.createElement('div');
     parent.setAttribute('width', 300);
     parent.setAttribute('layout', 'fixed');
@@ -1071,20 +1183,23 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
-  it('should return the max-width, if present, for FIXED_HEIGHT layout',
-      () => {
-        const element = createResource({height: 300}, 'fixed-height');
-        element.style.maxWidth = '250px';
-        expect(getContainerWidth(win, element)).to.equal(250);
-      });
+  it('should return the max-width, if present, for FIXED_HEIGHT layout', () => {
+    const element = createResource({height: 300}, 'fixed-height');
+    element.style.maxWidth = '250px';
+    expect(getContainerWidth(win, element)).to.equal(250);
+  });
 
-  it('should return parent\'s fixed width for FIXED_HEIGHT layout', () => {
+  it("should return parent's fixed width for FIXED_HEIGHT layout", () => {
     const parent = document.createElement('div');
     parent.setAttribute('width', 300);
     parent.setAttribute('layout', 'fixed');
     doc.body.appendChild(parent);
     const element = createResource(
-        {height: 250}, 'fixed-height', 'amp-ad', parent);
+      {height: 250},
+      'fixed-height',
+      'amp-ad',
+      parent
+    );
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
@@ -1094,13 +1209,12 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
     expect(getContainerWidth(win, element)).to.equal(250);
   });
 
-  it('should return parent\'s fixed width for FLUID layout', () => {
+  it("should return parent's fixed width for FLUID layout", () => {
     const parent = document.createElement('div');
     parent.setAttribute('width', 300);
     parent.setAttribute('layout', 'fixed');
     doc.body.appendChild(parent);
-    const element = createResource(
-        {height: 250}, 'fluid', 'amp-ad', parent);
+    const element = createResource({height: 250}, 'fluid', 'amp-ad', parent);
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
@@ -1110,20 +1224,25 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
     expect(getContainerWidth(win, element)).to.equal(250);
   });
 
-  it('should return parent\'s fixed width for RESPONSIVE layout', () => {
+  it("should return parent's fixed width for RESPONSIVE layout", () => {
     const parent = document.createElement('div');
     parent.setAttribute('width', 300);
     parent.setAttribute('layout', 'fixed');
     doc.body.appendChild(parent);
     const element = createResource(
-        {height: 250, width: 250}, 'responsive', 'amp-ad', parent);
+      {height: 250, width: 250},
+      'responsive',
+      'amp-ad',
+      parent
+    );
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
   it('should return the viewport width for CONTAINER layout', () => {
     const element = createResource({} /* config */, 'container');
-    sandbox.stub(Services.viewportForDoc(element), 'getSize')
-        .returns({width: 300});
+    sandbox
+      .stub(Services.viewportForDoc(element), 'getSize')
+      .returns({width: 300});
     expect(getContainerWidth(win, element)).to.equal(300);
   });
 
@@ -1133,8 +1252,7 @@ describes.realWin('#getContainerWidth', {amp: true}, env => {
       parent.setAttribute('width', 300);
       parent.setAttribute('layout', 'fixed');
       doc.body.appendChild(parent);
-      const element = createResource(
-          {height: 250}, layout, 'amp-ad', parent);
+      const element = createResource({height: 250}, layout, 'amp-ad', parent);
       expect(getContainerWidth(win, element, 1)).to.equal(-1);
     });
   });
diff --git a/ads/google/a4a/traffic-experiments.js b/ads/google/a4a/traffic-experiments.js
index 8695aaff6349..658e857c4be0 100644
--- a/ads/google/a4a/traffic-experiments.js
+++ b/ads/google/a4a/traffic-experiments.js
@@ -22,10 +22,7 @@
  * impacts on click-throughs.
  */
 
-import {
-  EXPERIMENT_ATTRIBUTE,
-  mergeExperimentIds,
-} from './utils';
+import {EXPERIMENT_ATTRIBUTE, mergeExperimentIds} from './utils';
 import {
   ExperimentInfo, // eslint-disable-line no-unused-vars
   isExperimentOn,
@@ -42,7 +39,6 @@ export let A4aExperimentBranches;
 /** @type {string} @private */
 export const MANUAL_EXPERIMENT_ID = '117152632';
 
-
 /**
  * Experiment IDs used to identify single pass experiments.
  *
@@ -59,7 +55,8 @@ export const SINGLE_PASS_EXPERIMENT_IDS = {
  * @return {?string} experiment extracted from page url.
  */
 export function extractUrlExperimentId(win, element) {
-  const expParam = Services.viewerForDoc(element).getParam('exp') ||
+  const expParam =
+    Services.viewerForDoc(element).getParam('exp') ||
     parseQueryString(win.location.search)['exp'];
   if (!expParam) {
     return null;
@@ -67,15 +64,20 @@ export function extractUrlExperimentId(win, element) {
   // Allow for per type experiment control with Doubleclick key set for 'da'
   // and AdSense using 'aa'.  Fallback to 'a4a' if type specific is missing.
   const expKeys = [
-    (element.getAttribute('type') || '').toLowerCase() == 'doubleclick' ?
-      'da' : 'aa',
+    (element.getAttribute('type') || '').toLowerCase() == 'doubleclick'
+      ? 'da'
+      : 'aa',
     'a4a',
   ];
   let arg;
   let match;
-  expKeys.forEach(key => arg = arg ||
-    ((match = new RegExp(`(?:^|,)${key}:(-?\\d+)`).exec(expParam)) &&
-      match[1]));
+  expKeys.forEach(
+    key =>
+      (arg =
+        arg ||
+        ((match = new RegExp(`(?:^|,)${key}:(-?\\d+)`).exec(expParam)) &&
+          match[1]))
+  );
   return arg || null;
 }
 
@@ -111,7 +113,10 @@ export function parseExperimentIds(idString) {
  */
 export function isInExperiment(element, id) {
   return parseExperimentIds(element.getAttribute(EXPERIMENT_ATTRIBUTE)).some(
-      x => { return x === id; });
+    x => {
+      return x === id;
+    }
+  );
 }
 
 /**
@@ -157,7 +162,9 @@ export function hasLaunched(win, element) {
  * @return {boolean} Whether all list elements are valid experiment IDs.
  */
 export function validateExperimentIds(idList) {
-  return idList.every(id => { return !isNaN(parseInt(id, 10)); });
+  return idList.every(id => {
+    return !isNaN(parseInt(id, 10));
+  });
 }
 
 /**
@@ -173,8 +180,10 @@ export function addExperimentIdToElement(experimentId, element) {
   }
   const currentEids = element.getAttribute(EXPERIMENT_ATTRIBUTE);
   if (currentEids && validateExperimentIds(parseExperimentIds(currentEids))) {
-    element.setAttribute(EXPERIMENT_ATTRIBUTE,
-        mergeExperimentIds([experimentId], currentEids));
+    element.setAttribute(
+      EXPERIMENT_ATTRIBUTE,
+      mergeExperimentIds([experimentId], currentEids)
+    );
   } else {
     element.setAttribute(EXPERIMENT_ATTRIBUTE, experimentId);
   }
diff --git a/ads/google/a4a/utils.js b/ads/google/a4a/utils.js
index 88b419fad463..097936308bc6 100644
--- a/ads/google/a4a/utils.js
+++ b/ads/google/a4a/utils.js
@@ -120,8 +120,12 @@ export const ADX_ADY_EXP = {
  * @return {number}
  */
 function getNavigationTiming(win, timingEvent) {
-  return (win['performance'] && win['performance']['timing'] &&
-      win['performance']['timing'][timingEvent]) || 0;
+  return (
+    (win['performance'] &&
+      win['performance']['timing'] &&
+      win['performance']['timing'][timingEvent]) ||
+    0
+  );
 }
 
 /**
@@ -135,8 +139,10 @@ function getNavigationTiming(win, timingEvent) {
  *   pathway.
  */
 export function isGoogleAdsA4AValidEnvironment(win) {
-  return supportsNativeCrypto(win) && (
-    !!isCdnProxy(win) || getMode(win).localDev || getMode(win).test);
+  return (
+    supportsNativeCrypto(win) &&
+    (!!isCdnProxy(win) || getMode(win).localDev || getMode(win).test)
+  );
 }
 
 /**
@@ -170,8 +176,10 @@ export function isReportingEnabled(ampElement) {
   if (getMode(ampElement.win).localDev && !getMode(ampElement.win).test) {
     toggleExperiment(win, 'a4aProfilingRate', true, true);
   }
-  return (type == 'doubleclick' || type == 'adsense') &&
-      isExperimentOn(win, 'a4aProfilingRate');
+  return (
+    (type == 'doubleclick' || type == 'adsense') &&
+    isExperimentOn(win, 'a4aProfilingRate')
+  );
 }
 
 /**
@@ -219,12 +227,14 @@ export function groupAmpAdsByType(win, type, groupFn) {
   // TODO(keithwrightbos): what about slots that become measured due to removal
   // of display none (e.g. user resizes viewport and media selector makes
   // visible).
-  const ampAdSelector =
-      r => r.element./*OK*/querySelector(`amp-ad[type=${type}]`);
+  const ampAdSelector = r =>
+    r.element./*OK*/ querySelector(`amp-ad[type=${type}]`);
   const {documentElement} = win.document;
-  return Services.resourcesForDoc(documentElement).getMeasuredResources(win,
-      r => {
-        const isAmpAdType = r.element.tagName == 'AMP-AD' &&
+  return (
+    Services.resourcesForDoc(documentElement)
+      .getMeasuredResources(win, r => {
+        const isAmpAdType =
+          r.element.tagName == 'AMP-AD' &&
           r.element.getAttribute('type') == type;
         if (isAmpAdType) {
           return true;
@@ -236,22 +246,29 @@ export function groupAmpAdsByType(win, type, groupFn) {
       })
       // Need to wait on any contained element resolution followed by build
       // of child ad.
-      .then(resources => Promise.all(resources.map(
-          resource => {
+      .then(resources =>
+        Promise.all(
+          resources.map(resource => {
             if (resource.element.tagName == 'AMP-AD') {
               return resource.element;
             }
             // Must be container element so need to wait for child amp-ad to
             // be upgraded.
             return whenUpgradedToCustomElement(
-                dev().assertElement(ampAdSelector(resource)));
-          })))
+              dev().assertElement(ampAdSelector(resource))
+            );
+          })
+        )
+      )
       // Group by networkId.
-      .then(elements => elements.reduce((result, element) => {
-        const groupId = groupFn(element);
-        (result[groupId] || (result[groupId] = [])).push(element.getImpl());
-        return result;
-      }, {}));
+      .then(elements =>
+        elements.reduce((result, element) => {
+          const groupId = groupFn(element);
+          (result[groupId] || (result[groupId] = [])).push(element.getImpl());
+          return result;
+        }, {})
+      )
+  );
 }
 
 /**
@@ -264,63 +281,62 @@ export function googlePageParameters(a4a, startTime) {
   const ampDoc = a4a.getAmpDoc();
   // Do not wait longer than 1 second to retrieve referrer to ensure
   // viewer integration issues do not cause ad requests to hang indefinitely.
-  const referrerPromise = Services.timerFor(win).timeoutPromise(
-      1000, Services.viewerForDoc(ampDoc).getReferrerUrl())
-      .catch(() => {
-        dev().expectedError('AMP-A4A', 'Referrer timeout!');
-        return '';
-      });
+  const referrerPromise = Services.timerFor(win)
+    .timeoutPromise(1000, Services.viewerForDoc(ampDoc).getReferrerUrl())
+    .catch(() => {
+      dev().expectedError('AMP-A4A', 'Referrer timeout!');
+      return '';
+    });
   const domLoading = getNavigationTiming(win, 'domLoading');
   return Promise.all([
-    getOrCreateAdCid(ampDoc, 'AMP_ECID_GOOGLE', '_ga'), referrerPromise])
-      .then(promiseResults => {
-        const clientId = promiseResults[0];
-        const referrer = promiseResults[1];
-        const {pageViewId, canonicalUrl} = Services.documentInfoForDoc(ampDoc);
-        // Read by GPT for GA/GPT integration.
-        win.gaGlobal = win.gaGlobal || {cid: clientId, hid: pageViewId};
-        const {screen} = win;
-        const viewport = Services.viewportForDoc(ampDoc);
-        const viewportRect = viewport.getRect();
-        const viewportSize = viewport.getSize();
-        const visibilityState = Services.viewerForDoc(ampDoc)
-            .getVisibilityState();
-        return {
-          'is_amp': a4a.isXhrAllowed() ?
-            AmpAdImplementation.AMP_AD_XHR_TO_IFRAME_OR_AMP :
-            AmpAdImplementation.AMP_AD_IFRAME_GET,
-          'amp_v': internalRuntimeVersion(),
-          'd_imp': '1',
-          'c': getCorrelator(win, ampDoc, clientId),
-          'ga_cid': win.gaGlobal.cid || null,
-          'ga_hid': win.gaGlobal.hid || null,
-          'dt': startTime,
-          'biw': viewportRect.width,
-          'bih': viewportRect.height,
-          'u_aw': screen ? screen.availWidth : null,
-          'u_ah': screen ? screen.availHeight : null,
-          'u_cd': screen ? screen.colorDepth : null,
-          'u_w': screen ? screen.width : null,
-          'u_h': screen ? screen.height : null,
-          'u_tz': -new Date().getTimezoneOffset(),
-          'u_his': getHistoryLength(win),
-          'isw': win != win.top ? viewportSize.width : null,
-          'ish': win != win.top ? viewportSize.height : null,
-          'art': getAmpRuntimeTypeParameter(win),
-          'vis': visibilityStateCodes[visibilityState] || '0',
-          'scr_x': viewport.getScrollLeft(),
-          'scr_y': viewport.getScrollTop(),
-          'bc': getBrowserCapabilitiesBitmap(win) || null,
-          'debug_experiment_id':
-              (/(?:#|,)deid=([\d,]+)/i.exec(win.location.hash) || [])[1] ||
-                  null,
-          'url': canonicalUrl || null,
-          'top': win != win.top ? topWindowUrlOrDomain(win) : null,
-          'loc': win.location.href == canonicalUrl ? null : win.location.href,
-          'ref': referrer || null,
-          'bdt': domLoading ? startTime - domLoading : null,
-        };
-      });
+    getOrCreateAdCid(ampDoc, 'AMP_ECID_GOOGLE', '_ga'),
+    referrerPromise,
+  ]).then(promiseResults => {
+    const clientId = promiseResults[0];
+    const referrer = promiseResults[1];
+    const {pageViewId, canonicalUrl} = Services.documentInfoForDoc(ampDoc);
+    // Read by GPT for GA/GPT integration.
+    win.gaGlobal = win.gaGlobal || {cid: clientId, hid: pageViewId};
+    const {screen} = win;
+    const viewport = Services.viewportForDoc(ampDoc);
+    const viewportRect = viewport.getRect();
+    const viewportSize = viewport.getSize();
+    const visibilityState = Services.viewerForDoc(ampDoc).getVisibilityState();
+    return {
+      'is_amp': a4a.isXhrAllowed()
+        ? AmpAdImplementation.AMP_AD_XHR_TO_IFRAME_OR_AMP
+        : AmpAdImplementation.AMP_AD_IFRAME_GET,
+      'amp_v': internalRuntimeVersion(),
+      'd_imp': '1',
+      'c': getCorrelator(win, ampDoc, clientId),
+      'ga_cid': win.gaGlobal.cid || null,
+      'ga_hid': win.gaGlobal.hid || null,
+      'dt': startTime,
+      'biw': viewportRect.width,
+      'bih': viewportRect.height,
+      'u_aw': screen ? screen.availWidth : null,
+      'u_ah': screen ? screen.availHeight : null,
+      'u_cd': screen ? screen.colorDepth : null,
+      'u_w': screen ? screen.width : null,
+      'u_h': screen ? screen.height : null,
+      'u_tz': -new Date().getTimezoneOffset(),
+      'u_his': getHistoryLength(win),
+      'isw': win != win.top ? viewportSize.width : null,
+      'ish': win != win.top ? viewportSize.height : null,
+      'art': getAmpRuntimeTypeParameter(win),
+      'vis': visibilityStateCodes[visibilityState] || '0',
+      'scr_x': viewport.getScrollLeft(),
+      'scr_y': viewport.getScrollTop(),
+      'bc': getBrowserCapabilitiesBitmap(win) || null,
+      'debug_experiment_id':
+        (/(?:#|,)deid=([\d,]+)/i.exec(win.location.hash) || [])[1] || null,
+      'url': canonicalUrl || null,
+      'top': win != win.top ? topWindowUrlOrDomain(win) : null,
+      'loc': win.location.href == canonicalUrl ? null : win.location.href,
+      'ref': referrer || null,
+      'bdt': domLoading ? startTime - domLoading : null,
+    };
+  });
 }
 
 /**
@@ -334,14 +350,18 @@ export function googlePageParameters(a4a, startTime) {
  * @return {!Promise<string>}
  */
 export function googleAdUrl(
-  a4a, baseUrl, startTime, parameters, opt_experimentIds) {
+  a4a,
+  baseUrl,
+  startTime,
+  parameters,
+  opt_experimentIds
+) {
   // TODO: Maybe add checks in case these promises fail.
   const blockLevelParameters = googleBlockParameters(a4a, opt_experimentIds);
-  return googlePageParameters(a4a, startTime)
-      .then(pageLevelParameters => {
-        Object.assign(parameters, blockLevelParameters, pageLevelParameters);
-        return truncAndTimeUrl(baseUrl, parameters, startTime);
-      });
+  return googlePageParameters(a4a, startTime).then(pageLevelParameters => {
+    Object.assign(parameters, blockLevelParameters, pageLevelParameters);
+    return truncAndTimeUrl(baseUrl, parameters, startTime);
+  });
 }
 
 /**
@@ -351,9 +371,11 @@ export function googleAdUrl(
  * @return {string}
  */
 export function truncAndTimeUrl(baseUrl, parameters, startTime) {
-  return buildUrl(
-      baseUrl, parameters, MAX_URL_LENGTH - 10, TRUNCATION_PARAM)
-    + '&dtd=' + elapsedTimeWithCeiling(Date.now(), startTime);
+  return (
+    buildUrl(baseUrl, parameters, MAX_URL_LENGTH - 10, TRUNCATION_PARAM) +
+    '&dtd=' +
+    elapsedTimeWithCeiling(Date.now(), startTime)
+  );
 }
 
 /**
@@ -406,9 +428,11 @@ function topWindowUrlOrDomain(win) {
       return win.top.location.hostname;
     }
     const secondFromTop = secondWindowFromTop(win);
-    if (secondFromTop == win ||
-        origin == ancestorOrigins[ancestorOrigins.length - 2]) {
-      return extractHost(secondFromTop./*OK*/document.referrer);
+    if (
+      secondFromTop == win ||
+      origin == ancestorOrigins[ancestorOrigins.length - 2]
+    ) {
+      return extractHost(secondFromTop./*OK*/ document.referrer);
     }
     return extractHost(topOrigin);
   } else {
@@ -417,7 +441,7 @@ function topWindowUrlOrDomain(win) {
     } catch (e) {}
     const secondFromTop = secondWindowFromTop(win);
     try {
-      return extractHost(secondFromTop./*OK*/document.referrer);
+      return extractHost(secondFromTop./*OK*/ document.referrer);
     } catch (e) {}
     return null;
   }
@@ -430,8 +454,7 @@ function topWindowUrlOrDomain(win) {
 function secondWindowFromTop(win) {
   let secondFromTop = win;
   let depth = 0;
-  while (secondFromTop.parent != secondFromTop.parent.parent &&
-        depth < 100) {
+  while (secondFromTop.parent != secondFromTop.parent.parent && depth < 100) {
     secondFromTop = secondFromTop.parent;
     depth++;
   }
@@ -463,10 +486,12 @@ function elapsedTimeWithCeiling(time, start) {
  */
 export function getCorrelator(win, elementOrAmpDoc, opt_cid) {
   if (!win.ampAdPageCorrelator) {
-    win.ampAdPageCorrelator = isExperimentOn(win, 'exp-new-correlator') ?
-      Math.floor(4503599627370496 * Math.random()) :
-      makeCorrelator(
-          Services.documentInfoForDoc(elementOrAmpDoc).pageViewId, opt_cid);
+    win.ampAdPageCorrelator = isExperimentOn(win, 'exp-new-correlator')
+      ? Math.floor(4503599627370496 * Math.random())
+      : makeCorrelator(
+          Services.documentInfoForDoc(elementOrAmpDoc).pageViewId,
+          opt_cid
+        );
   }
   return win.ampAdPageCorrelator;
 }
@@ -479,7 +504,7 @@ export function getCorrelator(win, elementOrAmpDoc, opt_cid) {
 function makeCorrelator(pageViewId, opt_clientId) {
   const pageViewIdNumeric = Number(pageViewId || 0);
   if (opt_clientId) {
-    return pageViewIdNumeric + ((opt_clientId.replace(/\D/g, '') % 1e6) * 1e6);
+    return pageViewIdNumeric + (opt_clientId.replace(/\D/g, '') % 1e6) * 1e6;
   } else {
     // In this case, pageViewIdNumeric is only 4 digits => too low entropy
     // to be useful as a page correlator.  So synthesize one from scratch.
@@ -489,7 +514,6 @@ function makeCorrelator(pageViewId, opt_clientId) {
   }
 }
 
-
 /**
  * Collect additional dimensions for the brdim parameter.
  * @param {!Window} win The window for which we read the browser dimensions.
@@ -512,7 +536,8 @@ export function additionalDimensions(win, viewportSize) {
     innerWidth = viewportSize.width;
     innerHeight = viewportSize.height;
   } catch (e) {}
-  return [win.screenLeft,
+  return [
+    win.screenLeft,
     win.screenTop,
     screenX,
     screenY,
@@ -521,7 +546,8 @@ export function additionalDimensions(win, viewportSize) {
     outerWidth,
     outerHeight,
     innerWidth,
-    innerHeight].join();
+    innerHeight,
+  ].join();
 }
 
 /**
@@ -570,7 +596,7 @@ export function getCsiAmpAnalyticsConfig() {
         // ast => ad schedule time
         // ars => ad render start
         'met.a4a':
-            'ast.${scheduleTime}~ars_lvt.${viewerLastVisibleTime}~ars.${time}',
+          'ast.${scheduleTime}~ars_lvt.${viewerLastVisibleTime}~ars.${time}',
         'qqid': '${qqid}',
       }),
       'adIframeLoaded': csiTrigger('ad-iframe-loaded', {
@@ -631,8 +657,9 @@ export function extractAmpAnalyticsConfig(a4a, responseHeaders) {
     return null;
   }
   try {
-    const analyticsConfig =
-        parseJson(responseHeaders.get(AMP_ANALYTICS_HEADER));
+    const analyticsConfig = parseJson(
+      responseHeaders.get(AMP_ANALYTICS_HEADER)
+    );
     devAssert(Array.isArray(analyticsConfig['url']));
     const urls = analyticsConfig['url'];
     if (!urls.length) {
@@ -662,12 +689,15 @@ export function extractAmpAnalyticsConfig(a4a, responseHeaders) {
     }
     // Security review needed here.
     config['requests'] = requests;
-    config['triggers']['continuousVisible']['request'] =
-        Object.keys(requests);
+    config['triggers']['continuousVisible']['request'] = Object.keys(requests);
     return config;
   } catch (err) {
-    dev().error('AMP-A4A', 'Invalid analytics', err,
-        responseHeaders.get(AMP_ANALYTICS_HEADER));
+    dev().error(
+      'AMP-A4A',
+      'Invalid analytics',
+      err,
+      responseHeaders.get(AMP_ANALYTICS_HEADER)
+    );
   }
   return null;
 }
@@ -690,8 +720,9 @@ export function extractAmpAnalyticsConfig(a4a, responseHeaders) {
 export function mergeExperimentIds(newIds, currentIdString) {
   const newIdString = newIds.filter(newId => Number(newId)).join(',');
   currentIdString = currentIdString || '';
-  return currentIdString + (currentIdString && newIdString ? ',' : '')
-      + newIdString;
+  return (
+    currentIdString + (currentIdString && newIdString ? ',' : '') + newIdString
+  );
 }
 
 /**
@@ -706,22 +737,31 @@ export function mergeExperimentIds(newIds, currentIdString) {
  * @return {?JsonObject} config or null if invalid/missing.
  */
 export function addCsiSignalsToAmpAnalyticsConfig(
-  win, element, config, qqid, isVerifiedAmpCreative) {
+  win,
+  element,
+  config,
+  qqid,
+  isVerifiedAmpCreative
+) {
   // Add CSI pingbacks.
   const correlator = getCorrelator(win, element);
   const slotId = Number(element.getAttribute('data-amp-slot-index'));
-  const eids = encodeURIComponent(
-      element.getAttribute(EXPERIMENT_ATTRIBUTE));
+  const eids = encodeURIComponent(element.getAttribute(EXPERIMENT_ATTRIBUTE));
   const adType = element.getAttribute('type');
-  const initTime =
-      Number(getTimingDataSync(win, 'navigationStart') || Date.now());
-  const deltaTime = Math.round(win.performance && win.performance.now ?
-    win.performance.now() : (Date.now() - initTime));
-  const baseCsiUrl = 'https://csi.gstatic.com/csi?s=a4a' +
-      `&c=${correlator}&slotId=${slotId}&qqid.${slotId}=${qqid}` +
-      `&dt=${initTime}` +
-      (eids != 'null' ? `&e.${slotId}=${eids}` : '') +
-      `&rls=${internalRuntimeVersion()}&adt.${slotId}=${adType}`;
+  const initTime = Number(
+    getTimingDataSync(win, 'navigationStart') || Date.now()
+  );
+  const deltaTime = Math.round(
+    win.performance && win.performance.now
+      ? win.performance.now()
+      : Date.now() - initTime
+  );
+  const baseCsiUrl =
+    'https://csi.gstatic.com/csi?s=a4a' +
+    `&c=${correlator}&slotId=${slotId}&qqid.${slotId}=${qqid}` +
+    `&dt=${initTime}` +
+    (eids != 'null' ? `&e.${slotId}=${eids}` : '') +
+    `&rls=${internalRuntimeVersion()}&adt.${slotId}=${adType}`;
   const isAmpSuffix = isVerifiedAmpCreative ? 'Friendly' : 'CrossDomain';
   config['triggers']['continuousVisibleIniLoad'] = {
     'on': 'ini-load',
@@ -735,14 +775,14 @@ export function addCsiSignalsToAmpAnalyticsConfig(
     'selectionMethod': 'closest',
     'request': 'renderStartCsi',
   };
-  config['requests']['iniLoadCsi'] = baseCsiUrl +
-      `&met.a4a.${slotId}=iniLoadCsi${isAmpSuffix}.${deltaTime}`;
-  config['requests']['renderStartCsi'] = baseCsiUrl +
-      `&met.a4a.${slotId}=renderStartCsi${isAmpSuffix}.${deltaTime}`;
+  config['requests']['iniLoadCsi'] =
+    baseCsiUrl + `&met.a4a.${slotId}=iniLoadCsi${isAmpSuffix}.${deltaTime}`;
+  config['requests']['renderStartCsi'] =
+    baseCsiUrl + `&met.a4a.${slotId}=renderStartCsi${isAmpSuffix}.${deltaTime}`;
 
   // Add CSI ping for visibility.
-  config['requests']['visibilityCsi'] = baseCsiUrl +
-      `&met.a4a.${slotId}=visibilityCsi.${deltaTime}`;
+  config['requests']['visibilityCsi'] =
+    baseCsiUrl + `&met.a4a.${slotId}=visibilityCsi.${deltaTime}`;
   config['triggers']['continuousVisible']['request'].push('visibilityCsi');
   return config;
 }
@@ -756,8 +796,11 @@ export function addCsiSignalsToAmpAnalyticsConfig(
  */
 export function getEnclosingContainerTypes(adElement) {
   const containerTypeSet = {};
-  for (let el = adElement.parentElement, counter = 0;
-    el && counter < 20; el = el.parentElement, counter++) {
+  for (
+    let el = adElement.parentElement, counter = 0;
+    el && counter < 20;
+    el = el.parentElement, counter++
+  ) {
     const tagName = el.tagName.toUpperCase();
     if (ValidAdContainerTypes[tagName]) {
       containerTypeSet[ValidAdContainerTypes[tagName]] = true;
@@ -779,9 +822,12 @@ export function maybeAppendErrorParameter(adUrl, parameterValue) {
   // truncated and error parameter is not already present.  Note that we assume
   // that added, error parameter length will be less than truncation parameter
   // so adding will not cause length to exceed maximum.
-  if (new RegExp(`[?|&](${encodeURIComponent(TRUNCATION_PARAM.name)}=` +
-      `${encodeURIComponent(String(TRUNCATION_PARAM.value))}|aet=[^&]*)$`)
-      .test(adUrl)) {
+  if (
+    new RegExp(
+      `[?|&](${encodeURIComponent(TRUNCATION_PARAM.name)}=` +
+        `${encodeURIComponent(String(TRUNCATION_PARAM.value))}|aet=[^&]*)$`
+    ).test(adUrl)
+  ) {
     return;
   }
   const modifiedAdUrl = adUrl + `&aet=${parameterValue}`;
@@ -795,12 +841,14 @@ export function maybeAppendErrorParameter(adUrl, parameterValue) {
  * @return {?string}
  */
 export function getBinaryTypeNumericalCode(type) {
-  return {
-    'production': '0',
-    'control': '1',
-    'canary': '2',
-    'rc': '3',
-  }[type] || null;
+  return (
+    {
+      'production': '0',
+      'control': '1',
+      'canary': '2',
+      'rc': '3',
+    }[type] || null
+  );
 }
 
 /** @const {!RegExp} */
@@ -825,16 +873,18 @@ export let IdentityToken;
 export function getIdentityToken(win, ampDoc, consentPolicyId) {
   // If configured to use amp-consent, delay request until consent state is
   // resolved.
-  win['goog_identity_prom'] = win['goog_identity_prom'] ||
-      (consentPolicyId
-        ? getConsentPolicyState(ampDoc.getHeadNode(), consentPolicyId)
-        : Promise.resolve(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED))
-          .then(consentState =>
-            consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
-            consentState == CONSENT_POLICY_STATE.UNKNOWN ?
-            /** @type{!IdentityToken} */({}) :
-              executeIdentityTokenFetch(win, ampDoc));
-  return /** @type {!Promise<!IdentityToken>} */(win['goog_identity_prom']);
+  win['goog_identity_prom'] =
+    win['goog_identity_prom'] ||
+    (consentPolicyId
+      ? getConsentPolicyState(ampDoc.getHeadNode(), consentPolicyId)
+      : Promise.resolve(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED)
+    ).then(consentState =>
+      consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
+      consentState == CONSENT_POLICY_STATE.UNKNOWN
+        ? /** @type {!IdentityToken} */ ({})
+        : executeIdentityTokenFetch(win, ampDoc)
+    );
+  return /** @type {!Promise<!IdentityToken>} */ (win['goog_identity_prom']);
 }
 
 /**
@@ -845,42 +895,63 @@ export function getIdentityToken(win, ampDoc, consentPolicyId) {
  * @param {number=} startTime
  * @return {!Promise<!IdentityToken>}
  */
-function executeIdentityTokenFetch(win, ampDoc, redirectsRemaining = 1,
-  domain = undefined, startTime = Date.now()) {
+function executeIdentityTokenFetch(
+  win,
+  ampDoc,
+  redirectsRemaining = 1,
+  domain = undefined,
+  startTime = Date.now()
+) {
   const url = getIdentityTokenRequestUrl(win, ampDoc, domain);
-  return Services.xhrFor(win).fetchJson(url, {
-    mode: 'cors',
-    method: 'GET',
-    ampCors: false,
-    credentials: 'include',
-  }).then(res => res.json())
-      .then(obj => {
-        const token = obj['newToken'];
-        const jar = obj['1p_jar'] || '';
-        const pucrd = obj['pucrd'] || '';
-        const freshLifetimeSecs = parseInt(obj['freshLifetimeSecs'] || '', 10);
-        const validLifetimeSecs = parseInt(obj['validLifetimeSecs'] || '', 10);
-        const altDomain = obj['altDomain'];
-        const fetchTimeMs = Date.now() - startTime;
-        if (IDENTITY_DOMAIN_REGEXP_.test(altDomain)) {
-          if (!redirectsRemaining--) {
-            // Max redirects, log?
-            return {fetchTimeMs};
-          }
-          return executeIdentityTokenFetch(
-              win, ampDoc, redirectsRemaining, altDomain, startTime);
-        } else if (freshLifetimeSecs > 0 && validLifetimeSecs > 0 &&
-            typeof token == 'string') {
-          return {token, jar, pucrd, freshLifetimeSecs, validLifetimeSecs,
-            fetchTimeMs};
+  return Services.xhrFor(win)
+    .fetchJson(url, {
+      mode: 'cors',
+      method: 'GET',
+      ampCors: false,
+      credentials: 'include',
+    })
+    .then(res => res.json())
+    .then(obj => {
+      const token = obj['newToken'];
+      const jar = obj['1p_jar'] || '';
+      const pucrd = obj['pucrd'] || '';
+      const freshLifetimeSecs = parseInt(obj['freshLifetimeSecs'] || '', 10);
+      const validLifetimeSecs = parseInt(obj['validLifetimeSecs'] || '', 10);
+      const altDomain = obj['altDomain'];
+      const fetchTimeMs = Date.now() - startTime;
+      if (IDENTITY_DOMAIN_REGEXP_.test(altDomain)) {
+        if (!redirectsRemaining--) {
+          // Max redirects, log?
+          return {fetchTimeMs};
         }
-        // returning empty
-        return {fetchTimeMs};
-      })
-      .catch(unusedErr => {
-        // TODO log?
-        return {};
-      });
+        return executeIdentityTokenFetch(
+          win,
+          ampDoc,
+          redirectsRemaining,
+          altDomain,
+          startTime
+        );
+      } else if (
+        freshLifetimeSecs > 0 &&
+        validLifetimeSecs > 0 &&
+        typeof token == 'string'
+      ) {
+        return {
+          token,
+          jar,
+          pucrd,
+          freshLifetimeSecs,
+          validLifetimeSecs,
+          fetchTimeMs,
+        };
+      }
+      // returning empty
+      return {fetchTimeMs};
+    })
+    .catch(unusedErr => {
+      // TODO log?
+      return {};
+    });
 }
 
 /**
@@ -893,12 +964,14 @@ function executeIdentityTokenFetch(win, ampDoc, redirectsRemaining = 1,
 export function getIdentityTokenRequestUrl(win, ampDoc, domain = undefined) {
   if (!domain && win != win.top && win.location.ancestorOrigins) {
     const matches = IDENTITY_DOMAIN_REGEXP_.exec(
-        win.location.ancestorOrigins[win.location.ancestorOrigins.length - 1]);
+      win.location.ancestorOrigins[win.location.ancestorOrigins.length - 1]
+    );
     domain = (matches && matches[0]) || undefined;
   }
   domain = domain || '.google.com';
-  const canonical =
-    extractHost(Services.documentInfoForDoc(ampDoc).canonicalUrl);
+  const canonical = extractHost(
+    Services.documentInfoForDoc(ampDoc).canonicalUrl
+  );
   return `https://adservice${domain}/adsid/integrator.json?domain=${canonical}`;
 }
 
diff --git a/ads/google/adsense.js b/ads/google/adsense.js
index f41569d5b921..8d69b59fb9de 100644
--- a/ads/google/adsense.js
+++ b/ads/google/adsense.js
@@ -33,21 +33,43 @@ import {validateData} from '../../3p/3p';
  */
 export function adsense(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [],
-      ['adClient', 'adSlot', 'adHost', 'adtest', 'tagOrigin', 'experimentId',
-        'ampSlotIndex', 'adChannel', 'autoFormat', 'fullWidth', 'package',
-        'npaOnUnknownConsent', 'matchedContentUiType', 'matchedContentRowsNum',
-        'matchedContentColumnsNum']);
+  validateData(
+    data,
+    [],
+    [
+      'adClient',
+      'adSlot',
+      'adHost',
+      'adtest',
+      'tagOrigin',
+      'experimentId',
+      'ampSlotIndex',
+      'adChannel',
+      'autoFormat',
+      'fullWidth',
+      'package',
+      'npaOnUnknownConsent',
+      'matchedContentUiType',
+      'matchedContentRowsNum',
+      'matchedContentColumnsNum',
+    ]
+  );
 
-  if (data['autoFormat'] == ADSENSE_RSPV_TAG ||
-      data['autoFormat'] == ADSENSE_MCRSPV_TAG) {
-    userAssert(hasOwn(data, 'fullWidth'),
-        'Responsive AdSense ad units require the attribute data-full-width.');
+  if (
+    data['autoFormat'] == ADSENSE_RSPV_TAG ||
+    data['autoFormat'] == ADSENSE_MCRSPV_TAG
+  ) {
+    userAssert(
+      hasOwn(data, 'fullWidth'),
+      'Responsive AdSense ad units require the attribute data-full-width.'
+    );
 
-    userAssert(data['height'] == ADSENSE_RSPV_WHITELISTED_HEIGHT,
-        `Specified height ${data['height']} in <amp-ad> tag is not equal to ` +
-      `the required height of ${ADSENSE_RSPV_WHITELISTED_HEIGHT} for ` +
-      'responsive AdSense ad units.');
+    userAssert(
+      data['height'] == ADSENSE_RSPV_WHITELISTED_HEIGHT,
+      `Specified height ${data['height']} in <amp-ad> tag is not equal to ` +
+        `the required height of ${ADSENSE_RSPV_WHITELISTED_HEIGHT} for ` +
+        'responsive AdSense ad units.'
+    );
   }
 
   if (global.context.clientId) {
@@ -62,14 +84,22 @@ export function adsense(global, data) {
   global.document.body.appendChild(s);
 
   const i = global.document.createElement('ins');
-  ['adChannel', 'adClient', 'adSlot', 'adHost', 'adtest', 'tagOrigin',
-    'package', 'matchedContentUiType', 'matchedContentRowsNum',
-    'matchedContentColumnsNum']
-      .forEach(datum => {
-        if (data[datum]) {
-          i.setAttribute('data-' + camelCaseToDash(datum), data[datum]);
-        }
-      });
+  [
+    'adChannel',
+    'adClient',
+    'adSlot',
+    'adHost',
+    'adtest',
+    'tagOrigin',
+    'package',
+    'matchedContentUiType',
+    'matchedContentRowsNum',
+    'matchedContentColumnsNum',
+  ].forEach(datum => {
+    if (data[datum]) {
+      i.setAttribute('data-' + camelCaseToDash(datum), data[datum]);
+    }
+  });
   i.setAttribute('data-page-url', global.context.canonicalUrl);
   i.setAttribute('class', 'adsbygoogle');
   setStyles(i, {
@@ -85,8 +115,9 @@ export function adsense(global, data) {
         return;
       }
     case CONSENT_POLICY_STATE.INSUFFICIENT:
-      (global.adsbygoogle = global.adsbygoogle || [])
-          ['requestNonPersonalizedAds'] = true;
+      (global.adsbygoogle = global.adsbygoogle || [])[
+        'requestNonPersonalizedAds'
+      ] = true;
       break;
   }
   if (data['experimentId']) {
diff --git a/ads/google/csa.js b/ads/google/csa.js
index f1ed923418be..0eea294220f3 100644
--- a/ads/google/csa.js
+++ b/ads/google/csa.js
@@ -39,7 +39,6 @@ export const AD_TYPE = {
   AFSH_BACKFILL: 3,
 };
 
-
 /**
  * Request Custom Search Ads (Adsense for Search or AdSense for Shopping).
  * @param {!Window} global The window object of the iframe
@@ -47,15 +46,19 @@ export const AD_TYPE = {
  */
 export function csa(global, data) {
   // Get parent width in case we want to override
-  const width = global.document.body./*OK*/clientWidth;
+  const width = global.document.body./*OK*/ clientWidth;
 
-  validateData(data, [], [
-    'afshPageOptions',
-    'afshAdblockOptions',
-    'afsPageOptions',
-    'afsAdblockOptions',
-    'ampSlotIndex',
-  ]);
+  validateData(
+    data,
+    [],
+    [
+      'afshPageOptions',
+      'afshAdblockOptions',
+      'afsPageOptions',
+      'afsAdblockOptions',
+      'ampSlotIndex',
+    ]
+  );
 
   // Add the ad container to the document
   const containerDiv = global.document.createElement('div');
@@ -68,13 +71,21 @@ export function csa(global, data) {
 
   // Parse all the options
   const afshPage = Object.assign(
-      Object(tryParseJson(data['afshPageOptions'])), pageOptions);
+    Object(tryParseJson(data['afshPageOptions'])),
+    pageOptions
+  );
   const afsPage = Object.assign(
-      Object(tryParseJson(data['afsPageOptions'])), pageOptions);
+    Object(tryParseJson(data['afsPageOptions'])),
+    pageOptions
+  );
   const afshAd = Object.assign(
-      Object(tryParseJson(data['afshAdblockOptions'])), adblockOptions);
+    Object(tryParseJson(data['afshAdblockOptions'])),
+    adblockOptions
+  );
   const afsAd = Object.assign(
-      Object(tryParseJson(data['afsAdblockOptions'])), adblockOptions);
+    Object(tryParseJson(data['afsAdblockOptions'])),
+    adblockOptions
+  );
 
   // Special case for AFSh when "auto" is the requested width
   if (afshAd['width'] == 'auto') {
@@ -82,18 +93,25 @@ export function csa(global, data) {
   }
 
   // Event listener needed for iOS9 bug
-  global.addEventListener('orientationchange',
-      orientationChangeHandler.bind(null, global, containerDiv));
+  global.addEventListener(
+    'orientationchange',
+    orientationChangeHandler.bind(null, global, containerDiv)
+  );
 
   // Register resize callbacks
   global.context.onResizeSuccess(
-      resizeSuccessHandler.bind(null, global, containerDiv));
+    resizeSuccessHandler.bind(null, global, containerDiv)
+  );
   global.context.onResizeDenied(
-      resizeDeniedHandler.bind(null, global, containerDiv));
+    resizeDeniedHandler.bind(null, global, containerDiv)
+  );
 
   // Only call for ads once the script has loaded
-  loadScript(global, 'https://www.google.com/adsense/search/ads.js',
-      requestCsaAds.bind(null, global, data, afsPage, afsAd, afshPage, afshAd));
+  loadScript(
+    global,
+    'https://www.google.com/adsense/search/ads.js',
+    requestCsaAds.bind(null, global, data, afsPage, afsAd, afshPage, afshAd)
+  );
 }
 
 /**
@@ -109,7 +127,7 @@ function orientationChangeHandler(global, containerDiv) {
   global.setTimeout(() => {
     // Force DOM reflow and repaint.
     // eslint-disable-next-line no-unused-vars
-    const ignore = global.document.body./*OK*/offsetHeight;
+    const ignore = global.document.body./*OK*/ offsetHeight;
     // Capture new height.
     let newHeight = getStyle(containerDiv, 'height');
     // In older versions of iOS, this height will be different because the
@@ -122,8 +140,8 @@ function orientationChangeHandler(global, containerDiv) {
       // Also update the onclick function to resize to the right height.
       const overflow = global.document.getElementById('overflow');
       if (overflow) {
-        overflow.onclick =
-            () => global.context.requestResize(undefined, newHeight);
+        overflow.onclick = () =>
+          global.context.requestResize(undefined, newHeight);
       }
       // Resize the container to the correct height.
       global.context.requestResize(undefined, newHeight);
@@ -218,8 +236,7 @@ function getAdType(data) {
   }
   if (data['afsPageOptions'] != null && data['afshPageOptions'] != null) {
     return AD_TYPE.AFSH_BACKFILL;
-  }
-  else {
+  } else {
     return AD_TYPE.UNSUPPORTED;
   }
 }
@@ -249,7 +266,7 @@ export function callbackWithNoBackfill(global, containerName, hasAd) {
  * @param {string} containerName The name of the CSA container
  * @param {boolean} hasAd Whether or not CSA returned an ad
  * @visibleForTesting
-*/
+ */
 export function callbackWithBackfill(global, page, ad, containerName, hasAd) {
   if (hasAd) {
     resizeIframe(global, containerName);
@@ -268,10 +285,10 @@ export function callbackWithBackfill(global, page, ad, containerName, hasAd) {
 export function resizeIframe(global, containerName) {
   // Get actual height of container
   const container = global.document.getElementById(containerName);
-  const height = container./*OK*/offsetHeight;
+  const height = container./*OK*/ offsetHeight;
   // Set initial AMP height
   currentAmpHeight =
-      global.context.initialIntersection.boundingClientRect.height;
+    global.context.initialIntersection.boundingClientRect.height;
 
   // If the height of the container is larger than the height of the
   // initially requested AMP tag, add the overflow element
@@ -336,10 +353,11 @@ function getOverflowLine(global) {
  * @return {!Element}
  */
 function getOverflowChevron(global) {
-  const svg = '<svg xmlns="http://www.w3.org/2000/svg" width="36px" ' +
-      'height="36px" viewBox="0 0 48 48" fill="#757575"><path d="M14.83' +
-      ' 16.42L24 25.59l9.17-9.17L36 19.25l-12 12-12-12z"/>' +
-      '<path d="M0-.75h48v48H0z" fill="none"/> </svg>';
+  const svg =
+    '<svg xmlns="http://www.w3.org/2000/svg" width="36px" ' +
+    'height="36px" viewBox="0 0 48 48" fill="#757575"><path d="M14.83' +
+    ' 16.42L24 25.59l9.17-9.17L36 19.25l-12 12-12-12z"/>' +
+    '<path d="M0-.75h48v48H0z" fill="none"/> </svg>';
 
   const chevron = global.document.createElement('div');
   setStyles(chevron, {
@@ -349,7 +367,7 @@ function getOverflowChevron(global) {
     marginRight: 'auto',
     display: 'block',
   });
-  chevron./*OK*/innerHTML = svg;
+  chevron./*OK*/ innerHTML = svg;
   return chevron;
 }
 
diff --git a/ads/google/doubleclick.js b/ads/google/doubleclick.js
index da1191d910d7..17bf71a20c2e 100644
--- a/ads/google/doubleclick.js
+++ b/ads/google/doubleclick.js
@@ -21,8 +21,10 @@ const TAG = 'DOUBLECLICK - DEPRECATED';
  * @param {!Object} opt_data
  */
 export function doubleclick(opt_global, opt_data) {
-  dev().error(TAG, 'The use of doubleclick.js has been deprecated. Please ' +
-              'switch to Fast Fetch. See documentation here: ' +
-              'https://github.com/ampproject/amphtml/issues/11834');
-
+  dev().error(
+    TAG,
+    'The use of doubleclick.js has been deprecated. Please ' +
+      'switch to Fast Fetch. See documentation here: ' +
+      'https://github.com/ampproject/amphtml/issues/11834'
+  );
 }
diff --git a/ads/google/ima-player-data.js b/ads/google/ima-player-data.js
index e0064557036a..64e884740a66 100644
--- a/ads/google/ima-player-data.js
+++ b/ads/google/ima-player-data.js
@@ -15,7 +15,6 @@
  */
 
 export class ImaPlayerData {
-
   /**
    * Create a new ImaPlayerData object.
    */
diff --git a/ads/google/imaVideo.js b/ads/google/imaVideo.js
index 167ef1d5cfa7..c2a0883e9edf 100644
--- a/ads/google/imaVideo.js
+++ b/ads/google/imaVideo.js
@@ -23,7 +23,6 @@ import {loadScript} from '../../3p/3p';
 import {throttle} from '../../src/utils/rate-limit';
 import {tryParseJson} from '../../src/json';
 
-
 /**
  * Possible player states.
  * @enum {number}
@@ -227,9 +226,8 @@ let showControlsThrottled = throttle(window, showControls, 1000);
  * @param {!Object} data
  */
 export function imaVideo(global, data) {
-
-  videoWidth = global./*OK*/innerWidth;
-  videoHeight = global./*OK*/innerHeight;
+  videoWidth = global./*OK*/ innerWidth;
+  videoHeight = global./*OK*/ innerHeight;
   adLabel = data.adLabel || 'Ad (%s of %s)';
 
   // Wraps *everything*.
@@ -432,7 +430,9 @@ export function imaVideo(global, data) {
   }
   videoPlayer.setAttribute('playsinline', true);
   videoPlayer.setAttribute(
-      'controlsList', 'nodownload nofullscreen noremoteplayback');
+    'controlsList',
+    'nodownload nofullscreen noremoteplayback'
+  );
   if (data.src) {
     const sourceElement = document.createElement('source');
     sourceElement.setAttribute('src', data.src);
@@ -469,9 +469,11 @@ export function imaVideo(global, data) {
   mouseDownEvent = 'mousedown';
   mouseMoveEvent = 'mousemove';
   mouseUpEvent = 'mouseup';
-  if (navigator.userAgent.match(/iPhone/i) ||
-      navigator.userAgent.match(/iPad/i) ||
-      navigator.userAgent.match(/Android/i)) {
+  if (
+    navigator.userAgent.match(/iPhone/i) ||
+    navigator.userAgent.match(/iPad/i) ||
+    navigator.userAgent.match(/Android/i)
+  ) {
     mobileBrowser = true;
     interactEvent = 'touchend';
     mouseDownEvent = 'touchstart';
@@ -483,18 +485,22 @@ export function imaVideo(global, data) {
     bigPlayDiv.addEventListener(mouseMoveEvent, onBigPlayTouchMove);
     bigPlayDiv.addEventListener(mouseUpEvent, onBigPlayTouchEnd);
     bigPlayDiv.addEventListener(
-        'tapwithoutdrag',
-        onBigPlayClick.bind(null, global));
+      'tapwithoutdrag',
+      onBigPlayClick.bind(null, global)
+    );
   } else {
     bigPlayDiv.addEventListener(
-        interactEvent,
-        onBigPlayClick.bind(null, global));
+      interactEvent,
+      onBigPlayClick.bind(null, global)
+    );
   }
   playPauseDiv.addEventListener(interactEvent, onPlayPauseClick);
   progressBarWrapperDiv.addEventListener(mouseDownEvent, onProgressClick);
   muteUnmuteDiv.addEventListener(interactEvent, onMuteUnmuteClick);
-  fullscreenDiv.addEventListener(interactEvent,
-      toggleFullscreen.bind(null, global));
+  fullscreenDiv.addEventListener(
+    interactEvent,
+    toggleFullscreen.bind(null, global)
+  );
 
   // Timeout is 1s, because showControls will hide after 3s
   showControlsThrottled = throttle(window, showControls, 1000);
@@ -502,25 +508,31 @@ export function imaVideo(global, data) {
   const fullScreenEvents = [
     'fullscreenchange',
     'mozfullscreenchange',
-    'webkitfullscreenchange'];
+    'webkitfullscreenchange',
+  ];
   fullScreenEvents.forEach(fsEvent => {
-    global.document.addEventListener(fsEvent,
-        onFullscreenChange.bind(null, global),
-        false);
+    global.document.addEventListener(
+      fsEvent,
+      onFullscreenChange.bind(null, global),
+      false
+    );
   });
 
   consentState = global.context.initialConsentState;
 
-  if (consentState == 4) { // UNKNOWN
+  if (consentState == 4) {
+    // UNKNOWN
     // On unknown consent state, do not load IMA. Treat this the same as if IMA
     // failed to load.
     onImaLoadFail();
   } else {
     // Set-up code that can't run until the IMA lib loads.
     loadScript(
-        /** @type {!Window} */ (global),
-        'https://imasdk.googleapis.com/js/sdkloader/ima3.js',
-        () => onImaLoadSuccess(global, data), onImaLoadFail);
+      /** @type {!Window} */ (global),
+      'https://imasdk.googleapis.com/js/sdkloader/ima3.js',
+      () => onImaLoadSuccess(global, data),
+      onImaLoadFail
+    );
   }
 }
 
@@ -571,8 +583,10 @@ function onImaLoadSuccess(global, data) {
     }
   }
 
-  adDisplayContainer =
-      new global.google.ima.AdDisplayContainer(adContainerDiv, videoPlayer);
+  adDisplayContainer = new global.google.ima.AdDisplayContainer(
+    adContainerDiv,
+    videoPlayer
+  );
 
   adsLoader = new global.google.ima.AdsLoader(adDisplayContainer);
   adsLoader.getSettings().setPlayerType('amp-ima');
@@ -582,8 +596,12 @@ function onImaLoadSuccess(global, data) {
   // an AdDisplayContainer.
   // playerType and playerVersion are used by the developers to track usage,
   // so we do not want to allow users to overwrite those values.
-  const skippedSettings =
-      ['locale', 'vpaidMode', 'playerType', 'playerVersion'];
+  const skippedSettings = [
+    'locale',
+    'vpaidMode',
+    'playerType',
+    'playerVersion',
+  ];
   for (const setting in imaSettings) {
     if (!skippedSettings.includes(setting)) {
       // Change e.g. 'ppid' to 'setPpid'.
@@ -594,13 +612,15 @@ function onImaLoadSuccess(global, data) {
     }
   }
   adsLoader.addEventListener(
-      global.google.ima.AdsManagerLoadedEvent.Type.ADS_MANAGER_LOADED,
-      onAdsManagerLoaded.bind(null, global),
-      false);
+    global.google.ima.AdsManagerLoadedEvent.Type.ADS_MANAGER_LOADED,
+    onAdsManagerLoaded.bind(null, global),
+    false
+  );
   adsLoader.addEventListener(
-      global.google.ima.AdErrorEvent.Type.AD_ERROR,
-      onAdsLoaderError,
-      false);
+    global.google.ima.AdErrorEvent.Type.AD_ERROR,
+    onAdsLoaderError,
+    false
+  );
 
   videoPlayer.addEventListener('ended', onContentEnded);
 
@@ -625,7 +645,10 @@ function onImaLoadSuccess(global, data) {
 function onImaLoadFail() {
   // Something blocked ima3.js from loading - ignore all IMA stuff and just play
   // content.
-  addHoverEventToElement(/** @type !Element */(videoPlayer), showControlsThrottled);
+  addHoverEventToElement(
+    /** @type {!Element} */ (videoPlayer),
+    showControlsThrottled
+  );
   imaLoadAllowed = false;
   postMessage({event: VideoEvents.LOAD});
 }
@@ -636,7 +659,7 @@ function onImaLoadFail() {
  */
 function htmlToElement(html) {
   const template = document.createElement('template');
-  template./*OK*/innerHTML = html;
+  template./*OK*/ innerHTML = html;
   return template.content.firstChild;
 }
 
@@ -654,7 +677,7 @@ function createIcon(global, name, fill = '#FFFFFF') {
   icon.setAttributeNS(null, 'width', '100%');
   icon.setAttributeNS(null, 'viewBox', '0 0 24 24');
   setStyle(icon, 'filter', 'drop-shadow(0px 0px 14px rgba(0,0,0,0.4))');
-  icon./*OK*/innerHTML = icons[name];
+  icon./*OK*/ innerHTML = icons[name];
   return icon;
 }
 
@@ -664,7 +687,7 @@ function createIcon(global, name, fill = '#FFFFFF') {
  * @param {string} [fill='#FFFFFF']
  */
 function changeIcon(element, name, fill = '#FFFFFF') {
-  element./*OK*/innerHTML = icons[name];
+  element./*OK*/ innerHTML = icons[name];
   if (fill != element.getAttributeNS(null, 'fill')) {
     element.setAttributeNS(null, 'fill', fill);
   }
@@ -752,7 +775,10 @@ export function playAds(global) {
     // Ad request resolved.
     try {
       adsManager.init(
-          videoWidth, videoHeight, global.google.ima.ViewMode.NORMAL);
+        videoWidth,
+        videoHeight,
+        global.google.ima.ViewMode.NORMAL
+      );
       adsManager.start();
     } catch (adError) {
       playVideo();
@@ -796,25 +822,31 @@ export function onContentEnded() {
 export function onAdsManagerLoaded(global, adsManagerLoadedEvent) {
   const adsRenderingSettings = new global.google.ima.AdsRenderingSettings();
   adsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete = true;
-  adsManager = adsManagerLoadedEvent.getAdsManager(videoPlayer,
-      adsRenderingSettings);
-  adsManager.addEventListener(global.google.ima.AdErrorEvent.Type.AD_ERROR,
-      onAdError);
+  adsManager = adsManagerLoadedEvent.getAdsManager(
+    videoPlayer,
+    adsRenderingSettings
+  );
   adsManager.addEventListener(
-      global.google.ima.AdEvent.Type.LOADED,
-      onAdLoad);
+    global.google.ima.AdErrorEvent.Type.AD_ERROR,
+    onAdError
+  );
+  adsManager.addEventListener(global.google.ima.AdEvent.Type.LOADED, onAdLoad);
   adsManager.addEventListener(
-      global.google.ima.AdEvent.Type.AD_PROGRESS,
-      onAdProgress);
+    global.google.ima.AdEvent.Type.AD_PROGRESS,
+    onAdProgress
+  );
   adsManager.addEventListener(
-      global.google.ima.AdEvent.Type.CONTENT_PAUSE_REQUESTED,
-      onContentPauseRequested.bind(null, global));
+    global.google.ima.AdEvent.Type.CONTENT_PAUSE_REQUESTED,
+    onContentPauseRequested.bind(null, global)
+  );
   adsManager.addEventListener(
-      global.google.ima.AdEvent.Type.CONTENT_RESUME_REQUESTED,
-      onContentResumeRequested);
+    global.google.ima.AdEvent.Type.CONTENT_RESUME_REQUESTED,
+    onContentResumeRequested
+  );
   adsManager.addEventListener(
-      global.google.ima.AdEvent.Type.ALL_ADS_COMPLETED,
-      onAllAdsCompleted);
+    global.google.ima.AdEvent.Type.ALL_ADS_COMPLETED,
+    onAllAdsCompleted
+  );
   if (muteAdsManagerOnLoaded) {
     adsManager.setVolume(0);
   }
@@ -832,7 +864,10 @@ export function onAdsLoaderError() {
   // failing to load an ad is just as good as loading one as far as starting
   // playback is concerned because our content will be ready to play.
   postMessage({event: VideoEvents.LOAD});
-  addHoverEventToElement(/** @type !Element */(videoPlayer), showControlsThrottled);
+  addHoverEventToElement(
+    /** @type {!Element} */ (videoPlayer),
+    showControlsThrottled
+  );
   if (playbackStarted) {
     playVideo();
   }
@@ -849,7 +884,10 @@ export function onAdError() {
   if (adsManager) {
     adsManager.destroy();
   }
-  addHoverEventToElement(/** @type !Element */(videoPlayer), showControlsThrottled);
+  addHoverEventToElement(
+    /** @type {!Element} */ (videoPlayer),
+    showControlsThrottled
+  );
   playVideo();
 }
 
@@ -876,8 +914,7 @@ export function onAdProgress(global) {
     remainingSeconds = '0' + remainingSeconds;
   }
   const label = adLabel.replace('%s', adPosition).replace('%s', totalAds);
-  countdownDiv.textContent
-    = `${label}: ${remainingMinutes}:${remainingSeconds}`;
+  countdownDiv.textContent = `${label}: ${remainingMinutes}:${remainingSeconds}`;
 }
 
 /**
@@ -888,15 +925,19 @@ export function onAdProgress(global) {
 export function onContentPauseRequested(global) {
   if (adsManagerWidthOnLoad) {
     adsManager.resize(
-        adsManagerWidthOnLoad,
-        adsManagerHeightOnLoad,
-        global.google.ima.ViewMode.NORMAL);
+      adsManagerWidthOnLoad,
+      adsManagerHeightOnLoad,
+      global.google.ima.ViewMode.NORMAL
+    );
     adsManagerWidthOnLoad = null;
     adsManagerHeightOnLoad = null;
   }
   adsActive = true;
   postMessage({event: VideoEvents.AD_START});
-  removeHoverEventFromElement(/** @type !Element */(videoPlayer), showControlsThrottled);
+  removeHoverEventFromElement(
+    /** @type {!Element} */ (videoPlayer),
+    showControlsThrottled
+  );
   setStyle(adContainerDiv, 'display', 'block');
   videoPlayer.removeEventListener('ended', onContentEnded);
   showAdControls();
@@ -910,7 +951,10 @@ export function onContentPauseRequested(global) {
  */
 export function onContentResumeRequested() {
   adsActive = false;
-  addHoverEventToElement(/** @type !Element */(videoPlayer), showControlsThrottled);
+  addHoverEventToElement(
+    /** @type {!Element} */ (videoPlayer),
+    showControlsThrottled
+  );
   postMessage({event: VideoEvents.AD_END});
   resetControlsAfterAd();
   if (!contentComplete) {
@@ -965,12 +1009,10 @@ function playerDataTick() {
  * @visibleForTesting
  */
 export function updateUi(currentTime, duration) {
-  timeNode.textContent =
-      formatTime(currentTime) + ' / ' + formatTime(duration);
-  const progressPercent =
-      Math.floor((currentTime / duration) * 100);
+  timeNode.textContent = formatTime(currentTime) + ' / ' + formatTime(duration);
+  const progressPercent = Math.floor((currentTime / duration) * 100);
   setStyle(progressLine, 'width', progressPercent + '%');
-  setStyle(progressMarkerDiv, 'left', (progressPercent - 1) + '%');
+  setStyle(progressMarkerDiv, 'left', progressPercent - 1 + '%');
 }
 
 /**
@@ -994,7 +1036,7 @@ export function formatTime(time) {
   } else {
     timeString += minutes + ':';
   }
-  const seconds = Math.floor(time - ((hours * 3600) + (minutes * 60)));
+  const seconds = Math.floor(time - (hours * 3600 + minutes * 60));
   timeString += zeroPad(seconds);
   return timeString;
 }
@@ -1044,7 +1086,7 @@ function onProgressClickEnd() {
 function onProgressMove(event) {
   const progressWrapperPosition = getPagePosition(progressBarWrapperDiv);
   const progressListStart = progressWrapperPosition.x;
-  const progressListWidth = progressBarWrapperDiv./*OK*/offsetWidth;
+  const progressListWidth = progressBarWrapperDiv./*OK*/ offsetWidth;
 
   // Handle Android Chrome touch events.
   const eventX = event.clientX || event.touches[0].pageX;
@@ -1065,12 +1107,14 @@ function onProgressMove(event) {
  */
 function getPagePosition(el) {
   let lx, ly;
-  for (lx = 0, ly = 0;
+  for (
+    lx = 0, ly = 0;
     el != null;
-    lx += el./*OK*/offsetLeft, ly += el./*OK*/offsetTop,
-    el = el./*OK*/offsetParent)
-  {}
-  return {x: lx,y: ly};
+    lx += el./*OK*/ offsetLeft,
+      ly += el./*OK*/ offsetTop,
+      el = el./*OK*/ offsetParent
+  ) {}
+  return {x: lx, y: ly};
 }
 
 /**
@@ -1168,34 +1212,33 @@ export function unmuteVideo() {
   }
 }
 
-
 /**
  * @param {Object} global
  */
 function exitFullscreen(global) {
   // The video is currently in fullscreen mode
-  const cancelFullscreen = global.document.exitFullscreen ||
-      global.document.exitFullScreen ||
-      global.document.webkitCancelFullScreen ||
-      global.document.mozCancelFullScreen;
+  const cancelFullscreen =
+    global.document.exitFullscreen ||
+    global.document.exitFullScreen ||
+    global.document.webkitCancelFullScreen ||
+    global.document.mozCancelFullScreen;
   if (cancelFullscreen) {
     cancelFullscreen.call(document);
   }
 }
 
-
 /**
  * @param {Object} global
  */
 function enterFullscreen(global) {
   // Try to enter fullscreen mode in the browser
   const requestFullscreen =
-      global.document.documentElement.requestFullscreen ||
-      global.document.documentElement.webkitRequestFullscreen ||
-      global.document.documentElement.mozRequestFullscreen ||
-      global.document.documentElement.requestFullScreen ||
-      global.document.documentElement.webkitRequestFullScreen ||
-      global.document.documentElement.mozRequestFullScreen;
+    global.document.documentElement.requestFullscreen ||
+    global.document.documentElement.webkitRequestFullscreen ||
+    global.document.documentElement.mozRequestFullscreen ||
+    global.document.documentElement.requestFullScreen ||
+    global.document.documentElement.webkitRequestFullScreen ||
+    global.document.documentElement.mozRequestFullScreen;
   if (requestFullscreen) {
     fullscreenWidth = window.screen.width;
     fullscreenHeight = window.screen.height;
@@ -1212,7 +1255,6 @@ function enterFullscreen(global) {
   }
 }
 
-
 /**
  * @param {Object} global
  */
@@ -1224,7 +1266,6 @@ function toggleFullscreen(global) {
   enterFullscreen(global);
 }
 
-
 /**
  * Called when the fullscreen mode of the browser or content player changes.
  * @param {Object} global
@@ -1234,7 +1275,10 @@ function onFullscreenChange(global) {
     if (adsManager) {
       // Resize the ad container
       adsManager.resize(
-          videoWidth, videoHeight, global.google.ima.ViewMode.NORMAL);
+        videoWidth,
+        videoHeight,
+        global.google.ima.ViewMode.NORMAL
+      );
       adsManagerWidthOnLoad = null;
       adsManagerHeightOnLoad = null;
     }
@@ -1248,8 +1292,10 @@ function onFullscreenChange(global) {
       if (adsManager) {
         // Resize the ad container
         adsManager.resize(
-            fullscreenWidth, fullscreenHeight,
-            global.google.ima.ViewMode.FULLSCREEN);
+          fullscreenWidth,
+          fullscreenHeight,
+          global.google.ima.ViewMode.FULLSCREEN
+        );
         adsManagerWidthOnLoad = null;
         adsManagerHeightOnLoad = null;
       }
@@ -1286,9 +1332,12 @@ export function showAdControls() {
     'height': miniControls ? '18px' : '22px',
   };
   setStyles(fullscreenDiv, buttonDefaults);
-  setStyles(muteUnmuteDiv, Object.assign(buttonDefaults, {
-    'margin-right': '10px',
-  }));
+  setStyles(
+    muteUnmuteDiv,
+    Object.assign(buttonDefaults, {
+      'margin-right': '10px',
+    })
+  );
   // show ad controls
   setStyle(countdownWrapperDiv, 'display', 'flex');
   showControls();
@@ -1310,9 +1359,12 @@ export function resetControlsAfterAd() {
   });
   const buttonDefaults = {'height': '30px'};
   setStyles(fullscreenDiv, buttonDefaults);
-  setStyles(muteUnmuteDiv, Object.assign(buttonDefaults, {
-    'margin-right': '20px',
-  }));
+  setStyles(
+    muteUnmuteDiv,
+    Object.assign(buttonDefaults, {
+      'margin-right': '20px',
+    })
+  );
   // show non-ad controls
   const showElement = button => setStyle(button, 'display', 'block');
   [playPauseDiv, timeDiv, progressBarWrapperDiv].forEach(showElement);
@@ -1416,8 +1468,10 @@ function onMessage(global, event) {
         });
         if (adsActive && !fullscreen) {
           adsManager.resize(
-              args.width, args.height,
-              global.google.ima.ViewMode.NORMAL);
+            args.width,
+            args.height,
+            global.google.ima.ViewMode.NORMAL
+          );
         } else {
           adsManagerWidthOnLoad = args.width;
           adsManagerHeightOnLoad = args.height;
@@ -1445,15 +1499,13 @@ function onMessage(global, event) {
   }
 }
 
-
 /**
  * @param {!Object} data
  */
 function postMessage(data) {
-  window.parent./*OK*/postMessage(data, '*');
+  window.parent./*OK*/ postMessage(data, '*');
 }
 
-
 /**
  * Returns the properties we need to access for testing.
  *
diff --git a/ads/google/test/test-adsense.js b/ads/google/test/test-adsense.js
index 402bf0a9aabb..c78bf40a3323 100644
--- a/ads/google/test/test-adsense.js
+++ b/ads/google/test/test-adsense.js
@@ -17,7 +17,6 @@ import {CONSENT_POLICY_STATE} from '../../../src/consent-state';
 import {adsense} from '../adsense';
 
 describes.realWin('adsenseDelayedFetch', {}, env => {
-
   let containerElem, data;
   const canonicalUrl = 'https://foo.com?some=page';
   const clientId = 'some_clientId';
@@ -42,7 +41,8 @@ describes.realWin('adsenseDelayedFetch', {}, env => {
     env.win.context = {canonicalUrl, clientId, pageViewId};
     data = {};
     Object.keys(elementAttributes).forEach(
-        attr => data[attr] = `some-${attr}`);
+      attr => (data[attr] = `some-${attr}`)
+    );
     data['experimentId'] = '1234,567,890';
   });
 
@@ -55,15 +55,20 @@ describes.realWin('adsenseDelayedFetch', {}, env => {
       },
     };
     adsense(env.win, data);
-    expect(env.win.document.querySelector('script[src=' +
-        '"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"]'))
-        .to.be.ok;
+    expect(
+      env.win.document.querySelector(
+        'script[src=' +
+          '"https://pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"]'
+      )
+    ).to.be.ok;
     const insElement = env.win.document.querySelector('ins.adsbygoogle');
     expect(insElement).to.be.ok;
     expect(insElement.getAttribute('data-page-url')).to.equal(canonicalUrl);
     Object.keys(elementAttributes).forEach(attr =>
-      expect(insElement.getAttribute(elementAttributes[attr]))
-          .to.equal(`some-${attr}`));
+      expect(insElement.getAttribute(elementAttributes[attr])).to.equal(
+        `some-${attr}`
+      )
+    );
     expect(pushArg).to.be.ok;
     expect(pushArg).to.jsonEqual({
       params: {
@@ -91,7 +96,8 @@ describes.realWin('adsenseDelayedFetch', {}, env => {
     data['height'] = '666';
     allowConsoleError(() => {
       expect(() => adsense(env.win, data)).to.throw(
-          /Specified height 666 in <amp-ad> tag is not equal to the required/);
+        /Specified height 666 in <amp-ad> tag is not equal to the required/
+      );
     });
   });
 
@@ -100,13 +106,12 @@ describes.realWin('adsenseDelayedFetch', {}, env => {
     data['height'] = '320';
     allowConsoleError(() => {
       expect(() => adsense(env.win, data)).to.throw(
-          /Responsive AdSense ad units require the attribute data-full-width.​/
+        /Responsive AdSense ad units require the attribute data-full-width.​/
       );
     });
   });
 
   describe('amp-consent integration', () => {
-
     let pushCount = 0;
     beforeEach(() => {
       pushCount = 0;
@@ -175,17 +180,17 @@ describes.realWin('adsenseDelayedFetch', {}, env => {
         if (result == RESULT_STATE.NO_REQUEST) {
           expect(insElement).to.not.be.ok;
           expect(pushCount).to.equal(0);
-          expect(env.win.adsbygoogle['requestNonPersonalizedAds'])
-              .to.be.undefined;
+          expect(env.win.adsbygoogle['requestNonPersonalizedAds']).to.be
+            .undefined;
         } else {
           expect(insElement).to.be.ok;
           expect(pushCount).to.equal(1);
           expect(env.win.adsbygoogle).to.be.ok;
           expect(env.win.adsbygoogle['requestNonPersonalizedAds']).to.equal(
-              result == RESULT_STATE.NPA ? true : undefined);
+            result == RESULT_STATE.NPA ? true : undefined
+          );
         }
       });
     }
-
   });
 });
diff --git a/ads/google/test/test-utils.js b/ads/google/test/test-utils.js
index e8e249388d6b..2818e1ce9d78 100644
--- a/ads/google/test/test-utils.js
+++ b/ads/google/test/test-utils.js
@@ -35,93 +35,131 @@ describe('#getMultiSizeDimensions', () => {
   const multiSizeDataStr = '300x300,300x250,250x250,250x200,150x50';
 
   function verifyArray(actual, lower, upper) {
-    expect(multiSizes.filter((size, index) => index < upper && index >= lower))
-        .to.deep.equal(actual);
+    expect(
+      multiSizes.filter((size, index) => index < upper && index >= lower)
+    ).to.deep.equal(actual);
   }
 
   it('should return all sizes', () => {
     const actual = getMultiSizeDimensions(
-        multiSizeDataStr, 300, 300,
-        /* Ignore lowerbound */ false);
+      multiSizeDataStr,
+      300,
+      300,
+      /* Ignore lowerbound */ false
+    );
     verifyArray(actual, 0, multiSizes.length);
   });
 
   it('should return a smaller array', () => {
     const actual = getMultiSizeDimensions(
-        multiSizeDataStr, 300, 250,
-        /* Ignore lowerbound */ false);
+      multiSizeDataStr,
+      300,
+      250,
+      /* Ignore lowerbound */ false
+    );
     verifyArray(actual, 1, multiSizes.length);
   });
 
   it('should return an even smaller array', () => {
     const actual = getMultiSizeDimensions(
-        multiSizeDataStr, 250, 250,
-        /* Ignore lowerbound */ false);
+      multiSizeDataStr,
+      250,
+      250,
+      /* Ignore lowerbound */ false
+    );
     verifyArray(actual, 2, multiSizes.length);
   });
 
   it('should return an empty array', () => {
     const actual = getMultiSizeDimensions(
-        multiSizeDataStr, 100, 50,
-        /* Ignore lowerbound */ false);
+      multiSizeDataStr,
+      100,
+      50,
+      /* Ignore lowerbound */ false
+    );
     verifyArray(actual, 0, 0);
   });
 
   it('should return a smaller array due to lowerbound', () => {
     const actual = getMultiSizeDimensions(
-        multiSizeDataStr, 300, 300,
-        /* Use lowerbound */ true);
+      multiSizeDataStr,
+      300,
+      300,
+      /* Use lowerbound */ true
+    );
 
     verifyArray(actual, 0, multiSizes.length - 1);
   });
 
-  it('should return a smaller array due to lowerbound + smaller primary size',
-      () => {
-        const actual = getMultiSizeDimensions(
-            multiSizeDataStr, 300, 250,
-            /* Use lowerbound */ true);
-        verifyArray(actual, 1, multiSizes.length - 1);
-      });
+  it('should return a smaller array due to lowerbound + smaller primary size', () => {
+    const actual = getMultiSizeDimensions(
+      multiSizeDataStr,
+      300,
+      250,
+      /* Use lowerbound */ true
+    );
+    verifyArray(actual, 1, multiSizes.length - 1);
+  });
 
   it('should return all positive sizes', () => {
     const actual = getMultiSizeDimensions(
-        '-1x300,' + multiSizeDataStr, 300, 300,
-        /* Ignore lowerbound */ false);
+      '-1x300,' + multiSizeDataStr,
+      300,
+      300,
+      /* Ignore lowerbound */ false
+    );
     verifyArray(actual, 0, multiSizes.length);
   });
 
   it('should add dummy size for fluid', () => {
-    expect(getMultiSizeDimensions('fluid', 300, 300, /* useLowerBound */ false))
-        .to.deep.equal([[320, 50]]);
+    expect(
+      getMultiSizeDimensions('fluid', 300, 300, /* useLowerBound */ false)
+    ).to.deep.equal([[320, 50]]);
   });
 
   it('should not add dummy size for fluid if fluid is primary size', () => {
-    expect(getMultiSizeDimensions(
-        'fluid', 300, 300,
+    expect(
+      getMultiSizeDimensions(
+        'fluid',
+        300,
+        300,
         /* useLowerBound */ false,
-        /* isFluidPrimary */ true))
-        .to.deep.equal([]);
+        /* isFluidPrimary */ true
+      )
+    ).to.deep.equal([]);
   });
 
   it('should allow fluid with fixed sizes', () => {
-    expect(getMultiSizeDimensions(
-        'fluid,300x300', 300, 300, /* useLowerBound */ false))
-        .to.deep.equal([[320, 50], [300, 300]]);
-    expect(getMultiSizeDimensions(
-        '300x300,fluid', 300, 300, /* useLowerBound */ false))
-        .to.deep.equal([[300, 300], [320, 50]]);
+    expect(
+      getMultiSizeDimensions(
+        'fluid,300x300',
+        300,
+        300,
+        /* useLowerBound */ false
+      )
+    ).to.deep.equal([[320, 50], [300, 300]]);
+    expect(
+      getMultiSizeDimensions(
+        '300x300,fluid',
+        300,
+        300,
+        /* useLowerBound */ false
+      )
+    ).to.deep.equal([[300, 300], [320, 50]]);
   });
 });
 
 describe('#getMatchedContentResponsiveHeightAndUpdatePubParams', () => {
   it('should use auto logic when no pub params present', () => {
     const element = document.createElement('div');
-    expect(getMatchedContentResponsiveHeightAndUpdatePubParams(400, element))
-        .to.equal(1472);
+    expect(
+      getMatchedContentResponsiveHeightAndUpdatePubParams(400, element)
+    ).to.equal(1472);
     expect(element.getAttribute(ExternalCorePubVars.ROWS_NUM)).to.equal('12');
     expect(element.getAttribute(ExternalCorePubVars.COLUMNS_NUM)).to.equal('1');
-    expect(element.getAttribute(ExternalCorePubVars.UI_TYPE))
-        .to.equal(LayoutType.MOBILE_BANNER_IMAGE_SIDEBYSIDE);
+    expect(element.getAttribute(ExternalCorePubVars.UI_TYPE)).to.equal(
+      LayoutType.MOBILE_BANNER_IMAGE_SIDEBYSIDE
+    );
   });
 
   it('should use pub control logic when pub params present', () => {
@@ -129,14 +167,17 @@ describe('#getMatchedContentResponsiveHeightAndUpdatePubParams', () => {
     element.setAttribute(ExternalCorePubVars.ROWS_NUM, '1,2');
     element.setAttribute(ExternalCorePubVars.COLUMNS_NUM, '3,4');
     element.setAttribute(
-        ExternalCorePubVars.UI_TYPE,
-        `${LayoutType.IMAGE_SIDEBYSIDE},${LayoutType.IMAGE_STACKED}`);
+      ExternalCorePubVars.UI_TYPE,
+      `${LayoutType.IMAGE_SIDEBYSIDE},${LayoutType.IMAGE_STACKED}`
+    );
 
-    expect(getMatchedContentResponsiveHeightAndUpdatePubParams(800, element))
-        .to.equal(382);
+    expect(
+      getMatchedContentResponsiveHeightAndUpdatePubParams(800, element)
+    ).to.equal(382);
     expect(element.getAttribute(ExternalCorePubVars.ROWS_NUM)).to.equal('2');
     expect(element.getAttribute(ExternalCorePubVars.COLUMNS_NUM)).to.equal('4');
-    expect(element.getAttribute(ExternalCorePubVars.UI_TYPE))
-        .to.equal(LayoutType.PUB_CONTROL_IMAGE_STACKED);
+    expect(element.getAttribute(ExternalCorePubVars.UI_TYPE)).to.equal(
+      LayoutType.PUB_CONTROL_IMAGE_STACKED
+    );
   });
 });
diff --git a/ads/google/utils.js b/ads/google/utils.js
index b2d60a3394a4..b113cd90df73 100644
--- a/ads/google/utils.js
+++ b/ads/google/utils.js
@@ -47,8 +47,9 @@ export const DUMMY_FLUID_SIZE = '320x50';
  * Required size to be sent with fluid requests in array format.
  * @const {!Array<number>}
  */
-const DUMMY_FLUID_SIZE_ARR =
-    DUMMY_FLUID_SIZE.split('x').map(dim => Number(dim));
+const DUMMY_FLUID_SIZE_ARR = DUMMY_FLUID_SIZE.split('x').map(dim =>
+  Number(dim)
+);
 
 /**
  * Given the amp-ad data attribute containing the multi-size dimensions, and a
@@ -71,13 +72,12 @@ export function getMultiSizeDimensions(
   primaryWidth,
   primaryHeight,
   multiSizeValidation,
-  isFluidPrimary = false) {
-
+  isFluidPrimary = false
+) {
   const dimensions = [];
   const arrayOfSizeStrs = multiSizeDataStr.split(',');
 
   for (let i = 0; i < arrayOfSizeStrs.length; i++) {
-
     const sizeStr = arrayOfSizeStrs[i];
     if (sizeStr.toLowerCase() == 'fluid') {
       if (!isFluidPrimary) {
@@ -99,22 +99,43 @@ export function getMultiSizeDimensions(
     const height = Number(size[1]);
 
     // Make sure that both dimensions given are positive numbers.
-    if (!validateDimensions(width, height,
+    if (
+      !validateDimensions(
+        width,
+        height,
         w => isNaN(w) || w <= 0,
         h => isNaN(h) || h <= 0,
-        badParams => badParams.map(badParam =>
-          `Invalid ${badParam.dim} of ${badParam.val} ` +
-            'given for secondary size.').join(' '))) {
+        badParams =>
+          badParams
+            .map(
+              badParam =>
+                `Invalid ${badParam.dim} of ${badParam.val} ` +
+                'given for secondary size.'
+            )
+            .join(' ')
+      )
+    ) {
       continue;
     }
 
     // Check that secondary size is not larger than primary size.
-    if (!isFluidPrimary && !validateDimensions(width, height,
+    if (
+      !isFluidPrimary &&
+      !validateDimensions(
+        width,
+        height,
         w => w > primaryWidth,
         h => h > primaryHeight,
-        badParams => badParams.map(badParam =>
-          `Secondary ${badParam.dim} ${badParam.val} ` +
-            `can't be larger than the primary ${badParam.dim}.`).join(' '))) {
+        badParams =>
+          badParams
+            .map(
+              badParam =>
+                `Secondary ${badParam.dim} ${badParam.val} ` +
+                `can't be larger than the primary ${badParam.dim}.`
+            )
+            .join(' ')
+      )
+    ) {
       continue;
     }
 
@@ -126,13 +147,22 @@ export function getMultiSizeDimensions(
       const minRatio = 2 / 3;
       const minWidth = minRatio * primaryWidth;
       const minHeight = minRatio * primaryHeight;
-      if (!validateDimensions(width, height,
+      if (
+        !validateDimensions(
+          width,
+          height,
           w => w < minWidth,
           h => h < minHeight,
-          badParams => badParams.map(badParam =>
-            `Secondary ${badParam.dim} ${badParam.val} is ` +
-              `smaller than 2/3rds of the primary ${badParam.dim}.`)
-              .join(' '))) {
+          badParams =>
+            badParams
+              .map(
+                badParam =>
+                  `Secondary ${badParam.dim} ${badParam.val} is ` +
+                  `smaller than 2/3rds of the primary ${badParam.dim}.`
+              )
+              .join(' ')
+        )
+      ) {
         continue;
       }
     }
@@ -162,8 +192,13 @@ export function getMultiSizeDimensions(
  * A function that will produce an informative error message.
  * @return {boolean}
  */
-function validateDimensions(width, height, widthCond, heightCond, errorBuilder)
-{
+function validateDimensions(
+  width,
+  height,
+  widthCond,
+  heightCond,
+  errorBuilder
+) {
   const badParams = [];
   if (widthCond(width)) {
     badParams.push({dim: 'width', val: width});
@@ -188,23 +223,29 @@ function validateDimensions(width, height, widthCond, heightCond, errorBuilder)
  * @return {number} height to use for the matched content slot.
  */
 export function getMatchedContentResponsiveHeightAndUpdatePubParams(
-  availableWidth, element) {
+  availableWidth,
+  element
+) {
   const pubControlParams = {
     numberOfRows: element.getAttribute(ExternalCorePubVars.ROWS_NUM),
     numberOfColumns: element.getAttribute(ExternalCorePubVars.COLUMNS_NUM),
     layoutType: element.getAttribute(ExternalCorePubVars.UI_TYPE),
   };
   let config;
-  if (pubControlParams.numberOfRows ||
-      pubControlParams.numberOfColumns ||
-      pubControlParams.layoutType) {
+  if (
+    pubControlParams.numberOfRows ||
+    pubControlParams.numberOfColumns ||
+    pubControlParams.layoutType
+  ) {
     // Publisher provided at least 1 param  which means we are in
     // "pub controlled matched content" mode.
     config = getPubControlConfig(availableWidth, pubControlParams);
   } else {
     // Publisher didn't provide any matched content params so use auto mode.
     config = getAutoConfig(
-        availableWidth, availableWidth <= MIN_PUB_CONTROL_WIDTH_OF_DESKTOP);
+      availableWidth,
+      availableWidth <= MIN_PUB_CONTROL_WIDTH_OF_DESKTOP
+    );
   }
   if (config.validationError) {
     user().error('AMP-AD', config.validationError);
diff --git a/ads/gumgum.js b/ads/gumgum.js
index 8f229cd99191..615ac9a2f87d 100644
--- a/ads/gumgum.js
+++ b/ads/gumgum.js
@@ -24,32 +24,29 @@ import {setStyles} from '../src/style';
 export function gumgum(global, data) {
   validateData(data, ['zone', 'slot']);
 
-  const
-      win = window,
-      ctx = win.context,
-      dom = global.document.getElementById('c'),
-      ampWidth = parseInt(data.width || '0', 10),
-      ampHeight = parseInt(data.height || '0', 10),
-      ggevents = global.ggevents || [];
+  const win = window,
+    ctx = win.context,
+    dom = global.document.getElementById('c'),
+    ampWidth = parseInt(data.width || '0', 10),
+    ampHeight = parseInt(data.height || '0', 10),
+    ggevents = global.ggevents || [];
 
-  const
-      {max} = Math,
-      slotId = parseInt(data.slot, 10),
-      onLoad = function(type) {
-        return function(evt) {
-          const
-              ad = Object.assign({width: 0, height: 0}, evt.ad || {}),
-              identifier = ['GUMGUM', type, evt.id].join('_');
-          ctx.reportRenderedEntityIdentifier(identifier);
-          ctx.renderStart({
-            width: max(ampWidth, ad.width),
-            height: max(ampHeight, ad.height),
-          });
-        };
-      },
-      noFill = function() {
-        ctx.noContentAvailable();
+  const {max} = Math,
+    slotId = parseInt(data.slot, 10),
+    onLoad = function(type) {
+      return function(evt) {
+        const ad = Object.assign({width: 0, height: 0}, evt.ad || {}),
+          identifier = ['GUMGUM', type, evt.id].join('_');
+        ctx.reportRenderedEntityIdentifier(identifier);
+        ctx.renderStart({
+          width: max(ampWidth, ad.width),
+          height: max(ampHeight, ad.height),
+        });
       };
+    },
+    noFill = function() {
+      ctx.noContentAvailable();
+    };
 
   // Ads logic starts
   global.ggv2id = data.zone;
diff --git a/ads/holder.js b/ads/holder.js
index e35519abde0a..dc5e5c14ab21 100644
--- a/ads/holder.js
+++ b/ads/holder.js
@@ -24,10 +24,10 @@ export function holder(global, data) {
   validateData(data, ['block'], []);
   const wcl = global.context.location;
   const n = navigator.userAgent;
-  let l = '&r' + Math.round((Math.random() * 10000000)) + '&h' + wcl.href;
+  let l = '&r' + Math.round(Math.random() * 10000000) + '&h' + wcl.href;
   if (!(n.indexOf('Safari') != -1 && n.indexOf('Chrome') == -1)) {
     l += '&c1';
   }
   data.queue = l;
-  writeScript(global,'https://i.holder.com.ua/js2/holder/ajax/ampv1.js');
+  writeScript(global, 'https://i.holder.com.ua/js2/holder/ajax/ampv1.js');
 }
diff --git a/ads/ibillboard.js b/ads/ibillboard.js
index aa1be9434746..93bec6106ff6 100644
--- a/ads/ibillboard.js
+++ b/ads/ibillboard.js
@@ -29,7 +29,6 @@ const validHosts = [
  * @param {!Object} data
  */
 export function ibillboard(global, data) {
-
   validateData(data, ['src']);
   const {src} = data;
   validateSrcPrefix(validHosts, src);
diff --git a/ads/idealmedia.js b/ads/idealmedia.js
index 443db3567bd1..ef1466d6db20 100644
--- a/ads/idealmedia.js
+++ b/ads/idealmedia.js
@@ -28,11 +28,12 @@ export function idealmedia(global, data) {
 
   document.body.appendChild(scriptRoot);
 
-  const url = `https://jsc.idealmedia.io/${encodeURIComponent(data.publisher[0])}/`
-    + `${encodeURIComponent(data.publisher[1])}/`
-    + `${encodeURIComponent(data.publisher)}.`
-    + `${encodeURIComponent(data.widget)}.js?t=`
-    + Math.floor(Date.now() / 36e5);
+  const url =
+    `https://jsc.idealmedia.io/${encodeURIComponent(data.publisher[0])}/` +
+    `${encodeURIComponent(data.publisher[1])}/` +
+    `${encodeURIComponent(data.publisher)}.` +
+    `${encodeURIComponent(data.widget)}.js?t=` +
+    Math.floor(Date.now() / 36e5);
 
   loadScript(global, data.url || url);
 }
diff --git a/ads/imedia.js b/ads/imedia.js
index ef34f61d2453..8da74128d79e 100644
--- a/ads/imedia.js
+++ b/ads/imedia.js
@@ -36,41 +36,48 @@ export function imedia(global, data) {
   }
   mW.inPagePositions.push({parentElement, context: global.context});
 
-  computeInMasterFrame(global, 'imedia-load', done => {
-    loadScript(global, 'https://i.imedia.cz/js/im3.js', () => {
-      if (global.im != null) {
-        mW.im = global.im;
-        mW.im.conf.referer = context.canonicalUrl;
+  computeInMasterFrame(
+    global,
+    'imedia-load',
+    done => {
+      loadScript(global, 'https://i.imedia.cz/js/im3.js', () => {
+        if (global.im != null) {
+          mW.im = global.im;
+          mW.im.conf.referer = context.canonicalUrl;
 
-        // send request to get all ads
-        mW.im.getAds(positions, {AMPcallback: ads => {
-          mW.ads = ads;
-          done(null);
-        }});
-      }});
-  }, () => {
-    mW.inPagePositions = mW.inPagePositions.filter(inPagePostion => {
-      let used = true;
-      positions.filter((position, index) => {
-
-        // match right element and zone to write advert from adserver
-        if (inPagePostion.parentElement.id == position.id) {
-          used = false;
-          position.id = inPagePostion.parentElement; // right element "c" to position obj.
-          if (mW.im.writeAd) {
-            mW.im.writeAd(mW.ads[index], position);
+          // send request to get all ads
+          mW.im.getAds(positions, {
+            AMPcallback: ads => {
+              mW.ads = ads;
+              done(null);
+            },
+          });
+        }
+      });
+    },
+    () => {
+      mW.inPagePositions = mW.inPagePositions.filter(inPagePostion => {
+        let used = true;
+        positions.filter((position, index) => {
+          // match right element and zone to write advert from adserver
+          if (inPagePostion.parentElement.id == position.id) {
+            used = false;
+            position.id = inPagePostion.parentElement; // right element "c" to position obj.
+            if (mW.im.writeAd) {
+              mW.im.writeAd(mW.ads[index], position);
 
-            // inform AMP runtime when the ad starts rendering
-            if (mW.ads[index].impress) {
-              inPagePostion.context.renderStart();
-            } else {
-              inPagePostion.context.noContentAvailable();
+              // inform AMP runtime when the ad starts rendering
+              if (mW.ads[index].impress) {
+                inPagePostion.context.renderStart();
+              } else {
+                inPagePostion.context.noContentAvailable();
+              }
             }
+            return false;
           }
-          return false;
-        }
+        });
+        return used; // remove (filter) element filled with add
       });
-      return used; // remove (filter) element filled with add
-    });
-  });
+    }
+  );
 }
diff --git a/ads/imonomy.js b/ads/imonomy.js
index 26b4d7d51375..c92969e029bf 100644
--- a/ads/imonomy.js
+++ b/ads/imonomy.js
@@ -33,14 +33,17 @@ export function imonomy(global, data) {
   if (!('slot' in data)) {
     global.CasaleArgs = data;
     writeScript(global, `//tag.imonomy.com/${data.pid}/indexJTag.js`);
-  } else { //DFP ad request call
+  } else {
+    //DFP ad request call
     let calledDoubleclick = false;
     data.timeout = isNaN(data.timeout) ? DEFAULT_TIMEOUT : data.timeout;
     const timer = setTimeout(() => {
       callDoubleclick(EVENT_TIMEOUT);
     }, data.timeout);
     const callDoubleclick = function(code) {
-      if (calledDoubleclick) { return; }
+      if (calledDoubleclick) {
+        return;
+      }
       calledDoubleclick = true;
       clearTimeout(timer);
       reportStats(data, code);
@@ -60,11 +63,15 @@ export function imonomy(global, data) {
     };
 
     loadScript(
-        global, `//tag.imonomy.com/amp/${data.pid}/amp.js`, () => {
-          global.context.renderStart();
-        }, () => {
-          global.context.noContentAvailable();
-        });
+      global,
+      `//tag.imonomy.com/amp/${data.pid}/amp.js`,
+      () => {
+        global.context.renderStart();
+      },
+      () => {
+        global.context.noContentAvailable();
+      }
+    );
   }
 }
 
@@ -87,7 +94,9 @@ function prepareData(data) {
  */
 function reportStats(data, code) {
   try {
-    if (code == EVENT_BADTAG) { return; }
+    if (code == EVENT_BADTAG) {
+      return;
+    }
     const xhttp = new XMLHttpRequest();
     xhttp.withCredentials = true;
     let unitFormat = '';
@@ -96,19 +105,19 @@ function reportStats(data, code) {
       pageLocation = encodeURIComponent(window.context.location.href);
     }
     const {subId, pid} = data,
-        trackId = 'AMP',
-        notFirst = true,
-        cid = '',
-        abLabel = '',
-        rand = Math.random();
+      trackId = 'AMP',
+      notFirst = true,
+      cid = '',
+      abLabel = '',
+      rand = Math.random();
     if (!isNaN(data.width) && !isNaN(data.height)) {
       unitFormat = `${data.width}x${data.height}`;
     }
     const uid = '',
-        isLocked = false,
-        isTrackable = false,
-        isClient = false,
-        tier = 0;
+      isLocked = false,
+      isTrackable = false,
+      isClient = false,
+      tier = 0;
     const baseUrl = '//srv.imonomy.com/internal/reporter';
     let unitCodeUrl = `${baseUrl}?v=2&subid=${subId}&sid=${pid}&`;
     unitCodeUrl = unitCodeUrl + `format=${unitFormat}&ai=`;
@@ -134,6 +143,5 @@ function reportStats(data, code) {
     xhttp.open('GET', unitCodeUrl, true);
     xhttp.setRequestHeader('Content-Type', 'application/json');
     xhttp.send();
-
   } catch (e) {}
 }
diff --git a/ads/improvedigital.js b/ads/improvedigital.js
index 8452f26ec981..16419918b010 100755
--- a/ads/improvedigital.js
+++ b/ads/improvedigital.js
@@ -23,13 +23,19 @@ import {validateData, writeScript} from '../3p/3p';
 export function improvedigital(global, data) {
   validateData(data, ['placement'], ['width', 'height', 'optin', 'keyvalue']);
 
-  let url = 'https://ad.360yield.com' +
-      '/adj?' +
-      'p=' + encodeURIComponent(data.placement) +
-      '&w=' + encodeURIComponent(data.width) +
-      '&h=' + encodeURIComponent(data.height) +
-      '&optin=' + encodeURIComponent(data.optin) +
-      '&tz=' + new Date().getTimezoneOffset();
+  let url =
+    'https://ad.360yield.com' +
+    '/adj?' +
+    'p=' +
+    encodeURIComponent(data.placement) +
+    '&w=' +
+    encodeURIComponent(data.width) +
+    '&h=' +
+    encodeURIComponent(data.height) +
+    '&optin=' +
+    encodeURIComponent(data.optin) +
+    '&tz=' +
+    new Date().getTimezoneOffset();
 
   const value = data.keyvalue;
   let newData = '';
@@ -38,11 +44,12 @@ export function improvedigital(global, data) {
 
   if (value && value.length > 0) {
     const keys = value.split('&');
-    for (let i = 0; i < keys.length; i++)
-    {
-      if (!keys[i]) {continue;}
+    for (let i = 0; i < keys.length; i++) {
+      if (!keys[i]) {
+        continue;
+      }
       const segment = keys[i].split('=');
-      const segment1 = (segment[1] ? encodeURIComponent(segment[1]) : '');
+      const segment1 = segment[1] ? encodeURIComponent(segment[1]) : '';
       if (validKey > 0) {
         newData += amps;
       }
diff --git a/ads/inabox/frame-overlay-helper.js b/ads/inabox/frame-overlay-helper.js
index 4752def46b13..3f3eadb1f8f6 100644
--- a/ads/inabox/frame-overlay-helper.js
+++ b/ads/inabox/frame-overlay-helper.js
@@ -26,7 +26,6 @@ import {
 import {resetStyles, setImportantStyles} from '../../src/style';
 import {restrictedVsync, timer} from './util';
 
-
 const CENTER_TRANSITION_TIME_MS = 150;
 const CENTER_TRANSITION_END_WAIT_TIME_MS = 50;
 
@@ -38,38 +37,47 @@ const CENTER_TRANSITION_END_WAIT_TIME_MS = 50;
  * @private
  */
 const expandFrameImpl = function(win, iframe, onFinish) {
-  restrictedVsync(win, {
-    measure(state) {
-      state.viewportSize = {
-        width: win./*OK*/innerWidth,
-        height: win./*OK*/innerHeight,
-      };
-      state.rect = layoutRectFromDomRect(iframe./*OK*/getBoundingClientRect());
+  restrictedVsync(
+    win,
+    {
+      measure(state) {
+        state.viewportSize = {
+          width: win./*OK*/ innerWidth,
+          height: win./*OK*/ innerHeight,
+        };
+        state.rect = layoutRectFromDomRect(
+          iframe./*OK*/ getBoundingClientRect()
+        );
+      },
+      mutate(state) {
+        const {width, height} = state.viewportSize;
+        const expandedRect = layoutRectLtwh(0, 0, width, height);
+
+        centerFrameUnderVsyncMutate(
+          iframe,
+          state.rect,
+          state.viewportSize,
+          CENTER_TRANSITION_TIME_MS
+        );
+
+        // To prevent double click during transition;
+        setImportantStyles(iframe, {'pointer-events': 'none'});
+
+        timer(() => {
+          restrictedVsync(win, {
+            mutate() {
+              resetStyles(iframe, ['pointer-events']);
+              expandFrameUnderVsyncMutate(iframe);
+              onFinish(state.rect, expandedRect);
+            },
+          });
+        }, CENTER_TRANSITION_TIME_MS + CENTER_TRANSITION_END_WAIT_TIME_MS);
+      },
     },
-    mutate(state) {
-      const {width, height} = state.viewportSize;
-      const expandedRect = layoutRectLtwh(0, 0, width, height);
-
-      centerFrameUnderVsyncMutate(iframe, state.rect, state.viewportSize,
-          CENTER_TRANSITION_TIME_MS);
-
-      // To prevent double click during transition;
-      setImportantStyles(iframe, {'pointer-events': 'none'});
-
-      timer(() => {
-        restrictedVsync(win, {
-          mutate() {
-            resetStyles(iframe, ['pointer-events']);
-            expandFrameUnderVsyncMutate(iframe);
-            onFinish(state.rect, expandedRect);
-          },
-        });
-      }, CENTER_TRANSITION_TIME_MS + CENTER_TRANSITION_END_WAIT_TIME_MS);
-    },
-  }, {});
+    {}
+  );
 };
 
-
 /**
  * Resets the frame from full overlay mode.
  * @param {!Window} win Host window.
@@ -89,14 +97,14 @@ const collapseFrameImpl = function(win, iframe, onFinish, onMeasure) {
       restrictedVsync(win, {
         measure() {
           onMeasure(
-              layoutRectFromDomRect(iframe./*OK*/getBoundingClientRect()));
+            layoutRectFromDomRect(iframe./*OK*/ getBoundingClientRect())
+          );
         },
       });
     },
   });
 };
 
-
 /**
  * Places the child frame in full overlay mode.
  * @param {!Window} win Host window.
@@ -105,7 +113,6 @@ const collapseFrameImpl = function(win, iframe, onFinish, onMeasure) {
  */
 export let expandFrame = expandFrameImpl;
 
-
 /**
  * @param {!Function} implFn
  * @visibleForTesting
@@ -114,7 +121,6 @@ export function stubExpandFrameForTesting(implFn) {
   expandFrame = implFn;
 }
 
-
 /**
  * @visibleForTesting
  */
@@ -122,7 +128,6 @@ export function resetExpandFrameForTesting() {
   expandFrame = expandFrameImpl;
 }
 
-
 /**
  * Places the child frame in full overlay mode.
  * @param {!Window} win Host window.
@@ -132,7 +137,6 @@ export function resetExpandFrameForTesting() {
  */
 export let collapseFrame = collapseFrameImpl;
 
-
 /**
  * @param {!Function} implFn
  * @visibleForTesting
@@ -141,7 +145,6 @@ export function stubCollapseFrameForTesting(implFn) {
   collapseFrame = implFn;
 }
 
-
 /**
  * @visibleForTesting
  */
diff --git a/ads/inabox/frame-overlay-manager.js b/ads/inabox/frame-overlay-manager.js
index 58105f872e5a..77683409567b 100644
--- a/ads/inabox/frame-overlay-manager.js
+++ b/ads/inabox/frame-overlay-manager.js
@@ -16,12 +16,10 @@
 
 import {collapseFrame, expandFrame} from './frame-overlay-helper';
 
-
 /**
  * Inabox host manager for full overlay frames.
  */
 export class FrameOverlayManager {
-
   /**
    * @param {!Window} win
    */
@@ -82,18 +80,23 @@ export class FrameOverlayManager {
     // We know what the collapsed box was. If the viewport has not changed while
     // expanded, we can immediately notify the consumer of the collapsed
     // box rect since it should be the same. Otherwise, we wait for remeasure.
-    collapseFrame(this.win_, iframe, () => {
-      this.isExpanded_ = false;
+    collapseFrame(
+      this.win_,
+      iframe,
+      () => {
+        this.isExpanded_ = false;
 
-      if (!this.viewportChangedSinceExpand_) {
-        callback(this.collapsedRect_);
-      }
-    }, collapsedRect => {
-      this.collapsedRect_ = collapsedRect;
+        if (!this.viewportChangedSinceExpand_) {
+          callback(this.collapsedRect_);
+        }
+      },
+      collapsedRect => {
+        this.collapsedRect_ = collapsedRect;
 
-      if (this.viewportChangedSinceExpand_) {
-        callback(this.collapsedRect_);
+        if (this.viewportChangedSinceExpand_) {
+          callback(this.collapsedRect_);
+        }
       }
-    });
+    );
   }
 }
diff --git a/ads/inabox/inabox-host.js b/ads/inabox/inabox-host.js
index becb491d54d4..93a347caa8ef 100644
--- a/ads/inabox/inabox-host.js
+++ b/ads/inabox/inabox-host.js
@@ -69,7 +69,7 @@ export class InaboxHost {
       win.AMP[INABOX_UNREGISTER_IFRAME] = host.unregisterIframe.bind(host);
     }
     const queuedMsgs = win[PENDING_MESSAGES];
-    const processMessageFn = /** @type function(Event)*/(evt => {
+    const processMessageFn = /** @type {function(Event)} */ (evt => {
       try {
         host.processMessage(evt);
       } catch (err) {
@@ -107,9 +107,10 @@ export class InaboxHost {
 function validateMessage(message) {
   const valid = !!(message.source && message.source.postMessage);
   if (!valid) {
-    user().error(TAG,
-        'Missing message.source. message.data='
-        + JSON.stringify(getData(message)));
+    user().error(
+      TAG,
+      'Missing message.source. message.data=' + JSON.stringify(getData(message))
+    );
   }
   return valid;
 }
diff --git a/ads/inabox/inabox-messaging-host.js b/ads/inabox/inabox-messaging-host.js
index 537082e284da..9a546b6954de 100644
--- a/ads/inabox/inabox-messaging-host.js
+++ b/ads/inabox/inabox-messaging-host.js
@@ -34,7 +34,6 @@ const READ_ONLY_MESSAGES = [MessageType.SEND_POSITIONS];
 
 /** Simple helper for named callbacks. */
 class NamedObservable {
-
   /**
    * Creates an instance of NamedObservable.
    */
@@ -76,7 +75,6 @@ class NamedObservable {
 let AdFrameDef;
 
 export class InaboxMessagingHost {
-
   /**
    * @param {!Window} win
    * @param {!Array<!HTMLIFrameElement>} iframes
@@ -98,13 +96,19 @@ export class InaboxMessagingHost {
     this.frameOverlayManager_ = new FrameOverlayManager(win);
 
     this.msgObservable_.listen(
-        MessageType.SEND_POSITIONS, this.handleSendPositions_);
+      MessageType.SEND_POSITIONS,
+      this.handleSendPositions_
+    );
 
     this.msgObservable_.listen(
-        MessageType.FULL_OVERLAY_FRAME, this.handleEnterFullOverlay_);
+      MessageType.FULL_OVERLAY_FRAME,
+      this.handleEnterFullOverlay_
+    );
 
     this.msgObservable_.listen(
-        MessageType.CANCEL_FULL_OVERLAY_FRAME, this.handleCancelFullOverlay_);
+      MessageType.CANCEL_FULL_OVERLAY_FRAME,
+      this.handleCancelFullOverlay_
+    );
   }
 
   /**
@@ -125,24 +129,29 @@ export class InaboxMessagingHost {
       return false;
     }
 
-    const adFrame =
-        this.getFrameElement_(message.source, request['sentinel']);
+    const adFrame = this.getFrameElement_(message.source, request['sentinel']);
     if (!adFrame) {
       dev().info(TAG, 'Ignored message from untrusted iframe:', message);
       return false;
     }
 
     const allowedTypes = adFrame.iframe.dataset['ampAllowed'];
-    const allowedTypesList = allowedTypes ?
-      allowedTypes.split(/\s*,\s*/) :
-      READ_ONLY_MESSAGES;
+    const allowedTypesList = allowedTypes
+      ? allowedTypes.split(/\s*,\s*/)
+      : READ_ONLY_MESSAGES;
     if (allowedTypesList.indexOf(request['type']) === -1) {
       dev().info(TAG, 'Ignored non-whitelisted message type:', message);
       return false;
     }
 
-    if (!this.msgObservable_.fire(request['type'], this,
-        [adFrame.measurableFrame, request, message.source, message.origin])) {
+    if (
+      !this.msgObservable_.fire(request['type'], this, [
+        adFrame.measurableFrame,
+        request,
+        message.source,
+        message.origin,
+      ])
+    ) {
       dev().warn(TAG, 'Unprocessed AMP message:', message);
       return false;
     }
@@ -160,16 +169,27 @@ export class InaboxMessagingHost {
   handleSendPositions_(iframe, request, source, origin) {
     const viewportRect = this.positionObserver_.getViewportRect();
     const targetRect = this.positionObserver_.getTargetRect(iframe);
-    this.sendPosition_(request, source, origin, dict({
-      'viewportRect': viewportRect,
-      'targetRect': targetRect,
-    }));
+    this.sendPosition_(
+      request,
+      source,
+      origin,
+      dict({
+        'viewportRect': viewportRect,
+        'targetRect': targetRect,
+      })
+    );
 
     devAssert(this.iframeMap_[request.sentinel]);
     this.iframeMap_[request.sentinel].observeUnregisterFn =
-        this.iframeMap_[request.sentinel].observeUnregisterFn ||
-        this.positionObserver_.observe(iframe, data =>
-          this.sendPosition_(request, source, origin, /** @type ?JsonObject */(data)));
+      this.iframeMap_[request.sentinel].observeUnregisterFn ||
+      this.positionObserver_.observe(iframe, data =>
+        this.sendPosition_(
+          request,
+          source,
+          origin,
+          /** @type {?JsonObject} */ (data)
+        )
+      );
     return true;
   }
 
@@ -182,9 +202,10 @@ export class InaboxMessagingHost {
    */
   sendPosition_(request, source, origin, data) {
     dev().fine(TAG, 'Sent position data to [%s] %s', request.sentinel, data);
-    source./*OK*/postMessage(
-        serializeMessage(MessageType.POSITION, request.sentinel, data),
-        origin);
+    source./*OK*/ postMessage(
+      serializeMessage(MessageType.POSITION, request.sentinel, data),
+      origin
+    );
   }
 
   /**
@@ -199,15 +220,17 @@ export class InaboxMessagingHost {
    */
   handleEnterFullOverlay_(iframe, request, source, origin) {
     this.frameOverlayManager_.expandFrame(iframe, boxRect => {
-      source./*OK*/postMessage(
-          serializeMessage(
-              MessageType.FULL_OVERLAY_FRAME_RESPONSE,
-              request.sentinel,
-              dict({
-                'success': true,
-                'boxRect': boxRect,
-              })),
-          origin);
+      source./*OK*/ postMessage(
+        serializeMessage(
+          MessageType.FULL_OVERLAY_FRAME_RESPONSE,
+          request.sentinel,
+          dict({
+            'success': true,
+            'boxRect': boxRect,
+          })
+        ),
+        origin
+      );
     });
 
     return true;
@@ -222,15 +245,17 @@ export class InaboxMessagingHost {
    */
   handleCancelFullOverlay_(iframe, request, source, origin) {
     this.frameOverlayManager_.collapseFrame(iframe, boxRect => {
-      source./*OK*/postMessage(
-          serializeMessage(
-              MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
-              request.sentinel,
-              dict({
-                'success': true,
-                'boxRect': boxRect,
-              })),
-          origin);
+      source./*OK*/ postMessage(
+        serializeMessage(
+          MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
+          request.sentinel,
+          dict({
+            'success': true,
+            'boxRect': boxRect,
+          })
+        ),
+        origin
+      );
     });
 
     return true;
@@ -271,8 +296,11 @@ export class InaboxMessagingHost {
     const measurableWin = measurableFrame.contentWindow;
     for (let i = 0; i < this.iframes_.length; i++) {
       const iframe = this.iframes_[i];
-      for (let j = 0, tempWin = measurableWin;
-        j < 10; j++, tempWin = tempWin.parent) {
+      for (
+        let j = 0, tempWin = measurableWin;
+        j < 10;
+        j++, tempWin = tempWin.parent
+      ) {
         if (iframe.contentWindow == tempWin) {
           this.iframeMap_[sentinel] = {iframe, measurableFrame};
           return this.iframeMap_[sentinel];
@@ -304,9 +332,11 @@ export class InaboxMessagingHost {
     // hierarchy. If win is not nested within x-domain framing, then
     // this loop breaks immediately.
     let topXDomainWin;
-    for (let j = 0, tempWin = win;
+    for (
+      let j = 0, tempWin = win;
       j < 10 && tempWin != tempWin.top && !canInspectWindow(tempWin);
-      j++, topXDomainWin = tempWin, tempWin = tempWin.parent) {}
+      j++, topXDomainWin = tempWin, tempWin = tempWin.parent
+    ) {}
     // If topXDomainWin exists, we know that the frame we want to measure
     // is a x-domain frame. Unfortunately, you can not access properties
     // on a x-domain window, so we can not do window.frameElement, and
@@ -314,18 +344,20 @@ export class InaboxMessagingHost {
     // over that parent's child iframes until we find the frame element
     // that corresponds to topXDomainWin.
     if (!!topXDomainWin) {
-      const iframes =
-            topXDomainWin.parent.document.querySelectorAll('iframe');
-      for (let k = 0, frame = iframes[k]; k < iframes.length;
-        k++, frame = iframes[k]) {
+      const iframes = topXDomainWin.parent.document.querySelectorAll('iframe');
+      for (
+        let k = 0, frame = iframes[k];
+        k < iframes.length;
+        k++, frame = iframes[k]
+      ) {
         if (frame.contentWindow == topXDomainWin) {
-          return /** @type {!HTMLIFrameElement} */(frame);
+          return /** @type {!HTMLIFrameElement} */ (frame);
         }
       }
     }
     // If topXDomainWin does not exist, then win is friendly, and we can
     // just return its frameElement directly.
-    return /** @type {!HTMLIFrameElement} */(win.frameElement);
+    return /** @type {!HTMLIFrameElement} */ (win.frameElement);
   }
 
   /**
diff --git a/ads/inabox/position-observer.js b/ads/inabox/position-observer.js
index 0247de991748..8f069cbd1ef3 100644
--- a/ads/inabox/position-observer.js
+++ b/ads/inabox/position-observer.js
@@ -35,7 +35,6 @@ let PositionEntryDef;
 const MIN_EVENT_INTERVAL_IN_MS = 100;
 
 export class PositionObserver {
-
   /**
    * @param {!Window} win
    */
@@ -60,10 +59,14 @@ export class PositionObserver {
   observe(element, callback) {
     if (!this.positionObservable_) {
       this.positionObservable_ = new Observable();
-      const listener = throttle(this.win_, () => {
-        this.update_();
-        this.positionObservable_.fire();
-      }, MIN_EVENT_INTERVAL_IN_MS);
+      const listener = throttle(
+        this.win_,
+        () => {
+          this.update_();
+          this.positionObservable_.fire();
+        },
+        MIN_EVENT_INTERVAL_IN_MS
+      );
       this.update_();
       this.win_.addEventListener('scroll', listener, true);
       this.win_.addEventListener('resize', listener, true);
@@ -89,7 +92,7 @@ export class PositionObserver {
    */
   getPositionEntry_(element) {
     return {
-      viewportRect: /** @type {!LayoutRectDef} */(this.viewportRect_),
+      viewportRect: /** @type {!LayoutRectDef} */ (this.viewportRect_),
       // relative position to viewport
       targetRect: this.getTargetRect(element),
     };
@@ -101,15 +104,16 @@ export class PositionObserver {
   getViewportRect() {
     const {scrollingElement_: scrollingElement, win_: win} = this;
 
-    const scrollLeft = scrollingElement./*OK*/scrollLeft ||
-        win./*OK*/pageXOffset;
-    const scrollTop = scrollingElement./*OK*/scrollTop ||
-        win./*OK*/pageYOffset;
+    const scrollLeft =
+      scrollingElement./*OK*/ scrollLeft || win./*OK*/ pageXOffset;
+    const scrollTop =
+      scrollingElement./*OK*/ scrollTop || win./*OK*/ pageYOffset;
     return layoutRectLtwh(
-        Math.round(scrollLeft),
-        Math.round(scrollTop),
-        win./*OK*/innerWidth,
-        win./*OK*/innerHeight);
+      Math.round(scrollLeft),
+      Math.round(scrollTop),
+      win./*OK*/ innerWidth,
+      win./*OK*/ innerHeight
+    );
   }
 
   /**
@@ -122,16 +126,23 @@ export class PositionObserver {
    * @return {!LayoutRectDef}
    */
   getTargetRect(element) {
-    let targetRect =
-        layoutRectFromDomRect(element./*OK*/getBoundingClientRect());
+    let targetRect = layoutRectFromDomRect(
+      element./*OK*/ getBoundingClientRect()
+    );
     const parentWin = element.ownerDocument.defaultView;
-    for (let j = 0, tempWin = parentWin;
+    for (
+      let j = 0, tempWin = parentWin;
       j < 10 && tempWin != this.win_ && tempWin != this.win_.top;
-      j++, tempWin = tempWin.parent) {
+      j++, tempWin = tempWin.parent
+    ) {
       const parentFrameRect = layoutRectFromDomRect(
-          tempWin.frameElement./*OK*/getBoundingClientRect());
-      targetRect = moveLayoutRect(targetRect,
-          parentFrameRect.left, parentFrameRect.top);
+        tempWin.frameElement./*OK*/ getBoundingClientRect()
+      );
+      targetRect = moveLayoutRect(
+        targetRect,
+        parentFrameRect.left,
+        parentFrameRect.top
+      );
     }
     return targetRect;
   }
@@ -143,16 +154,18 @@ export class PositionObserver {
  */
 function getScrollingElement(win) {
   const doc = win.document;
-  if (doc./*OK*/scrollingElement) {
-    return doc./*OK*/scrollingElement;
+  if (doc./*OK*/ scrollingElement) {
+    return doc./*OK*/ scrollingElement;
   }
-  if (doc.body
-      // Due to https://bugs.webkit.org/show_bug.cgi?id=106133, WebKit
-      // browsers have to use `body` and NOT `documentElement` for
-      // scrolling purposes. This has mostly being resolved via
-      // `scrollingElement` property, but this branch is still necessary
-      // for backward compatibility purposes.
-      && isWebKit(win.navigator.userAgent)) {
+  if (
+    doc.body &&
+    // Due to https://bugs.webkit.org/show_bug.cgi?id=106133, WebKit
+    // browsers have to use `body` and NOT `documentElement` for
+    // scrolling purposes. This has mostly being resolved via
+    // `scrollingElement` property, but this branch is still necessary
+    // for backward compatibility purposes.
+    isWebKit(win.navigator.userAgent)
+  ) {
     return doc.body;
   }
   return doc.documentElement;
diff --git a/ads/inabox/util.js b/ads/inabox/util.js
index c8aaea5a4893..daf2ebdd1c68 100644
--- a/ads/inabox/util.js
+++ b/ads/inabox/util.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Executes a "restricted" read/write vsync cycle.
  * This function exists mainly since the vsync service is not available for the
@@ -42,7 +41,6 @@ export function restrictedVsync(win, task, opt_state) {
   });
 }
 
-
 /**
  * Executes a function after a certain time.
  * The timer service is not available for the inabox host script, hence this
diff --git a/ads/inmobi.js b/ads/inmobi.js
index 063b027685c9..77f4e9d64c23 100644
--- a/ads/inmobi.js
+++ b/ads/inmobi.js
@@ -22,7 +22,7 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function inmobi(global, data) {
-  validateData(data, ['siteid','slotid'], []);
+  validateData(data, ['siteid', 'slotid'], []);
 
   const inmobiConf = {
     siteid: data.siteid,
@@ -40,7 +40,7 @@ export function inmobi(global, data) {
   };
 
   writeScript(global, 'https://cf.cdn.inmobi.com/ad/inmobi.secure.js', () => {
-    global.document.write('<div id=\'my-ad-slot\'></div>');
+    global.document.write("<div id='my-ad-slot'></div>");
     global._inmobi.getNewAd(document.getElementById('my-ad-slot'), inmobiConf);
   });
 }
diff --git a/ads/innity.js b/ads/innity.js
index 0006d9d0a6ba..26c1b88f95b5 100644
--- a/ads/innity.js
+++ b/ads/innity.js
@@ -24,9 +24,15 @@ export function innity(global, data) {
   validateData(data, ['pub', 'zone'], ['channel']);
   writeScript(global, 'https://cdn.innity.net/admanager.js', () => {
     const innityAMPZone = global.innity_adZone;
-    const innityAMPTag = new innityAMPZone(encodeURIComponent(data.pub),
-        encodeURIComponent(data.zone), {width: data.width, height: data.height,
-          channel: data.channel ? encodeURIComponent(data.channel) : ''});
+    const innityAMPTag = new innityAMPZone(
+      encodeURIComponent(data.pub),
+      encodeURIComponent(data.zone),
+      {
+        width: data.width,
+        height: data.height,
+        channel: data.channel ? encodeURIComponent(data.channel) : '',
+      }
+    );
     // AMP handling or noContentAvailable
     innityAMPTag.amp(global.context);
     // else renderStart (with at least house ad)
diff --git a/ads/ix.js b/ads/ix.js
index 6677ce90ddd4..1089899dfaf7 100644
--- a/ads/ix.js
+++ b/ads/ix.js
@@ -32,7 +32,8 @@ export function ix(global, data) {
   if (!('slot' in data)) {
     global.CasaleArgs = data;
     writeScript(global, 'https://js-sec.indexww.com/indexJTag.js');
-  } else { //DFP ad request call
+  } else {
+    //DFP ad request call
 
     const start = Date.now();
     let calledDoubleclick = false;
@@ -42,7 +43,9 @@ export function ix(global, data) {
     }, data.ixTimeout);
 
     const callDoubleclick = function(code) {
-      if (calledDoubleclick) { return; }
+      if (calledDoubleclick) {
+        return;
+      }
       calledDoubleclick = true;
       clearTimeout(timer);
       reportStats(data.ixId, data.ixSlot, data.slot, start, code);
@@ -61,9 +64,14 @@ export function ix(global, data) {
       ampError: EVENT_ERROR,
     };
 
-    loadScript(global, 'https://js-sec.indexww.com/apl/amp.js', undefined, () => {
-      callDoubleclick(EVENT_ERROR);
-    });
+    loadScript(
+      global,
+      'https://js-sec.indexww.com/apl/amp.js',
+      undefined,
+      () => {
+        callDoubleclick(EVENT_ERROR);
+      }
+    );
   }
 }
 
@@ -89,13 +97,15 @@ function prepareData(data) {
  */
 function reportStats(siteID, slotID, dfpSlot, start, code) {
   try {
-    if (code == EVENT_BADTAG) { return; }
+    if (code == EVENT_BADTAG) {
+      return;
+    }
     const xhttp = new XMLHttpRequest();
     xhttp.withCredentials = true;
 
     const deltat = Date.now() - start;
-    const ts = start / 1000 >> 0;
-    const ets = Date.now() / 1000 >> 0;
+    const ts = (start / 1000) >> 0;
+    const ets = (Date.now() / 1000) >> 0;
     let url = 'https://as-sec.casalemedia.com/headerstats?s=' + siteID;
     if (typeof window.context.location.href !== 'undefined') {
       url += '&u=' + encodeURIComponent(window.context.location.href);
@@ -112,7 +122,7 @@ function reportStats(siteID, slotID, dfpSlot, start, code) {
       stats += '"n":"amp-e",';
     }
     stats += '"v":"' + deltat + '",';
-    stats += '"b": "INDX","x": "' + dfpSlot.substring(0,64) + '"}]}]}';
+    stats += '"b": "INDX","x": "' + dfpSlot.substring(0, 64) + '"}]}]}';
 
     xhttp.open('POST', url, true);
     xhttp.setRequestHeader('Content-Type', 'application/json');
diff --git a/ads/jubna.js b/ads/jubna.js
index d88b71eebf71..8661f0cb855a 100644
--- a/ads/jubna.js
+++ b/ads/jubna.js
@@ -17,9 +17,9 @@
 import {loadScript, validateData} from '../3p/3p';
 
 /**
-* @param {!Window} global
-* @param {!Object} data
-*/
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function jubna(global, data) {
   validateData(data, ['wid', 'pid']);
   global._jubna = global._jubna || {
diff --git a/ads/kargo.js b/ads/kargo.js
index edb7ef160bc2..75a7226f6f87 100644
--- a/ads/kargo.js
+++ b/ads/kargo.js
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  computeInMasterFrame,
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {computeInMasterFrame, loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
@@ -30,7 +26,8 @@ export function kargo(global, data) {
   validateData(data, ['site', 'slot'], ['options']);
 
   // Kargo AdTag url
-  const kargoScriptUrl = 'https://storage.cloud.kargo.com/ad/network/tag/v3/' + data.site + '.js';
+  const kargoScriptUrl =
+    'https://storage.cloud.kargo.com/ad/network/tag/v3/' + data.site + '.js';
 
   // parse extra ad call options (optional)
   let options = {};
@@ -43,28 +40,33 @@ export function kargo(global, data) {
   // Add window source reference to ad options
   options.source_window = global;
 
-  computeInMasterFrame(global, 'kargo-load', function(done) {
-    // load AdTag in Master window
-    loadScript(this, kargoScriptUrl, () => {
-      let success = false;
-      if (this.Kargo != null && this.Kargo.loaded) {
-        success = true;
-      }
+  computeInMasterFrame(
+    global,
+    'kargo-load',
+    function(done) {
+      // load AdTag in Master window
+      loadScript(this, kargoScriptUrl, () => {
+        let success = false;
+        if (this.Kargo != null && this.Kargo.loaded) {
+          success = true;
+        }
 
-      done(success);
-    });
-  }, success => {
-    if (success) {
-      const w = options.source_window;
+        done(success);
+      });
+    },
+    success => {
+      if (success) {
+        const w = options.source_window;
 
-      // Add reference to Kargo api to this window if it's not the Master window
-      if (!w.context.isMaster) {
-        w.Kargo = w.context.master.Kargo;
-      }
+        // Add reference to Kargo api to this window if it's not the Master window
+        if (!w.context.isMaster) {
+          w.Kargo = w.context.master.Kargo;
+        }
 
-      w.Kargo.getAd(data.slot, options);
-    } else {
-      throw new Error('Kargo AdTag failed to load');
+        w.Kargo.getAd(data.slot, options);
+      } else {
+        throw new Error('Kargo AdTag failed to load');
+      }
     }
-  });
+  );
 }
diff --git a/ads/kiosked.js b/ads/kiosked.js
index 2aa5d57c06d6..235df8a09fab 100644
--- a/ads/kiosked.js
+++ b/ads/kiosked.js
@@ -27,14 +27,24 @@ export function kiosked(global, data) {
   if (hasOwn(data, 'scriptid')) {
     scriptId = data['scriptid'];
   }
-  window.addEventListener('kioskedAdRender', function() {
-    global.context.renderStart();
-  }, false);
+  window.addEventListener(
+    'kioskedAdRender',
+    function() {
+      global.context.renderStart();
+    },
+    false
+  );
 
-  window.addEventListener('kioskedAdNoFill', function() {
-    global.context.noContentAvailable();
-  }, false);
-
-  writeScript(global, 'https://scripts.kiosked.com/loader/kiosked-ad.js?staticTagId=' + scriptId);
+  window.addEventListener(
+    'kioskedAdNoFill',
+    function() {
+      global.context.noContentAvailable();
+    },
+    false
+  );
 
+  writeScript(
+    global,
+    'https://scripts.kiosked.com/loader/kiosked-ad.js?staticTagId=' + scriptId
+  );
 }
diff --git a/ads/kixer.js b/ads/kixer.js
index a8cbdf59516f..3ef34177e954 100644
--- a/ads/kixer.js
+++ b/ads/kixer.js
@@ -54,11 +54,13 @@ export function kixer(global, data) {
   const kxviewCheck = function(intersectionEntry) {
     inView = intersectionEntry.intersectionRatio > 0.5; // Half of the unit is in the viewport
     if (inView) {
-      if (!viewed && viewTimer == null) { // If the ad hasn't been viewed and the timer is not set
+      if (!viewed && viewTimer == null) {
+        // If the ad hasn't been viewed and the timer is not set
         viewTimer = setTimeout(kxviewFire, 900); // Set a Timeout to check the ad in 900ms and fire the view
       }
     } else {
-      if (viewTimer) { // If the Timeout is set
+      if (viewTimer) {
+        // If the Timeout is set
         clearTimeout(viewTimer); // Clear the Timeout
         viewTimer = null;
       }
@@ -66,7 +68,8 @@ export function kixer(global, data) {
   };
 
   const kxviewFire = function() {
-    if (inView) { // if the ad is still in the viewport
+    if (inView) {
+      // if the ad is still in the viewport
       if (typeof __kx_viewability.process_locked === 'function') {
         viewed = true;
         __kx_viewability.process_locked(data.adslot); // Fire kixer view
diff --git a/ads/kuadio.js b/ads/kuadio.js
index 0c0f9aec7456..94f13ea47142 100644
--- a/ads/kuadio.js
+++ b/ads/kuadio.js
@@ -21,8 +21,11 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function kuadio(global, data) {
-  validateData(data, ['widgetId'],
-      ['region', 'baseUrl', 'betaMode', 'debugMode', 'fastParse', 'ref']);
+  validateData(
+    data,
+    ['widgetId'],
+    ['region', 'baseUrl', 'betaMode', 'debugMode', 'fastParse', 'ref']
+  );
 
   global._pvmax = {
     region: data.region,
diff --git a/ads/lentainform.js b/ads/lentainform.js
index 698cdc4d2be1..40bcc3a9ac7d 100644
--- a/ads/lentainform.js
+++ b/ads/lentainform.js
@@ -28,11 +28,12 @@ export function lentainform(global, data) {
 
   document.body.appendChild(scriptRoot);
 
-  const url = `https://jsc.lentainform.com/${encodeURIComponent(data.publisher[0])}/`
-    + `${encodeURIComponent(data.publisher[1])}/`
-    + `${encodeURIComponent(data.publisher)}.`
-    + `${encodeURIComponent(data.widget)}.js?t=`
-    + Math.floor(Date.now() / 36e5);
+  const url =
+    `https://jsc.lentainform.com/${encodeURIComponent(data.publisher[0])}/` +
+    `${encodeURIComponent(data.publisher[1])}/` +
+    `${encodeURIComponent(data.publisher)}.` +
+    `${encodeURIComponent(data.widget)}.js?t=` +
+    Math.floor(Date.now() / 36e5);
 
   loadScript(global, data.url || url);
 }
diff --git a/ads/lockerdome.js b/ads/lockerdome.js
index 4058d18d676b..e15c76077991 100644
--- a/ads/lockerdome.js
+++ b/ads/lockerdome.js
@@ -17,9 +17,9 @@
 import {loadScript, validateData} from '../3p/3p';
 
 /**
-* @param {!Window} global
-* @param {!Object} data
-*/
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function lockerdome(global, data) {
   validateData(data, ['slot']);
   global.SLOT = data.slot;
diff --git a/ads/mantis.js b/ads/mantis.js
index 9c52a19e9051..5712ea12522b 100644
--- a/ads/mantis.js
+++ b/ads/mantis.js
@@ -24,9 +24,13 @@ export function mantisDisplay(global, data) {
   validateData(data, ['property', 'zone'], []);
 
   global.mantis = global.mantis || [];
-  global.mantis.push(['display', 'load', {
-    property: data['property'],
-  }]);
+  global.mantis.push([
+    'display',
+    'load',
+    {
+      property: data['property'],
+    },
+  ]);
 
   const d = global.document.createElement('div');
   d.setAttribute('data-mantis-zone', data['zone']);
@@ -43,11 +47,15 @@ export function mantisRecommend(global, data) {
   validateData(data, ['property'], ['css']);
 
   global.mantis = global.mantis || [];
-  global.mantis.push(['recommend', 'load', {
-    property: data['property'],
-    render: 'recommended',
-    css: data['css'],
-  }]);
+  global.mantis.push([
+    'recommend',
+    'load',
+    {
+      property: data['property'],
+      render: 'recommended',
+      css: data['css'],
+    },
+  ]);
 
   const d = global.document.createElement('div');
   d.setAttribute('id', 'recommended');
diff --git a/ads/mediaimpact.js b/ads/mediaimpact.js
index 2c001e062304..e26709c5f93f 100644
--- a/ads/mediaimpact.js
+++ b/ads/mediaimpact.js
@@ -25,10 +25,11 @@ export function mediaimpact(global, data) {
   /* eslint google-camelcase/google-camelcase: 0 */
   global.sas_loadHandler = function(f) {
     if (f.hasAd) {
-      f.crea1 || (f.crea1 = {
-        width: 300,
-        height: 250,
-      });
+      f.crea1 ||
+        (f.crea1 = {
+          width: 300,
+          height: 250,
+        });
       global.context.renderStart({
         width: f.crea1.width,
         height: f.crea1.height,
@@ -37,23 +38,35 @@ export function mediaimpact(global, data) {
       global.context.noContentAvailable();
     }
   };
-  window.addEventListener('load', function() {
-    asmi.sas.call(data.site + '/(' + data.page + ')', // eslint-disable-line no-undef
+  window.addEventListener(
+    'load',
+    function() {
+      // eslint-disable-next-line no-undef
+      asmi.sas.call(
+        data.site + '/(' + data.page + ')',
         data.format,
         data.target + ';googleAMP=1;',
         '',
-        'sas_' + data.slot.replace('sas_',''),
-        1);
-  }, false);
-  asmiSetup = { // eslint-disable-line no-unused-vars, no-undef
+        'sas_' + data.slot.replace('sas_', ''),
+        1
+      );
+    },
+    false
+  );
+  // eslint-disable-next-line no-unused-vars, no-undef
+  asmiSetup = {
     view: 'm',
     async: true,
   };
-  loadScript(global, 'https://ec-ns.sascdn.com/diff/251/pages/amp_default.js', () => {
-    if (!document.getElementById('sas_' + data.slot.replace('sas_',''))) {
-      const adContainer = global.document.createElement('div');
-      adContainer.id = 'sas_' + data.slot.replace('sas_','');
-      global.document.body.appendChild(adContainer);
+  loadScript(
+    global,
+    'https://ec-ns.sascdn.com/diff/251/pages/amp_default.js',
+    () => {
+      if (!document.getElementById('sas_' + data.slot.replace('sas_', ''))) {
+        const adContainer = global.document.createElement('div');
+        adContainer.id = 'sas_' + data.slot.replace('sas_', '');
+        global.document.body.appendChild(adContainer);
+      }
     }
-  });
+  );
 }
diff --git a/ads/medianet.js b/ads/medianet.js
index 9c49c2ea13b3..19206f93ee2c 100644
--- a/ads/medianet.js
+++ b/ads/medianet.js
@@ -19,14 +19,24 @@ import {getSourceUrl, parseUrlDeprecated} from '../src/url';
 import {hasOwn} from '../src/utils/object';
 
 const mandatoryParams = ['tagtype', 'cid'],
-    optionalParams = [
-      'timeout', 'crid', 'misc',
-      'slot', 'targeting', 'categoryExclusions',
-      'tagForChildDirectedTreatment', 'cookieOptions',
-      'overrideWidth', 'overrideHeight', 'loadingStrategy',
-      'consentNotificationId', 'useSameDomainRenderingUntilDeprecated',
-      'experimentId', 'multiSize', 'multiSizeValidation',
-    ];
+  optionalParams = [
+    'timeout',
+    'crid',
+    'misc',
+    'slot',
+    'targeting',
+    'categoryExclusions',
+    'tagForChildDirectedTreatment',
+    'cookieOptions',
+    'overrideWidth',
+    'overrideHeight',
+    'loadingStrategy',
+    'consentNotificationId',
+    'useSameDomainRenderingUntilDeprecated',
+    'experimentId',
+    'multiSize',
+    'multiSizeValidation',
+  ];
 // useSameDomainRenderingUntilDeprecated is included to ensure publisher
 // amp-tags don't break before 29th March
 
@@ -37,11 +47,12 @@ const mandatoryParams = ['tagtype', 'cid'],
 export function medianet(global, data) {
   validateData(data, mandatoryParams, optionalParams);
 
-  const publisherUrl = global.context.canonicalUrl ||
-      getSourceUrl(global.context.location.href),
-      referrerUrl = global.context.referrer;
+  const publisherUrl =
+      global.context.canonicalUrl || getSourceUrl(global.context.location.href),
+    referrerUrl = global.context.referrer;
 
-  if (data.tagtype === 'headerbidder') { //parameter tagtype is used to identify the product the publisher is using. Going ahead we plan to support more product types.
+  if (data.tagtype === 'headerbidder') {
+    //parameter tagtype is used to identify the product the publisher is using. Going ahead we plan to support more product types.
     loadHBTag(global, data, publisherUrl, referrerUrl);
   } else if (data.tagtype === 'cm' && data.crid) {
     loadCMTag(global, data, publisherUrl, referrerUrl);
@@ -143,7 +154,6 @@ function loadCMTag(global, data, publisherUrl, referrerUrl) {
  * @param {?string} referrerUrl
  */
 function loadHBTag(global, data, publisherUrl, referrerUrl) {
-
   /**
    * Loads MNETAd.
    */
@@ -162,8 +172,10 @@ function loadHBTag(global, data, publisherUrl, referrerUrl) {
 
     data.targeting = data.targeting || {};
 
-    if (global.advBidxc &&
-      typeof global.advBidxc.setAmpTargeting === 'function') {
+    if (
+      global.advBidxc &&
+      typeof global.advBidxc.setAmpTargeting === 'function'
+    ) {
       global.advBidxc.setAmpTargeting(global, data);
     }
     global.advBidxc.loadAmpAd(global, data);
@@ -174,8 +186,10 @@ function loadHBTag(global, data, publisherUrl, referrerUrl) {
    */
   function mnetHBHandle() {
     global.advBidxc = global.context.master.advBidxc;
-    if (global.advBidxc &&
-      typeof global.advBidxc.registerAmpSlot === 'function') {
+    if (
+      global.advBidxc &&
+      typeof global.advBidxc.registerAmpSlot === 'function'
+    ) {
       global.advBidxc.registerAmpSlot({
         cb: loadMNETAd,
         data,
@@ -184,22 +198,34 @@ function loadHBTag(global, data, publisherUrl, referrerUrl) {
     }
   }
 
-  computeInMasterFrame(global, 'medianet-hb-load', done => {
-    /*eslint "google-camelcase/google-camelcase": 0*/
-    global.advBidxc_requrl = publisherUrl;
-    global.advBidxc_refurl = referrerUrl;
-    global.advBidxc = {
-      registerAmpSlot: () => {},
-      setAmpTargeting: () => {},
-      renderAmpAd: () => {},
-      loadAmpAd: () => {
-        global.context.noContentAvailable();
-      },
-    };
-    global.advBidxc.amp = getCallbacksObject();
-    const publisherDomain = parseUrlDeprecated(publisherUrl).hostname;
-    writeScript(global, 'https://contextual.media.net/bidexchange.js?https=1&amp=1&cid=' + encodeURIComponent(data.cid) + '&dn=' + encodeURIComponent(publisherDomain), () => {
-      done(null);
-    });
-  }, mnetHBHandle);
+  computeInMasterFrame(
+    global,
+    'medianet-hb-load',
+    done => {
+      /*eslint "google-camelcase/google-camelcase": 0*/
+      global.advBidxc_requrl = publisherUrl;
+      global.advBidxc_refurl = referrerUrl;
+      global.advBidxc = {
+        registerAmpSlot: () => {},
+        setAmpTargeting: () => {},
+        renderAmpAd: () => {},
+        loadAmpAd: () => {
+          global.context.noContentAvailable();
+        },
+      };
+      global.advBidxc.amp = getCallbacksObject();
+      const publisherDomain = parseUrlDeprecated(publisherUrl).hostname;
+      writeScript(
+        global,
+        'https://contextual.media.net/bidexchange.js?https=1&amp=1&cid=' +
+          encodeURIComponent(data.cid) +
+          '&dn=' +
+          encodeURIComponent(publisherDomain),
+        () => {
+          done(null);
+        }
+      );
+    },
+    mnetHBHandle
+  );
 }
diff --git a/ads/medyanet.js b/ads/medyanet.js
index 5fb1dff2749b..a291e6e91012 100644
--- a/ads/medyanet.js
+++ b/ads/medyanet.js
@@ -46,13 +46,15 @@ function medyanetAds(global, data) {
   f.setAttribute('allowfullscreen', 'true');
   f.setAttribute('scrolling', 'no');
   setStyles(f, {
-    border: '0 none transparent' ,
-    position: 'relative' ,
+    border: '0 none transparent',
+    position: 'relative',
   });
   f.onload = function() {
     window.context.renderStart();
   };
-  f.src = `https://app.medyanetads.com/amp/medyanetads.html?bidderData=${global.domain}&adunit=${global.adunit}&size=${global.size}`;
+  f.src = `https://app.medyanetads.com/amp/medyanetads.html?bidderData=${
+    global.domain
+  }&adunit=${global.adunit}&size=${global.size}`;
   const url = window.top.location.search.substring(1);
   if (url && url.indexOf('hb=true') !== -1) {
     f.src = f.src + '&hb=true';
diff --git a/ads/meg.js b/ads/meg.js
index a0b60d69d2f2..1355673c6f3c 100644
--- a/ads/meg.js
+++ b/ads/meg.js
@@ -34,10 +34,15 @@ export function meg(global, data) {
       global.context.noContentAvailable();
     },
   };
-  loadScript(global, url, () => {
-    // Meg has been loaded
-  }, () => {
-    // Cannot load meg embed.js
-    global.context.noContentAvailable();
-  });
+  loadScript(
+    global,
+    url,
+    () => {
+      // Meg has been loaded
+    },
+    () => {
+      // Cannot load meg embed.js
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/mgid.js b/ads/mgid.js
index 6755a7bf03b5..52034330f4dd 100644
--- a/ads/mgid.js
+++ b/ads/mgid.js
@@ -28,11 +28,12 @@ export function mgid(global, data) {
 
   document.body.appendChild(scriptRoot);
 
-  const url = `https://jsc.mgid.com/${encodeURIComponent(data.publisher[0])}/`
-    + `${encodeURIComponent(data.publisher[1])}/`
-    + `${encodeURIComponent(data.publisher)}.`
-    + `${encodeURIComponent(data.widget)}.js?t=`
-    + Math.floor(Date.now() / 36e5);
+  const url =
+    `https://jsc.mgid.com/${encodeURIComponent(data.publisher[0])}/` +
+    `${encodeURIComponent(data.publisher[1])}/` +
+    `${encodeURIComponent(data.publisher)}.` +
+    `${encodeURIComponent(data.widget)}.js?t=` +
+    Math.floor(Date.now() / 36e5);
 
   loadScript(global, data.url || url);
 }
diff --git a/ads/miximedia.js b/ads/miximedia.js
index 7a46854bf7ad..96cd9ea2755f 100644
--- a/ads/miximedia.js
+++ b/ads/miximedia.js
@@ -22,7 +22,7 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function miximedia(global, data) {
   validateData(data, ['blockid']);
-  (global._miximedia = global._miximedia || {
+  global._miximedia = global._miximedia || {
     viewId: global.context.pageViewId,
     blockId: data['blockid'],
     htmlURL: data['canonical'] || global.context.canonicalUrl,
@@ -34,14 +34,17 @@ export function miximedia(global, data) {
     domFingerprint: window.context.domFingerprint,
     location: window.context.location,
     startTime: window.context.startTime,
-
-  });
+  };
   global._miximedia.AMPCallbacks = {
     renderStart: global.context.renderStart,
     noContentAvailable: global.context.noContentAvailable,
   };
   // load the miximedia  AMP JS file script asynchronously
   const rand = Math.round(Math.random() * 100000000);
-  loadScript(global, 'https://amp.mixi.media/ampclient/mixi.js?rand=' + rand, () => {},
-      global.context.noContentAvailable);
+  loadScript(
+    global,
+    'https://amp.mixi.media/ampclient/mixi.js?rand=' + rand,
+    () => {},
+    global.context.noContentAvailable
+  );
 }
diff --git a/ads/mixpo.js b/ads/mixpo.js
index 67e4b0173172..a8367dc513fe 100644
--- a/ads/mixpo.js
+++ b/ads/mixpo.js
@@ -14,22 +14,18 @@
  * limitations under the License.
  */
 
-import {validateData,writeScript} from '../3p/3p';
+import {validateData, writeScript} from '../3p/3p';
 
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function mixpo(global, data) {
-  validateData(data, [
-    'guid',
-    'subdomain',
-  ]);
+  validateData(data, ['guid', 'subdomain']);
 
   const g = global,
-      cdnSubdomain = (data.subdomain == 'www') ?
-        'cdn' : data.subdomain + '-cdn',
-      url = data.loader || `https://${cdnSubdomain}.mixpo.com/js/loader.js`;
+    cdnSubdomain = data.subdomain == 'www' ? 'cdn' : data.subdomain + '-cdn',
+    url = data.loader || `https://${cdnSubdomain}.mixpo.com/js/loader.js`;
 
   g.mixpoAd = {
     amp: true,
diff --git a/ads/nativo.js b/ads/nativo.js
index 8b78bcfb42ed..1633187e3b0a 100644
--- a/ads/nativo.js
+++ b/ads/nativo.js
@@ -22,11 +22,11 @@ import {loadScript} from '../3p/3p';
 export function nativo(global, data) {
   let ntvAd;
   (function(ntvAd, global, data) {
-    global
-        .history
-        .replaceState(null,
-            '',
-            location.pathname + location.hash.replace(/({).*(})/, ''));
+    global.history.replaceState(
+      null,
+      '',
+      location.pathname + location.hash.replace(/({).*(})/, '')
+    );
     // Private
     let delayedAdLoad = false;
     let percentageOfadViewed;
@@ -36,26 +36,27 @@ export function nativo(global, data) {
      * @return {boolean}
      */
     function isValidDelayTime(delay) {
-      return ((typeof delay != 'undefined'
-        && !isNaN(delay)
-        && parseInt(delay,10) >= 0));
+      return (
+        typeof delay != 'undefined' && !isNaN(delay) && parseInt(delay, 10) >= 0
+      );
     }
     /**
      * @param {!Object} data
      * @return {boolean}
      */
     function isDelayedTimeStart(data) {
-      return (isValidDelayTime(data.delayByTime)
-        && ('delay' in data)
-        && !('delayByView' in data));
+      return (
+        isValidDelayTime(data.delayByTime) &&
+        'delay' in data &&
+        !('delayByView' in data)
+      );
     }
     /**
      * @param {!Object} data
      * @return {boolean}
      */
     function isDelayedViewStart(data) {
-      return (isValidDelayTime(data.delayByTime)
-        && ('delayByView' in data));
+      return isValidDelayTime(data.delayByTime) && 'delayByView' in data;
     }
     /**
      * Loads ad when done.
@@ -64,9 +65,11 @@ export function nativo(global, data) {
       const g = global;
       global.context.observeIntersection(function(positions) {
         const coordinates = getLastPositionCoordinates(positions);
-        if (typeof coordinates.rootBounds != 'undefined'
-            && (coordinates.intersectionRect.top == (
-              coordinates.rootBounds.top + coordinates.boundingClientRect.y))) {
+        if (
+          typeof coordinates.rootBounds != 'undefined' &&
+          coordinates.intersectionRect.top ==
+            coordinates.rootBounds.top + coordinates.boundingClientRect.y
+        ) {
           if (isDelayedViewStart(data) && !delayedAdLoad) {
             g.PostRelease.Start();
             delayedAdLoad = true;
@@ -104,10 +107,10 @@ export function nativo(global, data) {
     function viewabilityConfiguration(positions) {
       const coordinates = getLastPositionCoordinates(positions);
       setPercentageOfadViewed(
-          (((coordinates.intersectionRect
-              .height * 100) / coordinates
-              .boundingClientRect
-              .height) / 100));
+        (coordinates.intersectionRect.height * 100) /
+          coordinates.boundingClientRect.height /
+          100
+      );
       global.PostRelease.checkIsAdVisible();
     }
     // Public
@@ -124,11 +127,17 @@ export function nativo(global, data) {
       global._prx.push(['cfg.RequestUrl', data['requestUrl'] || loc.href]);
       for (const key in data) {
         switch (key) {
-          case 'premium': global._prx.push(['cfg.SetUserPremium']); break;
-          case 'debug': global._prx.push(['cfg.Debug']); break;
-          case 'delay': if (isValidDelayTime(data.delayByTime)) {
-            global._prx.push(['cfg.SetNoAutoStart']);
-          } break;
+          case 'premium':
+            global._prx.push(['cfg.SetUserPremium']);
+            break;
+          case 'debug':
+            global._prx.push(['cfg.Debug']);
+            break;
+          case 'delay':
+            if (isValidDelayTime(data.delayByTime)) {
+              global._prx.push(['cfg.SetNoAutoStart']);
+            }
+            break;
         }
       }
     };
diff --git a/ads/navegg.js b/ads/navegg.js
index a576f98b5d88..5c7fc5252934 100644
--- a/ads/navegg.js
+++ b/ads/navegg.js
@@ -24,7 +24,8 @@ import {loadScript, validateData} from '../3p/3p';
 export function navegg(global, data) {
   validateData(data, ['acc']);
   const {acc} = data;
-  let seg, nvg = function() {};
+  let seg,
+    nvg = function() {};
   delete data.acc;
   nvg.prototype.getProfile = function() {};
   data.targeting = data.targeting || {};
diff --git a/ads/netletix.js b/ads/netletix.js
index 7cda96409d54..635b636101fc 100644
--- a/ads/netletix.js
+++ b/ads/netletix.js
@@ -37,32 +37,39 @@ const DEFAULT_NX_SITE = 'none';
 export function netletix(global, data) {
   /*eslint "google-camelcase/google-camelcase": 0*/
   global._netletix_amp = {
-    allowed_data: ['nxasync','nxv','nxsite','nxid','nxscript'],
-    mandatory_data: ['nxkey','nxunit','nxwidth','nxheight'],
+    allowed_data: ['nxasync', 'nxv', 'nxsite', 'nxid', 'nxscript'],
+    mandatory_data: ['nxkey', 'nxunit', 'nxwidth', 'nxheight'],
     data,
   };
 
-  validateData(data,
-      global._netletix_amp.mandatory_data, global._netletix_amp.allowed_data);
+  validateData(
+    data,
+    global._netletix_amp.mandatory_data,
+    global._netletix_amp.allowed_data
+  );
 
-  const nxh = (data.nxheight || DEFAULT_NX_HEIGHT);
-  const nxw = (data.nxwidth || DEFAULT_NX_WIDTH);
+  const nxh = data.nxheight || DEFAULT_NX_HEIGHT;
+  const nxw = data.nxwidth || DEFAULT_NX_WIDTH;
   const url = assertHttpsUrl(
-      addParamsToUrl(
-          NX_URL_FULL + encodeURIComponent(data.nxkey || DEFAULT_NX_KEY),
-          dict({
-            'unit': data.nxunit || DEFAULT_NX_UNIT,
-            'width': data.nxwidth || DEFAULT_NX_WIDTH,
-            'height': data.nxheight || DEFAULT_NX_HEIGHT,
-            'v': data.nxv || DEFAULT_NX_V,
-            'site': data.nxsite || DEFAULT_NX_SITE,
-            'ord': Math.round(Math.random() * 100000000),
-          })),
-      data.ampSlotIndex);
+    addParamsToUrl(
+      NX_URL_FULL + encodeURIComponent(data.nxkey || DEFAULT_NX_KEY),
+      dict({
+        'unit': data.nxunit || DEFAULT_NX_UNIT,
+        'width': data.nxwidth || DEFAULT_NX_WIDTH,
+        'height': data.nxheight || DEFAULT_NX_HEIGHT,
+        'v': data.nxv || DEFAULT_NX_V,
+        'site': data.nxsite || DEFAULT_NX_SITE,
+        'ord': Math.round(Math.random() * 100000000),
+      })
+    ),
+    data.ampSlotIndex
+  );
 
   window.addEventListener('message', event => {
-    if (event.data.type &&
-        startsWith(dev().assertString(event.data.type), 'nx-')) {
+    if (
+      event.data.type &&
+      startsWith(dev().assertString(event.data.type), 'nx-')
+    ) {
       switch (event.data.type) {
         case 'nx-resize':
           const renderconfig = {
@@ -70,8 +77,11 @@ export function netletix(global, data) {
             'height': event.data.height,
           };
           global.context.renderStart(renderconfig);
-          if (event.data.width && event.data.height &&
-              (event.data.width != nxw || event.data.height != nxh)) {
+          if (
+            event.data.width &&
+            event.data.height &&
+            (event.data.width != nxw || event.data.height != nxh)
+          ) {
             global.context.requestResize(event.data.width, event.data.height);
           }
           break;
diff --git a/ads/nokta.js b/ads/nokta.js
index 3baf19aadf06..8f8ee985de4c 100644
--- a/ads/nokta.js
+++ b/ads/nokta.js
@@ -27,5 +27,8 @@ export function nokta(global, data) {
   global.zone = data.zone;
   global.iwidth = data.width;
   global.iheight = data.height;
-  writeScript(global, 'https://static.virgul.com/theme/mockups/noktaamp/ampjs.js');
+  writeScript(
+    global,
+    'https://static.virgul.com/theme/mockups/noktaamp/ampjs.js'
+  );
 }
diff --git a/ads/nws.js b/ads/nws.js
index 779a8e98b7c4..c7ed163fdf3c 100644
--- a/ads/nws.js
+++ b/ads/nws.js
@@ -22,9 +22,14 @@ import {validateSrcPrefix, writeScript} from '../3p/3p';
  */
 export function nws(global, data) {
   const {src} = data;
-  validateSrcPrefix([
-    'https://tags.nws.ai/', 'https://echo.nws.press/', 'https://stories.nws.ai/',
-  ], src);
+  validateSrcPrefix(
+    [
+      'https://tags.nws.ai/',
+      'https://echo.nws.press/',
+      'https://stories.nws.ai/',
+    ],
+    src
+  );
   writeScript(global, src);
 }
 
@@ -36,8 +41,9 @@ export function nws(global, data) {
  */
 export function chargeads(global, data) {
   const {src} = data;
-  validateSrcPrefix([
-    'https://www.chargeplatform.com/', 'https://tags.chargeplatform.com/',
-  ], src);
+  validateSrcPrefix(
+    ['https://www.chargeplatform.com/', 'https://tags.chargeplatform.com/'],
+    src
+  );
   writeScript(global, src);
 }
diff --git a/ads/onnetwork.js b/ads/onnetwork.js
index 28c3f62021b6..4dc618ba3efe 100644
--- a/ads/onnetwork.js
+++ b/ads/onnetwork.js
@@ -42,9 +42,8 @@ export function onnetwork(global, data) {
   // Movie tag using "data-sid" attribute
   else if (sid) {
     url = hosts.video + '/embed.php?ampsrc=1&sid=' + encodeURIComponent(sid);
-  // Movie placement using "data-mid" attribute
-  }
-  else if (mid) {
+    // Movie placement using "data-mid" attribute
+  } else if (mid) {
     url = hosts.video + '/embed.php?ampsrc=1&mid=' + encodeURIComponent(mid);
   }
 
diff --git a/ads/openadstream.js b/ads/openadstream.js
index 53209047ffe5..cbd6bb0a2737 100644
--- a/ads/openadstream.js
+++ b/ads/openadstream.js
@@ -23,9 +23,15 @@ import {validateData, writeScript} from '../3p/3p';
 export function openadstream(global, data) {
   validateData(data, ['adhost', 'sitepage', 'pos'], ['query']);
 
-  let url = 'https://' + encodeURIComponent(data.adhost)
-      + '/3/' + data.sitepage
-      + '/1' + String(Math.random()).substring(2, 11) + '@' + data.pos;
+  let url =
+    'https://' +
+    encodeURIComponent(data.adhost) +
+    '/3/' +
+    data.sitepage +
+    '/1' +
+    String(Math.random()).substring(2, 11) +
+    '@' +
+    data.pos;
 
   if (data.query) {
     url = url + '?' + data.query;
diff --git a/ads/openx.js b/ads/openx.js
index c3f38b876802..28d5b89f2dde 100644
--- a/ads/openx.js
+++ b/ads/openx.js
@@ -57,7 +57,7 @@ export function openx(global, data) {
         if (startsWith(openxKey, 'dfp')) {
           // Remove 'dfp' prefix, lowercase the first letter.
           let fixKey = openxKey.substring(3);
-          fixKey = fixKey.substring(0,1).toLowerCase() + fixKey.substring(1);
+          fixKey = fixKey.substring(0, 1).toLowerCase() + fixKey.substring(1);
           dfpData[fixKey] = data[openxKey];
         }
         delete dfpData[openxKey];
@@ -82,7 +82,8 @@ export function openx(global, data) {
       } else {
         standardImplementation(global, jssdk, dfpData);
       }
-    } else if (data.auid) { // Just show an ad.
+    } else if (data.auid) {
+      // Just show an ad.
       global.OX_cmds = [
         () => {
           const oxRequest = OX();
@@ -102,7 +103,8 @@ export function openx(global, data) {
       ];
       loadScript(global, jssdk);
     }
-  } else if (data.dfpSlot) { // Fall back to a DFP ad.
+  } else if (data.dfpSlot) {
+    // Fall back to a DFP ad.
     doubleclick(global, dfpData);
   }
 }
@@ -136,8 +138,9 @@ function advanceImplementation(global, jssdk, dfpData, data) {
     callback: () => {
       const priceMap = global.oxhbjs && global.oxhbjs.getPriceMap();
       const slot = priceMap && priceMap['c'];
-      const targeting = slot ?
-        `${slot.size}_${slot.price},hb-bid-${slot.bid_id}` : 'none_t';
+      const targeting = slot
+        ? `${slot.size}_${slot.price},hb-bid-${slot.bid_id}`
+        : 'none_t';
       dfpData.targeting = dfpData.targeting || {};
       assign(dfpData.targeting, {oxb: targeting});
       doubleclick(global, dfpData);
@@ -171,8 +174,9 @@ function setCustomVars(oxRequest, customVars) {
  */
 function filterCustomVar(customVars) {
   const filterPattern = /^[A-Za-z0-9._]{1,20}$/;
-  const filteredKeys = Object.keys(customVars)
-      .filter(key => filterPattern.test(key));
+  const filteredKeys = Object.keys(customVars).filter(key =>
+    filterPattern.test(key)
+  );
   const filteredCustomVar = {};
   filteredKeys.forEach(key => {
     filteredCustomVar[key.toLowerCase()] = customVars[key];
diff --git a/ads/opinary.js b/ads/opinary.js
index 26fe050a76c1..8c2d9c81aa81 100644
--- a/ads/opinary.js
+++ b/ads/opinary.js
@@ -27,7 +27,7 @@ export function opinary(global, data) {
   div.setAttribute('id', 'opinary-automation-placeholder');
   global.document.getElementById('c').appendChild(div);
 
-  if (!document.querySelector('link[rel=\'canonical\']')) {
+  if (!document.querySelector("link[rel='canonical']")) {
     const link = document.createElement('link');
     link.rel = 'canonical';
     link.href = global.context.canonicalUrl;
diff --git a/ads/outbrain.js b/ads/outbrain.js
index 53e2594e5cea..6251836949d9 100644
--- a/ads/outbrain.js
+++ b/ads/outbrain.js
@@ -21,11 +21,10 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function outbrain(global, data) {
-
   // ensure we have valid widgetIds value
   validateData(data, ['widgetids']);
 
-  (global._outbrain = global._outbrain || {
+  global._outbrain = global._outbrain || {
     viewId: global.context.pageViewId,
     widgetIds: data['widgetids'],
     htmlURL: data['htmlurl'] || global.context.canonicalUrl,
@@ -34,8 +33,11 @@ export function outbrain(global, data) {
     testMode: data['testmode'] || 'false',
     styleFile: data['stylefile'] || '',
     referrer: data['referrer'] || global.context.referrer,
-  });
+  };
 
   // load the Outbrain AMP JS file
-  loadScript(global, 'https://widgets.outbrain.com/widgetAMP/outbrainAMP.min.js');
+  loadScript(
+    global,
+    'https://widgets.outbrain.com/widgetAMP/outbrainAMP.min.js'
+  );
 }
diff --git a/ads/pixels.js b/ads/pixels.js
index 94bf8f1267f6..afe513a47f48 100644
--- a/ads/pixels.js
+++ b/ads/pixels.js
@@ -21,19 +21,20 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function pixels(global, data) {
-  validateData(data,
-      ['origin', 'sid', 'tag'],
-      ['clickTracker', 'viewability']
-  );
+  validateData(data, ['origin', 'sid', 'tag'], ['clickTracker', 'viewability']);
   data.tag = data.tag.toString().toLowerCase();
   global._pixelsParam = data;
   if (data.tag === 'sync') {
-    writeScript(global, 'https://cdn.adsfactor.net/amp/pixels-amp.min.js', () => {
-      const pixelsAMPAd = global.pixelsAd;
-      const pixelsAMPTag = new pixelsAMPAd(data);
-      pixelsAMPTag.renderAmp(global.context);
-      global.context.renderStart();
-    });
+    writeScript(
+      global,
+      'https://cdn.adsfactor.net/amp/pixels-amp.min.js',
+      () => {
+        const pixelsAMPAd = global.pixelsAd;
+        const pixelsAMPTag = new pixelsAMPAd(data);
+        pixelsAMPTag.renderAmp(global.context);
+        global.context.renderStart();
+      }
+    );
   } else {
     global.context.noContentAvailable();
   }
diff --git a/ads/plista.js b/ads/plista.js
index d7ffaf0521ca..b7a8390fa53a 100644
--- a/ads/plista.js
+++ b/ads/plista.js
@@ -22,20 +22,31 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function plista(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [], [
-    'publickey', 'widgetname', 'urlprefix',
-    'item', 'geo', 'categories', 'countrycode',
-  ]);
+  validateData(
+    data,
+    [],
+    [
+      'publickey',
+      'widgetname',
+      'urlprefix',
+      'item',
+      'geo',
+      'categories',
+      'countrycode',
+    ]
+  );
   const div = global.document.createElement('div');
   div.setAttribute('data-display', 'plista_widget_' + data.widgetname);
   // container with id "c" is provided by amphtml
   global.document.getElementById('c').appendChild(div);
   window.PLISTA = {
     publickey: data.publickey,
-    widgets: [{
-      name: data.widgetname,
-      pre: data.urlprefix,
-    }],
+    widgets: [
+      {
+        name: data.widgetname,
+        pre: data.urlprefix,
+      },
+    ],
     item: data.item,
     geo: data.geo,
     categories: data.categories,
@@ -45,5 +56,10 @@ export function plista(global, data) {
   };
 
   // load the plista modules asynchronously
-  loadScript(global, 'https://static' + (data.countrycode ? '-' + encodeURIComponent(data.countrycode) : '') + '.plista.com/async.js');
+  loadScript(
+    global,
+    'https://static' +
+      (data.countrycode ? '-' + encodeURIComponent(data.countrycode) : '') +
+      '.plista.com/async.js'
+  );
 }
diff --git a/ads/popin.js b/ads/popin.js
index 8981c3f76213..b16f4fc5bf97 100644
--- a/ads/popin.js
+++ b/ads/popin.js
@@ -17,9 +17,9 @@
 import {loadScript, validateData} from '../3p/3p';
 
 /**
-* @param {!Window} global
-* @param {!Object} data
-*/
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function popin(global, data) {
   validateData(data, ['mediaid']);
 
@@ -27,7 +27,10 @@ export function popin(global, data) {
   d.id = '_popIn_amp_recommend';
   global.document.getElementById('c').appendChild(d);
 
-  const url = 'https://api.popin.cc/searchbox/' + encodeURIComponent(data['mediaid']) + '.js';
+  const url =
+    'https://api.popin.cc/searchbox/' +
+    encodeURIComponent(data['mediaid']) +
+    '.js';
 
   loadScript(global, url);
 }
diff --git a/ads/postquare.js b/ads/postquare.js
index 0366031db692..c4e50182fbf7 100644
--- a/ads/postquare.js
+++ b/ads/postquare.js
@@ -21,7 +21,6 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function postquare(global, data) {
-
   validateData(data, ['widgetids']);
 
   global._postquare = global._postquare || {
diff --git a/ads/pressboard.js b/ads/pressboard.js
index 75f1f9afaf75..a68bc8fc969f 100644
--- a/ads/pressboard.js
+++ b/ads/pressboard.js
@@ -24,9 +24,14 @@ export function pressboard(global, data) {
   validateData(data, ['media']);
   data.baseUrl = 'https://adserver.pressboard.ca';
   global.pbParams = data;
-  loadScript(global, data.baseUrl + '/js/amp-ad.js', () => {
-    global.context.renderStart();
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  loadScript(
+    global,
+    data.baseUrl + '/js/amp-ad.js',
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/pubexchange.js b/ads/pubexchange.js
index d1ea82a1475e..a002281e0024 100644
--- a/ads/pubexchange.js
+++ b/ads/pubexchange.js
@@ -21,7 +21,6 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function pubexchange(global, data) {
-
   // ensure we have valid widgetIds value
   validateData(data, ['publication', 'moduleId', 'moduleNum'], ['test']);
 
diff --git a/ads/pubguru.js b/ads/pubguru.js
index 9c7ea34bbe1e..6d6c2fdb3638 100644
--- a/ads/pubguru.js
+++ b/ads/pubguru.js
@@ -29,6 +29,10 @@ export function pubguru(global, data) {
   el.setAttribute('id', 'the-ad-unit');
 
   global.document.getElementById('c').appendChild(el);
-  loadScript(global, 'https://amp.pubguru.org/amp.'
-      + encodeURIComponent(data.publisher) + '.min.js');
+  loadScript(
+    global,
+    'https://amp.pubguru.org/amp.' +
+      encodeURIComponent(data.publisher) +
+      '.min.js'
+  );
 }
diff --git a/ads/pubmine.js b/ads/pubmine.js
index 035f79a1c3f4..76a69bf11657 100644
--- a/ads/pubmine.js
+++ b/ads/pubmine.js
@@ -17,8 +17,8 @@
 import {loadScript, validateData} from '../3p/3p';
 
 const pubmineOptional = ['section', 'pt', 'ht'],
-    pubmineRequired = ['siteid'],
-    pubmineURL = 'https://s.pubmine.com/head.js';
+  pubmineRequired = ['siteid'],
+  pubmineURL = 'https://s.pubmine.com/head.js';
 
 /**
  * @param {!Object} data
diff --git a/ads/pulsepoint.js b/ads/pulsepoint.js
index 12ffe4fb8462..586756e329d9 100644
--- a/ads/pulsepoint.js
+++ b/ads/pulsepoint.js
@@ -23,9 +23,7 @@ import {loadScript, validateData, writeScript} from '../3p/3p';
  */
 export function pulsepoint(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [], [
-    'pid', 'tagid', 'tagtype', 'slot', 'timeout',
-  ]);
+  validateData(data, [], ['pid', 'tagid', 'tagtype', 'slot', 'timeout']);
   if (data.tagtype === 'hb') {
     headerBidding(global, data);
   } else {
@@ -38,10 +36,16 @@ export function pulsepoint(global, data) {
  * @param {!Object} data
  */
 function tag(global, data) {
-  writeScript(global, 'https://tag.contextweb.com/getjs.aspx?action=VIEWAD' +
-      '&cwpid=' + encodeURIComponent(data.pid)
-      + '&cwtagid=' + encodeURIComponent(data.tagid)
-      + '&cwadformat=' + encodeURIComponent(data.width + 'X' + data.height));
+  writeScript(
+    global,
+    'https://tag.contextweb.com/getjs.aspx?action=VIEWAD' +
+      '&cwpid=' +
+      encodeURIComponent(data.pid) +
+      '&cwtagid=' +
+      encodeURIComponent(data.tagid) +
+      '&cwadformat=' +
+      encodeURIComponent(data.width + 'X' + data.height)
+  );
 }
 
 /**
@@ -52,13 +56,15 @@ function headerBidding(global, data) {
   loadScript(global, 'https://ads.contextweb.com/ht.js', () => {
     const hbConfig = {
       timeout: data.timeout || 1000,
-      slots: [{
-        cp: data.pid,
-        ct: data.tagid,
-        cf: data.width + 'x' + data.height,
-        placement: data.slot,
-        elementId: 'c',
-      }],
+      slots: [
+        {
+          cp: data.pid,
+          ct: data.tagid,
+          cf: data.width + 'x' + data.height,
+          placement: data.slot,
+          elementId: 'c',
+        },
+      ],
       done(targeting) {
         doubleclick(global, {
           width: data.width,
@@ -71,4 +77,3 @@ function headerBidding(global, data) {
     new window.PulsePointHeaderTag(hbConfig).init();
   });
 }
-
diff --git a/ads/purch.js b/ads/purch.js
index ce03e15dc52a..64ed76c97ca5 100644
--- a/ads/purch.js
+++ b/ads/purch.js
@@ -14,18 +14,14 @@
  * limitations under the License.
  */
 
-import {
-  validateData,
-  validateSrcPrefix,
-  writeScript} from '../3p/3p';
+import {validateData, validateSrcPrefix, writeScript} from '../3p/3p';
 
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function purch(global, data) {
-  validateData(data, [],
-      ['pid', 'divid', 'config']);
+  validateData(data, [], ['pid', 'divid', 'config']);
   global.data = data;
 
   const adsrc = 'https://ramp.purch.com/serve/creative_amp.js';
diff --git a/ads/rbinfox.js b/ads/rbinfox.js
index 84ad70fade81..e0fb1a66aeb8 100644
--- a/ads/rbinfox.js
+++ b/ads/rbinfox.js
@@ -59,9 +59,9 @@ function addToQueue(global, src) {
   const ctx = n + blockId;
   global[ctx] = global[ctx] || [];
   global[ctx].push(() => {
-	  const renderTo = 'infox_' + blockId;
-	  // Create container
-	  createContainer(global, renderTo);
-	  global['INFOX' + blockId].renderTo(renderTo);
+    const renderTo = 'infox_' + blockId;
+    // Create container
+    createContainer(global, renderTo);
+    global['INFOX' + blockId].renderTo(renderTo);
   });
 }
diff --git a/ads/recomad.js b/ads/recomad.js
index 117a5b9dc2df..911544fc65f0 100644
--- a/ads/recomad.js
+++ b/ads/recomad.js
@@ -57,13 +57,13 @@ export function recomad(global, data) {
   validateData(data, ['appId', 'widgetId', ['searchTerm', 'origin']]);
 
   createWidgetContainer(
-      window.document.createElement('div'),
-      data['appId'],
-      data['widgetId'],
-      data['searchTerm'] || '',
-      data['origin'] || '',
-      data['baseUrl'] || '',
-      data['puid'] || ''
+    window.document.createElement('div'),
+    data['appId'],
+    data['widgetId'],
+    data['searchTerm'] || '',
+    data['origin'] || '',
+    data['baseUrl'] || '',
+    data['puid'] || ''
   );
 
   loadScript(window, 'https://widget.s24.com/js/s24widget.min.js');
diff --git a/ads/relap.js b/ads/relap.js
index 2242c98661a0..51c2fb5cd0d9 100644
--- a/ads/relap.js
+++ b/ads/relap.js
@@ -63,7 +63,9 @@ export function relap(global, data) {
     anchorEl.id = data['anchorid'];
     global.document.getElementById('c').appendChild(anchorEl);
 
-    const url = `https://relap.io/api/v6/head.js?token=${encodeURIComponent(data['token'])}&url=${encodeURIComponent(urlParam)}`;
+    const url = `https://relap.io/api/v6/head.js?token=${encodeURIComponent(
+      data['token']
+    )}&url=${encodeURIComponent(urlParam)}`;
     loadScript(global, url);
   }
 }
diff --git a/ads/revcontent.js b/ads/revcontent.js
index a42a54aaa350..97c96a640dda 100644
--- a/ads/revcontent.js
+++ b/ads/revcontent.js
@@ -21,13 +21,9 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function revcontent(global, data) {
-  const endpoint = 'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js';
-  const required = [
-    'id',
-    'width',
-    'height',
-    'wrapper',
-  ];
+  const endpoint =
+    'https://labs-cdn.revcontent.com/build/amphtml/revcontent.amp.min.js';
+  const required = ['id', 'width', 'height', 'wrapper'];
   const optional = [
     'api',
     'key',
diff --git a/ads/revjet.js b/ads/revjet.js
index b3045c27c565..417a8e8c19c5 100644
--- a/ads/revjet.js
+++ b/ads/revjet.js
@@ -26,10 +26,11 @@ export function revjet(global, data) {
   global._revjetData = Object.assign({}, data);
 
   loadScript(
-      global,
-      'https://cdn.revjet.com/~cdn/JS/03/amp.js',
-      /* opt_cb */ undefined,
-      () => {
-        global.context.noContentAvailable();
-      });
+    global,
+    'https://cdn.revjet.com/~cdn/JS/03/amp.js',
+    /* opt_cb */ undefined,
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/rubicon.js b/ads/rubicon.js
index cc73f11af8bf..2e331cbd3536 100644
--- a/ads/rubicon.js
+++ b/ads/rubicon.js
@@ -22,11 +22,21 @@ import {validateData, writeScript} from '../3p/3p';
  */
 export function rubicon(global, data) {
   // TODO: check mandatory fields
-  validateData(data, [], [
-    'account', 'site', 'zone', 'size',
-    'kw', 'visitor', 'inventory',
-    'method', 'callback',
-  ]);
+  validateData(
+    data,
+    [],
+    [
+      'account',
+      'site',
+      'zone',
+      'size',
+      'kw',
+      'visitor',
+      'inventory',
+      'method',
+      'callback',
+    ]
+  );
 
   if (data.method === 'smartTag') {
     smartTag(global, data);
@@ -50,6 +60,10 @@ function smartTag(global, data) {
   global.rp_amp = 'st';
   global.rp_callback = data.callback;
   /* eslint-enable */
-  writeScript(global, 'https://ads.rubiconproject.com/ad/'
-      + encodeURIComponent(data.account) + '.js');
+  writeScript(
+    global,
+    'https://ads.rubiconproject.com/ad/' +
+      encodeURIComponent(data.account) +
+      '.js'
+  );
 }
diff --git a/ads/runative.js b/ads/runative.js
index 19e5364a01db..7d4b44fb0309 100644
--- a/ads/runative.js
+++ b/ads/runative.js
@@ -38,11 +38,7 @@ const adContainerId = 'runative_id';
  */
 export function runative(global, data) {
   // ensure we have valid widgetIds value
-  validateData(
-      data,
-      requiredParams,
-      optionsParams
-  );
+  validateData(data, requiredParams, optionsParams);
 
   const adContainer = global.document.getElementById('c');
   const adNativeContainer = getAdContainer(global);
@@ -51,16 +47,9 @@ export function runative(global, data) {
   adContainer.appendChild(adNativeContainer);
 
   // load the RUNative AMP JS file
-  loadScript(
-      global,
-      '//cdn.run-syndicate.com/sdk/v1/n.js',
-      () => {
-        global
-            .document
-            .body
-            .appendChild(initScript);
-      }
-  );
+  loadScript(global, '//cdn.run-syndicate.com/sdk/v1/n.js', () => {
+    global.document.body.appendChild(initScript);
+  });
 }
 
 /**
@@ -70,14 +59,13 @@ function getInitData(data) {
   const initKeys = requiredParams.concat(optionsParams);
   const initParams = {};
 
-  initKeys
-      .forEach(key => {
-        if (key in data) {
-          const initKey = key === 'adType' ? 'type' : key;
+  initKeys.forEach(key => {
+    if (key in data) {
+      const initKey = key === 'adType' ? 'type' : key;
 
-          initParams[initKey] = data[key];
-        }
-      });
+      initParams[initKey] = data[key];
+    }
+  });
 
   initParams['element_id'] = adContainerId;
 
@@ -102,9 +90,9 @@ function getAdContainer(global) {
 function getInitAdScript(global, data) {
   const scriptElement = global.document.createElement('script');
   const initData = getInitData(data);
-  const initScript = global
-      .document
-      .createTextNode(`NativeAd(${ JSON.stringify(initData) });`);
+  const initScript = global.document.createTextNode(
+    `NativeAd(${JSON.stringify(initData)});`
+  );
 
   scriptElement.appendChild(initScript);
 
diff --git a/ads/sas.js b/ads/sas.js
index 5fcf63f884d2..87e039207dd5 100644
--- a/ads/sas.js
+++ b/ads/sas.js
@@ -24,13 +24,15 @@ import {validateData, writeScript} from '../3p/3p';
 export function sas(global, data) {
   let url, adHost;
   const fields = ['site', 'size', 'area'];
-  validateData(data, ['customerName'],
-      ['adHost', 'site', 'size', 'area', 'mid','tags']);
+  validateData(
+    data,
+    ['customerName'],
+    ['adHost', 'site', 'size', 'area', 'mid', 'tags']
+  );
 
   if (typeof data.adHost === 'undefined') {
     adHost = encodeURIComponent(data['customerName']) + '-ads.aimatch.com';
-  }
-  else {
+  } else {
     adHost = encodeURIComponent(data['adHost']);
   }
 
diff --git a/ads/sekindo.js b/ads/sekindo.js
index 51b22032dedf..cd49c1df1e47 100644
--- a/ads/sekindo.js
+++ b/ads/sekindo.js
@@ -25,23 +25,31 @@ export function sekindo(global, data) {
   validateData(data, ['spaceid']);
   const pubUrl = encodeURIComponent(global.context.sourceUrl);
   const excludesSet = {ampSlotIndex: 1, type: 1};
-  const customParamMap = {spaceid: 's',width: 'x',height: 'y'};
-  let query = 'isAmpProject=1&pubUrl=' + pubUrl + '&cbuster=' +
-  global.context.startTime + '&';
+  const customParamMap = {spaceid: 's', width: 'x', height: 'y'};
+  let query =
+    'isAmpProject=1&pubUrl=' +
+    pubUrl +
+    '&cbuster=' +
+    global.context.startTime +
+    '&';
   let getParam = '';
   for (const key in data) {
     if (hasOwn(data, key)) {
       if (typeof excludesSet[key] == 'undefined') {
-        getParam = (typeof customParamMap[key] == 'undefined') ?
-          key : customParamMap[key];
+        getParam =
+          typeof customParamMap[key] == 'undefined' ? key : customParamMap[key];
         query += getParam + '=' + encodeURIComponent(data[key]) + '&';
       }
     }
   }
-  loadScript(global,
-      'https://live.sekindo.com/live/liveView.php?' + query, () => {
-        global.context.renderStart();
-      }, () => {
-        global.context.noContentAvailable();
-      });
+  loadScript(
+    global,
+    'https://live.sekindo.com/live/liveView.php?' + query,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/slimcutmedia.js b/ads/slimcutmedia.js
index 93219ec7ba12..7622a77f8e10 100644
--- a/ads/slimcutmedia.js
+++ b/ads/slimcutmedia.js
@@ -28,8 +28,16 @@ export function slimcutmedia(global, data) {
     data,
   };
 
-  validateData(data,
-      global._scm_amp.mandatory_data, global._scm_amp.allowed_data);
+  validateData(
+    data,
+    global._scm_amp.mandatory_data,
+    global._scm_amp.allowed_data
+  );
 
-  loadScript(global, 'https://static.freeskreen.com/publisher/' + encodeURIComponent(data.pid) + '/freeskreen.min.js');
+  loadScript(
+    global,
+    'https://static.freeskreen.com/publisher/' +
+      encodeURIComponent(data.pid) +
+      '/freeskreen.min.js'
+  );
 }
diff --git a/ads/smartclip.js b/ads/smartclip.js
index 48319134576e..e5a5594e24fb 100644
--- a/ads/smartclip.js
+++ b/ads/smartclip.js
@@ -28,12 +28,22 @@ export function smartclip(global, data) {
     data,
   };
 
-  validateData(data,
-      global._smartclip_amp.mandatory_data, global._smartclip_amp.allowed_data);
+  validateData(
+    data,
+    global._smartclip_amp.mandatory_data,
+    global._smartclip_amp.allowed_data
+  );
 
   const rand = Math.round(Math.random() * 100000000);
 
-  loadScript(global, 'https://des.smartclip.net/ads?type=dyn&plc='
-    + encodeURIComponent(data.plc) + '&sz=' + encodeURIComponent(data.sz)
-    + (data.extra ? '&' + encodeURI(data.extra) : '') + '&rnd=' + rand);
+  loadScript(
+    global,
+    'https://des.smartclip.net/ads?type=dyn&plc=' +
+      encodeURIComponent(data.plc) +
+      '&sz=' +
+      encodeURIComponent(data.sz) +
+      (data.extra ? '&' + encodeURI(data.extra) : '') +
+      '&rnd=' +
+      rand
+  );
 }
diff --git a/ads/smi2.js b/ads/smi2.js
index 1f0cdef3a8e2..443321cf2e57 100644
--- a/ads/smi2.js
+++ b/ads/smi2.js
@@ -22,7 +22,7 @@ import {loadScript, validateData} from '../3p/3p';
  */
 export function smi2(global, data) {
   validateData(data, ['blockid']);
-  (global._smi2 = global._smi2 || {
+  global._smi2 = global._smi2 || {
     viewId: global.context.pageViewId,
     blockId: data['blockid'],
     htmlURL: data['canonical'] || global.context.canonicalUrl,
@@ -34,14 +34,17 @@ export function smi2(global, data) {
     domFingerprint: window.context.domFingerprint,
     location: window.context.location,
     startTime: window.context.startTime,
-
-  });
+  };
   global._smi2.AMPCallbacks = {
     renderStart: global.context.renderStart,
     noContentAvailable: global.context.noContentAvailable,
   };
   // load the smi2  AMP JS file script asynchronously
   const rand = Math.round(Math.random() * 100000000);
-  loadScript(global, 'https://amp.smi2.ru/ampclient/ampfecth.js?rand=' + rand, () => {},
-      global.context.noContentAvailable);
+  loadScript(
+    global,
+    'https://amp.smi2.ru/ampclient/ampfecth.js?rand=' + rand,
+    () => {},
+    global.context.noContentAvailable
+  );
 }
diff --git a/ads/sortable.js b/ads/sortable.js
index 1a79b58e6586..35b7ec85b6d6 100644
--- a/ads/sortable.js
+++ b/ads/sortable.js
@@ -25,13 +25,14 @@ export function sortable(global, data) {
 
   const slot = global.document.getElementById('c');
   const ad = global.document.createElement('div');
-  const size = (data.responsive === 'true') ?
-    'auto'
-    : data.width + 'x' + data.height;
+  const size =
+    data.responsive === 'true' ? 'auto' : data.width + 'x' + data.height;
   ad.className = 'ad-tag';
   ad.setAttribute('data-ad-name', data.name);
   ad.setAttribute('data-ad-size', size);
   slot.appendChild(ad);
-  loadScript(global, 'https://tags-cdn.deployads.com/a/'
-      + encodeURIComponent(data.site) + '.js');
+  loadScript(
+    global,
+    'https://tags-cdn.deployads.com/a/' + encodeURIComponent(data.site) + '.js'
+  );
 }
diff --git a/ads/sovrn.js b/ads/sovrn.js
index abc16baf74ce..183ad0c0951f 100644
--- a/ads/sovrn.js
+++ b/ads/sovrn.js
@@ -12,7 +12,7 @@
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
-*/
+ */
 /*
  *********
  * Existing sovrn customers feel free to contact amp-implementations@sovrn.com
diff --git a/ads/speakol.js b/ads/speakol.js
index c6ab360dd704..37576833ab82 100644
--- a/ads/speakol.js
+++ b/ads/speakol.js
@@ -24,16 +24,21 @@ import {loadScript, validateData} from '../3p/3p';
  */
 
 export function speakol(global, data) {
-    validateData(data, ['widgetid']);
+  validateData(data, ['widgetid']);
 
-    global._speakol = global._speakol || {
-        widgetId: data['widgetid'],
-    };
+  global._speakol = global._speakol || {
+    widgetId: data['widgetid'],
+  };
 
-    const d = global.document.createElement('div');
-    d.classList.add('speakol-widget');
-    d.id = 'spk-wi-' + data['widgetid'];
-    global.document.getElementById('c').appendChild(d);
+  const d = global.document.createElement('div');
+  d.classList.add('speakol-widget');
+  d.id = 'spk-wi-' + data['widgetid'];
+  global.document.getElementById('c').appendChild(d);
 
-    loadScript(global, `https://crawler.speakol.com/sdk/speakol-widget.js?wid=wi-${data['widgetid']}&eid=spk-wi-${data['widgetid']}`);
+  loadScript(
+    global,
+    `https://crawler.speakol.com/sdk/speakol-widget.js?wid=wi-${
+      data['widgetid']
+    }&eid=spk-wi-${data['widgetid']}`
+  );
 }
diff --git a/ads/spotx.js b/ads/spotx.js
index 9b20acf9c111..e09fd3b34ca1 100644
--- a/ads/spotx.js
+++ b/ads/spotx.js
@@ -32,8 +32,8 @@ export function spotx(global, data) {
 
   data['spotx_content_width'] = data.spotx_content_width || data.width;
   data['spotx_content_height'] = data.spotx_content_height || data.height;
-  data['spotx_content_page_url'] = global.context.location.href ||
-      global.context.sourceUrl;
+  data['spotx_content_page_url'] =
+    global.context.location.href || global.context.sourceUrl;
 
   // Add data-* attribute for each data value passed in.
   for (const key in data) {
diff --git a/ads/sunmedia.js b/ads/sunmedia.js
index dddfcec17b19..4bf2c62f4d92 100644
--- a/ads/sunmedia.js
+++ b/ads/sunmedia.js
@@ -28,8 +28,14 @@ export function sunmedia(global, data) {
     data,
   };
 
-  validateData(data,
-      global._sunmedia_amp.mandatory_data, global._sunmedia_amp.allowed_data);
+  validateData(
+    data,
+    global._sunmedia_amp.mandatory_data,
+    global._sunmedia_amp.allowed_data
+  );
 
-  loadScript(global, 'https://vod.addevweb.com/sunmedia/amp/ads/SMIntextAMP.js');
+  loadScript(
+    global,
+    'https://vod.addevweb.com/sunmedia/amp/ads/SMIntextAMP.js'
+  );
 }
diff --git a/ads/svknative.js b/ads/svknative.js
index 963085713fbc..a170f58fe098 100644
--- a/ads/svknative.js
+++ b/ads/svknative.js
@@ -21,13 +21,12 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function svknative(global, data) {
-
   // ensure we have valid widgetid value
   validateData(data, ['widgetid']);
 
   const s = global.document.createElement('script');
-  const scriptKey = 'svknativeampwidget_' +
-		Math.floor(Math.random() * 10000000);
+  const scriptKey =
+    'svknativeampwidget_' + Math.floor(Math.random() * 10000000);
 
   s.setAttribute('data-key', scriptKey);
   global.document.getElementById('c').appendChild(s);
diff --git a/ads/swoop.js b/ads/swoop.js
index 0d77ead40d5c..61fe24d1da54 100644
--- a/ads/swoop.js
+++ b/ads/swoop.js
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  computeInMasterFrame,
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {computeInMasterFrame, loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
@@ -26,25 +22,27 @@ import {
  */
 export function swoop(global, data) {
   // Required properties
-  validateData(data, [
-    'layout',
-    'placement',
-    'publisher',
-    'slot',
-  ]);
+  validateData(data, ['layout', 'placement', 'publisher', 'slot']);
 
-  computeInMasterFrame(global, 'swoop-load', done => {
-    global.swoopIabConfig = data;
+  computeInMasterFrame(
+    global,
+    'swoop-load',
+    done => {
+      global.swoopIabConfig = data;
 
-    loadScript(global, 'https://www.swoop-amp.com/amp.js', () => done(global.Swoop != null));
-  }, success => {
-    if (success) {
-      if (!global.context.isMaster) {
-        global.context.master.Swoop.announcePlace(global, data);
+      loadScript(global, 'https://www.swoop-amp.com/amp.js', () =>
+        done(global.Swoop != null)
+      );
+    },
+    success => {
+      if (success) {
+        if (!global.context.isMaster) {
+          global.context.master.Swoop.announcePlace(global, data);
+        }
+      } else {
+        global.context.noContentAvailable();
+        throw new Error('Swoop failed to load');
       }
-    } else {
-      global.context.noContentAvailable();
-      throw new Error('Swoop failed to load');
     }
-  });
+  );
 }
diff --git a/ads/taboola.js b/ads/taboola.js
index 2d25c4c72a75..44307c2f5519 100644
--- a/ads/taboola.js
+++ b/ads/taboola.js
@@ -27,8 +27,12 @@ export function taboola(global, data) {
 
   // ensure we have vlid publisher, placement and mode
   // and exactly one page-type
-  validateData(data, ['publisher', 'placement', 'mode',
-    ['article', 'video', 'photo', 'search', 'category', 'homepage', 'other']]);
+  validateData(data, [
+    'publisher',
+    'placement',
+    'mode',
+    ['article', 'video', 'photo', 'search', 'category', 'homepage', 'other'],
+  ]);
 
   // setup default values for referrer and url
   const params = {
@@ -44,17 +48,18 @@ export function taboola(global, data) {
   });
 
   // push the two object into the '_taboola' global
-  (global._taboola = global._taboola || []).push([{
-    viewId: global.context.pageViewId,
-    publisher: data.publisher,
-    placement: data.placement,
-    mode: data.mode,
-    framework: 'amp',
-    container: 'c',
-  },
-  params,
-  {flush: true}]
-  );
+  (global._taboola = global._taboola || []).push([
+    {
+      viewId: global.context.pageViewId,
+      publisher: data.publisher,
+      placement: data.placement,
+      mode: data.mode,
+      framework: 'amp',
+      container: 'c',
+    },
+    params,
+    {flush: true},
+  ]);
 
   // install observation on entering/leaving the view
   global.context.observeIntersection(function(changes) {
@@ -70,5 +75,10 @@ export function taboola(global, data) {
   });
 
   // load the taboola loader asynchronously
-  loadScript(global, `https://cdn.taboola.com/libtrc/${encodeURIComponent(data.publisher)}/loader.js`);
+  loadScript(
+    global,
+    `https://cdn.taboola.com/libtrc/${encodeURIComponent(
+      data.publisher
+    )}/loader.js`
+  );
 }
diff --git a/ads/tcsemotion.js b/ads/tcsemotion.js
index 4da17968c529..98d7c866f01b 100644
--- a/ads/tcsemotion.js
+++ b/ads/tcsemotion.js
@@ -13,18 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {validateData,writeScript} from '../3p/3p';
+import {validateData, writeScript} from '../3p/3p';
 /**
  * @param {!Window} global
  * @param {!Object} d
  */
 export function tcsemotion(global, d) {
-  validateData(d, ['zone','delhost']);
+  validateData(d, ['zone', 'delhost']);
   global.djaxData = d;
   if (d.hb && d.hb == 'true') {
     global.djaxData.hb = true;
   } else {
     global.djaxData.hb = false;
   }
-  writeScript(global,'https://ads.tcsemotion.com/www/delivery/amphb.js');
+  writeScript(global, 'https://ads.tcsemotion.com/www/delivery/amphb.js');
 }
diff --git a/ads/teads.js b/ads/teads.js
index 7872d60cdb7c..391b978a53b5 100644
--- a/ads/teads.js
+++ b/ads/teads.js
@@ -29,16 +29,26 @@ export function teads(global, data) {
     data,
   };
 
-  validateData(data,
-      global._teads_amp.mandatory_data, global._teads_amp.allowed_data);
+  validateData(
+    data,
+    global._teads_amp.mandatory_data,
+    global._teads_amp.allowed_data
+  );
 
   if (data.tag) {
     validateData(data.tag, global._teads_amp.mandatory_tag_data);
     global._tta = data.tag.tta;
     global._ttp = data.tag.ttp;
 
-    loadScript(global, 'https://a.teads.tv/media/format/' + encodeURI(data.tag.js || 'v3/teads-format.min.js'));
+    loadScript(
+      global,
+      'https://a.teads.tv/media/format/' +
+        encodeURI(data.tag.js || 'v3/teads-format.min.js')
+    );
   } else {
-    loadScript(global, 'https://a.teads.tv/page/' + encodeURIComponent(data.pid) + '/tag');
+    loadScript(
+      global,
+      'https://a.teads.tv/page/' + encodeURIComponent(data.pid) + '/tag'
+    );
   }
 }
diff --git a/ads/torimochi.js b/ads/torimochi.js
index 69cb88e39c49..2e628a5a54a6 100644
--- a/ads/torimochi.js
+++ b/ads/torimochi.js
@@ -22,7 +22,6 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function torimochi(global, data) {
-
   validateData(data, ['area', 'adtype']);
 
   if (data.width < global.width) {
@@ -36,7 +35,8 @@ export function torimochi(global, data) {
   global.extra = parseJson(data['extra'] || '{}');
   global.context.renderStart({width: global.width, height: global.height});
 
-  const url = 'https://asset.torimochi-ad.net/js/torimochi_ad_amp.min.js?v=' + Date.now();
+  const url =
+    'https://asset.torimochi-ad.net/js/torimochi_ad_amp.min.js?v=' + Date.now();
 
   writeScript(global, url);
 }
diff --git a/ads/uas.js b/ads/uas.js
index 421d8a34614f..09476bdaade2 100644
--- a/ads/uas.js
+++ b/ads/uas.js
@@ -56,10 +56,17 @@ function centerAd(global) {
  */
 export function uas(global, data) {
   validateData(
-      data,
-      ['accId', 'adUnit', 'sizes'],
-      ['locLat', 'locLon', 'locSrc', 'pageURL', 'targetings', 'extraParams',
-        'visibility']
+    data,
+    ['accId', 'adUnit', 'sizes'],
+    [
+      'locLat',
+      'locLon',
+      'locSrc',
+      'pageURL',
+      'targetings',
+      'extraParams',
+      'visibility',
+    ]
   );
   global.Phoenix = {EQ: []};
   const uasDivId = 'uas-amp-slot';
@@ -67,16 +74,22 @@ export function uas(global, data) {
   loadScript(global, 'https://ads.pubmatic.com/AdServer/js/phoenix.js', () => {
     global.Phoenix.EQ.push(function() {
       global.Phoenix.enableSingleRequestCallMode();
-      global.Phoenix.setInfo('AMP', 1);// Need to set the AMP flag
+      global.Phoenix.setInfo('AMP', 1); // Need to set the AMP flag
       global.Phoenix.setInfo('ACCID', data.accId);
       // Reading PAGEURL from sourceUrl or location.href
-      global.Phoenix.setInfo('PAGEURL', (global.context.sourceUrl || global.context.location.href)); // eslint-disable-line max-len
+      global.Phoenix.setInfo(
+        'PAGEURL',
+        global.context.sourceUrl || global.context.location.href
+      ); // eslint-disable-line max-len
       data.pageURL && global.Phoenix.setInfo('PAGEURL', data.pageURL);
       data.locLat && global.Phoenix.setInfo('LAT', data.locLat);
       data.locLon && global.Phoenix.setInfo('LON', data.locLon);
       data.locSrc && global.Phoenix.setInfo('LOC_SRC', data.locSrc);
-      const slot = global.Phoenix.defineAdSlot(data.adUnit, data.sizes,
-          uasDivId);
+      const slot = global.Phoenix.defineAdSlot(
+        data.adUnit,
+        data.sizes,
+        uasDivId
+      );
       slot.setVisibility(1);
       forEachOnObject(data.targetings, function(key, value) {
         slot.setTargeting(key, value);
diff --git a/ads/uzou.js b/ads/uzou.js
index d69fa2a25f6b..a975253d158b 100644
--- a/ads/uzou.js
+++ b/ads/uzou.js
@@ -18,9 +18,9 @@ import {loadScript, validateData} from '../3p/3p';
 import {parseJson} from '../src/json';
 
 /**
-* @param {!Window} global
-* @param {!Object} data
-*/
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function uzou(global, data) {
   validateData(data, ['widgetParams'], []);
 
@@ -35,7 +35,9 @@ export function uzou(global, data) {
   const akamaiHost = widgetParams['akamaiHost'] || 'speee-ad.akamaized.net';
   const placementCode = widgetParams['placementCode'];
   const mode = widgetParams['mode'] || 'production';
-  const entryPoint = `https://${prefixMap[mode]}${akamaiHost}/tag/${placementCode}/js/outer-frame.min.js`;
+  const entryPoint = `https://${
+    prefixMap[mode]
+  }${akamaiHost}/tag/${placementCode}/js/outer-frame.min.js`;
 
   const d = global.document.createElement('div');
   d.className = `uz-${placementCode} uz-ny`;
@@ -45,9 +47,9 @@ export function uzou(global, data) {
 
   const uzouInjector = {
     url: fixedEncodeURIComponent(
-        widgetParams['url'] ||
-      global.context.canonicalUrl ||
-      global.context.sourceUrl
+      widgetParams['url'] ||
+        global.context.canonicalUrl ||
+        global.context.sourceUrl
     ),
     referer: widgetParams['referer'] || global.context.referrer,
   };
diff --git a/ads/valuecommerce.js b/ads/valuecommerce.js
index e773acd81b15..6bcf751b385a 100644
--- a/ads/valuecommerce.js
+++ b/ads/valuecommerce.js
@@ -21,8 +21,7 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function valuecommerce(global, data) {
-  validateData(data, ['pid'], ['sid', 'vcptn','om']);
+  validateData(data, ['pid'], ['sid', 'vcptn', 'om']);
   global.vcParam = data;
   writeScript(global, 'https://amp.valuecommerce.com/amp_bridge.js');
 }
-
diff --git a/ads/videointelligence.js b/ads/videointelligence.js
index a5a097590c54..8f0b1090b918 100644
--- a/ads/videointelligence.js
+++ b/ads/videointelligence.js
@@ -21,7 +21,6 @@ import {loadScript, validateData} from '../3p/3p';
  * @param {!Object} data
  */
 export function videointelligence(global, data) {
-
   validateData(data, ['publisherId', 'channelId']);
 
   loadScript(global, 'https://s.vi-serve.com/tagLoaderAmp.js');
diff --git a/ads/videonow.js b/ads/videonow.js
index de82a25601c4..c920ad93fbb3 100644
--- a/ads/videonow.js
+++ b/ads/videonow.js
@@ -30,18 +30,24 @@ export function videonow(global, data) {
   const kind = data.type || 'prod';
 
   // production version by default
-  let script = (data.src && decodeURI(data.src)) ||
-    ('https://static.videonow.ru/vn_init.js' +
-      '?amp=1&profileId=' + profileId);
+  let script =
+    (data.src && decodeURI(data.src)) ||
+    'https://static.videonow.ru/vn_init.js?amp=1&profileId=' + profileId;
 
   if (kind === 'local') {
-    script = 'https://localhost:8085/vn_init.js?amp=1' +
-      '?profileId=' + profileId +
-      '&url=' + encodeURIComponent('https://localhost:8085/init');
+    script =
+      'https://localhost:8085/vn_init.js?amp=1' +
+      '?profileId=' +
+      profileId +
+      '&url=' +
+      encodeURIComponent('https://localhost:8085/init');
   } else if (kind === 'dev') {
-    script = 'https://static.videonow.ru/dev/vn_init_module.js' +
-      '?amp=1&profileId=' + profileId +
-      '&url=' + encodeURIComponent('https://data.videonow.ru/?init');
+    script =
+      'https://static.videonow.ru/dev/vn_init_module.js' +
+      '?amp=1&profileId=' +
+      profileId +
+      '&url=' +
+      encodeURIComponent('https://data.videonow.ru/?init');
   }
 
   loadScript(global, script);
diff --git a/ads/viralize.js b/ads/viralize.js
index 8e82336ef100..8e3af774c044 100644
--- a/ads/viralize.js
+++ b/ads/viralize.js
@@ -44,7 +44,10 @@ export function viralize(global, data) {
 
   const scriptUrl = addParamsToUrl(endpoint, queryParams);
 
-  loadScript(global, scriptUrl,
-      () => global.context.renderStart(),
-      () => global.context.noContentAvailable());
+  loadScript(
+    global,
+    scriptUrl,
+    () => global.context.renderStart(),
+    () => global.context.noContentAvailable()
+  );
 }
diff --git a/ads/webediads.js b/ads/webediads.js
index c16845ca3f7c..c3942b607e3a 100644
--- a/ads/webediads.js
+++ b/ads/webediads.js
@@ -28,7 +28,7 @@ export function webediads(global, data) {
       'site': data.site,
       'page': data.page,
       'position': data.position,
-      'query': (data.query) ? data.query : '',
+      'query': data.query ? data.query : '',
     });
   });
 }
diff --git a/ads/weborama.js b/ads/weborama.js
index eecf96612b88..86ad07de73d6 100644
--- a/ads/weborama.js
+++ b/ads/weborama.js
@@ -83,5 +83,8 @@ export function weboramaDisplay(global, data) {
     weak_encoding: data.wbo_weak_encoding,
   };
 
-  writeScript(global, 'https://cstatic.weborama.fr/js/advertiserv2/adperf_launch_1.0.0_scrambled.js');
+  writeScript(
+    global,
+    'https://cstatic.weborama.fr/js/advertiserv2/adperf_launch_1.0.0_scrambled.js'
+  );
 }
diff --git a/ads/widespace.js b/ads/widespace.js
index b0774d199051..8f8dd709f093 100644
--- a/ads/widespace.js
+++ b/ads/widespace.js
@@ -21,7 +21,6 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function widespace(global, data) {
-
   const WS_AMP_CODE_VER = '1.0.1';
   // Optional demography parameters.
   let demo = [];
@@ -32,9 +31,12 @@ export function widespace(global, data) {
 
   validateData(data, ['sid'], demo);
 
-  const url = 'https://engine.widespace.com/map/engine/dynamic?isamp=1'
-      + '&ampver=' + WS_AMP_CODE_VER
-      + '&#sid=' + encodeURIComponent(data.sid);
+  const url =
+    'https://engine.widespace.com/map/engine/dynamic?isamp=1' +
+    '&ampver=' +
+    WS_AMP_CODE_VER +
+    '&#sid=' +
+    encodeURIComponent(data.sid);
 
   writeScript(global, url);
 }
diff --git a/ads/wisteria.js b/ads/wisteria.js
index 44046c38ce6c..a37282f909d8 100644
--- a/ads/wisteria.js
+++ b/ads/wisteria.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
@@ -30,5 +27,13 @@ export function wisteria(global, data) {
   //get canonical url
   const originalUrl = global.context.canonicalUrl;
   validateData(data, ['siteId', 'templateNumber']);
-  loadScript(global, 'https://wisteria-js.excite.co.jp/wisteria.js?site_id=' + data['siteId'] + '&template_no=' + data['templateNumber'] + '&original_url=' + originalUrl);
+  loadScript(
+    global,
+    'https://wisteria-js.excite.co.jp/wisteria.js?site_id=' +
+      data['siteId'] +
+      '&template_no=' +
+      data['templateNumber'] +
+      '&original_url=' +
+      originalUrl
+  );
 }
diff --git a/ads/wpmedia.js b/ads/wpmedia.js
index 03a78cf0e17d..b6750561be5d 100644
--- a/ads/wpmedia.js
+++ b/ads/wpmedia.js
@@ -21,7 +21,7 @@ import {validateData, writeScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function wpmedia(global, data) {
-  validateData(data, ['slot','bunch'], ['sn','slots']);
+  validateData(data, ['slot', 'bunch'], ['sn', 'slots']);
 
   // const url = 'http://localhost/wpjslib.js';
   const url = 'https://std.wpcdn.pl/wpjslib/wpjslib-amp.js';
diff --git a/ads/xlift.js b/ads/xlift.js
index 9859a66b274f..c1cafffe7d51 100644
--- a/ads/xlift.js
+++ b/ads/xlift.js
@@ -39,14 +39,18 @@ export function xlift(global, data) {
   //assign XliftAmpHelper property to global(window)
   global.XliftAmpHelper = null;
 
-  loadScript(global, 'https://cdn.x-lift.jp/resources/common/xlift_amp.js', () => {
-    if (!global.XliftAmpHelper) {
+  loadScript(
+    global,
+    'https://cdn.x-lift.jp/resources/common/xlift_amp.js',
+    () => {
+      if (!global.XliftAmpHelper) {
+        global.context.noContentAvailable();
+      } else {
+        global.XliftAmpHelper.show();
+      }
+    },
+    () => {
       global.context.noContentAvailable();
     }
-    else {
-      global.XliftAmpHelper.show();
-    }
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  );
 }
diff --git a/ads/yahoo.js b/ads/yahoo.js
index d74d815095db..09ca195ff85e 100644
--- a/ads/yahoo.js
+++ b/ads/yahoo.js
@@ -17,9 +17,9 @@
 import {validateData, writeScript} from '../3p/3p';
 
 /**
-* @param {!Window} global
-* @param {!Object} data
-*/
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function yahoo(global, data) {
   validateData(data, ['sid', 'site', 'sa']);
   global.yadData = data;
diff --git a/ads/yahoojp.js b/ads/yahoojp.js
index 22d79ca7f9ef..a26a1c143c8e 100644
--- a/ads/yahoojp.js
+++ b/ads/yahoojp.js
@@ -23,6 +23,8 @@ import {validateData, writeScript} from '../3p/3p';
 export function yahoojp(global, data) {
   validateData(data, ['yadsid'], []);
   global.yahoojpParam = data;
-  writeScript(global,
-      'https://s.yimg.jp/images/listing/tool/yads/ydn/amp/amp.js');
+  writeScript(
+    global,
+    'https://s.yimg.jp/images/listing/tool/yads/ydn/amp/amp.js'
+  );
 }
diff --git a/ads/yandex.js b/ads/yandex.js
index 19bc98ad6f6b..33bf5ced20dd 100644
--- a/ads/yandex.js
+++ b/ads/yandex.js
@@ -23,15 +23,13 @@ const renderTo = 'yandex_rtb';
  * @param {!Object} data
  */
 export function yandex(global, data) {
-  validateData(
-      data,
-      ['blockId'],
-      ['data', 'onRender', 'onError']
-  );
+  validateData(data, ['blockId'], ['data', 'onRender', 'onError']);
 
   addToQueue(global, data);
-  loadScript(global,
-      'https://yastatic.net/partner-code/loaders/context_amp.js');
+  loadScript(
+    global,
+    'https://yastatic.net/partner-code/loaders/context_amp.js'
+  );
 }
 
 /**
@@ -41,30 +39,32 @@ export function yandex(global, data) {
 function addToQueue(global, data) {
   global[n] = global[n] || [];
   global[n].push(() => {
-
     // Create container
     createContainer(global, renderTo);
 
     // Show Ad in container
-    global.Ya.Context.AdvManager.render({
-      blockId: data.blockId,
-      statId: data.statId,
-      renderTo,
-      data: data.data,
-      async: true,
-      onRender: () => {
-        if (typeof data.onRender === 'function') {
-          data.onRender();
-        }
-        global.context.renderStart();
+    global.Ya.Context.AdvManager.render(
+      {
+        blockId: data.blockId,
+        statId: data.statId,
+        renderTo,
+        data: data.data,
+        async: true,
+        onRender: () => {
+          if (typeof data.onRender === 'function') {
+            data.onRender();
+          }
+          global.context.renderStart();
+        },
       },
-    }, () => {
-      if (typeof data.onError === 'function') {
-        data.onError();
-      } else {
-        global.context.noContentAvailable();
+      () => {
+        if (typeof data.onError === 'function') {
+          data.onError();
+        } else {
+          global.context.noContentAvailable();
+        }
       }
-    });
+    );
   });
 }
 
diff --git a/ads/yengo.js b/ads/yengo.js
index 7c8cbf0198d9..ed4bd3651a14 100644
--- a/ads/yengo.js
+++ b/ads/yengo.js
@@ -23,13 +23,19 @@ import {loadScript, validateData} from '../3p/3p';
 export function yengo(global, data) {
   validateData(data, ['blockId']);
 
-  const url = 'https://code.yengo.com/data/' +
-      encodeURIComponent(data['blockId']) + '.js?async=1&div=c';
-
-  loadScript(global, url, () => {
-    global.context.renderStart();
-  }, () => {
-    global.context.noContentAvailable();
-  });
+  const url =
+    'https://code.yengo.com/data/' +
+    encodeURIComponent(data['blockId']) +
+    '.js?async=1&div=c';
 
+  loadScript(
+    global,
+    url,
+    () => {
+      global.context.renderStart();
+    },
+    () => {
+      global.context.noContentAvailable();
+    }
+  );
 }
diff --git a/ads/yieldbot.js b/ads/yieldbot.js
index b0a2d456ae1d..69ebf23ed21e 100644
--- a/ads/yieldbot.js
+++ b/ads/yieldbot.js
@@ -36,10 +36,12 @@ export function yieldbot(global, data) {
         let dimensions;
 
         if (multiSizeDataStr) {
-          dimensions = getMultiSizeDimensions(multiSizeDataStr,
-              primaryWidth,
-              primaryHeight,
-              false);
+          dimensions = getMultiSizeDimensions(
+            multiSizeDataStr,
+            primaryWidth,
+            primaryHeight,
+            false
+          );
           dimensions.unshift([primaryWidth, primaryHeight]);
         } else {
           dimensions = [[primaryWidth, primaryHeight]];
@@ -70,13 +72,16 @@ export function yieldbot(global, data) {
       } catch (e) {
         rethrowAsync(e);
       }
-      user().warn('AMP-AD', 'type="yieldbot" will no longer ' +
-                  'be supported starting on March 29, 2018.' +
-                  ' Please use your amp-ad-network and RTC to configure a' +
-                  ' Yieldbot callout vendor. Refer to' +
-                  ' https://github.com/ampproject/amphtml/blob/master/' +
-                  'extensions/amp-a4a/rtc-publisher-implementation-guide.md' +
-                  '#setting-up-rtc-config for more information.');
+      user().warn(
+        'AMP-AD',
+        'type="yieldbot" will no longer ' +
+          'be supported starting on March 29, 2018.' +
+          ' Please use your amp-ad-network and RTC to configure a' +
+          ' Yieldbot callout vendor. Refer to' +
+          ' https://github.com/ampproject/amphtml/blob/master/' +
+          'extensions/amp-a4a/rtc-publisher-implementation-guide.md' +
+          '#setting-up-rtc-config for more information.'
+      );
     });
   });
 }
diff --git a/ads/yieldmo.js b/ads/yieldmo.js
index da44aa770e9d..6cc66c83f1de 100644
--- a/ads/yieldmo.js
+++ b/ads/yieldmo.js
@@ -21,14 +21,13 @@ import {loadScript} from '../3p/3p';
  * @param {!Object} data
  */
 export function yieldmo(global, data) {
-
   const ymElem = global.document.createElement('div');
   ymElem.id = 'ym_' + data.ymid;
   ymElem.className = 'ym';
   ymElem.dataset['ampEnabled'] = true;
   global.document.getElementById('c').appendChild(ymElem);
 
-  const swimLane = Math.round(5 * Math.random() / 3);
+  const swimLane = Math.round((5 * Math.random()) / 3);
   const ymJs = 'https://static.yieldmo.com/ym.' + swimLane + '.js';
 
   loadScript(global, ymJs);
diff --git a/ads/yieldone.js b/ads/yieldone.js
index 7f4bb10e4243..14349502ef1a 100644
--- a/ads/yieldone.js
+++ b/ads/yieldone.js
@@ -1,29 +1,31 @@
 /**
-  * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS-IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
+ * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import {validateData, writeScript} from '../3p/3p';
 
 /**
-  * @param {!Window} global
-  * @param {!Object} data
-  */
+ * @param {!Window} global
+ * @param {!Object} data
+ */
 export function yieldone(global, data) {
-  validateData(data, ['pubid', 'pid','width', 'height'], []);
+  validateData(data, ['pubid', 'pid', 'width', 'height'], []);
 
   global.yieldoneParam = data;
-  writeScript(global,
-      'https://img.ak.impact-ad.jp/ic/pone/commonjs/yone-amp.js');
+  writeScript(
+    global,
+    'https://img.ak.impact-ad.jp/ic/pone/commonjs/yone-amp.js'
+  );
 }
diff --git a/ads/yieldpro.js b/ads/yieldpro.js
index f4935793609c..b46716bf2ee0 100644
--- a/ads/yieldpro.js
+++ b/ads/yieldpro.js
@@ -14,60 +14,63 @@
  * limitations under the License.
  */
 
-import {
-  computeInMasterFrame,
-  loadScript,
-  validateData,
-} from '../3p/3p';
+import {computeInMasterFrame, loadScript, validateData} from '../3p/3p';
 
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function yieldpro(global, data) {
-
-  validateData(data, ['sectionId', 'slot', 'pubnetwork'], [
-    'instance',
-    'custom',
-    'adServerUrl',
-    'cacheSafe',
-    'pageIdModifier',
-    'click3rd',
-    'debugsrc',
-  ]);
+  validateData(
+    data,
+    ['sectionId', 'slot', 'pubnetwork'],
+    [
+      'instance',
+      'custom',
+      'adServerUrl',
+      'cacheSafe',
+      'pageIdModifier',
+      'click3rd',
+      'debugsrc',
+    ]
+  );
   //TODO support dmp and cookie
 
   const SCRIPT_HOST = 'creatives.yieldpro.eu/showad_';
 
-  let scriptUrl = 'https://' + SCRIPT_HOST +
-      data['pubnetwork'] + '.js';
+  let scriptUrl = 'https://' + SCRIPT_HOST + data['pubnetwork'] + '.js';
 
   if (data['debugsrc']) {
     scriptUrl = data['debugsrc'];
   }
 
-  computeInMasterFrame(global, 'yieldpro-request', done => {
-    let success = false;
-    const masterWin = this;
-    if (!masterWin.showadAMPAdapter) {
-      masterWin.showadAMPAdapter = {
-        registerSlot: () => {},
-      };
-      loadScript(this, scriptUrl, () => {
-        if (masterWin.showadAMPAdapter.inited) {
-          success = true;
-        }
-        done(success);
-      });
-    } else {
-      done(true);
-    }
-  }, success => {
-    if (success) {
-      global.showadAMPAdapter = global.context.master.showadAMPAdapter;
-      global.showadAMPAdapter.registerSlot(data, global);
-    } else {
-      throw new Error('Yieldpro AdTag failed to load');
+  computeInMasterFrame(
+    global,
+    'yieldpro-request',
+    done => {
+      let success = false;
+      const masterWin = this;
+      if (!masterWin.showadAMPAdapter) {
+        masterWin.showadAMPAdapter = {
+          registerSlot: () => {},
+        };
+        loadScript(this, scriptUrl, () => {
+          if (masterWin.showadAMPAdapter.inited) {
+            success = true;
+          }
+          done(success);
+        });
+      } else {
+        done(true);
+      }
+    },
+    success => {
+      if (success) {
+        global.showadAMPAdapter = global.context.master.showadAMPAdapter;
+        global.showadAMPAdapter.registerSlot(data, global);
+      } else {
+        throw new Error('Yieldpro AdTag failed to load');
+      }
     }
-  });
+  );
 }
diff --git a/ads/zedo.js b/ads/zedo.js
index 99486e469162..bb584ecd2387 100644
--- a/ads/zedo.js
+++ b/ads/zedo.js
@@ -16,31 +16,46 @@
 
 import {loadScript, validateData} from '../3p/3p';
 
-
 /**
  * @param {!Window} global
  * @param {!Object} data
  */
 export function zedo(global, data) {
   // check mandatory fields
-  validateData(data,
-      ['superId', 'network', 'placementId', 'channel', 'publisher', 'dim'],
-      ['charset', 'callback', 'renderer']);
+  validateData(
+    data,
+    ['superId', 'network', 'placementId', 'channel', 'publisher', 'dim'],
+    ['charset', 'callback', 'renderer']
+  );
 
   loadScript(global, 'https://ss3.zedo.com/gecko/tag/Gecko.amp.min.js', () => {
     const {ZGTag} = global;
     const charset = data.charset || '';
     const callback = data.callback || function() {};
-    const geckoTag = new ZGTag(data.superId, data.network, '', '',
-        charset, callback);
+    const geckoTag = new ZGTag(
+      data.superId,
+      data.network,
+      '',
+      '',
+      charset,
+      callback
+    );
     geckoTag.setAMP();
     // define placement
-    const placement = geckoTag.addPlacement(data.placementId,
-        data.channel, data.publisher, data.dim, data.width, data.height);
+    const placement = geckoTag.addPlacement(
+      data.placementId,
+      data.channel,
+      data.publisher,
+      data.dim,
+      data.width,
+      data.height
+    );
     if (data.renderer) {
       for (const key in data.renderer) {
-        placement.includeRenderer(data.renderer[key].name,
-            data.renderer[key].value);
+        placement.includeRenderer(
+          data.renderer[key].name,
+          data.renderer[key].value
+        );
       }
     } else {
       placement.includeRenderer('display', {});
diff --git a/ads/zen.js b/ads/zen.js
index 38f81513ae24..0ea812b3dc67 100644
--- a/ads/zen.js
+++ b/ads/zen.js
@@ -24,9 +24,9 @@ const renderTo = 'zen-widget';
  */
 export function zen(global, data) {
   validateData(
-      data,
-      ['clid'],
-      ['size', 'orientation', 'successCallback', 'failCallback']
+    data,
+    ['clid'],
+    ['size', 'orientation', 'successCallback', 'failCallback']
   );
 
   addToQueue(global, data);
@@ -40,7 +40,6 @@ export function zen(global, data) {
 function addToQueue(global, data) {
   global[n] = global[n] || [];
   global[n].push(() => {
-
     // Create container
     createContainer(global, renderTo);
 
diff --git a/ads/zucks.js b/ads/zucks.js
index 173812da0877..914bb393aebb 100644
--- a/ads/zucks.js
+++ b/ads/zucks.js
@@ -33,13 +33,13 @@ export function zucks(global, data) {
       container.appendChild(d);
 
       if (data['zoeMultiAd'] !== 'true') {
-        (global.gZgokZoeQueue =
-          (global.gZgokZoeQueue || [])).push({frameId});
+        (global.gZgokZoeQueue = global.gZgokZoeQueue || []).push({frameId});
       }
 
-      (global.gZgokZoeWidgetQueue =
-        (global.gZgokZoeWidgetQueue || []))
-          .push({frameId, parent: `#${elementId}`});
+      (global.gZgokZoeWidgetQueue = global.gZgokZoeWidgetQueue || []).push({
+        frameId,
+        parent: `#${elementId}`,
+      });
     });
   }
 
diff --git a/build-system/amp-cors.js b/build-system/amp-cors.js
index 5b5d65c67f32..350b87db1c85 100644
--- a/build-system/amp-cors.js
+++ b/build-system/amp-cors.js
@@ -20,22 +20,31 @@
  *    https://goo.gl/F6uCAY
  * @type {RegExp}
  */
-const ORIGIN_REGEX = new RegExp('^http://localhost:8000|' +
-'^http://.+\.localhost:8000|' +
-'^https?://.+\.herokuapp\.com');
+const ORIGIN_REGEX = new RegExp(
+  '^http://localhost:8000|' +
+    '^http://.+.localhost:8000|' +
+    '^https?://.+.herokuapp.com'
+);
 
 /**
-* In practice this would be the publishers origin.
-* Please see AMP CORS docs for more details:
-*    https://goo.gl/F6uCAY
-* @type {RegExp}
-*/
-const SOURCE_ORIGIN_REGEX = new RegExp('^http://localhost:8000|' +
-'^http://.+\.localhost:8000|' +
-'^https?://.+\.herokuapp\.com');
+ * In practice this would be the publishers origin.
+ * Please see AMP CORS docs for more details:
+ *    https://goo.gl/F6uCAY
+ * @type {RegExp}
+ */
+const SOURCE_ORIGIN_REGEX = new RegExp(
+  '^http://localhost:8000|' +
+    '^http://.+.localhost:8000|' +
+    '^https?://.+.herokuapp.com'
+);
 
-function assertCors(req, res, opt_validMethods, opt_exposeHeaders,
-  opt_ignoreMissingSourceOrigin) {
+function assertCors(
+  req,
+  res,
+  opt_validMethods,
+  opt_exposeHeaders,
+  opt_ignoreMissingSourceOrigin
+) {
   // Allow disable CORS check (iframe fixtures have origin 'about:srcdoc').
   if (req.query.cors == '0') {
     return;
@@ -62,8 +71,10 @@ function assertCors(req, res, opt_validMethods, opt_exposeHeaders,
       throw invalidOrigin;
     }
 
-    if (!opt_ignoreMissingSourceOrigin &&
-        !SOURCE_ORIGIN_REGEX.test(req.query.__amp_source_origin)) {
+    if (
+      !opt_ignoreMissingSourceOrigin &&
+      !SOURCE_ORIGIN_REGEX.test(req.query.__amp_source_origin)
+    ) {
       res.statusCode = 500;
       res.end(JSON.stringify({message: invalidSourceOrigin}));
       throw invalidSourceOrigin;
@@ -89,12 +100,17 @@ function enableCors(req, res, origin, opt_exposeHeaders) {
   if (origin) {
     res.setHeader('Access-Control-Allow-Origin', origin);
   }
-  res.setHeader('Access-Control-Expose-Headers',
-      ['AMP-Access-Control-Allow-Source-Origin']
-          .concat(opt_exposeHeaders || []).join(', '));
+  res.setHeader(
+    'Access-Control-Expose-Headers',
+    ['AMP-Access-Control-Allow-Source-Origin']
+      .concat(opt_exposeHeaders || [])
+      .join(', ')
+  );
   if (req.query.__amp_source_origin) {
-    res.setHeader('AMP-Access-Control-Allow-Source-Origin',
-        req.query.__amp_source_origin);
+    res.setHeader(
+      'AMP-Access-Control-Allow-Source-Origin',
+      req.query.__amp_source_origin
+    );
   }
 }
 
@@ -103,5 +119,6 @@ function getUrlPrefix(req) {
 }
 
 module.exports = {
-  enableCors, assertCors,
+  enableCors,
+  assertCors,
 };
diff --git a/build-system/amp.extern.js b/build-system/amp.extern.js
index a2275189d096..437d1b2e9d6a 100644
--- a/build-system/amp.extern.js
+++ b/build-system/amp.extern.js
@@ -45,7 +45,7 @@ var FetchInitDef;
  */
 var FetchRequestDef;
 
-/** @constructor **/
+/** @constructor */
 var FormDataWrapperInterface = function() {};
 
 FormDataWrapperInterface.prototype.entries = function() {};
diff --git a/build-system/amp4test.js b/build-system/amp4test.js
index 4e2a8d73c25e..9fe4504d4fed 100644
--- a/build-system/amp4test.js
+++ b/build-system/amp4test.js
@@ -18,8 +18,9 @@
 const app = require('express').Router();
 const cors = require('./amp-cors');
 const minimist = require('minimist');
-const argv = minimist(
-    process.argv.slice(2), {boolean: ['strictBabelTransform']});
+const argv = minimist(process.argv.slice(2), {
+  boolean: ['strictBabelTransform'],
+});
 const multer = require('multer');
 const path = require('path');
 const {renderShadowViewer} = require('./shadow-viewer');
@@ -51,7 +52,7 @@ app.use('/compose-doc', function(req, res) {
   const {body, css, experiments, extensions, spec} = req.query;
 
   const compiled = process.env.SERVE_MODE == 'compiled';
-  const frameHtml = (compiled)
+  const frameHtml = compiled
     ? 'dist.3p/current-min/frame.html'
     : 'dist.3p/current/frame.max.html';
 
@@ -60,8 +61,7 @@ app.use('/compose-doc', function(req, res) {
     const string = `"${experiments.split(',').join('","')}"`;
     // TODO: Why is setting localDev necessary?
     // `allow-doc-opt-in` enables any experiment to be enabled via doc opt-in.
-    experimentsBlock =
-      `<script>
+    experimentsBlock = `<script>
         window.AMP_CONFIG = window.AMP_CONFIG || {"localDev": true};
         window.AMP_CONFIG['allow-doc-opt-in'] = (window.AMP_CONFIG['allow-doc-opt-in'] || []).concat([${string}]);
       </script>
@@ -69,8 +69,7 @@ app.use('/compose-doc', function(req, res) {
   }
 
   // TODO: Do we need to inject amp-3p-iframe-src for non-ad tests?
-  const head =
-    `${experimentsBlock}
+  const head = `${experimentsBlock}
     <meta name="amp-3p-iframe-src" content="http://localhost:9876/${frameHtml}">`;
 
   const doc = composeDocument({
@@ -119,23 +118,20 @@ const bank = {};
  * Deposit a request. An ID has to be specified. Will override previous request
  * if the same ID already exists.
  */
-app.use(
-    '/request-bank/:bid/deposit/:id/',
-    upload.array(),
-    (req, res) => {
-      cors.enableCors(req, res);
-      if (!bank[req.params.bid]) {
-        bank[req.params.bid] = {};
-      }
-      const key = req.params.id;
-      log('SERVER-LOG [DEPOSIT]: ', key);
-      if (typeof bank[req.params.bid][key] === 'function') {
-        bank[req.params.bid][key](req);
-      } else {
-        bank[req.params.bid][key] = req;
-      }
-      res.end();
-    });
+app.use('/request-bank/:bid/deposit/:id/', upload.array(), (req, res) => {
+  cors.enableCors(req, res);
+  if (!bank[req.params.bid]) {
+    bank[req.params.bid] = {};
+  }
+  const key = req.params.id;
+  log('SERVER-LOG [DEPOSIT]: ', key);
+  if (typeof bank[req.params.bid][key] === 'function') {
+    bank[req.params.bid][key](req);
+  } else {
+    bank[req.params.bid][key] = req;
+  }
+  res.end();
+});
 
 /**
  * Withdraw a request. If the request of the given ID is already in the bank,
@@ -245,9 +241,9 @@ app.get('/a4a/:bid', (req, res) => {
 function composeDocument(config) {
   const {body, css, extensions, head, spec, mode} = config;
 
-  const m = (mode || process.env.SERVE_MODE);
-  const cdn = (m === 'cdn');
-  const compiled = (m === 'compiled');
+  const m = mode || process.env.SERVE_MODE;
+  const cdn = m === 'cdn';
+  const compiled = m === 'compiled';
 
   const cssTag = css ? `<style amp-custom>${css}</style>` : '';
 
@@ -258,22 +254,25 @@ function composeDocument(config) {
   switch (amp) {
     case 'amp':
       canonical = '<link rel="canonical" href="http://nonblocking.io" />';
-      boilerplate = '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>';
-      runtime = (cdn)
+      boilerplate =
+        '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>';
+      runtime = cdn
         ? 'https://cdn.ampproject.org/v0.js'
         : `/dist/${compiled ? 'v0' : 'amp'}.js`;
       break;
     case 'amp4ads':
       canonical = '';
-      boilerplate = '<style amp4ads-boilerplate>body{visibility:hidden}</style>';
-      runtime = (cdn)
+      boilerplate =
+        '<style amp4ads-boilerplate>body{visibility:hidden}</style>';
+      runtime = cdn
         ? 'https://cdn.ampproject.org/amp4ads-v0.js'
         : `/dist/${compiled ? 'amp4ads-v0' : 'amp-inabox'}.js`;
       break;
     case 'amp4email':
       canonical = '';
-      boilerplate = '<style amp4email-boilerplate>body{visibility:hidden}</style>';
-      runtime = (cdn)
+      boilerplate =
+        '<style amp4email-boilerplate>body{visibility:hidden}</style>';
+      runtime = cdn
         ? 'https://cdn.ampproject.org/v0.js'
         : `/dist/${compiled ? 'v0' : 'amp'}.js`;
       break;
@@ -285,19 +284,20 @@ function composeDocument(config) {
   // Generate extension <script> markup.
   let extensionScripts = '';
   if (extensions) {
-    extensionScripts = extensions.map(extension => {
-      const tuple = extension.split(':');
-      const name = tuple[0];
-      const version = tuple[1] || '0.1';
-      const src = (cdn)
-        ? `https://cdn.ampproject.org/v0/${name}-${version}.js`
-        : `/dist/v0/${name}-${version}.${compiled ? '' : 'max.'}js`;
-      return `<script async custom-element="${name}" src="${src}"></script>`;
-    }).join('\n');
+    extensionScripts = extensions
+      .map(extension => {
+        const tuple = extension.split(':');
+        const name = tuple[0];
+        const version = tuple[1] || '0.1';
+        const src = cdn
+          ? `https://cdn.ampproject.org/v0/${name}-${version}.js`
+          : `/dist/v0/${name}-${version}.${compiled ? '' : 'max.'}js`;
+        return `<script async custom-element="${name}" src="${src}"></script>`;
+      })
+      .join('\n');
   }
 
-  const topHalfOfHtml =
-    `<!doctype html>
+  const topHalfOfHtml = `<!doctype html>
     <html ${amp}>
     <head>
       <title>AMP TEST</title>
@@ -319,7 +319,8 @@ function composeDocument(config) {
     const start = topHalfOfHtml.indexOf(runtimeScript);
     let end = start + runtimeScript.length;
 
-    let customElements = [], extensionsMap = [];
+    let customElements = [],
+      extensionsMap = [];
     if (extensions) {
       end = topHalfOfHtml.indexOf(extensionScripts) + extensionScripts.length;
       // Filter out extensions that are not custom elements, e.g. amp-mustache.
@@ -332,8 +333,7 @@ function composeDocument(config) {
         };
       });
     }
-    ampAdMeta =
-      `<script amp-ad-metadata type=application/json>
+    ampAdMeta = `<script amp-ad-metadata type=application/json>
       {
         "ampRuntimeUtf16CharOffsets": [ ${start}, ${end} ],
         "customElementExtensions": ${JSON.stringify(customElements)},
diff --git a/build-system/app-index/amphtml-helpers.js b/build-system/app-index/amphtml-helpers.js
index d04a220625d5..be3736b7f33c 100644
--- a/build-system/app-index/amphtml-helpers.js
+++ b/build-system/app-index/amphtml-helpers.js
@@ -22,7 +22,6 @@ const boilerPlate = require('./boilerplate');
 const {html, joinFragments} = require('./html');
 const {matchIterator} = require('./regex');
 
-
 const componentTagNameRegex = /\<(amp-[^\s\>]+)/g;
 const templateTagTypeRegex = /\<template[^\>]+type="?([^\s"\>]+)/g;
 
@@ -33,57 +32,62 @@ const containsByRegex = (str, re) => str.search(re) > -1;
 // TODO(alanorozco): Expand
 const formTypes = ['input', 'select', 'form'];
 
-
 const ExtensionScript = ({name, version, isTemplate}) =>
-  html`<script
-    async
-    ${isTemplate ? 'custom-template' : 'custom-element'}="${name}"
-    src="https://cdn.ampproject.org/v0/${name}-${version || '0.1'}.js">
-  </script>`;
-
+  html`
+    <script
+      async
+      ${isTemplate ? 'custom-template' : 'custom-element'}="${name}"
+      src="https://cdn.ampproject.org/v0/${name}-${version || '0.1'}.js"
+    ></script>
+  `;
 
 const AmpState = (id, state) => html`
   <amp-state id="${id}">
     <script type="application/json">
       ${JSON.stringify(state)}
     </script>
-  </amp-state>`;
-
+  </amp-state>
+`;
 
 const ternaryExpr = (condition, onTrue, onFalse) =>
   `${condition} ? ${onTrue} : ${onFalse}`;
 
-
 const containsExpr = (haystack, needle, onTrue, onFalse) =>
   ternaryExpr(`${haystack}.indexOf(${needle}) > -1`, onTrue, onFalse);
 
-
 const ampStateKey = (...keys) => keys.join('.');
 
-
 const AmpDoc = ({body, css, head, canonical}) => {
   assert(canonical);
   return html`
-    <!doctype html>
+    <!DOCTYPE html>
     <html ⚡>
-    <head>
-      <title>AMP Dev Server</title>
-      <meta charset="utf-8">
-      <meta name="viewport"
-          content="width=device-width,minimum-scale=1,initial-scale=1">
-      ${css ? html`<style amp-custom>${css}</style>` : ''}
-      <link rel="canonical" href="${canonical}">
-      ${boilerPlate}
-      <script async src="https://cdn.ampproject.org/v0.js"></script>
-      ${head || ''}
-            <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-    <body>
-      ${body}
-    </body>
-    </html>`;
+      <head>
+        <title>AMP Dev Server</title>
+        <meta charset="utf-8" />
+        <meta
+          name="viewport"
+          content="width=device-width,minimum-scale=1,initial-scale=1"
+        />
+        ${css
+          ? html`
+              <style amp-custom>
+                ${css}
+              </style>
+            `
+          : ''}
+        <link rel="canonical" href="${canonical}" />
+        ${boilerPlate}
+        <script async src="https://cdn.ampproject.org/v0.js"></script>
+        ${head || ''}
+              <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+      <body>
+        ${body}
+      </body>
+    </html>
+  `;
 };
 
-
 const componentExtensionNameMapping = {
   'amp-state': 'amp-bind',
 };
@@ -91,25 +95,27 @@ const componentExtensionNameMapping = {
 const componentExtensionName = tagName =>
   componentExtensionNameMapping[tagName] || tagName;
 
-
-const addRequiredExtensionsToHead = (docStr, extensionConf = {
-  'amp-mustache': {version: '0.2'},
-}) => {
+const addRequiredExtensionsToHead = (
+  docStr,
+  extensionConf = {
+    'amp-mustache': {version: '0.2'},
+  }
+) => {
   const extensions = {};
 
   const addExtension = (name, defaultConf = {}) =>
-    extensions[name] = {name, ...defaultConf, ...(extensionConf[name] || {})};
+    (extensions[name] = {name, ...defaultConf, ...(extensionConf[name] || {})});
 
   const addTemplate = (name, defaultConf = {}) =>
     addExtension(name, {isTemplate: true, ...defaultConf});
 
   Array.from(matchIterator(componentTagNameRegex, docStr))
-      .map(([unusedFullMatch, tagName]) => componentExtensionName(tagName))
-      .forEach(addExtension);
+    .map(([unusedFullMatch, tagName]) => componentExtensionName(tagName))
+    .forEach(addExtension);
 
   Array.from(matchIterator(templateTagTypeRegex, docStr))
-      .map(([unusedFullMatch, type]) => type)
-      .forEach(addTemplate);
+    .map(([unusedFullMatch, type]) => type)
+    .forEach(addTemplate);
 
   // TODO(alanorozco): Too greedy. Parse "on" attributes instead.
   if (docStr.indexOf('AMP.setState') >= 0) {
@@ -120,11 +126,13 @@ const addRequiredExtensionsToHead = (docStr, extensionConf = {
     addExtension('amp-form');
   }
 
-  return docStr.replace(/\<\/head\>/i, headClosingTag =>
-    joinFragments(Object.values(extensions), ExtensionScript) + headClosingTag);
+  return docStr.replace(
+    /\<\/head\>/i,
+    headClosingTag =>
+      joinFragments(Object.values(extensions), ExtensionScript) + headClosingTag
+  );
 };
 
-
 module.exports = {
   AmpDoc,
   AmpState,
diff --git a/build-system/app-index/api/api.js b/build-system/app-index/api/api.js
index 482257bc7793..a11cdd267bd3 100644
--- a/build-system/app-index/api/api.js
+++ b/build-system/app-index/api/api.js
@@ -23,11 +23,9 @@ const Fuse = require('fuse.js');
 const path = require('path');
 const {getListing} = require('../util/listing');
 
-
 // Sitting on /build-system/app-index/api, so we go back thrice for the root.
 const root = path.join(__dirname, '../../../');
 
-
 function searchListing(fileSet, opt_searchQuery) {
   if (!opt_searchQuery) {
     return fileSet;
@@ -42,7 +40,6 @@ function searchListing(fileSet, opt_searchQuery) {
   return fuse.search(opt_searchQuery).map(i => fileSet[i]);
 }
 
-
 async function handleListingRequest({query: {path, search}}, res) {
   try {
     assert(path);
@@ -58,10 +55,8 @@ async function handleListingRequest({query: {path, search}}, res) {
   }
 }
 
-
 function installExpressMiddleware(app) {
   app.get('/dashboard/api/listing', handleListingRequest);
 }
 
-
 module.exports = {installExpressMiddleware};
diff --git a/build-system/app-index/boilerplate.js b/build-system/app-index/boilerplate.js
index ddfea76a2672..337bfbe1e9d8 100644
--- a/build-system/app-index/boilerplate.js
+++ b/build-system/app-index/boilerplate.js
@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 /* eslint-disable max-len */
-module.exports = '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>';
+module.exports =
+  '<style amp-boilerplate>body{-webkit-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-moz-animation:-amp-start 8s steps(1,end) 0s 1 normal both;-ms-animation:-amp-start 8s steps(1,end) 0s 1 normal both;animation:-amp-start 8s steps(1,end) 0s 1 normal both}@-webkit-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-moz-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-ms-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@-o-keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}@keyframes -amp-start{from{visibility:hidden}to{visibility:visible}}</style><noscript><style amp-boilerplate>body{-webkit-animation:none;-moz-animation:none;-ms-animation:none;animation:none}</style></noscript>';
diff --git a/build-system/app-index/document-modes.js b/build-system/app-index/document-modes.js
index 3038e461b3c4..9ed300ff1ac1 100644
--- a/build-system/app-index/document-modes.js
+++ b/build-system/app-index/document-modes.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 module.exports = {
   'standard': '/',
   'shadow': '/shadow/',
diff --git a/build-system/app-index/file-list.js b/build-system/app-index/file-list.js
index 386aa48ae3b8..d36b58de1298 100644
--- a/build-system/app-index/file-list.js
+++ b/build-system/app-index/file-list.js
@@ -23,7 +23,6 @@ const {appendQueryParamsToUrl, replaceLeadingSlash} = require('./url');
 const {html, joinFragments} = require('./html');
 const {KeyValueOptions} = require('./form');
 
-
 const examplesPathRegex = /^\/examples\//;
 const htmlDocRegex = /\.html$/;
 
@@ -37,74 +36,79 @@ const endpointStateId = 'listingEndpoint';
 const endpointStateKey = 'src';
 const endpointKey = ampStateKey(endpointStateId, endpointStateKey);
 
-
 const FileListSearchInput = ({basepath}) => html`
-  <input type="text"
+  <input
+    type="text"
     class="file-list-search"
     placeholder="Fuzzy Search"
     pattern="[a-zA-Z0-9-]+"
     on="input-debounced: AMP.setState({
       ${endpointStateId}: {
         ${endpointStateKey}: '${endpoint({
-          path: basepath,
-          search: '',
-        })}' + event.value
+      path: basepath,
+      search: '',
+    })}' + event.value
       }
-    })">`;
-
+    })"
+  />
+`;
 
 const ExamplesDocumentModeSelect = () => html`
   <label for="examples-mode-select">
     Document mode:
-    <select id="examples-mode-select"
-        on="change:AMP.setState({
+    <select
+      id="examples-mode-select"
+      on="change:AMP.setState({
           ${selectModeStateId}: {
             ${selectModeStateKey}: event.value
           }
-        })">
+        })"
+    >
       ${KeyValueOptions(documentModes)}
     </select>
-  </label>`;
-
+  </label>
+`;
 
 const linksToExample = (shouldContainBasepath, opt_name) =>
   examplesPathRegex.test(shouldContainBasepath) &&
-    htmlDocRegex.test(opt_name || shouldContainBasepath);
-
+  htmlDocRegex.test(opt_name || shouldContainBasepath);
 
 const ExamplesSelectModeOptional = ({basepath, selectModePrefix}) =>
-  !examplesPathRegex.test(basepath + '/') ? '' : ExamplesDocumentModeSelect({
-    selectModePrefix,
-  });
-
+  !examplesPathRegex.test(basepath + '/')
+    ? ''
+    : ExamplesDocumentModeSelect({
+        selectModePrefix,
+      });
 
 const FileListItem = ({name, href, boundHref}) =>
-  html`<div class="file-link-container" role="listitem">
-    <a class="file-link"
-      ${boundHref ? `[href]="${boundHref}" ` : ''}
-      ${href ? `href="${href}" ` : ''}>
-      ${name}
-    </a>
-  </div>`;
-
+  html`
+    <div class="file-link-container" role="listitem">
+      <a
+        class="file-link"
+        ${boundHref ? `[href]="${boundHref}" ` : ''}
+        ${href ? `href="${href}" ` : ''}
+      >
+        ${name}
+      </a>
+    </div>
+  `;
 
 const PlaceholderFileListItem = ({name, href, selectModePrefix}) =>
-  linksToExample(href) ?
-    FileListItem({
-      name,
-      href: selectModePrefix + replaceLeadingSlash(href, ''),
-      boundHref: `(${selectModeKey} || '${selectModePrefix}') + '${
-        replaceLeadingSlash(href, '')}'`,
-    }) :
-    FileListItem({href, name});
-
+  linksToExample(href)
+    ? FileListItem({
+        name,
+        href: selectModePrefix + replaceLeadingSlash(href, ''),
+        boundHref: `(${selectModeKey} || '${selectModePrefix}') + '${replaceLeadingSlash(
+          href,
+          ''
+        )}'`,
+      })
+    : FileListItem({href, name});
 
 const maybePrefixExampleDocHref = (basepath, name, selectModePrefix) =>
-  (linksToExample(basepath, name) ?
-    replaceLeadingSlash(basepath, selectModePrefix) :
-    basepath) +
-  name;
-
+  (linksToExample(basepath, name)
+    ? replaceLeadingSlash(basepath, selectModePrefix)
+    : basepath) + name;
 
 const FileListHeading = ({basepath, selectModePrefix}) => html`
   <div class="file-list-heading">
@@ -119,66 +123,79 @@ const FileListHeading = ({basepath, selectModePrefix}) => html`
       ${ExamplesSelectModeOptional({basepath, selectModePrefix})}
       <a href="/~" class="underlined">List root directory</a>
     </div>
-  </div>`;
-
+  </div>
+`;
 
 const wrapFileList = rendered => html`
   <div class="file-list-container">
     <div class="wrap">
       ${rendered}
     </div>
-  </div>`;
-
+  </div>
+`;
 
 const FileList = ({basepath, fileSet, selectModePrefix}) =>
-  wrapFileList(joinFragments([
-    AmpState(endpointStateId, {
-      [endpointStateKey]: endpoint({path: basepath}),
-    }),
-
-    FileListHeading({basepath, selectModePrefix}),
-
-    html`<amp-list [src]="${endpointKey}"
-      src="${endpoint({path: basepath})}"
-      items="."
-      layout="fixed-height"
-      width="auto"
-      height="568px"
-      class="file-list custom-loader">
-
-      <div fallback>Failed to load data.</div>
-
-      <div placeholder>
-        <div role="list">
-          ${joinFragments(fileSet, name =>
-            PlaceholderFileListItem({
-              name,
-              href: maybePrefixExampleDocHref(basepath, name, selectModePrefix),
-              selectModePrefix,
-            }))}
-        </div>
-      </div>
-
-      <template type="amp-mustache">
-        ${FileListItem({
-          href: `${basepath}{{.}}`,
-          boundHref: containsExpr(
-              '\'{{.}}\'',
-              '\'.html\'',
-              `(${selectModeKey} || '${selectModePrefix}') +` +
+  wrapFileList(
+    joinFragments([
+      AmpState(endpointStateId, {
+        [endpointStateKey]: endpoint({path: basepath}),
+      }),
+
+      FileListHeading({basepath, selectModePrefix}),
+
+      html`
+        <amp-list
+          [src]="${endpointKey}"
+          src="${endpoint({path: basepath})}"
+          items="."
+          layout="fixed-height"
+          width="auto"
+          height="568px"
+          class="file-list custom-loader"
+        >
+          <div fallback>Failed to load data.</div>
+
+          <div placeholder>
+            <div role="list">
+              ${joinFragments(fileSet, name =>
+                PlaceholderFileListItem({
+                  name,
+                  href: maybePrefixExampleDocHref(
+                    basepath,
+                    name,
+                    selectModePrefix
+                  ),
+                  selectModePrefix,
+                })
+              )}
+            </div>
+          </div>
+
+          <template type="amp-mustache">
+            ${FileListItem({
+              href: `${basepath}{{.}}`,
+              boundHref: containsExpr(
+                "'{{.}}'",
+                "'.html'",
+                `(${selectModeKey} || '${selectModePrefix}') +` +
                   `'${replaceLeadingSlash(basepath, '')}{{.}}'`,
-              `'${basepath}{{.}}'`),
-          name: '{{.}}',
-        })}
-      </template>
-
-      <div overflow
-        role="button"
-        aria-label="Show more"
-        class="list-overflow">
-        Show more
-      </div>
-    </amp-list>`,
-  ]));
+                `'${basepath}{{.}}'`
+              ),
+              name: '{{.}}',
+            })}
+          </template>
+
+          <div
+            overflow
+            role="button"
+            aria-label="Show more"
+            class="list-overflow"
+          >
+            Show more
+          </div>
+        </amp-list>
+      `,
+    ])
+  );
 
 module.exports = {FileList};
diff --git a/build-system/app-index/form.js b/build-system/app-index/form.js
index 94bcdd3b1c38..a4accb316a1f 100644
--- a/build-system/app-index/form.js
+++ b/build-system/app-index/form.js
@@ -18,15 +18,19 @@
 
 const {html} = require('./html');
 
-
-const Option = ({value, name}) => html`<option value=${value}>${name}</option>`;
-
-
-const KeyValueOptions = options => Object.keys(options).map(name =>
-  Option({
-    name,
-    value: options[name],
-  })).join('');
-
+const Option = ({value, name}) =>
+  html`
+    <option value=${value}>${name}</option>
+  `;
+
+const KeyValueOptions = options =>
+  Object.keys(options)
+    .map(name =>
+      Option({
+        name,
+        value: options[name],
+      })
+    )
+    .join('');
 
 module.exports = {Option, KeyValueOptions};
diff --git a/build-system/app-index/header-links.js b/build-system/app-index/header-links.js
index 9586857fc624..e2956a9559ea 100644
--- a/build-system/app-index/header-links.js
+++ b/build-system/app-index/header-links.js
@@ -17,7 +17,8 @@
 module.exports = [
   {
     'name': 'Developing',
-    'href': 'https://' +
+    'href':
+      'https://' +
       'github.com/ampproject/amphtml/blob/master/contributing/DEVELOPING.md',
   },
   {
diff --git a/build-system/app-index/html.js b/build-system/app-index/html.js
index cf311af0a1e3..87c1786a1a98 100644
--- a/build-system/app-index/html.js
+++ b/build-system/app-index/html.js
@@ -16,7 +16,6 @@
 
 const identity = a => a;
 
-
 /**
  * Takes a set of HTML fragments and concatenates them.
  * @param {!Array<T>} fragments
@@ -27,7 +26,6 @@ const identity = a => a;
 const joinFragments = (fragments, renderer = identity) =>
   fragments.map(renderer).join('');
 
-
 /**
  * pass-through for syntax highlighting
  * @param {!Array<string>} strings
@@ -37,5 +35,4 @@ const joinFragments = (fragments, renderer = identity) =>
 const html = (strings, ...values) =>
   joinFragments(strings, (string, i) => string + (values[i] || ''));
 
-
 module.exports = {html, joinFragments};
diff --git a/build-system/app-index/proxy-form.js b/build-system/app-index/proxy-form.js
index 20dcf64c2d10..830aaa551eb6 100644
--- a/build-system/app-index/proxy-form.js
+++ b/build-system/app-index/proxy-form.js
@@ -19,28 +19,34 @@ const documentModes = require('./document-modes');
 const {html} = require('./html');
 const {KeyValueOptions} = require('./form');
 
-
-module.exports = () => html`<div class="block">
+module.exports = () => html`
+  <div class="block">
     <form id="proxy-form" action="/proxy" target="_top">
       <label for="proxy-input">
         <span>Load URL by Proxy</span>
         <select name="mode">
           ${KeyValueOptions(documentModes)}
         </select>
-        <input type="text"
+        <input
+          type="text"
           class="text-input"
           id="proxy-input"
           name="url"
-          required aria-required="true"
+          required
+          aria-required="true"
           placeholder="https://"
-          pattern="^(https?://)?[^\\s]+$" />
+          pattern="^(https?://)?[^\\s]+$"
+        />
       </label>
       <div class="form-info">
         <span>Takes canonical, AMPHTML and Google viewer URLs.</span>
-        <a href="/ampproject/amphtml/blob/master/contributing/TESTING.md#document-proxy"
-          target="_blank">
+        <a
+          href="/ampproject/amphtml/blob/master/contributing/TESTING.md#document-proxy"
+          target="_blank"
+        >
           What's this?
         </a>
       </div>
     </form>
-  </div>`;
+  </div>
+`;
diff --git a/build-system/app-index/regex.js b/build-system/app-index/regex.js
index f42d89f1fb57..f4f202d75ea3 100644
--- a/build-system/app-index/regex.js
+++ b/build-system/app-index/regex.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 function* matchIterator(regex, subject) {
   let match = regex.exec(subject);
   while (match != null) {
@@ -23,5 +22,4 @@ function* matchIterator(regex, subject) {
   }
 }
 
-
 module.exports = {matchIterator};
diff --git a/build-system/app-index/settings.js b/build-system/app-index/settings.js
index 9fb4373476e1..b8363c0ed5ef 100644
--- a/build-system/app-index/settings.js
+++ b/build-system/app-index/settings.js
@@ -35,64 +35,75 @@ const serveModes = [
   },
 ];
 
-
 const SelectorBlock = ({id, value, selected, children}) => html`
-  <div class="selector-block"
-      ${selected ? ' selected' : ''}
-      id="${id}"
-      option="${value}">
+  <div
+    class="selector-block"
+    ${selected ? ' selected' : ''}
+    id="${id}"
+    option="${value}"
+  >
     <div class="check-icon icon"></div>
     ${children}
-  </div>`;
-
+  </div>
+`;
 
 const ServeModeSelector = ({serveMode}) => html`
   <form
     action="/serve_mode_change"
     action-xhr="/serve_mode_change"
     target="_blank"
-    id="serve-mode-form">
+    id="serve-mode-form"
+  >
     <amp-selector
       layout="container"
       on="select:serve-mode-form.submit"
-      name="mode">
+      name="mode"
+    >
       ${joinFragments(serveModes, ({value, description}) =>
         SelectorBlock({
           id: `serve_mode_${value}`,
           value,
           selected: serveMode == value,
-          children: html`<strong>${value}</strong>
-            <p>${description}</p>`,
-        }))}
+          children: html`
+            <strong>${value}</strong>
+            <p>${description}</p>
+          `,
+        })
+      )}
     </amp-selector>
-  </form>`;
-
+  </form>
+`;
 
-const SettingsOpenButton = () => html`<div
+const SettingsOpenButton = () => html`
+  <div
     on="tap: settings-modal.open"
     role="button"
     tabindex="0"
-    class="settings-cog-icon icon">
+    class="settings-cog-icon icon"
+  >
     Settings
-  </div>`;
+  </div>
+`;
 
-
-const SettingsCloseButton = () => html`<div
+const SettingsCloseButton = () => html`
+  <div
     on="tap: settings-modal.close"
     role="button"
     tabindex="1"
-    class="close-icon icon">
+    class="close-icon icon"
+  >
     Close Settings
-  </div>`;
-
+  </div>
+`;
 
-const SettingsModal = ({serveMode}) => html`<amp-lightbox
-    layout="nodisplay"
-    id="settings-modal">
-    <div class="settings-modal-header"
-        on="tap: settings-modal.close"
-        role="button"
-        tabindex="1">
+const SettingsModal = ({serveMode}) => html`
+  <amp-lightbox layout="nodisplay" id="settings-modal">
+    <div
+      class="settings-modal-header"
+      on="tap: settings-modal.close"
+      role="button"
+      tabindex="1"
+    >
       <div class="wrap">
         <div class="settings-close-button-container">
           ${SettingsCloseButton()}
@@ -106,7 +117,7 @@ const SettingsModal = ({serveMode}) => html`<amp-lightbox
         ${ServeModeSelector({serveMode})}
       </div>
     </div>
-  </amp-lightbox>`;
-
+  </amp-lightbox>
+`;
 
 module.exports = {SettingsModal, SettingsOpenButton};
diff --git a/build-system/app-index/template.js b/build-system/app-index/template.js
index 368dee2fd157..db23a5ed37d2 100644
--- a/build-system/app-index/template.js
+++ b/build-system/app-index/template.js
@@ -26,14 +26,13 @@ const {FileList} = require('./file-list');
 const {html, joinFragments} = require('./html');
 const {SettingsModal, SettingsOpenButton} = require('./settings');
 
-
 const HeaderLink = ({name, href, divider}) => html`
   <li class="${divider ? 'divider' : ''}">
     <a target="_blank" rel="noopener noreferrer" href="${href}">
       ${name}
     </a>
-  </li>`;
-
+  </li>
+`;
 
 const Header = ({isMainPage, links}) => html`
   <header>
@@ -43,31 +42,26 @@ const Header = ({isMainPage, links}) => html`
     </div>
     <ul class="right-nav">
       ${joinFragments(links, ({name, href, divider}, i) =>
-          HeaderLink({
-            divider: divider || i == links.length - 1,
-            name,
-            href,
-          }))}
+        HeaderLink({
+          divider: divider || i == links.length - 1,
+          name,
+          href,
+        })
+      )}
       <li>${SettingsOpenButton()}</li>
     </ul>
-  </header>`;
-
+  </header>
+`;
 
-const HeaderBackToMainLink = () => html`<a href="/">← Back to main</a>`;
-
-
-const ProxyFormOptional = ({isMainPage}) => isMainPage ? ProxyForm() : '';
+const HeaderBackToMainLink = () =>
+  html`
+    <a href="/">← Back to main</a>
+  `;
 
+const ProxyFormOptional = ({isMainPage}) => (isMainPage ? ProxyForm() : '');
 
 function renderTemplate(opt_params) {
-  const {
-    basepath,
-    css,
-    isMainPage,
-    fileSet,
-    serveMode,
-    selectModePrefix,
-  } = {
+  const {basepath, css, isMainPage, fileSet, serveMode, selectModePrefix} = {
     basepath: '/',
     isMainPage: false,
     fileSet: [],
@@ -77,17 +71,21 @@ function renderTemplate(opt_params) {
   };
 
   const body = joinFragments([
-    html`<div class="wrap">
-      ${Header({isMainPage, links: headerLinks})}
-      ${ProxyFormOptional({isMainPage})}
-    </div>`,
+    html`
+      <div class="wrap">
+        ${Header({isMainPage, links: headerLinks})}
+        ${ProxyFormOptional({isMainPage})}
+      </div>
+    `,
 
     FileList({basepath, selectModePrefix, fileSet}),
 
-    html`<div class="center">
-      Built with 💙  by
-      <a href="https://ampproject.org" class="underlined">the AMP Project</a>.
-    </div>`,
+    html`
+      <div class="center">
+        Built with 💙 by
+        <a href="https://ampproject.org" class="underlined">the AMP Project</a>.
+      </div>
+    `,
 
     SettingsModal({serveMode}),
   ]);
@@ -97,5 +95,4 @@ function renderTemplate(opt_params) {
   return addRequiredExtensionsToHead(docWithoutExtensions);
 }
 
-
 module.exports = {renderTemplate};
diff --git a/build-system/app-index/url.js b/build-system/app-index/url.js
index 5c64de143b0c..91a5fa43e903 100644
--- a/build-system/app-index/url.js
+++ b/build-system/app-index/url.js
@@ -14,17 +14,17 @@
  * limitations under the License.
  */
 
-
 const appendQueryParamsToUrl = (url, params) =>
-  url + '?' + Object.keys(params).map(k =>
-    `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`).join('&');
-
+  url +
+  '?' +
+  Object.keys(params)
+    .map(k => `${encodeURIComponent(k)}=${encodeURIComponent(params[k])}`)
+    .join('&');
 
 const leadingSlashRegex = /^\//;
 const replaceLeadingSlash = (subject, replacement) =>
   subject.replace(leadingSlashRegex, replacement);
 
-
 module.exports = {
   appendQueryParamsToUrl,
   replaceLeadingSlash,
diff --git a/build-system/app-test.js b/build-system/app-test.js
index b5a7a0cd5658..6c3b4dca32e0 100644
--- a/build-system/app-test.js
+++ b/build-system/app-test.js
@@ -47,10 +47,7 @@ function appTestEndpoints(app) {
     const nextWeek = new Date(new Date(date).setDate(date.getDate() + 7));
     const twoWeeks = new Date(new Date(date).setDate(date.getDate() + 14));
 
-    const blocked = [
-      getISO8601Date(nextWeek),
-      getISO8601Date(twoWeeks),
-    ];
+    const blocked = [getISO8601Date(nextWeek), getISO8601Date(twoWeeks)];
 
     res.json({
       blocked,
diff --git a/build-system/app-utils.js b/build-system/app-utils.js
index 6d6da6d4936f..a87a6570f4e1 100644
--- a/build-system/app-utils.js
+++ b/build-system/app-utils.js
@@ -27,24 +27,30 @@ const replaceUrls = (mode, file, hostName, inabox, storyV1) => {
     // TODO:(ccordry) remove this when story 0.1 is deprecated
     if (storyV1) {
       file = file.replace(
-          /https:\/\/cdn\.ampproject\.org\/v0\/amp-story-0\.1\.js/g,
-          hostName + '/dist/v0/amp-story-1.0.max.js');
+        /https:\/\/cdn\.ampproject\.org\/v0\/amp-story-0\.1\.js/g,
+        hostName + '/dist/v0/amp-story-1.0.max.js'
+      );
     }
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/v0\.js/g,
-        hostName + '/dist/amp.js');
+      /https:\/\/cdn\.ampproject\.org\/v0\.js/g,
+      hostName + '/dist/amp.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/shadow-v0\.js/g,
-        hostName + '/dist/amp-shadow.js');
+      /https:\/\/cdn\.ampproject\.org\/shadow-v0\.js/g,
+      hostName + '/dist/amp-shadow.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/amp4ads-v0\.js/g,
-        hostName + '/dist/amp-inabox.js');
+      /https:\/\/cdn\.ampproject\.org\/amp4ads-v0\.js/g,
+      hostName + '/dist/amp-inabox.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/video-iframe-integration-v0\.js/g,
-        hostName + '/dist/video-iframe-integration.js');
+      /https:\/\/cdn\.ampproject\.org\/video-iframe-integration-v0\.js/g,
+      hostName + '/dist/video-iframe-integration.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
-        hostName + '/dist/v0/$1.max.js');
+      /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
+      hostName + '/dist/v0/$1.max.js'
+    );
     if (inabox) {
       let filename;
       if (inabox == '1') {
@@ -57,23 +63,29 @@ const replaceUrls = (mode, file, hostName, inabox, storyV1) => {
     }
   } else if (mode == 'compiled') {
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/v0\.js/g,
-        hostName + '/dist/v0.js');
+      /https:\/\/cdn\.ampproject\.org\/v0\.js/g,
+      hostName + '/dist/v0.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/shadow-v0\.js/g,
-        hostName + '/dist/shadow-v0.js');
+      /https:\/\/cdn\.ampproject\.org\/shadow-v0\.js/g,
+      hostName + '/dist/shadow-v0.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/amp4ads-v0\.js/g,
-        hostName + '/dist/amp4ads-v0.js');
+      /https:\/\/cdn\.ampproject\.org\/amp4ads-v0\.js/g,
+      hostName + '/dist/amp4ads-v0.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/video-iframe-integration-v0\.js/g,
-        hostName + '/dist/video-iframe-integration-v0.js');
+      /https:\/\/cdn\.ampproject\.org\/video-iframe-integration-v0\.js/g,
+      hostName + '/dist/video-iframe-integration-v0.js'
+    );
     file = file.replace(
-        /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
-        hostName + '/dist/v0/$1.js');
+      /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
+      hostName + '/dist/v0/$1.js'
+    );
     file = file.replace(
-        /\/dist.3p\/current\/(.*)\.max.html/g,
-        hostName + '/dist.3p/current-min/$1.html');
+      /\/dist.3p\/current\/(.*)\.max.html/g,
+      hostName + '/dist.3p/current-min/$1.html'
+    );
     if (inabox) {
       let filename;
       if (inabox == '1') {
diff --git a/build-system/app.js b/build-system/app.js
index f0ea7eee5cbb..1b7f052a7ad2 100644
--- a/build-system/app.js
+++ b/build-system/app.js
@@ -55,7 +55,8 @@ app.use('/list/', require('./routes/list'));
 app.use((req, res, next) => {
   if (req.query.csp) {
     res.set({
-      'content-security-policy': "default-src * blob: data:; script-src https://cdn.ampproject.org/rtv/ https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ http://localhost:8000 https://localhost:8000; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net; report-uri https://csp-collector.appspot.com/csp/amp",
+      'content-security-policy':
+        "default-src * blob: data:; script-src https://cdn.ampproject.org/rtv/ https://cdn.ampproject.org/v0.js https://cdn.ampproject.org/v0/ https://cdn.ampproject.org/viewer/ http://localhost:8000 https://localhost:8000; object-src 'none'; style-src 'unsafe-inline' https://cdn.ampproject.org/rtv/ https://cdn.materialdesignicons.com https://cloud.typography.com https://fast.fonts.net https://fonts.googleapis.com https://maxcdn.bootstrapcdn.com https://p.typekit.net https://use.fontawesome.com https://use.typekit.net; report-uri https://csp-collector.appspot.com/csp/amp",
     });
   }
   next();
@@ -85,7 +86,6 @@ if (!global.AMP_TESTING) {
   devDashboard.installExpressMiddleware(app);
 }
 
-
 // Changes the current serve mode via query param
 // e.g. /serve_mode_change?mode=(default|compiled|cdn)
 // (See ./app-index/settings.js)
@@ -103,7 +103,6 @@ app.get('/serve_mode_change', (req, res) => {
   res.status(400).json({ok: false});
 });
 
-
 // Redirects to a proxied document with optional mode through query params.
 //
 // Mode can be one of:
@@ -122,11 +121,10 @@ app.get('/serve_mode_change', (req, res) => {
 //
 // This passthrough is useful to generate the URL from <form> values,
 // (See ./app-index/proxy-form.js)
-app.get('/proxy', async(req, res, next) => {
+app.get('/proxy', async (req, res, next) => {
   const {mode, url} = req.query;
   const urlSuffixClearPrefixReStr =
-      '^https?://' +
-      '((www\.)?google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)/amp/s/)?';
+    '^https?://((www.)?google.(com?|[a-z]{2}|com?.[a-z]{2}|cat)/amp/s/)?';
   const urlSuffix = url.replace(new RegExp(urlSuffixClearPrefixReStr, 'i'), '');
 
   try {
@@ -141,7 +139,6 @@ app.get('/proxy', async(req, res, next) => {
   }
 });
 
-
 /**
  * Resolves an AMPHTML URL from a canonical URL. If AMPHTML is canonical, same
  * URL is returned.
@@ -154,9 +151,10 @@ function requestAmphtmlDocUrl(urlSuffix, protocol = 'https') {
   console.log(`Fetching URL: ${defaultUrl}`);
   return new Promise((resolve, reject) => {
     request(defaultUrl, (error, response, body) => {
-      if (error || (response && (
-        response.statusCode < 200 || response.statusCode >= 300))) {
-
+      if (
+        error ||
+        (response && (response.statusCode < 200 || response.statusCode >= 300))
+      ) {
         if (protocol == 'https') {
           return requestAmphtmlDocUrl(urlSuffix, 'http');
         }
@@ -181,25 +179,22 @@ function requestAmphtmlDocUrl(urlSuffix, protocol = 'https') {
  * integration tests. Using this to mock
  * out the recaptcha api.
  */
-app.get(
-    '/dist.3p/*/recaptcha.*html',
-    recaptchaFrameRequestHandler
-);
-app.use(
-    '/recaptcha',
-    recaptchaRouter
-);
+app.get('/dist.3p/*/recaptcha.*html', recaptchaFrameRequestHandler);
+app.use('/recaptcha', recaptchaRouter);
 
 // Deprecate usage of .min.html/.max.html
-app.get([
-  '/examples/*.(min|max).html',
-  '/test/manual/*.(min|max).html',
-  '/test/fixtures/e2e/*/*.(min|max).html',
-  '/dist/cache-sw.(min|max).html',
-], (req, res) => {
-  const filePath = req.url;
-  res.send(generateInfo(filePath));
-});
+app.get(
+  [
+    '/examples/*.(min|max).html',
+    '/test/manual/*.(min|max).html',
+    '/test/fixtures/e2e/*/*.(min|max).html',
+    '/dist/cache-sw.(min|max).html',
+  ],
+  (req, res) => {
+    const filePath = req.url;
+    res.send(generateInfo(filePath));
+  }
+);
 
 app.use('/pwa', (req, res) => {
   let file;
@@ -280,14 +275,12 @@ app.use('/form/html/post', (req, res) => {
   });
 });
 
-
 app.use('/form/redirect-to/post', (req, res) => {
   cors.assertCors(req, res, ['POST'], ['AMP-Redirect-To']);
   res.setHeader('AMP-Redirect-To', 'https://google.com');
   res.end('{}');
 });
 
-
 app.use('/form/echo-json/post', (req, res) => {
   cors.assertCors(req, res, ['POST']);
   const form = new formidable.IncomingForm();
@@ -305,21 +298,28 @@ app.use('/form/json/poll1', (req, res) => {
   const form = new formidable.IncomingForm();
   form.parse(req, () => {
     res.setHeader('Content-Type', 'application/json');
-    res.end(JSON.stringify({
-      result: [{
-        answer: 'Penguins',
-        percentage: new Array(77),
-      }, {
-        answer: 'Ostriches',
-        percentage: new Array(8),
-      }, {
-        answer: 'Kiwis',
-        percentage: new Array(14),
-      }, {
-        answer: 'Wekas',
-        percentage: new Array(1),
-      }],
-    }));
+    res.end(
+      JSON.stringify({
+        result: [
+          {
+            answer: 'Penguins',
+            percentage: new Array(77),
+          },
+          {
+            answer: 'Ostriches',
+            percentage: new Array(8),
+          },
+          {
+            answer: 'Kiwis',
+            percentage: new Array(14),
+          },
+          {
+            answer: 'Wekas',
+            percentage: new Array(1),
+          },
+        ],
+      })
+    );
   });
 });
 
@@ -351,7 +351,6 @@ app.use('/form/search-html/get', (req, res) => {
   `);
 });
 
-
 app.use('/form/search-json/get', (req, res) => {
   cors.assertCors(req, res, ['GET']);
   res.json({
@@ -361,8 +360,17 @@ app.use('/form/search-json/get', (req, res) => {
   });
 });
 
-const autocompleteColors = ['red', 'orange', 'yellow', 'green', 'blue',
-  'purple', 'pink', 'black', 'white'];
+const autocompleteColors = [
+  'red',
+  'orange',
+  'yellow',
+  'green',
+  'blue',
+  'purple',
+  'pink',
+  'black',
+  'white',
+];
 
 app.use('/form/autocomplete/query', (req, res) => {
   const query = req.query.q;
@@ -370,32 +378,63 @@ app.use('/form/autocomplete/query', (req, res) => {
     res.json({items: autocompleteColors});
   } else {
     const lowerCaseQuery = query.toLowerCase();
-    const filtered = autocompleteColors.filter(
-        l => l.toLowerCase().includes(lowerCaseQuery));
+    const filtered = autocompleteColors.filter(l =>
+      l.toLowerCase().includes(lowerCaseQuery)
+    );
     res.json({items: filtered});
   }
 });
 
-const autosuggestLanguages = ['ActionScript', 'AppleScript', 'Asp', 'BASIC',
-  'C', 'C++', 'Clojure', 'COBOL', 'ColdFusion', 'Erlang', 'Fortran', 'Go',
-  'Groovy', 'Haskell', 'Java', 'JavaScript', 'Lisp', 'Perl', 'PHP', 'Python',
-  'Ruby', 'Scala', 'Scheme'];
+const autosuggestLanguages = [
+  'ActionScript',
+  'AppleScript',
+  'Asp',
+  'BASIC',
+  'C',
+  'C++',
+  'Clojure',
+  'COBOL',
+  'ColdFusion',
+  'Erlang',
+  'Fortran',
+  'Go',
+  'Groovy',
+  'Haskell',
+  'Java',
+  'JavaScript',
+  'Lisp',
+  'Perl',
+  'PHP',
+  'Python',
+  'Ruby',
+  'Scala',
+  'Scheme',
+];
 
 app.use('/form/autosuggest/query', (req, res) => {
   cors.assertCors(req, res, ['GET']);
   const MAX_RESULTS = 4;
   const query = req.query.q;
   if (!query) {
-    res.json({items: [{
-      results: autosuggestLanguages.slice(0, MAX_RESULTS),
-    }]});
+    res.json({
+      items: [
+        {
+          results: autosuggestLanguages.slice(0, MAX_RESULTS),
+        },
+      ],
+    });
   } else {
     const lowerCaseQuery = query.toLowerCase();
-    const filtered = autosuggestLanguages.filter(
-        l => l.toLowerCase().includes(lowerCaseQuery));
-    res.json({items: [{
-      results: filtered.slice(0, MAX_RESULTS)},
-    ]});
+    const filtered = autosuggestLanguages.filter(l =>
+      l.toLowerCase().includes(lowerCaseQuery)
+    );
+    res.json({
+      items: [
+        {
+          results: filtered.slice(0, MAX_RESULTS),
+        },
+      ],
+    });
   }
 });
 
@@ -429,19 +468,21 @@ app.use('/form/verify-search-json/post', (req, res) => {
     if (fields.city !== 'Mountain View' || fields.zip !== '94043') {
       errors.push({
         name: 'city',
-        message: 'City doesn\'t match zip (Mountain View and 94043)',
+        message: "City doesn't match zip (Mountain View and 94043)",
       });
     }
 
     if (errors.length === 0) {
-      res.end(JSON.stringify({
-        results: [
-          {title: 'Result 1'},
-          {title: 'Result 2'},
-          {title: 'Result 3'},
-        ],
-        committed: true,
-      }));
+      res.end(
+        JSON.stringify({
+          results: [
+            {title: 'Result 1'},
+            {title: 'Result 2'},
+            {title: 'Result 3'},
+          ],
+          committed: true,
+        })
+      );
     } else {
       res.statusCode = 400;
       res.end(JSON.stringify({verifyErrors: errors}));
@@ -450,8 +491,10 @@ app.use('/form/verify-search-json/post', (req, res) => {
 });
 
 app.use('/share-tracking/get-outgoing-fragment', (req, res) => {
-  res.setHeader('AMP-Access-Control-Allow-Source-Origin',
-      req.protocol + '://' + req.headers.host);
+  res.setHeader(
+    'AMP-Access-Control-Allow-Source-Origin',
+    req.protocol + '://' + req.headers.host
+  );
   res.json({
     fragment: '54321',
   });
@@ -460,17 +503,20 @@ app.use('/share-tracking/get-outgoing-fragment', (req, res) => {
 // Fetches an AMP document from the AMP proxy and replaces JS
 // URLs, so that they point to localhost.
 function proxyToAmpProxy(req, res, mode) {
-  const url = 'https://cdn.ampproject.org/'
-      + (req.query['amp_js_v'] ? 'v' : 'c')
-      + req.url;
+  const url =
+    'https://cdn.ampproject.org/' +
+    (req.query['amp_js_v'] ? 'v' : 'c') +
+    req.url;
   console.log('Fetching URL: ' + url);
   request(url, function(error, response, body) {
     body = body
-        // Unversion URLs.
-        .replace(/https\:\/\/cdn\.ampproject\.org\/rtv\/\d+\//g,
-            'https://cdn.ampproject.org/')
-        // <base> href pointing to the proxy, so that images, etc. still work.
-        .replace('<head>', '<head><base href="https://cdn.ampproject.org/">');
+      // Unversion URLs.
+      .replace(
+        /https\:\/\/cdn\.ampproject\.org\/rtv\/\d+\//g,
+        'https://cdn.ampproject.org/'
+      )
+      // <base> href pointing to the proxy, so that images, etc. still work.
+      .replace('<head>', '<head><base href="https://cdn.ampproject.org/">');
     const inabox = req.query['inabox'];
     // TODO(ccordry): Remove this when story v01 is depricated.
     const storyV1 = req.query['story_v'] === '1';
@@ -485,7 +531,6 @@ function proxyToAmpProxy(req, res, mode) {
   });
 }
 
-
 let itemCtr = 2;
 const doctype = '<!doctype html>\n';
 const liveListDocs = Object.create(null);
@@ -500,7 +545,7 @@ app.use('/examples/live-list-update(-reverse)?.amp.html', (req, res, next) => {
   // When we already have state in memory and user refreshes page, we flush
   // the dom we maintain on the server.
   if (!('amp_latest_update_time' in req.query) && liveListDoc) {
-    let outerHTML = liveListDoc.documentElement./*OK*/outerHTML;
+    let outerHTML = liveListDoc.documentElement./*OK*/ outerHTML;
     outerHTML = replaceUrls(mode, outerHTML);
     res.send(`${doctype}${outerHTML}`);
     return;
@@ -509,8 +554,9 @@ app.use('/examples/live-list-update(-reverse)?.amp.html', (req, res, next) => {
     const liveListUpdateFullPath = `${pc.cwd()}${req.baseUrl}`;
     console.log('liveListUpdateFullPath', liveListUpdateFullPath);
     const liveListFile = fs.readFileSync(liveListUpdateFullPath);
-    liveListDoc = liveListDocs[req.baseUrl] = new jsdom.JSDOM(liveListFile)
-        .window.document;
+    liveListDoc = liveListDocs[req.baseUrl] = new jsdom.JSDOM(
+      liveListFile
+    ).window.document;
     liveListDoc.ctr = 0;
   }
   const liveList = liveListDoc.querySelector('#my-live-list');
@@ -519,35 +565,38 @@ app.use('/examples/live-list-update(-reverse)?.amp.html', (req, res, next) => {
   const pagination = liveListDoc.querySelector('#my-live-list [pagination]');
   const item1 = liveList.querySelector('#list-item-1');
   if (liveListDoc.ctr != 0) {
-    if (Math.random() < .8) {
+    if (Math.random() < 0.8) {
       // Always run a replace on the first item
       liveListReplace(item1);
 
-      if (Math.random() < .5) {
+      if (Math.random() < 0.5) {
         liveListTombstone(liveList);
       }
 
-      if (Math.random() < .8) {
+      if (Math.random() < 0.8) {
         liveListInsert(liveList, item1);
       }
       pagination.textContent = '';
-      const liveChildren = [].slice.call(items.children)
-          .filter(x => !x.hasAttribute('data-tombstone'));
+      const liveChildren = [].slice
+        .call(items.children)
+        .filter(x => !x.hasAttribute('data-tombstone'));
 
       const pageCount = Math.ceil(liveChildren.length / perPage);
       const pageListItems = Array.apply(null, Array(pageCount))
-          .map((_, i) => `<li>${i + 1}</li>`).join('');
-      const newPagination = '<nav aria-label="amp live list pagination">' +
-          `<ul class="pagination">${pageListItems}</ul>` +
-          '</nav>';
-      pagination./*OK*/innerHTML = newPagination;
+        .map((_, i) => `<li>${i + 1}</li>`)
+        .join('');
+      const newPagination =
+        '<nav aria-label="amp live list pagination">' +
+        `<ul class="pagination">${pageListItems}</ul>` +
+        '</nav>';
+      pagination./*OK*/ innerHTML = newPagination;
     } else {
       // Sometimes we want an empty response to simulate no changes.
       res.send(`${doctype}<html></html>`);
       return;
     }
   }
-  let outerHTML = liveListDoc.documentElement./*OK*/outerHTML;
+  let outerHTML = liveListDoc.documentElement./*OK*/ outerHTML;
   outerHTML = replaceUrls(mode, outerHTML);
   liveListDoc.ctr++;
   res.send(`${doctype}${outerHTML}`);
@@ -577,19 +626,19 @@ function liveListTombstone(liveList) {
   // We can tombstone any list item except item-1 since we always do a
   // replace example on item-1.
   if (tombstoneId != 1) {
-    const item = liveList./*OK*/querySelector(`#list-item-${tombstoneId}`);
+    const item = liveList./*OK*/ querySelector(`#list-item-${tombstoneId}`);
     if (item) {
       item.setAttribute('data-tombstone', '');
     }
   }
 }
 
-
 // Generate a random number between min and max
 // Value is inclusive of both min and max values.
 function range(min, max) {
-  const values =
-      Array.apply(null, new Array(max - min + 1)).map((_, i) => min + i);
+  const values = Array.apply(null, new Array(max - min + 1)).map(
+    (_, i) => min + i
+  );
   return values[Math.round(Math.random() * (max - min))];
 }
 
@@ -603,12 +652,18 @@ function getLiveBlogItem() {
   // Generate a 3 to 7 worded headline
   const headline = bacon(range(3, 7));
   const numOfParagraphs = range(1, 2);
-  const body = Array.apply(null, new Array(numOfParagraphs)).map(() => {
-    return `<p>${bacon(range(50, 90))}</p>`;
-  }).join('\n');
+  const body = Array.apply(null, new Array(numOfParagraphs))
+    .map(() => {
+      return `<p>${bacon(range(50, 90))}</p>`;
+    })
+    .join('\n');
 
   const img = `<amp-img
-        src="${flip() ? 'https://placekitten.com/300/350' : 'https://baconmockup.com/300/350'}"
+        src="${
+          flip()
+            ? 'https://placekitten.com/300/350'
+            : 'https://baconmockup.com/300/350'
+        }"
         layout="responsive"
          height="300" width="350">
       </amp-img>`;
@@ -651,9 +706,11 @@ function getLiveBlogItemWithBindAttributes() {
   const now = Date.now();
   // Generate a 3 to 7 worded headline
   const numOfParagraphs = range(1, 2);
-  const body = Array.apply(null, new Array(numOfParagraphs)).map(() => {
-    return `<p>${bacon(range(50, 90))}</p>`;
-  }).join('\n');
+  const body = Array.apply(null, new Array(numOfParagraphs))
+    .map(() => {
+      return `<p>${bacon(range(50, 90))}</p>`;
+    })
+    .join('\n');
 
   return `<!doctype html>
     <html amp><body>
@@ -670,25 +727,26 @@ function getLiveBlogItemWithBindAttributes() {
     </amp-live-list></body></html>`;
 }
 
-app.use('/examples/live-blog(-non-floating-button)?.amp.html',
-    (req, res, next) => {
-      if ('amp_latest_update_time' in req.query) {
-        res.setHeader('Content-Type', 'text/html');
-        res.end(getLiveBlogItem());
-        return;
-      }
-      next();
-    });
+app.use(
+  '/examples/live-blog(-non-floating-button)?.amp.html',
+  (req, res, next) => {
+    if ('amp_latest_update_time' in req.query) {
+      res.setHeader('Content-Type', 'text/html');
+      res.end(getLiveBlogItem());
+      return;
+    }
+    next();
+  }
+);
 
-app.use('/examples/bind/live-list.amp.html',
-    (req, res, next) => {
-      if ('amp_latest_update_time' in req.query) {
-        res.setHeader('Content-Type', 'text/html');
-        res.end(getLiveBlogItemWithBindAttributes());
-        return;
-      }
-      next();
-    });
+app.use('/examples/bind/live-list.amp.html', (req, res, next) => {
+  if ('amp_latest_update_time' in req.query) {
+    res.setHeader('Content-Type', 'text/html');
+    res.end(getLiveBlogItemWithBindAttributes());
+    return;
+  }
+  next();
+});
 
 app.use('/impression-proxy/', (req, res) => {
   cors.assertCors(req, res, ['GET']);
@@ -769,16 +827,19 @@ app.get('/a4a_template/*', (req, res) => {
     res.end('Invalid path: ' + req.path);
     return;
   }
-  const filePath = `${pc.cwd()}/extensions/amp-ad-network-${match[1]}-impl/` +
-      `0.1/data/${match[2]}.template`;
-  fs.readFileAsync(filePath).then(file => {
-    res.setHeader('Content-Type', 'application/json');
-    res.setHeader('AMP-template-amp-creative', 'amp-mustache');
-    res.end(file);
-  }).error(() => {
-    res.status(404);
-    res.end('Not found: ' + filePath);
-  });
+  const filePath =
+    `${pc.cwd()}/extensions/amp-ad-network-${match[1]}-impl/` +
+    `0.1/data/${match[2]}.template`;
+  fs.readFileAsync(filePath)
+    .then(file => {
+      res.setHeader('Content-Type', 'application/json');
+      res.setHeader('AMP-template-amp-creative', 'amp-mustache');
+      res.end(file);
+    })
+    .error(() => {
+      res.status(404);
+      res.end('Not found: ' + filePath);
+    });
 });
 
 // Returns a document that echoes any post messages received from parent.
@@ -789,7 +850,7 @@ app.get('/a4a_template/*', (req, res) => {
 app.get('/iframe-echo-message', (req, res) => {
   const {message} = req.query;
   res.send(
-      `<!doctype html>
+    `<!doctype html>
         <body style="background-color: yellow">
         <script>
         if (${message}) {
@@ -803,7 +864,8 @@ app.get('/iframe-echo-message', (req, res) => {
         }
         </script>
         </body>
-      </html>`);
+      </html>`
+  );
 });
 
 // A4A envelope.
@@ -815,8 +877,7 @@ app.use('/a4a(|-3p)/', (req, res) => {
   let adUrl = req.url;
   const templatePath = '/build-system/server-a4a-template.html';
   const urlPrefix = getUrlPrefix(req);
-  if (!adUrl.startsWith('/proxy') &&
-      urlPrefix.indexOf('//localhost') != -1) {
+  if (!adUrl.startsWith('/proxy') && urlPrefix.indexOf('//localhost') != -1) {
     // This is a special case for testing. `localhost` URLs are transformed to
     // `ads.localhost` to ensure that the iframe is fully x-origin.
     adUrl = urlPrefix.replace('localhost', 'ads.localhost') + adUrl;
@@ -824,12 +885,12 @@ app.use('/a4a(|-3p)/', (req, res) => {
   adUrl = addQueryParam(adUrl, 'inabox', 1);
   fs.readFileAsync(pc.cwd() + templatePath, 'utf8').then(template => {
     const result = template
-        .replace(/CHECKSIG/g, force3p || '')
-        .replace(/DISABLE3PFALLBACK/g, !force3p)
-        .replace(/OFFSET/g, req.query.offset || '0px')
-        .replace(/AD_URL/g, adUrl)
-        .replace(/AD_WIDTH/g, req.query.width || '300')
-        .replace(/AD_HEIGHT/g, req.query.height || '250');
+      .replace(/CHECKSIG/g, force3p || '')
+      .replace(/DISABLE3PFALLBACK/g, !force3p)
+      .replace(/OFFSET/g, req.query.offset || '0px')
+      .replace(/AD_URL/g, adUrl)
+      .replace(/AD_WIDTH/g, req.query.width || '300')
+      .replace(/AD_HEIGHT/g, req.query.height || '250');
     res.end(result);
   });
 });
@@ -842,8 +903,10 @@ app.use('/inabox/:version/', (req, res) => {
   let adUrl = req.url;
   const templatePath = '/build-system/server-inabox-template.html';
   const urlPrefix = getUrlPrefix(req);
-  if (!adUrl.startsWith('/proxy') && // Ignore /proxy
-      urlPrefix.indexOf('//localhost') != -1) {
+  if (
+    !adUrl.startsWith('/proxy') && // Ignore /proxy
+    urlPrefix.indexOf('//localhost') != -1
+  ) {
     // This is a special case for testing. `localhost` URLs are transformed to
     // `ads.localhost` to ensure that the iframe is fully x-origin.
     adUrl = urlPrefix.replace('localhost', 'ads.localhost') + adUrl;
@@ -851,10 +914,10 @@ app.use('/inabox/:version/', (req, res) => {
   adUrl = addQueryParam(adUrl, 'inabox', req.params['version']);
   fs.readFileAsync(pc.cwd() + templatePath, 'utf8').then(template => {
     const result = template
-        .replace(/AD_URL/g, adUrl)
-        .replace(/OFFSET/g, req.query.offset || '0px')
-        .replace(/AD_WIDTH/g, req.query.width || '300')
-        .replace(/AD_HEIGHT/g, req.query.height || '250');
+      .replace(/AD_URL/g, adUrl)
+      .replace(/OFFSET/g, req.query.offset || '0px')
+      .replace(/AD_WIDTH/g, req.query.width || '300')
+      .replace(/AD_HEIGHT/g, req.query.height || '250');
     res.end(result);
   });
 });
@@ -864,14 +927,16 @@ app.use('/examples/analytics.config.json', (req, res, next) => {
   next();
 });
 
-app.use(['/examples/*', '/extensions/*', '/test/manual/*'],
-    (req, res, next) => {
-      const sourceOrigin = req.query['__amp_source_origin'];
-      if (sourceOrigin) {
-        res.setHeader('AMP-Access-Control-Allow-Source-Origin', sourceOrigin);
-      }
-      next();
-    });
+app.use(
+  ['/examples/*', '/extensions/*', '/test/manual/*'],
+  (req, res, next) => {
+    const sourceOrigin = req.query['__amp_source_origin'];
+    if (sourceOrigin) {
+      res.setHeader('AMP-Access-Control-Allow-Source-Origin', sourceOrigin);
+    }
+    next();
+  }
+);
 
 /**
  * Append ?sleep=5 to any included JS file in examples to emulate delay in
@@ -893,76 +958,92 @@ app.use(['/dist/v0/amp-*.js'], (req, res, next) => {
  */
 app.get('/test/manual/amp-video.amp.html', runVideoTestBench);
 
-app.get([
-  '/examples/*.html',
-  '/test/manual/*.html',
-  '/test/fixtures/e2e/*/*.html'], (req, res, next) => {
-  const filePath = req.path;
-  const mode = pc.env.SERVE_MODE;
-  const inabox = req.query['inabox'];
-  const stream = Number(req.query['stream']);
-  fs.readFileAsync(pc.cwd() + filePath, 'utf8').then(file => {
-    if (req.query['amp_js_v']) {
-      file = addViewerIntegrationScript(req.query['amp_js_v'], file);
-    }
-    file = file.replace(/__TEST_SERVER_PORT__/g, TEST_SERVER_PORT);
+app.get(
+  ['/examples/*.html', '/test/manual/*.html', '/test/fixtures/e2e/*/*.html'],
+  (req, res, next) => {
+    const filePath = req.path;
+    const mode = pc.env.SERVE_MODE;
+    const inabox = req.query['inabox'];
+    const stream = Number(req.query['stream']);
+    fs.readFileAsync(pc.cwd() + filePath, 'utf8')
+      .then(file => {
+        if (req.query['amp_js_v']) {
+          file = addViewerIntegrationScript(req.query['amp_js_v'], file);
+        }
+        file = file.replace(/__TEST_SERVER_PORT__/g, TEST_SERVER_PORT);
 
-    if (inabox && req.headers.origin && req.query.__amp_source_origin) {
-      // Allow CORS requests for A4A.
-      cors.enableCors(req, res, req.headers.origin);
-    } else {
-      file = replaceUrls(mode, file, '', inabox);
-    }
+        if (inabox && req.headers.origin && req.query.__amp_source_origin) {
+          // Allow CORS requests for A4A.
+          cors.enableCors(req, res, req.headers.origin);
+        } else {
+          file = replaceUrls(mode, file, '', inabox);
+        }
 
-    // Extract amp-ad for the given 'type' specified in URL query.
-    if (req.path.indexOf('/examples/ads.amp.html') == 0 && req.query.type) {
-      const ads = file.match(
-          elementExtractor('(amp-ad|amp-embed)', req.query.type));
-      file = file.replace(
-          /<body>[\s\S]+<\/body>/m, '<body>' + ads.join('') + '</body>');
-    }
+        // Extract amp-ad for the given 'type' specified in URL query.
+        if (req.path.indexOf('/examples/ads.amp.html') == 0 && req.query.type) {
+          const ads = file.match(
+            elementExtractor('(amp-ad|amp-embed)', req.query.type)
+          );
+          file = file.replace(
+            /<body>[\s\S]+<\/body>/m,
+            '<body>' + ads.join('') + '</body>'
+          );
+        }
 
-    // Extract amp-analytics for the given 'type' specified in URL query.
-    if (req.path.indexOf(
-        '/examples/analytics-vendors.amp.html') == 0 && req.query.type) {
-      const analytics = file.match(
-          elementExtractor('amp-analytics', req.query.type));
-      file = file.replace(
-          /<div id="container">[\s\S]+<\/div>/m,
-          '<div id="container">' + analytics.join('') + '</div>');
-    }
+        // Extract amp-analytics for the given 'type' specified in URL query.
+        if (
+          req.path.indexOf('/examples/analytics-vendors.amp.html') == 0 &&
+          req.query.type
+        ) {
+          const analytics = file.match(
+            elementExtractor('amp-analytics', req.query.type)
+          );
+          file = file.replace(
+            /<div id="container">[\s\S]+<\/div>/m,
+            '<div id="container">' + analytics.join('') + '</div>'
+          );
+        }
 
-    // Extract amp-consent for the given 'type' specified in URL query.
-    if (req.path.indexOf(
-        '/examples/cmp-vendors.amp.html') == 0 && req.query.type) {
-      const consent = file.match(
-          elementExtractor('amp-consent', req.query.type));
-      file = file.replace(
-          /<div id="container">[\s\S]+<\/div>/m,
-          '<div id="container">' + consent.join('') + '</div>');
-    }
+        // Extract amp-consent for the given 'type' specified in URL query.
+        if (
+          req.path.indexOf('/examples/cmp-vendors.amp.html') == 0 &&
+          req.query.type
+        ) {
+          const consent = file.match(
+            elementExtractor('amp-consent', req.query.type)
+          );
+          file = file.replace(
+            /<div id="container">[\s\S]+<\/div>/m,
+            '<div id="container">' + consent.join('') + '</div>'
+          );
+        }
 
-    if (stream > 0) {
-      res.writeHead(200, {'Content-Type': 'text/html'});
-      let pos = 0;
-      const writeChunk = function() {
-        const chunk = file.substring(pos, Math.min(pos + stream, file.length));
-        res.write(chunk);
-        pos += stream;
-        if (pos < file.length) {
-          setTimeout(writeChunk, 500);
+        if (stream > 0) {
+          res.writeHead(200, {'Content-Type': 'text/html'});
+          let pos = 0;
+          const writeChunk = function() {
+            const chunk = file.substring(
+              pos,
+              Math.min(pos + stream, file.length)
+            );
+            res.write(chunk);
+            pos += stream;
+            if (pos < file.length) {
+              setTimeout(writeChunk, 500);
+            } else {
+              res.end();
+            }
+          };
+          writeChunk();
         } else {
-          res.end();
+          res.send(file);
         }
-      };
-      writeChunk();
-    } else {
-      res.send(file);
-    }
-  }).catch(() => {
-    next();
-  });
-});
+      })
+      .catch(() => {
+        next();
+      });
+  }
+);
 
 appTestEndpoints(app);
 
@@ -973,8 +1054,9 @@ function escapeRegExp(string) {
 function elementExtractor(tagName, type) {
   type = escapeRegExp(type);
   return new RegExp(
-      `<${tagName}[\\s][^>]*['"]${type}['"][^>]*>([\\s\\S]+?)</${tagName}>`,
-      'gm');
+    `<${tagName}[\\s][^>]*['"]${type}['"][^>]*>([\\s\\S]+?)</${tagName}>`,
+    'gm'
+  );
 }
 
 // Data for example: http://localhost:8000/examples/bind/xhr.amp.html
@@ -1086,75 +1168,81 @@ app.get('/adzerk/*', (req, res) => {
     return;
   }
   const filePath =
-      pc.cwd() + '/extensions/amp-ad-network-adzerk-impl/0.1/data/' + match[1];
-  fs.readFileAsync(filePath).then(file => {
-    res.setHeader('Content-Type', 'application/json');
-    res.setHeader('AMP-Ad-Template-Extension', 'amp-mustache');
-    res.setHeader('AMP-Ad-Response-Type', 'template');
-    res.end(file);
-  }).error(() => {
-    res.status(404);
-    res.end('Not found: ' + filePath);
-  });
+    pc.cwd() + '/extensions/amp-ad-network-adzerk-impl/0.1/data/' + match[1];
+  fs.readFileAsync(filePath)
+    .then(file => {
+      res.setHeader('Content-Type', 'application/json');
+      res.setHeader('AMP-Ad-Template-Extension', 'amp-mustache');
+      res.setHeader('AMP-Ad-Response-Type', 'template');
+      res.end(file);
+    })
+    .error(() => {
+      res.status(404);
+      res.end('Not found: ' + filePath);
+    });
 });
 
 /*
  * Serve extension scripts and their source maps.
  */
-app.get(['/dist/rtv/*/v0/*.js', '/dist/rtv/*/v0/*.js.map'],
-    (req, res, next) => {
-      const mode = pc.env.SERVE_MODE;
-      const fileName = path.basename(req.path).replace('.max.', '.');
-      let filePath = 'https://cdn.ampproject.org/v0/' + fileName;
-      if (mode == 'cdn') {
-        // This will not be useful until extension-location.js change in prod
-        // Require url from cdn
-        request(filePath, (error, response) => {
-          if (error) {
-            res.status(404);
-            res.end();
-          } else {
-            res.send(response);
-          }
-        });
-        return;
-      }
-      const isJsMap = filePath.endsWith('.map');
-      if (isJsMap) {
-        filePath = filePath.replace(/\.js\.map$/, '\.js');
-      }
-      filePath = replaceUrls(mode, filePath);
-      req.url = filePath + (isJsMap ? '.map' : '');
-      next();
-    });
+app.get(
+  ['/dist/rtv/*/v0/*.js', '/dist/rtv/*/v0/*.js.map'],
+  (req, res, next) => {
+    const mode = pc.env.SERVE_MODE;
+    const fileName = path.basename(req.path).replace('.max.', '.');
+    let filePath = 'https://cdn.ampproject.org/v0/' + fileName;
+    if (mode == 'cdn') {
+      // This will not be useful until extension-location.js change in prod
+      // Require url from cdn
+      request(filePath, (error, response) => {
+        if (error) {
+          res.status(404);
+          res.end();
+        } else {
+          res.send(response);
+        }
+      });
+      return;
+    }
+    const isJsMap = filePath.endsWith('.map');
+    if (isJsMap) {
+      filePath = filePath.replace(/\.js\.map$/, '.js');
+    }
+    filePath = replaceUrls(mode, filePath);
+    req.url = filePath + (isJsMap ? '.map' : '');
+    next();
+  }
+);
 
 /**
  * Serve entry point script url
  */
-app.get(['/dist/sw.js', '/dist/sw-kill.js', '/dist/ww.js'],
-    (req, res, next) => {
-      // Special case for entry point script url. Use compiled for testing
-      const mode = pc.env.SERVE_MODE;
-      const fileName = path.basename(req.path);
-      if (mode == 'cdn') {
-        // This will not be useful until extension-location.js change in prod
-        // Require url from cdn
-        const filePath = 'https://cdn.ampproject.org/' + fileName;
-        request(filePath, function(error, response) {
-          if (error) {
-            res.status(404);
-            res.end();
-          } else {
-            res.send(response);
-          }
-        });
-        return;
-      }
-      if (mode == 'default') {
-        req.url = req.url.replace(/\.js$/, '.max.js');
-      }
-      next();
-    });
+app.get(
+  ['/dist/sw.js', '/dist/sw-kill.js', '/dist/ww.js'],
+  (req, res, next) => {
+    // Special case for entry point script url. Use compiled for testing
+    const mode = pc.env.SERVE_MODE;
+    const fileName = path.basename(req.path);
+    if (mode == 'cdn') {
+      // This will not be useful until extension-location.js change in prod
+      // Require url from cdn
+      const filePath = 'https://cdn.ampproject.org/' + fileName;
+      request(filePath, function(error, response) {
+        if (error) {
+          res.status(404);
+          res.end();
+        } else {
+          res.send(response);
+        }
+      });
+      return;
+    }
+    if (mode == 'default') {
+      req.url = req.url.replace(/\.js$/, '.max.js');
+    }
+    next();
+  }
+);
 
 app.get('/dist/iframe-transport-client-lib.js', (req, res, next) => {
   req.url = req.url.replace(/dist/, 'dist.3p/current');
@@ -1174,19 +1262,26 @@ app.get('/dist/amp-inabox-host.js', (req, res, next) => {
  */
 app.get('/dist/sw(.max)?.js', (req, res, next) => {
   const filePath = req.path;
-  fs.readFileAsync(pc.cwd() + filePath, 'utf8').then(file => {
-    let n = new Date();
-    // Round down to the nearest 5 minutes.
-    n -= ((n.getMinutes() % 5) * 1000 * 60)
-        + (n.getSeconds() * 1000) + n.getMilliseconds();
-    file = 'self.AMP_CONFIG = {v: "99' + n + '",' +
-        'cdnUrl: "http://localhost:8000/dist"};'
-        + file;
-    res.setHeader('Content-Type', 'application/javascript');
-    res.setHeader('Date', new Date().toUTCString());
-    res.setHeader('Cache-Control', 'no-cache;max-age=150');
-    res.end(file);
-  }).catch(next);
+  fs.readFileAsync(pc.cwd() + filePath, 'utf8')
+    .then(file => {
+      let n = new Date();
+      // Round down to the nearest 5 minutes.
+      n -=
+        (n.getMinutes() % 5) * 1000 * 60 +
+        n.getSeconds() * 1000 +
+        n.getMilliseconds();
+      file =
+        'self.AMP_CONFIG = {v: "99' +
+        n +
+        '",' +
+        'cdnUrl: "http://localhost:8000/dist"};' +
+        file;
+      res.setHeader('Content-Type', 'application/javascript');
+      res.setHeader('Date', new Date().toUTCString());
+      res.setHeader('Cache-Control', 'no-cache;max-age=150');
+      res.end(file);
+    })
+    .catch(next);
 });
 
 app.get('/dist/rtv/9[89]*/*.js', (req, res, next) => {
@@ -1198,10 +1293,12 @@ app.get('/dist/rtv/9[89]*/*.js', (req, res, next) => {
     // Cause a delay, to show the "stale-while-revalidate"
     if (req.path.includes('v0.js')) {
       const path = req.path.replace(/rtv\/\d+/, '');
-      return fs.readFileAsync(pc.cwd() + path, 'utf8')
-          .then(file => {
-            res.end(file);
-          }).catch(next);
+      return fs
+        .readFileAsync(pc.cwd() + path, 'utf8')
+        .then(file => {
+          res.end(file);
+        })
+        .catch(next);
     }
 
     res.end(`
@@ -1214,30 +1311,36 @@ app.get('/dist/rtv/9[89]*/*.js', (req, res, next) => {
 
 app.get(['/dist/cache-sw.html'], (req, res, next) => {
   const filePath = '/test/manual/cache-sw.html';
-  fs.readFileAsync(pc.cwd() + filePath, 'utf8').then(file => {
-    let n = new Date();
-    // Round down to the nearest 5 minutes.
-    n -= ((n.getMinutes() % 5) * 1000 * 60)
-        + (n.getSeconds() * 1000) + n.getMilliseconds();
-    const percent = parseFloat(req.query.canary) || 0.01;
-    let env = '99';
-    if (Math.random() < percent) {
-      env = '98';
-      n += 5 * 1000 * 60;
-    }
-    file = file.replace(/dist\/v0/g, `dist/rtv/${env}${n}/v0`);
-    file = file.replace(/CURRENT_RTV/, env + n);
+  fs.readFileAsync(pc.cwd() + filePath, 'utf8')
+    .then(file => {
+      let n = new Date();
+      // Round down to the nearest 5 minutes.
+      n -=
+        (n.getMinutes() % 5) * 1000 * 60 +
+        n.getSeconds() * 1000 +
+        n.getMilliseconds();
+      const percent = parseFloat(req.query.canary) || 0.01;
+      let env = '99';
+      if (Math.random() < percent) {
+        env = '98';
+        n += 5 * 1000 * 60;
+      }
+      file = file.replace(/dist\/v0/g, `dist/rtv/${env}${n}/v0`);
+      file = file.replace(/CURRENT_RTV/, env + n);
 
-    res.setHeader('Content-Type', 'text/html');
-    res.end(file);
-  }).catch(next);
+      res.setHeader('Content-Type', 'text/html');
+      res.end(file);
+    })
+    .catch(next);
 });
 
 app.get('/dist/diversions', (req, res) => {
   let n = new Date();
   // Round down to the nearest 5 minutes.
-  n -= ((n.getMinutes() % 5) * 1000 * 60)
-      + (n.getSeconds() * 1000) + n.getMilliseconds();
+  n -=
+    (n.getMinutes() % 5) * 1000 * 60 +
+    n.getSeconds() * 1000 +
+    n.getMilliseconds();
   n += 5 * 1000 * 60;
   res.setHeader('Content-Type', 'application/json');
   res.setHeader('Date', new Date().toUTCString());
@@ -1268,9 +1371,9 @@ app.use('/shadow/', (req, res) => {
   const {url} = req;
   const isProxyUrl = /^\/proxy\//.test(url);
 
-  const baseHref = isProxyUrl ?
-    'https://cdn.ampproject.org/' :
-    `${path.dirname(url)}/`;
+  const baseHref = isProxyUrl
+    ? 'https://cdn.ampproject.org/'
+    : `${path.dirname(url)}/`;
 
   const viewerHtml = renderShadowViewer({
     src: req.url.replace(/^\//, ''),
@@ -1294,18 +1397,22 @@ function addViewerIntegrationScript(ampJsVersion, file) {
     return file;
   }
   let viewerScript;
-  if (Number.isInteger(ampJsVersion)) { // eslint-disable-line amphtml-internal/no-es2015-number-props
+  // eslint-disable-next-line amphtml-internal/no-es2015-number-props
+  if (Number.isInteger(ampJsVersion)) {
     // Viewer integration script from gws, such as
     // https://cdn.ampproject.org/viewer/google/v7.js
     viewerScript =
-        '<script async src="https://cdn.ampproject.org/viewer/google/v' +
-        ampJsVersion + '.js"></script>';
+      '<script async src="https://cdn.ampproject.org/viewer/google/v' +
+      ampJsVersion +
+      '.js"></script>';
   } else {
     // Viewer integration script from runtime, such as
     // https://cdn.ampproject.org/v0/amp-viewer-integration-0.1.js
-    viewerScript = '<script async ' +
-        'src="https://cdn.ampproject.org/v0/amp-viewer-integration-' +
-        ampJsVersion + '.js" data-amp-report-test="viewer-integr.js"></script>';
+    viewerScript =
+      '<script async ' +
+      'src="https://cdn.ampproject.org/v0/amp-viewer-integration-' +
+      ampJsVersion +
+      '.js" data-amp-report-test="viewer-integr.js"></script>';
   }
   file = file.replace('        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>', viewerScript + '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>');
   return file;
@@ -1323,7 +1430,7 @@ function getUrlPrefix(req) {
  */
 function addQueryParam(url, param, value) {
   const paramValue =
-      encodeURIComponent(param) + '=' + encodeURIComponent(value);
+    encodeURIComponent(param) + '=' + encodeURIComponent(value);
   if (!url.includes('?')) {
     url += '?' + paramValue;
   } else {
@@ -1332,21 +1439,25 @@ function addQueryParam(url, param, value) {
   return url;
 }
 
-
 function generateInfo(filePath) {
   const mode = pc.env.SERVE_MODE;
   filePath = filePath.substr(0, filePath.length - 9) + '.html';
 
-  return '<h2>Please note that .min/.max is no longer supported</h2>' +
-      '<h3>Current serving mode is ' + mode + '</h3>' +
-      '<h3>Please go to <a href= ' + filePath +
-      '>Unversioned Link</a> to view the page<h3>' +
-      '<h3></h3>' +
-      '<h3><a href = /serve_mode=default>' +
-      'Change to DEFAULT mode (unminified JS)</a></h3>' +
-      '<h3><a href = /serve_mode=compiled>' +
-      'Change to COMPILED mode (minified JS)</a></h3>' +
-      '<h3><a href = /serve_mode=cdn>Change to CDN mode (prod JS)</a></h3>';
+  return (
+    '<h2>Please note that .min/.max is no longer supported</h2>' +
+    '<h3>Current serving mode is ' +
+    mode +
+    '</h3>' +
+    '<h3>Please go to <a href= ' +
+    filePath +
+    '>Unversioned Link</a> to view the page<h3>' +
+    '<h3></h3>' +
+    '<h3><a href = /serve_mode=default>' +
+    'Change to DEFAULT mode (unminified JS)</a></h3>' +
+    '<h3><a href = /serve_mode=compiled>' +
+    'Change to COMPILED mode (minified JS)</a></h3>' +
+    '<h3><a href = /serve_mode=cdn>Change to CDN mode (prod JS)</a></h3>'
+  );
 }
 
 module.exports = app;
diff --git a/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js b/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
index 16d935759358..9009b65e0b6f 100644
--- a/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
+++ b/build-system/babel-plugins/babel-plugin-amp-mode-transformer/index.js
@@ -15,10 +15,10 @@
  */
 
 /**
-* Changes the values of getMode().test, getMode().localDev to false
-* and getMode().localDev to true.
-* @param {Object} babelTypes
-*/
+ * Changes the values of getMode().test, getMode().localDev to false
+ * and getMode().localDev to true.
+ * @param {Object} babelTypes
+ */
 const {resolve, dirname} = require('path');
 module.exports = function({types: t}) {
   let getModeFound = false;
@@ -32,7 +32,9 @@ module.exports = function({types: t}) {
         specifiers.forEach(specifier => {
           if (specifier.imported.name === 'getMode') {
             const filepath = resolve(
-                dirname(state.file.opts.filename), source.value);
+              dirname(state.file.opts.filename),
+              source.value
+            );
             if (filepath.endsWith('/amphtml/src/mode')) {
               getModeFound = true;
             }
@@ -54,7 +56,7 @@ module.exports = function({types: t}) {
             path.replaceWith(t.booleanLiteral(true));
           }
         }
-  	  },
+      },
     },
   };
 };
diff --git a/build-system/babel-plugins/babel-plugin-is_dev-constant-transformer/index.js b/build-system/babel-plugins/babel-plugin-is_dev-constant-transformer/index.js
index c27d1c33feeb..3cad3ad8e414 100644
--- a/build-system/babel-plugins/babel-plugin-is_dev-constant-transformer/index.js
+++ b/build-system/babel-plugins/babel-plugin-is_dev-constant-transformer/index.js
@@ -15,18 +15,20 @@
  */
 
 /**
-  * Changes the values of IS_DEV to false and IS_MINIFIED to true.
-  * The above said variables are in src/mode.js file.
-  * @param {Object} babelTypes
-  */
+ * Changes the values of IS_DEV to false and IS_MINIFIED to true.
+ * The above said variables are in src/mode.js file.
+ * @param {Object} babelTypes
+ */
 module.exports = function({types: t}) {
   return {
     visitor: {
       VariableDeclarator(path) {
         const {node} = path;
         const {id, init} = node;
-        if (t.isIdentifier(id, {name: 'IS_DEV'})
-            && t.isBooleanLiteral(init, {value: true})) {
+        if (
+          t.isIdentifier(id, {name: 'IS_DEV'}) &&
+          t.isBooleanLiteral(init, {value: true})
+        ) {
           node.init = t.booleanLiteral(false);
         }
       },
diff --git a/build-system/babel-plugins/babel-plugin-is_minified-constant-transformer/index.js b/build-system/babel-plugins/babel-plugin-is_minified-constant-transformer/index.js
index 3d9f8daa5157..f57e1b497d36 100644
--- a/build-system/babel-plugins/babel-plugin-is_minified-constant-transformer/index.js
+++ b/build-system/babel-plugins/babel-plugin-is_minified-constant-transformer/index.js
@@ -15,23 +15,25 @@
  */
 
 /**
-  * Changes the values of IS_DEV to false and IS_MINIFIED to true.
-  * The above said variables are in src/mode.js file.
-  * @param {Object} babelTypes
-  */
+ * Changes the values of IS_DEV to false and IS_MINIFIED to true.
+ * The above said variables are in src/mode.js file.
+ * @param {Object} babelTypes
+ */
 module.exports = function(babelTypes) {
   const {types: t} = babelTypes;
   return {
     visitor: {
       VariableDeclarator(path) {
         const {id, init} = path.node;
-        if (t.isIdentifier(id, {name: 'IS_MINIFIED'})
-            && t.isBooleanLiteral(init, {value: false})) {
+        if (
+          t.isIdentifier(id, {name: 'IS_MINIFIED'}) &&
+          t.isBooleanLiteral(init, {value: false})
+        ) {
           path.replaceWith(
-              t.variableDeclarator(
-                  t.identifier('IS_MINIFIED'),
-                  t.booleanLiteral(true)
-              )
+            t.variableDeclarator(
+              t.identifier('IS_MINIFIED'),
+              t.booleanLiteral(true)
+            )
           );
         }
       },
diff --git a/build-system/babel-plugins/babel-plugin-transform-amp-asserts/index.js b/build-system/babel-plugins/babel-plugin-transform-amp-asserts/index.js
index 49d67155ad11..e7ca4a87cd4f 100644
--- a/build-system/babel-plugins/babel-plugin-transform-amp-asserts/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-amp-asserts/index.js
@@ -43,7 +43,6 @@ const removableDevAsserts = [
 
 const removableUserAsserts = ['fine'];
 
-
 module.exports = function(babel) {
   const {types: t} = babel;
   return {
@@ -52,8 +51,8 @@ module.exports = function(babel) {
         const {node} = path;
         const {callee} = node;
         const {parenthesized} = node.extra || {};
-        const isMemberAndCallExpression = t.isMemberExpression(callee)
-            && t.isCallExpression(callee.object);
+        const isMemberAndCallExpression =
+          t.isMemberExpression(callee) && t.isCallExpression(callee.object);
 
         if (!isMemberAndCallExpression) {
           return;
@@ -61,11 +60,13 @@ module.exports = function(babel) {
 
         const logCallee = callee.object.callee;
         const {property} = callee;
-        const isRemovableDevCall = t.isIdentifier(logCallee, {name: 'dev'}) &&
-            isRemovableMethod(t, property, removableDevAsserts);
+        const isRemovableDevCall =
+          t.isIdentifier(logCallee, {name: 'dev'}) &&
+          isRemovableMethod(t, property, removableDevAsserts);
 
-        const isRemovableUserCall = t.isIdentifier(logCallee, {name: 'user'}) &&
-            isRemovableMethod(t, property, removableUserAsserts);
+        const isRemovableUserCall =
+          t.isIdentifier(logCallee, {name: 'user'}) &&
+          isRemovableMethod(t, property, removableUserAsserts);
 
         if (!(isRemovableDevCall || isRemovableUserCall)) {
           return;
@@ -81,9 +82,9 @@ module.exports = function(babel) {
           if (parenthesized) {
             path.replaceWith(t.parenthesizedExpression(args));
             path.skip();
-          // If is not an assert type, we won't need to do type annotation.
-          // If it has no type that we can cast to, then we also won't need to
-          // do type annotation.
+            // If is not an assert type, we won't need to do type annotation.
+            // If it has no type that we can cast to, then we also won't need to
+            // do type annotation.
           } else if (!property.name.startsWith('assert') || !type) {
             path.replaceWith(args);
           } else {
diff --git a/build-system/babel-plugins/babel-plugin-transform-amp-extension-call/index.js b/build-system/babel-plugins/babel-plugin-transform-amp-extension-call/index.js
index 1a0a2ab907a0..6b300d6e1762 100644
--- a/build-system/babel-plugins/babel-plugin-transform-amp-extension-call/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-amp-extension-call/index.js
@@ -22,14 +22,17 @@ module.exports = function(babel) {
       CallExpression(path) {
         const {node} = path;
         const {callee} = node;
-        if (t.isIdentifier(callee.object, {name: 'AMP'}) &&
-            t.isIdentifier(callee.property, {name: 'extension'})) {
+        if (
+          t.isIdentifier(callee.object, {name: 'AMP'}) &&
+          t.isIdentifier(callee.property, {name: 'extension'})
+        ) {
           const func = node.arguments[node.arguments.length - 1];
 
           const IIFE = t.expressionStatement(
-              t.callExpression(func, [
-                t.memberExpression(t.identifier('self'), t.identifier('AMP')),
-              ]));
+            t.callExpression(func, [
+              t.memberExpression(t.identifier('self'), t.identifier('AMP')),
+            ])
+          );
           path.replaceWith(IIFE);
         }
       },
diff --git a/build-system/babel-plugins/babel-plugin-transform-html-template/index.js b/build-system/babel-plugins/babel-plugin-transform-html-template/index.js
index ea04b6750e47..6adde21d885b 100644
--- a/build-system/babel-plugins/babel-plugin-transform-html-template/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-html-template/index.js
@@ -26,8 +26,11 @@ const INSERTED_TEMPLATES = new Map();
  */
 function optimizeLiteralOutput(templateLiteral) {
   if (templateLiteral.quasis.length !== 1) {
-    console/* OK */.log('Improperly formatted `html` tagged template literal' +
-      ', more than one template element present.');
+    console /* OK */
+      .log(
+        'Improperly formatted `html` tagged template literal' +
+          ', more than one template element present.'
+      );
     return null;
   }
   return minify(templateLiteral.quasis[0].value.cooked, {
@@ -44,9 +47,11 @@ module.exports = function({types: t}) {
       TaggedTemplateExpression(path) {
         const {tag} = path.node;
 
-        if (t.isIdentifier(tag, {name: 'html'}) ||
-            (t.isCallExpression(tag) &&
-             t.isIdentifier(tag.callee, {name: 'htmlFor'}))) {
+        if (
+          t.isIdentifier(tag, {name: 'html'}) ||
+          (t.isCallExpression(tag) &&
+            t.isIdentifier(tag.callee, {name: 'htmlFor'}))
+        ) {
           // Replace a matching TemplateExpression by either inlining a
           // transpiled template or hoisting the template and referring
           // to its value.
@@ -54,13 +59,13 @@ module.exports = function({types: t}) {
           const template = optimizeLiteralOutput(path.node.quasi);
 
           if (template !== null) {
-            const templateArrayExpression = t.arrayExpression(
-                [t.stringLiteral(template)]
-            );
+            const templateArrayExpression = t.arrayExpression([
+              t.stringLiteral(template),
+            ]);
 
             if (t.isProgram(path.scope.block)) {
               path.replaceWith(
-                  t.callExpression(tag, [templateArrayExpression])
+                t.callExpression(tag, [templateArrayExpression])
               );
             } else {
               // Since the template is inline, and the block scope
@@ -73,7 +78,7 @@ module.exports = function({types: t}) {
               } else {
                 // Template not hoisted. Hoist it.
                 hoistedIdentifier = path.scope.generateUidIdentifier(
-                    'template'
+                  'template'
                 );
                 const program = path.findParent(path => path.isProgram());
 
diff --git a/build-system/babel-plugins/babel-plugin-transform-version-call/index.js b/build-system/babel-plugins/babel-plugin-transform-version-call/index.js
index ca198d104c10..efe698bd05a0 100644
--- a/build-system/babel-plugins/babel-plugin-transform-version-call/index.js
+++ b/build-system/babel-plugins/babel-plugin-transform-version-call/index.js
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-const {VERSION} = require('../../internal-version') ;
+const {VERSION} = require('../../internal-version');
 
 module.exports = function(babel) {
   const {types: t} = babel;
diff --git a/build-system/build.conf.js b/build-system/build.conf.js
index ad06ec3f28ec..f1e0ebac0f2c 100644
--- a/build-system/build.conf.js
+++ b/build-system/build.conf.js
@@ -15,40 +15,37 @@
  */
 
 const defaultPlugins = [
+  require.resolve('./babel-plugins/babel-plugin-transform-amp-asserts'),
+  require.resolve('./babel-plugins/babel-plugin-transform-html-template'),
   require.resolve(
-      './babel-plugins/babel-plugin-transform-amp-asserts'),
+    './babel-plugins/babel-plugin-transform-parenthesize-expression'
+  ),
   require.resolve(
-      './babel-plugins/babel-plugin-transform-html-template'),
-  require.resolve(
-      './babel-plugins/babel-plugin-transform-parenthesize-expression'),
-  require.resolve(
-      './babel-plugins/babel-plugin-is_minified-constant-transformer'),
-  require.resolve(
-      './babel-plugins/babel-plugin-transform-amp-extension-call'),
-  require.resolve(
-      './babel-plugins/babel-plugin-transform-version-call'),
+    './babel-plugins/babel-plugin-is_minified-constant-transformer'
+  ),
+  require.resolve('./babel-plugins/babel-plugin-transform-amp-extension-call'),
+  require.resolve('./babel-plugins/babel-plugin-transform-version-call'),
 ];
 
 module.exports = {
-  plugins: ({
-    isEsmBuild,
-    isCommonJsModule,
-    isForTesting,
-  }) => {
+  plugins: ({isEsmBuild, isCommonJsModule, isForTesting}) => {
     let pluginsToApply = defaultPlugins;
     if (isEsmBuild) {
       pluginsToApply = pluginsToApply.concat([
-        [require.resolve('babel-plugin-filter-imports'), {
-          'imports': {
-            './polyfills/fetch': ['installFetch'],
-            './polyfills/domtokenlist-toggle': ['installDOMTokenListToggle'],
-            './polyfills/document-contains': ['installDocContains'],
-            './polyfills/math-sign': ['installMathSign'],
-            './polyfills/object-assign': ['installObjectAssign'],
-            './polyfills/object-values': ['installObjectValues'],
-            './polyfills/promise': ['installPromise'],
+        [
+          require.resolve('babel-plugin-filter-imports'),
+          {
+            'imports': {
+              './polyfills/fetch': ['installFetch'],
+              './polyfills/domtokenlist-toggle': ['installDOMTokenListToggle'],
+              './polyfills/document-contains': ['installDocContains'],
+              './polyfills/math-sign': ['installMathSign'],
+              './polyfills/object-assign': ['installObjectAssign'],
+              './polyfills/object-values': ['installObjectValues'],
+              './polyfills/promise': ['installPromise'],
+            },
           },
-        }],
+        ],
       ]);
     }
     if (isCommonJsModule) {
@@ -59,11 +56,9 @@ module.exports = {
     if (!isForTesting) {
       pluginsToApply = pluginsToApply.concat([
         require.resolve(
-            './babel-plugins/babel-plugin-is_dev-constant-transformer'
-        ),
-        require.resolve(
-            './babel-plugins/babel-plugin-amp-mode-transformer'
+          './babel-plugins/babel-plugin-is_dev-constant-transformer'
         ),
+        require.resolve('./babel-plugins/babel-plugin-amp-mode-transformer'),
       ]);
     }
     return pluginsToApply;
diff --git a/build-system/check-package-manager.js b/build-system/check-package-manager.js
index c334396f1a29..e011a5335d05 100644
--- a/build-system/check-package-manager.js
+++ b/build-system/check-package-manager.js
@@ -25,9 +25,11 @@ const fs = require('fs');
 const https = require('https');
 const {getStdout} = require('./exec');
 
-const setupInstructionsUrl = 'https://github.com/ampproject/amphtml/blob/master/contributing/getting-started-quick.md#one-time-setup';
+const setupInstructionsUrl =
+  'https://github.com/ampproject/amphtml/blob/master/contributing/getting-started-quick.md#one-time-setup';
 const nodeDistributionsUrl = 'https://nodejs.org/dist/index.json';
-const gulpHelpUrl = 'https://medium.com/gulpjs/gulp-sips-command-line-interface-e53411d4467';
+const gulpHelpUrl =
+  'https://medium.com/gulpjs/gulp-sips-command-line-interface-e53411d4467';
 
 const yarnExecutable = 'npx yarn';
 const gulpExecutable = 'npx gulp';
@@ -35,10 +37,18 @@ const gulpExecutable = 'npx gulp';
 const updatesNeeded = [];
 
 // Color formatting libraries may not be available when this script is run.
-function red(text) {return '\x1b[31m' + text + '\x1b[0m';}
-function cyan(text) {return '\x1b[36m' + text + '\x1b[0m';}
-function green(text) {return '\x1b[32m' + text + '\x1b[0m';}
-function yellow(text) {return '\x1b[33m' + text + '\x1b[0m';}
+function red(text) {
+  return '\x1b[31m' + text + '\x1b[0m';
+}
+function cyan(text) {
+  return '\x1b[36m' + text + '\x1b[0m';
+}
+function green(text) {
+  return '\x1b[32m' + text + '\x1b[0m';
+}
+function yellow(text) {
+  return '\x1b[33m' + text + '\x1b[0m';
+}
 
 /**
  * @fileoverview Perform checks on the AMP toolchain.
@@ -47,23 +57,33 @@ function yellow(text) {return '\x1b[33m' + text + '\x1b[0m';}
 // If npm is being run, print a message and cause 'npm install' to fail.
 function ensureYarn() {
   if (process.env.npm_execpath.indexOf('yarn') === -1) {
-    console.log(red(
-        '*** The AMP project uses yarn for package management ***'), '\n');
+    console.log(
+      red('*** The AMP project uses yarn for package management ***'),
+      '\n'
+    );
     console.log(yellow('To install all packages:'));
     console.log(cyan('$'), 'yarn', '\n');
     console.log(
-        yellow('To install a new (runtime) package to "dependencies":'));
+      yellow('To install a new (runtime) package to "dependencies":')
+    );
     console.log(cyan('$'), 'yarn add --exact [package_name@version]', '\n');
     console.log(
-        yellow('To install a new (toolset) package to "devDependencies":'));
-    console.log(cyan('$'),
-        'yarn add --dev --exact [package_name@version]', '\n');
+      yellow('To install a new (toolset) package to "devDependencies":')
+    );
+    console.log(
+      cyan('$'),
+      'yarn add --dev --exact [package_name@version]',
+      '\n'
+    );
     console.log(yellow('To upgrade a package:'));
     console.log(cyan('$'), 'yarn upgrade --exact [package_name@version]', '\n');
     console.log(yellow('To remove a package:'));
     console.log(cyan('$'), 'yarn remove [package_name]', '\n');
-    console.log(yellow('For detailed instructions, see'),
-        cyan(setupInstructionsUrl), '\n');
+    console.log(
+      yellow('For detailed instructions, see'),
+      cyan(setupInstructionsUrl),
+      '\n'
+    );
     process.exit(1);
   }
 }
@@ -72,43 +92,64 @@ function ensureYarn() {
 function checkNodeVersion() {
   const nodeVersion = getStdout('node --version').trim();
   return new Promise(resolve => {
-    https.get(nodeDistributionsUrl, res => {
-      res.setEncoding('utf8');
-      let distributions = '';
-      res.on('data', data => {
-        distributions += data;
-      });
-      res.on('end', () => {
-        const distributionsJson = JSON.parse(distributions);
-        const latestLtsVersion = getNodeLatestLtsVersion(distributionsJson);
-        if (latestLtsVersion === '') {
-          console.log(yellow('WARNING: Something went wrong. ' +
-              'Could not determine the latest LTS version of node.'));
-        } else if (nodeVersion !== latestLtsVersion) {
-          console.log(yellow('WARNING: Detected node version'),
+    https
+      .get(nodeDistributionsUrl, res => {
+        res.setEncoding('utf8');
+        let distributions = '';
+        res.on('data', data => {
+          distributions += data;
+        });
+        res.on('end', () => {
+          const distributionsJson = JSON.parse(distributions);
+          const latestLtsVersion = getNodeLatestLtsVersion(distributionsJson);
+          if (latestLtsVersion === '') {
+            console.log(
+              yellow(
+                'WARNING: Something went wrong. ' +
+                  'Could not determine the latest LTS version of node.'
+              )
+            );
+          } else if (nodeVersion !== latestLtsVersion) {
+            console.log(
+              yellow('WARNING: Detected node version'),
               cyan(nodeVersion) +
-              yellow('. Recommended (latest LTS) version is'),
-              cyan(latestLtsVersion) + yellow('.'));
-          console.log(yellow('⤷ To fix this, run'),
-              cyan('"nvm install --lts"'), yellow('or see'),
+                yellow('. Recommended (latest LTS) version is'),
+              cyan(latestLtsVersion) + yellow('.')
+            );
+            console.log(
+              yellow('⤷ To fix this, run'),
+              cyan('"nvm install --lts"'),
+              yellow('or see'),
               cyan('https://nodejs.org/en/download/package-manager'),
-              yellow('for instructions.'));
-          updatesNeeded.push('node');
-        } else {
-          console.log(green('Detected'), cyan('node'), green('version'),
-              cyan(nodeVersion + ' (latest LTS)') +
-              green('.'));
-        }
+              yellow('for instructions.')
+            );
+            updatesNeeded.push('node');
+          } else {
+            console.log(
+              green('Detected'),
+              cyan('node'),
+              green('version'),
+              cyan(nodeVersion + ' (latest LTS)') + green('.')
+            );
+          }
+          resolve();
+        });
+      })
+      .on('error', () => {
+        console.log(
+          yellow(
+            'WARNING: Something went wrong. ' +
+              'Could not download node version info from ' +
+              cyan(nodeDistributionsUrl) +
+              yellow('.')
+          )
+        );
+        console.log(
+          yellow('⤷ Detected node version'),
+          cyan(nodeVersion) + yellow('.')
+        );
         resolve();
       });
-    }).on('error', () => {
-      console.log(yellow('WARNING: Something went wrong. ' +
-          'Could not download node version info from ' +
-          cyan(nodeDistributionsUrl) + yellow('.')));
-      console.log(yellow('⤷ Detected node version'), cyan(nodeVersion) +
-          yellow('.'));
-      resolve();
-    });
   });
 }
 
@@ -116,9 +157,11 @@ function getNodeLatestLtsVersion(distributionsJson) {
   if (distributionsJson) {
     // Versions are in descending order, so the first match is the latest lts.
     return distributionsJson.find(function(distribution) {
-      return distribution.hasOwnProperty('version') &&
-          distribution.hasOwnProperty('lts') &&
-          distribution.lts;
+      return (
+        distribution.hasOwnProperty('version') &&
+        distribution.hasOwnProperty('lts') &&
+        distribution.lts
+      );
     }).version;
   } else {
     return '';
@@ -132,28 +175,42 @@ function checkYarnVersion() {
   const yarnInfoJson = JSON.parse(yarnInfo.split('\n')[0]); // First line
   const stableVersion = getYarnStableVersion(yarnInfoJson);
   if (stableVersion === '') {
-    console.log(yellow('WARNING: Something went wrong. ' +
-        'Could not determine the stable version of yarn.'));
+    console.log(
+      yellow(
+        'WARNING: Something went wrong. ' +
+          'Could not determine the stable version of yarn.'
+      )
+    );
   } else if (yarnVersion !== stableVersion) {
-    console.log(yellow('WARNING: Detected yarn version'),
-        cyan(yarnVersion) + yellow('. Recommended (stable) version is'),
-        cyan(stableVersion) + yellow('.'));
-    console.log(yellow('⤷ To fix this, run'),
-        cyan('"curl -o- -L https://yarnpkg.com/install.sh | bash"'),
-        yellow('or see'), cyan('https://yarnpkg.com/docs/install'),
-        yellow('for instructions.'));
+    console.log(
+      yellow('WARNING: Detected yarn version'),
+      cyan(yarnVersion) + yellow('. Recommended (stable) version is'),
+      cyan(stableVersion) + yellow('.')
+    );
+    console.log(
+      yellow('⤷ To fix this, run'),
+      cyan('"curl -o- -L https://yarnpkg.com/install.sh | bash"'),
+      yellow('or see'),
+      cyan('https://yarnpkg.com/docs/install'),
+      yellow('for instructions.')
+    );
     updatesNeeded.push('yarn');
   } else {
-    console.log(green('Detected'), cyan('yarn'), green('version'),
-        cyan(yarnVersion + ' (stable)') +
-        green('. Installing packages...'));
+    console.log(
+      green('Detected'),
+      cyan('yarn'),
+      green('version'),
+      cyan(yarnVersion + ' (stable)') + green('. Installing packages...')
+    );
   }
 }
 
 function getYarnStableVersion(infoJson) {
-  if (infoJson &&
-      infoJson.hasOwnProperty('data') &&
-      infoJson.data.hasOwnProperty('version')) {
+  if (
+    infoJson &&
+    infoJson.hasOwnProperty('data') &&
+    infoJson.data.hasOwnProperty('version')
+  ) {
     return infoJson.data.version;
   } else {
     return '';
@@ -166,30 +223,51 @@ function checkGlobalGulp() {
   const globalGulp = globalPackages.match(/"gulp@.*" has binaries/);
   const globalGulpCli = globalPackages.match(/"gulp-cli@.*" has binaries/);
   if (globalGulp) {
-    console.log(yellow('WARNING: Detected a global install of'),
-        cyan('gulp') + yellow('. It is recommended that you use'),
-        cyan('gulp-cli'), yellow('instead.'));
-    console.log(yellow('⤷ To fix this, run'),
-        cyan('"yarn global remove gulp"'), yellow('followed by'),
-        cyan('"yarn global add gulp-cli"') + yellow('.'));
-    console.log(yellow('⤷ See'), cyan(gulpHelpUrl),
-        yellow('for more information.'));
+    console.log(
+      yellow('WARNING: Detected a global install of'),
+      cyan('gulp') + yellow('. It is recommended that you use'),
+      cyan('gulp-cli'),
+      yellow('instead.')
+    );
+    console.log(
+      yellow('⤷ To fix this, run'),
+      cyan('"yarn global remove gulp"'),
+      yellow('followed by'),
+      cyan('"yarn global add gulp-cli"') + yellow('.')
+    );
+    console.log(
+      yellow('⤷ See'),
+      cyan(gulpHelpUrl),
+      yellow('for more information.')
+    );
     updatesNeeded.push('gulp');
   } else if (!globalGulpCli) {
-    console.log(yellow('WARNING: Could not find'),
-        cyan('gulp-cli') + yellow('.'));
-    console.log(yellow('⤷ To install it, run'),
-        cyan('"yarn global add gulp-cli"') + yellow('.'));
+    console.log(
+      yellow('WARNING: Could not find'),
+      cyan('gulp-cli') + yellow('.')
+    );
+    console.log(
+      yellow('⤷ To install it, run'),
+      cyan('"yarn global add gulp-cli"') + yellow('.')
+    );
   } else if (!firstInstall) {
     const gulpVersions = getStdout(gulpExecutable + ' --version').trim();
     const gulpVersion = gulpVersions.match(/Local version[:]? (.*?)$/);
     if (gulpVersion && gulpVersion.length == 2) {
-      console.log(green('Detected'), cyan('gulp'), green('version'),
-          cyan(gulpVersion[1]) + green('.'));
+      console.log(
+        green('Detected'),
+        cyan('gulp'),
+        green('version'),
+        cyan(gulpVersion[1]) + green('.')
+      );
     } else {
-      console.log(yellow('WARNING: ' +
-          'Could not determine the local version of gulp. ' +
-          '(This is normal during install / upgrade.)'));
+      console.log(
+        yellow(
+          'WARNING: ' +
+            'Could not determine the local version of gulp. ' +
+            '(This is normal during install / upgrade.)'
+        )
+      );
     }
   }
 }
@@ -204,14 +282,24 @@ function main() {
     checkGlobalGulp();
     checkYarnVersion();
     if (!process.env.TRAVIS && updatesNeeded.length > 0) {
-      console.log(yellow('\nWARNING: Detected missing updates for'),
-          cyan(updatesNeeded.join(', ')));
-      console.log(yellow('⤷ Continuing install in'), cyan('5'),
-          yellow('seconds...'));
-      console.log(yellow('⤷ Press'), cyan('Ctrl + C'),
-          yellow('to abort and fix...'));
+      console.log(
+        yellow('\nWARNING: Detected missing updates for'),
+        cyan(updatesNeeded.join(', '))
+      );
+      console.log(
+        yellow('⤷ Continuing install in'),
+        cyan('5'),
+        yellow('seconds...')
+      );
+      console.log(
+        yellow('⤷ Press'),
+        cyan('Ctrl + C'),
+        yellow('to abort and fix...')
+      );
       let resolver;
-      const deferred = new Promise(resolverIn => {resolver = resolverIn;});
+      const deferred = new Promise(resolverIn => {
+        resolver = resolverIn;
+      });
       setTimeout(() => {
         console.log(yellow('\nAttempting to install packages...'));
         resolver();
diff --git a/build-system/compile-wrappers.js b/build-system/compile-wrappers.js
index c146ddf060ff..2a2c5790012c 100644
--- a/build-system/compile-wrappers.js
+++ b/build-system/compile-wrappers.js
@@ -18,17 +18,22 @@ const {VERSION} = require('./internal-version');
 
 // If there is a sync JS error during initial load,
 // at least try to unhide the body.
-exports.mainBinary = 'var global=self;self.AMP=self.AMP||[];' +
-    'try{(function(_){\n<%= contents %>})(AMP._=AMP._||{})}catch(e){' +
-    'setTimeout(function(){' +
-    'var s=document.body.style;' +
-    's.opacity=1;' +
-    's.visibility="visible";' +
-    's.animation="none";' +
-    's.WebkitAnimation="none;"},1000);throw e};';
+exports.mainBinary =
+  'var global=self;self.AMP=self.AMP||[];' +
+  'try{(function(_){\n<%= contents %>})(AMP._=AMP._||{})}catch(e){' +
+  'setTimeout(function(){' +
+  'var s=document.body.style;' +
+  's.opacity=1;' +
+  's.visibility="visible";' +
+  's.animation="none";' +
+  's.WebkitAnimation="none;"},1000);throw e};';
 
-exports.extension = function(name, loadPriority, intermediateDeps,
-  opt_splitMarker) {
+exports.extension = function(
+  name,
+  loadPriority,
+  intermediateDeps,
+  opt_splitMarker
+) {
   opt_splitMarker = opt_splitMarker || '';
   let deps = '';
   if (intermediateDeps) {
@@ -50,9 +55,11 @@ exports.extension = function(name, loadPriority, intermediateDeps,
     }
     priority = 'p:"high",';
   }
-  return `(self.AMP=self.AMP||[]).push({n:"${name}",${priority}${deps}` +
-      `v:"${VERSION}",f:(function(AMP,_){${opt_splitMarker}\n` +
-      '<%= contents %>\n})});';
+  return (
+    `(self.AMP=self.AMP||[]).push({n:"${name}",${priority}${deps}` +
+    `v:"${VERSION}",f:(function(AMP,_){${opt_splitMarker}\n` +
+    '<%= contents %>\n})});'
+  );
 };
 
 exports.none = '<%= contents %>';
diff --git a/build-system/compile/closure-compile.js b/build-system/compile/closure-compile.js
index 369769f1a167..dd7370c96349 100644
--- a/build-system/compile/closure-compile.js
+++ b/build-system/compile/closure-compile.js
@@ -39,9 +39,10 @@ function formatClosureCompilerError(message) {
 
 exports.handleCompilerError = function(outputFilename) {
   handleError(
-      colors.red('Compilation failed for ') +
+    colors.red('Compilation failed for ') +
       colors.cyan(outputFilename) +
-      colors.red(':'));
+      colors.red(':')
+  );
 };
 
 exports.handleTypeCheckError = function() {
@@ -57,8 +58,9 @@ exports.handleSinglePassCompilerError = function() {
  * @param {string} message
  */
 function handleError(message) {
-  console./*OK*/error(
-      `${message}\n` + formatClosureCompilerError(compilerErrors));
+  console./*OK*/ error(
+    `${message}\n` + formatClosureCompilerError(compilerErrors)
+  );
 }
 
 /**
@@ -71,15 +73,16 @@ exports.gulpClosureCompile = function(compilerOptions) {
   };
   const pluginOptions = {
     platform: ['java'], // Override the binary used by closure compiler
-    logger: errors => compilerErrors = errors, // Capture compiler errors
+    logger: errors => (compilerErrors = errors), // Capture compiler errors
   };
 
   if (compilerOptions.includes('SINGLE_FILE_COMPILATION=true')) {
     // For single-pass compilation, use the default compiler.jar
     // TODO(rsimha): Use the native compiler instead of compiler.jar once a fix
     // is checked in for https://github.com/google/closure-compiler/issues/3041
-    closureCompiler.compiler.JAR_PATH =
-          require.resolve('../../third_party/closure-compiler/compiler.jar');
+    closureCompiler.compiler.JAR_PATH = require.resolve(
+      '../../third_party/closure-compiler/compiler.jar'
+    );
   } else {
     // On Mac OS and Linux, speed up compilation using nailgun.
     // See https://github.com/facebook/nailgun.
@@ -94,8 +97,9 @@ exports.gulpClosureCompile = function(compilerOptions) {
       initOptions.extraArguments = null; // Already part of nailgun-server
     } else {
       // For other platforms, use AMP's custom runner.jar
-      closureCompiler.compiler.JAR_PATH =
-            require.resolve('../runner/dist/runner.jar');
+      closureCompiler.compiler.JAR_PATH = require.resolve(
+        '../runner/dist/runner.jar'
+      );
     }
   }
 
diff --git a/build-system/compile/compile.js b/build-system/compile/compile.js
index 99549239780d..30c6ff3c297b 100644
--- a/build-system/compile/compile.js
+++ b/build-system/compile/compile.js
@@ -23,11 +23,15 @@ const nop = require('gulp-nop');
 const rename = require('gulp-rename');
 const rimraf = require('rimraf');
 const sourcemaps = require('gulp-sourcemaps');
-const {gulpClosureCompile, handleCompilerError, handleTypeCheckError} = require('./closure-compile');
+const {
+  gulpClosureCompile,
+  handleCompilerError,
+  handleTypeCheckError,
+} = require('./closure-compile');
 const {isTravisBuild} = require('../travis');
 const {shortenLicense, shouldShortenLicense} = require('./shorten-license');
 const {singlePassCompile} = require('./single-pass');
-const {VERSION: internalRuntimeVersion} = require('../internal-version') ;
+const {VERSION: internalRuntimeVersion} = require('../internal-version');
 
 const isProdBuild = !!argv.type;
 const queue = [];
@@ -37,23 +41,29 @@ const MAX_PARALLEL_CLOSURE_INVOCATIONS = argv.single_pass ? 1 : 4;
 // Compiles AMP with the closure compiler. This is intended only for
 // production use. During development we intend to continue using
 // babel, as it has much faster incremental compilation.
-exports.closureCompile = async function(entryModuleFilename, outputDir,
-  outputFilename, options) {
+exports.closureCompile = async function(
+  entryModuleFilename,
+  outputDir,
+  outputFilename,
+  options
+) {
   // Rate limit closure compilation to MAX_PARALLEL_CLOSURE_INVOCATIONS
   // concurrent processes.
   return new Promise(function(resolve, reject) {
     function start() {
       inProgress++;
-      compile(entryModuleFilename, outputDir, outputFilename, options)
-          .then(function() {
-            if (isTravisBuild()) {
-              // Print a progress dot after each task to avoid Travis timeouts.
-              process.stdout.write('.');
-            }
-            inProgress--;
-            next();
-            resolve();
-          }, reason => reject(reason));
+      compile(entryModuleFilename, outputDir, outputFilename, options).then(
+        function() {
+          if (isTravisBuild()) {
+            // Print a progress dot after each task to avoid Travis timeouts.
+            process.stdout.write('.');
+          }
+          inProgress--;
+          next();
+          resolve();
+        },
+        reason => reject(reason)
+      );
     }
     function next() {
       if (!queue.length) {
@@ -107,9 +117,7 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
     'third_party/moment/moment.extern.js',
     'third_party/react-externs/externs.js',
   ];
-  const define = [
-    `VERSION=${internalRuntimeVersion}`,
-  ];
+  const define = [`VERSION=${internalRuntimeVersion}`];
   if (argv.pseudo_names) {
     define.push('PSEUDO_NAMES=true');
   }
@@ -129,7 +137,8 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
       define.push('ESM_BUILD=true');
     }
 
-    console/*OK*/.assert(typeof entryModuleFilenames == 'string');
+    console /*OK*/
+      .assert(typeof entryModuleFilenames == 'string');
     return singlePassCompile(entryModuleFilenames, compilationOptions);
   }
 
@@ -151,8 +160,10 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
     let sourceMapBase = 'http://localhost:8000/';
     if (isProdBuild) {
       // Point sourcemap to fetch files from correct GitHub tag.
-      sourceMapBase = 'https://raw.githubusercontent.com/ampproject/amphtml/' +
-            internalRuntimeVersion + '/';
+      sourceMapBase =
+        'https://raw.githubusercontent.com/ampproject/amphtml/' +
+        internalRuntimeVersion +
+        '/';
     }
     const srcs = [
       '3p/3p.js',
@@ -230,9 +241,9 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
       'node_modules/web-activities/activity-ports.js',
       'node_modules/@ampproject/animations/dist/animations.mjs',
       'node_modules/@ampproject/worker-dom/dist/' +
-          'unminified.index.safe.mjs.patched.js',
+        'unminified.index.safe.mjs.patched.js',
       'node_modules/document-register-element/build/' +
-          'document-register-element.patched.js',
+        'document-register-element.patched.js',
       // 'node_modules/core-js/modules/**.js',
       // Not sure what these files are, but they seem to duplicate code
       // one level below and confuse the compiler.
@@ -252,9 +263,7 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
       srcs.push.apply(srcs, options.extraGlobs);
     }
     if (options.include3pDirectories) {
-      srcs.push(
-          '3p/**/*.js',
-          'ads/**/*.js');
+      srcs.push('3p/**/*.js', 'ads/**/*.js');
     }
     // Many files include the polyfills, but we only want to deliver them
     // once. Since all files automatically wait for the main binary to load
@@ -266,42 +275,47 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
         return p !== 'custom-elements.js';
       });
       srcs.push(
-          '!build/fake-module/src/polyfills.js',
-          '!build/fake-module/src/polyfills/**/*.js',
-          '!build/fake-polyfills/src/polyfills.js',
-          'src/polyfills/custom-elements.js',
-          'build/fake-polyfills/**/*.js');
+        '!build/fake-module/src/polyfills.js',
+        '!build/fake-module/src/polyfills/**/*.js',
+        '!build/fake-polyfills/src/polyfills.js',
+        'src/polyfills/custom-elements.js',
+        'build/fake-polyfills/**/*.js'
+      );
       polyfillsShadowList.forEach(polyfillFile => {
         srcs.push(`!src/polyfills/${polyfillFile}`);
-        fs.writeFileSync('build/fake-polyfills/src/polyfills/' + polyfillFile,
-            'export function install() {}');
+        fs.writeFileSync(
+          'build/fake-polyfills/src/polyfills/' + polyfillFile,
+          'export function install() {}'
+        );
       });
     } else if (options.includePolyfills) {
       srcs.push(
-          '!build/fake-module/src/polyfills.js',
-          '!build/fake-module/src/polyfills/**/*.js',
-          '!build/fake-polyfills/**/*.js',
+        '!build/fake-module/src/polyfills.js',
+        '!build/fake-module/src/polyfills/**/*.js',
+        '!build/fake-polyfills/**/*.js'
       );
     } else {
-      srcs.push('!src/polyfills.js', '!build/fake-polyfills/**/*.js',);
+      srcs.push('!src/polyfills.js', '!build/fake-polyfills/**/*.js');
       unneededFiles.push('build/fake-module/src/polyfills.js');
     }
     // Negative globstars must come at the end.
     srcs.push(
-        // Don't include rollup configs
-        '!**/rollup.config.js',
-        // Don't include tests.
-        '!**_test.js',
-        '!**/test-*.js',
-        '!**/test-e2e/*.js',
-        // Don't include externs.
-        '!**/*.extern.js',
+      // Don't include rollup configs
+      '!**/rollup.config.js',
+      // Don't include tests.
+      '!**_test.js',
+      '!**/test-*.js',
+      '!**/test-e2e/*.js',
+      // Don't include externs.
+      '!**/*.extern.js'
     );
     unneededFiles.forEach(function(fake) {
       if (!fs.existsSync(fake)) {
-        fs.writeFileSync(fake,
-            '// Not needed in closure compiler\n' +
-            'export function deadCode() {}');
+        fs.writeFileSync(
+          fake,
+          '// Not needed in closure compiler\n' +
+            'export function deadCode() {}'
+        );
       }
     });
 
@@ -358,13 +372,14 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
       // it won't do strict type checking if its whitespace only.
       compilerOptions.define.push('TYPECHECK_ONLY=true');
       compilerOptions.jscomp_error.push(
-          'checkTypes',
-          'accessControls',
-          'const',
-          'constantProperty',
-          'globalThis');
+        'checkTypes',
+        'accessControls',
+        'const',
+        'constantProperty',
+        'globalThis'
+      );
       compilerOptions.conformance_configs =
-          'build-system/conformance-config.textproto';
+        'build-system/conformance-config.textproto';
     }
 
     if (compilerOptions.define.length == 0) {
@@ -388,27 +403,29 @@ function compile(entryModuleFilenames, outputDir, outputFilename, options) {
     });
 
     if (options.typeCheckOnly) {
-      return gulp.src(srcs, {base: '.'})
-          .pipe(gulpClosureCompile(compilerOptionsArray))
-          .on('error', err => {
-            handleTypeCheckError();
-            reject(err);
-          })
-          .pipe(nop())
-          .on('end', resolve);
+      return gulp
+        .src(srcs, {base: '.'})
+        .pipe(gulpClosureCompile(compilerOptionsArray))
+        .on('error', err => {
+          handleTypeCheckError();
+          reject(err);
+        })
+        .pipe(nop())
+        .on('end', resolve);
     } else {
-      return gulp.src(srcs, {base: '.'})
-          .pipe(gulpIf(shouldShortenLicense, shortenLicense()))
-          .pipe(sourcemaps.init({loadMaps: true}))
-          .pipe(gulpClosureCompile(compilerOptionsArray))
-          .on('error', err => {
-            handleCompilerError(outputFilename);
-            reject(err);
-          })
-          .pipe(rename(outputFilename))
-          .pipe(sourcemaps.write('.'))
-          .pipe(gulp.dest(outputDir))
-          .on('end', resolve);
+      return gulp
+        .src(srcs, {base: '.'})
+        .pipe(gulpIf(shouldShortenLicense, shortenLicense()))
+        .pipe(sourcemaps.init({loadMaps: true}))
+        .pipe(gulpClosureCompile(compilerOptionsArray))
+        .on('error', err => {
+          handleCompilerError(outputFilename);
+          reject(err);
+        })
+        .pipe(rename(outputFilename))
+        .pipe(sourcemaps.write('.'))
+        .pipe(gulp.dest(outputDir))
+        .on('end', resolve);
     }
   });
 }
diff --git a/build-system/compile/shorten-license.js b/build-system/compile/shorten-license.js
index 643c9b3a1b78..2419aa72d308 100644
--- a/build-system/compile/shorten-license.js
+++ b/build-system/compile/shorten-license.js
@@ -62,15 +62,12 @@ const BSD_SHORT = [
 
 /* eslint-enable */
 
-const LICENSES = [
-  [MIT_FULL, MIT_SHORT],
-  [POLYMER_BSD_FULL, BSD_SHORT],
-];
+const LICENSES = [[MIT_FULL, MIT_SHORT], [POLYMER_BSD_FULL, BSD_SHORT]];
 
 const PATHS = [
   'third_party/webcomponentsjs/ShadowCSS.js',
   'node_modules/document-register-element/build/' +
-      'document-register-element.patched.js',
+    'document-register-element.patched.js',
 ];
 
 /**
diff --git a/build-system/compile/single-pass.js b/build-system/compile/single-pass.js
index 7da736fbf266..5acbfd761d21 100644
--- a/build-system/compile/single-pass.js
+++ b/build-system/compile/single-pass.js
@@ -32,18 +32,25 @@ const rename = require('gulp-rename');
 const sourcemaps = require('gulp-sourcemaps');
 const tempy = require('tempy');
 const through = require('through2');
-const {extensionBundles, altMainBundles, TYPES} = require('../../bundles.config');
-const {gulpClosureCompile, handleSinglePassCompilerError} = require('./closure-compile');
+const {
+  extensionBundles,
+  altMainBundles,
+  TYPES,
+} = require('../../bundles.config');
+const {
+  gulpClosureCompile,
+  handleSinglePassCompilerError,
+} = require('./closure-compile');
 const {isTravisBuild} = require('../travis');
 const {shortenLicense, shouldShortenLicense} = require('./shorten-license');
 const {TopologicalSort} = require('topological-sort');
 const TYPES_VALUES = Object.keys(TYPES).map(x => TYPES[x]);
 const wrappers = require('../compile-wrappers');
-const {VERSION: internalRuntimeVersion} = require('../internal-version') ;
+const {VERSION: internalRuntimeVersion} = require('../internal-version');
 
 const argv = minimist(process.argv.slice(2));
-let singlePassDest = typeof argv.single_pass_dest === 'string' ?
-  argv.single_pass_dest : './dist/';
+let singlePassDest =
+  typeof argv.single_pass_dest === 'string' ? argv.single_pass_dest : './dist/';
 
 if (!singlePassDest.endsWith('/')) {
   singlePassDest = `${singlePassDest}/`;
@@ -67,24 +74,26 @@ const commonJsModules = [
 
 const mainBundle = 'src/amp.js';
 const extensionsInfo = {};
-let extensions = extensionBundles.concat(altMainBundles)
-    .filter(unsupportedExtensions).map(ext => {
-      const path = buildFullPathFromConfig(ext);
-      if (Array.isArray(path)) {
-        path.forEach((p, index) => {
-          extensionsInfo[p] = Object.create(ext);
-          extensionsInfo[p].filename = ext.name + '-' + ext.version[index];
-        });
+let extensions = extensionBundles
+  .concat(altMainBundles)
+  .filter(unsupportedExtensions)
+  .map(ext => {
+    const path = buildFullPathFromConfig(ext);
+    if (Array.isArray(path)) {
+      path.forEach((p, index) => {
+        extensionsInfo[p] = Object.create(ext);
+        extensionsInfo[p].filename = ext.name + '-' + ext.version[index];
+      });
+    } else {
+      extensionsInfo[path] = Object.create(ext);
+      if (isAltMainBundle(ext.name) && ext.path) {
+        extensionsInfo[path].filename = ext.name;
       } else {
-        extensionsInfo[path] = Object.create(ext);
-        if (isAltMainBundle(ext.name) && ext.path) {
-          extensionsInfo[path].filename = ext.name;
-        } else {
-          extensionsInfo[path].filename = ext.name + '-' + ext.version;
-        }
+        extensionsInfo[path].filename = ext.name + '-' + ext.version;
       }
-      return path;
-    });
+    }
+    return path;
+  });
 // Flatten nested arrays to support multiple versions
 extensions = [].concat.apply([], extensions);
 
@@ -133,24 +142,25 @@ exports.getFlags = function(config) {
 
   // Turn object into deterministically sorted array.
   const flagsArray = [];
-  Object.keys(flags).sort().forEach(function(flag) {
-    const val = flags[flag];
-    if (val instanceof Array) {
-      val.forEach(function(item) {
-        flagsArray.push('--' + flag, item);
-      });
-    } else {
-      if (val != null) {
-        flagsArray.push('--' + flag, val);
+  Object.keys(flags)
+    .sort()
+    .forEach(function(flag) {
+      const val = flags[flag];
+      if (val instanceof Array) {
+        val.forEach(function(item) {
+          flagsArray.push('--' + flag, item);
+        });
       } else {
-        flagsArray.push('--' + flag);
+        if (val != null) {
+          flagsArray.push('--' + flag, val);
+        } else {
+          flagsArray.push('--' + flag);
+        }
       }
-    }
-  });
+    });
 
   return exports.getGraph(config.modules, config).then(function(g) {
-    return flagsArray.concat(
-        exports.getBundleFlags(g, flagsArray));
+    return flagsArray.concat(exports.getBundleFlags(g, flagsArray));
   });
 };
 
@@ -160,9 +170,11 @@ exports.getBundleFlags = function(g) {
   // Add all packages (directories with a package.json) to the srcs array.
   // Closure compiler reads the packages to resolve
   // non-relative module names.
-  Object.keys(g.packages).sort().forEach(function(pkg) {
-    srcs.push(pkg);
-  });
+  Object.keys(g.packages)
+    .sort()
+    .forEach(function(pkg) {
+      srcs.push(pkg);
+    });
 
   // Build up the weird flag structure that closure compiler calls
   // modules and we call bundles.
@@ -197,8 +209,12 @@ exports.getBundleFlags = function(g) {
     } else {
       // TODO(@cramforce): Remove special case.
       if (!/_base/.test(bundle.name)) {
-        throw new Error('Unexpected missing extension info ' + bundle.name +
-            ',' + JSON.stringify(bundle));
+        throw new Error(
+          'Unexpected missing extension info ' +
+            bundle.name +
+            ',' +
+            JSON.stringify(bundle)
+        );
       }
       name = bundle.name;
       info = {
@@ -206,7 +222,7 @@ exports.getBundleFlags = function(g) {
       };
     }
     // And now build --module $name:$numberOfJsFiles:$bundleDeps
-    let cmd = name + ':' + (bundle.modules.length);
+    let cmd = name + ':' + bundle.modules.length;
     const bundleDeps = [];
     if (!isMain) {
       const configEntry = getExtensionBundleConfig(originalName);
@@ -226,8 +242,8 @@ exports.getBundleFlags = function(g) {
     flagsArray.push('--module', cmd);
     if (bundleKeys.length > 1) {
       function massageWrapper(w) {
-        return (w.replace('<%= contents %>', '%s')
-        /*+ '\n//# sourceMappingURL=%basename%.map\n'*/);
+        return w.replace('<%= contents %>', '%s');
+        /*+ '\n//# sourceMappingURL=%basename%.map\n'*/
       }
       // We need to post wrap the main bundles. We can't wrap v0.js either
       // since it would have the wrapper already when we read it and prepend
@@ -236,11 +252,23 @@ exports.getBundleFlags = function(g) {
         jsFilesToWrap.push(name);
       } else {
         const configEntry = getExtensionBundleConfig(originalName);
-        const marker = configEntry && Array.isArray(configEntry.postPrepend) ?
-          SPLIT_MARKER : '';
-        flagsArray.push('--module_wrapper', name + ':' +
-          massageWrapper(wrappers.extension(
-              info.name, info.loadPriority, bundleDeps, marker)));
+        const marker =
+          configEntry && Array.isArray(configEntry.postPrepend)
+            ? SPLIT_MARKER
+            : '';
+        flagsArray.push(
+          '--module_wrapper',
+          name +
+            ':' +
+            massageWrapper(
+              wrappers.extension(
+                info.name,
+                info.loadPriority,
+                bundleDeps,
+                marker
+              )
+            )
+        );
       }
     } else {
       throw new Error('Expect to build more than one bundle.');
@@ -297,72 +325,87 @@ exports.getGraph = function(entryModules, config) {
     deps: true,
     detectGlobals: false,
   })
-  // The second stage are transforms that closure compiler supports
-  // directly and which we don't want to apply during deps finding.
-      .transform(babelify, {
-        compact: false,
-        plugins: [
-          require.resolve('babel-plugin-transform-es2015-modules-commonjs'),
-        ],
-      });
+    // The second stage are transforms that closure compiler supports
+    // directly and which we don't want to apply during deps finding.
+    .transform(babelify, {
+      compact: false,
+      plugins: [
+        require.resolve('babel-plugin-transform-es2015-modules-commonjs'),
+      ],
+    });
   // This gets us the actual deps. We collect them in an array, so
   // we can sort them prior to building the dep tree. Otherwise the tree
   // will not be stable.
   const depEntries = [];
-  b.pipeline.get('deps').push(through.obj(function(row, enc, next) {
-    row.source = null; // Release memory
-    depEntries.push(row);
-    next();
-  }));
-
-  b.bundle().on('end', function() {
-    const edges = {};
-    depEntries.sort(function(a, b) {
-      return a.id < b.id;
-    }).forEach(function(row) {
-      const id = unifyPath(exports.maybeAddDotJs(
-          relativePath(process.cwd(), row.id)));
-      topo.addNode(id, id);
-      const deps = edges[id] = Object.keys(row.deps).sort().map(function(dep) {
-        return unifyPath(relativePath(process.cwd(),
-            row.deps[dep]));
-      });
-      graph.deps[id] = deps;
-      if (row.entry) {
-        graph.depOf[id] = {};
-        graph.depOf[id][id] = true; // Self edge.
-        deps.forEach(function(dep) {
-          graph.depOf[id][dep] = true;
+  b.pipeline.get('deps').push(
+    through.obj(function(row, enc, next) {
+      row.source = null; // Release memory
+      depEntries.push(row);
+      next();
+    })
+  );
+
+  b.bundle()
+    .on('end', function() {
+      const edges = {};
+      depEntries
+        .sort(function(a, b) {
+          return a.id < b.id;
+        })
+        .forEach(function(row) {
+          const id = unifyPath(
+            exports.maybeAddDotJs(relativePath(process.cwd(), row.id))
+          );
+          topo.addNode(id, id);
+          const deps = (edges[id] = Object.keys(row.deps)
+            .sort()
+            .map(function(dep) {
+              return unifyPath(relativePath(process.cwd(), row.deps[dep]));
+            }));
+          graph.deps[id] = deps;
+          if (row.entry) {
+            graph.depOf[id] = {};
+            graph.depOf[id][id] = true; // Self edge.
+            deps.forEach(function(dep) {
+              graph.depOf[id][dep] = true;
+            });
+          }
         });
-      }
-    });
-    Object.keys(edges).sort().forEach(function(id) {
-      edges[id].forEach(function(dep) {
-        topo.addEdge(id, dep);
-      });
-    });
-    graph.sorted = Array.from(topo.sort().keys()).reverse();
-
-    setupBundles(graph);
-    transformPathsToTempDir(graph, config);
-    resolve(graph);
-    fs.writeFileSync('deps.txt', JSON.stringify(graph, null, 2));
-  }).on('error', reject).pipe(devnull());
+      Object.keys(edges)
+        .sort()
+        .forEach(function(id) {
+          edges[id].forEach(function(dep) {
+            topo.addEdge(id, dep);
+          });
+        });
+      graph.sorted = Array.from(topo.sort().keys()).reverse();
+
+      setupBundles(graph);
+      transformPathsToTempDir(graph, config);
+      resolve(graph);
+      fs.writeFileSync('deps.txt', JSON.stringify(graph, null, 2));
+    })
+    .on('error', reject)
+    .pipe(devnull());
   return promise;
 };
 
 function setupBundles(graph) {
   // For each module, mark them as to whether any of the entry
   // modules depends on them (transitively).
-  Array.from(graph.sorted).reverse().forEach(function(id) {
-    graph.deps[id].forEach(function(dep) {
-      Object.keys(graph.depOf).sort().forEach(function(entry) {
-        if (graph.depOf[entry][id]) {
-          graph.depOf[entry][dep] = true;
-        }
+  Array.from(graph.sorted)
+    .reverse()
+    .forEach(function(id) {
+      graph.deps[id].forEach(function(dep) {
+        Object.keys(graph.depOf)
+          .sort()
+          .forEach(function(entry) {
+            if (graph.depOf[entry][id]) {
+              graph.depOf[entry][dep] = true;
+            }
+          });
       });
     });
-  });
 
   // Create the bundles.
   graph.sorted.forEach(function(id) {
@@ -372,18 +415,26 @@ function setupBundles(graph) {
     // Bundles that this item must be available to.
     const bundleDestCandidates = [];
     // Count in how many bundles a modules wants to be.
-    Object.keys(graph.depOf).sort().forEach(function(entry) {
-      if (graph.depOf[entry][id]) {
-        inBundleCount++;
-        dest = entry;
-        const configEntry = getExtensionBundleConfig(entry);
-        const type = configEntry ? configEntry.type : mainBundle;
-        bundleDestCandidates.push(type);
-      }
-    });
-    console/*OK*/.assert(inBundleCount >= 1,
-        'Should be in at least 1 bundle', id, 'Bundle count',
-        inBundleCount, graph.depOf);
+    Object.keys(graph.depOf)
+      .sort()
+      .forEach(function(entry) {
+        if (graph.depOf[entry][id]) {
+          inBundleCount++;
+          dest = entry;
+          const configEntry = getExtensionBundleConfig(entry);
+          const type = configEntry ? configEntry.type : mainBundle;
+          bundleDestCandidates.push(type);
+        }
+      });
+    console /*OK*/
+      .assert(
+        inBundleCount >= 1,
+        'Should be in at least 1 bundle',
+        id,
+        'Bundle count',
+        inBundleCount,
+        graph.depOf
+      );
     // If a module is in more than 1 bundle, it must go into _base.
     if (bundleDestCandidates.length > 1) {
       const first = bundleDestCandidates[0];
@@ -516,20 +567,21 @@ function isAltMainBundle(name) {
 }
 
 exports.singlePassCompile = async function(entryModule, options) {
-  return exports.getFlags({
-    modules: [entryModule].concat(extensions),
-    writeTo: singlePassDest,
-    define: options.define,
-    externs: options.externs,
-    hideWarningsFor: options.hideWarningsFor,
-  })
-      .then(compile)
-      .then(wrapMainBinaries)
-      .then(postProcessConcat)
-      .catch(err => {
-        err.showStack = false; // Useless node_modules stack
-        return Promise.reject(err);
-      });
+  return exports
+    .getFlags({
+      modules: [entryModule].concat(extensions),
+      writeTo: singlePassDest,
+      define: options.define,
+      externs: options.externs,
+      hideWarningsFor: options.hideWarningsFor,
+    })
+    .then(compile)
+    .then(wrapMainBinaries)
+    .then(postProcessConcat)
+    .catch(err => {
+      err.showStack = false; // Useless node_modules stack
+      return Promise.reject(err);
+    });
 };
 
 /**
@@ -551,8 +603,11 @@ function wrapMainBinaries() {
     const path = `dist/${x}.js`;
     const bootstrapCode = path === 'dist/v0.js' ? '' : mainFile;
     const isAmpAltstring = path === 'dist/v0.js' ? '' : 'self.IS_AMP_ALT=1;';
-    fs.writeFileSync(path, `${isAmpAltstring}${prefix}${bootstrapCode}` +
-        `${fs.readFileSync(path).toString()}${suffix}`);
+    fs.writeFileSync(
+      path,
+      `${isAmpAltstring}${prefix}${bootstrapCode}` +
+        `${fs.readFileSync(path).toString()}${suffix}`
+    );
   });
 }
 
@@ -562,8 +617,7 @@ function wrapMainBinaries() {
  * source maps.
  */
 function postProcessConcat() {
-  const extensions = extensionBundles.filter(
-      x => Array.isArray(x.postPrepend));
+  const extensions = extensionBundles.filter(x => Array.isArray(x.postPrepend));
   extensions.forEach(extension => {
     const isAltMainBundle = altMainBundles.some(x => {
       return x.name === extension.name;
@@ -582,11 +636,15 @@ function postProcessConcat() {
       targets.push(createFullPath(extension.version));
     }
     targets.forEach(path => {
-      const prependContent = extension.postPrepend.map(x => {
-        return ';' + fs.readFileSync(x, 'utf8').toString();
-      }).join('');
-      const content = fs.readFileSync(path, 'utf8').toString()
-          .split(SPLIT_MARKER);
+      const prependContent = extension.postPrepend
+        .map(x => {
+          return ';' + fs.readFileSync(x, 'utf8').toString();
+        })
+        .join('');
+      const content = fs
+        .readFileSync(path, 'utf8')
+        .toString()
+        .split(SPLIT_MARKER);
       const prefix = content[0];
       const suffix = content[1];
       fs.writeFileSync(path, prefix + prependContent + suffix, 'utf8');
@@ -597,17 +655,18 @@ function postProcessConcat() {
 function compile(flagsArray) {
   // TODO(@cramforce): Run the post processing step
   return new Promise(function(resolve, reject) {
-    return gulp.src(srcs, {base: transformDir})
-        .pipe(gulpIf(shouldShortenLicense, shortenLicense()))
-        .pipe(sourcemaps.init({loadMaps: true}))
-        .pipe(gulpClosureCompile(flagsArray))
-        .on('error', err => {
-          handleSinglePassCompilerError();
-          reject(err);
-        })
-        .pipe(sourcemaps.write('.'))
-        .pipe(gulpIf(/(\/amp-|\/_base)/, rename(path => path.dirname += '/v0')))
-        .pipe(gulp.dest('.'))
-        .on('end', resolve);
+    return gulp
+      .src(srcs, {base: transformDir})
+      .pipe(gulpIf(shouldShortenLicense, shortenLicense()))
+      .pipe(sourcemaps.init({loadMaps: true}))
+      .pipe(gulpClosureCompile(flagsArray))
+      .on('error', err => {
+        handleSinglePassCompilerError();
+        reject(err);
+      })
+      .pipe(sourcemaps.write('.'))
+      .pipe(gulpIf(/(\/amp-|\/_base)/, rename(path => (path.dirname += '/v0'))))
+      .pipe(gulp.dest('.'))
+      .on('end', resolve);
   });
 }
diff --git a/build-system/config.js b/build-system/config.js
index 37a3b30aea62..aa0bce4aa953 100644
--- a/build-system/config.js
+++ b/build-system/config.js
@@ -15,9 +15,7 @@
  */
 'use strict';
 
-const initTestsPath = [
-  'test/_init_tests.js',
-];
+const initTestsPath = ['test/_init_tests.js'];
 
 const fixturesExamplesPaths = [
   'test/fixtures/*.html',
@@ -58,8 +56,10 @@ const builtRuntimePaths = [
 
 const commonUnitTestPaths = initTestsPath.concat(fixturesExamplesPaths);
 
-const commonIntegrationTestPaths =
-    initTestsPath.concat(fixturesExamplesPaths, builtRuntimePaths);
+const commonIntegrationTestPaths = initTestsPath.concat(
+  fixturesExamplesPaths,
+  builtRuntimePaths
+);
 
 const testPaths = commonIntegrationTestPaths.concat([
   'test/*/!(e2e)/**/*.js',
@@ -73,9 +73,7 @@ const a4aTestPaths = initTestsPath.concat([
   'ads/google/a4a/test/*.js',
 ]);
 
-const chaiAsPromised = [
-  'test/chai-as-promised/chai-as-promised.js',
-];
+const chaiAsPromised = ['test/chai-as-promised/chai-as-promised.js'];
 
 const unitTestPaths = [
   'test/unit/**/*.js',
@@ -83,24 +81,16 @@ const unitTestPaths = [
   'extensions/**/test/*.js',
 ];
 
-const unitTestOnSaucePaths = [
-  'test/unit/**/*.js',
-  'ads/**/test/test-*.js',
-];
+const unitTestOnSaucePaths = ['test/unit/**/*.js', 'ads/**/test/test-*.js'];
 
 const integrationTestPaths = [
   'test/integration/**/*.js',
   'extensions/**/test/integration/**/*.js',
 ];
 
-const e2eTestPaths = [
-  'test/e2e/*.js',
-  'extensions/**/test-e2e/*.js',
-];
+const e2eTestPaths = ['test/e2e/*.js', 'extensions/**/test-e2e/*.js'];
 
-const devDashboardTestPaths = [
-  'build-system/app-index/test/**/*.js',
-];
+const devDashboardTestPaths = ['build-system/app-index/test/**/*.js'];
 
 const lintGlobs = [
   '**/*.js',
@@ -149,7 +139,7 @@ module.exports = {
   jsonGlobs: [
     '**/*.json',
     '!{node_modules,build,dist,dist.3p,dist.tools,' +
-        'third_party,build-system}/**/*.*',
+      'third_party,build-system}/**/*.*',
   ],
   presubmitGlobs: [
     '**/*.{css,js,go}',
@@ -157,7 +147,7 @@ module.exports = {
     // built 3p binary. This is done, so we make sure our special 3p checks
     // run against the entire transitive closure of deps.
     '!{node_modules,build,dist,dist.tools,' +
-        'dist.3p/[0-9]*,dist.3p/current,dist.3p/current-min}/**/*.*',
+      'dist.3p/[0-9]*,dist.3p/current,dist.3p/current-min}/**/*.*',
     '!dist.3p/current/**/ampcontext-lib.js',
     '!dist.3p/current/**/iframe-transport-client-lib.js',
     '!out/**/*.*',
diff --git a/build-system/ctrlcHandler.js b/build-system/ctrlcHandler.js
index d7464da4c6ec..fd64d34cfbb2 100644
--- a/build-system/ctrlcHandler.js
+++ b/build-system/ctrlcHandler.js
@@ -21,9 +21,8 @@ const {isTravisBuild} = require('./travis');
 
 const {green, cyan} = colors;
 
-const killCmd =
-    (process.platform == 'win32') ? 'taskkill /f /pid' : 'kill -KILL';
-const killSuffix = (process.platform == 'win32') ? '>NUL' : '';
+const killCmd = process.platform == 'win32' ? 'taskkill /f /pid' : 'kill -KILL';
+const killSuffix = process.platform == 'win32' ? '>NUL' : '';
 
 /**
  * Creates an async child process that handles Ctrl + C and immediately cancels
@@ -33,11 +32,19 @@ const killSuffix = (process.platform == 'win32') ? '>NUL' : '';
  */
 exports.createCtrlcHandler = function(command) {
   if (!isTravisBuild()) {
-    log(green('Running'), cyan(command) + green('. Press'), cyan('Ctrl + C'),
-        green('to cancel...'));
+    log(
+      green('Running'),
+      cyan(command) + green('. Press'),
+      cyan('Ctrl + C'),
+      green('to cancel...')
+    );
   }
-  const killMessage = green('\nDetected ') + cyan('Ctrl + C') +
-      green('. Canceling ') + cyan(command) + green('.');
+  const killMessage =
+    green('\nDetected ') +
+    cyan('Ctrl + C') +
+    green('. Canceling ') +
+    cyan(command) +
+    green('.');
   const listenerCmd = `
     #!/bin/sh
     ctrlcHandler() {
@@ -48,8 +55,9 @@ exports.createCtrlcHandler = function(command) {
     trap 'ctrlcHandler' INT
     read _ # Waits until the process is terminated
   `;
-  return execScriptAsync(
-      listenerCmd, {'stdio': [null, process.stdout, process.stderr]}).pid;
+  return execScriptAsync(listenerCmd, {
+    'stdio': [null, process.stdout, process.stderr],
+  }).pid;
 };
 
 /**
diff --git a/build-system/dep-check-config.js b/build-system/dep-check-config.js
index ebbba2f88086..df7f5c742f2a 100644
--- a/build-system/dep-check-config.js
+++ b/build-system/dep-check-config.js
@@ -75,13 +75,13 @@ exports.rules = [
     mustNotDependOn: 'third_party/**/*.js',
     whitelist: [
       'extensions/amp-crypto-polyfill/**/*.js->' +
-          'third_party/closure-library/sha384-generated.js',
+        'third_party/closure-library/sha384-generated.js',
       'extensions/amp-mustache/**/amp-mustache.js->' +
-          'third_party/mustache/mustache.js',
+        'third_party/mustache/mustache.js',
       'extensions/amp-ad-network-adzerk-impl/0.1/' +
-          'amp-ad-network-adzerk-impl.js->third_party/mustache/mustache.js',
+        'amp-ad-network-adzerk-impl.js->third_party/mustache/mustache.js',
       'extensions/amp-timeago/0.1/amp-timeago.js->' +
-          'third_party/timeagojs/timeago.js',
+        'third_party/timeagojs/timeago.js',
       '3p/polyfills.js->third_party/babel/custom-babel-helpers.js',
       'src/sanitizer.js->third_party/caja/html-sanitizer.js',
       'extensions/amp-viz-vega/**->third_party/vega/vega.js',
@@ -89,21 +89,21 @@ exports.rules = [
       'src/css.js->third_party/css-escape/css-escape.js',
       'src/shadow-embed.js->third_party/webcomponentsjs/ShadowCSS.js',
       'third_party/timeagojs/timeago.js->' +
-          'third_party/timeagojs/timeago-locales.js',
+        'third_party/timeagojs/timeago-locales.js',
       'extensions/amp-date-picker/**->third_party/react-dates/bundle.js',
       'extensions/amp-date-picker/**->third_party/rrule/rrule.js',
       'extensions/amp-subscriptions/**/*.js->' +
-          'third_party/subscriptions-project/apis.js',
+        'third_party/subscriptions-project/apis.js',
       'extensions/amp-subscriptions/**/*.js->' +
-          'third_party/subscriptions-project/config.js',
+        'third_party/subscriptions-project/config.js',
       'extensions/amp-subscriptions-google/**/*.js->' +
-          'third_party/subscriptions-project/apis.js',
+        'third_party/subscriptions-project/apis.js',
       'extensions/amp-subscriptions-google/**/*.js->' +
-          'third_party/subscriptions-project/config.js',
+        'third_party/subscriptions-project/config.js',
       'extensions/amp-subscriptions-google/**/*.js->' +
-          'third_party/subscriptions-project/swg.js',
+        'third_party/subscriptions-project/swg.js',
       'extensions/amp-recaptcha-input/**/*.js->' +
-      'third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm.js',
+        'third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm.js',
     ],
   },
   // Rules for 3p
@@ -183,18 +183,18 @@ exports.rules = [
     whitelist: [
       // See todo note in ads/_a4a-config.js
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js',
+        'extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js',
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-doubleclick-impl/0.1/' +
-          'doubleclick-a4a-config.js',
+        'extensions/amp-ad-network-doubleclick-impl/0.1/' +
+        'doubleclick-a4a-config.js',
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-fake-impl/0.1/fake-a4a-config.js',
+        'extensions/amp-ad-network-fake-impl/0.1/fake-a4a-config.js',
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js',
+        'extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js',
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config.js',
+        'extensions/amp-ad-network-cloudflare-impl/0.1/cloudflare-a4a-config.js',
       'ads/_a4a-config.js->' +
-          'extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js',
+        'extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js',
     ],
   },
   // Rules for extensions and main src.
@@ -278,404 +278,400 @@ exports.rules = [
     mustNotDependOn: 'src/service/**/*.js',
     whitelist: [
       'extensions/amp-a4a/0.1/a4a-variable-source.js->' +
-          'src/service/variable-source.js',
+        'src/service/variable-source.js',
       'extensions/amp-a4a/0.1/amp-a4a.js->' +
-          'src/service/url-replacements-impl.js',
+        'src/service/url-replacements-impl.js',
       'extensions/amp-video-service/**->' +
-          'src/service/video-service-interface.js',
+        'src/service/video-service-interface.js',
       'extensions/amp-video/0.1/amp-video.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-video-iframe/0.1/amp-video-iframe.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-ooyala-player/0.1/amp-ooyala-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-youtube/0.1/amp-youtube.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-viqeo-player/0.1/amp-viqeo-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-brightcove/0.1/amp-brightcove.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-powr-player/0.1/amp-powr-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-dailymotion/0.1/amp-dailymotion.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-brid-player/0.1/amp-brid-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-gfycat/0.1/amp-gfycat.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-a4a/0.1/amp-a4a.js->src/service/variable-source.js',
       'extensions/amp-a4a/0.1/friendly-frame-util.js->' +
-          'src/service/url-replacements-impl.js',
+        'src/service/url-replacements-impl.js',
       'extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-3q-player/0.1/amp-3q-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-ima-video/0.1/amp-ima-video.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-vimeo/0.1/amp-vimeo.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-wistia-player/0.1/amp-wistia-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-delight-player/0.1/amp-delight-player.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/video-manager-impl.js',
       'extensions/amp-analytics/0.1/iframe-transport.js->' +
-          'src/service/extension-location.js',
+        'src/service/extension-location.js',
       'extensions/amp-analytics/0.1/iframe-transport.js->' +
-          'src/service/jank-meter.js',
+        'src/service/jank-meter.js',
       'extensions/amp-position-observer/0.1/amp-position-observer.js->' +
-          'src/service/position-observer/position-observer-impl.js',
+        'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-position-observer/0.1/amp-position-observer.js->' +
-          'src/service/position-observer/position-observer-worker.js',
+        'src/service/position-observer/position-observer-worker.js',
       'extensions/amp-fx-collection/0.1/providers/fx-provider.js->' +
-          'src/service/position-observer/position-observer-impl.js',
+        'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-fx-collection/0.1/providers/fx-provider.js->' +
-          'src/service/position-observer/position-observer-worker.js',
+        'src/service/position-observer/position-observer-worker.js',
       'extensions/amp-list/0.1/amp-list.js->' +
-          'src/service/position-observer/position-observer-impl.js',
+        'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-list/0.1/amp-list.js->' +
-            'src/service/position-observer/position-observer-worker.js',
+        'src/service/position-observer/position-observer-worker.js',
       'extensions/amp-video-docking/0.1/amp-video-docking.js->' +
-          'src/service/position-observer/position-observer-impl.js',
+        'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-video-docking/0.1/amp-video-docking.js->' +
-          'src/service/position-observer/position-observer-worker.js',
+        'src/service/position-observer/position-observer-worker.js',
       'extensions/amp-analytics/0.1/amp-analytics.js->' +
-          'src/service/cid-impl.js',
+        'src/service/cid-impl.js',
       'extensions/amp-analytics/0.1/cookie-writer.js->' +
-          'src/service/cid-impl.js',
+        'src/service/cid-impl.js',
       'extensions/amp-next-page/0.1/next-page-service.js->' +
-          'src/service/position-observer/position-observer-impl.js',
+        'src/service/position-observer/position-observer-impl.js',
       'extensions/amp-next-page/0.1/next-page-service.js->' +
-          'src/service/position-observer/position-observer-worker.js',
+        'src/service/position-observer/position-observer-worker.js',
       'extensions/amp-user-notification/0.1/amp-user-notification.js->' +
-          'src/service/notification-ui-manager.js',
+        'src/service/notification-ui-manager.js',
       'extensions/amp-consent/0.1/amp-consent.js->' +
-          'src/service/notification-ui-manager.js',
+        'src/service/notification-ui-manager.js',
       // For autoplay delegation:
       'extensions/amp-story/0.1/amp-story-page.js->' +
-          'src/service/video-service-sync-impl.js',
+        'src/service/video-service-sync-impl.js',
       'extensions/amp-story/1.0/amp-story-page.js->' +
-          'src/service/video-service-sync-impl.js',
+        'src/service/video-service-sync-impl.js',
       // Accessing USER_INTERACTED constant:
       'extensions/amp-story/1.0/media-pool.js->' +
-          'src/service/video-service-interface.js',
+        'src/service/video-service-interface.js',
       'extensions/amp-story/1.0/page-advancement.js->' +
-          'src/service/action-impl.js',
+        'src/service/action-impl.js',
       'extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js->' +
-          'src/service/navigation.js',
+        'src/service/navigation.js',
       'extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js->' +
-          'src/service/navigation.js',
-	  'extensions/amp-mowplayer/0.1/amp-mowplayer.js->' +
-          'src/service/video-manager-impl.js',
+        'src/service/navigation.js',
+      'extensions/amp-mowplayer/0.1/amp-mowplayer.js->' +
+        'src/service/video-manager-impl.js',
       'extensions/amp-analytics/0.1/linker-manager.js->' +
-          'src/service/navigation.js',
+        'src/service/navigation.js',
       'extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js->' +
         'src/service/navigation.js',
-      'extensions/amp-list/0.1/amp-list.js->' +
-          'src/service/xhr-impl.js',
-      'extensions/amp-form/0.1/amp-form.js->' +
-          'src/service/xhr-impl.js',
+      'extensions/amp-list/0.1/amp-list.js->src/service/xhr-impl.js',
+      'extensions/amp-form/0.1/amp-form.js->src/service/xhr-impl.js',
       // Accessing extension-location.calculateExtensionScriptUrl().
       'extensions/amp-script/0.1/amp-script.js->' +
-            'src/service/extension-location.js',
+        'src/service/extension-location.js',
       // Origin experiments.
       'extensions/amp-list/0.1/amp-list.js->' +
-          'src/service/origin-experiments-impl.js',
+        'src/service/origin-experiments-impl.js',
       'extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js->' +
-          'src/service/origin-experiments-impl.js',
+        'src/service/origin-experiments-impl.js',
       'extensions/amp-experiment/1.0/amp-experiment.js->' +
-          'src/service/origin-experiments-impl.js',
+        'src/service/origin-experiments-impl.js',
       'extensions/amp-script/0.1/amp-script.js->' +
-          'src/service/origin-experiments-impl.js',
+        'src/service/origin-experiments-impl.js',
       // For action macros.
       'extensions/amp-action-macro/0.1/amp-action-macro.js->' +
-            'src/service/action-impl.js',
+        'src/service/action-impl.js',
       'extensions/amp-link-rewriter/0.1/amp-link-rewriter.js->' +
-            'src/service/navigation.js',
+        'src/service/navigation.js',
       // For localization.
-      'extensions/amp-story/0.1/amp-story.js->' +
-            'src/service/localization.js',
-      'extensions/amp-story/1.0/amp-story.js->' +
-            'src/service/localization.js',
+      'extensions/amp-story/0.1/amp-story.js->src/service/localization.js',
+      'extensions/amp-story/1.0/amp-story.js->src/service/localization.js',
       'extensions/amp-story/1.0/_locales/af.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/am.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ar.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/bg.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/bn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/bs.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ca.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/cs.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/da.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/de.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/default.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/el.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/en-GB.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/en.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/es-419.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/es.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/et.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/eu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/fa.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/fi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/fil.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/fr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/gl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/gu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/hi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/hr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/hu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/id.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/is.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/it.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/iw.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ja.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ka.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/km.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/kn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ko.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/lo.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/lt.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/lv.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/mk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ml.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/mn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/mr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ms.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/my.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ne.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/nl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/no.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/pa.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/pt-BR.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/pt-PT.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ro.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ru.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/si.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sq.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sv.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/sw.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ta.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/te.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/th.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/tr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/uk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/ur.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/vi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/zh-CN.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/zh-TW.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story/1.0/_locales/zu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/af.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/am.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ar.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/bg.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/bn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/bs.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ca.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/cs.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/da.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/de.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/el.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/en-GB.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/en.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/es-419.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/es.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/et.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/eu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/fa.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/fi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/fil.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/fr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/gl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/gu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/hi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/hr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/hu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/id.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/is.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/it.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/iw.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ja.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ka.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/km.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/kn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ko.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/lo.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/lt.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/lv.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/mk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ml.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/mn.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/mr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ms.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/my.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ne.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/nl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/no.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/pa.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/pt-BR.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/pt-PT.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ro.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ru.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/si.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sl.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sq.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sv.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/sw.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ta.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/te.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/th.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/tr.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/uk.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/ur.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/vi.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/zh-CN.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/zh-TW.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
       'extensions/amp-story-auto-ads/0.1/_locales/zu.js->' +
-          'src/service/localization.js',
+        'src/service/localization.js',
     ],
   },
   {
@@ -734,7 +730,8 @@ exports.rules = [
       'src/3p-frame.js',
       'src/iframe-helper.js',
     ],
-    whitelist: 'extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js->src/3p-frame.js',
+    whitelist:
+      'extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js->src/3p-frame.js',
   },
 
   {
@@ -763,21 +760,19 @@ exports.rules = [
   // Do not add any additional files to this whitelist without express
   // permission from @bradfrizzell, @keithwrightbos, or @robhazan.
   {
-    mustNotDependOn: [
-      'ads/google/doubleclick.js',
-    ],
+    mustNotDependOn: ['ads/google/doubleclick.js'],
     whitelist: [
-      /** DO NOT ADD TO WHITELIST **/
+      /** DO NOT ADD TO WHITELIST */
       'ads/ix.js->ads/google/doubleclick.js',
       'ads/imonomy.js->ads/google/doubleclick.js',
       'ads/medianet.js->ads/google/doubleclick.js',
       'ads/navegg.js->ads/google/doubleclick.js',
-      /** DO NOT ADD TO WHITELIST **/
+      /** DO NOT ADD TO WHITELIST */
       'ads/openx.js->ads/google/doubleclick.js',
       'ads/pulsepoint.js->ads/google/doubleclick.js',
       'ads/rubicon.js->ads/google/doubleclick.js',
       'ads/yieldbot.js->ads/google/doubleclick.js',
-      /** DO NOT ADD TO WHITELIST **/
+      /** DO NOT ADD TO WHITELIST */
     ],
   },
 ];
diff --git a/build-system/eslint-rules/query-selector.js b/build-system/eslint-rules/query-selector.js
index 4aaa1c190620..b9a1d490b098 100644
--- a/build-system/eslint-rules/query-selector.js
+++ b/build-system/eslint-rules/query-selector.js
@@ -73,8 +73,8 @@ module.exports = function(context) {
       return;
     }
 
-    if (callee.trailingComments) {
-      const ok = callee.trailingComments.some(comment => {
+    if (node.leadingComments) {
+      const ok = node.leadingComments.some(comment => {
         return comment.value === 'OK';
       });
       if (ok) {
diff --git a/build-system/exec.js b/build-system/exec.js
index d9d9a4341814..82afff22cc29 100644
--- a/build-system/exec.js
+++ b/build-system/exec.js
@@ -21,8 +21,8 @@
 
 const childProcess = require('child_process');
 
-const shellCmd = (process.platform == 'win32') ? 'cmd' : '/bin/sh';
-const shellFlag = (process.platform == 'win32') ? '/C' : '-c';
+const shellCmd = process.platform == 'win32' ? 'cmd' : '/bin/sh';
+const shellFlag = process.platform == 'win32' ? '/C' : '-c';
 
 /**
  * Spawns the given command in a child process with the given options.
@@ -77,14 +77,12 @@ exports.execOrDie = function(cmd, options) {
  * @return {!Object}
  */
 function getOutput(cmd) {
-  const p = spawnProcess(
-      cmd,
-      {
-        'cwd': process.cwd(),
-        'env': process.env,
-        'stdio': 'pipe',
-        'encoding': 'utf-8',
-      });
+  const p = spawnProcess(cmd, {
+    'cwd': process.cwd(),
+    'env': process.env,
+    'stdio': 'pipe',
+    'encoding': 'utf-8',
+  });
   return p;
 }
 
diff --git a/build-system/git.js b/build-system/git.js
index 296f6f0c9df5..b7ea4a734384 100644
--- a/build-system/git.js
+++ b/build-system/git.js
@@ -67,7 +67,9 @@ exports.shortSha = function(sha) {
  */
 exports.gitDiffNameOnlyMaster = function() {
   const masterBaseline = gitMasterBaseline();
-  return getStdout(`git diff --name-only ${masterBaseline}`).trim().split('\n');
+  return getStdout(`git diff --name-only ${masterBaseline}`)
+    .trim()
+    .split('\n');
 };
 
 /**
@@ -100,7 +102,9 @@ ${colors.cyan(commitLogMaxCount)} commits. \
 Branch ${colors.cyan(exports.gitBranchName())} may not have been forked from \
 ${colors.cyan('master')}.`;
     commitLog += `\n${colors.yellow('WARNING:')} See \
-${colors.cyan('https://github.com/ampproject/amphtml/blob/master/contributing/getting-started-quick.md')} \
+${colors.cyan(
+  'https://github.com/ampproject/amphtml/blob/master/contributing/getting-started-quick.md'
+)} \
 for how to fix this.`;
   }
   return commitLog;
@@ -114,7 +118,8 @@ for how to fix this.`;
 exports.gitDiffAddedNameOnlyMaster = function() {
   const branchPoint = gitMergeBaseLocalMaster();
   return getStdout(`git diff --name-only --diff-filter=ARC ${branchPoint}`)
-      .trim().split('\n');
+    .trim()
+    .split('\n');
 };
 
 /**
@@ -130,9 +135,9 @@ exports.gitDiffColor = function() {
  * @return {string}
  */
 exports.gitBranchName = function() {
-  return isTravisPullRequestBuild() ?
-    travisPullRequestBranch() :
-    getStdout('git rev-parse --abbrev-ref HEAD').trim();
+  return isTravisPullRequestBuild()
+    ? travisPullRequestBranch()
+    : getStdout('git rev-parse --abbrev-ref HEAD').trim();
 };
 
 /**
@@ -160,8 +165,8 @@ exports.gitCommitterEmail = function() {
  */
 exports.gitCommitFormattedTime = function() {
   return getStdout(
-      'TZ=UTC git log -1 --pretty="%cd" --date=format-local:%y%m%d%H%M%S')
-      .trim();
+    'TZ=UTC git log -1 --pretty="%cd" --date=format-local:%y%m%d%H%M%S'
+  ).trim();
 };
 
 /**
diff --git a/build-system/internal-version.js b/build-system/internal-version.js
index ebba56324664..629f881fdf33 100644
--- a/build-system/internal-version.js
+++ b/build-system/internal-version.js
@@ -43,8 +43,9 @@ function getVersion() {
       lastDigit = parseInt(argv.custom_version_mark, 10);
       if (isNaN(lastDigit) || lastDigit < 0 || lastDigit > 9) {
         throw new Error(
-            `--custom_version_mark is set to ${argv.custom_version_mark}, ` +
-            'expected value between 0 and 9!');
+          `--custom_version_mark is set to ${argv.custom_version_mark}, ` +
+            'expected value between 0 and 9!'
+        );
       }
     }
     return `${lastCommitFormattedTime}${lastDigit}`;
diff --git a/build-system/pr-check/build-targets.js b/build-system/pr-check/build-targets.js
index a02fa2a47690..babf3355adc9 100644
--- a/build-system/pr-check/build-targets.js
+++ b/build-system/pr-check/build-targets.js
@@ -43,7 +43,8 @@ function isValidatorWebuiFile(filePath) {
  * @return {boolean}
  */
 function isBuildSystemFile(filePath) {
-  return (filePath.startsWith('build-system') &&
+  return (
+    (filePath.startsWith('build-system') &&
       // Exclude textproto from build-system since we want it to trigger
       // tests and type check.
       path.extname(filePath) != '.textproto' &&
@@ -55,9 +56,10 @@ function isBuildSystemFile(filePath) {
       !isDevDashboardFile(filePath) &&
       // Exclude visual diff files from build-system since we want it to trigger
       // visual diff tests.
-      !isVisualDiffFile(filePath))
-      // OWNERS.yaml files should trigger build system to run tests
-      || isOwnersFile(filePath);
+      !isVisualDiffFile(filePath)) ||
+    // OWNERS.yaml files should trigger build system to run tests
+    isOwnersFile(filePath)
+  );
 }
 
 /**
@@ -67,13 +69,13 @@ function isBuildSystemFile(filePath) {
  * @return {boolean}
  */
 function isBuildSystemAndRuntimeFile(filePath) {
-  return isBuildSystemFile(filePath) &&
-      // These build system files are involved in the compilation/bundling and
-      // are likely to affect the runtime as well.
-      (
-        filePath.startsWith('build-system/babel-plugins') ||
-        filePath.startsWith('build-system/runner')
-      );
+  return (
+    isBuildSystemFile(filePath) &&
+    // These build system files are involved in the compilation/bundling and
+    // are likely to affect the runtime as well.
+    (filePath.startsWith('build-system/babel-plugins') ||
+      filePath.startsWith('build-system/runner'))
+  );
 }
 
 /**
@@ -101,9 +103,12 @@ function isValidatorFile(filePath) {
 
   // Validator files take the form of validator-.*\.(html|out|protoascii)
   const name = path.basename(filePath);
-  return name.startsWith('validator-') &&
-      (name.endsWith('.out') || name.endsWith('.html') ||
-        name.endsWith('.protoascii'));
+  return (
+    name.startsWith('validator-') &&
+    (name.endsWith('.out') ||
+      name.endsWith('.html') ||
+      name.endsWith('.protoascii'))
+  );
 }
 
 /**
@@ -131,9 +136,11 @@ function isDocFile(filePath) {
  */
 function isVisualDiffFile(filePath) {
   const filename = path.basename(filePath);
-  return (filename == 'visual-diff.js' ||
-          filename == 'visual-tests' ||
-          filePath.startsWith('examples/visual-tests/'));
+  return (
+    filename == 'visual-diff.js' ||
+    filename == 'visual-tests' ||
+    filePath.startsWith('examples/visual-tests/')
+  );
 }
 
 /**
@@ -155,8 +162,10 @@ function isUnitTest(filePath) {
  * @return {boolean}
  */
 function isDevDashboardFile(filePath) {
-  return (filePath === 'build-system/app.js' ||
-  filePath.startsWith('build-system/app-index/'));
+  return (
+    filePath === 'build-system/app.js' ||
+    filePath.startsWith('build-system/app-index/')
+  );
 }
 
 /**
@@ -178,7 +187,7 @@ function isIntegrationTest(filePath) {
  */
 function isFlagConfig(filePath) {
   const filename = path.basename(filePath);
-  return (filename == 'prod-config.json' || filename == 'canary-config.json');
+  return filename == 'prod-config.json' || filename == 'canary-config.json';
 }
 
 /**
@@ -191,17 +200,23 @@ function isFlagConfig(filePath) {
 function areValidBuildTargets(buildTargets, fileName) {
   const files = gitDiffNameOnlyMaster();
   if (buildTargets.has('FLAG_CONFIG') && buildTargets.has('RUNTIME')) {
-    console.log(fileName, colors.red('ERROR:'),
-        'Looks like your PR contains',
-        colors.cyan('{prod|canary}-config.json'),
-        'in addition to some other files.  Config and code are not kept in',
-        'sync, and config needs to be backwards compatible with code for at',
-        'least two weeks.  See #8188');
+    console.log(
+      fileName,
+      colors.red('ERROR:'),
+      'Looks like your PR contains',
+      colors.cyan('{prod|canary}-config.json'),
+      'in addition to some other files.  Config and code are not kept in',
+      'sync, and config needs to be backwards compatible with code for at',
+      'least two weeks.  See #8188'
+    );
     const nonFlagConfigFiles = files.filter(file => !isFlagConfig(file));
     const fileLogPrefix = colors.bold(colors.yellow(`${fileName}:`));
-    console.log(fileLogPrefix, colors.red('ERROR:'),
-        'Please move these files to a separate PR:',
-        colors.cyan(nonFlagConfigFiles.join(', ')));
+    console.log(
+      fileLogPrefix,
+      colors.red('ERROR:'),
+      'Please move these files to a separate PR:',
+      colors.cyan(nonFlagConfigFiles.join(', '))
+    );
     return false;
   }
   return true;
@@ -226,7 +241,8 @@ function determineBuildTargets() {
       'INTEGRATION_TEST',
       'DOCS',
       'FLAG_CONFIG',
-      'VISUAL_DIFF']);
+      'VISUAL_DIFF',
+    ]);
   }
   const targetSet = new Set();
   for (const p of filePaths) {
diff --git a/build-system/pr-check/build.js b/build-system/pr-check/build.js
index c0f1ab404898..a913293fe3d7 100644
--- a/build-system/pr-check/build.js
+++ b/build-system/pr-check/build.js
@@ -38,15 +38,16 @@ const {runYarnChecks} = require('./yarn-checks');
 
 const FILENAME = 'build.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
-
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
   const buildTargets = determineBuildTargets();
-  if (!runYarnChecks(FILENAME) ||
-      !areValidBuildTargets(buildTargets, FILENAME)) {
+  if (
+    !runYarnChecks(FILENAME) ||
+    !areValidBuildTargets(buildTargets, FILENAME)
+  ) {
     stopTimer(FILENAME, FILENAME, startTime);
     process.exitCode = 1;
     return;
@@ -58,20 +59,24 @@ function main() {
     uploadBuildOutput(FILENAME);
   } else {
     printChangeSummary(FILENAME);
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('UNIT_TEST') ||
-        buildTargets.has('INTEGRATION_TEST') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('FLAG_CONFIG') ||
-        buildTargets.has('VISUAL_DIFF')) {
-
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('UNIT_TEST') ||
+      buildTargets.has('INTEGRATION_TEST') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('FLAG_CONFIG') ||
+      buildTargets.has('VISUAL_DIFF')
+    ) {
       timedExecOrDie('gulp update-packages');
       timedExecOrDie('gulp build --fortesting');
       uploadBuildOutput(FILENAME);
     } else {
-      console.log(`${FILELOGPREFIX} Skipping ` + colors.cyan('Build ') +
+      console.log(
+        `${FILELOGPREFIX} Skipping ` +
+          colors.cyan('Build ') +
           'because this commit does not affect the runtime, build system, ' +
-          'test files, or visual diff files');
+          'test files, or visual diff files'
+      );
     }
   }
 
diff --git a/build-system/pr-check/checks.js b/build-system/pr-check/checks.js
index cb970c88ef50..c53bbaca5c2d 100644
--- a/build-system/pr-check/checks.js
+++ b/build-system/pr-check/checks.js
@@ -26,18 +26,19 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 const {reportAllExpectedTests} = require('../tasks/runtime-test/status-report');
 
 const FILENAME = 'checks.js';
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function runCommonChecks() {
-  timedExecOrDie('gulp presubmit');
   timedExecOrDie('gulp lint');
+  timedExecOrDie('gulp presubmit');
   timedExecOrDie('gulp ava');
   timedExecOrDie('node node_modules/jest/bin/jest.js');
   timedExecOrDie('gulp caches-json');
@@ -69,8 +70,7 @@ function main() {
       timedExecOrDie('gulp dev-dashboard-tests');
     }
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM')) {
+    if (buildTargets.has('RUNTIME') || buildTargets.has('BUILD_SYSTEM')) {
       timedExecOrDie('gulp dep-check');
       timedExecOrDie('gulp check-types');
     }
diff --git a/build-system/pr-check/dist-bundle-size.js b/build-system/pr-check/dist-bundle-size.js
index c90099c57272..d85ce4cf73b4 100644
--- a/build-system/pr-check/dist-bundle-size.js
+++ b/build-system/pr-check/dist-bundle-size.js
@@ -39,15 +39,16 @@ const {runYarnChecks} = require('./yarn-checks');
 
 const FILENAME = 'dist-bundle-size.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
-
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
   const buildTargets = determineBuildTargets();
-  if (!runYarnChecks(FILENAME) ||
-      !areValidBuildTargets(buildTargets, FILENAME)) {
+  if (
+    !runYarnChecks(FILENAME) ||
+    !areValidBuildTargets(buildTargets, FILENAME)
+  ) {
     stopTimer(FILENAME, FILENAME, startTime);
     process.exitCode = 1;
     return;
@@ -60,21 +61,25 @@ function main() {
     uploadDistOutput(FILENAME);
   } else {
     printChangeSummary(FILENAME);
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('UNIT_TEST') ||
-        buildTargets.has('INTEGRATION_TEST') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('FLAG_CONFIG')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('UNIT_TEST') ||
+      buildTargets.has('INTEGRATION_TEST') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('FLAG_CONFIG')
+    ) {
       timedExecOrDie('gulp update-packages');
       timedExecOrDie('gulp dist --fortesting');
       timedExecOrDie('gulp bundle-size --on_pr_build');
       uploadDistOutput(FILENAME);
     } else {
       timedExecOrDie('gulp bundle-size --on_skipped_build');
-      console.log(`${FILELOGPREFIX} Skipping ` +
+      console.log(
+        `${FILELOGPREFIX} Skipping ` +
           colors.cyan('Dist, Bundle Size ') +
           'because this commit does not affect the runtime, build system, ' +
-          'test files, or visual diff files');
+          'test files, or visual diff files'
+      );
     }
   }
 
diff --git a/build-system/pr-check/e2e-tests.js b/build-system/pr-check/e2e-tests.js
index b8269b5595eb..609316b7e94f 100644
--- a/build-system/pr-check/e2e-tests.js
+++ b/build-system/pr-check/e2e-tests.js
@@ -28,14 +28,15 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'e2e-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 async function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -47,21 +48,24 @@ async function main() {
     timedExecOrDie('gulp e2e --nobuild --headless');
   } else {
     printChangeSummary(FILENAME);
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('UNIT_TEST') ||
-        buildTargets.has('INTEGRATION_TEST') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('FLAG_CONFIG') ||
-        buildTargets.has('VISUAL_DIFF')) {
-
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('UNIT_TEST') ||
+      buildTargets.has('INTEGRATION_TEST') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('FLAG_CONFIG') ||
+      buildTargets.has('VISUAL_DIFF')
+    ) {
       downloadBuildOutput(FILENAME);
       timedExecOrDie('gulp update-packages');
       timedExecOrDie('gulp e2e --nobuild --headless');
     } else {
-      console.log(`${FILELOGPREFIX} Skipping ` +
+      console.log(
+        `${FILELOGPREFIX} Skipping ` +
           colors.cyan('End to End Tests ') +
           'because this commit does not affect the runtime, build system, ' +
-          'test files, or visual diff files');
+          'test files, or visual diff files'
+      );
     }
   }
   stopTimer(FILENAME, FILENAME, startTime);
diff --git a/build-system/pr-check/local-tests.js b/build-system/pr-check/local-tests.js
index 132cfb921a71..c4a2371df82f 100644
--- a/build-system/pr-check/local-tests.js
+++ b/build-system/pr-check/local-tests.js
@@ -27,15 +27,15 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'local-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
-
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -49,34 +49,46 @@ function main() {
   } else {
     printChangeSummary(FILENAME);
 
-    if (!(buildTargets.has('RUNTIME') ||
-          buildTargets.has('BUILD_SYSTEM') ||
-          buildTargets.has('UNIT_TEST') ||
-          buildTargets.has('INTEGRATION_TEST'))) {
+    if (
+      !(
+        buildTargets.has('RUNTIME') ||
+        buildTargets.has('BUILD_SYSTEM') ||
+        buildTargets.has('UNIT_TEST') ||
+        buildTargets.has('INTEGRATION_TEST')
+      )
+    ) {
       console.log(
-          `${FILELOGPREFIX} Skipping ` + colors.cyan('Local Tests ') +
+        `${FILELOGPREFIX} Skipping ` +
+          colors.cyan('Local Tests ') +
           'because this commit not affect the runtime, build system, ' +
-          'unit test files, or integration test files.');
+          'unit test files, or integration test files.'
+      );
       stopTimer(FILENAME, FILENAME, startTime);
       return;
     }
     downloadBuildOutput(FILENAME);
     timedExecOrDie('gulp update-packages');
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('UNIT_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('UNIT_TEST')
+    ) {
       timedExecOrDie('gulp test --unit --nobuild --headless --local-changes');
     }
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('INTEGRATION_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('INTEGRATION_TEST')
+    ) {
       timedExecOrDie('gulp test --integration --nobuild --headless --coverage');
     }
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('UNIT_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('UNIT_TEST')
+    ) {
       timedExecOrDie('gulp test --unit --nobuild --headless --coverage');
     }
   }
diff --git a/build-system/pr-check/remote-tests.js b/build-system/pr-check/remote-tests.js
index 6c101aed6570..7bbd74da9e9e 100644
--- a/build-system/pr-check/remote-tests.js
+++ b/build-system/pr-check/remote-tests.js
@@ -29,15 +29,15 @@ const {
   stopTimer,
   startSauceConnect,
   stopSauceConnect,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'remote-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
-
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 async function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -54,15 +54,20 @@ async function main() {
     stopSauceConnect(FILENAME);
   } else {
     printChangeSummary(FILENAME);
-    if (!(buildTargets.has('RUNTIME') ||
-          buildTargets.has('BUILD_SYSTEM') ||
-          buildTargets.has('UNIT_TEST') ||
-          buildTargets.has('INTEGRATION_TEST'))) {
+    if (
+      !(
+        buildTargets.has('RUNTIME') ||
+        buildTargets.has('BUILD_SYSTEM') ||
+        buildTargets.has('UNIT_TEST') ||
+        buildTargets.has('INTEGRATION_TEST')
+      )
+    ) {
       console.log(
-          `${FILELOGPREFIX} Skipping ` +
+        `${FILELOGPREFIX} Skipping ` +
           colors.cyan('Remote (Sauce Labs) Tests ') +
           'because this commit does not affect the runtime, ' +
-          'build system, or integration test files.');
+          'build system, or integration test files.'
+      );
       stopTimer(FILENAME, FILENAME, startTime);
       return;
     }
@@ -70,17 +75,22 @@ async function main() {
     timedExecOrDie('gulp update-packages');
     await startSauceConnect(FILENAME);
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('UNIT_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('UNIT_TEST')
+    ) {
       timedExecOrDie('gulp test --unit --nobuild --saucelabs_lite');
     }
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('INTEGRATION_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('INTEGRATION_TEST')
+    ) {
       timedExecOrDie(
-          'gulp test --integration --nobuild --compiled --saucelabs');
+        'gulp test --integration --nobuild --compiled --saucelabs'
+      );
     }
     stopSauceConnect(FILENAME);
   }
diff --git a/build-system/pr-check/single-pass-tests.js b/build-system/pr-check/single-pass-tests.js
index c0edd5655f02..354bff5a8968 100644
--- a/build-system/pr-check/single-pass-tests.js
+++ b/build-system/pr-check/single-pass-tests.js
@@ -26,15 +26,15 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'single-pass-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
-
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -43,22 +43,30 @@ function main() {
   if (!isTravisPullRequestBuild()) {
     timedExecOrDie('gulp update-packages');
     timedExecOrDie('gulp dist --fortesting --single_pass --pseudo_names');
-    timedExecOrDie('gulp test --integration ' +
-        '--nobuild --compiled --single_pass --headless');
+    timedExecOrDie(
+      'gulp test --integration ' +
+        '--nobuild --compiled --single_pass --headless'
+    );
   } else {
     printChangeSummary(FILENAME);
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('INTEGRATION_TEST')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('INTEGRATION_TEST')
+    ) {
       timedExecOrDie('gulp update-packages');
       timedExecOrDie('gulp dist --fortesting --single_pass --pseudo_names');
-      timedExecOrDie('gulp test --integration ' +
-          '--nobuild --compiled --single_pass --headless');
+      timedExecOrDie(
+        'gulp test --integration ' +
+          '--nobuild --compiled --single_pass --headless'
+      );
     } else {
-      console.log(`${FILELOGPREFIX} Skipping ` +
+      console.log(
+        `${FILELOGPREFIX} Skipping ` +
           colors.cyan('Single Pass Tests ') +
           'because this commit does not affect the runtime, build system, ' +
-          'or integration test files.');
+          'or integration test files.'
+      );
     }
   }
 
diff --git a/build-system/pr-check/utils.js b/build-system/pr-check/utils.js
index 509af2bfb292..e1f274059d91 100644
--- a/build-system/pr-check/utils.js
+++ b/build-system/pr-check/utils.js
@@ -26,19 +26,25 @@ const {
   gitTravisMasterBaseline,
   shortSha,
 } = require('../git');
+const {
+  isTravisBuild,
+  travisBuildNumber,
+  travisPullRequestSha,
+} = require('../travis');
 const {execOrDie, exec} = require('../exec');
-const {isTravisBuild, travisBuildNumber, travisPullRequestSha} = require('../travis');
 
-const BUILD_OUTPUT_FILE =
-    isTravisBuild() ? `amp_build_${travisBuildNumber()}.zip` : '';
-const DIST_OUTPUT_FILE =
-    isTravisBuild() ? `amp_dist_${travisBuildNumber()}.zip` : '';
+const BUILD_OUTPUT_FILE = isTravisBuild()
+  ? `amp_build_${travisBuildNumber()}.zip`
+  : '';
+const DIST_OUTPUT_FILE = isTravisBuild()
+  ? `amp_dist_${travisBuildNumber()}.zip`
+  : '';
 const OUTPUT_DIRS = 'build/ dist/ dist.3p/ EXTENSIONS_CSS_MAP';
 const OUTPUT_STORAGE_LOCATION = 'gs://amp-travis-builds';
 const OUTPUT_STORAGE_KEY_FILE = 'sa-travis-key.json';
 const OUTPUT_STORAGE_PROJECT_ID = 'amp-travis-build-storage';
 const OUTPUT_STORAGE_SERVICE_ACCOUNT =
-    'sa-travis@amp-travis-build-storage.iam.gserviceaccount.com';
+  'sa-travis@amp-travis-build-storage.iam.gserviceaccount.com';
 
 /**
  * Prints a summary of files changed by, and commits included in the PR.
@@ -50,24 +56,27 @@ function printChangeSummary(fileName) {
 
   if (isTravisBuild()) {
     console.log(
-        `${fileLogPrefix} ${colors.cyan('origin/master')} is currently at ` +
-        `commit ${colors.cyan(shortSha(gitTravisMasterBaseline()))}`);
+      `${fileLogPrefix} ${colors.cyan('origin/master')} is currently at ` +
+        `commit ${colors.cyan(shortSha(gitTravisMasterBaseline()))}`
+    );
     commitSha = travisPullRequestSha();
   } else {
     commitSha = gitCommitHash();
   }
   console.log(
-      `${fileLogPrefix} Testing the following changes at commit ` +
-      `${colors.cyan(shortSha(commitSha))}`);
+    `${fileLogPrefix} Testing the following changes at commit ` +
+      `${colors.cyan(shortSha(commitSha))}`
+  );
 
   const filesChanged = gitDiffStatMaster();
   console.log(filesChanged);
 
   const branchPoint = gitMergeBaseMaster();
   console.log(
-      `${fileLogPrefix} Commit log since branch ` +
+    `${fileLogPrefix} Commit log since branch ` +
       `${colors.cyan(gitBranchName())} was forked from ` +
-      `${colors.cyan('master')} at ${colors.cyan(shortSha(branchPoint))}:`);
+      `${colors.cyan('master')} at ${colors.cyan(shortSha(branchPoint))}:`
+  );
   console.log(gitDiffCommitLog() + '\n');
 }
 
@@ -77,12 +86,17 @@ function printChangeSummary(fileName) {
  */
 async function startSauceConnect(functionName) {
   process.env['SAUCE_USERNAME'] = 'amphtml';
-  const response = await requestPromise('https://amphtml-sauce-token-dealer.appspot.com/getJwtToken');
+  const response = await requestPromise(
+    'https://amphtml-sauce-token-dealer.appspot.com/getJwtToken'
+  );
   process.env['SAUCE_ACCESS_KEY'] = response.trim();
   const startScCmd = 'build-system/sauce_connect/start_sauce_connect.sh';
   const fileLogPrefix = colors.bold(colors.yellow(`${functionName}:`));
-  console.log('\n' + fileLogPrefix,
-      'Starting Sauce Connect Proxy:', colors.cyan(startScCmd));
+  console.log(
+    '\n' + fileLogPrefix,
+    'Starting Sauce Connect Proxy:',
+    colors.cyan(startScCmd)
+  );
   execOrDie(startScCmd);
 }
 
@@ -93,8 +107,11 @@ async function startSauceConnect(functionName) {
 function stopSauceConnect(functionName) {
   const stopScCmd = 'build-system/sauce_connect/stop_sauce_connect.sh';
   const fileLogPrefix = colors.bold(colors.yellow(`${functionName}:`));
-  console.log('\n' + fileLogPrefix,
-      'Stopping Sauce Connect Proxy:', colors.cyan(stopScCmd));
+  console.log(
+    '\n' + fileLogPrefix,
+    'Stopping Sauce Connect Proxy:',
+    colors.cyan(stopScCmd)
+  );
   execOrDie(stopScCmd);
 }
 
@@ -108,7 +125,10 @@ function startTimer(functionName, fileName) {
   const startTime = Date.now();
   const fileLogPrefix = colors.bold(colors.yellow(`${fileName}:`));
   console.log(
-      '\n' + fileLogPrefix, 'Running', colors.cyan(functionName) + '...');
+    '\n' + fileLogPrefix,
+    'Running',
+    colors.cyan(functionName) + '...'
+  );
   return startTime;
 }
 
@@ -123,11 +143,15 @@ function stopTimer(functionName, fileName, startTime) {
   const endTime = Date.now();
   const executionTime = endTime - startTime;
   const mins = Math.floor(executionTime / 60000);
-  const secs = Math.floor(executionTime % 60000 / 1000);
+  const secs = Math.floor((executionTime % 60000) / 1000);
   const fileLogPrefix = colors.bold(colors.yellow(`${fileName}:`));
   console.log(
-      fileLogPrefix, 'Done running', colors.cyan(functionName),
-      'Total time:', colors.green(mins + 'm ' + secs + 's'));
+    fileLogPrefix,
+    'Done running',
+    colors.cyan(functionName),
+    'Total time:',
+    colors.green(mins + 'm ' + secs + 's')
+  );
 }
 
 /**
@@ -163,19 +187,21 @@ function timedExecOrDie(cmd, fileName = 'utils.js') {
  */
 async function downloadOutput_(functionName, outputFileName) {
   const fileLogPrefix = colors.bold(colors.yellow(`${functionName}:`));
-  const buildOutputDownloadUrl =
-    `${OUTPUT_STORAGE_LOCATION}/${outputFileName}`;
+  const buildOutputDownloadUrl = `${OUTPUT_STORAGE_LOCATION}/${outputFileName}`;
 
   console.log(
-      `${fileLogPrefix} Downloading build output from ` +
-      colors.cyan(buildOutputDownloadUrl) + '...');
+    `${fileLogPrefix} Downloading build output from ` +
+      colors.cyan(buildOutputDownloadUrl) +
+      '...'
+  );
   exec('echo travis_fold:start:download_results && echo');
   authenticateWithStorageLocation_();
   execOrDie(`gsutil cp ${buildOutputDownloadUrl} ${outputFileName}`);
   exec('echo travis_fold:end:download_results');
 
   console.log(
-      `${fileLogPrefix} Extracting ` + colors.cyan(outputFileName) + '...');
+    `${fileLogPrefix} Extracting ` + colors.cyan(outputFileName) + '...'
+  );
   exec('echo travis_fold:start:unzip_results && echo');
   execOrDie(`unzip -o ${outputFileName}`);
   exec('echo travis_fold:end:unzip_results');
@@ -196,16 +222,23 @@ async function uploadOutput_(functionName, outputFileName) {
   const fileLogPrefix = colors.bold(colors.yellow(`${functionName}:`));
 
   console.log(
-      `\n${fileLogPrefix} Compressing ` +
+    `\n${fileLogPrefix} Compressing ` +
       colors.cyan(OUTPUT_DIRS.split(' ').join(', ')) +
-      ' into ' + colors.cyan(outputFileName) + '...');
+      ' into ' +
+      colors.cyan(outputFileName) +
+      '...'
+  );
   exec('echo travis_fold:start:zip_results && echo');
   execOrDie(`zip -r ${outputFileName} ${OUTPUT_DIRS}`);
   exec('echo travis_fold:end:zip_results');
 
   console.log(
-      `${fileLogPrefix} Uploading ` + colors.cyan(outputFileName) + ' to ' +
-      colors.cyan(OUTPUT_STORAGE_LOCATION) + '...');
+    `${fileLogPrefix} Uploading ` +
+      colors.cyan(outputFileName) +
+      ' to ' +
+      colors.cyan(OUTPUT_STORAGE_LOCATION) +
+      '...'
+  );
   exec('echo travis_fold:start:upload_results && echo');
   authenticateWithStorageLocation_();
   execOrDie(`gsutil -m cp -r ${outputFileName} ${OUTPUT_STORAGE_LOCATION}`);
@@ -214,8 +247,10 @@ async function uploadOutput_(functionName, outputFileName) {
 
 function authenticateWithStorageLocation_() {
   decryptTravisKey_();
-  execOrDie('gcloud auth activate-service-account ' +
-  `--key-file ${OUTPUT_STORAGE_KEY_FILE}`);
+  execOrDie(
+    'gcloud auth activate-service-account ' +
+      `--key-file ${OUTPUT_STORAGE_KEY_FILE}`
+  );
   execOrDie(`gcloud config set account ${OUTPUT_STORAGE_SERVICE_ACCOUNT}`);
   execOrDie('gcloud config set pass_credentials_to_gsutil true');
   execOrDie(`gcloud config set project ${OUTPUT_STORAGE_PROJECT_ID}`);
@@ -261,8 +296,10 @@ function decryptTravisKey_() {
   // -md sha256 is required due to encryption differences between
   // openssl 1.1.1a, which was used to encrypt the key, and
   // openssl 1.0.2g, which is used by Travis to decrypt.
-  execOrDie(`openssl aes-256-cbc -md sha256 -k ${process.env.GCP_TOKEN} -in ` +
-      `build-system/sa-travis-key.json.enc -out ${OUTPUT_STORAGE_KEY_FILE} -d`);
+  execOrDie(
+    `openssl aes-256-cbc -md sha256 -k ${process.env.GCP_TOKEN} -in ` +
+      `build-system/sa-travis-key.json.enc -out ${OUTPUT_STORAGE_KEY_FILE} -d`
+  );
 }
 
 module.exports = {
diff --git a/build-system/pr-check/validator-tests.js b/build-system/pr-check/validator-tests.js
index a7746e8f163c..0d3160a54ea3 100644
--- a/build-system/pr-check/validator-tests.js
+++ b/build-system/pr-check/validator-tests.js
@@ -26,14 +26,15 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'validator-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -46,25 +47,31 @@ function main() {
     printChangeSummary(FILENAME);
     let ranTests = false;
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('VALIDATOR')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('VALIDATOR')
+    ) {
       timedExecOrDie('gulp validator');
       ranTests = true;
     }
 
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('VALIDATOR_WEBUI')) {
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('VALIDATOR_WEBUI')
+    ) {
       timedExecOrDie('gulp validator-webui');
       ranTests = true;
     }
 
     if (!ranTests) {
       console.log(
-          `${FILELOGPREFIX} Skipping ` + colors.cyan('Validator Tests ') +
+        `${FILELOGPREFIX} Skipping ` +
+          colors.cyan('Validator Tests ') +
           'because this commit does not affect the runtime, build system, ' +
-          'validator, or validator web UI.');
+          'validator, or validator web UI.'
+      );
     }
   }
 
diff --git a/build-system/pr-check/visual-diff-tests.js b/build-system/pr-check/visual-diff-tests.js
index 2ff344349b16..21e7d95747e8 100644
--- a/build-system/pr-check/visual-diff-tests.js
+++ b/build-system/pr-check/visual-diff-tests.js
@@ -28,14 +28,15 @@ const {
   printChangeSummary,
   startTimer,
   stopTimer,
-  timedExecOrDie: timedExecOrDieBase} = require('./utils');
+  timedExecOrDie: timedExecOrDieBase,
+} = require('./utils');
 const {determineBuildTargets} = require('./build-targets');
 const {isTravisPullRequestBuild} = require('../travis');
 
 const FILENAME = 'visual-diff-tests.js';
 const FILELOGPREFIX = colors.bold(colors.yellow(`${FILENAME}:`));
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 function main() {
   const startTime = startTimer(FILENAME, FILENAME);
@@ -49,22 +50,25 @@ function main() {
   } else {
     printChangeSummary(FILENAME);
     process.env['PERCY_TOKEN'] = atob(process.env.PERCY_TOKEN_ENCODED);
-    if (buildTargets.has('RUNTIME') ||
-        buildTargets.has('BUILD_SYSTEM') ||
-        buildTargets.has('INTEGRATION_TEST') ||
-        buildTargets.has('VISUAL_DIFF') ||
-        buildTargets.has('FLAG_CONFIG')) {
-
+    if (
+      buildTargets.has('RUNTIME') ||
+      buildTargets.has('BUILD_SYSTEM') ||
+      buildTargets.has('INTEGRATION_TEST') ||
+      buildTargets.has('VISUAL_DIFF') ||
+      buildTargets.has('FLAG_CONFIG')
+    ) {
       downloadBuildOutput(FILENAME);
       timedExecOrDie('gulp update-packages');
       timedExecOrDie('gulp visual-diff --nobuild');
     } else {
       timedExecOrDie('gulp visual-diff --nobuild --empty');
       console.log(
-          `${FILELOGPREFIX} Skipping ` + colors.cyan('Visual Diff Tests ') +
+        `${FILELOGPREFIX} Skipping ` +
+          colors.cyan('Visual Diff Tests ') +
           'because this commit does not affect the ' +
           'runtime, build system, integration test files, ' +
-          'visual diff test files, or flag config files.');
+          'visual diff test files, or flag config files.'
+      );
     }
   }
 
diff --git a/build-system/pr-check/yarn-checks.js b/build-system/pr-check/yarn-checks.js
index bd67e1532f67..38713f26c80e 100644
--- a/build-system/pr-check/yarn-checks.js
+++ b/build-system/pr-check/yarn-checks.js
@@ -34,19 +34,34 @@ function isYarnLockFileInSync(fileName = 'yarn-checks.js') {
   const fileLogPrefix = colors.bold(colors.yellow(`${fileName}:`));
   const yarnIntegrityCheck = getStderr('yarn check --integrity').trim();
   if (yarnIntegrityCheck.includes('error')) {
-    console.error(fileLogPrefix, colors.red('ERROR:'),
-        'Found the following', colors.cyan('yarn'), 'errors:\n' +
-        colors.cyan(yarnIntegrityCheck));
-    console.error(fileLogPrefix, colors.red('ERROR:'),
-        'Updates to', colors.cyan('package.json'),
-        'must be accompanied by a corresponding update to',
-        colors.cyan('yarn.lock'));
-    console.error(fileLogPrefix, colors.yellow('NOTE:'),
-        'To update', colors.cyan('yarn.lock'), 'after changing',
-        colors.cyan('package.json') + ',', 'run',
-        '"' + colors.cyan('yarn install') + '"',
-        'and include the updated', colors.cyan('yarn.lock'),
-        'in your PR.');
+    console.error(
+      fileLogPrefix,
+      colors.red('ERROR:'),
+      'Found the following',
+      colors.cyan('yarn'),
+      'errors:\n' + colors.cyan(yarnIntegrityCheck)
+    );
+    console.error(
+      fileLogPrefix,
+      colors.red('ERROR:'),
+      'Updates to',
+      colors.cyan('package.json'),
+      'must be accompanied by a corresponding update to',
+      colors.cyan('yarn.lock')
+    );
+    console.error(
+      fileLogPrefix,
+      colors.yellow('NOTE:'),
+      'To update',
+      colors.cyan('yarn.lock'),
+      'after changing',
+      colors.cyan('package.json') + ',',
+      'run',
+      '"' + colors.cyan('yarn install') + '"',
+      'and include the updated',
+      colors.cyan('yarn.lock'),
+      'in your PR.'
+    );
     return false;
   }
   return true;
@@ -62,12 +77,20 @@ function isYarnLockFileProperlyUpdated(fileName = 'yarn-checks.js') {
   const fileLogPrefix = colors.bold(colors.yellow(`${fileName}:`));
 
   if (localChanges.includes('yarn.lock')) {
-    console.error(fileLogPrefix, colors.red('ERROR:'),
-        'This PR did not properly update', colors.cyan('yarn.lock') + '.');
-    console.error(fileLogPrefix, colors.yellow('NOTE:'),
-        'To fix this, sync your branch to', colors.cyan('upstream/master') +
-        ', run', colors.cyan('gulp update-packages') +
-        ', and push a new commit containing the changes.');
+    console.error(
+      fileLogPrefix,
+      colors.red('ERROR:'),
+      'This PR did not properly update',
+      colors.cyan('yarn.lock') + '.'
+    );
+    console.error(
+      fileLogPrefix,
+      colors.yellow('NOTE:'),
+      'To fix this, sync your branch to',
+      colors.cyan('upstream/master') + ', run',
+      colors.cyan('gulp update-packages') +
+        ', and push a new commit containing the changes.'
+    );
     console.error(fileLogPrefix, 'Expected changes:');
     console.log(localChanges);
     return false;
@@ -81,8 +104,9 @@ function isYarnLockFileProperlyUpdated(fileName = 'yarn-checks.js') {
  * @return {boolean}
  */
 function runYarnChecks(filename) {
-  return isYarnLockFileInSync(filename) &&
-      isYarnLockFileProperlyUpdated(filename);
+  return (
+    isYarnLockFileInSync(filename) && isYarnLockFileProperlyUpdated(filename)
+  );
 }
 
 module.exports = {
diff --git a/build-system/recaptcha-router.js b/build-system/recaptcha-router.js
index 1b273ba3a931..64837f0d16dc 100644
--- a/build-system/recaptcha-router.js
+++ b/build-system/recaptcha-router.js
@@ -33,7 +33,10 @@ window.grecaptcha = {
 const recaptchaFrameRequestHandler = (req, res, next) => {
   if (global.AMP_TESTING) {
     fs.readFileAsync(pc.cwd() + req.path, 'utf8').then(file => {
-      file = file.replace(/initRecaptcha\(.*\)/g, 'initRecaptcha("/recaptcha/mock.js?sitekey=")');
+      file = file.replace(
+        /initRecaptcha\(.*\)/g,
+        'initRecaptcha("/recaptcha/mock.js?sitekey=")'
+      );
       res.end(file);
     });
   } else {
@@ -45,34 +48,31 @@ recaptchaRouter.get('/mock.js', (req, res) => {
   res.end(recaptchaMock);
 });
 
-recaptchaRouter.post(
-    '/submit',
-    upload.array(),
-    (req, res) => {
-      cors.enableCors(req, res);
+recaptchaRouter.post('/submit', upload.array(), (req, res) => {
+  cors.enableCors(req, res);
 
-      const responseJson = {
-        message: 'Success!',
-      };
+  const responseJson = {
+    message: 'Success!',
+  };
 
-      Object.keys(req.body).forEach(bodyKey => {
-        responseJson[bodyKey] = req.body[bodyKey];
-      });
+  Object.keys(req.body).forEach(bodyKey => {
+    responseJson[bodyKey] = req.body[bodyKey];
+  });
 
-      const containsRecaptchaInResponse = Object.keys(responseJson)
-          .some(responseJsonKey => {
-            return responseJsonKey.toLowerCase().includes('recaptcha');
-          });
-
-      if (containsRecaptchaInResponse) {
-        res.status(200).json(responseJson);
-      } else {
-        res.status(400).json({
-          message: 'Did not include a recaptcha token',
-        });
-      }
+  const containsRecaptchaInResponse = Object.keys(responseJson).some(
+    responseJsonKey => {
+      return responseJsonKey.toLowerCase().includes('recaptcha');
     }
-);
+  );
+
+  if (containsRecaptchaInResponse) {
+    res.status(200).json(responseJson);
+  } else {
+    res.status(400).json({
+      message: 'Did not include a recaptcha token',
+    });
+  }
+});
 
 module.exports = {
   recaptchaFrameRequestHandler,
diff --git a/build-system/routes/list.js b/build-system/routes/list.js
index da5f0bd03867..9fdb868951f4 100644
--- a/build-system/routes/list.js
+++ b/build-system/routes/list.js
@@ -48,8 +48,9 @@ router.get('/search/countries', function(req, res) {
   if (req.query.hasOwnProperty('q')) {
     const query = req.query.q.toLowerCase();
 
-    filtered = countries.items
-        .filter(country => country.name.toLowerCase().startsWith(query));
+    filtered = countries.items.filter(country =>
+      country.name.toLowerCase().startsWith(query)
+    );
   }
 
   const results = {
@@ -76,10 +77,14 @@ const squareImgUrl = width => {
 const randomFalsy = () => {
   const rand = randInt(4);
   switch (rand) {
-    case 1: return null;
-    case 2: return undefined;
-    case 3: return '';
-    default: return false;
+    case 1:
+      return null;
+    case 2:
+      return undefined;
+    case 3:
+      return '';
+    default:
+      return false;
   }
 };
 
@@ -108,8 +113,9 @@ const generateResults = (category, count = 2) => {
   }
 
   r.items = items;
-  r['load-more-src'] =
-      `/list/infinite-scroll-random/${category}?${randInt(10000)}`;
+  r['load-more-src'] = `/list/infinite-scroll-random/${category}?${randInt(
+    10000
+  )}`;
 
   return r;
 };
@@ -146,15 +152,18 @@ router.get('/infinite-scroll', function(req, res) {
 
   const items = generateJson(numberOfItems, pagesLeft);
 
-  const nextUrl = '/list/infinite-scroll?items=' +
-    numberOfItems + '&left=' + (pagesLeft - 1) +
-    '&latency=' + latency;
+  const nextUrl =
+    '/list/infinite-scroll?items=' +
+    numberOfItems +
+    '&left=' +
+    (pagesLeft - 1) +
+    '&latency=' +
+    latency;
   const next = pagesLeft == 0 ? randomFalsy() : nextUrl;
-  const results = next === false ? {items}
-    : {items, next,
-      'loadMoreButtonText': 'test',
-      'loadMoreEndText': 'end',
-    };
+  const results =
+    next === false
+      ? {items}
+      : {items, next, 'loadMoreButtonText': 'test', 'loadMoreEndText': 'end'};
 
   if (latency) {
     setTimeout(() => res.json(results), latency);
@@ -178,8 +187,11 @@ router.get('/infinite-scroll-state', function(req, res) {
   const numberOfItems = query['items'] || 2;
   const pagesLeft = query['left'] || 0;
   const items = generateJsonWithState(numberOfItems, pagesLeft);
-  const next = '/list/infinite-scroll-state?left=' + (pagesLeft - 1)
-      + '&items=' + numberOfItems;
+  const next =
+    '/list/infinite-scroll-state?left=' +
+    (pagesLeft - 1) +
+    '&items=' +
+    numberOfItems;
   const results = {
     items,
     next,
diff --git a/build-system/scope-require.js b/build-system/scope-require.js
index a19cabd75d48..d814217d3dfc 100644
--- a/build-system/scope-require.js
+++ b/build-system/scope-require.js
@@ -39,9 +39,10 @@ function scopeRequire(src, scopeName) {
   const flatGlobals = globals.reduce((acc, g) => acc.concat(g.nodes), []);
 
   flatGlobals
-      .filter(node => isIdentifier(node) && isRequire(node))
-      .forEach(node =>
-        replaceIdentifier(node.parent, test => test === node, scopeName));
+    .filter(node => isIdentifier(node) && isRequire(node))
+    .forEach(node =>
+      replaceIdentifier(node.parent, test => test === node, scopeName)
+    );
 
   return escodegen.generate(ast, {format: {compact: true}});
 }
@@ -102,35 +103,44 @@ function createMemberNode(identifierNode, scopeName) {
   };
 }
 
-
 program
-    .description('Scope global `require` calls to an object.')
-    .option('-i, --infile [filename]', 'The path of the input file.' +
-        ' Reads from stdin if unspecified')
-    .option('-o, --outfile [filename]', 'The path for the output file.' +
-        ' Writes to stdout if unspecified.')
-    .option('-n --name [name]', 'The name to reference `require` calls from.' +
-        ' The default is `AMP`', 'AMP')
-    .parse(process.argv);
+  .description('Scope global `require` calls to an object.')
+  .option(
+    '-i, --infile [filename]',
+    'The path of the input file. Reads from stdin if unspecified'
+  )
+  .option(
+    '-o, --outfile [filename]',
+    'The path for the output file. Writes to stdout if unspecified.'
+  )
+  .option(
+    '-n --name [name]',
+    'The name to reference `require` calls from. The default is `AMP`',
+    'AMP'
+  )
+  .parse(process.argv);
 
-const inputStream = (program.infile && program.infile !== '-' ?
-  fs.createReadStream(program.infile) :
-  process.stdin);
+const inputStream =
+  program.infile && program.infile !== '-'
+    ? fs.createReadStream(program.infile)
+    : process.stdin;
 inputStream.on('error', err => {
-  console./*OK*/error(colors.red('\nError reading file: ' + err.path));
+  console./*OK*/ error(colors.red('\nError reading file: ' + err.path));
 });
 
-const outputStream = (program.outfile && program.outfile !== '-' ?
-  fs.createWriteStream(program.outfile) :
-  process.stdout);
+const outputStream =
+  program.outfile && program.outfile !== '-'
+    ? fs.createWriteStream(program.outfile)
+    : process.stdout;
 outputStream.on('error', err => {
-  console./*OK*/error(colors.red('\nError writing file: ' + err.path));
+  console./*OK*/ error(colors.red('\nError writing file: ' + err.path));
 });
 
 const scopeRequireStream = es.map((inputFile, cb) =>
-  cb(null, scopeRequire(inputFile.toString('utf8'), program.name)));
+  cb(null, scopeRequire(inputFile.toString('utf8'), program.name))
+);
 
 inputStream
-    .pipe(es.wait())
-    .pipe(scopeRequireStream)
-    .pipe(outputStream);
+  .pipe(es.wait())
+  .pipe(scopeRequireStream)
+  .pipe(outputStream);
diff --git a/build-system/server.js b/build-system/server.js
index deeb8811893c..32d8888bcb92 100644
--- a/build-system/server.js
+++ b/build-system/server.js
@@ -36,15 +36,19 @@ const {
 const useHttps = process.env.SERVE_USEHTTPS == 'true';
 const quiet = process.env.SERVE_QUIET == 'true';
 const sendCachingHeaders = process.env.SERVE_CACHING_HEADERS == 'true';
-const noCachingExtensions = process.env.SERVE_EXTENSIONS_WITHOUT_CACHING ==
-    'true';
+const noCachingExtensions =
+  process.env.SERVE_EXTENSIONS_WITHOUT_CACHING == 'true';
 const header = require('connect-header');
 
 // Exit if the port is in use.
 process.on('uncaughtException', function(err) {
   if (err.errno === 'EADDRINUSE') {
-    log(colors.red('ERROR:'), 'Port', colors.cyan(port),
-        'in use, shutting down server');
+    log(
+      colors.red('ERROR:'),
+      'Port',
+      colors.cyan(port),
+      'in use, shutting down server'
+    );
   } else {
     log(colors.red(err));
   }
@@ -65,9 +69,11 @@ if (!quiet) {
 }
 middleware.push(app);
 if (sendCachingHeaders) {
-  middleware.push(header({
-    'cache-control': ' max-age=600',
-  }));
+  middleware.push(
+    header({
+      'cache-control': ' max-age=600',
+    })
+  );
 }
 
 if (noCachingExtensions) {
@@ -81,11 +87,12 @@ if (noCachingExtensions) {
 }
 
 // Start gulp webserver
-gulp.src(process.cwd())
-    .pipe(webserver({
-      port,
-      host,
-      directoryListing: true,
-      https: useHttps,
-      middleware,
-    }));
+gulp.src(process.cwd()).pipe(
+  webserver({
+    port,
+    host,
+    directoryListing: true,
+    https: useHttps,
+    middleware,
+  })
+);
diff --git a/build-system/shadow-viewer.js b/build-system/shadow-viewer.js
index 9713cb01a46d..559ae56a5d8d 100644
--- a/build-system/shadow-viewer.js
+++ b/build-system/shadow-viewer.js
@@ -144,21 +144,21 @@ const SCRIPT = `
 };
 `;
 
-
 const renderShadowViewer = ({src, baseHref, port = 8000}) =>
-  html`<!doctype html>
-  <html>
-    <head>
-      <base href="${baseHref}">
-      <title>Shadow Viewer</title>
-      <script>
-        ${SCRIPT}
-      </script>
-            <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
-    <body style="padding: 0; margin: 0">
-      <amp-viewer src="http://localhost:${port}/${src}"></amp-viewer>
-    </body>
-  </html>`;
-
+  html`
+    <!DOCTYPE html>
+    <html>
+      <head>
+        <base href="${baseHref}" />
+        <title>Shadow Viewer</title>
+        <script>
+          ${SCRIPT};
+        </script>
+              <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+      <body style="padding: 0; margin: 0">
+        <amp-viewer src="http://localhost:${port}/${src}"></amp-viewer>
+      </body>
+    </html>
+  `;
 
 module.exports = {renderShadowViewer};
diff --git a/build-system/tasks/ava.js b/build-system/tasks/ava.js
index c89db06fa926..04635c17c2a7 100644
--- a/build-system/tasks/ava.js
+++ b/build-system/tasks/ava.js
@@ -23,12 +23,13 @@ const {isTravisBuild} = require('../travis');
  * Runs ava tests.
  */
 function ava() {
-  return gulp.src([
-    require.resolve('./csvify-size/test.js'),
-    require.resolve('./get-zindex/test.js'),
-    require.resolve('./prepend-global/test.js'),
-  ])
-      .pipe(gulpAva({silent: isTravisBuild()}));
+  return gulp
+    .src([
+      require.resolve('./csvify-size/test.js'),
+      require.resolve('./get-zindex/test.js'),
+      require.resolve('./prepend-global/test.js'),
+    ])
+    .pipe(gulpAva({silent: isTravisBuild()}));
 }
 
 module.exports = {
diff --git a/build-system/tasks/build.js b/build-system/tasks/build.js
index 69ab3ef4d780..669a592dad93 100644
--- a/build-system/tasks/build.js
+++ b/build-system/tasks/build.js
@@ -31,7 +31,6 @@ const {maybeUpdatePackages} = require('./update-packages');
 const {parseExtensionFlags} = require('./extension-helpers');
 const {serve} = require('./serve');
 
-
 /**
  * Enables watching for file changes in css, extensions.
  * @return {!Promise}
@@ -108,16 +107,15 @@ watch.flags = {
   with_inabox: '  Also watch and build the amp-inabox.js binary.',
   with_shadow: '  Also watch and build the amp-shadow.js binary.',
   extensions: '  Watches and builds only the listed extensions.',
-  extensions_from: '  Watches and builds only the extensions from the ' +
-      'listed AMP(s).',
+  extensions_from:
+    '  Watches and builds only the extensions from the listed AMP(s).',
   noextensions: '  Watches and builds with no extensions.',
 };
 
 defaultTask.description = 'Runs "watch" and then "serve"';
 defaultTask.flags = {
   extensions: '  Watches and builds only the listed extensions.',
-  extensions_from: '  Watches and builds only the extensions from the ' +
-      'listed AMP(s).',
+  extensions_from:
+    '  Watches and builds only the extensions from the listed AMP(s).',
   noextensions: '  Watches and builds with no extensions.',
 };
-
diff --git a/build-system/tasks/bundle-size.js b/build-system/tasks/bundle-size.js
index f7ed3655ff91..cdcfe81adac0 100644
--- a/build-system/tasks/bundle-size.js
+++ b/build-system/tasks/bundle-size.js
@@ -69,21 +69,32 @@ function getGzippedBundleSize() {
  */
 function storeBundleSize() {
   if (!isTravisPushBuild()) {
-    log(yellow('Skipping'), cyan('--on_push_build') + ':',
-        'this action can only be performed on `push` builds on Travis');
+    log(
+      yellow('Skipping'),
+      cyan('--on_push_build') + ':',
+      'this action can only be performed on `push` builds on Travis'
+    );
     return;
   }
 
   if (travisRepoSlug() !== expectedGitHubRepoSlug) {
-    log(yellow('Skipping'), cyan('--on_push_build') + ':',
-        'this action can only be performed on Travis builds on the',
-        cyan(expectedGitHubRepoSlug), 'repository');
+    log(
+      yellow('Skipping'),
+      cyan('--on_push_build') + ':',
+      'this action can only be performed on Travis builds on the',
+      cyan(expectedGitHubRepoSlug),
+      'repository'
+    );
     return;
   }
 
   if (!process.env.GITHUB_ARTIFACTS_RW_TOKEN) {
-    log(red('ERROR: Missing GITHUB_ARTIFACTS_RW_TOKEN, cannot store the ' +
-        'bundle size in the artifacts repository on GitHub!'));
+    log(
+      red(
+        'ERROR: Missing GITHUB_ARTIFACTS_RW_TOKEN, cannot store the ' +
+          'bundle size in the artifacts repository on GitHub!'
+      )
+    );
     process.exitCode = 1;
     return;
   }
@@ -98,23 +109,43 @@ function storeBundleSize() {
     auth: `token ${process.env.GITHUB_ARTIFACTS_RW_TOKEN}`,
   });
 
-  return octokit.repos.getContents(githubApiCallOptions).then(() => {
-    log('The file', cyan(`bundle-size/${commitHash}`), 'already exists in the',
-        'build artifacts repository on GitHub. Skipping...');
-  }).catch(() => {
-    return octokit.repos.createFile(Object.assign(githubApiCallOptions, {
-      message: `bundle-size: ${commitHash} (${bundleSize})`,
-      content: Buffer.from(bundleSize).toString('base64'),
-    })).then(() => {
-      log('Stored the new bundle size of', cyan(bundleSize), 'in the artifacts',
-          'repository on GitHub');
-    }).catch(error => {
-      log(red(`ERROR: Failed to create the bundle-size/${commitHash} file in`),
-          red('the build artifacts repository on GitHub!'));
-      log(red('Error message was:'), error.message);
-      process.exitCode = 1;
+  return octokit.repos
+    .getContents(githubApiCallOptions)
+    .then(() => {
+      log(
+        'The file',
+        cyan(`bundle-size/${commitHash}`),
+        'already exists in the',
+        'build artifacts repository on GitHub. Skipping...'
+      );
+    })
+    .catch(() => {
+      return octokit.repos
+        .createFile(
+          Object.assign(githubApiCallOptions, {
+            message: `bundle-size: ${commitHash} (${bundleSize})`,
+            content: Buffer.from(bundleSize).toString('base64'),
+          })
+        )
+        .then(() => {
+          log(
+            'Stored the new bundle size of',
+            cyan(bundleSize),
+            'in the artifacts',
+            'repository on GitHub'
+          );
+        })
+        .catch(error => {
+          log(
+            red(
+              `ERROR: Failed to create the bundle-size/${commitHash} file in`
+            ),
+            red('the build artifacts repository on GitHub!')
+          );
+          log(red('Error message was:'), error.message);
+          process.exitCode = 1;
+        });
     });
-  });
 }
 
 /**
@@ -124,12 +155,16 @@ async function skipBundleSize() {
   if (isTravisPullRequestBuild()) {
     const commitHash = gitCommitHash();
     try {
-      const response = await requestPost(url.resolve(bundleSizeAppBaseUrl,
-          path.join('commit', commitHash, 'skip')));
+      const response = await requestPost(
+        url.resolve(
+          bundleSizeAppBaseUrl,
+          path.join('commit', commitHash, 'skip')
+        )
+      );
       if (response.statusCode < 200 || response.statusCode >= 300) {
         throw new Error(
-            `${response.statusCode} ${response.statusMessage}: ` +
-            response.body);
+          `${response.statusCode} ${response.statusMessage}: ` + response.body
+        );
       }
     } catch (error) {
       log(red('Could not report a skipped pull request'));
@@ -138,8 +173,12 @@ async function skipBundleSize() {
       return;
     }
   } else {
-    log(yellow('Not marking this pull request to skip because that can only be '
-               + 'done on Travis'));
+    log(
+      yellow(
+        'Not marking this pull request to skip because that can only be ' +
+          'done on Travis'
+      )
+    );
   }
 }
 
@@ -153,8 +192,10 @@ async function reportBundleSize() {
     const commitHash = gitCommitHash();
     try {
       const response = await requestPost({
-        uri: url.resolve(bundleSizeAppBaseUrl,
-            path.join('commit', commitHash, 'report')),
+        uri: url.resolve(
+          bundleSizeAppBaseUrl,
+          path.join('commit', commitHash, 'report')
+        ),
         json: true,
         body: {
           baseSha,
@@ -163,8 +204,8 @@ async function reportBundleSize() {
       });
       if (response.statusCode < 200 || response.statusCode >= 300) {
         throw new Error(
-            `${response.statusCode} ${response.statusMessage}: ` +
-            response.body);
+          `${response.statusCode} ${response.statusMessage}: ` + response.body
+        );
       }
     } catch (error) {
       log(red('Could not report the bundle size of this pull request'));
@@ -173,8 +214,12 @@ async function reportBundleSize() {
       return;
     }
   } else {
-    log(yellow('Not reporting the bundle size of this pull request because '
-               + 'that can only be done on Travis'));
+    log(
+      yellow(
+        'Not reporting the bundle size of this pull request because ' +
+          'that can only be done on Travis'
+      )
+    );
   }
 }
 
@@ -196,12 +241,13 @@ module.exports = {
 };
 
 bundleSize.description =
-    'Checks if the minified AMP binary has exceeded its size cap';
+  'Checks if the minified AMP binary has exceeded its size cap';
 bundleSize.flags = {
-  'on_push_build': '  Store bundle size in AMP build artifacts repo '
-      + '(also implies --on_pr_build)',
-  'on_pr_build': '  Report the bundle size of this pull request to '
-      + 'GitHub',
-  'on_skipped_build': '  Set the status of this pull request\'s bundle '
-      + 'size check in GitHub to `skipped`',
+  'on_push_build':
+    '  Store bundle size in AMP build artifacts repo ' +
+    '(also implies --on_pr_build)',
+  'on_pr_build': '  Report the bundle size of this pull request to GitHub',
+  'on_skipped_build':
+    "  Set the status of this pull request's bundle " +
+    'size check in GitHub to `skipped`',
 };
diff --git a/build-system/tasks/changelog.js b/build-system/tasks/changelog.js
index c6d09487813e..2bfc1662a4ef 100644
--- a/build-system/tasks/changelog.js
+++ b/build-system/tasks/changelog.js
@@ -100,12 +100,20 @@ let PrMetadataDef;
 
 async function changelog() {
   if (!GITHUB_ACCESS_TOKEN) {
-    log(colors.red('Warning! You have not set the ' +
-        'GITHUB_ACCESS_TOKEN env var. Aborting "changelog" task.'));
-    log(colors.green('See https://help.github.com/articles/' +
-        'creating-an-access-token-for-command-line-use/ ' +
-        'for instructions on how to create a github access token. We only ' +
-        'need `public_repo` scope.'));
+    log(
+      colors.red(
+        'Warning! You have not set the ' +
+          'GITHUB_ACCESS_TOKEN env var. Aborting "changelog" task.'
+      )
+    );
+    log(
+      colors.green(
+        'See https://help.github.com/articles/' +
+          'creating-an-access-token-for-command-line-use/ ' +
+          'for instructions on how to create a github access token. We only ' +
+          'need `public_repo` scope.'
+      )
+    );
     return;
   }
 
@@ -127,25 +135,24 @@ function getGitMetadata() {
     branch: undefined,
   };
   return getLastProdReleasedGitTag(gitMetadata)
-      .then(getCurrentBranchName)
-      .then(getGitLog)
-      .then(getGithubPullRequestsMetadata)
-      .then(getGithubFilesMetadata)
-      .then(getLastGitTag)
-      .then(buildChangelog)
-      .then(function(gitMetadata) {
-        log(colors.blue('\n' + gitMetadata.changelog));
-        if (isDryrun) {
-          return;
-        }
-        return getCurrentSha().then(
-            submitReleaseNotes.bind(null, argv.tag, gitMetadata.changelog)
-        );
-      })
-      .catch(errHandler);
+    .then(getCurrentBranchName)
+    .then(getGitLog)
+    .then(getGithubPullRequestsMetadata)
+    .then(getGithubFilesMetadata)
+    .then(getLastGitTag)
+    .then(buildChangelog)
+    .then(function(gitMetadata) {
+      log(colors.blue('\n' + gitMetadata.changelog));
+      if (isDryrun) {
+        return;
+      }
+      return getCurrentSha().then(
+        submitReleaseNotes.bind(null, argv.tag, gitMetadata.changelog)
+      );
+    })
+    .catch(errHandler);
 }
 
-
 /**
  * Get the last git tag this current HEAD bases off of from.
  *
@@ -234,39 +241,45 @@ function buildChangelog(gitMetadata) {
   let changelog = `## Version: ${argv.tag}\n\n`;
 
   if (gitMetadata.baseTag) {
-    changelog += `## Baseline: [${gitMetadata.baseTag}]` +
-        '(https://github.com/ampproject/amphtml/releases/' +
-        `tag/${gitMetadata.baseTag})\n\n`;
+    changelog +=
+      `## Baseline: [${gitMetadata.baseTag}]` +
+      '(https://github.com/ampproject/amphtml/releases/' +
+      `tag/${gitMetadata.baseTag})\n\n`;
   }
 
   // Append all titles
-  changelog += gitMetadata.logs.filter(function(log) {
-    const {pr} = log;
-    if (!pr) {
-      return true;
-    }
-    // Ignore PRs that are just all docs changes.
-    return !pr.filenames.every(function(filename) {
-      return config.changelogIgnoreFileTypes.test(filename);
-    });
-  }).map(function(log) {
-    const {pr} = log;
-    if (!pr) {
-      return '  - ' + log.title;
-    }
-    return `  - ${pr.title.trim()} (#${pr.id})`;
-  }).join('\n');
+  changelog += gitMetadata.logs
+    .filter(function(log) {
+      const {pr} = log;
+      if (!pr) {
+        return true;
+      }
+      // Ignore PRs that are just all docs changes.
+      return !pr.filenames.every(function(filename) {
+        return config.changelogIgnoreFileTypes.test(filename);
+      });
+    })
+    .map(function(log) {
+      const {pr} = log;
+      if (!pr) {
+        return '  - ' + log.title;
+      }
+      return `  - ${pr.title.trim()} (#${pr.id})`;
+    })
+    .join('\n');
   changelog += '\n\n## Breakdown by component\n\n';
   const sections = buildSections(gitMetadata);
 
-  Object.keys(sections).sort().forEach(function(section) {
-    changelog += `<details>\n<summary>${section}</summary>\n`;
-    const uniqueItems = sections[section].filter(function(title, idx) {
-      return sections[section].indexOf(title) == idx;
+  Object.keys(sections)
+    .sort()
+    .forEach(function(section) {
+      changelog += `<details>\n<summary>${section}</summary>\n`;
+      const uniqueItems = sections[section].filter(function(title, idx) {
+        return sections[section].indexOf(title) == idx;
+      });
+      changelog += uniqueItems.join('');
+      changelog += '</details>\n';
     });
-    changelog += uniqueItems.join('');
-    changelog += '</details>\n';
-  });
 
   gitMetadata.changelog = changelog;
   return gitMetadata;
@@ -352,15 +365,21 @@ function getLastProdReleasedGitTag(gitMetadata) {
  * @return {!Promise<GitMetadataDef>}
  */
 function getGitLog(gitMetadata) {
-  const args = `log ${gitMetadata.branch}...${gitMetadata.tag} ` +
-      '--pretty=oneline --first-parent';
+  const args =
+    `log ${gitMetadata.branch}...${gitMetadata.tag} ` +
+    '--pretty=oneline --first-parent';
   const options = {args};
   return gitExec(options).then(function(logs) {
     if (!logs) {
-      throw new Error('No logs found "git log ' + gitMetadata.branch + '...' +
-          gitMetadata.tag + '".\nIs it possible that there is no delta?\n' +
+      throw new Error(
+        'No logs found "git log ' +
+          gitMetadata.branch +
+          '...' +
+          gitMetadata.tag +
+          '".\nIs it possible that there is no delta?\n' +
           'Make sure to fetch and rebase (or reset --hard) the latest ' +
-          'from remote upstream.');
+          'from remote upstream.'
+      );
     }
     const commits = logs.split('\n').filter(log => !!log.length);
     gitMetadata.logs = commits.map(log => {
@@ -383,31 +402,31 @@ function getGithubPullRequestsMetadata(gitMetadata) {
     getClosedPullRequests(2),
     getClosedPullRequests(3),
   ])
-      .then(requests => [].concat.apply([], requests))
-      .then(prs => {
-        gitMetadata.prs = prs;
-        const githubPrRequest = gitMetadata.logs.map(log => {
-          const pr = prs.filter(pr => pr.merge_commit_sha == log.sha)[0];
-          if (pr) {
-            log.pr = buildPrMetadata(pr);
-          } else if (isPrIdInTitle(log.title)) {
-            const id = getPrIdFromCommit(log.title);
-            const prOptions = extend({}, pullOptions);
-            prOptions.url += `/${id}`;
-            const fileOptions = extend({}, prOptions);
-            fileOptions.url += '/files';
-            // If we couldn't find the matching pull request from 3 pages
-            // of closed pull request try and fetch it through the id
-            // if we can retrieve it from the commit message (only available
-            // through github merge).
-            return getPullRequest(prOptions, log);
-          }
-          return BBPromise.resolve();
-        });
-        return BBPromise.all(githubPrRequest).then(() => {
-          return gitMetadata;
-        });
+    .then(requests => [].concat.apply([], requests))
+    .then(prs => {
+      gitMetadata.prs = prs;
+      const githubPrRequest = gitMetadata.logs.map(log => {
+        const pr = prs.filter(pr => pr.merge_commit_sha == log.sha)[0];
+        if (pr) {
+          log.pr = buildPrMetadata(pr);
+        } else if (isPrIdInTitle(log.title)) {
+          const id = getPrIdFromCommit(log.title);
+          const prOptions = extend({}, pullOptions);
+          prOptions.url += `/${id}`;
+          const fileOptions = extend({}, prOptions);
+          fileOptions.url += '/files';
+          // If we couldn't find the matching pull request from 3 pages
+          // of closed pull request try and fetch it through the id
+          // if we can retrieve it from the commit message (only available
+          // through github merge).
+          return getPullRequest(prOptions, log);
+        }
+        return BBPromise.resolve();
       });
+      return BBPromise.all(githubPrRequest).then(() => {
+        return gitMetadata;
+      });
+    });
 }
 
 /**
@@ -476,8 +495,10 @@ function getPullRequestFiles(filesOption, pr) {
   return request(filesOption).then(function(res) {
     const body = JSON.parse(res.body);
 
-    assert(Array.isArray(body) && body.length > 0,
-        'Pull request response must not be empty. ' + res.body);
+    assert(
+      Array.isArray(body) && body.length > 0,
+      'Pull request response must not be empty. ' + res.body
+    );
     const filenames = body.map(function(file) {
       return file.filename;
     });
@@ -501,7 +522,7 @@ function errHandler(err) {
  * @return {boolean}
  */
 function isPrIdInTitle(str) {
-  return str./* OK*/indexOf('Merge pull request #') == 0;
+  return str./* OK*/ indexOf('Merge pull request #') == 0;
 }
 
 /**
@@ -522,10 +543,9 @@ function getPrIdFromCommit(commit) {
  * @return {boolean}
  */
 function isJs(str) {
-  return str./* OK*/endsWith('.js');
+  return str./* OK*/ endsWith('.js');
 }
 
-
 /**
  * @param {!JSONValue} pr
  * @return {!PrMetadata}
@@ -542,12 +562,20 @@ function buildPrMetadata(pr) {
 
 async function changelogUpdate() {
   if (!GITHUB_ACCESS_TOKEN) {
-    log(colors.red('Warning! You have not set the ' +
-        'GITHUB_ACCESS_TOKEN env var. Aborting "changelog" task.'));
-    log(colors.green('See https://help.github.com/articles/' +
-        'creating-an-access-token-for-command-line-use/ ' +
-        'for instructions on how to create a github access token. We only ' +
-        'need `public_repo` scope.'));
+    log(
+      colors.red(
+        'Warning! You have not set the ' +
+          'GITHUB_ACCESS_TOKEN env var. Aborting "changelog" task.'
+      )
+    );
+    log(
+      colors.green(
+        'See https://help.github.com/articles/' +
+          'creating-an-access-token-for-command-line-use/ ' +
+          'for instructions on how to create a github access token. We only ' +
+          'need `public_repo` scope.'
+      )
+    );
     return;
   }
   if (!argv.message) {
@@ -557,8 +585,9 @@ async function changelogUpdate() {
 }
 
 function update() {
-  const url = 'https://api.github.com/repos/ampproject/amphtml/releases/tags/' +
-      `${argv.tag}`;
+  const url =
+    'https://api.github.com/repos/ampproject/amphtml/releases/tags/' +
+    `${argv.tag}`;
   const tagsOptions = {
     url,
     method: 'GET',
@@ -600,12 +629,13 @@ function update() {
     } else {
       releasesOptions.body.body = argv.message + release.body;
     }
-    return request(releasesOptions).then(() => {
-      log(colors.green('Update Successful.'));
-    })
-        .catch(e => {
-          log(colors.red('Update Failed. ' + e.message));
-        });
+    return request(releasesOptions)
+      .then(() => {
+        log(colors.green('Update Successful.'));
+      })
+      .catch(e => {
+        log(colors.red('Update Failed. ' + e.message));
+      });
   });
 }
 
@@ -621,8 +651,9 @@ changelog.flags = {
   tag: '  The git tag and github release label',
 };
 
-changelogUpdate.description = 'Update github release. Ex. prepend ' +
-    'canary percentage changes to release';
+changelogUpdate.description =
+  'Update github release. Ex. prepend ' +
+  'canary percentage changes to release';
 changelogUpdate.flags = {
   dryrun: '  Generate changelog but dont push it out',
   tag: '  The git tag and github release label',
diff --git a/build-system/tasks/check-links.js b/build-system/tasks/check-links.js
index bc56d3133282..e0e77fd03ae4 100644
--- a/build-system/tasks/check-links.js
+++ b/build-system/tasks/check-links.js
@@ -51,60 +51,65 @@ async function checkLinks() {
   const linkCheckers = markdownFiles.map(function(markdownFile) {
     return runLinkChecker(markdownFile);
   });
-  return BBPromise.all(linkCheckers)
-      .then(function(allResults) {
-        let deadLinksFound = false;
-        const filesWithDeadLinks = [];
-        allResults.map(function(results, index) {
-          // Skip files that were deleted by the PR.
-          if (!fs.existsSync(markdownFiles[index])) {
-            return;
-          }
-          let deadLinksFoundInFile = false;
-          results.forEach(function(result) {
-            // Skip links to files that were introduced by the PR.
-            if (isLinkToFileIntroducedByPR(result.link)) {
-              return;
-            }
-            if (result.status === 'dead') {
-              deadLinksFound = true;
-              deadLinksFoundInFile = true;
-              log('[%s] %s', colors.red('✖'), result.link);
-            } else if (!isTravisBuild()) {
-              log('[%s] %s', colors.green('✔'), result.link);
-            }
-          });
-          if (deadLinksFoundInFile) {
-            filesWithDeadLinks.push(markdownFiles[index]);
-            log(
-                colors.red('ERROR'),
-                'Possible dead link(s) found in',
-                colors.magenta(markdownFiles[index]));
-          } else {
-            log(
-                colors.green('SUCCESS'),
-                'All links in',
-                colors.magenta(markdownFiles[index]), 'are alive.');
-          }
-        });
-        if (deadLinksFound) {
-          log(
-              colors.red('ERROR'),
-              'Please update dead link(s) in',
-              colors.magenta(filesWithDeadLinks.join(',')),
-              'or whitelist them in build-system/tasks/check-links.js');
-          log(
-              colors.yellow('NOTE'),
-              'If the link(s) above are not meant to resolve to a real webpage',
-              'surrounding them with backticks will exempt them from the link',
-              'checker.');
-          process.exit(1);
-        } else {
-          log(
-              colors.green('SUCCESS'),
-              'All links in all markdown files in this branch are alive.');
+  return BBPromise.all(linkCheckers).then(function(allResults) {
+    let deadLinksFound = false;
+    const filesWithDeadLinks = [];
+    allResults.map(function(results, index) {
+      // Skip files that were deleted by the PR.
+      if (!fs.existsSync(markdownFiles[index])) {
+        return;
+      }
+      let deadLinksFoundInFile = false;
+      results.forEach(function(result) {
+        // Skip links to files that were introduced by the PR.
+        if (isLinkToFileIntroducedByPR(result.link)) {
+          return;
+        }
+        if (result.status === 'dead') {
+          deadLinksFound = true;
+          deadLinksFoundInFile = true;
+          log('[%s] %s', colors.red('✖'), result.link);
+        } else if (!isTravisBuild()) {
+          log('[%s] %s', colors.green('✔'), result.link);
         }
       });
+      if (deadLinksFoundInFile) {
+        filesWithDeadLinks.push(markdownFiles[index]);
+        log(
+          colors.red('ERROR'),
+          'Possible dead link(s) found in',
+          colors.magenta(markdownFiles[index])
+        );
+      } else {
+        log(
+          colors.green('SUCCESS'),
+          'All links in',
+          colors.magenta(markdownFiles[index]),
+          'are alive.'
+        );
+      }
+    });
+    if (deadLinksFound) {
+      log(
+        colors.red('ERROR'),
+        'Please update dead link(s) in',
+        colors.magenta(filesWithDeadLinks.join(',')),
+        'or whitelist them in build-system/tasks/check-links.js'
+      );
+      log(
+        colors.yellow('NOTE'),
+        'If the link(s) above are not meant to resolve to a real webpage',
+        'surrounding them with backticks will exempt them from the link',
+        'checker.'
+      );
+      process.exit(1);
+    } else {
+      log(
+        colors.green('SUCCESS'),
+        'All links in all markdown files in this branch are alive.'
+      );
+    }
+  });
 }
 
 /**
@@ -115,7 +120,7 @@ async function checkLinks() {
  */
 function isLinkToFileIntroducedByPR(link) {
   return gitDiffAddedNameOnlyMaster().some(function(file) {
-    return (file.length > 0 && link.includes(path.parse(file).base));
+    return file.length > 0 && link.includes(path.parse(file).base);
   });
 }
 
@@ -129,8 +134,10 @@ function filterWhitelistedLinks(markdown) {
   let filteredMarkdown = markdown;
 
   // localhost links optionally preceded by ( or [ (not served on Travis)
-  filteredMarkdown =
-      filteredMarkdown.replace(/(\(|\[)?http:\/\/localhost:8000/g, '');
+  filteredMarkdown = filteredMarkdown.replace(
+    /(\(|\[)?http:\/\/localhost:8000/g,
+    ''
+  );
 
   // Links in script tags (illustrative, and not always valid)
   filteredMarkdown = filteredMarkdown.replace(/src="http.*?"/g, '');
@@ -143,11 +150,15 @@ function filterWhitelistedLinks(markdown) {
 
   // The heroku nightly build page is not always acccessible by the checker.
   filteredMarkdown = filteredMarkdown.replace(
-      /\(http:\/\/amphtml-nightly\.herokuapp\.com\/\)/g, '');
+    /\(http:\/\/amphtml-nightly\.herokuapp\.com\/\)/g,
+    ''
+  );
 
   // The Googlebot help page is currently only available to signed-in users.
   filteredMarkdown = filteredMarkdown.replace(
-      /\(https:\/\/support\.google\.com\/webmasters\/answer\/182072\)/g, '');
+    /\(https:\/\/support\.google\.com\/webmasters\/answer\/182072\)/g,
+    ''
+  );
 
   // After all whitelisting is done, clean up any remaining empty blocks bounded
   // by backticks. Otherwise, `` will be treated as the start of a code block
@@ -172,7 +183,7 @@ function runLinkChecker(markdownFile) {
   const markdown = fs.readFileSync(markdownFile).toString();
   const filteredMarkdown = filterWhitelistedLinks(markdown);
   const opts = {
-    baseUrl: 'file://' + path.dirname(path.resolve((markdownFile))),
+    baseUrl: 'file://' + path.dirname(path.resolve(markdownFile)),
   };
   return markdownLinkCheck(filteredMarkdown, opts);
 }
diff --git a/build-system/tasks/check-types.js b/build-system/tasks/check-types.js
index 82be2d3ae456..b6cee3968cdd 100644
--- a/build-system/tasks/check-types.js
+++ b/build-system/tasks/check-types.js
@@ -15,8 +15,12 @@
  */
 
 const log = require('fancy-log');
+const {
+  closureNailgunPort,
+  startNailgunServer,
+  stopNailgunServer,
+} = require('./nailgun');
 const {cleanupBuildDir, closureCompile} = require('../compile/compile');
-const {closureNailgunPort, startNailgunServer, stopNailgunServer} = require('./nailgun');
 const {compileCss} = require('./css');
 const {createCtrlcHandler, exitCtrlcHandler} = require('../ctrlcHandler');
 const {extensions, maybeInitializeExtensions} = require('./extension-helpers');
@@ -44,59 +48,88 @@ async function checkTypes() {
   const extensionValues = Object.keys(extensions).map(function(key) {
     return extensions[key];
   });
-  const extensionSrcs = extensionValues.filter(function(extension) {
-    return !extension.noTypeCheck;
-  }).map(function(extension) {
-    return './extensions/' + extension.name + '/' +
-        extension.version + '/' + extension.name + '.js';
-  }).sort();
+  const extensionSrcs = extensionValues
+    .filter(function(extension) {
+      return !extension.noTypeCheck;
+    })
+    .map(function(extension) {
+      return (
+        './extensions/' +
+        extension.name +
+        '/' +
+        extension.version +
+        '/' +
+        extension.name +
+        '.js'
+      );
+    })
+    .sort();
   return compileCss()
-      .then(async() => {
-        await startNailgunServer(closureNailgunPort, /* detached */ false);
-      })
-      .then(() => {
-        if (!isTravisBuild()) {
-          log('Checking types...');
-        }
-        return Promise.all([
-          closureCompile(compileSrcs.concat(extensionSrcs), './dist',
-              'check-types.js', {
-                include3pDirectories: true,
-                includePolyfills: true,
-                extraGlobs: ['src/inabox/*.js'],
-                typeCheckOnly: true,
-              }),
-          // Type check 3p/ads code.
-          closureCompile(['./3p/integration.js'], './dist',
-              'integration-check-types.js', {
-                externs: ['ads/ads.extern.js'],
-                include3pDirectories: true,
-                includePolyfills: true,
-                typeCheckOnly: true,
-              }),
-          closureCompile(['./3p/ampcontext-lib.js'], './dist',
-              'ampcontext-check-types.js', {
-                externs: ['ads/ads.extern.js'],
-                include3pDirectories: true,
-                includePolyfills: true,
-                typeCheckOnly: true,
-              }),
-          closureCompile(['./3p/iframe-transport-client-lib.js'], './dist',
-              'iframe-transport-client-check-types.js', {
-                externs: ['ads/ads.extern.js'],
-                include3pDirectories: true,
-                includePolyfills: true,
-                typeCheckOnly: true,
-              }),
-        ]);
-      }).then(() => {
-        if (isTravisBuild()) {
-          // New line after all the compilation progress dots on Travis.
-          console.log('\n');
-        }
-      }).then(async() => {
-        await stopNailgunServer(closureNailgunPort);
-      }).then(() => exitCtrlcHandler(handlerProcess));
+    .then(async () => {
+      await startNailgunServer(closureNailgunPort, /* detached */ false);
+    })
+    .then(() => {
+      if (!isTravisBuild()) {
+        log('Checking types...');
+      }
+      return Promise.all([
+        closureCompile(
+          compileSrcs.concat(extensionSrcs),
+          './dist',
+          'check-types.js',
+          {
+            include3pDirectories: true,
+            includePolyfills: true,
+            extraGlobs: ['src/inabox/*.js'],
+            typeCheckOnly: true,
+          }
+        ),
+        // Type check 3p/ads code.
+        closureCompile(
+          ['./3p/integration.js'],
+          './dist',
+          'integration-check-types.js',
+          {
+            externs: ['ads/ads.extern.js'],
+            include3pDirectories: true,
+            includePolyfills: true,
+            typeCheckOnly: true,
+          }
+        ),
+        closureCompile(
+          ['./3p/ampcontext-lib.js'],
+          './dist',
+          'ampcontext-check-types.js',
+          {
+            externs: ['ads/ads.extern.js'],
+            include3pDirectories: true,
+            includePolyfills: true,
+            typeCheckOnly: true,
+          }
+        ),
+        closureCompile(
+          ['./3p/iframe-transport-client-lib.js'],
+          './dist',
+          'iframe-transport-client-check-types.js',
+          {
+            externs: ['ads/ads.extern.js'],
+            include3pDirectories: true,
+            includePolyfills: true,
+            typeCheckOnly: true,
+          }
+        ),
+      ]);
+    })
+    .then(() => {
+      if (isTravisBuild()) {
+        // New line after all the compilation progress dots on Travis.
+        console.log('\n');
+      }
+    })
+    .then(async () => {
+      await stopNailgunServer(closureNailgunPort);
+    })
+    .then(() => exitCtrlcHandler(handlerProcess));
 }
 
 module.exports = {
diff --git a/build-system/tasks/clean.js b/build-system/tasks/clean.js
index 7877f7b461e5..05017d645eca 100644
--- a/build-system/tasks/clean.js
+++ b/build-system/tasks/clean.js
@@ -21,13 +21,7 @@ const del = require('del');
  * Clean up the build artifacts
  */
 async function clean() {
-  return del([
-    'dist',
-    'dist.3p',
-    'dist.tools',
-    'build',
-    '.amp-build',
-  ]);
+  return del(['dist', 'dist.3p', 'dist.tools', 'build', '.amp-build']);
 }
 
 module.exports = {
diff --git a/build-system/tasks/compile-expr.js b/build-system/tasks/compile-expr.js
index 19bca7ddacca..e771426bc847 100644
--- a/build-system/tasks/compile-expr.js
+++ b/build-system/tasks/compile-expr.js
@@ -36,18 +36,14 @@ function compileExpr(path, jisonFilename, imports, parserName, jsFilename) {
   const generator = new jison.Generator(bnf, settings);
   const jsModule = generator.generate(settings);
 
-  const license = fs.readFileSync(
-      'build-system/tasks/js-license.txt', 'utf8');
-  const suppressCheckTypes = '/** @fileoverview ' +
-      '@suppress {checkTypes, suspiciousCode, uselessCode} */';
+  const license = fs.readFileSync('build-system/tasks/js-license.txt', 'utf8');
+  const suppressCheckTypes =
+    '/** @fileoverview ' +
+    '@suppress {checkTypes, suspiciousCode, uselessCode} */';
   const jsExports = 'export const ' + parserName + ' = parser;';
 
-  const out = [
-    license,
-    suppressCheckTypes,
-    imports,
-    jsModule,
-    jsExports]
+  const out =
+    [license, suppressCheckTypes, imports, jsModule, jsExports]
       .join('\n\n')
       // Required in order to support babel 7, since 'token-stack: true' will
       // adversely affect lexer performance.
@@ -68,7 +64,7 @@ async function compileAccessExpr() {
 async function compileBindExpr() {
   const path = 'extensions/amp-bind/0.1/';
   const jisonFilename = 'bind-expr-impl.jison';
-  const imports = 'import {AstNode, AstNodeType} from \'./bind-expr-defines\';';
+  const imports = "import {AstNode, AstNodeType} from './bind-expr-defines';";
   const parserName = 'bindParser';
   const jsFilename = 'bind-expr-impl.js';
   compileExpr(path, jisonFilename, imports, parserName, jsFilename);
@@ -77,7 +73,7 @@ async function compileBindExpr() {
 async function compileCssExpr() {
   const path = 'extensions/amp-animation/0.1/parsers/';
   const jisonFilename = 'css-expr-impl.jison';
-  const imports = 'import * as ast from \'./css-expr-ast\';';
+  const imports = "import * as ast from './css-expr-ast';";
   const parserName = 'cssParser';
   const jsFilename = 'css-expr-impl.js';
   compileExpr(path, jisonFilename, imports, parserName, jsFilename);
diff --git a/build-system/tasks/create-module-compatible-es5-bundle.js b/build-system/tasks/create-module-compatible-es5-bundle.js
index 31053f36b6f7..3e55ad05f587 100644
--- a/build-system/tasks/create-module-compatible-es5-bundle.js
+++ b/build-system/tasks/create-module-compatible-es5-bundle.js
@@ -30,11 +30,18 @@ const sourcemaps = require('gulp-sourcemaps');
  * Changes `global?global:VARNAME}(this)` to `global?global:VARNAME}(self)`
  */
 function createModuleCompatibleES5Bundle(src) {
-  return gulp.src('dist/' + src)
-      .pipe(sourcemaps.init({loadMaps: true}))
-      .pipe(regexpSourcemaps(/(window.global\?window.global:\w*)this/, '$1self', 'module-global'))
-      .pipe(sourcemaps.write('./'))
-      .pipe(gulp.dest('dist'));
+  return gulp
+    .src('dist/' + src)
+    .pipe(sourcemaps.init({loadMaps: true}))
+    .pipe(
+      regexpSourcemaps(
+        /(window.global\?window.global:\w*)this/,
+        '$1self',
+        'module-global'
+      )
+    )
+    .pipe(sourcemaps.write('./'))
+    .pipe(gulp.dest('dist'));
 }
 
 module.exports = {
diff --git a/build-system/tasks/css.js b/build-system/tasks/css.js
index 9da7dad1260a..05db94632187 100644
--- a/build-system/tasks/css.js
+++ b/build-system/tasks/css.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 const file = require('gulp-file');
 const fs = require('fs-extra');
 const gulp = require('gulp');
@@ -75,15 +74,17 @@ function compileCss(watch, opt_compileAll) {
    * @return {Promise}
    */
   function writeCss(css, originalCssFilename, jsFilename, cssFilename) {
-    return toPromise(gulp.src(`css/${originalCssFilename}`)
-        .pipe(file(jsFilename, 'export const cssText = ' +
-          JSON.stringify(css)))
+    return toPromise(
+      gulp
+        .src(`css/${originalCssFilename}`)
+        .pipe(file(jsFilename, 'export const cssText = ' + JSON.stringify(css)))
         .pipe(gulp.dest('build'))
         .on('end', function() {
           mkdirSync('build');
           mkdirSync('build/css');
           fs.writeFileSync(`build/css/${cssFilename}`, css);
-        }));
+        })
+    );
   }
 
   /**
@@ -92,8 +93,9 @@ function compileCss(watch, opt_compileAll) {
    * @param {string} outCss
    */
   function writeCssEntryPoint(path, outJs, outCss) {
-    return jsifyCssAsync(`css/${path}`)
-        .then(css => writeCss(css, path, outJs, outCss));
+    return jsifyCssAsync(`css/${path}`).then(css =>
+      writeCss(css, path, outJs, outCss)
+    );
   }
 
   const startTime = Date.now();
@@ -101,7 +103,6 @@ function compileCss(watch, opt_compileAll) {
   // Used by `gulp test --local-changes` to map CSS files to JS files.
   fs.writeFileSync('EXTENSIONS_CSS_MAP', JSON.stringify(extensions));
 
-
   let promise = Promise.resolve();
 
   cssEntryPoints.forEach(entryPoint => {
@@ -109,13 +110,17 @@ function compileCss(watch, opt_compileAll) {
     promise = promise.then(() => writeCssEntryPoint(path, outJs, outCss));
   });
 
-  return promise.then(() => buildExtensions({
-    bundleOnlyIfListedInFiles: false,
-    compileOnlyCss: true,
-    compileAll: opt_compileAll,
-  })).then(() => {
-    endBuildStep('Recompiled all CSS files into', 'build/', startTime);
-  });
+  return promise
+    .then(() =>
+      buildExtensions({
+        bundleOnlyIfListedInFiles: false,
+        compileOnlyCss: true,
+        compileAll: opt_compileAll,
+      })
+    )
+    .then(() => {
+      endBuildStep('Recompiled all CSS files into', 'build/', startTime);
+    });
 }
 
 module.exports = {
diff --git a/build-system/tasks/csvify-size/index.js b/build-system/tasks/csvify-size/index.js
index 2b1941227bcf..d9375558c15b 100644
--- a/build-system/tasks/csvify-size/index.js
+++ b/build-system/tasks/csvify-size/index.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const BBPromise = require('bluebird');
 const childProcess = require('child_process');
 const exec = BBPromise.promisify(childProcess.exec);
@@ -23,7 +22,6 @@ const colors = require('ansi-colors');
 const fs = BBPromise.promisifyAll(require('fs'));
 const log = require('fancy-log');
 
-
 const prettyBytesUnits = ['B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
 
 /**
@@ -42,9 +40,7 @@ let FieldsDef;
 
 const filePath = 'test/size.txt';
 
-const tableHeaders = [
-  ['"datetime"'],
-];
+const tableHeaders = [['"datetime"']];
 
 const dateTimes = [];
 
@@ -53,8 +49,9 @@ const dateTimes = [];
  * @return {!Array<string>}
  */
 function getLog(format) {
-  return exec(`git log --format="${format}" ${filePath}`)
-      .then(logs => logs.trim().split('\n'));
+  return exec(`git log --format="${format}" ${filePath}`).then(logs =>
+    logs.trim().split('\n')
+  );
 }
 
 /**
@@ -63,7 +60,10 @@ function getLog(format) {
  */
 function parseSizeFile(file) {
   const lines = file.trim().split('\n');
-  const headers = lines[0].trim().split('|').map(x => x.trim());
+  const headers = lines[0]
+    .trim()
+    .split('|')
+    .map(x => x.trim());
   let minPos = -1;
   // Find the "min" column which is the closure compiled or the "size" column
   // which was previously babelify compiled file.
@@ -79,48 +79,58 @@ function parseSizeFile(file) {
   // Remove separator
   lines.shift();
 
-  return lines.map(line => {
-    const columns = line.split('|').map(x => x.trim());
-    let name = columns[columns.length - 1];
-
-    // Older size.txt files contained duplicate entries of the same "entity",
-    // for example a file had an entry for its .min and its .max file.
-    const shouldSkip = (name.endsWith('max.js') &&
-        !name.endsWith('alp.max.js') && !/\s\/\s/.test(name))
-        || name == 'current/integration.js' || name == 'amp.js' ||
-        name == 'cc.js' || name.endsWith('-latest.js');
+  return lines
+    .map(line => {
+      const columns = line.split('|').map(x => x.trim());
+      let name = columns[columns.length - 1];
 
+      // Older size.txt files contained duplicate entries of the same "entity",
+      // for example a file had an entry for its .min and its .max file.
+      const shouldSkip =
+        (name.endsWith('max.js') &&
+          !name.endsWith('alp.max.js') &&
+          !/\s\/\s/.test(name)) ||
+        name == 'current/integration.js' ||
+        name == 'amp.js' ||
+        name == 'cc.js' ||
+        name.endsWith('-latest.js');
 
-    if (shouldSkip) {
-      return null;
-    }
+      if (shouldSkip) {
+        return null;
+      }
 
-    // Normalize names. We made mistakes at some point with duplicate entries
-    // or renamed entries so we make sure to identify these entities
-    // and put then into the same column.
-    if (name == 'v0.js / amp.js' || name == 'current-min/v0.js') {
-      name = 'v0.js';
-    } else if (name == 'current-min/f.js / current/integration.js' ||
-      name == 'current-min/f.js') {
-      name = 'f.js';
-    } else if (name == 'alp.max.js' || name == 'alp.js / install-alp.js' ||
-        name == 'alp.js / alp.max.js') {
-      name = 'alp.js';
-    } else if (name == 'sw.js / sw.max.js') {
-      name = 'sw.js';
-    } else if (name == 'sw-kill.js / sw-kill.max.js') {
-      name = 'sw-kill.js';
-    } else if (name == 'a4a-host-v0.js / amp-inabox-host.js') {
-      name = 'amp4ads-host-v0.js / amp-inabox-host.js';
-    } else if (name == 'a4a-v0.js / amp-inabox.js') {
-      name = 'amp4ads-v0.js / amp-inabox.js';
-    }
+      // Normalize names. We made mistakes at some point with duplicate entries
+      // or renamed entries so we make sure to identify these entities
+      // and put then into the same column.
+      if (name == 'v0.js / amp.js' || name == 'current-min/v0.js') {
+        name = 'v0.js';
+      } else if (
+        name == 'current-min/f.js / current/integration.js' ||
+        name == 'current-min/f.js'
+      ) {
+        name = 'f.js';
+      } else if (
+        name == 'alp.max.js' ||
+        name == 'alp.js / install-alp.js' ||
+        name == 'alp.js / alp.max.js'
+      ) {
+        name = 'alp.js';
+      } else if (name == 'sw.js / sw.max.js') {
+        name = 'sw.js';
+      } else if (name == 'sw-kill.js / sw-kill.max.js') {
+        name = 'sw-kill.js';
+      } else if (name == 'a4a-host-v0.js / amp-inabox-host.js') {
+        name = 'amp4ads-host-v0.js / amp-inabox-host.js';
+      } else if (name == 'a4a-v0.js / amp-inabox.js') {
+        name = 'amp4ads-v0.js / amp-inabox.js';
+      }
 
-    return {
-      name: `"${name}"`,
-      size: `"${reversePrettyBytes(columns[minPos])}"`,
-    };
-  }).filter(x => !!x);
+      return {
+        name: `"${name}"`,
+        size: `"${reversePrettyBytes(columns[minPos])}"`,
+      };
+    })
+    .filter(x => !!x);
 }
 
 /**
@@ -149,20 +159,23 @@ function mergeTables(dateTimes, tables) {
   });
 
   // Populate the headers array with unique file names for row 1
-  Object.keys(obj).sort().forEach(fileName => {
-    // TODO(erwinm): figure out where this is occurring.
-    if (fileName.trim() == '""') {
-      return;
-    }
-    tableHeaders[0].push(fileName);
-  });
+  Object.keys(obj)
+    .sort()
+    .forEach(fileName => {
+      // TODO(erwinm): figure out where this is occurring.
+      if (fileName.trim() == '""') {
+        return;
+      }
+      tableHeaders[0].push(fileName);
+    });
 
   // Populate column A with all the dates we've seen and then
   // populate all other columns with their respective file size if any.
   dateTimes.forEach(dateTime => {
     // Seed array with empty string values
-    const row =
-        Array.apply(null, Array(tableHeaders[0].length)).map(() => '""');
+    const row = Array.apply(null, Array(tableHeaders[0].length)).map(
+      () => '""'
+    );
     rows.push(row);
     row[0] = dateTime;
     // Exclude the datetime column
@@ -187,7 +200,8 @@ function mergeTables(dateTimes, tables) {
  */
 function reversePrettyBytes(prettyBytes) {
   const triple = prettyBytes.match(
-      /(\d+(?:\.\d+)?)\s+(B|kB|MB|GB|TB|PB|EB|ZB|YB)/);
+    /(\d+(?:\.\d+)?)\s+(B|kB|MB|GB|TB|PB|EB|ZB|YB)/
+  );
   if (!triple) {
     throw new Error('No matching bytes data found');
   }
@@ -216,27 +230,30 @@ function serializeCheckout(logs) {
     return acc.then(tables => {
       // We checkout all the known commits for the file and accumulate
       // all the tables.
-      return exec(`git checkout ${sha} ${filePath}`).then(() => {
-        return fs.readFileAsync(`${filePath}`);
-      }).then(file => {
-        const quotedDateTime = `"${dateTime}"`;
-        dateTimes.push(quotedDateTime);
-        // We convert the read file string into an Table objects
-        const fields = parseSizeFile(file.toString()).map(field => {
-          field.dateTime = quotedDateTime;
-          return field;
-        });
-        tables.push(fields);
-        return tables;
-      }).catch(e => {
-        // Ignore if pathspec error. This can happen if the file was
-        // deleted in git.
-        if (/error: pathspec/.test(e.message)) {
-          tables.push([]);
+      return exec(`git checkout ${sha} ${filePath}`)
+        .then(() => {
+          return fs.readFileAsync(`${filePath}`);
+        })
+        .then(file => {
+          const quotedDateTime = `"${dateTime}"`;
+          dateTimes.push(quotedDateTime);
+          // We convert the read file string into an Table objects
+          const fields = parseSizeFile(file.toString()).map(field => {
+            field.dateTime = quotedDateTime;
+            return field;
+          });
+          tables.push(fields);
           return tables;
-        }
-        log(colors.red(e.message));
-      });
+        })
+        .catch(e => {
+          // Ignore if pathspec error. This can happen if the file was
+          // deleted in git.
+          if (/error: pathspec/.test(e.message)) {
+            tables.push([]);
+            return tables;
+          }
+          log(colors.red(e.message));
+        });
     });
   }, Promise.resolve(tables));
   return promise.then(mergeTables.bind(null, dateTimes));
@@ -244,15 +261,14 @@ function serializeCheckout(logs) {
 
 async function csvifySize() {
   const shaAndDate = '%H %ai';
-  return getLog(shaAndDate)
-      .then(logs => {
-        // Reverse it from oldest to newest
-        return serializeCheckout(logs.reverse()).then(rows => {
-          rows.unshift.apply(rows, tableHeaders);
-          const tbl = rows.map(row => row.join(',')).join('\n');
-          return fs.writeFileAsync('test/size.csv', `${tbl}\n`);
-        });
-      });
+  return getLog(shaAndDate).then(logs => {
+    // Reverse it from oldest to newest
+    return serializeCheckout(logs.reverse()).then(rows => {
+      rows.unshift.apply(rows, tableHeaders);
+      const tbl = rows.map(row => row.join(',')).join('\n');
+      return fs.writeFileAsync('test/size.csv', `${tbl}\n`);
+    });
+  });
 }
 
 module.exports = {
diff --git a/build-system/tasks/csvify-size/test.js b/build-system/tasks/csvify-size/test.js
index d4cb46e8f252..37d68cb875c2 100644
--- a/build-system/tasks/csvify-size/test.js
+++ b/build-system/tasks/csvify-size/test.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const m = require('./');
 const test = require('ava');
 
@@ -50,9 +49,7 @@ test('sync - parse table typedef', t => {
   t.plan(1);
   const dateTimes = ['"0"', '"1"', '"2"'];
   const tables = [
-    [
-      {name: '"v0.js"', size: '"5.5"', dateTime: '"0"'},
-    ],
+    [{name: '"v0.js"', size: '"5.5"', dateTime: '"0"'}],
     [
       {name: '"v0.js"', size: '"8.5"', dateTime: '"1"'},
       {name: '"f.js"', size: '"70.11"', dateTime: '"1"'},
diff --git a/build-system/tasks/dep-check.js b/build-system/tasks/dep-check.js
index 806694d42d66..921eabc5e894 100644
--- a/build-system/tasks/dep-check.js
+++ b/build-system/tasks/dep-check.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const babelify = require('babelify');
 const BBPromise = require('bluebird');
 const browserify = require('browserify');
@@ -105,8 +104,9 @@ Rule.prototype.matchBadDeps = function(moduleName, deps) {
     return [];
   }
 
-  const isFilenameMatch = this.filesMatching_
-      .some(x => minimatch(moduleName, x));
+  const isFilenameMatch = this.filesMatching_.some(x =>
+    minimatch(moduleName, x)
+  );
   if (!isFilenameMatch) {
     return [];
   }
@@ -117,7 +117,6 @@ Rule.prototype.matchBadDeps = function(moduleName, deps) {
   deps.forEach(dep => {
     this.mustNotDependOn_.forEach(badDepPattern => {
       if (minimatch(dep, badDepPattern)) {
-
         // Allow extension files to depend on their own code.
         const dir = path.dirname(dep);
         if (dir.startsWith('extensions/')) {
@@ -140,8 +139,10 @@ Rule.prototype.matchBadDeps = function(moduleName, deps) {
         if (inWhitelist) {
           return;
         }
-        mustNotDependErrors.push(`${moduleName} must not depend on ${dep}. ` +
-            `Rule: ${JSON.stringify(this.config_)}.`);
+        mustNotDependErrors.push(
+          `${moduleName} must not depend on ${dep}. ` +
+            `Rule: ${JSON.stringify(this.config_)}.`
+        );
       }
     });
   });
@@ -159,24 +160,34 @@ const rules = depCheckConfig.rules.map(config => new Rule(config));
  * @return {!Promise<!Array<string>>}
  */
 function getSrcs() {
-  return fs.readdirAsync('extensions').then(dirItems => {
-    // Look for extension entry points
-    return flatten(dirItems
-        .map(x => `extensions/${x}`)
-        .filter(x => fs.statSync(x).isDirectory())
-        .map(getEntryModule)
-        // Concat the core binary and integration binary as entry points.
-        .concat('src/amp.js', '3p/integration.js'));
-  }).then(files => {
-    // Write all the entry modules into a single file so they can be processed
-    // together.
-    fs.mkdirpSync('./.amp-build');
-    const filename = './.amp-build/gulp-dep-check-collection.js';
-    fs.writeFileSync(filename, files.map(file => {
-      return `import '../${file}';`;
-    }).join('\n'));
-    return [filename];
-  });
+  return fs
+    .readdirAsync('extensions')
+    .then(dirItems => {
+      // Look for extension entry points
+      return flatten(
+        dirItems
+          .map(x => `extensions/${x}`)
+          .filter(x => fs.statSync(x).isDirectory())
+          .map(getEntryModule)
+          // Concat the core binary and integration binary as entry points.
+          .concat('src/amp.js', '3p/integration.js')
+      );
+    })
+    .then(files => {
+      // Write all the entry modules into a single file so they can be processed
+      // together.
+      fs.mkdirpSync('./.amp-build');
+      const filename = './.amp-build/gulp-dep-check-collection.js';
+      fs.writeFileSync(
+        filename,
+        files
+          .map(file => {
+            return `import '../${file}';`;
+          })
+          .join('\n')
+      );
+      return [filename];
+    });
 }
 
 /**
@@ -194,29 +205,31 @@ function getGraph(entryModule) {
 
   // TODO(erwinm): Try and work this in with `gulp build` so that
   // we're not running browserify twice on travis.
-  const bundler = browserify(entryModule, {debug: true})
-      .transform(babelify, {
-        compact: false,
-        // Transform files in node_modules since deps use ES6 export.
-        // https://github.com/babel/babelify#why-arent-files-in-node_modules-being-transformed
-        global: true,
-      });
+  const bundler = browserify(entryModule, {debug: true}).transform(babelify, {
+    compact: false,
+    // Transform files in node_modules since deps use ES6 export.
+    // https://github.com/babel/babelify#why-arent-files-in-node_modules-being-transformed
+    global: true,
+  });
 
-  bundler.pipeline.get('deps').push(through.obj(function(row, enc, next) {
-    module.deps.push({
-      name: row.file.replace(absPathRegExp, ''),
-      deps: row.deps,
-    });
-    this.push(row);
-    next();
-  }));
-  bundler.bundle()
-      .pipe(source(entryModule))
-      // Unfortunately we need to write the files out.
-      .pipe(gulp.dest('./.amp-build'))
-      .on('end', () => {
-        resolve(module);
+  bundler.pipeline.get('deps').push(
+    through.obj(function(row, enc, next) {
+      module.deps.push({
+        name: row.file.replace(absPathRegExp, ''),
+        deps: row.deps,
       });
+      this.push(row);
+      next();
+    })
+  );
+  bundler
+    .bundle()
+    .pipe(source(entryModule))
+    // Unfortunately we need to write the files out.
+    .pipe(gulp.dest('./.amp-build'))
+    .on('end', () => {
+      resolve(module);
+    });
   return promise;
 }
 
@@ -226,12 +239,13 @@ function getGraph(entryModule) {
  */
 function getEntryModule(extensionFolder) {
   const extension = path.basename(extensionFolder);
-  return fs.readdirSync(extensionFolder)
-      .map(x => `${extensionFolder}/${x}`)
-      .filter(x => fs.statSync(x).isDirectory())
-      .map(x => `${x}/${extension}.js`)
-      .filter(x => fs.existsSync(x))
-      .filter(x => fs.statSync(x).isFile());
+  return fs
+    .readdirSync(extensionFolder)
+    .map(x => `${extensionFolder}/${x}`)
+    .filter(x => fs.statSync(x).isDirectory())
+    .map(x => `${x}/${extension}.js`)
+    .filter(x => fs.existsSync(x))
+    .filter(x => fs.statSync(x).isFile());
 }
 
 /**
@@ -248,16 +262,15 @@ function flattenGraph(entryPoints) {
   // the entry points.
   entryPoints = entryPoints.map(entryPoint => entryPoint.deps);
   // Now make the graph have unique entries
-  return flatten(entryPoints)
-      .reduce((acc, cur) => {
-        const {name} = cur;
-        if (!acc[name]) {
-          acc[name] = Object.keys(cur.deps)
-              // Get rid of the absolute path for minimatch'ing
-              .map(x => cur.deps[x].replace(absPathRegExp, ''));
-        }
-        return acc;
-      }, Object.create(null));
+  return flatten(entryPoints).reduce((acc, cur) => {
+    const {name} = cur;
+    if (!acc[name]) {
+      acc[name] = Object.keys(cur.deps)
+        // Get rid of the absolute path for minimatch'ing
+        .map(x => cur.deps[x].replace(absPathRegExp, ''));
+    }
+    return acc;
+  }, Object.create(null));
 }
 
 /**
@@ -287,16 +300,21 @@ async function depCheck() {
   if (!isTravisBuild()) {
     log('Checking dependencies...');
   }
-  return getSrcs().then(entryPoints => {
-    // This check is for extension folders that actually dont have
-    // an extension entry point module yet.
-    entryPoints = entryPoints.filter(x => fs.existsSync(x));
-    return BBPromise.all(entryPoints.map(getGraph));
-  }).then(flattenGraph).then(runRules).then(errorsFound => {
-    if (errorsFound) {
-      process.exit(1);
-    }
-  }).then(() => exitCtrlcHandler(handlerProcess));
+  return getSrcs()
+    .then(entryPoints => {
+      // This check is for extension folders that actually dont have
+      // an extension entry point module yet.
+      entryPoints = entryPoints.filter(x => fs.existsSync(x));
+      return BBPromise.all(entryPoints.map(getGraph));
+    })
+    .then(flattenGraph)
+    .then(runRules)
+    .then(errorsFound => {
+      if (errorsFound) {
+        process.exit(1);
+      }
+    })
+    .then(() => exitCtrlcHandler(handlerProcess));
 }
 
 /**
diff --git a/build-system/tasks/dev-dashboard-tests.js b/build-system/tasks/dev-dashboard-tests.js
index bfe258f3308c..828b26cb1f00 100644
--- a/build-system/tasks/dev-dashboard-tests.js
+++ b/build-system/tasks/dev-dashboard-tests.js
@@ -20,7 +20,6 @@ const deglob = require('globs-to-files');
 const Mocha = require('mocha');
 const {isTravisBuild} = require('../travis');
 
-
 /**
  * Run all the dev dashboard tests
  */
@@ -35,7 +34,9 @@ async function devDashboardTests() {
 
   // Create our deffered
   let resolver;
-  const deferred = new Promise(resolverIn => {resolver = resolverIn;});
+  const deferred = new Promise(resolverIn => {
+    resolver = resolverIn;
+  });
 
   // Run the tests.
   mocha.run(function(failures) {
diff --git a/build-system/tasks/dist.js b/build-system/tasks/dist.js
index 7023b45c3829..2c76a04296b7 100644
--- a/build-system/tasks/dist.js
+++ b/build-system/tasks/dist.js
@@ -39,11 +39,17 @@ const {
   getExtensionsToBuild,
   parseExtensionFlags,
 } = require('./extension-helpers');
+const {
+  closureNailgunPort,
+  startNailgunServer,
+  stopNailgunServer,
+} = require('./nailgun');
+const {
+  createModuleCompatibleES5Bundle,
+} = require('./create-module-compatible-es5-bundle');
 const {cleanupBuildDir} = require('../compile/compile');
-const {closureNailgunPort, startNailgunServer, stopNailgunServer} = require('./nailgun');
 const {compileCss, cssEntryPoints} = require('./css');
 const {createCtrlcHandler, exitCtrlcHandler} = require('../ctrlcHandler');
-const {createModuleCompatibleES5Bundle} = require('./create-module-compatible-es5-bundle');
 const {isTravisBuild} = require('../travis');
 const {maybeUpdatePackages} = require('./update-packages');
 
@@ -68,51 +74,59 @@ async function dist() {
   }
   if (argv.single_pass) {
     if (!isTravisBuild()) {
-      log(green('Building all AMP extensions in'), cyan('single_pass'),
-          green('mode.'));
+      log(
+        green('Building all AMP extensions in'),
+        cyan('single_pass'),
+        green('mode.')
+      );
     }
   } else {
     parseExtensionFlags();
   }
   return compileCss(/* watch */ undefined, /* opt_compileAll */ true)
-      .then(async() => {
-        await startNailgunServer(closureNailgunPort, /* detached */ false);
-      })
-      .then(() => {
+    .then(async () => {
+      await startNailgunServer(closureNailgunPort, /* detached */ false);
+    })
+    .then(() => {
+      return Promise.all([
+        compileAllMinifiedTargets(),
+        // NOTE: When adding a line here,
+        // consider whether you need to include polyfills
+        // and whether you need to init logging (initLogConstructor).
+        buildAlp({minify: true, watch: false}),
+        buildExaminer({minify: true, watch: false}),
+        buildWebWorker({minify: true, watch: false}),
+        buildExtensions({minify: true, watch: false}),
+        buildExperiments({minify: true, watch: false}),
+        buildLoginDone({minify: true, watch: false}),
+        buildWebPushPublisherFiles({minify: true, watch: false}),
+        copyCss(),
+      ]);
+    })
+    .then(() => {
+      if (isTravisBuild()) {
+        // New line after all the compilation progress dots on Travis.
+        console.log('\n');
+      }
+    })
+    .then(async () => {
+      await stopNailgunServer(closureNailgunPort);
+    })
+    .then(() => {
+      return copyAliasExtensions();
+    })
+    .then(() => {
+      if (argv.esm) {
         return Promise.all([
-          compileAllMinifiedTargets(),
-          // NOTE: When adding a line here,
-          // consider whether you need to include polyfills
-          // and whether you need to init logging (initLogConstructor).
-          buildAlp({minify: true, watch: false}),
-          buildExaminer({minify: true, watch: false}),
-          buildWebWorker({minify: true, watch: false}),
-          buildExtensions({minify: true, watch: false}),
-          buildExperiments({minify: true, watch: false}),
-          buildLoginDone({minify: true, watch: false}),
-          buildWebPushPublisherFiles({minify: true, watch: false}),
-          copyCss(),
+          createModuleCompatibleES5Bundle('v0.js'),
+          createModuleCompatibleES5Bundle('amp4ads-v0.js'),
+          createModuleCompatibleES5Bundle('shadow-v0.js'),
         ]);
-      }).then(() => {
-        if (isTravisBuild()) {
-          // New line after all the compilation progress dots on Travis.
-          console.log('\n');
-        }
-      }).then(async() => {
-        await stopNailgunServer(closureNailgunPort);
-      }).then(() => {
-        return copyAliasExtensions();
-      }).then(() => {
-        if (argv.esm) {
-          return Promise.all([
-            createModuleCompatibleES5Bundle('v0.js'),
-            createModuleCompatibleES5Bundle('amp4ads-v0.js'),
-            createModuleCompatibleES5Bundle('shadow-v0.js'),
-          ]);
-        } else {
-          return Promise.resolve();
-        }
-      }).then(() => exitCtrlcHandler(handlerProcess));
+      } else {
+        return Promise.resolve();
+      }
+    })
+    .then(() => exitCtrlcHandler(handlerProcess));
 }
 
 /**
@@ -126,11 +140,13 @@ function copyCss() {
     fs.copySync(`build/css/${outCss}`, `dist/${outCss}`);
   });
 
-  return toPromise(gulp.src('build/css/amp-*.css', {base: 'build/css/'})
-      .pipe(gulp.dest('dist/v0')))
-      .then(() => {
-        endBuildStep('Copied', 'build/css/*.css to dist/*.css', startTime);
-      });
+  return toPromise(
+    gulp
+      .src('build/css/amp-*.css', {base: 'build/css/'})
+      .pipe(gulp.dest('dist/v0'))
+  ).then(() => {
+    endBuildStep('Copied', 'build/css/*.css to dist/*.css', startTime);
+  });
 }
 
 /**
@@ -145,12 +161,16 @@ function copyAliasExtensions() {
   const extensionsToBuild = getExtensionsToBuild();
 
   for (const key in extensionAliasFilePath) {
-    if (extensionsToBuild.length > 0 &&
-        extensionsToBuild.indexOf(extensionAliasFilePath[key]['name']) == -1) {
+    if (
+      extensionsToBuild.length > 0 &&
+      extensionsToBuild.indexOf(extensionAliasFilePath[key]['name']) == -1
+    ) {
       continue;
     }
-    fs.copySync('dist/v0/' + extensionAliasFilePath[key]['file'],
-        'dist/v0/' + key);
+    fs.copySync(
+      'dist/v0/' + extensionAliasFilePath[key]['file'],
+      'dist/v0/' + key
+    );
   }
 
   return Promise.resolve();
@@ -174,8 +194,10 @@ function buildWebPushPublisherFiles(options) {
 function buildWebPushPublisherFilesVersion(version, options) {
   options = options || {};
   const {watch} = options;
-  const fileNames =
-      ['amp-web-push-helper-frame', 'amp-web-push-permission-dialog'];
+  const fileNames = [
+    'amp-web-push-helper-frame',
+    'amp-web-push-permission-dialog',
+  ];
   const promises = [];
 
   mkdirSync('dist');
@@ -207,35 +229,38 @@ function buildWebPushPublisherFile(version, fileName, watch, options) {
   const js = fs.readFileSync(basePath + fileName + '.js', 'utf8');
   const builtName = fileName + '.js';
   const minifiedName = fileName + '.js';
-  return toPromise(gulp.src(basePath + '/*.js', {base: '.'})
+  return toPromise(
+    gulp
+      .src(basePath + '/*.js', {base: '.'})
       .pipe(file(builtName, js))
-      .pipe(gulp.dest(tempBuildDir)))
-      .then(function() {
-        return compileJs('./' + tempBuildDir, builtName, './' + distDir, {
-          watch,
-          includePolyfills: true,
-          minify: options.minify || argv.minify,
-          minifiedName,
-          extraGlobs: [
-            tempBuildDir + '*.js',
-          ],
-        });
-      })
-      .then(function() {
-        if (fs.existsSync(distDir + '/' + minifiedName)) {
-          // Build Helper Frame HTML
-          let fileContents =
-              fs.readFileSync(basePath + fileName + '.html', 'utf8');
-          fileContents = fileContents.replace(
-              '<!-- [GULP-MAGIC-REPLACE ' + fileName + '.js] -->',
-              '<script>' + fs.readFileSync(distDir + '/' +
-              minifiedName, 'utf8') + '</script>'
-          );
-
-          fs.writeFileSync('dist/v0/' + fileName + '.html',
-              fileContents);
-        }
+      .pipe(gulp.dest(tempBuildDir))
+  )
+    .then(function() {
+      return compileJs('./' + tempBuildDir, builtName, './' + distDir, {
+        watch,
+        includePolyfills: true,
+        minify: options.minify || argv.minify,
+        minifiedName,
+        extraGlobs: [tempBuildDir + '*.js'],
       });
+    })
+    .then(function() {
+      if (fs.existsSync(distDir + '/' + minifiedName)) {
+        // Build Helper Frame HTML
+        let fileContents = fs.readFileSync(
+          basePath + fileName + '.html',
+          'utf8'
+        );
+        fileContents = fileContents.replace(
+          '<!-- [GULP-MAGIC-REPLACE ' + fileName + '.js] -->',
+          '<script>' +
+            fs.readFileSync(distDir + '/' + minifiedName, 'utf8') +
+            '</script>'
+        );
+
+        fs.writeFileSync('dist/v0/' + fileName + '.html', fileContents);
+      }
+    });
 }
 
 /**
@@ -280,12 +305,8 @@ async function buildLoginDoneVersion(version, options) {
   const html = fs.readFileSync(htmlPath, 'utf8');
   const minJs = `https://${hostname}/v0/amp-login-done-${version}.js`;
   const minHtml = html
-      .replace(
-          `../../../dist/v0/amp-login-done-${version}.max.js`,
-          minJs)
-      .replace(
-          `../../../dist/v0/amp-login-done-${version}.js`,
-          minJs);
+    .replace(`../../../dist/v0/amp-login-done-${version}.max.js`, minJs)
+    .replace(`../../../dist/v0/amp-login-done-${version}.js`, minJs);
   if (minHtml.indexOf(minJs) == -1) {
     throw new Error('Failed to correctly set JS in login-done.html');
   }
@@ -293,30 +314,31 @@ async function buildLoginDoneVersion(version, options) {
   mkdirSync('dist');
   mkdirSync('dist/v0');
 
-  fs.writeFileSync('dist/v0/amp-login-done-' + version + '.html',
-      minHtml);
+  fs.writeFileSync('dist/v0/amp-login-done-' + version + '.html', minHtml);
 
   // Build JS.
   const js = fs.readFileSync(jsPath, 'utf8');
   const builtName = 'amp-login-done-' + version + '.max.js';
   const minifiedName = 'amp-login-done-' + version + '.js';
   const latestName = 'amp-login-done-latest.js';
-  return toPromise(gulp.src(path + '/*.js', {base: path})
+  return toPromise(
+    gulp
+      .src(path + '/*.js', {base: path})
       .pipe(file(builtName, js))
-      .pipe(gulp.dest(buildDir)))
-      .then(function() {
-        return compileJs('./' + buildDir, builtName, './dist/v0/', {
-          watch: false,
-          includePolyfills: true,
-          minify: options.minify || argv.minify,
-          minifiedName,
-          latestName,
-          extraGlobs: [
-            buildDir + 'amp-login-done-0.1.max.js',
-            buildDir + 'amp-login-done-dialog.js',
-          ],
-        });
-      });
+      .pipe(gulp.dest(buildDir))
+  ).then(function() {
+    return compileJs('./' + buildDir, builtName, './dist/v0/', {
+      watch: false,
+      includePolyfills: true,
+      minify: options.minify || argv.minify,
+      minifiedName,
+      latestName,
+      extraGlobs: [
+        buildDir + 'amp-login-done-0.1.max.js',
+        buildDir + 'amp-login-done-dialog.js',
+      ],
+    });
+  });
 }
 
 module.exports = {
@@ -331,15 +353,17 @@ buildExperiments.description = 'Builds experiments.html/js';
 buildLoginDone.description = 'Builds login-done.html/js';
 dist.description = 'Build production binaries';
 dist.flags = {
-  pseudo_names: '  Compiles with readable names. ' +
-          'Great for profiling and debugging production code.',
+  pseudo_names:
+    '  Compiles with readable names. ' +
+    'Great for profiling and debugging production code.',
   fortesting: '  Compiles production binaries for local testing',
   config: '  Sets the runtime\'s AMP_CONFIG to one of "prod" or "canary"',
-  single_pass: 'Compile AMP\'s primary JS bundles in a single invocation',
+  single_pass: "Compile AMP's primary JS bundles in a single invocation",
   extensions: '  Builds only the listed extensions.',
   extensions_from: '  Builds only the extensions from the listed AMP(s).',
   noextensions: '  Builds with no extensions.',
-  single_pass_dest: '  The directory closure compiler will write out to ' +
-          'with --single_pass mode. The default directory is `dist`',
+  single_pass_dest:
+    '  The directory closure compiler will write out to ' +
+    'with --single_pass mode. The default directory is `dist`',
   full_sourcemaps: '  Includes source code content in sourcemaps',
 };
diff --git a/build-system/tasks/e2e/amp-driver.js b/build-system/tasks/e2e/amp-driver.js
index d52b790f529d..eaa14ec5c852 100644
--- a/build-system/tasks/e2e/amp-driver.js
+++ b/build-system/tasks/e2e/amp-driver.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /** @enum {string} */
 const AmpdocEnvironment = {
   SINGLE: 'single',
@@ -35,15 +34,18 @@ const EnvironmentBehaviorMap = {
 
   [AmpdocEnvironment.VIEWER_DEMO]: {
     ready(controller) {
-      return controller.findElement('#AMP_DOC_dynamic[data-loaded]')
-          .then(frame => controller.switchToFrame(frame));
+      return controller
+        .findElement('#AMP_DOC_dynamic[data-loaded]')
+        .then(frame => controller.switchToFrame(frame));
     },
 
     url(url) {
-      const defaultCaps = ['a2a','focus-rect','foo','keyboard','swipe'];
+      const defaultCaps = ['a2a', 'focus-rect', 'foo', 'keyboard', 'swipe'];
       // TODO(estherkim): somehow allow non-8000 port and domain
-      return `http://localhost:8000/examples/viewer.html#href=${url}` +
-          `&caps=${defaultCaps.join(',')}`;
+      return (
+        `http://localhost:8000/examples/viewer.html#href=${url}` +
+        `&caps=${defaultCaps.join(',')}`
+      );
     },
   },
 
@@ -52,7 +54,8 @@ const EnvironmentBehaviorMap = {
       // TODO(cvializ): this is a HACK
       // There should be a better way to detect that the shadowdoc is ready.
       const shadowHost = await controller.findElement(
-          '.amp-doc-host[style="visibility: visible;"]');
+        '.amp-doc-host[style="visibility: visible;"]'
+      );
       await controller.switchToShadow(shadowHost);
     },
 
@@ -82,11 +85,15 @@ class AmpDriver {
    * @return {!Promise}
    */
   async toggleExperiment(name, toggle) {
-    await this.controller_.evaluate((name, toggle) => {
-      (window.AMP = window.AMP || []).push(AMP => {
-        AMP.toggleExperiment(name, toggle);
-      });
-    }, name, toggle);
+    await this.controller_.evaluate(
+      (name, toggle) => {
+        (window.AMP = window.AMP || []).push(AMP => {
+          AMP.toggleExperiment(name, toggle);
+        });
+      },
+      name,
+      toggle
+    );
   }
 
   /**
diff --git a/build-system/tasks/e2e/describes-e2e.js b/build-system/tasks/e2e/describes-e2e.js
index d3aac26fe014..2d16e18a26f8 100644
--- a/build-system/tasks/e2e/describes-e2e.js
+++ b/build-system/tasks/e2e/describes-e2e.js
@@ -18,13 +18,15 @@
 require('chromedriver'); // eslint-disable-line no-unused-vars
 
 const puppeteer = require('puppeteer');
+const {
+  SeleniumWebDriverController,
+} = require('./selenium-webdriver-controller');
 const {AmpDriver, AmpdocEnvironment} = require('./amp-driver');
 const {Builder, Capabilities} = require('selenium-webdriver');
 const {clearLastExpectError, getLastExpectError} = require('./expect');
 const {installRepl, uninstallRepl} = require('./repl');
 const {isTravisBuild} = require('../../travis');
 const {PuppeteerController} = require('./puppeteer-controller');
-const {SeleniumWebDriverController} = require('./selenium-webdriver-controller');
 
 /** Should have something in the name, otherwise nothing is shown. */
 const SUB = ' ';
@@ -142,12 +144,18 @@ const endtoend = describeEnv(spec => new EndToEndFixture(spec));
  * Maps an environment enum value to a `describes.repeated` variant object.
  */
 const EnvironmentVariantMap = {
-  [AmpdocEnvironment.SINGLE]:
-      {name: 'Standalone environment', value: {environment: 'single'}},
-  [AmpdocEnvironment.VIEWER_DEMO]:
-      {name: 'Viewer environment', value: {environment: 'viewer-demo'}},
-  [AmpdocEnvironment.SHADOW_DEMO]:
-      {name: 'Shadow environment', value: {environment: 'shadow-demo'}},
+  [AmpdocEnvironment.SINGLE]: {
+    name: 'Standalone environment',
+    value: {environment: 'single'},
+  },
+  [AmpdocEnvironment.VIEWER_DEMO]: {
+    name: 'Viewer environment',
+    value: {environment: 'viewer-demo'},
+  },
+  [AmpdocEnvironment.SHADOW_DEMO]: {
+    name: 'Shadow environment',
+    value: {environment: 'shadow-demo'},
+  },
 };
 
 const defaultEnvironments = [
@@ -162,7 +170,7 @@ const defaultEnvironments = [
  *
  * Example usage:
  * it.configure().skipViewerDemo().skipShadowDemo().run('Should ...', ...);
-*/
+ */
 class ItConfig {
   constructor(it, env) {
     this.it = it;
@@ -289,7 +297,7 @@ function describeEnv(factory) {
    * @param {function(!Object)} fn
    */
   mainFunc.only = function(name, spec, fn) {
-    return templateFunc(name, spec, fn, describe./*OK*/only);
+    return templateFunc(name, spec, fn, describe./*OK*/ only);
   };
 
   mainFunc.skip = function(name, variants, fn) {
@@ -300,7 +308,6 @@ function describeEnv(factory) {
 }
 
 class EndToEndFixture {
-
   /** @param {!TestSpec} spec */
   constructor(spec) {
     /** @const */
@@ -319,9 +326,7 @@ class EndToEndFixture {
       experiments = [],
       initialRect = DEFAULT_E2E_INITIAL_RECT,
     } = this.spec;
-    const {
-      environment,
-    } = env;
+    const {environment} = env;
 
     await toggleExperiments(ampDriver, testUrl, experiments);
 
@@ -344,10 +349,7 @@ class EndToEndFixture {
  * Get the controller object for the configured engine.
  * @param {!DescribesConfigDef} describesConfig
  */
-async function getController({
-  engine = 'selenium',
-  headless = false,
-}) {
+async function getController({engine = 'selenium', headless = false}) {
   if (engine == 'puppeteer') {
     const browser = await createPuppeteer({headless});
     return new PuppeteerController(browser);
diff --git a/build-system/tasks/e2e/driver/query-xpath.js b/build-system/tasks/e2e/driver/query-xpath.js
index 9033cd1c4603..670ee5d0e475 100644
--- a/build-system/tasks/e2e/driver/query-xpath.js
+++ b/build-system/tasks/e2e/driver/query-xpath.js
@@ -57,16 +57,21 @@ function queryXpath(xpathString, context) {
   // Add an ID to every element in the tree so we can reference them later.
   // This allows us to correlate nodes from the cloned tree to the
   // original tree.
-  for (const {item, index} of
-    createIndexedInterator(createElementIterator(context))) {
+  for (const {item, index} of createIndexedInterator(
+    createElementIterator(context)
+  )) {
     setData(item, index);
   }
 
   const fakeDocument = document.implementation.createDocument(
-      'http://www.w3.org/1999/xhtml', 'html', null);
+    'http://www.w3.org/1999/xhtml',
+    'html',
+    null
+  );
   try {
     fakeDocument.documentElement.appendChild(
-        context.cloneNode(/* deep */ true));
+      context.cloneNode(/* deep */ true)
+    );
   } catch (e) {
     // Appending the AMP `CustomElement`s to the new document throws errors
     // because the implementations expect the AmpDoc to be present and it
@@ -77,11 +82,12 @@ function queryXpath(xpathString, context) {
   // Map the xpath results from the fake tree to the corresponding nodes in
   // the test document tree.
   const xpathIterator = createXpathIterator(
-      evaluate(xpathString, fakeDocument, null, XPathResult.ANY_TYPE));
+    evaluate(xpathString, fakeDocument, null, XPathResult.ANY_TYPE)
+  );
   const elements = [...xpathIterator].map(node => {
     const testId = getData(node);
     const selector = `[${TEST_ID_ATTRIBUTE}="${testId}"]`;
-    return context./*OK*/querySelector(selector);
+    return context./*OK*/ querySelector(selector);
   });
 
   // Restore the DOM to the original state without the ID in the dataset.
@@ -126,8 +132,9 @@ function removeData(node) {
 function createElementIterator(element) {
   const document = element.ownerDocument;
   return createCommonIterator(
-      document.createNodeIterator(element, NodeFilter.SHOW_ELEMENT),
-      'nextNode');
+    document.createNodeIterator(element, NodeFilter.SHOW_ELEMENT),
+    'nextNode'
+  );
 }
 
 /**
@@ -148,7 +155,7 @@ function createXpathIterator(xpathResult) {
  */
 function* createCommonIterator(iterator, nextProperty) {
   let item;
-  while (Boolean(item = iterator[nextProperty]())) {
+  while (Boolean((item = iterator[nextProperty]()))) {
     yield item;
   }
 }
@@ -168,5 +175,4 @@ function* createIndexedInterator(iter) {
   }
 }
 
-
 window.queryXpath = queryXpath;
diff --git a/build-system/tasks/e2e/expect.js b/build-system/tasks/e2e/expect.js
index 445697a8ee3a..382396b35514 100644
--- a/build-system/tasks/e2e/expect.js
+++ b/build-system/tasks/e2e/expect.js
@@ -69,13 +69,25 @@ function installIncludeWrapper(chai, utils) {
 
   const overwrite = overwriteAlwaysUseSuper(utils);
   Assertion.overwriteChainableMethod(
-      'include', overwrite, inheritChainingBehavior);
+    'include',
+    overwrite,
+    inheritChainingBehavior
+  );
   Assertion.overwriteChainableMethod(
-      'includes', overwrite, inheritChainingBehavior);
+    'includes',
+    overwrite,
+    inheritChainingBehavior
+  );
   Assertion.overwriteChainableMethod(
-      'contain', overwrite, inheritChainingBehavior);
+    'contain',
+    overwrite,
+    inheritChainingBehavior
+  );
   Assertion.overwriteChainableMethod(
-      'contains', overwrite, inheritChainingBehavior);
+    'contains',
+    overwrite,
+    inheritChainingBehavior
+  );
 }
 
 function installMatchWrapper(chai, utils) {
@@ -91,9 +103,15 @@ function installLengthWrapper(chai, utils) {
 
   const overwrite = overwriteAlwaysUseSuper(utils);
   Assertion.overwriteChainableMethod(
-      'length', overwrite, inheritChainingBehavior);
+    'length',
+    overwrite,
+    inheritChainingBehavior
+  );
   Assertion.overwriteChainableMethod(
-      'lengthOf', overwrite, inheritChainingBehavior);
+    'lengthOf',
+    overwrite,
+    inheritChainingBehavior
+  );
 }
 
 function installAboveWrapper(chai, utils) {
@@ -146,7 +164,6 @@ function installIsNullWrapper(chai, utils) {
   Assertion.overwriteProperty('null', overwrite);
 }
 
-
 function overwriteAlwaysUseSuper(utils) {
   const {flag} = utils;
 
diff --git a/build-system/tasks/e2e/functional-test-controller.js b/build-system/tasks/e2e/functional-test-controller.js
index 4e04470c1cbd..44c71ce91a65 100644
--- a/build-system/tasks/e2e/functional-test-controller.js
+++ b/build-system/tasks/e2e/functional-test-controller.js
@@ -40,7 +40,7 @@ class ElementHandle {
    * @package
    */
   getElement() {
-  	return this.element_;
+    return this.element_;
   }
 }
 
@@ -75,9 +75,10 @@ class ControllerPromise {
    * @param {function(TYPE,function(TYPE): ?TYPE): !Promise=} opt_waitForValue
    */
   constructor(executorOrPromise, opt_waitForValue) {
-    this.promise_ = typeof executorOrPromise == 'function' ?
-      new Promise(executorOrPromise) :
-      executorOrPromise;
+    this.promise_ =
+      typeof executorOrPromise == 'function'
+        ? new Promise(executorOrPromise)
+        : executorOrPromise;
 
     /**
      * Returns a Promise that resolves when the given expected value fulfills
@@ -91,15 +92,17 @@ class ControllerPromise {
   /** @override */
   catch(onRejected) {
     return new ControllerPromise(
-        this.promise_.catch(onRejected),
-        this.waitForValue);
+      this.promise_.catch(onRejected),
+      this.waitForValue
+    );
   }
 
- 	/** @override */
+  /** @override */
   finally(onFinally) {
     return new ControllerPromise(
-        this.promise_.finally(onFinally),
-        this.waitForValue);
+      this.promise_.finally(onFinally),
+      this.waitForValue
+    );
   }
 
   /** @override */
@@ -111,13 +114,15 @@ class ControllerPromise {
       wrappedWait = (condition, opt_mutate) => {
         opt_mutate = opt_mutate || (x => x);
         return this.waitForValue(condition, value =>
-          opt_mutate(opt_onFulfilled(value)));
+          opt_mutate(opt_onFulfilled(value))
+        );
       };
     }
 
     return new ControllerPromise(
-        this.promise_.then(opt_onFulfilled, opt_onRejected),
-        wrappedWait);
+      this.promise_.then(opt_onFulfilled, opt_onRejected),
+      wrappedWait
+    );
   }
 }
 
@@ -444,13 +449,12 @@ class FunctionalTestController {
   async dispose() {}
 }
 
-
 /**
  * @typedef {{
  *   width: number,
  *   height: number
  * }} WindowRectDef
-*/
+ */
 let WindowRectDef;
 
 /**
@@ -460,7 +464,7 @@ let WindowRectDef;
  *   width: number,
  *   height: number
  * }}
-*/
+ */
 let DOMRectDef;
 
 /** @enum {string} */
diff --git a/build-system/tasks/e2e/index.js b/build-system/tasks/e2e/index.js
index 46c37ec6c1f1..9f3de297cb99 100644
--- a/build-system/tasks/e2e/index.js
+++ b/build-system/tasks/e2e/index.js
@@ -44,8 +44,9 @@ function buildRuntime_() {
 
 function launchWebServer_() {
   webServerProcess_ = execScriptAsync(
-      `gulp serve --host ${HOST} --port ${PORT}`,
-      {stdio: 'ignore'});
+    `gulp serve --host ${HOST} --port ${PORT}`,
+    {stdio: 'ignore'}
+  );
 
   let resolver;
   const deferred = new Promise(resolverIn => {
@@ -116,8 +117,7 @@ async function e2e() {
         delete require.cache[file];
         mocha.addFile(file);
       });
-    }
-    else {
+    } else {
       config.e2eTestPaths.forEach(path => {
         glob.sync(path).forEach(file => {
           delete require.cache[file];
@@ -134,8 +134,7 @@ async function e2e() {
       process.exitCode = failures ? 1 : 0;
       await resolver();
     });
-  }
-  else {
+  } else {
     const filesToWatch = argv.files ? [argv.files] : [config.e2eTestPaths];
     const watcher = watch(filesToWatch);
     log('Watching', cyan(filesToWatch), 'for changes...');
diff --git a/build-system/tasks/e2e/puppeteer-controller.js b/build-system/tasks/e2e/puppeteer-controller.js
index c14a765a0042..7bf8894fc729 100644
--- a/build-system/tasks/e2e/puppeteer-controller.js
+++ b/build-system/tasks/e2e/puppeteer-controller.js
@@ -65,7 +65,10 @@ async function waitFor(page, valueFn, args, condition, opt_mutate) {
 
   while (!condition(value)) {
     const handle = await page.waitForFunction(
-        valueFn, {timeout: DEFAULT_WAIT_TIMEOUT}, ...args);
+      valueFn,
+      {timeout: DEFAULT_WAIT_TIMEOUT},
+      ...args
+    );
     value = await handle.jsonValue();
     if (opt_mutate) {
       value = await opt_mutate(value);
@@ -141,7 +144,7 @@ class PuppeteerController {
    * @template T
    */
   getWaitFn_(valueFn, ...args) {
-    return async(condition, opt_mutate) => {
+    return async (condition, opt_mutate) => {
       const frame = await this.getCurrentFrame_();
       return waitFor(frame, valueFn, args, condition, opt_mutate);
     };
@@ -167,9 +170,14 @@ class PuppeteerController {
   async findElement(selector) {
     const frame = await this.getCurrentFrame_();
     const root = await this.getRoot_();
-    const jsHandle = await frame.waitForFunction((root, selector) => {
-      return root./*OK*/querySelector(selector);
-    }, {timeout: DEFAULT_WAIT_TIMEOUT}, root, selector);
+    const jsHandle = await frame.waitForFunction(
+      (root, selector) => {
+        return root./*OK*/ querySelector(selector);
+      },
+      {timeout: DEFAULT_WAIT_TIMEOUT},
+      root,
+      selector
+    );
     const elementHandle = jsHandle.asElement();
     return new ElementHandle(elementHandle);
   }
@@ -182,10 +190,15 @@ class PuppeteerController {
   async findElements(selector) {
     const frame = await this.getCurrentFrame_();
     const root = await this.getRoot_();
-    const nodeListHandle = await frame.waitForFunction((root, selector) => {
-      const nodeList = root./*OK*/querySelectorAll(selector);
-      return nodeList.length > 0 ? nodeList : null;
-    }, {timeout: DEFAULT_WAIT_TIMEOUT}, root, selector);
+    const nodeListHandle = await frame.waitForFunction(
+      (root, selector) => {
+        const nodeList = root./*OK*/ querySelectorAll(selector);
+        return nodeList.length > 0 ? nodeList : null;
+      },
+      {timeout: DEFAULT_WAIT_TIMEOUT},
+      root,
+      selector
+    );
 
     const lengthHandle = await nodeListHandle.getProperty('length');
     const length = await lengthHandle.jsonValue();
@@ -209,10 +222,15 @@ class PuppeteerController {
     const frame = await this.getCurrentFrame_();
 
     const root = await this.getRoot_();
-    const jsHandle = await frame.waitForFunction((xpath, root) => {
-      const results = window.queryXpath(xpath, root);
-      return results && results[0];
-    }, {timeout: DEFAULT_WAIT_TIMEOUT}, xpath, root);
+    const jsHandle = await frame.waitForFunction(
+      (xpath, root) => {
+        const results = window.queryXpath(xpath, root);
+        return results && results[0];
+      },
+      {timeout: DEFAULT_WAIT_TIMEOUT},
+      xpath,
+      root
+    );
     return new ElementHandle(jsHandle.asElement());
   }
 
@@ -227,9 +245,14 @@ class PuppeteerController {
     const frame = await this.getCurrentFrame_();
     const root = await this.getRoot_();
 
-    const arrayHandle = await frame.waitForFunction((xpath, root) => {
-      return window.queryXpath(xpath, root);
-    }, {timeout: DEFAULT_WAIT_TIMEOUT}, xpath, root);
+    const arrayHandle = await frame.waitForFunction(
+      (xpath, root) => {
+        return window.queryXpath(xpath, root);
+      },
+      {timeout: DEFAULT_WAIT_TIMEOUT},
+      xpath,
+      root
+    );
 
     const lengthHandle = await arrayHandle.getProperty('length');
     const length = await lengthHandle.jsonValue();
@@ -289,10 +312,9 @@ class PuppeteerController {
    */
   async type(handle, keys) {
     const frame = await this.getCurrentFrame_();
-    const targetElement = handle ?
-      handle.getElement() :
-      await frame.$(':focus');
-
+    const targetElement = handle
+      ? handle.getElement()
+      : await frame.$(':focus');
 
     const key = KeyToPuppeteerMap[keys];
     if (key) {
@@ -312,8 +334,9 @@ class PuppeteerController {
     const element = handle.getElement();
     const getter = element => element.textContent;
     return new ControllerPromise(
-        this.evaluate(getter, element),
-        this.getWaitFn_(getter, element));
+      this.evaluate(getter, element),
+      this.getWaitFn_(getter, element)
+    );
   }
 
   /**
@@ -325,11 +348,12 @@ class PuppeteerController {
   getElementCssValue(handle, styleProperty) {
     const element = handle.getElement();
     const getter = (element, styleProperty) => {
-      return window/*OK*/['getComputedStyle'](element)[styleProperty];
+      return window /*OK*/['getComputedStyle'](element)[styleProperty];
     };
     return new ControllerPromise(
-        this.evaluate(getter, element, styleProperty),
-        this.getWaitFn_(getter, element, styleProperty));
+      this.evaluate(getter, element, styleProperty),
+      this.getWaitFn_(getter, element, styleProperty)
+    );
   }
 
   /**
@@ -342,8 +366,9 @@ class PuppeteerController {
     const element = handle.getElement();
     const getter = (element, attribute) => element.getAttribute(attribute);
     return new ControllerPromise(
-        this.evaluate(getter, element, attribute),
-        this.getWaitFn_(getter, element, attribute));
+      this.evaluate(getter, element, attribute),
+      this.getWaitFn_(getter, element, attribute)
+    );
   }
 
   /**
@@ -358,8 +383,9 @@ class PuppeteerController {
       return element[property];
     };
     return new ControllerPromise(
-        this.evaluate(getter, element, property),
-        this.getWaitFn_(getter, element, property));
+      this.evaluate(getter, element, property),
+      this.getWaitFn_(getter, element, property)
+    );
   }
 
   /**
@@ -373,7 +399,7 @@ class PuppeteerController {
       // Extracting the values seems to perform better than returning
       // the raw ClientRect from the element, in terms of flakiness.
       // The raw ClientRect also has hundredths of a pixel. We round to int.
-      const {x, y, width, height} = element./*OK*/getBoundingClientRect();
+      const {x, y, width, height} = element./*OK*/ getBoundingClientRect();
       return {
         x: Math.round(x),
         y: Math.round(y),
@@ -382,8 +408,9 @@ class PuppeteerController {
       };
     };
     return new ControllerPromise(
-        this.evaluate(getter, element),
-        this.getWaitFn_(getter, element));
+      this.evaluate(getter, element),
+      this.getWaitFn_(getter, element)
+    );
   }
 
   /**
@@ -392,14 +419,10 @@ class PuppeteerController {
    * @override
    */
   async setWindowRect(rect) {
-    const {
-      width,
-      height,
-    } = rect;
+    const {width, height} = rect;
     await this.resizeWindow_(width, height);
   }
 
-
   /**
    * Resize the window and the viewport. The `page.setViewport` method only
    * changes the size of the rendered area of the browser, not the window size.
@@ -438,7 +461,7 @@ class PuppeteerController {
     });
     const chromePaddingWidth = outerWidth > 0 ? outerWidth - clientWidth : 0;
     const chromePaddingHeight =
-        outerHeight > 0 ? outerHeight - clientHeight : 0;
+      outerHeight > 0 ? outerHeight - clientHeight : 0;
 
     await page.setViewport({
       width: width + chromePaddingWidth,
@@ -447,27 +470,30 @@ class PuppeteerController {
     });
 
     // Any tab.
-    const {targetInfos: [{targetId}]} = await browser._connection.send(
-        'Target.getTargets');
+    const {
+      targetInfos: [{targetId}],
+    } = await browser._connection.send('Target.getTargets');
 
     // Tab window.
     try {
       const {windowId} = await browser._connection.send(
-          'Browser.getWindowForTarget', {targetId});
+        'Browser.getWindowForTarget',
+        {targetId}
+      );
 
       // Resize.
-      await browser._connection.send(
-          'Browser.setWindowBounds', {
-            bounds: {
-              width: width + chromePaddingWidth,
-              height: height + chromePaddingHeight,
-            },
-            windowId,
-          });
+      await browser._connection.send('Browser.setWindowBounds', {
+        bounds: {
+          width: width + chromePaddingWidth,
+          height: height + chromePaddingHeight,
+        },
+        windowId,
+      });
     } catch (e) {
       // Catch if we're in headless.
-      if (!e.toString().includes(
-          'Protocol error (Browser.getWindowForTarget)')) {
+      if (
+        !e.toString().includes('Protocol error (Browser.getWindowForTarget)')
+      ) {
         throw e;
       }
     }
@@ -478,8 +504,9 @@ class PuppeteerController {
    */
   getTitle() {
     const title = this.getCurrentFrame_().then(frame => frame.title());
-    return new ControllerPromise(
-        title, () => this.getCurrentFrame_().then(frame => frame.title()));
+    return new ControllerPromise(title, () =>
+      this.getCurrentFrame_().then(frame => frame.title())
+    );
   }
 
   /**
@@ -510,9 +537,13 @@ class PuppeteerController {
    */
   async scroll(handle, opt_scrollToOptions) {
     const element = handle.getElement();
-    await this.evaluate((element, opt_scrollToOptions) => {
-      element./*OK*/scrollTo(opt_scrollToOptions);
-    }, element, opt_scrollToOptions);
+    await this.evaluate(
+      (element, opt_scrollToOptions) => {
+        element./*OK*/ scrollTo(opt_scrollToOptions);
+      },
+      element,
+      opt_scrollToOptions
+    );
   }
 
   /**
@@ -523,9 +554,13 @@ class PuppeteerController {
    */
   async scrollBy(handle, opt_scrollToOptions) {
     const element = handle.getElement();
-    await this.evaluate((element, opt_scrollToOptions) => {
-      element./*OK*/scrollBy(opt_scrollToOptions);
-    }, element, opt_scrollToOptions);
+    await this.evaluate(
+      (element, opt_scrollToOptions) => {
+        element./*OK*/ scrollBy(opt_scrollToOptions);
+      },
+      element,
+      opt_scrollToOptions
+    );
   }
 
   /**
diff --git a/build-system/tasks/e2e/repl.js b/build-system/tasks/e2e/repl.js
index 789b7003175e..9120f2c563eb 100644
--- a/build-system/tasks/e2e/repl.js
+++ b/build-system/tasks/e2e/repl.js
@@ -59,7 +59,7 @@ function installRepl(global, env) {
       });
     }
 
-    console./*OK*/log(READY_MESSAGE);
+    console./*OK*/ log(READY_MESSAGE);
 
     return replPromise;
   };
@@ -76,7 +76,7 @@ function installRepl(global, env) {
     delete global.repl.env;
     delete global.repl.continue;
 
-    console./*OK*/log(CONTINUE_MESSAGE);
+    console./*OK*/ log(CONTINUE_MESSAGE);
   }
 }
 
diff --git a/build-system/tasks/e2e/selenium-webdriver-controller.js b/build-system/tasks/e2e/selenium-webdriver-controller.js
index 9097c4d32fb0..4b68e4548c7a 100644
--- a/build-system/tasks/e2e/selenium-webdriver-controller.js
+++ b/build-system/tasks/e2e/selenium-webdriver-controller.js
@@ -15,17 +15,12 @@
  */
 
 const fs = require('fs');
-const {
-  By,
-  Condition,
-  Key: SeleniumKey,
-  error,
-} = require('selenium-webdriver');
 const {
   ControllerPromise,
   ElementHandle,
   Key,
 } = require('./functional-test-controller');
+const {By, Condition, Key: SeleniumKey, error} = require('selenium-webdriver');
 const {expect} = require('chai');
 
 const {NoSuchElementError} = error;
@@ -52,7 +47,7 @@ const KeyToSeleniumMap = {
  */
 function expectCondition(valueFn, condition, opt_mutate) {
   opt_mutate = opt_mutate || (x => x);
-  return new Condition('value matches condition', async() => {
+  return new Condition('value matches condition', async () => {
     const value = await valueFn();
     const mutatedValue = await opt_mutate(value);
     return condition(mutatedValue);
@@ -75,8 +70,9 @@ function waitFor(driver, valueFn, condition, opt_mutate) {
     // (like "") do not cause driver.wait to continue waiting.
     return condition(value) ? {value} : null;
   };
-  return driver.wait(expectCondition(valueFn, conditionValue, opt_mutate))
-      .then(result => result.value); // Unbox the value.
+  return driver
+    .wait(expectCondition(valueFn, conditionValue, opt_mutate))
+    .then(result => result.value); // Unbox the value.
 }
 
 /** @implements {FunctionalTestController} */
@@ -124,7 +120,7 @@ class SeleniumWebDriverController {
     const bySelector = By.css(selector);
 
     const label = 'for element to be located ' + selector;
-    const condition = new Condition(label, async() => {
+    const condition = new Condition(label, async () => {
       try {
         const root = await this.getRoot_();
         return await root.findElement(bySelector);
@@ -155,7 +151,7 @@ class SeleniumWebDriverController {
     const bySelector = By.css(selector);
 
     const label = 'for at least one element to be located ' + selector;
-    const condition = new Condition(label, async() => {
+    const condition = new Condition(label, async () => {
       try {
         const root = await this.getRoot_();
         const elements = await root.findElements(bySelector);
@@ -180,13 +176,20 @@ class SeleniumWebDriverController {
     await this.maybeInstallXpath_();
 
     const label = 'for element to be located ' + xpath;
-    const webElement = await this.driver.wait(new Condition(label, async() => {
-      const root = await this.getRoot_();
-      const results = await this.evaluate((xpath, root) => {
-        return window.queryXpath(xpath, root);
-      }, xpath, root);
-      return (results && results[0]);
-    }), ELEMENT_WAIT_TIMEOUT);
+    const webElement = await this.driver.wait(
+      new Condition(label, async () => {
+        const root = await this.getRoot_();
+        const results = await this.evaluate(
+          (xpath, root) => {
+            return window.queryXpath(xpath, root);
+          },
+          xpath,
+          root
+        );
+        return results && results[0];
+      }),
+      ELEMENT_WAIT_TIMEOUT
+    );
     return new ElementHandle(webElement, this);
   }
 
@@ -198,13 +201,20 @@ class SeleniumWebDriverController {
   async findElementsXPath(xpath) {
     await this.maybeInstallXpath_();
     const label = 'for at least one element to be located ' + xpath;
-    const webElements = await this.driver.wait(new Condition(label, async() => {
-      const root = await this.getRoot_();
-      const results = await this.evaluate((xpath, root) => {
-        return window.queryXpath(xpath, root);
-      }, xpath, root);
-      return results;
-    }), ELEMENT_WAIT_TIMEOUT);
+    const webElements = await this.driver.wait(
+      new Condition(label, async () => {
+        const root = await this.getRoot_();
+        const results = await this.evaluate(
+          (xpath, root) => {
+            return window.queryXpath(xpath, root);
+          },
+          xpath,
+          root
+        );
+        return results;
+      }),
+      ELEMENT_WAIT_TIMEOUT
+    );
     return webElements.map(webElement => new ElementHandle(webElement, this));
   }
 
@@ -232,8 +242,7 @@ class SeleniumWebDriverController {
   async getActiveElement() {
     const root = await this.getRoot_();
     const getter = root => root.parentNode.activeElement;
-    const activeElement =
-        await this.driver.executeScript(getter, root);
+    const activeElement = await this.driver.executeScript(getter, root);
     return new ElementHandle(activeElement);
   }
 
@@ -244,8 +253,7 @@ class SeleniumWebDriverController {
   async getDocumentElement() {
     const root = await this.getRoot_();
     const getter = root => root.ownerDocument.documentElement;
-    const documentElement =
-        await this.driver.executeScript(getter, root);
+    const documentElement = await this.driver.executeScript(getter, root);
     return new ElementHandle(documentElement);
   }
 
@@ -265,10 +273,9 @@ class SeleniumWebDriverController {
    * @override
    */
   async type(handle, keys) {
-    const targetElement = handle ?
-      handle.getElement() :
-      await this.driver.switchTo().activeElement();
-
+    const targetElement = handle
+      ? handle.getElement()
+      : await this.driver.switchTo().activeElement();
 
     const key = KeyToSeleniumMap[keys];
     if (key) {
@@ -286,8 +293,9 @@ class SeleniumWebDriverController {
   getElementText(handle) {
     const webElement = handle.getElement();
     return new ControllerPromise(
-        webElement.getText(),
-        this.getWaitFn_(() => webElement.getText()));
+      webElement.getText(),
+      this.getWaitFn_(() => webElement.getText())
+    );
   }
 
   /**
@@ -310,8 +318,9 @@ class SeleniumWebDriverController {
     const webElement = handle.getElement();
     const getter = (element, attribute) => element.getAttribute(attribute);
     return new ControllerPromise(
-        this.evaluate(getter, webElement, attribute),
-        this.getWaitFn_(() => this.evaluate(getter, webElement, attribute)));
+      this.evaluate(getter, webElement, attribute),
+      this.getWaitFn_(() => this.evaluate(getter, webElement, attribute))
+    );
   }
 
   /**
@@ -325,9 +334,11 @@ class SeleniumWebDriverController {
     const getProperty = (element, property) => element[property];
 
     return new ControllerPromise(
-        this.driver.executeScript(getProperty, webElement, property),
-        this.getWaitFn_(() => this.driver.executeScript(
-            getProperty, webElement, property)));
+      this.driver.executeScript(getProperty, webElement, property),
+      this.getWaitFn_(() =>
+        this.driver.executeScript(getProperty, webElement, property)
+      )
+    );
   }
 
   /**
@@ -338,8 +349,9 @@ class SeleniumWebDriverController {
   getElementRect(handle) {
     const webElement = handle.getElement();
     return new ControllerPromise(
-        webElement.getRect(),
-        this.getWaitFn_(() => webElement.getRect()));
+      webElement.getRect(),
+      this.getWaitFn_(() => webElement.getRect())
+    );
   }
 
   /**
@@ -351,8 +363,9 @@ class SeleniumWebDriverController {
   getElementCssValue(handle, styleProperty) {
     const webElement = handle.getElement();
     return new ControllerPromise(
-        webElement.getCssValue(styleProperty),
-        this.getWaitFn_(() => webElement.getCssValue(styleProperty)));
+      webElement.getCssValue(styleProperty),
+      this.getWaitFn_(() => webElement.getCssValue(styleProperty))
+    );
   }
 
   /**
@@ -363,8 +376,9 @@ class SeleniumWebDriverController {
   isElementEnabled(handle) {
     const webElement = handle.getElement();
     return new ControllerPromise(
-        webElement.isEnabled(),
-        this.getWaitFn_(() => webElement.isEnabled()));
+      webElement.isEnabled(),
+      this.getWaitFn_(() => webElement.isEnabled())
+    );
   }
 
   /**
@@ -375,8 +389,9 @@ class SeleniumWebDriverController {
   isElementSelected(handle) {
     const webElement = handle.getElement();
     return new ControllerPromise(
-        webElement.isSelected(),
-        this.getWaitFn_(() => webElement.isSelected()));
+      webElement.isSelected(),
+      this.getWaitFn_(() => webElement.isSelected())
+    );
   }
 
   /**
@@ -386,18 +401,17 @@ class SeleniumWebDriverController {
    * @override
    */
   async setWindowRect(rect) {
-    const {
-      width,
-      height,
-    } = rect;
-
-
-    await this.driver.manage().window().setRect({
-      x: 0,
-      y: 0,
-      width,
-      height,
-    });
+    const {width, height} = rect;
+
+    await this.driver
+      .manage()
+      .window()
+      .setRect({
+        x: 0,
+        y: 0,
+        width,
+        height,
+      });
 
     // Check to make sure we resized the content to the correct size.
     const htmlElement = this.driver.findElement(By.tagName('html'));
@@ -420,10 +434,13 @@ class SeleniumWebDriverController {
     const horizBorder = width - clientWidth;
     const vertBorder = height - clientHeight;
 
-    await this.driver.manage().window().setRect({
-      width: width + horizBorder,
-      height: height + vertBorder,
-    });
+    await this.driver
+      .manage()
+      .window()
+      .setRect({
+        width: width + horizBorder,
+        height: height + vertBorder,
+      });
 
     // Verify the size. The browser may refuse to resize smaller than some
     // size when not running headless. It is better to fail here rather than
@@ -439,11 +456,13 @@ class SeleniumWebDriverController {
     // to fail immediately,.Figure out why, we want the test to fail here
     // instead of continuing.
     expect(resultWidth).to.equal(
-        width,
-        'Failed to resize the window to the requested width.');
+      width,
+      'Failed to resize the window to the requested width.'
+    );
     expect(resultHeight).to.equal(
-        height,
-        'Failed to resize the window to the requested height.');
+      height,
+      'Failed to resize the window to the requested height.'
+    );
   }
 
   /**
@@ -455,8 +474,9 @@ class SeleniumWebDriverController {
     const getTitle = () => document.title;
 
     return new ControllerPromise(
-        this.driver.executeScript(getTitle),
-        this.getWaitFn_(() => this.driver.executeScript(getTitle)));
+      this.driver.executeScript(getTitle),
+      this.getWaitFn_(() => this.driver.executeScript(getTitle))
+    );
   }
 
   /**
@@ -478,11 +498,14 @@ class SeleniumWebDriverController {
   async scroll(handle, opt_scrollToOptions) {
     const webElement = handle.getElement();
     const scrollTo = (element, opt_scrollToOptions) => {
-      element./*OK*/scrollTo(opt_scrollToOptions);
+      element./*OK*/ scrollTo(opt_scrollToOptions);
     };
 
     return await this.driver.executeScript(
-        scrollTo, webElement, opt_scrollToOptions);
+      scrollTo,
+      webElement,
+      opt_scrollToOptions
+    );
   }
 
   /**
@@ -494,11 +517,14 @@ class SeleniumWebDriverController {
   async scrollBy(handle, opt_scrollToOptions) {
     const webElement = handle.getElement();
     const scrollBy = (element, opt_scrollToOptions) => {
-      element./*OK*/scrollBy(opt_scrollToOptions);
+      element./*OK*/ scrollBy(opt_scrollToOptions);
     };
 
     return await this.driver.executeScript(
-        scrollBy, webElement, opt_scrollToOptions);
+      scrollBy,
+      webElement,
+      opt_scrollToOptions
+    );
   }
 
   /**
@@ -510,11 +536,14 @@ class SeleniumWebDriverController {
   async scrollTo(handle, opt_scrollToOptions) {
     const webElement = handle.getElement();
     const scrollTo = (element, opt_scrollToOptions) => {
-      element./*OK*/scrollTo(opt_scrollToOptions);
+      element./*OK*/ scrollTo(opt_scrollToOptions);
     };
 
     return await this.driver.executeScript(
-        scrollTo, webElement, opt_scrollToOptions);
+      scrollTo,
+      webElement,
+      opt_scrollToOptions
+    );
   }
 
   /**
@@ -577,7 +606,9 @@ class SeleniumWebDriverController {
   async switchToShadow(handle) {
     const shadowHost = handle.getElement();
     const shadowRootBody = await this.evaluate(
-        shadowHost => shadowHost.shadowRoot.body, shadowHost);
+      shadowHost => shadowHost.shadowRoot.body,
+      shadowHost
+    );
     this.shadowRoot_ = shadowRootBody;
   }
 
diff --git a/build-system/tasks/extension-generator/index.js b/build-system/tasks/extension-generator/index.js
index 45db600a521f..abacd6a81b0a 100644
--- a/build-system/tasks/extension-generator/index.js
+++ b/build-system/tasks/extension-generator/index.js
@@ -25,8 +25,12 @@ const year = new Date().getFullYear();
 /*eslint "max-len": 0*/
 
 function pascalCase(str) {
-  return str[0].toUpperCase() + str.slice(1).replace(/-([a-z])/g,
-      function(g) { return g[1].toUpperCase(); });
+  return (
+    str[0].toUpperCase() +
+    str.slice(1).replace(/-([a-z])/g, function(g) {
+      return g[1].toUpperCase();
+    })
+  );
 }
 
 function getValidatorFile(name) {
@@ -274,33 +278,45 @@ function getExamplesFile(name) {
 
 async function makeExtension() {
   if (!argv.name) {
-    log(colors.red(
-        'Error! Please pass in the "--name" flag with a value'));
+    log(colors.red('Error! Please pass in the "--name" flag with a value'));
   }
   const {name} = argv;
   const examplesFile = getExamplesFile(name);
 
   fs.mkdirpSync(`extensions/${name}/0.1/test`);
-  fs.writeFileSync(`extensions/${name}/${name}.md`,
-      getMarkdownExtensionFile(name));
-  fs.writeFileSync(`extensions/${name}/validator-${name}.protoascii`,
-      getValidatorFile(name));
-  fs.writeFileSync(`extensions/${name}/0.1/${name}.js`,
-      getJsExtensionFile(name));
-  fs.writeFileSync(`extensions/${name}/0.1/test/test-${name}.js`,
-      getJsTestExtensionFile(name));
-  fs.writeFileSync(`extensions/${name}/0.1/test/validator-${name}.html`,
-      examplesFile);
-
-  const examplesFileValidatorOut = examplesFile.trim().split('\n')
-      .map(line => `|  ${line}`)
-      .join('\n');
-
-  fs.writeFileSync(`extensions/${name}/0.1/test/validator-${name}.out`,
-      ['PASS', examplesFileValidatorOut].join('\n'));
-
-  fs.writeFileSync(`examples/${name}.amp.html`,
-      examplesFile);
+  fs.writeFileSync(
+    `extensions/${name}/${name}.md`,
+    getMarkdownExtensionFile(name)
+  );
+  fs.writeFileSync(
+    `extensions/${name}/validator-${name}.protoascii`,
+    getValidatorFile(name)
+  );
+  fs.writeFileSync(
+    `extensions/${name}/0.1/${name}.js`,
+    getJsExtensionFile(name)
+  );
+  fs.writeFileSync(
+    `extensions/${name}/0.1/test/test-${name}.js`,
+    getJsTestExtensionFile(name)
+  );
+  fs.writeFileSync(
+    `extensions/${name}/0.1/test/validator-${name}.html`,
+    examplesFile
+  );
+
+  const examplesFileValidatorOut = examplesFile
+    .trim()
+    .split('\n')
+    .map(line => `|  ${line}`)
+    .join('\n');
+
+  fs.writeFileSync(
+    `extensions/${name}/0.1/test/validator-${name}.out`,
+    ['PASS', examplesFileValidatorOut].join('\n')
+  );
+
+  fs.writeFileSync(`examples/${name}.amp.html`, examplesFile);
 }
 
 module.exports = {
diff --git a/build-system/tasks/extension-helpers.js b/build-system/tasks/extension-helpers.js
index b0e61dbee9ea..92b8be9523f2 100644
--- a/build-system/tasks/extension-helpers.js
+++ b/build-system/tasks/extension-helpers.js
@@ -20,7 +20,12 @@ const log = require('fancy-log');
 const minimatch = require('minimatch');
 const watch = require('gulp-watch');
 const wrappers = require('../compile-wrappers');
-const {aliasBundles, extensionBundles, verifyExtensionBundles, verifyExtensionAliasBundles} = require('../../bundles.config');
+const {
+  aliasBundles,
+  extensionBundles,
+  verifyExtensionBundles,
+  verifyExtensionAliasBundles,
+} = require('../../bundles.config');
 const {compileJs, mkdirSync} = require('./helpers');
 const {isTravisBuild} = require('../travis');
 const {jsifyCssAsync} = require('./jsify-css');
@@ -77,9 +82,9 @@ function declareExtension(name, version, latestVersion, options) {
   const versions = Array.isArray(version) ? version : [version];
   versions.forEach(v => {
     extensions[`${name}-${v}`] = Object.assign(
-        {name, version: v, latestVersion},
-        defaultOptions,
-        options
+      {name, version: v, latestVersion},
+      defaultOptions,
+      options
     );
   });
   if (name.startsWith('amp-ad-network-')) {
@@ -105,7 +110,11 @@ function maybeInitializeExtensions() {
     verifyExtensionAliasBundles();
     aliasBundles.forEach(c => {
       declareExtensionVersionAlias(
-          c.name, c.version, c.latestVersion, c.options);
+        c.name,
+        c.version,
+        c.latestVersion,
+        c.options
+      );
     });
   }
 }
@@ -176,21 +185,26 @@ function getExtensionsToBuild() {
  */
 function parseExtensionFlags() {
   if (!isTravisBuild()) {
-    const noExtensionsMessage = green('⤷ Use ') +
-        cyan('--noextensions ') +
-        green('to skip building extensions.');
-    const extensionsMessage = green('⤷ Use ') +
-        cyan('--extensions=amp-foo,amp-bar ') +
-        green('to choose which extensions to build.');
-    const minimalSetMessage = green('⤷ Use ') +
-        cyan('--extensions=minimal_set ') +
-        green('to build just the extensions needed to load ') +
-        cyan('article.amp.html') + green('.');
-    const extensionsFromMessage = green('⤷ Use ') +
-        cyan('--extensions_from=examples/foo.amp.html ') +
-        green('to build extensions from example docs.');
+    const noExtensionsMessage =
+      green('⤷ Use ') +
+      cyan('--noextensions ') +
+      green('to skip building extensions.');
+    const extensionsMessage =
+      green('⤷ Use ') +
+      cyan('--extensions=amp-foo,amp-bar ') +
+      green('to choose which extensions to build.');
+    const minimalSetMessage =
+      green('⤷ Use ') +
+      cyan('--extensions=minimal_set ') +
+      green('to build just the extensions needed to load ') +
+      cyan('article.amp.html') +
+      green('.');
+    const extensionsFromMessage =
+      green('⤷ Use ') +
+      cyan('--extensions_from=examples/foo.amp.html ') +
+      green('to build extensions from example docs.');
     if (argv.extensions) {
-      if (typeof (argv.extensions) !== 'string') {
+      if (typeof argv.extensions !== 'string') {
         log(red('ERROR:'), 'Missing list of extensions.');
         log(noExtensionsMessage);
         log(extensionsMessage);
@@ -202,8 +216,10 @@ function parseExtensionFlags() {
     }
 
     if (argv.extensions || argv.extensions_from) {
-      log(green('Building extension(s):'),
-          cyan(getExtensionsToBuild().join(', ')));
+      log(
+        green('Building extension(s):'),
+        cyan(getExtensionsToBuild().join(', '))
+      );
     } else if (argv.noextensions) {
       log(green('Not building any AMP extensions.'));
     } else {
@@ -261,7 +277,7 @@ function getExtensionsFromArg(examples) {
  */
 function dedupe(arr) {
   const map = Object.create(null);
-  arr.forEach(item => map[item] = true);
+  arr.forEach(item => (map[item] = true));
   return Object.keys(map);
 }
 
@@ -277,26 +293,29 @@ function buildExtensions(options) {
     return Promise.resolve();
   }
 
-  const extensionsToBuild = options.compileAll ?
-    [] : getExtensionsToBuild();
+  const extensionsToBuild = options.compileAll ? [] : getExtensionsToBuild();
 
   const results = [];
   for (const key in extensions) {
-    if (extensionsToBuild.length > 0 &&
-        extensionsToBuild.indexOf(extensions[key].name) == -1) {
+    if (
+      extensionsToBuild.length > 0 &&
+      extensionsToBuild.indexOf(extensions[key].name) == -1
+    ) {
       continue;
     }
     const e = extensions[key];
     let o = Object.assign({}, options);
     o = Object.assign(o, e);
-    results.push(buildExtension(
+    results.push(
+      buildExtension(
         e.name,
         e.version,
         e.latestVersion,
         e.hasCss,
         o,
         e.extraGlobs
-    ));
+      )
+    );
   }
   return Promise.all(results);
 }
@@ -322,7 +341,13 @@ function buildExtensions(options) {
  * @return {!Promise}
  */
 function buildExtension(
-  name, version, latestVersion, hasCss, options, opt_extraGlobs) {
+  name,
+  version,
+  latestVersion,
+  hasCss,
+  options,
+  opt_extraGlobs
+) {
   options = options || {};
   options.extraGlobs = opt_extraGlobs;
   if (options.compileOnlyCss && !hasCss) {
@@ -390,14 +415,19 @@ function buildExtensionCss(path, name, version, options) {
     fs.writeFileSync(cssName, css, 'utf-8');
   }
   const promises = [];
-  const mainCssBinary = jsifyCssAsync(path + '/' + name + '.css')
-      .then(writeCssBinaries.bind(null, `${name}-${version}.css`));
+  const mainCssBinary = jsifyCssAsync(path + '/' + name + '.css').then(
+    writeCssBinaries.bind(null, `${name}-${version}.css`)
+  );
 
   if (Array.isArray(options.cssBinaries)) {
-    promises.push.apply(promises, options.cssBinaries.map(function(name) {
-      return jsifyCssAsync(`${path}/${name}.css`)
-          .then(css => writeCssBinaries(`${name}-${version}.css`, css));
-    }));
+    promises.push.apply(
+      promises,
+      options.cssBinaries.map(function(name) {
+        return jsifyCssAsync(`${path}/${name}.css`).then(css =>
+          writeCssBinaries(`${name}-${version}.css`, css)
+        );
+      })
+    );
   }
   promises.push(mainCssBinary);
   return Promise.all(promises);
@@ -417,18 +447,24 @@ function buildExtensionCss(path, name, version, options) {
  */
 function buildExtensionJs(path, name, version, latestVersion, options) {
   const filename = options.filename || name + '.js';
-  return compileJs(path + '/', filename, './dist/v0', Object.assign(options, {
-    toName: `${name}-${version}.max.js`,
-    minifiedName: `${name}-${version}.js`,
-    latestName: version === latestVersion ? `${name}-latest.js` : '',
-    // Wrapper that either registers the extension or schedules it for
-    // execution after the main binary comes back.
-    // The `function` is wrapped in `()` to avoid lazy parsing it,
-    // since it will be immediately executed anyway.
-    // See https://github.com/ampproject/amphtml/issues/3977
-    wrapper: options.noWrapper ? ''
-      : wrappers.extension(name, options.loadPriority),
-  })).then(() => {
+  return compileJs(
+    path + '/',
+    filename,
+    './dist/v0',
+    Object.assign(options, {
+      toName: `${name}-${version}.max.js`,
+      minifiedName: `${name}-${version}.js`,
+      latestName: version === latestVersion ? `${name}-latest.js` : '',
+      // Wrapper that either registers the extension or schedules it for
+      // execution after the main binary comes back.
+      // The `function` is wrapped in `()` to avoid lazy parsing it,
+      // since it will be immediately executed anyway.
+      // See https://github.com/ampproject/amphtml/issues/3977
+      wrapper: options.noWrapper
+        ? ''
+        : wrappers.extension(name, options.loadPriority),
+    })
+  ).then(() => {
     // Copy @ampproject/worker-dom/dist/worker.safe.js to the dist/ folder.
     if (name === 'amp-script') {
       // TODO(choumx): Compile this when worker-dom externs are available.
diff --git a/build-system/tasks/firebase.js b/build-system/tasks/firebase.js
index 015848f61c1d..f98b6fcea8b6 100644
--- a/build-system/tasks/firebase.js
+++ b/build-system/tasks/firebase.js
@@ -21,7 +21,6 @@ const path = require('path');
 const {build} = require('./build');
 const {dist} = require('./dist');
 
-
 async function walk(dest) {
   const filelist = [];
   const files = await fs.readdir(dest);
@@ -29,9 +28,9 @@ async function walk(dest) {
   for (let i = 0; i < files.length; i++) {
     const file = `${dest}/${files[i]}`;
 
-    fs.statSync(file).isDirectory() ?
-      Array.prototype.push.apply(filelist, await walk(file)) :
-      filelist.push(file);
+    fs.statSync(file).isDirectory()
+      ? Array.prototype.push.apply(filelist, await walk(file))
+      : filelist.push(file);
   }
 
   return filelist;
@@ -41,8 +40,9 @@ async function copyAndReplaceUrls(src, dest) {
   await fs.copy(src, dest, {overwrite: true});
   // Recursively gets all the files within the directory and its children.
   const files = await walk(dest);
-  const promises = files.filter(fileName => path.extname(fileName) == '.html')
-      .map(file => replaceUrls(file));
+  const promises = files
+    .filter(fileName => path.extname(fileName) == '.html')
+    .map(file => replaceUrls(file));
   await Promise.all(promises);
 }
 
@@ -50,8 +50,9 @@ async function modifyThirdPartyUrl() {
   const filePath = 'firebase/dist/amp.js';
   const data = await fs.readFile('firebase/dist/amp.js', 'utf8');
   const result = data.replace(
-      'self.AMP_CONFIG={',
-      'self.AMP_CONFIG={"thirdPartyUrl":location.origin,');
+    'self.AMP_CONFIG={',
+    'self.AMP_CONFIG={"thirdPartyUrl":location.origin,'
+  );
   await fs.writeFile(filePath, result, 'utf8');
 }
 
@@ -67,8 +68,9 @@ async function firebase() {
   if (argv.file) {
     log(colors.green(`Processing file: ${argv.file}.`));
     log(colors.green('Writing file to firebase.index.html.'));
-    await fs.copyFile(/*src*/ argv.file, 'firebase/index.html',
-        {overwrite: true});
+    await fs.copyFile(/*src*/ argv.file, 'firebase/index.html', {
+      overwrite: true,
+    });
     await replaceUrls('firebase/index.html');
   } else {
     await Promise.all([
@@ -83,18 +85,28 @@ async function firebase() {
   ]);
   await Promise.all([
     modifyThirdPartyUrl(),
-    fs.copyFile('firebase/dist/ww.max.js', 'firebase/dist/ww.js',
-        {overwrite: true}),
+    fs.copyFile('firebase/dist/ww.max.js', 'firebase/dist/ww.js', {
+      overwrite: true,
+    }),
   ]);
 }
 
 async function replaceUrls(filePath) {
   const data = await fs.readFile(filePath, 'utf8');
-  let result = data.replace(/https:\/\/cdn\.ampproject\.org\/v0\.js/g, '/dist/amp.js');
+  let result = data.replace(
+    /https:\/\/cdn\.ampproject\.org\/v0\.js/g,
+    '/dist/amp.js'
+  );
   if (argv.min) {
-    result = result.replace(/https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g, '/dist/v0/$1.js');
+    result = result.replace(
+      /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
+      '/dist/v0/$1.js'
+    );
   } else {
-    result = result.replace(/https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g, '/dist/v0/$1.max.js');
+    result = result.replace(
+      /https:\/\/cdn\.ampproject\.org\/v0\/(.+?).js/g,
+      '/dist/v0/$1.max.js'
+    );
   }
   await fs.writeFile(filePath, result, 'utf8');
 }
diff --git a/build-system/tasks/get-zindex/index.js b/build-system/tasks/get-zindex/index.js
index 8d47d7c7d14a..32abd0e42f2f 100644
--- a/build-system/tasks/get-zindex/index.js
+++ b/build-system/tasks/get-zindex/index.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const fs = require('fs');
 const gulp = require('gulp');
 const PluginError = require('plugin-error');
@@ -23,17 +22,13 @@ const postcss = require('postcss');
 const table = require('text-table');
 const through = require('through2');
 
-const tableHeaders = [
-  ['selector', 'z-index', 'file'],
-  ['---', '---', '---'],
-];
+const tableHeaders = [['selector', 'z-index', 'file'], ['---', '---', '---']];
 
 const tableOptions = {
   align: ['l', 'l', 'l'],
   hsep: '   |   ',
 };
 
-
 /**
  * @param {!Object<string, !Array<number>} acc accumulator object for selectors
  * @param {!Rules} css post css rules object
@@ -74,11 +69,12 @@ function onFileThrough(file, enc, cb) {
   const selectors = Object.create(null);
 
   postcss([zIndexCollector.bind(null, selectors)])
-      .process(file.contents.toString(), {
-        from: file.relative,
-      }).then(() => {
-        cb(null, {name: file.relative, selectors});
-      });
+    .process(file.contents.toString(), {
+      from: file.relative,
+    })
+    .then(() => {
+      cb(null, {name: file.relative, selectors});
+    });
 }
 
 /**
@@ -88,14 +84,18 @@ function onFileThrough(file, enc, cb) {
  */
 function createTable(filesData) {
   const rows = [];
-  Object.keys(filesData).sort().forEach(fileName => {
-    const selectors = filesData[fileName];
-    Object.keys(selectors).sort().forEach(selectorName => {
-      const zIndex = selectors[selectorName];
-      const row = [selectorName, zIndex, fileName];
-      rows.push(row);
+  Object.keys(filesData)
+    .sort()
+    .forEach(fileName => {
+      const selectors = filesData[fileName];
+      Object.keys(selectors)
+        .sort()
+        .forEach(selectorName => {
+          const zIndex = selectors[selectorName];
+          const row = [selectorName, zIndex, fileName];
+          rows.push(row);
+        });
     });
-  });
   rows.sort((a, b) => {
     const aZIndex = parseInt(a[1], 10);
     const bZIndex = parseInt(b[1], 10);
@@ -104,7 +104,6 @@ function createTable(filesData) {
   return rows;
 }
 
-
 /**
  * @param {string} glob
  * @return {!Stream}
@@ -120,16 +119,16 @@ function getZindex(cb) {
   const filesData = Object.create(null);
   // Don't return the stream here since we do a `writeFileSync`
   getZindexStream('{css,src,extensions}/**/*.css')
-      .on('data', chunk => {
-        filesData[chunk.name] = chunk.selectors;
-      })
-      .on('end', () => {
-        const rows = createTable(filesData);
-        rows.unshift.apply(rows, tableHeaders);
-        const tbl = table(rows, tableOptions);
-        fs.writeFileSync('css/Z_INDEX.md', tbl);
-        cb();
-      });
+    .on('data', chunk => {
+      filesData[chunk.name] = chunk.selectors;
+    })
+    .on('end', () => {
+      const rows = createTable(filesData);
+      rows.unshift.apply(rows, tableHeaders);
+      const tbl = table(rows, tableOptions);
+      fs.writeFileSync('css/Z_INDEX.md', tbl);
+      cb();
+    });
 }
 
 module.exports = {
@@ -139,4 +138,4 @@ module.exports = {
 };
 
 getZindex.description =
-    'Runs through all css files of project to gather z-index values';
+  'Runs through all css files of project to gather z-index values';
diff --git a/build-system/tasks/get-zindex/test.js b/build-system/tasks/get-zindex/test.js
index a009a4d116ea..18453c35fa17 100644
--- a/build-system/tasks/get-zindex/test.js
+++ b/build-system/tasks/get-zindex/test.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const m = require('./');
 const test = require('ava');
 
@@ -34,13 +33,13 @@ test.cb('collects selectors', t => {
   const data = Object.create(null);
   const testFiles = `${__dirname}/*.css`;
   m.getZindexStream(testFiles)
-      .on('data', chunk => {
-        data[chunk.name] = chunk.selectors;
-      })
-      .on('end', () => {
-        t.deepEqual(data, result);
-        t.end();
-      });
+    .on('data', chunk => {
+      data[chunk.name] = chunk.selectors;
+    })
+    .on('end', () => {
+      t.deepEqual(data, result);
+      t.end();
+    });
 });
 
 test('sync - create array of arrays with z index order', t => {
diff --git a/build-system/tasks/helpers.js b/build-system/tasks/helpers.js
index c17a9a1d08da..80c460b52b5c 100644
--- a/build-system/tasks/helpers.js
+++ b/build-system/tasks/helpers.js
@@ -39,7 +39,7 @@ const {closureCompile} = require('../compile/compile');
 const {isTravisBuild} = require('../travis');
 const {thirdPartyFrames} = require('../config');
 const {transpileTs} = require('../typescript');
-const {VERSION: internalRuntimeVersion} = require('../internal-version') ;
+const {VERSION: internalRuntimeVersion} = require('../internal-version');
 
 const {green, red, cyan} = colors;
 const argv = require('minimist')(process.argv.slice(2));
@@ -57,9 +57,7 @@ const EXTENSION_BUNDLE_MAP = {
     'third_party/d3-geo-projection/d3-geo-projection.js',
     'third_party/vega/vega.js',
   ],
-  'amp-inputmask.js': [
-    'third_party/inputmask/bundle.js',
-  ],
+  'amp-inputmask.js': ['third_party/inputmask/bundle.js'],
 };
 
 const UNMINIFIED_TARGETS = [
@@ -108,157 +106,178 @@ function compileAllUnminifiedTargets(watch) {
  */
 function compile(watch, shouldMinify) {
   const promises = [
-    compileJs('./3p/', 'integration.js',
-        './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'), {
-          minifiedName: 'f.js',
-          watch,
-          minify: shouldMinify,
-          externs: ['./ads/ads.extern.js'],
-          include3pDirectories: true,
-          includePolyfills: true,
-        }),
-    compileJs('./3p/', 'ampcontext-lib.js',
-        './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'), {
-          minifiedName: 'ampcontext-v0.js',
-          watch,
-          minify: shouldMinify,
-          externs: ['./ads/ads.extern.js'],
-          include3pDirectories: true,
-          includePolyfills: false,
-        }),
-    compileJs('./3p/', 'iframe-transport-client-lib.js',
-        './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'), {
-          minifiedName: 'iframe-transport-client-v0.js',
-          watch,
-          minify: shouldMinify,
-          externs: ['./ads/ads.extern.js'],
-          include3pDirectories: true,
-          includePolyfills: false,
-        }),
-    compileJs('./3p/', 'recaptcha.js',
-        './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'), {
-          minifiedName: 'recaptcha.js',
-          watch,
-          minify: shouldMinify,
-          externs: [],
-          include3pDirectories: true,
-          includePolyfills: true,
-        }),
-    compileJs('./extensions/amp-viewer-integration/0.1/examples/',
-        'amp-viewer-host.js', './dist/v0/examples', {
-          toName: 'amp-viewer-host.max.js',
-          minifiedName: 'amp-viewer-host.js',
-          incudePolyfills: true,
-          watch,
-          extraGlobs: ['extensions/amp-viewer-integration/**/*.js'],
-          compilationLevel: 'WHITESPACE_ONLY',
-          minify: false,
-        }),
+    compileJs(
+      './3p/',
+      'integration.js',
+      './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'),
+      {
+        minifiedName: 'f.js',
+        watch,
+        minify: shouldMinify,
+        externs: ['./ads/ads.extern.js'],
+        include3pDirectories: true,
+        includePolyfills: true,
+      }
+    ),
+    compileJs(
+      './3p/',
+      'ampcontext-lib.js',
+      './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'),
+      {
+        minifiedName: 'ampcontext-v0.js',
+        watch,
+        minify: shouldMinify,
+        externs: ['./ads/ads.extern.js'],
+        include3pDirectories: true,
+        includePolyfills: false,
+      }
+    ),
+    compileJs(
+      './3p/',
+      'iframe-transport-client-lib.js',
+      './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'),
+      {
+        minifiedName: 'iframe-transport-client-v0.js',
+        watch,
+        minify: shouldMinify,
+        externs: ['./ads/ads.extern.js'],
+        include3pDirectories: true,
+        includePolyfills: false,
+      }
+    ),
+    compileJs(
+      './3p/',
+      'recaptcha.js',
+      './dist.3p/' + (shouldMinify ? internalRuntimeVersion : 'current'),
+      {
+        minifiedName: 'recaptcha.js',
+        watch,
+        minify: shouldMinify,
+        externs: [],
+        include3pDirectories: true,
+        includePolyfills: true,
+      }
+    ),
+    compileJs(
+      './extensions/amp-viewer-integration/0.1/examples/',
+      'amp-viewer-host.js',
+      './dist/v0/examples',
+      {
+        toName: 'amp-viewer-host.max.js',
+        minifiedName: 'amp-viewer-host.js',
+        incudePolyfills: true,
+        watch,
+        extraGlobs: ['extensions/amp-viewer-integration/**/*.js'],
+        compilationLevel: 'WHITESPACE_ONLY',
+        minify: false,
+      }
+    ),
   ];
 
   if (!argv.single_pass && (!watch || argv.with_shadow)) {
     promises.push(
-        compileJs('./src/', 'amp-shadow.js', './dist', {
-          minifiedName: 'shadow-v0.js',
-          includePolyfills: true,
-          watch,
-          minify: shouldMinify,
-        })
+      compileJs('./src/', 'amp-shadow.js', './dist', {
+        minifiedName: 'shadow-v0.js',
+        includePolyfills: true,
+        watch,
+        minify: shouldMinify,
+      })
     );
   }
 
   if (!watch || argv.with_video_iframe_integration) {
     promises.push(
-        compileJs('./src/', 'video-iframe-integration.js', './dist', {
-          minifiedName: 'video-iframe-integration-v0.js',
-          includePolyfills: false,
-          watch,
-          minify: shouldMinify,
-        }));
+      compileJs('./src/', 'video-iframe-integration.js', './dist', {
+        minifiedName: 'video-iframe-integration-v0.js',
+        includePolyfills: false,
+        watch,
+        minify: shouldMinify,
+      })
+    );
   }
 
   if (!watch || argv.with_inabox) {
     if (!argv.single_pass) {
       promises.push(
-          // Entry point for inabox runtime.
-          compileJs('./src/inabox/', 'amp-inabox.js', './dist', {
-            toName: 'amp-inabox.js',
-            minifiedName: 'amp4ads-v0.js',
-            includePolyfills: true,
-            extraGlobs: ['src/inabox/*.js', '3p/iframe-messaging-client.js'],
-            watch,
-            minify: shouldMinify,
-          }));
-    }
-    promises.push(
-        // inabox-host
-        compileJs('./ads/inabox/', 'inabox-host.js', './dist', {
-          toName: 'amp-inabox-host.js',
-          minifiedName: 'amp4ads-host-v0.js',
-          includePolyfills: false,
+        // Entry point for inabox runtime.
+        compileJs('./src/inabox/', 'amp-inabox.js', './dist', {
+          toName: 'amp-inabox.js',
+          minifiedName: 'amp4ads-v0.js',
+          includePolyfills: true,
+          extraGlobs: ['src/inabox/*.js', '3p/iframe-messaging-client.js'],
           watch,
           minify: shouldMinify,
         })
+      );
+    }
+    promises.push(
+      // inabox-host
+      compileJs('./ads/inabox/', 'inabox-host.js', './dist', {
+        toName: 'amp-inabox-host.js',
+        minifiedName: 'amp4ads-host-v0.js',
+        includePolyfills: false,
+        watch,
+        minify: shouldMinify,
+      })
     );
   }
 
   if (argv.with_inabox_lite) {
     promises.push(
-        // Entry point for inabox runtime.
-        compileJs('./src/inabox/', 'amp-inabox-lite.js', './dist', {
-          toName: 'amp-inabox-lite.js',
-          minifiedName: 'amp4ads-lite-v0.js',
-          includePolyfills: true,
-          extraGlobs: ['src/inabox/*.js', '3p/iframe-messaging-client.js'],
-          watch,
-          minify: shouldMinify,
-        }));
+      // Entry point for inabox runtime.
+      compileJs('./src/inabox/', 'amp-inabox-lite.js', './dist', {
+        toName: 'amp-inabox-lite.js',
+        minifiedName: 'amp4ads-lite-v0.js',
+        includePolyfills: true,
+        extraGlobs: ['src/inabox/*.js', '3p/iframe-messaging-client.js'],
+        watch,
+        minify: shouldMinify,
+      })
+    );
   }
 
   thirdPartyFrames.forEach(frameObject => {
     promises.push(
-        thirdPartyBootstrap(
-            frameObject.max, frameObject.min, shouldMinify)
+      thirdPartyBootstrap(frameObject.max, frameObject.min, shouldMinify)
     );
   });
 
   if (watch) {
     thirdPartyFrames.forEach(frameObject => {
       gulpWatch(frameObject.max, function() {
-        thirdPartyBootstrap(
-            frameObject.max, frameObject.min, shouldMinify);
+        thirdPartyBootstrap(frameObject.max, frameObject.min, shouldMinify);
       });
     });
   }
 
   return Promise.all(promises)
-      .then(() => {
+    .then(() => {
+      return compileJs('./src/', 'amp.js', './dist', {
+        toName: 'amp.js',
+        minifiedName: 'v0.js',
+        includePolyfills: true,
+        watch,
+        minify: shouldMinify,
+        wrapper: wrappers.mainBinary,
+        singlePassCompilation: argv.single_pass,
+        esmPassCompilation: argv.esm,
+      });
+    })
+    .then(() => {
+      if (!argv.single_pass) {
         return compileJs('./src/', 'amp.js', './dist', {
-          toName: 'amp.js',
-          minifiedName: 'v0.js',
+          toName: 'amp-esm.js',
+          minifiedName: 'v0-esm.js',
           includePolyfills: true,
+          includeOnlyESMLevelPolyfills: true,
           watch,
           minify: shouldMinify,
           wrapper: wrappers.mainBinary,
-          singlePassCompilation: argv.single_pass,
-          esmPassCompilation: argv.esm,
         });
-      })
-      .then(() => {
-        if (!argv.single_pass) {
-          return compileJs('./src/', 'amp.js', './dist', {
-            toName: 'amp-esm.js',
-            minifiedName: 'v0-esm.js',
-            includePolyfills: true,
-            includeOnlyESMLevelPolyfills: true,
-            watch,
-            minify: shouldMinify,
-            wrapper: wrappers.mainBinary,
-          });
-        } else {
-          return Promise.resolve();
-        }
-      });
+      } else {
+        return Promise.resolve();
+      }
+    });
 }
 
 /**
@@ -279,10 +298,14 @@ function appendToCompiledFile(srcFilename, destFilePath) {
     const firstLineBreak = file.indexOf('\n');
     const wrapperOpen = file.substr(0, firstLineBreak + 1);
     const reactDates = fs.readFileSync(
-        'third_party/react-dates/bundle.js', 'utf8');
+      'third_party/react-dates/bundle.js',
+      'utf8'
+    );
     // Inject the bundle inside the standard AMP wrapper (after the first line).
     const newSource = [
-      wrapperOpen, reactDates, file.substr(firstLineBreak + 1),
+      wrapperOpen,
+      reactDates,
+      file.substr(firstLineBreak + 1),
     ].join('\n');
     fs.writeFileSync(destFilePath, newSource, 'utf8');
   }
@@ -301,44 +324,44 @@ function compileMinifiedJs(srcDir, srcFilename, destDir, options) {
   const entryPoint = path.join(srcDir, srcFilename);
   const {minifiedName} = options;
   return closureCompile(entryPoint, destDir, minifiedName, options)
-      .then(function() {
-        const destPath = path.join(destDir, minifiedName);
-        appendToCompiledFile(srcFilename, destPath);
-        fs.writeFileSync(
-            path.join(destDir, 'version.txt'), internalRuntimeVersion);
-        if (options.latestName) {
-          fs.copySync(
-              destPath,
-              path.join(destDir, options.latestName));
-        }
-      })
-      .then(() => {
-        let name = minifiedName;
-        if (options.latestName) {
-          name += ` → ${options.latestName}`;
-        }
-        if (options.singlePassCompilation) {
-          altMainBundles.forEach(bundle => {
-            name += `, ${bundle.name}.js`;
-          });
-          name += ', and all extensions';
-        }
-        endBuildStep('Minified', name, startTime);
-      })
-      .then(() => {
-        if (argv.fortesting && MINIFIED_TARGETS.includes(minifiedName)) {
-          return enableLocalTesting(`${destDir}/${minifiedName}`);
-        }
-      })
-      .then(() => {
-        if (argv.fortesting && options.singlePassCompilation) {
-          const promises = [];
-          altMainBundles.forEach(bundle => {
-            promises.push(enableLocalTesting(`dist/${bundle.name}.js`));
-          });
-          return Promise.all(promises);
-        }
-      });
+    .then(function() {
+      const destPath = path.join(destDir, minifiedName);
+      appendToCompiledFile(srcFilename, destPath);
+      fs.writeFileSync(
+        path.join(destDir, 'version.txt'),
+        internalRuntimeVersion
+      );
+      if (options.latestName) {
+        fs.copySync(destPath, path.join(destDir, options.latestName));
+      }
+    })
+    .then(() => {
+      let name = minifiedName;
+      if (options.latestName) {
+        name += ` → ${options.latestName}`;
+      }
+      if (options.singlePassCompilation) {
+        altMainBundles.forEach(bundle => {
+          name += `, ${bundle.name}.js`;
+        });
+        name += ', and all extensions';
+      }
+      endBuildStep('Minified', name, startTime);
+    })
+    .then(() => {
+      if (argv.fortesting && MINIFIED_TARGETS.includes(minifiedName)) {
+        return enableLocalTesting(`${destDir}/${minifiedName}`);
+      }
+    })
+    .then(() => {
+      if (argv.fortesting && options.singlePassCompilation) {
+        const promises = [];
+        altMainBundles.forEach(bundle => {
+          promises.push(enableLocalTesting(`dist/${bundle.name}.js`));
+        });
+        return Promise.all(promises);
+      }
+    });
 }
 
 /**
@@ -370,17 +393,16 @@ function handleBundleError(err, failOnError, srcFilename, startTime) {
  * @param {?Object} options
  */
 function finishBundle(srcFilename, destDir, destFilename, options) {
-  appendToCompiledFile(srcFilename,
-      path.join(destDir, destFilename));
+  appendToCompiledFile(srcFilename, path.join(destDir, destFilename));
 
   if (options.latestName) {
     // "amp-foo-latest.js" -> "amp-foo-latest.max.js"
-    const latestMaxName =
-        options.latestName.split('.js')[0] + '.max.js';
+    const latestMaxName = options.latestName.split('.js')[0] + '.max.js';
     // Copy amp-foo-0.1.js to amp-foo-latest.max.js.
     fs.copySync(
-        path.join(destDir, options.toName),
-        path.join(destDir, latestMaxName));
+      path.join(destDir, options.toName),
+      path.join(destDir, latestMaxName)
+    );
   }
 }
 
@@ -407,15 +429,37 @@ function compileUnminifiedJs(srcDir, srcFilename, destDir, options) {
   const devWrapper = wrapper.replace('<%= contents %>', '$1');
 
   const lazybuild = lazypipe()
-      .pipe(source, srcFilename)
-      .pipe(buffer)
-      .pipe(sourcemaps.init.bind(sourcemaps), {loadMaps: true})
-      .pipe(regexpSourcemaps, /\$internalRuntimeVersion\$/g, internalRuntimeVersion, 'runtime-version')
-      .pipe(regexpSourcemaps, /([^]+)/, devWrapper, 'wrapper');
+    .pipe(
+      source,
+      srcFilename
+    )
+    .pipe(buffer)
+    .pipe(
+      sourcemaps.init.bind(sourcemaps),
+      {loadMaps: true}
+    )
+    .pipe(
+      regexpSourcemaps,
+      /\$internalRuntimeVersion\$/g,
+      internalRuntimeVersion,
+      'runtime-version'
+    )
+    .pipe(
+      regexpSourcemaps,
+      /([^]+)/,
+      devWrapper,
+      'wrapper'
+    );
 
   const lazywrite = lazypipe()
-      .pipe(sourcemaps.write.bind(sourcemaps), './')
-      .pipe(gulp.dest.bind(gulp), destDir);
+    .pipe(
+      sourcemaps.write.bind(sourcemaps),
+      './'
+    )
+    .pipe(
+      gulp.dest.bind(gulp),
+      destDir
+    );
 
   const destFilename = options.toName || srcFilename;
   /**
@@ -425,28 +469,31 @@ function compileUnminifiedJs(srcDir, srcFilename, destDir, options) {
   function rebundle(failOnError) {
     const startTime = Date.now();
     return toPromise(
-        bundler.bundle()
-            .on('error', err => handleBundleError(
-                err, failOnError, srcFilename, startTime))
-            .pipe(lazybuild())
-            .pipe(rename(destFilename))
-            .pipe(lazywrite())
-            .on('end', () => finishBundle(
-                srcFilename, destDir, destFilename, options)))
-        .then(() => {
-          let name = destFilename;
-          if (options.latestName) {
-            const latestMaxName =
-                options.latestName.split('.js')[0] + '.max.js';
-            name = `${name} → ${latestMaxName}`;
-          }
-          endBuildStep('Compiled', name, startTime);
-        })
-        .then(() => {
-          if (UNMINIFIED_TARGETS.includes(destFilename)) {
-            return enableLocalTesting(`${destDir}/${destFilename}`);
-          }
-        });
+      bundler
+        .bundle()
+        .on('error', err =>
+          handleBundleError(err, failOnError, srcFilename, startTime)
+        )
+        .pipe(lazybuild())
+        .pipe(rename(destFilename))
+        .pipe(lazywrite())
+        .on('end', () =>
+          finishBundle(srcFilename, destDir, destFilename, options)
+        )
+    )
+      .then(() => {
+        let name = destFilename;
+        if (options.latestName) {
+          const latestMaxName = options.latestName.split('.js')[0] + '.max.js';
+          name = `${name} → ${latestMaxName}`;
+        }
+        endBuildStep('Compiled', name, startTime);
+      })
+      .then(() => {
+        if (UNMINIFIED_TARGETS.includes(destFilename)) {
+          return enableLocalTesting(`${destDir}/${destFilename}`);
+        }
+      });
   }
 
   if (options.watch) {
@@ -536,12 +583,20 @@ function endBuildStep(stepName, targetName, startTime) {
  */
 function printConfigHelp(command) {
   if (!isTravisBuild()) {
-    log(green('Building version'), cyan(internalRuntimeVersion),
-        green('of the runtime for local testing with the'),
-        cyan((argv.config === 'canary') ? 'canary' : 'prod'),
-        green('AMP config.'));
-    log(green('⤷ Use'), cyan('--config={canary|prod}'), green('with your'),
-        cyan(command), green('command to specify which config to apply.'));
+    log(
+      green('Building version'),
+      cyan(internalRuntimeVersion),
+      green('of the runtime for local testing with the'),
+      cyan(argv.config === 'canary' ? 'canary' : 'prod'),
+      green('AMP config.')
+    );
+    log(
+      green('⤷ Use'),
+      cyan('--config={canary|prod}'),
+      green('with your'),
+      cyan(command),
+      green('command to specify which config to apply.')
+    );
   }
 }
 
@@ -550,11 +605,18 @@ function printConfigHelp(command) {
  */
 function printNobuildHelp() {
   if (!isTravisBuild()) {
-    for (const task of NOBUILD_HELP_TASKS) { // eslint-disable-line amphtml-internal/no-for-of-statement
+    for (const task of NOBUILD_HELP_TASKS) {
+      // eslint-disable-line amphtml-internal/no-for-of-statement
       if (argv._.includes(task)) {
-        log(green('To skip building during future'), cyan(task),
-            green('runs, use'), cyan('--nobuild'), green('with your'),
-            cyan(`gulp ${task}`), green('command.'));
+        log(
+          green('To skip building during future'),
+          cyan(task),
+          green('runs, use'),
+          cyan('--nobuild'),
+          green('with your'),
+          cyan(`gulp ${task}`),
+          green('command.')
+        );
         return;
       }
     }
@@ -567,15 +629,20 @@ function printNobuildHelp() {
  * @param {string} targetFile File to which the config is to be written.
  */
 async function enableLocalTesting(targetFile) {
-  const config = (argv.config === 'canary') ? 'canary' : 'prod';
+  const config = argv.config === 'canary' ? 'canary' : 'prod';
   const baseConfigFile =
-      'build-system/global-configs/' + config + '-config.json';
+    'build-system/global-configs/' + config + '-config.json';
 
   return removeConfig(targetFile).then(() => {
     return applyConfig(
-        config, targetFile, baseConfigFile,
-        /* opt_localDev */ true, /* opt_localBranch */ true,
-        /* opt_branch */ false, /* opt_fortesting */ !!argv.fortesting);
+      config,
+      targetFile,
+      baseConfigFile,
+      /* opt_localDev */ true,
+      /* opt_localBranch */ true,
+      /* opt_branch */ false,
+      /* opt_fortesting */ !!argv.fortesting
+    );
   });
 }
 
@@ -586,9 +653,11 @@ async function enableLocalTesting(targetFile) {
  * @return {string} The concatenated contents of the given files.
  */
 function concatFilesToString(files) {
-  return files.map(function(filePath) {
-    return fs.readFileSync(filePath, 'utf8');
-  }).join(MODULE_SEPARATOR);
+  return files
+    .map(function(filePath) {
+      return fs.readFileSync(filePath, 'utf8');
+    })
+    .join(MODULE_SEPARATOR);
 }
 
 /**
@@ -603,11 +672,11 @@ function concatFilesToString(files) {
 function thirdPartyBootstrap(input, outputName, shouldMinify) {
   const startTime = Date.now();
   if (!shouldMinify) {
-    return toPromise(gulp.src(input)
-        .pipe(gulp.dest('dist.3p/current')))
-        .then(() => {
-          endBuildStep('Processed', input, startTime);
-        });
+    return toPromise(gulp.src(input).pipe(gulp.dest('dist.3p/current'))).then(
+      () => {
+        endBuildStep('Processed', input, startTime);
+      }
+    );
   }
 
   // By default we use an absolute URL, that is independent of the
@@ -618,9 +687,11 @@ function thirdPartyBootstrap(input, outputName, shouldMinify) {
     ? './f.js'
     : `https://${hostname3p}/${internalRuntimeVersion}/f.js`;
   // Convert default relative URL to absolute min URL.
-  const html = fs.readFileSync(input, 'utf8')
-      .replace(/\.\/integration\.js/g, integrationJs);
-  return toPromise(file(outputName, html, {src: true})
+  const html = fs
+    .readFileSync(input, 'utf8')
+    .replace(/\.\/integration\.js/g, integrationJs);
+  return toPromise(
+    file(outputName, html, {src: true})
       .pipe(gulp.dest('dist.3p/' + internalRuntimeVersion))
       .on('end', function() {
         const aliasToLatestBuild = 'dist.3p/current-min';
@@ -628,13 +699,14 @@ function thirdPartyBootstrap(input, outputName, shouldMinify) {
           fs.unlinkSync(aliasToLatestBuild);
         }
         fs.symlinkSync(
-            './' + internalRuntimeVersion,
-            aliasToLatestBuild,
-            'dir');
-      }))
-      .then(() => {
-        endBuildStep('Processed', input, startTime);
-      });
+          './' + internalRuntimeVersion,
+          aliasToLatestBuild,
+          'dir'
+        );
+      })
+  ).then(() => {
+    endBuildStep('Processed', input, startTime);
+  });
 }
 
 /**
@@ -666,28 +738,37 @@ async function buildExperiments(options) {
 
   // Build HTML.
   const html = fs.readFileSync(htmlPath, 'utf8');
-  const minHtml = html.replace('/dist.tools/experiments/experiments.js',
-      `https://${hostname}/v0/experiments.js`);
-  gulp.src(htmlPath)
-      .pipe(file('experiments.cdn.html', minHtml))
-      .pipe(gulp.dest('dist.tools/experiments/'));
+  const minHtml = html.replace(
+    '/dist.tools/experiments/experiments.js',
+    `https://${hostname}/v0/experiments.js`
+  );
+  gulp
+    .src(htmlPath)
+    .pipe(file('experiments.cdn.html', minHtml))
+    .pipe(gulp.dest('dist.tools/experiments/'));
 
   // Build JS.
   const js = fs.readFileSync(jsPath, 'utf8');
   const builtName = 'experiments.max.js';
   const minifiedName = 'experiments.js';
-  return toPromise(gulp.src(path + '/*.js')
+  return toPromise(
+    gulp
+      .src(path + '/*.js')
       .pipe(file(builtName, js))
-      .pipe(gulp.dest('build/experiments/')))
-      .then(function() {
-        return compileJs(
-            './build/experiments/', builtName, './dist.tools/experiments/', {
-              watch: false,
-              minify: options.minify || argv.minify,
-              includePolyfills: true,
-              minifiedName,
-            });
-      });
+      .pipe(gulp.dest('build/experiments/'))
+  ).then(function() {
+    return compileJs(
+      './build/experiments/',
+      builtName,
+      './dist.tools/experiments/',
+      {
+        watch: false,
+        minify: options.minify || argv.minify,
+        includePolyfills: true,
+        minifiedName,
+      }
+    );
+  });
 }
 
 /**
diff --git a/build-system/tasks/jsify-css.js b/build-system/tasks/jsify-css.js
index 4cfe6ec7f1e7..ddcf5ced1ae4 100644
--- a/build-system/tasks/jsify-css.js
+++ b/build-system/tasks/jsify-css.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const autoprefixer = require('autoprefixer');
 const colors = require('ansi-colors');
 const cssnano = require('cssnano');
@@ -65,8 +64,11 @@ function transformCss(filename, opt_cssnano) {
   opt_cssnano = opt_cssnano || Object.create(null);
   // See http://cssnano.co/optimisations/ for full list.
   // We try and turn off any optimization that is marked unsafe.
-  const cssnanoOptions = Object.assign(Object.create(null),
-      cssNanoDefaultOptions, opt_cssnano);
+  const cssnanoOptions = Object.assign(
+    Object.create(null),
+    cssNanoDefaultOptions,
+    opt_cssnano
+  );
   const cssnanoTransformer = cssnano({preset: ['default', cssnanoOptions]});
 
   const css = fs.readFileSync(filename, 'utf8');
diff --git a/build-system/tasks/json-check.js b/build-system/tasks/json-check.js
index 229e1a84a214..7bbf2d11c7ec 100644
--- a/build-system/tasks/json-check.js
+++ b/build-system/tasks/json-check.js
@@ -27,29 +27,35 @@ const expectedCaches = ['cloudflare', 'google'];
  * Fail if caches.json is missing some expected caches.
  */
 async function cachesJson() {
-  return gulp.src(['caches.json'])
-      .pipe(through2.obj(function(file) {
-        let obj;
-        try {
-          obj = JSON.parse(file.contents.toString());
-        } catch (e) {
-          log(colors.yellow('Could not parse caches.json. '
-                + 'This is most likely a fatal error that '
-                + 'will be found by checkValidJson'));
-          return;
-        }
-        const foundCaches = [];
-        for (const foundCache of obj.caches) {
-          foundCaches.push(foundCache.id);
+  return gulp.src(['caches.json']).pipe(
+    through2.obj(function(file) {
+      let obj;
+      try {
+        obj = JSON.parse(file.contents.toString());
+      } catch (e) {
+        log(
+          colors.yellow(
+            'Could not parse caches.json. ' +
+              'This is most likely a fatal error that ' +
+              'will be found by checkValidJson'
+          )
+        );
+        return;
+      }
+      const foundCaches = [];
+      for (const foundCache of obj.caches) {
+        foundCaches.push(foundCache.id);
+      }
+      for (const cache of expectedCaches) {
+        if (!foundCaches.includes(cache)) {
+          log(
+            colors.red('Missing expected cache "' + cache + '" in caches.json')
+          );
+          process.exitCode = 1;
         }
-        for (const cache of expectedCaches) {
-          if (!foundCaches.includes(cache)) {
-            log(colors.red('Missing expected cache "'
-                  + cache + '" in caches.json'));
-            process.exitCode = 1;
-          }
-        }
-      }));
+      }
+    })
+  );
 }
 
 /**
@@ -57,21 +63,25 @@ async function cachesJson() {
  */
 async function jsonSyntax() {
   let hasError = false;
-  return gulp.src(jsonGlobs)
-      .pipe(through2.obj(function(file) {
+  return gulp
+    .src(jsonGlobs)
+    .pipe(
+      through2.obj(function(file) {
         try {
           JSON.parse(file.contents.toString());
         } catch (e) {
-          log(colors.red('Invalid JSON in '
-              + file.relative + ': ' + e.message));
+          log(
+            colors.red('Invalid JSON in ' + file.relative + ': ' + e.message)
+          );
           hasError = true;
         }
-      }))
-      .on('end', function() {
-        if (hasError) {
-          process.exit(1);
-        }
-      });
+      })
+    )
+    .on('end', function() {
+      if (hasError) {
+        process.exit(1);
+      }
+    });
 }
 
 module.exports = {
diff --git a/build-system/tasks/lint.js b/build-system/tasks/lint.js
index d0922945a229..af0e4675e2fb 100644
--- a/build-system/tasks/lint.js
+++ b/build-system/tasks/lint.js
@@ -15,7 +15,6 @@
  */
 'use strict';
 
-
 const argv = require('minimist')(process.argv.slice(2));
 const colors = require('ansi-colors');
 const config = require('../config');
@@ -31,7 +30,7 @@ const {gitDiffNameOnlyMaster} = require('../git');
 const {isTravisBuild} = require('../travis');
 const {maybeUpdatePackages} = require('./update-packages');
 
-const isWatching = (argv.watch || argv.w) || false;
+const isWatching = argv.watch || argv.w || false;
 const options = {
   fix: false,
   quiet: argv.quiet || false,
@@ -48,7 +47,10 @@ const rootDir = path.dirname(path.dirname(__dirname));
 function initializeStream(globs, streamOptions) {
   let stream = gulp.src(globs, streamOptions);
   if (isWatching) {
-    const watcher = lazypipe().pipe(watch, globs);
+    const watcher = lazypipe().pipe(
+      watch,
+      globs
+    );
     stream = stream.pipe(watcher());
   }
   return stream;
@@ -79,44 +81,73 @@ function runLinter(filePath, stream, options) {
     log(colors.green('Starting linter...'));
   }
   const fixedFiles = {};
-  return stream.pipe(eslint(options))
-      .pipe(eslint.formatEach('stylish', function(msg) {
+  return stream
+    .pipe(eslint(options))
+    .pipe(
+      eslint.formatEach('stylish', function(msg) {
         logOnSameLine(msg.trim() + '\n');
-      }))
-      .pipe(eslintIfFixed(filePath))
-      .pipe(eslint.result(function(result) {
+      })
+    )
+    .pipe(eslintIfFixed(filePath))
+    .pipe(
+      eslint.result(function(result) {
         if (!isTravisBuild()) {
           logOnSameLine(colors.green('Linted: ') + result.filePath);
         }
         if (options.fix && result.fixed) {
           const relativePath = path.relative(rootDir, result.filePath);
-          const status = result.errorCount == 0 ?
-            colors.green('Fixed: ') : colors.yellow('Partially fixed: ');
+          const status =
+            result.errorCount == 0
+              ? colors.green('Fixed: ')
+              : colors.yellow('Partially fixed: ');
           logOnSameLine(status + colors.cyan(relativePath));
           fixedFiles[relativePath] = status;
         }
-      }))
-      .pipe(eslint.results(function(results) {
+      })
+    )
+    .pipe(
+      eslint.results(function(results) {
         if (results.errorCount == 0 && results.warningCount == 0) {
           if (!isTravisBuild()) {
-            logOnSameLine(colors.green('SUCCESS: ') +
-                'No linter warnings or errors.');
+            logOnSameLine(
+              colors.green('SUCCESS: ') + 'No linter warnings or errors.'
+            );
           }
         } else {
-          const prefix = results.errorCount == 0 ?
-            colors.yellow('WARNING: ') : colors.red('ERROR: ');
-          logOnSameLine(prefix + 'Found ' +
-              results.errorCount + ' error(s) and ' +
-              results.warningCount + ' warning(s).');
+          const prefix =
+            results.errorCount == 0
+              ? colors.yellow('WARNING: ')
+              : colors.red('ERROR: ');
+          logOnSameLine(
+            prefix +
+              'Found ' +
+              results.errorCount +
+              ' error(s) and ' +
+              results.warningCount +
+              ' warning(s).'
+          );
           if (!options.fix) {
-            log(colors.yellow('NOTE 1:'),
-                'You may be able to automatically fix some of these warnings ' +
+            log(
+              colors.yellow('NOTE 1:'),
+              'You may be able to automatically fix some of these warnings ' +
                 '/ errors by running',
-                colors.cyan('gulp lint --local-changes --fix'),
-                'from your local branch.');
-            log(colors.yellow('NOTE 2:'),
-                'Since this is a destructive operation (that edits your files',
-                'in-place), make sure you commit before running the command.');
+              colors.cyan('gulp lint --local-changes --fix'),
+              'from your local branch.'
+            );
+            log(
+              colors.yellow('NOTE 2:'),
+              'Since this is a destructive operation (that edits your files',
+              'in-place), make sure you commit before running the command.'
+            );
+            log(
+              colors.yellow('NOTE 3:'),
+              'If you see any',
+              colors.cyan('prettier/prettier'),
+              'errors, read',
+              colors.cyan(
+                'https://github.com/ampproject/amphtml/blob/master/contributing/getting-started-e2e.md#code-quality-and-style'
+              )
+            );
           }
         }
         if (options.fix && Object.keys(fixedFiles).length > 0) {
@@ -125,8 +156,9 @@ function runLinter(filePath, stream, options) {
             log(fixedFiles[file] + colors.cyan(file));
           });
         }
-      }))
-      .pipe(eslint.failAfterError());
+      })
+    )
+    .pipe(eslint.failAfterError());
 }
 
 /**
@@ -147,10 +179,14 @@ function jsFilesChanged() {
  * @return {boolean}
  */
 function eslintRulesChanged() {
-  return gitDiffNameOnlyMaster().filter(function(file) {
-    return path.basename(file).includes('.eslintrc') ||
-        path.dirname(file) === 'build-system/eslint-rules';
-  }).length > 0;
+  return (
+    gitDiffNameOnlyMaster().filter(function(file) {
+      return (
+        path.basename(file).includes('.eslintrc') ||
+        path.dirname(file) === 'build-system/eslint-rules'
+      );
+    }).length > 0
+  );
 }
 
 /**
@@ -159,8 +195,9 @@ function eslintRulesChanged() {
  * @param {!Array<string>} files
  */
 function setFilesToLint(files) {
-  config.lintGlobs =
-      config.lintGlobs.filter(e => e !== '**/*.js').concat(files);
+  config.lintGlobs = config.lintGlobs
+    .filter(e => e !== '**/*.js')
+    .concat(files);
   if (!isTravisBuild()) {
     log(colors.green('INFO: ') + 'Running lint on the following files:');
     files.forEach(file => {
@@ -180,8 +217,10 @@ function lint() {
   }
   if (argv.files) {
     setFilesToLint(argv.files.split(','));
-  } else if (!eslintRulesChanged() &&
-      (process.env.LOCAL_PR_CHECK || argv['local-changes'])) {
+  } else if (
+    !eslintRulesChanged() &&
+    (process.env.LOCAL_PR_CHECK || argv['local-changes'])
+  ) {
     const jsFiles = jsFilesChanged();
     if (jsFiles.length == 0) {
       log(colors.green('INFO: ') + 'No JS files in this PR');
@@ -202,7 +241,6 @@ lint.description = 'Validates against Google Closure Linter';
 lint.flags = {
   'watch': '  Watches for changes in files, validates against the linter',
   'fix': '  Fixes simple lint errors (spacing etc)',
-  'local-changes':
-      '  Lints just the changes commited to the local branch',
+  'local-changes': '  Lints just the changes commited to the local branch',
   'quiet': '  Suppress warnings from outputting',
 };
diff --git a/build-system/tasks/mocha-ci-reporter.js b/build-system/tasks/mocha-ci-reporter.js
index bc6e8ce122c3..fd5d65cd6453 100644
--- a/build-system/tasks/mocha-ci-reporter.js
+++ b/build-system/tasks/mocha-ci-reporter.js
@@ -48,8 +48,9 @@ function ciReporter(runner) {
     const {failures, stats} = self;
     Base.list(failures);
     process.stdout.write(
-        `Executed ${stats.failures + stats.passes} of ${stats.tests} ` +
-        `(Skipped ${stats.pending}) `);
+      `Executed ${stats.failures + stats.passes} of ${stats.tests} ` +
+        `(Skipped ${stats.pending}) `
+    );
     if (stats.failures == 0) {
       process.stdout.write(Base.color('green', 'SUCCESS \n'));
     } else {
diff --git a/build-system/tasks/nailgun.js b/build-system/tasks/nailgun.js
index 32045b40d794..a52f017e2622 100644
--- a/build-system/tasks/nailgun.js
+++ b/build-system/tasks/nailgun.js
@@ -24,10 +24,12 @@ const {isTravisBuild} = require('../travis');
 
 // Used to start and stop the Closure nailgun server
 let nailgunRunnerReplacer;
-const nailgunRunner =
-    require.resolve('../../third_party/nailgun/nailgun-runner');
-const nailgunServer =
-    require.resolve('../../third_party/nailgun/nailgun-server.jar');
+const nailgunRunner = require.resolve(
+  '../../third_party/nailgun/nailgun-runner'
+);
+const nailgunServer = require.resolve(
+  '../../third_party/nailgun/nailgun-server.jar'
+);
 const customRunner = require.resolve('../runner/dist/runner.jar');
 const DEFAULT_NAILGUN_PORT = '2113';
 const CLOSURE_NAILGUN_PORT = '2114';
@@ -39,17 +41,28 @@ const NAILGUN_STARTUP_TIMEOUT_MS = 5 * 1000;
 function maybeReplaceDefaultCompiler() {
   if (process.platform == 'darwin') {
     return require('require-hijack')
-        .replace('google-closure-compiler-osx').with(nailgunRunner);
+      .replace('google-closure-compiler-osx')
+      .with(nailgunRunner);
     return true;
   } else if (process.platform == 'linux') {
     return require('require-hijack')
-        .replace('google-closure-compiler-linux').with(nailgunRunner);
+      .replace('google-closure-compiler-linux')
+      .with(nailgunRunner);
   } else {
-    log(yellow('WARNING:'), 'Cannot run', cyan('nailgun-server.jar'),
-        'on', cyan(process.platform));
-    log(yellow('WARNING:'),
-        'Closure compiler will be significantly slower than on',
-        cyan('macos'), 'or', cyan('linux'));
+    log(
+      yellow('WARNING:'),
+      'Cannot run',
+      cyan('nailgun-server.jar'),
+      'on',
+      cyan(process.platform)
+    );
+    log(
+      yellow('WARNING:'),
+      'Closure compiler will be significantly slower than on',
+      cyan('macos'),
+      'or',
+      cyan('linux')
+    );
     return null;
   }
 }
@@ -67,14 +80,13 @@ async function startNailgunServer(port, detached) {
 
   // Start up the nailgun server after cleaning up old instances (if any)
   const startNailgunServerCmd =
-      'java -XX:+TieredCompilation -server -cp ' +
-      `${nailgunServer}:${customRunner} ` +
-      `com.facebook.nailgun.NGServer ${port}`;
-  const stopNailgunServerCmd =
-      `${nailgunRunner} --nailgun-port ${port} ng-stop`;
+    'java -XX:+TieredCompilation -server -cp ' +
+    `${nailgunServer}:${customRunner} ` +
+    `com.facebook.nailgun.NGServer ${port}`;
+  const stopNailgunServerCmd = `${nailgunRunner} --nailgun-port ${port} ng-stop`;
   const getVersionCmd =
-      `${nailgunRunner} --nailgun-port ${port} ` +
-      'org.ampproject.AmpCommandLineRunner -- --version';
+    `${nailgunRunner} --nailgun-port ${port} ` +
+    'org.ampproject.AmpCommandLineRunner -- --version';
   exec(stopNailgunServerCmd, {stdio: 'pipe'});
   const nailgunServerProcess = execScriptAsync(startNailgunServerCmd, {
     stdio: detached ? 'ignore' : 'pipe',
@@ -99,8 +111,13 @@ async function startNailgunServer(port, detached) {
       await sleep(1000);
     }
   }
-  log(red('ERROR:'), 'Could not start',
-      cyan('nailgun-server.jar'), 'on port', cyan(port) + '...');
+  log(
+    red('ERROR:'),
+    'Could not start',
+    cyan('nailgun-server.jar'),
+    'on port',
+    cyan(port) + '...'
+  );
   process.exit(1);
 }
 
@@ -114,16 +131,19 @@ async function stopNailgunServer(port) {
     nailgunRunnerReplacer.restore();
   }
   if (process.platform == 'darwin' || process.platform == 'linux') {
-    const stopNailgunServerCmd =
-        `${nailgunRunner} --nailgun-port ${port} ng-stop`;
+    const stopNailgunServerCmd = `${nailgunRunner} --nailgun-port ${port} ng-stop`;
     if (exec(stopNailgunServerCmd, {stdio: 'pipe'}).status == 0) {
       if (!isTravisBuild()) {
-        log('Stopped', cyan('nailgun-server.jar'), 'on port',
-            cyan(port));
+        log('Stopped', cyan('nailgun-server.jar'), 'on port', cyan(port));
       }
     } else {
-      log(yellow('WARNING:'), 'Could not find a running instance of',
-          cyan('nailgun-server.jar'), 'on port', cyan(port));
+      log(
+        yellow('WARNING:'),
+        'Could not find a running instance of',
+        cyan('nailgun-server.jar'),
+        'on port',
+        cyan(port)
+      );
     }
   }
 }
diff --git a/build-system/tasks/pr-check.js b/build-system/tasks/pr-check.js
index be7350e7627c..b2c940526e1e 100644
--- a/build-system/tasks/pr-check.js
+++ b/build-system/tasks/pr-check.js
@@ -23,8 +23,8 @@ const {
 const {determineBuildTargets} = require('../pr-check/build-targets');
 
 const FILENAME = 'pr-check.js';
-const timedExecOrDie =
-  (cmd, unusedFileName) => timedExecOrDieBase(cmd, FILENAME);
+const timedExecOrDie = (cmd, unusedFileName) =>
+  timedExecOrDieBase(cmd, FILENAME);
 
 /**
  * This file runs tests against the local workspace to mimic the CI build as
@@ -51,13 +51,11 @@ async function prCheck() {
     timedExecOrDie('gulp check-types');
   }
 
-  if (buildTargets.has('RUNTIME') ||
-      buildTargets.has('UNIT_TEST')) {
+  if (buildTargets.has('RUNTIME') || buildTargets.has('UNIT_TEST')) {
     timedExecOrDie('gulp test --unit --local-changes --headless');
   }
 
-  if (buildTargets.has('RUNTIME') ||
-      buildTargets.has('INTEGRATION_TEST')) {
+  if (buildTargets.has('RUNTIME') || buildTargets.has('INTEGRATION_TEST')) {
     if (!argv.nobuild) {
       timedExecOrDie('gulp clean');
       timedExecOrDie('gulp dist --fortesting');
@@ -65,13 +63,11 @@ async function prCheck() {
     timedExecOrDie('gulp test --nobuild --integration --headless');
   }
 
-  if (buildTargets.has('RUNTIME') ||
-      buildTargets.has('VALIDATOR')) {
+  if (buildTargets.has('RUNTIME') || buildTargets.has('VALIDATOR')) {
     timedExecOrDie('gulp validator');
   }
 
-  if (buildTargets.has('RUNTIME') ||
-      buildTargets.has('VALIDATOR_WEBUI')) {
+  if (buildTargets.has('RUNTIME') || buildTargets.has('VALIDATOR_WEBUI')) {
     timedExecOrDie('gulp validator-webui');
   }
 }
@@ -81,7 +77,7 @@ module.exports = {
 };
 
 prCheck.description =
-    'Runs a subset of the Travis CI checks against local changes.';
+  'Runs a subset of the Travis CI checks against local changes.';
 prCheck.flags = {
   'nobuild': '  Skips building the runtime via `gulp dist`.',
 };
diff --git a/build-system/tasks/prepend-global/index.js b/build-system/tasks/prepend-global/index.js
index 3e06a0a2dca8..6fce1dd937ad 100644
--- a/build-system/tasks/prepend-global/index.js
+++ b/build-system/tasks/prepend-global/index.js
@@ -48,7 +48,8 @@ function sanityCheck(str) {
   const numMatches = numConfigs(str);
   if (numMatches != 1) {
     throw new Error(
-        'Found ' + numMatches + ' AMP_CONFIG(s) before write. Aborting!');
+      'Found ' + numMatches + ' AMP_CONFIG(s) before write. Aborting!'
+    );
   }
 }
 
@@ -64,15 +65,14 @@ function checkoutBranchConfigs(filename, opt_localBranch, opt_branch) {
   }
   const branch = opt_branch || 'origin/master';
   // One bad path here will fail the whole operation.
-  return exec(`git checkout ${branch} ${filename}`)
-      .catch(function(e) {
-        // This means the files don't exist in master. Assume that it exists
-        // in the current branch.
-        if (/did not match any file/.test(e.message)) {
-          return;
-        }
-        throw e;
-      });
+  return exec(`git checkout ${branch} ${filename}`).catch(function(e) {
+    // This means the files don't exist in master. Assume that it exists
+    // in the current branch.
+    if (/did not match any file/.test(e.message)) {
+      return;
+    }
+    throw e;
+  });
 }
 
 /**
@@ -81,8 +81,10 @@ function checkoutBranchConfigs(filename, opt_localBranch, opt_branch) {
  * @return {string}
  */
 function prependConfig(configString, fileString) {
-  return `self.AMP_CONFIG||(self.AMP_CONFIG=${configString});` +
-    `/*AMP_CONFIG*/${fileString}`;
+  return (
+    `self.AMP_CONFIG||(self.AMP_CONFIG=${configString});` +
+    `/*AMP_CONFIG*/${fileString}`
+  );
 }
 
 /**
@@ -123,45 +125,54 @@ function valueOrDefault(value, defaultValue) {
  * @return {!Promise}
  */
 function applyConfig(
-  config, target, filename, opt_localDev, opt_localBranch, opt_branch,
-  opt_fortesting) {
+  config,
+  target,
+  filename,
+  opt_localDev,
+  opt_localBranch,
+  opt_branch,
+  opt_fortesting
+) {
   return checkoutBranchConfigs(filename, opt_localBranch, opt_branch)
-      .then(() => {
-        return Promise.all([
-          fs.readFileAsync(filename),
-          fs.readFileAsync(target),
-        ]);
-      })
-      .then(files => {
-        let configJson;
-        try {
-          configJson = JSON.parse(files[0].toString());
-        } catch (e) {
-          log(red(`Error parsing config file: ${filename}`));
-          throw e;
-        }
-        if (opt_localDev) {
-          configJson = enableLocalDev(config, target, configJson);
-        }
-        if (opt_fortesting) {
-          configJson = Object.assign({test: true}, configJson);
-        }
-        const targetString = files[1].toString();
-        const configString = JSON.stringify(configJson);
-        return prependConfig(configString, targetString);
-      })
-      .then(fileString => {
-        sanityCheck(fileString);
-        return writeTarget(target, fileString, argv.dryrun);
-      })
-      .then(() => {
-        if (!isTravisBuild()) {
-          const details = '(' + cyan(config) +
-              (opt_localDev ? ', ' + cyan('localDev') : '') +
-              (opt_fortesting ? ', ' + cyan('test') : '') + ')';
-          log('Applied AMP config', details, 'to', cyan(path.basename(target)));
-        }
-      });
+    .then(() => {
+      return Promise.all([
+        fs.readFileAsync(filename),
+        fs.readFileAsync(target),
+      ]);
+    })
+    .then(files => {
+      let configJson;
+      try {
+        configJson = JSON.parse(files[0].toString());
+      } catch (e) {
+        log(red(`Error parsing config file: ${filename}`));
+        throw e;
+      }
+      if (opt_localDev) {
+        configJson = enableLocalDev(config, target, configJson);
+      }
+      if (opt_fortesting) {
+        configJson = Object.assign({test: true}, configJson);
+      }
+      const targetString = files[1].toString();
+      const configString = JSON.stringify(configJson);
+      return prependConfig(configString, targetString);
+    })
+    .then(fileString => {
+      sanityCheck(fileString);
+      return writeTarget(target, fileString, argv.dryrun);
+    })
+    .then(() => {
+      if (!isTravisBuild()) {
+        const details =
+          '(' +
+          cyan(config) +
+          (opt_localDev ? ', ' + cyan('localDev') : '') +
+          (opt_fortesting ? ', ' + cyan('test') : '') +
+          ')';
+        log('Applied AMP config', details, 'to', cyan(path.basename(target)));
+      }
+    });
 }
 
 /**
@@ -174,10 +185,10 @@ function enableLocalDev(config, target, configJson) {
   let LOCAL_DEV_AMP_CONFIG = {localDev: true};
   const TESTING_HOST = process.env.AMP_TESTING_HOST;
   if (typeof TESTING_HOST == 'string') {
-    const TESTING_HOST_FULL_URL = TESTING_HOST.match(/^https?:\/\//) ?
-      TESTING_HOST : 'http://' + TESTING_HOST;
-    const TESTING_HOST_NO_PROTOCOL =
-      TESTING_HOST.replace(/^https?:\/\//, '');
+    const TESTING_HOST_FULL_URL = TESTING_HOST.match(/^https?:\/\//)
+      ? TESTING_HOST
+      : 'http://' + TESTING_HOST;
+    const TESTING_HOST_NO_PROTOCOL = TESTING_HOST.replace(/^https?:\/\//, '');
 
     LOCAL_DEV_AMP_CONFIG = Object.assign(LOCAL_DEV_AMP_CONFIG, {
       thirdPartyUrl: TESTING_HOST_FULL_URL,
@@ -185,8 +196,14 @@ function enableLocalDev(config, target, configJson) {
       thirdPartyFrameRegex: TESTING_HOST_NO_PROTOCOL,
     });
     if (!isTravisBuild()) {
-      log('Set', cyan('TESTING_HOST'), 'to', cyan(TESTING_HOST),
-          'in', cyan(target));
+      log(
+        'Set',
+        cyan('TESTING_HOST'),
+        'to',
+        cyan(TESTING_HOST),
+        'in',
+        cyan(target)
+      );
     }
   }
   return Object.assign(LOCAL_DEV_AMP_CONFIG, configJson);
@@ -197,22 +214,20 @@ function enableLocalDev(config, target, configJson) {
  * @return {!Promise}
  */
 function removeConfig(target) {
-  return fs.readFileAsync(target)
-      .then(file => {
-        let contents = file.toString();
-        if (numConfigs(contents) == 0) {
-          return Promise.resolve();
-        }
-        sanityCheck(contents);
-        const config =
-        /self\.AMP_CONFIG\|\|\(self\.AMP_CONFIG=.*?\/\*AMP_CONFIG\*\//;
-        contents = contents.replace(config, '');
-        return writeTarget(target, contents, argv.dryrun).then(() => {
-          if (!isTravisBuild()) {
-            log('Removed existing config from', cyan(target));
-          }
-        });
-      });
+  return fs.readFileAsync(target).then(file => {
+    let contents = file.toString();
+    if (numConfigs(contents) == 0) {
+      return Promise.resolve();
+    }
+    sanityCheck(contents);
+    const config = /self\.AMP_CONFIG\|\|\(self\.AMP_CONFIG=.*?\/\*AMP_CONFIG\*\//;
+    contents = contents.replace(config, '');
+    return writeTarget(target, contents, argv.dryrun).then(() => {
+      if (!isTravisBuild()) {
+        log('Removed existing config from', cyan(target));
+      }
+    });
+  });
 }
 
 async function prependGlobal() {
@@ -238,16 +253,26 @@ async function prependGlobal() {
   // Prod by default.
   const config = argv.canary ? 'canary' : 'prod';
   if (argv.canary) {
-    filename = valueOrDefault(argv.canary,
-        'build-system/global-configs/canary-config.json');
+    filename = valueOrDefault(
+      argv.canary,
+      'build-system/global-configs/canary-config.json'
+    );
   } else {
-    filename = valueOrDefault(argv.prod,
-        'build-system/global-configs/prod-config.json');
+    filename = valueOrDefault(
+      argv.prod,
+      'build-system/global-configs/prod-config.json'
+    );
   }
   return removeConfig(target).then(() => {
     return applyConfig(
-        config, target, filename,
-        argv.local_dev, argv.local_branch, argv.branch, argv.fortesting);
+      config,
+      target,
+      filename,
+      argv.local_dev,
+      argv.local_branch,
+      argv.branch,
+      argv.fortesting
+    );
   });
 }
 
@@ -266,16 +291,20 @@ module.exports = {
 prependGlobal.description = 'Prepends a json config to a target file';
 prependGlobal.flags = {
   'target': '  The file to prepend the json config to.',
-  'canary': '  Prepend the default canary config. ' +
-      'Takes in an optional value for a custom canary config source.',
-  'prod': '  Prepend the default prod config. ' +
-      'Takes in an optional value for a custom prod config source.',
+  'canary':
+    '  Prepend the default canary config. ' +
+    'Takes in an optional value for a custom canary config source.',
+  'prod':
+    '  Prepend the default prod config. ' +
+    'Takes in an optional value for a custom prod config source.',
   'local_dev': '  Enables runtime to be used for local development.',
-  'branch': '  Switch to a git branch to get config source from. ' +
-      'Uses master by default.',
-  'local_branch': '  Don\'t switch branches and use the config from the ' +
-      'local branch.',
+  'branch':
+    '  Switch to a git branch to get config source from. ' +
+    'Uses master by default.',
+  'local_branch':
+    "  Don't switch branches and use the config from the local branch.",
   'fortesting': '  Force the config to return true for getMode().test',
-  'remove': '  Removes previously prepended json config from the target ' +
-      'file (if present).',
+  'remove':
+    '  Removes previously prepended json config from the target ' +
+    'file (if present).',
 };
diff --git a/build-system/tasks/prepend-global/test.js b/build-system/tasks/prepend-global/test.js
index 60b049f6831d..3d75765c47d2 100644
--- a/build-system/tasks/prepend-global/test.js
+++ b/build-system/tasks/prepend-global/test.js
@@ -15,16 +15,17 @@
  */
 'use strict';
 
-
 const m = require('./');
 const test = require('ava');
 
-
 test('sync - prepends global config', t => {
   t.plan(1);
   const res = m.prependConfig('{"hello":"world"}', 'var x = 1 + 1;');
-  t.is(res, 'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"});' +
-      '/*AMP_CONFIG*/var x = 1 + 1;');
+  t.is(
+    res,
+    'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"});' +
+      '/*AMP_CONFIG*/var x = 1 + 1;'
+  );
 });
 
 test('sync - valueOrDefault', t => {
@@ -37,15 +38,17 @@ test('sync - valueOrDefault', t => {
 
 test('sync - sanityCheck', t => {
   t.plan(3);
-  const badStr = 'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
-      '/*AMP_CONFIG*/' +
-      'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
-      '/*AMP_CONFIG*/' +
-      'var x = 1 + 1;';
+  const badStr =
+    'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
+    '/*AMP_CONFIG*/' +
+    'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
+    '/*AMP_CONFIG*/' +
+    'var x = 1 + 1;';
   const badStr2 = 'var x = 1 + 1;';
-  const goodStr = 'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
-      '/*AMP_CONFIG*/' +
-      'var x = 1 + 1;';
+  const goodStr =
+    'self.AMP_CONFIG||(self.AMP_CONFIG={"hello":"world"})' +
+    '/*AMP_CONFIG*/' +
+    'var x = 1 + 1;';
   t.false(m.numConfigs(badStr) == 1);
   t.true(m.numConfigs(goodStr) == 1);
   t.false(m.numConfigs(badStr2) == 1);
diff --git a/build-system/tasks/presubmit-checks.js b/build-system/tasks/presubmit-checks.js
index aa46c5bcff05..3b52bb022ae0 100644
--- a/build-system/tasks/presubmit-checks.js
+++ b/build-system/tasks/presubmit-checks.js
@@ -25,22 +25,25 @@ const through2 = require('through2');
 const dedicatedCopyrightNoteSources = /(\.js|\.css|\.go)$/;
 
 const requiresReviewPrivacy =
-    'Usage of this API requires dedicated review due to ' +
-    'being privacy sensitive. Please file an issue asking for permission' +
-    ' to use if you have not yet done so.';
+  'Usage of this API requires dedicated review due to ' +
+  'being privacy sensitive. Please file an issue asking for permission' +
+  ' to use if you have not yet done so.';
 
-const privateServiceFactory = 'This service should only be installed in ' +
-    'the whitelisted files. Other modules should use a public function ' +
-    'typically called serviceNameFor.';
+const privateServiceFactory =
+  'This service should only be installed in ' +
+  'the whitelisted files. Other modules should use a public function ' +
+  'typically called serviceNameFor.';
 
 const shouldNeverBeUsed =
-    'Usage of this API is not allowed - only for internal purposes.';
+  'Usage of this API is not allowed - only for internal purposes.';
 
-const backwardCompat = 'This method must not be called. It is only retained ' +
-    'for backward compatibility during rollout.';
+const backwardCompat =
+  'This method must not be called. It is only retained ' +
+  'for backward compatibility during rollout.';
 
-const realiasGetMode = 'Do not re-alias getMode or its return so it can be ' +
-    'DCE\'d. Use explicitly like "getMode().localDev" instead.';
+const realiasGetMode =
+  'Do not re-alias getMode or its return so it can be ' +
+  'DCE\'d. Use explicitly like "getMode().localDev" instead.';
 
 // Terms that must not appear in our source files.
 const forbiddenTerms = {
@@ -72,11 +75,12 @@ const forbiddenTerms = {
   'dev\\(\\)\\.assert\\(': 'Use the devAssert function instead.',
   '[^.]user\\(\\)\\.assert\\(': 'Use the userAssert function instead.',
   'it\\.only': '',
-  'Math\.random[^;()]*=': 'Use Sinon to stub!!!',
+  'Math.random[^;()]*=': 'Use Sinon to stub!!!',
   'gulp-util': {
-    message: '`gulp-util` will be deprecated soon. See ' +
-        'https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5 ' +
-        'for a list of alternatives.',
+    message:
+      '`gulp-util` will be deprecated soon. See ' +
+      'https://medium.com/gulpjs/gulp-util-ca3b1f9f9ac5 ' +
+      'for a list of alternatives.',
   },
   'document-register-element.node': {
     message: 'Use `document-register-element.patched` instead',
@@ -92,12 +96,14 @@ const forbiddenTerms = {
     message: 'Use a sandbox instead to avoid repeated `#restore` calls',
   },
   'sandbox\\.(spy|stub|mock)\\([^,\\s]*[iI]?frame[^,\\s]*,': {
-    message: 'Do NOT stub on a cross domain iframe! #5359\n' +
-        '  If this is same domain, mark /*OK*/.\n' +
-        '  If this is cross domain, overwrite the method directly.',
+    message:
+      'Do NOT stub on a cross domain iframe! #5359\n' +
+      '  If this is same domain, mark /*OK*/.\n' +
+      '  If this is cross domain, overwrite the method directly.',
   },
   'console\\.\\w+\\(': {
-    message: 'If you run against this, use console/*OK*/.[log|error] to ' +
+    message:
+      'If you run against this, use console/*OK*/.[log|error] to ' +
       'whitelist a legit case.',
     whitelist: [
       'build-system/app.js',
@@ -129,10 +135,7 @@ const forbiddenTerms = {
   // as a variable.
   '\\bgetMode\\([^)]*\\)(?!\\.)': {
     message: realiasGetMode,
-    whitelist: [
-      'src/mode.js',
-      'dist.3p/current/integration.js',
-    ],
+    whitelist: ['src/mode.js', 'dist.3p/current/integration.js'],
   },
   'import[^}]*\\bgetMode as': {
     message: realiasGetMode,
@@ -147,23 +150,22 @@ const forbiddenTerms = {
     ],
   },
   '(?:var|let|const) +IS_DEV +=': {
-    message: 'IS_DEV local var only allowed in mode.js and ' +
-        'dist.3p/current/integration.js',
-    whitelist: [
-      'src/mode.js',
+    message:
+      'IS_DEV local var only allowed in mode.js and ' +
       'dist.3p/current/integration.js',
-    ],
+    whitelist: ['src/mode.js', 'dist.3p/current/integration.js'],
   },
   '\\.prefetch\\(': {
     message: 'Do not use preconnect.prefetch, use preconnect.preload instead.',
   },
   'iframePing': {
-    message: 'This is only available in vendor config for ' +
-        'temporary workarounds.',
+    message:
+      'This is only available in vendor config for temporary workarounds.',
     whitelist: [
       'build-system/routes/analytics.js',
       'extensions/amp-analytics/0.1/config.js',
       'extensions/amp-analytics/0.1/requests.js',
+      'extensions/amp-analytics/0.1/vendors.js',
     ],
   },
   // Service factories that should only be installed once.
@@ -194,23 +196,15 @@ const forbiddenTerms = {
   },
   'cidServiceForDocForTesting': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/service/cid-impl.js',
-    ],
+    whitelist: ['src/service/cid-impl.js'],
   },
   'installCryptoService': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/service/crypto-impl.js',
-      'src/runtime.js',
-    ],
+    whitelist: ['src/service/crypto-impl.js', 'src/runtime.js'],
   },
   'installDocumentStateService': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/service/document-state.js',
-      'src/runtime.js',
-    ],
+    whitelist: ['src/service/document-state.js', 'src/runtime.js'],
   },
   'installDocService': {
     message: privateServiceFactory,
@@ -244,10 +238,7 @@ const forbiddenTerms = {
   },
   'installTemplatesService': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/runtime.js',
-      'src/service/template-impl.js',
-    ],
+    whitelist: ['src/runtime.js', 'src/service/template-impl.js'],
   },
   'installUrlReplacementsServiceForDoc': {
     message: privateServiceFactory,
@@ -268,17 +259,11 @@ const forbiddenTerms = {
   },
   'setViewerVisibilityState': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/runtime.js',
-      'src/service/viewer-impl.js',
-    ],
+    whitelist: ['src/runtime.js', 'src/service/viewer-impl.js'],
   },
   'installViewportServiceForDoc': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/runtime.js',
-      'src/service/viewport/viewport-impl.js',
-    ],
+    whitelist: ['src/runtime.js', 'src/service/viewport/viewport-impl.js'],
   },
   'installVsyncService': {
     message: privateServiceFactory,
@@ -300,10 +285,7 @@ const forbiddenTerms = {
   },
   'installXhrService': {
     message: privateServiceFactory,
-    whitelist: [
-      'src/runtime.js',
-      'src/service/xhr-impl.js',
-    ],
+    whitelist: ['src/runtime.js', 'src/service/xhr-impl.js'],
   },
   'installPositionObserverServiceForDoc': {
     message: privateServiceFactory,
@@ -404,10 +386,7 @@ const forbiddenTerms = {
   },
   'getBaseCid': {
     message: requiresReviewPrivacy,
-    whitelist: [
-      'src/service/cid-impl.js',
-      'src/service/viewer-impl.js',
-    ],
+    whitelist: ['src/service/cid-impl.js', 'src/service/viewer-impl.js'],
   },
   'isTrustedViewer': {
     message: requiresReviewPrivacy,
@@ -425,9 +404,7 @@ const forbiddenTerms = {
   },
   'eval\\(': {
     message: shouldNeverBeUsed,
-    whitelist: [
-      'extension/amp-bind/0.1/test/test-bind-expr.js',
-    ],
+    whitelist: ['extension/amp-bind/0.1/test/test-bind-expr.js'],
   },
   'storageForDoc': {
     message: requiresReviewPrivacy,
@@ -508,8 +485,9 @@ const forbiddenTerms = {
     ],
   },
   'internalListenImplementation': {
-    message: 'Use `listen()` in either `event-helper` or `3p-frame-messaging`' +
-        ', depending on your use case.',
+    message:
+      'Use `listen()` in either `event-helper` or `3p-frame-messaging`' +
+      ', depending on your use case.',
     whitelist: [
       'src/3p-frame-messaging.js',
       'src/event-helper.js',
@@ -519,22 +497,21 @@ const forbiddenTerms = {
   },
   'setTimeout.*throw': {
     message: 'Use dev.error or user.error instead.',
-    whitelist: [
-      'src/log.js',
-    ],
+    whitelist: ['src/log.js'],
   },
-  '(dev|user)\\(\\)\\.(fine|info|warn|error)\\((?!\\s*([A-Z0-9-]+|[\'"`][A-Z0-9-]+[\'"`]))[^,)\n]*': { // eslint-disable-line max-len
-    message: 'Logging message require explicitly `TAG`, or an all uppercase' +
-        ' string as the first parameter',
+  '(dev|user)\\(\\)\\.(fine|info|warn|error)\\((?!\\s*([A-Z0-9-]+|[\'"`][A-Z0-9-]+[\'"`]))[^,)\n]*': {
+    // eslint-disable-line max-len
+    message:
+      'Logging message require explicitly `TAG`, or an all uppercase' +
+      ' string as the first parameter',
   },
   '\\.schedulePass\\(': {
     message: 'schedulePass is heavy, think twice before using it',
-    whitelist: [
-      'src/service/resources-impl.js',
-    ],
+    whitelist: ['src/service/resources-impl.js'],
   },
   '\\.requireLayout\\(': {
-    message: 'requireLayout is restricted b/c it affects non-contained elements', // eslint-disable-line max-len
+    message:
+      'requireLayout is restricted b/c it affects non-contained elements', // eslint-disable-line max-len
     whitelist: [
       'extensions/amp-animation/0.1/web-animations.js',
       'extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js',
@@ -551,14 +528,11 @@ const forbiddenTerms = {
   },
   '(win|Win)(dow)?(\\(\\))?\\.open\\W': {
     message: 'Use dom.openWindowDialog',
-    whitelist: [
-      'src/dom.js',
-    ],
+    whitelist: ['src/dom.js'],
   },
   '\\.getWin\\(': {
     message: backwardCompat,
-    whitelist: [
-    ],
+    whitelist: [],
   },
   '/\\*\\* @type \\{\\!Element\\} \\*/': {
     message: 'Use assertElement instead of casting to !Element.',
@@ -566,6 +540,7 @@ const forbiddenTerms = {
       'src/log.js', // Has actual implementation of assertElement.
       'dist.3p/current/integration.js', // Includes the previous.
       'src/polyfills/custom-elements.js',
+      'ads/google/imaVideo.js', // Required until #22277 is fixed.
     ],
   },
   'startupChunk\\(': {
@@ -578,8 +553,9 @@ const forbiddenTerms = {
     ],
   },
   'AMP_CONFIG': {
-    message: 'Do not access AMP_CONFIG directly. Use isExperimentOn() ' +
-        'and getMode() to access config',
+    message:
+      'Do not access AMP_CONFIG directly. Use isExperimentOn() ' +
+      'and getMode() to access config',
     whitelist: [
       'build-system/amp.extern.js',
       'build-system/app.js',
@@ -600,21 +576,19 @@ const forbiddenTerms = {
     ],
   },
   'data:image/svg(?!\\+xml;charset=utf-8,)[^,]*,': {
-    message: 'SVG data images must use charset=utf-8: ' +
-        '"data:image/svg+xml;charset=utf-8,..."',
+    message:
+      'SVG data images must use charset=utf-8: ' +
+      '"data:image/svg+xml;charset=utf-8,..."',
   },
   'new CustomEvent\\(': {
     message: 'Use createCustomEvent() helper instead.',
-    whitelist: [
-      'src/event-helper.js',
-    ],
+    whitelist: ['src/event-helper.js'],
   },
   'new FormData\\(': {
-    message: 'Use createFormDataWrapper() instead and call ' +
-        'formDataWrapper.getFormData() to get the native FormData object.',
-    whitelist: [
-      'src/form-data-wrapper.js',
-    ],
+    message:
+      'Use createFormDataWrapper() instead and call ' +
+      'formDataWrapper.getFormData() to get the native FormData object.',
+    whitelist: ['src/form-data-wrapper.js'],
   },
   '([eE]xit|[eE]nter|[cC]ancel|[rR]equest)Full[Ss]creen\\(': {
     message: 'Use fullscreenEnter() and fullscreenExit() from dom.js instead.',
@@ -629,26 +603,25 @@ const forbiddenTerms = {
   '\\.defer\\(\\)': {
     message: 'Promise.defer() is deprecated and should not be used.',
   },
-  '(dev|user)\\(\\)\\.assert(Element|String|Number)?\\(\\s*([A-Z][A-Z0-9-]*,)': { // eslint-disable-line max-len
+  '(dev|user)\\(\\)\\.assert(Element|String|Number)?\\(\\s*([A-Z][A-Z0-9-]*,)': {
+    // eslint-disable-line max-len
     message: 'TAG is not an argument to assert(). Will cause false positives.',
   },
   'eslint no-unused-vars': {
     message: 'Use a line-level "no-unused-vars" rule instead.',
-    whitelist: [
-      'extensions/amp-access/0.1/iframe-api/access-controller.js',
-    ],
+    whitelist: ['extensions/amp-access/0.1/iframe-api/access-controller.js'],
   },
   'this\\.skip\\(\\)': {
-    message: 'Use of `this.skip()` is forbidden in test files. Use ' +
-        '`this.skipTest()` from within a `before()` block instead. See #17245.',
+    message:
+      'Use of `this.skip()` is forbidden in test files. Use ' +
+      '`this.skipTest()` from within a `before()` block instead. See #17245.',
     checkInTestFolder: true,
-    whitelist: [
-      'test/_init_tests.js',
-    ],
+    whitelist: ['test/_init_tests.js'],
   },
   '[^\\.]makeBodyVisible\\(': {
-    message: 'This is a protected function. If you are calling this to show ' +
-        'body after an error please use `makeBodyVisibleRecovery`',
+    message:
+      'This is a protected function. If you are calling this to show ' +
+      'body after an error please use `makeBodyVisibleRecovery`',
     whitelist: [
       'src/amp.js',
       'src/amp-shadow.js',
@@ -659,8 +632,9 @@ const forbiddenTerms = {
   },
 };
 
-const ThreePTermsMessage = 'The 3p bootstrap iframe has no polyfills loaded' +
-    ' and can thus not use most modern web APIs.';
+const ThreePTermsMessage =
+  'The 3p bootstrap iframe has no polyfills loaded' +
+  ' and can thus not use most modern web APIs.';
 
 const forbidden3pTerms = {
   // We need to forbid promise usage because we don't have our own polyfill
@@ -670,19 +644,20 @@ const forbidden3pTerms = {
   '\\.then\\((?!callNext)': ThreePTermsMessage,
 };
 
-const bannedTermsHelpString = 'Please review viewport service for helper ' +
-    'methods or mark with `/*OK*/` or `/*REVIEW*/` and consult the AMP team. ' +
-    'Most of the forbidden property/method access banned on the ' +
-    '`forbiddenTermsSrcInclusive` object can be found in ' +
-    '[What forces layout / reflow gist by Paul Irish]' +
-    '(https://gist.github.com/paulirish/5d52fb081b3570c81e3a). ' +
-    'These properties/methods when read/used require the browser ' +
-    'to have the up-to-date value to return which might possibly be an ' +
-    'expensive computation and could also be triggered multiple times ' +
-    'if we are not careful. Please mark the call with ' +
-    '`object./*OK*/property` if you explicitly need to read or update the ' +
-    'forbidden property/method or mark it with `object./*REVIEW*/property` ' +
-    'if you are unsure and so that it stands out in code reviews.';
+const bannedTermsHelpString =
+  'Please review viewport service for helper ' +
+  'methods or mark with `/*OK*/` or `/*REVIEW*/` and consult the AMP team. ' +
+  'Most of the forbidden property/method access banned on the ' +
+  '`forbiddenTermsSrcInclusive` object can be found in ' +
+  '[What forces layout / reflow gist by Paul Irish]' +
+  '(https://gist.github.com/paulirish/5d52fb081b3570c81e3a). ' +
+  'These properties/methods when read/used require the browser ' +
+  'to have the up-to-date value to return which might possibly be an ' +
+  'expensive computation and could also be triggered multiple times ' +
+  'if we are not careful. Please mark the call with ' +
+  '`object./*OK*/property` if you explicitly need to read or update the ' +
+  'forbidden property/method or mark it with `object./*REVIEW*/property` ' +
+  'if you are unsure and so that it stands out in code reviews.';
 
 const forbiddenTermsSrcInclusive = {
   '\\.innerHTML(?!_)': bannedTermsHelpString,
@@ -736,16 +711,15 @@ const forbiddenTermsSrcInclusive = {
     ],
   },
   'getComputedStyle\\(': {
-    message: 'Due to various bugs in Firefox, you must use the computedStyle ' +
-    'helper in style.js.',
-    whitelist: [
-      'src/style.js',
-      'dist.3p/current/integration.js',
-    ],
+    message:
+      'Due to various bugs in Firefox, you must use the computedStyle ' +
+      'helper in style.js.',
+    whitelist: ['src/style.js', 'dist.3p/current/integration.js'],
   },
   'decodeURIComponent\\(': {
-    message: 'decodeURIComponent throws for malformed URL components. Please ' +
-    'use tryDecodeUriComponent from src/url.js',
+    message:
+      'decodeURIComponent throws for malformed URL components. Please ' +
+      'use tryDecodeUriComponent from src/url.js',
     whitelist: [
       '3p/integration.js',
       'dist.3p/current/integration.js',
@@ -760,8 +734,9 @@ const forbiddenTermsSrcInclusive = {
     ],
   },
   'Text(Encoder|Decoder)\\(': {
-    message: 'TextEncoder/TextDecoder is not supported in all browsers.' +
-        ' Please use UTF8 utilities from src/bytes.js',
+    message:
+      'TextEncoder/TextDecoder is not supported in all browsers.' +
+      ' Please use UTF8 utilities from src/bytes.js',
     whitelist: [
       'ads/google/a4a/line-delimited-response-handler.js',
       'examples/pwa/pwa.js',
@@ -813,8 +788,9 @@ const forbiddenTermsSrcInclusive = {
     ],
   },
   'reject\\(\\)': {
-    message: 'Always supply a reason in rejections. ' +
-    'error.cancellation() may be applicable.',
+    message:
+      'Always supply a reason in rejections. ' +
+      'error.cancellation() may be applicable.',
     whitelist: [
       'extensions/amp-access/0.1/access-expr-impl.js',
       'extensions/amp-animation/0.1/parsers/css-expr-impl.js',
@@ -842,9 +818,7 @@ const forbiddenTermsSrcInclusive = {
   },
   '\\.getTime\\(\\)': {
     message: 'Unless you do weird date math (whitelist), use Date.now().',
-    whitelist: [
-      'extensions/amp-timeago/0.1/amp-timeago.js',
-    ],
+    whitelist: ['extensions/amp-timeago/0.1/amp-timeago.js'],
   },
   '\\.expandStringSync\\(': {
     message: requiresReviewPrivacy,
@@ -885,8 +859,9 @@ const forbiddenTermsSrcInclusive = {
     ],
   },
   '(cdn|3p)\\.ampproject\\.': {
-    message: 'The CDN domain should typically not be hardcoded in source ' +
-        'code. Use a property of urls from src/config.js instead.',
+    message:
+      'The CDN domain should typically not be hardcoded in source ' +
+      'code. Use a property of urls from src/config.js instead.',
     whitelist: [
       'ads/_a4a-config.js',
       'build-system/app.js',
@@ -915,29 +890,21 @@ const forbiddenTermsSrcInclusive = {
   },
   '\\.indexOf\\([\'"][^)]+\\)\\s*===?\\s*0\\b': {
     message: 'use startsWith helper in src/string.js',
-    whitelist: [
-      'dist.3p/current/integration.js',
-      'build-system/app.js',
-    ],
+    whitelist: ['dist.3p/current/integration.js', 'build-system/app.js'],
   },
   '\\.indexOf\\(.*===?.*\\.length': 'use endsWith helper in src/string.js',
   '/url-parse-query-string': {
     message: 'Import parseQueryString from `src/url.js`',
-    whitelist: [
-      'src/url.js',
-      'src/mode.js',
-      'dist.3p/current/integration.js',
-    ],
+    whitelist: ['src/url.js', 'src/mode.js', 'dist.3p/current/integration.js'],
   },
   '\\.trim(Left|Right)\\(\\)': {
     message: 'Unsupported on IE; use trim() or a helper instead.',
-    whitelist: [
-      'validator/engine/validator.js',
-    ],
+    whitelist: ['validator/engine/validator.js'],
   },
-  'process\\.env(\\.TRAVIS|\\[\\\'TRAVIS)': {
-    message: 'Do not directly use process.env.TRAVIS. Instead, add a ' +
-        'function to build-system/travis.js',
+  "process\\.env(\\.TRAVIS|\\[\\'TRAVIS)": {
+    message:
+      'Do not directly use process.env.TRAVIS. Instead, add a ' +
+      'function to build-system/travis.js',
     whitelist: [
       'build-system/check-package-manager.js',
       'build-system/travis.js',
@@ -948,15 +915,11 @@ const forbiddenTermsSrcInclusive = {
 
 // Terms that must appear in a source file.
 const requiredTerms = {
-  'Copyright 20(15|16|17|18|19) The AMP HTML Authors\\.':
-      dedicatedCopyrightNoteSources,
-  'Licensed under the Apache License, Version 2\\.0':
-      dedicatedCopyrightNoteSources,
-  'http\\://www\\.apache\\.org/licenses/LICENSE-2\\.0':
-      dedicatedCopyrightNoteSources,
+  'Copyright 20(15|16|17|18|19) The AMP HTML Authors\\.': dedicatedCopyrightNoteSources,
+  'Licensed under the Apache License, Version 2\\.0': dedicatedCopyrightNoteSources,
+  'http\\://www\\.apache\\.org/licenses/LICENSE-2\\.0': dedicatedCopyrightNoteSources,
 };
 
-
 /**
  * Check if root of path is test/ or file is in a folder named test.
  * @param {string} path
@@ -974,8 +937,10 @@ function isInTestFolder(path) {
  */
 function isInBuildSystemFixtureFolder(filePath) {
   const folder = path.dirname(filePath);
-  return folder.startsWith('build-system/babel-plugins') &&
-    folder.includes('test/fixtures');
+  return (
+    folder.startsWith('build-system/babel-plugins') &&
+    folder.includes('test/fixtures')
+  );
 }
 
 /**
@@ -1013,61 +978,75 @@ function stripComments(contents) {
 function matchTerms(file, terms) {
   const contents = stripComments(file.contents.toString());
   const {relative} = file;
-  return Object.keys(terms).map(function(term) {
-    let fix;
-    const {whitelist, checkInTestFolder} = terms[term];
-    // NOTE: we could do a glob test instead of exact check in the future
-    // if needed but that might be too permissive.
-    if (isInBuildSystemFixtureFolder(relative) || (Array.isArray(whitelist) &&
-      (whitelist.indexOf(relative) != -1 ||
-      (isInTestFolder(relative) && !checkInTestFolder)))) {
-      return false;
-    }
-    // we can't optimize building the `RegExp` objects early unless we build
-    // another mapping of term -> regexp object to be able to get back to the
-    // original term to get the possible fix value. This is ok as the
-    // presubmit doesn't have to be blazing fast and this is most likely
-    // negligible.
-    const regex = new RegExp(term, 'gm');
-    let index = 0;
-    let line = 1;
-    let column = 0;
-    let match;
-    let hasTerm = false;
+  return Object.keys(terms)
+    .map(function(term) {
+      let fix;
+      const {whitelist, checkInTestFolder} = terms[term];
+      // NOTE: we could do a glob test instead of exact check in the future
+      // if needed but that might be too permissive.
+      if (
+        isInBuildSystemFixtureFolder(relative) ||
+        (Array.isArray(whitelist) &&
+          (whitelist.indexOf(relative) != -1 ||
+            (isInTestFolder(relative) && !checkInTestFolder)))
+      ) {
+        return false;
+      }
+      // we can't optimize building the `RegExp` objects early unless we build
+      // another mapping of term -> regexp object to be able to get back to the
+      // original term to get the possible fix value. This is ok as the
+      // presubmit doesn't have to be blazing fast and this is most likely
+      // negligible.
+      const regex = new RegExp(term, 'gm');
+      let index = 0;
+      let line = 1;
+      let column = 0;
+      let match;
+      let hasTerm = false;
 
-    while ((match = regex.exec(contents))) {
-      hasTerm = true;
-      for (index; index < match.index; index++) {
-        if (contents[index] === '\n') {
-          line++;
-          column = 1;
-        } else {
-          column++;
+      while ((match = regex.exec(contents))) {
+        hasTerm = true;
+        for (index; index < match.index; index++) {
+          if (contents[index] === '\n') {
+            line++;
+            column = 1;
+          } else {
+            column++;
+          }
         }
-      }
 
-      log(colors.red('Found forbidden: "' + match[0] +
-          '" in ' + relative + ':' + line + ':' + column));
-      if (typeof terms[term] === 'string') {
-        fix = terms[term];
-      } else {
-        fix = terms[term].message;
-      }
+        log(
+          colors.red(
+            'Found forbidden: "' +
+              match[0] +
+              '" in ' +
+              relative +
+              ':' +
+              line +
+              ':' +
+              column
+          )
+        );
+        if (typeof terms[term] === 'string') {
+          fix = terms[term];
+        } else {
+          fix = terms[term].message;
+        }
 
-      // log the possible fix information if provided for the term.
-      if (fix) {
-        log(colors.blue(fix));
+        // log the possible fix information if provided for the term.
+        if (fix) {
+          log(colors.blue(fix));
+        }
+        log(colors.blue('=========='));
       }
-      log(colors.blue('=========='));
-    }
 
-    return hasTerm;
-  }).some(function(hasAnyTerm) {
-    return hasAnyTerm;
-  });
+      return hasTerm;
+    })
+    .some(function(hasAnyTerm) {
+      return hasAnyTerm;
+    });
 }
 
-
 /**
  * Test if a file's contents match any of the
  * forbidden terms
@@ -1085,15 +1064,18 @@ function hasAnyTerms(file) {
 
   hasTerms = matchTerms(file, forbiddenTerms);
 
-  const isTestFile = /^test-/.test(basename) || /^_init_tests/.test(basename)
-      || /_test\.js$/.test(basename);
+  const isTestFile =
+    /^test-/.test(basename) ||
+    /^_init_tests/.test(basename) ||
+    /_test\.js$/.test(basename);
   if (!isTestFile) {
     hasSrcInclusiveTerms = matchTerms(file, forbiddenTermsSrcInclusive);
   }
 
-  const is3pFile = /\/(3p|ads)\//.test(pathname) ||
-      basename == '3p.js' ||
-      basename == 'style.js';
+  const is3pFile =
+    /\/(3p|ads)\//.test(pathname) ||
+    basename == '3p.js' ||
+    basename == 'style.js';
   // Yet another reason to move ads/google/a4a somewhere else
   const isA4A = /\/a4a\//.test(pathname);
   const isRecaptcha = basename == 'recaptcha.js';
@@ -1114,23 +1096,28 @@ function hasAnyTerms(file) {
  */
 function isMissingTerms(file) {
   const contents = file.contents.toString();
-  return Object.keys(requiredTerms).map(function(term) {
-    const filter = requiredTerms[term];
-    if (!filter.test(file.path)) {
-      return false;
-    }
+  return Object.keys(requiredTerms)
+    .map(function(term) {
+      const filter = requiredTerms[term];
+      if (!filter.test(file.path)) {
+        return false;
+      }
 
-    const matches = contents.match(new RegExp(term));
-    if (!matches) {
-      log(colors.red('Did not find required: "' + term +
-          '" in ' + file.relative));
-      log(colors.blue('=========='));
-      return true;
-    }
-    return false;
-  }).some(function(hasMissingTerm) {
-    return hasMissingTerm;
-  });
+      const matches = contents.match(new RegExp(term));
+      if (!matches) {
+        log(
+          colors.red(
+            'Did not find required: "' + term + '" in ' + file.relative
+          )
+        );
+        log(colors.blue('=========='));
+        return true;
+      }
+      return false;
+    })
+    .some(function(hasMissingTerm) {
+      return hasMissingTerm;
+    });
 }
 
 /**
@@ -1140,26 +1127,35 @@ function isMissingTerms(file) {
 function presubmit() {
   let forbiddenFound = false;
   let missingRequirements = false;
-  return gulp.src(srcGlobs)
-      .pipe(through2.obj(function(file, enc, cb) {
+  return gulp
+    .src(srcGlobs)
+    .pipe(
+      through2.obj(function(file, enc, cb) {
         forbiddenFound = hasAnyTerms(file) || forbiddenFound;
         missingRequirements = isMissingTerms(file) || missingRequirements;
         cb();
-      }))
-      .on('end', function() {
-        if (forbiddenFound) {
-          log(colors.blue(
-              'Please remove these usages or consult with the AMP team.'));
-        }
-        if (missingRequirements) {
-          log(colors.blue(
-              'Adding these terms (e.g. by adding a required LICENSE ' +
-            'to the file)'));
-        }
-        if (forbiddenFound || missingRequirements) {
-          process.exitCode = 1;
-        }
-      });
+      })
+    )
+    .on('end', function() {
+      if (forbiddenFound) {
+        log(
+          colors.blue(
+            'Please remove these usages or consult with the AMP team.'
+          )
+        );
+      }
+      if (missingRequirements) {
+        log(
+          colors.blue(
+            'Adding these terms (e.g. by adding a required LICENSE ' +
+              'to the file)'
+          )
+        );
+      }
+      if (forbiddenFound || missingRequirements) {
+        process.exitCode = 1;
+      }
+    });
 }
 
 module.exports = {
@@ -1167,4 +1163,4 @@ module.exports = {
 };
 
 presubmit.description =
-    'Run validation against files to check for forbidden and required terms';
+  'Run validation against files to check for forbidden and required terms';
diff --git a/build-system/tasks/process-3p-github-pr.js b/build-system/tasks/process-3p-github-pr.js
index 6f913fa82a6d..cf47bb62b5e7 100644
--- a/build-system/tasks/process-3p-github-pr.js
+++ b/build-system/tasks/process-3p-github-pr.js
@@ -78,16 +78,17 @@ const ANALYZE_OUTCOME = {
   AD: 1, // Ad integration PR, ping the ad onduty person
 };
 
-const AD_COMMENT = 'Dear contributor! Thank you for the pull request. ' +
-    'It looks like this PR is trying to add support to an ad network. \n \n' +
-    'If this is your first time adding support for ' +
-    'a new third-party ad service, please make sure your follow our ' +
-    '[developer guideline](https://github.com/ampproject/amphtml/blob/master/' +
-    'ads/README.md#developer-guidelines-for-a-pull-request). \n \n' +
-    'If you have not implemented it, we also highly recommend implementing ' +
-    'the [renderStart API](https://github.com/ampproject/amphtml/blob/master/' +
-    'ads/README.md#available-apis) to provide better user experience. ' +
-    'Please let us know if there is any question. \n \n';
+const AD_COMMENT =
+  'Dear contributor! Thank you for the pull request. ' +
+  'It looks like this PR is trying to add support to an ad network. \n \n' +
+  'If this is your first time adding support for ' +
+  'a new third-party ad service, please make sure your follow our ' +
+  '[developer guideline](https://github.com/ampproject/amphtml/blob/master/' +
+  'ads/README.md#developer-guidelines-for-a-pull-request). \n \n' +
+  'If you have not implemented it, we also highly recommend implementing ' +
+  'the [renderStart API](https://github.com/ampproject/amphtml/blob/master/' +
+  'ads/README.md#available-apis) to provide better user experience. ' +
+  'Please let us know if there is any question. \n \n';
 
 const defaultOption = {
   headers: {
@@ -118,12 +119,15 @@ function calculateReviewer() {
  */
 function process3pGithubPr() {
   if (!GITHUB_ACCESS_TOKEN) {
-    log(colors.red('You have not set the ' +
-        'GITHUB_ACCESS_TOKEN env var.'));
-    log(colors.green('See https://help.github.com/articles/' +
-        'creating-an-access-token-for-command-line-use/ ' +
-        'for instructions on how to create a github access token. We only ' +
-        'need `public_repo` scope.'));
+    log(colors.red('You have not set the GITHUB_ACCESS_TOKEN env var.'));
+    log(
+      colors.green(
+        'See https://help.github.com/articles/' +
+          'creating-an-access-token-for-command-line-use/ ' +
+          'for instructions on how to create a github access token. We only ' +
+          'need `public_repo` scope.'
+      )
+    );
     return;
   }
 
@@ -135,17 +139,18 @@ function process3pGithubPr() {
     arrayPromises.push(getIssues(batch));
   }
   return BBPromise.all(arrayPromises)
-      .then(requests => [].concat.apply([], requests))
-      .then(issues => {
-        const allIssues = issues;
-        const allTasks = [];
-        allIssues.forEach(function(issue) {
-          allTasks.push(handleIssue(issue));
-        });
-        return Promise.all(allTasks);
-      }).then(() => {
-        log(colors.blue('auto triaging succeed!'));
+    .then(requests => [].concat.apply([], requests))
+    .then(issues => {
+      const allIssues = issues;
+      const allTasks = [];
+      allIssues.forEach(function(issue) {
+        allTasks.push(handleIssue(issue));
       });
+      return Promise.all(allTasks);
+    })
+    .then(() => {
+      log(colors.blue('auto triaging succeed!'));
+    });
 }
 
 function handleIssue(issue) {
@@ -185,8 +190,9 @@ function getIssues(opt_page) {
 function getPullRequestFiles(pr) {
   const options = extend({}, defaultOption);
   const {number} = pr;
-  options.url = 'https://api.github.com/repos/ampproject/amphtml/pulls/'
-      + `${number}/files`;
+  options.url =
+    'https://api.github.com/repos/ampproject/amphtml/pulls/' +
+    `${number}/files`;
   return request(options).then(res => {
     const files = JSON.parse(res.body);
     if (!Array.isArray(files)) {
@@ -260,14 +266,16 @@ function isQualifiedPR(issue) {
 function replyToPR(pr, outcome) {
   let promise = Promise.resolve();
   if (outcome == ANALYZE_OUTCOME.AD) {
-    promise = promise.then(() => {
-      // We should be good with rate limit given the number of
-      // 3p integration PRs today.
-      const comment = AD_COMMENT + `Thank you! Ping @${reviewer} for review`;
-      return applyComment(pr, comment);
-    }).then(() => {
-      return assignIssue(pr, [reviewer]);
-    });
+    promise = promise
+      .then(() => {
+        // We should be good with rate limit given the number of
+        // 3p integration PRs today.
+        const comment = AD_COMMENT + `Thank you! Ping @${reviewer} for review`;
+        return applyComment(pr, comment);
+      })
+      .then(() => {
+        return assignIssue(pr, [reviewer]);
+      });
   }
   return promise;
 }
@@ -279,17 +287,20 @@ function replyToPR(pr, outcome) {
  */
 function applyComment(issue, comment) {
   const {number} = issue;
-  const options = extend({
-    url: 'https://api.github.com/repos/ampproject/amphtml/issues/'
-        + `${number}/comments`,
-    method: 'POST',
-    body: JSON.stringify({
-      'body': comment,
-    }),
-  }, defaultOption);
+  const options = extend(
+    {
+      url:
+        'https://api.github.com/repos/ampproject/amphtml/issues/' +
+        `${number}/comments`,
+      method: 'POST',
+      body: JSON.stringify({
+        'body': comment,
+      }),
+    },
+    defaultOption
+  );
   if (isDryrun) {
-    log(colors.blue(`apply comment to PR #${number}, ` +
-        `comment is ${comment}`));
+    log(colors.blue(`apply comment to PR #${number}, comment is ${comment}`));
     return Promise.resolve();
   }
   return request(options);
@@ -302,17 +313,20 @@ function applyComment(issue, comment) {
  */
 function assignIssue(issue, assignees) {
   const {number} = issue;
-  const options = extend({
-    url: 'https://api.github.com/repos/ampproject/amphtml/issues/'
-        + `${number}/assignees`,
-    method: 'POST',
-    body: JSON.stringify({
-      'assignees': assignees,
-    }),
-  }, defaultOption);
+  const options = extend(
+    {
+      url:
+        'https://api.github.com/repos/ampproject/amphtml/issues/' +
+        `${number}/assignees`,
+      method: 'POST',
+      body: JSON.stringify({
+        'assignees': assignees,
+      }),
+    },
+    defaultOption
+  );
   if (isDryrun) {
-    log(colors.blue(`assign PR #${number}, ` +
-        `to ${assignees}`));
+    log(colors.blue(`assign PR #${number}, to ${assignees}`));
     return Promise.resolve();
   }
   return request(options);
@@ -320,5 +334,5 @@ function assignIssue(issue, assignees) {
 
 process3pGithubPr.description = 'Automatically triage 3P integration PRs';
 process3pGithubPr.flags = {
-  dryrun: '  Generate process but don\'t push it out',
+  dryrun: "  Generate process but don't push it out",
 };
diff --git a/build-system/tasks/process-github-issues.js b/build-system/tasks/process-github-issues.js
index bb348d33f5b3..91694a42a4a6 100644
--- a/build-system/tasks/process-github-issues.js
+++ b/build-system/tasks/process-github-issues.js
@@ -72,12 +72,15 @@ const NUM_BATCHES = 14;
 // We start processing the issues by checking token first
 function processGithubIssues() {
   if (!GITHUB_ACCESS_TOKEN) {
-    log(colors.red('You have not set the ' +
-        'GITHUB_ACCESS_TOKEN env var.'));
-    log(colors.green('See https://help.github.com/articles/' +
-        'creating-an-access-token-for-command-line-use/ ' +
-        'for instructions on how to create a github access token. We only ' +
-        'need `public_repo` scope.'));
+    log(colors.red('You have not set the GITHUB_ACCESS_TOKEN env var.'));
+    log(
+      colors.green(
+        'See https://help.github.com/articles/' +
+          'creating-an-access-token-for-command-line-use/ ' +
+          'for instructions on how to create a github access token. We only ' +
+          'need `public_repo` scope.'
+      )
+    );
     return;
   }
   return updateGitHubIssues().then(function() {
@@ -118,166 +121,212 @@ function updateGitHubIssues() {
     arrayPromises.push(getIssues(batch));
   }
   return BBPromise.all(arrayPromises)
-      .then(requests => [].concat.apply([], requests))
-      .then(issues => {
-        const allIssues = issues;
-        allIssues.forEach(function(issue) {
-          const {
-            labels,
-            milestone,
-            assignee,
-            'pull_request': pullRequest,
-            'updated_at': issueLastUpdate,
-          } = issue;
-          let issueType;
-          let milestoneTitle;
-          let milestoneState;
-          let hasPriority = false;
-          let hasCategory = false;
-          let issueNewMilestone = MILESTONE_PENDING_TRIAGE;
-          let assigneeName = '';
-          let biweeklyUpdate = true;
-          let quartelyUpdate = true;
-          // if an issue is a pull request, we'll skip it
-          if (pullRequest) {
-            if (isDryrun) {
-              log(colors.red(issue.number + ' is a pull request'));
-            }
-            return;
-          }
-          if (getLastUpdate(issueLastUpdate) > QUARTERLY_DAYS) {
-            quartelyUpdate = false;
-            biweeklyUpdate = false;
-          } else if (getLastUpdate(issueLastUpdate) > BIWEEKLY_DAYS) {
-            biweeklyUpdate = false;
-          }
-          // Get the assignee
-          if (assignee) {
-            assigneeName = '@' + assignee.login;
-          }
-          // Get the title and state of the milestone
-          if (milestone) {
-            milestoneTitle = milestone.title;
-            milestoneState = milestone.state;
-            issueNewMilestone = milestone.number;
+    .then(requests => [].concat.apply([], requests))
+    .then(issues => {
+      const allIssues = issues;
+      allIssues.forEach(function(issue) {
+        const {
+          labels,
+          milestone,
+          assignee,
+          'pull_request': pullRequest,
+          'updated_at': issueLastUpdate,
+        } = issue;
+        let issueType;
+        let milestoneTitle;
+        let milestoneState;
+        let hasPriority = false;
+        let hasCategory = false;
+        let issueNewMilestone = MILESTONE_PENDING_TRIAGE;
+        let assigneeName = '';
+        let biweeklyUpdate = true;
+        let quartelyUpdate = true;
+        // if an issue is a pull request, we'll skip it
+        if (pullRequest) {
+          if (isDryrun) {
+            log(colors.red(issue.number + ' is a pull request'));
           }
-          // promise starts
-          promise = promise.then(function() {
-            log('Update ' + issue.number);
-            const updates = [];
-            // Get the labels we want to check
-            labels.forEach(function(label) {
-              if (label) {
-                // Check if the issues has type
-                if (label.name.startsWith('Type') ||
-                    label.name.startsWith('Related')) {
-                  issueType = label.name;
-                }
-                // Check if the issues has Priority
-                if (label.name.startsWith('P0') ||
-                    label.name.startsWith('P1') ||
-                    label.name.startsWith('P2') ||
-                    label.name.startsWith('P3')) {
-                  hasPriority = true;
-                  if (label.name.startsWith('P0') ||
-                      label.name.startsWith('P1')) {
-                    if (biweeklyUpdate == false) {
-                      biweeklyUpdate = true;
-                      updates.push(applyComment(issue, 'This is a high priority'
-                          + ' issue but it hasn\'t been updated in awhile. ' +
-                          assigneeName + ' Do you have any updates?'));
-                    }
-                  } else if (label.name.startsWith('P2') &&
-                      quartelyUpdate == false) {
-                    quartelyUpdate = true;
-                    updates.push(applyComment(issue, 'This issue hasn\'t been '
-                        + ' updated in awhile. ' +
-                    assigneeName + ' Do you have any updates?'));
+          return;
+        }
+        if (getLastUpdate(issueLastUpdate) > QUARTERLY_DAYS) {
+          quartelyUpdate = false;
+          biweeklyUpdate = false;
+        } else if (getLastUpdate(issueLastUpdate) > BIWEEKLY_DAYS) {
+          biweeklyUpdate = false;
+        }
+        // Get the assignee
+        if (assignee) {
+          assigneeName = '@' + assignee.login;
+        }
+        // Get the title and state of the milestone
+        if (milestone) {
+          milestoneTitle = milestone.title;
+          milestoneState = milestone.state;
+          issueNewMilestone = milestone.number;
+        }
+        // promise starts
+        promise = promise.then(function() {
+          log('Update ' + issue.number);
+          const updates = [];
+          // Get the labels we want to check
+          labels.forEach(function(label) {
+            if (label) {
+              // Check if the issues has type
+              if (
+                label.name.startsWith('Type') ||
+                label.name.startsWith('Related')
+              ) {
+                issueType = label.name;
+              }
+              // Check if the issues has Priority
+              if (
+                label.name.startsWith('P0') ||
+                label.name.startsWith('P1') ||
+                label.name.startsWith('P2') ||
+                label.name.startsWith('P3')
+              ) {
+                hasPriority = true;
+                if (
+                  label.name.startsWith('P0') ||
+                  label.name.startsWith('P1')
+                ) {
+                  if (biweeklyUpdate == false) {
+                    biweeklyUpdate = true;
+                    updates.push(
+                      applyComment(
+                        issue,
+                        'This is a high priority' +
+                          " issue but it hasn't been updated in awhile. " +
+                          assigneeName +
+                          ' Do you have any updates?'
+                      )
+                    );
                   }
-                }
-                if (label.name.startsWith('Category') ||
-                    label.name.startsWith('Related to') ||
-                    label.name.startsWith('GFI') ||
-                    label.name.startsWith('good first issue')) {
-                  hasCategory = true;
+                } else if (
+                  label.name.startsWith('P2') &&
+                  quartelyUpdate == false
+                ) {
+                  quartelyUpdate = true;
+                  updates.push(
+                    applyComment(
+                      issue,
+                      "This issue hasn't been " +
+                        ' updated in awhile. ' +
+                        assigneeName +
+                        ' Do you have any updates?'
+                    )
+                  );
                 }
               }
-            });
-            // Milestone task: move issues from closed milestone
-            if (milestone) {
-              if (milestoneState === 'closed') {
-                issueNewMilestone = MILESTONE_BACKLOG_BUGS;
-                updates.push(applyMilestone(issue, issueNewMilestone));
+              if (
+                label.name.startsWith('Category') ||
+                label.name.startsWith('Related to') ||
+                label.name.startsWith('GFI') ||
+                label.name.startsWith('good first issue')
+              ) {
+                hasCategory = true;
               }
             }
-            if (issueNewMilestone === MILESTONE_PENDING_TRIAGE) {
-              if (quartelyUpdate == false) {
-                quartelyUpdate = true;
-                updates.push(applyComment(issue, 'This issue seems to be in ' +
+          });
+          // Milestone task: move issues from closed milestone
+          if (milestone) {
+            if (milestoneState === 'closed') {
+              issueNewMilestone = MILESTONE_BACKLOG_BUGS;
+              updates.push(applyMilestone(issue, issueNewMilestone));
+            }
+          }
+          if (issueNewMilestone === MILESTONE_PENDING_TRIAGE) {
+            if (quartelyUpdate == false) {
+              quartelyUpdate = true;
+              updates.push(
+                applyComment(
+                  issue,
+                  'This issue seems to be in ' +
                     ' Pending Triage for awhile. ' +
-                    assigneeName + ' Please triage this to ' +
-                    'an appropriate milestone.'));
-              }
+                    assigneeName +
+                    ' Please triage this to ' +
+                    'an appropriate milestone.'
+                )
+              );
             }
-            // if issueType is not null, add correct milestones
-            if (issueType != null) {
-              if (issueNewMilestone === MILESTONE_PENDING_TRIAGE ||
-                  milestone == null) {
-                if (issueType === 'Type: Feature Request') {
-                  issueNewMilestone = MILESTONE_NEW_FRS;
-                  updates.push(applyMilestone(issue, issueNewMilestone));
-                } else if (issueType === 'Related to: Documentation' ||
-                    issueType === 'Type: Design Review' ||
-                    issueType === 'Type: Status Update') {
-                  issueNewMilestone = MILESTONE_DOCS_UPDATES;
-                  updates.push(applyMilestone(issue, issueNewMilestone));
-                } else if (issueType === 'Type: Bug' ||
-                    issueType === 'Related to: Flaky Tests') {
-                  issueNewMilestone = MILESTONE_BACKLOG_BUGS;
-                  updates.push(applyMilestone(issue, issueNewMilestone));
-                } else if (milestone == null) {
-                  updates.push(applyMilestone(issue, issueNewMilestone));
-                }
+          }
+          // if issueType is not null, add correct milestones
+          if (issueType != null) {
+            if (
+              issueNewMilestone === MILESTONE_PENDING_TRIAGE ||
+              milestone == null
+            ) {
+              if (issueType === 'Type: Feature Request') {
+                issueNewMilestone = MILESTONE_NEW_FRS;
+                updates.push(applyMilestone(issue, issueNewMilestone));
+              } else if (
+                issueType === 'Related to: Documentation' ||
+                issueType === 'Type: Design Review' ||
+                issueType === 'Type: Status Update'
+              ) {
+                issueNewMilestone = MILESTONE_DOCS_UPDATES;
+                updates.push(applyMilestone(issue, issueNewMilestone));
+              } else if (
+                issueType === 'Type: Bug' ||
+                issueType === 'Related to: Flaky Tests'
+              ) {
+                issueNewMilestone = MILESTONE_BACKLOG_BUGS;
+                updates.push(applyMilestone(issue, issueNewMilestone));
+              } else if (milestone == null) {
+                updates.push(applyMilestone(issue, issueNewMilestone));
               }
-            } else if (milestone == null) {
-              updates.push(applyMilestone(issue, issueNewMilestone));
-            } else if (issueNewMilestone === MILESTONE_PRIORITIZED_FRS ||
-                issueNewMilestone === MILESTONE_NEW_FRS) {
-              updates.push(applyLabel(issue, 'Type: Feature Request'));
-            } else if (issueNewMilestone === MILESTONE_BACKLOG_BUGS ||
-                milestoneTitle.startsWith('Sprint')) {
-              updates.push(applyLabel(issue, 'Type: Bug'));
             }
-            // Apply default priority if no priority
-            if (hasPriority == false &&
-                issueNewMilestone != MILESTONE_NEW_FRS &&
-                issueNewMilestone !== MILESTONE_3P_IMPLEMENTATION &&
-                issueNewMilestone !== MILESTONE_PENDING_TRIAGE &&
-                milestone != null) {
-              updates.push(applyLabel(issue, 'P2: Soon'));
-            }
-            // Add comment with missing Category
-            if (hasCategory == false) {
-              if (issueNewMilestone === MILESTONE_PENDING_TRIAGE ||
-                  issueNewMilestone === MILESTONE_DOCS_UPDATES ||
-                  issueNewMilestone == null ||
-                  issueNewMilestone === MILESTONE_GREAT_ISSUES) {
-                if (isDryrun) {
-                  log(colors.green('No comment needed '
-                      + ' for #' + issue.number));
-                }
-              } else {
-                updates.push(applyComment(issue,
-                    'This issue doesn\'t have a category'
-                    + ' which makes it harder for us to keep track of it. ' +
-                    assigneeName + ' Please add an appropriate category.'));
+          } else if (milestone == null) {
+            updates.push(applyMilestone(issue, issueNewMilestone));
+          } else if (
+            issueNewMilestone === MILESTONE_PRIORITIZED_FRS ||
+            issueNewMilestone === MILESTONE_NEW_FRS
+          ) {
+            updates.push(applyLabel(issue, 'Type: Feature Request'));
+          } else if (
+            issueNewMilestone === MILESTONE_BACKLOG_BUGS ||
+            milestoneTitle.startsWith('Sprint')
+          ) {
+            updates.push(applyLabel(issue, 'Type: Bug'));
+          }
+          // Apply default priority if no priority
+          if (
+            hasPriority == false &&
+            issueNewMilestone != MILESTONE_NEW_FRS &&
+            issueNewMilestone !== MILESTONE_3P_IMPLEMENTATION &&
+            issueNewMilestone !== MILESTONE_PENDING_TRIAGE &&
+            milestone != null
+          ) {
+            updates.push(applyLabel(issue, 'P2: Soon'));
+          }
+          // Add comment with missing Category
+          if (hasCategory == false) {
+            if (
+              issueNewMilestone === MILESTONE_PENDING_TRIAGE ||
+              issueNewMilestone === MILESTONE_DOCS_UPDATES ||
+              issueNewMilestone == null ||
+              issueNewMilestone === MILESTONE_GREAT_ISSUES
+            ) {
+              if (isDryrun) {
+                log(colors.green('No comment needed  for #' + issue.number));
               }
+            } else {
+              updates.push(
+                applyComment(
+                  issue,
+                  "This issue doesn't have a category" +
+                    ' which makes it harder for us to keep track of it. ' +
+                    assigneeName +
+                    ' Please add an appropriate category.'
+                )
+              );
             }
-            return Promise.all(updates);
-          });
+          }
+          return Promise.all(updates);
         });
-        return promise;
       });
+      return promise;
+    });
 }
 
 /**
@@ -295,12 +344,19 @@ function applyMilestone(issue, milestoneNumber) {
 
   issue.milestone = milestoneNumber;
   if (isDryrun) {
-    log(colors.green('Milestone applied ' + milestoneNumber +
-        ' for #' + issue.number));
+    log(
+      colors.green(
+        'Milestone applied ' + milestoneNumber + ' for #' + issue.number
+      )
+    );
     return;
   } else {
-    return createGithubRequest('/issues/' + issue.number,'PATCH',
-        issue.milestone, 'milestone');
+    return createGithubRequest(
+      '/issues/' + issue.number,
+      'PATCH',
+      issue.milestone,
+      'milestone'
+    );
   }
 }
 
@@ -317,14 +373,16 @@ function applyLabel(issue, label) {
     'access_token': GITHUB_ACCESS_TOKEN,
   };
   if (isDryrun) {
-    log(colors.green('Label applied ' +
-        label + ' for #' + issue.number));
+    log(colors.green('Label applied ' + label + ' for #' + issue.number));
     return;
   } else {
-    return createGithubRequest('/issues/' + issue.number + '/labels','POST',
-        [label], 'label');
+    return createGithubRequest(
+      '/issues/' + issue.number + '/labels',
+      'POST',
+      [label],
+      'label'
+    );
   }
-
 }
 
 /**
@@ -344,13 +402,23 @@ function applyComment(issue, comment) {
   return promise.then(function() {
     if (isDryrun) {
       log(colors.blue('waited 2 minutes to avoid gh rate limits'));
-      log(colors.green('Comment applied after ' +
-          'waiting 2 minutes to avoid github rate limits: ' + comment +
-          ' for #' + issue.number));
+      log(
+        colors.green(
+          'Comment applied after ' +
+            'waiting 2 minutes to avoid github rate limits: ' +
+            comment +
+            ' for #' +
+            issue.number
+        )
+      );
       return;
     } else {
-      createGithubRequest('/issues/' + issue.number + '/comments','POST',
-          comment, 'comment');
+      createGithubRequest(
+        '/issues/' + issue.number + '/comments',
+        'POST',
+        comment,
+        'comment'
+      );
     }
   });
 }
@@ -359,10 +427,11 @@ function getLastUpdate(issueLastUpdate) {
   const t = new Date();
   const splits = issueLastUpdate.split('-', 3);
   const exactDay = splits[2].split('T', 1);
-  const firstDate = Date.UTC(splits[0],splits[1],exactDay[0]);
-  const secondDate = Date.UTC(t.getFullYear(),t.getMonth() + 1,t.getDate());
-  const diff = Math.abs((firstDate.valueOf() -
-      secondDate.valueOf()) / (24 * 60 * 60 * 1000));
+  const firstDate = Date.UTC(splits[0], splits[1], exactDay[0]);
+  const secondDate = Date.UTC(t.getFullYear(), t.getMonth() + 1, t.getDate());
+  const diff = Math.abs(
+    (firstDate.valueOf() - secondDate.valueOf()) / (24 * 60 * 60 * 1000)
+  );
   return diff;
 }
 
@@ -406,8 +475,9 @@ module.exports = {
   processGithubIssues,
 };
 
-processGithubIssues.description = 'Automatically updates the labels ' +
-    'and milestones of all open issues at github.com/ampproject/amphtml.';
+processGithubIssues.description =
+  'Automatically updates the labels ' +
+  'and milestones of all open issues at github.com/ampproject/amphtml.';
 processGithubIssues.flags = {
-  dryrun: '  Generate process but don\'t push it out',
+  dryrun: "  Generate process but don't push it out",
 };
diff --git a/build-system/tasks/release-tagging.js b/build-system/tasks/release-tagging.js
index d1a61d9e926f..521be59151e9 100644
--- a/build-system/tasks/release-tagging.js
+++ b/build-system/tasks/release-tagging.js
@@ -27,14 +27,13 @@ const {GITHUB_ACCESS_TOKEN} = process.env;
 const gitExec = BBPromise.promisify(git.exec);
 
 const isDryrun = argv.dryrun;
-const verbose = (argv.verbose || argv.v);
+const verbose = argv.verbose || argv.v;
 
 const LABELS = {
   'canary': 'PR use: In Canary',
   'prod': 'PR use: In Production',
 };
 
-
 /**
  * @param {string} type Either of "canary" or "prod".
  * @param {string} dir Working dir.
@@ -47,19 +46,21 @@ function releaseTagFor(type, dir) {
 
   // Fetch tag.
   let tag;
-  promise = promise.then(function() {
-    return githubRequest('/releases');
-  }).then(res => {
-    const array = JSON.parse(res.body);
-    for (let i = 0; i < array.length; i++) {
-      const release = array[i];
-      const releaseType = release.prerelease ? 'canary' : 'prod';
-      if (releaseType == type) {
-        tag = release.tag_name;
-        break;
+  promise = promise
+    .then(function() {
+      return githubRequest('/releases');
+    })
+    .then(res => {
+      const array = JSON.parse(res.body);
+      for (let i = 0; i < array.length; i++) {
+        const release = array[i];
+        const releaseType = release.prerelease ? 'canary' : 'prod';
+        if (releaseType == type) {
+          tag = release.tag_name;
+          break;
+        }
       }
-    }
-  });
+    });
 
   // Checkout tag.
   promise = promise.then(function() {
@@ -72,29 +73,31 @@ function releaseTagFor(type, dir) {
 
   // Log.
   const pullRequests = [];
-  promise = promise.then(function() {
-    const date = new Date();
-    date.setDate(date.getDate() - 15);
-    const dateIso = date.toISOString().split('T')[0];
-    return gitExec({
-      cwd: ampDir,
-      args: 'log --pretty=oneline --since=' + dateIso,
-    });
-  }).then(function(output) {
-    const lines = output.split('\n');
-    for (let i = 0; i < lines.length; i++) {
-      let line = lines[i];
-      const paren = line.lastIndexOf('(');
-      line = paren != -1 ? line.substring(paren) : '';
-      if (!line) {
-        continue;
-      }
-      const match = line.match(/\(\#(\d+)\)/);
-      if (match && match[1]) {
-        pullRequests.push(match[1]);
+  promise = promise
+    .then(function() {
+      const date = new Date();
+      date.setDate(date.getDate() - 15);
+      const dateIso = date.toISOString().split('T')[0];
+      return gitExec({
+        cwd: ampDir,
+        args: 'log --pretty=oneline --since=' + dateIso,
+      });
+    })
+    .then(function(output) {
+      const lines = output.split('\n');
+      for (let i = 0; i < lines.length; i++) {
+        let line = lines[i];
+        const paren = line.lastIndexOf('(');
+        line = paren != -1 ? line.substring(paren) : '';
+        if (!line) {
+          continue;
+        }
+        const match = line.match(/\(\#(\d+)\)/);
+        if (match && match[1]) {
+          pullRequests.push(match[1]);
+        }
       }
-    }
-  });
+    });
 
   // Update.
   const label = LABELS[type];
@@ -124,13 +127,11 @@ function applyLabel(pullRequest, label) {
   if (isDryrun) {
     return Promise.resolve();
   }
-  return githubRequest(
-      '/issues/' + pullRequest + '/labels',
-      'POST',
-      [label]).then(function() {
+  return githubRequest('/issues/' + pullRequest + '/labels', 'POST', [
+    label,
+  ]).then(function() {
     if (verbose) {
-      log(colors.green(
-          'Label applied ' + label + ' for #' + pullRequest));
+      log(colors.green('Label applied ' + label + ' for #' + pullRequest));
     }
   });
 }
diff --git a/build-system/tasks/runtime-test/helpers.js b/build-system/tasks/runtime-test/helpers.js
index 9617e821944d..1b16d6f9e177 100644
--- a/build-system/tasks/runtime-test/helpers.js
+++ b/build-system/tasks/runtime-test/helpers.js
@@ -40,8 +40,11 @@ const LARGE_REFACTOR_THRESHOLD = 50;
 function extractCssJsFileMap() {
   //TODO(estherkim): consolidate arg validation logic
   if (!fs.existsSync(extensionsCssMapPath)) {
-    log(red('ERROR:'), 'Could not find the file',
-        cyan(extensionsCssMapPath) + '.');
+    log(
+      red('ERROR:'),
+      'Could not find the file',
+      cyan(extensionsCssMapPath) + '.'
+    );
     log('Make sure', cyan('gulp css'), 'was run prior to this.');
     process.exit();
   }
@@ -53,8 +56,9 @@ function extractCssJsFileMap() {
 
   // Adds an entry that maps a CSS file to a JS file
   function addCssJsEntry(cssData, cssBinaryName, cssJsFileMap) {
-    const cssFilePath = `extensions/${cssData['name']}/${cssData['version']}/` +
-        `${cssBinaryName}.css`;
+    const cssFilePath =
+      `extensions/${cssData['name']}/${cssData['version']}/` +
+      `${cssBinaryName}.css`;
     const jsFilePath = `build/${cssBinaryName}-${cssData['version']}.css.js`;
     cssJsFileMap[cssFilePath] = jsFilePath;
   }
@@ -94,8 +98,11 @@ function getAdTypes() {
   // Add all other ad types
   const files = fs.readdirSync('./ads/');
   for (let i = 0; i < files.length; i++) {
-    if (path.extname(files[i]) == '.js'
-        && files[i][0] != '_' && files[i] != 'ads.extern.js') {
+    if (
+      path.extname(files[i]) == '.js' &&
+      files[i][0] != '_' &&
+      files[i] != 'ads.extern.js'
+    ) {
       const adType = path.basename(files[i], '.js');
       const expanded = namingExceptions[adType];
       if (expanded) {
@@ -180,18 +187,22 @@ function unitTestsToRun(unitTestPaths) {
 
   function shouldRunTest(testFile, srcFiles) {
     const filesImported = getImports(testFile);
-    return filesImported.filter(function(file) {
-      return srcFiles.includes(file);
-    }).length > 0;
+    return (
+      filesImported.filter(function(file) {
+        return srcFiles.includes(file);
+      }).length > 0
+    );
   }
 
   // Retrieves the set of unit tests that should be run
   // for a set of source files.
   function getTestsFor(srcFiles) {
     const allUnitTests = deglob.sync(unitTestPaths);
-    return allUnitTests.filter(testFile => {
-      return shouldRunTest(testFile, srcFiles);
-    }).map(fullPath => path.relative(ROOT_DIR, fullPath));
+    return allUnitTests
+      .filter(testFile => {
+        return shouldRunTest(testFile, srcFiles);
+      })
+      .map(fullPath => path.relative(ROOT_DIR, fullPath));
   }
 
   filesChanged.forEach(file => {
diff --git a/build-system/tasks/runtime-test/index.js b/build-system/tasks/runtime-test/index.js
index b5e358ffac79..9e3f46a7f764 100644
--- a/build-system/tasks/runtime-test/index.js
+++ b/build-system/tasks/runtime-test/index.js
@@ -45,7 +45,6 @@ const {css} = require('../css');
 const {getStdout} = require('../../exec');
 const {isTravisBuild} = require('../../travis');
 
-
 const {green, yellow, cyan, red} = colors;
 
 const batchSize = 4; // Number of Sauce Lab browsers
@@ -70,13 +69,15 @@ function getConfig() {
     return Object.assign({}, karmaDefault, {browsers: ['Edge']});
   }
   if (argv.ie) {
-    return Object.assign({}, karmaDefault, {browsers: ['IE'],
+    return Object.assign({}, karmaDefault, {
+      browsers: ['IE'],
       customLaunchers: {
         IeNoAddOns: {
           base: 'IE',
           flags: ['-extoff'],
         },
-      }});
+      },
+    });
   }
   if (argv.chrome_canary && !argv.chrome_flags) {
     return Object.assign({}, karmaDefault, {browsers: ['ChromeCanary']});
@@ -89,7 +90,8 @@ function getConfig() {
     const config = Object.assign({}, karmaDefault, {
       browsers: ['Chrome_flags'],
       customLaunchers: {
-        Chrome_flags: { // eslint-disable-line google-camelcase/google-camelcase
+        Chrome_flags: {
+          // eslint-disable-line google-camelcase/google-camelcase
           base: chromeBase,
           flags: formattedFlagList,
         },
@@ -98,8 +100,9 @@ function getConfig() {
     return config;
   }
   if (argv.headless) {
-    return Object.assign({}, karmaDefault,
-        {browsers: ['Chrome_no_extensions_headless']});
+    return Object.assign({}, karmaDefault, {
+      browsers: ['Chrome_no_extensions_headless'],
+    });
   }
   if (argv.saucelabs || argv.saucelabs_lite) {
     if (!process.env.SAUCE_USERNAME) {
@@ -110,26 +113,27 @@ function getConfig() {
     }
 
     // Browser names are defined in `karma.conf.js`.
-    saucelabsBrowsers = argv.saucelabs ?
-    // With --saucelabs, integration tests are run on this set of browsers.
-      [
-        'SL_Chrome',
-        'SL_Firefox',
-        'SL_Edge_17',
-        'SL_Safari_12',
-        'SL_IE_11',
-        // TODO(amp-infra): Evaluate and add more platforms here.
-        //'SL_Chrome_Android_7',
-        //'SL_iOS_11',
-        //'SL_iOS_12',
-        'SL_Chrome_Beta',
-        'SL_Firefox_Beta',
-      ] : [
-      // With --saucelabs_lite, a subset of the unit tests are run.
-      // Only browsers that support chai-as-promised may be included below.
-      // TODO(rsimha): Add more browsers to this list. #6039.
-        'SL_Safari_12',
-      ];
+    saucelabsBrowsers = argv.saucelabs
+      ? // With --saucelabs, integration tests are run on this set of browsers.
+        [
+          'SL_Chrome',
+          'SL_Firefox',
+          'SL_Edge_17',
+          'SL_Safari_12',
+          'SL_IE_11',
+          // TODO(amp-infra): Evaluate and add more platforms here.
+          //'SL_Chrome_Android_7',
+          //'SL_iOS_11',
+          //'SL_iOS_12',
+          'SL_Chrome_Beta',
+          'SL_Firefox_Beta',
+        ]
+      : [
+          // With --saucelabs_lite, a subset of the unit tests are run.
+          // Only browsers that support chai-as-promised may be included below.
+          // TODO(rsimha): Add more browsers to this list. #6039.
+          'SL_Safari_12',
+        ];
 
     return Object.assign({}, karmaDefault, {
       reporters: ['super-dots', 'saucelabs', 'karmaSimpleReporter'],
@@ -152,47 +156,74 @@ function printArgvMessages() {
     saucelabs: 'Running integration tests on Sauce Labs browsers.',
     saucelabs_lite: 'Running tests on a subset of Sauce Labs browsers.', // eslint-disable-line google-camelcase/google-camelcase
     nobuild: 'Skipping build.',
-    watch: 'Enabling watch mode. Editing and saving a file will cause the' +
-        ' tests for that file to be re-run in the same browser instance.',
+    watch:
+      'Enabling watch mode. Editing and saving a file will cause the' +
+      ' tests for that file to be re-run in the same browser instance.',
     verbose: 'Enabling verbose mode. Expect lots of output!',
     testnames: 'Listing the names of all tests being run.',
     files: 'Running tests in the file(s): ' + cyan(argv.files),
-    integration: 'Running only the integration tests. Prerequisite: ' +
-        cyan('gulp build'),
+    integration:
+      'Running only the integration tests. Prerequisite: ' + cyan('gulp build'),
     unit: 'Running only the unit tests. Prerequisite: ' + cyan('gulp css'),
     a4a: 'Running only A4A tests.',
     compiled: 'Running tests against minified code.',
-    grep: 'Only running tests that match the pattern "' +
-        cyan(argv.grep) + '".',
+    grep:
+      'Only running tests that match the pattern "' + cyan(argv.grep) + '".',
     coverage: 'Running tests in code coverage mode.',
     headless: 'Running tests in a headless Chrome window.',
-    'local-changes': 'Running unit tests directly affected by the files' +
-        ' changed in the local branch.',
+    'local-changes':
+      'Running unit tests directly affected by the files' +
+      ' changed in the local branch.',
   };
   if (argv.chrome_flags) {
-    log(green('Launching'), cyan(chromeBase), green('with flags'),
-        cyan(formattedFlagList));
+    log(
+      green('Launching'),
+      cyan(chromeBase),
+      green('with flags'),
+      cyan(formattedFlagList)
+    );
   }
   if (!isTravisBuild()) {
-    log(green('Run'), cyan('gulp help'),
-        green('to see a list of all test flags.'));
-    log(green('⤷ Use'), cyan('--nohelp'),
-        green('to silence these messages.'));
-    if (!argv.unit && !argv.integration && !argv.files && !argv.a4a &&
-        !argv['local-changes']) {
+    log(
+      green('Run'),
+      cyan('gulp help'),
+      green('to see a list of all test flags.')
+    );
+    log(green('⤷ Use'), cyan('--nohelp'), green('to silence these messages.'));
+    if (
+      !argv.unit &&
+      !argv.integration &&
+      !argv.files &&
+      !argv.a4a &&
+      !argv['local-changes']
+    ) {
       log(green('Running all tests.'));
-      log(green('⤷ Use'), cyan('--unit'), green('or'), cyan('--integration'),
-          green('to run just the unit tests or integration tests.'));
-      log(green('⤷ Use'), cyan('--local-changes'),
-          green('to run unit tests from files commited to the local branch.'));
+      log(
+        green('⤷ Use'),
+        cyan('--unit'),
+        green('or'),
+        cyan('--integration'),
+        green('to run just the unit tests or integration tests.')
+      );
+      log(
+        green('⤷ Use'),
+        cyan('--local-changes'),
+        green('to run unit tests from files commited to the local branch.')
+      );
     }
     if (!argv.testnames && !argv.files && !argv['local-changes']) {
-      log(green('⤷ Use'), cyan('--testnames'),
-          green('to see the names of all tests being run.'));
+      log(
+        green('⤷ Use'),
+        cyan('--testnames'),
+        green('to see the names of all tests being run.')
+      );
     }
     if (!argv.headless) {
-      log(green('⤷ Use'), cyan('--headless'),
-          green('to run tests in a headless Chrome window.'));
+      log(
+        green('⤷ Use'),
+        cyan('--headless'),
+        green('to run tests in a headless Chrome window.')
+      );
     }
     if (!argv.compiled) {
       log(green('Running tests against unminified code.'));
@@ -211,12 +242,15 @@ function printArgvMessages() {
  */
 async function runTests() {
   if (!argv.integration && process.env.AMPSAUCE_REPO) {
-    console./* OK*/info('Deactivated for ampsauce repo');
+    console./* OK*/ info('Deactivated for ampsauce repo');
   }
 
   if (argv.saucelabs && !argv.integration) {
-    log(red('ERROR:'), 'Only integration tests may be run on the full set of',
-        'Sauce Labs browsers');
+    log(
+      red('ERROR:'),
+      'Only integration tests may be run on the full set of',
+      'Sauce Labs browsers'
+    );
     log('Use', cyan('--saucelabs'), 'with', cyan('--integration'));
     process.exit();
   }
@@ -240,8 +274,10 @@ async function runTests() {
     transform: [['babelify', {global: true}]],
     configure: function(bundle) {
       bundle.on('prebundle', function() {
-        log(green('Transforming tests with'),
-            cyan('browserify') + green('...'));
+        log(
+          green('Transforming tests with'),
+          cyan('browserify') + green('...')
+        );
       });
       bundle.on('transform', function(tr) {
         if (tr instanceof babelify) {
@@ -264,14 +300,18 @@ async function runTests() {
     }
   } else if (argv['local-changes']) {
     if (isLargeRefactor()) {
-      log(green('INFO:'),
-          'Skipping tests on local changes because this is a large refactor.');
+      log(
+        green('INFO:'),
+        'Skipping tests on local changes because this is a large refactor.'
+      );
       return reportTestSkipped();
     }
     const testsToRun = unitTestsToRun(config.unitTestPaths);
     if (testsToRun.length == 0) {
-      log(green('INFO:'),
-          'No unit tests were directly affected by local changes.');
+      log(
+        green('INFO:'),
+        'No unit tests were directly affected by local changes.'
+      );
       return reportTestSkipped();
     } else {
       log(green('INFO:'), 'Running the following unit tests:');
@@ -283,14 +323,20 @@ async function runTests() {
     c.files = c.files.concat(config.commonUnitTestPaths, testsToRun);
   } else if (argv.integration) {
     c.files = c.files.concat(
-        config.commonIntegrationTestPaths, config.integrationTestPaths);
+      config.commonIntegrationTestPaths,
+      config.integrationTestPaths
+    );
   } else if (argv.unit) {
     if (argv.saucelabs_lite) {
       c.files = c.files.concat(
-          config.commonUnitTestPaths, config.unitTestOnSaucePaths);
+        config.commonUnitTestPaths,
+        config.unitTestOnSaucePaths
+      );
     } else {
       c.files = c.files.concat(
-          config.commonUnitTestPaths, config.unitTestPaths);
+        config.commonUnitTestPaths,
+        config.unitTestPaths
+      );
     }
   } else if (argv.a4a) {
     c.files = c.files.concat(config.a4aTestPaths);
@@ -301,14 +347,14 @@ async function runTests() {
   // c.client is available in test browser via window.parent.karma.config
   c.client.amp = {
     useCompiledJs: !!argv.compiled,
-    saucelabs: (!!argv.saucelabs) || (!!argv.saucelabs_lite),
+    saucelabs: !!argv.saucelabs || !!argv.saucelabs_lite,
     singlePass: !!argv.single_pass,
     adTypes: getAdTypes(),
     mochaTimeout: c.client.mocha.timeout,
     propertiesObfuscated: !!argv.single_pass,
     testServerPort: c.client.testServerPort,
-    testOnIe: !!argv.ie ||
-        (!!argv.saucelabs && saucelabsBrowsers.includes('SL_IE_11')),
+    testOnIe:
+      !!argv.ie || (!!argv.saucelabs && saucelabsBrowsers.includes('SL_IE_11')),
   };
 
   if (argv.compiled) {
@@ -325,19 +371,25 @@ async function runTests() {
 
   if (argv.coverage) {
     c.browserify.transform = [
-      ['babelify', {
-        plugins: [
-          ['babel-plugin-istanbul', {
-            exclude: [
-              './ads/**/*.js',
-              './third_party/**/*.js',
-              './test/**/*.js',
-              './extensions/**/test/**/*.js',
-              './testing/**/*.js',
+      [
+        'babelify',
+        {
+          plugins: [
+            [
+              'babel-plugin-istanbul',
+              {
+                exclude: [
+                  './ads/**/*.js',
+                  './third_party/**/*.js',
+                  './test/**/*.js',
+                  './extensions/**/test/**/*.js',
+                  './testing/**/*.js',
+                ],
+              },
             ],
-          }],
-        ],
-      }],
+          ],
+        },
+      ],
     ];
     c.plugins.push('karma-coverage-istanbul-reporter');
     c.reporters = c.reporters.concat(['coverage-istanbul']);
@@ -347,17 +399,27 @@ async function runTests() {
     };
   }
 
-  const server = gulp.src(process.cwd(), {base: '.'}).pipe(webserver({
-    port: karmaDefault.client.testServerPort,
-    host: 'localhost',
-    directoryListing: true,
-    middleware: [app],
-  }).on('kill', function() {
-    log(yellow('Shutting down test responses server on '
-        + `localhost:${karmaDefault.client.testServerPort}`));
-  }));
-  log(yellow('Started test responses server on '
-        + `localhost:${karmaDefault.client.testServerPort}`));
+  const server = gulp.src(process.cwd(), {base: '.'}).pipe(
+    webserver({
+      port: karmaDefault.client.testServerPort,
+      host: 'localhost',
+      directoryListing: true,
+      middleware: [app],
+    }).on('kill', function() {
+      log(
+        yellow(
+          'Shutting down test responses server on ' +
+            `localhost:${karmaDefault.client.testServerPort}`
+        )
+      );
+    })
+  );
+  log(
+    yellow(
+      'Started test responses server on ' +
+        `localhost:${karmaDefault.client.testServerPort}`
+    )
+  );
 
   // Listen for Ctrl + C to cancel testing
   const handlerProcess = createCtrlcHandler('test');
@@ -387,8 +449,9 @@ async function runTests() {
 
   if (processExitCode != 0) {
     log(
-        red('ERROR:'),
-        yellow(`Karma test failed with exit code ${processExitCode}`));
+      red('ERROR:'),
+      yellow(`Karma test failed with exit code ${processExitCode}`)
+    );
     process.exitCode = processExitCode;
   }
 
@@ -406,30 +469,42 @@ async function runTests() {
     const browsers = {stable: [], beta: []};
     for (const browserId of saucelabsBrowsers) {
       browsers[
-          browserId.toLowerCase().endsWith('_beta')
-            ? 'beta' : 'stable']
-          .push(browserId);
+        browserId.toLowerCase().endsWith('_beta') ? 'beta' : 'stable'
+      ].push(browserId);
     }
     if (browsers.stable.length) {
       const allBatchesExitCodes = await runTestInBatchesWithBrowsers(
-          'stable', browsers.stable);
+        'stable',
+        browsers.stable
+      );
       if (allBatchesExitCodes) {
-        log(yellow('Some tests have failed on'), cyan('stable'),
-            yellow('browsers, so skipping running them on'), cyan('beta'),
-            yellow('browsers.'));
+        log(
+          yellow('Some tests have failed on'),
+          cyan('stable'),
+          yellow('browsers, so skipping running them on'),
+          cyan('beta'),
+          yellow('browsers.')
+        );
         return allBatchesExitCodes;
       }
     }
 
     if (browsers.beta.length) {
       const allBatchesExitCodes = await runTestInBatchesWithBrowsers(
-          'beta', browsers.beta);
+        'beta',
+        browsers.beta
+      );
       if (allBatchesExitCodes) {
-        log(yellow('Some tests have failed on'), cyan('beta'),
-            yellow('browsers.'));
-        log(yellow('This is not currently a fatal error, but will become an'),
-            yellow('error once the beta browsers are released as next stable'),
-            yellow('version!'));
+        log(
+          yellow('Some tests have failed on'),
+          cyan('beta'),
+          yellow('browsers.')
+        );
+        log(
+          yellow('This is not currently a fatal error, but will become an'),
+          yellow('error once the beta browsers are released as next stable'),
+          yellow('version!')
+        );
       }
     }
 
@@ -450,13 +525,22 @@ async function runTests() {
     let endIndex = batchSize;
     const batchExitCodes = [];
 
-    log(green('Running tests on'), cyan(browsers.length),
-        green('Sauce Labs'), cyan(batchName), green('browser(s)...'));
+    log(
+      green('Running tests on'),
+      cyan(browsers.length),
+      green('Sauce Labs'),
+      cyan(batchName),
+      green('browser(s)...')
+    );
     while (startIndex < endIndex) {
       const configBatch = Object.assign({}, c);
       configBatch.browsers = browsers.slice(startIndex, endIndex);
-      log(green('Batch'), cyan(`#${batch}`) + green(': Running tests on'),
-          cyan(configBatch.browsers.length), green('Sauce Labs browser(s)...'));
+      log(
+        green('Batch'),
+        cyan(`#${batch}`) + green(': Running tests on'),
+        cyan(configBatch.browsers.length),
+        green('Sauce Labs browser(s)...')
+      );
       batchExitCodes.push(await createKarmaServer(configBatch));
       startIndex = batch * batchSize;
       batch++;
@@ -473,79 +557,101 @@ async function runTests() {
    */
   function createKarmaServer(configBatch) {
     let resolver;
-    const deferred = new Promise(resolverIn => {resolver = resolverIn;});
+    const deferred = new Promise(resolverIn => {
+      resolver = resolverIn;
+    });
     new Karma(configBatch, function(exitCode) {
       if (argv.coverage) {
         if (isTravisBuild()) {
           const codecovCmd =
-              './node_modules/.bin/codecov --file=test/coverage/lcov.info';
+            './node_modules/.bin/codecov --file=test/coverage/lcov.info';
           let flags = '';
           if (argv.unit) {
             flags = ' --flags=unit_tests';
           } else if (argv.integration) {
             flags = ' --flags=integration_tests';
           }
-          log(green('INFO:'), 'Uploading code coverage report to',
-              cyan('https://codecov.io/gh/ampproject/amphtml'), 'by running',
-              cyan(codecovCmd + flags) + '...');
+          log(
+            green('INFO:'),
+            'Uploading code coverage report to',
+            cyan('https://codecov.io/gh/ampproject/amphtml'),
+            'by running',
+            cyan(codecovCmd + flags) + '...'
+          );
           const output = getStdout(codecovCmd + flags);
           const viewReportPrefix = 'View report at: ';
           const viewReport = output.match(`${viewReportPrefix}.*`);
           if (viewReport && viewReport.length > 0) {
-            log(green('INFO:'), viewReportPrefix +
-                cyan(viewReport[0].replace(viewReportPrefix, '')));
+            log(
+              green('INFO:'),
+              viewReportPrefix +
+                cyan(viewReport[0].replace(viewReportPrefix, ''))
+            );
           } else {
-            log(yellow('WARNING:'),
-                'Code coverage report upload may have failed:\n',
-                yellow(output));
+            log(
+              yellow('WARNING:'),
+              'Code coverage report upload may have failed:\n',
+              yellow(output)
+            );
           }
         } else {
           const coverageReportUrl =
-              'file://' + path.resolve('test/coverage/index.html');
-          log(green('INFO:'), 'Generated code coverage report at',
-              cyan(coverageReportUrl));
+            'file://' + path.resolve('test/coverage/index.html');
+          log(
+            green('INFO:'),
+            'Generated code coverage report at',
+            cyan(coverageReportUrl)
+          );
           opn(coverageReportUrl, {wait: false});
         }
       }
       resolver(exitCode);
-    }).on('run_start', function() {
-      if (!argv.saucelabs && !argv.saucelabs_lite) {
-        log(green('Running tests locally...'));
-      }
-      reportTestStarted();
-    }).on('browsers_ready', function() {
-      console./*OK*/log('\n');
-      log(green('Done. Running tests...'));
-    }).on('browser_complete', function(browser) {
-      const result = browser.lastResult;
-      // Prevent cases where Karma detects zero tests and still passes. #16851.
-      if (result.total == 0) {
-        log(red('ERROR: Zero tests detected by Karma. Something went wrong.'));
-        reportTestErrored().finally(() => {
-          if (!argv.watch) {
-            process.exit(1);
-          }
-        });
-      }
-      // Print a summary for each browser as soon as tests complete.
-      let message = `${browser.name}: Executed ` +
+    })
+      .on('run_start', function() {
+        if (!argv.saucelabs && !argv.saucelabs_lite) {
+          log(green('Running tests locally...'));
+        }
+        reportTestStarted();
+      })
+      .on('browsers_ready', function() {
+        console./*OK*/ log('\n');
+        log(green('Done. Running tests...'));
+      })
+      .on('browser_complete', function(browser) {
+        const result = browser.lastResult;
+        // Prevent cases where Karma detects zero tests and still passes. #16851.
+        if (result.total == 0) {
+          log(
+            red('ERROR: Zero tests detected by Karma. Something went wrong.')
+          );
+          reportTestErrored().finally(() => {
+            if (!argv.watch) {
+              process.exit(1);
+            }
+          });
+        }
+        // Print a summary for each browser as soon as tests complete.
+        let message =
+          `${browser.name}: Executed ` +
           `${result.success + result.failed} of ${result.total} ` +
           `(Skipped ${result.skipped}) `;
-      if (result.failed === 0) {
-        message += green('SUCCESS');
-      } else {
-        message += red(result.failed + ' FAILED');
-      }
-      message += '\n';
-      console./*OK*/log('\n');
-      log(message);
-    }).on('run_complete', (browsers, results) => {
-      if (results.error) {
-        reportTestErrored();
-      } else {
-        reportTestFinished(results.success, results.failed);
-      }
-    }).start();
+        if (result.failed === 0) {
+          message += green('SUCCESS');
+        } else {
+          message += red(result.failed + ' FAILED');
+        }
+        message += '\n';
+        console./*OK*/ log('\n');
+        log(message);
+      })
+      .on('run_complete', (browsers, results) => {
+        if (results.error) {
+          reportTestErrored();
+        } else {
+          reportTestFinished(results.success, results.failed);
+        }
+      })
+      .start();
     return deferred;
   }
 }
@@ -579,25 +685,26 @@ test.flags = {
   'testnames': '  Lists the name of each test being run',
   'watch': '  Watches for changes in files, runs corresponding test(s)',
   'saucelabs': '  Runs integration tests on saucelabs (requires setup)',
-  'saucelabs_lite': '  Runs tests on a subset of saucelabs browsers ' +
-      '(requires setup)',
+  'saucelabs_lite':
+    '  Runs tests on a subset of saucelabs browsers (requires setup)',
   'safari': '  Runs tests on Safari',
   'firefox': '  Runs tests on Firefox',
   'edge': '  Runs tests on Edge',
   'ie': '  Runs tests on IE',
   'chrome_canary': 'Runs tests on Chrome Canary',
-  'chrome_flags':
-    'Uses the given flags to launch Chrome',
+  'chrome_flags': 'Uses the given flags to launch Chrome',
   'unit': '  Run only unit tests.',
   'integration': '  Run only integration tests.',
-  'compiled': '  Changes integration tests to use production JS ' +
-      'binaries for execution',
+  'compiled':
+    '  Changes integration tests to use production JS ' +
+    'binaries for execution',
   'grep': '  Runs tests that match the pattern',
   'files': '  Runs tests for specific files',
   'nohelp': '  Silence help messages that are printed prior to test run',
   'a4a': '  Runs all A4A tests',
   'coverage': '  Run tests in code coverage mode',
   'headless': '  Run tests in a headless Chrome window',
-  'local-changes': '  Run unit tests directly affected by the files ' +
-      'changed in the local branch',
+  'local-changes':
+    '  Run unit tests directly affected by the files ' +
+    'changed in the local branch',
 };
diff --git a/build-system/tasks/runtime-test/status-report.js b/build-system/tasks/runtime-test/status-report.js
index 4fb2d9772e32..b5ff7b4de40a 100644
--- a/build-system/tasks/runtime-test/status-report.js
+++ b/build-system/tasks/runtime-test/status-report.js
@@ -71,19 +71,33 @@ function postReport(type, action) {
   if (type !== null && isTravisPullRequestBuild()) {
     const commitHash = gitCommitHash();
     const postUrl = `${reportBaseUrl}/${commitHash}/${type}/${action}`;
-    return requestPromise.post(postUrl)
-        .then(body => {
-          log(green('INFO:'), 'reported', cyan(`${type}/${action}`),
-              'to the test-status GitHub App');
-          if (body.length > 0) {
-            log(green('INFO:'), 'response from test-status was',
-                cyan(body.substr(0, 100)));
-          }
-        }).catch(error => {
-          log(yellow('WARNING:'), 'failed to report', cyan(`${type}/${action}`),
-              'to the test-status GitHub App:\n', error.message.substr(0, 100));
-          return;
-        });
+    return requestPromise
+      .post(postUrl)
+      .then(body => {
+        log(
+          green('INFO:'),
+          'reported',
+          cyan(`${type}/${action}`),
+          'to the test-status GitHub App'
+        );
+        if (body.length > 0) {
+          log(
+            green('INFO:'),
+            'response from test-status was',
+            cyan(body.substr(0, 100))
+          );
+        }
+      })
+      .catch(error => {
+        log(
+          yellow('WARNING:'),
+          'failed to report',
+          cyan(`${type}/${action}`),
+          'to the test-status GitHub App:\n',
+          error.message.substr(0, 100)
+        );
+        return;
+      });
   }
   return Promise.resolve();
 }
@@ -108,7 +122,8 @@ async function reportAllExpectedTests(buildTargets) {
   for (const [type, subTypes] of TEST_TYPE_SUBTYPES) {
     const testTypeBuildTargets = TEST_TYPE_BUILD_TARGETS.get(type);
     const action = testTypeBuildTargets.some(target => buildTargets.has(target))
-      ? 'queued' : 'skipped';
+      ? 'queued'
+      : 'skipped';
     for (const subType of subTypes) {
       await postReport(`${type}/${subType}`, action);
     }
diff --git a/build-system/tasks/serve.js b/build-system/tasks/serve.js
index 5caec476b015..dd1dc098ac4b 100644
--- a/build-system/tasks/serve.js
+++ b/build-system/tasks/serve.js
@@ -99,7 +99,6 @@ serve.flags = {
   'port': '  Specifies alternative port (default: 8000)',
   'https': '  Use HTTPS server (default: false)',
   'quiet': '  Do not log HTTP requests (default: false)',
-  'cache': '  Make local resources cacheable by the browser ' +
-      '(default: false)',
+  'cache': '  Make local resources cacheable by the browser (default: false)',
   'inspect': '  Run nodemon in `inspect` mode',
 };
diff --git a/build-system/tasks/size.js b/build-system/tasks/size.js
index dce0d947e7f6..58bc68bb42d0 100644
--- a/build-system/tasks/size.js
+++ b/build-system/tasks/size.js
@@ -24,7 +24,6 @@ const prettyBytes = require('pretty-bytes');
 const table = require('text-table');
 const through = require('through2');
 
-
 const tempFolderName = '__size-temp';
 
 const MIN_FILE_SIZE_POS = 0;
@@ -97,11 +96,19 @@ function normalizeRows(rows) {
   // normalize integration.js
   normalizeRow(rows, 'current-min/f.js', 'current/integration.js', true);
 
-  normalizeRow(rows, 'current-min/ampcontext-v0.js',
-      'current/ampcontext-lib.js', true);
+  normalizeRow(
+    rows,
+    'current-min/ampcontext-v0.js',
+    'current/ampcontext-lib.js',
+    true
+  );
 
-  normalizeRow(rows, 'current-min/iframe-transport-client-v0.js',
-      'current/iframe-transport-client-lib.js', true);
+  normalizeRow(
+    rows,
+    'current-min/iframe-transport-client-v0.js',
+    'current/iframe-transport-client-lib.js',
+    true
+  );
 
   // normalize alp.js
   normalizeRow(rows, 'alp.js', 'alp.max.js', true);
@@ -142,13 +149,17 @@ function normalizeRows(rows) {
  */
 function normalizeExtension(rows, filename) {
   const isMax = /\.max\.js$/.test(filename);
-  const counterpartName = filename.replace(/(v0\/.*?)(\.max)?(\.js)$/,
-      function(full, grp1, grp2, grp3) {
-        if (isMax) {
-          return grp1 + grp3;
-        }
-        return full;
-      });
+  const counterpartName = filename.replace(/(v0\/.*?)(\.max)?(\.js)$/, function(
+    full,
+    grp1,
+    grp2,
+    grp3
+  ) {
+    if (isMax) {
+      return grp1 + grp3;
+    }
+    return full;
+  });
 
   if (isMax) {
     normalizeRow(rows, counterpartName, filename, false);
@@ -198,7 +209,8 @@ function onFileThroughEnd(rows, cb) {
   rows = normalizeRows(rows);
   rows.unshift.apply(rows, tableHeaders);
   const tbl = table(rows, tableOptions);
-  console/* OK*/.log(tbl);
+  console /* OK*/
+    .log(tbl);
   fs.writeFileSync('test/size.txt', tbl);
   cb();
 }
@@ -211,8 +223,8 @@ function onFileThroughEnd(rows, cb) {
 function sizer() {
   const rows = [];
   return through.obj(
-      onFileThrough.bind(null, rows),
-      onFileThroughEnd.bind(null, rows)
+    onFileThrough.bind(null, rows),
+    onFileThroughEnd.bind(null, rows)
   );
 }
 
@@ -222,16 +234,17 @@ function sizer() {
  * output from the process.
  */
 function size() {
-  gulp.src([
-    'dist/**/*.js',
-    '!dist/**/*-latest.js',
-    '!dist/**/*check-types.js',
-    '!dist/**/amp-viewer-host.max.js',
-    'dist.3p/{current,current-min}/**/*.js',
-  ])
-      .pipe(sizer())
-      .pipe(gulp.dest(tempFolderName))
-      .on('end', del.bind(null, [tempFolderName]));
+  gulp
+    .src([
+      'dist/**/*.js',
+      '!dist/**/*-latest.js',
+      '!dist/**/*check-types.js',
+      '!dist/**/amp-viewer-host.max.js',
+      'dist.3p/{current,current-min}/**/*.js',
+    ])
+    .pipe(sizer())
+    .pipe(gulp.dest(tempFolderName))
+    .on('end', del.bind(null, [tempFolderName]));
 }
 
 module.exports = {
diff --git a/build-system/tasks/todos.js b/build-system/tasks/todos.js
index 3965363e3c2b..2a2896b8503a 100644
--- a/build-system/tasks/todos.js
+++ b/build-system/tasks/todos.js
@@ -28,7 +28,6 @@ const {GITHUB_ACCESS_TOKEN} = process.env;
 /** @type {!Object<string, !Promise<number>>} */
 const issueCache = Object.create(null);
 
-
 /**
  * Test if a file's contents contains closed TODOs.
  *
@@ -56,17 +55,18 @@ function findClosedTodosInFile(file) {
   if (promises.length == 0) {
     return Promise.resolve(0);
   }
-  return Promise.all(promises).then(results => {
-    return results.reduce(function(acc, v) {
-      return acc + v;
-    }, 0);
-  }).catch(function(error) {
-    log(colors.red('Failed in', file.path, error, error.stack));
-    return 0;
-  });
+  return Promise.all(promises)
+    .then(results => {
+      return results.reduce(function(acc, v) {
+        return acc + v;
+      }, 0);
+    })
+    .catch(function(error) {
+      log(colors.red('Failed in', file.path, error, error.stack));
+      return 0;
+    });
 }
 
-
 /**
  * @param {!File} file file is a vinyl file object
  * @param {string} issueId
@@ -77,18 +77,18 @@ function reportClosedIssue(file, issueId, todo) {
   if (issueCache[issueId] !== undefined) {
     return issueCache[issueId];
   }
-  return issueCache[issueId] = githubRequest('/issues/' + issueId)
-      .then(response => {
-        const issue = JSON.parse(response.body);
-        const value = issue.state == 'closed' ? 1 : 0;
-        if (value) {
-          log(colors.red(todo, 'in', file.path));
-        }
-        return value;
-      });
+  return (issueCache[issueId] = githubRequest('/issues/' + issueId).then(
+    response => {
+      const issue = JSON.parse(response.body);
+      const value = issue.state == 'closed' ? 1 : 0;
+      if (value) {
+        log(colors.red(todo, 'in', file.path));
+      }
+      return value;
+    }
+  ));
 }
 
-
 /**
  * @param {string} path
  * @param {string=} opt_method
@@ -116,25 +116,27 @@ function githubRequest(path, opt_method, opt_data) {
   return request(options);
 }
 
-
 /**
  * todos:find-closed task.
  */
 function todosFindClosed() {
   let foundCount = 0;
-  return gulp.src(srcGlobs)
-      .pipe(through2.obj(function(file, enc, cb) {
+  return gulp
+    .src(srcGlobs)
+    .pipe(
+      through2.obj(function(file, enc, cb) {
         findClosedTodosInFile(file).then(function(count) {
           foundCount += count;
           cb();
         });
-      }))
-      .on('end', function() {
-        if (foundCount > 0) {
-          log(colors.red('Found closed TODOs: ', foundCount));
-          process.exit(1);
-        }
-      });
+      })
+    )
+    .on('end', function() {
+      if (foundCount > 0) {
+        log(colors.red('Found closed TODOs: ', foundCount));
+        process.exit(1);
+      }
+    });
 }
 
 module.exports = {
diff --git a/build-system/tasks/update-packages.js b/build-system/tasks/update-packages.js
index de22c636ced2..3d96d68f5f1f 100644
--- a/build-system/tasks/update-packages.js
+++ b/build-system/tasks/update-packages.js
@@ -31,8 +31,7 @@ const yarnExecutable = 'npx yarn';
  * @param {string} file Contents to write
  */
 function writeIfUpdated(patchedName, file) {
-  if (!fs.existsSync(patchedName) ||
-      fs.readFileSync(patchedName) != file) {
+  if (!fs.existsSync(patchedName) || fs.readFileSync(patchedName) != file) {
     fs.writeFileSync(patchedName, file);
     if (!isTravisBuild()) {
       log(colors.green('Patched'), colors.cyan(patchedName));
@@ -65,11 +64,11 @@ function replaceInFile(filePath, newFilePath, ...args) {
  */
 function patchWebAnimations() {
   // Copies web-animations-js into a new file that has an export.
-  const patchedName = 'node_modules/web-animations-js/' +
-      'web-animations.install.js';
-  let file = fs.readFileSync(
-      'node_modules/web-animations-js/' +
-      'web-animations.min.js').toString();
+  const patchedName =
+    'node_modules/web-animations-js/web-animations.install.js';
+  let file = fs
+    .readFileSync('node_modules/web-animations-js/web-animations.min.js')
+    .toString();
   // Replace |requestAnimationFrame| with |window|.
   file = file.replace(/requestAnimationFrame/g, function(a, b) {
     if (file.charAt(b - 1) == '.') {
@@ -88,11 +87,12 @@ function patchWebAnimations() {
   file = file.replace(/this\._isFinished\s*=\s*\!0,/, '');
 
   // Wrap the contents inside the install function.
-  file = 'export function installWebAnimations(window) {\n' +
-      'var document = window.document;\n' +
-      file +
-      '\n' +
-      '}\n';
+  file =
+    'export function installWebAnimations(window) {\n' +
+    'var document = window.document;\n' +
+    file +
+    '\n' +
+    '}\n';
   writeIfUpdated(patchedName, file);
 }
 
@@ -107,14 +107,15 @@ function patchRegisterElement() {
   // compilation: https://github.com/google/closure-compiler/issues/1831
   const dir = 'node_modules/document-register-element/build/';
   replaceInFile(
-      dir + 'document-register-element.node.js',
-      dir + 'document-register-element.patched.js',
-      // Elimate the immediate side effect.
-      'installCustomElements(global);',
-      '',
-      // Replace CJS export with ES6 export.
-      'module.exports = installCustomElements;',
-      'export {installCustomElements};');
+    dir + 'document-register-element.node.js',
+    dir + 'document-register-element.patched.js',
+    // Elimate the immediate side effect.
+    'installCustomElements(global);',
+    '',
+    // Replace CJS export with ES6 export.
+    'module.exports = installCustomElements;',
+    'export {installCustomElements};'
+  );
 }
 
 /**
@@ -124,8 +125,9 @@ function patchRegisterElement() {
 function patchWorkerDom() {
   const dir = 'node_modules/@ampproject/worker-dom/dist/';
   fs.copyFileSync(
-      dir + 'unminified.index.safe.mjs',
-      dir + 'unminified.index.safe.mjs.patched.js');
+    dir + 'unminified.index.safe.mjs',
+    dir + 'unminified.index.safe.mjs.patched.js'
+  );
 }
 
 /**
@@ -149,8 +151,10 @@ function transformEs6Packages() {
       const updatedPackageJson = JSON.stringify(packageJson, null, 2);
       fs.writeFileSync(packageJsonFile, updatedPackageJson, 'utf8');
       if (!isTravisBuild()) {
-        log(colors.green('Enabled ES6 transforms for runtime dependency'),
-            colors.cyan(es6Package));
+        log(
+          colors.green('Enabled ES6 transforms for runtime dependency'),
+          colors.cyan(es6Package)
+        );
       }
     }
   });
@@ -177,9 +181,13 @@ function installCustomEslintRules() {
 function runYarnCheck() {
   const integrityCmd = yarnExecutable + ' check --integrity';
   if (getStderr(integrityCmd).trim() != '') {
-    log(colors.yellow('WARNING:'), 'The packages in',
-        colors.cyan('node_modules'), 'do not match',
-        colors.cyan('package.json.'));
+    log(
+      colors.yellow('WARNING:'),
+      'The packages in',
+      colors.cyan('node_modules'),
+      'do not match',
+      colors.cyan('package.json.')
+    );
     const verifyTreeCmd = yarnExecutable + ' check --verify-tree';
     exec(verifyTreeCmd);
     log('Running', colors.cyan('yarn'), 'to update packages...');
@@ -190,8 +198,11 @@ function runYarnCheck() {
      */
     execOrDie(`${yarnExecutable} install --production=false`); // Stop execution when Ctrl + C is detected.
   } else {
-    log(colors.green('All packages in'),
-        colors.cyan('node_modules'), colors.green('are up to date.'));
+    log(
+      colors.green('All packages in'),
+      colors.cyan('node_modules'),
+      colors.green('are up to date.')
+    );
   }
 }
 
@@ -227,4 +238,4 @@ module.exports = {
 };
 
 updatePackages.description =
-    'Runs yarn if node_modules is out of date, and applies custom patches';
+  'Runs yarn if node_modules is out of date, and applies custom patches';
diff --git a/build-system/tasks/visual-diff/helpers.js b/build-system/tasks/visual-diff/helpers.js
index 09e698619e56..881794b8fa61 100644
--- a/build-system/tasks/visual-diff/helpers.js
+++ b/build-system/tasks/visual-diff/helpers.js
@@ -23,7 +23,7 @@ const {isTravisBuild} = require('../../travis');
 const CSS_SELECTOR_RETRY_MS = 200;
 const CSS_SELECTOR_RETRY_ATTEMPTS = 50;
 const CSS_SELECTOR_TIMEOUT_MS =
-    CSS_SELECTOR_RETRY_MS * CSS_SELECTOR_RETRY_ATTEMPTS;
+  CSS_SELECTOR_RETRY_MS * CSS_SELECTOR_RETRY_ATTEMPTS;
 
 const HTML_ESCAPE_CHARS = {
   '&': '&amp;',
@@ -89,15 +89,23 @@ function log(mode, ...messages) {
  * @throws {Error} an encountered error.
  */
 async function verifySelectorsInvisible(page, testName, selectors) {
-  log('verbose', 'Waiting for invisibility of all:',
-      colors.cyan(selectors.join(', ')));
+  log(
+    'verbose',
+    'Waiting for invisibility of all:',
+    colors.cyan(selectors.join(', '))
+  );
   try {
-    await Promise.all(selectors.map(
-        selector => waitForElementVisibility(page, selector, {hidden: true})));
+    await Promise.all(
+      selectors.map(selector =>
+        waitForElementVisibility(page, selector, {hidden: true})
+      )
+    );
   } catch (e) {
-    throw new Error(`${colors.cyan(testName)} | An element with the CSS ` +
+    throw new Error(
+      `${colors.cyan(testName)} | An element with the CSS ` +
         `selector ${colors.cyan(e.message)} is still visible after ` +
-        `${CSS_SELECTOR_TIMEOUT_MS} ms`);
+        `${CSS_SELECTOR_TIMEOUT_MS} ms`
+    );
   }
 }
 
@@ -111,25 +119,39 @@ async function verifySelectorsInvisible(page, testName, selectors) {
  * @throws {Error} an encountered error.
  */
 async function verifySelectorsVisible(page, testName, selectors) {
-  log('verbose', 'Waiting for existence of all:',
-      colors.cyan(selectors.join(', ')));
+  log(
+    'verbose',
+    'Waiting for existence of all:',
+    colors.cyan(selectors.join(', '))
+  );
   try {
     await Promise.all(
-        selectors.map(selector => waitForSelectorExistence(page, selector)));
+      selectors.map(selector => waitForSelectorExistence(page, selector))
+    );
   } catch (e) {
-    throw new Error(`${colors.cyan(testName)} | The CSS selector ` +
-        `${colors.cyan(e.message)} does not match any elements in the page`);
+    throw new Error(
+      `${colors.cyan(testName)} | The CSS selector ` +
+        `${colors.cyan(e.message)} does not match any elements in the page`
+    );
   }
 
-  log('verbose', 'Waiting for visibility of all:',
-      colors.cyan(selectors.join(', ')));
+  log(
+    'verbose',
+    'Waiting for visibility of all:',
+    colors.cyan(selectors.join(', '))
+  );
   try {
-    await Promise.all(selectors.map(
-        selector => waitForElementVisibility(page, selector, {visible: true})));
+    await Promise.all(
+      selectors.map(selector =>
+        waitForElementVisibility(page, selector, {visible: true})
+      )
+    );
   } catch (e) {
-    throw new Error(`${colors.cyan(testName)} | An element with the CSS ` +
+    throw new Error(
+      `${colors.cyan(testName)} | An element with the CSS ` +
         `selector ${colors.cyan(e.message)} is still invisible after ` +
-        `${CSS_SELECTOR_TIMEOUT_MS} ms`);
+        `${CSS_SELECTOR_TIMEOUT_MS} ms`
+    );
   }
 }
 
@@ -142,10 +164,15 @@ async function verifySelectorsVisible(page, testName, selectors) {
  */
 async function waitForLoaderDots(page, testName) {
   const allLoaderDotsGone = await waitForElementVisibility(
-      page, '.i-amphtml-loader-dot', {hidden: true});
+    page,
+    '.i-amphtml-loader-dot',
+    {hidden: true}
+  );
   if (!allLoaderDotsGone) {
-    throw new Error(`${colors.cyan(testName)} still has the AMP loader dot ` +
-        `after ${CSS_SELECTOR_TIMEOUT_MS} ms`);
+    throw new Error(
+      `${colors.cyan(testName)} still has the AMP loader dot ` +
+        `after ${CSS_SELECTOR_TIMEOUT_MS} ms`
+    );
   }
 }
 
@@ -165,8 +192,11 @@ async function waitForElementVisibility(page, selector, options) {
   const waitForVisible = Boolean(options['visible']);
   const waitForHidden = Boolean(options['hidden']);
   if (waitForVisible == waitForHidden) {
-    log('fatal', 'waitForElementVisibility must be called with exactly one of',
-        "'visible' or 'hidden' set to true.");
+    log(
+      'fatal',
+      'waitForElementVisibility must be called with exactly one of',
+      "'visible' or 'hidden' set to true."
+    );
   }
 
   let attempt = 0;
@@ -175,24 +205,36 @@ async function waitForElementVisibility(page, selector, options) {
 
     for (const elementHandle of await page.$$(selector)) {
       const boundingBox = await elementHandle.boundingBox();
-      const elementIsVisible = boundingBox != null && boundingBox.height > 0 &&
-          boundingBox.width > 0;
+      const elementIsVisible =
+        boundingBox != null && boundingBox.height > 0 && boundingBox.width > 0;
       elementsAreVisible.push(elementIsVisible);
     }
 
     if (elementsAreVisible.length) {
-      log('verbose', 'Found', colors.cyan(elementsAreVisible.length),
-          'element(s) matching the CSS selector', colors.cyan(selector));
-      log('verbose', 'Expecting all element visibilities to be',
-          colors.cyan(waitForVisible), '; they are',
-          colors.cyan(elementsAreVisible));
+      log(
+        'verbose',
+        'Found',
+        colors.cyan(elementsAreVisible.length),
+        'element(s) matching the CSS selector',
+        colors.cyan(selector)
+      );
+      log(
+        'verbose',
+        'Expecting all element visibilities to be',
+        colors.cyan(waitForVisible),
+        '; they are',
+        colors.cyan(elementsAreVisible)
+      );
     } else {
       log('verbose', 'No', colors.cyan(selector), 'matches found');
     }
     // Since we assert that waitForVisible == !waitForHidden, there is no need
     // to check equality to both waitForVisible and waitForHidden.
-    if (elementsAreVisible.every(
-        elementIsVisible => elementIsVisible == waitForVisible)) {
+    if (
+      elementsAreVisible.every(
+        elementIsVisible => elementIsVisible == waitForVisible
+      )
+    ) {
       return true;
     }
 
diff --git a/build-system/tasks/visual-diff/index.js b/build-system/tasks/visual-diff/index.js
index 4dd9c68e22ac..d08fa8fad4ca 100644
--- a/build-system/tasks/visual-diff/index.js
+++ b/build-system/tasks/visual-diff/index.js
@@ -56,21 +56,30 @@ const WEBSERVER_TIMEOUT_RETRIES = 10;
 const NAVIGATE_TIMEOUT_MS = 30000;
 const MAX_PARALLEL_TABS = 5;
 const WAIT_FOR_TABS_MS = 1000;
-const BUILD_STATUS_URL = 'https://amphtml-percy-status-checker.appspot.com/status';
+const BUILD_STATUS_URL =
+  'https://amphtml-percy-status-checker.appspot.com/status';
 
 const ROOT_DIR = path.resolve(__dirname, '../../../');
 
 // JavaScript snippets that execute inside the page.
 const WRAP_IN_IFRAME_SNIPPET = fs.readFileSync(
-    path.resolve(__dirname, 'snippets/iframe-wrapper.js'), 'utf8');
+  path.resolve(__dirname, 'snippets/iframe-wrapper.js'),
+  'utf8'
+);
 const REMOVE_AMP_SCRIPTS_SNIPPET = fs.readFileSync(
-    path.resolve(__dirname, 'snippets/remove-amp-scripts.js'), 'utf8');
+  path.resolve(__dirname, 'snippets/remove-amp-scripts.js'),
+  'utf8'
+);
 const FREEZE_FORM_VALUE_SNIPPET = fs.readFileSync(
-    path.resolve(__dirname, 'snippets/freeze-form-values.js'), 'utf8');
+  path.resolve(__dirname, 'snippets/freeze-form-values.js'),
+  'utf8'
+);
 
 // HTML snippet to create an error page snapshot.
 const SNAPSHOT_ERROR_SNIPPET = fs.readFileSync(
-    path.resolve(__dirname, 'snippets/snapshot-error.html'), 'utf8');
+  path.resolve(__dirname, 'snippets/snapshot-error.html'),
+  'utf8'
+);
 
 let browser_;
 let webServerProcess_;
@@ -92,8 +101,7 @@ function maybeOverridePercyEnvironmentVariables() {
  * as baselines for future builds.
  */
 function setPercyBranch() {
-  if (!process.env['PERCY_BRANCH'] &&
-      (!argv.master || !isTravisBuild())) {
+  if (!process.env['PERCY_BRANCH'] && (!argv.master || !isTravisBuild())) {
     const userName = gitCommitterEmail();
     const branchName = gitBranchName();
     process.env['PERCY_BRANCH'] = userName + '-' + branchName;
@@ -127,18 +135,22 @@ function setPercyTargetCommit() {
  */
 async function launchWebServer() {
   webServerProcess_ = execScriptAsync(
-      `gulp serve --host ${HOST} --port ${PORT} ${process.env.WEBSERVER_QUIET}`,
-      {
-        stdio: argv.webserver_debug ?
-          ['ignore', process.stdout, process.stderr] :
-          'ignore',
-      });
+    `gulp serve --host ${HOST} --port ${PORT} ${process.env.WEBSERVER_QUIET}`,
+    {
+      stdio: argv.webserver_debug
+        ? ['ignore', process.stdout, process.stderr]
+        : 'ignore',
+    }
+  );
 
   webServerProcess_.on('close', code => {
     code = code || 0;
     if (code != 0) {
-      log('fatal', colors.cyan("'serve'"),
-          `errored with code ${code}. Cannot continue with visual diff tests`);
+      log(
+        'fatal',
+        colors.cyan("'serve'"),
+        `errored with code ${code}. Cannot continue with visual diff tests`
+      );
     }
   });
 
@@ -151,9 +163,11 @@ async function launchWebServer() {
     host: HOST,
     port: PORT,
     retries: WEBSERVER_TIMEOUT_RETRIES, // retry timeout defaults to 1 sec
-  }).on('connected', () => {
-    return resolver(webServerProcess_);
-  }).on('timeout', rejecter);
+  })
+    .on('connected', () => {
+      return resolver(webServerProcess_);
+    })
+    .on('timeout', rejecter);
   return deferred;
 }
 
@@ -219,22 +233,34 @@ async function newPage(browser, viewport = null) {
   page.on('request', interceptedRequest => {
     const requestUrl = new URL(interceptedRequest.url());
     const mockedFilepath = path.join(
-        path.dirname(__filename), 'network-mocks', requestUrl.hostname,
-        encodeURIComponent(
-            `${requestUrl.pathname.substr(1)}${requestUrl.search}`)
-            .replace(/%2F/g, '/'));
-
-    if (requestUrl.hostname == HOST ||
-        requestUrl.hostname.endsWith(`.${HOST}`)) {
+      path.dirname(__filename),
+      'network-mocks',
+      requestUrl.hostname,
+      encodeURIComponent(
+        `${requestUrl.pathname.substr(1)}${requestUrl.search}`
+      ).replace(/%2F/g, '/')
+    );
+
+    if (
+      requestUrl.hostname == HOST ||
+      requestUrl.hostname.endsWith(`.${HOST}`)
+    ) {
       return interceptedRequest.continue();
     } else if (fs.existsSync(mockedFilepath)) {
-      log('verbose', 'Mocked network request for',
-          colors.yellow(requestUrl.href), 'with file',
-          colors.cyan(mockedFilepath));
+      log(
+        'verbose',
+        'Mocked network request for',
+        colors.yellow(requestUrl.href),
+        'with file',
+        colors.cyan(mockedFilepath)
+      );
       return interceptedRequest.respond(fs.readFileSync(mockedFilepath));
     } else {
-      log('verbose', 'Blocked external network request for',
-          colors.yellow(requestUrl.href));
+      log(
+        'verbose',
+        'Blocked external network request for',
+        colors.yellow(requestUrl.href)
+      );
       return interceptedRequest.abort('blockedbyclient');
     }
   });
@@ -253,8 +279,13 @@ async function resetPage(page, viewport = null) {
   const width = viewport ? viewport.width : VIEWPORT_WIDTH;
   const height = viewport ? viewport.height : VIEWPORT_HEIGHT;
 
-  log('verbose', 'Resetting tab to', colors.yellow('about:blank'), 'with size',
-      colors.yellow(`${width}×${height}`));
+  log(
+    'verbose',
+    'Resetting tab to',
+    colors.yellow('about:blank'),
+    'with size',
+    colors.yellow(`${width}×${height}`)
+  );
 
   await page.goto('about:blank');
   await page.setViewport({width, height});
@@ -284,11 +315,21 @@ function addTestError(testErrors, name, message, error, consoleMessages) {
  * @param {!JsonObject} testError object as created by addTestError.
  */
 function logTestError(testError) {
-  log('error', 'Error in test', colors.yellow(testError.name), '\n  ',
-      testError.message, '\n  ', testError.error);
+  log(
+    'error',
+    'Error in test',
+    colors.yellow(testError.name),
+    '\n  ',
+    testError.message,
+    '\n  ',
+    testError.error
+  );
   if (testError.consoleMessages.length > 0) {
-    log('error', colors.cyan(testError.consoleMessages.length),
-        'Console messages in the browser so far:');
+    log(
+      'error',
+      colors.cyan(testError.consoleMessages.length),
+      'Console messages in the browser so far:'
+    );
     for (const message of testError.consoleMessages) {
       log('error', colors.cyan(`[console.${message.type()}]`), message.text());
     }
@@ -311,8 +352,11 @@ async function runVisualTests(assetGlobs, webpages) {
   fs.writeFileSync('PERCY_BUILD_ID', buildId);
   log('info', 'Started Percy build', colors.cyan(buildId));
   if (process.env['PERCY_TARGET_COMMIT']) {
-    log('info', 'The Percy build is baselined on top of commit',
-        colors.cyan(shortSha(process.env['PERCY_TARGET_COMMIT'])));
+    log(
+      'info',
+      'The Percy build is baselined on top of commit',
+      colors.cyan(shortSha(process.env['PERCY_TARGET_COMMIT']))
+    );
   }
 
   try {
@@ -328,8 +372,12 @@ async function runVisualTests(assetGlobs, webpages) {
   if (status.state == 'failed') {
     log('fatal', 'Build', colors.cyan(buildId), 'failed!');
   } else {
-    log('info', 'Build', colors.cyan(buildId),
-        'is now being processed by Percy.');
+    log(
+      'info',
+      'Build',
+      colors.cyan(buildId),
+      'is now being processed by Percy.'
+    );
   }
 }
 
@@ -367,13 +415,22 @@ async function generateSnapshots(percy, webpages) {
   const numUnfilteredPages = webpages.length;
   webpages = webpages.filter(webpage => !webpage.flaky);
   if (numUnfilteredPages != webpages.length) {
-    log('info', 'Skipping', colors.cyan(numUnfilteredPages - webpages.length),
-        'flaky pages');
+    log(
+      'info',
+      'Skipping',
+      colors.cyan(numUnfilteredPages - webpages.length),
+      'flaky pages'
+    );
   }
   if (argv.grep) {
     webpages = webpages.filter(webpage => argv.grep.test(webpage.name));
-    log('info', colors.cyan(`--grep ${argv.grep}`), 'matched',
-        colors.cyan(webpages.length), 'pages');
+    log(
+      'info',
+      colors.cyan(`--grep ${argv.grep}`),
+      'matched',
+      colors.cyan(webpages.length),
+      'pages'
+    );
   }
 
   // Expand all the interactive tests. Every test should have a base test with
@@ -381,34 +438,51 @@ async function generateSnapshots(percy, webpages) {
   // load those tests here.
   for (const webpage of webpages) {
     webpage.tests_ = {
-      '': async() => {},
+      '': async () => {},
     };
     if (webpage.interactive_tests) {
       try {
-        Object.assign(webpage.tests_,
-            require(path.resolve(ROOT_DIR, webpage.interactive_tests)));
+        Object.assign(
+          webpage.tests_,
+          require(path.resolve(ROOT_DIR, webpage.interactive_tests))
+        );
       } catch (error) {
-        log('fatal', 'Failed to load interactive test',
-            colors.cyan(webpage.interactive_tests), 'for test',
-            colors.cyan(webpage.name), '\nError:', error);
+        log(
+          'fatal',
+          'Failed to load interactive test',
+          colors.cyan(webpage.interactive_tests),
+          'for test',
+          colors.cyan(webpage.name),
+          '\nError:',
+          error
+        );
       }
     }
   }
 
   const totalTests = webpages.reduce(
-      (numTests, webpage) => numTests + Object.keys(webpage.tests_).length, 0);
+    (numTests, webpage) => numTests + Object.keys(webpage.tests_).length,
+    0
+  );
   if (!totalTests) {
     log('fatal', 'No pages left to test!');
   } else {
-    log('info', 'Executing', colors.cyan(totalTests), 'visual diff tests on',
-        colors.cyan(webpages.length), 'pages');
+    log(
+      'info',
+      'Executing',
+      colors.cyan(totalTests),
+      'visual diff tests on',
+      colors.cyan(webpages.length),
+      'pages'
+    );
   }
 
   const browser = await launchBrowser();
   if (argv.master) {
     const page = await newPage(browser);
     await page.goto(
-        `http://${HOST}:${PORT}/examples/visual-tests/blank-page/blank.html`);
+      `http://${HOST}:${PORT}/examples/visual-tests/blank-page/blank.html`
+    );
     await percy.snapshot('Blank page', page, SNAPSHOT_SINGLE_BUILD_OPTIONS);
   }
 
@@ -471,18 +545,26 @@ async function snapshotWebpages(percy, browser, webpages) {
       // to wait until there are no more network requests. This method is flaky
       // since Puppeteer doesn't always understand Chrome's network activity, so
       // ignore timeouts again.
-      const pagePromise = (async() => {
+      const pagePromise = (async () => {
         const responseWatcher = new Promise((resolve, reject) => {
           const responseTimeout = setTimeout(() => {
-            reject(new puppeteer.TimeoutError(
+            reject(
+              new puppeteer.TimeoutError(
                 `Response was not received in test ${testName} for page ` +
-                `${webpage.url} after ${NAVIGATE_TIMEOUT_MS}ms`));
+                  `${webpage.url} after ${NAVIGATE_TIMEOUT_MS}ms`
+              )
+            );
           }, NAVIGATE_TIMEOUT_MS);
 
           page.once('response', async response => {
-            log('verbose', 'Response for url', colors.yellow(response.url()),
-                'with status', colors.cyan(response.status()),
-                colors.cyan(response.statusText()));
+            log(
+              'verbose',
+              'Response for url',
+              colors.yellow(response.url()),
+              'with status',
+              colors.cyan(response.status()),
+              colors.cyan(response.statusText())
+            );
             clearTimeout(responseTimeout);
             resolve();
           });
@@ -494,97 +576,123 @@ async function snapshotWebpages(percy, browser, webpages) {
           page.goto(fullUrl, {waitUntil: 'networkidle2'}),
         ]);
       })()
-          .then(() => {
-            log('verbose', 'Page navigation of test', colors.yellow(name),
-                'is done, verifying page');
-          })
-          .catch(navigationError => {
-            hasWarnings = true;
-            addTestError(testErrors, name,
-                'The browser test runner failed to complete the navigation ' +
-                'to the test page', navigationError, consoleMessages);
-            if (!isTravisBuild()) {
-              log('warning', 'Continuing to verify page regardless...');
-            }
-          })
-          .then(async() => {
-            // Perform visibility checks: wait for all AMP built-in loader dots
-            // to disappear (i.e., all visible components are finished being
-            // layed out and external resources such as images are loaded and
-            // displayed), then, depending on the test configurations, wait for
-            // invisibility/visibility of specific elements that match the
-            // configured CSS selectors.
-            await waitForLoaderDots(page, name);
-            if (webpage.loading_incomplete_selectors) {
-              await verifySelectorsInvisible(
-                  page, name, webpage.loading_incomplete_selectors);
-            }
-            if (webpage.loading_complete_selectors) {
-              await verifySelectorsVisible(
-                  page, name, webpage.loading_complete_selectors);
-            }
-
-            // Based on test configuration, wait for a specific amount of time.
-            if (webpage.loading_complete_delay_ms) {
-              log('verbose', 'Waiting',
-                  colors.cyan(`${webpage.loading_complete_delay_ms}ms`),
-                  'for loading to complete');
-              await sleep(webpage.loading_complete_delay_ms);
-            }
-
-            // Run any other custom code located in the test's interactive_tests
-            // file. If there is no interactive test, this defaults to an empty
-            // function.
-            await testFunction(page, name);
-
-            // Execute post-scripts that clean up the page's HTML and send
-            // prepare it for snapshotting on Percy. See comments inside the
-            // snippet files for description of each.
-            await page.evaluate(REMOVE_AMP_SCRIPTS_SNIPPET);
-            await page.evaluate(FREEZE_FORM_VALUE_SNIPPET);
-
-            // Create a default set of snapshot options for Percy and modify
-            // them based on the test's configuration.
-            const snapshotOptions = Object.assign({}, DEFAULT_SNAPSHOT_OPTIONS);
-            if (webpage.enable_percy_javascript) {
-              snapshotOptions.enableJavaScript = true;
-            }
-
-            if (viewport) {
-              snapshotOptions.widths = [viewport.width];
-              log('verbose', 'Wrapping viewport-constrained page in an iframe');
-              await page.evaluate(WRAP_IN_IFRAME_SNIPPET
-                  .replace(/__WIDTH__/g, viewport.width)
-                  .replace(/__HEIGHT__/g, viewport.height));
-            }
-
-            // Finally, send the snapshot to percy.
-            await percy.snapshot(name, page, snapshotOptions);
-            log('travis', hasWarnings ? colors.yellow('●') : colors.cyan('●'));
-          })
-          .catch(async testError => {
-            log('travis', colors.red('●'));
-            addTestError(testErrors, name, 'Unknown failure in test page',
-                testError, consoleMessages);
-
-            let htmlSnapshot;
-            try {
-              htmlSnapshot = await page.content();
-            } catch (e) {
-              htmlSnapshot = e.message;
-            }
-            await page.setContent(
-                SNAPSHOT_ERROR_SNIPPET
-                    .replace('__TEST_NAME__', name)
-                    .replace('__TEST_ERROR__', testError)
-                    .replace('__HTML_SNAPSHOT__', escapeHtml(htmlSnapshot)));
-            await percy.snapshot(name, page, SNAPSHOT_SINGLE_BUILD_OPTIONS);
-          })
-          .finally(async() => {
-            log('verbose', 'Finished test', colors.yellow(name));
-            page.removeListener('console', consoleLogger);
-            availablePages.push(page);
-          });
+        .then(() => {
+          log(
+            'verbose',
+            'Page navigation of test',
+            colors.yellow(name),
+            'is done, verifying page'
+          );
+        })
+        .catch(navigationError => {
+          hasWarnings = true;
+          addTestError(
+            testErrors,
+            name,
+            'The browser test runner failed to complete the navigation ' +
+              'to the test page',
+            navigationError,
+            consoleMessages
+          );
+          if (!isTravisBuild()) {
+            log('warning', 'Continuing to verify page regardless...');
+          }
+        })
+        .then(async () => {
+          // Perform visibility checks: wait for all AMP built-in loader dots
+          // to disappear (i.e., all visible components are finished being
+          // layed out and external resources such as images are loaded and
+          // displayed), then, depending on the test configurations, wait for
+          // invisibility/visibility of specific elements that match the
+          // configured CSS selectors.
+          await waitForLoaderDots(page, name);
+          if (webpage.loading_incomplete_selectors) {
+            await verifySelectorsInvisible(
+              page,
+              name,
+              webpage.loading_incomplete_selectors
+            );
+          }
+          if (webpage.loading_complete_selectors) {
+            await verifySelectorsVisible(
+              page,
+              name,
+              webpage.loading_complete_selectors
+            );
+          }
+
+          // Based on test configuration, wait for a specific amount of time.
+          if (webpage.loading_complete_delay_ms) {
+            log(
+              'verbose',
+              'Waiting',
+              colors.cyan(`${webpage.loading_complete_delay_ms}ms`),
+              'for loading to complete'
+            );
+            await sleep(webpage.loading_complete_delay_ms);
+          }
+
+          // Run any other custom code located in the test's interactive_tests
+          // file. If there is no interactive test, this defaults to an empty
+          // function.
+          await testFunction(page, name);
+
+          // Execute post-scripts that clean up the page's HTML and send
+          // prepare it for snapshotting on Percy. See comments inside the
+          // snippet files for description of each.
+          await page.evaluate(REMOVE_AMP_SCRIPTS_SNIPPET);
+          await page.evaluate(FREEZE_FORM_VALUE_SNIPPET);
+
+          // Create a default set of snapshot options for Percy and modify
+          // them based on the test's configuration.
+          const snapshotOptions = Object.assign({}, DEFAULT_SNAPSHOT_OPTIONS);
+          if (webpage.enable_percy_javascript) {
+            snapshotOptions.enableJavaScript = true;
+          }
+
+          if (viewport) {
+            snapshotOptions.widths = [viewport.width];
+            log('verbose', 'Wrapping viewport-constrained page in an iframe');
+            await page.evaluate(
+              WRAP_IN_IFRAME_SNIPPET.replace(
+                /__WIDTH__/g,
+                viewport.width
+              ).replace(/__HEIGHT__/g, viewport.height)
+            );
+          }
+
+          // Finally, send the snapshot to percy.
+          await percy.snapshot(name, page, snapshotOptions);
+          log('travis', hasWarnings ? colors.yellow('●') : colors.cyan('●'));
+        })
+        .catch(async testError => {
+          log('travis', colors.red('●'));
+          addTestError(
+            testErrors,
+            name,
+            'Unknown failure in test page',
+            testError,
+            consoleMessages
+          );
+
+          let htmlSnapshot;
+          try {
+            htmlSnapshot = await page.content();
+          } catch (e) {
+            htmlSnapshot = e.message;
+          }
+          await page.setContent(
+            SNAPSHOT_ERROR_SNIPPET.replace('__TEST_NAME__', name)
+              .replace('__TEST_ERROR__', testError)
+              .replace('__HTML_SNAPSHOT__', escapeHtml(htmlSnapshot))
+          );
+          await percy.snapshot(name, page, SNAPSHOT_SINGLE_BUILD_OPTIONS);
+        })
+        .finally(async () => {
+          log('verbose', 'Finished test', colors.yellow(name));
+          page.removeListener('console', consoleLogger);
+          availablePages.push(page);
+        });
       pagePromises.push(pagePromise);
     }
   }
@@ -593,11 +701,14 @@ async function snapshotWebpages(percy, browser, webpages) {
   log('travis', '\n');
   if (isTravisBuild() && testErrors.length > 0) {
     testErrors.sort((a, b) => a.name.localeCompare(b.name));
-    log('info', colors.yellow('Tests warnings and errors:'),
-        'expand this section');
-    console./*OK*/log('travis_fold:start:visual_tests\n');
+    log(
+      'info',
+      colors.yellow('Tests warnings and errors:'),
+      'expand this section'
+    );
+    console./*OK*/ log('travis_fold:start:visual_tests\n');
     testErrors.forEach(logTestError);
-    console./*OK*/log('travis_fold:end:visual_tests');
+    console./*OK*/ log('travis_fold:end:visual_tests');
     return false;
   }
   return true;
@@ -634,13 +745,15 @@ async function createEmptyBuild() {
   const percy = new Percy({
     loaders: [
       new PercyAssetsLoader(
-          [path.resolve(__dirname, blankAssetsDir)], ROOT_DIR),
+        [path.resolve(__dirname, blankAssetsDir)],
+        ROOT_DIR
+      ),
     ],
   });
   await percy.startBuild();
-  await page.goto(
-      `http://${HOST}:${PORT}/examples/visual-tests/blank-page/blank.html`)
-      .then(() => {}, () => {});
+  await page
+    .goto(`http://${HOST}:${PORT}/examples/visual-tests/blank-page/blank.html`)
+    .then(() => {}, () => {});
   await percy.snapshot('Blank page', page, SNAPSHOT_SINGLE_BUILD_OPTIONS);
   await percy.finalizeBuild();
 }
@@ -671,10 +784,18 @@ async function visualDiff() {
  * Runs the AMP visual diff tests.
  */
 async function performVisualTests() {
-  if (!argv.percy_disabled &&
-      (!process.env.PERCY_PROJECT || !process.env.PERCY_TOKEN)) {
-    log('fatal', 'Could not find', colors.cyan('PERCY_PROJECT'), 'and',
-        colors.cyan('PERCY_TOKEN'), 'environment variables');
+  if (
+    !argv.percy_disabled &&
+    (!process.env.PERCY_PROJECT || !process.env.PERCY_TOKEN)
+  ) {
+    log(
+      'fatal',
+      'Could not find',
+      colors.cyan('PERCY_PROJECT'),
+      'and',
+      colors.cyan('PERCY_TOKEN'),
+      'environment variables'
+    );
   }
   setDebuggingLevel();
 
@@ -690,22 +811,32 @@ async function performVisualTests() {
   } else {
     // Load and parse the config. Use JSON5 due to JSON comments in file.
     const visualTestsConfig = JSON5.parse(
-        fs.readFileSync(
-            path.resolve(__dirname, '../../../test/visual-diff/visual-tests'),
-            'utf8'));
+      fs.readFileSync(
+        path.resolve(__dirname, '../../../test/visual-diff/visual-tests'),
+        'utf8'
+      )
+    );
     await runVisualTests(
-        visualTestsConfig.asset_globs, visualTestsConfig.webpages);
+      visualTestsConfig.asset_globs,
+      visualTestsConfig.webpages
+    );
   }
 }
 
 async function ensureOrBuildAmpRuntimeInTestMode_() {
   if (argv.nobuild) {
     const isInTestMode = /AMP_CONFIG=\{(?:.+,)?"test":true\b/.test(
-        fs.readFileSync('dist/amp.js', 'utf8'));
+      fs.readFileSync('dist/amp.js', 'utf8')
+    );
     if (!isInTestMode) {
-      log('fatal', 'The AMP runtime was not built in test mode. Run',
-          colors.cyan('gulp build --fortesting'), 'or remove the',
-          colors.cyan('--nobuild'), 'option from this command');
+      log(
+        'fatal',
+        'The AMP runtime was not built in test mode. Run',
+        colors.cyan('gulp build --fortesting'),
+        'or remove the',
+        colors.cyan('--nobuild'),
+        'option from this command'
+      );
     }
   } else {
     execOrDie('gulp build --fortesting');
@@ -715,8 +846,9 @@ async function ensureOrBuildAmpRuntimeInTestMode_() {
 function installPercy_() {
   if (!argv.noyarn) {
     log('info', 'Running', colors.cyan('yarn'), 'to install Percy...');
-    execOrDie('npx yarn --cwd build-system/tasks/visual-diff',
-        {'stdio': 'ignore'});
+    execOrDie('npx yarn --cwd build-system/tasks/visual-diff', {
+      'stdio': 'ignore',
+    });
   }
 
   puppeteer = require('puppeteer');
diff --git a/build-system/tasks/visual-diff/percy-assets-loader.js b/build-system/tasks/visual-diff/percy-assets-loader.js
index fd3beefee1fa..cb1bae83e2c2 100644
--- a/build-system/tasks/visual-diff/percy-assets-loader.js
+++ b/build-system/tasks/visual-diff/percy-assets-loader.js
@@ -65,14 +65,13 @@ class PercyAssetsLoader {
           assetFile = assetFile.replace(/\\/g, '/');
         }
 
-
         const content = fs.readFileSync(assetFile);
         resources.push(
-            percyClient.makeResource({
-              resourceUrl: encodeURI(`/${assetFile}`),
-              content,
-              mimetype: mime.lookup(assetFile),
-            }),
+          percyClient.makeResource({
+            resourceUrl: encodeURI(`/${assetFile}`),
+            content,
+            mimetype: mime.lookup(assetFile),
+          })
         );
       }
     }
diff --git a/build-system/test-server.js b/build-system/test-server.js
index c97626c999e8..a94907c160c2 100644
--- a/build-system/test-server.js
+++ b/build-system/test-server.js
@@ -30,10 +30,14 @@ function setCorsHeaders(req, res, next) {
   res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
   res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
   if (req.query.__amp_source_origin) {
-    res.setHeader('Access-Control-Expose-Headers',
-        'AMP-Access-Control-Allow-Source-Origin');
-    res.setHeader('AMP-Access-Control-Allow-Source-Origin',
-        req.query.__amp_source_origin);
+    res.setHeader(
+      'Access-Control-Expose-Headers',
+      'AMP-Access-Control-Allow-Source-Origin'
+    );
+    res.setHeader(
+      'AMP-Access-Control-Allow-Source-Origin',
+      req.query.__amp_source_origin
+    );
   }
   next();
 }
@@ -50,7 +54,6 @@ app.use('/redirect-to', function(req, res) {
   res.redirect(302, req.query.url);
 });
 
-
 app.use('/status/404', function(req, res) {
   res.status(404).end();
 });
@@ -62,7 +65,7 @@ app.use('/status/500', function(req, res) {
 app.use('/cookies/set', function(req, res) {
   delete req.query.__amp_source_origin;
   for (const name in req.query) {
-    res./*OK*/cookie(name, req.query[name]);
+    res./*OK*/ cookie(name, req.query[name]);
   }
   res.json({
     cookies: req.cookies || {},
@@ -88,11 +91,7 @@ app.use('/form/post/success', function(req, res) {
   delete req.query.__amp_source_origin;
   res.json({
     name: 'John Miller',
-    interests: [
-      {title: 'Football'},
-      {title: 'Basketball'},
-      {title: 'Writing'},
-    ],
+    interests: [{title: 'Football'}, {title: 'Basketball'}, {title: 'Writing'}],
   });
 });
 
@@ -118,5 +117,4 @@ app.use('/form/verify-error', function(req, res) {
   });
 });
 
-
 exports.app = app;
diff --git a/build-system/travis.js b/build-system/travis.js
index b8d023338440..50ef25ac49df 100644
--- a/build-system/travis.js
+++ b/build-system/travis.js
@@ -37,8 +37,9 @@ exports.isTravisBuild = function() {
  * @return {boolean}
  */
 exports.isTravisPullRequestBuild = function() {
-  return exports.isTravisBuild() &&
-      process.env.TRAVIS_EVENT_TYPE === 'pull_request';
+  return (
+    exports.isTravisBuild() && process.env.TRAVIS_EVENT_TYPE === 'pull_request'
+  );
 };
 
 /**
@@ -46,8 +47,7 @@ exports.isTravisPullRequestBuild = function() {
  * @return {boolean}
  */
 exports.isTravisPushBuild = function() {
-  return exports.isTravisBuild() &&
-      process.env.TRAVIS_EVENT_TYPE === 'push';
+  return exports.isTravisBuild() && process.env.TRAVIS_EVENT_TYPE === 'push';
 };
 
 /**
@@ -56,8 +56,11 @@ exports.isTravisPushBuild = function() {
  */
 exports.travisBuildNumber = function() {
   if (!exports.isTravisBuild()) {
-    log(red('ERROR:'), 'This is not a Travis build. Cannot get',
-        cyan('process.env.TRAVIS_BUILD_NUMBER') + '.');
+    log(
+      red('ERROR:'),
+      'This is not a Travis build. Cannot get',
+      cyan('process.env.TRAVIS_BUILD_NUMBER') + '.'
+    );
   }
   return process.env.TRAVIS_BUILD_NUMBER;
 };
@@ -68,8 +71,11 @@ exports.travisBuildNumber = function() {
  */
 exports.travisJobNumber = function() {
   if (!exports.isTravisBuild()) {
-    log(red('ERROR:'), 'This is not a Travis build. Cannot get',
-        cyan('process.env.TRAVIS_JOB_NUMBER') + '.');
+    log(
+      red('ERROR:'),
+      'This is not a Travis build. Cannot get',
+      cyan('process.env.TRAVIS_JOB_NUMBER') + '.'
+    );
   }
   return process.env.TRAVIS_JOB_NUMBER;
 };
@@ -80,8 +86,11 @@ exports.travisJobNumber = function() {
  */
 exports.travisRepoSlug = function() {
   if (!exports.isTravisBuild()) {
-    log(red('ERROR:'), 'This is not a Travis build. Cannot get',
-        cyan('process.env.TRAVIS_REPO_SLUG') + '.');
+    log(
+      red('ERROR:'),
+      'This is not a Travis build. Cannot get',
+      cyan('process.env.TRAVIS_REPO_SLUG') + '.'
+    );
   }
   return process.env.TRAVIS_REPO_SLUG;
 };
@@ -92,8 +101,11 @@ exports.travisRepoSlug = function() {
  */
 exports.travisPullRequestSha = function() {
   if (!exports.isTravisPullRequestBuild()) {
-    log(red('ERROR:'), 'This is not a Travis PR build. Cannot get',
-        cyan('process.env.TRAVIS_PULL_REQUEST_SHA') + '.');
+    log(
+      red('ERROR:'),
+      'This is not a Travis PR build. Cannot get',
+      cyan('process.env.TRAVIS_PULL_REQUEST_SHA') + '.'
+    );
   }
   return process.env.TRAVIS_PULL_REQUEST_SHA;
 };
@@ -104,8 +116,11 @@ exports.travisPullRequestSha = function() {
  */
 exports.travisPullRequestBranch = function() {
   if (!exports.isTravisPullRequestBuild()) {
-    log(red('ERROR:'), 'This is not a Travis PR build. Cannot get',
-        cyan('process.env.TRAVIS_PULL_REQUEST_BRANCH') + '.');
+    log(
+      red('ERROR:'),
+      'This is not a Travis PR build. Cannot get',
+      cyan('process.env.TRAVIS_PULL_REQUEST_BRANCH') + '.'
+    );
   }
   return process.env.TRAVIS_PULL_REQUEST_BRANCH;
 };
diff --git a/build-system/typescript.js b/build-system/typescript.js
index 00fd81948685..52a26bc7ba9f 100644
--- a/build-system/typescript.js
+++ b/build-system/typescript.js
@@ -34,10 +34,13 @@ const {endBuildStep} = require('./tasks/helpers');
 exports.transpileTs = function(srcDir, srcFilename) {
   const startTime = Date.now();
   const tsEntry = path.join(srcDir, srcFilename).replace(/\.js$/, '.ts');
-  const tsConfig = ts.convertCompilerOptionsFromJson({
-    'module': 'ES6',
-    'target': 'ES6',
-  }, srcDir);
+  const tsConfig = ts.convertCompilerOptionsFromJson(
+    {
+      'module': 'ES6',
+      'target': 'ES6',
+    },
+    srcDir
+  );
   const tsOptions = tsConfig.options;
   if (tsConfig.errors.length) {
     log(colors.red('TSickle:'), tsickle.formatDiagnostics(tsConfig.errors));
@@ -64,17 +67,24 @@ exports.transpileTs = function(srcDir, srcFilename) {
     shouldSkipTsickleProcessing: () => false,
     transformTypesToClosure: true,
   };
-  return tsickle.emitWithTsickle(
-      program, transformerHost, compilerHost, tsOptions, undefined,
+  return tsickle
+    .emitWithTsickle(
+      program,
+      transformerHost,
+      compilerHost,
+      tsOptions,
+      undefined,
       (filePath, contents) => {
         fs.writeFileSync(filePath, contents, {encoding: 'utf-8'});
-      })
-      .then(emitResult => {
-        const diagnostics =
-            ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-        if (diagnostics.length) {
-          log(colors.red('TSickle:'), tsickle.formatDiagnostics(diagnostics));
-        }
-        endBuildStep('Transpiled', srcFilename, startTime);
-      });
+      }
+    )
+    .then(emitResult => {
+      const diagnostics = ts
+        .getPreEmitDiagnostics(program)
+        .concat(emitResult.diagnostics);
+      if (diagnostics.length) {
+        log(colors.red('TSickle:'), tsickle.formatDiagnostics(diagnostics));
+      }
+      endBuildStep('Transpiled', srcFilename, startTime);
+    });
 };
diff --git a/builtins/amp-img.js b/builtins/amp-img.js
index 79f9430eaf57..513f3b21059a 100644
--- a/builtins/amp-img.js
+++ b/builtins/amp-img.js
@@ -27,11 +27,19 @@ import {registerElement} from '../src/service/custom-element-registry';
  * Attributes to propagate to internal image when changed externally.
  * @type {!Array<string>}
  */
-const ATTRIBUTES_TO_PROPAGATE = ['alt', 'title', 'referrerpolicy', 'aria-label',
-  'aria-describedby', 'aria-labelledby','srcset', 'src', 'sizes'];
+const ATTRIBUTES_TO_PROPAGATE = [
+  'alt',
+  'title',
+  'referrerpolicy',
+  'aria-label',
+  'aria-describedby',
+  'aria-labelledby',
+  'srcset',
+  'src',
+  'sizes',
+];
 
 export class AmpImg extends BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -62,9 +70,13 @@ export class AmpImg extends BaseElement {
   mutatedAttributesCallback(mutations) {
     if (this.img_) {
       const attrs = ATTRIBUTES_TO_PROPAGATE.filter(
-          value => mutations[value] !== undefined);
+        value => mutations[value] !== undefined
+      );
       this.propagateAttributes(
-          attrs, this.img_, /* opt_removeMissingAttrs */ true);
+        attrs,
+        this.img_,
+        /* opt_removeMissingAttrs */ true
+      );
       guaranteeSrcForSrcsetUnsupportedBrowsers(this.img_);
     }
   }
@@ -136,9 +148,11 @@ export class AmpImg extends BaseElement {
     if (this.element.getAttribute('role') == 'img') {
       this.element.removeAttribute('role');
       this.user().error(
-          'AMP-IMG', 'Setting role=img on amp-img elements breaks ' +
-        'screen readers please just set alt or ARIA attributes, they will ' +
-        'be correctly propagated for the underlying <img> element.');
+        'AMP-IMG',
+        'Setting role=img on amp-img elements breaks ' +
+          'screen readers please just set alt or ARIA attributes, they will ' +
+          'be correctly propagated for the underlying <img> element.'
+      );
     }
 
     this.propagateAttributes(ATTRIBUTES_TO_PROPAGATE, this.img_);
@@ -182,7 +196,7 @@ export class AmpImg extends BaseElement {
     let defaultSize = width + 'px';
 
     if (this.getLayout() !== Layout.FIXED) {
-      const ratio = Math.round(width * 100 / viewportWidth);
+      const ratio = Math.round((width * 100) / viewportWidth);
       defaultSize = Math.max(ratio, 100) + 'vw';
     }
 
@@ -240,12 +254,14 @@ export class AmpImg extends BaseElement {
     return true;
   }
 
-  /** @override **/
+  /** @override */
   firstLayoutCompleted() {
     const placeholder = this.getPlaceholder();
-    if (placeholder &&
+    if (
+      placeholder &&
       placeholder.classList.contains('i-amphtml-blurry-placeholder') &&
-      isExperimentOn(this.win, 'blurry-placeholder')) {
+      isExperimentOn(this.win, 'blurry-placeholder')
+    ) {
       setImportantStyles(placeholder, {'opacity': 0});
     } else {
       this.togglePlaceholder(false);
@@ -256,8 +272,10 @@ export class AmpImg extends BaseElement {
    * @private
    */
   hideFallbackImg_() {
-    if (!this.allowImgLoadFallback_
-      && this.img_.classList.contains('i-amphtml-ghost')) {
+    if (
+      !this.allowImgLoadFallback_ &&
+      this.img_.classList.contains('i-amphtml-ghost')
+    ) {
       this.getVsync().mutate(() => {
         this.img_.classList.remove('i-amphtml-ghost');
         this.toggleFallback(false);
diff --git a/builtins/amp-layout.js b/builtins/amp-layout.js
index 9bdd354970a8..337930672590 100644
--- a/builtins/amp-layout.js
+++ b/builtins/amp-layout.js
@@ -19,11 +19,9 @@ import {Layout, isLayoutSizeDefined} from '../src/layout';
 import {registerElement} from '../src/service/custom-element-registry';
 
 class AmpLayout extends BaseElement {
-
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER ||
-        isLayoutSizeDefined(layout);
+    return layout == Layout.CONTAINER || isLayoutSizeDefined(layout);
   }
 
   /** @override */
@@ -52,5 +50,3 @@ class AmpLayout extends BaseElement {
 export function installLayout(win) {
   registerElement(win, 'amp-layout', AmpLayout);
 }
-
-
diff --git a/builtins/amp-pixel.js b/builtins/amp-pixel.js
index e7e4dcd1bfa6..655d3c110232 100644
--- a/builtins/amp-pixel.js
+++ b/builtins/amp-pixel.js
@@ -22,12 +22,10 @@ import {registerElement} from '../src/service/custom-element-registry';
 
 const TAG = 'amp-pixel';
 
-
 /**
  * A simple analytics instrument. Fires as an impression signal.
  */
 export class AmpPixel extends BaseElement {
-
   /** @override */
   constructor(element) {
     super(element);
@@ -53,12 +51,16 @@ export class AmpPixel extends BaseElement {
       // Safari doesn't support referrerPolicy yet. We're using an
       // iframe based trick to remove referrer, which apparently can
       // only do "no-referrer".
-      userAssert(this.referrerPolicy_ == 'no-referrer',
-          `${TAG}: invalid "referrerpolicy" value "${this.referrerPolicy_}".`
-          + ' Only "no-referrer" is supported');
+      userAssert(
+        this.referrerPolicy_ == 'no-referrer',
+        `${TAG}: invalid "referrerpolicy" value "${this.referrerPolicy_}".` +
+          ' Only "no-referrer" is supported'
+      );
     }
-    if (this.element.hasAttribute('i-amphtml-ssr') &&
-        this.element.querySelector('img')) {
+    if (
+      this.element.hasAttribute('i-amphtml-ssr') &&
+      this.element.querySelector('img')
+    ) {
       dev().info(TAG, 'inabox img already present');
       return;
     }
@@ -79,19 +81,21 @@ export class AmpPixel extends BaseElement {
     }
     // Delay(1) provides a rudimentary "idle" signal.
     // TODO(dvoytenko): use an improved idle signal when available.
-    this.triggerPromise_ = Services.timerFor(this.win).promise(1).then(() => {
-      const src = this.element.getAttribute('src');
-      if (!src) {
-        return;
-      }
-      return Services.urlReplacementsForDoc(this.element)
+    this.triggerPromise_ = Services.timerFor(this.win)
+      .promise(1)
+      .then(() => {
+        const src = this.element.getAttribute('src');
+        if (!src) {
+          return;
+        }
+        return Services.urlReplacementsForDoc(this.element)
           .expandUrlAsync(this.assertSource_(src))
           .then(src => {
             const pixel = createPixel(this.win, src, this.referrerPolicy_);
             dev().info(TAG, 'pixel triggered: ', src);
             return pixel;
           });
-    });
+      });
   }
 
   /**
@@ -101,9 +105,11 @@ export class AmpPixel extends BaseElement {
    */
   assertSource_(src) {
     userAssert(
-        /^(https\:\/\/|\/\/)/i.test(src),
-        'The <amp-pixel> src attribute must start with ' +
-        '"https://" or "//". Invalid value: ' + src);
+      /^(https\:\/\/|\/\/)/i.test(src),
+      'The <amp-pixel> src attribute must start with ' +
+        '"https://" or "//". Invalid value: ' +
+        src
+    );
     return /** @type {string} */ (src);
   }
 }
diff --git a/bundles.config.js b/bundles.config.js
index 5eccad5dfe9e..1796ffa93c3a 100644
--- a/bundles.config.js
+++ b/bundles.config.js
@@ -22,11 +22,11 @@ const log = require('fancy-log');
 /**
  * @enum {string}
  */
-const TYPES = exports.TYPES = {
+const TYPES = (exports.TYPES = {
   AD: '_base_ad',
   MEDIA: '_base_media',
   MISC: '_base_misc',
-};
+});
 
 exports.extensionBundles = [
   {
@@ -460,9 +460,7 @@ exports.extensionBundles = [
     version: '0.1',
     latestVersion: '0.1',
     type: TYPES.MISC,
-    postPrepend: [
-      'third_party/inputmask/bundle.js',
-    ],
+    postPrepend: ['third_party/inputmask/bundle.js'],
   },
   {
     name: 'amp-instagram',
@@ -642,8 +640,7 @@ exports.extensionBundles = [
     name: 'amp-story',
     version: '0.1',
     latestVersion: '1.0',
-    options:
-    {
+    options: {
       hasCss: true,
       cssBinaries: [
         'amp-story-bookend',
@@ -663,8 +660,7 @@ exports.extensionBundles = [
     name: 'amp-story',
     version: '1.0',
     latestVersion: '1.0',
-    options:
-    {
+    options: {
       hasCss: true,
       cssBinaries: [
         'amp-story-bookend',
@@ -688,9 +684,7 @@ exports.extensionBundles = [
     latestVersion: '0.1',
     options: {
       hasCss: true,
-      cssBinaries: [
-        'amp-story-auto-ads-attribution',
-      ],
+      cssBinaries: ['amp-story-auto-ads-attribution'],
     },
     type: TYPES.MISC,
   },
@@ -732,9 +726,7 @@ exports.extensionBundles = [
     latestVersion: '0.1',
     options: {hasCss: true},
     type: TYPES.MISC,
-    postPrepend: [
-      'third_party/react-dates/bundle.js',
-    ],
+    postPrepend: ['third_party/react-dates/bundle.js'],
   },
   {
     name: 'amp-image-viewer',
@@ -848,8 +840,7 @@ exports.extensionBundles = [
     name: 'amp-viewer-integration',
     version: '0.1',
     latestVersion: '0.1',
-    options:
-    {
+    options: {
       // The viewer integration code needs to run asap, so that viewers
       // can influence document state asap. Otherwise the document may take
       // a long time to learn that it should start process other extensions
@@ -961,9 +952,13 @@ exports.altMainBundles = [
  */
 function verifyBundle_(condition, field, message, name, found) {
   if (!condition) {
-    log(colors.red('ERROR:'),
-        colors.cyan(field), message, colors.cyan(name),
-        '\n' + found);
+    log(
+      colors.red('ERROR:'),
+      colors.cyan(field),
+      message,
+      colors.cyan(name),
+      '\n' + found
+    );
     process.exit(1);
   }
 }
@@ -972,29 +967,53 @@ exports.verifyExtensionBundles = function() {
   exports.extensionBundles.forEach(bundle => {
     const bundleString = JSON.stringify(bundle, null, 2);
     verifyBundle_(
-        'name' in bundle,
-        'name', 'is missing from', '', bundleString);
+      'name' in bundle,
+      'name',
+      'is missing from',
+      '',
+      bundleString
+    );
     verifyBundle_(
-        'version' in bundle,
-        'version', 'is missing from', bundle.name, bundleString);
+      'version' in bundle,
+      'version',
+      'is missing from',
+      bundle.name,
+      bundleString
+    );
     verifyBundle_(
-        'latestVersion' in bundle,
-        'latestVersion', 'is missing from', bundle.name, bundleString);
+      'latestVersion' in bundle,
+      'latestVersion',
+      'is missing from',
+      bundle.name,
+      bundleString
+    );
     const duplicates = exports.extensionBundles.filter(
-        duplicate => duplicate.name === bundle.name);
+      duplicate => duplicate.name === bundle.name
+    );
     verifyBundle_(
-        duplicates.every(
-            duplicate => duplicate.latestVersion === bundle.latestVersion),
-        'latestVersion', 'is not the same for all versions of', bundle.name,
-        JSON.stringify(duplicates, null, 2));
+      duplicates.every(
+        duplicate => duplicate.latestVersion === bundle.latestVersion
+      ),
+      'latestVersion',
+      'is not the same for all versions of',
+      bundle.name,
+      JSON.stringify(duplicates, null, 2)
+    );
     verifyBundle_(
-        'type' in bundle,
-        'type', 'is missing from', bundle.name, bundleString);
+      'type' in bundle,
+      'type',
+      'is missing from',
+      bundle.name,
+      bundleString
+    );
     const validTypes = Object.keys(TYPES).map(x => TYPES[x]);
     verifyBundle_(
-        validTypes.some(validType => validType === bundle.type),
-        'type', `is not one of ${validTypes.join(',')} in`, bundle.name,
-        bundleString);
+      validTypes.some(validType => validType === bundle.type),
+      'type',
+      `is not one of ${validTypes.join(',')} in`,
+      bundle.name,
+      bundleString
+    );
   });
 };
 
@@ -1002,13 +1021,25 @@ exports.verifyExtensionAliasBundles = function() {
   exports.aliasBundles.forEach(bundle => {
     const bundleString = JSON.stringify(bundle, null, 2);
     verifyBundle_(
-        'name' in bundle,
-        'name', 'is missing from', '', bundleString);
+      'name' in bundle,
+      'name',
+      'is missing from',
+      '',
+      bundleString
+    );
     verifyBundle_(
-        'version' in bundle,
-        'version', 'is missing from', bundle.name, bundleString);
+      'version' in bundle,
+      'version',
+      'is missing from',
+      bundle.name,
+      bundleString
+    );
     verifyBundle_(
-        'latestVersion' in bundle,
-        'latestVersion', 'is missing from', bundle.name, bundleString);
+      'latestVersion' in bundle,
+      'latestVersion',
+      'is missing from',
+      bundle.name,
+      bundleString
+    );
   });
 };
diff --git a/contributing/getting-started-e2e.md b/contributing/getting-started-e2e.md
index ce9f95aef59c..800fae56694b 100644
--- a/contributing/getting-started-e2e.md
+++ b/contributing/getting-started-e2e.md
@@ -35,6 +35,7 @@ If you do not yet have a specific code contribution project in mind as you go th
 - [Create a Git branch](#create-a-git-branch)
 - [Pull the latest changes from the amphtml repository](#pull-the-latest-changes-from-the-amphtml-repository)
 - [Edit files and commit them](#edit-files-and-commit-them)
+  * [Code quality and style](#code-quality-and-style)
 - [Testing your changes](#testing-your-changes)
   * [Running tests locally](#running-tests-locally)
   * [Running all the Travis CI checks locally](#running-all-the-travis-ci-checks-locally)
@@ -293,9 +294,9 @@ The common workflow for making changes to files in Git is:
 
 * edit some files using your favorite editor
 
-* if your code requires a new dependency, run `yarn add --dev --exact [packagename]`, which will automatically update `package.json` and `yarn.lock`
+* if your code requires a new dependency, run `yarn add --exact [--dev] <packagename>`, which will automatically update `package.json` and `yarn.lock`
 
-* if you manually edited `package.json`, run `yarn install` to install the dependency and generate an updated `yarn.lock` file
+* if you manually edited `package.json`, run `yarn` to install the dependency and generate an updated `yarn.lock` file
 
 * tell Git that you care about these changes by _staging_ them using the `git add` command
 
@@ -343,13 +344,24 @@ git commit -a -m "<a brief description of your commit>"
 
 Note that you *can* add changes into an existing commit but that opens up some additional Git concepts that you don't really need to make a contribution.
 
+## Code quality and style
+
+The AMP Project uses [Eslint](https://eslint.org/) to ensure code quality and [Prettier](https://prettier.io/) to standardize code style. For easy development, here are two recommendations:
+- Use a code editor with Eslint support to make sure that your code satisfies all of AMP's quality and style rules. [Here](https://eslint.org/docs/user-guide/integrations#editors) is a list of editors with Eslint extension support.
+- Set your editor to automatically fix Eslint errors in your code on save.
+
+For example, if you use [Visual Studio Code](https://code.visualstudio.com/), you can install its [Eslint plugin](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint), and enable the `eslint.autoFixOnSave` setting.
+
+Alternatively, you can manually fix lint errors in your code by running:
+```
+gulp lint --local-changes --fix
+```
+
 # Testing your changes
 
 Before sending your code changes for review, please make sure that all of the affected tests are passing. You may be expected to add/modify some tests as well.
 
-{% call callout('Note', type='note') %}
-Automatically run most checks on `git push` by enabling our pre-push hook. Run `./build-system/enable-git-pre-push.sh`
-{% endcall %}
+Note: You can automatically run critical checks before `git push` by enabling our pre-push hook. To do so, run `./build-system/enable-git-pre-push.sh`.
 
 ## Running tests locally
 
diff --git a/contributing/getting-started-quick.md b/contributing/getting-started-quick.md
index 59893dae6e51..d0a0afa0f52a 100644
--- a/contributing/getting-started-quick.md
+++ b/contributing/getting-started-quick.md
@@ -107,12 +107,13 @@ git checkout -b <branch name> master
 
 ## Create commits to contain your changes
 
-1.  Edit files in your favorite editor
-2. If your code requires a new dependency, run `yarn add --dev --exact [packagename]`, which automatically updates `package.json` and `yarn.lock`
-3. If you manually edited `package.json`, run `yarn` to install the dependency and generate an updated `yarn.lock` file
-4. Add each file you change: `git add <file>`
-5. Create a commit: `git commit -m "<your commit message>"`
-6. To avoid having to run `git add` on each file, you can use `git commit -a -m "<your commit message>"` instead.
+1. Edit files in your favorite editor
+2. Make sure your changes satisfy AMP's [code quality and style rules](getting-started-e2e.md#code-quality-and-style)
+3. If your code requires a new dependency, run `yarn add --dev --exact [packagename]`, which automatically updates `package.json` and `yarn.lock`
+4. If you manually edited `package.json`, run `yarn` to install the dependency and generate an updated `yarn.lock` file
+5. Add each file you change: `git add <file>`
+6. Create a commit: `git commit -m "<your commit message>"`
+7. To avoid having to run `git add` on each file, you can use `git commit -a -m "<your commit message>"` instead.
 
 ## Pull the latest changes
 
diff --git a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
index cc92dbd7cd66..74cedb47e95f 100644
--- a/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
+++ b/extensions/amp-3d-gltf/0.1/amp-3d-gltf.js
@@ -27,13 +27,12 @@ const TAG = 'amp-3d-gltf';
 
 const isWebGLSupported = () => {
   const canvas = document.createElement('canvas');
-  const gl = canvas.getContext('webgl')
-      || canvas.getContext('experimental-webgl');
+  const gl =
+    canvas.getContext('webgl') || canvas.getContext('experimental-webgl');
   return gl && gl instanceof WebGLRenderingContext;
 };
 
 export class Amp3dGltf extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -60,9 +59,18 @@ export class Amp3dGltf extends AMP.BaseElement {
    */
   preconnectCallback(opt_onLayout) {
     preloadBootstrap(this.win, this.preconnect);
-    this.preconnect.url('https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js', opt_onLayout);
-    this.preconnect.url('https://cdn.jsdelivr.net/npm/three@0.91/examples/js/loaders/GLTFLoader.js', opt_onLayout);
-    this.preconnect.url('https://cdn.jsdelivr.net/npm/three@0.91/examples/js/controls/OrbitControls.js', opt_onLayout);
+    this.preconnect.url(
+      'https://cdnjs.cloudflare.com/ajax/libs/three.js/91/three.js',
+      opt_onLayout
+    );
+    this.preconnect.url(
+      'https://cdn.jsdelivr.net/npm/three@0.91/examples/js/loaders/GLTFLoader.js',
+      opt_onLayout
+    );
+    this.preconnect.url(
+      'https://cdn.jsdelivr.net/npm/three@0.91/examples/js/controls/OrbitControls.js',
+      opt_onLayout
+    );
   }
 
   /** @override */
@@ -92,9 +100,7 @@ export class Amp3dGltf extends AMP.BaseElement {
     const string = x => x;
     const number = x => parseFloat(x);
 
-    const src = assertHttpsUrl(
-        getOption('src', string, ''),
-        this.element);
+    const src = assertHttpsUrl(getOption('src', string, ''), this.element);
 
     const useAlpha = getOption('alpha', bool, false);
 
@@ -106,21 +112,27 @@ export class Amp3dGltf extends AMP.BaseElement {
       },
       'rendererSettings': {
         'clearAlpha': useAlpha ? 0 : 1,
-        'clearColor':
-            getOption('clearColor', string, '#fff'),
-        'maxPixelRatio':
-            getOption('maxPixelRatio', number, devicePixelRatio || 1),
+        'clearColor': getOption('clearColor', string, '#fff'),
+        'maxPixelRatio': getOption(
+          'maxPixelRatio',
+          number,
+          devicePixelRatio || 1
+        ),
       },
       'controls': {
         'enableZoom': getOption('enableZoom', bool, true),
         'autoRotate': getOption('autoRotate', bool, false),
       },
     });
-    this.registerAction('setModelRotation', invocation => {
-      this.sendCommandWhenReady_('setModelRotation', invocation.args)
-          .catch(e => dev()
-              .error('AMP-3D-GLTF', 'setModelRotation failed: %s', e));
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'setModelRotation',
+      invocation => {
+        this.sendCommandWhenReady_('setModelRotation', invocation.args).catch(
+          e => dev().error('AMP-3D-GLTF', 'setModelRotation failed: %s', e)
+        );
+      },
+      ActionTrust.LOW
+    );
   }
 
   /** @override */
@@ -130,9 +142,7 @@ export class Amp3dGltf extends AMP.BaseElement {
       return Promise.resolve();
     }
 
-    const iframe = getIframe(
-        this.win, this.element, '3d-gltf', this.context_
-    );
+    const iframe = getIframe(this.win, this.element, '3d-gltf', this.context_);
 
     this.applyFillContent(iframe, true);
     this.iframe_ = iframe;
@@ -149,11 +159,8 @@ export class Amp3dGltf extends AMP.BaseElement {
       return;
     }
 
-    const listenIframe = (evName, cb) => listenFor(
-        dev().assertElement(this.iframe_),
-        evName,
-        cb,
-        true);
+    const listenIframe = (evName, cb) =>
+      listenFor(dev().assertElement(this.iframe_), evName, cb, true);
 
     const disposers = [
       listenIframe('ready', this.willBeReady_.resolve),
@@ -192,12 +199,7 @@ export class Amp3dGltf extends AMP.BaseElement {
    * @private
    */
   postMessage_(type, message) {
-    postMessage(
-        dev().assertElement(this.iframe_),
-        type,
-        message,
-        '*',
-        true);
+    postMessage(dev().assertElement(this.iframe_), type, message, '*', true);
   }
 
   /**
@@ -225,8 +227,9 @@ export class Amp3dGltf extends AMP.BaseElement {
   onLayoutMeasure() {
     const box = this.getLayoutBox();
     this.sendCommandWhenReady_(
-        'setSize',
-        dict({'width': box.width, 'height': box.height}));
+      'setSize',
+      dict({'width': box.width, 'height': box.height})
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
index 280a30ded811..1fd1d7755308 100644
--- a/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
+++ b/extensions/amp-3d-gltf/0.1/test/test-amp-3d-gltf.js
@@ -17,96 +17,99 @@
 import '../amp-3d-gltf';
 import {createIframeWithMessageStub} from '../../../../testing/iframe';
 
-describes.realWin('amp-3d-gltf', {
-  amp: {
-    extensions: ['amp-3d-gltf'],
+describes.realWin(
+  'amp-3d-gltf',
+  {
+    amp: {
+      extensions: ['amp-3d-gltf'],
+    },
+    allowExternalResources: true,
   },
-  allowExternalResources: true,
-}, env => {
-  let win;
-  let doc;
-  let iframe;
-  let testIndex = 0;
-  let sendFakeMessage = () => {};
+  env => {
+    let win;
+    let doc;
+    let iframe;
+    let testIndex = 0;
+    let sendFakeMessage = () => {};
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    testIndex++;
-    const sentinel = 'amp3ptest' + testIndex;
-    iframe = createIframeWithMessageStub(win);
-    iframe.setAttribute('data-amp-3p-sentinel', sentinel);
-    iframe.name = 'test_nomaster';
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      testIndex++;
+      const sentinel = 'amp3ptest' + testIndex;
+      iframe = createIframeWithMessageStub(win);
+      iframe.setAttribute('data-amp-3p-sentinel', sentinel);
+      iframe.name = 'test_nomaster';
 
-    sendFakeMessage = type => {
-      return new Promise(resolve => {
-        iframe.postMessageToParent({sentinel, type});
-        setTimeout(resolve, 100);
-      });
-    };
-  });
+      sendFakeMessage = type => {
+        return new Promise(resolve => {
+          iframe.postMessageToParent({sentinel, type});
+          setTimeout(resolve, 100);
+        });
+      };
+    });
 
-  const createElement = () => {
-    const amp3dGltfEl = doc.createElement('amp-3d-gltf');
-    amp3dGltfEl.setAttribute('src', 'https://fake.com/fake.gltf');
-    amp3dGltfEl.setAttribute('layout', 'fixed');
-    amp3dGltfEl.setAttribute('width', '320');
-    amp3dGltfEl.setAttribute('height', '240');
+    const createElement = () => {
+      const amp3dGltfEl = doc.createElement('amp-3d-gltf');
+      amp3dGltfEl.setAttribute('src', 'https://fake.com/fake.gltf');
+      amp3dGltfEl.setAttribute('layout', 'fixed');
+      amp3dGltfEl.setAttribute('width', '320');
+      amp3dGltfEl.setAttribute('height', '240');
 
-    doc.body.appendChild(amp3dGltfEl);
+      doc.body.appendChild(amp3dGltfEl);
 
-    return amp3dGltfEl.build()
-        .then(() => {
-          const amp3dGltf = amp3dGltfEl.implementation_;
-          sandbox.stub(amp3dGltf, 'iframe_')
-              .get(() => iframe)
-              .set(() => {});
+      return amp3dGltfEl.build().then(() => {
+        const amp3dGltf = amp3dGltfEl.implementation_;
+        sandbox
+          .stub(amp3dGltf, 'iframe_')
+          .get(() => iframe)
+          .set(() => {});
 
-          const willLayout = amp3dGltfEl.layoutCallback();
+        const willLayout = amp3dGltfEl.layoutCallback();
 
-          return sendFakeMessage('ready')
-              .then(() => sendFakeMessage('loaded'))
-              .then(() => willLayout)
-              .then(() => amp3dGltf);
-        });
-  };
+        return sendFakeMessage('ready')
+          .then(() => sendFakeMessage('loaded'))
+          .then(() => willLayout)
+          .then(() => amp3dGltf);
+      });
+    };
 
-  // TODO (#16080): this test keeps timing out for some reason.
-  // Unskip when we figure out root cause.
-  it.skip('renders iframe', () => {
-    return createElement()
-        .then(() => {
-          expect(!!doc.body.querySelector('amp-3d-gltf > iframe')).to.be.true;
-        });
-  });
+    // TODO (#16080): this test keeps timing out for some reason.
+    // Unskip when we figure out root cause.
+    it.skip('renders iframe', () => {
+      return createElement().then(() => {
+        expect(!!doc.body.querySelector('amp-3d-gltf > iframe')).to.be.true;
+      });
+    });
 
-  // TODO (#16080): this test times out on Travis. Re-enable when fixed.
-  it.skip('sends toggleAmpViewport(false) when exiting viewport', () => {
-    return createElement()
-        .then(amp3dGltf => {
-          const postMessageSpy = sandbox.spy(amp3dGltf, 'postMessage_');
-          return amp3dGltf.viewportCallback(false).then(() => {
-            expect(postMessageSpy.calledOnce).to.be.true;
-            expect(postMessageSpy.firstCall.args[0]).to.equal('action');
-            expect(postMessageSpy.firstCall.args[1].action)
-                .to.equal('toggleAmpViewport');
-            expect(postMessageSpy.firstCall.args[1].args).to.be.false;
-          });
+    // TODO (#16080): this test times out on Travis. Re-enable when fixed.
+    it.skip('sends toggleAmpViewport(false) when exiting viewport', () => {
+      return createElement().then(amp3dGltf => {
+        const postMessageSpy = sandbox.spy(amp3dGltf, 'postMessage_');
+        return amp3dGltf.viewportCallback(false).then(() => {
+          expect(postMessageSpy.calledOnce).to.be.true;
+          expect(postMessageSpy.firstCall.args[0]).to.equal('action');
+          expect(postMessageSpy.firstCall.args[1].action).to.equal(
+            'toggleAmpViewport'
+          );
+          expect(postMessageSpy.firstCall.args[1].args).to.be.false;
         });
-  });
+      });
+    });
 
-  // TODO (#16080): this test times out on Travis. Re-enable when fixed.
-  it.skip('sends toggleAmpViewport(true) when entering viewport', () => {
-    return createElement()
-        .then(amp3dGltf => {
-          const postMessageSpy = sandbox.spy(amp3dGltf, 'postMessage_');
-          return amp3dGltf.viewportCallback(true).then(() => {
-            expect(postMessageSpy.calledOnce).to.be.true;
-            expect(postMessageSpy.firstCall.args[0]).to.equal('action');
-            expect(postMessageSpy.firstCall.args[1].action)
-                .to.equal('toggleAmpViewport');
-            expect(postMessageSpy.firstCall.args[1].args).to.be.true;
-          });
+    // TODO (#16080): this test times out on Travis. Re-enable when fixed.
+    it.skip('sends toggleAmpViewport(true) when entering viewport', () => {
+      return createElement().then(amp3dGltf => {
+        const postMessageSpy = sandbox.spy(amp3dGltf, 'postMessage_');
+        return amp3dGltf.viewportCallback(true).then(() => {
+          expect(postMessageSpy.calledOnce).to.be.true;
+          expect(postMessageSpy.firstCall.args[0]).to.equal('action');
+          expect(postMessageSpy.firstCall.args[1].action).to.equal(
+            'toggleAmpViewport'
+          );
+          expect(postMessageSpy.firstCall.args[1].args).to.be.true;
         });
-  });
-});
+      });
+    });
+  }
+);
diff --git a/extensions/amp-3q-player/0.1/amp-3q-player.js b/extensions/amp-3q-player/0.1/amp-3q-player.js
index d015f243a03e..b393c87459a6 100644
--- a/extensions/amp-3q-player/0.1/amp-3q-player.js
+++ b/extensions/amp-3q-player/0.1/amp-3q-player.js
@@ -30,18 +30,13 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
-
 const TAG = 'amp-3q-player';
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class Amp3QPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -74,9 +69,10 @@ class Amp3QPlayer extends AMP.BaseElement {
     const {element: el} = this;
 
     this.dataId = userAssert(
-        el.getAttribute('data-id'),
-        'The data-id attribute is required for <amp-3q-player> %s',
-        el);
+      el.getAttribute('data-id'),
+      'The data-id attribute is required for <amp-3q-player> %s',
+      el
+    );
 
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
@@ -88,18 +84,21 @@ class Amp3QPlayer extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    const iframe = createFrameFor(this,
-        'https://playout.3qsdn.com/'
-          + encodeURIComponent(dev().assertString(this.dataId))
-          // Autoplay is handled by VideoManager
-          + '?autoplay=false&amp=true');
+    const iframe = createFrameFor(
+      this,
+      'https://playout.3qsdn.com/' +
+        encodeURIComponent(dev().assertString(this.dataId)) +
+        // Autoplay is handled by VideoManager
+        '?autoplay=false&amp=true'
+    );
 
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.sdnBridge_.bind(this));
+      this.win,
+      'message',
+      this.sdnBridge_.bind(this)
+    );
 
     return this.loadPromise(this.iframe_).then(() => this.playerReadyPromise_);
   }
@@ -178,7 +177,7 @@ class Amp3QPlayer extends AMP.BaseElement {
   sdnPostMessage_(message) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow./*OK*/postMessage(message, '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
   }
@@ -291,7 +290,6 @@ class Amp3QPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, Amp3QPlayer);
 });
diff --git a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
index 19b4dce85f6a..9f4f76f58fda 100644
--- a/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
+++ b/extensions/amp-3q-player/0.1/test/test-amp-3q-player.js
@@ -19,85 +19,101 @@ import {Services} from '../../../../src/services';
 import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 
-
-describes.realWin('amp-3q-player', {
-  amp: {
-    extensions: ['amp-3q-player'],
+describes.realWin(
+  'amp-3q-player',
+  {
+    amp: {
+      extensions: ['amp-3q-player'],
+    },
   },
-}, function(env) {
-  let win;
-  let doc;
-  let timer;
+  function(env) {
+    let win;
+    let doc;
+    let timer;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+    });
 
-  function get3QElement(playoutId) {
-    const player = doc.createElement('amp-3q-player');
-    if (playoutId) {
-      player.setAttribute('data-id', playoutId);
+    function get3QElement(playoutId) {
+      const player = doc.createElement('amp-3q-player');
+      if (playoutId) {
+        player.setAttribute('data-id', playoutId);
+      }
+      doc.body.appendChild(player);
+      return player
+        .build()
+        .then(() => {
+          player.layoutCallback();
+          const iframe = player.querySelector('iframe');
+          player.implementation_.sdnBridge_({
+            source: iframe.contentWindow,
+            data: JSON.stringify({data: 'ready'}),
+          });
+        })
+        .then(() => {
+          return player;
+        });
     }
-    doc.body.appendChild(player);
-    return player.build().then(() => {
-      player.layoutCallback();
-      const iframe = player.querySelector('iframe');
-      player.implementation_.sdnBridge_({
-        source: iframe.contentWindow,
-        data: JSON.stringify({data: 'ready'}),
-      });
-    }).then(() => {
-      return player;
-    });
-  }
 
-  it('renders', () => {
-    return get3QElement(
-        'c8dbe7f4-7f7f-11e6-a407-0cc47a188158').then(player => {
-      const iframe = player.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.src).to.equal('https://playout.3qsdn.com/c8dbe7f4-7f7f-11e6-a407-0cc47a188158?autoplay=false&amp=true');
+    it('renders', () => {
+      return get3QElement('c8dbe7f4-7f7f-11e6-a407-0cc47a188158').then(
+        player => {
+          const iframe = player.querySelector('iframe');
+          expect(iframe).to.not.be.null;
+          expect(iframe.src).to.equal(
+            'https://playout.3qsdn.com/c8dbe7f4-7f7f-11e6-a407-0cc47a188158?autoplay=false&amp=true'
+          );
+        }
+      );
     });
-  });
 
-  it('requires data-id', () => {
-    return allowConsoleError(() => {
-      return get3QElement('').should.eventually.be.rejectedWith(
-          /The data-id attribute is required/);
+    it('requires data-id', () => {
+      return allowConsoleError(() => {
+        return get3QElement('').should.eventually.be.rejectedWith(
+          /The data-id attribute is required/
+        );
+      });
     });
-  });
-
-  it('should forward events from amp-3q-player to the amp element', () => {
-    return get3QElement(
-        'c8dbe7f4-7f7f-11e6-a407-0cc47a188158').then(player => {
 
-      const iframe = player.querySelector('iframe');
+    it('should forward events from amp-3q-player to the amp element', () => {
+      return get3QElement('c8dbe7f4-7f7f-11e6-a407-0cc47a188158').then(
+        player => {
+          const iframe = player.querySelector('iframe');
 
-      return Promise.resolve().then(() => {
-        const p = listenOncePromise(player, VideoEvents.MUTED);
-        sendFakeMessage(player, iframe, 'muted');
-        return p;
-      }).then(() => {
-        const p = listenOncePromise(player, VideoEvents.PLAYING);
-        sendFakeMessage(player, iframe, 'playing');
-        return p;
-      }).then(() => {
-        const p = listenOncePromise(player, VideoEvents.PAUSE);
-        sendFakeMessage(player, iframe, 'paused');
-        return p;
-      }).then(() => {
-        const p = listenOncePromise(player, VideoEvents.UNMUTED);
-        sendFakeMessage(player, iframe, 'unmuted');
-        const successTimeout = timer.promise(10);
-        return Promise.race([p, successTimeout]);
-      });
+          return Promise.resolve()
+            .then(() => {
+              const p = listenOncePromise(player, VideoEvents.MUTED);
+              sendFakeMessage(player, iframe, 'muted');
+              return p;
+            })
+            .then(() => {
+              const p = listenOncePromise(player, VideoEvents.PLAYING);
+              sendFakeMessage(player, iframe, 'playing');
+              return p;
+            })
+            .then(() => {
+              const p = listenOncePromise(player, VideoEvents.PAUSE);
+              sendFakeMessage(player, iframe, 'paused');
+              return p;
+            })
+            .then(() => {
+              const p = listenOncePromise(player, VideoEvents.UNMUTED);
+              sendFakeMessage(player, iframe, 'unmuted');
+              const successTimeout = timer.promise(10);
+              return Promise.race([p, successTimeout]);
+            });
+        }
+      );
     });
-  });
 
-  function sendFakeMessage(player, iframe, command) {
-    player.implementation_.sdnBridge_(
-        {source: iframe.contentWindow, data: JSON.stringify({data: command})});
+    function sendFakeMessage(player, iframe, command) {
+      player.implementation_.sdnBridge_({
+        source: iframe.contentWindow,
+        data: JSON.stringify({data: command}),
+      });
+    }
   }
-});
+);
diff --git a/extensions/amp-a4a/0.1/a4a-variable-source.js b/extensions/amp-a4a/0.1/a4a-variable-source.js
index ecc3043333b7..6fa81cddc050 100644
--- a/extensions/amp-a4a/0.1/a4a-variable-source.js
+++ b/extensions/amp-a4a/0.1/a4a-variable-source.js
@@ -23,7 +23,6 @@ import {
 } from '../../../src/service/variable-source';
 import {user, userAssert} from '../../../src/log';
 
-
 const WHITELISTED_VARIABLES = [
   'AMPDOC_HOST',
   'AMPDOC_HOSTNAME',
@@ -102,19 +101,27 @@ export class A4AVariableSource extends VariableSource {
     }
 
     this.set('NAV_TIMING', (startAttribute, endAttribute) => {
-      userAssert(startAttribute, 'The first argument to NAV_TIMING, the' +
-          ' start attribute name, is required');
+      userAssert(
+        startAttribute,
+        'The first argument to NAV_TIMING, the' +
+          ' start attribute name, is required'
+      );
       return getTimingDataSync(
-          this.win_,
-          /**@type {string}*/(startAttribute),
-          /**@type {string}*/(endAttribute));
+        this.win_,
+        /**@type {string}*/ (startAttribute),
+        /**@type {string}*/ (endAttribute)
+      );
     }).setAsync('NAV_TIMING', (startAttribute, endAttribute) => {
-      userAssert(startAttribute, 'The first argument to NAV_TIMING, the' +
-          ' start attribute name, is required');
+      userAssert(
+        startAttribute,
+        'The first argument to NAV_TIMING, the' +
+          ' start attribute name, is required'
+      );
       return getTimingDataAsync(
-          this.win_,
-          /**@type {string}*/(startAttribute),
-          /**@type {string}*/(endAttribute));
+        this.win_,
+        /**@type {string}*/ (startAttribute),
+        /**@type {string}*/ (endAttribute)
+      );
     });
 
     this.set('NAV_TYPE', () => {
@@ -125,8 +132,10 @@ export class A4AVariableSource extends VariableSource {
       return getNavigationData(this.win_, 'redirectCount');
     });
 
-    this.set('HTML_ATTR',
-        /** @type {function(...*)} */(this.htmlAttributeBinding_.bind(this)));
+    this.set(
+      'HTML_ATTR',
+      /** @type {function(...*)} */ (this.htmlAttributeBinding_.bind(this))
+    );
 
     this.set('CLIENT_ID', () => null);
   }
@@ -179,20 +188,27 @@ export class A4AVariableSource extends VariableSource {
       return '[]';
     }
     if (elements.length > HTML_ATTR_MAX_ELEMENTS_TO_TRAVERSE) {
-      user().error(TAG, 'CSS selector may match at most ' +
-          `${HTML_ATTR_MAX_ELEMENTS_TO_TRAVERSE} elements.`);
+      user().error(
+        TAG,
+        'CSS selector may match at most ' +
+          `${HTML_ATTR_MAX_ELEMENTS_TO_TRAVERSE} elements.`
+      );
       return '[]';
     }
     const result = [];
-    for (let i = 0; i < elements.length &&
-        result.length < HTML_ATTR_MAX_ELEMENTS_TO_RETURN; ++i) {
+    for (
+      let i = 0;
+      i < elements.length && result.length < HTML_ATTR_MAX_ELEMENTS_TO_RETURN;
+      ++i
+    ) {
       const currentResult = {};
       let foundAtLeastOneAttr = false;
       for (let j = 0; j < attributeNames.length; ++j) {
         const attributeName = attributeNames[j];
         if (elements[i].hasAttribute(attributeName)) {
-          currentResult[attributeName] =
-              elements[i].getAttribute(attributeName);
+          currentResult[attributeName] = elements[i].getAttribute(
+            attributeName
+          );
           foundAtLeastOneAttr = true;
         }
       }
diff --git a/extensions/amp-a4a/0.1/amp-a4a.js b/extensions/amp-a4a/0.1/amp-a4a.js
index d4a6cc1b2390..d33cf7e40528 100644
--- a/extensions/amp-a4a/0.1/amp-a4a.js
+++ b/extensions/amp-a4a/0.1/amp-a4a.js
@@ -30,10 +30,7 @@ import {
   generateSentinel,
   getDefaultBootstrapBaseUrl,
 } from '../../../src/3p-frame';
-import {
-  assertHttpsUrl,
-  tryDecodeUriComponent,
-} from '../../../src/url';
+import {assertHttpsUrl, tryDecodeUriComponent} from '../../../src/url';
 import {cancellation, isCancellation} from '../../../src/error';
 import {createElementWithAttributes} from '../../../src/dom';
 import {
@@ -59,9 +56,7 @@ import {
   installFriendlyIframeEmbed,
   setFriendlyIframeEmbedVisible,
 } from '../../../src/friendly-iframe-embed';
-import {
-  installUrlReplacementsForEmbed,
-} from '../../../src/service/url-replacements-impl';
+import {installUrlReplacementsForEmbed} from '../../../src/service/url-replacements-impl';
 import {isAdPositionAllowed} from '../../../src/ad-helper';
 import {isArray, isEnumValue, isObject} from '../../../src/types';
 import {isExperimentOn} from '../../../src/experiments';
@@ -76,7 +71,8 @@ import {utf8Decode} from '../../../src/utils/bytes';
 const METADATA_STRINGS = [
   '<script amp-ad-metadata type=application/json>',
   '<script type="application/json" amp-ad-metadata>',
-  '<script type=application/json amp-ad-metadata>'];
+  '<script type=application/json amp-ad-metadata>',
+];
 
 // TODO(tdrl): Temporary, while we're verifying whether SafeFrame is an
 // acceptable solution to the 'Safari on iOS doesn't fetch iframe src from
@@ -188,7 +184,10 @@ const LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER = {
  * @visibleForTesting
  */
 export function protectFunctionWrapper(
-  fn, inThis = undefined, onError = undefined) {
+  fn,
+  inThis = undefined,
+  onError = undefined
+) {
   return (...fnArgs) => {
     try {
       return fn.apply(inThis, fnArgs);
@@ -270,8 +269,7 @@ export class AmpA4A extends AMP.BaseElement {
      * uses safeframe when response header is not specified.
      * @private {?XORIGIN_MODE}
      */
-    this.experimentalNonAmpCreativeRenderMethod_ =
-        this.getNonAmpCreativeRenderingMethod();
+    this.experimentalNonAmpCreativeRenderMethod_ = this.getNonAmpCreativeRenderingMethod();
 
     /**
      * Gets a notion of current time, in ms.  The value is not necessarily
@@ -281,8 +279,10 @@ export class AmpA4A extends AMP.BaseElement {
      *
      * @const {function():number}
      */
-    this.getNow_ = (this.win.performance && this.win.performance.now) ?
-      this.win.performance.now.bind(this.win.performance) : Date.now;
+    this.getNow_ =
+      this.win.performance && this.win.performance.now
+        ? this.win.performance.now.bind(this.win.performance)
+        : Date.now;
 
     /** @const {string} */
     this.sentinel = generateSentinel(window);
@@ -380,25 +380,31 @@ export class AmpA4A extends AMP.BaseElement {
       height: this.element.getAttribute('height'),
     };
     const upgradeDelayMs = Math.round(this.getResource().getUpgradeDelayMs());
-    dev().info(TAG,
-        `upgradeDelay ${this.element.getAttribute('type')}: ${upgradeDelayMs}`);
+    dev().info(
+      TAG,
+      `upgradeDelay ${this.element.getAttribute('type')}: ${upgradeDelayMs}`
+    );
 
     this.uiHandler = new AMP.AmpAdUIHandler(this);
 
     const verifier = signatureVerifierFor(this.win);
-    this.keysetPromise_ =
-        Services.viewerForDoc(this.getAmpDoc()).whenFirstVisible().then(() => {
-          this.getSigningServiceNames().forEach(signingServiceName => {
-            verifier.loadKeyset(signingServiceName);
-          });
+    this.keysetPromise_ = Services.viewerForDoc(this.getAmpDoc())
+      .whenFirstVisible()
+      .then(() => {
+        this.getSigningServiceNames().forEach(signingServiceName => {
+          verifier.loadKeyset(signingServiceName);
         });
+      });
 
     this.a4aAnalyticsConfig_ = this.getA4aAnalyticsConfig();
     if (this.a4aAnalyticsConfig_) {
       // TODO(warrengm): Consider having page-level singletons for networks that
       // use the same config for all ads.
       this.a4aAnalyticsElement_ = insertAnalyticsElement(
-          this.element, this.a4aAnalyticsConfig_, true /* loadAnalytics */);
+        this.element,
+        this.a4aAnalyticsConfig_,
+        true /* loadAnalytics */
+      );
     }
 
     this.isSinglePageStoryAd = this.element.hasAttribute('amp-story');
@@ -407,14 +413,16 @@ export class AmpA4A extends AMP.BaseElement {
   /** @override */
   renderOutsideViewport() {
     // Ensure non-verified AMP creatives are throttled.
-    if (!this.isVerifiedAmpCreative_ && is3pThrottled(this.win) &&
-        !this.inNonAmpPreferenceExp()) {
+    if (
+      !this.isVerifiedAmpCreative_ &&
+      is3pThrottled(this.win) &&
+      !this.inNonAmpPreferenceExp()
+    ) {
       return false;
     }
     // Otherwise the ad is good to go.
     const elementCheck = getAmpAdRenderOutsideViewport(this.element);
-    return elementCheck !== null ?
-      elementCheck : super.renderOutsideViewport();
+    return elementCheck !== null ? elementCheck : super.renderOutsideViewport();
   }
 
   /**
@@ -471,8 +479,9 @@ export class AmpA4A extends AMP.BaseElement {
    * @return {boolean}
    */
   isAmpAdElement() {
-    return this.element.tagName == 'AMP-AD' ||
-        this.element.tagName == 'AMP-EMBED';
+    return (
+      this.element.tagName == 'AMP-AD' || this.element.tagName == 'AMP-EMBED'
+    );
   }
 
   /**
@@ -488,7 +497,7 @@ export class AmpA4A extends AMP.BaseElement {
     // matches amp-ad loader predicate such that A4A impl does not load.
     if (preconnect) {
       preconnect.forEach(p => {
-        this.preconnect.url(p, /*opt_preloadAs*/true);
+        this.preconnect.url(p, /*opt_preloadAs*/ true);
       });
     }
   }
@@ -534,8 +543,10 @@ export class AmpA4A extends AMP.BaseElement {
    * @visibleForTesting
    */
   inNonAmpPreferenceExp() {
-    return !!this.postAdResponseExperimentFeatures['pref_neutral_enabled'] &&
-      ['adsense', 'doubleclick'].includes(this.element.getAttribute('type'));
+    return (
+      !!this.postAdResponseExperimentFeatures['pref_neutral_enabled'] &&
+      ['adsense', 'doubleclick'].includes(this.element.getAttribute('type'))
+    );
   }
 
   /**
@@ -545,15 +556,23 @@ export class AmpA4A extends AMP.BaseElement {
    */
   shouldInitializePromiseChain_() {
     const slotRect = this.getIntersectionElementLayoutBox();
-    if (this.getLayout() != Layout.FLUID &&
-        (slotRect.height == 0 || slotRect.width == 0)) {
+    if (
+      this.getLayout() != Layout.FLUID &&
+      (slotRect.height == 0 || slotRect.width == 0)
+    ) {
       dev().fine(
-          TAG, 'onLayoutMeasure canceled due height/width 0', this.element);
+        TAG,
+        'onLayoutMeasure canceled due height/width 0',
+        this.element
+      );
       return false;
     }
     if (!isAdPositionAllowed(this.element, this.win)) {
-      user().warn(TAG, `<${this.element.tagName}> is not allowed to be ` +
-        `placed in elements with position:fixed: ${this.element}`);
+      user().warn(
+        TAG,
+        `<${this.element.tagName}> is not allowed to be ` +
+          `placed in elements with position:fixed: ${this.element}`
+      );
       return false;
     }
     // OnLayoutMeasure can be called when page is in prerender so delay until
@@ -562,8 +581,12 @@ export class AmpA4A extends AMP.BaseElement {
     // its element ancestry.
     if (!this.isValidElement()) {
       // TODO(kjwright): collapse?
-      user().warn(TAG, this.element.getAttribute('type'),
-          'Amp ad element ignored as invalid', this.element);
+      user().warn(
+        TAG,
+        this.element.getAttribute('type'),
+        'Amp ad element ignored as invalid',
+        this.element
+      );
       return false;
     }
     return true;
@@ -610,237 +633,257 @@ export class AmpA4A extends AMP.BaseElement {
     //   - Rendering fails => return false
     //   - Chain cancelled => don't return; drop error
     //   - Uncaught error otherwise => don't return; percolate error up
-    this.adPromise_ = Services.viewerForDoc(this.getAmpDoc()).whenFirstVisible()
-        .then(() => {
-          checkStillCurrent();
-          // See if experiment that delays request until slot is within
-          // renderOutsideViewport. Within render outside viewport will not
-          // resolve if already within viewport thus the check for already
-          // meeting the definition as opposed to waiting on the promise.
-          const delay = this.delayAdRequestEnabled();
-          if (delay) {
-            return this.getResource().whenWithinViewport(
-                typeof delay == 'number' ? delay :
-                  this.renderOutsideViewport());
-          }
-        })
-        // Possibly block on amp-consent.
-        /** @return {!Promise<Array<Promise>>} */
-        .then(() => {
-          checkStillCurrent();
-          const consentPolicyId = super.getConsentPolicy();
-
-          if (consentPolicyId) {
-
-            const consentStatePromise = getConsentPolicyState(
-                this.element,
-                consentPolicyId
-            ).catch(err => {
-              user().error(TAG, 'Error determining consent state', err);
-              return CONSENT_POLICY_STATE.UNKNOWN;
-            });
-
-            const consentStringPromise = getConsentPolicyInfo(
-                this.element,
-                consentPolicyId
-            ).catch(err => {
-              user().error(TAG, 'Error determining consent string', err);
-              return null;
-            });
-
-            return Promise.all([
-              consentStatePromise,
-              consentStringPromise,
-            ]);
-          }
+    this.adPromise_ = Services.viewerForDoc(this.getAmpDoc())
+      .whenFirstVisible()
+      .then(() => {
+        checkStillCurrent();
+        // See if experiment that delays request until slot is within
+        // renderOutsideViewport. Within render outside viewport will not
+        // resolve if already within viewport thus the check for already
+        // meeting the definition as opposed to waiting on the promise.
+        const delay = this.delayAdRequestEnabled();
+        if (delay) {
+          return this.getResource().whenWithinViewport(
+            typeof delay == 'number' ? delay : this.renderOutsideViewport()
+          );
+        }
+      })
+      // Possibly block on amp-consent.
+      /** @return {!Promise<Array<Promise>>} */
+      .then(() => {
+        checkStillCurrent();
+        const consentPolicyId = super.getConsentPolicy();
+
+        if (consentPolicyId) {
+          const consentStatePromise = getConsentPolicyState(
+            this.element,
+            consentPolicyId
+          ).catch(err => {
+            user().error(TAG, 'Error determining consent state', err);
+            return CONSENT_POLICY_STATE.UNKNOWN;
+          });
 
-          return Promise.resolve([null, null]);
-        })
-        // This block returns the ad URL, if one is available.
-        /** @return {!Promise<?string>} */
-        .then(consentResponse => {
-          checkStillCurrent();
+          const consentStringPromise = getConsentPolicyInfo(
+            this.element,
+            consentPolicyId
+          ).catch(err => {
+            user().error(TAG, 'Error determining consent string', err);
+            return null;
+          });
+
+          return Promise.all([consentStatePromise, consentStringPromise]);
+        }
 
-          const consentState = consentResponse[0];
-          const consentString = consentResponse[1];
+        return Promise.resolve([null, null]);
+      })
+      // This block returns the ad URL, if one is available.
+      /** @return {!Promise<?string>} */
+      .then(consentResponse => {
+        checkStillCurrent();
 
-          return /** @type {!Promise<?string>} */(this.getAdUrl(
-              consentState, this.tryExecuteRealTimeConfig_(
-                  consentState,
-                  consentString
-              )));
-        })
-        // This block returns the (possibly empty) response to the XHR request.
-        /** @return {!Promise<?Response>} */
-        .then(adUrl => {
-          checkStillCurrent();
-          this.adUrl_ = adUrl;
-          // If we should skip the XHR, we will instead request and render
-          // by simply writing a frame into the page using
-          // renderViaIframeGet
-          if (!this.isXhrAllowed() && !!this.adUrl_) {
-            this.experimentalNonAmpCreativeRenderMethod_ =
-                XORIGIN_MODE.IFRAME_GET;
-            return Promise.reject(IFRAME_GET);
+        const consentState = consentResponse[0];
+        const consentString = consentResponse[1];
+
+        return /** @type {!Promise<?string>} */ (this.getAdUrl(
+          consentState,
+          this.tryExecuteRealTimeConfig_(consentState, consentString)
+        ));
+      })
+      // This block returns the (possibly empty) response to the XHR request.
+      /** @return {!Promise<?Response>} */
+      .then(adUrl => {
+        checkStillCurrent();
+        this.adUrl_ = adUrl;
+        // If we should skip the XHR, we will instead request and render
+        // by simply writing a frame into the page using
+        // renderViaIframeGet
+        if (!this.isXhrAllowed() && !!this.adUrl_) {
+          this.experimentalNonAmpCreativeRenderMethod_ =
+            XORIGIN_MODE.IFRAME_GET;
+          return Promise.reject(IFRAME_GET);
+        }
+        return adUrl && this.sendXhrRequest(adUrl);
+      })
+      // The following block returns either the response (as a
+      // {bytes, headers} object), or null if no response is available /
+      // response is empty.
+      /** @return {?Promise<?{bytes: !ArrayBuffer, headers: !Headers}>} */
+      .then(fetchResponse => {
+        checkStillCurrent();
+        this.maybeTriggerAnalyticsEvent_('adRequestEnd');
+        // If the response is null (can occur for non-200 responses)  or
+        // arrayBuffer is null, force collapse.
+        if (
+          !fetchResponse ||
+          !fetchResponse.arrayBuffer ||
+          fetchResponse.headers.has('amp-ff-empty-creative')
+        ) {
+          this.forceCollapse();
+          return Promise.reject(NO_CONTENT_RESPONSE);
+        }
+        if (
+          fetchResponse.headers &&
+          fetchResponse.headers.has(EXPERIMENT_FEATURE_HEADER_NAME)
+        ) {
+          this.populatePostAdResponseExperimentFeatures_(
+            fetchResponse.headers.get(EXPERIMENT_FEATURE_HEADER_NAME)
+          );
+        }
+        if (
+          getMode().localDev &&
+          this.win.location &&
+          this.win.location.search
+        ) {
+          // Allow for setting experiment features via query param which
+          // will potentially override values returned in response.
+          const match = /(?:\?|&)a4a_feat_exp=([^&]+)/.exec(
+            this.win.location.search
+          );
+          if (match && match[1]) {
+            dev().info(TAG, `Using debug exp features: ${match[1]}`);
+            this.populatePostAdResponseExperimentFeatures_(
+              tryDecodeUriComponent(match[1])
+            );
           }
-          return adUrl && this.sendXhrRequest(adUrl);
-        })
-        // The following block returns either the response (as a
-        // {bytes, headers} object), or null if no response is available /
-        // response is empty.
-        /** @return {?Promise<?{bytes: !ArrayBuffer, headers: !Headers}>} */
-        .then(fetchResponse => {
-          checkStillCurrent();
-          this.maybeTriggerAnalyticsEvent_('adRequestEnd');
-          // If the response is null (can occur for non-200 responses)  or
-          // arrayBuffer is null, force collapse.
-          if (!fetchResponse || !fetchResponse.arrayBuffer ||
-              fetchResponse.headers.has('amp-ff-empty-creative')) {
+        }
+        // TODO(tdrl): Temporary, while we're verifying whether SafeFrame is
+        // an acceptable solution to the 'Safari on iOS doesn't fetch
+        // iframe src from cache' issue.  See
+        // https://github.com/ampproject/amphtml/issues/5614
+        const method = this.getNonAmpCreativeRenderingMethod(
+          fetchResponse.headers.get(RENDERING_TYPE_HEADER)
+        );
+        this.experimentalNonAmpCreativeRenderMethod_ = method;
+        if (
+          this.experimentalNonAmpCreativeRenderMethod_ == XORIGIN_MODE.NAMEFRAME
+        ) {
+          this.preconnect.preload(
+            getDefaultBootstrapBaseUrl(this.win, 'nameframe')
+          );
+        }
+        const safeframeVersionHeader = fetchResponse.headers.get(
+          SAFEFRAME_VERSION_HEADER
+        );
+        if (
+          /^[0-9-]+$/.test(safeframeVersionHeader) &&
+          safeframeVersionHeader != DEFAULT_SAFEFRAME_VERSION
+        ) {
+          this.safeframeVersion = safeframeVersionHeader;
+          this.preconnect.preload(this.getSafeframePath());
+        }
+        // Note: Resolving a .then inside a .then because we need to capture
+        // two fields of fetchResponse, one of which is, itself, a promise,
+        // and one of which isn't.  If we just return
+        // fetchResponse.arrayBuffer(), the next step in the chain will
+        // resolve it to a concrete value, but we'll lose track of
+        // fetchResponse.headers.
+        return fetchResponse.arrayBuffer().then(bytes => {
+          if (bytes.byteLength == 0) {
+            // The server returned no content. Instead of displaying a blank
+            // rectangle, we collapse the slot instead.
             this.forceCollapse();
             return Promise.reject(NO_CONTENT_RESPONSE);
           }
-          if (fetchResponse.headers && fetchResponse.headers.has(
-              EXPERIMENT_FEATURE_HEADER_NAME)) {
-            this.populatePostAdResponseExperimentFeatures_(
-                fetchResponse.headers.get(EXPERIMENT_FEATURE_HEADER_NAME));
-          }
-          if (getMode().localDev && this.win.location &&
-              this.win.location.search) {
-            // Allow for setting experiment features via query param which
-            // will potentially override values returned in response.
-            const match = /(?:\?|&)a4a_feat_exp=([^&]+)/.exec(
-                this.win.location.search);
-            if (match && match[1]) {
-              dev().info(TAG, `Using debug exp features: ${match[1]}`);
-              this.populatePostAdResponseExperimentFeatures_(
-                  tryDecodeUriComponent(match[1]));
-            }
-          }
-          // TODO(tdrl): Temporary, while we're verifying whether SafeFrame is
-          // an acceptable solution to the 'Safari on iOS doesn't fetch
-          // iframe src from cache' issue.  See
-          // https://github.com/ampproject/amphtml/issues/5614
-          const method = this.getNonAmpCreativeRenderingMethod(
-              fetchResponse.headers.get(RENDERING_TYPE_HEADER));
-          this.experimentalNonAmpCreativeRenderMethod_ = method;
-          if (this.experimentalNonAmpCreativeRenderMethod_ ==
-              XORIGIN_MODE.NAMEFRAME) {
-            this.preconnect.preload(
-                getDefaultBootstrapBaseUrl(this.win, 'nameframe'));
-          }
-          const safeframeVersionHeader =
-            fetchResponse.headers.get(SAFEFRAME_VERSION_HEADER);
-          if (/^[0-9-]+$/.test(safeframeVersionHeader) &&
-              safeframeVersionHeader != DEFAULT_SAFEFRAME_VERSION) {
-            this.safeframeVersion = safeframeVersionHeader;
-            this.preconnect.preload(this.getSafeframePath());
+          return {
+            bytes,
+            headers: fetchResponse.headers,
+          };
+        });
+      })
+      /** @return {!Promise<?ArrayBuffer>} */
+      .then(responseParts => {
+        checkStillCurrent();
+        // Keep a handle to the creative body so that we can render into
+        // SafeFrame or NameFrame later, if necessary.  TODO(tdrl): Temporary,
+        // while we
+        // assess whether this is the right solution to the Safari+iOS iframe
+        // src cache issue.  If we decide to keep a SafeFrame-like solution,
+        // we should restructure the promise chain to pass this info along
+        // more cleanly, without use of an object variable outside the chain.
+        if (!responseParts) {
+          return Promise.resolve();
+        }
+        const {bytes, headers} = responseParts;
+        const size = this.extractSize(responseParts.headers);
+        this.creativeSize_ = size || this.creativeSize_;
+        if (
+          this.experimentalNonAmpCreativeRenderMethod_ !=
+            XORIGIN_MODE.CLIENT_CACHE &&
+          bytes
+        ) {
+          this.creativeBody_ = bytes;
+        }
+        return this.maybeValidateAmpCreative(bytes, headers);
+      })
+      .then(creative => {
+        checkStillCurrent();
+        // Need to know if creative was verified as part of render outside
+        // viewport but cannot wait on promise.  Sadly, need a state a
+        // variable.
+        this.isVerifiedAmpCreative_ = !!creative;
+        return creative && utf8Decode(creative);
+      })
+      // This block returns CreativeMetaDataDef iff the creative was verified
+      // as AMP and could be properly parsed for friendly iframe render.
+      /** @return {?CreativeMetaDataDef} */
+      .then(creativeDecoded => {
+        checkStillCurrent();
+        // Note: It's critical that #getAmpAdMetadata be called
+        // on precisely the same creative that was validated
+        // via #validateAdResponse_.  See GitHub issue
+        // https://github.com/ampproject/amphtml/issues/4187
+        let creativeMetaDataDef;
+        if (
+          !creativeDecoded ||
+          !(creativeMetaDataDef = this.getAmpAdMetadata(creativeDecoded))
+        ) {
+          if (this.inNonAmpPreferenceExp()) {
+            // Experiment to give non-AMP creatives same benefits as AMP so
+            // update priority.
+            this.updateLayoutPriority(LayoutPriority.CONTENT);
           }
-          // Note: Resolving a .then inside a .then because we need to capture
-          // two fields of fetchResponse, one of which is, itself, a promise,
-          // and one of which isn't.  If we just return
-          // fetchResponse.arrayBuffer(), the next step in the chain will
-          // resolve it to a concrete value, but we'll lose track of
-          // fetchResponse.headers.
-          return fetchResponse.arrayBuffer().then(bytes => {
-            if (bytes.byteLength == 0) {
-              // The server returned no content. Instead of displaying a blank
-              // rectangle, we collapse the slot instead.
-              this.forceCollapse();
-              return Promise.reject(NO_CONTENT_RESPONSE);
-            }
+          return null;
+        }
+
+        // Update priority.
+        this.updateLayoutPriority(LayoutPriority.CONTENT);
+        // Load any extensions; do not wait on their promises as this
+        // is just to prefetch.
+        const extensions = Services.extensionsFor(this.win);
+        creativeMetaDataDef.customElementExtensions.forEach(extensionId =>
+          extensions.preloadExtension(extensionId)
+        );
+        // Preload any fonts.
+        (creativeMetaDataDef.customStylesheets || []).forEach(font =>
+          this.preconnect.preload(font.href)
+        );
+
+        const urls = Services.urlForDoc(this.element);
+        // Preload any AMP images.
+        (creativeMetaDataDef.images || []).forEach(
+          image => urls.isSecure(image) && this.preconnect.preload(image)
+        );
+        return creativeMetaDataDef;
+      })
+      .catch(error => {
+        switch (error.message || error) {
+          case IFRAME_GET:
+          case NETWORK_FAILURE:
+            return null;
+          case INVALID_SPSA_RESPONSE:
+          case NO_CONTENT_RESPONSE:
             return {
-              bytes,
-              headers: fetchResponse.headers,
+              minifiedCreative: '',
+              customElementExtensions: [],
+              customStylesheets: [],
             };
-          });
-        })
-        /** @return {!Promise<?ArrayBuffer>} */
-        .then(responseParts => {
-          checkStillCurrent();
-          // Keep a handle to the creative body so that we can render into
-          // SafeFrame or NameFrame later, if necessary.  TODO(tdrl): Temporary,
-          // while we
-          // assess whether this is the right solution to the Safari+iOS iframe
-          // src cache issue.  If we decide to keep a SafeFrame-like solution,
-          // we should restructure the promise chain to pass this info along
-          // more cleanly, without use of an object variable outside the chain.
-          if (!responseParts) {
-            return Promise.resolve();
-          }
-          const {bytes, headers} = responseParts;
-          const size = this.extractSize(responseParts.headers);
-          this.creativeSize_ = size || this.creativeSize_;
-          if (this.experimentalNonAmpCreativeRenderMethod_ !=
-              XORIGIN_MODE.CLIENT_CACHE &&
-              bytes) {
-            this.creativeBody_ = bytes;
-          }
-          return this.maybeValidateAmpCreative(bytes, headers);
-        })
-        .then(creative => {
-          checkStillCurrent();
-          // Need to know if creative was verified as part of render outside
-          // viewport but cannot wait on promise.  Sadly, need a state a
-          // variable.
-          this.isVerifiedAmpCreative_ = !!creative;
-          return creative && utf8Decode(creative);
-        })
-        // This block returns CreativeMetaDataDef iff the creative was verified
-        // as AMP and could be properly parsed for friendly iframe render.
-        /** @return {?CreativeMetaDataDef} */
-        .then(creativeDecoded => {
-          checkStillCurrent();
-          // Note: It's critical that #getAmpAdMetadata be called
-          // on precisely the same creative that was validated
-          // via #validateAdResponse_.  See GitHub issue
-          // https://github.com/ampproject/amphtml/issues/4187
-          let creativeMetaDataDef;
-          if (!creativeDecoded ||
-            !(creativeMetaDataDef = this.getAmpAdMetadata(creativeDecoded))) {
-            if (this.inNonAmpPreferenceExp()) {
-              // Experiment to give non-AMP creatives same benefits as AMP so
-              // update priority.
-              this.updateLayoutPriority(LayoutPriority.CONTENT);
-            }
-            return null;
-          }
-
-          // Update priority.
-          this.updateLayoutPriority(LayoutPriority.CONTENT);
-          // Load any extensions; do not wait on their promises as this
-          // is just to prefetch.
-          const extensions = Services.extensionsFor(this.win);
-          creativeMetaDataDef.customElementExtensions.forEach(
-              extensionId => extensions.preloadExtension(extensionId));
-          // Preload any fonts.
-          (creativeMetaDataDef.customStylesheets || []).forEach(font =>
-            this.preconnect.preload(font.href));
-
-          const urls = Services.urlForDoc(this.element);
-          // Preload any AMP images.
-          (creativeMetaDataDef.images || []).forEach(image =>
-            urls.isSecure(image) && this.preconnect.preload(image));
-          return creativeMetaDataDef;
-        })
-        .catch(error => {
-          switch (error.message || error) {
-            case IFRAME_GET:
-            case NETWORK_FAILURE:
-              return null;
-            case INVALID_SPSA_RESPONSE:
-            case NO_CONTENT_RESPONSE:
-              return {
-                minifiedCreative: '',
-                customElementExtensions: [],
-                customStylesheets: [],
-              };
-          }
-          // If error in chain occurs, report it and return null so that
-          // layoutCallback can render via cross domain iframe assuming ad
-          // url or creative exist.
-          this.promiseErrorHandler_(error);
-          return null;
-        });
+        }
+        // If error in chain occurs, report it and return null so that
+        // layoutCallback can render via cross domain iframe assuming ad
+        // url or creative exist.
+        this.promiseErrorHandler_(error);
+        return null;
+      });
   }
 
   /**
@@ -853,39 +896,44 @@ export class AmpA4A extends AMP.BaseElement {
   maybeValidateAmpCreative(bytes, headers) {
     const checkStillCurrent = this.verifyStillCurrent();
     return this.keysetPromise_
-        .then(() => {
-          if (this.element.getAttribute('type') == 'fake' &&
-              !this.element.getAttribute('checksig')) {
-            // do not verify signature for fake type ad, unless the ad
-            // specfically requires via 'checksig' attribute
-            return Promise.resolve(VerificationStatus.OK);
-          }
-          return signatureVerifierFor(this.win).verify(bytes, headers);
-        })
-        .then(status => {
-          checkStillCurrent();
-          let result = null;
-          switch (status) {
-            case VerificationStatus.OK:
-              result = bytes;
-              break;
-            case VerificationStatus.CRYPTO_UNAVAILABLE:
-              result = this.shouldPreferentialRenderWithoutCrypto() ?
-                bytes : null;
-              break;
-            // TODO(@taymonbeal, #9274): differentiate between these
-            case VerificationStatus.ERROR_KEY_NOT_FOUND:
-            case VerificationStatus.ERROR_SIGNATURE_MISMATCH:
-              user().error(
-                  TAG, this.element.getAttribute('type'),
-                  'Signature verification failed');
-            case VerificationStatus.UNVERIFIED:
-          }
-          if (this.isSinglePageStoryAd && !result) {
-            throw new Error(INVALID_SPSA_RESPONSE);
-          }
-          return result;
-        });
+      .then(() => {
+        if (
+          this.element.getAttribute('type') == 'fake' &&
+          !this.element.getAttribute('checksig')
+        ) {
+          // do not verify signature for fake type ad, unless the ad
+          // specfically requires via 'checksig' attribute
+          return Promise.resolve(VerificationStatus.OK);
+        }
+        return signatureVerifierFor(this.win).verify(bytes, headers);
+      })
+      .then(status => {
+        checkStillCurrent();
+        let result = null;
+        switch (status) {
+          case VerificationStatus.OK:
+            result = bytes;
+            break;
+          case VerificationStatus.CRYPTO_UNAVAILABLE:
+            result = this.shouldPreferentialRenderWithoutCrypto()
+              ? bytes
+              : null;
+            break;
+          // TODO(@taymonbeal, #9274): differentiate between these
+          case VerificationStatus.ERROR_KEY_NOT_FOUND:
+          case VerificationStatus.ERROR_SIGNATURE_MISMATCH:
+            user().error(
+              TAG,
+              this.element.getAttribute('type'),
+              'Signature verification failed'
+            );
+          case VerificationStatus.UNVERIFIED:
+        }
+        if (this.isSinglePageStoryAd && !result) {
+          throw new Error(INVALID_SPSA_RESPONSE);
+        }
+        return result;
+      });
   }
 
   /**
@@ -944,15 +992,20 @@ export class AmpA4A extends AMP.BaseElement {
         this.togglePlaceholder(true);
         // This delay provides a 1 second buffer where the ad loader is
         // displayed in between the creatives.
-        return Services.timerFor(this.win).promise(1000).then(() => {
-          this.isRelayoutNeededFlag = true;
-          this.getResource().layoutCanceled();
-          // Only Require relayout after page visible
-          Services.viewerForDoc(this.getAmpDoc()).whenNextVisible().then(() => {
-            Services.resourcesForDoc(this.getAmpDoc())
-                ./*OK*/requireLayout(this.element);
+        return Services.timerFor(this.win)
+          .promise(1000)
+          .then(() => {
+            this.isRelayoutNeededFlag = true;
+            this.getResource().layoutCanceled();
+            // Only Require relayout after page visible
+            Services.viewerForDoc(this.getAmpDoc())
+              .whenNextVisible()
+              .then(() => {
+                Services.resourcesForDoc(this.getAmpDoc())./*OK*/ requireLayout(
+                  this.element
+                );
+              });
           });
-        });
       });
     });
   }
@@ -970,7 +1023,7 @@ export class AmpA4A extends AMP.BaseElement {
     }
 
     if (error && error.message) {
-      error = duplicateErrorIfNecessary(/** @type {!Error} */(error));
+      error = duplicateErrorIfNecessary(/** @type {!Error} */ (error));
     } else {
       error = new Error('unknown error ' + error);
     }
@@ -985,7 +1038,7 @@ export class AmpA4A extends AMP.BaseElement {
     }
 
     // Additional arguments.
-    assignAdUrlToError(/** @type {!Error} */(error), this.adUrl_);
+    assignAdUrlToError(/** @type {!Error} */ (error), this.adUrl_);
 
     if (getMode().development || getMode().localDev || getMode().log) {
       user().error(TAG, error);
@@ -1024,35 +1077,40 @@ export class AmpA4A extends AMP.BaseElement {
     }
     const checkStillCurrent = this.verifyStillCurrent();
     // Promise chain will have determined if creative is valid AMP.
-    return this.adPromise_.then(creativeMetaData => {
-      checkStillCurrent();
-      if (this.isCollapsed_) {
-        return Promise.resolve();
-      }
-      // If this.iframe already exists, and we're not currently in the middle
-      // of refreshing, bail out here. This should only happen in
-      // testing context, not in production.
-      if (this.iframe && !this.isRefreshing) {
-        return Promise.resolve();
-      }
-      if (!creativeMetaData) {
-        // Non-AMP creative case, will verify ad url existence.
-        return this.renderNonAmpCreative();
-      }
-      // Must be an AMP creative.
-      return this.renderAmpCreative_(creativeMetaData)
-          .catch(err => {
-            checkStillCurrent();
-            // Failed to render via AMP creative path so fallback to non-AMP
-            // rendering within cross domain iframe.
-            user().warn(TAG, this.element.getAttribute('type'),
-                'Error injecting creative in friendly frame', err);
-            return this.renderNonAmpCreative();
-          });
-    }).catch(error => {
-      this.promiseErrorHandler_(error);
-      throw cancellation();
-    });
+    return this.adPromise_
+      .then(creativeMetaData => {
+        checkStillCurrent();
+        if (this.isCollapsed_) {
+          return Promise.resolve();
+        }
+        // If this.iframe already exists, and we're not currently in the middle
+        // of refreshing, bail out here. This should only happen in
+        // testing context, not in production.
+        if (this.iframe && !this.isRefreshing) {
+          return Promise.resolve();
+        }
+        if (!creativeMetaData) {
+          // Non-AMP creative case, will verify ad url existence.
+          return this.renderNonAmpCreative();
+        }
+        // Must be an AMP creative.
+        return this.renderAmpCreative_(creativeMetaData).catch(err => {
+          checkStillCurrent();
+          // Failed to render via AMP creative path so fallback to non-AMP
+          // rendering within cross domain iframe.
+          user().warn(
+            TAG,
+            this.element.getAttribute('type'),
+            'Error injecting creative in friendly frame',
+            err
+          );
+          return this.renderNonAmpCreative();
+        });
+      })
+      .catch(error => {
+        this.promiseErrorHandler_(error);
+        throw cancellation();
+      });
   }
 
   /**
@@ -1063,7 +1121,7 @@ export class AmpA4A extends AMP.BaseElement {
     return true;
   }
 
-  /** @override **/
+  /** @override */
   attemptChangeSize(newHeight, newWidth) {
     // Store original size of slot in order to allow re-expansion on
     // unlayoutCallback so that it is reverted to original size in case
@@ -1087,17 +1145,20 @@ export class AmpA4A extends AMP.BaseElement {
     this.promiseId_++;
     this.uiHandler.applyUnlayoutUI();
     if (this.originalSlotSize_) {
-      super.attemptChangeSize(
-          this.originalSlotSize_.height, this.originalSlotSize_.width)
-          .then(() => {
-            this.originalSlotSize_ = null;
-          })
-          .catch(err => {
+      super
+        .attemptChangeSize(
+          this.originalSlotSize_.height,
+          this.originalSlotSize_.width
+        )
+        .then(() => {
+          this.originalSlotSize_ = null;
+        })
+        .catch(err => {
           // TODO(keithwrightbos): if we are unable to revert size, on next
           // trigger of promise chain the ad request may fail due to invalid
           // slot size.  Determine how to handle this case.
-            dev().warn(TAG, 'unable to revert to original size', err);
-          });
+          dev().warn(TAG, 'unable to revert to original size', err);
+        });
     }
 
     this.isCollapsed_ = false;
@@ -1110,8 +1171,7 @@ export class AmpA4A extends AMP.BaseElement {
     this.creativeBody_ = null;
     this.isVerifiedAmpCreative_ = false;
     this.fromResumeCallback = false;
-    this.experimentalNonAmpCreativeRenderMethod_ =
-        this.getNonAmpCreativeRenderingMethod();
+    this.experimentalNonAmpCreativeRenderMethod_ = this.getNonAmpCreativeRenderingMethod();
     this.postAdResponseExperimentFeatures = {};
   }
 
@@ -1217,8 +1277,10 @@ export class AmpA4A extends AMP.BaseElement {
       user().error(TAG, `Invalid size header: ${headerValue}`);
       return null;
     }
-    return /** @type {?SizeInfoDef} */ (
-      {width: Number(match[1]), height: Number(match[2])});
+    return /** @type {?SizeInfoDef} */ ({
+      width: Number(match[1]),
+      height: Number(match[2]),
+    });
   }
 
   /**
@@ -1252,7 +1314,8 @@ export class AmpA4A extends AMP.BaseElement {
    */
   onCreativeRender(creativeMetaData, opt_onLoadPromise) {
     this.maybeTriggerAnalyticsEvent_(
-        creativeMetaData ? 'renderFriendlyEnd' : 'renderCrossDomainEnd');
+      creativeMetaData ? 'renderFriendlyEnd' : 'renderCrossDomainEnd'
+    );
   }
 
   /**
@@ -1261,8 +1324,11 @@ export class AmpA4A extends AMP.BaseElement {
    * @visibleForTesting
    */
   onCrossDomainIframeCreated(iframe) {
-    dev().info(TAG, this.element.getAttribute('type'),
-        `onCrossDomainIframeCreated ${iframe}`);
+    dev().info(
+      TAG,
+      this.element.getAttribute('type'),
+      `onCrossDomainIframeCreated ${iframe}`
+    );
   }
 
   /** @return {boolean} whether html creatives should be sandboxed. */
@@ -1284,31 +1350,35 @@ export class AmpA4A extends AMP.BaseElement {
       credentials: 'include',
     };
     return Services.xhrFor(this.win)
-        .fetch(adUrl, xhrInit)
-        .catch(error => {
-          if (error.response && error.response.status > 200) {
-            // Invalid server response code so we should collapse.
-            return null;
-          }
-          // If an error occurs, let the ad be rendered via iframe after delay.
-          // TODO(taymonbeal): Figure out a more sophisticated test for deciding
-          // whether to retry with an iframe after an ad request failure or just
-          // give up and render the fallback content (or collapse the ad slot).
-          const networkFailureHandlerResult =
-              this.onNetworkFailure(error, /** @type {string} */ (this.adUrl_));
-          devAssert(!!networkFailureHandlerResult);
-          if (networkFailureHandlerResult.frameGetDisabled) {
-            // Reset adUrl to null which will cause layoutCallback to not
-            // fetch via frame GET.
-            dev().info(
-                TAG, 'frame get disabled as part of network failure handler');
-            this.resetAdUrl();
-          } else {
-            this.adUrl_ = networkFailureHandlerResult.adUrl || this.adUrl_;
-            return Promise.reject(NETWORK_FAILURE);
-          }
+      .fetch(adUrl, xhrInit)
+      .catch(error => {
+        if (error.response && error.response.status > 200) {
+          // Invalid server response code so we should collapse.
           return null;
-        });
+        }
+        // If an error occurs, let the ad be rendered via iframe after delay.
+        // TODO(taymonbeal): Figure out a more sophisticated test for deciding
+        // whether to retry with an iframe after an ad request failure or just
+        // give up and render the fallback content (or collapse the ad slot).
+        const networkFailureHandlerResult = this.onNetworkFailure(
+          error,
+          /** @type {string} */ (this.adUrl_)
+        );
+        devAssert(!!networkFailureHandlerResult);
+        if (networkFailureHandlerResult.frameGetDisabled) {
+          // Reset adUrl to null which will cause layoutCallback to not
+          // fetch via frame GET.
+          dev().info(
+            TAG,
+            'frame get disabled as part of network failure handler'
+          );
+          this.resetAdUrl();
+        } else {
+          this.adUrl_ = networkFailureHandlerResult.adUrl || this.adUrl_;
+          return Promise.reject(NETWORK_FAILURE);
+        }
+        return null;
+      });
   }
 
   /**
@@ -1341,8 +1411,11 @@ export class AmpA4A extends AMP.BaseElement {
    */
   renderNonAmpCreative(throttleApplied) {
     if (this.element.getAttribute('disable3pfallback') == 'true') {
-      user().warn(TAG, this.element.getAttribute('type'),
-          'fallback to 3p disabled');
+      user().warn(
+        TAG,
+        this.element.getAttribute('type'),
+        'fallback to 3p disabled'
+      );
       return Promise.resolve(false);
     }
     // TODO(keithwrightbos): remove when no longer needed.
@@ -1351,11 +1424,13 @@ export class AmpA4A extends AMP.BaseElement {
     // cross-domain iframe solutions.
     const method = this.experimentalNonAmpCreativeRenderMethod_;
     let renderPromise = Promise.resolve(false);
-    if ((method == XORIGIN_MODE.SAFEFRAME ||
-         method == XORIGIN_MODE.NAMEFRAME) &&
-        this.creativeBody_) {
+    if (
+      (method == XORIGIN_MODE.SAFEFRAME || method == XORIGIN_MODE.NAMEFRAME) &&
+      this.creativeBody_
+    ) {
       renderPromise = this.renderViaNameAttrOfXOriginIframe_(
-          this.creativeBody_);
+        this.creativeBody_
+      );
       this.creativeBody_ = null; // Free resources.
     } else if (this.adUrl_) {
       assertHttpsUrl(this.adUrl_, this.element);
@@ -1364,18 +1439,20 @@ export class AmpA4A extends AMP.BaseElement {
       // Ad URL may not exist if buildAdUrl throws error or returns empty.
       // If error occurred, it would have already been reported but let's
       // report to user in case of empty.
-      user().warn(TAG, this.element.getAttribute('type'),
-          'No creative or URL available -- A4A can\'t render any ad');
+      user().warn(
+        TAG,
+        this.element.getAttribute('type'),
+        "No creative or URL available -- A4A can't render any ad"
+      );
     }
     if (!throttleApplied && !this.inNonAmpPreferenceExp()) {
       incrementLoadingAds(this.win, renderPromise);
     }
-    return renderPromise.then(
-        result => {
-          this.maybeTriggerAnalyticsEvent_('crossDomainIframeLoaded');
-          // Pass on the result to the next value in the promise change.
-          return result;
-        });
+    return renderPromise.then(result => {
+      this.maybeTriggerAnalyticsEvent_('crossDomainIframeLoaded');
+      // Pass on the result to the next value in the promise change.
+      return result;
+    });
   }
 
   /**
@@ -1386,24 +1463,24 @@ export class AmpA4A extends AMP.BaseElement {
    * @private
    */
   renderAmpCreative_(creativeMetaData) {
-    devAssert(creativeMetaData.minifiedCreative,
-        'missing minified creative');
+    devAssert(creativeMetaData.minifiedCreative, 'missing minified creative');
     devAssert(!!this.element.ownerDocument, 'missing owner document?!');
     this.maybeTriggerAnalyticsEvent_('renderFriendlyStart');
     // Create and setup friendly iframe.
-    this.iframe = /** @type {!HTMLIFrameElement} */(
-      createElementWithAttributes(
-          /** @type {!Document} */(this.element.ownerDocument), 'iframe',
-          dict({
-            // NOTE: It is possible for either width or height to be 'auto',
-            // a non-numeric value.
-            'height': this.creativeSize_.height,
-            'width': this.creativeSize_.width,
-            'frameborder': '0',
-            'allowfullscreen': '',
-            'allowtransparency': '',
-            'scrolling': 'no',
-          })));
+    this.iframe = /** @type {!HTMLIFrameElement} */ (createElementWithAttributes(
+      /** @type {!Document} */ (this.element.ownerDocument),
+      'iframe',
+      dict({
+        // NOTE: It is possible for either width or height to be 'auto',
+        // a non-numeric value.
+        'height': this.creativeSize_.height,
+        'width': this.creativeSize_.width,
+        'frameborder': '0',
+        'allowfullscreen': '',
+        'allowtransparency': '',
+        'scrolling': 'no',
+      })
+    ));
     this.applyFillContent(this.iframe);
     const fontsArray = [];
     if (creativeMetaData.customStylesheets) {
@@ -1416,28 +1493,39 @@ export class AmpA4A extends AMP.BaseElement {
     }
     const checkStillCurrent = this.verifyStillCurrent();
     return installFriendlyIframeEmbed(
-        this.iframe, this.element, {
-          host: this.element,
-          // Need to guarantee that this is no longer null
-          url: /** @type {string} */ (this.adUrl_),
-          html: creativeMetaData.minifiedCreative,
-          extensionIds: creativeMetaData.customElementExtensions || [],
-          fonts: fontsArray,
-        }, embedWin => {
-          installUrlReplacementsForEmbed(this.getAmpDoc(), embedWin,
-              new A4AVariableSource(this.getAmpDoc(), embedWin));
-        }).then(friendlyIframeEmbed => {
+      this.iframe,
+      this.element,
+      {
+        host: this.element,
+        // Need to guarantee that this is no longer null
+        url: /** @type {string} */ (this.adUrl_),
+        html: creativeMetaData.minifiedCreative,
+        extensionIds: creativeMetaData.customElementExtensions || [],
+        fonts: fontsArray,
+      },
+      embedWin => {
+        installUrlReplacementsForEmbed(
+          this.getAmpDoc(),
+          embedWin,
+          new A4AVariableSource(this.getAmpDoc(), embedWin)
+        );
+      }
+    ).then(friendlyIframeEmbed => {
       checkStillCurrent();
       this.friendlyIframeEmbed_ = friendlyIframeEmbed;
-      setFriendlyIframeEmbedVisible(
-          friendlyIframeEmbed, this.isInViewport());
+      setFriendlyIframeEmbedVisible(friendlyIframeEmbed, this.isInViewport());
       // Ensure visibility hidden has been removed (set by boilerplate).
-      const frameDoc = friendlyIframeEmbed.iframe.contentDocument ||
-              friendlyIframeEmbed.win.document;
+      const frameDoc =
+        friendlyIframeEmbed.iframe.contentDocument ||
+        friendlyIframeEmbed.win.document;
       setStyle(frameDoc.body, 'visibility', 'visible');
       protectFunctionWrapper(this.onCreativeRender, this, err => {
-        dev().error(TAG, this.element.getAttribute('type'),
-            'Error executing onCreativeRender', err);
+        dev().error(
+          TAG,
+          this.element.getAttribute('type'),
+          'Error executing onCreativeRender',
+          err
+        );
       })(creativeMetaData, friendlyIframeEmbed.whenWindowLoaded());
       friendlyIframeEmbed.whenIniLoaded().then(() => {
         checkStillCurrent();
@@ -1456,10 +1544,13 @@ export class AmpA4A extends AMP.BaseElement {
    * @private
    */
   iframeRenderHelper_(attributes) {
-    const mergedAttributes = Object.assign(attributes, dict({
-      'height': this.creativeSize_.height,
-      'width': this.creativeSize_.width,
-    }));
+    const mergedAttributes = Object.assign(
+      attributes,
+      dict({
+        'height': this.creativeSize_.height,
+        'width': this.creativeSize_.width,
+      })
+    );
 
     if (this.sentinel) {
       mergedAttributes['data-amp-3p-sentinel'] = this.sentinel;
@@ -1468,12 +1559,16 @@ export class AmpA4A extends AMP.BaseElement {
       // Block synchronous XHR in ad. These are very rare, but super bad for UX
       // as they block the UI thread for the arbitrary amount of time until the
       // request completes.
-      mergedAttributes['allow'] = 'sync-xhr \'none\';';
+      mergedAttributes['allow'] = "sync-xhr 'none';";
     }
     this.iframe = createElementWithAttributes(
-        /** @type {!Document} */ (this.element.ownerDocument),
-        'iframe', /** @type {!JsonObject} */ (
-          Object.assign(mergedAttributes, SHARED_IFRAME_PROPERTIES)));
+      /** @type {!Document} */ (this.element.ownerDocument),
+      'iframe',
+      /** @type {!JsonObject} */ (Object.assign(
+        mergedAttributes,
+        SHARED_IFRAME_PROPERTIES
+      ))
+    );
     if (this.sandboxHTMLCreativeFrame()) {
       applySandbox(this.iframe);
     }
@@ -1482,11 +1577,17 @@ export class AmpA4A extends AMP.BaseElement {
     // Iframe is appended to element as part of xorigin frame handler init.
     // Executive onCreativeRender after init to ensure it can get reference
     // to frame but prior to load to allow for earlier access.
-    const frameLoadPromise =
-        this.xOriginIframeHandler_.init(this.iframe, /* opt_isA4A */ true);
+    const frameLoadPromise = this.xOriginIframeHandler_.init(
+      this.iframe,
+      /* opt_isA4A */ true
+    );
     protectFunctionWrapper(this.onCreativeRender, this, err => {
-      dev().error(TAG, this.element.getAttribute('type'),
-          'Error executing onCreativeRender', err);
+      dev().error(
+        TAG,
+        this.element.getAttribute('type'),
+        'Error executing onCreativeRender',
+        err
+      );
     })(null);
     return frameLoadPromise;
   }
@@ -1513,11 +1614,14 @@ export class AmpA4A extends AMP.BaseElement {
    */
   renderViaIframeGet_(adUrl) {
     this.maybeTriggerAnalyticsEvent_('renderCrossDomainStart');
-    return this.iframeRenderHelper_(dict({
-      'src': Services.xhrFor(this.win).getCorsUrl(this.win, adUrl),
-      'name': JSON.stringify(
-          getContextMetadata(this.win, this.element, this.sentinel)),
-    }));
+    return this.iframeRenderHelper_(
+      dict({
+        'src': Services.xhrFor(this.win).getCorsUrl(this.win, adUrl),
+        'name': JSON.stringify(
+          getContextMetadata(this.win, this.element, this.sentinel)
+        ),
+      })
+    );
   }
 
   /**
@@ -1532,9 +1636,11 @@ export class AmpA4A extends AMP.BaseElement {
   renderViaNameAttrOfXOriginIframe_(creativeBody) {
     /** @type {?string} */
     const method = this.experimentalNonAmpCreativeRenderMethod_;
-    devAssert(method == XORIGIN_MODE.SAFEFRAME ||
-        method == XORIGIN_MODE.NAMEFRAME,
-    'Unrecognized A4A cross-domain rendering mode: %s', method);
+    devAssert(
+      method == XORIGIN_MODE.SAFEFRAME || method == XORIGIN_MODE.NAMEFRAME,
+      'Unrecognized A4A cross-domain rendering mode: %s',
+      method
+    );
     this.maybeTriggerAnalyticsEvent_('renderSafeFrameStart');
     const checkStillCurrent = this.verifyStillCurrent();
     return tryResolve(() => utf8Decode(creativeBody)).then(creative => {
@@ -1552,24 +1658,33 @@ export class AmpA4A extends AMP.BaseElement {
         default:
           // Shouldn't be able to get here, but...  Because of the assert,
           // above, we can only get here in non-dev mode, so give user feedback.
-          user().error('A4A', 'A4A received unrecognized cross-domain name'
-              + ' attribute iframe rendering mode request: %s.  Unable to'
-              + ' render a creative for'
-              + ' slot %s.', method, this.element.getAttribute('id'));
+          user().error(
+            'A4A',
+            'A4A received unrecognized cross-domain name' +
+              ' attribute iframe rendering mode request: %s.  Unable to' +
+              ' render a creative for' +
+              ' slot %s.',
+            method,
+            this.element.getAttribute('id')
+          );
           return Promise.reject('Unrecognized rendering mode request');
       }
       // TODO(bradfrizzell): change name of function and var
       let contextMetadata = getContextMetadata(
-          this.win, this.element, this.sentinel,
-          this.getAdditionalContextMetadata(method == XORIGIN_MODE.SAFEFRAME));
+        this.win,
+        this.element,
+        this.sentinel,
+        this.getAdditionalContextMetadata(method == XORIGIN_MODE.SAFEFRAME)
+      );
       // TODO(bradfrizzell) Clean up name assigning.
       if (method == XORIGIN_MODE.NAMEFRAME) {
         contextMetadata['creative'] = creative;
         name = JSON.stringify(contextMetadata);
       } else if (method == XORIGIN_MODE.SAFEFRAME) {
         contextMetadata = JSON.stringify(contextMetadata);
-        name = `${this.safeframeVersion};${creative.length};${creative}` +
-            `${contextMetadata}`;
+        name =
+          `${this.safeframeVersion};${creative.length};${creative}` +
+          `${contextMetadata}`;
       }
       return this.iframeRenderHelper_(dict({'src': srcPath, 'name': name}));
     });
@@ -1597,27 +1712,37 @@ export class AmpA4A extends AMP.BaseElement {
     }
     if (metadataStart < 0) {
       // Couldn't find a metadata blob.
-      dev().warn(TAG, this.element.getAttribute('type'),
-          'Could not locate start index for amp meta data in: %s', creative);
+      dev().warn(
+        TAG,
+        this.element.getAttribute('type'),
+        'Could not locate start index for amp meta data in: %s',
+        creative
+      );
       return null;
     }
     const metadataEnd = creative.lastIndexOf('</script>');
     if (metadataEnd < 0) {
       // Couldn't find a metadata blob.
-      dev().warn(TAG, this.element.getAttribute('type'),
-          'Could not locate closing script tag for amp meta data in: %s',
-          creative);
+      dev().warn(
+        TAG,
+        this.element.getAttribute('type'),
+        'Could not locate closing script tag for amp meta data in: %s',
+        creative
+      );
       return null;
     }
     try {
       const metaDataObj = parseJson(
-          creative.slice(metadataStart + metadataString.length, metadataEnd));
+        creative.slice(metadataStart + metadataString.length, metadataEnd)
+      );
       const ampRuntimeUtf16CharOffsets =
         metaDataObj['ampRuntimeUtf16CharOffsets'];
-      if (!isArray(ampRuntimeUtf16CharOffsets) ||
-          ampRuntimeUtf16CharOffsets.length != 2 ||
-          typeof ampRuntimeUtf16CharOffsets[0] !== 'number' ||
-          typeof ampRuntimeUtf16CharOffsets[1] !== 'number') {
+      if (
+        !isArray(ampRuntimeUtf16CharOffsets) ||
+        ampRuntimeUtf16CharOffsets.length != 2 ||
+        typeof ampRuntimeUtf16CharOffsets[0] !== 'number' ||
+        typeof ampRuntimeUtf16CharOffsets[1] !== 'number'
+      ) {
         throw new Error('Invalid runtime offsets');
       }
       const metaData = {};
@@ -1626,7 +1751,9 @@ export class AmpA4A extends AMP.BaseElement {
           metaDataObj['customElementExtensions'];
         if (!isArray(metaData.customElementExtensions)) {
           throw new Error(
-              'Invalid extensions', metaData.customElementExtensions);
+            'Invalid extensions',
+            metaData.customElementExtensions
+          );
         }
       } else {
         metaData.customElementExtensions = [];
@@ -1642,9 +1769,12 @@ export class AmpA4A extends AMP.BaseElement {
 
         const urls = Services.urlForDoc(this.element);
         metaData.customStylesheets.forEach(stylesheet => {
-          if (!isObject(stylesheet) || !stylesheet['href'] ||
-              typeof stylesheet['href'] !== 'string' ||
-              !urls.isSecure(stylesheet['href'])) {
+          if (
+            !isObject(stylesheet) ||
+            !stylesheet['href'] ||
+            typeof stylesheet['href'] !== 'string' ||
+            !urls.isSecure(stylesheet['href'])
+          ) {
             throw new Error(errorMsg);
           }
         });
@@ -1669,8 +1799,11 @@ export class AmpA4A extends AMP.BaseElement {
       return metaData;
     } catch (err) {
       dev().warn(
-          TAG, this.element.getAttribute('type'), 'Invalid amp metadata: %s',
-          creative.slice(metadataStart + metadataString.length, metadataEnd));
+        TAG,
+        this.element.getAttribute('type'),
+        'Invalid amp metadata: %s',
+        creative.slice(metadataStart + metadataString.length, metadataEnd)
+      );
       if (this.isSinglePageStoryAd) {
         throw err;
       }
@@ -1682,8 +1815,10 @@ export class AmpA4A extends AMP.BaseElement {
    * @return {string} full url to safeframe implementation.
    */
   getSafeframePath() {
-    return 'https://tpc.googlesyndication.com/safeframe/' +
-      `${this.safeframeVersion}/html/container.html`;
+    return (
+      'https://tpc.googlesyndication.com/safeframe/' +
+      `${this.safeframeVersion}/html/container.html`
+    );
   }
 
   /**
@@ -1697,11 +1832,13 @@ export class AmpA4A extends AMP.BaseElement {
       // No config exists that will listen to this event.
       return;
     }
-    const analyticsEvent =
-        devAssert(LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER[lifecycleStage]);
+    const analyticsEvent = devAssert(
+      LIFECYCLE_STAGE_TO_ANALYTICS_TRIGGER[lifecycleStage]
+    );
     const analyticsVars = /** @type {!JsonObject} */ (Object.assign(
-        dict({'time': Math.round(this.getNow_())}),
-        this.getA4aAnalyticsVars(analyticsEvent)));
+      dict({'time': Math.round(this.getNow_())}),
+      this.getA4aAnalyticsVars(analyticsEvent)
+    ));
     triggerAnalyticsEvent(this.element, analyticsEvent, analyticsVars);
   }
 
@@ -1724,7 +1861,9 @@ export class AmpA4A extends AMP.BaseElement {
    * added to this A4A element and no A4A triggers will be fired.
    * @return {?JsonObject}
    */
-  getA4aAnalyticsConfig() { return null; }
+  getA4aAnalyticsConfig() {
+    return null;
+  }
 
   /**
    * Attempts to execute Real Time Config, if the ad network has enabled it.
@@ -1737,19 +1876,20 @@ export class AmpA4A extends AMP.BaseElement {
   tryExecuteRealTimeConfig_(consentState, consentString) {
     if (!!AMP.RealTimeConfigManager) {
       try {
-        return new AMP.RealTimeConfigManager(this)
-            .maybeExecuteRealTimeConfig(
-                this.getCustomRealTimeConfigMacros_(),
-                consentState,
-                consentString
-            );
+        return new AMP.RealTimeConfigManager(this).maybeExecuteRealTimeConfig(
+          this.getCustomRealTimeConfigMacros_(),
+          consentState,
+          consentString
+        );
       } catch (err) {
         user().error(TAG, 'Could not perform Real Time Config.', err);
       }
     } else if (this.element.getAttribute('rtc-config')) {
-      user().error(TAG, 'RTC not supported for ad network ' +
-                   `${this.element.getAttribute('type')}`);
-
+      user().error(
+        TAG,
+        'RTC not supported for ad network ' +
+          `${this.element.getAttribute('type')}`
+      );
     }
   }
 
@@ -1779,13 +1919,16 @@ export class AmpA4A extends AMP.BaseElement {
     if (headerValue) {
       if (!isEnumValue(XORIGIN_MODE, headerValue)) {
         dev().error(
-            'AMP-A4A', `cross-origin render mode header ${headerValue}`);
+          'AMP-A4A',
+          `cross-origin render mode header ${headerValue}`
+        );
       } else {
         return headerValue;
       }
     }
-    return Services.platformFor(this.win).isIos() ?
-      XORIGIN_MODE.NAMEFRAME : null;
+    return Services.platformFor(this.win).isIos()
+      ? XORIGIN_MODE.NAMEFRAME
+      : null;
   }
 
   /**
@@ -1805,7 +1948,6 @@ export class AmpA4A extends AMP.BaseElement {
     return this.isVerifiedAmpCreative_;
   }
 
-
   /**
    * Adds single pass experiment IDs if the javascript binary has
    * "singlePassType" mode.
@@ -1813,11 +1955,15 @@ export class AmpA4A extends AMP.BaseElement {
   maybeAddSinglePassExperiment() {
     const type = getMode().singlePassType;
     if (type === 'sp') {
-      addExperimentIdToElement(SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS,
-          this.element);
+      addExperimentIdToElement(
+        SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS,
+        this.element
+      );
     } else if (type === 'mp') {
-      addExperimentIdToElement(SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS,
-          this.element);
+      addExperimentIdToElement(
+        SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS,
+        this.element
+      );
     }
   }
 }
@@ -1835,8 +1981,10 @@ export function assignAdUrlToError(error, adUrl) {
   if (adQueryIdx == -1) {
     return;
   }
-  (error.args || (error.args = {}))['au'] =
-    adUrl.substring(adQueryIdx + 1, adQueryIdx + 251);
+  (error.args || (error.args = {}))['au'] = adUrl.substring(
+    adQueryIdx + 1,
+    adQueryIdx + 251
+  );
 }
 
 /**
@@ -1853,6 +2001,8 @@ export function assignAdUrlToError(error, adUrl) {
  */
 export function signatureVerifierFor(win) {
   const propertyName = 'AMP_FAST_FETCH_SIGNATURE_VERIFIER_';
-  return win[propertyName] ||
-      (win[propertyName] = new SignatureVerifier(win, signingServerURLs));
+  return (
+    win[propertyName] ||
+    (win[propertyName] = new SignatureVerifier(win, signingServerURLs))
+  );
 }
diff --git a/extensions/amp-a4a/0.1/amp-ad-network-base.js b/extensions/amp-a4a/0.1/amp-ad-network-base.js
index 19c2d2b8c418..f5cbcadfab9a 100644
--- a/extensions/amp-a4a/0.1/amp-ad-network-base.js
+++ b/extensions/amp-a4a/0.1/amp-ad-network-base.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  FailureType,
-  RecoveryModeType,
-} from './amp-ad-type-defs';
+import {FailureType, RecoveryModeType} from './amp-ad-type-defs';
 import {Services} from '../../../src/services';
 import {dev, devAssert} from '../../../src/log';
 import {isLayoutSizeDefined} from '../../../src/layout';
@@ -30,7 +27,6 @@ const TAG = 'amp-ad-network-base';
  * @abstract
  */
 export class AmpAdNetworkBase extends AMP.BaseElement {
-
   /**
    * Creates an instance of AmpAdNetworkBase.
    * @param {!AmpElement} element
@@ -77,12 +73,14 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    devAssert(this.adResponsePromise_,
-        'layoutCallback invoked before XHR request!');
+    devAssert(
+      this.adResponsePromise_,
+      'layoutCallback invoked before XHR request!'
+    );
     return this.adResponsePromise_
-        .then(response => this.invokeValidator_(response))
-        .then(validatorResult => this.invokeRenderer_(validatorResult))
-        .catch(error => this.handleFailure_(error.type, error.msg));
+      .then(response => this.invokeValidator_(response))
+      .then(validatorResult => this.invokeRenderer_(validatorResult))
+      .catch(error => this.handleFailure_(error.type, error.msg));
   }
 
   /**
@@ -92,8 +90,10 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
    */
   onFailure(failure, recovery) {
     if (this.recoveryModes_[failure]) {
-      dev().warn(TAG,
-          `Recovery mode for failure type ${failure} already registered!`);
+      dev().warn(
+        TAG,
+        `Recovery mode for failure type ${failure} already registered!`
+      );
     }
     this.recoveryModes_[failure] = recovery;
   }
@@ -148,10 +148,12 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
    * @private
    */
   sendRequest_() {
-    Services.viewerForDoc(this.getAmpDoc()).whenFirstVisible().then(() => {
-      const url = this.getRequestUrl();
-      this.adResponsePromise_ = sendXhrRequest(this.win, url);
-    });
+    Services.viewerForDoc(this.getAmpDoc())
+      .whenFirstVisible()
+      .then(() => {
+        const url = this.getRequestUrl();
+        this.adResponsePromise_ = sendXhrRequest(this.win, url);
+      });
   }
 
   /**
@@ -165,14 +167,14 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
       return Promise.reject(this.handleFailure_(FailureType.INVALID_RESPONSE));
     }
     return response.arrayBuffer().then(unvalidatedBytes => {
-      const validatorType = response.headers.get('AMP-Ad-Response-Type')
-          || 'default';
-      devAssert(this.validators_[validatorType],
-          'Validator never registered!');
-      return this.validators_[validatorType].validate(
-          this.context_, unvalidatedBytes, response.headers)
-          .catch(err =>
-            Promise.reject({type: FailureType.VALIDATOR_ERROR, msg: err}));
+      const validatorType =
+        response.headers.get('AMP-Ad-Response-Type') || 'default';
+      devAssert(this.validators_[validatorType], 'Validator never registered!');
+      return this.validators_[validatorType]
+        .validate(this.context_, unvalidatedBytes, response.headers)
+        .catch(err =>
+          Promise.reject({type: FailureType.VALIDATOR_ERROR, msg: err})
+        );
     });
   }
 
@@ -184,10 +186,11 @@ export class AmpAdNetworkBase extends AMP.BaseElement {
   invokeRenderer_(validatorOutput) {
     const renderer = this.renderers_[validatorOutput.type];
     devAssert(renderer, 'Renderer for AMP creatives never registered!');
-    return renderer.render(
-        this.context_, this.element, validatorOutput.creativeData)
-        .catch(err =>
-          Promise.reject({type: FailureType.RENDERER_ERROR, msg: err}));
+    return renderer
+      .render(this.context_, this.element, validatorOutput.creativeData)
+      .catch(err =>
+        Promise.reject({type: FailureType.RENDERER_ERROR, msg: err})
+      );
   }
 
   /**
diff --git a/extensions/amp-a4a/0.1/amp-ad-template-helper.js b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
index 99fcd9b4b0b2..94426f796ecd 100644
--- a/extensions/amp-a4a/0.1/amp-ad-template-helper.js
+++ b/extensions/amp-a4a/0.1/amp-ad-template-helper.js
@@ -35,7 +35,6 @@ const TEMPLATE_CORS_CONFIG = {
 };
 
 export class AmpAdTemplateHelper {
-
   /**
    * @param {!Window} win
    */
@@ -54,19 +53,20 @@ export class AmpAdTemplateHelper {
    * @return {!Promise<string>}
    */
   fetch(templateUrl) {
-    const proxyUrl = getMode(this.win_).localDev && !isNaN(templateUrl)
-      ? `http://ads.localhost:${this.win_.location.port}` +
+    const proxyUrl =
+      getMode(this.win_).localDev && !isNaN(templateUrl)
+        ? `http://ads.localhost:${this.win_.location.port}` +
           `/a4a_template/adzerk/${templateUrl}`
-      : this.getTemplateProxyUrl_(templateUrl);
+        : this.getTemplateProxyUrl_(templateUrl);
     let templatePromise = this.cache_.get(proxyUrl);
     if (!templatePromise) {
       templatePromise = Services.xhrFor(this.win_)
-          .fetchText(proxyUrl, TEMPLATE_CORS_CONFIG)
-          .then(response => response.text());
+        .fetchText(proxyUrl, TEMPLATE_CORS_CONFIG)
+        .then(response => response.text());
       this.cache_.put(proxyUrl, templatePromise);
     }
     devAssert(templatePromise);
-    return /** @type{!Promise<string>} */ (templatePromise);
+    return /** @type {!Promise<string>} */ (templatePromise);
   }
 
   /**
@@ -75,8 +75,10 @@ export class AmpAdTemplateHelper {
    * @return {!Promise<!Element>} Promise which resolves after rendering completes.
    */
   render(templateValues, element) {
-    return Services.templatesFor(this.win_)
-        .findAndRenderTemplate(element, templateValues);
+    return Services.templatesFor(this.win_).findAndRenderTemplate(
+      element,
+      templateValues
+    );
   }
 
   /**
@@ -84,8 +86,9 @@ export class AmpAdTemplateHelper {
    * @param {!Array|!JsonObject} analyticsValue
    */
   insertAnalytics(element, analyticsValue) {
-    analyticsValue = /**@type {!Array}*/
-        (isArray(analyticsValue) ? analyticsValue : [analyticsValue]);
+    analyticsValue = /**@type {!Array}*/ (isArray(analyticsValue)
+      ? analyticsValue
+      : [analyticsValue]);
     for (let i = 0; i < analyticsValue.length; i++) {
       const config = analyticsValue[i];
       const analyticsEle = element.ownerDocument.createElement('amp-analytics');
@@ -97,10 +100,12 @@ export class AmpAdTemplateHelper {
       }
       if (config['inline']) {
         const scriptElem = createElementWithAttributes(
-            element.ownerDocument,
-            'script', dict({
-              'type': 'application/json',
-            }));
+          element.ownerDocument,
+          'script',
+          dict({
+            'type': 'application/json',
+          })
+        );
         scriptElem.textContent = JSON.stringify(config['inline']);
         analyticsEle.appendChild(scriptElem);
       }
@@ -116,8 +121,14 @@ export class AmpAdTemplateHelper {
   getTemplateProxyUrl_(url) {
     const cdnUrlSuffix = urls.cdn.slice(8);
     const loc = parseUrlDeprecated(url);
-    return loc.origin.indexOf(cdnUrlSuffix) > 0 ? url :
-      'https://' + loc.hostname.replace(/-/g, '--').replace(/\./g, '-') +
-      '.' + cdnUrlSuffix + '/ad/s/' + loc.hostname + loc.pathname;
+    return loc.origin.indexOf(cdnUrlSuffix) > 0
+      ? url
+      : 'https://' +
+          loc.hostname.replace(/-/g, '--').replace(/\./g, '-') +
+          '.' +
+          cdnUrlSuffix +
+          '/ad/s/' +
+          loc.hostname +
+          loc.pathname;
   }
 }
diff --git a/extensions/amp-a4a/0.1/amp-ad-utils.js b/extensions/amp-a4a/0.1/amp-ad-utils.js
index d3d0eae87352..052eaf0f327c 100644
--- a/extensions/amp-a4a/0.1/amp-ad-utils.js
+++ b/extensions/amp-a4a/0.1/amp-ad-utils.js
@@ -39,7 +39,8 @@ export function sendXhrRequest(win, url) {
 const METADATA_STRINGS = [
   '<script amp-ad-metadata type=application/json>',
   '<script type="application/json" amp-ad-metadata>',
-  '<script type=application/json amp-ad-metadata>'];
+  '<script type=application/json amp-ad-metadata>',
+];
 
 /**
  *
@@ -64,27 +65,33 @@ export function getAmpAdMetadata(creative) {
   if (metadataStart < 0) {
     // Couldn't find a metadata blob.
     dev().warn(
-        TAG, `Could not locate start index for amp meta data in: ${creative}`);
+      TAG,
+      `Could not locate start index for amp meta data in: ${creative}`
+    );
     return null;
   }
   const metadataEnd = creative.lastIndexOf('</script>');
   if (metadataEnd < 0) {
     // Couldn't find a metadata blob.
-    dev().warn(TAG,
-        'Could not locate closing script tag for amp meta data in: %s',
-        creative);
+    dev().warn(
+      TAG,
+      'Could not locate closing script tag for amp meta data in: %s',
+      creative
+    );
     return null;
   }
   try {
     const metaDataObj = parseJson(
-        creative.slice(metadataStart + metadataString.length, metadataEnd));
-    let ampRuntimeUtf16CharOffsets =
-      metaDataObj['ampRuntimeUtf16CharOffsets'];
+      creative.slice(metadataStart + metadataString.length, metadataEnd)
+    );
+    let ampRuntimeUtf16CharOffsets = metaDataObj['ampRuntimeUtf16CharOffsets'];
     if (!isArray(ampRuntimeUtf16CharOffsets)) {
       const headStart = creative.indexOf('<head>');
       const headEnd = creative.indexOf('        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>');
       const headSubstring = creative.slice(
-          headStart, headEnd + '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>'.length);
+        headStart,
+        headEnd + '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>'.length
+      );
       const scriptStart = headSubstring.indexOf('<script');
       const scriptEnd = headSubstring.lastIndexOf('</script>');
       if (scriptStart < 0 || scriptEnd < 0) {
@@ -96,18 +103,18 @@ export function getAmpAdMetadata(creative) {
         headStart + scriptStart,
         headStart + scriptEnd + '</script>'.length,
       ];
-    } else if (ampRuntimeUtf16CharOffsets.length != 2 ||
-        typeof ampRuntimeUtf16CharOffsets[0] !== 'number' ||
-        typeof ampRuntimeUtf16CharOffsets[1] !== 'number') {
+    } else if (
+      ampRuntimeUtf16CharOffsets.length != 2 ||
+      typeof ampRuntimeUtf16CharOffsets[0] !== 'number' ||
+      typeof ampRuntimeUtf16CharOffsets[1] !== 'number'
+    ) {
       throw new Error('Invalid runtime offsets');
     }
     const metaData = {};
     if (metaDataObj['customElementExtensions']) {
-      metaData.customElementExtensions =
-        metaDataObj['customElementExtensions'];
+      metaData.customElementExtensions = metaDataObj['customElementExtensions'];
       if (!isArray(metaData.customElementExtensions)) {
-        throw new Error(
-            'Invalid extensions', metaData.customElementExtensions);
+        throw new Error('Invalid extensions', metaData.customElementExtensions);
       }
     } else {
       metaData.customElementExtensions = [];
@@ -121,9 +128,12 @@ export function getAmpAdMetadata(creative) {
         throw new Error(errorMsg);
       }
       metaData.customStylesheets.forEach(stylesheet => {
-        if (!isObject(stylesheet) || !stylesheet['href'] ||
-            typeof stylesheet['href'] !== 'string' ||
-            !isSecureUrlDeprecated(stylesheet['href'])) {
+        if (
+          !isObject(stylesheet) ||
+          !stylesheet['href'] ||
+          typeof stylesheet['href'] !== 'string' ||
+          !isSecureUrlDeprecated(stylesheet['href'])
+        ) {
           throw new Error(errorMsg);
         }
       });
@@ -141,8 +151,10 @@ export function getAmpAdMetadata(creative) {
     return metaData;
   } catch (err) {
     dev().warn(
-        TAG, 'Invalid amp metadata: %s',
-        creative.slice(metadataStart + metadataString.length, metadataEnd));
+      TAG,
+      'Invalid amp metadata: %s',
+      creative.slice(metadataStart + metadataString.length, metadataEnd)
+    );
     return null;
   }
 }
diff --git a/extensions/amp-a4a/0.1/callout-vendors.js b/extensions/amp-a4a/0.1/callout-vendors.js
index d95d8c4776d9..f3345641f312 100644
--- a/extensions/amp-a4a/0.1/callout-vendors.js
+++ b/extensions/amp-a4a/0.1/callout-vendors.js
@@ -37,36 +37,41 @@ let RtcVendorDef;
 
 /** @const {!Object<string, RtcVendorDef>} */
 export const RTC_VENDORS = {
-////////////////////////////////////////////////////////////////////
-//                                                                //
-//              !!!      IMPORTANT NOTE     !!!                   //
-//                                                                //
-//  If you are adding a new vendor config object to this object,  //
-//  make sure to also update the RTC documentation in these two   //
-//  files under "supported vendors".                              //
-// https://github.com/ampproject/amphtml/blob/master/extensions/amp-a4a/rtc-documentation.md
-// https://github.com/ampproject/amphtml/blob/master/extensions/amp-a4a/rtc-publisher-implementation-guide.md
-////////////////////////////////////////////////////////////////////
+  ////////////////////////////////////////////////////////////////////
+  //                                                                //
+  //              !!!      IMPORTANT NOTE     !!!                   //
+  //                                                                //
+  //  If you are adding a new vendor config object to this object,  //
+  //  make sure to also update the RTC documentation in these two   //
+  //  files under "supported vendors".                              //
+  // https://github.com/ampproject/amphtml/blob/master/extensions/amp-a4a/rtc-documentation.md
+  // https://github.com/ampproject/amphtml/blob/master/extensions/amp-a4a/rtc-publisher-implementation-guide.md
+  ////////////////////////////////////////////////////////////////////
 
   // Add vendors here
   medianet: {
-    url: 'https://amprtc.media.net/rtb/getrtc?cid=CID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&tgt=TGT&curl=CANONICAL_URL&to=TIMEOUT&purl=HREF',
+    url:
+      'https://amprtc.media.net/rtb/getrtc?cid=CID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&tgt=TGT&curl=CANONICAL_URL&to=TIMEOUT&purl=HREF',
     macros: ['CID'],
-    errorReportingUrl: 'https://qsearch-a.akamaihd.net/log?logid=kfk&evtid=projectevents&project=amprtc_error&error=ERROR_TYPE&rd=HREF',
+    errorReportingUrl:
+      'https://qsearch-a.akamaihd.net/log?logid=kfk&evtid=projectevents&project=amprtc_error&error=ERROR_TYPE&rd=HREF',
     disableKeyAppend: true,
   },
   prebidappnexus: {
-    url: 'https://prebid.adnxs.com/pbs/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF',
+    url:
+      'https://prebid.adnxs.com/pbs/v1/openrtb2/amp?tag_id=PLACEMENT_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adcid=ADCID&purl=HREF',
     macros: ['PLACEMENT_ID'],
     disableKeyAppend: true,
   },
   prebidrubicon: {
-    url: 'https://prebid-server.rubiconproject.com/openrtb2/amp?tag_id=REQUEST_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF',
+    url:
+      'https://prebid-server.rubiconproject.com/openrtb2/amp?tag_id=REQUEST_ID&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&targeting=TGT&curl=CANONICAL_URL&timeout=TIMEOUT&adc=ADCID&purl=HREF',
     macros: ['REQUEST_ID'],
     disableKeyAppend: true,
   },
   indexexchange: {
-    url: 'https://amp.casalemedia.com/amprtc?v=1&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&s=SITE_ID&p=CANONICAL_URL',
+    url:
+      'https://amp.casalemedia.com/amprtc?v=1&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&s=SITE_ID&p=CANONICAL_URL',
     macros: ['SITE_ID'],
     disableKeyAppend: true,
   },
@@ -76,34 +81,40 @@ export const RTC_VENDORS = {
     disableKeyAppend: true,
   },
   yieldbot: {
-    url: 'https://i.yldbt.com/m/YB_PSN/v1/amp/init?curl=CANONICAL_URL&sn=YB_SLOT&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&aup=ATTR(data-slot)&pvi=PAGEVIEWID&tgt=TGT&adcid=ADCID&href=HREF',
+    url:
+      'https://i.yldbt.com/m/YB_PSN/v1/amp/init?curl=CANONICAL_URL&sn=YB_SLOT&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&aup=ATTR(data-slot)&pvi=PAGEVIEWID&tgt=TGT&adcid=ADCID&href=HREF',
     macros: ['YB_PSN', 'YB_SLOT'],
     disableKeyAppend: true,
   },
   salesforcedmp: {
-    url: 'https://cdn.krxd.net/userdata/v2/amp/ORGANIZATION_ID?segments_key=SEGMENTS_KEY&kuid_key=USER_KEY',
+    url:
+      'https://cdn.krxd.net/userdata/v2/amp/ORGANIZATION_ID?segments_key=SEGMENTS_KEY&kuid_key=USER_KEY',
     macros: ['ORGANIZATION_ID', 'SEGMENTS_KEY', 'USER_KEY'],
     disableKeyAppend: true,
   },
   purch: {
-    url: 'https://ads.servebom.com/tmntag.js?v=1.2&fmt=amp&o={%22p%22%3APLACEMENT_ID}&div_id=DIV_ID',
+    url:
+      'https://ads.servebom.com/tmntag.js?v=1.2&fmt=amp&o={%22p%22%3APLACEMENT_ID}&div_id=DIV_ID',
     macros: ['PLACEMENT_ID', 'DIV_ID'],
     disableKeyAppend: true,
   },
   aps: {
-    url: 'https://aax.amazon-adsystem.com/e/dtb/bid?src=PUB_ID&pubid=PUB_UUID&amp=1&u=CANONICAL_URL&slots=%5B%7B%22sd%22%3A%22ATTR(data-slot)%22%2C%22s%22%3A%5B%22ATTR(width)xATTR(height)%22%5D%2C%22ms%22%3A%22ATTR(data-multi-size)%22%7D%5D&pj=PARAMS',
+    url:
+      'https://aax.amazon-adsystem.com/e/dtb/bid?src=PUB_ID&pubid=PUB_UUID&amp=1&u=CANONICAL_URL&slots=%5B%7B%22sd%22%3A%22ATTR(data-slot)%22%2C%22s%22%3A%5B%22ATTR(width)xATTR(height)%22%5D%2C%22ms%22%3A%22ATTR(data-multi-size)%22%7D%5D&pj=PARAMS',
     macros: ['PUB_ID', 'PARAMS', 'PUB_UUID'],
     disableKeyAppend: true,
   },
   openwrap: {
     // PubMatic OpenWrap
-    url: 'https://ow.pubmatic.com/amp?v=1&w=ATTR(width)&h=ATTR(height)&ms=ATTR(data-multi-size)&auId=ATTR(data-slot)&purl=HREF&pubId=PUB_ID&profId=PROFILE_ID',
+    url:
+      'https://ow.pubmatic.com/amp?v=1&w=ATTR(width)&h=ATTR(height)&ms=ATTR(data-multi-size)&auId=ATTR(data-slot)&purl=HREF&pubId=PUB_ID&profId=PROFILE_ID',
     macros: ['PUB_ID', 'PROFILE_ID'],
     errorReportingUrl: 'https://ow.pubmatic.com/amp_error?e=ERROR_TYPE&h=HREF',
     disableKeyAppend: true,
   },
   criteo: {
-    url: 'https://bidder.criteo.com/amp/rtc?zid=ZONE_ID&nid=NETWORK_ID&psubid=PUBLISHER_SUB_ID&lir=LINE_ITEM_RANGES&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&timeout=TIMEOUT&curl=CANONICAL_URL&href=HREF',
+    url:
+      'https://bidder.criteo.com/amp/rtc?zid=ZONE_ID&nid=NETWORK_ID&psubid=PUBLISHER_SUB_ID&lir=LINE_ITEM_RANGES&w=ATTR(width)&h=ATTR(height)&ow=ATTR(data-override-width)&oh=ATTR(data-override-height)&ms=ATTR(data-multi-size)&slot=ATTR(data-slot)&timeout=TIMEOUT&curl=CANONICAL_URL&href=HREF',
     macros: ['ZONE_ID', 'NETWORK_ID', 'PUBLISHER_SUB_ID', 'LINE_ITEM_RANGES'],
     disableKeyAppend: true,
   },
@@ -112,7 +123,8 @@ export const RTC_VENDORS = {
     macros: ['NVG_ACC'],
   },
   sonobi: {
-    url: 'https://apex.go.sonobi.com/trinity.json?key_maker=%7B%22_DIVIDER_ATTR(data-slot)%7C1%22%3A%22PLACEMENT_ID_DIVIDER_ATTR(width)xATTR(height)%2CATTR(data-multi-size)%22%7D&ref=CANONICAL_URL&lib_name=amp&lib_v=0.1&pv=PAGEVIEWID&amp=1',
+    url:
+      'https://apex.go.sonobi.com/trinity.json?key_maker=%7B%22_DIVIDER_ATTR(data-slot)%7C1%22%3A%22PLACEMENT_ID_DIVIDER_ATTR(width)xATTR(height)%2CATTR(data-multi-size)%22%7D&ref=CANONICAL_URL&lib_name=amp&lib_v=0.1&pv=PAGEVIEWID&amp=1',
     disableKeyAppend: true,
     macros: ['PLACEMENT_ID', '_DIVIDER_'],
   },
@@ -120,12 +132,14 @@ export const RTC_VENDORS = {
 
 // DO NOT MODIFY: Setup for tests
 if (getMode().localDev || getMode().test) {
-  RTC_VENDORS['fakevendor'] = /** @type {RtcVendorDef} */({
-    url: 'https://localhost:8000/examples/rtcE1.json?slot_id=SLOT_ID&page_id=PAGE_ID&foo_id=FOO_ID',
+  RTC_VENDORS['fakevendor'] = /** @type {RtcVendorDef} */ ({
+    url:
+      'https://localhost:8000/examples/rtcE1.json?slot_id=SLOT_ID&page_id=PAGE_ID&foo_id=FOO_ID',
     macros: ['SLOT_ID', 'PAGE_ID', 'FOO_ID'],
   });
-  RTC_VENDORS['fakevendor2'] = /** @type {RtcVendorDef} */({
-    url: 'https://localhost:8000/examples/rtcE1.json?slot_id=SLOT_ID&page_id=PAGE_ID&foo_id=FOO_ID',
+  RTC_VENDORS['fakevendor2'] = /** @type {RtcVendorDef} */ ({
+    url:
+      'https://localhost:8000/examples/rtcE1.json?slot_id=SLOT_ID&page_id=PAGE_ID&foo_id=FOO_ID',
     errorReportingUrl: 'https://localhost:8000/examples/ERROR_TYPE',
     disableKeyAppend: true,
   });
diff --git a/extensions/amp-a4a/0.1/cryptographic-validator.js b/extensions/amp-a4a/0.1/cryptographic-validator.js
index 22911f7ff96c..f33470bf623b 100644
--- a/extensions/amp-a4a/0.1/cryptographic-validator.js
+++ b/extensions/amp-a4a/0.1/cryptographic-validator.js
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  AdResponseType,
-  Validator,
-  ValidatorResult,
-} from './amp-ad-type-defs';
+import {AdResponseType, Validator, ValidatorResult} from './amp-ad-type-defs';
 import {SignatureVerifier, VerificationStatus} from './signature-verifier';
 import {getAmpAdMetadata} from './amp-ad-utils';
 import {signingServerURLs} from '../../../ads/_a4a-config';
@@ -26,7 +22,7 @@ import {user} from '../../../src/log';
 import {utf8Decode} from '../../../src/utils/bytes';
 
 export const SIGNATURE_VERIFIER_PROPERTY_NAME =
-    'AMP_FAST_FETCH_SIGNATURE_VERIFIER_';
+  'AMP_FAST_FETCH_SIGNATURE_VERIFIER_';
 
 const TAG = 'amp-ad-cryptographic-validator';
 
@@ -34,9 +30,13 @@ export class CryptographicValidator extends Validator {
   /** @param {!Window} win */
   getSignatureVerifier_(win) {
     // TODO(levitzky) extract this into a service registered to ampdoc.
-    return win[SIGNATURE_VERIFIER_PROPERTY_NAME] ||
-        (win[SIGNATURE_VERIFIER_PROPERTY_NAME] =
-         new SignatureVerifier(win, signingServerURLs));
+    return (
+      win[SIGNATURE_VERIFIER_PROPERTY_NAME] ||
+      (win[SIGNATURE_VERIFIER_PROPERTY_NAME] = new SignatureVerifier(
+        win,
+        signingServerURLs
+      ))
+    );
   }
 
   /**
@@ -49,8 +49,10 @@ export class CryptographicValidator extends Validator {
       creativeMetadata: getAmpAdMetadata(utf8Decode(bytes)),
     };
     return /** @type {!./amp-ad-type-defs.ValidatorOutput} */ ({
-      type: verificationSucceeded && !!creativeData.creativeMetadata ?
-        ValidatorResult.AMP : ValidatorResult.NON_AMP,
+      type:
+        verificationSucceeded && !!creativeData.creativeMetadata
+          ? ValidatorResult.AMP
+          : ValidatorResult.NON_AMP,
       adResponseType: AdResponseType.CRYPTO,
       creativeData,
     });
@@ -59,23 +61,28 @@ export class CryptographicValidator extends Validator {
   /** @override */
   validate(context, unvalidatedBytes, headers) {
     return this.getSignatureVerifier_(context.win)
-        .verify(unvalidatedBytes, headers, /* lifecycleCallback */
-            (unusedEventName, unusedExtraVariables) => {})
-        .then(status => {
-          switch (status) {
-            case VerificationStatus.OK:
-              return this.createOutput_(true, unvalidatedBytes);
-            case VerificationStatus.UNVERIFIED:
-            // TODO(levitzky) Preferential render without crypto in some
-            // instances.
-            case VerificationStatus.CRYPTO_UNAVAILABLE:
-            // TODO(@taymonbeal, #9274): differentiate between these
-            case VerificationStatus.ERROR_KEY_NOT_FOUND:
-            case VerificationStatus.ERROR_SIGNATURE_MISMATCH:
-              user().error(TAG,
-                  `Signature verification failed with status ${status}.`);
-              return this.createOutput_(false, unvalidatedBytes);
-          }
-        });
+      .verify(
+        unvalidatedBytes,
+        headers /* lifecycleCallback */,
+        (unusedEventName, unusedExtraVariables) => {}
+      )
+      .then(status => {
+        switch (status) {
+          case VerificationStatus.OK:
+            return this.createOutput_(true, unvalidatedBytes);
+          case VerificationStatus.UNVERIFIED:
+          // TODO(levitzky) Preferential render without crypto in some
+          // instances.
+          case VerificationStatus.CRYPTO_UNAVAILABLE:
+          // TODO(@taymonbeal, #9274): differentiate between these
+          case VerificationStatus.ERROR_KEY_NOT_FOUND:
+          case VerificationStatus.ERROR_SIGNATURE_MISMATCH:
+            user().error(
+              TAG,
+              `Signature verification failed with status ${status}.`
+            );
+            return this.createOutput_(false, unvalidatedBytes);
+        }
+      });
   }
 }
diff --git a/extensions/amp-a4a/0.1/friendly-frame-renderer.js b/extensions/amp-a4a/0.1/friendly-frame-renderer.js
index 02cb9eea527e..c6fc637b93c9 100644
--- a/extensions/amp-a4a/0.1/friendly-frame-renderer.js
+++ b/extensions/amp-a4a/0.1/friendly-frame-renderer.js
@@ -29,7 +29,6 @@ export let CreativeData;
  * Render a validated AMP creative directly in the parent page.
  */
 export class FriendlyFrameRenderer extends Renderer {
-
   /**
    * Constructs a FriendlyFrameRenderer instance. The instance values here are
    * used by TemplateRenderer, which inherits from FriendlyFrameRenderer.
@@ -40,7 +39,6 @@ export class FriendlyFrameRenderer extends Renderer {
 
   /** @override */
   render(context, element, creativeData) {
-
     creativeData = /** @type {CreativeData} */ (creativeData);
 
     const {size, adUrl} = context;
@@ -50,6 +48,10 @@ export class FriendlyFrameRenderer extends Renderer {
     devAssert(adUrl, 'missing ad request url');
 
     return renderCreativeIntoFriendlyFrame(
-        adUrl, size, element, creativeMetadata);
+      adUrl,
+      size,
+      element,
+      creativeMetadata
+    );
   }
 }
diff --git a/extensions/amp-a4a/0.1/friendly-frame-util.js b/extensions/amp-a4a/0.1/friendly-frame-util.js
index 5eecd0b11923..a21c10bd9531 100644
--- a/extensions/amp-a4a/0.1/friendly-frame-util.js
+++ b/extensions/amp-a4a/0.1/friendly-frame-util.js
@@ -21,9 +21,7 @@ import {
   installFriendlyIframeEmbed,
   setFriendlyIframeEmbedVisible,
 } from '../../../src/friendly-iframe-embed';
-import {
-  installUrlReplacementsForEmbed,
-} from '../../../src/service/url-replacements-impl';
+import {installUrlReplacementsForEmbed} from '../../../src/service/url-replacements-impl';
 import {setStyle} from '../../../src/style';
 
 /**
@@ -39,22 +37,26 @@ import {setStyle} from '../../../src/style';
  * @return {!Promise<!Element>} The iframe into which the creative was rendered.
  */
 export function renderCreativeIntoFriendlyFrame(
-  adUrl, size, element, creativeMetadata) {
+  adUrl,
+  size,
+  element,
+  creativeMetadata
+) {
   // Create and setup friendly iframe.
-  const iframe = /** @type {!HTMLIFrameElement} */(
-    createElementWithAttributes(
-        /** @type {!Document} */(element.ownerDocument),
-        'iframe',
-        dict({
-          // NOTE: It is possible for either width or height to be 'auto',
-          // a non-numeric value.
-          'height': size.height,
-          'width': size.width,
-          'frameborder': '0',
-          'allowfullscreen': '',
-          'allowtransparency': '',
-          'scrolling': 'no',
-        })));
+  const iframe = /** @type {!HTMLIFrameElement} */ (createElementWithAttributes(
+    /** @type {!Document} */ (element.ownerDocument),
+    'iframe',
+    dict({
+      // NOTE: It is possible for either width or height to be 'auto',
+      // a non-numeric value.
+      'height': size.height,
+      'width': size.width,
+      'frameborder': '0',
+      'allowfullscreen': '',
+      'allowtransparency': '',
+      'scrolling': 'no',
+    })
+  ));
   // TODO(glevitzky): Ensure that applyFillContent or equivalent is called.
 
   const fontsArray = [];
@@ -68,23 +70,29 @@ export function renderCreativeIntoFriendlyFrame(
   }
 
   return installFriendlyIframeEmbed(
-      iframe, element, {
-        host: element,
-        url: /** @type {string} */ (adUrl),
-        html: creativeMetadata.minifiedCreative,
-        extensionIds: creativeMetadata.customElementExtensions || [],
-        fonts: fontsArray,
-      }, embedWin => {
-        installUrlReplacementsForEmbed(element.getAmpDoc(), embedWin,
-            new A4AVariableSource(element.getAmpDoc(), embedWin));
-      })
-      .then(friendlyIframeEmbed => {
-        setFriendlyIframeEmbedVisible(
-            friendlyIframeEmbed, element.isInViewport());
-        // Ensure visibility hidden has been removed (set by boilerplate).
-        const frameDoc = friendlyIframeEmbed.iframe.contentDocument ||
-            friendlyIframeEmbed.win.document;
-        setStyle(frameDoc.body, 'visibility', 'visible');
-        return iframe;
-      });
+    iframe,
+    element,
+    {
+      host: element,
+      url: /** @type {string} */ (adUrl),
+      html: creativeMetadata.minifiedCreative,
+      extensionIds: creativeMetadata.customElementExtensions || [],
+      fonts: fontsArray,
+    },
+    embedWin => {
+      installUrlReplacementsForEmbed(
+        element.getAmpDoc(),
+        embedWin,
+        new A4AVariableSource(element.getAmpDoc(), embedWin)
+      );
+    }
+  ).then(friendlyIframeEmbed => {
+    setFriendlyIframeEmbedVisible(friendlyIframeEmbed, element.isInViewport());
+    // Ensure visibility hidden has been removed (set by boilerplate).
+    const frameDoc =
+      friendlyIframeEmbed.iframe.contentDocument ||
+      friendlyIframeEmbed.win.document;
+    setStyle(frameDoc.body, 'visibility', 'visible');
+    return iframe;
+  });
 }
diff --git a/extensions/amp-a4a/0.1/name-frame-renderer.js b/extensions/amp-a4a/0.1/name-frame-renderer.js
index 6f0650c224a1..9dd3c3f59ceb 100644
--- a/extensions/amp-a4a/0.1/name-frame-renderer.js
+++ b/extensions/amp-a4a/0.1/name-frame-renderer.js
@@ -27,27 +27,28 @@ import {utf8Decode} from '../../../src/utils/bytes';
 export class NameFrameRenderer extends Renderer {
   /** @override */
   render(context, element, crossDomainData) {
-    crossDomainData = /** @type {!./amp-ad-type-defs.CrossDomainDataDef} */ (
-      crossDomainData);
+    crossDomainData = /** @type {!./amp-ad-type-defs.CrossDomainDataDef} */ (crossDomainData);
 
     if (!crossDomainData.creative && !crossDomainData.rawCreativeBytes) {
       // No creative, nothing to do.
       return Promise.resolve();
     }
 
-    const creative = crossDomainData.creative ||
-        // rawCreativeBytes must exist; if we're here, then `creative` must not
-        // exist, but the if-statement above guarantees that at least one of
-        // `creative` || `rawCreativeBytes` exists.
-        utf8Decode(/** @type {!ArrayBuffer} */ (
-          crossDomainData.rawCreativeBytes));
-    const srcPath =
-        getDefaultBootstrapBaseUrl(context.win, 'nameframe');
+    const creative =
+      crossDomainData.creative ||
+      // rawCreativeBytes must exist; if we're here, then `creative` must not
+      // exist, but the if-statement above guarantees that at least one of
+      // `creative` || `rawCreativeBytes` exists.
+      utf8Decode(
+        /** @type {!ArrayBuffer} */ (crossDomainData.rawCreativeBytes)
+      );
+    const srcPath = getDefaultBootstrapBaseUrl(context.win, 'nameframe');
     const contextMetadata = getContextMetadata(
-        context.win,
-        element,
-        context.sentinel,
-        crossDomainData.additionalContextMetadata);
+      context.win,
+      element,
+      context.sentinel,
+      crossDomainData.additionalContextMetadata
+    );
     contextMetadata['creative'] = creative;
     const attributes = dict({
       'src': srcPath,
@@ -65,8 +66,10 @@ export class NameFrameRenderer extends Renderer {
       attributes['data-amp-3p-sentinel'] = crossDomainData.sentinel;
     }
     const iframe = createElementWithAttributes(
-        /** @type {!Document} */ (element.ownerDocument), 'iframe',
-        /** @type {!JsonObject} */ (attributes));
+      /** @type {!Document} */ (element.ownerDocument),
+      'iframe',
+      /** @type {!JsonObject} */ (attributes)
+    );
     // TODO(glevitzky): Ensure that applyFillContent or equivalent is called.
     element.appendChild(iframe);
     return Promise.resolve();
diff --git a/extensions/amp-a4a/0.1/real-time-config-manager.js b/extensions/amp-a4a/0.1/real-time-config-manager.js
index 60baa79940ac..83fc4c82c8da 100644
--- a/extensions/amp-a4a/0.1/real-time-config-manager.js
+++ b/extensions/amp-a4a/0.1/real-time-config-manager.js
@@ -32,8 +32,8 @@ const MAX_RTC_CALLOUTS = 5;
 const MAX_URL_LENGTH = 16384;
 
 /** @type {boolean} */
-const ERROR_REPORTING_ENABLED = getMode(window).localDev ||
-      getMode(window).test || Math.random() < 0.01;
+const ERROR_REPORTING_ENABLED =
+  getMode(window).localDev || getMode(window).test || Math.random() < 0.01;
 
 /** @typedef {{
     urls: (undefined|Array<string>|
@@ -116,14 +116,14 @@ export class RealTimeConfigManager {
    * @return {!Promise<!rtcResponseDef>}
    * @private
    */
-  buildErrorResponse_(
-    error, callout, errorReportingUrl, opt_rtcTime) {
+  buildErrorResponse_(error, callout, errorReportingUrl, opt_rtcTime) {
     dev().warn(TAG, `RTC callout to ${callout} caused ${error}`);
     if (errorReportingUrl) {
       this.sendErrorMessage(error, errorReportingUrl);
     }
-    return Promise.resolve(/**@type {rtcResponseDef} */(
-      {error, callout, rtcTime: opt_rtcTime || 0}));
+    return Promise.resolve(
+      /**@type {rtcResponseDef} */ ({error, callout, rtcTime: opt_rtcTime || 0})
+    );
   }
 
   /**
@@ -203,18 +203,26 @@ export class RealTimeConfigManager {
 
     if (isArray(sendRegardlessOfConsentState)) {
       for (let i = 0; i < sendRegardlessOfConsentState.length; i++) {
-        if (this.consentState_ ==
-            CONSENT_POLICY_STATE[sendRegardlessOfConsentState[i]]) {
+        if (
+          this.consentState_ ==
+          CONSENT_POLICY_STATE[sendRegardlessOfConsentState[i]]
+        ) {
           return true;
         } else if (!CONSENT_POLICY_STATE[sendRegardlessOfConsentState[i]]) {
-          dev().warn(TAG, 'Invalid RTC consent state given: ' +
-                     `${sendRegardlessOfConsentState[i]}`);
+          dev().warn(
+            TAG,
+            'Invalid RTC consent state given: ' +
+              `${sendRegardlessOfConsentState[i]}`
+          );
         }
       }
       return false;
     }
-    user().warn(TAG, 'Invalid value for sendRegardlessOfConsentState:' +
-                `${sendRegardlessOfConsentState}`);
+    user().warn(
+      TAG,
+      'Invalid value for sendRegardlessOfConsentState:' +
+        `${sendRegardlessOfConsentState}`
+    );
     return !!optIsGloballyValid;
   }
 
@@ -233,23 +241,29 @@ export class RealTimeConfigManager {
    * custom URL.
    */
   modifyRtcConfigForConsentStateSettings() {
-    if (this.consentState_ == undefined ||
-        this.consentState_ == CONSENT_POLICY_STATE.SUFFICIENT ||
-        this.consentState_ == CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED) {
+    if (
+      this.consentState_ == undefined ||
+      this.consentState_ == CONSENT_POLICY_STATE.SUFFICIENT ||
+      this.consentState_ == CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+    ) {
       return;
     }
 
     const isGloballyValid = this.isValidCalloutForConsentState(this.rtcConfig_);
-    this.rtcConfig_.urls = (this.rtcConfig_.urls || []).filter(
-        url => this.isValidCalloutForConsentState(url, isGloballyValid));
+    this.rtcConfig_.urls = (this.rtcConfig_.urls || []).filter(url =>
+      this.isValidCalloutForConsentState(url, isGloballyValid)
+    );
 
     Object.keys(this.rtcConfig_.vendors || {}).forEach(vendor => {
-      if (!this.isValidCalloutForConsentState(
-          this.rtcConfig_.vendors[vendor], isGloballyValid)) {
+      if (
+        !this.isValidCalloutForConsentState(
+          this.rtcConfig_.vendors[vendor],
+          isGloballyValid
+        )
+      ) {
         delete this.rtcConfig_.vendors[vendor];
       }
     });
-
   }
 
   /**
@@ -281,9 +295,7 @@ export class RealTimeConfigManager {
       } else {
         dev().warn(TAG, `Invalid url: ${urlObj}`);
       }
-      this.inflateAndSendRtc_(url,
-          customMacros,
-          errorReportingUrl);
+      this.inflateAndSendRtc_(url, customMacros, errorReportingUrl);
     });
   }
 
@@ -297,36 +309,44 @@ export class RealTimeConfigManager {
     Object.keys(this.rtcConfig_.vendors || []).forEach(vendor => {
       const vendorObject = RTC_VENDORS[vendor.toLowerCase()];
       const url = vendorObject ? vendorObject.url : '';
-      const errorReportingUrl = vendorObject && vendorObject.errorReportingUrl ?
-        vendorObject.errorReportingUrl : '';
+      const errorReportingUrl =
+        vendorObject && vendorObject.errorReportingUrl
+          ? vendorObject.errorReportingUrl
+          : '';
       if (!url) {
         return this.promiseArray_.push(
-            this.buildErrorResponse_(
-                RTC_ERROR_ENUM.UNKNOWN_VENDOR, vendor, errorReportingUrl));
+          this.buildErrorResponse_(
+            RTC_ERROR_ENUM.UNKNOWN_VENDOR,
+            vendor,
+            errorReportingUrl
+          )
+        );
       }
       // There are two valid configurations of the vendor object.
       // It can either be an object of macros mapping string to string,
       // or it can be an object with sub-objects, one of which can be
       // 'macros'. This is for backwards compatability.
-      const vendorMacros =
-            isObject(this.rtcConfig_.vendors[vendor]['macros']) ?
-              this.rtcConfig_.vendors[vendor]['macros'] :
-              this.rtcConfig_.vendors[vendor];
+      const vendorMacros = isObject(this.rtcConfig_.vendors[vendor]['macros'])
+        ? this.rtcConfig_.vendors[vendor]['macros']
+        : this.rtcConfig_.vendors[vendor];
       const validVendorMacros = {};
       Object.keys(vendorMacros).forEach(macro => {
         if (!(vendorObject.macros && vendorObject.macros.includes(macro))) {
           user().error(TAG, `Unknown macro: ${macro} for vendor: ${vendor}`);
         } else {
           const value = vendorMacros[macro];
-          validVendorMacros[macro] = isObject(value) || isArray(value) ?
-            JSON.stringify(value) : value;
+          validVendorMacros[macro] =
+            isObject(value) || isArray(value) ? JSON.stringify(value) : value;
         }
       });
       // The ad network defined macros override vendor defined/pub specifed.
       const macros = Object.assign(validVendorMacros, customMacros);
-      this.inflateAndSendRtc_(url,
-          macros, errorReportingUrl,
-          vendor.toLowerCase());
+      this.inflateAndSendRtc_(
+        url,
+        macros,
+        errorReportingUrl,
+        vendor.toLowerCase()
+      );
     });
   }
 
@@ -337,12 +357,12 @@ export class RealTimeConfigManager {
    * @param {string=} opt_vendor
    * @private
    */
-  inflateAndSendRtc_(url,
-    macros, errorReportingUrl, opt_vendor) {
+  inflateAndSendRtc_(url, macros, errorReportingUrl, opt_vendor) {
     let {timeoutMillis} = this.rtcConfig_;
     const callout = opt_vendor || this.getCalloutParam_(url);
     const checkStillCurrent = this.a4aElement_.verifyStillCurrent.bind(
-        this.a4aElement_)();
+      this.a4aElement_
+    )();
     /**
      * The time that it takes to substitute the macros into the URL can vary
      * depending on what the url requires to be substituted, i.e. a long
@@ -353,45 +373,66 @@ export class RealTimeConfigManager {
     const send = url => {
       if (Object.keys(this.seenUrls_).length == MAX_RTC_CALLOUTS) {
         return this.buildErrorResponse_(
-            RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED,
-            callout, errorReportingUrl);
+          RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED,
+          callout,
+          errorReportingUrl
+        );
       }
-      if (!Services.urlForDoc(
-          this.a4aElement_.element).isSecure(url)) {
-        return this.buildErrorResponse_(RTC_ERROR_ENUM.INSECURE_URL,
-            callout, errorReportingUrl);
+      if (!Services.urlForDoc(this.a4aElement_.element).isSecure(url)) {
+        return this.buildErrorResponse_(
+          RTC_ERROR_ENUM.INSECURE_URL,
+          callout,
+          errorReportingUrl
+        );
       }
       if (this.seenUrls_[url]) {
-        return this.buildErrorResponse_(RTC_ERROR_ENUM.DUPLICATE_URL,
-            callout, errorReportingUrl);
+        return this.buildErrorResponse_(
+          RTC_ERROR_ENUM.DUPLICATE_URL,
+          callout,
+          errorReportingUrl
+        );
       }
       this.seenUrls_[url] = true;
       if (url.length > MAX_URL_LENGTH) {
         url = this.truncUrl_(url);
       }
       return this.sendRtcCallout_(
-          url, timeoutMillis, callout, checkStillCurrent,
-          errorReportingUrl);
+        url,
+        timeoutMillis,
+        callout,
+        checkStillCurrent,
+        errorReportingUrl
+      );
     };
 
     const whitelist = {};
-    Object.keys(macros).forEach(key => whitelist[key] = true);
+    Object.keys(macros).forEach(key => (whitelist[key] = true));
     const urlReplacementStartTime = Date.now();
-    this.promiseArray_.push(Services.timerFor(this.win_).timeoutPromise(
-        timeoutMillis,
-        Services.urlReplacementsForDoc(this.a4aElement_.element).expandUrlAsync(
-            url, macros, whitelist)).then(url => {
-      checkStillCurrent();
-      timeoutMillis -= (urlReplacementStartTime - Date.now());
-      return send(url);
-    }).catch(error => {
-      return isCancellation(error) ? undefined :
-        this.buildErrorResponse_(RTC_ERROR_ENUM.MACRO_EXPAND_TIMEOUT,
-            callout, errorReportingUrl);
-    }));
+    this.promiseArray_.push(
+      Services.timerFor(this.win_)
+        .timeoutPromise(
+          timeoutMillis,
+          Services.urlReplacementsForDoc(
+            this.a4aElement_.element
+          ).expandUrlAsync(url, macros, whitelist)
+        )
+        .then(url => {
+          checkStillCurrent();
+          timeoutMillis -= urlReplacementStartTime - Date.now();
+          return send(url);
+        })
+        .catch(error => {
+          return isCancellation(error)
+            ? undefined
+            : this.buildErrorResponse_(
+                RTC_ERROR_ENUM.MACRO_EXPAND_TIMEOUT,
+                callout,
+                errorReportingUrl
+              );
+        })
+    );
   }
 
-
   /**
    * @param {string} url
    * @return {string}
@@ -410,45 +451,66 @@ export class RealTimeConfigManager {
    * @return {!Promise<!rtcResponseDef>}
    * @private
    */
-  sendRtcCallout_(url, timeoutMillis, callout, checkStillCurrent,
-    errorReportingUrl) {
+  sendRtcCallout_(
+    url,
+    timeoutMillis,
+    callout,
+    checkStillCurrent,
+    errorReportingUrl
+  ) {
     /**
      * Note: Timeout is enforced by timerFor, not the value of
      *   rtcTime. There are situations where rtcTime could thus
      *   end up being greater than timeoutMillis.
      */
-    return Services.timerFor(this.win_).timeoutPromise(
+    return Services.timerFor(this.win_)
+      .timeoutPromise(
         timeoutMillis,
-        Services.xhrFor(this.win_).fetchJson(
+        Services.xhrFor(this.win_)
+          .fetchJson(
             // NOTE(bradfrizzell): we could include ampCors:false allowing
             // the request to be cached across sites but for now assume that
             // is not a required feature.
-            url, {credentials: 'include'}).then(res => {
-          checkStillCurrent();
-          return res.text().then(text => {
+            url,
+            {credentials: 'include'}
+          )
+          .then(res => {
             checkStillCurrent();
-            const rtcTime = Date.now() - this.rtcStartTime_;
-            // An empty text response is allowed, not an error.
-            if (!text) {
-              return {rtcTime, callout};
-            }
-            const response = tryParseJson(text);
-            return response ? {response, rtcTime, callout} :
-              this.buildErrorResponse_(
-                  RTC_ERROR_ENUM.MALFORMED_JSON_RESPONSE, callout,
-                  errorReportingUrl, rtcTime);
-          });
-        })).catch(error => {
-      return isCancellation(error) ? undefined :
-        this.buildErrorResponse_(
-            // The relevant error message for timeout looks like it is
-            // just 'message' but is in fact 'messageXXX' where the
-            // X's are hidden special characters. That's why we use
-            // match here.
-            (/^timeout/.test(error.message)) ?
-              RTC_ERROR_ENUM.TIMEOUT : RTC_ERROR_ENUM.NETWORK_FAILURE,
-            callout, errorReportingUrl, Date.now() - this.rtcStartTime_);
-    });
+            return res.text().then(text => {
+              checkStillCurrent();
+              const rtcTime = Date.now() - this.rtcStartTime_;
+              // An empty text response is allowed, not an error.
+              if (!text) {
+                return {rtcTime, callout};
+              }
+              const response = tryParseJson(text);
+              return response
+                ? {response, rtcTime, callout}
+                : this.buildErrorResponse_(
+                    RTC_ERROR_ENUM.MALFORMED_JSON_RESPONSE,
+                    callout,
+                    errorReportingUrl,
+                    rtcTime
+                  );
+            });
+          })
+      )
+      .catch(error => {
+        return isCancellation(error)
+          ? undefined
+          : this.buildErrorResponse_(
+              // The relevant error message for timeout looks like it is
+              // just 'message' but is in fact 'messageXXX' where the
+              // X's are hidden special characters. That's why we use
+              // match here.
+              /^timeout/.test(error.message)
+                ? RTC_ERROR_ENUM.TIMEOUT
+                : RTC_ERROR_ENUM.NETWORK_FAILURE,
+              callout,
+              errorReportingUrl,
+              Date.now() - this.rtcStartTime_
+            );
+      });
   }
 
   /**
@@ -477,8 +539,10 @@ export class RealTimeConfigManager {
 
     let timeout;
     try {
-      userAssert(rtcConfig['vendors'] || rtcConfig['urls'],
-          'RTC Config must specify vendors or urls');
+      userAssert(
+        rtcConfig['vendors'] || rtcConfig['urls'],
+        'RTC Config must specify vendors or urls'
+      );
       Object.keys(rtcConfig).forEach(key => {
         switch (key) {
           case 'vendors':
@@ -490,12 +554,18 @@ export class RealTimeConfigManager {
           case 'timeoutMillis':
             timeout = parseInt(rtcConfig[key], 10);
             if (isNaN(timeout)) {
-              user().warn(TAG, 'Invalid RTC timeout is NaN, ' +
-                          `using default timeout ${defaultTimeoutMillis}ms`);
+              user().warn(
+                TAG,
+                'Invalid RTC timeout is NaN, ' +
+                  `using default timeout ${defaultTimeoutMillis}ms`
+              );
               timeout = undefined;
             } else if (timeout >= defaultTimeoutMillis || timeout < 0) {
-              user().warn(TAG, `Invalid RTC timeout: ${timeout}ms, ` +
-                          `using default timeout ${defaultTimeoutMillis}ms`);
+              user().warn(
+                TAG,
+                `Invalid RTC timeout: ${timeout}ms, ` +
+                  `using default timeout ${defaultTimeoutMillis}ms`
+              );
               timeout = undefined;
             }
             break;
@@ -504,14 +574,18 @@ export class RealTimeConfigManager {
             break;
         }
       });
-      if (!Object.keys(rtcConfig['vendors'] || {}).length
-          && !(rtcConfig['urls'] || []).length) {
+      if (
+        !Object.keys(rtcConfig['vendors'] || {}).length &&
+        !(rtcConfig['urls'] || []).length
+      ) {
         return false;
       }
       const validateErrorReportingUrl = urlObj => {
         const errorUrl = urlObj['errorReportingUrl'];
-        if (errorUrl && !Services.urlForDoc(
-            this.a4aElement_.element).isSecure(errorUrl)) {
+        if (
+          errorUrl &&
+          !Services.urlForDoc(this.a4aElement_.element).isSecure(errorUrl)
+        ) {
           dev().warn(TAG, `Insecure RTC errorReportingUrl: ${errorUrl}`);
           urlObj['errorReportingUrl'] = undefined;
         }
@@ -526,9 +600,9 @@ export class RealTimeConfigManager {
       // This error would be due to the asserts above.
       return false;
     }
-    rtcConfig['timeoutMillis'] = timeout !== undefined ?
-      timeout : defaultTimeoutMillis;
-    this.rtcConfig_ = /** @type {RtcConfigDef} */(rtcConfig);
+    rtcConfig['timeoutMillis'] =
+      timeout !== undefined ? timeout : defaultTimeoutMillis;
+    this.rtcConfig_ = /** @type {RtcConfigDef} */ (rtcConfig);
     return true;
   }
 }
diff --git a/extensions/amp-a4a/0.1/refresh-intersection-observer-wrapper.js b/extensions/amp-a4a/0.1/refresh-intersection-observer-wrapper.js
index c54be4249003..b9fc94259a1e 100644
--- a/extensions/amp-a4a/0.1/refresh-intersection-observer-wrapper.js
+++ b/extensions/amp-a4a/0.1/refresh-intersection-observer-wrapper.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  IntersectionObserverPolyfill,
-} from '../../../src/intersection-observer-polyfill';
+import {IntersectionObserverPolyfill} from '../../../src/intersection-observer-polyfill';
 import {devAssert} from '../../../src/log';
 
 export class RefreshIntersectionObserverWrapper {
@@ -28,12 +26,13 @@ export class RefreshIntersectionObserverWrapper {
    * @param {Object} config
    */
   constructor(callback, baseElement, config) {
-
     /**
      * @private @const {!IntersectionObserverPolyfill}
      */
     this.intersectionObserver_ = new IntersectionObserverPolyfill(
-        callback, config);
+      callback,
+      config
+    );
 
     /**
      * Stores elements and their original viewportCallback functions so that
diff --git a/extensions/amp-a4a/0.1/refresh-manager.js b/extensions/amp-a4a/0.1/refresh-manager.js
index 9fbba86b94c8..b19cb02c388b 100644
--- a/extensions/amp-a4a/0.1/refresh-manager.js
+++ b/extensions/amp-a4a/0.1/refresh-manager.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  RefreshIntersectionObserverWrapper,
-} from './refresh-intersection-observer-wrapper';
+import {RefreshIntersectionObserverWrapper} from './refresh-intersection-observer-wrapper';
 import {Services} from '../../../src/services';
 import {devAssert, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
@@ -56,18 +54,21 @@ export function getPublisherSpecifiedRefreshInterval(element, win) {
     return checkAndSanitizeRefreshInterval(refreshInterval);
   }
   let metaTag;
-  const metaTagContent = ((metaTag = win.document
-      .getElementsByName(METATAG_NAME))
-      && metaTag[0]
-      && metaTag[0].getAttribute('content'));
+  const metaTagContent =
+    (metaTag = win.document.getElementsByName(METATAG_NAME)) &&
+    metaTag[0] &&
+    metaTag[0].getAttribute('content');
   if (!metaTagContent) {
     return null;
   }
   const networkIntervalPairs = metaTagContent.split(',');
   for (let i = 0; i < networkIntervalPairs.length; i++) {
     const pair = networkIntervalPairs[i].split('=');
-    userAssert(pair.length == 2, 'refresh metadata config must be of ' +
-        'the form `network_type=refresh_interval`');
+    userAssert(
+      pair.length == 2,
+      'refresh metadata config must be of ' +
+        'the form `network_type=refresh_interval`'
+    );
     if (pair[0].toLowerCase() == element.getAttribute('type').toLowerCase()) {
       return checkAndSanitizeRefreshInterval(pair[1]);
     }
@@ -85,11 +86,12 @@ export function getPublisherSpecifiedRefreshInterval(element, win) {
  */
 function checkAndSanitizeRefreshInterval(refreshInterval) {
   const refreshIntervalNum = Number(refreshInterval);
-  if (isNaN(refreshIntervalNum) ||
-      refreshIntervalNum < MIN_REFRESH_INTERVAL) {
-    user().warn(TAG,
-        'invalid refresh interval, must be a number no less than ' +
-        `${MIN_REFRESH_INTERVAL}: ${refreshInterval}`);
+  if (isNaN(refreshIntervalNum) || refreshIntervalNum < MIN_REFRESH_INTERVAL) {
+    user().warn(
+      TAG,
+      'invalid refresh interval, must be a number no less than ' +
+        `${MIN_REFRESH_INTERVAL}: ${refreshInterval}`
+    );
     return null;
   }
   return refreshIntervalNum * 1000;
@@ -163,27 +165,30 @@ let refreshManagerIdCounter = 0;
  * @return {?RefreshManager}
  */
 export function getRefreshManager(a4a, opt_predicate) {
-  const refreshInterval =
-      getPublisherSpecifiedRefreshInterval(a4a.element, a4a.win);
+  const refreshInterval = getPublisherSpecifiedRefreshInterval(
+    a4a.element,
+    a4a.win
+  );
   if (!refreshInterval || (opt_predicate && !opt_predicate())) {
     return null;
   }
-  return new RefreshManager(a4a, dict({
-    'visiblePercentageMin': 50,
-    'continuousTimeMin': 1,
-  }), refreshInterval);
+  return new RefreshManager(
+    a4a,
+    dict({
+      'visiblePercentageMin': 50,
+      'continuousTimeMin': 1,
+    }),
+    refreshInterval
+  );
 }
 
-
 export class RefreshManager {
-
   /**
    * @param {!./amp-a4a.AmpA4A} a4a The AmpA4A instance to be refreshed.
    * @param {!JsonObject} config
    * @param {number} refreshInterval
    */
   constructor(a4a, config, refreshInterval) {
-
     /** @private {string} */
     this.state_ = RefreshLifecycleState.INITIAL;
 
@@ -228,13 +233,18 @@ export class RefreshManager {
    * @return {(!IntersectionObserver|!RefreshIntersectionObserverWrapper)}
    */
   getIntersectionObserverWithThreshold_(threshold) {
-
     const thresholdString = String(threshold);
-    return observers[thresholdString] ||
-        (observers[thresholdString] = 'IntersectionObserver' in this.win_
+    return (
+      observers[thresholdString] ||
+      (observers[thresholdString] =
+        'IntersectionObserver' in this.win_
           ? new this.win_['IntersectionObserver'](this.ioCallback_, {threshold})
           : new RefreshIntersectionObserverWrapper(
-              this.ioCallback_, this.a4a_, {threshold}));
+              this.ioCallback_,
+              this.a4a_,
+              {threshold}
+            ))
+    );
   }
 
   /**
@@ -260,21 +270,27 @@ export class RefreshManager {
           // threshold. If this timer runs out without interruption, then all
           // viewability conditions have been met, and we can begin the refresh
           // timer.
-          if (entry.intersectionRatio >=
-              refreshManager.config_['visiblePercentageMin']) {
+          if (
+            entry.intersectionRatio >=
+            refreshManager.config_['visiblePercentageMin']
+          ) {
             refreshManager.state_ = RefreshLifecycleState.VIEW_PENDING;
             refreshManager.visibilityTimeoutId_ = refreshManager.timer_.delay(
-                () => {
-                  refreshManager.state_ = RefreshLifecycleState.REFRESH_PENDING;
-                  refreshManager.startRefreshTimer_();
-                }, refreshManager.config_['continuousTimeMin']);
+              () => {
+                refreshManager.state_ = RefreshLifecycleState.REFRESH_PENDING;
+                refreshManager.startRefreshTimer_();
+              },
+              refreshManager.config_['continuousTimeMin']
+            );
           }
           break;
         case RefreshLifecycleState.VIEW_PENDING:
           // If the element goes off screen before the minimum on screen time
           // duration elapses, place it back into INITIAL state.
-          if (entry.intersectionRatio <
-              refreshManager.config_['visiblePercentageMin']) {
+          if (
+            entry.intersectionRatio <
+            refreshManager.config_['visiblePercentageMin']
+          ) {
             refreshManager.timer_.cancel(refreshManager.visibilityTimeoutId_);
             refreshManager.visibilityTimeoutId_ = null;
             refreshManager.state_ = RefreshLifecycleState.INITIAL;
@@ -295,13 +311,13 @@ export class RefreshManager {
     switch (this.state_) {
       case RefreshLifecycleState.INITIAL:
         this.getIntersectionObserverWithThreshold_(
-            this.config_['visiblePercentageMin']).observe(this.element_);
+          this.config_['visiblePercentageMin']
+        ).observe(this.element_);
         break;
       case RefreshLifecycleState.REFRESH_PENDING:
       case RefreshLifecycleState.VIEW_PENDING:
       default:
         break;
-
     }
   }
 
@@ -329,9 +345,11 @@ export class RefreshManager {
    * @return {!JsonObject}
    */
   convertAndSanitizeConfiguration_(config) {
-    devAssert(config['visiblePercentageMin'] >= 0 &&
+    devAssert(
+      config['visiblePercentageMin'] >= 0 &&
         config['visiblePercentageMin'] <= 100,
-    'visiblePercentageMin for refresh must be in the range [0, 100]');
+      'visiblePercentageMin for refresh must be in the range [0, 100]'
+    );
     // Convert seconds to milliseconds.
     config['continuousTimeMin'] *= 1000;
     config['visiblePercentageMin'] /= 100;
@@ -343,7 +361,7 @@ export class RefreshManager {
    */
   unobserve() {
     this.getIntersectionObserverWithThreshold_(
-        this.config_['visiblePercentageMin']).unobserve(this.element_);
+      this.config_['visiblePercentageMin']
+    ).unobserve(this.element_);
   }
 }
-
diff --git a/extensions/amp-a4a/0.1/signature-verifier.js b/extensions/amp-a4a/0.1/signature-verifier.js
index a9d65690e5e7..6f62e143ec31 100644
--- a/extensions/amp-a4a/0.1/signature-verifier.js
+++ b/extensions/amp-a4a/0.1/signature-verifier.js
@@ -29,7 +29,6 @@ export const AMP_SIGNATURE_HEADER = 'AMP-Fast-Fetch-Signature';
  * @enum {number}
  */
 export const VerificationStatus = {
-
   /** The ad was successfully verified as AMP. */
   OK: 0,
 
@@ -58,7 +57,6 @@ export const VerificationStatus = {
    * i.e. is not SSL.
    */
   CRYPTO_UNAVAILABLE: 4,
-
 };
 
 /**
@@ -75,7 +73,6 @@ export const VerificationStatus = {
  * introduced as an experiment.
  */
 export class SignatureVerifier {
-
   /**
    * @param {!Window} win
    * @param {!Object<string, string>} signingServerURLs a map from the name of
@@ -134,8 +131,10 @@ export class SignatureVerifier {
      *
      * @private @const {function(): number}
      */
-    this.getNow_ = (win.performance && win.performance.now) ?
-      win.performance.now.bind(win.performance) : Date.now;
+    this.getNow_ =
+      win.performance && win.performance.now
+        ? win.performance.now.bind(win.performance)
+        : Date.now;
   }
 
   /**
@@ -168,8 +167,7 @@ export class SignatureVerifier {
    * @return {!Promise<!VerificationStatus>}
    */
   verify(creative, headers) {
-    const signatureFormat =
-        /^([A-Za-z0-9._-]+):([A-Za-z0-9._-]+):([A-Za-z0-9+/]{341}[AQgw]==)$/;
+    const signatureFormat = /^([A-Za-z0-9._-]+):([A-Za-z0-9._-]+):([A-Za-z0-9+/]{341}[AQgw]==)$/;
     if (!headers.has(AMP_SIGNATURE_HEADER)) {
       return Promise.resolve(VerificationStatus.UNVERIFIED);
     }
@@ -178,11 +176,17 @@ export class SignatureVerifier {
     if (!match) {
       // TODO(@taymonbeal, #9274): replace this with real error reporting
       user().error(
-          'AMP-A4A', `Invalid signature header: ${headerValue.split(':')[0]}`);
+        'AMP-A4A',
+        `Invalid signature header: ${headerValue.split(':')[0]}`
+      );
       return Promise.resolve(VerificationStatus.ERROR_SIGNATURE_MISMATCH);
     }
     return this.verifyCreativeAndSignature(
-        match[1], match[2], base64DecodeToBytes(match[3]), creative);
+      match[1],
+      match[2],
+      base64DecodeToBytes(match[3]),
+      creative
+    );
   }
 
   /**
@@ -207,15 +211,21 @@ export class SignatureVerifier {
    * @visibleForTesting
    */
   verifyCreativeAndSignature(
-    signingServiceName, keypairId, signature, creative) {
+    signingServiceName,
+    keypairId,
+    signature,
+    creative
+  ) {
     if (!this.signers_) {
       // Web Cryptography isn't available.
       return Promise.resolve(VerificationStatus.CRYPTO_UNAVAILABLE);
     }
     const signer = this.signers_[signingServiceName];
     devAssert(
-        signer, 'Keyset for service %s not loaded before verification',
-        signingServiceName);
+      signer,
+      'Keyset for service %s not loaded before verification',
+      signingServiceName
+    );
     return signer.promise.then(success => {
       if (!success) {
         // The public keyset couldn't be fetched and imported. Probably a
@@ -226,19 +236,25 @@ export class SignatureVerifier {
       if (keyPromise === undefined) {
         // We don't have this key, but maybe the cache is stale; try
         // cachebusting.
-        signer.promise =
-            this.fetchAndAddKeys_(signer.keys, signingServiceName, keypairId)
-                .then(success => {
-                  if (signer.keys[keypairId] === undefined) {
-                    // We still don't have this key; make sure we never try
-                    // again.
-                    signer.keys[keypairId] = null;
-                  }
-                  return success;
-                });
+        signer.promise = this.fetchAndAddKeys_(
+          signer.keys,
+          signingServiceName,
+          keypairId
+        ).then(success => {
+          if (signer.keys[keypairId] === undefined) {
+            // We still don't have this key; make sure we never try
+            // again.
+            signer.keys[keypairId] = null;
+          }
+          return success;
+        });
         // This "recursive" call can recurse at most once.
         return this.verifyCreativeAndSignature(
-            signingServiceName, keypairId, signature, creative);
+          signingServiceName,
+          keypairId,
+          signature,
+          creative
+        );
       } else if (keyPromise === null) {
         // We don't have this key and we already tried cachebusting.
         return VerificationStatus.ERROR_KEY_NOT_FOUND;
@@ -251,19 +267,21 @@ export class SignatureVerifier {
           }
           const crypto = Services.cryptoFor(this.win_);
           return crypto.verifyPkcs(key, signature, creative).then(
-              result => result ? VerificationStatus.OK :
-                VerificationStatus.ERROR_SIGNATURE_MISMATCH,
-              err => {
-                // Web Cryptography rejected the verification attempt. This
-                // hopefully won't happen in the wild, but browsers can be weird
-                // about this, so we need to guard against the possibility.
-                // Phone home to the AMP Project so that we can understand why
-                // this occurred.
-                const message = err && err.message;
-                dev().error(
-                    'AMP-A4A', `Failed to verify signature: ${message}`);
-                return VerificationStatus.UNVERIFIED;
-              });
+            result =>
+              result
+                ? VerificationStatus.OK
+                : VerificationStatus.ERROR_SIGNATURE_MISMATCH,
+            err => {
+              // Web Cryptography rejected the verification attempt. This
+              // hopefully won't happen in the wild, but browsers can be weird
+              // about this, so we need to guard against the possibility.
+              // Phone home to the AMP Project so that we can understand why
+              // this occurred.
+              const message = err && err.message;
+              dev().error('AMP-A4A', `Failed to verify signature: ${message}`);
+              return VerificationStatus.UNVERIFIED;
+            }
+          );
         });
       }
     });
@@ -292,89 +310,97 @@ export class SignatureVerifier {
     }
     // TODO(@taymonbeal, #11088): consider a timeout on this fetch
     return Services.xhrFor(this.win_)
-        .fetchJson(url, {
-          mode: 'cors',
-          method: 'GET',
-          // This should be cached across publisher domains, so don't append
-          // __amp_source_origin to the URL.
-          ampCors: false,
-          credentials: 'omit',
-        }).then(
-            response => {
-              // These are assertions on signing service behavior required by
-              // the spec. However, nothing terrible happens if they aren't met
-              // and there's no meaningful error recovery to be done if they
-              // fail, so we don't need to do them at runtime in production.
-              // They're included in dev mode as a debugging aid.
-              devAssert(
-                  response.status === 200,
-                  'Fast Fetch keyset spec requires status code 200');
-              devAssert(
-                  response.headers.get('Content-Type') ==
-                      'application/jwk-set+json',
-                  'Fast Fetch keyset spec requires Content-Type: ' +
-                      'application/jwk-set+json');
-              return response.json().then(
-                  jsonResponse => {
-                    const jwkSet = /** @type {!JsonObject} */ (jsonResponse);
-                    // This is supposed to be a JSON Web Key Set, as defined in
-                    // Section 5 of RFC 7517. However, the signing service could
-                    // misbehave and send an arbitrary JSON value, so we have to
-                    // type-check at runtime.
-                    if (!jwkSet || !isArray(jwkSet['keys'])) {
+      .fetchJson(url, {
+        mode: 'cors',
+        method: 'GET',
+        // This should be cached across publisher domains, so don't append
+        // __amp_source_origin to the URL.
+        ampCors: false,
+        credentials: 'omit',
+      })
+      .then(
+        response => {
+          // These are assertions on signing service behavior required by
+          // the spec. However, nothing terrible happens if they aren't met
+          // and there's no meaningful error recovery to be done if they
+          // fail, so we don't need to do them at runtime in production.
+          // They're included in dev mode as a debugging aid.
+          devAssert(
+            response.status === 200,
+            'Fast Fetch keyset spec requires status code 200'
+          );
+          devAssert(
+            response.headers.get('Content-Type') == 'application/jwk-set+json',
+            'Fast Fetch keyset spec requires Content-Type: ' +
+              'application/jwk-set+json'
+          );
+          return response.json().then(
+            jsonResponse => {
+              const jwkSet = /** @type {!JsonObject} */ (jsonResponse);
+              // This is supposed to be a JSON Web Key Set, as defined in
+              // Section 5 of RFC 7517. However, the signing service could
+              // misbehave and send an arbitrary JSON value, so we have to
+              // type-check at runtime.
+              if (!jwkSet || !isArray(jwkSet['keys'])) {
+                signingServiceError(
+                  signingServiceName,
+                  `Key set (${JSON.stringify(jwkSet)}) has no "keys"`
+                );
+                return false;
+              }
+              jwkSet['keys'].forEach(jwk => {
+                if (!jwk || typeof jwk['kid'] != 'string') {
+                  signingServiceError(
+                    signingServiceName,
+                    `Key (${JSON.stringify(jwk)}) has no "kid"`
+                  );
+                } else if (keys[jwk['kid']] === undefined) {
+                  // We haven't seen this keypair ID before.
+                  keys[jwk['kid']] = Services.cryptoFor(this.win_)
+                    .importPkcsKey(jwk)
+                    .catch(err => {
+                      // Web Cryptography rejected the key
+                      // import attempt. Either the signing
+                      // service sent a malformed key or the
+                      // browser is doing something weird.
+                      const jwkData = JSON.stringify(jwk);
+                      const message = err && err.message;
                       signingServiceError(
-                          signingServiceName,
-                          `Key set (${JSON.stringify(jwkSet)}) has no "keys"`);
-                      return false;
-                    }
-                    jwkSet['keys'].forEach(jwk => {
-                      if (!jwk || typeof jwk['kid'] != 'string') {
-                        signingServiceError(
-                            signingServiceName,
-                            `Key (${JSON.stringify(jwk)}) has no "kid"`);
-                      } else if (keys[jwk['kid']] === undefined) {
-                        // We haven't seen this keypair ID before.
-                        keys[jwk['kid']] =
-                            Services.cryptoFor(this.win_).importPkcsKey(jwk)
-                                .catch(err => {
-                                  // Web Cryptography rejected the key
-                                  // import attempt. Either the signing
-                                  // service sent a malformed key or the
-                                  // browser is doing something weird.
-                                  const jwkData = JSON.stringify(jwk);
-                                  const message = err && err.message;
-                                  signingServiceError(
-                                      signingServiceName,
-                                      `Failed to import key (${
-                                        jwkData
-                                      }): ${message}`);
-                                  return null;
-                                });
-                      }
-                    });
-                    return true;
-                  },
-                  err => {
-                    // The signing service didn't send valid JSON.
-                    signingServiceError(
                         signingServiceName,
-                        `Failed to parse JSON: ${err && err.response}`);
-                    return false;
-                  });
+                        `Failed to import key (${jwkData}): ${message}`
+                      );
+                      return null;
+                    });
+                }
+              });
+              return true;
             },
             err => {
-              // Some kind of error occurred during the XHR. This could be a lot
-              // of things (and we have no type information), but if there's no
-              // `response` it's probably a network connectivity failure, so we
-              // ignore it. Unfortunately, we can't distinguish this from a CORS
-              // problem.
-              if (err && err.response) {
-                // This probably indicates a non-2xx HTTP status code.
-                signingServiceError(
-                    signingServiceName, `Status code ${err.response.status}`);
-              }
+              // The signing service didn't send valid JSON.
+              signingServiceError(
+                signingServiceName,
+                `Failed to parse JSON: ${err && err.response}`
+              );
               return false;
-            });
+            }
+          );
+        },
+        err => {
+          // Some kind of error occurred during the XHR. This could be a lot
+          // of things (and we have no type information), but if there's no
+          // `response` it's probably a network connectivity failure, so we
+          // ignore it. Unfortunately, we can't distinguish this from a CORS
+          // problem.
+          if (err && err.response) {
+            // This probably indicates a non-2xx HTTP status code.
+            signingServiceError(
+              signingServiceName,
+              `Status code ${err.response.status}`
+            );
+          }
+          return false;
+        }
+      );
   }
 }
 
@@ -389,5 +415,7 @@ export class SignatureVerifier {
  */
 function signingServiceError(signingServiceName, message) {
   dev().error(
-      'AMP-A4A', `Signing service error for ${signingServiceName}: ${message}`);
+    'AMP-A4A',
+    `Signing service error for ${signingServiceName}: ${message}`
+  );
 }
diff --git a/extensions/amp-a4a/0.1/template-renderer.js b/extensions/amp-a4a/0.1/template-renderer.js
index 6bad018f8476..eac63ebffd30 100644
--- a/extensions/amp-a4a/0.1/template-renderer.js
+++ b/extensions/amp-a4a/0.1/template-renderer.js
@@ -29,12 +29,10 @@ import {renderCreativeIntoFriendlyFrame} from './friendly-frame-util';
  */
 export let CreativeData;
 
-
 /**
  * Render AMP creative into FriendlyFrame via templatization.
  */
 export class TemplateRenderer extends Renderer {
-
   /**
    * Constructs a TemplateRenderer instance.
    */
@@ -44,7 +42,6 @@ export class TemplateRenderer extends Renderer {
 
   /** @override */
   render(context, element, creativeData) {
-
     creativeData = /** @type {CreativeData} */ (creativeData);
 
     const {size, adUrl} = context;
@@ -54,29 +51,34 @@ export class TemplateRenderer extends Renderer {
     devAssert(adUrl, 'missing ad request url');
 
     return renderCreativeIntoFriendlyFrame(
-        adUrl, size, element, creativeMetadata)
-        .then(iframe => {
-          const templateData =
-          /** @type {!./amp-ad-type-defs.AmpTemplateCreativeDef} */ (
-              creativeData.templateData);
-          const {data} = templateData;
-          if (!data) {
-            return Promise.resolve();
+      adUrl,
+      size,
+      element,
+      creativeMetadata
+    ).then(iframe => {
+      const templateData =
+        /** @type {!./amp-ad-type-defs.AmpTemplateCreativeDef} */ (creativeData.templateData);
+      const {data} = templateData;
+      if (!data) {
+        return Promise.resolve();
+      }
+      const templateHelper = getAmpAdTemplateHelper(context.win);
+      return templateHelper
+        .render(data, iframe.contentWindow.document.body)
+        .then(renderedElement => {
+          const {analytics} = templateData;
+          if (analytics) {
+            templateHelper.insertAnalytics(renderedElement, analytics);
           }
-          const templateHelper = getAmpAdTemplateHelper(context.win);
-          return templateHelper
-              .render(data, iframe.contentWindow.document.body)
-              .then(renderedElement => {
-                const {analytics} = templateData;
-                if (analytics) {
-                  templateHelper.insertAnalytics(renderedElement, analytics);
-                }
-                // This element must exist, or #render() would have thrown.
-                const templateElement = iframe.contentWindow.document
-                    .querySelector('template');
-                templateElement.parentNode
-                    .replaceChild(renderedElement, templateElement);
-              });
+          // This element must exist, or #render() would have thrown.
+          const templateElement = iframe.contentWindow.document.querySelector(
+            'template'
+          );
+          templateElement.parentNode.replaceChild(
+            renderedElement,
+            templateElement
+          );
         });
+    });
   }
 }
diff --git a/extensions/amp-a4a/0.1/template-validator.js b/extensions/amp-a4a/0.1/template-validator.js
index f82e139c394d..426c0c8c1dfa 100644
--- a/extensions/amp-a4a/0.1/template-validator.js
+++ b/extensions/amp-a4a/0.1/template-validator.js
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  AdResponseType,
-  Validator,
-  ValidatorResult,
-} from './amp-ad-type-defs';
+import {AdResponseType, Validator, ValidatorResult} from './amp-ad-type-defs';
 import {AmpAdTemplateHelper} from '../../amp-a4a/0.1/amp-ad-template-helper';
 import {Services} from '../../../src/services';
 import {getAmpAdMetadata} from './amp-ad-utils';
@@ -40,8 +36,9 @@ let ampAdTemplateHelper;
  * @return {!AmpAdTemplateHelper}
  */
 export function getAmpAdTemplateHelper(win) {
-  return ampAdTemplateHelper ||
-      (ampAdTemplateHelper = new AmpAdTemplateHelper(win));
+  return (
+    ampAdTemplateHelper || (ampAdTemplateHelper = new AmpAdTemplateHelper(win))
+  );
 }
 
 /**
@@ -50,55 +47,64 @@ export function getAmpAdTemplateHelper(win) {
 export class TemplateValidator extends Validator {
   /** @override */
   validate(context, unvalidatedBytes, headers) {
-
     const body = utf8Decode(/** @type {!ArrayBuffer} */ (unvalidatedBytes));
-    const parsedResponseBody =
-    /** @type {./amp-ad-type-defs.AmpTemplateCreativeDef} */ (
-        tryParseJson(body));
+    const parsedResponseBody = /** @type {./amp-ad-type-defs.AmpTemplateCreativeDef} */ (tryParseJson(
+      body
+    ));
 
     // If we're missing the relevant header, or headers altogether, we cannot
     // proceed. In this case, we return a NON_AMP response, since we cannot
     // ensure this template will be valid AMP. We will pass the body of the
     // response as the creative, and downstream renderers may attempt to render
     // it as a non-AMP creative within a cross-domain iframe.
-    if (!parsedResponseBody || !headers ||
-        (headers.get(AMP_TEMPLATED_CREATIVE_HEADER_NAME) !== 'amp-mustache' &&
-         headers.get(DEPRECATED_AMP_TEMPLATED_CREATIVE_HEADER_NAME) !==
-           'amp-mustache')) {
+    if (
+      !parsedResponseBody ||
+      !headers ||
+      (headers.get(AMP_TEMPLATED_CREATIVE_HEADER_NAME) !== 'amp-mustache' &&
+        headers.get(DEPRECATED_AMP_TEMPLATED_CREATIVE_HEADER_NAME) !==
+          'amp-mustache')
+    ) {
       return Promise.resolve(
-          /** @type {!./amp-ad-type-defs.ValidatorOutput} */ ({
-            creativeData: {
-              creative: body,
-            },
-            adResponseType: AdResponseType.TEMPLATE,
-            type: ValidatorResult.NON_AMP,
-          }));
+        /** @type {!./amp-ad-type-defs.ValidatorOutput} */ ({
+          creativeData: {
+            creative: body,
+          },
+          adResponseType: AdResponseType.TEMPLATE,
+          type: ValidatorResult.NON_AMP,
+        })
+      );
     }
 
     return getAmpAdTemplateHelper(context.win)
-        .fetch(parsedResponseBody.templateUrl)
-        .then(template => {
-          const creativeMetadata = getAmpAdMetadata(template);
-          if (parsedResponseBody.analytics) {
-            pushIfNotExist(
-                creativeMetadata['customElementExtensions'], 'amp-analytics');
-          }
+      .fetch(parsedResponseBody.templateUrl)
+      .then(template => {
+        const creativeMetadata = getAmpAdMetadata(template);
+        if (parsedResponseBody.analytics) {
           pushIfNotExist(
-              creativeMetadata['customElementExtensions'], 'amp-mustache');
+            creativeMetadata['customElementExtensions'],
+            'amp-analytics'
+          );
+        }
+        pushIfNotExist(
+          creativeMetadata['customElementExtensions'],
+          'amp-mustache'
+        );
 
-          const extensions = Services.extensionsFor(context.win);
-          creativeMetadata.customElementExtensions.forEach(
-              extensionId => extensions./*OK*/preloadExtension(extensionId));
-          // TODO(levitzky) Add preload logic for fonts / images.
-          return Promise.resolve(
-              /** @type {!./amp-ad-type-defs.ValidatorOutput} */ ({
-                creativeData: {
-                  templateData: parsedResponseBody,
-                  creativeMetadata,
-                },
-                adResponseType: AdResponseType.TEMPLATE,
-                type: ValidatorResult.AMP,
-              }));
-        });
+        const extensions = Services.extensionsFor(context.win);
+        creativeMetadata.customElementExtensions.forEach(extensionId =>
+          extensions./*OK*/ preloadExtension(extensionId)
+        );
+        // TODO(levitzky) Add preload logic for fonts / images.
+        return Promise.resolve(
+          /** @type {!./amp-ad-type-defs.ValidatorOutput} */ ({
+            creativeData: {
+              templateData: parsedResponseBody,
+              creativeMetadata,
+            },
+            adResponseType: AdResponseType.TEMPLATE,
+            type: ValidatorResult.AMP,
+          })
+        );
+      });
   }
 }
diff --git a/extensions/amp-a4a/0.1/test/fetch-mock.js b/extensions/amp-a4a/0.1/test/fetch-mock.js
index 1a07d00822a6..8ed3abb914c0 100644
--- a/extensions/amp-a4a/0.1/test/fetch-mock.js
+++ b/extensions/amp-a4a/0.1/test/fetch-mock.js
@@ -41,7 +41,6 @@ export let MockResponse;
  * it. The window is stubbed when this class's constructor is called.
  */
 export class FetchMock {
-
   /** @param {!Window} win */
   constructor(win) {
     /** @private {!Window} */
@@ -116,17 +115,18 @@ export class FetchMock {
     }
     route.called = true;
     return Promise.resolve(
-        typeof route.response == 'function' ?
-          route.response() : route.response)
-        .then(data => {
-          if (data === null || typeof data == 'string') {
-            return new Response(data);
-          } else {
-            const {body, status, headers} = data;
-            return new Response(body, /** @type {!ResponseInit} */ (
-              {status, headers}));
-          }
-        });
+      typeof route.response == 'function' ? route.response() : route.response
+    ).then(data => {
+      if (data === null || typeof data == 'string') {
+        return new Response(data);
+      } else {
+        const {body, status, headers} = data;
+        return new Response(
+          body,
+          /** @type {!ResponseInit} */ ({status, headers})
+        );
+      }
+    });
   }
 }
 
diff --git a/extensions/amp-a4a/0.1/test/test-a4a-integration.js b/extensions/amp-a4a/0.1/test/test-a4a-integration.js
index 10c413ea1349..e64030a27d1c 100644
--- a/extensions/amp-a4a/0.1/test/test-a4a-integration.js
+++ b/extensions/amp-a4a/0.1/test/test-a4a-integration.js
@@ -32,9 +32,7 @@ import {
   resetScheduledElementForTesting,
   upgradeOrRegisterElement,
 } from '../../../../src/service/custom-element-registry';
-import {
-  data as validCSSAmp,
-} from './testdata/valid_css_at_rules_amp.reserialized';
+import {data as validCSSAmp} from './testdata/valid_css_at_rules_amp.reserialized';
 
 // Integration tests for A4A.  These stub out accesses to the outside world
 // (e.g., XHR requests and interfaces to ad network-specific code), but
@@ -70,8 +68,10 @@ function expectRenderedInXDomainIframe(element, src) {
   // Note: Unlike expectRenderedInXDomainIframe, this doesn't return a Promise
   // because it doesn't (cannot) inspect the contents of the iframe.
   expect(element, 'ad element').to.be.ok;
-  expect(element.querySelector('iframe[srcdoc]'),
-      'does not have a friendly iframe child').to.not.be.ok;
+  expect(
+    element.querySelector('iframe[srcdoc]'),
+    'does not have a friendly iframe child'
+  ).to.not.be.ok;
   const child = element.querySelector('iframe[src]');
   expect(child, 'iframe child').to.be.ok;
   expect(child.getAttribute('src')).to.contain.string(src);
@@ -89,7 +89,9 @@ describe('integration test: a4a', () => {
   beforeEach(() => {
     sandbox = sinon.sandbox;
     a4aRegistry = getA4ARegistry();
-    a4aRegistry['mock'] = () => {return true;};
+    a4aRegistry['mock'] = () => {
+      return true;
+    };
     return createIframePromise().then(f => {
       fixture = f;
       fetchMock = new FetchMock(fixture.win);
@@ -100,8 +102,10 @@ describe('integration test: a4a', () => {
         });
       }
       fetchMock.getOnce(
-          TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-          {name: 'ad'});
+        TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+        () => adResponse,
+        {name: 'ad'}
+      );
       adResponse = {
         headers: {'AMP-Access-Control-Allow-Source-Origin': 'about:srcdoc'},
         body: validCSSAmp.reserialized,
@@ -119,7 +123,7 @@ describe('integration test: a4a', () => {
   });
 
   afterEach(() => {
-    fetchMock./*OK*/restore();
+    fetchMock./*OK*/ restore();
     sandbox.restore();
     resetScheduledElementForTesting(window, 'amp-a4a');
     delete a4aRegistry['mock'];
@@ -151,8 +155,10 @@ describe('integration test: a4a', () => {
     // TODO(tdrl) Currently layoutCallback rejects, even though something *is*
     // rendered.  This should be fixed in a refactor, and we should change this
     // .catch to a .then.
-    const forceCollapseStub =
-        sandbox.spy(MockA4AImpl.prototype, 'forceCollapse');
+    const forceCollapseStub = sandbox.spy(
+      MockA4AImpl.prototype,
+      'forceCollapse'
+    );
     return fixture.addElement(a4aElement).catch(error => {
       expect(error.message).to.contain.string('Testing network error');
       expect(error.message).to.contain.string('AMP-A4A-');
@@ -164,49 +170,57 @@ describe('integration test: a4a', () => {
   it('should collapse slot when creative response has code 204', () => {
     adResponse.status = 204;
     adResponse.body = null;
-    const forceCollapseStub =
-        sandbox.spy(MockA4AImpl.prototype, 'forceCollapse');
+    const forceCollapseStub = sandbox.spy(
+      MockA4AImpl.prototype,
+      'forceCollapse'
+    );
     return fixture.addElement(a4aElement).then(() => {
       expect(forceCollapseStub).to.be.calledOnce;
     });
   });
 
-  it('should collapse slot when creative response.arrayBuffer() is empty',
-      () => {
-        adResponse.body = '';
-        const forceCollapseStub =
-            sandbox.spy(MockA4AImpl.prototype, 'forceCollapse');
-        return fixture.addElement(a4aElement).then(unusedElement => {
-          expect(forceCollapseStub).to.be.calledOnce;
-        });
-      });
+  it('should collapse slot when creative response.arrayBuffer() is empty', () => {
+    adResponse.body = '';
+    const forceCollapseStub = sandbox.spy(
+      MockA4AImpl.prototype,
+      'forceCollapse'
+    );
+    return fixture.addElement(a4aElement).then(unusedElement => {
+      expect(forceCollapseStub).to.be.calledOnce;
+    });
+  });
 
   it('should continue to show old creative after refresh and no fill', () => {
     return fixture.addElement(a4aElement).then(() => {
-      return expectRenderedInFriendlyIframe(a4aElement, 'Hello, world.')
-          .then(() => {
-            const a4a = new MockA4AImpl(a4aElement);
-            const initiateAdRequestMock = sandbox.stub(
-                MockA4AImpl.prototype, 'initiateAdRequest').callsFake(
-                () => {
-                  a4a.adPromise_ = Promise.resolve();
-                  // This simulates calling forceCollapse, without tripping
-                  // up any unrelated asserts.
-                  a4a.isRefreshing = false;
-                });
-            const tearDownSlotMock =
-                sandbox.stub(MockA4AImpl.prototype, 'tearDownSlot');
-            tearDownSlotMock.returns(undefined);
-            const destroyFrameSpy =
-                sandbox.spy(MockA4AImpl.prototype, 'destroyFrame');
-            const callback = sandbox.spy();
-            return a4a.refresh(callback).then(() => {
-              expect(initiateAdRequestMock).to.be.called;
-              expect(tearDownSlotMock).to.be.called;
-              expect(destroyFrameSpy).to.not.be.called;
-              expect(callback).to.be.called;
+      return expectRenderedInFriendlyIframe(a4aElement, 'Hello, world.').then(
+        () => {
+          const a4a = new MockA4AImpl(a4aElement);
+          const initiateAdRequestMock = sandbox
+            .stub(MockA4AImpl.prototype, 'initiateAdRequest')
+            .callsFake(() => {
+              a4a.adPromise_ = Promise.resolve();
+              // This simulates calling forceCollapse, without tripping
+              // up any unrelated asserts.
+              a4a.isRefreshing = false;
             });
+          const tearDownSlotMock = sandbox.stub(
+            MockA4AImpl.prototype,
+            'tearDownSlot'
+          );
+          tearDownSlotMock.returns(undefined);
+          const destroyFrameSpy = sandbox.spy(
+            MockA4AImpl.prototype,
+            'destroyFrame'
+          );
+          const callback = sandbox.spy();
+          return a4a.refresh(callback).then(() => {
+            expect(initiateAdRequestMock).to.be.called;
+            expect(tearDownSlotMock).to.be.called;
+            expect(destroyFrameSpy).to.not.be.called;
+            expect(callback).to.be.called;
           });
+        }
+      );
     });
   });
 
diff --git a/extensions/amp-a4a/0.1/test/test-a4a-var-source.js b/extensions/amp-a4a/0.1/test/test-a4a-var-source.js
index 40112a8534c4..82059773b9b6 100644
--- a/extensions/amp-a4a/0.1/test/test-a4a-var-source.js
+++ b/extensions/amp-a4a/0.1/test/test-a4a-var-source.js
@@ -16,12 +16,9 @@
 
 import {A4AVariableSource} from '../a4a-variable-source';
 import {createIframePromise} from '../../../../testing/iframe';
-import {installDocumentInfoServiceForDoc} from
-  '../../../../src/service/document-info-impl';
-
+import {installDocumentInfoServiceForDoc} from '../../../../src/service/document-info-impl';
 
 describe('A4AVariableSource', () => {
-
   let varSource;
 
   beforeEach(() => {
@@ -49,8 +46,9 @@ describe('A4AVariableSource', () => {
   });
 
   it('should replace CANONICAL_URL', () => {
-    expect(expandSync('CANONICAL_URL'))
-        .to.equal('https://pinterest.com:8080/pin1');
+    expect(expandSync('CANONICAL_URL')).to.equal(
+      'https://pinterest.com:8080/pin1'
+    );
   });
 
   it('should replace NAV_TIMING', () => {
@@ -70,7 +68,8 @@ describe('A4AVariableSource', () => {
 
   it('should replace HTML_ATTR', () => {
     expect(expandSync('HTML_ATTR', ['div', 'id'])).to.equal(
-        '[{\"id\":\"parent\"}]');
+      '[{"id":"parent"}]'
+    );
   });
 
   it('should replace CLIENT_ID with null', () => {
diff --git a/extensions/amp-a4a/0.1/test/test-amp-a4a.js b/extensions/amp-a4a/0.1/test/test-amp-a4a.js
index 150b6a519aad..708e28f6f9c1 100644
--- a/extensions/amp-a4a/0.1/test/test-amp-a4a.js
+++ b/extensions/amp-a4a/0.1/test/test-amp-a4a.js
@@ -42,9 +42,7 @@ import {FetchMock, networkFailure} from './fetch-mock';
 import {FriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed';
 import {LayoutPriority} from '../../../../src/layout';
 import {MockA4AImpl, TEST_URL} from './utils';
-import {
-  RealTimeConfigManager,
-} from '../real-time-config-manager';
+import {RealTimeConfigManager} from '../real-time-config-manager';
 import {
   SINGLE_PASS_EXPERIMENT_IDS,
   isInExperiment,
@@ -63,20 +61,22 @@ import {
 } from '../../../amp-ad/0.1/concurrent-load';
 import {installDocService} from '../../../../src/service/ampdoc-impl';
 import {layoutRectLtwh} from '../../../../src/layout-rect';
-import {
-  resetScheduledElementForTesting,
-} from '../../../../src/service/custom-element-registry';
+import {resetScheduledElementForTesting} from '../../../../src/service/custom-element-registry';
 import {data as testFragments} from './testdata/test_fragments';
 import {toggleExperiment} from '../../../../src/experiments';
-import {
-  data as validCSSAmp,
-} from './testdata/valid_css_at_rules_amp.reserialized';
+import {data as validCSSAmp} from './testdata/valid_css_at_rules_amp.reserialized';
 
 describe('amp-a4a', () => {
-  const IFRAME_SANDBOXING_FLAGS = ['allow-forms', 'allow-modals',
-    'allow-pointer-lock', 'allow-popups', 'allow-popups-to-escape-sandbox',
-    'allow-same-origin', 'allow-scripts',
-    'allow-top-navigation-by-user-activation'];
+  const IFRAME_SANDBOXING_FLAGS = [
+    'allow-forms',
+    'allow-modals',
+    'allow-pointer-lock',
+    'allow-popups',
+    'allow-popups-to-escape-sandbox',
+    'allow-same-origin',
+    'allow-scripts',
+    'allow-top-navigation-by-user-activation',
+  ];
 
   let sandbox;
   let fetchMock;
@@ -89,10 +89,11 @@ describe('amp-a4a', () => {
   beforeEach(() => {
     sandbox = sinon.sandbox;
     fetchMock = null;
-    getSigningServiceNamesMock = sandbox.stub(AmpA4A.prototype,
-        'getSigningServiceNames');
-    onCreativeRenderSpy =
-        sandbox.spy(AmpA4A.prototype, 'onCreativeRender');
+    getSigningServiceNamesMock = sandbox.stub(
+      AmpA4A.prototype,
+      'getSigningServiceNames'
+    );
+    onCreativeRenderSpy = sandbox.spy(AmpA4A.prototype, 'onCreativeRender');
     getSigningServiceNamesMock.returns(['google']);
     viewerWhenVisibleMock = sandbox.stub(Viewer.prototype, 'whenFirstVisible');
     viewerWhenVisibleMock.returns(Promise.resolve());
@@ -112,7 +113,7 @@ describe('amp-a4a', () => {
 
   afterEach(() => {
     if (fetchMock) {
-      fetchMock./*OK*/restore();
+      fetchMock./*OK*/ restore();
       fetchMock = null;
     }
     sandbox.restore();
@@ -127,11 +128,13 @@ describe('amp-a4a', () => {
     expect(fetchMock).to.be.null;
     fetchMock = new FetchMock(fixture.win);
     fetchMock.getOnce(
-        'https://cdn.ampproject.org/amp-ad-verifying-keyset.json', {
-          body: validCSSAmp.publicKeyset,
-          status: 200,
-          headers: {'Content-Type': 'application/jwk-set+json'},
-        });
+      'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
+      {
+        body: validCSSAmp.publicKeyset,
+        status: 200,
+        headers: {'Content-Type': 'application/jwk-set+json'},
+      }
+    );
     installDocService(fixture.win, /* isSingleDoc */ true);
     const {doc} = fixture;
     // TODO(a4a-cam@): This is necessary in the short term, until A4A is
@@ -158,14 +161,18 @@ describe('amp-a4a', () => {
       const ampdocService = Services.ampdocServiceFor(doc.defaultView);
       return ampdocService.getAmpDoc(element);
     };
-    element.isBuilt = () => {return true;};
+    element.isBuilt = () => {
+      return true;
+    };
     element.getLayoutBox = () => {
       return opt_rect || layoutRectLtwh(0, 0, 200, 50);
     };
     element.getPageLayoutBox = () => {
       return element.getLayoutBox.apply(element, arguments);
     };
-    element.getIntersectionChangeEntry = () => {return null;};
+    element.getIntersectionChangeEntry = () => {
+      return null;
+    };
     const signals = new Signals();
     element.signals = () => signals;
     element.renderStarted = () => {
@@ -187,10 +194,13 @@ describe('amp-a4a', () => {
       baseTestDoc.lastIndexOf('</script>') + '</script>'.length,
     ];
     const splicePoint = baseTestDoc.indexOf('</body>');
-    return baseTestDoc.slice(0, splicePoint) +
-        '<script type="application/json" amp-ad-metadata>' +
-        JSON.stringify(offsets) + '</script>' +
-        baseTestDoc.slice(splicePoint);
+    return (
+      baseTestDoc.slice(0, splicePoint) +
+      '<script type="application/json" amp-ad-metadata>' +
+      JSON.stringify(offsets) +
+      '</script>' +
+      baseTestDoc.slice(splicePoint)
+    );
   }
 
   /**
@@ -205,7 +215,8 @@ describe('amp-a4a', () => {
     const friendlyChild = element.querySelector('iframe[srcdoc]');
     expect(friendlyChild).to.be.ok;
     expect(friendlyChild.getAttribute('srcdoc')).to.have.string(
-        '<html ⚡4ads>');
+      '<html ⚡4ads>'
+    );
     expect(element).to.be.visible;
     expect(friendlyChild).to.be.visible;
   }
@@ -220,7 +231,8 @@ describe('amp-a4a', () => {
     expect(!!sandboxAttribute).to.equal(shouldSandbox);
     if (shouldSandbox) {
       expect(sandboxAttribute.split(' ').sort()).to.jsonEqual(
-          IFRAME_SANDBOXING_FLAGS);
+        IFRAME_SANDBOXING_FLAGS
+      );
     }
   }
 
@@ -234,8 +246,10 @@ describe('amp-a4a', () => {
     expect(element.tagName.toLowerCase()).to.equal('amp-a4a');
     expect(element).to.be.visible;
     expect(element.querySelectorAll('iframe')).to.have.lengthOf(1);
-    const safeFrameUrl = 'https://tpc.googlesyndication.com/safeframe/' +
-      sfVersion + '/html/container.html';
+    const safeFrameUrl =
+      'https://tpc.googlesyndication.com/safeframe/' +
+      sfVersion +
+      '/html/container.html';
     const child = element.querySelector(`iframe[src^="${safeFrameUrl}"][name]`);
     expect(child).to.be.ok;
     const name = child.getAttribute('name');
@@ -283,8 +297,11 @@ describe('amp-a4a', () => {
    * @param {string} srcUrl
    * @param {boolean=} shouldSandbox
    */
-  function verifyCachedContentIframeRender(element, srcUrl,
-    shouldSandbox = false) {
+  function verifyCachedContentIframeRender(
+    element,
+    srcUrl,
+    shouldSandbox = false
+  ) {
     expect(element.tagName.toLowerCase()).to.equal('amp-a4a');
     expect(element).to.be.visible;
     expect(element.querySelectorAll('iframe')).to.have.lengthOf(1);
@@ -301,7 +318,9 @@ describe('amp-a4a', () => {
   /** @param {string} nameData */
   function verifyNameData(nameData) {
     let attributes;
-    expect(() => {attributes = JSON.parse(nameData);}).not.to.throw(Error);
+    expect(() => {
+      attributes = JSON.parse(nameData);
+    }).not.to.throw(Error);
     expect(attributes).to.be.ok;
     verifyContext(attributes._context);
   }
@@ -312,28 +331,44 @@ describe('amp-a4a', () => {
    * @param {(string|Array<string>)=} additionalEvents
    */
   function verifyA4aAnalyticsTriggersWereFired(
-    a4a, triggerAnalyticsEventSpy, additionalEvents = []) {
-    ['ad-request-start', 'ad-response-end', 'ad-render-start',
-      'ad-render-end', 'ad-iframe-loaded'].concat(additionalEvents)
-        .forEach(evnt => expect(triggerAnalyticsEventSpy).to.be.calledWith(
-            a4a.element, evnt, {'time': sinon.match.number}));
+    a4a,
+    triggerAnalyticsEventSpy,
+    additionalEvents = []
+  ) {
+    [
+      'ad-request-start',
+      'ad-response-end',
+      'ad-render-start',
+      'ad-render-end',
+      'ad-iframe-loaded',
+    ]
+      .concat(additionalEvents)
+      .forEach(evnt =>
+        expect(triggerAnalyticsEventSpy).to.be.calledWith(a4a.element, evnt, {
+          'time': sinon.match.number,
+        })
+      );
   }
 
   describe('ads are visible', () => {
     let a4aElement;
     let a4a;
     let fixture;
-    beforeEach(() => createIframePromise().then(f => {
-      fixture = f;
-      setupForAdTesting(fixture);
-      fetchMock.getOnce(
-          TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-          {name: 'ad'});
-      a4aElement = createA4aElement(fixture.doc);
-      a4a = new MockA4AImpl(a4aElement);
-      a4a.releaseType_ = '0';
-      return fixture;
-    }));
+    beforeEach(() =>
+      createIframePromise().then(f => {
+        fixture = f;
+        setupForAdTesting(fixture);
+        fetchMock.getOnce(
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
+        a4aElement = createA4aElement(fixture.doc);
+        a4a = new MockA4AImpl(a4aElement);
+        a4a.releaseType_ = '0';
+        return fixture;
+      })
+    );
 
     it('for SafeFrame rendering case', () => {
       // Make sure there's no signature, so that we go down the 3p iframe path.
@@ -342,8 +377,10 @@ describe('amp-a4a', () => {
       // If rendering type is safeframe, we SHOULD attach a SafeFrame.
       adResponse.headers[RENDERING_TYPE_HEADER] = 'safeframe';
       a4a.buildCallback();
-      const lifecycleEventStub =
-          sandbox.stub(a4a, 'maybeTriggerAnalyticsEvent_');
+      const lifecycleEventStub = sandbox.stub(
+        a4a,
+        'maybeTriggerAnalyticsEvent_'
+      );
       a4a.onLayoutMeasure();
       return a4a.layoutCallback().then(() => {
         const child = a4aElement.querySelector('iframe[name]');
@@ -395,8 +432,9 @@ describe('amp-a4a', () => {
       return a4a.layoutCallback().then(() => {
         const child = a4aElement.querySelector('iframe[srcdoc]');
         expect(child).to.be.ok;
-        expect(child.srcdoc.indexOf('meta http-equiv=Content-Security-Policy'))
-            .to.not.equal(-1);
+        expect(
+          child.srcdoc.indexOf('meta http-equiv=Content-Security-Policy')
+        ).to.not.equal(-1);
       });
     });
 
@@ -416,8 +454,10 @@ describe('amp-a4a', () => {
     });
 
     it('detachedCallback should destroy FIE and detach frame', () => {
-      const fieDestroySpy =
-          sandbox./*OK*/spy(FriendlyIframeEmbed.prototype, 'destroy');
+      const fieDestroySpy = sandbox./*OK*/ spy(
+        FriendlyIframeEmbed.prototype,
+        'destroy'
+      );
       a4a.buildCallback();
       a4a.onLayoutMeasure();
       return a4a.layoutCallback().then(() => {
@@ -432,8 +472,11 @@ describe('amp-a4a', () => {
       a4a.onLayoutMeasure();
 
       // Never resolve
-      sandbox.stub/*OK*/(FriendlyIframeEmbed.prototype,'whenIniLoaded')
-          .callsFake(() => {return new Promise(() => {});});
+      sandbox
+        ./*OK*/ stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .callsFake(() => {
+          return new Promise(() => {});
+        });
       const creativeString = buildCreativeString();
       const metaData = a4a.getAmpAdMetadata(creativeString);
       return a4a.renderAmpCreative_(metaData).then(() => {
@@ -447,13 +490,14 @@ describe('amp-a4a', () => {
       const iniLoadPromise = new Promise(resolve => {
         iniLoadResolver = resolve;
       });
-      const whenIniLoadedStub = sandbox.stub(
-          FriendlyIframeEmbed.prototype,
-          'whenIniLoaded').callsFake(
-          () => iniLoadPromise);
+      const whenIniLoadedStub = sandbox
+        .stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .callsFake(() => iniLoadPromise);
       a4a.buildCallback();
-      const triggerAnalyticsEventSpy =
-          sandbox.spy(analytics, 'triggerAnalyticsEvent');
+      const triggerAnalyticsEventSpy = sandbox.spy(
+        analytics,
+        'triggerAnalyticsEvent'
+      );
       a4a.onLayoutMeasure();
       const layoutPromise = a4a.layoutCallback();
       expect(whenIniLoadedStub).to.not.be.called;
@@ -483,8 +527,9 @@ describe('amp-a4a', () => {
     });
 
     it('for requests from insecure HTTP pages', () => {
-      sandbox.stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
-          .returns(false);
+      sandbox
+        .stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
+        .returns(false);
       a4a.buildCallback();
       a4a.onLayoutMeasure();
       return a4a.layoutCallback().then(() => {
@@ -496,23 +541,29 @@ describe('amp-a4a', () => {
     });
 
     it('should fire amp-analytics triggers', () => {
-      const triggerAnalyticsEventSpy =
-          sandbox.spy(analytics, 'triggerAnalyticsEvent');
+      const triggerAnalyticsEventSpy = sandbox.spy(
+        analytics,
+        'triggerAnalyticsEvent'
+      );
       a4a.buildCallback();
       a4a.onLayoutMeasure();
-      sandbox.stub/*OK*/(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
-          .callsFake(() => Promise.resolve());
+      sandbox
+        ./*OK*/ stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .callsFake(() => Promise.resolve());
       return a4a.layoutCallback().then(() => {
         verifyA4aAnalyticsTriggersWereFired(a4a, triggerAnalyticsEventSpy);
       });
     });
 
     it('should not fire amp-analytics triggers without config', () => {
-      sandbox.stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig').callsFake(
-          () => null);
+      sandbox
+        .stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig')
+        .callsFake(() => null);
       a4a = new MockA4AImpl(a4aElement);
-      const triggerAnalyticsEventSpy =
-          sandbox.spy(analytics, 'triggerAnalyticsEvent');
+      const triggerAnalyticsEventSpy = sandbox.spy(
+        analytics,
+        'triggerAnalyticsEvent'
+      );
       a4a.buildCallback();
       a4a.onLayoutMeasure();
       return a4a.layoutCallback().then(() => {
@@ -521,22 +572,31 @@ describe('amp-a4a', () => {
     });
 
     it('should insert an amp-analytics element', () => {
-      sandbox.stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig').callsFake(
-          () => ({'foo': 'bar'}));
+      sandbox
+        .stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig')
+        .callsFake(() => ({'foo': 'bar'}));
       a4a = new MockA4AImpl(a4aElement);
-      const insertAnalyticsElementSpy =
-          sandbox.spy(analyticsExtension, 'insertAnalyticsElement');
+      const insertAnalyticsElementSpy = sandbox.spy(
+        analyticsExtension,
+        'insertAnalyticsElement'
+      );
       a4a.buildCallback();
       expect(insertAnalyticsElementSpy).to.be.calledWith(
-          a4a.element, {'foo': 'bar'}, true /* loadAnalytics */);
+        a4a.element,
+        {'foo': 'bar'},
+        true /* loadAnalytics */
+      );
     });
 
     it('should not insert an amp-analytics element if config is null', () => {
-      sandbox.stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig').callsFake(
-          () => null);
+      sandbox
+        .stub(MockA4AImpl.prototype, 'getA4aAnalyticsConfig')
+        .callsFake(() => null);
       a4a = new MockA4AImpl(a4aElement);
-      const insertAnalyticsElementSpy =
-          sandbox.spy(analyticsExtension, 'insertAnalyticsElement');
+      const insertAnalyticsElementSpy = sandbox.spy(
+        analyticsExtension,
+        'insertAnalyticsElement'
+      );
       a4a.buildCallback();
       expect(insertAnalyticsElementSpy).not.to.be.called;
     });
@@ -546,16 +606,20 @@ describe('amp-a4a', () => {
     let a4aElement;
     let a4a;
     let fixture;
-    beforeEach(() => createIframePromise().then(f => {
-      fixture = f;
-      setupForAdTesting(fixture);
-      fetchMock.getOnce(
-          TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-          {name: 'ad'});
-      a4aElement = createA4aElement(fixture.doc);
-      a4a = new MockA4AImpl(a4aElement);
-      return fixture;
-    }));
+    beforeEach(() =>
+      createIframePromise().then(f => {
+        fixture = f;
+        setupForAdTesting(fixture);
+        fetchMock.getOnce(
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
+        a4aElement = createA4aElement(fixture.doc);
+        a4a = new MockA4AImpl(a4aElement);
+        return fixture;
+      })
+    );
 
     it('when unlayoutCallback called after adPromise', () => {
       a4a.buildCallback();
@@ -567,16 +631,20 @@ describe('amp-a4a', () => {
       const layoutCallbackPromise = a4a.layoutCallback();
       a4a.unlayoutCallback();
       const renderNonAmpCreativeSpy = sandbox.spy(
-          AmpA4A.prototype, 'renderNonAmpCreative');
+        AmpA4A.prototype,
+        'renderNonAmpCreative'
+      );
       promiseResolver();
-      layoutCallbackPromise.then(() => {
-        // We should never get in here.
-        expect(false).to.be.true;
-      }).catch(err => {
-        expect(renderNonAmpCreativeSpy).to.not.be.called;
-        expect(err).to.be.ok;
-        expect(err.message).to.equal('CANCELLED');
-      });
+      layoutCallbackPromise
+        .then(() => {
+          // We should never get in here.
+          expect(false).to.be.true;
+        })
+        .catch(err => {
+          expect(renderNonAmpCreativeSpy).to.not.be.called;
+          expect(err).to.be.ok;
+          expect(err.message).to.equal('CANCELLED');
+        });
     });
 
     it('when unlayoutCallback called before renderAmpCreative_', () => {
@@ -590,13 +658,15 @@ describe('amp-a4a', () => {
       a4a.unlayoutCallback();
 
       promiseResolver();
-      layoutCallbackPromise.then(() => {
-        // We should never get in here.
-        expect(false).to.be.true;
-      }).catch(err => {
-        expect(err).to.be.ok;
-        expect(err.message).to.equal('CANCELLED');
-      });
+      layoutCallbackPromise
+        .then(() => {
+          // We should never get in here.
+          expect(false).to.be.true;
+        })
+        .catch(err => {
+          expect(err).to.be.ok;
+          expect(err.message).to.equal('CANCELLED');
+        });
     });
   });
 
@@ -612,8 +682,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         a4aElement = createA4aElement(doc);
         a4a = new MockA4AImpl(a4aElement);
@@ -643,8 +715,11 @@ describe('amp-a4a', () => {
         a4a.sandboxHTMLCreativeFrame = () => true;
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          verifyCachedContentIframeRender(a4aElement, TEST_URL,
-              true /* shouldSandbox */);
+          verifyCachedContentIframeRender(
+            a4aElement,
+            TEST_URL,
+            true /* shouldSandbox */
+          );
           expect(fetchMock.called('ad')).to.be.true;
         });
       });
@@ -653,13 +728,16 @@ describe('amp-a4a', () => {
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          verifyCachedContentIframeRender(a4aElement, TEST_URL,
-              false /* shouldSandbox */);
+          verifyCachedContentIframeRender(
+            a4aElement,
+            TEST_URL,
+            false /* shouldSandbox */
+          );
           expect(fetchMock.called('ad')).to.be.true;
         });
       });
 
-      it('shouldn\'t set feature policy for sync-xhr with exp off-a4a', () => {
+      it("shouldn't set feature policy for sync-xhr with exp off-a4a", () => {
         a4a.sandboxHTMLCreativeFrame = () => true;
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
@@ -674,8 +752,7 @@ describe('amp-a4a', () => {
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
           verifyCachedContentIframeRender(a4aElement, TEST_URL, true);
-          expect(a4a.iframe.getAttribute('allow'))
-              .to.equal('sync-xhr \'none\';');
+          expect(a4a.iframe.getAttribute('allow')).to.equal("sync-xhr 'none';");
         });
       });
     });
@@ -691,26 +768,40 @@ describe('amp-a4a', () => {
       });
 
       it('should render via cached iframe', () => {
-        const triggerAnalyticsEventSpy =
-            sandbox.spy(analytics, 'triggerAnalyticsEvent');
+        const triggerAnalyticsEventSpy = sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
         return a4a.layoutCallback().then(() => {
           verifyCachedContentIframeRender(a4aElement, TEST_URL);
           // Should have reported an error.
           expect(devErrLogStub).to.be.calledOnce;
           expect(devErrLogStub.getCall(0).args[1]).to.have.string(
-              'random illegal value');
+            'random illegal value'
+          );
           expect(fetchMock.called('ad')).to.be.true;
           verifyA4aAnalyticsTriggersWereFired(
-              a4a, triggerAnalyticsEventSpy, 'ad-iframe-loaded');
+            a4a,
+            triggerAnalyticsEventSpy,
+            'ad-iframe-loaded'
+          );
         });
       });
 
       it('should fire amp-analytics triggers for illegal render modes', () => {
-        const triggerAnalyticsEventSpy =
-            sandbox.spy(analytics, 'triggerAnalyticsEvent');
-        return a4a.layoutCallback().then(() =>
-          verifyA4aAnalyticsTriggersWereFired(
-              a4a, triggerAnalyticsEventSpy, 'ad-iframe-loaded'));
+        const triggerAnalyticsEventSpy = sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
+        return a4a
+          .layoutCallback()
+          .then(() =>
+            verifyA4aAnalyticsTriggersWereFired(
+              a4a,
+              triggerAnalyticsEventSpy,
+              'ad-iframe-loaded'
+            )
+          );
       });
     });
 
@@ -728,17 +819,20 @@ describe('amp-a4a', () => {
         });
       });
 
-      it('should make only one NameFrame even if onLayoutMeasure called ' +
-          'multiple times', () => {
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        return a4a.layoutCallback().then(() => {
-          verifyNameFrameRender(a4aElement);
-          expect(fetchMock.called('ad')).to.be.true;
-        });
-      });
+      it(
+        'should make only one NameFrame even if onLayoutMeasure called ' +
+          'multiple times',
+        () => {
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          return a4a.layoutCallback().then(() => {
+            verifyNameFrameRender(a4aElement);
+            expect(fetchMock.called('ad')).to.be.true;
+          });
+        }
+      );
 
       it('should apply sandbox when sandboxHTMLCreativeFrame is true', () => {
         a4a.sandboxHTMLCreativeFrame = () => true;
@@ -759,46 +853,59 @@ describe('amp-a4a', () => {
       });
 
       ['', 'client_cache', 'safeframe', 'some_random_thing'].forEach(
-          headerVal => {
-            it(`should not attach a NameFrame when header is ${headerVal}`,
-                () => {
-                  const devStub = sandbox.stub(dev(), 'error');
-                  // Make sure there's no signature, so that we go down the 3p
-                  // iframe path.
-                  delete adResponse.headers['AMP-Fast-Fetch-Signature'];
-                  delete adResponse.headers[AMP_SIGNATURE_HEADER];
-                  // If rendering type is anything but nameframe, we SHOULD NOT
-                  // attach a NameFrame.
-                  adResponse.headers[RENDERING_TYPE_HEADER] = headerVal;
-                  a4a.onLayoutMeasure();
-                  return a4a.layoutCallback().then(() => {
-                    if (headerVal == 'some_random_thing') {
-                      expect(devStub.withArgs('AMP-A4A',
-                          `cross-origin render mode header ${headerVal}`))
-                          .to.be.calledOnce;
-                    } else {
-                      expect(devStub).to.not.be.called;
-                    }
-                    const nameChild = a4aElement.querySelector(
-                        'iframe[src^="nameframe"]');
-                    expect(nameChild).to.not.be.ok;
-                    if (headerVal != 'safeframe') {
-                      const unsafeChild = a4aElement.querySelector('iframe');
-                      expect(unsafeChild).to.be.ok;
-                      expect(unsafeChild.getAttribute('src')).to.have.string(
-                          TEST_URL);
-                    }
-                    expect(fetchMock.called('ad')).to.be.true;
-                  });
-                });
+        headerVal => {
+          it(`should not attach a NameFrame when header is ${headerVal}`, () => {
+            const devStub = sandbox.stub(dev(), 'error');
+            // Make sure there's no signature, so that we go down the 3p
+            // iframe path.
+            delete adResponse.headers['AMP-Fast-Fetch-Signature'];
+            delete adResponse.headers[AMP_SIGNATURE_HEADER];
+            // If rendering type is anything but nameframe, we SHOULD NOT
+            // attach a NameFrame.
+            adResponse.headers[RENDERING_TYPE_HEADER] = headerVal;
+            a4a.onLayoutMeasure();
+            return a4a.layoutCallback().then(() => {
+              if (headerVal == 'some_random_thing') {
+                expect(
+                  devStub.withArgs(
+                    'AMP-A4A',
+                    `cross-origin render mode header ${headerVal}`
+                  )
+                ).to.be.calledOnce;
+              } else {
+                expect(devStub).to.not.be.called;
+              }
+              const nameChild = a4aElement.querySelector(
+                'iframe[src^="nameframe"]'
+              );
+              expect(nameChild).to.not.be.ok;
+              if (headerVal != 'safeframe') {
+                const unsafeChild = a4aElement.querySelector('iframe');
+                expect(unsafeChild).to.be.ok;
+                expect(unsafeChild.getAttribute('src')).to.have.string(
+                  TEST_URL
+                );
+              }
+              expect(fetchMock.called('ad')).to.be.true;
+            });
           });
+        }
+      );
 
       it('should fire amp-analytics triggers for lifecycle stages', () => {
-        const triggerAnalyticsEventSpy =
-            sandbox.spy(analytics, 'triggerAnalyticsEvent');
-        return a4a.layoutCallback().then(() =>
-          verifyA4aAnalyticsTriggersWereFired(
-              a4a, triggerAnalyticsEventSpy, 'ad-iframe-loaded'));
+        const triggerAnalyticsEventSpy = sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
+        return a4a
+          .layoutCallback()
+          .then(() =>
+            verifyA4aAnalyticsTriggersWereFired(
+              a4a,
+              triggerAnalyticsEventSpy,
+              'ad-iframe-loaded'
+            )
+          );
       });
     });
 
@@ -824,24 +931,30 @@ describe('amp-a4a', () => {
         });
       });
 
-      it('should make only one SafeFrame even if onLayoutMeasure called ' +
-          'multiple times', () => {
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        return a4a.layoutCallback().then(() => {
-          verifySafeFrameRender(a4aElement, DEFAULT_SAFEFRAME_VERSION);
-          expect(fetchMock.called('ad')).to.be.true;
-        });
-      });
+      it(
+        'should make only one SafeFrame even if onLayoutMeasure called ' +
+          'multiple times',
+        () => {
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          return a4a.layoutCallback().then(() => {
+            verifySafeFrameRender(a4aElement, DEFAULT_SAFEFRAME_VERSION);
+            expect(fetchMock.called('ad')).to.be.true;
+          });
+        }
+      );
 
       it('should apply sandbox when sandboxHTMLCreativeFrame is true', () => {
         a4a.sandboxHTMLCreativeFrame = () => true;
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          verifySafeFrameRender(a4aElement, DEFAULT_SAFEFRAME_VERSION,
-              true /* shouldSandbox */);
+          verifySafeFrameRender(
+            a4aElement,
+            DEFAULT_SAFEFRAME_VERSION,
+            true /* shouldSandbox */
+          );
           expect(fetchMock.called('ad')).to.be.true;
         });
       });
@@ -850,49 +963,60 @@ describe('amp-a4a', () => {
         a4a.sandboxHTMLCreativeFrame = () => false;
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          verifySafeFrameRender(a4aElement, DEFAULT_SAFEFRAME_VERSION,
-              false /* shouldSandbox */);
+          verifySafeFrameRender(
+            a4aElement,
+            DEFAULT_SAFEFRAME_VERSION,
+            false /* shouldSandbox */
+          );
           expect(fetchMock.called('ad')).to.be.true;
         });
       });
 
       ['', 'client_cache', 'nameframe', 'some_random_thing'].forEach(
-          headerVal => {
-            it(`should not attach a SafeFrame when header is ${headerVal}`,
-                () => {
-                  const devStub = sandbox.stub(dev(), 'error');
-                  // If rendering type is anything but safeframe, we SHOULD NOT
-                  // attach a SafeFrame.
-                  adResponse.headers[RENDERING_TYPE_HEADER] = headerVal;
-                  a4a.onLayoutMeasure();
-                  return a4a.layoutCallback().then(() => {
-                    if (headerVal == 'some_random_thing') {
-                      expect(devStub.withArgs('AMP-A4A',
-                          `cross-origin render mode header ${headerVal}`))
-                          .to.be.calledOnce;
-                    } else {
-                      expect(devStub).to.not.be.called;
-                    }
-                    const safeframeUrl = 'https://tpc.googlesyndication.com/safeframe/' +
-                      DEFAULT_SAFEFRAME_VERSION + '/html/container.html';
-                    const safeChild = a4aElement.querySelector(
-                        `iframe[src^="${safeframeUrl}"]`);
-                    expect(safeChild).to.not.be.ok;
-                    if (headerVal != 'nameframe') {
-                      const unsafeChild = a4aElement.querySelector('iframe');
-                      expect(unsafeChild).to.be.ok;
-                      expect(unsafeChild.getAttribute('src')).to.have.string(
-                          TEST_URL);
-                    }
-                    expect(fetchMock.called('ad')).to.be.true;
-                  });
-                });
+        headerVal => {
+          it(`should not attach a SafeFrame when header is ${headerVal}`, () => {
+            const devStub = sandbox.stub(dev(), 'error');
+            // If rendering type is anything but safeframe, we SHOULD NOT
+            // attach a SafeFrame.
+            adResponse.headers[RENDERING_TYPE_HEADER] = headerVal;
+            a4a.onLayoutMeasure();
+            return a4a.layoutCallback().then(() => {
+              if (headerVal == 'some_random_thing') {
+                expect(
+                  devStub.withArgs(
+                    'AMP-A4A',
+                    `cross-origin render mode header ${headerVal}`
+                  )
+                ).to.be.calledOnce;
+              } else {
+                expect(devStub).to.not.be.called;
+              }
+              const safeframeUrl =
+                'https://tpc.googlesyndication.com/safeframe/' +
+                DEFAULT_SAFEFRAME_VERSION +
+                '/html/container.html';
+              const safeChild = a4aElement.querySelector(
+                `iframe[src^="${safeframeUrl}"]`
+              );
+              expect(safeChild).to.not.be.ok;
+              if (headerVal != 'nameframe') {
+                const unsafeChild = a4aElement.querySelector('iframe');
+                expect(unsafeChild).to.be.ok;
+                expect(unsafeChild.getAttribute('src')).to.have.string(
+                  TEST_URL
+                );
+              }
+              expect(fetchMock.called('ad')).to.be.true;
+            });
           });
+        }
+      );
 
       it('should reset state to null on unlayoutCallback', () => {
         return a4a.layoutCallback().then(() => {
-          expect(a4a.experimentalNonAmpCreativeRenderMethod_)
-              .to.equal('safeframe');
+          expect(a4a.experimentalNonAmpCreativeRenderMethod_).to.equal(
+            'safeframe'
+          );
           a4a.unlayoutCallback();
           expect(a4a.experimentalNonAmpCreativeRenderMethod_).to.be.null;
           expect(fetchMock.called('ad')).to.be.true;
@@ -900,11 +1024,19 @@ describe('amp-a4a', () => {
       });
 
       it('should fire amp-analytics triggers for lifecycle stages', () => {
-        const triggerAnalyticsEventSpy =
-            sandbox.spy(analytics, 'triggerAnalyticsEvent');
-        return a4a.layoutCallback().then(() =>
-          verifyA4aAnalyticsTriggersWereFired(
-              a4a, triggerAnalyticsEventSpy, 'ad-iframe-loaded'));
+        const triggerAnalyticsEventSpy = sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
+        return a4a
+          .layoutCallback()
+          .then(() =>
+            verifyA4aAnalyticsTriggersWereFired(
+              a4a,
+              triggerAnalyticsEventSpy,
+              'ad-iframe-loaded'
+            )
+          );
       });
     });
   });
@@ -912,15 +1044,19 @@ describe('amp-a4a', () => {
   describe('cross-domain vs A4A', () => {
     let a4a;
     let a4aElement;
-    beforeEach(() => createIframePromise().then(fixture => {
-      setupForAdTesting(fixture);
-      fetchMock.getOnce(
-          TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-          {name: 'ad'});
-      const {doc} = fixture;
-      a4aElement = createA4aElement(doc);
-      a4a = new MockA4AImpl(a4aElement);
-    }));
+    beforeEach(() =>
+      createIframePromise().then(fixture => {
+        setupForAdTesting(fixture);
+        fetchMock.getOnce(
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
+        const {doc} = fixture;
+        a4aElement = createA4aElement(doc);
+        a4a = new MockA4AImpl(a4aElement);
+      })
+    );
     afterEach(() => {
       expect(fetchMock.called('ad')).to.be.true;
     });
@@ -935,25 +1071,29 @@ describe('amp-a4a', () => {
         });
       });
 
-      it(`should not use ${renderType} even if onLayoutMeasure called ` +
-          'multiple times', () => {
-        adResponse.headers[RENDERING_TYPE_HEADER] = renderType;
-        a4a.buildCallback();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        a4a.onLayoutMeasure();
-        return a4a.layoutCallback().then(() => {
-          const safeChild = a4aElement.querySelector('iframe[name]');
-          expect(safeChild).to.not.be.ok;
-          const crossDomainChild = a4aElement.querySelector('iframe[src]');
-          expect(crossDomainChild).to.not.be.ok;
-          const friendlyChild = a4aElement.querySelector('iframe[srcdoc]');
-          expect(friendlyChild).to.be.ok;
-          expect(friendlyChild.getAttribute('srcdoc')).to.have.string(
-              '<html ⚡4ads>');
-        });
-      });
+      it(
+        `should not use ${renderType} even if onLayoutMeasure called ` +
+          'multiple times',
+        () => {
+          adResponse.headers[RENDERING_TYPE_HEADER] = renderType;
+          a4a.buildCallback();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          a4a.onLayoutMeasure();
+          return a4a.layoutCallback().then(() => {
+            const safeChild = a4aElement.querySelector('iframe[name]');
+            expect(safeChild).to.not.be.ok;
+            const crossDomainChild = a4aElement.querySelector('iframe[src]');
+            expect(crossDomainChild).to.not.be.ok;
+            const friendlyChild = a4aElement.querySelector('iframe[srcdoc]');
+            expect(friendlyChild).to.be.ok;
+            expect(friendlyChild.getAttribute('srcdoc')).to.have.string(
+              '<html ⚡4ads>'
+            );
+          });
+        }
+      );
     });
   });
 
@@ -965,8 +1105,10 @@ describe('amp-a4a', () => {
     return createIframePromise().then(fixture => {
       setupForAdTesting(fixture);
       fetchMock.getOnce(
-          TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-          {name: 'ad'});
+        TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+        () => adResponse,
+        {name: 'ad'}
+      );
       const {doc} = fixture;
       const a4aElement = createA4aElement(doc);
       a4aElement.setAttribute('width', 480);
@@ -994,26 +1136,33 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const s = doc.createElement('style');
         s.textContent = '.fixed {position:fixed;}';
         doc.head.appendChild(s);
         const a4a = new MockA4AImpl(a4aElement);
-        const renderNonAmpCreativeSpy =
-          sandbox.spy(a4a, 'renderNonAmpCreative');
+        const renderNonAmpCreativeSpy = sandbox.spy(
+          a4a,
+          'renderNonAmpCreative'
+        );
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.ok;
         return a4a.layoutCallback().then(() => {
-          expect(renderNonAmpCreativeSpy.calledOnce,
-              'renderNonAmpCreative called exactly once').to.be.true;
+          expect(
+            renderNonAmpCreativeSpy.calledOnce,
+            'renderNonAmpCreative called exactly once'
+          ).to.be.true;
           a4a.unlayoutCallback();
           getResourceStub.returns({
             'hasBeenMeasured': () => true,
-            'isMeasureRequested': () => false});
+            'isMeasureRequested': () => false,
+          });
           const onLayoutMeasureSpy = sandbox.spy(a4a, 'onLayoutMeasure');
           a4a.resumeCallback();
           expect(onLayoutMeasureSpy).to.be.calledOnce;
@@ -1025,8 +1174,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const s = doc.createElement('style');
@@ -1038,8 +1189,10 @@ describe('amp-a4a', () => {
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.ok;
         return a4a.layoutCallback().then(() => {
-          expect(renderAmpCreativeSpy.calledOnce,
-              'renderAmpCreative_ called exactly once').to.be.true;
+          expect(
+            renderAmpCreativeSpy.calledOnce,
+            'renderAmpCreative_ called exactly once'
+          ).to.be.true;
           sandbox.stub(a4a, 'unlayoutCallback').callsFake(() => false);
           const onLayoutMeasureSpy = sandbox.spy(a4a, 'onLayoutMeasure');
           a4a.resumeCallback();
@@ -1055,22 +1208,28 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const s = doc.createElement('style');
         s.textContent = '.fixed {position:fixed;}';
         doc.head.appendChild(s);
         const a4a = new MockA4AImpl(a4aElement);
-        const renderNonAmpCreativeSpy =
-          sandbox.spy(a4a, 'renderNonAmpCreative');
+        const renderNonAmpCreativeSpy = sandbox.spy(
+          a4a,
+          'renderNonAmpCreative'
+        );
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.ok;
         return a4a.layoutCallback().then(() => {
-          expect(renderNonAmpCreativeSpy.calledOnce,
-              'renderNonAmpCreative called exactly once').to.be.true;
+          expect(
+            renderNonAmpCreativeSpy.calledOnce,
+            'renderNonAmpCreative called exactly once'
+          ).to.be.true;
           a4a.unlayoutCallback();
           const onLayoutMeasureSpy = sandbox.spy(a4a, 'onLayoutMeasure');
           getResourceStub.returns({'hasBeenMeasured': () => false});
@@ -1084,28 +1243,41 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         a4a.releaseType_ = '0';
         const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
-        const rtcResponse = Promise.resolve(
-            [{response: 'a', rtcTime: 1, callout: 'https://a.com'}]);
-        const maybeExecuteRealTimeConfigStub = sandbox.stub().returns(
-            rtcResponse);
+        const rtcResponse = Promise.resolve([
+          {response: 'a', rtcTime: 1, callout: 'https://a.com'},
+        ]);
+        const maybeExecuteRealTimeConfigStub = sandbox
+          .stub()
+          .returns(rtcResponse);
         AMP.RealTimeConfigManager = RealTimeConfigManager;
-        sandbox.stub(AMP.RealTimeConfigManager.prototype,
-            'maybeExecuteRealTimeConfig').callsFake(
-            maybeExecuteRealTimeConfigStub);
-        const tryExecuteRealTimeConfigSpy =
-              sandbox.spy(a4a, 'tryExecuteRealTimeConfig_');
+        sandbox
+          .stub(
+            AMP.RealTimeConfigManager.prototype,
+            'maybeExecuteRealTimeConfig'
+          )
+          .callsFake(maybeExecuteRealTimeConfigStub);
+        const tryExecuteRealTimeConfigSpy = sandbox.spy(
+          a4a,
+          'tryExecuteRealTimeConfig_'
+        );
         const updateLayoutPriorityStub = sandbox.stub(
-            a4a, 'updateLayoutPriority');
+          a4a,
+          'updateLayoutPriority'
+        );
         const renderAmpCreativeSpy = sandbox.spy(a4a, 'renderAmpCreative_');
-        const preloadExtensionSpy =
-            sandbox.spy(Extensions.prototype, 'preloadExtension');
+        const preloadExtensionSpy = sandbox.spy(
+          Extensions.prototype,
+          'preloadExtension'
+        );
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.instanceof(Promise);
@@ -1115,49 +1287,62 @@ describe('amp-a4a', () => {
           expect(a4a.isVerifiedAmpCreative()).to.be.true;
           expect(tryExecuteRealTimeConfigSpy.calledOnce).to.be.true;
           expect(maybeExecuteRealTimeConfigStub.calledOnce).to.be.true;
-          expect(maybeExecuteRealTimeConfigStub.calledWith(
-              {}, null)).to.be.true;
-          expect(getAdUrlSpy.calledOnce, 'getAdUrl called exactly once')
-              .to.be.true;
+          expect(maybeExecuteRealTimeConfigStub.calledWith({}, null)).to.be
+            .true;
+          expect(getAdUrlSpy.calledOnce, 'getAdUrl called exactly once').to.be
+            .true;
           expect(getAdUrlSpy.calledWith(null, rtcResponse)).to.be.true;
           expect(fetchMock.called('ad')).to.be.true;
           expect(preloadExtensionSpy.withArgs('amp-font')).to.be.calledOnce;
-          expect(doc.querySelector('link[rel=preload]' +
-            '[href="https://fonts.googleapis.com/css?family=Questrial"]'))
-              .to.be.ok;
+          expect(
+            doc.querySelector(
+              'link[rel=preload]' +
+                '[href="https://fonts.googleapis.com/css?family=Questrial"]'
+            )
+          ).to.be.ok;
           return a4a.layoutCallback().then(() => {
-            expect(renderAmpCreativeSpy.calledOnce,
-                'renderAmpCreative_ called exactly once').to.be.true;
-            expect(a4aElement.getElementsByTagName('iframe').length)
-                .to.equal(1);
+            expect(
+              renderAmpCreativeSpy.calledOnce,
+              'renderAmpCreative_ called exactly once'
+            ).to.be.true;
+            expect(a4aElement.getElementsByTagName('iframe').length).to.equal(
+              1
+            );
             const friendlyIframe = a4aElement.querySelector('iframe[srcdoc]');
             expect(friendlyIframe).to.not.be.null;
             expect(friendlyIframe.getAttribute('src')).to.be.null;
             const expectedAttributes = {
-              'frameborder': '0', 'allowfullscreen': '',
-              'allowtransparency': '', 'scrolling': 'no'};
+              'frameborder': '0',
+              'allowfullscreen': '',
+              'allowtransparency': '',
+              'scrolling': 'no',
+            };
             Object.keys(expectedAttributes).forEach(key => {
               expect(friendlyIframe.getAttribute(key)).to.equal(
-                  expectedAttributes[key]);
+                expectedAttributes[key]
+              );
             });
             // Should not contain v0.js, any extensions, or amp-boilerplate.
             const iframeDoc = friendlyIframe.contentDocument;
             expect(iframeDoc.querySelector('script[src]')).to.not.be.ok;
-            expect(iframeDoc.querySelector('script[custom-element]'))
-                .to.not.be.ok;
-            expect(iframeDoc.querySelector('style[amp-boilerplate]'))
-                .to.not.be.ok;
+            expect(iframeDoc.querySelector('script[custom-element]')).to.not.be
+              .ok;
+            expect(iframeDoc.querySelector('style[amp-boilerplate]')).to.not.be
+              .ok;
             expect(iframeDoc.querySelector('noscript')).to.not.be.ok;
             // Should contain font link and extension in main document.
-            expect(iframeDoc.querySelector(
-                'link[href="https://fonts.googleapis.com/css?family=Questrial"]'))
-                .to.be.ok;
+            expect(
+              iframeDoc.querySelector(
+                'link[href="https://fonts.googleapis.com/css?family=Questrial"]'
+              )
+            ).to.be.ok;
             expect(doc.querySelector('script[src*="amp-font-0.1"]')).to.be.ok;
-            expect(onCreativeRenderSpy.withArgs(sinon.match.object))
-                .to.be.calledOnce;
+            expect(onCreativeRenderSpy.withArgs(sinon.match.object)).to.be
+              .calledOnce;
             expect(updateLayoutPriorityStub).to.be.calledOnce;
             expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-                LayoutPriority.CONTENT);
+              LayoutPriority.CONTENT
+            );
           });
         });
       });
@@ -1168,26 +1353,36 @@ describe('amp-a4a', () => {
         delete adResponse.headers['AMP-Fast-Fetch-Signature'];
         delete adResponse.headers[AMP_SIGNATURE_HEADER];
         adResponse.headers[EXPERIMENT_FEATURE_HEADER_NAME] =
-            'pref_neutral_enabled=1,';
+          'pref_neutral_enabled=1,';
         adResponse.headers[CREATIVE_SIZE_HEADER] = '123x456';
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const element = createA4aElement(fixture.doc);
         element.setAttribute('type', 'adsense');
         const a4a = new MockA4AImpl(element);
         const updateLayoutPriorityStub = sandbox.stub(
-            a4a, 'updateLayoutPriority');
-        const renderNonAmpCreativeSpy =
-          sandbox.spy(a4a, 'renderNonAmpCreative');
-        sandbox.stub(a4a, 'maybeValidateAmpCreative').returns(
-            Promise.resolve());
+          a4a,
+          'updateLayoutPriority'
+        );
+        const renderNonAmpCreativeSpy = sandbox.spy(
+          a4a,
+          'renderNonAmpCreative'
+        );
+        sandbox
+          .stub(a4a, 'maybeValidateAmpCreative')
+          .returns(Promise.resolve());
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          expect(renderNonAmpCreativeSpy.calledOnce,
-              'renderNonAmpCreative_ called exactly once').to.be.true;
+          expect(
+            renderNonAmpCreativeSpy.calledOnce,
+            'renderNonAmpCreative_ called exactly once'
+          ).to.be.true;
           expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-              LayoutPriority.CONTENT);
+            LayoutPriority.CONTENT
+          );
           expect(is3pThrottled(a4a.win)).to.be.false;
         });
       });
@@ -1198,14 +1393,18 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         sandbox.stub(a4a, 'getAmpAdMetadata').callsFake(creative => {
-          const metaData = AmpA4A.prototype.getAmpAdMetadata.call(a4a,
-              creative);
+          const metaData = AmpA4A.prototype.getAmpAdMetadata.call(
+            a4a,
+            creative
+          );
           metaData.images = [
             'https://prefetch.me.com?a=b',
             'http://do.not.prefetch.me.com?c=d',
@@ -1216,12 +1415,21 @@ describe('amp-a4a', () => {
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          expect(doc.querySelector('link[rel=preload]' +
-            '[href="https://prefetch.me.com?a=b"]')).to.be.ok;
-          expect(doc.querySelector('link[rel=preload]' +
-            '[href="https://prefetch.metoo.com?e=f"]')).to.be.ok;
-          expect(doc.querySelector('link[rel=preload]' +
-            '[href="http://do.not.prefetch.me.com?c=d"]')).to.not.be.ok;
+          expect(
+            doc.querySelector(
+              'link[rel=preload][href="https://prefetch.me.com?a=b"]'
+            )
+          ).to.be.ok;
+          expect(
+            doc.querySelector(
+              'link[rel=preload][href="https://prefetch.metoo.com?e=f"]'
+            )
+          ).to.be.ok;
+          expect(
+            doc.querySelector(
+              'link[rel=preload][href="http://do.not.prefetch.me.com?c=d"]'
+            )
+          ).to.not.be.ok;
         });
       });
     });
@@ -1229,8 +1437,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const s = doc.createElement('style');
@@ -1246,8 +1456,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const rect = layoutRectLtwh(0, 0, 200, 0);
         const a4aElement = createA4aElement(doc, rect);
@@ -1276,29 +1488,34 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
         const updateLayoutPriorityStub = sandbox.stub(
-            a4a, 'updateLayoutPriority');
+          a4a,
+          'updateLayoutPriority'
+        );
         if (!isValidCreative) {
           delete adResponse.headers['AMP-Fast-Fetch-Signature'];
           delete adResponse.headers[AMP_SIGNATURE_HEADER];
         }
         a4a.promiseErrorHandler_ = () => {};
         if (opt_failAmpRender) {
-          sandbox.stub(a4a, 'renderAmpCreative_').returns(
-              Promise.reject('amp render failure'));
+          sandbox
+            .stub(a4a, 'renderAmpCreative_')
+            .returns(Promise.reject('amp render failure'));
         }
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.instanceof(Promise);
         return a4a.adPromise_.then(promiseResult => {
-          expect(getAdUrlSpy.calledOnce, 'getAdUrl called exactly once')
-              .to.be.true;
+          expect(getAdUrlSpy.calledOnce, 'getAdUrl called exactly once').to.be
+            .true;
           expect(fetchMock.called('ad')).to.be.true;
           expect(a4a.isVerifiedAmpCreative()).to.equal(isValidCreative);
           if (isValidCreative) {
@@ -1308,21 +1525,23 @@ describe('amp-a4a', () => {
             expect(promiseResult).to.not.be.ok;
           }
           return a4a.layoutCallback().then(() => {
-            expect(a4aElement.getElementsByTagName('iframe').length)
-                .to.not.equal(0);
+            expect(
+              a4aElement.getElementsByTagName('iframe').length
+            ).to.not.equal(0);
             const iframe = a4aElement.getElementsByTagName('iframe')[0];
             if (isValidCreative && !opt_failAmpRender) {
               expect(iframe.getAttribute('src')).to.be.null;
-              expect(onCreativeRenderSpy.withArgs(sinon.match.object))
-                  .to.be.calledOnce;
+              expect(onCreativeRenderSpy.withArgs(sinon.match.object)).to.be
+                .calledOnce;
               expect(updateLayoutPriorityStub).to.be.calledOnce;
               expect(updateLayoutPriorityStub.args[0][0]).to.equal(
-                  LayoutPriority.CONTENT);
+                LayoutPriority.CONTENT
+              );
             } else {
               expect(iframe.getAttribute('srcdoc')).to.be.null;
-              expect(iframe.src, 'verify iframe src w/ origin').to
-                  .equal(TEST_URL +
-                         '&__amp_source_origin=about%3Asrcdoc');
+              expect(iframe.src, 'verify iframe src w/ origin').to.equal(
+                TEST_URL + '&__amp_source_origin=about%3Asrcdoc'
+              );
               expect(onCreativeRenderSpy.withArgs(null)).to.be.called;
               if (!opt_failAmpRender) {
                 expect(updateLayoutPriorityStub).to.not.be.called;
@@ -1345,8 +1564,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            Promise.reject(networkFailure()), {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          Promise.reject(networkFailure()),
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -1357,8 +1578,8 @@ describe('amp-a4a', () => {
         expect(a4a.adPromise_).to.be.instanceof(Promise);
         return a4a.layoutCallback().then(() => {
           expect(getAdUrlSpy, 'getAdUrl called exactly once').to.be.calledOnce;
-          expect(onNetworkFailureSpy,
-              'onNetworkFailureSpy called exactly once').to.be.calledOnce;
+          expect(onNetworkFailureSpy, 'onNetworkFailureSpy called exactly once')
+            .to.be.calledOnce;
           // Verify iframe presence and lack of visibility hidden
           const iframe = a4aElement.querySelector('iframe[src]');
           expect(iframe).to.be.ok;
@@ -1372,17 +1593,24 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            Promise.reject(networkFailure()), {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          Promise.reject(networkFailure()),
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
-        sandbox.stub(a4a, 'onNetworkFailure')
-            .withArgs(sinon.match(val =>
-              val.message && val.message.indexOf('XHR Failed fetching') == 0),
-            TEST_URL)
-            .returns({adUrl: TEST_URL + '&err=true'});
+        sandbox
+          .stub(a4a, 'onNetworkFailure')
+          .withArgs(
+            sinon.match(
+              val =>
+                val.message && val.message.indexOf('XHR Failed fetching') == 0
+            ),
+            TEST_URL
+          )
+          .returns({adUrl: TEST_URL + '&err=true'});
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.instanceof(Promise);
@@ -1402,18 +1630,25 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            Promise.reject(networkFailure()), {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          Promise.reject(networkFailure()),
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         a4a.promiseErrorHandler_ = () => {};
         const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
-        sandbox.stub(a4a, 'onNetworkFailure')
-            .withArgs(sinon.match(val =>
-              val.message && val.message.indexOf('XHR Failed fetching') == 0),
-            TEST_URL)
-            .returns({frameGetDisabled: true});
+        sandbox
+          .stub(a4a, 'onNetworkFailure')
+          .withArgs(
+            sinon.match(
+              val =>
+                val.message && val.message.indexOf('XHR Failed fetching') == 0
+            ),
+            TEST_URL
+          )
+          .returns({frameGetDisabled: true});
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
@@ -1427,21 +1662,25 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            Promise.reject(networkFailure()), {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          Promise.reject(networkFailure()),
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         a4a.buildCallback();
         a4a.onLayoutMeasure();
-        return a4a.adPromise_.then(() => a4a.layoutCallback().then(() => {
-          // Verify iframe presence and lack of visibility hidden
-          expect(a4aElement.querySelectorAll('iframe').length).to.equal(1);
-          const iframe = a4aElement.querySelectorAll('iframe')[0];
-          expect(iframe.src.indexOf(TEST_URL)).to.equal(0);
-          expect(iframe).to.be.visible;
-          expect(onCreativeRenderSpy.withArgs(null)).to.be.called;
-        }));
+        return a4a.adPromise_.then(() =>
+          a4a.layoutCallback().then(() => {
+            // Verify iframe presence and lack of visibility hidden
+            expect(a4aElement.querySelectorAll('iframe').length).to.equal(1);
+            const iframe = a4aElement.querySelectorAll('iframe')[0];
+            expect(iframe.src.indexOf(TEST_URL)).to.equal(0);
+            expect(iframe).to.be.visible;
+            expect(onCreativeRenderSpy.withArgs(null)).to.be.called;
+          })
+        );
       });
     });
     it('should handle XHR error when resolves after layoutCallback', () => {
@@ -1449,11 +1688,12 @@ describe('amp-a4a', () => {
         setupForAdTesting(fixture);
         let rejectXhr;
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            new Promise((unusedResolve, reject) => {
-              rejectXhr = reject;
-            }),
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          new Promise((unusedResolve, reject) => {
+            rejectXhr = reject;
+          }),
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -1491,11 +1731,11 @@ describe('amp-a4a', () => {
       },
       {
         name: 'empty body',
-        fn: () => adResponse.body = '',
+        fn: () => (adResponse.body = ''),
       },
       {
         name: 'no fill header',
-        fn: () => adResponse.headers['amp-ff-empty-creative'] = '',
+        fn: () => (adResponse.headers['amp-ff-empty-creative'] = ''),
       },
     ].forEach(test => {
       it(`should collapse ${test.name}`, () => {
@@ -1503,9 +1743,10 @@ describe('amp-a4a', () => {
           setupForAdTesting(fixture);
           test.fn();
           fetchMock.getOnce(
-              TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-              adResponse,
-              {name: 'ad'});
+            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+            adResponse,
+            {name: 'ad'}
+          );
           const {doc} = fixture;
           const a4aElement = createA4aElement(doc);
           const a4a = new MockA4AImpl(a4aElement);
@@ -1514,11 +1755,14 @@ describe('amp-a4a', () => {
           const noContentUISpy = sandbox.spy();
           const unlayoutUISpy = sandbox.spy();
           a4a.uiHandler = {
-            applyNoContentUI: () => {noContentUISpy();},
-            applyUnlayoutUI: () => {unlayoutUISpy();},
+            applyNoContentUI: () => {
+              noContentUISpy();
+            },
+            applyUnlayoutUI: () => {
+              unlayoutUISpy();
+            },
           };
-          sandbox.stub(a4a, 'getLayoutBox').returns(
-              {width: 123, height: 456});
+          sandbox.stub(a4a, 'getLayoutBox').returns({width: 123, height: 456});
           a4a.onLayoutMeasure();
           expect(a4a.adPromise_).to.be.ok;
           return a4a.adPromise_.then(() => {
@@ -1529,21 +1773,26 @@ describe('amp-a4a', () => {
               expect(a4aElement.querySelector('iframe')).to.not.be.ok;
               expect(onCreativeRenderSpy).to.not.be.called;
               // call unlayout callback & verify it attempts to revert size
-              expect(a4a.originalSlotSize_).to.deep
-                  .equal({width: 123, height: 456});
+              expect(a4a.originalSlotSize_).to.deep.equal({
+                width: 123,
+                height: 456,
+              });
               let attemptChangeSizeResolver;
               const attemptChangeSizePromise = new Promise(resolve => {
                 attemptChangeSizeResolver = resolve;
               });
-              sandbox.stub(AMP.BaseElement.prototype, 'attemptChangeSize')
-                  .returns(attemptChangeSizePromise);
+              sandbox
+                .stub(AMP.BaseElement.prototype, 'attemptChangeSize')
+                .returns(attemptChangeSizePromise);
               a4a.unlayoutCallback();
               expect(unlayoutUISpy).to.be.calledOnce;
               expect(a4a.originalSlotSize_).to.be.ok;
               attemptChangeSizeResolver();
-              return Services.timerFor(a4a.win).promise(1).then(() => {
-                expect(a4a.originalSlotSize_).to.not.be.ok;
-              });
+              return Services.timerFor(a4a.win)
+                .promise(1)
+                .then(() => {
+                  expect(a4a.originalSlotSize_).to.not.be.ok;
+                });
             });
           });
         });
@@ -1558,8 +1807,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-            () => adResponse, {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -1570,9 +1821,13 @@ describe('amp-a4a', () => {
           return a4a.layoutCallback().then(() => {
             verifySafeFrameRender(a4aElement, '1-2-3');
             // Verify preload to safeframe with header version.
-            expect(doc.querySelector('link[rel=preload]' +
-              '[href="https://tpc.googlesyndication.com/safeframe/' +
-              '1-2-3/html/container.html"]')).to.be.ok;
+            expect(
+              doc.querySelector(
+                'link[rel=preload]' +
+                  '[href="https://tpc.googlesyndication.com/safeframe/' +
+                  '1-2-3/html/container.html"]'
+              )
+            ).to.be.ok;
           });
         });
       });
@@ -1585,65 +1840,69 @@ describe('amp-a4a', () => {
         return createIframePromise().then(fixture => {
           setupForAdTesting(fixture);
           fetchMock.getOnce(
-              TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
-              () => adResponse, {name: 'ad'});
+            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+            () => adResponse,
+            {name: 'ad'}
+          );
           const {doc} = fixture;
           const a4aElement = createA4aElement(doc);
           a4a = new MockA4AImpl(a4aElement);
           getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
         });
       });
-      it('should delay request until within renderOutsideViewport',() => {
+      it('should delay request until within renderOutsideViewport', () => {
         sandbox.stub(a4a, 'delayAdRequestEnabled').returns(true);
         let whenWithinViewportResolve;
-        getResourceStub.returns(
-            {
-              getUpgradeDelayMs: () => 1,
-              renderOutsideViewport: () => 3,
-              whenWithinViewport: viewport => {
-                expect(viewport).to.equal(3);
-                return new Promise(resolve => {
-                  whenWithinViewportResolve = resolve;
-                });
-              },
+        getResourceStub.returns({
+          getUpgradeDelayMs: () => 1,
+          renderOutsideViewport: () => 3,
+          whenWithinViewport: viewport => {
+            expect(viewport).to.equal(3);
+            return new Promise(resolve => {
+              whenWithinViewportResolve = resolve;
             });
+          },
+        });
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.instanceof(Promise);
         // Delay to all getAdUrl to potentially execute.
-        return Services.timerFor(a4a.win).promise(1).then(() => {
-          expect(getAdUrlSpy).to.not.be.called;
-          whenWithinViewportResolve();
-          return a4a.adPromise_.then(() => {
-            expect(getAdUrlSpy).to.be.calledOnce;
+        return Services.timerFor(a4a.win)
+          .promise(1)
+          .then(() => {
+            expect(getAdUrlSpy).to.not.be.called;
+            whenWithinViewportResolve();
+            return a4a.adPromise_.then(() => {
+              expect(getAdUrlSpy).to.be.calledOnce;
+            });
           });
-        });
       });
-      it('should delay request until numeric value',() => {
+      it('should delay request until numeric value', () => {
         sandbox.stub(a4a, 'delayAdRequestEnabled').returns(6);
         let whenWithinViewportResolve;
-        getResourceStub.returns(
-            {
-              getUpgradeDelayMs: () => 1,
-              renderOutsideViewport: () => 3,
-              whenWithinViewport: viewport => {
-                expect(viewport).to.equal(6);
-                return new Promise(resolve => {
-                  whenWithinViewportResolve = resolve;
-                });
-              },
+        getResourceStub.returns({
+          getUpgradeDelayMs: () => 1,
+          renderOutsideViewport: () => 3,
+          whenWithinViewport: viewport => {
+            expect(viewport).to.equal(6);
+            return new Promise(resolve => {
+              whenWithinViewportResolve = resolve;
             });
+          },
+        });
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         expect(a4a.adPromise_).to.be.instanceof(Promise);
         // Delay to all getAdUrl to potentially execute.
-        return Services.timerFor(a4a.win).promise(1).then(() => {
-          expect(getAdUrlSpy).to.not.be.called;
-          whenWithinViewportResolve();
-          return a4a.adPromise_.then(() => {
-            expect(getAdUrlSpy).to.be.calledOnce;
+        return Services.timerFor(a4a.win)
+          .promise(1)
+          .then(() => {
+            expect(getAdUrlSpy).to.not.be.called;
+            whenWithinViewportResolve();
+            return a4a.adPromise_.then(() => {
+              expect(getAdUrlSpy).to.be.calledOnce;
+            });
           });
-        });
       });
     });
     it('should ignore invalid safeframe version header', () => {
@@ -1654,8 +1913,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -1688,7 +1949,9 @@ describe('amp-a4a', () => {
           expect(preconnects).to.have.lengthOf(1);
           // AdSense origin.
           expect(preconnects[0]).to.have.property(
-              'href', 'https://googleads.g.doubleclick.net/');
+            'href',
+            'https://googleads.g.doubleclick.net/'
+          );
         });
       });
     });
@@ -1723,28 +1986,36 @@ describe('amp-a4a', () => {
     // fixed.
     it('should parse metadata with wrong opening tag', () => {
       const creative = buildCreativeString(metaData).replace(
-          '<script type="application/json" amp-ad-metadata>',
-          '<script type=application/json amp-ad-metadata>');
+        '<script type="application/json" amp-ad-metadata>',
+        '<script type=application/json amp-ad-metadata>'
+      );
       const actual = a4a.getAmpAdMetadata(creative);
-      const expected = Object.assign({
-        minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
-      }, metaData);
+      const expected = Object.assign(
+        {
+          minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
+        },
+        metaData
+      );
       expect(actual).to.deep.equal(expected);
     });
     it('should return null if metadata opening tag is (truly) wrong', () => {
       const creative = buildCreativeString(metaData).replace(
-          '<script type="application/json" amp-ad-metadata>',
-          '<script type=application/json" amp-ad-metadata>');
+        '<script type="application/json" amp-ad-metadata>',
+        '<script type=application/json" amp-ad-metadata>'
+      );
       expect(a4a.getAmpAdMetadata(creative)).to.be.null;
     });
 
     it('should return null if missing ampRuntimeUtf16CharOffsets', () => {
       const baseTestDoc = testFragments.minimalDocOneStyle;
       const splicePoint = baseTestDoc.indexOf('</body>');
-      expect(a4a.getAmpAdMetadata(
+      expect(
+        a4a.getAmpAdMetadata(
           baseTestDoc.slice(0, splicePoint) +
-        '<script type="application/json" amp-ad-metadata></script>' +
-        baseTestDoc.slice(splicePoint))).to.be.null;
+            '<script type="application/json" amp-ad-metadata></script>' +
+            baseTestDoc.slice(splicePoint)
+        )
+      ).to.be.null;
     });
     it('should return null if invalid extensions', () => {
       metaData.customElementExtensions = 'amp-vine';
@@ -1764,18 +2035,24 @@ describe('amp-a4a', () => {
     it('should not include amp images if not an array', () => {
       metaData.images = 'https://foo.com';
       const actual = a4a.getAmpAdMetadata(buildCreativeString(metaData));
-      const expected = Object.assign({
-        minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
-      }, metaData);
+      const expected = Object.assign(
+        {
+          minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
+        },
+        metaData
+      );
       delete expected.images;
       expect(actual).to.deep.equal(expected);
     });
     it('should tolerate missing images', () => {
       delete metaData.images;
       const actual = a4a.getAmpAdMetadata(buildCreativeString(metaData));
-      const expected = Object.assign({
-        minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
-      }, metaData);
+      const expected = Object.assign(
+        {
+          minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
+        },
+        metaData
+      );
       delete expected.images;
       expect(actual).to.deep.equal(expected);
     });
@@ -1783,22 +2060,25 @@ describe('amp-a4a', () => {
       while (metaData.images.length < 10) {
         metaData.images.push('https://another.image.com?abc=def');
       }
-      expect(a4a.getAmpAdMetadata(buildCreativeString(metaData)).images.length)
-          .to.equal(5);
+      expect(
+        a4a.getAmpAdMetadata(buildCreativeString(metaData)).images.length
+      ).to.equal(5);
     });
 
     it('should throw due to missing CTA type', () => {
       metaData.ctaUrl = 'http://foo.com';
       a4a.isSinglePageStoryAd = true;
-      expect(() => a4a.getAmpAdMetadata(buildCreativeString(metaData)))
-          .to.throw(new RegExp(INVALID_SPSA_RESPONSE));
+      expect(() =>
+        a4a.getAmpAdMetadata(buildCreativeString(metaData))
+      ).to.throw(new RegExp(INVALID_SPSA_RESPONSE));
     });
 
     it('should throw due to missing outlink', () => {
       metaData.ctaType = '0';
       a4a.isSinglePageStoryAd = true;
-      expect(() => a4a.getAmpAdMetadata(buildCreativeString(metaData)))
-          .to.throw(new RegExp(INVALID_SPSA_RESPONSE));
+      expect(() =>
+        a4a.getAmpAdMetadata(buildCreativeString(metaData))
+      ).to.throw(new RegExp(INVALID_SPSA_RESPONSE));
     });
 
     it('should set appropriate attributes and return metadata object', () => {
@@ -1806,9 +2086,12 @@ describe('amp-a4a', () => {
       metaData.ctaUrl = 'http://foo.com';
       a4a.isSinglePageStoryAd = true;
       const actual = a4a.getAmpAdMetadata(buildCreativeString(metaData));
-      const expected = Object.assign({
-        minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
-      }, metaData);
+      const expected = Object.assign(
+        {
+          minifiedCreative: testFragments.minimalDocOneStyleSrcDoc,
+        },
+        metaData
+      );
       delete expected.ctaType;
       delete expected.ctaUrl;
       expect(actual).to.deep.equal(expected);
@@ -1820,7 +2103,6 @@ describe('amp-a4a', () => {
   });
 
   describe('#maybeValidateAmpCreative', () => {
-
     let a4a;
     let verifier;
 
@@ -1876,7 +2158,9 @@ describe('amp-a4a', () => {
     });
     it('should return 1.25 if prefer-viewability-over-views', () => {
       a4aElement.setAttribute(
-          'data-loading-strategy', 'prefer-viewability-over-views');
+        'data-loading-strategy',
+        'prefer-viewability-over-views'
+      );
       expect(a4a.renderOutsideViewport()).to.equal(1.25);
       a4a.isVerifiedAmpCreative_ = true;
       expect(a4a.renderOutsideViewport()).to.equal(1.25);
@@ -1893,7 +2177,9 @@ describe('amp-a4a', () => {
         const {doc} = fixture;
         a4aElement = createA4aElement(doc);
         a4a = new AmpA4A(a4aElement);
-        sandbox.stub(a4a, 'getFallback').callsFake(() => {return true;});
+        sandbox.stub(a4a, 'getFallback').callsFake(() => {
+          return true;
+        });
         a4a.buildCallback();
         a4a.adUrl_ = 'https://nowhere.org';
       });
@@ -1908,44 +2194,54 @@ describe('amp-a4a', () => {
         expect(friendlyIframe.srcdoc).to.be.ok;
         const frameDoc = friendlyIframe.contentDocument;
         const styles = frameDoc.querySelectorAll('style[amp-custom]');
-        expect(Array.prototype.some.call(styles,
-            s => {
-              return s.innerHTML == 'p { background: green }';
-            }),
-        'Some style is "background: green"').to.be.true;
+        expect(
+          Array.prototype.some.call(styles, s => {
+            return s.innerHTML == 'p { background: green }';
+          }),
+          'Some style is "background: green"'
+        ).to.be.true;
         expect(frameDoc.body.innerHTML.trim()).to.equal('<p>some text</p>');
-        expect(Services.urlReplacementsForDoc(frameDoc.documentElement))
-            .to.not.equal(Services.urlReplacementsForDoc(a4aElement));
+        expect(
+          Services.urlReplacementsForDoc(frameDoc.documentElement)
+        ).to.not.equal(Services.urlReplacementsForDoc(a4aElement));
       });
     });
   });
 
   describe('#getLayoutPriority', () => {
-    describes.realWin('with shadow AmpDoc', {
-      amp: {
-        ampdoc: 'shadow',
+    describes.realWin(
+      'with shadow AmpDoc',
+      {
+        amp: {
+          ampdoc: 'shadow',
+        },
       },
-    }, env => {
-      it('should return priority of 1', () => {
-        const body = env.ampdoc.getBody();
-        const a4aElement = createA4aElement(env.win.document, null, body);
-        const a4a = new MockA4AImpl(a4aElement);
-        expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
-      });
-    });
+      env => {
+        it('should return priority of 1', () => {
+          const body = env.ampdoc.getBody();
+          const a4aElement = createA4aElement(env.win.document, null, body);
+          const a4a = new MockA4AImpl(a4aElement);
+          expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+        });
+      }
+    );
 
-    describes.realWin('with single AmpDoc', {
-      amp: {
-        ampdoc: 'single',
+    describes.realWin(
+      'with single AmpDoc',
+      {
+        amp: {
+          ampdoc: 'single',
+        },
       },
-    }, env => {
-      it('should return priority of 2', () => {
-        const body = env.ampdoc.getBody();
-        const a4aElement = createA4aElement(env.win.document, null, body);
-        const a4a = new MockA4AImpl(a4aElement);
-        expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.ADS);
-      });
-    });
+      env => {
+        it('should return priority of 2', () => {
+          const body = env.ampdoc.getBody();
+          const a4aElement = createA4aElement(env.win.document, null, body);
+          const a4a = new MockA4AImpl(a4aElement);
+          expect(a4a.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+        });
+      }
+    );
   });
 
   describe('#unlayoutCallback', () => {
@@ -1953,8 +2249,10 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -1970,15 +2268,19 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
+          TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+          () => adResponse,
+          {name: 'ad'}
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
         a4a.buildCallback();
         a4a.onLayoutMeasure();
-        const attemptChangeSizeStub =
-          sandbox.stub(AMP.BaseElement.prototype, 'attemptChangeSize');
+        const attemptChangeSizeStub = sandbox.stub(
+          AMP.BaseElement.prototype,
+          'attemptChangeSize'
+        );
         // Expect called twice: one for resize and second for reverting.
         attemptChangeSizeStub.withArgs(123, 456).returns(Promise.resolve());
         attemptChangeSizeStub.withArgs(200, 50).returns(Promise.resolve());
@@ -1994,9 +2296,11 @@ describe('amp-a4a', () => {
       return createIframePromise().then(fixture => {
         setupForAdTesting(fixture);
         let whenFirstVisibleResolve = null;
-        viewerWhenVisibleMock.returns(new Promise(resolve => {
-          whenFirstVisibleResolve = resolve;
-        }));
+        viewerWhenVisibleMock.returns(
+          new Promise(resolve => {
+            whenFirstVisibleResolve = resolve;
+          })
+        );
         const {doc} = fixture;
         const a4aElement = createA4aElement(doc);
         const a4a = new MockA4AImpl(a4aElement);
@@ -2009,144 +2313,155 @@ describe('amp-a4a', () => {
         a4a.uiHandler.state = 0;
         a4a.unlayoutCallback();
         whenFirstVisibleResolve();
-        return adPromise.then(unusedError => {
-          assert.fail('cancelled ad promise should not succeed');
-        }).catch(reason => {
-          expect(getAdUrlSpy.called, 'getAdUrl never called')
-              .to.be.false;
-          expect(reason.message).to.equal(cancellation().message);
-          expect(errorHandlerSpy).to.be.calledOnce;
-        });
+        return adPromise
+          .then(unusedError => {
+            assert.fail('cancelled ad promise should not succeed');
+          })
+          .catch(reason => {
+            expect(getAdUrlSpy.called, 'getAdUrl never called').to.be.false;
+            expect(reason.message).to.equal(cancellation().message);
+            expect(errorHandlerSpy).to.be.calledOnce;
+          });
       });
     });
 
     describe('consent integration', () => {
-
       let fixture, a4aElement, a4a, consentString;
-      beforeEach(() => createIframePromise().then(f => {
-        fixture = f;
-        setupForAdTesting(fixture);
-        fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
-        a4aElement = createA4aElement(fixture.doc);
-        a4a = new MockA4AImpl(a4aElement);
-        consentString = 'test-consent-string';
-        return fixture;
-      }));
+      beforeEach(() =>
+        createIframePromise().then(f => {
+          fixture = f;
+          setupForAdTesting(fixture);
+          fetchMock.getOnce(
+            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+            () => adResponse,
+            {name: 'ad'}
+          );
+          a4aElement = createA4aElement(fixture.doc);
+          a4a = new MockA4AImpl(a4aElement);
+          consentString = 'test-consent-string';
+          return fixture;
+        })
+      );
 
       it('should delay ad url by getConsentPolicyState', () => {
-        sandbox.stub(AMP.BaseElement.prototype, 'getConsentPolicy')
-            .returns('default');
+        sandbox
+          .stub(AMP.BaseElement.prototype, 'getConsentPolicy')
+          .returns('default');
         let inResolver;
-        const policyPromise = new Promise(resolver => inResolver = resolver);
-        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull')
-            .returns(Promise.resolve({
-              whenPolicyResolved: () => policyPromise,
-              getConsentStringInfo: () => consentString,
-            }));
-
-        const getAdUrlSpy = sandbox.spy(
-            a4a,
-            'getAdUrl'
+        const policyPromise = new Promise(resolver => (inResolver = resolver));
+        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
+          Promise.resolve({
+            whenPolicyResolved: () => policyPromise,
+            getConsentStringInfo: () => consentString,
+          })
         );
+
+        const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
         const tryExecuteRealTimeConfigSpy = sandbox.spy(
-            a4a,
-            'tryExecuteRealTimeConfig_'
+          a4a,
+          'tryExecuteRealTimeConfig_'
         );
 
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         // allow ad promise to start execution, unfortunately timer is only way.
-        return Services.timerFor(a4a.win).promise(50).then(() => {
-          expect(getAdUrlSpy).to.not.be.called;
-          inResolver(CONSENT_POLICY_STATE.SUFFICIENT);
-          return a4a.layoutCallback().then(() => {
-            expect(getAdUrlSpy.withArgs(
-                CONSENT_POLICY_STATE.SUFFICIENT
-            )).calledOnce;
-            expect(tryExecuteRealTimeConfigSpy.withArgs(
-                CONSENT_POLICY_STATE.SUFFICIENT,
-                consentString
-            )).calledOnce;
+        return Services.timerFor(a4a.win)
+          .promise(50)
+          .then(() => {
+            expect(getAdUrlSpy).to.not.be.called;
+            inResolver(CONSENT_POLICY_STATE.SUFFICIENT);
+            return a4a.layoutCallback().then(() => {
+              expect(getAdUrlSpy.withArgs(CONSENT_POLICY_STATE.SUFFICIENT))
+                .calledOnce;
+              expect(
+                tryExecuteRealTimeConfigSpy.withArgs(
+                  CONSENT_POLICY_STATE.SUFFICIENT,
+                  consentString
+                )
+              ).calledOnce;
+            });
           });
-        });
       });
 
       it('should not wait on consent if no policy', () => {
-        sandbox.stub(AMP.BaseElement.prototype, 'getConsentPolicy')
-            .returns(null);
-        const consentServiceSpy =
-          sandbox.spy(Services, 'consentPolicyServiceForDocOrNull');
+        sandbox
+          .stub(AMP.BaseElement.prototype, 'getConsentPolicy')
+          .returns(null);
+        const consentServiceSpy = sandbox.spy(
+          Services,
+          'consentPolicyServiceForDocOrNull'
+        );
         a4a.buildCallback();
         a4a.onLayoutMeasure();
-        return a4a.layoutCallback().then(() =>
-          expect(consentServiceSpy).to.not.be.called);
+        return a4a
+          .layoutCallback()
+          .then(() => expect(consentServiceSpy).to.not.be.called);
       });
 
       it('should pass consent state to getAdUrl', () => {
-        sandbox.stub(AMP.BaseElement.prototype, 'getConsentPolicy')
-            .returns('default');
-        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull')
-            .returns(Promise.resolve({
-              whenPolicyResolved: () =>
-                Promise.resolve(CONSENT_POLICY_STATE.SUFFICIENT),
-              getConsentStringInfo: () => consentString,
-            }));
-
-        const getAdUrlSpy = sandbox.spy(
-            a4a,
-            'getAdUrl'
+        sandbox
+          .stub(AMP.BaseElement.prototype, 'getConsentPolicy')
+          .returns('default');
+        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
+          Promise.resolve({
+            whenPolicyResolved: () =>
+              Promise.resolve(CONSENT_POLICY_STATE.SUFFICIENT),
+            getConsentStringInfo: () => consentString,
+          })
         );
+
+        const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
         const tryExecuteRealTimeConfigSpy = sandbox.spy(
-            a4a,
-            'tryExecuteRealTimeConfig_'
+          a4a,
+          'tryExecuteRealTimeConfig_'
         );
 
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          expect(getAdUrlSpy.withArgs(
-              CONSENT_POLICY_STATE.SUFFICIENT
-          )).calledOnce;
-          expect(tryExecuteRealTimeConfigSpy.withArgs(
+          expect(getAdUrlSpy.withArgs(CONSENT_POLICY_STATE.SUFFICIENT))
+            .calledOnce;
+          expect(
+            tryExecuteRealTimeConfigSpy.withArgs(
               CONSENT_POLICY_STATE.SUFFICIENT,
               consentString
-          )).calledOnce;
+            )
+          ).calledOnce;
         });
       });
 
       it('should return UNKNOWN if consent exception', () => {
         expectAsyncConsoleError(/Error determining consent state.*consent err/);
-        sandbox.stub(AMP.BaseElement.prototype, 'getConsentPolicy')
-            .returns('default');
-        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull')
-            .returns(Promise.resolve({
-              whenPolicyResolved: () => {throw new Error('consent err!');},
-              getConsentStringInfo: () => {throw new Error('consent err!');},
-            }));
-
-        const getAdUrlSpy = sandbox.spy(
-            a4a,
-            'getAdUrl'
+        sandbox
+          .stub(AMP.BaseElement.prototype, 'getConsentPolicy')
+          .returns('default');
+        sandbox.stub(Services, 'consentPolicyServiceForDocOrNull').returns(
+          Promise.resolve({
+            whenPolicyResolved: () => {
+              throw new Error('consent err!');
+            },
+            getConsentStringInfo: () => {
+              throw new Error('consent err!');
+            },
+          })
         );
+
+        const getAdUrlSpy = sandbox.spy(a4a, 'getAdUrl');
         const tryExecuteRealTimeConfigSpy = sandbox.spy(
-            a4a,
-            'tryExecuteRealTimeConfig_'
+          a4a,
+          'tryExecuteRealTimeConfig_'
         );
 
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-
-          expect(getAdUrlSpy.withArgs(
-              CONSENT_POLICY_STATE.UNKNOWN
-          )).calledOnce;
-          expect(tryExecuteRealTimeConfigSpy.withArgs(
+          expect(getAdUrlSpy.withArgs(CONSENT_POLICY_STATE.UNKNOWN)).calledOnce;
+          expect(
+            tryExecuteRealTimeConfigSpy.withArgs(
               CONSENT_POLICY_STATE.UNKNOWN,
               null
-          )).calledOnce;
-
+            )
+          ).calledOnce;
         });
       });
     });
@@ -2154,38 +2469,58 @@ describe('amp-a4a', () => {
     describe('protectFunctionWrapper', () => {
       it('works properly with no error', () => {
         let errorCalls = 0;
-        expect(protectFunctionWrapper(name => {
-          return `hello ${name}`;
-        }, null, () => {errorCalls++;})('world')).to.equal('hello world');
+        expect(
+          protectFunctionWrapper(
+            name => {
+              return `hello ${name}`;
+            },
+            null,
+            () => {
+              errorCalls++;
+            }
+          )('world')
+        ).to.equal('hello world');
         expect(errorCalls).to.equal(0);
       });
 
       it('handles error properly', () => {
         const err = new Error('test fail');
-        expect(protectFunctionWrapper((name, suffix) => {
-          expect(name).to.equal('world');
-          expect(suffix).to.equal('!');
-          throw err;
-        }, null, (currErr, name, suffix) => {
-          expect(currErr).to.equal(err);
-          expect(name).to.equal('world');
-          expect(suffix).to.equal('!');
-          return 'pass';
-        })('world', '!')).to.equal('pass');
+        expect(
+          protectFunctionWrapper(
+            (name, suffix) => {
+              expect(name).to.equal('world');
+              expect(suffix).to.equal('!');
+              throw err;
+            },
+            null,
+            (currErr, name, suffix) => {
+              expect(currErr).to.equal(err);
+              expect(name).to.equal('world');
+              expect(suffix).to.equal('!');
+              return 'pass';
+            }
+          )('world', '!')
+        ).to.equal('pass');
       });
 
       it('returns undefined if error thrown in error handler', () => {
         const err = new Error('test fail within fn');
-        expect(protectFunctionWrapper((name, suffix) => {
-          expect(name).to.equal('world');
-          expect(suffix).to.be.undefined;
-          throw err;
-        }, null, (currErr, name, suffix) => {
-          expect(currErr).to.equal(err);
-          expect(name).to.equal('world');
-          expect(suffix).to.be.undefined;
-          throw new Error('test fail within error fn');
-        })('world')).to.be.undefined;
+        expect(
+          protectFunctionWrapper(
+            (name, suffix) => {
+              expect(name).to.equal('world');
+              expect(suffix).to.be.undefined;
+              throw err;
+            },
+            null,
+            (currErr, name, suffix) => {
+              expect(currErr).to.equal(err);
+              expect(name).to.equal('world');
+              expect(suffix).to.be.undefined;
+              throw new Error('test fail within error fn');
+            }
+          )('world')
+        ).to.be.undefined;
       });
     });
   });
@@ -2276,7 +2611,6 @@ describe('amp-a4a', () => {
   });
 
   describe('#assignAdUrlToError', () => {
-
     it('should attach info to error correctly', () => {
       const error = new Error('foo');
       let queryString = '';
@@ -2299,11 +2633,14 @@ describe('amp-a4a', () => {
   });
 
   describe('#extractSize', () => {
-
     it('should return a size', () => {
-      expect(AmpA4A.prototype.extractSize(new Headers({
-        'X-CreativeSize': '320x50',
-      }))).to.deep.equal({width: 320, height: 50});
+      expect(
+        AmpA4A.prototype.extractSize(
+          new Headers({
+            'X-CreativeSize': '320x50',
+          })
+        )
+      ).to.deep.equal({width: 320, height: 50});
     });
 
     it('should return no size', () => {
@@ -2342,8 +2679,10 @@ describe('amp-a4a', () => {
         // long as they're called the appropriate number of times. We stub them
         // out here because they would otherwise throw errors unrelated to the
         // behavior actually being tested.
-        const initiateAdRequestMock =
-            sandbox.stub(AmpA4A.prototype, 'initiateAdRequest');
+        const initiateAdRequestMock = sandbox.stub(
+          AmpA4A.prototype,
+          'initiateAdRequest'
+        );
         initiateAdRequestMock.returns(undefined);
         const tearDownSlotMock = sandbox.stub(AmpA4A.prototype, 'tearDownSlot');
         tearDownSlotMock.returns(undefined);
@@ -2352,17 +2691,18 @@ describe('amp-a4a', () => {
         sandbox.stub(analytics, 'triggerAnalyticsEvent');
 
         expect(a4a.isRefreshing).to.be.false;
-        return a4a.refresh(() => {}).then(() => {
-          expect(initiateAdRequestMock).to.be.calledOnce;
-          expect(tearDownSlotMock).to.be.calledOnce;
-          expect(a4a.togglePlaceholder).to.be.calledOnce;
-          expect(a4a.isRefreshing).to.be.true;
-          expect(a4a.isRelayoutNeededFlag).to.be.true;
-        });
+        return a4a
+          .refresh(() => {})
+          .then(() => {
+            expect(initiateAdRequestMock).to.be.calledOnce;
+            expect(tearDownSlotMock).to.be.calledOnce;
+            expect(a4a.togglePlaceholder).to.be.calledOnce;
+            expect(a4a.isRefreshing).to.be.true;
+            expect(a4a.isRelayoutNeededFlag).to.be.true;
+          });
       });
     });
 
-
     it('should fire an analytics event when refreshing', () => {
       return createIframePromise().then(f => {
         const fixture = f;
@@ -2383,22 +2723,30 @@ describe('amp-a4a', () => {
         // long as they're called the appropriate number of times. We stub them
         // out here because they would otherwise throw errors unrelated to the
         // behavior actually being tested.
-        const initiateAdRequestMock =
-            sandbox.stub(AmpA4A.prototype, 'initiateAdRequest');
+        const initiateAdRequestMock = sandbox.stub(
+          AmpA4A.prototype,
+          'initiateAdRequest'
+        );
         initiateAdRequestMock.returns(undefined);
         const tearDownSlotMock = sandbox.stub(AmpA4A.prototype, 'tearDownSlot');
         tearDownSlotMock.returns(undefined);
         const destroyFrameMock = sandbox.stub(AmpA4A.prototype, 'destroyFrame');
         destroyFrameMock.returns(undefined);
 
-        const triggerAnalyticsEventStub = sandbox.stub(analytics,
-            'triggerAnalyticsEvent');
+        const triggerAnalyticsEventStub = sandbox.stub(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
 
         expect(a4a.isRefreshing).to.be.false;
-        return a4a.refresh(() => {}).then(() => {
-          expect(triggerAnalyticsEventStub)
-              .calledWith(a4a.element, 'ad-refresh');
-        });
+        return a4a
+          .refresh(() => {})
+          .then(() => {
+            expect(triggerAnalyticsEventStub).calledWith(
+              a4a.element,
+              'ad-refresh'
+            );
+          });
       });
     });
 
@@ -2464,52 +2812,58 @@ describe('amp-a4a', () => {
       let a4aElement;
       let a4a;
       let fixture;
-      beforeEach(() => createIframePromise().then(f => {
-        fixture = f;
-        setupForAdTesting(fixture);
-        fetchMock.getOnce(
-            TEST_URL + '&__amp_source_origin=about%3Asrcdoc', () => adResponse,
-            {name: 'ad'});
-        a4aElement = createA4aElement(fixture.doc);
-        a4a = new MockA4AImpl(a4aElement);
-        a4a.releaseType_ = '0';
-        return fixture;
-      }));
-
-      it('by default not allowed if crypto signature present but no SSL',
-          () => {
-            sandbox.stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
-                .returns(false);
-            a4a.buildCallback();
-            a4a.onLayoutMeasure();
-            return a4a.layoutCallback().then(() => {
-              expect(a4aElement.querySelector('iframe[src]')).to.be.ok;
-              expect(a4aElement.querySelector('iframe[srcdoc]')).to.not.be.ok;
-            });
-          });
-
-      it('allowed if crypto signature present, no SSL, and overrided' +
-         ' shouldPreferentialRenderWithoutCrypto', () => {
-        sandbox.stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
-            .returns(false);
-        sandbox.stub(
-            AmpA4A.prototype,
-            'shouldPreferentialRenderWithoutCrypto').callsFake(
-            () => true);
+      beforeEach(() =>
+        createIframePromise().then(f => {
+          fixture = f;
+          setupForAdTesting(fixture);
+          fetchMock.getOnce(
+            TEST_URL + '&__amp_source_origin=about%3Asrcdoc',
+            () => adResponse,
+            {name: 'ad'}
+          );
+          a4aElement = createA4aElement(fixture.doc);
+          a4a = new MockA4AImpl(a4aElement);
+          a4a.releaseType_ = '0';
+          return fixture;
+        })
+      );
+
+      it('by default not allowed if crypto signature present but no SSL', () => {
+        sandbox
+          .stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
+          .returns(false);
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
-          verifyA4ARender(a4aElement);
+          expect(a4aElement.querySelector('iframe[src]')).to.be.ok;
+          expect(a4aElement.querySelector('iframe[srcdoc]')).to.not.be.ok;
         });
       });
 
+      it(
+        'allowed if crypto signature present, no SSL, and overrided' +
+          ' shouldPreferentialRenderWithoutCrypto',
+        () => {
+          sandbox
+            .stub(Services.cryptoFor(fixture.win), 'isPkcsAvailable')
+            .returns(false);
+          sandbox
+            .stub(AmpA4A.prototype, 'shouldPreferentialRenderWithoutCrypto')
+            .callsFake(() => true);
+          a4a.buildCallback();
+          a4a.onLayoutMeasure();
+          return a4a.layoutCallback().then(() => {
+            verifyA4ARender(a4aElement);
+          });
+        }
+      );
+
       it('not allowed if no crypto signature present', () => {
         delete adResponse.headers['AMP-Fast-Fetch-Signature'];
         delete adResponse.headers[AMP_SIGNATURE_HEADER];
-        sandbox.stub(
-            AmpA4A.prototype,
-            'shouldPreferentialRenderWithoutCrypto').callsFake(
-            () => true);
+        sandbox
+          .stub(AmpA4A.prototype, 'shouldPreferentialRenderWithoutCrypto')
+          .callsFake(() => true);
         a4a.buildCallback();
         a4a.onLayoutMeasure();
         return a4a.layoutCallback().then(() => {
@@ -2542,7 +2896,6 @@ describe('amp-a4a', () => {
   //   - All
 });
 
-
 describes.realWin('AmpA4a-RTC', {amp: true}, env => {
   let element;
   let a4a;
@@ -2574,14 +2927,19 @@ describes.realWin('AmpA4a-RTC', {amp: true}, env => {
       expect(a4a.tryExecuteRealTimeConfig_()).to.be.undefined;
     });
     it('should log user error if RTC Config set but RTC not supported', () => {
-      element.setAttribute('rtc-config',
-          JSON.stringify({'urls': ['https://a.com']}));
-      expect(allowConsoleError(() => a4a.tryExecuteRealTimeConfig_()))
-          .to.be.undefined;
+      element.setAttribute(
+        'rtc-config',
+        JSON.stringify({'urls': ['https://a.com']})
+      );
+      expect(allowConsoleError(() => a4a.tryExecuteRealTimeConfig_())).to.be
+        .undefined;
       expect(errorSpy.calledOnce).to.be.true;
-      expect(errorSpy.calledWith(
+      expect(
+        errorSpy.calledWith(
           'amp-a4a',
-          'RTC not supported for ad network doubleclick')).to.be.true;
+          'RTC not supported for ad network doubleclick'
+        )
+      ).to.be.true;
     });
   });
 
@@ -2610,7 +2968,8 @@ describes.realWin('AmpA4a-RTC', {amp: true}, env => {
         }
         a4a.postAdResponseExperimentFeatures['pref_neutral_enabled'] = prefVal;
         expect(a4a.inNonAmpPreferenceExp()).to.equal(!!expected);
-      }));
+      })
+    );
   });
 
   describe('#sandboxHTMLCreativeFrame', () => {
@@ -2631,9 +2990,13 @@ describes.realWin('AmpA4a-RTC', {amp: true}, env => {
       a4a.maybeAddSinglePassExperiment();
 
       const isInSinglePass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS
+      );
       const isInMultiPass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS
+      );
 
       expect(isInSinglePass).to.be.true;
       expect(isInMultiPass).to.be.false;
@@ -2646,9 +3009,13 @@ describes.realWin('AmpA4a-RTC', {amp: true}, env => {
       a4a.maybeAddSinglePassExperiment();
 
       const isInSinglePass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS
+      );
       const isInMultiPass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS
+      );
 
       expect(isInSinglePass).to.be.false;
       expect(isInMultiPass).to.be.true;
@@ -2661,9 +3028,13 @@ describes.realWin('AmpA4a-RTC', {amp: true}, env => {
       a4a.maybeAddSinglePassExperiment();
 
       const isInSinglePass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.SINGLE_PASS
+      );
       const isInMultiPass = isInExperiment(
-          a4a.element, SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS);
+        a4a.element,
+        SINGLE_PASS_EXPERIMENT_IDS.MULTI_PASS
+      );
 
       expect(isInSinglePass).to.be.false;
       expect(isInMultiPass).to.be.false;
diff --git a/extensions/amp-a4a/0.1/test/test-amp-ad-template-helper.js b/extensions/amp-a4a/0.1/test/test-amp-ad-template-helper.js
index 8c0c9e22989b..afad52d41ed0 100644
--- a/extensions/amp-a4a/0.1/test/test-amp-ad-template-helper.js
+++ b/extensions/amp-a4a/0.1/test/test-amp-ad-template-helper.js
@@ -18,11 +18,10 @@ import {AmpAdTemplateHelper} from '../amp-ad-template-helper';
 import {AmpMustache} from '../../../amp-mustache/0.1/amp-mustache';
 import {Xhr} from '../../../../src/service/xhr-impl';
 
-
 describes.fakeWin('AmpAdTemplateHelper', {amp: true}, env => {
-
-  const cdnUrl = 'https://adserver-com.cdn.ampproject.org/ad/s/' +
-      'adserver.com/amp_template_1';
+  const cdnUrl =
+    'https://adserver-com.cdn.ampproject.org/ad/s/' +
+    'adserver.com/amp_template_1';
   const canonicalUrl = 'https://adserver.com/amp_template_1';
 
   let win, doc;
@@ -39,21 +38,22 @@ describes.fakeWin('AmpAdTemplateHelper', {amp: true}, env => {
 
   it('should return a promise resolving to a string template', () => {
     const template = 'content not important here';
-    fetchTextMock.withArgs(
-        cdnUrl,
-        {
-          mode: 'cors',
-          method: 'GET',
-          ampCors: false,
-          credentials: 'omit',
+    fetchTextMock
+      .withArgs(cdnUrl, {
+        mode: 'cors',
+        method: 'GET',
+        ampCors: false,
+        credentials: 'omit',
+      })
+      .returns(
+        Promise.resolve({
+          headers: {},
+          text: () => template,
         })
-        .returns(Promise.resolve(
-            {
-              headers: {},
-              text: () => template,
-            }));
-    return ampAdTemplateHelper.fetch(canonicalUrl)
-        .then(fetchedTemplate => expect(fetchedTemplate).to.equal(template));
+      );
+    return ampAdTemplateHelper
+      .fetch(canonicalUrl)
+      .then(fetchedTemplate => expect(fetchedTemplate).to.equal(template));
   });
 
   it('should use CDN url if one is supplied', () => {
@@ -61,8 +61,9 @@ describes.fakeWin('AmpAdTemplateHelper', {amp: true}, env => {
   });
 
   it('should convert canonical to CDN', () => {
-    expect(ampAdTemplateHelper.getTemplateProxyUrl_(canonicalUrl))
-        .to.equal(cdnUrl);
+    expect(ampAdTemplateHelper.getTemplateProxyUrl_(canonicalUrl)).to.equal(
+      cdnUrl
+    );
   });
 
   it('should render a template with correct values', () => {
@@ -72,35 +73,38 @@ describes.fakeWin('AmpAdTemplateHelper', {amp: true}, env => {
   it('should render a template with correct values', () => {
     win.AMP.registerTemplate('amp-mustache', AmpMustache);
     const parentDiv = doc.createElement('div');
-    parentDiv./*OK*/innerHTML =
-        '<template type="amp-mustache"><p>{{foo}}</p></template>';
+    parentDiv./*OK*/ innerHTML =
+      '<template type="amp-mustache"><p>{{foo}}</p></template>';
     doc.body.appendChild(parentDiv);
     return ampAdTemplateHelper.render({foo: 'bar'}, parentDiv).then(result => {
       expect(result).to.not.be.null;
-      expect(result./*OK*/innerHTML).to.equal('bar');
+      expect(result./*OK*/ innerHTML).to.equal('bar');
     });
   });
 
   it('should insert analytics component', () => {
     const parentDiv = doc.createElement('div');
-    parentDiv./*OK*/innerHTML =
-        '<p>123</p>';
+    parentDiv./*OK*/ innerHTML = '<p>123</p>';
     doc.body.appendChild(parentDiv);
-    const analytics = [{
-      'remote': 'remoteUrl',
-      'inline': {
-        'requests': 'r',
+    const analytics = [
+      {
+        'remote': 'remoteUrl',
+        'inline': {
+          'requests': 'r',
+        },
       },
-    }, {
-      'type': 'googleanalytics',
-    }];
+      {
+        'type': 'googleanalytics',
+      },
+    ];
     ampAdTemplateHelper.insertAnalytics(parentDiv, analytics);
     expect(parentDiv.childNodes.length).to.equal(3);
-    expect(parentDiv.innerHTML).to.equal('<p>123</p>' +
+    expect(parentDiv.innerHTML).to.equal(
+      '<p>123</p>' +
         '<amp-analytics config="remoteUrl">' +
         '<script type="application/json">{"requests":"r"}</script>' +
         '</amp-analytics>' +
-        '<amp-analytics type="googleanalytics"></amp-analytics>');
+        '<amp-analytics type="googleanalytics"></amp-analytics>'
+    );
   });
 });
-
diff --git a/extensions/amp-a4a/0.1/test/test-amp-ad-utils.js b/extensions/amp-a4a/0.1/test/test-amp-ad-utils.js
index a408d0d6a5bb..47cde5ec42b2 100644
--- a/extensions/amp-a4a/0.1/test/test-amp-ad-utils.js
+++ b/extensions/amp-a4a/0.1/test/test-amp-ad-utils.js
@@ -18,7 +18,6 @@ import {data} from './testdata/valid_css_at_rules_amp.reserialized';
 import {getAmpAdMetadata} from '../amp-ad-utils';
 
 describe('getAmpAdMetadata', () => {
-
   it('should parse metadata successfully', () => {
     const creativeMetadata = getAmpAdMetadata(data.reserialized);
     expect(creativeMetadata).to.be.ok;
@@ -52,8 +51,8 @@ describe('getAmpAdMetadata', () => {
 
   it('should return null -- missing closing script tag', () => {
     const creativeMetadata = getAmpAdMetadata(
-        data.reserializedMissingScriptTag);
+      data.reserializedMissingScriptTag
+    );
     expect(creativeMetadata).to.be.null;
   });
-
 });
diff --git a/extensions/amp-a4a/0.1/test/test-callout-vendors.js b/extensions/amp-a4a/0.1/test/test-callout-vendors.js
index 9b95a5cb0814..67193a00e1a0 100644
--- a/extensions/amp-a4a/0.1/test/test-callout-vendors.js
+++ b/extensions/amp-a4a/0.1/test/test-callout-vendors.js
@@ -21,13 +21,15 @@ import {isSecureUrlDeprecated} from '../../../../src/url';
 // This test acts as a presubmit to enforce that.
 describe('RTC_VENDORS', () => {
   it('should have all lowercase keys', () =>
-    Object.keys(RTC_VENDORS).forEach(
-        key => expect(key).to.equal(key.toLowerCase())
+    Object.keys(RTC_VENDORS).forEach(key =>
+      expect(key).to.equal(key.toLowerCase())
     ));
   it('should all use https', () =>
     Object.keys(RTC_VENDORS).forEach(key => {
       expect(isSecureUrlDeprecated(RTC_VENDORS[key].url)).to.be.true;
-      expect(!RTC_VENDORS[key].errorReportingUrl || isSecureUrlDeprecated(
-          RTC_VENDORS[key].errorReportingUrl)).to.be.true;
+      expect(
+        !RTC_VENDORS[key].errorReportingUrl ||
+          isSecureUrlDeprecated(RTC_VENDORS[key].errorReportingUrl)
+      ).to.be.true;
     }));
 });
diff --git a/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js b/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js
index 85ef549c488a..9b8df7b278b3 100644
--- a/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js
+++ b/extensions/amp-a4a/0.1/test/test-cryptographic-validator.js
@@ -31,7 +31,6 @@ const realWinConfig = {
 };
 
 describes.realWin('CryptographicValidator', realWinConfig, env => {
-
   const headers = {'Content-Type': 'application/jwk-set+json'};
   let sandbox;
   let userErrorStub;
@@ -53,56 +52,59 @@ describes.realWin('CryptographicValidator', realWinConfig, env => {
     env.win[SIGNATURE_VERIFIER_PROPERTY_NAME] = {
       verify: () => Promise.resolve(VerificationStatus.OK),
     };
-    return validator.validate(
-        {win: env.win}, utf8Encode(data.reserialized), headers)
-        .then(validatorOutput => {
-          expect(validatorOutput).to.be.ok;
-          expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
-          expect(validatorOutput.adResponseType).to.equal(
-              AdResponseType.CRYPTO);
-          expect(validatorOutput.creativeData).to.be.ok;
+    return validator
+      .validate({win: env.win}, utf8Encode(data.reserialized), headers)
+      .then(validatorOutput => {
+        expect(validatorOutput).to.be.ok;
+        expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
+        expect(validatorOutput.adResponseType).to.equal(AdResponseType.CRYPTO);
+        expect(validatorOutput.creativeData).to.be.ok;
 
-          const {creativeMetadata} = validatorOutput.creativeData;
-          expect(creativeMetadata.minifiedCreative).to.equal(
-              data.minifiedCreative);
-        });
+        const {creativeMetadata} = validatorOutput.creativeData;
+        expect(creativeMetadata.minifiedCreative).to.equal(
+          data.minifiedCreative
+        );
+      });
   });
 
   it('should have non-AMP validator result', () => {
     env.win[SIGNATURE_VERIFIER_PROPERTY_NAME] = {
       verify: () => Promise.resolve(VerificationStatus.UNVERIFIED),
     };
-    return validator.validate(
-        {win: env.win}, utf8Encode(data.reserialized), headers)
-        .then(validatorOutput => {
-          expect(validatorOutput).to.be.ok;
-          expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
-          expect(validatorOutput.adResponseType).to.equal(
-              AdResponseType.CRYPTO);
-          expect(validatorOutput.creativeData).to.be.ok;
+    return validator
+      .validate({win: env.win}, utf8Encode(data.reserialized), headers)
+      .then(validatorOutput => {
+        expect(validatorOutput).to.be.ok;
+        expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
+        expect(validatorOutput.adResponseType).to.equal(AdResponseType.CRYPTO);
+        expect(validatorOutput.creativeData).to.be.ok;
 
-          const {creativeMetadata} = validatorOutput.creativeData;
-          expect(creativeMetadata.minifiedCreative).to.equal(
-              data.minifiedCreative);
-          expect(userErrorStub).to.be.calledOnce;
-        });
+        const {creativeMetadata} = validatorOutput.creativeData;
+        expect(creativeMetadata.minifiedCreative).to.equal(
+          data.minifiedCreative
+        );
+        expect(userErrorStub).to.be.calledOnce;
+      });
   });
 
   it('should have non-AMP validator result due to bad metadata', () => {
     env.win[SIGNATURE_VERIFIER_PROPERTY_NAME] = {
       verify: () => Promise.resolve(VerificationStatus.UNVERIFIED),
     };
-    return validator.validate(
-        {win: env.win}, utf8Encode(data.reserializedInvalidOffset), headers)
-        .then(validatorOutput => {
-          expect(validatorOutput).to.be.ok;
-          expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
-          expect(validatorOutput.adResponseType).to.equal(
-              AdResponseType.CRYPTO);
-          expect(validatorOutput.creativeData).to.be.ok;
-          expect(validatorOutput.creativeData.creativeMetadata).to.not.be.ok;
+    return validator
+      .validate(
+        {win: env.win},
+        utf8Encode(data.reserializedInvalidOffset),
+        headers
+      )
+      .then(validatorOutput => {
+        expect(validatorOutput).to.be.ok;
+        expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
+        expect(validatorOutput.adResponseType).to.equal(AdResponseType.CRYPTO);
+        expect(validatorOutput.creativeData).to.be.ok;
+        expect(validatorOutput.creativeData.creativeMetadata).to.not.be.ok;
 
-          expect(userErrorStub).to.be.calledOnce;
-        });
+        expect(userErrorStub).to.be.calledOnce;
+      });
   });
 });
diff --git a/extensions/amp-a4a/0.1/test/test-friendly-frame-renderer.js b/extensions/amp-a4a/0.1/test/test-friendly-frame-renderer.js
index b685d574f030..4cf13a2214e0 100644
--- a/extensions/amp-a4a/0.1/test/test-friendly-frame-renderer.js
+++ b/extensions/amp-a4a/0.1/test/test-friendly-frame-renderer.js
@@ -23,7 +23,6 @@ const realWinConfig = {
 };
 
 describes.realWin('FriendlyFrameRenderer', realWinConfig, env => {
-
   const minifiedCreative = '<p>Hello, World!</p>';
 
   let containerElement;
@@ -52,7 +51,10 @@ describes.realWin('FriendlyFrameRenderer', realWinConfig, env => {
     });
     containerElement.renderStarted = () => {};
     containerElement.getLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.isInViewport = () => true;
     containerElement.getAmpDoc = () => env.ampdoc;
@@ -69,16 +71,18 @@ describes.realWin('FriendlyFrameRenderer', realWinConfig, env => {
     return renderPromise.then(() => {
       const iframe = containerElement.querySelector('iframe');
       expect(iframe).to.be.ok;
-      expect(iframe.contentWindow.document.body.innerHTML)
-          .to.equal(minifiedCreative);
+      expect(iframe.contentWindow.document.body.innerHTML).to.equal(
+        minifiedCreative
+      );
     });
   });
 
   it('should set the correct srcdoc on the iframe', () => {
-    const srcdoc = '<base href="http://www.google.com">'
-        + '<meta http-equiv=Content-Security-Policy content="script-src '
-        + '\'none\';object-src \'none\';child-src \'none\'">'
-        + '<p>Hello, World!</p>';
+    const srcdoc =
+      '<base href="http://www.google.com">' +
+      '<meta http-equiv=Content-Security-Policy content="script-src ' +
+      "'none';object-src 'none';child-src 'none'\">" +
+      '<p>Hello, World!</p>';
     return renderPromise.then(() => {
       const iframe = containerElement.querySelector('iframe');
       expect(iframe).to.be.ok;
@@ -103,8 +107,9 @@ describes.realWin('FriendlyFrameRenderer', realWinConfig, env => {
     return renderPromise.then(() => {
       const iframe = containerElement.querySelector('iframe');
       expect(iframe).to.be.ok;
-      expect(iframe.contentWindow.document.body.style.visibility)
-          .to.equal('visible');
+      expect(iframe.contentWindow.document.body.style.visibility).to.equal(
+        'visible'
+      );
     });
   });
 });
diff --git a/extensions/amp-a4a/0.1/test/test-friendly-frame-util.js b/extensions/amp-a4a/0.1/test/test-friendly-frame-util.js
index 9ca3e610c4c7..f1eff93b587b 100644
--- a/extensions/amp-a4a/0.1/test/test-friendly-frame-util.js
+++ b/extensions/amp-a4a/0.1/test/test-friendly-frame-util.js
@@ -23,7 +23,6 @@ const realWinConfig = {
 };
 
 describes.realWin('FriendlyFrameUtil', realWinConfig, env => {
-
   const minifiedCreative = '<p>Hello, World!</p>';
 
   let containerElement;
@@ -36,7 +35,10 @@ describes.realWin('FriendlyFrameUtil', realWinConfig, env => {
     });
     containerElement.renderStarted = () => {};
     containerElement.getLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.isInViewport = () => true;
     containerElement.getAmpDoc = () => env.ampdoc;
@@ -51,7 +53,11 @@ describes.realWin('FriendlyFrameUtil', realWinConfig, env => {
     };
 
     renderPromise = renderCreativeIntoFriendlyFrame(
-        adUrl, size, containerElement, creativeMetadata);
+      adUrl,
+      size,
+      containerElement,
+      creativeMetadata
+    );
   });
 
   afterEach(() => {
@@ -61,16 +67,18 @@ describes.realWin('FriendlyFrameUtil', realWinConfig, env => {
   it('should append iframe child', () => {
     return renderPromise.then(iframe => {
       expect(iframe).to.be.ok;
-      expect(iframe.contentWindow.document.body.innerHTML)
-          .to.equal(minifiedCreative);
+      expect(iframe.contentWindow.document.body.innerHTML).to.equal(
+        minifiedCreative
+      );
     });
   });
 
   it('should set the correct srcdoc on the iframe', () => {
-    const srcdoc = '<base href="http://www.google.com">'
-        + '<meta http-equiv=Content-Security-Policy content="script-src '
-        + '\'none\';object-src \'none\';child-src \'none\'">'
-        + '<p>Hello, World!</p>';
+    const srcdoc =
+      '<base href="http://www.google.com">' +
+      '<meta http-equiv=Content-Security-Policy content="script-src ' +
+      "'none';object-src 'none';child-src 'none'\">" +
+      '<p>Hello, World!</p>';
     return renderPromise.then(iframe => {
       expect(iframe).to.be.ok;
       expect(iframe.getAttribute('srcdoc')).to.equal(srcdoc);
@@ -92,9 +100,9 @@ describes.realWin('FriendlyFrameUtil', realWinConfig, env => {
   it('should style body of iframe document to be visible', () => {
     return renderPromise.then(iframe => {
       expect(iframe).to.be.ok;
-      expect(iframe.contentWindow.document.body.style.visibility)
-          .to.equal('visible');
+      expect(iframe.contentWindow.document.body.style.visibility).to.equal(
+        'visible'
+      );
     });
   });
 });
-
diff --git a/extensions/amp-a4a/0.1/test/test-name-frame-renderer.js b/extensions/amp-a4a/0.1/test/test-name-frame-renderer.js
index e79193b80f72..e4a05c736e4d 100644
--- a/extensions/amp-a4a/0.1/test/test-name-frame-renderer.js
+++ b/extensions/amp-a4a/0.1/test/test-name-frame-renderer.js
@@ -25,7 +25,6 @@ const realWinConfig = {
 };
 
 describes.realWin('NameFrameRenderer', realWinConfig, env => {
-
   const minifiedCreative = '<p>Hello, World!</p>';
 
   let containerElement;
@@ -50,7 +49,10 @@ describes.realWin('NameFrameRenderer', realWinConfig, env => {
     containerElement.setAttribute('height', 50);
     containerElement.setAttribute('width', 320);
     containerElement.getPageLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.getIntersectionChangeEntry = () => ({});
     document.body.appendChild(containerElement);
diff --git a/extensions/amp-a4a/0.1/test/test-real-time-config-manager.js b/extensions/amp-a4a/0.1/test/test-real-time-config-manager.js
index f8a9a7b1e86d..fe999677fc71 100644
--- a/extensions/amp-a4a/0.1/test/test-real-time-config-manager.js
+++ b/extensions/amp-a4a/0.1/test/test-real-time-config-manager.js
@@ -28,10 +28,7 @@ import {
 import {Services} from '../../../../src/services';
 import {Xhr} from '../../../../src/service/xhr-impl';
 import {createElementWithAttributes} from '../../../../src/dom';
-import {
-  dev,
-  user,
-} from '../../../../src/log';
+import {dev, user} from '../../../../src/log';
 import {isFiniteNumber} from '../../../../src/types';
 
 describes.realWin('real-time-config-manager', {amp: true}, env => {
@@ -63,8 +60,10 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
     // RealTimeConfigManager uses the UrlReplacements service scoped to the A4A
     // (FIE), but for testing stub in the parent service for simplicity.
     const urlReplacements = Services.urlReplacementsForDoc(element);
-    sandbox.stub(Services, 'urlReplacementsForDoc')
-        .withArgs(a4aElement.element).returns(urlReplacements);
+    sandbox
+      .stub(Services, 'urlReplacementsForDoc')
+      .withArgs(a4aElement.element)
+      .returns(urlReplacements);
 
     rtc = new RealTimeConfigManager(a4aElement);
     maybeExecuteRealTimeConfig_ = rtc.maybeExecuteRealTimeConfig.bind(rtc);
@@ -84,13 +83,16 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       fetchJsonStub.withArgs(params).returns(Promise.reject('FAIL'));
     } else {
       const textFunction = () => {
-        return !isString ? Promise.resolve(JSON.stringify(response)) :
-          Promise.resolve(response);
+        return !isString
+          ? Promise.resolve(JSON.stringify(response))
+          : Promise.resolve(response);
       };
-      fetchJsonStub.withArgs(params).returns(Promise.resolve({
-        status: 200,
-        text: textFunction,
-      }));
+      fetchJsonStub.withArgs(params).returns(
+        Promise.resolve({
+          status: 200,
+          text: textFunction,
+        })
+      );
     }
   }
 
@@ -119,27 +121,40 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
     });
 
     it('should convert & trunc url when parseable', () => {
-      const url = 'https://www.example.com/thisIsTooMany' +
-            'Characters1234567891011121314.php';
+      const url =
+        'https://www.example.com/thisIsTooMany' +
+        'Characters1234567891011121314.php';
       const ard = getCalloutParam_(url);
       expect(ard).to.equal(
-          'www.example.com/thisIsTooManyCharacters12345678910');
+        'www.example.com/thisIsTooManyCharacters12345678910'
+      );
     });
   });
 
   describe('#maybeExecuteRealTimeConfig_', () => {
     function executeTest(args) {
-      const {urls, vendors, timeoutMillis, rtcCalloutResponses,
-        expectedCalloutUrls, responseIsString, failXhr,
-        expectedRtcArray, calloutCount} = args;
+      const {
+        urls,
+        vendors,
+        timeoutMillis,
+        rtcCalloutResponses,
+        expectedCalloutUrls,
+        responseIsString,
+        failXhr,
+        expectedRtcArray,
+        calloutCount,
+      } = args;
       setRtcConfig({urls, vendors, timeoutMillis});
       (expectedCalloutUrls || []).forEach((expectedUrl, i) => {
-        setFetchJsonStubBehavior(expectedUrl, rtcCalloutResponses[i],
-            responseIsString, failXhr);
+        setFetchJsonStubBehavior(
+          expectedUrl,
+          rtcCalloutResponses[i],
+          responseIsString,
+          failXhr
+        );
       });
       const customMacros = args['customMacros'] || {};
-      const rtcResponsePromiseArray = maybeExecuteRealTimeConfig_(
-          customMacros);
+      const rtcResponsePromiseArray = maybeExecuteRealTimeConfig_(customMacros);
       return rtcResponsePromiseArray.then(rtcResponseArray => {
         expect(rtcResponseArray.length).to.equal(expectedRtcArray.length);
         expect(fetchJsonStub.callCount).to.equal(calloutCount);
@@ -148,19 +163,23 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         });
         rtcResponseArray.forEach((rtcResponse, i) => {
           expect(rtcResponse.response).to.deep.equal(
-              expectedRtcArray[i].response);
-          expect(rtcResponse.callout).to.equal(
-              expectedRtcArray[i].callout);
+            expectedRtcArray[i].response
+          );
+          expect(rtcResponse.callout).to.equal(expectedRtcArray[i].callout);
           expect(rtcResponse.error).to.equal(expectedRtcArray[i].error);
           expect(Object.keys(rtcResponse).sort()).to.deep.equal(
-              Object.keys(expectedRtcArray[i]).sort());
+            Object.keys(expectedRtcArray[i]).sort()
+          );
           expect(isFiniteNumber(rtcResponse.rtcTime)).to.be.true;
         });
       });
     }
 
     const urlMacros = [
-      'slot_id=SLOT_ID', 'page_id=PAGE_ID', 'adx=ADX', 'ady=ADY',
+      'slot_id=SLOT_ID',
+      'page_id=PAGE_ID',
+      'adx=ADX',
+      'ady=ADY',
     ];
 
     function generateUrls(numUrls, numMacroUrls) {
@@ -169,7 +188,11 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         urls.push(`https://www.${i}.com/`);
       }
       for (let i = 0; i < numMacroUrls; i++) {
-        urls.push(`https://www.${i + numUrls}.com/?${urlMacros.slice(0,i + 1).join('&')}`);
+        urls.push(
+          `https://www.${i + numUrls}.com/?${urlMacros
+            .slice(0, i + 1)
+            .join('&')}`
+        );
       }
       return urls;
     }
@@ -178,8 +201,9 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       // If this is an entry for a vendor, then the callout is just
       // the vendor name passed in to url here.
       const callout = !!isVendor ? url : getCalloutParam_(url);
-      return response ? {response, callout, rtcTime: 10} :
-        {callout, error, rtcTime: 10};
+      return response
+        ? {response, callout, rtcTime: 10}
+        : {callout, error, rtcTime: 10};
     }
 
     function generateCalloutResponses(numGoodResponses) {
@@ -188,7 +212,7 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       for (let i = 0; i < numGoodResponses; i++) {
         response = {};
         response[`response${i}`] = {};
-        response[`response${i}`][`foo${i}`] = [`a${i}`,`b${i}`,`c${i}`];
+        response[`response${i}`][`foo${i}`] = [`a${i}`, `b${i}`, `c${i}`];
         rtcCalloutResponses.push(response);
       }
       return rtcCalloutResponses;
@@ -201,19 +225,30 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         {'response1': {'fooArray': ['foo']}},
         {'response2': {'test': 'test2'}},
         {'response3': {'apple': 'banana'}},
-        {'response4': {'animalArray': ['cat', 'dog'],
-          'foodObject': {'apple': true, 'car': false}}},
+        {
+          'response4': {
+            'animalArray': ['cat', 'dog'],
+            'foodObject': {'apple': true, 'car': false},
+          },
+        },
         {'response5': [1, 2, 3]},
       ];
       const expectedRtcArray = [];
       urls.forEach((url, i) => {
         expectedRtcArray.push({
-          callout: getCalloutParam_(url), rtcTime: 10,
-          response: rtcCalloutResponses[i]});
+          callout: getCalloutParam_(url),
+          rtcTime: 10,
+          response: rtcCalloutResponses[i],
+        });
       });
       return executeTest({
-        urls, inflatedUrls: urls, rtcCalloutResponses, calloutCount,
-        expectedCalloutUrls: urls, expectedRtcArray});
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: urls,
+        expectedRtcArray,
+      });
     });
 
     it('should send only 5 RTC callouts for all URLS without macros', () => {
@@ -225,17 +260,24 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       for (let i = 0; i < 5; i++) {
         expectedRtcArray.push(rtcEntry(rtcCalloutResponses[i], urls[i]));
       }
-      expectedRtcArray.push(rtcEntry(null, urls[5],
-          RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED));
-      expectedRtcArray.push(rtcEntry(null, urls[6],
-          RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED));
+      expectedRtcArray.push(
+        rtcEntry(null, urls[5], RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED)
+      );
+      expectedRtcArray.push(
+        rtcEntry(null, urls[6], RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED)
+      );
       return executeTest({
-        urls, inflatedUrls: urls, rtcCalloutResponses, calloutCount,
-        expectedCalloutUrls, expectedRtcArray});
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls,
+        expectedRtcArray,
+      });
     });
 
     it('should send RTC callouts to inflated publisher URLs', () => {
-      const urls = generateUrls(1,2);
+      const urls = generateUrls(1, 2);
       const inflatedUrls = [
         'https://www.0.com/',
         'https://www.1.com/?slot_id=1',
@@ -252,8 +294,15 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         expectedRtcArray.push(rtcEntry(rtcResponse, inflatedUrls[i]));
       });
       const calloutCount = 3;
-      return executeTest({urls, customMacros, inflatedUrls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+      return executeTest({
+        urls,
+        customMacros,
+        inflatedUrls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
     it('should send RTC callouts to inflated vendor URLs', () => {
       const vendors = {
@@ -262,46 +311,65 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const inflatedUrls = [
         'https://localhost:8000/examples/rtcE1.json?slot_id=1&page_id=3&foo_id=4',
       ];
-      const rtcCalloutResponses = [
-        {'response1': {'fooArray': ['foo']}},
-      ];
+      const rtcCalloutResponses = [{'response1': {'fooArray': ['foo']}}];
       const customMacros = {
         PAGE_ID: () => 3,
         FOO_ID: () => 4,
       };
       const calloutCount = 1;
       const expectedRtcArray = [];
-      expectedRtcArray.push(rtcEntry(rtcCalloutResponses[0],
-          Object.keys(vendors)[0].toLowerCase(), undefined, true));
+      expectedRtcArray.push(
+        rtcEntry(
+          rtcCalloutResponses[0],
+          Object.keys(vendors)[0].toLowerCase(),
+          undefined,
+          true
+        )
+      );
       return executeTest({
-        vendors, customMacros, inflatedUrls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+        vendors,
+        customMacros,
+        inflatedUrls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
     it('should send callouts to vendor URLs with object/array macros', () => {
       const vendors = {
         'fAkeVeNdOR': {
           SLOT_ID: {'key': 'value'},
-          PAGE_ID: [1,2,3],
+          PAGE_ID: [1, 2, 3],
           FOO_ID: 'String',
         },
       };
       const inflatedUrls = [
         'https://localhost:8000/examples/rtcE1.json?slot_id=%7B%22key%22%3A%22' +
-            'value%22%7D&page_id=%5B1%2C2%2C3%5D&foo_id=String',
-      ];
-      const rtcCalloutResponses = [
-        {'response1': {'fooArray': ['foo']}},
+          'value%22%7D&page_id=%5B1%2C2%2C3%5D&foo_id=String',
       ];
+      const rtcCalloutResponses = [{'response1': {'fooArray': ['foo']}}];
       const calloutCount = 1;
       const expectedRtcArray = [];
-      expectedRtcArray.push(rtcEntry(rtcCalloutResponses[0],
-          Object.keys(vendors)[0].toLowerCase(), undefined, true));
+      expectedRtcArray.push(
+        rtcEntry(
+          rtcCalloutResponses[0],
+          Object.keys(vendors)[0].toLowerCase(),
+          undefined,
+          true
+        )
+      );
       return executeTest({
-        vendors, inflatedUrls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+        vendors,
+        inflatedUrls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
     it('should send RTC callouts to inflated publisher and vendor URLs', () => {
-      const urls = generateUrls(2,2);
+      const urls = generateUrls(2, 2);
       const vendors = {
         'fAkeVeNdOR': {SLOT_ID: 0, PAGE_ID: 1},
       };
@@ -321,14 +389,28 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const expectedRtcArray = [];
       for (let i = 0; i < 4; i++) {
         expectedRtcArray.push(
-            rtcEntry(rtcCalloutResponses[i], inflatedUrls[i]));
+          rtcEntry(rtcCalloutResponses[i], inflatedUrls[i])
+        );
       }
-      expectedRtcArray.push(rtcEntry(rtcCalloutResponses[4],
-          Object.keys(vendors)[0].toLowerCase(), undefined, true));
+      expectedRtcArray.push(
+        rtcEntry(
+          rtcCalloutResponses[4],
+          Object.keys(vendors)[0].toLowerCase(),
+          undefined,
+          true
+        )
+      );
       const calloutCount = 5;
       return executeTest({
-        urls, vendors, customMacros, inflatedUrls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+        urls,
+        vendors,
+        customMacros,
+        inflatedUrls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
     it('should ignore bad macros for vendor urls', () => {
       const vendors = {
@@ -341,18 +423,28 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const expectedRtcArray = [];
       for (let i = 0; i < 1; i++) {
         expectedRtcArray.push(
-            rtcEntry(rtcCalloutResponses[i],
-                Object.keys(vendors)[0].toLowerCase(), undefined, true));
+          rtcEntry(
+            rtcCalloutResponses[i],
+            Object.keys(vendors)[0].toLowerCase(),
+            undefined,
+            true
+          )
+        );
       }
       const calloutCount = 1;
       sandbox.stub(user(), 'error').callsFake(() => {});
       return executeTest({
-        vendors, inflatedUrls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+        vendors,
+        inflatedUrls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
 
     it('should favor publisher URLs over vendor URLs', () => {
-      const urls = generateUrls(3,2);
+      const urls = generateUrls(3, 2);
       const vendors = {
         'fAkeVeNdOR': {SLOT_ID: 0, PAGE_ID: 1},
       };
@@ -372,35 +464,53 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const expectedRtcArray = [];
       for (let i = 0; i < 5; i++) {
         expectedRtcArray.push(
-            rtcEntry(rtcCalloutResponses[i], inflatedUrls[i]));
+          rtcEntry(rtcCalloutResponses[i], inflatedUrls[i])
+        );
       }
       expectedRtcArray.push(
-          rtcEntry(null, Object.keys(vendors)[0].toLowerCase(),
-              RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED, true));
+        rtcEntry(
+          null,
+          Object.keys(vendors)[0].toLowerCase(),
+          RTC_ERROR_ENUM.MAX_CALLOUTS_EXCEEDED,
+          true
+        )
+      );
       const calloutCount = 5;
       return executeTest({
-        urls, vendors, customMacros, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: inflatedUrls, expectedRtcArray});
+        urls,
+        vendors,
+        customMacros,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: inflatedUrls,
+        expectedRtcArray,
+      });
     });
     it('should not send more than one RTC callout to the same url', () => {
-      const urls = [
-        'https://www.0.com/',
-        'https://www.0.com/',
-      ];
+      const urls = ['https://www.0.com/', 'https://www.0.com/'];
       const rtcCalloutResponses = generateCalloutResponses(1);
       const calloutCount = 1;
-      const expectedCalloutUrls = [
-        'https://www.0.com/',
-      ];
+      const expectedCalloutUrls = ['https://www.0.com/'];
       const expectedRtcArray = [
-        {response: rtcCalloutResponses[0],
-          callout: getCalloutParam_(urls[0]), rtcTime: 10},
-        {callout: getCalloutParam_(urls[1]),
-          error: RTC_ERROR_ENUM.DUPLICATE_URL, rtcTime: 10},
+        {
+          response: rtcCalloutResponses[0],
+          callout: getCalloutParam_(urls[0]),
+          rtcTime: 10,
+        },
+        {
+          callout: getCalloutParam_(urls[1]),
+          error: RTC_ERROR_ENUM.DUPLICATE_URL,
+          rtcTime: 10,
+        },
       ];
       return executeTest({
-        urls, inflatedUrls: urls, rtcCalloutResponses, calloutCount,
-        expectedCalloutUrls, expectedRtcArray});
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls,
+        expectedRtcArray,
+      });
     });
 
     it('should not send an RTC callout to an insecure url', () => {
@@ -414,21 +524,32 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         {'response2': {'insecure': ['virus']}},
       ];
       const calloutCount = 2;
-      const expectedCalloutUrls = [
-        'https://www.1.com/',
-        'https://www.2.com',
-      ];
+      const expectedCalloutUrls = ['https://www.1.com/', 'https://www.2.com'];
       const expectedRtcArray = [
-        {response: rtcCalloutResponses[0],
-          callout: getCalloutParam_(urls[0]), rtcTime: 10},
-        {response: rtcCalloutResponses[1],
-          callout: getCalloutParam_(urls[1]), rtcTime: 10},
-        {callout: getCalloutParam_(urls[2]),
-          error: RTC_ERROR_ENUM.INSECURE_URL, rtcTime: 10},
+        {
+          response: rtcCalloutResponses[0],
+          callout: getCalloutParam_(urls[0]),
+          rtcTime: 10,
+        },
+        {
+          response: rtcCalloutResponses[1],
+          callout: getCalloutParam_(urls[1]),
+          rtcTime: 10,
+        },
+        {
+          callout: getCalloutParam_(urls[2]),
+          error: RTC_ERROR_ENUM.INSECURE_URL,
+          rtcTime: 10,
+        },
       ];
       return executeTest({
-        urls, inflatedUrls: urls, rtcCalloutResponses, calloutCount,
-        expectedCalloutUrls, expectedRtcArray});
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls,
+        expectedRtcArray,
+      });
     });
     it('should not send RTC callout to unknown vendor', () => {
       const vendors = {
@@ -437,8 +558,13 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const calloutCount = 0;
       const expectedRtcArray = [];
       expectedRtcArray.push(
-          rtcEntry(null, Object.keys(vendors)[0].toLowerCase(),
-              RTC_ERROR_ENUM.UNKNOWN_VENDOR, true));
+        rtcEntry(
+          null,
+          Object.keys(vendors)[0].toLowerCase(),
+          RTC_ERROR_ENUM.UNKNOWN_VENDOR,
+          true
+        )
+      );
       return executeTest({vendors, calloutCount, expectedRtcArray});
     });
     it('should handle bad JSON response', () => {
@@ -447,12 +573,19 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const expectedRtcArray = [];
       rtcCalloutResponses.forEach((rtcResponse, i) => {
         expectedRtcArray.push(
-            rtcEntry(null, urls[i], RTC_ERROR_ENUM.MALFORMED_JSON_RESPONSE));
+          rtcEntry(null, urls[i], RTC_ERROR_ENUM.MALFORMED_JSON_RESPONSE)
+        );
       });
       const calloutCount = 1;
-      return executeTest({urls, inflatedUrls: urls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: urls, expectedRtcArray,
-        responseIsString: true});
+      return executeTest({
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: urls,
+        expectedRtcArray,
+        responseIsString: true,
+      });
     });
     it('should catch errors due to network failure', () => {
       const urls = generateUrls(1);
@@ -460,24 +593,32 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const expectedRtcArray = [];
       rtcCalloutResponses.forEach((rtcResponse, i) => {
         expectedRtcArray.push(
-            rtcEntry(null, urls[i], RTC_ERROR_ENUM.NETWORK_FAILURE));
+          rtcEntry(null, urls[i], RTC_ERROR_ENUM.NETWORK_FAILURE)
+        );
       });
       const calloutCount = 1;
-      return executeTest({urls, inflatedUrls: urls, rtcCalloutResponses,
-        calloutCount, expectedCalloutUrls: urls, expectedRtcArray,
-        failXhr: true});
+      return executeTest({
+        urls,
+        inflatedUrls: urls,
+        rtcCalloutResponses,
+        calloutCount,
+        expectedCalloutUrls: urls,
+        expectedRtcArray,
+        failXhr: true,
+      });
     });
     for (const consentState in CONSENT_POLICY_STATE) {
       it(`should handle consentState ${consentState}`, () => {
         setRtcConfig({urls: ['https://foo.com']});
         const rtcResult = maybeExecuteRealTimeConfig_(
-            {}, CONSENT_POLICY_STATE[consentState]);
+          {},
+          CONSENT_POLICY_STATE[consentState]
+        );
         switch (CONSENT_POLICY_STATE[consentState]) {
           case CONSENT_POLICY_STATE.SUFFICIENT:
           case CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED:
             expect(rtcResult).to.be.ok;
-            return rtcResult.then(() =>
-              expect(fetchJsonStub).to.be.calledOnce);
+            return rtcResult.then(() => expect(fetchJsonStub).to.be.calledOnce);
           case CONSENT_POLICY_STATE.UNKNOWN:
           case CONSENT_POLICY_STATE.INSUFFICIENT:
             return rtcResult.then(result => {
@@ -500,12 +641,17 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should return parsed rtcConfig for valid rtcConfig', () => {
       const rtcConfig = {
-        'vendors': {'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        'vendors': {
+          'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
           'nonexistent-vendor': {'SLOT_ID': '1'},
-          'fakeVendor2': {'SLOT_ID': '1'}},
-        'urls': ['https://localhost:4443/posts?slot_id=SLOT_ID',
-          'https://broken.zzzzzzz'],
-        'timeoutMillis': 500};
+          'fakeVendor2': {'SLOT_ID': '1'},
+        },
+        'urls': [
+          'https://localhost:4443/posts?slot_id=SLOT_ID',
+          'https://broken.zzzzzzz',
+        ],
+        'timeoutMillis': 500,
+      };
       setRtcConfig(rtcConfig);
       validateRtcConfig_(element);
       expect(rtc.rtcConfig_).to.be.ok;
@@ -514,12 +660,17 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should allow timeout of 0', () => {
       const rtcConfig = {
-        'vendors': {'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        'vendors': {
+          'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
           'nonexistent-vendor': {'SLOT_ID': '1'},
-          'fakeVendor2': {'SLOT_ID': '1'}},
-        'urls': ['https://localhost:4443/posts?slot_id=SLOT_ID',
-          'https://broken.zzzzzzz'],
-        'timeoutMillis': 0};
+          'fakeVendor2': {'SLOT_ID': '1'},
+        },
+        'urls': [
+          'https://localhost:4443/posts?slot_id=SLOT_ID',
+          'https://broken.zzzzzzz',
+        ],
+        'timeoutMillis': 0,
+      };
       setRtcConfig(rtcConfig);
       validateRtcConfig_(element);
       expect(rtc.rtcConfig_).to.be.ok;
@@ -528,19 +679,29 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should not allow timeout greater than default', () => {
       const rtcConfig = {
-        'vendors': {'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        'vendors': {
+          'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
           'nonexistent-vendor': {'SLOT_ID': '1'},
-          'fakeVendor2': {'SLOT_ID': '1'}},
-        'urls': ['https://localhost:4443/posts?slot_id=SLOT_ID',
-          'https://broken.zzzzzzz'],
-        'timeoutMillis': 1000000};
+          'fakeVendor2': {'SLOT_ID': '1'},
+        },
+        'urls': [
+          'https://localhost:4443/posts?slot_id=SLOT_ID',
+          'https://broken.zzzzzzz',
+        ],
+        'timeoutMillis': 1000000,
+      };
       const expectedRtcConfig = {
-        'vendors': {'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        'vendors': {
+          'fakeVendor': {'SLOT_ID': '1', 'PAGE_ID': '1'},
           'nonexistent-vendor': {'SLOT_ID': '1'},
-          'fakeVendor2': {'SLOT_ID': '1'}},
-        'urls': ['https://localhost:4443/posts?slot_id=SLOT_ID',
-          'https://broken.zzzzzzz'],
-        'timeoutMillis': 1000};
+          'fakeVendor2': {'SLOT_ID': '1'},
+        },
+        'urls': [
+          'https://localhost:4443/posts?slot_id=SLOT_ID',
+          'https://broken.zzzzzzz',
+        ],
+        'timeoutMillis': 1000,
+      };
       setRtcConfig(rtcConfig);
       validateRtcConfig_(element);
       expect(rtc.rtcConfig_).to.be.ok;
@@ -552,9 +713,13 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
     });
 
     // Test various misconfigurations that are missing vendors or urls.
-    [{'timeoutMillis': 500}, {'vendors': {}}, {'urls': []},
+    [
+      {'timeoutMillis': 500},
+      {'vendors': {}},
+      {'urls': []},
       {'vendors': {}, 'urls': []},
-      {'vendors': 'incorrect', 'urls': 'incorrect'}].forEach(rtcConfig => {
+      {'vendors': 'incorrect', 'urls': 'incorrect'},
+    ].forEach(rtcConfig => {
       it('should return false for rtcConfig missing required values', () => {
         setRtcConfig(rtcConfig);
         allowConsoleError(() => {
@@ -582,15 +747,18 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       const macroDelay = 20;
       const macros = {
         DUMMY: () => {
-          return Services.timerFor(env.win).promise(macroDelay).then(
-              () => {return 'foo';}
-          );
+          return Services.timerFor(env.win)
+            .promise(macroDelay)
+            .then(() => {
+              return 'foo';
+            });
         },
       };
       inflateAndSendRtc_(url, macros);
       return rtc.promiseArray_[0].then(errorResponse => {
         expect(errorResponse.error).to.equal(
-            RTC_ERROR_ENUM.MACRO_EXPAND_TIMEOUT);
+          RTC_ERROR_ENUM.MACRO_EXPAND_TIMEOUT
+        );
       });
     });
 
@@ -606,12 +774,10 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       return rtc.promiseArray_[0].then(errorResponse => {
         expect(errorResponse).to.be.undefined;
       });
-
     });
   });
 
   describe('modifyRtcConfigForConsentStateSettings', () => {
-
     beforeEach(() => {
       rtc.rtcConfig_ = {
         'vendors': {
@@ -623,7 +789,8 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
           'https://www.rtc.com/example1',
           'https://www.other-rtc.com/example2',
         ],
-        'timeoutMillis': 500};
+        'timeoutMillis': 500,
+      };
     });
 
     it('should not modify rtcConfig if consent state is valid', () => {
@@ -669,12 +836,18 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should clear just invalid custom URLs', () => {
       rtc.rtcConfig_.vendors = {
-        'vendorA': {'sendRegardlessOfConsentState': true,
-          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'}},
-        'vendorB': {'sendRegardlessOfConsentState': ['INSUFFICIENT', 'UNKNOWN'],
-          'macros': {'SLOT_ID': '1'}},
-        'vendorC': {'sendRegardlessOfConsentState': ['UNKNOWN'],
-          'macros': {'SLOT_ID': '1'}},
+        'vendorA': {
+          'sendRegardlessOfConsentState': true,
+          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        },
+        'vendorB': {
+          'sendRegardlessOfConsentState': ['INSUFFICIENT', 'UNKNOWN'],
+          'macros': {'SLOT_ID': '1'},
+        },
+        'vendorC': {
+          'sendRegardlessOfConsentState': ['UNKNOWN'],
+          'macros': {'SLOT_ID': '1'},
+        },
       };
       const expectedRtcConfig = Object.assign({}, rtc.rtcConfig_);
       expectedRtcConfig.urls = [];
@@ -685,10 +858,14 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should clear just invalid vendor callouts', () => {
       rtc.rtcConfig_.urls = [
-        {'sendRegardlessOfConsentState': true,
-          'url': 'https://www.rtc.com/example1'},
-        {'sendRegardlessOfConsentState': ['INSUFFICIENT', 'UNKNOWN'],
-          'url': 'https://www.other-rtc.com/example2'},
+        {
+          'sendRegardlessOfConsentState': true,
+          'url': 'https://www.rtc.com/example1',
+        },
+        {
+          'sendRegardlessOfConsentState': ['INSUFFICIENT', 'UNKNOWN'],
+          'url': 'https://www.other-rtc.com/example2',
+        },
       ];
       const expectedRtcConfig = Object.assign({}, rtc.rtcConfig_);
       expectedRtcConfig.vendors = {};
@@ -699,25 +876,35 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should not clear callouts if per-callout setting valid', () => {
       rtc.rtcConfig_.vendors = {
-        'vendorA': {'sendRegardlessOfConsentState': true,
-          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'}},
-        'vendorB': {'sendRegardlessOfConsentState': ['UNKNOWN'],
-          'macros': {'SLOT_ID': '1'}},
+        'vendorA': {
+          'sendRegardlessOfConsentState': true,
+          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        },
+        'vendorB': {
+          'sendRegardlessOfConsentState': ['UNKNOWN'],
+          'macros': {'SLOT_ID': '1'},
+        },
         'vendorC': {'SLOT_ID': '1'},
       };
       rtc.rtcConfig_.urls = [
-        {'sendRegardlessOfConsentState': true,
-          'url': 'https://www.rtc.com/example1'},
+        {
+          'sendRegardlessOfConsentState': true,
+          'url': 'https://www.rtc.com/example1',
+        },
         'https://www.other-rtc.com/example2',
       ];
       const expectedRtcConfig = Object.assign({}, rtc.rtcConfig_);
       expectedRtcConfig.vendors = {
-        'vendorA': {'sendRegardlessOfConsentState': true,
-          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'}},
+        'vendorA': {
+          'sendRegardlessOfConsentState': true,
+          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        },
       };
       expectedRtcConfig.urls = [
-        {'sendRegardlessOfConsentState': true,
-          'url': 'https://www.rtc.com/example1'},
+        {
+          'sendRegardlessOfConsentState': true,
+          'url': 'https://www.rtc.com/example1',
+        },
       ];
       rtc.consentState_ = CONSENT_POLICY_STATE.INSUFFICIENT;
       rtc.modifyRtcConfigForConsentStateSettings();
@@ -726,28 +913,39 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
 
     it('should handle mix of global and individual consent settings', () => {
       rtc.rtcConfig_.vendors = {
-        'vendorA': {'sendRegardlessOfConsentState': true,
-          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'}},
-        'vendorB': {'sendRegardlessOfConsentState': ['UNKNOWN'],
-          'macros': {'SLOT_ID': '1'}},
+        'vendorA': {
+          'sendRegardlessOfConsentState': true,
+          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        },
+        'vendorB': {
+          'sendRegardlessOfConsentState': ['UNKNOWN'],
+          'macros': {'SLOT_ID': '1'},
+        },
         'vendorC': {'SLOT_ID': '1'},
       };
       rtc.rtcConfig_.urls = [
-        {'sendRegardlessOfConsentState': true,
-          'url': 'https://www.rtc.com/example1'},
+        {
+          'sendRegardlessOfConsentState': true,
+          'url': 'https://www.rtc.com/example1',
+        },
         'https://www.other-rtc.com/example2',
       ];
       rtc.rtcConfig_.sendRegardlessOfConsentState = ['INSUFFICIENT'];
       const expectedRtcConfig = Object.assign({}, rtc.rtcConfig_);
       expectedRtcConfig.vendors = {
-        'vendorA': {'sendRegardlessOfConsentState': true,
-          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'}},
+        'vendorA': {
+          'sendRegardlessOfConsentState': true,
+          'macros': {'SLOT_ID': '1', 'PAGE_ID': '1'},
+        },
         'vendorC': {'SLOT_ID': '1'},
       };
       expectedRtcConfig.urls = [
-        {'sendRegardlessOfConsentState': true,
-          'url': 'https://www.rtc.com/example1'},
-        'https://www.other-rtc.com/example2'];
+        {
+          'sendRegardlessOfConsentState': true,
+          'url': 'https://www.rtc.com/example1',
+        },
+        'https://www.other-rtc.com/example2',
+      ];
       rtc.consentState_ = CONSENT_POLICY_STATE.INSUFFICIENT;
       rtc.modifyRtcConfigForConsentStateSettings();
       expect(rtc.rtcConfig_).to.deep.equal(expectedRtcConfig);
@@ -769,7 +967,6 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
       rtc.modifyRtcConfigForConsentStateSettings();
       expect(rtc.rtcConfig_).to.deep.equal(expectedRtcConfig);
     });
-
   });
 
   describe('sendErrorMessage', () => {
@@ -793,8 +990,9 @@ describes.realWin('real-time-config-manager', {amp: true}, env => {
         HREF: env.win.location.href,
       };
 
-      requestUrl = Services.urlReplacementsForDoc(a4aElement.element)
-          .expandUrlSync(errorReportingUrl, macros, whitelist);
+      requestUrl = Services.urlReplacementsForDoc(
+        a4aElement.element
+      ).expandUrlSync(errorReportingUrl, macros, whitelist);
     });
 
     it('should send error message pingback to correct url', () => {
diff --git a/extensions/amp-a4a/0.1/test/test-refresh.js b/extensions/amp-a4a/0.1/test/test-refresh.js
index 80cf14ea1b39..0cd21cd91664 100644
--- a/extensions/amp-a4a/0.1/test/test-refresh.js
+++ b/extensions/amp-a4a/0.1/test/test-refresh.js
@@ -21,13 +21,10 @@ import {
   RefreshManager,
   getPublisherSpecifiedRefreshInterval,
 } from '../refresh-manager';
-import {
-  RefreshIntersectionObserverWrapper,
-} from '../refresh-intersection-observer-wrapper';
+import {RefreshIntersectionObserverWrapper} from '../refresh-intersection-observer-wrapper';
 import {Services} from '../../../../src/services';
 
 describe('refresh', () => {
-
   let mockA4a;
   let sandbox;
   const config = {
@@ -45,7 +42,6 @@ describe('refresh', () => {
     return div;
   }
 
-
   beforeEach(() => {
     sandbox = sinon.sandbox;
     mockA4a = {
@@ -60,16 +56,25 @@ describe('refresh', () => {
   });
 
   describe('refresh-manager', () => {
-
     it('should get null refreshInterval', () => {
       mockA4a.element.removeAttribute(DATA_ATTR_NAME);
-      expect(getPublisherSpecifiedRefreshInterval(
-          mockA4a.element, window, 'doubleclick')).to.be.null;
+      expect(
+        getPublisherSpecifiedRefreshInterval(
+          mockA4a.element,
+          window,
+          'doubleclick'
+        )
+      ).to.be.null;
     });
 
     it('should get refreshInterval from slot', () => {
-      expect(getPublisherSpecifiedRefreshInterval(
-          mockA4a.element, window, 'doubleclick')).to.equal(35000);
+      expect(
+        getPublisherSpecifiedRefreshInterval(
+          mockA4a.element,
+          window,
+          'doubleclick'
+        )
+      ).to.equal(35000);
     });
 
     it('should get refreshInterval from meta tag', () => {
@@ -78,17 +83,28 @@ describe('refresh', () => {
       meta.setAttribute('name', METATAG_NAME);
       meta.setAttribute('content', 'doubleclick=40');
       window.document.head.appendChild(meta);
-      expect(getPublisherSpecifiedRefreshInterval(
-          mockA4a.element, window, 'doubleclick')).to.equal(40000);
+      expect(
+        getPublisherSpecifiedRefreshInterval(
+          mockA4a.element,
+          window,
+          'doubleclick'
+        )
+      ).to.equal(40000);
     });
 
     it('should call convertConfiguration_ and set proper units', () => {
       const getConfigurationSpy = sandbox.spy(
-          RefreshManager.prototype, 'convertAndSanitizeConfiguration_');
-      const refreshManager = new RefreshManager(mockA4a, {
-        visiblePercentageMin: 50,
-        continuousTimeMin: 1,
-      }, 30000);
+        RefreshManager.prototype,
+        'convertAndSanitizeConfiguration_'
+      );
+      const refreshManager = new RefreshManager(
+        mockA4a,
+        {
+          visiblePercentageMin: 50,
+          continuousTimeMin: 1,
+        },
+        30000
+      );
       expect(getConfigurationSpy).to.be.calledOnce;
       expect(refreshManager.config_).to.not.be.null;
       expect(refreshManager.config_.visiblePercentageMin).to.equal(0.5);
@@ -98,12 +114,13 @@ describe('refresh', () => {
     describe('#ioCallback_', () => {
       let refreshManager;
       beforeEach(
-          () => refreshManager = new RefreshManager(mockA4a, config, 30000));
+        () => (refreshManager = new RefreshManager(mockA4a, config, 30000))
+      );
 
       it('should stay in INITIAL state', () => {
         const ioEntry = {
           target: {
-            getAttribute: name => name == DATA_MANAGER_ID_NAME ? '0' : null,
+            getAttribute: name => (name == DATA_MANAGER_ID_NAME ? '0' : null),
           },
           intersectionRatio: refreshManager.config_.visiblePercentageMin,
         };
@@ -158,15 +175,16 @@ describe('refresh', () => {
       };
       refreshManager.refreshInterval_ = 0;
       refreshManager.initiateRefreshCycle();
-      return Services.timerFor(window).promise(500).then(() => {
-        expect(refreshSpy).to.be.calledOnce;
-        window.document.body.removeChild(mockA4a.element);
-      });
+      return Services.timerFor(window)
+        .promise(500)
+        .then(() => {
+          expect(refreshSpy).to.be.calledOnce;
+          window.document.body.removeChild(mockA4a.element);
+        });
     });
   });
 
   describe('RefreshIntersectionObserverWrapper', () => {
-
     let callback;
     let callbackPromise;
     let getRect;
@@ -191,9 +209,13 @@ describe('refresh', () => {
       });
       sandbox.stub(Services, 'ampdoc').callsFake(() => {
         return {
-          getRootNode: () => {return window.document;},
+          getRootNode: () => {
+            return window.document;
+          },
           win: window,
-          isSingleDoc: () => {return true;},
+          isSingleDoc: () => {
+            return true;
+          },
         };
       });
 
@@ -209,7 +231,10 @@ describe('refresh', () => {
       });
       callback = entries => resolver(entries);
       observerWrapper = new RefreshIntersectionObserverWrapper(
-          callback, mockA4a, {threshold: 0.5});
+        callback,
+        mockA4a,
+        {threshold: 0.5}
+      );
     });
 
     it('should invoke callback with intersection ratio 1', () => {
@@ -257,9 +282,11 @@ describe('refresh', () => {
         }),
       };
       observerWrapper.observe(mockA4a.element);
-      return Services.timerFor(window).promise(500).then(() => {
-        expect(callbackSpy).to.not.be.called;
-      });
+      return Services.timerFor(window)
+        .promise(500)
+        .then(() => {
+          expect(callbackSpy).to.not.be.called;
+        });
     });
   });
 });
diff --git a/extensions/amp-a4a/0.1/test/test-signature-verifier.js b/extensions/amp-a4a/0.1/test/test-signature-verifier.js
index 19b44cb64f5a..82961149abbe 100644
--- a/extensions/amp-a4a/0.1/test/test-signature-verifier.js
+++ b/extensions/amp-a4a/0.1/test/test-signature-verifier.js
@@ -16,7 +16,6 @@
 
 // TODO(@jridgewell, #11081): fix linter to allow fixing weird indentation
 
-
 import {SignatureVerifier, VerificationStatus} from '../signature-verifier';
 import {base64EncodeFromBytes} from '../../../../src/utils/base64';
 import {dev, user} from '../../../../src/log';
@@ -25,7 +24,6 @@ import {utf8Encode} from '../../../../src/utils/bytes';
 const networkFailure = {throws: new TypeError('Failed to fetch')};
 
 describes.fakeWin('SignatureVerifier', {amp: true}, env => {
-
   let mockDevError;
   beforeEach(() => {
     mockDevError = env.sandbox.mock(dev()).expects('error');
@@ -37,8 +35,9 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
 
   /** @param {string} signingServiceName */
   const expectSigningServiceError = signingServiceName => {
-    mockDevError.withExactArgs('AMP-A4A', sinon.match(signingServiceName))
-        .once();
+    mockDevError
+      .withExactArgs('AMP-A4A', sinon.match(signingServiceName))
+      .once();
   };
 
   const creative1 = utf8Encode('Hello world!');
@@ -51,12 +50,16 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
     const verifier = new SignatureVerifier(env.win);
     verifier.loadKeyset('service-1');
     return verifier
-        .verifyCreativeAndSignature(
-            'service-1', 'key-1', creative1, new Uint8Array(256))
-        .then(status => {
-          expect(status).to.equal(VerificationStatus.CRYPTO_UNAVAILABLE);
-          expect(env.fetchMock.called()).to.be.false;
-        });
+      .verifyCreativeAndSignature(
+        'service-1',
+        'key-1',
+        creative1,
+        new Uint8Array(256)
+      )
+      .then(status => {
+        expect(status).to.equal(VerificationStatus.CRYPTO_UNAVAILABLE);
+        expect(env.fetchMock.called()).to.be.false;
+      });
   });
 
   const crypto = window.crypto || window.msCrypto;
@@ -76,13 +79,15 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
         this.kid = kid;
         /** @const {!Promise<{privateKey: !webCrypto.CryptoKey, publicKey: !webCrypto.CryptoKey}>} */
         this.keysPromise = subtle.generateKey(
-            {
-              name: 'RSASSA-PKCS1-v1_5',
-              modulusLength: 2048,
-              publicExponent: Uint8Array.of(1, 0, 1),
-              hash: {name: 'SHA-256'},
-            },
-            true, ['sign', 'verify']);
+          {
+            name: 'RSASSA-PKCS1-v1_5',
+            modulusLength: 2048,
+            publicExponent: Uint8Array.of(1, 0, 1),
+            hash: {name: 'SHA-256'},
+          },
+          true,
+          ['sign', 'verify']
+        );
       }
 
       /**
@@ -91,20 +96,24 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
        */
       sign(data) {
         return this.keysPromise
-            .then(({privateKey}) => subtle.sign(
-                {name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}},
-                privateKey, data))
-            .then(signature => new Uint8Array(signature));
+          .then(({privateKey}) =>
+            subtle.sign(
+              {name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}},
+              privateKey,
+              data
+            )
+          )
+          .then(signature => new Uint8Array(signature));
       }
 
       /** @return {!Promise<!JsonObject>} */
       jwk() {
         return this.keysPromise
-            .then(({publicKey}) => subtle.exportKey('jwk', publicKey))
-            .then(jwk => {
-              jwk['kid'] = this.kid;
-              return jwk;
-            });
+          .then(({publicKey}) => subtle.exportKey('jwk', publicKey))
+          .then(jwk => {
+            jwk['kid'] = this.kid;
+            return jwk;
+          });
       }
     };
 
@@ -115,8 +124,10 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
      * @return {!Promise<!JsonObject>}
      */
     const jwkSet = keys =>
-      Promise.all(keys.map(key => key.jwk()))
-          .then(jwks => ({body: {'keys': jwks}, headers}));
+      Promise.all(keys.map(key => key.jwk())).then(jwks => ({
+        body: {'keys': jwks},
+        headers,
+      }));
 
     const key1 = new Keypair('key-1');
     const key2 = new Keypair('key-2');
@@ -134,322 +145,456 @@ describes.fakeWin('SignatureVerifier', {amp: true}, env => {
       expect(env.fetchMock.done()).to.be.true;
     });
 
-    it('should verify a signature',
-        () => key1.sign(creative1).then(signature => {
+    it('should verify a signature', () =>
+      key1.sign(creative1).then(signature => {
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.OK);
+      }));
+
+    it('should verify multiple signatures with only one network request', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
           env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', jwkSet([key1]));
+            'https://signingservice1.net/keyset.json',
+            jwkSet([key1])
+          );
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.OK);
-        }));
-
-    it('should verify multiple signatures with only one network request',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json', jwkSet([key1]));
-              verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.OK);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.OK);
-                  });
-            })));
-
-    it('should verify signatures from multiple signing services',
-        () => key1.sign(creative1).then(
-            signature1 => key2.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json', jwkSet([key1]));
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.OK);
               verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.OK);
-                    env.fetchMock.getOnce(
-                        'https://signingservice2.net/keyset.json',
-                        jwkSet([key2]));
-                    verifier.loadKeyset('service-2');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-2', 'key-2', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.OK);
-                  });
-            })));
-
-    it('should verify signatures when different signing services share a kid',
-        () => key1.sign(creative1).then(signature1 => {
-          const key1FromService2 = new Keypair('key-1');
-          return key1FromService2.sign(creative2).then(signature2 => {
-            env.fetchMock.getOnce(
-                'https://signingservice1.net/keyset.json', jwkSet([key1]));
-            verifier.loadKeyset('service-1');
-            return verifier
-                .verifyCreativeAndSignature(
-                    'service-1', 'key-1', signature1, creative1)
-                .then(status => {
-                  expect(status).to.equal(VerificationStatus.OK);
-                  env.fetchMock.getOnce(
-                      'https://signingservice2.net/keyset.json',
-                      jwkSet([key1FromService2]));
-                  verifier.loadKeyset('service-2');
-                  return expect(
-                      verifier.verifyCreativeAndSignature(
-                          'service-2', 'key-1', signature2, creative2))
-                      .to.eventually.equal(VerificationStatus.OK);
-                });
-          });
-        }));
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.OK);
+            });
+        })
+      ));
 
-    it('should verify a signature from a newly added key',
-        () => key2.sign(creative1).then(signature => {
+    it('should verify signatures from multiple signing services', () =>
+      key1.sign(creative1).then(signature1 =>
+        key2.sign(creative2).then(signature2 => {
           env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', () => {
-                env.fetchMock.getOnce(
-                    'https://signingservice1.net/keyset.json?kid=key-2',
-                    jwkSet([key2]));
-                return jwkSet([key1]);
-              });
+            'https://signingservice1.net/keyset.json',
+            jwkSet([key1])
+          );
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-2', signature, creative1))
-              .to.eventually.equal(VerificationStatus.OK);
-        }));
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.OK);
+              env.fetchMock.getOnce(
+                'https://signingservice2.net/keyset.json',
+                jwkSet([key2])
+              );
+              verifier.loadKeyset('service-2');
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-2',
+                  'key-2',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.OK);
+            });
+        })
+      ));
 
-    it('should return ERROR_KEY_NOT_FOUND for a nonexistent kid',
-        () => key1.sign(creative1).then(signature => {
+    it('should verify signatures when different signing services share a kid', () =>
+      key1.sign(creative1).then(signature1 => {
+        const key1FromService2 = new Keypair('key-1');
+        return key1FromService2.sign(creative2).then(signature2 => {
           env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', () => {
-                env.fetchMock.getOnce(
-                    'https://signingservice1.net/keyset.json?kid=key-1',
-                    jwkSet([]));
-                return jwkSet([]);
-              });
+            'https://signingservice1.net/keyset.json',
+            jwkSet([key1])
+          );
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.ERROR_KEY_NOT_FOUND);
-        }));
-
-    it('should not make more network requests retrying a nonexistent kid',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.OK);
               env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json', () => {
-                    env.fetchMock.getOnce(
-                        'https://signingservice1.net/keyset.json?kid=key-1',
-                        jwkSet([]));
-                    return jwkSet([]);
-                  });
-              verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(
-                        VerificationStatus.ERROR_KEY_NOT_FOUND);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(
-                            VerificationStatus.ERROR_KEY_NOT_FOUND);
-                  });
-            })));
-
-    it('should return ERROR_SIGNATURE_MISMATCH for a wrong signature',
-        () => key2.sign(creative1).then(signature => {
-          env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', jwkSet([key1]));
-          verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.ERROR_SIGNATURE_MISMATCH);
-        }));
+                'https://signingservice2.net/keyset.json',
+                jwkSet([key1FromService2])
+              );
+              verifier.loadKeyset('service-2');
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-2',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.OK);
+            });
+        });
+      }));
 
-    it('should return UNVERIFIED and report on Web Cryptography error',
-        () => key1.sign(creative1).then(signature => {
+    it('should verify a signature from a newly added key', () =>
+      key2.sign(creative1).then(signature => {
+        env.fetchMock.getOnce('https://signingservice1.net/keyset.json', () => {
           env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', jwkSet([key1]));
-          const errorMessage = 'Web Cryptography failed';
-          env.stubService('crypto', 'verifyPkcs')
-              .returns(Promise.reject(new Error(errorMessage)));
-          mockDevError.withExactArgs('AMP-A4A', sinon.match(errorMessage))
-              .once();
+            'https://signingservice1.net/keyset.json?kid=key-2',
+            jwkSet([key2])
+          );
+          return jwkSet([key1]);
+        });
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-2',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.OK);
+      }));
+
+    it('should return ERROR_KEY_NOT_FOUND for a nonexistent kid', () =>
+      key1.sign(creative1).then(signature => {
+        env.fetchMock.getOnce('https://signingservice1.net/keyset.json', () => {
+          env.fetchMock.getOnce(
+            'https://signingservice1.net/keyset.json?kid=key-1',
+            jwkSet([])
+          );
+          return jwkSet([]);
+        });
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.ERROR_KEY_NOT_FOUND);
+      }));
+
+    it('should not make more network requests retrying a nonexistent kid', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
+          env.fetchMock.getOnce(
+            'https://signingservice1.net/keyset.json',
+            () => {
+              env.fetchMock.getOnce(
+                'https://signingservice1.net/keyset.json?kid=key-1',
+                jwkSet([])
+              );
+              return jwkSet([]);
+            }
+          );
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.UNVERIFIED);
-        }));
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.ERROR_KEY_NOT_FOUND);
+              verifier.loadKeyset('service-1');
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.ERROR_KEY_NOT_FOUND);
+            });
+        })
+      ));
 
-    it('should return UNVERIFIED on network connectivity error',
-        () => key1.sign(creative1).then(signature => {
+    it('should return ERROR_SIGNATURE_MISMATCH for a wrong signature', () =>
+      key2.sign(creative1).then(signature => {
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.ERROR_SIGNATURE_MISMATCH);
+      }));
+
+    it('should return UNVERIFIED and report on Web Cryptography error', () =>
+      key1.sign(creative1).then(signature => {
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
+        const errorMessage = 'Web Cryptography failed';
+        env
+          .stubService('crypto', 'verifyPkcs')
+          .returns(Promise.reject(new Error(errorMessage)));
+        mockDevError.withExactArgs('AMP-A4A', sinon.match(errorMessage)).once();
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+      }));
+
+    it('should return UNVERIFIED on network connectivity error', () =>
+      key1.sign(creative1).then(signature => {
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          networkFailure
+        );
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+      }));
+
+    it('should not retry for same service on network connectivity error', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
           env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json', networkFailure);
+            'https://signingservice1.net/keyset.json',
+            networkFailure
+          );
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.UNVERIFIED);
-        }));
-
-    it('should not retry for same service on network connectivity error',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json', networkFailure);
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.UNVERIFIED);
               verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.UNVERIFIED);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.UNVERIFIED);
-                  });
-            })));
-
-    it('should return UNVERIFIED, report, and not retry on malformed JSON',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json',
-                  {body: '{"keys":', headers});
-              expectSigningServiceError('service-1');
-              verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.UNVERIFIED);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.UNVERIFIED);
-                  });
-            })));
-
-    it('should return UNVERIFIED, report, and not retry on non-JWK Set JSON',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json',
-                  {body: '{"foo":"bar"}', headers});
-              expectSigningServiceError('service-1');
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+            });
+        })
+      ));
+
+    it('should return UNVERIFIED, report, and not retry on malformed JSON', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
+          env.fetchMock.getOnce('https://signingservice1.net/keyset.json', {
+            body: '{"keys":',
+            headers,
+          });
+          expectSigningServiceError('service-1');
+          verifier.loadKeyset('service-1');
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.UNVERIFIED);
               verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.UNVERIFIED);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.UNVERIFIED);
-                  });
-            })));
-
-    it('should report on extraneous malformed data',
-        () => key1.sign(creative1).then(signature => {
-          env.fetchMock.getOnce(
-              'https://signingservice1.net/keyset.json',
-              jwkSet([key1]).then(keyset => {
-                keyset.body['keys'].push({'foo': 'bar'});
-                return keyset;
-              }));
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+            });
+        })
+      ));
+
+    it('should return UNVERIFIED, report, and not retry on non-JWK Set JSON', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
+          env.fetchMock.getOnce('https://signingservice1.net/keyset.json', {
+            body: '{"foo":"bar"}',
+            headers,
+          });
           expectSigningServiceError('service-1');
           verifier.loadKeyset('service-1');
-          return expect(
-              verifier.verifyCreativeAndSignature(
-                  'service-1', 'key-1', signature, creative1))
-              .to.eventually.equal(VerificationStatus.OK);
-        }));
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.UNVERIFIED);
+              verifier.loadKeyset('service-1');
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+            });
+        })
+      ));
 
-    it('should return UNVERIFIED, report, and not retry on malformed key',
-        () => key1.sign(creative1).then(
-            signature1 => key1.sign(creative2).then(signature2 => {
-              env.fetchMock.getOnce(
-                  'https://signingservice1.net/keyset.json',
-                  {body: {'keys': [{'kid': 'key-1', 'foo': 'bar'}]}, headers});
-              expectSigningServiceError('service-1');
+    it('should report on extraneous malformed data', () =>
+      key1.sign(creative1).then(signature => {
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1]).then(keyset => {
+            keyset.body['keys'].push({'foo': 'bar'});
+            return keyset;
+          })
+        );
+        expectSigningServiceError('service-1');
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verifyCreativeAndSignature(
+            'service-1',
+            'key-1',
+            signature,
+            creative1
+          )
+        ).to.eventually.equal(VerificationStatus.OK);
+      }));
+
+    it('should return UNVERIFIED, report, and not retry on malformed key', () =>
+      key1.sign(creative1).then(signature1 =>
+        key1.sign(creative2).then(signature2 => {
+          env.fetchMock.getOnce('https://signingservice1.net/keyset.json', {
+            body: {'keys': [{'kid': 'key-1', 'foo': 'bar'}]},
+            headers,
+          });
+          expectSigningServiceError('service-1');
+          verifier.loadKeyset('service-1');
+          return verifier
+            .verifyCreativeAndSignature(
+              'service-1',
+              'key-1',
+              signature1,
+              creative1
+            )
+            .then(status => {
+              expect(status).to.equal(VerificationStatus.UNVERIFIED);
               verifier.loadKeyset('service-1');
-              return verifier
-                  .verifyCreativeAndSignature(
-                      'service-1', 'key-1', signature1, creative1)
-                  .then(status => {
-                    expect(status).to.equal(VerificationStatus.UNVERIFIED);
-                    verifier.loadKeyset('service-1');
-                    return expect(
-                        verifier.verifyCreativeAndSignature(
-                            'service-1', 'key-1', signature2, creative2))
-                        .to.eventually.equal(VerificationStatus.UNVERIFIED);
-                  });
-            })));
+              return expect(
+                verifier.verifyCreativeAndSignature(
+                  'service-1',
+                  'key-1',
+                  signature2,
+                  creative2
+                )
+              ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+            });
+        })
+      ));
 
     describe('#verify', () => {
-      it('should verify a signature header',
-          () => key1.sign(creative1).then(signature => {
-            env.fetchMock.getOnce(
-                'https://signingservice1.net/keyset.json', jwkSet([key1]));
-            verifier.loadKeyset('service-1');
-            return expect(
-                verifier.verify(
-                    creative1,
-                    new Headers({
-                      'AMP-Fast-Fetch-Signature':
-                         `service-1:key-1:${base64EncodeFromBytes(signature)}`,
-                    })))
-                .to.eventually.equal(VerificationStatus.OK);
-          }));
+      it('should verify a signature header', () =>
+        key1.sign(creative1).then(signature => {
+          env.fetchMock.getOnce(
+            'https://signingservice1.net/keyset.json',
+            jwkSet([key1])
+          );
+          verifier.loadKeyset('service-1');
+          return expect(
+            verifier.verify(
+              creative1,
+              new Headers({
+                'AMP-Fast-Fetch-Signature': `service-1:key-1:${base64EncodeFromBytes(
+                  signature
+                )}`,
+              })
+            )
+          ).to.eventually.equal(VerificationStatus.OK);
+        }));
 
       it('should return UNVERIFIED on no header', () => {
         env.fetchMock.getOnce(
-            'https://signingservice1.net/keyset.json', jwkSet([key1]));
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
         verifier.loadKeyset('service-1');
-        return expect(verifier.verify(creative1, new Headers()))
-            .to.eventually.equal(VerificationStatus.UNVERIFIED);
+        return expect(
+          verifier.verify(creative1, new Headers())
+        ).to.eventually.equal(VerificationStatus.UNVERIFIED);
       });
 
-      it('should return UNVERIFIED on no header when crypto unavailable',
-          () => {
-            env.sandbox.stub(env.win, 'crypto').callsFake(undefined);
-            env.fetchMock.getOnce(
-                'https://signingservice1.net/keyset.json', jwkSet([key1]));
-            verifier.loadKeyset('service-1');
-            return expect(verifier.verify(creative1, new Headers()))
-                .to.eventually.equal(VerificationStatus.UNVERIFIED);
-          });
+      it('should return UNVERIFIED on no header when crypto unavailable', () => {
+        env.sandbox.stub(env.win, 'crypto').callsFake(undefined);
+        env.fetchMock.getOnce(
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
+        verifier.loadKeyset('service-1');
+        return expect(
+          verifier.verify(creative1, new Headers())
+        ).to.eventually.equal(VerificationStatus.UNVERIFIED);
+      });
 
       it('should return ERROR_SIGNATURE_MISMATCH on malformed header', () => {
         env.fetchMock.getOnce(
-            'https://signingservice1.net/keyset.json', jwkSet([key1]));
+          'https://signingservice1.net/keyset.json',
+          jwkSet([key1])
+        );
         env.sandbox.stub(user(), 'error');
         verifier.loadKeyset('service-1');
         return expect(
-            verifier.verify(
-                creative1,
-                new Headers({
-                  'AMP-Fast-Fetch-Signature': 'service-1:key-1:Invalid base64!',
-                })))
-            .to.eventually.equal(VerificationStatus.ERROR_SIGNATURE_MISMATCH);
+          verifier.verify(
+            creative1,
+            new Headers({
+              'AMP-Fast-Fetch-Signature': 'service-1:key-1:Invalid base64!',
+            })
+          )
+        ).to.eventually.equal(VerificationStatus.ERROR_SIGNATURE_MISMATCH);
       });
     });
   });
diff --git a/extensions/amp-a4a/0.1/test/test-template-renderer.js b/extensions/amp-a4a/0.1/test/test-template-renderer.js
index 619d81034651..aaf99812b350 100644
--- a/extensions/amp-a4a/0.1/test/test-template-renderer.js
+++ b/extensions/amp-a4a/0.1/test/test-template-renderer.js
@@ -32,7 +32,6 @@ const realWinConfig = {
 };
 
 describes.realWin('TemplateRenderer', realWinConfig, env => {
-
   const templateUrl = 'https://adnetwork.com/amp-template.html';
   const headers = {
     get: name => {
@@ -61,10 +60,16 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
     });
     containerElement.renderStarted = () => {};
     containerElement.getPageLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.getLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.getIntersectionChangeEntry = () => ({});
     containerElement.isInViewport = () => true;
@@ -84,12 +89,17 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
       return Promise.resolve(data.adTemplate);
     });
 
-    validatorPromise = validator.validate(context,
-        utf8Encode(JSON.stringify({
+    validatorPromise = validator.validate(
+      context,
+      utf8Encode(
+        JSON.stringify({
           templateUrl,
           data: {url: 'https://buy.com/buy-1'},
           analytics: {foo: 'bar'},
-        })), headers);
+        })
+      ),
+      headers
+    );
   });
 
   afterEach(() => {
@@ -100,86 +110,89 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
   it('should append iframe child with correct template values', () => {
     env.win.AMP.registerTemplate('amp-mustache', AmpMustache);
     return validatorPromise.then(validatorOutput => {
-
       // Sanity check. This behavior is tested in test-template-validator.js.
       expect(validatorOutput).to.be.ok;
       expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
       const {creativeData} = validatorOutput;
       expect(creativeData).to.be.ok;
-      return renderer.render(context, containerElement, creativeData)
-          .then(() => {
-            const iframe = containerElement.querySelector('iframe');
-            expect(iframe).to.be.ok;
-            expect(iframe.contentWindow.document.body.innerHTML.trim()).to
-                .equal('<div>\n      <p>ipsum lorem</p>\n      <a href=' +
-                    '"https://buy.com/buy-1" target="_top">Click for ad!</a>' +
-                    '\n    <amp-analytics class="i-amphtml-element i-amphtml' +
-                    '-notbuilt amp-notbuilt i-amphtml-layout-fixed i-amphtml' +
-                    '-layout-size-defined amp-unresolved i-amphtml-' +
-                    'unresolved" i-amphtml-layout="fixed" style="width: 1px;' +
-                    ' height: 1px;"></amp-analytics></div>');
-          });
+      return renderer
+        .render(context, containerElement, creativeData)
+        .then(() => {
+          const iframe = containerElement.querySelector('iframe');
+          expect(iframe).to.be.ok;
+          expect(iframe.contentWindow.document.body.innerHTML.trim()).to.equal(
+            '<div>\n      <p>ipsum lorem</p>\n      <a href=' +
+              '"https://buy.com/buy-1" target="_top">Click for ad!</a>' +
+              '\n    <amp-analytics class="i-amphtml-element i-amphtml' +
+              '-notbuilt amp-notbuilt i-amphtml-layout-fixed i-amphtml' +
+              '-layout-size-defined amp-unresolved i-amphtml-' +
+              'unresolved" i-amphtml-layout="fixed" style="width: 1px;' +
+              ' height: 1px;"></amp-analytics></div>'
+          );
+        });
     });
   });
 
   it('should set correct attributes on the iframe', () => {
     env.win.AMP.registerTemplate('amp-mustache', AmpMustache);
     return validatorPromise.then(validatorOutput => {
-
       // Sanity check. This behavior is tested in test-template-validator.js.
       expect(validatorOutput).to.be.ok;
       expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
       const {creativeData} = validatorOutput;
       expect(creativeData).to.be.ok;
-      return renderer.render(context, containerElement, creativeData)
-          .then(() => {
-            const iframe = containerElement.querySelector('iframe');
-            expect(iframe).to.be.ok;
-            expect(iframe.getAttribute('width')).to.equal('320');
-            expect(iframe.getAttribute('height')).to.equal('50');
-            expect(iframe.getAttribute('frameborder')).to.equal('0');
-            expect(iframe.getAttribute('allowfullscreen')).to.equal('');
-            expect(iframe.getAttribute('allowtransparency')).to.equal('');
-            expect(iframe.getAttribute('scrolling')).to.equal('no');
-          });
+      return renderer
+        .render(context, containerElement, creativeData)
+        .then(() => {
+          const iframe = containerElement.querySelector('iframe');
+          expect(iframe).to.be.ok;
+          expect(iframe.getAttribute('width')).to.equal('320');
+          expect(iframe.getAttribute('height')).to.equal('50');
+          expect(iframe.getAttribute('frameborder')).to.equal('0');
+          expect(iframe.getAttribute('allowfullscreen')).to.equal('');
+          expect(iframe.getAttribute('allowtransparency')).to.equal('');
+          expect(iframe.getAttribute('scrolling')).to.equal('no');
+        });
     });
   });
 
   it('should style body of iframe document to be visible', () => {
     env.win.AMP.registerTemplate('amp-mustache', AmpMustache);
     return validatorPromise.then(validatorOutput => {
-
       // Sanity check. This behavior is tested in test-template-validator.js.
       expect(validatorOutput).to.be.ok;
       expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
       const {creativeData} = validatorOutput;
       expect(creativeData).to.be.ok;
-      return renderer.render(context, containerElement, creativeData)
-          .then(() => {
-            const iframe = containerElement.querySelector('iframe');
-            expect(iframe).to.be.ok;
-            expect(iframe.contentWindow.document.body.style.visibility)
-                .to.equal('visible');
-          });
+      return renderer
+        .render(context, containerElement, creativeData)
+        .then(() => {
+          const iframe = containerElement.querySelector('iframe');
+          expect(iframe).to.be.ok;
+          expect(iframe.contentWindow.document.body.style.visibility).to.equal(
+            'visible'
+          );
+        });
     });
   });
 
   it('should insert analytics', () => {
     env.win.AMP.registerTemplate('amp-mustache', AmpMustache);
     const insertAnalyticsSpy = sandbox.spy(
-        getAmpAdTemplateHelper(env.win), 'insertAnalytics');
+      getAmpAdTemplateHelper(env.win),
+      'insertAnalytics'
+    );
     return validatorPromise.then(validatorOutput => {
-
       // Sanity check. This behavior is tested in test-template-validator.js.
       expect(validatorOutput).to.be.ok;
       expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
       const {creativeData} = validatorOutput;
       expect(creativeData).to.be.ok;
-      return renderer.render(context, containerElement, creativeData)
-          .then(() => {
-            expect(insertAnalyticsSpy).to.be.calledOnce;
-          });
+      return renderer
+        .render(context, containerElement, creativeData)
+        .then(() => {
+          expect(insertAnalyticsSpy).to.be.calledOnce;
+        });
     });
   });
 });
-
diff --git a/extensions/amp-a4a/0.1/test/test-template-validator.js b/extensions/amp-a4a/0.1/test/test-template-validator.js
index 066cc80a515a..d38aba0d94b2 100644
--- a/extensions/amp-a4a/0.1/test/test-template-validator.js
+++ b/extensions/amp-a4a/0.1/test/test-template-validator.js
@@ -31,7 +31,6 @@ const realWinConfig = {
 };
 
 describes.realWin('TemplateValidator', realWinConfig, env => {
-
   const templateUrl = 'https://adnetwork.com/amp-template.html';
   const headers = {
     get: name => {
@@ -47,7 +46,6 @@ describes.realWin('TemplateValidator', realWinConfig, env => {
   });
 
   describe('AMP Result', () => {
-
     let sandbox;
     let validatorPromise;
 
@@ -58,12 +56,17 @@ describes.realWin('TemplateValidator', realWinConfig, env => {
         return Promise.resolve(data.adTemplate);
       });
 
-      validatorPromise = validator.validate({win: env.win},
-          utf8Encode(JSON.stringify({
+      validatorPromise = validator.validate(
+        {win: env.win},
+        utf8Encode(
+          JSON.stringify({
             templateUrl,
             data: {url: 'https://buy.com/buy-1'},
             analytics: {foo: 'bar'},
-          })), headers);
+          })
+        ),
+        headers
+      );
     });
 
     afterEach(() => sandbox.restore());
@@ -76,28 +79,36 @@ describes.realWin('TemplateValidator', realWinConfig, env => {
     });
 
     it('should have AMP validator result w/ deprecated header name', () => {
-      validator.validate({win: env.win},
-          utf8Encode(JSON.stringify({
-            templateUrl,
-            data: {url: 'https://buy.com/buy-1'},
-            analytics: {foo: 'bar'},
-          })), {
+      validator
+        .validate(
+          {win: env.win},
+          utf8Encode(
+            JSON.stringify({
+              templateUrl,
+              data: {url: 'https://buy.com/buy-1'},
+              analytics: {foo: 'bar'},
+            })
+          ),
+          {
             get: name => {
               if (name == DEPRECATED_AMP_TEMPLATED_CREATIVE_HEADER_NAME) {
                 return 'amp-mustache';
               }
             },
-          }).then(validatorOutput => {
-        expect(validatorOutput).to.be.ok;
-        expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
-      });
+          }
+        )
+        .then(validatorOutput => {
+          expect(validatorOutput).to.be.ok;
+          expect(validatorOutput.type).to.equal(ValidatorResult.AMP);
+        });
     });
 
     it('should have TEMPLATE ad response type', () => {
       return validatorPromise.then(validatorOutput => {
         expect(validatorOutput).to.be.ok;
         expect(validatorOutput.adResponseType).to.equal(
-            AdResponseType.TEMPLATE);
+          AdResponseType.TEMPLATE
+        );
       });
     });
 
@@ -106,79 +117,99 @@ describes.realWin('TemplateValidator', realWinConfig, env => {
         expect(validatorOutput).to.be.ok;
         expect(validatorOutput.creativeData).to.be.ok;
         const {creativeMetadata} = validatorOutput.creativeData;
-        expect(creativeMetadata.minifiedCreative)
-            .to.equal(data.minifiedTemplateCreative);
+        expect(creativeMetadata.minifiedCreative).to.equal(
+          data.minifiedTemplateCreative
+        );
       });
     });
 
-    it('should have amp-analytics and mustache in customElementExtensions',
-        () => {
-          return validatorPromise.then(validatorOutput => {
-            expect(validatorOutput).to.be.ok;
-            expect(validatorOutput.creativeData).to.be.ok;
-            const {creativeMetadata} = validatorOutput.creativeData;
-            expect(creativeMetadata.customElementExtensions)
-                .to.deep.equal(['amp-analytics', 'amp-mustache']);
-          });
-        });
+    it('should have amp-analytics and mustache in customElementExtensions', () => {
+      return validatorPromise.then(validatorOutput => {
+        expect(validatorOutput).to.be.ok;
+        expect(validatorOutput.creativeData).to.be.ok;
+        const {creativeMetadata} = validatorOutput.creativeData;
+        expect(creativeMetadata.customElementExtensions).to.deep.equal([
+          'amp-analytics',
+          'amp-mustache',
+        ]);
+      });
+    });
   });
 
   describe('Non-AMP Result', () => {
     it('should have NON_AMP validator result due to lack of headers', () => {
-      return validator.validate({win: env.win},
-          utf8Encode(JSON.stringify({
-            templateUrl,
-            data: {url: 'https://buy.com/buy-1'},
-            analytics: {foo: 'bar'},
-          }))).then(validatorOutput => {
-        expect(validatorOutput).to.be.ok;
-        expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
-      });
+      return validator
+        .validate(
+          {win: env.win},
+          utf8Encode(
+            JSON.stringify({
+              templateUrl,
+              data: {url: 'https://buy.com/buy-1'},
+              analytics: {foo: 'bar'},
+            })
+          )
+        )
+        .then(validatorOutput => {
+          expect(validatorOutput).to.be.ok;
+          expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
+        });
     });
 
-    it('should have NON_AMP validator result due to lack of mustache header',
-        () => {
-          return validator.validate({win: env.win},
-              utf8Encode(JSON.stringify({
-                templateUrl,
-                data: {url: 'https://buy.com/buy-1'},
-                analytics: {foo: 'bar'},
-              })),
-              {
-                get: () => null,
-              }).then(validatorOutput => {
-            expect(validatorOutput).to.be.ok;
-            expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
-          });
+    it('should have NON_AMP validator result due to lack of mustache header', () => {
+      return validator
+        .validate(
+          {win: env.win},
+          utf8Encode(
+            JSON.stringify({
+              templateUrl,
+              data: {url: 'https://buy.com/buy-1'},
+              analytics: {foo: 'bar'},
+            })
+          ),
+          {
+            get: () => null,
+          }
+        )
+        .then(validatorOutput => {
+          expect(validatorOutput).to.be.ok;
+          expect(validatorOutput.type).to.equal(ValidatorResult.NON_AMP);
         });
+    });
 
     it('should have TEMPLATE ad response type', () => {
-      return validator.validate({win: env.win},
-          utf8Encode(JSON.stringify({
-            templateUrl,
-            data: {url: 'https://buy.com/buy-1'},
-            analytics: {foo: 'bar'},
-          }))).then(validatorOutput => {
-        expect(validatorOutput).to.be.ok;
-        expect(validatorOutput.adResponseType)
-            .to.equal(AdResponseType.TEMPLATE);
-      });
+      return validator
+        .validate(
+          {win: env.win},
+          utf8Encode(
+            JSON.stringify({
+              templateUrl,
+              data: {url: 'https://buy.com/buy-1'},
+              analytics: {foo: 'bar'},
+            })
+          )
+        )
+        .then(validatorOutput => {
+          expect(validatorOutput).to.be.ok;
+          expect(validatorOutput.adResponseType).to.equal(
+            AdResponseType.TEMPLATE
+          );
+        });
     });
 
     it('should have the response body as the creative in creativeData', () => {
-      return validator.validate({win: env.win},
-          utf8Encode(JSON.stringify({templateUrl})),
-          {
-            get: () => null,
-          }).then(validatorOutput => {
-        expect(validatorOutput).to.be.ok;
-        expect(validatorOutput.creativeData).to.be.ok;
-        const {creativeData} = validatorOutput;
-        expect(creativeData).to.be.ok;
-        expect(creativeData.creative).to.deep.equal(
-            '{"templateUrl":"https://adnetwork.com/amp-template.html"}');
-      });
+      return validator
+        .validate({win: env.win}, utf8Encode(JSON.stringify({templateUrl})), {
+          get: () => null,
+        })
+        .then(validatorOutput => {
+          expect(validatorOutput).to.be.ok;
+          expect(validatorOutput.creativeData).to.be.ok;
+          const {creativeData} = validatorOutput;
+          expect(creativeData).to.be.ok;
+          expect(creativeData.creative).to.deep.equal(
+            '{"templateUrl":"https://adnetwork.com/amp-template.html"}'
+          );
+        });
     });
   });
 });
-
diff --git a/extensions/amp-a4a/0.1/test/utils.js b/extensions/amp-a4a/0.1/test/utils.js
index 0c8e61d80d17..0060b8842df6 100644
--- a/extensions/amp-a4a/0.1/test/utils.js
+++ b/extensions/amp-a4a/0.1/test/utils.js
@@ -18,8 +18,10 @@ import {AmpA4A} from '../amp-a4a';
 import {dict} from '../../../../src/utils/object';
 
 /** @type {string} @private */
-export const TEST_URL = 'http://iframe.localhost:' + location.port +
-    '/test/fixtures/served/iframe.html?args';
+export const TEST_URL =
+  'http://iframe.localhost:' +
+  location.port +
+  '/test/fixtures/served/iframe.html?args';
 
 export class MockA4AImpl extends AmpA4A {
   getAdUrl() {
diff --git a/extensions/amp-access-laterpay/0.1/amp-access-laterpay.js b/extensions/amp-access-laterpay/0.1/amp-access-laterpay.js
index 40f42e744370..3944b8dd4f78 100644
--- a/extensions/amp-access-laterpay/0.1/amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.1/amp-access-laterpay.js
@@ -19,18 +19,19 @@ import {Services} from '../../../src/services';
 
 AMP.extension('amp-access-laterpay', '0.1', function(AMP) {
   AMP.registerServiceForDoc(
-      'laterpay',
-      /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
-      function(ampdoc) {
-        const element = ampdoc.getHeadNode();
-        return Services.accessServiceForDoc(element).then(accessService => {
-          const source = accessService.getVendorSource('laterpay');
-          const vendor = new LaterpayVendor(accessService, source);
-          const adapter = /** @type {
+    'laterpay',
+    /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
+    function(ampdoc) {
+      const element = ampdoc.getHeadNode();
+      return Services.accessServiceForDoc(element).then(accessService => {
+        const source = accessService.getVendorSource('laterpay');
+        const vendor = new LaterpayVendor(accessService, source);
+        const adapter = /** @type {
             !../../amp-access/0.1/amp-access-vendor.AccessVendorAdapter
           } */ (source.getAdapter());
-          adapter.registerVendor(vendor);
-          return vendor;
-        });
+        adapter.registerVendor(vendor);
+        return vendor;
       });
+    }
+  );
 });
diff --git a/extensions/amp-access-laterpay/0.1/laterpay-impl.js b/extensions/amp-access-laterpay/0.1/laterpay-impl.js
index 5811007f4313..2af62e28d22b 100644
--- a/extensions/amp-access-laterpay/0.1/laterpay-impl.js
+++ b/extensions/amp-access-laterpay/0.1/laterpay-impl.js
@@ -38,10 +38,11 @@ const CONFIG_URLS = {
 
 const DEFAULT_REGION = 'eu';
 
-const CONFIG_BASE_PATH = '/api/v1/public/amp?' +
-                         'article_url=CANONICAL_URL' +
-                         '&amp_reader_id=READER_ID' +
-                         '&return_url=RETURN_URL';
+const CONFIG_BASE_PATH =
+  '/api/v1/public/amp?' +
+  'article_url=CANONICAL_URL' +
+  '&amp_reader_id=READER_ID' +
+  '&return_url=RETURN_URL';
 const AUTHORIZATION_TIMEOUT = 3000;
 
 const DEFAULT_MESSAGES = {
@@ -91,12 +92,10 @@ let PurchaseOptionDef;
  */
 let PurchaseConfigDef;
 
-
 /**
  * @implements {../../amp-access/0.1/access-vendor.AccessVendor}
  */
 export class LaterpayVendor {
-
   /**
    * @param {!../../amp-access/0.1/amp-access.AccessService} accessService
    * @param {!../../amp-access/0.1/amp-access-source.AccessSource} accessSource
@@ -142,8 +141,11 @@ export class LaterpayVendor {
     this.currentLocale_ = this.laterpayConfig_['locale'] || 'en';
 
     /** @private {!JsonObject} */
-    this.i18n_ = /** @type {!JsonObject} */ (Object.assign(dict(),
-        DEFAULT_MESSAGES, this.laterpayConfig_['localeMessages'] || dict()));
+    this.i18n_ = /** @type {!JsonObject} */ (Object.assign(
+      dict(),
+      DEFAULT_MESSAGES,
+      this.laterpayConfig_['localeMessages'] || dict()
+    ));
 
     /** @private {string} */
     this.purchaseConfigBaseUrl_ = this.getConfigUrl_() + CONFIG_BASE_PATH;
@@ -188,36 +190,41 @@ export class LaterpayVendor {
    * @return {!Promise<!JsonObject>}
    */
   authorize() {
-    return this.getPurchaseConfig_()
-        .then(response => {
-          if (response.status === 204) {
-            throw user()
-                .createError('No merchant domains have been matched for this ' +
-            'article, or no paid content configurations are setup.');
-          }
-
-          if (this.laterpayConfig_['scrollToTopAfterAuth']) {
-            this.vsync_.mutate(() => this.viewport_.setScrollTop(0));
-          }
-          this.emptyContainer_();
-          return {access: response.access};
-        }, err => {
-          if (!err || !err.response) {
-            throw err;
-          }
-          const {response} = err;
-          if (response.status !== 402) {
-            throw err;
-          }
-          return response.json().catch(() => undefined).then(responseJson => {
+    return this.getPurchaseConfig_().then(
+      response => {
+        if (response.status === 204) {
+          throw user().createError(
+            'No merchant domains have been matched for this ' +
+              'article, or no paid content configurations are setup.'
+          );
+        }
+
+        if (this.laterpayConfig_['scrollToTopAfterAuth']) {
+          this.vsync_.mutate(() => this.viewport_.setScrollTop(0));
+        }
+        this.emptyContainer_();
+        return {access: response.access};
+      },
+      err => {
+        if (!err || !err.response) {
+          throw err;
+        }
+        const {response} = err;
+        if (response.status !== 402) {
+          throw err;
+        }
+        return response
+          .json()
+          .catch(() => undefined)
+          .then(responseJson => {
             this.purchaseConfig_ = responseJson;
             // empty before rendering, in case authorization is being called
             // again with the same state
-            this.emptyContainer_()
-                .then(this.renderPurchaseOverlay_.bind(this));
+            this.emptyContainer_().then(this.renderPurchaseOverlay_.bind(this));
             return {access: false};
           });
-        });
+      }
+    );
   }
 
   /**
@@ -225,20 +232,29 @@ export class LaterpayVendor {
    * @private
    */
   getPurchaseConfig_() {
-    const url = this.purchaseConfigBaseUrl_ +
-                '&article_title=' + encodeURIComponent(this.getArticleTitle_());
+    const url =
+      this.purchaseConfigBaseUrl_ +
+      '&article_title=' +
+      encodeURIComponent(this.getArticleTitle_());
     const urlPromise = this.accessSource_.buildUrl(
-        url, /* useAuthData */ false);
-    return urlPromise.then(url => {
-      return this.accessSource_.getLoginUrl(url);
-    }).then(url => {
-      dev().info(TAG, 'Authorization URL: ', url);
-      return this.timer_.timeoutPromise(
-          AUTHORIZATION_TIMEOUT,
-          this.xhr_.fetchJson(url, {
-            credentials: 'include',
-          })).then(res => res.json());
-    });
+      url,
+      /* useAuthData */ false
+    );
+    return urlPromise
+      .then(url => {
+        return this.accessSource_.getLoginUrl(url);
+      })
+      .then(url => {
+        dev().info(TAG, 'Authorization URL: ', url);
+        return this.timer_
+          .timeoutPromise(
+            AUTHORIZATION_TIMEOUT,
+            this.xhr_.fetchJson(url, {
+              credentials: 'include',
+            })
+          )
+          .then(res => res.json());
+      });
   }
 
   /**
@@ -255,11 +271,14 @@ export class LaterpayVendor {
    * @private
    */
   getArticleTitle_() {
-    const title = this.ampdoc.getRootNode().querySelector(
-        this.laterpayConfig_['articleTitleSelector']);
+    const title = this.ampdoc
+      .getRootNode()
+      .querySelector(this.laterpayConfig_['articleTitleSelector']);
     userAssert(
-        title, 'No article title element found with selector %s',
-        this.laterpayConfig_['articleTitleSelector']);
+      title,
+      'No article title element found with selector %s',
+      this.laterpayConfig_['articleTitleSelector']
+    );
     return title.textContent.trim();
   }
 
@@ -271,8 +290,8 @@ export class LaterpayVendor {
     const id = TAG + '-dialog';
     const dialogContainer = this.ampdoc.getElementById(id);
     return user().assertElement(
-        dialogContainer,
-        'No element found with id ' + id
+      dialogContainer,
+      'No element found with id ' + id
     );
   }
 
@@ -316,12 +335,14 @@ export class LaterpayVendor {
     }
     this.renderTextBlock_('header');
     const listContainer = this.createElement_('ul');
-    this.purchaseConfig_['premiumcontent']['title'] =
-      this.i18n_['premiumContentTitle'];
-    this.purchaseConfig_['premiumcontent']['description'] =
-        this.getArticleTitle_();
+    this.purchaseConfig_['premiumcontent']['title'] = this.i18n_[
+      'premiumContentTitle'
+    ];
+    this.purchaseConfig_['premiumcontent'][
+      'description'
+    ] = this.getArticleTitle_();
     listContainer.appendChild(
-        this.createPurchaseOption_(this.purchaseConfig_['premiumcontent'])
+      this.createPurchaseOption_(this.purchaseConfig_['premiumcontent'])
     );
     this.purchaseConfig_['timepasses'].forEach(timepass => {
       listContainer.appendChild(this.createPurchaseOption_(timepass));
@@ -341,13 +362,15 @@ export class LaterpayVendor {
     this.innerContainer_.appendChild(listContainer);
     this.innerContainer_.appendChild(purchaseButton);
     this.innerContainer_.appendChild(
-        this.createAlreadyPurchasedLink_(this.purchaseConfig_['apl']));
+      this.createAlreadyPurchasedLink_(this.purchaseConfig_['apl'])
+    );
     this.renderTextBlock_('footer');
     dialogContainer.appendChild(this.innerContainer_);
     dialogContainer.appendChild(this.createLaterpayBadge_());
     this.containerEmpty_ = false;
     this.preselectFirstOption_(
-        dev().assertElement(listContainer.firstElementChild));
+      dev().assertElement(listContainer.firstElementChild)
+    );
   }
 
   /**
@@ -426,15 +449,14 @@ export class LaterpayVendor {
     radio.type = 'radio';
     radio.id = option['title'];
     radio.value = option['purchase_url'];
-    const purchaseType = option['purchase_type'] === 'ppu' ?
-      'payLater' :
-      'payNow';
+    const purchaseType =
+      option['purchase_type'] === 'ppu' ? 'payLater' : 'payNow';
     const purchaseActionLabel = this.i18n_[purchaseType + 'Button'];
     radio.setAttribute('data-purchase-action-label', purchaseActionLabel);
     radio.setAttribute('data-purchase-type', purchaseType);
-    this.purchaseOptionListeners_.push(listen(
-        radio, 'change', this.handlePurchaseOptionSelection_.bind(this)
-    ));
+    this.purchaseOptionListeners_.push(
+      listen(radio, 'change', this.handlePurchaseOptionSelection_.bind(this))
+    );
     return radio;
   }
 
@@ -465,7 +487,7 @@ export class LaterpayVendor {
    * @private
    */
   formatPrice_(priceValue) {
-    const value = (priceValue / 100);
+    const value = priceValue / 100;
     const props = {
       style: 'decimal',
       minimumFractionDigits: 0,
@@ -476,7 +498,7 @@ export class LaterpayVendor {
   /**
    * @param {string} href
    * @return {!Element}
-  */
+   */
   createAlreadyPurchasedLink_(href) {
     const p = this.createElement_('p');
     p.className = TAG + '-already-purchased-link-container';
@@ -507,8 +529,10 @@ export class LaterpayVendor {
     const selectedOptionClassname = TAG + '-selected';
     const prevPurchaseOption = this.selectedPurchaseOption_;
     const purchaseActionLabel = target.dataset['purchaseActionLabel'];
-    if (prevPurchaseOption &&
-        prevPurchaseOption.classList.contains(selectedOptionClassname)) {
+    if (
+      prevPurchaseOption &&
+      prevPurchaseOption.classList.contains(selectedOptionClassname)
+    ) {
       prevPurchaseOption.classList.remove(selectedOptionClassname);
     }
     this.selectedPurchaseOption_ = target;
@@ -525,7 +549,9 @@ export class LaterpayVendor {
   handlePurchase_(ev, purchaseUrl, purchaseType) {
     ev.preventDefault();
     const urlPromise = this.accessSource_.buildUrl(
-        purchaseUrl, /* useAuthData */ false);
+      purchaseUrl,
+      /* useAuthData */ false
+    );
     return urlPromise.then(url => {
       dev().fine(TAG, 'Authorization URL: ', url);
       this.accessSource_.loginWithUrl(url, purchaseType);
diff --git a/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js b/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
index ceb2259139de..a0df170c8547 100644
--- a/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.1/test/test-amp-access-laterpay.js
@@ -18,276 +18,290 @@ import {LaterpayVendor} from '../laterpay-impl';
 
 const TAG = 'amp-access-laterpay';
 
-describes.fakeWin('LaterpayVendor', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let accessSource;
-  let accessService;
-  let accessSourceMock;
-  let xhrMock;
-  let articleTitle;
-  let laterpayConfig;
-  let vendor;
+describes.fakeWin(
+  'LaterpayVendor',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let accessSource;
+    let accessService;
+    let accessSourceMock;
+    let xhrMock;
+    let articleTitle;
+    let laterpayConfig;
+    let vendor;
 
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    laterpayConfig = {
-      articleTitleSelector: '#laterpay-test-title',
-      region: 'us',
-    };
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
 
-    accessSource = {
-      getAdapterConfig: () => { return laterpayConfig; },
-      buildUrl: () => {},
-      loginWithUrl: () => {},
-      getLoginUrl: () => {},
-    };
+      laterpayConfig = {
+        articleTitleSelector: '#laterpay-test-title',
+        region: 'us',
+      };
 
-    accessService = {
-      ampdoc,
-      getSource: () => accessSource,
-    };
+      accessSource = {
+        getAdapterConfig: () => {
+          return laterpayConfig;
+        },
+        buildUrl: () => {},
+        loginWithUrl: () => {},
+        getLoginUrl: () => {},
+      };
 
-    accessSourceMock = sandbox.mock(accessSource);
+      accessService = {
+        ampdoc,
+        getSource: () => accessSource,
+      };
 
-    articleTitle = document.createElement('h1');
-    articleTitle.id = 'laterpay-test-title';
-    articleTitle.textContent = 'test title';
-    document.body.appendChild(articleTitle);
+      accessSourceMock = sandbox.mock(accessSource);
 
-    vendor = new LaterpayVendor(accessService, accessSource);
-    xhrMock = sandbox.mock(vendor.xhr_);
-  });
+      articleTitle = document.createElement('h1');
+      articleTitle.id = 'laterpay-test-title';
+      articleTitle.textContent = 'test title';
+      document.body.appendChild(articleTitle);
 
-  afterEach(() => {
-    articleTitle.parentNode.removeChild(articleTitle);
-    accessSourceMock.verify();
-    xhrMock.verify();
-  });
+      vendor = new LaterpayVendor(accessService, accessSource);
+      xhrMock = sandbox.mock(vendor.xhr_);
+    });
 
-  describe('authorize', () => {
-    let emptyContainerStub;
-    beforeEach(() => {
-      emptyContainerStub = sandbox.stub(vendor, 'emptyContainer_');
-      sandbox.stub(vendor, 'renderPurchaseOverlay_');
+    afterEach(() => {
+      articleTitle.parentNode.removeChild(articleTitle);
+      accessSourceMock.verify();
+      xhrMock.verify();
     });
 
-    it('uses a non default region', () => {
-      const buildUrl = accessSourceMock.expects('buildUrl')
+    describe('authorize', () => {
+      let emptyContainerStub;
+      beforeEach(() => {
+        emptyContainerStub = sandbox.stub(vendor, 'emptyContainer_');
+        sandbox.stub(vendor, 'renderPurchaseOverlay_');
+      });
+
+      it('uses a non default region', () => {
+        const buildUrl = accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve(''))
           .once();
-      xhrMock.expects('fetchJson')
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(() => {
-        expect(
+        return vendor.authorize().then(() => {
+          expect(
             /connector\.uselaterpay\.com/g.test(buildUrl.firstCall.args[0])
-        ).to.be.true;
+          ).to.be.true;
+        });
       });
-    });
 
-    it('successful authorization', () => {
-      vendor.purchaseConfigBaseUrl_ = 'https://baseurl?param';
-      accessSourceMock.expects('buildUrl')
-          .withExactArgs('https://baseurl?param&article_title=test%20title', false)
+      it('successful authorization', () => {
+        vendor.purchaseConfigBaseUrl_ = 'https://baseurl?param';
+        accessSourceMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://baseurl?param&article_title=test%20title',
+            false
+          )
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(resp => {
-        expect(resp.access).to.be.true;
-        expect(emptyContainerStub.called).to.be.true;
+        return vendor.authorize().then(resp => {
+          expect(resp.access).to.be.true;
+          expect(emptyContainerStub.called).to.be.true;
+        });
       });
-    });
 
-    it('authorization fails due to lack of server config', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization fails due to lack of server config', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
           .returns(Promise.resolve({status: 204}))
           .once();
-      return vendor.authorize().catch(err => {
-        expect(err.message).to.exist;
+        return vendor.authorize().catch(err => {
+          expect(err.message).to.exist;
+        });
       });
-    });
 
-    it('authorization response from server fails', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization response from server fails', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
-          .returns(Promise.reject({
-            response: {
-              status: 402,
-              json() {
-                return Promise.resolve({access: false});
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+                json() {
+                  return Promise.resolve({access: false});
+                },
               },
-            },
-          }))
+            })
+          )
           .once();
-      emptyContainerStub.returns(Promise.resolve());
-      return vendor.authorize().then(err => {
-        expect(err.access).to.be.false;
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then(err => {
+          expect(err.access).to.be.false;
+        });
       });
     });
 
-  });
-
-  describe('create purchase overlay', () => {
-    let container;
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        premiumcontent: {
-          price: {},
-        },
-        subscriptions: [
-          {price: {}},
-        ],
-        timepasses: [
-          {price: {}},
-        ],
-      };
-      vendor.renderPurchaseOverlay_();
-    });
+    describe('create purchase overlay', () => {
+      let container;
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          premiumcontent: {
+            price: {},
+          },
+          subscriptions: [{price: {}}],
+          timepasses: [{price: {}}],
+        };
+        vendor.renderPurchaseOverlay_();
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('renders list', () => {
-      expect(container.querySelector('ul')).to.not.be.null;
-    });
+      it('renders list', () => {
+        expect(container.querySelector('ul')).to.not.be.null;
+      });
 
-    it('renders 3 purchase options', () => {
-      expect(container.querySelector('ul').childNodes.length).to.equal(3);
+      it('renders 3 purchase options', () => {
+        expect(container.querySelector('ul').childNodes.length).to.equal(3);
+      });
     });
 
-  });
-
-  describe('purchase option selection', () => {
-    let container;
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        premiumcontent: {
-          price: {},
-        },
-        subscriptions: [
-          {price: {}},
-        ],
-        timepasses: [
-          {price: {}},
-        ],
-      };
-      vendor.renderPurchaseOverlay_();
-      const ev = new Event('change');
-      container.querySelector('input').dispatchEvent(ev);
-    });
+    describe('purchase option selection', () => {
+      let container;
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          premiumcontent: {
+            price: {},
+          },
+          subscriptions: [{price: {}}],
+          timepasses: [{price: {}}],
+        };
+        vendor.renderPurchaseOverlay_();
+        const ev = new Event('change');
+        container.querySelector('input').dispatchEvent(ev);
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('purchase option is selected', () => {
-      expect(vendor.selectedPurchaseOption_).to.not.be.null;
-      expect(vendor.selectedPurchaseOption_.classList
-          .contains(TAG + '-selected')).to.be.true;
+      it('purchase option is selected', () => {
+        expect(vendor.selectedPurchaseOption_).to.not.be.null;
+        expect(
+          vendor.selectedPurchaseOption_.classList.contains(TAG + '-selected')
+        ).to.be.true;
+      });
     });
 
-  });
-
-  describe('purchase', () => {
-    let container;
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        premiumcontent: {
-          price: {},
-        },
-        subscriptions: [
-          {price: {}},
-        ],
-        timepasses: [
-          {price: {}},
-        ],
-        apl: 'http://apllink',
-      };
-      vendor.renderPurchaseOverlay_();
-    });
+    describe('purchase', () => {
+      let container;
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          premiumcontent: {
+            price: {},
+          },
+          subscriptions: [{price: {}}],
+          timepasses: [{price: {}}],
+          apl: 'http://apllink',
+        };
+        vendor.renderPurchaseOverlay_();
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('sends request for purchase', done => {
-      const changeEv = new Event('change');
-      container.querySelector('input').dispatchEvent(changeEv);
-      accessSourceMock.expects('buildUrl')
+      it('sends request for purchase', done => {
+        const changeEv = new Event('change');
+        container.querySelector('input').dispatchEvent(changeEv);
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('loginWithUrl')
-          .once();
-      const clickEv = new Event('click');
-      container.querySelector('button').dispatchEvent(clickEv);
-      setTimeout(() => {done();}, 500);
-    });
+        accessSourceMock.expects('loginWithUrl').once();
+        const clickEv = new Event('click');
+        container.querySelector('button').dispatchEvent(clickEv);
+        setTimeout(() => {
+          done();
+        }, 500);
+      });
 
-    it('sends request for already purchased', done => {
-      accessSourceMock.expects('buildUrl')
+      it('sends request for already purchased', done => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://apllink'))
           .once();
-      accessSourceMock.expects('loginWithUrl')
-          .once();
-      const clickEv = new Event('click');
-      container
+        accessSourceMock.expects('loginWithUrl').once();
+        const clickEv = new Event('click');
+        container
           .querySelector('.' + TAG + '-already-purchased-link-container > a')
           .dispatchEvent(clickEv);
-      setTimeout(() => {done();}, 500);
+        setTimeout(() => {
+          done();
+        }, 500);
+      });
     });
-
-
-  });
-});
+  }
+);
diff --git a/extensions/amp-access-laterpay/0.2/amp-access-laterpay.js b/extensions/amp-access-laterpay/0.2/amp-access-laterpay.js
index eebc46238de5..caa806d8b7c5 100644
--- a/extensions/amp-access-laterpay/0.2/amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.2/amp-access-laterpay.js
@@ -19,18 +19,19 @@ import {Services} from '../../../src/services';
 
 AMP.extension('amp-access-laterpay', '0.2', function(AMP) {
   AMP.registerServiceForDoc(
-      'laterpay',
-      /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
-      function(ampdoc) {
-        const element = ampdoc.getHeadNode();
-        return Services.accessServiceForDoc(element).then(accessService => {
-          const source = accessService.getVendorSource('laterpay');
-          const vendor = new LaterpayVendor(accessService, source);
-          const adapter = /** @type {
+    'laterpay',
+    /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
+    function(ampdoc) {
+      const element = ampdoc.getHeadNode();
+      return Services.accessServiceForDoc(element).then(accessService => {
+        const source = accessService.getVendorSource('laterpay');
+        const vendor = new LaterpayVendor(accessService, source);
+        const adapter = /** @type {
             !../../amp-access/0.1/amp-access-vendor.AccessVendorAdapter
           } */ (source.getAdapter());
-          adapter.registerVendor(vendor);
-          return vendor;
-        });
+        adapter.registerVendor(vendor);
+        return vendor;
       });
+    }
+  );
 });
diff --git a/extensions/amp-access-laterpay/0.2/laterpay-impl.js b/extensions/amp-access-laterpay/0.2/laterpay-impl.js
index e21038cc8b34..642c66774194 100644
--- a/extensions/amp-access-laterpay/0.2/laterpay-impl.js
+++ b/extensions/amp-access-laterpay/0.2/laterpay-impl.js
@@ -36,14 +36,16 @@ const CONFIG_URLS = {
   },
 };
 
-const LATERPAY_BADGE_URL = 'https://blog.laterpay.net/laterpay-academy/what-is-laterpay';
+const LATERPAY_BADGE_URL =
+  'https://blog.laterpay.net/laterpay-academy/what-is-laterpay';
 
 const DEFAULT_REGION = 'eu';
 
-const CONFIG_BASE_PATH = '/api/v2/fetch/amp/?' +
-                         'article_url=CANONICAL_URL' +
-                         '&amp_reader_id=READER_ID' +
-                         '&return_url=RETURN_URL';
+const CONFIG_BASE_PATH =
+  '/api/v2/fetch/amp/?' +
+  'article_url=CANONICAL_URL' +
+  '&amp_reader_id=READER_ID' +
+  '&return_url=RETURN_URL';
 const AUTHORIZATION_TIMEOUT = 3000;
 
 const DEFAULT_MESSAGES = {
@@ -116,12 +118,10 @@ let PurchaseConfigDef;
  */
 let PurchaseOptionsDef;
 
-
 /**
  * @implements {../../amp-access/0.1/access-vendor.AccessVendor}
  */
 export class LaterpayVendor {
-
   /**
    * @param {!../../amp-access/0.1/amp-access.AccessService} accessService
    * @param {!../../amp-access/0.1/amp-access-source.AccessSource} accessSource
@@ -170,8 +170,11 @@ export class LaterpayVendor {
     this.currentLocale_ = this.laterpayConfig_['locale'] || 'en';
 
     /** @private {!JsonObject} */
-    this.i18n_ = /** @type {!JsonObject} */ (Object.assign(dict(),
-        DEFAULT_MESSAGES, this.laterpayConfig_['localeMessages'] || dict()));
+    this.i18n_ = /** @type {!JsonObject} */ (Object.assign(
+      dict(),
+      DEFAULT_MESSAGES,
+      this.laterpayConfig_['localeMessages'] || dict()
+    ));
 
     /** @private {string} */
     this.purchaseConfigBaseUrl_ = this.getConfigUrl_() + CONFIG_BASE_PATH;
@@ -182,11 +185,9 @@ export class LaterpayVendor {
     }
     const jwt = this.laterpayConfig_['jwt'];
     if (jwt) {
-      this.purchaseConfigBaseUrl_ +=
-        '&jwt=' + encodeURIComponent(jwt);
+      this.purchaseConfigBaseUrl_ += '&jwt=' + encodeURIComponent(jwt);
     }
 
-
     /** @const @private {!../../../src/service/timer-impl.Timer} */
     this.timer_ = Services.timerFor(this.ampdoc.win);
 
@@ -222,38 +223,44 @@ export class LaterpayVendor {
    * @return {!Promise<!JsonObject>}
    */
   authorize() {
-    return this.getPurchaseConfig_()
-        .then(response => {
-          if (response.status === 204) {
-            throw user()
-                .createError('No merchant domains have been matched for this ' +
-            'article, or no paid content configurations are setup.');
-          }
-
-          if (this.laterpayConfig_['scrollToTopAfterAuth']) {
-            this.vsync_.mutate(() => this.viewport_.setScrollTop(0));
-          }
-          this.emptyContainer_();
-          return {access: response.access};
-        }, err => {
-          if (!err || !err.response) {
-            throw err;
-          }
-          const {response} = err;
-          if (response.status !== 402) {
-            throw err;
-          }
-          return response.json().catch(() => undefined).then(responseJson => {
+    return this.getPurchaseConfig_().then(
+      response => {
+        if (response.status === 204) {
+          throw user().createError(
+            'No merchant domains have been matched for this ' +
+              'article, or no paid content configurations are setup.'
+          );
+        }
+
+        if (this.laterpayConfig_['scrollToTopAfterAuth']) {
+          this.vsync_.mutate(() => this.viewport_.setScrollTop(0));
+        }
+        this.emptyContainer_();
+        return {access: response.access};
+      },
+      err => {
+        if (!err || !err.response) {
+          throw err;
+        }
+        const {response} = err;
+        if (response.status !== 402) {
+          throw err;
+        }
+        return response
+          .json()
+          .catch(() => undefined)
+          .then(responseJson => {
             this.purchaseConfig_ = responseJson;
             this.purchaseOptions_ = this.parseConfigIntoOptions_(
-                responseJson.purchase_options);
+              responseJson.purchase_options
+            );
             // empty before rendering, in case authorization is being called
             // again with the same state
-            this.emptyContainer_()
-                .then(this.renderPurchaseOverlay_.bind(this));
+            this.emptyContainer_().then(this.renderPurchaseOverlay_.bind(this));
             return {access: false};
           });
-        });
+      }
+    );
   }
 
   /**
@@ -261,20 +268,29 @@ export class LaterpayVendor {
    * @private
    */
   getPurchaseConfig_() {
-    const url = this.purchaseConfigBaseUrl_ +
-                '&article_title=' + encodeURIComponent(this.getArticleTitle_());
+    const url =
+      this.purchaseConfigBaseUrl_ +
+      '&article_title=' +
+      encodeURIComponent(this.getArticleTitle_());
     const urlPromise = this.accessSource_.buildUrl(
-        url, /* useAuthData */ false);
-    return urlPromise.then(url => {
-      return this.accessSource_.getLoginUrl(url);
-    }).then(url => {
-      dev().info(TAG, 'Authorization URL: ', url);
-      return this.timer_.timeoutPromise(
-          AUTHORIZATION_TIMEOUT,
-          this.xhr_.fetchJson(url, {
-            credentials: 'include',
-          })).then(res => res.json());
-    });
+      url,
+      /* useAuthData */ false
+    );
+    return urlPromise
+      .then(url => {
+        return this.accessSource_.getLoginUrl(url);
+      })
+      .then(url => {
+        dev().info(TAG, 'Authorization URL: ', url);
+        return this.timer_
+          .timeoutPromise(
+            AUTHORIZATION_TIMEOUT,
+            this.xhr_.fetchJson(url, {
+              credentials: 'include',
+            })
+          )
+          .then(res => res.json());
+      });
   }
 
   /**
@@ -286,15 +302,16 @@ export class LaterpayVendor {
     const articleTitle = this.getArticleTitle_();
     const purchaseOptions = {};
     purchaseOptions['singlePurchases'] = purchaseOptionsList.filter(
-        option => option['sales_model'] === 'single_purchase'
+      option => option['sales_model'] === 'single_purchase'
     );
     purchaseOptions['singlePurchases'].forEach(
-        option => option.description = articleTitle);
+      option => (option.description = articleTitle)
+    );
     purchaseOptions['timepasses'] = purchaseOptionsList.filter(
-        option => option['sales_model'] === 'timepass'
+      option => option['sales_model'] === 'timepass'
     );
     purchaseOptions['subscriptions'] = purchaseOptionsList.filter(
-        option => option['sales_model'] === 'subscription'
+      option => option['sales_model'] === 'subscription'
     );
     return purchaseOptions;
   }
@@ -313,11 +330,14 @@ export class LaterpayVendor {
    * @private
    */
   getArticleTitle_() {
-    const title = this.ampdoc.getRootNode().querySelector(
-        this.laterpayConfig_['articleTitleSelector']);
+    const title = this.ampdoc
+      .getRootNode()
+      .querySelector(this.laterpayConfig_['articleTitleSelector']);
     userAssert(
-        title, 'No article title element found with selector %s',
-        this.laterpayConfig_['articleTitleSelector']);
+      title,
+      'No article title element found with selector %s',
+      this.laterpayConfig_['articleTitleSelector']
+    );
     return title.textContent.trim();
   }
 
@@ -329,8 +349,8 @@ export class LaterpayVendor {
     const id = TAG + '-dialog';
     const dialogContainer = this.ampdoc.getElementById(id);
     return user().assertElement(
-        dialogContainer,
-        'No element found with id ' + id
+      dialogContainer,
+      'No element found with id ' + id
     );
   }
 
@@ -395,13 +415,15 @@ export class LaterpayVendor {
     this.innerContainer_.appendChild(listContainer);
     this.innerContainer_.appendChild(purchaseButton);
     this.innerContainer_.appendChild(
-        this.createAlreadyPurchasedLink_(this.purchaseConfig_['identify_url']));
+      this.createAlreadyPurchasedLink_(this.purchaseConfig_['identify_url'])
+    );
     this.renderTextBlock_('footer');
     dialogContainer.appendChild(this.innerContainer_);
     dialogContainer.appendChild(this.createLaterpayBadge_());
     this.containerEmpty_ = false;
     this.preselectFirstOption_(
-        dev().assertElement(listContainer.firstElementChild));
+      dev().assertElement(listContainer.firstElementChild)
+    );
   }
 
   /**
@@ -485,15 +507,14 @@ export class LaterpayVendor {
     radio.type = 'radio';
     radio.id = option['title'];
     radio.value = option['purchase_url'];
-    const purchaseType = option['price']['payment_model'] === 'pay_later' ?
-      'payLater' :
-      'payNow';
+    const purchaseType =
+      option['price']['payment_model'] === 'pay_later' ? 'payLater' : 'payNow';
     const purchaseActionLabel = this.i18n_[purchaseType + 'Button'];
     radio.setAttribute('data-purchase-action-label', purchaseActionLabel);
     radio.setAttribute('data-purchase-type', purchaseType);
-    this.purchaseOptionListeners_.push(listen(
-        radio, 'change', this.handlePurchaseOptionSelection_.bind(this)
-    ));
+    this.purchaseOptionListeners_.push(
+      listen(radio, 'change', this.handlePurchaseOptionSelection_.bind(this))
+    );
     return radio;
   }
 
@@ -523,7 +544,7 @@ export class LaterpayVendor {
    * @private
    */
   formatPrice_(priceValue) {
-    const value = (priceValue / 100);
+    const value = priceValue / 100;
     const props = {
       style: 'decimal',
       minimumFractionDigits: 0,
@@ -534,7 +555,7 @@ export class LaterpayVendor {
   /**
    * @param {string} href
    * @return {!Element}
-  */
+   */
   createAlreadyPurchasedLink_(href) {
     const p = this.createElement_('p');
     p.className = TAG + '-already-purchased-link-container';
@@ -565,8 +586,10 @@ export class LaterpayVendor {
     const selectedOptionClassname = TAG + '-selected';
     const prevPurchaseOption = this.selectedPurchaseOption_;
     const purchaseActionLabel = target.dataset['purchaseActionLabel'];
-    if (prevPurchaseOption &&
-        prevPurchaseOption.classList.contains(selectedOptionClassname)) {
+    if (
+      prevPurchaseOption &&
+      prevPurchaseOption.classList.contains(selectedOptionClassname)
+    ) {
       prevPurchaseOption.classList.remove(selectedOptionClassname);
     }
     this.selectedPurchaseOption_ = target;
@@ -583,7 +606,9 @@ export class LaterpayVendor {
   handlePurchase_(ev, purchaseUrl, purchaseType) {
     ev.preventDefault();
     const urlPromise = this.accessSource_.buildUrl(
-        purchaseUrl, /* useAuthData */ false);
+      purchaseUrl,
+      /* useAuthData */ false
+    );
     return urlPromise.then(url => {
       dev().fine(TAG, 'Authorization URL: ', url);
       this.accessSource_.loginWithUrl(url, purchaseType);
diff --git a/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js b/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
index ab5e225e1a58..f5eafad0b88d 100644
--- a/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
+++ b/extensions/amp-access-laterpay/0.2/test/test-amp-access-laterpay.js
@@ -18,304 +18,351 @@ import {LaterpayVendor} from '../laterpay-impl';
 
 const TAG = 'amp-access-laterpay';
 
-describes.fakeWin('LaterpayVendor', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let accessSource;
-  let accessService;
-  let accessSourceMock;
-  let xhrMock;
-  let articleTitle;
-  let laterpayConfig;
-  let vendor;
-  let priceData;
+describes.fakeWin(
+  'LaterpayVendor',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let accessSource;
+    let accessService;
+    let accessSourceMock;
+    let xhrMock;
+    let articleTitle;
+    let laterpayConfig;
+    let vendor;
+    let priceData;
 
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    laterpayConfig = {
-      articleTitleSelector: '#laterpay-test-title',
-      region: 'us',
-    };
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
 
-    accessSource = {
-      getAdapterConfig: () => { return laterpayConfig; },
-      buildUrl: () => {},
-      loginWithUrl: () => {},
-      getLoginUrl: () => {},
-    };
+      laterpayConfig = {
+        articleTitleSelector: '#laterpay-test-title',
+        region: 'us',
+      };
 
-    accessService = {
-      ampdoc,
-      getSource: () => accessSource,
-    };
+      accessSource = {
+        getAdapterConfig: () => {
+          return laterpayConfig;
+        },
+        buildUrl: () => {},
+        loginWithUrl: () => {},
+        getLoginUrl: () => {},
+      };
 
-    priceData = {
-      price: 123,
-      currency: 'EUR',
-      'payment_model': 'pay_later',
-    };
+      accessService = {
+        ampdoc,
+        getSource: () => accessSource,
+      };
 
-    accessSourceMock = sandbox.mock(accessSource);
+      priceData = {
+        price: 123,
+        currency: 'EUR',
+        'payment_model': 'pay_later',
+      };
 
-    articleTitle = document.createElement('h1');
-    articleTitle.id = 'laterpay-test-title';
-    articleTitle.textContent = 'test title';
-    document.body.appendChild(articleTitle);
+      accessSourceMock = sandbox.mock(accessSource);
 
-    vendor = new LaterpayVendor(accessService, accessSource);
-    xhrMock = sandbox.mock(vendor.xhr_);
-  });
+      articleTitle = document.createElement('h1');
+      articleTitle.id = 'laterpay-test-title';
+      articleTitle.textContent = 'test title';
+      document.body.appendChild(articleTitle);
 
-  afterEach(() => {
-    articleTitle.parentNode.removeChild(articleTitle);
-    accessSourceMock.verify();
-    xhrMock.verify();
-  });
+      vendor = new LaterpayVendor(accessService, accessSource);
+      xhrMock = sandbox.mock(vendor.xhr_);
+    });
 
-  describe('authorize', () => {
-    let emptyContainerStub;
-    beforeEach(() => {
-      emptyContainerStub = sandbox.stub(vendor, 'emptyContainer_');
-      sandbox.stub(vendor, 'renderPurchaseOverlay_');
+    afterEach(() => {
+      articleTitle.parentNode.removeChild(articleTitle);
+      accessSourceMock.verify();
+      xhrMock.verify();
     });
 
-    it('uses a non default region', () => {
-      const buildUrl = accessSourceMock.expects('buildUrl')
+    describe('authorize', () => {
+      let emptyContainerStub;
+      beforeEach(() => {
+        emptyContainerStub = sandbox.stub(vendor, 'emptyContainer_');
+        sandbox.stub(vendor, 'renderPurchaseOverlay_');
+      });
+
+      it('uses a non default region', () => {
+        const buildUrl = accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve(''))
           .once();
-      xhrMock.expects('fetchJson')
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(() => {
-        expect(
+        return vendor.authorize().then(() => {
+          expect(
             /connector\.uselaterpay\.com/g.test(buildUrl.firstCall.args[0])
-        ).to.be.true;
+          ).to.be.true;
+        });
       });
-    });
 
-    it('successful authorization', () => {
-      vendor.purchaseConfigBaseUrl_ = 'https://baseurl?param';
-      accessSourceMock.expects('buildUrl')
-          .withExactArgs('https://baseurl?param&article_title=test%20title', false)
+      it('successful authorization', () => {
+        vendor.purchaseConfigBaseUrl_ = 'https://baseurl?param';
+        accessSourceMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://baseurl?param&article_title=test%20title',
+            false
+          )
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(resp => {
-        expect(resp.access).to.be.true;
-        expect(emptyContainerStub.called).to.be.true;
+        return vendor.authorize().then(resp => {
+          expect(resp.access).to.be.true;
+          expect(emptyContainerStub.called).to.be.true;
+        });
       });
-    });
 
-    it('authorization fails due to lack of server config', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization fails due to lack of server config', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
           .returns(Promise.resolve({status: 204}))
           .once();
-      return vendor.authorize().catch(err => {
-        expect(err.message).to.exist;
+        return vendor.authorize().catch(err => {
+          expect(err.message).to.exist;
+        });
       });
-    });
 
-    it('authorization response from server fails', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization response from server fails', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
+        xhrMock
+          .expects('fetchJson')
           .withExactArgs('https://builturl', {
             credentials: 'include',
           })
-          .returns(Promise.reject({
-            response: {
-              status: 402,
-              json() {
-                return Promise.resolve({'purchase_options': [
-                  {'sales_model': 'single_purchase'},
-                  {'sales_model': 'timepass'},
-                  {'sales_model': 'subscription'},
-                ]});
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+                json() {
+                  return Promise.resolve({
+                    'purchase_options': [
+                      {'sales_model': 'single_purchase'},
+                      {'sales_model': 'timepass'},
+                      {'sales_model': 'subscription'},
+                    ],
+                  });
+                },
               },
-            },
-          }))
+            })
+          )
           .once();
-      emptyContainerStub.returns(Promise.resolve());
-      return vendor.authorize().then(err => {
-        expect(err.access).to.be.false;
-        expect(vendor.purchaseOptions_.singlePurchases).to.have.lengthOf(1);
-        expect(vendor.purchaseOptions_.timepasses).to.have.lengthOf(1);
-        expect(vendor.purchaseOptions_.subscriptions).to.have.lengthOf(1);
+        emptyContainerStub.returns(Promise.resolve());
+        return vendor.authorize().then(err => {
+          expect(err.access).to.be.false;
+          expect(vendor.purchaseOptions_.singlePurchases).to.have.lengthOf(1);
+          expect(vendor.purchaseOptions_.timepasses).to.have.lengthOf(1);
+          expect(vendor.purchaseOptions_.subscriptions).to.have.lengthOf(1);
+        });
       });
     });
 
-  });
-
-  describe('create purchase overlay', () => {
-    let container;
-
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        'identify_url': 'http://id.url',
-      };
-      vendor.purchaseOptions_ = {
-        singlePurchases: [{
-          price: priceData,
-        }],
-        timepasses: [{
-          price: priceData,
-        }],
-        subscriptions: [{
-          price: priceData,
-        }],
-      };
-      vendor.renderPurchaseOverlay_();
-    });
+    describe('create purchase overlay', () => {
+      let container;
+
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          'identify_url': 'http://id.url',
+        };
+        vendor.purchaseOptions_ = {
+          singlePurchases: [
+            {
+              price: priceData,
+            },
+          ],
+          timepasses: [
+            {
+              price: priceData,
+            },
+          ],
+          subscriptions: [
+            {
+              price: priceData,
+            },
+          ],
+        };
+        vendor.renderPurchaseOverlay_();
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('renders list', () => {
-      expect(container.querySelector('ul')).to.not.be.null;
-    });
+      it('renders list', () => {
+        expect(container.querySelector('ul')).to.not.be.null;
+      });
 
-    it('renders 3 purchase options', () => {
-      expect(container.querySelector('ul').childNodes.length).to.equal(3);
-    });
+      it('renders 3 purchase options', () => {
+        expect(container.querySelector('ul').childNodes.length).to.equal(3);
+      });
 
-    it('renders identify url link', () => {
-      expect(container.querySelector('p > a').href).to
-          .match(/^http\:\/\/id\.url/);
+      it('renders identify url link', () => {
+        expect(container.querySelector('p > a').href).to.match(
+          /^http\:\/\/id\.url/
+        );
+      });
     });
 
-  });
-
-  describe('purchase option selection', () => {
-    let container;
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        'identify_url': 'http://id.url',
-      };
-      vendor.purchaseOptions_ = {
-        singlePurchases: [{
-          price: priceData,
-        }],
-        timepasses: [{
-          price: priceData,
-        }],
-        subscriptions: [{
-          price: priceData,
-        }],
-      };
-      vendor.renderPurchaseOverlay_();
-      const ev = new Event('change');
-      container.querySelector('input').dispatchEvent(ev);
-    });
+    describe('purchase option selection', () => {
+      let container;
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          'identify_url': 'http://id.url',
+        };
+        vendor.purchaseOptions_ = {
+          singlePurchases: [
+            {
+              price: priceData,
+            },
+          ],
+          timepasses: [
+            {
+              price: priceData,
+            },
+          ],
+          subscriptions: [
+            {
+              price: priceData,
+            },
+          ],
+        };
+        vendor.renderPurchaseOverlay_();
+        const ev = new Event('change');
+        container.querySelector('input').dispatchEvent(ev);
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('purchase option is selected', () => {
-      expect(vendor.selectedPurchaseOption_).to.not.be.null;
-      expect(vendor.selectedPurchaseOption_.classList
-          .contains(TAG + '-selected')).to.be.true;
+      it('purchase option is selected', () => {
+        expect(vendor.selectedPurchaseOption_).to.not.be.null;
+        expect(
+          vendor.selectedPurchaseOption_.classList.contains(TAG + '-selected')
+        ).to.be.true;
+      });
     });
 
-  });
-
-  describe('purchase', () => {
-    let container;
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = TAG + '-dialog';
-      document.body.appendChild(container);
-      vendor.i18n_ = {};
-      vendor.purchaseConfig_ = {
-        'identify_url': 'http://id.url',
-      };
-      vendor.purchaseOptions_ = {
-        singlePurchases: [{
-          price: priceData,
-        }],
-        timepasses: [{
-          price: priceData,
-        }],
-        subscriptions: [{
-          price: priceData,
-        }],
-      };
-      vendor.renderPurchaseOverlay_();
-    });
+    describe('purchase', () => {
+      let container;
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = TAG + '-dialog';
+        document.body.appendChild(container);
+        vendor.i18n_ = {};
+        vendor.purchaseConfig_ = {
+          'identify_url': 'http://id.url',
+        };
+        vendor.purchaseOptions_ = {
+          singlePurchases: [
+            {
+              price: priceData,
+            },
+          ],
+          timepasses: [
+            {
+              price: priceData,
+            },
+          ],
+          subscriptions: [
+            {
+              price: priceData,
+            },
+          ],
+        };
+        vendor.renderPurchaseOverlay_();
+      });
 
-    afterEach(() => {
-      container.parentNode.removeChild(container);
-    });
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
 
-    it('sends request for purchase', done => {
-      const changeEv = new Event('change');
-      container.querySelector('input').dispatchEvent(changeEv);
-      accessSourceMock.expects('buildUrl')
+      it('sends request for purchase', done => {
+        const changeEv = new Event('change');
+        container.querySelector('input').dispatchEvent(changeEv);
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('loginWithUrl')
-          .once();
-      const clickEv = new Event('click');
-      container.querySelector('button').dispatchEvent(clickEv);
-      setTimeout(() => {done();}, 500);
-    });
+        accessSourceMock.expects('loginWithUrl').once();
+        const clickEv = new Event('click');
+        container.querySelector('button').dispatchEvent(clickEv);
+        setTimeout(() => {
+          done();
+        }, 500);
+      });
 
-    it('sends request for already purchased', done => {
-      accessSourceMock.expects('buildUrl')
+      it('sends request for already purchased', done => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://apllink'))
           .once();
-      accessSourceMock.expects('loginWithUrl')
-          .once();
-      const clickEv = new Event('click');
-      container
+        accessSourceMock.expects('loginWithUrl').once();
+        const clickEv = new Event('click');
+        container
           .querySelector('.' + TAG + '-already-purchased-link-container > a')
           .dispatchEvent(clickEv);
-      setTimeout(() => {done();}, 500);
+        setTimeout(() => {
+          done();
+        }, 500);
+      });
     });
-
-
-  });
-});
+  }
+);
diff --git a/extensions/amp-access-poool/0.1/amp-access-poool.js b/extensions/amp-access-poool/0.1/amp-access-poool.js
index 59b624cb5e3d..662d138b55d8 100644
--- a/extensions/amp-access-poool/0.1/amp-access-poool.js
+++ b/extensions/amp-access-poool/0.1/amp-access-poool.js
@@ -19,18 +19,19 @@ import {Services} from '../../../src/services';
 
 AMP.extension('amp-access-poool', '0.1', function(AMP) {
   AMP.registerServiceForDoc(
-      'poool',
-      /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
-      function(ampdoc) {
-        const element = ampdoc.getHeadNode();
-        return Services.accessServiceForDoc(element).then(accessService => {
-          const source = accessService.getVendorSource('poool');
-          const vendor = new PooolVendor(accessService, source);
-          const adapter = /** @type {
+    'poool',
+    /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
+    function(ampdoc) {
+      const element = ampdoc.getHeadNode();
+      return Services.accessServiceForDoc(element).then(accessService => {
+        const source = accessService.getVendorSource('poool');
+        const vendor = new PooolVendor(accessService, source);
+        const adapter = /** @type {
             !../../amp-access/0.1/amp-access-vendor.AccessVendorAdapter
           } */ (source.getAdapter());
-          adapter.registerVendor(vendor);
-          return vendor;
-        });
+        adapter.registerVendor(vendor);
+        return vendor;
       });
+    }
+  );
 });
diff --git a/extensions/amp-access-poool/0.1/poool-impl.js b/extensions/amp-access-poool/0.1/poool-impl.js
index 9c713b478c94..76e1fec1bab9 100644
--- a/extensions/amp-access-poool/0.1/poool-impl.js
+++ b/extensions/amp-access-poool/0.1/poool-impl.js
@@ -24,14 +24,13 @@ import {resetStyles, setStyle, setStyles} from '../../../src/style';
 const TAG = 'amp-access-poool';
 
 const ACCESS_CONFIG = {
-  'authorization':
-    'https://api.poool.fr/api/v2/amp/access?rid=READER_ID',
+  'authorization': 'https://api.poool.fr/api/v2/amp/access?rid=READER_ID',
   'iframe':
-    'https://assets.poool.fr/amp.html'
-        + '?rid=READER_ID'
-        + '&c=CANONICAL_URL'
-        + '&o=AMPDOC_URL'
-        + '&r=DOCUMENT_REFERRER',
+    'https://assets.poool.fr/amp.html' +
+    '?rid=READER_ID' +
+    '&c=CANONICAL_URL' +
+    '&o=AMPDOC_URL' +
+    '&r=DOCUMENT_REFERRER',
 };
 
 const AUTHORIZATION_TIMEOUT = 3000;
@@ -59,7 +58,6 @@ export class PooolVendor {
    * @param {!../../amp-access/0.1/amp-access-source.AccessSource} accessSource
    */
   constructor(accessService, accessSource) {
-
     /** @const */
     this.ampdoc = accessService.ampdoc;
 
@@ -102,20 +100,22 @@ export class PooolVendor {
    * @return {!Promise<!JsonObject>}
    */
   authorize() {
-    return this.getPooolAccess_()
-        .then(response => {
-          return {access: response.access};
-        }, err => {
-          if (!err || !err.response) {
-            throw err;
-          }
-          const {response} = err;
-          if (response.status !== 402) {
-            throw err;
-          }
-          this.renderPoool_();
-          return {access: false};
-        });
+    return this.getPooolAccess_().then(
+      response => {
+        return {access: response.access};
+      },
+      err => {
+        if (!err || !err.response) {
+          throw err;
+        }
+        const {response} = err;
+        if (response.status !== 402) {
+          throw err;
+        }
+        this.renderPoool_();
+        return {access: false};
+      }
+    );
   }
 
   /**
@@ -154,16 +154,18 @@ export class PooolVendor {
    * @private
    */
   getPooolAccess_() {
-    const url = addParamToUrl(this.accessUrl_ , 'iid', this.itemID_);
+    const url = addParamToUrl(this.accessUrl_, 'iid', this.itemID_);
     const urlPromise = this.accessSource_.buildUrl(url, false);
-    return urlPromise.then(url => {
-      return this.accessSource_.getLoginUrl(url);
-    }).then(url => {
-      dev().info(TAG, 'Authorization URL: ', url);
-      return this.timer_.timeoutPromise(
-          AUTHORIZATION_TIMEOUT,
-          this.xhr_.fetchJson(url)).then(res => res.json());
-    });
+    return urlPromise
+      .then(url => {
+        return this.accessSource_.getLoginUrl(url);
+      })
+      .then(url => {
+        dev().info(TAG, 'Authorization URL: ', url);
+        return this.timer_
+          .timeoutPromise(AUTHORIZATION_TIMEOUT, this.xhr_.fetchJson(url))
+          .then(res => res.json());
+      });
   }
 
   /**
@@ -172,18 +174,23 @@ export class PooolVendor {
   renderPoool_() {
     const pooolContainer = document.getElementById('poool');
     const urlPromise = this.accessSource_.buildUrl(
-        addParamsToUrl(this.iframeUrl_, dict({
+      addParamsToUrl(
+        this.iframeUrl_,
+        dict({
           'bi': this.pooolConfig_['bundleID'],
           'iid': this.pooolConfig_['itemID'],
           'ce': this.pooolConfig_['cookiesEnabled'],
-          'd': typeof this.pooolConfig_['debug'] !== 'undefined' &&
+          'd':
+            typeof this.pooolConfig_['debug'] !== 'undefined' &&
             this.pooolConfig_['debug'] !== null
-            ? this.pooolConfig_['debug']
-            : getMode().development || getMode().localDev,
+              ? this.pooolConfig_['debug']
+              : getMode().development || getMode().localDev,
           'fw': this.pooolConfig_['forceWidget'],
           'cs': this.pooolConfig_['customSegment'],
-        })),
-        false);
+        })
+      ),
+      false
+    );
 
     return urlPromise.then(url => {
       this.iframe_.src = url;
diff --git a/extensions/amp-access-poool/0.1/test/test-amp-access-poool.js b/extensions/amp-access-poool/0.1/test/test-amp-access-poool.js
index 6f0a6f424fb3..6491c49c92d9 100644
--- a/extensions/amp-access-poool/0.1/test/test-amp-access-poool.js
+++ b/extensions/amp-access-poool/0.1/test/test-amp-access-poool.js
@@ -15,120 +15,140 @@
  */
 import {PooolVendor} from '../poool-impl';
 
-describes.fakeWin('PooolVendor', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let accessSource;
-  let accessService;
-  let accessSourceMock;
-  let xhrMock;
-  let pooolConfig;
-  let vendor;
+describes.fakeWin(
+  'PooolVendor',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let accessSource;
+    let accessService;
+    let accessSourceMock;
+    let xhrMock;
+    let pooolConfig;
+    let vendor;
 
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    pooolConfig = {
-      bundleID: 'ZRGA3EYZ4GRBTSHREG345HGGZRTHZEGEH',
-      pageType: 'premium',
-      itemID: 'amp-test-article',
-    };
-
-    accessSource = {
-      getAdapterConfig: () => { return pooolConfig; },
-      buildUrl: () => {},
-      getReaderId_: () => {},
-      getLoginUrl: () => {},
-    };
-
-    accessService = {
-      ampdoc,
-      getSource: () => accessSource,
-    };
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
 
-    accessSourceMock = sandbox.mock(accessSource);
+      pooolConfig = {
+        bundleID: 'ZRGA3EYZ4GRBTSHREG345HGGZRTHZEGEH',
+        pageType: 'premium',
+        itemID: 'amp-test-article',
+      };
 
-    vendor = new PooolVendor(accessService, accessSource);
-    xhrMock = sandbox.mock(vendor.xhr_);
-  });
+      accessSource = {
+        getAdapterConfig: () => {
+          return pooolConfig;
+        },
+        buildUrl: () => {},
+        getReaderId_: () => {},
+        getLoginUrl: () => {},
+      };
 
-  afterEach(() => {
-    accessSourceMock.verify();
-    xhrMock.verify();
-  });
+      accessService = {
+        ampdoc,
+        getSource: () => accessSource,
+      };
 
-  describe('authorize', () => {
-    let container;
+      accessSourceMock = sandbox.mock(accessSource);
 
-    beforeEach(() => {
-      container = document.createElement('div');
-      container.id = 'poool-widget';
-      document.body.appendChild(container);
-      sandbox.stub(vendor, 'renderPoool_');
+      vendor = new PooolVendor(accessService, accessSource);
+      xhrMock = sandbox.mock(vendor.xhr_);
     });
 
     afterEach(() => {
-      container.parentNode.removeChild(container);
+      accessSourceMock.verify();
+      xhrMock.verify();
     });
 
-    it('successful authorization', () => {
-      vendor.accessUrl_ = 'https://baseurl?param';
-      accessSourceMock.expects('buildUrl')
+    describe('authorize', () => {
+      let container;
+
+      beforeEach(() => {
+        container = document.createElement('div');
+        container.id = 'poool-widget';
+        document.body.appendChild(container);
+        sandbox.stub(vendor, 'renderPoool_');
+      });
+
+      afterEach(() => {
+        container.parentNode.removeChild(container);
+      });
+
+      it('successful authorization', () => {
+        vendor.accessUrl_ = 'https://baseurl?param';
+        accessSourceMock
+          .expects('buildUrl')
           .withExactArgs('https://baseurl?param&iid=amp-test-article', false)
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(resp => {
-        expect(resp.access).to.be.true;
+        return vendor.authorize().then(resp => {
+          expect(resp.access).to.be.true;
+        });
       });
-    });
 
-    it('authorization fails because of wrong or missing server config', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization fails because of wrong or missing server config', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      accessSourceMock.expects('getLoginUrl')
+        accessSourceMock
+          .expects('getLoginUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve({access: true});
-            },
-          }))
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve({access: true});
+              },
+            })
+          )
           .once();
-      return vendor.authorize().catch(err => {
-        expect(err.message).to.exist;
+        return vendor.authorize().catch(err => {
+          expect(err.message).to.exist;
+        });
       });
-    });
 
-    it('authorization response fails - 402 error', () => {
-      accessSourceMock.expects('buildUrl')
+      it('authorization response fails - 402 error', () => {
+        accessSourceMock
+          .expects('buildUrl')
           .returns(Promise.resolve('https://builturl'))
           .once();
-      xhrMock.expects('fetchJson')
-          .returns(Promise.reject({
-            response: {
-              status: 402,
-            },
-          }))
+        xhrMock
+          .expects('fetchJson')
+          .returns(
+            Promise.reject({
+              response: {
+                status: 402,
+              },
+            })
+          )
           .once();
-      return vendor.authorize().then(err => {
-        expect(err.access).to.be.false;
+        return vendor.authorize().then(err => {
+          expect(err.access).to.be.false;
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-access-scroll/0.1/amp-access-scroll.js b/extensions/amp-access-scroll/0.1/amp-access-scroll.js
index dfeabd362dcf..0b8b341af0b3 100644
--- a/extensions/amp-access-scroll/0.1/amp-access-scroll.js
+++ b/extensions/amp-access-scroll/0.1/amp-access-scroll.js
@@ -19,19 +19,19 @@ import {Services} from '../../../src/services';
 
 AMP.extension('amp-access-scroll', '0.1', function(AMP) {
   AMP.registerServiceForDoc(
-      'scroll',
-      /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
-      function(ampdoc) {
-        const element = ampdoc.getHeadNode();
-        return Services.accessServiceForDoc(element).then(accessService => {
-          const source = accessService.getVendorSource('scroll');
-          const vendor = new ScrollAccessVendor(ampdoc, source);
-          const adapter = /** @type {
+    'scroll',
+    /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
+    function(ampdoc) {
+      const element = ampdoc.getHeadNode();
+      return Services.accessServiceForDoc(element).then(accessService => {
+        const source = accessService.getVendorSource('scroll');
+        const vendor = new ScrollAccessVendor(ampdoc, source);
+        const adapter = /** @type {
             !../../amp-access/0.1/amp-access-vendor.AccessVendorAdapter
           } */ (source.getAdapter());
-          adapter.registerVendor(vendor);
-          return vendor;
-        });
-      }
+        adapter.registerVendor(vendor);
+        return vendor;
+      });
+    }
   );
 });
diff --git a/extensions/amp-access-scroll/0.1/read-depth-tracker.js b/extensions/amp-access-scroll/0.1/read-depth-tracker.js
index b47323f210df..b6cc63c73280 100644
--- a/extensions/amp-access-scroll/0.1/read-depth-tracker.js
+++ b/extensions/amp-access-scroll/0.1/read-depth-tracker.js
@@ -39,9 +39,9 @@ export class ReadDepthTracker {
 
     /** @private {function()} */
     const debouncedFindTopParagraph_ = debounce(
-        ampdoc.win,
-        this.findTopParagraph_.bind(this),
-        1000
+      ampdoc.win,
+      this.findTopParagraph_.bind(this),
+      1000
     );
 
     this.viewport_ = Services.viewportForDoc(ampdoc);
@@ -59,24 +59,27 @@ export class ReadDepthTracker {
    * @private
    */
   findTopParagraph_() {
-    return Promise.all([].slice.call(this.paragraphs_)
-        .map(p => this.viewport_.getClientRectAsync(p)))
-        .then(rects => {
-          let lastIdxAboveViewport = null;
-          let lastPosition = null;
-          for (let i = rects.length - 1; i >= 0; i--) {
-            const bottomPosition = rects[i].bottom;
-            if (bottomPosition <= 0 &&
-              (lastPosition === null || lastPosition < bottomPosition)
-            ) {
-              lastIdxAboveViewport = i;
-              lastPosition = bottomPosition;
-            }
-          }
-          if (lastIdxAboveViewport !== null) {
-            this.recordLatestRead_(lastIdxAboveViewport);
-          }
-        });
+    return Promise.all(
+      [].slice
+        .call(this.paragraphs_)
+        .map(p => this.viewport_.getClientRectAsync(p))
+    ).then(rects => {
+      let lastIdxAboveViewport = null;
+      let lastPosition = null;
+      for (let i = rects.length - 1; i >= 0; i--) {
+        const bottomPosition = rects[i].bottom;
+        if (
+          bottomPosition <= 0 &&
+          (lastPosition === null || lastPosition < bottomPosition)
+        ) {
+          lastIdxAboveViewport = i;
+          lastPosition = bottomPosition;
+        }
+      }
+      if (lastIdxAboveViewport !== null) {
+        this.recordLatestRead_(lastIdxAboveViewport);
+      }
+    });
   }
 
   /**
@@ -88,7 +91,7 @@ export class ReadDepthTracker {
     if (this.lastReadIndex_ !== paragraphIdx) {
       this.lastReadIndex_ = paragraphIdx;
       this.updateLastRead_(
-          this.paragraphs_[paragraphIdx]./*OK*/innerText.substring(0, 50)
+        this.paragraphs_[paragraphIdx]./*OK*/ innerText.substring(0, 50)
       );
     }
   }
@@ -99,16 +102,19 @@ export class ReadDepthTracker {
    * @private
    */
   updateLastRead_(snippet) {
-    this.accessSource_.buildUrl((
-      `${this.connectHostname_}/amp/updatedepth`
-      + '?rid=READER_ID'
-      + '&cid=CLIENT_ID(scroll1)'
-      + '&c=CANONICAL_URL'
-      + '&o=AMPDOC_URL'
-      + '&rd=' + encodeURIComponent(snippet)
-    ), false).then(url => {
-      Services.xhrFor(this.ampdoc_.win)
-          .fetch(url);
-    });
+    this.accessSource_
+      .buildUrl(
+        `${this.connectHostname_}/amp/updatedepth` +
+          '?rid=READER_ID' +
+          '&cid=CLIENT_ID(scroll1)' +
+          '&c=CANONICAL_URL' +
+          '&o=AMPDOC_URL' +
+          '&rd=' +
+          encodeURIComponent(snippet),
+        false
+      )
+      .then(url => {
+        Services.xhrFor(this.ampdoc_.win).fetch(url);
+      });
   }
 }
diff --git a/extensions/amp-access-scroll/0.1/scroll-impl.js b/extensions/amp-access-scroll/0.1/scroll-impl.js
index aaa9ba485cae..9128b0272e7c 100644
--- a/extensions/amp-access-scroll/0.1/scroll-impl.js
+++ b/extensions/amp-access-scroll/0.1/scroll-impl.js
@@ -33,21 +33,23 @@ const TAG = 'amp-access-scroll-elt';
 const accessConfig = connectHostname => {
   /** @const {!JsonObject} */
   const ACCESS_CONFIG = /** @type {!JsonObject} */ ({
-    'authorization': `${connectHostname}/amp/access`
-                     + '?rid=READER_ID'
-                     + '&cid=CLIENT_ID(scroll1)'
-                     + '&c=CANONICAL_URL'
-                     + '&o=AMPDOC_URL'
-                     + '&x=QUERY_PARAM(scrollx)',
-    'pingback': `${connectHostname}/amp/pingback`
-                + '?rid=READER_ID'
-                + '&cid=CLIENT_ID(scroll1)'
-                + '&c=CANONICAL_URL'
-                + '&o=AMPDOC_URL'
-                + '&r=DOCUMENT_REFERRER'
-                + '&x=QUERY_PARAM(scrollx)'
-                + '&d=AUTHDATA(scroll)'
-                + '&v=AUTHDATA(visitId)',
+    'authorization':
+      `${connectHostname}/amp/access` +
+      '?rid=READER_ID' +
+      '&cid=CLIENT_ID(scroll1)' +
+      '&c=CANONICAL_URL' +
+      '&o=AMPDOC_URL' +
+      '&x=QUERY_PARAM(scrollx)',
+    'pingback':
+      `${connectHostname}/amp/pingback` +
+      '?rid=READER_ID' +
+      '&cid=CLIENT_ID(scroll1)' +
+      '&c=CANONICAL_URL' +
+      '&o=AMPDOC_URL' +
+      '&r=DOCUMENT_REFERRER' +
+      '&x=QUERY_PARAM(scrollx)' +
+      '&d=AUTHDATA(scroll)' +
+      '&v=AUTHDATA(visitId)',
     'namespace': 'scroll',
   });
   return ACCESS_CONFIG;
@@ -60,17 +62,18 @@ const accessConfig = connectHostname => {
 const analyticsConfig = connectHostname => {
   const ANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
     'requests': {
-      'scroll': `${connectHostname}/amp/analytics`
-                + '?rid=ACCESS_READER_ID'
-                + '&cid=CLIENT_ID(scroll1)'
-                + '&c=CANONICAL_URL'
-                + '&o=AMPDOC_URL'
-                + '&r=DOCUMENT_REFERRER'
-                + '&x=QUERY_PARAM(scrollx)'
-                + '&d=AUTHDATA(scroll.scroll)'
-                + '&v=AUTHDATA(scroll.visitId)'
-                + '&h=SOURCE_HOSTNAME'
-                + '&s=${totalEngagedTime}',
+      'scroll':
+        `${connectHostname}/amp/analytics` +
+        '?rid=ACCESS_READER_ID' +
+        '&cid=CLIENT_ID(scroll1)' +
+        '&c=CANONICAL_URL' +
+        '&o=AMPDOC_URL' +
+        '&r=DOCUMENT_REFERRER' +
+        '&x=QUERY_PARAM(scrollx)' +
+        '&d=AUTHDATA(scroll.scroll)' +
+        '&v=AUTHDATA(scroll.visitId)' +
+        '&h=SOURCE_HOSTNAME' +
+        '&s=${totalEngagedTime}',
     },
     'triggers': {
       'trackInterval': {
@@ -150,35 +153,37 @@ export class ScrollAccessVendor extends AccessClientAdapter {
   /** @override */
   authorize() {
     // TODO(dbow): Handle timeout?
-    return super.authorize()
-        .then(response => {
-          const isStory = this.ampdoc.getRootNode().querySelector(
-              'amp-story[standalone]');
-          if (response && response['scroll']) {
-            if (!isStory) {
-              const config = this.accessSource_.getAdapterConfig();
-              new ScrollElement(this.ampdoc).handleScrollUser(
-                  this.accessSource_, config);
-              addAnalytics(this.ampdoc, config);
-              if (response['features'] && response['features']['readDepth']) {
-                new ReadDepthTracker(
-                    this.ampdoc,
-                    this.accessSource_,
-                    connectHostname(config)
-                );
-              }
-            }
-          } else {
-            if (
-              response &&
-              response['blocker'] &&
-              ScrollContentBlocker.shouldCheck(this.ampdoc)
-            ) {
-              new ScrollContentBlocker(this.ampdoc, this.accessSource_).check();
-            }
+    return super.authorize().then(response => {
+      const isStory = this.ampdoc
+        .getRootNode()
+        .querySelector('amp-story[standalone]');
+      if (response && response['scroll']) {
+        if (!isStory) {
+          const config = this.accessSource_.getAdapterConfig();
+          new ScrollElement(this.ampdoc).handleScrollUser(
+            this.accessSource_,
+            config
+          );
+          addAnalytics(this.ampdoc, config);
+          if (response['features'] && response['features']['readDepth']) {
+            new ReadDepthTracker(
+              this.ampdoc,
+              this.accessSource_,
+              connectHostname(config)
+            );
           }
-          return response;
-        });
+        }
+      } else {
+        if (
+          response &&
+          response['blocker'] &&
+          ScrollContentBlocker.shouldCheck(this.ampdoc)
+        ) {
+          new ScrollContentBlocker(this.ampdoc, this.accessSource_).check();
+        }
+      }
+      return response;
+    });
   }
 }
 
@@ -213,17 +218,19 @@ class ScrollContentBlocker {
    */
   check() {
     Services.xhrFor(this.ampdoc_.win)
-        .fetchJson('https://block.scroll.com/check.json')
-        .then(() => false, e => this.blockedByScrollApp_(e.message))
-        .then(blockedByScrollApp => {
-          if (blockedByScrollApp === true) {
-            // TODO(dbow): Ideally we would automatically redirect to the page
-            // here, but for now we are adding a button so we redirect on user
-            // action.
-            new ScrollElement(this.ampdoc_).addActivateButton(
-                this.accessSource_, this.accessSource_.getAdapterConfig());
-          }
-        });
+      .fetchJson('https://block.scroll.com/check.json')
+      .then(() => false, e => this.blockedByScrollApp_(e.message))
+      .then(blockedByScrollApp => {
+        if (blockedByScrollApp === true) {
+          // TODO(dbow): Ideally we would automatically redirect to the page
+          // here, but for now we are adding a button so we redirect on user
+          // action.
+          new ScrollElement(this.ampdoc_).addActivateButton(
+            this.accessSource_,
+            this.accessSource_.getAdapterConfig()
+          );
+        }
+      });
   }
 
   /**
@@ -237,7 +244,7 @@ class ScrollContentBlocker {
   blockedByScrollApp_(message) {
     return (
       message.indexOf(
-          'XHR Failed fetching (https://block.scroll.com/...): ' +
+        'XHR Failed fetching (https://block.scroll.com/...): ' +
           'Resource blocked by content blocker'
       ) === 0
     );
@@ -271,9 +278,12 @@ class ScrollElement {
     this.iframe_.setAttribute('title', 'Scroll');
     this.iframe_.setAttribute('width', '100%');
     this.iframe_.setAttribute('height', '100%');
-    this.iframe_.setAttribute('sandbox', 'allow-scripts allow-same-origin ' +
-                                         'allow-top-navigation allow-popups ' +
-                                         'allow-popups-to-escape-sandbox');
+    this.iframe_.setAttribute(
+      'sandbox',
+      'allow-scripts allow-same-origin ' +
+        'allow-top-navigation allow-popups ' +
+        'allow-popups-to-escape-sandbox'
+    );
     this.scrollBar_.appendChild(this.iframe_);
     ampdoc.getBody().appendChild(this.scrollBar_);
 
@@ -293,8 +303,10 @@ class ScrollElement {
     placeholder.classList.add('amp-access-scroll-bar');
     placeholder.classList.add('amp-access-scroll-placeholder');
     const img = document.createElement('img');
-    img.setAttribute('src',
-        'https://static.scroll.com/assets/icn-scroll-logo32-9f4ceef399905139bbd26b87bfe94542.svg');
+    img.setAttribute(
+      'src',
+      'https://static.scroll.com/assets/icn-scroll-logo32-9f4ceef399905139bbd26b87bfe94542.svg'
+    );
     img.setAttribute('layout', 'fixed');
     img.setAttribute('width', 32);
     img.setAttribute('height', 32);
@@ -302,19 +314,22 @@ class ScrollElement {
     this.ampdoc_.getBody().appendChild(placeholder);
 
     // Set iframe to scrollbar URL.
-    accessSource.buildUrl((
-      `${connectHostname(vendorConfig)}/amp/scrollbar`
-      + '?rid=READER_ID'
-      + '&cid=CLIENT_ID(scroll1)'
-      + '&c=CANONICAL_URL'
-      + '&o=AMPDOC_URL'
-    ), false).then(scrollbarUrl => {
-      this.iframe_.onload = () => {
-        // On iframe load, remove placeholder element.
-        this.ampdoc_.getBody().removeChild(placeholder);
-      };
-      this.iframe_.setAttribute('src', scrollbarUrl);
-    });
+    accessSource
+      .buildUrl(
+        `${connectHostname(vendorConfig)}/amp/scrollbar` +
+          '?rid=READER_ID' +
+          '&cid=CLIENT_ID(scroll1)' +
+          '&c=CANONICAL_URL' +
+          '&o=AMPDOC_URL',
+        false
+      )
+      .then(scrollbarUrl => {
+        this.iframe_.onload = () => {
+          // On iframe load, remove placeholder element.
+          this.ampdoc_.getBody().removeChild(placeholder);
+        };
+        this.iframe_.setAttribute('src', scrollbarUrl);
+      });
   }
 
   /**
@@ -324,16 +339,19 @@ class ScrollElement {
    * @param {!JsonObject} vendorConfig
    */
   addActivateButton(accessSource, vendorConfig) {
-    accessSource.buildUrl((
-      `${scrollHostname(vendorConfig)}/activateamp`
-      + '?rid=READER_ID'
-      + '&cid=CLIENT_ID(scroll1)'
-      + '&c=CANONICAL_URL'
-      + '&o=AMPDOC_URL'
-      + '&x=QUERY_PARAM(scrollx)'
-    ), false).then(url => {
-      this.iframe_.setAttribute('src', url);
-    });
+    accessSource
+      .buildUrl(
+        `${scrollHostname(vendorConfig)}/activateamp` +
+          '?rid=READER_ID' +
+          '&cid=CLIENT_ID(scroll1)' +
+          '&c=CANONICAL_URL' +
+          '&o=AMPDOC_URL' +
+          '&x=QUERY_PARAM(scrollx)',
+        false
+      )
+      .then(url => {
+        this.iframe_.setAttribute('src', url);
+      });
   }
 }
 
@@ -353,13 +371,18 @@ function addAnalytics(ampdoc, vendorConfig) {
   if (vendorConfig['dataConsentId']) {
     attributes['data-block-on-consent'] = '';
   }
-  const analyticsElem = createElementWithAttributes(doc, 'amp-analytics',
-      attributes);
+  const analyticsElem = createElementWithAttributes(
+    doc,
+    'amp-analytics',
+    attributes
+  );
   const scriptElem = createElementWithAttributes(
-      doc,
-      'script', dict({
-        'type': 'application/json',
-      }));
+    doc,
+    'script',
+    dict({
+      'type': 'application/json',
+    })
+  );
   const ANALYTICS_CONFIG = analyticsConfig(connectHostname(vendorConfig));
   scriptElem.textContent = JSON.stringify(ANALYTICS_CONFIG);
   analyticsElem.appendChild(scriptElem);
@@ -367,7 +390,7 @@ function addAnalytics(ampdoc, vendorConfig) {
 
   // Get extensions service and force load analytics extension
   const extensions = Services.extensionsFor(ampdoc.win);
-  extensions./*OK*/installExtensionForDoc(ampdoc, 'amp-analytics');
+  extensions./*OK*/ installExtensionForDoc(ampdoc, 'amp-analytics');
 
   // Append
   ampdoc.getBody().appendChild(analyticsElem);
diff --git a/extensions/amp-access-scroll/0.1/test/read-depth-tracker.js b/extensions/amp-access-scroll/0.1/test/read-depth-tracker.js
index 7537b82bdfc1..30e78b29e56e 100644
--- a/extensions/amp-access-scroll/0.1/test/read-depth-tracker.js
+++ b/extensions/amp-access-scroll/0.1/test/read-depth-tracker.js
@@ -16,27 +16,30 @@
 import {AccessSource} from '../../../amp-access/0.1/amp-access-source';
 import {ReadDepthTracker} from '../read-depth-tracker';
 
-describes.realWin('ReadDepthTracker', {
-  amp: {
-    extensions: ['amp-access-scroll'],
+describes.realWin(
+  'ReadDepthTracker',
+  {
+    amp: {
+      extensions: ['amp-access-scroll'],
+    },
   },
-}, env => {
-  let win;
-  let doc;
-  let ampdoc;
-  let sandbox;
-  let accessSource;
-  let readDepthTracker;
+  env => {
+    let win;
+    let doc;
+    let ampdoc;
+    let sandbox;
+    let accessSource;
+    let readDepthTracker;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    sandbox = env.sandbox;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      sandbox = env.sandbox;
 
-    // Undefined initialization params for AccessSource
-    let scheduleViewFn, onReauthorizeFn;
-    accessSource = new AccessSource(
+      // Undefined initialization params for AccessSource
+      let scheduleViewFn, onReauthorizeFn;
+      accessSource = new AccessSource(
         ampdoc,
         {
           'authorization': 'https://acme.com/a',
@@ -50,54 +53,55 @@ describes.realWin('ReadDepthTracker', {
         scheduleViewFn,
         onReauthorizeFn,
         doc.documentElement
-    );
+      );
 
-    for (let i = 0; i < 5; i++) {
-      const elem = doc.createElement('p');
-      elem./*OK*/innerText = `Scroll amp test paragraph ${i}`;
-      elem.id = `${i}`;
-      doc.body.appendChild(elem);
-    }
+      for (let i = 0; i < 5; i++) {
+        const elem = doc.createElement('p');
+        elem./*OK*/ innerText = `Scroll amp test paragraph ${i}`;
+        elem.id = `${i}`;
+        doc.body.appendChild(elem);
+      }
 
-    readDepthTracker = new ReadDepthTracker(
+      readDepthTracker = new ReadDepthTracker(
         ampdoc,
         accessSource,
         'api.test.com'
-    );
+      );
 
-    // Stub viewport to fake paragraph positions
-    sandbox.stub(readDepthTracker.viewport_,'getClientRectAsync')
+      // Stub viewport to fake paragraph positions
+      sandbox
+        .stub(readDepthTracker.viewport_, 'getClientRectAsync')
         .callsFake(returnRectPosition);
 
-    // Stub updateLastRead_ call to check content sent
-    sandbox.stub(readDepthTracker, 'updateLastRead_');
-  });
+      // Stub updateLastRead_ call to check content sent
+      sandbox.stub(readDepthTracker, 'updateLastRead_');
+    });
 
-  function returnRectPosition(paragraph) {
-    if (paragraph.id === '0') {
-      return {bottom: -50};
-    } else if (paragraph.id === '1') {
-      return {bottom: -30};
-    } else {
-      return {bottom: 10};
+    function returnRectPosition(paragraph) {
+      if (paragraph.id === '0') {
+        return {bottom: -50};
+      } else if (paragraph.id === '1') {
+        return {bottom: -30};
+      } else {
+        return {bottom: 10};
+      }
     }
-  }
 
-  it('updates last read position to API with correct snippet', () => {
-    readDepthTracker.findTopParagraph_()
-        .then(() => {
-          expect(readDepthTracker.updateLastRead_.calledOnce).to.be.true;
-          expect(readDepthTracker.updateLastRead_.getCall(0).args[0])
-              .to.equal('Scroll amp test paragraph 1');
-        });
-  });
+    it('updates last read position to API with correct snippet', () => {
+      readDepthTracker.findTopParagraph_().then(() => {
+        expect(readDepthTracker.updateLastRead_.calledOnce).to.be.true;
+        expect(readDepthTracker.updateLastRead_.getCall(0).args[0]).to.equal(
+          'Scroll amp test paragraph 1'
+        );
+      });
+    });
 
-  it('does not update last read position if position has not changed', () => {
-    readDepthTracker.lastReadIndex_ = 1;
+    it('does not update last read position if position has not changed', () => {
+      readDepthTracker.lastReadIndex_ = 1;
 
-    readDepthTracker.findTopParagraph_()
-        .then(() => {
-          expect(readDepthTracker.updateLastRead_.calledOnce).to.be.false;
-        });
-  });
-});
+      readDepthTracker.findTopParagraph_().then(() => {
+        expect(readDepthTracker.updateLastRead_.calledOnce).to.be.false;
+      });
+    });
+  }
+);
diff --git a/extensions/amp-access/0.1/access-expr.js b/extensions/amp-access/0.1/access-expr.js
index 5f67c0392170..b6339220726b 100644
--- a/extensions/amp-access/0.1/access-expr.js
+++ b/extensions/amp-access/0.1/access-expr.js
@@ -16,7 +16,6 @@
 
 import {accessParser as parser} from './access-expr-impl';
 
-
 /**
  * Evaluates access expression.
  *
diff --git a/extensions/amp-access/0.1/access-vars.js b/extensions/amp-access/0.1/access-vars.js
index 49cdda89e143..85f3a77f2ca7 100644
--- a/extensions/amp-access/0.1/access-vars.js
+++ b/extensions/amp-access/0.1/access-vars.js
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-
 /**
  * Exports the substitution variables for access services.
  *
  * @interface
  */
 export class AccessVars {
-
   /**
    * Returns the promise that will yield the access READER_ID.
    *
diff --git a/extensions/amp-access/0.1/access-vendor.js b/extensions/amp-access/0.1/access-vendor.js
index f78096792671..ec7f73014322 100644
--- a/extensions/amp-access/0.1/access-vendor.js
+++ b/extensions/amp-access/0.1/access-vendor.js
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-
 /**
  * This interface is intended to be implemented by AMP Access vendors to
  * provide authorization and pingback.
  * @interface
  */
 export class AccessVendor {
-
   /**
    * Requests authorization from the vendor. Returns a promise that yields
    * a JSON authorization response.
diff --git a/extensions/amp-access/0.1/amp-access-client.js b/extensions/amp-access/0.1/amp-access-client.js
index 92b98c092722..df6ffa585255 100644
--- a/extensions/amp-access/0.1/amp-access-client.js
+++ b/extensions/amp-access/0.1/amp-access-client.js
@@ -26,10 +26,8 @@ const TAG = 'amp-access-client';
 /** @const {number} */
 const DEFAULT_AUTHORIZATION_TIMEOUT = 3000;
 
-
 /** @implements {./amp-access-source.AccessTypeAdapterDef} */
 export class AccessClientAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -43,8 +41,10 @@ export class AccessClientAdapter {
     this.context_ = context;
 
     /** @const @private {string} */
-    this.authorizationUrl_ = userAssert(configJson['authorization'],
-        '"authorization" URL must be specified');
+    this.authorizationUrl_ = userAssert(
+      configJson['authorization'],
+      '"authorization" URL must be specified'
+    );
     assertHttpsUrl(this.authorizationUrl_, '"authorization"');
 
     /** @const @private {boolean} */
@@ -59,7 +59,8 @@ export class AccessClientAdapter {
 
     /** @const @private {number} */
     this.authorizationTimeout_ = this.buildConfigAuthorizationTimeout_(
-        configJson);
+      configJson
+    );
 
     /** @const @private {!../../../src/service/xhr-impl.Xhr} */
     this.xhr_ = Services.xhrFor(ampdoc.win);
@@ -78,8 +79,10 @@ export class AccessClientAdapter {
     }
 
     let timeout = configJson['authorizationTimeout'];
-    userAssert(typeof timeout == 'number',
-        '"authorizationTimeout" must be a number');
+    userAssert(
+      typeof timeout == 'number',
+      '"authorizationTimeout" must be a number'
+    );
     if (!(getMode().localDev || getMode().development)) {
       timeout = Math.min(timeout, DEFAULT_AUTHORIZATION_TIMEOUT);
     }
@@ -118,15 +121,20 @@ export class AccessClientAdapter {
   /** @override */
   authorize() {
     dev().fine(TAG, 'Start authorization via ', this.authorizationUrl_);
-    const urlPromise = this.context_.buildUrl(this.authorizationUrl_,
-        /* useAuthData */ false);
+    const urlPromise = this.context_.buildUrl(
+      this.authorizationUrl_,
+      /* useAuthData */ false
+    );
     return urlPromise.then(url => {
       dev().fine(TAG, 'Authorization URL: ', url);
-      return this.timer_.timeoutPromise(
+      return this.timer_
+        .timeoutPromise(
           this.authorizationTimeout_,
           this.xhr_.fetchJson(url, {
             credentials: 'include',
-          })).then(res => res.json());
+          })
+        )
+        .then(res => res.json());
     });
   }
 
@@ -137,8 +145,10 @@ export class AccessClientAdapter {
 
   /** @override */
   pingback() {
-    const promise = this.context_.buildUrl(devAssert(this.pingbackUrl_),
-        /* useAuthData */ true);
+    const promise = this.context_.buildUrl(
+      devAssert(this.pingbackUrl_),
+      /* useAuthData */ true
+    );
     return promise.then(url => {
       dev().fine(TAG, 'Pingback URL: ', url);
       return this.xhr_.sendSignal(url, {
diff --git a/extensions/amp-access/0.1/amp-access-iframe.js b/extensions/amp-access/0.1/amp-access-iframe.js
index 7909911be5fb..8904b5c4138a 100644
--- a/extensions/amp-access/0.1/amp-access-iframe.js
+++ b/extensions/amp-access/0.1/amp-access-iframe.js
@@ -29,10 +29,8 @@ const AUTHORIZATION_TIMEOUT = 3000;
 const EXPIRATION_TIMEOUT = 1000 * 60 * 60 * 24 * 7; // 7 days
 const TAG = 'amp-access-iframe';
 
-
 /** @implements {./amp-access-source.AccessTypeAdapterDef} */
 export class AccessIframeAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -52,20 +50,23 @@ export class AccessIframeAdapter {
     this.timer_ = Services.timerFor(ampdoc.win);
 
     /** @const @private {string} */
-    this.iframeSrc_ = userAssert(configJson['iframeSrc'],
-        '"iframeSrc" URL must be specified');
+    this.iframeSrc_ = userAssert(
+      configJson['iframeSrc'],
+      '"iframeSrc" URL must be specified'
+    );
     assertHttpsUrl(this.iframeSrc_, '"iframeSrc"');
 
     /** @const @private {?Array} */
     this.iframeVars_ = configJson['iframeVars'] || null;
     if (this.iframeVars_) {
-      userAssert(isArray(this.iframeVars_),
-          '"iframeVars" must be an array');
+      userAssert(isArray(this.iframeVars_), '"iframeVars" must be an array');
     }
 
     /** @const @private {!JsonObject} */
-    this.defaultResponse_ = userAssert(configJson['defaultResponse'],
-        '"defaultResponse" must be specified');
+    this.defaultResponse_ = userAssert(
+      configJson['defaultResponse'],
+      '"defaultResponse" must be specified'
+    );
 
     /** @private @const {string} */
     this.targetOrigin_ = parseUrlDeprecated(this.iframeSrc_).origin;
@@ -82,9 +83,10 @@ export class AccessIframeAdapter {
 
     /** @private @const {!Messenger} */
     this.messenger_ = new Messenger(
-        this.ampdoc.win,
-        () => this.iframe_.contentWindow,
-        this.targetOrigin_);
+      this.ampdoc.win,
+      () => this.iframe_.contentWindow,
+      this.targetOrigin_
+    );
 
     /** @private {?Promise<!JsonObject>} */
     this.configPromise_ = null;
@@ -113,10 +115,7 @@ export class AccessIframeAdapter {
 
   /** @override */
   authorize() {
-    return Promise.race([
-      this.authorizeLocal_(),
-      this.authorizeRemote_(),
-    ]);
+    return Promise.race([this.authorizeLocal_(), this.authorizeRemote_()]);
   }
 
   /** @override */
@@ -166,12 +165,15 @@ export class AccessIframeAdapter {
       if (this.iframeVars_) {
         const varsString = this.iframeVars_.join('&');
         const varsPromise = this.context_.collectUrlVars(
-            varsString,
-            /* useAuthData */ false);
-        resolve(varsPromise.then(vars => {
-          configJson['iframeVars'] = vars;
-          return configJson;
-        }));
+          varsString,
+          /* useAuthData */ false
+        );
+        resolve(
+          varsPromise.then(vars => {
+            configJson['iframeVars'] = vars;
+            return configJson;
+          })
+        );
       } else {
         resolve(configJson);
       }
@@ -194,15 +196,17 @@ export class AccessIframeAdapter {
    * @private
    */
   authorizeRemote_() {
-    return this.connect().then(() => {
-      return this.messenger_.sendCommandRsvp('authorize', {});
-    }).then(data => {
-      if (data) {
-        // Store the value in a non-blocking microtask.
-        Promise.resolve().then(() => this.store_(data));
-      }
-      return data;
-    });
+    return this.connect()
+      .then(() => {
+        return this.messenger_.sendCommandRsvp('authorize', {});
+      })
+      .then(data => {
+        if (data) {
+          // Store the value in a non-blocking microtask.
+          Promise.resolve().then(() => this.store_(data));
+        }
+        return data;
+      });
   }
 
   /**
@@ -222,7 +226,7 @@ export class AccessIframeAdapter {
       }
       const parsed = parseJson(raw);
       const time = parsed['t'];
-      if ((time + EXPIRATION_TIMEOUT) < this.ampdoc.win.Date.now()) {
+      if (time + EXPIRATION_TIMEOUT < this.ampdoc.win.Date.now()) {
         // Already expired.
         return null;
       }
@@ -251,10 +255,15 @@ export class AccessIframeAdapter {
     }
     try {
       if (data) {
-        storage.setItem(TAG, JSON.stringify(dict({
-          't': this.ampdoc.win.Date.now(),
-          'd': data,
-        })));
+        storage.setItem(
+          TAG,
+          JSON.stringify(
+            dict({
+              't': this.ampdoc.win.Date.now(),
+              'd': data,
+            })
+          )
+        );
       } else {
         storage.removeItem(TAG);
       }
@@ -273,16 +282,18 @@ export class AccessIframeAdapter {
     if (cmd == 'connect') {
       // First ever message. Indicates that the receiver is listening.
       this.configPromise_.then(configJson => {
-        this.messenger_.sendCommandRsvp('start', {
-          'protocol': 'amp-access',
-          'config': configJson,
-        }).then(() => {
-          // Confirmation that connection has been successful.
-          if (this.connectedResolver_) {
-            this.connectedResolver_();
-            this.connectedResolver_ = null;
-          }
-        });
+        this.messenger_
+          .sendCommandRsvp('start', {
+            'protocol': 'amp-access',
+            'config': configJson,
+          })
+          .then(() => {
+            // Confirmation that connection has been successful.
+            if (this.connectedResolver_) {
+              this.connectedResolver_();
+              this.connectedResolver_ = null;
+            }
+          });
       });
       return;
     }
diff --git a/extensions/amp-access/0.1/amp-access-other.js b/extensions/amp-access/0.1/amp-access-other.js
index fb9c767b6fd6..f729b9c6194c 100644
--- a/extensions/amp-access/0.1/amp-access-other.js
+++ b/extensions/amp-access/0.1/amp-access-other.js
@@ -20,10 +20,8 @@ import {isProxyOrigin} from '../../../src/url';
 /** @const {string} */
 const TAG = 'amp-access-other';
 
-
 /** @implements {./amp-access-source.AccessTypeAdapterDef} */
 export class AccessOtherAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -38,7 +36,7 @@ export class AccessOtherAdapter {
 
     /** @private {?JsonObject} */
     this.authorizationResponse_ =
-        configJson['authorizationFallbackResponse'] || null;
+      configJson['authorizationFallbackResponse'] || null;
 
     /** @const @private {boolean} */
     this.isProxyOrigin_ = isProxyOrigin(ampdoc.win.location);
@@ -55,7 +53,7 @@ export class AccessOtherAdapter {
   isAuthorizationEnabled() {
     // The `type=other` is allowed to use the authorization fallback, but
     // only if it's not on `cdn.ampproject.org`.
-    return (!!this.authorizationResponse_ && !this.isProxyOrigin_);
+    return !!this.authorizationResponse_ && !this.isProxyOrigin_;
   }
 
   /** @override */
diff --git a/extensions/amp-access/0.1/amp-access-server-jwt.js b/extensions/amp-access/0.1/amp-access-server-jwt.js
index ddd5ad6fa11b..8079ef7b88c9 100644
--- a/extensions/amp-access/0.1/amp-access-server-jwt.js
+++ b/extensions/amp-access/0.1/amp-access-server-jwt.js
@@ -40,7 +40,6 @@ const AUTHORIZATION_TIMEOUT = 3000;
 /** @const {string} */
 const AMP_AUD = 'ampproject.org';
 
-
 /**
  * This class implements server-side authorization protocol with JWT. In this
  * approach only immediately visible sections are downloaded. For authorization,
@@ -75,7 +74,6 @@ const AMP_AUD = 'ampproject.org';
  * @implements {./amp-access-source.AccessTypeAdapterDef}
  */
 export class AccessServerJwtAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -103,24 +101,27 @@ export class AccessServerJwtAdapter {
     /** @const @private {!../../../src/service/vsync-impl.Vsync} */
     this.vsync_ = Services.vsyncFor(ampdoc.win);
 
-    const stateElement = ampdoc.getRootNode().querySelector(
-        'meta[name="i-amphtml-access-state"]');
+    const stateElement = ampdoc
+      .getRootNode()
+      .querySelector('meta[name="i-amphtml-access-state"]');
 
     /** @private @const {?string} */
-    this.serverState_ = stateElement ?
-      stateElement.getAttribute('content') : null;
+    this.serverState_ = stateElement
+      ? stateElement.getAttribute('content')
+      : null;
 
     const isInExperiment = isExperimentOn(ampdoc.win, 'amp-access-server-jwt');
 
     /** @private @const {boolean} */
     this.isProxyOrigin_ = isProxyOrigin(ampdoc.win.location) || isInExperiment;
 
-    const serviceUrlOverride = isInExperiment ?
-      this.viewer_.getParam('serverAccessService') : null;
+    const serviceUrlOverride = isInExperiment
+      ? this.viewer_.getParam('serverAccessService')
+      : null;
 
     /** @private @const {string} */
-    this.serviceUrl_ = serviceUrlOverride ||
-        removeFragment(ampdoc.win.location.href);
+    this.serviceUrl_ =
+      serviceUrlOverride || removeFragment(ampdoc.win.location.href);
 
     /** @const @private {?string} */
     this.key_ = configJson['publicKey'] || null;
@@ -128,16 +129,20 @@ export class AccessServerJwtAdapter {
     /** @const @private {?string} */
     this.keyUrl_ = configJson['publicKeyUrl'] || null;
 
-    userAssert(this.key_ || this.keyUrl_,
-        '"publicKey" or "publicKeyUrl" must be specified');
+    userAssert(
+      this.key_ || this.keyUrl_,
+      '"publicKey" or "publicKeyUrl" must be specified'
+    );
     if (this.keyUrl_) {
       assertHttpsUrl(this.keyUrl_, '"publicKeyUrl"');
     }
     if (this.key_ && this.keyUrl_) {
       // TODO(dvoytenko): Remove "publicKey" option eventually.
-      user().warn(TAG,
-          'Both "publicKey" and "publicKeyUrl" specified. ' +
-          'The "publicKeyUrl" will be ignored.');
+      user().warn(
+        TAG,
+        'Both "publicKey" and "publicKeyUrl" specified. ' +
+          'The "publicKeyUrl" will be ignored.'
+      );
     }
 
     /** @private @const {!JwtHelper} */
@@ -162,10 +167,13 @@ export class AccessServerJwtAdapter {
 
   /** @override */
   authorize() {
-    dev().fine(TAG, 'Start authorization with ',
-        this.isProxyOrigin_ ? 'proxy' : 'non-proxy',
-        this.serverState_,
-        this.clientAdapter_.getAuthorizationUrl());
+    dev().fine(
+      TAG,
+      'Start authorization with ',
+      this.isProxyOrigin_ ? 'proxy' : 'non-proxy',
+      this.serverState_,
+      this.clientAdapter_.getAuthorizationUrl()
+    );
     if (!this.isProxyOrigin_ || !this.serverState_) {
       return this.authorizeOnClient_();
     }
@@ -193,34 +201,44 @@ export class AccessServerJwtAdapter {
    */
   fetchJwt_() {
     const urlPromise = this.context_.buildUrl(
-        this.clientAdapter_.getAuthorizationUrl(),
-        /* useAuthData */ false);
-    let jwtPromise = urlPromise.then(url => {
-      dev().fine(TAG, 'Authorization URL: ', url);
-      return this.timer_.timeoutPromise(
+      this.clientAdapter_.getAuthorizationUrl(),
+      /* useAuthData */ false
+    );
+    let jwtPromise = urlPromise
+      .then(url => {
+        dev().fine(TAG, 'Authorization URL: ', url);
+        return this.timer_.timeoutPromise(
           AUTHORIZATION_TIMEOUT,
           this.xhr_.fetchText(url, {
             credentials: 'include',
-          }));
-    }).then(resp => {
-      return resp.text();
-    }).then(encoded => {
-      const jwt = this.jwtHelper_.decode(encoded);
-      userAssert(jwt['amp_authdata'],
-          '"amp_authdata" must be present in JWT');
-      return {encoded, jwt};
-    });
+          })
+        );
+      })
+      .then(resp => {
+        return resp.text();
+      })
+      .then(encoded => {
+        const jwt = this.jwtHelper_.decode(encoded);
+        userAssert(
+          jwt['amp_authdata'],
+          '"amp_authdata" must be present in JWT'
+        );
+        return {encoded, jwt};
+      });
     if (this.shouldBeValidated_()) {
       // Validate JWT in the development mode.
       if (this.jwtHelper_.isVerificationSupported()) {
         jwtPromise = jwtPromise.then(resp => {
           return this.jwtHelper_
-              .decodeAndVerify(resp.encoded, this.loadKeyPem_())
-              .then(() => resp);
+            .decodeAndVerify(resp.encoded, this.loadKeyPem_())
+            .then(() => resp);
         });
       } else {
-        user().warn(TAG, 'Cannot verify signature on this browser since' +
-            ' it doesn\'t support WebCrypto APIs');
+        user().warn(
+          TAG,
+          'Cannot verify signature on this browser since' +
+            " it doesn't support WebCrypto APIs"
+        );
       }
       jwtPromise = jwtPromise.then(resp => {
         this.validateJwt_(resp.jwt);
@@ -240,8 +258,9 @@ export class AccessServerJwtAdapter {
     if (this.key_) {
       return Promise.resolve(this.key_);
     }
-    return this.xhr_.fetchText(dev().assertString(this.keyUrl_))
-        .then(res => res.text());
+    return this.xhr_
+      .fetchText(dev().assertString(this.keyUrl_))
+      .then(res => res.text());
   }
 
   /**
@@ -262,8 +281,7 @@ export class AccessServerJwtAdapter {
     // exp: expiration time.
     const exp = jwt['exp'];
     userAssert(exp, '"exp" field must be specified');
-    userAssert(parseFloat(exp) * 1000 > now,
-        'token has expired: %s', exp);
+    userAssert(parseFloat(exp) * 1000 > now, 'token has expired: %s', exp);
 
     // aud: audience.
     const aud = jwt['aud'];
@@ -277,7 +295,7 @@ export class AccessServerJwtAdapter {
         }
       }
     } else {
-      audForAmp = (aud == AMP_AUD);
+      audForAmp = aud == AMP_AUD;
     }
     userAssert(audForAmp, '"aud" must be "%s": %s', AMP_AUD, aud);
   }
@@ -287,8 +305,11 @@ export class AccessServerJwtAdapter {
    * @private
    */
   authorizeOnClient_() {
-    dev().fine(TAG, 'Proceed via client protocol via ',
-        this.clientAdapter_.getAuthorizationUrl());
+    dev().fine(
+      TAG,
+      'Proceed via client protocol via ',
+      this.clientAdapter_.getAuthorizationUrl()
+    );
     return this.fetchJwt_().then(resp => {
       return resp.jwt['amp_authdata'];
     });
@@ -303,16 +324,19 @@ export class AccessServerJwtAdapter {
     return this.fetchJwt_().then(resp => {
       const {encoded, jwt} = resp;
       const accessData = jwt['amp_authdata'];
-      const request = serializeQueryString(dict({
-        'url': removeFragment(this.ampdoc.win.location.href),
-        'state': this.serverState_,
-        'jwt': encoded,
-      }));
+      const request = serializeQueryString(
+        dict({
+          'url': removeFragment(this.ampdoc.win.location.href),
+          'state': this.serverState_,
+          'jwt': encoded,
+        })
+      );
       dev().fine(TAG, 'Authorization request: ', this.serviceUrl_, request);
       dev().fine(TAG, '- access data: ', accessData);
       // Note that `application/x-www-form-urlencoded` is used to avoid
       // CORS preflight request.
-      return this.timer_.timeoutPromise(
+      return this.timer_
+        .timeoutPromise(
           AUTHORIZATION_TIMEOUT,
           fetchDocument(this.ampdoc.win, this.serviceUrl_, {
             method: 'POST',
@@ -321,10 +345,13 @@ export class AccessServerJwtAdapter {
               'Content-Type': 'application/x-www-form-urlencoded',
             }),
             requireAmpResponseSourceOrigin: false,
-          })).then(response => {
-        dev().fine(TAG, 'Authorization response: ', response);
-        return this.replaceSections_(response);
-      }).then(() => accessData);
+          })
+        )
+        .then(response => {
+          dev().fine(TAG, 'Authorization response: ', response);
+          return this.replaceSections_(response);
+        })
+        .then(() => accessData);
     });
   }
 
@@ -339,15 +366,19 @@ export class AccessServerJwtAdapter {
       for (let i = 0; i < sections.length; i++) {
         const section = sections[i];
         const sectionId = section.getAttribute('i-amphtml-access-id');
-        const target = this.ampdoc.getRootNode().querySelector(
-            `[i-amphtml-access-id="${escapeCssSelectorIdent(sectionId)}"]`);
+        const target = this.ampdoc
+          .getRootNode()
+          .querySelector(
+            `[i-amphtml-access-id="${escapeCssSelectorIdent(sectionId)}"]`
+          );
         if (!target) {
           dev().warn(TAG, 'Section not found: ', sectionId);
           continue;
         }
         target.parentElement.replaceChild(
-            this.ampdoc.win.document.importNode(section, /* deep */ true),
-            target);
+          this.ampdoc.win.document.importNode(section, /* deep */ true),
+          target
+        );
       }
     });
   }
diff --git a/extensions/amp-access/0.1/amp-access-server.js b/extensions/amp-access/0.1/amp-access-server.js
index 4ffe4f62420b..5a20caae8ed5 100644
--- a/extensions/amp-access/0.1/amp-access-server.js
+++ b/extensions/amp-access/0.1/amp-access-server.js
@@ -27,7 +27,6 @@ import {parseJson} from '../../../src/json';
 /** @const {string} */
 const TAG = 'amp-access-server';
 
-
 /**
  * This class implements server-side authorization protocol. In this approach
  * only immediately visible sections are downloaded. For authorization, the
@@ -58,7 +57,6 @@ const TAG = 'amp-access-server';
  * @implements {./amp-access-source.AccessTypeAdapterDef}
  */
 export class AccessServerAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -86,24 +84,27 @@ export class AccessServerAdapter {
     /** @const @private {!../../../src/service/vsync-impl.Vsync} */
     this.vsync_ = Services.vsyncFor(ampdoc.win);
 
-    const stateElement = ampdoc.getRootNode().querySelector(
-        'meta[name="i-amphtml-access-state"]');
+    const stateElement = ampdoc
+      .getRootNode()
+      .querySelector('meta[name="i-amphtml-access-state"]');
 
     /** @private @const {?string} */
-    this.serverState_ = stateElement ?
-      stateElement.getAttribute('content') : null;
+    this.serverState_ = stateElement
+      ? stateElement.getAttribute('content')
+      : null;
 
     const isInExperiment = isExperimentOn(ampdoc.win, 'amp-access-server');
 
     /** @private @const {boolean} */
     this.isProxyOrigin_ = isProxyOrigin(ampdoc.win.location) || isInExperiment;
 
-    const serviceUrlOverride = isInExperiment ?
-      this.viewer_.getParam('serverAccessService') : null;
+    const serviceUrlOverride = isInExperiment
+      ? this.viewer_.getParam('serverAccessService')
+      : null;
 
     /** @private @const {string} */
-    this.serviceUrl_ = serviceUrlOverride ||
-        removeFragment(ampdoc.win.location.href);
+    this.serviceUrl_ =
+      serviceUrlOverride || removeFragment(ampdoc.win.location.href);
   }
 
   /** @override */
@@ -122,10 +123,13 @@ export class AccessServerAdapter {
 
   /** @override */
   authorize() {
-    dev().fine(TAG, 'Start authorization with ',
-        this.isProxyOrigin_ ? 'proxy' : 'non-proxy',
-        this.serverState_,
-        this.clientAdapter_.getAuthorizationUrl());
+    dev().fine(
+      TAG,
+      'Start authorization with ',
+      this.isProxyOrigin_ ? 'proxy' : 'non-proxy',
+      this.serverState_,
+      this.clientAdapter_.getAuthorizationUrl()
+    );
     if (!this.isProxyOrigin_ || !this.serverState_) {
       dev().fine(TAG, 'Proceed via client protocol');
       return this.clientAdapter_.authorize();
@@ -134,24 +138,26 @@ export class AccessServerAdapter {
     dev().fine(TAG, 'Proceed via server protocol');
 
     const varsPromise = this.context_.collectUrlVars(
-        this.clientAdapter_.getAuthorizationUrl(),
-        /* useAuthData */ false);
-    return varsPromise.then(vars => {
-      const requestVars = {};
-      for (const k in vars) {
-        if (vars[k] != null) {
-          requestVars[k] = String(vars[k]);
+      this.clientAdapter_.getAuthorizationUrl(),
+      /* useAuthData */ false
+    );
+    return varsPromise
+      .then(vars => {
+        const requestVars = {};
+        for (const k in vars) {
+          if (vars[k] != null) {
+            requestVars[k] = String(vars[k]);
+          }
         }
-      }
-      const request = dict({
-        'url': removeFragment(this.ampdoc.win.location.href),
-        'state': this.serverState_,
-        'vars': requestVars,
-      });
-      dev().fine(TAG, 'Authorization request: ', this.serviceUrl_, request);
-      // Note that `application/x-www-form-urlencoded` is used to avoid
-      // CORS preflight request.
-      return this.timer_.timeoutPromise(
+        const request = dict({
+          'url': removeFragment(this.ampdoc.win.location.href),
+          'state': this.serverState_,
+          'vars': requestVars,
+        });
+        dev().fine(TAG, 'Authorization request: ', this.serviceUrl_, request);
+        // Note that `application/x-www-form-urlencoded` is used to avoid
+        // CORS preflight request.
+        return this.timer_.timeoutPromise(
           this.clientAdapter_.getAuthorizationTimeout(),
           fetchDocument(this.ampdoc.win, this.serviceUrl_, {
             method: 'POST',
@@ -160,19 +166,22 @@ export class AccessServerAdapter {
               'Content-Type': 'application/x-www-form-urlencoded',
             }),
             requireAmpResponseSourceOrigin: false,
-          }));
-    }).then(responseDoc => {
-      dev().fine(TAG, 'Authorization response: ', responseDoc);
-      const accessDataString = devAssert(
+          })
+        );
+      })
+      .then(responseDoc => {
+        dev().fine(TAG, 'Authorization response: ', responseDoc);
+        const accessDataString = devAssert(
           responseDoc.querySelector('script[id="amp-access-data"]'),
-          'No authorization data available').textContent;
-      const accessData = parseJson(accessDataString);
-      dev().fine(TAG, '- access data: ', accessData);
-
-      return this.replaceSections_(responseDoc).then(() => {
-        return accessData;
+          'No authorization data available'
+        ).textContent;
+        const accessData = parseJson(accessDataString);
+        dev().fine(TAG, '- access data: ', accessData);
+
+        return this.replaceSections_(responseDoc).then(() => {
+          return accessData;
+        });
       });
-    });
   }
 
   /** @override */
@@ -201,15 +210,19 @@ export class AccessServerAdapter {
       for (let i = 0; i < sections.length; i++) {
         const section = sections[i];
         const sectionId = section.getAttribute('i-amphtml-access-id');
-        const target = this.ampdoc.getRootNode().querySelector(
-            `[i-amphtml-access-id="${escapeCssSelectorIdent(sectionId)}"]`);
+        const target = this.ampdoc
+          .getRootNode()
+          .querySelector(
+            `[i-amphtml-access-id="${escapeCssSelectorIdent(sectionId)}"]`
+          );
         if (!target) {
           dev().warn(TAG, 'Section not found: ', sectionId);
           continue;
         }
         target.parentElement.replaceChild(
-            this.ampdoc.win.document.importNode(section, /* deep */ true),
-            target);
+          this.ampdoc.win.document.importNode(section, /* deep */ true),
+          target
+        );
       }
     });
   }
diff --git a/extensions/amp-access/0.1/amp-access-source.js b/extensions/amp-access/0.1/amp-access-source.js
index 67b7873b5c6a..702318c76e20 100644
--- a/extensions/amp-access/0.1/amp-access-source.js
+++ b/extensions/amp-access/0.1/amp-access-source.js
@@ -22,10 +22,7 @@ import {AccessServerJwtAdapter} from './amp-access-server-jwt';
 import {AccessVendorAdapter} from './amp-access-vendor';
 import {Deferred} from '../../../src/utils/promise';
 import {Services} from '../../../src/services';
-import {
-  assertHttpsUrl,
-  parseQueryString,
-} from '../../../src/url';
+import {assertHttpsUrl, parseQueryString} from '../../../src/url';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getLoginUrl, openLoginDialog} from './login-dialog';
@@ -34,7 +31,6 @@ import {isExperimentOn} from '../../../src/experiments';
 import {isObject} from '../../../src/types';
 import {triggerAnalyticsEvent} from '../../../src/analytics';
 
-
 /** @const */
 const TAG = 'amp-access';
 
@@ -50,7 +46,6 @@ export const AccessType = {
   OTHER: 'other',
 };
 
-
 /**
  * AccessSource represents a single source of authentication information for a
  * page. These sources are constructed, unified and attached to the document by
@@ -65,9 +60,14 @@ export class AccessSource {
    * @param {function(!Promise)} onReauthorizeFn
    * @param {!Element} accessElement
    */
-  constructor(ampdoc, configJson, readerIdFn, scheduleViewFn,
-    onReauthorizeFn, accessElement) {
-
+  constructor(
+    ampdoc,
+    configJson,
+    readerIdFn,
+    scheduleViewFn,
+    onReauthorizeFn,
+    accessElement
+  ) {
     /** @const */
     this.ampdoc = ampdoc;
 
@@ -97,7 +97,7 @@ export class AccessSource {
 
     /** @const {?JsonObject} */
     this.authorizationFallbackResponse_ =
-        configJson['authorizationFallbackResponse'];
+      configJson['authorizationFallbackResponse'];
 
     /** @const {?string} */
     this.namespace_ = configJson['namespace'] || null;
@@ -168,7 +168,7 @@ export class AccessSource {
       buildUrl: this.buildUrl.bind(this),
       collectUrlVars: this.collectUrlVars.bind(this),
     });
-    const isJwt = (this.isJwtEnabled_ && configJson['jwt'] === true);
+    const isJwt = this.isJwtEnabled_ && configJson['jwt'] === true;
     switch (this.type_) {
       case AccessType.CLIENT:
         if (isJwt) {
@@ -197,7 +197,6 @@ export class AccessSource {
     return this.adapter_.getConfig();
   }
 
-
   /**
    * @return {!Promise} Returns a promise for the initial authorization.
    */
@@ -210,9 +209,9 @@ export class AccessSource {
    * @return {!AccessType}
    */
   buildConfigType_(configJson) {
-    let type = configJson['type'] ?
-      user().assertEnumValue(AccessType, configJson['type'], 'access type') :
-      null;
+    let type = configJson['type']
+      ? user().assertEnumValue(AccessType, configJson['type'], 'access type')
+      : null;
     if (!type) {
       if (configJson['vendor']) {
         type = AccessType.VENDOR;
@@ -228,8 +227,10 @@ export class AccessSource {
       user().info(TAG, 'Forcing access type: SERVER');
       type = AccessType.SERVER;
     }
-    if (type == AccessType.IFRAME &&
-        !isExperimentOn(this.ampdoc.win, 'amp-access-iframe')) {
+    if (
+      type == AccessType.IFRAME &&
+      !isExperimentOn(this.ampdoc.win, 'amp-access-iframe')
+    ) {
       user().error(TAG, 'Experiment "amp-access-iframe" is not enabled.');
       type = AccessType.CLIENT;
     }
@@ -253,8 +254,7 @@ export class AccessSource {
         loginMap[k] = loginConfig[k];
       }
     } else {
-      userAssert(false,
-          '"login" must be either a single URL or a map of URLs');
+      userAssert(false, '"login" must be either a single URL or a map of URLs');
     }
 
     // Check that all URLs are valid.
@@ -285,8 +285,13 @@ export class AccessSource {
    * Do some initial setup.
    */
   start() {
-    dev().fine(TAG, 'config:', this.type_, this.loginConfig_,
-        this.adapter_.getConfig());
+    dev().fine(
+      TAG,
+      'config:',
+      this.type_,
+      this.loginConfig_,
+      this.adapter_.getConfig()
+    );
 
     // Calculate login URLs right away.
     this.buildLoginUrls_();
@@ -350,30 +355,31 @@ export class AccessSource {
       return Promise.resolve();
     }
 
-    const responsePromise =
-      this.adapter_.authorize().catch(error => {
-        this.analyticsEvent_('access-authorization-failed');
-        if (this.authorizationFallbackResponse_ && !opt_disableFallback) {
-          // Use fallback.
-          user().error(TAG, 'Authorization failed: ', error);
-          return this.authorizationFallbackResponse_;
-        } else {
-          // Rethrow the error, it will be processed in the bottom `catch`.
-          throw error;
-        }
-      });
-
-    const promise = responsePromise.then(response => {
-      dev().fine(TAG, 'Authorization response: ', response);
-      this.setAuthResponse_(response);
-      this.buildLoginUrls_();
-      return response;
-    }).catch(error => {
-      user().error(TAG, 'Authorization failed: ', error);
-      this.firstAuthorizationResolver_();
-      throw error;
+    const responsePromise = this.adapter_.authorize().catch(error => {
+      this.analyticsEvent_('access-authorization-failed');
+      if (this.authorizationFallbackResponse_ && !opt_disableFallback) {
+        // Use fallback.
+        user().error(TAG, 'Authorization failed: ', error);
+        return this.authorizationFallbackResponse_;
+      } else {
+        // Rethrow the error, it will be processed in the bottom `catch`.
+        throw error;
+      }
     });
 
+    const promise = responsePromise
+      .then(response => {
+        dev().fine(TAG, 'Authorization response: ', response);
+        this.setAuthResponse_(response);
+        this.buildLoginUrls_();
+        return response;
+      })
+      .catch(error => {
+        user().error(TAG, 'Authorization failed: ', error);
+        this.firstAuthorizationResolver_();
+        throw error;
+      });
+
     return promise;
   }
 
@@ -390,13 +396,16 @@ export class AccessSource {
    * @return {!Promise}
    */
   reportViewToServer() {
-    return this.adapter_.pingback().then(() => {
-      dev().fine(TAG, 'Pingback complete');
-      this.analyticsEvent_('access-pingback-sent');
-    }).catch(error => {
-      this.analyticsEvent_('access-pingback-failed');
-      throw user().createError('Pingback failed: ', error);
-    });
+    return this.adapter_
+      .pingback()
+      .then(() => {
+        dev().fine(TAG, 'Pingback complete');
+        this.analyticsEvent_('access-pingback-sent');
+      })
+      .catch(error => {
+        this.analyticsEvent_('access-pingback-failed');
+        throw user().createError('Pingback failed: ', error);
+      });
   }
 
   /**
@@ -416,11 +425,17 @@ export class AccessSource {
    * @return {!Promise}
    */
   loginWithType(type) {
-    userAssert(this.loginConfig_[type],
-        'Login URL is not configured: %s', type);
+    userAssert(
+      this.loginConfig_[type],
+      'Login URL is not configured: %s',
+      type
+    );
     // Login URL should always be available at this time.
-    const loginUrl = userAssert(this.loginUrlMap_[type],
-        'Login URL is not ready: %s', type);
+    const loginUrl = userAssert(
+      this.loginUrlMap_[type],
+      'Login URL is not ready: %s',
+      type
+    );
     return this.login_(loginUrl, type);
   }
 
@@ -455,7 +470,7 @@ export class AccessSource {
     // 1 second, however, the new login request will be allowed to proceed,
     // given that we cannot always determine fully if the previous attempt is
     // "stuck".
-    if (this.loginPromise_ && (now - this.loginStartTime_ < 1000)) {
+    if (this.loginPromise_ && now - this.loginStartTime_ < 1000) {
       return this.loginPromise_;
     }
 
@@ -463,38 +478,41 @@ export class AccessSource {
 
     this.loginAnalyticsEvent_(eventLabel, 'started');
     const dialogPromise = this.openLoginDialog_(loginUrl);
-    const loginPromise = dialogPromise.then(result => {
-      dev().fine(TAG, 'Login dialog completed: ', eventLabel, result);
-      this.loginPromise_ = null;
-      const query = parseQueryString(result);
-      const s = query['success'];
-      const success = (s == 'true' || s == 'yes' || s == '1');
-      if (success) {
-        this.loginAnalyticsEvent_(eventLabel, 'success');
-      } else {
-        this.loginAnalyticsEvent_(eventLabel, 'rejected');
-      }
-      if (success || !s) {
-        // In case of a success, repeat the authorization and pingback flows.
-        // Also do this for an empty response to avoid false negatives.
-        // Pingback is repeated in this case since this could now be a new
-        // "view" with a different access profile.
-        this.adapter_.postAction();
-        const authorizationPromise = this.runAuthorization(
-            /* disableFallback */ true);
-        this.onReauthorize_(authorizationPromise);
-        return authorizationPromise.then(() => {
-          this.scheduleView_(/* timeToView */ 0);
-        });
-      }
-    }).catch(reason => {
-      dev().fine(TAG, 'Login dialog failed: ', eventLabel, reason);
-      this.loginAnalyticsEvent_(eventLabel, 'failed');
-      if (this.loginPromise_ == loginPromise) {
+    const loginPromise = dialogPromise
+      .then(result => {
+        dev().fine(TAG, 'Login dialog completed: ', eventLabel, result);
         this.loginPromise_ = null;
-      }
-      throw reason;
-    });
+        const query = parseQueryString(result);
+        const s = query['success'];
+        const success = s == 'true' || s == 'yes' || s == '1';
+        if (success) {
+          this.loginAnalyticsEvent_(eventLabel, 'success');
+        } else {
+          this.loginAnalyticsEvent_(eventLabel, 'rejected');
+        }
+        if (success || !s) {
+          // In case of a success, repeat the authorization and pingback flows.
+          // Also do this for an empty response to avoid false negatives.
+          // Pingback is repeated in this case since this could now be a new
+          // "view" with a different access profile.
+          this.adapter_.postAction();
+          const authorizationPromise = this.runAuthorization(
+            /* disableFallback */ true
+          );
+          this.onReauthorize_(authorizationPromise);
+          return authorizationPromise.then(() => {
+            this.scheduleView_(/* timeToView */ 0);
+          });
+        }
+      })
+      .catch(reason => {
+        dev().fine(TAG, 'Login dialog failed: ', eventLabel, reason);
+        this.loginAnalyticsEvent_(eventLabel, 'failed');
+        if (this.loginPromise_ == loginPromise) {
+          this.loginPromise_ = null;
+        }
+        throw reason;
+      });
     this.loginPromise_ = loginPromise;
     this.loginStartTime_ = now;
     return this.loginPromise_;
@@ -523,11 +541,13 @@ export class AccessSource {
     const promises = [];
     for (const k in this.loginConfig_) {
       promises.push(
-          this.buildUrl(this.loginConfig_[k], /* useAuthData */ true)
-              .then(url => {
-                this.loginUrlMap_[k] = url;
-                return {type: k, url};
-              }));
+        this.buildUrl(this.loginConfig_[k], /* useAuthData */ true).then(
+          url => {
+            this.loginUrlMap_[k] = url;
+            return {type: k, url};
+          }
+        )
+      );
     }
     return Promise.all(promises);
   }
@@ -542,12 +562,10 @@ export class AccessSource {
  */
 export let AccessTypeAdapterContextDef;
 
-
 /**
  * @interface
  */
 export class AccessTypeAdapterDef {
-
   /**
    * @return {!JsonObject}
    */
diff --git a/extensions/amp-access/0.1/amp-access-vendor.js b/extensions/amp-access/0.1/amp-access-vendor.js
index bea0f630bfe0..21bb90daa113 100644
--- a/extensions/amp-access/0.1/amp-access-vendor.js
+++ b/extensions/amp-access/0.1/amp-access-vendor.js
@@ -21,7 +21,6 @@ import {dev, userAssert} from '../../../src/log';
 /** @const {string} */
 const TAG = 'amp-access-vendor';
 
-
 /**
  * The adapter for a vendor implementation that implements `AccessVendor`
  * interface and delivered via a separate extension. The vendor implementation
@@ -30,7 +29,6 @@ const TAG = 'amp-access-vendor';
  * @implements {./amp-access-source.AccessTypeAdapterDef}
  */
 export class AccessVendorAdapter {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} configJson
@@ -40,8 +38,10 @@ export class AccessVendorAdapter {
     this.ampdoc = ampdoc;
 
     /** @const @private {string} */
-    this.vendorName_ = userAssert(configJson['vendor'],
-        '"vendor" name must be specified');
+    this.vendorName_ = userAssert(
+      configJson['vendor'],
+      '"vendor" name must be specified'
+    );
 
     /** @const @private {!JsonObject} */
     this.vendorConfig_ = configJson[this.vendorName_] || {};
diff --git a/extensions/amp-access/0.1/amp-access.js b/extensions/amp-access/0.1/amp-access.js
index ba3d60a18b75..8dd477147c3e 100644
--- a/extensions/amp-access/0.1/amp-access.js
+++ b/extensions/amp-access/0.1/amp-access.js
@@ -34,7 +34,6 @@ import {listenOnce} from '../../../src/event-helper';
 import {startsWith} from '../../../src/string';
 import {triggerAnalyticsEvent} from '../../../src/analytics';
 
-
 /** @const */
 const TAG = 'amp-access';
 
@@ -44,7 +43,6 @@ const VIEW_TIMEOUT = 2000;
 /** @const {string} */
 const TEMPLATE_PROP = '__AMP_ACCESS__TEMPLATE';
 
-
 /**
  * AccessService implements the complete lifecycle of the AMP Access system.
  * @implements {AccessVars}
@@ -138,8 +136,9 @@ export class AccessService {
     });
 
     // Re-authorize newly added sections.
-    ampdoc.getRootNode().addEventListener(AmpEvents.DOM_UPDATE,
-        this.onDomUpdate_.bind(this));
+    ampdoc
+      .getRootNode()
+      .addEventListener(AmpEvents.DOM_UPDATE, this.onDomUpdate_.bind(this));
   }
 
   /** @override from AccessVars */
@@ -159,8 +158,10 @@ export class AccessService {
       // No consent - an essential part of the access system.
       const consent = Promise.resolve();
       this.readerIdPromise_ = this.cid_.then(cid => {
-        return cid.get({scope: 'amp-access', createCookieIfNotPresent: true},
-            consent);
+        return cid.get(
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          consent
+        );
       });
     }
     return this.readerIdPromise_;
@@ -186,9 +187,11 @@ export class AccessService {
    * @private
    */
   parseConfig_() {
-    userAssert(isJsonScriptTag(this.accessElement_),
-        `${TAG} config should ` +
-        'be inside a <script> tag with type="application/json"');
+    userAssert(
+      isJsonScriptTag(this.accessElement_),
+      `${TAG} config should ` +
+        'be inside a <script> tag with type="application/json"'
+    );
     const rawContent = tryParseJson(this.accessElement_.textContent, e => {
       throw user().createError('Failed to parse "amp-access" JSON: ' + e);
     });
@@ -199,8 +202,10 @@ export class AccessService {
       for (let i = 0; i < contentArray['length']; i++) {
         const namespace = contentArray[i]['namespace'];
         userAssert(!!namespace, 'Namespace required');
-        userAssert(!configMap[namespace],
-            'Namespace already used: ' + namespace);
+        userAssert(
+          !configMap[namespace],
+          'Namespace already used: ' + namespace
+        );
         configMap[namespace] = contentArray[i];
       }
     } else {
@@ -211,9 +216,16 @@ export class AccessService {
     const scheduleViewFn = this.scheduleView_.bind(this);
     const onReauthorizeFn = this.onReauthorize_.bind(this);
 
-    return Object.keys(configMap).map(key =>
-      new AccessSource(this.ampdoc, configMap[key], readerIdFn, scheduleViewFn,
-          onReauthorizeFn, this.accessElement_)
+    return Object.keys(configMap).map(
+      key =>
+        new AccessSource(
+          this.ampdoc,
+          configMap[key],
+          readerIdFn,
+          scheduleViewFn,
+          onReauthorizeFn,
+          this.accessElement_
+        )
     );
   }
 
@@ -242,18 +254,17 @@ export class AccessService {
     for (let i = 0; i < this.sources_.length; i++) {
       const source = this.sources_[i];
       if (source.getType() == AccessType.VENDOR) {
-        const vendorAdapter =
-          /** @type {!./amp-access-vendor.AccessVendorAdapter} */ (
-            source.getAdapter()
-          );
+        const vendorAdapter = /** @type {!./amp-access-vendor.AccessVendorAdapter} */ (source.getAdapter());
         if (vendorAdapter.getVendorName() == name) {
           return source;
         }
       }
     }
-    userAssert(false,
-        'Access vendor "%s" can only be used for "type=vendor", but none found',
-        name);
+    userAssert(
+      false,
+      'Access vendor "%s" can only be used for "type=vendor", but none found',
+      name
+    );
     // Should not happen, just to appease type checking.
     throw new Error();
   }
@@ -300,7 +311,9 @@ export class AccessService {
   startInternal_() {
     const actionService = Services.actionServiceForDoc(this.accessElement_);
     actionService.installActionHandler(
-        this.accessElement_, this.handleAction_.bind(this));
+      this.accessElement_,
+      this.handleAction_.bind(this)
+    );
 
     for (let i = 0; i < this.sources_.length; i++) {
       this.sources_[i].start();
@@ -319,8 +332,10 @@ export class AccessService {
   /** @private */
   listenToBroadcasts_() {
     this.viewer_.onBroadcast(message => {
-      if (message['type'] == 'amp-access-reauthorize' &&
-              message['origin'] == this.pubOrigin_) {
+      if (
+        message['type'] == 'amp-access-reauthorize' &&
+        message['origin'] == this.pubOrigin_
+      ) {
         this.runAuthorization_();
       }
     });
@@ -349,10 +364,12 @@ export class AccessService {
 
   /** @private */
   broadcastReauthorize_() {
-    this.viewer_.broadcast(dict({
-      'type': 'amp-access-reauthorize',
-      'origin': this.pubOrigin_,
-    }));
+    this.viewer_.broadcast(
+      dict({
+        'type': 'amp-access-reauthorize',
+        'origin': this.pubOrigin_,
+      })
+    );
   }
 
   /**
@@ -368,7 +385,8 @@ export class AccessService {
 
     const authorizations = this.viewer_.whenFirstVisible().then(() => {
       return Promise.all(
-          this.sources_.map(source => this.runOneAuthorization_(source)));
+        this.sources_.map(source => this.runOneAuthorization_(source))
+      );
     });
 
     const rendered = authorizations.then(() => {
@@ -392,10 +410,9 @@ export class AccessService {
    * @private
    */
   runOneAuthorization_(source) {
-    return source.runAuthorization()
-        .catch(() => {
-          this.toggleTopClass_('amp-access-error', true);
-        });
+    return source.runAuthorization().catch(() => {
+      this.toggleTopClass_('amp-access-error', true);
+    });
   }
 
   /** @override from AccessVars */
@@ -442,7 +459,8 @@ export class AccessService {
     }
     if (renderPromise) {
       return renderPromise.then(() =>
-        this.applyAuthorizationAttrs_(element, on));
+        this.applyAuthorizationAttrs_(element, on)
+      );
     }
     return this.applyAuthorizationAttrs_(element, on);
   }
@@ -479,12 +497,20 @@ export class AccessService {
     const templateElements = element.querySelectorAll('[amp-access-template]');
     if (templateElements.length > 0) {
       for (let i = 0; i < templateElements.length; i++) {
-        const p = this.renderTemplate_(element, templateElements[i], response)
-            .catch(error => {
-              // Ignore the error.
-              dev().error(TAG, 'Template failed: ', error,
-                  templateElements[i], element);
-            });
+        const p = this.renderTemplate_(
+          element,
+          templateElements[i],
+          response
+        ).catch(error => {
+          // Ignore the error.
+          dev().error(
+            TAG,
+            'Template failed: ',
+            error,
+            templateElements[i],
+            element
+          );
+        });
         promises.push(p);
       }
     }
@@ -555,21 +581,21 @@ export class AccessService {
     }
     dev().fine(TAG, 'start view monitoring');
     this.reportViewPromise_ = this.whenViewed_(timeToView)
-        .then(() => {
-          // Wait for the most recent authorization flow to complete.
-          return this.lastAuthorizationPromises_;
-        })
-        .then(() => {
-          // Report the analytics event.
-          this.analyticsEvent_('access-viewed');
-          return this.reportViewToServer_();
-        })
-        .catch(reason => {
-          // Ignore - view has been canceled.
-          dev().fine(TAG, 'view cancelled:', reason);
-          this.reportViewPromise_ = null;
-          throw reason;
-        });
+      .then(() => {
+        // Wait for the most recent authorization flow to complete.
+        return this.lastAuthorizationPromises_;
+      })
+      .then(() => {
+        // Report the analytics event.
+        this.analyticsEvent_('access-viewed');
+        return this.reportViewToServer_();
+      })
+      .catch(reason => {
+        // Ignore - view has been canceled.
+        dev().fine(TAG, 'view cancelled:', reason);
+        this.reportViewPromise_ = null;
+        throw reason;
+      });
 
     // Support pre-rendering with metering by possibly hiding content
     // after view is recorded.
@@ -597,11 +623,13 @@ export class AccessService {
     const unlistenSet = [];
     return new Promise((resolve, reject) => {
       // 1. Document becomes invisible again: cancel.
-      unlistenSet.push(this.viewer_.onVisibilityChanged(() => {
-        if (!this.viewer_.isVisible()) {
-          reject(cancellation());
-        }
-      }));
+      unlistenSet.push(
+        this.viewer_.onVisibilityChanged(() => {
+          if (!this.viewer_.isVisible()) {
+            reject(cancellation());
+          }
+        })
+      );
 
       // 2. After a few seconds: register a view.
       const timeoutId = this.timer_.delay(resolve, timeToView);
@@ -611,14 +639,16 @@ export class AccessService {
       unlistenSet.push(this.viewport_.onScroll(resolve));
 
       // 4. Tap: register a view.
-      unlistenSet.push(listenOnce(this.ampdoc.getRootNode(),
-          'click', resolve));
-    }).then(() => {
-      unlistenSet.forEach(unlisten => unlisten());
-    }, reason => {
-      unlistenSet.forEach(unlisten => unlisten());
-      throw reason;
-    });
+      unlistenSet.push(listenOnce(this.ampdoc.getRootNode(), 'click', resolve));
+    }).then(
+      () => {
+        unlistenSet.forEach(unlisten => unlisten());
+      },
+      reason => {
+        unlistenSet.forEach(unlisten => unlisten());
+        throw reason;
+      }
+    );
   }
 
   /**
@@ -644,7 +674,6 @@ export class AccessService {
     this.vsync_.mutate(() => {
       this.getRootElement_().classList.toggle(className, on);
     });
-
   }
 
   /**
@@ -681,8 +710,11 @@ export class AccessService {
    * @return {!AccessSource}
    */
   getSource(index) {
-    userAssert(index >= 0 && index < this.sources_.length,
-        'Invalid index: %d', index);
+    userAssert(
+      index >= 0 && index < this.sources_.length,
+      'Invalid index: %d',
+      index
+    );
     return this.sources_[index];
   }
 
@@ -699,11 +731,11 @@ export class AccessService {
     const singleSource = this.sources_.length == 1;
 
     // Try to find a matching namespace
-    const namespace = (splitPoint > -1) ? type.substring(0, splitPoint) : type;
+    const namespace = splitPoint > -1 ? type.substring(0, splitPoint) : type;
     const match = this.sources_.filter(s => s.getNamespace() == namespace);
     if (match.length) {
       // Matching namespace found
-      const remaining = (splitPoint > -1) ? type.substring(splitPoint + 1) : '';
+      const remaining = splitPoint > -1 ? type.substring(splitPoint + 1) : '';
       return match[0].loginWithType(remaining);
     }
 
@@ -719,18 +751,19 @@ export class AccessService {
    */
   combinedResponses() {
     if (this.sources_.length == 1 && !this.sources_[0].getNamespace()) {
-      return /** @type {!JsonObject} */ (this.sources_[0].getAuthResponse() ||
-        {});
+      return (
+        /** @type {!JsonObject} */ (this.sources_[0].getAuthResponse() || {})
+      );
     }
 
     const combined = /** @type {!JsonObject} */ ({});
-    this.sources_.forEach(source =>
-      combined[source.getNamespace()] = source.getAuthResponse());
+    this.sources_.forEach(
+      source => (combined[source.getNamespace()] = source.getAuthResponse())
+    );
     return combined;
   }
 }
 
-
 // Register the extension services.
 AMP.extension(TAG, '0.1', function(AMP) {
   AMP.registerServiceForDoc('access', function(ampdoc) {
@@ -738,7 +771,6 @@ AMP.extension(TAG, '0.1', function(AMP) {
   });
 });
 
-
 /** @package Visible for testing only. */
 export function getAccessVarsClassForTesting() {
   return AccessVars;
diff --git a/extensions/amp-access/0.1/amp-login-done-dialog.js b/extensions/amp-access/0.1/amp-login-done-dialog.js
index 1a909ca50ea7..bf30fc6d565c 100644
--- a/extensions/amp-access/0.1/amp-login-done-dialog.js
+++ b/extensions/amp-access/0.1/amp-login-done-dialog.js
@@ -21,7 +21,6 @@ import {
 } from '../../../src/url';
 import {listen} from '../../../src/event-helper';
 
-
 /**
  * @private Visible for testing.
  */
@@ -55,8 +54,9 @@ export class LoginDoneDialog {
     if (this.win.opener && this.win.opener != this.win) {
       // This is a dialog postback. Try to communicate with the opener window.
       return this.postback_().then(
-          this.postbackSuccess_.bind(this),
-          this.postbackError_.bind(this));
+        this.postbackSuccess_.bind(this),
+        this.postbackError_.bind(this)
+      );
     }
 
     if (query['url']) {
@@ -83,7 +83,7 @@ export class LoginDoneDialog {
   setStyles_() {
     const doc = this.win.document;
     const style = doc.createElement('style');
-    style./*OK*/textContent = this.buildStyles_();
+    style./*OK*/ textContent = this.buildStyles_();
     doc.head.appendChild(style);
   }
 
@@ -168,21 +168,27 @@ export class LoginDoneDialog {
         }
       });
 
-      opener./*OK*/postMessage({
-        sentinel: 'amp',
-        type: 'result',
-        result: response,
-      }, target);
+      opener./*OK*/ postMessage(
+        {
+          sentinel: 'amp',
+          type: 'result',
+          result: response,
+        },
+        target
+      );
 
       this.win.setTimeout(() => {
         reject(new Error('Timed out'));
       }, 5000);
-    }).then(() => {
-      unlisten();
-    }, error => {
-      unlisten();
-      throw error;
-    });
+    }).then(
+      () => {
+        unlisten();
+      },
+      error => {
+        unlisten();
+        throw error;
+      }
+    );
   }
 
   /**
@@ -211,8 +217,11 @@ export class LoginDoneDialog {
    */
   postbackError_(error) {
     if (this.win.console && this.win.console.log) {
-      (this.win.console./*OK*/error || this.win.console.log).call(
-          this.win.console, 'Postback failed: ', error);
+      (this.win.console./*OK*/ error || this.win.console.log).call(
+        this.win.console,
+        'Postback failed: ',
+        error
+      );
     }
 
     const doc = this.win.document;
@@ -235,7 +244,6 @@ export class LoginDoneDialog {
   }
 }
 
-
 /**
  * The language is selected based on the `hl` query parameter or
  * `navigate.language` by setting CSS of the following form:
diff --git a/extensions/amp-access/0.1/iframe-api/access-controller.js b/extensions/amp-access/0.1/iframe-api/access-controller.js
index 644486161ea7..eebd0ccc53ad 100644
--- a/extensions/amp-access/0.1/iframe-api/access-controller.js
+++ b/extensions/amp-access/0.1/iframe-api/access-controller.js
@@ -15,7 +15,6 @@
  */
 /*eslint no-unused-vars: 0*/
 
-
 /**
  * The controller that the iframe must implement in order to provide
  * the access features.
@@ -23,7 +22,6 @@
  * @interface
  */
 export class AccessController {
-
   /**
    * Check origin, protocol and configuration and initialize controller.
    * @param {string} origin
diff --git a/extensions/amp-access/0.1/iframe-api/iframe-api.js b/extensions/amp-access/0.1/iframe-api/iframe-api.js
index 0d70f251eef1..a76f53e7a314 100644
--- a/extensions/amp-access/0.1/iframe-api/iframe-api.js
+++ b/extensions/amp-access/0.1/iframe-api/iframe-api.js
@@ -23,13 +23,11 @@
 import {AccessController} from './access-controller';
 import {Messenger} from './messenger';
 
-
 /**
  * Connects to the parent AMP document and executes authorization, pingback,
  * and other access features.
  */
 export class AmpAccessIframeApi {
-
   /**
    * @param {!AccessController} controller
    * @param {!Window=} opt_win
@@ -49,9 +47,10 @@ export class AmpAccessIframeApi {
 
     /** @private @const {!Messenger} */
     this.messenger_ = new Messenger(
-        this.win_,
-        this.target_,
-        /* targetOrigin */ null);
+      this.win_,
+      this.target_,
+      /* targetOrigin */ null
+    );
 
     /** @private {?Object} */
     this.config_ = null;
@@ -94,10 +93,13 @@ export class AmpAccessIframeApi {
       this.config_ = payload['config'];
       this.protocol_ = payload['protocol'];
       const promise = new Promise(resolve => {
-        resolve(this.controller_.connect(
+        resolve(
+          this.controller_.connect(
             this.messenger_.getTargetOrigin(),
             this.protocol_,
-            this.config_));
+            this.config_
+          )
+        );
       });
       this.connectedResolver_(promise);
       return promise;
@@ -122,7 +124,6 @@ export class AmpAccessIframeApi {
   }
 }
 
-
 /** @package Visible for testing. */
 export function getAccessControllerForTesting() {
   return AccessController;
diff --git a/extensions/amp-access/0.1/iframe-api/messenger.js b/extensions/amp-access/0.1/iframe-api/messenger.js
index 62837ddcfc63..d3a0681ba106 100644
--- a/extensions/amp-access/0.1/iframe-api/messenger.js
+++ b/extensions/amp-access/0.1/iframe-api/messenger.js
@@ -24,9 +24,7 @@
 
 const SENTINEL = '__AMP__';
 
-
 export class Messenger {
-
   /**
    * @param {!Window} win
    * @param {!Window|function():?Window} targetOrCallback
@@ -172,15 +170,20 @@ export class Messenger {
     const target = this.getTarget();
     // Only "connect" command is allowed to use `targetOrigin == '*'`
     const targetOrigin =
-        cmd == 'connect' ?
-          (this.targetOrigin_ != null ? this.targetOrigin_ : '*') :
-          this.getTargetOrigin();
-    target./*OK*/postMessage(/** @type {!JsonObject} */ ({
-      'sentinel': SENTINEL,
-      '_rsvp': rsvpId,
-      'cmd': cmd,
-      'payload': opt_payload || null,
-    }), targetOrigin);
+      cmd == 'connect'
+        ? this.targetOrigin_ != null
+          ? this.targetOrigin_
+          : '*'
+        : this.getTargetOrigin();
+    target./*OK*/ postMessage(
+      /** @type {!JsonObject} */ ({
+        'sentinel': SENTINEL,
+        '_rsvp': rsvpId,
+        'cmd': cmd,
+        'payload': opt_payload || null,
+      }),
+      targetOrigin
+    );
   }
 
   /**
@@ -213,15 +216,18 @@ export class Messenger {
     const rsvp = !!rsvpId && cmd != 'rsvp';
     const result = this.handleCommand_(rsvpId, cmd, payload);
     if (rsvp) {
-      Promise.resolve(result).then(result => {
-        this.sendCommand_(rsvpId, 'rsvp', {
-          'result': result,
-        });
-      }, reason => {
-        this.sendCommand_(rsvpId, 'rsvp', {
-          'error': String(reason),
-        });
-      });
+      Promise.resolve(result).then(
+        result => {
+          this.sendCommand_(rsvpId, 'rsvp', {
+            'result': result,
+          });
+        },
+        reason => {
+          this.sendCommand_(rsvpId, 'rsvp', {
+            'error': String(reason),
+          });
+        }
+      );
     }
   }
 
diff --git a/extensions/amp-access/0.1/iframe-api/rollup.config.js b/extensions/amp-access/0.1/iframe-api/rollup.config.js
index 26c88d41a766..b24997ba2ef4 100644
--- a/extensions/amp-access/0.1/iframe-api/rollup.config.js
+++ b/extensions/amp-access/0.1/iframe-api/rollup.config.js
@@ -33,7 +33,5 @@ export default {
     }),
     cleanup(),
   ],
-  external: [
-    path.resolve('../../../../src/polyfills.js'),
-  ],
+  external: [path.resolve('../../../../src/polyfills.js')],
 };
diff --git a/extensions/amp-access/0.1/jwt.js b/extensions/amp-access/0.1/jwt.js
index a3c16e36cb04..3aef1ea0f4dd 100644
--- a/extensions/amp-access/0.1/jwt.js
+++ b/extensions/amp-access/0.1/jwt.js
@@ -14,14 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  base64UrlDecodeToBytes,
-} from '../../../src/utils/base64';
+import {base64UrlDecodeToBytes} from '../../../src/utils/base64';
 import {pemToBytes} from '../../../src/utils/pem';
 import {stringToBytes, utf8Decode} from '../../../src/utils/bytes';
 import {tryParseJson} from '../../../src/json';
 
-
 /**
  * @typedef {{
  *   header: (?JsonObject|undefined),
@@ -32,17 +29,14 @@ import {tryParseJson} from '../../../src/json';
  */
 let JwtTokenInternalDef;
 
-
 /**
  * Provides helper methods to decode and verify JWT tokens.
  */
 export class JwtHelper {
-
   /**
    * @param {!Window} win
    */
   constructor(win) {
-
     /** @const {!Window} */
     this.win = win;
 
@@ -50,8 +44,8 @@ export class JwtHelper {
      * Might be `null` if the platform does not support Crypto Subtle.
      * @const @private {?webCrypto.SubtleCrypto}
      */
-    this.subtle_ = (win.crypto &&
-        (win.crypto.subtle || win.crypto.webkitSubtle)) || null;
+    this.subtle_ =
+      (win.crypto && (win.crypto.subtle || win.crypto.webkitSubtle)) || null;
   }
 
   /**
@@ -81,28 +75,31 @@ export class JwtHelper {
     if (!this.subtle_) {
       throw new Error('Crypto is not supported on this platform');
     }
-    const decodedPromise = new Promise(
-        resolve => resolve(this.decodeInternal_(encodedToken)));
+    const decodedPromise = new Promise(resolve =>
+      resolve(this.decodeInternal_(encodedToken))
+    );
     return decodedPromise.then(decoded => {
       const alg = decoded.header['alg'];
       if (!alg || alg != 'RS256') {
         // TODO(dvoytenko@): Support other RS* algos.
         throw new Error('Only alg=RS256 is supported');
       }
-      return this.importKey_(pemPromise).then(key => {
-        const sig = base64UrlDecodeToBytes(decoded.sig);
-        return this.subtle_.verify(
+      return this.importKey_(pemPromise)
+        .then(key => {
+          const sig = base64UrlDecodeToBytes(decoded.sig);
+          return this.subtle_.verify(
             /* options */ {name: 'RSASSA-PKCS1-v1_5'},
             key,
             sig,
             stringToBytes(decoded.verifiable)
-        );
-      }).then(isValid => {
-        if (isValid) {
-          return decoded.payload;
-        }
-        throw new Error('Signature verification failed');
-      });
+          );
+        })
+        .then(isValid => {
+          if (isValid) {
+            return decoded.payload;
+          }
+          throw new Error('Signature verification failed');
+        });
     });
   }
 
@@ -143,14 +140,15 @@ export class JwtHelper {
   importKey_(pemPromise) {
     return pemPromise.then(pem => {
       return this.subtle_.importKey(
-          /* format */ 'spki',
-          pemToBytes(pem),
-          /* algo options */ {
-            name: 'RSASSA-PKCS1-v1_5',
-            hash: {name: 'SHA-256'},
-          },
-          /* extractable */ false,
-          /* uses */ ['verify']);
+        /* format */ 'spki',
+        pemToBytes(pem),
+        /* algo options */ {
+          name: 'RSASSA-PKCS1-v1_5',
+          hash: {name: 'SHA-256'},
+        },
+        /* extractable */ false,
+        /* uses */ ['verify']
+      );
     });
   }
 }
diff --git a/extensions/amp-access/0.1/login-dialog.js b/extensions/amp-access/0.1/login-dialog.js
index d5df13a7dd2e..01cca77c91e2 100644
--- a/extensions/amp-access/0.1/login-dialog.js
+++ b/extensions/amp-access/0.1/login-dialog.js
@@ -43,7 +43,6 @@ export function createLoginDialog(ampdoc, urlOrPromise) {
   return new WebLoginDialog(ampdoc.win, viewer, urlOrPromise);
 }
 
-
 /**
  * Opens the login dialog for the specified URL. If the login dialog succeeds,
  * the returned promised is resolved with the dialog's response. Otherwise, the
@@ -66,7 +65,6 @@ export function getLoginUrl(ampdoc, urlOrPromise) {
   return createLoginDialog(ampdoc, urlOrPromise).getLoginUrl();
 }
 
-
 /**
  * The implementation of the Login Dialog delegated via Viewer.
  */
@@ -84,8 +82,8 @@ class ViewerLoginDialog {
   }
 
   /**
-  * @return {!Promise<string>}
-  */
+   * @return {!Promise<string>}
+   */
   getLoginUrl() {
     let urlPromise;
     if (typeof this.urlOrPromise == 'string') {
@@ -98,7 +96,6 @@ class ViewerLoginDialog {
     });
   }
 
-
   /**
    * Opens the dialog. Returns the promise that will yield with the dialog's
    * result or will be rejected if dialog fails. The dialog's result is
@@ -108,15 +105,16 @@ class ViewerLoginDialog {
   open() {
     return this.getLoginUrl().then(loginUrl => {
       dev().fine(TAG, 'Open viewer dialog: ', loginUrl);
-      return this.viewer.sendMessageAwaitResponse('openDialog', dict({
-        'url': loginUrl,
-      }));
+      return this.viewer.sendMessageAwaitResponse(
+        'openDialog',
+        dict({
+          'url': loginUrl,
+        })
+      );
     });
   }
-
 }
 
-
 /**
  * Web-based implementation of the Login Dialog.
  * @visibleForTesting
@@ -168,13 +166,16 @@ export class WebLoginDialog {
       this.reject_ = reject;
       // Must always be called synchronously.
       this.openInternal_();
-    }).then(result => {
-      this.cleanup_();
-      return result;
-    }, error => {
-      this.cleanup_();
-      throw error;
-    });
+    }).then(
+      result => {
+        this.cleanup_();
+        return result;
+      },
+      error => {
+        this.cleanup_();
+        throw error;
+      }
+    );
   }
 
   /** @private */
@@ -203,8 +204,8 @@ export class WebLoginDialog {
   }
 
   /**
-  * @return {!Promise<string>}
-  */
+   * @return {!Promise<string>}
+   */
   getLoginUrl() {
     let urlPromise;
     if (typeof this.urlOrPromise == 'string') {
@@ -240,22 +241,28 @@ export class WebLoginDialog {
       dev().fine(TAG, 'Open dialog: ', 'about:blank', returnUrl, w, h, x, y);
       this.dialog_ = openWindowDialog(this.win, '', '_blank', options);
       if (this.dialog_) {
-        this.dialogReadyPromise_ = this.urlOrPromise.then(url => {
-          const loginUrl = buildLoginUrl(url, returnUrl);
-          dev().fine(TAG, 'Set dialog url: ', loginUrl);
-          this.dialog_.location.replace(loginUrl);
-        }, error => {
-          throw new Error('failed to resolve url: ' + error);
-        });
+        this.dialogReadyPromise_ = this.urlOrPromise.then(
+          url => {
+            const loginUrl = buildLoginUrl(url, returnUrl);
+            dev().fine(TAG, 'Set dialog url: ', loginUrl);
+            this.dialog_.location.replace(loginUrl);
+          },
+          error => {
+            throw new Error('failed to resolve url: ' + error);
+          }
+        );
       }
     }
 
     if (this.dialogReadyPromise_) {
-      this.dialogReadyPromise_.then(() => {
-        this.setupDialog_(returnUrl);
-      }, error => {
-        this.loginDone_(/* result */ null, error);
-      });
+      this.dialogReadyPromise_.then(
+        () => {
+          this.setupDialog_(returnUrl);
+        },
+        error => {
+          this.loginDone_(/* result */ null, error);
+        }
+      );
     } else {
       this.loginDone_(/* result */ null, new Error('failed to open dialog'));
     }
@@ -291,10 +298,13 @@ export class WebLoginDialog {
       dev().fine(TAG, 'Received message from dialog: ', getData(e));
       if (getData(e)['type'] == 'result') {
         if (this.dialog_) {
-          this.dialog_./*OK*/postMessage(dict({
-            'sentinel': 'amp',
-            'type': 'result-ack',
-          }), returnOrigin);
+          this.dialog_./*OK*/ postMessage(
+            dict({
+              'sentinel': 'amp',
+              'type': 'result-ack',
+            }),
+            returnOrigin
+          );
         }
         this.loginDone_(getData(e)['result']);
       }
@@ -328,8 +338,11 @@ export class WebLoginDialog {
     let returnUrl;
     if (getMode().localDev) {
       const loc = this.win.location;
-      returnUrl = loc.protocol + '//' + loc.host +
-          '/extensions/amp-access/0.1/amp-login-done.html';
+      returnUrl =
+        loc.protocol +
+        '//' +
+        loc.host +
+        '/extensions/amp-access/0.1/amp-login-done.html';
     } else {
       returnUrl = `${urls.cdn}/v0/amp-login-done-0.1.html`;
     }
@@ -337,7 +350,6 @@ export class WebLoginDialog {
   }
 }
 
-
 /**
  * @param {string} url
  * @param {string} returnUrl
@@ -351,7 +363,10 @@ function buildLoginUrl(url, returnUrl) {
   if (RETURN_URL_REGEX.test(url)) {
     return url.replace(RETURN_URL_REGEX, encodeURIComponent(returnUrl));
   }
-  return url +
-      (url.indexOf('?') == -1 ? '?' : '&') +
-      'return=' + encodeURIComponent(returnUrl);
+  return (
+    url +
+    (url.indexOf('?') == -1 ? '?' : '&') +
+    'return=' +
+    encodeURIComponent(returnUrl)
+  );
 }
diff --git a/extensions/amp-access/0.1/test/test-access-expr.js b/extensions/amp-access/0.1/test/test-access-expr.js
index cd669978239a..c513e9cc6ace 100644
--- a/extensions/amp-access/0.1/test/test-access-expr.js
+++ b/extensions/amp-access/0.1/test/test-access-expr.js
@@ -16,9 +16,7 @@
 
 import {evaluateAccessExpr} from '../access-expr';
 
-
 describe('evaluateAccessExpr', () => {
-
   it('should NOT allow double equal', () => {
     expect(() => {
       evaluateAccessExpr('access == true', {});
@@ -107,25 +105,25 @@ describe('evaluateAccessExpr', () => {
 
   it('should evaluate simple string expressions', () => {
     expect(evaluateAccessExpr('str = "A"', {str: 'A'})).to.be.true;
-    expect(evaluateAccessExpr('str = \'A\'', {str: 'A'})).to.be.true;
+    expect(evaluateAccessExpr("str = 'A'", {str: 'A'})).to.be.true;
     expect(evaluateAccessExpr('str != "A"', {str: 'A'})).to.be.false;
   });
 
   it('should evaluate string expressions with wrong type', () => {
     expect(evaluateAccessExpr('str = "A"', {})).to.be.false;
-    expect(evaluateAccessExpr('str = \'A\'', {})).to.be.false;
+    expect(evaluateAccessExpr("str = 'A'", {})).to.be.false;
     expect(evaluateAccessExpr('str != "A"', {})).to.be.true;
 
     expect(evaluateAccessExpr('str = "A"', {str: 1})).to.be.false;
-    expect(evaluateAccessExpr('str = \'A\'', {str: 1})).to.be.false;
+    expect(evaluateAccessExpr("str = 'A'", {str: 1})).to.be.false;
     expect(evaluateAccessExpr('str != "A"', {str: 1})).to.be.true;
 
     expect(evaluateAccessExpr('str = ""', {str: false})).to.be.false;
-    expect(evaluateAccessExpr('str = \'\'', {str: false})).to.be.false;
+    expect(evaluateAccessExpr("str = ''", {str: false})).to.be.false;
     expect(evaluateAccessExpr('str != ""', {str: false})).to.be.true;
 
     expect(evaluateAccessExpr('str = "A"', {str: true})).to.be.false;
-    expect(evaluateAccessExpr('str = \'A\'', {str: true})).to.be.false;
+    expect(evaluateAccessExpr("str = 'A'", {str: true})).to.be.false;
     expect(evaluateAccessExpr('str != "A"', {str: true})).to.be.true;
   });
 
@@ -173,10 +171,10 @@ describe('evaluateAccessExpr', () => {
   it('should evaluate NOT expressions', () => {
     expect(evaluateAccessExpr('NOT (access = true)', {})).to.be.true;
 
-    expect(evaluateAccessExpr('NOT (access = true)', {access: true}))
-        .to.be.false;
-    expect(evaluateAccessExpr('NOT (access = true)', {access: false}))
-        .to.be.true;
+    expect(evaluateAccessExpr('NOT (access = true)', {access: true})).to.be
+      .false;
+    expect(evaluateAccessExpr('NOT (access = true)', {access: false})).to.be
+      .true;
 
     expect(evaluateAccessExpr('NOT (access = 1)', {access: 1})).to.be.false;
     expect(evaluateAccessExpr('NOT (access = 1)', {access: 0})).to.be.true;
@@ -194,8 +192,8 @@ describe('evaluateAccessExpr', () => {
     expect(evaluateAccessExpr('a = 1 OR b = 2', {a: 1, b: 2})).to.be.true;
     expect(evaluateAccessExpr('a = 1 OR b != 2', {a: 1, b: 2})).to.be.true;
 
-    expect(evaluateAccessExpr('NOT (a = 1 OR b != 2)', {a: 1, b: 2}))
-        .to.be.false;
+    expect(evaluateAccessExpr('NOT (a = 1 OR b != 2)', {a: 1, b: 2})).to.be
+      .false;
 
     expect(evaluateAccessExpr('a AND b = 2', {a: 1, b: 2})).to.be.true;
     expect(evaluateAccessExpr('a AND b', {a: 1, b: 2})).to.be.true;
diff --git a/extensions/amp-access/0.1/test/test-amp-access-client.js b/extensions/amp-access/0.1/test/test-amp-access-client.js
index 04d991f64ef8..42b6e17ab980 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-client.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-client.js
@@ -18,250 +18,297 @@ import * as lolex from 'lolex';
 import * as mode from '../../../../src/mode';
 import {AccessClientAdapter} from '../amp-access-client';
 
+describes.realWin(
+  'AccessClientAdapter',
+  {
+    amp: true,
+  },
+  env => {
+    let ampdoc;
+    let clock;
+    let validConfig;
+    let context;
+    let contextMock;
 
-describes.realWin('AccessClientAdapter', {
-  amp: true,
-}, env => {
-  let ampdoc;
-  let clock;
-  let validConfig;
-  let context;
-  let contextMock;
-
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    clock = lolex.install({target: ampdoc.win});
-
-    validConfig = {
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-    };
-
-    context = {
-      buildUrl: () => {},
-    };
-    contextMock = sandbox.mock(context);
-  });
-
-  afterEach(() => {
-    contextMock.verify();
-    clock.uninstall();
-  });
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      clock = lolex.install({target: ampdoc.win});
 
+      validConfig = {
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+      };
 
-  describe('config', () => {
-    it('should load valid config', () => {
-      const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      expect(adapter.authorizationUrl_).to
-          .equal('https://acme.com/a?rid=READER_ID');
-      expect(adapter.pingbackUrl_).to
-          .equal('https://acme.com/p?rid=READER_ID');
-      expect(adapter.authorizationTimeout_).to
-          .equal(3000);
-      expect(adapter.getConfig()).to.deep.equal({
-        authorizationUrl: 'https://acme.com/a?rid=READER_ID',
-        pingbackEnabled: true,
-        pingbackUrl: 'https://acme.com/p?rid=READER_ID',
-        authorizationTimeout: 3000,
-      });
-      expect(adapter.isAuthorizationEnabled()).to.be.true;
-      expect(adapter.isPingbackEnabled()).to.be.true;
+      context = {
+        buildUrl: () => {},
+      };
+      contextMock = sandbox.mock(context);
     });
 
-    it('should set authorization timeout if provided', () => {
-      validConfig['authorizationTimeout'] = 5000;
-      const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      expect(adapter.authorizationTimeout_).to.equal(5000);
+    afterEach(() => {
+      contextMock.verify();
+      clock.uninstall();
     });
 
-    it('should allow only lower-than-default timeout in production', () => {
-      sandbox.stub(mode, 'getMode').callsFake(() => {
-        return {development: false, localDev: false};
+    describe('config', () => {
+      it('should load valid config', () => {
+        const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        expect(adapter.authorizationUrl_).to.equal(
+          'https://acme.com/a?rid=READER_ID'
+        );
+        expect(adapter.pingbackUrl_).to.equal(
+          'https://acme.com/p?rid=READER_ID'
+        );
+        expect(adapter.authorizationTimeout_).to.equal(3000);
+        expect(adapter.getConfig()).to.deep.equal({
+          authorizationUrl: 'https://acme.com/a?rid=READER_ID',
+          pingbackEnabled: true,
+          pingbackUrl: 'https://acme.com/p?rid=READER_ID',
+          authorizationTimeout: 3000,
+        });
+        expect(adapter.isAuthorizationEnabled()).to.be.true;
+        expect(adapter.isPingbackEnabled()).to.be.true;
       });
 
-      let adapter;
+      it('should set authorization timeout if provided', () => {
+        validConfig['authorizationTimeout'] = 5000;
+        const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        expect(adapter.authorizationTimeout_).to.equal(5000);
+      });
 
-      validConfig['authorizationTimeout'] = 1000;
-      adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      expect(adapter.authorizationTimeout_).to.equal(1000);
+      it('should allow only lower-than-default timeout in production', () => {
+        sandbox.stub(mode, 'getMode').callsFake(() => {
+          return {development: false, localDev: false};
+        });
 
-      validConfig['authorizationTimeout'] = 5000;
-      adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      expect(adapter.authorizationTimeout_).to.equal(3000);
-    });
+        let adapter;
 
-    it('should fail when authorization timeout is malformed', () => {
-      validConfig['authorizationTimeout'] = 'someString';
-      allowConsoleError(() => { expect(() => {
-        new AccessClientAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"authorizationTimeout" must be a number/); });
-    });
+        validConfig['authorizationTimeout'] = 1000;
+        adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        expect(adapter.authorizationTimeout_).to.equal(1000);
 
-    it('should fail if config authorization is missing or malformed', () => {
-      delete validConfig['authorization'];
-      allowConsoleError(() => { expect(() => {
-        new AccessClientAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"authorization" URL must be specified/); });
+        validConfig['authorizationTimeout'] = 5000;
+        adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        expect(adapter.authorizationTimeout_).to.equal(3000);
+      });
 
-      validConfig['authorization'] = 'http://acme.com/a';
-      allowConsoleError(() => { expect(() => {
-        new AccessClientAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"authorization".*https\:/); });
-    });
+      it('should fail when authorization timeout is malformed', () => {
+        validConfig['authorizationTimeout'] = 'someString';
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessClientAdapter(ampdoc, validConfig, context);
+          }).to.throw(/"authorizationTimeout" must be a number/);
+        });
+      });
 
-    it('should fail if config pingback is missing or malformed', () => {
-      delete validConfig['pingback'];
-      allowConsoleError(() => { expect(() => {
-        new AccessClientAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"pingback" URL must be specified/); });
+      it('should fail if config authorization is missing or malformed', () => {
+        delete validConfig['authorization'];
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessClientAdapter(ampdoc, validConfig, context);
+          }).to.throw(/"authorization" URL must be specified/);
+        });
 
-      validConfig['pingback'] = 'http://acme.com/p';
-      allowConsoleError(() => { expect(() => {
-        new AccessClientAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"pingback".*https\:/); });
-    });
+        validConfig['authorization'] = 'http://acme.com/a';
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessClientAdapter(ampdoc, validConfig, context);
+          }).to.throw(/"authorization".*https\:/);
+        });
+      });
 
-    it('should allow missing pingback when noPingback=true', () => {
-      delete validConfig['pingback'];
-      validConfig['noPingback'] = true;
-      const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      expect(adapter.isPingbackEnabled()).to.be.false;
-      expect(adapter.pingbackUrl_).to.not.exist;
-    });
-  });
+      it('should fail if config pingback is missing or malformed', () => {
+        delete validConfig['pingback'];
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessClientAdapter(ampdoc, validConfig, context);
+          }).to.throw(/"pingback" URL must be specified/);
+        });
 
+        validConfig['pingback'] = 'http://acme.com/p';
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessClientAdapter(ampdoc, validConfig, context);
+          }).to.throw(/"pingback".*https\:/);
+        });
+      });
 
-  describe('runtime', () => {
+      it('should allow missing pingback when noPingback=true', () => {
+        delete validConfig['pingback'];
+        validConfig['noPingback'] = true;
+        const adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        expect(adapter.isPingbackEnabled()).to.be.false;
+        expect(adapter.pingbackUrl_).to.not.exist;
+      });
+    });
 
-    let adapter;
-    let xhrMock;
+    describe('runtime', () => {
+      let adapter;
+      let xhrMock;
 
-    beforeEach(() => {
-      adapter = new AccessClientAdapter(ampdoc, validConfig, context);
-      xhrMock = sandbox.mock(adapter.xhr_);
-    });
+      beforeEach(() => {
+        adapter = new AccessClientAdapter(ampdoc, validConfig, context);
+        xhrMock = sandbox.mock(adapter.xhr_);
+      });
 
-    afterEach(() => {
-      xhrMock.verify();
-    });
+      afterEach(() => {
+        xhrMock.verify();
+      });
 
-    describe('authorize', () => {
-      it('should issue XHR fetch', () => {
-        contextMock.expects('buildUrl')
+      describe('authorize', () => {
+        it('should issue XHR fetch', () => {
+          contextMock
+            .expects('buildUrl')
             .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
+              'https://acme.com/a?rid=READER_ID',
+              /* useAuthData */ false
+            )
             .returns(Promise.resolve('https://acme.com/a?rid=reader1'))
             .once();
-        xhrMock.expects('fetchJson')
+          xhrMock
+            .expects('fetchJson')
             .withExactArgs('https://acme.com/a?rid=reader1', {
               credentials: 'include',
             })
-            .returns(Promise.resolve({
-              json() {
-                return Promise.resolve({access: 'A'});
-              },
-            }))
+            .returns(
+              Promise.resolve({
+                json() {
+                  return Promise.resolve({access: 'A'});
+                },
+              })
+            )
             .once();
-        return adapter.authorize().then(response => {
-          expect(response).to.exist;
-          expect(response.access).to.equal('A');
+          return adapter.authorize().then(response => {
+            expect(response).to.exist;
+            expect(response.access).to.equal('A');
+          });
         });
-      });
 
-      it('should fail when XHR fails', () => {
-        contextMock.expects('buildUrl')
+        it('should fail when XHR fails', () => {
+          contextMock
+            .expects('buildUrl')
             .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
+              'https://acme.com/a?rid=READER_ID',
+              /* useAuthData */ false
+            )
             .returns(Promise.resolve('https://acme.com/a?rid=reader1'))
             .once();
-        xhrMock.expects('fetchJson')
+          xhrMock
+            .expects('fetchJson')
             .withExactArgs('https://acme.com/a?rid=reader1', {
               credentials: 'include',
             })
             .returns(Promise.reject('intentional'))
             .once();
-        return adapter.authorize().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
+          return adapter.authorize().then(
+            () => {
+              throw new Error('must never happen');
+            },
+            error => {
+              expect(error).to.match(/intentional/);
+            }
+          );
         });
-      });
 
-      it('should time out XHR fetch', () => {
-        contextMock.expects('buildUrl')
+        it('should time out XHR fetch', () => {
+          contextMock
+            .expects('buildUrl')
             .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
+              'https://acme.com/a?rid=READER_ID',
+              /* useAuthData */ false
+            )
             .returns(Promise.resolve('https://acme.com/a?rid=reader1'))
             .once();
-        xhrMock.expects('fetchJson')
+          xhrMock
+            .expects('fetchJson')
             .withExactArgs('https://acme.com/a?rid=reader1', {
               credentials: 'include',
             })
             .returns(new Promise(() => {})) // Never resolved.
             .once();
-        const promise = adapter.authorize();
-        return Promise.resolve().then(() => {
-          clock.tick(3001);
-          return promise;
-        }).then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/timeout/);
+          const promise = adapter.authorize();
+          return Promise.resolve()
+            .then(() => {
+              clock.tick(3001);
+              return promise;
+            })
+            .then(
+              () => {
+                throw new Error('must never happen');
+              },
+              error => {
+                expect(error).to.match(/timeout/);
+              }
+            );
         });
       });
-    });
 
-    describe('pingback', () => {
-      it('should send POST pingback', () => {
-        contextMock.expects('buildUrl')
+      describe('pingback', () => {
+        it('should send POST pingback', () => {
+          contextMock
+            .expects('buildUrl')
             .withExactArgs(
-                'https://acme.com/p?rid=READER_ID',
-                /* useAuthData */ true)
+              'https://acme.com/p?rid=READER_ID',
+              /* useAuthData */ true
+            )
             .returns(Promise.resolve('https://acme.com/p?rid=reader1'))
             .once();
-        xhrMock.expects('sendSignal')
-            .withExactArgs('https://acme.com/p?rid=reader1',
-                sinon.match(init => {
-                  return (init.method == 'POST' &&
-                      init.credentials == 'include' &&
-                      init.requireAmpResponseSourceOrigin == undefined &&
-                      init.body == '' &&
-                      init.headers['Content-Type'] ==
-                          'application/x-www-form-urlencoded');
-                }))
+          xhrMock
+            .expects('sendSignal')
+            .withExactArgs(
+              'https://acme.com/p?rid=reader1',
+              sinon.match(init => {
+                return (
+                  init.method == 'POST' &&
+                  init.credentials == 'include' &&
+                  init.requireAmpResponseSourceOrigin == undefined &&
+                  init.body == '' &&
+                  init.headers['Content-Type'] ==
+                    'application/x-www-form-urlencoded'
+                );
+              })
+            )
             .returns(Promise.resolve())
             .once();
-        return adapter.pingback();
-      });
+          return adapter.pingback();
+        });
 
-      it('should fail when POST fails', () => {
-        contextMock.expects('buildUrl')
+        it('should fail when POST fails', () => {
+          contextMock
+            .expects('buildUrl')
             .withExactArgs(
-                'https://acme.com/p?rid=READER_ID',
-                /* useAuthData */ true)
+              'https://acme.com/p?rid=READER_ID',
+              /* useAuthData */ true
+            )
             .returns(Promise.resolve('https://acme.com/p?rid=reader1'))
             .once();
-        xhrMock.expects('sendSignal')
-            .withExactArgs('https://acme.com/p?rid=reader1',
-                sinon.match(init => {
-                  return (init.method == 'POST' &&
-                      init.credentials == 'include' &&
-                      init.requireAmpResponseSourceOrigin == undefined &&
-                      init.body == '' &&
-                      init.headers['Content-Type'] ==
-                          'application/x-www-form-urlencoded');
-                }))
+          xhrMock
+            .expects('sendSignal')
+            .withExactArgs(
+              'https://acme.com/p?rid=reader1',
+              sinon.match(init => {
+                return (
+                  init.method == 'POST' &&
+                  init.credentials == 'include' &&
+                  init.requireAmpResponseSourceOrigin == undefined &&
+                  init.body == '' &&
+                  init.headers['Content-Type'] ==
+                    'application/x-www-form-urlencoded'
+                );
+              })
+            )
             .returns(Promise.reject('intentional'))
             .once();
-        return adapter.pingback().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
+          return adapter.pingback().then(
+            () => {
+              throw new Error('must never happen');
+            },
+            error => {
+              expect(error).to.match(/intentional/);
+            }
+          );
         });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-access/0.1/test/test-amp-access-iframe.js b/extensions/amp-access/0.1/test/test-amp-access-iframe.js
index 7cb9777108b6..4b4fcbf1d024 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-iframe.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-iframe.js
@@ -19,334 +19,375 @@ import {AccessIframeAdapter} from '../amp-access-iframe';
 import {Messenger} from '../iframe-api/messenger';
 import {dev} from '../../../../src/log';
 
+describes.fakeWin(
+  'AccessIframeAdapter',
+  {
+    amp: true,
+  },
+  env => {
+    let ampdoc;
+    let clock;
+    let validConfig;
+    let context;
+    let contextMock;
 
-describes.fakeWin('AccessIframeAdapter', {
-  amp: true,
-}, env => {
-  let ampdoc;
-  let clock;
-  let validConfig;
-  let context;
-  let contextMock;
-
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    clock = lolex.install({
-      target: ampdoc.win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
-
-    validConfig = {
-      'iframeSrc': 'https://acme.com/iframe',
-      'defaultResponse': {
-        'response': 'default',
-      },
-    };
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      clock = lolex.install({
+        target: ampdoc.win,
+        toFake: ['Date', 'setTimeout', 'clearTimeout'],
+      });
 
-    context = {
-      buildUrl: () => {},
-      collectUrlVars: () => {},
-    };
-    contextMock = sandbox.mock(context);
-  });
+      validConfig = {
+        'iframeSrc': 'https://acme.com/iframe',
+        'defaultResponse': {
+          'response': 'default',
+        },
+      };
 
-  afterEach(() => {
-    contextMock.verify();
-    clock.uninstall();
-  });
+      context = {
+        buildUrl: () => {},
+        collectUrlVars: () => {},
+      };
+      contextMock = sandbox.mock(context);
+    });
 
+    afterEach(() => {
+      contextMock.verify();
+      clock.uninstall();
+    });
 
-  describe('config', () => {
-    it('should load valid config', () => {
-      const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      expect(adapter.getConfig()).to.deep.equal({
-        'iframeSrc': 'https://acme.com/iframe',
-        'iframeVars': null,
+    describe('config', () => {
+      it('should load valid config', () => {
+        const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        expect(adapter.getConfig()).to.deep.equal({
+          'iframeSrc': 'https://acme.com/iframe',
+          'iframeVars': null,
+        });
+        expect(adapter.isAuthorizationEnabled()).to.be.true;
+        expect(adapter.isPingbackEnabled()).to.be.true;
       });
-      expect(adapter.isAuthorizationEnabled()).to.be.true;
-      expect(adapter.isPingbackEnabled()).to.be.true;
-    });
 
-    it('should load valid config with vars', () => {
-      validConfig['iframeVars'] = ['VAR1'];
-      const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      expect(adapter.getConfig()).to.deep.equal({
-        'iframeSrc': 'https://acme.com/iframe',
-        'iframeVars': ['VAR1'],
+      it('should load valid config with vars', () => {
+        validConfig['iframeVars'] = ['VAR1'];
+        const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        expect(adapter.getConfig()).to.deep.equal({
+          'iframeSrc': 'https://acme.com/iframe',
+          'iframeVars': ['VAR1'],
+        });
+        expect(adapter.isAuthorizationEnabled()).to.be.true;
+        expect(adapter.isPingbackEnabled()).to.be.true;
       });
-      expect(adapter.isAuthorizationEnabled()).to.be.true;
-      expect(adapter.isPingbackEnabled()).to.be.true;
-    });
 
-    it('should require "iframeSrc"', () => {
-      delete validConfig['iframeSrc'];
-      allowConsoleError(() => { expect(() => {
-        new AccessIframeAdapter(ampdoc, validConfig, context);
-      }).to.throw(/iframeSrc/); });
-    });
+      it('should require "iframeSrc"', () => {
+        delete validConfig['iframeSrc'];
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessIframeAdapter(ampdoc, validConfig, context);
+          }).to.throw(/iframeSrc/);
+        });
+      });
 
-    it('should require "iframeSrc" to be secure', () => {
-      validConfig['iframeSrc'] = 'http://acme.com/iframe';
-      allowConsoleError(() => { expect(() => {
-        new AccessIframeAdapter(ampdoc, validConfig, context);
-      }).to.throw(/https/); });
-    });
+      it('should require "iframeSrc" to be secure', () => {
+        validConfig['iframeSrc'] = 'http://acme.com/iframe';
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessIframeAdapter(ampdoc, validConfig, context);
+          }).to.throw(/https/);
+        });
+      });
 
-    it('should require "defaultResponse"', () => {
-      delete validConfig['defaultResponse'];
-      allowConsoleError(() => { expect(() => {
-        new AccessIframeAdapter(ampdoc, validConfig, context);
-      }).to.throw(/defaultResponse/); });
-    });
+      it('should require "defaultResponse"', () => {
+        delete validConfig['defaultResponse'];
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessIframeAdapter(ampdoc, validConfig, context);
+          }).to.throw(/defaultResponse/);
+        });
+      });
 
-    it('should disallow non-array vars', () => {
-      validConfig['iframeVars'] = {};
-      allowConsoleError(() => { expect(() => {
-        new AccessIframeAdapter(ampdoc, validConfig, context);
-      }).to.throw(/array/); });
+      it('should disallow non-array vars', () => {
+        validConfig['iframeVars'] = {};
+        allowConsoleError(() => {
+          expect(() => {
+            new AccessIframeAdapter(ampdoc, validConfig, context);
+          }).to.throw(/array/);
+        });
+      });
     });
-  });
-
 
-  describe('runtime connect', () => {
-    it('should NOT connect until necessary', () => {
-      const connectStub = sandbox.stub(Messenger.prototype, 'connect');
-      const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      expect(adapter.connectedPromise_).to.be.null;
-      expect(adapter.iframe_.parentNode).to.be.null;
-      expect(connectStub).to.not.be.called;
-    });
+    describe('runtime connect', () => {
+      it('should NOT connect until necessary', () => {
+        const connectStub = sandbox.stub(Messenger.prototype, 'connect');
+        const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        expect(adapter.connectedPromise_).to.be.null;
+        expect(adapter.iframe_.parentNode).to.be.null;
+        expect(connectStub).to.not.be.called;
+      });
 
-    it('should connect on first and only first authorize', () => {
-      const connectStub = sandbox.stub(Messenger.prototype, 'connect');
-      const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      adapter.authorize();
-      expect(adapter.connectedPromise_).to.not.be.null;
-      expect(adapter.iframe_.parentNode).to.not.be.null;
-      expect(connectStub).to.be.calledOnce;
-    });
+      it('should connect on first and only first authorize', () => {
+        const connectStub = sandbox.stub(Messenger.prototype, 'connect');
+        const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        adapter.authorize();
+        expect(adapter.connectedPromise_).to.not.be.null;
+        expect(adapter.iframe_.parentNode).to.not.be.null;
+        expect(connectStub).to.be.calledOnce;
+      });
 
-    it('should resolve vars', () => {
-      contextMock.expects('collectUrlVars')
+      it('should resolve vars', () => {
+        contextMock
+          .expects('collectUrlVars')
           .withExactArgs('VAR1&VAR2', false)
-          .returns(Promise.resolve({
-            'VAR1': 'A',
-            'VAR2': 'B',
-          }))
-          .once();
-      validConfig['iframeVars'] = ['VAR1', 'VAR2'];
-      const sendStub = sandbox.stub(Messenger.prototype, 'sendCommandRsvp')
-          .returns(Promise.resolve({}));
-      const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      const promise = adapter.connect();
-      adapter.handleCommand_('connect');
-      return promise.then(() => {
-        expect(sendStub).to.be.calledOnce;
-        expect(sendStub).to.be.calledWithExactly('start', {
-          'protocol': 'amp-access',
-          'config': Object.assign({}, validConfig, {
-            'iframeVars': {
+          .returns(
+            Promise.resolve({
               'VAR1': 'A',
               'VAR2': 'B',
-            },
-          }),
+            })
+          )
+          .once();
+        validConfig['iframeVars'] = ['VAR1', 'VAR2'];
+        const sendStub = sandbox
+          .stub(Messenger.prototype, 'sendCommandRsvp')
+          .returns(Promise.resolve({}));
+        const adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        const promise = adapter.connect();
+        adapter.handleCommand_('connect');
+        return promise.then(() => {
+          expect(sendStub).to.be.calledOnce;
+          expect(sendStub).to.be.calledWithExactly('start', {
+            'protocol': 'amp-access',
+            'config': Object.assign({}, validConfig, {
+              'iframeVars': {
+                'VAR1': 'A',
+                'VAR2': 'B',
+              },
+            }),
+          });
         });
       });
     });
-  });
-
 
-  describe('runtime', () => {
-    let adapter;
-    let messengerMock;
-    let storage, storageMock;
+    describe('runtime', () => {
+      let adapter;
+      let messengerMock;
+      let storage, storageMock;
 
-    beforeEach(() => {
-      storage = {
-        getItem: () => {},
-        setItem: () => {},
-        removeItem: () => {},
-      };
-      storageMock = sandbox.mock(storage);
-      Object.defineProperty(ampdoc.win, 'sessionStorage', {get: () => storage});
-      adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
-      messengerMock = sandbox.mock(adapter.messenger_);
-    });
+      beforeEach(() => {
+        storage = {
+          getItem: () => {},
+          setItem: () => {},
+          removeItem: () => {},
+        };
+        storageMock = sandbox.mock(storage);
+        Object.defineProperty(ampdoc.win, 'sessionStorage', {
+          get: () => storage,
+        });
+        adapter = new AccessIframeAdapter(ampdoc, validConfig, context);
+        messengerMock = sandbox.mock(adapter.messenger_);
+      });
 
-    afterEach(() => {
-      messengerMock.verify();
-      storageMock.verify();
-    });
+      afterEach(() => {
+        messengerMock.verify();
+        storageMock.verify();
+      });
 
-    it('should connect', () => {
-      return adapter.connectedPromise_;
-    });
+      it('should connect', () => {
+        return adapter.connectedPromise_;
+      });
 
-    describe('authorize', () => {
-      beforeEach(() => {
-        messengerMock.expects('sendCommandRsvp')
+      describe('authorize', () => {
+        beforeEach(() => {
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('start', {
               'protocol': 'amp-access',
               'config': validConfig,
             })
             .returns(Promise.resolve())
             .once();
-        adapter.connect();
-        adapter.handleCommand_('connect');
-      });
+          adapter.connect();
+          adapter.handleCommand_('connect');
+        });
 
-      it('should issue authorization', () => {
-        messengerMock.expects('sendCommandRsvp')
+        it('should issue authorization', () => {
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(Promise.resolve({a: 1}))
             .once();
-        return adapter.authorize().then(result => {
-          expect(result).to.deep.equal({a: 1});
+          return adapter.authorize().then(result => {
+            expect(result).to.deep.equal({a: 1});
+          });
         });
-      });
 
-      it('should default to the default response', () => {
-        messengerMock.expects('sendCommandRsvp')
+        it('should default to the default response', () => {
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(new Promise(() => {}))
             .once();
-        const p = adapter.authorize();
-        clock.tick(3001);
-        return p.then(result => {
-          expect(result).to.deep.equal({response: 'default'});
+          const p = adapter.authorize();
+          clock.tick(3001);
+          return p.then(result => {
+            expect(result).to.deep.equal({response: 'default'});
+          });
         });
-      });
 
-      it('should store successful authorization', () => {
-        const data = {a: 1};
-        storageMock.expects('setItem')
-            .withExactArgs('amp-access-iframe', JSON.stringify({
-              't': ampdoc.win.Date.now(),
-              'd': data,
-            }))
+        it('should store successful authorization', () => {
+          const data = {a: 1};
+          storageMock
+            .expects('setItem')
+            .withExactArgs(
+              'amp-access-iframe',
+              JSON.stringify({
+                't': ampdoc.win.Date.now(),
+                'd': data,
+              })
+            )
             .once();
-        messengerMock.expects('sendCommandRsvp')
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(Promise.resolve(data))
             .once();
-        return adapter.authorize().then(() => {
-          // Skip a microtask.
-          return Promise.resolve().then(() => Promise.resolve());
+          return adapter.authorize().then(() => {
+            // Skip a microtask.
+            return Promise.resolve().then(() => Promise.resolve());
+          });
         });
-      });
 
-      it('should recover the response from storage', () => {
-        const data = {a: 1};
-        storageMock.expects('getItem')
+        it('should recover the response from storage', () => {
+          const data = {a: 1};
+          storageMock
+            .expects('getItem')
             .withExactArgs('amp-access-iframe')
-            .returns(JSON.stringify({
-              't': ampdoc.win.Date.now() - 1000 * 60 * 60 * 24 * 7 + 3000 + 2,
-              'd': data,
-            }))
+            .returns(
+              JSON.stringify({
+                't': ampdoc.win.Date.now() - 1000 * 60 * 60 * 24 * 7 + 3000 + 2,
+                'd': data,
+              })
+            )
             .once();
-        storageMock.expects('removeItem')
+          storageMock
+            .expects('removeItem')
             .withExactArgs('amp-access-iframe')
             .never();
-        messengerMock.expects('sendCommandRsvp')
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(new Promise(() => {}))
             .once();
-        const p = adapter.authorize();
-        clock.tick(3001);
-        return p.then(result => {
-          expect(result).to.deep.equal(data);
+          const p = adapter.authorize();
+          clock.tick(3001);
+          return p.then(result => {
+            expect(result).to.deep.equal(data);
+          });
         });
-      });
 
-      it('should reject the expired response from storage', () => {
-        const data = {a: 1};
-        storageMock.expects('getItem')
+        it('should reject the expired response from storage', () => {
+          const data = {a: 1};
+          storageMock
+            .expects('getItem')
             .withExactArgs('amp-access-iframe')
-            .returns(JSON.stringify({
-              't': ampdoc.win.Date.now() - 1000 * 60 * 60 * 24 * 7 + 3000 - 1,
-              'd': data,
-            }))
+            .returns(
+              JSON.stringify({
+                't': ampdoc.win.Date.now() - 1000 * 60 * 60 * 24 * 7 + 3000 - 1,
+                'd': data,
+              })
+            )
             .once();
-        messengerMock.expects('sendCommandRsvp')
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(new Promise(() => {}))
             .once();
-        const p = adapter.authorize();
-        clock.tick(3001);
-        return p.then(result => {
-          expect(result).to.deep.equal({response: 'default'});
+          const p = adapter.authorize();
+          clock.tick(3001);
+          return p.then(result => {
+            expect(result).to.deep.equal({response: 'default'});
+          });
         });
-      });
 
-      it('should tolerate storage failures', () => {
-        const devErrorStub = sandbox.stub(dev(), 'error');
-        storageMock.expects('getItem')
+        it('should tolerate storage failures', () => {
+          const devErrorStub = sandbox.stub(dev(), 'error');
+          storageMock
+            .expects('getItem')
             .withExactArgs('amp-access-iframe')
             .throws(new Error('intentional'))
             .once();
-        storageMock.expects('removeItem')
+          storageMock
+            .expects('removeItem')
             .withExactArgs('amp-access-iframe')
             // Ensure that removal errors are also tolerated.
             .throws(new Error('intentional'))
             .once();
-        messengerMock.expects('sendCommandRsvp')
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             .returns(new Promise(() => {}))
             .once();
-        const p = adapter.authorize();
-        clock.tick(3001);
-        return p.then(result => {
-          expect(result).to.deep.equal({response: 'default'});
-          expect(devErrorStub).to.be.calledOnce;
-          expect(devErrorStub.args[0][1]).to.match(/failed to restore/);
+          const p = adapter.authorize();
+          clock.tick(3001);
+          return p.then(result => {
+            expect(result).to.deep.equal({response: 'default'});
+            expect(devErrorStub).to.be.calledOnce;
+            expect(devErrorStub.args[0][1]).to.match(/failed to restore/);
+          });
         });
-      });
 
-      it('should ignore absent storage', () => {
-        storage = null;
-        storageMock.expects('getItem')
+        it('should ignore absent storage', () => {
+          storage = null;
+          storageMock
+            .expects('getItem')
             .withExactArgs('amp-access-iframe')
             .never();
-        messengerMock.expects('sendCommandRsvp')
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('authorize', {})
             // Never resolved.
             .returns(new Promise(() => {}))
             .once();
-        const p = adapter.authorize();
-        clock.tick(3001);
-        return p.then(result => {
-          expect(result).to.deep.equal({response: 'default'});
+          const p = adapter.authorize();
+          clock.tick(3001);
+          return p.then(result => {
+            expect(result).to.deep.equal({response: 'default'});
+          });
         });
       });
-    });
 
-    describe('pingback', () => {
-      beforeEach(() => {
-        messengerMock.expects('sendCommandRsvp')
+      describe('pingback', () => {
+        beforeEach(() => {
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('start', {
               'protocol': 'amp-access',
               'config': validConfig,
             })
             .returns(Promise.resolve())
             .once();
-        adapter.connect();
-        adapter.handleCommand_('connect');
-      });
+          adapter.connect();
+          adapter.handleCommand_('connect');
+        });
 
-      it('should send pingback', () => {
-        messengerMock.expects('sendCommandRsvp')
+        it('should send pingback', () => {
+          messengerMock
+            .expects('sendCommandRsvp')
             .withExactArgs('pingback', {})
             .returns(Promise.resolve())
             .once();
-        return adapter.pingback();
+          return adapter.pingback();
+        });
       });
-    });
 
-    describe('actions', () => {
-      it('should reset stored state after action', () => {
-        storageMock.expects('removeItem')
+      describe('actions', () => {
+        it('should reset stored state after action', () => {
+          storageMock
+            .expects('removeItem')
             .withExactArgs('amp-access-iframe')
             .once();
-        adapter.postAction();
+          adapter.postAction();
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-access/0.1/test/test-amp-access-other.js b/extensions/amp-access/0.1/test/test-amp-access-other.js
index 814de87c2cbf..2ddd04737cd1 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-other.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-other.js
@@ -16,7 +16,6 @@
 
 import {AccessOtherAdapter} from '../amp-access-other';
 
-
 describes.realWin('AccessOtherAdapter', {amp: true}, env => {
   let ampdoc;
   let validConfig;
@@ -39,7 +38,6 @@ describes.realWin('AccessOtherAdapter', {amp: true}, env => {
     sandbox.restore();
   });
 
-
   describe('config', () => {
     it('should load valid config', () => {
       const adapter = new AccessOtherAdapter(ampdoc, validConfig, context);
@@ -63,7 +61,6 @@ describes.realWin('AccessOtherAdapter', {amp: true}, env => {
     });
   });
 
-
   describe('runtime', () => {
     let adapter;
 
@@ -71,8 +68,7 @@ describes.realWin('AccessOtherAdapter', {amp: true}, env => {
       adapter = new AccessOtherAdapter(ampdoc, {}, context);
     });
 
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     it('should disable authorization without fallback object', () => {
       adapter.authorizationResponse_ = null;
@@ -104,9 +100,11 @@ describes.realWin('AccessOtherAdapter', {amp: true}, env => {
       adapter.isProxyOrigin_ = true;
       adapter.authorizationResponse_ = {};
       contextMock.expects('buildUrl').never();
-      allowConsoleError(() => { expect(() => {
-        adapter.authorize();
-      }).to.throw(); });
+      allowConsoleError(() => {
+        expect(() => {
+          adapter.authorize();
+        }).to.throw();
+      });
     });
 
     it('should respond to authorization when not on proxy proxy', () => {
diff --git a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
index e9a4603a491e..799a3661f55a 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-server-jwt.js
@@ -21,7 +21,6 @@ import {getMode} from '../../../../src/mode';
 import {isUserErrorMessage} from '../../../../src/log';
 import {removeFragment, serializeQueryString} from '../../../../src/url';
 
-
 describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
   let win;
   let ampdoc;
@@ -59,16 +58,16 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
     contextMock.verify();
   });
 
-
   describe('config', () => {
     it('should load valid config', () => {
       const adapter = new AccessServerJwtAdapter(ampdoc, validConfig, context);
-      expect(adapter.clientAdapter_.authorizationUrl_).to
-          .equal('https://acme.com/a?rid=READER_ID');
-      expect(adapter.clientAdapter_.pingbackUrl_).to
-          .equal('https://acme.com/p?rid=READER_ID');
-      expect(adapter.keyUrl_).to
-          .equal('https://acme.com/pk');
+      expect(adapter.clientAdapter_.authorizationUrl_).to.equal(
+        'https://acme.com/a?rid=READER_ID'
+      );
+      expect(adapter.clientAdapter_.pingbackUrl_).to.equal(
+        'https://acme.com/p?rid=READER_ID'
+      );
+      expect(adapter.keyUrl_).to.equal('https://acme.com/pk');
       expect(adapter.key_).to.be.null;
       expect(adapter.serverState_).to.equal('STATE1');
       expect(adapter.isProxyOrigin_).to.be.false;
@@ -78,23 +77,29 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
 
     it('should fail if config is invalid: authorization', () => {
       delete validConfig['authorization'];
-      allowConsoleError(() => { expect(() => {
-        new AccessServerJwtAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"authorization" URL must be specified/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessServerJwtAdapter(ampdoc, validConfig, context);
+        }).to.throw(/"authorization" URL must be specified/);
+      });
     });
 
     it('should fail if config is invalid: publicKeyUrl', () => {
       delete validConfig['publicKeyUrl'];
-      allowConsoleError(() => { expect(() => {
-        new AccessServerJwtAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"publicKey" or "publicKeyUrl" must be specified/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessServerJwtAdapter(ampdoc, validConfig, context);
+        }).to.throw(/"publicKey" or "publicKeyUrl" must be specified/);
+      });
     });
 
     it('should fail if config is invalid: http publicKeyUrl', () => {
       validConfig['publicKeyUrl'] = 'http://acme.com/pk';
-      allowConsoleError(() => { expect(() => {
-        new AccessServerJwtAdapter(ampdoc, validConfig, context);
-      }).to.throw(/https/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessServerJwtAdapter(ampdoc, validConfig, context);
+        }).to.throw(/https/);
+      });
     });
 
     it('should support either publicKey or publicKeyUrl', () => {
@@ -113,7 +118,6 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
   });
 
   describe('runtime', () => {
-
     let adapter;
     let clientAdapter;
     let clientAdapterMock;
@@ -165,12 +169,12 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
     });
 
     describe('authorize', () => {
-
       it('should fallback to client auth when not on proxy', () => {
         adapter.isProxyOrigin_ = false;
         const p = Promise.resolve();
-        const stub = sandbox.stub(adapter, 'authorizeOnClient_').callsFake(
-            () => p);
+        const stub = sandbox
+          .stub(adapter, 'authorizeOnClient_')
+          .callsFake(() => p);
         docFetcherMock.expects('fetchDocument').never();
         const result = adapter.authorize();
         expect(result).to.equal(p);
@@ -180,8 +184,9 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
       it('should fallback to client auth w/o server state', () => {
         adapter.serverState_ = null;
         const p = Promise.resolve();
-        const stub = sandbox.stub(adapter, 'authorizeOnClient_').callsFake(
-            () => p);
+        const stub = sandbox
+          .stub(adapter, 'authorizeOnClient_')
+          .callsFake(() => p);
         docFetcherMock.expects('fetchDocument').never();
         const result = adapter.authorize();
         expect(result).to.equal(p);
@@ -190,8 +195,9 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
 
       it('should execute via server on proxy and w/server state', () => {
         const p = Promise.resolve();
-        const stub = sandbox.stub(adapter, 'authorizeOnServer_').callsFake(
-            () => p);
+        const stub = sandbox
+          .stub(adapter, 'authorizeOnServer_')
+          .callsFake(() => p);
         docFetcherMock.expects('fetchDocument').never();
         const result = adapter.authorize();
         expect(result).to.equal(p);
@@ -201,8 +207,9 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
       it('should fetch JWT directly via client', () => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
-        sandbox.stub(adapter, 'fetchJwt_').callsFake(
-            () => Promise.resolve({jwt}));
+        sandbox
+          .stub(adapter, 'fetchJwt_')
+          .callsFake(() => Promise.resolve({jwt}));
         docFetcherMock.expects('fetchDocument').never();
         return adapter.authorizeOnClient_().then(result => {
           expect(result).to.equal(authdata);
@@ -214,29 +221,31 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
         const encoded = 'rAnDoM';
-        sandbox.stub(adapter, 'fetchJwt_').callsFake(
-            () => Promise.resolve({jwt, encoded}));
+        sandbox
+          .stub(adapter, 'fetchJwt_')
+          .callsFake(() => Promise.resolve({jwt, encoded}));
         const request = serializeQueryString({
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
           'jwt': encoded,
         });
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: request,
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(Promise.resolve(responseDoc))
-            .once();
-        const replaceSectionsStub =
-            sandbox.stub(adapter, 'replaceSections_').callsFake(
-                () => {
-                  return Promise.resolve();
-                });
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: request,
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(Promise.resolve(responseDoc))
+          .once();
+        const replaceSectionsStub = sandbox
+          .stub(adapter, 'replaceSections_')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
         return adapter.authorizeOnServer_().then(response => {
           expect(response).to.equal(authdata);
           expect(replaceSectionsStub).to.be.calledOnce;
@@ -248,35 +257,40 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
         const encoded = 'rAnDoM';
-        sandbox.stub(adapter, 'fetchJwt_').callsFake(
-            () => Promise.resolve({jwt, encoded}));
+        sandbox
+          .stub(adapter, 'fetchJwt_')
+          .callsFake(() => Promise.resolve({jwt, encoded}));
         const request = serializeQueryString({
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
           'jwt': encoded,
         });
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: request,
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(Promise.reject('intentional'))
-            .once();
-        const replaceSectionsStub =
-            sandbox.stub(adapter, 'replaceSections_').callsFake(
-                () => {
-                  return Promise.resolve();
-                });
-        return adapter.authorizeOnServer_().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
-          expect(replaceSectionsStub).to.have.not.been.called;
-        });
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: request,
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(Promise.reject('intentional'))
+          .once();
+        const replaceSectionsStub = sandbox
+          .stub(adapter, 'replaceSections_')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        return adapter.authorizeOnServer_().then(
+          () => {
+            throw new Error('must never happen');
+          },
+          error => {
+            expect(error).to.match(/intentional/);
+            expect(replaceSectionsStub).to.have.not.been.called;
+          }
+        );
       });
 
       it('should fail when authorize-and-fill times out', () => {
@@ -284,39 +298,46 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
         const encoded = 'rAnDoM';
-        sandbox.stub(adapter, 'fetchJwt_').callsFake(
-            () => Promise.resolve({jwt, encoded}));
+        sandbox
+          .stub(adapter, 'fetchJwt_')
+          .callsFake(() => Promise.resolve({jwt, encoded}));
         const request = serializeQueryString({
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
           'jwt': encoded,
         });
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: request,
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(new Promise(() => {})) // Never resolved.
-            .once();
-        const replaceSectionsStub =
-            sandbox.stub(adapter, 'replaceSections_').callsFake(
-                () => {
-                  return Promise.resolve();
-                });
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: request,
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(new Promise(() => {})) // Never resolved.
+          .once();
+        const replaceSectionsStub = sandbox
+          .stub(adapter, 'replaceSections_')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
         const promise = adapter.authorizeOnServer_();
-        return Promise.resolve().then(() => {
-          clock.tick(3001);
-          return promise;
-        }).then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/timeout/);
-          expect(replaceSectionsStub).to.have.not.been.called;
-        });
+        return Promise.resolve()
+          .then(() => {
+            clock.tick(3001);
+            return promise;
+          })
+          .then(
+            () => {
+              throw new Error('must never happen');
+            },
+            error => {
+              expect(error).to.match(/timeout/);
+              expect(replaceSectionsStub).to.have.not.been.called;
+            }
+          );
       });
 
       it('should replace sections', () => {
@@ -336,12 +357,16 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         responseDoc.appendChild(unknownResponseElement3);
 
         return adapter.replaceSections_(responseDoc).then(() => {
-          expect(win.document.querySelector('[i-amphtml-access-id="1/1"]')
-              .textContent).to.equal('a1');
-          expect(win.document.querySelector('[i-amphtml-access-id="1/2"]')
-              .textContent).to.equal('a2');
-          expect(win.document.querySelector('[i-amphtml-access-id=a3]'))
-              .to.be.null;
+          expect(
+            win.document.querySelector('[i-amphtml-access-id="1/1"]')
+              .textContent
+          ).to.equal('a1');
+          expect(
+            win.document.querySelector('[i-amphtml-access-id="1/2"]')
+              .textContent
+          ).to.equal('a2');
+          expect(win.document.querySelector('[i-amphtml-access-id=a3]')).to.be
+            .null;
         });
       });
 
@@ -360,26 +385,32 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
         const encoded = 'rAnDoM';
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(Promise.resolve({
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(
+            Promise.resolve({
               text() {
                 return Promise.resolve(encoded);
               },
-            }))
-            .once();
-        jwtMock.expects('decode')
-            .withExactArgs(encoded)
-            .returns(jwt)
-            .once();
+            })
+          )
+          .once();
+        jwtMock
+          .expects('decode')
+          .withExactArgs(encoded)
+          .returns(jwt)
+          .once();
         sandbox.stub(adapter, 'shouldBeValidated_').callsFake(() => false);
         return adapter.fetchJwt_().then(resp => {
           expect(resp.encoded).to.equal(encoded);
@@ -388,50 +419,64 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
       });
 
       it('should fail when JWT fetch fails', () => {
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(Promise.reject('intentional'))
-            .once();
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(Promise.reject('intentional'))
+          .once();
         jwtMock.expects('decode').never();
-        return adapter.fetchJwt_().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
-          expect(isUserErrorMessage(error.message)).to.be.true;
-        });
+        return adapter.fetchJwt_().then(
+          () => {
+            throw new Error('must never happen');
+          },
+          error => {
+            expect(error).to.match(/intentional/);
+            expect(isUserErrorMessage(error.message)).to.be.true;
+          }
+        );
       });
 
       it('should fail when JWT fetch times out', () => {
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(new Promise(() => {})) // Never resolved.
-            .once();
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(new Promise(() => {})) // Never resolved.
+          .once();
         jwtMock.expects('decode').never();
         const promise = adapter.fetchJwt_();
-        return Promise.resolve().then(() => {
-          clock.tick(3001);
-          return promise;
-        }).then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/timeout/);
-        });
+        return Promise.resolve()
+          .then(() => {
+            clock.tick(3001);
+            return promise;
+          })
+          .then(
+            () => {
+              throw new Error('must never happen');
+            },
+            error => {
+              expect(error).to.match(/timeout/);
+            }
+          );
       });
 
       it('should verified JWT after fetch when supported', () => {
@@ -440,41 +485,52 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const encoded = 'rAnDoM';
         const pem = 'pEm';
         const pemPromise = Promise.resolve(pem);
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(Promise.resolve({
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(
+            Promise.resolve({
               text() {
                 return Promise.resolve(encoded);
               },
-            }))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/pk')
-            .returns(Promise.resolve({
+            })
+          )
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/pk')
+          .returns(
+            Promise.resolve({
               text() {
                 return pemPromise;
               },
-            }))
-            .once();
-        jwtMock.expects('decode')
-            .withExactArgs(encoded)
-            .returns(jwt)
-            .once();
-        jwtMock.expects('isVerificationSupported')
-            .returns(true)
-            .once();
-        jwtMock.expects('decodeAndVerify')
-            .withExactArgs(encoded, pemPromise)
-            .returns(Promise.resolve(jwt))
-            .once();
+            })
+          )
+          .once();
+        jwtMock
+          .expects('decode')
+          .withExactArgs(encoded)
+          .returns(jwt)
+          .once();
+        jwtMock
+          .expects('isVerificationSupported')
+          .returns(true)
+          .once();
+        jwtMock
+          .expects('decodeAndVerify')
+          .withExactArgs(encoded, pemPromise)
+          .returns(Promise.resolve(jwt))
+          .once();
         sandbox.stub(adapter, 'shouldBeValidated_').callsFake(() => true);
         const validateStub = sandbox.stub(adapter, 'validateJwt_');
         return adapter.fetchJwt_().then(resp => {
@@ -490,79 +546,101 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
         const encoded = 'rAnDoM';
         const pem = 'pEm';
         adapter.key_ = pem;
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(Promise.resolve({
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(
+            Promise.resolve({
               text() {
                 return Promise.resolve(encoded);
               },
-            }))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/pk')
-            .never();
-        jwtMock.expects('decode')
-            .withExactArgs(encoded)
-            .returns(jwt)
-            .once();
-        jwtMock.expects('isVerificationSupported')
-            .returns(true)
-            .once();
+            })
+          )
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/pk')
+          .never();
+        jwtMock
+          .expects('decode')
+          .withExactArgs(encoded)
+          .returns(jwt)
+          .once();
+        jwtMock
+          .expects('isVerificationSupported')
+          .returns(true)
+          .once();
         let pemPromise;
-        jwtMock.expects('decodeAndVerify')
-            .withExactArgs(encoded, sinon.match(arg => {
+        jwtMock
+          .expects('decodeAndVerify')
+          .withExactArgs(
+            encoded,
+            sinon.match(arg => {
               pemPromise = arg;
               return true;
-            }))
-            .returns(Promise.resolve(jwt))
-            .once();
+            })
+          )
+          .returns(Promise.resolve(jwt))
+          .once();
         sandbox.stub(adapter, 'shouldBeValidated_').callsFake(() => true);
         const validateStub = sandbox.stub(adapter, 'validateJwt_');
-        return adapter.fetchJwt_().then(resp => {
-          expect(resp.encoded).to.equal(encoded);
-          expect(resp.jwt).to.equal(jwt);
-          expect(validateStub).to.be.calledOnce;
-          return pemPromise;
-        }).then(pemValue => {
-          expect(pemValue).to.equal(pem);
-        });
+        return adapter
+          .fetchJwt_()
+          .then(resp => {
+            expect(resp.encoded).to.equal(encoded);
+            expect(resp.jwt).to.equal(jwt);
+            expect(validateStub).to.be.calledOnce;
+            return pemPromise;
+          })
+          .then(pemValue => {
+            expect(pemValue).to.equal(pem);
+          });
       });
 
       it('should NOT verified JWT after fetch when not supported', () => {
         const authdata = {};
         const jwt = {'amp_authdata': authdata};
         const encoded = 'rAnDoM';
-        contextMock.expects('buildUrl')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve('https://acme.com/a?rid=r1'))
-            .once();
-        xhrMock.expects('fetchText')
-            .withExactArgs('https://acme.com/a?rid=r1', {
-              credentials: 'include',
-            })
-            .returns(Promise.resolve({
+        contextMock
+          .expects('buildUrl')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(Promise.resolve('https://acme.com/a?rid=r1'))
+          .once();
+        xhrMock
+          .expects('fetchText')
+          .withExactArgs('https://acme.com/a?rid=r1', {
+            credentials: 'include',
+          })
+          .returns(
+            Promise.resolve({
               text() {
                 return Promise.resolve(encoded);
               },
-            }))
-            .once();
-        jwtMock.expects('decode')
-            .withExactArgs(encoded)
-            .returns(jwt)
-            .once();
-        jwtMock.expects('isVerificationSupported')
-            .returns(false)
-            .once();
+            })
+          )
+          .once();
+        jwtMock
+          .expects('decode')
+          .withExactArgs(encoded)
+          .returns(jwt)
+          .once();
+        jwtMock
+          .expects('isVerificationSupported')
+          .returns(false)
+          .once();
         jwtMock.expects('decodeAndVerify').never();
         sandbox.stub(adapter, 'shouldBeValidated_').callsFake(() => true);
         const validateStub = sandbox.stub(adapter, 'validateJwt_');
@@ -575,7 +653,6 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
     });
 
     describe('validation', () => {
-
       let jwt;
 
       beforeEach(() => {
@@ -591,23 +668,29 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
 
       it('should fail w/o exp', () => {
         delete jwt['exp'];
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(/"exp" field must be specified/); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw(/"exp" field must be specified/);
+        });
       });
 
       it('should fail w/invalid exp', () => {
         jwt['exp'] = 'invalid';
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw();
+        });
       });
 
       it('should fail when expired', () => {
         jwt['exp'] = Math.floor((Date.now() - 10000) / 1000);
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(/token has expired/); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw(/token has expired/);
+        });
       });
 
       it('should succeed with array aud', () => {
@@ -623,31 +706,38 @@ describes.realWin('AccessServerJwtAdapter', {amp: true}, env => {
 
       it('should fail w/o aud', () => {
         delete jwt['aud'];
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(/"aud" field must be specified/); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw(/"aud" field must be specified/);
+        });
       });
 
       it('should fail w/non-AMP aud', () => {
         jwt['aud'] = 'other.org';
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(/"aud" must be "ampproject.org"/); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw(/"aud" must be "ampproject.org"/);
+        });
       });
 
       it('should fail w/non-AMP aud array', () => {
         jwt['aud'] = ['another.org', 'other.org'];
-        allowConsoleError(() => { expect(() => {
-          adapter.validateJwt_(jwt);
-        }).to.throw(/"aud" must be "ampproject.org"/); });
+        allowConsoleError(() => {
+          expect(() => {
+            adapter.validateJwt_(jwt);
+          }).to.throw(/"aud" must be "ampproject.org"/);
+        });
       });
     });
 
     describe('pingback', () => {
       it('should always send client pingback', () => {
-        clientAdapterMock.expects('pingback')
-            .returns(Promise.resolve())
-            .once();
+        clientAdapterMock
+          .expects('pingback')
+          .returns(Promise.resolve())
+          .once();
         adapter.pingback();
       });
     });
diff --git a/extensions/amp-access/0.1/test/test-amp-access-server.js b/extensions/amp-access/0.1/test/test-amp-access-server.js
index bd9cc6a568f6..a9741f660477 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-server.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-server.js
@@ -19,7 +19,6 @@ import * as lolex from 'lolex';
 import {AccessServerAdapter} from '../amp-access-server';
 import {removeFragment} from '../../../../src/url';
 
-
 describes.realWin('AccessServerAdapter', {amp: true}, env => {
   let win;
   let document;
@@ -58,14 +57,15 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
     contextMock.verify();
   });
 
-
   describe('config', () => {
     it('should load valid config', () => {
       const adapter = new AccessServerAdapter(ampdoc, validConfig, context);
-      expect(adapter.clientAdapter_.authorizationUrl_).to
-          .equal('https://acme.com/a?rid=READER_ID');
-      expect(adapter.clientAdapter_.pingbackUrl_).to
-          .equal('https://acme.com/p?rid=READER_ID');
+      expect(adapter.clientAdapter_.authorizationUrl_).to.equal(
+        'https://acme.com/a?rid=READER_ID'
+      );
+      expect(adapter.clientAdapter_.pingbackUrl_).to.equal(
+        'https://acme.com/p?rid=READER_ID'
+      );
       expect(adapter.serverState_).to.equal('STATE1');
       expect(adapter.isProxyOrigin_).to.be.false;
       expect(adapter.isAuthorizationEnabled()).to.be.true;
@@ -74,9 +74,11 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
 
     it('should fail if config is invalid', () => {
       delete validConfig['authorization'];
-      allowConsoleError(() => { expect(() => {
-        new AccessServerAdapter(ampdoc, validConfig, context);
-      }).to.throw(/"authorization" URL must be specified/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessServerAdapter(ampdoc, validConfig, context);
+        }).to.throw(/"authorization" URL must be specified/);
+      });
     });
 
     it('should tolerate when i-amphtml-access-state is missing', () => {
@@ -87,7 +89,6 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
   });
 
   describe('runtime', () => {
-
     let adapter;
     let clientAdapter;
     let clientAdapterMock;
@@ -136,11 +137,13 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
     });
 
     describe('authorize', () => {
-
       it('should fallback to client auth when not on proxy', () => {
         adapter.isProxyOrigin_ = false;
         const p = Promise.resolve();
-        clientAdapterMock.expects('authorize').returns(p).once();
+        clientAdapterMock
+          .expects('authorize')
+          .returns(p)
+          .once();
         docFetcherMock.expects('fetchDocument').never();
         const result = adapter.authorize();
         expect(result).to.equal(p);
@@ -149,7 +152,10 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
       it('should fallback to client auth w/o server state', () => {
         adapter.serverState_ = null;
         const p = Promise.resolve();
-        clientAdapterMock.expects('authorize').returns(p).once();
+        clientAdapterMock
+          .expects('authorize')
+          .returns(p)
+          .once();
         docFetcherMock.expects('fetchDocument').never();
         const result = adapter.authorize();
         expect(result).to.equal(p);
@@ -157,15 +163,19 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
 
       it('should execute authorize-and-fill', () => {
         adapter.serviceUrl_ = 'http://localhost:8000/af';
-        contextMock.expects('collectUrlVars')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve({
+        contextMock
+          .expects('collectUrlVars')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(
+            Promise.resolve({
               'READER_ID': 'reader1',
               'OTHER': 123,
-            }))
-            .once();
+            })
+          )
+          .once();
         const request = {
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
@@ -174,22 +184,23 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
             'OTHER': '123',
           },
         };
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: 'request=' + encodeURIComponent(JSON.stringify(request)),
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(Promise.resolve(responseDoc))
-            .once();
-        const replaceSectionsStub =
-            sandbox.stub(adapter, 'replaceSections_').callsFake(
-                () => {
-                  return Promise.resolve();
-                });
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: 'request=' + encodeURIComponent(JSON.stringify(request)),
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(Promise.resolve(responseDoc))
+          .once();
+        const replaceSectionsStub = sandbox
+          .stub(adapter, 'replaceSections_')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
         return adapter.authorize().then(response => {
           expect(response).to.exist;
           expect(response.access).to.equal('A');
@@ -199,15 +210,19 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
 
       it('should fail when XHR fails', () => {
         adapter.serviceUrl_ = 'http://localhost:8000/af';
-        contextMock.expects('collectUrlVars')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve({
+        contextMock
+          .expects('collectUrlVars')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(
+            Promise.resolve({
               'READER_ID': 'reader1',
               'OTHER': 123,
-            }))
-            .once();
+            })
+          )
+          .once();
         const request = {
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
@@ -216,35 +231,43 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
             'OTHER': '123',
           },
         };
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: 'request=' + encodeURIComponent(JSON.stringify(request)),
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(Promise.reject('intentional'))
-            .once();
-        return adapter.authorize().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
-        });
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: 'request=' + encodeURIComponent(JSON.stringify(request)),
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(Promise.reject('intentional'))
+          .once();
+        return adapter.authorize().then(
+          () => {
+            throw new Error('must never happen');
+          },
+          error => {
+            expect(error).to.match(/intentional/);
+          }
+        );
       });
 
       it('should time out XHR fetch', () => {
         adapter.serviceUrl_ = 'http://localhost:8000/af';
-        contextMock.expects('collectUrlVars')
-            .withExactArgs(
-                'https://acme.com/a?rid=READER_ID',
-                /* useAuthData */ false)
-            .returns(Promise.resolve({
+        contextMock
+          .expects('collectUrlVars')
+          .withExactArgs(
+            'https://acme.com/a?rid=READER_ID',
+            /* useAuthData */ false
+          )
+          .returns(
+            Promise.resolve({
               'READER_ID': 'reader1',
               'OTHER': 123,
-            }))
-            .once();
+            })
+          )
+          .once();
         const request = {
           'url': removeFragment(win.location.href),
           'state': 'STATE1',
@@ -253,26 +276,32 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
             'OTHER': '123',
           },
         };
-        docFetcherMock.expects('fetchDocument')
-            .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
-              method: 'POST',
-              body: 'request=' + encodeURIComponent(JSON.stringify(request)),
-              headers: {
-                'Content-Type': 'application/x-www-form-urlencoded',
-              },
-              requireAmpResponseSourceOrigin: false,
-            })
-            .returns(new Promise(() => {})) // Never resolved.
-            .once();
+        docFetcherMock
+          .expects('fetchDocument')
+          .withExactArgs(sinon.match.any, 'http://localhost:8000/af', {
+            method: 'POST',
+            body: 'request=' + encodeURIComponent(JSON.stringify(request)),
+            headers: {
+              'Content-Type': 'application/x-www-form-urlencoded',
+            },
+            requireAmpResponseSourceOrigin: false,
+          })
+          .returns(new Promise(() => {})) // Never resolved.
+          .once();
         const promise = adapter.authorize();
-        return Promise.resolve().then(() => {
-          clock.tick(3001);
-          return promise;
-        }).then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/timeout/);
-        });
+        return Promise.resolve()
+          .then(() => {
+            clock.tick(3001);
+            return promise;
+          })
+          .then(
+            () => {
+              throw new Error('must never happen');
+            },
+            error => {
+              expect(error).to.match(/timeout/);
+            }
+          );
       });
 
       it('should replace sections', () => {
@@ -292,10 +321,12 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
         responseDoc.appendChild(unknownResponseElement3);
 
         return adapter.replaceSections_(responseDoc).then(() => {
-          expect(document.querySelector('[i-amphtml-access-id="1/1"]')
-              .textContent).to.equal('a1');
-          expect(document.querySelector('[i-amphtml-access-id="1/2"]')
-              .textContent).to.equal('a2');
+          expect(
+            document.querySelector('[i-amphtml-access-id="1/1"]').textContent
+          ).to.equal('a1');
+          expect(
+            document.querySelector('[i-amphtml-access-id="1/2"]').textContent
+          ).to.equal('a2');
           expect(document.querySelector('[i-amphtml-access-id=a3]')).to.be.null;
         });
       });
@@ -303,9 +334,10 @@ describes.realWin('AccessServerAdapter', {amp: true}, env => {
 
     describe('pingback', () => {
       it('should always send client pingback', () => {
-        clientAdapterMock.expects('pingback')
-            .returns(Promise.resolve())
-            .once();
+        clientAdapterMock
+          .expects('pingback')
+          .returns(Promise.resolve())
+          .once();
         adapter.pingback();
       });
     });
diff --git a/extensions/amp-access/0.1/test/test-amp-access-source.js b/extensions/amp-access/0.1/test/test-amp-access-source.js
index efc094932b88..c84e48f13808 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-source.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-source.js
@@ -21,340 +21,410 @@ import {AccessServerAdapter} from '../amp-access-server';
 import {AccessServerJwtAdapter} from '../amp-access-server-jwt';
 import {AccessSource} from '../amp-access-source';
 import {AccessVendorAdapter} from '../amp-access-vendor';
-import {cidServiceForDocForTesting} from
-  '../../../../src/service/cid-impl';
-import {installPerformanceService} from
-  '../../../../src/service/performance-impl';
+import {cidServiceForDocForTesting} from '../../../../src/service/cid-impl';
+import {installPerformanceService} from '../../../../src/service/performance-impl';
 import {toggleExperiment} from '../../../../src/experiments';
 
+describes.fakeWin(
+  'AccessSource',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document;
+    let ampdoc;
+    let element;
+
+    // Undefined initialization params for AccessSource (unused in tests so far).
+    let readerIdFn, scheduleViewFn, onReauthorizeFn;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      element = document.createElement('script');
+      element.setAttribute('id', 'amp-access');
+      element.setAttribute('type', 'application/json');
+      document.body.appendChild(element);
+      document.documentElement.classList.remove('amp-access-error');
+    });
 
-describes.fakeWin('AccessSource', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document;
-  let ampdoc;
-  let element;
-
-  // Undefined initialization params for AccessSource (unused in tests so far).
-  let readerIdFn, scheduleViewFn, onReauthorizeFn;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    element = document.createElement('script');
-    element.setAttribute('id', 'amp-access');
-    element.setAttribute('type', 'application/json');
-    document.body.appendChild(element);
-    document.documentElement.classList.remove('amp-access-error');
-  });
-
-  afterEach(() => {
-    toggleExperiment(win, 'amp-access-server', false);
-    toggleExperiment(win, 'amp-access-iframe', false);
-  });
-
-  function expectSourceType(ampdoc, config, type, adapter) {
-    const source = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, element);
-    expect(source.type_).to.equal(type);
-    expect(source.adapter_).to.be.instanceOf(adapter);
-  }
+    afterEach(() => {
+      toggleExperiment(win, 'amp-access-server', false);
+      toggleExperiment(win, 'amp-access-iframe', false);
+    });
 
-  it('should parse multiple login URLs', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': {
+    function expectSourceType(ampdoc, config, type, adapter) {
+      const source = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        element
+      );
+      expect(source.type_).to.equal(type);
+      expect(source.adapter_).to.be.instanceOf(adapter);
+    }
+
+    it('should parse multiple login URLs', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': {
+          'login1': 'https://acme.com/l1',
+          'login2': 'https://acme.com/l2',
+        },
+      };
+
+      const service = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        element
+      );
+      expect(service.loginConfig_).to.deep.equal({
         'login1': 'https://acme.com/l1',
         'login2': 'https://acme.com/l2',
-      },
-    };
-
-    const service = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, element);
-    expect(service.loginConfig_).to.deep.equal({
-      'login1': 'https://acme.com/l1',
-      'login2': 'https://acme.com/l2',
+      });
     });
-  });
-
-  it('should parse type', () => {
-    let config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-      'iframeSrc': 'https://acme.com/i',
-      'defaultResponse': {},
-    };
-    expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-
-    config['type'] = 'client';
-    expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-
-    allowConsoleError(() => {
-      config['type'] = 'iframe';
+
+    it('should parse type', () => {
+      let config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+        'iframeSrc': 'https://acme.com/i',
+        'defaultResponse': {},
+      };
+      expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
+
+      config['type'] = 'client';
+      expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
+
+      allowConsoleError(() => {
+        config['type'] = 'iframe';
+        expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
+        toggleExperiment(win, 'amp-access-iframe', true);
+        expectSourceType(ampdoc, config, 'iframe', AccessIframeAdapter);
+      });
+
+      config['type'] = 'server';
+      expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
+
+      config['type'] = 'server';
+      toggleExperiment(win, 'amp-access-server', true);
+      expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
+
+      // When the 'amp-access-server' experiment is enabled, documents with
+      // access type 'client' are also treated as 'server'.
+      config['type'] = 'client';
+      toggleExperiment(win, 'amp-access-server', true);
+      expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
+
+      config['type'] = 'other';
+      expectSourceType(ampdoc, config, 'other', AccessOtherAdapter);
+
+      config = {};
+      config['type'] = 'vendor';
+      config['vendor'] = 'vendor1';
+      expectSourceType(ampdoc, config, 'vendor', AccessVendorAdapter);
+
+      delete config['type'];
+      config['vendor'] = 'vendor1';
+      expectSourceType(ampdoc, config, 'vendor', AccessVendorAdapter);
+    });
+
+    it('should return adapter config', () => {
+      const config = {
+        type: 'vendor',
+        vendor: 'vendor1',
+      };
+      const source = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        element
+      );
+      sandbox.stub(source.adapter_, 'getConfig');
+      source.getAdapterConfig();
+      expect(source.adapter_.getConfig.called).to.be.true;
+    });
+
+    it('should parse type for JWT w/o experiment', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+        'jwt': true,
+      };
+      toggleExperiment(win, 'amp-access-jwt', false);
+
+      expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
+
+      config['type'] = 'client';
       expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-      toggleExperiment(win, 'amp-access-iframe', true);
-      expectSourceType(ampdoc, config, 'iframe', AccessIframeAdapter);
+
+      config['type'] = 'server';
+      toggleExperiment(win, 'amp-access-server', true);
+      expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
+    });
+
+    it('should parse type for JWT with experiment', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+        'jwt': true,
+        'publicKeyUrl': 'https://acme.com/pk',
+      };
+      toggleExperiment(win, 'amp-access-jwt', true);
+
+      expectSourceType(ampdoc, config, 'client', AccessServerJwtAdapter);
+
+      config['type'] = 'client';
+      expectSourceType(ampdoc, config, 'client', AccessServerJwtAdapter);
+
+      config['type'] = 'server';
+      toggleExperiment(win, 'amp-access-server', true);
+      expectSourceType(ampdoc, config, 'server', AccessServerJwtAdapter);
+    });
+
+    it('should initialize authorization fallback response', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+        'authorizationFallbackResponse': {'error': true},
+      };
+      const service = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        element
+      );
+      expect(service.authorizationFallbackResponse_).to.deep.equal({
+        'error': true,
+      });
     });
 
-    config['type'] = 'server';
-    expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-
-    config['type'] = 'server';
-    toggleExperiment(win, 'amp-access-server', true);
-    expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
-
-    // When the 'amp-access-server' experiment is enabled, documents with
-    // access type 'client' are also treated as 'server'.
-    config['type'] = 'client';
-    toggleExperiment(win, 'amp-access-server', true);
-    expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
-
-    config['type'] = 'other';
-    expectSourceType(ampdoc, config, 'other', AccessOtherAdapter);
-
-    config = {};
-    config['type'] = 'vendor';
-    config['vendor'] = 'vendor1';
-    expectSourceType(ampdoc, config, 'vendor', AccessVendorAdapter);
-
-    delete config['type'];
-    config['vendor'] = 'vendor1';
-    expectSourceType(ampdoc, config, 'vendor', AccessVendorAdapter);
-  });
-
-  it('should return adapter config', () => {
-    const config = {
-      type: 'vendor',
-      vendor: 'vendor1',
-    };
-    const source = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, element);
-    sandbox.stub(source.adapter_, 'getConfig');
-    source.getAdapterConfig();
-    expect(source.adapter_.getConfig.called).to.be.true;
-  });
-
-  it('should parse type for JWT w/o experiment', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-      'jwt': true,
-    };
-    toggleExperiment(win, 'amp-access-jwt', false);
-
-    expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-
-    config['type'] = 'client';
-    expectSourceType(ampdoc, config, 'client', AccessClientAdapter);
-
-    config['type'] = 'server';
-    toggleExperiment(win, 'amp-access-server', true);
-    expectSourceType(ampdoc, config, 'server', AccessServerAdapter);
-  });
-
-  it('should parse type for JWT with experiment', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-      'jwt': true,
-      'publicKeyUrl': 'https://acme.com/pk',
-    };
-    toggleExperiment(win, 'amp-access-jwt', true);
-
-    expectSourceType(ampdoc, config, 'client', AccessServerJwtAdapter);
-
-    config['type'] = 'client';
-    expectSourceType(ampdoc, config, 'client', AccessServerJwtAdapter);
-
-    config['type'] = 'server';
-    toggleExperiment(win, 'amp-access-server', true);
-    expectSourceType(ampdoc, config, 'server', AccessServerJwtAdapter);
-  });
-
-  it('should initialize authorization fallback response', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-      'authorizationFallbackResponse': {'error': true},
-    };
-    const service = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, element);
-    expect(service.authorizationFallbackResponse_).to.deep.equal(
-        {'error': true});
-  });
-
-  it('should login with url only', () => {
-    const config = {
-      type: 'vendor',
-      vendor: 'vendor1',
-    };
-    const source = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, element);
-    const sourceMock = sandbox.mock(source);
-    sourceMock.expects('login_')
+    it('should login with url only', () => {
+      const config = {
+        type: 'vendor',
+        vendor: 'vendor1',
+      };
+      const source = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        element
+      );
+      const sourceMock = sandbox.mock(source);
+      sourceMock
+        .expects('login_')
         .withExactArgs('https://url', '')
         .once();
-    source.loginWithUrl('https://url');
-  });
-});
-
-
-describes.fakeWin('AccessSource adapter context', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let clock;
-  let configElement;
-  let source;
-  let context;
-
-  // Undefined initialization params for AccessSource (unused in tests so far).
-  let scheduleViewFn, onReauthorizeFn;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-    clock = sandbox.useFakeTimers();
-    clock.tick(0);
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    const config = {
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-    };
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify(config);
-    document.body.appendChild(configElement);
-
-    const readerIdFn = () => Promise.resolve('reader1');
-    source = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, configElement);
-    context = source.adapter_.context_;
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-  });
+      source.loginWithUrl('https://url');
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessSource adapter context',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let clock;
+    let configElement;
+    let source;
+    let context;
+
+    // Undefined initialization params for AccessSource (unused in tests so far).
+    let scheduleViewFn, onReauthorizeFn;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+      clock = sandbox.useFakeTimers();
+      clock.tick(0);
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      const config = {
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+      };
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify(config);
+      document.body.appendChild(configElement);
+
+      const readerIdFn = () => Promise.resolve('reader1');
+      source = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        configElement
+      );
+      context = source.adapter_.context_;
+    });
+
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+    });
 
-  it('should resolve URL without auth response and no authdata vars', () => {
-    return context.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ false).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
+    it('should resolve URL without auth response and no authdata vars', () => {
+      return context
+        .buildUrl(
+          '?rid=READER_ID&type=AUTHDATA(child.type)',
+          /* useAuthData */ false
+        )
+        .then(url => {
+          expect(url).to.equal('?rid=reader1&type=');
+        });
     });
-  });
 
-  it('should resolve URL without auth response and with authdata vars', () => {
-    return context.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
+    it('should resolve URL without auth response and with authdata vars', () => {
+      return context
+        .buildUrl(
+          '?rid=READER_ID&type=AUTHDATA(child.type)',
+          /* useAuthData */ true
+        )
+        .then(url => {
+          expect(url).to.equal('?rid=reader1&type=');
+        });
     });
-  });
 
-  it('should resolve URL with auth response and no authdata vars', () => {
-    source.setAuthResponse_({child: {type: 'premium'}});
-    return context.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ false).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
+    it('should resolve URL with auth response and no authdata vars', () => {
+      source.setAuthResponse_({child: {type: 'premium'}});
+      return context
+        .buildUrl(
+          '?rid=READER_ID&type=AUTHDATA(child.type)',
+          /* useAuthData */ false
+        )
+        .then(url => {
+          expect(url).to.equal('?rid=reader1&type=');
+        });
     });
-  });
 
-  it('should resolve URL with auth response and with authdata vars', () => {
-    source.setAuthResponse_({child: {type: 'premium'}});
-    return context.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=premium');
+    it('should resolve URL with auth response and with authdata vars', () => {
+      source.setAuthResponse_({child: {type: 'premium'}});
+      return context
+        .buildUrl(
+          '?rid=READER_ID&type=AUTHDATA(child.type)',
+          /* useAuthData */ true
+        )
+        .then(url => {
+          expect(url).to.equal('?rid=reader1&type=premium');
+        });
     });
-  });
 
-  it('should resolve URL with unknown authdata var', () => {
-    source.setAuthResponse_({child: {type: 'premium'}});
-    return context.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type2)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
+    it('should resolve URL with unknown authdata var', () => {
+      source.setAuthResponse_({child: {type: 'premium'}});
+      return context
+        .buildUrl(
+          '?rid=READER_ID&type=AUTHDATA(child.type2)',
+          /* useAuthData */ true
+        )
+        .then(url => {
+          expect(url).to.equal('?rid=reader1&type=');
+        });
     });
-  });
-
-  it('should return adapter config', () => {
-    sandbox.stub(source.adapter_, 'getConfig');
-    source.getAdapterConfig();
-    expect(source.adapter_.getConfig.called).to.be.true;
-  });
-});
-
-
-describes.fakeWin('AccessSource authorization', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, ampdoc;
-  let clock;
-  let adapterMock;
-  let source;
-
-  // Undefined initialization params for AccessSource (unused in tests so far).
-  let scheduleViewFn, onReauthorizeFn;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    clock = sandbox.useFakeTimers();
-    clock.tick(0);
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    const config = {
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    };
-    const readerIdFn = () => Promise.resolve('reader1');
-    source = new AccessSource(ampdoc, config, readerIdFn, scheduleViewFn,
-        onReauthorizeFn, win.document.documentElement);
-
-    const adapter = {
-      getConfig: () => {
-      },
-      isAuthorizationEnabled: () => true,
-      isPingbackEnabled: () => true,
-      authorize: () => {
-      },
-    };
-    source.adapter_ = adapter;
-    adapterMock = sandbox.mock(adapter);
-  });
-
-  afterEach(() => {
-    adapterMock.verify();
-  });
-
-  it('should resolve first-authorization promise after response', () => {
-    adapterMock.expects('authorize')
+
+    it('should return adapter config', () => {
+      sandbox.stub(source.adapter_, 'getConfig');
+      source.getAdapterConfig();
+      expect(source.adapter_.getConfig.called).to.be.true;
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessSource authorization',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, ampdoc;
+    let clock;
+    let adapterMock;
+    let source;
+
+    // Undefined initialization params for AccessSource (unused in tests so far).
+    let scheduleViewFn, onReauthorizeFn;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      clock = sandbox.useFakeTimers();
+      clock.tick(0);
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      const config = {
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
+      };
+      const readerIdFn = () => Promise.resolve('reader1');
+      source = new AccessSource(
+        ampdoc,
+        config,
+        readerIdFn,
+        scheduleViewFn,
+        onReauthorizeFn,
+        win.document.documentElement
+      );
+
+      const adapter = {
+        getConfig: () => {},
+        isAuthorizationEnabled: () => true,
+        isPingbackEnabled: () => true,
+        authorize: () => {},
+      };
+      source.adapter_ = adapter;
+      adapterMock = sandbox.mock(adapter);
+    });
+
+    afterEach(() => {
+      adapterMock.verify();
+    });
+
+    it('should resolve first-authorization promise after response', () => {
+      adapterMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
-    return source.runAuthorization().then(() => {
-      return source.whenFirstAuthorized();
+      return source.runAuthorization().then(() => {
+        return source.whenFirstAuthorized();
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-access/0.1/test/test-amp-access-vendor.js b/extensions/amp-access/0.1/test/test-amp-access-vendor.js
index ec24114183fd..9ab198f7d7f6 100644
--- a/extensions/amp-access/0.1/test/test-amp-access-vendor.js
+++ b/extensions/amp-access/0.1/test/test-amp-access-vendor.js
@@ -17,7 +17,6 @@
 import {AccessVendor} from '../access-vendor';
 import {AccessVendorAdapter} from '../amp-access-vendor';
 
-
 describes.realWin('AccessVendorAdapter', {amp: true}, env => {
   let ampdoc;
   let validConfig;
@@ -45,9 +44,11 @@ describes.realWin('AccessVendorAdapter', {amp: true}, env => {
 
     it('should require vendor name', () => {
       delete validConfig['vendor'];
-      allowConsoleError(() => { expect(() => {
-        new AccessVendorAdapter(ampdoc, validConfig);
-      }).to.throw(/"vendor" name must be specified/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessVendorAdapter(ampdoc, validConfig);
+        }).to.throw(/"vendor" name must be specified/);
+      });
     });
 
     it('should wait on registration', () => {
@@ -65,9 +66,11 @@ describes.realWin('AccessVendorAdapter', {amp: true}, env => {
       const adapter = new AccessVendorAdapter(ampdoc, validConfig);
       expect(adapter.vendorResolve_).to.exist;
       adapter.registerVendor('vendor1', {});
-      allowConsoleError(() => { expect(() => {
-        adapter.registerVendor('vendor2', {});
-      }).to.throw(/Vendor has already been registered/); });
+      allowConsoleError(() => {
+        expect(() => {
+          adapter.registerVendor('vendor2', {});
+        }).to.throw(/Vendor has already been registered/);
+      });
     });
   });
 
@@ -89,10 +92,11 @@ describes.realWin('AccessVendorAdapter', {amp: true}, env => {
 
     describe('authorize', () => {
       it('should call vendor authorization', () => {
-        vendorMock.expects('authorize')
-            .withExactArgs()
-            .returns(Promise.resolve({access: 'A'}))
-            .once();
+        vendorMock
+          .expects('authorize')
+          .withExactArgs()
+          .returns(Promise.resolve({access: 'A'}))
+          .once();
         return adapter.authorize().then(response => {
           expect(response).to.exist;
           expect(response.access).to.equal('A');
@@ -100,37 +104,46 @@ describes.realWin('AccessVendorAdapter', {amp: true}, env => {
       });
 
       it('should fail when vendor fails', () => {
-        vendorMock.expects('authorize')
-            .withExactArgs()
-            .returns(Promise.reject('intentional'))
-            .once();
-        return adapter.authorize().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
-        });
+        vendorMock
+          .expects('authorize')
+          .withExactArgs()
+          .returns(Promise.reject('intentional'))
+          .once();
+        return adapter.authorize().then(
+          () => {
+            throw new Error('must never happen');
+          },
+          error => {
+            expect(error).to.match(/intentional/);
+          }
+        );
       });
     });
 
     describe('pingback', () => {
       it('should send pingback signal', () => {
-        vendorMock.expects('pingback')
-            .withExactArgs()
-            .returns(Promise.resolve())
-            .once();
+        vendorMock
+          .expects('pingback')
+          .withExactArgs()
+          .returns(Promise.resolve())
+          .once();
         return adapter.pingback();
       });
 
       it('should fail when vendor fails', () => {
-        vendorMock.expects('pingback')
-            .withExactArgs()
-            .returns(Promise.reject('intentional'))
-            .once();
-        return adapter.pingback().then(() => {
-          throw new Error('must never happen');
-        }, error => {
-          expect(error).to.match(/intentional/);
-        });
+        vendorMock
+          .expects('pingback')
+          .withExactArgs()
+          .returns(Promise.reject('intentional'))
+          .once();
+        return adapter.pingback().then(
+          () => {
+            throw new Error('must never happen');
+          },
+          error => {
+            expect(error).to.match(/intentional/);
+          }
+        );
       });
     });
   });
diff --git a/extensions/amp-access/0.1/test/test-amp-access.js b/extensions/amp-access/0.1/test/test-amp-access.js
index e09bde6e8adf..07368414f6f5 100644
--- a/extensions/amp-access/0.1/test/test-amp-access.js
+++ b/extensions/amp-access/0.1/test/test-amp-access.js
@@ -19,1707 +19,1899 @@ import {AccessService} from '../amp-access';
 import {AmpEvents} from '../../../../src/amp-events';
 import {Observable} from '../../../../src/observable';
 import {Services} from '../../../../src/services';
-import {cidServiceForDocForTesting} from
-  '../../../../src/service/cid-impl';
-import {installPerformanceService} from
-  '../../../../src/service/performance-impl';
+import {cidServiceForDocForTesting} from '../../../../src/service/cid-impl';
+import {installPerformanceService} from '../../../../src/service/performance-impl';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.fakeWin('AccessService', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document;
-  let ampdoc;
-  let element;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    element = document.createElement('script');
-    element.setAttribute('id', 'amp-access');
-    element.setAttribute('type', 'application/json');
-    document.body.appendChild(element);
-    document.documentElement.classList.remove('amp-access-error');
-  });
-
-  afterEach(() => {
-    toggleExperiment(win, 'amp-access-server', false);
-  });
-
-  it('should disable service when no config', () => {
-    document.body.removeChild(element);
-    const service = new AccessService(ampdoc);
-    expect(service.isEnabled()).to.be.false;
-    expect(service.accessElement_).to.be.undefined;
-  });
-
-  it('should fail if config is malformed', () => {
-    expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(Error);
-  });
-
-  it('should default to "client" and fail if authorization is missing', () => {
-    const config = {};
-    element.textContent = JSON.stringify(config);
-    allowConsoleError(() => { expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(/"authorization" URL must be specified/); });
-  });
-
-  it('should fail if config login is malformed', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'http://acme.com/l',
-    };
-    element.textContent = JSON.stringify(config);
-    allowConsoleError(() => { expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(/https\:/); });
-  });
-
-  it('should parse the complete config', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AccessService(ampdoc);
-    expect(service.isEnabled()).to.be.true;
-    expect(service.accessElement_).to.equal(element);
-    const source = service.sources_[0];
-    expect(source.type_).to.equal('client');
-    expect(source.loginConfig_).to.deep.equal({'': 'https://acme.com/l'});
-    expect(source.adapter_).to.be.instanceOf(AccessClientAdapter);
-    expect(source.adapter_.authorizationUrl_).to.equal('https://acme.com/a');
-  });
-
-  it('should fail if type is unknown', () => {
-    const config = {
-      'type': 'unknown',
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    };
-    element.textContent = JSON.stringify(config);
-    allowConsoleError(() => { expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(/Unknown access type/); });
-  });
-
-  it('should start when enabled', () => {
-    element.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    });
-    const service = new AccessService(ampdoc);
-    service.startInternal_ = sandbox.spy();
-    service.start_();
-    expect(service.startInternal_).to.be.calledOnce;
-  });
-
-  it('should start all services', () => {
-    element.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    });
-    const service = new AccessService(ampdoc);
-    service.sources_[0].buildLoginUrls_ = sandbox.spy();
-    service.runAuthorization_ = sandbox.spy();
-    service.scheduleView_ = sandbox.spy();
-    service.listenToBroadcasts_ = sandbox.spy();
-
-    service.startInternal_();
-    expect(service.sources_[0].buildLoginUrls_).to.be.calledOnce;
-    expect(service.runAuthorization_).to.be.calledOnce;
-    expect(service.scheduleView_).to.be.calledOnce;
-    expect(service.scheduleView_.firstCall.args[0]).to.equal(2000);
-    expect(service.listenToBroadcasts_).to.be.calledOnce;
-  });
-
-  it('should initialize publisher origin', () => {
-    element.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    });
-    const service = new AccessService(ampdoc);
-    expect(service.pubOrigin_).to.exist;
-    expect(service.pubOrigin_).to.match(/^http.*/);
-  });
-
-  it('should find and register vendor', () => {
-    const config = {
-      'vendor': 'vendor1',
-    };
-    element.textContent = JSON.stringify(config);
-    const accessService = new AccessService(ampdoc);
-    const source = accessService.getVendorSource('vendor1');
-    expect(source).to.equal(accessService.sources_[0]);
-
-    class Vendor1 {}
-    const vendor1 = new Vendor1();
-    source.getAdapter().registerVendor(vendor1);
-    return source.adapter_.vendorPromise_.then(vendor => {
-      expect(vendor).to.equal(vendor1);
-    });
-  });
-
-  it('should fail to find non-existent vendor', () => {
-    const config = {
-      'authorization': 'https://acme.com/a',
-      'pingback': 'https://acme.com/p',
-      'login': 'https://acme.com/l',
-    };
-    element.textContent = JSON.stringify(config);
-    const accessService = new AccessService(ampdoc);
-    allowConsoleError(() => { expect(() => {
-      accessService.getVendorSource('vendor1');
-    }).to.throw(/can only be used for "type=vendor"/); });
-  });
-
-  it('should parse multiple sources', () => {
-    const config = [
-      {
+describes.fakeWin(
+  'AccessService',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document;
+    let ampdoc;
+    let element;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      element = document.createElement('script');
+      element.setAttribute('id', 'amp-access');
+      element.setAttribute('type', 'application/json');
+      document.body.appendChild(element);
+      document.documentElement.classList.remove('amp-access-error');
+    });
+
+    afterEach(() => {
+      toggleExperiment(win, 'amp-access-server', false);
+    });
+
+    it('should disable service when no config', () => {
+      document.body.removeChild(element);
+      const service = new AccessService(ampdoc);
+      expect(service.isEnabled()).to.be.false;
+      expect(service.accessElement_).to.be.undefined;
+    });
+
+    it('should fail if config is malformed', () => {
+      expect(() => {
+        new AccessService(ampdoc);
+      }).to.throw(Error);
+    });
+
+    it('should default to "client" and fail if authorization is missing', () => {
+      const config = {};
+      element.textContent = JSON.stringify(config);
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessService(ampdoc);
+        }).to.throw(/"authorization" URL must be specified/);
+      });
+    });
+
+    it('should fail if config login is malformed', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'http://acme.com/l',
+      };
+      element.textContent = JSON.stringify(config);
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessService(ampdoc);
+        }).to.throw(/https\:/);
+      });
+    });
+
+    it('should parse the complete config', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+      };
+      element.textContent = JSON.stringify(config);
+      const service = new AccessService(ampdoc);
+      expect(service.isEnabled()).to.be.true;
+      expect(service.accessElement_).to.equal(element);
+      const source = service.sources_[0];
+      expect(source.type_).to.equal('client');
+      expect(source.loginConfig_).to.deep.equal({'': 'https://acme.com/l'});
+      expect(source.adapter_).to.be.instanceOf(AccessClientAdapter);
+      expect(source.adapter_.authorizationUrl_).to.equal('https://acme.com/a');
+    });
+
+    it('should fail if type is unknown', () => {
+      const config = {
+        'type': 'unknown',
         'authorization': 'https://acme.com/a',
         'pingback': 'https://acme.com/p',
         'login': 'https://acme.com/l',
-        'namespace': 'donuts',
-      },
-      {
-        'authorization': 'https://beta.com/a',
-        'pingback': 'https://beta.com/p',
-        'login': 'https://beta.com/l',
-        'namespace': 'beer',
-      },
-    ];
-    element.textContent = JSON.stringify(config);
-    const accessService = new AccessService(ampdoc);
-    expect(accessService.sources_.length).to.equal(2);
-    expect(accessService.sources_[0].getNamespace()).to.equal('donuts');
-    expect(accessService.sources_[1].getNamespace()).to.equal('beer');
-  });
-
-  it('should reject invalid multiple sources', () => {
-    const config = [
-      {
+      };
+      element.textContent = JSON.stringify(config);
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessService(ampdoc);
+        }).to.throw(/Unknown access type/);
+      });
+    });
+
+    it('should start when enabled', () => {
+      element.textContent = JSON.stringify({
         'authorization': 'https://acme.com/a',
         'pingback': 'https://acme.com/p',
         'login': 'https://acme.com/l',
-        'namespace': 'beer',
-      },
-      {
-        'authorization': 'https://beta.com/a',
-        'pingback': 'https://beta.com/p',
-        'login': 'https://beta.com/l',
-        'namespace': 'beer',
-      },
-    ];
-    element.textContent = JSON.stringify(config);
-    allowConsoleError(() => { expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(/Namespace already used/); });
-
-    delete (config[0].namespace);
-    element.textContent = JSON.stringify(config);
-    allowConsoleError(() => { expect(() => {
-      new AccessService(ampdoc);
-    }).to.throw(/Namespace required/); });
-  });
-});
-
-
-describes.fakeWin('AccessService authorization', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let clock;
-  let configElement, elementOn, elementOff, elementError;
-  let cidMock;
-  let adapterMock;
-  let performanceMock;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-    clock = sandbox.useFakeTimers();
-    clock.tick(0);
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    elementOn = document.createElement('div');
-    elementOn.setAttribute('amp-access', 'access');
-    document.body.appendChild(elementOn);
-
-    elementOff = document.createElement('div');
-    elementOff.setAttribute('amp-access', 'NOT access');
-    document.body.appendChild(elementOff);
-
-    elementError = document.createElement('div');
-    elementError.setAttribute('amp-access', 'error');
-    elementError.setAttribute('amp-access-hide', '');
-    document.body.appendChild(elementError);
-
-    service = new AccessService(ampdoc);
-    service.viewer_ = {
-      isVisible: () => true,
-      whenFirstVisible: () => Promise.resolve(),
-      onVisibilityChanged: () => {},
-      broadcast: () => {},
-      onBroadcast: () => {},
-    };
-
-    const adapter = {
-      getConfig: () => {},
-      isAuthorizationEnabled: () => true,
-      isPingbackEnabled: () => true,
-      authorize: () => {},
-    };
-    service.sources_[0].adapter_ = adapter;
-    adapterMock = sandbox.mock(adapter);
-
-    sandbox.stub(service.resources_, 'mutateElement').callsFake(
-        (unusedElement, mutator) => {
+      });
+      const service = new AccessService(ampdoc);
+      service.startInternal_ = sandbox.spy();
+      service.start_();
+      expect(service.startInternal_).to.be.calledOnce;
+    });
+
+    it('should start all services', () => {
+      element.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+      });
+      const service = new AccessService(ampdoc);
+      service.sources_[0].buildLoginUrls_ = sandbox.spy();
+      service.runAuthorization_ = sandbox.spy();
+      service.scheduleView_ = sandbox.spy();
+      service.listenToBroadcasts_ = sandbox.spy();
+
+      service.startInternal_();
+      expect(service.sources_[0].buildLoginUrls_).to.be.calledOnce;
+      expect(service.runAuthorization_).to.be.calledOnce;
+      expect(service.scheduleView_).to.be.calledOnce;
+      expect(service.scheduleView_.firstCall.args[0]).to.equal(2000);
+      expect(service.listenToBroadcasts_).to.be.calledOnce;
+    });
+
+    it('should initialize publisher origin', () => {
+      element.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+      });
+      const service = new AccessService(ampdoc);
+      expect(service.pubOrigin_).to.exist;
+      expect(service.pubOrigin_).to.match(/^http.*/);
+    });
+
+    it('should find and register vendor', () => {
+      const config = {
+        'vendor': 'vendor1',
+      };
+      element.textContent = JSON.stringify(config);
+      const accessService = new AccessService(ampdoc);
+      const source = accessService.getVendorSource('vendor1');
+      expect(source).to.equal(accessService.sources_[0]);
+
+      class Vendor1 {}
+      const vendor1 = new Vendor1();
+      source.getAdapter().registerVendor(vendor1);
+      return source.adapter_.vendorPromise_.then(vendor => {
+        expect(vendor).to.equal(vendor1);
+      });
+    });
+
+    it('should fail to find non-existent vendor', () => {
+      const config = {
+        'authorization': 'https://acme.com/a',
+        'pingback': 'https://acme.com/p',
+        'login': 'https://acme.com/l',
+      };
+      element.textContent = JSON.stringify(config);
+      const accessService = new AccessService(ampdoc);
+      allowConsoleError(() => {
+        expect(() => {
+          accessService.getVendorSource('vendor1');
+        }).to.throw(/can only be used for "type=vendor"/);
+      });
+    });
+
+    it('should parse multiple sources', () => {
+      const config = [
+        {
+          'authorization': 'https://acme.com/a',
+          'pingback': 'https://acme.com/p',
+          'login': 'https://acme.com/l',
+          'namespace': 'donuts',
+        },
+        {
+          'authorization': 'https://beta.com/a',
+          'pingback': 'https://beta.com/p',
+          'login': 'https://beta.com/l',
+          'namespace': 'beer',
+        },
+      ];
+      element.textContent = JSON.stringify(config);
+      const accessService = new AccessService(ampdoc);
+      expect(accessService.sources_.length).to.equal(2);
+      expect(accessService.sources_[0].getNamespace()).to.equal('donuts');
+      expect(accessService.sources_[1].getNamespace()).to.equal('beer');
+    });
+
+    it('should reject invalid multiple sources', () => {
+      const config = [
+        {
+          'authorization': 'https://acme.com/a',
+          'pingback': 'https://acme.com/p',
+          'login': 'https://acme.com/l',
+          'namespace': 'beer',
+        },
+        {
+          'authorization': 'https://beta.com/a',
+          'pingback': 'https://beta.com/p',
+          'login': 'https://beta.com/l',
+          'namespace': 'beer',
+        },
+      ];
+      element.textContent = JSON.stringify(config);
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessService(ampdoc);
+        }).to.throw(/Namespace already used/);
+      });
+
+      delete config[0].namespace;
+      element.textContent = JSON.stringify(config);
+      allowConsoleError(() => {
+        expect(() => {
+          new AccessService(ampdoc);
+        }).to.throw(/Namespace required/);
+      });
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService authorization',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let clock;
+    let configElement, elementOn, elementOff, elementError;
+    let cidMock;
+    let adapterMock;
+    let performanceMock;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+      clock = sandbox.useFakeTimers();
+      clock.tick(0);
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
+      });
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      elementOn = document.createElement('div');
+      elementOn.setAttribute('amp-access', 'access');
+      document.body.appendChild(elementOn);
+
+      elementOff = document.createElement('div');
+      elementOff.setAttribute('amp-access', 'NOT access');
+      document.body.appendChild(elementOff);
+
+      elementError = document.createElement('div');
+      elementError.setAttribute('amp-access', 'error');
+      elementError.setAttribute('amp-access-hide', '');
+      document.body.appendChild(elementError);
+
+      service = new AccessService(ampdoc);
+      service.viewer_ = {
+        isVisible: () => true,
+        whenFirstVisible: () => Promise.resolve(),
+        onVisibilityChanged: () => {},
+        broadcast: () => {},
+        onBroadcast: () => {},
+      };
+
+      const adapter = {
+        getConfig: () => {},
+        isAuthorizationEnabled: () => true,
+        isPingbackEnabled: () => true,
+        authorize: () => {},
+      };
+      service.sources_[0].adapter_ = adapter;
+      adapterMock = sandbox.mock(adapter);
+
+      sandbox
+        .stub(service.resources_, 'mutateElement')
+        .callsFake((unusedElement, mutator) => {
           mutator();
           return Promise.resolve();
         });
-    service.vsync_ = {
-      mutate: callback => {
-        callback();
-      },
-      mutatePromise: callback => {
-        callback();
-        return Promise.resolve();
-      },
-    };
-    const cid = {
-      get: () => {},
-    };
-    cidMock = sandbox.mock(cid);
-    service.cid_ = Promise.resolve(cid);
-
-    service.analyticsEvent_ = sandbox.spy();
-    service.sources_[0].analyticsEvent_ = sandbox.spy();
-    performanceMock = sandbox.mock(service.performance_);
-    performanceMock.expects('onload_').atLeast(0);
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-    if (elementOn.parentElement) {
-      elementOn.parentElement.removeChild(elementOn);
-    }
-    if (elementOff.parentElement) {
-      elementOff.parentElement.removeChild(elementOff);
-    }
-    if (elementError.parentElement) {
-      elementError.parentElement.removeChild(elementError);
-    }
-    adapterMock.verify();
-    performanceMock.verify();
-  });
+      service.vsync_ = {
+        mutate: callback => {
+          callback();
+        },
+        mutatePromise: callback => {
+          callback();
+          return Promise.resolve();
+        },
+      };
+      const cid = {
+        get: () => {},
+      };
+      cidMock = sandbox.mock(cid);
+      service.cid_ = Promise.resolve(cid);
+
+      service.analyticsEvent_ = sandbox.spy();
+      service.sources_[0].analyticsEvent_ = sandbox.spy();
+      performanceMock = sandbox.mock(service.performance_);
+      performanceMock.expects('onload_').atLeast(0);
+    });
+
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+      if (elementOn.parentElement) {
+        elementOn.parentElement.removeChild(elementOn);
+      }
+      if (elementOff.parentElement) {
+        elementOff.parentElement.removeChild(elementOff);
+      }
+      if (elementError.parentElement) {
+        elementError.parentElement.removeChild(elementError);
+      }
+      adapterMock.verify();
+      performanceMock.verify();
+    });
 
-  function expectGetReaderId(result) {
-    cidMock.expects('get')
+    function expectGetReaderId(result) {
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve(result))
         .once();
-  }
+    }
 
-  it('should short-circuit authorization flow when disabled', () => {
-    adapterMock.expects('isAuthorizationEnabled')
+    it('should short-circuit authorization flow when disabled', () => {
+      adapterMock
+        .expects('isAuthorizationEnabled')
         .withExactArgs()
         .returns(false)
         .once();
-    adapterMock.expects('authorize').never();
-    cidMock.expects('get').never();
-    const promise = service.runAuthorization_();
-    expect(document.documentElement).to.have.class('amp-access-loading');
-    expect(document.documentElement).not.to.have.class('amp-access-error');
-    return promise.then(() => {
-      expect(document.documentElement).not.to.have.class('amp-access-loading');
+      adapterMock.expects('authorize').never();
+      cidMock.expects('get').never();
+      const promise = service.runAuthorization_();
+      expect(document.documentElement).to.have.class('amp-access-loading');
       expect(document.documentElement).not.to.have.class('amp-access-error');
-      return service.lastAuthorizationPromises_;
-    }).then(() => {
-      expect(service.sources_[0].authResponse_).to.be.null;
+      return promise
+        .then(() => {
+          expect(document.documentElement).not.to.have.class(
+            'amp-access-loading'
+          );
+          expect(document.documentElement).not.to.have.class(
+            'amp-access-error'
+          );
+          return service.lastAuthorizationPromises_;
+        })
+        .then(() => {
+          expect(service.sources_[0].authResponse_).to.be.null;
+        });
     });
-  });
 
-  it('should run authorization flow', () => {
-    const source = service.sources_[0];
-    adapterMock.expects('authorize')
+    it('should run authorization flow', () => {
+      const source = service.sources_[0];
+      adapterMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
-    expectGetReaderId('reader1');
-    source.buildLoginUrls_ = sandbox.spy();
-    const firstPromise = service.lastAuthorizationPromises_;
-    const promise = service.runAuthorization_();
-    expect(firstPromise).not.to.equal(promise);
-    const lastPromise = service.lastAuthorizationPromises_;
-    expect(lastPromise).to.equal(promise);
-    expect(document.documentElement).to.have.class('amp-access-loading');
-    expect(document.documentElement).not.to.have.class('amp-access-error');
-    expect(source.buildLoginUrls_).to.have.not.been.called;
-    return promise.then(() => {
-      expect(document.documentElement).not.to.have.class('amp-access-loading');
+      expectGetReaderId('reader1');
+      source.buildLoginUrls_ = sandbox.spy();
+      const firstPromise = service.lastAuthorizationPromises_;
+      const promise = service.runAuthorization_();
+      expect(firstPromise).not.to.equal(promise);
+      const lastPromise = service.lastAuthorizationPromises_;
+      expect(lastPromise).to.equal(promise);
+      expect(document.documentElement).to.have.class('amp-access-loading');
       expect(document.documentElement).not.to.have.class('amp-access-error');
-      expect(elementOn).not.to.have.attribute('amp-access-hide');
-      expect(elementOff).to.have.attribute('amp-access-hide');
-      expect(source.authResponse_).to.exist;
-      expect(source.authResponse_.access).to.be.true;
-      expect(source.buildLoginUrls_).to.be.calledOnce;
-      // Last authorization promise stays unchanged.
-      expect(service.lastAuthorizationPromises_).to.equal(lastPromise);
+      expect(source.buildLoginUrls_).to.have.not.been.called;
+      return promise.then(() => {
+        expect(document.documentElement).not.to.have.class(
+          'amp-access-loading'
+        );
+        expect(document.documentElement).not.to.have.class('amp-access-error');
+        expect(elementOn).not.to.have.attribute('amp-access-hide');
+        expect(elementOff).to.have.attribute('amp-access-hide');
+        expect(source.authResponse_).to.exist;
+        expect(source.authResponse_.access).to.be.true;
+        expect(source.buildLoginUrls_).to.be.calledOnce;
+        // Last authorization promise stays unchanged.
+        expect(service.lastAuthorizationPromises_).to.equal(lastPromise);
+      });
     });
-  });
 
-  it('should recover from authorization failure', () => {
-    expectGetReaderId('reader1');
-    adapterMock.expects('authorize')
+    it('should recover from authorization failure', () => {
+      expectGetReaderId('reader1');
+      adapterMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.reject('intentional'))
         .once();
-    const promise = service.runAuthorization_();
-    expect(document.documentElement).to.have.class('amp-access-loading');
-    expect(document.documentElement).not.to.have.class('amp-access-error');
-    return promise.then(() => {
-      expect(document.documentElement).not.to.have.class('amp-access-loading');
-      expect(document.documentElement).to.have.class('amp-access-error');
-      expect(elementOn).to.have.attribute('amp-access-hide');
-      expect(elementOff).not.to.have.attribute('amp-access-hide');
+      const promise = service.runAuthorization_();
+      expect(document.documentElement).to.have.class('amp-access-loading');
+      expect(document.documentElement).not.to.have.class('amp-access-error');
+      return promise.then(() => {
+        expect(document.documentElement).not.to.have.class(
+          'amp-access-loading'
+        );
+        expect(document.documentElement).to.have.class('amp-access-error');
+        expect(elementOn).to.have.attribute('amp-access-hide');
+        expect(elementOff).not.to.have.attribute('amp-access-hide');
+      });
     });
-  });
 
-  it('should apply authorization response to new sections', () => {
-    function createElements() {
-      const container = win.document.createElement('div');
-      const elementOff = win.document.createElement('div');
-      elementOff.setAttribute('amp-access', 'NOT access');
-      container.appendChild(elementOff);
-      const elementOn = win.document.createElement('div');
-      elementOn.setAttribute('amp-access', 'access');
-      container.appendChild(elementOn);
-      return {container, elementOn, elementOff};
-    }
-    function dispatchUpdateEvent(target) {
-      const event = win.document.createEvent('Event');
-      event.initEvent(AmpEvents.DOM_UPDATE, true, true);
-      target.dispatchEvent(event);
-    }
-    expectGetReaderId('reader1');
-    adapterMock.expects('authorize')
+    it('should apply authorization response to new sections', () => {
+      function createElements() {
+        const container = win.document.createElement('div');
+        const elementOff = win.document.createElement('div');
+        elementOff.setAttribute('amp-access', 'NOT access');
+        container.appendChild(elementOff);
+        const elementOn = win.document.createElement('div');
+        elementOn.setAttribute('amp-access', 'access');
+        container.appendChild(elementOn);
+        return {container, elementOn, elementOff};
+      }
+      function dispatchUpdateEvent(target) {
+        const event = win.document.createEvent('Event');
+        event.initEvent(AmpEvents.DOM_UPDATE, true, true);
+        target.dispatchEvent(event);
+      }
+      expectGetReaderId('reader1');
+      adapterMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
-    const early = createElements();
-    const later = createElements();
-    // Add "early" elements right away.
-    win.document.body.appendChild(early.container);
-    dispatchUpdateEvent(early.container);
-    expect(early.elementOn).not.to.have.attribute('amp-access-hide');
-    expect(early.elementOff).not.to.have.attribute('amp-access-hide');
-    return service.runAuthorization_().then(() => {
-      // "early" applied by the authorization response.
+      const early = createElements();
+      const later = createElements();
+      // Add "early" elements right away.
+      win.document.body.appendChild(early.container);
+      dispatchUpdateEvent(early.container);
       expect(early.elementOn).not.to.have.attribute('amp-access-hide');
-      expect(early.elementOff).to.have.attribute('amp-access-hide');
-
-      // "later" is not applied yet, not even after event.
-      win.document.body.appendChild(later.container);
-      dispatchUpdateEvent(later.container);
-      expect(later.elementOn).not.to.have.attribute('amp-access-hide');
-      expect(later.elementOff).not.to.have.attribute('amp-access-hide');
-      return service.lastAuthorizationPromises_;
-    }).then(() => {
-      expect(later.elementOn).not.to.have.attribute('amp-access-hide');
-      expect(later.elementOff).to.have.attribute('amp-access-hide');
-    });
-  });
-
-  it('should execute the onApplyAuthorizations registered callbacks', () => {
-    expectGetReaderId('reader1');
-    adapterMock.expects('authorize')
+      expect(early.elementOff).not.to.have.attribute('amp-access-hide');
+      return service
+        .runAuthorization_()
+        .then(() => {
+          // "early" applied by the authorization response.
+          expect(early.elementOn).not.to.have.attribute('amp-access-hide');
+          expect(early.elementOff).to.have.attribute('amp-access-hide');
+
+          // "later" is not applied yet, not even after event.
+          win.document.body.appendChild(later.container);
+          dispatchUpdateEvent(later.container);
+          expect(later.elementOn).not.to.have.attribute('amp-access-hide');
+          expect(later.elementOff).not.to.have.attribute('amp-access-hide');
+          return service.lastAuthorizationPromises_;
+        })
+        .then(() => {
+          expect(later.elementOn).not.to.have.attribute('amp-access-hide');
+          expect(later.elementOff).to.have.attribute('amp-access-hide');
+        });
+    });
+
+    it('should execute the onApplyAuthorizations registered callbacks', () => {
+      expectGetReaderId('reader1');
+      adapterMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
 
-    const applyAuthorizationsStub = sandbox.stub();
-    service.onApplyAuthorizations(applyAuthorizationsStub);
-
-    return service.runAuthorization_().then(() => {
-      expect(applyAuthorizationsStub).to.have.been.calledOnce;
-    });
-  });
-
-  it('should run authorization for broadcast events on same origin', () => {
-    let broadcastHandler;
-    sandbox.stub(service.viewer_, 'onBroadcast').callsFake(handler => {
-      broadcastHandler = handler;
-    });
-    service.runAuthorization_ = sandbox.spy();
-    service.listenToBroadcasts_();
-    expect(broadcastHandler).to.exist;
-
-    // Unknown message.
-    broadcastHandler({});
-    expect(service.runAuthorization_).to.have.not.been.called;
-
-    // Wrong origin.
-    broadcastHandler({type: 'amp-access-reauthorize', origin: 'other'});
-    expect(service.runAuthorization_).to.have.not.been.called;
-
-    // Broadcast with the right origin.
-    broadcastHandler({type: 'amp-access-reauthorize',
-      origin: service.pubOrigin_});
-    expect(service.runAuthorization_).to.be.calledOnce;
-  });
-});
-
-
-describes.fakeWin('AccessService applyAuthorizationToElement_', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let configElement, elementOn, elementOff;
-  let templatesMock;
-  let mutateElementStub;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    elementOn = document.createElement('div');
-    elementOn.setAttribute('amp-access', 'access');
-    document.body.appendChild(elementOn);
-
-    elementOff = document.createElement('div');
-    elementOff.setAttribute('amp-access', 'NOT access');
-    document.body.appendChild(elementOff);
-
-    service = new AccessService(ampdoc);
-
-    mutateElementStub =
-        sandbox.stub(service.resources_, 'mutateElement').callsFake(
-            (unusedElement, mutator) => {
-              mutator();
-              return Promise.resolve();
-            });
-    service.vsync_ = {
-      mutatePromise: callback => {
-        callback();
-        return Promise.resolve();
-      },
-    };
-    templatesMock = sandbox.mock(service.templates_);
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-    if (elementOn.parentElement) {
-      elementOn.parentElement.removeChild(elementOn);
-    }
-    if (elementOff.parentElement) {
-      elementOff.parentElement.removeChild(elementOff);
-    }
-  });
+      const applyAuthorizationsStub = sandbox.stub();
+      service.onApplyAuthorizations(applyAuthorizationsStub);
+
+      return service.runAuthorization_().then(() => {
+        expect(applyAuthorizationsStub).to.have.been.calledOnce;
+      });
+    });
+
+    it('should run authorization for broadcast events on same origin', () => {
+      let broadcastHandler;
+      sandbox.stub(service.viewer_, 'onBroadcast').callsFake(handler => {
+        broadcastHandler = handler;
+      });
+      service.runAuthorization_ = sandbox.spy();
+      service.listenToBroadcasts_();
+      expect(broadcastHandler).to.exist;
+
+      // Unknown message.
+      broadcastHandler({});
+      expect(service.runAuthorization_).to.have.not.been.called;
 
-  function createTemplate() {
-    const template = document.createElement('template');
-    template.setAttribute('amp-access-template', '');
-    return template;
+      // Wrong origin.
+      broadcastHandler({type: 'amp-access-reauthorize', origin: 'other'});
+      expect(service.runAuthorization_).to.have.not.been.called;
+
+      // Broadcast with the right origin.
+      broadcastHandler({
+        type: 'amp-access-reauthorize',
+        origin: service.pubOrigin_,
+      });
+      expect(service.runAuthorization_).to.be.calledOnce;
+    });
   }
+);
+
+describes.fakeWin(
+  'AccessService applyAuthorizationToElement_',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let configElement, elementOn, elementOff;
+    let templatesMock;
+    let mutateElementStub;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
+      });
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      elementOn = document.createElement('div');
+      elementOn.setAttribute('amp-access', 'access');
+      document.body.appendChild(elementOn);
+
+      elementOff = document.createElement('div');
+      elementOff.setAttribute('amp-access', 'NOT access');
+      document.body.appendChild(elementOff);
 
-  it('should toggle authorization attribute', () => {
-    expect(elementOn).not.to.have.attribute('amp-access-hide');
-    expect(elementOff).not.to.have.attribute('amp-access-hide');
-
-    service.applyAuthorizationToElement_(elementOn, {access: true});
-    service.applyAuthorizationToElement_(elementOff, {access: true});
-    expect(elementOn).not.to.have.attribute('amp-access-hide');
-    expect(elementOff).to.have.attribute('amp-access-hide');
-    expect(mutateElementStub).to.be.calledOnce;
-    expect(mutateElementStub.getCall(0).args[0]).to.equal(elementOff);
-
-    service.applyAuthorizationToElement_(elementOn, {access: false});
-    service.applyAuthorizationToElement_(elementOff, {access: false});
-    expect(elementOn).to.have.attribute('amp-access-hide');
-    expect(elementOff).not.to.have.attribute('amp-access-hide');
-    expect(mutateElementStub).to.have.callCount(3);
-    expect(mutateElementStub.getCall(1).args[0]).to.equal(elementOn);
-    expect(mutateElementStub.getCall(2).args[0]).to.equal(elementOff);
-  });
-
-  it('should render and re-render templates when access is on', () => {
-    const template1 = createTemplate();
-    const template2 = createTemplate();
-    elementOn.appendChild(template1);
-    elementOn.appendChild(template2);
-
-    function renderAndCheck() {
+      service = new AccessService(ampdoc);
+
+      mutateElementStub = sandbox
+        .stub(service.resources_, 'mutateElement')
+        .callsFake((unusedElement, mutator) => {
+          mutator();
+          return Promise.resolve();
+        });
+      service.vsync_ = {
+        mutatePromise: callback => {
+          callback();
+          return Promise.resolve();
+        },
+      };
       templatesMock = sandbox.mock(service.templates_);
-      const result1 = document.createElement('div');
-      const result2 = document.createElement('div');
-      templatesMock.expects('renderTemplate')
+    });
+
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+      if (elementOn.parentElement) {
+        elementOn.parentElement.removeChild(elementOn);
+      }
+      if (elementOff.parentElement) {
+        elementOff.parentElement.removeChild(elementOff);
+      }
+    });
+
+    function createTemplate() {
+      const template = document.createElement('template');
+      template.setAttribute('amp-access-template', '');
+      return template;
+    }
+
+    it('should toggle authorization attribute', () => {
+      expect(elementOn).not.to.have.attribute('amp-access-hide');
+      expect(elementOff).not.to.have.attribute('amp-access-hide');
+
+      service.applyAuthorizationToElement_(elementOn, {access: true});
+      service.applyAuthorizationToElement_(elementOff, {access: true});
+      expect(elementOn).not.to.have.attribute('amp-access-hide');
+      expect(elementOff).to.have.attribute('amp-access-hide');
+      expect(mutateElementStub).to.be.calledOnce;
+      expect(mutateElementStub.getCall(0).args[0]).to.equal(elementOff);
+
+      service.applyAuthorizationToElement_(elementOn, {access: false});
+      service.applyAuthorizationToElement_(elementOff, {access: false});
+      expect(elementOn).to.have.attribute('amp-access-hide');
+      expect(elementOff).not.to.have.attribute('amp-access-hide');
+      expect(mutateElementStub).to.have.callCount(3);
+      expect(mutateElementStub.getCall(1).args[0]).to.equal(elementOn);
+      expect(mutateElementStub.getCall(2).args[0]).to.equal(elementOff);
+    });
+
+    it('should render and re-render templates when access is on', () => {
+      const template1 = createTemplate();
+      const template2 = createTemplate();
+      elementOn.appendChild(template1);
+      elementOn.appendChild(template2);
+
+      function renderAndCheck() {
+        templatesMock = sandbox.mock(service.templates_);
+        const result1 = document.createElement('div');
+        const result2 = document.createElement('div');
+        templatesMock
+          .expects('renderTemplate')
           .withExactArgs(template1, {access: true})
           .returns(Promise.resolve(result1))
           .once();
-      templatesMock.expects('renderTemplate')
+        templatesMock
+          .expects('renderTemplate')
           .withExactArgs(template2, {access: true})
           .returns(Promise.resolve(result2))
           .once();
-      const p = service.applyAuthorizationToElement_(elementOn, {access: true});
-      return p.then(() => {
-        expect(elementOn.contains(template1)).to.be.false;
-        expect(elementOn.contains(result1)).to.be.true;
-        expect(result1).to.have.attribute('amp-access-template');
-        expect(result1['__AMP_ACCESS__TEMPLATE']).to.equal(template1);
-
-        expect(elementOn.contains(template2)).to.be.false;
-        expect(elementOn.contains(result2)).to.be.true;
-        expect(result2).to.have.attribute('amp-access-template');
-        expect(result2['__AMP_ACCESS__TEMPLATE']).to.equal(template2);
-
-        expect(elementOn.querySelectorAll('[amp-access-template]').length)
-            .to.equal(2);
-        templatesMock.verify();
+        const p = service.applyAuthorizationToElement_(elementOn, {
+          access: true,
+        });
+        return p.then(() => {
+          expect(elementOn.contains(template1)).to.be.false;
+          expect(elementOn.contains(result1)).to.be.true;
+          expect(result1).to.have.attribute('amp-access-template');
+          expect(result1['__AMP_ACCESS__TEMPLATE']).to.equal(template1);
+
+          expect(elementOn.contains(template2)).to.be.false;
+          expect(elementOn.contains(result2)).to.be.true;
+          expect(result2).to.have.attribute('amp-access-template');
+          expect(result2['__AMP_ACCESS__TEMPLATE']).to.equal(template2);
+
+          expect(
+            elementOn.querySelectorAll('[amp-access-template]').length
+          ).to.equal(2);
+          templatesMock.verify();
+        });
+      }
+
+      return renderAndCheck()
+        .then(() => {
+          // Render second time.
+          return renderAndCheck();
+        })
+        .then(() => {
+          // Render third time.
+          return renderAndCheck();
+        });
+    });
+
+    it('should NOT render templates when access is off', () => {
+      elementOff.appendChild(createTemplate());
+      templatesMock.expects('renderTemplate').never();
+      service.applyAuthorizationToElement_(elementOff, {access: true});
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService pingback',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let clock;
+    let configElement;
+    let adapterMock;
+    let cidMock;
+    let visibilityChanged;
+    let scrolled;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+      clock = sandbox.useFakeTimers();
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback':
+          'https://acme.com/p?rid=READER_ID&type=AUTHDATA(child.type)',
+        'login': 'https://acme.com/l?rid=READER_ID',
       });
-    }
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      service = new AccessService(ampdoc);
+
+      const adapter = {
+        isPingbackEnabled: () => true,
+        pingback: () => Promise.resolve(),
+      };
+      service.sources_[0].adapter_ = adapter;
+      adapterMock = sandbox.mock(adapter);
+
+      const cid = {
+        get: () => {},
+      };
+      cidMock = sandbox.mock(cid);
+      service.cid_ = Promise.resolve(cid);
+
+      service.analyticsEvent_ = sandbox.spy();
+      service.sources_[0].analyticsEvent_ = sandbox.spy();
+      win.docState_ = {
+        onReady: callback => callback(),
+      };
+
+      visibilityChanged = new Observable();
+      service.viewer_ = {
+        isVisible: () => true,
+        whenFirstVisible: () => Promise.resolve(),
+        onVisibilityChanged: callback => visibilityChanged.add(callback),
+        broadcast: () => {},
+      };
+
+      scrolled = new Observable();
+      service.viewport_ = {
+        onScroll: callback => scrolled.add(callback),
+      };
+
+      // Emulate first authorization complete.
+      service.sources_[0].firstAuthorizationResolver_();
+    });
 
-    return renderAndCheck().then(() => {
-      // Render second time.
-      return renderAndCheck();
-    }).then(() => {
-      // Render third time.
-      return renderAndCheck();
-    });
-  });
-
-  it('should NOT render templates when access is off', () => {
-    elementOff.appendChild(createTemplate());
-    templatesMock.expects('renderTemplate').never();
-    service.applyAuthorizationToElement_(elementOff, {access: true});
-  });
-});
-
-
-describes.fakeWin('AccessService pingback', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let clock;
-  let configElement;
-  let adapterMock;
-  let cidMock;
-  let visibilityChanged;
-  let scrolled;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-    clock = sandbox.useFakeTimers();
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID&type=AUTHDATA(child.type)',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    service = new AccessService(ampdoc);
-
-    const adapter = {
-      isPingbackEnabled: () => true,
-      pingback: () => Promise.resolve(),
-    };
-    service.sources_[0].adapter_ = adapter;
-    adapterMock = sandbox.mock(adapter);
-
-    const cid = {
-      get: () => {},
-    };
-    cidMock = sandbox.mock(cid);
-    service.cid_ = Promise.resolve(cid);
-
-    service.analyticsEvent_ = sandbox.spy();
-    service.sources_[0].analyticsEvent_ = sandbox.spy();
-    win.docState_ = {
-      onReady: callback => callback(),
-    };
-
-    visibilityChanged = new Observable();
-    service.viewer_ = {
-      isVisible: () => true,
-      whenFirstVisible: () => Promise.resolve(),
-      onVisibilityChanged: callback => visibilityChanged.add(callback),
-      broadcast: () => {},
-    };
-
-    scrolled = new Observable();
-    service.viewport_ = {
-      onScroll: callback => scrolled.add(callback),
-    };
-
-    // Emulate first authorization complete.
-    service.sources_[0].firstAuthorizationResolver_();
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-    adapterMock.verify();
-  });
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+      adapterMock.verify();
+    });
 
-  function expectGetReaderId(result) {
-    cidMock.expects('get')
+    function expectGetReaderId(result) {
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve(result))
         .once();
-  }
+    }
 
-  it('should register "viewed" signal after timeout', () => {
-    service.reportViewToServer_ = sandbox.spy();
-    const p = service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      clock.tick(2001);
-      return p;
-    }).then(() => {}, () => {}).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(visibilityChanged.getHandlerCount()).to.equal(0);
-      expect(scrolled.getHandlerCount()).to.equal(0);
-      expect(service.analyticsEvent_).to.have.been.calledWith('access-viewed');
-    });
-  });
-
-  it('should register "viewed" signal after scroll', () => {
-    service.reportViewToServer_ = sandbox.spy();
-    const p = service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      scrolled.fire();
-      return p;
-    }).then(() => {}, () => {}).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(visibilityChanged.getHandlerCount()).to.equal(0);
-      expect(scrolled.getHandlerCount()).to.equal(0);
-      expect(service.analyticsEvent_).to.have.been.calledWith('access-viewed');
-    });
-  });
-
-  it('should register "viewed" signal after click', () => {
-    service.reportViewToServer_ = sandbox.spy();
-    const p = service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      let clickEvent;
-      if (document.createEvent) {
-        clickEvent = document.createEvent('MouseEvent');
-        clickEvent.initMouseEvent('click', true, true, window, 1);
-      } else {
-        clickEvent = document.createEventObject();
-        clickEvent.type = 'click';
-      }
-      document.documentElement.dispatchEvent(clickEvent);
-      return p;
-    }).then(() => {}, () => {}).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(visibilityChanged.getHandlerCount()).to.equal(0);
-      expect(scrolled.getHandlerCount()).to.equal(0);
-      expect(service.analyticsEvent_).to.have.been.calledWith('access-viewed');
-    });
-  });
-
-  it('should wait for last authorization completion', () => {
-    expect(service.lastAuthorizationPromises_).to.exist;
-    let lastAuthorizationResolver;
-    service.lastAuthorizationPromises_ = new Promise(resolve => {
-      lastAuthorizationResolver = resolve;
-    });
-    const triggerStart = 1; // First event is "access-authorization-received".
-    service.reportViewToServer_ = sandbox.spy();
-    service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      clock.tick(2001);
-      return Promise.resolve();
-    }).then(() => {
-      expect(service.reportViewToServer_).to.have.not.been.called;
-      // First event is "access-authorization-received".
-      expect(service.analyticsEvent_.callCount).to.equal(triggerStart);
-      lastAuthorizationResolver();
-      return Promise.all([service.lastAuthorizationPromises_,
-        service.reportViewPromise_]);
-    }).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(service.analyticsEvent_.callCount).to.equal(triggerStart + 1);
-      expect(service.analyticsEvent_.getCall(triggerStart).args[0])
-          .to.equal('access-viewed');
-    });
-  });
-
-  it('should cancel "viewed" signal after click', () => {
-    service.reportViewToServer_ = sandbox.spy();
-    const p = service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      service.viewer_.isVisible = () => false;
-      visibilityChanged.fire();
-      return p;
-    }).then(() => {}, () => {}).then(() => {
-      expect(service.reportViewToServer_).to.have.not.been.called;
-      expect(visibilityChanged.getHandlerCount()).to.equal(0);
-      expect(scrolled.getHandlerCount()).to.equal(0);
-    });
-  });
-
-  it('should schedule "viewed" monitoring only once', () => {
-    const timeToView = 2000;
-    service.whenViewed_ = ttv => {
-      expect(ttv).to.equal(timeToView);
-      return Promise.resolve();
-    };
-    service.reportViewToServer_ = sandbox.spy();
-    const p1 = service.reportWhenViewed_(timeToView);
-    const p2 = service.reportWhenViewed_(timeToView);
-    expect(p2).to.equal(p1);
-    return p1.then(() => {
-      const p3 = service.reportWhenViewed_(timeToView);
-      expect(p3).to.equal(p1);
-      return p3;
-    }).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-    });
-  });
-
-  it('should ignore "viewed" monitoring when pingback is disabled', () => {
-    adapterMock.expects('isPingbackEnabled').returns(false);
-
-    service.reportWhenViewed_ = sandbox.spy();
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-
-    service.scheduleView_(/* timeToView */ 2000);
-
-    expect(service.reportWhenViewed_).to.have.not.been.called;
-    expect(service.reportViewPromise_).to.be.null;
-    expect(broadcastStub).to.have.not.been.called;
-  });
-
-  it('should re-schedule "viewed" monitoring after visibility change', () => {
-    service.reportViewToServer_ = sandbox.spy();
-
-    service.scheduleView_(/* timeToView */ 2000);
-
-    // 1. First attempt fails due to document becoming invisible.
-    let p1;
-    return ampdoc.whenReady().then(() => {
-      p1 = service.reportViewPromise_;
-      expect(p1).to.exist;
-      service.viewer_.isVisible = () => false;
-      visibilityChanged.fire();
-      return p1;
-    }).then(() => 'SUCCESS', () => 'ERROR').then(result => {
-      expect(result).to.equal('ERROR');
-      expect(service.reportViewToServer_).to.have.not.been.called;
-      expect(service.reportViewPromise_).to.not.exist;
-    }).then(() => {
-      // 2. Second attempt is rescheduled and will complete.
-      service.viewer_.isVisible = () => true;
-      visibilityChanged.fire();
-      const p2 = service.reportViewPromise_;
-      expect(p2).to.exist;
-      expect(p2).to.not.equal(p1);
-      expect(service.reportViewToServer_).to.have.not.been.called;
-      return Promise.resolve().then(() => {
-        clock.tick(2001);
-        expect(service.reportViewToServer_).to.have.not.been.called;
-        return p2;
+    it('should register "viewed" signal after timeout', () => {
+      service.reportViewToServer_ = sandbox.spy();
+      const p = service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          clock.tick(2001);
+          return p;
+        })
+        .then(() => {}, () => {})
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(visibilityChanged.getHandlerCount()).to.equal(0);
+          expect(scrolled.getHandlerCount()).to.equal(0);
+          expect(service.analyticsEvent_).to.have.been.calledWith(
+            'access-viewed'
+          );
+        });
+    });
+
+    it('should register "viewed" signal after scroll', () => {
+      service.reportViewToServer_ = sandbox.spy();
+      const p = service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          scrolled.fire();
+          return p;
+        })
+        .then(() => {}, () => {})
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(visibilityChanged.getHandlerCount()).to.equal(0);
+          expect(scrolled.getHandlerCount()).to.equal(0);
+          expect(service.analyticsEvent_).to.have.been.calledWith(
+            'access-viewed'
+          );
+        });
+    });
+
+    it('should register "viewed" signal after click', () => {
+      service.reportViewToServer_ = sandbox.spy();
+      const p = service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          let clickEvent;
+          if (document.createEvent) {
+            clickEvent = document.createEvent('MouseEvent');
+            clickEvent.initMouseEvent('click', true, true, window, 1);
+          } else {
+            clickEvent = document.createEventObject();
+            clickEvent.type = 'click';
+          }
+          document.documentElement.dispatchEvent(clickEvent);
+          return p;
+        })
+        .then(() => {}, () => {})
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(visibilityChanged.getHandlerCount()).to.equal(0);
+          expect(scrolled.getHandlerCount()).to.equal(0);
+          expect(service.analyticsEvent_).to.have.been.calledWith(
+            'access-viewed'
+          );
+        });
+    });
+
+    it('should wait for last authorization completion', () => {
+      expect(service.lastAuthorizationPromises_).to.exist;
+      let lastAuthorizationResolver;
+      service.lastAuthorizationPromises_ = new Promise(resolve => {
+        lastAuthorizationResolver = resolve;
       });
-    }).then(() => 'SUCCESS', reason => reason).then(result => {
-      expect(result).to.equal('SUCCESS');
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(service.reportViewPromise_).to.exist;
+      const triggerStart = 1; // First event is "access-authorization-received".
+      service.reportViewToServer_ = sandbox.spy();
+      service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          clock.tick(2001);
+          return Promise.resolve();
+        })
+        .then(() => {
+          expect(service.reportViewToServer_).to.have.not.been.called;
+          // First event is "access-authorization-received".
+          expect(service.analyticsEvent_.callCount).to.equal(triggerStart);
+          lastAuthorizationResolver();
+          return Promise.all([
+            service.lastAuthorizationPromises_,
+            service.reportViewPromise_,
+          ]);
+        })
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(service.analyticsEvent_.callCount).to.equal(triggerStart + 1);
+          expect(
+            service.analyticsEvent_.getCall(triggerStart).args[0]
+          ).to.equal('access-viewed');
+        });
+    });
+
+    it('should cancel "viewed" signal after click', () => {
+      service.reportViewToServer_ = sandbox.spy();
+      const p = service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          service.viewer_.isVisible = () => false;
+          visibilityChanged.fire();
+          return p;
+        })
+        .then(() => {}, () => {})
+        .then(() => {
+          expect(service.reportViewToServer_).to.have.not.been.called;
+          expect(visibilityChanged.getHandlerCount()).to.equal(0);
+          expect(scrolled.getHandlerCount()).to.equal(0);
+        });
+    });
+
+    it('should schedule "viewed" monitoring only once', () => {
+      const timeToView = 2000;
+      service.whenViewed_ = ttv => {
+        expect(ttv).to.equal(timeToView);
+        return Promise.resolve();
+      };
+      service.reportViewToServer_ = sandbox.spy();
+      const p1 = service.reportWhenViewed_(timeToView);
+      const p2 = service.reportWhenViewed_(timeToView);
+      expect(p2).to.equal(p1);
+      return p1
+        .then(() => {
+          const p3 = service.reportWhenViewed_(timeToView);
+          expect(p3).to.equal(p1);
+          return p3;
+        })
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+        });
     });
-  });
 
-  it('should re-start "viewed" monitoring when directly requested', () => {
-    service.lastAuthorizationPromise_ = Promise.resolve();
-    const whenViewedSpy = sandbox.stub(service, 'whenViewed_').callsFake(() => {
-      return Promise.resolve();
+    it('should ignore "viewed" monitoring when pingback is disabled', () => {
+      adapterMock.expects('isPingbackEnabled').returns(false);
+
+      service.reportWhenViewed_ = sandbox.spy();
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+
+      service.scheduleView_(/* timeToView */ 2000);
+
+      expect(service.reportWhenViewed_).to.have.not.been.called;
+      expect(service.reportViewPromise_).to.be.null;
+      expect(broadcastStub).to.have.not.been.called;
     });
-    service.scheduleView_(/* timeToView */ 0);
-    return Promise.resolve().then(() => {
-      expect(whenViewedSpy).to.be.calledOnce;
+
+    it('should re-schedule "viewed" monitoring after visibility change', () => {
+      service.reportViewToServer_ = sandbox.spy();
+
+      service.scheduleView_(/* timeToView */ 2000);
+
+      // 1. First attempt fails due to document becoming invisible.
+      let p1;
+      return ampdoc
+        .whenReady()
+        .then(() => {
+          p1 = service.reportViewPromise_;
+          expect(p1).to.exist;
+          service.viewer_.isVisible = () => false;
+          visibilityChanged.fire();
+          return p1;
+        })
+        .then(() => 'SUCCESS', () => 'ERROR')
+        .then(result => {
+          expect(result).to.equal('ERROR');
+          expect(service.reportViewToServer_).to.have.not.been.called;
+          expect(service.reportViewPromise_).to.not.exist;
+        })
+        .then(() => {
+          // 2. Second attempt is rescheduled and will complete.
+          service.viewer_.isVisible = () => true;
+          visibilityChanged.fire();
+          const p2 = service.reportViewPromise_;
+          expect(p2).to.exist;
+          expect(p2).to.not.equal(p1);
+          expect(service.reportViewToServer_).to.have.not.been.called;
+          return Promise.resolve().then(() => {
+            clock.tick(2001);
+            expect(service.reportViewToServer_).to.have.not.been.called;
+            return p2;
+          });
+        })
+        .then(() => 'SUCCESS', reason => reason)
+        .then(result => {
+          expect(result).to.equal('SUCCESS');
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(service.reportViewPromise_).to.exist;
+        });
+    });
+
+    it('should re-start "viewed" monitoring when directly requested', () => {
+      service.lastAuthorizationPromise_ = Promise.resolve();
+      const whenViewedSpy = sandbox
+        .stub(service, 'whenViewed_')
+        .callsFake(() => {
+          return Promise.resolve();
+        });
       service.scheduleView_(/* timeToView */ 0);
-    }).then(() => {
-      expect(whenViewedSpy).to.have.callCount(2);
+      return Promise.resolve()
+        .then(() => {
+          expect(whenViewedSpy).to.be.calledOnce;
+          service.scheduleView_(/* timeToView */ 0);
+        })
+        .then(() => {
+          expect(whenViewedSpy).to.have.callCount(2);
+        });
     });
-  });
 
-  it('should send POST pingback', () => {
-    expectGetReaderId('reader1');
-    adapterMock.expects('pingback')
+    it('should send POST pingback', () => {
+      expectGetReaderId('reader1');
+      adapterMock
+        .expects('pingback')
         .withExactArgs()
         .returns(Promise.resolve())
         .once();
-    return service.reportViewToServer_().then(() => {
-      return 'SUCCESS';
-    }, error => {
-      return 'ERROR ' + error;
-    }).then(result => {
-      expect(result).to.equal('SUCCESS');
-      expect(service.sources_[0].analyticsEvent_).to.have.been.calledWith(
-          'access-pingback-sent');
-    });
-  });
-
-  it('should NOT send analytics event if postback failed', () => {
-    expectGetReaderId('reader1');
-    adapterMock.expects('pingback')
+      return service
+        .reportViewToServer_()
+        .then(
+          () => {
+            return 'SUCCESS';
+          },
+          error => {
+            return 'ERROR ' + error;
+          }
+        )
+        .then(result => {
+          expect(result).to.equal('SUCCESS');
+          expect(service.sources_[0].analyticsEvent_).to.have.been.calledWith(
+            'access-pingback-sent'
+          );
+        });
+    });
+
+    it('should NOT send analytics event if postback failed', () => {
+      expectGetReaderId('reader1');
+      adapterMock
+        .expects('pingback')
         .withExactArgs()
         .returns(Promise.reject('intentional'))
         .once();
-    return service.reportViewToServer_().then(() => {
-      return 'SUCCESS';
-    }, error => {
-      return 'ERROR ' + error;
-    }).then(result => {
-      expect(result).to.match(/ERROR/);
-      expect(service.sources_[0].analyticsEvent_).to.have.not.been.calledWith(
-          'access-pingback-sent');
-      expect(service.sources_[0].analyticsEvent_).to.have.been.calledWith(
-          'access-pingback-failed');
-    });
-  });
-
-  it('should broadcast "viewed" signal to other documents', () => {
-    service.reportViewToServer_ = sandbox.stub().returns(Promise.resolve());
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-    const p = service.reportWhenViewed_(/* timeToView */ 2000);
-    return Promise.resolve().then(() => {
-      clock.tick(2001);
-      return p;
-    }).then(() => {}, () => {}).then(() => {
-      expect(service.reportViewToServer_).to.be.calledOnce;
-      expect(broadcastStub).to.be.calledOnce;
-      expect(broadcastStub.firstCall.args[0]).to.deep.equal({
-        'type': 'amp-access-reauthorize',
-        'origin': service.pubOrigin_,
+      return service
+        .reportViewToServer_()
+        .then(
+          () => {
+            return 'SUCCESS';
+          },
+          error => {
+            return 'ERROR ' + error;
+          }
+        )
+        .then(result => {
+          expect(result).to.match(/ERROR/);
+          expect(
+            service.sources_[0].analyticsEvent_
+          ).to.have.not.been.calledWith('access-pingback-sent');
+          expect(service.sources_[0].analyticsEvent_).to.have.been.calledWith(
+            'access-pingback-failed'
+          );
+        });
+    });
+
+    it('should broadcast "viewed" signal to other documents', () => {
+      service.reportViewToServer_ = sandbox.stub().returns(Promise.resolve());
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+      const p = service.reportWhenViewed_(/* timeToView */ 2000);
+      return Promise.resolve()
+        .then(() => {
+          clock.tick(2001);
+          return p;
+        })
+        .then(() => {}, () => {})
+        .then(() => {
+          expect(service.reportViewToServer_).to.be.calledOnce;
+          expect(broadcastStub).to.be.calledOnce;
+          expect(broadcastStub.firstCall.args[0]).to.deep.equal({
+            'type': 'amp-access-reauthorize',
+            'origin': service.pubOrigin_,
+          });
+        });
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService refresh',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let configElement;
+    let serviceMock;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
       });
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      service = new AccessService(ampdoc);
+
+      const cid = {
+        get: () => {},
+      };
+      service.cid_ = Promise.resolve(cid);
+
+      service.analyticsEvent_ = sandbox.spy();
+      serviceMock = sandbox.mock(service);
+      service.sources_[0].openLoginDialog_ = () => {};
+      service.sources_[0].loginUrlMap_[''] = 'https://acme.com/l?rid=R';
+      service.sources_[0].analyticsEvent_ = sandbox.spy();
+      service.sources_[0].getAdapter().postAction = sandbox.spy();
+
+      service.viewer_ = {
+        broadcast: () => {},
+        isVisible: () => true,
+        onVisibilityChanged: () => {},
+      };
     });
-  });
-});
-
-describes.fakeWin('AccessService refresh', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let configElement;
-  let serviceMock;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    service = new AccessService(ampdoc);
-
-    const cid = {
-      get: () => {},
-    };
-    service.cid_ = Promise.resolve(cid);
-
-    service.analyticsEvent_ = sandbox.spy();
-    serviceMock = sandbox.mock(service);
-    service.sources_[0].openLoginDialog_ = () => {};
-    service.sources_[0].loginUrlMap_[''] = 'https://acme.com/l?rid=R';
-    service.sources_[0].analyticsEvent_ = sandbox.spy();
-    service.sources_[0].getAdapter().postAction = sandbox.spy();
-
-    service.viewer_ = {
-      broadcast: () => {},
-      isVisible: () => true,
-      onVisibilityChanged: () => {},
-    };
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-  });
 
-  it('should intercept global action to refresh', () => {
-    serviceMock.expects('runAuthorization_')
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+    });
+
+    it('should intercept global action to refresh', () => {
+      serviceMock
+        .expects('runAuthorization_')
         .withExactArgs()
         .once();
-    const event = {preventDefault: sandbox.spy()};
-    const invocation = {method: 'refresh', event, satisfiesTrust: () => false};
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.not.be.called;
-
-    invocation.satisfiesTrust = () => true;
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.be.calledOnce;
-  });
-});
-
-describes.fakeWin('AccessService login', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let clock;
-  let configElement;
-  let cidMock;
-  let serviceMock;
-  let sourceMock;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-    clock = sandbox.useFakeTimers();
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    service = new AccessService(ampdoc);
-
-    const cid = {
-      get: () => {},
-    };
-    cidMock = sandbox.mock(cid);
-    service.cid_ = Promise.resolve(cid);
-
-    service.analyticsEvent_ = sandbox.spy();
-    serviceMock = sandbox.mock(service);
-    sourceMock = sandbox.mock(service.sources_[0]);
-    service.sources_[0].openLoginDialog_ = () => {};
-    service.sources_[0].loginUrlMap_[''] = 'https://acme.com/l?rid=R';
-    service.sources_[0].analyticsEvent_ = sandbox.spy();
-    service.sources_[0].getAdapter().postAction = sandbox.spy();
-
-    service.viewer_ = {
-      broadcast: () => {},
-      isVisible: () => true,
-      onVisibilityChanged: () => {},
-    };
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-  });
+      const event = {preventDefault: sandbox.spy()};
+      const invocation = {
+        method: 'refresh',
+        event,
+        satisfiesTrust: () => false,
+      };
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.not.be.called;
+
+      invocation.satisfiesTrust = () => true;
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.be.calledOnce;
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService login',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let clock;
+    let configElement;
+    let cidMock;
+    let serviceMock;
+    let sourceMock;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+      clock = sandbox.useFakeTimers();
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
+      });
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      service = new AccessService(ampdoc);
+
+      const cid = {
+        get: () => {},
+      };
+      cidMock = sandbox.mock(cid);
+      service.cid_ = Promise.resolve(cid);
+
+      service.analyticsEvent_ = sandbox.spy();
+      serviceMock = sandbox.mock(service);
+      sourceMock = sandbox.mock(service.sources_[0]);
+      service.sources_[0].openLoginDialog_ = () => {};
+      service.sources_[0].loginUrlMap_[''] = 'https://acme.com/l?rid=R';
+      service.sources_[0].analyticsEvent_ = sandbox.spy();
+      service.sources_[0].getAdapter().postAction = sandbox.spy();
+
+      service.viewer_ = {
+        broadcast: () => {},
+        isVisible: () => true,
+        onVisibilityChanged: () => {},
+      };
+    });
 
-  it('should intercept global action to login', () => {
-    serviceMock.expects('loginWithType_')
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+    });
+
+    it('should intercept global action to login', () => {
+      serviceMock
+        .expects('loginWithType_')
         .withExactArgs('')
         .once();
-    const event = {preventDefault: sandbox.spy()};
-    const invocation = {method: 'login', event, satisfiesTrust: () => false};
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.not.be.called;
-
-    invocation.satisfiesTrust = () => true;
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.be.calledOnce;
-  });
-
-  it('should intercept global action to login-other', () => {
-    serviceMock.expects('loginWithType_')
+      const event = {preventDefault: sandbox.spy()};
+      const invocation = {method: 'login', event, satisfiesTrust: () => false};
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.not.be.called;
+
+      invocation.satisfiesTrust = () => true;
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.be.calledOnce;
+    });
+
+    it('should intercept global action to login-other', () => {
+      serviceMock
+        .expects('loginWithType_')
         .withExactArgs('other')
         .once();
-    const event = {preventDefault: sandbox.spy()};
-    const invocation =
-        {method: 'login-other', event, satisfiesTrust: () => false};
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.not.be.called;
-
-    invocation.satisfiesTrust = () => true;
-    service.handleAction_(invocation);
-    expect(event.preventDefault).to.be.calledOnce;
-  });
-
-  it('should build login url', () => {
-    cidMock.expects('get')
+      const event = {preventDefault: sandbox.spy()};
+      const invocation = {
+        method: 'login-other',
+        event,
+        satisfiesTrust: () => false,
+      };
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.not.be.called;
+
+      invocation.satisfiesTrust = () => true;
+      service.handleAction_(invocation);
+      expect(event.preventDefault).to.be.calledOnce;
+    });
+
+    it('should build login url', () => {
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve('reader1'))
         .once();
-    return service.sources_[0].buildLoginUrls_().then(urls => {
-      const {url} = urls[0];
-      expect(url).to.equal('https://acme.com/l?rid=reader1');
-      expect(service.sources_[0].loginUrlMap_['']).to.equal(url);
-    });
-  });
-
-  it('should build multiple login url', () => {
-    const source = service.sources_[0];
-    source.loginConfig_ = {
-      'login1': 'https://acme.com/l1?rid=READER_ID',
-      'login2': 'https://acme.com/l2?rid=READER_ID',
-    };
-    cidMock.expects('get')
+      return service.sources_[0].buildLoginUrls_().then(urls => {
+        const {url} = urls[0];
+        expect(url).to.equal('https://acme.com/l?rid=reader1');
+        expect(service.sources_[0].loginUrlMap_['']).to.equal(url);
+      });
+    });
+
+    it('should build multiple login url', () => {
+      const source = service.sources_[0];
+      source.loginConfig_ = {
+        'login1': 'https://acme.com/l1?rid=READER_ID',
+        'login2': 'https://acme.com/l2?rid=READER_ID',
+      };
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve('reader1'))
         .atLeast(1);
-    return source.buildLoginUrls_().then(urls => {
-      expect(urls).to.have.length(2);
-      let l1, l2;
-      if (urls[0].type == 'login1') {
-        l1 = 0;
-        l2 = 1;
-      } else {
-        l1 = 1;
-        l2 = 0;
-      }
-      expect(urls[l1]).to.deep.equal({
-        'type': 'login1',
-        'url': 'https://acme.com/l1?rid=reader1',
-      });
-      expect(urls[l2]).to.deep.equal({
-        'type': 'login2',
-        'url': 'https://acme.com/l2?rid=reader1',
+      return source.buildLoginUrls_().then(urls => {
+        expect(urls).to.have.length(2);
+        let l1, l2;
+        if (urls[0].type == 'login1') {
+          l1 = 0;
+          l2 = 1;
+        } else {
+          l1 = 1;
+          l2 = 0;
+        }
+        expect(urls[l1]).to.deep.equal({
+          'type': 'login1',
+          'url': 'https://acme.com/l1?rid=reader1',
+        });
+        expect(urls[l2]).to.deep.equal({
+          'type': 'login2',
+          'url': 'https://acme.com/l2?rid=reader1',
+        });
+        expect(source.loginUrlMap_['login1']).to.equal(
+          'https://acme.com/l1?rid=reader1'
+        );
+        expect(source.loginUrlMap_['login2']).to.equal(
+          'https://acme.com/l2?rid=reader1'
+        );
       });
-      expect(source.loginUrlMap_['login1']).to
-          .equal('https://acme.com/l1?rid=reader1');
-      expect(source.loginUrlMap_['login2']).to
-          .equal('https://acme.com/l2?rid=reader1');
     });
-  });
 
-  it('should build login url with RETURN_URL', () => {
-    const source = service.sources_[0];
-    source.loginConfig_[''] =
+    it('should build login url with RETURN_URL', () => {
+      const source = service.sources_[0];
+      source.loginConfig_[''] =
         'https://acme.com/l?rid=READER_ID&ret=RETURN_URL';
-    cidMock.expects('get')
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve('reader1'))
         .once();
-    return source.buildLoginUrls_().then(urls => {
-      const {url} = urls[0];
-      expect(url).to.equal('https://acme.com/l?rid=reader1&ret=RETURN_URL');
-      expect(source.loginUrlMap_['']).to.equal(url);
-    });
-  });
-
-  it('should open dialog in the same microtask', () => {
-    const source = service.sources_[0];
-    source.openLoginDialog_ = sandbox.stub();
-    source.openLoginDialog_.returns(new Promise(() => {}));
-    service.loginWithType_('');
-    expect(source.openLoginDialog_).to.be.calledOnce;
-    expect(source.openLoginDialog_.firstCall.args[0])
-        .to.equal('https://acme.com/l?rid=R');
-    expect(source.analyticsEvent_).to.have.been.calledWith(
-        'access-login-started');
-  });
-
-  it('should fail to open dialog if loginUrl is not built yet', () => {
-    service.sources_[0].loginUrlMap_[''] = null;
-    allowConsoleError(() => {
-      expect(() => service.loginWithType_('')).to.throw(
-          /Login URL is not ready/);
-    });
-  });
-
-  it('should succeed login with success=true', () => {
-    const source = service.sources_[0];
-    const authorizationStub =
-        sandbox.stub(source, 'runAuthorization').callsFake(
-            () => Promise.resolve());
-    const viewStub = sandbox.stub(source, 'scheduleView_');
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-    sourceMock.expects('openLoginDialog_')
+      return source.buildLoginUrls_().then(urls => {
+        const {url} = urls[0];
+        expect(url).to.equal('https://acme.com/l?rid=reader1&ret=RETURN_URL');
+        expect(source.loginUrlMap_['']).to.equal(url);
+      });
+    });
+
+    it('should open dialog in the same microtask', () => {
+      const source = service.sources_[0];
+      source.openLoginDialog_ = sandbox.stub();
+      source.openLoginDialog_.returns(new Promise(() => {}));
+      service.loginWithType_('');
+      expect(source.openLoginDialog_).to.be.calledOnce;
+      expect(source.openLoginDialog_.firstCall.args[0]).to.equal(
+        'https://acme.com/l?rid=R'
+      );
+      expect(source.analyticsEvent_).to.have.been.calledWith(
+        'access-login-started'
+      );
+    });
+
+    it('should fail to open dialog if loginUrl is not built yet', () => {
+      service.sources_[0].loginUrlMap_[''] = null;
+      allowConsoleError(() => {
+        expect(() => service.loginWithType_('')).to.throw(
+          /Login URL is not ready/
+        );
+      });
+    });
+
+    it('should succeed login with success=true', () => {
+      const source = service.sources_[0];
+      const authorizationStub = sandbox
+        .stub(source, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const viewStub = sandbox.stub(source, 'scheduleView_');
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=R')
         .returns(Promise.resolve('#success=true'))
         .once();
-    return service.loginWithType_('').then(() => {
-      expect(source.getAdapter().postAction).to.be.calledOnce;
-      expect(source.loginPromise_).to.not.exist;
-      expect(authorizationStub).to.be.calledOnce;
-      expect(authorizationStub).to.be.calledWithExactly(
-          /* disableFallback */ true);
-      expect(viewStub).to.be.calledOnce;
-      expect(viewStub).to.be.calledWithExactly(/* timeToView */ 0);
-      expect(broadcastStub).to.be.calledOnce;
-      expect(broadcastStub.firstCall.args[0]).to.deep.equal({
-        'type': 'amp-access-reauthorize',
-        'origin': service.pubOrigin_,
-      });
+      return service.loginWithType_('').then(() => {
+        expect(source.getAdapter().postAction).to.be.calledOnce;
+        expect(source.loginPromise_).to.not.exist;
+        expect(authorizationStub).to.be.calledOnce;
+        expect(authorizationStub).to.be.calledWithExactly(
+          /* disableFallback */ true
+        );
+        expect(viewStub).to.be.calledOnce;
+        expect(viewStub).to.be.calledWithExactly(/* timeToView */ 0);
+        expect(broadcastStub).to.be.calledOnce;
+        expect(broadcastStub.firstCall.args[0]).to.deep.equal({
+          'type': 'amp-access-reauthorize',
+          'origin': service.pubOrigin_,
+        });
 
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-started');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-success');
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-started'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-success'
+        );
+      });
     });
-  });
 
-  it('should fail login with success=no', () => {
-    const source = service.sources_[0];
-    service.runAuthorization_ = sandbox.spy();
-    sourceMock.expects('openLoginDialog_')
+    it('should fail login with success=no', () => {
+      const source = service.sources_[0];
+      service.runAuthorization_ = sandbox.spy();
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=R')
         .returns(Promise.resolve('#success=no'))
         .once();
-    return service.loginWithType_('').then(() => {
-      expect(source.loginPromise_).to.not.exist;
-      expect(service.runAuthorization_).to.have.not.been.called;
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-rejected');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-started');
-    });
-  });
-
-  it('should fail login with empty response, but re-authorize', () => {
-    const source = service.sources_[0];
-    const authorizationStub =
-      sandbox.stub(source, 'runAuthorization').callsFake(
-          () => Promise.resolve());
-    const viewStub = sandbox.stub(source, 'scheduleView_');
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-    sourceMock.expects('openLoginDialog_')
+      return service.loginWithType_('').then(() => {
+        expect(source.loginPromise_).to.not.exist;
+        expect(service.runAuthorization_).to.have.not.been.called;
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-rejected'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-started'
+        );
+      });
+    });
+
+    it('should fail login with empty response, but re-authorize', () => {
+      const source = service.sources_[0];
+      const authorizationStub = sandbox
+        .stub(source, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const viewStub = sandbox.stub(source, 'scheduleView_');
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=R')
         .returns(Promise.resolve(''))
         .once();
-    return service.loginWithType_('').then(() => {
-      expect(source.loginPromise_).to.not.exist;
-      expect(authorizationStub).to.be.calledOnce;
-      expect(authorizationStub).to.be.calledWithExactly(
-          /* disableFallback */ true);
-      expect(viewStub).to.be.calledOnce;
-      expect(viewStub).to.be.calledWithExactly(/* timeToView */ 0);
-      expect(broadcastStub).to.be.calledOnce;
-      expect(broadcastStub.firstCall.args[0]).to.deep.equal({
-        'type': 'amp-access-reauthorize',
-        'origin': service.pubOrigin_,
+      return service.loginWithType_('').then(() => {
+        expect(source.loginPromise_).to.not.exist;
+        expect(authorizationStub).to.be.calledOnce;
+        expect(authorizationStub).to.be.calledWithExactly(
+          /* disableFallback */ true
+        );
+        expect(viewStub).to.be.calledOnce;
+        expect(viewStub).to.be.calledWithExactly(/* timeToView */ 0);
+        expect(broadcastStub).to.be.calledOnce;
+        expect(broadcastStub.firstCall.args[0]).to.deep.equal({
+          'type': 'amp-access-reauthorize',
+          'origin': service.pubOrigin_,
+        });
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-started'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-rejected'
+        );
       });
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-started');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-rejected');
     });
-  });
 
-  it('should fail login with aborted dialog', () => {
-    const source = service.sources_[0];
-    service.runAuthorization_ = sandbox.spy();
-    sourceMock.expects('openLoginDialog_')
+    it('should fail login with aborted dialog', () => {
+      const source = service.sources_[0];
+      service.runAuthorization_ = sandbox.spy();
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=R')
         .returns(Promise.reject('abort'))
         .once();
-    return service.loginWithType_('')
-        .then(() => 'S', () => 'ERROR').then(result => {
+      return service
+        .loginWithType_('')
+        .then(() => 'S', () => 'ERROR')
+        .then(result => {
           expect(result).to.equal('ERROR');
           expect(source.loginPromise_).to.not.exist;
           expect(service.runAuthorization_).to.have.not.been.called;
           expect(source.analyticsEvent_).to.have.been.calledWith(
-              'access-login-started');
+            'access-login-started'
+          );
           expect(source.analyticsEvent_).to.have.been.calledWith(
-              'access-login-failed');
+            'access-login-failed'
+          );
         });
-  });
-
-  it('should succeed login with success=true with multiple logins', () => {
-    const source = service.sources_[0];
-    source.loginConfig_ = {
-      'login1': 'https://acme.com/l1?rid=READER_ID',
-      'login2': 'https://acme.com/l2?rid=READER_ID',
-    };
-    source.loginUrlMap_ = {
-      'login1': 'https://acme.com/l1?rid=R',
-      'login2': 'https://acme.com/l2?rid=R',
-    };
-    const authorizationStub =
-      sandbox.stub(source, 'runAuthorization').callsFake(
-          () => Promise.resolve());
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-    sourceMock.expects('openLoginDialog_')
+    });
+
+    it('should succeed login with success=true with multiple logins', () => {
+      const source = service.sources_[0];
+      source.loginConfig_ = {
+        'login1': 'https://acme.com/l1?rid=READER_ID',
+        'login2': 'https://acme.com/l2?rid=READER_ID',
+      };
+      source.loginUrlMap_ = {
+        'login1': 'https://acme.com/l1?rid=R',
+        'login2': 'https://acme.com/l2?rid=R',
+      };
+      const authorizationStub = sandbox
+        .stub(source, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l2?rid=R')
         .returns(Promise.resolve('#success=true'))
         .once();
-    return service.loginWithType_('login2').then(() => {
-      expect(service.loginPromise_).to.not.exist;
-      expect(authorizationStub).to.be.calledOnce;
-      expect(broadcastStub).to.be.calledOnce;
-      expect(broadcastStub.firstCall.args[0]).to.deep.equal({
-        'type': 'amp-access-reauthorize',
-        'origin': service.pubOrigin_,
+      return service.loginWithType_('login2').then(() => {
+        expect(service.loginPromise_).to.not.exist;
+        expect(authorizationStub).to.be.calledOnce;
+        expect(broadcastStub).to.be.calledOnce;
+        expect(broadcastStub.firstCall.args[0]).to.deep.equal({
+          'type': 'amp-access-reauthorize',
+          'origin': service.pubOrigin_,
+        });
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-started'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-login2-started'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-success'
+        );
+        expect(source.analyticsEvent_).to.have.been.calledWith(
+          'access-login-login2-success'
+        );
       });
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-started');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-login2-started');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-success');
-      expect(source.analyticsEvent_).to.have.been.calledWith(
-          'access-login-login2-success');
-    });
-  });
-
-  it('should block login for 1 second', () => {
-    let p1Reject;
-    const p1Promise = new Promise((unusedResolve, reject) => {
-      p1Reject = reject;
-    });
-    const source = service.sources_[0];
-    service.runAuthorization_ = sandbox.spy();
-
-    const openLoginDialogStub = sandbox.stub(source, 'openLoginDialog_');
-    openLoginDialogStub.onCall(0).returns(p1Promise);
-    openLoginDialogStub.onCall(1).returns(new Promise(() => {}));
-    openLoginDialogStub.onCall(2).throws();
-    const p1 = service.loginWithType_('');
-
-    // The immediate second attempt is blocked.
-    const p2 = service.loginWithType_('');
-    expect(source.loginPromise_).to.equal(p1);
-    expect(p2).to.equal(p1);
-
-    // The delayed third attempt succeeds after 1 second.
-    clock.tick(1001);
-    const p3 = service.loginWithType_('');
-    expect(source.loginPromise_).to.equal(p3);
-    expect(p3).to.not.equal(p1);
-
-    // Rejecting the first login attempt does not reject the current promise.
-    p1Reject();
-    return p1Promise.then(() => 'SUCCESS', () => 'ERROR').then(res => {
-      expect(res).to.equal('ERROR');
+    });
+
+    it('should block login for 1 second', () => {
+      let p1Reject;
+      const p1Promise = new Promise((unusedResolve, reject) => {
+        p1Reject = reject;
+      });
+      const source = service.sources_[0];
+      service.runAuthorization_ = sandbox.spy();
+
+      const openLoginDialogStub = sandbox.stub(source, 'openLoginDialog_');
+      openLoginDialogStub.onCall(0).returns(p1Promise);
+      openLoginDialogStub.onCall(1).returns(new Promise(() => {}));
+      openLoginDialogStub.onCall(2).throws();
+      const p1 = service.loginWithType_('');
+
+      // The immediate second attempt is blocked.
+      const p2 = service.loginWithType_('');
+      expect(source.loginPromise_).to.equal(p1);
+      expect(p2).to.equal(p1);
+
+      // The delayed third attempt succeeds after 1 second.
+      clock.tick(1001);
+      const p3 = service.loginWithType_('');
       expect(source.loginPromise_).to.equal(p3);
+      expect(p3).to.not.equal(p1);
+
+      // Rejecting the first login attempt does not reject the current promise.
+      p1Reject();
+      return p1Promise
+        .then(() => 'SUCCESS', () => 'ERROR')
+        .then(res => {
+          expect(res).to.equal('ERROR');
+          expect(source.loginPromise_).to.equal(p3);
+        });
     });
-  });
 
-  it('should wait for token exchange post-login with success=true', () => {
-    const source = service.sources_[0];
-    const authorizationStub =
-      sandbox.stub(source, 'runAuthorization').callsFake(
-          () => Promise.resolve());
-    const viewStub = sandbox.stub(source, 'scheduleView_');
-    const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
-    sourceMock.expects('openLoginDialog_')
+    it('should wait for token exchange post-login with success=true', () => {
+      const source = service.sources_[0];
+      const authorizationStub = sandbox
+        .stub(source, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const viewStub = sandbox.stub(source, 'scheduleView_');
+      const broadcastStub = sandbox.stub(service.viewer_, 'broadcast');
+      sourceMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=R')
         .returns(Promise.resolve('#success=true'))
         .once();
-    return service.loginWithType_('').then(() => {
-      expect(source.loginPromise_).to.not.exist;
-      expect(authorizationStub).to.be.calledOnce;
-      expect(viewStub).to.be.calledOnce;
-      expect(broadcastStub).to.be.calledOnce;
-    });
-  });
-});
-
-
-describes.fakeWin('AccessService analytics', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let configElement;
-  let service;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify({
-      'authorization': 'https://acme.com/a?rid=READER_ID',
-      'pingback': 'https://acme.com/p?rid=READER_ID',
-      'login': 'https://acme.com/l?rid=READER_ID',
-    });
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    service = new AccessService(ampdoc);
-    service.enabled_ = true;
-    service.getReaderId_ = () => {
-      return Promise.resolve('reader1');
-    };
-    service.sources_[0].setAuthResponse_(
-        {views: 3, child: {type: 'premium'}, zero: 0});
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-  });
-
-  it('should return null when not enabled', () => {
-    service.enabled_ = false;
-    expect(service.getAccessReaderId()).to.be.null;
-    expect(service.getAuthdataField('views')).to.be.null;
-  });
-
-  it('should return reader id', () => {
-    return service.getAccessReaderId().then(readerId => {
-      expect(readerId).to.equal('reader1');
-    });
-  });
-
-  it('should return authdata', () => {
-    service.sources_[0].firstAuthorizationResolver_();
-    return Promise.all([
-      service.getAuthdataField('views'),
-      service.getAuthdataField('child.type'),
-      service.getAuthdataField('other'),
-      service.getAuthdataField('child.other'),
-      service.getAuthdataField('zero'),
-    ]).then(res => {
-      expect(res[0]).to.equal(3);
-      expect(res[1]).to.equal('premium');
-      expect(res[2]).to.be.null;
-      expect(res[3]).to.be.null;
-      expect(res[4]).to.equal(0);
-    });
-  });
-
-  it('should wait the first authorization for authdata', () => {
-    let viewsValue;
-    const promise = service.getAuthdataField('views').then(res => {
-      viewsValue = res;
-    });
-    return Promise.resolve().then(() => {
-      expect(viewsValue).to.be.undefined;
-      // Resolve the authorization.
-      service.sources_[0].firstAuthorizationResolver_();
-      return promise;
-    }).then(() => {
-      expect(viewsValue).to.equal(3);
+      return service.loginWithType_('').then(() => {
+        expect(source.loginPromise_).to.not.exist;
+        expect(authorizationStub).to.be.calledOnce;
+        expect(viewStub).to.be.calledOnce;
+        expect(broadcastStub).to.be.calledOnce;
+      });
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService analytics',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let configElement;
+    let service;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify({
+        'authorization': 'https://acme.com/a?rid=READER_ID',
+        'pingback': 'https://acme.com/p?rid=READER_ID',
+        'login': 'https://acme.com/l?rid=READER_ID',
+      });
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      service = new AccessService(ampdoc);
+      service.enabled_ = true;
+      service.getReaderId_ = () => {
+        return Promise.resolve('reader1');
+      };
+      service.sources_[0].setAuthResponse_({
+        views: 3,
+        child: {type: 'premium'},
+        zero: 0,
+      });
     });
-  });
 
-  it('should wait the latest authorization for authdata if started', () => {
-    let resolver;
-    service.lastAuthorizationPromises_ = new Promise(resolve => {
-      resolver = resolve;
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+    });
+
+    it('should return null when not enabled', () => {
+      service.enabled_ = false;
+      expect(service.getAccessReaderId()).to.be.null;
+      expect(service.getAuthdataField('views')).to.be.null;
     });
-    let viewsValue;
-    const promise = service.getAuthdataField('views').then(res => {
-      viewsValue = res;
+
+    it('should return reader id', () => {
+      return service.getAccessReaderId().then(readerId => {
+        expect(readerId).to.equal('reader1');
+      });
     });
-    return Promise.resolve().then(() => {
-      expect(viewsValue).to.be.undefined;
-      // Resolve the first authorization.
+
+    it('should return authdata', () => {
       service.sources_[0].firstAuthorizationResolver_();
-    }).then(() => {
-      expect(viewsValue).to.be.undefined;
-      // Resolve the second authorization.
-      resolver();
-      return promise;
-    }).then(() => {
-      expect(viewsValue).to.equal(3);
-    });
-  });
-});
-
-
-describes.fakeWin('AccessService multiple sources', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win, document, ampdoc;
-  let clock;
-  let configElement, elementOnBeer, elementOnBeerOrDonuts, elementError;
-  let cidMock;
-  let adapterBeerMock, adapterDonutsMock;
-  let performanceMock;
-  let service;
-  let sourceBeer, sourceDonuts;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    document = win.document;
-    clock = sandbox.useFakeTimers();
-    clock.tick(0);
-
-    cidServiceForDocForTesting(ampdoc);
-    installPerformanceService(win);
-
-    configElement = document.createElement('script');
-    configElement.setAttribute('id', 'amp-access');
-    configElement.setAttribute('type', 'application/json');
-    configElement.textContent = JSON.stringify([
-      {
-        'authorization': 'https://acme.com/a?rid=READER_ID',
-        'pingback': 'https://acme.com/p?rid=READER_ID',
-        'login': 'https://acme.com/l?rid=READER_ID',
-        'namespace': 'beer',
-      },
-      {
-        'authorization': 'https://acme.com/a?rid=READER_ID',
-        'pingback': 'https://acme.com/p?rid=READER_ID',
-        'login': {
-          'login2': 'https://acme.com/l?rid=READER_ID',
+      return Promise.all([
+        service.getAuthdataField('views'),
+        service.getAuthdataField('child.type'),
+        service.getAuthdataField('other'),
+        service.getAuthdataField('child.other'),
+        service.getAuthdataField('zero'),
+      ]).then(res => {
+        expect(res[0]).to.equal(3);
+        expect(res[1]).to.equal('premium');
+        expect(res[2]).to.be.null;
+        expect(res[3]).to.be.null;
+        expect(res[4]).to.equal(0);
+      });
+    });
+
+    it('should wait the first authorization for authdata', () => {
+      let viewsValue;
+      const promise = service.getAuthdataField('views').then(res => {
+        viewsValue = res;
+      });
+      return Promise.resolve()
+        .then(() => {
+          expect(viewsValue).to.be.undefined;
+          // Resolve the authorization.
+          service.sources_[0].firstAuthorizationResolver_();
+          return promise;
+        })
+        .then(() => {
+          expect(viewsValue).to.equal(3);
+        });
+    });
+
+    it('should wait the latest authorization for authdata if started', () => {
+      let resolver;
+      service.lastAuthorizationPromises_ = new Promise(resolve => {
+        resolver = resolve;
+      });
+      let viewsValue;
+      const promise = service.getAuthdataField('views').then(res => {
+        viewsValue = res;
+      });
+      return Promise.resolve()
+        .then(() => {
+          expect(viewsValue).to.be.undefined;
+          // Resolve the first authorization.
+          service.sources_[0].firstAuthorizationResolver_();
+        })
+        .then(() => {
+          expect(viewsValue).to.be.undefined;
+          // Resolve the second authorization.
+          resolver();
+          return promise;
+        })
+        .then(() => {
+          expect(viewsValue).to.equal(3);
+        });
+    });
+  }
+);
+
+describes.fakeWin(
+  'AccessService multiple sources',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win, document, ampdoc;
+    let clock;
+    let configElement, elementOnBeer, elementOnBeerOrDonuts, elementError;
+    let cidMock;
+    let adapterBeerMock, adapterDonutsMock;
+    let performanceMock;
+    let service;
+    let sourceBeer, sourceDonuts;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      document = win.document;
+      clock = sandbox.useFakeTimers();
+      clock.tick(0);
+
+      cidServiceForDocForTesting(ampdoc);
+      installPerformanceService(win);
+
+      configElement = document.createElement('script');
+      configElement.setAttribute('id', 'amp-access');
+      configElement.setAttribute('type', 'application/json');
+      configElement.textContent = JSON.stringify([
+        {
+          'authorization': 'https://acme.com/a?rid=READER_ID',
+          'pingback': 'https://acme.com/p?rid=READER_ID',
+          'login': 'https://acme.com/l?rid=READER_ID',
+          'namespace': 'beer',
+        },
+        {
+          'authorization': 'https://acme.com/a?rid=READER_ID',
+          'pingback': 'https://acme.com/p?rid=READER_ID',
+          'login': {
+            'login2': 'https://acme.com/l?rid=READER_ID',
+          },
+          'namespace': 'donuts',
         },
-        'namespace': 'donuts',
-      },
-    ]);
-    document.body.appendChild(configElement);
-    document.documentElement.classList.remove('amp-access-error');
-
-    elementOnBeer = document.createElement('div');
-    elementOnBeer.setAttribute('amp-access', 'beer.access');
-    document.body.appendChild(elementOnBeer);
-
-    elementOnBeerOrDonuts = document.createElement('div');
-    elementOnBeerOrDonuts.setAttribute('amp-access',
-        'beer.access OR donuts.access');
-    document.body.appendChild(elementOnBeerOrDonuts);
-
-    elementError = document.createElement('div');
-    elementError.setAttribute('amp-access', 'error');
-    elementError.setAttribute('amp-access-hide', '');
-    document.body.appendChild(elementError);
-
-    service = new AccessService(ampdoc);
-    sourceBeer = service.sources_[0];
-    sourceDonuts = service.sources_[1];
-
-    const adapterBeer = {
-      getConfig: () => {},
-      isAuthorizationEnabled: () => true,
-      isPingbackEnabled: () => true,
-      authorize: () => {},
-      postAction: () => {},
-    };
-    const adapterDonuts = {
-      getConfig: () => {},
-      isAuthorizationEnabled: () => true,
-      isPingbackEnabled: () => true,
-      authorize: () => {},
-      postAction: () => {},
-    };
-    sourceBeer.adapter_ = adapterBeer;
-    adapterBeerMock = sandbox.mock(adapterBeer);
-
-    sourceDonuts.adapter_ = adapterDonuts;
-    adapterDonutsMock = sandbox.mock(adapterDonuts);
-
-    sandbox.stub(service.resources_, 'mutateElement').callsFake(
-        (unusedElement, mutator) => {
+      ]);
+      document.body.appendChild(configElement);
+      document.documentElement.classList.remove('amp-access-error');
+
+      elementOnBeer = document.createElement('div');
+      elementOnBeer.setAttribute('amp-access', 'beer.access');
+      document.body.appendChild(elementOnBeer);
+
+      elementOnBeerOrDonuts = document.createElement('div');
+      elementOnBeerOrDonuts.setAttribute(
+        'amp-access',
+        'beer.access OR donuts.access'
+      );
+      document.body.appendChild(elementOnBeerOrDonuts);
+
+      elementError = document.createElement('div');
+      elementError.setAttribute('amp-access', 'error');
+      elementError.setAttribute('amp-access-hide', '');
+      document.body.appendChild(elementError);
+
+      service = new AccessService(ampdoc);
+      sourceBeer = service.sources_[0];
+      sourceDonuts = service.sources_[1];
+
+      const adapterBeer = {
+        getConfig: () => {},
+        isAuthorizationEnabled: () => true,
+        isPingbackEnabled: () => true,
+        authorize: () => {},
+        postAction: () => {},
+      };
+      const adapterDonuts = {
+        getConfig: () => {},
+        isAuthorizationEnabled: () => true,
+        isPingbackEnabled: () => true,
+        authorize: () => {},
+        postAction: () => {},
+      };
+      sourceBeer.adapter_ = adapterBeer;
+      adapterBeerMock = sandbox.mock(adapterBeer);
+
+      sourceDonuts.adapter_ = adapterDonuts;
+      adapterDonutsMock = sandbox.mock(adapterDonuts);
+
+      sandbox
+        .stub(service.resources_, 'mutateElement')
+        .callsFake((unusedElement, mutator) => {
           mutator();
           return Promise.resolve();
         });
-    service.vsync_ = {
-      mutate: callback => {
-        callback();
-      },
-      mutatePromise: callback => {
-        callback();
-        return Promise.resolve();
-      },
-    };
-    const cid = {
-      get: () => {},
-    };
-    cidMock = sandbox.mock(cid);
-    service.cid_ = Promise.resolve(cid);
-
-    service.analyticsEvent_ = sandbox.spy();
-    sourceBeer.analyticsEvent_ = sandbox.spy();
-    sourceDonuts.analyticsEvent_ = sandbox.spy();
-    performanceMock = sandbox.mock(service.performance_);
-    performanceMock.expects('onload_').atLeast(0);
-  });
-
-  afterEach(() => {
-    if (configElement.parentElement) {
-      configElement.parentElement.removeChild(configElement);
-    }
-    if (elementOnBeer.parentElement) {
-      elementOnBeer.parentElement.removeChild(elementOnBeer);
-    }
-    if (elementOnBeerOrDonuts.parentElement) {
-      elementOnBeerOrDonuts.parentElement.removeChild(elementOnBeerOrDonuts);
-    }
-    if (elementError.parentElement) {
-      elementError.parentElement.removeChild(elementError);
-    }
-    adapterBeerMock.verify();
-    adapterDonutsMock.verify();
-    performanceMock.verify();
-  });
+      service.vsync_ = {
+        mutate: callback => {
+          callback();
+        },
+        mutatePromise: callback => {
+          callback();
+          return Promise.resolve();
+        },
+      };
+      const cid = {
+        get: () => {},
+      };
+      cidMock = sandbox.mock(cid);
+      service.cid_ = Promise.resolve(cid);
+
+      service.analyticsEvent_ = sandbox.spy();
+      sourceBeer.analyticsEvent_ = sandbox.spy();
+      sourceDonuts.analyticsEvent_ = sandbox.spy();
+      performanceMock = sandbox.mock(service.performance_);
+      performanceMock.expects('onload_').atLeast(0);
+    });
+
+    afterEach(() => {
+      if (configElement.parentElement) {
+        configElement.parentElement.removeChild(configElement);
+      }
+      if (elementOnBeer.parentElement) {
+        elementOnBeer.parentElement.removeChild(elementOnBeer);
+      }
+      if (elementOnBeerOrDonuts.parentElement) {
+        elementOnBeerOrDonuts.parentElement.removeChild(elementOnBeerOrDonuts);
+      }
+      if (elementError.parentElement) {
+        elementError.parentElement.removeChild(elementError);
+      }
+      adapterBeerMock.verify();
+      adapterDonutsMock.verify();
+      performanceMock.verify();
+    });
 
-  function expectGetReaderId(result) {
-    cidMock.expects('get')
+    function expectGetReaderId(result) {
+      cidMock
+        .expects('get')
         .withExactArgs(
-            {scope: 'amp-access', createCookieIfNotPresent: true},
-            sinon.match(() => true))
+          {scope: 'amp-access', createCookieIfNotPresent: true},
+          sinon.match(() => true)
+        )
         .returns(Promise.resolve(result))
         .once();
-  }
+    }
 
-  it('should run authorization flow', () => {
-    expectGetReaderId('reader1');
-    adapterBeerMock.expects('authorize')
+    it('should run authorization flow', () => {
+      expectGetReaderId('reader1');
+      adapterBeerMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: false}))
         .once();
-    adapterDonutsMock.expects('authorize')
+      adapterDonutsMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
 
-    const promise = service.runAuthorization_();
-    const lastPromise = service.lastAuthorizationPromises_;
-    expect(lastPromise).to.equal(promise);
-    expect(document.documentElement).to.have.class('amp-access-loading');
-    expect(document.documentElement).not.to.have.class('amp-access-error');
-    return promise.then(() => {
-      expect(document.documentElement).not.to.have.class('amp-access-loading');
+      const promise = service.runAuthorization_();
+      const lastPromise = service.lastAuthorizationPromises_;
+      expect(lastPromise).to.equal(promise);
+      expect(document.documentElement).to.have.class('amp-access-loading');
       expect(document.documentElement).not.to.have.class('amp-access-error');
-      expect(elementOnBeer).to.have.attribute('amp-access-hide');
-      expect(elementOnBeerOrDonuts).not.to.have.attribute('amp-access-hide');
-      expect(sourceBeer.authResponse_).to.exist;
-      expect(sourceBeer.authResponse_.access).to.be.false;
-      expect(sourceDonuts.authResponse_).to.exist;
-      expect(sourceDonuts.authResponse_.access).to.be.true;
-      // Last authorization promise stays unchanged.
-      expect(service.lastAuthorizationPromises_).to.equal(lastPromise);
-    });
-  });
-
-  it('should return authdata', () => {
-    expectGetReaderId('reader1');
-    adapterBeerMock.expects('authorize')
+      return promise.then(() => {
+        expect(document.documentElement).not.to.have.class(
+          'amp-access-loading'
+        );
+        expect(document.documentElement).not.to.have.class('amp-access-error');
+        expect(elementOnBeer).to.have.attribute('amp-access-hide');
+        expect(elementOnBeerOrDonuts).not.to.have.attribute('amp-access-hide');
+        expect(sourceBeer.authResponse_).to.exist;
+        expect(sourceBeer.authResponse_.access).to.be.false;
+        expect(sourceDonuts.authResponse_).to.exist;
+        expect(sourceDonuts.authResponse_.access).to.be.true;
+        // Last authorization promise stays unchanged.
+        expect(service.lastAuthorizationPromises_).to.equal(lastPromise);
+      });
+    });
+
+    it('should return authdata', () => {
+      expectGetReaderId('reader1');
+      adapterBeerMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.reject('rejected'))
         .once();
-    adapterDonutsMock.expects('authorize')
+      adapterDonutsMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({access: true}))
         .once();
-    service.runAuthorization_();
-    return Promise.all([
-      service.getAuthdataField('beer.access'),
-      service.getAuthdataField('donuts.access'),
-      service.getAuthdataField('garbage'),
-      service.getAuthdataField('donuts.garbage'),
-      service.getAuthdataField('garbage.garbage'),
-    ]).then(res => {
-      expect(res[0]).to.be.null;
-      expect(res[1]).to.equal(true);
-      expect(res[2]).to.be.null;
-      expect(res[3]).to.be.null;
-      expect(res[4]).to.be.null;
-    });
-  });
-
-  it('should succeed login flat', () => {
-    expectGetReaderId('reader1');
-    const authorizationStub =
-      sandbox.stub(sourceBeer, 'runAuthorization').callsFake(
-          () => Promise.resolve());
-    const viewer = Services.viewerForDoc(ampdoc);
-    const broadcastStub = sandbox.stub(viewer, 'broadcast');
-    const sourceBeerMock = sandbox.mock(sourceBeer);
-    sourceBeerMock.expects('openLoginDialog_')
+      service.runAuthorization_();
+      return Promise.all([
+        service.getAuthdataField('beer.access'),
+        service.getAuthdataField('donuts.access'),
+        service.getAuthdataField('garbage'),
+        service.getAuthdataField('donuts.garbage'),
+        service.getAuthdataField('garbage.garbage'),
+      ]).then(res => {
+        expect(res[0]).to.be.null;
+        expect(res[1]).to.equal(true);
+        expect(res[2]).to.be.null;
+        expect(res[3]).to.be.null;
+        expect(res[4]).to.be.null;
+      });
+    });
+
+    it('should succeed login flat', () => {
+      expectGetReaderId('reader1');
+      const authorizationStub = sandbox
+        .stub(sourceBeer, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const viewer = Services.viewerForDoc(ampdoc);
+      const broadcastStub = sandbox.stub(viewer, 'broadcast');
+      const sourceBeerMock = sandbox.mock(sourceBeer);
+      sourceBeerMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=reader1')
         .returns(Promise.resolve('#success=true'))
         .once();
-    sourceBeer.analyticsEvent_ = sandbox.spy();
-    return sourceBeer.buildLoginUrls_()
+      sourceBeer.analyticsEvent_ = sandbox.spy();
+      return sourceBeer
+        .buildLoginUrls_()
         .then(() => service.loginWithType_('beer'))
         .then(() => {
           expect(sourceBeer.loginPromise_).to.not.exist;
@@ -1730,28 +1922,32 @@ describes.fakeWin('AccessService multiple sources', {
             'origin': service.pubOrigin_,
           });
           expect(sourceBeer.analyticsEvent_).to.have.been.calledWith(
-              'access-login-started');
+            'access-login-started'
+          );
           expect(sourceBeer.analyticsEvent_).to.have.been.calledWith(
-              'access-login-success');
+            'access-login-success'
+          );
 
           sourceBeerMock.verify();
         });
-  });
-
-  it('should succeed login hierarchy', () => {
-    expectGetReaderId('reader1');
-    const authorizationStub =
-      sandbox.stub(sourceDonuts, 'runAuthorization').callsFake(
-          () => Promise.resolve());
-    const viewer = Services.viewerForDoc(ampdoc);
-    const broadcastStub = sandbox.stub(viewer, 'broadcast');
-    const sourceDonutsMock = sandbox.mock(sourceDonuts);
-    sourceDonutsMock.expects('openLoginDialog_')
+    });
+
+    it('should succeed login hierarchy', () => {
+      expectGetReaderId('reader1');
+      const authorizationStub = sandbox
+        .stub(sourceDonuts, 'runAuthorization')
+        .callsFake(() => Promise.resolve());
+      const viewer = Services.viewerForDoc(ampdoc);
+      const broadcastStub = sandbox.stub(viewer, 'broadcast');
+      const sourceDonutsMock = sandbox.mock(sourceDonuts);
+      sourceDonutsMock
+        .expects('openLoginDialog_')
         .withExactArgs('https://acme.com/l?rid=reader1')
         .returns(Promise.resolve('#success=true'))
         .once();
-    sourceDonuts.analyticsEvent_ = sandbox.spy();
-    return sourceDonuts.buildLoginUrls_()
+      sourceDonuts.analyticsEvent_ = sandbox.spy();
+      return sourceDonuts
+        .buildLoginUrls_()
         .then(() => service.loginWithType_('donuts-login2'))
         .then(() => {
           expect(sourceDonuts.loginPromise_).to.not.exist;
@@ -1762,16 +1958,20 @@ describes.fakeWin('AccessService multiple sources', {
             'origin': service.pubOrigin_,
           });
           expect(sourceDonuts.analyticsEvent_).to.have.been.calledWith(
-              'access-login-started');
+            'access-login-started'
+          );
           expect(sourceDonuts.analyticsEvent_).to.have.been.calledWith(
-              'access-login-login2-started');
+            'access-login-login2-started'
+          );
           expect(sourceDonuts.analyticsEvent_).to.have.been.calledWith(
-              'access-login-success');
+            'access-login-success'
+          );
           expect(sourceDonuts.analyticsEvent_).to.have.been.calledWith(
-              'access-login-login2-success');
-
+            'access-login-login2-success'
+          );
 
           sourceDonutsMock.verify();
         });
-  });
-});
+    });
+  }
+);
diff --git a/extensions/amp-access/0.1/test/test-amp-login-done-dialog.js b/extensions/amp-access/0.1/test/test-amp-login-done-dialog.js
index 43d3e245fdad..a790d227fd9e 100644
--- a/extensions/amp-access/0.1/test/test-amp-login-done-dialog.js
+++ b/extensions/amp-access/0.1/test/test-amp-login-done-dialog.js
@@ -16,9 +16,7 @@
 
 import {LoginDoneDialog, buildLangSelector} from '../amp-login-done-dialog';
 
-
 describe('LoginDoneDialog', () => {
-
   let sandbox;
   let clock;
   let windowApi;
@@ -97,202 +95,230 @@ describe('LoginDoneDialog', () => {
   }
 
   describe('buildStyles_', () => {
-
     it('should build complete CSS expression', () => {
       windowApi.navigator.language = 'fr-FR';
-      expect(dialog.buildStyles_()).to.equal('[lang="fr"], [lang="fr-FR"] ' +
-          '{display: block}');
+      expect(dialog.buildStyles_()).to.equal(
+        '[lang="fr"], [lang="fr-FR"] {display: block}'
+      );
     });
 
     it('should prioritize query parameter first', () => {
       windowApi.navigator.language = 'fr-FR';
       windowApi.location.search = '?hl=en-US';
-      expect(dialog.buildStyles_()).to.equal('[lang="en"], [lang="en-US"] ' +
-          '{display: block}');
+      expect(dialog.buildStyles_()).to.equal(
+        '[lang="en"], [lang="en-US"] {display: block}'
+      );
     });
 
     it('should fallback to navigator.lang if no DOM nodes exist', () => {
       windowApi.navigator.language = 'fr-FR';
       windowApi.location.search = '?hl=unk';
-      expect(dialog.buildStyles_()).to.equal('[lang="fr"], [lang="fr-FR"] ' +
-          '{display: block}');
+      expect(dialog.buildStyles_()).to.equal(
+        '[lang="fr"], [lang="fr-FR"] {display: block}'
+      );
     });
 
     it('should fallback to navigator.userLang if no DOM nodes exist', () => {
       windowApi.navigator.userLanguage = 'de-DE';
       windowApi.navigator.language = 'unk';
       windowApi.location.search = '?hl=unk';
-      expect(dialog.buildStyles_()).to.equal('[lang="de"], [lang="de-DE"] ' +
-          '{display: block}');
+      expect(dialog.buildStyles_()).to.equal(
+        '[lang="de"], [lang="de-DE"] {display: block}'
+      );
     });
 
     it('should fallback to en-US if no DOM nodes exist', () => {
       windowApi.navigator.userLanguage = 'unk';
       windowApi.navigator.language = 'unk';
       windowApi.location.search = '?hl=unk';
-      expect(dialog.buildStyles_()).to.equal('[lang="en"], [lang="en-US"] ' +
-          '{display: block}');
+      expect(dialog.buildStyles_()).to.equal(
+        '[lang="en"], [lang="en-US"] {display: block}'
+      );
     });
   });
 
-
   describe('buildLangSelector', () => {
-
     it('should enable every prefix', () => {
       expect(buildLangSelector('fr')).to.equal('[lang="fr"]');
-      expect(buildLangSelector('fr-FR')).to
-          .equal('[lang="fr"], [lang="fr-FR"]');
-      expect(buildLangSelector('fr-FR-PR')).to
-          .equal('[lang="fr"], [lang="fr-FR"], [lang="fr-FR-PR"]');
+      expect(buildLangSelector('fr-FR')).to.equal(
+        '[lang="fr"], [lang="fr-FR"]'
+      );
+      expect(buildLangSelector('fr-FR-PR')).to.equal(
+        '[lang="fr"], [lang="fr-FR"], [lang="fr-FR-PR"]'
+      );
     });
 
     it('should normalize prefixes', () => {
-      expect(buildLangSelector('FR-fr')).to
-          .equal('[lang="fr"], [lang="fr-FR"]');
+      expect(buildLangSelector('FR-fr')).to.equal(
+        '[lang="fr"], [lang="fr-FR"]'
+      );
     });
 
     it('should protect form malformed prefixes', () => {
-      expect(buildLangSelector('"fr"')).to
-          .equal('[lang="fr"]');
-      expect(buildLangSelector('\\fr\\')).to
-          .equal('[lang="fr"]');
-      expect(buildLangSelector('f r')).to
-          .equal('[lang="fr"]');
+      expect(buildLangSelector('"fr"')).to.equal('[lang="fr"]');
+      expect(buildLangSelector('\\fr\\')).to.equal('[lang="fr"]');
+      expect(buildLangSelector('f r')).to.equal('[lang="fr"]');
     });
   });
 
-
   describe('postbackOrRedirect_', () => {
-
     it('should post message to opener', () => {
-      openerMock.expects('postMessage')
-          .withExactArgs(
-              sinon.match(arg => {
-                return (arg.sentinel == 'amp' && arg.type == 'result' &&
-                    arg.result == '#result1');
-              }),
-              '*')
-          .once();
+      openerMock
+        .expects('postMessage')
+        .withExactArgs(
+          sinon.match(arg => {
+            return (
+              arg.sentinel == 'amp' &&
+              arg.type == 'result' &&
+              arg.result == '#result1'
+            );
+          }),
+          '*'
+        )
+        .once();
       const promise = dialog.postbackOrRedirect_();
       return Promise.resolve()
-          .then(() => {
-            succeed();
-            return promise;
-          })
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.equal('SUCCESS');
-            expect(messageListener).to.not.exist;
-          });
+        .then(() => {
+          succeed();
+          return promise;
+        })
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.equal('SUCCESS');
+          expect(messageListener).to.not.exist;
+        });
     });
 
     it('should redirect to url without opener with HTTP', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent('http://acme.com/doc1');
+      windowApi.location.search =
+        '?url=' + encodeURIComponent('http://acme.com/doc1');
       windowApi.opener = null;
-      return dialog.postbackOrRedirect_()
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.equal('SUCCESS');
-            expect(windowApi.location.replace).to.be.calledOnce;
-            expect(windowApi.location.replace.firstCall.args[0]).to.equal(
-                'http://acme.com/doc1');
-          });
+      return dialog
+        .postbackOrRedirect_()
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.equal('SUCCESS');
+          expect(windowApi.location.replace).to.be.calledOnce;
+          expect(windowApi.location.replace.firstCall.args[0]).to.equal(
+            'http://acme.com/doc1'
+          );
+        });
     });
 
     it('should work around double-encoding of URL on redirect', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent(encodeURIComponent('http://acme.com/doc1'));
+      windowApi.location.search =
+        '?url=' +
+        encodeURIComponent(encodeURIComponent('http://acme.com/doc1'));
       windowApi.opener = null;
-      return dialog.postbackOrRedirect_()
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.equal('SUCCESS');
-            expect(windowApi.location.replace).to.be.calledOnce;
-            expect(windowApi.location.replace.firstCall.args[0]).to.equal(
-                'http://acme.com/doc1');
-          });
+      return dialog
+        .postbackOrRedirect_()
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.equal('SUCCESS');
+          expect(windowApi.location.replace).to.be.calledOnce;
+          expect(windowApi.location.replace.firstCall.args[0]).to.equal(
+            'http://acme.com/doc1'
+          );
+        });
     });
 
     it('should redirect to url without opener with HTTPS', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent('https://acme.com/doc1');
+      windowApi.location.search =
+        '?url=' + encodeURIComponent('https://acme.com/doc1');
       windowApi.opener = null;
-      return dialog.postbackOrRedirect_()
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.equal('SUCCESS');
-            expect(windowApi.location.replace).to.be.calledOnce;
-            expect(windowApi.location.replace.firstCall.args[0]).to.equal(
-                'https://acme.com/doc1');
-          });
+      return dialog
+        .postbackOrRedirect_()
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.equal('SUCCESS');
+          expect(windowApi.location.replace).to.be.calledOnce;
+          expect(windowApi.location.replace.firstCall.args[0]).to.equal(
+            'https://acme.com/doc1'
+          );
+        });
     });
 
     it('should work around double-encoding of URL on redirect w/HTTPS', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent(encodeURIComponent('https://acme.com/doc1'));
+      windowApi.location.search =
+        '?url=' +
+        encodeURIComponent(encodeURIComponent('https://acme.com/doc1'));
       windowApi.opener = null;
-      return dialog.postbackOrRedirect_()
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.equal('SUCCESS');
-            expect(windowApi.location.replace).to.be.calledOnce;
-            expect(windowApi.location.replace.firstCall.args[0]).to.equal(
-                'https://acme.com/doc1');
-          });
+      return dialog
+        .postbackOrRedirect_()
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.equal('SUCCESS');
+          expect(windowApi.location.replace).to.be.calledOnce;
+          expect(windowApi.location.replace.firstCall.args[0]).to.equal(
+            'https://acme.com/doc1'
+          );
+        });
     });
 
     it('should fail tripple-encoding of URL', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent(
-              encodeURIComponent(encodeURIComponent('https://acme.com/doc1')));
+      windowApi.location.search =
+        '?url=' +
+        encodeURIComponent(
+          encodeURIComponent(encodeURIComponent('https://acme.com/doc1'))
+        );
       windowApi.opener = null;
-      allowConsoleError(() => { expect(() => {
-        dialog.postbackOrRedirect_();
-      }).to.throw(/URL must start with/); });
+      allowConsoleError(() => {
+        expect(() => {
+          dialog.postbackOrRedirect_();
+        }).to.throw(/URL must start with/);
+      });
       expect(windowApi.location.replace).to.have.not.been.called;
     });
 
     it('should fail redirect to url without opener and invalid URL', () => {
-      windowApi.location.search = '?url=' +
-          encodeURIComponent(/*eslint no-script-url: 0*/ 'javascript:alert(1)');
+      windowApi.location.search =
+        '?url=' +
+        encodeURIComponent(/*eslint no-script-url: 0*/ 'javascript:alert(1)');
       windowApi.opener = null;
-      allowConsoleError(() => { expect(() => {
-        dialog.postbackOrRedirect_();
-      }).to.throw(/URL must start with/); });
+      allowConsoleError(() => {
+        expect(() => {
+          dialog.postbackOrRedirect_();
+        }).to.throw(/URL must start with/);
+      });
       expect(windowApi.location.replace).to.have.not.been.called;
     });
 
     it('should fail without opener and redirect URL', () => {
       windowApi.opener = null;
-      return dialog.postbackOrRedirect_()
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.match(/No opener or return location available/);
-            expect(messageListener).to.not.exist;
-          });
+      return dialog
+        .postbackOrRedirect_()
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.match(/No opener or return location available/);
+          expect(messageListener).to.not.exist;
+        });
     });
 
     it('should fail with timeout', () => {
-      openerMock.expects('postMessage')
-          .withExactArgs(
-              sinon.match(arg => {
-                return (arg.sentinel == 'amp' && arg.type == 'result' &&
-                    arg.result == '#result1');
-              }),
-              '*')
-          .once();
+      openerMock
+        .expects('postMessage')
+        .withExactArgs(
+          sinon.match(arg => {
+            return (
+              arg.sentinel == 'amp' &&
+              arg.type == 'result' &&
+              arg.result == '#result1'
+            );
+          }),
+          '*'
+        )
+        .once();
       const promise = dialog.postback_();
       return Promise.resolve()
-          .then(() => {
-            clock.tick(10000);
-            return promise;
-          })
-          .then(() => 'SUCCESS', error => 'ERROR ' + error)
-          .then(res => {
-            expect(res).to.match(/Timed out/);
-            expect(messageListener).to.not.exist;
-          });
+        .then(() => {
+          clock.tick(10000);
+          return promise;
+        })
+        .then(() => 'SUCCESS', error => 'ERROR ' + error)
+        .then(res => {
+          expect(res).to.match(/Timed out/);
+          expect(messageListener).to.not.exist;
+        });
     });
 
     it('should revert to error mode if window is not closed', () => {
@@ -308,10 +334,10 @@ describe('LoginDoneDialog', () => {
     it('should configure error mode for "postback"', () => {
       dialog.postbackError_(new Error());
 
-      expect(windowApi.document.documentElement)
-          .to.have.class('amp-error');
-      expect(windowApi.document.documentElement.getAttribute('data-error'))
-          .to.equal('postback');
+      expect(windowApi.document.documentElement).to.have.class('amp-error');
+      expect(
+        windowApi.document.documentElement.getAttribute('data-error')
+      ).to.equal('postback');
       expect(closeButton.onclick).to.exist;
 
       windowMock.expects('close').once();
@@ -321,18 +347,18 @@ describe('LoginDoneDialog', () => {
     it('should configure error mode for "close"', () => {
       dialog.postbackError_(new Error());
 
-      expect(windowApi.document.documentElement)
-          .to.have.class('amp-error');
-      expect(windowApi.document.documentElement.getAttribute('data-error'))
-          .to.equal('postback');
+      expect(windowApi.document.documentElement).to.have.class('amp-error');
+      expect(
+        windowApi.document.documentElement.getAttribute('data-error')
+      ).to.equal('postback');
       windowMock.expects('close').once();
       closeButton.onclick();
 
       clock.tick(3000);
-      expect(windowApi.document.documentElement)
-          .to.have.class('amp-error');
-      expect(windowApi.document.documentElement.getAttribute('data-error'))
-          .to.equal('close');
+      expect(windowApi.document.documentElement).to.have.class('amp-error');
+      expect(
+        windowApi.document.documentElement.getAttribute('data-error')
+      ).to.equal('close');
     });
   });
 });
diff --git a/extensions/amp-access/0.1/test/test-iframe-api.js b/extensions/amp-access/0.1/test/test-iframe-api.js
index 7a2c95e1263d..efb5643d745d 100644
--- a/extensions/amp-access/0.1/test/test-iframe-api.js
+++ b/extensions/amp-access/0.1/test/test-iframe-api.js
@@ -17,81 +17,92 @@
 import {AccessController} from '../iframe-api/access-controller';
 import {AmpAccessIframeApi} from '../iframe-api/iframe-api';
 
+describes.fakeWin(
+  'AmpAccessIframeApi',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let win;
+    let iframeApi;
+    let controllerMock;
+    let messengerMock;
 
-describes.fakeWin('AmpAccessIframeApi', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let win;
-  let iframeApi;
-  let controllerMock;
-  let messengerMock;
-
-  beforeEach(() => {
-    win = env.win;
-    const controller = new AccessController();
-    controllerMock = sandbox.mock(controller);
-    iframeApi = new AmpAccessIframeApi(controller, win);
-    messengerMock = sandbox.mock(iframeApi.messenger_);
-  });
+    beforeEach(() => {
+      win = env.win;
+      const controller = new AccessController();
+      controllerMock = sandbox.mock(controller);
+      iframeApi = new AmpAccessIframeApi(controller, win);
+      messengerMock = sandbox.mock(iframeApi.messenger_);
+    });
 
-  afterEach(() => {
-    controllerMock.verify();
-    messengerMock.verify();
-  });
+    afterEach(() => {
+      controllerMock.verify();
+      messengerMock.verify();
+    });
 
-  it('should configure messenger', () => {
-    expect(iframeApi.messenger_.win_).to.equal(win);
-    expect(iframeApi.messenger_.targetOrCallback_).to.equal(win.parent);
-  });
+    it('should configure messenger', () => {
+      expect(iframeApi.messenger_.win_).to.equal(win);
+      expect(iframeApi.messenger_.targetOrCallback_).to.equal(win.parent);
+    });
 
-  it('should connect and initialize', () => {
-    const config = {'property': 'A'};
-    messengerMock.expects('connect').once();
-    messengerMock.expects('sendCommand').withExactArgs('connect').once();
-    messengerMock.expects('getTargetOrigin')
+    it('should connect and initialize', () => {
+      const config = {'property': 'A'};
+      messengerMock.expects('connect').once();
+      messengerMock
+        .expects('sendCommand')
+        .withExactArgs('connect')
+        .once();
+      messengerMock
+        .expects('getTargetOrigin')
         .returns('TARGET_ORIGIN')
         .once();
-    controllerMock.expects('connect')
+      controllerMock
+        .expects('connect')
         .withExactArgs('TARGET_ORIGIN', 'protocol1', config)
         .returns(Promise.resolve(1))
         .once();
-    const promise = iframeApi.connect();
-    iframeApi.handleCommand_('start', {
-      'protocol': 'protocol1',
-      'config': config,
+      const promise = iframeApi.connect();
+      iframeApi.handleCommand_('start', {
+        'protocol': 'protocol1',
+        'config': config,
+      });
+      return expect(promise).to.eventually.equal(1);
     });
-    return expect(promise).to.eventually.equal(1);
-  });
 
-  it('should authorize', () => {
-    controllerMock.expects('authorize')
+    it('should authorize', () => {
+      controllerMock
+        .expects('authorize')
         .withExactArgs()
         .returns(Promise.resolve({a: 1}))
         .once();
-    return iframeApi.handleCommand_('authorize', {}).then(result => {
-      expect(result).to.deep.equal({a: 1});
+      return iframeApi.handleCommand_('authorize', {}).then(result => {
+        expect(result).to.deep.equal({a: 1});
+      });
     });
-  });
 
-  it('should pingback', () => {
-    controllerMock.expects('pingback')
+    it('should pingback', () => {
+      controllerMock
+        .expects('pingback')
         .withExactArgs()
         .returns(Promise.resolve())
         .once();
-    return iframeApi.handleCommand_('pingback', {});
-  });
+      return iframeApi.handleCommand_('pingback', {});
+    });
 
-  it('should tolerate pingback without response', () => {
-    controllerMock.expects('pingback')
+    it('should tolerate pingback without response', () => {
+      controllerMock
+        .expects('pingback')
         .withExactArgs()
         .returns(undefined)
         .once();
-    return iframeApi.handleCommand_('pingback', {});
-  });
+      return iframeApi.handleCommand_('pingback', {});
+    });
 
-  it('should ignore unimplemented pingback', () => {
-    iframeApi = new AmpAccessIframeApi({}, win);
-    return iframeApi.handleCommand_('pingback', {});
-  });
-});
+    it('should ignore unimplemented pingback', () => {
+      iframeApi = new AmpAccessIframeApi({}, win);
+      return iframeApi.handleCommand_('pingback', {});
+    });
+  }
+);
diff --git a/extensions/amp-access/0.1/test/test-iframe-messenger.js b/extensions/amp-access/0.1/test/test-iframe-messenger.js
index 39441d4e81bc..504f6f2d64ef 100644
--- a/extensions/amp-access/0.1/test/test-iframe-messenger.js
+++ b/extensions/amp-access/0.1/test/test-iframe-messenger.js
@@ -16,7 +16,6 @@
 
 import {Messenger} from '../iframe-api/messenger';
 
-
 describes.fakeWin('Messenger', {}, env => {
   let win;
 
@@ -33,9 +32,7 @@ describes.fakeWin('Messenger', {}, env => {
     beforeEach(() => {
       // A port knows the origin, but doesn't always know the source window.
       source = null;
-      messenger = new Messenger(win,
-          () => source,
-          'https://example-sp.com');
+      messenger = new Messenger(win, () => source, 'https://example-sp.com');
       onCommand = sandbox.spy();
       addEventListenerSpy = sandbox.spy(win, 'addEventListener');
       removeEventListenerSpy = sandbox.spy(win, 'removeEventListener');
@@ -211,11 +208,16 @@ describes.fakeWin('Messenger', {}, env => {
           payload: {error: 'intentional'},
         },
       });
-      return promise.then(() => {
-        throw new Error('must have failed');
-      }, reason => {
-        expect(() => {throw reason;}).to.throw(/intentional/);
-      });
+      return promise.then(
+        () => {
+          throw new Error('must have failed');
+        },
+        reason => {
+          expect(() => {
+            throw reason;
+          }).to.throw(/intentional/);
+        }
+      );
     });
 
     describe('execute rsvp', () => {
@@ -225,16 +227,16 @@ describes.fakeWin('Messenger', {}, env => {
       let handlerResponse;
 
       beforeEach(() => {
-        sandbox.stub(messenger, 'handleCommand_')
-            .callsFake(() => handlerResponse);
+        sandbox
+          .stub(messenger, 'handleCommand_')
+          .callsFake(() => handlerResponse);
         let sendResolver;
         sendPromise = new Promise(resolve => {
           sendResolver = resolve;
         });
-        sendStub = sandbox.stub(messenger, 'sendCommand_')
-            .callsFake(() => {
-              sendResolver();
-            });
+        sendStub = sandbox.stub(messenger, 'sendCommand_').callsFake(() => {
+          sendResolver();
+        });
         handler = addEventListenerSpy.args[0][1];
       });
 
@@ -293,7 +295,6 @@ describes.fakeWin('Messenger', {}, env => {
     });
   });
 
-
   describe('iframe side', () => {
     let messenger;
     let target;
@@ -305,9 +306,7 @@ describes.fakeWin('Messenger', {}, env => {
       target = {
         postMessage: sandbox.spy(),
       };
-      messenger = new Messenger(win,
-          target,
-          /* targetOrigin */ null);
+      messenger = new Messenger(win, target, /* targetOrigin */ null);
       onCommand = sandbox.spy();
       addEventListenerSpy = sandbox.spy(win, 'addEventListener');
       messenger.connect(onCommand);
diff --git a/extensions/amp-access/0.1/test/test-jwt.js b/extensions/amp-access/0.1/test/test-jwt.js
index 8cdc80af2da6..f69a40c97c41 100644
--- a/extensions/amp-access/0.1/test/test-jwt.js
+++ b/extensions/amp-access/0.1/test/test-jwt.js
@@ -17,16 +17,14 @@
 import {JwtHelper} from '../jwt';
 import {pemToBytes} from '../../../../src/utils/pem';
 
-
 describe('JwtHelper', () => {
-
   // Generated from https://jwt.io/#debugger
   // Name deliberately changed from "John Doe" to "John ௵Z加䅌ਇ☎Èʘغޝ" to test
   // correct unicode handling on our part.
   const TOKEN_HEADER = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9';
   const TOKEN_PAYLOAD =
-      'eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4g4K-1' +
-      'WuWKoOSFjOCoh-KYjsOIypjYut6dIiwiYWRtaW4iOnRydWV9';
+    'eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4g4K-1' +
+    'WuWKoOSFjOCoh-KYjsOIypjYut6dIiwiYWRtaW4iOnRydWV9';
   const TOKEN_SIG = 'TJVA95OrM7E2cBab30RMHrHDcEfxjoYZgeFONFh7HgQ';
   const TOKEN = `${TOKEN_HEADER}.${TOKEN_PAYLOAD}.${TOKEN_SIG}`;
 
@@ -43,7 +41,6 @@ describe('JwtHelper', () => {
   });
 
   describe('decode', () => {
-
     it('should decode fully', () => {
       const tok = helper.decodeInternal_(TOKEN);
       expect(tok.header).to.deep.equal({
@@ -56,9 +53,9 @@ describe('JwtHelper', () => {
         'admin': true,
       });
       expect(tok.verifiable).to.equal(
-          TOKEN.substring(0, TOKEN.lastIndexOf('.')));
-      expect(tok.sig).to.equal(
-          TOKEN.substring(TOKEN.lastIndexOf('.') + 1));
+        TOKEN.substring(0, TOKEN.lastIndexOf('.'))
+      );
+      expect(tok.sig).to.equal(TOKEN.substring(TOKEN.lastIndexOf('.') + 1));
     });
 
     it('should fail on invalid format', () => {
@@ -70,14 +67,16 @@ describe('JwtHelper', () => {
     it('should fail on invalid JSON in header', () => {
       expect(() => {
         helper.decodeInternal_(
-            `${TOKEN_HEADER.substring(1)}.${TOKEN_PAYLOAD}.${TOKEN_SIG}`);
+          `${TOKEN_HEADER.substring(1)}.${TOKEN_PAYLOAD}.${TOKEN_SIG}`
+        );
       }).to.throw(/Invalid token/);
     });
 
     it('should fail on invalid JSON in payload', () => {
       expect(() => {
         helper.decodeInternal_(
-            `${TOKEN_HEADER}.${TOKEN_PAYLOAD.substring(1)}.${TOKEN_SIG}`);
+          `${TOKEN_HEADER}.${TOKEN_PAYLOAD.substring(1)}.${TOKEN_SIG}`
+        );
       }).to.throw(/Invalid token/);
     });
 
@@ -94,70 +93,83 @@ describe('JwtHelper', () => {
      * - header: {"alg": "RS256", "typ": "JWT"}
      * - payload: {"sub": "1234567890", "name": "John Do", "admin": true}
      */
-    const SIG = 'NuE6WH4kIS77Bd6kK8R1mj2aZYpM0mTo-ZnH1UkYeyhTYRNvcIVy' +
-        'SFNYH0jQnyREG3CRpsRCYRr9X4Q1Mnzm1Xnx_0saPSV02CTiLjmHX340p9m' +
-        'KRCeOHkwytP-da-wXv2KKsEWTHM0RJET3GgHHm7zFCPHF89dmoBXeCz33iFY';
-    const TOKEN = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9'
-        + '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6dHJ1ZX0'
-        + '.' + SIG;
-    const PEM = '-----BEGIN PUBLIC KEY-----\n'
-        + 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n'
-        + 'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n'
-        + 'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n'
-        + 'o2kQ+X5xK9cipRgEKwIDAQAB\n'
-        + '-----END PUBLIC KEY-----';
+    const SIG =
+      'NuE6WH4kIS77Bd6kK8R1mj2aZYpM0mTo-ZnH1UkYeyhTYRNvcIVy' +
+      'SFNYH0jQnyREG3CRpsRCYRr9X4Q1Mnzm1Xnx_0saPSV02CTiLjmHX340p9m' +
+      'KRCeOHkwytP-da-wXv2KKsEWTHM0RJET3GgHHm7zFCPHF89dmoBXeCz33iFY';
+    const TOKEN =
+      'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' +
+      '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6dHJ1ZX0' +
+      '.' +
+      SIG;
+    const PEM =
+      '-----BEGIN PUBLIC KEY-----\n' +
+      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n' +
+      'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n' +
+      'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n' +
+      'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
+      '-----END PUBLIC KEY-----';
 
-    beforeEach(() => {
-    });
+    beforeEach(() => {});
 
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     // TODO(aghassemi, 6292): Unskip for Safari after #6292
-    it.configure().skipSafari().run('should decode and verify token correctly',
-        () => {
-          // Skip on non-subtle browser.
-          if (!helper.isVerificationSupported()) {
-            return;
-          }
-          return helper.decodeAndVerify(TOKEN, Promise.resolve(PEM))
-              .then(tok => {
-                expect(tok['name']).to.equal('John Do');
-              });
+    it.configure()
+      .skipSafari()
+      .run('should decode and verify token correctly', () => {
+        // Skip on non-subtle browser.
+        if (!helper.isVerificationSupported()) {
+          return;
+        }
+        return helper.decodeAndVerify(TOKEN, Promise.resolve(PEM)).then(tok => {
+          expect(tok['name']).to.equal('John Do');
         });
+      });
 
-    it.configure().skipSafari().run('should fail invalid signature', () => {
-      // Skip on non-subtle browser.
-      if (!helper.isVerificationSupported()) {
-        return;
-      }
-
-      const token = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9'
-          + '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6MH0'
-          + '.' + SIG;
-
-      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(() => {
-        throw new Error('must have failed');
-      }, error => {
-        // Expected.
-        expect(error.message).to.match(/Signature verification failed/);
+    it.configure()
+      .skipSafari()
+      .run('should fail invalid signature', () => {
+        // Skip on non-subtle browser.
+        if (!helper.isVerificationSupported()) {
+          return;
+        }
+
+        const token =
+          'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' +
+          '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6MH0' +
+          '.' +
+          SIG;
+
+        return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(
+          () => {
+            throw new Error('must have failed');
+          },
+          error => {
+            // Expected.
+            expect(error.message).to.match(/Signature verification failed/);
+          }
+        );
       });
-    });
   });
 
   describe('decodeAndVerify with mock subtle', () => {
-    const SIG = 'NuE6WH4kIS77Bd6kK8R1mj2aZYpM0mTo-ZnH1UkYeyhTYRNvcIVy' +
-        'SFNYH0jQnyREG3CRpsRCYRr9X4Q1Mnzm1Xnx_0saPSV02CTiLjmHX340p9m' +
-        'KRCeOHkwytP-da-wXv2KKsEWTHM0RJET3GgHHm7zFCPHF89dmoBXeCz33iFY';
-    const TOKEN = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9'
-        + '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6dHJ1ZX0'
-        + '.' + SIG;
-    const PEM = '-----BEGIN PUBLIC KEY-----\n'
-        + 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n'
-        + 'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n'
-        + 'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n'
-        + 'o2kQ+X5xK9cipRgEKwIDAQAB\n'
-        + '-----END PUBLIC KEY-----';
+    const SIG =
+      'NuE6WH4kIS77Bd6kK8R1mj2aZYpM0mTo-ZnH1UkYeyhTYRNvcIVy' +
+      'SFNYH0jQnyREG3CRpsRCYRr9X4Q1Mnzm1Xnx_0saPSV02CTiLjmHX340p9m' +
+      'KRCeOHkwytP-da-wXv2KKsEWTHM0RJET3GgHHm7zFCPHF89dmoBXeCz33iFY';
+    const TOKEN =
+      'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9' +
+      '.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG8iLCJhZG1pbiI6dHJ1ZX0' +
+      '.' +
+      SIG;
+    const PEM =
+      '-----BEGIN PUBLIC KEY-----\n' +
+      'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n' +
+      'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n' +
+      'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n' +
+      'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
+      '-----END PUBLIC KEY-----';
 
     let windowApi;
     let subtleMock;
@@ -182,53 +194,64 @@ describe('JwtHelper', () => {
     });
 
     it('should fail invalid token', () => {
-      return helper.decodeAndVerify('a.b', Promise.resolve(PEM)).then(() => {
-        throw new Error('Must have failed');
-      }, error => {
-        expect(error.message).to.match(/Invalid token/);
-      });
+      return helper.decodeAndVerify('a.b', Promise.resolve(PEM)).then(
+        () => {
+          throw new Error('Must have failed');
+        },
+        error => {
+          expect(error.message).to.match(/Invalid token/);
+        }
+      );
     });
 
     it('should fail without alg', () => {
       const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiIifQ.e30.X';
-      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(() => {
-        throw new Error('Must have failed');
-      }, error => {
-        expect(error.message).to.match(/Only alg=RS256 is supported/);
-      });
+      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(
+        () => {
+          throw new Error('Must have failed');
+        },
+        error => {
+          expect(error.message).to.match(/Only alg=RS256 is supported/);
+        }
+      );
     });
 
     it('should fail with wrong alg', () => {
       // HS256 used instead of RS256.
       const token = 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.e30.X';
-      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(() => {
-        throw new Error('Must have failed');
-      }, error => {
-        expect(error.message).to.match(/Only alg=RS256 is supported/);
-      });
+      return helper.decodeAndVerify(token, Promise.resolve(PEM)).then(
+        () => {
+          throw new Error('Must have failed');
+        },
+        error => {
+          expect(error.message).to.match(/Only alg=RS256 is supported/);
+        }
+      );
     });
 
     it('should fetch they key and verify', () => {
       const key = 'KEY';
-      subtleMock.expects('importKey')
-          .withExactArgs(
+      subtleMock
+        .expects('importKey')
+        .withExactArgs(
           /* format */ 'spki',
-              pemToBytes(PEM),
-              {name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}},
-              /* extractable */ false,
-              /* uses */ ['verify']
-          )
-          .returns(Promise.resolve(key))
-          .once();
-      subtleMock.expects('verify')
-          .withExactArgs(
-              {name: 'RSASSA-PKCS1-v1_5'},
-              key,
-              /* sig */ sinon.match(() => true),
-              /* verifiable */ sinon.match(() => true)
-          )
-          .returns(Promise.resolve(true))
-          .once();
+          pemToBytes(PEM),
+          {name: 'RSASSA-PKCS1-v1_5', hash: {name: 'SHA-256'}},
+          /* extractable */ false,
+          /* uses */ ['verify']
+        )
+        .returns(Promise.resolve(key))
+        .once();
+      subtleMock
+        .expects('verify')
+        .withExactArgs(
+          {name: 'RSASSA-PKCS1-v1_5'},
+          key,
+          /* sig */ sinon.match(() => true),
+          /* verifiable */ sinon.match(() => true)
+        )
+        .returns(Promise.resolve(true))
+        .once();
       return helper.decodeAndVerify(TOKEN, Promise.resolve(PEM)).then(tok => {
         expect(tok['name']).to.equal('John Do');
       });
diff --git a/extensions/amp-access/0.1/test/test-login-dialog.js b/extensions/amp-access/0.1/test/test-login-dialog.js
index 8b1b229b9a73..d56725d762b0 100644
--- a/extensions/amp-access/0.1/test/test-login-dialog.js
+++ b/extensions/amp-access/0.1/test/test-login-dialog.js
@@ -15,16 +15,14 @@
  */
 
 import {Services} from '../../../../src/services';
-import {
-  WebLoginDialog,
-  openLoginDialog,
-} from '../login-dialog';
+import {WebLoginDialog, openLoginDialog} from '../login-dialog';
 import {installDocService} from '../../../../src/service/ampdoc-impl';
 
-const RETURN_URL_ESC = encodeURIComponent('http://localhost:8000/extensions' +
+const RETURN_URL_ESC = encodeURIComponent(
+  'http://localhost:8000/extensions' +
     '/amp-access/0.1/amp-login-done.html?url=' +
-    encodeURIComponent('http://localhost:8000/test-login-dialog'));
-
+    encodeURIComponent('http://localhost:8000/test-login-dialog')
+);
 
 describes.sandboxed('ViewerLoginDialog', {}, () => {
   let ampdoc;
@@ -76,8 +74,9 @@ describes.sandboxed('ViewerLoginDialog', {}, () => {
   });
 
   it('should delegate to viewer with url', () => {
-    const stub = sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.resolve('#success=yes'));
+    const stub = sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve('#success=yes'));
     return openLoginDialog(ampdoc, 'http://acme.com/login').then(res => {
       expect(res).to.equal('#success=yes');
       expect(stub).to.be.calledOnce;
@@ -89,8 +88,9 @@ describes.sandboxed('ViewerLoginDialog', {}, () => {
   });
 
   it('should delegate to viewer with url promise', () => {
-    const stub = sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.resolve('#success=yes'));
+    const stub = sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve('#success=yes'));
     const urlPromise = Promise.resolve('http://acme.com/login');
     return openLoginDialog(ampdoc, urlPromise).then(res => {
       expect(res).to.equal('#success=yes');
@@ -103,29 +103,38 @@ describes.sandboxed('ViewerLoginDialog', {}, () => {
   });
 
   it('should fail when url promise fails', () => {
-    sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.resolve('#success=yes'));
+    sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve('#success=yes'));
     const urlPromise = Promise.reject('expected');
-    return openLoginDialog(ampdoc, urlPromise).then(() => {
-      throw new Error('must not be here');
-    }, reason => {
-      expect(reason).to.equal('expected');
-    });
+    return openLoginDialog(ampdoc, urlPromise).then(
+      () => {
+        throw new Error('must not be here');
+      },
+      reason => {
+        expect(reason).to.equal('expected');
+      }
+    );
   });
 
   it('should fail when viewer fails', () => {
-    sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.reject('expected'));
-    return openLoginDialog(ampdoc, 'http://acme.com/login').then(() => {
-      throw new Error('must not be here');
-    }, reason => {
-      expect(reason).to.equal('expected');
-    });
+    sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.reject('expected'));
+    return openLoginDialog(ampdoc, 'http://acme.com/login').then(
+      () => {
+        throw new Error('must not be here');
+      },
+      reason => {
+        expect(reason).to.equal('expected');
+      }
+    );
   });
 
   it('should have correct URL with other parameters', () => {
-    const stub = sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.resolve('#success=yes'));
+    const stub = sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve('#success=yes'));
     const url = 'http://acme.com/login?a=b';
     return openLoginDialog(ampdoc, url).then(() => {
       expect(stub.firstCall.args[1]).to.deep.equal({
@@ -135,8 +144,9 @@ describes.sandboxed('ViewerLoginDialog', {}, () => {
   });
 
   it('should allow alternative form of return URL', () => {
-    const stub = sandbox.stub(viewer, 'sendMessageAwaitResponse').callsFake(
-        () => Promise.resolve('#success=yes'));
+    const stub = sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve('#success=yes'));
     const url = 'http://acme.com/login?a=b&ret1=RETURN_URL';
     return openLoginDialog(ampdoc, url).then(() => {
       expect(stub.firstCall.args[1]).to.deep.equal({
@@ -146,7 +156,6 @@ describes.sandboxed('ViewerLoginDialog', {}, () => {
   });
 });
 
-
 describes.sandboxed('WebLoginDialog', {}, () => {
   let clock;
   let viewer;
@@ -231,7 +240,8 @@ describes.sandboxed('WebLoginDialog', {}, () => {
     openLoginDialog(ampdoc, 'http://acme.com/login');
     expect(windowApi.open).to.be.calledOnce;
     expect(windowApi.open.firstCall.args[0]).to.match(
-        /^http\:\/\/acme.com\/login\?return\=/);
+      /^http\:\/\/acme.com\/login\?return\=/
+    );
   });
 
   it('should call window.open in the same microtask with promise', () => {
@@ -243,162 +253,194 @@ describes.sandboxed('WebLoginDialog', {}, () => {
 
   it('should yield error if window.open fails', () => {
     // Open is called twice due to retry on _top.
-    windowMock.expects('open').twice().throws('OPEN ERROR');
+    windowMock
+      .expects('open')
+      .twice()
+      .throws('OPEN ERROR');
     return openLoginDialog(ampdoc, 'http://acme.com/login')
-        .then(() => 'SUCCESS', error => 'ERROR ' + error)
-        .then(result => {
-          expect(result).to.match(/OPEN ERROR/);
-          expect(windowApi.messageListener).to.not.exist;
-        });
+      .then(() => 'SUCCESS', error => 'ERROR ' + error)
+      .then(result => {
+        expect(result).to.match(/OPEN ERROR/);
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 
   it('should yield error if window.open returns null', () => {
     // Open is called twice due to retry on _top.
-    windowMock.expects('open').twice().returns(null);
+    windowMock
+      .expects('open')
+      .twice()
+      .returns(null);
     return openLoginDialog(ampdoc, 'http://acme.com/login')
-        .then(() => 'SUCCESS', error => 'ERROR ' + error)
-        .then(result => {
-          expect(result).to.match(/failed to open dialog/);
-          expect(windowApi.messageListener).to.not.exist;
-        });
+      .then(() => 'SUCCESS', error => 'ERROR ' + error)
+      .then(result => {
+        expect(result).to.match(/failed to open dialog/);
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 
   it('should yield error if window.open returns null with promise', () => {
     // Open is called twice due to retry on _top.
-    windowMock.expects('open').twice().returns(null);
+    windowMock
+      .expects('open')
+      .twice()
+      .returns(null);
     return openLoginDialog(ampdoc, Promise.resolve('http://acme.com/login'))
-        .then(() => 'SUCCESS', error => 'ERROR ' + error)
-        .then(result => {
-          expect(result).to.match(/failed to open dialog/);
-          expect(windowApi.messageListener).to.not.exist;
-        });
+      .then(() => 'SUCCESS', error => 'ERROR ' + error)
+      .then(result => {
+        expect(result).to.match(/failed to open dialog/);
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 
   it('should respond when window.open succeeds', () => {
-    windowMock.expects('open').once().returns(dialog);
+    windowMock
+      .expects('open')
+      .once()
+      .returns(dialog);
     const promise = openLoginDialog(ampdoc, 'http://acme.com/login');
     return Promise.resolve()
-        .then(() => {
-          succeed();
-          return promise;
-        })
-        .then(result => {
-          expect(result).to.equal('#success=true');
-          expect(windowApi.messageListener).to.not.exist;
-        });
+      .then(() => {
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 
   it('should have correct window.open params', () => {
-    windowMock.expects('open')
-        .withExactArgs(
-            'http://acme.com/login?return=' + RETURN_URL_ESC,
-            '_blank',
-            'height=450,width=700,left=150,top=275' +
-            ',resizable=yes,scrollbars=yes')
-        .returns(dialog)
-        .once();
-    dialogMock.expects('postMessage')
-        .withExactArgs(
-            sinon.match(arg => {
-              return (arg.sentinel == 'amp' && arg.type == 'result-ack');
-            }),
-            'http://localhost:8000')
-        .once();
+    windowMock
+      .expects('open')
+      .withExactArgs(
+        'http://acme.com/login?return=' + RETURN_URL_ESC,
+        '_blank',
+        'height=450,width=700,left=150,top=275' +
+          ',resizable=yes,scrollbars=yes'
+      )
+      .returns(dialog)
+      .once();
+    dialogMock
+      .expects('postMessage')
+      .withExactArgs(
+        sinon.match(arg => {
+          return arg.sentinel == 'amp' && arg.type == 'result-ack';
+        }),
+        'http://localhost:8000'
+      )
+      .once();
     const promise = openLoginDialog(ampdoc, 'http://acme.com/login');
     return Promise.resolve()
-        .then(() => {
-          succeed();
-          return promise;
-        })
-        .then(result => {
-          expect(result).to.equal('#success=true');
-        });
+      .then(() => {
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+      });
   });
 
   it('should have correct URL with other parameters', () => {
-    windowMock.expects('open')
-        .withExactArgs(
-            'http://acme.com/login?a=1&return=' + RETURN_URL_ESC,
-            '_blank',
-            'height=450,width=700,left=150,top=275' +
-            ',resizable=yes,scrollbars=yes')
-        .returns(dialog)
-        .once();
+    windowMock
+      .expects('open')
+      .withExactArgs(
+        'http://acme.com/login?a=1&return=' + RETURN_URL_ESC,
+        '_blank',
+        'height=450,width=700,left=150,top=275' +
+          ',resizable=yes,scrollbars=yes'
+      )
+      .returns(dialog)
+      .once();
     const promise = openLoginDialog(ampdoc, 'http://acme.com/login?a=1');
     return Promise.resolve()
-        .then(() => {
-          succeed();
-          return promise;
-        })
-        .then(result => {
-          expect(result).to.equal('#success=true');
-        });
+      .then(() => {
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+      });
   });
 
   it('should substitute return URL', () => {
-    windowMock.expects('open')
-        .withExactArgs(
-            'http://acme.com/login?a=1&ret1=' + RETURN_URL_ESC,
-            '_blank',
-            'height=450,width=700,left=150,top=275' +
-            ',resizable=yes,scrollbars=yes')
-        .returns(dialog)
-        .once();
-    const promise = openLoginDialog(ampdoc,
-        'http://acme.com/login?a=1&ret1=RETURN_URL');
+    windowMock
+      .expects('open')
+      .withExactArgs(
+        'http://acme.com/login?a=1&ret1=' + RETURN_URL_ESC,
+        '_blank',
+        'height=450,width=700,left=150,top=275' +
+          ',resizable=yes,scrollbars=yes'
+      )
+      .returns(dialog)
+      .once();
+    const promise = openLoginDialog(
+      ampdoc,
+      'http://acme.com/login?a=1&ret1=RETURN_URL'
+    );
     return Promise.resolve()
-        .then(() => {
-          succeed();
-          return promise;
-        })
-        .then(result => {
-          expect(result).to.equal('#success=true');
-        });
+      .then(() => {
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+      });
   });
 
   it('should override return URL', () => {
     viewer.getResolvedViewerUrl = () => 'http://acme.com/viewer1';
-    windowMock.expects('open')
-        .withArgs(
-            'http://acme.com/login?a=1&ret1=' +
-            encodeURIComponent('http://localhost:8000/extensions' +
-                '/amp-access/0.1/amp-login-done.html?url=' +
-                encodeURIComponent('http://acme.com/viewer1')))
-        .returns(dialog)
-        .once();
-    const promise = openLoginDialog(ampdoc,
-        'http://acme.com/login?a=1&ret1=RETURN_URL');
-    return Promise.resolve().then(() => {
-      succeed();
-      return promise;
-    }).then(result => {
-      expect(result).to.equal('#success=true');
-    });
+    windowMock
+      .expects('open')
+      .withArgs(
+        'http://acme.com/login?a=1&ret1=' +
+          encodeURIComponent(
+            'http://localhost:8000/extensions' +
+              '/amp-access/0.1/amp-login-done.html?url=' +
+              encodeURIComponent('http://acme.com/viewer1')
+          )
+      )
+      .returns(dialog)
+      .once();
+    const promise = openLoginDialog(
+      ampdoc,
+      'http://acme.com/login?a=1&ret1=RETURN_URL'
+    );
+    return Promise.resolve()
+      .then(() => {
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+      });
   });
 
   it('should respond with empty string when dialog is closed', () => {
-    windowMock.expects('open')
-        .returns(dialog)
-        .once();
+    windowMock
+      .expects('open')
+      .returns(dialog)
+      .once();
     dialog.closed = true;
     const promise = openLoginDialog(ampdoc, 'http://acme.com/login?a=1');
     return Promise.resolve()
-        .then(() => {
-          clock.tick(10000);
-          clock.tick(10000);
-          return promise;
-        })
-        .then(res => res, error => 'ERROR ' + error)
-        .then(result => {
-          expect(result).to.equal('');
-        });
+      .then(() => {
+        clock.tick(10000);
+        clock.tick(10000);
+        return promise;
+      })
+      .then(res => res, error => 'ERROR ' + error)
+      .then(result => {
+        expect(result).to.equal('');
+      });
   });
 
   it('should succeed with URL promise', () => {
-    windowMock.expects('open')
-        .withArgs('')
-        .returns(dialog)
-        .once();
+    windowMock
+      .expects('open')
+      .withArgs('')
+      .returns(dialog)
+      .once();
     let urlResolver;
     const urlPromise = new Promise(resolve => {
       urlResolver = resolve;
@@ -407,33 +449,38 @@ describes.sandboxed('WebLoginDialog', {}, () => {
     const promise = dialogObj.open();
     expect(dialogObj.dialogReadyPromise_).to.be.ok;
     urlResolver('http://acme.com/login?a=1');
-    return urlPromise.then(() => {
-      return dialogObj.dialogReadyPromise_;
-    }).then(() => {
-      expect(dialogUrl).to.be.equal(
-          'http://acme.com/login?a=1&return=' + RETURN_URL_ESC);
-      succeed();
-      return promise;
-    }).then(result => {
-      expect(result).to.equal('#success=true');
-      expect(windowApi.messageListener).to.not.exist;
-    });
+    return urlPromise
+      .then(() => {
+        return dialogObj.dialogReadyPromise_;
+      })
+      .then(() => {
+        expect(dialogUrl).to.be.equal(
+          'http://acme.com/login?a=1&return=' + RETURN_URL_ESC
+        );
+        succeed();
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.equal('#success=true');
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 
   it('should fail when URL promise is rejected', () => {
-    windowMock.expects('open')
-        .withArgs('')
-        .returns(dialog)
-        .once();
+    windowMock
+      .expects('open')
+      .withArgs('')
+      .returns(dialog)
+      .once();
     const promise = openLoginDialog(ampdoc, Promise.reject());
     return Promise.resolve()
-        .then(() => {
-          return promise;
-        })
-        .then(() => 'SUCCESS', error => 'ERROR ' + error)
-        .then(result => {
-          expect(result).to.match(/failed to resolve url/);
-          expect(windowApi.messageListener).to.not.exist;
-        });
+      .then(() => {
+        return promise;
+      })
+      .then(() => 'SUCCESS', error => 'ERROR ' + error)
+      .then(result => {
+        expect(result).to.match(/failed to resolve url/);
+        expect(windowApi.messageListener).to.not.exist;
+      });
   });
 });
diff --git a/extensions/amp-accordion/0.1/amp-accordion.js b/extensions/amp-accordion/0.1/amp-accordion.js
index ad9a017aaf10..4dd70d2478ed 100644
--- a/extensions/amp-accordion/0.1/amp-accordion.js
+++ b/extensions/amp-accordion/0.1/amp-accordion.js
@@ -41,7 +41,6 @@ const EXPAND_CURVE_ = bezierCurve(0.47, 0, 0.745, 0.715);
 const COLLAPSE_CURVE_ = bezierCurve(0.39, 0.575, 0.565, 1);
 
 class AmpAccordion extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -65,10 +64,9 @@ class AmpAccordion extends AMP.BaseElement {
     this.action_ = null;
 
     /** @private {number|string} */
-    this.suffix_ = element.id ? element.id :
-      Math.floor(Math.random() * Math.floor(100));
-
-
+    this.suffix_ = element.id
+      ? element.id
+      : Math.floor(Math.random() * Math.floor(100));
   }
 
   /** @override */
@@ -89,16 +87,20 @@ class AmpAccordion extends AMP.BaseElement {
     this.sections_ = this.getRealChildren();
     this.sections_.forEach((section, index) => {
       userAssert(
-          section.tagName.toLowerCase() == 'section',
-          'Sections should be enclosed in a <section> tag, ' +
+        section.tagName.toLowerCase() == 'section',
+        'Sections should be enclosed in a <section> tag, ' +
           'See https://github.com/ampproject/amphtml/blob/master/extensions/' +
-          'amp-accordion/amp-accordion.md. Found in: %s', this.element);
+          'amp-accordion/amp-accordion.md. Found in: %s',
+        this.element
+      );
       const sectionComponents = section.children;
       userAssert(
-          sectionComponents.length == 2,
-          'Each section must have exactly two children. ' +
+        sectionComponents.length == 2,
+        'Each section must have exactly two children. ' +
           'See https://github.com/ampproject/amphtml/blob/master/extensions/' +
-          'amp-accordion/amp-accordion.md. Found in: %s', this.element);
+          'amp-accordion/amp-accordion.md. Found in: %s',
+        this.element
+      );
       const content = sectionComponents[1];
       content.classList.add('i-amphtml-accordion-content');
       let contentId = content.getAttribute('id');
@@ -168,8 +170,10 @@ class AmpAccordion extends AMP.BaseElement {
       header.classList.add('i-amphtml-accordion-header');
       header.setAttribute('role', 'button');
       header.setAttribute('aria-controls', contentId);
-      header.setAttribute('aria-expanded',
-          section.hasAttribute('expanded').toString());
+      header.setAttribute(
+        'aria-expanded',
+        section.hasAttribute('expanded').toString()
+      );
       if (!header.hasAttribute('tabindex')) {
         header.setAttribute('tabindex', 0);
       }
@@ -200,16 +204,21 @@ class AmpAccordion extends AMP.BaseElement {
       return dict();
     }
     try {
-      const sessionStr =
-          this.win./*OK*/sessionStorage.getItem(
-              dev().assertString(this.sessionId_));
+      const sessionStr = this.win./*OK*/ sessionStorage.getItem(
+        dev().assertString(this.sessionId_)
+      );
       return sessionStr
-        ? /** @type {!JsonObject} */ (
-          devAssert(parseJson(dev().assertString(sessionStr))))
+        ? /** @type {!JsonObject} */ (devAssert(
+            parseJson(dev().assertString(sessionStr))
+          ))
         : dict();
     } catch (e) {
-      dev().fine('AMP-ACCORDION',
-          'Error setting session state: %s, %s', e.message, e.stack);
+      dev().fine(
+        'AMP-ACCORDION',
+        'Error setting session state: %s, %s',
+        e.message,
+        e.stack
+      );
       return dict();
     }
   }
@@ -224,11 +233,17 @@ class AmpAccordion extends AMP.BaseElement {
     }
     const sessionStr = JSON.stringify(this.currentState_);
     try {
-      this.win./*OK*/sessionStorage.setItem(
-          dev().assertString(this.sessionId_), sessionStr);
+      this.win./*OK*/ sessionStorage.setItem(
+        dev().assertString(this.sessionId_),
+        sessionStr
+      );
     } catch (e) {
-      dev().fine('AMP-ACCORDION',
-          'Error setting session state: %s, %s', e.message, e.stack);
+      dev().fine(
+        'AMP-ACCORDION',
+        'Error setting session state: %s, %s',
+        e.message,
+        e.stack
+      );
     }
   }
 
@@ -238,8 +253,11 @@ class AmpAccordion extends AMP.BaseElement {
    * @param {!Element} section
    */
   triggerEvent_(name, section) {
-    const event =
-        createCustomEvent(this.win, `accordionSection.${name}`, dict({}));
+    const event = createCustomEvent(
+      this.win,
+      `accordionSection.${name}`,
+      dict({})
+    );
     this.action_.trigger(section, name, event, ActionTrust.HIGH);
 
     this.element.dispatchCustomEvent(name);
@@ -257,11 +275,15 @@ class AmpAccordion extends AMP.BaseElement {
     const content = sectionComponents[1];
     const contentId = content.getAttribute('id');
     const isSectionClosedAfterClick = section.hasAttribute('expanded');
-    const toExpand = (opt_forceExpand == undefined) ?
-      !section.hasAttribute('expanded') : opt_forceExpand;
-
-    if ((toExpand && section.hasAttribute('expanded')) ||
-        (!toExpand && !section.hasAttribute('expanded'))) {
+    const toExpand =
+      opt_forceExpand == undefined
+        ? !section.hasAttribute('expanded')
+        : opt_forceExpand;
+
+    if (
+      (toExpand && section.hasAttribute('expanded')) ||
+      (!toExpand && !section.hasAttribute('expanded'))
+    ) {
       // Caveat: if expand-single-section is added when target section
       // already expanded, it would still short circuit here and
       // not collapsing other sections
@@ -285,7 +307,8 @@ class AmpAccordion extends AMP.BaseElement {
         header.setAttribute('aria-expanded', 'false');
         this.animateCollapse_(section);
       }
-    } else { // Toggle without animation
+    } else {
+      // Toggle without animation
       this.mutateElement(() => {
         if (toExpand) {
           this.triggerEvent_('expand', section);
@@ -328,29 +351,35 @@ class AmpAccordion extends AMP.BaseElement {
     let originalWidthStyle;
     const sectionChild = section.children[1];
 
-    return this.measureMutateElement(() => {
-      sectionWidth = section./*OK*/offsetWidth;
-      originalWidthStyle = getStyle(sectionChild, 'width');
-    }, () => {
-      // We set position and opacity to avoid a FOUC while measuring height.
-      // We set the width for layouts where the height depends on the width.
-      setImportantStyles(sectionChild, {
-        'position': 'fixed',
-        'width': `${sectionWidth}px`,
-        'opacity': '0',
-      });
-      if (!section.hasAttribute('expanded')) {
-        this.triggerEvent_('expand', section);
-        section.setAttribute('expanded', '');
+    return this.measureMutateElement(
+      () => {
+        sectionWidth = section./*OK*/ offsetWidth;
+        originalWidthStyle = getStyle(sectionChild, 'width');
+      },
+      () => {
+        // We set position and opacity to avoid a FOUC while measuring height.
+        // We set the width for layouts where the height depends on the width.
+        setImportantStyles(sectionChild, {
+          'position': 'fixed',
+          'width': `${sectionWidth}px`,
+          'opacity': '0',
+        });
+        if (!section.hasAttribute('expanded')) {
+          this.triggerEvent_('expand', section);
+          section.setAttribute('expanded', '');
+        }
       }
-    }).then(() => {
-      return this.measureMutateElement(
+    )
+      .then(() => {
+        return this.measureMutateElement(
           () => {
-            headerHeight = section./*OK*/offsetHeight;
-            contentHeight = sectionChild./*OK*/offsetHeight;
+            headerHeight = section./*OK*/ offsetHeight;
+            contentHeight = sectionChild./*OK*/ offsetHeight;
             const viewportHeight = this.getViewport().getHeight();
-            duration = this.getTransitionDuration_(Math.abs(contentHeight),
-                viewportHeight);
+            duration = this.getTransitionDuration_(
+              Math.abs(contentHeight),
+              viewportHeight
+            );
           },
           () => {
             setStyles(section, {
@@ -361,30 +390,40 @@ class AmpAccordion extends AMP.BaseElement {
               'opacity': '',
               'width': originalWidthStyle,
             });
-          });
-    }).then(() => {
-      const animation = new Animation(this.element);
-      animation.setCurve(EXPAND_CURVE_);
-      // We expand the whole section to make sure we do not effect the size of
-      // the content.
-      animation.add(0, setStylesTransition(section, {
-        'height': px(numeric(headerHeight, headerHeight + contentHeight)),
-      }), 1);
-      animation.add(0, setStylesTransition(sectionChild, {
-        'opacity': numeric(0,1),
-      }), 1);
-      return animation.start(duration).thenAlways(() => {
-        this.mutateElement(() => {
-          setStyles(section, {
-            'overflow': '',
-            'height': '',
-          });
-          setStyles(sectionChild, {
-            'opacity': '',
+          }
+        );
+      })
+      .then(() => {
+        const animation = new Animation(this.element);
+        animation.setCurve(EXPAND_CURVE_);
+        // We expand the whole section to make sure we do not effect the size of
+        // the content.
+        animation.add(
+          0,
+          setStylesTransition(section, {
+            'height': px(numeric(headerHeight, headerHeight + contentHeight)),
+          }),
+          1
+        );
+        animation.add(
+          0,
+          setStylesTransition(sectionChild, {
+            'opacity': numeric(0, 1),
+          }),
+          1
+        );
+        return animation.start(duration).thenAlways(() => {
+          this.mutateElement(() => {
+            setStyles(section, {
+              'overflow': '',
+              'height': '',
+            });
+            setStyles(sectionChild, {
+              'opacity': '',
+            });
           });
         });
       });
-    });
   }
 
   /**
@@ -398,20 +437,30 @@ class AmpAccordion extends AMP.BaseElement {
     let duration;
     const sectionHeader = section.firstElementChild;
 
-    return this.measureMutateElement(() => {
-      sectionHeight = section./*OK*/offsetHeight;
-      headerHeight = sectionHeader./*OK*/offsetHeight;
-      const viewportHeight = this.getViewport().getSize().height;
-      duration = this.getTransitionDuration_(Math.abs(sectionHeight),
-          viewportHeight);
-    }, () => {
-      setStyles(section, {
-        'overflow': 'hidden',
-      });
-    }).then(() => {
-      return Animation.animate(section, setStylesTransition(section, {
-        'height': px(numeric(sectionHeight, headerHeight)),
-      }), duration, COLLAPSE_CURVE_).thenAlways(() => {
+    return this.measureMutateElement(
+      () => {
+        sectionHeight = section./*OK*/ offsetHeight;
+        headerHeight = sectionHeader./*OK*/ offsetHeight;
+        const viewportHeight = this.getViewport().getSize().height;
+        duration = this.getTransitionDuration_(
+          Math.abs(sectionHeight),
+          viewportHeight
+        );
+      },
+      () => {
+        setStyles(section, {
+          'overflow': 'hidden',
+        });
+      }
+    ).then(() => {
+      return Animation.animate(
+        section,
+        setStylesTransition(section, {
+          'height': px(numeric(sectionHeight, headerHeight)),
+        }),
+        duration,
+        COLLAPSE_CURVE_
+      ).thenAlways(() => {
         return this.mutateElement(() => {
           if (section.hasAttribute('expanded')) {
             this.triggerEvent_('collapse', section);
@@ -441,12 +490,8 @@ class AmpAccordion extends AMP.BaseElement {
     opt_minDur = MIN_TRANSITION_DURATION,
     opt_maxDur = MAX_TRANSITION_DURATION
   ) {
-    const distanceAdjustedDuration = Math.abs(dy) / maxY * opt_maxDur;
-    return clamp(
-        distanceAdjustedDuration,
-        opt_minDur,
-        opt_maxDur
-    );
+    const distanceAdjustedDuration = (Math.abs(dy) / maxY) * opt_maxDur;
+    return clamp(distanceAdjustedDuration, opt_minDur, opt_maxDur);
   }
 
   /**
@@ -501,8 +546,8 @@ class AmpAccordion extends AMP.BaseElement {
   shouldHandleClick_(event) {
     const target = dev().assertElement(event.target);
     const header = dev().assertElement(event.currentTarget);
-    const hasAnchor = !!closest(target, e => (e.tagName == 'A'), header);
-    const hasTapAction = this.action_.hasAction(target,'tap', header);
+    const hasAnchor = !!closest(target, e => e.tagName == 'A', header);
+    const hasTapAction = this.action_.hasAction(target, 'tap', header);
     return !hasAnchor && !hasTapAction;
   }
 
@@ -556,7 +601,6 @@ class AmpAccordion extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpAccordion);
 });
diff --git a/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
index 026c3a3f19b9..19086bb463eb 100644
--- a/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
+++ b/extensions/amp-accordion/0.1/test/integration/test-amp-accordion.js
@@ -27,30 +27,35 @@ describe('amp-accordion', function() {
     </section>
   </amp-accordion>
   `;
-  describes.integration('amp-accordion', {
-    body,
-    extensions,
-  }, env => {
-
-    let win, iframe, doc;
-    beforeEach(() => {
-      win = env.win;
-      iframe = env.iframe;
-      doc = win.document;
-      iframe.width = 300;
-    });
+  describes.integration(
+    'amp-accordion',
+    {
+      body,
+      extensions,
+    },
+    env => {
+      let win, iframe, doc;
+      beforeEach(() => {
+        win = env.win;
+        iframe = env.iframe;
+        doc = win.document;
+        iframe.width = 300;
+      });
 
-    it('should respect the media attribute', () => {
-      const accordion = doc.getElementById('media-accordion');
-      expect(iframe.clientWidth).to.equal(300);
-      expect(accordion.className).to.match(/i-amphtml-hidden-by-media-query/);
-      iframe.width = 600;
-      expect(iframe.clientWidth).to.equal(600);
-      return timeout(200).then(() => {
-        expect(accordion.className).to.not.match(/i-amphtml-hidden-by-media-query/);
+      it('should respect the media attribute', () => {
+        const accordion = doc.getElementById('media-accordion');
+        expect(iframe.clientWidth).to.equal(300);
+        expect(accordion.className).to.match(/i-amphtml-hidden-by-media-query/);
+        iframe.width = 600;
+        expect(iframe.clientWidth).to.equal(600);
+        return timeout(200).then(() => {
+          expect(accordion.className).to.not.match(
+            /i-amphtml-hidden-by-media-query/
+          );
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 /**
diff --git a/extensions/amp-accordion/0.1/test/test-amp-accordion.js b/extensions/amp-accordion/0.1/test/test-amp-accordion.js
index 98e2e9014a19..4c3555de7cc3 100644
--- a/extensions/amp-accordion/0.1/test/test-amp-accordion.js
+++ b/extensions/amp-accordion/0.1/test/test-amp-accordion.js
@@ -20,631 +20,745 @@ import {computedStyle} from '../../../../src/style';
 import {poll} from '../../../../testing/iframe';
 import {tryFocus} from '../../../../src/dom';
 
-
-describes.realWin('amp-accordion', {
-  amp: {
-    extensions: ['amp-accordion'],
+describes.realWin(
+  'amp-accordion',
+  {
+    amp: {
+      extensions: ['amp-accordion'],
+    },
   },
-}, env => {
-  let win, doc;
-  let counter = 0;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    counter += 1;
-  });
-
-  function getAmpAccordionWithContents(contents, opt_shouldSetId) {
-    win.sessionStorage.clear();
-    const ampAccordion = doc.createElement('amp-accordion');
-    if (opt_shouldSetId) {
-      ampAccordion.setAttribute('id', `acc${counter}`);
-    }
-    for (let i = 0; i < contents.length; i++) {
-      const section = doc.createElement('section');
+  env => {
+    let win, doc;
+    let counter = 0;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      counter += 1;
+    });
+
+    function getAmpAccordionWithContents(contents, opt_shouldSetId) {
+      win.sessionStorage.clear();
+      const ampAccordion = doc.createElement('amp-accordion');
       if (opt_shouldSetId) {
-        section.setAttribute('id', `acc${counter}sec${i}`);
+        ampAccordion.setAttribute('id', `acc${counter}`);
       }
-      section.innerHTML = contents[i];
-      ampAccordion.appendChild(section);
-      if (i == 1) {
-        section.setAttribute('expanded', '');
+      for (let i = 0; i < contents.length; i++) {
+        const section = doc.createElement('section');
+        if (opt_shouldSetId) {
+          section.setAttribute('id', `acc${counter}sec${i}`);
+        }
+        section.innerHTML = contents[i];
+        ampAccordion.appendChild(section);
+        if (i == 1) {
+          section.setAttribute('expanded', '');
+        }
       }
+      doc.body.appendChild(ampAccordion);
+      return ampAccordion
+        .build()
+        .then(() => {
+          ampAccordion.implementation_.mutateElement = fn =>
+            new Promise(() => {
+              fn();
+            });
+          return ampAccordion.layoutCallback();
+        })
+        .then(() => ampAccordion);
     }
-    doc.body.appendChild(ampAccordion);
-    return ampAccordion.build().then(() => {
-      ampAccordion.implementation_.mutateElement = fn => new Promise(() => {
-        fn();
-      });
-      return ampAccordion.layoutCallback();
-    }).then(() => ampAccordion);
-  }
-
 
-  function getAmpAccordion(opt_shouldSetId) {
-    const contents = [0, 1, 2].map((i => {
-      return '<h2 tabindex="0">Section ' + i +
-          '<span>nested stuff<span></h2><div id=\'test' + i +
-          '\'>Loreum ipsum</div>';
-    }));
-    return getAmpAccordionWithContents(contents, opt_shouldSetId);
-  }
+    function getAmpAccordion(opt_shouldSetId) {
+      const contents = [0, 1, 2].map(i => {
+        return (
+          '<h2 tabindex="0">Section ' +
+          i +
+          "<span>nested stuff<span></h2><div id='test" +
+          i +
+          "'>Loreum ipsum</div>"
+        );
+      });
+      return getAmpAccordionWithContents(contents, opt_shouldSetId);
+    }
 
-  it('should expand when toggle action is triggered on a collapsed section',
-      () => {
-        return getAmpAccordion().then(ampAccordion => {
-          const impl = ampAccordion.implementation_;
-          const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[0].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('false');
-          impl.toggle_(headerElements[0].parentNode);
-          expect(headerElements[0].parentNode
-              .hasAttribute('expanded')).to.be.true;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('true');
-        });
+    it('should expand when toggle action is triggered on a collapsed section', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        impl.toggle_(headerElements[0].parentNode);
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
       });
+    });
 
-  it('multiple accordions should not have the same IDs on content',
-      () => {
+    it('multiple accordions should not have the same IDs on content', () => {
+      return getAmpAccordion().then(() => {
         return getAmpAccordion().then(() => {
-          return getAmpAccordion().then(() => {
-            const contentElements =
-              doc.getElementsByClassName('i-amphtml-accordion-content');
-            for (let i = 0; i < contentElements.length; i++) {
-              expect(contentElements[i].id.startsWith(
-                  '_AMP_content_')).to.be.false;
-            }
-          });
+          const contentElements = doc.getElementsByClassName(
+            'i-amphtml-accordion-content'
+          );
+          for (let i = 0; i < contentElements.length; i++) {
+            expect(contentElements[i].id.startsWith('_AMP_content_')).to.be
+              .false;
+          }
         });
       });
+    });
 
-  it('should collapse when toggle action is triggered on a expanded section',
-      () => {
-        return getAmpAccordion().then(ampAccordion => {
-          const impl = ampAccordion.implementation_;
-          const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.true;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('true');
-          impl.toggle_(headerElements[1].parentNode);
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('false');
-        });
+    it('should collapse when toggle action is triggered on a expanded section', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        impl.toggle_(headerElements[1].parentNode);
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
       });
+    });
+
+    it('should expand when expand action is triggered on a collapsed section', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        impl.expand_(headerElements[0].parentNode);
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+      });
+    });
 
-  it('should expand when expand action is triggered on a collapsed section',
+    it(
+      'should collapse other sections when expand action is triggered on a ' +
+        'collapsed section if expand-single-section attribute is set',
       () => {
         return getAmpAccordion().then(ampAccordion => {
+          ampAccordion.setAttribute('expand-single-section', '');
+          expect(ampAccordion.hasAttribute('expand-single-section')).to.be.true;
           const impl = ampAccordion.implementation_;
           const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[0].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('false');
+            'section > *:first-child'
+          );
+          // second section is expanded by default
+          expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+            .true;
+          expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+            'true'
+          );
+
+          // expand the first section
           impl.expand_(headerElements[0].parentNode);
-          expect(headerElements[0]
-              .parentNode.hasAttribute('expanded')).to.be.true;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('true');
+
+          // we expect the first section to be expanded
+          expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+            .true;
+          expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+            'true'
+          );
+
+          // we expect the second section to be collapsed
+          expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+            .false;
+          expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+            'false'
+          );
         });
-      });
+      }
+    );
+
+    it(
+      "should trigger a section's expand event the section is expanded " +
+        'without animation',
+      () => {
+        let impl;
+        return getAmpAccordion(true)
+          .then(ampAccordion => {
+            impl = ampAccordion.implementation_;
+            impl.sections_[0].setAttribute(
+              'on',
+              `expand:acc${counter}.expand(section='acc${counter}sec${2}')`
+            );
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
+            impl.toggle_(impl.sections_[0], true);
+            return poll('wait for first section to expand', () =>
+              impl.sections_[0].hasAttribute('expanded')
+            );
+          })
+          .then(() => {
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.true;
+          });
+      }
+    );
 
-  it('should collapse other sections when expand action is triggered on a ' +
-    'collapsed section if expand-single-section attribute is set',
-  () => {
-    return getAmpAccordion().then(ampAccordion => {
-      ampAccordion.setAttribute('expand-single-section', '');
-      expect(ampAccordion.hasAttribute('expand-single-section')).to.be.true;
+    it(
+      "should trigger a section's collapse event the section is expanded " +
+        'without animation',
+      () => {
+        let impl;
+        return getAmpAccordion(true)
+          .then(ampAccordion => {
+            impl = ampAccordion.implementation_;
+            impl.sections_[1].setAttribute(
+              'on',
+              `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`
+            );
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
+            impl.toggle_(impl.sections_[1], false);
+            return poll(
+              'wait for first section to expand',
+              () => !impl.sections_[1].hasAttribute('expanded')
+            );
+          })
+          .then(() => {
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.true;
+          });
+      }
+    );
+
+    it(
+      "should trigger a section's expand event the section is expanded " +
+        'with animation',
+      () => {
+        let impl;
+        return getAmpAccordion(true)
+          .then(ampAccordion => {
+            ampAccordion.setAttribute('animate', '');
+            impl = ampAccordion.implementation_;
+            impl.sections_[0].setAttribute(
+              'on',
+              `expand:acc${counter}.expand(section='acc${counter}sec${2}')`
+            );
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
+            impl.toggle_(impl.sections_[0], true);
+            return poll('wait for first section to expand', () =>
+              impl.sections_[0].hasAttribute('expanded')
+            );
+          })
+          .then(() => {
+            return poll('wait for second section to expand', () =>
+              impl.sections_[2].hasAttribute('expanded')
+            );
+          });
+      }
+    );
+
+    it(
+      "should trigger a section's collapse event the section is expanded " +
+        'with animation',
+      () => {
+        let impl;
+        return getAmpAccordion(true)
+          .then(ampAccordion => {
+            ampAccordion.setAttribute('animate', '');
+            impl = ampAccordion.implementation_;
+            impl.sections_[1].setAttribute(
+              'on',
+              `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`
+            );
+            expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
+            impl.toggle_(impl.sections_[1], false);
+            return poll(
+              'wait for first section to expand',
+              () => !impl.sections_[1].hasAttribute('expanded')
+            );
+          })
+          .then(() => {
+            return poll('wait for second section to expand', () =>
+              impl.sections_[2].hasAttribute('expanded')
+            );
+          });
+      }
+    );
+
+    it('should size responsive children correctly when animating', async () => {
+      const contents = [
+        `
+      <h2>Section header</h2>
+      <amp-layout layout="responsive" width="3" height="2"></amp-layout>
+    `,
+      ];
+      const ampAccordion = await getAmpAccordionWithContents(contents, true);
       const impl = ampAccordion.implementation_;
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      // second section is expanded by default
-      expect(headerElements[1]
-          .parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[1]
-          .getAttribute('aria-expanded')).to.equal('true');
-
-      // expand the first section
-      impl.expand_(headerElements[0].parentNode);
-
-      // we expect the first section to be expanded
-      expect(headerElements[0].parentNode
-          .hasAttribute('expanded')).to.be.true;
-      expect(headerElements[0]
-          .getAttribute('aria-expanded')).to.equal('true');
-
-      // we expect the second section to be collapsed
-      expect(headerElements[1]
-          .parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[1]
-          .getAttribute('aria-expanded')).to.equal('false');
-    });
-  });
-
-  it('should trigger a section\'s expand event the section is expanded ' +
-    'without animation',
-  () => {
-    let impl;
-    return getAmpAccordion(true).then(ampAccordion => {
-      impl = ampAccordion.implementation_;
-      impl.sections_[0].setAttribute('on',
-          `expand:acc${counter}.expand(section='acc${counter}sec${2}')`);
-      expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-      impl.toggle_(impl.sections_[0], true);
-      return poll('wait for first section to expand',
-          () => impl.sections_[0].hasAttribute('expanded'));
-    })
-        .then(() => {
-          expect(impl.sections_[2].hasAttribute('expanded')).to.be.true;
-        });
-  });
-
-  it('should trigger a section\'s collapse event the section is expanded ' +
-    'without animation',
-  () => {
-    let impl;
-    return getAmpAccordion(true).then(ampAccordion => {
-      impl = ampAccordion.implementation_;
-      impl.sections_[1].setAttribute('on',
-          `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`);
-      expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-      impl.toggle_(impl.sections_[1], false);
-      return poll('wait for first section to expand',
-          () => !impl.sections_[1].hasAttribute('expanded'));
-    })
-        .then(() => {
-          expect(impl.sections_[2].hasAttribute('expanded')).to.be.true;
-        });
-  });
+      const firstSection = impl.sections_[0];
+      const content = firstSection.querySelector('amp-layout');
 
-  it('should trigger a section\'s expand event the section is expanded ' +
-    'with animation',
-  () => {
-    let impl;
-    return getAmpAccordion(true).then(ampAccordion => {
       ampAccordion.setAttribute('animate', '');
-      impl = ampAccordion.implementation_;
-      impl.sections_[0].setAttribute('on',
-          `expand:acc${counter}.expand(section='acc${counter}sec${2}')`);
-      expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-      impl.toggle_(impl.sections_[0], true);
-      return poll('wait for first section to expand',
-          () => impl.sections_[0].hasAttribute('expanded'));
-    }).then(() => {
-      return poll('wait for second section to expand',
-          () => impl.sections_[2].hasAttribute('expanded'));
+      ampAccordion.style.width = '300px';
+      impl.toggle_(firstSection, true);
+      await poll('wait for first section to finish animating', () => {
+        return (
+          firstSection.hasAttribute('expanded') &&
+          computedStyle(win, content).opacity == '1'
+        );
+      });
+
+      expect(content.getBoundingClientRect()).to.include({
+        width: 300,
+        height: 200,
+      });
     });
-  });
 
-  it('should trigger a section\'s collapse event the section is expanded ' +
-    'with animation',
-  () => {
-    let impl;
-    return getAmpAccordion(true).then(ampAccordion => {
+    it('should size fixed size children correctly when animating', async () => {
+      const contents = [
+        `
+      <h2>Section header</h2>
+      <amp-layout layout="fixed" width="300" height="200"></amp-layout>
+    `,
+      ];
+      const ampAccordion = await getAmpAccordionWithContents(contents, true);
+      const impl = ampAccordion.implementation_;
+      const firstSection = impl.sections_[0];
+      const content = firstSection.querySelector('amp-layout');
+
       ampAccordion.setAttribute('animate', '');
-      impl = ampAccordion.implementation_;
-      impl.sections_[1].setAttribute('on',
-          `collapse:acc${counter}.expand(section='acc${counter}sec${2}')`);
-      expect(impl.sections_[2].hasAttribute('expanded')).to.be.false;
-      impl.toggle_(impl.sections_[1], false);
-      return poll('wait for first section to expand',
-          () => !impl.sections_[1].hasAttribute('expanded'));
-    }).then(() => {
-      return poll('wait for second section to expand',
-          () => impl.sections_[2].hasAttribute('expanded'));
+      ampAccordion.style.width = '400px';
+      impl.toggle_(firstSection, true);
+      await poll('wait for first section to finish animating', () => {
+        return (
+          firstSection.hasAttribute('expanded') &&
+          computedStyle(win, content).opacity == '1'
+        );
+      });
+
+      expect(content.getBoundingClientRect()).to.include({
+        width: 300,
+        height: 200,
+      });
     });
-  });
 
-  it('should size responsive children correctly when animating', async() => {
-    const contents = [`
-      <h2>Section header</h2>
-      <amp-layout layout="responsive" width="3" height="2"></amp-layout>
-    `];
-    const ampAccordion = await getAmpAccordionWithContents(contents, true);
-    const impl = ampAccordion.implementation_;
-    const firstSection = impl.sections_[0];
-    const content = firstSection.querySelector('amp-layout');
-
-    ampAccordion.setAttribute('animate', '');
-    ampAccordion.style.width = '300px';
-    impl.toggle_(firstSection, true);
-    await poll('wait for first section to finish animating', () => {
-      return firstSection.hasAttribute('expanded') &&
-          computedStyle(win, content).opacity == '1';
+    it('should stay expanded on the expand action when expanded', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        impl.expand_(headerElements[1].parentNode);
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+      });
     });
 
-    expect(content.getBoundingClientRect()).to.include({
-      width: 300,
-      height: 200,
+    it('should collapse on the collapse action when expanded', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        impl.collapse_(headerElements[1].parentNode);
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+      });
     });
-  });
 
-  it('should size fixed size children correctly when animating', async() => {
-    const contents = [`
-      <h2>Section header</h2>
-      <amp-layout layout="fixed" width="300" height="200"></amp-layout>
-    `];
-    const ampAccordion = await getAmpAccordionWithContents(contents, true);
-    const impl = ampAccordion.implementation_;
-    const firstSection = impl.sections_[0];
-    const content = firstSection.querySelector('amp-layout');
-
-    ampAccordion.setAttribute('animate', '');
-    ampAccordion.style.width = '400px';
-    impl.toggle_(firstSection, true);
-    await poll('wait for first section to finish animating', () => {
-      return firstSection.hasAttribute('expanded') &&
-          computedStyle(win, content).opacity == '1';
+    it('should stay collapsed on the collapse action when collapsed', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        impl.collapse_(headerElements[0].parentNode);
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+      });
+    });
+
+    it('should expand when header of a collapsed section is clicked', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const clickEvent = {
+          target: headerElements[0],
+          currentTarget: headerElements[0],
+          preventDefault: sandbox.spy(),
+        };
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        ampAccordion.implementation_.onHeaderPicked_(clickEvent);
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        expect(clickEvent.preventDefault.called).to.be.true;
+      });
+    });
+
+    it("should expand section when header's child is clicked", () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const header = headerElements[0];
+        const child = doc.createElement('div');
+        header.appendChild(child);
+        const clickEvent = {
+          target: child,
+          currentTarget: header,
+          preventDefault: sandbox.spy(),
+        };
+        expect(header.parentNode.hasAttribute('expanded')).to.be.false;
+        expect(header.getAttribute('aria-expanded')).to.equal('false');
+        ampAccordion.implementation_.onHeaderPicked_(clickEvent);
+        expect(header.parentNode.hasAttribute('expanded')).to.be.true;
+        expect(header.getAttribute('aria-expanded')).to.equal('true');
+        expect(clickEvent.preventDefault).to.have.been.called;
+      });
+    });
+
+    it('should collapse when header of an expanded section is clicked', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const clickEvent = {
+          target: headerElements[1],
+          currentTarget: headerElements[1],
+          preventDefault: sandbox.spy(),
+        };
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        ampAccordion.implementation_.onHeaderPicked_(clickEvent);
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        expect(clickEvent.preventDefault).to.have.been.called;
+      });
     });
 
-    expect(content.getBoundingClientRect()).to.include({
-      width: 300,
-      height: 200,
+    it('should allow for clickable links in header', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const a = doc.createElement('a');
+        headerElements[0].appendChild(a);
+        const aClickEvent = {
+          target: a,
+          currentTarget: headerElements[0],
+          preventDefault: sandbox.spy(),
+        };
+        ampAccordion.implementation_.clickHandler_(aClickEvent);
+        expect(aClickEvent.preventDefault).to.not.have.been.called;
+      });
     });
-  });
 
-  it('should stay expanded on the expand action when expanded',
+    it(
+      'should expand when header of a collapsed section is ' +
+        'activated via keyboard',
       () => {
         return getAmpAccordion().then(ampAccordion => {
-          const impl = ampAccordion.implementation_;
           const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.true;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('true');
-          impl.expand_(headerElements[1].parentNode);
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.true;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('true');
+            'section > *:first-child'
+          );
+          const keyDownEvent = {
+            key: Keys.SPACE,
+            target: headerElements[0],
+            currentTarget: headerElements[0],
+            preventDefault: sandbox.spy(),
+          };
+          expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+            .false;
+          expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+            'false'
+          );
+          ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
+          expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+            .true;
+          expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+            'true'
+          );
+          expect(keyDownEvent.preventDefault.called).to.be.true;
         });
-      });
+      }
+    );
 
-  it('should collapse on the collapse action when expanded',
+    it(
+      "should NOT expand section when header's child is " +
+        'activated via keyboard',
       () => {
         return getAmpAccordion().then(ampAccordion => {
-          const impl = ampAccordion.implementation_;
           const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.true;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('true');
-          impl.collapse_(headerElements[1].parentNode);
-          expect(headerElements[1].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[1]
-              .getAttribute('aria-expanded')).to.equal('false');
+            'section > *:first-child'
+          );
+          const child = doc.createElement('div');
+          headerElements[0].appendChild(child);
+          const keyDownEvent = {
+            key: Keys.ENTER,
+            target: child,
+            currentTarget: headerElements[0],
+            preventDefault: sandbox.spy(),
+          };
+          expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+            .false;
+          expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+            'false'
+          );
+          ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
+          expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+            .false;
+          expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+            'false'
+          );
+          expect(keyDownEvent.preventDefault.called).to.be.false;
         });
-      });
+      }
+    );
 
-  it('should stay collapsed on the collapse action when collapsed',
+    it(
+      'should collapse when header of an expanded section is ' +
+        'activated via keyboard',
       () => {
         return getAmpAccordion().then(ampAccordion => {
-          const impl = ampAccordion.implementation_;
           const headerElements = doc.querySelectorAll(
-              'section > *:first-child');
-          expect(headerElements[0].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('false');
-          impl.collapse_(headerElements[0].parentNode);
-          expect(headerElements[0].parentNode
-              .hasAttribute('expanded')).to.be.false;
-          expect(headerElements[0]
-              .getAttribute('aria-expanded')).to.equal('false');
+            'section > *:first-child'
+          );
+          const keyDownEvent = {
+            key: Keys.ENTER,
+            target: headerElements[1],
+            currentTarget: headerElements[1],
+            preventDefault: sandbox.spy(),
+          };
+          expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+            .true;
+          expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+            'true'
+          );
+          ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
+          expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+            .false;
+          expect(headerElements[1].getAttribute('aria-expanded')).to.equal(
+            'false'
+          );
+          expect(keyDownEvent.preventDefault.called).to.be.true;
         });
-      });
-
-  it('should expand when header of a collapsed section is clicked', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const clickEvent = {
-        target: headerElements[0],
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      ampAccordion.implementation_.onHeaderPicked_(clickEvent);
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
-      expect(clickEvent.preventDefault.called).to.be.true;
-    });
-  });
-
-  it('should expand section when header\'s child is clicked', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const header = headerElements[0];
-      const child = doc.createElement('div');
-      header.appendChild(child);
-      const clickEvent = {
-        target: child,
-        currentTarget: header,
-        preventDefault: sandbox.spy(),
-      };
-      expect(header.parentNode.hasAttribute('expanded')).to.be.false;
-      expect(header.getAttribute('aria-expanded')).to.equal('false');
-      ampAccordion.implementation_.onHeaderPicked_(clickEvent);
-      expect(header.parentNode.hasAttribute('expanded')).to.be.true;
-      expect(header.getAttribute('aria-expanded')).to.equal('true');
-      expect(clickEvent.preventDefault).to.have.been.called;
-    });
-  });
-
-  it('should collapse when header of an expanded section is clicked', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const clickEvent = {
-        target: headerElements[1],
-        currentTarget: headerElements[1],
-        preventDefault: sandbox.spy(),
-      };
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
-      ampAccordion.implementation_.onHeaderPicked_(clickEvent);
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[1].getAttribute('aria-expanded')).to.equal('false');
-      expect(clickEvent.preventDefault).to.have.been.called;
-    });
-  });
-
-  it('should allow for clickable links in header', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const a = doc.createElement('a');
-      headerElements[0].appendChild(a);
-      const aClickEvent = {
-        target: a,
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      ampAccordion.implementation_.clickHandler_(aClickEvent);
-      expect(aClickEvent.preventDefault).to.not.have.been.called;
-    });
-  });
-
-  it('should expand when header of a collapsed section is ' +
-     'activated via keyboard', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const keyDownEvent = {
-        key: Keys.SPACE,
-        target: headerElements[0],
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
-      expect(keyDownEvent.preventDefault.called).to.be.true;
-    });
-  });
-
-  it('should NOT expand section when header\'s child is ' +
-     'activated via keyboard', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const child = doc.createElement('div');
-      headerElements[0].appendChild(child);
-      const keyDownEvent = {
-        key: Keys.ENTER,
-        target: child,
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      expect(keyDownEvent.preventDefault.called).to.be.false;
-    });
-  });
-
-  it('should collapse when header of an expanded section is ' +
-     'activated via keyboard', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const keyDownEvent = {
-        key: Keys.ENTER,
-        target: headerElements[1],
-        currentTarget: headerElements[1],
-        preventDefault: sandbox.spy(),
-      };
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[1].getAttribute('aria-expanded')).to.equal('true');
-      ampAccordion.implementation_.keyDownHandler_(keyDownEvent);
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[1].getAttribute('aria-expanded')).to.equal('false');
-      expect(keyDownEvent.preventDefault.called).to.be.true;
-    });
-  });
-
-  it('should be navigable by up and down arrow keys when ' +
-     'any header has focus', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      // Focus the first header,
-      tryFocus(headerElements[0]);
-      expect(doc.activeElement)
-          .to.equal(headerElements[0]);
-      const upArrowEvent = {
-        key: Keys.UP_ARROW,
-        target: headerElements[0],
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      ampAccordion.implementation_.keyDownHandler_(upArrowEvent);
-      expect(doc.activeElement)
-          .to.equal(headerElements[headerElements.length - 1]);
-      const downArrowEvent = {
-        key: Keys.DOWN_ARROW,
-        target: headerElements[headerElements.length - 1],
-        currentTarget: headerElements[headerElements.length - 1],
-        preventDefault: sandbox.spy(),
-      };
-      ampAccordion.implementation_.keyDownHandler_(downArrowEvent);
-      expect(doc.activeElement).to.equal(headerElements[0]);
-    });
-  });
+      }
+    );
 
-  it('should return correct sessionStorageKey', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const impl = ampAccordion.implementation_;
-      const url = win.location.href;
-      impl.element.id = '321';
-      const id = impl.getSessionStorageKey_();
-      const correctId = 'amp-321-' + url;
-      expect(id).to.be.equal(correctId);
+    it(
+      'should be navigable by up and down arrow keys when ' +
+        'any header has focus',
+      () => {
+        return getAmpAccordion().then(ampAccordion => {
+          const headerElements = doc.querySelectorAll(
+            'section > *:first-child'
+          );
+          // Focus the first header,
+          tryFocus(headerElements[0]);
+          expect(doc.activeElement).to.equal(headerElements[0]);
+          const upArrowEvent = {
+            key: Keys.UP_ARROW,
+            target: headerElements[0],
+            currentTarget: headerElements[0],
+            preventDefault: sandbox.spy(),
+          };
+          ampAccordion.implementation_.keyDownHandler_(upArrowEvent);
+          expect(doc.activeElement).to.equal(
+            headerElements[headerElements.length - 1]
+          );
+          const downArrowEvent = {
+            key: Keys.DOWN_ARROW,
+            target: headerElements[headerElements.length - 1],
+            currentTarget: headerElements[headerElements.length - 1],
+            preventDefault: sandbox.spy(),
+          };
+          ampAccordion.implementation_.keyDownHandler_(downArrowEvent);
+          expect(doc.activeElement).to.equal(headerElements[0]);
+        });
+      }
+    );
+
+    it('should return correct sessionStorageKey', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const url = win.location.href;
+        impl.element.id = '321';
+        const id = impl.getSessionStorageKey_();
+        const correctId = 'amp-321-' + url;
+        expect(id).to.be.equal(correctId);
+      });
     });
-  });
 
-  it('should set sessionStorage on change in expansion', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const impl = ampAccordion.implementation_;
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const clickEventExpandElement = {
-        target: headerElements[0],
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      const clickEventCollapseElement = {
-        target: headerElements[1],
-        currentTarget: headerElements[1],
-        preventDefault: sandbox.spy(),
-      };
-      expect(Object.keys(impl.currentState_)).to.have.length(0);
-      impl.onHeaderPicked_(clickEventExpandElement);
-      expect(Object.keys(impl.currentState_)).to.have.length(1);
-      expect(impl.currentState_['test0']).to.be.true;
-      impl.onHeaderPicked_(clickEventCollapseElement);
-      expect(Object.keys(impl.currentState_)).to.have.length(2);
-      expect(impl.currentState_['test0']).to.be.true;
-      expect(impl.currentState_['test1']).to.be.false;
+    it('should set sessionStorage on change in expansion', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const clickEventExpandElement = {
+          target: headerElements[0],
+          currentTarget: headerElements[0],
+          preventDefault: sandbox.spy(),
+        };
+        const clickEventCollapseElement = {
+          target: headerElements[1],
+          currentTarget: headerElements[1],
+          preventDefault: sandbox.spy(),
+        };
+        expect(Object.keys(impl.currentState_)).to.have.length(0);
+        impl.onHeaderPicked_(clickEventExpandElement);
+        expect(Object.keys(impl.currentState_)).to.have.length(1);
+        expect(impl.currentState_['test0']).to.be.true;
+        impl.onHeaderPicked_(clickEventCollapseElement);
+        expect(Object.keys(impl.currentState_)).to.have.length(2);
+        expect(impl.currentState_['test0']).to.be.true;
+        expect(impl.currentState_['test1']).to.be.false;
+      });
     });
-  });
 
-  it('should respect session states and expand/collapse', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const impl = ampAccordion.implementation_;
-      let headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('false');
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be.false;
-      impl.getSessionState_ = function() {
-        return {
-          'test0': true,
+    it('should respect session states and expand/collapse', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        let headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'false'
+        );
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        impl.getSessionState_ = function() {
+          return {
+            'test0': true,
+          };
         };
-      };
-      impl.buildCallback();
-      headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be.false;
-      impl.getSessionState_ = function() {
-        return {
-          'test0': true,
-          'test1': false,
+        impl.buildCallback();
+        headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        impl.getSessionState_ = function() {
+          return {
+            'test0': true,
+            'test1': false,
+          };
         };
-      };
-      impl.buildCallback();
-      headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be.true;
-      expect(headerElements[0].getAttribute('aria-expanded')).to.equal('true');
-      expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be.false;
-      expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be.false;
+        impl.buildCallback();
+        headerElements = doc.querySelectorAll('section > *:first-child');
+        expect(headerElements[0].parentNode.hasAttribute('expanded')).to.be
+          .true;
+        expect(headerElements[0].getAttribute('aria-expanded')).to.equal(
+          'true'
+        );
+        expect(headerElements[1].parentNode.hasAttribute('expanded')).to.be
+          .false;
+        expect(headerElements[2].parentNode.hasAttribute('expanded')).to.be
+          .false;
+      });
     });
-  });
 
-  it('should disable sessionStorage when opt-out', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const impl = ampAccordion.implementation_;
-      const setSessionStateSpy = sandbox.spy();
-      const getSessionStateSpy = sandbox.spy();
-      impl.win.sessionStorage.setItem = function() {
-        setSessionStateSpy();
-      };
-      impl.win.sessionStorage.getItem = function() {
-        getSessionStateSpy();
-      };
-
-      ampAccordion.setAttribute('disable-session-states', null);
-      impl.buildCallback();
-      expect(Object.keys(impl.currentState_)).to.have.length(0);
-      const headerElements = doc.querySelectorAll(
-          'section > *:first-child');
-      const clickEventExpandElement = {
-        target: headerElements[0],
-        currentTarget: headerElements[0],
-        preventDefault: sandbox.spy(),
-      };
-      impl.onHeaderPicked_(clickEventExpandElement);
-      expect(getSessionStateSpy).to.not.have.been.called;
-      expect(setSessionStateSpy).to.not.have.been.called;
-      expect(Object.keys(impl.currentState_)).to.have.length(1);
-    });
-  });
+    it('should disable sessionStorage when opt-out', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const impl = ampAccordion.implementation_;
+        const setSessionStateSpy = sandbox.spy();
+        const getSessionStateSpy = sandbox.spy();
+        impl.win.sessionStorage.setItem = function() {
+          setSessionStateSpy();
+        };
+        impl.win.sessionStorage.getItem = function() {
+          getSessionStateSpy();
+        };
 
-  it('two accordions should not affect each other', () => {
-    return getAmpAccordion().then(ampAccordion => {
-      const ampAccordion1 = ampAccordion;
-      const ampAccordion2 = doc.createElement('amp-accordion');
-      for (let i = 0; i < 3; i++) {
-        const section = doc.createElement('section');
-        section.innerHTML = '<h2>Section ' + i +
-            '<span>nested stuff<span></h2><div id=\'test' + i +
-            '\'>Loreum ipsum</div>';
-        ampAccordion2.appendChild(section);
-      }
-      doc.body.appendChild(ampAccordion2);
-      return ampAccordion2.build().then(() => {
-        ampAccordion.implementation_.mutateElement = fn => fn();
-        return ampAccordion.layoutCallback();
-      }).then(() => {
-        const headerElements1 = ampAccordion1.querySelectorAll(
-            'section > *:first-child');
-        const clickEventElement = {
-          target: headerElements1[0],
-          currentTarget: headerElements1[0],
+        ampAccordion.setAttribute('disable-session-states', null);
+        impl.buildCallback();
+        expect(Object.keys(impl.currentState_)).to.have.length(0);
+        const headerElements = doc.querySelectorAll('section > *:first-child');
+        const clickEventExpandElement = {
+          target: headerElements[0],
+          currentTarget: headerElements[0],
           preventDefault: sandbox.spy(),
         };
-        ampAccordion1.implementation_.onHeaderPicked_(clickEventElement);
-        const headerElements2 = ampAccordion2.querySelectorAll(
-            'section > *:first-child');
-        expect(headerElements1[0].parentNode.hasAttribute('expanded'))
-            .to.be.true;
-        expect(headerElements2[0].parentNode.hasAttribute('expanded'))
-            .to.be.false;
+        impl.onHeaderPicked_(clickEventExpandElement);
+        expect(getSessionStateSpy).to.not.have.been.called;
+        expect(setSessionStateSpy).to.not.have.been.called;
+        expect(Object.keys(impl.currentState_)).to.have.length(1);
+      });
+    });
+
+    it('two accordions should not affect each other', () => {
+      return getAmpAccordion().then(ampAccordion => {
+        const ampAccordion1 = ampAccordion;
+        const ampAccordion2 = doc.createElement('amp-accordion');
+        for (let i = 0; i < 3; i++) {
+          const section = doc.createElement('section');
+          section.innerHTML =
+            '<h2>Section ' +
+            i +
+            "<span>nested stuff<span></h2><div id='test" +
+            i +
+            "'>Loreum ipsum</div>";
+          ampAccordion2.appendChild(section);
+        }
+        doc.body.appendChild(ampAccordion2);
+        return ampAccordion2
+          .build()
+          .then(() => {
+            ampAccordion.implementation_.mutateElement = fn => fn();
+            return ampAccordion.layoutCallback();
+          })
+          .then(() => {
+            const headerElements1 = ampAccordion1.querySelectorAll(
+              'section > *:first-child'
+            );
+            const clickEventElement = {
+              target: headerElements1[0],
+              currentTarget: headerElements1[0],
+              preventDefault: sandbox.spy(),
+            };
+            ampAccordion1.implementation_.onHeaderPicked_(clickEventElement);
+            const headerElements2 = ampAccordion2.querySelectorAll(
+              'section > *:first-child'
+            );
+            expect(headerElements1[0].parentNode.hasAttribute('expanded')).to.be
+              .true;
+            expect(headerElements2[0].parentNode.hasAttribute('expanded')).to.be
+              .false;
+          });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-action-macro/0.1/amp-action-macro.js b/extensions/amp-action-macro/0.1/amp-action-macro.js
index 121b998f3ac5..c6193b8f6ea2 100644
--- a/extensions/amp-action-macro/0.1/amp-action-macro.js
+++ b/extensions/amp-action-macro/0.1/amp-action-macro.js
@@ -22,10 +22,9 @@ import {userAssert} from '../../../src/log';
 const TAG = 'amp-action-macro';
 
 /**
-* The <amp-action-macro> element is used to define a reusable action.
-*/
+ * The <amp-action-macro> element is used to define a reusable action.
+ */
 export class AmpActionMacro extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -39,8 +38,10 @@ export class AmpActionMacro extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-action-macro'),
-        'Experiment is off');
+    userAssert(
+      isExperimentOn(this.win, 'amp-action-macro'),
+      'Experiment is off'
+    );
     const {element} = this;
 
     this.actions_ = Services.actionServiceForDoc(element);
@@ -70,20 +71,30 @@ export class AmpActionMacro extends AMP.BaseElement {
       // Verify that the argument variable names defined on the macro are used
       // in the caller invocation.
       for (const arg in args) {
-        userAssert(this.arguments_.includes(arg),
-            'Variable argument name "%s" is not defined in %s',
-            arg, this.element);
+        userAssert(
+          this.arguments_.includes(arg),
+          'Variable argument name "%s" is not defined in %s',
+          arg,
+          this.element
+        );
       }
     }
     if (invocation.caller.tagName.toLowerCase() === TAG) {
-      userAssert(this.isValidMacroReference_(
-          invocation.caller),
-      'Action macro with ID "%s" cannot reference itself or macros defined '
-          + 'after it', this.element.getAttribute('id'));
+      userAssert(
+        this.isValidMacroReference_(invocation.caller),
+        'Action macro with ID "%s" cannot reference itself or macros defined ' +
+          'after it',
+        this.element.getAttribute('id')
+      );
     }
     // Trigger the macro's action.
     this.actions_.trigger(
-        this.element, `${actionEventType}`, event, trust, args);
+      this.element,
+      `${actionEventType}`,
+      event,
+      trust,
+      args
+    );
   }
 
   /** @override */
@@ -100,12 +111,13 @@ export class AmpActionMacro extends AMP.BaseElement {
    * @private
    */
   isValidMacroReference_(invokingElement) {
-    return !!(this.element.compareDocumentPosition(invokingElement)
-        & Node.DOCUMENT_POSITION_FOLLOWING);
+    return !!(
+      this.element.compareDocumentPosition(invokingElement) &
+      Node.DOCUMENT_POSITION_FOLLOWING
+    );
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpActionMacro);
 });
diff --git a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
index ebb3c9a1ac50..90259cf10ae9 100644
--- a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
+++ b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js
@@ -14,169 +14,219 @@
  * limitations under the License.
  */
 
-import {
-  ActionInvocation,
-} from '../../../../src/service/action-impl';
+import {ActionInvocation} from '../../../../src/service/action-impl';
 import {ActionTrust} from '../../../../src/action-constants';
 import {AmpActionMacro} from '../amp-action-macro';
 import {Services} from '../../../../src/services';
-import {
-  toggleExperiment,
-} from '../../../../src/experiments';
-
-describes.realWin('amp-action-macro', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-action-macro'],
+import {toggleExperiment} from '../../../../src/experiments';
+
+describes.realWin(
+  'amp-action-macro',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-action-macro'],
+    },
   },
-}, env => {
+  env => {
+    let win;
+    let doc;
 
-  let win;
-  let doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-
-    toggleExperiment(win, 'amp-action-macro', true);
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
 
-  function newActionMacro() {
-    const actionMacro = doc.createElement('amp-action-macro');
-    doc.body.appendChild(actionMacro);
-    return actionMacro.build().then(() => {
-      return actionMacro.layoutCallback();
+      toggleExperiment(win, 'amp-action-macro', true);
     });
-  }
 
-  it('should build if experiment is on', done => {
-    newActionMacro().then(() => {
-      done();
-    }, unused => {
-      done(new Error('component should have built'));
+    function newActionMacro() {
+      const actionMacro = doc.createElement('amp-action-macro');
+      doc.body.appendChild(actionMacro);
+      return actionMacro.build().then(() => {
+        return actionMacro.layoutCallback();
+      });
+    }
+
+    it('should build if experiment is on', done => {
+      newActionMacro().then(
+        () => {
+          done();
+        },
+        unused => {
+          done(new Error('component should have built'));
+        }
+      );
     });
-  });
 
-  it('should not build if experiment is off', () => {
-    return allowConsoleError(() => {
-      toggleExperiment(env.win, 'amp-action-macro', false);
-      return newActionMacro().catch(err => {
-        expect(err.message).to.include('Experiment is off');
+    it('should not build if experiment is off', () => {
+      return allowConsoleError(() => {
+        toggleExperiment(env.win, 'amp-action-macro', false);
+        return newActionMacro().catch(err => {
+          expect(err.message).to.include('Experiment is off');
+        });
       });
     });
-  });
-
-  describe('registered action', () => {
-    let macro;
-    let callingMacroElement;
-    let referrableMacro;
-    let referrableMacroElement;
-    let unreferrableMacro;
-    let unreferrableMacroElement;
-    beforeEach(() => {
-      toggleExperiment(win, 'amp-action-macro', true);
 
-      // This macro is referrable and can be invoked by the macro element(s)
-      // defined after it.
-      referrableMacroElement = doc.createElement('amp-action-macro');
-      referrableMacroElement.setAttribute(
-          'execute', 'target.execute(index=x,index=y)');
-      referrableMacroElement.setAttribute('arguments', 'x,y');
-      referrableMacroElement.setAttribute('id', 'amp-action-id-referrable');
-
-      callingMacroElement = doc.createElement('amp-action-macro');
-      callingMacroElement.setAttribute(
-          'execute', 'target.execute(index=x,index=y)');
-      callingMacroElement.setAttribute('arguments', 'x,y');
-      callingMacroElement.setAttribute('id', 'amp-action-id');
-
-      // This macro is not referrable as it is defined after the calling macro
-      // element.
-      unreferrableMacroElement = doc.createElement('amp-action-macro');
-      unreferrableMacroElement.setAttribute(
-          'execute', 'target.execute(index=x,index=y)');
-      unreferrableMacroElement.setAttribute('arguments', 'x,y');
-      unreferrableMacroElement.setAttribute('id', 'amp-action-id-unreferrable');
-
-      doc.body.appendChild(referrableMacroElement);
-      doc.body.appendChild(callingMacroElement);
-      doc.body.appendChild(unreferrableMacroElement);
-      referrableMacro = new AmpActionMacro(referrableMacroElement);
-      macro = new AmpActionMacro(callingMacroElement);
-      unreferrableMacro = new AmpActionMacro(unreferrableMacroElement);
-    });
+    describe('registered action', () => {
+      let macro;
+      let callingMacroElement;
+      let referrableMacro;
+      let referrableMacroElement;
+      let unreferrableMacro;
+      let unreferrableMacroElement;
+      beforeEach(() => {
+        toggleExperiment(win, 'amp-action-macro', true);
+
+        // This macro is referrable and can be invoked by the macro element(s)
+        // defined after it.
+        referrableMacroElement = doc.createElement('amp-action-macro');
+        referrableMacroElement.setAttribute(
+          'execute',
+          'target.execute(index=x,index=y)'
+        );
+        referrableMacroElement.setAttribute('arguments', 'x,y');
+        referrableMacroElement.setAttribute('id', 'amp-action-id-referrable');
+
+        callingMacroElement = doc.createElement('amp-action-macro');
+        callingMacroElement.setAttribute(
+          'execute',
+          'target.execute(index=x,index=y)'
+        );
+        callingMacroElement.setAttribute('arguments', 'x,y');
+        callingMacroElement.setAttribute('id', 'amp-action-id');
+
+        // This macro is not referrable as it is defined after the calling macro
+        // element.
+        unreferrableMacroElement = doc.createElement('amp-action-macro');
+        unreferrableMacroElement.setAttribute(
+          'execute',
+          'target.execute(index=x,index=y)'
+        );
+        unreferrableMacroElement.setAttribute('arguments', 'x,y');
+        unreferrableMacroElement.setAttribute(
+          'id',
+          'amp-action-id-unreferrable'
+        );
+
+        doc.body.appendChild(referrableMacroElement);
+        doc.body.appendChild(callingMacroElement);
+        doc.body.appendChild(unreferrableMacroElement);
+        referrableMacro = new AmpActionMacro(referrableMacroElement);
+        macro = new AmpActionMacro(callingMacroElement);
+        unreferrableMacro = new AmpActionMacro(unreferrableMacroElement);
+      });
 
-    it('should register execute action', () => {
-      const registerAction = sandbox.stub(macro, 'registerAction');
-      macro.buildCallback();
-      expect(registerAction).to.have.been.called;
-    });
+      it('should register execute action', () => {
+        const registerAction = sandbox.stub(macro, 'registerAction');
+        macro.buildCallback();
+        expect(registerAction).to.have.been.called;
+      });
 
-    it('should validate caller argument vars against defined arguments',
-        () => {
-          const button = doc.createElement('button');
-          // Given the caller is called with a invalid argument alias 'z'.
-          const callerAction = new ActionInvocation(macro, 'execute',
-              {z: 1}, button, button, {}, ActionTrust.HIGH, 'tap',
-              'AMP-ACTION-MACRO');
-          macro.buildCallback();
-          expect(() => macro.execute_(callerAction)).to.throw(
-              /Variable argument name "z" is not defined/
-          );
-        });
+      it('should validate caller argument vars against defined arguments', () => {
+        const button = doc.createElement('button');
+        // Given the caller is called with a invalid argument alias 'z'.
+        const callerAction = new ActionInvocation(
+          macro,
+          'execute',
+          {z: 1},
+          button,
+          button,
+          {},
+          ActionTrust.HIGH,
+          'tap',
+          'AMP-ACTION-MACRO'
+        );
+        macro.buildCallback();
+        expect(() => macro.execute_(callerAction)).to.throw(
+          /Variable argument name "z" is not defined/
+        );
+      });
 
-    it('should trigger macro action', () => {
-      const actions = {trigger: sandbox.spy()};
-      sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-      const button = doc.createElement('button');
-      // Given the caller was called with a valid defined argument alias
-      // 'x'.
-      const callerAction = new ActionInvocation(macro, 'execute', {x: 1},
-          button, button, {}, ActionTrust.HIGH, 'tap', 'AMP-ACTION-MACRO');
-      macro.buildCallback();
-      macro.execute_(callerAction);
-      expect(actions.trigger).to.have.been.called;
-    });
+      it('should trigger macro action', () => {
+        const actions = {trigger: sandbox.spy()};
+        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+        const button = doc.createElement('button');
+        // Given the caller was called with a valid defined argument alias
+        // 'x'.
+        const callerAction = new ActionInvocation(
+          macro,
+          'execute',
+          {x: 1},
+          button,
+          button,
+          {},
+          ActionTrust.HIGH,
+          'tap',
+          'AMP-ACTION-MACRO'
+        );
+        macro.buildCallback();
+        macro.execute_(callerAction);
+        expect(actions.trigger).to.have.been.called;
+      });
 
-    it('should not allow recursive calls', () => {
-      const actions = {trigger: sandbox.spy()};
-      sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-      // Given the caller is the amp action macro that is also being invoked.
-      const callerAction = new ActionInvocation(macro, 'execute', {x: 1},
-          callingMacroElement, callingMacroElement, {}, ActionTrust.HIGH, 'tap',
-          'AMP-ACTION-MACRO');
-      macro.buildCallback();
-      expect(() => macro.execute_(callerAction)).to.throw(
-          /Action macro with ID "amp-action-id" cannot reference itself or macros defined after it/);
-    });
+      it('should not allow recursive calls', () => {
+        const actions = {trigger: sandbox.spy()};
+        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+        // Given the caller is the amp action macro that is also being invoked.
+        const callerAction = new ActionInvocation(
+          macro,
+          'execute',
+          {x: 1},
+          callingMacroElement,
+          callingMacroElement,
+          {},
+          ActionTrust.HIGH,
+          'tap',
+          'AMP-ACTION-MACRO'
+        );
+        macro.buildCallback();
+        expect(() => macro.execute_(callerAction)).to.throw(
+          /Action macro with ID "amp-action-id" cannot reference itself or macros defined after it/
+        );
+      });
 
-    it('should allow calls to macros defined before itself', () => {
-      const actions = {trigger: sandbox.spy()};
-      sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-      // Given the caller is an amp action macro that was defined before the
-      // action macro being invoked.
-      const callerAction = new ActionInvocation(macro, 'execute', {x: 1},
-          referrableMacroElement, callingMacroElement, {},
-          ActionTrust.HIGH, 'tap',
-          'AMP-ACTION-MACRO');
-      referrableMacro.buildCallback();
-      referrableMacro.execute_(callerAction);
-      expect(actions.trigger).to.have.been.called;
-    });
+      it('should allow calls to macros defined before itself', () => {
+        const actions = {trigger: sandbox.spy()};
+        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+        // Given the caller is an amp action macro that was defined before the
+        // action macro being invoked.
+        const callerAction = new ActionInvocation(
+          macro,
+          'execute',
+          {x: 1},
+          referrableMacroElement,
+          callingMacroElement,
+          {},
+          ActionTrust.HIGH,
+          'tap',
+          'AMP-ACTION-MACRO'
+        );
+        referrableMacro.buildCallback();
+        referrableMacro.execute_(callerAction);
+        expect(actions.trigger).to.have.been.called;
+      });
 
-    it('should not allow calls to macros defined after itself', () => {
-      const actions = {trigger: sandbox.spy()};
-      sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-      // Given the caller is an amp action macro that was defined after the
-      // action macro being invoked.
-      const callerAction = new ActionInvocation(macro, 'execute', {x: 1},
-          unreferrableMacroElement, callingMacroElement, {},
-          ActionTrust.HIGH, 'tap',
-          'AMP-ACTION-MACRO');
-      unreferrableMacro.buildCallback();
-      expect(() => unreferrableMacro.execute_(callerAction)).to.throw(
-          /Action macro with ID "amp-action-id-unreferrable" cannot reference itself or macros defined after it/);
+      it('should not allow calls to macros defined after itself', () => {
+        const actions = {trigger: sandbox.spy()};
+        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+        // Given the caller is an amp action macro that was defined after the
+        // action macro being invoked.
+        const callerAction = new ActionInvocation(
+          macro,
+          'execute',
+          {x: 1},
+          unreferrableMacroElement,
+          callingMacroElement,
+          {},
+          ActionTrust.HIGH,
+          'tap',
+          'AMP-ACTION-MACRO'
+        );
+        unreferrableMacro.buildCallback();
+        expect(() => unreferrableMacro.execute_(callerAction)).to.throw(
+          /Action macro with ID "amp-action-id-unreferrable" cannot reference itself or macros defined after it/
+        );
+      });
     });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-ad-custom/0.1/amp-ad-custom.js b/extensions/amp-ad-custom/0.1/amp-ad-custom.js
index 7d925ab370b3..2351d6b2c412 100644
--- a/extensions/amp-ad-custom/0.1/amp-ad-custom.js
+++ b/extensions/amp-ad-custom/0.1/amp-ad-custom.js
@@ -45,8 +45,10 @@ export class AmpAdTemplate extends AmpAdNetworkBase {
 
     /** @const {string} */
     this.baseRequestUrl_ = this.element.getAttribute('src');
-    devAssert(this.baseRequestUrl_,
-        'Invalid network configuration: no request URL specified');
+    devAssert(
+      this.baseRequestUrl_,
+      'Invalid network configuration: no request URL specified'
+    );
 
     this.getContext().win = this.win;
   }
@@ -70,14 +72,20 @@ export class AmpAdTemplate extends AmpAdNetworkBase {
     Object.keys(this.element.dataset).forEach(dataField => {
       if (startsWith(dataField, DATA_REQUEST_PARAM_PREFIX)) {
         const requestParamName = dataField.slice(
-            DATA_REQUEST_PARAM_PREFIX.length, dataField.length);
+          DATA_REQUEST_PARAM_PREFIX.length,
+          dataField.length
+        );
         if (requestParamName) {
           // Set the first character to lower case, as reading it in camelCase
           // will automatically put it into upper case.
-          const finalParamName = requestParamName.charAt(0).toLowerCase() +
-              requestParamName.slice(1);
+          const finalParamName =
+            requestParamName.charAt(0).toLowerCase() +
+            requestParamName.slice(1);
           url = addParamToUrl(
-              url, finalParamName, this.element.dataset[dataField]);
+            url,
+            finalParamName,
+            this.element.dataset[dataField]
+          );
         }
       }
     });
diff --git a/extensions/amp-ad-custom/0.1/test/test-amp-ad-custom.js b/extensions/amp-ad-custom/0.1/test/test-amp-ad-custom.js
index d0ca3c180fd3..dc1bbb01f1d7 100644
--- a/extensions/amp-ad-custom/0.1/test/test-amp-ad-custom.js
+++ b/extensions/amp-ad-custom/0.1/test/test-amp-ad-custom.js
@@ -20,9 +20,7 @@ import {
 } from '../../../amp-a4a/0.1/template-validator';
 import {AmpAdTemplate} from '../amp-ad-custom';
 import {AmpMustache} from '../../../amp-mustache/0.1/amp-mustache';
-import {
-  data,
-} from '../../../amp-a4a/0.1/test/testdata/valid_css_at_rules_amp.reserialized';
+import {data} from '../../../amp-a4a/0.1/test/testdata/valid_css_at_rules_amp.reserialized';
 import {tryParseJson} from '../../../../src/json';
 import {utf8Encode} from '../../../../src/utils/bytes';
 
@@ -33,7 +31,6 @@ const realWinConfig = {
 };
 
 describes.realWin('TemplateRenderer', realWinConfig, env => {
-
   const templateUrl = '/adzerk/1';
 
   let containerElement;
@@ -49,10 +46,16 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
     });
     containerElement.renderStarted = () => {};
     containerElement.getPageLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.getLayoutBox = () => ({
-      left: 0, top: 0, width: 0, height: 0,
+      left: 0,
+      top: 0,
+      width: 0,
+      height: 0,
     });
     containerElement.getIntersectionChangeEntry = () => ({});
     containerElement.isInViewport = () => true;
@@ -73,15 +76,19 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
   });
 
   describe('Iframe Rendering', () => {
-
     it('should load AMP ad in friendly frame', () => {
       impl.adResponsePromise_ = Promise.resolve({
-        arrayBuffer: () => Promise.resolve(utf8Encode(JSON.stringify({
-          templateUrl,
-          data: {
-            url: 'https://www.google.com',
-          },
-        }))),
+        arrayBuffer: () =>
+          Promise.resolve(
+            utf8Encode(
+              JSON.stringify({
+                templateUrl,
+                data: {
+                  url: 'https://www.google.com',
+                },
+              })
+            )
+          ),
         headers: {
           get: header => {
             switch (header) {
@@ -106,10 +113,11 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
       return impl.layoutCallback().then(() => {
         const iframe = containerElement.querySelector('iframe');
         expect(iframe).to.be.ok;
-        expect(iframe.contentWindow.document.body.innerHTML.trim()).to
-            .equal('<div>\n      <p>ipsum lorem</p>\n      <a href="https://' +
-                'www.google.com/" target="_top">Click for ad!</a>\n    ' +
-                '</div>');
+        expect(iframe.contentWindow.document.body.innerHTML.trim()).to.equal(
+          '<div>\n      <p>ipsum lorem</p>\n      <a href="https://' +
+            'www.google.com/" target="_top">Click for ad!</a>\n    ' +
+            '</div>'
+        );
       });
     });
 
@@ -181,7 +189,8 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
       impl.element.setAttribute('data-request-param-camel-case', '789');
       impl.baseRequestUrl_ = 'https://foo.com';
       expect(impl.getRequestUrl()).to.equal(
-          'https://foo.com?bar=123&baz=456&camelCase=789');
+        'https://foo.com?bar=123&baz=456&camelCase=789'
+      );
     });
   });
 
@@ -189,11 +198,10 @@ describes.realWin('TemplateRenderer', realWinConfig, env => {
     it('should throw if missing src attribute', () => {
       containerElement.removeAttribute('src');
       allowConsoleError(() => {
-        expect(() => new AmpAdTemplate(containerElement)).to
-            .throw('Invalid network configuration: no request URL specified');
+        expect(() => new AmpAdTemplate(containerElement)).to.throw(
+          'Invalid network configuration: no request URL specified'
+        );
       });
     });
   });
 });
-
-
diff --git a/extensions/amp-ad-exit/0.1/amp-ad-exit.js b/extensions/amp-ad-exit/0.1/amp-ad-exit.js
index ca92ebf10535..8bf0072e593b 100644
--- a/extensions/amp-ad-exit/0.1/amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/amp-ad-exit.js
@@ -94,39 +94,47 @@ export class AmpAdExit extends AMP.BaseElement {
     const target = this.targets_[args['target']];
     userAssert(target, `Exit target not found: '${args['target']}'`);
     userAssert(event, 'Unexpected null event');
-    event = /** @type {!../../../src/service/action-impl.ActionEventDef} */(
-      event);
+    event = /** @type {!../../../src/service/action-impl.ActionEventDef} */ (event);
 
     event.preventDefault();
-    if (!this.filter_(this.defaultFilters_, event) ||
-        !this.filter_(target.filters, event)) {
+    if (
+      !this.filter_(this.defaultFilters_, event) ||
+      !this.filter_(target.filters, event)
+    ) {
       return;
     }
-    const substituteVariables =
-        this.getUrlVariableRewriter_(args, event, target);
+    const substituteVariables = this.getUrlVariableRewriter_(
+      args,
+      event,
+      target
+    );
     if (target.trackingUrls) {
-      target.trackingUrls.map(substituteVariables)
-          .forEach(url => this.pingTrackingUrl_(url));
+      target.trackingUrls
+        .map(substituteVariables)
+        .forEach(url => this.pingTrackingUrl_(url));
     }
     const finalUrl = substituteVariables(target.finalUrl);
     if (HostServices.isAvailable(this.getAmpDoc())) {
       HostServices.exitForDoc(this.getAmpDoc())
-          .then(exitService => exitService.openUrl(finalUrl))
-          .catch(error => {
-            // TODO: reporting on errors
-            dev().fine(TAG, 'ExitServiceError - fallback=' + error.fallback);
-            if (error.fallback) {
-              openWindowDialog(this.win, finalUrl, '_blank');
-            }
-          });
+        .then(exitService => exitService.openUrl(finalUrl))
+        .catch(error => {
+          // TODO: reporting on errors
+          dev().fine(TAG, 'ExitServiceError - fallback=' + error.fallback);
+          if (error.fallback) {
+            openWindowDialog(this.win, finalUrl, '_blank');
+          }
+        });
     } else {
-      const clickTarget = (target.behaviors && target.behaviors.clickTarget
-      && target.behaviors.clickTarget == '_top') ? '_top' : '_blank';
+      const clickTarget =
+        target.behaviors &&
+        target.behaviors.clickTarget &&
+        target.behaviors.clickTarget == '_top'
+          ? '_top'
+          : '_blank';
       openWindowDialog(this.win, finalUrl, clickTarget);
     }
   }
 
-
   /**
    * @param {!Object<string, string|number|boolean>} args
    * @param {!../../../src/service/action-impl.ActionEventDef} event
@@ -150,7 +158,7 @@ export class AmpAdExit extends AMP.BaseElement {
           continue;
         }
         const customVar =
-        /** @type {!./config.VariableDef} */ (target['vars'][customVarName]);
+          /** @type {!./config.VariableDef} */ (target['vars'][customVarName]);
         if (!customVar) {
           continue;
         }
@@ -176,25 +184,32 @@ export class AmpAdExit extends AMP.BaseElement {
         */
         substitutionFunctions[customVarName] = () => {
           if (customVar.iframeTransportSignal) {
-            const vendorResponse = replacements./*OK*/expandStringSync(
-                customVar.iframeTransportSignal, {
-                  'IFRAME_TRANSPORT_SIGNAL': (vendor, responseKey) => {
-                    if (!(vendor && responseKey)) {
-                      return '';
-                    }
-                    const vendorResponses = this.vendorResponses_[vendor];
-                    if (vendorResponses && responseKey in vendorResponses) {
-                      return vendorResponses[responseKey];
-                    }
-                  },
-                });
-            if (customVar.iframeTransportSignal ==
-                `IFRAME_TRANSPORT_SIGNAL${vendorResponse}`) {
+            const vendorResponse = replacements./*OK*/ expandStringSync(
+              customVar.iframeTransportSignal,
+              {
+                'IFRAME_TRANSPORT_SIGNAL': (vendor, responseKey) => {
+                  if (!(vendor && responseKey)) {
+                    return '';
+                  }
+                  const vendorResponses = this.vendorResponses_[vendor];
+                  if (vendorResponses && responseKey in vendorResponses) {
+                    return vendorResponses[responseKey];
+                  }
+                },
+              }
+            );
+            if (
+              customVar.iframeTransportSignal ==
+              `IFRAME_TRANSPORT_SIGNAL${vendorResponse}`
+            ) {
               // No substitution occurred, so format string in amp-ad-exit
               // config was invalid
-              dev().error(TAG, 'Invalid IFRAME_TRANSPORT_SIGNAL format:' +
+              dev().error(
+                TAG,
+                'Invalid IFRAME_TRANSPORT_SIGNAL format:' +
                   vendorResponse +
-                  ' (perhaps there is a space after a comma?)');
+                  ' (perhaps there is a space after a comma?)'
+              );
             } else if (vendorResponse != '') {
               // Caveat: If the vendor's response *is* the empty string, then
               // this will cause the arg/default value to be returned.
@@ -204,14 +219,20 @@ export class AmpAdExit extends AMP.BaseElement {
 
           // Either it's not a 3p analytics variable, or it is one
           // but no matching response has been received yet.
-          return (customVarName in args) ?
-            args[customVarName] : customVar.defaultValue;
+          return customVarName in args
+            ? args[customVarName]
+            : customVar.defaultValue;
         };
         whitelist[customVarName] = true;
       }
     }
-    return url => replacements.expandUrlSync(
-        url, substitutionFunctions, undefined /* opt_collectVars */, whitelist);
+    return url =>
+      replacements.expandUrlSync(
+        url,
+        substitutionFunctions,
+        undefined /* opt_collectVars */,
+        whitelist
+      );
   }
 
   /**
@@ -224,9 +245,11 @@ export class AmpAdExit extends AMP.BaseElement {
    */
   pingTrackingUrl_(url) {
     user().fine(TAG, `pinging ${url}`);
-    if (this.transport_.beacon &&
-        this.win.navigator.sendBeacon &&
-        this.win.navigator.sendBeacon(url, '')) {
+    if (
+      this.transport_.beacon &&
+      this.win.navigator.sendBeacon &&
+      this.win.navigator.sendBeacon(url, '')
+    ) {
       return;
     }
     if (this.transport_.image) {
@@ -257,34 +280,50 @@ export class AmpAdExit extends AMP.BaseElement {
 
     // Note that order is expected as part of applying default filter options.
     this.defaultFilters_.push(
-        createFilter('minDelay', makeClickDelaySpec(1000), this));
+      createFilter('minDelay', makeClickDelaySpec(1000), this)
+    );
     this.defaultFilters_.push(
-        createFilter('carouselBtns',
-            makeInactiveElementSpec('.amp-carousel-button'), this));
+      createFilter(
+        'carouselBtns',
+        makeInactiveElementSpec('.amp-carousel-button'),
+        this
+      )
+    );
 
     const {children} = this.element;
-    userAssert(children.length == 1,
-        'The tag should contain exactly one <script> child.');
+    userAssert(
+      children.length == 1,
+      'The tag should contain exactly one <script> child.'
+    );
     const child = children[0];
     userAssert(
-        isJsonScriptTag(child),
-        'The amp-ad-exit config should ' +
-        'be inside a <script> tag with type="application/json"');
+      isJsonScriptTag(child),
+      'The amp-ad-exit config should ' +
+        'be inside a <script> tag with type="application/json"'
+    );
     try {
       const config = assertConfig(parseJson(child.textContent));
       let defaultClickStartTimingEvent;
-      if (isObject(config['options']) &&
-          typeof config['options']['startTimingEvent'] === 'string') {
+      if (
+        isObject(config['options']) &&
+        typeof config['options']['startTimingEvent'] === 'string'
+      ) {
         defaultClickStartTimingEvent = config['options']['startTimingEvent'];
-        this.defaultFilters_.splice(0, 1, createFilter('minDelay',
+        this.defaultFilters_.splice(
+          0,
+          1,
+          createFilter(
+            'minDelay',
             makeClickDelaySpec(1000, config['options']['startTimingEvent']),
-            this));
+            this
+          )
+        );
       }
       for (const name in config['filters']) {
         const spec = config['filters'][name];
         if (spec.type == FilterType.CLICK_DELAY) {
           spec.startTimingEvent =
-              spec.startTimingEvent || defaultClickStartTimingEvent;
+            spec.startTimingEvent || defaultClickStartTimingEvent;
         }
         this.userFilters_[name] = createFilter(name, spec, this);
       }
@@ -294,9 +333,9 @@ export class AmpAdExit extends AMP.BaseElement {
           finalUrl: target['finalUrl'],
           trackingUrls: target['trackingUrls'] || [],
           vars: target['vars'] || {},
-          filters:
-              (target['filters'] || []).map(
-                  f => this.userFilters_[f]).filter(f => f),
+          filters: (target['filters'] || [])
+            .map(f => this.userFilters_[f])
+            .filter(f => f),
           behaviors: target['behaviors'] || {},
         };
         // Build a map of {vendor, origin} for 3p custom variables in the config
@@ -305,20 +344,21 @@ export class AmpAdExit extends AMP.BaseElement {
             continue;
           }
           const matches = target['vars'][customVar].iframeTransportSignal.match(
-              /IFRAME_TRANSPORT_SIGNAL\(([^,]+)/);
+            /IFRAME_TRANSPORT_SIGNAL\(([^,]+)/
+          );
           if (!matches || matches.length < 2) {
             continue;
           }
           const vendor = matches[1];
           const {origin} = parseUrlDeprecated(assertVendor(vendor));
           this.expectedOriginToVendor_[origin] =
-              this.expectedOriginToVendor_[origin] || vendor;
+            this.expectedOriginToVendor_[origin] || vendor;
         }
       }
-      this.transport_.beacon = config['transport'][TransportMode.BEACON]
-          !== false;
-      this.transport_.image = config['transport'][TransportMode.IMAGE]
-          !== false;
+      this.transport_.beacon =
+        config['transport'][TransportMode.BEACON] !== false;
+      this.transport_.image =
+        config['transport'][TransportMode.IMAGE] !== false;
     } catch (e) {
       this.user().error(TAG, 'Invalid JSON config', e);
       throw e;
@@ -369,30 +409,33 @@ export class AmpAdExit extends AMP.BaseElement {
     }
     this.ampAdResourceId_ = this.ampAdResourceId_ || this.getAmpAdResourceId_();
     if (!this.ampAdResourceId_) {
-      user().warn(TAG,
-          'No friendly parent amp-ad element was found for amp-ad-exit; ' +
-          'not in inabox case.');
+      user().warn(
+        TAG,
+        'No friendly parent amp-ad element was found for amp-ad-exit; ' +
+          'not in inabox case.'
+      );
       return;
     }
     devAssert(!this.unlisten_, 'Unlistener should not already exist.');
-    this.unlisten_ = listen(this.getAmpDoc().win, 'message',
-        event => {
-          // We shouldn't deserialize just any message...it would be too
-          // expensive to parse ones that aren't for amp-ad-exit.
-          if (!this.expectedOriginToVendor_[event.origin]) {
-            return;
-          }
-          const responseMsg = deserializeMessage(getData(event));
-          if (!responseMsg ||
-              responseMsg['type'] != MessageType.IFRAME_TRANSPORT_RESPONSE) {
-            return;
-          }
-          this.assertValidResponseMessage_(responseMsg, event.origin);
-          if (responseMsg['creativeId'] != this.ampAdResourceId_) {
-            return; // Valid message, but for different amp-ad-exit instance
-          }
-          this.vendorResponses_[responseMsg['vendor']] = responseMsg['message'];
-        });
+    this.unlisten_ = listen(this.getAmpDoc().win, 'message', event => {
+      // We shouldn't deserialize just any message...it would be too
+      // expensive to parse ones that aren't for amp-ad-exit.
+      if (!this.expectedOriginToVendor_[event.origin]) {
+        return;
+      }
+      const responseMsg = deserializeMessage(getData(event));
+      if (
+        !responseMsg ||
+        responseMsg['type'] != MessageType.IFRAME_TRANSPORT_RESPONSE
+      ) {
+        return;
+      }
+      this.assertValidResponseMessage_(responseMsg, event.origin);
+      if (responseMsg['creativeId'] != this.ampAdResourceId_) {
+        return; // Valid message, but for different amp-ad-exit instance
+      }
+      this.vendorResponses_[responseMsg['vendor']] = responseMsg['message'];
+    });
   }
 
   /**
@@ -404,20 +447,27 @@ export class AmpAdExit extends AMP.BaseElement {
    * @private
    */
   assertValidResponseMessage_(responseMessage, eventOrigin) {
-    userAssert(responseMessage['message'],
-        'Received empty response from 3p analytics frame');
     userAssert(
-        responseMessage['creativeId'],
-        'Received malformed message from 3p analytics frame: ' +
-        'creativeId missing');
-    userAssert(responseMessage['vendor'],
-        'Received malformed message from 3p analytics frame: ' +
-        'vendor missing');
-    const vendorURL = parseUrlDeprecated(assertVendor(
-        responseMessage['vendor']));
-    userAssert(vendorURL && vendorURL.origin == eventOrigin,
-        'Invalid origin for vendor ' +
-        `${responseMessage['vendor']}: ${eventOrigin}`);
+      responseMessage['message'],
+      'Received empty response from 3p analytics frame'
+    );
+    userAssert(
+      responseMessage['creativeId'],
+      'Received malformed message from 3p analytics frame: ' +
+        'creativeId missing'
+    );
+    userAssert(
+      responseMessage['vendor'],
+      'Received malformed message from 3p analytics frame: vendor missing'
+    );
+    const vendorURL = parseUrlDeprecated(
+      assertVendor(responseMessage['vendor'])
+    );
+    userAssert(
+      vendorURL && vendorURL.origin == eventOrigin,
+      'Invalid origin for vendor ' +
+        `${responseMessage['vendor']}: ${eventOrigin}`
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-ad-exit/0.1/config.js b/extensions/amp-ad-exit/0.1/config.js
index e3686d817fad..c6b4972043f9 100644
--- a/extensions/amp-ad-exit/0.1/config.js
+++ b/extensions/amp-ad-exit/0.1/config.js
@@ -15,9 +15,7 @@
  */
 
 import {FilterType} from './filters/filter';
-import {
-  IFRAME_TRANSPORTS,
-} from '../../amp-analytics/0.1/iframe-transport-vendors';
+import {IFRAME_TRANSPORTS} from '../../amp-analytics/0.1/iframe-transport-vendors';
 import {user, userAssert} from '../../../src/log';
 
 /**
@@ -138,8 +136,10 @@ export function assertConfig(config) {
  */
 function assertTransport(transport) {
   for (const t in transport) {
-    userAssert(t == TransportMode.BEACON || t == TransportMode.IMAGE,
-        `Unknown transport option: '${t}'`);
+    userAssert(
+      t == TransportMode.BEACON || t == TransportMode.IMAGE,
+      `Unknown transport option: '${t}'`
+    );
     userAssert(typeof transport[t] == 'boolean');
   }
 }
@@ -155,10 +155,15 @@ function assertFilters(filters) {
     FilterType.INACTIVE_ELEMENT,
   ];
   for (const name in filters) {
-    userAssert(typeof filters[name] == 'object',
-        'Filter specification \'%s\' is malformed', name);
-    userAssert(validFilters.indexOf(filters[name].type) != -1,
-        'Supported filters: ' + validFilters.join(', '));
+    userAssert(
+      typeof filters[name] == 'object',
+      "Filter specification '%s' is malformed",
+      name
+    );
+    userAssert(
+      validFilters.indexOf(filters[name].type) != -1,
+      'Supported filters: ' + validFilters.join(', ')
+    );
   }
 }
 
@@ -169,7 +174,7 @@ function assertFilters(filters) {
  * @param {!JsonObject} config
  */
 function assertTargets(targets, config) {
-  userAssert(typeof targets == 'object', '\'targets\' must be an object');
+  userAssert(typeof targets == 'object', "'targets' must be an object");
   for (const target in targets) {
     assertTarget(target, targets[target], config);
   }
@@ -184,20 +189,24 @@ function assertTargets(targets, config) {
  */
 function assertTarget(name, target, config) {
   userAssert(
-      typeof target['finalUrl'] == 'string',
-      'finalUrl of target \'%s\' must be a string', name);
+    typeof target['finalUrl'] == 'string',
+    "finalUrl of target '%s' must be a string",
+    name
+  );
   if (target['filters']) {
     target['filters'].forEach(filter => {
-      userAssert(
-          config['filters'][filter], 'filter \'%s\' not defined', filter);
+      userAssert(config['filters'][filter], "filter '%s' not defined", filter);
     });
   }
   if (target['vars']) {
     const pattern = /^_[a-zA-Z0-9_-]+$/;
     for (const variable in target['vars']) {
       userAssert(
-          pattern.test(variable), '\'%s\' must match the pattern \'%s\'',
-          variable, pattern);
+        pattern.test(variable),
+        "'%s' must match the pattern '%s'",
+        variable,
+        pattern
+      );
     }
   }
 }
@@ -209,7 +218,9 @@ function assertTarget(name, target, config) {
  * @return {string} The vendor's iframe URL
  */
 export function assertVendor(vendor) {
-  return user().assertString(IFRAME_TRANSPORTS[vendor],
-      `Unknown or invalid vendor ${vendor}, ` +
-      'note that vendor must use transport: iframe');
+  return user().assertString(
+    IFRAME_TRANSPORTS[vendor],
+    `Unknown or invalid vendor ${vendor}, ` +
+      'note that vendor must use transport: iframe'
+  );
 }
diff --git a/extensions/amp-ad-exit/0.1/filters/click-delay.js b/extensions/amp-ad-exit/0.1/filters/click-delay.js
index 9415d3b93c91..d4208883d6db 100644
--- a/extensions/amp-ad-exit/0.1/filters/click-delay.js
+++ b/extensions/amp-ad-exit/0.1/filters/click-delay.js
@@ -28,9 +28,12 @@ export class ClickDelayFilter extends Filter {
    */
   constructor(name, spec, win) {
     super(name, spec.type);
-    userAssert(spec.type == FilterType.CLICK_DELAY &&
-      typeof spec.delay == 'number' && spec.delay > 0,
-    'Invalid ClickDelay spec');
+    userAssert(
+      spec.type == FilterType.CLICK_DELAY &&
+        typeof spec.delay == 'number' &&
+        spec.delay > 0,
+      'Invalid ClickDelay spec'
+    );
 
     /**
      * @const {!../config.ClickDelayConfig}
@@ -39,20 +42,26 @@ export class ClickDelayFilter extends Filter {
     this.spec = spec;
 
     /**
-    * @type {number}
-    * @visibleForTesting
-    */
+     * @type {number}
+     * @visibleForTesting
+     */
     this.intervalStart = Date.now();
 
     if (spec.startTimingEvent) {
       if (!win['performance'] || !win['performance']['timing']) {
-        dev().warn(TAG, 'Browser does not support performance timing, ' +
-            'falling back to now');
+        dev().warn(
+          TAG,
+          'Browser does not support performance timing, ' +
+            'falling back to now'
+        );
       } else if (
-        win['performance']['timing'][spec.startTimingEvent] == undefined) {
-        dev().warn(TAG,
-            `Invalid performance timing event type ${spec.startTimingEvent}` +
-            ', falling back to now');
+        win['performance']['timing'][spec.startTimingEvent] == undefined
+      ) {
+        dev().warn(
+          TAG,
+          `Invalid performance timing event type ${spec.startTimingEvent}` +
+            ', falling back to now'
+        );
       } else {
         this.intervalStart =
           win['performance']['timing'][spec.startTimingEvent];
@@ -62,7 +71,7 @@ export class ClickDelayFilter extends Filter {
 
   /** @override */
   filter() {
-    return (Date.now() - this.intervalStart) >= this.spec.delay;
+    return Date.now() - this.intervalStart >= this.spec.delay;
   }
 }
 
diff --git a/extensions/amp-ad-exit/0.1/filters/click-location.js b/extensions/amp-ad-exit/0.1/filters/click-location.js
index 45315b037d0e..07253550a2cb 100644
--- a/extensions/amp-ad-exit/0.1/filters/click-location.js
+++ b/extensions/amp-ad-exit/0.1/filters/click-location.js
@@ -57,7 +57,7 @@ export class ClickLocationFilter extends Filter {
      *   bottom: number,
      *   left: number
      * }}
-    */
+     */
     let AllowedRectDef;
 
     /**
@@ -74,10 +74,12 @@ export class ClickLocationFilter extends Filter {
 
   /** @override */
   filter(event) {
-    if (event.clientX >= this.allowedRect_.left &&
-        event.clientX <= this.allowedRect_.right &&
-        event.clientY >= this.allowedRect_.top &&
-        event.clientY <= this.allowedRect_.bottom) {
+    if (
+      event.clientX >= this.allowedRect_.left &&
+      event.clientX <= this.allowedRect_.right &&
+      event.clientY >= this.allowedRect_.top &&
+      event.clientY <= this.allowedRect_.bottom
+    ) {
       return true;
     }
     return false;
@@ -91,11 +93,12 @@ export class ClickLocationFilter extends Filter {
     this.adExitElement_.getVsync().measure(() => {
       const {win} = this.adExitElement_;
       if (this.relativeTo_) {
-        const relativeElement = win.document.querySelector(
-            this.relativeTo_);
-        userAssert(relativeElement,
-            `relativeTo element ${this.relativeTo_} not found.`);
-        const rect = relativeElement./*OK*/getBoundingClientRect();
+        const relativeElement = win.document.querySelector(this.relativeTo_);
+        userAssert(
+          relativeElement,
+          `relativeTo element ${this.relativeTo_} not found.`
+        );
+        const rect = relativeElement./*OK*/ getBoundingClientRect();
         this.allowedRect_.left = rect.left;
         this.allowedRect_.top = rect.top;
         this.allowedRect_.bottom = rect.bottom;
@@ -103,8 +106,8 @@ export class ClickLocationFilter extends Filter {
       } else {
         this.allowedRect_.left = 0;
         this.allowedRect_.top = 0;
-        this.allowedRect_.bottom = win./*OK*/innerHeight;
-        this.allowedRect_.right = win./*OK*/innerWidth;
+        this.allowedRect_.bottom = win./*OK*/ innerHeight;
+        this.allowedRect_.right = win./*OK*/ innerWidth;
       }
       this.allowedRect_.left += this.leftBorder_;
       this.allowedRect_.top += this.topBorder_;
@@ -119,11 +122,13 @@ export class ClickLocationFilter extends Filter {
  * @return {boolean} Whether the config defines a ClickLocation filter.
  */
 function isValidClickLocationSpec(spec) {
-  return spec.type == FilterType.CLICK_LOCATION &&
-      (typeof spec.left === 'undefined' || typeof spec.left === 'number') &&
-      (typeof spec.right === 'undefined' || typeof spec.right === 'number') &&
-      (typeof spec.top === 'undefined' || typeof spec.top === 'number') &&
-      (typeof spec.bottom === 'undefined' || typeof spec.bottom === 'number') &&
-      (typeof spec.relativeTo === 'undefined' ||
-       typeof spec.relativeTo === 'string') ;
+  return (
+    spec.type == FilterType.CLICK_LOCATION &&
+    (typeof spec.left === 'undefined' || typeof spec.left === 'number') &&
+    (typeof spec.right === 'undefined' || typeof spec.right === 'number') &&
+    (typeof spec.top === 'undefined' || typeof spec.top === 'number') &&
+    (typeof spec.bottom === 'undefined' || typeof spec.bottom === 'number') &&
+    (typeof spec.relativeTo === 'undefined' ||
+      typeof spec.relativeTo === 'string')
+  );
 }
diff --git a/extensions/amp-ad-exit/0.1/filters/factory.js b/extensions/amp-ad-exit/0.1/filters/factory.js
index 5142f7069653..c08bd4b89b6f 100644
--- a/extensions/amp-ad-exit/0.1/filters/factory.js
+++ b/extensions/amp-ad-exit/0.1/filters/factory.js
@@ -28,14 +28,17 @@ export function createFilter(name, spec, adExitInstance) {
   switch (spec.type) {
     case FilterType.CLICK_DELAY:
       return new ClickDelayFilter(
-          name,
-          /** @type {!../config.ClickDelayConfig} **/(spec),
-          adExitInstance.win);
+        name,
+        /** @type {!../config.ClickDelayConfig} */ (spec),
+        adExitInstance.win
+      );
     case FilterType.CLICK_LOCATION:
       return new ClickLocationFilter(name, spec, adExitInstance);
     case FilterType.INACTIVE_ELEMENT:
       return new InactiveElementFilter(
-          name, /** @type {!../config.InactiveElementConfig} */(spec));
+        name,
+        /** @type {!../config.InactiveElementConfig} */ (spec)
+      );
     default:
       return undefined;
   }
diff --git a/extensions/amp-ad-exit/0.1/filters/inactive-element.js b/extensions/amp-ad-exit/0.1/filters/inactive-element.js
index f21c6afd6be2..0d3ac5cd8b5a 100644
--- a/extensions/amp-ad-exit/0.1/filters/inactive-element.js
+++ b/extensions/amp-ad-exit/0.1/filters/inactive-element.js
@@ -29,8 +29,7 @@ export class InactiveElementFilter extends Filter {
    */
   constructor(name, spec) {
     super(name, spec.type);
-    userAssert(isValidInactiveElementSpec(spec),
-        'Invalid InactiveElementspec');
+    userAssert(isValidInactiveElementSpec(spec), 'Invalid InactiveElementspec');
 
     /** @private {string} */
     this.selector_ = spec.selector;
@@ -48,8 +47,9 @@ export class InactiveElementFilter extends Filter {
  * @return {boolean} Whether the config defines a InactiveElement filter.
  */
 function isValidInactiveElementSpec(spec) {
-  return spec.type == FilterType.INACTIVE_ELEMENT &&
-      typeof spec.selector == 'string';
+  return (
+    spec.type == FilterType.INACTIVE_ELEMENT && typeof spec.selector == 'string'
+  );
 }
 
 /**
diff --git a/extensions/amp-ad-exit/0.1/test/filters/test-click-delay.js b/extensions/amp-ad-exit/0.1/test/filters/test-click-delay.js
index 2cda84bd6fb0..d4ab7467a0bb 100644
--- a/extensions/amp-ad-exit/0.1/test/filters/test-click-delay.js
+++ b/extensions/amp-ad-exit/0.1/test/filters/test-click-delay.js
@@ -24,14 +24,15 @@ describe('click-delay', () => {
     startTimingEvent: 'navigationStart',
   };
   let sandbox;
-  beforeEach(() => sandbox = sinon.sandbox);
+  beforeEach(() => (sandbox = sinon.sandbox));
   afterEach(() => sandbox.restore());
 
   it('should use performance timing', () => {
     const win = {performance: {timing: {'navigationStart': 456}}};
     sandbox.stub(Date, 'now').returns(123);
-    expect(new ClickDelayFilter('foo', DEFAULT_CONFIG, win).intervalStart)
-        .to.equal(456);
+    expect(
+      new ClickDelayFilter('foo', DEFAULT_CONFIG, win).intervalStart
+    ).to.equal(456);
   });
 
   describe('spec validation', () => {
@@ -48,34 +49,41 @@ describe('click-delay', () => {
       {config: DEFAULT_CONFIG, win: {performance: {timing: {}}}},
     ];
     tests.forEach(test => {
-      it(`should properly handle ${JSON.stringify(test.config)} and win ` +
+      it(
+        `should properly handle ${JSON.stringify(test.config)} and win ` +
           `${JSON.stringify(test.win)}`,
-      () => {
-        if (test.err) {
-          allowConsoleError(() =>
-            expect(() => new ClickDelayFilter('foo', test.config, test.win))
-                .to.throw(win.err));
-        } else {
-          sandbox.stub(Date, 'now').returns(123);
-          expect(new ClickDelayFilter(
-              'foo', test.config, test.win).intervalStart).to.equal(123);
+        () => {
+          if (test.err) {
+            allowConsoleError(() =>
+              expect(
+                () => new ClickDelayFilter('foo', test.config, test.win)
+              ).to.throw(win.err)
+            );
+          } else {
+            sandbox.stub(Date, 'now').returns(123);
+            expect(
+              new ClickDelayFilter('foo', test.config, test.win).intervalStart
+            ).to.equal(123);
+          }
         }
-      });
+      );
     });
   });
 
   describe('#filter', () => {
     it('should filter based on timing event', () => {
-      const filter = new ClickDelayFilter(
-          'foo', DEFAULT_CONFIG, {performance: {timing: {navigationStart: 1}}});
+      const filter = new ClickDelayFilter('foo', DEFAULT_CONFIG, {
+        performance: {timing: {navigationStart: 1}},
+      });
       const nowStub = sandbox.stub(Date, 'now');
       nowStub.onFirstCall().returns(1001);
       expect(filter.filter()).to.be.true;
     });
 
     it('should filter based on timing event, second call', () => {
-      const filter = new ClickDelayFilter(
-          'foo', DEFAULT_CONFIG, {performance: {timing: {navigationStart: 1}}});
+      const filter = new ClickDelayFilter('foo', DEFAULT_CONFIG, {
+        performance: {timing: {navigationStart: 1}},
+      });
       const nowStub = sandbox.stub(Date, 'now');
       nowStub.onFirstCall().returns(1);
       nowStub.onSecondCall().returns(125);
diff --git a/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js b/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
index 13198f7d962c..c4c7c4411149 100644
--- a/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
+++ b/extensions/amp-ad-exit/0.1/test/test-amp-ad-exit.js
@@ -16,9 +16,7 @@
 
 import {AmpAdExit} from '../amp-ad-exit';
 import {FilterType} from '../filters/filter';
-import {
-  IFRAME_TRANSPORTS,
-} from '../../../amp-analytics/0.1/iframe-transport-vendors';
+import {IFRAME_TRANSPORTS} from '../../../amp-analytics/0.1/iframe-transport-vendors';
 import {installPlatformService} from '../../../../src/service/platform-impl';
 import {installTimerService} from '../../../../src/service/timer-impl';
 import {setParentWindow} from '../../../../src/service';
@@ -52,7 +50,7 @@ const EXIT_CONFIG = {
     },
     variables: {
       'finalUrl':
-          'http://localhost:8000/vars?foo=bar&ampdoc=AMPDOC_HOST&r=RANDOM&x=CLICK_X&y=CLICK_Y',
+        'http://localhost:8000/vars?foo=bar&ampdoc=AMPDOC_HOST&r=RANDOM&x=CLICK_X&y=CLICK_Y',
       'trackingUrls': [
         'http://localhost:8000/tracking?r=RANDOM&x=CLICK_X&y=CLICK_Y',
       ],
@@ -83,8 +81,7 @@ const EXIT_CONFIG = {
       vars: {
         _foo: {
           defaultValue: 'foo-default',
-          iframeTransportSignal:
-              `IFRAME_TRANSPORT_SIGNAL(${TEST_3P_VENDOR},collected-data)`,
+          iframeTransportSignal: `IFRAME_TRANSPORT_SIGNAL(${TEST_3P_VENDOR},collected-data)`,
         },
         _bar: {
           defaultValue: 'bar-default',
@@ -127,300 +124,294 @@ const EXIT_CONFIG = {
   },
 };
 
-describes.realWin('amp-ad-exit', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-ad-exit'],
+describes.realWin(
+  'amp-ad-exit',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-ad-exit'],
+    },
   },
-}, env => {
-  let sandbox;
-  let win;
-  let element;
-
-  function makeClickEvent(time = 0, x = 0, y = 0, target = win.document.body) {
-    sandbox.clock.tick(time);
-    return {
-      preventDefault: sandbox.spy(),
-      clientX: x,
-      clientY: y,
-      target,
-    };
-  }
+  env => {
+    let sandbox;
+    let win;
+    let element;
+
+    function makeClickEvent(
+      time = 0,
+      x = 0,
+      y = 0,
+      target = win.document.body
+    ) {
+      sandbox.clock.tick(time);
+      return {
+        preventDefault: sandbox.spy(),
+        clientX: x,
+        clientY: y,
+        target,
+      };
+    }
 
-  function makeElementWithConfig(config) {
-    const el = win.document.createElement('amp-ad-exit');
-    el.id = 'exit-api';
-    const json = win.document.createElement('script');
-    json.textContent = JSON.stringify(config);
-    json.setAttribute('type', 'application/json');
-    el.appendChild(json);
-    win.document.body.appendChild(el);
-    return el.build().then(() => el);
-  }
+    function makeElementWithConfig(config) {
+      const el = win.document.createElement('amp-ad-exit');
+      el.id = 'exit-api';
+      const json = win.document.createElement('script');
+      json.textContent = JSON.stringify(config);
+      json.setAttribute('type', 'application/json');
+      el.appendChild(json);
+      win.document.body.appendChild(el);
+      return el.build().then(() => el);
+    }
 
-  // Ad ad div or the relativeTo element cannot be found.
-  function addAdDiv() {
-    const adDiv = win.document.createElement('div');
-    adDiv.id = 'ad';
-    adDiv.style.position = 'absolute';
-    adDiv.style.left = '100px';
-    adDiv.style.top = '200px';
-    adDiv.style.width = '200px';
-    adDiv.style.height = '200px';
-    win.document.body.appendChild(adDiv);
-  }
+    // Ad ad div or the relativeTo element cannot be found.
+    function addAdDiv() {
+      const adDiv = win.document.createElement('div');
+      adDiv.id = 'ad';
+      adDiv.style.position = 'absolute';
+      adDiv.style.left = '100px';
+      adDiv.style.top = '200px';
+      adDiv.style.width = '200px';
+      adDiv.style.height = '200px';
+      win.document.body.appendChild(adDiv);
+    }
 
-  beforeEach(() => {
-    sandbox = sinon.createSandbox({useFakeTimers: true});
-    win = env.win;
-    toggleExperiment(win, 'amp-ad-exit', true);
-    addAdDiv();
-    // TEST_3P_VENDOR must be in IFRAME_TRANSPORTS
-    // *before* makeElementWithConfig
-    IFRAME_TRANSPORTS[TEST_3P_VENDOR] = '/nowhere.html';
-    return makeElementWithConfig(EXIT_CONFIG).then(el => {
-      element = el;
+    beforeEach(() => {
+      sandbox = sinon.createSandbox({useFakeTimers: true});
+      win = env.win;
+      toggleExperiment(win, 'amp-ad-exit', true);
+      addAdDiv();
+      // TEST_3P_VENDOR must be in IFRAME_TRANSPORTS
+      // *before* makeElementWithConfig
+      IFRAME_TRANSPORTS[TEST_3P_VENDOR] = '/nowhere.html';
+      return makeElementWithConfig(EXIT_CONFIG).then(el => {
+        element = el;
+      });
     });
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-    env.win.document.body.removeChild(element);
-    env.win.document.body.removeChild(env.win.document.getElementById('ad'));
-    element = undefined;
-    // Without the following, will break amp-analytics' test-vendor.js
-    delete IFRAME_TRANSPORTS[TEST_3P_VENDOR];
-  });
-
-  it('should reject non-JSON children', () => {
-    const el = win.document.createElement('amp-ad-exit');
-    el.appendChild(win.document.createElement('p'));
-    win.document.body.appendChild(el);
-    let promise;
-    allowConsoleError(() => promise = el.build());
-    return promise.should.be.rejectedWith(/application\/json/);
-  });
-
-  it('should do nothing for missing targets', () => {
-    const open = sandbox.stub(win, 'open');
-    try {
-      allowConsoleError(() => element.implementation_.executeAction({
+
+    afterEach(() => {
+      sandbox.restore();
+      env.win.document.body.removeChild(element);
+      env.win.document.body.removeChild(env.win.document.getElementById('ad'));
+      element = undefined;
+      // Without the following, will break amp-analytics' test-vendor.js
+      delete IFRAME_TRANSPORTS[TEST_3P_VENDOR];
+    });
+
+    it('should reject non-JSON children', () => {
+      const el = win.document.createElement('amp-ad-exit');
+      el.appendChild(win.document.createElement('p'));
+      win.document.body.appendChild(el);
+      let promise;
+      allowConsoleError(() => (promise = el.build()));
+      return promise.should.be.rejectedWith(/application\/json/);
+    });
+
+    it('should do nothing for missing targets', () => {
+      const open = sandbox.stub(win, 'open');
+      try {
+        allowConsoleError(() =>
+          element.implementation_.executeAction({
+            method: 'exit',
+            args: {target: 'not-a-real-target'},
+            event: makeClickEvent(1001),
+            satisfiesTrust: () => true,
+          })
+        );
+        expect(open).to.not.have.been.called;
+      } catch (expected) {}
+    });
+
+    it('should stop event propagation', () => {
+      const event = makeClickEvent(1001);
+      element.implementation_.executeAction({
         method: 'exit',
-        args: {target: 'not-a-real-target'},
-        event: makeClickEvent(1001),
+        args: {target: 'twoSecondDelay'},
+        event,
         satisfiesTrust: () => true,
-      }));
-      expect(open).to.not.have.been.called;
-    } catch (expected) {}
-  });
-
-  it('should stop event propagation', () => {
-    const event = makeClickEvent(1001);
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'twoSecondDelay'},
-      event,
-      satisfiesTrust: () => true,
+      });
+      expect(event.preventDefault).to.have.been.called;
     });
-    expect(event.preventDefault).to.have.been.called;
-  });
 
-  it('should reject fast clicks', () => {
-    const open = sandbox.stub(win, 'open');
+    it('should reject fast clicks', () => {
+      const open = sandbox.stub(win, 'open');
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'simple'},
-      event: makeClickEvent(999),
-      satisfiesTrust: () => true,
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'simple'},
+        event: makeClickEvent(999),
+        satisfiesTrust: () => true,
+      });
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'twoSecondDelay'},
-      event: makeClickEvent(1000), // 1000 ms + 999 from the previous exit.
-      satisfiesTrust: () => true,
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'twoSecondDelay'},
+        event: makeClickEvent(1000), // 1000 ms + 999 from the previous exit.
+        satisfiesTrust: () => true,
+      });
 
-    expect(open).to.not.have.been.called;
-  });
+      expect(open).to.not.have.been.called;
+    });
 
-  it('should use options.startTimingEvent', () => {
-    return makeElementWithConfig({
-      targets: {
-        navStart: {
-          'finalUrl': 'http://localhost:8000/simple',
-          'filters': ['twoSecond'],
+    it('should use options.startTimingEvent', () => {
+      return makeElementWithConfig({
+        targets: {
+          navStart: {
+            'finalUrl': 'http://localhost:8000/simple',
+            'filters': ['twoSecond'],
+          },
         },
-      },
-      options: {'startTimingEvent': 'navigationStart'},
-      filters: {
-        'twoSecond': {
-          type: 'clickDelay',
-          delay: 2000,
+        options: {'startTimingEvent': 'navigationStart'},
+        filters: {
+          'twoSecond': {
+            type: 'clickDelay',
+            delay: 2000,
+          },
         },
-      },
-    }).then(el => {
-      expect(el.implementation_.defaultFilters_.length).to.equal(2);
-      let clickFilter = el.implementation_.defaultFilters_[0];
-      expect(clickFilter.spec.type).to.equal(FilterType.CLICK_DELAY);
-      expect(clickFilter.spec.startTimingEvent).to.equal('navigationStart');
-      clickFilter = el.implementation_.userFilters_['twoSecond'];
-      expect(clickFilter).to.be.ok;
-      expect(clickFilter.spec.type).to.equal(FilterType.CLICK_DELAY);
-      expect(clickFilter.spec.startTimingEvent).to.equal('navigationStart');
-    });
-  });
-
-  it('should attempt new-tab navigation', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
-
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'simple'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
+      }).then(el => {
+        expect(el.implementation_.defaultFilters_.length).to.equal(2);
+        let clickFilter = el.implementation_.defaultFilters_[0];
+        expect(clickFilter.spec.type).to.equal(FilterType.CLICK_DELAY);
+        expect(clickFilter.spec.startTimingEvent).to.equal('navigationStart');
+        clickFilter = el.implementation_.userFilters_['twoSecond'];
+        expect(clickFilter).to.be.ok;
+        expect(clickFilter.spec.type).to.equal(FilterType.CLICK_DELAY);
+        expect(clickFilter.spec.startTimingEvent).to.equal('navigationStart');
+      });
     });
 
-    expect(open).to.have.been.calledOnce;
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.simple.finalUrl, '_blank');
-  });
+    it('should attempt new-tab navigation', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-  it('should fall back to top navigation', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => null);
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'simple'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'simple'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
+      expect(open).to.have.been.calledOnce;
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.simple.finalUrl,
+        '_blank'
+      );
     });
 
-    expect(open).to.have.been.calledTwice;
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.simple.finalUrl, '_blank');
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.simple.finalUrl, '_top');
-  });
+    it('should fall back to top navigation', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => null);
 
-  it('should attempt same-tab navigation', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'simple'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'clickTargetTest'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
+      expect(open).to.have.been.calledTwice;
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.simple.finalUrl,
+        '_blank'
+      );
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.simple.finalUrl,
+        '_top'
+      );
     });
 
-    expect(open).to.have.been.calledOnce;
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.clickTargetTest.finalUrl, '_top');
-  });
+    it('should attempt same-tab navigation', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-  it('should ping tracking URLs with sendBeacon', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
-    const sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-        () => true);
-
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'tracking'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'clickTargetTest'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
 
-    expect(open).to.have.been.calledOnce;
-    expect(sendBeacon).to.have.been.calledThrice;
-    expect(sendBeacon)
-        .to.have.been.calledWith('http://localhost:8000/tracking?1', '');
-    expect(sendBeacon)
-        .to.have.been.calledWith('http://localhost:8000/tracking?2', '');
-    expect(sendBeacon)
-        .to.have.been.calledWith('http://localhost:8000/tracking?3', '');
-  });
-
-  it('should ping tracking URLs with image requests (no sendBeacon)', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
+      expect(open).to.have.been.calledOnce;
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.clickTargetTest.finalUrl,
+        '_top'
+      );
     });
 
-    let sendBeacon;
-    if (win.navigator.sendBeacon) {
-      sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-          () => true);
-    }
-    const createElement = sandbox.spy(win.document, 'createElement');
+    it('should ping tracking URLs with sendBeacon', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
+      const sendBeacon = sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => true);
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'tracking'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'tracking'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
 
-    expect(open).to.have.been.calledOnce;
-    if (win.navigator.sendBeacon) {
+      expect(open).to.have.been.calledOnce;
       expect(sendBeacon).to.have.been.calledThrice;
-    } else {
-      expect(createElement.withArgs('img')).to.have.been.calledThrice;
-      const imgs = createElement.withArgs('img').returnValues;
-      expect(imgs[0].src).to.equal('http://localhost:8000/tracking?1');
-      expect(imgs[1].src).to.equal('http://localhost:8000/tracking?2');
-      expect(imgs[2].src).to.equal('http://localhost:8000/tracking?3');
-    }
-  });
-
-  it('should ping tracking URLs with image requests (sendBeacon fails)', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?1',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?2',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?3',
+        ''
+      );
     });
 
-    const sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-        () => false);
-    const createElement = sandbox.spy(win.document, 'createElement');
+    it('should ping tracking URLs with image requests (no sendBeacon)', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'tracking'},
-      event: makeClickEvent(1001),
-      satisfiesTrust: () => true,
-    });
+      let sendBeacon;
+      if (win.navigator.sendBeacon) {
+        sendBeacon = sandbox
+          .stub(win.navigator, 'sendBeacon')
+          .callsFake(() => true);
+      }
+      const createElement = sandbox.spy(win.document, 'createElement');
 
-    expect(open).to.have.been.calledOnce;
-    expect(sendBeacon).to.have.been.calledThrice;
-    expect(createElement.withArgs('img')).to.have.been.calledThrice;
-    const imgs = createElement.withArgs('img').returnValues;
-    expect(imgs[0].src).to.equal('http://localhost:8000/tracking?1');
-    expect(imgs[1].src).to.equal('http://localhost:8000/tracking?2');
-    expect(imgs[2].src).to.equal('http://localhost:8000/tracking?3');
-  });
-
-  it('should ping tracking URLs with image requests (transport)', () => {
-    const config = {
-      targets: EXIT_CONFIG.targets,
-      filters: EXIT_CONFIG.filters,
-      transport: {
-        beacon: false,
-      },
-    };
-    return makeElementWithConfig(config).then(el => {
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'tracking'},
+        event: makeClickEvent(1001),
+        satisfiesTrust: () => true,
+      });
+
+      expect(open).to.have.been.calledOnce;
+      if (win.navigator.sendBeacon) {
+        expect(sendBeacon).to.have.been.calledThrice;
+      } else {
+        expect(createElement.withArgs('img')).to.have.been.calledThrice;
+        const imgs = createElement.withArgs('img').returnValues;
+        expect(imgs[0].src).to.equal('http://localhost:8000/tracking?1');
+        expect(imgs[1].src).to.equal('http://localhost:8000/tracking?2');
+        expect(imgs[2].src).to.equal('http://localhost:8000/tracking?3');
+      }
+    });
+
+    it('should ping tracking URLs with image requests (sendBeacon fails)', () => {
       const open = sandbox.stub(win, 'open').callsFake(() => {
         return {name: 'fakeWin'};
       });
 
-      const sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-          () => true);
+      const sendBeacon = sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => false);
       const createElement = sandbox.spy(win.document, 'createElement');
 
-      el.implementation_.executeAction({
+      element.implementation_.executeAction({
         method: 'exit',
         args: {target: 'tracking'},
         event: makeClickEvent(1001),
@@ -428,283 +419,344 @@ describes.realWin('amp-ad-exit', {
       });
 
       expect(open).to.have.been.calledOnce;
-      expect(sendBeacon).to.not.have.been.called;
+      expect(sendBeacon).to.have.been.calledThrice;
       expect(createElement.withArgs('img')).to.have.been.calledThrice;
       const imgs = createElement.withArgs('img').returnValues;
       expect(imgs[0].src).to.equal('http://localhost:8000/tracking?1');
       expect(imgs[1].src).to.equal('http://localhost:8000/tracking?2');
       expect(imgs[2].src).to.equal('http://localhost:8000/tracking?3');
     });
-  });
 
-  it('should replace standard URL variables', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
+    it('should ping tracking URLs with image requests (transport)', () => {
+      const config = {
+        targets: EXIT_CONFIG.targets,
+        filters: EXIT_CONFIG.filters,
+        transport: {
+          beacon: false,
+        },
+      };
+      return makeElementWithConfig(config).then(el => {
+        const open = sandbox.stub(win, 'open').callsFake(() => {
+          return {name: 'fakeWin'};
+        });
+
+        const sendBeacon = sandbox
+          .stub(win.navigator, 'sendBeacon')
+          .callsFake(() => true);
+        const createElement = sandbox.spy(win.document, 'createElement');
+
+        el.implementation_.executeAction({
+          method: 'exit',
+          args: {target: 'tracking'},
+          event: makeClickEvent(1001),
+          satisfiesTrust: () => true,
+        });
+
+        expect(open).to.have.been.calledOnce;
+        expect(sendBeacon).to.not.have.been.called;
+        expect(createElement.withArgs('img')).to.have.been.calledThrice;
+        const imgs = createElement.withArgs('img').returnValues;
+        expect(imgs[0].src).to.equal('http://localhost:8000/tracking?1');
+        expect(imgs[1].src).to.equal('http://localhost:8000/tracking?2');
+        expect(imgs[2].src).to.equal('http://localhost:8000/tracking?3');
+      });
     });
 
-    if (!win.navigator) {
-      win.navigator = {sendBeacon: () => false};
-    }
-    const sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-        () => true);
-
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'variables'},
-      event: makeClickEvent(1001, 101, 102),
-      satisfiesTrust: () => true,
-    });
+    it('should replace standard URL variables', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-    const urlMatcher = sinon.match(new RegExp(
-        'http:\\/\\/localhost:8000\\/vars\\?' +
-        'foo=bar&ampdoc=AMPDOC_HOST&r=[0-9\\.]+&x=101&y=102'));
-    expect(open).to.have.been.calledWith(urlMatcher, '_blank');
+      if (!win.navigator) {
+        win.navigator = {sendBeacon: () => false};
+      }
+      const sendBeacon = sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => true);
 
-    const trackingMatcher = sinon.match(
-        /http:\/\/localhost:8000\/tracking\?r=[0-9\.]+&x=101&y=102/);
-    expect(sendBeacon).to.have.been.calledWith(trackingMatcher, '');
-  });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'variables'},
+        event: makeClickEvent(1001, 101, 102),
+        satisfiesTrust: () => true,
+      });
 
-  it('should replace custom URL variables with vars', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
+      const urlMatcher = sinon.match(
+        new RegExp(
+          'http:\\/\\/localhost:8000\\/vars\\?' +
+            'foo=bar&ampdoc=AMPDOC_HOST&r=[0-9\\.]+&x=101&y=102'
+        )
+      );
+      expect(open).to.have.been.calledWith(urlMatcher, '_blank');
 
-    if (!win.navigator) {
-      win.navigator = {sendBeacon: () => false};
-    }
-    const sendBeacon = sandbox.stub(win.navigator, 'sendBeacon').callsFake(
-        () => true);
-
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'customVars', _foo: 'foo', _bar: 'bar', _numVar: 0,
-        _boolVar: false},
-      event: makeClickEvent(1001, 101, 102),
-      satisfiesTrust: () => true,
+      const trackingMatcher = sinon.match(
+        /http:\/\/localhost:8000\/tracking\?r=[0-9\.]+&x=101&y=102/
+      );
+      expect(sendBeacon).to.have.been.calledWith(trackingMatcher, '');
     });
 
-    expect(open).to.have.been.calledWith(
-        'http://localhost:8000/vars?foo=foo', '_blank');
-    expect(sendBeacon)
-        .to.have.been.calledWith(
-            'http://localhost:8000/tracking?bar=bar', '');
-    expect(sendBeacon)
-        .to.have.been.calledWith(
-            'http://localhost:8000/tracking?numVar=0&boolVar=false', '');
-  });
-
-  it('border protection', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
+    it('should replace custom URL variables with vars', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-    win.innerWidth = 1000;
-    win.innerHeight = 2000;
-    // Replace the getVsync function so that the measure can happen at once.
-    element.implementation_.getVsync = () => {
-      return {measure: callback => callback()};
-    };
-    element.implementation_.onLayoutMeasure();
-
-    // The click is within the top border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtection'},
-      event: makeClickEvent(1001, 500, 8),
-      satisfiesTrust: () => true,
-    });
+      if (!win.navigator) {
+        win.navigator = {sendBeacon: () => false};
+      }
+      const sendBeacon = sandbox
+        .stub(win.navigator, 'sendBeacon')
+        .callsFake(() => true);
 
-    // The click is within the right border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtection'},
-      event: makeClickEvent(1001, 993, 500),
-      satisfiesTrust: () => true,
-    });
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {
+          target: 'customVars',
+          _foo: 'foo',
+          _bar: 'bar',
+          _numVar: 0,
+          _boolVar: false,
+        },
+        event: makeClickEvent(1001, 101, 102),
+        satisfiesTrust: () => true,
+      });
 
-    // The click is within the bottom border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtection'},
-      event: makeClickEvent(1001, 500, 1992),
-      satisfiesTrust: () => true,
-    });
+      expect(open).to.have.been.calledWith(
+        'http://localhost:8000/vars?foo=foo',
+        '_blank'
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?bar=bar',
+        ''
+      );
+      expect(sendBeacon).to.have.been.calledWith(
+        'http://localhost:8000/tracking?numVar=0&boolVar=false',
+        ''
+      );
+    });
+
+    it('border protection', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-    expect(open).to.not.have.been.called;
+      win.innerWidth = 1000;
+      win.innerHeight = 2000;
+      // Replace the getVsync function so that the measure can happen at once.
+      element.implementation_.getVsync = () => {
+        return {measure: callback => callback()};
+      };
+      element.implementation_.onLayoutMeasure();
 
-    // The click is within the left border but left border protection is not
-    // set.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtection'},
-      event: makeClickEvent(1001, 8, 500),
-      satisfiesTrust: () => true,
-    });
+      // The click is within the top border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtection'},
+        event: makeClickEvent(1001, 500, 8),
+        satisfiesTrust: () => true,
+      });
 
-    // THe click is not within the border area.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtection'},
-      event: makeClickEvent(1001, 500, 500),
-      satisfiesTrust: () => true,
-    });
-    expect(open).to.have.been.calledTwice;
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.borderProtection.finalUrl, '_blank');
-  });
-
-  it('border protection relative to div', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
+      // The click is within the right border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtection'},
+        event: makeClickEvent(1001, 993, 500),
+        satisfiesTrust: () => true,
+      });
 
-    // Replace the getVsync function so that the measure can happen at once.
-    element.implementation_.getVsync = () => {
-      return {measure: callback => callback()};
-    };
-    element.implementation_.onLayoutMeasure();
-
-    // The click is within the top border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtectionRelativeTo'},
-      event: makeClickEvent(1001, 200, 208),
-      satisfiesTrust: () => true,
-    });
+      // The click is within the bottom border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtection'},
+        event: makeClickEvent(1001, 500, 1992),
+        satisfiesTrust: () => true,
+      });
 
-    // The click is within the right border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtectionRelativeTo'},
-      event: makeClickEvent(1001, 293, 300),
-      satisfiesTrust: () => true,
-    });
+      expect(open).to.not.have.been.called;
 
-    // The click is within the bottom border.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtectionRelativeTo'},
-      event: makeClickEvent(1001, 200, 392),
-      satisfiesTrust: () => true,
+      // The click is within the left border but left border protection is not
+      // set.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtection'},
+        event: makeClickEvent(1001, 8, 500),
+        satisfiesTrust: () => true,
+      });
+
+      // THe click is not within the border area.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtection'},
+        event: makeClickEvent(1001, 500, 500),
+        satisfiesTrust: () => true,
+      });
+      expect(open).to.have.been.calledTwice;
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.borderProtection.finalUrl,
+        '_blank'
+      );
     });
 
-    expect(open).to.not.have.been.called;
+    it('border protection relative to div', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-    // The click is within the left border but left border protection is not
-    // set.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtectionRelativeTo'},
-      event: makeClickEvent(1001, 103, 300),
-      satisfiesTrust: () => true,
-    });
+      // Replace the getVsync function so that the measure can happen at once.
+      element.implementation_.getVsync = () => {
+        return {measure: callback => callback()};
+      };
+      element.implementation_.onLayoutMeasure();
 
-    // THe click is not within the border area.
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'borderProtectionRelativeTo'},
-      event: makeClickEvent(1001, 200, 300),
-      satisfiesTrust: () => true,
-    });
-    expect(open).to.have.been.calledTwice;
-    expect(open).to.have.been.calledWith(
-        EXIT_CONFIG.targets.borderProtection.finalUrl, '_blank');
-  });
-
-  it('should not trigger for amp-carousel buttons', () => {
-    const open = sandbox.stub(win, 'open');
-    const fakeCarouselButton = document.createElement('div');
-    fakeCarouselButton.classList.add('amp-carousel-button');
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'simple'},
-      event: makeClickEvent(1001, 200, 300, fakeCarouselButton),
-      satisfiesTrust: () => true,
-    });
-    expect(open).to.not.have.been.called;
-  });
-
-  it('should not trigger for elements matching InactiveElementFilter', () => {
-    const open = sandbox.stub(win, 'open');
-    const unclickable = document.createElement('span');
-    unclickable.id = 'unclickable';
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'inactiveElementTest'},
-      event: makeClickEvent(1001, 200, 300, unclickable),
-      satisfiesTrust: () => true,
+      // The click is within the top border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtectionRelativeTo'},
+        event: makeClickEvent(1001, 200, 208),
+        satisfiesTrust: () => true,
+      });
+
+      // The click is within the right border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtectionRelativeTo'},
+        event: makeClickEvent(1001, 293, 300),
+        satisfiesTrust: () => true,
+      });
+
+      // The click is within the bottom border.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtectionRelativeTo'},
+        event: makeClickEvent(1001, 200, 392),
+        satisfiesTrust: () => true,
+      });
+
+      expect(open).to.not.have.been.called;
+
+      // The click is within the left border but left border protection is not
+      // set.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtectionRelativeTo'},
+        event: makeClickEvent(1001, 103, 300),
+        satisfiesTrust: () => true,
+      });
+
+      // THe click is not within the border area.
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'borderProtectionRelativeTo'},
+        event: makeClickEvent(1001, 200, 300),
+        satisfiesTrust: () => true,
+      });
+      expect(open).to.have.been.calledTwice;
+      expect(open).to.have.been.calledWith(
+        EXIT_CONFIG.targets.borderProtection.finalUrl,
+        '_blank'
+      );
+    });
+
+    it('should not trigger for amp-carousel buttons', () => {
+      const open = sandbox.stub(win, 'open');
+      const fakeCarouselButton = document.createElement('div');
+      fakeCarouselButton.classList.add('amp-carousel-button');
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'simple'},
+        event: makeClickEvent(1001, 200, 300, fakeCarouselButton),
+        satisfiesTrust: () => true,
+      });
+      expect(open).to.not.have.been.called;
     });
-    expect(open).to.not.have.been.called;
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'inactiveElementTest'},
-      event: makeClickEvent(1001, 200, 300, win.document.body),
-      satisfiesTrust: () => true,
+
+    it('should not trigger for elements matching InactiveElementFilter', () => {
+      const open = sandbox.stub(win, 'open');
+      const unclickable = document.createElement('span');
+      unclickable.id = 'unclickable';
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'inactiveElementTest'},
+        event: makeClickEvent(1001, 200, 300, unclickable),
+        satisfiesTrust: () => true,
+      });
+      expect(open).to.not.have.been.called;
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'inactiveElementTest'},
+        event: makeClickEvent(1001, 200, 300, win.document.body),
+        satisfiesTrust: () => true,
+      });
+      expect(open).to.have.been.called;
     });
-    expect(open).to.have.been.called;
-  });
 
-  it('should replace custom URL variables with 3P Analytics defaults', () => {
-    const open = sandbox.stub(win, 'open').returns({name: 'fakeWin'});
+    it('should replace custom URL variables with 3P Analytics defaults', () => {
+      const open = sandbox.stub(win, 'open').returns({name: 'fakeWin'});
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'variableFrom3pAnalytics'},
-      event: makeClickEvent(1004),
-      satisfiesTrust: () => true,
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'variableFrom3pAnalytics'},
+        event: makeClickEvent(1004),
+        satisfiesTrust: () => true,
+      });
+
+      expect(open).to.have.been.calledWith(
+        'http://localhost:8000/vars?foo=foo-default',
+        '_blank'
+      );
     });
 
-    expect(open).to.have.been.calledWith(
-        'http://localhost:8000/vars?foo=foo-default', '_blank');
-  });
+    it('should replace custom URL variables with 3P Analytics signals', () => {
+      const open = sandbox.stub(win, 'open').callsFake(() => {
+        return {name: 'fakeWin'};
+      });
 
-  it('should replace custom URL variables with 3P Analytics signals', () => {
-    const open = sandbox.stub(win, 'open').callsFake(() => {
-      return {name: 'fakeWin'};
-    });
+      element.implementation_.vendorResponses_[TEST_3P_VENDOR] = {
+        'unused': 'unused',
+        'collected-data': 'abc123',
+      };
 
-    element.implementation_.vendorResponses_[TEST_3P_VENDOR] = {
-      'unused': 'unused',
-      'collected-data': 'abc123',
-    };
+      element.implementation_.executeAction({
+        method: 'exit',
+        args: {target: 'variableFrom3pAnalytics'},
+        event: makeClickEvent(1005),
+        satisfiesTrust: () => true,
+      });
 
-    element.implementation_.executeAction({
-      method: 'exit',
-      args: {target: 'variableFrom3pAnalytics'},
-      event: makeClickEvent(1005),
-      satisfiesTrust: () => true,
+      expect(open).to.have.been.calledWith(
+        'http://localhost:8000/vars?foo=abc123',
+        '_blank'
+      );
     });
 
-    expect(open).to.have.been.calledWith(
-        'http://localhost:8000/vars?foo=abc123', '_blank');
-  });
-
-  it('should reject unrecognized 3P Analytics vendors', () => {
-    const unkVendor = JSON.parse(JSON.stringify(EXIT_CONFIG));
-    unkVendor.targets.variableFrom3pAnalytics.vars._foo.vendorAnalyticsSource =
+    it('should reject unrecognized 3P Analytics vendors', () => {
+      const unkVendor = JSON.parse(JSON.stringify(EXIT_CONFIG));
+      unkVendor.targets.variableFrom3pAnalytics.vars._foo.vendorAnalyticsSource =
         'nonexistent_vendor';
 
-    expect(makeElementWithConfig(unkVendor))
-        .to.eventually.be.rejectedWith(/Unknown vendor/);
-  });
-
-  it('getAmpAdResourceId_ should reference AMP top window', () => {
-    const frame = win.document.createElement('iframe');
-    win.document.body.appendChild(frame);
-    const doc = frame.contentDocument;
-    const ampAd = doc.createElement('amp-ad');
-    ampAd.getResourceId = () => 12345;
-    doc.body.appendChild(ampAd);
-    const adFrame = doc.createElement('iframe');
-    ampAd.appendChild(adFrame);
-    const ampAdExitElement =
-        adFrame.contentDocument.createElement('amp-ad-exit');
-    adFrame.contentDocument.body.appendChild(ampAdExitElement);
-    installTimerService(frame.contentWindow);
-    installPlatformService(frame.contentWindow);
-    setParentWindow(adFrame.contentWindow, frame.contentWindow);
-    expect(new AmpAdExit(ampAdExitElement).getAmpAdResourceId_())
-        .to.equal('12345');
-  });
-});
+      expect(makeElementWithConfig(unkVendor)).to.eventually.be.rejectedWith(
+        /Unknown vendor/
+      );
+    });
+
+    it('getAmpAdResourceId_ should reference AMP top window', () => {
+      const frame = win.document.createElement('iframe');
+      win.document.body.appendChild(frame);
+      const doc = frame.contentDocument;
+      const ampAd = doc.createElement('amp-ad');
+      ampAd.getResourceId = () => 12345;
+      doc.body.appendChild(ampAd);
+      const adFrame = doc.createElement('iframe');
+      ampAd.appendChild(adFrame);
+      const ampAdExitElement = adFrame.contentDocument.createElement(
+        'amp-ad-exit'
+      );
+      adFrame.contentDocument.body.appendChild(ampAdExitElement);
+      installTimerService(frame.contentWindow);
+      installPlatformService(frame.contentWindow);
+      setParentWindow(adFrame.contentWindow, frame.contentWindow);
+      expect(new AmpAdExit(ampAdExitElement).getAmpAdResourceId_()).to.equal(
+        '12345'
+      );
+    });
+  }
+);
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js b/extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js
index 1e72652ec1ad..31c683734947 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/adsense-a4a-config.js
@@ -34,9 +34,7 @@ import {
   isCdnProxy,
   isGoogleAdsA4AValidEnvironment,
 } from '../../../ads/google/a4a/utils';
-import {
-  selectAndSetExperiments,
-} from '../../../ads/google/a4a/experiment-utils';
+import {selectAndSetExperiments} from '../../../ads/google/a4a/experiment-utils';
 
 /** @const {string} @visibleForTesting */
 export const ADSENSE_A4A_EXPERIMENT_NAME = 'expAdsenseA4A';
@@ -70,12 +68,16 @@ export const ADSENSE_EXP_NAMES = {
  * @param {!Element} element
  */
 function selectExperiments(win, element) {
-  selectAndSetExperiments(win, element,
-      [ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP,
-        ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL],
-      ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
-      true);
-
+  selectAndSetExperiments(
+    win,
+    element,
+    [
+      ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP,
+      ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL,
+    ],
+    ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
+    true
+  );
 
   // See if in holdback control/experiment.
   const urlExperimentId = extractUrlExperimentId(win, element);
@@ -84,18 +86,25 @@ function selectExperiments(win, element) {
     addExperimentIdToElement(experimentId, element);
     forceExperimentBranch(win, ADSENSE_A4A_EXPERIMENT_NAME, experimentId);
     dev().info(
-        TAG, `url experiment selection ${urlExperimentId}: ${experimentId}.`);
+      TAG,
+      `url experiment selection ${urlExperimentId}: ${experimentId}.`
+    );
   }
 
   // If not in the unconditioned canonical experiment, attempt to
   // select into the undiluted canonical experiment.
   const inUnconditionedCanonicalExp = !!getExperimentBranch(
-      win, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL);
+    win,
+    ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL
+  );
   if (!inUnconditionedCanonicalExp && !isCdnProxy(win)) {
-    selectAndSetExperiments(win, element,
-        [ADSENSE_EXPERIMENTS.CANONICAL_EXP,
-          ADSENSE_EXPERIMENTS.CANONICAL_CTL],
-        ADSENSE_EXP_NAMES.CANONICAL, true);
+    selectAndSetExperiments(
+      win,
+      element,
+      [ADSENSE_EXPERIMENTS.CANONICAL_EXP, ADSENSE_EXPERIMENTS.CANONICAL_CTL],
+      ADSENSE_EXP_NAMES.CANONICAL,
+      true
+    );
   }
 }
 
@@ -110,10 +119,11 @@ export function adsenseIsA4AEnabled(win, element, useRemoteHtml) {
     return false;
   }
   selectExperiments(win, element);
-  return isGoogleAdsA4AValidEnvironment(win) ||
-      getExperimentBranch(
-          win, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL) ==
+  return (
+    isGoogleAdsA4AValidEnvironment(win) ||
+    getExperimentBranch(win, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL) ==
       ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP ||
-      getExperimentBranch(win, ADSENSE_EXP_NAMES.CANONICAL) ==
-      ADSENSE_EXPERIMENTS.CANONICAL_EXP;
+    getExperimentBranch(win, ADSENSE_EXP_NAMES.CANONICAL) ==
+      ADSENSE_EXPERIMENTS.CANONICAL_EXP
+  );
 }
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js b/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js
index 4c67d81bc71c..66da4070c490 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/adsense-shared-state.js
@@ -22,12 +22,10 @@ import {devAssert} from '../../../src/log';
  * parameters.
  */
 export class AdsenseSharedState {
-
   /**
    * Creates an instance of AdsenseSharedState.
    */
   constructor() {
-
     /** @private {!Array<!{id: string, format: string, client: string, slotname: (string|undefined)}>} */
     this.previousSlots_ = [];
   }
@@ -50,7 +48,7 @@ export class AdsenseSharedState {
       result.prevFmts += (result.prevFmts ? ',' : '') + slot.format;
       if (slot.slotname) {
         result.prevSlotnames +=
-            (result.prevSlotnames ? ',' : '') + slot.slotname;
+          (result.prevSlotnames ? ',' : '') + slot.slotname;
       }
       if (slot.client == client) {
         result.pv = 1;
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
index 2c93041821df..e1a2fe36faae 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/amp-ad-network-adsense-impl.js
@@ -53,11 +53,7 @@ import {
   isInManualExperiment,
 } from '../../../ads/google/a4a/traffic-experiments';
 import {clamp} from '../../../src/utils/math';
-import {
-  computedStyle,
-  setStyle,
-  setStyles,
-} from '../../../src/style';
+import {computedStyle, setStyle, setStyles} from '../../../src/style';
 import {dev, devAssert, user} from '../../../src/log';
 import {domFingerprintPlain} from '../../../src/utils/dom-fingerprint';
 import {getAmpAdRenderOutsideViewport} from '../../amp-ad/0.1/concurrent-load';
@@ -95,7 +91,6 @@ const FORMAT_EXP = 'as-use-attr-for-format';
 
 /** @final */
 export class AmpAdNetworkAdsenseImpl extends AmpA4A {
-
   /**
    * @param {!Element} element
    */
@@ -203,30 +198,37 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
      */
     if (this.isResponsive_()) {
       if (!this.element.hasAttribute('data-full-width')) {
-        user().warn(TAG,
-            'Responsive AdSense ad units require the attribute ' +
-            'data-full-width.');
+        user().warn(
+          TAG,
+          'Responsive AdSense ad units require the attribute ' +
+            'data-full-width.'
+        );
         return false;
       }
 
       const height = this.element.getAttribute('height');
       const width = this.element.getAttribute('width');
       if (height != ADSENSE_RSPV_WHITELISTED_HEIGHT) {
-        user().warn(TAG,
-            `Specified height ${height} in <amp-ad> tag is not equal to the ` +
+        user().warn(
+          TAG,
+          `Specified height ${height} in <amp-ad> tag is not equal to the ` +
             `required height of ${ADSENSE_RSPV_WHITELISTED_HEIGHT} for ` +
-            'responsive AdSense ad units.');
+            'responsive AdSense ad units.'
+        );
         return false;
       }
       if (width != '100vw') {
-        user().warn(TAG,
-            `Invalid width ${width} for full-width responsive <amp-ad> tag. ` +
-            'Width must be 100vw.');
+        user().warn(
+          TAG,
+          `Invalid width ${width} for full-width responsive <amp-ad> tag. ` +
+            'Width must be 100vw.'
+        );
         return false;
       }
     }
-    return !!this.element.getAttribute('data-ad-client') &&
-        this.isAmpAdElement();
+    return (
+      !!this.element.getAttribute('data-ad-client') && this.isAmpAdElement()
+    );
   }
 
   /** @override */
@@ -238,11 +240,11 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
   buildCallback() {
     super.buildCallback();
     this.identityTokenPromise_ = Services.viewerForDoc(this.getAmpDoc())
-        .whenFirstVisible().then(() =>
-          getIdentityToken(
-              this.win, this.getAmpDoc(), super.getConsentPolicy()));
-    this.autoFormat_ =
-        this.element.getAttribute('data-auto-format') || '';
+      .whenFirstVisible()
+      .then(() =>
+        getIdentityToken(this.win, this.getAmpDoc(), super.getConsentPolicy())
+      );
+    this.autoFormat_ = this.element.getAttribute('data-auto-format') || '';
 
     if (this.isResponsive_()) {
       // Attempt to resize to the correct height. The width should already be
@@ -250,9 +252,13 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       // affect it.
       const viewportSize = this.getViewport().getSize();
       return this.attemptChangeSize(
-          AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              this.autoFormat_, viewportSize, this.element),
-          viewportSize.width).catch(() => {});
+        AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
+          this.autoFormat_,
+          viewportSize,
+          this.element
+        ),
+        viewportSize.width
+      ).catch(() => {});
     }
     // This should happen last, as some diversion criteria rely on some of the
     // preceding logic (specifically responsive logic).
@@ -272,29 +278,32 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
    * @visibleForTesting
    */
   divertExperiments() {
-    const experimentInfoMap =
-    /** @type {!Object<string,
+    const experimentInfoMap = /** @type {!Object<string,
         !../../../src/experiments.ExperimentInfo>} */ ({
-        [FORMAT_EXP]: {
-          isTrafficEligible: () => !this.isResponsive_() &&
-            Number(this.element.getAttribute('width')) > 0 &&
-            Number(this.element.getAttribute('height')) > 0,
-          branches: ['21062003', '21062004'],
-        },
-        [[ADX_ADY_EXP.branch]]: {
-          isTrafficEligible: () => true,
-          branches: [[ADX_ADY_EXP.control], [ADX_ADY_EXP.experiment]],
-        },
-      });
+      [FORMAT_EXP]: {
+        isTrafficEligible: () =>
+          !this.isResponsive_() &&
+          Number(this.element.getAttribute('width')) > 0 &&
+          Number(this.element.getAttribute('height')) > 0,
+        branches: ['21062003', '21062004'],
+      },
+      [[ADX_ADY_EXP.branch]]: {
+        isTrafficEligible: () => true,
+        branches: [[ADX_ADY_EXP.control], [ADX_ADY_EXP.experiment]],
+      },
+    });
     const setExps = randomlySelectUnsetExperiments(this.win, experimentInfoMap);
     Object.keys(setExps).forEach(expName =>
-      addExperimentIdToElement(setExps[expName], this.element));
+      addExperimentIdToElement(setExps[expName], this.element)
+    );
   }
 
   /** @override */
   getAdUrl(consentState) {
-    if (consentState == CONSENT_POLICY_STATE.UNKNOWN &&
-        this.element.getAttribute('data-npa-on-unknown-consent') != 'true') {
+    if (
+      consentState == CONSENT_POLICY_STATE.UNKNOWN &&
+      this.element.getAttribute('data-npa-on-unknown-consent') != 'true'
+    ) {
       user().info(TAG, 'Ad request suppressed due to unknown consent');
       return Promise.resolve('');
     }
@@ -308,14 +317,16 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     if (adClientId.substring(0, 3) != 'ca-') {
       adClientId = 'ca-' + adClientId;
     }
-    const adTestOn = this.element.getAttribute('data-adtest') ||
-        isInManualExperiment(this.element);
+    const adTestOn =
+      this.element.getAttribute('data-adtest') ||
+      isInManualExperiment(this.element);
     const width = Number(this.element.getAttribute('width'));
     const height = Number(this.element.getAttribute('height'));
 
-    this.size_ = getExperimentBranch(this.win, FORMAT_EXP) == '21062004'
-      ? {width, height}
-      : this.getIntersectionElementLayoutBox();
+    this.size_ =
+      getExperimentBranch(this.win, FORMAT_EXP) == '21062004'
+        ? {width, height}
+        : this.getIntersectionElementLayoutBox();
     const format = `${this.size_.width}x${this.size_.height}`;
     const slotId = this.element.getAttribute('data-amp-slot-index');
     // data-amp-slot-index is set by the upgradeCallback method of amp-ad.
@@ -326,25 +337,33 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     this.uniqueSlotId_ = slotId + adk;
     const slotname = this.element.getAttribute('data-ad-slot');
     const sharedStateParams = sharedState.addNewSlot(
-        format, this.uniqueSlotId_, adClientId, slotname);
+      format,
+      this.uniqueSlotId_,
+      adClientId,
+      slotname
+    );
     const viewportSize = this.getViewport().getSize();
     if (!this.ifi_) {
       this.win['ampAdGoogleIfiCounter'] =
-          this.win['ampAdGoogleIfiCounter'] || 1;
+        this.win['ampAdGoogleIfiCounter'] || 1;
       this.ifi_ = this.win['ampAdGoogleIfiCounter']++;
     }
     const enclosingContainers = getEnclosingContainerTypes(this.element);
-    const pfx = enclosingContainers.includes(
-        ValidAdContainerTypes['AMP-FX-FLYING-CARPET']) ||
-        enclosingContainers.includes(ValidAdContainerTypes['AMP-STICKY-AD']);
+    const pfx =
+      enclosingContainers.includes(
+        ValidAdContainerTypes['AMP-FX-FLYING-CARPET']
+      ) || enclosingContainers.includes(ValidAdContainerTypes['AMP-STICKY-AD']);
     const parameters = {
       'client': adClientId,
       'format': format,
       'w': this.size_.width,
       'h': this.size_.height,
       'iu': slotname,
-      'npa': consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
-          consentState == CONSENT_POLICY_STATE.UNKNOWN ? 1 : null,
+      'npa':
+        consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
+        consentState == CONSENT_POLICY_STATE.UNKNOWN
+          ? 1
+          : null,
       'adtest': adTestOn ? 'on' : null,
       'adk': adk,
       'output': 'html',
@@ -376,21 +395,26 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
 
     const experimentIds = [];
     const identityPromise = Services.timerFor(this.win)
-        .timeoutPromise(1000, this.identityTokenPromise_)
-        .catch(unusedErr => {
-          // On error/timeout, proceed.
-          return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/(
-            {});
-        });
+      .timeoutPromise(1000, this.identityTokenPromise_)
+      .catch(unusedErr => {
+        // On error/timeout, proceed.
+        return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({});
+      });
     return identityPromise.then(identity => {
       return googleAdUrl(
-          this, ADSENSE_BASE_URL, startTime, Object.assign(
-              {
-                'adsid': identity.token || null,
-                'jar': identity.jar || null,
-                'pucrd': identity.pucrd || null,
-              },
-              parameters), experimentIds);
+        this,
+        ADSENSE_BASE_URL,
+        startTime,
+        Object.assign(
+          {
+            'adsid': identity.token || null,
+            'jar': identity.jar || null,
+            'pucrd': identity.pucrd || null,
+          },
+          parameters
+        ),
+        experimentIds
+      );
     });
   }
 
@@ -407,7 +431,8 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     }
     const checksum = headers.get('AMP-Verification-Checksum');
     return Promise.resolve(
-        checksum && stringHash32(utf8Decode(bytes)) == checksum ? bytes : null);
+      checksum && stringHash32(utf8Decode(bytes)) == checksum ? bytes : null
+    );
   }
 
   /** @override */
@@ -417,8 +442,10 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
     this.shouldSandbox_ = responseHeaders.get(SANDBOX_HEADER) == 'true';
     if (this.ampAnalyticsConfig_) {
       // Load amp-analytics extensions
-      this.extensions_./*OK*/installExtensionForDoc(
-          this.getAmpDoc(), 'amp-analytics');
+      this.extensions_./*OK*/ installExtensionForDoc(
+        this.getAmpDoc(),
+        'amp-analytics'
+      );
     }
     return this.size_;
   }
@@ -444,7 +471,8 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       return null;
     }
     const ctypesReMatch = /[?&]force_a4a_ctypes=([^&]+)/.exec(
-        this.win.location.search);
+      this.win.location.search
+    );
     // If the RE passes, then length is necessarily > 1.
     if (ctypesReMatch) {
       return ctypesReMatch[1];
@@ -454,8 +482,11 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
 
   /** @override */
   isXhrAllowed() {
-    return isCdnProxy(this.win) || getMode(this.win).localDev ||
-        getMode(this.win).test;
+    return (
+      isCdnProxy(this.win) ||
+      getMode(this.win).localDev ||
+      getMode(this.win).test
+    );
   }
 
   /** @override */
@@ -467,27 +498,35 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
   onCreativeRender(creativeMetaData) {
     super.onCreativeRender(creativeMetaData);
     this.isAmpCreative_ = !!creativeMetaData;
-    if (creativeMetaData &&
-        !creativeMetaData.customElementExtensions.includes('amp-ad-exit')) {
+    if (
+      creativeMetaData &&
+      !creativeMetaData.customElementExtensions.includes('amp-ad-exit')
+    ) {
       // Capture phase click handlers on the ad if amp-ad-exit not present
       // (assume it will handle capture).
       devAssert(this.iframe);
       Navigation.installAnchorClickInterceptor(
-          this.getAmpDoc(), this.iframe.contentWindow);
+        this.getAmpDoc(),
+        this.iframe.contentWindow
+      );
     }
     if (this.ampAnalyticsConfig_) {
       devAssert(!this.ampAnalyticsElement_);
       if (isReportingEnabled(this)) {
         addCsiSignalsToAmpAnalyticsConfig(
-            this.win,
-            this.element,
-            this.ampAnalyticsConfig_,
-            this.qqid_,
-            !!creativeMetaData);
+          this.win,
+          this.element,
+          this.ampAnalyticsConfig_,
+          this.qqid_,
+          !!creativeMetaData
+        );
       }
       this.ampAnalyticsElement_ = insertAnalyticsElement(
-          this.element, this.ampAnalyticsConfig_, /*loadAnalytics*/ true,
-          !!this.postAdResponseExperimentFeatures['avr_disable_immediate']);
+        this.element,
+        this.ampAnalyticsConfig_,
+        /*loadAnalytics*/ true,
+        !!this.postAdResponseExperimentFeatures['avr_disable_immediate']
+      );
     }
 
     setStyles(dev().assertElement(this.iframe), {
@@ -507,8 +546,10 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       return false;
     }
     const superResult = super.unlayoutCallback();
-    this.element.setAttribute('data-amp-slot-index',
-        this.win.ampAdSlotIdCounter++);
+    this.element.setAttribute(
+      'data-amp-slot-index',
+      this.win.ampAdSlotIdCounter++
+    );
     if (this.uniqueSlotId_) {
       sharedState.removeSlot(this.uniqueSlotId_);
     }
@@ -533,22 +574,26 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
       const layoutBox = this.getLayoutBox();
 
       // Nudge into the correct horizontal position by changing side margin.
-      this.getVsync().run({
-        measure: state => {
-          // Check the parent element because amp-ad is explicitly styled to
-          // have direction: ltr.
-          state.direction =
-            computedStyle(this.win,
-                dev().assertElement(this.element.parentElement))['direction'];
-        },
-        mutate: state => {
-          if (state.direction == 'rtl') {
-            setStyle(this.element, 'marginRight', layoutBox.left, 'px');
-          } else {
-            setStyle(this.element, 'marginLeft', -layoutBox.left, 'px');
-          }
+      this.getVsync().run(
+        {
+          measure: state => {
+            // Check the parent element because amp-ad is explicitly styled to
+            // have direction: ltr.
+            state.direction = computedStyle(
+              this.win,
+              dev().assertElement(this.element.parentElement)
+            )['direction'];
+          },
+          mutate: state => {
+            if (state.direction == 'rtl') {
+              setStyle(this.element, 'marginRight', layoutBox.left, 'px');
+            } else {
+              setStyle(this.element, 'marginLeft', -layoutBox.left, 'px');
+            }
+          },
         },
-      }, {direction: ''});
+        {direction: ''}
+      );
     }
   }
 
@@ -587,7 +632,9 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
         return clamp(idealHeight, minHeight, maxHeight);
       case ADSENSE_MCRSPV_TAG:
         return getMatchedContentResponsiveHeightAndUpdatePubParams(
-            viewportSize.width, element);
+          viewportSize.width,
+          element
+        );
       default:
         return 0;
     }
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/test/test-adsense-a4a-config.js b/extensions/amp-ad-network-adsense-impl/0.1/test/test-adsense-a4a-config.js
index d3085645a483..ae314d35038c 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/test/test-adsense-a4a-config.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/test/test-adsense-a4a-config.js
@@ -23,9 +23,7 @@ import {
 import {EXPERIMENT_ATTRIBUTE} from '../../../../ads/google/a4a/utils';
 import {createIframePromise} from '../../../../testing/iframe';
 import {forceExperimentBranch} from '../../../../src/experiments';
-import {
-  isInExperiment,
-} from '../../../../ads/google/a4a/traffic-experiments';
+import {isInExperiment} from '../../../../ads/google/a4a/traffic-experiments';
 import {isProxyOrigin, parseUrlDeprecated} from '../../../../src/url';
 import {urls} from '../../../../src/config';
 
@@ -38,26 +36,32 @@ describe('adsense-a4a-config', () => {
   beforeEach(() => {
     sandbox = sinon.sandbox;
     mockWin = {
-      location: parseUrlDeprecated('https://nowhere.org/a/place/page.html?s=foo&q=bar'),
+      location: parseUrlDeprecated(
+        'https://nowhere.org/a/place/page.html?s=foo&q=bar'
+      ),
       document: {
-        querySelector: unused => {return null;},
+        querySelector: unused => {
+          return null;
+        },
       },
       crypto: {
         subtle: true,
         webkitSubtle: true,
       },
     };
-    return createIframePromise().then(i => { testFixture = i; });
+    return createIframePromise().then(i => {
+      testFixture = i;
+    });
   });
   afterEach(() => {
     sandbox.restore();
   });
 
   describe('#adsenseIsA4AEnabled', () => {
-
     it('should not enable a4a when missing data-ad-client', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/some/path/to/content.html');
+        'https://cdn.ampproject.org/some/path/to/content.html'
+      );
       const elem = testFixture.doc.createElement('div');
       testFixture.doc.body.appendChild(elem);
       expect(adsenseIsA4AEnabled(mockWin, elem)).to.be.false;
@@ -65,9 +69,11 @@ describe('adsense-a4a-config', () => {
 
     it('should not enable a4a when useRemoteHtml is true', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/some/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://cdn.ampproject.org/some/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
@@ -77,95 +83,126 @@ describe('adsense-a4a-config', () => {
 
     it('should use FF | uncond. canon. exp. | page = canonical', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://some-pub-site.com/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://some-pub-site.com/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
-          ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
+        ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.true;
     });
 
     it('should use FF | uncond. canon. exp. | page = amp cache', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/some/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://cdn.ampproject.org/some/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
-          ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
+        ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.true;
     });
 
     it('should use DF | uncond. canon. ctl. | page = canonical', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://some-pub-site.com/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://some-pub-site.com/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
-          ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
+        ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.false;
     });
 
     it('should use FF | uncond. canon. ctl. | page = amp cache', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/some/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://cdn.ampproject.org/some/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
-          ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL,
+        ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_CTL
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.true;
     });
 
-
     it('should use FF | canonical exp. | page = canonical', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://some-pub-site.com/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://some-pub-site.com/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.CANONICAL,
-          ADSENSE_EXPERIMENTS.CANONICAL_EXP);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.CANONICAL,
+        ADSENSE_EXPERIMENTS.CANONICAL_EXP
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.true;
     });
 
     it('should use DF | canonical ctl. | page = canonical', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://some-pub-site.com/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
+        'https://some-pub-site.com/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org/);
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
       testFixture.doc.body.appendChild(elem);
       const useRemoteHtml = false;
-      forceExperimentBranch(mockWin, ADSENSE_EXP_NAMES.CANONICAL,
-          ADSENSE_EXPERIMENTS.CANONICAL_CTL);
+      forceExperimentBranch(
+        mockWin,
+        ADSENSE_EXP_NAMES.CANONICAL,
+        ADSENSE_EXPERIMENTS.CANONICAL_CTL
+      );
       expect(adsenseIsA4AEnabled(mockWin, elem, useRemoteHtml)).to.be.false;
     });
 
     // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
     it.skip('should not enable a4a when on a non-Google AMP cache', () => {
       mockWin.location = parseUrlDeprecated(
-          'https://amp.cloudflare.com/some/path/to/content.html');
-      sandbox.stub(urls, 'cdnProxyRegex').callsFake(
-          /^https:\/\/([a-zA-Z0-9_-]+\.)?amp\.cloudflare\.com/);
+        'https://amp.cloudflare.com/some/path/to/content.html'
+      );
+      sandbox
+        .stub(urls, 'cdnProxyRegex')
+        .callsFake(/^https:\/\/([a-zA-Z0-9_-]+\.)?amp\.cloudflare\.com/);
       expect(isProxyOrigin(mockWin.location)).to.be.true;
       const elem = testFixture.doc.createElement('div');
       elem.setAttribute('data-ad-client', 'ca-pub-somepub');
@@ -176,8 +213,9 @@ describe('adsense-a4a-config', () => {
     Object.keys(URL_EXPERIMENT_MAPPING).forEach(expFlagValue => {
       it(`exp flag=${expFlagValue} should set eid attribute`, () => {
         mockWin.location = parseUrlDeprecated(
-            'https://cdn.ampproject.org/some/path/to/content.html?exp=aa:' +
-            String(expFlagValue));
+          'https://cdn.ampproject.org/some/path/to/content.html?exp=aa:' +
+            String(expFlagValue)
+        );
         const elem = testFixture.doc.createElement('div');
         elem.setAttribute('data-ad-client', 'ca-pub-somepub');
         testFixture.doc.body.appendChild(elem);
@@ -187,8 +225,8 @@ describe('adsense-a4a-config', () => {
           expect(elem.getAttribute(EXPERIMENT_ATTRIBUTE)).to.not.be.ok;
         } else {
           expect(elem.getAttribute(EXPERIMENT_ATTRIBUTE)).to.be.ok;
-          expect(isInExperiment(elem, URL_EXPERIMENT_MAPPING[expFlagValue]))
-              .to.be.true;
+          expect(isInExperiment(elem, URL_EXPERIMENT_MAPPING[expFlagValue])).to
+            .be.true;
         }
       });
     });
diff --git a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
index 109bb0a0e652..668e92269663 100644
--- a/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
+++ b/extensions/amp-ad-network-adsense-impl/0.1/test/test-amp-ad-network-adsense-impl.js
@@ -49,1034 +49,1140 @@ function createAdsenseImplElement(attributes, doc, opt_tag) {
   return addAttributesToElement(element, attributes);
 }
 
-describes.realWin('amp-ad-network-adsense-impl', {
-  amp: {
-    extensions: ['amp-ad', 'amp-ad-network-adsense-impl'],
-    // runtimeOn: true,
+describes.realWin(
+  'amp-ad-network-adsense-impl',
+  {
+    amp: {
+      extensions: ['amp-ad', 'amp-ad-network-adsense-impl'],
+      // runtimeOn: true,
+    },
   },
-}, env => {
-  let win, doc, ampdoc, viewer;
-  let impl;
-  let element;
-  let isResponsiveStub;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    sandbox.stub(
-        AmpAdNetworkAdsenseImpl.prototype, 'getSigningServiceNames').callsFake(
-        () => {
+  env => {
+    let win, doc, ampdoc, viewer;
+    let impl;
+    let element;
+    let isResponsiveStub;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      sandbox
+        .stub(AmpAdNetworkAdsenseImpl.prototype, 'getSigningServiceNames')
+        .callsFake(() => {
           return ['google'];
         });
-    viewer = win.services.viewer.obj;
-    sandbox.stub(viewer, 'getReferrerUrl').callsFake(
-        () => Promise.resolve('https://acme.org/'));
-    element = createAdsenseImplElement({
-      'data-ad-client': 'ca-adsense',
-      'width': '320',
-      'height': '50',
-      'data-experiment-id': '8675309',
-    }, doc);
-    sandbox.stub(element, 'tryUpgrade_').callsFake(() => {});
-    doc.body.appendChild(element);
-    impl = new AmpAdNetworkAdsenseImpl(element);
-    impl.win['goog_identity_prom'] = Promise.resolve({});
-    isResponsiveStub = sandbox.stub(impl, 'isResponsive_');
-  });
-
-  /**
-   * Instantiates element and impl, adding the former to the document of the
-   * iframe.
-   * @param {!{width, height, type}} config
-   */
-  function createImplTag(config) {
-    config.type = 'adsense';
-    element = createElementWithAttributes(doc, 'amp-ad', config);
-    // To trigger CSS styling.
-    element.setAttribute('data-a4a-upgrade-type',
-        'amp-ad-network-adsense-impl');
-    // Used to test styling which is targetted at first iframe child of
-    // amp-ad.
-    const iframe = doc.createElement('iframe');
-    element.appendChild(iframe);
-    sandbox.stub(element, 'tryUpgrade_').callsFake(() => {});
-    doc.body.appendChild(element);
-    impl = new AmpAdNetworkAdsenseImpl(element);
-    impl.buildCallback();
-    element.classList.remove('i-amphtml-notbuilt');
-    impl.iframe = iframe;
-  }
-
-  describe('#isValidElement', () => {
-    it('should be valid', () => {
-      expect(impl.isValidElement()).to.be.true;
-    });
-    it('should be valid (responsive)', () => {
-      isResponsiveStub.callsFake(() => true);
-      element.setAttribute('data-full-width', 'true');
-      element.setAttribute('height', '320');
-      element.setAttribute('width', '100vw');
-      expect(impl.isValidElement()).to.be.true;
-    });
-    it('should NOT be valid (responsive with wrong height)', () => {
-      isResponsiveStub.callsFake(() => true);
-      element.setAttribute('data-full-width', 'true');
-      element.setAttribute('height', '666');
-      element.setAttribute('width', '100vw');
-      expect(impl.isValidElement()).to.be.false;
-    });
-    it('should NOT be valid (responsive with wrong width)', () => {
-      isResponsiveStub.callsFake(() => true);
-      element.setAttribute('data-full-width', 'true');
-      element.setAttribute('height', '320');
-      element.setAttribute('width', '666');
-      expect(impl.isValidElement()).to.be.false;
-    });
-    it('should NOT be valid (responsive with missing data-full-width)', () => {
-      isResponsiveStub.callsFake(() => true);
-      element.setAttribute('height', '320');
-      element.setAttribute('width', '100vw');
-      expect(impl.isValidElement()).to.be.false;
-    });
-    it('should NOT be valid (impl tag name)', () => {
-      element = createAdsenseImplElement({'data-ad-client': 'ca-adsense'},
-          doc, 'amp-ad-network-adsense-impl');
-      impl = new AmpAdNetworkAdsenseImpl(element);
-      expect(impl.isValidElement()).to.be.false;
-    });
-    it('should NOT be valid (missing ad client)', () => {
-      element.setAttribute('data-ad-client', '');
-      element.setAttribute('type', 'adsense');
-      expect(impl.isValidElement()).to.be.false;
-    });
-    it('should be valid (amp-embed)', () => {
-      element = createAdsenseImplElement({'data-ad-client': 'ca-adsense'},
-          doc, 'amp-embed');
+      viewer = win.services.viewer.obj;
+      sandbox
+        .stub(viewer, 'getReferrerUrl')
+        .callsFake(() => Promise.resolve('https://acme.org/'));
+      element = createAdsenseImplElement(
+        {
+          'data-ad-client': 'ca-adsense',
+          'width': '320',
+          'height': '50',
+          'data-experiment-id': '8675309',
+        },
+        doc
+      );
+      sandbox.stub(element, 'tryUpgrade_').callsFake(() => {});
+      doc.body.appendChild(element);
       impl = new AmpAdNetworkAdsenseImpl(element);
-      expect(impl.isValidElement()).to.be.true;
+      impl.win['goog_identity_prom'] = Promise.resolve({});
+      isResponsiveStub = sandbox.stub(impl, 'isResponsive_');
     });
-  });
 
-  describe('#extractSize', () => {
-    let preloadExtensionSpy;
-
-    beforeEach(() => {
-      element = createElementWithAttributes(doc, 'amp-ad', {
-        'width': '200',
-        'height': '50',
-        'type': 'adsense',
-        'layout': 'fixed',
-      });
+    /**
+     * Instantiates element and impl, adding the former to the document of the
+     * iframe.
+     * @param {!{width, height, type}} config
+     */
+    function createImplTag(config) {
+      config.type = 'adsense';
+      element = createElementWithAttributes(doc, 'amp-ad', config);
+      // To trigger CSS styling.
+      element.setAttribute(
+        'data-a4a-upgrade-type',
+        'amp-ad-network-adsense-impl'
+      );
+      // Used to test styling which is targetted at first iframe child of
+      // amp-ad.
+      const iframe = doc.createElement('iframe');
+      element.appendChild(iframe);
+      sandbox.stub(element, 'tryUpgrade_').callsFake(() => {});
+      doc.body.appendChild(element);
       impl = new AmpAdNetworkAdsenseImpl(element);
-      sandbox.stub(impl, 'getAmpDoc').callsFake(() => ampdoc);
-      const extensions = Services.extensionsFor(impl.win);
-      preloadExtensionSpy = sandbox.spy(extensions, 'preloadExtension');
-    });
+      impl.buildCallback();
+      element.classList.remove('i-amphtml-notbuilt');
+      impl.iframe = iframe;
+    }
 
-    it('without analytics', () => {
-      impl.extractSize({
-        get() {
-          return undefined;
-        },
-        has() {
-          return false;
-        },
+    describe('#isValidElement', () => {
+      it('should be valid', () => {
+        expect(impl.isValidElement()).to.be.true;
       });
-      expect(preloadExtensionSpy.withArgs('amp-analytics')).to.not.be.called;
-    });
-
-    it('with analytics', () => {
-      const url = ['https://foo.com?a=b', 'https://blah.com?lsk=sdk&sld=vj'];
-      impl.extractSize({
-        get(name) {
-          switch (name) {
-            case 'X-AmpAnalytics':
-              return JSON.stringify({url});
-            default:
-              return undefined;
-          }
-        },
-        has(name) {
-          return !!this.get(name);
-        },
+      it('should be valid (responsive)', () => {
+        isResponsiveStub.callsFake(() => true);
+        element.setAttribute('data-full-width', 'true');
+        element.setAttribute('height', '320');
+        element.setAttribute('width', '100vw');
+        expect(impl.isValidElement()).to.be.true;
       });
-      expect(preloadExtensionSpy.withArgs('amp-analytics')).to.be.called;
-      // exact value of ampAnalyticsConfig_ covered in
-      // ads/google/test/test-utils.js
-    });
-
-    it('should consume sandbox header', () => {
-      impl.extractSize({
-        get(name) {
-          switch (name) {
-            case 'amp-ff-sandbox':
-              return 'true';
-            default:
-              return undefined;
-          }
-        },
-        has(name) {
-          return !!this.get(name);
-        },
+      it('should NOT be valid (responsive with wrong height)', () => {
+        isResponsiveStub.callsFake(() => true);
+        element.setAttribute('data-full-width', 'true');
+        element.setAttribute('height', '666');
+        element.setAttribute('width', '100vw');
+        expect(impl.isValidElement()).to.be.false;
+      });
+      it('should NOT be valid (responsive with wrong width)', () => {
+        isResponsiveStub.callsFake(() => true);
+        element.setAttribute('data-full-width', 'true');
+        element.setAttribute('height', '320');
+        element.setAttribute('width', '666');
+        expect(impl.isValidElement()).to.be.false;
+      });
+      it('should NOT be valid (responsive with missing data-full-width)', () => {
+        isResponsiveStub.callsFake(() => true);
+        element.setAttribute('height', '320');
+        element.setAttribute('width', '100vw');
+        expect(impl.isValidElement()).to.be.false;
+      });
+      it('should NOT be valid (impl tag name)', () => {
+        element = createAdsenseImplElement(
+          {'data-ad-client': 'ca-adsense'},
+          doc,
+          'amp-ad-network-adsense-impl'
+        );
+        impl = new AmpAdNetworkAdsenseImpl(element);
+        expect(impl.isValidElement()).to.be.false;
+      });
+      it('should NOT be valid (missing ad client)', () => {
+        element.setAttribute('data-ad-client', '');
+        element.setAttribute('type', 'adsense');
+        expect(impl.isValidElement()).to.be.false;
+      });
+      it('should be valid (amp-embed)', () => {
+        element = createAdsenseImplElement(
+          {'data-ad-client': 'ca-adsense'},
+          doc,
+          'amp-embed'
+        );
+        impl = new AmpAdNetworkAdsenseImpl(element);
+        expect(impl.isValidElement()).to.be.true;
       });
-      expect(impl.sandboxHTMLCreativeFrame()).to.be.true;
     });
-  });
 
-  describe('#onNetworkFailure', () => {
+    describe('#extractSize', () => {
+      let preloadExtensionSpy;
 
-    it('should append error parameter', () => {
-      const TEST_URL = 'https://somenetwork.com/foo?hello=world&a=b';
-      expect(impl.onNetworkFailure(new Error('xhr failure'), TEST_URL))
-          .to.jsonEqual({adUrl: TEST_URL + '&aet=n'});
-    });
-  });
-
-  describe('#onCreativeRender', () => {
-    beforeEach(() => {
-      element = createElementWithAttributes(doc, 'amp-ad', {
-        'width': '200',
-        'height': '50',
-        'type': 'adsense',
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'adsense',
+          'layout': 'fixed',
+        });
+        impl = new AmpAdNetworkAdsenseImpl(element);
+        sandbox.stub(impl, 'getAmpDoc').callsFake(() => ampdoc);
+        const extensions = Services.extensionsFor(impl.win);
+        preloadExtensionSpy = sandbox.spy(extensions, 'preloadExtension');
       });
-      doc.body.appendChild(element);
-      impl = new AmpAdNetworkAdsenseImpl(element);
-      impl.getA4aAnalyticsConfig = () => {};
-      impl.buildCallback();
-      sandbox.stub(impl, 'getAmpDoc').callsFake(() => ampdoc);
-      sandbox.stub(env.ampdocService, 'getAmpDoc').callsFake(() => ampdoc);
-    });
 
-    [true, false].forEach(exp => {
-      it('injects amp analytics' +
-        (exp ? ', trigger immediate disable exp' : ''), () => {
-        impl.ampAnalyticsConfig_ = {
-          transport: {beacon: false, xhrpost: false},
-          requests: {
-            visibility1: 'https://foo.com?hello=world',
-            visibility2: 'https://bar.com?a=b',
+      it('without analytics', () => {
+        impl.extractSize({
+          get() {
+            return undefined;
           },
-          triggers: {
-            continuousVisible: {
-              on: 'visible',
-              request: ['visibility1', 'visibility2'],
-              visibilitySpec: {
-                selector: 'amp-ad',
-                selectionMethod: 'closest',
-                visiblePercentageMin: 50,
-                continuousTimeMin: 1000,
-              },
-            },
-            continuousVisibleIniLoad: {
-              on: 'ini-load',
-              selector: 'amp-ad',
-              selectionMethod: 'closest',
-            },
-            continuousVisibleRenderStart: {
-              on: 'render-start',
-              selector: 'amp-ad',
-              selectionMethod: 'closest',
-            },
+          has() {
+            return false;
           },
-        };
-        // To placate assertion.
-        impl.responseHeaders_ = {
-          get: function(name) {
-            if (name == 'X-QQID') {
-              return 'qqid_string';
+        });
+        expect(preloadExtensionSpy.withArgs('amp-analytics')).to.not.be.called;
+      });
+
+      it('with analytics', () => {
+        const url = ['https://foo.com?a=b', 'https://blah.com?lsk=sdk&sld=vj'];
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'X-AmpAnalytics':
+                return JSON.stringify({url});
+              default:
+                return undefined;
             }
           },
-          has: function(name) {
-            if (name == 'X-QQID') {
-              return true;
+          has(name) {
+            return !!this.get(name);
+          },
+        });
+        expect(preloadExtensionSpy.withArgs('amp-analytics')).to.be.called;
+        // exact value of ampAnalyticsConfig_ covered in
+        // ads/google/test/test-utils.js
+      });
+
+      it('should consume sandbox header', () => {
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'amp-ff-sandbox':
+                return 'true';
+              default:
+                return undefined;
             }
           },
-        };
-        // Next two lines are to ensure that internal parts not relevant for
-        // this test are properly set.
-        impl.size_ = {width: 200, height: 50};
-        impl.iframe = impl.win.document.createElement('iframe');
-        if (exp) {
-          impl.postAdResponseExperimentFeatures['avr_disable_immediate'] = '1';
-        }
-        impl.onCreativeRender(false);
-        const ampAnalyticsElement = impl.element.querySelector('amp-analytics');
-        expect(ampAnalyticsElement).to.be.ok;
-        expect(ampAnalyticsElement.CONFIG).jsonEqual(impl.ampAnalyticsConfig_);
-        expect(ampAnalyticsElement.getAttribute('sandbox')).to.equal('true');
-        expect(ampAnalyticsElement.getAttribute('trigger')).to.equal(
-            exp ? '' : 'immediate');
-        expect(impl.ampAnalyticsElement_).to.be.ok;
-        // Exact format of amp-analytics element covered in
-        // test/unit/test-analytics.js.
-        // Just ensure extensions is loaded, and analytics element appended.
+          has(name) {
+            return !!this.get(name);
+          },
+        });
+        expect(impl.sandboxHTMLCreativeFrame()).to.be.true;
       });
     });
 
-    it('should register click listener', () => {
-      impl.iframe = impl.win.document.createElement('iframe');
-      impl.win.document.body.appendChild(impl.iframe);
-      const adBody = impl.iframe.contentDocument.body;
-      let clickHandlerCalled = 0;
-
-      adBody.onclick = function(e) {
-        expect(e.defaultPrevented).to.be.false;
-        e.preventDefault(); // Make the test not actually navigate.
-        clickHandlerCalled++;
-      };
-      adBody.innerHTML = '<a ' +
-          'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
-          '<button id="target"><button></div>';
-      const button = adBody.querySelector('#target');
-      const a = adBody.querySelector('a');
-      const ev1 = new Event('click', {bubbles: true});
-      ev1.pageX = 10;
-      ev1.pageY = 20;
-      sandbox.stub(impl, 'getResource').returns(
-          {
-            getUpgradeDelayMs: () => 1,
-          });
+    describe('#onNetworkFailure', () => {
+      it('should append error parameter', () => {
+        const TEST_URL = 'https://somenetwork.com/foo?hello=world&a=b';
+        expect(
+          impl.onNetworkFailure(new Error('xhr failure'), TEST_URL)
+        ).to.jsonEqual({adUrl: TEST_URL + '&aet=n'});
+      });
+    });
 
-      // Make sure the ad iframe (FIE) has a local URL replacements service.
-      const urlReplacements = Services.urlReplacementsForDoc(element);
-      sandbox.stub(Services, 'urlReplacementsForDoc')
-          .withArgs(a).returns(urlReplacements);
+    describe('#onCreativeRender', () => {
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'adsense',
+        });
+        doc.body.appendChild(element);
+        impl = new AmpAdNetworkAdsenseImpl(element);
+        impl.getA4aAnalyticsConfig = () => {};
+        impl.buildCallback();
+        sandbox.stub(impl, 'getAmpDoc').callsFake(() => ampdoc);
+        sandbox.stub(env.ampdocService, 'getAmpDoc').callsFake(() => ampdoc);
+      });
 
-      impl.buildCallback();
-      impl.size_ = {width: 123, height: 456};
-      impl.onCreativeRender({customElementExtensions: []});
-      button.dispatchEvent(ev1);
-      expect(a.href).to.equal('https://f.co/?10,20,RANDOM');
-      expect(clickHandlerCalled).to.equal(1);
-    });
+      [true, false].forEach(exp => {
+        it(
+          'injects amp analytics' +
+            (exp ? ', trigger immediate disable exp' : ''),
+          () => {
+            impl.ampAnalyticsConfig_ = {
+              transport: {beacon: false, xhrpost: false},
+              requests: {
+                visibility1: 'https://foo.com?hello=world',
+                visibility2: 'https://bar.com?a=b',
+              },
+              triggers: {
+                continuousVisible: {
+                  on: 'visible',
+                  request: ['visibility1', 'visibility2'],
+                  visibilitySpec: {
+                    selector: 'amp-ad',
+                    selectionMethod: 'closest',
+                    visiblePercentageMin: 50,
+                    continuousTimeMin: 1000,
+                  },
+                },
+                continuousVisibleIniLoad: {
+                  on: 'ini-load',
+                  selector: 'amp-ad',
+                  selectionMethod: 'closest',
+                },
+                continuousVisibleRenderStart: {
+                  on: 'render-start',
+                  selector: 'amp-ad',
+                  selectionMethod: 'closest',
+                },
+              },
+            };
+            // To placate assertion.
+            impl.responseHeaders_ = {
+              get: function(name) {
+                if (name == 'X-QQID') {
+                  return 'qqid_string';
+                }
+              },
+              has: function(name) {
+                if (name == 'X-QQID') {
+                  return true;
+                }
+              },
+            };
+            // Next two lines are to ensure that internal parts not relevant for
+            // this test are properly set.
+            impl.size_ = {width: 200, height: 50};
+            impl.iframe = impl.win.document.createElement('iframe');
+            if (exp) {
+              impl.postAdResponseExperimentFeatures['avr_disable_immediate'] =
+                '1';
+            }
+            impl.onCreativeRender(false);
+            const ampAnalyticsElement = impl.element.querySelector(
+              'amp-analytics'
+            );
+            expect(ampAnalyticsElement).to.be.ok;
+            expect(ampAnalyticsElement.CONFIG).jsonEqual(
+              impl.ampAnalyticsConfig_
+            );
+            expect(ampAnalyticsElement.getAttribute('sandbox')).to.equal(
+              'true'
+            );
+            expect(ampAnalyticsElement.getAttribute('trigger')).to.equal(
+              exp ? '' : 'immediate'
+            );
+            expect(impl.ampAnalyticsElement_).to.be.ok;
+            // Exact format of amp-analytics element covered in
+            // test/unit/test-analytics.js.
+            // Just ensure extensions is loaded, and analytics element appended.
+          }
+        );
+      });
 
-    it('should not register click listener is amp-ad-exit', () => {
-      impl.iframe = impl.win.document.createElement('iframe');
-      impl.win.document.body.appendChild(impl.iframe);
-      const adBody = impl.iframe.contentDocument.body;
-      let clickHandlerCalled = 0;
-
-      adBody.onclick = function(e) {
-        expect(e.defaultPrevented).to.be.false;
-        e.preventDefault(); // Make the test not actually navigate.
-        clickHandlerCalled++;
-      };
-      adBody.innerHTML = '<a ' +
+      it('should register click listener', () => {
+        impl.iframe = impl.win.document.createElement('iframe');
+        impl.win.document.body.appendChild(impl.iframe);
+        const adBody = impl.iframe.contentDocument.body;
+        let clickHandlerCalled = 0;
+
+        adBody.onclick = function(e) {
+          expect(e.defaultPrevented).to.be.false;
+          e.preventDefault(); // Make the test not actually navigate.
+          clickHandlerCalled++;
+        };
+        adBody.innerHTML =
+          '<a ' +
           'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
           '<button id="target"><button></div>';
-      const button = adBody.querySelector('#target');
-      const a = adBody.querySelector('a');
-      const ev1 = new Event('click', {bubbles: true});
-      ev1.pageX = 10;
-      ev1.pageY = 20;
-      sandbox.stub(impl, 'getResource').returns(
-          {
-            getUpgradeDelayMs: () => 1,
-          });
-      impl.buildCallback();
-      impl.size_ = {width: 123, height: 456};
-      impl.onCreativeRender({customElementExtensions: ['amp-ad-exit']});
-      button.dispatchEvent(ev1);
-      expect(a.href).to.equal('https://f.co/?CLICK_X,CLICK_Y,RANDOM');
-      expect(clickHandlerCalled).to.equal(1);
-    });
+        const button = adBody.querySelector('#target');
+        const a = adBody.querySelector('a');
+        const ev1 = new Event('click', {bubbles: true});
+        ev1.pageX = 10;
+        ev1.pageY = 20;
+        sandbox.stub(impl, 'getResource').returns({
+          getUpgradeDelayMs: () => 1,
+        });
 
-    it('should set iframe id and data-google-query-id attribute', () => {
-      impl.buildCallback();
-      impl.ifi_ = 3;
-      impl.qqid_ = 'abc';
-      impl.iframe = impl.win.document.createElement('iframe');
-      impl.size_ = {width: 123, height: 456};
-      impl.onCreativeRender(null);
-      expect(impl.element.getAttribute('data-google-query-id')).to.equal('abc');
-      expect(impl.iframe.id).to.equal('google_ads_iframe_3');
-    });
-  });
+        // Make sure the ad iframe (FIE) has a local URL replacements service.
+        const urlReplacements = Services.urlReplacementsForDoc(element);
+        sandbox
+          .stub(Services, 'urlReplacementsForDoc')
+          .withArgs(a)
+          .returns(urlReplacements);
+
+        impl.buildCallback();
+        impl.size_ = {width: 123, height: 456};
+        impl.onCreativeRender({customElementExtensions: []});
+        button.dispatchEvent(ev1);
+        expect(a.href).to.equal('https://f.co/?10,20,RANDOM');
+        expect(clickHandlerCalled).to.equal(1);
+      });
 
-  describe('centering', () => {
-
-    function verifyCss(iframe) {
-      expect(iframe).to.be.ok;
-      const style = win.getComputedStyle(iframe);
-      expect(style.top).to.equal('50%');
-      expect(style.left).to.equal('50%');
-      // We expect these set, but the exact dimensions will be determined by the
-      // IOb.
-      expect(style.width).to.be.ok;
-      expect(style.height).to.be.ok;
-      // We don't know the exact values by which the frame will be translated,
-      // as this can vary depending on whether we use the height/width
-      // attributes, or the actual size of the frame. To make this less of a
-      // hassle, we'll just match against regexp.
-      expect(style.transform).to.match(new RegExp(
-          'matrix\\(1, 0, 0, 1, -[0-9]+, -[0-9]+\\)'));
-    }
+      it('should not register click listener is amp-ad-exit', () => {
+        impl.iframe = impl.win.document.createElement('iframe');
+        impl.win.document.body.appendChild(impl.iframe);
+        const adBody = impl.iframe.contentDocument.body;
+        let clickHandlerCalled = 0;
+
+        adBody.onclick = function(e) {
+          expect(e.defaultPrevented).to.be.false;
+          e.preventDefault(); // Make the test not actually navigate.
+          clickHandlerCalled++;
+        };
+        adBody.innerHTML =
+          '<a ' +
+          'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
+          '<button id="target"><button></div>';
+        const button = adBody.querySelector('#target');
+        const a = adBody.querySelector('a');
+        const ev1 = new Event('click', {bubbles: true});
+        ev1.pageX = 10;
+        ev1.pageY = 20;
+        sandbox.stub(impl, 'getResource').returns({
+          getUpgradeDelayMs: () => 1,
+        });
+        impl.buildCallback();
+        impl.size_ = {width: 123, height: 456};
+        impl.onCreativeRender({customElementExtensions: ['amp-ad-exit']});
+        button.dispatchEvent(ev1);
+        expect(a.href).to.equal('https://f.co/?CLICK_X,CLICK_Y,RANDOM');
+        expect(clickHandlerCalled).to.equal(1);
+      });
 
-    it('centers iframe in slot when height && width', () => {
-      createImplTag({
-        width: '300',
-        height: '150',
+      it('should set iframe id and data-google-query-id attribute', () => {
+        impl.buildCallback();
+        impl.ifi_ = 3;
+        impl.qqid_ = 'abc';
+        impl.iframe = impl.win.document.createElement('iframe');
+        impl.size_ = {width: 123, height: 456};
+        impl.onCreativeRender(null);
+        expect(impl.element.getAttribute('data-google-query-id')).to.equal(
+          'abc'
+        );
+        expect(impl.iframe.id).to.equal('google_ads_iframe_3');
       });
-      // Need to call upgradeCallback on AmpAd element to ensure upgrade
-      // attribute is set such that CSS is applies.
-      new AmpAd(element).upgradeCallback();
-      expect(impl.element.getAttribute('width')).to.equal('300');
-      expect(impl.element.getAttribute('height')).to.equal('150');
-      verifyCss(impl.iframe);
-    });
-    it('centers iframe in slot when !height && !width', () => {
-      allowConsoleError(() => createImplTag({
-        layout: 'fixed',
-      }));
-      // Need to call upgradeCallback on AmpAd element to ensure upgrade
-      // attribute is set such that CSS is applies.
-      new AmpAd(element).upgradeCallback();
-      expect(impl.element.getAttribute('width')).to.be.null;
-      expect(impl.element.getAttribute('height')).to.be.null;
-      verifyCss(impl.iframe);
-    });
-    it('centers iframe in slot when !height && width', () => {
-      allowConsoleError(() => createImplTag({
-        width: '300',
-        layout: 'fixed',
-      }));
-      // Need to call upgradeCallback on AmpAd element to ensure upgrade
-      // attribute is set such that CSS is applies.
-      new AmpAd(element).upgradeCallback();
-      expect(impl.element.getAttribute('width')).to.equal('300');
-      expect(impl.element.getAttribute('height')).to.be.null;
-      verifyCss(impl.iframe);
     });
-    it('centers iframe in slot when height && !width', () => {
-      allowConsoleError(() => createImplTag({
-        height: '150',
-        layout: 'fixed',
-      }));
-      // Need to call upgradeCallback on AmpAd element to ensure upgrade
-      // attribute is set such that CSS is applies.
-      new AmpAd(element).upgradeCallback();
-      expect(impl.element.getAttribute('width')).to.be.null;
-      expect(impl.element.getAttribute('height')).to.equal('150');
-      verifyCss(impl.iframe);
-    });
-  });
 
-  describe('#getAdUrl', () => {
-    const adsenseFormatExpName = 'as-use-attr-for-format';
+    describe('centering', () => {
+      function verifyCss(iframe) {
+        expect(iframe).to.be.ok;
+        const style = win.getComputedStyle(iframe);
+        expect(style.top).to.equal('50%');
+        expect(style.left).to.equal('50%');
+        // We expect these set, but the exact dimensions will be determined by the
+        // IOb.
+        expect(style.width).to.be.ok;
+        expect(style.height).to.be.ok;
+        // We don't know the exact values by which the frame will be translated,
+        // as this can vary depending on whether we use the height/width
+        // attributes, or the actual size of the frame. To make this less of a
+        // hassle, we'll just match against regexp.
+        expect(style.transform).to.match(
+          new RegExp('matrix\\(1, 0, 0, 1, -[0-9]+, -[0-9]+\\)')
+        );
+      }
 
-    beforeEach(() => {
-      resetSharedState();
+      it('centers iframe in slot when height && width', () => {
+        createImplTag({
+          width: '300',
+          height: '150',
+        });
+        // Need to call upgradeCallback on AmpAd element to ensure upgrade
+        // attribute is set such that CSS is applies.
+        new AmpAd(element).upgradeCallback();
+        expect(impl.element.getAttribute('width')).to.equal('300');
+        expect(impl.element.getAttribute('height')).to.equal('150');
+        verifyCss(impl.iframe);
+      });
+      it('centers iframe in slot when !height && !width', () => {
+        allowConsoleError(() =>
+          createImplTag({
+            layout: 'fixed',
+          })
+        );
+        // Need to call upgradeCallback on AmpAd element to ensure upgrade
+        // attribute is set such that CSS is applies.
+        new AmpAd(element).upgradeCallback();
+        expect(impl.element.getAttribute('width')).to.be.null;
+        expect(impl.element.getAttribute('height')).to.be.null;
+        verifyCss(impl.iframe);
+      });
+      it('centers iframe in slot when !height && width', () => {
+        allowConsoleError(() =>
+          createImplTag({
+            width: '300',
+            layout: 'fixed',
+          })
+        );
+        // Need to call upgradeCallback on AmpAd element to ensure upgrade
+        // attribute is set such that CSS is applies.
+        new AmpAd(element).upgradeCallback();
+        expect(impl.element.getAttribute('width')).to.equal('300');
+        expect(impl.element.getAttribute('height')).to.be.null;
+        verifyCss(impl.iframe);
+      });
+      it('centers iframe in slot when height && !width', () => {
+        allowConsoleError(() =>
+          createImplTag({
+            height: '150',
+            layout: 'fixed',
+          })
+        );
+        // Need to call upgradeCallback on AmpAd element to ensure upgrade
+        // attribute is set such that CSS is applies.
+        new AmpAd(element).upgradeCallback();
+        expect(impl.element.getAttribute('width')).to.be.null;
+        expect(impl.element.getAttribute('height')).to.equal('150');
+        verifyCss(impl.iframe);
+      });
     });
 
-    afterEach(() => {
-      toggleExperiment(impl.win, adsenseFormatExpName, false);
-      toggleExperiment(
-          impl.win, 'ADSENSE_AMP_AUTO_ADS_HOLDOUT_EXPERIMENT_NAME', false);
-    });
+    describe('#getAdUrl', () => {
+      const adsenseFormatExpName = 'as-use-attr-for-format';
 
-    it('should contain act', () => {
-      const ampStickyAd =
-            createElementWithAttributes(doc, 'amp-sticky-ad', {
-              'layout': 'nodisplay',
-            });
-      ampStickyAd.appendChild(element);
-      doc.body.appendChild(ampStickyAd);
-      return impl.getAdUrl().then(adUrl => {
-        expect(adUrl).to.contain('act=sa');
+      beforeEach(() => {
+        resetSharedState();
       });
-    });
 
-    it('formats client properly', () => {
-      element.setAttribute('data-ad-client', 'SoMeClient');
-      return impl.getAdUrl().then(url => {
-        expect(url).to.match(/\\?client=ca-someclient/);
+      afterEach(() => {
+        toggleExperiment(impl.win, adsenseFormatExpName, false);
+        toggleExperiment(
+          impl.win,
+          'ADSENSE_AMP_AUTO_ADS_HOLDOUT_EXPERIMENT_NAME',
+          false
+        );
       });
-    });
-    it('has correct format when width == "auto"', () => {
-      element.setAttribute('width', 'auto');
-      expect(impl.element.getAttribute('width')).to.equal('auto');
-      return impl.getAdUrl().then(url =>
-        // With exp as-use-attr-for-format off, we can't test for specific
-        // numbers, but we know that the values should be numeric.
-        expect(url).to.match(/format=\d+x\d+&w=\d+&h=\d+/));
-    });
-    it('has correct format when height == "auto"', () => {
-      element.setAttribute('height', 'auto');
-      expect(impl.element.getAttribute('height')).to.equal('auto');
-      return impl.getAdUrl().then(url =>
-        // With exp as-use-attr-for-format off, we can't test for specific
-        // numbers, but we know that the values should be numeric.
-        expect(url).to.match(/format=\d+x\d+&w=\d+&h=\d+/));
-    });
-    it('has correct format when as-use-attr-for-format is on', () => {
-      forceExperimentBranch(impl.win, adsenseFormatExpName, '21062004');
-      impl.divertExperiments();
-      const width = element.getAttribute('width');
-      const height = element.getAttribute('height');
-      return impl.getAdUrl().then(url =>
-        expect(url).to.match(new RegExp(
-            `format=${width}x${height}&w=${width}&h=${height}`)));
-    });
-    it('has experiment eid in adsense frmt exp and width/height numeric',
-        () => {
-          forceExperimentBranch(impl.win, adsenseFormatExpName, '21062004');
-          impl.divertExperiments();
-          return impl.getAdUrl().then(
-              url => expect(url).to.match(/eid=[^&]*21062004/));
+
+      it('should contain act', () => {
+        const ampStickyAd = createElementWithAttributes(doc, 'amp-sticky-ad', {
+          'layout': 'nodisplay',
+        });
+        ampStickyAd.appendChild(element);
+        doc.body.appendChild(ampStickyAd);
+        return impl.getAdUrl().then(adUrl => {
+          expect(adUrl).to.contain('act=sa');
         });
-    it('has control eid in adsense frmt exp and width/height numeric', () => {
-      forceExperimentBranch(impl.win, adsenseFormatExpName, '21062003');
-      impl.divertExperiments();
-      return impl.getAdUrl().then(
-          url => expect(url).to.match(/eid=[^&]*21062003/));
-    });
-    it('returns the right URL', () => {
-      element.setAttribute('data-ad-slot', 'some_slot');
-      element.setAttribute('data-language', 'lxz');
-      return impl.getAdUrl().then(url => {
-        [
-          /^https:\/\/googleads\.g\.doubleclick\.net\/pagead\/ads/,
-          /(\?|&)adk=\d+(&|$)/,
-          /(\?|&)is_amp=3(&|$)/,
-          /(\?|&)amp_v=%24internalRuntimeVersion%24(&|$)/,
-          /(\?|&)client=ca-adsense(&|$)/,
-          /(\?|&)format=\d+x\d+(&|$)/,
-          /(\?|&)iu=some_slot(&|$)/,
-          /(\?|&)output=html(&|$)/,
-          /(\?|&)w=\d+(&|$)/,
-          /(\?|&)h=\d+(&|$)/,
-          /(\?|&)d_imp=1(&|$)/,
-          /(\?|&)dt=\d+(&|$)/,
-          /(\?|&)ifi=\d+(&|$)/,
-          /(\?|&)adf=\d+(&|$)/,
-          /(\?|&)c=\d+(&|$)/,
-          /(\?|&)biw=\d+(&|$)/,
-          /(\?|&)bih=\d+(&|$)/,
-          /(\?|&)adx=-?\d+(&|$)/,
-          /(\?|&)ady=-?\d+(&|$)/,
-          /(\?|&)u_aw=\d+(&|$)/,
-          /(\?|&)u_ah=\d+(&|$)/,
-          /(\?|&)u_cd=24(&|$)/,
-          /(\?|&)u_w=\d+(&|$)/,
-          /(\?|&)u_h=\d+(&|$)/,
-          /(\?|&)u_tz=-?\d+(&|$)/,
-          /(\?|&)u_his=\d+(&|$)/,
-          /(\?|&)oid=2(&|$)/,
-          /(\?|&)isw=\d+(&|$)/,
-          /(\?|&)ish=\d+(&|$)/,
-          /(\?|&)pfx=(1|0)(&|$)/,
-          /(\?|&)hl=lxz(&|$)/,
-          /(\?|&)url=https?%3A%2F%2F[a-zA-Z0-9.:%]+(&|$)/,
-          /(\?|&)top=localhost(&|$)/,
-          /(\?|&)ref=https%3A%2F%2Facme.org%2F(&|$)/,
-          /(\?|&)dtd=\d+(&|$)/,
-        ].forEach(regexp => expect(url).to.match(regexp));
       });
-      it('sets rafmt for responsive', () => {
-        element.setAttribute('data-ad-slot', 'some_slot');
-        element.setAttribute('data-auto-format', 'rspv');
+
+      it('formats client properly', () => {
+        element.setAttribute('data-ad-client', 'SoMeClient');
         return impl.getAdUrl().then(url => {
-          expect(url).to.match(/(\?|&)ramft=13(&|$)/);
+          expect(url).to.match(/\\?client=ca-someclient/);
         });
       });
-      it('sets rafmt for matched content responsive', () => {
+      it('has correct format when width == "auto"', () => {
+        element.setAttribute('width', 'auto');
+        expect(impl.element.getAttribute('width')).to.equal('auto');
+        return impl.getAdUrl().then(url =>
+          // With exp as-use-attr-for-format off, we can't test for specific
+          // numbers, but we know that the values should be numeric.
+          expect(url).to.match(/format=\d+x\d+&w=\d+&h=\d+/)
+        );
+      });
+      it('has correct format when height == "auto"', () => {
+        element.setAttribute('height', 'auto');
+        expect(impl.element.getAttribute('height')).to.equal('auto');
+        return impl.getAdUrl().then(url =>
+          // With exp as-use-attr-for-format off, we can't test for specific
+          // numbers, but we know that the values should be numeric.
+          expect(url).to.match(/format=\d+x\d+&w=\d+&h=\d+/)
+        );
+      });
+      it('has correct format when as-use-attr-for-format is on', () => {
+        forceExperimentBranch(impl.win, adsenseFormatExpName, '21062004');
+        impl.divertExperiments();
+        const width = element.getAttribute('width');
+        const height = element.getAttribute('height');
+        return impl
+          .getAdUrl()
+          .then(url =>
+            expect(url).to.match(
+              new RegExp(`format=${width}x${height}&w=${width}&h=${height}`)
+            )
+          );
+      });
+      it('has experiment eid in adsense frmt exp and width/height numeric', () => {
+        forceExperimentBranch(impl.win, adsenseFormatExpName, '21062004');
+        impl.divertExperiments();
+        return impl
+          .getAdUrl()
+          .then(url => expect(url).to.match(/eid=[^&]*21062004/));
+      });
+      it('has control eid in adsense frmt exp and width/height numeric', () => {
+        forceExperimentBranch(impl.win, adsenseFormatExpName, '21062003');
+        impl.divertExperiments();
+        return impl
+          .getAdUrl()
+          .then(url => expect(url).to.match(/eid=[^&]*21062003/));
+      });
+      it('returns the right URL', () => {
         element.setAttribute('data-ad-slot', 'some_slot');
-        element.setAttribute('data-auto-format', 'mcrspv');
+        element.setAttribute('data-language', 'lxz');
         return impl.getAdUrl().then(url => {
-          expect(url).to.match(/(\?|&)ramft=15(&|$)/);
+          [
+            /^https:\/\/googleads\.g\.doubleclick\.net\/pagead\/ads/,
+            /(\?|&)adk=\d+(&|$)/,
+            /(\?|&)is_amp=3(&|$)/,
+            /(\?|&)amp_v=%24internalRuntimeVersion%24(&|$)/,
+            /(\?|&)client=ca-adsense(&|$)/,
+            /(\?|&)format=\d+x\d+(&|$)/,
+            /(\?|&)iu=some_slot(&|$)/,
+            /(\?|&)output=html(&|$)/,
+            /(\?|&)w=\d+(&|$)/,
+            /(\?|&)h=\d+(&|$)/,
+            /(\?|&)d_imp=1(&|$)/,
+            /(\?|&)dt=\d+(&|$)/,
+            /(\?|&)ifi=\d+(&|$)/,
+            /(\?|&)adf=\d+(&|$)/,
+            /(\?|&)c=\d+(&|$)/,
+            /(\?|&)biw=\d+(&|$)/,
+            /(\?|&)bih=\d+(&|$)/,
+            /(\?|&)adx=-?\d+(&|$)/,
+            /(\?|&)ady=-?\d+(&|$)/,
+            /(\?|&)u_aw=\d+(&|$)/,
+            /(\?|&)u_ah=\d+(&|$)/,
+            /(\?|&)u_cd=24(&|$)/,
+            /(\?|&)u_w=\d+(&|$)/,
+            /(\?|&)u_h=\d+(&|$)/,
+            /(\?|&)u_tz=-?\d+(&|$)/,
+            /(\?|&)u_his=\d+(&|$)/,
+            /(\?|&)oid=2(&|$)/,
+            /(\?|&)isw=\d+(&|$)/,
+            /(\?|&)ish=\d+(&|$)/,
+            /(\?|&)pfx=(1|0)(&|$)/,
+            /(\?|&)hl=lxz(&|$)/,
+            /(\?|&)url=https?%3A%2F%2F[a-zA-Z0-9.:%]+(&|$)/,
+            /(\?|&)top=localhost(&|$)/,
+            /(\?|&)ref=https%3A%2F%2Facme.org%2F(&|$)/,
+            /(\?|&)dtd=\d+(&|$)/,
+          ].forEach(regexp => expect(url).to.match(regexp));
         });
-      });
-      it('sets matched content specific fields', () => {
-        element.setAttribute('data-matched-content-ui-type', 'ui');
-        element.setAttribute('data-matched-content-rows-num', 'rows');
-        element.setAttribute('data-matched-content-columns-num', 'cols');
-        return impl.getAdUrl().then(url => {
-          expect(url).to.match(/(\?|&)crui=ui(&|$)/);
-          expect(url).to.match(/(\?|&)cr_row=rows(&|$)/);
-          expect(url).to.match(/(\?|&)cr_col=cols(&|$)/);
+        it('sets rafmt for responsive', () => {
+          element.setAttribute('data-ad-slot', 'some_slot');
+          element.setAttribute('data-auto-format', 'rspv');
+          return impl.getAdUrl().then(url => {
+            expect(url).to.match(/(\?|&)ramft=13(&|$)/);
+          });
+        });
+        it('sets rafmt for matched content responsive', () => {
+          element.setAttribute('data-ad-slot', 'some_slot');
+          element.setAttribute('data-auto-format', 'mcrspv');
+          return impl.getAdUrl().then(url => {
+            expect(url).to.match(/(\?|&)ramft=15(&|$)/);
+          });
+        });
+        it('sets matched content specific fields', () => {
+          element.setAttribute('data-matched-content-ui-type', 'ui');
+          element.setAttribute('data-matched-content-rows-num', 'rows');
+          element.setAttribute('data-matched-content-columns-num', 'cols');
+          return impl.getAdUrl().then(url => {
+            expect(url).to.match(/(\?|&)crui=ui(&|$)/);
+            expect(url).to.match(/(\?|&)cr_row=rows(&|$)/);
+            expect(url).to.match(/(\?|&)cr_col=cols(&|$)/);
+          });
         });
       });
-    });
 
-    // Not using arrow function here because otherwise the way closure behaves
-    // prevents me from calling this.timeout(5000).
-    it('with multiple slots', function() {
-      // When run locally, this test tends to exceed 2000ms timeout.
-      this.timeout(10000);
-      // Reset counter for purpose of this test.
-      delete win['ampAdGoogleIfiCounter'];
-      const elem1 = createAdsenseImplElement({
-        'data-ad-client': 'ca-adsense',
-        'width': '320',
-        'height': '50',
-        'data-experiment-id': '8675309',
-      }, doc);
-      doc.body.appendChild(elem1);
-      const elem2 = createAdsenseImplElement({
-        'data-ad-client': 'ca-adsense',
-        'width': '320',
-        'height': '50',
-        'data-experiment-id': '8675309',
-        'data-ad-slot': 'slotname_foo',
-      }, doc, 'amp-ad');
-      doc.body.appendChild(elem2);
-      const elem3 = createAdsenseImplElement({
-        'data-ad-client': 'ca-not-adsense',
-        'width': '320',
-        'height': '50',
-        'data-experiment-id': '8675309',
-      }, doc, 'amp-ad');
-      doc.body.appendChild(elem3);
-      const impl1 = new AmpAdNetworkAdsenseImpl(elem1);
-      const impl2 = new AmpAdNetworkAdsenseImpl(elem2);
-      const impl3 = new AmpAdNetworkAdsenseImpl(elem3);
-      toggleExperiment(impl1.win, 'as-use-attr-for-format', true);
-      return impl1.getAdUrl().then(adUrl1 => {
-        expect(adUrl1).to.match(/pv=2/);
-        expect(adUrl1).to.not.match(/prev_fmts/);
-        expect(adUrl1).to.not.match(/prev_slotnames/);
-        expect(adUrl1).to.match(/ifi=1/);
-        return impl2.getAdUrl().then(adUrl2 => {
-          expect(adUrl2).to.match(/pv=1/);
-          expect(adUrl2).to.match(/prev_fmts=\d+?x\d+?/);
-          expect(adUrl2).to.not.match(/prev_slotnames/);
-          expect(adUrl2).to.match(/ifi=2/);
-          return impl3.getAdUrl().then(adUrl3 => {
-            expect(adUrl3).to.match(/pv=2/);
-            // By some quirk of the test infrastructure, when this test
-            // is ran individually, each added slot after the first one
-            // has a bounding rectangle of 0x0. The important thing to
-            // test here is the number of previous formats.
-            expect(adUrl3).to.match(
-                /prev_fmts=(\d+?x\d+?%2C\d+?x\d+?|\d+?x\d+?%2C\d+?x\d+?)/);
-            expect(adUrl3).to.match(/prev_slotnames=slotname_foo/);
-            expect(adUrl3).to.match(/ifi=3/);
+      // Not using arrow function here because otherwise the way closure behaves
+      // prevents me from calling this.timeout(5000).
+      it('with multiple slots', function() {
+        // When run locally, this test tends to exceed 2000ms timeout.
+        this.timeout(10000);
+        // Reset counter for purpose of this test.
+        delete win['ampAdGoogleIfiCounter'];
+        const elem1 = createAdsenseImplElement(
+          {
+            'data-ad-client': 'ca-adsense',
+            'width': '320',
+            'height': '50',
+            'data-experiment-id': '8675309',
+          },
+          doc
+        );
+        doc.body.appendChild(elem1);
+        const elem2 = createAdsenseImplElement(
+          {
+            'data-ad-client': 'ca-adsense',
+            'width': '320',
+            'height': '50',
+            'data-experiment-id': '8675309',
+            'data-ad-slot': 'slotname_foo',
+          },
+          doc,
+          'amp-ad'
+        );
+        doc.body.appendChild(elem2);
+        const elem3 = createAdsenseImplElement(
+          {
+            'data-ad-client': 'ca-not-adsense',
+            'width': '320',
+            'height': '50',
+            'data-experiment-id': '8675309',
+          },
+          doc,
+          'amp-ad'
+        );
+        doc.body.appendChild(elem3);
+        const impl1 = new AmpAdNetworkAdsenseImpl(elem1);
+        const impl2 = new AmpAdNetworkAdsenseImpl(elem2);
+        const impl3 = new AmpAdNetworkAdsenseImpl(elem3);
+        toggleExperiment(impl1.win, 'as-use-attr-for-format', true);
+        return impl1.getAdUrl().then(adUrl1 => {
+          expect(adUrl1).to.match(/pv=2/);
+          expect(adUrl1).to.not.match(/prev_fmts/);
+          expect(adUrl1).to.not.match(/prev_slotnames/);
+          expect(adUrl1).to.match(/ifi=1/);
+          return impl2.getAdUrl().then(adUrl2 => {
+            expect(adUrl2).to.match(/pv=1/);
+            expect(adUrl2).to.match(/prev_fmts=\d+?x\d+?/);
+            expect(adUrl2).to.not.match(/prev_slotnames/);
+            expect(adUrl2).to.match(/ifi=2/);
+            return impl3.getAdUrl().then(adUrl3 => {
+              expect(adUrl3).to.match(/pv=2/);
+              // By some quirk of the test infrastructure, when this test
+              // is ran individually, each added slot after the first one
+              // has a bounding rectangle of 0x0. The important thing to
+              // test here is the number of previous formats.
+              expect(adUrl3).to.match(
+                /prev_fmts=(\d+?x\d+?%2C\d+?x\d+?|\d+?x\d+?%2C\d+?x\d+?)/
+              );
+              expect(adUrl3).to.match(/prev_slotnames=slotname_foo/);
+              expect(adUrl3).to.match(/ifi=3/);
+            });
           });
         });
       });
-    });
 
-    it('should include identity', () => {
-      // Force get identity result by overloading window variable.
-      const token = /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/({
-        token: 'abcdef', jar: 'some_jar', pucrd: 'some_pucrd',
-      });
-      impl.win['goog_identity_prom'] = Promise.resolve(token);
-      impl.buildCallback();
-      return impl.getAdUrl().then(url => {
-        [/(\?|&)adsid=abcdef(&|$)/,
-          /(\?|&)jar=some_jar(&|$)/,
-          /(\?|&)pucrd=some_pucrd(&|$)/].forEach(
-            regexp => expect(url).to.match(regexp));
+      it('should include identity', () => {
+        // Force get identity result by overloading window variable.
+        const token = /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
+          token: 'abcdef',
+          jar: 'some_jar',
+          pucrd: 'some_pucrd',
+        });
+        impl.win['goog_identity_prom'] = Promise.resolve(token);
+        impl.buildCallback();
+        return impl.getAdUrl().then(url => {
+          [
+            /(\?|&)adsid=abcdef(&|$)/,
+            /(\?|&)jar=some_jar(&|$)/,
+            /(\?|&)pucrd=some_pucrd(&|$)/,
+          ].forEach(regexp => expect(url).to.match(regexp));
+        });
       });
-    });
-
-    it('includes adsense package code when present', () => {
-      element.setAttribute('data-package', 'package_code');
-      return expect(impl.getAdUrl()).to.eventually
-          .match(/pwprc=package_code(&|$)/);
-    });
-
-    it('should return empty string if unknown consentState', () => expect(
-        impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN)).to.eventually.equal(''));
 
-    it('should include npa=1 if unknown consent & explicit npa', () => {
-      impl.element.setAttribute('data-npa-on-unknown-consent', 'true');
-      return impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN).then(url => {
-        expect(url).to.match(/(\?|&)npa=1(&|$)/);
+      it('includes adsense package code when present', () => {
+        element.setAttribute('data-package', 'package_code');
+        return expect(impl.getAdUrl()).to.eventually.match(
+          /pwprc=package_code(&|$)/
+        );
       });
-    });
-
-    it('should include npa=1 if insufficient consent', () =>
-      impl.getAdUrl(CONSENT_POLICY_STATE.INSUFFICIENT).then(url => {
-        expect(url).to.match(/(\?|&)npa=1(&|$)/);
-      }));
 
-    it('should not include not npa, if sufficient consent', () =>
-      impl.getAdUrl(CONSENT_POLICY_STATE.SUFFICIENT).then(url => {
-        expect(url).to.not.match(/(\?|&)npa=(&|$)/);
-      }));
+      it('should return empty string if unknown consentState', () =>
+        expect(impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN)).to.eventually.equal(
+          ''
+        ));
 
-    it('should not include npa, if not required consent', () =>
-      impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED).then(url => {
-        expect(url).to.not.match(/(\?|&)npa=(&|$)/);
-      }));
-  });
-
-  describe('#unlayoutCallback', () => {
-    beforeEach(() => {
-      createImplTag({
-        width: '300',
-        height: '150',
+      it('should include npa=1 if unknown consent & explicit npa', () => {
+        impl.element.setAttribute('data-npa-on-unknown-consent', 'true');
+        return impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN).then(url => {
+          expect(url).to.match(/(\?|&)npa=1(&|$)/);
+        });
       });
-      impl.win.ampAdSlotIdCounter = 1;
-      expect(impl.element.getAttribute('data-amp-slot-index')).to.not.be.ok;
-      impl.layoutMeasureExecuted_ = true;
-      impl.uiHandler = {applyUnlayoutUI: () => {}};
-      const placeholder = doc.createElement('div');
-      placeholder.setAttribute('placeholder', '');
-      const fallback = doc.createElement('div');
-      fallback.setAttribute('fallback', '');
-      impl.element.appendChild(placeholder);
-      impl.element.appendChild(fallback);
-      impl.size_ = {width: 123, height: 456};
-    });
 
-    it('should reset state to null on non-FIE unlayoutCallback', () => {
-      impl.onCreativeRender();
-      expect(impl.unlayoutCallback()).to.be.true;
-      expect(impl.iframe).is.not.ok;
-    });
+      it('should include npa=1 if insufficient consent', () =>
+        impl.getAdUrl(CONSENT_POLICY_STATE.INSUFFICIENT).then(url => {
+          expect(url).to.match(/(\?|&)npa=1(&|$)/);
+        }));
 
-    it('should not reset state to null on FIE unlayoutCallback', () => {
-      impl.onCreativeRender({customElementExtensions: []});
-      expect(impl.unlayoutCallback()).to.be.false;
-      expect(impl.iframe).is.ok;
+      it('should not include not npa, if sufficient consent', () =>
+        impl.getAdUrl(CONSENT_POLICY_STATE.SUFFICIENT).then(url => {
+          expect(url).to.not.match(/(\?|&)npa=(&|$)/);
+        }));
+
+      it('should not include npa, if not required consent', () =>
+        impl.getAdUrl(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED).then(url => {
+          expect(url).to.not.match(/(\?|&)npa=(&|$)/);
+        }));
     });
 
-    it('should call #resetSlot, remove child iframe, but keep other children',
-        () => {
-          impl.ampAnalyticsConfig_ = {};
-          impl.ampAnalyticsElement_ =
-             doc.createElement('amp-analytics');
-          impl.element.appendChild(impl.ampAnalyticsElement_);
-          expect(impl.iframe).to.be.ok;
-          expect(impl.element.querySelector('iframe')).to.be.ok;
-          impl.unlayoutCallback();
-          expect(impl.element.querySelector('div[placeholder]')).to.be.ok;
-          expect(impl.element.querySelector('div[fallback]')).to.be.ok;
-          expect(impl.element.querySelector('iframe')).to.be.null;
-          expect(impl.element.querySelectorAll('amp-analytics'))
-              .to.have.lengthOf(1);
-          expect(impl.element.querySelector('amp-analytics')).to.equal(
-              impl.a4aAnalyticsElement_);
-          expect(impl.iframe).to.be.null;
-          expect(impl.ampAnalyticsConfig_).to.be.null;
-          expect(impl.ampAnalyticsElement_).to.be.null;
-          expect(impl.element.getAttribute('data-amp-slot-index'))
-              .to.equal('1');
+    describe('#unlayoutCallback', () => {
+      beforeEach(() => {
+        createImplTag({
+          width: '300',
+          height: '150',
         });
-  });
-
-  describe('#buildCallback', () => {
-
-    const VIEWPORT_WIDTH = 375;
-    const VIEWPORT_HEIGHT = 667;
+        impl.win.ampAdSlotIdCounter = 1;
+        expect(impl.element.getAttribute('data-amp-slot-index')).to.not.be.ok;
+        impl.layoutMeasureExecuted_ = true;
+        impl.uiHandler = {applyUnlayoutUI: () => {}};
+        const placeholder = doc.createElement('div');
+        placeholder.setAttribute('placeholder', '');
+        const fallback = doc.createElement('div');
+        fallback.setAttribute('fallback', '');
+        impl.element.appendChild(placeholder);
+        impl.element.appendChild(fallback);
+        impl.size_ = {width: 123, height: 456};
+      });
 
-    let iframe;
+      it('should reset state to null on non-FIE unlayoutCallback', () => {
+        impl.onCreativeRender();
+        expect(impl.unlayoutCallback()).to.be.true;
+        expect(impl.iframe).is.not.ok;
+      });
 
-    function constructImpl(config) {
-      config.type = 'adsense';
-      element = createElementWithAttributes(doc, 'amp-ad', config);
-      iframe = env.win.document.createElement('iframe');
-      element.appendChild(iframe);
-      doc.body.appendChild(element);
-      const impl = new AmpAdNetworkAdsenseImpl(element);
-      impl.element.style.display = 'block';
-      impl.element.style.position = 'relative';
-      impl.element.style.top = '101vh';
-      // Fix the viewport to a consistent size to that the test doesn't depend
-      // on the actual browser window opened.
-      impl.getViewport().getSize =
-          () => ({width: VIEWPORT_WIDTH, height: VIEWPORT_HEIGHT});
-      return impl;
-    }
+      it('should not reset state to null on FIE unlayoutCallback', () => {
+        impl.onCreativeRender({customElementExtensions: []});
+        expect(impl.unlayoutCallback()).to.be.false;
+        expect(impl.iframe).is.ok;
+      });
 
-    it('should do nothing for non-responsive', () => {
-      const adsense = constructImpl({
-        width: '320',
-        height: '150',
+      it('should call #resetSlot, remove child iframe, but keep other children', () => {
+        impl.ampAnalyticsConfig_ = {};
+        impl.ampAnalyticsElement_ = doc.createElement('amp-analytics');
+        impl.element.appendChild(impl.ampAnalyticsElement_);
+        expect(impl.iframe).to.be.ok;
+        expect(impl.element.querySelector('iframe')).to.be.ok;
+        impl.unlayoutCallback();
+        expect(impl.element.querySelector('div[placeholder]')).to.be.ok;
+        expect(impl.element.querySelector('div[fallback]')).to.be.ok;
+        expect(impl.element.querySelector('iframe')).to.be.null;
+        expect(impl.element.querySelectorAll('amp-analytics')).to.have.lengthOf(
+          1
+        );
+        expect(impl.element.querySelector('amp-analytics')).to.equal(
+          impl.a4aAnalyticsElement_
+        );
+        expect(impl.iframe).to.be.null;
+        expect(impl.ampAnalyticsConfig_).to.be.null;
+        expect(impl.ampAnalyticsElement_).to.be.null;
+        expect(impl.element.getAttribute('data-amp-slot-index')).to.equal('1');
       });
-      expect(adsense.buildCallback()).to.be.undefined;
     });
 
-    it('should schedule a resize for responsive', function *() {
-      const adsense = constructImpl({
-        width: '100vw',
-        height: '100',
-        'data-auto-format': 'rspv',
+    describe('#buildCallback', () => {
+      const VIEWPORT_WIDTH = 375;
+      const VIEWPORT_HEIGHT = 667;
+
+      let iframe;
+
+      function constructImpl(config) {
+        config.type = 'adsense';
+        element = createElementWithAttributes(doc, 'amp-ad', config);
+        iframe = env.win.document.createElement('iframe');
+        element.appendChild(iframe);
+        doc.body.appendChild(element);
+        const impl = new AmpAdNetworkAdsenseImpl(element);
+        impl.element.style.display = 'block';
+        impl.element.style.position = 'relative';
+        impl.element.style.top = '101vh';
+        // Fix the viewport to a consistent size to that the test doesn't depend
+        // on the actual browser window opened.
+        impl.getViewport().getSize = () => ({
+          width: VIEWPORT_WIDTH,
+          height: VIEWPORT_HEIGHT,
+        });
+        return impl;
+      }
+
+      it('should do nothing for non-responsive', () => {
+        const adsense = constructImpl({
+          width: '320',
+          height: '150',
+        });
+        expect(adsense.buildCallback()).to.be.undefined;
       });
-      env.sandbox.stub(adsense, 'attemptChangeSize').returns(Promise.resolve());
 
-      const promise = adsense.buildCallback();
-      expect(promise).to.exist;
-      yield promise;
+      it('should schedule a resize for responsive', function*() {
+        const adsense = constructImpl({
+          width: '100vw',
+          height: '100',
+          'data-auto-format': 'rspv',
+        });
+        env.sandbox
+          .stub(adsense, 'attemptChangeSize')
+          .returns(Promise.resolve());
 
-      expect(adsense.attemptChangeSize).to.be.calledWith(300, VIEWPORT_WIDTH);
-    });
+        const promise = adsense.buildCallback();
+        expect(promise).to.exist;
+        yield promise;
 
-    it('should call divertExperiments after isResponsive', () => {
-      const adsense = constructImpl({
-        width: '320',
-        height: '150',
+        expect(adsense.attemptChangeSize).to.be.calledWith(300, VIEWPORT_WIDTH);
       });
-      const isResponsiveSpy = env.sandbox.spy(adsense, 'isResponsive_');
-      const divertExperimentsSpy = env.sandbox.spy(
-          adsense, 'divertExperiments');
-      adsense.buildCallback();
-      expect(isResponsiveSpy.calledBefore(divertExperimentsSpy)).to.be.true;
-    });
 
-    it('should schedule a resize for matched content responsive', function *() {
-      const adsense = constructImpl({
-        width: '100vw',
-        height: '100',
-        'data-auto-format': 'mcrspv',
+      it('should call divertExperiments after isResponsive', () => {
+        const adsense = constructImpl({
+          width: '320',
+          height: '150',
+        });
+        const isResponsiveSpy = env.sandbox.spy(adsense, 'isResponsive_');
+        const divertExperimentsSpy = env.sandbox.spy(
+          adsense,
+          'divertExperiments'
+        );
+        adsense.buildCallback();
+        expect(isResponsiveSpy.calledBefore(divertExperimentsSpy)).to.be.true;
       });
-      env.sandbox.stub(adsense, 'attemptChangeSize').returns(Promise.resolve());
 
-      const promise = adsense.buildCallback();
-      expect(promise).to.exist;
-      yield promise;
-
-      expect(adsense.attemptChangeSize).to.be.calledWith(1386, VIEWPORT_WIDTH);
+      it('should schedule a resize for matched content responsive', function*() {
+        const adsense = constructImpl({
+          width: '100vw',
+          height: '100',
+          'data-auto-format': 'mcrspv',
+        });
+        env.sandbox
+          .stub(adsense, 'attemptChangeSize')
+          .returns(Promise.resolve());
+
+        const promise = adsense.buildCallback();
+        expect(promise).to.exist;
+        yield promise;
+
+        expect(adsense.attemptChangeSize).to.be.calledWith(
+          1386,
+          VIEWPORT_WIDTH
+        );
+      });
     });
-  });
 
-  describe('#onLayoutMeasure', () => {
+    describe('#onLayoutMeasure', () => {
+      const VIEWPORT_WIDTH = 375;
+      const VIEWPORT_HEIGHT = 667;
 
-    const VIEWPORT_WIDTH = 375;
-    const VIEWPORT_HEIGHT = 667;
+      // Nested elements to contain the ad. (container contains the ad, and
+      // containerContainer contains that container.)
+      let containerContainer, container;
+      let iframe;
 
-    // Nested elements to contain the ad. (container contains the ad, and
-    // containerContainer contains that container.)
-    let containerContainer, container;
-    let iframe;
+      function buildImpl(config) {
+        // Create an element with horizontal margins for the ad to break out of.
+        containerContainer.style.marginLeft = '5px';
+        containerContainer.style.marginRight = '9px';
 
-    function buildImpl(config) {
-      // Create an element with horizontal margins for the ad to break out of.
-      containerContainer.style.marginLeft = '5px';
-      containerContainer.style.marginRight = '9px';
+        // Create an element with horizontal margins for the ad to break out of.
+        container.style.marginLeft = '19px';
+        container.style.marginRight = '25px';
 
-      // Create an element with horizontal margins for the ad to break out of.
-      container.style.marginLeft = '19px';
-      container.style.marginRight = '25px';
+        config.type = 'adsense';
+        config['data-ad-client'] = 'ca-pub-1234';
 
-      config.type = 'adsense';
-      config['data-ad-client'] = 'ca-pub-1234';
+        element = createElementWithAttributes(doc, 'amp-ad', config);
+        iframe = doc.createElement('iframe');
 
-      element = createElementWithAttributes(doc, 'amp-ad', config);
-      iframe = doc.createElement('iframe');
+        element.appendChild(iframe);
+        container.appendChild(element);
+        containerContainer.appendChild(container);
+        doc.body.appendChild(containerContainer);
 
-      element.appendChild(iframe);
-      container.appendChild(element);
-      containerContainer.appendChild(container);
-      doc.body.appendChild(containerContainer);
+        impl = new AmpAdNetworkAdsenseImpl(element);
+        impl.element.style.display = 'block';
+        impl.element.style.position = 'relative';
+        impl.element.style.top = '150vh';
 
-      impl = new AmpAdNetworkAdsenseImpl(element);
-      impl.element.style.display = 'block';
-      impl.element.style.position = 'relative';
-      impl.element.style.top = '150vh';
-
-      // Stub out vsync tasks to run immediately.
-      impl.getVsync().run = (vsyncTaskSpec, vsyncState) => {
-        if (vsyncTaskSpec.measure) {
-          vsyncTaskSpec.measure(vsyncState);
-        }
-        if (vsyncTaskSpec.mutate) {
-          vsyncTaskSpec.mutate(vsyncState);
-        }
-      };
+        // Stub out vsync tasks to run immediately.
+        impl.getVsync().run = (vsyncTaskSpec, vsyncState) => {
+          if (vsyncTaskSpec.measure) {
+            vsyncTaskSpec.measure(vsyncState);
+          }
+          if (vsyncTaskSpec.mutate) {
+            vsyncTaskSpec.mutate(vsyncState);
+          }
+        };
 
-      // Fix the viewport to a consistent size to that the test doesn't depend
-      // on the actual browser window opened.
-      impl.getViewport().getSize =
-          () => ({width: VIEWPORT_WIDTH, height: VIEWPORT_HEIGHT});
+        // Fix the viewport to a consistent size to that the test doesn't depend
+        // on the actual browser window opened.
+        impl.getViewport().getSize = () => ({
+          width: VIEWPORT_WIDTH,
+          height: VIEWPORT_HEIGHT,
+        });
 
-      return impl.buildCallback();
-    }
+        return impl.buildCallback();
+      }
 
-    beforeEach(() => {
-      viewer.toggleRuntime(); // Turn runtime on for these tests.
-    });
+      beforeEach(() => {
+        viewer.toggleRuntime(); // Turn runtime on for these tests.
+      });
 
-    afterEach(() => {
-      viewer.toggleRuntime(); // Turn runtime off again.
+      afterEach(() => {
+        viewer.toggleRuntime(); // Turn runtime off again.
 
-      if (containerContainer != null && containerContainer.parentNode != null) {
-        containerContainer.parentNode.removeChild(containerContainer);
-      }
-      doc.body.style.direction = '';
-    });
+        if (
+          containerContainer != null &&
+          containerContainer.parentNode != null
+        ) {
+          containerContainer.parentNode.removeChild(containerContainer);
+        }
+        doc.body.style.direction = '';
+      });
 
-    it('should change left margin for responsive', () => {
-      containerContainer = doc.createElement('div');
-      container = doc.createElement('div');
-      return buildImpl({
-        width: '100vw',
-        height: '150',
-        'data-auto-format': 'rspv',
-      }).then(() => {
-        impl.onLayoutMeasure();
-        // Left margin is 19px from container and 5px from body.
-        expect(element.style.marginLeft).to.be.equal('-24px');
-        expect(element.style.marginRight).to.be.equal('');
+      it('should change left margin for responsive', () => {
+        containerContainer = doc.createElement('div');
+        container = doc.createElement('div');
+        return buildImpl({
+          width: '100vw',
+          height: '150',
+          'data-auto-format': 'rspv',
+        }).then(() => {
+          impl.onLayoutMeasure();
+          // Left margin is 19px from container and 5px from body.
+          expect(element.style.marginLeft).to.be.equal('-24px');
+          expect(element.style.marginRight).to.be.equal('');
+        });
       });
-    });
 
-    it('should change right margin for responsive in RTL', () => {
-      containerContainer = doc.createElement('div');
-      container = doc.createElement('div');
-      doc.body.style.direction = 'rtl'; // todo: revert
-
-      return buildImpl({
-        width: '100vw',
-        height: '150',
-        'data-auto-format': 'rspv',
-      }).then(() => {
-        impl.onLayoutMeasure();
-        // Right margin is 9px from containerContainer and 25px from container.
-        expect(element.style.marginRight).to.be.equal('-109px');
-        expect(element.style.marginLeft).to.be.equal('');
+      it('should change right margin for responsive in RTL', () => {
+        containerContainer = doc.createElement('div');
+        container = doc.createElement('div');
+        doc.body.style.direction = 'rtl'; // todo: revert
+
+        return buildImpl({
+          width: '100vw',
+          height: '150',
+          'data-auto-format': 'rspv',
+        }).then(() => {
+          impl.onLayoutMeasure();
+          // Right margin is 9px from containerContainer and 25px from container.
+          expect(element.style.marginRight).to.be.equal('-109px');
+          expect(element.style.marginLeft).to.be.equal('');
+        });
       });
     });
-  });
 
-  describe('#getResponsiveHeightForContext', () => {
-    it('should request 100px height for very small viewports', () => {
-      expect(
+    describe('#getResponsiveHeightForContext', () => {
+      it('should request 100px height for very small viewports', () => {
+        expect(
           AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              'rspv', {width: 100, height: 667}, doc.createElement('div')))
-          .to.be.equal(100);
-    });
+            'rspv',
+            {width: 100, height: 667},
+            doc.createElement('div')
+          )
+        ).to.be.equal(100);
+      });
 
-    it('should request 6:5 aspect ratio for normal viewport (iPhone 5)', () => {
-      expect(
+      it('should request 6:5 aspect ratio for normal viewport (iPhone 5)', () => {
+        expect(
           AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              'rspv', {width: 320, height: 568}, doc.createElement('div')))
-          .to.be.equal(267);
-    });
+            'rspv',
+            {width: 320, height: 568},
+            doc.createElement('div')
+          )
+        ).to.be.equal(267);
+      });
 
-    it('should request 300px height for wide viewports', () => {
-      expect(
+      it('should request 300px height for wide viewports', () => {
+        expect(
           AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              'rspv', {width: 500, height: 667}, doc.createElement('div')))
-          .to.be.equal(300);
+            'rspv',
+            {width: 500, height: 667},
+            doc.createElement('div')
+          )
+        ).to.be.equal(300);
+      });
     });
-  });
 
-  describe('#getMCResponsiveHeightForContext_', () => {
-    it('get matched content responsive height for iPhone 6', () => {
-      expect(
+    describe('#getMCResponsiveHeightForContext_', () => {
+      it('get matched content responsive height for iPhone 6', () => {
+        expect(
           AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              'mcrspv', {width: 375, height: 320}, doc.createElement('div')))
-          .to.be.equal(1386);
-    });
+            'mcrspv',
+            {width: 375, height: 320},
+            doc.createElement('div')
+          )
+        ).to.be.equal(1386);
+      });
 
-    it('get matched content responsive height for iPhone 5', () => {
-      expect(
+      it('get matched content responsive height for iPhone 5', () => {
+        expect(
           AmpAdNetworkAdsenseImpl.getResponsiveHeightForContext_(
-              'mcrspv', {width: 320, height: 320}, doc.createElement('div')))
-          .to.be.equal(1200);
+            'mcrspv',
+            {width: 320, height: 320},
+            doc.createElement('div')
+          )
+        ).to.be.equal(1200);
+      });
     });
-  });
 
-  describe('#delayAdRequestEnabled', () => {
-    it('should return 3', () => {
-      impl.divertExperiments();
-      expect(impl.delayAdRequestEnabled()).to.equal(3);
-    });
+    describe('#delayAdRequestEnabled', () => {
+      it('should return 3', () => {
+        impl.divertExperiments();
+        expect(impl.delayAdRequestEnabled()).to.equal(3);
+      });
 
-    it('should respect loading strategy', () => {
-      impl.element.setAttribute(
-          'data-loading-strategy', 'prefer-viewability-over-views');
-      impl.divertExperiments();
-      expect(impl.delayAdRequestEnabled()).to.equal(1.25);
+      it('should respect loading strategy', () => {
+        impl.element.setAttribute(
+          'data-loading-strategy',
+          'prefer-viewability-over-views'
+        );
+        impl.divertExperiments();
+        expect(impl.delayAdRequestEnabled()).to.equal(1.25);
+      });
     });
-  });
 
-  describe('#preconnect', () => {
-    it('should preload nameframe', () => {
-      const preloadSpy = sandbox.spy(Preconnect.prototype, 'preload');
-      expect(impl.getPreconnectUrls()).to.deep.equal(
-          ['https://googleads.g.doubleclick.net']);
-      expect(preloadSpy).to.be.calledOnce;
-      expect(preloadSpy.args[0]).to.match(/nameframe/);
+    describe('#preconnect', () => {
+      it('should preload nameframe', () => {
+        const preloadSpy = sandbox.spy(Preconnect.prototype, 'preload');
+        expect(impl.getPreconnectUrls()).to.deep.equal([
+          'https://googleads.g.doubleclick.net',
+        ]);
+        expect(preloadSpy).to.be.calledOnce;
+        expect(preloadSpy.args[0]).to.match(/nameframe/);
+      });
     });
-  });
 
-  describe('#getConsentPolicy', () => {
-    it('should return null', () =>
-      expect(AmpAdNetworkAdsenseImpl.prototype.getConsentPolicy()).to.be.null);
-  });
-
-  describe('#isXhrAllowed', () => {
-    beforeEach(() => {
-      impl.win = {
-        location: {},
-      };
+    describe('#getConsentPolicy', () => {
+      it('should return null', () =>
+        expect(AmpAdNetworkAdsenseImpl.prototype.getConsentPolicy()).to.be
+          .null);
     });
 
-    it('should return false on a canonical page', () => {
-      impl.win.location.origin = 'https://www.somesite.com';
-      expect(impl.isXhrAllowed()).to.be.false;
-    });
+    describe('#isXhrAllowed', () => {
+      beforeEach(() => {
+        impl.win = {
+          location: {},
+        };
+      });
+
+      it('should return false on a canonical page', () => {
+        impl.win.location.origin = 'https://www.somesite.com';
+        expect(impl.isXhrAllowed()).to.be.false;
+      });
 
-    it('should return true on a non-canonical page', () => {
-      impl.win.location.origin = 'https://www-somesite.cdn.ampproject.org';
-      expect(impl.isXhrAllowed()).to.be.true;
+      it('should return true on a non-canonical page', () => {
+        impl.win.location.origin = 'https://www-somesite.cdn.ampproject.org';
+        expect(impl.isXhrAllowed()).to.be.true;
+      });
     });
-  });
 
-  describe('#checksumVerification', () => {
-    it('should call super if missing Algorithm header', () => {
-      sandbox.stub(AmpA4A.prototype, 'maybeValidateAmpCreative')
+    describe('#checksumVerification', () => {
+      it('should call super if missing Algorithm header', () => {
+        sandbox
+          .stub(AmpA4A.prototype, 'maybeValidateAmpCreative')
           .returns(Promise.resolve('foo'));
-      const creative = '<html><body>This is some text</body></html>';
-      const mockHeaders = {
-        get: key => {
-          switch (key) {
-            case 'AMP-Verification-Checksum-Algorithm':
-              return 'unknown';
-            case 'AMP-Verification-Checksum':
-              return '2569076912';
-            default:
-              throw new Error(`unexpected header: ${key}`);
-          }
-        },
-      };
-      expect(AmpAdNetworkAdsenseImpl.prototype.maybeValidateAmpCreative(
-          utf8Encode(creative), mockHeaders)).to.eventually.equal('foo');
-    });
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'unknown';
+              case 'AMP-Verification-Checksum':
+                return '2569076912';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        expect(
+          AmpAdNetworkAdsenseImpl.prototype.maybeValidateAmpCreative(
+            utf8Encode(creative),
+            mockHeaders
+          )
+        ).to.eventually.equal('foo');
+      });
 
-    it('should properly validate checksum', () => {
-      const creative = '<html><body>This is some text</body></html>';
-      const mockHeaders = {
-        get: key => {
-          switch (key) {
-            case 'AMP-Verification-Checksum-Algorithm':
-              return 'djb2a-32';
-            case 'AMP-Verification-Checksum':
-              return '2569076912';
-            default:
-              throw new Error(`unexpected header: ${key}`);
-          }
-        },
-      };
-      return AmpAdNetworkAdsenseImpl.prototype.maybeValidateAmpCreative(
-          utf8Encode(creative), mockHeaders).then(result => {
-        expect(result).to.be.ok;
-        expect(utf8Decode(result)).to.equal(creative);
+      it('should properly validate checksum', () => {
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'djb2a-32';
+              case 'AMP-Verification-Checksum':
+                return '2569076912';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        return AmpAdNetworkAdsenseImpl.prototype
+          .maybeValidateAmpCreative(utf8Encode(creative), mockHeaders)
+          .then(result => {
+            expect(result).to.be.ok;
+            expect(utf8Decode(result)).to.equal(creative);
+          });
       });
-    });
 
-    it('should fail validation if invalid checksum', () => {
-      const creative = '<html><body>This is some text</body></html>';
-      const mockHeaders = {
-        get: key => {
-          switch (key) {
-            case 'AMP-Verification-Checksum-Algorithm':
-              return 'djb2a-32';
-            case 'AMP-Verification-Checksum':
-              return '12345';
-            default:
-              throw new Error(`unexpected header: ${key}`);
-          }
-        },
-      };
-      expect(AmpAdNetworkAdsenseImpl.prototype.maybeValidateAmpCreative(
-          utf8Encode(creative), mockHeaders)).to.eventually.not.be.ok;
+      it('should fail validation if invalid checksum', () => {
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'djb2a-32';
+              case 'AMP-Verification-Checksum':
+                return '12345';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        expect(
+          AmpAdNetworkAdsenseImpl.prototype.maybeValidateAmpCreative(
+            utf8Encode(creative),
+            mockHeaders
+          )
+        ).to.eventually.not.be.ok;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js b/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js
index 658c5fc7d744..a3dac15d2fdd 100644
--- a/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js
+++ b/extensions/amp-ad-network-adzerk-impl/0.1/amp-ad-network-adzerk-impl.js
@@ -55,7 +55,6 @@ let ampAdTemplateHelper;
  * will be rendered via cross domain frame.
  */
 export class AmpAdNetworkAdzerkImpl extends AmpA4A {
-
   /**
    * @param {!Element} element
    */
@@ -68,8 +67,8 @@ export class AmpAdNetworkAdzerkImpl extends AmpA4A {
     /** @private {?../../amp-a4a/0.1/amp-ad-type-defs.AmpTemplateCreativeDef} */
     this.ampCreativeJson_ = null;
 
-    ampAdTemplateHelper = ampAdTemplateHelper ||
-        new AmpAdTemplateHelper(this.win);
+    ampAdTemplateHelper =
+      ampAdTemplateHelper || new AmpAdTemplateHelper(this.win);
   }
 
   /**
@@ -93,8 +92,7 @@ export class AmpAdNetworkAdzerkImpl extends AmpA4A {
     const data = this.element.getAttribute('data-r');
     devAssert(data, 'Expected data-r attribte on amp-ad tag');
     if (getMode(this.win).localDev) {
-      return `http://ads.localhost:${this.win.location.port}` +
-          '/adzerk/' + data;
+      return `http://ads.localhost:${this.win.location.port}/adzerk/` + data;
     }
     return `https://engine.adzerk.net/amp?r=${encodeURIComponent(data)}`;
   }
@@ -108,20 +106,26 @@ export class AmpAdNetworkAdzerkImpl extends AmpA4A {
     const checkStillCurrent = this.verifyStillCurrent();
     return tryResolve(() => utf8Decode(bytes)).then(body => {
       checkStillCurrent();
-      this.ampCreativeJson_ = /** @type {!../../amp-a4a/0.1/amp-ad-type-defs.AmpTemplateCreativeDef} */
-        (tryParseJson(body) || {});
+      this.ampCreativeJson_ =
+        /** @type {!../../amp-a4a/0.1/amp-ad-type-defs.AmpTemplateCreativeDef} */ (tryParseJson(
+          body
+        ) || {});
       // TODO(keithwrightbos): macro value validation?  E.g. http invalid?
       return ampAdTemplateHelper
-          .fetch(this.ampCreativeJson_.templateUrl)
-          .then(parsedTemplate => {
-            return utf8Encode(this.parseMetadataFromCreative(parsedTemplate));
-          })
-          .catch(error => {
-            dev().warn(TAG, 'Error fetching/expanding template',
-                this.ampCreativeJson_, error);
-            this.forceCollapse();
-            return Promise.reject(NO_CONTENT_RESPONSE);
-          });
+        .fetch(this.ampCreativeJson_.templateUrl)
+        .then(parsedTemplate => {
+          return utf8Encode(this.parseMetadataFromCreative(parsedTemplate));
+        })
+        .catch(error => {
+          dev().warn(
+            TAG,
+            'Error fetching/expanding template',
+            this.ampCreativeJson_,
+            error
+          );
+          this.forceCollapse();
+          return Promise.reject(NO_CONTENT_RESPONSE);
+        });
     });
   }
 
@@ -137,7 +141,9 @@ export class AmpAdNetworkAdzerkImpl extends AmpA4A {
     // launched this will either be performed server-side, or will be replaced
     // by more sophisticated logic.
     const minifiedCreative = creative.replace(
-        /<script async.+?<\/script>/g, '');
+      /<script async.+?<\/script>/g,
+      ''
+    );
     this.creativeMetadata_ = /** @type {?CreativeMetaDataDef} */ ({
       minifiedCreative,
       customElementExtensions: [],
@@ -156,27 +162,35 @@ export class AmpAdNetworkAdzerkImpl extends AmpA4A {
     }
     if (this.ampCreativeJson_.analytics) {
       pushIfNotExist(
-          this.creativeMetadata_['customElementExtensions'], 'amp-analytics');
+        this.creativeMetadata_['customElementExtensions'],
+        'amp-analytics'
+      );
     }
     pushIfNotExist(
-        this.creativeMetadata_['customElementExtensions'], 'amp-mustache');
-    return /**@type {?CreativeMetaDataDef}*/(this.creativeMetadata_);
+      this.creativeMetadata_['customElementExtensions'],
+      'amp-mustache'
+    );
+    return /**@type {?CreativeMetaDataDef}*/ (this.creativeMetadata_);
   }
 
   /** @override */
   onCreativeRender(unusedMetadata) {
     if (this.ampCreativeJson_ && this.ampCreativeJson_.data) {
-      ampAdTemplateHelper.render(
+      ampAdTemplateHelper
+        .render(
           this.ampCreativeJson_.data,
-          this.iframe.contentWindow.document.body)
-          .then(renderedElement => {
-            if (this.ampCreativeJson_.analytics) {
-              ampAdTemplateHelper.insertAnalytics(
-                  renderedElement, this.ampCreativeJson_.analytics);
-            }
-            this.iframe.contentWindow.document.body./*OK*/innerHTML =
-                renderedElement./*OK*/innerHTML;
-          });
+          this.iframe.contentWindow.document.body
+        )
+        .then(renderedElement => {
+          if (this.ampCreativeJson_.analytics) {
+            ampAdTemplateHelper.insertAnalytics(
+              renderedElement,
+              this.ampCreativeJson_.analytics
+            );
+          }
+          this.iframe.contentWindow.document.body./*OK*/ innerHTML =
+            renderedElement./*OK*/ innerHTML;
+        });
     }
   }
 }
diff --git a/extensions/amp-ad-network-adzerk-impl/0.1/test/test-amp-ad-network-adzerk-impl.js b/extensions/amp-ad-network-adzerk-impl/0.1/test/test-amp-ad-network-adzerk-impl.js
index 10c876bb51ca..976d6775e091 100644
--- a/extensions/amp-ad-network-adzerk-impl/0.1/test/test-amp-ad-network-adzerk-impl.js
+++ b/extensions/amp-ad-network-adzerk-impl/0.1/test/test-amp-ad-network-adzerk-impl.js
@@ -53,16 +53,20 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
       const r = '{"p":[{"n":1234,"t":[5],"s":677496}]}';
       element.setAttribute('data-r', r);
       expect(impl.getAdUrl()).to.equal(
-          `https://engine.adzerk.net/amp?r=${encodeURIComponent(r)}`);
+        `https://engine.adzerk.net/amp?r=${encodeURIComponent(r)}`
+      );
     });
 
     it('should be valid #2', () => {
-      element.setAttribute('data-r',
-          '{"p":[{"t":[5],"s":333999,"a":5603000}]}');
+      element.setAttribute(
+        'data-r',
+        '{"p":[{"t":[5],"s":333999,"a":5603000}]}'
+      );
       expect(impl.getAdUrl()).to.equal(
-          'https://engine.adzerk.net' +
+        'https://engine.adzerk.net' +
           '/amp?r=%7B%22p%22%3A%5B%7B%22t%22%3A%5B5%5D%2C%22s%22%3A333999' +
-          '%2C%22a%22%3A5603000%7D%5D%7D');
+          '%2C%22a%22%3A5603000%7D%5D%7D'
+      );
     });
 
     it('should be invalid', () => {
@@ -99,19 +103,24 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
             <p>{{foo}}</p>
             </template>
           </body></html>`;
-      fetchTextMock.withArgs(
+      fetchTextMock
+        .withArgs(
           'https://www-adzerk-com.cdn.ampproject.org/ad/s/www.adzerk.com/456',
           {
             mode: 'cors',
             method: 'GET',
             ampCors: false,
             credentials: 'omit',
-          }).returns(Promise.resolve(
-          {
+          }
+        )
+        .returns(
+          Promise.resolve({
             headers: {},
             text: () => template,
-          }));
-      return impl.maybeValidateAmpCreative(
+          })
+        );
+      return impl
+        .maybeValidateAmpCreative(
           utf8Encode(JSON.stringify(adResponseBody)).buffer,
           {
             get: name => {
@@ -119,22 +128,25 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
               return 'amp-mustache';
             },
           },
-          () => {})
-          .then(buffer => Promise.resolve(utf8Decode(buffer)))
-          .then(creative => {
-            expect(creative).to.not.contain(
-                '<script async src="https://cdn.ampproject.org/v0.js">' +
-                '</script>');
-            expect(creative).to.not.contain(
-                '<script async custom-template="amp-mustache" src=' +
-                '"https://cdn.ampproject.org/v0/amp-mustache-latest.js">' +
-                '</script>');
-            expect(impl.getAmpAdMetadata()).to.jsonEqual({
-              minifiedCreative: creative,
-              customElementExtensions: ['amp-mustache'],
-              extensions: [],
-            });
+          () => {}
+        )
+        .then(buffer => Promise.resolve(utf8Decode(buffer)))
+        .then(creative => {
+          expect(creative).to.not.contain(
+            '<script async src="https://cdn.ampproject.org/v0.js">' +
+              '</script>'
+          );
+          expect(creative).to.not.contain(
+            '<script async custom-template="amp-mustache" src=' +
+              '"https://cdn.ampproject.org/v0/amp-mustache-latest.js">' +
+              '</script>'
+          );
+          expect(impl.getAmpAdMetadata()).to.jsonEqual({
+            minifiedCreative: creative,
+            customElementExtensions: ['amp-mustache'],
+            extensions: [],
           });
+        });
     });
   });
 
@@ -152,18 +164,22 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
             <p>{{foo}}</p>
             </template>
           </body></html>`;
-      fetchTextMock.withArgs(
+      fetchTextMock
+        .withArgs(
           'https://www-adzerk-com.cdn.ampproject.org/ad/s/www.adzerk.com/456',
           {
             mode: 'cors',
             method: 'GET',
             ampCors: false,
             credentials: 'omit',
-          }).returns(Promise.resolve(
-          {
+          }
+        )
+        .returns(
+          Promise.resolve({
             headers: {},
             text: () => template,
-          }));
+          })
+        );
     });
 
     it('should auto add amp-analytics if required', () => {
@@ -171,7 +187,8 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
         templateUrl: 'https://www.adzerk.com/456',
         analytics: {'type': 'googleanalytics'},
       };
-      return impl.maybeValidateAmpCreative(
+      return impl
+        .maybeValidateAmpCreative(
           utf8Encode(JSON.stringify(adResponseBody)).buffer,
           {
             get: name => {
@@ -179,21 +196,22 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
               return 'amp-mustache';
             },
           },
-          () => {})
-          .then(buffer => utf8Decode(buffer))
-          .then(creative => {
-            expect(impl.getAmpAdMetadata()).to.jsonEqual({
-              minifiedCreative: creative,
-              customElementExtensions: ['amp-analytics', 'amp-mustache'],
-              extensions: [],
-            });
-            // Won't insert duplicate
-            expect(impl.getAmpAdMetadata()).to.jsonEqual({
-              minifiedCreative: creative,
-              customElementExtensions: ['amp-analytics', 'amp-mustache'],
-              extensions: [],
-            });
+          () => {}
+        )
+        .then(buffer => utf8Decode(buffer))
+        .then(creative => {
+          expect(impl.getAmpAdMetadata()).to.jsonEqual({
+            minifiedCreative: creative,
+            customElementExtensions: ['amp-analytics', 'amp-mustache'],
+            extensions: [],
+          });
+          // Won't insert duplicate
+          expect(impl.getAmpAdMetadata()).to.jsonEqual({
+            minifiedCreative: creative,
+            customElementExtensions: ['amp-analytics', 'amp-mustache'],
+            extensions: [],
           });
+        });
     });
 
     it('should not add amp-analytics if not', () => {
@@ -201,7 +219,8 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
         templateUrl: 'https://www.adzerk.com/456',
         analytics: undefined,
       };
-      return impl.maybeValidateAmpCreative(
+      return impl
+        .maybeValidateAmpCreative(
           utf8Encode(JSON.stringify(adResponseBody)).buffer,
           {
             get: name => {
@@ -209,15 +228,16 @@ describes.fakeWin('amp-ad-network-adzerk-impl', {amp: true}, env => {
               return 'amp-mustache';
             },
           },
-          () => {})
-          .then(buffer => utf8Decode(buffer))
-          .then(creative => {
-            expect(impl.getAmpAdMetadata()).to.jsonEqual({
-              minifiedCreative: creative,
-              customElementExtensions: ['amp-mustache'],
-              extensions: [],
-            });
+          () => {}
+        )
+        .then(buffer => utf8Decode(buffer))
+        .then(creative => {
+          expect(impl.getAmpAdMetadata()).to.jsonEqual({
+            minifiedCreative: creative,
+            customElementExtensions: ['amp-mustache'],
+            extensions: [],
           });
+        });
     });
   });
 });
diff --git a/extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js b/extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js
index 1ec0377a134e..533bfa488795 100644
--- a/extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js
+++ b/extensions/amp-ad-network-cloudflare-impl/0.1/amp-ad-network-cloudflare-impl.js
@@ -27,7 +27,6 @@ import {startsWith} from '../../../src/string';
  * additional guidance on other implementation details.
  */
 export class AmpAdNetworkCloudflareImpl extends AmpA4A {
-
   /**
    * Validate the tag parameters.  If invalid, ad ad will not be displayed.
    * @override
@@ -103,10 +102,16 @@ export class AmpAdNetworkCloudflareImpl extends AmpA4A {
     let pre = url.indexOf('?') < 0 ? '?' : '&';
     for (let i = 0; i < el.attributes.length; i++) {
       const attrib = el.attributes[i];
-      if (attrib.specified && startsWith(attrib.name, 'data-')
-          && !startsWith(attrib.name, 'data-cf-')) {
-        url += pre + encodeURIComponent(attrib.name.substring(5)) +
-          '=' + encodeURIComponent(this.replacements(attrib.value, values));
+      if (
+        attrib.specified &&
+        startsWith(attrib.name, 'data-') &&
+        !startsWith(attrib.name, 'data-cf-')
+      ) {
+        url +=
+          pre +
+          encodeURIComponent(attrib.name.substring(5)) +
+          '=' +
+          encodeURIComponent(this.replacements(attrib.value, values));
         pre = '&';
       }
     }
@@ -115,8 +120,9 @@ export class AmpAdNetworkCloudflareImpl extends AmpA4A {
   }
 }
 
-
 AMP.extension('amp-ad-network-cloudflare-impl', '0.1', AMP => {
-  AMP.registerElement('amp-ad-network-cloudflare-impl',
-      AmpAdNetworkCloudflareImpl);
+  AMP.registerElement(
+    'amp-ad-network-cloudflare-impl',
+    AmpAdNetworkCloudflareImpl
+  );
 });
diff --git a/extensions/amp-ad-network-cloudflare-impl/0.1/test/test-amp-ad-network-cloudflare-impl.js b/extensions/amp-ad-network-cloudflare-impl/0.1/test/test-amp-ad-network-cloudflare-impl.js
index 7a017f27562a..6f80ab193410 100644
--- a/extensions/amp-ad-network-cloudflare-impl/0.1/test/test-amp-ad-network-cloudflare-impl.js
+++ b/extensions/amp-ad-network-cloudflare-impl/0.1/test/test-amp-ad-network-cloudflare-impl.js
@@ -23,155 +23,168 @@ import {
 import {cloudflareIsA4AEnabled} from '../cloudflare-a4a-config';
 import {createElementWithAttributes} from '../../../../src/dom';
 
-
-describes.realWin('cloudflare-a4a-config', {
-  amp: {
-    extensions: ['amp-ad', 'amp-ad-network-cloudflare-impl'],
+describes.realWin(
+  'cloudflare-a4a-config',
+  {
+    amp: {
+      extensions: ['amp-ad', 'amp-ad-network-cloudflare-impl'],
+    },
   },
-}, env => {
-  let doc;
-  let win;
-  beforeEach(() => {
-    win = env.win;
-    doc = env.win.document;
-  });
-  it('should pass a4a config predicate', () => {
-    const el = createElementWithAttributes(doc, 'amp-ad', {
-      'data-cf-network': 'cloudflare',
-      src: '/ad.html',
-      'data-cf-a4a': 'true',
-    });
-    expect(cloudflareIsA4AEnabled(win, el)).to.be.true;
-  });
-
-  it('should not pass a4a config predicate when useRemoteHtml is true', () => {
-    const el = createElementWithAttributes(doc, 'amp-ad', {
-      'data-cf-network': 'cloudflare',
-      src: '/ad.html',
-      'data-cf-a4a': 'true',
+  env => {
+    let doc;
+    let win;
+    beforeEach(() => {
+      win = env.win;
+      doc = env.win.document;
     });
-    const useRemoteHtml = true;
-    expect(cloudflareIsA4AEnabled(win, el, useRemoteHtml)).to.be.false;
-  });
-});
-
-describes.realWin('amp-ad-network-cloudflare-impl', {
-  amp: {
-    extensions: ['amp-ad', 'amp-ad-network-cloudflare-impl'],
-  },
-}, env => {
-
-  let cloudflareImpl;
-  let el;
-  let doc;
-
-  beforeEach(() => {
-    doc = env.win.document;
-    el = doc.createElement('amp-ad');
-    el.setAttribute('type', 'cloudflare');
-    el.setAttribute('data-cf-network', 'cloudflare');
-    el.setAttribute('src',
-        'https://firebolt.cloudflaredemo.com/a4a-ad.html');
-    sandbox.stub(
-        AmpAdNetworkCloudflareImpl.prototype,
-        'getSigningServiceNames').callsFake(
-        () => {
-          return ['cloudflare','cloudflare-dev'];
-        });
-    sandbox.stub(vendors, 'NETWORKS').callsFake({
-      cloudflare: {
-        base: 'https://firebolt.cloudflaredemo.com',
-      },
-
-      'cf-test': {
-        base: 'https://cf-test.com',
-        src: 'https://cf-test.com/path/ad?width=SLOT_WIDTH&height=SLOT_HEIGHT',
-      },
+    it('should pass a4a config predicate', () => {
+      const el = createElementWithAttributes(doc, 'amp-ad', {
+        'data-cf-network': 'cloudflare',
+        src: '/ad.html',
+        'data-cf-a4a': 'true',
+      });
+      expect(cloudflareIsA4AEnabled(win, el)).to.be.true;
     });
-    sandbox.stub(el, 'tryUpgrade_').callsFake(() => {});
-    doc.body.appendChild(el);
-    cloudflareImpl = new AmpAdNetworkCloudflareImpl(el);
-  });
-
-  describe('#isValidElement', () => {
-    it('should be valid', () => {
-      expect(cloudflareImpl.isValidElement()).to.be.true;
+
+    it('should not pass a4a config predicate when useRemoteHtml is true', () => {
+      const el = createElementWithAttributes(doc, 'amp-ad', {
+        'data-cf-network': 'cloudflare',
+        src: '/ad.html',
+        'data-cf-a4a': 'true',
+      });
+      const useRemoteHtml = true;
+      expect(cloudflareIsA4AEnabled(win, el, useRemoteHtml)).to.be.false;
     });
-    it('should NOT be valid (impl tag name)', () => {
-      el = doc.createElement('amp-ad-network-cloudflare-impl');
+  }
+);
+
+describes.realWin(
+  'amp-ad-network-cloudflare-impl',
+  {
+    amp: {
+      extensions: ['amp-ad', 'amp-ad-network-cloudflare-impl'],
+    },
+  },
+  env => {
+    let cloudflareImpl;
+    let el;
+    let doc;
+
+    beforeEach(() => {
+      doc = env.win.document;
+      el = doc.createElement('amp-ad');
       el.setAttribute('type', 'cloudflare');
+      el.setAttribute('data-cf-network', 'cloudflare');
+      el.setAttribute('src', 'https://firebolt.cloudflaredemo.com/a4a-ad.html');
+      sandbox
+        .stub(AmpAdNetworkCloudflareImpl.prototype, 'getSigningServiceNames')
+        .callsFake(() => {
+          return ['cloudflare', 'cloudflare-dev'];
+        });
+      sandbox.stub(vendors, 'NETWORKS').callsFake({
+        cloudflare: {
+          base: 'https://firebolt.cloudflaredemo.com',
+        },
+
+        'cf-test': {
+          base: 'https://cf-test.com',
+          src:
+            'https://cf-test.com/path/ad?width=SLOT_WIDTH&height=SLOT_HEIGHT',
+        },
+      });
+      sandbox.stub(el, 'tryUpgrade_').callsFake(() => {});
+      doc.body.appendChild(el);
       cloudflareImpl = new AmpAdNetworkCloudflareImpl(el);
-      expect(cloudflareImpl.isValidElement()).to.be.false;
     });
-  });
 
-  describe('#getAdUrl', () => {
-
-    it('should be valid', () => {
-      expect(cloudflareImpl.getAdUrl()).to.equal(
-          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html');
+    describe('#isValidElement', () => {
+      it('should be valid', () => {
+        expect(cloudflareImpl.isValidElement()).to.be.true;
+      });
+      it('should NOT be valid (impl tag name)', () => {
+        el = doc.createElement('amp-ad-network-cloudflare-impl');
+        el.setAttribute('type', 'cloudflare');
+        cloudflareImpl = new AmpAdNetworkCloudflareImpl(el);
+        expect(cloudflareImpl.isValidElement()).to.be.false;
+      });
     });
 
-    it('should handle non-a4a URLs', () => {
-      el.setAttribute('data-cf-a4a', 'false');
-      expect(cloudflareImpl.getAdUrl()).to.equal(
-          'https://firebolt.cloudflaredemo.com/a4a-ad.html');
-    });
+    describe('#getAdUrl', () => {
+      it('should be valid', () => {
+        expect(cloudflareImpl.getAdUrl()).to.equal(
+          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html'
+        );
+      });
 
-    it('should accept a4a src', () => {
-      el.setAttribute('src',
-          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html');
-      expect(cloudflareImpl.getAdUrl()).to.equal(
-          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html');
-    });
+      it('should handle non-a4a URLs', () => {
+        el.setAttribute('data-cf-a4a', 'false');
+        expect(cloudflareImpl.getAdUrl()).to.equal(
+          'https://firebolt.cloudflaredemo.com/a4a-ad.html'
+        );
+      });
 
-    it('should handle additional templated width/height', () => {
-      el.setAttribute('src', 'https://firebolt.cloudflaredemo.com/'
-        + 'ad?width=SLOT_WIDTH&height=SLOT_HEIGHT');
-      expect(cloudflareImpl.getAdUrl()).to.equal(
-          'https://firebolt.cloudflaredemo.com/_a4a/ad?width=0&height=0');
-    });
+      it('should accept a4a src', () => {
+        el.setAttribute(
+          'src',
+          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html'
+        );
+        expect(cloudflareImpl.getAdUrl()).to.equal(
+          'https://firebolt.cloudflaredemo.com/_a4a/a4a-ad.html'
+        );
+      });
 
-    function parseQuery(query) {
-      const kvs = query.split(/&/);
-      const params = {};
-      for (let i = 0; i < kvs.length; i++) {
-        const parts = kvs[i].match(/^([^=]+)=?(.*)/);
-        params[parts[1]] = parts[2];
+      it('should handle additional templated width/height', () => {
+        el.setAttribute(
+          'src',
+          'https://firebolt.cloudflaredemo.com/' +
+            'ad?width=SLOT_WIDTH&height=SLOT_HEIGHT'
+        );
+        expect(cloudflareImpl.getAdUrl()).to.equal(
+          'https://firebolt.cloudflaredemo.com/_a4a/ad?width=0&height=0'
+        );
+      });
+
+      function parseQuery(query) {
+        const kvs = query.split(/&/);
+        const params = {};
+        for (let i = 0; i < kvs.length; i++) {
+          const parts = kvs[i].match(/^([^=]+)=?(.*)/);
+          params[parts[1]] = parts[2];
+        }
+        return params;
       }
-      return params;
-    }
-
-    it('should handle data parameters', () => {
-      el.setAttribute('src', 'https://firebolt.cloudflaredemo.com/ad');
-      el.setAttribute('data-key', 'value');
-      el.setAttribute('data-another', 'more');
-
-      const url = cloudflareImpl.getAdUrl();
-      const base = 'https://firebolt.cloudflaredemo.com/_a4a/ad?';
-      expect(url.substring(0, base.length)).to.equal(base);
-      expect(parseQuery(url.substring(base.length))).to.deep.equal({
-        another: 'more',
-        key: 'value',
+
+      it('should handle data parameters', () => {
+        el.setAttribute('src', 'https://firebolt.cloudflaredemo.com/ad');
+        el.setAttribute('data-key', 'value');
+        el.setAttribute('data-another', 'more');
+
+        const url = cloudflareImpl.getAdUrl();
+        const base = 'https://firebolt.cloudflaredemo.com/_a4a/ad?';
+        expect(url.substring(0, base.length)).to.equal(base);
+        expect(parseQuery(url.substring(base.length))).to.deep.equal({
+          another: 'more',
+          key: 'value',
+        });
       });
-    });
 
-    // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
-    it.skip('should handle default src with data parameters', () => {
-      el.setAttribute('data-cf-network', 'cf-test');
-      el.removeAttribute('src');
-      el.setAttribute('data-key', 'value');
-      el.setAttribute('data-another', 'more');
-
-      const url = cloudflareImpl.getAdUrl();
-      const base = 'https://cf-test.com/_a4a/path/ad?';
-      expect(url.substring(0, base.length)).to.equal(base);
-      expect(parseQuery(url.substring(base.length))).to.deep.equal({
-        another: 'more',
-        height: '0',
-        key: 'value',
-        width: '0',
+      // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
+      it.skip('should handle default src with data parameters', () => {
+        el.setAttribute('data-cf-network', 'cf-test');
+        el.removeAttribute('src');
+        el.setAttribute('data-key', 'value');
+        el.setAttribute('data-another', 'more');
+
+        const url = cloudflareImpl.getAdUrl();
+        const base = 'https://cf-test.com/_a4a/path/ad?';
+        expect(url.substring(0, base.length)).to.equal(base);
+        expect(parseQuery(url.substring(base.length))).to.deep.equal({
+          another: 'more',
+          height: '0',
+          key: 'value',
+          width: '0',
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
index 5fd640fdebb6..2bf8ebc3a90a 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/amp-ad-network-doubleclick-impl.js
@@ -106,7 +106,7 @@ const TAG = 'amp-ad-network-doubleclick-impl';
 
 /** @const {string} */
 const DOUBLECLICK_BASE_URL =
-    'https://securepubads.g.doubleclick.net/gampad/ads';
+  'https://securepubads.g.doubleclick.net/gampad/ads';
 
 /** @const {string} */
 const RTC_SUCCESS = '2';
@@ -159,7 +159,6 @@ let LayoutRectOrDimsDef;
 
 /** @final */
 export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
-
   /**
    * @param {!Element} element
    */
@@ -252,8 +251,11 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     this.forceSafeframe = false;
     if ('forceSafeframe' in this.element.dataset) {
       if (!/^(1|(true))$/i.test(this.element.dataset['forceSafeframe'])) {
-        user().warn(TAG, 'Ignoring invalid data-force-safeframe attribute: ' +
-            this.element.dataset['forceSafeframe']);
+        user().warn(
+          TAG,
+          'Ignoring invalid data-force-safeframe attribute: ' +
+            this.element.dataset['forceSafeframe']
+        );
       } else {
         this.forceSafeframe = true;
       }
@@ -322,8 +324,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // being schedule due to being beyond viewport max offset.  If slot
     // comes within standard outside viewport range, then ensure throttling
     // will not be applied.
-    this.getResource().whenWithinViewport(renderOutsideViewport).then(
-        () => this.isIdleRender_ = false);
+    this.getResource()
+      .whenWithinViewport(renderOutsideViewport)
+      .then(() => (this.isIdleRender_ = false));
     return vpRange;
   }
 
@@ -346,8 +349,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    * @visibleForTesting
    */
   setPageLevelExperiments(urlExperimentId) {
-    if (!isCdnProxy(this.win) && !isExperimentOn(
-        this.win, 'expDfpInvOrigDeprecated')) {
+    if (
+      !isCdnProxy(this.win) &&
+      !isExperimentOn(this.win, 'expDfpInvOrigDeprecated')
+    ) {
       this.experimentIds.push('21060933');
     }
     let forcedExperimentId;
@@ -357,41 +362,44 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
         '7': DOUBLECLICK_SRA_EXP_BRANCHES.SRA_CONTROL,
         '8': DOUBLECLICK_SRA_EXP_BRANCHES.SRA,
         '9': DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER,
-
       }[urlExperimentId];
       if (forcedExperimentId) {
         this.experimentIds.push(forcedExperimentId);
       }
     }
-    const experimentInfoMap =
-    /** @type {!Object<string,
+    const experimentInfoMap = /** @type {!Object<string,
         !../../../src/experiments.ExperimentInfo>} */ ({
-        // Only select into SRA experiments if SRA not already explicitly
-        // enabled and refresh is not being used by any slot.
-        [DOUBLECLICK_SRA_EXP]: {
-          isTrafficEligible: () => !forcedExperimentId &&
-              !this.win.document./*OK*/querySelector(
-                  'meta[name=amp-ad-enable-refresh], ' +
-                  'amp-ad[type=doubleclick][data-enable-refresh], ' +
-                  'meta[name=amp-ad-doubleclick-sra]'),
-          branches: Object.keys(DOUBLECLICK_SRA_EXP_BRANCHES).map(
-              key => DOUBLECLICK_SRA_EXP_BRANCHES[key]),
-        },
-        [FLEXIBLE_AD_SLOTS_EXP]: {
-          isTrafficEligible: () => true,
-          branches: Object.values(FLEXIBLE_AD_SLOTS_BRANCHES),
-        },
-        [[ADX_ADY_EXP.branch]]: {
-          isTrafficEligible: () => true,
-          branches: [[ADX_ADY_EXP.control], [ADX_ADY_EXP.experiment]],
-        },
-      });
+      // Only select into SRA experiments if SRA not already explicitly
+      // enabled and refresh is not being used by any slot.
+      [DOUBLECLICK_SRA_EXP]: {
+        isTrafficEligible: () =>
+          !forcedExperimentId &&
+          !this.win.document./*OK*/ querySelector(
+            'meta[name=amp-ad-enable-refresh], ' +
+              'amp-ad[type=doubleclick][data-enable-refresh], ' +
+              'meta[name=amp-ad-doubleclick-sra]'
+          ),
+        branches: Object.keys(DOUBLECLICK_SRA_EXP_BRANCHES).map(
+          key => DOUBLECLICK_SRA_EXP_BRANCHES[key]
+        ),
+      },
+      [FLEXIBLE_AD_SLOTS_EXP]: {
+        isTrafficEligible: () => true,
+        branches: Object.values(FLEXIBLE_AD_SLOTS_BRANCHES),
+      },
+      [[ADX_ADY_EXP.branch]]: {
+        isTrafficEligible: () => true,
+        branches: [[ADX_ADY_EXP.control], [ADX_ADY_EXP.experiment]],
+      },
+    });
     const setExps = this.randomlySelectUnsetExperiments_(experimentInfoMap);
-    Object.keys(setExps).forEach(expName =>
-      setExps[expName] && this.experimentIds.push(setExps[expName]));
-    if (setExps[FLEXIBLE_AD_SLOTS_EXP] &&
-        setExps[FLEXIBLE_AD_SLOTS_EXP] ==
-        FLEXIBLE_AD_SLOTS_BRANCHES.EXPERIMENT) {
+    Object.keys(setExps).forEach(
+      expName => setExps[expName] && this.experimentIds.push(setExps[expName])
+    );
+    if (
+      setExps[FLEXIBLE_AD_SLOTS_EXP] &&
+      setExps[FLEXIBLE_AD_SLOTS_EXP] == FLEXIBLE_AD_SLOTS_BRANCHES.EXPERIMENT
+    ) {
       this.sendFlexibleAdSlotParams_ = true;
     }
   }
@@ -415,19 +423,24 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
 
   /** @private */
   maybeDeprecationWarn_() {
-    const warnDeprecation = feature => user().warn(
-        TAG, `${feature} is no longer supported for DoubleClick.` +
+    const warnDeprecation = feature =>
+      user().warn(
+        TAG,
+        `${feature} is no longer supported for DoubleClick.` +
           'Please refer to ' +
           'https://github.com/ampproject/amphtml/issues/11834 ' +
-          'for more information');
+          'for more information'
+      );
     const usdrd = 'useSameDomainRenderingUntilDeprecated';
-    const hasUSDRD = usdrd in this.element.dataset ||
-          (tryParseJson(this.element.getAttribute('json')) || {})[usdrd];
+    const hasUSDRD =
+      usdrd in this.element.dataset ||
+      (tryParseJson(this.element.getAttribute('json')) || {})[usdrd];
     if (hasUSDRD) {
       warnDeprecation(usdrd);
     }
-    const useRemoteHtml =
-      !!this.win.document.querySelector('meta[name=amp-3p-iframe-src]');
+    const useRemoteHtml = !!this.win.document.querySelector(
+      'meta[name=amp-3p-iframe-src]'
+    );
     if (useRemoteHtml) {
       warnDeprecation('remote.html');
     }
@@ -438,24 +451,27 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     super.buildCallback();
     this.maybeDeprecationWarn_();
     this.setPageLevelExperiments(this.extractUrlExperimentId_());
-    this.useSra = (getMode().localDev && /(\?|&)force_sra=true(&|$)/.test(
-        this.win.location.search)) ||
-        !!this.win.document.querySelector(
-            'meta[name=amp-ad-doubleclick-sra]') ||
-        [DOUBLECLICK_SRA_EXP_BRANCHES.SRA,
-          DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER].some(
-            eid => this.experimentIds.indexOf(eid) >= 0);
+    this.useSra =
+      (getMode().localDev &&
+        /(\?|&)force_sra=true(&|$)/.test(this.win.location.search)) ||
+      !!this.win.document.querySelector('meta[name=amp-ad-doubleclick-sra]') ||
+      [
+        DOUBLECLICK_SRA_EXP_BRANCHES.SRA,
+        DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER,
+      ].some(eid => this.experimentIds.indexOf(eid) >= 0);
     this.identityTokenPromise_ = Services.viewerForDoc(this.getAmpDoc())
-        .whenFirstVisible().then(() =>
-          getIdentityToken(
-              this.win, this.getAmpDoc(), super.getConsentPolicy()));
+      .whenFirstVisible()
+      .then(() =>
+        getIdentityToken(this.win, this.getAmpDoc(), super.getConsentPolicy())
+      );
     this.troubleshootData_.slotId = this.element.getAttribute('data-slot');
-    this.troubleshootData_.slotIndex =
-        this.element.getAttribute('data-amp-slot-index');
+    this.troubleshootData_.slotIndex = this.element.getAttribute(
+      'data-amp-slot-index'
+    );
     if (!this.isFluidRequest_) {
       const multiSizeStr = this.element.getAttribute('data-multi-size');
-      this.isFluidRequest_ = !!multiSizeStr &&
-          multiSizeStr.indexOf('fluid') != -1;
+      this.isFluidRequest_ =
+        !!multiSizeStr && multiSizeStr.indexOf('fluid') != -1;
     }
     this.maybeAddSinglePassExperiment();
   }
@@ -476,8 +492,11 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     instances = instances || [this];
     const tokens = getPageviewStateTokensForAdRequest(instances);
     return {
-      'npa': consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
-          consentState == CONSENT_POLICY_STATE.UNKNOWN ? 1 : null,
+      'npa':
+        consentState == CONSENT_POLICY_STATE.INSUFFICIENT ||
+        consentState == CONSENT_POLICY_STATE.UNKNOWN
+          ? 1
+          : null,
       'gdfp_req': '1',
       'sfv': DEFAULT_SAFEFRAME_VERSION,
       'u_sd': this.win.devicePixelRatio,
@@ -496,47 +515,58 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     devAssert(this.jsonTargeting);
     const tfcd = this.jsonTargeting && this.jsonTargeting[TFCD];
     this.win['ampAdGoogleIfiCounter'] = this.win['ampAdGoogleIfiCounter'] || 1;
-    this.ifi_ = (this.isRefreshing && this.ifi_) ||
-        this.win['ampAdGoogleIfiCounter']++;
-    const pageLayoutBox = this.isSinglePageStoryAd ?
-      this.element.getPageLayoutBox() : null;
+    this.ifi_ =
+      (this.isRefreshing && this.ifi_) || this.win['ampAdGoogleIfiCounter']++;
+    const pageLayoutBox = this.isSinglePageStoryAd
+      ? this.element.getPageLayoutBox()
+      : null;
     let psz = null;
     let msz = null;
     if (this.sendFlexibleAdSlotParams_) {
       const parentWidth = getContainerWidth(
-          this.win, this.element.parentElement);
+        this.win,
+        this.element.parentElement
+      );
       let slotWidth = getContainerWidth(
-          this.win, this.element, 1 /* maxDepth */);
+        this.win,
+        this.element,
+        1 /* maxDepth */
+      );
       slotWidth = slotWidth == -1 ? parentWidth : slotWidth;
       psz = `${parentWidth}x-1`;
       msz = `${slotWidth}x-1`;
     }
-    return Object.assign({
-      'iu': this.element.getAttribute('data-slot'),
-      'co': this.jsonTargeting &&
-          this.jsonTargeting['cookieOptOut'] ? '1' : null,
-      'adk': this.adKey,
-      'sz': this.isSinglePageStoryAd ? '1x1' : this.parameterSize,
-      'output': 'html',
-      'impl': 'ifr',
-      'tfcd': tfcd == undefined ? null : tfcd,
-      'adtest': isInManualExperiment(this.element) ? 'on' : null,
-      'ifi': this.ifi_,
-      'rc': this.refreshCount_ || null,
-      'frc': Number(this.fromResumeCallback) || null,
-      'fluid': this.isFluidRequest_ ? 'height' : null,
-      'fsf': this.forceSafeframe ? '1' : null,
-      // Both msz/psz send a height of -1 because height expansion is
-      // disallowed in AMP.
-      'msz': msz,
-      'psz': psz,
-      'scp': serializeTargeting(
+    return Object.assign(
+      {
+        'iu': this.element.getAttribute('data-slot'),
+        'co':
+          this.jsonTargeting && this.jsonTargeting['cookieOptOut'] ? '1' : null,
+        'adk': this.adKey,
+        'sz': this.isSinglePageStoryAd ? '1x1' : this.parameterSize,
+        'output': 'html',
+        'impl': 'ifr',
+        'tfcd': tfcd == undefined ? null : tfcd,
+        'adtest': isInManualExperiment(this.element) ? 'on' : null,
+        'ifi': this.ifi_,
+        'rc': this.refreshCount_ || null,
+        'frc': Number(this.fromResumeCallback) || null,
+        'fluid': this.isFluidRequest_ ? 'height' : null,
+        'fsf': this.forceSafeframe ? '1' : null,
+        // Both msz/psz send a height of -1 because height expansion is
+        // disallowed in AMP.
+        'msz': msz,
+        'psz': psz,
+        'scp': serializeTargeting(
           (this.jsonTargeting && this.jsonTargeting['targeting']) || null,
-          (this.jsonTargeting &&
-            this.jsonTargeting['categoryExclusions']) || null),
-      'spsa': this.isSinglePageStoryAd ?
-        `${pageLayoutBox.width}x${pageLayoutBox.height}` : null,
-    }, googleBlockParameters(this));
+          (this.jsonTargeting && this.jsonTargeting['categoryExclusions']) ||
+            null
+        ),
+        'spsa': this.isSinglePageStoryAd
+          ? `${pageLayoutBox.width}x${pageLayoutBox.height}`
+          : null,
+      },
+      googleBlockParameters(this)
+    );
   }
 
   /**
@@ -547,38 +577,42 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   populateAdUrlState(consentState) {
     this.consentState = consentState;
     // Allow for pub to override height/width via override attribute.
-    const width = Number(this.element.getAttribute('data-override-width')) ||
+    const width =
+      Number(this.element.getAttribute('data-override-width')) ||
       Number(this.element.getAttribute('width'));
-    const height = Number(this.element.getAttribute('data-override-height')) ||
+    const height =
+      Number(this.element.getAttribute('data-override-height')) ||
       Number(this.element.getAttribute('height'));
-    this.initialSize_ = this.isFluidPrimaryRequest_ ? {width: 0, height: 0} :
-      (width && height ?
-        // width/height could be 'auto' in which case we fallback to measured.
-        {width, height} : this.getIntersectionElementLayoutBox());
-    this.jsonTargeting =
-      tryParseJson(this.element.getAttribute('json')) || {};
+    this.initialSize_ = this.isFluidPrimaryRequest_
+      ? {width: 0, height: 0}
+      : width && height
+      ? // width/height could be 'auto' in which case we fallback to measured.
+        {width, height}
+      : this.getIntersectionElementLayoutBox();
+    this.jsonTargeting = tryParseJson(this.element.getAttribute('json')) || {};
     this.adKey = this.generateAdKey_(
-        `${this.initialSize_.width}x${this.initialSize_.height}`);
+      `${this.initialSize_.width}x${this.initialSize_.height}`
+    );
     this.parameterSize = this.isFluidPrimaryRequest_
       ? DUMMY_FLUID_SIZE
       : `${this.initialSize_.width}x${this.initialSize_.height}`;
     const multiSizeDataStr = this.element.getAttribute('data-multi-size');
     if (multiSizeDataStr) {
-      const multiSizeValidation = this.element
-          .getAttribute('data-multi-size-validation') || 'true';
+      const multiSizeValidation =
+        this.element.getAttribute('data-multi-size-validation') || 'true';
       // The following call will check all specified multi-size dimensions,
       // verify that they meet all requirements, and then return all the valid
       // dimensions in an array.
       const dimensions = getMultiSizeDimensions(
-          multiSizeDataStr,
-          this.initialSize_.width,
-          this.initialSize_.height,
-          multiSizeValidation == 'true',
-          this.isFluidPrimaryRequest_);
+        multiSizeDataStr,
+        this.initialSize_.width,
+        this.initialSize_.height,
+        multiSizeValidation == 'true',
+        this.isFluidPrimaryRequest_
+      );
       if (dimensions.length) {
-        this.parameterSize += '|' + dimensions
-            .map(dimension => dimension.join('x'))
-            .join('|');
+        this.parameterSize +=
+          '|' + dimensions.map(dimension => dimension.join('x')).join('|');
       }
     }
   }
@@ -595,8 +629,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     if (this.useSra) {
       this.sraDeferred = this.sraDeferred || new Deferred();
     }
-    if (consentState == CONSENT_POLICY_STATE.UNKNOWN &&
-        this.element.getAttribute('data-npa-on-unknown-consent') != 'true') {
+    if (
+      consentState == CONSENT_POLICY_STATE.UNKNOWN &&
+      this.element.getAttribute('data-npa-on-unknown-consent') != 'true'
+    ) {
       user().info(TAG, 'Ad request suppressed due to unknown consent');
       this.getAdUrlDeferred.resolve('');
       return Promise.resolve('');
@@ -615,24 +651,29 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // validateData, from 3p/3p/js, after noving it someplace common.
     const startTime = Date.now();
     const identityPromise = Services.timerFor(this.win)
-        .timeoutPromise(1000, this.identityTokenPromise_)
-        .catch(() => {
-          // On error/timeout, proceed.
-          return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/({});
-        });
+      .timeoutPromise(1000, this.identityTokenPromise_)
+      .catch(() => {
+        // On error/timeout, proceed.
+        return /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({});
+      });
     const checkStillCurrent = this.verifyStillCurrent();
-    Promise.all([opt_rtcResponsesPromise, identityPromise])
-        .then(results => {
-          checkStillCurrent();
-          const rtcParams = this.mergeRtcResponses_(results[0]);
-          this.identityToken = results[1];
-          googleAdUrl(
-              this, DOUBLECLICK_BASE_URL, startTime, Object.assign(
-                  this.getBlockParameters_(), this.buildIdentityParams(),
-                  this.getPageParameters(consentState), rtcParams),
-              this.experimentIds)
-              .then(adUrl => this.getAdUrlDeferred.resolve(adUrl));
-        });
+    Promise.all([opt_rtcResponsesPromise, identityPromise]).then(results => {
+      checkStillCurrent();
+      const rtcParams = this.mergeRtcResponses_(results[0]);
+      this.identityToken = results[1];
+      googleAdUrl(
+        this,
+        DOUBLECLICK_BASE_URL,
+        startTime,
+        Object.assign(
+          this.getBlockParameters_(),
+          this.buildIdentityParams(),
+          this.getPageParameters(consentState),
+          rtcParams
+        ),
+        this.experimentIds
+      ).then(adUrl => this.getAdUrlDeferred.resolve(adUrl));
+    });
     this.troubleshootData_.adUrl = this.getAdUrlDeferred.promise;
     return this.getAdUrlDeferred.promise;
   }
@@ -642,11 +683,13 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    * @return {!Object<string,string>}
    */
   buildIdentityParams() {
-    return this.identityToken ? {
-      adsid: this.identityToken.token || null,
-      jar: this.identityToken.jar || null,
-      pucrd: this.identityToken.pucrd || null,
-    } : {};
+    return this.identityToken
+      ? {
+          adsid: this.identityToken.token || null,
+          jar: this.identityToken.jar || null,
+          pucrd: this.identityToken.pucrd || null,
+        }
+      : {};
   }
 
   /**
@@ -673,13 +716,12 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       if (rtcResponse.response) {
         if (rtcResponse.response['targeting']) {
           const rewrittenResponse = this.rewriteRtcKeys_(
-              rtcResponse.response['targeting'],
-              rtcResponse.callout);
-          this.jsonTargeting['targeting'] =
-              !!this.jsonTargeting['targeting'] ?
-                deepMerge(this.jsonTargeting['targeting'],
-                    rewrittenResponse) :
-                rewrittenResponse;
+            rtcResponse.response['targeting'],
+            rtcResponse.callout
+          );
+          this.jsonTargeting['targeting'] = !!this.jsonTargeting['targeting']
+            ? deepMerge(this.jsonTargeting['targeting'], rewrittenResponse)
+            : rewrittenResponse;
         }
         if (rtcResponse.response['categoryExclusions']) {
           if (!exclusions) {
@@ -724,11 +766,15 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       REFERRER: opt_timeout => this.getReferrer_(opt_timeout),
       TGT: () =>
         JSON.stringify(
-            (tryParseJson(
-                this.element.getAttribute('json')) || {})['targeting']),
-      ADCID: opt_timeout => getOrCreateAdCid(
-          this.getAmpDoc(), 'AMP_ECID_GOOGLE', '_ga',
-          parseInt(opt_timeout, 10)),
+          (tryParseJson(this.element.getAttribute('json')) || {})['targeting']
+        ),
+      ADCID: opt_timeout =>
+        getOrCreateAdCid(
+          this.getAmpDoc(),
+          'AMP_ECID_GOOGLE',
+          '_ga',
+          parseInt(opt_timeout, 10)
+        ),
       ATTR: name => {
         if (!whitelist[name.toLowerCase()]) {
           dev().warn('TAG', `Invalid attribute ${name}`);
@@ -751,14 +797,15 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    */
   getReferrer_(opt_timeout) {
     const timeoutInt = parseInt(opt_timeout, 10);
-    const referrerPromise = Services.viewerForDoc(this.getAmpDoc())
-        .getReferrerUrl();
+    const referrerPromise = Services.viewerForDoc(
+      this.getAmpDoc()
+    ).getReferrerUrl();
     if (isNaN(timeoutInt) || timeoutInt < 0) {
       return referrerPromise;
     }
     return Services.timerFor(this.win)
-        .timeoutPromise(timeoutInt, referrerPromise)
-        .catch(() => undefined);
+      .timeoutPromise(timeoutInt, referrerPromise)
+      .catch(() => undefined);
   }
 
   /**
@@ -794,7 +841,8 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     }
     const checksum = headers.get('AMP-Verification-Checksum');
     return Promise.resolve(
-        checksum && stringHash32(utf8Decode(bytes)) == checksum ? bytes : null);
+      checksum && stringHash32(utf8Decode(bytes)) == checksum ? bytes : null
+    );
   }
 
   /** @override */
@@ -802,14 +850,18 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     this.ampAnalyticsConfig_ = extractAmpAnalyticsConfig(this, responseHeaders);
     this.qqid_ = responseHeaders.get(QQID_HEADER);
     this.shouldSandbox_ = responseHeaders.get(SANDBOX_HEADER) == 'true';
-    this.troubleshootData_.creativeId =
-        dev().assertString(responseHeaders.get('google-creative-id') || '-1');
-    this.troubleshootData_.lineItemId =
-        dev().assertString(responseHeaders.get('google-lineitem-id') || '-1');
+    this.troubleshootData_.creativeId = dev().assertString(
+      responseHeaders.get('google-creative-id') || '-1'
+    );
+    this.troubleshootData_.lineItemId = dev().assertString(
+      responseHeaders.get('google-lineitem-id') || '-1'
+    );
     if (this.ampAnalyticsConfig_) {
       // Load amp-analytics extensions
-      this.extensions_./*OK*/installExtensionForDoc(
-          this.getAmpDoc(), 'amp-analytics');
+      this.extensions_./*OK*/ installExtensionForDoc(
+        this.getAmpDoc(),
+        'amp-analytics'
+      );
     }
     // If the server returned a size, use that, otherwise use the size that we
     // sent in the ad request.
@@ -831,7 +883,8 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     if (responseHeaders.get('amp-ff-pageview-tokens')) {
       this.removePageviewStateToken();
       this.setPageviewStateToken(
-          dev().assertString(responseHeaders.get('amp-ff-pageview-tokens')));
+        dev().assertString(responseHeaders.get('amp-ff-pageview-tokens'))
+      );
     }
 
     return size;
@@ -853,15 +906,17 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     const height = Number(this.element.getAttribute('height'));
     return width && height
       ? {width, height}
-      // width/height could be 'auto' in which case we fallback to measured.
-      : this.getIntersectionElementLayoutBox();
+      : // width/height could be 'auto' in which case we fallback to measured.
+        this.getIntersectionElementLayoutBox();
   }
 
   /** @override */
   tearDownSlot() {
     super.tearDownSlot();
-    this.element.setAttribute('data-amp-slot-index',
-        this.win.ampAdSlotIdCounter++);
+    this.element.setAttribute(
+      'data-amp-slot-index',
+      this.win.ampAdSlotIdCounter++
+    );
     if (this.ampAnalyticsElement_) {
       removeElement(this.ampAnalyticsElement_);
       this.ampAnalyticsElement_ = null;
@@ -891,8 +946,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // non-AMP creatives.  This is not done in the scheduler to ensure as many
     // slots as possible are marked for layout given scheduler imposes 5 seconds
     // past previous execution.
-    if (this.postAdResponseExperimentFeatures['render-idle-throttle'] &&
-          this.isIdleRender_) {
+    if (
+      this.postAdResponseExperimentFeatures['render-idle-throttle'] &&
+      this.isIdleRender_
+    ) {
       if (is3pThrottled(this.win)) {
         return waitFor3pThrottle().then(() => super.renderNonAmpCreative());
       } else {
@@ -951,27 +1008,35 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
   onCreativeRender(creativeMetaData, opt_onLoadPromise) {
     super.onCreativeRender(creativeMetaData);
     this.isAmpCreative_ = !!creativeMetaData;
-    if (creativeMetaData &&
-        !creativeMetaData.customElementExtensions.includes('amp-ad-exit')) {
+    if (
+      creativeMetaData &&
+      !creativeMetaData.customElementExtensions.includes('amp-ad-exit')
+    ) {
       // Capture phase click handlers on the ad if amp-ad-exit not present
       // (assume it will handle capture).
       devAssert(this.iframe);
       Navigation.installAnchorClickInterceptor(
-          this.getAmpDoc(), this.iframe.contentWindow);
+        this.getAmpDoc(),
+        this.iframe.contentWindow
+      );
     }
     if (this.ampAnalyticsConfig_) {
       devAssert(!this.ampAnalyticsElement_);
       if (isReportingEnabled(this)) {
         addCsiSignalsToAmpAnalyticsConfig(
-            this.win,
-            this.element,
-            this.ampAnalyticsConfig_,
-            this.qqid_,
-            !!creativeMetaData);
+          this.win,
+          this.element,
+          this.ampAnalyticsConfig_,
+          this.qqid_,
+          !!creativeMetaData
+        );
       }
       this.ampAnalyticsElement_ = insertAnalyticsElement(
-          this.element, this.ampAnalyticsConfig_, /*loadAnalytics*/ true,
-          !!this.postAdResponseExperimentFeatures['avr_disable_immediate']);
+        this.element,
+        this.ampAnalyticsConfig_,
+        /*loadAnalytics*/ true,
+        !!this.postAdResponseExperimentFeatures['avr_disable_immediate']
+      );
     }
     if (this.isRefreshing) {
       devAssert(this.refreshManager_);
@@ -984,11 +1049,13 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // the slot. This ensures that the creative is centered in the former case,
     // and not truncated in the latter.
     const size = this.returnedSize_ || this.getSlotSize();
-    const isMultiSizeFluid = this.isFluidRequest_ && this.returnedSize_ &&
-        // TODO(@glevitzky, 11583) Remove this clause once we stop sending back
-        // the size header for fluid ads. Fluid size headers always come back as
-        // 0x0.
-        !(size.width == 0 && size.height == 0);
+    const isMultiSizeFluid =
+      this.isFluidRequest_ &&
+      this.returnedSize_ &&
+      // TODO(@glevitzky, 11583) Remove this clause once we stop sending back
+      // the size header for fluid ads. Fluid size headers always come back as
+      // 0x0.
+      !(size.width == 0 && size.height == 0);
     setStyles(dev().assertElement(this.iframe), {
       width: `${size.width}px`,
       height: `${size.height}px`,
@@ -1012,22 +1079,29 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       });
     }
 
-    this.refreshManager_ = this.refreshManager_ ||
-        getRefreshManager(this, () => {
-          if (this.useSra) {
-            user().warn(TAG, 'Refresh not compatible with SRA.');
-            return false;
-          }
-          if (getEnclosingContainerTypes(this.element).filter(container =>
-            container != ValidAdContainerTypes['AMP-CAROUSEL'] &&
-                container != ValidAdContainerTypes['AMP-STICKY-AD']).length) {
-            user().warn(TAG,
-                'Refresh not compatible with ad-containers, except for ' +
-                'AMP-CAROUSEL and AMP-STICKY-AD');
-            return false;
-          }
-          return true;
-        });
+    this.refreshManager_ =
+      this.refreshManager_ ||
+      getRefreshManager(this, () => {
+        if (this.useSra) {
+          user().warn(TAG, 'Refresh not compatible with SRA.');
+          return false;
+        }
+        if (
+          getEnclosingContainerTypes(this.element).filter(
+            container =>
+              container != ValidAdContainerTypes['AMP-CAROUSEL'] &&
+              container != ValidAdContainerTypes['AMP-STICKY-AD']
+          ).length
+        ) {
+          user().warn(
+            TAG,
+            'Refresh not compatible with ad-containers, except for ' +
+              'AMP-CAROUSEL and AMP-STICKY-AD'
+          );
+          return false;
+        }
+        return true;
+      });
 
     this.postTroubleshootMessage();
   }
@@ -1043,32 +1117,41 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    *   testing.
    */
   expandFluidCreative_() {
-    if (this.isFluidRequest_ &&
-        // If a size was returned in the response, then this is a multi-size
-        // response, not a fluid response.
-        !this.returnedSize_ &&
-        this.isVerifiedAmpCreative()) {
+    if (
+      this.isFluidRequest_ &&
+      // If a size was returned in the response, then this is a multi-size
+      // response, not a fluid response.
+      !this.returnedSize_ &&
+      this.isVerifiedAmpCreative()
+    ) {
       // This is an AMP fluid creative that will be rendered in a friendly
       // frame.
-      if (!this.iframe || !this.iframe.contentWindow ||
-          !this.iframe.contentWindow.document ||
-          !this.iframe.contentWindow.document.body) {
-        dev().error(TAG, 'Attempting to expand fluid creative without ' +
+      if (
+        !this.iframe ||
+        !this.iframe.contentWindow ||
+        !this.iframe.contentWindow.document ||
+        !this.iframe.contentWindow.document.body
+      ) {
+        dev().error(
+          TAG,
+          'Attempting to expand fluid creative without ' +
             'a properly set up friendly frame. Slot id: ' +
-            this.element.getAttribute('data-amp-slot-index'));
+            this.element.getAttribute('data-amp-slot-index')
+        );
         return Promise.reject('Cannot access body of friendly frame');
       }
       return this.setCssPosition_('static').then(() => {
         return this.attemptChangeHeight(
-            this.iframe.contentWindow.document.body./*OK*/clientHeight)
-            .then(() => {
-              this.fireFluidDelayedImpression();
-              this.reattemptToExpandFluidCreative_ = false;
-            })
-            .catch(() => {
-              this.reattemptToExpandFluidCreative_ = true;
-              this.setCssPosition_('absolute');
-            });
+          this.iframe.contentWindow.document.body./*OK*/ clientHeight
+        )
+          .then(() => {
+            this.fireFluidDelayedImpression();
+            this.reattemptToExpandFluidCreative_ = false;
+          })
+          .catch(() => {
+            this.reattemptToExpandFluidCreative_ = true;
+            this.setCssPosition_('absolute');
+          });
       });
     }
     return Promise.resolve();
@@ -1113,9 +1196,11 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // We want to resize only if neither returned dimension is larger than its
     // primary counterpart, and if at least one of the returned dimensions
     // differ from its primary counterpart.
-    if ((this.isFluidRequest_ && width && height) ||
-        ((width != pWidth || height != pHeight) &&
-         (width <= pWidth && height <= pHeight))) {
+    if (
+      (this.isFluidRequest_ && width && height) ||
+      ((width != pWidth || height != pHeight) &&
+        (width <= pWidth && height <= pHeight))
+    ) {
       this.attemptChangeSize(height, width).catch(() => {});
     }
   }
@@ -1134,10 +1219,19 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
       if (!this.sraDeferred) {
         dev().warn(TAG, `SRA failed to include element ${this.ifi_}`);
         if (isExperimentOn(this.win, 'doubleclickSraReportExcludedBlock')) {
-          this.getAmpDoc().getBody().appendChild(createElementWithAttributes(
-              this.win.document, 'amp-pixel', dict({'src':
-              'https://pagead2.googlesyndication.com/pagead/gen_204?' +
-                  `id=${encodeURIComponent('a4a::sra')}&ifi=${this.ifi_}`})));
+          this.getAmpDoc()
+            .getBody()
+            .appendChild(
+              createElementWithAttributes(
+                this.win.document,
+                'amp-pixel',
+                dict({
+                  'src':
+                    'https://pagead2.googlesyndication.com/pagead/gen_204?' +
+                    `id=${encodeURIComponent('a4a::sra')}&ifi=${this.ifi_}`,
+                })
+              )
+            );
         }
       }
     });
@@ -1168,13 +1262,15 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
         }
         // Create amp-pixel and append to document to send impression.
         this.win.document.body.appendChild(
-            createElementWithAttributes(
-                this.win.document,
-                'amp-pixel',
-                dict({
-                  'src': url,
-                  'referrerpolicy': scrubReferer ? 'no-referrer' : '',
-                })));
+          createElementWithAttributes(
+            this.win.document,
+            'amp-pixel',
+            dict({
+              'src': url,
+              'referrerpolicy': scrubReferer ? 'no-referrer' : '',
+            })
+          )
+        );
       } catch (unusedError) {}
     });
   }
@@ -1197,7 +1293,10 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    */
   groupSlotsForSra() {
     return groupAmpAdsByType(
-        this.win, this.element.getAttribute('type'), getNetworkId);
+      this.win,
+      this.element.getAttribute('type'),
+      getNetworkId
+    );
   }
 
   /**
@@ -1216,33 +1315,38 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     // be called for all and we should cancel SRA execution.
     const checkStillCurrent = this.verifyStillCurrent();
     const noFallbackExp = this.experimentIds.includes(
-        DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER);
-    sraRequests = sraRequests || this.groupSlotsForSra()
-        .then(groupIdToBlocksAry => {
-          checkStillCurrent();
-          const sraRequestPromises = [];
-          Object.keys(groupIdToBlocksAry).forEach(networkId => {
-            const blocks = devAssert(groupIdToBlocksAry[networkId]);
-            // TODO: filter blocks with SRA disabled?
-            sraRequestPromises.push(Promise.all(blocks).then(instances => {
+      DOUBLECLICK_SRA_EXP_BRANCHES.SRA_NO_RECOVER
+    );
+    sraRequests =
+      sraRequests ||
+      this.groupSlotsForSra().then(groupIdToBlocksAry => {
+        checkStillCurrent();
+        const sraRequestPromises = [];
+        Object.keys(groupIdToBlocksAry).forEach(networkId => {
+          const blocks = devAssert(groupIdToBlocksAry[networkId]);
+          // TODO: filter blocks with SRA disabled?
+          sraRequestPromises.push(
+            Promise.all(blocks).then(instances => {
               devAssert(instances.length);
               checkStillCurrent();
               // Exclude any instances that do not have an adPromise_ as this
               // indicates they were invalid.
-              const typeInstances =
-              /** @type {!Array<!AmpAdNetworkDoubleclickImpl>}*/(instances)
-                    .filter(instance => {
-                      const isValid = instance.hasAdPromise();
-                      if (!isValid) {
-                        dev().info(TAG,
-                            'Ignoring instance without ad promise as ' +
-                            'likely invalid',
-                            instance.element);
-                      }
-                      return isValid;
-                    });
+              const typeInstances = /** @type {!Array<!AmpAdNetworkDoubleclickImpl>}*/ (instances).filter(
+                instance => {
+                  const isValid = instance.hasAdPromise();
+                  if (!isValid) {
+                    dev().info(
+                      TAG,
+                      'Ignoring instance without ad promise as ' +
+                        'likely invalid',
+                      instance.element
+                    );
+                  }
+                  return isValid;
+                }
+              );
               if (!typeInstances.length) {
-              // Only contained invalid elements.
+                // Only contained invalid elements.
                 return;
               }
               // If not within no recovery SRA experiment, determine if more
@@ -1253,8 +1357,8 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
                 dev().info(TAG, `single block in network ${networkId}`);
                 // Ensure deferred exists, may not if getAdUrl did not yet
                 // execute.
-                typeInstances[0].sraDeferred = typeInstances[0].sraDeferred ||
-                  new Deferred();
+                typeInstances[0].sraDeferred =
+                  typeInstances[0].sraDeferred || new Deferred();
                 typeInstances[0].sraDeferred.resolve(null);
                 return;
               }
@@ -1262,71 +1366,87 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
               // Construct and send SRA request.
               // TODO(keithwrightbos) - how do we handle per slot 204 response?
               return constructSRARequest_(this, typeInstances)
-                  .then(sraUrlIn => {
-                    checkStillCurrent();
-                    sraUrl = sraUrlIn;
-                    return Services.xhrFor(this.win).fetch(sraUrl, {
-                      mode: 'cors',
-                      method: 'GET',
-                      credentials: 'include',
-                    });
-                  })
-                  .then(response => {
-                    checkStillCurrent();
-                    // Chunk handler called with metadata and creative for each
-                    // slot in order of URLs given which is then passed to
-                    // resolver used for sendXhrRequest.
-                    const sraRequestAdUrlResolvers =
-                    typeInstances.map(instance => instance.sraDeferred.resolve);
-                    const slotCallback = metaJsonCreativeGrouper(
-                        (creative, headersObj, done) => {
-                          checkStillCurrent();
-                          sraBlockCallbackHandler(creative, headersObj, done,
-                              sraRequestAdUrlResolvers, sraUrl);
-                        });
-                    lineDelimitedStreamer(this.win, response, slotCallback);
-                    return Promise.all(typeInstances.map(
-                        instance => instance.sraDeferred.promise));
-                  })
-                  .catch(error => {
-                    if (isCancellation(error)) {
-                      // Cancellation should be propagated to slot promises
-                      // causing their adPromise chains within A4A to handle
-                      // appropriately.
-                      typeInstances.forEach(instance => instance.sraDeferred &&
-                        instance.sraDeferred.reject(error));
-                    } else if (noFallbackExp ||
-                      !!this.win.document.querySelector(
-                          'meta[name=amp-ad-doubleclick-sra]')) {
-                      // If publisher has explicitly enabled SRA mode (not
-                      // experiment), then assume error is network failure,
-                      // collapse slot, reset url to empty string to ensure
-                      // no fallback to frame GET (given expectation of SRA
-                      // consistency), and propagate error to A4A ad promise
-                      // chain.
-                      assignAdUrlToError(/** @type {!Error} */(error), sraUrl);
-                      this.warnOnError('SRA request failure', error);
-                      // Publisher explicitly wants SRA so do not attempt to
-                      // recover as SRA guarantees cannot be enforced.
-                      typeInstances.forEach(instance => {
-                        // Reset ad url to ensure layoutCallback does not
-                        // fallback to frame get which would lose SRA
-                        // guarantees.
-                        instance.resetAdUrl();
-                        instance.attemptCollapse();
-                        instance.sraDeferred.reject(error);
-                      });
-                    } else {
-                      // Opportunistic SRA used so fallback to individual
-                      // XHR requests.
-                      typeInstances.forEach(instance =>
-                        instance.sraDeferred.resolve(null));
-                    }
+                .then(sraUrlIn => {
+                  checkStillCurrent();
+                  sraUrl = sraUrlIn;
+                  return Services.xhrFor(this.win).fetch(sraUrl, {
+                    mode: 'cors',
+                    method: 'GET',
+                    credentials: 'include',
                   });
-            }));
-          });
-          return Promise.all(sraRequestPromises);
+                })
+                .then(response => {
+                  checkStillCurrent();
+                  // Chunk handler called with metadata and creative for each
+                  // slot in order of URLs given which is then passed to
+                  // resolver used for sendXhrRequest.
+                  const sraRequestAdUrlResolvers = typeInstances.map(
+                    instance => instance.sraDeferred.resolve
+                  );
+                  const slotCallback = metaJsonCreativeGrouper(
+                    (creative, headersObj, done) => {
+                      checkStillCurrent();
+                      sraBlockCallbackHandler(
+                        creative,
+                        headersObj,
+                        done,
+                        sraRequestAdUrlResolvers,
+                        sraUrl
+                      );
+                    }
+                  );
+                  lineDelimitedStreamer(this.win, response, slotCallback);
+                  return Promise.all(
+                    typeInstances.map(instance => instance.sraDeferred.promise)
+                  );
+                })
+                .catch(error => {
+                  if (isCancellation(error)) {
+                    // Cancellation should be propagated to slot promises
+                    // causing their adPromise chains within A4A to handle
+                    // appropriately.
+                    typeInstances.forEach(
+                      instance =>
+                        instance.sraDeferred &&
+                        instance.sraDeferred.reject(error)
+                    );
+                  } else if (
+                    noFallbackExp ||
+                    !!this.win.document.querySelector(
+                      'meta[name=amp-ad-doubleclick-sra]'
+                    )
+                  ) {
+                    // If publisher has explicitly enabled SRA mode (not
+                    // experiment), then assume error is network failure,
+                    // collapse slot, reset url to empty string to ensure
+                    // no fallback to frame GET (given expectation of SRA
+                    // consistency), and propagate error to A4A ad promise
+                    // chain.
+                    assignAdUrlToError(/** @type {!Error} */ (error), sraUrl);
+                    this.warnOnError('SRA request failure', error);
+                    // Publisher explicitly wants SRA so do not attempt to
+                    // recover as SRA guarantees cannot be enforced.
+                    typeInstances.forEach(instance => {
+                      // Reset ad url to ensure layoutCallback does not
+                      // fallback to frame get which would lose SRA
+                      // guarantees.
+                      instance.resetAdUrl();
+                      instance.attemptCollapse();
+                      instance.sraDeferred.reject(error);
+                    });
+                  } else {
+                    // Opportunistic SRA used so fallback to individual
+                    // XHR requests.
+                    typeInstances.forEach(instance =>
+                      instance.sraDeferred.resolve(null)
+                    );
+                  }
+                });
+            })
+          );
         });
+        return Promise.all(sraRequestPromises);
+      });
     return sraRequests;
   }
 
@@ -1358,8 +1478,9 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
    * @visibleForTesting
    */
   getLocationQueryParameterValue(parameterName) {
-    windowLocationQueryParameters = windowLocationQueryParameters ||
-        parseQueryString((this.win.location && this.win.location.search) || '');
+    windowLocationQueryParameters =
+      windowLocationQueryParameters ||
+      parseQueryString((this.win.location && this.win.location.search) || '');
     return windowLocationQueryParameters[parameterName];
   }
 
@@ -1370,10 +1491,13 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     }
     const creativeSize = this.getCreativeSize();
     devAssert(creativeSize, 'this.getCreativeSize returned null');
-    this.safeframeApi_ = this.safeframeApi_ ||
-        new SafeframeHostApi(
-            this, this.isFluidRequest_,
-            /** @type {{height, width}} */(creativeSize));
+    this.safeframeApi_ =
+      this.safeframeApi_ ||
+      new SafeframeHostApi(
+        this,
+        this.isFluidRequest_,
+        /** @type {{height, width}} */ (creativeSize)
+      );
 
     return this.safeframeApi_.getSafeframeNameAttr();
   }
@@ -1392,29 +1516,35 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
     }
     devAssert(this.troubleshootData_.adUrl, 'ad URL does not exist yet');
     return this.troubleshootData_.adUrl.then(adUrl => {
-      const slotId = this.troubleshootData_.slotId + '_' +
-          this.troubleshootData_.slotIndex;
+      const slotId =
+        this.troubleshootData_.slotId + '_' + this.troubleshootData_.slotIndex;
       const payload = dict({
-        'gutData': JSON.stringify(dict({
-          'events': [{
-            'timestamp': Date.now(),
-            'slotid': slotId,
-            'messageId': 4,
-          }],
-          'slots': [{
-            'contentUrl': adUrl || '',
-            'id': slotId,
-            'leafAdUnitName': this.troubleshootData_.slotId,
-            'domId': slotId,
-            'lineItemId': this.troubleshootData_.lineItemId,
-            'creativeId': this.troubleshootData_.creativeId,
-          }],
-        })),
+        'gutData': JSON.stringify(
+          dict({
+            'events': [
+              {
+                'timestamp': Date.now(),
+                'slotid': slotId,
+                'messageId': 4,
+              },
+            ],
+            'slots': [
+              {
+                'contentUrl': adUrl || '',
+                'id': slotId,
+                'leafAdUnitName': this.troubleshootData_.slotId,
+                'domId': slotId,
+                'lineItemId': this.troubleshootData_.lineItemId,
+                'creativeId': this.troubleshootData_.creativeId,
+              },
+            ],
+          })
+        ),
         'userAgent': navigator.userAgent,
         'referrer': this.win.location.href,
         'messageType': 'LOAD',
       });
-      this.win.opener./*OK*/postMessage(payload, '*');
+      this.win.opener./*OK*/ postMessage(payload, '*');
     });
   }
 
@@ -1480,12 +1610,12 @@ export function resetLocationQueryParametersForTesting() {
  */
 export function getNetworkId(element) {
   const networkId = /^(?:\/)?(\d+)/.exec(
-      dev().assertString(element.getAttribute('data-slot')));
+    dev().assertString(element.getAttribute('data-slot'))
+  );
   // TODO: guarantee data-ad-slot format as part of isValidElement?
   return networkId ? networkId[1] : '';
 }
 
-
 /**
  * @param {!../../../extensions/amp-a4a/0.1/amp-a4a.AmpA4A} a4a
  * @param {!Array<!AmpAdNetworkDoubleclickImpl>} instances
@@ -1496,15 +1626,21 @@ function constructSRARequest_(a4a, instances) {
   devAssert(instances && instances.length);
   const startTime = Date.now();
   return Promise.all(
-      instances.map(instance => instance.getAdUrlDeferred.promise))
-      .then(() => googlePageParameters(a4a, startTime))
-      .then(googPageLevelParameters => {
-        const blockParameters = constructSRABlockParameters(instances);
-        return truncAndTimeUrl(DOUBLECLICK_BASE_URL,
-            Object.assign(blockParameters, googPageLevelParameters,
-                instances[0].getPageParameters(instances[0].consentState,
-                    instances)), startTime);
-      });
+    instances.map(instance => instance.getAdUrlDeferred.promise)
+  )
+    .then(() => googlePageParameters(a4a, startTime))
+    .then(googPageLevelParameters => {
+      const blockParameters = constructSRABlockParameters(instances);
+      return truncAndTimeUrl(
+        DOUBLECLICK_BASE_URL,
+        Object.assign(
+          blockParameters,
+          googPageLevelParameters,
+          instances[0].getPageParameters(instances[0].consentState, instances)
+        ),
+        startTime
+      );
+    });
 }
 
 /**
@@ -1517,8 +1653,7 @@ function constructSRARequest_(a4a, instances) {
 export function getPageviewStateTokensForAdRequest(instancesInAdRequest) {
   const pageviewStateTokensInAdRequest = [];
   for (const token in tokensToInstances) {
-    if (!instancesInAdRequest.includes(
-        tokensToInstances[token])) {
+    if (!instancesInAdRequest.includes(tokensToInstances[token])) {
       pageviewStateTokensInAdRequest.push(token);
     }
   }
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
index 93bea028fef2..00cf36c4382b 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/safeframe-host.js
@@ -91,8 +91,10 @@ export function safeframeListener(event) {
     safeframeHost.connectMessagingChannel(data[MESSAGE_FIELDS.CHANNEL]);
   } else if (payload) {
     // Currently we do not expect a payload on initial connection messages.
-    safeframeHost.processMessage(/** @type {!JsonObject} */(payload),
-        data[MESSAGE_FIELDS.SERVICE]);
+    safeframeHost.processMessage(
+      /** @type {!JsonObject} */ (payload),
+      data[MESSAGE_FIELDS.SERVICE]
+    );
   }
 }
 
@@ -117,7 +119,6 @@ export function safeframeListener(event) {
  *  then calls the instance of send() below whenever an update occurs.
  */
 export class SafeframeHostApi {
-
   /**
    * @param {!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl} baseInstance
    * @param {boolean} isFluid
@@ -129,7 +130,8 @@ export class SafeframeHostApi {
 
     /** @private {!Function} */
     this.checkStillCurrent_ = this.baseInstance_.verifyStillCurrent.bind(
-        this.baseInstance_)();
+      this.baseInstance_
+    )();
 
     /** @private {!Window} */
     this.win_ = this.baseInstance_.win;
@@ -159,9 +161,10 @@ export class SafeframeHostApi {
     this.creativeSize_ = creativeSize;
 
     /** @private {{width:number, height:number}} */
-    this.initialCreativeSize_ =
-      /** @private {{width:number, height:number}} */
-      (Object.assign({}, creativeSize));
+    this.initialCreativeSize_ = /** @type {{width:number, height:number}} */ (Object.assign(
+      {},
+      creativeSize
+    ));
 
     /** @private {?Promise} */
     this.delay_ = null;
@@ -176,16 +179,20 @@ export class SafeframeHostApi {
     this.isRegistered_ = false;
 
     // TODO: Make this page-level.
-    const sfConfig = Object(tryParseJson(
-        this.baseInstance_.element.getAttribute(
-            'data-safeframe-config')) || {});
+    const sfConfig = Object(
+      tryParseJson(
+        this.baseInstance_.element.getAttribute('data-safeframe-config')
+      ) || {}
+    );
     /** @private {boolean} */
-    this.expandByOverlay_ = hasOwn(sfConfig, 'expandByOverlay') ?
-      sfConfig['expandByOverlay'] : true;
+    this.expandByOverlay_ = hasOwn(sfConfig, 'expandByOverlay')
+      ? sfConfig['expandByOverlay']
+      : true;
 
     /** @private {boolean} */
-    this.expandByPush_ = hasOwn(sfConfig, 'expandByPush') ?
-      sfConfig['expandByPush'] : true;
+    this.expandByPush_ = hasOwn(sfConfig, 'expandByPush')
+      ? sfConfig['expandByPush']
+      : true;
 
     /** @private {?Function} */
     this.unlisten_ = null;
@@ -204,26 +211,28 @@ export class SafeframeHostApi {
     attributes['hostPeerName'] = this.win_.location.origin;
     attributes['initialGeometry'] = this.getInitialGeometry();
     attributes['permissions'] = JSON.stringify(
-        dict({
-          'expandByOverlay': this.expandByOverlay_,
-          'expandByPush': this.expandByPush_,
-          'readCookie': false,
-          'writeCookie': false,
-        }));
+      dict({
+        'expandByOverlay': this.expandByOverlay_,
+        'expandByPush': this.expandByPush_,
+        'readCookie': false,
+        'writeCookie': false,
+      })
+    );
     attributes['metadata'] = JSON.stringify(
-        dict({
-          'shared': {
-            'sf_ver': this.baseInstance_.safeframeVersion,
-            'ck_on': 1,
-            'flash_ver': '26.0.0',
-            // Once GPT Safeframe is updated to look in amp object,
-            // remove this canonical_url here.
+      dict({
+        'shared': {
+          'sf_ver': this.baseInstance_.safeframeVersion,
+          'ck_on': 1,
+          'flash_ver': '26.0.0',
+          // Once GPT Safeframe is updated to look in amp object,
+          // remove this canonical_url here.
+          'canonical_url': this.maybeGetCanonicalUrl(),
+          'amp': {
             'canonical_url': this.maybeGetCanonicalUrl(),
-            'amp': {
-              'canonical_url': this.maybeGetCanonicalUrl(),
-            },
           },
-        }));
+        },
+      })
+    );
     attributes['reportCreativeGeometry'] = this.isFluid_;
     attributes['isDifferentSourceWindow'] = false;
     attributes['sentinel'] = this.sentinel_;
@@ -241,9 +250,11 @@ export class SafeframeHostApi {
     // as Safeframe will always be a different origin.
     // Don't allow for no-referrer.
     const {canonicalUrl} = Services.documentInfoForDoc(
-        this.baseInstance_.getAmpDoc());
+      this.baseInstance_.getAmpDoc()
+    );
     const metaReferrer = this.win_.document.querySelector(
-        "meta[name='referrer']");
+      "meta[name='referrer']"
+    );
     if (!metaReferrer) {
       return canonicalUrl;
     }
@@ -311,10 +322,13 @@ export class SafeframeHostApi {
     this.iframe_ = this.baseInstance_.iframe;
     this.channel = channel;
     this.setupGeom_();
-    this.sendMessage_({
-      'message': 'connect',
-      'c': this.channel,
-    }, '');
+    this.sendMessage_(
+      {
+        'message': 'connect',
+        'c': this.channel,
+      },
+      ''
+    );
   }
 
   /**
@@ -326,10 +340,12 @@ export class SafeframeHostApi {
    * @private
    */
   setupGeom_() {
-    devAssert(this.iframe_.contentWindow,
-        'Frame contentWindow unavailable.');
+    devAssert(this.iframe_.contentWindow, 'Frame contentWindow unavailable.');
     const throttledUpdate = throttle(
-        this.win_, this.updateGeometry_.bind(this), 1000);
+      this.win_,
+      this.updateGeometry_.bind(this),
+      1000
+    );
     const scrollUnlistener = this.viewport_.onScroll(throttledUpdate);
     const changedUnlistener = this.viewport_.onChanged(throttledUpdate);
     this.unlisten_ = () => {
@@ -347,14 +363,20 @@ export class SafeframeHostApi {
     if (!this.iframe_) {
       return;
     }
-    this.viewport_.getClientRectAsync(this.iframe_).then(iframeBox => {
-      this.checkStillCurrent_();
-      const formattedGeom = this.formatGeom_(iframeBox);
-      this.sendMessage_({
-        newGeometry: formattedGeom,
-        uid: this.uid_,
-      }, SERVICE.GEOMETRY_UPDATE);
-    }).catch(err => dev().error(TAG, err));
+    this.viewport_
+      .getClientRectAsync(this.iframe_)
+      .then(iframeBox => {
+        this.checkStillCurrent_();
+        const formattedGeom = this.formatGeom_(iframeBox);
+        this.sendMessage_(
+          {
+            newGeometry: formattedGeom,
+            uid: this.uid_,
+          },
+          SERVICE.GEOMETRY_UPDATE
+        );
+      })
+      .catch(err => dev().error(TAG, err));
   }
 
   /**
@@ -368,7 +390,7 @@ export class SafeframeHostApi {
     const viewportSize = this.viewport_.getSize();
     const scrollLeft = this.viewport_.getScrollLeft();
     const scrollTop = this.viewport_.getScrollTop();
-    const currentGeometry = /** @type {JsonObject} */({
+    const currentGeometry = /** @type {JsonObject} */ ({
       'windowCoords_t': 0,
       'windowCoords_r': viewportSize.width,
       'windowCoords_b': viewportSize.height,
@@ -384,16 +406,20 @@ export class SafeframeHostApi {
       'styleZIndex': getStyle(this.baseInstance_.element, 'zIndex'),
       // AMP's built in resize methodology that we use only allows expansion
       // to the right and bottom, so we enforce that here.
-      'allowedExpansion_r': viewportSize.width -
-          iframeBox.width,
-      'allowedExpansion_b': viewportSize.height -
-          iframeBox.height,
+      'allowedExpansion_r': viewportSize.width - iframeBox.width,
+      'allowedExpansion_b': viewportSize.height - iframeBox.height,
       'allowedExpansion_t': 0,
       'allowedExpansion_l': 0,
-      'yInView': this.getPercInView(viewportSize.height,
-          iframeBox.top, iframeBox.bottom),
-      'xInView': this.getPercInView(viewportSize.width,
-          iframeBox.left, iframeBox.right),
+      'yInView': this.getPercInView(
+        viewportSize.height,
+        iframeBox.top,
+        iframeBox.bottom
+      ),
+      'xInView': this.getPercInView(
+        viewportSize.width,
+        iframeBox.left,
+        iframeBox.right
+      ),
     });
     this.currentGeometry_ = currentGeometry;
     return JSON.stringify(currentGeometry);
@@ -411,8 +437,10 @@ export class SafeframeHostApi {
    * @return {number}
    */
   getPercInView(rootBoundEnd, boundingRectStart, boundingRectEnd) {
-    const lengthInView = (boundingRectEnd >= rootBoundEnd) ?
-      rootBoundEnd - boundingRectStart : boundingRectEnd;
+    const lengthInView =
+      boundingRectEnd >= rootBoundEnd
+        ? rootBoundEnd - boundingRectStart
+        : boundingRectEnd;
     const percInView = lengthInView / (boundingRectEnd - boundingRectStart);
     return Math.max(0, Math.min(1, percInView)) || 0;
   }
@@ -431,12 +459,15 @@ export class SafeframeHostApi {
     const message = dict();
     message[MESSAGE_FIELDS.CHANNEL] = this.channel;
     message[MESSAGE_FIELDS.PAYLOAD] = JSON.stringify(
-        /** @type {!JsonObject} */(payload));
+      /** @type {!JsonObject} */ (payload)
+    );
     message[MESSAGE_FIELDS.SERVICE] = serviceName;
     message[MESSAGE_FIELDS.SENTINEL] = this.sentinel_;
     message[MESSAGE_FIELDS.ENDPOINT_IDENTITY] = this.endpointIdentity_;
-    this.iframe_.contentWindow./*OK*/postMessage(
-        JSON.stringify(message), SAFEFRAME_ORIGIN);
+    this.iframe_.contentWindow./*OK*/ postMessage(
+      JSON.stringify(message),
+      SAFEFRAME_ORIGIN
+    );
   }
 
   /**
@@ -467,7 +498,6 @@ export class SafeframeHostApi {
     }
   }
 
-
   /**
    * @param {!JsonObject} payload
    * @private
@@ -476,33 +506,39 @@ export class SafeframeHostApi {
     if (!this.isRegistered_) {
       return;
     }
-    const expandHeight = Number(this.creativeSize_.height) +
-          payload['expand_b'] + payload['expand_t'];
-    const expandWidth = Number(this.creativeSize_.width) +
-          payload['expand_r'] + payload['expand_l'];
+    const expandHeight =
+      Number(this.creativeSize_.height) +
+      payload['expand_b'] +
+      payload['expand_t'];
+    const expandWidth =
+      Number(this.creativeSize_.width) +
+      payload['expand_r'] +
+      payload['expand_l'];
     // Verify that if expanding by push, that expandByPush is allowed.
     // If expanding by overlay, verify that expandByOverlay is allowed,
     // and that we are only expanding within the bounds of the amp-ad.
-    if (isNaN(expandHeight) || isNaN(expandWidth) ||
-        (payload['push'] && !this.expandByPush_) ||
-        (!payload['push'] && !this.expandByOverlay_ &&
-         (expandWidth > this.creativeSize_.width ||
-          expandHeight > this.creativeSize_.height))) {
+    if (
+      isNaN(expandHeight) ||
+      isNaN(expandWidth) ||
+      (payload['push'] && !this.expandByPush_) ||
+      (!payload['push'] &&
+        !this.expandByOverlay_ &&
+        (expandWidth > this.creativeSize_.width ||
+          expandHeight > this.creativeSize_.height))
+    ) {
       dev().error(TAG, 'Invalid expand values.');
-      this.sendResizeResponse(
-          /* SUCCESS? */ false, SERVICE.EXPAND_RESPONSE);
+      this.sendResizeResponse(/* SUCCESS? */ false, SERVICE.EXPAND_RESPONSE);
       return;
     }
     // Can't expand to greater than the viewport size
-    if (expandHeight > this.viewport_.getSize().height ||
-        expandWidth > this.viewport_.getSize().width) {
-      this.sendResizeResponse(
-          /* SUCCESS? */ false, SERVICE.EXPAND_RESPONSE);
+    if (
+      expandHeight > this.viewport_.getSize().height ||
+      expandWidth > this.viewport_.getSize().width
+    ) {
+      this.sendResizeResponse(/* SUCCESS? */ false, SERVICE.EXPAND_RESPONSE);
       return;
     }
-    this.handleSizeChange(expandHeight,
-        expandWidth,
-        SERVICE.EXPAND_RESPONSE);
+    this.handleSizeChange(expandHeight, expandWidth, SERVICE.EXPAND_RESPONSE);
   }
 
   /**
@@ -511,14 +547,15 @@ export class SafeframeHostApi {
   handleCollapseRequest_() {
     // Only collapse if expanded.
     if (this.isCollapsed_ || !this.isRegistered_) {
-      this.sendResizeResponse(
-          /* SUCCESS? */ false, SERVICE.COLLAPSE_RESPONSE);
+      this.sendResizeResponse(/* SUCCESS? */ false, SERVICE.COLLAPSE_RESPONSE);
       return;
     }
-    this.handleSizeChange(this.initialCreativeSize_.height,
-        this.initialCreativeSize_.width,
-        SERVICE.COLLAPSE_RESPONSE,
-        /** isCollapse */ true);
+    this.handleSizeChange(
+      this.initialCreativeSize_.height,
+      this.initialCreativeSize_.width,
+      SERVICE.COLLAPSE_RESPONSE,
+      /** isCollapse */ true
+    );
   }
 
   /**
@@ -529,21 +566,21 @@ export class SafeframeHostApi {
   resizeSafeframe(height, width, messageType) {
     this.isCollapsed_ = messageType == SERVICE.COLLAPSE_RESPONSE;
     this.baseInstance_.measureMutateElement(
-        /** MEASURER */ () => {
-          this.baseInstance_.getResource().measure();
-        },
-        /** MUTATOR */ () => {
-          if (this.iframe_) {
-            setStyles(this.iframe_, {
-              'height': height + 'px',
-              'width': width + 'px',
-            });
-            this.creativeSize_.height = height;
-            this.creativeSize_.width = width;
-          }
-          this.sendResizeResponse(/** SUCCESS */ true, messageType);
-        },
-        this.iframe_
+      /** MEASURER */ () => {
+        this.baseInstance_.getResource().measure();
+      },
+      /** MUTATOR */ () => {
+        if (this.iframe_) {
+          setStyles(this.iframe_, {
+            'height': height + 'px',
+            'width': width + 'px',
+          });
+          this.creativeSize_.height = height;
+          this.creativeSize_.width = width;
+        }
+        this.sendResizeResponse(/** SUCCESS */ true, messageType);
+      },
+      this.iframe_
     );
   }
 
@@ -565,15 +602,20 @@ export class SafeframeHostApi {
    * @param {boolean=} optIsCollapse Whether this is a collapse attempt.
    */
   handleSizeChange(height, width, messageType, optIsCollapse) {
-    return this.viewport_.getClientRectAsync(
-        this.baseInstance_.element).then(box => {
-      if (!optIsCollapse && width <= box.width && height <= box.height) {
-        this.resizeSafeframe(height, width, messageType);
-      } else {
-        this.resizeAmpAdAndSafeframe(height, width, messageType,
-            optIsCollapse);
-      }
-    });
+    return this.viewport_
+      .getClientRectAsync(this.baseInstance_.element)
+      .then(box => {
+        if (!optIsCollapse && width <= box.width && height <= box.height) {
+          this.resizeSafeframe(height, width, messageType);
+        } else {
+          this.resizeAmpAdAndSafeframe(
+            height,
+            width,
+            messageType,
+            optIsCollapse
+          );
+        }
+      });
   }
 
   /**
@@ -584,10 +626,12 @@ export class SafeframeHostApi {
     if (!this.isRegistered_) {
       return;
     }
-    const resizeHeight = Number(this.creativeSize_.height) +
-          (payload['resize_b'] + payload['resize_t']);
-    const resizeWidth = Number(this.creativeSize_.width) +
-          (payload['resize_r'] + payload['resize_l']);
+    const resizeHeight =
+      Number(this.creativeSize_.height) +
+      (payload['resize_b'] + payload['resize_t']);
+    const resizeWidth =
+      Number(this.creativeSize_.width) +
+      (payload['resize_r'] + payload['resize_l']);
 
     // Make sure we are actually resizing here.
     if (isNaN(resizeWidth) || isNaN(resizeHeight)) {
@@ -595,8 +639,12 @@ export class SafeframeHostApi {
       return;
     }
 
-    this.resizeAmpAdAndSafeframe(resizeHeight, resizeWidth,
-        SERVICE.RESIZE_RESPONSE, true);
+    this.resizeAmpAdAndSafeframe(
+      resizeHeight,
+      resizeWidth,
+      SERVICE.RESIZE_RESPONSE,
+      true
+    );
   }
 
   /**
@@ -607,20 +655,26 @@ export class SafeframeHostApi {
     if (!this.iframe_) {
       return;
     }
-    this.viewport_.getClientRectAsync(this.iframe_).then(iframeBox => {
-      this.checkStillCurrent_();
-      const formattedGeom = this.formatGeom_(iframeBox);
-      this.sendMessage_({
-        uid: this.uid_,
-        success,
-        newGeometry: formattedGeom,
-        'expand_t': this.currentGeometry_['allowedExpansion_t'],
-        'expand_b': this.currentGeometry_['allowedExpansion_b'],
-        'expand_r': this.currentGeometry_['allowedExpansion_r'],
-        'expand_l': this.currentGeometry_['allowedExpansion_l'],
-        push: true,
-      }, messageType);
-    }).catch(err => dev().error(TAG, err));
+    this.viewport_
+      .getClientRectAsync(this.iframe_)
+      .then(iframeBox => {
+        this.checkStillCurrent_();
+        const formattedGeom = this.formatGeom_(iframeBox);
+        this.sendMessage_(
+          {
+            uid: this.uid_,
+            success,
+            newGeometry: formattedGeom,
+            'expand_t': this.currentGeometry_['allowedExpansion_t'],
+            'expand_b': this.currentGeometry_['allowedExpansion_b'],
+            'expand_r': this.currentGeometry_['allowedExpansion_r'],
+            'expand_l': this.currentGeometry_['allowedExpansion_l'],
+            push: true,
+          },
+          messageType
+        );
+      })
+      .catch(err => dev().error(TAG, err));
   }
 
   /**
@@ -635,38 +689,44 @@ export class SafeframeHostApi {
   resizeAmpAdAndSafeframe(height, width, messageType, opt_isShrinking) {
     // First, attempt to resize the Amp-Ad that is the parent of the
     // safeframe
-    this.baseInstance_.attemptChangeSize(height, width).then(() => {
-      this.checkStillCurrent_();
-      // If this resize succeeded, we always resize the safeframe.
-      // resizeSafeframe also sends the resize response.
-      this.resizeSafeframe(height, width, messageType);
-    }, /** REJECT CALLBACK */ () => {
-      // If the resize initially failed, it may have been queued
-      // as a pendingChangeSize, which will cause the size change
-      // to execute upon the next user interaction. We don't want
-      // that for safeframe, so we reset it here.
-      this.baseInstance_.getResource().resetPendingChangeSize();
-      if (opt_isShrinking) {
-        // If this is a collapse or resize request, then even if resizing
-        // the amp-ad failed, still resize the iframe.
-        // resizeSafeframe also sends the resize response.
-        // Only register as collapsed if explicitly a collapse request.
-        this.resizeSafeframe(height, width, messageType);
-      } else {
-        // We were attempting to
-        // expand past the bounds of the amp-ad, and it failed. Thus,
-        // we need to send a failure message, and the safeframe is
-        // not resized.
+    this.baseInstance_
+      .attemptChangeSize(height, width)
+      .then(
+        () => {
+          this.checkStillCurrent_();
+          // If this resize succeeded, we always resize the safeframe.
+          // resizeSafeframe also sends the resize response.
+          this.resizeSafeframe(height, width, messageType);
+        },
+        /** REJECT CALLBACK */ () => {
+          // If the resize initially failed, it may have been queued
+          // as a pendingChangeSize, which will cause the size change
+          // to execute upon the next user interaction. We don't want
+          // that for safeframe, so we reset it here.
+          this.baseInstance_.getResource().resetPendingChangeSize();
+          if (opt_isShrinking) {
+            // If this is a collapse or resize request, then even if resizing
+            // the amp-ad failed, still resize the iframe.
+            // resizeSafeframe also sends the resize response.
+            // Only register as collapsed if explicitly a collapse request.
+            this.resizeSafeframe(height, width, messageType);
+          } else {
+            // We were attempting to
+            // expand past the bounds of the amp-ad, and it failed. Thus,
+            // we need to send a failure message, and the safeframe is
+            // not resized.
+            this.sendResizeResponse(false, messageType);
+          }
+        }
+      )
+      .catch(err => {
+        if (err.message == 'CANCELLED') {
+          dev().error(TAG, err);
+          return;
+        }
+        dev().error(TAG, `Resizing failed: ${err}`);
         this.sendResizeResponse(false, messageType);
-      }
-    }).catch(err => {
-      if (err.message == 'CANCELLED') {
-        dev().error(TAG, err);
-        return;
-      }
-      dev().error(TAG, `Resizing failed: ${err}`);
-      this.sendResizeResponse(false, messageType);
-    });
+      });
   }
 
   /**
@@ -679,16 +739,18 @@ export class SafeframeHostApi {
     if (!payload || !(newHeight = parseInt(payload['height'], 10))) {
       return;
     }
-    this.baseInstance_.attemptChangeHeight(newHeight)
-        .then(() => {
-          this.checkStillCurrent_();
-          this.onFluidResize_(newHeight);
-        }).catch(err => {
-          if (err.message == 'CANCELLED') {
-            dev().error(TAG, err);
-            return;
-          }
-        });
+    this.baseInstance_
+      .attemptChangeHeight(newHeight)
+      .then(() => {
+        this.checkStillCurrent_();
+        this.onFluidResize_(newHeight);
+      })
+      .catch(err => {
+        if (err.message == 'CANCELLED') {
+          dev().error(TAG, err);
+          return;
+        }
+      });
   }
 
   /**
@@ -704,9 +766,10 @@ export class SafeframeHostApi {
       setStyles(iframe, {height: `${newHeight}px`});
     }
     this.baseInstance_.fireFluidDelayedImpression();
-    this.iframe_.contentWindow./*OK*/postMessage(
-        JSON.stringify(dict({'message': 'resize-complete', 'c': this.channel})),
-        SAFEFRAME_ORIGIN);
+    this.iframe_.contentWindow./*OK*/ postMessage(
+      JSON.stringify(dict({'message': 'resize-complete', 'c': this.channel})),
+      SAFEFRAME_ORIGIN
+    );
   }
 
   /**
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
index 6d07ec7fb94a..2755fbd34e8a 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/sra-utils.js
@@ -17,9 +17,7 @@
 import {RENDERING_TYPE_HEADER, XORIGIN_MODE} from '../../amp-a4a/0.1/amp-a4a';
 import {dev, devAssert} from '../../../src/log';
 import {getEnclosingContainerTypes} from '../../../ads/google/a4a/utils';
-import {
-  isInManualExperiment,
-} from '../../../ads/google/a4a/traffic-experiments';
+import {isInManualExperiment} from '../../../ads/google/a4a/traffic-experiments';
 import {isObject} from '../../../src/types';
 import {tryResolve} from '../../../src/utils/promise';
 import {utf8Encode} from '../../../src/utils/bytes';
@@ -35,14 +33,25 @@ export const TFCD = 'tagForChildDirectedTreatment';
 
 /** @private {!Array<function(!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>):?Object<string,string>>} */
 const SRA_JOINERS = [
-  combineInventoryUnits, getCookieOptOut, getAdks, getSizes, getTfcd, isAdTest,
-  getTargetingAndExclusions, getExperimentIds, getIdentity, getForceSafeframe,
-  getPageOffsets, getContainers, getIsFluid];
+  combineInventoryUnits,
+  getCookieOptOut,
+  getAdks,
+  getSizes,
+  getTfcd,
+  isAdTest,
+  getTargetingAndExclusions,
+  getExperimentIds,
+  getIdentity,
+  getForceSafeframe,
+  getPageOffsets,
+  getContainers,
+  getIsFluid,
+];
 
 /**
-  * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
-  * @return {!Object<string, *>}
-  */
+ * @param {!Array<!./amp-ad-network-doubleclick-impl.AmpAdNetworkDoubleclickImpl>} impls
+ * @return {!Object<string, *>}
+ */
 export function constructSRABlockParameters(impls) {
   const parameters = {'output': 'ldjh', 'impl': 'fifs'};
   SRA_JOINERS.forEach(joiner => Object.assign(parameters, joiner(impls)));
@@ -95,7 +104,7 @@ export function combineInventoryUnits(impls) {
       let index = uniqueIuNames[componentNames[i]];
       if (index == undefined) {
         iuNamesOutput.push(componentNames[i]);
-        uniqueIuNames[componentNames[i]] = (index = uniqueIuNamesCount++);
+        uniqueIuNames[componentNames[i]] = index = uniqueIuNamesCount++;
       }
       encodedNames.push(index);
     }
@@ -116,8 +125,10 @@ export function combineInventoryUnits(impls) {
  */
 export function getCookieOptOut(impls) {
   return getFirstInstanceValue_(impls, impl =>
-    impl.jsonTargeting &&
-         impl.jsonTargeting['cookieOptOut'] ? {'co': '1'} : null);
+    impl.jsonTargeting && impl.jsonTargeting['cookieOptOut']
+      ? {'co': '1'}
+      : null
+  );
 }
 
 /**
@@ -127,7 +138,7 @@ export function getCookieOptOut(impls) {
  * @visibleForTesting
  */
 export function getAdks(impls) {
-  return ({'adks': impls.map(impl => devAssert(impl.adKey)).join()});
+  return {'adks': impls.map(impl => devAssert(impl.adKey)).join()};
 }
 
 /**
@@ -137,8 +148,9 @@ export function getAdks(impls) {
  * @visibleForTesting
  */
 export function getSizes(impls) {
-  return ({'prev_iu_szs': impls.map(impl =>
-    devAssert(impl.parameterSize)).join()});
+  return {
+    'prev_iu_szs': impls.map(impl => devAssert(impl.parameterSize)).join(),
+  };
 }
 
 /**
@@ -150,8 +162,10 @@ export function getSizes(impls) {
  */
 export function getTfcd(impls) {
   return getFirstInstanceValue_(impls, impl =>
-    impl.jsonTargeting && impl.jsonTargeting[TFCD] ?
-      {'tfcd': impl.jsonTargeting[TFCD]} : null);
+    impl.jsonTargeting && impl.jsonTargeting[TFCD]
+      ? {'tfcd': impl.jsonTargeting[TFCD]}
+      : null
+  );
 }
 
 /**
@@ -163,7 +177,8 @@ export function getTfcd(impls) {
  */
 export function isAdTest(impls) {
   return getFirstInstanceValue_(impls, impl =>
-    isInManualExperiment(impl.element) ? {'adtest': 'on'} : null);
+    isInManualExperiment(impl.element) ? {'adtest': 'on'} : null
+  );
 }
 
 /**
@@ -178,12 +193,18 @@ export function getTargetingAndExclusions(impls) {
   let hasScp = false;
   const scps = [];
   impls.forEach(impl => {
-    if (impl.jsonTargeting && (impl.jsonTargeting['targeting'] ||
-       impl.jsonTargeting['categoryExclusions'])) {
+    if (
+      impl.jsonTargeting &&
+      (impl.jsonTargeting['targeting'] ||
+        impl.jsonTargeting['categoryExclusions'])
+    ) {
       hasScp = true;
-      scps.push(serializeTargeting(
+      scps.push(
+        serializeTargeting(
           impl.jsonTargeting['targeting'] || null,
-          impl.jsonTargeting['categoryExclusions'] || null));
+          impl.jsonTargeting['categoryExclusions'] || null
+        )
+      );
     } else {
       scps.push('');
     }
@@ -202,10 +223,12 @@ export function getTargetingAndExclusions(impls) {
  */
 export function getExperimentIds(impls) {
   const eids = {};
-  const deid = (impls.length &&
-     /(?:#|,)deid=([\d,]+)/i.exec(impls[0].win.location.hash)) || [];
+  const deid =
+    (impls.length &&
+      /(?:#|,)deid=([\d,]+)/i.exec(impls[0].win.location.hash)) ||
+    [];
   (deid[1] || '').split(',').forEach(eid => eid && (eids[eid] = 1));
-  impls.forEach(impl => impl.experimentIds.forEach(eid => eids[eid] = 1));
+  impls.forEach(impl => impl.experimentIds.forEach(eid => (eids[eid] = 1)));
   const eidKeys = Object.keys(eids).join();
   return eidKeys ? {'eid': eidKeys} : null;
 }
@@ -302,9 +325,9 @@ export function getIsFluid(impls) {
  * @return {?string}
  */
 export function serializeTargeting(targeting, categoryExclusions) {
-  const serialized = targeting ?
-    Object.keys(targeting).map(key => serializeItem_(key, targeting[key])) :
-    [];
+  const serialized = targeting
+    ? Object.keys(targeting).map(key => serializeItem_(key, targeting[key]))
+    : [];
   if (categoryExclusions) {
     serialized.push(serializeItem_('excl_cat', categoryExclusions));
   }
@@ -318,8 +341,9 @@ export function serializeTargeting(targeting, categoryExclusions) {
  * @private
  */
 function serializeItem_(key, value) {
-  const serializedValue =
-    (Array.isArray(value) ? value : [value]).map(encodeURIComponent).join();
+  const serializedValue = (Array.isArray(value) ? value : [value])
+    .map(encodeURIComponent)
+    .join();
   return `${encodeURIComponent(key)}=${serializedValue}`;
 }
 
@@ -337,45 +361,46 @@ function serializeItem_(key, value) {
  * @param {string} sraUrl url of SRA request for error reporting
  */
 export function sraBlockCallbackHandler(
-  creative, headersObj, done, sraRequestAdUrlResolvers, sraUrl) {
+  creative,
+  headersObj,
+  done,
+  sraRequestAdUrlResolvers,
+  sraUrl
+) {
   const headerNames = Object.keys(headersObj);
-  if (headerNames.length == 1 &&
-      isObject(headersObj[headerNames[0]])) {
+  if (headerNames.length == 1 && isObject(headersObj[headerNames[0]])) {
     // TODO(keithwrightbos) - fix upstream so response does
     // not improperly place headers under key.
-    headersObj =
-      /** @type {!Object} */(headersObj)[headerNames[0]];
-    headersObj = Object.keys(headersObj).reduce(
-        (newObj, key) => {
-          newObj[key.toLowerCase()] = headersObj[key];
-          return newObj;
-        }, {});
+    headersObj = /** @type {!Object} */ (headersObj)[headerNames[0]];
+    headersObj = Object.keys(headersObj).reduce((newObj, key) => {
+      newObj[key.toLowerCase()] = headersObj[key];
+      return newObj;
+    }, {});
   }
   // Force safeframe rendering method.
-  headersObj[RENDERING_TYPE_HEADER.toLowerCase()] =
-      XORIGIN_MODE.SAFEFRAME;
+  headersObj[RENDERING_TYPE_HEADER.toLowerCase()] = XORIGIN_MODE.SAFEFRAME;
   // Construct pseudo fetch response to be passed down the A4A
   // promise chain for this block.
   const headers =
-/** @type {?Headers} */
-({
-  get: name => {
-    // TODO(keithwrightbos) - fix upstream so response writes
-    // all metadata values as strings.
-    let header = headersObj[name.toLowerCase()];
-    if (header && typeof header != 'string') {
-      header = JSON.stringify(header);
-    }
-    return header;
-  },
-  has: name => !!headersObj[name.toLowerCase()],
-});
+    /** @type {?Headers} */
+    ({
+      get: name => {
+        // TODO(keithwrightbos) - fix upstream so response writes
+        // all metadata values as strings.
+        let header = headersObj[name.toLowerCase()];
+        if (header && typeof header != 'string') {
+          header = JSON.stringify(header);
+        }
+        return header;
+      },
+      has: name => !!headersObj[name.toLowerCase()],
+    });
   const fetchResponse =
-/** @type {?Response} */
-({
-  headers,
-  arrayBuffer: () => tryResolve(() => utf8Encode(creative)),
-});
+    /** @type {?Response} */
+    ({
+      headers,
+      arrayBuffer: () => tryResolve(() => utf8Encode(creative)),
+    });
   // Pop head off of the array of resolvers as the response
   // should match the order of blocks declared in the ad url.
   // This allows the block to start rendering while the SRA
@@ -384,7 +409,11 @@ export function sraBlockCallbackHandler(
   // If done, expect array to be empty (ensures ad response
   // included data for all slots).
   if (done && sraRequestAdUrlResolvers.length) {
-    dev().warn(TAG, 'Premature end of SRA response',
-        sraRequestAdUrlResolvers.length, sraUrl);
+    dev().warn(
+      TAG,
+      'Premature end of SRA response',
+      sraRequestAdUrlResolvers.length,
+      sraUrl
+    );
   }
 }
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
index 3d0ee7a98e8e..4e39cbc5e14b 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-amp-ad-network-doubleclick-impl.js
@@ -41,9 +41,7 @@ import {CONSENT_POLICY_STATE} from '../../../../src/consent-state';
 import {Deferred} from '../../../../src/utils/promise';
 import {FriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed';
 import {Layout} from '../../../../src/layout';
-import {
-  QQID_HEADER,
-} from '../../../../ads/google/a4a/utils';
+import {QQID_HEADER} from '../../../../ads/google/a4a/utils';
 import {Services} from '../../../../src/services';
 import {createElementWithAttributes} from '../../../../src/dom';
 import {toggleExperiment} from '../../../../src/experiments';
@@ -83,8 +81,10 @@ function createImplTag(config, element, impl, env) {
   config.type = 'doubleclick';
   element = createElementWithAttributes(env.win.document, 'amp-ad', config);
   // To trigger CSS styling.
-  element.setAttribute('data-a4a-upgrade-type',
-      'amp-ad-network-doubleclick-impl');
+  element.setAttribute(
+    'data-a4a-upgrade-type',
+    'amp-ad-network-doubleclick-impl'
+  );
   // Used to test styling which is targetted at first iframe child of
   // amp-ad.
   const iframe = env.win.document.createElement('iframe');
@@ -122,8 +122,7 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       expect(impl.isValidElement()).to.be.true;
     });
     it('should NOT be valid (impl tag name)', () => {
-      element =
-          doc.createElement('amp-ad-network-doubleclick-impl');
+      element = doc.createElement('amp-ad-network-doubleclick-impl');
       element.setAttribute('type', 'doubleclick');
       element.setAttribute('data-ad-client', 'doubleclick');
       impl = new AmpAdNetworkDoubleclickImpl(element);
@@ -144,7 +143,6 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
   });
 
-
   describe('#extractSize', () => {
     let preloadExtensionSpy;
     const size = {width: 200, height: 50};
@@ -171,44 +169,50 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       impl.isFluid_ = true;
       impl.element.setAttribute('height', 'fluid');
       const resizeSpy = sandbox.spy(impl, 'attemptChangeSize');
-      expect(impl.extractSize({
-        get(name) {
-          return name == CREATIVE_SIZE_HEADER ? '0x0' : undefined;
-        },
-        has(name) {
-          return name == CREATIVE_SIZE_HEADER;
-        },
-      })).to.deep.equal({width: 0, height: 0});
+      expect(
+        impl.extractSize({
+          get(name) {
+            return name == CREATIVE_SIZE_HEADER ? '0x0' : undefined;
+          },
+          has(name) {
+            return name == CREATIVE_SIZE_HEADER;
+          },
+        })
+      ).to.deep.equal({width: 0, height: 0});
       expect(resizeSpy).to.not.be.called;
     });
 
     it('should not load amp-analytics without an analytics header', () => {
-      expect(impl.extractSize({
-        get() {
-          return undefined;
-        },
-        has() {
-          return false;
-        },
-      })).to.deep.equal(size);
+      expect(
+        impl.extractSize({
+          get() {
+            return undefined;
+          },
+          has() {
+            return false;
+          },
+        })
+      ).to.deep.equal(size);
       expect(preloadExtensionSpy.withArgs('amp-analytics')).to.not.be.called;
     });
 
     it('should load amp-analytics with an analytics header', () => {
       const url = ['https://foo.com?a=b', 'https://blah.com?lsk=sdk&sld=vj'];
-      expect(impl.extractSize({
-        get(name) {
-          switch (name) {
-            case 'X-AmpAnalytics':
-              return JSON.stringify({url});
-            default:
-              return undefined;
-          }
-        },
-        has(name) {
-          return !!this.get(name);
-        },
-      })).to.deep.equal(size);
+      expect(
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'X-AmpAnalytics':
+                return JSON.stringify({url});
+              default:
+                return undefined;
+            }
+          },
+          has(name) {
+            return !!this.get(name);
+          },
+        })
+      ).to.deep.equal(size);
       expect(preloadExtensionSpy.withArgs('amp-analytics')).to.be.called;
       // exact value of ampAnalyticsConfig covered in
       // ads/google/test/test-utils.js
@@ -216,66 +220,74 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
 
     it('should load delayed impression amp-pixels with fluid', () => {
       impl.isFluidRequest_ = true;
-      expect(impl.extractSize({
-        get(name) {
-          switch (name) {
-            case 'X-AmpImps':
-              return 'https://a.com?a=b,https://b.com?c=d';
-            default:
-              return undefined;
-          }
-        },
-        has(name) {
-          return !!this.get(name);
-        },
-      })).to.deep.equal(size);
-      expect(impl.fluidImpressionUrl_).to
-          .equal('https://a.com?a=b,https://b.com?c=d');
+      expect(
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'X-AmpImps':
+                return 'https://a.com?a=b,https://b.com?c=d';
+              default:
+                return undefined;
+            }
+          },
+          has(name) {
+            return !!this.get(name);
+          },
+        })
+      ).to.deep.equal(size);
+      expect(impl.fluidImpressionUrl_).to.equal(
+        'https://a.com?a=b,https://b.com?c=d'
+      );
+    });
+    it('should not load delayed impression amp-pixels with fluid + multi-size', () => {
+      sandbox.stub(impl, 'handleResize_');
+      impl.isFluid_ = true;
+      expect(
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'X-AmpImps':
+                return 'https://a.com?a=b,https://b.com?c=d';
+              case 'X-CreativeSize':
+                return '200x50';
+              default:
+                return undefined;
+            }
+          },
+          has(name) {
+            return !!this.get(name);
+          },
+        })
+      ).to.deep.equal(size);
+      expect(impl.fluidImpressionUrl_).to.not.be.ok;
+    });
+    it('should consume pageview state tokens when header is present', () => {
+      const removePageviewStateTokenSpy = sandbox.spy(
+        impl,
+        'removePageviewStateToken'
+      );
+      const setPageviewStateTokenSpy = sandbox.spy(
+        impl,
+        'setPageviewStateToken'
+      );
+      expect(
+        impl.extractSize({
+          get(name) {
+            switch (name) {
+              case 'amp-ff-pageview-tokens':
+                return 'DUMMY_TOKEN';
+              default:
+                return undefined;
+            }
+          },
+          has(name) {
+            return !!this.get(name);
+          },
+        })
+      ).to.deep.equal(size);
+      expect(removePageviewStateTokenSpy).to.be.calledOnce;
+      expect(setPageviewStateTokenSpy.withArgs('DUMMY_TOKEN')).to.be.calledOnce;
     });
-    it('should not load delayed impression amp-pixels with fluid + multi-size',
-        () => {
-          sandbox.stub(impl, 'handleResize_');
-          impl.isFluid_ = true;
-          expect(impl.extractSize({
-            get(name) {
-              switch (name) {
-                case 'X-AmpImps':
-                  return 'https://a.com?a=b,https://b.com?c=d';
-                case 'X-CreativeSize':
-                  return '200x50';
-                default:
-                  return undefined;
-              }
-            },
-            has(name) {
-              return !!this.get(name);
-            },
-          })).to.deep.equal(size);
-          expect(impl.fluidImpressionUrl_).to.not.be.ok;
-        });
-    it('should consume pageview state tokens when header is present',
-        () => {
-          const removePageviewStateTokenSpy =
-              sandbox.spy(impl, 'removePageviewStateToken');
-          const setPageviewStateTokenSpy =
-              sandbox.spy(impl, 'setPageviewStateToken');
-          expect(impl.extractSize({
-            get(name) {
-              switch (name) {
-                case 'amp-ff-pageview-tokens':
-                  return 'DUMMY_TOKEN';
-                default:
-                  return undefined;
-              }
-            },
-            has(name) {
-              return !!this.get(name);
-            },
-          })).to.deep.equal(size);
-          expect(removePageviewStateTokenSpy).to.be.calledOnce;
-          expect(setPageviewStateTokenSpy.withArgs('DUMMY_TOKEN')).to.be
-              .calledOnce;
-        });
 
     it('should consume sandbox header', () => {
       impl.extractSize({
@@ -327,65 +339,74 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
 
     [true, false].forEach(exp => {
-      it('injects amp analytics' +
-        (exp ? ', trigger immediate disable exp' : ''), () => {
-        impl.ampAnalyticsConfig_ = {
-          transport: {beacon: false, xhrpost: false},
-          requests: {
-            visibility1: 'https://foo.com?hello=world',
-            visibility2: 'https://bar.com?a=b',
-          },
-          triggers: {
-            continuousVisible: {
-              on: 'visible',
-              request: ['visibility1', 'visibility2'],
-              visibilitySpec: {
+      it(
+        'injects amp analytics' +
+          (exp ? ', trigger immediate disable exp' : ''),
+        () => {
+          impl.ampAnalyticsConfig_ = {
+            transport: {beacon: false, xhrpost: false},
+            requests: {
+              visibility1: 'https://foo.com?hello=world',
+              visibility2: 'https://bar.com?a=b',
+            },
+            triggers: {
+              continuousVisible: {
+                on: 'visible',
+                request: ['visibility1', 'visibility2'],
+                visibilitySpec: {
+                  selector: 'amp-ad',
+                  selectionMethod: 'closest',
+                  visiblePercentageMin: 50,
+                  continuousTimeMin: 1000,
+                },
+              },
+              continuousVisibleIniLoad: {
+                on: 'ini-load',
+                selector: 'amp-ad',
+                selectionMethod: 'closest',
+              },
+              continuousVisibleRenderStart: {
+                on: 'render-start',
                 selector: 'amp-ad',
                 selectionMethod: 'closest',
-                visiblePercentageMin: 50,
-                continuousTimeMin: 1000,
               },
             },
-            continuousVisibleIniLoad: {
-              on: 'ini-load',
-              selector: 'amp-ad',
-              selectionMethod: 'closest',
+          };
+          // To placate assertion.
+          impl.responseHeaders_ = {
+            get: function(name) {
+              if (name == 'X-QQID') {
+                return 'qqid_string';
+              }
             },
-            continuousVisibleRenderStart: {
-              on: 'render-start',
-              selector: 'amp-ad',
-              selectionMethod: 'closest',
+            has: function(name) {
+              if (name == 'X-QQID') {
+                return true;
+              }
             },
-          },
-        };
-        // To placate assertion.
-        impl.responseHeaders_ = {
-          get: function(name) {
-            if (name == 'X-QQID') {
-              return 'qqid_string';
-            }
-          },
-          has: function(name) {
-            if (name == 'X-QQID') {
-              return true;
-            }
-          },
-        };
-        if (exp) {
-          impl.postAdResponseExperimentFeatures['avr_disable_immediate'] = '1';
+          };
+          if (exp) {
+            impl.postAdResponseExperimentFeatures['avr_disable_immediate'] =
+              '1';
+          }
+          impl.onCreativeRender(false);
+          const ampAnalyticsElement = impl.element.querySelector(
+            'amp-analytics'
+          );
+          expect(ampAnalyticsElement).to.be.ok;
+          expect(ampAnalyticsElement.CONFIG).jsonEqual(
+            impl.ampAnalyticsConfig_
+          );
+          expect(ampAnalyticsElement.getAttribute('sandbox')).to.equal('true');
+          expect(ampAnalyticsElement.getAttribute('trigger')).to.equal(
+            exp ? '' : 'immediate'
+          );
+          expect(impl.ampAnalyticsElement_).to.be.ok;
+          // Exact format of amp-analytics element covered in
+          // test/unit/test-analytics.js.
+          // Just ensure extensions is loaded, and analytics element appended.
         }
-        impl.onCreativeRender(false);
-        const ampAnalyticsElement = impl.element.querySelector('amp-analytics');
-        expect(ampAnalyticsElement).to.be.ok;
-        expect(ampAnalyticsElement.CONFIG).jsonEqual(impl.ampAnalyticsConfig_);
-        expect(ampAnalyticsElement.getAttribute('sandbox')).to.equal('true');
-        expect(ampAnalyticsElement.getAttribute('trigger')).to.equal(
-            exp ? '' : 'immediate');
-        expect(impl.ampAnalyticsElement_).to.be.ok;
-        // Exact format of amp-analytics element covered in
-        // test/unit/test-analytics.js.
-        // Just ensure extensions is loaded, and analytics element appended.
-      });
+      );
     });
 
     it('should register click listener', () => {
@@ -399,23 +420,25 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
         e.preventDefault(); // Make the test not actually navigate.
         clickHandlerCalled++;
       };
-      adBody.innerHTML = '<a ' +
-          'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
-          '<button id="target"><button></div>';
+      adBody.innerHTML =
+        '<a ' +
+        'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
+        '<button id="target"><button></div>';
       const button = adBody.querySelector('#target');
       const a = adBody.querySelector('a');
       const ev1 = new Event('click', {bubbles: true});
       ev1.pageX = 10;
       ev1.pageY = 20;
-      sandbox.stub(impl, 'getResource').returns(
-          {
-            getUpgradeDelayMs: () => 1,
-          });
+      sandbox.stub(impl, 'getResource').returns({
+        getUpgradeDelayMs: () => 1,
+      });
 
       // Make sure the ad iframe (FIE) has a local URL replacements service.
       const urlReplacements = Services.urlReplacementsForDoc(element);
-      sandbox.stub(Services, 'urlReplacementsForDoc')
-          .withArgs(a).returns(urlReplacements);
+      sandbox
+        .stub(Services, 'urlReplacementsForDoc')
+        .withArgs(a)
+        .returns(urlReplacements);
 
       impl.buildCallback();
       impl.size_ = {width: 123, height: 456};
@@ -436,18 +459,18 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
         e.preventDefault(); // Make the test not actually navigate.
         clickHandlerCalled++;
       };
-      adBody.innerHTML = '<a ' +
-          'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
-          '<button id="target"><button></div>';
+      adBody.innerHTML =
+        '<a ' +
+        'href="https://f.co?CLICK_X,CLICK_Y,RANDOM">' +
+        '<button id="target"><button></div>';
       const button = adBody.querySelector('#target');
       const a = adBody.querySelector('a');
       const ev1 = new Event('click', {bubbles: true});
       ev1.pageX = 10;
       ev1.pageY = 20;
-      sandbox.stub(impl, 'getResource').returns(
-          {
-            getUpgradeDelayMs: () => 1,
-          });
+      sandbox.stub(impl, 'getResource').returns({
+        getUpgradeDelayMs: () => 1,
+      });
       impl.buildCallback();
       impl.size_ = {width: 123, height: 456};
       impl.onCreativeRender({customElementExtensions: ['amp-ad-exit']});
@@ -494,7 +517,12 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       // to fix failures when this is run after 'gulp build', without a 'dist'.
       sandbox.stub(impl, 'getPageLayoutBox').callsFake(() => {
         return {
-          top: 11, left: 12, right: 0, bottom: 0, width: 0, height: 0,
+          top: 11,
+          left: 12,
+          right: 0,
+          bottom: 0,
+          width: 0,
+          height: 0,
         };
       });
     });
@@ -594,31 +622,44 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
 
     describe('data-force-safeframe', () => {
       const fsfRegexp = /(\?|&)fsf=1(&|$)/;
-      it('handles default', () => expect(
-          new AmpAdNetworkDoubleclickImpl(element).getAdUrl())
-          .to.eventually.not.match(fsfRegexp));
+      it('handles default', () =>
+        expect(
+          new AmpAdNetworkDoubleclickImpl(element).getAdUrl()
+        ).to.eventually.not.match(fsfRegexp));
 
       it('case insensitive attribute name', () => {
         element.setAttribute('data-FORCE-SafeFraMe', '1');
         return expect(
-            new AmpAdNetworkDoubleclickImpl(element).getAdUrl())
-            .to.eventually.match(fsfRegexp);
+          new AmpAdNetworkDoubleclickImpl(element).getAdUrl()
+        ).to.eventually.match(fsfRegexp);
       });
 
       ['tRuE', 'true', 'TRUE', '1'].forEach(val => {
         it(`valid attribute: ${val}`, () => {
           element.setAttribute('data-force-safeframe', val);
-          return expect(new AmpAdNetworkDoubleclickImpl(element).getAdUrl())
-              .to.eventually.match(fsfRegexp);
+          return expect(
+            new AmpAdNetworkDoubleclickImpl(element).getAdUrl()
+          ).to.eventually.match(fsfRegexp);
         });
       });
 
-      ['aTrUe', 'trueB', '0', '01', '10', 'false', '', ' true', 'true ',
-        ' true '].forEach(val => {
+      [
+        'aTrUe',
+        'trueB',
+        '0',
+        '01',
+        '10',
+        'false',
+        '',
+        ' true',
+        'true ',
+        ' true ',
+      ].forEach(val => {
         it(`invalid attribute: ${val}`, () => {
           element.setAttribute('data-force-safeframe', val);
-          return expect(new AmpAdNetworkDoubleclickImpl(element).getAdUrl())
-              .to.eventually.not.match(fsfRegexp);
+          return expect(
+            new AmpAdNetworkDoubleclickImpl(element).getAdUrl()
+          ).to.eventually.not.match(fsfRegexp);
         });
       });
     });
@@ -640,54 +681,53 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       return impl.getAdUrl().then(url =>
         // With exp dc-use-attr-for-format off, we can't test for specific
         // numbers, but we know that the values should be numeric.
-        expect(url).to.match(/sz=[0-9]+x[0-9]+/));
+        expect(url).to.match(/sz=[0-9]+x[0-9]+/)
+      );
+    });
+    it('has correct format when width == "auto"', () => {
+      element.setAttribute('width', 'auto');
+      new AmpAd(element).upgradeCallback();
+      expect(impl.element.getAttribute('width')).to.equal('auto');
+      impl.buildCallback();
+      impl.onLayoutMeasure();
+      return impl.getAdUrl().then(url =>
+        // Ensure that "auto" doesn't appear anywhere here:
+        expect(url).to.match(/sz=[0-9]+x[0-9]+/)
+      );
+    });
+    it('has correct format with height/width override', () => {
+      element.setAttribute('data-override-width', '123');
+      element.setAttribute('data-override-height', '456');
+      new AmpAd(element).upgradeCallback();
+      impl.buildCallback();
+      impl.onLayoutMeasure();
+      return impl.getAdUrl().then(url => expect(url).to.contain('sz=123x456&'));
+    });
+    it('has correct format with height/width override and multiSize', () => {
+      element.setAttribute('data-override-width', '123');
+      element.setAttribute('data-override-height', '456');
+      element.setAttribute('data-multi-size', '1x2,3x4');
+      element.setAttribute('data-multi-size-validation', 'false');
+      new AmpAd(element).upgradeCallback();
+      impl.buildCallback();
+      impl.onLayoutMeasure();
+      return impl
+        .getAdUrl()
+        .then(url => expect(url).to.contain('sz=123x456%7C1x2%7C3x4&'));
+    });
+    it('has correct format with auto height/width and multiSize', () => {
+      element.setAttribute('data-override-width', '123');
+      element.setAttribute('data-override-height', '456');
+      element.setAttribute('data-multi-size', '1x2,3x4');
+      element.setAttribute('data-multi-size-validation', 'false');
+      new AmpAd(element).upgradeCallback();
+      impl.buildCallback();
+      impl.onLayoutMeasure();
+      return impl.getAdUrl().then(url =>
+        // Ensure that "auto" doesn't appear anywhere here:
+        expect(url).to.match(/sz=[0-9]+x[0-9]+%7C1x2%7C3x4&/)
+      );
     });
-    it('has correct format when width == "auto"',
-        () => {
-          element.setAttribute('width', 'auto');
-          new AmpAd(element).upgradeCallback();
-          expect(impl.element.getAttribute('width')).to.equal('auto');
-          impl.buildCallback();
-          impl.onLayoutMeasure();
-          return impl.getAdUrl().then(url =>
-            // Ensure that "auto" doesn't appear anywhere here:
-            expect(url).to.match(/sz=[0-9]+x[0-9]+/));
-        });
-    it('has correct format with height/width override',
-        () => {
-          element.setAttribute('data-override-width', '123');
-          element.setAttribute('data-override-height', '456');
-          new AmpAd(element).upgradeCallback();
-          impl.buildCallback();
-          impl.onLayoutMeasure();
-          return impl.getAdUrl().then(url =>
-            expect(url).to.contain('sz=123x456&'));
-        });
-    it('has correct format with height/width override and multiSize',
-        () => {
-          element.setAttribute('data-override-width', '123');
-          element.setAttribute('data-override-height', '456');
-          element.setAttribute('data-multi-size', '1x2,3x4');
-          element.setAttribute('data-multi-size-validation', 'false');
-          new AmpAd(element).upgradeCallback();
-          impl.buildCallback();
-          impl.onLayoutMeasure();
-          return impl.getAdUrl().then(url =>
-            expect(url).to.contain('sz=123x456%7C1x2%7C3x4&'));
-        });
-    it('has correct format with auto height/width and multiSize',
-        () => {
-          element.setAttribute('data-override-width', '123');
-          element.setAttribute('data-override-height', '456');
-          element.setAttribute('data-multi-size', '1x2,3x4');
-          element.setAttribute('data-multi-size-validation', 'false');
-          new AmpAd(element).upgradeCallback();
-          impl.buildCallback();
-          impl.onLayoutMeasure();
-          return impl.getAdUrl().then(url =>
-            // Ensure that "auto" doesn't appear anywhere here:
-            expect(url).to.match(/sz=[0-9]+x[0-9]+%7C1x2%7C3x4&/));
-        });
     it('has correct sz with fluid as multi-size', () => {
       element.setAttribute('width', '300');
       element.setAttribute('height', '250');
@@ -695,8 +735,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       new AmpAd(element).upgradeCallback();
       impl.buildCallback();
       impl.onLayoutMeasure();
-      return impl.getAdUrl().then(url =>
-        expect(url).to.match(/sz=300x250%7C320x50&/));
+      return impl
+        .getAdUrl()
+        .then(url => expect(url).to.match(/sz=300x250%7C320x50&/));
     });
     it('should have the correct ifi numbers - no refresh', function() {
       // When ran locally, this test tends to exceed 2000ms timeout.
@@ -718,8 +759,10 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       });
     });
     it('should have google_preview parameter', () => {
-      sandbox.stub(impl, 'getLocationQueryParameterValue')
-          .withArgs('google_preview').returns('abcdef');
+      sandbox
+        .stub(impl, 'getLocationQueryParameterValue')
+        .withArgs('google_preview')
+        .returns('abcdef');
       new AmpAd(element).upgradeCallback();
       expect(impl.getAdUrl()).to.eventually.contain('&gct=abcdef');
     });
@@ -734,8 +777,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       // We don't really care about the behavior of the following methods, so
       // we'll just stub them out so that refresh() can run without tripping any
       // unrelated errors.
-      sandbox.stub(AmpA4A.prototype, 'initiateAdRequest').callsFake(
-          () => impl.adPromise_ = Promise.resolve());
+      sandbox
+        .stub(AmpA4A.prototype, 'initiateAdRequest')
+        .callsFake(() => (impl.adPromise_ = Promise.resolve()));
       const tearDownSlotMock = sandbox.stub(AmpA4A.prototype, 'tearDownSlot');
       tearDownSlotMock.returns(undefined);
       const destroyFrameMock = sandbox.stub(AmpA4A.prototype, 'destroyFrame');
@@ -753,13 +797,15 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       return impl.getAdUrl().then(url1 => {
         expect(url1).to.not.match(/(\?|&)rc=[0-9]+(&|$)/);
         expect(url1).to.match(/(\?|&)ifi=1(&|$)/);
-        return impl.refresh(() => {}).then(() => {
-          return impl.getAdUrl().then(url2 => {
-            expect(url2).to.match(/(\?|&)rc=1(&|$)/);
-            expect(url1).to.match(/(\?|&)ifi=1(&|$)/);
-            expect(url2).to.not.match(/(\?|&)frc=1(&|$)/);
+        return impl
+          .refresh(() => {})
+          .then(() => {
+            return impl.getAdUrl().then(url2 => {
+              expect(url2).to.match(/(\?|&)rc=1(&|$)/);
+              expect(url1).to.match(/(\?|&)ifi=1(&|$)/);
+              expect(url2).to.not.match(/(\?|&)frc=1(&|$)/);
+            });
           });
-        });
       });
     });
     it('has correct frc value', () => {
@@ -770,16 +816,19 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
     it('should include identity', () => {
       // Force get identity result by overloading window variable.
-      const token = /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/({
-        token: 'abcdef', jar: 'some_jar', pucrd: 'some_pucrd',
+      const token = /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
+        token: 'abcdef',
+        jar: 'some_jar',
+        pucrd: 'some_pucrd',
       });
       impl.win['goog_identity_prom'] = Promise.resolve(token);
       impl.buildCallback();
       return impl.getAdUrl().then(url => {
-        [/(\?|&)adsid=abcdef(&|$)/,
+        [
+          /(\?|&)adsid=abcdef(&|$)/,
           /(\?|&)jar=some_jar(&|$)/,
-          /(\?|&)pucrd=some_pucrd(&|$)/].forEach(
-            regexp => expect(url).to.match(regexp));
+          /(\?|&)pucrd=some_pucrd(&|$)/,
+        ].forEach(regexp => expect(url).to.match(regexp));
       });
     });
 
@@ -812,8 +861,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       }));
 
     it('should include msz/psz if in experiment', () => {
-      sandbox.stub(impl, 'randomlySelectUnsetExperiments_').returns(
-          {flexAdSlots: '21063174'});
+      sandbox
+        .stub(impl, 'randomlySelectUnsetExperiments_')
+        .returns({flexAdSlots: '21063174'});
       impl.setPageLevelExperiments();
       return impl.getAdUrl().then(url => {
         expect(url).to.match(/(\?|&)msz=[0-9]+x-1(&|$)/);
@@ -823,8 +873,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
 
     it('should not include msz/psz if not in flexAdSlots control', () => {
-      sandbox.stub(impl, 'randomlySelectUnsetExperiments_').returns(
-          {flexAdSlots: '21063173'});
+      sandbox
+        .stub(impl, 'randomlySelectUnsetExperiments_')
+        .returns({flexAdSlots: '21063173'});
       impl.setPageLevelExperiments();
       return impl.getAdUrl().then(url => {
         expect(url).to.not.match(/(\?|&)msz=/);
@@ -851,8 +902,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
         'data-slot': '/1234/abc/def',
       });
       const impl = new AmpAdNetworkDoubleclickImpl(element);
-      expect(impl.getPageParameters(
-          CONSENT_POLICY_STATE.INSUFFICIENT).npa).to.equal(1);
+      expect(
+        impl.getPageParameters(CONSENT_POLICY_STATE.INSUFFICIENT).npa
+      ).to.equal(1);
     });
   });
 
@@ -860,10 +912,15 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     let sandbox;
 
     beforeEach(() => {
-      const setup = createImplTag({
-        width: '300',
-        height: '150',
-      }, element, impl, env);
+      const setup = createImplTag(
+        {
+          width: '300',
+          height: '150',
+        },
+        element,
+        impl,
+        env
+      );
       element = setup[0];
       impl = setup[1];
       env = setup[2];
@@ -896,28 +953,27 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       expect(impl.iframe).is.ok;
     });
 
-    it('should call #resetSlot, remove child iframe, but keep other children',
-        () => {
-          impl.ampAnalyticsConfig_ = {};
-          impl.ampAnalyticsElement_ =
-             doc.createElement('amp-analytics');
-          impl.element.appendChild(impl.ampAnalyticsElement_);
-          expect(impl.iframe).to.be.ok;
-          expect(impl.element.querySelector('iframe')).to.be.ok;
-          impl.unlayoutCallback();
-          expect(impl.element.querySelector('div[placeholder]')).to.be.ok;
-          expect(impl.element.querySelector('div[fallback]')).to.be.ok;
-          expect(impl.element.querySelector('iframe')).to.be.null;
-          expect(impl.element.querySelectorAll('amp-analytics'))
-              .to.have.lengthOf(1);
-          expect(impl.element.querySelector('amp-analytics')).to.equal(
-              impl.a4aAnalyticsElement_);
-          expect(impl.iframe).to.be.null;
-          expect(impl.ampAnalyticsConfig_).to.be.null;
-          expect(impl.ampAnalyticsElement_).to.be.null;
-          expect(impl.element.getAttribute('data-amp-slot-index'))
-              .to.equal('1');
-        });
+    it('should call #resetSlot, remove child iframe, but keep other children', () => {
+      impl.ampAnalyticsConfig_ = {};
+      impl.ampAnalyticsElement_ = doc.createElement('amp-analytics');
+      impl.element.appendChild(impl.ampAnalyticsElement_);
+      expect(impl.iframe).to.be.ok;
+      expect(impl.element.querySelector('iframe')).to.be.ok;
+      impl.unlayoutCallback();
+      expect(impl.element.querySelector('div[placeholder]')).to.be.ok;
+      expect(impl.element.querySelector('div[fallback]')).to.be.ok;
+      expect(impl.element.querySelector('iframe')).to.be.null;
+      expect(impl.element.querySelectorAll('amp-analytics')).to.have.lengthOf(
+        1
+      );
+      expect(impl.element.querySelector('amp-analytics')).to.equal(
+        impl.a4aAnalyticsElement_
+      );
+      expect(impl.iframe).to.be.null;
+      expect(impl.ampAnalyticsConfig_).to.be.null;
+      expect(impl.ampAnalyticsElement_).to.be.null;
+      expect(impl.element.getAttribute('data-amp-slot-index')).to.equal('1');
+    });
 
     it('should call #unobserve on refreshManager', () => {
       impl.refreshManager_ = {
@@ -967,9 +1023,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
      * it has an AMP creative.
      */
     function stubForAmpCreative() {
-      sandbox.stub(
-          signatureVerifierFor(impl.win), 'verify').callsFake(
-          () => Promise.resolve(VerificationStatus.OK));
+      sandbox
+        .stub(signatureVerifierFor(impl.win), 'verify')
+        .callsFake(() => Promise.resolve(VerificationStatus.OK));
     }
 
     /**
@@ -978,8 +1034,10 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
      */
     function mockSendXhrRequest(size, isAmpCreative) {
       return {
-        arrayBuffer: () => Promise.resolve(utf8Encode(
-            '<html><body>Hello, World!</body></html>')),
+        arrayBuffer: () =>
+          Promise.resolve(
+            utf8Encode('<html><body>Hello, World!</body></html>')
+          ),
         headers: {
           get(prop) {
             switch (prop) {
@@ -1042,20 +1100,24 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
         headers: {'Content-Type': 'application/jwk-set+json'},
       };
       env.expectFetch(
-          'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
-          keyResponse);
+        'https://cdn.ampproject.org/amp-ad-verifying-keyset.json',
+        keyResponse
+      );
       env.expectFetch(
-          'https://cdn.ampproject.org/amp-ad-verifying-keyset-dev.json',
-          keyResponse);
+        'https://cdn.ampproject.org/amp-ad-verifying-keyset-dev.json',
+        keyResponse
+      );
     });
 
     it('amp creative - should force iframe to match size of creative', () => {
       stubForAmpCreative();
-      sandbox.stub(impl, 'sendXhrRequest').returns(
-          mockSendXhrRequest('150x50', true));
+      sandbox
+        .stub(impl, 'sendXhrRequest')
+        .returns(mockSendXhrRequest('150x50', true));
       // Stub ini load otherwise FIE could delay test
-      sandbox./*OK*/stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
-          .returns(Promise.resolve());
+      sandbox
+        ./*OK*/ stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .returns(Promise.resolve());
       impl.buildCallback();
       impl.onLayoutMeasure();
       return impl.layoutCallback().then(() => {
@@ -1067,8 +1129,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
 
     it('should force iframe to match size of creative', () => {
-      sandbox.stub(impl, 'sendXhrRequest').returns(
-          mockSendXhrRequest('150x50', false));
+      sandbox
+        .stub(impl, 'sendXhrRequest')
+        .returns(mockSendXhrRequest('150x50', false));
       impl.buildCallback();
       impl.onLayoutMeasure();
       return impl.layoutCallback().then(() => {
@@ -1081,13 +1144,18 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
 
     it('amp creative - should force iframe to match size of slot', () => {
       stubForAmpCreative();
-      sandbox.stub(impl, 'sendXhrRequest').callsFake(
-          () => mockSendXhrRequest(undefined, true));
-      sandbox.stub(impl, 'renderViaIframeGet_').callsFake(
-          () => impl.iframeRenderHelper_({src: impl.adUrl_, name: 'name'}));
+      sandbox
+        .stub(impl, 'sendXhrRequest')
+        .callsFake(() => mockSendXhrRequest(undefined, true));
+      sandbox
+        .stub(impl, 'renderViaIframeGet_')
+        .callsFake(() =>
+          impl.iframeRenderHelper_({src: impl.adUrl_, name: 'name'})
+        );
       // Stub ini load otherwise FIE could delay test
-      sandbox./*OK*/stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
-          .returns(Promise.resolve());
+      sandbox
+        ./*OK*/ stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .returns(Promise.resolve());
       // This would normally be set in AmpA4a#buildCallback.
       impl.creativeSize_ = {width: 200, height: 50};
       impl.buildCallback();
@@ -1101,10 +1169,14 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
     });
 
     it('should force iframe to match size of slot', () => {
-      sandbox.stub(impl, 'sendXhrRequest').callsFake(
-          () => mockSendXhrRequest(undefined, false));
-      sandbox.stub(impl, 'renderViaIframeGet_').callsFake(
-          () => impl.iframeRenderHelper_({src: impl.adUrl_, name: 'name'}));
+      sandbox
+        .stub(impl, 'sendXhrRequest')
+        .callsFake(() => mockSendXhrRequest(undefined, false));
+      sandbox
+        .stub(impl, 'renderViaIframeGet_')
+        .callsFake(() =>
+          impl.iframeRenderHelper_({src: impl.adUrl_, name: 'name'})
+        );
       // This would normally be set in AmpA4a#buildCallback.
       impl.creativeSize_ = {width: 200, height: 50};
       impl.buildCallback();
@@ -1119,12 +1191,14 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
 
     it('should issue an ad request even with bad multi-size data attr', () => {
       stubForAmpCreative();
-      sandbox.stub(impl, 'sendXhrRequest').callsFake(
-          () => mockSendXhrRequest(undefined, true));
+      sandbox
+        .stub(impl, 'sendXhrRequest')
+        .callsFake(() => mockSendXhrRequest(undefined, true));
       impl.element.setAttribute('data-multi-size', '201x50');
       // Stub ini load otherwise FIE could delay test
-      sandbox./*OK*/stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
-          .returns(Promise.resolve());
+      sandbox
+        ./*OK*/ stub(FriendlyIframeEmbed.prototype, 'whenIniLoaded')
+        .returns(Promise.resolve());
       impl.buildCallback();
       impl.onLayoutMeasure();
       return impl.layoutCallback().then(() => {
@@ -1173,8 +1247,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
             expect(gutData.events[0].slotid).to.equal(slotId + '_0');
             expect(gutData.events[0].messageId).to.equal(4);
 
-            expect(gutData.slots[0].contentUrl).to
-                .equal('http://www.getmesomeads.com');
+            expect(gutData.slots[0].contentUrl).to.equal(
+              'http://www.getmesomeads.com'
+            );
             expect(gutData.slots[0].id).to.equal(slotId + '_0');
             expect(gutData.slots[0].leafAdUnitName).to.equal(slotId);
             expect(gutData.slots[0].domId).to.equal(slotId + '_0');
@@ -1185,8 +1260,9 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
       };
       const postMessageSpy = sandbox.spy(env.win.opener, 'postMessage');
       impl.win = env.win;
-      return impl.postTroubleshootMessage().then(() =>
-        expect(postMessageSpy).to.be.calledOnce);
+      return impl
+        .postTroubleshootMessage()
+        .then(() => expect(postMessageSpy).to.be.calledOnce);
     });
 
     it('should not emit post message', () => {
@@ -1221,375 +1297,431 @@ describes.realWin('amp-ad-network-doubleclick-impl', realWinConfig, env => {
 
     it('should return safeframe if fluid', () => {
       impl.isLayoutSupported(Layout.FLUID);
-      expect(impl.getNonAmpCreativeRenderingMethod()).to
-          .equal(XORIGIN_MODE.SAFEFRAME);
+      expect(impl.getNonAmpCreativeRenderingMethod()).to.equal(
+        XORIGIN_MODE.SAFEFRAME
+      );
     });
 
     it('should return safeframe if force safeframe', () => {
       element.setAttribute('data-force-safeframe', '1');
-      expect(new AmpAdNetworkDoubleclickImpl(element)
-          .getNonAmpCreativeRenderingMethod()).to.equal(XORIGIN_MODE.SAFEFRAME);
+      expect(
+        new AmpAdNetworkDoubleclickImpl(
+          element
+        ).getNonAmpCreativeRenderingMethod()
+      ).to.equal(XORIGIN_MODE.SAFEFRAME);
     });
   });
 });
 
+describes.realWin(
+  'additional amp-ad-network-doubleclick-impl',
+  realWinConfigAmpAd,
+  env => {
+    let doc;
+    let impl;
+    let element;
 
-describes.realWin('additional amp-ad-network-doubleclick-impl',
-    realWinConfigAmpAd, env => {
-      let doc;
-      let impl;
-      let element;
+    beforeEach(() => {
+      doc = env.win.document;
+      element = createElementWithAttributes(doc, 'amp-ad', {
+        'width': '200',
+        'height': '50',
+        'type': 'doubleclick',
+      });
+      doc.body.appendChild(element);
+      impl = new AmpAdNetworkDoubleclickImpl(element);
+    });
 
+    describe('#onNetworkFailure', () => {
       beforeEach(() => {
-        doc = env.win.document;
         element = createElementWithAttributes(doc, 'amp-ad', {
           'width': '200',
           'height': '50',
           'type': 'doubleclick',
         });
-        doc.body.appendChild(element);
         impl = new AmpAdNetworkDoubleclickImpl(element);
       });
 
-      describe('#onNetworkFailure', () => {
-
-        beforeEach(() => {
-          element = createElementWithAttributes(doc, 'amp-ad', {
-            'width': '200',
-            'height': '50',
-            'type': 'doubleclick',
-          });
-          impl = new AmpAdNetworkDoubleclickImpl(element);
-        });
-
-        it('should append error parameter', () => {
-          const TEST_URL = 'https://somenetwork.com/foo?hello=world&a=b';
-          expect(impl.onNetworkFailure(new Error('xhr failure'), TEST_URL))
-              .to.jsonEqual({adUrl: TEST_URL + '&aet=n'});
-        });
+      it('should append error parameter', () => {
+        const TEST_URL = 'https://somenetwork.com/foo?hello=world&a=b';
+        expect(
+          impl.onNetworkFailure(new Error('xhr failure'), TEST_URL)
+        ).to.jsonEqual({adUrl: TEST_URL + '&aet=n'});
       });
+    });
 
-      describe('centering', () => {
-        const size = {width: '300px', height: '150px'};
-
-        /**
-         * @param {!Element} iframe
-         * @param {{width: number, height: number}} expectedSize
-         */
-        function verifyCss(iframe, expectedSize) {
-          expect(iframe).to.be.ok;
-          const style = env.win.getComputedStyle(iframe);
-          expect(style.top).to.equal('50%');
-          expect(style.left).to.equal('50%');
-          expect(style.width).to.equal(expectedSize.width);
-          expect(style.height).to.equal(expectedSize.height);
-          // We don't know the exact values by which the frame will be
-          // translated, as this can vary depending on whether we use the
-          // height/width attributes, or the actual size of the frame. To make
-          // this less of a hassle, we'll just match against regexp.
-          expect(style.transform).to.match(new RegExp(
-              'matrix\\(1, 0, 0, 1, -[0-9]+, -[0-9]+\\)'));
-        }
-
-        afterEach(() => env.win.document.body.removeChild(impl.element));
+    describe('centering', () => {
+      const size = {width: '300px', height: '150px'};
 
-        it('centers iframe in slot when height && width', () => {
-          const setup = createImplTag({
+      /**
+       * @param {!Element} iframe
+       * @param {{width: number, height: number}} expectedSize
+       */
+      function verifyCss(iframe, expectedSize) {
+        expect(iframe).to.be.ok;
+        const style = env.win.getComputedStyle(iframe);
+        expect(style.top).to.equal('50%');
+        expect(style.left).to.equal('50%');
+        expect(style.width).to.equal(expectedSize.width);
+        expect(style.height).to.equal(expectedSize.height);
+        // We don't know the exact values by which the frame will be
+        // translated, as this can vary depending on whether we use the
+        // height/width attributes, or the actual size of the frame. To make
+        // this less of a hassle, we'll just match against regexp.
+        expect(style.transform).to.match(
+          new RegExp('matrix\\(1, 0, 0, 1, -[0-9]+, -[0-9]+\\)')
+        );
+      }
+
+      afterEach(() => env.win.document.body.removeChild(impl.element));
+
+      it('centers iframe in slot when height && width', () => {
+        const setup = createImplTag(
+          {
             width: '300',
             height: '150',
-          }, element, impl, env);
-          element = setup[0];
-          impl = setup[1];
-          env = setup[2];
-          expect(impl.element.getAttribute('width')).to.equal('300');
-          expect(impl.element.getAttribute('height')).to.equal('150');
-          verifyCss(impl.iframe, size);
-        });
-        it('centers iframe in slot when !height && !width', () => {
-          const setup = createImplTag({
+          },
+          element,
+          impl,
+          env
+        );
+        element = setup[0];
+        impl = setup[1];
+        env = setup[2];
+        expect(impl.element.getAttribute('width')).to.equal('300');
+        expect(impl.element.getAttribute('height')).to.equal('150');
+        verifyCss(impl.iframe, size);
+      });
+      it('centers iframe in slot when !height && !width', () => {
+        const setup = createImplTag(
+          {
             layout: 'fixed',
-          }, element, impl, env);
-          element = setup[0];
-          impl = setup[1];
-          env = setup[2];
-          expect(impl.element.getAttribute('width')).to.be.null;
-          expect(impl.element.getAttribute('height')).to.be.null;
-          verifyCss(impl.iframe, size);
-        });
-        it('centers iframe in slot when !height && width', () => {
-          const setup = createImplTag({
+          },
+          element,
+          impl,
+          env
+        );
+        element = setup[0];
+        impl = setup[1];
+        env = setup[2];
+        expect(impl.element.getAttribute('width')).to.be.null;
+        expect(impl.element.getAttribute('height')).to.be.null;
+        verifyCss(impl.iframe, size);
+      });
+      it('centers iframe in slot when !height && width', () => {
+        const setup = createImplTag(
+          {
             width: '300',
             layout: 'fixed',
-          }, element, impl, env);
-          element = setup[0];
-          impl = setup[1];
-          env = setup[2];
-          expect(impl.element.getAttribute('width')).to.equal('300');
-          expect(impl.element.getAttribute('height')).to.be.null;
-          verifyCss(impl.iframe, size);
-        });
-        it('centers iframe in slot when height && !width', () => {
-          const setup = createImplTag({
+          },
+          element,
+          impl,
+          env
+        );
+        element = setup[0];
+        impl = setup[1];
+        env = setup[2];
+        expect(impl.element.getAttribute('width')).to.equal('300');
+        expect(impl.element.getAttribute('height')).to.be.null;
+        verifyCss(impl.iframe, size);
+      });
+      it('centers iframe in slot when height && !width', () => {
+        const setup = createImplTag(
+          {
             height: '150',
             layout: 'fixed',
-          }, element, impl, env);
-          element = setup[0];
-          impl = setup[1];
-          env = setup[2];
-          expect(impl.element.getAttribute('width')).to.be.null;
-          expect(impl.element.getAttribute('height')).to.equal('150');
-          verifyCss(impl.iframe, size);
-        });
+          },
+          element,
+          impl,
+          env
+        );
+        element = setup[0];
+        impl = setup[1];
+        env = setup[2];
+        expect(impl.element.getAttribute('width')).to.be.null;
+        expect(impl.element.getAttribute('height')).to.equal('150');
+        verifyCss(impl.iframe, size);
       });
+    });
 
-      describe('#fireDelayedImpressions', () => {
-        let isSecureStub;
-        beforeEach(() => {
-          element = createElementWithAttributes(doc, 'amp-ad', {
-            'width': '200',
-            'height': '50',
-            'type': 'doubleclick',
-          });
-          impl = new AmpAdNetworkDoubleclickImpl(element);
-          impl.getAmpDoc = () => {};
-          isSecureStub = sandbox.stub();
-          sandbox.stub(Services, 'urlForDoc').returns({isSecure: isSecureStub});
-        });
-
-        it('should handle null impressions', () => {
-          impl.fireDelayedImpressions(null);
-          expect(env.win.document.querySelectorAll('amp-pixel').length)
-              .to.equal(0);
+    describe('#fireDelayedImpressions', () => {
+      let isSecureStub;
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'doubleclick',
         });
+        impl = new AmpAdNetworkDoubleclickImpl(element);
+        impl.getAmpDoc = () => {};
+        isSecureStub = sandbox.stub();
+        sandbox.stub(Services, 'urlForDoc').returns({isSecure: isSecureStub});
+      });
 
-        it('should not include non-https', () => {
-          const urls = ['http://f.com?a=b', 'https://b.net?c=d'];
-          isSecureStub.withArgs(urls[0]).returns(false);
-          isSecureStub.withArgs(urls[1]).returns(true);
-          impl.fireDelayedImpressions(urls.join());
-          expect(env.win.document.querySelectorAll('amp-pixel').length)
-              .to.equal(1);
-          expect(env.win.document.querySelector(
-              `amp-pixel[src="${urls[1]}"][referrerpolicy=""]`))
-              .to.be.ok;
-        });
+      it('should handle null impressions', () => {
+        impl.fireDelayedImpressions(null);
+        expect(env.win.document.querySelectorAll('amp-pixel').length).to.equal(
+          0
+        );
+      });
 
-        it('should append amp-pixel w/o scrubReferer', () => {
-          const urls = ['https://f.com?a=b', 'https://b.net?c=d'];
-          isSecureStub.returns(true);
-          impl.fireDelayedImpressions(urls.join());
-          urls.forEach(url => expect(env.win.document.querySelector(
-              `amp-pixel[src="${url}"][referrerpolicy=""]`)).to.be.ok);
-        });
+      it('should not include non-https', () => {
+        const urls = ['http://f.com?a=b', 'https://b.net?c=d'];
+        isSecureStub.withArgs(urls[0]).returns(false);
+        isSecureStub.withArgs(urls[1]).returns(true);
+        impl.fireDelayedImpressions(urls.join());
+        expect(env.win.document.querySelectorAll('amp-pixel').length).to.equal(
+          1
+        );
+        expect(
+          env.win.document.querySelector(
+            `amp-pixel[src="${urls[1]}"][referrerpolicy=""]`
+          )
+        ).to.be.ok;
+      });
 
-        it('should append amp-pixel with scrubReferer', () => {
-          const urls = ['https://f.com?a=b', 'https://b.net?c=d'];
-          isSecureStub.returns(true);
-          impl.fireDelayedImpressions(urls.join(), true);
-          urls.forEach(url => expect(env.win.document.querySelector(
-              `amp-pixel[src="${url}"][referrerpolicy="no-referrer"]`))
-              .to.be.ok);
-        });
+      it('should append amp-pixel w/o scrubReferer', () => {
+        const urls = ['https://f.com?a=b', 'https://b.net?c=d'];
+        isSecureStub.returns(true);
+        impl.fireDelayedImpressions(urls.join());
+        urls.forEach(
+          url =>
+            expect(
+              env.win.document.querySelector(
+                `amp-pixel[src="${url}"][referrerpolicy=""]`
+              )
+            ).to.be.ok
+        );
       });
 
-      describe('#idleRenderOutsideViewport', () => {
-        beforeEach(() => {
-          element = createElementWithAttributes(doc, 'amp-ad', {
-            'width': '200',
-            'height': '50',
-            'type': 'doubleclick',
-          });
-          impl = new AmpAdNetworkDoubleclickImpl(element);
-          sandbox.stub(impl, 'getResource').returns(
-              {whenWithinViewport: () => Promise.resolve()});
-        });
+      it('should append amp-pixel with scrubReferer', () => {
+        const urls = ['https://f.com?a=b', 'https://b.net?c=d'];
+        isSecureStub.returns(true);
+        impl.fireDelayedImpressions(urls.join(), true);
+        urls.forEach(
+          url =>
+            expect(
+              env.win.document.querySelector(
+                `amp-pixel[src="${url}"][referrerpolicy="no-referrer"]`
+              )
+            ).to.be.ok
+        );
+      });
+    });
 
-        it('should use experiment value', () => {
-          impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
-          expect(impl.idleRenderOutsideViewport()).to.equal(4);
-          expect(impl.isIdleRender_).to.be.true;
+    describe('#idleRenderOutsideViewport', () => {
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'doubleclick',
         });
+        impl = new AmpAdNetworkDoubleclickImpl(element);
+        sandbox
+          .stub(impl, 'getResource')
+          .returns({whenWithinViewport: () => Promise.resolve()});
+      });
 
-        it('should return false if using loading strategy', () => {
-          impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
-          impl.element.setAttribute('data-loading-strategy',
-              'prefer-viewability-over-views');
-          expect(impl.idleRenderOutsideViewport()).to.be.false;
-          expect(impl.isIdleRender_).to.be.false;
-        });
+      it('should use experiment value', () => {
+        impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
+        expect(impl.idleRenderOutsideViewport()).to.equal(4);
+        expect(impl.isIdleRender_).to.be.true;
+      });
 
-        it('should return false if invalid experiment value', () => {
-          impl.postAdResponseExperimentFeatures['render-idle-vp'] = 'abc';
-          expect(impl.idleRenderOutsideViewport()).to.be.false;
-        });
+      it('should return false if using loading strategy', () => {
+        impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
+        impl.element.setAttribute(
+          'data-loading-strategy',
+          'prefer-viewability-over-views'
+        );
+        expect(impl.idleRenderOutsideViewport()).to.be.false;
+        expect(impl.isIdleRender_).to.be.false;
+      });
 
-        it('should return 12 if no experiment header', () => {
-          expect(impl.idleRenderOutsideViewport()).to.equal(12);
-        });
+      it('should return false if invalid experiment value', () => {
+        impl.postAdResponseExperimentFeatures['render-idle-vp'] = 'abc';
+        expect(impl.idleRenderOutsideViewport()).to.be.false;
+      });
 
-        it('should return renderOutsideViewport boolean', () => {
-          sandbox.stub(impl, 'renderOutsideViewport').returns(false);
-          expect(impl.idleRenderOutsideViewport()).to.be.false;
-        });
+      it('should return 12 if no experiment header', () => {
+        expect(impl.idleRenderOutsideViewport()).to.equal(12);
       });
 
-      describe('idle renderNonAmpCreative', () => {
+      it('should return renderOutsideViewport boolean', () => {
+        sandbox.stub(impl, 'renderOutsideViewport').returns(false);
+        expect(impl.idleRenderOutsideViewport()).to.be.false;
+      });
+    });
 
-        beforeEach(() => {
-          element = createElementWithAttributes(doc, 'amp-ad', {
-            'width': '200',
-            'height': '50',
-            'type': 'doubleclick',
-          });
-          impl = new AmpAdNetworkDoubleclickImpl(element);
-          impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
-          impl.postAdResponseExperimentFeatures['render-idle-throttle'] =
-              'true';
-          sandbox.stub(AmpA4A.prototype, 'renderNonAmpCreative')
-              .returns(Promise.resolve());
+    describe('idle renderNonAmpCreative', () => {
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'doubleclick',
         });
+        impl = new AmpAdNetworkDoubleclickImpl(element);
+        impl.postAdResponseExperimentFeatures['render-idle-vp'] = '4';
+        impl.postAdResponseExperimentFeatures['render-idle-throttle'] = 'true';
+        sandbox
+          .stub(AmpA4A.prototype, 'renderNonAmpCreative')
+          .returns(Promise.resolve());
+      });
 
-        // TODO(jeffkaufman, #13422): this test was silently failing
-        it.skip('should throttle if idle render and non-AMP creative', () => {
-          impl.win['3pla'] = 1;
-          const startTime = Date.now();
-          return impl.renderNonAmpCreative().then(() => {
-            expect(Date.now() - startTime).to.be.at.least(1000);
-          });
+      // TODO(jeffkaufman, #13422): this test was silently failing
+      it.skip('should throttle if idle render and non-AMP creative', () => {
+        impl.win['3pla'] = 1;
+        const startTime = Date.now();
+        return impl.renderNonAmpCreative().then(() => {
+          expect(Date.now() - startTime).to.be.at.least(1000);
         });
+      });
 
-        it('should NOT throttle if idle experiment not enabled', () => {
-          impl.win['3pla'] = 1;
-          delete impl.postAdResponseExperimentFeatures['render-idle-vp'];
-          const startTime = Date.now();
-          return impl.renderNonAmpCreative().then(() => {
-            expect(Date.now() - startTime).to.be.at.most(50);
-          });
+      it('should NOT throttle if idle experiment not enabled', () => {
+        impl.win['3pla'] = 1;
+        delete impl.postAdResponseExperimentFeatures['render-idle-vp'];
+        const startTime = Date.now();
+        return impl.renderNonAmpCreative().then(() => {
+          expect(Date.now() - startTime).to.be.at.most(50);
         });
+      });
 
-        it('should NOT throttle if experiment throttle not enabled', () => {
-          impl.win['3pla'] = 1;
-          const startTime = Date.now();
-          return impl.renderNonAmpCreative().then(() => {
-            expect(Date.now() - startTime).to.be.at.most(50);
-          });
+      it('should NOT throttle if experiment throttle not enabled', () => {
+        impl.win['3pla'] = 1;
+        const startTime = Date.now();
+        return impl.renderNonAmpCreative().then(() => {
+          expect(Date.now() - startTime).to.be.at.most(50);
         });
+      });
 
-        it('should NOT throttle if idle render and no previous', () => {
-          impl.win['3pla'] = 0;
-          const startTime = Date.now();
-          return impl.renderNonAmpCreative().then(() => {
-            expect(Date.now() - startTime).to.be.at.most(50);
-          });
+      it('should NOT throttle if idle render and no previous', () => {
+        impl.win['3pla'] = 0;
+        const startTime = Date.now();
+        return impl.renderNonAmpCreative().then(() => {
+          expect(Date.now() - startTime).to.be.at.most(50);
         });
       });
+    });
 
-      describe('#preconnect', () => {
-        beforeEach(() => {
-          element = createElementWithAttributes(doc, 'amp-ad', {
-            'width': '200',
-            'height': '50',
-            'type': 'doubleclick',
-          });
-          doc.body.appendChild(element);
-          impl = new AmpAdNetworkDoubleclickImpl(element);
+    describe('#preconnect', () => {
+      beforeEach(() => {
+        element = createElementWithAttributes(doc, 'amp-ad', {
+          'width': '200',
+          'height': '50',
+          'type': 'doubleclick',
         });
+        doc.body.appendChild(element);
+        impl = new AmpAdNetworkDoubleclickImpl(element);
       });
+    });
 
-      describe('#getConsentPolicy', () => {
-        it('should return null', () => expect(
-            AmpAdNetworkDoubleclickImpl.prototype.getConsentPolicy())
-            .to.be.null);
+    describe('#getConsentPolicy', () => {
+      it('should return null', () =>
+        expect(AmpAdNetworkDoubleclickImpl.prototype.getConsentPolicy()).to.be
+          .null);
+    });
+
+    describe('#setPageLevelExperiments', () => {
+      let randomlySelectUnsetExperimentsStub;
+      let extractUrlExperimentIdStub;
+      beforeEach(() => {
+        randomlySelectUnsetExperimentsStub = sandbox.stub(
+          impl,
+          'randomlySelectUnsetExperiments_'
+        );
+        extractUrlExperimentIdStub = sandbox.stub(
+          impl,
+          'extractUrlExperimentId_'
+        );
+        sandbox.stub(AmpA4A.prototype, 'buildCallback').callsFake(() => {});
+        sandbox.stub(impl, 'getAmpDoc').returns({});
+        sandbox
+          .stub(Services, 'viewerForDoc')
+          .returns({whenFirstVisible: () => new Deferred().promise});
+      });
+      afterEach(() => {
+        toggleExperiment(env.win, 'envDfpInvOrigDeprecated', false);
       });
 
-      describe('#setPageLevelExperiments', () => {
-        let randomlySelectUnsetExperimentsStub;
-        let extractUrlExperimentIdStub;
-        beforeEach(() => {
-          randomlySelectUnsetExperimentsStub =
-            sandbox.stub(impl, 'randomlySelectUnsetExperiments_');
-          extractUrlExperimentIdStub =
-            sandbox.stub(impl, 'extractUrlExperimentId_');
-          sandbox.stub(AmpA4A.prototype, 'buildCallback').callsFake(() => {});
-          sandbox.stub(impl, 'getAmpDoc').returns({});
-          sandbox.stub(Services, 'viewerForDoc').returns(
-              {whenFirstVisible: () => new Deferred().promise});
-        });
-        afterEach(() => {
-          toggleExperiment(env.win, 'envDfpInvOrigDeprecated', false);
-        });
+      it('should set invalid origin fix experiment if on canonical', () => {
+        randomlySelectUnsetExperimentsStub.returns({});
+        impl.setPageLevelExperiments();
+        expect(impl.experimentIds.includes('21060933')).to.be.true;
+      });
 
-        it('should set invalid origin fix experiment if on canonical', () => {
-          randomlySelectUnsetExperimentsStub.returns({});
-          impl.setPageLevelExperiments();
-          expect(impl.experimentIds.includes('21060933')).to.be.true;
-        });
+      it('should not set invalid origin fix if exp on', () => {
+        toggleExperiment(env.win, 'envDfpInvOrigDeprecated', true);
+        randomlySelectUnsetExperimentsStub.returns({});
+        impl.setPageLevelExperiments();
+        expect(impl.experimentIds.includes('21060933')).to.be.true;
+      });
 
-        it('should not set invalid origin fix if exp on', () => {
-          toggleExperiment(env.win, 'envDfpInvOrigDeprecated', true);
-          randomlySelectUnsetExperimentsStub.returns({});
-          impl.setPageLevelExperiments();
-          expect(impl.experimentIds.includes('21060933')).to.be.true;
+      it('should select SRA experiments', () => {
+        randomlySelectUnsetExperimentsStub.returns({
+          doubleclickSraExp: '117152667',
         });
+        extractUrlExperimentIdStub.returns(undefined);
+        impl.buildCallback();
+        expect(impl.experimentIds.includes('117152667')).to.be.true;
+        expect(impl.useSra).to.be.true;
+      });
 
-        it('should select SRA experiments', () => {
-          randomlySelectUnsetExperimentsStub.returns(
-              {doubleclickSraExp: '117152667'});
-          extractUrlExperimentIdStub.returns(undefined);
-          impl.buildCallback();
-          expect(impl.experimentIds.includes('117152667')).to.be.true;
-          expect(impl.useSra).to.be.true;
-        });
+      it('should force-select SRA experiment from URL experiment ID', () => {
+        randomlySelectUnsetExperimentsStub.returns({});
+        impl.setPageLevelExperiments('8');
+        expect(impl.experimentIds.includes('117152667')).to.be.true;
+      });
 
-        it('should force-select SRA experiment from URL experiment ID', () => {
+      describe('should properly limit SRA traffic', () => {
+        let experimentInfoMap;
+        beforeEach(() => {
           randomlySelectUnsetExperimentsStub.returns({});
-          impl.setPageLevelExperiments('8');
-          expect(impl.experimentIds.includes('117152667')).to.be.true;
+          impl.setPageLevelExperiments();
+          // args format is call array followed by parameter array so expect
+          // first call, first param.
+          experimentInfoMap =
+            randomlySelectUnsetExperimentsStub.args[0][0]['doubleclickSraExp'];
+          expect(experimentInfoMap).to.be.ok;
+          expect(impl.useSra).to.be.false;
         });
 
-        describe('should properly limit SRA traffic', () => {
-          let experimentInfoMap;
-          beforeEach(() => {
-            randomlySelectUnsetExperimentsStub.returns({});
-            impl.setPageLevelExperiments();
-            // args format is call array followed by parameter array so expect
-            // first call, first param.
-            experimentInfoMap = randomlySelectUnsetExperimentsStub
-                .args[0][0]['doubleclickSraExp'];
-            expect(experimentInfoMap).to.be.ok;
-            expect(impl.useSra).to.be.false;
-          });
-
-          it('should allow by default', () =>
-            expect(experimentInfoMap.isTrafficEligible()).to.be.true);
+        it('should allow by default', () =>
+          expect(experimentInfoMap.isTrafficEligible()).to.be.true);
 
-          it('should not allow if refresh meta', () => {
-            doc.head.appendChild(createElementWithAttributes(
-                doc, 'meta', {name: 'amp-ad-enable-refresh'}));
-            expect(experimentInfoMap.isTrafficEligible()).to.be.false;
-          });
+        it('should not allow if refresh meta', () => {
+          doc.head.appendChild(
+            createElementWithAttributes(doc, 'meta', {
+              name: 'amp-ad-enable-refresh',
+            })
+          );
+          expect(experimentInfoMap.isTrafficEligible()).to.be.false;
+        });
 
-          it('should not allow if sra meta', () => {
-            doc.head.appendChild(createElementWithAttributes(
-                doc, 'meta', {name: 'amp-ad-doubleclick-sra'}));
-            expect(experimentInfoMap.isTrafficEligible()).to.be.false;
-          });
+        it('should not allow if sra meta', () => {
+          doc.head.appendChild(
+            createElementWithAttributes(doc, 'meta', {
+              name: 'amp-ad-doubleclick-sra',
+            })
+          );
+          expect(experimentInfoMap.isTrafficEligible()).to.be.false;
+        });
 
-          it('should not allow if block level refresh', () => {
-            impl.element.setAttribute('data-enable-refresh', '');
-            expect(experimentInfoMap.isTrafficEligible()).to.be.false;
-          });
+        it('should not allow if block level refresh', () => {
+          impl.element.setAttribute('data-enable-refresh', '');
+          expect(experimentInfoMap.isTrafficEligible()).to.be.false;
         });
       });
+    });
 
-      describe('#getPageviewStateTokensForAdRequest', () => {
-
-        beforeEach(() => {
-          resetTokensToInstancesMap();
-        });
+    describe('#getPageviewStateTokensForAdRequest', () => {
+      beforeEach(() => {
+        resetTokensToInstancesMap();
+      });
 
-        it('should return the tokens associated with instances that are not ' +
-         'passed to it as an argument', () => {
+      it(
+        'should return the tokens associated with instances that are not ' +
+          'passed to it as an argument',
+        () => {
           const element1 = doc.createElement('amp-ad');
           element1.setAttribute('type', 'doubleclick');
           element1.setAttribute('data-ad-client', 'doubleclick');
@@ -1601,69 +1733,82 @@ describes.realWin('additional amp-ad-network-doubleclick-impl',
           const impl2 = new AmpAdNetworkDoubleclickImpl(element2);
           impl2.setPageviewStateToken('DUMMY_TOKEN_2');
           const instances = [impl1];
-          expect(getPageviewStateTokensForAdRequest(instances)).to.deep.equal(
-              ['DUMMY_TOKEN_2']);
-        });
-      });
+          expect(getPageviewStateTokensForAdRequest(instances)).to.deep.equal([
+            'DUMMY_TOKEN_2',
+          ]);
+        }
+      );
+    });
 
-      describe('#checksumVerification', () => {
-        it('should call super if missing Algorithm header', () => {
-          sandbox.stub(AmpA4A.prototype, 'maybeValidateAmpCreative')
-              .returns(Promise.resolve('foo'));
-          const creative = '<html><body>This is some text</body></html>';
-          const mockHeaders = {
-            get: key => {
-              switch (key) {
-                case 'AMP-Verification-Checksum-Algorithm':
-                  return 'unknown';
-                case 'AMP-Verification-Checksum':
-                  return '2569076912';
-                default:
-                  throw new Error(`unexpected header: ${key}`);
-              }
-            },
-          };
-          expect(AmpAdNetworkDoubleclickImpl.prototype.maybeValidateAmpCreative(
-              utf8Encode(creative), mockHeaders)).to.eventually.equal('foo');
-        });
+    describe('#checksumVerification', () => {
+      it('should call super if missing Algorithm header', () => {
+        sandbox
+          .stub(AmpA4A.prototype, 'maybeValidateAmpCreative')
+          .returns(Promise.resolve('foo'));
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'unknown';
+              case 'AMP-Verification-Checksum':
+                return '2569076912';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        expect(
+          AmpAdNetworkDoubleclickImpl.prototype.maybeValidateAmpCreative(
+            utf8Encode(creative),
+            mockHeaders
+          )
+        ).to.eventually.equal('foo');
+      });
 
-        it('should properly validate checksum', () => {
-          const creative = '<html><body>This is some text</body></html>';
-          const mockHeaders = {
-            get: key => {
-              switch (key) {
-                case 'AMP-Verification-Checksum-Algorithm':
-                  return 'djb2a-32';
-                case 'AMP-Verification-Checksum':
-                  return '2569076912';
-                default:
-                  throw new Error(`unexpected header: ${key}`);
-              }
-            },
-          };
-          return AmpAdNetworkDoubleclickImpl.prototype.maybeValidateAmpCreative(
-              utf8Encode(creative), mockHeaders).then(result => {
+      it('should properly validate checksum', () => {
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'djb2a-32';
+              case 'AMP-Verification-Checksum':
+                return '2569076912';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        return AmpAdNetworkDoubleclickImpl.prototype
+          .maybeValidateAmpCreative(utf8Encode(creative), mockHeaders)
+          .then(result => {
             expect(result).to.be.ok;
             expect(utf8Decode(result)).to.equal(creative);
           });
-        });
+      });
 
-        it('should fail validation if invalid checksum', () => {
-          const creative = '<html><body>This is some text</body></html>';
-          const mockHeaders = {
-            get: key => {
-              switch (key) {
-                case 'AMP-Verification-Checksum-Algorithm':
-                  return 'djb2a-32';
-                case 'AMP-Verification-Checksum':
-                  return '12345';
-                default:
-                  throw new Error(`unexpected header: ${key}`);
-              }
-            },
-          };
-          expect(AmpAdNetworkDoubleclickImpl.prototype.maybeValidateAmpCreative(
-              utf8Encode(creative), mockHeaders)).to.eventually.not.be.ok;
-        });
+      it('should fail validation if invalid checksum', () => {
+        const creative = '<html><body>This is some text</body></html>';
+        const mockHeaders = {
+          get: key => {
+            switch (key) {
+              case 'AMP-Verification-Checksum-Algorithm':
+                return 'djb2a-32';
+              case 'AMP-Verification-Checksum':
+                return '12345';
+              default:
+                throw new Error(`unexpected header: ${key}`);
+            }
+          },
+        };
+        expect(
+          AmpAdNetworkDoubleclickImpl.prototype.maybeValidateAmpCreative(
+            utf8Encode(creative),
+            mockHeaders
+          )
+        ).to.eventually.not.be.ok;
       });
     });
+  }
+);
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-fluid.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-fluid.js
index 544d1b264c55..97ac919d3c0d 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-fluid.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-fluid.js
@@ -78,15 +78,16 @@ function createScaffoldingForFluidRendering(impl, sandbox) {
   };
   impl.buildCallback();
   impl.attemptChangeHeight = () => Promise.resolve();
-  sandbox.stub(impl, 'sendXhrRequest').returns(Promise.resolve({
-    arrayBuffer: () => Promise.resolve(utf8Encode(rawCreative)),
-    headers: {has: () => false, get: () => undefined},
-  }));
+  sandbox.stub(impl, 'sendXhrRequest').returns(
+    Promise.resolve({
+      arrayBuffer: () => Promise.resolve(utf8Encode(rawCreative)),
+      headers: {has: () => false, get: () => undefined},
+    })
+  );
   impl.sentinel = 'sentinel';
   impl.initiateAdRequest();
-  impl.safeframeApi_ = new SafeframeHostApi(
-      impl, true, impl.creativeSize_);
-  sandbox./*OK*/stub(impl.safeframeApi_, 'setupGeom_');
+  impl.safeframeApi_ = new SafeframeHostApi(impl, true, impl.creativeSize_);
+  sandbox./*OK*/ stub(impl.safeframeApi_, 'setupGeom_');
 }
 
 describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
@@ -109,10 +110,11 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
     const ampStyle = doc.createElement('style');
     ampStyle.setAttribute('amp-runtime', 'scratch-fortesting');
     doc.head.appendChild(ampStyle);
-    doc.body.appendChild(createElementWithAttributes(
-        env.win.document, 'div', {
-          'style': 'width: 1px; height: 1000px;',
-        }));
+    doc.body.appendChild(
+      createElementWithAttributes(env.win.document, 'div', {
+        'style': 'width: 1px; height: 1000px;',
+      })
+    );
     element = createElementWithAttributes(env.win.document, 'amp-ad', {
       'height': 'fluid',
       'type': 'doubleclick',
@@ -126,7 +128,10 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
     });
     doc.body.appendChild(multiSizeElement);
     multiSizeImpl = new AmpAdNetworkDoubleclickImpl(
-        multiSizeElement, env.win.document, env.win);
+      multiSizeElement,
+      env.win.document,
+      env.win
+    );
 
     const getLayout = () => 'fluid';
     impl.getLayout = getLayout;
@@ -158,8 +163,10 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
   });
 
   it('should NOT load delayed impression amp-pixels', () => {
-    const fireDelayedImpressionsSpy =
-        sandbox.spy(impl, 'fireDelayedImpressions');
+    const fireDelayedImpressionsSpy = sandbox.spy(
+      impl,
+      'fireDelayedImpressions'
+    );
     const size = impl.extractSize({
       get(name) {
         switch (name) {
@@ -192,8 +199,7 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
     multiSizeImpl.initiateAdRequest();
     return multiSizeImpl.adPromise_.then(() => {
       expect(multiSizeImpl.adUrl_).to.be.ok;
-      expect(multiSizeImpl.adUrl_).to.match(
-          /[&?]sz=320x50%7C300x200%7C150x50/);
+      expect(multiSizeImpl.adUrl_).to.match(/[&?]sz=320x50%7C300x200%7C150x50/);
     });
   });
 
@@ -226,11 +232,14 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
 
   it('should fire delayed impression ping', () => {
     createScaffoldingForFluidRendering(impl, sandbox);
-    const connectMessagingChannelSpy =
-          sandbox./*OK*/spy(impl.safeframeApi_,
-              'connectMessagingChannel');
-    const onFluidResizeSpy = sandbox./*OK*/spy(impl.safeframeApi_,
-        'onFluidResize_');
+    const connectMessagingChannelSpy = sandbox./*OK*/ spy(
+      impl.safeframeApi_,
+      'connectMessagingChannel'
+    );
+    const onFluidResizeSpy = sandbox./*OK*/ spy(
+      impl.safeframeApi_,
+      'onFluidResize_'
+    );
     return impl.adPromise_.then(() => {
       return impl.layoutCallback().then(() => {
         expect(connectMessagingChannelSpy).to.be.calledOnce;
@@ -259,8 +268,8 @@ describes.realWin('DoubleClick Fast Fetch Fluid', realWinConfig, env => {
     impl.isVerifiedAmpCreative_ = true;
     impl.fluidImpressionUrl_ = 'http://www.foo.co.uk';
     impl.onCreativeRender(null, mockPromise);
-    expect(delayedImpressionSpy.withArgs('http://www.foo.co.uk'))
-        .to.be.calledOnce;
+    expect(delayedImpressionSpy.withArgs('http://www.foo.co.uk')).to.be
+      .calledOnce;
   });
 
   it('should set expansion re-attempt flag after initial failure', () => {
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
index 08bc383caea4..70e51622482b 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-rtc.js
@@ -19,9 +19,7 @@
 // always available for them. However, when we test an impl in isolation,
 // AmpAd is not loaded already, so we need to load it separately.
 import '../../../amp-ad/0.1/amp-ad';
-import {
-  AmpAdNetworkDoubleclickImpl,
-} from '../amp-ad-network-doubleclick-impl';
+import {AmpAdNetworkDoubleclickImpl} from '../amp-ad-network-doubleclick-impl';
 import {RTC_ERROR_ENUM} from '../../../amp-a4a/0.1/real-time-config-manager';
 import {RTC_VENDORS} from '../../../amp-a4a/0.1/callout-vendors';
 import {Services} from '../../../../src/services';
@@ -60,7 +58,10 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
 
   describe('#mergeRtcResponses_', () => {
     function testMergeRtcResponses(
-      rtcResponseArray, expectedParams, expectedJsonTargeting) {
+      rtcResponseArray,
+      expectedParams,
+      expectedJsonTargeting
+    ) {
       const rtcUrlParams = impl.mergeRtcResponses_(rtcResponseArray);
       expect(rtcUrlParams).to.deep.equal(expectedParams);
       expect(impl.jsonTargeting).to.deep.equal(expectedJsonTargeting);
@@ -71,17 +72,29 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       const expectedParams = {'artc': null, 'ati': '', 'ard': ''};
       const expectedJsonTargeting = {};
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should properly merge RTC responses into jsonTargeting on impl', () => {
       const rtcResponseArray = [
-        {response: {targeting: {'a': [1,2,3], 'b': {c: 'd'}}},
-          callout: 'www.exampleA.com', rtcTime: 100},
-        {response: {targeting: {'a': 'foo', 'b': {e: 'f'}}},
-          callout: 'www.exampleB.com', rtcTime: 500},
-        {response: {targeting: {'z': [{a: 'b'}, {c: 'd'}], 'b': {c: 'd'}}},
-          callout: 'www.exampleC.com', rtcTime: 100},
+        {
+          response: {targeting: {'a': [1, 2, 3], 'b': {c: 'd'}}},
+          callout: 'www.exampleA.com',
+          rtcTime: 100,
+        },
+        {
+          response: {targeting: {'a': 'foo', 'b': {e: 'f'}}},
+          callout: 'www.exampleB.com',
+          rtcTime: 500,
+        },
+        {
+          response: {targeting: {'z': [{a: 'b'}, {c: 'd'}], 'b': {c: 'd'}}},
+          callout: 'www.exampleC.com',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '2,2,2',
@@ -90,10 +103,16 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       };
       const expectedJsonTargeting = {
         targeting: {
-          'a': 'foo', 'b': {c: 'd', e: 'f'}, 'z': [{a: 'b'}, {c: 'd'}]},
+          'a': 'foo',
+          'b': {c: 'd', e: 'f'},
+          'z': [{a: 'b'}, {c: 'd'}],
+        },
       };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should properly merge RTC responses from vendors', () => {
@@ -101,12 +120,21 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         'url': 'https://fakevendor2.biz',
       };
       const rtcResponseArray = [
-        {response: {targeting: {'a': [1,2,3], 'b': {c: 'd'}}},
-          callout: 'fakevendor', rtcTime: 100},
-        {response: {targeting: {'a': 'foo', 'b': {e: 'f'}}},
-          callout: 'www.exampleB.com', rtcTime: 500},
-        {response: {targeting: {'a': 'bar'}},
-          callout: 'TEMP_VENDOR', rtcTime: 100},
+        {
+          response: {targeting: {'a': [1, 2, 3], 'b': {c: 'd'}}},
+          callout: 'fakevendor',
+          rtcTime: 100,
+        },
+        {
+          response: {targeting: {'a': 'foo', 'b': {e: 'f'}}},
+          callout: 'www.exampleB.com',
+          rtcTime: 500,
+        },
+        {
+          response: {targeting: {'a': 'bar'}},
+          callout: 'TEMP_VENDOR',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '2,2,2',
@@ -115,21 +143,34 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       };
       const expectedJsonTargeting = {
         targeting: {
-          'a': 'foo', 'b': {e: 'f'}, 'a_fakevendor': [1,2,3],
-          'b_fakevendor': {c: 'd'}, 'a_TEMP_VENDOR': 'bar'},
+          'a': 'foo',
+          'b': {e: 'f'},
+          'a_fakevendor': [1, 2, 3],
+          'b_fakevendor': {c: 'd'},
+          'a_TEMP_VENDOR': 'bar',
+        },
       };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should properly merge into existing json', () => {
       element.setAttribute('json', '{"targeting":{"a":"foo"}}');
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const rtcResponseArray = [
-        {response: {targeting: {'a': [1,2,3]}},
-          callout: 'fakevendor', rtcTime: 100},
+        {
+          response: {targeting: {'a': [1, 2, 3]}},
+          callout: 'fakevendor',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '2',
@@ -137,19 +178,32 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         ard: 'fakevendor',
       };
       const expectedJsonTargeting = {
-        targeting: {'a': 'foo', 'a_fakevendor': [1,2,3]}};
+        targeting: {'a': 'foo', 'a_fakevendor': [1, 2, 3]},
+      };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should properly merge into existing categoryExclusions', () => {
       element.setAttribute('json', '{"categoryExclusions": ["sports"]}');
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const rtcResponseArray = [
-        {response: {targeting: {'a': [1,2,3]}, categoryExclusions: ['health']},
-          callout: 'fakevendor', rtcTime: 100},
+        {
+          response: {
+            targeting: {'a': [1, 2, 3]},
+            categoryExclusions: ['health'],
+          },
+          callout: 'fakevendor',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '2',
@@ -157,21 +211,30 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         ard: 'fakevendor',
       };
       const expectedJsonTargeting = {
-        targeting: {'a_fakevendor': [1,2,3]},
+        targeting: {'a_fakevendor': [1, 2, 3]},
         categoryExclusions: ['sports', 'health'],
       };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should not allow duplicate categoryExclusions', () => {
       element.setAttribute('json', '{"categoryExclusions": ["health"]}');
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const rtcResponseArray = [
-        {response: {categoryExclusions: ['health']},
-          callout: 'fakevendor', rtcTime: 100},
+        {
+          response: {categoryExclusions: ['health']},
+          callout: 'fakevendor',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '2',
@@ -182,14 +245,20 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         categoryExclusions: ['health'],
       };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     Object.keys(RTC_ERROR_ENUM).forEach(errorName => {
       it(`should send correct error value for ${errorName}`, () => {
         const rtcResponseArray = [
-          {error: RTC_ERROR_ENUM[errorName],
-            callout: 'www.exampleA.com', rtcTime: 100},
+          {
+            error: RTC_ERROR_ENUM[errorName],
+            callout: 'www.exampleA.com',
+            rtcTime: 100,
+          },
         ];
         const expectedParams = {
           ati: `${RTC_ERROR_ENUM[errorName]}`,
@@ -198,50 +267,78 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         };
         const expectedJsonTargeting = {};
         testMergeRtcResponses(
-            rtcResponseArray, expectedParams, expectedJsonTargeting);
+          rtcResponseArray,
+          expectedParams,
+          expectedJsonTargeting
+        );
       });
     });
 
-
     it('should properly merge mix of success and errors', () => {
-      impl.jsonTargeting = {targeting:
-                            {'abc': [1,2,3], 'b': {n: 'm'}, 'a': 'TEST'},
-      categoryExclusions: ['sports']};
+      impl.jsonTargeting = {
+        targeting: {'abc': [1, 2, 3], 'b': {n: 'm'}, 'a': 'TEST'},
+        categoryExclusions: ['sports'],
+      };
       const rtcResponseArray = [
-        {error: RTC_ERROR_ENUM.TIMEOUT,
-          callout: 'www.exampleA.com', rtcTime: 1500},
-        {response: {targeting: {'a': 'foo', 'b': {e: 'f'}},
-          categoryExclusions: ['health']},
-        callout: 'VendorFoo', rtcTime: 500},
-        {response: {targeting: {'a': [1,2,3], 'b': {c: 'd'}}},
-          callout: 'www.exampleB.com', rtcTime: 100},
-        {response: {targeting: {'a': [4,5,6], 'b': {x: [1,2]}}},
-          callout: 'VendCom', rtcTime: 500},
-        {error: RTC_ERROR_ENUM.DUPLICATE_URL,
-          callout: 'www.exampleB.com', rtcTime: 0},
-        {error: RTC_ERROR_ENUM.NETWORK_FAILURE,
-          callout: '3PVend', rtcTime: 100},
+        {
+          error: RTC_ERROR_ENUM.TIMEOUT,
+          callout: 'www.exampleA.com',
+          rtcTime: 1500,
+        },
+        {
+          response: {
+            targeting: {'a': 'foo', 'b': {e: 'f'}},
+            categoryExclusions: ['health'],
+          },
+          callout: 'VendorFoo',
+          rtcTime: 500,
+        },
+        {
+          response: {targeting: {'a': [1, 2, 3], 'b': {c: 'd'}}},
+          callout: 'www.exampleB.com',
+          rtcTime: 100,
+        },
+        {
+          response: {targeting: {'a': [4, 5, 6], 'b': {x: [1, 2]}}},
+          callout: 'VendCom',
+          rtcTime: 500,
+        },
+        {
+          error: RTC_ERROR_ENUM.DUPLICATE_URL,
+          callout: 'www.exampleB.com',
+          rtcTime: 0,
+        },
+        {
+          error: RTC_ERROR_ENUM.NETWORK_FAILURE,
+          callout: '3PVend',
+          rtcTime: 100,
+        },
       ];
       const expectedParams = {
         ati: '10,2,2,2,5,8',
         artc: '1500,500,100,500,0,100',
-        ard: 'www.exampleA.com,VendorFoo,www.exampleB.com,' +
-            'VendCom,www.exampleB.com,3PVend',
+        ard:
+          'www.exampleA.com,VendorFoo,www.exampleB.com,' +
+          'VendCom,www.exampleB.com,3PVend',
       };
       const expectedJsonTargeting = {
         targeting: {
-          'a': [4,5,6], 'b': {n: 'm', e: 'f', c: 'd', x: [1,2]},
-          abc: [1,2,3]},
+          'a': [4, 5, 6],
+          'b': {n: 'm', e: 'f', c: 'd', x: [1, 2]},
+          abc: [1, 2, 3],
+        },
         categoryExclusions: ['sports', 'health'],
       };
       testMergeRtcResponses(
-          rtcResponseArray, expectedParams, expectedJsonTargeting);
+        rtcResponseArray,
+        expectedParams,
+        expectedJsonTargeting
+      );
     });
 
     it('should return null for empty array', () => {
       expect(impl.mergeRtcResponses_()).to.be.null;
     });
-
   });
 
   describe('rewriteRtcKeys', () => {
@@ -254,8 +351,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         'a_fakevendor': '1',
         'b_fakevendor': '2',
       };
-      expect(impl.rewriteRtcKeys_(response, 'fakevendor'))
-          .to.deep.equal(rewrittenResponse);
+      expect(impl.rewriteRtcKeys_(response, 'fakevendor')).to.deep.equal(
+        rewrittenResponse
+      );
     });
 
     it('should not rewrite key names if vendor has disableKeyAppend', () => {
@@ -264,8 +362,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         'b': '2',
       };
       // fakevendor2 has disableKeyAppend set to true, see callout-vendors.js
-      expect(impl.rewriteRtcKeys_(response, 'fakevendor2'))
-          .to.deep.equal(response);
+      expect(impl.rewriteRtcKeys_(response, 'fakevendor2')).to.deep.equal(
+        response
+      );
     });
 
     it('should not rewrite key names if custom url callout', () => {
@@ -273,8 +372,9 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         'a': '1',
         'b': '2',
       };
-      expect(impl.rewriteRtcKeys_(response, 'www.customurl.biz'))
-          .to.deep.equal(response);
+      expect(impl.rewriteRtcKeys_(response, 'www.customurl.biz')).to.deep.equal(
+        response
+      );
     });
   });
 
@@ -306,11 +406,15 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
         'json': JSON.stringify(json),
       });
       env.win.document.body.appendChild(element);
-      Object.defineProperty(
-          env.win.document, 'referrer', {value: 'https://www.google.com/'});
+      Object.defineProperty(env.win.document, 'referrer', {
+        value: 'https://www.google.com/',
+      });
       const docInfo = Services.documentInfoForDoc(element);
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const customMacros = impl.getCustomRealTimeConfigMacros_();
       expect(customMacros.PAGEVIEWID()).to.equal(docInfo.pageViewId);
@@ -335,7 +439,10 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       });
       env.win.document.body.appendChild(element);
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const customMacros = impl.getCustomRealTimeConfigMacros_();
       let adcid;
@@ -354,7 +461,10 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       });
       env.win.document.body.appendChild(element);
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const customMacros = impl.getCustomRealTimeConfigMacros_();
       return customMacros.ADCID(0).then(adcid => {
@@ -368,7 +478,10 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       });
       env.win.document.body.appendChild(element);
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const viewer = Services.viewerForDoc(impl.getAmpDoc());
       sandbox.stub(viewer, 'getReferrerUrl').returns(new Promise(() => {}));
@@ -385,7 +498,10 @@ describes.realWin('DoubleClick Fast Fetch RTC', {amp: true}, env => {
       });
       env.win.document.body.appendChild(element);
       impl = new AmpAdNetworkDoubleclickImpl(
-          element, env.win.document, env.win);
+        element,
+        env.win.document,
+        env.win
+      );
       impl.populateAdUrlState();
       const customMacros = impl.getCustomRealTimeConfigMacros_();
       expect(customMacros.TGT()).to.equal(JSON.stringify(json['targeting']));
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-safeframe.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-safeframe.js
index 33ba2c7c3620..7a7ba108b5e6 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-safeframe.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-safeframe.js
@@ -46,7 +46,6 @@ const realWinConfig = {
   allowExternalResources: true,
 };
 
-
 describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
   let doubleclickImpl;
   let ampAd;
@@ -80,8 +79,7 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       width: creativeWidth,
       height: creativeHeight,
     };
-    safeframeHost = new SafeframeHostApi(
-        doubleclickImpl, false, creativeSize);
+    safeframeHost = new SafeframeHostApi(doubleclickImpl, false, creativeSize);
     doubleclickImpl.upgradeCallback();
     doubleclickImpl.layoutCallback();
   }
@@ -124,10 +122,14 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       const safeframeMock = createElementWithAttributes(doc, 'iframe', {});
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe = safeframeMock;
-      const connectMessagingChannelSpy = sandbox.spy(
-          safeframeHost, 'connectMessagingChannel');
-      const postMessageStub = sandbox./*OK*/stub(
-          safeframeMock.contentWindow, 'postMessage');
+      const connectMessagingChannelSpy = sandbox./*OK*/ spy(
+        safeframeHost,
+        'connectMessagingChannel'
+      );
+      const postMessageStub = sandbox./*OK*/ stub(
+        safeframeMock.contentWindow,
+        'postMessage'
+      );
       sendSetupMessage();
 
       // Verify that the channel was set up
@@ -138,36 +140,59 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       const firstPostMessageArgs = postMessageStub.firstCall.args;
       let connectMessage = JSON.parse(firstPostMessageArgs[0]);
       let payload = JSON.parse(connectMessage[MESSAGE_FIELDS.PAYLOAD]);
-      expect(payload).to.deep.equal({'c': safeframeChannel,
-        'message': 'connect'});
+      expect(payload).to.deep.equal({
+        'c': safeframeChannel,
+        'message': 'connect',
+      });
       expect(connectMessage[MESSAGE_FIELDS.CHANNEL]).to.equal(safeframeChannel);
       expect(connectMessage[MESSAGE_FIELDS.SENTINEL]).to.equal(
-          doubleclickImpl.sentinel);
+        doubleclickImpl.sentinel
+      );
       expect(connectMessage[MESSAGE_FIELDS.ENDPOINT_IDENTITY]).to.equal(
-          safeframeHost.endpointIdentity_);
+        safeframeHost.endpointIdentity_
+      );
 
       // Verify that the initial geometry update was sent
-      return Services.timerFor(env.win).promise(500).then(() => {
-        const secondPostMessageArgs = postMessageStub.secondCall.args;
-        connectMessage = JSON.parse(secondPostMessageArgs[0]);
-        expect(connectMessage[MESSAGE_FIELDS.CHANNEL]).to.equal(
-            safeframeChannel);
-        expect(connectMessage[MESSAGE_FIELDS.SENTINEL]).to.equal(
-            doubleclickImpl.sentinel);
-        expect(connectMessage[MESSAGE_FIELDS.ENDPOINT_IDENTITY]).to.equal(
-            safeframeHost.endpointIdentity_);
-        payload = JSON.parse(connectMessage[MESSAGE_FIELDS.PAYLOAD]);
-        expect(Object.keys(payload)).to.deep.equal(['newGeometry', 'uid']);
-        expect(Object.keys(JSON.parse(payload['newGeometry']))).to.deep.equal([
-          'windowCoords_t', 'windowCoords_r', 'windowCoords_b',
-          'windowCoords_l', 'frameCoords_t', 'frameCoords_r',
-          'frameCoords_b', 'frameCoords_l',
-          'posCoords_t', 'posCoords_b', 'posCoords_r', 'posCoords_l',
-          'styleZIndex',
-          'allowedExpansion_r', 'allowedExpansion_b', 'allowedExpansion_t',
-          'allowedExpansion_l', 'yInView', 'xInView',
-        ]);
-      });
+      return Services.timerFor(env.win)
+        .promise(500)
+        .then(() => {
+          const secondPostMessageArgs = postMessageStub.secondCall.args;
+          connectMessage = JSON.parse(secondPostMessageArgs[0]);
+          expect(connectMessage[MESSAGE_FIELDS.CHANNEL]).to.equal(
+            safeframeChannel
+          );
+          expect(connectMessage[MESSAGE_FIELDS.SENTINEL]).to.equal(
+            doubleclickImpl.sentinel
+          );
+          expect(connectMessage[MESSAGE_FIELDS.ENDPOINT_IDENTITY]).to.equal(
+            safeframeHost.endpointIdentity_
+          );
+          payload = JSON.parse(connectMessage[MESSAGE_FIELDS.PAYLOAD]);
+          expect(Object.keys(payload)).to.deep.equal(['newGeometry', 'uid']);
+          expect(Object.keys(JSON.parse(payload['newGeometry']))).to.deep.equal(
+            [
+              'windowCoords_t',
+              'windowCoords_r',
+              'windowCoords_b',
+              'windowCoords_l',
+              'frameCoords_t',
+              'frameCoords_r',
+              'frameCoords_b',
+              'frameCoords_l',
+              'posCoords_t',
+              'posCoords_b',
+              'posCoords_r',
+              'posCoords_l',
+              'styleZIndex',
+              'allowedExpansion_r',
+              'allowedExpansion_b',
+              'allowedExpansion_t',
+              'allowedExpansion_l',
+              'yInView',
+              'xInView',
+            ]
+          );
+        });
     });
   });
 
@@ -177,20 +202,40 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
         canonicalUrl: 'http://example.org/canonical',
       });
       const attrs = safeframeHost.getSafeframeNameAttr();
-      expect(Object.keys(attrs)).to.deep.equal(
-          ['uid', 'hostPeerName', 'initialGeometry', 'permissions',
-            'metadata', 'reportCreativeGeometry', 'isDifferentSourceWindow',
-            'sentinel']);
+      expect(Object.keys(attrs)).to.deep.equal([
+        'uid',
+        'hostPeerName',
+        'initialGeometry',
+        'permissions',
+        'metadata',
+        'reportCreativeGeometry',
+        'isDifferentSourceWindow',
+        'sentinel',
+      ]);
 
       // Check the geometry
       const initialGeometry = JSON.parse(attrs['initialGeometry']);
-      expect(Object.keys(initialGeometry)).to.deep.equal(
-          ['windowCoords_t', 'windowCoords_r', 'windowCoords_b',
-            'windowCoords_l', 'frameCoords_t', 'frameCoords_r',
-            'frameCoords_b', 'frameCoords_l', 'posCoords_t',
-            'posCoords_b', 'posCoords_r', 'posCoords_l', 'styleZIndex',
-            'allowedExpansion_r', 'allowedExpansion_b', 'allowedExpansion_t',
-            'allowedExpansion_l', 'yInView', 'xInView']);
+      expect(Object.keys(initialGeometry)).to.deep.equal([
+        'windowCoords_t',
+        'windowCoords_r',
+        'windowCoords_b',
+        'windowCoords_l',
+        'frameCoords_t',
+        'frameCoords_r',
+        'frameCoords_b',
+        'frameCoords_l',
+        'posCoords_t',
+        'posCoords_b',
+        'posCoords_r',
+        'posCoords_l',
+        'styleZIndex',
+        'allowedExpansion_r',
+        'allowedExpansion_b',
+        'allowedExpansion_t',
+        'allowedExpansion_l',
+        'yInView',
+        'xInView',
+      ]);
       Object.keys(initialGeometry).forEach(key => {
         if (key != 'styleZIndex') {
           expect(typeof initialGeometry[key]).to.equal('number');
@@ -283,44 +328,50 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
 
   describe('getCurrentGeometry', () => {
     beforeEach(() => {
-      sandbox./*OK*/stub(safeframeHost.viewport_, 'getSize').returns({
+      sandbox./*OK*/ stub(safeframeHost.viewport_, 'getSize').returns({
         height: 1000,
         width: 500,
       });
     });
 
     it('should get current geometry when safeframe fills amp-ad', () => {
-      sandbox./*OK*/stub(safeframeHost.baseInstance_,
-          'getPageLayoutBox').returns({
-        top: 0,
-        left: 0,
-        right: 300,
-        bottom: 250,
-      });
+      sandbox
+        ./*OK*/ stub(safeframeHost.baseInstance_, 'getPageLayoutBox')
+        .returns({
+          top: 0,
+          left: 0,
+          right: 300,
+          bottom: 250,
+        });
       const safeframeMock = createElementWithAttributes(doc, 'iframe', {
         'class': 'safeframe',
       });
       // Set the size of the safeframe to be the same as its containing
       // amp-ad element
       const css = createElementWithAttributes(doc, 'style');
-      css.innerHTML = '.safeframe' +
-          '{height:250px!important;' +
-          'width:300px!important;' +
-          'background-color:blue!important;' +
-          'display:block!important;}';
+      css.innerHTML =
+        '.safeframe' +
+        '{height:250px!important;' +
+        'width:300px!important;' +
+        'background-color:blue!important;' +
+        'display:block!important;}';
       doc.head.appendChild(css);
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe_ = safeframeMock;
       safeframeHost.iframe_ = safeframeMock;
 
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.updateGeometry_();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        const payload = sendMessageStub.firstCall.args[0];
-        const messageType = sendMessageStub.firstCall.args[1];
-        expect(payload['newGeometry']).to.equal(
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          const payload = sendMessageStub.firstCall.args[0];
+          const messageType = sendMessageStub.firstCall.args[1];
+          expect(payload['newGeometry']).to.equal(
             '{"windowCoords_t":0,"windowCoords_r":500,"windowCoords_b":1000,' +
               '"windowCoords_l":0,"frameCoords_t":0,"frameCoords_r":300,' +
               '"frameCoords_b":250,"frameCoords_l":0,' +
@@ -328,44 +379,51 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
               '"posCoords_l":0,"styleZIndex":"",' +
               '"allowedExpansion_r":200,"allowedExpansion_b":750,' +
               '"allowedExpansion_t":0,"allowedExpansion_l":0,"yInView":1,' +
-              '"xInView":1}');
-        expect(payload['uid']).to.equal(safeframeHost.uid_);
-        expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
-      });
+              '"xInView":1}'
+          );
+          expect(payload['uid']).to.equal(safeframeHost.uid_);
+          expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
+        });
     });
 
     it('should get geometry when safeframe does not fill amp-ad', () => {
-      sandbox./*OK*/stub(safeframeHost.baseInstance_,
-          'getPageLayoutBox').returns({
-        top: 0,
-        left: 0,
-        right: 50,
-        bottom: 50,
-      });
+      sandbox
+        ./*OK*/ stub(safeframeHost.baseInstance_, 'getPageLayoutBox')
+        .returns({
+          top: 0,
+          left: 0,
+          right: 50,
+          bottom: 50,
+        });
       // In this case, the safeframe is smaller than its containing
       // amp-ad element.
       const safeframeMock = createElementWithAttributes(doc, 'iframe', {
         'class': 'safeframe',
       });
       const css = createElementWithAttributes(doc, 'style');
-      css.innerHTML = '.safeframe' +
-          '{height:10px!important;' +
-          'width:10px!important;' +
-          'background-color:blue!important;' +
-          'display:block!important;}';
+      css.innerHTML =
+        '.safeframe' +
+        '{height:10px!important;' +
+        'width:10px!important;' +
+        'background-color:blue!important;' +
+        'display:block!important;}';
       doc.head.appendChild(css);
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe_ = safeframeMock;
       safeframeHost.iframe_ = safeframeMock;
 
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.updateGeometry_();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        const payload = sendMessageStub.firstCall.args[0];
-        const messageType = sendMessageStub.firstCall.args[1];
-        expect(payload['newGeometry']).to.equal(
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          const payload = sendMessageStub.firstCall.args[0];
+          const messageType = sendMessageStub.firstCall.args[1];
+          expect(payload['newGeometry']).to.equal(
             '{"windowCoords_t":0,"windowCoords_r":500,"windowCoords_b":1000,' +
               '"windowCoords_l":0,"frameCoords_t":0,"frameCoords_r":10,' +
               '"frameCoords_b":10,"frameCoords_l":0,' +
@@ -373,65 +431,72 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
               '"posCoords_l":0,"styleZIndex":"",' +
               '"allowedExpansion_r":490,"allowedExpansion_b":990,' +
               '"allowedExpansion_t":0,"allowedExpansion_l":0,"yInView":1,' +
-              '"xInView":1}');
-        expect(payload['uid']).to.equal(safeframeHost.uid_);
-        expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
-      });
+              '"xInView":1}'
+          );
+          expect(payload['uid']).to.equal(safeframeHost.uid_);
+          expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
+        });
     });
 
-
     it('should handle cancellation', () => {
-      sandbox./*OK*/stub(safeframeHost.baseInstance_,
-          'getPageLayoutBox').returns({
-        top: 0,
-        left: 0,
-        right: 50,
-        bottom: 50,
-      });
+      sandbox
+        ./*OK*/ stub(safeframeHost.baseInstance_, 'getPageLayoutBox')
+        .returns({
+          top: 0,
+          left: 0,
+          right: 50,
+          bottom: 50,
+        });
       // In this case, the safeframe is smaller than its containing
       // amp-ad element.
       const safeframeMock = createElementWithAttributes(doc, 'iframe', {
         'class': 'safeframe',
       });
       const css = createElementWithAttributes(doc, 'style');
-      css.innerHTML = '.safeframe' +
+      css.innerHTML =
+        '.safeframe' +
         '{height:10px!important;' +
-          'width:10px!important;' +
-          'background-color:blue!important;' +
-          'display:block!important;}';
+        'width:10px!important;' +
+        'background-color:blue!important;' +
+        'display:block!important;}';
       doc.head.appendChild(css);
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe_ = safeframeMock;
       safeframeHost.iframe_ = safeframeMock;
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.updateGeometry_();
       safeframeHost.baseInstance_.promiseId_++;
-      return Services.timerFor(env.win).promise(1000).then(() => {
-        expect(sendMessageStub).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(1000)
+        .then(() => {
+          expect(sendMessageStub).to.not.be.called;
+        });
     });
 
     it('should get geometry when scrolled', () => {
-
-      sandbox./*OK*/stub(safeframeHost.baseInstance_,
-          'getPageLayoutBox').returns({
-        top: 0,
-        left: 0,
-        right: 50,
-        bottom: 50,
-      });
+      sandbox
+        ./*OK*/ stub(safeframeHost.baseInstance_, 'getPageLayoutBox')
+        .returns({
+          top: 0,
+          left: 0,
+          right: 50,
+          bottom: 50,
+        });
       // In this case, the safeframe is smaller than its containing
       // amp-ad element.
       const safeframeMock = createElementWithAttributes(doc, 'iframe', {
         'class': 'safeframe',
       });
       const css = createElementWithAttributes(doc, 'style');
-      css.innerHTML = '.safeframe' +
-          '{height:100px!important;' +
-          'width:100px!important;' +
-          'background-color:blue!important;' +
-          'display:block!important;}';
+      css.innerHTML =
+        '.safeframe' +
+        '{height:100px!important;' +
+        'width:100px!important;' +
+        'background-color:blue!important;' +
+        'display:block!important;}';
       doc.head.appendChild(css);
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe_ = safeframeMock;
@@ -440,24 +505,29 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       // Scroll 100 px
       safeframeHost.viewport_.setScrollTop(50);
 
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.updateGeometry_();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        const payload = sendMessageStub.firstCall.args[0];
-        const messageType = sendMessageStub.firstCall.args[1];
-        expect(payload['newGeometry']).to.equal(
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          const payload = sendMessageStub.firstCall.args[0];
+          const messageType = sendMessageStub.firstCall.args[1];
+          expect(payload['newGeometry']).to.equal(
             '{"windowCoords_t":0,"windowCoords_r":500,"windowCoords_b":1000,' +
               '"windowCoords_l":0,"frameCoords_t":0,"frameCoords_r":100,' +
               '"frameCoords_b":100,"frameCoords_l":0,"posCoords_t":-50,' +
               '"posCoords_b":50,"posCoords_r":100,"posCoords_l":0,' +
               '"styleZIndex":"","allowedExpansion_r":400,' +
               '"allowedExpansion_b":900,"allowedExpansion_t":0,' +
-              '"allowedExpansion_l":0,"yInView":0.5,"xInView":1}');
-        expect(payload['uid']).to.equal(safeframeHost.uid_);
-        expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
-      });
+              '"allowedExpansion_l":0,"yInView":0.5,"xInView":1}'
+          );
+          expect(payload['uid']).to.equal(safeframeHost.uid_);
+          expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
+        });
     });
   });
 
@@ -467,51 +537,60 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe = safeframeMock;
 
-      const onScrollStub = sandbox./*OK*/stub(
-          safeframeHost.viewport_, 'onScroll');
-      const onChangedStub = sandbox./*OK*/stub(
-          safeframeHost.viewport_, 'onChanged');
+      const onScrollStub = sandbox./*OK*/ stub(
+        safeframeHost.viewport_,
+        'onScroll'
+      );
+      const onChangedStub = sandbox./*OK*/ stub(
+        safeframeHost.viewport_,
+        'onChanged'
+      );
 
       safeframeMock.contentWindow.postMessage = () => {};
       sendSetupMessage();
       const maybeUpdateGeometry1 = onScrollStub.firstCall.args[0];
       const maybeUpdateGeometry2 = onChangedStub.firstCall.args[0];
-      const sendMessageStub = sandbox./*OK*/spy(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ spy(safeframeHost, 'sendMessage_');
       maybeUpdateGeometry1();
       maybeUpdateGeometry2();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendMessageStub).to.be.calledTwice;
-        const payload = sendMessageStub.secondCall.args[0];
-        const messageType = sendMessageStub.secondCall.args[1];
-        expect(JSON.parse(payload['newGeometry'])).to.deep.equal(
-            safeframeHost.currentGeometry_);
-        expect(payload['uid']).to.equal(safeframeHost.uid_);
-        expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
-        return Services.timerFor(env.win).promise(1000).then(() => {
-          expect(sendMessageStub).to.be.calledThrice;
-          const payload = sendMessageStub.thirdCall.args[0];
-          const messageType = sendMessageStub.thirdCall.args[1];
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendMessageStub).to.be.calledTwice;
+          const payload = sendMessageStub.secondCall.args[0];
+          const messageType = sendMessageStub.secondCall.args[1];
           expect(JSON.parse(payload['newGeometry'])).to.deep.equal(
-              safeframeHost.currentGeometry_);
+            safeframeHost.currentGeometry_
+          );
           expect(payload['uid']).to.equal(safeframeHost.uid_);
           expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
+          return Services.timerFor(env.win)
+            .promise(1000)
+            .then(() => {
+              expect(sendMessageStub).to.be.calledThrice;
+              const payload = sendMessageStub.thirdCall.args[0];
+              const messageType = sendMessageStub.thirdCall.args[1];
+              expect(JSON.parse(payload['newGeometry'])).to.deep.equal(
+                safeframeHost.currentGeometry_
+              );
+              expect(payload['uid']).to.equal(safeframeHost.uid_);
+              expect(messageType).to.equal(SERVICE.GEOMETRY_UPDATE);
+            });
         });
-      });
-
     });
   });
 
   describe('formatGeom', () => {
     it('should build proper geometry update', () => {
-      sandbox./*OK*/stub(safeframeHost.baseInstance_,
-          'getPageLayoutBox').returns({
-        top: 200,
-        left: 100,
-        right: 400,
-        bottom: 800,
-      });
+      sandbox
+        ./*OK*/ stub(safeframeHost.baseInstance_, 'getPageLayoutBox')
+        .returns({
+          top: 200,
+          left: 100,
+          right: 400,
+          bottom: 800,
+        });
       const iframeBox = {
         top: 300,
         left: 200,
@@ -520,63 +599,83 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
         width: 300,
         height: 700,
       };
-      sandbox./*OK*/stub(safeframeHost.viewport_, 'getSize').returns({
+      sandbox./*OK*/ stub(safeframeHost.viewport_, 'getSize').returns({
         width: 500,
         height: 1000,
       });
       const expectedParsedSfGU = {
-        'windowCoords_t': 0, 'windowCoords_r': 500, 'windowCoords_b': 1000,
-        'windowCoords_l': 0, 'frameCoords_t': 300, 'frameCoords_r': 500,
-        'frameCoords_b': 1000, 'frameCoords_l': 200,
-        'posCoords_b': 1000, 'posCoords_l': 200, 'posCoords_r': 500,
-        'posCoords_t': 300, 'styleZIndex': '',
-        'allowedExpansion_r': 200, 'allowedExpansion_b': 300,
-        'allowedExpansion_t': 0, 'allowedExpansion_l': 0, 'yInView': 1,
+        'windowCoords_t': 0,
+        'windowCoords_r': 500,
+        'windowCoords_b': 1000,
+        'windowCoords_l': 0,
+        'frameCoords_t': 300,
+        'frameCoords_r': 500,
+        'frameCoords_b': 1000,
+        'frameCoords_l': 200,
+        'posCoords_b': 1000,
+        'posCoords_l': 200,
+        'posCoords_r': 500,
+        'posCoords_t': 300,
+        'styleZIndex': '',
+        'allowedExpansion_r': 200,
+        'allowedExpansion_b': 300,
+        'allowedExpansion_t': 0,
+        'allowedExpansion_l': 0,
+        'yInView': 1,
         'xInView': 1,
       };
-      const safeframeGeometryUpdate = safeframeHost.formatGeom_(
-          iframeBox);
+      const safeframeGeometryUpdate = safeframeHost.formatGeom_(iframeBox);
       const parsedSfGU = JSON.parse(safeframeGeometryUpdate);
       expect(parsedSfGU).to.deep.equal(expectedParsedSfGU);
       expect(safeframeHost.currentGeometry_).to.deep.equal(expectedParsedSfGU);
-
     });
   });
 
   describe('sendResizeResponse', () => {
     it('should handle cancellation', () => {
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.sendResizeResponse(true, SERVICE.COLLAPSE_REQUEST);
       safeframeHost.baseInstance_.promiseId_++;
-      return Services.timerFor(env.win).promise(0).then(() => {
-        expect(sendMessageStub).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(0)
+        .then(() => {
+          expect(sendMessageStub).to.not.be.called;
+        });
     });
   });
 
   describe('resizeAmpAdAndSafeframe', () => {
     it('should handle cancellation', () => {
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
-      safeframeHost.resizeAmpAdAndSafeframe(
-          100, 100, SERVICE.COLLAPSE_REQUEST);
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
+      safeframeHost.resizeAmpAdAndSafeframe(100, 100, SERVICE.COLLAPSE_REQUEST);
       safeframeHost.baseInstance_.promiseId_++;
-      return Services.timerFor(env.win).promise(0).then(() => {
-        expect(sendMessageStub).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(0)
+        .then(() => {
+          expect(sendMessageStub).to.not.be.called;
+        });
     });
   });
 
   describe('handleFluidMessage', () => {
     it('should handle cancellation', () => {
-      const sendMessageStub = sandbox./*OK*/stub(safeframeHost,
-          'sendMessage_');
+      const sendMessageStub = sandbox./*OK*/ stub(
+        safeframeHost,
+        'sendMessage_'
+      );
       safeframeHost.handleFluidMessage_({height: 10});
       safeframeHost.baseInstance_.promiseId_++;
-      return Services.timerFor(env.win).promise(0).then(() => {
-        expect(sendMessageStub).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(0)
+        .then(() => {
+          expect(sendMessageStub).to.not.be.called;
+        });
     });
   });
 
@@ -593,11 +692,12 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
     function setupForResize() {
       sandbox.restore();
       const css = createElementWithAttributes(doc, 'style');
-      css.innerHTML = '.safeframe' +
-          '{height:50px!important;' +
-          'width:50px!important;' +
-          'background-color:blue!important;' +
-          'display:block!important;}';
+      css.innerHTML =
+        '.safeframe' +
+        '{height:50px!important;' +
+        'width:50px!important;' +
+        'background-color:blue!important;' +
+        'display:block!important;}';
       doc.head.appendChild(css);
       safeframeMock = createElementWithAttributes(doc, 'iframe', {
         height: 50,
@@ -605,19 +705,24 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       });
       ampAd.appendChild(safeframeMock);
       doubleclickImpl.iframe = safeframeMock;
-      resizeSafeframeSpy = sandbox.spy(
-          safeframeHost, 'resizeSafeframe');
-      sendResizeResponseSpy = sandbox.spy(
-          safeframeHost, 'sendResizeResponse');
-      resizeAmpAdAndSafeframeSpy = sandbox.spy(
-          safeframeHost, 'resizeAmpAdAndSafeframe');
+      resizeSafeframeSpy = sandbox./*OK*/ spy(safeframeHost, 'resizeSafeframe');
+      sendResizeResponseSpy = sandbox./*OK*/ spy(
+        safeframeHost,
+        'sendResizeResponse'
+      );
+      resizeAmpAdAndSafeframeSpy = sandbox./*OK*/ spy(
+        safeframeHost,
+        'resizeAmpAdAndSafeframe'
+      );
       safeframeHost.initialHeight_ = ampAdHeight;
       safeframeHost.initialWidth_ = ampAdWidth;
       sendSetupMessage();
       sendRegisterDoneMessage();
       attemptChangeSizeStub = sandbox.stub(
-          doubleclickImpl, 'attemptChangeSize');
-      sandbox./*OK*/stub(safeframeHost.viewport_, 'getSize').returns({
+        doubleclickImpl,
+        'attemptChangeSize'
+      );
+      sandbox./*OK*/ stub(safeframeHost.viewport_, 'getSize').returns({
         height: 1000,
         width: 1000,
       });
@@ -658,15 +763,19 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       sendExpandMessage(50, 50);
       // Verify that we can immediately resize the safeframe, and don't
       // need to call any of the fancy AMP element resize things.
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(300, 350);
-        expect(safeframeMock.style.height).to.equal('300px');
-        expect(safeframeMock.style.width).to.equal('350px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.EXPAND_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(resizeSafeframeSpy).to.be.calledOnce;
+          expect(resizeSafeframeSpy).to.be.calledWith(300, 350);
+          expect(safeframeMock.style.height).to.equal('300px');
+          expect(safeframeMock.style.width).to.equal('350px');
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            true,
+            SERVICE.EXPAND_RESPONSE
+          );
+          expect(resizeAmpAdAndSafeframeSpy).to.not.be.called;
+        });
     });
 
     /**
@@ -688,15 +797,19 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       sendExpandMessage(50, 50);
       // Verify that we can immediately resize the safeframe, and don't
       // need to call any of the fancy AMP element resize things.
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(300, 350);
-        expect(safeframeMock.style.height).to.equal('300px');
-        expect(safeframeMock.style.width).to.equal('350px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.EXPAND_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.not.be.called;
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(resizeSafeframeSpy).to.be.calledOnce;
+          expect(resizeSafeframeSpy).to.be.calledWith(300, 350);
+          expect(safeframeMock.style.height).to.equal('300px');
+          expect(safeframeMock.style.width).to.equal('350px');
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            true,
+            SERVICE.EXPAND_RESPONSE
+          );
+          expect(resizeAmpAdAndSafeframeSpy).to.not.be.called;
+        });
     });
 
     /**
@@ -705,31 +818,38 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
      * using element.attemptChangeSize. If that succeeds, then we also
      * resize the safeframe.
      */
-    it('expand_request should succeed if expanding past amp-ad bounds and' +
-       ' does not create reflow', () => {
-      const expandWidthBy = 550;
-      const expandHeightBy = 600;
-      // Sneaky hack to do a synchronous mock of attemptChangeSize
-      // Resize the ampAd to simulate a success.
-      const then = f => {
-        ampAd.style.height = '850px';
-        ampAd.style.width = '850px';
-        f();
-        return {'catch': () => {}};
-      };
-      attemptChangeSizeStub.returns({then});
-      sendExpandMessage(expandHeightBy, expandWidthBy);
-
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(850, 850);
-        expect(safeframeMock.style.height).to.equal('850px');
-        expect(safeframeMock.style.width).to.equal('850px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.EXPAND_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
-      });
-    });
+    it(
+      'expand_request should succeed if expanding past amp-ad bounds and' +
+        ' does not create reflow',
+      () => {
+        const expandWidthBy = 550;
+        const expandHeightBy = 600;
+        // Sneaky hack to do a synchronous mock of attemptChangeSize
+        // Resize the ampAd to simulate a success.
+        const then = f => {
+          ampAd.style.height = '850px';
+          ampAd.style.width = '850px';
+          f();
+          return {'catch': () => {}};
+        };
+        attemptChangeSizeStub.returns({then});
+        sendExpandMessage(expandHeightBy, expandWidthBy);
+
+        return Services.timerFor(env.win)
+          .promise(100)
+          .then(() => {
+            expect(resizeSafeframeSpy).to.be.calledOnce;
+            expect(resizeSafeframeSpy).to.be.calledWith(850, 850);
+            expect(safeframeMock.style.height).to.equal('850px');
+            expect(safeframeMock.style.width).to.equal('850px');
+            expect(sendResizeResponseSpy).to.be.calledWith(
+              true,
+              SERVICE.EXPAND_RESPONSE
+            );
+            expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
+          });
+      }
+    );
 
     /**
      * If the safeframed creative asks to resize outside the bounds of
@@ -740,10 +860,14 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
     it('resizeAmpAdAndSafeframe should send error on rejection', () => {
       attemptChangeSizeStub.rejects();
       safeframeHost.resizeAmpAdAndSafeframe(550, 550, SERVICE.EXPAND_RESPONSE);
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.EXPAND_RESPONSE);
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            false,
+            SERVICE.EXPAND_RESPONSE
+          );
+        });
     });
 
     /**
@@ -752,10 +876,14 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
      */
     it('expand_request fails if expanding larger than viewport', () => {
       sendExpandMessage(5000, 5000);
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.EXPAND_RESPONSE);
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            false,
+            SERVICE.EXPAND_RESPONSE
+          );
+        });
     });
 
     /**
@@ -779,10 +907,14 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       allowConsoleError(() => {
         receiveMessage(expandMessage);
       });
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.EXPAND_RESPONSE);
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            false,
+            SERVICE.EXPAND_RESPONSE
+          );
+        });
     });
 
     /**
@@ -790,21 +922,28 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
      * try to expand that element, and in this test it fails. Thus, we also
      * fail resizing the safeframe.
      */
-    it('expand_request should fail if expanding past amp-ad bounds and would ' +
-       'create reflow', () => {
-      attemptChangeSizeStub.rejects();
-
-      sendExpandMessage(550, 550);
-
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.not.be.called;
-        expect(safeframeMock.height).to.equal('50');
-        expect(safeframeMock.width).to.equal('50');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.EXPAND_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
-      });
-    });
+    it(
+      'expand_request should fail if expanding past amp-ad bounds and would ' +
+        'create reflow',
+      () => {
+        attemptChangeSizeStub.rejects();
+
+        sendExpandMessage(550, 550);
+
+        return Services.timerFor(env.win)
+          .promise(100)
+          .then(() => {
+            expect(resizeSafeframeSpy).to.not.be.called;
+            expect(safeframeMock.height).to.equal('50');
+            expect(safeframeMock.width).to.equal('50');
+            expect(sendResizeResponseSpy).to.be.calledWith(
+              false,
+              SERVICE.EXPAND_RESPONSE
+            );
+            expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
+          });
+      }
+    );
 
     function sendCollapseMessage() {
       const collapseMessage = {};
@@ -828,15 +967,19 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       attemptChangeSizeStub.rejects();
       sendCollapseMessage();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(250, 300);
-        expect(safeframeMock.style.height).to.equal('250px');
-        expect(safeframeMock.style.width).to.equal('300px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.COLLAPSE_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(resizeSafeframeSpy).to.be.calledOnce;
+          expect(resizeSafeframeSpy).to.be.calledWith(250, 300);
+          expect(safeframeMock.style.height).to.equal('250px');
+          expect(safeframeMock.style.width).to.equal('300px');
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            true,
+            SERVICE.COLLAPSE_RESPONSE
+          );
+          expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
+        });
     });
 
     it('should collapse safeframe on amp-ad resize success', () => {
@@ -856,34 +999,46 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       attemptChangeSizeStub.returns({then});
       sendCollapseMessage();
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(250, 300);
-        expect(safeframeMock.style.height).to.equal('250px');
-        expect(safeframeMock.style.width).to.equal('300px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.COLLAPSE_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(resizeSafeframeSpy).to.be.calledOnce;
+          expect(resizeSafeframeSpy).to.be.calledWith(250, 300);
+          expect(safeframeMock.style.height).to.equal('250px');
+          expect(safeframeMock.style.width).to.equal('300px');
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            true,
+            SERVICE.COLLAPSE_RESPONSE
+          );
+          expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
+        });
     });
 
     it('should send collapse failure message if already collapsed', () => {
       safeframeHost.isCollapsed_ = true;
       sendCollapseMessage();
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.COLLAPSE_RESPONSE);
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            false,
+            SERVICE.COLLAPSE_RESPONSE
+          );
+        });
     });
 
     it('should send collapse failure message if not registered', () => {
       safeframeHost.isCollapsed_ = false;
       safeframeHost.isRegistered_ = false;
       sendCollapseMessage();
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            false, SERVICE.COLLAPSE_RESPONSE);
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            false,
+            SERVICE.COLLAPSE_RESPONSE
+          );
+        });
     });
 
     /**
@@ -922,15 +1077,19 @@ describes.realWin('DoubleClick Fast Fetch - Safeframe', realWinConfig, env => {
       attemptChangeSizeStub.returns({then});
       sendResizeMessage(-5, -5, -5, -5);
 
-      return Services.timerFor(env.win).promise(100).then(() => {
-        expect(resizeSafeframeSpy).to.be.calledOnce;
-        expect(resizeSafeframeSpy).to.be.calledWith(240, 290);
-        expect(safeframeMock.style.height).to.equal('240px');
-        expect(safeframeMock.style.width).to.equal('290px');
-        expect(sendResizeResponseSpy).to.be.calledWith(
-            true, SERVICE.RESIZE_RESPONSE);
-        expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
-      });
+      return Services.timerFor(env.win)
+        .promise(100)
+        .then(() => {
+          expect(resizeSafeframeSpy).to.be.calledOnce;
+          expect(resizeSafeframeSpy).to.be.calledWith(240, 290);
+          expect(safeframeMock.style.height).to.equal('240px');
+          expect(safeframeMock.style.width).to.equal('290px');
+          expect(sendResizeResponseSpy).to.be.calledWith(
+            true,
+            SERVICE.RESIZE_RESPONSE
+          );
+          expect(resizeAmpAdAndSafeframeSpy).to.be.calledOnce;
+        });
     });
   });
 });
diff --git a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
index 537d9aeedc37..60f6cf134df3 100644
--- a/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
+++ b/extensions/amp-ad-network-doubleclick-impl/0.1/test/test-doubleclick-sra.js
@@ -27,12 +27,8 @@ import {
 } from '../amp-ad-network-doubleclick-impl';
 import {BaseElement} from '../../../../src/base-element';
 import {Deferred} from '../../../../src/utils/promise';
-import {
-  EXPERIMENT_ATTRIBUTE,
-} from '../../../../ads/google/a4a/utils';
-import {
-  MANUAL_EXPERIMENT_ID,
-} from '../../../../ads/google/a4a/traffic-experiments';
+import {EXPERIMENT_ATTRIBUTE} from '../../../../ads/google/a4a/utils';
+import {MANUAL_EXPERIMENT_ID} from '../../../../ads/google/a4a/traffic-experiments';
 import {SignatureVerifier} from '../../../amp-a4a/0.1/signature-verifier';
 import {
   TFCD,
@@ -67,7 +63,7 @@ const config = {amp: true, allowExternalResources: true};
   calling setAttribute('src', 'foo') on the iframe, which will cause all these
   tests to fail.
 */
-describes.realWin('Doubleclick SRA', config , env => {
+describes.realWin('Doubleclick SRA', config, env => {
   let sandbox;
   let doc;
 
@@ -80,9 +76,13 @@ describes.realWin('Doubleclick SRA', config , env => {
 
   function createAndAppendAdElement(opt_attributes, opt_type, opt_domElement) {
     const element = createElementWithAttributes(
-        doc, opt_type || 'amp-ad',
-        Object.assign(
-            {type: 'doubleclick', height: 320, width: 50}, opt_attributes));
+      doc,
+      opt_type || 'amp-ad',
+      Object.assign(
+        {type: 'doubleclick', height: 320, width: 50},
+        opt_attributes
+      )
+    );
     (opt_domElement || doc.body).appendChild(element);
     return element;
   }
@@ -99,7 +99,10 @@ describes.realWin('Doubleclick SRA', config , env => {
     // layoutCallback is executed.
     it('should be enabled if meta tag present, and force refresh off', () => {
       createAndAppendAdElement(
-          {name: 'amp-ad-doubleclick-sra'}, 'meta', doc.head);
+        {name: 'amp-ad-doubleclick-sra'},
+        'meta',
+        doc.head
+      );
       const element = createAndAppendAdElement({'data-enable-refresh': 30});
       const impl = new AmpAdNetworkDoubleclickImpl(element);
       impl.buildCallback();
@@ -111,7 +114,7 @@ describes.realWin('Doubleclick SRA', config , env => {
 
   describe('block parameter joining', () => {
     let impls;
-    beforeEach(() => impls = []);
+    beforeEach(() => (impls = []));
 
     it('should join IUs', () => {
       for (let i = 0; i < 2; i++) {
@@ -154,8 +157,7 @@ describes.realWin('Doubleclick SRA', config , env => {
         impls.push({parameterSize: i});
         expected.push(i);
       }
-      expect(getSizes(impls)).to.jsonEqual(
-          {'prev_iu_szs': expected.join()});
+      expect(getSizes(impls)).to.jsonEqual({'prev_iu_szs': expected.join()});
     });
     it('should determine tagForChildDirectedTreatment', () => {
       expect(getTfcd(impls)).to.be.null;
@@ -192,35 +194,49 @@ describes.realWin('Doubleclick SRA', config , env => {
       impls[0] = {jsonTargeting: {}};
       expect(getTargetingAndExclusions(impls)).to.be.null;
       impls[1] = {jsonTargeting: {targeting: {a: 1, b: 2}}};
-      expect(getTargetingAndExclusions(impls)).to.jsonEqual(
-          {'prev_scp': '|a=1&b=2'});
-      impls[2] = {jsonTargeting: {targeting: {c: 1, d: 'l=d'},
-        categoryExclusions: ['a','b']}};
+      expect(getTargetingAndExclusions(impls)).to.jsonEqual({
+        'prev_scp': '|a=1&b=2',
+      });
+      impls[2] = {
+        jsonTargeting: {
+          targeting: {c: 1, d: 'l=d'},
+          categoryExclusions: ['a', 'b'],
+        },
+      };
       impls[3] = {};
-      expect(getTargetingAndExclusions(impls)).to.jsonEqual(
-          {'prev_scp': '|a=1&b=2|c=1&d=l%3Dd&excl_cat=a,b|'});
+      expect(getTargetingAndExclusions(impls)).to.jsonEqual({
+        'prev_scp': '|a=1&b=2|c=1&d=l%3Dd&excl_cat=a,b|',
+      });
     });
     it('should determine experiment ids', () => {
       expect(getExperimentIds(impls)).to.be.null;
-      impls[0] = {win: {location: {hash: '#deid=123,456,7'}},
-        experimentIds: []};
+      impls[0] = {
+        win: {location: {hash: '#deid=123,456,7'}},
+        experimentIds: [],
+      };
       // NOTE(keithwrightbos): let's hope this doesn't flake given eids
       // are stored in object.
       expect(getExperimentIds(impls)).to.jsonEqual({'eid': '7,123,456'});
       impls[0].experimentIds = ['901', '902'];
-      expect(getExperimentIds(impls)).to.jsonEqual(
-          {'eid': '7,123,456,901,902'});
+      expect(getExperimentIds(impls)).to.jsonEqual({
+        'eid': '7,123,456,901,902',
+      });
       impls[1] = {experimentIds: ['902', '903']};
-      expect(getExperimentIds(impls)).to.jsonEqual(
-          {'eid': '7,123,456,901,902,903'});
+      expect(getExperimentIds(impls)).to.jsonEqual({
+        'eid': '7,123,456,901,902,903',
+      });
     });
     it('should determine identity', () => {
       impls[0] = new AmpAdNetworkDoubleclickImpl(
-          env.win.document.createElement('span'));
+        env.win.document.createElement('span')
+      );
       impls[0].identityToken = {token: 'foo', jar: 'bar', pucrd: 'oof'};
       impls[1] = {};
-      expect(getIdentity(impls)).to.jsonEqual(
-          {adsid: 'foo', jar: 'bar', pucrd: 'oof'});
+      expect(getIdentity(impls)).to.jsonEqual({
+        adsid: 'foo',
+        jar: 'bar',
+        pucrd: 'oof',
+      });
     });
     it('should combine force safeframe', () => {
       expect(getForceSafeframe(impls)).to.be.null;
@@ -233,11 +249,15 @@ describes.realWin('Doubleclick SRA', config , env => {
     });
     it('should combine page offsets', () => {
       impls[0] = {getPageLayoutBox: () => ({left: 123, top: 456})};
-      expect(getPageOffsets(impls)).to.jsonEqual(
-          {'adxs': '123', 'adys': '456'});
+      expect(getPageOffsets(impls)).to.jsonEqual({
+        'adxs': '123',
+        'adys': '456',
+      });
       impls[1] = {getPageLayoutBox: () => ({left: 123, top: 789})};
-      expect(getPageOffsets(impls)).to.jsonEqual(
-          {'adxs': '123,123', 'adys': '456,789'});
+      expect(getPageOffsets(impls)).to.jsonEqual({
+        'adxs': '123,123',
+        'adys': '456,789',
+      });
     });
     it('should combine contained state', () => {
       expect(getContainers(impls)).to.be.null;
@@ -245,8 +265,14 @@ describes.realWin('Doubleclick SRA', config , env => {
       expect(getContainers(impls)).to.be.null;
       impls[1] = {element: {parentElement: {tagName: 'AMP-CAROUSEL'}}};
       expect(getContainers(impls)).to.jsonEqual({'acts': '|ac'});
-      impls[2] = {element: {parentElement: {tagName: 'AMP-CAROUSEL',
-        parentElement: {tagName: 'AMP-STICKY-AD'}}}};
+      impls[2] = {
+        element: {
+          parentElement: {
+            tagName: 'AMP-CAROUSEL',
+            parentElement: {tagName: 'AMP-STICKY-AD'},
+          },
+        },
+      };
       expect(getContainers(impls)).to.jsonEqual({'acts': '|ac|ac,sa'});
     });
     it('should combine fluid state', () => {
@@ -261,17 +287,21 @@ describes.realWin('Doubleclick SRA', config , env => {
     let impl;
 
     beforeEach(() => {
-      const element = createAndAppendAdElement(
-          {'data-a4a-upgrade-type': 'amp-ad-network-doubleclick-impl'});
+      const element = createAndAppendAdElement({
+        'data-a4a-upgrade-type': 'amp-ad-network-doubleclick-impl',
+      });
       // Testing competitive exclusion when we have an AMP ad and a non-AMP ad
       // on the same page. Need to add the child frame of the element to stand
       // in as the non-AMP ad.
       createAndAppendAdElement(
-          {
-            src: 'https://foo.com',
-            height: 320,
-            width: 50,
-          }, 'iframe', element);
+        {
+          src: 'https://foo.com',
+          height: 320,
+          width: 50,
+        },
+        'iframe',
+        element
+      );
       impl = new AmpAdNetworkDoubleclickImpl(element);
       impl.buildCallback();
       impl.isAmpCreative_ = true;
@@ -305,18 +335,20 @@ describes.realWin('Doubleclick SRA', config , env => {
           'data-force-safeframe': forceSafeFrame ? '1' : '0',
           'data-multi-size': '9999x9999',
         };
-        const element1 =
-          createElementWithAttributes(doc, 'amp-ad', config1);
+        const element1 = createElementWithAttributes(doc, 'amp-ad', config1);
         const impl1 = new AmpAdNetworkDoubleclickImpl(element1);
         sandbox.stub(impl1, 'getPageLayoutBox').returns({top: 123, left: 456});
         impl1.experimentIds = [MANUAL_EXPERIMENT_ID];
-        sandbox.stub(impl1, 'generateAdKey_').withArgs('50x320')
-            .returns('13579');
+        sandbox
+          .stub(impl1, 'generateAdKey_')
+          .withArgs('50x320')
+          .returns('13579');
         impl1.populateAdUrlState();
-        impl1.identityToken =
-          /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/({
-            token: 'abcdef', jar: 'some_jar', pucrd: 'some_pucrd',
-          });
+        impl1.identityToken = /**@type {!../../../ads/google/a4a/utils.IdentityToken}*/ ({
+          token: 'abcdef',
+          jar: 'some_jar',
+          pucrd: 'some_pucrd',
+        });
         const targeting2 = {
           cookieOptOut: 1,
           categoryExclusions: 'food',
@@ -332,12 +364,13 @@ describes.realWin('Doubleclick SRA', config , env => {
           'data-multi-size-validation': 'false',
           'data-multi-size': '1x2,3x4',
         };
-        const element2 =
-          createElementWithAttributes(doc, 'amp-ad', config2);
+        const element2 = createElementWithAttributes(doc, 'amp-ad', config2);
         const impl2 = new AmpAdNetworkDoubleclickImpl(element2);
         sandbox.stub(impl2, 'getPageLayoutBox').returns({top: 789, left: 101});
-        sandbox.stub(impl2, 'generateAdKey_').withArgs('250x300')
-            .returns('2468');
+        sandbox
+          .stub(impl2, 'generateAdKey_')
+          .withArgs('250x300')
+          .returns('2468');
         element2.setAttribute(EXPERIMENT_ATTRIBUTE, MANUAL_EXPERIMENT_ID);
         impl2.populateAdUrlState();
         const exp = {
@@ -386,7 +419,12 @@ describes.realWin('Doubleclick SRA', config , env => {
     }
 
     function generateSraXhrMockCall(
-      validInstances, networkId, responses, opt_xhrFail, opt_allInvalid) {
+      validInstances,
+      networkId,
+      responses,
+      opt_xhrFail,
+      opt_allInvalid
+    ) {
       devAssert(validInstances.length > 1);
       devAssert(!(opt_xhrFail && opt_allInvalid));
       // Start with nameframe method, SRA will override to use safeframe.
@@ -394,39 +432,55 @@ describes.realWin('Doubleclick SRA', config , env => {
       headers[RENDERING_TYPE_HEADER] = XORIGIN_MODE.NAMEFRAME;
       // Assume all implementations have same data slot.
       const iuParts = encodeURIComponent(
-          validInstances[0].element.getAttribute('data-slot').split(/\//)
-              .splice(1).join());
-      sandbox.stub(validInstances[0], 'getLocationQueryParameterValue')
-          .withArgs('google_preview').returns('abcdef');
+        validInstances[0].element
+          .getAttribute('data-slot')
+          .split(/\//)
+          .splice(1)
+          .join()
+      );
+      sandbox
+        .stub(validInstances[0], 'getLocationQueryParameterValue')
+        .withArgs('google_preview')
+        .returns('abcdef');
       const xhrWithArgs = xhrMock.withArgs(
-          sinon.match(new RegExp(
-              '^https:\/\/securepubads\\.g\\.doubleclick\\.net' +
-              '\/gampad\/ads\\?output=ldjh&impl=fifs&iu_parts=' +
-              `${iuParts}&enc_prev_ius=.*&gct=abcdef`)),
-          {
-            mode: 'cors',
-            method: 'GET',
-            credentials: 'include',
-          });
+        sinon.match(
+          new RegExp(
+            '^https://securepubads\\.g\\.doubleclick\\.net' +
+              '/gampad/ads\\?output=ldjh&impl=fifs&iu_parts=' +
+              `${iuParts}&enc_prev_ius=.*&gct=abcdef`
+          )
+        ),
+        {
+          mode: 'cors',
+          method: 'GET',
+          credentials: 'include',
+        }
+      );
       if (opt_xhrFail) {
-        xhrWithArgs.returns(Promise.reject(
-            new TypeError('some random network error')));
+        xhrWithArgs.returns(
+          Promise.reject(new TypeError('some random network error'))
+        );
       } else if (opt_allInvalid) {
         xhrWithArgs.throws(new Error('invalid should not make xhr!'));
       } else {
-        xhrWithArgs.returns(Promise.resolve({
-          arrayBuffer: () => { throw new Error('Expected SRA!'); },
-          bodyUsed: false,
-          text: () => {
-            let slotDataString = '';
-            responses.forEach(slot => {
-              slotDataString +=
-                `${JSON.stringify(slot.headers)}\n${slot.creative}\n`;
-            });
-            return Promise.resolve(slotDataString);
-          },
-          headers,
-        }));
+        xhrWithArgs.returns(
+          Promise.resolve({
+            arrayBuffer: () => {
+              throw new Error('Expected SRA!');
+            },
+            bodyUsed: false,
+            text: () => {
+              let slotDataString = '';
+              responses.forEach(slot => {
+                slotDataString += `${JSON.stringify(slot.headers)}\n${
+                  slot.creative
+                }\n`;
+              });
+              return Promise.resolve(slotDataString);
+            },
+            headers,
+          })
+        );
       }
     }
 
@@ -438,25 +492,28 @@ describes.realWin('Doubleclick SRA', config , env => {
       };
       const iu = encodeURIComponent(impl.element.getAttribute('data-slot'));
       const urlRegexp = new RegExp(
-          '^https:\/\/securepubads\\.g\\.doubleclick\\.net' +
-        `\/gampad\/ads\\?iu=${iu}&`);
-      xhrMock.withArgs(
-          sinon.match(urlRegexp),
-          {
-            mode: 'cors',
-            method: 'GET',
-            credentials: 'include',
-          }).returns(Promise.resolve({
-        arrayBuffer: () => Promise.resolve(utf8Encode(creative)),
-        bodyUsed: false,
-        headers: {
-          get: header => headers[header],
-          has: header => header in headers,
-        },
-        text: () => {
-          throw new Error('should not be SRA!');
-        },
-      }));
+        '^https://securepubads\\.g\\.doubleclick\\.net' +
+          `\/gampad\/ads\\?iu=${iu}&`
+      );
+      xhrMock
+        .withArgs(sinon.match(urlRegexp), {
+          mode: 'cors',
+          method: 'GET',
+          credentials: 'include',
+        })
+        .returns(
+          Promise.resolve({
+            arrayBuffer: () => Promise.resolve(utf8Encode(creative)),
+            bodyUsed: false,
+            headers: {
+              get: header => headers[header],
+              has: header => header in headers,
+            },
+            text: () => {
+              throw new Error('should not be SRA!');
+            },
+          })
+        );
     }
 
     /**
@@ -479,7 +536,10 @@ describes.realWin('Doubleclick SRA', config , env => {
     function executeTest(items, opt_implicitSra) {
       if (!opt_implicitSra) {
         createAndAppendAdElement(
-            {name: 'amp-ad-doubleclick-sra'}, 'meta', doc.head);
+          {name: 'amp-ad-doubleclick-sra'},
+          'meta',
+          doc.head
+        );
       }
       // Store if XHR will fail by networkId.
       const networkXhrFailure = {};
@@ -487,8 +547,10 @@ describes.realWin('Doubleclick SRA', config , env => {
       const networkValidity = {};
       const doubleclickInstances = [];
       const networkNestHeaders = [];
-      const attemptCollapseSpy =
-        sandbox.spy(BaseElement.prototype, 'attemptCollapse');
+      const attemptCollapseSpy = sandbox.spy(
+        BaseElement.prototype,
+        'attemptCollapse'
+      );
       const expIds = [];
       let expectedAttemptCollapseCalls = 0;
       items.forEach(network => {
@@ -515,20 +577,21 @@ describes.realWin('Doubleclick SRA', config , env => {
         networkXhrFailure[network.networkId] = !!network.xhrFail;
         networkNestHeaders[network.networkId] = network.nestHeaders;
         expectedAttemptCollapseCalls +=
-            network.xhrFail && !opt_implicitSra ? network.instances : 0;
+          network.xhrFail && !opt_implicitSra ? network.instances : 0;
         expIds[network.networkId] = network.expIds || [];
       });
       const grouping = {};
       const groupingPromises = {};
       doubleclickInstances.forEach(impl => {
         const networkId = getNetworkId(impl.element);
-        (grouping[networkId] || (grouping[networkId] = []))
-            .push(impl);
-        (groupingPromises[networkId] || (groupingPromises[networkId] = []))
-            .push(Promise.resolve(impl));
+        (grouping[networkId] || (grouping[networkId] = [])).push(impl);
+        (
+          groupingPromises[networkId] || (groupingPromises[networkId] = [])
+        ).push(Promise.resolve(impl));
       });
-      sandbox.stub(AmpAdNetworkDoubleclickImpl.prototype, 'groupSlotsForSra')
-          .returns(Promise.resolve(groupingPromises));
+      sandbox
+        .stub(AmpAdNetworkDoubleclickImpl.prototype, 'groupSlotsForSra')
+        .returns(Promise.resolve(groupingPromises));
       let idx = 0;
       const layoutCallbacks = [];
       const getLayoutCallback = (impl, creative, isSra, noRender) => {
@@ -543,7 +606,8 @@ describes.realWin('Doubleclick SRA', config , env => {
           if (opt_implicitSra) {
             expect(impl.iframe).to.be.ok;
             expect(impl.iframe.src).to.match(
-                /securepubads\.g\.doubleclick\.net/);
+              /securepubads\.g\.doubleclick\.net/
+            );
             return;
           }
           expect(impl.postAdResponseExperimentFeatures['foo']).to.equal('bar');
@@ -552,7 +616,8 @@ describes.realWin('Doubleclick SRA', config , env => {
           if (isSra) {
             // Expect safeframe.
             expect(name).to.match(
-                new RegExp(`^\\d+-\\d+-\\d+;\\d+;${creative}`));
+              new RegExp(`^\\d+-\\d+-\\d+;\\d+;${creative}`)
+            );
           } else {
             // Expect nameframe render.
             expect(JSON.parse(name).creative).to.equal(creative);
@@ -560,10 +625,12 @@ describes.realWin('Doubleclick SRA', config , env => {
         });
       };
       Object.keys(grouping).forEach(networkId => {
-        const validInstances = grouping[networkId].filter(impl =>
-          impl.element.getAttribute('data-test-invalid') != 'true');
-        const isSra = validInstances.length > 1 &&
-            !validInstances[0].experimentIds.includes('21062235');
+        const validInstances = grouping[networkId].filter(
+          impl => impl.element.getAttribute('data-test-invalid') != 'true'
+        );
+        const isSra =
+          validInstances.length > 1 &&
+          !validInstances[0].experimentIds.includes('21062235');
         const sraResponses = [];
         validInstances.forEach(impl => {
           const creative = `slot${idx++}`;
@@ -579,26 +646,41 @@ describes.realWin('Doubleclick SRA', config , env => {
           } else {
             generateNonSraXhrMockCall(impl, creative);
           }
-          layoutCallbacks.push(getLayoutCallback(
-              impl, creative, isSra,
+          layoutCallbacks.push(
+            getLayoutCallback(
+              impl,
+              creative,
+              isSra,
               (!opt_implicitSra && networkXhrFailure[networkId]) ||
-            impl.element.getAttribute('data-test-invalid') == 'true'));
+                impl.element.getAttribute('data-test-invalid') == 'true'
+            )
+          );
         });
         if (isSra) {
-          generateSraXhrMockCall(validInstances, networkId, sraResponses,
-              networkXhrFailure[networkId], networkValidity[networkId]);
+          generateSraXhrMockCall(
+            validInstances,
+            networkId,
+            sraResponses,
+            networkXhrFailure[networkId],
+            networkValidity[networkId]
+          );
         }
       });
-      return Promise.all(layoutCallbacks).then(() => expect(
-          attemptCollapseSpy.callCount).to.equal(expectedAttemptCollapseCalls));
+      return Promise.all(layoutCallbacks).then(() =>
+        expect(attemptCollapseSpy.callCount).to.equal(
+          expectedAttemptCollapseCalls
+        )
+      );
     }
 
     beforeEach(() => {
       xhrMock = sandbox.stub(Xhr.prototype, 'fetch');
-      sandbox.stub(AmpA4A.prototype,
-          'getSigningServiceNames').returns(['google']);
-      sandbox.stub(SignatureVerifier.prototype, 'loadKeyset')
-          .callsFake(() => {});
+      sandbox
+        .stub(AmpA4A.prototype, 'getSigningServiceNames')
+        .returns(['google']);
+      sandbox
+        .stub(SignatureVerifier.prototype, 'loadKeyset')
+        .callsFake(() => {});
     });
 
     afterEach(() => {
@@ -607,17 +689,17 @@ describes.realWin('Doubleclick SRA', config , env => {
 
     it('should not use SRA if single slot', () => executeTest([1234]));
 
-    it('should not use SRA if single slot, multiple networks',
-        () => executeTest([1234, 4567]));
+    it('should not use SRA if single slot, multiple networks', () =>
+      executeTest([1234, 4567]));
 
-    it('should correctly use SRA for multiple slots',
-        () => executeTest([1234, 1234]));
+    it('should correctly use SRA for multiple slots', () =>
+      executeTest([1234, 1234]));
 
     it('should correctly handle SRA response with nested headers', () =>
       executeTest([{networkId: 1234, instances: 2, nestHeaders: true}]));
 
-    it('should not send SRA request if slots are invalid',
-        () => executeTest([{networkId: 1234, invalidInstances: 2}]));
+    it('should not send SRA request if slots are invalid', () =>
+      executeTest([{networkId: 1234, invalidInstances: 2}]));
 
     it('should send SRA request if more than 1 slot is valid', () =>
       executeTest([{networkId: 1234, instances: 2, invalidInstances: 2}]));
@@ -628,22 +710,31 @@ describes.realWin('Doubleclick SRA', config , env => {
     it('should send SRA request if only 1 slot and no recovery exp', () =>
       executeTest([{networkId: 1234, instances: 1, expIds: ['21062235']}]));
 
-    it('should handle xhr failure by not sending subsequent request',
-        () => executeTest([{networkId: 1234, instances: 2, xhrFail: true}]));
-
-    it('should handle xhr failure by via subsequent request if implicit',
-        () => executeTest([{networkId: 1234, instances: 2, xhrFail: true}],
-            true));
-
-    it('should handle mixture of xhr and non xhr failures', () => executeTest(
-        [{networkId: 1234, instances: 2, xhrFail: true}, 4567, 4567]));
-
-    it('should correctly use SRA for multiple slots. multiple networks',
-        () => executeTest([1234, 4567, 1234, 4567]));
-
-    it('should handle mixture of all possible scenarios', () => executeTest(
-        [1234, 1234, 101, {networkId: 4567, instances: 2, xhrFail: true}, 202,
-          {networkId: 8901, instances: 3, invalidInstances: 1}]));
+    it('should handle xhr failure by not sending subsequent request', () =>
+      executeTest([{networkId: 1234, instances: 2, xhrFail: true}]));
+
+    it('should handle xhr failure by via subsequent request if implicit', () =>
+      executeTest([{networkId: 1234, instances: 2, xhrFail: true}], true));
+
+    it('should handle mixture of xhr and non xhr failures', () =>
+      executeTest([
+        {networkId: 1234, instances: 2, xhrFail: true},
+        4567,
+        4567,
+      ]));
+
+    it('should correctly use SRA for multiple slots. multiple networks', () =>
+      executeTest([1234, 4567, 1234, 4567]));
+
+    it('should handle mixture of all possible scenarios', () =>
+      executeTest([
+        1234,
+        1234,
+        101,
+        {networkId: 4567, instances: 2, xhrFail: true},
+        202,
+        {networkId: 8901, instances: 3, invalidInstances: 1},
+      ]));
   });
 
   describe('#sraBlockCallbackHandler', () => {
@@ -652,18 +743,30 @@ describes.realWin('Doubleclick SRA', config , env => {
       const headerObj = {a: 'b', c: 123};
       const slotDeferred = new Deferred();
       const sraRequestAdUrlResolvers = [
-        slotDeferred.resolve, {resolve: () => {throw new Error();}}];
+        slotDeferred.resolve,
+        {
+          resolve: () => {
+            throw new Error();
+          },
+        },
+      ];
       sraBlockCallbackHandler(
-          creative, headerObj, /* done */false, sraRequestAdUrlResolvers);
+        creative,
+        headerObj,
+        /* done */ false,
+        sraRequestAdUrlResolvers
+      );
       expect(sraRequestAdUrlResolvers.length).to.equal(1);
       return slotDeferred.promise.then(fetchResponse => {
         expect(fetchResponse.headers.get('a')).to.equal('b');
         expect(fetchResponse.headers.get('c')).to.equal('123');
-        expect(fetchResponse.headers.get(RENDERING_TYPE_HEADER.toLowerCase()))
-            .to.equal(XORIGIN_MODE.SAFEFRAME);
+        expect(
+          fetchResponse.headers.get(RENDERING_TYPE_HEADER.toLowerCase())
+        ).to.equal(XORIGIN_MODE.SAFEFRAME);
         expect(fetchResponse.headers.has('unknown')).to.be.false;
-        return fetchResponse.arrayBuffer().then(buffer =>
-          expect(utf8Decode(buffer)).to.equal(creative));
+        return fetchResponse
+          .arrayBuffer()
+          .then(buffer => expect(utf8Decode(buffer)).to.equal(creative));
       });
     });
 
@@ -690,17 +793,28 @@ describes.realWin('Doubleclick SRA', config , env => {
       for (let i = 1; i <= blocks.length; i++) {
         const {creative, headers, deferred} = blocks[i - 1];
         sraBlockCallbackHandler(
-            creative, headers, resolvers.length == 1, resolvers);
+          creative,
+          headers,
+          resolvers.length == 1,
+          resolvers
+        );
         expect(resolvers.length).to.equal(blocks.length - i);
-        promises.push(deferred.promise.then(fetchResponse => {
-          Object.keys(headers).forEach(name => expect(
-              fetchResponse.header.get(name)).to.equal(String(headers[name])));
-          expect(fetchResponse.headers.get(RENDERING_TYPE_HEADER.toLowerCase()))
-              .to.equal(XORIGIN_MODE.SAFEFRAME);
-          expect(fetchResponse.headers.has('unknown')).to.be.false;
-          return fetchResponse.arrayBuffer().then(buffer =>
-            expect(utf8Decode(buffer)).to.equal(creative));
-        }));
+        promises.push(
+          deferred.promise.then(fetchResponse => {
+            Object.keys(headers).forEach(name =>
+              expect(fetchResponse.header.get(name)).to.equal(
+                String(headers[name])
+              )
+            );
+            expect(
+              fetchResponse.headers.get(RENDERING_TYPE_HEADER.toLowerCase())
+            ).to.equal(XORIGIN_MODE.SAFEFRAME);
+            expect(fetchResponse.headers.has('unknown')).to.be.false;
+            return fetchResponse
+              .arrayBuffer()
+              .then(buffer => expect(utf8Decode(buffer)).to.equal(creative));
+          })
+        );
       }
       return promises;
     });
diff --git a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js
index 35df58b2948b..8d3b47dfaaf3 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/amp-ad-network-fake-impl.js
@@ -21,7 +21,6 @@ import {user, userAssert} from '../../../src/log';
 const TAG = 'AMP-AD-NETWORK-FAKE-IMPL';
 
 export class AmpAdNetworkFakeImpl extends AmpA4A {
-
   /**
    * @param {!Element} element
    */
@@ -31,8 +30,11 @@ export class AmpAdNetworkFakeImpl extends AmpA4A {
 
   /** @override */
   buildCallback() {
-    userAssert(this.element.hasAttribute('src'),
-        'Attribute src required for <amp-ad type="fake">: %s', this.element);
+    userAssert(
+      this.element.hasAttribute('src'),
+      'Attribute src required for <amp-ad type="fake">: %s',
+      this.element
+    );
     super.buildCallback();
   }
 
@@ -60,17 +62,22 @@ export class AmpAdNetworkFakeImpl extends AmpA4A {
       if (!response) {
         return null;
       }
-      const {status, headers} =
-      /** @type {{status: number, headers: !Headers}} */ (response);
+      const {
+        status,
+        headers,
+      } = /** @type {{status: number, headers: !Headers}} */ (response);
 
       // In the convert creative mode the content is the plain AMP HTML.
       // This mode is primarily used for A4A Envelop for testing.
       // See DEVELOPING.md for more info.
       if (this.element.getAttribute('a4a-conversion') == 'true') {
         return response.text().then(
-            responseText => new Response(
-                this.transformCreative_(responseText),
-                {status, headers}));
+          responseText =>
+            new Response(this.transformCreative_(responseText), {
+              status,
+              headers,
+            })
+        );
       }
 
       // Normal mode: Expect the creative is written in AMP4ADS doc.
@@ -119,7 +126,7 @@ export class AmpAdNetworkFakeImpl extends AmpA4A {
       style.parentNode.removeChild(style);
     }
 
-    let creative = root./*OK*/outerHTML;
+    let creative = root./*OK*/ outerHTML;
 
     // Metadata
     creative += '<script type="application/json" amp-ad-metadata>';
@@ -151,8 +158,6 @@ export class AmpAdNetworkFakeImpl extends AmpA4A {
   }
 }
 
-
 AMP.extension('amp-ad-network-fake-impl', '0.1', AMP => {
-  AMP.registerElement(
-      'amp-ad-network-fake-impl', AmpAdNetworkFakeImpl);
+  AMP.registerElement('amp-ad-network-fake-impl', AmpAdNetworkFakeImpl);
 });
diff --git a/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js b/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
index e5bfc95ae5db..17dbbffa7ee0 100644
--- a/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
+++ b/extensions/amp-ad-network-fake-impl/0.1/test/test-amp-ad-network-fake-impl.js
@@ -17,40 +17,43 @@
 import {AmpAd} from '../../../amp-ad/0.1/amp-ad'; // eslint-disable-line no-unused-vars
 import {AmpAdNetworkFakeImpl} from '../amp-ad-network-fake-impl';
 
-describes.realWin('amp-ad-network-fake-impl', {
-  amp: {
-    extensions: ['amp-ad', 'amp-ad-network-fake-impl'],
+describes.realWin(
+  'amp-ad-network-fake-impl',
+  {
+    amp: {
+      extensions: ['amp-ad', 'amp-ad-network-fake-impl'],
+    },
   },
-}, env => {
-  let doc;
-  let win;
-  let fakeImplElem;
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    fakeImplElem = doc.createElement('amp-ad');
-    fakeImplElem.setAttribute('type', 'fake');
-    fakeImplElem.setAttribute('src', 'https://fake.com');
-  });
+  env => {
+    let doc;
+    let win;
+    let fakeImplElem;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      fakeImplElem = doc.createElement('amp-ad');
+      fakeImplElem.setAttribute('type', 'fake');
+      fakeImplElem.setAttribute('src', 'https://fake.com');
+    });
 
-  it('should not send ad request with valid id', () => {
-    const fakeImpl = new AmpAdNetworkFakeImpl(fakeImplElem);
-    // no id
-    expect(fakeImpl.isValidElement()).to.be.false;
-    // valid id
-    fakeImplElem.setAttribute('id', 'valid');
-    const fakeImpl2 = new AmpAdNetworkFakeImpl(fakeImplElem);
-    expect(fakeImpl2.isValidElement()).to.be.false;
-  });
+    it('should not send ad request with valid id', () => {
+      const fakeImpl = new AmpAdNetworkFakeImpl(fakeImplElem);
+      // no id
+      expect(fakeImpl.isValidElement()).to.be.false;
+      // valid id
+      fakeImplElem.setAttribute('id', 'valid');
+      const fakeImpl2 = new AmpAdNetworkFakeImpl(fakeImplElem);
+      expect(fakeImpl2.isValidElement()).to.be.false;
+    });
 
-  it('send ad request with invalid id', () => {
-    fakeImplElem.setAttribute('id', 'i-amphtml-demo-test');
-    const fakeImpl = new AmpAdNetworkFakeImpl(fakeImplElem);
-    expect(fakeImpl.isValidElement()).to.be.true;
-  });
+    it('send ad request with invalid id', () => {
+      fakeImplElem.setAttribute('id', 'i-amphtml-demo-test');
+      const fakeImpl = new AmpAdNetworkFakeImpl(fakeImplElem);
+      expect(fakeImpl.isValidElement()).to.be.true;
+    });
 
-  it('adds the correct metadata for a story ad', () => {
-    const storyAd = `
+    it('adds the correct metadata for a story ad', () => {
+      const storyAd = `
     <html ⚡4ads>
     <head>
       <meta charset="utf-8">
@@ -63,15 +66,17 @@ describes.realWin('amp-ad-network-fake-impl', {
     <body>Hello, AMP4ADS world.</body>
     </html>
     `;
-    fakeImplElem.setAttribute('id', 'i-amphtml-demo-test');
-    fakeImplElem.setAttribute('amp-story', '');
-    const transformed = new AmpAdNetworkFakeImpl(fakeImplElem)
-        .transformCreative_(storyAd);
-    const root = new DOMParser().parseFromString(transformed, 'text/html')
+      fakeImplElem.setAttribute('id', 'i-amphtml-demo-test');
+      fakeImplElem.setAttribute('amp-story', '');
+      const transformed = new AmpAdNetworkFakeImpl(
+        fakeImplElem
+      ).transformCreative_(storyAd);
+      const root = new DOMParser().parseFromString(transformed, 'text/html')
         .documentElement;
-    const metadata = root.querySelector('[amp-ad-metadata]').textContent;
-    const parsed = JSON.parse(metadata);
-    expect(parsed.ctaType).to.equal('INSTALL');
-    expect(parsed.ctaUrl).to.equal('https://www.amp.dev');
-  });
-});
+      const metadata = root.querySelector('[amp-ad-metadata]').textContent;
+      const parsed = JSON.parse(metadata);
+      expect(parsed.ctaType).to.equal('INSTALL');
+      expect(parsed.ctaUrl).to.equal('https://www.amp.dev');
+    });
+  }
+);
diff --git a/extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js b/extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js
index 289c9bab8974..71a1f74fe920 100644
--- a/extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js
+++ b/extensions/amp-ad-network-gmossp-impl/0.1/amp-ad-network-gmossp-impl.js
@@ -40,13 +40,14 @@ const GMOSSP_BASE_A4A_URL_ = 'https://amp.sp.gmossp-sp.jp/_a4a/';
  * the cloudflare signing key.
  */
 export class AmpAdNetworkGmosspImpl extends AmpA4A {
-
   /** @override */
   isValidElement() {
     const src = this.element.getAttribute('src') || '';
-    return this.isAmpAdElement() &&
-        (startsWith(src, GMOSSP_BASE_URL_) ||
-         startsWith(src, GMOSSP_BASE_A4A_URL_));
+    return (
+      this.isAmpAdElement() &&
+      (startsWith(src, GMOSSP_BASE_URL_) ||
+        startsWith(src, GMOSSP_BASE_A4A_URL_))
+    );
   }
 
   /** @override */
@@ -56,14 +57,12 @@ export class AmpAdNetworkGmosspImpl extends AmpA4A {
 
   /** @override */
   getAdUrl() {
-    return this.element.getAttribute('src').replace(GMOSSP_BASE_URL_,
-        GMOSSP_BASE_A4A_URL_);
+    return this.element
+      .getAttribute('src')
+      .replace(GMOSSP_BASE_URL_, GMOSSP_BASE_A4A_URL_);
   }
-
 }
 
-
 AMP.extension('amp-ad-network-gmossp-impl', '0.1', AMP => {
-  AMP.registerElement('amp-ad-network-gmossp-impl',
-      AmpAdNetworkGmosspImpl);
+  AMP.registerElement('amp-ad-network-gmossp-impl', AmpAdNetworkGmosspImpl);
 });
diff --git a/extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js b/extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js
index 792a8c8e995f..9a9ba60937d0 100644
--- a/extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js
+++ b/extensions/amp-ad-network-gmossp-impl/0.1/gmossp-a4a-config.js
@@ -30,8 +30,11 @@ const GMOSSP_SRC_A4A_PREFIX_ = 'https://amp.sp.gmossp-sp.jp/_a4a/';
  */
 export function gmosspIsA4AEnabled(win, element, useRemoteHtml) {
   let src;
-  return !useRemoteHtml && !!(src = element.getAttribute('src')) &&
-      !!element.getAttribute('data-use-a4a') &&
-      (startsWith(src, GMOSSP_SRC_PREFIX_) ||
-       startsWith(src, GMOSSP_SRC_A4A_PREFIX_));
+  return (
+    !useRemoteHtml &&
+    !!(src = element.getAttribute('src')) &&
+    !!element.getAttribute('data-use-a4a') &&
+    (startsWith(src, GMOSSP_SRC_PREFIX_) ||
+      startsWith(src, GMOSSP_SRC_A4A_PREFIX_))
+  );
 }
diff --git a/extensions/amp-ad-network-gmossp-impl/0.1/test/test-amp-ad-network-gmossp-impl.js b/extensions/amp-ad-network-gmossp-impl/0.1/test/test-amp-ad-network-gmossp-impl.js
index 25623a2242fe..79e20ffffbe2 100644
--- a/extensions/amp-ad-network-gmossp-impl/0.1/test/test-amp-ad-network-gmossp-impl.js
+++ b/extensions/amp-ad-network-gmossp-impl/0.1/test/test-amp-ad-network-gmossp-impl.js
@@ -24,7 +24,6 @@ import {
 import {createElementWithAttributes} from '../../../../src/dom';
 import {gmosspIsA4AEnabled} from '../gmossp-a4a-config';
 
-
 describes.realWin('gmossp-a4a-config', {amp: false}, env => {
   let doc;
   let win;
@@ -41,14 +40,16 @@ describes.realWin('gmossp-a4a-config', {amp: false}, env => {
   });
   it('should pass a4a config predicate', () => {
     const element = createElementWithAttributes(doc, 'amp-ad', {
-      src: 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1',
+      src:
+        'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1',
       'data-use-a4a': 'true',
     });
     expect(gmosspIsA4AEnabled(win, element)).to.be.true;
   });
   it('should fail a4a config predicate due to useRemoteHtml', () => {
     const element = createElementWithAttributes(doc, 'amp-ad', {
-      src: 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1',
+      src:
+        'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1',
       'data-use-a4a': 'true',
     });
     const useRemoteHtml = true;
@@ -75,61 +76,72 @@ describes.realWin('gmossp-a4a-config', {amp: false}, env => {
   });
 });
 
-
-describes.realWin('amp-ad-network-gmossp-impl', {
-  amp: {
-    extensions: ['amp-ad-network-gmossp-impl'],
+describes.realWin(
+  'amp-ad-network-gmossp-impl',
+  {
+    amp: {
+      extensions: ['amp-ad-network-gmossp-impl'],
+    },
   },
-}, env => {
-  let win, doc;
-  let gmosspImpl;
-  let gmosspImplElem;
+  env => {
+    let win, doc;
+    let gmosspImpl;
+    let gmosspImplElem;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    gmosspImplElem = doc.createElement('amp-ad');
-    gmosspImplElem.setAttribute('type', 'gmossp');
-    gmosspImplElem.setAttribute('data-use-a4a', 'true');
-    sandbox.stub(
-        AmpAdNetworkGmosspImpl.prototype, 'getSigningServiceNames').callsFake(
-        () => {
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      gmosspImplElem = doc.createElement('amp-ad');
+      gmosspImplElem.setAttribute('type', 'gmossp');
+      gmosspImplElem.setAttribute('data-use-a4a', 'true');
+      sandbox
+        .stub(AmpAdNetworkGmosspImpl.prototype, 'getSigningServiceNames')
+        .callsFake(() => {
           return ['google'];
         });
-    gmosspImpl = new AmpAdNetworkGmosspImpl(gmosspImplElem);
-  });
-
-  describe('#isValidElement', () => {
-    it('should be valid', () => {
-      gmosspImplElem.setAttribute('src',
-          'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1');
-      expect(gmosspImpl.isValidElement()).to.be.true;
-    });
-    it('should be valid', () => {
-      gmosspImplElem.setAttribute('src',
-          'https://sp.gmossp-sp.jp/ads/ssp.ad?space_id=33303&is_a4a=1');
-      expect(gmosspImpl.isValidElement()).to.be.true;
-    });
-    it('should NOT be valid (impl tag name)', () => {
-      gmosspImplElem = doc.createElement('amp-ad-network-gmossp-impl');
-      gmosspImplElem.setAttribute('type', 'gmossp');
       gmosspImpl = new AmpAdNetworkGmosspImpl(gmosspImplElem);
-      expect(gmosspImpl.isValidElement()).to.be.false;
     });
-  });
 
-  describe('#getAdUrl', () => {
-    it('should be valid', () => {
-      gmosspImplElem.setAttribute('src',
-          'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1');
-      const base = 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?';
-      expect(gmosspImpl.getAdUrl().substring(0, base.length)).to.equal(base);
+    describe('#isValidElement', () => {
+      it('should be valid', () => {
+        gmosspImplElem.setAttribute(
+          'src',
+          'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1'
+        );
+        expect(gmosspImpl.isValidElement()).to.be.true;
+      });
+      it('should be valid', () => {
+        gmosspImplElem.setAttribute(
+          'src',
+          'https://sp.gmossp-sp.jp/ads/ssp.ad?space_id=33303&is_a4a=1'
+        );
+        expect(gmosspImpl.isValidElement()).to.be.true;
+      });
+      it('should NOT be valid (impl tag name)', () => {
+        gmosspImplElem = doc.createElement('amp-ad-network-gmossp-impl');
+        gmosspImplElem.setAttribute('type', 'gmossp');
+        gmosspImpl = new AmpAdNetworkGmosspImpl(gmosspImplElem);
+        expect(gmosspImpl.isValidElement()).to.be.false;
+      });
     });
-    it('should be valid', () => {
-      gmosspImplElem.setAttribute('src',
-          'https://sp.gmossp-sp.jp/ads/ssp.ad?space_id=33303&is_a4a=1');
-      const base = 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?';
-      expect(gmosspImpl.getAdUrl().substring(0, base.length)).to.equal(base);
+
+    describe('#getAdUrl', () => {
+      it('should be valid', () => {
+        gmosspImplElem.setAttribute(
+          'src',
+          'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?space_id=33303&is_a4a=1'
+        );
+        const base = 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?';
+        expect(gmosspImpl.getAdUrl().substring(0, base.length)).to.equal(base);
+      });
+      it('should be valid', () => {
+        gmosspImplElem.setAttribute(
+          'src',
+          'https://sp.gmossp-sp.jp/ads/ssp.ad?space_id=33303&is_a4a=1'
+        );
+        const base = 'https://amp.sp.gmossp-sp.jp/_a4a/ads/ssp.ad?';
+        expect(gmosspImpl.getAdUrl().substring(0, base.length)).to.equal(base);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ad-network-triplelift-impl/0.1/amp-ad-network-triplelift-impl.js b/extensions/amp-ad-network-triplelift-impl/0.1/amp-ad-network-triplelift-impl.js
index 9bb8e8a8c340..10293f73d09f 100644
--- a/extensions/amp-ad-network-triplelift-impl/0.1/amp-ad-network-triplelift-impl.js
+++ b/extensions/amp-ad-network-triplelift-impl/0.1/amp-ad-network-triplelift-impl.js
@@ -39,7 +39,6 @@ const TRIPLELIFT_BASE_A4A_URL_ = 'amp.3lift.com/_a4a/amp/auction';
  * the cloudflare signing key.
  */
 export class AmpAdNetworkTripleliftImpl extends AmpA4A {
-
   /** @override */
   isValidElement() {
     return this.isAmpAdElement();
@@ -52,13 +51,15 @@ export class AmpAdNetworkTripleliftImpl extends AmpA4A {
 
   /** @override */
   getAdUrl() {
-    return this.element.getAttribute('src').replace(TRIPLELIFT_BASE_URL_,
-        TRIPLELIFT_BASE_A4A_URL_);
+    return this.element
+      .getAttribute('src')
+      .replace(TRIPLELIFT_BASE_URL_, TRIPLELIFT_BASE_A4A_URL_);
   }
 }
 
-
 AMP.extension('amp-ad-network-triplelift-impl', '0.1', AMP => {
-  AMP.registerElement('amp-ad-network-triplelift-impl',
-      AmpAdNetworkTripleliftImpl);
+  AMP.registerElement(
+    'amp-ad-network-triplelift-impl',
+    AmpAdNetworkTripleliftImpl
+  );
 });
diff --git a/extensions/amp-ad-network-triplelift-impl/0.1/test/test-amp-ad-network-triplelift-impl.js b/extensions/amp-ad-network-triplelift-impl/0.1/test/test-amp-ad-network-triplelift-impl.js
index 4c8d07ab2ac6..e79615cc9001 100644
--- a/extensions/amp-ad-network-triplelift-impl/0.1/test/test-amp-ad-network-triplelift-impl.js
+++ b/extensions/amp-ad-network-triplelift-impl/0.1/test/test-amp-ad-network-triplelift-impl.js
@@ -24,7 +24,6 @@ import {
 import {createElementWithAttributes} from '../../../../src/dom';
 import {tripleliftIsA4AEnabled} from '../triplelift-a4a-config';
 
-
 describes.realWin('triplelift-a4a-config', {amp: false}, env => {
   let doc;
   let win;
@@ -68,49 +67,56 @@ describes.realWin('triplelift-a4a-config', {amp: false}, env => {
   });
 });
 
-
-describes.realWin('amp-ad-network-triplelift-impl', {
-  amp: {
-    extensions: ['amp-ad-network-triplelift-impl'],
+describes.realWin(
+  'amp-ad-network-triplelift-impl',
+  {
+    amp: {
+      extensions: ['amp-ad-network-triplelift-impl'],
+    },
   },
-}, env => {
-  let win, doc;
-  let tripleliftImpl;
-  let tripleliftImplElem;
+  env => {
+    let win, doc;
+    let tripleliftImpl;
+    let tripleliftImplElem;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    tripleliftImplElem = doc.createElement('amp-ad');
-    tripleliftImplElem.setAttribute('type', 'triplelift');
-    tripleliftImplElem.setAttribute('src',
-        'https://ib.3lift.com/ttj?inv_code=ampforadstest_main_feed');
-    tripleliftImplElem.setAttribute('data-use-a4a','true');
-    sandbox.stub(
-        AmpAdNetworkTripleliftImpl.prototype,
-        'getSigningServiceNames').callsFake(
-        () => {
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      tripleliftImplElem = doc.createElement('amp-ad');
+      tripleliftImplElem.setAttribute('type', 'triplelift');
+      tripleliftImplElem.setAttribute(
+        'src',
+        'https://ib.3lift.com/ttj?inv_code=ampforadstest_main_feed'
+      );
+      tripleliftImplElem.setAttribute('data-use-a4a', 'true');
+      sandbox
+        .stub(AmpAdNetworkTripleliftImpl.prototype, 'getSigningServiceNames')
+        .callsFake(() => {
           return ['cloudflare'];
         });
-    tripleliftImpl = new AmpAdNetworkTripleliftImpl(tripleliftImplElem);
-  });
-
-  describe('#isValidElement', () => {
-    it('should be valid', () => {
-      expect(tripleliftImpl.isValidElement()).to.be.true;
-    });
-    it('should NOT be valid (impl tag name)', () => {
-      tripleliftImplElem = doc.createElement('amp-ad-network-triplelift-impl');
-      tripleliftImplElem.setAttribute('type', 'triplelift');
       tripleliftImpl = new AmpAdNetworkTripleliftImpl(tripleliftImplElem);
-      expect(tripleliftImpl.isValidElement()).to.be.false;
     });
-  });
 
-  describe('#getAdUrl', () => {
-    it('should be valid', () => {
-      expect(tripleliftImpl.getAdUrl()).to.equal(
-          'https://amp.3lift.com/_a4a/amp/auction?inv_code=ampforadstest_main_feed');
+    describe('#isValidElement', () => {
+      it('should be valid', () => {
+        expect(tripleliftImpl.isValidElement()).to.be.true;
+      });
+      it('should NOT be valid (impl tag name)', () => {
+        tripleliftImplElem = doc.createElement(
+          'amp-ad-network-triplelift-impl'
+        );
+        tripleliftImplElem.setAttribute('type', 'triplelift');
+        tripleliftImpl = new AmpAdNetworkTripleliftImpl(tripleliftImplElem);
+        expect(tripleliftImpl.isValidElement()).to.be.false;
+      });
     });
-  });
-});
+
+    describe('#getAdUrl', () => {
+      it('should be valid', () => {
+        expect(tripleliftImpl.getAdUrl()).to.equal(
+          'https://amp.3lift.com/_a4a/amp/auction?inv_code=ampforadstest_main_feed'
+        );
+      });
+    });
+  }
+);
diff --git a/extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js b/extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js
index aafac9916eb0..faebfda22154 100644
--- a/extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js
+++ b/extensions/amp-ad-network-triplelift-impl/0.1/triplelift-a4a-config.js
@@ -24,6 +24,10 @@ const SRC_PREFIX_ = 'https://ib.3lift.com/';
  */
 export function tripleliftIsA4AEnabled(win, element, useRemoteHtml) {
   let src;
-  return !useRemoteHtml && !!element.getAttribute('data-use-a4a') && !!(src =
-    element.getAttribute('src')) && src.indexOf(SRC_PREFIX_) == 0;
+  return (
+    !useRemoteHtml &&
+    !!element.getAttribute('data-use-a4a') &&
+    !!(src = element.getAttribute('src')) &&
+    src.indexOf(SRC_PREFIX_) == 0
+  );
 }
diff --git a/extensions/amp-ad/0.1/amp-ad-3p-impl.js b/extensions/amp-ad/0.1/amp-ad-3p-impl.js
index 051b5fb0b903..1a97218ab2b7 100644
--- a/extensions/amp-ad/0.1/amp-ad-3p-impl.js
+++ b/extensions/amp-ad/0.1/amp-ad-3p-impl.js
@@ -30,15 +30,11 @@ import {
 } from '../../../src/layout';
 import {adConfig} from '../../../ads/_config';
 import {clamp} from '../../../src/utils/math';
-import {
-  computedStyle,
-  setStyle,
-} from '../../../src/style';
+import {computedStyle, setStyle} from '../../../src/style';
 import {dev, devAssert, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getAdCid} from '../../../src/ad-cid';
-import {getAdContainer, isAdPositionAllowed}
-  from '../../../src/ad-helper';
+import {getAdContainer, isAdPositionAllowed} from '../../../src/ad-helper';
 import {
   getAmpAdRenderOutsideViewport,
   incrementLoadingAds,
@@ -64,7 +60,6 @@ const MIN_FULL_WIDTH_HEIGHT = 100;
 const MAX_FULL_WIDTH_HEIGHT = 500;
 
 export class AmpAd3PImpl extends AMP.BaseElement {
-
   /**
    * @param {!AmpElement} element
    */
@@ -158,8 +153,7 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     }
     // Otherwise the ad is good to go.
     const elementCheck = getAmpAdRenderOutsideViewport(this.element);
-    return elementCheck !== null ?
-      elementCheck : super.renderOutsideViewport();
+    return elementCheck !== null ? elementCheck : super.renderOutsideViewport();
   }
 
   /**
@@ -198,8 +192,7 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     this.fallback_ = this.getFallback();
 
     this.config = adConfig[this.type_];
-    userAssert(
-        this.config, `Type "${this.type_}" is not supported in amp-ad`);
+    userAssert(this.config, `Type "${this.type_}" is not supported in amp-ad`);
 
     this.uiHandler = new AmpAdUIHandler(this);
 
@@ -219,12 +212,18 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     if (!hasFullWidth) {
       return false;
     }
-    userAssert(this.element.getAttribute('width') == '100vw',
-        'Ad units with data-full-width must have width="100vw".');
-    userAssert(!!this.config.fullWidthHeightRatio,
-        'Ad network does not support full width ads.');
-    dev().info(TAG_3P_IMPL,
-        '#${this.getResource().getId()} Full width requested');
+    userAssert(
+      this.element.getAttribute('width') == '100vw',
+      'Ad units with data-full-width must have width="100vw".'
+    );
+    userAssert(
+      !!this.config.fullWidthHeightRatio,
+      'Ad network does not support full width ads.'
+    );
+    dev().info(
+      TAG_3P_IMPL,
+      '#${this.getResource().getId()} Full width requested'
+    );
     return true;
   }
 
@@ -235,8 +234,7 @@ export class AmpAd3PImpl extends AMP.BaseElement {
    */
   preconnectCallback(opt_onLayout) {
     // We always need the bootstrap.
-    preloadBootstrap(
-        this.win, this.preconnect, this.config.remoteHTMLDisabled);
+    preloadBootstrap(this.win, this.preconnect, this.config.remoteHTMLDisabled);
     if (typeof this.config.prefetch == 'string') {
       this.preconnect.preload(this.config.prefetch, 'script');
     } else if (this.config.prefetch) {
@@ -281,19 +279,23 @@ export class AmpAd3PImpl extends AMP.BaseElement {
       const layoutBox = this.getLayoutBox();
 
       // Nudge into the correct horizontal position by changing side margin.
-      this.getVsync().run({
-        measure: state => {
-          state.direction =
-              computedStyle(this.win, this.element)['direction'];
-        },
-        mutate: state => {
-          if (state.direction == 'rtl') {
-            setStyle(this.element, 'marginRight', layoutBox.left, 'px');
-          } else {
-            setStyle(this.element, 'marginLeft', -layoutBox.left, 'px');
-          }
+      this.getVsync().run(
+        {
+          measure: state => {
+            state.direction = computedStyle(this.win, this.element)[
+              'direction'
+            ];
+          },
+          mutate: state => {
+            if (state.direction == 'rtl') {
+              setStyle(this.element, 'marginRight', layoutBox.left, 'px');
+            } else {
+              setStyle(this.element, 'marginLeft', -layoutBox.left, 'px');
+            }
+          },
         },
-      }, {direction: ''});
+        {direction: ''}
+      );
     }
   }
 
@@ -303,8 +305,9 @@ export class AmpAd3PImpl extends AMP.BaseElement {
    */
   measureIframeLayoutBox_() {
     if (this.xOriginIframeHandler_ && this.xOriginIframeHandler_.iframe) {
-      const iframeBox =
-          this.getViewport().getLayoutRect(this.xOriginIframeHandler_.iframe);
+      const iframeBox = this.getViewport().getLayoutRect(
+        this.xOriginIframeHandler_.iframe
+      );
       const box = this.getLayoutBox();
       // Cache the iframe's relative position to the amp-ad. This is
       // necessary for fixed-position containers which "move" with the
@@ -325,8 +328,9 @@ export class AmpAd3PImpl extends AMP.BaseElement {
       this.measureIframeLayoutBox_();
     }
 
-    const iframe = /** @type {!../../../src/layout-rect.LayoutRectDef} */(
-      devAssert(this.iframeLayoutBox_));
+    const iframe = /** @type {!../../../src/layout-rect.LayoutRectDef} */ (devAssert(
+      this.iframeLayoutBox_
+    ));
     return moveLayoutRect(iframe, box.left, box.top);
   }
 
@@ -335,16 +339,20 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     if (this.layoutPromise_) {
       return this.layoutPromise_;
     }
-    userAssert(!this.isInFixedContainer_,
-        '<amp-ad> is not allowed to be placed in elements with ' +
-        'position:fixed: %s', this.element);
+    userAssert(
+      !this.isInFixedContainer_,
+      '<amp-ad> is not allowed to be placed in elements with ' +
+        'position:fixed: %s',
+      this.element
+    );
 
     const consentPromise = this.getConsentState();
     const consentPolicyId = super.getConsentPolicy();
     const isConsentV2Experiment = isExperimentOn(this.win, 'amp-consent-v2');
-    const consentStringPromise = (consentPolicyId && isConsentV2Experiment)
-      ? getConsentPolicyInfo(this.element, consentPolicyId)
-      : Promise.resolve(null);
+    const consentStringPromise =
+      consentPolicyId && isConsentV2Experiment
+        ? getConsentPolicyInfo(this.element, consentPolicyId)
+        : Promise.resolve(null);
     const sharedDataPromise = consentPolicyId
       ? getConsentPolicySharedData(this.element, consentPolicyId)
       : Promise.resolve(null);
@@ -355,7 +363,6 @@ export class AmpAd3PImpl extends AMP.BaseElement {
       sharedDataPromise,
       consentStringPromise,
     ]).then(consents => {
-
       // Use JsonObject to preserve field names so that ampContext can access
       // values with name
       // ampcontext.js and this file are compiled in different compilation unit
@@ -378,11 +385,14 @@ export class AmpAd3PImpl extends AMP.BaseElement {
       // because both happen inside a cross-domain iframe.  Separating them
       // here, though, allows us to measure the impact of ad throttling via
       // incrementLoadingAds().
-      const iframe = getIframe(toWin(this.element.ownerDocument.defaultView),
-          this.element, this.type_, opt_context,
-          {disallowCustom: this.config.remoteHTMLDisabled});
-      this.xOriginIframeHandler_ = new AmpAdXOriginIframeHandler(
-          this);
+      const iframe = getIframe(
+        toWin(this.element.ownerDocument.defaultView),
+        this.element,
+        this.type_,
+        opt_context,
+        {disallowCustom: this.config.remoteHTMLDisabled}
+      );
+      this.xOriginIframeHandler_ = new AmpAdXOriginIframeHandler(this);
       return this.xOriginIframeHandler_.init(iframe);
     });
     incrementLoadingAds(this.win, this.layoutPromise_);
@@ -426,11 +436,11 @@ export class AmpAd3PImpl extends AMP.BaseElement {
   }
 
   /**
-  * Calculates and attempts to set the appropriate height & width for a
-  * responsive full width ad unit.
-  * @return {!Promise}
-  * @private
-  */
+   * Calculates and attempts to set the appropriate height & width for a
+   * responsive full width ad unit.
+   * @return {!Promise}
+   * @private
+   */
   attemptFullWidthSizeChange_() {
     const viewportSize = this.getViewport().getSize();
     const maxHeight = Math.min(MAX_FULL_WIDTH_HEIGHT, viewportSize.height);
@@ -441,12 +451,12 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     // affect it.
 
     return this.attemptChangeSize(height, width).then(
-        () => {
-          dev().info(TAG_3P_IMPL, `Size change accepted: ${width}x${height}`);
-        },
-        () => {
-          dev().info(TAG_3P_IMPL, `Size change rejected: ${width}x${height}`);
-        }
+      () => {
+        dev().info(TAG_3P_IMPL, `Size change accepted: ${width}x${height}`);
+      },
+      () => {
+        dev().info(TAG_3P_IMPL, `Size change rejected: ${width}x${height}`);
+      }
     );
   }
 
@@ -462,9 +472,14 @@ export class AmpAd3PImpl extends AMP.BaseElement {
     // fast fetch.
     if (this.element.getAttribute('data-auto-format') === ADSENSE_MCRSPV_TAG) {
       return getMatchedContentResponsiveHeightAndUpdatePubParams(
-          width, this.element);
+        width,
+        this.element
+      );
     }
-    return clamp(Math.round(width / this.config.fullWidthHeightRatio),
-        MIN_FULL_WIDTH_HEIGHT, maxHeight);
+    return clamp(
+      Math.round(width / this.config.fullWidthHeightRatio),
+      MIN_FULL_WIDTH_HEIGHT,
+      maxHeight
+    );
   }
 }
diff --git a/extensions/amp-ad/0.1/amp-ad-custom.js b/extensions/amp-ad/0.1/amp-ad-custom.js
index d8abf63aa720..4b2788a1b8f6 100644
--- a/extensions/amp-ad/0.1/amp-ad-custom.js
+++ b/extensions/amp-ad/0.1/amp-ad-custom.js
@@ -41,7 +41,6 @@ const ampCustomadXhrPromises = {};
 let ampCustomadFullUrls = null;
 
 export class AmpAdCustom extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -62,7 +61,7 @@ export class AmpAdCustom extends AMP.BaseElement {
     return LayoutPriority.CONTENT;
   }
 
-  /** @override **/
+  /** @override */
   isLayoutSupported(layout) {
     /** @TODO Add proper support for more layouts, and figure out which ones
      *  we're permitting */
@@ -76,8 +75,10 @@ export class AmpAdCustom extends AMP.BaseElement {
     this.url_ = this.element.getAttribute('data-url');
     this.slot_ = this.element.getAttribute('data-slot');
     // Ensure that the slot value is legal
-    userAssert(this.slot_ === null || this.slot_.match(/^[0-9a-z]+$/),
-        'custom ad slot should be alphanumeric: ' + this.slot_);
+    userAssert(
+      this.slot_ === null || this.slot_.match(/^[0-9a-z]+$/),
+      'custom ad slot should be alphanumeric: ' + this.slot_
+    );
 
     this.uiHandler = new AmpAdUIHandler(this);
   }
@@ -87,8 +88,11 @@ export class AmpAdCustom extends AMP.BaseElement {
     /** @const {string} fullUrl */
     const fullUrl = this.getFullUrl_();
     // if we have cached the response, find it, otherwise fetch
-    const responsePromise = ampCustomadXhrPromises[fullUrl] ||
-        Services.xhrFor(this.win).fetchJson(fullUrl).then(res => res.json());
+    const responsePromise =
+      ampCustomadXhrPromises[fullUrl] ||
+      Services.xhrFor(this.win)
+        .fetchJson(fullUrl)
+        .then(res => res.json());
     if (this.slot_ !== null) {
       // Cache this response if using `data-slot` feature so only one request
       // is made per url
@@ -98,8 +102,7 @@ export class AmpAdCustom extends AMP.BaseElement {
       // We will get here when the data has been fetched from the server
       let templateData = data;
       if (this.slot_ !== null) {
-        templateData = hasOwn(data, this.slot_) ? data[this.slot_] :
-          null;
+        templateData = hasOwn(data, this.slot_) ? data[this.slot_] : null;
       }
 
       if (!templateData || typeof templateData != 'object') {
@@ -113,16 +116,16 @@ export class AmpAdCustom extends AMP.BaseElement {
 
       try {
         Services.templatesFor(this.win)
-            .findAndRenderTemplate(this.element, templateData)
-            .then(renderedElement => {
-              // Get here when the template has been rendered Clear out the
-              // child template and replace it by the rendered version Note that
-              // we can't clear templates that's not ad's child because they
-              // maybe used by other ad component.
-              removeChildren(this.element);
-              this.element.appendChild(renderedElement);
-              this.signals().signal(CommonSignals.INI_LOAD);
-            });
+          .findAndRenderTemplate(this.element, templateData)
+          .then(renderedElement => {
+            // Get here when the template has been rendered Clear out the
+            // child template and replace it by the rendered version Note that
+            // we can't clear templates that's not ad's child because they
+            // maybe used by other ad component.
+            removeChildren(this.element);
+            this.element.appendChild(renderedElement);
+            this.signals().signal(CommonSignals.INI_LOAD);
+          });
       } catch (e) {
         this.uiHandler.applyNoContentUI();
       }
@@ -161,8 +164,9 @@ export class AmpAdCustom extends AMP.BaseElement {
     userAssert(templateData['templateId'], 'TemplateId not specified');
 
     userAssert(
-        templateData['data'] && typeof templateData['data'] == 'object',
-        'Template data not specified');
+      templateData['data'] && typeof templateData['data'] == 'object',
+      'Template data not specified'
+    );
 
     this.element.setAttribute('template', templateData['templateId']);
 
@@ -225,8 +229,11 @@ export class AmpAdCustom extends AMP.BaseElement {
         }
       }
       for (const baseUrl in slots) {
-        ampCustomadFullUrls[baseUrl] = addParamToUrl(baseUrl, 'ampslots',
-            slots[baseUrl].join(','));
+        ampCustomadFullUrls[baseUrl] = addParamToUrl(
+          baseUrl,
+          'ampslots',
+          slots[baseUrl].join(',')
+        );
       }
     }
     return ampCustomadFullUrls[this.url_];
diff --git a/extensions/amp-ad/0.1/amp-ad-ui.js b/extensions/amp-ad/0.1/amp-ad-ui.js
index e27b7d10b380..164b41bee13f 100644
--- a/extensions/amp-ad/0.1/amp-ad-ui.js
+++ b/extensions/amp-ad/0.1/amp-ad-ui.js
@@ -18,7 +18,6 @@ import {ancestorElementsByTag} from '../../../src/dom';
 import {getAdContainer} from '../../../src/ad-helper';
 
 export class AmpAdUIHandler {
-
   /**
    * @param {!AMP.BaseElement} baseInstance
    */
@@ -37,8 +36,11 @@ export class AmpAdUIHandler {
     if (this.element_.hasAttribute('data-ad-container-id')) {
       const id = this.element_.getAttribute('data-ad-container-id');
       const container = this.doc_.getElementById(id);
-      if (container && container.tagName == 'AMP-LAYOUT' &&
-          container.contains(this.element_)) {
+      if (
+        container &&
+        container.tagName == 'AMP-LAYOUT' &&
+        container.contains(this.element_)
+      ) {
         // Parent <amp-layout> component with reference id can serve as the
         // ad container
         this.containerElement_ = container;
@@ -68,12 +70,11 @@ export class AmpAdUIHandler {
   applyNoContentUI() {
     if (getAdContainer(this.element_) === 'AMP-STICKY-AD') {
       // Special case: force collapse sticky-ad if no content.
-      this.baseInstance_./*OK*/collapse();
+      this.baseInstance_./*OK*/ collapse();
       return;
     }
 
     if (getAdContainer(this.element_) === 'AMP-FX-FLYING-CARPET') {
-
       /**
        * Special case: Force collapse the ad if it is the,
        * only and direct child of a flying carpet.
@@ -83,15 +84,17 @@ export class AmpAdUIHandler {
        * used with flying carpet and ads yet.
        */
 
-      const flyingCarpetElements =
-        ancestorElementsByTag(this.element_, 'amp-fx-flying-carpet');
+      const flyingCarpetElements = ancestorElementsByTag(
+        this.element_,
+        'amp-fx-flying-carpet'
+      );
       const flyingCarpetElement = flyingCarpetElements[0];
 
       flyingCarpetElement.getImpl().then(implementation => {
         const children = implementation.getChildren();
 
         if (children.length === 1 && children[0] === this.element_) {
-          this.baseInstance_./*OK*/collapse();
+          this.baseInstance_./*OK*/ collapse();
         }
       });
       return;
@@ -100,10 +103,10 @@ export class AmpAdUIHandler {
     let attemptCollapsePromise;
     if (this.containerElement_) {
       // Collapse the container element if there's one
-      attemptCollapsePromise = this.element_.getResources().attemptCollapse(
-          this.containerElement_);
-      attemptCollapsePromise.then(() => {
-      });
+      attemptCollapsePromise = this.element_
+        .getResources()
+        .attemptCollapse(this.containerElement_);
+      attemptCollapsePromise.then(() => {});
     } else {
       attemptCollapsePromise = this.baseInstance_.attemptCollapse();
     }
@@ -163,13 +166,17 @@ export class AmpAdUIHandler {
     let newHeight, newWidth;
     height = parseInt(height, 10);
     if (!isNaN(height)) {
-      newHeight = Math.max(this.element_./*OK*/offsetHeight +
-          height - iframeHeight, height);
+      newHeight = Math.max(
+        this.element_./*OK*/ offsetHeight + height - iframeHeight,
+        height
+      );
     }
     width = parseInt(width, 10);
     if (!isNaN(width)) {
-      newWidth = Math.max(this.element_./*OK*/offsetWidth +
-          width - iframeWidth, width);
+      newWidth = Math.max(
+        this.element_./*OK*/ offsetWidth + width - iframeWidth,
+        width
+      );
     }
 
     /** @type {!Object<boolean, number|undefined, number|undefined>} */
@@ -188,13 +195,15 @@ export class AmpAdUIHandler {
       resizeInfo.success = false;
       return Promise.resolve(resizeInfo);
     }
-    return this.baseInstance_.attemptChangeSize(
-        newHeight, newWidth).then(() => {
-      return resizeInfo;
-    }, () => {
-      resizeInfo.success = false;
-      return resizeInfo;
-    });
+    return this.baseInstance_.attemptChangeSize(newHeight, newWidth).then(
+      () => {
+        return resizeInfo;
+      },
+      () => {
+        resizeInfo.success = false;
+        return resizeInfo;
+      }
+    );
   }
 }
 
diff --git a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
index f71192898e8e..1ddf5cd6cbec 100644
--- a/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/amp-ad-xorigin-iframe-handler.js
@@ -18,15 +18,10 @@ import {
   ADSENSE_EXPERIMENTS,
   ADSENSE_EXP_NAMES,
 } from '../../amp-ad-network-adsense-impl/0.1/adsense-a4a-config';
-import {
-  CONSTANTS,
-  MessageType,
-} from '../../../src/3p-frame-messaging';
+import {CONSTANTS, MessageType} from '../../../src/3p-frame-messaging';
 import {CommonSignals} from '../../../src/common-signals';
 import {Deferred} from '../../../src/utils/promise';
-import {
-  IntersectionObserver,
-} from '../../../src/intersection-observer';
+import {IntersectionObserver} from '../../../src/intersection-observer';
 import {Services} from '../../../src/services';
 import {
   SubscriptionApi,
@@ -37,10 +32,7 @@ import {
 import {dev, devAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getData} from '../../../src/event-helper';
-import {
-  getExperimentBranch,
-  isExperimentOn,
-} from '../../../src/experiments';
+import {getExperimentBranch, isExperimentOn} from '../../../src/experiments';
 import {getHtml} from '../../../src/get-html';
 import {removeElement} from '../../../src/dom';
 import {reportErrorToAnalytics} from '../../../src/error';
@@ -51,9 +43,7 @@ const VISIBILITY_TIMEOUT = 10000;
 
 const MIN_INABOX_POSITION_EVENT_INTERVAL = 100;
 
-
 export class AmpAdXOriginIframeHandler {
-
   /**
    * @param {!./amp-ad-3p-impl.AmpAd3PImpl|!../../amp-a4a/0.1/amp-a4a.AmpA4A} baseInstance
    */
@@ -98,7 +88,6 @@ export class AmpAdXOriginIframeHandler {
     this.sendPositionPending_ = false;
   }
 
-
   /**
    * Sets up listeners and iframe state for iframe containing ad creative.
    * @param {!Element} iframe
@@ -106,8 +95,7 @@ export class AmpAdXOriginIframeHandler {
    * @return {!Promise} awaiting render complete promise
    */
   init(iframe, opt_isA4A) {
-    devAssert(
-        !this.iframe, 'multiple invocations of init without destroy!');
+    devAssert(!this.iframe, 'multiple invocations of init without destroy!');
     this.iframe = iframe;
     this.iframe.setAttribute('scrolling', 'no');
     this.baseInstance_.applyFillContent(this.iframe);
@@ -115,36 +103,48 @@ export class AmpAdXOriginIframeHandler {
 
     // Init IntersectionObserver service.
     this.intersectionObserver_ = new IntersectionObserver(
-        this.baseInstance_, this.iframe, true);
+      this.baseInstance_,
+      this.iframe,
+      true
+    );
 
     this.embedStateApi_ = new SubscriptionApi(
-        this.iframe, 'send-embed-state', true,
-        () => this.sendEmbedInfo_(this.baseInstance_.isInViewport()));
+      this.iframe,
+      'send-embed-state',
+      true,
+      () => this.sendEmbedInfo_(this.baseInstance_.isInViewport())
+    );
 
     // TODO(bradfrizzell): Would be better to turn this on if
     // A4A.isXhrEnabled() is false, or if we simply decide it is
     // ok to turn this on for all traffic.
-    if (getExperimentBranch(
-        this.win_, ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL) ==
-       ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP ||
-       getExperimentBranch(this.win_, ADSENSE_EXP_NAMES.CANONICAL) ==
+    if (
+      getExperimentBranch(
+        this.win_,
+        ADSENSE_EXP_NAMES.UNCONDITIONED_CANONICAL
+      ) == ADSENSE_EXPERIMENTS.UNCONDITIONED_CANONICAL_EXP ||
+      getExperimentBranch(this.win_, ADSENSE_EXP_NAMES.CANONICAL) ==
         ADSENSE_EXPERIMENTS.CANONICAL_EXP ||
-       isExperimentOn(this.win_, 'inabox-position-api')) {
+      isExperimentOn(this.win_, 'inabox-position-api')
+    ) {
       // To provide position to inabox.
       this.inaboxPositionApi_ = new SubscriptionApi(
-          this.iframe, MessageType.SEND_POSITIONS, true, () => {
-            // TODO(@zhouyx): Make sendPosition_ only send to
-            // message origin iframe
-            this.sendPosition_();
-            this.registerPosition_();
-          });
+        this.iframe,
+        MessageType.SEND_POSITIONS,
+        true,
+        () => {
+          // TODO(@zhouyx): Make sendPosition_ only send to
+          // message origin iframe
+          this.sendPosition_();
+          this.registerPosition_();
+        }
+      );
     }
     // Triggered by context.reportRenderedEntityIdentifier(…) inside the ad
     // iframe.
-    listenForOncePromise(this.iframe, 'entity-id', true)
-        .then(info => {
-          this.element_.creativeId = info.data['id'];
-        });
+    listenForOncePromise(this.iframe, 'entity-id', true).then(info => {
+      this.element_.creativeId = info.data['id'];
+    });
 
     this.handleOneTimeRequest_(MessageType.GET_HTML, payload => {
       const selector = payload['selector'];
@@ -163,33 +163,50 @@ export class AmpAdXOriginIframeHandler {
     });
 
     // Install iframe resize API.
-    this.unlisteners_.push(listenFor(this.iframe, 'embed-size',
+    this.unlisteners_.push(
+      listenFor(
+        this.iframe,
+        'embed-size',
         (data, source, origin) => {
           if (!!data['hasOverflow']) {
             this.element_.warnOnMissingOverflow = false;
           }
           this.handleResize_(data['height'], data['width'], source, origin);
-        }, true, true));
-
-    this.unlisteners_.push(this.viewer_.onVisibilityChanged(() => {
-      this.sendEmbedInfo_(this.baseInstance_.isInViewport());
-    }));
-
-    this.unlisteners_.push(listenFor(this.iframe,
-        MessageType.USER_ERROR_IN_IFRAME, data => {
+        },
+        true,
+        true
+      )
+    );
+
+    this.unlisteners_.push(
+      this.viewer_.onVisibilityChanged(() => {
+        this.sendEmbedInfo_(this.baseInstance_.isInViewport());
+      })
+    );
+
+    this.unlisteners_.push(
+      listenFor(
+        this.iframe,
+        MessageType.USER_ERROR_IN_IFRAME,
+        data => {
           this.userErrorForAnalytics_(data['message']);
-        }, true, true /* opt_includingNestedWindows */));
+        },
+        true,
+        true /* opt_includingNestedWindows */
+      )
+    );
 
     // Iframe.onload normally called by the Ad after full load.
-    const iframeLoadPromise = this.baseInstance_.loadPromise(this.iframe)
-        .then(() => {
-          // Wait just a little to allow `no-content` message to arrive.
-          if (this.iframe) {
-            // Chrome does not reflect the iframe readystate.
-            this.iframe.readyState = 'complete';
-          }
-          return timer.promise(10);
-        });
+    const iframeLoadPromise = this.baseInstance_
+      .loadPromise(this.iframe)
+      .then(() => {
+        // Wait just a little to allow `no-content` message to arrive.
+        if (this.iframe) {
+          // Chrome does not reflect the iframe readystate.
+          this.iframe.readyState = 'complete';
+        }
+        return timer.promise(10);
+      });
 
     // Calculate render-start and no-content signals.
     const {
@@ -201,12 +218,17 @@ export class AmpAdXOriginIframeHandler {
       resolve: noContentResolve,
     } = new Deferred();
 
-    if (this.baseInstance_.config &&
-            this.baseInstance_.config.renderStartImplemented) {
+    if (
+      this.baseInstance_.config &&
+      this.baseInstance_.config.renderStartImplemented
+    ) {
       // When `render-start` is supported, these signals are mutually
       // exclusive. Whichever arrives first wins.
-      listenForOncePromise(this.iframe,
-          ['render-start', 'no-content'], true).then(info => {
+      listenForOncePromise(
+        this.iframe,
+        ['render-start', 'no-content'],
+        true
+      ).then(info => {
         const {data} = info;
         if (data['type'] == 'render-start') {
           this.renderStart_(info);
@@ -277,7 +299,10 @@ export class AmpAdXOriginIframeHandler {
    * @private
    */
   handleOneTimeRequest_(requestType, getter) {
-    this.unlisteners_.push(listenFor(this.iframe, requestType,
+    this.unlisteners_.push(
+      listenFor(
+        this.iframe,
+        requestType,
         (info, source, origin) => {
           if (!this.iframe) {
             return;
@@ -291,12 +316,18 @@ export class AmpAdXOriginIframeHandler {
             result[CONSTANTS.messageIdFieldName] = messageId;
             result[CONSTANTS.contentFieldName] = content;
             postMessageToWindows(
-                dev().assertElement(this.iframe), [{win: source, origin}],
-                requestType + CONSTANTS.responseTypeSuffix,
-                result, true
+              dev().assertElement(this.iframe),
+              [{win: source, origin}],
+              requestType + CONSTANTS.responseTypeSuffix,
+              result,
+              true
             );
           });
-        }, true /* opt_is3P */, false /* opt_includingNestedWindows */));
+        },
+        true /* opt_is3P */,
+        false /* opt_includingNestedWindows */
+      )
+    );
   }
 
   /**
@@ -311,7 +342,11 @@ export class AmpAdXOriginIframeHandler {
     }
     const data = getData(opt_info);
     this.handleResize_(
-        data['height'], data['width'], opt_info['source'], opt_info['origin']);
+      data['height'],
+      data['width'],
+      opt_info['source'],
+      opt_info['origin']
+    );
   }
 
   /**
@@ -382,13 +417,20 @@ export class AmpAdXOriginIframeHandler {
         // iframe can be cleanup before vsync.
         return;
       }
-      const iframeHeight = this.iframe./*OK*/offsetHeight;
-      const iframeWidth = this.iframe./*OK*/offsetWidth;
-      this.uiHandler_.updateSize(height, width, iframeHeight,
-          iframeWidth).then(info => {
-        this.sendEmbedSizeResponse_(info.success,
-            info.newWidth, info.newHeight, source, origin);
-      }, () => {});
+      const iframeHeight = this.iframe./*OK*/ offsetHeight;
+      const iframeWidth = this.iframe./*OK*/ offsetWidth;
+      this.uiHandler_.updateSize(height, width, iframeHeight, iframeWidth).then(
+        info => {
+          this.sendEmbedSizeResponse_(
+            info.success,
+            info.newWidth,
+            info.newHeight,
+            source,
+            origin
+          );
+        },
+        () => {}
+      );
     });
   }
 
@@ -401,21 +443,27 @@ export class AmpAdXOriginIframeHandler {
    * @param {string} origin
    * @private
    */
-  sendEmbedSizeResponse_(success, requestedWidth, requestedHeight, source,
-    origin) {
+  sendEmbedSizeResponse_(
+    success,
+    requestedWidth,
+    requestedHeight,
+    source,
+    origin
+  ) {
     // The iframe may have been removed by the time we resize.
     if (!this.iframe) {
       return;
     }
     postMessageToWindows(
-        this.iframe,
-        [{win: source, origin}],
-        success ? 'embed-size-changed' : 'embed-size-denied',
-        dict({
-          'requestedWidth': requestedWidth,
-          'requestedHeight': requestedHeight,
-        }),
-        true);
+      this.iframe,
+      [{win: source, origin}],
+      success ? 'embed-size-changed' : 'embed-size-denied',
+      dict({
+        'requestedWidth': requestedWidth,
+        'requestedHeight': requestedHeight,
+      }),
+      true
+    );
   }
 
   /**
@@ -426,10 +474,13 @@ export class AmpAdXOriginIframeHandler {
     if (!this.embedStateApi_) {
       return;
     }
-    this.embedStateApi_.send('embed-state', dict({
-      'inViewport': inViewport,
-      'pageHidden': !this.viewer_.isVisible(),
-    }));
+    this.embedStateApi_.send(
+      'embed-state',
+      dict({
+        'inViewport': inViewport,
+        'pageHidden': !this.viewer_.isVisible(),
+      })
+    );
   }
 
   /**
@@ -437,16 +488,19 @@ export class AmpAdXOriginIframeHandler {
    * @private
    */
   getIframePositionPromise_() {
-    return this.viewport_.getClientRectAsync(
-        dev().assertElement(this.iframe)).then(position => {
-      devAssert(position,
-          'element clientRect should intersects with root clientRect');
-      const viewport = this.viewport_.getRect();
-      return dict({
-        'targetRect': position,
-        'viewportRect': viewport,
+    return this.viewport_
+      .getClientRectAsync(dev().assertElement(this.iframe))
+      .then(position => {
+        devAssert(
+          position,
+          'element clientRect should intersects with root clientRect'
+        );
+        const viewport = this.viewport_.getRect();
+        return dict({
+          'targetRect': position,
+          'viewportRect': viewport,
+        });
       });
-    });
   }
 
   /** @private */
@@ -472,16 +526,26 @@ export class AmpAdXOriginIframeHandler {
 
     this.isInaboxPositionApiInit_ = true;
     // Send window scroll/resize event to viewport.
-    this.unlisteners_.push(this.viewport_.onScroll(throttle(this.win_, () => {
-      this.getIframePositionPromise_().then(position => {
-        this.inaboxPositionApi_.send(MessageType.POSITION, position);
-      });
-    }, MIN_INABOX_POSITION_EVENT_INTERVAL)));
-    this.unlisteners_.push(this.viewport_.onResize(() => {
-      this.getIframePositionPromise_().then(position => {
-        this.inaboxPositionApi_.send(MessageType.POSITION, position);
-      });
-    }));
+    this.unlisteners_.push(
+      this.viewport_.onScroll(
+        throttle(
+          this.win_,
+          () => {
+            this.getIframePositionPromise_().then(position => {
+              this.inaboxPositionApi_.send(MessageType.POSITION, position);
+            });
+          },
+          MIN_INABOX_POSITION_EVENT_INTERVAL
+        )
+      )
+    );
+    this.unlisteners_.push(
+      this.viewport_.onResize(() => {
+        this.getIframePositionPromise_().then(position => {
+          this.inaboxPositionApi_.send(MessageType.POSITION, position);
+        });
+      })
+    );
   }
 
   /**
@@ -495,7 +559,6 @@ export class AmpAdXOriginIframeHandler {
     this.sendEmbedInfo_(inViewport);
   }
 
-
   /**
    * See BaseElement method.
    */
diff --git a/extensions/amp-ad/0.1/amp-ad.js b/extensions/amp-ad/0.1/amp-ad.js
index ce80cf453aa5..0d3365c1100d 100644
--- a/extensions/amp-ad/0.1/amp-ad.js
+++ b/extensions/amp-ad/0.1/amp-ad.js
@@ -22,7 +22,6 @@ import {getA4ARegistry} from '../../../ads/_a4a-config';
 import {hasOwn} from '../../../src/utils/object';
 import {userAssert} from '../../../src/log';
 
-
 /**
  * Construct ad network type-specific tag and script name.  Note that this
  * omits the version number and '.js' suffix for the extension script, which
@@ -37,7 +36,6 @@ function networkImplementationTag(type) {
 }
 
 export class AmpAd extends AMP.BaseElement {
-
   /** @override */
   isLayoutSupported(unusedLayout) {
     // TODO(jridgewell, #5980, #8218): ensure that unupgraded calls are not
@@ -52,14 +50,17 @@ export class AmpAd extends AMP.BaseElement {
     /** @const {string} */
     const consentId = this.element.getAttribute('data-consent-notification-id');
     const consent = consentId
-      ? Services.userNotificationManagerForDoc(this.element)
-          .then(service => service.get(consentId))
+      ? Services.userNotificationManagerForDoc(this.element).then(service =>
+          service.get(consentId)
+        )
       : Promise.resolve();
     const type = this.element.getAttribute('type');
     return consent.then(() => {
       const isCustom = type === 'custom';
-      userAssert(isCustom || hasOwn(adConfig, type)
-          || hasOwn(a4aRegistry, type), `Unknown ad type "${type}"`);
+      userAssert(
+        isCustom || hasOwn(adConfig, type) || hasOwn(a4aRegistry, type),
+        `Unknown ad type "${type}"`
+      );
 
       // Check for the custom ad type (no ad network, self-service)
       if (isCustom) {
@@ -73,13 +74,16 @@ export class AmpAd extends AMP.BaseElement {
         this.getVsync().mutate(() => {
           this.element.setAttribute('data-amp-slot-index', slotId);
 
-          const useRemoteHtml = (!(adConfig[type] || {}).remoteHTMLDisabled &&
-              this.win.document.querySelector('meta[name=amp-3p-iframe-src]'));
+          const useRemoteHtml =
+            !(adConfig[type] || {}).remoteHTMLDisabled &&
+            this.win.document.querySelector('meta[name=amp-3p-iframe-src]');
           // TODO(tdrl): Check amp-ad registry to see if they have this already.
           // TODO(a4a-cam): Shorten this predicate.
-          if (!a4aRegistry[type] ||
-              // Note that predicate execution may have side effects.
-              !a4aRegistry[type](this.win, this.element, useRemoteHtml)) {
+          if (
+            !a4aRegistry[type] ||
+            // Note that predicate execution may have side effects.
+            !a4aRegistry[type](this.win, this.element, useRemoteHtml)
+          ) {
             // Either this ad network doesn't support Fast Fetch, its Fast
             // Fetch implementation has explicitly opted not to handle this
             // tag, or this page uses remote.html which is inherently
@@ -89,18 +93,24 @@ export class AmpAd extends AMP.BaseElement {
 
           const extensionTagName = networkImplementationTag(type);
           this.element.setAttribute('data-a4a-upgrade-type', extensionTagName);
-          resolve(Services.extensionsFor(this.win)
+          resolve(
+            Services.extensionsFor(this.win)
               .loadElementClass(extensionTagName)
               .then(ctor => new ctor(this.element))
               .catch(error => {
-              // Work around presubmit restrictions.
+                // Work around presubmit restrictions.
                 const TAG = this.element.tagName;
                 // Report error and fallback to 3p
                 this.user().error(
-                    TAG, 'Unable to load ad implementation for type ',
-                    type, ', falling back to 3p, error: ', error);
+                  TAG,
+                  'Unable to load ad implementation for type ',
+                  type,
+                  ', falling back to 3p, error: ',
+                  error
+                );
                 return new AmpAd3PImpl(this.element);
-              }));
+              })
+          );
         });
       });
     });
diff --git a/extensions/amp-ad/0.1/concurrent-load.js b/extensions/amp-ad/0.1/concurrent-load.js
index cba43cf4c6e1..caf42564c77b 100644
--- a/extensions/amp-ad/0.1/concurrent-load.js
+++ b/extensions/amp-ad/0.1/concurrent-load.js
@@ -58,10 +58,13 @@ export function getAmpAdRenderOutsideViewport(element) {
     return 1.25;
   }
   const errorMessage =
-      'Value of data-loading-strategy should be a float number in range ' +
-      'of [0, 3], but got ' + rawValue;
-  const viewportNumber =
-      user().assertNumber(parseFloat(rawValue), errorMessage);
+    'Value of data-loading-strategy should be a float number in range ' +
+    'of [0, 3], but got ' +
+    rawValue;
+  const viewportNumber = user().assertNumber(
+    parseFloat(rawValue),
+    errorMessage
+  );
   userAssert(viewportNumber >= 0 && viewportNumber <= 3, errorMessage);
   return viewportNumber;
 }
@@ -84,13 +87,13 @@ export function incrementLoadingAds(win, opt_loadingPromise) {
   }
 
   Services.timerFor(win)
-      .timeoutPromise(1000, opt_loadingPromise)
-      .catch(() => {})
-      .then(() => {
-        if (!--win[LOADING_ADS_WIN_ID_]) {
-          throttlePromiseResolver_();
-          throttlePromise_ = null;
-          throttlePromiseResolver_ = null;
-        }
-      });
+    .timeoutPromise(1000, opt_loadingPromise)
+    .catch(() => {})
+    .then(() => {
+      if (!--win[LOADING_ADS_WIN_ID_]) {
+        throttlePromiseResolver_();
+        throttlePromise_ = null;
+        throttlePromiseResolver_ = null;
+      }
+    });
 }
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
index 2c5b1735a848..469f24e13a0f 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-3p-impl.js
@@ -29,7 +29,6 @@ import {macroTask} from '../../../../testing/yield';
 import {stubService} from '../../../../testing/test-helper';
 import {user} from '../../../../src/log';
 
-
 function createAmpAd(win, attachToAmpdoc = false, ampdoc) {
   const ampAdElement = createElementWithAttributes(win.document, 'amp-ad', {
     type: '_ping_',
@@ -44,557 +43,601 @@ function createAmpAd(win, attachToAmpdoc = false, ampdoc) {
     ampdoc.getBody().appendChild(ampAdElement);
   }
 
-  ampAdElement.isBuilt = () => {return true;};
+  ampAdElement.isBuilt = () => {
+    return true;
+  };
 
   return new AmpAd3PImpl(ampAdElement);
 }
 
-describes.realWin('amp-ad-3p-impl', {
-  amp: {
-    runtimeOn: false,
-    canonicalUrl: 'https://canonical.url',
+describes.realWin(
+  'amp-ad-3p-impl',
+  {
+    amp: {
+      runtimeOn: false,
+      canonicalUrl: 'https://canonical.url',
+    },
+    allowExternalResources: true,
   },
-  allowExternalResources: true,
-}, env => {
-  let sandbox;
-  let ad3p;
-  let win;
-  let registryBackup;
-  const whenFirstVisible = Promise.resolve();
-
-  beforeEach(() => {
-    registryBackup = Object.create(null);
-    Object.keys(adConfig).forEach(k => {
-      registryBackup[k] = adConfig[k];
-      delete adConfig[k];
-    });
-    adConfig['_ping_'] = Object.assign({}, registryBackup['_ping_']);
-    sandbox = env.sandbox;
-    win = env.win;
-    ad3p = createAmpAd(win);
-    win.document.body.appendChild(ad3p.element);
-    ad3p.buildCallback();
-    // Turn the doc to visible so prefetch will be proceeded.
-    stubService(sandbox, win, 'viewer', 'whenFirstVisible')
-        .returns(whenFirstVisible);
-  });
+  env => {
+    let sandbox;
+    let ad3p;
+    let win;
+    let registryBackup;
+    const whenFirstVisible = Promise.resolve();
 
-  afterEach(() => {
-    Object.keys(registryBackup).forEach(k => {
-      adConfig[k] = registryBackup[k];
+    beforeEach(() => {
+      registryBackup = Object.create(null);
+      Object.keys(adConfig).forEach(k => {
+        registryBackup[k] = adConfig[k];
+        delete adConfig[k];
+      });
+      adConfig['_ping_'] = Object.assign({}, registryBackup['_ping_']);
+      sandbox = env.sandbox;
+      win = env.win;
+      ad3p = createAmpAd(win);
+      win.document.body.appendChild(ad3p.element);
+      ad3p.buildCallback();
+      // Turn the doc to visible so prefetch will be proceeded.
+      stubService(sandbox, win, 'viewer', 'whenFirstVisible').returns(
+        whenFirstVisible
+      );
     });
-    registryBackup = null;
-  });
 
-  describe('layoutCallback', () => {
-    it('should create iframe and pass data via URL fragment', () => {
-      return ad3p.layoutCallback().then(() => {
-        const iframe = ad3p.element.querySelector('iframe[src]');
-        expect(iframe).to.be.ok;
-        expect(iframe.tagName).to.equal('IFRAME');
-        const url = iframe.getAttribute('src');
-        expect(url).to.match(/^http:\/\/ads.localhost:/);
-        expect(iframe).to.not.have.attribute('hidden');
-
-        expect(url).to.match(/frame(.max)?.html/);
-        const data = JSON.parse(iframe.name).attributes;
-        expect(data).to.have.property('type', '_ping_');
-        expect(data).to.have.property('src', 'https://testsrc');
-        expect(data).to.have.property('width', 300);
-        expect(data).to.have.property('height', 250);
-        expect(data._context.canonicalUrl).to.equal('https://canonical.url/');
+    afterEach(() => {
+      Object.keys(registryBackup).forEach(k => {
+        adConfig[k] = registryBackup[k];
       });
+      registryBackup = null;
     });
 
-    it('should only layout once', () => {
-      ad3p.unlayoutCallback();
-      const firstLayout = ad3p.layoutCallback();
-      const secondLayout = ad3p.layoutCallback();
-      expect(firstLayout).to.equal(secondLayout);
+    describe('layoutCallback', () => {
+      it('should create iframe and pass data via URL fragment', () => {
+        return ad3p.layoutCallback().then(() => {
+          const iframe = ad3p.element.querySelector('iframe[src]');
+          expect(iframe).to.be.ok;
+          expect(iframe.tagName).to.equal('IFRAME');
+          const url = iframe.getAttribute('src');
+          expect(url).to.match(/^http:\/\/ads.localhost:/);
+          expect(iframe).to.not.have.attribute('hidden');
+
+          expect(url).to.match(/frame(.max)?.html/);
+          const data = JSON.parse(iframe.name).attributes;
+          expect(data).to.have.property('type', '_ping_');
+          expect(data).to.have.property('src', 'https://testsrc');
+          expect(data).to.have.property('width', 300);
+          expect(data).to.have.property('height', 250);
+          expect(data._context.canonicalUrl).to.equal('https://canonical.url/');
+        });
+      });
 
-      ad3p.unlayoutCallback();
-      const newLayout = ad3p.layoutCallback();
-      expect(newLayout).to.not.equal(secondLayout);
-    });
+      it('should only layout once', () => {
+        ad3p.unlayoutCallback();
+        const firstLayout = ad3p.layoutCallback();
+        const secondLayout = ad3p.layoutCallback();
+        expect(firstLayout).to.equal(secondLayout);
 
-    it('should propagete CID to ad iframe', () => {
-      sandbox.stub(adCid, 'getAdCid').resolves('sentinel123');
+        ad3p.unlayoutCallback();
+        const newLayout = ad3p.layoutCallback();
+        expect(newLayout).to.not.equal(secondLayout);
+      });
+
+      it('should propagete CID to ad iframe', () => {
+        sandbox.stub(adCid, 'getAdCid').resolves('sentinel123');
 
-      return ad3p.layoutCallback().then(() => {
-        const frame = ad3p.element.querySelector('iframe[src]');
-        expect(frame).to.be.ok;
-        const data = JSON.parse(frame.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.clientId).to.equal('sentinel123');
+        return ad3p.layoutCallback().then(() => {
+          const frame = ad3p.element.querySelector('iframe[src]');
+          expect(frame).to.be.ok;
+          const data = JSON.parse(frame.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.clientId).to.equal('sentinel123');
+        });
       });
-    });
 
-    it('should proceed w/o CID', () => {
-      sandbox.stub(adCid, 'getAdCid').resolves(undefined);
-      return ad3p.layoutCallback().then(() => {
-        const frame = ad3p.element.querySelector('iframe[src]');
-        expect(frame).to.be.ok;
-        const data = JSON.parse(frame.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.clientId).to.equal(null);
+      it('should proceed w/o CID', () => {
+        sandbox.stub(adCid, 'getAdCid').resolves(undefined);
+        return ad3p.layoutCallback().then(() => {
+          const frame = ad3p.element.querySelector('iframe[src]');
+          expect(frame).to.be.ok;
+          const data = JSON.parse(frame.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.clientId).to.equal(null);
+        });
       });
-    });
 
-    it('should propagate consent state to ad iframe', () => {
-      ad3p.element.setAttribute('data-block-on-consent', '');
-      sandbox.stub(consent, 'getConsentPolicyState')
+      it('should propagate consent state to ad iframe', () => {
+        ad3p.element.setAttribute('data-block-on-consent', '');
+        sandbox
+          .stub(consent, 'getConsentPolicyState')
           .resolves(CONSENT_POLICY_STATE.SUFFICIENT);
-      sandbox.stub(consent, 'getConsentPolicySharedData')
+        sandbox
+          .stub(consent, 'getConsentPolicySharedData')
           .resolves({a: 1, b: 2});
 
-      return ad3p.layoutCallback().then(() => {
-        const frame = ad3p.element.querySelector('iframe[src]');
-        expect(frame).to.be.ok;
-        const data = JSON.parse(frame.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.initialConsentState)
-            .to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-        expect(data._context.consentSharedData)
-            .to.deep.equal({a: 1, b: 2});
+        return ad3p.layoutCallback().then(() => {
+          const frame = ad3p.element.querySelector('iframe[src]');
+          expect(frame).to.be.ok;
+          const data = JSON.parse(frame.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.initialConsentState).to.equal(
+            CONSENT_POLICY_STATE.SUFFICIENT
+          );
+          expect(data._context.consentSharedData).to.deep.equal({a: 1, b: 2});
+        });
       });
-    });
 
-    it('should propagate null consent state to ad iframe', () => {
-      return ad3p.layoutCallback().then(() => {
-        const frame = ad3p.element.querySelector('iframe[src]');
-        expect(frame).to.be.ok;
-        const data = JSON.parse(frame.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.initialConsentState).to.be.null;
+      it('should propagate null consent state to ad iframe', () => {
+        return ad3p.layoutCallback().then(() => {
+          const frame = ad3p.element.querySelector('iframe[src]');
+          expect(frame).to.be.ok;
+          const data = JSON.parse(frame.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.initialConsentState).to.be.null;
+        });
       });
-    });
 
-    it('should throw on position:fixed', () => {
-      ad3p.element.style.position = 'fixed';
-      ad3p.onLayoutMeasure();
-      allowConsoleError(() => {
-        expect(() => ad3p.layoutCallback()).to.throw('position:fixed');
+      it('should throw on position:fixed', () => {
+        ad3p.element.style.position = 'fixed';
+        ad3p.onLayoutMeasure();
+        allowConsoleError(() => {
+          expect(() => ad3p.layoutCallback()).to.throw('position:fixed');
+        });
       });
-    });
 
-    it('should throw on parent being position:fixed', () => {
-      const adContainerElement = win.document.createElement('div');
-      adContainerElement.style.position = 'fixed';
-      win.document.body.appendChild(adContainerElement);
-      const ad3p = createAmpAd(win);
-      adContainerElement.appendChild(ad3p.element);
+      it('should throw on parent being position:fixed', () => {
+        const adContainerElement = win.document.createElement('div');
+        adContainerElement.style.position = 'fixed';
+        win.document.body.appendChild(adContainerElement);
+        const ad3p = createAmpAd(win);
+        adContainerElement.appendChild(ad3p.element);
 
-      ad3p.onLayoutMeasure();
-      allowConsoleError(() => {
-        expect(() => ad3p.layoutCallback()).to.throw('position:fixed');
+        ad3p.onLayoutMeasure();
+        allowConsoleError(() => {
+          expect(() => ad3p.layoutCallback()).to.throw('position:fixed');
+        });
       });
-    });
-
-    it('should allow position:fixed with whitelisted ad container', () => {
-      const adContainerElement = win.document.createElement('amp-sticky-ad');
-      adContainerElement.style.position = 'fixed';
-      win.document.body.appendChild(adContainerElement);
-      const ad3p = createAmpAd(win);
-      adContainerElement.appendChild(ad3p.element);
-      ad3p.buildCallback();
-      ad3p.onLayoutMeasure();
-      return ad3p.layoutCallback();
-    });
 
-    it('should pass ad container info to child iframe via URL', () => {
-      const adContainerElement = win.document.createElement('amp-sticky-ad');
-      win.document.body.appendChild(adContainerElement);
-      const ad3p = createAmpAd(win);
-      adContainerElement.appendChild(ad3p.element);
-      ad3p.buildCallback();
-      ad3p.onLayoutMeasure();
-      return ad3p.layoutCallback().then(() => {
-        const frame = ad3p.element.querySelector('iframe[src]');
-        expect(frame).to.be.ok;
-        const data = JSON.parse(frame.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.container).to.equal('AMP-STICKY-AD');
+      it('should allow position:fixed with whitelisted ad container', () => {
+        const adContainerElement = win.document.createElement('amp-sticky-ad');
+        adContainerElement.style.position = 'fixed';
+        win.document.body.appendChild(adContainerElement);
+        const ad3p = createAmpAd(win);
+        adContainerElement.appendChild(ad3p.element);
+        ad3p.buildCallback();
+        ad3p.onLayoutMeasure();
+        return ad3p.layoutCallback();
       });
-    });
 
-    it('should use custom path', () => {
-      const remoteUrl = 'https://example.com/boot/remote.html';
-      const meta = win.document.createElement('meta');
-      meta.setAttribute('name', 'amp-3p-iframe-src');
-      meta.setAttribute('content', remoteUrl);
-      win.document.head.appendChild(meta);
-      ad3p.onLayoutMeasure();
-      return ad3p.layoutCallback().then(() => {
-        expect(win.document.querySelector('iframe[src="' +
-            `${remoteUrl}?$internalRuntimeVersion$"]`)).to.be.ok;
+      it('should pass ad container info to child iframe via URL', () => {
+        const adContainerElement = win.document.createElement('amp-sticky-ad');
+        win.document.body.appendChild(adContainerElement);
+        const ad3p = createAmpAd(win);
+        adContainerElement.appendChild(ad3p.element);
+        ad3p.buildCallback();
+        ad3p.onLayoutMeasure();
+        return ad3p.layoutCallback().then(() => {
+          const frame = ad3p.element.querySelector('iframe[src]');
+          expect(frame).to.be.ok;
+          const data = JSON.parse(frame.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.container).to.equal('AMP-STICKY-AD');
+        });
       });
-    });
 
-    it('should use default path if custom disabled', () => {
-      const meta = win.document.createElement('meta');
-      meta.setAttribute('name', 'amp-3p-iframe-src');
-      meta.setAttribute('content', 'https://example.com/boot/remote.html');
-      win.document.head.appendChild(meta);
-      ad3p.config.remoteHTMLDisabled = true;
-      ad3p.onLayoutMeasure();
-      sandbox.stub(user(), 'error');
-      return ad3p.layoutCallback().then(() => {
-        expect(win.document.querySelector('iframe[src="' +
-            'http://ads.localhost:9876/dist.3p/current/frame.max.html"]'))
-            .to.be.ok;
+      it('should use custom path', () => {
+        const remoteUrl = 'https://example.com/boot/remote.html';
+        const meta = win.document.createElement('meta');
+        meta.setAttribute('name', 'amp-3p-iframe-src');
+        meta.setAttribute('content', remoteUrl);
+        win.document.head.appendChild(meta);
+        ad3p.onLayoutMeasure();
+        return ad3p.layoutCallback().then(() => {
+          expect(
+            win.document.querySelector(
+              `iframe[src="${remoteUrl}?$internalRuntimeVersion$"]`
+            )
+          ).to.be.ok;
+        });
       });
-    });
-  });
 
-  describe('preconnectCallback', () => {
-    it('should add preconnect and prefetch to DOM header', () => {
-      ad3p.buildCallback();
-      ad3p.preconnectCallback();
-      return whenFirstVisible.then(() => {
-        const fetches = win.document.querySelectorAll('link[rel=preload]');
-        expect(fetches).to.have.length(2);
-        expect(Array.from(fetches).map(link => link.href).sort()).to
-            .jsonEqual([
-              'http://ads.localhost:9876/dist.3p/current/frame.max.html',
-              'http://ads.localhost:9876/dist.3p/current/integration.js',
-            ]);
-
-        const preconnects =
-            win.document.querySelectorAll('link[rel=preconnect]');
-        expect(preconnects[preconnects.length - 1]).to.have.property('href',
-            'https://testsrc/');
+      it('should use default path if custom disabled', () => {
+        const meta = win.document.createElement('meta');
+        meta.setAttribute('name', 'amp-3p-iframe-src');
+        meta.setAttribute('content', 'https://example.com/boot/remote.html');
+        win.document.head.appendChild(meta);
+        ad3p.config.remoteHTMLDisabled = true;
+        ad3p.onLayoutMeasure();
+        sandbox.stub(user(), 'error');
+        return ad3p.layoutCallback().then(() => {
+          expect(
+            win.document.querySelector(
+              'iframe[src="' +
+                'http://ads.localhost:9876/dist.3p/current/frame.max.html"]'
+            )
+          ).to.be.ok;
+        });
       });
     });
 
-    it('should use remote html path for preload', () => {
-      const remoteUrl = 'https://example.com/boot/remote.html';
-      const meta = win.document.createElement('meta');
-      meta.setAttribute('name', 'amp-3p-iframe-src');
-      meta.setAttribute('content', remoteUrl);
-      win.document.head.appendChild(meta);
-      ad3p.buildCallback();
-      ad3p.preconnectCallback();
-      return whenFirstVisible.then(() => {
-        expect(Array.from(win.document.querySelectorAll('link[rel=preload]'))
-            .some(link => link.href == `${remoteUrl}?$internalRuntimeVersion$`))
-            .to.be.true;
+    describe('preconnectCallback', () => {
+      it('should add preconnect and prefetch to DOM header', () => {
+        ad3p.buildCallback();
+        ad3p.preconnectCallback();
+        return whenFirstVisible.then(() => {
+          const fetches = win.document.querySelectorAll('link[rel=preload]');
+          expect(fetches).to.have.length(2);
+          expect(
+            Array.from(fetches)
+              .map(link => link.href)
+              .sort()
+          ).to.jsonEqual([
+            'http://ads.localhost:9876/dist.3p/current/frame.max.html',
+            'http://ads.localhost:9876/dist.3p/current/integration.js',
+          ]);
+
+          const preconnects = win.document.querySelectorAll(
+            'link[rel=preconnect]'
+          );
+          expect(preconnects[preconnects.length - 1]).to.have.property(
+            'href',
+            'https://testsrc/'
+          );
+        });
       });
-    });
 
-    it('should not use remote html path for preload if disabled', () => {
-      const meta = win.document.createElement('meta');
-      meta.setAttribute('name', 'amp-3p-iframe-src');
-      meta.setAttribute('content', 'https://example.com/boot/remote.html');
-      win.document.head.appendChild(meta);
-      ad3p.config.remoteHTMLDisabled = true;
-      ad3p.buildCallback();
-      allowConsoleError(() => {
+      it('should use remote html path for preload', () => {
+        const remoteUrl = 'https://example.com/boot/remote.html';
+        const meta = win.document.createElement('meta');
+        meta.setAttribute('name', 'amp-3p-iframe-src');
+        meta.setAttribute('content', remoteUrl);
+        win.document.head.appendChild(meta);
+        ad3p.buildCallback();
         ad3p.preconnectCallback();
+        return whenFirstVisible.then(() => {
+          expect(
+            Array.from(win.document.querySelectorAll('link[rel=preload]')).some(
+              link => link.href == `${remoteUrl}?$internalRuntimeVersion$`
+            )
+          ).to.be.true;
+        });
       });
-      return whenFirstVisible.then(() => {
-        expect(Array.from(win.document.querySelectorAll('link[rel=preload]'))
-            .some(link => link.href ==
-              'http://ads.localhost:9876/dist.3p/current/frame.max.html'))
-            .to.be.true;
+
+      it('should not use remote html path for preload if disabled', () => {
+        const meta = win.document.createElement('meta');
+        meta.setAttribute('name', 'amp-3p-iframe-src');
+        meta.setAttribute('content', 'https://example.com/boot/remote.html');
+        win.document.head.appendChild(meta);
+        ad3p.config.remoteHTMLDisabled = true;
+        ad3p.buildCallback();
+        allowConsoleError(() => {
+          ad3p.preconnectCallback();
+        });
+        return whenFirstVisible.then(() => {
+          expect(
+            Array.from(win.document.querySelectorAll('link[rel=preload]')).some(
+              link =>
+                link.href ==
+                'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+            )
+          ).to.be.true;
+        });
       });
     });
-  });
-
-  // TODO: add test for noContentHandler_()
 
-  describe('renderOutsideViewport', () => {
-    it('should allow rendering within 3 viewports by default', () => {
-      expect(ad3p.renderOutsideViewport()).to.equal(3);
-    });
+    // TODO: add test for noContentHandler_()
 
-    it('should reduce render range when prefer-viewability-over-views ' +
-        'is set', () => {
-      ad3p.element.setAttribute(
-          'data-loading-strategy', 'prefer-viewability-over-views');
-      expect(ad3p.renderOutsideViewport()).to.equal(1.25);
-    });
+    describe('renderOutsideViewport', () => {
+      it('should allow rendering within 3 viewports by default', () => {
+        expect(ad3p.renderOutsideViewport()).to.equal(3);
+      });
 
-    it('should only allow rendering one ad per second', function* () {
-      const clock = lolex.install({
-        target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
-      const ad3p2 = createAmpAd(win);
-      const oneSecPromise = Services.timerFor(win).promise(1001);
-      expect(ad3p.renderOutsideViewport()).to.equal(3);
-      expect(ad3p2.renderOutsideViewport()).to.equal(3);
-
-      ad3p.layoutCallback();
-      expect(ad3p2.renderOutsideViewport()).to.equal(false);
-
-      // Ad loading should only block 1s.
-      clock.tick(999);
-      yield macroTask();
-      expect(ad3p2.renderOutsideViewport()).to.equal(false);
-      clock.tick(2);
-      yield oneSecPromise;
-      expect(ad3p2.renderOutsideViewport()).to.equal(3);
-    });
+      it(
+        'should reduce render range when prefer-viewability-over-views ' +
+          'is set',
+        () => {
+          ad3p.element.setAttribute(
+            'data-loading-strategy',
+            'prefer-viewability-over-views'
+          );
+          expect(ad3p.renderOutsideViewport()).to.equal(1.25);
+        }
+      );
+
+      it('should only allow rendering one ad per second', function*() {
+        const clock = lolex.install({
+          target: win,
+          toFake: ['Date', 'setTimeout', 'clearTimeout'],
+        });
+        const ad3p2 = createAmpAd(win);
+        const oneSecPromise = Services.timerFor(win).promise(1001);
+        expect(ad3p.renderOutsideViewport()).to.equal(3);
+        expect(ad3p2.renderOutsideViewport()).to.equal(3);
+
+        ad3p.layoutCallback();
+        expect(ad3p2.renderOutsideViewport()).to.equal(false);
+
+        // Ad loading should only block 1s.
+        clock.tick(999);
+        yield macroTask();
+        expect(ad3p2.renderOutsideViewport()).to.equal(false);
+        clock.tick(2);
+        yield oneSecPromise;
+        expect(ad3p2.renderOutsideViewport()).to.equal(3);
+      });
 
-    it('should only allow rendering one ad a time', function* () {
-      const ad3p2 = createAmpAd(win);
-      expect(ad3p.renderOutsideViewport()).to.equal(3);
-      expect(ad3p2.renderOutsideViewport()).to.equal(3);
+      it('should only allow rendering one ad a time', function*() {
+        const ad3p2 = createAmpAd(win);
+        expect(ad3p.renderOutsideViewport()).to.equal(3);
+        expect(ad3p2.renderOutsideViewport()).to.equal(3);
 
-      const layoutPromise = ad3p.layoutCallback();
-      expect(ad3p2.renderOutsideViewport()).to.equal(false);
+        const layoutPromise = ad3p.layoutCallback();
+        expect(ad3p2.renderOutsideViewport()).to.equal(false);
 
-      // load ad one a time
-      yield layoutPromise; // wait for iframe load
-      yield macroTask(); // yield to promise resolution after iframe load
-      expect(ad3p2.renderOutsideViewport()).to.equal(3);
+        // load ad one a time
+        yield layoutPromise; // wait for iframe load
+        yield macroTask(); // yield to promise resolution after iframe load
+        expect(ad3p2.renderOutsideViewport()).to.equal(3);
+      });
     });
-  });
-
-  describe('#getIntersectionElementLayoutBox', () => {
-    it('should not cache intersection box', () => {
-      return ad3p.layoutCallback().then(() => {
-        const iframe = ad3p.element.querySelector('iframe');
-
-        // Force some styles on the iframe, to display it without loading
-        // the iframe and have different size than the ad itself.
-        iframe.style.width = '300px';
-        iframe.style.height = '200px';
-        iframe.style.display = 'block';
-        iframe.style.minHeight = '0px';
-
-        const stub = sandbox.stub(ad3p, 'getLayoutBox');
-        const box = {
-          top: 100,
-          bottom: 200,
-          left: 0,
-          right: 100,
-          width: 100,
-          height: 100,
-        };
-        stub.returns(box);
 
-        ad3p.onLayoutMeasure();
-        const intersection = ad3p.getIntersectionElementLayoutBox();
-
-        // Simulate a fixed position element "moving" 100px by scrolling down
-        // the page.
-        box.top += 100;
-        box.bottom += 100;
-        const newIntersection = ad3p.getIntersectionElementLayoutBox();
-        expect(newIntersection).not.to.deep.equal(intersection);
-        expect(newIntersection.top).to.equal(intersection.top + 100);
-        expect(newIntersection.width).to.equal(300);
-        expect(newIntersection.height).to.equal(200);
+    describe('#getIntersectionElementLayoutBox', () => {
+      it('should not cache intersection box', () => {
+        return ad3p.layoutCallback().then(() => {
+          const iframe = ad3p.element.querySelector('iframe');
+
+          // Force some styles on the iframe, to display it without loading
+          // the iframe and have different size than the ad itself.
+          iframe.style.width = '300px';
+          iframe.style.height = '200px';
+          iframe.style.display = 'block';
+          iframe.style.minHeight = '0px';
+
+          const stub = sandbox.stub(ad3p, 'getLayoutBox');
+          const box = {
+            top: 100,
+            bottom: 200,
+            left: 0,
+            right: 100,
+            width: 100,
+            height: 100,
+          };
+          stub.returns(box);
+
+          ad3p.onLayoutMeasure();
+          const intersection = ad3p.getIntersectionElementLayoutBox();
+
+          // Simulate a fixed position element "moving" 100px by scrolling down
+          // the page.
+          box.top += 100;
+          box.bottom += 100;
+          const newIntersection = ad3p.getIntersectionElementLayoutBox();
+          expect(newIntersection).not.to.deep.equal(intersection);
+          expect(newIntersection.top).to.equal(intersection.top + 100);
+          expect(newIntersection.width).to.equal(300);
+          expect(newIntersection.height).to.equal(200);
+        });
       });
     });
-  });
-
-  describe('full width responsive ad', () => {
 
-    const VIEWPORT_WIDTH = 300;
-    const VIEWPORT_HEIGHT = 600;
+    describe('full width responsive ad', () => {
+      const VIEWPORT_WIDTH = 300;
+      const VIEWPORT_HEIGHT = 600;
 
-    beforeEach(() => {
-      adConfig['_ping_'].fullWidthHeightRatio = 1.2;
-      win.document.body.removeChild(ad3p.element);
-    });
+      beforeEach(() => {
+        adConfig['_ping_'].fullWidthHeightRatio = 1.2;
+        win.document.body.removeChild(ad3p.element);
+      });
 
-    describe('should resize correctly', () => {
-      let impl;
-      let element;
-
-      function constructImpl(config) {
-        config.type = '_ping_';
-        element = createElementWithAttributes(win.document, 'amp-ad', config);
-        win.document.body.appendChild(element);
-        impl = new AmpAd3PImpl(element);
-        impl.element.style.display = 'block';
-        impl.element.style.position = 'relative';
-        impl.element.style.top = '101vh';
-
-        // Fix the viewport to a consistent size to that the test doesn't depend
-        // on the actual browser window opened.
-        impl.getViewport().getSize =
-          () => ({width: VIEWPORT_WIDTH, height: VIEWPORT_HEIGHT});
-      }
-
-      it('should do nothing for non-responsive', () => {
-        constructImpl({
-          width: '280',
-          height: '280',
+      describe('should resize correctly', () => {
+        let impl;
+        let element;
+
+        function constructImpl(config) {
+          config.type = '_ping_';
+          element = createElementWithAttributes(win.document, 'amp-ad', config);
+          win.document.body.appendChild(element);
+          impl = new AmpAd3PImpl(element);
+          impl.element.style.display = 'block';
+          impl.element.style.position = 'relative';
+          impl.element.style.top = '101vh';
+
+          // Fix the viewport to a consistent size to that the test doesn't depend
+          // on the actual browser window opened.
+          impl.getViewport().getSize = () => ({
+            width: VIEWPORT_WIDTH,
+            height: VIEWPORT_HEIGHT,
+          });
+        }
+
+        it('should do nothing for non-responsive', () => {
+          constructImpl({
+            width: '280',
+            height: '280',
+          });
+          const attemptChangeSizeSpy = sandbox.spy(impl, 'attemptChangeSize');
+          expect(impl.buildCallback()).to.be.undefined;
+          expect(attemptChangeSizeSpy).to.not.be.called;
         });
-        const attemptChangeSizeSpy = sandbox.spy(impl, 'attemptChangeSize');
-        expect(impl.buildCallback()).to.be.undefined;
-        expect(attemptChangeSizeSpy).to.not.be.called;
-      });
 
-      it('should schedule a resize for responsive', () => {
-        constructImpl({
-          width: '100vw',
-          height: '280',
-          'data-auto-format': 'rspv',
-          'data-full-width': '',
+        it('should schedule a resize for responsive', () => {
+          constructImpl({
+            width: '100vw',
+            height: '280',
+            'data-auto-format': 'rspv',
+            'data-full-width': '',
+          });
+          const attemptChangeSizeSpy = sandbox
+            .stub(impl, 'attemptChangeSize')
+            .callsFake((height, width) => {
+              expect(width).to.equal(VIEWPORT_WIDTH);
+              expect(height).to.equal(250);
+              return Promise.resolve();
+            });
+
+          const callback = impl.buildCallback();
+          expect(callback).to.exist;
+          expect(attemptChangeSizeSpy).to.be.calledOnce;
         });
-        const attemptChangeSizeSpy =
-            sandbox.stub(impl, 'attemptChangeSize').callsFake(
-                (height, width) => {
-                  expect(width).to.equal(VIEWPORT_WIDTH);
-                  expect(height).to.equal(250);
-                  return Promise.resolve();
-                });
-
-        const callback = impl.buildCallback();
-        expect(callback).to.exist;
-        expect(attemptChangeSizeSpy).to.be.calledOnce;
-      });
 
-      it('should schedule a resize for matched content responsive', () => {
-        constructImpl({
-          width: '100vw',
-          height: '280',
-          'data-auto-format': 'mcrspv',
-          'data-full-width': '',
+        it('should schedule a resize for matched content responsive', () => {
+          constructImpl({
+            width: '100vw',
+            height: '280',
+            'data-auto-format': 'mcrspv',
+            'data-full-width': '',
+          });
+          const attemptChangeSizeSpy = sandbox
+            .stub(impl, 'attemptChangeSize')
+            .callsFake((height, width) => {
+              expect(width).to.equal(VIEWPORT_WIDTH);
+              expect(height).to.equal(1131);
+              return Promise.resolve();
+            });
+
+          const callback = impl.buildCallback();
+          expect(callback).to.exist;
+          expect(attemptChangeSizeSpy).to.be.calledOnce;
         });
-        const attemptChangeSizeSpy =
-            sandbox.stub(impl, 'attemptChangeSize').callsFake(
-                (height, width) => {
-                  expect(width).to.equal(VIEWPORT_WIDTH);
-                  expect(height).to.equal(1131);
-                  return Promise.resolve();
-                });
-
-        const callback = impl.buildCallback();
-        expect(callback).to.exist;
-        expect(attemptChangeSizeSpy).to.be.calledOnce;
       });
-    });
-
-    describe('should align correctly', () => {
-      // Nested elements to contain the ad. (container contains the ad, and
-      // containerContainer contains that container.)
-      let containerContainer, container;
-      let viewer;
-      let element;
-      let impl;
-
-      function buildImpl(config) {
-        containerContainer = win.document.createElement('div');
-        container = win.document.createElement('div');
-        // Create an element with horizontal margins for the ad to break out
-        // of.
-        containerContainer.style.marginLeft = '5px';
-        containerContainer.style.marginRight = '9px';
-
-        // Create an element with horizontal margins for the ad to break out
-        // of.
-        container.style.marginLeft = '14px';
-        container.style.paddingLeft = '5px';
-        container.style.marginRight = '20px';
-        container.style.paddingRight = '5px';
-
-        config.type = '_ping_';
-
-        element = createElementWithAttributes(win.document, 'amp-ad', config);
-
-        container.appendChild(element);
-        containerContainer.appendChild(container);
-        win.document.body.appendChild(containerContainer);
-
-        impl = new AmpAd3PImpl(element);
-        impl.element.style.display = 'block';
-        impl.element.style.position = 'relative';
-        impl.element.style.top = '150vh';
-
-        // Stub out vsync tasks to run immediately.
-        impl.getVsync().run = (vsyncTaskSpec, vsyncState) => {
-          if (vsyncTaskSpec.measure) {
-            vsyncTaskSpec.measure(vsyncState);
-          }
-          if (vsyncTaskSpec.mutate) {
-            vsyncTaskSpec.mutate(vsyncState);
-          }
-        };
-
-        // Fix the viewport to a consistent size to that the test doesn't
-        // depend on the actual browser window opened.
-        impl.getViewport().getSize =
-              () => ({width: VIEWPORT_WIDTH, height: VIEWPORT_HEIGHT});
-
-        return impl.buildCallback();
-      }
 
-      beforeEach(() => {
-        viewer = win.services.viewer.obj;
-        viewer.toggleRuntime(); // Turn runtime on for these tests.
-      });
+      describe('should align correctly', () => {
+        // Nested elements to contain the ad. (container contains the ad, and
+        // containerContainer contains that container.)
+        let containerContainer, container;
+        let viewer;
+        let element;
+        let impl;
+
+        function buildImpl(config) {
+          containerContainer = win.document.createElement('div');
+          container = win.document.createElement('div');
+          // Create an element with horizontal margins for the ad to break out
+          // of.
+          containerContainer.style.marginLeft = '5px';
+          containerContainer.style.marginRight = '9px';
+
+          // Create an element with horizontal margins for the ad to break out
+          // of.
+          container.style.marginLeft = '14px';
+          container.style.paddingLeft = '5px';
+          container.style.marginRight = '20px';
+          container.style.paddingRight = '5px';
+
+          config.type = '_ping_';
+
+          element = createElementWithAttributes(win.document, 'amp-ad', config);
+
+          container.appendChild(element);
+          containerContainer.appendChild(container);
+          win.document.body.appendChild(containerContainer);
+
+          impl = new AmpAd3PImpl(element);
+          impl.element.style.display = 'block';
+          impl.element.style.position = 'relative';
+          impl.element.style.top = '150vh';
+
+          // Stub out vsync tasks to run immediately.
+          impl.getVsync().run = (vsyncTaskSpec, vsyncState) => {
+            if (vsyncTaskSpec.measure) {
+              vsyncTaskSpec.measure(vsyncState);
+            }
+            if (vsyncTaskSpec.mutate) {
+              vsyncTaskSpec.mutate(vsyncState);
+            }
+          };
+
+          // Fix the viewport to a consistent size to that the test doesn't
+          // depend on the actual browser window opened.
+          impl.getViewport().getSize = () => ({
+            width: VIEWPORT_WIDTH,
+            height: VIEWPORT_HEIGHT,
+          });
+
+          return impl.buildCallback();
+        }
+
+        beforeEach(() => {
+          viewer = win.services.viewer.obj;
+          viewer.toggleRuntime(); // Turn runtime on for these tests.
+        });
 
-      afterEach(() => {
-        viewer.toggleRuntime(); // Turn runtime off again.
-        win.document.body.style.direction = '';
-      });
+        afterEach(() => {
+          viewer.toggleRuntime(); // Turn runtime off again.
+          win.document.body.style.direction = '';
+        });
 
-      it('should change left margin for responsive', () => {
-        return buildImpl({
-          width: '100vw',
-          height: '280',
-          'data-auto-format': 'rspv',
-          'data-full-width': '',
-        }).then(() => {
-          expect(element.offsetWidth).to.equal(VIEWPORT_WIDTH);
-
-          impl.onLayoutMeasure();
-          // Left margin is 19px from container and 5px from body.
-          expect(element.style.marginRight).to.be.equal('');
-          expect(element.style.marginLeft).to.be.equal('-24px');
+        it('should change left margin for responsive', () => {
+          return buildImpl({
+            width: '100vw',
+            height: '280',
+            'data-auto-format': 'rspv',
+            'data-full-width': '',
+          }).then(() => {
+            expect(element.offsetWidth).to.equal(VIEWPORT_WIDTH);
+
+            impl.onLayoutMeasure();
+            // Left margin is 19px from container and 5px from body.
+            expect(element.style.marginRight).to.be.equal('');
+            expect(element.style.marginLeft).to.be.equal('-24px');
+          });
         });
-      });
 
-      it('should change right margin for responsive in RTL', () => {
-        win.document.body.style.direction = 'rtl';
-
-        return buildImpl({
-          width: '100vw',
-          height: '320',
-          'data-auto-format': 'rspv',
-          'data-full-width': '',
-        }).then(() => {
-          expect(element.offsetWidth).to.equal(VIEWPORT_WIDTH);
-
-          impl.onLayoutMeasure();
-          // Right margin is 9px from containerContainer and 25px from
-          // container.
-          expect(element.style.marginLeft).to.be.equal('');
-          expect(element.style.marginRight).to.be.equal('-34px');
+        it('should change right margin for responsive in RTL', () => {
+          win.document.body.style.direction = 'rtl';
+
+          return buildImpl({
+            width: '100vw',
+            height: '320',
+            'data-auto-format': 'rspv',
+            'data-full-width': '',
+          }).then(() => {
+            expect(element.offsetWidth).to.equal(VIEWPORT_WIDTH);
+
+            impl.onLayoutMeasure();
+            // Right margin is 9px from containerContainer and 25px from
+            // container.
+            expect(element.style.marginLeft).to.be.equal('');
+            expect(element.style.marginRight).to.be.equal('-34px');
+          });
         });
       });
     });
-  });
-});
+  }
+);
 
 describe('#getLayoutPriority', () => {
-  describes.realWin('with shadow AmpDoc', {
-    amp: {
-      ampdoc: 'shadow',
+  describes.realWin(
+    'with shadow AmpDoc',
+    {
+      amp: {
+        ampdoc: 'shadow',
+      },
     },
-  }, env => {
-    it('should return priority of 1', () => {
-      const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
-      expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
-    });
-  });
-
-  describes.realWin('with single AmpDoc', {
-    amp: {
-      ampdoc: 'single',
+    env => {
+      it('should return priority of 1', () => {
+        const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
+        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+      });
+    }
+  );
+
+  describes.realWin(
+    'with single AmpDoc',
+    {
+      amp: {
+        ampdoc: 'single',
+      },
     },
-  }, env => {
-    it('should return priority of 2', () => {
-      const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
-      expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.ADS);
-    });
-  });
+    env => {
+      it('should return priority of 2', () => {
+        const ad3p = createAmpAd(env.ampdoc.win, /*attach*/ true, env.ampdoc);
+        expect(ad3p.getLayoutPriority()).to.equal(LayoutPriority.ADS);
+      });
+    }
+  );
 });
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-custom.js b/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
index bd61bb7f90f4..dd38b91da971 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-custom.js
@@ -17,10 +17,7 @@
 import {AmpAdCustom} from '../amp-ad-custom';
 import {LayoutPriority} from '../../../../src/layout';
 import {Services} from '../../../../src/services';
-import {
-  createElementWithAttributes,
-  removeChildren,
-} from '../../../../src/dom';
+import {createElementWithAttributes, removeChildren} from '../../../../src/dom';
 
 describe('Amp custom ad', () => {
   let sandbox;
@@ -65,7 +62,9 @@ describe('Amp custom ad', () => {
     const urlBase1 = '/examples/custom.ad.example.single.json';
     const elem1 = getCustomAd(urlBase1);
     const ad1 = new AmpAdCustom(elem1);
-    sandbox.stub(ad1, 'getFallback').callsFake(() => {return null;});
+    sandbox.stub(ad1, 'getFallback').callsFake(() => {
+      return null;
+    });
     ad1.buildCallback();
 
     // Single ad with a slot
@@ -73,7 +72,9 @@ describe('Amp custom ad', () => {
     const slot = 'myslot2';
     const elem2 = getCustomAd(urlBase2, slot);
     const ad2 = new AmpAdCustom(elem2);
-    sandbox.stub(ad2, 'getFallback').callsFake(() => {return null;});
+    sandbox.stub(ad2, 'getFallback').callsFake(() => {
+      return null;
+    });
     ad2.buildCallback();
     const expected2 = urlBase2 + '&ampslots=' + slot;
 
@@ -82,13 +83,17 @@ describe('Amp custom ad', () => {
     const slot3 = 'myslot3';
     const elem3 = getCustomAd(urlBase34, slot3);
     const ad3 = new AmpAdCustom(elem3);
-    sandbox.stub(ad3, 'getFallback').callsFake(() => {return null;});
+    sandbox.stub(ad3, 'getFallback').callsFake(() => {
+      return null;
+    });
     ad3.buildCallback();
 
     const slot4 = 'myslot4';
     const elem4 = getCustomAd(urlBase34, slot4);
     const ad4 = new AmpAdCustom(elem4);
-    sandbox.stub(ad4, 'getFallback').callsFake(() => {return null;});
+    sandbox.stub(ad4, 'getFallback').callsFake(() => {
+      return null;
+    });
     ad4.buildCallback();
 
     const expected34 = urlBase34 + '?ampslots=' + slot3 + '%2C' + slot4;
@@ -126,29 +131,45 @@ describe('Amp custom ad', () => {
     const url = '/examples/custom.ad.example.json';
     const slot = 'myslot';
 
-    describes.realWin('with shadow AmpDoc', {
-      amp: {
-        ampdoc: 'shadow',
+    describes.realWin(
+      'with shadow AmpDoc',
+      {
+        amp: {
+          ampdoc: 'shadow',
+        },
       },
-    }, env => {
-      it('should return priority of 0', () => {
-        const adElement = getCustomAd(url, slot, /*body*/env.ampdoc.getBody());
-        const customAd = new AmpAdCustom(adElement);
-        expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
-      });
-    });
+      env => {
+        it('should return priority of 0', () => {
+          const adElement = getCustomAd(
+            url,
+            slot,
+            /*body*/ env.ampdoc.getBody()
+          );
+          const customAd = new AmpAdCustom(adElement);
+          expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        });
+      }
+    );
 
-    describes.realWin('with single AmpDoc', {
-      amp: {
-        ampdoc: 'single',
+    describes.realWin(
+      'with single AmpDoc',
+      {
+        amp: {
+          ampdoc: 'single',
+        },
       },
-    }, env => {
-      it('should return priority of 0', () => {
-        const adElement = getCustomAd(url, slot, /*body*/env.ampdoc.getBody());
-        const customAd = new AmpAdCustom(adElement);
-        expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
-      });
-    });
+      env => {
+        it('should return priority of 0', () => {
+          const adElement = getCustomAd(
+            url,
+            slot,
+            /*body*/ env.ampdoc.getBody()
+          );
+          const customAd = new AmpAdCustom(adElement);
+          expect(customAd.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        });
+      }
+    );
   });
 
   describe('TemplateData', () => {
@@ -156,17 +177,19 @@ describe('Amp custom ad', () => {
       const elem = getCustomAd('fake.json');
       const ad = new AmpAdCustom(elem);
       ad.buildCallback();
-      expect(ad.handleTemplateData_({
-        'a': '1',
-        'b': '2',
-        'data': {
-          'c': '3',
-        },
-        'templateId': '4',
-        'vars': {
-          'd': '5',
-        },
-      })).to.deep.equal({
+      expect(
+        ad.handleTemplateData_({
+          'a': '1',
+          'b': '2',
+          'data': {
+            'c': '3',
+          },
+          'templateId': '4',
+          'vars': {
+            'd': '5',
+          },
+        })
+      ).to.deep.equal({
         'a': '1',
         'b': '2',
         'data': {
@@ -186,17 +209,19 @@ describe('Amp custom ad', () => {
       removeChildren(elem);
       const ad = new AmpAdCustom(elem);
       ad.buildCallback();
-      expect(ad.handleTemplateData_({
-        'a': '1',
-        'b': '2',
-        'data': {
-          'c': '3',
-        },
-        'templateId': '4',
-        'vars': {
-          'd': '5',
-        },
-      })).to.deep.equal({
+      expect(
+        ad.handleTemplateData_({
+          'a': '1',
+          'b': '2',
+          'data': {
+            'c': '3',
+          },
+          'templateId': '4',
+          'vars': {
+            'd': '5',
+          },
+        })
+      ).to.deep.equal({
         'c': '3',
       });
       expect(elem.getAttribute('template')).to.equal('4');
@@ -233,4 +258,3 @@ describe('Amp custom ad', () => {
     });
   });
 });
-
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
index 6f8cabd9765c..2845d9ff38f2 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-ui.js
@@ -22,258 +22,298 @@ import {createElementWithAttributes} from '../../../../src/dom';
 import {macroTask} from '../../../../testing/yield';
 import {setStyles} from '../../../../src/style';
 
-describes.realWin('amp-ad-ui handler', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'amp-ad-ui handler',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let sandbox;
-  let adImpl;
-  let uiHandler;
-  let adContainer;
-  let adElement;
+  env => {
+    let sandbox;
+    let adImpl;
+    let uiHandler;
+    let adContainer;
+    let adElement;
 
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    adElement = env.win.document.createElement('amp-ad');
-    adImpl = new BaseElement(adElement);
-    uiHandler = new AmpAdUIHandler(adImpl);
-    sandbox.stub(adHelper, 'getAdContainer').callsFake(() => {
-      return adContainer;
-    });
-    adContainer = null;
-  });
-
-  describe('applyNoContentUI', () => {
-    it('should force collapse ad in sticky ad container', () => {
-      adContainer = 'AMP-STICKY-AD';
-      const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
-      const collapseSpy = sandbox.stub(adImpl, 'collapse').callsFake(() => {});
-      uiHandler.applyNoContentUI();
-      expect(collapseSpy).to.be.calledOnce;
-      expect(attemptCollapseSpy).to.not.be.called;
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      adElement = env.win.document.createElement('amp-ad');
+      adImpl = new BaseElement(adElement);
+      uiHandler = new AmpAdUIHandler(adImpl);
+      sandbox.stub(adHelper, 'getAdContainer').callsFake(() => {
+        return adContainer;
+      });
+      adContainer = null;
     });
 
-    it('should force collapse ad inside flying carpet, ' +
-      'if it is the only and direct child of flying carpet', function* () {
-      adContainer = 'AMP-FX-FLYING-CARPET';
-      const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
-      const collapseSpy = sandbox.stub(adImpl, 'collapse').callsFake(() => {});
-
-      sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
-        return [{
-          getImpl: () => Promise.resolve({
-            getChildren: () => [adElement],
-          }),
-        }];
+    describe('applyNoContentUI', () => {
+      it('should force collapse ad in sticky ad container', () => {
+        adContainer = 'AMP-STICKY-AD';
+        const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
+        const collapseSpy = sandbox
+          .stub(adImpl, 'collapse')
+          .callsFake(() => {});
+        uiHandler.applyNoContentUI();
+        expect(collapseSpy).to.be.calledOnce;
+        expect(attemptCollapseSpy).to.not.be.called;
       });
 
-      uiHandler.applyNoContentUI();
-      yield macroTask();
+      it(
+        'should force collapse ad inside flying carpet, ' +
+          'if it is the only and direct child of flying carpet',
+        function*() {
+          adContainer = 'AMP-FX-FLYING-CARPET';
+          const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
+          const collapseSpy = sandbox
+            .stub(adImpl, 'collapse')
+            .callsFake(() => {});
 
-      expect(collapseSpy).to.be.calledOnce;
-      expect(attemptCollapseSpy).to.not.be.called;
-    });
+          sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
+            return [
+              {
+                getImpl: () =>
+                  Promise.resolve({
+                    getChildren: () => [adElement],
+                  }),
+              },
+            ];
+          });
 
-    it('should NOT force collapse ad inside flying carpet, ' +
-      'if there is another element', function* () {
-      adContainer = 'AMP-FX-FLYING-CARPET';
-      const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
-      const collapseSpy = sandbox.stub(adImpl, 'collapse').callsFake(() => {});
+          uiHandler.applyNoContentUI();
+          yield macroTask();
 
-      const otherElement = env.win.document.createElement('div');
+          expect(collapseSpy).to.be.calledOnce;
+          expect(attemptCollapseSpy).to.not.be.called;
+        }
+      );
 
-      sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
-        return [{
-          getImpl: () => Promise.resolve({
-            getChildren: () => [adElement, otherElement],
-          }),
-        }];
-      });
+      it(
+        'should NOT force collapse ad inside flying carpet, ' +
+          'if there is another element',
+        function*() {
+          adContainer = 'AMP-FX-FLYING-CARPET';
+          const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
+          const collapseSpy = sandbox
+            .stub(adImpl, 'collapse')
+            .callsFake(() => {});
 
-      uiHandler.applyNoContentUI();
-      yield macroTask();
+          const otherElement = env.win.document.createElement('div');
 
-      expect(collapseSpy).to.not.be.called;
-      expect(attemptCollapseSpy).to.not.be.called;
-    });
+          sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
+            return [
+              {
+                getImpl: () =>
+                  Promise.resolve({
+                    getChildren: () => [adElement, otherElement],
+                  }),
+              },
+            ];
+          });
 
-    it('should NOT force collapse ad inside flying carpet, ' +
-      'if it is not a direct child of flying carpet.', function* () {
-      adContainer = 'AMP-FX-FLYING-CARPET';
-      const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
-      const collapseSpy = sandbox.stub(adImpl, 'collapse').callsFake(() => {});
+          uiHandler.applyNoContentUI();
+          yield macroTask();
 
-      const otherElement = env.win.document.createElement('div');
-      adElement.remove();
-      otherElement.appendChild(adElement);
+          expect(collapseSpy).to.not.be.called;
+          expect(attemptCollapseSpy).to.not.be.called;
+        }
+      );
 
-      sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
-        return [{
-          getImpl: () => Promise.resolve({
-            getChildren: () => [otherElement],
-          }),
-        }];
-      });
+      it(
+        'should NOT force collapse ad inside flying carpet, ' +
+          'if it is not a direct child of flying carpet.',
+        function*() {
+          adContainer = 'AMP-FX-FLYING-CARPET';
+          const attemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
+          const collapseSpy = sandbox
+            .stub(adImpl, 'collapse')
+            .callsFake(() => {});
 
-      uiHandler.applyNoContentUI();
-      yield macroTask();
+          const otherElement = env.win.document.createElement('div');
+          adElement.remove();
+          otherElement.appendChild(adElement);
 
-      expect(collapseSpy).to.not.be.called;
-      expect(attemptCollapseSpy).to.not.be.called;
-    });
+          sandbox.stub(dom, 'ancestorElementsByTag').callsFake(() => {
+            return [
+              {
+                getImpl: () =>
+                  Promise.resolve({
+                    getChildren: () => [otherElement],
+                  }),
+              },
+            ];
+          });
 
+          uiHandler.applyNoContentUI();
+          yield macroTask();
 
+          expect(collapseSpy).to.not.be.called;
+          expect(attemptCollapseSpy).to.not.be.called;
+        }
+      );
 
-    it('should collapse ad amp-layout container if there is one', () => {
-      adElement = createElementWithAttributes(env.win.document, 'amp-ad', {
-        'data-ad-container-id': 'test',
+      it('should collapse ad amp-layout container if there is one', () => {
+        adElement = createElementWithAttributes(env.win.document, 'amp-ad', {
+          'data-ad-container-id': 'test',
+        });
+        const container = createElementWithAttributes(
+          env.win.document,
+          'amp-layout',
+          {'id': 'test'}
+        );
+        container.appendChild(adElement);
+        env.win.document.body.appendChild(container);
+        adImpl = new BaseElement(adElement);
+        uiHandler = new AmpAdUIHandler(adImpl);
+        const adAttemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
+        uiHandler.applyNoContentUI();
+        expect(adAttemptCollapseSpy).to.not.be.called;
       });
-      const container = createElementWithAttributes(env.win.document,
-          'amp-layout', {'id': 'test'});
-      container.appendChild(adElement);
-      env.win.document.body.appendChild(container);
-      adImpl = new BaseElement(adElement);
-      uiHandler = new AmpAdUIHandler(adImpl);
-      const adAttemptCollapseSpy = sandbox.spy(adImpl, 'attemptCollapse');
-      uiHandler.applyNoContentUI();
-      expect(adAttemptCollapseSpy).to.not.be.called;
-    });
 
-    it('should try to collapse element first', () => {
-      sandbox.stub(adImpl, 'getFallback').callsFake(() => {
-        return true;
-      });
-      const fallbackSpy = sandbox.stub(adImpl, 'toggleFallback').callsFake(
-          () => {});
-      const collapseSpy = sandbox.stub(adImpl, 'attemptCollapse').callsFake(
-          () => {
+      it('should try to collapse element first', () => {
+        sandbox.stub(adImpl, 'getFallback').callsFake(() => {
+          return true;
+        });
+        const fallbackSpy = sandbox
+          .stub(adImpl, 'toggleFallback')
+          .callsFake(() => {});
+        const collapseSpy = sandbox
+          .stub(adImpl, 'attemptCollapse')
+          .callsFake(() => {
             expect(fallbackSpy).to.not.been.called;
             return Promise.resolve();
           });
-      uiHandler.applyNoContentUI();
-      expect(collapseSpy).to.be.calledOnce;
-    });
-
-    it('should toggle fallback when collapse fail', () => {
-      let resolve = null;
-      const promise = new Promise(resolve_ => {
-        resolve = resolve_;
+        uiHandler.applyNoContentUI();
+        expect(collapseSpy).to.be.calledOnce;
       });
-      const placeholderSpy = sandbox.spy(adImpl, 'togglePlaceholder');
-      const fallbackSpy = sandbox.stub(adImpl, 'toggleFallback').callsFake(
-          () => {});
-      sandbox.stub(uiHandler.baseInstance_, 'attemptCollapse').callsFake(
-          () => {
+
+      it('should toggle fallback when collapse fail', () => {
+        let resolve = null;
+        const promise = new Promise(resolve_ => {
+          resolve = resolve_;
+        });
+        const placeholderSpy = sandbox.spy(adImpl, 'togglePlaceholder');
+        const fallbackSpy = sandbox
+          .stub(adImpl, 'toggleFallback')
+          .callsFake(() => {});
+        sandbox
+          .stub(uiHandler.baseInstance_, 'attemptCollapse')
+          .callsFake(() => {
             return Promise.reject();
           });
-      sandbox.stub(uiHandler.baseInstance_, 'mutateElement').callsFake(
-          callback => {
+        sandbox
+          .stub(uiHandler.baseInstance_, 'mutateElement')
+          .callsFake(callback => {
             callback();
             resolve();
           });
-      uiHandler.applyNoContentUI();
-      return promise.then(() => {
-        expect(placeholderSpy).to.be.calledWith(false);
-        expect(fallbackSpy).to.be.calledWith(true);
-      });
-    });
-
-    it('should apply default holder if not provided', () => {
-      sandbox.stub(adImpl, 'getFallback').callsFake(() => {
-        return false;
-      });
-      let resolve = null;
-      const promise = new Promise(resolve_ => {
-        resolve = resolve_;
-      });
-      sandbox.stub(adImpl, 'attemptCollapse').callsFake(() => {
-        return Promise.reject();
-      });
-      sandbox.stub(adImpl, 'mutateElement').callsFake(callback => {
-        callback();
-        resolve();
-      });
-      sandbox.stub(adImpl, 'togglePlaceholder').callsFake(() => {});
-      sandbox.stub(adImpl, 'toggleFallback').callsFake(() => {});
-      uiHandler.applyNoContentUI();
-      return promise.then(() => {
-        const el = adImpl.element.querySelector('[fallback]');
-        expect(el).to.be.ok;
-        expect(el.children[0]).to.have.class('i-amphtml-ad-default-holder');
-        expect(el.children[0]).to.have.attribute('data-ad-holder-text');
+        uiHandler.applyNoContentUI();
+        return promise.then(() => {
+          expect(placeholderSpy).to.be.calledWith(false);
+          expect(fallbackSpy).to.be.calledWith(true);
+        });
       });
-    });
 
-    describe('updateSize function', () => {
-      it('should calculate take consideration of padding', () => {
-        setStyles(adImpl.element, {
-          width: '350px',
-          height: '50px',
+      it('should apply default holder if not provided', () => {
+        sandbox.stub(adImpl, 'getFallback').callsFake(() => {
+          return false;
         });
-        env.win.document.body.appendChild(adElement);
-        sandbox.stub(adImpl, 'attemptChangeSize').callsFake((height, width) => {
-          expect(height).to.equal(100);
-          expect(width).to.equal(450);
-          return Promise.resolve();
+        let resolve = null;
+        const promise = new Promise(resolve_ => {
+          resolve = resolve_;
         });
-        return uiHandler.updateSize(100, 400, 50, 300).then(sizes => {
-          expect(sizes).to.deep.equal({
-            success: true,
-            newWidth: 450,
-            newHeight: 100,
-          });
+        sandbox.stub(adImpl, 'attemptCollapse').callsFake(() => {
+          return Promise.reject();
+        });
+        sandbox.stub(adImpl, 'mutateElement').callsFake(callback => {
+          callback();
+          resolve();
+        });
+        sandbox.stub(adImpl, 'togglePlaceholder').callsFake(() => {});
+        sandbox.stub(adImpl, 'toggleFallback').callsFake(() => {});
+        uiHandler.applyNoContentUI();
+        return promise.then(() => {
+          const el = adImpl.element.querySelector('[fallback]');
+          expect(el).to.be.ok;
+          expect(el.children[0]).to.have.class('i-amphtml-ad-default-holder');
+          expect(el.children[0]).to.have.attribute('data-ad-holder-text');
         });
       });
 
-      it('should tolerate string input', () => {
-        sandbox.stub(adImpl, 'attemptChangeSize').callsFake((height, width) => {
-          expect(height).to.equal(100);
-          expect(width).to.equal(400);
-          return Promise.resolve();
-        });
-        return uiHandler.updateSize('100', 400, 0, 0).then(sizes => {
-          expect(sizes).to.deep.equal({
-            success: true,
-            newWidth: 400,
-            newHeight: 100,
+      describe('updateSize function', () => {
+        it('should calculate take consideration of padding', () => {
+          setStyles(adImpl.element, {
+            width: '350px',
+            height: '50px',
+          });
+          env.win.document.body.appendChild(adElement);
+          sandbox
+            .stub(adImpl, 'attemptChangeSize')
+            .callsFake((height, width) => {
+              expect(height).to.equal(100);
+              expect(width).to.equal(450);
+              return Promise.resolve();
+            });
+          return uiHandler.updateSize(100, 400, 50, 300).then(sizes => {
+            expect(sizes).to.deep.equal({
+              success: true,
+              newWidth: 450,
+              newHeight: 100,
+            });
           });
         });
-      });
 
-      it('should reject on special case undefined sizes', () => {
-        const attemptChangeSizeSpy = sandbox.spy(adImpl, 'attemptChangeSize');
-        return uiHandler.updateSize(undefined, undefined, 0, 0).catch(e => {
-          expect(e.message).to.equal('undefined width and height');
-          expect(attemptChangeSizeSpy).to.not.be.called;
+        it('should tolerate string input', () => {
+          sandbox
+            .stub(adImpl, 'attemptChangeSize')
+            .callsFake((height, width) => {
+              expect(height).to.equal(100);
+              expect(width).to.equal(400);
+              return Promise.resolve();
+            });
+          return uiHandler.updateSize('100', 400, 0, 0).then(sizes => {
+            expect(sizes).to.deep.equal({
+              success: true,
+              newWidth: 400,
+              newHeight: 100,
+            });
+          });
         });
-      });
 
-      it('should reject on special case inside sticky ad', () => {
-        adContainer = 'AMP-STICKY-AD';
-        const attemptChangeSizeSpy = sandbox.spy(adImpl, 'attemptChangeSize');
-        return uiHandler.updateSize(100, 400, 0, 0).then(sizes => {
-          expect(sizes).to.deep.equal({
-            success: false,
-            newWidth: 400,
-            newHeight: 100,
+        it('should reject on special case undefined sizes', () => {
+          const attemptChangeSizeSpy = sandbox.spy(adImpl, 'attemptChangeSize');
+          return uiHandler.updateSize(undefined, undefined, 0, 0).catch(e => {
+            expect(e.message).to.equal('undefined width and height');
+            expect(attemptChangeSizeSpy).to.not.be.called;
           });
-          expect(attemptChangeSizeSpy).to.not.be.called;
         });
-      });
 
-      it('should reject on attemptChangeSize reject', () => {
-        sandbox.stub(adImpl, 'attemptChangeSize').callsFake(() => {
-          return Promise.reject();
+        it('should reject on special case inside sticky ad', () => {
+          adContainer = 'AMP-STICKY-AD';
+          const attemptChangeSizeSpy = sandbox.spy(adImpl, 'attemptChangeSize');
+          return uiHandler.updateSize(100, 400, 0, 0).then(sizes => {
+            expect(sizes).to.deep.equal({
+              success: false,
+              newWidth: 400,
+              newHeight: 100,
+            });
+            expect(attemptChangeSizeSpy).to.not.be.called;
+          });
         });
-        return uiHandler.updateSize(100, 400, 0, 0).then(sizes => {
-          expect(sizes).to.deep.equal({
-            success: false,
-            newWidth: 400,
-            newHeight: 100,
+
+        it('should reject on attemptChangeSize reject', () => {
+          sandbox.stub(adImpl, 'attemptChangeSize').callsFake(() => {
+            return Promise.reject();
+          });
+          return uiHandler.updateSize(100, 400, 0, 0).then(sizes => {
+            expect(sizes).to.deep.equal({
+              success: false,
+              newWidth: 400,
+              newHeight: 100,
+            });
           });
         });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
index 299f755e8ee5..bdda2114b20a 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad-xorigin-iframe-handler.js
@@ -26,7 +26,6 @@ import {
 import {layoutRectLtwh} from '../../../../src/layout-rect';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
 describe('amp-ad-xorigin-iframe-handler', () => {
   let sandbox;
   let adImpl;
@@ -78,7 +77,6 @@ describe('amp-ad-xorigin-iframe-handler', () => {
     let initPromise;
 
     describe('if render-start is implemented', () => {
-
       let noContentSpy;
 
       beforeEach(() => {
@@ -90,8 +88,7 @@ describe('amp-ad-xorigin-iframe-handler', () => {
             newHeight: 217,
           });
         });
-        noContentSpy =
-            sandbox.spy/*OK*/(iframeHandler, 'freeXOriginIframe');
+        noContentSpy = sandbox./*OK*/ spy(iframeHandler, 'freeXOriginIframe');
 
         initPromise = iframeHandler.init(iframe);
       });
@@ -112,21 +109,26 @@ describe('amp-ad-xorigin-iframe-handler', () => {
           type: 'render-start',
         });
         const renderStartPromise = signals.whenSignal('render-start');
-        return Promise.all([renderStartPromise, initPromise]).then(() => {
-          expect(iframe.style.visibility).to.equal('');
-          expect(renderStartedSpy).to.be.calledOnce;
-        }).then(() => {
-          const message = {
-            sentinel: 'amp3ptest' + testIndex,
-            type: 'no-content',
-          };
-          const promise = expectPostMessage(
-              iframe.contentWindow, window, message);
-          iframe.postMessageToParent(message);
-          return promise.then(() => {
-            expect(noContentSpy).to.not.been.called;
+        return Promise.all([renderStartPromise, initPromise])
+          .then(() => {
+            expect(iframe.style.visibility).to.equal('');
+            expect(renderStartedSpy).to.be.calledOnce;
+          })
+          .then(() => {
+            const message = {
+              sentinel: 'amp3ptest' + testIndex,
+              type: 'no-content',
+            };
+            const promise = expectPostMessage(
+              iframe.contentWindow,
+              window,
+              message
+            );
+            iframe.postMessageToParent(message);
+            return promise.then(() => {
+              expect(noContentSpy).to.not.been.called;
+            });
           });
-        });
       });
 
       it('should resolve and resize on message "render-start" w/ size', () => {
@@ -138,34 +140,40 @@ describe('amp-ad-xorigin-iframe-handler', () => {
           sentinel: 'amp3ptest' + testIndex,
         });
         const expectResponsePromise = iframe.expectMessageFromParent(
-            'embed-size-changed');
+          'embed-size-changed'
+        );
         const renderStartPromise = signals.whenSignal('render-start');
-        return Promise.all([renderStartPromise, initPromise]).then(() => {
-          expect(iframe.style.visibility).to.equal('');
-          return expectResponsePromise;
-        }).then(data => {
-          expect(data).to.jsonEqual({
-            requestedWidth: 114,
-            requestedHeight: 217,
-            type: 'embed-size-changed',
-            sentinel: 'amp3ptest' + testIndex,
+        return Promise.all([renderStartPromise, initPromise])
+          .then(() => {
+            expect(iframe.style.visibility).to.equal('');
+            return expectResponsePromise;
+          })
+          .then(data => {
+            expect(data).to.jsonEqual({
+              requestedWidth: 114,
+              requestedHeight: 217,
+              type: 'embed-size-changed',
+              sentinel: 'amp3ptest' + testIndex,
+            });
           });
-        });
       });
 
       // TODO(@lannka): unskip flaky test
-      it.skip('should resolve on message "no-content" ' +
-          'and remove non-master iframe', () => {
-        expect(iframe.style.visibility).to.equal('hidden');
-        iframe.postMessageToParent({
-          sentinel: 'amp3ptest' + testIndex,
-          type: 'no-content',
-        });
-        return initPromise.then(() => {
-          expect(noContentSpy).to.be.calledWith(false);
-          expect(iframeHandler.iframe).to.be.null;
-        });
-      });
+      it.skip(
+        'should resolve on message "no-content" ' +
+          'and remove non-master iframe',
+        () => {
+          expect(iframe.style.visibility).to.equal('hidden');
+          iframe.postMessageToParent({
+            sentinel: 'amp3ptest' + testIndex,
+            type: 'no-content',
+          });
+          return initPromise.then(() => {
+            expect(noContentSpy).to.be.calledWith(false);
+            expect(iframeHandler.iframe).to.be.null;
+          });
+        }
+      );
 
       it('should NOT remove master iframe on message "no-content"', () => {
         iframe.name = 'test_master';
@@ -194,11 +202,14 @@ describe('amp-ad-xorigin-iframe-handler', () => {
         }).then(() => {
           const clock = sandbox.useFakeTimers();
           clock.tick(0);
-          const timeoutPromise =
-              Services.timerFor(window).timeoutPromise(2000, initPromise);
+          const timeoutPromise = Services.timerFor(window).timeoutPromise(
+            2000,
+            initPromise
+          );
           clock.tick(2001);
-          return expect(timeoutPromise).to.eventually
-              .be.rejectedWith(/timeout/);
+          return expect(timeoutPromise).to.eventually.be.rejectedWith(
+            /timeout/
+          );
         });
       });
 
@@ -221,8 +232,10 @@ describe('amp-ad-xorigin-iframe-handler', () => {
       it('should be able to use user-error API', () => {
         const err = new Error();
         err.message = 'error test';
-        const userErrorReportSpy =
-                sandbox.spy/*OK*/(iframeHandler, 'userErrorForAnalytics_');
+        const userErrorReportSpy = sandbox./*OK*/ spy(
+          iframeHandler,
+          'userErrorForAnalytics_'
+        );
         iframe.postMessageToParent({
           type: 'user-error-in-iframe',
           sentinel: 'amp3ptest' + testIndex,
@@ -235,18 +248,21 @@ describe('amp-ad-xorigin-iframe-handler', () => {
       });
     });
 
-    it('should trigger render-start on message "bootstrap-loaded" if' +
-       ' render-start is NOT implemented', () => {
-      initPromise = iframeHandler.init(iframe);
-      iframe.postMessageToParent({
-        sentinel: 'amp3ptest' + testIndex,
-        type: 'bootstrap-loaded',
-      });
-      const renderStartPromise = signals.whenSignal('render-start');
-      return renderStartPromise.then(() => {
-        expect(renderStartedSpy).to.be.calledOnce;
-      });
-    });
+    it(
+      'should trigger render-start on message "bootstrap-loaded" if' +
+        ' render-start is NOT implemented',
+      () => {
+        initPromise = iframeHandler.init(iframe);
+        iframe.postMessageToParent({
+          sentinel: 'amp3ptest' + testIndex,
+          type: 'bootstrap-loaded',
+        });
+        const renderStartPromise = signals.whenSignal('render-start');
+        return renderStartPromise.then(() => {
+          expect(renderStartedSpy).to.be.calledOnce;
+        });
+      }
+    );
 
     it('should trigger visibility on timeout', () => {
       const clock = sandbox.useFakeTimers();
@@ -276,14 +292,14 @@ describe('amp-ad-xorigin-iframe-handler', () => {
   });
 
   describe('Initialized iframe', () => {
-
     beforeEach(() => {
       iframeHandler.init(iframe);
     });
 
     it('should be able to use embed-state API', () => {
-      sandbox.stub/*OK*/(iframeHandler.viewer_, 'isVisible').callsFake(
-          () => true);
+      sandbox
+        ./*OK*/ stub(iframeHandler.viewer_, 'isVisible')
+        .callsFake(() => true);
       iframe.postMessageToParent({
         type: 'send-embed-state',
         sentinel: 'amp3ptest' + testIndex,
@@ -376,12 +392,12 @@ describe('amp-ad-xorigin-iframe-handler', () => {
       iframe.setAttribute('data-amp-3p-sentinel', 'amp3ptest' + testIndex);
       iframe.name = 'test_nomaster';
       iframeHandler.init(iframe);
-      sandbox.stub/*OK*/(
-          iframeHandler.viewport_,
-          'getClientRectAsync').callsFake(() => {
-        return Promise.resolve(layoutRectLtwh(1, 1, 1, 1));
-      });
-      sandbox.stub/*OK*/(iframeHandler.viewport_, 'getRect').callsFake(() => {
+      sandbox
+        ./*OK*/ stub(iframeHandler.viewport_, 'getClientRectAsync')
+        .callsFake(() => {
+          return Promise.resolve(layoutRectLtwh(1, 1, 1, 1));
+        });
+      sandbox./*OK*/ stub(iframeHandler.viewport_, 'getRect').callsFake(() => {
         return layoutRectLtwh(1, 1, 1, 1);
       });
       iframe.postMessageToParent({
@@ -405,17 +421,18 @@ describe('amp-ad-xorigin-iframe-handler', () => {
         sentinel: 'amp3ptest' + testIndex,
         messageId: 3,
       });
-      return iframe.expectMessageFromParent(
-          'get-consent-state-result').then(data => {
-        expect(data).to.jsonEqual({
-          type: 'get-consent-state-result',
-          sentinel: 'amp3ptest' + testIndex,
-          messageId: 3,
-          content: {
-            consentState: 2,
-          },
+      return iframe
+        .expectMessageFromParent('get-consent-state-result')
+        .then(data => {
+          expect(data).to.jsonEqual({
+            type: 'get-consent-state-result',
+            sentinel: 'amp3ptest' + testIndex,
+            messageId: 3,
+            content: {
+              consentState: 2,
+            },
+          });
         });
-      });
     });
   });
 });
diff --git a/extensions/amp-ad/0.1/test/test-amp-ad.js b/extensions/amp-ad/0.1/test/test-amp-ad.js
index cfc882ce1448..86aab522abb6 100644
--- a/extensions/amp-ad/0.1/test/test-amp-ad.js
+++ b/extensions/amp-ad/0.1/test/test-amp-ad.js
@@ -21,7 +21,6 @@ import {adConfig} from '../../../../ads/_config';
 import {getA4ARegistry} from '../../../../ads/_a4a-config';
 import {stubService} from '../../../../testing/test-helper';
 
-
 describes.realWin('Ad loader', {amp: true}, env => {
   let win, doc;
   const a4aRegistry = getA4ARegistry();
@@ -57,7 +56,6 @@ describes.realWin('Ad loader', {amp: true}, env => {
   });
 
   tagNames.forEach(tag => {
-
     describe(tag, () => {
       let ampAdElement;
       let ampAd;
@@ -65,11 +63,16 @@ describes.realWin('Ad loader', {amp: true}, env => {
 
       beforeEach(() => {
         const getUserNotificationStub = stubService(
-            sandbox, win, 'userNotificationManager', 'get');
-        getUserNotificationStub.withArgs('notif')
-            .returns(new Promise(resolve => {
-              userNotificationResolver = resolve;
-            }));
+          sandbox,
+          win,
+          'userNotificationManager',
+          'get'
+        );
+        getUserNotificationStub.withArgs('notif').returns(
+          new Promise(resolve => {
+            userNotificationResolver = resolve;
+          })
+        );
 
         ampAdElement = doc.createElement(tag);
         ampAdElement.setAttribute('type', '_ping_');
@@ -85,8 +88,10 @@ describes.realWin('Ad loader', {amp: true}, env => {
 
           return Promise.race([
             ampAd.upgradeCallback().then(() => {
-              throw new Error('upgradeCallback should not resolve without ' +
-                'notification dismissal');
+              throw new Error(
+                'upgradeCallback should not resolve without ' +
+                  'notification dismissal'
+              );
             }),
             Services.timerFor(win).promise(25),
           ]);
@@ -108,8 +113,9 @@ describes.realWin('Ad loader', {amp: true}, env => {
 
         it('falls back to 3p for registered, non-A4A type', () => {
           ampAd = new AmpAd(ampAdElement);
-          return expect(ampAd.upgradeCallback())
-              .to.eventually.be.instanceof(AmpAd3PImpl);
+          return expect(ampAd.upgradeCallback()).to.eventually.be.instanceof(
+            AmpAd3PImpl
+          );
         });
       });
 
@@ -119,15 +125,17 @@ describes.realWin('Ad loader', {amp: true}, env => {
         };
         ampAdElement.setAttribute('type', 'zort');
         const extensions = Services.extensionsFor(win);
-        const extensionsStub = sandbox.stub(extensions, 'loadElementClass')
-            .withArgs('amp-ad-network-zort-impl')
-            .returns(Promise.reject(new Error('I failed!')));
+        const extensionsStub = sandbox
+          .stub(extensions, 'loadElementClass')
+          .withArgs('amp-ad-network-zort-impl')
+          .returns(Promise.reject(new Error('I failed!')));
         ampAd = new AmpAd(ampAdElement);
         sandbox.stub(ampAd.user(), 'error');
         return ampAd.upgradeCallback().then(baseElement => {
           expect(extensionsStub).to.be.called;
-          expect(ampAdElement.getAttribute(
-              'data-a4a-upgrade-type')).to.equal('amp-ad-network-zort-impl');
+          expect(ampAdElement.getAttribute('data-a4a-upgrade-type')).to.equal(
+            'amp-ad-network-zort-impl'
+          );
           expect(baseElement).to.be.instanceof(AmpAd3PImpl);
         });
       });
@@ -153,16 +161,20 @@ describes.realWin('Ad loader', {amp: true}, env => {
         ampAdElement.setAttribute('type', 'zort');
         ampAdElement.setAttribute('rtc-config', '{"urls": ["https://a.qqq"]}');
         const zortInstance = {};
-        const zortConstructor = function() { return zortInstance; };
+        const zortConstructor = function() {
+          return zortInstance;
+        };
         const extensions = Services.extensionsFor(win);
-        const extensionsStub = sandbox.stub(extensions, 'loadElementClass')
-            .withArgs('amp-ad-network-zort-impl')
-            .returns(Promise.resolve(zortConstructor));
+        const extensionsStub = sandbox
+          .stub(extensions, 'loadElementClass')
+          .withArgs('amp-ad-network-zort-impl')
+          .returns(Promise.resolve(zortConstructor));
         ampAd = new AmpAd(ampAdElement);
         return ampAd.upgradeCallback().then(baseElement => {
           expect(extensionsStub).to.be.called;
-          expect(ampAdElement.getAttribute(
-              'data-a4a-upgrade-type')).to.equal('amp-ad-network-zort-impl');
+          expect(ampAdElement.getAttribute('data-a4a-upgrade-type')).to.equal(
+            'amp-ad-network-zort-impl'
+          );
           expect(baseElement).to.equal(zortInstance);
         });
       });
@@ -178,16 +190,20 @@ describes.realWin('Ad loader', {amp: true}, env => {
         ampAdElement.setAttribute('type', 'zort');
         ampAdElement.setAttribute('rtc-config', '{"urls": ["https://a.qqq"]}');
         const zortInstance = {};
-        const zortConstructor = function() { return zortInstance; };
+        const zortConstructor = function() {
+          return zortInstance;
+        };
         const extensions = Services.extensionsFor(win);
-        const extensionsStub = sandbox.stub(extensions, 'loadElementClass')
-            .withArgs('amp-ad-network-zort-impl')
-            .returns(Promise.resolve(zortConstructor));
+        const extensionsStub = sandbox
+          .stub(extensions, 'loadElementClass')
+          .withArgs('amp-ad-network-zort-impl')
+          .returns(Promise.resolve(zortConstructor));
         ampAd = new AmpAd(ampAdElement);
         return ampAd.upgradeCallback().then(baseElement => {
           expect(extensionsStub).to.be.called;
-          expect(ampAdElement.getAttribute(
-              'data-a4a-upgrade-type')).to.equal('amp-ad-network-zort-impl');
+          expect(ampAdElement.getAttribute('data-a4a-upgrade-type')).to.equal(
+            'amp-ad-network-zort-impl'
+          );
           expect(baseElement).to.equal(zortInstance);
         });
       });
@@ -203,16 +219,20 @@ describes.realWin('Ad loader', {amp: true}, env => {
         };
         ampAdElement.setAttribute('type', 'zort');
         const zortInstance = {};
-        const zortConstructor = function() { return zortInstance; };
+        const zortConstructor = function() {
+          return zortInstance;
+        };
         const extensions = Services.extensionsFor(win);
-        const extensionsStub = sandbox.stub(extensions, 'loadElementClass')
-            .withArgs('amp-ad-network-zort-impl')
-            .returns(Promise.resolve(zortConstructor));
+        const extensionsStub = sandbox
+          .stub(extensions, 'loadElementClass')
+          .withArgs('amp-ad-network-zort-impl')
+          .returns(Promise.resolve(zortConstructor));
         ampAd = new AmpAd(ampAdElement);
         return ampAd.upgradeCallback().then(baseElement => {
           expect(extensionsStub).to.be.called;
-          expect(ampAdElement.getAttribute(
-              'data-a4a-upgrade-type')).to.equal('amp-ad-network-zort-impl');
+          expect(ampAdElement.getAttribute('data-a4a-upgrade-type')).to.equal(
+            'amp-ad-network-zort-impl'
+          );
           expect(baseElement).to.equal(zortInstance);
         });
       });
@@ -223,16 +243,20 @@ describes.realWin('Ad loader', {amp: true}, env => {
         };
         ampAdElement.setAttribute('type', 'zort');
         const zortInstance = {};
-        const zortConstructor = function() { return zortInstance; };
+        const zortConstructor = function() {
+          return zortInstance;
+        };
         const extensions = Services.extensionsFor(win);
-        const extensionsStub = sandbox.stub(extensions, 'loadElementClass')
-            .withArgs('amp-ad-network-zort-impl')
-            .returns(Promise.resolve(zortConstructor));
+        const extensionsStub = sandbox
+          .stub(extensions, 'loadElementClass')
+          .withArgs('amp-ad-network-zort-impl')
+          .returns(Promise.resolve(zortConstructor));
         ampAd = new AmpAd(ampAdElement);
         return ampAd.upgradeCallback().then(baseElement => {
           expect(extensionsStub).to.be.called;
-          expect(ampAdElement.getAttribute(
-              'data-a4a-upgrade-type')).to.equal('amp-ad-network-zort-impl');
+          expect(ampAdElement.getAttribute('data-a4a-upgrade-type')).to.equal(
+            'amp-ad-network-zort-impl'
+          );
           expect(baseElement).to.equal(zortInstance);
         });
       });
@@ -247,19 +271,29 @@ describes.realWin('Ad loader', {amp: true}, env => {
         Promise.resolve().then(() => {
           Services.vsyncFor(win).mutate(() => {
             const zortInstance = {};
-            const zortConstructor = function() { return zortInstance; };
+            const zortConstructor = function() {
+              return zortInstance;
+            };
             const extensions = Services.extensionsFor(win);
-            extensions.registerExtension('amp-ad-network-zort-impl', () => {
-              extensions.addElement('amp-ad-network-zort-impl',
-                  zortConstructor);
-            }, {});
+            extensions.registerExtension(
+              'amp-ad-network-zort-impl',
+              () => {
+                extensions.addElement(
+                  'amp-ad-network-zort-impl',
+                  zortConstructor
+                );
+              },
+              {}
+            );
           });
         });
         return upgradePromise.then(element => {
           expect(element).to.not.be.null;
-          expect(doc.head.querySelector(
-              'script[custom-element="amp-ad-network-zort-impl"]'))
-              .to.not.be.null;
+          expect(
+            doc.head.querySelector(
+              'script[custom-element="amp-ad-network-zort-impl"]'
+            )
+          ).to.not.be.null;
         });
       });
     });
diff --git a/extensions/amp-ad/0.1/test/test-concurrent-load.js b/extensions/amp-ad/0.1/test/test-concurrent-load.js
index 68958d19c507..3f89c2c22652 100644
--- a/extensions/amp-ad/0.1/test/test-concurrent-load.js
+++ b/extensions/amp-ad/0.1/test/test-concurrent-load.js
@@ -26,18 +26,22 @@ import {installTimerService} from '../../../../src/service/timer-impl';
 import {macroTask} from '../../../../testing/yield';
 
 describes.realWin('concurrent-load', {}, env => {
-
   describe('getAmpAdRenderOutsideViewport', () => {
-    it('should return null if ' +
-        'data-loading-strategy attribute does not exist', () => {
-      const element = env.win.document.createElement('amp-ad');
-      expect(getAmpAdRenderOutsideViewport(element)).to.be.null;
-    });
+    it(
+      'should return null if ' +
+        'data-loading-strategy attribute does not exist',
+      () => {
+        const element = env.win.document.createElement('amp-ad');
+        expect(getAmpAdRenderOutsideViewport(element)).to.be.null;
+      }
+    );
 
     it('should respect data-loading-strategy attribute', () => {
       // data-loading-strategy=prefer-viewability-over-views is 1.25
       verifyGetAmpAdRenderOutsideViewport(
-          'prefer-viewability-over-views', 1.25);
+        'prefer-viewability-over-views',
+        1.25
+      );
       // data-loading-strategy attribute with no value is 1.25
       verifyGetAmpAdRenderOutsideViewport('', 1.25);
 
@@ -69,14 +73,15 @@ describes.realWin('concurrent-load', {}, env => {
   });
 
   describe('incrementLoadingAds', () => {
-
     let win;
     let clock;
 
     beforeEach(() => {
       win = env.win;
       clock = lolex.install({
-        target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+        target: win,
+        toFake: ['Date', 'setTimeout', 'clearTimeout'],
+      });
       installTimerService(win);
     });
 
@@ -84,7 +89,7 @@ describes.realWin('concurrent-load', {}, env => {
       clock.uninstall();
     });
 
-    it('should throttle ad loading one per second', function* () {
+    it('should throttle ad loading one per second', function*() {
       expect(is3pThrottled(win)).to.be.false;
       incrementLoadingAds(win);
       expect(is3pThrottled(win)).to.be.true;
@@ -96,12 +101,15 @@ describes.realWin('concurrent-load', {}, env => {
       expect(is3pThrottled(win)).to.be.false;
     });
 
-    it('should throttle ad one a time', function* () {
+    it('should throttle ad one a time', function*() {
       expect(is3pThrottled(win)).to.be.false;
       let resolver;
-      incrementLoadingAds(win, new Promise(res => {
-        resolver = res;
-      }));
+      incrementLoadingAds(
+        win,
+        new Promise(res => {
+          resolver = res;
+        })
+      );
       expect(is3pThrottled(win)).to.be.true;
       resolver();
       yield macroTask();
@@ -118,14 +126,16 @@ describes.realWin('concurrent-load', {}, env => {
     it.skip('should block if incremented', () => {
       incrementLoadingAds(env.win);
       const start = Date.now();
-      return waitFor3pThrottle(env.win).then(
-          () => expect(Date.now() - start).to.be.at.least(1000));
+      return waitFor3pThrottle(env.win).then(() =>
+        expect(Date.now() - start).to.be.at.least(1000)
+      );
     });
 
     it('should not block if never incremented', () => {
       const start = Date.now();
-      return waitFor3pThrottle(env.win).then(
-          () => expect(Date.now() - start).to.be.at.most(50));
+      return waitFor3pThrottle(env.win).then(() =>
+        expect(Date.now() - start).to.be.at.most(50)
+      );
     });
   });
 });
diff --git a/extensions/amp-addthis/0.1/addthis-utils/classify.js b/extensions/amp-addthis/0.1/addthis-utils/classify.js
index 0d38b6adfdd2..bd79c1aea3f8 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/classify.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/classify.js
@@ -88,9 +88,11 @@ const classifyRating = (rating = '') => {
   rating = rating.toLowerCase().replace(RE_WHITESPACE, '');
 
   // Check if the rating is adult content
-  if (rating === 'mature' ||
-      rating === 'adult' ||
-      rating === 'rta-5042-1996-1400-1577-rta') {
+  if (
+    rating === 'mature' ||
+    rating === 'adult' ||
+    rating === 'rta-5042-1996-1400-1577-rta'
+  ) {
     classification |= PORN_BIT;
   }
 
@@ -132,7 +134,11 @@ const extractKeywordsFromContent = content => {
  * @return {string|undefined}
  */
 const getSearchString = url => {
-  const terms = url.split('?').pop().toLowerCase().split('&');
+  const terms = url
+    .split('?')
+    .pop()
+    .toLowerCase()
+    .split('&');
   let matches;
 
   for (let i = 0; i < terms.length; i++) {
@@ -163,26 +169,28 @@ const isSearchUrl = (url = '') => {
     return false;
   }
 
-  return (lowerUrl.indexOf('addthis') === -1) && (
-    RE_SEARCH_GOOGLE.test(lowerUrl)
-      || RE_SEARCH_AOL.test(lowerUrl) /* search.aol.* /aol/search?q=*/
-      || lowerUrl.indexOf('/pagead/aclk?') > -1 /*googleadservices*/
-      || lowerUrl.indexOf(com + 'url') > -1 /*bing*/
-      || lowerUrl.indexOf(com + 'l.php') > -1 /*facebook graph search*/
-      || lowerUrl.indexOf('/search?') > -1 /* many */
-      || lowerUrl.indexOf('/search/?') > -1 /* a few */
-      || lowerUrl.indexOf('search?') > -1 /*yandex.ru, and presumably others*/
-      || lowerUrl.indexOf('yandex.ru/clck/jsredir?') > -1 /*yandex, no one else */
-      || lowerUrl.indexOf(com + 'search') > -1 /* yahoo (including yahoo int'l), many others */
-      || lowerUrl.indexOf(org + 'search') > -1 /*many .org searches*/
-      || lowerUrl.indexOf('/search.html?') > -1 /* a few */
-      || lowerUrl.indexOf('search/results.') > -1 /*cars.com, gmc.com*/
-      || lowerUrl.indexOf(com + 's?bs') > -1 /*baidu*/
-      || lowerUrl.indexOf(com + 's?wd') > -1 /*baidu*/
-      || lowerUrl.indexOf(com + 'mb?search') > -1 /*manta*/
-      || lowerUrl.indexOf(com + 'mvc/search') > -1 /*eonline*/
-      || lowerUrl.indexOf(com + 'web') > -1 /*ask.com (same in .ca), altavista*/
-      || lowerUrl.indexOf('hotbot' + com) > -1 /*hotbot*/
+  return (
+    lowerUrl.indexOf('addthis') === -1 &&
+    (RE_SEARCH_GOOGLE.test(lowerUrl) ||
+    RE_SEARCH_AOL.test(lowerUrl) /* search.aol.* /aol/search?q=*/ ||
+    lowerUrl.indexOf('/pagead/aclk?') > -1 /*googleadservices*/ ||
+    lowerUrl.indexOf(com + 'url') > -1 /*bing*/ ||
+    lowerUrl.indexOf(com + 'l.php') > -1 /*facebook graph search*/ ||
+    lowerUrl.indexOf('/search?') > -1 /* many */ ||
+    lowerUrl.indexOf('/search/?') > -1 /* a few */ ||
+    lowerUrl.indexOf('search?') > -1 /*yandex.ru, and presumably others*/ ||
+    lowerUrl.indexOf('yandex.ru/clck/jsredir?') > -1 /*yandex, no one else */ ||
+    lowerUrl.indexOf(com + 'search') >
+      -1 /* yahoo (including yahoo int'l), many others */ ||
+    lowerUrl.indexOf(org + 'search') > -1 /*many .org searches*/ ||
+    lowerUrl.indexOf('/search.html?') > -1 /* a few */ ||
+    lowerUrl.indexOf('search/results.') > -1 /*cars.com, gmc.com*/ ||
+    lowerUrl.indexOf(com + 's?bs') > -1 /*baidu*/ ||
+    lowerUrl.indexOf(com + 's?wd') > -1 /*baidu*/ ||
+    lowerUrl.indexOf(com + 'mb?search') > -1 /*manta*/ ||
+    lowerUrl.indexOf(com + 'mvc/search') > -1 /*eonline*/ ||
+    lowerUrl.indexOf(com + 'web') > -1 /*ask.com (same in .ca), altavista*/ ||
+      lowerUrl.indexOf('hotbot' + com) > -1) /*hotbot*/
   );
 };
 
@@ -194,8 +202,8 @@ const isSearchUrl = (url = '') => {
  * @return {number} classification bitmask (currently only setting a porn bit)
  */
 export const classifyPage = (pageInfo, metaElements) => {
-  let bitmask = classifyString(pageInfo.title) |
-      classifyString(pageInfo.hostname, true);
+  let bitmask =
+    classifyString(pageInfo.title) | classifyString(pageInfo.hostname, true);
 
   metaElements.forEach(metaElement => {
     const {name, content} = getDetailsForMeta(metaElement);
@@ -212,7 +220,6 @@ export const classifyPage = (pageInfo, metaElements) => {
   return bitmask;
 };
 
-
 /**
  * Returns bitmask based on detected classification
  * @param {string} referrerString
@@ -254,12 +261,14 @@ export const classifyReferrer = (
  */
 export const isProductPage = (doc, metaElements) => {
   // if a single id or class enumerated below exists, return true
-  if (doc.getElementById('product') ||
-      (doc.getElementsByClassName('product') || []).length > 0 ||
-      doc.getElementById('productDescription') ||
-      doc.getElementById('page-product') ||
-      doc.getElementById('vm_cart_products') ||
-      window['Virtuemart']) {
+  if (
+    doc.getElementById('product') ||
+    (doc.getElementsByClassName('product') || []).length > 0 ||
+    doc.getElementById('productDescription') ||
+    doc.getElementById('page-product') ||
+    doc.getElementById('vm_cart_products') ||
+    window['Virtuemart']
+  ) {
     return true;
   }
 
@@ -285,9 +294,9 @@ export const isProductPage = (doc, metaElements) => {
  */
 export const getKeywordsString = metaElements => {
   const keywords = metaElements
-      .filter(meta => getDetailsForMeta(meta).name.toLowerCase() === 'keywords')
-      .map(meta => extractKeywordsFromContent(getDetailsForMeta(meta).content))
-      .reduce((kws, subKeywords) => kws.concat(subKeywords), []);
+    .filter(meta => getDetailsForMeta(meta).name.toLowerCase() === 'keywords')
+    .map(meta => extractKeywordsFromContent(getDetailsForMeta(meta).content))
+    .reduce((kws, subKeywords) => kws.concat(subKeywords), []);
 
   return keywords.join(',');
 };
diff --git a/extensions/amp-addthis/0.1/addthis-utils/cuid.js b/extensions/amp-addthis/0.1/addthis-utils/cuid.js
index 48da89d17ba6..b963203cb8ff 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/cuid.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/cuid.js
@@ -26,7 +26,7 @@ const CUID_SESSION_TIME = Date.now();
 const getDateFromCuid = cuid => {
   let date = new Date();
   try {
-    date = (new Date((parseInt(cuid.substr(0, 8), 16) * 1000)));
+    date = new Date(parseInt(cuid.substr(0, 8), 16) * 1000);
   } catch (e) {}
   return date;
 };
@@ -75,7 +75,10 @@ export const isValidCUID = cuid => {
  * @return {string}
  */
 export const createCUID = () => {
-  return ((CUID_SESSION_TIME / 1000) & MAX_HEX).toString(16) +
-    ('00000000' + (Math.floor(Math.random() * (MAX_HEX + 1))).toString(16))
-        .slice(-8);
+  return (
+    ((CUID_SESSION_TIME / 1000) & MAX_HEX).toString(16) +
+    ('00000000' + Math.floor(Math.random() * (MAX_HEX + 1)).toString(16)).slice(
+      -8
+    )
+  );
 };
diff --git a/extensions/amp-addthis/0.1/addthis-utils/fragment.js b/extensions/amp-addthis/0.1/addthis-utils/fragment.js
index fd0c9536f236..d897e514a4e7 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/fragment.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/fragment.js
@@ -75,7 +75,10 @@ export const clearOurFragment = url => {
 export const getFragmentId = url => {
   const fragment = getModernFragment(url);
   if (fragment) {
-    return fragment.split('.').slice(1).shift();
+    return fragment
+      .split('.')
+      .slice(1)
+      .shift();
   } else {
     return undefined;
   }
@@ -89,7 +92,10 @@ export const getFragmentId = url => {
 export const getServiceFromUrlFragment = url => {
   const fragment = getModernFragment(url);
   if (fragment) {
-    return fragment.split('.').slice(2).shift();
+    return fragment
+      .split('.')
+      .slice(2)
+      .shift();
   } else {
     return undefined;
   }
diff --git a/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js b/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
index 6ffae761f8f2..425f4f93938e 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode.js
@@ -1,27 +1,48 @@
 /**
-* Copyright 2019 The AMP HTML Authors. All Rights Reserved.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS-IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import {dict} from '../../../../src/utils/object';
 
-const overrideKeys = ['backgroundColor', 'borderRadius', 'counterColor',
-  'counts', 'countsFontSize', 'desktopPosition', 'elements', 'hideDevice',
-  'hideEmailSharingConfirmation', 'hideLabel','iconColor', 'label',
-  'mobilePosition', 'numPreferredServices', 'offset', 'originalServices',
-  'postShareFollowMsg', 'postShareRecommendedMsg', 'postShareTitle',
-  'responsive', 'shareCountThreshold', 'size', 'style', 'textColor',
-  'thankyou', 'titleFontSize', '__hideOnHomepage',
+const overrideKeys = [
+  'backgroundColor',
+  'borderRadius',
+  'counterColor',
+  'counts',
+  'countsFontSize',
+  'desktopPosition',
+  'elements',
+  'hideDevice',
+  'hideEmailSharingConfirmation',
+  'hideLabel',
+  'iconColor',
+  'label',
+  'mobilePosition',
+  'numPreferredServices',
+  'offset',
+  'originalServices',
+  'postShareFollowMsg',
+  'postShareRecommendedMsg',
+  'postShareTitle',
+  'responsive',
+  'shareCountThreshold',
+  'size',
+  'style',
+  'textColor',
+  'thankyou',
+  'titleFontSize',
+  '__hideOnHomepage',
 ];
 
 /**
@@ -37,9 +58,11 @@ export function getWidgetOverload(self) {
   const override = dict({});
   overrideKeys.forEach(item => {
     const data = self.element.getAttribute(`data-attr-${item}`);
-    if (typeof data === 'string' ||
+    if (
+      typeof data === 'string' ||
       typeof data === 'number' ||
-      typeof data === 'boolean') {
+      typeof data === 'boolean'
+    ) {
       override[String(item)] = data;
     }
   });
diff --git a/extensions/amp-addthis/0.1/addthis-utils/lojson.js b/extensions/amp-addthis/0.1/addthis-utils/lojson.js
index 0086a2cf3495..38508828b0a2 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/lojson.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/lojson.js
@@ -96,21 +96,26 @@ export function getLojsonData({loc, title, pubId, atConfig, referrer, ampDoc}) {
   const service = getServiceFromUrlFragment(pageInfo.du);
   const {win} = ampDoc;
   const metaElements = toArray(getMetaElements(win.document));
-  const isDNTEnabled = win.navigator.doNotTrack &&
-      win.navigator.doNotTrack !== 'unspecified' &&
-      win.navigator.doNotTrack !== 'no' &&
-      win.navigator.doNotTrack !== '0';
+  const isDNTEnabled =
+    win.navigator.doNotTrack &&
+    win.navigator.doNotTrack !== 'unspecified' &&
+    win.navigator.doNotTrack !== 'no' &&
+    win.navigator.doNotTrack !== '0';
 
   return dict({
     'amp': 1,
-    'bl': 0 |
-    (atConfig['use_cookies'] !== false ? 1 : 0) |
-    (atConfig['track_textcopy'] === true ? 2 : 0) |
-    (atConfig['track_addressbar'] === true ? 4 : 0),
+    'bl':
+      0 |
+      (atConfig['use_cookies'] !== false ? 1 : 0) |
+      (atConfig['track_textcopy'] === true ? 2 : 0) |
+      (atConfig['track_addressbar'] === true ? 4 : 0),
     'cb': classifyPage(pageInfo, metaElements),
     'colc': Date.now(),
-    'ct': atConfig['track_clickback'] !== false &&
-    atConfig['track_linkback'] !== false ? 1 : 0,
+    'ct':
+      atConfig['track_clickback'] !== false &&
+      atConfig['track_linkback'] !== false
+        ? 1
+        : 0,
     'dc': 1,
     'dp': host,
     'dr': host === parsedReferrer.host ? undefined : parsedReferrer.host,
@@ -121,13 +126,14 @@ export function getLojsonData({loc, title, pubId, atConfig, referrer, ampDoc}) {
     'ln': langWithoutLocale,
     'lnlc': locale,
     'mk': getKeywordsString(metaElements),
-    'of': isDNTEnabled ? 4 :
-      nonTrackedDomainMatcher.test(hostname) ? 1 :
-        0,
+    'of': isDNTEnabled ? 4 : nonTrackedDomainMatcher.test(hostname) ? 1 : 0,
     'pd': isProductPage(win.document, metaElements) ? 1 : 0,
     'pub': pubId,
-    'rb': classifyReferrer(referrer, parsedReferrer,
-        parseUrlDeprecated(pageInfo.du)),
+    'rb': classifyReferrer(
+      referrer,
+      parsedReferrer,
+      parseUrlDeprecated(pageInfo.du)
+    ),
     'sid': getSessionId(),
     'skipb': 1,
     'sr': service,
diff --git a/extensions/amp-addthis/0.1/addthis-utils/mode.js b/extensions/amp-addthis/0.1/addthis-utils/mode.js
index 1d4df9324843..84d8b33f28d5 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/mode.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/mode.js
@@ -54,7 +54,8 @@ export function getAddThisModeObject({pubId, widgetId, productCode}) {
   // widget ids are 4-character strings with lower-case letters and numbers only
   const hasWidgetId = isWidgetId(widgetId);
   // product code is one of just a few values
-  const hasProductCode = typeof productCode === 'string' &&
+  const hasProductCode =
+    typeof productCode === 'string' &&
     (productCode === 'shin' || productCode === 'shfs');
   return {hasPubId, hasWidgetId, hasProductCode};
 }
diff --git a/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js b/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js
index 04610d7b63f8..1433d5af6684 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/monitors/click-monitor.js
@@ -99,8 +99,10 @@ export class ClickMonitor {
    * @return {string}
    */
   getIframeClickString() {
-    return Object.keys(this.iframeClickMap_).map(key => {
-      return `${key}|${this.iframeClickMap_[key]}`;
-    }).join(',');
+    return Object.keys(this.iframeClickMap_)
+      .map(key => {
+        return `${key}|${this.iframeClickMap_[key]}`;
+      })
+      .join(',');
   }
 }
diff --git a/extensions/amp-addthis/0.1/addthis-utils/monitors/dwell-monitor.js b/extensions/amp-addthis/0.1/addthis-utils/monitors/dwell-monitor.js
index 4b0ff7ca2661..a7b0e117447e 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/monitors/dwell-monitor.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/monitors/dwell-monitor.js
@@ -41,7 +41,7 @@ export class DwellMonitor {
   listener() {
     if (!this.viewer_.isVisible()) {
       const lastVisibleTime = this.viewer_.getLastVisibleTime() || 0;
-      this.dwellTime_ += (Date.now() - lastVisibleTime);
+      this.dwellTime_ += Date.now() - lastVisibleTime;
     }
   }
 
diff --git a/extensions/amp-addthis/0.1/addthis-utils/monitors/scroll-monitor.js b/extensions/amp-addthis/0.1/addthis-utils/monitors/scroll-monitor.js
index 94bf172e849c..c255d285544b 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/monitors/scroll-monitor.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/monitors/scroll-monitor.js
@@ -48,8 +48,8 @@ export class ScrollMonitor {
     const scrollTop = this.viewport_.getScrollTop() || 0;
     this.maxScrollTop_ = Math.max(this.maxScrollTop_, scrollTop);
     this.maxScrollPlusHeight_ = Math.max(
-        this.maxScrollPlusHeight_,
-        (this.viewport_.getHeight() || 0) + scrollTop
+      this.maxScrollPlusHeight_,
+      (this.viewport_.getHeight() || 0) + scrollTop
     );
   }
 
diff --git a/extensions/amp-addthis/0.1/addthis-utils/pixel.js b/extensions/amp-addthis/0.1/addthis-utils/pixel.js
index b975d4b6fe4d..341afdb5309a 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/pixel.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/pixel.js
@@ -46,21 +46,21 @@ const groupPixelsByTime = pixelList => {
   });
 
   const delayMap = cleanedPixels
-      .map(pixel => {
-        const delays = pixel.delay;
-        return delays.map(delay => ({
-          delay,
-          pixels: [pixel],
-        }));
-      })
-      .reduce((a, b) => a.concat(b), []) // flatten
-      .reduce((currentDelayMap, {delay, pixels}) => {
-        if (!currentDelayMap[delay]) {
-          currentDelayMap[delay] = [];
-        }
-        currentDelayMap[delay] = currentDelayMap[delay].concat(pixels);
-        return currentDelayMap;
-      }, {});
+    .map(pixel => {
+      const delays = pixel.delay;
+      return delays.map(delay => ({
+        delay,
+        pixels: [pixel],
+      }));
+    })
+    .reduce((a, b) => a.concat(b), []) // flatten
+    .reduce((currentDelayMap, {delay, pixels}) => {
+      if (!currentDelayMap[delay]) {
+        currentDelayMap[delay] = [];
+      }
+      currentDelayMap[delay] = currentDelayMap[delay].concat(pixels);
+      return currentDelayMap;
+    }, {});
 
   return Object.keys(delayMap).map(delay => ({
     delay: Number(delay),
@@ -71,34 +71,35 @@ const groupPixelsByTime = pixelList => {
 export const pixelDrop = (url, ampDoc) => {
   const doc = ampDoc.win.document;
   const ampPixel = createElementWithAttributes(
-      doc,
-      'amp-pixel',
-      dict({
-        'layout': 'nodisplay',
-        'referrerpolicy': 'no-referrer',
-        'src': url,
-      })
+    doc,
+    'amp-pixel',
+    dict({
+      'layout': 'nodisplay',
+      'referrerpolicy': 'no-referrer',
+      'src': url,
+    })
   );
   doc.body.appendChild(ampPixel);
 };
 
-const getIframeName = url => parseUrlDeprecated(url).host
-    .split('.')
+const getIframeName = url =>
+  parseUrlDeprecated(url)
+    .host.split('.')
     .concat(pixelatorFrameTitle.toLowerCase().replace(/\s/, '_'));
 
 const iframeDrop = (url, ampDoc, {name, title}) => {
   const doc = ampDoc.win.document;
   const iframe = createElementWithAttributes(
-      doc,
-      'iframe',
-      dict({
-        'frameborder': 0,
-        'width': 0,
-        'height': 0,
-        'name': name,
-        'title': title,
-        'src': url,
-      })
+    doc,
+    'iframe',
+    dict({
+      'frameborder': 0,
+      'width': 0,
+      'height': 0,
+      'name': name,
+      'title': title,
+      'src': url,
+    })
   );
   toggle(iframe, false);
   setStyles(iframe, {
@@ -171,8 +172,8 @@ function getJsonObject_(object) {
   if (object === undefined || object === null) {
     return params;
   }
-  const stringifiedObject = typeof object === 'string' ?
-    object : JSON.stringify(object);
+  const stringifiedObject =
+    typeof object === 'string' ? object : JSON.stringify(object);
 
   try {
     const parsedObject = parseJson(stringifiedObject);
@@ -181,8 +182,7 @@ function getJsonObject_(object) {
         params[key] = parsedObject[key];
       }
     }
-  } catch (error) {
-  }
+  } catch (error) {}
   return params;
 }
 
@@ -191,20 +191,23 @@ export const callPixelEndpoint = event => {
   const eventData = getJsonObject_(getData(event));
   const url = addParamsToUrl(endpoint, eventData);
 
-  Services.xhrFor(ampDoc.win).fetchJson(url, {
-    mode: 'cors',
-    method: 'GET',
-    // This should be cacheable across publisher domains, so don't append
-    // __amp_source_origin to the URL.
-    ampCors: false,
-    credentials: 'include',
-  }).then(res => res.json()).then(json => {
-    const {pixels = []} = json;
-    if (pixels.length > 0) {
-      dropPixelGroups(pixels, {
-        sid: eventData['sid'],
-        ampDoc,
-      });
-    }
-  });
+  Services.xhrFor(ampDoc.win)
+    .fetchJson(url, {
+      mode: 'cors',
+      method: 'GET',
+      // This should be cacheable across publisher domains, so don't append
+      // __amp_source_origin to the URL.
+      ampCors: false,
+      credentials: 'include',
+    })
+    .then(res => res.json())
+    .then(json => {
+      const {pixels = []} = json;
+      if (pixels.length > 0) {
+        dropPixelGroups(pixels, {
+          sid: eventData['sid'],
+          ampDoc,
+        });
+      }
+    });
 };
diff --git a/extensions/amp-addthis/0.1/addthis-utils/pjson.js b/extensions/amp-addthis/0.1/addthis-utils/pjson.js
index d2a9b9161d3c..3d9c34ce60d8 100644
--- a/extensions/amp-addthis/0.1/addthis-utils/pjson.js
+++ b/extensions/amp-addthis/0.1/addthis-utils/pjson.js
@@ -16,11 +16,7 @@
 import {API_SERVER} from '../constants';
 import {callPixelEndpoint} from './pixel';
 
-import {
-  classifyPage,
-  classifyReferrer,
-  getKeywordsString,
-} from './classify';
+import {classifyPage, classifyReferrer, getKeywordsString} from './classify';
 import {getMetaElements} from './meta';
 import {getSessionId} from './session';
 import {parseUrlDeprecated} from '../../../../src/url';
@@ -30,33 +26,33 @@ import {toArray} from '../../../../src/types';
 const SHARE = 300;
 
 /**
-  * @param {{
-  * loc:Location,
-  * referrer:string,
-  * title:string,
-  * ampDoc: *,
-  * pubId:string,
-  * data: {
-  *   url: string,
-  *   service: string
-  * }
-  * }} pjson
-  * @return {{amp: number, cb: number, dc: number, dest: *, gen: number, mk: string, pub: *, rb: number, sid, url}}
-  */
+ * @param {{
+ * loc:Location,
+ * referrer:string,
+ * title:string,
+ * ampDoc: *,
+ * pubId:string,
+ * data: {
+ *   url: string,
+ *   service: string
+ * }
+ * }} pjson
+ * @return {{amp: number, cb: number, dc: number, dest: *, gen: number, mk: string, pub: *, rb: number, sid, url}}
+ */
 const getPjsonData = ({loc, referrer, title, ampDoc, pubId, data}) => {
   const {href, hostname, search, pathname, hash, protocol, port} = loc;
   /** @typedef {{
-  * du: string,
-  * hostname: string,
-  * href: string,
-  * referrer: string,
-  * search: string,
-  * pathname: string,
-  * title: string,
-  * hash: string,
-  * protocol: string,
-  * port: string
-  * }} */
+   * du: string,
+   * hostname: string,
+   * href: string,
+   * referrer: string,
+   * search: string,
+   * pathname: string,
+   * title: string,
+   * hash: string,
+   * protocol: string,
+   * port: string
+   * }} */
   const pageInfo = {
     du: href.split('#').shift(),
     hostname,
@@ -81,8 +77,11 @@ const getPjsonData = ({loc, referrer, title, ampDoc, pubId, data}) => {
     gen: SHARE,
     mk: getKeywordsString(metaElements),
     pub: pubId,
-    rb: classifyReferrer(referrer, parsedReferrer,
-        parseUrlDeprecated(pageInfo.du)),
+    rb: classifyReferrer(
+      referrer,
+      parsedReferrer,
+      parseUrlDeprecated(pageInfo.du)
+    ),
     sid: getSessionId(),
     url: data.url,
   };
diff --git a/extensions/amp-addthis/0.1/amp-addthis.js b/extensions/amp-addthis/0.1/amp-addthis.js
index 767846c57c00..3286af530649 100644
--- a/extensions/amp-addthis/0.1/amp-addthis.js
+++ b/extensions/amp-addthis/0.1/amp-addthis.js
@@ -44,9 +44,7 @@ import {
   SHARE_CONFIG_KEYS,
   SHARE_EVENT,
 } from './constants';
-import {
-  ActiveToolsMonitor,
-} from './addthis-utils/monitors/active-tools-monitor';
+import {ActiveToolsMonitor} from './addthis-utils/monitors/active-tools-monitor';
 import {ClickMonitor} from './addthis-utils/monitors/click-monitor';
 import {ConfigManager} from './config-manager';
 import {DwellMonitor} from './addthis-utils/monitors/dwell-monitor';
@@ -60,10 +58,12 @@ import {callPjson} from './addthis-utils/pjson';
 import {createElementWithAttributes, removeElement} from '../../../src/dom';
 import {dict} from '../../../src/utils/object';
 import {
-  getAddThisMode, isProductCode, isPubId, isWidgetId,
+  getAddThisMode,
+  isProductCode,
+  isPubId,
+  isWidgetId,
 } from './addthis-utils/mode';
-import {getWidgetOverload}
-  from './addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
+import {getWidgetOverload} from './addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {listen} from '../../../src/event-helper';
 import {parseUrlDeprecated} from '../../../src/url';
@@ -93,7 +93,6 @@ export function getConfigManager() {
 }
 
 class AmpAddThis extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -147,22 +146,22 @@ class AmpAddThis extends AMP.BaseElement {
       if (isPubId(pubId)) {
         if (!isProductCode(productCode) && !isWidgetId(widgetId)) {
           userAssert(
-              widgetId,
-              'Widget id or product code is required for <amp-addthis> %s',
-              this.element
+            widgetId,
+            'Widget id or product code is required for <amp-addthis> %s',
+            this.element
           );
         } else if (isProductCode(productCode) && isWidgetId(widgetId)) {
           userAssert(
-              productCode,
-              'Only widget id or product code is required <amp-addthis> %s',
-              this.element
+            productCode,
+            'Only widget id or product code is required <amp-addthis> %s',
+            this.element
           );
         }
       } else {
         userAssert(
-            pubId,
-            'The data-pub-id attribute is required for <amp-addthis> %s',
-            this.element
+          pubId,
+          'The data-pub-id attribute is required for <amp-addthis> %s',
+          this.element
         );
       }
     }
@@ -181,10 +180,13 @@ class AmpAddThis extends AMP.BaseElement {
 
     // Optional attributes
     const ampDoc = this.getAmpDoc();
-    this.canonicalUrl_ = this.element.getAttribute('data-canonical-url') ||
-      Services.documentInfoForDoc(this.element).canonicalUrl || ampDoc.getUrl();
-    this.canonicalTitle_ = this.element.getAttribute('data-canonical-title') ||
-        ampDoc.win.document.title;
+    this.canonicalUrl_ =
+      this.element.getAttribute('data-canonical-url') ||
+      Services.documentInfoForDoc(this.element).canonicalUrl ||
+      ampDoc.getUrl();
+    this.canonicalTitle_ =
+      this.element.getAttribute('data-canonical-title') ||
+      ampDoc.win.document.title;
     this.widgetType_ = this.element.getAttribute('data-widget-type');
     this.shareConfig_ = this.getShareConfigAsJsonObject_();
     this.atConfig_ = this.getATConfig_(ampDoc);
@@ -197,32 +199,32 @@ class AmpAddThis extends AMP.BaseElement {
       const viewer = Services.viewerForDoc(ampDoc);
       const loc = parseUrlDeprecated(this.canonicalUrl_);
 
-      viewer.whenFirstVisible()
-          .then(() => viewer.getReferrerUrl())
-          .then(referrer => {
-            this.referrer_ = referrer;
-
-            callLojson({
-              loc,
-              title: this.canonicalTitle_,
-              pubId: this.pubId_,
-              atConfig: this.atConfig_,
-              referrer,
-              ampDoc,
-            });
-
-            dwellMonitor.startForDoc(ampDoc);
-            scrollMonitor.startForDoc(ampDoc);
-            clickMonitor.startForDoc(ampDoc);
+      viewer
+        .whenFirstVisible()
+        .then(() => viewer.getReferrerUrl())
+        .then(referrer => {
+          this.referrer_ = referrer;
+
+          callLojson({
+            loc,
+            title: this.canonicalTitle_,
+            pubId: this.pubId_,
+            atConfig: this.atConfig_,
+            referrer,
+            ampDoc,
           });
 
+          dwellMonitor.startForDoc(ampDoc);
+          scrollMonitor.startForDoc(ampDoc);
+          clickMonitor.startForDoc(ampDoc);
+        });
+
       // Only the component that registers the page view listens for x-frame
       // events.
       this.setupListeners_({ampDoc, loc, pubId: this.pubId_});
     }
   }
 
-
   /**
    * @param {boolean=} opt_onLayout
    * @override
@@ -247,25 +249,25 @@ class AmpAddThis extends AMP.BaseElement {
    */
   createPlaceholderCallback() {
     const placeholder = createElementWithAttributes(
-        this.win.document,
-        'div',
-        dict({
-          'placeholder': '',
-        })
+      this.win.document,
+      'div',
+      dict({
+        'placeholder': '',
+      })
     );
     setStyle(placeholder, 'background-color', '#fff');
 
     const image = createElementWithAttributes(
-        this.win.document,
-        'amp-img',
-        dict({
-          'src': `https://cache.addthiscdn.com/icons/v3/thumbs/${ICON_SIZE}x${ICON_SIZE}/addthis.png`,
-          'layout': 'fixed',
-          'width': ICON_SIZE,
-          'height': ICON_SIZE,
-          'referrerpolicy': 'origin',
-          'alt': ALT_TEXT,
-        })
+      this.win.document,
+      'amp-img',
+      dict({
+        'src': `https://cache.addthiscdn.com/icons/v3/thumbs/${ICON_SIZE}x${ICON_SIZE}/addthis.png`,
+        'layout': 'fixed',
+        'width': ICON_SIZE,
+        'height': ICON_SIZE,
+        'referrerpolicy': 'origin',
+        'alt': ALT_TEXT,
+      })
     );
 
     placeholder.appendChild(image);
@@ -275,16 +277,16 @@ class AmpAddThis extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     const iframe = createElementWithAttributes(
-        /** @type !Document */ (this.element.ownerDocument),
-        'iframe',
-        dict({
-          'frameborder': 0,
-          'title': ALT_TEXT,
-          'src': `${ORIGIN}/dc/amp-addthis.html`,
-          'id': this.widgetId_,
-          'pco': this.productCode_,
-          'containerClassName': this.containerClassName_,
-        })
+      /** @type {!Document} */ (this.element.ownerDocument),
+      'iframe',
+      dict({
+        'frameborder': 0,
+        'title': ALT_TEXT,
+        'src': `${ORIGIN}/dc/amp-addthis.html`,
+        'id': this.widgetId_,
+        'pco': this.productCode_,
+        'containerClassName': this.containerClassName_,
+      })
     );
     const iframeLoadPromise = this.loadPromise(iframe);
 
@@ -368,10 +370,11 @@ class AmpAddThis extends AMP.BaseElement {
         // Fallbacks for values that should always be defined.
         const {win} = ampDoc;
         if (key === 'ui_language') {
-          config[key] = win.document.documentElement.lang ||
-              win.navigator.language ||
-              win.navigator.userLanguage ||
-              'en';
+          config[key] =
+            win.document.documentElement.lang ||
+            win.navigator.language ||
+            win.navigator.userLanguage ||
+            'en';
         }
       }
       return config;
@@ -389,41 +392,45 @@ class AmpAddThis extends AMP.BaseElement {
    */
   setupListeners_({ampDoc, loc, pubId}) {
     // Send "engagement" analytics on page hide.
-    listen(ampDoc.win, 'pagehide', () => callEng({
-      monitors: {
-        dwellMonitor,
-        scrollMonitor,
-        clickMonitor,
-        activeToolsMonitor,
-      },
-      ampDoc,
-      loc,
-      pubId,
-    }));
+    listen(ampDoc.win, 'pagehide', () =>
+      callEng({
+        monitors: {
+          dwellMonitor,
+          scrollMonitor,
+          clickMonitor,
+          activeToolsMonitor,
+        },
+        ampDoc,
+        loc,
+        pubId,
+      })
+    );
 
     const postMessageDispatcher = new PostMessageDispatcher();
     const pmHandler = postMessageDispatcher.handleAddThisMessage.bind(
-        postMessageDispatcher
+      postMessageDispatcher
     );
 
     listen(ampDoc.win, 'message', pmHandler);
 
     // Trigger "pjson" call when a share occurs.
-    postMessageDispatcher.on(SHARE_EVENT, data => callPjson({
-      data,
-      loc,
-      pubId,
-      ampDoc,
-      title: this.canonicalTitle_,
-      atConfig: this.atConfig_,
-      referrer: this.referrer_,
-    }));
+    postMessageDispatcher.on(SHARE_EVENT, data =>
+      callPjson({
+        data,
+        loc,
+        pubId,
+        ampDoc,
+        title: this.canonicalTitle_,
+        atConfig: this.atConfig_,
+        referrer: this.referrer_,
+      })
+    );
 
     // Dispatch the configuration to the configManager on a
     // CONFIGURATION_EVENT.
     postMessageDispatcher.on(
-        CONFIGURATION_EVENT,
-        configManager.receiveConfiguration.bind(configManager)
+      CONFIGURATION_EVENT,
+      configManager.receiveConfiguration.bind(configManager)
     );
   }
 }
@@ -431,5 +438,3 @@ class AmpAddThis extends AMP.BaseElement {
 AMP.extension('amp-addthis', '0.1', AMP => {
   AMP.registerElement('amp-addthis', AmpAddThis);
 });
-
-
diff --git a/extensions/amp-addthis/0.1/config-manager.js b/extensions/amp-addthis/0.1/config-manager.js
index 4c445328d510..d42ce5a4cd48 100644
--- a/extensions/amp-addthis/0.1/config-manager.js
+++ b/extensions/amp-addthis/0.1/config-manager.js
@@ -147,9 +147,11 @@ export class ConfigManager {
       'dashboardConfig': dashboardConfig,
     });
 
-    if (dashboardConfig &&
+    if (
+      dashboardConfig &&
       dashboardConfig.widgets &&
-      Object.keys(dashboardConfig.widgets).length > 0) {
+      Object.keys(dashboardConfig.widgets).length > 0
+    ) {
       const mode = getAddThisMode({pubId, widgetId, productCode});
       switch (mode) {
         case 1:
@@ -172,11 +174,11 @@ export class ConfigManager {
           return;
         default:
           return;
-          // invalid tool configuration
+        // invalid tool configuration
       }
     }
 
-    iframe.contentWindow./*OK*/postMessage(JSON.stringify(jsonToSend), ORIGIN);
+    iframe.contentWindow./*OK*/ postMessage(JSON.stringify(jsonToSend), ORIGIN);
 
     if (configRequestStatus === RequestStatus.NOT_REQUESTED) {
       // If a config for this pubId has not been requested yet, then this iframe
@@ -239,15 +241,17 @@ export class ConfigManager {
       containerClassName,
     });
 
-    iframeLoadPromise.then(() => this.sendConfiguration_({
-      iframe,
-      pubId,
-      widgetId,
-      shareConfig,
-      atConfig,
-      productCode,
-      containerClassName,
-    }));
+    iframeLoadPromise.then(() =>
+      this.sendConfiguration_({
+        iframe,
+        pubId,
+        widgetId,
+        shareConfig,
+        atConfig,
+        productCode,
+        containerClassName,
+      })
+    );
   }
 
   /**
@@ -256,7 +260,7 @@ export class ConfigManager {
    */
   unregister({pubId, iframe}) {
     this.configProviderIframes_ = this.configProviderIframes_.filter(
-        providerFrame => providerFrame !== iframe
+      providerFrame => providerFrame !== iframe
     );
 
     const pubData = this.dataForPubId_[pubId] || {};
diff --git a/extensions/amp-addthis/0.1/post-message-dispatcher.js b/extensions/amp-addthis/0.1/post-message-dispatcher.js
index c3192f0341c3..f324ceae3744 100644
--- a/extensions/amp-addthis/0.1/post-message-dispatcher.js
+++ b/extensions/amp-addthis/0.1/post-message-dispatcher.js
@@ -87,9 +87,10 @@ export class PostMessageDispatcher {
     switch (data.event) {
       case CONFIGURATION_EVENT: {
         this.emit_(
-            CONFIGURATION_EVENT,
-            /** @type {!JsonObject} */ (
-              Object.assign({}, data, {'source': event.source}))
+          CONFIGURATION_EVENT,
+          /** @type {!JsonObject} */ (Object.assign({}, data, {
+            'source': event.source,
+          }))
         );
         break;
       }
diff --git a/extensions/amp-addthis/0.1/test/addthis-utils/test-fragment.js b/extensions/amp-addthis/0.1/test/addthis-utils/test-fragment.js
index 0a4594f43356..5451f1f3f343 100644
--- a/extensions/amp-addthis/0.1/test/addthis-utils/test-fragment.js
+++ b/extensions/amp-addthis/0.1/test/addthis-utils/test-fragment.js
@@ -19,9 +19,10 @@ import {clearOurFragment} from '../../addthis-utils/fragment';
 describe('fragment', () => {
   it('clears AddThis fragments from an url', () => {
     let url =
-        'http://www.example.com/2012-07-25?utm_campaign=linkedin-Share-Web#at_pco=cfd-1.0';
+      'http://www.example.com/2012-07-25?utm_campaign=linkedin-Share-Web#at_pco=cfd-1.0';
     expect(clearOurFragment(url)).to.equal(
-        'http://www.example.com/2012-07-25?utm_campaign=linkedin-Share-Web');
+      'http://www.example.com/2012-07-25?utm_campaign=linkedin-Share-Web'
+    );
 
     url = 'http://www.addthis.com/#.WNU1xGHp7QE.facebook;text';
     expect(clearOurFragment(url)).to.equal('http://www.addthis.com/');
diff --git a/extensions/amp-addthis/0.1/test/test-amp-addthis.js b/extensions/amp-addthis/0.1/test/test-amp-addthis.js
index 49a78cf88c95..eb01fc7bb39f 100644
--- a/extensions/amp-addthis/0.1/test/test-amp-addthis.js
+++ b/extensions/amp-addthis/0.1/test/test-amp-addthis.js
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ALT_TEXT,
-  CONFIGURATION_EVENT,
-  ICON_SIZE,
-  ORIGIN,
-} from '../constants';
+import {ALT_TEXT, CONFIGURATION_EVENT, ICON_SIZE, ORIGIN} from '../constants';
 import {ConfigManager} from '../config-manager';
 
 import {createCUID, isDateInFuture} from '../addthis-utils/cuid';
@@ -35,578 +30,593 @@ import {getConfigManager} from '../amp-addthis';
 import {getDetailsForMeta, getMetaElements} from './../addthis-utils/meta';
 import {getKeywordsString} from './../addthis-utils/classify';
 import {getSessionId} from '../addthis-utils/session';
-import {getWidgetOverload} from
-  '../addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
+import {getWidgetOverload} from '../addthis-utils/get-widget-id-overloaded-with-json-for-anonymous-mode';
 import {toArray} from '../../../../src/types';
 
-describes.realWin('amp-addthis', {
-  amp: {
-    extensions: ['amp-addthis'],
+describes.realWin(
+  'amp-addthis',
+  {
+    amp: {
+      extensions: ['amp-addthis'],
+    },
   },
-}, env => {
-  const configManager = getConfigManager();
-  const pubId = 'ra-5988ef04ee1db125';
-  const widgetId = '29nf';
-  const floatingPubId = 'ra-5b2947993c86010c';
-  const floatingWidgetId = '4hvd';
-  const productCode = 'shin';
-  let doc;
-  let registerStub;
-  let unregisterStub;
-
-  beforeEach(() => {
-    doc = env.win.document;
-    registerStub = env.sandbox.stub(configManager, 'register');
-    unregisterStub = env.sandbox.stub(configManager, 'unregister');
-  });
-
-  function getAT(configuration, opt_responsive, opt_beforeLayoutCallback) {
-    const {shareConfig = {}} = configuration;
-    const elementAttributes = dict({
-      'width': '320px',
-      'height': '90px',
-    });
-    if (configuration.pubId) {
-      elementAttributes['data-pub-id'] = configuration.pubId;
-    }
-    if (configuration.widgetId) {
-      elementAttributes['data-widget-id'] = configuration.widgetId;
-    }
-    if (configuration.productCode) {
-      elementAttributes['data-product-code'] = configuration.productCode;
-    }
-    Object.keys(shareConfig).forEach(key => {
-      elementAttributes[`data-share-${key}`] = shareConfig[key];
+  env => {
+    const configManager = getConfigManager();
+    const pubId = 'ra-5988ef04ee1db125';
+    const widgetId = '29nf';
+    const floatingPubId = 'ra-5b2947993c86010c';
+    const floatingWidgetId = '4hvd';
+    const productCode = 'shin';
+    let doc;
+    let registerStub;
+    let unregisterStub;
+
+    beforeEach(() => {
+      doc = env.win.document;
+      registerStub = env.sandbox.stub(configManager, 'register');
+      unregisterStub = env.sandbox.stub(configManager, 'unregister');
     });
-    const at = createElementWithAttributes(
+
+    function getAT(configuration, opt_responsive, opt_beforeLayoutCallback) {
+      const {shareConfig = {}} = configuration;
+      const elementAttributes = dict({
+        'width': '320px',
+        'height': '90px',
+      });
+      if (configuration.pubId) {
+        elementAttributes['data-pub-id'] = configuration.pubId;
+      }
+      if (configuration.widgetId) {
+        elementAttributes['data-widget-id'] = configuration.widgetId;
+      }
+      if (configuration.productCode) {
+        elementAttributes['data-product-code'] = configuration.productCode;
+      }
+      Object.keys(shareConfig).forEach(key => {
+        elementAttributes[`data-share-${key}`] = shareConfig[key];
+      });
+      const at = createElementWithAttributes(
         doc,
         'amp-addthis',
         elementAttributes
-    );
-    if (opt_responsive) {
-      at.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(at);
-    return at.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(at);
+      );
+      if (opt_responsive) {
+        at.setAttribute('layout', 'responsive');
       }
-      // Reference to the promise is kept here so that it can be passed on to
-      // and returned by the final callback (for the sake of tests), rather than
-      // just added to the chain.
-      const atIframeLoadPromise = at.layoutCallback();
-      return atIframeLoadPromise.then(() => ({atIframeLoadPromise}));
-    }).then(({atIframeLoadPromise}) => ({at, atIframeLoadPromise}));
-  }
+      doc.body.appendChild(at);
+      return at
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(at);
+          }
+          // Reference to the promise is kept here so that it can be passed on to
+          // and returned by the final callback (for the sake of tests), rather than
+          // just added to the chain.
+          const atIframeLoadPromise = at.layoutCallback();
+          return atIframeLoadPromise.then(() => ({atIframeLoadPromise}));
+        })
+        .then(({atIframeLoadPromise}) => ({at, atIframeLoadPromise}));
+    }
 
-  function testIframe(iframe) {
-    expect(iframe).to.not.equal(null);
-    expect(iframe.getAttribute('src'))
-        .to.equal(`${ORIGIN}/dc/amp-addthis.html`);
-    expect(iframe.getAttribute('title')).to.equal(ALT_TEXT);
-  }
+    function testIframe(iframe) {
+      expect(iframe).to.not.equal(null);
+      expect(iframe.getAttribute('src')).to.equal(
+        `${ORIGIN}/dc/amp-addthis.html`
+      );
+      expect(iframe.getAttribute('title')).to.equal(ALT_TEXT);
+    }
 
-  it('renders the iframe', () => {
-    return getAT({pubId, widgetId}).then(({at}) => {
-      testIframe(at.querySelector('iframe'));
+    it('renders the iframe', () => {
+      return getAT({pubId, widgetId}).then(({at}) => {
+        testIframe(at.querySelector('iframe'));
+      });
     });
-  });
 
-  it('renders a placeholder with an amp-img', () => {
-    return getAT({pubId, widgetId}).then(({at}) => {
-      const placeholder = at.querySelector('[placeholder]');
-      const ampImg = placeholder.querySelector('amp-img');
-
-      expect(placeholder).to.not.equal(null);
-      expect(ampImg).to.not.equal(null);
-      expect(ampImg.getAttribute('src')).to.match(/cache\.addthiscdn\.com/);
-      expect(ampImg.getAttribute('width')).to.equal(ICON_SIZE);
-      expect(ampImg.getAttribute('height')).to.equal(ICON_SIZE);
-      expect(ampImg.getAttribute('alt')).to.equal(ALT_TEXT);
+    it('renders a placeholder with an amp-img', () => {
+      return getAT({pubId, widgetId}).then(({at}) => {
+        const placeholder = at.querySelector('[placeholder]');
+        const ampImg = placeholder.querySelector('amp-img');
+
+        expect(placeholder).to.not.equal(null);
+        expect(ampImg).to.not.equal(null);
+        expect(ampImg.getAttribute('src')).to.match(/cache\.addthiscdn\.com/);
+        expect(ampImg.getAttribute('width')).to.equal(ICON_SIZE);
+        expect(ampImg.getAttribute('height')).to.equal(ICON_SIZE);
+        expect(ampImg.getAttribute('alt')).to.equal(ALT_TEXT);
+      });
     });
-  });
 
-  it('fails when tag needs pub id', () => {
-    allowConsoleError(() => {
-      expect(getAT({widgetId})).to.be.rejectedWith(
-          /The pub id attribute is required for /,
-      );
+    it('fails when tag needs pub id', () => {
+      allowConsoleError(() => {
+        expect(getAT({widgetId})).to.be.rejectedWith(
+          /The pub id attribute is required for /
+        );
+      });
     });
-  });
 
-  it('fails when tag needs widget id', () => {
-    allowConsoleError(() => {
-      expect(getAT({pubId})).to.be.rejectedWith(
-          /Widget id or product code is required for /,
-      );
+    it('fails when tag needs widget id', () => {
+      allowConsoleError(() => {
+        expect(getAT({pubId})).to.be.rejectedWith(
+          /Widget id or product code is required for /
+        );
+      });
     });
-  });
 
-  it('fails when tag needs pub id and has empty product code', () => {
-    allowConsoleError(() => {
-      expect(getAT({widgetId})).to.be.rejectedWith(
-          /The pub id attribute is required for /,
-      );
+    it('fails when tag needs pub id and has empty product code', () => {
+      allowConsoleError(() => {
+        expect(getAT({widgetId})).to.be.rejectedWith(
+          /The pub id attribute is required for /
+        );
+      });
     });
-  });
 
-  it('fails when tag has pubId but not widget id or product code', () => {
-    allowConsoleError(() => {
-      expect(getAT({pubId})).to.be.rejectedWith(
-          /Widget id or product code is required for /,
-      );
+    it('fails when tag has pubId but not widget id or product code', () => {
+      allowConsoleError(() => {
+        expect(getAT({pubId})).to.be.rejectedWith(
+          /Widget id or product code is required for /
+        );
+      });
     });
-  });
 
-  it('fails when tag has no pub id, widget id, or product code', () => {
-    allowConsoleError(() => {
-      expect(getAT({})).to.be.rejectedWith(
-          /Widget id or product code is required for /,
-      );
-    });
-  });
-
-  // success here means "no errors thrown when creating element"
-  it('succeeds when tag has pub id and widget id', () => {
-    expect(getAT({
-      pubId, widgetId,
-    })).to.not.equal(void 0);
-  });
-
-  it('succeeds when tag has pub id and product code', () => {
-    expect(getAT({
-      pubId, productCode,
-    })).to.not.equal(void 0);
-  });
-
-  it('succeeds when tag has just a product code', () => {
-    expect(getAT({
-      productCode,
-    })).to.not.equal(void 0);
-  });
-
-  it('removes the iframe after unlayoutCallback', () => {
-    return getAT({pubId, widgetId}).then(({at}) => {
-      const obj = at.implementation_;
-      testIframe(at.querySelector('iframe'));
-      obj.unlayoutCallback();
-      expect(at.querySelector('iframe')).to.equal(null);
-      expect(obj.iframe_).to.equal(null);
-    });
-  });
-
-  it('registers the frame with the configManager on layout', () => {
-    return getAT({pubId, widgetId, shareConfig: {}}).then(() => {
-      expect(registerStub.calledOnce).to.equal(true);
-    });
-  });
-
-  it('unregisters the frame with the configManager on unlayoutCallback', () => {
-    return getAT({pubId, widgetId}).then(({at}) => {
-      const obj = at.implementation_;
-      obj.unlayoutCallback();
-
-      expect(unregisterStub.calledOnce).to.equal(true);
-    });
-  });
-
-  it('accepts and stores shareConfig data via custom attributes', () => {
-    const shareConfig = {
-      url: 'https://www.addthis.com',
-      title: 'AddThis Website Tools',
-      media: 'https://i.imgur.com/yNlQWRM.jpg',
-      description: 'This is a fake page.',
-    };
-
-    return getAT({pubId, widgetId, shareConfig}).then(({at}) => {
-      expect(Object.keys(shareConfig).length).to.equal(4);
-      Object.keys(shareConfig).forEach(key => {
-        expect(at.getAttribute(`data-share-${key}`)).to.equal(shareConfig[key]);
+    it('fails when tag has no pub id, widget id, or product code', () => {
+      allowConsoleError(() => {
+        expect(getAT({})).to.be.rejectedWith(
+          /Widget id or product code is required for /
+        );
       });
     });
-  });
 
-  it('defaults to sharing ownerDocument\'s title and url', () => {
-    return getAT({pubId, widgetId}).then(({at}) => {
-      const obj = at.implementation_;
-      const {shareConfig_} = obj;
-      expect(shareConfig_.title).to.equal(doc.title);
-      expect(shareConfig_.url).to.equal(doc.location.href);
+    // success here means "no errors thrown when creating element"
+    it('succeeds when tag has pub id and widget id', () => {
+      expect(
+        getAT({
+          pubId,
+          widgetId,
+        })
+      ).to.not.equal(void 0);
     });
-  });
 
-  it('registers a view at most once per "session"', done => {
-    const testConfigManager = new ConfigManager();
-    let numPendingRequests = 0;
-    let numViewsRegistered = 0;
+    it('succeeds when tag has pub id and product code', () => {
+      expect(
+        getAT({
+          pubId,
+          productCode,
+        })
+      ).to.not.equal(void 0);
+    });
 
-    return new Promise((resolve, reject) => {
-      done();
-      const mockIframe = {
-        contentWindow: {
-          postMessage: json => {
-            let receivedJSON;
+    it('succeeds when tag has just a product code', () => {
+      expect(
+        getAT({
+          productCode,
+        })
+      ).to.not.equal(void 0);
+    });
 
-            numPendingRequests--;
+    it('removes the iframe after unlayoutCallback', () => {
+      return getAT({pubId, widgetId}).then(({at}) => {
+        const obj = at.implementation_;
+        testIframe(at.querySelector('iframe'));
+        obj.unlayoutCallback();
+        expect(at.querySelector('iframe')).to.equal(null);
+        expect(obj.iframe_).to.equal(null);
+      });
+    });
 
-            try {
-              receivedJSON = JSON.parse(json);
-            } catch (ex) {
-              reject(ex);
-            }
+    it('registers the frame with the configManager on layout', () => {
+      return getAT({pubId, widgetId, shareConfig: {}}).then(() => {
+        expect(registerStub.calledOnce).to.equal(true);
+      });
+    });
 
-            if (receivedJSON.registerView === true) {
-              numViewsRegistered++;
-            }
+    it('unregisters the frame with the configManager on unlayoutCallback', () => {
+      return getAT({pubId, widgetId}).then(({at}) => {
+        const obj = at.implementation_;
+        obj.unlayoutCallback();
 
-            if (numPendingRequests === 0) {
-              expect(numViewsRegistered).to.equal(1);
-              resolve();
-            }
-          },
-        },
+        expect(unregisterStub.calledOnce).to.equal(true);
+      });
+    });
+
+    it('accepts and stores shareConfig data via custom attributes', () => {
+      const shareConfig = {
+        url: 'https://www.addthis.com',
+        title: 'AddThis Website Tools',
+        media: 'https://i.imgur.com/yNlQWRM.jpg',
+        description: 'This is a fake page.',
       };
 
-      // Fake a number of registered elements.
-      for (let i = 0; i < 3; i++) {
-        numPendingRequests++;
-        testConfigManager.register({
-          pubId,
-          widgetId,
-          iframe: mockIframe,
-          iframeLoadPromise: Promise.resolve(),
+      return getAT({pubId, widgetId, shareConfig}).then(({at}) => {
+        expect(Object.keys(shareConfig).length).to.equal(4);
+        Object.keys(shareConfig).forEach(key => {
+          expect(at.getAttribute(`data-share-${key}`)).to.equal(
+            shareConfig[key]
+          );
         });
-      }
+      });
     });
-  });
-
-  it('sends expected JSON config to the iframe after registering', () => {
-    const testConfigManager = new ConfigManager();
-    const shareConfig = {
-      title: 'lol',
-    };
-    const expectedString = JSON.stringify({
-      event: CONFIGURATION_EVENT,
-      shareConfig,
-      pubId: '1234',
-      widgetId,
-      configRequestStatus: 0,
-      dashboardConfig: undefined,
-    });
-
-    return new Promise((resolve, reject) => {
-      const mockIframe = {
-        contentWindow: {
-          postMessage: (json, origin) => {
-            try {
-              expect(json).to.equal(expectedString);
-              expect(origin).to.equal(ORIGIN);
-            } catch (ex) {
-              reject(ex);
-            } finally {
-              testConfigManager.unregister({
-                pubId,
-                iframe: mockIframe,
-              });
-            }
-            resolve();
+
+    it("defaults to sharing ownerDocument's title and url", () => {
+      return getAT({pubId, widgetId}).then(({at}) => {
+        const obj = at.implementation_;
+        const {shareConfig_} = obj;
+        expect(shareConfig_.title).to.equal(doc.title);
+        expect(shareConfig_.url).to.equal(doc.location.href);
+      });
+    });
+
+    it('registers a view at most once per "session"', done => {
+      const testConfigManager = new ConfigManager();
+      let numPendingRequests = 0;
+      let numViewsRegistered = 0;
+
+      return new Promise((resolve, reject) => {
+        done();
+        const mockIframe = {
+          contentWindow: {
+            postMessage: json => {
+              let receivedJSON;
+
+              numPendingRequests--;
+
+              try {
+                receivedJSON = JSON.parse(json);
+              } catch (ex) {
+                reject(ex);
+              }
+
+              if (receivedJSON.registerView === true) {
+                numViewsRegistered++;
+              }
+
+              if (numPendingRequests === 0) {
+                expect(numViewsRegistered).to.equal(1);
+                resolve();
+              }
+            },
           },
-        },
-      };
+        };
+
+        // Fake a number of registered elements.
+        for (let i = 0; i < 3; i++) {
+          numPendingRequests++;
+          testConfigManager.register({
+            pubId,
+            widgetId,
+            iframe: mockIframe,
+            iframeLoadPromise: Promise.resolve(),
+          });
+        }
+      });
+    });
 
-      testConfigManager.register({
+    it('sends expected JSON config to the iframe after registering', () => {
+      const testConfigManager = new ConfigManager();
+      const shareConfig = {
+        title: 'lol',
+      };
+      const expectedString = JSON.stringify({
+        event: CONFIGURATION_EVENT,
+        shareConfig,
         pubId: '1234',
         widgetId,
-        shareConfig,
-        iframe: mockIframe,
-        iframeLoadPromise: Promise.resolve(),
+        configRequestStatus: 0,
+        dashboardConfig: undefined,
       });
-    });
-  });
-
-  it('requests a config exactly once per pubId', () => {
-    const testConfigManager = new ConfigManager();
-    const firstPubId = '111';
-    const secondPubId = '222';
-    const thirdPubId = '333';
-    const numConfigsRequested = {
-      [firstPubId]: 0,
-      [secondPubId]: 0,
-      [thirdPubId]: 0,
-    };
-    let numPendingRequests = 0;
-
-    return new Promise((resolve, reject) => {
-      const mockIframe = {
-        contentWindow: {
-          postMessage: json => {
-            let receivedJSON;
-
-            numPendingRequests--;
-
-            try {
-              receivedJSON = JSON.parse(json);
-            } catch (ex) {
-              reject(ex);
-            }
-
-            if (receivedJSON.configRequestStatus === 0) {
-              numConfigsRequested[receivedJSON.pubId]++;
-            }
-
-            if (numPendingRequests === 0) {
-              expect(numConfigsRequested[firstPubId]).to.equal(1);
-              expect(numConfigsRequested[secondPubId]).to.equal(1);
-              expect(numConfigsRequested[thirdPubId]).to.equal(1);
+
+      return new Promise((resolve, reject) => {
+        const mockIframe = {
+          contentWindow: {
+            postMessage: (json, origin) => {
+              try {
+                expect(json).to.equal(expectedString);
+                expect(origin).to.equal(ORIGIN);
+              } catch (ex) {
+                reject(ex);
+              } finally {
+                testConfigManager.unregister({
+                  pubId,
+                  iframe: mockIframe,
+                });
+              }
               resolve();
-            }
+            },
           },
-        },
-      };
+        };
 
-      // Fake a number of registered elements.
-      // Registers firstPubId once, secondPubId twice, and thirdPubId thrice.
-      for (let i = 0; i < 6; i++) {
-        numPendingRequests++;
         testConfigManager.register({
-          pubId: i === 0 ? firstPubId : (i < 3 ? secondPubId : thirdPubId),
+          pubId: '1234',
           widgetId,
+          shareConfig,
           iframe: mockIframe,
           iframeLoadPromise: Promise.resolve(),
         });
-      }
+      });
     });
-  });
-
-  it('gets meta elements from document', () => {
-    const meta1 = document.createElement('meta');
-    window.document.head.appendChild(meta1);
-    expect(toArray(getMetaElements(window.document)).length).to.equal(1);
-    const meta2 = document.createElement('meta');
-    window.document.head.appendChild(meta2);
-    expect(toArray(getMetaElements(window.document)).length).to.equal(2);
-  });
-
-  it('gets 0 meta elements from document when there are none', () => {
-    expect(toArray(getMetaElements(window.document)).length).to.equal(0);
-  });
-
-  it('gets details for meta tag with name in lower case', () => {
-    const meta1 = document.createElement('meta');
-    meta1.name = 'KEYWORDS';
-    meta1.content = 'this,that';
-    const details = getDetailsForMeta(meta1);
-    expect(details.name).to.equal(meta1.name.toLowerCase());
-    expect(details.name).not.to.equal(meta1.name);
-    expect(details.content).to.equal(meta1.content);
-  });
-
-  it('gets keywords from meta tags', () => {
-    const meta1 = document.createElement('meta');
-    meta1.name = 'keywords';
-    meta1.content = 'this,that';
-    expect(getKeywordsString([meta1])).to.equal(meta1.content);
-    const meta2 = document.createElement('meta');
-    meta2.name = 'keywords';
-    meta2.content = 'a,b';
-    expect(getKeywordsString([meta1, meta2]))
-        .to.equal(`${meta1.content},${meta2.content}`);
-  });
-
-  it('can tell future dates from past dates', () => {
-    const nextYear = new Date();
-    nextYear.setFullYear(nextYear.getFullYear() + 1);
-    expect(isDateInFuture(nextYear)).to.equal(true);
-
-    const nextMonth = new Date();
-    nextMonth.setMonth(nextMonth.getMonth() + 1);
-    expect(isDateInFuture(nextMonth)).to.equal(true);
-
-    const tomorrow = new Date();
-    tomorrow.setDate(tomorrow.getDate() + 1);
-    expect(isDateInFuture(tomorrow)).to.equal(true);
-
-    const today = new Date();
-    expect(isDateInFuture(today)).to.equal(false);
-
-    const yesterday = new Date();
-    yesterday.setDate(yesterday.getDate() - 1);
-    expect(isDateInFuture(yesterday)).to.equal(false);
-
-    const lastYear = new Date();
-    lastYear.setFullYear(lastYear.getFullYear() - 1);
-    expect(isDateInFuture(lastYear)).to.equal(false);
-  });
-
-  it('gives id for iframe if floating tool loaded', () => {
-    return getAT({
-      pubId: floatingPubId, widgetId: floatingWidgetId,
-    }).then(
-        ({at}) => {
-          testIframe(at.querySelector('iframe'));
-          const iframe = at.querySelector('iframe');
-          expect(iframe.getAttribute('id')).to.equal(floatingWidgetId);
-        },
-    );
-  });
-
-  it('gets mode correctly based on attributes', () => {
-    const widgetId = 'abcd';
-    const pubId = 'ra-0000000000000000';
-    const productCode = 'shfs';
-    const mode1 = {widgetId, pubId};
-    const mode2 = {productCode, pubId};
-    const mode3 = {productCode};
-    const mode4 = {widgetId, productCode, pubId};
-    const mode5 = {widgetId};
-    const mode6 = {pubId};
-    const mode7 = {pubId, widgetId: ''};
-    const mode8 = {pubId, productCode: ''};
-    const mode9 = {pubId, widgetId: '', productCode: ''};
-
-    expect(getAddThisMode({})).to.equal(-1);
-    expect(getAddThisMode(mode1)).to.equal(1);
-    expect(getAddThisMode(mode2)).to.equal(2);
-    expect(getAddThisMode(mode3)).to.equal(3);
-    expect(getAddThisMode(mode4)).to.equal(-1);
-    expect(getAddThisMode(mode5)).to.equal(-1);
-    expect(getAddThisMode(mode6)).to.equal(-1);
-    expect(getAddThisMode(mode7)).to.equal(-1);
-    expect(getAddThisMode(mode8)).to.equal(-1);
-    expect(getAddThisMode(mode9)).to.equal(-1);
-  });
-
-  it('isPubId: pretty much knows if a thing is a pub id or not', () => {
-    expect(isPubId(1)).to.equal(false);
-    expect(isPubId(String('maybe'))).to.equal(true);
-    expect(isPubId('maybe')).to.equal(true);
-    expect(isPubId({})).to.equal(false);
-    expect(isPubId([])).to.equal(false);
-    expect(isPubId(void 0)).to.equal(false);
-    expect(isPubId(null)).to.equal(false);
-  });
-
-  it('isProductCode: pretty much knows if a thing is a product code or not',
-      () => {
-        expect(isProductCode(1)).to.equal(false);
-        expect(isProductCode(String('mayb'))).to.equal(false);
-        expect(isProductCode(String('shin'))).to.equal(true);
-        expect(isProductCode('maybe')).to.equal(false);
-        expect(isProductCode('shin')).to.equal(true);
-        expect(isProductCode('shfs')).to.equal(true);
-        expect(isProductCode({})).to.equal(false);
-        expect(isProductCode([])).to.equal(false);
-        expect(isProductCode(void 0)).to.equal(false);
-        expect(isProductCode(null)).to.equal(false);
+
+    it('requests a config exactly once per pubId', () => {
+      const testConfigManager = new ConfigManager();
+      const firstPubId = '111';
+      const secondPubId = '222';
+      const thirdPubId = '333';
+      const numConfigsRequested = {
+        [firstPubId]: 0,
+        [secondPubId]: 0,
+        [thirdPubId]: 0,
+      };
+      let numPendingRequests = 0;
+
+      return new Promise((resolve, reject) => {
+        const mockIframe = {
+          contentWindow: {
+            postMessage: json => {
+              let receivedJSON;
+
+              numPendingRequests--;
+
+              try {
+                receivedJSON = JSON.parse(json);
+              } catch (ex) {
+                reject(ex);
+              }
+
+              if (receivedJSON.configRequestStatus === 0) {
+                numConfigsRequested[receivedJSON.pubId]++;
+              }
+
+              if (numPendingRequests === 0) {
+                expect(numConfigsRequested[firstPubId]).to.equal(1);
+                expect(numConfigsRequested[secondPubId]).to.equal(1);
+                expect(numConfigsRequested[thirdPubId]).to.equal(1);
+                resolve();
+              }
+            },
+          },
+        };
+
+        // Fake a number of registered elements.
+        // Registers firstPubId once, secondPubId twice, and thirdPubId thrice.
+        for (let i = 0; i < 6; i++) {
+          numPendingRequests++;
+          testConfigManager.register({
+            pubId: i === 0 ? firstPubId : i < 3 ? secondPubId : thirdPubId,
+            widgetId,
+            iframe: mockIframe,
+            iframeLoadPromise: Promise.resolve(),
+          });
+        }
       });
+    });
 
-  it('isWidgetId: pretty much knows if a thing is a widget id or not', () => {
-    expect(isWidgetId(1)).to.equal(false);
-    expect(isWidgetId(String('mayb'))).to.equal(true);
-    expect(isWidgetId(String('101x'))).to.equal(true);
-    expect(isWidgetId('maybe')).to.equal(false);
-    expect(isWidgetId('shin')).to.equal(true);
-    expect(isWidgetId('shfs')).to.equal(true);
-    expect(isWidgetId({})).to.equal(false);
-    expect(isWidgetId([])).to.equal(false);
-    expect(isWidgetId(void 0)).to.equal(false);
-    expect(isWidgetId(null)).to.equal(false);
-  });
-
-  it('getWidgetOverload: self.element.getAttribute function argument', () => {
-    const result = '{"counts":"none","numPreferredServices":5}';
-    const mock = {
-      'data-attr-counts': 'none',
-      'data-attr-numPreferredServices': 5,
-    };
-    const getAttribute = key => mock[key] ;
-    const self = {element: {getAttribute}};
-    expect(getWidgetOverload(self)).to.equal(result);
-  });
-
-  it('getWidgetOverload: doesn\'t pass unknown params', () => {
-    const mock = {
-      'data-attr-csounts': 'none',
-      'data-attr-nsumPreferredServices': 5,
-    };
-    const getAttribute = key => mock[key] ;
-    const self = {element: {getAttribute}};
-    expect(getWidgetOverload(self)).to.equal('');
-  });
-
-  it('getWidgetOverload: only saves string, boolean, number', () => {
-    const mock = {
-      'data-attr-backgroundColor': undefined,
-      'data-attr-counterColor': null,
-      'data-attr-counts': [],
-      'data-attr-countsFontSize': {},
-      'data-attr-desktopPosition': new Function(),
-    };
-    const getAttribute = key => mock[key] ;
-    const self = {element: {getAttribute}};
-    expect(getWidgetOverload(self)).to.equal('');
-  });
-
-  it('getWidgetOverload: passes all params correctly', () => {
-    const mock = {
-      'data-attr-backgroundColor': 1,
-      'data-attr-counterColor': 1,
-      'data-attr-counts': 1,
-      'data-attr-countsFontSize': 1,
-      'data-attr-desktopPosition': 1,
-      'data-attr-elements': 1,
-      'data-attr-hideDevice': 1,
-      'data-attr-hideEmailSharingConfirmation': 1,
-      'data-attr-hideLabel': 1,
-      'data-attr-iconColor': 1,
-      'data-attr-mobilePosition': 1,
-      'data-attr-numPreferredServices': 1,
-      'data-attr-offset': 1,
-      'data-attr-originalServices': 1,
-      'data-attr-postShareFollowMsg': 1,
-      'data-attr-postShareRecommendedMsg': 1,
-      'data-attr-postShareTitle': 1,
-      'data-attr-responsive': 1,
-      'data-attr-shareCountThreshold': 1,
-      'data-attr-size': 1,
-      'data-attr-style': 1,
-      'data-attr-textColor': 1,
-      'data-attr-thankyou': 1,
-      'data-attr-titleFontSize': 1,
-      'data-attr-__hideOnHomepage': 1,
-    };
-    const getAttribute = key => mock[key] ;
-    const self = {element: {getAttribute}};
-    expect(getWidgetOverload(self).length).to.equal(447);
-  });
-
-  it('getSessionId: returns a string of 16 characters containing 0-9 a-f',
-      () => {
-        expect(typeof getSessionId() === 'string').to.equal(true);
-        expect(getSessionId().length).to.equal(16);
-        expect(/^[0-9a-f]{16}$/.test(getSessionId())).to.equal(true);
-
-        // within the same session, ids match
-        const a = getSessionId();
-        const b = getSessionId();
-        expect(a).to.equal(b);
+    it('gets meta elements from document', () => {
+      const meta1 = document.createElement('meta');
+      window.document.head.appendChild(meta1);
+      expect(toArray(getMetaElements(window.document)).length).to.equal(1);
+      const meta2 = document.createElement('meta');
+      window.document.head.appendChild(meta2);
+      expect(toArray(getMetaElements(window.document)).length).to.equal(2);
+    });
+
+    it('gets 0 meta elements from document when there are none', () => {
+      expect(toArray(getMetaElements(window.document)).length).to.equal(0);
+    });
+
+    it('gets details for meta tag with name in lower case', () => {
+      const meta1 = document.createElement('meta');
+      meta1.name = 'KEYWORDS';
+      meta1.content = 'this,that';
+      const details = getDetailsForMeta(meta1);
+      expect(details.name).to.equal(meta1.name.toLowerCase());
+      expect(details.name).not.to.equal(meta1.name);
+      expect(details.content).to.equal(meta1.content);
+    });
+
+    it('gets keywords from meta tags', () => {
+      const meta1 = document.createElement('meta');
+      meta1.name = 'keywords';
+      meta1.content = 'this,that';
+      expect(getKeywordsString([meta1])).to.equal(meta1.content);
+      const meta2 = document.createElement('meta');
+      meta2.name = 'keywords';
+      meta2.content = 'a,b';
+      expect(getKeywordsString([meta1, meta2])).to.equal(
+        `${meta1.content},${meta2.content}`
+      );
+    });
+
+    it('can tell future dates from past dates', () => {
+      const nextYear = new Date();
+      nextYear.setFullYear(nextYear.getFullYear() + 1);
+      expect(isDateInFuture(nextYear)).to.equal(true);
+
+      const nextMonth = new Date();
+      nextMonth.setMonth(nextMonth.getMonth() + 1);
+      expect(isDateInFuture(nextMonth)).to.equal(true);
+
+      const tomorrow = new Date();
+      tomorrow.setDate(tomorrow.getDate() + 1);
+      expect(isDateInFuture(tomorrow)).to.equal(true);
+
+      const today = new Date();
+      expect(isDateInFuture(today)).to.equal(false);
+
+      const yesterday = new Date();
+      yesterday.setDate(yesterday.getDate() - 1);
+      expect(isDateInFuture(yesterday)).to.equal(false);
+
+      const lastYear = new Date();
+      lastYear.setFullYear(lastYear.getFullYear() - 1);
+      expect(isDateInFuture(lastYear)).to.equal(false);
+    });
+
+    it('gives id for iframe if floating tool loaded', () => {
+      return getAT({
+        pubId: floatingPubId,
+        widgetId: floatingWidgetId,
+      }).then(({at}) => {
+        testIframe(at.querySelector('iframe'));
+        const iframe = at.querySelector('iframe');
+        expect(iframe.getAttribute('id')).to.equal(floatingWidgetId);
       });
+    });
+
+    it('gets mode correctly based on attributes', () => {
+      const widgetId = 'abcd';
+      const pubId = 'ra-0000000000000000';
+      const productCode = 'shfs';
+      const mode1 = {widgetId, pubId};
+      const mode2 = {productCode, pubId};
+      const mode3 = {productCode};
+      const mode4 = {widgetId, productCode, pubId};
+      const mode5 = {widgetId};
+      const mode6 = {pubId};
+      const mode7 = {pubId, widgetId: ''};
+      const mode8 = {pubId, productCode: ''};
+      const mode9 = {pubId, widgetId: '', productCode: ''};
+
+      expect(getAddThisMode({})).to.equal(-1);
+      expect(getAddThisMode(mode1)).to.equal(1);
+      expect(getAddThisMode(mode2)).to.equal(2);
+      expect(getAddThisMode(mode3)).to.equal(3);
+      expect(getAddThisMode(mode4)).to.equal(-1);
+      expect(getAddThisMode(mode5)).to.equal(-1);
+      expect(getAddThisMode(mode6)).to.equal(-1);
+      expect(getAddThisMode(mode7)).to.equal(-1);
+      expect(getAddThisMode(mode8)).to.equal(-1);
+      expect(getAddThisMode(mode9)).to.equal(-1);
+    });
+
+    it('isPubId: pretty much knows if a thing is a pub id or not', () => {
+      expect(isPubId(1)).to.equal(false);
+      expect(isPubId(String('maybe'))).to.equal(true);
+      expect(isPubId('maybe')).to.equal(true);
+      expect(isPubId({})).to.equal(false);
+      expect(isPubId([])).to.equal(false);
+      expect(isPubId(void 0)).to.equal(false);
+      expect(isPubId(null)).to.equal(false);
+    });
+
+    it('isProductCode: pretty much knows if a thing is a product code or not', () => {
+      expect(isProductCode(1)).to.equal(false);
+      expect(isProductCode(String('mayb'))).to.equal(false);
+      expect(isProductCode(String('shin'))).to.equal(true);
+      expect(isProductCode('maybe')).to.equal(false);
+      expect(isProductCode('shin')).to.equal(true);
+      expect(isProductCode('shfs')).to.equal(true);
+      expect(isProductCode({})).to.equal(false);
+      expect(isProductCode([])).to.equal(false);
+      expect(isProductCode(void 0)).to.equal(false);
+      expect(isProductCode(null)).to.equal(false);
+    });
+
+    it('isWidgetId: pretty much knows if a thing is a widget id or not', () => {
+      expect(isWidgetId(1)).to.equal(false);
+      expect(isWidgetId(String('mayb'))).to.equal(true);
+      expect(isWidgetId(String('101x'))).to.equal(true);
+      expect(isWidgetId('maybe')).to.equal(false);
+      expect(isWidgetId('shin')).to.equal(true);
+      expect(isWidgetId('shfs')).to.equal(true);
+      expect(isWidgetId({})).to.equal(false);
+      expect(isWidgetId([])).to.equal(false);
+      expect(isWidgetId(void 0)).to.equal(false);
+      expect(isWidgetId(null)).to.equal(false);
+    });
+
+    it('getWidgetOverload: self.element.getAttribute function argument', () => {
+      const result = '{"counts":"none","numPreferredServices":5}';
+      const mock = {
+        'data-attr-counts': 'none',
+        'data-attr-numPreferredServices': 5,
+      };
+      const getAttribute = key => mock[key];
+      const self = {element: {getAttribute}};
+      expect(getWidgetOverload(self)).to.equal(result);
+    });
+
+    it("getWidgetOverload: doesn't pass unknown params", () => {
+      const mock = {
+        'data-attr-csounts': 'none',
+        'data-attr-nsumPreferredServices': 5,
+      };
+      const getAttribute = key => mock[key];
+      const self = {element: {getAttribute}};
+      expect(getWidgetOverload(self)).to.equal('');
+    });
+
+    it('getWidgetOverload: only saves string, boolean, number', () => {
+      const mock = {
+        'data-attr-backgroundColor': undefined,
+        'data-attr-counterColor': null,
+        'data-attr-counts': [],
+        'data-attr-countsFontSize': {},
+        'data-attr-desktopPosition': new Function(),
+      };
+      const getAttribute = key => mock[key];
+      const self = {element: {getAttribute}};
+      expect(getWidgetOverload(self)).to.equal('');
+    });
+
+    it('getWidgetOverload: passes all params correctly', () => {
+      const mock = {
+        'data-attr-backgroundColor': 1,
+        'data-attr-counterColor': 1,
+        'data-attr-counts': 1,
+        'data-attr-countsFontSize': 1,
+        'data-attr-desktopPosition': 1,
+        'data-attr-elements': 1,
+        'data-attr-hideDevice': 1,
+        'data-attr-hideEmailSharingConfirmation': 1,
+        'data-attr-hideLabel': 1,
+        'data-attr-iconColor': 1,
+        'data-attr-mobilePosition': 1,
+        'data-attr-numPreferredServices': 1,
+        'data-attr-offset': 1,
+        'data-attr-originalServices': 1,
+        'data-attr-postShareFollowMsg': 1,
+        'data-attr-postShareRecommendedMsg': 1,
+        'data-attr-postShareTitle': 1,
+        'data-attr-responsive': 1,
+        'data-attr-shareCountThreshold': 1,
+        'data-attr-size': 1,
+        'data-attr-style': 1,
+        'data-attr-textColor': 1,
+        'data-attr-thankyou': 1,
+        'data-attr-titleFontSize': 1,
+        'data-attr-__hideOnHomepage': 1,
+      };
+      const getAttribute = key => mock[key];
+      const self = {element: {getAttribute}};
+      expect(getWidgetOverload(self).length).to.equal(447);
+    });
+
+    it('getSessionId: returns a string of 16 characters containing 0-9 a-f', () => {
+      expect(typeof getSessionId() === 'string').to.equal(true);
+      expect(getSessionId().length).to.equal(16);
+      expect(/^[0-9a-f]{16}$/.test(getSessionId())).to.equal(true);
+
+      // within the same session, ids match
+      const a = getSessionId();
+      const b = getSessionId();
+      expect(a).to.equal(b);
+    });
 
-  it('createCUID: returns a string of 16 characters containing 0-9 a-f', () => {
-    expect(typeof createCUID() === 'string').to.equal(true);
+    it('createCUID: returns a string of 16 characters containing 0-9 a-f', () => {
+      expect(typeof createCUID() === 'string').to.equal(true);
 
-    const a = createCUID();
-    const b = createCUID();
-    expect(a).to.not.equal(b);
+      const a = createCUID();
+      const b = createCUID();
+      expect(a).to.not.equal(b);
 
-    const o = {};
-    for (let i = 0; i < 100000; i += 1) {
-      const c = createCUID().length;
-      if (!o[c]) {
-        o[c] = 0;
+      const o = {};
+      for (let i = 0; i < 100000; i += 1) {
+        const c = createCUID().length;
+        if (!o[c]) {
+          o[c] = 0;
+        }
+        o[c] = o[c] + 1;
       }
-      o[c] = o[c] + 1;
-    }
-    expect(o[16]).to.equal(100000);
-  });
-});
+      expect(o[16]).to.equal(100000);
+    });
+  }
+);
diff --git a/extensions/amp-analytics/0.1/activity-impl.js b/extensions/amp-analytics/0.1/activity-impl.js
index a156779c55b2..9ebf069be97e 100644
--- a/extensions/amp-analytics/0.1/activity-impl.js
+++ b/extensions/amp-analytics/0.1/activity-impl.js
@@ -24,7 +24,6 @@ import {hasOwn} from '../../../src/utils/object';
 import {listen} from '../../../src/event-helper';
 import {registerServiceBuilderForDoc} from '../../../src/service';
 
-
 /**
  * The amount of time after an activity the user is considered engaged.
  * @private @const {number}
@@ -65,7 +64,6 @@ function findEngagedTimeBetween(activityEvent, time) {
 }
 
 class ActivityHistory {
-
   /**
    * Creates an instance of ActivityHistory.
    */
@@ -90,8 +88,10 @@ class ActivityHistory {
     }
 
     if (this.prevActivityEvent_.time < activityEvent.time) {
-      this.totalEngagedTime_ +=
-          findEngagedTimeBetween(this.prevActivityEvent_, activityEvent.time);
+      this.totalEngagedTime_ += findEngagedTimeBetween(
+        this.prevActivityEvent_,
+        activityEvent.time
+      );
       this.prevActivityEvent_ = activityEvent;
     }
   }
@@ -105,15 +105,14 @@ class ActivityHistory {
   getTotalEngagedTime(time) {
     let totalEngagedTime = 0;
     if (this.prevActivityEvent_ !== undefined) {
-      totalEngagedTime = this.totalEngagedTime_ +
-          findEngagedTimeBetween(this.prevActivityEvent_, time);
+      totalEngagedTime =
+        this.totalEngagedTime_ +
+        findEngagedTimeBetween(this.prevActivityEvent_, time);
     }
     return totalEngagedTime;
   }
-
 }
 
-
 /**
  * Array of event types which will be listened for on the document to indicate
  * activity. Other activities are also observed on the Viewer and Viewport
@@ -121,7 +120,11 @@ class ActivityHistory {
  * @private @const {Array<string>}
  */
 const ACTIVE_EVENT_TYPES = [
-  'mousedown', 'mouseup', 'mousemove', 'keydown', 'keyup',
+  'mousedown',
+  'mouseup',
+  'mousemove',
+  'keydown',
+  'keyup',
 ];
 
 /**
@@ -132,7 +135,6 @@ export function installActivityServiceForTesting(ampDoc) {
 }
 
 export class Activity {
-
   /**
    * Activity tracks basic user activity on the page.
    *  - Listeners are not registered on the activity event types until the
@@ -172,7 +174,7 @@ export class Activity {
     this.totalEngagedTimeByTrigger_ = {
       /*
        * "$triggerName" : ${lastRequestTimestamp}
-      */
+       */
     };
 
     /** @private {Array<!UnlistenDef>} */
@@ -211,7 +213,7 @@ export class Activity {
     // Ensure that a negative time is never returned. This may cause loss of
     // data if there is a time change during the session but it will decrease
     // the likelyhood of errors in that situation.
-    return (timeSinceStart > 0 ? timeSinceStart : 0);
+    return timeSinceStart > 0 ? timeSinceStart : 0;
   }
 
   /**
@@ -227,12 +229,18 @@ export class Activity {
   /** @private */
   setUpActivityListeners_() {
     for (let i = 0; i < ACTIVE_EVENT_TYPES.length; i++) {
-      this.unlistenFuncs_.push(listen(this.ampdoc.getRootNode(),
-          ACTIVE_EVENT_TYPES[i], this.boundHandleActivity_));
+      this.unlistenFuncs_.push(
+        listen(
+          this.ampdoc.getRootNode(),
+          ACTIVE_EVENT_TYPES[i],
+          this.boundHandleActivity_
+        )
+      );
     }
 
     this.unlistenFuncs_.push(
-        this.viewer_.onVisibilityChanged(this.boundHandleVisibilityChange_));
+      this.viewer_.onVisibilityChanged(this.boundHandleVisibilityChange_)
+    );
 
     // Viewport.onScroll does not return an unlisten function.
     // TODO(britice): If Viewport is updated to return an unlisten function,
@@ -335,13 +343,13 @@ export class Activity {
       }
       return this.getTotalEngagedTime();
     }
-    const currentIncrementalEngagedTime =
-      this.totalEngagedTimeByTrigger_[name];
+    const currentIncrementalEngagedTime = this.totalEngagedTimeByTrigger_[name];
     if (reset === false) {
       return this.getTotalEngagedTime() - currentIncrementalEngagedTime;
     }
     this.totalEngagedTimeByTrigger_[name] = this.getTotalEngagedTime();
-    return this.totalEngagedTimeByTrigger_[name] -
-      currentIncrementalEngagedTime;
+    return (
+      this.totalEngagedTimeByTrigger_[name] - currentIncrementalEngagedTime
+    );
   }
 }
diff --git a/extensions/amp-analytics/0.1/amp-analytics.js b/extensions/amp-analytics/0.1/amp-analytics.js
index 440940f65cfd..f57786615cfa 100644
--- a/extensions/amp-analytics/0.1/amp-analytics.js
+++ b/extensions/amp-analytics/0.1/amp-analytics.js
@@ -29,10 +29,7 @@ import {
 } from './instrumentation';
 import {LayoutPriority} from '../../../src/layout';
 import {LinkerManager} from './linker-manager';
-import {
-  RequestHandler,
-  expandPostMessage,
-} from './requests';
+import {RequestHandler, expandPostMessage} from './requests';
 import {Services} from '../../../src/services';
 import {Transport} from './transport';
 import {dev, devAssert, rethrowAsync, user} from '../../../src/log';
@@ -55,7 +52,6 @@ const WHITELIST_EVENT_IN_SANDBOX = [
 ];
 
 export class AmpAnalytics extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -129,14 +125,16 @@ export class AmpAnalytics extends AMP.BaseElement {
 
     this.element.setAttribute('aria-hidden', 'true');
 
-    this.consentNotificationId_ = this.element
-        .getAttribute('data-consent-notification-id');
+    this.consentNotificationId_ = this.element.getAttribute(
+      'data-consent-notification-id'
+    );
 
     if (this.consentNotificationId_ != null) {
-      this.consentPromise_ =
-          Services.userNotificationManagerForDoc(this.element)
-              .then(service => service.get(dev().assertString(
-                  this.consentNotificationId_)));
+      this.consentPromise_ = Services.userNotificationManagerForDoc(
+        this.element
+      ).then(service =>
+        service.get(dev().assertString(this.consentNotificationId_))
+      );
     }
 
     if (this.element.getAttribute('trigger') == 'immediate') {
@@ -174,7 +172,9 @@ export class AmpAnalytics extends AMP.BaseElement {
     if (this.iniPromise_) {
       this.iniPromise_.then(() => {
         this.transport_.maybeInitIframeTransport(
-            this.getAmpDoc().win, this.element);
+          this.getAmpDoc().win,
+          this.element
+        );
       });
     }
   }
@@ -193,7 +193,6 @@ export class AmpAnalytics extends AMP.BaseElement {
       });
     }
 
-
     return super.unlayoutCallback();
   }
 
@@ -207,33 +206,34 @@ export class AmpAnalytics extends AMP.BaseElement {
     }
     toggle(this.element, false);
 
-    this.iniPromise_ =
-        Services.viewerForDoc(this.getAmpDoc()).whenFirstVisible()
-            // Rudimentary "idle" signal.
-            .then(() => Services.timerFor(this.win).promise(1))
-            .then(() => this.consentPromise_)
-            .then(() => Services.ampdocServiceFor(this.win))
-            .then(ampDocService => {
-              return ampDocService.getAmpDoc(this.element, {
-                closestAmpDoc: true,
-              });
-            })
-            .then(instrumentationServicePromiseForDoc)
-            .then(instrumentation => {
-              this.instrumentation_ = instrumentation;
-              return new AnalyticsConfig(this.element).loadConfig();
-            })
-            .then(config => {
-              this.config_ = /** @type {!JsonObject} */ (config);
-              return new CookieWriter(this.win,
-                  this.element, this.config_).write();
-            })
-            .then(() => {
-              this.transport_ =
-                  new Transport(this.win, this.config_['transport'] || {});
-            })
-            .then(this.registerTriggers_.bind(this))
-            .then(this.initializeLinker_.bind(this));
+    this.iniPromise_ = Services.viewerForDoc(this.getAmpDoc())
+      .whenFirstVisible()
+      // Rudimentary "idle" signal.
+      .then(() => Services.timerFor(this.win).promise(1))
+      .then(() => this.consentPromise_)
+      .then(() => Services.ampdocServiceFor(this.win))
+      .then(ampDocService => {
+        return ampDocService.getAmpDoc(this.element, {
+          closestAmpDoc: true,
+        });
+      })
+      .then(instrumentationServicePromiseForDoc)
+      .then(instrumentation => {
+        this.instrumentation_ = instrumentation;
+        return new AnalyticsConfig(this.element).loadConfig();
+      })
+      .then(config => {
+        this.config_ = /** @type {!JsonObject} */ (config);
+        return new CookieWriter(this.win, this.element, this.config_).write();
+      })
+      .then(() => {
+        this.transport_ = new Transport(
+          this.win,
+          this.config_['transport'] || {}
+        );
+      })
+      .then(this.registerTriggers_.bind(this))
+      .then(this.initializeLinker_.bind(this));
     return this.iniPromise_;
   }
 
@@ -254,19 +254,28 @@ export class AmpAnalytics extends AMP.BaseElement {
 
     if (!this.config_['triggers']) {
       const TAG = this.getName_();
-      this.user().error(TAG, 'No triggers were found in the ' +
-          'config. No analytics data will be sent.');
+      this.user().error(
+        TAG,
+        'No triggers were found in the ' +
+          'config. No analytics data will be sent.'
+      );
       return Promise.resolve();
     }
 
-    this.processExtraUrlParams_(this.config_['extraUrlParams'],
-        this.config_['extraUrlParamsReplaceMap']);
+    this.processExtraUrlParams_(
+      this.config_['extraUrlParams'],
+      this.config_['extraUrlParamsReplaceMap']
+    );
 
-    this.analyticsGroup_ =
-        this.instrumentation_.createAnalyticsGroup(this.element);
+    this.analyticsGroup_ = this.instrumentation_.createAnalyticsGroup(
+      this.element
+    );
 
     this.transport_.maybeInitIframeTransport(
-        this.getAmpDoc().win, this.element, this.preconnect);
+      this.getAmpDoc().win,
+      this.element,
+      this.preconnect
+    );
 
     const promises = [];
     // Trigger callback can be synchronous. Do the registration at the end.
@@ -274,59 +283,76 @@ export class AmpAnalytics extends AMP.BaseElement {
       if (hasOwn(this.config_['triggers'], k)) {
         const trigger = this.config_['triggers'][k];
         const expansionOptions = this.expansionOptions_(
-            dict({}), trigger, undefined, true);
+          dict({}),
+          trigger,
+          undefined,
+          true
+        );
         const TAG = this.getName_();
         if (!trigger) {
           this.user().error(TAG, 'Trigger should be an object: ', k);
           continue;
         }
-        const hasRequestOrPostMessage = trigger['request'] ||
-            (trigger['parentPostMessage'] && this.isInabox_);
+        const hasRequestOrPostMessage =
+          trigger['request'] ||
+          (trigger['parentPostMessage'] && this.isInabox_);
         if (!trigger['on'] || !hasRequestOrPostMessage) {
           const errorMsgSeg = this.isInabox_ ? '/"parentPostMessage"' : '';
-          this.user().error(TAG, '"on" and "request"' + errorMsgSeg +
-              ' attributes are required for data to be collected.');
+          this.user().error(
+            TAG,
+            '"on" and "request"' +
+              errorMsgSeg +
+              ' attributes are required for data to be collected.'
+          );
           continue;
         }
         // Check for not supported trigger for sandboxed analytics
         if (this.isSandbox_) {
           const eventType = trigger['on'];
-          if (isEnumValue(AnalyticsEventType, eventType) &&
-              !WHITELIST_EVENT_IN_SANDBOX.includes(eventType)) {
-            this.user().error(TAG, eventType +
-                ' is not supported for amp-analytics in scope');
+          if (
+            isEnumValue(AnalyticsEventType, eventType) &&
+            !WHITELIST_EVENT_IN_SANDBOX.includes(eventType)
+          ) {
+            this.user().error(
+              TAG,
+              eventType + ' is not supported for amp-analytics in scope'
+            );
             continue;
           }
         }
 
-        this.processExtraUrlParams_(trigger['extraUrlParams'],
-            this.config_['extraUrlParamsReplaceMap']);
-        promises.push(this.isSampledIn_(trigger).then(result => {
-          if (!result) {
-            return;
-          }
-          // replace selector and selectionMethod
-          if (this.isSandbox_) {
-            // Only support selection of parent element for analytics in scope
-            if (!this.element.parentElement) {
-              // In case parent element has been removed from DOM, do nothing
+        this.processExtraUrlParams_(
+          trigger['extraUrlParams'],
+          this.config_['extraUrlParamsReplaceMap']
+        );
+        promises.push(
+          this.isSampledIn_(trigger).then(result => {
+            if (!result) {
               return;
             }
-            trigger['selector'] = this.element.parentElement.tagName;
-            trigger['selectionMethod'] = 'closest';
-            this.addTriggerNoInline_(trigger);
-          } else if (trigger['selector']) {
-            // Expand the selector using variable expansion.
-            return this.variableService_.expandTemplate(
-                trigger['selector'], expansionOptions)
+            // replace selector and selectionMethod
+            if (this.isSandbox_) {
+              // Only support selection of parent element for analytics in scope
+              if (!this.element.parentElement) {
+                // In case parent element has been removed from DOM, do nothing
+                return;
+              }
+              trigger['selector'] = this.element.parentElement.tagName;
+              trigger['selectionMethod'] = 'closest';
+              this.addTriggerNoInline_(trigger);
+            } else if (trigger['selector']) {
+              // Expand the selector using variable expansion.
+              return this.variableService_
+                .expandTemplate(trigger['selector'], expansionOptions)
                 .then(selector => {
                   trigger['selector'] = selector;
                   this.addTriggerNoInline_(trigger);
                 });
-          } else {
-            this.addTriggerNoInline_(trigger);
-          }
-        }));
+            } else {
+              this.addTriggerNoInline_(trigger);
+            }
+          })
+        );
       }
     }
     return Promise.all(promises);
@@ -359,7 +385,9 @@ export class AmpAnalytics extends AMP.BaseElement {
     }
     try {
       this.analyticsGroup_.addTrigger(
-          config, this.handleEvent_.bind(this, config));
+        config,
+        this.handleEvent_.bind(this, config)
+      );
     } catch (e) {
       const TAG = this.getName_();
       const eventType = config['on'];
@@ -384,16 +412,20 @@ export class AmpAnalytics extends AMP.BaseElement {
       for (const replaceMapKey in replaceMap) {
         if (++count > MAX_REPLACES) {
           const TAG = this.getName_();
-          this.user().error(TAG,
-              'More than ' + MAX_REPLACES + ' extraUrlParamsReplaceMap rules ' +
-              'aren\'t allowed; Skipping the rest');
+          this.user().error(
+            TAG,
+            'More than ' +
+              MAX_REPLACES +
+              ' extraUrlParamsReplaceMap rules ' +
+              "aren't allowed; Skipping the rest"
+          );
           break;
         }
 
         for (const extraUrlParamsKey in params) {
           const newkey = extraUrlParamsKey.replace(
-              replaceMapKey,
-              replaceMap[replaceMapKey]
+            replaceMapKey,
+            replaceMap[replaceMapKey]
           );
           if (extraUrlParamsKey != newkey) {
             const value = params[extraUrlParamsKey];
@@ -443,8 +475,11 @@ export class AmpAnalytics extends AMP.BaseElement {
     if (!this.config_['requests']) {
       if (!this.isInabox_) {
         const TAG = this.getName_();
-        this.user().error(TAG, 'No request strings defined. Analytics ' +
-          'data will not be sent from this page.');
+        this.user().error(
+          TAG,
+          'No request strings defined. Analytics ' +
+            'data will not be sent from this page.'
+        );
       }
       return;
     }
@@ -464,11 +499,14 @@ export class AmpAnalytics extends AMP.BaseElement {
       // times to support nested requests. Leave any unresolved placeholders.
       // Expand any requests placeholder.
       for (const k in this.config_['requests']) {
-        this.config_['requests'][k]['baseUrl'] =
-            expandTemplate(this.config_['requests'][k]['baseUrl'], key => {
-              const request = this.config_['requests'][key];
-              return (request && request['baseUrl']) || '${' + key + '}';
-            }, 5);
+        this.config_['requests'][k]['baseUrl'] = expandTemplate(
+          this.config_['requests'][k]['baseUrl'],
+          key => {
+            const request = this.config_['requests'][key];
+            return (request && request['baseUrl']) || '${' + key + '}';
+          },
+          5
+        );
       }
 
       const requests = {};
@@ -476,9 +514,12 @@ export class AmpAnalytics extends AMP.BaseElement {
         if (hasOwn(this.config_['requests'], k)) {
           const request = this.config_['requests'][k];
           requests[k] = new RequestHandler(
-              this.element, request, this.preconnect,
-              this.transport_,
-              this.isSandbox_);
+            this.element,
+            request,
+            this.preconnect,
+            this.transport_,
+            this.isSandbox_
+          );
         }
       }
       this.requests_ = requests;
@@ -491,8 +532,12 @@ export class AmpAnalytics extends AMP.BaseElement {
    */
   initializeLinker_() {
     const type = this.element.getAttribute('type');
-    this.linkerManager_ = new LinkerManager(this.getAmpDoc(),
-        this.config_, type, this.element);
+    this.linkerManager_ = new LinkerManager(
+      this.getAmpDoc(),
+      this.config_,
+      type,
+      this.element
+    );
     this.linkerManager_.init();
   }
 
@@ -506,7 +551,8 @@ export class AmpAnalytics extends AMP.BaseElement {
    */
   handleEvent_(trigger, event) {
     const requests = isArray(trigger['request'])
-      ? trigger['request'] : [trigger['request']];
+      ? trigger['request']
+      : [trigger['request']];
     for (let r = 0; r < requests.length; r++) {
       const requestName = requests[r];
       this.handleRequestForEvent_(requestName, trigger, event);
@@ -532,8 +578,11 @@ export class AmpAnalytics extends AMP.BaseElement {
 
     if (requestName != undefined && !request) {
       const TAG = this.getName_();
-      this.user().error(TAG, 'Ignoring request for event. Request string ' +
-          'not found: ', trigger['request']);
+      this.user().error(
+        TAG,
+        'Ignoring request for event. Request string not found: ',
+        trigger['request']
+      );
       if (!hasPostMessage) {
         return;
       }
@@ -575,17 +624,21 @@ export class AmpAnalytics extends AMP.BaseElement {
       return;
     }
     const expansionOptions = this.expansionOptions_(event, trigger);
-    expandPostMessage(this.getAmpDoc(), msg, this.config_['extraUrlParams'],
-        trigger, expansionOptions, this.element)
-        .then(message => {
-          if (isIframed(this.win)) {
-            // Only post message with explict `parentPostMessage` to inabox host
-            this.win.parent./*OK*/postMessage(message, '*');
-          }
-        });
+    expandPostMessage(
+      this.getAmpDoc(),
+      msg,
+      this.config_['extraUrlParams'],
+      trigger,
+      expansionOptions,
+      this.element
+    ).then(message => {
+      if (isIframed(this.win)) {
+        // Only post message with explict `parentPostMessage` to inabox host
+        this.win.parent./*OK*/ postMessage(message, '*');
+      }
+    });
   }
 
-
   /**
    * @param {!JsonObject} trigger The config to use to determine sampling.
    * @return {!Promise<boolean>} Whether the request should be sampled in or
@@ -609,10 +662,10 @@ export class AmpAnalytics extends AMP.BaseElement {
     if (threshold >= 0 && threshold <= 100) {
       const expansionOptions = this.expansionOptions_(dict({}), trigger);
       return this.expandTemplateWithUrlParams_(sampleOn, expansionOptions)
-          .then(key => this.cryptoService_.uniform(key))
-          .then(digest => digest * 100 < threshold);
+        .then(key => this.cryptoService_.uniform(key))
+        .then(digest => digest * 100 < threshold);
     }
-    user()./*OK*/error(TAG, 'Invalid threshold for sampling.');
+    user()./*OK*/ error(TAG, 'Invalid threshold for sampling.');
     return resolve;
   }
 
@@ -626,16 +679,21 @@ export class AmpAnalytics extends AMP.BaseElement {
    */
   checkTriggerEnabled_(trigger, event) {
     const expansionOptions = this.expansionOptions_(event, trigger);
-    const enabledOnTagLevel =
-        this.checkSpecEnabled_(this.config_['enabled'], expansionOptions);
-    const enabledOnTriggerLevel =
-        this.checkSpecEnabled_(trigger['enabled'], expansionOptions);
-
-    return Promise.all([enabledOnTagLevel, enabledOnTriggerLevel])
-        .then(enabled => {
-          devAssert(enabled.length === 2);
-          return enabled[0] && enabled[1];
-        });
+    const enabledOnTagLevel = this.checkSpecEnabled_(
+      this.config_['enabled'],
+      expansionOptions
+    );
+    const enabledOnTriggerLevel = this.checkSpecEnabled_(
+      trigger['enabled'],
+      expansionOptions
+    );
+
+    return Promise.all([enabledOnTagLevel, enabledOnTriggerLevel]).then(
+      enabled => {
+        devAssert(enabled.length === 2);
+        return enabled[0] && enabled[1];
+      }
+    );
   }
 
   /**
@@ -658,11 +716,18 @@ export class AmpAnalytics extends AMP.BaseElement {
       return Promise.resolve(spec);
     }
 
-    return this.expandTemplateWithUrlParams_(spec, expansionOptions)
-        .then(val => {
-          return val !== '' && val !== '0' && val !== 'false' &&
-              val !== 'null' && val !== 'NaN' && val !== 'undefined';
-        });
+    return this.expandTemplateWithUrlParams_(spec, expansionOptions).then(
+      val => {
+        return (
+          val !== '' &&
+          val !== '0' &&
+          val !== 'false' &&
+          val !== 'null' &&
+          val !== 'NaN' &&
+          val !== 'undefined'
+        );
+      }
+    );
   }
 
   /**
@@ -674,10 +739,14 @@ export class AmpAnalytics extends AMP.BaseElement {
    * @private
    */
   expandTemplateWithUrlParams_(spec, expansionOptions) {
-    return this.variableService_.expandTemplate(spec, expansionOptions)
-        .then(key => Services.urlReplacementsForDoc(
-            this.element).expandUrlAsync(key,
-            this.variableService_.getMacros()));
+    return this.variableService_
+      .expandTemplate(spec, expansionOptions)
+      .then(key =>
+        Services.urlReplacementsForDoc(this.element).expandUrlAsync(
+          key,
+          this.variableService_.getMacros()
+        )
+      );
   }
 
   /**
@@ -686,8 +755,9 @@ export class AmpAnalytics extends AMP.BaseElement {
    * @private
    */
   getName_() {
-    return 'AmpAnalytics ' +
-        (this.element.getAttribute('id') || '<unknown id>');
+    return (
+      'AmpAnalytics ' + (this.element.getAttribute('id') || '<unknown id>')
+    );
   }
 
   /**
@@ -709,7 +779,9 @@ export class AmpAnalytics extends AMP.BaseElement {
 AMP.extension(TAG, '0.1', AMP => {
   // Register doc-service factory.
   AMP.registerServiceForDoc(
-      'amp-analytics-instrumentation', InstrumentationService);
+    'amp-analytics-instrumentation',
+    InstrumentationService
+  );
   AMP.registerServiceForDoc('activity', Activity);
   installVariableService(AMP.win);
   installLinkerReaderService(AMP.win);
diff --git a/extensions/amp-analytics/0.1/analytics-group.js b/extensions/amp-analytics/0.1/analytics-group.js
index aafebdec1fb9..0826701ee7d9 100644
--- a/extensions/amp-analytics/0.1/analytics-group.js
+++ b/extensions/amp-analytics/0.1/analytics-group.js
@@ -15,10 +15,7 @@
  */
 
 import {dev, userAssert} from '../../../src/log';
-import {
-  getTrackerKeyName,
-  getTrackerTypesForParentType,
-} from './events';
+import {getTrackerKeyName, getTrackerTypesForParentType} from './events';
 
 /**
  * Represents the group of analytics triggers for a single config. All triggers
@@ -32,7 +29,6 @@ export class AnalyticsGroup {
    * @param {!Element} analyticsElement
    */
   constructor(root, analyticsElement) {
-
     /** @const */
     this.root_ = root;
     /** @const */
@@ -65,13 +61,21 @@ export class AnalyticsGroup {
     const trackerWhitelist = getTrackerTypesForParentType(this.root_.getType());
 
     const tracker = this.root_.getTrackerForWhitelist(
-        trackerKey, trackerWhitelist);
-    userAssert(!!tracker,
-        'Trigger type "%s" is not allowed in the %s', eventType,
-        this.root_.getType());
-    const unlisten = tracker.add(this.analyticsElement_, eventType, config,
-        handler);
+      trackerKey,
+      trackerWhitelist
+    );
+    userAssert(
+      !!tracker,
+      'Trigger type "%s" is not allowed in the %s',
+      eventType,
+      this.root_.getType()
+    );
+    const unlisten = tracker.add(
+      this.analyticsElement_,
+      eventType,
+      config,
+      handler
+    );
     this.listeners_.push(unlisten);
   }
 }
-
diff --git a/extensions/amp-analytics/0.1/analytics-root.js b/extensions/amp-analytics/0.1/analytics-root.js
index 84c390ea0836..c2cf0f3c1439 100644
--- a/extensions/amp-analytics/0.1/analytics-root.js
+++ b/extensions/amp-analytics/0.1/analytics-root.js
@@ -14,18 +14,14 @@
  * limitations under the License.
  */
 
-import {
-  HostServices,
-} from '../../../src/inabox/host-services';
+import {HostServices} from '../../../src/inabox/host-services';
 import {ScrollManager} from './scroll-manager';
 import {Services} from '../../../src/services';
 import {
   VisibilityManagerForDoc,
   VisibilityManagerForEmbed,
 } from './visibility-manager';
-import {
-  VisibilityManagerForMApp,
-} from './visibility-manager-for-mapp';
+import {VisibilityManagerForMApp} from './visibility-manager-for-mapp';
 import {
   closestAncestorElementBySelector,
   matches,
@@ -88,18 +84,23 @@ export class AnalyticsRoot {
     } else {
       // TODO: Using the visibility service and apply it for all tracking types
       const promise = HostServices.visibilityForDoc(this.ampdoc);
-      this.usingHostAPIPromise_ = promise.then(visibilityService => {
-        this.hostVisibilityService_ = visibilityService;
-        return true;
-      }).catch(error => {
-        dev().fine(TAG, 'VisibilityServiceError - fallback=' + error.fallback);
-        if (error.fallback) {
-          // Do not use HostAPI, fallback to original implementation.
-          return false;
-        }
-        // Cannot fallback, service error. Throw user error.
-        throw user().createError('Host Visibility Service Error');
-      });
+      this.usingHostAPIPromise_ = promise
+        .then(visibilityService => {
+          this.hostVisibilityService_ = visibilityService;
+          return true;
+        })
+        .catch(error => {
+          dev().fine(
+            TAG,
+            'VisibilityServiceError - fallback=' + error.fallback
+          );
+          if (error.fallback) {
+            // Do not use HostAPI, fallback to original implementation.
+            return false;
+          }
+          // Cannot fallback, service error. Throw user error.
+          throw user().createError('Host Visibility Service Error');
+        });
     }
     return this.usingHostAPIPromise_;
   }
@@ -245,8 +246,12 @@ export class AnalyticsRoot {
     }
     if (selector == ':host') {
       return new Promise(resolve => {
-        resolve(user().assertElement(
-            this.getHostElement(), `Element "${selector}" not found`));
+        resolve(
+          user().assertElement(
+            this.getHostElement(),
+            `Element "${selector}" not found`
+          )
+        );
       });
     }
 
@@ -272,8 +277,7 @@ export class AnalyticsRoot {
       if (found && this.contains(found)) {
         result = found;
       }
-      return user().assertElement(
-          result, `Element "${selector}" not found`);
+      return user().assertElement(result, `Element "${selector}" not found`);
     });
   }
 
@@ -290,8 +294,10 @@ export class AnalyticsRoot {
   getAmpElement(context, selector, selectionMethod) {
     return this.getElement(context, selector, selectionMethod).then(element => {
       userAssert(
-          element.classList.contains('i-amphtml-element'),
-          'Element "%s" is required to be an AMP element', selector);
+        element.classList.contains('i-amphtml-element'),
+        'Element "%s" is required to be an AMP element',
+        selector
+      );
       return element;
     });
   }
@@ -309,8 +315,7 @@ export class AnalyticsRoot {
    *   `'closest'` and `'scope'`.
    * @return {function(!Event)}
    */
-  createSelectiveListener(
-    listener, context, selector, selectionMethod = null) {
+  createSelectiveListener(listener, context, selector, selectionMethod = null) {
     return event => {
       if (selector == ':host') {
         // `:host` is not reachable via selective listener b/c event path
@@ -320,18 +325,20 @@ export class AnalyticsRoot {
 
       // Navigate up the DOM tree to find the actual target.
       const rootElement = this.getRootElement();
-      const isSelectAny = (selector == '*');
-      const isSelectRoot = (selector == ':root');
+      const isSelectAny = selector == '*';
+      const isSelectRoot = selector == ':root';
       let {target} = event;
       while (target) {
-
         // Target must be contained by this root.
         if (!this.contains(target)) {
           break;
         }
         // `:scope` context must contain the target.
-        if (selectionMethod == 'scope' &&
-            !isSelectRoot && !context.contains(target)) {
+        if (
+          selectionMethod == 'scope' &&
+          !isSelectRoot &&
+          !context.contains(target)
+        ) {
           break;
         }
         // `closest()` target must contain the conext.
@@ -342,9 +349,11 @@ export class AnalyticsRoot {
         }
 
         // Check if the target matches the selector.
-        if (isSelectAny ||
-            (isSelectRoot && target == rootElement) ||
-            matchesNoInline(target, selector)) {
+        if (
+          isSelectAny ||
+          (isSelectRoot && target == rootElement) ||
+          matchesNoInline(target, selector)
+        ) {
           listener(target, event);
           // Don't fire the event multiple times even if the more than one
           // ancestor matches the selector.
@@ -403,7 +412,6 @@ export class AnalyticsRoot {
   }
 }
 
-
 /**
  * The implementation of the analytics root for an ampdoc.
  */
@@ -466,13 +474,14 @@ export class AmpdocAnalyticsRoot extends AnalyticsRoot {
       // If there is hostAPI (hostAPI never exist with the FIE case)
       fetch('http://localhost:8000/visiblityManagerForMAPP');
       return new VisibilityManagerForMApp(
-          this.ampdoc, this.hostVisibilityService_);
+        this.ampdoc,
+        this.hostVisibilityService_
+      );
     }
     return new VisibilityManagerForDoc(this.ampdoc);
   }
 }
 
-
 /**
  * The implementation of the analytics root for FIE.
  */
@@ -521,12 +530,12 @@ export class EmbedAnalyticsRoot extends AnalyticsRoot {
   /** @override */
   createVisibilityManager() {
     return new VisibilityManagerForEmbed(
-        this.parent.getVisibilityManager(),
-        this.embed);
+      this.parent.getVisibilityManager(),
+      this.embed
+    );
   }
 }
 
-
 /**
  * @param  {!Element} el
  * @param  {string} selector
diff --git a/extensions/amp-analytics/0.1/config.js b/extensions/amp-analytics/0.1/config.js
index 28d7c7899f37..41b995dfccde 100644
--- a/extensions/amp-analytics/0.1/config.js
+++ b/extensions/amp-analytics/0.1/config.js
@@ -27,12 +27,10 @@ import {variableServiceFor} from './variables';
 const TAG = 'amp-analytics/config';
 
 export class AnalyticsConfig {
-
   /**
    * @param {!Element} element
    */
   constructor(element) {
-
     /** @private {!Element} */
     this.element_ = element;
 
@@ -67,8 +65,8 @@ export class AnalyticsConfig {
     this.isSandbox_ = this.element_.hasAttribute('sandbox');
 
     return this.fetchRemoteConfig_()
-        .then(this.processConfigs_.bind(this))
-        .then(() => this.config_);
+      .then(this.processConfigs_.bind(this))
+      .then(() => this.config_);
   }
 
   /**
@@ -92,20 +90,29 @@ export class AnalyticsConfig {
       fetchConfig.credentials = this.element_.getAttribute('data-credentials');
     }
     return Services.urlReplacementsForDoc(this.element_)
-        .expandUrlAsync(remoteConfigUrl)
-        .then(expandedUrl => {
-          remoteConfigUrl = expandedUrl;
-          return Services.xhrFor(toWin(this.win_)).fetchJson(
-              remoteConfigUrl, fetchConfig);
-        })
-        .then(res => res.json())
-        .then(jsonValue => {
+      .expandUrlAsync(remoteConfigUrl)
+      .then(expandedUrl => {
+        remoteConfigUrl = expandedUrl;
+        return Services.xhrFor(toWin(this.win_)).fetchJson(
+          remoteConfigUrl,
+          fetchConfig
+        );
+      })
+      .then(res => res.json())
+      .then(
+        jsonValue => {
           this.remoteConfig_ = jsonValue;
           dev().fine(TAG, 'Remote config loaded', remoteConfigUrl);
-        }, err => {
-          user().error(TAG,
-              'Error loading remote config: ', remoteConfigUrl, err);
-        });
+        },
+        err => {
+          user().error(
+            TAG,
+            'Error loading remote config: ',
+            remoteConfigUrl,
+            err
+          );
+        }
+      );
   }
 
   /**
@@ -149,23 +156,33 @@ export class AnalyticsConfig {
         requireAmpResponseSourceOrigin: false,
       };
       if (this.element_.hasAttribute('data-credentials')) {
-        fetchConfig.credentials = this.element_
-            .getAttribute('data-credentials');
+        fetchConfig.credentials = this.element_.getAttribute(
+          'data-credentials'
+        );
       }
       return Services.urlReplacementsForDoc(this.element_)
-          .expandUrlAsync(configRewriterUrl)
-          .then(expandedUrl => {
-            return Services.xhrFor(toWin(this.win_)).fetchJson(
-                expandedUrl, fetchConfig);
-          })
-          .then(res => res.json())
-          .then(jsonValue => {
+        .expandUrlAsync(configRewriterUrl)
+        .then(expandedUrl => {
+          return Services.xhrFor(toWin(this.win_)).fetchJson(
+            expandedUrl,
+            fetchConfig
+          );
+        })
+        .then(res => res.json())
+        .then(
+          jsonValue => {
             this.config_ = this.mergeConfigs_(jsonValue);
             dev().fine(TAG, 'Configuration re-written', configRewriterUrl);
-          }, err => {
-            user().error(TAG,
-                'Error rewriting configuration: ', configRewriterUrl, err);
-          });
+          },
+          err => {
+            user().error(
+              TAG,
+              'Error rewriting configuration: ',
+              configRewriterUrl,
+              err
+            );
+          }
+        );
     });
   }
 
@@ -186,8 +203,10 @@ export class AnalyticsConfig {
 
     if (pubVarGroups && !vendorVarGroups) {
       const TAG = this.getName_();
-      user().warn(TAG, 'This analytics provider does not currently ' +
-          'support varGroups');
+      user().warn(
+        TAG,
+        'This analytics provider does not currently support varGroups'
+      );
       return Promise.resolve();
     }
 
@@ -209,13 +228,14 @@ export class AnalyticsConfig {
         return;
       }
 
-      const groupPromise = this.shallowExpandObject(this.element_, group)
-          .then(expandedGroup => {
-            // This is part of the user config and should not be sent.
-            delete expandedGroup['enabled'];
-            // Merge all groups into single `vars` object.
-            Object.assign(rewriterConfig['vars'], expandedGroup);
-          });
+      const groupPromise = this.shallowExpandObject(this.element_, group).then(
+        expandedGroup => {
+          // This is part of the user config and should not be sent.
+          delete expandedGroup['enabled'];
+          // Merge all groups into single `vars` object.
+          Object.assign(rewriterConfig['vars'], expandedGroup);
+        }
+      );
       allPromises.push(groupPromise);
     });
 
@@ -251,10 +271,16 @@ export class AnalyticsConfig {
     });
     const defaultConfig = this.predefinedConfig_['default'] || {};
     mergeObjects(expandConfigRequest(defaultConfig), config);
-    mergeObjects(expandConfigRequest(this.getTypeConfig_()), config,
-        /* predefined */ true);
-    mergeObjects(expandConfigRequest(rewrittenConfig), config,
-        /* predefined */ true);
+    mergeObjects(
+      expandConfigRequest(this.getTypeConfig_()),
+      config,
+      /* predefined */ true
+    );
+    mergeObjects(
+      expandConfigRequest(rewrittenConfig),
+      config,
+      /* predefined */ true
+    );
     return config;
   }
 
@@ -291,8 +317,7 @@ export class AnalyticsConfig {
       if (children.length == 1) {
         inlineConfig = getChildJsonConfig(this.element_);
       } else if (children.length > 1) {
-        user().error(TAG, 'The tag should contain only one' +
-            ' <script> child.');
+        user().error(TAG, 'The tag should contain only one <script> child.');
       }
     } catch (er) {
       user().error(TAG, er.message);
@@ -311,24 +336,33 @@ export class AnalyticsConfig {
       // overwriting
       if (inlineConfig['transport'] || this.remoteConfig_['transport']) {
         const TAG = this.getName_();
-        user().error(TAG, 'Inline or remote config should not ' +
-            'overwrite vendor transport settings');
+        user().error(
+          TAG,
+          'Inline or remote config should not ' +
+            'overwrite vendor transport settings'
+        );
       }
     }
 
     // Do NOT allow inline or remote config to use 'transport: iframe'
     if (inlineConfig['transport'] && inlineConfig['transport']['iframe']) {
-      user().error(TAG, 'Inline configs are not allowed to ' +
-          'specify transport iframe');
+      user().error(
+        TAG,
+        'Inline configs are not allowed to specify transport iframe'
+      );
       if (!getMode().localDev || getMode().test) {
         inlineConfig['transport']['iframe'] = undefined;
       }
     }
 
-    if (this.remoteConfig_['transport'] &&
-        this.remoteConfig_['transport']['iframe']) {
-      user().error(TAG, 'Remote configs are not allowed to ' +
-          'specify transport iframe');
+    if (
+      this.remoteConfig_['transport'] &&
+      this.remoteConfig_['transport']['iframe']
+    ) {
+      user().error(
+        TAG,
+        'Remote configs are not allowed to specify transport iframe'
+      );
       this.remoteConfig_['transport']['iframe'] = undefined;
     }
   }
@@ -339,8 +373,9 @@ export class AnalyticsConfig {
    * @private
    */
   getName_() {
-    return 'AmpAnalytics ' +
-        (this.element_.getAttribute('id') || '<unknown id>');
+    return (
+      'AmpAnalytics ' + (this.element_.getAttribute('id') || '<unknown id>')
+    );
   }
 
   /**
@@ -357,22 +392,25 @@ export class AnalyticsConfig {
 
     Object.keys(obj).forEach(key => {
       keys.push(key);
-      const expanded = Services.urlReplacementsForDoc(element)
-          .expandStringAsync(obj[key],
-              variableServiceFor(/** @type {!Window} */
-                  (this.win_)).getMacros());
+      const expanded = Services.urlReplacementsForDoc(
+        element
+      ).expandStringAsync(
+        obj[key],
+        variableServiceFor(
+          /** @type {!Window} */
+          (this.win_)
+        ).getMacros()
+      );
       expansionPromises.push(expanded);
     });
 
     return Promise.all(expansionPromises).then(expandedValues => {
-      keys.forEach((key, i) =>
-        expandedObj[key] = expandedValues[i]);
+      keys.forEach((key, i) => (expandedObj[key] = expandedValues[i]));
       return expandedObj;
     });
   }
 }
 
-
 /**
  * Merges two objects. If the value is array or plain object, the values are
  * merged otherwise the value is overwritten.
@@ -389,29 +427,40 @@ export function mergeObjects(from, to, opt_predefinedConfig) {
   // Assert that optouts are allowed only in predefined configs.
   // The last expression adds an exception of known, safe optout function
   // that is already being used in the wild.
-  userAssert(opt_predefinedConfig
-      || !from || !from['optout']
-      || from['optout'] == '_gaUserPrefs.ioo'
-      || from['optoutElementId'] == '__gaOptOutExtension',
-  'optout property is only available to vendor config.');
+  userAssert(
+    opt_predefinedConfig ||
+      !from ||
+      !from['optout'] ||
+      from['optout'] == '_gaUserPrefs.ioo' ||
+      from['optoutElementId'] == '__gaOptOutExtension',
+    'optout property is only available to vendor config.'
+  );
 
   for (const property in from) {
-    userAssert(opt_predefinedConfig || property != 'iframePing',
-        'iframePing config is only available to vendor config.');
+    userAssert(
+      opt_predefinedConfig || property != 'iframePing',
+      'iframePing config is only available to vendor config.'
+    );
     // Only deal with own properties.
     if (hasOwn(from, property)) {
       if (isArray(from[property])) {
         if (!isArray(to[property])) {
           to[property] = [];
         }
-        to[property] = mergeObjects(from[property], to[property],
-            opt_predefinedConfig);
+        to[property] = mergeObjects(
+          from[property],
+          to[property],
+          opt_predefinedConfig
+        );
       } else if (isObject(from[property])) {
         if (!isObject(to[property])) {
           to[property] = {};
         }
-        to[property] = mergeObjects(from[property], to[property],
-            opt_predefinedConfig);
+        to[property] = mergeObjects(
+          from[property],
+          to[property],
+          opt_predefinedConfig
+        );
       } else {
         to[property] = from[property];
       }
diff --git a/extensions/amp-analytics/0.1/cookie-writer.js b/extensions/amp-analytics/0.1/cookie-writer.js
index 857695e36244..fe5252f0de8a 100644
--- a/extensions/amp-analytics/0.1/cookie-writer.js
+++ b/extensions/amp-analytics/0.1/cookie-writer.js
@@ -42,7 +42,6 @@ const RESERVED_KEYS = {
 };
 
 export class CookieWriter {
-
   /**
    * @param {!Window} win
    * @param {!Element} element
@@ -96,15 +95,17 @@ export class CookieWriter {
    */
   init_() {
     // TODO: Need the consider the case for shadow doc.
-    if (isInFie(this.element_) || isProxyOrigin(this.win_.location) ||
-        getMode(this.win_).runtime == 'inabox') {
+    if (
+      isInFie(this.element_) ||
+      isProxyOrigin(this.win_.location) ||
+      getMode(this.win_).runtime == 'inabox'
+    ) {
       // Disable cookie writer in friendly iframe and proxy origin and inabox.
       // Note: It's important to check origin here so that setCookie doesn't
       // throw error "should not attempt ot set cookie on proxy origin"
       return Promise.resolve();
     }
 
-
     if (!hasOwn(this.config_, 'cookies')) {
       return Promise.resolve();
     }
@@ -166,8 +167,11 @@ export class CookieWriter {
     // Make sure that only QUERY_PARAM and LINKER_PARAM is supported
     const {name} = getNameArgs(str);
     if (!EXPAND_WHITELIST[name]) {
-      user().error(TAG, `cookie value ${str} not supported. ` +
-        'Only QUERY_PARAM and LINKER_PARAM is supported');
+      user().error(
+        TAG,
+        `cookie value ${str} not supported. ` +
+          'Only QUERY_PARAM and LINKER_PARAM is supported'
+      );
       return false;
     }
 
@@ -183,19 +187,20 @@ export class CookieWriter {
   expandAndWrite_(cookieName, cookieValue) {
     // Note: Have to use `expandStringAsync` because QUERY_PARAM can wait for
     // trackImpressionPromise and resolve async
-    return this.urlReplacementService_.expandStringAsync(cookieValue,
-        this.bindings_, EXPAND_WHITELIST).then(
-        value => {
-          // Note: We ignore empty cookieValue, that means currently we don't
-          // provide a way to overwrite or erase existing cookie
-          if (value) {
-            const expireDate = Date.now() + BASE_CID_MAX_AGE_MILLIS;
-            setCookie(this.win_, cookieName, value, expireDate, {
-              highestAvailableDomain: true,
-            });
-          }
-        }).catch(e => {
-      user().error(TAG, 'Error expanding cookie string', e);
-    });
+    return this.urlReplacementService_
+      .expandStringAsync(cookieValue, this.bindings_, EXPAND_WHITELIST)
+      .then(value => {
+        // Note: We ignore empty cookieValue, that means currently we don't
+        // provide a way to overwrite or erase existing cookie
+        if (value) {
+          const expireDate = Date.now() + BASE_CID_MAX_AGE_MILLIS;
+          setCookie(this.win_, cookieName, value, expireDate, {
+            highestAvailableDomain: true,
+          });
+        }
+      })
+      .catch(e => {
+        user().error(TAG, 'Error expanding cookie string', e);
+      });
   }
 }
diff --git a/extensions/amp-analytics/0.1/crc32.js b/extensions/amp-analytics/0.1/crc32.js
index 56c3cbaddb86..198a4db5d76a 100644
--- a/extensions/amp-analytics/0.1/crc32.js
+++ b/extensions/amp-analytics/0.1/crc32.js
@@ -21,7 +21,7 @@ import {utf8Encode} from '../../../src/utils/bytes';
  * https://en.wikipedia.org/wiki/Cyclic_redundancy_check#Polynomial_representations_of_cyclic_redundancy_checks
  * @const {number}
  */
-const CRC32_KEY = 0xEDB88320;
+const CRC32_KEY = 0xedb88320;
 
 /** @private {?Array<number>} */
 let crcTable = null;
@@ -41,10 +41,10 @@ export function crc32(str) {
   // Shrink to 32 bits.
   let crc = -1 >>> 0;
   for (let i = 0; i < bytes.length; i++) {
-    const lookupIndex = (crc ^ bytes[i]) & 0xFF;
+    const lookupIndex = (crc ^ bytes[i]) & 0xff;
     crc = (crc >>> 8) ^ crcTable[lookupIndex];
   }
-  return (crc ^ (-1)) >>> 0;
+  return (crc ^ -1) >>> 0;
 }
 
 /**
diff --git a/extensions/amp-analytics/0.1/events.js b/extensions/amp-analytics/0.1/events.js
index 562e434fa2bf..732ebc3a26a4 100644
--- a/extensions/amp-analytics/0.1/events.js
+++ b/extensions/amp-analytics/0.1/events.js
@@ -65,47 +65,65 @@ const TRACKER_TYPE = Object.freeze({
     name: 'click',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
     // Escape the temporal dead zone by not referencing a class directly.
-    klass: function(root) { return new ClickEventTracker(root); },
+    klass: function(root) {
+      return new ClickEventTracker(root);
+    },
   },
   'scroll': {
     name: 'scroll',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
-    klass: function(root) { return new ScrollEventTracker(root); },
+    klass: function(root) {
+      return new ScrollEventTracker(root);
+    },
   },
   'custom': {
     name: 'custom',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
-    klass: function(root) { return new CustomEventTracker(root); },
+    klass: function(root) {
+      return new CustomEventTracker(root);
+    },
   },
   'render-start': {
     name: 'render-start',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer', 'visible']),
-    klass: function(root) { return new SignalTracker(root); },
+    klass: function(root) {
+      return new SignalTracker(root);
+    },
   },
   'ini-load': {
     name: 'ini-load',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer', 'visible']),
-    klass: function(root) { return new IniLoadTracker(root); },
+    klass: function(root) {
+      return new IniLoadTracker(root);
+    },
   },
   'timer': {
     name: 'timer',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES,
-    klass: function(root) { return new TimerEventTracker(root); },
+    klass: function(root) {
+      return new TimerEventTracker(root);
+    },
   },
   'visible': {
     name: 'visible',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
-    klass: function(root) { return new VisibilityTracker(root); },
+    klass: function(root) {
+      return new VisibilityTracker(root);
+    },
   },
   'hidden': {
     name: 'visible', // Reuse tracker with visibility
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
-    klass: function(root) { return new VisibilityTracker(root); },
+    klass: function(root) {
+      return new VisibilityTracker(root);
+    },
   },
   'video': {
     name: 'video',
     allowedFor: ALLOWED_FOR_ALL_ROOT_TYPES.concat(['timer']),
-    klass: function(root) { return new VideoEventTracker(root); },
+    klass: function(root) {
+      return new VideoEventTracker(root);
+    },
   },
 });
 
@@ -122,8 +140,9 @@ function isVideoTriggerType(triggerType) {
  * @return {boolean}
  */
 function isReservedTriggerType(triggerType) {
-  return !!TRACKER_TYPE[triggerType] ||
-      isEnumValue(AnalyticsEventType, triggerType);
+  return (
+    !!TRACKER_TYPE[triggerType] || isEnumValue(AnalyticsEventType, triggerType)
+  );
 }
 
 /**
@@ -137,8 +156,9 @@ export function getTrackerKeyName(eventType) {
   if (!isReservedTriggerType(eventType)) {
     return 'custom';
   }
-  return hasOwn(TRACKER_TYPE, eventType) ?
-    TRACKER_TYPE[eventType].name : eventType;
+  return hasOwn(TRACKER_TYPE, eventType)
+    ? TRACKER_TYPE[eventType].name
+    : eventType;
 }
 
 /**
@@ -148,8 +168,10 @@ export function getTrackerKeyName(eventType) {
 export function getTrackerTypesForParentType(parentType) {
   const filtered = {};
   Object.keys(TRACKER_TYPE).forEach(key => {
-    if (hasOwn(TRACKER_TYPE, key) &&
-        TRACKER_TYPE[key].allowedFor.indexOf(parentType) != -1) {
+    if (
+      hasOwn(TRACKER_TYPE, key) &&
+      TRACKER_TYPE[key].allowedFor.indexOf(parentType) != -1
+    ) {
       filtered[key] = TRACKER_TYPE[key].klass;
     }
   }, this);
@@ -194,7 +216,6 @@ export class AnalyticsEvent {
   }
 }
 
-
 /**
  * The base class for all trackers. A tracker tracks all events of the same
  * type for a single analytics root.
@@ -226,7 +247,6 @@ export class EventTracker {
   add(unusedContext, unusedEventType, unusedConfig, unusedListener) {}
 }
 
-
 /**
  * Tracks custom events.
  */
@@ -280,15 +300,18 @@ export class CustomEventTracker extends EventTracker {
     }
     const selectionMethod = config['selectionMethod'] || null;
 
-    const targetReady =
-        this.root.getElement(context, selector, selectionMethod);
+    const targetReady = this.root.getElement(
+      context,
+      selector,
+      selectionMethod
+    );
 
     const isSandboxEvent = startsWith(eventType, 'sandbox-');
 
     // Push recent events if any.
-    const buffer = isSandboxEvent ?
-      this.sandboxBuffer_ && this.sandboxBuffer_[eventType] :
-      this.buffer_ && this.buffer_[eventType];
+    const buffer = isSandboxEvent
+      ? this.sandboxBuffer_ && this.sandboxBuffer_[eventType]
+      : this.buffer_ && this.buffer_[eventType];
 
     if (buffer) {
       const bufferLength = buffer.length;
@@ -357,7 +380,6 @@ export class CustomEventTracker extends EventTracker {
   }
 }
 
-
 /**
  * Tracks click events.
  */
@@ -384,14 +406,19 @@ export class ClickEventTracker extends EventTracker {
 
   /** @override */
   add(context, eventType, config, listener) {
-    const selector = userAssert(config['selector'],
-        'Missing required selector on click trigger');
+    const selector = userAssert(
+      config['selector'],
+      'Missing required selector on click trigger'
+    );
     const selectionMethod = config['selectionMethod'] || null;
-    return this.clickObservable_.add(this.root.createSelectiveListener(
+    return this.clickObservable_.add(
+      this.root.createSelectiveListener(
         this.handleClick_.bind(this, listener),
-        (context.parentElement || context),
+        context.parentElement || context,
         selector,
-        selectionMethod));
+        selectionMethod
+      )
+    );
   }
 
   /**
@@ -402,9 +429,10 @@ export class ClickEventTracker extends EventTracker {
    */
   handleClick_(listener, target, unusedEvent) {
     const params = getDataParamsFromAttributes(
-        target,
-        /* computeParamNameFunc */ undefined,
-        VARIABLE_DATA_ATTRIBUTE_KEY);
+      target,
+      /* computeParamNameFunc */ undefined,
+      VARIABLE_DATA_ATTRIBUTE_KEY
+    );
     listener(new AnalyticsEvent(target, 'click', params));
   }
 }
@@ -413,7 +441,6 @@ export class ClickEventTracker extends EventTracker {
  * Tracks scroll events.
  */
 export class ScrollEventTracker extends EventTracker {
-
   /**
    * @param {!./analytics-root.AnalyticsRoot} root
    */
@@ -430,8 +457,9 @@ export class ScrollEventTracker extends EventTracker {
   /** @override */
   dispose() {
     if (this.boundScrollHandler_ !== null) {
-      this.root_.getScrollManager()
-          .removeScrollHandler(this.boundScrollHandler_);
+      this.root_
+        .getScrollManager()
+        .removeScrollHandler(this.boundScrollHandler_);
       this.boundScrollHandler_ = null;
     }
   }
@@ -443,25 +471,34 @@ export class ScrollEventTracker extends EventTracker {
       return NO_UNLISTEN;
     }
 
-    if (!Array.isArray(config['scrollSpec']['verticalBoundaries']) &&
-      !Array.isArray(config['scrollSpec']['horizontalBoundaries'])) {
-      user().error(TAG, 'Boundaries are required for the scroll ' +
-        'trigger to work.');
+    if (
+      !Array.isArray(config['scrollSpec']['verticalBoundaries']) &&
+      !Array.isArray(config['scrollSpec']['horizontalBoundaries'])
+    ) {
+      user().error(
+        TAG,
+        'Boundaries are required for the scroll trigger to work.'
+      );
       return NO_UNLISTEN;
     }
 
     const boundsV = this.normalizeBoundaries_(
-        config['scrollSpec']['verticalBoundaries']
+      config['scrollSpec']['verticalBoundaries']
     );
     const boundsH = this.normalizeBoundaries_(
-        config['scrollSpec']['horizontalBoundaries']
+      config['scrollSpec']['horizontalBoundaries']
     );
 
-    this.boundScrollHandler_ =
-      this.scrollHandler_.bind(this, boundsV, boundsH, listener);
+    this.boundScrollHandler_ = this.scrollHandler_.bind(
+      this,
+      boundsV,
+      boundsH,
+      listener
+    );
 
-    return this.root_.getScrollManager()
-        .addScrollHandler(this.boundScrollHandler_);
+    return this.root_
+      .getScrollManager()
+      .addScrollHandler(this.boundScrollHandler_);
   }
 
   /**
@@ -475,15 +512,17 @@ export class ScrollEventTracker extends EventTracker {
   scrollHandler_(boundsV, boundsH, listener, e) {
     // Calculates percentage scrolled by adding screen height/width to
     // top/left and dividing by the total scroll height/width.
-    this.triggerScrollEvents_(boundsV,
-        (e.top + e.height) * 100 / e./*OK*/scrollHeight,
-        VAR_V_SCROLL_BOUNDARY,
-        listener
+    this.triggerScrollEvents_(
+      boundsV,
+      ((e.top + e.height) * 100) / e./*OK*/ scrollHeight,
+      VAR_V_SCROLL_BOUNDARY,
+      listener
     );
-    this.triggerScrollEvents_(boundsH,
-        (e.left + e.width) * 100 / e./*OK*/scrollWidth,
-        VAR_H_SCROLL_BOUNDARY,
-        listener
+    this.triggerScrollEvents_(
+      boundsH,
+      ((e.left + e.width) * 100) / e./*OK*/ scrollWidth,
+      VAR_H_SCROLL_BOUNDARY,
+      listener
     );
   }
 
@@ -510,8 +549,10 @@ export class ScrollEventTracker extends EventTracker {
         return result;
       }
 
-      bound = Math.min(Math.round(bound / SCROLL_PRECISION_PERCENT) *
-        SCROLL_PRECISION_PERCENT, 100);
+      bound = Math.min(
+        Math.round(bound / SCROLL_PRECISION_PERCENT) * SCROLL_PRECISION_PERCENT,
+        100
+      );
       result[bound] = false;
     }
     return result;
@@ -543,11 +584,11 @@ export class ScrollEventTracker extends EventTracker {
       const vars = dict();
       vars[varName] = b;
       listener(
-          new AnalyticsEvent(
-              this.root_.getRootElement(),
-              AnalyticsEventType.SCROLL,
-              vars
-          )
+        new AnalyticsEvent(
+          this.root_.getRootElement(),
+          AnalyticsEventType.SCROLL,
+          vars
+        )
       );
     }
   }
@@ -566,8 +607,7 @@ export class SignalTracker extends EventTracker {
   }
 
   /** @override */
-  dispose() {
-  }
+  dispose() {}
 
   /** @override */
   add(context, eventType, config, listener) {
@@ -582,14 +622,16 @@ export class SignalTracker extends EventTracker {
       // Look for the AMP-element. Wait for DOM to be fully parsed to avoid
       // false missed searches.
       const selectionMethod = config['selectionMethod'];
-      signalsPromise = this.root.getAmpElement(
-          (context.parentElement || context),
+      signalsPromise = this.root
+        .getAmpElement(
+          context.parentElement || context,
           selector,
           selectionMethod
-      ).then(element => {
-        target = element;
-        return this.getElementSignal(eventType, target);
-      });
+        )
+        .then(element => {
+          target = element;
+          return this.getElementSignal(eventType, target);
+        });
     }
 
     // Wait for the target and the event signal.
@@ -626,8 +668,7 @@ export class IniLoadTracker extends EventTracker {
   }
 
   /** @override */
-  dispose() {
-  }
+  dispose() {}
 
   /** @override */
   add(context, eventType, config, listener) {
@@ -642,14 +683,16 @@ export class IniLoadTracker extends EventTracker {
       // An AMP-element. Wait for DOM to be fully parsed to avoid
       // false missed searches.
       const selectionMethod = config['selectionMethod'];
-      promise = this.root.getAmpElement(
-          (context.parentElement || context),
+      promise = this.root
+        .getAmpElement(
+          context.parentElement || context,
           selector,
           selectionMethod
-      ).then(element => {
-        target = element;
-        return this.getElementSignal('ini-load', target);
-      });
+        )
+        .then(element => {
+          target = element;
+          return this.getElementSignal('ini-load', target);
+        });
     }
     // Wait for the target and the event.
     promise.then(() => {
@@ -676,7 +719,6 @@ export class IniLoadTracker extends EventTracker {
   }
 }
 
-
 /**
  * Timer event handler.
  */
@@ -692,24 +734,30 @@ class TimerEventHandler {
     /** @private {number|undefined} */
     this.intervalId_ = undefined;
 
-    userAssert('interval' in timerSpec,
-        'Timer interval specification required');
+    userAssert(
+      'interval' in timerSpec,
+      'Timer interval specification required'
+    );
     /** @private @const {number} */
     this.intervalLength_ = Number(timerSpec['interval']) || 0;
-    userAssert(this.intervalLength_ >= MIN_TIMER_INTERVAL_SECONDS,
-        'Bad timer interval specification');
+    userAssert(
+      this.intervalLength_ >= MIN_TIMER_INTERVAL_SECONDS,
+      'Bad timer interval specification'
+    );
 
     /** @private @const {number} */
-    this.maxTimerLength_ = 'maxTimerLength' in timerSpec ?
-      Number(timerSpec['maxTimerLength']) : DEFAULT_MAX_TIMER_LENGTH_SECONDS;
+    this.maxTimerLength_ =
+      'maxTimerLength' in timerSpec
+        ? Number(timerSpec['maxTimerLength'])
+        : DEFAULT_MAX_TIMER_LENGTH_SECONDS;
     userAssert(this.maxTimerLength_ > 0, 'Bad maxTimerLength specification');
 
     /** @private @const {boolean} */
     this.maxTimerInSpec_ = 'maxTimerLength' in timerSpec;
 
     /** @private @const {boolean} */
-    this.callImmediate_ = 'immediate' in timerSpec ?
-      Boolean(timerSpec['immediate']) : true;
+    this.callImmediate_ =
+      'immediate' in timerSpec ? Boolean(timerSpec['immediate']) : true;
 
     /** @private {?function()} */
     this.intervalCallback_ = null;
@@ -863,7 +911,6 @@ class TimerEventHandler {
   }
 }
 
-
 /**
  * Tracks timer events.
  */
@@ -898,14 +945,20 @@ export class TimerEventTracker extends EventTracker {
   /** @override */
   add(context, eventType, config, listener) {
     const timerSpec = config['timerSpec'];
-    userAssert(timerSpec && typeof timerSpec == 'object',
-        'Bad timer specification');
+    userAssert(
+      timerSpec && typeof timerSpec == 'object',
+      'Bad timer specification'
+    );
     const timerStart = 'startSpec' in timerSpec ? timerSpec['startSpec'] : null;
-    userAssert(!timerStart || typeof timerStart == 'object',
-        'Bad timer start specification');
+    userAssert(
+      !timerStart || typeof timerStart == 'object',
+      'Bad timer start specification'
+    );
     const timerStop = 'stopSpec' in timerSpec ? timerSpec['stopSpec'] : null;
-    userAssert((!timerStart && !timerStop) || typeof timerStop == 'object',
-        'Bad timer stop specification');
+    userAssert(
+      (!timerStart && !timerStop) || typeof timerStop == 'object',
+      'Bad timer stop specification'
+    );
 
     const timerId = this.generateTimerId_();
     let startBuilder;
@@ -913,24 +966,36 @@ export class TimerEventTracker extends EventTracker {
     if (timerStart) {
       const startTracker = this.getTracker_(timerStart);
       userAssert(startTracker, 'Cannot track timer start');
-      startBuilder = startTracker.add.bind(startTracker, context,
-          timerStart['on'], timerStart,
-          this.handleTimerToggle_.bind(this, timerId, eventType, listener));
+      startBuilder = startTracker.add.bind(
+        startTracker,
+        context,
+        timerStart['on'],
+        timerStart,
+        this.handleTimerToggle_.bind(this, timerId, eventType, listener)
+      );
     }
     if (timerStop) {
       const stopTracker = this.getTracker_(timerStop);
       userAssert(stopTracker, 'Cannot track timer stop');
-      stopBuilder = stopTracker.add.bind(stopTracker, context,
-          timerStop['on'], timerStop,
-          this.handleTimerToggle_.bind(this, timerId, eventType, listener));
+      stopBuilder = stopTracker.add.bind(
+        stopTracker,
+        context,
+        timerStop['on'],
+        timerStop,
+        this.handleTimerToggle_.bind(this, timerId, eventType, listener)
+      );
     }
 
     const timerHandler = new TimerEventHandler(
-        timerSpec, startBuilder, stopBuilder);
+      timerSpec,
+      startBuilder,
+      stopBuilder
+    );
     this.trackers_[timerId] = timerHandler;
 
     timerHandler.init(
-        this.startTimer_.bind(this, timerId, eventType, listener));
+      this.startTimer_.bind(this, timerId, eventType, listener)
+    );
     return () => {
       this.removeTracker_(timerId);
     };
@@ -954,7 +1019,9 @@ export class TimerEventTracker extends EventTracker {
     const trackerKey = getTrackerKeyName(eventType);
 
     return this.root.getTrackerForWhitelist(
-        trackerKey, getTrackerTypesForParentType('timer'));
+      trackerKey,
+      getTrackerTypesForParentType('timer')
+    );
   }
 
   /**
@@ -989,8 +1056,11 @@ export class TimerEventTracker extends EventTracker {
     const timerCallback = () => {
       listener(this.createEvent_(timerId, eventType));
     };
-    timerHandler.startIntervalInWindow(this.root.ampdoc.win, timerCallback,
-        this.removeTracker_.bind(this, timerId));
+    timerHandler.startIntervalInWindow(
+      this.root.ampdoc.win,
+      timerCallback,
+      this.removeTracker_.bind(this, timerId)
+    );
   }
 
   /**
@@ -1008,8 +1078,11 @@ export class TimerEventTracker extends EventTracker {
    * @private
    */
   createEvent_(timerId, eventType) {
-    return new AnalyticsEvent(this.root.getRootElement(), eventType,
-        this.trackers_[timerId].getTimerVars());
+    return new AnalyticsEvent(
+      this.root.getRootElement(),
+      eventType,
+      this.trackers_[timerId].getTimerVars()
+    );
   }
 
   /**
@@ -1025,7 +1098,6 @@ export class TimerEventTracker extends EventTracker {
   }
 }
 
-
 /**
  * Tracks video session events
  */
@@ -1040,12 +1112,14 @@ export class VideoEventTracker extends EventTracker {
     this.sessionObservable_ = new Observable();
 
     /** @private {?function(!Event)} */
-    this.boundOnSession_ =
-        this.sessionObservable_.fire.bind(this.sessionObservable_);
+    this.boundOnSession_ = this.sessionObservable_.fire.bind(
+      this.sessionObservable_
+    );
 
     Object.keys(VideoAnalyticsEvents).forEach(key => {
-      this.root.getRoot().addEventListener(
-          VideoAnalyticsEvents[key], this.boundOnSession_);
+      this.root
+        .getRoot()
+        .addEventListener(VideoAnalyticsEvents[key], this.boundOnSession_);
     });
   }
 
@@ -1064,8 +1138,11 @@ export class VideoEventTracker extends EventTracker {
     const videoSpec = config['videoSpec'] || {};
     const selector = config['selector'] || videoSpec['selector'];
     const selectionMethod = config['selectionMethod'] || null;
-    const targetReady =
-        this.root.getElement(context, selector, selectionMethod);
+    const targetReady = this.root.getElement(
+      context,
+      selector,
+      selectionMethod
+    );
 
     const endSessionWhenInvisible = videoSpec['end-session-when-invisible'];
     const excludeAutoplay = videoSpec['exclude-autoplay'];
@@ -1081,9 +1158,10 @@ export class VideoEventTracker extends EventTracker {
 
     return this.sessionObservable_.add(event => {
       const {type} = event;
-      const isVisibleType = (type === VideoAnalyticsEvents.SESSION_VISIBLE);
-      const normalizedType =
-          isVisibleType ? VideoAnalyticsEvents.SESSION : type;
+      const isVisibleType = type === VideoAnalyticsEvents.SESSION_VISIBLE;
+      const normalizedType = isVisibleType
+        ? VideoAnalyticsEvents.SESSION
+        : type;
       const details = /** @type {?JsonObject|undefined} */ (getData(event));
 
       if (normalizedType !== on) {
@@ -1091,8 +1169,10 @@ export class VideoEventTracker extends EventTracker {
       }
 
       if (normalizedType === VideoAnalyticsEvents.SECONDS_PLAYED && !interval) {
-        user().error(TAG, 'video-seconds-played requires interval spec ' +
-          'with non-zero value');
+        user().error(
+          TAG,
+          'video-seconds-played requires interval spec with non-zero value'
+        );
         return;
       }
 
@@ -1105,19 +1185,23 @@ export class VideoEventTracker extends EventTracker {
 
       if (normalizedType === VideoAnalyticsEvents.PERCENTAGE_PLAYED) {
         if (!percentages) {
-          user().error(TAG,
-              'video-percentage-played requires percentages spec.');
+          user().error(
+            TAG,
+            'video-percentage-played requires percentages spec.'
+          );
           return;
         }
 
         for (let i = 0; i < percentages.length; i++) {
           const percentage = percentages[i];
 
-          if (percentage <= 0 || (percentage % percentageInterval) != 0) {
-            user().error(TAG,
-                'Percentages must be set in increments of %s with non-zero ' +
-                  'values',
-                percentageInterval);
+          if (percentage <= 0 || percentage % percentageInterval != 0) {
+            user().error(
+              TAG,
+              'Percentages must be set in increments of %s with non-zero ' +
+                'values',
+              percentageInterval
+            );
 
             return;
           }
@@ -1127,7 +1211,7 @@ export class VideoEventTracker extends EventTracker {
         const normalizedPercentageInt = parseInt(normalizedPercentage, 10);
 
         devAssert(isFiniteNumber(normalizedPercentageInt));
-        devAssert((normalizedPercentageInt % percentageInterval) == 0);
+        devAssert(normalizedPercentageInt % percentageInterval == 0);
 
         if (lastPercentage == normalizedPercentageInt) {
           return;
@@ -1148,8 +1232,10 @@ export class VideoEventTracker extends EventTracker {
         return;
       }
 
-      const el = dev().assertElement(event.target,
-          'No target specified by video session event.');
+      const el = dev().assertElement(
+        event.target,
+        'No target specified by video session event.'
+      );
       targetReady.then(target => {
         if (target.contains(el)) {
           listener(new AnalyticsEvent(target, normalizedType, details));
@@ -1159,7 +1245,6 @@ export class VideoEventTracker extends EventTracker {
   }
 }
 
-
 /**
  * Tracks visibility events.
  */
@@ -1175,8 +1260,7 @@ export class VisibilityTracker extends EventTracker {
   }
 
   /** @override */
-  dispose() {
-  }
+  dispose() {}
 
   /** @override */
   add(context, eventType, config, listener) {
@@ -1187,36 +1271,46 @@ export class VisibilityTracker extends EventTracker {
     let createReportReadyPromiseFunc = null;
 
     if (reportWhenSpec) {
-      userAssert(!visibilitySpec['repeat'],
-          'reportWhen and repeat are mutually exclusive.');
+      userAssert(
+        !visibilitySpec['repeat'],
+        'reportWhen and repeat are mutually exclusive.'
+      );
     }
 
     if (eventType == 'hidden') {
       if (reportWhenSpec) {
-        user().error(TAG,
-            'ReportWhen should not be defined when eventType is "hidden"');
+        user().error(
+          TAG,
+          'ReportWhen should not be defined when eventType is "hidden"'
+        );
       }
       // special polyfill for eventType: 'hidden'
       reportWhenSpec = 'documentHidden';
     }
 
-    const visibilityManagerPromise = this.root.isUsingHostAPI()
-        .then(hasHostAPI => {
-          if (hasHostAPI) {
-            this.assertMeasurableWithHostApi_(selector, reportWhenSpec);
-          }
-          return this.root.getVisibilityManager();
-        });
+    const visibilityManagerPromise = this.root
+      .isUsingHostAPI()
+      .then(hasHostAPI => {
+        if (hasHostAPI) {
+          this.assertMeasurableWithHostApi_(selector, reportWhenSpec);
+        }
+        return this.root.getVisibilityManager();
+      });
 
     if (reportWhenSpec == 'documentHidden') {
-      createReportReadyPromiseFunc =
-          this.createReportReadyPromiseForDocumentHidden_.bind(this);
+      createReportReadyPromiseFunc = this.createReportReadyPromiseForDocumentHidden_.bind(
+        this
+      );
     } else if (reportWhenSpec == 'documentExit') {
-      createReportReadyPromiseFunc =
-          this.createReportReadyPromiseForDocumentExit_.bind(this);
+      createReportReadyPromiseFunc = this.createReportReadyPromiseForDocumentExit_.bind(
+        this
+      );
     } else {
-      userAssert(!reportWhenSpec, 'reportWhen value "%s" not supported.',
-          reportWhenSpec);
+      userAssert(
+        !reportWhenSpec,
+        'reportWhen value "%s" not supported.',
+        reportWhenSpec
+      );
     }
 
     let unlistenPromise;
@@ -1224,33 +1318,47 @@ export class VisibilityTracker extends EventTracker {
     if (!selector || selector == ':root' || selector == ':host') {
       // When `selector` is specified, we always use "ini-load" signal as
       // a "ready" signal.
-      unlistenPromise = visibilityManagerPromise.then(visibilityManager => {
-        return visibilityManager.listenRoot(
+      unlistenPromise = visibilityManagerPromise.then(
+        visibilityManager => {
+          return visibilityManager.listenRoot(
             visibilitySpec,
             this.getReadyPromise(waitForSpec, selector),
             createReportReadyPromiseFunc,
             this.onEvent_.bind(
-                this, eventType, listener, this.root.getRootElement()));
-      }, () => {});
+              this,
+              eventType,
+              listener,
+              this.root.getRootElement()
+            )
+          );
+        },
+        () => {}
+      );
     } else {
       // An AMP-element. Wait for DOM to be fully parsed to avoid
       // false missed searches.
-      const selectionMethod = config['selectionMethod'] ||
-          visibilitySpec['selectionMethod'];
-      unlistenPromise = this.root.getAmpElement(
-          (context.parentElement || context),
+      const selectionMethod =
+        config['selectionMethod'] || visibilitySpec['selectionMethod'];
+      unlistenPromise = this.root
+        .getAmpElement(
+          context.parentElement || context,
           selector,
           selectionMethod
-      ).then(element => {
-        return visibilityManagerPromise.then(visibilityManager => {
-          return visibilityManager.listenElement(
-              element,
-              visibilitySpec,
-              this.getReadyPromise(waitForSpec, selector, element),
-              createReportReadyPromiseFunc,
-              this.onEvent_.bind(this, eventType, listener, element));
-        }, () => {});
-      });
+        )
+        .then(element => {
+          return visibilityManagerPromise.then(
+            visibilityManager => {
+              return visibilityManager.listenElement(
+                element,
+                visibilitySpec,
+                this.getReadyPromise(waitForSpec, selector, element),
+                createReportReadyPromiseFunc,
+                this.onEvent_.bind(this, eventType, listener, element)
+              );
+            },
+            () => {}
+          );
+        });
     }
 
     return function() {
@@ -1266,12 +1374,16 @@ export class VisibilityTracker extends EventTracker {
    * @param {string=} reportWhenSpec
    */
   assertMeasurableWithHostApi_(selector, reportWhenSpec) {
-    userAssert(!selector || selector == ':root' || selector == ':host',
-        'Element %s that is not root is not supported with host API',
-        selector);
+    userAssert(
+      !selector || selector == ':root' || selector == ':host',
+      'Element %s that is not root is not supported with host API',
+      selector
+    );
 
-    userAssert(reportWhenSpec !== 'documentExit',
-        'reportWhen : documentExit is not supported with host API');
+    userAssert(
+      reportWhenSpec !== 'documentExit',
+      'reportWhen : documentExit is not supported with host API'
+    );
   }
 
   /**
@@ -1321,10 +1433,13 @@ export class VisibilityTracker extends EventTracker {
     // user presses the home button, uses the OS task switcher to switch to
     // a different app, answers an incoming call, etc.
 
-    win.addEventListener('unload', unloadListener = () => {
-      win.removeEventListener('unload', unloadListener);
-      deferred.resolve();
-    });
+    win.addEventListener(
+      'unload',
+      (unloadListener = () => {
+        win.removeEventListener('unload', unloadListener);
+        deferred.resolve();
+      })
+    );
 
     // Note: pagehide is currently not supported on Opera Mini, nor IE<=10.
     // Documentation conflicts as to whether Safari on iOS will also fire it
@@ -1333,10 +1448,13 @@ export class VisibilityTracker extends EventTracker {
     // Good, but several years old, analysis at:
     // https://www.igvita.com/2015/11/20/dont-lose-user-and-app-state-use-page-visibility/
     // Especially note the event table on this page.
-    win.addEventListener('pagehide', pageHideListener = () => {
-      win.removeEventListener('pagehide', pageHideListener);
-      deferred.resolve();
-    });
+    win.addEventListener(
+      'pagehide',
+      (pageHideListener = () => {
+        win.removeEventListener('pagehide', pageHideListener);
+        deferred.resolve();
+      })
+    );
     return deferred.promise;
   }
 
@@ -1360,12 +1478,15 @@ export class VisibilityTracker extends EventTracker {
     }
 
     const trackerWhitelist = getTrackerTypesForParentType('visible');
-    userAssert(waitForSpec == 'none' ||
-        trackerWhitelist[waitForSpec] !== undefined,
-    'waitFor value %s not supported', waitForSpec);
+    userAssert(
+      waitForSpec == 'none' || trackerWhitelist[waitForSpec] !== undefined,
+      'waitFor value %s not supported',
+      waitForSpec
+    );
 
-    const waitForTracker = this.waitForTrackers_[waitForSpec] ||
-        this.root.getTrackerForWhitelist(waitForSpec, trackerWhitelist);
+    const waitForTracker =
+      this.waitForTrackers_[waitForSpec] ||
+      this.root.getTrackerForWhitelist(waitForSpec, trackerWhitelist);
     if (waitForTracker) {
       this.waitForTrackers_[waitForSpec] = waitForTracker;
     } else {
@@ -1373,8 +1494,8 @@ export class VisibilityTracker extends EventTracker {
     }
 
     // Wait for root signal if there's no element selected.
-    return opt_element ?
-      waitForTracker.getElementSignal(waitForSpec, opt_element)
+    return opt_element
+      ? waitForTracker.getElementSignal(waitForSpec, opt_element)
       : waitForTracker.getRootSignal(waitForSpec);
   }
 
@@ -1387,9 +1508,10 @@ export class VisibilityTracker extends EventTracker {
    */
   onEvent_(eventType, listener, target, state) {
     const attr = getDataParamsFromAttributes(
-        target,
-        /* computeParamNameFunc */ undefined,
-        VARIABLE_DATA_ATTRIBUTE_KEY);
+      target,
+      /* computeParamNameFunc */ undefined,
+      VARIABLE_DATA_ATTRIBUTE_KEY
+    );
     for (const key in attr) {
       state[key] = attr[key];
     }
diff --git a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
index 1b56e46cf615..48d8f238df2c 100644
--- a/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
+++ b/extensions/amp-analytics/0.1/iframe-transport-message-queue.js
@@ -35,7 +35,6 @@ export class IframeTransportMessageQueue {
    * messages to
    */
   constructor(win, frame) {
-
     /** @private {!HTMLIFrameElement} */
     this.frame_ = frame;
 
@@ -49,12 +48,14 @@ export class IframeTransportMessageQueue {
     this.pendingEvents_ = [];
 
     /** @private {!../../../src/iframe-helper.SubscriptionApi} */
-    this.postMessageApi_ = new SubscriptionApi(this.frame_,
-        MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
-        true,
-        () => {
-          this.setIsReady();
-        });
+    this.postMessageApi_ = new SubscriptionApi(
+      this.frame_,
+      MessageType.SEND_IFRAME_TRANSPORT_EVENTS,
+      true,
+      () => {
+        this.setIsReady();
+      }
+    );
   }
 
   /**
@@ -92,13 +93,16 @@ export class IframeTransportMessageQueue {
    * creative) is sending it.
    */
   enqueue(event) {
-    devAssert(event && event.creativeId && event.message,
-        'Attempted to enqueue malformed message for: ' +
-        event.creativeId);
+    devAssert(
+      event && event.creativeId && event.message,
+      'Attempted to enqueue malformed message for: ' + event.creativeId
+    );
     this.pendingEvents_.push(event);
     if (this.queueSize() >= MAX_QUEUE_SIZE_) {
-      dev().warn(TAG_, 'Exceeded maximum size of queue for: ' +
-          event.creativeId);
+      dev().warn(
+        TAG_,
+        'Exceeded maximum size of queue for: ' + event.creativeId
+      );
       this.pendingEvents_.shift();
     }
     this.flushQueue_();
@@ -110,11 +114,12 @@ export class IframeTransportMessageQueue {
    */
   flushQueue_() {
     if (this.isReady() && this.queueSize()) {
-      this.postMessageApi_.send(MessageType.IFRAME_TRANSPORT_EVENTS,
-          /** @type {!JsonObject} */
-          ({events: this.pendingEvents_}));
+      this.postMessageApi_.send(
+        MessageType.IFRAME_TRANSPORT_EVENTS,
+        /** @type {!JsonObject} */
+        ({events: this.pendingEvents_})
+      );
       this.pendingEvents_ = [];
     }
   }
 }
-
diff --git a/extensions/amp-analytics/0.1/iframe-transport.js b/extensions/amp-analytics/0.1/iframe-transport.js
index a3d9e235ec46..4ddfda84a3fa 100644
--- a/extensions/amp-analytics/0.1/iframe-transport.js
+++ b/extensions/amp-analytics/0.1/iframe-transport.js
@@ -46,13 +46,19 @@ export let FrameData;
  * @return {string}
  */
 export function getIframeTransportScriptUrl(ampWin, opt_forceProdUrl) {
-  if ((getMode().localDev || getMode().test) && !opt_forceProdUrl &&
-      ampWin.parent && ampWin.parent.location) {
+  if (
+    (getMode().localDev || getMode().test) &&
+    !opt_forceProdUrl &&
+    ampWin.parent &&
+    ampWin.parent.location
+  ) {
     const loc = ampWin.parent.location;
     return `${loc.protocol}//${loc.host}/dist/iframe-transport-client-lib.js`;
   }
-  return urls.thirdParty +
-      `/${internalRuntimeVersion()}/iframe-transport-client-v0.js`;
+  return (
+    urls.thirdParty +
+    `/${internalRuntimeVersion()}/iframe-transport-client-v0.js`
+  );
 }
 
 /**
@@ -77,8 +83,10 @@ export class IframeTransport {
     /** @private @const {string} */
     this.creativeId_ = id;
 
-    devAssert(config && config['iframe'],
-        'Must supply iframe URL to constructor!');
+    devAssert(
+      config && config['iframe'],
+      'Must supply iframe URL to constructor!'
+    );
     this.frameUrl_ = config['iframe'];
 
     /** @private {number} */
@@ -91,8 +99,10 @@ export class IframeTransport {
    * Called when a Transport instance is being removed from the DOM
    */
   detach() {
-    IframeTransport.markCrossDomainIframeAsDone(this.ampWin_.document,
-        this.type_);
+    IframeTransport.markCrossDomainIframeAsDone(
+      this.ampWin_.document,
+      this.type_
+    );
   }
 
   /**
@@ -103,7 +113,7 @@ export class IframeTransport {
     let frameData;
     if (IframeTransport.hasCrossDomainIframe(this.type_)) {
       frameData = IframeTransport.getFrameData(this.type_);
-      ++(frameData.usageCount);
+      ++frameData.usageCount;
     } else {
       frameData = this.createCrossDomainIframe();
       this.ampWin_.document.body.appendChild(frameData.frame);
@@ -132,26 +142,33 @@ export class IframeTransport {
     // iframeTransport.getCreativeId() -> sentinel relationship is *not*
     // many-to-many.
     const sentinel = IframeTransport.createUniqueId_();
-    const frameName = JSON.stringify(/** @type {JsonObject} */ ({
-      scriptSrc: getIframeTransportScriptUrl(this.ampWin_),
-      sentinel,
-      type: this.type_,
-    }));
-    const frame = createElementWithAttributes(this.ampWin_.document, 'iframe',
-        /** @type {!JsonObject} */ ({
-          sandbox: 'allow-scripts allow-same-origin',
-          name: frameName,
-          'data-amp-3p-sentinel': sentinel,
-        }));
+    const frameName = JSON.stringify(
+      /** @type {JsonObject} */ ({
+        scriptSrc: getIframeTransportScriptUrl(this.ampWin_),
+        sentinel,
+        type: this.type_,
+      })
+    );
+    const frame = createElementWithAttributes(
+      this.ampWin_.document,
+      'iframe',
+      /** @type {!JsonObject} */ ({
+        sandbox: 'allow-scripts allow-same-origin',
+        name: frameName,
+        'data-amp-3p-sentinel': sentinel,
+      })
+    );
     frame.sentinel = sentinel;
     toggle(frame, false);
     frame.src = this.frameUrl_;
-    const frameData = /** @const {FrameData} */ ({
+    const frameData = /** @type {FrameData} */ ({
       frame,
       usageCount: 1,
-      queue: new IframeTransportMessageQueue(this.ampWin_,
-          /** @type {!HTMLIFrameElement} */
-          (frame)),
+      queue: new IframeTransportMessageQueue(
+        this.ampWin_,
+        /** @type {!HTMLIFrameElement} */
+        (frame)
+      ),
     });
     IframeTransport.crossDomainIframes_[this.type_] = frameData;
     return frameData;
@@ -171,24 +188,30 @@ export class IframeTransport {
       return;
     }
     // TODO(jonkeller): Consider merging with jank-meter.js
-    IframeTransport.performanceObservers_[this.type_] =
-        new this.ampWin_.PerformanceObserver(entryList => {
-          if (!entryList) {
-            return;
-          }
-          entryList.getEntries().forEach(entry => {
-            if (entry && entry['entryType'] == 'longtask' &&
-              (entry['name'] == 'cross-origin-descendant') &&
-              entry.attribution) {
-              entry.attribution.forEach(attrib => {
-                if (this.frameUrl_ == attrib['containerSrc'] &&
-                    ++this.numLongTasks_ % LONG_TASK_REPORTING_THRESHOLD == 0) {
-                  user().error(TAG_, `Long Task: Vendor: "${this.type_}"`);
-                }
-              });
+    IframeTransport.performanceObservers_[
+      this.type_
+    ] = new this.ampWin_.PerformanceObserver(entryList => {
+      if (!entryList) {
+        return;
+      }
+      entryList.getEntries().forEach(entry => {
+        if (
+          entry &&
+          entry['entryType'] == 'longtask' &&
+          entry['name'] == 'cross-origin-descendant' &&
+          entry.attribution
+        ) {
+          entry.attribution.forEach(attrib => {
+            if (
+              this.frameUrl_ == attrib['containerSrc'] &&
+              ++this.numLongTasks_ % LONG_TASK_REPORTING_THRESHOLD == 0
+            ) {
+              user().error(TAG_, `Long Task: Vendor: "${this.type_}"`);
             }
           });
-        });
+        }
+      });
+    });
     IframeTransport.performanceObservers_[this.type_].observe({
       entryTypes: ['longtask'],
     });
@@ -204,10 +227,14 @@ export class IframeTransport {
    */
   static markCrossDomainIframeAsDone(ampDoc, type) {
     const frameData = IframeTransport.getFrameData(type);
-    devAssert(frameData && frameData.frame && frameData.usageCount,
-        'Marked the ' + type + ' frame as done, but there is no' +
-        ' record of it existing.');
-    if (--(frameData.usageCount)) {
+    devAssert(
+      frameData && frameData.frame && frameData.usageCount,
+      'Marked the ' +
+        type +
+        ' frame as done, but there is no' +
+        ' record of it existing.'
+    );
+    if (--frameData.usageCount) {
       // Some other instance is still using it
       return;
     }
@@ -236,7 +263,7 @@ export class IframeTransport {
    * @private
    */
   static createUniqueId_() {
-    return String(++(IframeTransport.nextId_));
+    return String(++IframeTransport.nextId_);
   }
 
   /**
@@ -248,14 +275,19 @@ export class IframeTransport {
   sendRequest(event) {
     const frameData = IframeTransport.getFrameData(this.type_);
     devAssert(frameData, 'Trying to send message to non-existent frame');
-    devAssert(frameData.queue,
-        'Event queue is missing for messages from ' + this.type_ +
-        ' to creative ID ' + this.creativeId_);
+    devAssert(
+      frameData.queue,
+      'Event queue is missing for messages from ' +
+        this.type_ +
+        ' to creative ID ' +
+        this.creativeId_
+    );
     frameData.queue.enqueue(
-        /**
-         * @type {!../../../src/3p-frame-messaging.IframeTransportEvent}
-         */
-        ({creativeId: this.creativeId_, message: event}));
+      /**
+       * @type {!../../../src/3p-frame-messaging.IframeTransportEvent}
+       */
+      ({creativeId: this.creativeId_, message: event})
+    );
   }
 
   /**
diff --git a/extensions/amp-analytics/0.1/instrumentation.js b/extensions/amp-analytics/0.1/instrumentation.js
index 116fcffc626c..fd6f7bca566f 100644
--- a/extensions/amp-analytics/0.1/instrumentation.js
+++ b/extensions/amp-analytics/0.1/instrumentation.js
@@ -14,18 +14,10 @@
  * limitations under the License.
  */
 
-import {
-  AmpdocAnalyticsRoot,
-  EmbedAnalyticsRoot,
-} from './analytics-root';
-import {
-  AnalyticsEvent,
-  CustomEventTracker,
-} from './events';
+import {AmpdocAnalyticsRoot, EmbedAnalyticsRoot} from './analytics-root';
+import {AnalyticsEvent, CustomEventTracker} from './events';
 import {AnalyticsGroup} from './analytics-group';
-import {
-  getFriendlyIframeEmbedOptional,
-} from '../../../src/friendly-iframe-embed';
+import {getFriendlyIframeEmbedOptional} from '../../../src/friendly-iframe-embed';
 import {
   getParentWindowFrameElement,
   getServiceForDoc,
@@ -85,8 +77,10 @@ export class InstrumentationService {
     // TODO(dvoytenko): rename to `triggerEvent`.
     const event = new AnalyticsEvent(target, eventType, opt_vars);
     const root = this.findRoot_(target);
-    const tracker = /** @type {!CustomEventTracker} */ (
-      root.getTracker('custom', CustomEventTracker));
+    const tracker = /** @type {!CustomEventTracker} */ (root.getTracker(
+      'custom',
+      CustomEventTracker
+    ));
     tracker.trigger(event);
   }
 
@@ -102,8 +96,11 @@ export class InstrumentationService {
       if (embed) {
         const embedNotNull = embed;
         return this.getOrCreateRoot_(embed, () => {
-          return new EmbedAnalyticsRoot(this.ampdoc, embedNotNull,
-              this.ampdocRoot_);
+          return new EmbedAnalyticsRoot(
+            this.ampdoc,
+            embedNotNull,
+            this.ampdocRoot_
+          );
         });
       }
     }
@@ -127,7 +124,6 @@ export class InstrumentationService {
   }
 }
 
-
 /**
  * It's important to resolve instrumentation asynchronously in elements that
  * depends on it in multi-doc scope. Otherwise an element life-cycle could
@@ -137,8 +133,10 @@ export class InstrumentationService {
  * @return {!Promise<InstrumentationService>}
  */
 export function instrumentationServicePromiseForDoc(elementOrAmpDoc) {
-  return /** @type {!Promise<InstrumentationService>} */ (
-    getServicePromiseForDoc(elementOrAmpDoc, 'amp-analytics-instrumentation'));
+  return /** @type {!Promise<InstrumentationService>} */ (getServicePromiseForDoc(
+    elementOrAmpDoc,
+    'amp-analytics-instrumentation'
+  ));
 }
 
 /**
@@ -147,6 +145,9 @@ export function instrumentationServicePromiseForDoc(elementOrAmpDoc) {
  */
 export function instrumentationServiceForDocForTesting(elementOrAmpDoc) {
   registerServiceBuilderForDoc(
-      elementOrAmpDoc, 'amp-analytics-instrumentation', InstrumentationService);
+    elementOrAmpDoc,
+    'amp-analytics-instrumentation',
+    InstrumentationService
+  );
   return getServiceForDoc(elementOrAmpDoc, 'amp-analytics-instrumentation');
 }
diff --git a/extensions/amp-analytics/0.1/linker-manager.js b/extensions/amp-analytics/0.1/linker-manager.js
index 71aaea7d7237..c04da64803bb 100644
--- a/extensions/amp-analytics/0.1/linker-manager.js
+++ b/extensions/amp-analytics/0.1/linker-manager.js
@@ -32,7 +32,6 @@ const TAG = 'amp-analytics/linker-manager';
 const LINKER_CREATED = 'i-amphtml-linker-created';
 
 export class LinkerManager {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} config
@@ -74,7 +73,6 @@ export class LinkerManager {
     this.variableService_ = variableServiceFor(this.ampdoc_.win);
   }
 
-
   /**
    * Start resolving any macros that may exist in the linker configuration
    * and register the callback with the navigation service. Since macro
@@ -86,7 +84,9 @@ export class LinkerManager {
       return;
     }
 
-    this.config_ = this.processConfig_(/** @type {!JsonObject} */(this.config_));
+    this.config_ = this.processConfig_(
+      /** @type {!JsonObject} */ (this.config_)
+    );
     // Each linker config has it's own set of macros to resolve.
     this.allLinkerPromises_ = Object.keys(this.config_).map(name => {
       const ids = this.config_[name]['ids'];
@@ -94,11 +94,12 @@ export class LinkerManager {
       const keys = Object.keys(ids);
       // Expand the value of each key value pair (if necessary).
       const valuePromises = keys.map(key => {
-        const expansionOptions = new ExpansionOptions(this.vars_,
-            /* opt_iterations */ undefined,
-            /* opt_noencode */ true);
-        return this.expandTemplateWithUrlParams_(ids[key],
-            expansionOptions);
+        const expansionOptions = new ExpansionOptions(
+          this.vars_,
+          /* opt_iterations */ undefined,
+          /* opt_noencode */ true
+        );
+        return this.expandTemplateWithUrlParams_(ids[key], expansionOptions);
       });
 
       return Promise.all(valuePromises).then(values => {
@@ -117,10 +118,11 @@ export class LinkerManager {
     if (this.allLinkerPromises_.length) {
       const navigation = Services.navigationForDoc(this.ampdoc_);
       navigation.registerAnchorMutator(
-          this.handleAnchorMutation_.bind(this), Priority.ANALYTICS_LINKER);
+        this.handleAnchorMutation_.bind(this),
+        Priority.ANALYTICS_LINKER
+      );
     }
 
-
     this.enableFormSupport_();
 
     return Promise.all(this.allLinkerPromises_);
@@ -155,15 +157,16 @@ export class LinkerManager {
     });
 
     const location = WindowInterface.getLocation(this.ampdoc_.win);
-    const isProxyOrigin =
-        this.urlService_.isProxyOrigin(location);
+    const isProxyOrigin = this.urlService_.isProxyOrigin(location);
     linkerNames.forEach(name => {
-      const mergedConfig =
-          Object.assign({}, defaultConfig, config[name]);
+      const mergedConfig = Object.assign({}, defaultConfig, config[name]);
 
       if (mergedConfig['enabled'] !== true) {
-        user().info(TAG, 'linker config for %s is not enabled and ' +
-            'will be ignored.', name);
+        user().info(
+          TAG,
+          'linker config for %s is not enabled and will be ignored.',
+          name
+        );
         return;
       }
 
@@ -172,8 +175,7 @@ export class LinkerManager {
       }
 
       if (!mergedConfig['ids']) {
-        user().error(TAG,
-            '"ids" is a required field for use of "linkers".');
+        user().error(TAG, '"ids" is a required field for use of "linkers".');
         return;
       }
 
@@ -191,14 +193,14 @@ export class LinkerManager {
    */
   expandTemplateWithUrlParams_(template, expansionOptions) {
     const bindings = this.variableService_.getMacros();
-    return this.variableService_.expandTemplate(template, expansionOptions)
-        .then(expanded => {
-          const urlReplacements = Services.urlReplacementsForDoc(this.element_);
-          return urlReplacements.expandUrlAsync(expanded, bindings);
-        });
+    return this.variableService_
+      .expandTemplate(template, expansionOptions)
+      .then(expanded => {
+        const urlReplacements = Services.urlReplacementsForDoc(this.element_);
+        return urlReplacements.expandUrlAsync(expanded, bindings);
+      });
   }
 
-
   /**
    * If the document has existing cid meta tag they do not need to explicity
    * opt-in to use linker.
@@ -206,10 +208,14 @@ export class LinkerManager {
    * @private
    */
   isLegacyOptIn_() {
-    const optInMeta = this.ampdoc_.win.document.head./*OK*/querySelector(
-        'meta[name="amp-google-client-id-api"][content="googleanalytics"]');
-    if (!optInMeta || optInMeta.hasAttribute(LINKER_CREATED) ||
-        this.type_ !== 'googleanalytics') {
+    const optInMeta = this.ampdoc_.win.document.head./*OK*/ querySelector(
+      'meta[name="amp-google-client-id-api"][content="googleanalytics"]'
+    );
+    if (
+      !optInMeta ||
+      optInMeta.hasAttribute(LINKER_CREATED) ||
+      this.type_ !== 'googleanalytics'
+    ) {
       return false;
     }
 
@@ -224,7 +230,7 @@ export class LinkerManager {
    */
   isSafari12OrAbove_() {
     const platform = Services.platformFor(this.ampdoc_.win);
-    return platform.isSafari() && (platform.getMajorVersion() >= 12);
+    return platform.isSafari() && platform.getMajorVersion() >= 12;
   }
 
   /**
@@ -249,7 +255,6 @@ export class LinkerManager {
     }
   }
 
-
   /**
    * Appends the linker param if the given url falls within rules defined in
    * linker configuration.
@@ -264,8 +269,10 @@ export class LinkerManager {
     const /** @type {Array} */ domains = config['destinationDomains'];
 
     if (this.isDomainMatch_(hostname, name, domains)) {
-      const linkerValue = createLinker(/* version */ '1',
-          this.resolvedIds_[name]);
+      const linkerValue = createLinker(
+        /* version */ '1',
+        this.resolvedIds_[name]
+      );
       if (linkerValue) {
         const params = dict();
         params[name] = linkerValue;
@@ -311,12 +318,13 @@ export class LinkerManager {
       return false;
     }
 
-    const {sourceUrl, canonicalUrl} =
-        Services.documentInfoForDoc(this.ampdoc_);
+    const {sourceUrl, canonicalUrl} = Services.documentInfoForDoc(this.ampdoc_);
     const sourceOrigin = this.urlService_.parse(sourceUrl).hostname;
     const canonicalOrigin = this.urlService_.parse(canonicalUrl).hostname;
-    if (!areFriendlyDomains(sourceOrigin, hostname)
-        && !areFriendlyDomains(canonicalOrigin, hostname)) {
+    if (
+      !areFriendlyDomains(sourceOrigin, hostname) &&
+      !areFriendlyDomains(canonicalOrigin, hostname)
+    ) {
       return false;
     }
     return true;
@@ -331,8 +339,9 @@ export class LinkerManager {
     }
 
     this.formSubmitService_.then(formService => {
-      this.formSubmitUnlistener_ =
-          formService.beforeSubmit(this.handleFormSubmit_.bind(this));
+      this.formSubmitUnlistener_ = formService.beforeSubmit(
+        this.handleFormSubmit_.bind(this)
+      );
     });
   }
 
@@ -348,8 +357,8 @@ export class LinkerManager {
       const config = this.config_[linkerName];
       const /** @type {Array} */ domains = config['destinationDomains'];
 
-      const url = form.getAttribute('action-xhr') ||
-          form.getAttribute('action');
+      const url =
+        form.getAttribute('action-xhr') || form.getAttribute('action');
       const {hostname} = this.urlService_.parse(url);
 
       if (this.isDomainMatch_(hostname, linkerName, domains)) {
@@ -358,7 +367,6 @@ export class LinkerManager {
     }
   }
 
-
   /**
    * Add the linker data to form. If action-xhr is present we can update the
    * action-xhr, if not we fallback to adding hidden inputs.
@@ -403,8 +411,10 @@ export class LinkerManager {
     });
 
     const inputEl = createElementWithAttributes(
-        /** @type {!Document} */ (form.ownerDocument),
-        'input', attrs);
+      /** @type {!Document} */ (form.ownerDocument),
+      'input',
+      attrs
+    );
     form.appendChild(inputEl);
   }
 }
@@ -446,15 +456,15 @@ function regexEscape(str) {
 }
 
 /**
-   * Allows specified wildcard matching of domains.
-   * Example:
-   *    `*.foo.com` matches `amp.foo.com`
-   *    `*.foo.com*` matches `amp.foo.com.uk`
-   * @param {string} hostname
-   * @param {string} domain
-   * @return {boolean}
-   * @visibleForTesting
-   */
+ * Allows specified wildcard matching of domains.
+ * Example:
+ *    `*.foo.com` matches `amp.foo.com`
+ *    `*.foo.com*` matches `amp.foo.com.uk`
+ * @param {string} hostname
+ * @param {string} domain
+ * @return {boolean}
+ * @visibleForTesting
+ */
 export function isWildCardMatch(hostname, domain) {
   const escaped = regexEscape(domain);
   const regex = escaped.replace(/\*/g, '.*');
diff --git a/extensions/amp-analytics/0.1/linker-reader.js b/extensions/amp-analytics/0.1/linker-reader.js
index 0918a327d42d..d562effaeeeb 100644
--- a/extensions/amp-analytics/0.1/linker-reader.js
+++ b/extensions/amp-analytics/0.1/linker-reader.js
@@ -27,9 +27,7 @@ import {user} from '../../../src/log';
 
 const TAG = 'amp-analytics/linker-reader';
 
-
 export class LinkerReader {
-
   /**
    * @param {!Window} win
    */
@@ -83,7 +81,6 @@ export class LinkerReader {
     return parseLinker(value);
   }
 
-
   /**
    * Remove the linker param from the current url
    * @param {!Location} url
@@ -96,8 +93,11 @@ export class LinkerReader {
     }
     const searchUrl = url.search;
     const removedLinkerParamSearchUrl = removeParamsFromSearch(searchUrl, name);
-    const newHref = url.origin + url.pathname +
-        removedLinkerParamSearchUrl + (url.hash || '');
+    const newHref =
+      url.origin +
+      url.pathname +
+      removedLinkerParamSearchUrl +
+      (url.hash || '');
     this.win_.history.replaceState(null, '', newHref);
   }
 }
@@ -106,8 +106,7 @@ export class LinkerReader {
  * @param {!Window} win
  */
 export function installLinkerReaderService(win) {
-  registerServiceBuilder(win, 'amp-analytics-linker-reader',
-      LinkerReader);
+  registerServiceBuilder(win, 'amp-analytics-linker-reader', LinkerReader);
 }
 
 /**
diff --git a/extensions/amp-analytics/0.1/linker.js b/extensions/amp-analytics/0.1/linker.js
index 7fbef5c1a3e4..6a88171fd249 100644
--- a/extensions/amp-analytics/0.1/linker.js
+++ b/extensions/amp-analytics/0.1/linker.js
@@ -29,7 +29,6 @@ const CHECKSUM_OFFSET_MAX_MIN = 1;
 const VALID_VERSION = 1;
 const TAG = 'amp-analytics/linker';
 
-
 /**
  * Creates the linker string, in the format of
  * <version>*<checksum>*<serializedIds>
@@ -133,7 +132,6 @@ function getCheckSum(serializedIds, opt_offsetMin) {
   return crc.toString(36);
 }
 
-
 /**
  * Generates a semi-unique value for page visitor.
  * @return {string}
@@ -143,11 +141,11 @@ function getFingerprint() {
   const timezone = date.getTimezoneOffset();
 
   const language = WindowInterface.getUserLanguage(window);
-  return [WindowInterface.getUserAgent(window), timezone, language]
-      .join(DELIMITER);
+  return [WindowInterface.getUserAgent(window), timezone, language].join(
+    DELIMITER
+  );
 }
 
-
 /**
  * Encode all values & join them together
  * @param {!Object} pairs
@@ -158,15 +156,15 @@ function serialize(pairs) {
     return '';
   }
   return Object.keys(pairs)
-      .filter(key => {
-        const valid = KEY_VALIDATOR.test(key);
-        if (!valid) {
-          user().error(TAG, 'Invalid linker key: ' + key);
-        }
-        return valid;
-      })
-      .map(key => key + DELIMITER + encode(pairs[key]))
-      .join(DELIMITER);
+    .filter(key => {
+      const valid = KEY_VALIDATOR.test(key);
+      if (!valid) {
+        user().error(TAG, 'Invalid linker key: ' + key);
+      }
+      return valid;
+    })
+    .map(key => key + DELIMITER + encode(pairs[key]))
+    .join(DELIMITER);
 }
 
 /**
@@ -199,7 +197,6 @@ function getMinSinceEpoch() {
   return Math.floor(Date.now() / 60000);
 }
 
-
 /**
  * Function that encodesURIComponent but also tilde, since we are using it as
  * our delimiter.
diff --git a/extensions/amp-analytics/0.1/opacity.js b/extensions/amp-analytics/0.1/opacity.js
index c36b15790827..7afa32e42b43 100644
--- a/extensions/amp-analytics/0.1/opacity.js
+++ b/extensions/amp-analytics/0.1/opacity.js
@@ -16,12 +16,11 @@
 
 import {computedStyle} from '../../../src/style';
 
-
 /**
-  *  Returns the min opacity found amongst the element and its ancestors
-  *  @param {!Element|null} el
-  *  @return {number} minimum opacity value
-  */
+ *  Returns the min opacity found amongst the element and its ancestors
+ *  @param {!Element|null} el
+ *  @return {number} minimum opacity value
+ */
 export function getMinOpacity(el) {
   const parentNodeTree = getElementNodeTree(el.parentElement);
   parentNodeTree.push(el);
@@ -32,52 +31,56 @@ export function getMinOpacity(el) {
     const node = parentNodeTree[i];
     opacity = getElementOpacity(node);
 
-    if (opacity < minOpacityFound) { minOpacityFound = opacity; }
-
-    if (minOpacityFound === 0) { return minOpacityFound; }
+    if (opacity < minOpacityFound) {
+      minOpacityFound = opacity;
+    }
 
+    if (minOpacityFound === 0) {
+      return minOpacityFound;
+    }
   }
 
   return minOpacityFound;
-
 }
 
 /**
-  * Returns the Opacity value of the element.
-  * @param {!Element} el
-  * @return {number}
-  */
+ * Returns the Opacity value of the element.
+ * @param {!Element} el
+ * @return {number}
+ */
 function getElementOpacity(el) {
   const win = window;
   const fullyVisibleValue = 1;
   const fullyHiddenValue = 0;
 
-  if (!el) { return fullyVisibleValue; }
+  if (!el) {
+    return fullyVisibleValue;
+  }
   const {visibility, opacity} = computedStyle(win, el);
 
   if (visibility === 'hidden') {
     return fullyHiddenValue;
-
   }
-  const opacityValue = (opacity === '')
-    ? fullyVisibleValue
-    : parseFloat(opacity);
+  const opacityValue = opacity === '' ? fullyVisibleValue : parseFloat(opacity);
 
-  if (isNaN(opacityValue)) { return fullyVisibleValue; }
+  if (isNaN(opacityValue)) {
+    return fullyVisibleValue;
+  }
 
   return opacityValue;
-
 }
 
 /**
-  * Returns the node tree of the current element starting from
-  * the document root
-  * @param {!Element|null} el
-  * @return {Array} node list of the element's node tree
-  */
+ * Returns the node tree of the current element starting from
+ * the document root
+ * @param {!Element|null} el
+ * @return {Array} node list of the element's node tree
+ */
 function getElementNodeTree(el) {
   const nodeList = [];
-  if (!el) { return nodeList; }
+  if (!el) {
+    return nodeList;
+  }
 
   const CAP = 50;
   const DOCUMENT_NODE_TYPE = 9;
@@ -87,26 +90,24 @@ function getElementNodeTree(el) {
   nodeList.push(element);
 
   for (let i = 0; i < CAP; i++) {
-
     parent = element.parentNode || element.parentElement;
 
     if (parent && parent.nodeType == ELEMENT_WITH_PARENT_TYPE) {
       element = parent;
       nodeList.push(element);
-
     } else if (parent && parent.nodeType == DOCUMENT_NODE_TYPE) {
       parent = element.ownerDocument.defaultView.frameElement;
 
       if (parent && parent.nodeType == ELEMENT_WITH_PARENT_TYPE) {
         element = parent;
         nodeList.push(element);
-
-      } else { break; }
-
-    } else { break; }
-
+      } else {
+        break;
+      }
+    } else {
+      break;
+    }
   }
 
   return nodeList;
-
 }
diff --git a/extensions/amp-analytics/0.1/requests.js b/extensions/amp-analytics/0.1/requests.js
index 34d45fce50df..7599662043bb 100644
--- a/extensions/amp-analytics/0.1/requests.js
+++ b/extensions/amp-analytics/0.1/requests.js
@@ -38,7 +38,6 @@ export class RequestHandler {
    * @param {boolean} isSandbox
    */
   constructor(element, request, preconnect, transport, isSandbox) {
-
     /** @const {!Element} */
     this.element_ = element;
 
@@ -114,7 +113,7 @@ export class RequestHandler {
    * @param {!./variables.ExpansionOptions} expansionOption
    */
   send(configParams, trigger, expansionOption) {
-    const isImportant = (trigger['important'] === true);
+    const isImportant = trigger['important'] === true;
     if (!this.reportRequest_ && !isImportant) {
       // Ignore non important trigger out reportWindow
       return;
@@ -124,33 +123,45 @@ export class RequestHandler {
     this.lastTrigger_ = trigger;
     const bindings = this.variableService_.getMacros();
     bindings['RESOURCE_TIMING'] = getResourceTiming(
-        this.win, trigger['resourceTimingSpec'], this.startTime_);
+      this.win,
+      trigger['resourceTimingSpec'],
+      this.startTime_
+    );
     // TODO: (@zhouyx) Move to variable service once that becomes
     // a doc level services
     bindings['CONSENT_STATE'] = getConsentStateStr(this.element_);
 
     if (!this.baseUrlPromise_) {
       expansionOption.freezeVar('extraUrlParams');
-      this.baseUrlTemplatePromise_ =
-          this.variableService_.expandTemplate(this.baseUrl, expansionOption);
+      this.baseUrlTemplatePromise_ = this.variableService_.expandTemplate(
+        this.baseUrl,
+        expansionOption
+      );
       this.baseUrlPromise_ = this.baseUrlTemplatePromise_.then(baseUrl => {
         return this.urlReplacementService_.expandUrlAsync(
-            baseUrl, bindings, this.whiteList_);
+          baseUrl,
+          bindings,
+          this.whiteList_
+        );
       });
     }
 
     const params = Object.assign({}, configParams, trigger['extraUrlParams']);
     const timestamp = this.win.Date.now();
     const batchSegmentPromise = expandExtraUrlParams(
-        this.variableService_, this.urlReplacementService_, params,
-        expansionOption, bindings, this.whiteList_)
-        .then(params => {
-          return dict({
-            'trigger': trigger['on'],
-            'timestamp': timestamp,
-            'extraUrlParams': params,
-          });
-        });
+      this.variableService_,
+      this.urlReplacementService_,
+      params,
+      expansionOption,
+      bindings,
+      this.whiteList_
+    ).then(params => {
+      return dict({
+        'trigger': trigger['on'],
+        'timestamp': timestamp,
+        'extraUrlParams': params,
+      });
+    });
     this.batchSegmentPromises_.push(batchSegmentPromise);
     this.trigger_(isImportant || !this.batchInterval_);
   }
@@ -205,23 +216,29 @@ export class RequestHandler {
 
     baseUrlTemplatePromise.then(preUrl => {
       this.preconnect_.url(preUrl, true);
-      Promise.all(
-          [baseUrlPromise, Promise.all(segmentPromises)]).then(results => {
-        const baseUrl = results[0];
-        const batchSegments = results[1];
-        if (batchSegments.length === 0) {
-          return;
+      Promise.all([baseUrlPromise, Promise.all(segmentPromises)]).then(
+        results => {
+          const baseUrl = results[0];
+          const batchSegments = results[1];
+          if (batchSegments.length === 0) {
+            return;
+          }
+          // TODO: iframePing will not work with batch. Add a config validation.
+          if (trigger['iframePing']) {
+            userAssert(
+              trigger['on'] == 'visible',
+              'iframePing is only available on page view requests.'
+            );
+            this.transport_.sendRequestUsingIframe(baseUrl, batchSegments[0]);
+          } else {
+            this.transport_.sendRequest(
+              baseUrl,
+              batchSegments,
+              !!this.batchInterval_
+            );
+          }
         }
-        // TODO: iframePing will not work with batch. Add a config validation.
-        if (trigger['iframePing']) {
-          userAssert(trigger['on'] == 'visible',
-              'iframePing is only available on page view requests.');
-          this.transport_.sendRequestUsingIframe(baseUrl, batchSegments[0]);
-        } else {
-          this.transport_.sendRequest(
-              baseUrl, batchSegments, !!this.batchInterval_);
-        }
-      });
+      );
     });
   }
 
@@ -245,18 +262,25 @@ export class RequestHandler {
       return;
     }
 
-    this.batchInterval_ = isArray(this.batchInterval_) ?
-      this.batchInterval_ : [this.batchInterval_];
+    this.batchInterval_ = isArray(this.batchInterval_)
+      ? this.batchInterval_
+      : [this.batchInterval_];
 
     for (let i = 0; i < this.batchInterval_.length; i++) {
       let interval = this.batchInterval_[i];
-      userAssert(isFiniteNumber(interval),
-          'Invalid batchInterval value: %s', this.batchInterval_);
+      userAssert(
+        isFiniteNumber(interval),
+        'Invalid batchInterval value: %s',
+        this.batchInterval_
+      );
       interval = Number(interval) * 1000;
-      userAssert(interval >= BATCH_INTERVAL_MIN,
-          'Invalid batchInterval value: %s, ' +
+      userAssert(
+        interval >= BATCH_INTERVAL_MIN,
+        'Invalid batchInterval value: %s, ' +
           'interval value must be greater than %s ms.',
-          this.batchInterval_, BATCH_INTERVAL_MIN);
+        this.batchInterval_,
+        BATCH_INTERVAL_MIN
+      );
       this.batchInterval_[i] = interval;
     }
 
@@ -287,11 +311,14 @@ export class RequestHandler {
    * Schedule sending request regarding to batchInterval
    */
   refreshBatchInterval_() {
-    devAssert(this.batchIntervalPointer_ != null,
-        'Should not start batchInterval without pointer');
-    const interval = this.batchIntervalPointer_ < this.batchInterval_.length ?
-      this.batchInterval_[this.batchIntervalPointer_++] :
-      this.batchInterval_[this.batchInterval_.length - 1];
+    devAssert(
+      this.batchIntervalPointer_ != null,
+      'Should not start batchInterval without pointer'
+    );
+    const interval =
+      this.batchIntervalPointer_ < this.batchInterval_.length
+        ? this.batchInterval_[this.batchIntervalPointer_++]
+        : this.batchInterval_[this.batchInterval_.length - 1];
 
     this.batchIntervalTimeoutId_ = this.win.setTimeout(() => {
       this.trigger_(true);
@@ -311,18 +338,24 @@ export class RequestHandler {
  * @return {Promise<string>}
  */
 export function expandPostMessage(
-  ampdoc, msg, configParams, trigger, expansionOption, element)
-{
+  ampdoc,
+  msg,
+  configParams,
+  trigger,
+  expansionOption,
+  element
+) {
   const variableService = variableServiceFor(ampdoc.win);
   const urlReplacementService = Services.urlReplacementsForDoc(element);
 
   const bindings = variableService.getMacros();
   expansionOption.freezeVar('extraUrlParams');
 
-  const basePromise = variableService.expandTemplate(
-      msg, expansionOption).then(base => {
-    return urlReplacementService.expandStringAsync(base, bindings);
-  });
+  const basePromise = variableService
+    .expandTemplate(msg, expansionOption)
+    .then(base => {
+      return urlReplacementService.expandStringAsync(base, bindings);
+    });
   if (msg.indexOf('${extraUrlParams}') < 0) {
     // No need to append extraUrlParams
     return basePromise;
@@ -331,13 +364,17 @@ export function expandPostMessage(
   return basePromise.then(expandedMsg => {
     const params = Object.assign({}, configParams, trigger['extraUrlParams']);
     //return base url with the appended extra url params;
-    return expandExtraUrlParams(variableService, urlReplacementService, params,
-        expansionOption, bindings)
-        .then(extraUrlParams => {
-          return defaultSerializer(expandedMsg, [
-            dict({'extraUrlParams': extraUrlParams}),
-          ]);
-        });
+    return expandExtraUrlParams(
+      variableService,
+      urlReplacementService,
+      params,
+      expansionOption,
+      bindings
+    ).then(extraUrlParams => {
+      return defaultSerializer(expandedMsg, [
+        dict({'extraUrlParams': extraUrlParams}),
+      ]);
+    });
   });
 }
 
@@ -352,26 +389,33 @@ export function expandPostMessage(
  * @return {!Promise<!Object>}
  * @private
  */
-function expandExtraUrlParams(variableService, urlReplacements, params,
-  expansionOption, bindings, opt_whitelist)
-{
+function expandExtraUrlParams(
+  variableService,
+  urlReplacements,
+  params,
+  expansionOption,
+  bindings,
+  opt_whitelist
+) {
   const requestPromises = [];
   // Don't encode param values here,
   // as we'll do it later in the getExtraUrlParamsString call.
   const option = new ExpansionOptions(
-      expansionOption.vars,
-      expansionOption.iterations,
-      true /* noEncode */);
+    expansionOption.vars,
+    expansionOption.iterations,
+    true /* noEncode */
+  );
 
   const expandObject = (params, key) => {
     const value = params[key];
 
     if (typeof value === 'string') {
-      const request = variableService.expandTemplate(value, option)
-          .then(value =>
-            urlReplacements.expandStringAsync(
-                value, bindings, opt_whitelist))
-          .then(value => params[key] = value);
+      const request = variableService
+        .expandTemplate(value, option)
+        .then(value =>
+          urlReplacements.expandStringAsync(value, bindings, opt_whitelist)
+        )
+        .then(value => (params[key] = value));
       requestPromises.push(request);
     } else if (isArray(value)) {
       value.forEach((_, index) => expandObject(value, index));
@@ -380,9 +424,7 @@ function expandExtraUrlParams(variableService, urlReplacements, params,
     }
   };
 
-  Object.keys(params).forEach(key =>
-    expandObject(params, key)
-  );
+  Object.keys(params).forEach(key => expandObject(params, key));
 
   return Promise.all(requestPromises).then(() => params);
 }
diff --git a/extensions/amp-analytics/0.1/resource-timing.js b/extensions/amp-analytics/0.1/resource-timing.js
index 8fedebdb6af1..cf4327548114 100644
--- a/extensions/amp-analytics/0.1/resource-timing.js
+++ b/extensions/amp-analytics/0.1/resource-timing.js
@@ -83,23 +83,32 @@ function validateResourceTimingSpec(spec) {
     user().warn('ANALYTICS', 'resourceTimingSpec missing "resources" field');
     return false;
   }
-  if (!spec['encoding'] || !spec['encoding']['entry'] ||
-      !spec['encoding']['delim']) {
+  if (
+    !spec['encoding'] ||
+    !spec['encoding']['entry'] ||
+    !spec['encoding']['delim']
+  ) {
     user().warn(
-        'ANALYTICS',
-        'resourceTimingSpec is missing or has incomplete encoding options');
+      'ANALYTICS',
+      'resourceTimingSpec is missing or has incomplete encoding options'
+    );
     return false;
   }
   if (spec['encoding']['base'] < 2 || spec['encoding']['base'] > 36) {
     user().warn(
-        'ANALYTICS',
-        'resource timing variables only supports bases between 2 and 36');
+      'ANALYTICS',
+      'resource timing variables only supports bases between 2 and 36'
+    );
     return false;
   }
-  if (spec['responseAfter'] != null &&
-      typeof spec['responseAfter'] != 'number') {
+  if (
+    spec['responseAfter'] != null &&
+    typeof spec['responseAfter'] != 'number'
+  ) {
     user().warn(
-        'ANALYTICS', 'resourceTimingSpec["responseAfter"] must be a number');
+      'ANALYTICS',
+      'resourceTimingSpec["responseAfter"] must be a number'
+    );
     return false;
   }
   return true;
@@ -111,8 +120,9 @@ function validateResourceTimingSpec(spec) {
  * @return {!Array<!PerformanceResourceTiming>}
  */
 function getResourceTimingEntries(win) {
-  return /** @type {!Array<!PerformanceResourceTiming>} */ (
-    win.performance.getEntriesByType('resource'));
+  return /** @type {!Array<!PerformanceResourceTiming>} */ (win.performance.getEntriesByType(
+    'resource'
+  ));
 }
 
 /**
@@ -160,9 +170,10 @@ function nameForEntry(entry, resourcesByHost) {
       continue;
     }
     const index = findIndex(
-        resources,
-        res => res.pathPattern.test(url.pathname) &&
-            res.queryPattern.test(url.search));
+      resources,
+      res =>
+        res.pathPattern.test(url.pathname) && res.queryPattern.test(url.search)
+    );
     if (index != -1) {
       return resources[index].name;
     }
@@ -244,12 +255,11 @@ function serialize(entries, resourceTimingSpec, win) {
   const format = (val, relativeTo = 0) =>
     Math.round(val - relativeTo).toString(encoding['base'] || 10);
 
-  const promises =
-      filterEntries(entries, resources)
-          .map(({entry, name}) => entryToExpansionOptions(entry, name, format))
-          .map(
-              expansion =>
-                variableService.expandTemplate(encoding['entry'], expansion));
+  const promises = filterEntries(entries, resources)
+    .map(({entry, name}) => entryToExpansionOptions(entry, name, format))
+    .map(expansion =>
+      variableService.expandTemplate(encoding['entry'], expansion)
+    );
   return Promise.all(promises).then(vars => vars.join(encoding['delim']));
 }
 
@@ -262,9 +272,13 @@ function serialize(entries, resourceTimingSpec, win) {
 function serializeResourceTiming(win, resourceTimingSpec) {
   // Check that the performance timing API exists before and that the spec is
   // valid before proceeding. If not, we simply return an empty string.
-  if (resourceTimingSpec['done'] || !win.performance || !win.performance.now ||
-      !win.performance.getEntriesByType ||
-      !validateResourceTimingSpec(resourceTimingSpec)) {
+  if (
+    resourceTimingSpec['done'] ||
+    !win.performance ||
+    !win.performance.now ||
+    !win.performance.getEntriesByType ||
+    !validateResourceTimingSpec(resourceTimingSpec)
+  ) {
     resourceTimingSpec['done'] = true;
     return Promise.resolve('');
   }
@@ -278,8 +292,10 @@ function serializeResourceTiming(win, resourceTimingSpec) {
   const responseAfter = resourceTimingSpec['responseAfter'] || 0;
   // Update responseAfter for next time to avoid reporting the same resource
   // multiple times.
-  resourceTimingSpec['responseAfter'] =
-      Math.max(responseAfter, win.performance.now());
+  resourceTimingSpec['responseAfter'] = Math.max(
+    responseAfter,
+    win.performance.now()
+  );
 
   // Filter resources that are too early.
   entries = entries.filter(e => e.startTime + e.duration >= responseAfter);
@@ -298,7 +314,7 @@ function serializeResourceTiming(win, resourceTimingSpec) {
  */
 export function getResourceTiming(win, spec, startTime) {
   // Only allow collecting timing within 1s
-  if (spec && (Date.now() < (startTime + 60 * 1000))) {
+  if (spec && Date.now() < startTime + 60 * 1000) {
     return serializeResourceTiming(win, spec);
   } else {
     return Promise.resolve('');
diff --git a/extensions/amp-analytics/0.1/scroll-manager.js b/extensions/amp-analytics/0.1/scroll-manager.js
index fcdacdc5f45a..1fa93202ae9b 100644
--- a/extensions/amp-analytics/0.1/scroll-manager.js
+++ b/extensions/amp-analytics/0.1/scroll-manager.js
@@ -40,7 +40,6 @@ export class ScrollManager {
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
   constructor(ampdoc) {
-
     /** @const @private {!../../../src/service/viewport/viewport-impl.Viewport} */
     this.viewport_ = Services.viewportForDoc(ampdoc);
 
@@ -75,7 +74,6 @@ export class ScrollManager {
    * @return {!UnlistenDef}
    */
   addScrollHandler(handler) {
-
     // Trigger an event to fire events that might have already happened.
     const size = this.viewport_.getSize();
     /** {./scroll-manager.ScrollEventDef} */
@@ -109,7 +107,6 @@ export class ScrollManager {
       height: e.height,
       scrollWidth: this.viewport_.getScrollWidth(),
       scrollHeight: this.viewport_.getScrollHeight(),
-
     };
     // Fire all of our children scroll observables
     this.scrollObservable_.fire(scrollEvent);
@@ -131,9 +128,8 @@ export class ScrollManager {
    * @private
    */
   addViewportOnChangedListener_() {
-    this.viewportOnChangedUnlistener_ =
-      this.viewport_.onChanged(this.onScroll_.bind(this));
+    this.viewportOnChangedUnlistener_ = this.viewport_.onChanged(
+      this.onScroll_.bind(this)
+    );
   }
-
 }
-
diff --git a/extensions/amp-analytics/0.1/test/test-amp-analytics.js b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
index 19a6deebc46a..9a3068b2492c 100644
--- a/extensions/amp-analytics/0.1/test/test-amp-analytics.js
+++ b/extensions/amp-analytics/0.1/test/test-amp-analytics.js
@@ -16,10 +16,7 @@
 
 import {AmpAnalytics} from '../amp-analytics';
 import {AnalyticsConfig} from '../config';
-import {
-  ClickEventTracker,
-  VisibilityTracker,
-} from '../events';
+import {ClickEventTracker, VisibilityTracker} from '../events';
 import {
   ImagePixelVerifier,
   mockWindowInterface,
@@ -28,717 +25,799 @@ import {LayoutPriority} from '../../../../src/layout';
 import {LinkerManager} from '../linker-manager';
 import {Services} from '../../../../src/services';
 import {Transport} from '../transport';
-import {cidServiceForDocForTesting} from
-  '../../../../src/service/cid-impl';
+import {cidServiceForDocForTesting} from '../../../../src/service/cid-impl';
 import {
   getService,
   registerServiceBuilder,
   resetServiceForTesting,
 } from '../../../../src/service';
 import {installCryptoService} from '../../../../src/service/crypto-impl';
-import {
-  installUserNotificationManagerForTesting,
-} from '../../../amp-user-notification/0.1/amp-user-notification';
+import {installUserNotificationManagerForTesting} from '../../../amp-user-notification/0.1/amp-user-notification';
 import {instrumentationServiceForDocForTesting} from '../instrumentation';
 
-describes.realWin('amp-analytics', {
-  amp: {
-    extensions: ['amp-analytics'],
+describes.realWin(
+  'amp-analytics',
+  {
+    amp: {
+      extensions: ['amp-analytics'],
+    },
   },
-}, function(env) {
-  let win, doc, sandbox;
-  let configWithCredentials;
-  let uidService;
-  let crypto;
-  let ampdoc;
-  let ins;
-  let viewer;
-  let jsonRequestConfigs = {};
-  let requestVerifier;
-
-  const jsonMockResponses = {
-    '//invalidConfig': '{"transport": {"iframe": "fake.com"}}',
-    '//config1': '{"vars": {"title": "remote"}}',
-    'https://foo/Test%20Title': '{"vars": {"title": "magic"}}',
-    '//config-rv2': '{"requests": {"foo": "https://example.com/remote"}}',
-    'https://rewriter.com': '{"vars": {"title": "rewritten"}}',
-  };
-  const trivialConfig = {
-    'requests': {'foo': 'https://example.com/bar'},
-    'triggers': {'pageview': {'on': 'visible', 'request': 'foo'}},
-  };
-
-  const noTriggersError = '[AmpAnalytics <unknown id>] No triggers were ' +
+  function(env) {
+    let win, doc, sandbox;
+    let configWithCredentials;
+    let uidService;
+    let crypto;
+    let ampdoc;
+    let ins;
+    let viewer;
+    let jsonRequestConfigs = {};
+    let requestVerifier;
+
+    const jsonMockResponses = {
+      '//invalidConfig': '{"transport": {"iframe": "fake.com"}}',
+      '//config1': '{"vars": {"title": "remote"}}',
+      'https://foo/Test%20Title': '{"vars": {"title": "magic"}}',
+      '//config-rv2': '{"requests": {"foo": "https://example.com/remote"}}',
+      'https://rewriter.com': '{"vars": {"title": "rewritten"}}',
+    };
+    const trivialConfig = {
+      'requests': {'foo': 'https://example.com/bar'},
+      'triggers': {'pageview': {'on': 'visible', 'request': 'foo'}},
+    };
+
+    const noTriggersError =
+      '[AmpAnalytics <unknown id>] No triggers were ' +
       'found in the config. No analytics data will be sent.';
-  const noRequestStringsError = '[AmpAnalytics <unknown id>] No request ' +
+    const noRequestStringsError =
+      '[AmpAnalytics <unknown id>] No request ' +
       'strings defined. Analytics data will not be sent from this page.';
-  const oneScriptChildError = '[AmpAnalytics <unknown id>] The tag should ' +
+    const oneScriptChildError =
+      '[AmpAnalytics <unknown id>] The tag should ' +
       'contain only one <script> child.';
-  const scriptTypeError = '[AmpAnalytics <unknown id>] ' +
+    const scriptTypeError =
+      '[AmpAnalytics <unknown id>] ' +
       '<script> child must have type="application/json"';
-  const configParseError = '[AmpAnalytics <unknown id>] Failed to ' +
+    const configParseError =
+      '[AmpAnalytics <unknown id>] Failed to ' +
       'parse <script> contents. Is it valid JSON?';
-  const onAndRequestAttributesError = '[AmpAnalytics <unknown id>] "on" and ' +
+    const onAndRequestAttributesError =
+      '[AmpAnalytics <unknown id>] "on" and ' +
       '"request" attributes are required for data to be collected.';
-  const onAndRequestAttributesInaboxError = '[AmpAnalytics <unknown id>] ' +
+    const onAndRequestAttributesInaboxError =
+      '[AmpAnalytics <unknown id>] ' +
       '"on" and "request"/"parentPostMessage" ' +
       'attributes are required for data to be collected.';
-  const invalidThresholdForSamplingError =
+    const invalidThresholdForSamplingError =
       '[AmpAnalytics <unknown id>] Invalid threshold for sampling.';
-  const clickTrackerNotSupportedError = '[AmpAnalytics <unknown id>] click ' +
+    const clickTrackerNotSupportedError =
+      '[AmpAnalytics <unknown id>] click ' +
       'is not supported for amp-analytics in scope';
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    sandbox = env.sandbox;
-    ampdoc = env.ampdoc;
-    configWithCredentials = false;
-    doc.title = 'Test Title';
-    resetServiceForTesting(win, 'xhr');
-    jsonRequestConfigs = {};
-    registerServiceBuilder(win, 'xhr', function() {
-      return {fetchJson: (url, init) => {
-        jsonRequestConfigs[url] = init;
-        expect(init.requireAmpResponseSourceOrigin).to.be.false;
-        if (configWithCredentials) {
-          expect(init.credentials).to.equal('include');
-        } else {
-          expect(init.credentials).to.undefined;
-        }
-        return Promise.resolve({
-          json() {
-            return Promise.resolve(JSON.parse(jsonMockResponses[url]));
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      sandbox = env.sandbox;
+      ampdoc = env.ampdoc;
+      configWithCredentials = false;
+      doc.title = 'Test Title';
+      resetServiceForTesting(win, 'xhr');
+      jsonRequestConfigs = {};
+      registerServiceBuilder(win, 'xhr', function() {
+        return {
+          fetchJson: (url, init) => {
+            jsonRequestConfigs[url] = init;
+            expect(init.requireAmpResponseSourceOrigin).to.be.false;
+            if (configWithCredentials) {
+              expect(init.credentials).to.equal('include');
+            } else {
+              expect(init.credentials).to.undefined;
+            }
+            return Promise.resolve({
+              json() {
+                return Promise.resolve(JSON.parse(jsonMockResponses[url]));
+              },
+            });
           },
-        });
-      }};
-    });
-    resetServiceForTesting(win, 'crypto');
-    installCryptoService(win, 'crypto');
-    crypto = getService(win, 'crypto');
-    const link = doc.createElement('link');
-    link.setAttribute('rel', 'canonical');
-    link.setAttribute('href', './test-canonical.html');
-    doc.head.appendChild(link);
-    cidServiceForDocForTesting(ampdoc);
-    viewer = win.services.viewer.obj;
-    ins = instrumentationServiceForDocForTesting(ampdoc);
-    installUserNotificationManagerForTesting(ampdoc);
-
-    const wi = mockWindowInterface(sandbox);
-    requestVerifier = new ImagePixelVerifier(wi);
-    return Services.userNotificationManagerForDoc(doc.head).then(manager => {
-      uidService = manager;
-    });
-  });
-
-
-  function getAnalyticsTag(config = {}, attrs) {
-    config['transport'] = {
-      xhrpost: false,
-      beacon: false,
-    };
-    config = JSON.stringify(config);
-    const el = doc.createElement('amp-analytics');
-    const script = doc.createElement('script');
-    script.textContent = config;
-    script.setAttribute('type', 'application/json');
-    el.appendChild(script);
-    for (const k in attrs) {
-      el.setAttribute(k, attrs[k]);
-    }
-
-    doc.body.appendChild(el);
-
-    el.connectedCallback();
-    const analytics = new AmpAnalytics(el);
-    analytics.createdCallback();
-    analytics.buildCallback();
-    return analytics;
-  }
-
-  function waitForSendRequest(analytics, opt_max) {
-    expect(analytics.element).to.not.have.display('none');
-    return analytics.layoutCallback().then(() => {
-      expect(analytics.element).to.have.display('none');
-      if (requestVerifier.hasRequestSent()) {
-        return;
-      }
-      return new Promise(resolve => {
-        const start = Date.now();
-        const interval = setInterval(() => {
-          const time = Date.now();
-          if (requestVerifier.hasRequestSent() ||
-              (opt_max && (time - start) > opt_max)) {
-            clearInterval(interval);
-            resolve();
-          }
-        }, 4);
-      });
-    });
-  }
-
-  function waitForNoSendRequest(analytics) {
-    return waitForSendRequest(analytics, 100).then(() => {
-      expect(requestVerifier.hasRequestSent()).to.be.false;
-    });
-  }
-
-  describe('send hit', () => {
-    it('sends a basic hit', function() {
-      const analytics = getAnalyticsTag(trivialConfig);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar');
-      });
-    });
-
-    it('does not send a hit when config is not in a script tag', function() {
-      expectAsyncConsoleError(noTriggersError);
-      expectAsyncConsoleError(noRequestStringsError);
-      const config = JSON.stringify(trivialConfig);
-      const el = doc.createElement('amp-analytics');
-      el.textContent = config;
-      const analytics = new AmpAnalytics(el);
-      doc.body.appendChild(el);
-      el.connectedCallback();
-      analytics.createdCallback();
-      analytics.buildCallback();
-      // Initialization has not started.
-      expect(analytics.iniPromise_).to.be.null;
-
-      return waitForNoSendRequest(analytics);
-    });
-
-    it('does start initialization when requested', () => {
-      const config = JSON.stringify(trivialConfig);
-      const el = doc.createElement('amp-analytics');
-      el.setAttribute('trigger', 'immediate');
-      el.textContent = config;
-      const whenFirstVisibleStub = sandbox.stub(
-          viewer,
-          'whenFirstVisible').callsFake(() => new Promise(function() {}));
-      const analytics = new AmpAnalytics(el);
-      el.getAmpDoc = () => ampdoc;
-      analytics.buildCallback();
-      const iniPromise = analytics.iniPromise_;
-      expect(iniPromise).to.be.ok;
-      expect(el).to.have.attribute('hidden');
-      // Viewer.whenFirstVisible is the first blocking call to initialize.
-      expect(whenFirstVisibleStub).to.be.calledOnce;
-
-      // Repeated call, returns pre-created promise.
-      expect(analytics.ensureInitialized_()).to.equal(iniPromise);
-      expect(whenFirstVisibleStub).to.be.calledOnce;
-    });
-
-    it('does not send a hit when multiple child tags exist', function() {
-      expectAsyncConsoleError(oneScriptChildError);
-      expectAsyncConsoleError(noRequestStringsError);
-      expectAsyncConsoleError(noTriggersError);
-      const analytics = getAnalyticsTag(trivialConfig);
-      const script2 = document.createElement('script');
-      script2.setAttribute('type', 'application/json');
-      analytics.element.appendChild(script2);
-      return waitForNoSendRequest(analytics);
-    });
-
-    it('does not send a hit when script tag does not have a type attribute',
-        function() {
-          expectAsyncConsoleError(scriptTypeError);
-          expectAsyncConsoleError(noRequestStringsError);
-          expectAsyncConsoleError(noTriggersError);
-          const el = doc.createElement('amp-analytics');
-          const script = doc.createElement('script');
-          script.textContent = JSON.stringify(trivialConfig);
-          el.appendChild(script);
-          doc.body.appendChild(el);
-          const analytics = new AmpAnalytics(el);
-          el.connectedCallback();
-          analytics.createdCallback();
-          analytics.buildCallback();
-
-          return waitForNoSendRequest(analytics);
-        });
-
-    it('does not send a hit when json config is not valid', function() {
-      expectAsyncConsoleError(configParseError);
-      expectAsyncConsoleError(noRequestStringsError);
-      expectAsyncConsoleError(noTriggersError);
+        };
+      });
+      resetServiceForTesting(win, 'crypto');
+      installCryptoService(win, 'crypto');
+      crypto = getService(win, 'crypto');
+      const link = doc.createElement('link');
+      link.setAttribute('rel', 'canonical');
+      link.setAttribute('href', './test-canonical.html');
+      doc.head.appendChild(link);
+      cidServiceForDocForTesting(ampdoc);
+      viewer = win.services.viewer.obj;
+      ins = instrumentationServiceForDocForTesting(ampdoc);
+      installUserNotificationManagerForTesting(ampdoc);
+
+      const wi = mockWindowInterface(sandbox);
+      requestVerifier = new ImagePixelVerifier(wi);
+      return Services.userNotificationManagerForDoc(doc.head).then(manager => {
+        uidService = manager;
+      });
+    });
+
+    function getAnalyticsTag(config = {}, attrs) {
+      config['transport'] = {
+        xhrpost: false,
+        beacon: false,
+      };
+      config = JSON.stringify(config);
       const el = doc.createElement('amp-analytics');
       const script = doc.createElement('script');
+      script.textContent = config;
       script.setAttribute('type', 'application/json');
-      script.textContent = '{"a",}';
       el.appendChild(script);
+      for (const k in attrs) {
+        el.setAttribute(k, attrs[k]);
+      }
+
       doc.body.appendChild(el);
-      const analytics = new AmpAnalytics(el);
+
       el.connectedCallback();
+      const analytics = new AmpAnalytics(el);
       analytics.createdCallback();
       analytics.buildCallback();
+      return analytics;
+    }
 
-      return waitForNoSendRequest(analytics);
-    });
-
-    it('does not send a hit when request is not provided', function() {
-      expectAsyncConsoleError(onAndRequestAttributesError);
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/bar'},
-        'triggers': [{'on': 'visible'}],
+    function waitForSendRequest(analytics, opt_max) {
+      expect(analytics.element).to.not.have.display('none');
+      return analytics.layoutCallback().then(() => {
+        expect(analytics.element).to.have.display('none');
+        if (requestVerifier.hasRequestSent()) {
+          return;
+        }
+        return new Promise(resolve => {
+          const start = Date.now();
+          const interval = setInterval(() => {
+            const time = Date.now();
+            if (
+              requestVerifier.hasRequestSent() ||
+              (opt_max && time - start > opt_max)
+            ) {
+              clearInterval(interval);
+              resolve();
+            }
+          }, 4);
+        });
       });
+    }
 
-      return waitForNoSendRequest(analytics);
-    });
+    function waitForNoSendRequest(analytics) {
+      return waitForSendRequest(analytics, 100).then(() => {
+        expect(requestVerifier.hasRequestSent()).to.be.false;
+      });
+    }
 
-    it('does not send a hit when request type is not defined', function() {
-      expectAsyncConsoleError(noRequestStringsError);
-      expectAsyncConsoleError(/Request string not found/);
-      const analytics = getAnalyticsTag({
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
+    describe('send hit', () => {
+      it('sends a basic hit', function() {
+        const analytics = getAnalyticsTag(trivialConfig);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar');
+        });
       });
 
-      return waitForNoSendRequest(analytics);
-    });
+      it('does not send a hit when config is not in a script tag', function() {
+        expectAsyncConsoleError(noTriggersError);
+        expectAsyncConsoleError(noRequestStringsError);
+        const config = JSON.stringify(trivialConfig);
+        const el = doc.createElement('amp-analytics');
+        el.textContent = config;
+        const analytics = new AmpAnalytics(el);
+        doc.body.appendChild(el);
+        el.connectedCallback();
+        analytics.createdCallback();
+        analytics.buildCallback();
+        // Initialization has not started.
+        expect(analytics.iniPromise_).to.be.null;
+
+        return waitForNoSendRequest(analytics);
+      });
+
+      it('does start initialization when requested', () => {
+        const config = JSON.stringify(trivialConfig);
+        const el = doc.createElement('amp-analytics');
+        el.setAttribute('trigger', 'immediate');
+        el.textContent = config;
+        const whenFirstVisibleStub = sandbox
+          .stub(viewer, 'whenFirstVisible')
+          .callsFake(() => new Promise(function() {}));
+        const analytics = new AmpAnalytics(el);
+        el.getAmpDoc = () => ampdoc;
+        analytics.buildCallback();
+        const iniPromise = analytics.iniPromise_;
+        expect(iniPromise).to.be.ok;
+        expect(el).to.have.attribute('hidden');
+        // Viewer.whenFirstVisible is the first blocking call to initialize.
+        expect(whenFirstVisibleStub).to.be.calledOnce;
+
+        // Repeated call, returns pre-created promise.
+        expect(analytics.ensureInitialized_()).to.equal(iniPromise);
+        expect(whenFirstVisibleStub).to.be.calledOnce;
+      });
+
+      it('does not send a hit when multiple child tags exist', function() {
+        expectAsyncConsoleError(oneScriptChildError);
+        expectAsyncConsoleError(noRequestStringsError);
+        expectAsyncConsoleError(noTriggersError);
+        const analytics = getAnalyticsTag(trivialConfig);
+        const script2 = document.createElement('script');
+        script2.setAttribute('type', 'application/json');
+        analytics.element.appendChild(script2);
+        return waitForNoSendRequest(analytics);
+      });
+
+      it('does not send a hit when script tag does not have a type attribute', function() {
+        expectAsyncConsoleError(scriptTypeError);
+        expectAsyncConsoleError(noRequestStringsError);
+        expectAsyncConsoleError(noTriggersError);
+        const el = doc.createElement('amp-analytics');
+        const script = doc.createElement('script');
+        script.textContent = JSON.stringify(trivialConfig);
+        el.appendChild(script);
+        doc.body.appendChild(el);
+        const analytics = new AmpAnalytics(el);
+        el.connectedCallback();
+        analytics.createdCallback();
+        analytics.buildCallback();
+
+        return waitForNoSendRequest(analytics);
+      });
+
+      it('does not send a hit when json config is not valid', function() {
+        expectAsyncConsoleError(configParseError);
+        expectAsyncConsoleError(noRequestStringsError);
+        expectAsyncConsoleError(noTriggersError);
+        const el = doc.createElement('amp-analytics');
+        const script = doc.createElement('script');
+        script.setAttribute('type', 'application/json');
+        script.textContent = '{"a",}';
+        el.appendChild(script);
+        doc.body.appendChild(el);
+        const analytics = new AmpAnalytics(el);
+        el.connectedCallback();
+        analytics.createdCallback();
+        analytics.buildCallback();
+
+        return waitForNoSendRequest(analytics);
+      });
+
+      it('does not send a hit when request is not provided', function() {
+        expectAsyncConsoleError(onAndRequestAttributesError);
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [{'on': 'visible'}],
+        });
 
-    it('expands nested requests', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'foo': 'https://example.com/bar&${foobar}&baz',
-          'foobar': 'f1',
-        },
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
+        return waitForNoSendRequest(analytics);
       });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar&f1&baz');
-      });
-    });
 
-    it('expand nested requests with vendor provided value', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'foo': 'https://example.com/bar&${clientId}&baz',
-          'clientId': 'c1',
-        },
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar&c1&baz');
-      });
-    });
+      it('does not send a hit when request type is not defined', function() {
+        expectAsyncConsoleError(noRequestStringsError);
+        expectAsyncConsoleError(/Request string not found/);
+        const analytics = getAnalyticsTag({
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
 
-    it('expands nested requests (3 levels)', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'foo': 'https://example.com/bar&${foobar}',
-          'foobar': '${baz}',
-          'baz': 'b1',
-        },
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
+        return waitForNoSendRequest(analytics);
       });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar&b1');
+      it('expands nested requests', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'foo': 'https://example.com/bar&${foobar}&baz',
+            'foobar': 'f1',
+          },
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar&f1&baz');
+        });
       });
-    });
 
-    it('should tolerate invalid triggers', function() {
-      expectAsyncConsoleError(/No request strings defined/);
-      const analytics = getAnalyticsTag({
-        'request': {'foo': 'https://example.com'},
-        'triggers': [],
+      it('expand nested requests with vendor provided value', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'foo': 'https://example.com/bar&${clientId}&baz',
+            'clientId': 'c1',
+          },
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar&c1&baz');
+        });
       });
-      return waitForNoSendRequest(analytics);
-    });
 
-    it('expands recursive requests', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': '/bar&${foobar}&baz', 'foobar': '${foo}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      });
+      it('expands nested requests (3 levels)', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'foo': 'https://example.com/bar&${foobar}',
+            'foobar': '${baz}',
+            'baz': 'b1',
+          },
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/bar&/bar&/bar&&baz&baz&baz');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar&b1');
+        });
       });
-    });
 
-    it('sends multiple requests per trigger', function() {
-      expectAsyncConsoleError(/Request string not found/);
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'foo': 'https://example.com/bar&${foobar}',
-          'foobar': '${baz}',
-          'baz': 'b1',
-        },
-        'triggers': [{'on': 'visible', 'request': ['foo', 'foobar', 'foo2']}],
+      it('should tolerate invalid triggers', function() {
+        expectAsyncConsoleError(/No request strings defined/);
+        const analytics = getAnalyticsTag({
+          'request': {'foo': 'https://example.com'},
+          'triggers': [],
+        });
+        return waitForNoSendRequest(analytics);
       });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar&b1');
-        requestVerifier.verifyRequest('b1');
-      });
-    });
+      it('expands recursive requests', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': '/bar&${foobar}&baz', 'foobar': '${foo}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
 
-    it('should not replace HTML_ATTR outside of amp-ad', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'htmlAttrRequest': 'https://example.com/bar&ids=${htmlAttr(div,id)}',
-        },
-        'triggers': [{'on': 'visible', 'request': 'htmlAttrRequest'}],
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/bar&/bar&/bar&&baz&baz&baz');
+        });
       });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar&ids=HTML_ATTR(div,id)');
-      });
-    });
+      it('sends multiple requests per trigger', function() {
+        expectAsyncConsoleError(/Request string not found/);
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'foo': 'https://example.com/bar&${foobar}',
+            'foobar': '${baz}',
+            'baz': 'b1',
+          },
+          'triggers': [{'on': 'visible', 'request': ['foo', 'foobar', 'foo2']}],
+        });
 
-    it('fills cid', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/cid=${clientId(analytics-abc)}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar&b1');
+          requestVerifier.verifyRequest('b1');
+        });
       });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequestMatch(/^https:\/\/example.com\/cid=[a-zA-Z\-]+/);
+      it('should not replace HTML_ATTR outside of amp-ad', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'htmlAttrRequest':
+              'https://example.com/bar&ids=${htmlAttr(div,id)}',
+          },
+          'triggers': [{'on': 'visible', 'request': 'htmlAttrRequest'}],
+        });
+
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/bar&ids=HTML_ATTR(div,id)'
+          );
+        });
       });
-    });
 
-    // TODO(lannka, #12476): Make this test work with sinon 4.0.
-    it.skip('fills internally provided trigger vars', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'timer': 'https://e.com/start=${timerStart}&duration=${timerDuration}',
-          'visible': 'https://e.com/totalVisibleTime=${totalVisibleTime}',
-        },
-        'triggers': {
-          'timerTrigger': {
-            'on': 'timer',
-            'request': 'timer',
-            'timerSpec': {'interval': 1},
+      it('fills cid', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'foo': 'https://example.com/cid=${clientId(analytics-abc)}',
           },
-          'visibility': {'on': 'visible', 'request': 'visible'},
-        },
-      });
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest(/https:\/\/e.com\/start=[0-9]+&duration=0/);
-        requestVerifier.verifyRequest('https://e.com/totalVisibleTime=0');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequestMatch(
+            /^https:\/\/example.com\/cid=[a-zA-Z\-]+/
+          );
+        });
       });
-    });
 
-    it('should create and destroy analytics group', () => {
-      const analytics = getAnalyticsTag({
-        requests: {foo: 'https://example.com/bar'},
-        triggers: [{on: 'click', selector: '${foo}', request: 'foo'}],
-        vars: {foo: 'bar'},
-      });
-      return waitForNoSendRequest(analytics).then(() => {
-        expect(analytics.analyticsGroup_).to.be.ok;
-        const disposeStub = sandbox.stub(analytics.analyticsGroup_, 'dispose');
-        analytics.detachedCallback();
-        expect(analytics.analyticsGroup_).to.be.null;
-        expect(disposeStub).to.be.calledOnce;
-      });
-    });
+      // TODO(lannka, #12476): Make this test work with sinon 4.0.
+      it.skip('fills internally provided trigger vars', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'timer':
+              'https://e.com/start=${timerStart}&duration=${timerDuration}',
+            'visible': 'https://e.com/totalVisibleTime=${totalVisibleTime}',
+          },
+          'triggers': {
+            'timerTrigger': {
+              'on': 'timer',
+              'request': 'timer',
+              'timerSpec': {'interval': 1},
+            },
+            'visibility': {'on': 'visible', 'request': 'visible'},
+          },
+        });
 
-    it('expands urls in config request', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/${title}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'config': 'https://foo/TITLE',
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            /https:\/\/e.com\/start=[0-9]+&duration=0/
+          );
+          requestVerifier.verifyRequest('https://e.com/totalVisibleTime=0');
+        });
       });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/magic');
+
+      it('should create and destroy analytics group', () => {
+        const analytics = getAnalyticsTag({
+          requests: {foo: 'https://example.com/bar'},
+          triggers: [{on: 'click', selector: '${foo}', request: 'foo'}],
+          vars: {foo: 'bar'},
+        });
+        return waitForNoSendRequest(analytics).then(() => {
+          expect(analytics.analyticsGroup_).to.be.ok;
+          const disposeStub = sandbox.stub(
+            analytics.analyticsGroup_,
+            'dispose'
+          );
+          analytics.detachedCallback();
+          expect(analytics.analyticsGroup_).to.be.null;
+          expect(disposeStub).to.be.calledOnce;
+        });
       });
-    });
 
-    it('updates requestCount on each request', () => {
-      const analytics = getAnalyticsTag({
-        'host': 'example.com',
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-          'pageview2': '/test2=${requestCount}',
-        },
-        'triggers': [
-          {'on': 'visible', 'request': 'pageview1'},
-          {'on': 'visible', 'request': 'pageview2'},
-        ],
+      it('expands urls in config request', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {'foo': 'https://example.com/${title}'},
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'config': 'https://foo/TITLE',
+          }
+        );
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/magic');
+        });
       });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
-        requestVerifier.verifyRequest('/test2=2');
+
+      it('updates requestCount on each request', () => {
+        const analytics = getAnalyticsTag({
+          'host': 'example.com',
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
+            'pageview2': '/test2=${requestCount}',
+          },
+          'triggers': [
+            {'on': 'visible', 'request': 'pageview1'},
+            {'on': 'visible', 'request': 'pageview2'},
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+          requestVerifier.verifyRequest('/test2=2');
+        });
       });
     });
 
-  });
+    describe('expand variables', () => {
+      it('expands trigger vars', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
+          },
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+              'vars': {
+                'var1': 'x',
+                'var2': 'test2',
+              },
+            },
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test1=x&test2=test2'
+          );
+        });
+      });
 
-  describe('expand variables', () => {
-    it('expands trigger vars', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
+      it('expands config vars', () => {
+        const analytics = getAnalyticsTag({
           'vars': {
             'var1': 'x',
             'var2': 'test2',
           },
-        }],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test1=x&test2=test2');
-      });
-    });
-
-    it('expands config vars', () => {
-      const analytics = getAnalyticsTag({
-        'vars': {
-          'var1': 'x',
-          'var2': 'test2',
-        },
-        'requests': {
-          'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
-        },
-        'triggers': [{'on': 'visible', 'request': 'pageview'}],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test1=x&test2=test2');
+          'requests': {
+            'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
+          },
+          'triggers': [{'on': 'visible', 'request': 'pageview'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test1=x&test2=test2'
+          );
+        });
       });
-    });
 
-    it('expands platform vars', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/title=${title}&ref=${documentReferrer}',
-        },
-        'triggers': [{'on': 'visible', 'request': 'pageview'}],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequestMatch(/https:\/\/example.com\/title=Test%20Title&ref=http%3A%2F%2Flocalhost%3A9876%2F(context|debug).html/);
+      it('expands platform vars', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'pageview':
+              'https://example.com/title=${title}&ref=${documentReferrer}',
+          },
+          'triggers': [{'on': 'visible', 'request': 'pageview'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequestMatch(
+            /https:\/\/example.com\/title=Test%20Title&ref=http%3A%2F%2Flocalhost%3A9876%2F(context|debug).html/
+          );
+        });
       });
-    });
 
-    it('expands url-replacements vars', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/TITLE'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/Test%20Title');
+      it('expands url-replacements vars', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/TITLE'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/Test%20Title');
+        });
       });
-    });
 
-    it('expands trigger vars with higher precedence' +
-        'than config vars', () => {
-      const analytics = getAnalyticsTag({
-        'vars': {
-          'var1': 'config1',
-          'var2': 'config2',
-        },
-        'requests': {
-          'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
+      it('expands trigger vars with higher precedencethan config vars', () => {
+        const analytics = getAnalyticsTag({
           'vars': {
-            'var1': 'trigger1',
+            'var1': 'config1',
+            'var2': 'config2',
           },
-        }],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test1=trigger1&test2=config2');
+          'requests': {
+            'pageview': 'https://example.com/test1=${var1}&test2=${var2}',
+          },
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+              'vars': {
+                'var1': 'trigger1',
+              },
+            },
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test1=trigger1&test2=config2'
+          );
+        });
       });
-    });
 
-    it('expands element level vars with higher precedence' +
-        'than trigger vars', () => {
-      const analytics = getAnalyticsTag();
-      const analyticsGroup = ins.createAnalyticsGroup(analytics.element);
-
-      const el1 = doc.createElement('div');
-      el1.className = 'x';
-      el1.dataset.varsTest = 'foo';
-      analyticsGroup.root_.getRootElement().appendChild(el1);
-
-      const handlerSpy = sandbox.spy();
-      analyticsGroup.addTrigger(
-          {'on': 'click', 'selector': '.x', 'vars': {'test': 'bar'}},
-          handlerSpy);
-      analyticsGroup.root_.getTrackerOptional('click')
-          .clickObservable_.fire({target: el1});
-
-      expect(handlerSpy).to.be.calledOnce;
-      const event = handlerSpy.args[0][0];
-      expect(event.vars.test).to.equal('foo');
-    });
+      it(
+        'expands element level vars with higher precedence' +
+          'than trigger vars',
+        () => {
+          const analytics = getAnalyticsTag();
+          const analyticsGroup = ins.createAnalyticsGroup(analytics.element);
+
+          const el1 = doc.createElement('div');
+          el1.className = 'x';
+          el1.dataset.varsTest = 'foo';
+          analyticsGroup.root_.getRootElement().appendChild(el1);
+
+          const handlerSpy = sandbox.spy();
+          analyticsGroup.addTrigger(
+            {'on': 'click', 'selector': '.x', 'vars': {'test': 'bar'}},
+            handlerSpy
+          );
+          analyticsGroup.root_
+            .getTrackerOptional('click')
+            .clickObservable_.fire({target: el1});
+
+          expect(handlerSpy).to.be.calledOnce;
+          const event = handlerSpy.args[0][0];
+          expect(event.vars.test).to.equal('foo');
+        }
+      );
 
-    it('expands config vars with higher precedence' +
-        'than platform vars', () => {
-      const analytics = getAnalyticsTag({
-        'vars': {'random': 428},
-        'requests': {
-          'pageview': 'https://example.com/test1=${title}&test2=${random}',
-        },
-        'triggers': [{'on': 'visible', 'request': 'pageview'}],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test1=Test%20Title&test2=428');
+      it('expands config vars with higher precedencethan platform vars', () => {
+        const analytics = getAnalyticsTag({
+          'vars': {'random': 428},
+          'requests': {
+            'pageview': 'https://example.com/test1=${title}&test2=${random}',
+          },
+          'triggers': [{'on': 'visible', 'request': 'pageview'}],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test1=Test%20Title&test2=428'
+          );
+        });
       });
-    });
 
-    it('expands and encodes requests, config vars,' +
-        'and trigger vars', () => {
-      const analytics = getAnalyticsTag({
-        'vars': {
-          'c1': 'config 1',
-          'c2': 'config&2',
-        },
-        'requests': {
-          'base': 'https://example.com/test?c1=${c1}&t1=${t1}',
-          'pageview': '${base}&c2=${c2}&t2=${t2}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
+      it('expands and encodes requests, config vars,and trigger vars', () => {
+        const analytics = getAnalyticsTag({
           'vars': {
-            't1': 'trigger=1',
-            't2': 'trigger?2',
+            'c1': 'config 1',
+            'c2': 'config&2',
           },
-        }],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test?c1=config%201&t1=trigger%3D1&c2=config%262&t2=trigger%3F2');
-      });
-    });
-
-    it('encodes array vars', () => {
-      const analytics = getAnalyticsTag({
-        'vars': {
-          'c1': ['Config, The Barbarian', 'config 1'],
-          'c2': 'config&2',
-        },
-        'requests': {
-          'base': 'https://example.com/test?',
-          'pageview': '${base}c1=${c1}&c2=${c2}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
-        }],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test?c1=Config%2C%20The%20Barbarian,config%201&c2=config%262');
+          'requests': {
+            'base': 'https://example.com/test?c1=${c1}&t1=${t1}',
+            'pageview': '${base}&c2=${c2}&t2=${t2}',
+          },
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+              'vars': {
+                't1': 'trigger=1',
+                't2': 'trigger?2',
+              },
+            },
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test?c1=config%201&t1=trigger%3D1&c2=config%262&t2=trigger%3F2'
+          );
+        });
       });
-    });
 
-    it('expands url-replacements vars', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/test1=${var1}&test2=${var2}&title=TITLE',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
+      it('encodes array vars', () => {
+        const analytics = getAnalyticsTag({
           'vars': {
-            'var1': 'x',
-            'var2': 'DOCUMENT_REFERRER',
+            'c1': ['Config, The Barbarian', 'config 1'],
+            'c2': 'config&2',
           },
-        }],
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequestMatch(/https:\/\/example.com\/test1=x&test2=http%3A%2F%2Flocalhost%3A9876%2F(context|debug).html&title=Test%20Title/);
+          'requests': {
+            'base': 'https://example.com/test?',
+            'pageview': '${base}c1=${c1}&c2=${c2}',
+          },
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+            },
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test?c1=Config%2C%20The%20Barbarian,config%201&c2=config%262'
+          );
+        });
       });
-    });
 
-    it('expands complex vars', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/test1=${qp_foo}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
-          'vars': {
-            'qp_foo': '${queryParam(foo)}',
+      it('expands url-replacements vars', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'pageview':
+              'https://example.com/test1=${var1}&test2=${var2}&title=TITLE',
           },
-        }],
-      });
-      const urlReplacements =
-          Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').callsFake(
-          function(name) {
-            return {sync: param => {
-              return '_' + name.toLowerCase() + '_' + param + '_';
-            }};
-          });
-
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/test1=_query_param_foo_');
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+              'vars': {
+                'var1': 'x',
+                'var2': 'DOCUMENT_REFERRER',
+              },
+            },
+          ],
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequestMatch(
+            /https:\/\/example.com\/test1=x&test2=http%3A%2F%2Flocalhost%3A9876%2F(context|debug).html&title=Test%20Title/
+          );
+        });
       });
-    });
-  });
 
-  describe('expand selector', () => {
+      it('expands complex vars', () => {
+        const analytics = getAnalyticsTag({
+          'requests': {
+            'pageview': 'https://example.com/test1=${qp_foo}',
+          },
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview',
+              'vars': {
+                'qp_foo': '${queryParam(foo)}',
+              },
+            },
+          ],
+        });
+        const urlReplacements = Services.urlReplacementsForDoc(
+          analytics.element
+        );
+        sandbox
+          .stub(urlReplacements.getVariableSource(), 'get')
+          .callsFake(function(name) {
+            return {
+              sync: param => {
+                return '_' + name.toLowerCase() + '_' + param + '_';
+              },
+            };
+          });
 
-    it('expands selector with config variable', () => {
-      const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
-      const addStub = sandbox.stub(tracker, 'add');
-      const analytics = getAnalyticsTag({
-        requests: {foo: 'https://example.com/bar'},
-        triggers: [{on: 'click', selector: '${foo}', request: 'foo'}],
-        vars: {foo: 'bar'},
-      });
-      return waitForNoSendRequest(analytics).then(() => {
-        expect(addStub).to.be.calledOnce;
-        const config = addStub.args[0][2];
-        expect(config['selector']).to.equal('bar');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/test1=_query_param_foo_'
+          );
+        });
       });
     });
 
-    function selectorExpansionTest(selector) {
-      it('expand selector value: ' + selector, () => {
+    describe('expand selector', () => {
+      it('expands selector with config variable', () => {
         const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
         const addStub = sandbox.stub(tracker, 'add');
         const analytics = getAnalyticsTag({
           requests: {foo: 'https://example.com/bar'},
-          triggers: [{on: 'click', selector: '${foo}, ${bar}', request: 'foo'}],
-          vars: {foo: selector, bar: '123'},
+          triggers: [{on: 'click', selector: '${foo}', request: 'foo'}],
+          vars: {foo: 'bar'},
         });
         return waitForNoSendRequest(analytics).then(() => {
           expect(addStub).to.be.calledOnce;
           const config = addStub.args[0][2];
-          expect(config['selector']).to.equal(selector + ', 123');
+          expect(config['selector']).to.equal('bar');
         });
       });
-    }
 
-    ['.clazz', 'a, div', 'a .foo', 'a #foo', 'a > div', 'div + p', 'div ~ ul',
-      '[target=_blank]', '[title~=flower]', '[lang|=en]', 'a[href^="https"]',
-      'a[href$=".pdf"]', 'a[href="w3schools"]', 'a:active', 'p::after',
-      'p:first-child', 'p:lang(it)', ':not(p)', 'p:nth-child(2)']
-        .map(selectorExpansionTest);
+      function selectorExpansionTest(selector) {
+        it('expand selector value: ' + selector, () => {
+          const tracker = ins.ampdocRoot_.getTracker(
+            'click',
+            ClickEventTracker
+          );
+          const addStub = sandbox.stub(tracker, 'add');
+          const analytics = getAnalyticsTag({
+            requests: {foo: 'https://example.com/bar'},
+            triggers: [
+              {on: 'click', selector: '${foo}, ${bar}', request: 'foo'},
+            ],
+            vars: {foo: selector, bar: '123'},
+          });
+          return waitForNoSendRequest(analytics).then(() => {
+            expect(addStub).to.be.calledOnce;
+            const config = addStub.args[0][2];
+            expect(config['selector']).to.equal(selector + ', 123');
+          });
+        });
+      }
 
-    it('does not expands selector with platform variable', () => {
-      const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
-      const addStub = sandbox.stub(tracker, 'add');
-      const analytics = getAnalyticsTag({
-        requests: {foo: 'https://example.com/bar'},
-        triggers: [{on: 'click', selector: '${title}', request: 'foo'}],
-      });
-      return waitForNoSendRequest(analytics).then(() => {
-        expect(addStub).to.be.calledOnce;
-        const config = addStub.args[0][2];
-        expect(config['selector']).to.equal('TITLE');
+      [
+        '.clazz',
+        'a, div',
+        'a .foo',
+        'a #foo',
+        'a > div',
+        'div + p',
+        'div ~ ul',
+        '[target=_blank]',
+        '[title~=flower]',
+        '[lang|=en]',
+        'a[href^="https"]',
+        'a[href$=".pdf"]',
+        'a[href="w3schools"]',
+        'a:active',
+        'p::after',
+        'p:first-child',
+        'p:lang(it)',
+        ':not(p)',
+        'p:nth-child(2)',
+      ].map(selectorExpansionTest);
+
+      it('does not expands selector with platform variable', () => {
+        const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
+        const addStub = sandbox.stub(tracker, 'add');
+        const analytics = getAnalyticsTag({
+          requests: {foo: 'https://example.com/bar'},
+          triggers: [{on: 'click', selector: '${title}', request: 'foo'}],
+        });
+        return waitForNoSendRequest(analytics).then(() => {
+          expect(addStub).to.be.calledOnce;
+          const config = addStub.args[0][2];
+          expect(config['selector']).to.equal('TITLE');
+        });
       });
     });
-  });
-
-  describe('optout by function', () => {
 
-    beforeEach(() => {
-      sandbox.stub(AnalyticsConfig.prototype, 'loadConfig')
-          .returns(Promise.resolve({
+    describe('optout by function', () => {
+      beforeEach(() => {
+        sandbox.stub(AnalyticsConfig.prototype, 'loadConfig').returns(
+          Promise.resolve({
             'requests': {
               'foo': {
                 baseUrl: 'https://example.com/bar',
@@ -754,36 +833,44 @@ describes.realWin('amp-analytics', {
             },
             'vars': {},
             'optout': 'foo.bar',
-          }));
-    });
+          })
+        );
+      });
 
-    it('works for vendor config when optout returns false', function() {
-      win['foo'] = {'bar': () => false};
-      const analytics = getAnalyticsTag(trivialConfig);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar');
+      it('works for vendor config when optout returns false', function() {
+        win['foo'] = {'bar': () => false};
+        const analytics = getAnalyticsTag(trivialConfig);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar');
+        });
       });
-    });
 
-    it('works for vendor config when optout returns true', function() {
-      win['foo'] = {'bar': function() { return true; }};
-      const analytics = getAnalyticsTag(trivialConfig, {'type': 'testVendor'});
-      return waitForNoSendRequest(analytics);
-    });
+      it('works for vendor config when optout returns true', function() {
+        win['foo'] = {
+          'bar': function() {
+            return true;
+          },
+        };
+        const analytics = getAnalyticsTag(trivialConfig, {
+          'type': 'testVendor',
+        });
+        return waitForNoSendRequest(analytics);
+      });
 
-    it('works for vendor config when optout is not defined', function() {
-      const analytics = getAnalyticsTag(trivialConfig, {'type': 'testVendor'});
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar');
+      it('works for vendor config when optout is not defined', function() {
+        const analytics = getAnalyticsTag(trivialConfig, {
+          'type': 'testVendor',
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar');
+        });
       });
     });
-  });
-
-  describe('optout by id', () => {
 
-    beforeEach(() => {
-      sandbox.stub(AnalyticsConfig.prototype, 'loadConfig')
-          .returns(Promise.resolve({
+    describe('optout by id', () => {
+      beforeEach(() => {
+        sandbox.stub(AnalyticsConfig.prototype, 'loadConfig').returns(
+          Promise.resolve({
             'requests': {
               'foo': {
                 baseUrl: 'https://example.com/bar',
@@ -799,832 +886,1000 @@ describes.realWin('amp-analytics', {
             },
             'vars': {},
             'optoutElementId': 'elementId',
-          }));
-    });
+          })
+        );
+      });
 
-    it('doesnt send hit when config optout id is found', function() {
-      const element = doc.createElement('script');
-      element.type = 'text/javascript';
-      element.id = 'elementId';
-      doc.documentElement.insertBefore(
-          element, doc.documentElement.firstChild);
+      it('doesnt send hit when config optout id is found', function() {
+        const element = doc.createElement('script');
+        element.type = 'text/javascript';
+        element.id = 'elementId';
+        doc.documentElement.insertBefore(
+          element,
+          doc.documentElement.firstChild
+        );
 
-      const analytics = getAnalyticsTag(trivialConfig, {'type': 'testVendor'});
-      return waitForNoSendRequest(analytics);
-    });
+        const analytics = getAnalyticsTag(trivialConfig, {
+          'type': 'testVendor',
+        });
+        return waitForNoSendRequest(analytics);
+      });
 
-    it('sends hit when config optout id is not found', function() {
-      const analytics = getAnalyticsTag(trivialConfig, {'type': 'testVendor'});
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/bar');
+      it('sends hit when config optout id is not found', function() {
+        const analytics = getAnalyticsTag(trivialConfig, {
+          'type': 'testVendor',
+        });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/bar');
+        });
       });
     });
-  });
-
-  describe('extraUrlParams', () => {
 
-    let config;
-    beforeEach(() => {
-      config = {
-        vars: {host: 'example.com', path: 'helloworld'},
-        extraUrlParams: {'s.evar0': '0', 's.evar1': '${path}', 'foofoo': 'baz'},
-        triggers: {trig: {'on': 'visible', 'request': 'foo'}},
-      };
-      config['requests'] = {'foo': 'https://${host}/${path}?a=b'};
-    });
+    describe('extraUrlParams', () => {
+      let config;
+      beforeEach(() => {
+        config = {
+          vars: {host: 'example.com', path: 'helloworld'},
+          extraUrlParams: {
+            's.evar0': '0',
+            's.evar1': '${path}',
+            'foofoo': 'baz',
+          },
+          triggers: {trig: {'on': 'visible', 'request': 'foo'}},
+        };
+        config['requests'] = {'foo': 'https://${host}/${path}?a=b'};
+      });
 
-    it('are sent', () => {
-      const analytics = getAnalyticsTag(config);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/helloworld?a=b&s.evar0=0&s.evar1=helloworld&foofoo=baz');
+      it('are sent', () => {
+        const analytics = getAnalyticsTag(config);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/helloworld?a=b&s.evar0=0&s.evar1=helloworld&foofoo=baz'
+          );
+        });
       });
-    });
 
-    it('are renamed by extraUrlParamsReplaceMap', () => {
-      config.extraUrlParamsReplaceMap = {'s.evar': 'v'};
-      const analytics = getAnalyticsTag(config);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/helloworld?a=b&foofoo=baz&v0=0&v1=helloworld');
+      it('are renamed by extraUrlParamsReplaceMap', () => {
+        config.extraUrlParamsReplaceMap = {'s.evar': 'v'};
+        const analytics = getAnalyticsTag(config);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/helloworld?a=b&foofoo=baz&v0=0&v1=helloworld'
+          );
+        });
       });
-    });
 
-    it('are supported at trigger level', () => {
-      config.triggers.trig.extraUrlParams = {c: 'd', 's.evar': 'e'};
-      config.extraUrlParamsReplaceMap = {'s.evar': 'v'};
-      const analytics = getAnalyticsTag(config);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/helloworld?a=b&foofoo=baz&v0=0&v1=helloworld&c=d&v=e');
+      it('are supported at trigger level', () => {
+        config.triggers.trig.extraUrlParams = {c: 'd', 's.evar': 'e'};
+        config.extraUrlParamsReplaceMap = {'s.evar': 'v'};
+        const analytics = getAnalyticsTag(config);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/helloworld?a=b&foofoo=baz&v0=0&v1=helloworld&c=d&v=e'
+          );
+        });
       });
-    });
 
-    it('are supported as a var in URL', () => {
-      config['requests'].foo =
+      it('are supported as a var in URL', () => {
+        config['requests'].foo =
           'https://${host}/${path}?${extraUrlParams}&a=b';
-      const analytics = getAnalyticsTag(config);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/helloworld?s.evar0=0&s.evar1=helloworld&foofoo=baz&a=b');
+        const analytics = getAnalyticsTag(config);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/helloworld?s.evar0=0&s.evar1=helloworld&foofoo=baz&a=b'
+          );
+        });
       });
-    });
 
-    it('work when the value is an array', () => {
-      config.extraUrlParams = {'foo': ['0']};
-      const analytics = getAnalyticsTag(config);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/helloworld?a=b&foo=0');
+      it('work when the value is an array', () => {
+        config.extraUrlParams = {'foo': ['0']};
+        const analytics = getAnalyticsTag(config);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/helloworld?a=b&foo=0'
+          );
+        });
       });
     });
-  });
 
-  describe('sampling', () => {
-    function getConfig(sampleRate) {
-      return {
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-        },
-        'triggers': {
-          'sampled': {
-            'on': 'visible',
-            'request': 'pageview1',
-            'sampleSpec': {
-              'sampleOn': '${requestCount}',
-              'threshold': sampleRate,
+    describe('sampling', () => {
+      function getConfig(sampleRate) {
+        return {
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
+          },
+          'triggers': {
+            'sampled': {
+              'on': 'visible',
+              'request': 'pageview1',
+              'sampleSpec': {
+                'sampleOn': '${requestCount}',
+                'threshold': sampleRate,
+              },
             },
           },
-        },
-      };
-    }
-
-    it('allows a request through', () => {
-      const analytics = getAnalyticsTag(getConfig(1));
-
-      sandbox.stub(crypto, 'uniform').returns(Promise.resolve(0.005));
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
-      });
-    });
-
-    it('allows a request through based on url-replacements', () => {
-      const config = getConfig(1);
-      config.triggers.sampled.sampleSpec.sampleOn = '${pageViewId}';
-      const analytics = getAnalyticsTag(config);
-
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').returns({
-        async: 0,
-        sync: 0,
-      });
-      sandbox.stub(crypto, 'uniform')
-          .withArgs('0').returns(Promise.resolve(0.005));
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
-      });
-    });
-
-    it('does not allow a request through', () => {
-      const analytics = getAnalyticsTag(getConfig(1));
-
-      sandbox.stub(crypto, 'uniform').returns(Promise.resolve(0.1));
-      return waitForNoSendRequest(analytics);
-    });
-
-    it('works when sampleSpec is 100%', () => {
-      const analytics = getAnalyticsTag(getConfig(100));
-
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
-      });
-    });
+        };
+      }
 
-    it('works when sampleSpec is 0%', () => {
-      const analytics = getAnalyticsTag(getConfig(0));
+      it('allows a request through', () => {
+        const analytics = getAnalyticsTag(getConfig(1));
 
-      return waitForNoSendRequest(analytics);
-    });
+        sandbox.stub(crypto, 'uniform').returns(Promise.resolve(0.005));
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
+      });
 
-    it('works when sampleSpec is incomplete', () => {
-      expectAsyncConsoleError(invalidThresholdForSamplingError);
-      const incompleteConfig = {
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview1',
-          'sampleSpec': {
-            'sampleOn': '${requestCount}',
-          },
-        }],
-      };
-      const analytics = getAnalyticsTag(incompleteConfig);
+      it('allows a request through based on url-replacements', () => {
+        const config = getConfig(1);
+        config.triggers.sampled.sampleSpec.sampleOn = '${pageViewId}';
+        const analytics = getAnalyticsTag(config);
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        const urlReplacements = Services.urlReplacementsForDoc(
+          analytics.element
+        );
+        sandbox.stub(urlReplacements.getVariableSource(), 'get').returns({
+          async: 0,
+          sync: 0,
+        });
+        sandbox
+          .stub(crypto, 'uniform')
+          .withArgs('0')
+          .returns(Promise.resolve(0.005));
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
 
-    it('works for invalid threadhold (Infinity)', () => {
-      expectAsyncConsoleError(invalidThresholdForSamplingError);
-      const analytics = getAnalyticsTag(getConfig(Infinity));
+      it('does not allow a request through', () => {
+        const analytics = getAnalyticsTag(getConfig(1));
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        sandbox.stub(crypto, 'uniform').returns(Promise.resolve(0.1));
+        return waitForNoSendRequest(analytics);
       });
-    });
 
-    it('works for invalid threadhold (NaN)', () => {
-      expectAsyncConsoleError(invalidThresholdForSamplingError);
-      const analytics = getAnalyticsTag(getConfig(NaN));
+      it('works when sampleSpec is 100%', () => {
+        const analytics = getAnalyticsTag(getConfig(100));
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
 
-    it('works for invalid threadhold (-1)', () => {
-      expectAsyncConsoleError(invalidThresholdForSamplingError);
-      const analytics = getAnalyticsTag(getConfig(-1));
+      it('works when sampleSpec is 0%', () => {
+        const analytics = getAnalyticsTag(getConfig(0));
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForNoSendRequest(analytics);
       });
-    });
-  });
 
-  describe('enabled', () => {
-    function getConfig() {
-      return {
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-        },
-        'triggers': {
-          'conditional': {
-            'on': 'visible',
-            'request': 'pageview1',
-            'vars': {},
+      it('works when sampleSpec is incomplete', () => {
+        expectAsyncConsoleError(invalidThresholdForSamplingError);
+        const incompleteConfig = {
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
           },
-        },
-        'vars': {},
-      };
-    }
-
-    it('allows a request through for undefined "enabled" property', () => {
-      const analytics = getAnalyticsTag(getConfig());
+          'triggers': [
+            {
+              'on': 'visible',
+              'request': 'pageview1',
+              'sampleSpec': {
+                'sampleOn': '${requestCount}',
+              },
+            },
+          ],
+        };
+        const analytics = getAnalyticsTag(incompleteConfig);
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
 
-    it('allows a request based on a variable', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${foo}';
-      config.triggers.conditional.vars.foo = 'bar';
-      const analytics = getAnalyticsTag(config);
+      it('works for invalid threadhold (Infinity)', () => {
+        expectAsyncConsoleError(invalidThresholdForSamplingError);
+        const analytics = getAnalyticsTag(getConfig(Infinity));
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
 
-    it('allows a request based on url-replacements', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${pageViewId}';
-      const analytics = getAnalyticsTag(config);
+      it('works for invalid threadhold (NaN)', () => {
+        expectAsyncConsoleError(invalidThresholdForSamplingError);
+        const analytics = getAnalyticsTag(getConfig(NaN));
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: 1});
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
 
-    it('does not allow a request through', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '';
-      const analytics = getAnalyticsTag(config);
+      it('works for invalid threadhold (-1)', () => {
+        expectAsyncConsoleError(invalidThresholdForSamplingError);
+        const analytics = getAnalyticsTag(getConfig(-1));
 
-      return waitForNoSendRequest(analytics);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
+      });
     });
 
-    it('does not allow a request through with false', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = false;
-      const analytics = getAnalyticsTag(config);
-
-      return waitForNoSendRequest(analytics);
-    });
+    describe('enabled', () => {
+      function getConfig() {
+        return {
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
+          },
+          'triggers': {
+            'conditional': {
+              'on': 'visible',
+              'request': 'pageview1',
+              'vars': {},
+            },
+          },
+          'vars': {},
+        };
+      }
 
-    it('does not allow a request through if a variable is missing', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${undefinedParam}';
-      const analytics = getAnalyticsTag(config);
+      it('allows a request through for undefined "enabled" property', () => {
+        const analytics = getAnalyticsTag(getConfig());
 
-      return waitForNoSendRequest(analytics);
-    });
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
+      });
 
-    it('does not allow a request through if a request param is missing', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+      it('allows a request based on a variable', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = '${foo}';
+        config.triggers.conditional.vars.foo = 'bar';
+        const analytics = getAnalyticsTag(config);
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns(null);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
+      });
 
-      return waitForNoSendRequest(analytics);
-    });
+      it('allows a request based on url-replacements', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = '${pageViewId}';
+        const analytics = getAnalyticsTag(config);
 
-    it('does not allow a request through ' +
-     'if a request param is falsey (0)', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+        const urlReplacements = Services.urlReplacementsForDoc(
+          analytics.element
+        );
+        sandbox
+          .stub(urlReplacements.getVariableSource(), 'get')
+          .returns({sync: 1});
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
+      });
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: 0});
+      it('does not allow a request through', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = '';
+        const analytics = getAnalyticsTag(config);
 
-      return waitForNoSendRequest(analytics);
-    });
+        return waitForNoSendRequest(analytics);
+      });
 
-    it('does not allow a request through ' +
-    'if a request param is falsey (false)', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+      it('does not allow a request through with false', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = false;
+        const analytics = getAnalyticsTag(config);
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: false});
+        return waitForNoSendRequest(analytics);
+      });
 
-      return waitForNoSendRequest(analytics);
-    });
+      it('does not allow a request through if a variable is missing', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = '${undefinedParam}';
+        const analytics = getAnalyticsTag(config);
 
-    it('does not allow a request through ' +
-     'if a request param is falsey (null)', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+        return waitForNoSendRequest(analytics);
+      });
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: null});
+      it('does not allow a request through if a request param is missing', () => {
+        const config = getConfig();
+        config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+        const analytics = getAnalyticsTag(config);
 
-      return waitForNoSendRequest(analytics);
-    });
+        const urlReplacements = Services.urlReplacementsForDoc(
+          analytics.element
+        );
+        sandbox.stub(urlReplacements.getVariableSource(), 'get').returns(null);
 
-    it('does not allow a request through ' +
-     'if a request param is falsey (NaN)', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+        return waitForNoSendRequest(analytics);
+      });
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: NaN});
+      it(
+        'does not allow a request through ' +
+          'if a request param is falsey (0)',
+        () => {
+          const config = getConfig();
+          config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
 
-      return waitForNoSendRequest(analytics);
-    });
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: 0});
 
-    it('does not allow a request through ' +
-     'if a request param is falsey (undefined)', () => {
-      const config = getConfig();
-      config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through ' +
+          'if a request param is falsey (false)',
+        () => {
+          const config = getConfig();
+          config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: false});
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: undefined});
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through ' +
+          'if a request param is falsey (null)',
+        () => {
+          const config = getConfig();
+          config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: null});
 
-      return waitForNoSendRequest(analytics);
-    });
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through ' +
+          'if a request param is falsey (NaN)',
+        () => {
+          const config = getConfig();
+          config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: NaN});
 
-    it('allows a request based on a variable when enabled on tag level', () => {
-      const config = getConfig();
-      config.enabled = '${foo}';
-      config.vars.foo = 'bar';
-      const analytics = getAnalyticsTag(config);
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through ' +
+          'if a request param is falsey (undefined)',
+        () => {
+          const config = getConfig();
+          config.triggers.conditional.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: undefined});
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
-      });
-    });
+          return waitForNoSendRequest(analytics);
+        }
+      );
 
-    it('allows a request based on url-replacements ' +
-    'when enabled on tag level', () => {
-      const config = getConfig();
-      config.enabled = '${pageViewId}';
-      const analytics = getAnalyticsTag(config);
+      it('allows a request based on a variable when enabled on tag level', () => {
+        const config = getConfig();
+        config.enabled = '${foo}';
+        config.vars.foo = 'bar';
+        const analytics = getAnalyticsTag(config);
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get')
-          .returns({sync: 1});
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
-    });
-
-    it('does not allow a request through when enabled on tag level', () => {
-      const config = getConfig();
-      config.enabled = '';
-      const analytics = getAnalyticsTag(config);
-
-      return waitForNoSendRequest(analytics);
-    });
 
-    it('does not allow a request through if a variable is missing ' +
-    'when enabled on tag level', () => {
-      const config = getConfig();
-      config.enabled = '${undefinedParam}';
-      const analytics = getAnalyticsTag(config);
-
-      return waitForNoSendRequest(analytics);
-    });
+      it(
+        'allows a request based on url-replacements ' +
+          'when enabled on tag level',
+        () => {
+          const config = getConfig();
+          config.enabled = '${pageViewId}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns({sync: 1});
+          return waitForSendRequest(analytics).then(() => {
+            requestVerifier.verifyRequest('/test1=1');
+          });
+        }
+      );
 
-    it('does not allow a request through if a request param is missing ' +
-    'when enabled on tag level', () => {
-      const config = getConfig();
-      config.enabled = '${queryParam(undefinedParam)}';
-      const analytics = getAnalyticsTag(config);
+      it('does not allow a request through when enabled on tag level', () => {
+        const config = getConfig();
+        config.enabled = '';
+        const analytics = getAnalyticsTag(config);
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').returns(null);
+        return waitForNoSendRequest(analytics);
+      });
 
-      return waitForNoSendRequest(analytics);
-    });
+      it(
+        'does not allow a request through if a variable is missing ' +
+          'when enabled on tag level',
+        () => {
+          const config = getConfig();
+          config.enabled = '${undefinedParam}';
+          const analytics = getAnalyticsTag(config);
 
-    it('does not allow a request through if a request param is missing ' +
-    'when enabled on tag level but enabled on trigger level', () => {
-      const config = getConfig();
-      config.enabled = '${queryParam(undefinedParam)}';
-      config.triggers.conditional.enabled = '${foo}';
-      config.triggers.conditional.vars.foo = 'bar';
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through if a request param is missing ' +
+          'when enabled on tag level',
+        () => {
+          const config = getConfig();
+          config.enabled = '${queryParam(undefinedParam)}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns(null);
 
-      const analytics = getAnalyticsTag(config);
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through if a request param is missing ' +
+          'when enabled on tag level but enabled on trigger level',
+        () => {
+          const config = getConfig();
+          config.enabled = '${queryParam(undefinedParam)}';
+          config.triggers.conditional.enabled = '${foo}';
+          config.triggers.conditional.vars.foo = 'bar';
+
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns(null);
 
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').returns(null);
+          return waitForNoSendRequest(analytics);
+        }
+      );
+
+      it(
+        'does not allow a request through if enabled on tag level ' +
+          'but variable is missing on trigger level',
+        () => {
+          const config = getConfig();
+          config.enabled = '${pageViewId}';
+          config.triggers.conditional.enabled = '${foo}';
+          const analytics = getAnalyticsTag(config);
+
+          const urlReplacements = Services.urlReplacementsForDoc(
+            analytics.element
+          );
+          sandbox
+            .stub(urlReplacements.getVariableSource(), 'get')
+            .returns('page');
 
-      return waitForNoSendRequest(analytics);
+          return waitForNoSendRequest(analytics);
+        }
+      );
     });
 
-    it('does not allow a request through if enabled on tag level ' +
-    'but variable is missing on trigger level', () => {
-      const config = getConfig();
-      config.enabled = '${pageViewId}';
-      config.triggers.conditional.enabled = '${foo}';
-      const analytics = getAnalyticsTag(config);
-
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').returns('page');
-
-      return waitForNoSendRequest(analytics);
-    });
-  });
+    describe('data-consent-notification-id', () => {
+      it('should resume fetch when consent is given', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {'foo': 'https://example.com/local'},
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'data-consent-notification-id': 'amp-user-notification1',
+          }
+        );
 
-  describe('data-consent-notification-id', () => {
+        sandbox.stub(uidService, 'get').callsFake(id => {
+          expect(id).to.equal('amp-user-notification1');
+          return Promise.resolve();
+        });
 
-    it('should resume fetch when consent is given', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/local'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'data-consent-notification-id': 'amp-user-notification1',
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('https://example.com/local');
+        });
       });
 
-      sandbox.stub(uidService, 'get').callsFake(id => {
-        expect(id).to.equal('amp-user-notification1');
-        return Promise.resolve();
-      });
+      it('should not fetch when consent is not given', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {'foo': 'https://example.com/local'},
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'data-consent-notification-id': 'amp-user-notification1',
+          }
+        );
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('https://example.com/local');
+        sandbox.stub(uidService, 'get').callsFake(id => {
+          expect(id).to.equal('amp-user-notification1');
+          return Promise.reject();
+        });
+        return analytics.layoutCallback().then(
+          () => {
+            throw new Error('Must never be here');
+          },
+          () => {
+            expect(requestVerifier.hasRequestSent()).to.be.false;
+          }
+        );
       });
-    });
 
-    it('should not fetch when consent is not given', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/local'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'data-consent-notification-id': 'amp-user-notification1',
-      });
+      it(
+        'should not throw in resumeCallback/unlayoutCallback ' +
+          'if consent rejected',
+        () => {
+          const analytics = getAnalyticsTag(
+            {
+              'requests': {'foo': 'https://example.com/local'},
+              'triggers': [{'on': 'visible', 'request': 'foo'}],
+            },
+            {
+              'data-consent-notification-id': 'amp-user-notification1',
+            }
+          );
+
+          sandbox.stub(uidService, 'get').callsFake(id => {
+            expect(id).to.equal('amp-user-notification1');
+            return Promise.reject();
+          });
 
-      sandbox.stub(uidService, 'get').callsFake(id => {
-        expect(id).to.equal('amp-user-notification1');
-        return Promise.reject();
-      });
-      return analytics.layoutCallback().then(() => {
-        throw new Error('Must never be here');
-      }, () => {
-        expect(requestVerifier.hasRequestSent()).to.be.false;
-      });
+          sandbox.stub(viewer, 'isVisible').returns(false);
+          analytics.layoutCallback();
+          analytics.resumeCallback();
+          analytics.unlayoutCallback();
+        }
+      );
     });
 
-    it('should not throw in resumeCallback/unlayoutCallback ' +
-        'if consent rejected', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/local'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'data-consent-notification-id': 'amp-user-notification1',
+    describe('Sandbox AMP Analytics Element', () => {
+      beforeEach(() => {
+        // Unfortunately need to fake sandbox analytics element's parent
+        // to an AMP element
+        doc.body.classList.add('i-amphtml-element');
       });
 
-      sandbox.stub(uidService, 'get').callsFake(id => {
-        expect(id).to.equal('amp-user-notification1');
-        return Promise.reject();
+      afterEach(() => {
+        doc.body.classList.remove('i-amphtml-element');
       });
 
-      sandbox.stub(viewer, 'isVisible').returns(false);
-      analytics.layoutCallback();
-      analytics.resumeCallback();
-      analytics.unlayoutCallback();
-    });
-  });
-
-  describe('Sandbox AMP Analytics Element', () => {
-
-    beforeEach(() => {
-      // Unfortunately need to fake sandbox analytics element's parent
-      // to an AMP element
-      doc.body.classList.add('i-amphtml-element');
-    });
-
-    afterEach(() => {
-      doc.body.classList.remove('i-amphtml-element');
-    });
-
-    it('should not add listener when eventType is not whitelist', function() {
-      expectAsyncConsoleError(clickTrackerNotSupportedError);
-      // Right now we only whitelist VISIBLE & HIDDEN
-      const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
-      const addStub = sandbox.stub(tracker, 'add');
-      const analytics = getAnalyticsTag({
-        requests: {foo: 'https://example.com/bar'},
-        triggers: [{on: 'click', request: 'foo'}],
-      }, {
-        'sandbox': 'true',
-      });
+      it('should not add listener when eventType is not whitelist', function() {
+        expectAsyncConsoleError(clickTrackerNotSupportedError);
+        // Right now we only whitelist VISIBLE & HIDDEN
+        const tracker = ins.ampdocRoot_.getTracker('click', ClickEventTracker);
+        const addStub = sandbox.stub(tracker, 'add');
+        const analytics = getAnalyticsTag(
+          {
+            requests: {foo: 'https://example.com/bar'},
+            triggers: [{on: 'click', request: 'foo'}],
+          },
+          {
+            'sandbox': 'true',
+          }
+        );
 
-      return waitForNoSendRequest(analytics).then(() => {
-        expect(addStub).to.not.be.called;
+        return waitForNoSendRequest(analytics).then(() => {
+          expect(addStub).to.not.be.called;
+        });
       });
-    });
 
-    it('replace selector and selectionMethod when in scope', () => {
-      const tracker = ins.ampdocRoot_.getTracker('visible', VisibilityTracker);
-      const addStub = sandbox.stub(tracker, 'add');
-      const analytics = getAnalyticsTag({
-        requests: {foo: 'https://example.com/bar'},
-        triggers: [{on: 'visible', selector: 'amp-iframe', request: 'foo'}],
-      }, {
-        'sandbox': 'true',
-      }, true);
-      return waitForNoSendRequest(analytics).then(() => {
-        expect(addStub).to.be.calledOnce;
-        const config = addStub.args[0][2];
-        expect(config['selector']).to.equal(
-            analytics.element.parentElement.tagName);
-        expect(config['selectionMethod']).to.equal('closest');
+      it('replace selector and selectionMethod when in scope', () => {
+        const tracker = ins.ampdocRoot_.getTracker(
+          'visible',
+          VisibilityTracker
+        );
+        const addStub = sandbox.stub(tracker, 'add');
+        const analytics = getAnalyticsTag(
+          {
+            requests: {foo: 'https://example.com/bar'},
+            triggers: [{on: 'visible', selector: 'amp-iframe', request: 'foo'}],
+          },
+          {
+            'sandbox': 'true',
+          },
+          true
+        );
+        return waitForNoSendRequest(analytics).then(() => {
+          expect(addStub).to.be.calledOnce;
+          const config = addStub.args[0][2];
+          expect(config['selector']).to.equal(
+            analytics.element.parentElement.tagName
+          );
+          expect(config['selectionMethod']).to.equal('closest');
+        });
       });
-    });
 
-    it('expand vendor vars but not replace non whitelist variables', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/test1=${var1}&CLIENT_ID(analytics-abc)=${var2}',
-        },
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
-          'vars': {
-            'var1': 'CLIENT_ID(analytics-abc)',
-            'var2': 'test2',
+      it('expand vendor vars but not replace non whitelist variables', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {
+              'pageview':
+                'https://example.com/test1=${var1}&CLIENT_ID(analytics-abc)=${var2}',
+            },
+            'triggers': [
+              {
+                'on': 'visible',
+                'request': 'pageview',
+                'vars': {
+                  'var1': 'CLIENT_ID(analytics-abc)',
+                  'var2': 'test2',
+                },
+              },
+            ],
           },
-        }]}, {
-        'sandbox': 'true',
-      });
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest(
+          {
+            'sandbox': 'true',
+          }
+        );
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
             'https://example.com/test1=CLIENT_ID(analytics-abc)&' +
-            'CLIENT_ID(analytics-abc)=test2');
+              'CLIENT_ID(analytics-abc)=test2'
+          );
+        });
       });
-    });
 
-    it('should not replace non whitelist variable', () => {
-      const analytics = getAnalyticsTag({
-        'requests':
-            {'foo': 'https://example.com/cid=${clientId(analytics-abc)}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'sandbox': 'true',
-      });
+      it('should not replace non whitelist variable', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {
+              'foo': 'https://example.com/cid=${clientId(analytics-abc)}',
+            },
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'sandbox': 'true',
+          }
+        );
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest(
-            'https://example.com/cid=CLIENT_ID(analytics-abc)');
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
+            'https://example.com/cid=CLIENT_ID(analytics-abc)'
+          );
+        });
       });
-    });
 
-    it('should replace whitelist variable', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/random=${random}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'sandbox': 'true',
-      }, true);
+      it('should replace whitelist variable', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {'foo': 'https://example.com/random=${random}'},
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'sandbox': 'true',
+          },
+          true
+        );
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequestMatch(/^https:\/\/example.com\/random=0.[0-9]/);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequestMatch(
+            /^https:\/\/example.com\/random=0.[0-9]/
+          );
+        });
       });
-    });
 
-    it('should replace for multi whitelisted(or not) variables', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo':
-            'https://example.com/cid=${clientId(analytics-abc)}random=RANDOM'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'sandbox': 'true',
-      }, true);
+      it('should replace for multi whitelisted(or not) variables', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {
+              'foo':
+                'https://example.com/cid=${clientId(analytics-abc)}random=RANDOM',
+            },
+            'triggers': [{'on': 'visible', 'request': 'foo'}],
+          },
+          {
+            'sandbox': 'true',
+          },
+          true
+        );
 
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequestMatch(
-            /https:\/\/example\.com\/cid=CLIENT_ID\(analytics-abc\)random=0\.[0-9]+/);
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequestMatch(
+            /https:\/\/example\.com\/cid=CLIENT_ID\(analytics-abc\)random=0\.[0-9]+/
+          );
+        });
       });
-    });
 
-    it('expands url-replacements vars', () => {
-      const analytics = getAnalyticsTag({
-        'requests': {
-          'pageview': 'https://example.com/VIEWER&AMP_VERSION&' +
-          'test1=${var1}&test2=${var2}&test3=${var3}&url=AMPDOC_URL'},
-        'triggers': [{
-          'on': 'visible',
-          'request': 'pageview',
-          'vars': {
-            'var1': 'x',
-            'var2': 'AMPDOC_URL',
-            'var3': 'CLIENT_ID',
+      it('expands url-replacements vars', () => {
+        const analytics = getAnalyticsTag(
+          {
+            'requests': {
+              'pageview':
+                'https://example.com/VIEWER&AMP_VERSION&' +
+                'test1=${var1}&test2=${var2}&test3=${var3}&url=AMPDOC_URL',
+            },
+            'triggers': [
+              {
+                'on': 'visible',
+                'request': 'pageview',
+                'vars': {
+                  'var1': 'x',
+                  'var2': 'AMPDOC_URL',
+                  'var3': 'CLIENT_ID',
+                },
+              },
+            ],
           },
-        }]}, {
-        'sandbox': 'true',
-      }, true);
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest(
+          {
+            'sandbox': 'true',
+          },
+          true
+        );
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest(
             'https://example.com/VIEWER&%24internalRuntimeVersion%24' +
-          '&test1=x&test2=about%3Asrcdoc&test3=CLIENT_ID' +
-          '&url=about%3Asrcdoc');
+              '&test1=x&test2=about%3Asrcdoc&test3=CLIENT_ID' +
+              '&url=about%3Asrcdoc'
+          );
+        });
       });
-    });
 
-    it('allow a request sample through on non whitelist url variables', () => {
-      const config = {
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-        },
-        'triggers': {
-          'sampled': {
-            'on': 'visible',
-            'request': 'pageview1',
-            'sampleSpec': {
-              'sampleOn': '${requestCount}',
-              'threshold': 1,
+      it('allow a request sample through on non whitelist url variables', () => {
+        const config = {
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
+          },
+          'triggers': {
+            'sampled': {
+              'on': 'visible',
+              'request': 'pageview1',
+              'sampleSpec': {
+                'sampleOn': '${requestCount}',
+                'threshold': 1,
+              },
             },
           },
-        },
-      };
-      config.triggers.sampled.sampleSpec.sampleOn = '${clientId}';
-      const analytics = getAnalyticsTag(config, {
-        'sandbox': 'true',
-      }, true);
-
-      const urlReplacements = Services.urlReplacementsForDoc(analytics.element);
-      sandbox.stub(urlReplacements.getVariableSource(), 'get').returns({
-        async: 0,
-        sync: 0,
-      });
-      sandbox.stub(crypto, 'uniform')
-          .withArgs('0').returns(Promise.resolve(0.005))
-          .withArgs('CLIENT_ID').returns(Promise.resolve(0.5));
-      return waitForSendRequest(analytics).then(() => {
-        requestVerifier.verifyRequest('/test1=1');
+        };
+        config.triggers.sampled.sampleSpec.sampleOn = '${clientId}';
+        const analytics = getAnalyticsTag(
+          config,
+          {
+            'sandbox': 'true',
+          },
+          true
+        );
+
+        const urlReplacements = Services.urlReplacementsForDoc(
+          analytics.element
+        );
+        sandbox.stub(urlReplacements.getVariableSource(), 'get').returns({
+          async: 0,
+          sync: 0,
+        });
+        sandbox
+          .stub(crypto, 'uniform')
+          .withArgs('0')
+          .returns(Promise.resolve(0.005))
+          .withArgs('CLIENT_ID')
+          .returns(Promise.resolve(0.5));
+        return waitForSendRequest(analytics).then(() => {
+          requestVerifier.verifyRequest('/test1=1');
+        });
       });
     });
-  });
 
-  describe('Linkers', () => {
-    let analytics;
+    describe('Linkers', () => {
+      let analytics;
 
-    beforeEach(() => {
-      const el = doc.createElement('amp-analytics');
-      el.setAttribute('type', 'foo');
-      doc.body.appendChild(el);
-      analytics = new AmpAnalytics(el);
-      analytics.getAmpDoc = () => ampdoc;
-    });
+      beforeEach(() => {
+        const el = doc.createElement('amp-analytics');
+        el.setAttribute('type', 'foo');
+        doc.body.appendChild(el);
+        analytics = new AmpAnalytics(el);
+        analytics.getAmpDoc = () => ampdoc;
+      });
 
-    it('Initializes a new Linker.', () => {
-      expectAsyncConsoleError(noTriggersError);
-      expectAsyncConsoleError(noRequestStringsError);
+      it('Initializes a new Linker.', () => {
+        expectAsyncConsoleError(noTriggersError);
+        expectAsyncConsoleError(noRequestStringsError);
 
-      sandbox.stub(AnalyticsConfig.prototype, 'loadConfig')
-          .resolves({});
+        sandbox.stub(AnalyticsConfig.prototype, 'loadConfig').resolves({});
 
-      const linkerStub = sandbox.stub(LinkerManager.prototype, 'init');
+        const linkerStub = sandbox.stub(LinkerManager.prototype, 'init');
 
-      analytics.buildCallback();
-      return analytics.layoutCallback().then(() => {
-        expect(linkerStub.calledOnce).to.be.true;
+        analytics.buildCallback();
+        return analytics.layoutCallback().then(() => {
+          expect(linkerStub.calledOnce).to.be.true;
+        });
       });
     });
-  });
 
-  describe('iframe transport', () => {
-
-    const sampleconfig = {
-      'triggers': {
-        'sample_visibility_trigger': {
-          'on': 'visible',
-          'request': 'sample_visibility_request',
+    describe('iframe transport', () => {
+      const sampleconfig = {
+        'triggers': {
+          'sample_visibility_trigger': {
+            'on': 'visible',
+            'request': 'sample_visibility_request',
+          },
         },
-      },
-      'requests': {
-        'sample_visibility_request': {
-          baseUrl: '//fake-request',
+        'requests': {
+          'sample_visibility_request': {
+            baseUrl: '//fake-request',
+          },
         },
-      },
-    };
+      };
 
-    it('initialize iframe transport', () => {
-      const el = doc.createElement('amp-analytics');
-      el.setAttribute('type', 'foo');
-      doc.body.appendChild(el);
-      const analytics = new AmpAnalytics(el);
+      it('initialize iframe transport', () => {
+        const el = doc.createElement('amp-analytics');
+        el.setAttribute('type', 'foo');
+        doc.body.appendChild(el);
+        const analytics = new AmpAnalytics(el);
 
-      sandbox.stub(AnalyticsConfig.prototype, 'loadConfig')
+        sandbox
+          .stub(AnalyticsConfig.prototype, 'loadConfig')
           .returns(Promise.resolve(sampleconfig));
 
-      analytics.buildCallback();
-      analytics.preconnectCallback();
-      const initSpy = sandbox.spy(
-          Transport.prototype, 'maybeInitIframeTransport');
-      return analytics.layoutCallback().then(() => {
-        expect(initSpy).to.be.called;
+        analytics.buildCallback();
+        analytics.preconnectCallback();
+        const initSpy = sandbox.spy(
+          Transport.prototype,
+          'maybeInitIframeTransport'
+        );
+        return analytics.layoutCallback().then(() => {
+          expect(initSpy).to.be.called;
+        });
       });
     });
-  });
 
-  describe('parentPostMessage in inabox case', () => {
-    let postMessageSpy;
+    describe('parentPostMessage in inabox case', () => {
+      let postMessageSpy;
 
-    function waitForParentPostMessage(opt_max) {
-      if (postMessageSpy.callCount) {
-        return Promise.resolve();
+      function waitForParentPostMessage(opt_max) {
+        if (postMessageSpy.callCount) {
+          return Promise.resolve();
+        }
+        return new Promise(resolve => {
+          const start = Date.now();
+          const interval = setInterval(() => {
+            const time = Date.now();
+            if (
+              postMessageSpy.callCount ||
+              (opt_max && time - start > opt_max)
+            ) {
+              clearInterval(interval);
+              resolve();
+            }
+          }, 4);
+        });
       }
-      return new Promise(resolve => {
-        const start = Date.now();
-        const interval = setInterval(() => {
-          const time = Date.now();
-          if (postMessageSpy.callCount ||
-              (opt_max && (time - start) > opt_max)) {
-            clearInterval(interval);
-            resolve();
-          }
-        }, 4);
-      });
-    }
 
-    function waitForNoParentPostMessage() {
-      return waitForParentPostMessage(100).then(() => {
-        expect(postMessageSpy).to.not.be.called;
-      });
-    }
+      function waitForNoParentPostMessage() {
+        return waitForParentPostMessage(100).then(() => {
+          expect(postMessageSpy).to.not.be.called;
+        });
+      }
 
-    it('does send a hit when parentPostMessage is provided inabox', function() {
-      env.win.AMP_MODE.runtime = 'inabox';
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/bar'},
-        'triggers': [{'on': 'visible', 'parentPostMessage': 'foo'}],
-      });
-      postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
-      return waitForNoSendRequest(analytics).then(() => {
-        return waitForParentPostMessage();
+      it('does send a hit when parentPostMessage is provided inabox', function() {
+        env.win.AMP_MODE.runtime = 'inabox';
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [{'on': 'visible', 'parentPostMessage': 'foo'}],
+        });
+        postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
+        return waitForNoSendRequest(analytics).then(() => {
+          return waitForParentPostMessage();
+        });
       });
-    });
 
-    it('does not send with parentPostMessage not inabox', function() {
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/bar'},
-        'triggers': [{
-          'on': 'visible',
-          'parentPostMessage': 'foo',
-        }],
-      });
-      postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
-      return waitForNoSendRequest(analytics).then(() => {
-        return waitForNoParentPostMessage();
+      it('does not send with parentPostMessage not inabox', function() {
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [
+            {
+              'on': 'visible',
+              'parentPostMessage': 'foo',
+            },
+          ],
+        });
+        postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
+        return waitForNoSendRequest(analytics).then(() => {
+          return waitForNoParentPostMessage();
+        });
       });
-    });
 
-    it('not send when request and parentPostMessage are not provided',
-        function() {
-          env.win.AMP_MODE.runtime = 'inabox';
-          expectAsyncConsoleError(onAndRequestAttributesInaboxError);
-          const analytics = getAnalyticsTag({
-            'requests': {'foo': 'https://example.com/bar'},
-            'triggers': [{'on': 'visible'}],
-          });
-          postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
-          return waitForNoSendRequest(analytics).then(() => {
-            return waitForNoParentPostMessage();
-          });
+      it('not send when request and parentPostMessage are not provided', function() {
+        env.win.AMP_MODE.runtime = 'inabox';
+        expectAsyncConsoleError(onAndRequestAttributesInaboxError);
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [{'on': 'visible'}],
+        });
+        postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
+        return waitForNoSendRequest(analytics).then(() => {
+          return waitForNoParentPostMessage();
         });
-
-    it('send when request and parentPostMessage are provided', function() {
-      env.win.AMP_MODE.runtime = 'inabox';
-      const analytics = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/bar'},
-        'triggers': [{
-          'on': 'visible',
-          'parentPostMessage': 'bar',
-          'request': 'foo',
-        }],
       });
-      postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
-      return waitForSendRequest(analytics).then(() => {
-        return waitForParentPostMessage(analytics);
+
+      it('send when request and parentPostMessage are provided', function() {
+        env.win.AMP_MODE.runtime = 'inabox';
+        const analytics = getAnalyticsTag({
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [
+            {
+              'on': 'visible',
+              'parentPostMessage': 'bar',
+              'request': 'foo',
+            },
+          ],
+        });
+        postMessageSpy = sandbox.spy(analytics.win.parent, 'postMessage');
+        return waitForSendRequest(analytics).then(() => {
+          return waitForParentPostMessage(analytics);
+        });
       });
     });
-  });
 
-  describe('getLayoutPriority', () => {
-    function getConfig() {
-      return {
-        'requests': {
-          'pageview1': '/test1=${requestCount}',
-        },
-        'triggers': {
-          'conditional': {
-            'on': 'visible',
-            'request': 'pageview1',
-            'vars': {},
+    describe('getLayoutPriority', () => {
+      function getConfig() {
+        return {
+          'requests': {
+            'pageview1': '/test1=${requestCount}',
           },
-        },
-        'vars': {},
-      };
-    }
+          'triggers': {
+            'conditional': {
+              'on': 'visible',
+              'request': 'pageview1',
+              'vars': {},
+            },
+          },
+          'vars': {},
+        };
+      }
 
-    it('is 1 for non-inabox', () => {
-      expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
-          LayoutPriority.METADATA);
-    });
+      it('is 1 for non-inabox', () => {
+        expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
+          LayoutPriority.METADATA
+        );
+      });
 
-    it('is 0 for inabox', () => {
-      env.win.AMP_MODE.runtime = 'inabox';
-      expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
-          LayoutPriority.CONTENT);
+      it('is 0 for inabox', () => {
+        env.win.AMP_MODE.runtime = 'inabox';
+        expect(getAnalyticsTag(getConfig()).getLayoutPriority()).to.equal(
+          LayoutPriority.CONTENT
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-analytics/0.1/test/test-analytics-group.js b/extensions/amp-analytics/0.1/test/test-analytics-group.js
index 37ad038f88ff..9897c80675d9 100644
--- a/extensions/amp-analytics/0.1/test/test-analytics-group.js
+++ b/extensions/amp-analytics/0.1/test/test-analytics-group.js
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  AmpdocAnalyticsRoot,
-} from '../analytics-root.js';
-import {
-  AnalyticsGroup,
-} from '../analytics-group.js';
+import {AmpdocAnalyticsRoot} from '../analytics-root.js';
+import {AnalyticsGroup} from '../analytics-group.js';
 import {
   ClickEventTracker,
   CustomEventTracker,
@@ -50,9 +46,11 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
 
   it('should reject trigger in a disallowed environment', () => {
     sandbox.stub(root, 'getType').callsFake(() => 'other');
-    allowConsoleError(() => { expect(() => {
-      group.addTrigger({on: 'click', selector: '*'});
-    }).to.throw(/Trigger type "click" is not allowed in the other/); });
+    allowConsoleError(() => {
+      expect(() => {
+        group.addTrigger({on: 'click', selector: '*'});
+      }).to.throw(/Trigger type "click" is not allowed in the other/);
+    });
   });
 
   it('should reject trigger that fails to initialize', () => {
@@ -73,8 +71,7 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     expect(group.listeners_).to.be.empty;
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
-    expect(stub).to.be.calledWith(
-        analyticsElement, 'click', config, handler);
+    expect(stub).to.be.calledWith(analyticsElement, 'click', config, handler);
     expect(group.listeners_).to.have.length(1);
     expect(group.listeners_[0]).to.equal(unlisten);
   });
@@ -88,8 +85,7 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     expect(group.listeners_).to.be.empty;
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
-    expect(stub).to.be.calledWith(
-        analyticsElement, 'scroll', config, handler);
+    expect(stub).to.be.calledWith(analyticsElement, 'scroll', config, handler);
     expect(group.listeners_).to.have.length(1);
     expect(group.listeners_[0]).to.equal(unlisten);
   });
@@ -104,7 +100,11 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
     expect(stub).to.be.calledWith(
-        analyticsElement, 'custom-event-1', config, handler);
+      analyticsElement,
+      'custom-event-1',
+      config,
+      handler
+    );
     expect(group.listeners_).to.have.length(1);
     expect(group.listeners_[0]).to.equal(unlisten);
   });
@@ -121,7 +121,11 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
     expect(stub).to.be.calledWith(
-        analyticsElement, 'render-start', config, handler);
+      analyticsElement,
+      'render-start',
+      config,
+      handler
+    );
   });
 
   it('should add "ini-load" trigger', () => {
@@ -136,14 +140,19 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
     expect(stub).to.be.calledWith(
-        analyticsElement, 'ini-load', config, handler);
+      analyticsElement,
+      'ini-load',
+      config,
+      handler
+    );
   });
 
   it('should add "timer" trigger', () => {
     const handler = function() {};
     const unlisten = function() {};
-    const stub = sandbox.stub(TimerEventTracker.prototype, 'add').callsFake(
-        () => unlisten);
+    const stub = sandbox
+      .stub(TimerEventTracker.prototype, 'add')
+      .callsFake(() => unlisten);
     const config = {on: 'timer'};
     group.addTrigger(config, handler);
     const tracker = root.getTrackerOptional('timer');
@@ -165,8 +174,7 @@ describes.realWin('AnalyticsGroup', {amp: 1}, env => {
     const handler = function() {};
     group.addTrigger(config, handler);
     expect(stub).to.be.calledOnce;
-    expect(stub).to.be.calledWith(
-        analyticsElement, 'visible', config, handler);
+    expect(stub).to.be.calledWith(analyticsElement, 'visible', config, handler);
   });
 
   it('should add "visible" trigger for hidden', () => {
diff --git a/extensions/amp-analytics/0.1/test/test-analytics-root.js b/extensions/amp-analytics/0.1/test/test-analytics-root.js
index 32886fea121e..da24eb5534e0 100644
--- a/extensions/amp-analytics/0.1/test/test-analytics-root.js
+++ b/extensions/amp-analytics/0.1/test/test-analytics-root.js
@@ -14,19 +14,10 @@
  * limitations under the License.
  */
 
-import {
-  AmpDocShadow,
-} from '../../../../src/service/ampdoc-impl';
-import {
-  AmpdocAnalyticsRoot,
-  EmbedAnalyticsRoot,
-} from '../analytics-root';
-import {
-  CustomEventTracker,
-} from '../events';
-import {
-  HostServices,
-} from '../../../../src/inabox/host-services';
+import {AmpDocShadow} from '../../../../src/service/ampdoc-impl';
+import {AmpdocAnalyticsRoot, EmbedAnalyticsRoot} from '../analytics-root';
+import {CustomEventTracker} from '../events';
+import {HostServices} from '../../../../src/inabox/host-services';
 import {ScrollManager} from '../scroll-manager';
 import {
   VisibilityManagerForDoc,
@@ -34,7 +25,6 @@ import {
 } from '../visibility-manager';
 import {VisibilityManagerForMApp} from '../visibility-manager-for-mapp';
 
-
 describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
   let win;
   let ampdoc;
@@ -107,8 +97,9 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
   });
 
   it('should provide the correct rect for ini-load for main doc', () => {
-    const stub = sandbox.stub(resources, 'getResourcesInRect').callsFake(
-        () => Promise.resolve([]));
+    const stub = sandbox
+      .stub(resources, 'getResourcesInRect')
+      .callsFake(() => Promise.resolve([]));
     root.whenIniLoaded();
     expect(stub).to.be.calledOnce;
     expect(stub.args[0][0]).to.equal(win);
@@ -127,8 +118,9 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
         return {left: 10, top: 11, width: 100, height: 200};
       }
     });
-    const stub = sandbox.stub(resources, 'getResourcesInRect').callsFake(
-        () => Promise.resolve([]));
+    const stub = sandbox
+      .stub(resources, 'getResourcesInRect')
+      .callsFake(() => Promise.resolve([]));
     root.whenIniLoaded();
     expect(stub).to.be.calledOnce;
     expect(stub.args[0][0]).to.equal(win);
@@ -180,21 +172,21 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
     expect(root.getScrollManager()).to.equal(scrollManager);
   });
 
-
   describe('getElement', () => {
-
     let allTestInstances;
     let getTestPromise;
     let addTestInstance;
 
     beforeEach(() => {
       getTestPromise = (promise, result) => {
-        return promise.then(element => {
-          expect(result).to.not.be.null;
-          expect(element).to.equal(result);
-        }).catch(error => {
-          expect(error).to.match(new RegExp(result));
-        });
+        return promise
+          .then(element => {
+            expect(result).to.not.be.null;
+            expect(element).to.equal(result);
+          })
+          .catch(error => {
+            expect(error).to.match(new RegExp(result));
+          });
       };
 
       allTestInstances = [];
@@ -208,25 +200,34 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
       return Promise.all(allTestInstances);
     });
 
-
     it('should find :root', () => {
       const rootElement = win.document.documentElement;
       addTestInstance(root.getElement(body, ':root'), rootElement);
       addTestInstance(root.getElement(target, ':root'), rootElement);
       addTestInstance(root.getElement(target, ':root', ':scope'), rootElement);
       addTestInstance(
-          root.getElement(target, ':root', ':closest'), rootElement);
+        root.getElement(target, ':root', ':closest'),
+        rootElement
+      );
     });
 
     it('should find :host, but always null', () => {
-      addTestInstance(root.getElement(body, ':host'),
-          'Element ":host" not found');
-      addTestInstance(root.getElement(target, ':host'),
-          'Element ":host" not found');
-      addTestInstance(root.getElement(target, ':host', ':scope'),
-          'Element ":host" not found');
-      addTestInstance(root.getElement(target, ':host', ':closest'),
-          'Element ":host" not found');
+      addTestInstance(
+        root.getElement(body, ':host'),
+        'Element ":host" not found'
+      );
+      addTestInstance(
+        root.getElement(target, ':host'),
+        'Element ":host" not found'
+      );
+      addTestInstance(
+        root.getElement(target, ':host', ':scope'),
+        'Element ":host" not found'
+      );
+      addTestInstance(
+        root.getElement(target, ':host', ':closest'),
+        'Element ":host" not found'
+      );
     });
 
     it('should find element by ID', () => {
@@ -345,13 +346,15 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
     });
   });
 
-
   describe('createSelectiveListener', () => {
-
     function matches(context, target, selector, selectionMethod) {
       const listener = sandbox.spy();
       const selective = root.createSelectiveListener(
-          listener, context, selector, selectionMethod);
+        listener,
+        context,
+        selector,
+        selectionMethod
+      );
       selective({target});
       if (listener.callCount == 1) {
         return listener.args[0][0];
@@ -367,12 +370,13 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
     it('should match root', () => {
       const {documentElement} = win.document;
       expect(matches(body, documentElement, '*')).to.equal(documentElement);
-      expect(matches(body, documentElement, ':root'))
-          .to.equal(documentElement);
-      expect(matches(body, documentElement, ':root', 'closest'))
-          .to.equal(documentElement);
-      expect(matches(body, documentElement, ':root', 'scope'))
-          .to.equal(documentElement);
+      expect(matches(body, documentElement, ':root')).to.equal(documentElement);
+      expect(matches(body, documentElement, ':root', 'closest')).to.equal(
+        documentElement
+      );
+      expect(matches(body, documentElement, ':root', 'scope')).to.equal(
+        documentElement
+      );
     });
 
     it('should match direct target', () => {
@@ -408,8 +412,9 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
       expect(matches(target, target, '#target', 'scope')).to.equal(target);
       expect(matches(target, target, '.target', 'scope')).to.equal(target);
       expect(matches(target, target, 'target', 'scope')).to.equal(target);
-      expect(matches(target, target, '#target.target', 'scope'))
-          .to.equal(target);
+      expect(matches(target, target, '#target.target', 'scope')).to.equal(
+        target
+      );
 
       expect(matches(child, target, '#target', 'scope')).to.be.null;
       expect(matches(child, target, '.target', 'scope')).to.be.null;
@@ -424,8 +429,9 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
       expect(matches(child, child, '#target', 'closest')).to.equal(target);
       expect(matches(child, child, '.target', 'closest')).to.equal(target);
       expect(matches(child, child, 'target', 'closest')).to.equal(target);
-      expect(matches(child, child, '#target.target', 'closest'))
-          .to.equal(target);
+      expect(matches(child, child, '#target.target', 'closest')).to.equal(
+        target
+      );
 
       expect(matches(body, target, '*', 'closest')).to.equal(body);
       expect(matches(body, target, '#target', 'closest')).to.be.null;
@@ -442,218 +448,238 @@ describes.realWin('AmpdocAnalyticsRoot', {amp: 1}, env => {
   });
 });
 
+describes.realWin(
+  'EmbedAnalyticsRoot',
+  {
+    amp: {ampdoc: 'fie'},
+  },
+  env => {
+    let win;
+    let embed;
+    let ampdoc;
+    let parentRoot;
+    let root;
+    let body, target, child, other;
 
-describes.realWin('EmbedAnalyticsRoot', {
-  amp: {ampdoc: 'fie'},
-}, env => {
-  let win;
-  let embed;
-  let ampdoc;
-  let parentRoot;
-  let root;
-  let body, target, child, other;
-
-  beforeEach(() => {
-    win = env.win;
-    embed = env.embed;
-    ampdoc = env.ampdoc;
-    embed.host = ampdoc.win.document.createElement('amp-embed-host');
-    parentRoot = new AmpdocAnalyticsRoot(ampdoc);
-    root = new EmbedAnalyticsRoot(ampdoc, embed, parentRoot);
-    body = win.document.body;
-
-    target = win.document.createElement('target');
-    target.id = 'target';
-    target.className = 'target';
-    body.appendChild(target);
-
-    child = win.document.createElement('child');
-    child.id = 'child';
-    child.className = 'child';
-    target.appendChild(child);
-
-    other = win.document.createElement('div');
-    other.id = 'other';
-    other.className = 'other';
-    body.appendChild(other);
-  });
-
-  it('should initialize correctly', () => {
-    expect(root.ampdoc).to.equal(ampdoc);
-    expect(root.getType()).to.equal('embed');
-    expect(root.parent).to.equal(parentRoot);
-    expect(root.getHostElement()).to.be.equal(embed.iframe);
-    expect(root.getRoot()).to.equal(win.document);
-    expect(root.getRootElement()).to.equal(win.document.documentElement);
-    expect(root.contains(target)).to.be.true;
-    expect(root.getElementById('target')).to.equal(target);
-  });
-
-  it('should add tracker, reuse and dispose', () => {
-    const tracker = root.getTracker('custom', CustomEventTracker);
-    expect(tracker).to.be.instanceOf(CustomEventTracker);
-    expect(tracker.root).to.equal(root);
-
-    // Reused.
-    expect(root.getTracker('custom', CustomEventTracker)).to.equal(tracker);
-    expect(root.getTrackerOptional('custom')).to.equal(tracker);
-
-    // Dispose.
-    const stub = sandbox.stub(tracker, 'dispose');
-    root.dispose();
-    expect(stub).to.be.calledOnce;
-    expect(root.getTrackerOptional('custom')).to.be.null;
-  });
-
-  it('should create and reuse trackers, but not if not in whitelist', () => {
-    const whitelist = {
-      'custom': CustomEventTracker,
-    };
-    const customTracker = root.getTrackerForWhitelist('custom', whitelist);
-    expect(customTracker).to.be.instanceOf(CustomEventTracker);
-    expect(customTracker.root).to.equal(root);
-
-    const noneTracker = root.getTrackerForWhitelist('none', whitelist);
-    expect(noneTracker).to.be.null;
-
-    expect(root.getTrackerForWhitelist('custom', whitelist))
-        .to.equal(customTracker);
-    expect(root.getTracker('custom', CustomEventTracker))
-        .to.equal(customTracker);
-  });
-
-  it('should init with embed signals', () => {
-    expect(root.signals()).to.equal(embed.signals());
-  });
-
-  it('should resolve ini-load signal', () => {
-    const stub = sandbox.stub(embed, 'whenIniLoaded').callsFake(
-        () => Promise.resolve());
-    return root.whenIniLoaded().then(() => {
+    beforeEach(() => {
+      win = env.win;
+      embed = env.embed;
+      ampdoc = env.ampdoc;
+      embed.host = ampdoc.win.document.createElement('amp-embed-host');
+      parentRoot = new AmpdocAnalyticsRoot(ampdoc);
+      root = new EmbedAnalyticsRoot(ampdoc, embed, parentRoot);
+      body = win.document.body;
+
+      target = win.document.createElement('target');
+      target.id = 'target';
+      target.className = 'target';
+      body.appendChild(target);
+
+      child = win.document.createElement('child');
+      child.id = 'child';
+      child.className = 'child';
+      target.appendChild(child);
+
+      other = win.document.createElement('div');
+      other.id = 'other';
+      other.className = 'other';
+      body.appendChild(other);
+    });
+
+    it('should initialize correctly', () => {
+      expect(root.ampdoc).to.equal(ampdoc);
+      expect(root.getType()).to.equal('embed');
+      expect(root.parent).to.equal(parentRoot);
+      expect(root.getHostElement()).to.be.equal(embed.iframe);
+      expect(root.getRoot()).to.equal(win.document);
+      expect(root.getRootElement()).to.equal(win.document.documentElement);
+      expect(root.contains(target)).to.be.true;
+      expect(root.getElementById('target')).to.equal(target);
+    });
+
+    it('should add tracker, reuse and dispose', () => {
+      const tracker = root.getTracker('custom', CustomEventTracker);
+      expect(tracker).to.be.instanceOf(CustomEventTracker);
+      expect(tracker.root).to.equal(root);
+
+      // Reused.
+      expect(root.getTracker('custom', CustomEventTracker)).to.equal(tracker);
+      expect(root.getTrackerOptional('custom')).to.equal(tracker);
+
+      // Dispose.
+      const stub = sandbox.stub(tracker, 'dispose');
+      root.dispose();
       expect(stub).to.be.calledOnce;
+      expect(root.getTrackerOptional('custom')).to.be.null;
     });
-  });
 
-  it('should create visibility root', () => {
-    const visibilityManager = root.getVisibilityManager();
-    expect(visibilityManager).to.be.instanceOf(VisibilityManagerForEmbed);
-    expect(visibilityManager.ampdoc).to.equal(ampdoc);
-    expect(visibilityManager.embed).to.equal(embed);
-    expect(visibilityManager.parent)
-        .to.equal(parentRoot.getVisibilityManager());
-    // Ensure the instance is reused.
-    expect(root.getVisibilityManager()).to.equal(visibilityManager);
-  });
+    it('should create and reuse trackers, but not if not in whitelist', () => {
+      const whitelist = {
+        'custom': CustomEventTracker,
+      };
+      const customTracker = root.getTrackerForWhitelist('custom', whitelist);
+      expect(customTracker).to.be.instanceOf(CustomEventTracker);
+      expect(customTracker.root).to.equal(root);
 
+      const noneTracker = root.getTrackerForWhitelist('none', whitelist);
+      expect(noneTracker).to.be.null;
 
-  describe('getElement', () => {
+      expect(root.getTrackerForWhitelist('custom', whitelist)).to.equal(
+        customTracker
+      );
+      expect(root.getTracker('custom', CustomEventTracker)).to.equal(
+        customTracker
+      );
+    });
 
-    let getElementTestInstances;
-    let addTestInstance;
-    beforeEach(() => {
-      getElementTestInstances = {
-        'promises': [],
-        'results': [],
-      };
-      addTestInstance = (promise, result) => {
-        getElementTestInstances.promises.push(promise);
-        getElementTestInstances.results.push(result);
-      };
+    it('should init with embed signals', () => {
+      expect(root.signals()).to.equal(embed.signals());
     });
 
-    afterEach(() => {
-      // Tests happen here.
-      return Promise.all(getElementTestInstances.promises).then(values => {
-        for (let i = 0; i < values.length; i++) {
-          expect(values[i]).to.equal(getElementTestInstances.results[i]);
-        }
+    it('should resolve ini-load signal', () => {
+      const stub = sandbox
+        .stub(embed, 'whenIniLoaded')
+        .callsFake(() => Promise.resolve());
+      return root.whenIniLoaded().then(() => {
+        expect(stub).to.be.calledOnce;
       });
     });
 
-    it('should find :root', () => {
-      const rootElement = win.document.documentElement;
-      addTestInstance(root.getElement(body, ':root'), rootElement);
-      addTestInstance(root.getElement(target, ':root'), rootElement);
-      addTestInstance(root.getElement(target, ':root', ':scope'), rootElement);
-      addTestInstance(
-          root.getElement(target, ':root', ':closest'), rootElement);
-    });
+    it('should create visibility root', () => {
+      const visibilityManager = root.getVisibilityManager();
+      expect(visibilityManager).to.be.instanceOf(VisibilityManagerForEmbed);
+      expect(visibilityManager.ampdoc).to.equal(ampdoc);
+      expect(visibilityManager.embed).to.equal(embed);
+      expect(visibilityManager.parent).to.equal(
+        parentRoot.getVisibilityManager()
+      );
+      // Ensure the instance is reused.
+      expect(root.getVisibilityManager()).to.equal(visibilityManager);
+    });
+
+    describe('getElement', () => {
+      let getElementTestInstances;
+      let addTestInstance;
+      beforeEach(() => {
+        getElementTestInstances = {
+          'promises': [],
+          'results': [],
+        };
+        addTestInstance = (promise, result) => {
+          getElementTestInstances.promises.push(promise);
+          getElementTestInstances.results.push(result);
+        };
+      });
 
-    it('should find :host', () => {
-      addTestInstance(root.getElement(body, ':host'), embed.iframe);
-      addTestInstance(root.getElement(target, ':host'), embed.iframe);
-      addTestInstance(root.getElement(target, ':host', ':scope'), embed.iframe);
-      addTestInstance(
-          root.getElement(target, ':host', ':closest'), embed.iframe);
-    });
+      afterEach(() => {
+        // Tests happen here.
+        return Promise.all(getElementTestInstances.promises).then(values => {
+          for (let i = 0; i < values.length; i++) {
+            expect(values[i]).to.equal(getElementTestInstances.results[i]);
+          }
+        });
+      });
 
-    it('should find element by ID', () => {
-      addTestInstance(root.getElement(body, '#target'), target);
-      addTestInstance(root.getElement(body, '#child'), child);
-      addTestInstance(root.getElement(target, '#target'), target);
-      addTestInstance(root.getElement(child, '#target'), target);
-      addTestInstance(root.getElement(other, '#target'), target);
-    });
+      it('should find :root', () => {
+        const rootElement = win.document.documentElement;
+        addTestInstance(root.getElement(body, ':root'), rootElement);
+        addTestInstance(root.getElement(target, ':root'), rootElement);
+        addTestInstance(
+          root.getElement(target, ':root', ':scope'),
+          rootElement
+        );
+        addTestInstance(
+          root.getElement(target, ':root', ':closest'),
+          rootElement
+        );
+      });
 
-    it('should find element by class', () => {
-      addTestInstance(root.getElement(body, '.target'), target);
-      addTestInstance(root.getElement(body, '.child'), child);
-      addTestInstance(root.getElement(target, '.target'), target);
-      addTestInstance(root.getElement(child, '.target'), target);
-      addTestInstance(root.getElement(other, '.target'), target);
-    });
-  });
+      it('should find :host', () => {
+        addTestInstance(root.getElement(body, ':host'), embed.iframe);
+        addTestInstance(root.getElement(target, ':host'), embed.iframe);
+        addTestInstance(
+          root.getElement(target, ':host', ':scope'),
+          embed.iframe
+        );
+        addTestInstance(
+          root.getElement(target, ':host', ':closest'),
+          embed.iframe
+        );
+      });
 
+      it('should find element by ID', () => {
+        addTestInstance(root.getElement(body, '#target'), target);
+        addTestInstance(root.getElement(body, '#child'), child);
+        addTestInstance(root.getElement(target, '#target'), target);
+        addTestInstance(root.getElement(child, '#target'), target);
+        addTestInstance(root.getElement(other, '#target'), target);
+      });
 
-  describe('createSelectiveListener', () => {
+      it('should find element by class', () => {
+        addTestInstance(root.getElement(body, '.target'), target);
+        addTestInstance(root.getElement(body, '.child'), child);
+        addTestInstance(root.getElement(target, '.target'), target);
+        addTestInstance(root.getElement(child, '.target'), target);
+        addTestInstance(root.getElement(other, '.target'), target);
+      });
+    });
 
-    function matches(context, target, selector, selectionMethod) {
-      const listener = sandbox.spy();
-      const selective = root.createSelectiveListener(
-          listener, context, selector, selectionMethod);
-      selective({target});
-      if (listener.callCount == 1) {
-        return listener.args[0][0];
+    describe('createSelectiveListener', () => {
+      function matches(context, target, selector, selectionMethod) {
+        const listener = sandbox.spy();
+        const selective = root.createSelectiveListener(
+          listener,
+          context,
+          selector,
+          selectionMethod
+        );
+        selective({target});
+        if (listener.callCount == 1) {
+          return listener.args[0][0];
+        }
+        return null;
       }
-      return null;
-    }
 
-    it('should never match host', () => {
-      expect(matches(body, target, ':host')).to.be.null;
-      expect(matches(target, target, ':host')).to.be.null;
-    });
+      it('should never match host', () => {
+        expect(matches(body, target, ':host')).to.be.null;
+        expect(matches(target, target, ':host')).to.be.null;
+      });
 
-    it('should match root', () => {
-      const {documentElement} = win.document;
-      expect(matches(body, documentElement, '*')).to.equal(documentElement);
-      expect(matches(body, documentElement, ':root'))
-          .to.equal(documentElement);
-      expect(matches(body, documentElement, ':root', 'closest'))
-          .to.equal(documentElement);
-      expect(matches(body, documentElement, ':root', 'scope'))
-          .to.equal(documentElement);
-    });
+      it('should match root', () => {
+        const {documentElement} = win.document;
+        expect(matches(body, documentElement, '*')).to.equal(documentElement);
+        expect(matches(body, documentElement, ':root')).to.equal(
+          documentElement
+        );
+        expect(matches(body, documentElement, ':root', 'closest')).to.equal(
+          documentElement
+        );
+        expect(matches(body, documentElement, ':root', 'scope')).to.equal(
+          documentElement
+        );
+      });
 
-    it('should match direct target', () => {
-      expect(matches(body, target, '*')).to.equal(target);
-      expect(matches(body, target, '#target')).to.equal(target);
-      expect(matches(body, target, '.target')).to.equal(target);
-      expect(matches(body, target, 'target')).to.equal(target);
-      expect(matches(body, target, '#target.target')).to.equal(target);
-    });
+      it('should match direct target', () => {
+        expect(matches(body, target, '*')).to.equal(target);
+        expect(matches(body, target, '#target')).to.equal(target);
+        expect(matches(body, target, '.target')).to.equal(target);
+        expect(matches(body, target, 'target')).to.equal(target);
+        expect(matches(body, target, '#target.target')).to.equal(target);
+      });
 
-    it('should match target via child', () => {
-      expect(matches(body, child, '*')).to.equal(child);
-      expect(matches(body, child, '#target')).to.equal(target);
-      expect(matches(body, child, '.target')).to.equal(target);
-      expect(matches(body, child, 'target')).to.equal(target);
-      expect(matches(body, child, '#target.target')).to.equal(target);
-    });
+      it('should match target via child', () => {
+        expect(matches(body, child, '*')).to.equal(child);
+        expect(matches(body, child, '#target')).to.equal(target);
+        expect(matches(body, child, '.target')).to.equal(target);
+        expect(matches(body, child, 'target')).to.equal(target);
+        expect(matches(body, child, '#target.target')).to.equal(target);
+      });
 
-    it('should NOT match nodes not in root', () => {
-      expect(matches(body, target, '*')).to.equal(target);
-      sandbox.stub(root, 'contains').callsFake(() => false);
-      expect(matches(body, target, '*')).to.be.null;
+      it('should NOT match nodes not in root', () => {
+        expect(matches(body, target, '*')).to.equal(target);
+        sandbox.stub(root, 'contains').callsFake(() => false);
+        expect(matches(body, target, '*')).to.be.null;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-analytics/0.1/test/test-config.js b/extensions/amp-analytics/0.1/test/test-config.js
index 0baeb3b24cea..c74ba9c19906 100644
--- a/extensions/amp-analytics/0.1/test/test-config.js
+++ b/extensions/amp-analytics/0.1/test/test-config.js
@@ -22,7 +22,6 @@ import {map} from '../../../../src/utils/object';
 import {stubService} from '../../../../testing/test-helper';
 
 describes.realWin('AnalyticsConfig', {amp: false}, env => {
-
   let win;
   let doc;
   let sandbox;
@@ -43,10 +42,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         'requests': {'foo': '/bar', 'bar': 'foobar'},
       };
 
-      const element = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/${bar}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': 'https://example.com/${bar}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']).to.deep.equal({
@@ -57,9 +59,12 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
             baseUrl: 'foobar',
           },
         });
-        expect(config['triggers']).to.deep.equal([{
-          'on': 'visible', 'request': 'foo',
-        }]);
+        expect(config['triggers']).to.deep.equal([
+          {
+            'on': 'visible',
+            'request': 'foo',
+          },
+        ]);
       });
     });
 
@@ -73,13 +78,19 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': {
-          'baseUrl': 'https://example.com/${bar}',
-          'batchInterval': 0,
-        }, 'bar': 'bar-i'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {
+            'foo': {
+              'baseUrl': 'https://example.com/${bar}',
+              'batchInterval': 0,
+            },
+            'bar': 'bar-i',
+          },
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']).to.deep.equal({
@@ -92,9 +103,12 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
             'batchInterval': 2,
           },
         });
-        expect(config['triggers']).to.deep.equal([{
-          'on': 'visible', 'request': 'foo',
-        }]);
+        expect(config['triggers']).to.deep.equal([
+          {
+            'on': 'visible',
+            'request': 'foo',
+          },
+        ]);
       });
     });
 
@@ -107,21 +121,24 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
           'bar': {
             'baseUrl': 'bar-v',
-          }},
-      };
-      const element = getAnalyticsTag({
-        'requests': {
-          'foo': {
-            'baseUrl': 'https://example.com/${bar}',
-            'batchInterval': 0,
           },
-          'bar': {
-            'batchInterval': 3,
+        },
+      };
+      const element = getAnalyticsTag(
+        {
+          'requests': {
+            'foo': {
+              'baseUrl': 'https://example.com/${bar}',
+              'batchInterval': 0,
+            },
+            'bar': {
+              'batchInterval': 3,
+            },
           },
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
         },
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
-
+        {'type': '-test-venfor'}
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']).to.deep.equal({
@@ -134,30 +151,38 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
             'batchInterval': 3,
           },
         });
-        expect(config['triggers']).to.deep.equal([{
-          'on': 'visible', 'request': 'foo',
-        }]);
+        expect(config['triggers']).to.deep.equal([
+          {
+            'on': 'visible',
+            'request': 'foo',
+          },
+        ]);
       });
     });
 
     it('inline and remote both string', () => {
-      const element = getAnalyticsTag({
-        'vars': {'title': 'local'},
-        'requests': {'foo': 'https://example.com/${title}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'config': '//config-rv2',
-      });
-
-      stubXhr().returns(Promise.resolve({
-        json() {
-          return Promise.resolve({
-            requests: {
-              foo: 'https://example.com/remote',
-            },
-          });
+      const element = getAnalyticsTag(
+        {
+          'vars': {'title': 'local'},
+          'requests': {'foo': 'https://example.com/${title}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
         },
-      }));
+        {
+          'config': '//config-rv2',
+        }
+      );
+
+      stubXhr().returns(
+        Promise.resolve({
+          json() {
+            return Promise.resolve({
+              requests: {
+                foo: 'https://example.com/remote',
+              },
+            });
+          },
+        })
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']).to.deep.equal({
@@ -165,9 +190,12 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
             'baseUrl': 'https://example.com/remote',
           },
         });
-        expect(config['triggers']).to.deep.equal([{
-          'on': 'visible', 'request': 'foo',
-        }]);
+        expect(config['triggers']).to.deep.equal([
+          {
+            'on': 'visible',
+            'request': 'foo',
+          },
+        ]);
       });
     });
   });
@@ -175,29 +203,39 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
   describe('mergeObjects', () => {
     it('merges objects correctly', function() {
       expect(mergeObjects({}, {})).to.deep.equal({});
-      expect(mergeObjects(map({'a': 0}), map({'b': 1})))
-          .to.deep.equal(map({'a': 0, 'b': 1}));
-      expect(mergeObjects({'foo': 1}, {'1': 1}))
-          .to.deep.equal({'foo': 1, '1': 1});
-      expect(mergeObjects({'1': 1}, {'bar': 'bar'}))
-          .to.deep.equal({'1': 1, 'bar': 'bar'});
-      expect(mergeObjects({'foo': [1, 2, 3, 4]}, {'bar': [4, 5, 6, 7]}))
-          .to.deep.equal({'foo': [1,2, 3, 4], 'bar': [4, 5, 6, 7]});
-      expect(mergeObjects(
-          null, {'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}}))
-          .to.deep.equal({'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}});
-      expect(mergeObjects(
-          undefined,
-          {'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}}))
-          .to.deep.equal({'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}});
-      expect(mergeObjects(
+      expect(mergeObjects(map({'a': 0}), map({'b': 1}))).to.deep.equal(
+        map({'a': 0, 'b': 1})
+      );
+      expect(mergeObjects({'foo': 1}, {'1': 1})).to.deep.equal({
+        'foo': 1,
+        '1': 1,
+      });
+      expect(mergeObjects({'1': 1}, {'bar': 'bar'})).to.deep.equal({
+        '1': 1,
+        'bar': 'bar',
+      });
+      expect(
+        mergeObjects({'foo': [1, 2, 3, 4]}, {'bar': [4, 5, 6, 7]})
+      ).to.deep.equal({'foo': [1, 2, 3, 4], 'bar': [4, 5, 6, 7]});
+      expect(
+        mergeObjects(null, {'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}})
+      ).to.deep.equal({'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}});
+      expect(
+        mergeObjects(undefined, {
+          'foo': 'bar',
+          'baz': {'foobar': ['abc', 'def']},
+        })
+      ).to.deep.equal({'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}});
+      expect(
+        mergeObjects(
           {'baz': 'bar', 'foobar': {'foobar': ['abc', 'def']}},
-          {'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}}))
-          .to.deep.equal({
-            'foo': 'bar',
-            'baz': 'bar',
-            'foobar': {'foobar': ['abc', 'def']},
-          });
+          {'foo': 'bar', 'baz': {'foobar': ['abc', 'def']}}
+        )
+      ).to.deep.equal({
+        'foo': 'bar',
+        'baz': 'bar',
+        'foobar': {'foobar': ['abc', 'def']},
+      });
     });
   });
 
@@ -227,8 +265,11 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         'triggers': [{'on': 'visible', 'request': 'foo'}],
         'optout': 'foo.bar',
       });
-      return expect(new AnalyticsConfig(element).loadConfig()).to.be
-          .rejectedWith(/optout property is only available to vendor config/);
+      return expect(
+        new AnalyticsConfig(element).loadConfig()
+      ).to.be.rejectedWith(
+        /optout property is only available to vendor config/
+      );
     });
 
     it('succeeds for vendor iframePing config', () => {
@@ -261,8 +302,11 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         'element': {'foo': 'https://example.com/bar'},
         'triggers': [{'on': 'visible', 'iframePing': true}],
       });
-      return expect(new AnalyticsConfig(element).loadConfig()).to.be
-          .rejectedWith(/iframePing config is only available to vendor config/);
+      return expect(
+        new AnalyticsConfig(element).loadConfig()
+      ).to.be.rejectedWith(
+        /iframePing config is only available to vendor config/
+      );
     });
 
     it('succeeds for vendor iframe transport config', () => {
@@ -296,10 +340,12 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
 
     it('fails for inlined iframe transport config', () => {
       expectAsyncConsoleError(
-          /Inline configs are not allowed to specify transport iframe/);
+        /Inline configs are not allowed to specify transport iframe/
+      );
       expectAsyncConsoleError(
-          '[AmpAnalytics <unknown id>] Inline or remote config ' +
-          'should not overwrite vendor transport settings');
+        '[AmpAnalytics <unknown id>] Inline or remote config ' +
+          'should not overwrite vendor transport settings'
+      );
       ANALYTICS_CONFIG['-test-venfor'] = {
         'requests': {
           'pageview': '//fake-url',
@@ -317,16 +363,19 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           iframe: '//fake-url',
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': 'https://example.com/bar'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-        transport: {
-          image: false,
-          xhrpost: false,
-          beacon: false,
-          iframe: '//fake-url2',
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': 'https://example.com/bar'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+          transport: {
+            image: false,
+            xhrpost: false,
+            beacon: false,
+            iframe: '//fake-url2',
+          },
         },
-      }, {'type': '-test-venfor'});
+        {'type': '-test-venfor'}
+      );
       return new AnalyticsConfig(element).loadConfig();
     });
   });
@@ -334,27 +383,33 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
   describe('remote config', () => {
     it('fetches and merges remote config', () => {
       expectAsyncConsoleError(
-          /Remote configs are not allowed to specify transport iframe/);
+        /Remote configs are not allowed to specify transport iframe/
+      );
 
-      const element = getAnalyticsTag({
-        'vars': {'title': 'local'},
-        'requests': {'foo': 'https://example.com/${title}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'config': '//config1',
-      });
+      const element = getAnalyticsTag(
+        {
+          'vars': {'title': 'local'},
+          'requests': {'foo': 'https://example.com/${title}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {
+          'config': '//config1',
+        }
+      );
 
       const xhrStub = stubXhr();
-      xhrStub.returns(Promise.resolve({
-        json: () => {
-          return {
-            vars: {'title': 'remote'},
-            transport: {
-              iframe: '//fake-url',
-            },
-          };
-        },
-      }));
+      xhrStub.returns(
+        Promise.resolve({
+          json: () => {
+            return {
+              vars: {'title': 'remote'},
+              transport: {
+                iframe: '//fake-url',
+              },
+            };
+          },
+        })
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(xhrStub).to.be.calledWith('//config1', {
@@ -367,39 +422,46 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
     });
 
     it('should not fetch remote config if sandboxed', () => {
-      const element = getAnalyticsTag({
-        'vars': {'title': 'local'},
-        'requests': {'foo': 'https://example.com/${title}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'config': '//config1',
-        'sandbox': 'true',
-      });
+      const element = getAnalyticsTag(
+        {
+          'vars': {'title': 'local'},
+          'requests': {'foo': 'https://example.com/${title}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {
+          'config': '//config1',
+          'sandbox': 'true',
+        }
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['vars']['title']).to.equal('local');
       });
     });
 
-
     it('fetches and merges remote config with credentials', () => {
-      const element = getAnalyticsTag({
-        'vars': {'title': 'local'},
-        'requests': {'foo': 'https://example.com/${title}'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {
-        'config': '//config1',
-        'data-credentials': 'include',
-      });
+      const element = getAnalyticsTag(
+        {
+          'vars': {'title': 'local'},
+          'requests': {'foo': 'https://example.com/${title}'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {
+          'config': '//config1',
+          'data-credentials': 'include',
+        }
+      );
 
       const xhrStub = stubXhr();
-      xhrStub.returns(Promise.resolve({
-        json: () => {
-          return {
-            vars: {'title': 'remote'},
-          };
-        },
-      }));
+      xhrStub.returns(
+        Promise.resolve({
+          json: () => {
+            return {
+              vars: {'title': 'remote'},
+            };
+          },
+        })
+      );
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(xhrStub).to.be.calledWith('//config1', {
           credentials: 'include',
@@ -411,7 +473,6 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
   });
 
   describe('should re-write configuration if configured', () => {
-
     it('should fully rewrite a configuration', () => {
       ANALYTICS_CONFIG['-test-venfor'] = {
         'requests': {'foo': '//vendor'},
@@ -420,10 +481,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           'url': '//rewriter',
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       const xhrStub = stubXhr();
       xhrStub.callsFake(url => {
@@ -440,7 +504,7 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         expect(xhrStub).to.be.calledWith('//rewriter', {
           body: {
             requests: {foo: '//inlined'},
-            triggers: [{on: 'visible', request: 'foo'}] ,
+            triggers: [{on: 'visible', request: 'foo'}],
           },
           method: 'POST',
           requireAmpResponseSourceOrigin: false,
@@ -469,15 +533,18 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-        'configRewriter': {
-          'varGroups': {
-            'feature1': {'enabled': true},
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+          'configRewriter': {
+            'varGroups': {
+              'feature1': {'enabled': true},
+            },
           },
         },
-      }, {'type': '-test-venfor'});
+        {'type': '-test-venfor'}
+      );
 
       const xhrStub = stubXhr();
 
@@ -485,7 +552,7 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         expect(xhrStub).to.be.calledWith('//rewriter', {
           body: {
             requests: {foo: '//inlined'},
-            triggers: [{on: 'visible', request: 'foo'}] ,
+            triggers: [{on: 'visible', request: 'foo'}],
             configRewriter: {
               vars: {
                 cid: 'amp12345',
@@ -514,10 +581,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       const xhrStub = stubXhr();
 
@@ -525,7 +595,7 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         expect(xhrStub).to.be.calledWith('//rewriter', {
           body: {
             requests: {foo: '//inlined'},
-            triggers: [{on: 'visible', request: 'foo'}] ,
+            triggers: [{on: 'visible', request: 'foo'}],
             configRewriter: {
               vars: {
                 cid: 'amp12345',
@@ -553,10 +623,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       const xhrStub = stubXhr();
 
@@ -564,7 +637,7 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         expect(xhrStub).to.be.calledWith('//rewriter', {
           body: {
             requests: {foo: '//inlined'},
-            triggers: [{on: 'visible', request: 'foo'}] ,
+            triggers: [{on: 'visible', request: 'foo'}],
           },
           method: 'POST',
           requireAmpResponseSourceOrigin: false,
@@ -572,7 +645,6 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
       });
     });
 
-
     it('should support amp-analytics-variables macros in varGroups', () => {
       ANALYTICS_CONFIG['-test-venfor'] = {
         'requests': {'foo': '//vendor'},
@@ -587,10 +659,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           },
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       const xhrStub = stubXhr();
 
@@ -611,7 +686,6 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
       });
     });
 
-
     it('should merge rewritten configuration and use vendor', () => {
       ANALYTICS_CONFIG['-test-venfor'] = {
         'requests': {'foo': '//vendor'},
@@ -620,10 +694,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
           'url': '//rewriter',
         },
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor', 'config': '//remote'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor', 'config': '//remote'}
+      );
 
       const xhrStub = stubXhr();
       xhrStub.callsFake(url => {
@@ -640,7 +717,7 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         expect(xhrStub).to.be.calledWith('//rewriter', {
           body: {
             requests: {foo: '//remote'},
-            triggers: [{on: 'visible', request: 'foo'}] ,
+            triggers: [{on: 'visible', request: 'foo'}],
           },
           method: 'POST',
           requireAmpResponseSourceOrigin: false,
@@ -656,13 +733,15 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
       ANALYTICS_CONFIG['-test-venfor'] = {
         'requests': {'foo': '//vendor'},
         'triggers': [{'on': 'visible', 'request': 'foo'}],
-        'configRewriter': {
-        },
+        'configRewriter': {},
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-      }, {'type': '-test-venfor'});
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+        },
+        {'type': '-test-venfor'}
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']['foo']).to.deep.equal({
@@ -676,13 +755,16 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
         'requests': {'foo': '//vendor'},
         'triggers': [{'on': 'visible', 'request': 'foo'}],
       };
-      const element = getAnalyticsTag({
-        'requests': {'foo': '//inlined'},
-        'triggers': [{'on': 'visible', 'request': 'foo'}],
-        'configRewriter': {
-          'url': '//rewriter',
+      const element = getAnalyticsTag(
+        {
+          'requests': {'foo': '//inlined'},
+          'triggers': [{'on': 'visible', 'request': 'foo'}],
+          'configRewriter': {
+            'url': '//rewriter',
+          },
         },
-      }, {'type': '-test-venfor'});
+        {'type': '-test-venfor'}
+      );
 
       return new AnalyticsConfig(element).loadConfig().then(config => {
         expect(config['requests']['foo']).to.deep.equal({
@@ -744,13 +826,13 @@ describes.realWin('AnalyticsConfig', {amp: false}, env => {
     };
     expandStringStub.withArgs('$NOT(foo)', macros).resolves('false');
     stubService(sandbox, win, 'amp-analytics-variables', 'getMacros').returns(
-        macros);
+      macros
+    );
 
-    sandbox.stub(Services, 'urlReplacementsForDoc')
-        .returns({
-          'expandUrlAsync': url => Promise.resolve(url),
-          'expandStringAsync': expandStringStub,
-        });
+    sandbox.stub(Services, 'urlReplacementsForDoc').returns({
+      'expandUrlAsync': url => Promise.resolve(url),
+      'expandStringAsync': expandStringStub,
+    });
 
     return stubService(sandbox, win, 'xhr', 'fetchJson');
   }
diff --git a/extensions/amp-analytics/0.1/test/test-cookie-writer.js b/extensions/amp-analytics/0.1/test/test-cookie-writer.js
index d1ac6ad4dd9c..30ecc32e3d72 100644
--- a/extensions/amp-analytics/0.1/test/test-cookie-writer.js
+++ b/extensions/amp-analytics/0.1/test/test-cookie-writer.js
@@ -22,222 +22,236 @@ import {installLinkerReaderService} from '../linker-reader';
 import {installVariableService} from '../variables';
 import {stubService} from '../../../../testing/test-helper';
 
-
 const TAG = '[amp-analytics/cookie-writer]';
 
-describes.realWin('amp-analytics.cookie-writer', {
-  amp: true,
-  runtimeOn: true,
-}, env => {
-
-  let sandbox;
-  let win;
-  let doc;
-  let setCookieSpy;
-  let element;
-
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    setCookieSpy = sandbox.spy();
-    win = env.win;
-    doc = win.document;
-    sandbox.stub(cookie, 'setCookie').callsFake(
-        (win, name, value) => {
-          setCookieSpy(name, value);
-        });
-    element = doc.createElement('div');
-    doc.body.appendChild(element);
-    installVariableService(win);
-    installLinkerReaderService(win);
-  });
-
-  describe('write with condition', () => {
-    let expandAndWriteSpy;
+describes.realWin(
+  'amp-analytics.cookie-writer',
+  {
+    amp: true,
+    runtimeOn: true,
+  },
+  env => {
+    let sandbox;
+    let win;
+    let doc;
+    let setCookieSpy;
+    let element;
 
-    it('Resolve when no config', () => {
-      const config = dict({});
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      setCookieSpy = sandbox.spy();
+      win = env.win;
+      doc = win.document;
+      sandbox.stub(cookie, 'setCookie').callsFake((win, name, value) => {
+        setCookieSpy(name, value);
       });
+      element = doc.createElement('div');
+      doc.body.appendChild(element);
+      installVariableService(win);
+      installLinkerReaderService(win);
     });
 
-    it('Resovle when config is invalid', () => {
-      const config = dict({
-        'cookies': 'invalid',
+    describe('write with condition', () => {
+      let expandAndWriteSpy;
+
+      it('Resolve when no config', () => {
+        const config = dict({});
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-      expectAsyncConsoleError(TAG + ' cookies config must be an object');
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+
+      it('Resovle when config is invalid', () => {
+        const config = dict({
+          'cookies': 'invalid',
+        });
+        expectAsyncConsoleError(TAG + ' cookies config must be an object');
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve when element is in FIE', () => {
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'value': 'QUERY_PARAM(test)',
+      it('Resolve when element is in FIE', () => {
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'value': 'QUERY_PARAM(test)',
+            },
           },
-        },
-      });
-      const parent = doc.createElement('div');
-      parent.classList.add('i-amphtml-fie');
-      doc.body.appendChild(parent);
-      parent.appendChild(element);
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const parent = doc.createElement('div');
+        parent.classList.add('i-amphtml-fie');
+        doc.body.appendChild(parent);
+        parent.appendChild(element);
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve when in viewer', () => {
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'value': 'QUERY_PARAM(test)',
+      it('Resolve when in viewer', () => {
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'value': 'QUERY_PARAM(test)',
+            },
           },
-        },
-      });
-      const mockWin = {
-        location: 'https://www-example-com.cdn.ampproject.org',
-      };
-      installLinkerReaderService(mockWin);
-      installVariableService(mockWin);
-      const cookieWriter = new CookieWriter(mockWin, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const mockWin = {
+          location: 'https://www-example-com.cdn.ampproject.org',
+        };
+        installLinkerReaderService(mockWin);
+        installVariableService(mockWin);
+        const cookieWriter = new CookieWriter(mockWin, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve when in inabox ad', () => {
-      env.win.AMP_MODE.runtime = 'inabox';
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'value': 'QUERY_PARAM(test)',
+      it('Resolve when in inabox ad', () => {
+        env.win.AMP_MODE.runtime = 'inabox';
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'value': 'QUERY_PARAM(test)',
+            },
           },
-        },
-      });
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve when disabled', () => {
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'value': 'QUERY_PARAM(test)',
+      it('Resolve when disabled', () => {
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'value': 'QUERY_PARAM(test)',
+            },
+            'enabled': false,
           },
-          'enabled': false,
-        },
-      });
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve with nothing to write', () => {
-      const config = dict({
-        'cookies': {},
-      });
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+      it('Resolve with nothing to write', () => {
+        const config = dict({
+          'cookies': {},
+        });
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve with invalid cookieValue (not object)', () => {
-      const config = dict({
-        'cookies': {
-          'testId': 'QUERY_PARAM(test)',
-        },
-      });
-      expectAsyncConsoleError(TAG +
-          ' cookieValue must be configured in an object');
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+      it('Resolve with invalid cookieValue (not object)', () => {
+        const config = dict({
+          'cookies': {
+            'testId': 'QUERY_PARAM(test)',
+          },
+        });
+        expectAsyncConsoleError(
+          TAG + ' cookieValue must be configured in an object'
+        );
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
-
 
-    it('Resolve when no value in cookieValue object', () => {
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'novalue': 'QUERY_PARAM(test)',
+      it('Resolve when no value in cookieValue object', () => {
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'novalue': 'QUERY_PARAM(test)',
+            },
           },
-        },
-      });
-      expectAsyncConsoleError(TAG +
-          ' value is required in the cookieValue object');
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        expectAsyncConsoleError(
+          TAG + ' value is required in the cookieValue object'
+        );
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Ignore reserved keys', () => {
-      const config = dict({
-        'cookies': {
-          'cookiePath': {
-            'value': 'QUERY_PARAM(test)',
+      it('Ignore reserved keys', () => {
+        const config = dict({
+          'cookies': {
+            'cookiePath': {
+              'value': 'QUERY_PARAM(test)',
+            },
           },
-        },
-      });
-      const cookieWriter = new CookieWriter(win, element, config);
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const cookieWriter = new CookieWriter(win, element, config);
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
-    });
 
-    it('Resolve when cookie value is not supported', () => {
-      const config = dict({
-        'cookies': {
-          'testId': {
-            'value': 'RANDOM',
+      it('Resolve when cookie value is not supported', () => {
+        const config = dict({
+          'cookies': {
+            'testId': {
+              'value': 'RANDOM',
+            },
+            'testId1': {
+              'value': 'static',
+            },
+            'testId2': {
+              'value': 'QUERY_PARAM(abc)-suf',
+            },
+            'testId3': {
+              'value': 'pre-QUERY_PARAM(abc)',
+            },
           },
-          'testId1': {
-            'value': 'static',
-          },
-          'testId2': {
-            'value': 'QUERY_PARAM(abc)-suf',
-          },
-          'testId3': {
-            'value': 'pre-QUERY_PARAM(abc)',
-          },
-        },
-      });
-      const cookieWriter = new CookieWriter(win, element, config);
-      expectAsyncConsoleError(TAG + ' cookie value RANDOM not supported. ' +
-          'Only QUERY_PARAM and LINKER_PARAM is supported');
-      expectAsyncConsoleError(TAG + ' cookie value static not supported. ' +
-          'Only QUERY_PARAM and LINKER_PARAM is supported');
-      expectAsyncConsoleError(TAG + ' cookie value QUERY_PARAM(abc)-suf not ' +
-          'supported. Only QUERY_PARAM and LINKER_PARAM is supported');
-      expectAsyncConsoleError(TAG + ' cookie value pre-QUERY_PARAM(abc) not ' +
-          'supported. Only QUERY_PARAM and LINKER_PARAM is supported');
-      expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
-      return cookieWriter.write().then(() => {
-        expect(expandAndWriteSpy).to.not.be.called;
+        });
+        const cookieWriter = new CookieWriter(win, element, config);
+        expectAsyncConsoleError(
+          TAG +
+            ' cookie value RANDOM not supported. ' +
+            'Only QUERY_PARAM and LINKER_PARAM is supported'
+        );
+        expectAsyncConsoleError(
+          TAG +
+            ' cookie value static not supported. ' +
+            'Only QUERY_PARAM and LINKER_PARAM is supported'
+        );
+        expectAsyncConsoleError(
+          TAG +
+            ' cookie value QUERY_PARAM(abc)-suf not ' +
+            'supported. Only QUERY_PARAM and LINKER_PARAM is supported'
+        );
+        expectAsyncConsoleError(
+          TAG +
+            ' cookie value pre-QUERY_PARAM(abc) not ' +
+            'supported. Only QUERY_PARAM and LINKER_PARAM is supported'
+        );
+        expandAndWriteSpy = sandbox.spy(cookieWriter, 'expandAndWrite_');
+        return cookieWriter.write().then(() => {
+          expect(expandAndWriteSpy).to.not.be.called;
+        });
       });
     });
-  });
-});
+  }
+);
 
 describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, env => {
   let win;
@@ -257,21 +271,29 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, env => {
   });
 
   it('should read value from QUERY_PARAM and LINKER_PARAM', () => {
-    stubService(env.sandbox, win, 'amp-analytics-linker-reader', 'get')
-        .callsFake((name, id) => {
-          return `${name}-${id}`;
-        });
+    stubService(
+      env.sandbox,
+      win,
+      'amp-analytics-linker-reader',
+      'get'
+    ).callsFake((name, id) => {
+      return `${name}-${id}`;
+    });
     win.location = 'https://example.com/?a=123&b=567';
-    const cookieWriter = new CookieWriter(win, win.document.body, dict({
-      'cookies': {
-        'aCookie': {
-          'value': 'QUERY_PARAM(a)',
-        },
-        'bCookie': {
-          'value': 'LINKER_PARAM(b,c)',
+    const cookieWriter = new CookieWriter(
+      win,
+      win.document.body,
+      dict({
+        'cookies': {
+          'aCookie': {
+            'value': 'QUERY_PARAM(a)',
+          },
+          'bCookie': {
+            'value': 'LINKER_PARAM(b,c)',
+          },
         },
-      },
-    }));
+      })
+    );
     return cookieWriter.write().then(() => {
       const cookies = win.document.cookie.split(';');
       expect(cookies).to.include('aCookie=123');
@@ -281,30 +303,38 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, env => {
 
   it('should write cookie under eTLD+1 domain with right exp.', () => {
     win.location = 'https://www.example.com/?a=123&b=567';
-    const cookieWriter = new CookieWriter(win, win.document.body, dict({
-      'cookies': {
-        'aCookie': {
-          'value': 'QUERY_PARAM(a)',
+    const cookieWriter = new CookieWriter(
+      win,
+      win.document.body,
+      dict({
+        'cookies': {
+          'aCookie': {
+            'value': 'QUERY_PARAM(a)',
+          },
         },
-      },
-    }));
+      })
+    );
     return cookieWriter.write().then(() => {
       expect(win.document.lastSetCookieRaw).to.equal(
-          'aCookie=123; path=/; domain=example.com; ' +
-          'expires=Tue, 01 Jan 2019 08:00:00 GMT');
+        'aCookie=123; path=/; domain=example.com; ' +
+          'expires=Tue, 01 Jan 2019 08:00:00 GMT'
+      );
     });
   });
 
-
   it('should not write empty cookie', () => {
     win.location = 'https://www.example.com/?a=123&b=567';
-    const cookieWriter = new CookieWriter(win, win.document.body, dict({
-      'cookies': {
-        'cCookie': {
-          'value': 'QUERY_PARAM(c)',
+    const cookieWriter = new CookieWriter(
+      win,
+      win.document.body,
+      dict({
+        'cookies': {
+          'cCookie': {
+            'value': 'QUERY_PARAM(c)',
+          },
         },
-      },
-    }));
+      })
+    );
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
       expect(win.document.lastSetCookieRaw).to.be.undefined;
@@ -313,13 +343,17 @@ describes.fakeWin('amp-analytics.cookie-writer value', {amp: true}, env => {
 
   it('should not write cookie if macro is mal-formatted', () => {
     win.location = 'https://www.example.com/?a=123&b=567';
-    const cookieWriter = new CookieWriter(win, win.document.body, dict({
-      'cookies': {
-        'aCookie': {
-          'value': 'LINKER_PARAM(b)',
+    const cookieWriter = new CookieWriter(
+      win,
+      win.document.body,
+      dict({
+        'cookies': {
+          'aCookie': {
+            'value': 'LINKER_PARAM(b)',
+          },
         },
-      },
-    }));
+      })
+    );
     expectAsyncConsoleError(/LINKER_PARAM requires two params, name and id/);
     return cookieWriter.write().then(() => {
       expect(win.document.cookie).to.equal('');
diff --git a/extensions/amp-analytics/0.1/test/test-events.js b/extensions/amp-analytics/0.1/test/test-events.js
index d40404c7c927..14388177d55d 100644
--- a/extensions/amp-analytics/0.1/test/test-events.js
+++ b/extensions/amp-analytics/0.1/test/test-events.js
@@ -30,7 +30,6 @@ import {Deferred} from '../../../../src/utils/promise';
 import {Signals} from '../../../../src/utils/signals';
 import {macroTask} from '../../../../testing/yield';
 
-
 describes.realWin('Events', {amp: 1}, env => {
   let win;
   let ampdoc;
@@ -58,7 +57,6 @@ describes.realWin('Events', {amp: 1}, env => {
     target.appendChild(child);
   });
 
-
   describe('ClickEventTracker', () => {
     let iniEventCount;
     let tracker;
@@ -72,27 +70,35 @@ describes.realWin('Events', {amp: 1}, env => {
     it('should initalize, add listeners and dispose', () => {
       expect(tracker.root).to.equal(root);
       expect(tracker.clickObservable_.getHandlerCount()).to.equal(0);
-      expect(win.document.eventListeners.count('click'))
-          .to.equal(iniEventCount + 1);
+      expect(win.document.eventListeners.count('click')).to.equal(
+        iniEventCount + 1
+      );
 
       tracker.dispose();
-      expect(win.document.eventListeners.count('click'))
-          .to.equal(iniEventCount);
+      expect(win.document.eventListeners.count('click')).to.equal(
+        iniEventCount
+      );
     });
 
     it('should require selector', () => {
-      allowConsoleError(() => { expect(() => {
-        tracker.add(analyticsElement, 'click', {selector: ''});
-      }).to.throw(/Missing required selector/); });
+      allowConsoleError(() => {
+        expect(() => {
+          tracker.add(analyticsElement, 'click', {selector: ''});
+        }).to.throw(/Missing required selector/);
+      });
     });
 
     it('should add listener', () => {
       const selUnlisten = function() {};
-      const selListenerStub =
-          sandbox.stub(root, 'createSelectiveListener').callsFake(
-              () => selUnlisten);
-      tracker.add(analyticsElement, 'click',
-          {selector: '*', selectionMethod: 'scope'}, handler);
+      const selListenerStub = sandbox
+        .stub(root, 'createSelectiveListener')
+        .callsFake(() => selUnlisten);
+      tracker.add(
+        analyticsElement,
+        'click',
+        {selector: '*', selectionMethod: 'scope'},
+        handler
+      );
       expect(tracker.clickObservable_.getHandlerCount()).to.equal(1);
       expect(tracker.clickObservable_.handlers_[0]).to.equal(selUnlisten);
       expect(selListenerStub).to.be.calledOnce;
@@ -161,7 +167,6 @@ describes.realWin('Events', {amp: 1}, env => {
   });
 
   describe('ScrollEventTracker', () => {
-
     let tracker;
     let fakeViewport;
     let getFakeViewportChangedEvent;
@@ -177,8 +182,9 @@ describes.realWin('Events', {amp: 1}, env => {
     beforeEach(() => {
       tracker = root.getTracker('scroll', ScrollEventTracker);
       fakeViewport = {
-        'getSize': sandbox.stub().returns(
-            {top: 0, left: 0, height: 200, width: 200}),
+        'getSize': sandbox
+          .stub()
+          .returns({top: 0, left: 0, height: 200, width: 200}),
         'getScrollTop': sandbox.stub().returns(0),
         'getScrollLeft': sandbox.stub().returns(0),
         'getScrollHeight': sandbox.stub().returns(500),
@@ -212,34 +218,36 @@ describes.realWin('Events', {amp: 1}, env => {
       expect(scrollManager.scrollObservable_.getHandlerCount()).to.equal(0);
     });
 
-
     it('fires on scroll', () => {
       const fn1 = sandbox.stub();
       const fn2 = sandbox.stub();
       tracker.add(undefined, 'scroll', defaultScrollConfig, fn1);
-      tracker.add(undefined, 'scroll', {
-        'on': 'scroll',
-        'scrollSpec': {
-          'verticalBoundaries': [92],
-          'horizontalBoundaries': [92],
+      tracker.add(
+        undefined,
+        'scroll',
+        {
+          'on': 'scroll',
+          'scrollSpec': {
+            'verticalBoundaries': [92],
+            'horizontalBoundaries': [92],
+          },
         },
-      }, fn2);
+        fn2
+      );
 
       function matcher(expected) {
         return actual => {
-          return actual.vars.horizontalScrollBoundary === String(expected) ||
-            actual.vars.verticalScrollBoundary === String(expected);
+          return (
+            actual.vars.horizontalScrollBoundary === String(expected) ||
+            actual.vars.verticalScrollBoundary === String(expected)
+          );
         };
       }
       expect(fn1).to.have.callCount(2);
-      expect(
-          fn1.getCall(0)
-              .calledWithMatch(sinon.match(matcher(0)))
-      ).to.be.true;
-      expect(
-          fn1.getCall(1)
-              .calledWithMatch(sinon.match(matcher(0)))
-      ).to.be.true;
+      expect(fn1.getCall(0).calledWithMatch(sinon.match(matcher(0)))).to.be
+        .true;
+      expect(fn1.getCall(1).calledWithMatch(sinon.match(matcher(0)))).to.be
+        .true;
       expect(fn2).to.have.not.been.called;
 
       // Scroll Down
@@ -249,18 +257,14 @@ describes.realWin('Events', {amp: 1}, env => {
 
       expect(fn1).to.have.callCount(4);
       expect(fn1.getCall(2).calledWithMatch(sinon.match(matcher(100)))).to.be
-          .true;
+        .true;
       expect(fn1.getCall(3).calledWithMatch(sinon.match(matcher(100)))).to.be
-          .true;
+        .true;
       expect(fn2).to.have.callCount(2);
-      expect(
-          fn2.getCall(0)
-              .calledWithMatch(sinon.match(matcher(90)))
-      ).to.be.true;
-      expect(
-          fn2.getCall(1)
-              .calledWithMatch(sinon.match(matcher(90)))
-      ).to.be.true;
+      expect(fn2.getCall(0).calledWithMatch(sinon.match(matcher(90)))).to.be
+        .true;
+      expect(fn2.getCall(1).calledWithMatch(sinon.match(matcher(90)))).to.be
+        .true;
     });
 
     it('does not fire duplicates on scroll', () => {
@@ -282,32 +286,57 @@ describes.realWin('Events', {amp: 1}, env => {
         tracker.add(undefined, 'scroll', {'on': 'scroll'}, fn1);
         expect(fn1).to.have.not.been.called;
 
-        tracker.add(undefined, 'scroll', {
-          'on': 'scroll',
-          'scrollSpec': {},
-        }, fn1);
+        tracker.add(
+          undefined,
+          'scroll',
+          {
+            'on': 'scroll',
+            'scrollSpec': {},
+          },
+          fn1
+        );
         expect(fn1).to.have.not.been.called;
 
-        tracker.add(undefined, 'scroll', {
-          'on': 'scroll',
-          'scrollSpec': {
-            'verticalBoundaries': undefined, 'horizontalBoundaries': undefined,
+        tracker.add(
+          undefined,
+          'scroll',
+          {
+            'on': 'scroll',
+            'scrollSpec': {
+              'verticalBoundaries': undefined,
+              'horizontalBoundaries': undefined,
+            },
           },
-        }, fn1);
+          fn1
+        );
         expect(fn1).to.have.not.been.called;
 
-        tracker.add(undefined, 'scroll', {
-          'on': 'scroll',
-          'scrollSpec': {'verticalBoundaries': [], 'horizontalBoundaries': []},
-        }, fn1);
+        tracker.add(
+          undefined,
+          'scroll',
+          {
+            'on': 'scroll',
+            'scrollSpec': {
+              'verticalBoundaries': [],
+              'horizontalBoundaries': [],
+            },
+          },
+          fn1
+        );
         expect(fn1).to.have.not.been.called;
 
-        tracker.add(undefined, 'scroll', {
-          'on': 'scroll',
-          'scrollSpec': {
-            'verticalBoundaries': ['foo'], 'horizontalBoundaries': ['foo'],
+        tracker.add(
+          undefined,
+          'scroll',
+          {
+            'on': 'scroll',
+            'scrollSpec': {
+              'verticalBoundaries': ['foo'],
+              'horizontalBoundaries': ['foo'],
+            },
           },
-        }, fn1);
+          fn1
+        );
         expect(fn1).to.have.not.been.called;
       });
     });
@@ -330,30 +359,38 @@ describes.realWin('Events', {amp: 1}, env => {
     it('fires events on normalized boundaries.', () => {
       const fn1 = sandbox.stub();
       const fn2 = sandbox.stub();
-      tracker.add(undefined, 'scroll', {
-        'on': 'scroll',
-        'scrollSpec': {
-          'verticalBoundaries': [1],
+      tracker.add(
+        undefined,
+        'scroll',
+        {
+          'on': 'scroll',
+          'scrollSpec': {
+            'verticalBoundaries': [1],
+          },
         },
-      }, fn1);
-      tracker.add(undefined, 'scroll', {
-        'on': 'scroll',
-        'scrollSpec': {
-          'verticalBoundaries': [4],
+        fn1
+      );
+      tracker.add(
+        undefined,
+        'scroll',
+        {
+          'on': 'scroll',
+          'scrollSpec': {
+            'verticalBoundaries': [4],
+          },
         },
-      }, fn2);
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
     });
   });
 
-
   describe('CustomEventTracker', () => {
     let tracker;
     let clock;
     const targetReadyPromise = Promise.resolve();
     let getElementSpy;
 
-
     beforeEach(() => {
       clock = sandbox.useFakeTimers();
       tracker = root.getTracker('custom', CustomEventTracker);
@@ -401,11 +438,18 @@ describes.realWin('Events', {amp: 1}, env => {
         eventResolver2 = resolve;
       });
       tracker.add(
-          analyticsElement, 'custom-event', {'selector': '.child'}, handler);
-      tracker.add(analyticsElement,
-          'custom-event', {'selector': '.target'}, eventResolver1);
+        analyticsElement,
+        'custom-event',
+        {'selector': '.child'},
+        handler
+      );
       tracker.add(
-          analyticsElement, 'custom-event', {}, eventResolver2);
+        analyticsElement,
+        'custom-event',
+        {'selector': '.target'},
+        eventResolver1
+      );
+      tracker.add(analyticsElement, 'custom-event', {}, eventResolver2);
       tracker.trigger(new AnalyticsEvent(target, 'custom-event'));
       return eventPromise1.then(() => {
         return eventPromise2.then(() => {
@@ -420,23 +464,33 @@ describes.realWin('Events', {amp: 1}, env => {
       target.appendChild(child2);
       const handler2 = sandbox.spy();
       tracker.add(
-          analyticsElement, 'custom-event', {'selector': '.child'}, handler);
+        analyticsElement,
+        'custom-event',
+        {'selector': '.child'},
+        handler
+      );
       tracker.add(
-          analyticsElement, 'custom-event', {'selector': '.child2'}, handler2);
+        analyticsElement,
+        'custom-event',
+        {'selector': '.child2'},
+        handler2
+      );
       tracker.trigger(new AnalyticsEvent(child, 'custom-event'));
       expect(getElementSpy).to.be.calledTwice;
-      return getElementSpy.returnValues[1].then(() => {
-        expect(handler).to.be.calledOnce;
-        expect(handler2).to.not.be.called;
-        handler.resetHistory();
-        tracker.trigger(new AnalyticsEvent(child2, 'custom-event'));
-      }).then(() => {
-        expect(handler).to.not.be.called;
-        expect(handler2).to.be.calledOnce;
-      });
+      return getElementSpy.returnValues[1]
+        .then(() => {
+          expect(handler).to.be.calledOnce;
+          expect(handler2).to.not.be.called;
+          handler.resetHistory();
+          tracker.trigger(new AnalyticsEvent(child2, 'custom-event'));
+        })
+        .then(() => {
+          expect(handler).to.not.be.called;
+          expect(handler2).to.be.calledOnce;
+        });
     });
 
-    it('should buffer custom events early on', function* () {
+    it('should buffer custom events early on', function*() {
       // Events before listeners added.
       tracker.trigger(new AnalyticsEvent(target, 'custom-event-1'));
       tracker.trigger(new AnalyticsEvent(target, 'custom-event-2'));
@@ -490,23 +544,27 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should not not fire twice from observerable and buffer', function* () {
+    it('should not not fire twice from observerable and buffer', function*() {
       tracker.trigger(
-          new AnalyticsEvent(target, 'custom-event-1', {'order': '1'}));
+        new AnalyticsEvent(target, 'custom-event-1', {'order': '1'})
+      );
       tracker.add(analyticsElement, 'custom-event-1', {}, handler);
       yield targetReadyPromise;
       tracker.trigger(
-          new AnalyticsEvent(target, 'custom-event-1', {'order': '2'}));
+        new AnalyticsEvent(target, 'custom-event-1', {'order': '2'})
+      );
       yield targetReadyPromise;
       clock.tick(1);
       expect(handler).to.have.callCount(2);
-      expect(handler.firstCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'custom-event-1', {'order': '2'}));
-      expect(handler.secondCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'custom-event-1', {'order': '1'}));
+      expect(handler.firstCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'custom-event-1', {'order': '2'})
+      );
+      expect(handler.secondCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'custom-event-1', {'order': '1'})
+      );
     });
 
-    it('should buffer sandbox events in different list', function* () {
+    it('should buffer sandbox events in different list', function*() {
       // Events before listeners added.
       tracker.trigger(new AnalyticsEvent(target, 'sandbox-1-event-1'));
       tracker.trigger(new AnalyticsEvent(target, 'event-1'));
@@ -523,7 +581,7 @@ describes.realWin('Events', {amp: 1}, env => {
       expect(tracker.sandboxBuffer_['sandbox-1-event-1']).to.be.undefined;
     });
 
-    it('should keep sandbox buffer before handler is added', function* () {
+    it('should keep sandbox buffer before handler is added', function*() {
       tracker.trigger(new AnalyticsEvent(target, 'sandbox-1-event-1'));
       clock.tick(10001);
       tracker.trigger(new AnalyticsEvent(target, 'sandbox-1-event-1'));
@@ -534,34 +592,41 @@ describes.realWin('Events', {amp: 1}, env => {
       expect(handler).to.be.calledTwice;
     });
 
-    it('should handle all events without duplicate trigger', function* () {
+    it('should handle all events without duplicate trigger', function*() {
       tracker.trigger(
-          new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '1'}));
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '1'})
+      );
       tracker.trigger(
-          new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '2'}));
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '2'})
+      );
       tracker.add(analyticsElement, 'sandbox-1-event-1', {}, handler);
       yield targetReadyPromise;
       tracker.trigger(
-          new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '3'}));
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '3'})
+      );
       yield targetReadyPromise;
       clock.tick(1);
       expect(tracker.sandboxBuffer_['sandbox-1-event-1']).to.be.undefined;
       tracker.trigger(
-          new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '4'}));
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '4'})
+      );
       yield targetReadyPromise;
       expect(handler).to.have.callCount(4);
-      expect(handler.firstCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'sandbox-1-event-1', {'order': '3'}));
-      expect(handler.secondCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'sandbox-1-event-1', {'order': '1'}));
-      expect(handler.thirdCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'sandbox-1-event-1', {'order': '2'}));
-      expect(handler.lastCall).to.be.calledWith(new AnalyticsEvent(
-          target, 'sandbox-1-event-1', {'order': '4'}));
+      expect(handler.firstCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '3'})
+      );
+      expect(handler.secondCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '1'})
+      );
+      expect(handler.thirdCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '2'})
+      );
+      expect(handler.lastCall).to.be.calledWith(
+        new AnalyticsEvent(target, 'sandbox-1-event-1', {'order': '4'})
+      );
     });
   });
 
-
   describe('SignalTracker', () => {
     let tracker;
     let targetSignals;
@@ -630,7 +695,6 @@ describes.realWin('Events', {amp: 1}, env => {
     });
   });
 
-
   describe('IniLoadTracker', () => {
     let tracker;
     let targetSignals;
@@ -651,8 +715,9 @@ describes.realWin('Events', {amp: 1}, env => {
       const promise = new Promise(resolve => {
         resolver = resolve;
       });
-      const iniLoadStub = sandbox.stub(root, 'whenIniLoaded').callsFake(
-          () => Promise.resolve());
+      const iniLoadStub = sandbox
+        .stub(root, 'whenIniLoaded')
+        .callsFake(() => Promise.resolve());
       tracker.add(analyticsElement, 'ini-load', {}, resolver);
       return promise.then(event => {
         expect(event.target).to.equal(root.getRootElement());
@@ -666,8 +731,9 @@ describes.realWin('Events', {amp: 1}, env => {
       const promise = new Promise(resolve => {
         resolver = resolve;
       });
-      const iniLoadStub = sandbox.stub(root, 'whenIniLoaded').callsFake(
-          () => Promise.resolve());
+      const iniLoadStub = sandbox
+        .stub(root, 'whenIniLoaded')
+        .callsFake(() => Promise.resolve());
       tracker.add(analyticsElement, 'ini-load', {selector: ':root'}, resolver);
       return promise.then(event => {
         expect(event.target).to.equal(root.getRootElement());
@@ -681,8 +747,9 @@ describes.realWin('Events', {amp: 1}, env => {
       const promise = new Promise(resolve => {
         resolver = resolve;
       });
-      const iniLoadStub = sandbox.stub(root, 'whenIniLoaded').callsFake(
-          () => Promise.resolve());
+      const iniLoadStub = sandbox
+        .stub(root, 'whenIniLoaded')
+        .callsFake(() => Promise.resolve());
       tracker.add(analyticsElement, 'sig1', {selector: ':host'}, resolver);
       return promise.then(event => {
         expect(event.target).to.equal(root.getRootElement());
@@ -697,8 +764,12 @@ describes.realWin('Events', {amp: 1}, env => {
         resolver = resolve;
       });
       const spy = sandbox.spy(targetSignals, 'whenSignal');
-      tracker.add(analyticsElement, 'ini-load', {selector: '.target'},
-          resolver);
+      tracker.add(
+        analyticsElement,
+        'ini-load',
+        {selector: '.target'},
+        resolver
+      );
       targetSignals.signal('ini-load');
       return promise.then(event => {
         expect(event.target).to.equal(target);
@@ -713,8 +784,12 @@ describes.realWin('Events', {amp: 1}, env => {
         resolver = resolve;
       });
       const spy = sandbox.spy(targetSignals, 'whenSignal');
-      tracker.add(analyticsElement, 'ini-load', {selector: '.target'},
-          resolver);
+      tracker.add(
+        analyticsElement,
+        'ini-load',
+        {selector: '.target'},
+        resolver
+      );
       targetSignals.signal('load-end');
       return promise.then(event => {
         expect(event.target).to.equal(target);
@@ -724,7 +799,6 @@ describes.realWin('Events', {amp: 1}, env => {
     });
   });
 
-
   describe('TimerEventTracker', () => {
     let clock;
     let tracker;
@@ -769,71 +843,142 @@ describes.realWin('Events', {amp: 1}, env => {
           tracker.add(analyticsElement, 'timer', {timerSpec: {}}, handler);
         }).to.throw(/Timer interval specification required/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: null,
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: null,
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad timer interval specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 'two',
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 'two',
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad timer interval specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 0.1,
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 0.1,
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad timer interval specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 0.49,
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 0.49,
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad timer interval specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 1,
-            maxTimerLength: '',
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 1,
+                maxTimerLength: '',
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad maxTimerLength specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 1,
-            maxTimerLength: 0,
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 1,
+                maxTimerLength: 0,
+              },
+            },
+            handler
+          );
         }).to.throw(/Bad maxTimerLength specification/);
         expect(() => {
-          tracker.add(analyticsElement, 'timer', {timerSpec: {
-            interval: 1,
-            startSpec: {on: 'timer', selector: '.target'},
-          }}, handler);
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 1,
+                startSpec: {on: 'timer', selector: '.target'},
+              },
+            },
+            handler
+          );
         }).to.throw(/Cannot track timer start/);
       });
 
       expect(handler).to.not.be.called;
       expect(() => {
-        tracker.add(analyticsElement, 'timer',
-            {timerSpec: {interval: 1}}, handler);
+        tracker.add(
+          analyticsElement,
+          'timer',
+          {timerSpec: {interval: 1}},
+          handler
+        );
       }).to.not.throw();
 
       const clickTracker = root.getTracker('click', ClickEventTracker);
       expect(() => {
-        tracker.add(analyticsElement, 'timer',
-            {
-	      timerSpec: {
-	        startSpec: {on: 'click', selector: '.target'},
-	        stopSpec: {on: 'click', selector: '.target'},
-	        interval: 1},
-	    }, handler, function(unused) { return clickTracker; });
+        tracker.add(
+          analyticsElement,
+          'timer',
+          {
+            timerSpec: {
+              startSpec: {on: 'click', selector: '.target'},
+              stopSpec: {on: 'click', selector: '.target'},
+              interval: 1,
+            },
+          },
+          handler,
+          function(unused) {
+            return clickTracker;
+          }
+        );
       }).to.not.throw();
     });
 
     it('timers start and stop by tracking different events', () => {
       const fn1 = sandbox.stub();
       const clickTracker = root.getTracker('click', ClickEventTracker);
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 1,
-        startSpec: {on: 'click', selector: '.target'},
-        stopSpec: {on: 'click', selector: '.target'},
-      }}, fn1, function(unused) { return clickTracker; });
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 1,
+            startSpec: {on: 'click', selector: '.target'},
+            stopSpec: {on: 'click', selector: '.target'},
+          },
+        },
+        fn1,
+        function(unused) {
+          return clickTracker;
+        }
+      );
       expect(fn1).to.have.not.been.called;
 
       clock.tick(5 * 1000); // 5 seconds
@@ -849,11 +994,21 @@ describes.realWin('Events', {amp: 1}, env => {
       const fn2 = sandbox.stub();
       const customTracker = root.getTracker('custom', CustomEventTracker);
       const getElementSpy = sandbox.spy(root, 'getElement');
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 1,
-        startSpec: {on: 'custom-event-start', selector: '.target'},
-        stopSpec: {on: 'custom-event-stop', selector: '.target'},
-      }}, fn2, function(unused) { return customTracker; });
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 1,
+            startSpec: {on: 'custom-event-start', selector: '.target'},
+            stopSpec: {on: 'custom-event-stop', selector: '.target'},
+          },
+        },
+        fn2,
+        function(unused) {
+          return customTracker;
+        }
+      );
       expect(fn2).to.have.not.been.called;
       customTracker.trigger(new AnalyticsEvent(target, 'custom-event-start'));
 
@@ -875,54 +1030,80 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('timers started and stopped by the same event on the same target'
-        + ' do not have race condition problems', () => {
-      const fn1 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 1,
-        immediate: false,
-        startSpec: {on: 'click', selector: '.target'},
-        stopSpec: {on: 'click', selector: '.target'},
-      }}, fn1);
-      expect(fn1).to.have.not.been.called;
-
-      target.click(); // Start timer.
-      expect(fn1).to.have.not.been.called;
-      target.click(); // Stop timer.
-      expect(fn1).to.be.calledOnce;
-      target.click(); // Start timer.
-      expect(fn1).to.be.calledOnce;
-      target.click(); // Stop timer.
-      expect(fn1).to.be.calledTwice;
-      clock.tick(5);
-      target.click(); // Start timer.
-      expect(fn1).to.be.calledTwice;
-      target.click(); // Stop timer.
-      expect(fn1).to.be.calledThrice;
-      target.click(); // Start timer.
-      expect(fn1).to.be.calledThrice;
-      target.click(); // Stop timer.
-      expect(fn1).to.have.callCount(4);
-      target.click(); // Start timer.
-      expect(fn1).to.have.callCount(4);
+    it(
+      'timers started and stopped by the same event on the same target' +
+        ' do not have race condition problems',
+      () => {
+        const fn1 = sandbox.stub();
+        tracker.add(
+          analyticsElement,
+          'timer',
+          {
+            timerSpec: {
+              interval: 1,
+              immediate: false,
+              startSpec: {on: 'click', selector: '.target'},
+              stopSpec: {on: 'click', selector: '.target'},
+            },
+          },
+          fn1
+        );
+        expect(fn1).to.have.not.been.called;
 
-      clock.tick(3 * 1000); // 3 seconds
-      expect(fn1).to.have.callCount(7); // 4 timer stops + 3.005 seconds
-    });
+        target.click(); // Start timer.
+        expect(fn1).to.have.not.been.called;
+        target.click(); // Stop timer.
+        expect(fn1).to.be.calledOnce;
+        target.click(); // Start timer.
+        expect(fn1).to.be.calledOnce;
+        target.click(); // Stop timer.
+        expect(fn1).to.be.calledTwice;
+        clock.tick(5);
+        target.click(); // Start timer.
+        expect(fn1).to.be.calledTwice;
+        target.click(); // Stop timer.
+        expect(fn1).to.be.calledThrice;
+        target.click(); // Start timer.
+        expect(fn1).to.be.calledThrice;
+        target.click(); // Stop timer.
+        expect(fn1).to.have.callCount(4);
+        target.click(); // Start timer.
+        expect(fn1).to.have.callCount(4);
+
+        clock.tick(3 * 1000); // 3 seconds
+        expect(fn1).to.have.callCount(7); // 4 timer stops + 3.005 seconds
+      }
+    );
 
     it('only fires when the timer interval exceeds the minimum', () => {
       const fn1 = sandbox.stub();
-      allowConsoleError(() => { expect(() => {
-        tracker.add(analyticsElement, 'timer', {timerSpec: {
-          interval: 0,
-        }}, fn1);
-      }).to.throw(); });
+      allowConsoleError(() => {
+        expect(() => {
+          tracker.add(
+            analyticsElement,
+            'timer',
+            {
+              timerSpec: {
+                interval: 0,
+              },
+            },
+            fn1
+          );
+        }).to.throw();
+      });
       expect(fn1).to.have.not.been.called;
 
       const fn2 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 1,
-      }}, fn2);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 1,
+          },
+        },
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
       expect(fn2.args[0][0]).to.be.instanceOf(AnalyticsEvent);
       expect(fn2.args[0][0].target).to.equal(root.getRootElement());
@@ -931,29 +1112,57 @@ describes.realWin('Events', {amp: 1}, env => {
 
     it('fires on the appropriate interval', () => {
       const fn1 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-      }}, fn1);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+          },
+        },
+        fn1
+      );
       expect(fn1).to.be.calledOnce;
 
       const fn2 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 15,
-      }}, fn2);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 15,
+          },
+        },
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
 
       const fn3 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        immediate: false,
-      }}, fn3);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            immediate: false,
+          },
+        },
+        fn3
+      );
       expect(fn3).to.have.not.been.called;
 
       const fn4 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 15,
-        immediate: false,
-      }}, fn4);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 15,
+            immediate: false,
+          },
+        },
+        fn4
+      );
       expect(fn4).to.have.not.been.called;
 
       clock.tick(10 * 1000); // 10 seconds
@@ -981,37 +1190,72 @@ describes.realWin('Events', {amp: 1}, env => {
 
     it('stops firing after the maxTimerLength is exceeded', () => {
       const fn1 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 15,
-      }}, fn1);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 15,
+          },
+        },
+        fn1
+      );
       expect(fn1).to.be.calledOnce;
 
       const fn2 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 20,
-      }}, fn2);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 20,
+          },
+        },
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
 
       const fn3 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 3600,
-      }}, fn3);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 3600,
+          },
+        },
+        fn3
+      );
       expect(fn3).to.be.calledOnce;
 
       const fn4 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        stopSpec: {on: 'click', selector: '.target'},
-        maxTimerLength: 20,
-      }}, fn4);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            stopSpec: {on: 'click', selector: '.target'},
+            maxTimerLength: 20,
+          },
+        },
+        fn4
+      );
 
       const fn5 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        stopSpec: {on: 'click', selector: '.target'},
-      }}, fn5);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            stopSpec: {on: 'click', selector: '.target'},
+          },
+        },
+        fn5
+      );
 
       expect(tracker.getTrackedTimerKeys()).to.have.length(5);
 
@@ -1050,17 +1294,31 @@ describes.realWin('Events', {amp: 1}, env => {
 
     it('should unlisten tracker', () => {
       const fn1 = sandbox.stub();
-      const u1 = tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 15,
-      }}, fn1);
+      const u1 = tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 15,
+          },
+        },
+        fn1
+      );
       expect(fn1).to.be.calledOnce;
 
       const fn2 = sandbox.stub();
-      const u2 = tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 20,
-      }}, fn2);
+      const u2 = tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 20,
+          },
+        },
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
 
       expect(tracker.getTrackedTimerKeys()).to.have.length(2);
@@ -1077,17 +1335,31 @@ describes.realWin('Events', {amp: 1}, env => {
 
     it('should dispose all trackers', () => {
       const fn1 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 15,
-      }}, fn1);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 15,
+          },
+        },
+        fn1
+      );
       expect(fn1).to.be.calledOnce;
 
       const fn2 = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 10,
-        maxTimerLength: 20,
-      }}, fn2);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 10,
+            maxTimerLength: 20,
+          },
+        },
+        fn2
+      );
       expect(fn2).to.be.calledOnce;
 
       expect(countIntervals()).to.equal(2);
@@ -1098,17 +1370,26 @@ describes.realWin('Events', {amp: 1}, env => {
 
     it('should create events with timer vars', () => {
       const handler = sandbox.stub();
-      tracker.add(analyticsElement, 'timer', {timerSpec: {
-        interval: 3,
-        immediate: false,
-        startSpec: {on: 'click', selector: '.target'},
-        stopSpec: {on: 'click', selector: '.target'},
-      }}, handler);
+      tracker.add(
+        analyticsElement,
+        'timer',
+        {
+          timerSpec: {
+            interval: 3,
+            immediate: false,
+            startSpec: {on: 'click', selector: '.target'},
+            stopSpec: {on: 'click', selector: '.target'},
+          },
+        },
+        handler
+      );
       expect(handler).to.have.not.been.called;
 
       // Fake out the time since clock.tick will not actually advance the time.
       let fakeTime = 1000; // 1 second past epoch
-      sandbox.stub(Date, 'now').callsFake(() => { return fakeTime; });
+      sandbox.stub(Date, 'now').callsFake(() => {
+        return fakeTime;
+      });
       target.click();
       fakeTime = 1600; // Must set fake time before advancing the interval.
       clock.tick(600); // Not a full second.
@@ -1142,7 +1423,6 @@ describes.realWin('Events', {amp: 1}, env => {
     });
   });
 
-
   describe('VisibilityTracker', () => {
     let tracker;
     let visibilityManagerMock;
@@ -1158,8 +1438,10 @@ describes.realWin('Events', {amp: 1}, env => {
       tracker = root.getTracker('visible', VisibilityTracker);
       visibilityManagerMock = sandbox.mock(root.getVisibilityManager());
       getAmpElementSpy = sandbox.spy(root, 'getAmpElement');
-      tracker.waitForTrackers_['ini-load'] =
-          root.getTracker('ini-load', IniLoadTracker);
+      tracker.waitForTrackers_['ini-load'] = root.getTracker(
+        'ini-load',
+        IniLoadTracker
+      );
       iniLoadTrackerMock = sandbox.mock(tracker.waitForTrackers_['ini-load']);
 
       target.classList.add('i-amphtml-element');
@@ -1199,23 +1481,24 @@ describes.realWin('Events', {amp: 1}, env => {
       expect(tracker.root).to.equal(root);
     });
 
-    it('should add doc listener', function* () {
+    it('should add doc listener', function*() {
       const unlisten = sandbox.spy();
       iniLoadTrackerMock.expects('getRootSignal').never();
       iniLoadTrackerMock.expects('getElementSignal').never();
       visibilityManagerMock
-          .expects('listenRoot')
-          .withExactArgs(
-              matchEmptySpec,
-              /* readyPromise */ null,
-              /* createReportReadyPromiseFunc */ null,
-              saveCallback)
-          .returns(unlisten)
-          .once();
+        .expects('listenRoot')
+        .withExactArgs(
+          matchEmptySpec,
+          /* readyPromise */ null,
+          /* createReportReadyPromiseFunc */ null,
+          saveCallback
+        )
+        .returns(unlisten)
+        .once();
       tracker.add(analyticsElement, 'visible', {}, eventResolver);
       yield macroTask();
       saveCallback.callback({totalVisibleTime: 10});
-      return eventPromise.then(function *(event) {
+      return eventPromise.then(function*(event) {
         expect(event.target).to.equal(root.getRootElement());
         expect(event.type).to.equal('visible');
         expect(event.vars.totalVisibleTime).to.equal(10);
@@ -1224,29 +1507,24 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should add root listener', function* () {
+    it('should add root listener', function*() {
       const config = {selector: ':root'};
       const unlisten = sandbox.spy();
       iniLoadTrackerMock.expects('getElementSignal').never();
       const readyPromise = Promise.resolve();
       iniLoadTrackerMock
-          .expects('getRootSignal')
-          .returns(readyPromise)
-          .once();
+        .expects('getRootSignal')
+        .returns(readyPromise)
+        .once();
       visibilityManagerMock
-          .expects('listenRoot')
-          .withExactArgs(
-              matchEmptySpec,
-              readyPromise,
-              null,
-              saveCallback)
-          .returns(unlisten)
-          .once();
-      tracker.add(analyticsElement,
-          'visible', config, eventResolver);
+        .expects('listenRoot')
+        .withExactArgs(matchEmptySpec, readyPromise, null, saveCallback)
+        .returns(unlisten)
+        .once();
+      tracker.add(analyticsElement, 'visible', config, eventResolver);
       yield macroTask();
       saveCallback.callback({totalVisibleTime: 10});
-      return eventPromise.then(function* (event) {
+      return eventPromise.then(function*(event) {
         expect(event.target).to.equal(root.getRootElement());
         expect(event.type).to.equal('visible');
         expect(event.vars.totalVisibleTime).to.equal(10);
@@ -1255,29 +1533,29 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should add host listener and spec', function* () {
+    it('should add host listener and spec', function*() {
       const config = {visibilitySpec: {selector: ':host'}};
       const unlisten = sandbox.spy();
       iniLoadTrackerMock.expects('getElementSignal').never();
       const readyPromise = Promise.resolve();
       iniLoadTrackerMock
-          .expects('getRootSignal')
-          .returns(readyPromise)
-          .once();
+        .expects('getRootSignal')
+        .returns(readyPromise)
+        .once();
       visibilityManagerMock
-          .expects('listenRoot')
-          .withExactArgs(
-              config.visibilitySpec,
-              readyPromise,
-              /* createReportReadyPromiseFunc */ null,
-              saveCallback)
-          .returns(unlisten)
-          .once();
-      tracker.add(analyticsElement,
-          'visible', config, eventResolver);
+        .expects('listenRoot')
+        .withExactArgs(
+          config.visibilitySpec,
+          readyPromise,
+          /* createReportReadyPromiseFunc */ null,
+          saveCallback
+        )
+        .returns(unlisten)
+        .once();
+      tracker.add(analyticsElement, 'visible', config, eventResolver);
       yield macroTask();
       saveCallback.callback({totalVisibleTime: 10});
-      return eventPromise.then(function* (event) {
+      return eventPromise.then(function*(event) {
         expect(event.target).to.equal(root.getRootElement());
         expect(event.type).to.equal('visible');
         expect(event.vars.totalVisibleTime).to.equal(10);
@@ -1286,28 +1564,33 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should add target listener', function* () {
+    it('should add target listener', function*() {
       const config = {visibilitySpec: {selector: '.target'}};
       const unlisten = sandbox.spy();
       iniLoadTrackerMock.expects('getRootSignal').once();
       const readyPromise = Promise.resolve();
       iniLoadTrackerMock
-          .expects('getElementSignal')
-          .withExactArgs('ini-load', target)
-          .returns(readyPromise)
-          .once();
+        .expects('getElementSignal')
+        .withExactArgs('ini-load', target)
+        .returns(readyPromise)
+        .once();
       visibilityManagerMock
-          .expects('listenElement')
-          .withExactArgs(
-              target,
-              config.visibilitySpec,
-              readyPromise,
-              /* createReportReadyPromiseFunc */ null,
-              saveCallback)
-          .returns(unlisten)
-          .once();
-      const res = tracker.add(analyticsElement,
-          'visible', config, eventResolver);
+        .expects('listenElement')
+        .withExactArgs(
+          target,
+          config.visibilitySpec,
+          readyPromise,
+          /* createReportReadyPromiseFunc */ null,
+          saveCallback
+        )
+        .returns(unlisten)
+        .once();
+      const res = tracker.add(
+        analyticsElement,
+        'visible',
+        config,
+        eventResolver
+      );
       expect(res).to.be.a('function');
       const unlistenReady = getAmpElementSpy.returnValues[0];
       // #getAmpElement Promise
@@ -1315,7 +1598,7 @@ describes.realWin('Events', {amp: 1}, env => {
       // #assertMeasurable_ Promise
       yield macroTask();
       saveCallback.callback({totalVisibleTime: 10});
-      return eventPromise.then(function* (event) {
+      return eventPromise.then(function*(event) {
         expect(event.target).to.equal(target);
         expect(event.type).to.equal('visible');
         expect(event.vars.totalVisibleTime).to.equal(10);
@@ -1324,7 +1607,7 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should expand data params', function* () {
+    it('should expand data params', function*() {
       target.setAttribute('data-vars-foo', 'bar');
 
       const config = {selector: '.target'};
@@ -1333,20 +1616,21 @@ describes.realWin('Events', {amp: 1}, env => {
       const readyPromise = Promise.resolve();
 
       iniLoadTrackerMock
-          .expects('getElementSignal')
-          .withExactArgs('ini-load', target)
-          .returns(readyPromise)
-          .once();
+        .expects('getElementSignal')
+        .withExactArgs('ini-load', target)
+        .returns(readyPromise)
+        .once();
       visibilityManagerMock
-          .expects('listenElement')
-          .withExactArgs(
-              target,
-              matchEmptySpec,
-              readyPromise,
-              /* createReportReadyPromiseFunc */ null,
-              saveCallback)
-          .returns(unlisten)
-          .once();
+        .expects('listenElement')
+        .withExactArgs(
+          target,
+          matchEmptySpec,
+          readyPromise,
+          /* createReportReadyPromiseFunc */ null,
+          saveCallback
+        )
+        .returns(unlisten)
+        .once();
       tracker.add(analyticsElement, 'visible', config, eventResolver);
       const unlistenReady = getAmpElementSpy.returnValues[0];
       // #getAmpElement Promise
@@ -1354,7 +1638,7 @@ describes.realWin('Events', {amp: 1}, env => {
       // #assertMeasurable_ Promise
       yield macroTask();
       saveCallback.callback({totalVisibleTime: 10});
-      return eventPromise.then(function* (event) {
+      return eventPromise.then(function*(event) {
         expect(event.vars.totalVisibleTime).to.equal(10);
         expect(event.vars.foo).to.equal('bar');
         yield macroTask();
@@ -1362,36 +1646,35 @@ describes.realWin('Events', {amp: 1}, env => {
       });
     });
 
-    it('should pass func to get reportReady with "hidden" trigger',
-        function* () {
-          const config =
-            {visibilitySpec: {selector: '.target', waitFor: 'none'}};
-          visibilityManagerMock
-              .expects('listenElement')
-              .withExactArgs(
-                  target,
-                  config.visibilitySpec,
-                  /* readyPromise */ null,
-                  /* createReportReadyPromiseFunc */ matchFunc,
-                  saveCallback)
-              .returns(null)
-              .once();
-          tracker.add(analyticsElement, 'hidden', config, eventResolver);
-          const unlistenReady = getAmpElementSpy.returnValues[0];
-          // #getAmpElement Promise
-          yield unlistenReady;
-          // #assertMeasurable_ Promise
-          yield macroTask();
-
-          // NOTE: createReportReadyPromiseFunc is
-          // fully tested in test-visibility-manager
-
-          saveCallback.callback({totalVisibleTime: 10});
-          return eventPromise.then(event => {
-            expect(event.vars.totalVisibleTime).to.equal(10);
-            expect(event.type).to.equal('hidden');
-          });
-        });
+    it('should pass func to get reportReady with "hidden" trigger', function*() {
+      const config = {visibilitySpec: {selector: '.target', waitFor: 'none'}};
+      visibilityManagerMock
+        .expects('listenElement')
+        .withExactArgs(
+          target,
+          config.visibilitySpec,
+          /* readyPromise */ null,
+          /* createReportReadyPromiseFunc */ matchFunc,
+          saveCallback
+        )
+        .returns(null)
+        .once();
+      tracker.add(analyticsElement, 'hidden', config, eventResolver);
+      const unlistenReady = getAmpElementSpy.returnValues[0];
+      // #getAmpElement Promise
+      yield unlistenReady;
+      // #assertMeasurable_ Promise
+      yield macroTask();
+
+      // NOTE: createReportReadyPromiseFunc is
+      // fully tested in test-visibility-manager
+
+      saveCallback.callback({totalVisibleTime: 10});
+      return eventPromise.then(event => {
+        expect(event.vars.totalVisibleTime).to.equal(10);
+        expect(event.type).to.equal('hidden');
+      });
+    });
 
     describe('should wait on correct readyPromise', () => {
       const selector = '.target';
@@ -1401,16 +1684,16 @@ describes.realWin('Events', {amp: 1}, env => {
         expect(tracker.getReadyPromise(undefined, undefined)).to.be.null;
         // Default case: waitFor is not specified, no AMP element selected
         iniLoadTrackerMock
-            .expects('getRootSignal')
-            .returns(Promise.resolve())
-            .once();
+          .expects('getRootSignal')
+          .returns(Promise.resolve())
+          .once();
         const waitForTracker1 = tracker.getReadyPromise(undefined, ':root');
         return waitForTracker1.then(() => {
           iniLoadTrackerMock
-              .expects('getElementSignal')
-              .withExactArgs('ini-load', target)
-              .returns(Promise.resolve())
-              .once();
+            .expects('getElementSignal')
+            .withExactArgs('ini-load', target)
+            .returns(Promise.resolve())
+            .once();
           // Default case: waitFor is not specified, AMP element selected
           const promise2 = tracker.getReadyPromise(undefined, selector, target);
           target.signals().signal('ini-load');
@@ -1419,60 +1702,79 @@ describes.realWin('Events', {amp: 1}, env => {
       });
 
       it('with waitFor NONE', () => {
-        expect(tracker.getReadyPromise('none', undefined, undefined))
-            .to.be.null;
-        expect(tracker.getReadyPromise('none', ':root', undefined))
-            .to.be.null;
-        expect(tracker.getReadyPromise('none', selector, target))
-            .to.be.null;
+        expect(tracker.getReadyPromise('none', undefined, undefined)).to.be
+          .null;
+        expect(tracker.getReadyPromise('none', ':root', undefined)).to.be.null;
+        expect(tracker.getReadyPromise('none', selector, target)).to.be.null;
       });
 
       it('with waitFor INI_LOAD', () => {
         iniLoadTrackerMock
-            .expects('getRootSignal')
-            .returns(Promise.resolve())
-            .twice();
-        const promise =
-            tracker.getReadyPromise('ini-load', undefined, undefined);
+          .expects('getRootSignal')
+          .returns(Promise.resolve())
+          .twice();
+        const promise = tracker.getReadyPromise(
+          'ini-load',
+          undefined,
+          undefined
+        );
         return promise.then(() => {
-          const promise1 =
-            tracker.getReadyPromise('ini-load', ':root', undefined);
+          const promise1 = tracker.getReadyPromise(
+            'ini-load',
+            ':root',
+            undefined
+          );
           return promise1.then(() => {
             iniLoadTrackerMock
-                .expects('getElementSignal')
-                .withExactArgs('ini-load', target)
-                .returns(Promise.resolve())
-                .once();
-            const promise2 =
-                tracker.getReadyPromise('ini-load', selector, target);
+              .expects('getElementSignal')
+              .withExactArgs('ini-load', target)
+              .returns(Promise.resolve())
+              .once();
+            const promise2 = tracker.getReadyPromise(
+              'ini-load',
+              selector,
+              target
+            );
             return promise2;
           });
         });
       });
 
       it('with waitFor RENDER_START', () => {
-        tracker.waitForTrackers_['render-start'] =
-            root.getTracker('render-start', SignalTracker);
-        const signalTrackerMock =
-            sandbox.mock(tracker.waitForTrackers_['render-start']);
+        tracker.waitForTrackers_['render-start'] = root.getTracker(
+          'render-start',
+          SignalTracker
+        );
+        const signalTrackerMock = sandbox.mock(
+          tracker.waitForTrackers_['render-start']
+        );
         signalTrackerMock
-            .expects('getRootSignal')
-            .withExactArgs('render-start')
-            .returns(Promise.resolve())
-            .twice();
-        const promise =
-            tracker.getReadyPromise('render-start', undefined, undefined);
+          .expects('getRootSignal')
+          .withExactArgs('render-start')
+          .returns(Promise.resolve())
+          .twice();
+        const promise = tracker.getReadyPromise(
+          'render-start',
+          undefined,
+          undefined
+        );
         return promise.then(() => {
-          const promise1 =
-              tracker.getReadyPromise('render-start', ':root', undefined);
+          const promise1 = tracker.getReadyPromise(
+            'render-start',
+            ':root',
+            undefined
+          );
           return promise1.then(() => {
             signalTrackerMock
-                .expects('getElementSignal')
-                .withExactArgs('render-start', target)
-                .returns(Promise.resolve())
-                .once();
-            const promise2 =
-                tracker.getReadyPromise('render-start', selector, target);
+              .expects('getElementSignal')
+              .withExactArgs('render-start', target)
+              .returns(Promise.resolve())
+              .once();
+            const promise2 = tracker.getReadyPromise(
+              'render-start',
+              selector,
+              target
+            );
             return promise2;
           });
         });
@@ -1483,7 +1785,9 @@ describes.realWin('Events', {amp: 1}, env => {
       it('with viewer hidden', () => {
         const stub = sandbox.stub(tracker.root, 'getViewer').callsFake(() => {
           return {
-            isVisible: () => {return false;},
+            isVisible: () => {
+              return false;
+            },
           };
         });
         const promise = tracker.createReportReadyPromiseForDocumentHidden_();
@@ -1492,7 +1796,7 @@ describes.realWin('Events', {amp: 1}, env => {
         });
       });
 
-      it('with documentExit trigger on unload', function* () {
+      it('with documentExit trigger on unload', function*() {
         const config = {visibilitySpec: {reportWhen: 'documentExit'}};
         const tracker = root.getTracker('visible', VisibilityTracker);
         const deferred = new Deferred();
@@ -1514,7 +1818,7 @@ describes.realWin('Events', {amp: 1}, env => {
         });
       });
 
-      it('with documentExit trigger on pagehide', function* () {
+      it('with documentExit trigger on pagehide', function*() {
         const config = {visibilitySpec: {reportWhen: 'documentExit'}};
         const tracker = root.getTracker('visible', VisibilityTracker);
 
@@ -1546,17 +1850,19 @@ describes.realWin('Events', {amp: 1}, env => {
 
       it('element level selector is unmeasurable', () => {
         expectAsyncConsoleError(
-            /Element  .target that is not root is not supported with host API/);
-        const config =
-            {visibilitySpec: {selector: '.target'}};
+          /Element  .target that is not root is not supported with host API/
+        );
+        const config = {visibilitySpec: {selector: '.target'}};
         tracker.add(analyticsElement, 'visible', config, eventResolver);
       });
 
       it('reportWhen documentExit is unmeasurable', () => {
         expectAsyncConsoleError(
-            /reportWhen : documentExit is not supported with host API/);
-        const config =
-            {visibilitySpec: {selector: ':root', reportWhen: 'documentExit'}};
+          /reportWhen : documentExit is not supported with host API/
+        );
+        const config = {
+          visibilitySpec: {selector: ':root', reportWhen: 'documentExit'},
+        };
         tracker.add(analyticsElement, 'visible', config, eventResolver);
       });
     });
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js b/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
index 31a95ac604d5..5eb19d271068 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport-client.js
@@ -15,7 +15,8 @@
  */
 
 import {
-  IframeTransportClient, IframeTransportContext,
+  IframeTransportClient,
+  IframeTransportContext,
 } from '../../../../3p/iframe-transport-client';
 import {MessageType} from '../../../../src/3p-frame-messaging';
 import {adopt} from '../../../../src/runtime';
@@ -24,7 +25,7 @@ adopt(window);
 
 let nextId = 5000;
 function createUniqueId() {
-  return String(++(nextId));
+  return String(++nextId);
 }
 
 describe('iframe-transport-client', () => {
@@ -58,7 +59,7 @@ describe('iframe-transport-client', () => {
       object['data'] = data;
     }
     const payload = 'amp-' + JSON.stringify(object);
-    window./*OK*/postMessage(payload, '*');
+    window./*OK*/ postMessage(payload, '*');
   }
 
   it('fails to create iframeTransportClient if no window.name ', () => {
@@ -70,23 +71,29 @@ describe('iframe-transport-client', () => {
     window.name = oldWindowName;
   });
 
-  it('fails to create iframeTransportClient if window.name is missing' +
-    ' sentinel', () => {
-    const oldWindowName = window.name;
-    allowConsoleError(() => { expect(() => {
-      window.name = JSON.stringify({type: 'some-vendor'});
-      new IframeTransportClient(window);
-    }).to.throw(/missing sentinel/); });
-    window.name = oldWindowName;
-  });
+  it(
+    'fails to create iframeTransportClient if window.name is missing' +
+      ' sentinel',
+    () => {
+      const oldWindowName = window.name;
+      allowConsoleError(() => {
+        expect(() => {
+          window.name = JSON.stringify({type: 'some-vendor'});
+          new IframeTransportClient(window);
+        }).to.throw(/missing sentinel/);
+      });
+      window.name = oldWindowName;
+    }
+  );
 
-  it('fails to create iframeTransportClient if window.name is missing' +
-    ' type', () => {
+  it('fails to create iframeTransportClient if window.name is missing type', () => {
     const oldWindowName = window.name;
-    allowConsoleError(() => { expect(() => {
-      window.name = JSON.stringify({sentinel});
-      new IframeTransportClient(window);
-    }).to.throw(/must supply vendor name/); });
+    allowConsoleError(() => {
+      expect(() => {
+        window.name = JSON.stringify({sentinel});
+        new IframeTransportClient(window);
+      }).to.throw(/must supply vendor name/);
+    });
     window.name = oldWindowName;
   });
 
@@ -100,26 +107,36 @@ describe('iframe-transport-client', () => {
       expect(creativeId).to.equal('101');
       expect(event).to.equal('hello, world!');
     };
-    send(MessageType.IFRAME_TRANSPORT_EVENTS, /** @type {!JsonObject} */ ({
-      events: [
-        {creativeId: '101', message: 'hello, world!'},
-      ]}));
+    send(
+      MessageType.IFRAME_TRANSPORT_EVENTS,
+      /** @type {!JsonObject} */ ({
+        events: [{creativeId: '101', message: 'hello, world!'}],
+      })
+    );
   });
 
   it('requires onNewContextInstance', () => {
-    allowConsoleError(() => { expect(() => {
-      new IframeTransportContext(window,
+    allowConsoleError(() => {
+      expect(() => {
+        new IframeTransportContext(
+          window,
           iframeTransportClient.iframeMessagingClient_,
-          'my_creative', 'my_vendor');
-    }).to.throw(/Must implement onNewContextInstance/); });
+          'my_creative',
+          'my_vendor'
+        );
+      }).to.throw(/Must implement onNewContextInstance/);
+    });
   });
 
   it('calls onNewContextInstance', () => {
     const onNewContextInstanceSpy = sandbox.spy();
     window.onNewContextInstance = ctx => onNewContextInstanceSpy(ctx);
-    const ctx = new IframeTransportContext(window,
-        iframeTransportClient.iframeMessagingClient_,
-        'my_creative', 'my_vendor');
+    const ctx = new IframeTransportContext(
+      window,
+      iframeTransportClient.iframeMessagingClient_,
+      'my_creative',
+      'my_vendor'
+    );
     expect(onNewContextInstanceSpy).to.be.calledOnce;
     expect(onNewContextInstanceSpy).to.be.calledWith(ctx);
     window.onNewContextInstance = undefined;
@@ -128,9 +145,12 @@ describe('iframe-transport-client', () => {
   it('Sets listener and baseMessage properly', () => {
     const onNewContextInstanceSpy = sandbox.spy();
     window.onNewContextInstance = ctx => onNewContextInstanceSpy(ctx);
-    const ctx = new IframeTransportContext(window,
-        iframeTransportClient.iframeMessagingClient_,
-        'my_creative', 'my_vendor');
+    const ctx = new IframeTransportContext(
+      window,
+      iframeTransportClient.iframeMessagingClient_,
+      'my_creative',
+      'my_vendor'
+    );
     expect(ctx.listener_).to.be.null;
     expect(ctx.baseMessage_).to.not.be.null;
     expect(ctx.baseMessage_.creativeId).to.equal('my_creative');
@@ -147,9 +167,12 @@ describe('iframe-transport-client', () => {
   it('dispatches event', () => {
     const onNewContextInstanceSpy = sandbox.spy();
     window.onNewContextInstance = ctx => onNewContextInstanceSpy(ctx);
-    const ctx = new IframeTransportContext(window,
-        iframeTransportClient.iframeMessagingClient_,
-        'my_creative', 'my_vendor');
+    const ctx = new IframeTransportContext(
+      window,
+      iframeTransportClient.iframeMessagingClient_,
+      'my_creative',
+      'my_vendor'
+    );
     const listener = sandbox.spy();
     ctx.onAnalyticsEvent(listener);
     const event = 'Something important happened';
@@ -165,8 +188,12 @@ describe('iframe-transport-client', () => {
     // This const exists solely to avoid triggering a false positive on the
     // presubmit rule that says you can't call stub() on a cross-domain iframe.
     const imc = iframeTransportClient.iframeMessagingClient_;
-    const ctx = new IframeTransportContext(window, imc,
-        'my_creative', 'my_vendor');
+    const ctx = new IframeTransportContext(
+      window,
+      imc,
+      'my_creative',
+      'my_vendor'
+    );
     const response = {foo: 'bar', answer: '42'};
     sandbox.stub(imc, 'sendMessage').callsFake((type, opt_payload) => {
       expect(type).to.equal(MessageType.IFRAME_TRANSPORT_RESPONSE);
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js b/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
index b1abaf4941be..e800bf46d114 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport-message-queue.js
@@ -17,46 +17,48 @@
 import {IframeTransportMessageQueue} from '../iframe-transport-message-queue';
 import {createElementWithAttributes} from '../../../../src/dom';
 
-describes.realWin('amp-analytics.iframe-transport-message-queue', {amp: true},
-    env => {
-      let frame;
-      let queue;
-
-      beforeEach(() => {
-        frame = createElementWithAttributes(env.win.document, 'iframe', {
-          'sandbox': 'allow-scripts',
-          'name': 'some_name',
-        });
-        frame.src = 'http://example.com';
-        frame.sentinel = '42';
-        queue = new IframeTransportMessageQueue(env.win, frame);
-      });
+describes.realWin(
+  'amp-analytics.iframe-transport-message-queue',
+  {amp: true},
+  env => {
+    let frame;
+    let queue;
 
-      afterEach(() => {
+    beforeEach(() => {
+      frame = createElementWithAttributes(env.win.document, 'iframe', {
+        'sandbox': 'allow-scripts',
+        'name': 'some_name',
       });
+      frame.src = 'http://example.com';
+      frame.sentinel = '42';
+      queue = new IframeTransportMessageQueue(env.win, frame);
+    });
 
-      it('is empty when first created ', () => {
-        expect(queue.queueSize()).to.equal(0);
-      });
+    afterEach(() => {});
 
-      it('is not ready until setIsReady() is called ', () => {
-        expect(queue.isReady()).to.be.false;
-        queue.setIsReady();
-        expect(queue.isReady()).to.be.true;
-      });
+    it('is empty when first created ', () => {
+      expect(queue.queueSize()).to.equal(0);
+    });
 
-      it('queues messages when not ready to send ', () => {
-        const beforeCount = queue.queueSize();
-        queue.enqueue({creativeId: 'some_senderId', message: 'some_data'});
-        queue.enqueue({creativeId: 'another_senderId', message: 'some_data'});
-        const afterCount = queue.queueSize();
-        expect(afterCount - beforeCount).to.equal(2);
-      });
+    it('is not ready until setIsReady() is called ', () => {
+      expect(queue.isReady()).to.be.false;
+      queue.setIsReady();
+      expect(queue.isReady()).to.be.true;
+    });
 
-      it('flushes the queue when ready to send ', () => {
-        queue.enqueue({creativeId: 'some_senderId', message: 'some_data'});
-        queue.setIsReady();
-        const afterCount = queue.queueSize();
-        expect(afterCount).to.equal(0);
-      });
+    it('queues messages when not ready to send ', () => {
+      const beforeCount = queue.queueSize();
+      queue.enqueue({creativeId: 'some_senderId', message: 'some_data'});
+      queue.enqueue({creativeId: 'another_senderId', message: 'some_data'});
+      const afterCount = queue.queueSize();
+      expect(afterCount - beforeCount).to.equal(2);
+    });
+
+    it('flushes the queue when ready to send ', () => {
+      queue.enqueue({creativeId: 'some_senderId', message: 'some_data'});
+      queue.setIsReady();
+      const afterCount = queue.queueSize();
+      expect(afterCount).to.equal(0);
     });
+  }
+);
diff --git a/extensions/amp-analytics/0.1/test/test-iframe-transport.js b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
index dca1e233fd6b..d8ae35ce41ef 100644
--- a/extensions/amp-analytics/0.1/test/test-iframe-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-iframe-transport.js
@@ -14,23 +14,28 @@
  * limitations under the License.
  */
 
-import {IframeTransport, getIframeTransportScriptUrl}
-  from '../iframe-transport';
+import {
+  IframeTransport,
+  getIframeTransportScriptUrl,
+} from '../iframe-transport';
 import {addParamsToUrl} from '../../../../src/url';
 import {expectPostMessage} from '../../../../testing/iframe.js';
 import {urls} from '../../../../src/config';
 import {user} from '../../../../src/log';
 
 describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
-
   let sandbox;
   let iframeTransport;
   const frameUrl = 'http://example.com';
 
   beforeEach(() => {
     sandbox = env.sandbox;
-    iframeTransport = new IframeTransport(env.ampdoc.win,
-        'some_vendor_type', {iframe: frameUrl}, frameUrl + '-1');
+    iframeTransport = new IframeTransport(
+      env.ampdoc.win,
+      'some_vendor_type',
+      {iframe: frameUrl},
+      frameUrl + '-1'
+    );
   });
 
   afterEach(() => {
@@ -46,10 +51,12 @@ describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
 
   it('creates one frame per vendor type', () => {
     const createCrossDomainIframeSpy = sandbox.spy(
-        iframeTransport, 'createCrossDomainIframe');
+      iframeTransport,
+      'createCrossDomainIframe'
+    );
     expect(createCrossDomainIframeSpy).to.not.be.called;
-    expect(IframeTransport.hasCrossDomainIframe(iframeTransport.getType()))
-        .to.be.true;
+    expect(IframeTransport.hasCrossDomainIframe(iframeTransport.getType())).to
+      .be.true;
 
     iframeTransport.processCrossDomainIframe();
     expect(createCrossDomainIframeSpy).to.not.be.called;
@@ -66,21 +73,31 @@ describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
   });
 
   it('does not cause sentinel collisions', () => {
-    const iframeTransport2 = new IframeTransport(env.ampdoc.win,
-        'some_other_vendor_type', {iframe: 'https://example.com/test2'},
-        'https://example.com/test2-2');
+    const iframeTransport2 = new IframeTransport(
+      env.ampdoc.win,
+      'some_other_vendor_type',
+      {iframe: 'https://example.com/test2'},
+      'https://example.com/test2-2'
+    );
 
     const frame1 = IframeTransport.getFrameData(iframeTransport.getType());
     const frame2 = IframeTransport.getFrameData(iframeTransport2.getType());
-    expectAllUnique([iframeTransport.getCreativeId(),
+    expectAllUnique([
+      iframeTransport.getCreativeId(),
       iframeTransport2.getCreativeId(),
-      frame1.frame.sentinel, frame2.frame.sentinel]);
+      frame1.frame.sentinel,
+      frame2.frame.sentinel,
+    ]);
   });
 
   it('correctly tracks usageCount and destroys iframes', () => {
     const frameUrl2 = 'https://example.com/test2';
-    const iframeTransport2 = new IframeTransport(env.ampdoc.win,
-        'some_other_vendor_type', {iframe: frameUrl2}, frameUrl2 + '-3');
+    const iframeTransport2 = new IframeTransport(
+      env.ampdoc.win,
+      'some_other_vendor_type',
+      {iframe: frameUrl2},
+      frameUrl2 + '-3'
+    );
 
     const frame1 = IframeTransport.getFrameData(iframeTransport.getType());
     const frame2 = IframeTransport.getFrameData(iframeTransport2.getType());
@@ -99,31 +116,47 @@ describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
 
     // Stop using the iframes, make sure usage counts go to zero and they are
     // removed from the DOM.
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport.getType());
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport.getType()
+    );
     expect(frame1.usageCount).to.equal(2);
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport.getType());
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport.getType());
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport.getType()
+    );
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport.getType()
+    );
     expect(frame1.usageCount).to.equal(0);
     expect(frame2.usageCount).to.equal(4); // (Still)
     expect(env.win.document.getElementsByTagName('IFRAME')).to.have.lengthOf(1);
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport2.getType());
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport2.getType());
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport2.getType());
-    IframeTransport.markCrossDomainIframeAsDone(env.win.document,
-        iframeTransport2.getType());
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport2.getType()
+    );
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport2.getType()
+    );
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport2.getType()
+    );
+    IframeTransport.markCrossDomainIframeAsDone(
+      env.win.document,
+      iframeTransport2.getType()
+    );
     expect(frame2.usageCount).to.equal(0);
     expect(env.win.document.getElementsByTagName('IFRAME')).to.have.lengthOf(0);
   });
 
   it('creates one PerformanceObserver per vendor type', () => {
     const createPerformanceObserverSpy = sandbox.spy(
-        IframeTransport.prototype, 'createPerformanceObserver_');
+      IframeTransport.prototype,
+      'createPerformanceObserver_'
+    );
     expect(createPerformanceObserverSpy).to.not.be.called;
 
     iframeTransport.processCrossDomainIframe(); // Create 2nd frame for 1st vendor
@@ -131,8 +164,12 @@ describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
 
     // Create frame for a new vendor
     const frameUrl2 = 'https://example.com/test2';
-    new IframeTransport(env.ampdoc.win, 'some_other_vendor_type',
-        {iframe: frameUrl2}, frameUrl2 + '-3');
+    new IframeTransport(
+      env.ampdoc.win,
+      'some_other_vendor_type',
+      {iframe: frameUrl2},
+      frameUrl2 + '-3'
+    );
     expect(createPerformanceObserverSpy).to.be.called;
   });
 
@@ -146,57 +183,75 @@ describes.realWin('amp-analytics.iframe-transport', {amp: true}, env => {
     const url = getIframeTransportScriptUrl(env.ampdoc.win, true);
     expect(url).to.contain(urls.thirdParty);
     expect(url).to.contain('/iframe-transport-client-v0.js');
-    expect(url).to.equal('https://3p.ampproject.net/$internalRuntimeVersion$/' +
-        'iframe-transport-client-v0.js');
+    expect(url).to.equal(
+      'https://3p.ampproject.net/$internalRuntimeVersion$/' +
+        'iframe-transport-client-v0.js'
+    );
   });
 });
 
-describes.realWin('amp-analytics.iframe-transport',
-    {amp: true, allowExternalResources: true}, env => {
-      it('logs poor performance of vendor iframe', () => {
-        const body = '<html><head><script>' +
-            'function busyWait(count, duration, cb) {\n' +
-            '  if (count) {\n' +
-            '    var d = new Date();\n' +
-            '    var d2 = null;\n' +
-            '    do {\n' +
-            '      d2 = new Date();\n' +
-            '    } while (d2-d < duration);\n' + // Note the semicolon!
-            '    setTimeout(function() { ' +
-            '      busyWait(count-1, duration, cb);' +
-            '    },0);\n' +
-            '  } else {\n' +
-            '    cb();\n' +
-            '  }\n' +
-            '}\n' +
-            'function begin() {\n' +
-            '  busyWait(5, 200, function() {\n' +
-            '    window.parent.postMessage("doneSleeping", "*");\n' +
-            '  });\n' +
-            '}' +
-            '</script>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>' +
-            '<body onload="javascript:begin()">' +
-            'Non-Performant Fake Iframe' +
-            '</body>' +
-            '</html>';
-        const frameUrl2 = addParamsToUrl('http://ads.localhost:' +
-            document.location.port + '/amp4test/compose-doc', {body});
-        sandbox.stub(env.ampdoc.win.document.body, 'appendChild');
-        new IframeTransport(env.ampdoc.win, 'some_other_vendor_type',
-            {iframe: frameUrl2}, frameUrl2 + '-3');
-        sandbox.restore();
-        const errorSpy = sandbox.spy(user(), 'error');
-        const {frame} = IframeTransport.getFrameData('some_other_vendor_type');
-        frame.setAttribute('style', '');
-        env.ampdoc.win.document.body.appendChild(frame);
-        return new Promise((resolve,unused) => {
-          expectPostMessage(frame.contentWindow, env.ampdoc.win, 'doneSleeping')
-              .then(() => {
-                expect(errorSpy).to.be.called;
-                expect(errorSpy.args[0][1]).to.match(
-                    /Long Task: Vendor: "some_other_vendor_type"/);
-                resolve();
-              });
+describes.realWin(
+  'amp-analytics.iframe-transport',
+  {amp: true, allowExternalResources: true},
+  env => {
+    it('logs poor performance of vendor iframe', () => {
+      const body =
+        '<html><head><script>' +
+        'function busyWait(count, duration, cb) {\n' +
+        '  if (count) {\n' +
+        '    var d = new Date();\n' +
+        '    var d2 = null;\n' +
+        '    do {\n' +
+        '      d2 = new Date();\n' +
+        '    } while (d2-d < duration);\n' + // Note the semicolon!
+        '    setTimeout(function() { ' +
+        '      busyWait(count-1, duration, cb);' +
+        '    },0);\n' +
+        '  } else {\n' +
+        '    cb();\n' +
+        '  }\n' +
+        '}\n' +
+        'function begin() {\n' +
+        '  busyWait(5, 200, function() {\n' +
+        '    window.parent.postMessage("doneSleeping", "*");\n' +
+        '  });\n' +
+        '}' +
+        '</script>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>' +
+        '<body onload="javascript:begin()">' +
+        'Non-Performant Fake Iframe' +
+        '</body>' +
+        '</html>';
+      const frameUrl2 = addParamsToUrl(
+        'http://ads.localhost:' +
+          document.location.port +
+          '/amp4test/compose-doc',
+        {body}
+      );
+      sandbox.stub(env.ampdoc.win.document.body, 'appendChild');
+      new IframeTransport(
+        env.ampdoc.win,
+        'some_other_vendor_type',
+        {iframe: frameUrl2},
+        frameUrl2 + '-3'
+      );
+      sandbox.restore();
+      const errorSpy = sandbox.spy(user(), 'error');
+      const {frame} = IframeTransport.getFrameData('some_other_vendor_type');
+      frame.setAttribute('style', '');
+      env.ampdoc.win.document.body.appendChild(frame);
+      return new Promise((resolve, unused) => {
+        expectPostMessage(
+          frame.contentWindow,
+          env.ampdoc.win,
+          'doneSleeping'
+        ).then(() => {
+          expect(errorSpy).to.be.called;
+          expect(errorSpy.args[0][1]).to.match(
+            /Long Task: Vendor: "some_other_vendor_type"/
+          );
+          resolve();
         });
-      }).timeout(10000);
-    });
+      });
+    }).timeout(10000);
+  }
+);
diff --git a/extensions/amp-analytics/0.1/test/test-instrumentation.js b/extensions/amp-analytics/0.1/test/test-instrumentation.js
index 9ac05daf3fb5..42e5b6a56818 100644
--- a/extensions/amp-analytics/0.1/test/test-instrumentation.js
+++ b/extensions/amp-analytics/0.1/test/test-instrumentation.js
@@ -16,9 +16,7 @@
 
 import {CustomEventTracker} from '../events';
 
-import {
-  InstrumentationService,
-} from '../instrumentation.js';
+import {InstrumentationService} from '../instrumentation.js';
 
 describes.realWin('InstrumentationService', {amp: 1}, env => {
   let win;
@@ -77,48 +75,50 @@ describes.realWin('InstrumentationService', {amp: 1}, env => {
   });
 });
 
-
-describes.realWin('InstrumentationService in FIE', {
-  amp: {ampdoc: 'fie'},
-}, env => {
-  let win;
-  let embed;
-  let ampdoc;
-  let service;
-  let root;
-  let analyticsElement;
-  let target;
-
-  beforeEach(() => {
-    win = env.win;
-    embed = env.embed;
-    ampdoc = env.ampdoc;
-    service = new InstrumentationService(ampdoc);
-    root = service.ampdocRoot_;
-
-    analyticsElement = win.document.createElement('amp-analytics');
-    win.document.body.appendChild(analyticsElement);
-
-    target = win.document.createElement('div');
-    win.document.body.appendChild(target);
-  });
-
-  it('should create and reuse embed root', () => {
-    expect(root.ampdoc).to.equal(ampdoc);
-    expect(root.parent).to.be.null;
-
-    const group1 = service.createAnalyticsGroup(analyticsElement);
-    const embedRoot = group1.root_;
-    expect(embedRoot).to.not.equal(root);
-    expect(embedRoot.parent).to.equal(root);
-    expect(embedRoot.ampdoc).to.equal(ampdoc);
-    expect(embedRoot.embed).to.equal(embed);
-
-    // Reuse the previously created instance.
-    const analyticsElement2 = win.document.createElement('amp-analytics');
-    win.document.body.appendChild(analyticsElement2);
-    const group2 = service.createAnalyticsGroup(analyticsElement2);
-    expect(group2.root_).to.equal(embedRoot);
-  });
-});
-
+describes.realWin(
+  'InstrumentationService in FIE',
+  {
+    amp: {ampdoc: 'fie'},
+  },
+  env => {
+    let win;
+    let embed;
+    let ampdoc;
+    let service;
+    let root;
+    let analyticsElement;
+    let target;
+
+    beforeEach(() => {
+      win = env.win;
+      embed = env.embed;
+      ampdoc = env.ampdoc;
+      service = new InstrumentationService(ampdoc);
+      root = service.ampdocRoot_;
+
+      analyticsElement = win.document.createElement('amp-analytics');
+      win.document.body.appendChild(analyticsElement);
+
+      target = win.document.createElement('div');
+      win.document.body.appendChild(target);
+    });
+
+    it('should create and reuse embed root', () => {
+      expect(root.ampdoc).to.equal(ampdoc);
+      expect(root.parent).to.be.null;
+
+      const group1 = service.createAnalyticsGroup(analyticsElement);
+      const embedRoot = group1.root_;
+      expect(embedRoot).to.not.equal(root);
+      expect(embedRoot.parent).to.equal(root);
+      expect(embedRoot.ampdoc).to.equal(ampdoc);
+      expect(embedRoot.embed).to.equal(embed);
+
+      // Reuse the previously created instance.
+      const analyticsElement2 = win.document.createElement('amp-analytics');
+      win.document.body.appendChild(analyticsElement2);
+      const group2 = service.createAnalyticsGroup(analyticsElement2);
+      expect(group2.root_).to.equal(embedRoot);
+    });
+  }
+);
diff --git a/extensions/amp-analytics/0.1/test/test-linker-manager.js b/extensions/amp-analytics/0.1/test/test-linker-manager.js
index 5fee17cfc82d..8429cdb54b7b 100644
--- a/extensions/amp-analytics/0.1/test/test-linker-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-linker-manager.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
  *
@@ -52,20 +51,24 @@ describes.realWin('Linker Manager', {amp: true}, env => {
       beforeSubmit: beforeSubmitStub,
     });
 
-    sandbox.stub(Services, 'documentInfoForDoc')
-        .returns({
-          sourceUrl: 'https://amp.source.com/some/path?q=123',
-          canonicalUrl: 'https://www.canonical.com/some/path?q=123',
-        });
+    sandbox.stub(Services, 'documentInfoForDoc').returns({
+      sourceUrl: 'https://amp.source.com/some/path?q=123',
+      canonicalUrl: 'https://www.canonical.com/some/path?q=123',
+    });
 
     // LinkerManager uses Url/UrlReplacements services scoped to the element,
     // but for testing stub in the top-level ampdoc service for simplicity.
     element = {};
     const urlReplacements = Services.urlReplacementsForDoc(doc.documentElement);
-    sandbox.stub(Services, 'urlReplacementsForDoc')
-        .withArgs(element).returns(urlReplacements);
+    sandbox
+      .stub(Services, 'urlReplacementsForDoc')
+      .withArgs(element)
+      .returns(urlReplacements);
     const url = Services.urlForDoc(doc.documentElement);
-    sandbox.stub(Services, 'urlForDoc').withArgs(element).returns(url);
+    sandbox
+      .stub(Services, 'urlForDoc')
+      .withArgs(element)
+      .returns(url);
 
     handlers = [];
     sandbox.stub(Services, 'navigationForDoc').returns({
@@ -84,16 +87,21 @@ describes.realWin('Linker Manager', {amp: true}, env => {
   });
 
   it('registers anchor mutator if given valid linkers config', () => {
-    new LinkerManager(ampdoc, {
-      linkers: {
-        testLinker: {
-          enabled: true,
-          ids: {
-            foo: 'bar',
+    new LinkerManager(
+      ampdoc,
+      {
+        linkers: {
+          testLinker: {
+            enabled: true,
+            ids: {
+              foo: 'bar',
+            },
           },
         },
       },
-    }, /* type */ null, element).init();
+      /* type */ null,
+      element
+    ).init();
 
     expect(handlers.length).to.equal(1);
   });
@@ -109,20 +117,25 @@ describes.realWin('Linker Manager', {amp: true}, env => {
   });
 
   it('does not register anchor mutator if no linkers enabled', () => {
-    new LinkerManager(ampdoc, {
-      linkers: {
-        testLinker1: {
-          ids: {
-            bar: 'foo',
+    new LinkerManager(
+      ampdoc,
+      {
+        linkers: {
+          testLinker1: {
+            ids: {
+              bar: 'foo',
+            },
           },
-        },
-        testLinker2: {
-          ids: {
-            foo: 'bar',
+          testLinker2: {
+            ids: {
+              foo: 'bar',
+            },
           },
         },
       },
-    }, /* type */ null, element).init();
+      /* type */ null,
+      element
+    ).init();
     expect(handlers.length).to.equal(0);
   });
 
@@ -130,16 +143,21 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     windowInterface.getLocation.returns({
       origin: 'https://amp.source.com',
     });
-    new LinkerManager(ampdoc, {
-      linkers: {
-        testLinker: {
-          enabled: true,
-          ids: {
-            bar: 'foo',
+    new LinkerManager(
+      ampdoc,
+      {
+        linkers: {
+          testLinker: {
+            enabled: true,
+            ids: {
+              bar: 'foo',
+            },
           },
         },
       },
-    }, /* type */ null, element).init();
+      /* type */ null,
+      element
+    ).init();
     expect(handlers.length).to.equal(0);
   });
 
@@ -147,24 +165,31 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     windowInterface.getLocation.returns({
       origin: 'https://amp.source.com',
     });
-    new LinkerManager(ampdoc, {
-      linkers: {
-        testLinker: {
-          enabled: true,
-          proxyOnly: false,
-          ids: {
-            bar: 'foo',
+    new LinkerManager(
+      ampdoc,
+      {
+        linkers: {
+          testLinker: {
+            enabled: true,
+            proxyOnly: false,
+            ids: {
+              bar: 'foo',
+            },
           },
         },
       },
-    }, /* type */ null, element).init();
+      /* type */ null,
+      element
+    ).init();
     expect(handlers.length).to.equal(1);
   });
 
   it('should resolve vars and append to matching anchor', () => {
-    windowInterface.getUserAgent.returns('Mozilla/5.0 (X11; Linux x86_64) ' +
+    windowInterface.getUserAgent.returns(
+      'Mozilla/5.0 (X11; Linux x86_64) ' +
         'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 ' +
-        'Safari/537.36');
+        'Safari/537.36'
+    );
     windowInterface.getUserLanguage.returns('en-US');
     sandbox.useFakeTimers(1533329483292);
     sandbox.stub(Date.prototype, 'getTimezoneOffset').returns(420);
@@ -193,10 +218,11 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     return lm.init().then(() => {
       expect(handlers.length).to.equal(1);
       expect(clickAnchor('https://www.source.com/dest?a=1')).to.equal(
-          'https://www.source.com/dest' +
+        'https://www.source.com/dest' +
           '?a=1' +
           '&testLinker1=1*1pgvkob*_key*VEVTVCUyMFRJVExF*gclid*MjM0' +
-          '&testLinker2=1*1u4ugj3*foo*YmFy');
+          '&testLinker2=1*1u4ugj3*foo*YmFy'
+      );
     });
   });
 
@@ -217,7 +243,7 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     return lm.init().then(() => {
       expect(handlers.length).to.equal(1);
       expect(clickAnchor('https://www.source.com/dest?a=1')).to.equal(
-          'https://www.source.com/dest?a=1'
+        'https://www.source.com/dest?a=1'
       );
     });
   });
@@ -611,10 +637,18 @@ describes.realWin('Linker Manager', {amp: true}, env => {
           },
         },
       };
-      const p1 =
-          new LinkerManager(ampdoc, config, 'googleanalytics', element).init();
-      const p2 =
-          new LinkerManager(ampdoc, config, 'googleanalytics', element).init();
+      const p1 = new LinkerManager(
+        ampdoc,
+        config,
+        'googleanalytics',
+        element
+      ).init();
+      const p2 = new LinkerManager(
+        ampdoc,
+        config,
+        'googleanalytics',
+        element
+      ).init();
       return Promise.all([p1, p2]).then(() => {
         const a = clickAnchor('https://www.source.com/path');
         expect(a).to.not.match(/(testLinker1=.*){2}/);
@@ -714,16 +748,21 @@ describes.realWin('Linker Manager', {amp: true}, env => {
   describe('form support', () => {
     it('should register the `beforeSubmit` callback', () => {
       toggleExperiment(win, 'linker-form', true);
-      const linkerManager = new LinkerManager(ampdoc, {
-        linkers: {
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const linkerManager = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
           },
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       return linkerManager.init().then(() => {
         expect(beforeSubmitStub.calledOnce).to.be.true;
@@ -733,17 +772,22 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     });
 
     it('should add hidden elements to form if not action-xhr', () => {
-      const linkerManager = new LinkerManager(ampdoc, {
-        linkers: {
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const linkerManager = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
+            destinationDomains: ['www.ampproject.com'],
           },
-          destinationDomains: ['www.ampproject.com'],
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       return linkerManager.init().then(() => {
         const form = createForm();
@@ -763,17 +807,22 @@ describes.realWin('Linker Manager', {amp: true}, env => {
     });
 
     it('if action-xhr and method=GET it should add linker-xhr attr', () => {
-      const linkerManager = new LinkerManager(ampdoc, {
-        linkers: {
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const linkerManager = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
+            destinationDomains: ['www.ampproject.com'],
           },
-          destinationDomains: ['www.ampproject.com'],
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       return linkerManager.init().then(() => {
         const form = createForm();
@@ -785,24 +834,30 @@ describes.realWin('Linker Manager', {amp: true}, env => {
 
         expect(setterSpy.calledOnce).to.be.true;
 
-        const calledWithLinkerUrl = setterSpy
-            .calledWith(sinon.match(/testLinker=1\*\w{5,7}\*foo*\w+/));
+        const calledWithLinkerUrl = setterSpy.calledWith(
+          sinon.match(/testLinker=1\*\w{5,7}\*foo*\w+/)
+        );
         return expect(calledWithLinkerUrl).to.be.true;
       });
     });
 
     it('if action-xhr and method=POST it should add linker-xhr attr', () => {
-      const linkerManager = new LinkerManager(ampdoc, {
-        linkers: {
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const linkerManager = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
+            destinationDomains: ['www.ampproject.com'],
           },
-          destinationDomains: ['www.ampproject.com'],
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       return linkerManager.init().then(() => {
         const form = createForm();
@@ -814,25 +869,30 @@ describes.realWin('Linker Manager', {amp: true}, env => {
 
         expect(setterSpy.calledOnce).to.be.true;
 
-        const calledWithLinkerUrl = setterSpy
-            .calledWith(sinon.match(/testLinker=1\*\w{5,7}\*foo*\w+/));
+        const calledWithLinkerUrl = setterSpy.calledWith(
+          sinon.match(/testLinker=1\*\w{5,7}\*foo*\w+/)
+        );
         return expect(calledWithLinkerUrl).to.be.true;
       });
     });
 
-
     it('should not add linker if no domain match', () => {
-      const linkerManager = new LinkerManager(ampdoc, {
-        linkers: {
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const linkerManager = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
+            destinationDomains: ['www.ampproject.com'],
           },
-          destinationDomains: ['www.ampproject.com'],
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       return linkerManager.init().then(() => {
         const form = createForm();
@@ -849,29 +909,39 @@ describes.realWin('Linker Manager', {amp: true}, env => {
         origin: 'https://www.ampbyexample.com',
       });
 
-      const manager1 = new LinkerManager(ampdoc, {
-        linkers: {
-          proxyOnly: false,
-          testLinker: {
-            enabled: true,
-            ids: {
-              foo: 'bar',
+      const manager1 = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            proxyOnly: false,
+            testLinker: {
+              enabled: true,
+              ids: {
+                foo: 'bar',
+              },
             },
           },
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
-      const manager2 = new LinkerManager(ampdoc, {
-        linkers: {
-          proxyOnly: false,
-          testLinker2: {
-            enabled: true,
-            ids: {
-              hello: 'world',
+      const manager2 = new LinkerManager(
+        ampdoc,
+        {
+          linkers: {
+            proxyOnly: false,
+            testLinker2: {
+              enabled: true,
+              ids: {
+                hello: 'world',
+              },
             },
           },
         },
-      }, /* type */ null, element);
+        /* type */ null,
+        element
+      );
 
       const p1 = manager1.init();
       const p2 = manager2.init();
@@ -915,12 +985,11 @@ describe('areFriendlyDomains', () => {
     expect(areFriendlyDomains('amp.source.com', 'www.source.com')).to.be.true;
     expect(areFriendlyDomains('m.source.com', 'www.source.com')).to.be.true;
     expect(areFriendlyDomains('amp.www.source.com', 'source.com')).to.be.true;
-    expect(areFriendlyDomains('amp.source.com', 'm.www.source.com'))
-        .to.be.true;
+    expect(areFriendlyDomains('amp.source.com', 'm.www.source.com')).to.be.true;
 
     expect(areFriendlyDomains('amp.source.com', 'amp.google.com')).to.be.false;
-    expect(areFriendlyDomains('web.amp.source.com', 'web.m.source.com'))
-        .to.be.false;
+    expect(areFriendlyDomains('web.amp.source.com', 'web.m.source.com')).to.be
+      .false;
   });
 });
 
diff --git a/extensions/amp-analytics/0.1/test/test-linker-reader.js b/extensions/amp-analytics/0.1/test/test-linker-reader.js
index 3ee61515b546..5abb22a182b6 100644
--- a/extensions/amp-analytics/0.1/test/test-linker-reader.js
+++ b/extensions/amp-analytics/0.1/test/test-linker-reader.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {
   installLinkerReaderService,
   linkerReaderServiceFor,
@@ -33,9 +32,11 @@ describe('LinkerReader', () => {
     sandbox.useFakeTimers(1533329483292);
     sandbox.stub(Date.prototype, 'getTimezoneOffset').returns(420);
     mockWin = mockWindowInterface(sandbox);
-    mockWin.getUserAgent.returns('Mozilla/5.0 (X11; Linux x86_64) ' +
+    mockWin.getUserAgent.returns(
+      'Mozilla/5.0 (X11; Linux x86_64) ' +
         'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 ' +
-        'Safari/537.36');
+        'Safari/537.36'
+    );
     mockWin.getUserLanguage.returns('en-US');
     mockWin.location = {
       href: 'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx',
@@ -58,13 +59,15 @@ describe('LinkerReader', () => {
       expectAsyncConsoleError(/LINKER_PARAM requires two params, name and id/);
       expect(linkerReader.get('testlinker')).to.be.null;
       expect(mockWin.location.href).to.equal(
-          'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx');
+        'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx'
+      );
     });
 
     it('return null when no linker name', () => {
       expect(linkerReader.get('nolinker', 'id')).to.be.null;
       expect(mockWin.location.href).to.equal(
-          'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx');
+        'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx'
+      );
     });
 
     it('return null when linker name value is invalid', () => {
@@ -76,37 +79,43 @@ describe('LinkerReader', () => {
 
     it('return null when no linker id value', () => {
       mockWin.location.href =
-          'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx';
+        'https://example.com?testlinker=1*1f66u1p*key1*dmFsdWUx';
       expect(linkerReader.get('testlinker', 'key2')).to.be.null;
       expect(mockWin.location.href).to.equal('https://example.com/');
     });
 
     it('remove linker_param from url', () => {
-      mockWin.location.href = 'https://example.com?a=1&b=2&' +
-          'testlinker=1*1f66u1p*key1*dmFsdWUx&c&' +
-          'testlinker2=1*1f66u1p*key1*dmFsdWUx&d=2#hash';
+      mockWin.location.href =
+        'https://example.com?a=1&b=2&' +
+        'testlinker=1*1f66u1p*key1*dmFsdWUx&c&' +
+        'testlinker2=1*1f66u1p*key1*dmFsdWUx&d=2#hash';
       linkerReader.get('testlinker', 'id');
-      expect(mockWin.location.href).to.equal('https://example.com/?a=1&b=2&c&' +
-          'testlinker2=1*1f66u1p*key1*dmFsdWUx&d=2#hash');
+      expect(mockWin.location.href).to.equal(
+        'https://example.com/?a=1&b=2&c&' +
+          'testlinker2=1*1f66u1p*key1*dmFsdWUx&d=2#hash'
+      );
       linkerReader.get('testlinker2', 'key1');
-      expect(mockWin.location.href).to.equal('https://example.com/?a=1&b=2&c&' +
-          'd=2#hash');
+      expect(mockWin.location.href).to.equal(
+        'https://example.com/?a=1&b=2&c&d=2#hash'
+      );
     });
 
     it('return correct id value', () => {
-      mockWin.location.href = 'https://example.com?' +
+      mockWin.location.href =
+        'https://example.com?' +
         'test=1*1f66u1p*key1*dmFsdWUx&var=foo&' +
         'test2=1*1m48hbv*cid*MTIzNDU.*ref*aHR0cHM6Ly93d3cuZXhhbXBsZS5jb20.';
       expect(linkerReader.get('test', 'key1')).to.equal('value1');
       expect(linkerReader.get('test2', 'cid')).to.equal('12345');
       expect(linkerReader.get('test2', 'ref')).to.equal(
-          'https://www.example.com');
+        'https://www.example.com'
+      );
       expect(mockWin.location.href).to.equal('https://example.com/?var=foo');
     });
 
     it('returns same value when reading the same id', () => {
-      mockWin.location.href = 'https://example.com?' +
-        'test=1*1f66u1p*key1*dmFsdWUx&var=foo';
+      mockWin.location.href =
+        'https://example.com?test=1*1f66u1p*key1*dmFsdWUx&var=foo';
       expect(linkerReader.get('test', 'key1')).to.equal('value1');
       expect(linkerReader.get('test', 'key1')).to.equal('value1');
     });
diff --git a/extensions/amp-analytics/0.1/test/test-linker.js b/extensions/amp-analytics/0.1/test/test-linker.js
index 8c6c4c9641f2..d1a933399ef6 100644
--- a/extensions/amp-analytics/0.1/test/test-linker.js
+++ b/extensions/amp-analytics/0.1/test/test-linker.js
@@ -223,10 +223,12 @@ const createLinkerTests = [
     description: 'works for AMP CID API generated Client ID',
     version: '1',
     pairs: {
-      '_ga': 'amp-' +
+      '_ga':
+        'amp-' +
         'oRg8vByriPdstwLgkz-UNWbp2P13vNFsnhES5vW8s5WodTOoea0mTiY7X62utLyz',
     },
-    output: '1*1fkd1zz*_ga*' +
+    output:
+      '1*1fkd1zz*_ga*' +
       'YW1wLW9SZzh2QnlyaVBkc3R3TGdrei1VTldicDJQMT' +
       'N2TkZzbmhFUzV2VzhzNVdvZFRPb2VhMG1UaVk3WDYydXRMeXo.',
   },
@@ -234,10 +236,10 @@ const createLinkerTests = [
     description: 'works for AMP Viewer generated Client ID',
     version: '1',
     pairs: {
-      '_ga':
-          'WgcaAD4XN2lydhQVNFruk6X8zwoUg6K2RnaRlhjs6CXvTv4aJV-3oVLdI1WxxvJb',
+      '_ga': 'WgcaAD4XN2lydhQVNFruk6X8zwoUg6K2RnaRlhjs6CXvTv4aJV-3oVLdI1WxxvJb',
     },
-    output: '1*19eaxqc*_ga*' +
+    output:
+      '1*19eaxqc*_ga*' +
       'V2djYUFENFhOMmx5ZGhRVk5GcnVrNlg4endvVWc2Sz' +
       'JSbmFSbGhqczZDWHZUdjRhSlYtM29WTGRJMVd4eHZKYg..',
   },
@@ -252,9 +254,11 @@ describe('Linker', () => {
     sandbox.useFakeTimers(BASE_TIME);
     sandbox.stub(Date.prototype, 'getTimezoneOffset').returns(420);
     mockWin = mockWindowInterface(sandbox);
-    mockWin.getUserAgent.returns('Mozilla/5.0 (X11; Linux x86_64) ' +
+    mockWin.getUserAgent.returns(
+      'Mozilla/5.0 (X11; Linux x86_64) ' +
         'AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 ' +
-        'Safari/537.36');
+        'Safari/537.36'
+    );
     mockWin.getUserLanguage.returns('en-US');
   });
 
diff --git a/extensions/amp-analytics/0.1/test/test-opacity.js b/extensions/amp-analytics/0.1/test/test-opacity.js
index 95f20e92d244..4cc17720992d 100644
--- a/extensions/amp-analytics/0.1/test/test-opacity.js
+++ b/extensions/amp-analytics/0.1/test/test-opacity.js
@@ -27,7 +27,7 @@ describes.realWin('getMinOpacity', {amp: true}, env => {
     win = env.win;
     doc = win.document;
     style = doc.createElement('style');
-    style.setAttribute('amp-custom','');
+    style.setAttribute('amp-custom', '');
     style.innerHTML = `
     #img {
       opacity: 0.5;
@@ -67,7 +67,7 @@ describes.realWin('getMinOpacity', {amp: true}, env => {
     expect(getMinOpacity(ampElement)).to.equal(0);
   });
 
-  it('amp element\'s parent opacity value lower than amp element', () => {
+  it("amp element's parent opacity value lower than amp element", () => {
     parent.style.opacity = 0;
     expect(getMinOpacity(ampElement)).to.equal(0);
 
diff --git a/extensions/amp-analytics/0.1/test/test-requests.js b/extensions/amp-analytics/0.1/test/test-requests.js
index 4cbc2bd0fe27..7791b5e631a3 100644
--- a/extensions/amp-analytics/0.1/test/test-requests.js
+++ b/extensions/amp-analytics/0.1/test/test-requests.js
@@ -49,12 +49,17 @@ describes.realWin('Requests', {amp: 1}, env => {
 
   function createRequestHandler(request, spy) {
     return new RequestHandler(
-        analyticsElement, request, preconnect, {sendRequest: spy}, false);
+      analyticsElement,
+      request,
+      preconnect,
+      {sendRequest: spy},
+      false
+    );
   }
 
   describe('RequestHandler', () => {
     describe('batch', () => {
-      it('should batch multiple send', function* () {
+      it('should batch multiple send', function*() {
         const spy = sandbox.spy();
         const r = {'baseUrl': 'r2', 'batchInterval': 1};
         const handler = createRequestHandler(r, spy);
@@ -68,7 +73,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.be.calledOnce;
       });
 
-      it('should work properly with no batch', function* () {
+      it('should work properly with no batch', function*() {
         const spy = sandbox.spy();
         const r = {'baseUrl': 'r1'};
         const handler = createRequestHandler(r, spy);
@@ -79,15 +84,15 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.be.calledTwice;
       });
 
-
-      it('should preconnect', function* () {
+      it('should preconnect', function*() {
         const r = {'baseUrl': 'r2?cid=CLIENT_ID(scope)&var=${test}'};
         const handler = createRequestHandler(r, sandbox.spy());
         const expansionOptions = new ExpansionOptions({'test': 'expanded'});
         handler.send({}, {}, expansionOptions, {});
         yield macroTask();
         expect(preconnectSpy).to.be.calledWith(
-            'r2?cid=CLIENT_ID(scope)&var=expanded');
+          'r2?cid=CLIENT_ID(scope)&var=expanded'
+        );
       });
     });
 
@@ -154,7 +159,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         }
       });
 
-      it('should schedule send request with interval array', function* () {
+      it('should schedule send request with interval array', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': [1, 2]};
         const handler = createRequestHandler(r, spy);
         const expansionOptions = new ExpansionOptions({});
@@ -182,7 +187,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.be.calledOnce;
       });
 
-      it('should not schedule send request w/o trigger', function* () {
+      it('should not schedule send request w/o trigger', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': [1]};
         createRequestHandler(r, spy);
         clock.tick(1000);
@@ -190,7 +195,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.not.be.called;
       });
 
-      it('should schedule send independent of trigger immediate', function* () {
+      it('should schedule send independent of trigger immediate', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': [1, 2]};
         const handler = createRequestHandler(r, spy);
         const expansionOptions = new ExpansionOptions({});
@@ -228,7 +233,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(handler3.reportWindow_).to.be.null;
       });
 
-      it('should stop bathInterval outside batch report window', function* () {
+      it('should stop bathInterval outside batch report window', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': 0.5, 'reportWindow': 1};
         const handler = createRequestHandler(r, spy);
 
@@ -246,7 +251,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.not.be.called;
       });
 
-      it('should stop send request outside batch report window', function* () {
+      it('should stop send request outside batch report window', function*() {
         const r = {'baseUrl': 'r', 'reportWindow': 1};
         const handler = createRequestHandler(r, spy);
 
@@ -261,7 +266,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.not.be.called;
       });
 
-      it('should flush batch queue after batch report window', function* () {
+      it('should flush batch queue after batch report window', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': 5, 'reportWindow': 1};
         const handler = createRequestHandler(r, spy);
 
@@ -272,7 +277,7 @@ describes.realWin('Requests', {amp: 1}, env => {
         expect(spy).to.be.calledOnce;
       });
 
-      it('should respect immediate trigger', function* () {
+      it('should respect immediate trigger', function*() {
         const r = {'baseUrl': 'r', 'batchInterval': 0.2, 'reportWindow': 0.5};
         const handler = createRequestHandler(r, spy);
 
@@ -287,7 +292,7 @@ describes.realWin('Requests', {amp: 1}, env => {
     });
 
     describe('batch segments', () => {
-      it('should respect config extraUrlParam', function* () {
+      it('should respect config extraUrlParam', function*() {
         const spy = sandbox.spy();
         const r = {'baseUrl': 'r1', 'batchInterval': 1};
         const handler = createRequestHandler(r, spy);
@@ -303,39 +308,59 @@ describes.realWin('Requests', {amp: 1}, env => {
         ]);
       });
 
-      it('should respect trigger extraUrlParam', function* () {
+      it('should respect trigger extraUrlParam', function*() {
         const spy = sandbox.spy();
         const r = {'baseUrl': 'r1', 'batchInterval': 1};
         const handler = createRequestHandler(r, spy);
 
         const expansionOptions = new ExpansionOptions({'v2': '中'});
-        handler.send({}, {
-          'extraUrlParams': {
-            'e1': 'e1',
-            'e2': '${v2}', // check vars are used and not double encoded
+        handler.send(
+          {},
+          {
+            'extraUrlParams': {
+              'e1': 'e1',
+              'e2': '${v2}', // check vars are used and not double encoded
+            },
           },
-        }, expansionOptions, {});
+          expansionOptions,
+          {}
+        );
         handler.send(
-            {}, {'extraUrlParams': {'e1': 'e1'}}, expansionOptions, {});
+          {},
+          {'extraUrlParams': {'e1': 'e1'}},
+          expansionOptions,
+          {}
+        );
         clock.tick(1000);
         yield macroTask();
         expect(spy).to.be.calledWith('r1', [
-          {extraUrlParams: {e1: 'e1', e2: '中'},
-            timestamp: 0, trigger: undefined},
+          {
+            extraUrlParams: {e1: 'e1', e2: '中'},
+            timestamp: 0,
+            trigger: undefined,
+          },
           {extraUrlParams: {e1: 'e1'}, timestamp: 0, trigger: undefined},
         ]);
       });
 
-      it('should keep extraUrlParam', function* () {
+      it('should keep extraUrlParam', function*() {
         const spy = sandbox.spy();
         const r = {'baseUrl': 'r1&${extraUrlParams}&r2', 'batchInterval': 1};
         const handler = createRequestHandler(r, spy);
 
         const expansionOptions = new ExpansionOptions({});
         handler.send(
-            {}, {'extraUrlParams': {'e1': 'e1'}}, expansionOptions, {});
+          {},
+          {'extraUrlParams': {'e1': 'e1'}},
+          expansionOptions,
+          {}
+        );
         handler.send(
-            {}, {'extraUrlParams': {'e2': 'e2'}}, expansionOptions, {});
+          {},
+          {'extraUrlParams': {'e2': 'e2'}},
+          expansionOptions,
+          {}
+        );
         clock.tick(1000);
         yield macroTask();
         expect(spy).to.be.calledWith('r1&${extraUrlParams}&r2', [
@@ -353,14 +378,18 @@ describes.realWin('Requests', {amp: 1}, env => {
           createRequestHandler(r, spy);
         } catch (e) {
           expect(e).to.match(
-              /batchPlugin cannot be set on non-batched request/);
+            /batchPlugin cannot be set on non-batched request/
+          );
         }
       });
 
       it('should throw error with unsupported batchPlugin', () => {
         const spy = sandbox.spy();
-        const r =
-            {'baseUrl': 'r', 'batchInterval': 1, 'batchPlugin': 'invalid'};
+        const r = {
+          'baseUrl': 'r',
+          'batchInterval': 1,
+          'batchPlugin': 'invalid',
+        };
         try {
           createRequestHandler(r, spy);
         } catch (e) {
@@ -370,21 +399,22 @@ describes.realWin('Requests', {amp: 1}, env => {
     });
   });
 
-  it('should replace dynamic bindings RESOURCE_TIMING', function* () {
+  it('should replace dynamic bindings RESOURCE_TIMING', function*() {
     const spy = sandbox.spy();
     const r = {'baseUrl': 'r1&${resourceTiming}'};
     const handler = createRequestHandler(r, spy);
     const expansionOptions = new ExpansionOptions({
       'resourceTiming': 'RESOURCE_TIMING',
     });
-    sandbox.stub(ResourceTiming, 'getResourceTiming')
-        .returns(Promise.resolve('resource-timing'));
+    sandbox
+      .stub(ResourceTiming, 'getResourceTiming')
+      .returns(Promise.resolve('resource-timing'));
     handler.send({}, {}, expansionOptions);
     yield macroTask();
     expect(spy).to.be.calledWith('r1&resource-timing');
   });
 
-  it('should replace dynamic bindings CONSENT_STATE', function* () {
+  it('should replace dynamic bindings CONSENT_STATE', function*() {
     const spy = sandbox.spy();
     const r = {'baseUrl': 'r1&$CONSENT_STATEtest&${consentState}test2'};
     const handler = createRequestHandler(r, spy);
@@ -416,31 +446,34 @@ describes.realWin('Requests', {amp: 1}, env => {
 
     it('should expand', () => {
       return expandPostMessage(
-          ampdoc,
-          'test foo 123 ... ${teste1}',
-          undefined,
-          {},
-          expansionOptions,
-          element).then(msg => {
+        ampdoc,
+        'test foo 123 ... ${teste1}',
+        undefined,
+        {},
+        expansionOptions,
+        element
+      ).then(msg => {
         expect(msg).to.equal('test foo 123 ... TESTE1');
       });
     });
 
     it('should replace not append ${extraUrlParams}', () => {
       const replacePromise = expandPostMessage(
-          ampdoc,
-          'test ${extraUrlParams} foo',
-          params, /* configParams */
-          {}, /* trigger */
-          expansionOptions,
-          element);
+        ampdoc,
+        'test ${extraUrlParams} foo',
+        params /* configParams */,
+        {} /* trigger */,
+        expansionOptions,
+        element
+      );
       const appendPromise = expandPostMessage(
-          ampdoc,
-          'test foo',
-          params, /* configParams */
-          {}, /* trigger */
-          expansionOptions,
-          element);
+        ampdoc,
+        'test foo',
+        params /* configParams */,
+        {} /* trigger */,
+        expansionOptions,
+        element
+      );
       return replacePromise.then(replace => {
         expect(replace).to.equal('test e1=TESTE1&e2=teste2 foo');
         expect(appendPromise).to.eventually.equal('test foo');
diff --git a/extensions/amp-analytics/0.1/test/test-resource-timing.js b/extensions/amp-analytics/0.1/test/test-resource-timing.js
index 14f45ff2c771..9152136e7efe 100644
--- a/extensions/amp-analytics/0.1/test/test-resource-timing.js
+++ b/extensions/amp-analytics/0.1/test/test-resource-timing.js
@@ -36,7 +36,7 @@ export function newResourceTimingSpec() {
     },
     'encoding': {
       'entry':
-          '${key}-${initiatorType}-${startTime}-${duration}-${transferSize}',
+        '${key}-${initiatorType}-${startTime}-${duration}-${transferSize}',
       'delim': '~',
     },
   };
@@ -55,7 +55,13 @@ export function newResourceTimingSpec() {
  * @return {!JsonObject}
  */
 export function newPerformanceResourceTiming(
-  url, initiatorType, startTime, duration, bodySize, cached) {
+  url,
+  initiatorType,
+  startTime,
+  duration,
+  bodySize,
+  cached
+) {
   const dnsTime = cached ? 0 : duration * 0.1;
   const tcpTime = cached ? 0 : duration * 0.2;
   const serverTime = cached ? duration : duration * 0.4;
@@ -90,12 +96,16 @@ describes.realWin('resourceTiming', {amp: true}, env => {
    * @return {!Promise<undefined>}
    */
   const runSerializeTest = function(
-    fakeEntries, resourceTimingSpec, expectedResult) {
+    fakeEntries,
+    resourceTimingSpec,
+    expectedResult
+  ) {
     sandbox.stub(win.performance, 'getEntriesByType').returns(fakeEntries);
-    return getResourceTiming(win, resourceTimingSpec, Date.now())
-        .then(result => {
-          expect(result).to.equal(expectedResult);
-        });
+    return getResourceTiming(win, resourceTimingSpec, Date.now()).then(
+      result => {
+        expect(result).to.equal(expectedResult);
+      }
+    );
   };
 
   beforeEach(() => {
@@ -106,44 +116,60 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should return empty if the performance API is not supported', () => {
     const fakeWin = {};
-    return getResourceTiming(fakeWin, newResourceTimingSpec(), Date.now())
-        .then(result => {
-          expect(result).to.equal('');
-        });
+    return getResourceTiming(fakeWin, newResourceTimingSpec(), Date.now()).then(
+      result => {
+        expect(result).to.equal('');
+      }
+    );
   });
 
   it('should return empty when resource timing is not supported', () => {
     // Performance API (fakeWin.performance) doesn't support resource timing.
     const fakeWin = {performance: {}};
-    return getResourceTiming(fakeWin, newResourceTimingSpec(), Date.now())
-        .then(result => {
-          expect(result).to.equal('');
-        });
+    return getResourceTiming(fakeWin, newResourceTimingSpec(), Date.now()).then(
+      result => {
+        expect(result).to.equal('');
+      }
+    );
   });
 
   it('should return empty when start time has passed 1s', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     sandbox.stub(win.performance, 'getEntriesByType').returns([entry]);
-    return getResourceTiming(win, spec, Date.now() - 60 * 1000)
-        .then(result => {
-          expect(result).to.equal('');
-        });
+    return getResourceTiming(win, spec, Date.now() - 60 * 1000).then(result => {
+      expect(result).to.equal('');
+    });
   });
 
   it('should return empty if resourceTimingSpec is empty', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     return runSerializeTest([entry], {}, '');
   });
 
   it('should return empty if encoding spec is empty', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     delete spec['encoding'];
     return runSerializeTest([entry], spec, '');
@@ -151,8 +177,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should return empty if encoding spec is missing delim', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     delete spec['encoding']['delim'];
     return runSerializeTest([entry], spec, '');
@@ -160,8 +191,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should return empty if encoding spec is missing entry', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     delete spec['encoding']['entry'];
     return runSerializeTest([entry], spec, '');
@@ -169,8 +205,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should serialize matching entries', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     const expect = 'foo_bar-script-100-500-7200';
     return runSerializeTest([entry], spec, expect);
@@ -178,19 +219,37 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should serialize multiple matching entries', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://bar.example.com/lib.js', 'script', 700, 100, 80 * 1000, true);
+      'http://bar.example.com/lib.js',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
     return runSerializeTest(
-        [entry1, entry2], newResourceTimingSpec(),
-        'foo_bar-script-100-500-7200~foo_bar-script-700-100-0');
+      [entry1, entry2],
+      newResourceTimingSpec(),
+      'foo_bar-script-100-500-7200~foo_bar-script-700-100-0'
+    );
   });
 
   it('should match against the first spec', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
 
     const spec = newResourceTimingSpec();
     // Note that both spec'd resources match.
@@ -207,8 +266,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should accept empty per-resource specs', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
 
     const spec = newResourceTimingSpec();
     // Note that both spec'd resources match.
@@ -225,9 +289,21 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should should only report resources if the host matches', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js', 'script', 100, 500, 10 * 1000, false);
+      'http://foo.example.com/lib.js',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://baz.example.com/lib.js', 'script', 700, 100, 80 * 1000, true);
+      'http://baz.example.com/lib.js',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
 
     const spec = newResourceTimingSpec();
     spec.resources = {'foo': {'host': 'foo.example.com'}};
@@ -236,9 +312,21 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should should only report resources if the path matches', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js', 'script', 100, 500, 10 * 1000, false);
+      'http://foo.example.com/lib.js',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://foo.example.com/extra.js', 'script', 700, 100, 80 * 1000, true);
+      'http://foo.example.com/extra.js',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
 
     const spec = newResourceTimingSpec();
     spec.resources = {
@@ -249,11 +337,21 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should should only report resources if the query matches', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=200', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=200',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=test', 'script', 700, 100, 80 * 1000,
-        true);
+      'http://foo.example.com/lib.js?v=test',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
 
     const spec = newResourceTimingSpec();
     spec.resources = {
@@ -268,8 +366,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should replace ${key} and ${initiatorType}', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${key}.${initiatorType}';
     return runSerializeTest([entry], spec, 'foo_style.link');
@@ -277,8 +380,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should replace ${startTime} and ${duration}', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${startTime}.${duration}';
     return runSerializeTest([entry], spec, '100.500');
@@ -286,8 +394,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should replace ${domainLookupTime} and ${tcpConnectTime}', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${domainLookupTime}.${tcpConnectTime}';
     return runSerializeTest([entry], spec, '50.100');
@@ -295,28 +408,42 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should replace ${serverResponseTime} and ${networkTransferTime}', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${serverResponseTime}.${networkTransferTime}';
     return runSerializeTest([entry], spec, '200.150');
   });
 
-  it('should replace ${transferSize}, ${encodedBodySize}, ${decodedBodySize}',
-      () => {
-        const entry = newPerformanceResourceTiming(
-            'http://foo.example.com/style.css?v=200', 'link', 100, 500,
-            10 * 1000, false);
-        const spec = newResourceTimingSpec();
-        spec['encoding']['entry'] =
-           '${transferSize}.${encodedBodySize}.${decodedBodySize}';
-        return runSerializeTest([entry], spec, '7200.7000.10000');
-      });
+  it('should replace ${transferSize}, ${encodedBodySize}, ${decodedBodySize}', () => {
+    const entry = newPerformanceResourceTiming(
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
+    const spec = newResourceTimingSpec();
+    spec['encoding']['entry'] =
+      '${transferSize}.${encodedBodySize}.${decodedBodySize}';
+    return runSerializeTest([entry], spec, '7200.7000.10000');
+  });
 
   it('should use the base specified in encoding', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${decodedBodySize}';
     spec['encoding']['base'] = 36;
@@ -326,8 +453,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should reject invalid bases (over 36)', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${decodedBodySize}';
     spec['encoding']['base'] = 40;
@@ -338,10 +470,21 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should not replace other analytics variables', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://bar.example.com/lib.js', 'script', 700, 100, 80 * 1000, true);
+      'http://bar.example.com/lib.js',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${startTime}.${random}.${undefinedVariable}';
     // The counter is incremented for each entry.
@@ -350,37 +493,76 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should URL-encode the results', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://bar.example.com/lib.js', 'script', 700, 100, 80 * 1000, true);
+      'http://bar.example.com/lib.js',
+      'script',
+      700,
+      100,
+      80 * 1000,
+      true
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${key}?${startTime},${duration}';
     spec['encoding']['delim'] = ':';
     return runSerializeTest(
-        [entry1, entry2], spec, 'foo_bar?100,500:foo_bar?700,100');
+      [entry1, entry2],
+      spec,
+      'foo_bar?100,500:foo_bar?700,100'
+    );
   });
 
   it('should only include resources downloaded after `responseAfter`', () => {
     const entry1 = newPerformanceResourceTiming(
-        'http://foo.example.com/lib.js?v=123', 'script', 100, 200, 10 * 1000,
-        false);
+      'http://foo.example.com/lib.js?v=123',
+      'script',
+      100,
+      200,
+      10 * 1000,
+      false
+    );
     const entry2 = newPerformanceResourceTiming(
-        'http://bar.example.com/lib.js', 'script', 200, 200, 80 * 1000, true);
+      'http://bar.example.com/lib.js',
+      'script',
+      200,
+      200,
+      80 * 1000,
+      true
+    );
     const entry3 = newPerformanceResourceTiming(
-        'http://bar.example.com/lib.js', 'script', 300, 200, 80 * 1000, true);
+      'http://bar.example.com/lib.js',
+      'script',
+      300,
+      200,
+      80 * 1000,
+      true
+    );
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${key}.${startTime}';
     spec['encoding']['delim'] = '-';
     spec['responseAfter'] = 350;
     return runSerializeTest(
-        [entry1, entry2, entry3], spec, 'foo_bar.200-foo_bar.300');
+      [entry1, entry2, entry3],
+      spec,
+      'foo_bar.200-foo_bar.300'
+    );
   });
 
   it('should reject invalid (non-numeric) responseAfter fields', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['responseAfter'] = '100';
     return runSerializeTest([entry], spec, '').then(() => {
@@ -390,9 +572,21 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should update responseAfter', () => {
     const initialEntry = newPerformanceResourceTiming(
-        'https://example.com/lib.css', 'link', 100, 400, 5 * 1000, false);
+      'https://example.com/lib.css',
+      'link',
+      100,
+      400,
+      5 * 1000,
+      false
+    );
     const laterEntry = newPerformanceResourceTiming(
-        'https://bar.example.com/lib.js', 'script', 200, 500, 10 * 1000, false);
+      'https://bar.example.com/lib.js',
+      'script',
+      200,
+      500,
+      10 * 1000,
+      false
+    );
 
     // Stub performance.now so that it returns a timestamp after the resource
     // timing entry.
@@ -407,16 +601,18 @@ describes.realWin('resourceTiming', {amp: true}, env => {
     const spec = newResourceTimingSpec();
     spec['encoding']['entry'] = '${initiatorType}.${startTime}.${duration}';
 
-    return getResourceTiming(win, spec, Date.now()).then(result => {
-      expect(result).to.equal('link.100.400');
-      expect(spec['responseAfter']).to.equal(600);
-
-      // Check resource timings a second time.
-      return getResourceTiming(win, spec, Date.now());
-    }).then(result => {
-      expect(result).to.equal('script.200.500');
-      expect(spec['responseAfter']).to.equal(800);
-    });
+    return getResourceTiming(win, spec, Date.now())
+      .then(result => {
+        expect(result).to.equal('link.100.400');
+        expect(spec['responseAfter']).to.equal(600);
+
+        // Check resource timings a second time.
+        return getResourceTiming(win, spec, Date.now());
+      })
+      .then(result => {
+        expect(result).to.equal('script.200.500');
+        expect(spec['responseAfter']).to.equal(800);
+      });
   });
 
   it('should not update responseAfter if greater', () => {
@@ -432,8 +628,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should stop reporting after reaching the buffer limit', () => {
     const entry = newPerformanceResourceTiming(
-        'http://does_not_match.com/lib.js', 'script', 100, 500, 10 * 1000,
-        false);
+      'http://does_not_match.com/lib.js',
+      'script',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const entries = new Array(150).fill(entry);
     // Stub performance.now so that it returns a timestamp after the resource
     // timing entry.
@@ -446,8 +647,13 @@ describes.realWin('resourceTiming', {amp: true}, env => {
 
   it('should not report if resourceTimingSpec is done', () => {
     const entry = newPerformanceResourceTiming(
-        'http://foo.example.com/style.css?v=200', 'link', 100, 500, 10 * 1000,
-        false);
+      'http://foo.example.com/style.css?v=200',
+      'link',
+      100,
+      500,
+      10 * 1000,
+      false
+    );
     const spec = newResourceTimingSpec();
     spec['done'] = true;
     return runSerializeTest([entry], spec, '');
diff --git a/extensions/amp-analytics/0.1/test/test-scroll-manager.js b/extensions/amp-analytics/0.1/test/test-scroll-manager.js
index 3fb60d220463..7b0f67c4bd16 100644
--- a/extensions/amp-analytics/0.1/test/test-scroll-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-scroll-manager.js
@@ -17,7 +17,6 @@
 import {AmpdocAnalyticsRoot} from '../analytics-root';
 import {ScrollManager} from '../scroll-manager';
 
-
 describes.realWin('ScrollManager', {amp: 1}, env => {
   let win;
   let ampdoc;
@@ -50,8 +49,9 @@ describes.realWin('ScrollManager', {amp: 1}, env => {
     scrollManager = new ScrollManager(ampdoc);
     root.scrollManager_ = scrollManager;
     fakeViewport = {
-      'getSize': sandbox.stub().returns(
-          {top: 0, left: 0, height: 200, width: 200}),
+      'getSize': sandbox
+        .stub()
+        .returns({top: 0, left: 0, height: 200, width: 200}),
       'getScrollTop': sandbox.stub().returns(0),
       'getScrollLeft': sandbox.stub().returns(0),
       'getScrollHeight': sandbox.stub().returns(500),
@@ -61,7 +61,6 @@ describes.realWin('ScrollManager', {amp: 1}, env => {
       },
     };
     scrollManager.viewport_ = fakeViewport;
-
   });
 
   it('should initalize, add listeners and dispose', () => {
@@ -74,21 +73,24 @@ describes.realWin('ScrollManager', {amp: 1}, env => {
     expect(scrollManager.scrollObservable_.getHandlerCount()).to.equal(0);
   });
 
-  it('should add a viewport onChanged listener with scroll handlers, '
-    + 'and dispose when there are none', () => {
-    expect(scrollManager.viewportOnChangedUnlistener_).to.not.be.ok;
+  it(
+    'should add a viewport onChanged listener with scroll handlers, ' +
+      'and dispose when there are none',
+    () => {
+      expect(scrollManager.viewportOnChangedUnlistener_).to.not.be.ok;
 
-    const fn1 = sandbox.stub();
-    scrollManager.addScrollHandler(fn1);
+      const fn1 = sandbox.stub();
+      scrollManager.addScrollHandler(fn1);
 
-    expect(scrollManager.viewportOnChangedUnlistener_).to.be.ok;
-    const unlistenStub = scrollManager.viewportOnChangedUnlistener_;
+      expect(scrollManager.viewportOnChangedUnlistener_).to.be.ok;
+      const unlistenStub = scrollManager.viewportOnChangedUnlistener_;
 
-    scrollManager.removeScrollHandler(fn1);
+      scrollManager.removeScrollHandler(fn1);
 
-    expect(scrollManager.viewportOnChangedUnlistener_).to.not.be.ok;
-    expect(unlistenStub).to.have.callCount(1);
-  });
+      expect(scrollManager.viewportOnChangedUnlistener_).to.not.be.ok;
+      expect(unlistenStub).to.have.callCount(1);
+    }
+  );
 
   it('fires on scroll', () => {
     const fn1 = sandbox.stub();
@@ -124,16 +126,13 @@ describes.realWin('ScrollManager', {amp: 1}, env => {
 
     expect(fn1).to.have.callCount(2);
     expect(
-        fn1.getCall(1)
-            .calledWithMatch(sinon.match(matcher(expectedScrollEvent)))
+      fn1.getCall(1).calledWithMatch(sinon.match(matcher(expectedScrollEvent)))
     ).to.be.true;
 
     expect(fn2).to.have.callCount(2);
     expect(
-        fn2.getCall(1)
-            .calledWithMatch(sinon.match(matcher(expectedScrollEvent)))
+      fn2.getCall(1).calledWithMatch(sinon.match(matcher(expectedScrollEvent)))
     ).to.be.true;
-
   });
 
   it('can remove specifc handlers', () => {
@@ -152,7 +151,6 @@ describes.realWin('ScrollManager', {amp: 1}, env => {
     fakeViewport.getScrollLeft.returns(500);
     scrollManager.onScroll_({top: 500, left: 500, height: 250, width: 250});
 
-
     expect(fn1).to.have.callCount(2);
     expect(fn2).to.have.callCount(1);
   });
diff --git a/extensions/amp-analytics/0.1/test/test-transport-serializers.js b/extensions/amp-analytics/0.1/test/test-transport-serializers.js
index 10c1234e3a21..257ce4fd8f49 100644
--- a/extensions/amp-analytics/0.1/test/test-transport-serializers.js
+++ b/extensions/amp-analytics/0.1/test/test-transport-serializers.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {TransportSerializers} from '../transport-serializer';
 import {dict} from '../../../../src/utils/object';
 import {isArray} from '../../../../src/types';
@@ -36,59 +35,69 @@ import {isArray} from '../../../../src/types';
  * }
  */
 const defaultTestData = {
-  'in': [{
-    'baseUrl': 'https://base.com',
-    'batchSegments': [{
-      'trigger': 'click',
-      'timestamp': 0,
-      'extraUrlParams': {
-        a: 1,
-        b: 'xyz',
-      },
-    }],
-  }, {
-    'baseUrl': 'https://base.com?${extraUrlParams}&z=1',
-    'batchSegments': [{
-      'trigger': 'click',
-      'timestamp': 0,
-      'extraUrlParams': {
-        a: 1,
-        b: 'xyz',
-      },
-    }],
-  }],
-
-  'out': [{
-    generateRequest: {
-      url: 'https://base.com?a=1&b=xyz',
-    },
-    generateBatchRequest: {
-      url: 'https://base.com?a=1&b=xyz',
-    },
-    generateRequestWithPayload: {
-      url: 'https://base.com',
-      payload: '{"a":1,"b":"xyz"}',
-    },
-    generateBatchRequestWithPayload: {
-      url: 'https://base.com',
-      payload: '[{"a":1,"b":"xyz"}]',
-    },
-  }, {
-    generateRequest: {
-      url: 'https://base.com?a=1&b=xyz&z=1',
+  'in': [
+    {
+      'baseUrl': 'https://base.com',
+      'batchSegments': [
+        {
+          'trigger': 'click',
+          'timestamp': 0,
+          'extraUrlParams': {
+            a: 1,
+            b: 'xyz',
+          },
+        },
+      ],
     },
-    generateBatchRequest: {
-      url: 'https://base.com?a=1&b=xyz&z=1',
+    {
+      'baseUrl': 'https://base.com?${extraUrlParams}&z=1',
+      'batchSegments': [
+        {
+          'trigger': 'click',
+          'timestamp': 0,
+          'extraUrlParams': {
+            a: 1,
+            b: 'xyz',
+          },
+        },
+      ],
     },
-    generateRequestWithPayload: {
-      url: 'https://base.com?&z=1',
-      payload: '{"a":1,"b":"xyz"}',
+  ],
+
+  'out': [
+    {
+      generateRequest: {
+        url: 'https://base.com?a=1&b=xyz',
+      },
+      generateBatchRequest: {
+        url: 'https://base.com?a=1&b=xyz',
+      },
+      generateRequestWithPayload: {
+        url: 'https://base.com',
+        payload: '{"a":1,"b":"xyz"}',
+      },
+      generateBatchRequestWithPayload: {
+        url: 'https://base.com',
+        payload: '[{"a":1,"b":"xyz"}]',
+      },
     },
-    generateBatchRequestWithPayload: {
-      url: 'https://base.com?&z=1',
-      payload: '[{"a":1,"b":"xyz"}]',
+    {
+      generateRequest: {
+        url: 'https://base.com?a=1&b=xyz&z=1',
+      },
+      generateBatchRequest: {
+        url: 'https://base.com?a=1&b=xyz&z=1',
+      },
+      generateRequestWithPayload: {
+        url: 'https://base.com?&z=1',
+        payload: '{"a":1,"b":"xyz"}',
+      },
+      generateBatchRequestWithPayload: {
+        url: 'https://base.com?&z=1',
+        payload: '[{"a":1,"b":"xyz"}]',
+      },
     },
-  }],
+  ],
 };
 
 /**
@@ -127,8 +136,9 @@ describe('Transport serializers', () => {
           'extraUrlParams': null,
         });
         try {
-          const output =
-              serializer.generateBatchRequest('base', [batchSegment]);
+          const output = serializer.generateBatchRequest('base', [
+            batchSegment,
+          ]);
           expect(output.url).to.be.ok;
         } catch (e) {
           throw e;
@@ -142,8 +152,9 @@ describe('Transport serializers', () => {
           'extraUrlParams': '12?3',
         });
         try {
-          const output =
-              serializer.generateBatchRequest('base', [batchSegment]);
+          const output = serializer.generateBatchRequest('base', [
+            batchSegment,
+          ]);
           expect(output.url).to.not.contain('12?3');
         } catch (e) {
           throw e;
@@ -157,8 +168,9 @@ describe('Transport serializers', () => {
           'extraUrlParams': '123',
         });
         try {
-          const output =
-              serializer.generateBatchRequest('base', [batchSegment]);
+          const output = serializer.generateBatchRequest('base', [
+            batchSegment,
+          ]);
           expect(typeof output.url).to.equal('string');
         } catch (e) {
           throw e;
@@ -166,7 +178,6 @@ describe('Transport serializers', () => {
       });
     });
 
-
     describe('custom test', () => {
       let testData;
       let input;
@@ -197,14 +208,18 @@ describe('Transport serializers', () => {
           expect(batchSegments).to.be.ok;
           expect(isArray(batchSegments)).to.be.true;
           const request = output[i];
-          expect(serializer.generateRequest(baseUrl, batchSegments[0]))
-              .to.jsonEqual(request.generateRequest);
-          expect(serializer.generateRequest(baseUrl, batchSegments[0], true))
-              .to.jsonEqual(request.generateRequestWithPayload);
-          expect(serializer.generateBatchRequest(baseUrl, batchSegments))
-              .to.jsonEqual(request.generateRequest);
-          expect(serializer.generateBatchRequest(baseUrl, batchSegments, true))
-              .to.jsonEqual(request.generateBatchRequestWithPayload);
+          expect(
+            serializer.generateRequest(baseUrl, batchSegments[0])
+          ).to.jsonEqual(request.generateRequest);
+          expect(
+            serializer.generateRequest(baseUrl, batchSegments[0], true)
+          ).to.jsonEqual(request.generateRequestWithPayload);
+          expect(
+            serializer.generateBatchRequest(baseUrl, batchSegments)
+          ).to.jsonEqual(request.generateRequest);
+          expect(
+            serializer.generateBatchRequest(baseUrl, batchSegments, true)
+          ).to.jsonEqual(request.generateBatchRequestWithPayload);
         }
       });
     });
diff --git a/extensions/amp-analytics/0.1/test/test-transport.js b/extensions/amp-analytics/0.1/test/test-transport.js
index f11696f9c178..6608a7ca6bfe 100644
--- a/extensions/amp-analytics/0.1/test/test-transport.js
+++ b/extensions/amp-analytics/0.1/test/test-transport.js
@@ -24,422 +24,503 @@ import {getMode} from '../../../../src/mode';
 import {installTimerService} from '../../../../src/service/timer-impl';
 import {loadPromise} from '../../../../src/event-helper';
 
-describes.realWin('amp-analytics.transport', {
-  amp: false,
-  allowExternalResources: true,
-}, env => {
-
-  let sandbox;
-  let win;
-  let doc;
-  let openXhrStub;
-  let sendXhrStub;
-  let sendBeaconStub;
-  let imagePixelVerifier;
-
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    win = env.win;
-    doc = win.document;
-    openXhrStub = sandbox.stub();
-    sendXhrStub = sandbox.stub();
-    sendBeaconStub = sandbox.stub();
-  });
-
-  it('prefers beacon over xhrpost and image', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: true, xhrpost: true, image: true,
+describes.realWin(
+  'amp-analytics.transport',
+  {
+    amp: false,
+    allowExternalResources: true,
+  },
+  env => {
+    let sandbox;
+    let win;
+    let doc;
+    let openXhrStub;
+    let sendXhrStub;
+    let sendBeaconStub;
+    let imagePixelVerifier;
+
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      win = env.win;
+      doc = win.document;
+      openXhrStub = sandbox.stub();
+      sendXhrStub = sandbox.stub();
+      sendBeaconStub = sandbox.stub();
     });
-    expectBeacon('https://example.com/test', '');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('prefers xhrpost over image', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: false, xhrpost: true, image: true,
+
+    it('prefers beacon over xhrpost and image', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
+      });
+      expectBeacon('https://example.com/test', '');
+      expectNoXhr();
+      expectNoImagePixel();
     });
-    expectNoBeacon();
-    expectXhr('https://example.com/test', '');
-    expectNoImagePixel();
-  });
-
-  it('reluctantly uses image if nothing else is enabled', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {
-      image: true,
+
+    it('prefers xhrpost over image', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: false,
+        xhrpost: true,
+        image: true,
+      });
+      expectNoBeacon();
+      expectXhr('https://example.com/test', '');
+      expectNoImagePixel();
     });
-    expectNoBeacon();
-    expectImagePixel('https://example.com/test');
-    expectNoXhr();
-  });
-
-  it('falls back to image setting suppressWarnings to true', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: false, xhrpost: false, image: {suppressWarnings: true},
+
+    it('reluctantly uses image if nothing else is enabled', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {
+        image: true,
+      });
+      expectNoBeacon();
+      expectImagePixel('https://example.com/test');
+      expectNoXhr();
     });
-    expectNoBeacon();
-    expectNoXhr();
-    expectImagePixel('https://example.com/test');
-  });
-
-  it('falls back to image setting referrerPolicy', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: true, xhrpost: true, image: true, referrerPolicy: 'no-referrer',
+
+    it('falls back to image setting suppressWarnings to true', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: false,
+        xhrpost: false,
+        image: {suppressWarnings: true},
+      });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel('https://example.com/test');
     });
-    expectNoBeacon();
-    expectNoXhr();
-    expectImagePixel('https://example.com/test', 'no-referrer');
-  });
-
-  it('falls back to xhrpost when enabled and beacon is not available', () => {
-    setupStubs(false, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: true, xhrpost: true, image: true,
+
+    it('falls back to image setting referrerPolicy', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
+        referrerPolicy: 'no-referrer',
+      });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel('https://example.com/test', 'no-referrer');
     });
-    expectNoBeacon();
-    expectXhr('https://example.com/test', '');
-    expectNoImagePixel();
-  });
-
-  it('falls back to image when beacon not found and xhr disabled', () => {
-    setupStubs(false, true);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: true, xhrpost: false, image: true,
+
+    it('falls back to xhrpost when enabled and beacon is not available', () => {
+      setupStubs(false, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
+      });
+      expectNoBeacon();
+      expectXhr('https://example.com/test', '');
+      expectNoImagePixel();
     });
-    expectNoBeacon();
-    expectNoXhr();
-    expectImagePixel('https://example.com/test');
-  });
-
-  it('falls back to image when beacon and xhr are not available', () => {
-    setupStubs(false, false);
-    sendRequest(win, 'https://example.com/test', {
-      beacon: true, xhrpost: true, image: true,
+
+    it('falls back to image when beacon not found and xhr disabled', () => {
+      setupStubs(false, true);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: true,
+        xhrpost: false,
+        image: true,
+      });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel('https://example.com/test');
     });
-    expectNoBeacon();
-    expectNoXhr();
-    expectImagePixel('https://example.com/test');
-  });
-
-  it('does not send a request when no transport methods are enabled', () => {
-    setupStubs(true, true);
-    sendRequest(win, 'https://example.com/test', {});
-    expectNoBeacon();
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('does not send a request when URL is empty', () => {
-    setupStubs(true, true);
-    sendRequest(win, '', {beacon: true, xhrpost: true, image: true});
-    expectNoBeacon();
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send single segment request', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], false);
-    expectBeacon('https://e.com/test?a=1&b=hello', '');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send single segment request in batch', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], true);
-    expectBeacon('https://e.com/test?a=1&b=hello', '');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send single segment request useBody', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true, useBody: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], false);
-    expectBeacon('https://e.com/test', '{"a":1,"b":"hello"}');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send single segment request useBody in batch', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true, useBody: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], true);
-    expectBeacon('https://e.com/test', '[{"a":1,"b":"hello"}]');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send multi-segment request w/o batch (only 1st sent)', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }, {
-      extraUrlParams: {
-        a: 2,
-        b: 'world',
-      },
-    }], false);
-    expectBeacon('https://e.com/test?a=1&b=hello', '');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send multi-segment request in batch', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }, {
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], true);
-    expectBeacon('https://e.com/test?a=1&b=hello&a=1&b=hello', '');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('send multi-segment request useBody in batch', () => {
-    setupStubs(true, true);
-    new Transport(win, {beacon: true, useBody: true}).sendRequest('https://e.com/test', [{
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }, {
-      extraUrlParams: {
-        a: 1,
-        b: 'hello',
-      },
-    }], true);
-    expectBeacon('https://e.com/test', '[{"a":1,"b":"hello"},{"a":1,"b":"hello"}]');
-    expectNoXhr();
-    expectNoImagePixel();
-  });
-
-  it('asserts that urls are https', () => {
-    allowConsoleError(() => { expect(() => {
-      sendRequest(win, 'http://example.com/test', {image: true});
-    }).to.throw(/https/); });
-  });
-
-  it('should NOT allow __amp_source_origin', () => {
-    allowConsoleError(() => { expect(() => {
-      sendRequest(win, 'https://twitter.com?__amp_source_origin=1', {image: true});
-    }).to.throw(/Source origin is not allowed in/); });
-  });
-
-  describe('sendRequestUsingIframe', () => {
-    const url = 'http://iframe.localhost:9876/test/fixtures/served/iframe.html';
-
-    function sendRequestUsingIframe(win, url) {
-      new Transport(win).sendRequestUsingIframe(url, {});
-    }
 
-    it('should create and delete an iframe', () => {
-      const clock = lolex.install({target: win});
-      installTimerService(win);
-      sendRequestUsingIframe(win, url);
-      const iframe = doc.querySelector('iframe[src="' + url + '"]');
-      expect(iframe).to.be.ok;
-      expect(iframe.getAttribute('sandbox')).to.equal(
-          'allow-scripts allow-same-origin');
-      return loadPromise(iframe).then(() => {
-        clock.tick(4999);
-        expect(doc.querySelector('iframe[src="' + url + '"]')).to.be.ok;
-        clock.tick(1);
-        expect(doc.querySelector('iframe[src="' + url + '"]')).to.not.be.ok;
+    it('falls back to image when beacon and xhr are not available', () => {
+      setupStubs(false, false);
+      sendRequest(win, 'https://example.com/test', {
+        beacon: true,
+        xhrpost: true,
+        image: true,
       });
+      expectNoBeacon();
+      expectNoXhr();
+      expectImagePixel('https://example.com/test');
     });
 
-    it('iframe asserts that urls are https', () => {
-      allowConsoleError(() => { expect(() => {
-        sendRequestUsingIframe(win, 'http://example.com/test');
-      }).to.throw(/https/); });
+    it('does not send a request when no transport methods are enabled', () => {
+      setupStubs(true, true);
+      sendRequest(win, 'https://example.com/test', {});
+      expectNoBeacon();
+      expectNoXhr();
+      expectNoImagePixel();
     });
 
-    it('forbids same origin', () => {
-      const fakeWin = {
-        location: {
-          href: 'https://example.com/abc',
-        },
-      };
-      allowConsoleError(() => {
-        expect(() => {
-          sendRequestUsingIframe(fakeWin, 'https://example.com/123');
-        }).to.throw(/Origin of iframe request/);
-      });
+    it('does not send a request when URL is empty', () => {
+      setupStubs(true, true);
+      sendRequest(win, '', {beacon: true, xhrpost: true, image: true});
+      expectNoBeacon();
+      expectNoXhr();
+      expectNoImagePixel();
+    });
+
+    it('send single segment request', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        false
+      );
+      expectBeacon('https://e.com/test?a=1&b=hello', '');
+      expectNoXhr();
+      expectNoImagePixel();
     });
-  });
 
-  describe('iframe transport', () => {
+    it('send single segment request in batch', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        true
+      );
+      expectBeacon('https://e.com/test?a=1&b=hello', '');
+      expectNoXhr();
+      expectNoImagePixel();
+    });
 
-    it('does not initialize transport iframe if not used', () => {
-      const transport = new Transport(win, {
-        image: true,
-        xhrpost: true,
-        beacon: false,
-      });
+    it('send single segment request useBody', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true, useBody: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        false
+      );
+      expectBeacon('https://e.com/test', '{"a":1,"b":"hello"}');
+      expectNoXhr();
+      expectNoImagePixel();
+    });
 
-      const ampAnalyticsEl = null;
+    it('send single segment request useBody in batch', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true, useBody: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        true
+      );
+      expectBeacon('https://e.com/test', '[{"a":1,"b":"hello"}]');
+      expectNoXhr();
+      expectNoImagePixel();
+    });
+
+    it('send multi-segment request w/o batch (only 1st sent)', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+          {
+            extraUrlParams: {
+              a: 2,
+              b: 'world',
+            },
+          },
+        ],
+        false
+      );
+      expectBeacon('https://e.com/test?a=1&b=hello', '');
+      expectNoXhr();
+      expectNoImagePixel();
+    });
+
+    it('send multi-segment request in batch', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        true
+      );
+      expectBeacon('https://e.com/test?a=1&b=hello&a=1&b=hello', '');
+      expectNoXhr();
+      expectNoImagePixel();
+    });
+
+    it('send multi-segment request useBody in batch', () => {
+      setupStubs(true, true);
+      new Transport(win, {beacon: true, useBody: true}).sendRequest(
+        'https://e.com/test',
+        [
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+          {
+            extraUrlParams: {
+              a: 1,
+              b: 'hello',
+            },
+          },
+        ],
+        true
+      );
+      expectBeacon(
+        'https://e.com/test',
+        '[{"a":1,"b":"hello"},{"a":1,"b":"hello"}]'
+      );
+      expectNoXhr();
+      expectNoImagePixel();
+    });
 
-      const preconnectSpy = sandbox.spy();
-      transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
-        preload: preconnectSpy,
+    it('asserts that urls are https', () => {
+      allowConsoleError(() => {
+        expect(() => {
+          sendRequest(win, 'http://example.com/test', {image: true});
+        }).to.throw(/https/);
       });
-      expect(transport.iframeTransport_).to.be.null;
-      expect(preconnectSpy).to.not.be.called;
     });
 
-    it('initialize iframe transport when used', () => {
-      const transport = new Transport(win, {
-        iframe: '//test',
+    it('should NOT allow __amp_source_origin', () => {
+      allowConsoleError(() => {
+        expect(() => {
+          sendRequest(win, 'https://twitter.com?__amp_source_origin=1', {
+            image: true,
+          });
+        }).to.throw(/Source origin is not allowed in/);
       });
+    });
 
-      const ad = doc.createElement('amp-ad');
-      ad.getResourceId = () => '123';
-      doc.body.appendChild(ad);
-      const frame = doc.createElement('iframe');
-      ad.appendChild(frame);
-      frame.contentWindow.document.write(
-          '<amp-analytics type="bg"></amp-analytics>');
-      frame.contentWindow.__AMP_TOP = win;
-      const ampAnalyticsEl =
-          frame.contentWindow.document.querySelector('amp-analytics');
-
-      const preconnectSpy = sandbox.spy();
-      transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
-        preload: preconnectSpy,
+    describe('sendRequestUsingIframe', () => {
+      const url =
+        'http://iframe.localhost:9876/test/fixtures/served/iframe.html';
+
+      function sendRequestUsingIframe(win, url) {
+        new Transport(win).sendRequestUsingIframe(url, {});
+      }
+
+      it('should create and delete an iframe', () => {
+        const clock = lolex.install({target: win});
+        installTimerService(win);
+        sendRequestUsingIframe(win, url);
+        const iframe = doc.querySelector('iframe[src="' + url + '"]');
+        expect(iframe).to.be.ok;
+        expect(iframe.getAttribute('sandbox')).to.equal(
+          'allow-scripts allow-same-origin'
+        );
+        return loadPromise(iframe).then(() => {
+          clock.tick(4999);
+          expect(doc.querySelector('iframe[src="' + url + '"]')).to.be.ok;
+          clock.tick(1);
+          expect(doc.querySelector('iframe[src="' + url + '"]')).to.not.be.ok;
+        });
       });
-      expect(transport.iframeTransport_).to.be.ok;
-      expect(preconnectSpy).to.be.called;
 
-      transport.deleteIframeTransport();
-      expect(transport.iframeTransport_).to.be.null;
-    });
+      it('iframe asserts that urls are https', () => {
+        allowConsoleError(() => {
+          expect(() => {
+            sendRequestUsingIframe(win, 'http://example.com/test');
+          }).to.throw(/https/);
+        });
+      });
 
-    it('initialize iframe transport when used with inabox', () => {
-      win.AMP_MODE = win.AMP_MODE || {};
-      win.AMP_MODE.runtime = 'inabox';
-      expect(getMode(win).runtime).to.equal('inabox');
+      it('forbids same origin', () => {
+        const fakeWin = {
+          location: {
+            href: 'https://example.com/abc',
+          },
+        };
+        allowConsoleError(() => {
+          expect(() => {
+            sendRequestUsingIframe(fakeWin, 'https://example.com/123');
+          }).to.throw(/Origin of iframe request/);
+        });
+      });
+    });
 
-      const transport = new Transport(win, {
-        iframe: '//test',
+    describe('iframe transport', () => {
+      it('does not initialize transport iframe if not used', () => {
+        const transport = new Transport(win, {
+          image: true,
+          xhrpost: true,
+          beacon: false,
+        });
+
+        const ampAnalyticsEl = null;
+
+        const preconnectSpy = sandbox.spy();
+        transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
+          preload: preconnectSpy,
+        });
+        expect(transport.iframeTransport_).to.be.null;
+        expect(preconnectSpy).to.not.be.called;
       });
 
-      const frame = doc.createElement('iframe');
-      doc.body.appendChild(frame);
-      frame.contentWindow.document.write(
-          '<amp-analytics type="bg"></amp-analytics>');
-      frame.contentWindow.__AMP_TOP = win;
-      const ampAnalyticsEl =
-          frame.contentWindow.document.querySelector('amp-analytics');
-
-      const preconnectSpy = sandbox.spy();
-      transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
-        preload: preconnectSpy,
+      it('initialize iframe transport when used', () => {
+        const transport = new Transport(win, {
+          iframe: '//test',
+        });
+
+        const ad = doc.createElement('amp-ad');
+        ad.getResourceId = () => '123';
+        doc.body.appendChild(ad);
+        const frame = doc.createElement('iframe');
+        ad.appendChild(frame);
+        frame.contentWindow.document.write(
+          '<amp-analytics type="bg"></amp-analytics>'
+        );
+        frame.contentWindow.__AMP_TOP = win;
+        const ampAnalyticsEl = frame.contentWindow.document.querySelector(
+          'amp-analytics'
+        );
+
+        const preconnectSpy = sandbox.spy();
+        transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
+          preload: preconnectSpy,
+        });
+        expect(transport.iframeTransport_).to.be.ok;
+        expect(preconnectSpy).to.be.called;
+
+        transport.deleteIframeTransport();
+        expect(transport.iframeTransport_).to.be.null;
       });
-      expect(transport.iframeTransport_).to.be.ok;
-      expect(preconnectSpy).to.be.called;
 
-      transport.deleteIframeTransport();
-      expect(transport.iframeTransport_).to.be.null;
-    });
+      it('initialize iframe transport when used with inabox', () => {
+        win.AMP_MODE = win.AMP_MODE || {};
+        win.AMP_MODE.runtime = 'inabox';
+        expect(getMode(win).runtime).to.equal('inabox');
+
+        const transport = new Transport(win, {
+          iframe: '//test',
+        });
+
+        const frame = doc.createElement('iframe');
+        doc.body.appendChild(frame);
+        frame.contentWindow.document.write(
+          '<amp-analytics type="bg"></amp-analytics>'
+        );
+        frame.contentWindow.__AMP_TOP = win;
+        const ampAnalyticsEl = frame.contentWindow.document.querySelector(
+          'amp-analytics'
+        );
+
+        const preconnectSpy = sandbox.spy();
+        transport.maybeInitIframeTransport(win, ampAnalyticsEl, {
+          preload: preconnectSpy,
+        });
+        expect(transport.iframeTransport_).to.be.ok;
+        expect(preconnectSpy).to.be.called;
+
+        transport.deleteIframeTransport();
+        expect(transport.iframeTransport_).to.be.null;
+      });
 
-    it('send via iframe transport', () => {
-      setupStubs(true, true);
-      const transport = new Transport(win, {
-        beacon: true, xhrpost: true, image: true,
-        iframe: '//test',
+      it('send via iframe transport', () => {
+        setupStubs(true, true);
+        const transport = new Transport(win, {
+          beacon: true,
+          xhrpost: true,
+          image: true,
+          iframe: '//test',
+        });
+        const iframeTransportSendRequestSpy = sandbox.spy();
+        transport.iframeTransport_ = {
+          sendRequest: iframeTransportSendRequestSpy,
+        };
+        transport.sendRequest('test test', [{}], false);
+        expectNoBeacon();
+        expectNoXhr();
+        expectNoImagePixel();
+        expect(iframeTransportSendRequestSpy).to.be.calledWith('test test');
       });
-      const iframeTransportSendRequestSpy = sandbox.spy();
-      transport.iframeTransport_ = {
-        sendRequest: iframeTransportSendRequestSpy,
-      };
-      transport.sendRequest('test test', [{}], false);
-      expectNoBeacon();
-      expectNoXhr();
-      expectNoImagePixel();
-      expect(iframeTransportSendRequestSpy).to.be.calledWith('test test');
     });
-  });
-
-  function setupStubs(beacon, xhr) {
-    const wi = mockWindowInterface(sandbox);
-    wi.getSendBeacon.returns(beacon ? sendBeaconStub : undefined);
-
-    const FakeXMLHttpRequest = () => {
-      return {
-        withCredentials: false,
-        open: openXhrStub,
-        send: sendXhrStub,
-        setRequestHeader: () => {},
+
+    function setupStubs(beacon, xhr) {
+      const wi = mockWindowInterface(sandbox);
+      wi.getSendBeacon.returns(beacon ? sendBeaconStub : undefined);
+
+      const FakeXMLHttpRequest = () => {
+        return {
+          withCredentials: false,
+          open: openXhrStub,
+          send: sendXhrStub,
+          setRequestHeader: () => {},
+        };
       };
-    };
-    wi.getXMLHttpRequest.returns(xhr ? FakeXMLHttpRequest : undefined);
-    sendBeaconStub.returns(beacon);
+      wi.getXMLHttpRequest.returns(xhr ? FakeXMLHttpRequest : undefined);
+      sendBeaconStub.returns(beacon);
 
-    imagePixelVerifier = new ImagePixelVerifier(wi);
-  }
+      imagePixelVerifier = new ImagePixelVerifier(wi);
+    }
 
-  function sendRequest(win, request, options) {
-    new Transport(win, options).sendRequest(request, [{}], false);
-  }
+    function sendRequest(win, request, options) {
+      new Transport(win, options).sendRequest(request, [{}], false);
+    }
 
-  function expectBeacon(url, payload) {
-    expect(sendBeaconStub).to.be.calledWith(url, payload);
-  }
+    function expectBeacon(url, payload) {
+      expect(sendBeaconStub).to.be.calledWith(url, payload);
+    }
 
-  function expectNoBeacon() {
-    expect(sendBeaconStub).to.not.be.called;
-  }
+    function expectNoBeacon() {
+      expect(sendBeaconStub).to.not.be.called;
+    }
 
-  function expectXhr(url, payload) {
-    expect(openXhrStub).to.be.calledWith('POST', url, true);
-    expect(sendXhrStub).to.be.calledWith(payload);
-  }
+    function expectXhr(url, payload) {
+      expect(openXhrStub).to.be.calledWith('POST', url, true);
+      expect(sendXhrStub).to.be.calledWith(payload);
+    }
 
-  function expectNoXhr() {
-    expect(openXhrStub).to.not.be.called;
-    expect(sendXhrStub).to.not.be.called;
-  }
+    function expectNoXhr() {
+      expect(openXhrStub).to.not.be.called;
+      expect(sendXhrStub).to.not.be.called;
+    }
 
-  function expectImagePixel(url, referrerPolicy) {
-    imagePixelVerifier.verifyRequest(url, referrerPolicy);
-  }
+    function expectImagePixel(url, referrerPolicy) {
+      imagePixelVerifier.verifyRequest(url, referrerPolicy);
+    }
 
-  function expectNoImagePixel() {
-    expect(imagePixelVerifier.hasRequestSent()).to.be.false;
+    function expectNoImagePixel() {
+      expect(imagePixelVerifier.hasRequestSent()).to.be.false;
+    }
   }
-});
+);
diff --git a/extensions/amp-analytics/0.1/test/test-variables.js b/extensions/amp-analytics/0.1/test/test-variables.js
index da132ad46291..37cd8711f53f 100644
--- a/extensions/amp-analytics/0.1/test/test-variables.js
+++ b/extensions/amp-analytics/0.1/test/test-variables.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
  *
@@ -41,20 +40,19 @@ describe('amp-analytics.VariableService', function() {
   describe('encodeVars', () => {
     it('correctly encodes scalars and arrays', () => {
       expect(encodeVars('abc %&')).to.equal('abc%20%25%26');
-      expect(encodeVars('SOME_MACRO(abc,123)'))
-          .to.equal('SOME_MACRO(abc,123)');
+      expect(encodeVars('SOME_MACRO(abc,123)')).to.equal('SOME_MACRO(abc,123)');
 
       const array = ['abc %&', 'a b'];
       expect(encodeVars(array)).to.equal('abc%20%25%26,a%20b');
       // Test non-inplace semantics by testing again.
       expect(encodeVars(array)).to.equal('abc%20%25%26,a%20b');
-      expect(encodeVars(['12.3', 'SOME_MACRO(abc,123)', 'ab/c']))
-          .to.equal('12.3,SOME_MACRO(abc,123),ab%2Fc');
+      expect(encodeVars(['12.3', 'SOME_MACRO(abc,123)', 'ab/c'])).to.equal(
+        '12.3,SOME_MACRO(abc,123),ab%2Fc'
+      );
     });
   });
 
   describe('expand', () => {
-
     const vars = {
       'a': '${b}',
       'b': '${c}',
@@ -63,7 +61,9 @@ describe('amp-analytics.VariableService', function() {
 
     function check(template, expected, vars) {
       const actual = variables.expandTemplateSync(
-          template, new ExpansionOptions(vars));
+        template,
+        new ExpansionOptions(vars)
+      );
       expect(actual).to.equal(expected);
     }
 
@@ -73,7 +73,9 @@ describe('amp-analytics.VariableService', function() {
 
     it('expands nested vars (no encode)', () => {
       const actual = variables.expandTemplateSync(
-          '${a}', new ExpansionOptions(vars, undefined, true));
+        '${a}',
+        new ExpansionOptions(vars, undefined, true)
+      );
       expect(actual).to.equal('https://www.google.com/a?b=1&c=2');
     });
 
@@ -111,36 +113,47 @@ describe('amp-analytics.VariableService', function() {
       });
 
       check('${foo}&${bar(3,4)}', 'FOO(1,2)&BAR(3,4)', {
-        'foo': 'FOO(1,2)', 'bar': 'BAR',
+        'foo': 'FOO(1,2)',
+        'bar': 'BAR',
       });
 
       // TODO: fix this, should be 'AAA(1,2)%26BBB(3,4)%26CCC(5,6)%26DDD(7,8)'
       check('${all}', 'AAA(1%2C2)%26BBB(3%2C4)%26CCC(5%2C6)%26DDD(7,8)', {
-        'a': 'AAA', 'b': 'BBB', 'c': 'CCC(5,6)', 'd': 'DDD(7,8)',
+        'a': 'AAA',
+        'b': 'BBB',
+        'c': 'CCC(5,6)',
+        'd': 'DDD(7,8)',
         'all': '${a(1,2)}&${b(3,4)}&${c}&${d}',
       });
     });
 
     it('respect freeze variables', () => {
-      const vars = new ExpansionOptions({'fooParam': 'QUERY_PARAM',
-        'freeze': 'error'});
+      const vars = new ExpansionOptions({
+        'fooParam': 'QUERY_PARAM',
+        'freeze': 'error',
+      });
       vars.freezeVar('freeze');
       const actual = variables.expandTemplateSync(
-          '${fooParam(foo,bar)}${nonfreeze}${freeze}', vars);
+        '${fooParam(foo,bar)}${nonfreeze}${freeze}',
+        vars
+      );
       expect(actual).to.equal('QUERY_PARAM(foo,bar)${freeze}');
     });
 
     it('expands array vars', () => {
-      check('${array}',
-          'xy%26x,MACRO(abc,def),MACRO(abc%2Cdef)%26123,%24%7Bfoo%7D', {
-            'foo': 'bar',
-            'array': [
-              'xy&x', // special chars should be encoded
-              'MACRO(abc,def)', // do not encode macro
-              'MACRO(abc,def)&123', // this is not a macro
-              '${foo}', // vars in array is not expanded
-            ],
-          });
+      check(
+        '${array}',
+        'xy%26x,MACRO(abc,def),MACRO(abc%2Cdef)%26123,%24%7Bfoo%7D',
+        {
+          'foo': 'bar',
+          'array': [
+            'xy&x', // special chars should be encoded
+            'MACRO(abc,def)', // do not encode macro
+            'MACRO(abc,def)&123', // this is not a macro
+            '${foo}', // vars in array is not expanded
+          ],
+        }
+      );
     });
 
     it('handles empty var name', () => {
@@ -149,18 +162,27 @@ describe('amp-analytics.VariableService', function() {
 
     describe('should handle recursive vars', () => {
       const recursiveVars = {
-        '1': '1${2}', '2': '2${3}', '3': '3${4}', '4': '4${1}',
+        '1': '1${2}',
+        '2': '2${3}',
+        '3': '3${4}',
+        '4': '4${1}',
       };
 
       it('default to 2 recursions', () => {
-        expectAsyncConsoleError(/Maximum depth reached while expanding variables/);
+        expectAsyncConsoleError(
+          /Maximum depth reached while expanding variables/
+        );
         check('${1}', '123%24%7B4%7D', recursiveVars);
       });
 
       it('customize recursions to 5', () => {
-        expectAsyncConsoleError(/Maximum depth reached while expanding variables/);
+        expectAsyncConsoleError(
+          /Maximum depth reached while expanding variables/
+        );
         const actual = variables.expandTemplateSync(
-            '${1}', new ExpansionOptions(recursiveVars, 5));
+          '${1}',
+          new ExpansionOptions(recursiveVars, 5)
+        );
         expect(actual).to.equal('123412%24%7B3%7D');
       });
     });
@@ -191,11 +213,14 @@ describe('amp-analytics.VariableService', function() {
 
     it('default works without first arg', () => check('$DEFAULT(,two)', 'two'));
 
-    it('default works without first arg length',
-        () => check('$DEFAULT($TRIM(), two)', 'two'));
+    it('default works without first arg length', () =>
+      check('$DEFAULT($TRIM(), two)', 'two'));
 
-    it('hash works', () => check('$HASH(test)',
-        'doQSMg97CqWBL85CjcRwazyuUOAqZMqhangiSb_o78S37xzLEmJV0ZYEff7fF6Cp'));
+    it('hash works', () =>
+      check(
+        '$HASH(test)',
+        'doQSMg97CqWBL85CjcRwazyuUOAqZMqhangiSb_o78S37xzLEmJV0ZYEff7fF6Cp'
+      ));
 
     it('substr works', () => check('$SUBSTR(Hello world!, 1, 4)', 'ello'));
 
@@ -219,14 +244,18 @@ describe('amp-analytics.VariableService', function() {
     it('if works', () => check('$IF(hey, truthy, falsey)', 'truthy'));
 
     it('chaining works', () => {
-      return check('$SUBSTR(Hello world!, 6)', 'world!').then(() =>
-        check('$TOUPPERCASE($SUBSTR(Hello world!, 6))', 'WORLD!')).then(() =>
-        check('$BASE64($TOUPPERCASE($SUBSTR(Hello world!, 6)))', 'V09STEQh'))
-          .then(() =>
-            check('$HASH($BASE64($TOUPPERCASE($SUBSTR(Hello world!, 6))))',
-                'OPTTt2IGW8-R31MrIF_cRUwLTZ9jLDOXEuhNz_Q' +
-                'S7Uc5ZmODduHWdplzrZ7Jsnqx')
-          );
+      return check('$SUBSTR(Hello world!, 6)', 'world!')
+        .then(() => check('$TOUPPERCASE($SUBSTR(Hello world!, 6))', 'WORLD!'))
+        .then(() =>
+          check('$BASE64($TOUPPERCASE($SUBSTR(Hello world!, 6)))', 'V09STEQh')
+        )
+        .then(() =>
+          check(
+            '$HASH($BASE64($TOUPPERCASE($SUBSTR(Hello world!, 6))))',
+            'OPTTt2IGW8-R31MrIF_cRUwLTZ9jLDOXEuhNz_Q' +
+              'S7Uc5ZmODduHWdplzrZ7Jsnqx'
+          )
+        );
     });
 
     it('replaces common use case', () => {
@@ -246,8 +275,10 @@ describe('amp-analytics.VariableService', function() {
     });
 
     it('replaces respecting space as arg', () => {
-      return check('$REPLACE(this-is-a-test, `-`, ` `)',
-          'this%20is%20a%20test');
+      return check(
+        '$REPLACE(this-is-a-test, `-`, ` `)',
+        'this%20is%20a%20test'
+      );
     });
 
     it('replaces respecting backticks', () => {
@@ -263,13 +294,14 @@ describe('amp-analytics.VariableService', function() {
       const linkerReaderStub = sandbox.stub(linkerReader, 'get');
       linkerReaderStub.withArgs('gl', 'cid').returns('a1b2c3');
       linkerReaderStub.withArgs('gl', 'gclid').returns(123);
-      return check('LINKER_PARAM(gl, cid)&LINKER_PARAM(gl, gclid)',
-          'a1b2c3&123');
+      return check(
+        'LINKER_PARAM(gl, cid)&LINKER_PARAM(gl, gclid)',
+        'a1b2c3&123'
+      );
     });
   });
 
   describe('getNameArgs:', () => {
-
     function check(input, name, argList) {
       it('can parse ' + name, () => {
         expect(getNameArgsForTesting(input)).to.deep.equal({name, argList});
@@ -283,7 +315,6 @@ describe('amp-analytics.VariableService', function() {
     check('client id\nand something', 'client id\nand something', '');
     check('client id\nclientId()', 'client id\nclientId()', '');
 
-
     check('clientId()', 'clientId', '()');
     check('clientId(abc)', 'clientId', '(abc)');
     check('clientId(abc,def)', 'clientId', '(abc,def)');
diff --git a/extensions/amp-analytics/0.1/test/test-vendors.js b/extensions/amp-analytics/0.1/test/test-vendors.js
index 3c3c1d7e4736..98995823966f 100644
--- a/extensions/amp-analytics/0.1/test/test-vendors.js
+++ b/extensions/amp-analytics/0.1/test/test-vendors.js
@@ -31,163 +31,187 @@ const VENDOR_REQUESTS = require('./vendor-requests.json');
 const AnalyticsConfig = Object.assign({}, ANALYTICS_CONFIG);
 
 describe('iframe transport', () => {
-
   it('Should not contain iframe transport if not whitelisted', () => {
     for (const vendor in AnalyticsConfig) {
       const vendorEntry = AnalyticsConfig[vendor];
-      if (hasOwn(vendorEntry, 'transport') &&
-          hasOwn(vendorEntry.transport, 'iframe')) {
-        expect(vendorEntry['transport']['iframe'])
-            .to.equal(IFRAME_TRANSPORTS[vendor]);
+      if (
+        hasOwn(vendorEntry, 'transport') &&
+        hasOwn(vendorEntry.transport, 'iframe')
+      ) {
+        expect(vendorEntry['transport']['iframe']).to.equal(
+          IFRAME_TRANSPORTS[vendor]
+        );
       }
     }
   });
 });
 
-describes.realWin('amp-analytics', {
-  amp: {
-    extensions: ['amp-analytics'],
+describes.realWin(
+  'amp-analytics',
+  {
+    amp: {
+      extensions: ['amp-analytics'],
+    },
   },
-}, function(env) {
-  let win, doc;
-  let requestVerifier;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    const wi = mockWindowInterface(env.sandbox);
-    wi.getLocation.returns(win.location);
-    requestVerifier = new ImagePixelVerifier(wi);
-  });
+  function(env) {
+    let win, doc;
+    let requestVerifier;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      const wi = mockWindowInterface(env.sandbox);
+      wi.getLocation.returns(win.location);
+      requestVerifier = new ImagePixelVerifier(wi);
+    });
+
+    function getAnalyticsTag(config, attrs) {
+      config['transport'] = {
+        xhrpost: false,
+        beacon: false,
+      };
+      config = JSON.stringify(config);
+      const el = doc.createElement('amp-analytics');
+      const script = doc.createElement('script');
+      script.textContent = config;
+      script.setAttribute('type', 'application/json');
+      el.appendChild(script);
+      for (const k in attrs) {
+        el.setAttribute(k, attrs[k]);
+      }
 
+      doc.body.appendChild(el);
 
-  function getAnalyticsTag(config, attrs) {
-    config['transport'] = {
-      xhrpost: false,
-      beacon: false,
-    };
-    config = JSON.stringify(config);
-    const el = doc.createElement('amp-analytics');
-    const script = doc.createElement('script');
-    script.textContent = config;
-    script.setAttribute('type', 'application/json');
-    el.appendChild(script);
-    for (const k in attrs) {
-      el.setAttribute(k, attrs[k]);
+      el.connectedCallback();
+      const analytics = new AmpAnalytics(el);
+      analytics.createdCallback();
+      analytics.buildCallback();
+      return analytics;
     }
 
-    doc.body.appendChild(el);
-
-    el.connectedCallback();
-    const analytics = new AmpAnalytics(el);
-    analytics.createdCallback();
-    analytics.buildCallback();
-    return analytics;
-  }
-
-  /**
-   * Clears the properties in the config that should only be used in vendor
-   * configs. This is needed because we pass in all the vendor requests as
-   * inline config and iframePings/optout are not allowed to be used without
-   * AMP team's approval.
-   *
-   * @param {!JsonObject} config The inline config to update.
-   * @return {!JsonObject}
-   */
-  function clearVendorOnlyConfig(config) {
-    for (const t in config.triggers) {
-      if (config.triggers[t].iframePing) {
-        config.triggers[t].iframePing = undefined;
+    /**
+     * Clears the properties in the config that should only be used in vendor
+     * configs. This is needed because we pass in all the vendor requests as
+     * inline config and iframePings/optout are not allowed to be used without
+     * AMP team's approval.
+     *
+     * @param {!JsonObject} config The inline config to update.
+     * @return {!JsonObject}
+     */
+    function clearVendorOnlyConfig(config) {
+      for (const t in config.triggers) {
+        if (config.triggers[t].iframePing) {
+          config.triggers[t].iframePing = undefined;
+        }
       }
+      if (config.optout) {
+        config.optout = undefined;
+      }
+      return config;
     }
-    if (config.optout) {
-      config.optout = undefined;
-    }
-    return config;
-  }
 
-  describe('vendor request tests', () => {
-    for (const vendor in AnalyticsConfig) {
-      if (vendor === 'default') {
-        continue;
-      }
-      const config = AnalyticsConfig[vendor];
-      if (!config.requests) {
-        delete AnalyticsConfig[vendor];
-        continue;
-      }
-      describe('analytics vendor: ' + vendor, function() {
-        beforeEach(() => {
-          // Remove all the triggers to prevent unwanted requests, for instance
-          // one from a "visible" trigger. Those unwanted requests are a source
-          // of test flakiness. Especially they will alternate value of var
-          // $requestCount.
-          config.triggers = {};
-        });
+    describe('vendor request tests', () => {
+      for (const vendor in AnalyticsConfig) {
+        if (vendor === 'default') {
+          continue;
+        }
+        const config = AnalyticsConfig[vendor];
+        if (!config.requests) {
+          delete AnalyticsConfig[vendor];
+          continue;
+        }
+        describe('analytics vendor: ' + vendor, function() {
+          beforeEach(() => {
+            // Remove all the triggers to prevent unwanted requests, for instance
+            // one from a "visible" trigger. Those unwanted requests are a source
+            // of test flakiness. Especially they will alternate value of var
+            // $requestCount.
+            config.triggers = {};
+          });
 
-        for (const name in config.requests) {
-          it('should produce request: ' + name +
-              '. If this test fails update vendor-requests.json', function* () {
-            const urlReplacements =
-                Services.urlReplacementsForDoc(doc.documentElement);
-            const analytics = getAnalyticsTag(clearVendorOnlyConfig(config));
-            sandbox.stub(urlReplacements.getVariableSource(), 'get').callsFake(
-                function(name) {
-                  expect(this.replacements_).to.have.property(name);
-                  const defaultValue = `_${name.toLowerCase()}_`;
-                  return {
-                    sync: () => defaultValue,
-                  };
-                });
-
-            sandbox.stub(ExpansionOptions.prototype, 'getVar').callsFake(
-                function(name) {
-                  let val = this.vars[name];
-                  if (val == null || val == '') {
-                    val = '!' + name;
+          for (const name in config.requests) {
+            it(
+              'should produce request: ' +
+                name +
+                '. If this test fails update vendor-requests.json',
+              function*() {
+                const urlReplacements = Services.urlReplacementsForDoc(
+                  doc.documentElement
+                );
+                const analytics = getAnalyticsTag(
+                  clearVendorOnlyConfig(config)
+                );
+                sandbox
+                  .stub(urlReplacements.getVariableSource(), 'get')
+                  .callsFake(function(name) {
+                    expect(this.replacements_).to.have.property(name);
+                    const defaultValue = `_${name.toLowerCase()}_`;
+                    return {
+                      sync: () => defaultValue,
+                    };
+                  });
+
+                sandbox
+                  .stub(ExpansionOptions.prototype, 'getVar')
+                  .callsFake(function(name) {
+                    let val = this.vars[name];
+                    if (val == null || val == '') {
+                      val = '!' + name;
+                    }
+                    return val;
+                  });
+                analytics.createdCallback();
+                analytics.buildCallback();
+                yield analytics.layoutCallback();
+
+                // Wait for event queue to clear.
+                yield macroTask();
+
+                analytics.handleEvent_(
+                  {
+                    request: name,
+                  },
+                  {
+                    vars: Object.create(null),
                   }
-                  return val;
-                });
-            analytics.createdCallback();
-            analytics.buildCallback();
-            yield analytics.layoutCallback();
-
-            // Wait for event queue to clear.
-            yield macroTask();
-
-            analytics.handleEvent_({
-              request: name,
-            }, {
-              vars: Object.create(null),
-            });
-            yield macroTask();
-            expect(requestVerifier.hasRequestSent()).to.be.true;
-            let url = requestVerifier.getLastRequestUrl();
-
-            const vendorData = VENDOR_REQUESTS[vendor];
-            if (!vendorData) {
-              throw new Error('Add vendor ' + vendor +
-                  ' to vendor-requests.json');
-            }
-            const val = vendorData[name];
-            if (val == '<ignore for test>') {
-              url = '<ignore for test>';
-            }
-            if (val == null) {
-              throw new Error('Define ' + vendor + '.' + name +
-                  ' in vendor-requests.json. Expected value: ' + url);
-            }
-
-            // Write this out for easy copy pasting.
-            writeOutput(vendor, name, url);
-
-            expect(url).to.equal(val);
-          });
-        }
-      });
-    }
-  });
-});
+                );
+                yield macroTask();
+                expect(requestVerifier.hasRequestSent()).to.be.true;
+                let url = requestVerifier.getLastRequestUrl();
+
+                const vendorData = VENDOR_REQUESTS[vendor];
+                if (!vendorData) {
+                  throw new Error(
+                    'Add vendor ' + vendor + ' to vendor-requests.json'
+                  );
+                }
+                const val = vendorData[name];
+                if (val == '<ignore for test>') {
+                  url = '<ignore for test>';
+                }
+                if (val == null) {
+                  throw new Error(
+                    'Define ' +
+                      vendor +
+                      '.' +
+                      name +
+                      ' in vendor-requests.json. Expected value: ' +
+                      url
+                  );
+                }
+
+                // Write this out for easy copy pasting.
+                writeOutput(vendor, name, url);
+
+                expect(url).to.equal(val);
+              }
+            );
+          }
+        });
+      }
+    });
+  }
+);
 
 const actualResults = {};
 
diff --git a/extensions/amp-analytics/0.1/test/test-visibility-manager-for-mapp.js b/extensions/amp-analytics/0.1/test/test-visibility-manager-for-mapp.js
index 55105f4d4a8d..d8526c700a83 100644
--- a/extensions/amp-analytics/0.1/test/test-visibility-manager-for-mapp.js
+++ b/extensions/amp-analytics/0.1/test/test-visibility-manager-for-mapp.js
@@ -46,7 +46,6 @@ class MockVisibilityInterface {
   }
 }
 
-
 describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
   let win;
   let ampdoc;
@@ -65,8 +64,7 @@ describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
     viewer = win.services.viewer.obj;
     sandbox.stub(viewer, 'getFirstVisibleTime').callsFake(() => 1);
     visibilityInterface = new MockVisibilityInterface();
-    root =
-        new VisibilityManagerForMApp(ampdoc, visibilityInterface);
+    root = new VisibilityManagerForMApp(ampdoc, visibilityInterface);
 
     win.IntersectionObserver = null;
 
@@ -78,8 +76,7 @@ describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
   it('should initialize correctly', () => {
     viewer.setVisibilityState_(VisibilityState.HIDDEN);
     visibilityInterface = new MockVisibilityInterface(0.5);
-    root =
-        new VisibilityManagerForMApp(ampdoc, visibilityInterface);
+    root = new VisibilityManagerForMApp(ampdoc, visibilityInterface);
     expect(root.parent).to.be.null;
     expect(root.ampdoc).to.equal(ampdoc);
     expect(root.getStartTime()).to.equal(viewer.getFirstVisibleTime());
@@ -111,8 +108,7 @@ describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
 
   it('should switch root model to no-visibility on dispose', () => {
     visibilityInterface = new MockVisibilityInterface(1);
-    root =
-        new VisibilityManagerForMApp(ampdoc, visibilityInterface);
+    root = new VisibilityManagerForMApp(ampdoc, visibilityInterface);
     expect(root.getRootVisibility()).to.equal(1);
     root.dispose();
     expect(root.getRootVisibility()).to.equal(0);
@@ -121,15 +117,21 @@ describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
   it('should not support listen on element', () => {
     const target = win.document.createElement('div');
     //root.listenElement(target, {}, null, null, () => {});
-    allowConsoleError(() => { expect(() => {
-      root.listenElement(target, {}, null, null, () => {});
-    }).to.throw(/element level visibility not supported/); });
-    allowConsoleError(() => { expect(() => {
-      root.observe();
-    }).to.throw(/element level visibility not supported/); });
-    allowConsoleError(() => { expect(() => {
-      root.getElementVisibility();
-    }).to.throw(/element level visibility not supported/); });
+    allowConsoleError(() => {
+      expect(() => {
+        root.listenElement(target, {}, null, null, () => {});
+      }).to.throw(/element level visibility not supported/);
+    });
+    allowConsoleError(() => {
+      expect(() => {
+        root.observe();
+      }).to.throw(/element level visibility not supported/);
+    });
+    allowConsoleError(() => {
+      expect(() => {
+        root.getElementVisibility();
+      }).to.throw(/element level visibility not supported/);
+    });
   });
 
   it('should protect from invalid intersection values', () => {
@@ -179,7 +181,9 @@ describes.fakeWin('VisibilityManagerForMapp', {amp: true}, env => {
 
     // Back to visible range
     visibilityInterface.fireVisibilityChangeForTesting(
-        0.3, layoutRectLtwh(1, 2, 100, 201));
+      0.3,
+      layoutRectLtwh(1, 2, 100, 201)
+    );
     clock.tick(3);
     return eventPromise.then(state => {
       expect(disposed).to.be.calledOnce;
diff --git a/extensions/amp-analytics/0.1/test/test-visibility-manager.js b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
index 33476c107dc3..5422288dddd2 100644
--- a/extensions/amp-analytics/0.1/test/test-visibility-manager.js
+++ b/extensions/amp-analytics/0.1/test/test-visibility-manager.js
@@ -27,7 +27,6 @@ import {VisibilityState} from '../../../../src/visibility-state';
 import {layoutRectLtwh, rectIntersection} from '../../../../src/layout-rect';
 
 class IntersectionObserverStub {
-
   constructor(callback, options) {
     this.callback = callback;
     this.options = options;
@@ -63,7 +62,6 @@ class IntersectionObserverStub {
   }
 }
 
-
 describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
   let win;
   let ampdoc;
@@ -82,8 +80,7 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     viewer = win.services.viewer.obj;
     sandbox.stub(viewer, 'getFirstVisibleTime').callsFake(() => 1);
     viewport = win.services.viewport.obj;
-    startVisibilityHandlerCount =
-        viewer.visibilityObservable_.getHandlerCount();
+    startVisibilityHandlerCount = viewer.visibilityObservable_.getHandlerCount();
 
     root = new VisibilityManagerForDoc(ampdoc);
 
@@ -166,8 +163,9 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
   });
 
   it('should switch visibility based on viewer for main doc', () => {
-    expect(viewer.visibilityObservable_.getHandlerCount())
-        .equal(startVisibilityHandlerCount + 1);
+    expect(viewer.visibilityObservable_.getHandlerCount()).equal(
+      startVisibilityHandlerCount + 1
+    );
     expect(root.getRootVisibility()).to.equal(1);
 
     // Go prerender.
@@ -198,11 +196,13 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
 
     // Unrelated event.
     const otherTarget = win.document.createElement('div');
-    inOb.callback([{
-      target: otherTarget,
-      intersectionRatio: 0.3,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
+    inOb.callback([
+      {
+        target: otherTarget,
+        intersectionRatio: 0.3,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(root.getRootVisibility()).to.equal(0);
 
     // Move to the viewport.
@@ -310,7 +310,12 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     root.listenRoot(spec, null, null, modelsCalled);
     root.listenElement(otherTarget, spec, null, null, modelsCalled);
     root.listenElement(
-        otherTarget, {totalTimeMin: 20}, null, null, modelsCalled);
+      otherTarget,
+      {totalTimeMin: 20},
+      null,
+      null,
+      modelsCalled
+    );
     expect(root.models_).to.have.length(3);
     root.models_.forEach(model => {
       model.unsubscribe(modelsDisposed);
@@ -332,8 +337,9 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     expect(otherUnsubscribes.callCount).to.equal(2);
 
     // Viewer and viewport have been unsubscribed.
-    expect(viewer.visibilityObservable_.getHandlerCount())
-        .equal(startVisibilityHandlerCount);
+    expect(viewer.visibilityObservable_.getHandlerCount()).equal(
+      startVisibilityHandlerCount
+    );
 
     // Intersection observer disconnected.
     expect(inOb.disconnected).to.be.true;
@@ -350,16 +356,20 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     // Check observer is correctly set.
     const inOb = root.getIntersectionObserver_();
     expect(inOb).to.be.instanceOf(IntersectionObserverPolyfill);
-    expect(viewport.scrollObservable_.getHandlerCount())
-        .to.equal(startScrollCount + 1);
-    expect(viewport.changeObservable_.getHandlerCount())
-        .to.equal(startChangeCount + 1);
+    expect(viewport.scrollObservable_.getHandlerCount()).to.equal(
+      startScrollCount + 1
+    );
+    expect(viewport.changeObservable_.getHandlerCount()).to.equal(
+      startChangeCount + 1
+    );
 
     root.dispose();
-    expect(viewport.scrollObservable_.getHandlerCount())
-        .to.equal(startScrollCount);
-    expect(viewport.changeObservable_.getHandlerCount())
-        .to.equal(startChangeCount);
+    expect(viewport.scrollObservable_.getHandlerCount()).to.equal(
+      startScrollCount
+    );
+    expect(viewport.changeObservable_.getHandlerCount()).to.equal(
+      startChangeCount
+    );
   });
 
   it('should support polyfill on non-amp root element', () => {
@@ -389,8 +399,12 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
       }
       return null;
     });
-    expect(rootElement.getLayoutBox())
-        .to.contain({left: 0, top: 50, width: 100, height: 100});
+    expect(rootElement.getLayoutBox()).to.contain({
+      left: 0,
+      top: 50,
+      width: 100,
+      height: 100,
+    });
     viewport.scrollObservable_.fire({type: 'scroll'});
     expect(model.getVisibility_()).to.equal(0.5);
 
@@ -404,8 +418,9 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     const disposed = sandbox.spy();
     const spec = {totalTimeMin: 10};
     root.listenRoot(spec, null, null, eventResolver);
-    sandbox.stub(root, 'getRootLayoutBox').callsFake(
-        () => layoutRectLtwh(11, 21, 101, 201));
+    sandbox
+      .stub(root, 'getRootLayoutBox')
+      .callsFake(() => layoutRectLtwh(11, 21, 101, 201));
 
     expect(root.models_).to.have.length(1);
     const model = root.models_[0];
@@ -481,9 +496,14 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     const testPromise = new Promise(resolve => {
       testPromiseResolver = resolve;
     });
-    root.listenRoot({}, null, () => {
-      return testPromise;
-    }, eventResolver);
+    root.listenRoot(
+      {},
+      null,
+      () => {
+        return testPromise;
+      },
+      eventResolver
+    );
     expect(root.models_).to.have.length(1);
     const model = root.models_[0];
     model.unsubscribe(disposed);
@@ -533,11 +553,13 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     expect(model.getVisibility_()).to.equal(0);
 
     // In viewport.
-    inOb.callback([{
-      target,
-      intersectionRatio: 0.3,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 0.3,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(0.3);
 
     // Go invisible on root.
@@ -575,26 +597,51 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     expect(model.getVisibility_()).to.equal(0);
 
     // Valid value.
-    inOb.callback([{target, intersectionRatio: 0.3,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1)}]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 0.3,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(0.3);
 
     // Invalid negative value.
-    inOb.callback([{target, intersectionRatio: -0.01,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1)}]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: -0.01,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(0);
 
-    inOb.callback([{target, intersectionRatio: -1000,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1)}]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: -1000,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(0);
 
     // Invalid overflow value.
-    inOb.callback([{target, intersectionRatio: 1.01,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1)}]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 1.01,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(1);
 
-    inOb.callback([{target, intersectionRatio: 1000,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1)}]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 1000,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model.getVisibility_()).to.equal(1);
   });
 
@@ -618,11 +665,13 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     expect(inOb.elements).to.contain(target);
 
     // In viewport.
-    inOb.callback([{
-      target,
-      intersectionRatio: 0.3,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 0.3,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
     expect(model1.getVisibility_()).to.equal(0.3);
     expect(trackedElement.intersectionRatio).to.equal(0.3);
 
@@ -646,29 +695,32 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
     sandbox.stub(model1, 'reset_');
     // Fire the first event.
     clock.tick(11);
-    return eventPromise.then(state => {
-      // First event fired. The first model should be cleaned up, but not
-      // the other.
-      expect(state.totalVisibleTime).to.equal(10);
-      expect(disposed1).to.be.calledOnce;
-      expect(root.models_).to.have.length(1);
-      expect(root.trackedElements_[target.__AMP_VIS_ID])
-          .to.equal(trackedElement);
-      expect(trackedElement.listeners).to.have.length(1);
-      expect(inOb.elements).to.contain(target);
-
-      // Fire the second event.
-      clock.tick(10);
-      return eventPromise2;
-    }).then(state => {
-      // Second event fired. Everything should be released now.
-      expect(state.totalVisibleTime).to.equal(20);
-      expect(disposed2).to.be.calledOnce;
-      expect(root.models_).to.have.length(0);
-      expect(root.trackedElements_[target.__AMP_VIS_ID]).to.not.exist;
-      expect(trackedElement.listeners).to.have.length(0);
-      expect(inOb.elements).to.not.contain(target);
-    });
+    return eventPromise
+      .then(state => {
+        // First event fired. The first model should be cleaned up, but not
+        // the other.
+        expect(state.totalVisibleTime).to.equal(10);
+        expect(disposed1).to.be.calledOnce;
+        expect(root.models_).to.have.length(1);
+        expect(root.trackedElements_[target.__AMP_VIS_ID]).to.equal(
+          trackedElement
+        );
+        expect(trackedElement.listeners).to.have.length(1);
+        expect(inOb.elements).to.contain(target);
+
+        // Fire the second event.
+        clock.tick(10);
+        return eventPromise2;
+      })
+      .then(state => {
+        // Second event fired. Everything should be released now.
+        expect(state.totalVisibleTime).to.equal(20);
+        expect(disposed2).to.be.calledOnce;
+        expect(root.models_).to.have.length(0);
+        expect(root.trackedElements_[target.__AMP_VIS_ID]).to.not.exist;
+        expect(trackedElement.listeners).to.have.length(0);
+        expect(inOb.elements).to.not.contain(target);
+      });
   });
 
   it('should listen on a resource', () => {
@@ -680,17 +732,20 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
       },
     };
     const resources = win.services.resources.obj;
-    sandbox.stub(resources, 'getResourceForElementOptional').callsFake(
-        () => resource);
+    sandbox
+      .stub(resources, 'getResourceForElementOptional')
+      .callsFake(() => resource);
     const spec = {totalTimeMin: 10};
     root.listenElement(target, spec, null, null, eventResolver);
 
     const inOb = root.getIntersectionObserver_();
-    inOb.callback([{
-      target,
-      intersectionRatio: 0.3,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
+    inOb.callback([
+      {
+        target,
+        intersectionRatio: 0.3,
+        intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+      },
+    ]);
 
     expect(root.models_).to.have.length(1);
     const model = root.models_[0];
@@ -708,227 +763,239 @@ describes.fakeWin('VisibilityManagerForDoc', {amp: true}, env => {
   });
 });
 
+describes.realWin(
+  'EmbedAnalyticsRoot',
+  {
+    amp: {ampdoc: 'fie'},
+  },
+  env => {
+    let parentWin;
+    let win;
+    let ampdoc;
+    let embed;
+    let clock;
+    let viewer;
+    let viewport;
+    let parentRoot;
+    let root;
+    let inob;
+
+    beforeEach(() => {
+      parentWin = env.parentWin;
+      win = env.win;
+      ampdoc = env.ampdoc;
+      embed = env.embed;
+      embed.host = ampdoc.win.document.createElement('amp-host');
+      clock = sandbox.useFakeTimers();
+      clock.tick(1);
 
-describes.realWin('EmbedAnalyticsRoot', {
-  amp: {ampdoc: 'fie'},
-}, env => {
-  let parentWin;
-  let win;
-  let ampdoc;
-  let embed;
-  let clock;
-  let viewer;
-  let viewport;
-  let parentRoot;
-  let root;
-  let inob;
-
-  beforeEach(() => {
-    parentWin = env.parentWin;
-    win = env.win;
-    ampdoc = env.ampdoc;
-    embed = env.embed;
-    embed.host = ampdoc.win.document.createElement('amp-host');
-    clock = sandbox.useFakeTimers();
-    clock.tick(1);
-
-    viewport = parentWin.services.viewport.obj;
-    viewer = parentWin.services.viewer.obj;
-    sandbox.stub(viewer, 'getFirstVisibleTime').callsFake(() => 1);
-
-    parentRoot = new VisibilityManagerForDoc(ampdoc);
-    parentWin.IntersectionObserver = IntersectionObserverStub;
-    parentWin.IntersectionObserverEntry = function() {};
-    parentWin.IntersectionObserverEntry.prototype.intersectionRatio = 1;
-
-    root = new VisibilityManagerForEmbed(parentRoot, embed);
-    inob = parentRoot.getIntersectionObserver_();
-  });
-
-  it('should dispose with parent', () => {
-    const unsubscribeSpy = sandbox.spy();
-    root.unsubscribe(unsubscribeSpy);
-
-    expect(parentRoot.children_).to.have.length(1);
-    expect(parentRoot.children_[0]).to.equal(root);
-
-    parentRoot.dispose();
-    expect(parentRoot.children_).to.have.length(0);
-    expect(unsubscribeSpy).to.be.calledOnce;
-  });
-
-  it('should remove from parent when disposed', () => {
-    const unsubscribeSpy = sandbox.spy();
-    root.unsubscribe(unsubscribeSpy);
+      viewport = parentWin.services.viewport.obj;
+      viewer = parentWin.services.viewer.obj;
+      sandbox.stub(viewer, 'getFirstVisibleTime').callsFake(() => 1);
 
-    expect(parentRoot.children_).to.have.length(1);
-    expect(parentRoot.children_[0]).to.equal(root);
+      parentRoot = new VisibilityManagerForDoc(ampdoc);
+      parentWin.IntersectionObserver = IntersectionObserverStub;
+      parentWin.IntersectionObserverEntry = function() {};
+      parentWin.IntersectionObserverEntry.prototype.intersectionRatio = 1;
 
-    root.dispose();
-    expect(parentRoot.children_).to.have.length(0);
-    expect(unsubscribeSpy).to.be.calledOnce;
-  });
+      root = new VisibilityManagerForEmbed(parentRoot, embed);
+      inob = parentRoot.getIntersectionObserver_();
+    });
 
-  it('should initialize correctly backgrounded', () => {
-    viewer.setVisibilityState_(VisibilityState.HIDDEN);
-    root = new VisibilityManagerForEmbed(parentRoot, embed);
+    it('should dispose with parent', () => {
+      const unsubscribeSpy = sandbox.spy();
+      root.unsubscribe(unsubscribeSpy);
 
-    expect(root.parent).to.equal(parentRoot);
-    expect(root.ampdoc).to.equal(ampdoc);
-    expect(root.getStartTime()).to.equal(embed.getStartTime());
-    expect(root.isBackgrounded()).to.be.true;
-    expect(root.isBackgroundedAtStart()).to.be.true;
+      expect(parentRoot.children_).to.have.length(1);
+      expect(parentRoot.children_[0]).to.equal(root);
 
-    // Root model starts invisible.
-    expect(root.getRootVisibility()).to.equal(0);
-  });
+      parentRoot.dispose();
+      expect(parentRoot.children_).to.have.length(0);
+      expect(unsubscribeSpy).to.be.calledOnce;
+    });
 
-  it('should initialize correctly foregrounded', () => {
-    expect(root.parent).to.equal(parentRoot);
-    expect(root.ampdoc).to.equal(ampdoc);
-    expect(root.getStartTime()).to.equal(embed.getStartTime());
-    expect(root.isBackgrounded()).to.be.false;
-    expect(root.isBackgroundedAtStart()).to.be.false;
+    it('should remove from parent when disposed', () => {
+      const unsubscribeSpy = sandbox.spy();
+      root.unsubscribe(unsubscribeSpy);
 
-    // Root model starts invisible.
-    root.setRootVisibility(1);
-    expect(root.getRootVisibility()).to.equal(1);
-  });
+      expect(parentRoot.children_).to.have.length(1);
+      expect(parentRoot.children_[0]).to.equal(root);
 
-  it('should resolve root layout box', () => {
-    sandbox.stub(viewport, 'getLayoutRect').callsFake(element => {
-      if (element == embed.iframe) {
-        return layoutRectLtwh(11, 21, 101, 201);
-      }
-      return null;
-    });
-    expect(root.getRootLayoutBox()).to.contain({
-      left: 11,
-      top: 21,
-      width: 101,
-      height: 201,
+      root.dispose();
+      expect(parentRoot.children_).to.have.length(0);
+      expect(unsubscribeSpy).to.be.calledOnce;
     });
-  });
-
-  it('should ask parent to observe host element', () => {
-    const id = embed.host.__AMP_VIS_ID;
-    expect(parentRoot.trackedElements_[id]).to.be.ok;
 
-    root.dispose();
-    expect(parentRoot.trackedElements_[id]).to.be.undefined;
-  });
+    it('should initialize correctly backgrounded', () => {
+      viewer.setVisibilityState_(VisibilityState.HIDDEN);
+      root = new VisibilityManagerForEmbed(parentRoot, embed);
 
-  it('should delegate observation to parent', () => {
-    const inOb = {
-      observe: sandbox.spy(),
-      unobserve: sandbox.spy(),
-    };
-    parentRoot.intersectionObserver_ = inOb;
+      expect(root.parent).to.equal(parentRoot);
+      expect(root.ampdoc).to.equal(ampdoc);
+      expect(root.getStartTime()).to.equal(embed.getStartTime());
+      expect(root.isBackgrounded()).to.be.true;
+      expect(root.isBackgroundedAtStart()).to.be.true;
 
-    const listener = sandbox.spy();
-    const target = win.document.createElement('div');
+      // Root model starts invisible.
+      expect(root.getRootVisibility()).to.equal(0);
+    });
 
-    // Observe.
-    const unlisten = root.observe(target, listener);
-    expect(inOb.observe).to.be.calledOnce;
-    expect(inOb.observe).to.be.calledWith(target);
-    const id = target.__AMP_VIS_ID;
-    expect(parentRoot.trackedElements_[id]).to.be.ok;
+    it('should initialize correctly foregrounded', () => {
+      expect(root.parent).to.equal(parentRoot);
+      expect(root.ampdoc).to.equal(ampdoc);
+      expect(root.getStartTime()).to.equal(embed.getStartTime());
+      expect(root.isBackgrounded()).to.be.false;
+      expect(root.isBackgroundedAtStart()).to.be.false;
 
-    // Unobserve.
-    unlisten();
-    expect(inOb.unobserve).to.be.calledOnce;
-    expect(inOb.unobserve).to.be.calledWith(target);
-    expect(parentRoot.trackedElements_[id]).to.be.undefined;
-  });
-
-  it('should depend on parent for visibility', () => {
-    const callbackSpy = sandbox.spy();
-    const otherTarget = win.document.createElement('div');
-    root.listenRoot({}, null, null, callbackSpy);
-    expect(root.models_).to.have.length(1);
-    const rootModel = root.models_[0];
+      // Root model starts invisible.
+      root.setRootVisibility(1);
+      expect(root.getRootVisibility()).to.equal(1);
+    });
 
-    root.listenElement(otherTarget, {}, null, null, callbackSpy);
-    expect(root.models_).to.have.length(2);
-    const elementModel = root.models_[1];
+    it('should resolve root layout box', () => {
+      sandbox.stub(viewport, 'getLayoutRect').callsFake(element => {
+        if (element == embed.iframe) {
+          return layoutRectLtwh(11, 21, 101, 201);
+        }
+        return null;
+      });
+      expect(root.getRootLayoutBox()).to.contain({
+        left: 11,
+        top: 21,
+        width: 101,
+        height: 201,
+      });
+    });
 
-    // Set up.
-    expect(inob.elements).to.contain(embed.host);
-    expect(inob.elements).to.contain(otherTarget);
+    it('should ask parent to observe host element', () => {
+      const id = embed.host.__AMP_VIS_ID;
+      expect(parentRoot.trackedElements_[id]).to.be.ok;
 
-    // Start state.
-    expect(parentRoot.getRootVisibility()).to.equal(1);
-    expect(root.getRootVisibility()).to.equal(0);
-    expect(rootModel.getVisibility_()).to.equal(0);
-    expect(elementModel.getVisibility_()).to.equal(0);
-
-    // Make root visible.
-    inob.callback([{
-      target: embed.host,
-      intersectionRatio: 0.5,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
-    expect(root.getRootVisibility()).to.equal(0.5);
-    expect(rootModel.getVisibility_()).to.equal(0.5);
-    expect(elementModel.getVisibility_()).to.equal(0);
-
-    // Make element visible.
-    inob.callback([{
-      target: otherTarget,
-      intersectionRatio: 0.45,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
-    expect(root.getRootVisibility()).to.equal(0.5);
-    expect(rootModel.getVisibility_()).to.equal(0.5);
-    expect(elementModel.getVisibility_()).to.equal(0.45);
-
-    // Hide parent.
-    viewer.setVisibilityState_(VisibilityState.HIDDEN);
-    expect(parentRoot.getRootVisibility()).to.equal(0);
-    expect(root.getRootVisibility()).to.equal(0);
-    expect(rootModel.getVisibility_()).to.equal(0);
-    expect(elementModel.getVisibility_()).to.equal(0);
+      root.dispose();
+      expect(parentRoot.trackedElements_[id]).to.be.undefined;
+    });
 
-    // Show parent.
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
-    expect(parentRoot.getRootVisibility()).to.equal(1);
-    expect(root.getRootVisibility()).to.equal(0.5);
-    expect(rootModel.getVisibility_()).to.equal(0.5);
-    expect(elementModel.getVisibility_()).to.equal(0.45);
-
-    // Hide root.
-    inob.callback([{
-      target: embed.host,
-      intersectionRatio: 0,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
-    expect(root.getRootVisibility()).to.equal(0);
-    expect(rootModel.getVisibility_()).to.equal(0);
-    expect(elementModel.getVisibility_()).to.equal(0);
-
-    // Update element.
-    inob.callback([{
-      target: otherTarget,
-      intersectionRatio: 0.55,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
-    expect(root.getRootVisibility()).to.equal(0);
-    expect(rootModel.getVisibility_()).to.equal(0);
-    expect(elementModel.getVisibility_()).to.equal(0);
-
-    // Show root.
-    inob.callback([{
-      target: embed.host,
-      intersectionRatio: 0.7,
-      intersectionRect: layoutRectLtwh(0, 0, 1, 1),
-    }]);
-    expect(root.getRootVisibility()).to.equal(0.7);
-    expect(rootModel.getVisibility_()).to.equal(0.7);
-    expect(elementModel.getVisibility_()).to.equal(0.55);
-  });
-});
+    it('should delegate observation to parent', () => {
+      const inOb = {
+        observe: sandbox.spy(),
+        unobserve: sandbox.spy(),
+      };
+      parentRoot.intersectionObserver_ = inOb;
+
+      const listener = sandbox.spy();
+      const target = win.document.createElement('div');
+
+      // Observe.
+      const unlisten = root.observe(target, listener);
+      expect(inOb.observe).to.be.calledOnce;
+      expect(inOb.observe).to.be.calledWith(target);
+      const id = target.__AMP_VIS_ID;
+      expect(parentRoot.trackedElements_[id]).to.be.ok;
+
+      // Unobserve.
+      unlisten();
+      expect(inOb.unobserve).to.be.calledOnce;
+      expect(inOb.unobserve).to.be.calledWith(target);
+      expect(parentRoot.trackedElements_[id]).to.be.undefined;
+    });
 
+    it('should depend on parent for visibility', () => {
+      const callbackSpy = sandbox.spy();
+      const otherTarget = win.document.createElement('div');
+      root.listenRoot({}, null, null, callbackSpy);
+      expect(root.models_).to.have.length(1);
+      const rootModel = root.models_[0];
+
+      root.listenElement(otherTarget, {}, null, null, callbackSpy);
+      expect(root.models_).to.have.length(2);
+      const elementModel = root.models_[1];
+
+      // Set up.
+      expect(inob.elements).to.contain(embed.host);
+      expect(inob.elements).to.contain(otherTarget);
+
+      // Start state.
+      expect(parentRoot.getRootVisibility()).to.equal(1);
+      expect(root.getRootVisibility()).to.equal(0);
+      expect(rootModel.getVisibility_()).to.equal(0);
+      expect(elementModel.getVisibility_()).to.equal(0);
+
+      // Make root visible.
+      inob.callback([
+        {
+          target: embed.host,
+          intersectionRatio: 0.5,
+          intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+        },
+      ]);
+      expect(root.getRootVisibility()).to.equal(0.5);
+      expect(rootModel.getVisibility_()).to.equal(0.5);
+      expect(elementModel.getVisibility_()).to.equal(0);
+
+      // Make element visible.
+      inob.callback([
+        {
+          target: otherTarget,
+          intersectionRatio: 0.45,
+          intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+        },
+      ]);
+      expect(root.getRootVisibility()).to.equal(0.5);
+      expect(rootModel.getVisibility_()).to.equal(0.5);
+      expect(elementModel.getVisibility_()).to.equal(0.45);
+
+      // Hide parent.
+      viewer.setVisibilityState_(VisibilityState.HIDDEN);
+      expect(parentRoot.getRootVisibility()).to.equal(0);
+      expect(root.getRootVisibility()).to.equal(0);
+      expect(rootModel.getVisibility_()).to.equal(0);
+      expect(elementModel.getVisibility_()).to.equal(0);
+
+      // Show parent.
+      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      expect(parentRoot.getRootVisibility()).to.equal(1);
+      expect(root.getRootVisibility()).to.equal(0.5);
+      expect(rootModel.getVisibility_()).to.equal(0.5);
+      expect(elementModel.getVisibility_()).to.equal(0.45);
+
+      // Hide root.
+      inob.callback([
+        {
+          target: embed.host,
+          intersectionRatio: 0,
+          intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+        },
+      ]);
+      expect(root.getRootVisibility()).to.equal(0);
+      expect(rootModel.getVisibility_()).to.equal(0);
+      expect(elementModel.getVisibility_()).to.equal(0);
+
+      // Update element.
+      inob.callback([
+        {
+          target: otherTarget,
+          intersectionRatio: 0.55,
+          intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+        },
+      ]);
+      expect(root.getRootVisibility()).to.equal(0);
+      expect(rootModel.getVisibility_()).to.equal(0);
+      expect(elementModel.getVisibility_()).to.equal(0);
+
+      // Show root.
+      inob.callback([
+        {
+          target: embed.host,
+          intersectionRatio: 0.7,
+          intersectionRect: layoutRectLtwh(0, 0, 1, 1),
+        },
+      ]);
+      expect(root.getRootVisibility()).to.equal(0.7);
+      expect(rootModel.getVisibility_()).to.equal(0.7);
+      expect(elementModel.getVisibility_()).to.equal(0.55);
+    });
+  }
+);
 
 describes.realWin('VisibilityManager integrated', {amp: true}, env => {
   let win, doc;
@@ -1013,15 +1080,18 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
 
       const resource = resources.getResourceForElement(ampElement);
       scrollTop = 10;
-      sandbox.stub(resource, 'getLayoutBox').callsFake(
-          () => layoutRectLtwh(0, scrollTop, 100, 100));
+      sandbox
+        .stub(resource, 'getLayoutBox')
+        .callsFake(() => layoutRectLtwh(0, scrollTop, 100, 100));
     });
   });
 
   function fireIntersect(intersectPercent) {
     scrollTop = 100 - intersectPercent;
     const entry = makeIntersectionEntry(
-        [0, scrollTop, 100, 100], [0, 0, 100, 100]);
+      [0, scrollTop, 100, 100],
+      [0, 0, 100, 100]
+    );
     inObCallback([entry]);
   }
 
@@ -1029,8 +1099,9 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     boundingClientRect = layoutRectLtwh.apply(null, boundingClientRect);
     rootBounds = layoutRectLtwh.apply(null, rootBounds);
     const intersect = rectIntersection(boundingClientRect, rootBounds);
-    const ratio = (intersect.width * intersect.height) /
-        (boundingClientRect.width * boundingClientRect.height);
+    const ratio =
+      (intersect.width * intersect.height) /
+      (boundingClientRect.width * boundingClientRect.height);
     return {
       intersectionRect: intersect,
       boundingClientRect,
@@ -1048,48 +1119,63 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(ampElement, {}, readyPromise, () => {
-      return readyReportPromise;
-    }, eventResolver);
+    visibility.listenElement(
+      ampElement,
+      {},
+      readyPromise,
+      () => {
+        return readyReportPromise;
+      },
+      eventResolver
+    );
 
-    return Promise.resolve().then(() => {
-      clock.tick(100);
-      fireIntersect(25); // visible
-      readyResolver();
-    }).then(() => {
-      clock.tick(5);
-      readyReportResolver();
-      return eventPromise;
-    }).then(state => {
-      expect(state).to.contains({
-        backgrounded: 0,
-        backgroundedAtStart: 0,
-        elementHeight: 100,
-        elementWidth: 100,
-        elementX: 0,
-        elementY: 75,
-        firstSeenTime: 100,
-        lastSeenTime: 105,
-        lastVisibleTime: 105,
-        loadTimeVisibility: 25,
-        maxVisiblePercentage: 25,
-        minVisiblePercentage: 25,
-        opacity: 0.5,
-        totalVisibleTime: 5,
-        maxContinuousVisibleTime: 5,
-        intersectionRatio: 0.25,
-        intersectionRect: '{"left":0,"top":75,"width":100,"height":25,' +
-          '"bottom":100,"right":100,"x":0,"y":75}',
+    return Promise.resolve()
+      .then(() => {
+        clock.tick(100);
+        fireIntersect(25); // visible
+        readyResolver();
+      })
+      .then(() => {
+        clock.tick(5);
+        readyReportResolver();
+        return eventPromise;
+      })
+      .then(state => {
+        expect(state).to.contains({
+          backgrounded: 0,
+          backgroundedAtStart: 0,
+          elementHeight: 100,
+          elementWidth: 100,
+          elementX: 0,
+          elementY: 75,
+          firstSeenTime: 100,
+          lastSeenTime: 105,
+          lastVisibleTime: 105,
+          loadTimeVisibility: 25,
+          maxVisiblePercentage: 25,
+          minVisiblePercentage: 25,
+          opacity: 0.5,
+          totalVisibleTime: 5,
+          maxContinuousVisibleTime: 5,
+          intersectionRatio: 0.25,
+          intersectionRect:
+            '{"left":0,"top":75,"width":100,"height":25,' +
+            '"bottom":100,"right":100,"x":0,"y":75}',
+        });
       });
-    });
   });
 
-  it('should wait for readyPromise with readyReportPromise', async() => {
+  it('should wait for readyPromise with readyReportPromise', async () => {
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(ampElement, {}, readyPromise, () =>
-      readyReportPromise, eventResolver);
+    visibility.listenElement(
+      ampElement,
+      {},
+      readyPromise,
+      () => readyReportPromise,
+      eventResolver
+    );
     const model = visibility.models_[0];
 
     await Promise.resolve();
@@ -1131,12 +1217,17 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     });
   });
 
-  it('should wait for readyReportPromise with reportWhen', async() => {
+  it('should wait for readyReportPromise with reportWhen', async () => {
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(ampElement, {reportWhen: 'documentExit'},
-        readyPromise, () => readyReportPromise, eventResolver);
+    visibility.listenElement(
+      ampElement,
+      {reportWhen: 'documentExit'},
+      readyPromise,
+      () => readyReportPromise,
+      eventResolver
+    );
     const model = visibility.models_[0];
 
     await Promise.resolve();
@@ -1175,83 +1266,143 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     });
   });
 
-  it('should wait for readyReportPromise with reportWhen and never meets  ' +
-      'visiblePercentageMin', async() => {
-    viewer.setVisibilityState_(VisibilityState.VISIBLE);
-    visibility = new VisibilityManagerForDoc(ampdoc);
+  it(
+    'should wait for readyReportPromise with reportWhen and never meets  ' +
+      'visiblePercentageMin',
+    async () => {
+      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(ampElement, {
-      reportWhen: 'documentExit',
-      visiblePercentageMin: 50,
-    },
-    readyPromise, () => readyReportPromise, eventResolver);
-    const model = visibility.models_[0];
+      visibility.listenElement(
+        ampElement,
+        {
+          reportWhen: 'documentExit',
+          visiblePercentageMin: 50,
+        },
+        readyPromise,
+        () => readyReportPromise,
+        eventResolver
+      );
+      const model = visibility.models_[0];
 
-    await Promise.resolve();
-    expect(isModelResolved(model)).to.be.false;
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.false;
 
-    clock.tick(20);
-    fireIntersect(25); // Doesn't meet visiblePercentageMin.
-    clock.tick(30);
+      clock.tick(20);
+      fireIntersect(25); // Doesn't meet visiblePercentageMin.
+      clock.tick(30);
 
-    readyResolver();
-    await Promise.resolve();
-    expect(isModelResolved(model)).to.be.false;
+      readyResolver();
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.false;
 
-    clock.tick(40);
+      clock.tick(40);
 
-    readyReportResolver();
-    await Promise.resolve();
-    expect(isModelResolved(model)).to.be.true;
+      readyReportResolver();
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.true;
 
-    const state = await eventPromise;
-    expect(state).to.contains({
-      backgrounded: 0,
-      backgroundedAtStart: 0,
-      elementHeight: 100,
-      elementWidth: 100,
-      elementX: 0,
-      elementY: 75,
-      firstSeenTime: 50,
-      lastSeenTime: 90,
-      lastVisibleTime: 0, // Didn't meet visibility.
-      loadTimeVisibility: 25,
-      // FIXME: max/minVisiblePercentage should equal loadTimeVisibility.
-      // See https://github.com/ampproject/amphtml/issues/19567
-      maxVisiblePercentage: 0,
-      minVisiblePercentage: 0,
-      totalVisibleTime: 0,
-      maxContinuousVisibleTime: 0,
-    });
-  });
+      const state = await eventPromise;
+      expect(state).to.contains({
+        backgrounded: 0,
+        backgroundedAtStart: 0,
+        elementHeight: 100,
+        elementWidth: 100,
+        elementX: 0,
+        elementY: 75,
+        firstSeenTime: 50,
+        lastSeenTime: 90,
+        lastVisibleTime: 0, // Didn't meet visibility.
+        loadTimeVisibility: 25,
+        // FIXME: max/minVisiblePercentage should equal loadTimeVisibility.
+        // See https://github.com/ampproject/amphtml/issues/19567
+        maxVisiblePercentage: 0,
+        minVisiblePercentage: 0,
+        totalVisibleTime: 0,
+        maxContinuousVisibleTime: 0,
+      });
+    }
+  );
+
+  it(
+    'should accumulate timings and wait for readyReportPromise with ' +
+      'reportWhen and high minTotalVisibleTime',
+    async () => {
+      viewer.setVisibilityState_(VisibilityState.VISIBLE);
+      visibility = new VisibilityManagerForDoc(ampdoc);
+
+      visibility.listenElement(
+        ampElement,
+        {
+          reportWhen: 'documentExit',
+          minTotalVisibleTime: 100000, // Never met
+        },
+        readyPromise,
+        () => readyReportPromise,
+        eventResolver
+      );
+      const model = visibility.models_[0];
+
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.false;
+
+      readyResolver();
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.false;
+
+      clock.tick(20);
+      fireIntersect(25); // visible
+      clock.tick(20);
+      fireIntersect(0); // hidden
+      clock.tick(20);
+      fireIntersect(35); // visible again
+      clock.tick(30);
+      fireIntersect(0); // hidden
+      clock.tick(20);
+
+      readyReportResolver();
+      await Promise.resolve();
+      expect(isModelResolved(model)).to.be.true;
+
+      const state = await eventPromise;
+      expect(state).to.contains({
+        backgrounded: 0,
+        backgroundedAtStart: 0,
+        elementHeight: 100,
+        elementWidth: 100,
+        elementX: 0,
+        elementY: 100,
+        firstSeenTime: 20,
+        lastSeenTime: 60,
+        lastVisibleTime: 90,
+        loadTimeVisibility: 25,
+        maxVisiblePercentage: 35,
+        minVisiblePercentage: 25,
+        totalVisibleTime: 50,
+        maxContinuousVisibleTime: 30,
+      });
+    }
+  );
 
-  it('should accumulate timings and wait for readyReportPromise with ' +
-        'reportWhen and high minTotalVisibleTime', async() => {
+  it('should wait for readyReportPromise when missing readyPromise', async () => {
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(ampElement, {
-      reportWhen: 'documentExit',
-      minTotalVisibleTime: 100000, // Never met
-    }, readyPromise, () => readyReportPromise, eventResolver);
+    visibility.listenElement(
+      ampElement,
+      {},
+      null,
+      () => readyReportPromise,
+      eventResolver
+    );
     const model = visibility.models_[0];
 
-    await Promise.resolve();
-    expect(isModelResolved(model)).to.be.false;
-
-    readyResolver();
-    await Promise.resolve();
-    expect(isModelResolved(model)).to.be.false;
-
     clock.tick(20);
     fireIntersect(25); // visible
-    clock.tick(20);
-    fireIntersect(0); // hidden
-    clock.tick(20);
-    fireIntersect(35); // visible again
     clock.tick(30);
-    fireIntersect(0); // hidden
-    clock.tick(20);
+
+    await Promise.resolve();
+    expect(isModelResolved(model)).to.be.false;
 
     readyReportResolver();
     await Promise.resolve();
@@ -1264,75 +1415,44 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
       elementHeight: 100,
       elementWidth: 100,
       elementX: 0,
-      elementY: 100,
+      elementY: 75,
       firstSeenTime: 20,
-      lastSeenTime: 60,
-      lastVisibleTime: 90,
+      lastSeenTime: 50,
+      lastVisibleTime: 50,
       loadTimeVisibility: 25,
-      maxVisiblePercentage: 35,
+      maxVisiblePercentage: 25,
       minVisiblePercentage: 25,
-      totalVisibleTime: 50,
+      totalVisibleTime: 30,
       maxContinuousVisibleTime: 30,
     });
   });
 
-  it('should wait for readyReportPromise when missing readyPromise',
-      async() => {
-        viewer.setVisibilityState_(VisibilityState.VISIBLE);
-        visibility = new VisibilityManagerForDoc(ampdoc);
-
-        visibility.listenElement(ampElement, {}, null, () =>
-          readyReportPromise, eventResolver);
-        const model = visibility.models_[0];
-
-        clock.tick(20);
-        fireIntersect(25); // visible
-        clock.tick(30);
-
-        await Promise.resolve();
-        expect(isModelResolved(model)).to.be.false;
-
-        readyReportResolver();
-        await Promise.resolve();
-        expect(isModelResolved(model)).to.be.true;
-
-        const state = await eventPromise;
-        expect(state).to.contains({
-          backgrounded: 0,
-          backgroundedAtStart: 0,
-          elementHeight: 100,
-          elementWidth: 100,
-          elementX: 0,
-          elementY: 75,
-          firstSeenTime: 20,
-          lastSeenTime: 50,
-          lastVisibleTime: 50,
-          loadTimeVisibility: 25,
-          maxVisiblePercentage: 25,
-          minVisiblePercentage: 25,
-          totalVisibleTime: 30,
-          maxContinuousVisibleTime: 30,
-        });
-      });
-
   it('should execute "visible" trigger with percent range', () => {
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     const spy = sandbox.spy();
-    visibility.listenElement(ampElement, {
-      'visiblePercentageThresholds': [[0, 30], [50, 100]],
-    }, Promise.resolve(), null, spy);
+    visibility.listenElement(
+      ampElement,
+      {
+        'visiblePercentageThresholds': [[0, 30], [50, 100]],
+      },
+      Promise.resolve(),
+      null,
+      spy
+    );
 
-    return Promise.resolve().then(() => {
-      fireIntersect(25); // visible
-    }).then(() => {
-      expect(spy).to.be.calledOnce;
-      fireIntersect(55);
-      return Promise.resolve().then(() => {
-        expect(spy).to.be.calledTwice;
+    return Promise.resolve()
+      .then(() => {
+        fireIntersect(25); // visible
+      })
+      .then(() => {
+        expect(spy).to.be.calledOnce;
+        fireIntersect(55);
+        return Promise.resolve().then(() => {
+          expect(spy).to.be.calledTwice;
+        });
       });
-    });
   });
 
   it('should trigger "visible" with no duration condition', () => {
@@ -1340,74 +1460,80 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
-        ampElement,
-        {visiblePercentageMin: 20},
-        readyPromise,
-        null,
-        eventResolver);
+      ampElement,
+      {visiblePercentageMin: 20},
+      readyPromise,
+      null,
+      eventResolver
+    );
 
     // add multiple triggers on the same element
     visibility.listenElement(
-        ampElement,
-        {visiblePercentageMin: 30},
-        readyPromise,
-        null,
-        eventResolver2);
+      ampElement,
+      {visiblePercentageMin: 30},
+      readyPromise,
+      null,
+      eventResolver2
+    );
 
     // "observe" should not have been called since resource not loaded yet.
     expect(observeSpy).to.be.called;
     readyResolver();
-    return Promise.resolve().then(() => {
-      expect(observeSpy).to.be.calledWith(ampElement);
+    return Promise.resolve()
+      .then(() => {
+        expect(observeSpy).to.be.calledWith(ampElement);
 
-      clock.tick(135);
-      fireIntersect(5); // below visiblePercentageMin, no trigger
-
-      clock.tick(100);
-      fireIntersect(25); // above spec 1 min visible, trigger callback 1
-      return eventPromise.then(state => {
-        expect(state).to.contains({
-          backgrounded: 0,
-          backgroundedAtStart: 0,
-          elementHeight: 100,
-          elementWidth: 100,
-          elementX: 0,
-          elementY: 75,
-          firstSeenTime: 135,
-          lastSeenTime: 235,
-          lastVisibleTime: 235,
-          loadTimeVisibility: 5,
-          maxVisiblePercentage: 25,
-          minVisiblePercentage: 25,
-          totalVisibleTime: 0, // duration metrics are always 0
-          maxContinuousVisibleTime: 0, // as it triggers immediately
-        });
-        expect(unobserveSpy).to.not.be.called;
+        clock.tick(135);
+        fireIntersect(5); // below visiblePercentageMin, no trigger
 
         clock.tick(100);
-        fireIntersect(35); // above spec 2 min visible, trigger callback 2
-        return eventPromise2;
-      }).then(state => {
-        expect(state).to.contains({
-          backgrounded: 0,
-          backgroundedAtStart: 0,
-          elementHeight: 100,
-          elementWidth: 100,
-          elementX: 0,
-          elementY: 65,
-          firstSeenTime: 135,
-          lastSeenTime: 335,
-          lastVisibleTime: 335,
-          loadTimeVisibility: 5,
-          maxVisiblePercentage: 35,
-          minVisiblePercentage: 35,
-          totalVisibleTime: 0, // duration metrics is always 0
-          maxContinuousVisibleTime: 0, // as it triggers immediately
-        });
+        fireIntersect(25); // above spec 1 min visible, trigger callback 1
+        return eventPromise
+          .then(state => {
+            expect(state).to.contains({
+              backgrounded: 0,
+              backgroundedAtStart: 0,
+              elementHeight: 100,
+              elementWidth: 100,
+              elementX: 0,
+              elementY: 75,
+              firstSeenTime: 135,
+              lastSeenTime: 235,
+              lastVisibleTime: 235,
+              loadTimeVisibility: 5,
+              maxVisiblePercentage: 25,
+              minVisiblePercentage: 25,
+              totalVisibleTime: 0, // duration metrics are always 0
+              maxContinuousVisibleTime: 0, // as it triggers immediately
+            });
+            expect(unobserveSpy).to.not.be.called;
+
+            clock.tick(100);
+            fireIntersect(35); // above spec 2 min visible, trigger callback 2
+            return eventPromise2;
+          })
+          .then(state => {
+            expect(state).to.contains({
+              backgrounded: 0,
+              backgroundedAtStart: 0,
+              elementHeight: 100,
+              elementWidth: 100,
+              elementX: 0,
+              elementY: 65,
+              firstSeenTime: 135,
+              lastSeenTime: 335,
+              lastVisibleTime: 335,
+              loadTimeVisibility: 5,
+              maxVisiblePercentage: 35,
+              minVisiblePercentage: 35,
+              totalVisibleTime: 0, // duration metrics is always 0
+              maxContinuousVisibleTime: 0, // as it triggers immediately
+            });
+          });
+      })
+      .then(() => {
+        expect(unobserveSpy).to.be.called; // unobserve when all callback fired
       });
-    }).then(() => {
-      expect(unobserveSpy).to.be.called; // unobserve when all callback fired
-    });
   });
 
   it('should trigger "visible" with duration condition', () => {
@@ -1415,11 +1541,12 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     visibility = new VisibilityManagerForDoc(ampdoc);
 
     visibility.listenElement(
-        ampElement,
-        {continuousTimeMin: 1000},
-        readyPromise,
-        null,
-        eventResolver);
+      ampElement,
+      {continuousTimeMin: 1000},
+      readyPromise,
+      null,
+      eventResolver
+    );
     const model = visibility.models_[0];
 
     readyResolver();
@@ -1480,12 +1607,7 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
     viewer.setVisibilityState_(VisibilityState.HIDDEN);
     visibility = new VisibilityManagerForDoc(ampdoc);
 
-    visibility.listenElement(
-        ampElement,
-        {},
-        readyPromise,
-        null,
-        eventResolver);
+    visibility.listenElement(ampElement, {}, readyPromise, null, eventResolver);
 
     viewer.setVisibilityState_(VisibilityState.VISIBLE);
     readyResolver();
@@ -1504,7 +1626,6 @@ describes.realWin('VisibilityManager integrated', {amp: true}, env => {
   });
 });
 
-
 describes.fakeWin('scroll depth', {amp: true}, env => {
   let ampdoc;
   let root;
diff --git a/extensions/amp-analytics/0.1/test/test-visibility-model.js b/extensions/amp-analytics/0.1/test/test-visibility-model.js
index 1f32a69930c3..c45de9ba6ef8 100644
--- a/extensions/amp-analytics/0.1/test/test-visibility-model.js
+++ b/extensions/amp-analytics/0.1/test/test-visibility-model.js
@@ -19,12 +19,11 @@ import {VisibilityModel} from '../visibility-model';
 const NO_SPEC = {};
 const NO_CALC = () => 0;
 
-
 describes.sandboxed('VisibilityModel', {}, () => {
   let startTime;
   let clock;
 
-  const tick = async(timeout = 0) => {
+  const tick = async (timeout = 0) => {
     // Wait for the micro-task queue to clear since we need to wait for
     // internal promises to finish before running assertions;
     await Promise.resolve();
@@ -37,9 +36,7 @@ describes.sandboxed('VisibilityModel', {}, () => {
     clock.tick(startTime + 1);
   });
 
-
   describe('config', () => {
-
     function config(spec) {
       return new VisibilityModel(spec, NO_CALC).spec_;
     }
@@ -53,110 +50,106 @@ describes.sandboxed('VisibilityModel', {}, () => {
 
     it('should parse visiblePercentageMin', () => {
       expect(config({}).visiblePercentageMin).to.equal(0);
-      expect(config({visiblePercentageMin: ''}).visiblePercentageMin)
-          .to.equal(0);
-      expect(config({visiblePercentageMin: 0}).visiblePercentageMin)
-          .to.equal(0);
-      expect(config({visiblePercentageMin: '0'}).visiblePercentageMin)
-          .to.equal(0);
-      expect(config({visiblePercentageMin: 50}).visiblePercentageMin)
-          .to.equal(0.5);
-      expect(config({visiblePercentageMin: '50'}).visiblePercentageMin)
-          .to.equal(0.5);
-      expect(config({visiblePercentageMin: 100}).visiblePercentageMin)
-          .to.equal(1);
-      expect(config({visiblePercentageMin: '100'}).visiblePercentageMin)
-          .to.equal(1);
+      expect(config({visiblePercentageMin: ''}).visiblePercentageMin).to.equal(
+        0
+      );
+      expect(config({visiblePercentageMin: 0}).visiblePercentageMin).to.equal(
+        0
+      );
+      expect(config({visiblePercentageMin: '0'}).visiblePercentageMin).to.equal(
+        0
+      );
+      expect(config({visiblePercentageMin: 50}).visiblePercentageMin).to.equal(
+        0.5
+      );
+      expect(
+        config({visiblePercentageMin: '50'}).visiblePercentageMin
+      ).to.equal(0.5);
+      expect(config({visiblePercentageMin: 100}).visiblePercentageMin).to.equal(
+        1
+      );
+      expect(
+        config({visiblePercentageMin: '100'}).visiblePercentageMin
+      ).to.equal(1);
     });
 
     it('should parse visiblePercentageMax', () => {
       expect(config({}).visiblePercentageMax).to.equal(1);
-      expect(config({visiblePercentageMax: ''}).visiblePercentageMax)
-          .to.equal(1);
-      expect(config({visiblePercentageMax: 0}).visiblePercentageMax)
-          .to.equal(0);
-      expect(config({visiblePercentageMax: '0'}).visiblePercentageMax)
-          .to.equal(0);
-      expect(config({visiblePercentageMax: 50}).visiblePercentageMax)
-          .to.equal(0.5);
-      expect(config({visiblePercentageMax: '50'}).visiblePercentageMax)
-          .to.equal(0.5);
-      expect(config({visiblePercentageMax: 100}).visiblePercentageMax)
-          .to.equal(1);
-      expect(config({visiblePercentageMax: '100'}).visiblePercentageMax)
-          .to.equal(1);
+      expect(config({visiblePercentageMax: ''}).visiblePercentageMax).to.equal(
+        1
+      );
+      expect(config({visiblePercentageMax: 0}).visiblePercentageMax).to.equal(
+        0
+      );
+      expect(config({visiblePercentageMax: '0'}).visiblePercentageMax).to.equal(
+        0
+      );
+      expect(config({visiblePercentageMax: 50}).visiblePercentageMax).to.equal(
+        0.5
+      );
+      expect(
+        config({visiblePercentageMax: '50'}).visiblePercentageMax
+      ).to.equal(0.5);
+      expect(config({visiblePercentageMax: 100}).visiblePercentageMax).to.equal(
+        1
+      );
+      expect(
+        config({visiblePercentageMax: '100'}).visiblePercentageMax
+      ).to.equal(1);
     });
 
     it('should parse totalTimeMin', () => {
       expect(config({}).totalTimeMin).to.equal(0);
-      expect(config({totalTimeMin: ''}).totalTimeMin)
-          .to.equal(0);
-      expect(config({totalTimeMin: 0}).totalTimeMin)
-          .to.equal(0);
-      expect(config({totalTimeMin: '0'}).totalTimeMin)
-          .to.equal(0);
-      expect(config({totalTimeMin: 50}).totalTimeMin)
-          .to.equal(50);
-      expect(config({totalTimeMin: '50'}).totalTimeMin)
-          .to.equal(50);
-      expect(config({totalTimeMin: 100}).totalTimeMin)
-          .to.equal(100);
-      expect(config({totalTimeMin: '100'}).totalTimeMin)
-          .to.equal(100);
+      expect(config({totalTimeMin: ''}).totalTimeMin).to.equal(0);
+      expect(config({totalTimeMin: 0}).totalTimeMin).to.equal(0);
+      expect(config({totalTimeMin: '0'}).totalTimeMin).to.equal(0);
+      expect(config({totalTimeMin: 50}).totalTimeMin).to.equal(50);
+      expect(config({totalTimeMin: '50'}).totalTimeMin).to.equal(50);
+      expect(config({totalTimeMin: 100}).totalTimeMin).to.equal(100);
+      expect(config({totalTimeMin: '100'}).totalTimeMin).to.equal(100);
     });
 
     it('should parse totalTimeMax', () => {
       expect(config({}).totalTimeMax).to.equal(Infinity);
-      expect(config({totalTimeMax: ''}).totalTimeMax)
-          .to.equal(Infinity);
-      expect(config({totalTimeMax: 0}).totalTimeMax)
-          .to.equal(Infinity);
-      expect(config({totalTimeMax: '0'}).totalTimeMax)
-          .to.equal(Infinity);
-      expect(config({totalTimeMax: 50}).totalTimeMax)
-          .to.equal(50);
-      expect(config({totalTimeMax: '50'}).totalTimeMax)
-          .to.equal(50);
-      expect(config({totalTimeMax: 100}).totalTimeMax)
-          .to.equal(100);
-      expect(config({totalTimeMax: '100'}).totalTimeMax)
-          .to.equal(100);
+      expect(config({totalTimeMax: ''}).totalTimeMax).to.equal(Infinity);
+      expect(config({totalTimeMax: 0}).totalTimeMax).to.equal(Infinity);
+      expect(config({totalTimeMax: '0'}).totalTimeMax).to.equal(Infinity);
+      expect(config({totalTimeMax: 50}).totalTimeMax).to.equal(50);
+      expect(config({totalTimeMax: '50'}).totalTimeMax).to.equal(50);
+      expect(config({totalTimeMax: 100}).totalTimeMax).to.equal(100);
+      expect(config({totalTimeMax: '100'}).totalTimeMax).to.equal(100);
     });
 
     it('should parse continuousTimeMin', () => {
       expect(config({}).continuousTimeMin).to.equal(0);
-      expect(config({continuousTimeMin: ''}).continuousTimeMin)
-          .to.equal(0);
-      expect(config({continuousTimeMin: 0}).continuousTimeMin)
-          .to.equal(0);
-      expect(config({continuousTimeMin: '0'}).continuousTimeMin)
-          .to.equal(0);
-      expect(config({continuousTimeMin: 50}).continuousTimeMin)
-          .to.equal(50);
-      expect(config({continuousTimeMin: '50'}).continuousTimeMin)
-          .to.equal(50);
-      expect(config({continuousTimeMin: 100}).continuousTimeMin)
-          .to.equal(100);
-      expect(config({continuousTimeMin: '100'}).continuousTimeMin)
-          .to.equal(100);
+      expect(config({continuousTimeMin: ''}).continuousTimeMin).to.equal(0);
+      expect(config({continuousTimeMin: 0}).continuousTimeMin).to.equal(0);
+      expect(config({continuousTimeMin: '0'}).continuousTimeMin).to.equal(0);
+      expect(config({continuousTimeMin: 50}).continuousTimeMin).to.equal(50);
+      expect(config({continuousTimeMin: '50'}).continuousTimeMin).to.equal(50);
+      expect(config({continuousTimeMin: 100}).continuousTimeMin).to.equal(100);
+      expect(config({continuousTimeMin: '100'}).continuousTimeMin).to.equal(
+        100
+      );
     });
 
     it('should parse continuousTimeMax', () => {
       expect(config({}).continuousTimeMax).to.equal(Infinity);
-      expect(config({continuousTimeMax: ''}).continuousTimeMax)
-          .to.equal(Infinity);
-      expect(config({continuousTimeMax: 0}).continuousTimeMax)
-          .to.equal(Infinity);
-      expect(config({continuousTimeMax: '0'}).continuousTimeMax)
-          .to.equal(Infinity);
-      expect(config({continuousTimeMax: 50}).continuousTimeMax)
-          .to.equal(50);
-      expect(config({continuousTimeMax: '50'}).continuousTimeMax)
-          .to.equal(50);
-      expect(config({continuousTimeMax: 100}).continuousTimeMax)
-          .to.equal(100);
-      expect(config({continuousTimeMax: '100'}).continuousTimeMax)
-          .to.equal(100);
+      expect(config({continuousTimeMax: ''}).continuousTimeMax).to.equal(
+        Infinity
+      );
+      expect(config({continuousTimeMax: 0}).continuousTimeMax).to.equal(
+        Infinity
+      );
+      expect(config({continuousTimeMax: '0'}).continuousTimeMax).to.equal(
+        Infinity
+      );
+      expect(config({continuousTimeMax: 50}).continuousTimeMax).to.equal(50);
+      expect(config({continuousTimeMax: '50'}).continuousTimeMax).to.equal(50);
+      expect(config({continuousTimeMax: 100}).continuousTimeMax).to.equal(100);
+      expect(config({continuousTimeMax: '100'}).continuousTimeMax).to.equal(
+        100
+      );
     });
 
     it('should parse repeat', () => {
@@ -350,12 +343,15 @@ describes.sandboxed('VisibilityModel', {}, () => {
     let visibilityValueForTesting = null;
 
     beforeEach(() => {
-      vh = new VisibilityModel({
-        minVisiblePercentage: 25,
-        totalTimeMin: 10,
-        continuousTimeMin: 10,
-        continuousTimeMax: 1000,
-      }, NO_CALC);
+      vh = new VisibilityModel(
+        {
+          minVisiblePercentage: 25,
+          totalTimeMin: 10,
+          continuousTimeMin: 10,
+          continuousTimeMax: 1000,
+        },
+        NO_CALC
+      );
       updateStub = sandbox.stub(vh, 'update').callsFake(() => {
         if (visibilityValueForTesting) {
           vh.update_(visibilityValueForTesting);
@@ -531,15 +527,19 @@ describes.sandboxed('VisibilityModel', {}, () => {
         const shouldTriggerEventTestSpecs = [
           {reportWhen: 'documentExit'},
           {reportWhen: 'documentHidden'},
-          {reportWhen: 'documentExit', totalTimeMin: 100000,
-            visiblePercentageMin: 50},
+          {
+            reportWhen: 'documentExit',
+            totalTimeMin: 100000,
+            visiblePercentageMin: 50,
+          },
         ];
 
         for (const i in shouldTriggerEventTestSpecs) {
-          it('should trigger event with reportWhen,' +
-              `test case #${i}`, async() => {
+          it(`should trigger event with reportWhen, test case #${i}`, async () => {
             const vh = new VisibilityModel(
-                shouldTriggerEventTestSpecs[i], () => 0);
+              shouldTriggerEventTestSpecs[i],
+              () => 0
+            );
 
             vh.onTriggerEvent(eventSpy);
             // TODO(warrengm): Inverting the two following lines will break this
@@ -565,7 +565,7 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('conditions met, wait to reset', () => {
-      const resolveSpy = vh.eventResolver_ = sandbox.spy();
+      const resolveSpy = (vh.eventResolver_ = sandbox.spy());
       vh.update_(1);
       vh.continuousTime_ = 10;
       vh.totalVisibleTime_ = 10;
@@ -575,8 +575,8 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('conditions not met, reset', () => {
-      const updateCounterSpy = vh.updateCounters_ = sandbox.spy();
-      const resetSpy = vh.reset_ = sandbox.spy();
+      const updateCounterSpy = (vh.updateCounters_ = sandbox.spy());
+      const resetSpy = (vh.reset_ = sandbox.spy());
       vh.waitToReset_ = true;
       vh.update_(1);
       expect(resetSpy).to.not.be.called;
@@ -586,9 +586,7 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
   });
 
-
   describe('tracking math', () => {
-
     it('should register "seen" values', () => {
       const vh = new VisibilityModel(NO_SPEC, NO_CALC);
 
@@ -658,10 +656,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should match custom visibility position', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 10,
-        visiblePercentageMax: 90,
-      }, NO_CALC);
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 10,
+          visiblePercentageMax: 90,
+        },
+        NO_CALC
+      );
       vh.updateCounters_(0);
       expect(vh.matchesVisibility_).to.be.false;
 
@@ -808,10 +809,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should yield based on position only', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 10,
-        visiblePercentageMax: 90,
-      }, NO_CALC);
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 10,
+          visiblePercentageMax: 90,
+        },
+        NO_CALC
+      );
       clock.tick(100);
       expect(vh.updateCounters_(0)).to.be.false;
       expect(vh.updateCounters_(0.1)).to.be.false;
@@ -821,10 +825,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should yield based on total time only', () => {
-      const vh = new VisibilityModel({
-        totalTimeMin: 10,
-        totalTimeMax: 90,
-      }, NO_CALC);
+      const vh = new VisibilityModel(
+        {
+          totalTimeMin: 10,
+          totalTimeMax: 90,
+        },
+        NO_CALC
+      );
       expect(vh.updateCounters_(0.1)).to.be.false;
       clock.tick(5);
       expect(vh.updateCounters_(0)).to.be.false;
@@ -837,10 +844,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should yield based on continuous time only', () => {
-      const vh = new VisibilityModel({
-        continuousTimeMin: 10,
-        continuousTimeMax: 90,
-      }, NO_CALC);
+      const vh = new VisibilityModel(
+        {
+          continuousTimeMin: 10,
+          continuousTimeMax: 90,
+        },
+        NO_CALC
+      );
       expect(vh.updateCounters_(0.1)).to.be.false;
       clock.tick(5);
       expect(vh.updateCounters_(0)).to.be.false;
@@ -865,11 +875,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should trigger for visibility percent only', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 49,
-        visiblePercentageMax: 80,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 49,
+          visiblePercentageMax: 80,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.63;
       vh.update();
@@ -882,11 +895,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should only update load-time visibility once', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 49,
-        visiblePercentageMax: 80,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 49,
+          visiblePercentageMax: 80,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.49;
       vh.update();
@@ -901,10 +917,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire with totalTimeMin condition', () => {
-      const vh = new VisibilityModel({
-        totalTimeMin: 1000,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          totalTimeMin: 1000,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.63;
       vh.update();
@@ -933,10 +952,13 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire with continuousTimeMin condition', () => {
-      const vh = new VisibilityModel({
-        continuousTimeMin: 1000,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          continuousTimeMin: 1000,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.63;
       vh.update();
@@ -974,11 +996,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire with totalTimeMin and visiblePercentageMin', () => {
-      const vh = new VisibilityModel({
-        totalTimeMin: 1000,
-        visiblePercentageMin: 10,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          totalTimeMin: 1000,
+          visiblePercentageMin: 10,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.05;
       vh.update();
@@ -1009,11 +1034,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire with continuousTimeMin=1k and totalTimeMin=2k', () => {
-      const vh = new VisibilityModel({
-        totalTimeMin: 2000,
-        continuousTimeMin: 1000,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          totalTimeMin: 2000,
+          continuousTimeMin: 1000,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       visibility = 0.05;
       vh.update();
@@ -1041,11 +1069,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire with continuousTimeMin=1k and visPercentageMin=50', () => {
-      const vh = new VisibilityModel({
-        continuousTimeMin: 1000,
-        visiblePercentageMin: 49,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          continuousTimeMin: 1000,
+          visiblePercentageMin: 49,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
 
       clock.tick(999);
       visibility = 0;
@@ -1074,11 +1105,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire for visiblePercentageMin=visiblePercentageMax=100', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 100,
-        visiblePercentageMax: 100,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 100,
+          visiblePercentageMax: 100,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
       visibility = 0.99;
       clock.tick(200);
       vh.update();
@@ -1090,12 +1124,15 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should fire for visiblePercentageMin=visiblePercentageMax=0', () => {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 0,
-        visiblePercentageMax: 0,
-        repeat: true,
-      }, calcVisibility);
-      const eventSpy = vh.eventResolver_ = sandbox.spy();
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 0,
+          visiblePercentageMax: 0,
+          repeat: true,
+        },
+        calcVisibility
+      );
+      const eventSpy = (vh.eventResolver_ = sandbox.spy());
       sandbox.stub(vh, 'reset_').callsFake(() => {
         vh.eventPromise_ = new Promise(unused => {
           vh.eventResolver_ = eventSpy;
@@ -1145,11 +1182,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
       calcVisibility = () => visibility;
     });
 
-    it('should wait for repeat interval', function* () {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 49,
-        repeat: true,
-      }, calcVisibility);
+    it('should wait for repeat interval', function*() {
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 49,
+          repeat: true,
+        },
+        calcVisibility
+      );
       const spy = sandbox.spy();
       vh.onTriggerEvent(() => {
         spy();
@@ -1167,11 +1207,14 @@ describes.sandboxed('VisibilityModel', {}, () => {
       expect(spy).to.be.calledOnce;
     });
 
-    it('should wait for not match to fire again w/o interval', function* () {
-      const vh = new VisibilityModel({
-        visiblePercentageMin: 49,
-        repeat: true,
-      }, calcVisibility);
+    it('should wait for not match to fire again w/o interval', function*() {
+      const vh = new VisibilityModel(
+        {
+          visiblePercentageMin: 49,
+          repeat: true,
+        },
+        calcVisibility
+      );
       const spy = sandbox.spy();
       vh.onTriggerEvent(() => {
         spy();
@@ -1207,9 +1250,12 @@ describes.sandboxed('VisibilityModel', {}, () => {
     });
 
     it('should correctly update initialScrollDepth', () => {
-      const vh = new VisibilityModel({
-        repeat: true,
-      }, calcVisibility);
+      const vh = new VisibilityModel(
+        {
+          repeat: true,
+        },
+        calcVisibility
+      );
       vh.maybeSetInitialScrollDepth(200);
       vh.maybeSetInitialScrollDepth(100);
       vh.maybeSetInitialScrollDepth(400);
diff --git a/extensions/amp-analytics/0.1/transport-serializer.js b/extensions/amp-analytics/0.1/transport-serializer.js
index 3b1d30b0c628..08abbfd4554a 100644
--- a/extensions/amp-analytics/0.1/transport-serializer.js
+++ b/extensions/amp-analytics/0.1/transport-serializer.js
@@ -43,7 +43,6 @@ export let RequestDef;
  * @interface
  */
 export class TransportSerializerDef {
-
   /**
    * @param {string} unusedBaseUrl
    * @param {!BatchSegmentDef} unusedSegment
@@ -67,7 +66,6 @@ export class TransportSerializerDef {
  * @implements {TransportSerializerDef}
  */
 class DefaultTransportSerializer {
-
   /** @override */
   generateRequest(baseUrl, segment, withPayload = false) {
     if (withPayload) {
@@ -87,7 +85,8 @@ class DefaultTransportSerializer {
       return {
         url: baseUrl.replace(EXTRA_URL_PARAM_VAR, ''),
         payload: JSON.stringify(
-            segments.map(segment => segment['extraUrlParams'])),
+          segments.map(segment => segment['extraUrlParams'])
+        ),
       };
     }
     return {
@@ -115,9 +114,9 @@ export const TransportSerializers = {
  */
 export function defaultSerializer(baseUrl, batchSegments) {
   const extraUrlParamsStr = batchSegments
-      .map(item => serializeQueryString(item['extraUrlParams']))
-      .filter(queryString => !!queryString)
-      .join('&');
+    .map(item => serializeQueryString(item['extraUrlParams']))
+    .filter(queryString => !!queryString)
+    .join('&');
   let requestUrl;
   if (baseUrl.indexOf(EXTRA_URL_PARAM_VAR) >= 0) {
     requestUrl = baseUrl.replace(EXTRA_URL_PARAM_VAR, extraUrlParamsStr);
diff --git a/extensions/amp-analytics/0.1/transport.js b/extensions/amp-analytics/0.1/transport.js
index 2125df2cf123..db6bb241aaac 100644
--- a/extensions/amp-analytics/0.1/transport.js
+++ b/extensions/amp-analytics/0.1/transport.js
@@ -45,12 +45,11 @@ const TAG_ = 'amp-analytics/transport';
  * Transport defines the ways how the analytics pings are going to be sent.
  */
 export class Transport {
-
   /**
    * @param {!Window} win
    * @param {!JsonObject} options
    */
-  constructor(win, options = /** @type {!JsonObject} */({})) {
+  constructor(win, options = /** @type {!JsonObject} */ ({})) {
     /** @private {!Window} */
     this.win_ = win;
 
@@ -58,7 +57,9 @@ export class Transport {
     this.options_ = options;
 
     /** @private {string|undefined} */
-    this.referrerPolicy_ = /** @type {string|undefined} */ (this.options_['referrerPolicy']);
+    this.referrerPolicy_ = /** @type {string|undefined} */ (this.options_[
+      'referrerPolicy'
+    ]);
 
     // no-referrer is only supported in image transport
     if (this.referrerPolicy_ === 'no-referrer') {
@@ -111,21 +112,28 @@ export class Transport {
       return;
     }
 
-    if (this.options_['beacon'] && Transport.sendRequestUsingBeacon(
-        this.win_, getRequest(this.useBody_))) {
+    if (
+      this.options_['beacon'] &&
+      Transport.sendRequestUsingBeacon(this.win_, getRequest(this.useBody_))
+    ) {
       return;
     }
-    if (this.options_['xhrpost'] && Transport.sendRequestUsingXhr(
-        this.win_, getRequest(this.useBody_))) {
+    if (
+      this.options_['xhrpost'] &&
+      Transport.sendRequestUsingXhr(this.win_, getRequest(this.useBody_))
+    ) {
       return;
     }
     const image = this.options_['image'];
     if (image) {
-      const suppressWarnings = (typeof image == 'object' &&
-      image['suppressWarnings']);
+      const suppressWarnings =
+        typeof image == 'object' && image['suppressWarnings'];
       Transport.sendRequestUsingImage(
-          this.win_, getRequest(false), suppressWarnings,
-          /** @type {string|undefined} */ (this.referrerPolicy_));
+        this.win_,
+        getRequest(false),
+        suppressWarnings,
+        /** @type {string|undefined} */ (this.referrerPolicy_)
+      );
       return;
     }
     user().warn(TAG_, 'Failed to send request', url, this.options_);
@@ -152,13 +160,20 @@ export class Transport {
 
     const type = element.getAttribute('type');
     // In inabox there is no amp-ad element.
-    const ampAdResourceId = this.isInabox_ ? '1' : user().assertString(
-        getAmpAdResourceId(element, getTopWindow(win)),
-        'No friendly amp-ad ancestor element was found ' +
-        'for amp-analytics tag with iframe transport.');
+    const ampAdResourceId = this.isInabox_
+      ? '1'
+      : user().assertString(
+          getAmpAdResourceId(element, getTopWindow(win)),
+          'No friendly amp-ad ancestor element was found ' +
+            'for amp-analytics tag with iframe transport.'
+        );
 
     this.iframeTransport_ = new IframeTransport(
-        win, type, this.options_, ampAdResourceId);
+      win,
+      type,
+      this.options_,
+      ampAdResourceId
+    );
   }
 
   /**
@@ -190,11 +205,12 @@ export class Transport {
 
     assertHttpsUrl(request, 'amp-analytics request');
     userAssert(
-        parseUrlDeprecated(request).origin !=
+      parseUrlDeprecated(request).origin !=
         parseUrlDeprecated(this.win_.location.href).origin,
-        'Origin of iframe request must not be equal to the document origin.' +
+      'Origin of iframe request must not be equal to the document origin.' +
         ' See https://github.com/ampproject/' +
-        ' amphtml/blob/master/spec/amp-iframe-origin-policy.md for details.');
+        ' amphtml/blob/master/spec/amp-iframe-origin-policy.md for details.'
+    );
 
     /** @const {!Element} */
     const iframe = this.win_.document.createElement('iframe');
@@ -215,7 +231,9 @@ export class Transport {
    * @return {!TransportSerializerDef}
    */
   getSerializer_() {
-    return /** @type {!TransportSerializerDef} */(TransportSerializers['default']);
+    return /** @type {!TransportSerializerDef} */ (TransportSerializers[
+      'default'
+    ]);
   }
 
   /**
@@ -226,14 +244,19 @@ export class Transport {
    */
   static sendRequestUsingImage(win, request, suppressWarnings, referrerPolicy) {
     const image = createPixel(win, request.url, referrerPolicy);
-    loadPromise(image).then(() => {
-      dev().fine(TAG_, 'Sent image request', request.url);
-    }).catch(() => {
-      if (!suppressWarnings) {
-        user().warn(TAG_, 'Response unparseable or failed to send image ' +
-            'request', request.url);
-      }
-    });
+    loadPromise(image)
+      .then(() => {
+        dev().fine(TAG_, 'Sent image request', request.url);
+      })
+      .catch(() => {
+        if (!suppressWarnings) {
+          user().warn(
+            TAG_,
+            'Response unparseable or failed to send image request',
+            request.url
+          );
+        }
+      });
   }
 
   /**
diff --git a/extensions/amp-analytics/0.1/variables.js b/extensions/amp-analytics/0.1/variables.js
index 46676252a935..c53d24b69da0 100644
--- a/extensions/amp-analytics/0.1/variables.js
+++ b/extensions/amp-analytics/0.1/variables.js
@@ -84,8 +84,6 @@ export class ExpansionOptions {
   }
 }
 
-
-
 /**
  * @param {string} str
  * @param {string} s
@@ -95,12 +93,16 @@ export class ExpansionOptions {
 function substrMacro(str, s, opt_l) {
   const start = Number(s);
   let {length} = str;
-  userAssert(isFiniteNumber(start),
-      'Start index ' + start + 'in substr macro should be a number');
+  userAssert(
+    isFiniteNumber(start),
+    'Start index ' + start + 'in substr macro should be a number'
+  );
   if (opt_l) {
     length = Number(opt_l);
-    userAssert(isFiniteNumber(length),
-        'Length ' + length + ' in substr macro should be a number');
+    userAssert(
+      isFiniteNumber(length),
+      'Length ' + length + ' in substr macro should be a number'
+    );
   }
 
   return str.substr(start, length);
@@ -135,7 +137,6 @@ function replaceMacro(string, matchPattern, opt_newSubStr) {
   return string.replace(regex, opt_newSubStr);
 }
 
-
 /**
  * Provides support for processing of advanced variable syntax like nested
  * expansions macros etc.
@@ -145,7 +146,6 @@ export class VariableService {
    * @param {!Window} window
    */
   constructor(window) {
-
     /** @private {!Window} */
     this.win_ = window;
 
@@ -163,13 +163,15 @@ export class VariableService {
     this.register_('$NOT', value => String(!value));
     this.register_('$BASE64', value => base64UrlEncodeFromString(value));
     this.register_('$HASH', this.hashMacro_.bind(this));
-    this.register_('$IF',
-        (value, thenValue, elseValue) => value ? thenValue : elseValue);
+    this.register_('$IF', (value, thenValue, elseValue) =>
+      value ? thenValue : elseValue
+    );
     this.register_('$REPLACE', replaceMacro);
     // TODO(ccordry): Make sure this stays a window level service when this
     // VariableService is migrated to document level.
     this.register_('LINKER_PARAM', (name, id) =>
-      this.linkerReader_.get(name, id));
+      this.linkerReader_.get(name, id)
+    );
   }
 
   /**
@@ -184,8 +186,7 @@ export class VariableService {
    * @param {*} macro
    */
   register_(name, macro) {
-    devAssert(!this.macros_[name], 'Macro "' + name
-        + '" already registered.');
+    devAssert(!this.macros_[name], 'Macro "' + name + '" already registered.');
     this.macros_[name] = macro;
   }
 
@@ -207,8 +208,11 @@ export class VariableService {
   expandTemplateSync(template, options) {
     return template.replace(/\${([^}]*)}/g, (match, key) => {
       if (options.iterations < 0) {
-        user().error(TAG, 'Maximum depth reached while expanding variables. ' +
-            'Please ensure that the variables are not recursive.');
+        user().error(
+          TAG,
+          'Maximum depth reached while expanding variables. ' +
+            'Please ensure that the variables are not recursive.'
+        );
         return match;
       }
 
@@ -227,13 +231,18 @@ export class VariableService {
       let value = options.getVar(name);
 
       if (typeof value == 'string') {
-        value = this.expandTemplateSync(value,
-            new ExpansionOptions(options.vars, options.iterations - 1,
-                true /* noEncode */));
+        value = this.expandTemplateSync(
+          value,
+          new ExpansionOptions(
+            options.vars,
+            options.iterations - 1,
+            true /* noEncode */
+          )
+        );
       }
 
       if (!options.noEncode) {
-        value = encodeVars(/** @type {string|?Array<string>} */(value));
+        value = encodeVars(/** @type {string|?Array<string>} */ (value));
       }
       if (value) {
         value += argList;
@@ -242,7 +251,6 @@ export class VariableService {
     });
   }
 
-
   /**
    * @param {string} value
    * @return {!Promise<string>}
diff --git a/extensions/amp-analytics/0.1/vendors.js b/extensions/amp-analytics/0.1/vendors.js
index cd93f09ddd2b..77c260f602bd 100644
--- a/extensions/amp-analytics/0.1/vendors.js
+++ b/extensions/amp-analytics/0.1/vendors.js
@@ -58,9 +58,7 @@ import {MOBIFY_CONFIG} from './vendors/mobify';
 import {MPARTICLE_CONFIG} from './vendors/mparticle';
 import {NEWRELIC_CONFIG} from './vendors/newrelic';
 import {NIELSEN_CONFIG} from './vendors/nielsen';
-import {
-  NIELSEN_MARKETING_CLOUD_CONFIG,
-} from './vendors/nielsen-marketing-cloud';
+import {NIELSEN_MARKETING_CLOUD_CONFIG} from './vendors/nielsen-marketing-cloud';
 import {OEWADIRECT_CONFIG} from './vendors/oewadirect';
 import {OEWA_CONFIG} from './vendors/oewa';
 import {PARSELY_CONFIG} from './vendors/parsely';
@@ -72,9 +70,7 @@ import {PRESSBOARD_CONFIG} from './vendors/pressboard';
 import {QUANTCAST_CONFIG} from './vendors/quantcast';
 import {RETARGETLY_CONFIG} from './vendors/retargetly';
 import {ADOBEANALYTICS_CONFIG} from './vendors/adobeanalytics';
-import {
-  ADOBEANALYTICS_NATIVECONFIG_CONFIG,
-} from './vendors/adobeanalytics_nativeConfig';
+import {ADOBEANALYTICS_NATIVECONFIG_CONFIG} from './vendors/adobeanalytics_nativeConfig';
 import {INFONLINE_CONFIG} from './vendors/infonline';
 import {SIMPLEREACH_CONFIG} from './vendors/simplereach';
 import {SEGMENT_CONFIG} from './vendors/segment';
@@ -91,9 +87,7 @@ import {LINKPULSE_CONFIG} from './vendors/linkpulse';
 import {RAKAM_CONFIG} from './vendors/rakam';
 import {IBEATANALYTICS_CONFIG} from './vendors/ibeatanalytics';
 import {TOPMAILRU_CONFIG} from './vendors/topmailru';
-import {
-  ORACLEINFINITYANALYTICS_CONFIG,
-} from './vendors/oracleInfinityAnalytics';
+import {ORACLEINFINITYANALYTICS_CONFIG} from './vendors/oracleInfinityAnalytics';
 import {MOAT_CONFIG} from './vendors/moat';
 import {BG_CONFIG} from './vendors/bg';
 import {UPSCORE_CONFIG} from './vendors/upscore';
@@ -105,7 +99,6 @@ import {VPONANALYTICS_CONFIG} from './vendors/vponanalytics';
  * @const {!JsonObject}
  */
 export const ANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
-
   // Default parent configuration applied to all amp-analytics tags.
   'default': {
     'transport': {'beacon': true, 'xhrpost': true, 'image': true},
@@ -254,15 +247,13 @@ if (getMode().test || getMode().localDev) {
   ANALYTICS_CONFIG['_fake_'] = _FAKE_;
 }
 
-ANALYTICS_CONFIG['infonline']['triggers']['pageview']['iframe' +
-/* TEMPORARY EXCEPTION */ 'Ping'] = true;
+ANALYTICS_CONFIG['infonline']['triggers']['pageview']['iframePing'] = true;
 
-ANALYTICS_CONFIG['adobeanalytics_nativeConfig']
-    ['triggers']['pageLoad']['iframe' +
-    /* TEMPORARY EXCEPTION */ 'Ping'] = true;
+ANALYTICS_CONFIG['adobeanalytics_nativeConfig']['triggers']['pageLoad'][
+  'iframePing'
+] = true;
 
-ANALYTICS_CONFIG['oewa']['triggers']['pageview']['iframe' +
-/* TEMPORARY EXCEPTION */ 'Ping'] = true;
+ANALYTICS_CONFIG['oewa']['triggers']['pageview']['iframePing'] = true;
 
 mergeIframeTransportConfig(ANALYTICS_CONFIG, IFRAME_TRANSPORTS);
 
@@ -276,8 +267,11 @@ function mergeIframeTransportConfig(config, iframeTransportConfig) {
   for (const vendor in iframeTransportConfig) {
     if (hasOwn(iframeTransportConfig, vendor)) {
       const url = iframeTransportConfig[vendor];
-      config[vendor]['transport'] =
-          Object.assign({}, config[vendor]['transport'], {'iframe': url});
+      config[vendor]['transport'] = Object.assign(
+        {},
+        config[vendor]['transport'],
+        {'iframe': url}
+      );
     }
   }
 }
diff --git a/extensions/amp-analytics/0.1/vendors/acquialift.js b/extensions/amp-analytics/0.1/vendors/acquialift.js
index 0bd20aa09b26..b2c62e705734 100644
--- a/extensions/amp-analytics/0.1/vendors/acquialift.js
+++ b/extensions/amp-analytics/0.1/vendors/acquialift.js
@@ -22,18 +22,18 @@ export const ACQUIALIFT_CONFIG = /** @type {!JsonObject} */ ({
   },
   'transport': {'beacon': true, 'xhrpost': true, 'image': false},
   'requests': {
-    'base': 'https://${decisionApiUrl}/capture?account_id=${accountId}&site_id=${siteId}',
-    'basicCapture': '${base}' +
+    'base':
+      'https://${decisionApiUrl}/capture?account_id=${accountId}&site_id=${siteId}',
+    'basicCapture':
+      '${base}' +
       '&ident=${clientId(tc_ptid)}' +
       '&identsrc=amp' +
       '&es=Amp' +
       '&url=${canonicalUrl}' +
       '&rurl=${documentReferrer}' +
       '&cttl=${title}',
-    'pageview': '${basicCapture}' +
-      '&en=Content View',
-    'click': '${basicCapture}' +
-      '&en=Click-Through',
+    'pageview': '${basicCapture}&en=Content View',
+    'click': '${basicCapture}&en=Click-Through',
   },
   'triggers': {
     'defaultPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/adobeanalytics.js b/extensions/amp-analytics/0.1/vendors/adobeanalytics.js
index 34589c5a1532..23ac497e103d 100644
--- a/extensions/amp-analytics/0.1/vendors/adobeanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/adobeanalytics.js
@@ -27,18 +27,20 @@ export const ADOBEANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'requestPath': '/b/ss/${reportSuites}/0/amp-1.0/s${random}',
     // vid starts with z to work around #2198
-    'basePrefix': 'vid=z${clientId(adobe_amp_id)}' +
-        '&ndh=0' +
-        '&ce=${documentCharset}' +
-        '&pageName=${pageName}' +
-        '&g=${ampdocUrl}' +
-        '&r=${documentReferrer}' +
-        '&bh=${availableScreenHeight}' +
-        '&bw=${availableScreenWidth}' +
-        '&c=${screenColorDepth}' +
-        '&j=amp' +
-        '&s=${screenWidth}x${screenHeight}',
+    'basePrefix':
+      'vid=z${clientId(adobe_amp_id)}' +
+      '&ndh=0' +
+      '&ce=${documentCharset}' +
+      '&pageName=${pageName}' +
+      '&g=${ampdocUrl}' +
+      '&r=${documentReferrer}' +
+      '&bh=${availableScreenHeight}' +
+      '&bw=${availableScreenWidth}' +
+      '&c=${screenColorDepth}' +
+      '&j=amp' +
+      '&s=${screenWidth}x${screenHeight}',
     'pageview': 'https://${host}${requestPath}?${basePrefix}',
-    'click': 'https://${host}${requestPath}?${basePrefix}&pe=lnk_${linkType}&pev1=${linkUrl}&pev2=${linkName}',
+    'click':
+      'https://${host}${requestPath}?${basePrefix}&pe=lnk_${linkType}&pev1=${linkUrl}&pev2=${linkName}',
   },
 });
diff --git a/extensions/amp-analytics/0.1/vendors/afsanalytics.js b/extensions/amp-analytics/0.1/vendors/afsanalytics.js
index 6cf4487ecd54..36fc402fb5e0 100644
--- a/extensions/amp-analytics/0.1/vendors/afsanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/afsanalytics.js
@@ -25,7 +25,8 @@ export const AFSANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': '//${server}.afsanalytics.com',
     'base': '${host}/cgi_bin/',
-    'pageview': '${base}connect.cgi?usr=${websiteid}Pauto' +
+    'pageview':
+      '${base}connect.cgi?usr=${websiteid}Pauto' +
       '&js=1' +
       '&amp=1' +
       '&title=${title}' +
@@ -34,7 +35,8 @@ export const AFSANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
       '&resolution=${screenWidth}x${screenHeight}' +
       '&color=${screenColorDepth}' +
       '&Tips=${random}',
-    'click': '${base}click.cgi?usr=${websiteid}' +
+    'click':
+      '${base}click.cgi?usr=${websiteid}' +
       '&event=${event}' +
       '&exit=${clicklabel}',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/alexametrics.js b/extensions/amp-analytics/0.1/vendors/alexametrics.js
index 928bb545d595..bbd0ac8bb4b4 100644
--- a/extensions/amp-analytics/0.1/vendors/alexametrics.js
+++ b/extensions/amp-analytics/0.1/vendors/alexametrics.js
@@ -16,8 +16,10 @@
 
 export const ALEXAMETRICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
-    'base': 'https://${ampAtrkHost}/atrk.gif?account=${atrk_acct}&domain=${domain}',
-    'pageview': '${base}&jsv=amp-${ampVersion}' +
+    'base':
+      'https://${ampAtrkHost}/atrk.gif?account=${atrk_acct}&domain=${domain}',
+    'pageview':
+      '${base}&jsv=amp-${ampVersion}' +
       '&frame_height=${viewportHeight}&frame_width=${viewportWidth}' +
       '&title=${title}&time=${timestamp}&time_zone_offset=${timezone}' +
       '&screen_params=${screenWidth}x${screenHeight}x${screenColorDepth}' +
diff --git a/extensions/amp-analytics/0.1/vendors/atinternet.js b/extensions/amp-analytics/0.1/vendors/atinternet.js
index 83639c49c27f..28774fdd5d75 100644
--- a/extensions/amp-analytics/0.1/vendors/atinternet.js
+++ b/extensions/amp-analytics/0.1/vendors/atinternet.js
@@ -21,12 +21,12 @@ export const ATINTERNET_CONFIG = /** @type {!JsonObject} */ ({
     'domain': '.xiti.com',
   },
   'requests': {
-    'base': 'https://${log}${domain}/${pixelPath}?s=${site}&ts=${timestamp}&r=${screenWidth}x${screenHeight}x${screenColorDepth}&re=${availableScreenWidth}x${availableScreenHeight}',
+    'base':
+      'https://${log}${domain}/${pixelPath}?s=${site}&ts=${timestamp}&r=${screenWidth}x${screenHeight}x${screenColorDepth}&re=${availableScreenWidth}x${availableScreenHeight}',
     'suffix': '&medium=amp&${extraUrlParams}&ref=${documentReferrer}',
-    'pageview': '${base}&' +
-      'p=${title}&' +
-      's2=${level2}${suffix}',
-    'click': '${base}&' +
+    'pageview': '${base}&p=${title}&s2=${level2}${suffix}',
+    'click':
+      '${base}&' +
       'pclick=${title}&' +
       's2click=${level2}&' +
       'p=${label}&' +
diff --git a/extensions/amp-analytics/0.1/vendors/baiduanalytics.js b/extensions/amp-analytics/0.1/vendors/baiduanalytics.js
index cdac22f0ae26..53dcc9f5aba3 100644
--- a/extensions/amp-analytics/0.1/vendors/baiduanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/baiduanalytics.js
@@ -17,11 +17,9 @@
 export const BAIDUANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://hm.baidu.com',
-    'base': '${host}/hm.gif?' +
-        'si=${token}&nv=0&st=4&v=pixel-1.0&rnd=${timestamp}',
+    'base': '${host}/hm.gif?si=${token}&nv=0&st=4&v=pixel-1.0&rnd=${timestamp}',
     'pageview': '${base}&et=0',
-    'event': '${base}&ep=${category}*${action}*' +
-        '${label}*${value}&et=4&api=8_0',
+    'event': '${base}&ep=${category}*${action}*${label}*${value}&et=4&api=8_0',
   },
   'transport': {
     'beacon': false,
diff --git a/extensions/amp-analytics/0.1/vendors/bg.js b/extensions/amp-analytics/0.1/vendors/bg.js
index 055bf6d10729..2c88980a93da 100644
--- a/extensions/amp-analytics/0.1/vendors/bg.js
+++ b/extensions/amp-analytics/0.1/vendors/bg.js
@@ -14,5 +14,4 @@
  * limitations under the License.
  */
 
-export const BG_CONFIG = /** @type {!JsonObject} */ ({
-});
+export const BG_CONFIG = /** @type {!JsonObject} */ ({});
diff --git a/extensions/amp-analytics/0.1/vendors/burt.js b/extensions/amp-analytics/0.1/vendors/burt.js
index 9fda1e7a5589..1f171145dd89 100644
--- a/extensions/amp-analytics/0.1/vendors/burt.js
+++ b/extensions/amp-analytics/0.1/vendors/burt.js
@@ -22,17 +22,19 @@ export const BURT_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': '//${trackingKey}.c.richmetrics.com/',
-    'base': '${host}imglog?' +
+    'base':
+      '${host}imglog?' +
       'e=${trackingKey}&' +
       'pi=${trackingKey}' +
-        '|${pageViewId}' +
-        '|${canonicalPath}' +
-        '|${clientId(burt-amp-user-id)}&' +
+      '|${pageViewId}' +
+      '|${canonicalPath}' +
+      '|${clientId(burt-amp-user-id)}&' +
       'ui=${clientId(burt-amp-user-id)}&' +
       'v=amp&' +
       'ts=${timestamp}&' +
       'sn=${requestCount}&',
-    'pageview': '${base}' +
+    'pageview':
+      '${base}' +
       'type=page&' +
       'ca=${category}&' +
       'sc=${subCategory}&' +
@@ -44,8 +46,7 @@ export const BURT_CONFIG = /** @type {!JsonObject} */ ({
       'sd=${screenWidth}x${screenHeight}&' +
       'wd=${availableScreenWidth}x${availableScreenHeight}&' +
       'ws=${scrollLeft}x${scrollTop}',
-    'pageping': '${base}' +
-      'type=pageping',
+    'pageping': '${base}type=pageping',
   },
   'triggers': {
     'pageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/byside.js b/extensions/amp-analytics/0.1/vendors/byside.js
index 7c2c38e830cf..7a382b2d89b4 100644
--- a/extensions/amp-analytics/0.1/vendors/byside.js
+++ b/extensions/amp-analytics/0.1/vendors/byside.js
@@ -26,8 +26,9 @@ export const BYSIDE_CONFIG = /** @type {!JsonObject} */ ({
     'host': '//${webcareZone}.byside.com/',
     'base': '${host}BWA${webcareId}/amp/',
     'pageview': '${base}pixel.php',
-    'event': '${base}signal.php?event_id=${eventId}' +
-    '&event_label=${eventLabel}&fields=${fields}',
+    'event':
+      '${base}signal.php?event_id=${eventId}' +
+      '&event_label=${eventLabel}&fields=${fields}',
   },
   'extraUrlParams': {
     'webcare_id': '${webcareId}',
diff --git a/extensions/amp-analytics/0.1/vendors/chartbeat.js b/extensions/amp-analytics/0.1/vendors/chartbeat.js
index be2581fc02cb..f9117c2c5d82 100644
--- a/extensions/amp-analytics/0.1/vendors/chartbeat.js
+++ b/extensions/amp-analytics/0.1/vendors/chartbeat.js
@@ -17,7 +17,8 @@
 export const CHARTBEAT_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://ping.chartbeat.net',
-    'basePrefix': '/ping?h=${domain}&' +
+    'basePrefix':
+      '/ping?h=${domain}&' +
       'p=${canonicalPath}&' +
       'u=${clientId(_cb)}&' +
       'd=${canonicalHost}&' +
diff --git a/extensions/amp-analytics/0.1/vendors/clicky.js b/extensions/amp-analytics/0.1/vendors/clicky.js
index 8e582e42c166..5293ae50cd42 100644
--- a/extensions/amp-analytics/0.1/vendors/clicky.js
+++ b/extensions/amp-analytics/0.1/vendors/clicky.js
@@ -19,11 +19,10 @@ export const CLICKY_CONFIG = /** @type {!JsonObject} */ ({
     'site_id': '',
   },
   'requests': {
-    'base': 'https://in.getclicky.com/in.php?' +
-      'site_id=${site_id}',
-    'baseSuffix': '&mime=${contentType}&' +
-      'x=${random}',
-    'pageview': '${base}&' +
+    'base': 'https://in.getclicky.com/in.php?site_id=${site_id}',
+    'baseSuffix': '&mime=${contentType}&x=${random}',
+    'pageview':
+      '${base}&' +
       'res=${screenWidth}x${screenHeight}&' +
       'lang=${browserLanguage}&' +
       'secure=1&' +
@@ -31,9 +30,7 @@ export const CLICKY_CONFIG = /** @type {!JsonObject} */ ({
       'href=${canonicalPath}&' +
       'title=${title}' +
       '${baseSuffix}',
-    'interval': '${base}&' +
-      'type=ping' +
-      '${baseSuffix}',
+    'interval': '${base}&type=ping${baseSuffix}',
   },
   'triggers': {
     'defaultPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/colanalytics.js b/extensions/amp-analytics/0.1/vendors/colanalytics.js
index dda474f3380f..a3b065eceb4b 100644
--- a/extensions/amp-analytics/0.1/vendors/colanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/colanalytics.js
@@ -18,7 +18,8 @@ export const COLANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://ase.clmbtech.com',
     'base': '${host}/message',
-    'pageview': '${base}?cid=${id}' +
+    'pageview':
+      '${base}?cid=${id}' +
       '&val_101=${id}' +
       '&val_101=${canonicalPath}' +
       '&ch=${canonicalHost}' +
diff --git a/extensions/amp-analytics/0.1/vendors/comscore.js b/extensions/amp-analytics/0.1/vendors/comscore.js
index 67aa0d06b6a8..eb7a94b77bd7 100644
--- a/extensions/amp-analytics/0.1/vendors/comscore.js
+++ b/extensions/amp-analytics/0.1/vendors/comscore.js
@@ -21,7 +21,8 @@ export const COMSCORE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://sb.scorecardresearch.com',
     'base': '${host}/b?',
-    'pageview': '${base}c1=2' +
+    'pageview':
+      '${base}c1=2' +
       '&c2=${c2}' +
       '&cs_pv=${pageViewId}' +
       '&c12=${clientId(comScore)}' +
diff --git a/extensions/amp-analytics/0.1/vendors/cxense.js b/extensions/amp-analytics/0.1/vendors/cxense.js
index f17e12881d1f..b82c3452d1aa 100644
--- a/extensions/amp-analytics/0.1/vendors/cxense.js
+++ b/extensions/amp-analytics/0.1/vendors/cxense.js
@@ -18,11 +18,12 @@ export const CXENSE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://scomcluster.cxense.com',
     'base': '${host}/Repo/rep.gif',
-    'pageview': '${base}?ver=1&typ=pgv&sid=${siteId}&ckp=${clientId(cX_P)}&' +
-        'loc=${sourceUrl}&rnd=${random}&ref=${documentReferrer}&' +
-        'ltm=${timestamp}&wsz=${screenWidth}x${screenHeight}&' +
-        'bln=${browserLanguage}&chs=${documentCharset}&' +
-        'col=${screenColorDepth}&tzo=${timezone}&cp_cx_channel=amp',
+    'pageview':
+      '${base}?ver=1&typ=pgv&sid=${siteId}&ckp=${clientId(cX_P)}&' +
+      'loc=${sourceUrl}&rnd=${random}&ref=${documentReferrer}&' +
+      'ltm=${timestamp}&wsz=${screenWidth}x${screenHeight}&' +
+      'bln=${browserLanguage}&chs=${documentCharset}&' +
+      'col=${screenColorDepth}&tzo=${timezone}&cp_cx_channel=amp',
   },
   'triggers': {
     'defaultPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/dynatrace.js b/extensions/amp-analytics/0.1/vendors/dynatrace.js
index f66d0d836855..af3d414caf47 100644
--- a/extensions/amp-analytics/0.1/vendors/dynatrace.js
+++ b/extensions/amp-analytics/0.1/vendors/dynatrace.js
@@ -16,8 +16,10 @@
 
 export const DYNATRACE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
-    'endpoint': '${protocol}://${tenant}${separator}${environment}:${port}/ampbf/${tenantpath}',
-    'pageview': '${endpoint}?type=js&' +
+    'endpoint':
+      '${protocol}://${tenant}${separator}${environment}:${port}/ampbf/${tenantpath}',
+    'pageview':
+      '${endpoint}?type=js&' +
       'flavor=amp&' +
       'v=1&' +
       'a=1%7C1%7C_load_%7C_load_%7C-%7C${navTiming(navigationStart)}%7C' +
diff --git a/extensions/amp-analytics/0.1/vendors/epica.js b/extensions/amp-analytics/0.1/vendors/epica.js
index c682f207ff8d..68c60e24d726 100644
--- a/extensions/amp-analytics/0.1/vendors/epica.js
+++ b/extensions/amp-analytics/0.1/vendors/epica.js
@@ -25,7 +25,8 @@ export const EPICA_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://cat.poder.io/api/v1/pixel',
-    'base': '?writeKey=${writeKey}' +
+    'base':
+      '?writeKey=${writeKey}' +
       '&context.library.name=amp' +
       '&anonymousId=${anonymousId}' +
       '&context.locale=${browserLanguage}' +
diff --git a/extensions/amp-analytics/0.1/vendors/euleriananalytics.js b/extensions/amp-analytics/0.1/vendors/euleriananalytics.js
index 07fa6cefc2cb..e4a47e95056f 100644
--- a/extensions/amp-analytics/0.1/vendors/euleriananalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/euleriananalytics.js
@@ -21,21 +21,23 @@ export const EULERIANANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'base': 'https://${analyticsHost}',
-    'basePrefix': '-/${random}?' +
+    'basePrefix':
+      '-/${random}?' +
       'euid-amp=${clientId(etuix)}&' +
       'url=${documentLocation}&',
-    'pageview': '${base}/col2/${basePrefix}' +
+    'pageview':
+      '${base}/col2/${basePrefix}' +
       'rf=${externalReferrer}&' +
       'urlp=${pagePath}&' +
       'ss=${screenWidth}x${screenHeight}&' +
       'sd=${screenColorDepth}',
-    'action': '${base}/action/${basePrefix}' +
+    'action':
+      '${base}/action/${basePrefix}' +
       'eact=${actionCode}&' +
       'actr=${actionRef}',
-    'user': '${base}/uparam/${basePrefix}' +
-      'euk${userParamKey}=${userParamVal}',
-    'contextflag': '${base}/cflag2/${basePrefix}' +
-      'ecf0k=${cflagKey}&ecf0v=${cflagVal}',
+    'user': '${base}/uparam/${basePrefix}euk${userParamKey}=${userParamVal}',
+    'contextflag':
+      '${base}/cflag2/${basePrefix}ecf0k=${cflagKey}&ecf0v=${cflagVal}',
   },
   'transport': {
     'beacon': false,
diff --git a/extensions/amp-analytics/0.1/vendors/facebookpixel.js b/extensions/amp-analytics/0.1/vendors/facebookpixel.js
index 1b3103b931f5..1a5c684b0420 100644
--- a/extensions/amp-analytics/0.1/vendors/facebookpixel.js
+++ b/extensions/amp-analytics/0.1/vendors/facebookpixel.js
@@ -21,73 +21,82 @@ export const FACEBOOKPIXEL_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://www.facebook.com',
     'base': '${host}/tr?noscript=1',
-    'pageview': '${base}&ev=PageView&' +
-        'id=${pixelId}',
-    'event': '${base}&ev=${eventName}&' +
-        'id=${pixelId}' +
-        '&cd[content_name]=${content_name}',
-    'eventViewContent': '${base}&ev=ViewContent&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_type]=${content_type}' +
-        '&cd[content_ids]=${content_ids}',
-    'eventSearch': '${base}&ev=Search&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_category]=${content_category}' +
-        '&cd[content_ids]=${content_ids}' +
-        '&cd[search_string]=${search_string}',
-    'eventAddToCart': '${base}&ev=AddToCart&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_type]=${content_type}' +
-        '&cd[content_ids]=${content_ids}',
-    'eventAddToWishlist': '${base}&ev=AddToWishlist&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_category]=${content_category}' +
-        '&cd[content_ids]=${content_ids}',
-    'eventInitiateCheckout': '${base}&ev=InitiateCheckout&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_category]=${content_category}' +
-        '&cd[num_items]=${num_items}' +
-        '&cd[content_ids]=${content_ids}',
-    'eventAddPaymentInfo': '${base}&ev=AddPaymentInfo&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_category]=${content_category}' +
-        '&cd[content_ids]=${content_ids}',
-    'eventPurchase': '${base}&ev=Purchase&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_type]=${content_type}' +
-        '&cd[content_ids]=${content_ids}' +
-        '&cd[num_items]=${num_items}',
-    'eventLead': '${base}&ev=Lead&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[content_category]=${content_category}',
-    'eventCompleteRegistration': '${base}&ev=CompleteRegistration&' +
-        'id=${pixelId}' +
-        '&cd[value]=${value}' +
-        '&cd[currency]=${currency}' +
-        '&cd[content_name]=${content_name}' +
-        '&cd[status]=${status}',
+    'pageview': '${base}&ev=PageView&id=${pixelId}',
+    'event':
+      '${base}&ev=${eventName}&' +
+      'id=${pixelId}' +
+      '&cd[content_name]=${content_name}',
+    'eventViewContent':
+      '${base}&ev=ViewContent&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_type]=${content_type}' +
+      '&cd[content_ids]=${content_ids}',
+    'eventSearch':
+      '${base}&ev=Search&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_category]=${content_category}' +
+      '&cd[content_ids]=${content_ids}' +
+      '&cd[search_string]=${search_string}',
+    'eventAddToCart':
+      '${base}&ev=AddToCart&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_type]=${content_type}' +
+      '&cd[content_ids]=${content_ids}',
+    'eventAddToWishlist':
+      '${base}&ev=AddToWishlist&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_category]=${content_category}' +
+      '&cd[content_ids]=${content_ids}',
+    'eventInitiateCheckout':
+      '${base}&ev=InitiateCheckout&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_category]=${content_category}' +
+      '&cd[num_items]=${num_items}' +
+      '&cd[content_ids]=${content_ids}',
+    'eventAddPaymentInfo':
+      '${base}&ev=AddPaymentInfo&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_category]=${content_category}' +
+      '&cd[content_ids]=${content_ids}',
+    'eventPurchase':
+      '${base}&ev=Purchase&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_type]=${content_type}' +
+      '&cd[content_ids]=${content_ids}' +
+      '&cd[num_items]=${num_items}',
+    'eventLead':
+      '${base}&ev=Lead&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[content_category]=${content_category}',
+    'eventCompleteRegistration':
+      '${base}&ev=CompleteRegistration&' +
+      'id=${pixelId}' +
+      '&cd[value]=${value}' +
+      '&cd[currency]=${currency}' +
+      '&cd[content_name]=${content_name}' +
+      '&cd[status]=${status}',
   },
   'triggers': {
     'trackPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/gemius.js b/extensions/amp-analytics/0.1/vendors/gemius.js
index a13a85365d02..da6a0e84df24 100644
--- a/extensions/amp-analytics/0.1/vendors/gemius.js
+++ b/extensions/amp-analytics/0.1/vendors/gemius.js
@@ -19,7 +19,8 @@ export const GEMIUS_CONFIG = /** @type {!JsonObject} */ ({
     'dnt': '0',
   },
   'requests': {
-    'base': 'https://${prefix}.hit.gemius.pl/_${timestamp}/redot.gif?l=91&id=${identifier}&screen=${screenWidth}x${screenHeight}&window=${viewportWidth}x${viewportHeight}&fr=1&href=${sourceUrl}&ref=${documentReferrer}&extra=gemamp%3D1%7Campid%3D${clientId(gemius)}%7C${extraparams}&nc=${dnt}',
+    'base':
+      'https://${prefix}.hit.gemius.pl/_${timestamp}/redot.gif?l=91&id=${identifier}&screen=${screenWidth}x${screenHeight}&window=${viewportWidth}x${viewportHeight}&fr=1&href=${sourceUrl}&ref=${documentReferrer}&extra=gemamp%3D1%7Campid%3D${clientId(gemius)}%7C${extraparams}&nc=${dnt}',
     'pageview': '${base}&et=view&hsrc=1',
     'event': '${base}&et=action&hsrc=3',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/googleadwords.js b/extensions/amp-analytics/0.1/vendors/googleadwords.js
index ee193e88093d..c6b076f3c23f 100644
--- a/extensions/amp-analytics/0.1/vendors/googleadwords.js
+++ b/extensions/amp-analytics/0.1/vendors/googleadwords.js
@@ -19,27 +19,29 @@ export const GOOGLEADWORDS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'conversion_prefix': 'https://www.googleadservices.com/pagead/conversion/',
     'remarketing_prefix':
-        'https://googleads.g.doubleclick.net/pagead/viewthroughconversion/',
-    'common_params': '${googleConversionId}/?' +
-        'cv=amp2&' + // Increment when making changes.
-        'label=${googleConversionLabel}&' +
-        'random=${random}&' +
-        'url=${sourceUrl}&' +
-        'ref=${documentReferrer}&' +
-        'fst=${pageViewId}&' +
-        'num=${counter(googleadwords)}&' +
-        'fmt=3&' +
-        'async=1&' +
-        'u_h=${screenHeight}&u_w=${screenWidth}&' +
-        'u_ah=${availableScreenHeight}&u_aw=${availableScreenWidth}&' +
-        'u_cd=${screenColorDepth}&' +
-        'u_tz=${timezone}&' +
-        'tiba=${title}&' +
-        'guid=ON&script=0',
-    'conversion_params': 'value=${googleConversionValue}&' +
-        'currency_code=${googleConversionCurrency}&' +
-        'bg=${googleConversionColor}&' +
-        'hl=${googleConversionLanguage}',
+      'https://googleads.g.doubleclick.net/pagead/viewthroughconversion/',
+    'common_params':
+      '${googleConversionId}/?' +
+      'cv=amp2&' + // Increment when making changes.
+      'label=${googleConversionLabel}&' +
+      'random=${random}&' +
+      'url=${sourceUrl}&' +
+      'ref=${documentReferrer}&' +
+      'fst=${pageViewId}&' +
+      'num=${counter(googleadwords)}&' +
+      'fmt=3&' +
+      'async=1&' +
+      'u_h=${screenHeight}&u_w=${screenWidth}&' +
+      'u_ah=${availableScreenHeight}&u_aw=${availableScreenWidth}&' +
+      'u_cd=${screenColorDepth}&' +
+      'u_tz=${timezone}&' +
+      'tiba=${title}&' +
+      'guid=ON&script=0',
+    'conversion_params':
+      'value=${googleConversionValue}&' +
+      'currency_code=${googleConversionCurrency}&' +
+      'bg=${googleConversionColor}&' +
+      'hl=${googleConversionLanguage}',
     'conversion': '${conversion_prefix}${common_params}&${conversion_params}',
     'remarketing': '${remarketing_prefix}${common_params}',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/googleanalytics.js b/extensions/amp-analytics/0.1/vendors/googleanalytics.js
index 078d9697d94b..3fcfdffdd45d 100644
--- a/extensions/amp-analytics/0.1/vendors/googleanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/googleanalytics.js
@@ -25,59 +25,64 @@ export const GOOGLEANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://www.google-analytics.com',
-    'basePrefix': 'v=1&' +
-        '_v=a1&' +
-        'ds=${dataSource}&' +
-        '${anonymizeIP}&' +
-        '_s=${requestCount}&' +
-        'dt=${title}&' +
-        'sr=${screenWidth}x${screenHeight}&' +
-        '_utmht=${timestamp}&' +
-        'cid=${clientId}&' +
-        'tid=${account}&' +
-        'dl=${documentLocation}&' +
-        'dr=${externalReferrer}&' +
-        'sd=${screenColorDepth}&' +
-        'ul=${browserLanguage}&' +
-        'de=${documentCharset}',
-    'baseSuffix': '&a=${pageViewId}&' +
-        'z=${random}',
-    'pageview': '${host}/r/collect?${basePrefix}&' +
-        't=pageview&' +
-        'jid=${random}&' +
-        '_r=1' +
-        '${baseSuffix}',
-    'event': '${host}/collect?${basePrefix}&' +
-        't=event&' +
-        'jid=&' +
-        'ec=${eventCategory}&' +
-        'ea=${eventAction}&' +
-        'el=${eventLabel}&' +
-        'ev=${eventValue}' +
-        '${baseSuffix}',
-    'social': '${host}/collect?${basePrefix}&' +
-        't=social&' +
-        'jid=&' +
-        'sa=${socialAction}&' +
-        'sn=${socialNetwork}&' +
-        'st=${socialTarget}' +
-        '${baseSuffix}',
-    'timing': '${host}/collect?${basePrefix}&' +
-        't=${timingRequestType}&' +
-        'jid=&' +
-        'plt=${pageLoadTime}&' +
-        'dns=${domainLookupTime}&' +
-        'tcp=${tcpConnectTime}&' +
-        'rrt=${redirectTime}&' +
-        'srt=${serverResponseTime}&' +
-        'pdt=${pageDownloadTime}&' +
-        'clt=${contentLoadTime}&' +
-        'dit=${domInteractiveTime}' +
-        '${baseSuffix}',
-    'error': '${host}/collect?${basePrefix}&' +
-        't=exception&' +
-        'exd=${errorParam}' +
-        '${baseSuffix}',
+    'basePrefix':
+      'v=1&' +
+      '_v=a1&' +
+      'ds=${dataSource}&' +
+      '${anonymizeIP}&' +
+      '_s=${requestCount}&' +
+      'dt=${title}&' +
+      'sr=${screenWidth}x${screenHeight}&' +
+      '_utmht=${timestamp}&' +
+      'cid=${clientId}&' +
+      'tid=${account}&' +
+      'dl=${documentLocation}&' +
+      'dr=${externalReferrer}&' +
+      'sd=${screenColorDepth}&' +
+      'ul=${browserLanguage}&' +
+      'de=${documentCharset}',
+    'baseSuffix': '&a=${pageViewId}&z=${random}',
+    'pageview':
+      '${host}/r/collect?${basePrefix}&' +
+      't=pageview&' +
+      'jid=${random}&' +
+      '_r=1' +
+      '${baseSuffix}',
+    'event':
+      '${host}/collect?${basePrefix}&' +
+      't=event&' +
+      'jid=&' +
+      'ec=${eventCategory}&' +
+      'ea=${eventAction}&' +
+      'el=${eventLabel}&' +
+      'ev=${eventValue}' +
+      '${baseSuffix}',
+    'social':
+      '${host}/collect?${basePrefix}&' +
+      't=social&' +
+      'jid=&' +
+      'sa=${socialAction}&' +
+      'sn=${socialNetwork}&' +
+      'st=${socialTarget}' +
+      '${baseSuffix}',
+    'timing':
+      '${host}/collect?${basePrefix}&' +
+      't=${timingRequestType}&' +
+      'jid=&' +
+      'plt=${pageLoadTime}&' +
+      'dns=${domainLookupTime}&' +
+      'tcp=${tcpConnectTime}&' +
+      'rrt=${redirectTime}&' +
+      'srt=${serverResponseTime}&' +
+      'pdt=${pageDownloadTime}&' +
+      'clt=${contentLoadTime}&' +
+      'dit=${domInteractiveTime}' +
+      '${baseSuffix}',
+    'error':
+      '${host}/collect?${basePrefix}&' +
+      't=exception&' +
+      'exd=${errorParam}' +
+      '${baseSuffix}',
   },
   'triggers': {
     'performanceTiming': {
diff --git a/extensions/amp-analytics/0.1/vendors/gtag.js b/extensions/amp-analytics/0.1/vendors/gtag.js
index b5f9a65321f2..651609aa9be2 100644
--- a/extensions/amp-analytics/0.1/vendors/gtag.js
+++ b/extensions/amp-analytics/0.1/vendors/gtag.js
@@ -40,83 +40,78 @@ export const GTAG_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'uaHost': 'https://www.google-analytics.com',
     'uaBasePrefix':
-        'v=1&' +
-         '_v=a1&' +
-         'ds=${dataSource}&' +
-         '${anonymizeIP}&' +
-         '_s=${requestCount}&' +
-         'dt=${title}&' +
-         'sr=${screenWidth}x${screenHeight}&' +
-         'cid=${clientId}&' +
-         'tid=${trackingId}&' +
-         'dl=${sourceUrl}&' +
-         'dr=${externalReferrer}&' +
-         'sd=${screenColorDepth}&' +
-         'ul=${browserLanguage}&' +
-         'de=${documentCharset}',
-    'uaBaseSuffix':
-        '&a=${pageViewId}&' +
-         'z=${random}',
-    'uaPageviewCommon':
-         '&t=pageview&' +
-         'jid=${random}&' +
-         'gjid=${random}&' +
-         '_r=1',
+      'v=1&' +
+      '_v=a1&' +
+      'ds=${dataSource}&' +
+      '${anonymizeIP}&' +
+      '_s=${requestCount}&' +
+      'dt=${title}&' +
+      'sr=${screenWidth}x${screenHeight}&' +
+      'cid=${clientId}&' +
+      'tid=${trackingId}&' +
+      'dl=${sourceUrl}&' +
+      'dr=${externalReferrer}&' +
+      'sd=${screenColorDepth}&' +
+      'ul=${browserLanguage}&' +
+      'de=${documentCharset}',
+    'uaBaseSuffix': '&a=${pageViewId}&z=${random}',
+    'uaPageviewCommon': '&t=pageview&jid=${random}&gjid=${random}&_r=1',
     'uaPageview':
-        '${uaHost}/r/collect?${uaBasePrefix}' +
-         '${uaPageviewCommon}' +
-         '${uaBaseSuffix}',
+      '${uaHost}/r/collect?${uaBasePrefix}' +
+      '${uaPageviewCommon}' +
+      '${uaBaseSuffix}',
     'uaPageviewNpa':
-        '${uaHost}/collect?${uaBasePrefix}' +
-         '${uaPageviewCommon}' +
-         '${uaBaseSuffix}',
+      '${uaHost}/collect?${uaBasePrefix}' +
+      '${uaPageviewCommon}' +
+      '${uaBaseSuffix}',
     'uaEvent':
-        '${uaHost}/collect?${uaBasePrefix}&' +
-         't=event&' +
-         'jid=' +
-         '${uaBaseSuffix}',
+      '${uaHost}/collect?${uaBasePrefix}&' +
+      't=event&' +
+      'jid=' +
+      '${uaBaseSuffix}',
     'uaTiming':
-        '${uaHost}/collect?${uaBasePrefix}&' +
-         'jid=&' +
-         'plt=${pageLoadTime}&' +
-         'dns=${domainLookupTime}&' +
-         'tcp=${tcpConnectTime}&' +
-         'rrt=${redirectTime}&' +
-         'srt=${serverResponseTime}&' +
-         'pdt=${pageDownloadTime}&' +
-         'clt=${contentLoadTime}&' +
-         'dit=${domInteractiveTime}' +
-         '${uaBaseSuffix}',
+      '${uaHost}/collect?${uaBasePrefix}&' +
+      'jid=&' +
+      'plt=${pageLoadTime}&' +
+      'dns=${domainLookupTime}&' +
+      'tcp=${tcpConnectTime}&' +
+      'rrt=${redirectTime}&' +
+      'srt=${serverResponseTime}&' +
+      'pdt=${pageDownloadTime}&' +
+      'clt=${contentLoadTime}&' +
+      'dit=${domInteractiveTime}' +
+      '${uaBaseSuffix}',
     'uaError':
-        '${uaHost}/collect?${uaBasePrefix}&' +
-         't=exception&' +
-         'exd=${errorParam}' +
-         '${uaBaseSuffix}',
-    'awConversionPrefix':
-        'https://www.googleadservices.com/pagead/conversion/',
+      '${uaHost}/collect?${uaBasePrefix}&' +
+      't=exception&' +
+      'exd=${errorParam}' +
+      '${uaBaseSuffix}',
+    'awConversionPrefix': 'https://www.googleadservices.com/pagead/conversion/',
     'awRemarketingPrefix':
-        'https://googleads.g.doubleclick.net/pagead/viewthroughconversion/',
+      'https://googleads.g.doubleclick.net/pagead/viewthroughconversion/',
     'awCommonParams':
-        '${conversionId}/?' +
-         'cv=amp3&' + // Increment when making changes.
-         'label=${conversionLabel}&' +
-         'random=${random}&' +
-         'url=${sourceUrl}&' +
-         'ref=${documentReferrer}&' +
-         'fst=${pageViewId}&' +
-         'num=${counter(googleadwords)}&' +
-         'fmt=3&' +
-         'async=1&' +
-         'u_h=${screenHeight}&u_w=${screenWidth}&' +
-         'u_ah=${availableScreenHeight}&u_aw=${availableScreenWidth}&' +
-         'u_cd=${screenColorDepth}&' +
-         'u_tz=${timezone}&' +
-         'tiba=${title}&' +
-         'guid=ON&script=0',
+      '${conversionId}/?' +
+      'cv=amp3&' + // Increment when making changes.
+      'label=${conversionLabel}&' +
+      'random=${random}&' +
+      'url=${sourceUrl}&' +
+      'ref=${documentReferrer}&' +
+      'fst=${pageViewId}&' +
+      'num=${counter(googleadwords)}&' +
+      'fmt=3&' +
+      'async=1&' +
+      'u_h=${screenHeight}&u_w=${screenWidth}&' +
+      'u_ah=${availableScreenHeight}&u_aw=${availableScreenWidth}&' +
+      'u_cd=${screenColorDepth}&' +
+      'u_tz=${timezone}&' +
+      'tiba=${title}&' +
+      'guid=ON&script=0',
     'awConversion': '${awConversionPrefix}${awCommonParams}',
     'awRemarketing': '${awRemarketingPrefix}${awCommonParams}',
-    'flBase': 'https://ad.doubleclick.net/activity;src=${flSrc};type=${flType};cat=${flCat}',
-    'flDynamicBase': 'https://${flSrc}.fls.doubleclick.net/activityi;src=${flSrc};type=${flType};cat=${flCat}',
+    'flBase':
+      'https://ad.doubleclick.net/activity;src=${flSrc};type=${flType};cat=${flCat}',
+    'flDynamicBase':
+      'https://${flSrc}.fls.doubleclick.net/activityi;src=${flSrc};type=${flType};cat=${flCat}',
     'dnsBase': 'https://ad.doubleclick.net/ddm/clk/',
   },
   'transport': {
diff --git a/extensions/amp-analytics/0.1/vendors/ibeatanalytics.js b/extensions/amp-analytics/0.1/vendors/ibeatanalytics.js
index 778e8973f352..a760206169e6 100644
--- a/extensions/amp-analytics/0.1/vendors/ibeatanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/ibeatanalytics.js
@@ -18,29 +18,30 @@ export const IBEATANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://ibeat.indiatimes.com',
     'base': 'https://ibeat.indiatimes.com/iBeat/pageTrendlogAmp.html',
-    'pageview': '${base}?' +
-              '&h=${h}' +
-              '&d=${h}' +
-              '&url=${url}' +
-              '&k=${key}' +
-              '&ts=${time}' +
-              '&ch=${channel}' +
-              '&sid=${uid}' +
-              '&at=${agentType}' +
-              '&ref=${documentReferrer}' +
-              '&aid=${aid}' +
-              '&loc=1' +
-              '&ct=1' +
-              '&cat=${cat}' +
-              '&scat=${scat}' +
-              '&ac=1' +
-              '&tg=${tags}' +
-              '&ctids=${catIds}' +
-              '&pts=${pagePublishTime}' +
-              '&auth=${author}' +
-              '&pos=${position}' +
-              '&iBeatField=${ibeatFields}' +
-              '&cid=${clientId(MSCSAuthDetails)}',
+    'pageview':
+      '${base}?' +
+      '&h=${h}' +
+      '&d=${h}' +
+      '&url=${url}' +
+      '&k=${key}' +
+      '&ts=${time}' +
+      '&ch=${channel}' +
+      '&sid=${uid}' +
+      '&at=${agentType}' +
+      '&ref=${documentReferrer}' +
+      '&aid=${aid}' +
+      '&loc=1' +
+      '&ct=1' +
+      '&cat=${cat}' +
+      '&scat=${scat}' +
+      '&ac=1' +
+      '&tg=${tags}' +
+      '&ctids=${catIds}' +
+      '&pts=${pagePublishTime}' +
+      '&auth=${author}' +
+      '&pos=${position}' +
+      '&iBeatField=${ibeatFields}' +
+      '&cid=${clientId(MSCSAuthDetails)}',
   },
   'triggers': {
     'defaultPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/infonline.js b/extensions/amp-analytics/0.1/vendors/infonline.js
index 12aed4022f58..3819a7890393 100644
--- a/extensions/amp-analytics/0.1/vendors/infonline.js
+++ b/extensions/amp-analytics/0.1/vendors/infonline.js
@@ -21,7 +21,8 @@ export const INFONLINE_CONFIG = /** @type {!JsonObject} */ ({
   },
   'transport': {'beacon': false, 'xhrpost': false, 'image': true},
   'requests': {
-    'pageview': '${url}?st=${st}' +
+    'pageview':
+      '${url}?st=${st}' +
       '&sv=${sv}' +
       '&ap=${ap}' +
       '&co=${co}' +
diff --git a/extensions/amp-analytics/0.1/vendors/iplabel.js b/extensions/amp-analytics/0.1/vendors/iplabel.js
index fb718d348e5a..496a4d59f6e6 100644
--- a/extensions/amp-analytics/0.1/vendors/iplabel.js
+++ b/extensions/amp-analytics/0.1/vendors/iplabel.js
@@ -18,31 +18,32 @@ export const IPLABEL_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'collectorUrl': 'm.col.ip-label.net',
     'endpoint': 'https://${collectorUrl}/coll/',
-    'onload': '${endpoint}?' +
-    'T=${trackerId}&' +
-    'm=' +
-    '2502|${navTiming(navigationStart)}|' +
-    '2508|${navTiming(domainLookupStart)}|' +
-    '2509|${navTiming(domainLookupEnd)}|' +
-    '2510|${navTiming(connectStart)}|' +
-    '2512|${navTiming(connectEnd)}|' +
-    '2514|${navTiming(responseStart)}|' +
-    '2515|${navTiming(responseEnd)}|' +
-    '2517|${navTiming(domInteractive)}|' +
-    '2520|${navTiming(loadEventStart)}' +
-    '&ts=${timestamp}' +
-    '&ua=${userAgent}' +
-    '&d=${ipldim}' +
-    '&i=${clientip}' +
-    '&d[1]=${customdim}' +
-    '&d[2]=${business}' +
-    '&d[3]=${abtesting}' +
-    '&d[4]=${infrastructure}' +
-    '&d[5]=${customer}' +
-    '&u=${urlgroup}' +
-    '&w=${availableScreenWidth}&h=${availableScreenHeight}' +
-    '&r=${documentReferrer}' +
-    '&l=${browserLanguage}',
+    'onload':
+      '${endpoint}?' +
+      'T=${trackerId}&' +
+      'm=' +
+      '2502|${navTiming(navigationStart)}|' +
+      '2508|${navTiming(domainLookupStart)}|' +
+      '2509|${navTiming(domainLookupEnd)}|' +
+      '2510|${navTiming(connectStart)}|' +
+      '2512|${navTiming(connectEnd)}|' +
+      '2514|${navTiming(responseStart)}|' +
+      '2515|${navTiming(responseEnd)}|' +
+      '2517|${navTiming(domInteractive)}|' +
+      '2520|${navTiming(loadEventStart)}' +
+      '&ts=${timestamp}' +
+      '&ua=${userAgent}' +
+      '&d=${ipldim}' +
+      '&i=${clientip}' +
+      '&d[1]=${customdim}' +
+      '&d[2]=${business}' +
+      '&d[3]=${abtesting}' +
+      '&d[4]=${infrastructure}' +
+      '&d[5]=${customer}' +
+      '&u=${urlgroup}' +
+      '&w=${availableScreenWidth}&h=${availableScreenHeight}' +
+      '&r=${documentReferrer}' +
+      '&l=${browserLanguage}',
   },
   'triggers': {
     'trackPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/krux.js b/extensions/amp-analytics/0.1/vendors/krux.js
index 08a412375d50..b5f4733a34d6 100644
--- a/extensions/amp-analytics/0.1/vendors/krux.js
+++ b/extensions/amp-analytics/0.1/vendors/krux.js
@@ -17,7 +17,8 @@
 export const KRUX_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'beaconHost': 'https://beacon.krxd.net',
-    'timing': 't_navigation_type=0&' +
+    'timing':
+      't_navigation_type=0&' +
       't_dns=${domainLookupTime}&' +
       't_tcp=${tcpConnectTime}&' +
       't_http_request=${serverResponseTime}&' +
@@ -25,7 +26,8 @@ export const KRUX_CONFIG = /** @type {!JsonObject} */ ({
       't_content_ready=${contentLoadTime}&' +
       't_window_load=${pageLoadTime}&' +
       't_redirect=${redirectTime}',
-    'common': 'source=amp&' +
+    'common':
+      'source=amp&' +
       'confid=${confid}&' +
       '_kpid=${pubid}&' +
       '_kcp_s=${site}&' +
diff --git a/extensions/amp-analytics/0.1/vendors/linkpulse.js b/extensions/amp-analytics/0.1/vendors/linkpulse.js
index 7ff88d0407b5..63071f87c508 100644
--- a/extensions/amp-analytics/0.1/vendors/linkpulse.js
+++ b/extensions/amp-analytics/0.1/vendors/linkpulse.js
@@ -27,35 +27,38 @@ export const LINKPULSE_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'base': 'https://${host}',
-    'pageview': '${base}/p?i=${id}' +
-              '&r=${documentReferrer}' +
-              '&p=${pageUrl}' +
-              '&s=${section}' +
-              '&t=${type}' +
-              '&c=${channel}' +
-              '&mt=${title}' +
-              '&_t=amp' +
-              '&_r=${random}',
-    'pageload': '${base}/pl?i=${id}' +
-              '&ct=${domInteractiveTime}' +
-              '&rt=${pageDownloadTime}' +
-              '&pt=${pageLoadTime}' +
-              '&p=${pageUrl}' +
-              '&c=${channel}' +
-              '&t=${type}' +
-              '&s=${section}' +
-              '&_t=amp' +
-              '&_r=${random}',
-    'ping': '${base}/u?i=${id}' +
-              '&u=${clientId(_lp4_u)}' +
-              '&p=${pageUrl}' +
-              '&uActive=true' +
-              '&isPing=yes' +
-              '&c=${channel}' +
-              '&t=${type}' +
-              '&s=${section}' +
-              '&_t=amp' +
-              '&_r=${random}',
+    'pageview':
+      '${base}/p?i=${id}' +
+      '&r=${documentReferrer}' +
+      '&p=${pageUrl}' +
+      '&s=${section}' +
+      '&t=${type}' +
+      '&c=${channel}' +
+      '&mt=${title}' +
+      '&_t=amp' +
+      '&_r=${random}',
+    'pageload':
+      '${base}/pl?i=${id}' +
+      '&ct=${domInteractiveTime}' +
+      '&rt=${pageDownloadTime}' +
+      '&pt=${pageLoadTime}' +
+      '&p=${pageUrl}' +
+      '&c=${channel}' +
+      '&t=${type}' +
+      '&s=${section}' +
+      '&_t=amp' +
+      '&_r=${random}',
+    'ping':
+      '${base}/u?i=${id}' +
+      '&u=${clientId(_lp4_u)}' +
+      '&p=${pageUrl}' +
+      '&uActive=true' +
+      '&isPing=yes' +
+      '&c=${channel}' +
+      '&t=${type}' +
+      '&s=${section}' +
+      '&_t=amp' +
+      '&_r=${random}',
   },
   'triggers': {
     'pageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/marinsoftware.js b/extensions/amp-analytics/0.1/vendors/marinsoftware.js
index 1e6cdbfab22f..214fb8b7c926 100644
--- a/extensions/amp-analytics/0.1/vendors/marinsoftware.js
+++ b/extensions/amp-analytics/0.1/vendors/marinsoftware.js
@@ -17,26 +17,26 @@
 export const MARINSOFTWARE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'base': 'https://tracker.marinsm.com/tp',
-    'baseParams': 'cid=${trackerId}' +
+    'baseParams':
+      'cid=${trackerId}' +
       '&ampVersion=${ampVersion}' +
       '&ds=AMP' +
       '&ref=${externalReferrer}' +
       '&page=${sourceUrl}' +
       '&uuid=${clientId(marin_amp_id)}' +
       '&rnd=${random}',
-    'pageView': '${base}?' +
-      '${baseParams}' +
-      '&act=1',
-    'conversion': '${base}?' +
+    'pageView': '${base}?${baseParams}&act=1',
+    'conversion':
+      '${base}?' +
       '${baseParams}' +
       '&act=2' +
       '&trans=UTM:I' +
-        '|${orderId}' +
-        '|${marinConversionType}' +
-        '|${productName}' +
-        '|${category}' +
-        '|${price}' +
-        '|${quantity}',
+      '|${orderId}' +
+      '|${marinConversionType}' +
+      '|${productName}' +
+      '|${category}' +
+      '|${price}' +
+      '|${quantity}',
   },
   'transport': {
     'beacon': true,
diff --git a/extensions/amp-analytics/0.1/vendors/mediametrie.js b/extensions/amp-analytics/0.1/vendors/mediametrie.js
index 89b4ec89ff2d..c1ab050e2d68 100644
--- a/extensions/amp-analytics/0.1/vendors/mediametrie.js
+++ b/extensions/amp-analytics/0.1/vendors/mediametrie.js
@@ -17,7 +17,8 @@
 export const MEDIAMETRIE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://prof.estat.com/m/web',
-    'pageview': '${host}/${serial}?' +
+    'pageview':
+      '${host}/${serial}?' +
       'c=${level1}' +
       '&dom=${ampdocUrl}' +
       '&enc=${documentCharset}' +
diff --git a/extensions/amp-analytics/0.1/vendors/mediarithmics.js b/extensions/amp-analytics/0.1/vendors/mediarithmics.js
index 2eba2e209a9a..5c61b8e36fa3 100644
--- a/extensions/amp-analytics/0.1/vendors/mediarithmics.js
+++ b/extensions/amp-analytics/0.1/vendors/mediarithmics.js
@@ -23,7 +23,8 @@ export const MEDIARITHMICS_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://${domain}',
-    'pageview': '${host}/v1/visits/pixel?' +
+    'pageview':
+      '${host}/v1/visits/pixel?' +
       '$site_token=${site_token}' +
       '&$url=${url}' +
       '&$ev=${event_name}' +
diff --git a/extensions/amp-analytics/0.1/vendors/mediator.js b/extensions/amp-analytics/0.1/vendors/mediator.js
index 66f8a4e44688..c56c07455134 100644
--- a/extensions/amp-analytics/0.1/vendors/mediator.js
+++ b/extensions/amp-analytics/0.1/vendors/mediator.js
@@ -18,8 +18,7 @@ export const MEDIATOR_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': '//collector.mediator.media/script/${mediator_id}/amp/',
     'renderstart': '${host}init/?url=${canonicalUrl}',
-    'prefix': '${host}register/?url=${canonicalUrl}' +
-              '&ref=${documentReferrer}&',
+    'prefix': '${host}register/?url=${canonicalUrl}&ref=${documentReferrer}&',
     'suffix': 'vh=${viewportHeight}&sh=${scrollHeight}&st=${scrollTop}',
     'pageview': '${prefix}e=v',
     'timer': '${prefix}e=t&${suffix}',
@@ -43,36 +42,28 @@ export const MEDIATOR_CONFIG = /** @type {!JsonObject} */ ({
     'scrollPing0': {
       'on': 'scroll',
       'scrollSpec': {
-        'verticalBoundaries': [
-          5,
-        ],
+        'verticalBoundaries': [5],
       },
       'request': 's0',
     },
     'scrollPing1': {
       'on': 'scroll',
       'scrollSpec': {
-        'verticalBoundaries': [
-          35,
-        ],
+        'verticalBoundaries': [35],
       },
       'request': 's1',
     },
     'scrollPing2': {
       'on': 'scroll',
       'scrollSpec': {
-        'verticalBoundaries': [
-          65,
-        ],
+        'verticalBoundaries': [65],
       },
       'request': 's2',
     },
     'scrollPing3': {
       'on': 'scroll',
       'scrollSpec': {
-        'verticalBoundaries': [
-          95,
-        ],
+        'verticalBoundaries': [95],
       },
       'request': 's3',
     },
diff --git a/extensions/amp-analytics/0.1/vendors/metrika.js b/extensions/amp-analytics/0.1/vendors/metrika.js
index 9f86735439f6..c02dffd57364 100644
--- a/extensions/amp-analytics/0.1/vendors/metrika.js
+++ b/extensions/amp-analytics/0.1/vendors/metrika.js
@@ -18,16 +18,18 @@ export const METRIKA_CONFIG = /** @type {!JsonObject} */ ({
   'transport': {'beacon': true, 'xhrpost': true, 'image': false},
   'requests': {
     'pageview': '${_watch}?browser-info=${_brInfo}&${_siteInfo}&${_suffix}',
-    'notBounce': '${_watch}?browser-info=ar%3A1%3Anb%3A1%3A${_brInfo}' +
-      '&${_suffix}',
+    'notBounce':
+      '${_watch}?browser-info=ar%3A1%3Anb%3A1%3A${_brInfo}&${_suffix}',
     'externalLink': '${_watch}?browser-info=ln%3A1%3A${_brInfo}&${_suffix}',
-    'reachGoal': '${_watch}?browser-info=ar%3A1%3A${_brInfo}&${_siteInfo}' +
+    'reachGoal':
+      '${_watch}?browser-info=ar%3A1%3A${_brInfo}&${_siteInfo}' +
       '&${_goalSuffix}',
     '_domain': 'https://mc.yandex.ru',
     '_watch': '${_domain}/watch/${counterId}',
     '_suffix': 'page-url=${sourceUrl}&page-ref=${documentReferrer}',
-    '_goalSuffix': 'page-url=goal%3A%2F%2F${sourceHost}%2F${goalId}' +
-    '&page-ref=${sourceUrl}',
+    '_goalSuffix':
+      'page-url=goal%3A%2F%2F${sourceHost}%2F${goalId}' +
+      '&page-ref=${sourceUrl}',
     '_techInfo': [
       'amp%3A1%3Az%3A${timezone}%3Ai%3A${timestamp}%3Arn%3A${random}',
       'la%3A${browserLanguage}%3Aen%3A${documentCharset}',
diff --git a/extensions/amp-analytics/0.1/vendors/moat.js b/extensions/amp-analytics/0.1/vendors/moat.js
index 72ffbf34bc1c..b2b3e0bc91cf 100644
--- a/extensions/amp-analytics/0.1/vendors/moat.js
+++ b/extensions/amp-analytics/0.1/vendors/moat.js
@@ -19,95 +19,105 @@ export const MOAT_CONFIG = /** @type {!JsonObject} */ ({
     'element': ':root',
   },
   'requests': {
-    'load': JSON.stringify(/** @type {!JsonObject} */ ({
-      'type': 'load',
-      'pcode': '${pcode}',
-      'l0t': '${l0t}',
-      'acctType': '${acctType}',
-      'adType': '${adType}',
-      'qs': '${qs}',
-      'element': {
-        'src': '${htmlAttr(img,src,width)}',
-        'viewer': '${viewer}',
-      },
-      'document': {
-        'AMPDocumentHostname': '${ampdocHostname}',
-        'AMPDocumentURL': '${ampdocUrl}',
-        'canonicalHost': '${canonicalHost}',
-        'canonicalHostname': '${canonicalHostname}',
-        'canonicalPath': '${canonicalPath}',
-        'canonicalURL': '${canonicalUrl}',
-        'documentCharset': '${documentCharset}',
-        'documentReferrer': '${documentReferrer}',
-        'externalReferrer': '${externalReferrer}',
-        'sourceURL': '${sourceUrl}',
-        'sourceHost': '${sourceHost}',
-        'sourceHostname': '${sourceHostname}',
-        'sourcePath': '${sourcePath}',
-        'title': '${title}',
-        'viewer': '${viewer}',
-      },
-      'device': {
-        'availableScreenHeight': '${availableScreenHeight}',
-        'availableScreenWidth': '${availableScreenWidth}',
-        'browserLanguage': '${browserLanguage}',
-        'screenColorDepth': '${screenColorDepth}',
-        'screenHeight': '${screenHeight}',
-        'screenWidth': '${screenWidth}',
-        'scrollHeight': '${scrollHeight}',
-        'scrollWidth': '${scrollWidth}',
-        'scrollLeft': '${scrollLeft}',
-        'scrollTop': '${scrollTop}',
-        'timezone': '${timezone}',
-        'userAgent': '${userAgent}',
+    'load': JSON.stringify(
+      /** @type {!JsonObject} */ ({
+        'type': 'load',
+        'pcode': '${pcode}',
+        'l0t': '${l0t}',
+        'acctType': '${acctType}',
+        'adType': '${adType}',
+        'qs': '${qs}',
+        'element': {
+          'src': '${htmlAttr(img,src,width)}',
+          'viewer': '${viewer}',
+        },
+        'document': {
+          'AMPDocumentHostname': '${ampdocHostname}',
+          'AMPDocumentURL': '${ampdocUrl}',
+          'canonicalHost': '${canonicalHost}',
+          'canonicalHostname': '${canonicalHostname}',
+          'canonicalPath': '${canonicalPath}',
+          'canonicalURL': '${canonicalUrl}',
+          'documentCharset': '${documentCharset}',
+          'documentReferrer': '${documentReferrer}',
+          'externalReferrer': '${externalReferrer}',
+          'sourceURL': '${sourceUrl}',
+          'sourceHost': '${sourceHost}',
+          'sourceHostname': '${sourceHostname}',
+          'sourcePath': '${sourcePath}',
+          'title': '${title}',
+          'viewer': '${viewer}',
+        },
+        'device': {
+          'availableScreenHeight': '${availableScreenHeight}',
+          'availableScreenWidth': '${availableScreenWidth}',
+          'browserLanguage': '${browserLanguage}',
+          'screenColorDepth': '${screenColorDepth}',
+          'screenHeight': '${screenHeight}',
+          'screenWidth': '${screenWidth}',
+          'scrollHeight': '${scrollHeight}',
+          'scrollWidth': '${scrollWidth}',
+          'scrollLeft': '${scrollLeft}',
+          'scrollTop': '${scrollTop}',
+          'timezone': '${timezone}',
+          'userAgent': '${userAgent}',
+          'viewportHeight': '${viewportHeight}',
+          'viewportWidth': '${viewportWidth}',
+        },
+        'requestCount': '${requestCount}',
+        'timeStamp': '${timestamp}',
+      })
+    ),
+    'unload': JSON.stringify(
+      /** @type {!JsonObject} */ ({
+        'type': 'unload',
+        'pcode': '${pcode}',
+        'l0t': '${l0t}',
+        'requestCount': '${requestCount}',
+        'timeStamp': '${timestamp}',
+      })
+    ),
+    'click': JSON.stringify(
+      /** @type {!JsonObject} */ ({
+        'type': 'click',
+        'pcode': '${pcode}',
+        'l0t': '${l0t}',
+        'requestCount': '${requestCount}',
+        'timeStamp': '${timestamp}',
+      })
+    ),
+    'viewability': JSON.stringify(
+      /** @type {!JsonObject} */ ({
+        'type': 'viewability',
+        'pcode': '${pcode}',
+        'l0t': '${l0t}',
+        'backgroundState': '${backgroundState}',
+        'intersectionRect': '${intersectionRect}',
+        'intersectionRatio': '${intersectionRatio}',
+        'maxVisiblePercentage': '${maxVisiblePercentage}',
+        'minVisiblePercentage': '${minVisiblePercentage}',
+        'x': '${elementX}',
+        'y': '${elementY}',
+        'height': '${elementHeight}',
+        'width': '${elementWidth}',
         'viewportHeight': '${viewportHeight}',
         'viewportWidth': '${viewportWidth}',
-      },
-      'requestCount': '${requestCount}',
-      'timeStamp': '${timestamp}',
-    })),
-    'unload': JSON.stringify(/** @type {!JsonObject} */ ({
-      'type': 'unload',
-      'pcode': '${pcode}',
-      'l0t': '${l0t}',
-      'requestCount': '${requestCount}',
-      'timeStamp': '${timestamp}',
-    })),
-    'click': JSON.stringify(/** @type {!JsonObject} */ ({
-      'type': 'click',
-      'pcode': '${pcode}',
-      'l0t': '${l0t}',
-      'requestCount': '${requestCount}',
-      'timeStamp': '${timestamp}',
-    })),
-    'viewability': JSON.stringify(/** @type {!JsonObject} */ ({
-      'type': 'viewability',
-      'pcode': '${pcode}',
-      'l0t': '${l0t}',
-      'backgroundState': '${backgroundState}',
-      'intersectionRect': '${intersectionRect}',
-      'intersectionRatio': '${intersectionRatio}',
-      'maxVisiblePercentage': '${maxVisiblePercentage}',
-      'minVisiblePercentage': '${minVisiblePercentage}',
-      'x': '${elementX}',
-      'y': '${elementY}',
-      'height': '${elementHeight}',
-      'width': '${elementWidth}',
-      'viewportHeight': '${viewportHeight}',
-      'viewportWidth': '${viewportWidth}',
-      'opacity': '${opacity}',
-      'timeStamp': '${timestamp}',
-      'requestCount': '${requestCount}',
-    })),
-    'iframe': JSON.stringify(/** @type {!JsonObject} */ ({
-      'type': 'iframe',
-      'pcode': '${pcode}',
-      'height': '${elementHeight}',
-      'width': '${elementWidth}',
-      'x': '${elementX}',
-      'y': '${elementY}',
-      'requestCount': '${requestCount}',
-    })),
+        'opacity': '${opacity}',
+        'timeStamp': '${timestamp}',
+        'requestCount': '${requestCount}',
+      })
+    ),
+    'iframe': JSON.stringify(
+      /** @type {!JsonObject} */ ({
+        'type': 'iframe',
+        'pcode': '${pcode}',
+        'height': '${elementHeight}',
+        'width': '${elementWidth}',
+        'x': '${elementX}',
+        'y': '${elementY}',
+        'requestCount': '${requestCount}',
+      })
+    ),
   },
   'triggers': {
     'load': {
@@ -131,10 +141,28 @@ export const MOAT_CONFIG = /** @type {!JsonObject} */ ({
       'visibilitySpec': {
         'repeat': true,
         'visiblePercentageThresholds': [
-          [0,0],[0,5],[5,10],[10,15],[15,20],[20,25],
-          [25,30],[30,35],[35,40],[40,45],[45,50],
-          [50,55],[55,60],[60,65],[65,70],[70,75],
-          [75,80],[80,85],[85,90],[90,95],[95,100],[100,100],
+          [0, 0],
+          [0, 5],
+          [5, 10],
+          [10, 15],
+          [15, 20],
+          [20, 25],
+          [25, 30],
+          [30, 35],
+          [35, 40],
+          [40, 45],
+          [45, 50],
+          [50, 55],
+          [55, 60],
+          [60, 65],
+          [65, 70],
+          [70, 75],
+          [75, 80],
+          [80, 85],
+          [85, 90],
+          [90, 95],
+          [95, 100],
+          [100, 100],
         ],
       },
     },
@@ -144,7 +172,7 @@ export const MOAT_CONFIG = /** @type {!JsonObject} */ ({
       'request': 'iframe',
       'visibilitySpec': {
         'repeat': true,
-        'visiblePercentageThresholds': [[0,0]],
+        'visiblePercentageThresholds': [[0, 0]],
       },
     },
   },
diff --git a/extensions/amp-analytics/0.1/vendors/mobify.js b/extensions/amp-analytics/0.1/vendors/mobify.js
index b417546f6fa8..717bc272d08d 100644
--- a/extensions/amp-analytics/0.1/vendors/mobify.js
+++ b/extensions/amp-analytics/0.1/vendors/mobify.js
@@ -31,18 +31,22 @@ export const MOBIFY_CONFIG = /** @type {!JsonObject} */ ({
       '%22referrer%22%3a%22${documentReferrer}%22',
       '%22templateName%22%3a%22${templateName}%22',
     ].join('%2c'),
-    '_basePrefix': '${_host}/s.gif?' +
+    '_basePrefix':
+      '${_host}/s.gif?' +
       'slug=${projectSlug}&' +
       'timestamp_local=${timestamp}&' +
       'channel=web&' +
       'dimensions=%7b${_dimensions}%7d',
-    'ampstart': '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
+    'ampstart':
+      '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
       '%22action%22%3a%22ampStart%22%2c%22value%22' +
       '%3a${navTiming(navigationStart,domLoading)}%7d',
     'pageview': '${_basePrefix}&data=%7b%22action%22%3a%22pageview%22%7d',
-    'pageload': '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
+    'pageload':
+      '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
       '%22action%22%3a%22load%22%2c%22value%22%3a${pageLoadTime}%7d',
-    'pagedcl': '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
+    'pagedcl':
+      '${_basePrefix}&data=%7b%22category%22%3a%22timing%22%2c' +
       '%22action%22%3a%22DOMContentLoaded%22%2c%22value%22' +
       '%3a${contentLoadTime}%7d',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/mparticle.js b/extensions/amp-analytics/0.1/vendors/mparticle.js
index 6ffe57363a53..5ad33f93ba51 100644
--- a/extensions/amp-analytics/0.1/vendors/mparticle.js
+++ b/extensions/amp-analytics/0.1/vendors/mparticle.js
@@ -23,31 +23,34 @@ export const MPARTICLE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://pixels.mparticle.com',
     'endpointPath': '/v1/${apiKey}/Pixel',
-    'baseParams': 'et=${eventType}&' +
-        'amp_id=${amp_clientId}&' +
-        'attrs_k=${eventAttributes_Keys}&' +
-        'attrs_v=${eventAttributes_Values}&' +
-        'ua_k=${userAttributes_Keys}&' +
-        'ua_v=${userAttributes_Values}&' +
-        'ui_t=${userIdentities_Types}&' +
-        'ui_v=${userIdentities_Values}&' +
-        'flags_k=${customFlags_Keys}&' +
-        'flags_v=${customFlags_Values}&' +
-        'ct=${timestamp}&' +
-        'dbg=${debug}&' +
-        'lc=${location}&' +
-        'av=${appVersion}',
-    'pageview': '${host}${endpointPath}?' +
-        'dt=ScreenView&' +
-        'n=${pageName}&' +
-        'hn=${ampdocUrl}&' +
-        'ttl=${title}&' +
-        'path=${canonicalPath}&' +
-        '${baseParams}',
-    'event': '${host}${endpointPath}?' +
-        'dt=AppEvent&' +
-        'n=${eventName}&' +
-        '${baseParams}',
+    'baseParams':
+      'et=${eventType}&' +
+      'amp_id=${amp_clientId}&' +
+      'attrs_k=${eventAttributes_Keys}&' +
+      'attrs_v=${eventAttributes_Values}&' +
+      'ua_k=${userAttributes_Keys}&' +
+      'ua_v=${userAttributes_Values}&' +
+      'ui_t=${userIdentities_Types}&' +
+      'ui_v=${userIdentities_Values}&' +
+      'flags_k=${customFlags_Keys}&' +
+      'flags_v=${customFlags_Values}&' +
+      'ct=${timestamp}&' +
+      'dbg=${debug}&' +
+      'lc=${location}&' +
+      'av=${appVersion}',
+    'pageview':
+      '${host}${endpointPath}?' +
+      'dt=ScreenView&' +
+      'n=${pageName}&' +
+      'hn=${ampdocUrl}&' +
+      'ttl=${title}&' +
+      'path=${canonicalPath}&' +
+      '${baseParams}',
+    'event':
+      '${host}${endpointPath}?' +
+      'dt=AppEvent&' +
+      'n=${eventName}&' +
+      '${baseParams}',
   },
   'transport': {
     'beacon': false,
diff --git a/extensions/amp-analytics/0.1/vendors/mpulse.js b/extensions/amp-analytics/0.1/vendors/mpulse.js
index c327613b2072..8dfe7bcae27a 100644
--- a/extensions/amp-analytics/0.1/vendors/mpulse.js
+++ b/extensions/amp-analytics/0.1/vendors/mpulse.js
@@ -16,7 +16,8 @@
 
 export const MPULSE_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
-    'onvisible': 'https://${beacon_url}?' +
+    'onvisible':
+      'https://${beacon_url}?' +
       'h.d=${h.d}' +
       '&h.key=${h.key}' +
       '&h.t=${h.t}' +
diff --git a/extensions/amp-analytics/0.1/vendors/navegg.js b/extensions/amp-analytics/0.1/vendors/navegg.js
index 9cdea202e32f..f2fa45e83501 100644
--- a/extensions/amp-analytics/0.1/vendors/navegg.js
+++ b/extensions/amp-analytics/0.1/vendors/navegg.js
@@ -18,13 +18,13 @@ export const NAVEGG_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'pageview':
       'https://amp.navdmp.com/amp?' +
-        'aid=${clientId(navegg_id)}&' +
-        'url=${canonicalUrl}&' +
-        'ref=${documentReferrer}&' +
-        'tit=${title}&' +
-        'lan=${browserLanguage}' +
-        '&acc=${account}&' +
-        'v=7',
+      'aid=${clientId(navegg_id)}&' +
+      'url=${canonicalUrl}&' +
+      'ref=${documentReferrer}&' +
+      'tit=${title}&' +
+      'lan=${browserLanguage}' +
+      '&acc=${account}&' +
+      'v=7',
   },
   'triggers': {
     'trackpageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/newrelic.js b/extensions/amp-analytics/0.1/vendors/newrelic.js
index 2d7a7839d3bb..ef879f0f0666 100644
--- a/extensions/amp-analytics/0.1/vendors/newrelic.js
+++ b/extensions/amp-analytics/0.1/vendors/newrelic.js
@@ -16,12 +16,13 @@
 
 export const NEWRELIC_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
-    'pageview': 'https://${beacon}/amp?appId=${appId}' +
+    'pageview':
+      'https://${beacon}/amp?appId=${appId}' +
       '&licenseKey=${licenseKey}' +
       '&ampUrl=${ampdocUrl}' +
       '&canonicalUrl=${canonicalUrl}' +
       '&timeToDomContentLoadedEventEnd=' +
-        '${navTiming(domContentLoadedEventEnd)}' +
+      '${navTiming(domContentLoadedEventEnd)}' +
       '&timeToDomInteractive=${navTiming(domInteractive)}' +
       '&timeToDomComplete=${navTiming(domComplete)}' +
       '&timeToDomLoading=${navTiming(domLoading)}' +
diff --git a/extensions/amp-analytics/0.1/vendors/nielsen.js b/extensions/amp-analytics/0.1/vendors/nielsen.js
index 6596f6d09a26..ed886a95386e 100644
--- a/extensions/amp-analytics/0.1/vendors/nielsen.js
+++ b/extensions/amp-analytics/0.1/vendors/nielsen.js
@@ -20,8 +20,10 @@ export const NIELSEN_CONFIG = /** @type {!JsonObject} */ ({
     'prefix': '',
   },
   'requests': {
-    'session': 'https://${prefix}uaid-linkage.imrworldwide.com/cgi-bin/gn?prd=session&c13=asid,P${apid}&sessionId=${sessionId}_${pageViewId}&pingtype=4&enc=false&c61=createtm,${timestamp}&rnd=${random}',
-    'cloudapi': 'https://${prefix}cloudapi.imrworldwide.com/nmapi/v2/${apid}/${sessionId}_${pageViewId}/a?b=%7B%22devInfo%22%3A%7B%22devId%22%3A%22${sessionId}_${pageViewId}%22%2C%22apn%22%3A%22${apn}%22%2C%22apv%22%3A%22${apv}%22%2C%22apid%22%3A%22${apid}%22%7D%2C%22metadata%22%3A%7B%22static%22%3A%7B%22type%22%3A%22static%22%2C%22section%22%3A%22${section}%22%2C%22assetid%22%3A%22${pageViewId}%22%2C%22segA%22%3A%22${segA}%22%2C%22segB%22%3A%22${segB}%22%2C%22segC%22%3A%22${segC}%22%2C%22adModel%22%3A%220%22%2C%22dataSrc%22%3A%22cms%22%7D%2C%22content%22%3A%7B%7D%2C%22ad%22%3A%7B%7D%7D%2C%22event%22%3A%22playhead%22%2C%22position%22%3A%22${timestamp}%22%2C%22data%22%3A%7B%22hidden%22%3A%22${backgroundState}%22%2C%22blur%22%3A%22${backgroundState}%22%2C%22position%22%3A%22${timestamp}%22%7D%2C%22type%22%3A%22static%22%2C%22utc%22%3A%22${timestamp}%22%2C%22index%22%3A%22${requestCount}%22%7D',
+    'session':
+      'https://${prefix}uaid-linkage.imrworldwide.com/cgi-bin/gn?prd=session&c13=asid,P${apid}&sessionId=${sessionId}_${pageViewId}&pingtype=4&enc=false&c61=createtm,${timestamp}&rnd=${random}',
+    'cloudapi':
+      'https://${prefix}cloudapi.imrworldwide.com/nmapi/v2/${apid}/${sessionId}_${pageViewId}/a?b=%7B%22devInfo%22%3A%7B%22devId%22%3A%22${sessionId}_${pageViewId}%22%2C%22apn%22%3A%22${apn}%22%2C%22apv%22%3A%22${apv}%22%2C%22apid%22%3A%22${apid}%22%7D%2C%22metadata%22%3A%7B%22static%22%3A%7B%22type%22%3A%22static%22%2C%22section%22%3A%22${section}%22%2C%22assetid%22%3A%22${pageViewId}%22%2C%22segA%22%3A%22${segA}%22%2C%22segB%22%3A%22${segB}%22%2C%22segC%22%3A%22${segC}%22%2C%22adModel%22%3A%220%22%2C%22dataSrc%22%3A%22cms%22%7D%2C%22content%22%3A%7B%7D%2C%22ad%22%3A%7B%7D%7D%2C%22event%22%3A%22playhead%22%2C%22position%22%3A%22${timestamp}%22%2C%22data%22%3A%7B%22hidden%22%3A%22${backgroundState}%22%2C%22blur%22%3A%22${backgroundState}%22%2C%22position%22%3A%22${timestamp}%22%7D%2C%22type%22%3A%22static%22%2C%22utc%22%3A%22${timestamp}%22%2C%22index%22%3A%22${requestCount}%22%7D',
   },
   'triggers': {
     'visible': {
diff --git a/extensions/amp-analytics/0.1/vendors/oewa.js b/extensions/amp-analytics/0.1/vendors/oewa.js
index ddb5233c701a..d4e0b9c032d6 100644
--- a/extensions/amp-analytics/0.1/vendors/oewa.js
+++ b/extensions/amp-analytics/0.1/vendors/oewa.js
@@ -17,7 +17,8 @@
 export const OEWA_CONFIG = /** @type {!JsonObject} */ ({
   'transport': {'beacon': false, 'xhrpost': false, 'image': true},
   'requests': {
-    'pageview': '${url}?s=${s}' +
+    'pageview':
+      '${url}?s=${s}' +
       '&amp=1' +
       '&cp=${cp}' +
       '&host=${canonicalHost}' +
diff --git a/extensions/amp-analytics/0.1/vendors/oewadirect.js b/extensions/amp-analytics/0.1/vendors/oewadirect.js
index 1f03e1d139f5..fa8e8596175b 100644
--- a/extensions/amp-analytics/0.1/vendors/oewadirect.js
+++ b/extensions/amp-analytics/0.1/vendors/oewadirect.js
@@ -17,7 +17,8 @@
 export const OEWADIRECT_CONFIG = /** @type {!JsonObject} */ ({
   'transport': {'beacon': false, 'xhrpost': false, 'image': true},
   'requests': {
-    'pageview': 'https://${s}.oewabox.at/j0=,,,r=${canonicalUrl};+,amp=1+cp=${cp}+ssl=1+hn=${canonicalHost};;;?lt=${pageViewId}&x=${screenWidth}x${screenHeight}x24&c=CLIENT_ID(oewa)',
+    'pageview':
+      'https://${s}.oewabox.at/j0=,,,r=${canonicalUrl};+,amp=1+cp=${cp}+ssl=1+hn=${canonicalHost};;;?lt=${pageViewId}&x=${screenWidth}x${screenHeight}x24&c=CLIENT_ID(oewa)',
   },
   'triggers': {
     'pageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/parsely.js b/extensions/amp-analytics/0.1/vendors/parsely.js
index b4c0967f93a0..8ac942be4fbe 100644
--- a/extensions/amp-analytics/0.1/vendors/parsely.js
+++ b/extensions/amp-analytics/0.1/vendors/parsely.js
@@ -17,21 +17,24 @@
 export const PARSELY_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://srv.pixel.parsely.com',
-    'basePrefix': '${host}/plogger/?' +
+    'basePrefix':
+      '${host}/plogger/?' +
       'rand=${timestamp}&' +
       'idsite=${apikey}&' +
       'url=${ampdocUrl}&' +
       'urlref=${documentReferrer}&' +
       'screen=${screenWidth}x${screenHeight}%7C' +
-        '${availableScreenWidth}x${availableScreenHeight}%7C' +
-        '${screenColorDepth}&' +
+      '${availableScreenWidth}x${availableScreenHeight}%7C' +
+      '${screenColorDepth}&' +
       'title=${title}&' +
       'date=${timestamp}&' +
       'ampid=${clientId(_parsely_visitor)}',
-    'pageview': '${basePrefix}&action=pageview&metadata=' +
-    '{\"canonical_url\":\"${canonicalUrl}\"}',
-    'heartbeat': '${basePrefix}&action=heartbeat' +
-    '&tt=${totalEngagedTime}&inc=${incrementalEngagedTime(parsely-js)}',
+    'pageview':
+      '${basePrefix}&action=pageview&metadata=' +
+      '{"canonical_url":"${canonicalUrl}"}',
+    'heartbeat':
+      '${basePrefix}&action=heartbeat' +
+      '&tt=${totalEngagedTime}&inc=${incrementalEngagedTime(parsely-js)}',
   },
   'triggers': {
     'defaultPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/permutive.js b/extensions/amp-analytics/0.1/vendors/permutive.js
index 482a0a03243b..514f8f0ad7af 100644
--- a/extensions/amp-analytics/0.1/vendors/permutive.js
+++ b/extensions/amp-analytics/0.1/vendors/permutive.js
@@ -19,20 +19,18 @@ export const PERMUTIVE_CONFIG = /** @type {!JsonObject} */ ({
     'identity': '${clientId(_ga)}',
   },
   'requests': {
-    'track': 'https://${namespace}.amp.permutive.com/track' +
+    'track':
+      'https://${namespace}.amp.permutive.com/track' +
       '?k=${key}' +
       '&i=${identity}' +
       '&it=amp',
-    'pageview': '${track}' +
+    'pageview':
+      '${track}' +
       '&e=Pageview' +
       '&_ep_isp_info=%24ip_isp_info' +
       '&_ep_geo_info=%24ip_geo_info',
-    'engagement': '${track}' +
-      '&e=PageviewEngagement' +
-      '&_ep_engaged_time=5',
-    'completion': '${track}' +
-      '&e=PageviewEngagement' +
-      '&_ep_completion=0.25',
+    'engagement': '${track}&e=PageviewEngagement&_ep_engaged_time=5',
+    'completion': '${track}&e=PageviewEngagement&_ep_completion=0.25',
   },
   'triggers': {
     'trackPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/piStats.js b/extensions/amp-analytics/0.1/vendors/piStats.js
index 381a5d63f670..c33d89263922 100644
--- a/extensions/amp-analytics/0.1/vendors/piStats.js
+++ b/extensions/amp-analytics/0.1/vendors/piStats.js
@@ -17,19 +17,20 @@
 export const PISTATS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://events.pi-stats.com',
-    'basePrefix': '${host}/eventsamp/?' +
-        'e=PageLoad&' +
-        'pid=${property}&' +
-        'url=${ampdocUrl}&' +
-        'cnt=${cntId}&' +
-        'lang=${language}&' +
-        'ref=${documentReferrer}&' +
-        'id=${clientId(piStatsDEVICEID)}&' +
-        'ua=${userAgent}&' +
-        'ctype=web&' +
-        'blang=${browserLanguage}&' +
-        'v=2.0&' +
-        'dist=Javascript',
+    'basePrefix':
+      '${host}/eventsamp/?' +
+      'e=PageLoad&' +
+      'pid=${property}&' +
+      'url=${ampdocUrl}&' +
+      'cnt=${cntId}&' +
+      'lang=${language}&' +
+      'ref=${documentReferrer}&' +
+      'id=${clientId(piStatsDEVICEID)}&' +
+      'ua=${userAgent}&' +
+      'ctype=web&' +
+      'blang=${browserLanguage}&' +
+      'v=2.0&' +
+      'dist=Javascript',
     'pageview': '${basePrefix}&eventtype=pageview',
   },
   'triggers': {
diff --git a/extensions/amp-analytics/0.1/vendors/piano.js b/extensions/amp-analytics/0.1/vendors/piano.js
index 291a605b72ca..105e310df5f9 100644
--- a/extensions/amp-analytics/0.1/vendors/piano.js
+++ b/extensions/amp-analytics/0.1/vendors/piano.js
@@ -18,9 +18,11 @@ export const PIANO_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://api-v3.tinypass.com',
     'basePrefix': '/api/v3',
-    'baseSuffix': '&pageview_id=${pageViewId}&rand=${random}&' +
+    'baseSuffix':
+      '&pageview_id=${pageViewId}&rand=${random}&' +
       'amp_client_id=${clientId}&aid=${aid}',
-    'pageview': '${host}${basePrefix}/page/track?url=${canonicalUrl}&' +
+    'pageview':
+      '${host}${basePrefix}/page/track?url=${canonicalUrl}&' +
       'referer=${documentReferrer}&content_created=${contentCreated}&' +
       'content_author=${contentAuthor}&content_section=${contentSection}&' +
       'timezone_offset=${timezone}&tags=${tags}&amp_url=${ampdocUrl}&' +
diff --git a/extensions/amp-analytics/0.1/vendors/pinpoll.js b/extensions/amp-analytics/0.1/vendors/pinpoll.js
index 030e4b958f70..0e548ef6dbf0 100644
--- a/extensions/amp-analytics/0.1/vendors/pinpoll.js
+++ b/extensions/amp-analytics/0.1/vendors/pinpoll.js
@@ -16,7 +16,8 @@
 
 export const PINPOLL_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
-    'pageview': '${protocol}://${host}/${version}?' +
+    'pageview':
+      '${protocol}://${host}/${version}?' +
       'url=${sourceUrl}&' +
       'sourceHost=${sourceHost}&' +
       'sourceHostname=${sourceHostname}&' +
diff --git a/extensions/amp-analytics/0.1/vendors/pressboard.js b/extensions/amp-analytics/0.1/vendors/pressboard.js
index be0cb359bd97..1a67b1477c0f 100644
--- a/extensions/amp-analytics/0.1/vendors/pressboard.js
+++ b/extensions/amp-analytics/0.1/vendors/pressboard.js
@@ -29,7 +29,8 @@ export const PRESSBOARD_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://adserver.pressboard.ca',
-    'common_params': '&amp=1&url=${canonicalUrl}' +
+    'common_params':
+      '&amp=1&url=${canonicalUrl}' +
       '&referrer=${documentReferrer}' +
       '&ts=${timestamp}' +
       '&ua=${userAgent}' +
@@ -38,7 +39,8 @@ export const PRESSBOARD_CONFIG = /** @type {!JsonObject} */ ({
       '&mid=${mediaId}&cid=${campaignId}&sid=${storyRequestId}' +
       '&geoid=${geoNameId}&cn=${country}&rg=${region}&ct=${city}' +
       '&dbi=${dbInstance}&tz=${timeZoneOffset}',
-    'conversion_params': '&hbt=${requestCount}' +
+    'conversion_params':
+      '&hbt=${requestCount}' +
       '&pvid=${pageViewId}' +
       '&asurl=${sourceUrl}' +
       '&ash=${scrollHeight}' +
@@ -47,7 +49,8 @@ export const PRESSBOARD_CONFIG = /** @type {!JsonObject} */ ({
       '&avh=${viewportHeight}' +
       '&ast=${scrollTop}' +
       '&atet=${totalEngagedTime}',
-    'conversion': '${host}' +
+    'conversion':
+      '${host}' +
       '/track/attention-amp?' +
       '${common_params}' +
       '${conversion_params}',
diff --git a/extensions/amp-analytics/0.1/vendors/quantcast.js b/extensions/amp-analytics/0.1/vendors/quantcast.js
index 5c26ca874603..178ca4f66fc5 100644
--- a/extensions/amp-analytics/0.1/vendors/quantcast.js
+++ b/extensions/amp-analytics/0.1/vendors/quantcast.js
@@ -20,7 +20,8 @@ export const QUANTCAST_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://pixel.quantserve.com/pixel',
-    'pageview': '${host};r=${random};a=${pcode};labels=${labels};' +
+    'pageview':
+      '${host};r=${random};a=${pcode};labels=${labels};' +
       'fpan=;fpa=${clientId(__qca)};ns=0;ce=1;cm=;je=0;' +
       'sr=${screenWidth}x${screenHeight}x${screenColorDepth};' +
       'enc=n;et=${timestamp};ref=${documentReferrer};url=${canonicalUrl}',
diff --git a/extensions/amp-analytics/0.1/vendors/rakam.js b/extensions/amp-analytics/0.1/vendors/rakam.js
index de2da5421410..3738987c2a19 100644
--- a/extensions/amp-analytics/0.1/vendors/rakam.js
+++ b/extensions/amp-analytics/0.1/vendors/rakam.js
@@ -19,7 +19,8 @@ export const RAKAM_CONFIG = /** @type {!JsonObject} */ ({
     'deviceId': 'CLIENT_ID(rakam_device_id)',
   },
   'requests': {
-    'base': '?api.api_key=${writeKey}' +
+    'base':
+      '?api.api_key=${writeKey}' +
       '&prop._platform=amp' +
       '&prop._device_id=${deviceId}' +
       '&prop.locale=${browserLanguage}' +
@@ -31,7 +32,9 @@ export const RAKAM_CONFIG = /** @type {!JsonObject} */ ({
       '&prop.timezone=${timezone}' +
       '&prop._time=${timestamp}' +
       '&prop.resolution=${screenWidth} × ${screenHeight}',
-    'pageview': 'https://${apiEndpoint}/event/pixel${base}&collection=${pageViewName}',
-    'custom': 'https://${apiEndpoint}/event/pixel${base}&collection=${collection}',
+    'pageview':
+      'https://${apiEndpoint}/event/pixel${base}&collection=${pageViewName}',
+    'custom':
+      'https://${apiEndpoint}/event/pixel${base}&collection=${collection}',
   },
 });
diff --git a/extensions/amp-analytics/0.1/vendors/reppublika.js b/extensions/amp-analytics/0.1/vendors/reppublika.js
index 7a631f0b4686..8fb797407cc2 100644
--- a/extensions/amp-analytics/0.1/vendors/reppublika.js
+++ b/extensions/amp-analytics/0.1/vendors/reppublika.js
@@ -18,7 +18,8 @@ export const REPPUBLIKA_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://t5.mindtake.com',
     'basePrefix': '/tag/cid/',
-    'baseSuffix': 'Service=${service}&Category=${category}&' +
+    'baseSuffix':
+      'Service=${service}&Category=${category}&' +
       'Url=${sourceUrl}&Device=${device}&uid=${random}',
     'pageview': '${host}${basePrefix}${code}/track.gif?${baseSuffix}',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/retargetly.js b/extensions/amp-analytics/0.1/vendors/retargetly.js
index 399aa93b24d4..581a160df7e0 100644
--- a/extensions/amp-analytics/0.1/vendors/retargetly.js
+++ b/extensions/amp-analytics/0.1/vendors/retargetly.js
@@ -17,9 +17,10 @@
 export const RETARGETLY_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://api.retargetly.com',
-    'page': '${host}/api?id=${accountId}&src=${sourceId}&url=${sourceUrl}' +
-    '&n=${title}&ref=${documentReferrer}&ua=${userAgent}' +
-    '&random=${random}&bl=${browserLanguage}&source=amp',
+    'page':
+      '${host}/api?id=${accountId}&src=${sourceId}&url=${sourceUrl}' +
+      '&n=${title}&ref=${documentReferrer}&ua=${userAgent}' +
+      '&random=${random}&bl=${browserLanguage}&source=amp',
   },
   'transport': {
     'beacon': false,
@@ -33,5 +34,3 @@ export const RETARGETLY_CONFIG = /** @type {!JsonObject} */ ({
     },
   },
 });
-
-
diff --git a/extensions/amp-analytics/0.1/vendors/segment.js b/extensions/amp-analytics/0.1/vendors/segment.js
index 49667f4eccce..c6e3f4bbf1eb 100644
--- a/extensions/amp-analytics/0.1/vendors/segment.js
+++ b/extensions/amp-analytics/0.1/vendors/segment.js
@@ -25,7 +25,8 @@ export const SEGMENT_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://api.segment.io/v1/pixel',
-    'base': '?writeKey=${writeKey}' +
+    'base':
+      '?writeKey=${writeKey}' +
       '&context.library.name=amp' +
       '&anonymousId=${anonymousId}' +
       '&context.locale=${browserLanguage}' +
diff --git a/extensions/amp-analytics/0.1/vendors/shinystat.js b/extensions/amp-analytics/0.1/vendors/shinystat.js
index 32161d6313b5..f0d37662b916 100644
--- a/extensions/amp-analytics/0.1/vendors/shinystat.js
+++ b/extensions/amp-analytics/0.1/vendors/shinystat.js
@@ -22,19 +22,19 @@ export const SHINYSTAT_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'base': 'https://amp.shinystat.com/cgi-bin/shinyamp.cgi',
-    'commpar': 'AMP=1&RM=${random}' +
-               '&USER=${account}' +
-               '&PAG=${page}' +
-               '&HR=${sourceUrl}' +
-               '&REFER=${documentReferrer}' +
-               '&RES=${screenWidth}X${screenHeight}' +
-               '&COLOR=${screenColorDepth}' +
-               '&CID=${clientId(AMP_CID)}' +
-               '&PAGID=${pageViewId}' +
-               '&TITL=${title}' +
-               '&RQC=${requestCount}',
-    'pagepar': '&VIE=${viewer}' +
-               '&PLT=${pageLoadTime}',
+    'commpar':
+      'AMP=1&RM=${random}' +
+      '&USER=${account}' +
+      '&PAG=${page}' +
+      '&HR=${sourceUrl}' +
+      '&REFER=${documentReferrer}' +
+      '&RES=${screenWidth}X${screenHeight}' +
+      '&COLOR=${screenColorDepth}' +
+      '&CID=${clientId(AMP_CID)}' +
+      '&PAGID=${pageViewId}' +
+      '&TITL=${title}' +
+      '&RQC=${requestCount}',
+    'pagepar': '&VIE=${viewer}&PLT=${pageLoadTime}',
     'eventpar': '&SSXL=1',
     'linkpar': '&LINK=${outboundLink}',
     'pageview': '${base}?${commpar}${pagepar}',
diff --git a/extensions/amp-analytics/0.1/vendors/simplereach.js b/extensions/amp-analytics/0.1/vendors/simplereach.js
index d33de25b8a30..b8a9270bf962 100644
--- a/extensions/amp-analytics/0.1/vendors/simplereach.js
+++ b/extensions/amp-analytics/0.1/vendors/simplereach.js
@@ -24,7 +24,8 @@ export const SIMPLEREACH_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://edge.simplereach.com',
-    'baseParams': 'amp=true' +
+    'baseParams':
+      'amp=true' +
       '&pid=${pid}' +
       '&title=${title}' +
       '&url=${canonicalUrl}' +
@@ -39,9 +40,7 @@ export const SIMPLEREACH_CONFIG = /** @type {!JsonObject} */ ({
       '&article_id=${article_id}' +
       '&ignore_metadata=${ignore_metadata}',
     'visible': '${host}/n?${baseParams}',
-    'timer': '${host}/t?${baseParams}' +
-      '&t=5000' +
-      '&e=5000',
+    'timer': '${host}/t?${baseParams}&t=5000&e=5000',
   },
   'triggers': {
     'visible': {
diff --git a/extensions/amp-analytics/0.1/vendors/snowplow.js b/extensions/amp-analytics/0.1/vendors/snowplow.js
index 8f04a2ea7c07..4bc0a669f81a 100644
--- a/extensions/amp-analytics/0.1/vendors/snowplow.js
+++ b/extensions/amp-analytics/0.1/vendors/snowplow.js
@@ -20,18 +20,20 @@ export const SNOWPLOW_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'aaVersion': 'amp-0.2',
-    'basePrefix': 'https://${collectorHost}/i?url=${canonicalUrl}&page=${title}&' +
-        'res=${screenWidth}x${screenHeight}&stm=${timestamp}&' +
-        'tz=${timezone}&aid=${appId}&p=web&tv=${aaVersion}&' +
-        'cd=${screenColorDepth}&cs=${documentCharset}&' +
-        'duid=${duid}&' +
-        'lang=${browserLanguage}&refr=${documentReferrer}&stm=${timezone}&' +
-        'vp=${viewportWidth}x${viewportHeight}',
+    'basePrefix':
+      'https://${collectorHost}/i?url=${canonicalUrl}&page=${title}&' +
+      'res=${screenWidth}x${screenHeight}&stm=${timestamp}&' +
+      'tz=${timezone}&aid=${appId}&p=web&tv=${aaVersion}&' +
+      'cd=${screenColorDepth}&cs=${documentCharset}&' +
+      'duid=${duid}&' +
+      'lang=${browserLanguage}&refr=${documentReferrer}&stm=${timezone}&' +
+      'vp=${viewportWidth}x${viewportHeight}',
     'pageView': '${basePrefix}&e=pv',
-    'structEvent': '${basePrefix}&e=se&' +
-        'se_ca=${structEventCategory}&se_ac=${structEventAction}&' +
-        'se_la=${structEventLabel}&se_pr=${structEventProperty}&' +
-        'se_va=${structEventValue}',
+    'structEvent':
+      '${basePrefix}&e=se&' +
+      'se_ca=${structEventCategory}&se_ac=${structEventAction}&' +
+      'se_la=${structEventLabel}&se_pr=${structEventProperty}&' +
+      'se_va=${structEventValue}',
   },
   'transport': {
     'beacon': false,
diff --git a/extensions/amp-analytics/0.1/vendors/teaanalytics.js b/extensions/amp-analytics/0.1/vendors/teaanalytics.js
index fb4956b5d119..977296771267 100644
--- a/extensions/amp-analytics/0.1/vendors/teaanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/teaanalytics.js
@@ -22,27 +22,26 @@ export const TEAANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   requests: {
     domain: 'https://${channel}/v1/amp',
     commonParams:
-        'user.user_unique_id=${userUniqueId}' +
-        '&header.app_id=${app_id}' +
-        '&header.language=${browserLanguage}' +
-        '&header.screen_height=${screenHeight}' +
-        '&header.screen_width=${screenWidth}' +
-        '&header.resolution=${screenHeight}x${screenWidth}' +
-        '&header.tz_offset=${timezone}' +
-        '&header.tz_name=${timezoneCode}' +
-        '&header.referrer=${documentReferrer}' +
-        '&header.custom.user_agent=${userAgent}' +
-        '&event.local_time_ms=${timestamp}' +
-        '&event.params._staging_flag=${debug}' +
-        '&verbose=${debug}',
-    base: '${domain}?' +
-        '${commonParams}' +
-        '&rnd=${random}',
-    pageview: '${base}' +
-        '&event=predefine_pageview' +
-        '&event.params.url=${sourceUrl}' +
-        '&event.params.url_path=${sourcePath}' +
-        '&event.params.title=${title}',
+      'user.user_unique_id=${userUniqueId}' +
+      '&header.app_id=${app_id}' +
+      '&header.language=${browserLanguage}' +
+      '&header.screen_height=${screenHeight}' +
+      '&header.screen_width=${screenWidth}' +
+      '&header.resolution=${screenHeight}x${screenWidth}' +
+      '&header.tz_offset=${timezone}' +
+      '&header.tz_name=${timezoneCode}' +
+      '&header.referrer=${documentReferrer}' +
+      '&header.custom.user_agent=${userAgent}' +
+      '&event.local_time_ms=${timestamp}' +
+      '&event.params._staging_flag=${debug}' +
+      '&verbose=${debug}',
+    base: '${domain}?${commonParams}&rnd=${random}',
+    pageview:
+      '${base}' +
+      '&event=predefine_pageview' +
+      '&event.params.url=${sourceUrl}' +
+      '&event.params.url_path=${sourcePath}' +
+      '&event.params.title=${title}',
     event: '${base}',
   },
 });
diff --git a/extensions/amp-analytics/0.1/vendors/tealiumcollect.js b/extensions/amp-analytics/0.1/vendors/tealiumcollect.js
index 2fbe70c217c5..4539dbfbaadf 100644
--- a/extensions/amp-analytics/0.1/vendors/tealiumcollect.js
+++ b/extensions/amp-analytics/0.1/vendors/tealiumcollect.js
@@ -28,30 +28,33 @@ export const TEALIUMCOLLECT_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://collect.tealiumiq.com',
-    'base': '${host}/event?${tealium}&' +
-        '${dom1}&${dom2}&${datetime}&' +
-        'tealium_event=${tealium_event}&' +
-        'amp_version=${ampVersion}&' +
-        'amp_request_count=${requestCount}',
-    'tealium': 'tealium_account=${account}&' +
-        'tealium_profile=${profile}&' +
-        'tealium_datasource=${datasource}&' +
-        'tealium_visitor_id=${visitor_id}',
-    'dom1': 'url=${sourceUrl}&ampdoc_url=${ampdocUrl}&' +
-        'domain=${sourceHost}&pathname=${sourcePath}&' +
-        'amp_hostname=${ampdocHostname}&' +
-        'canonical_hostname=${canonicalHostname}',
-    'dom2': 'title=${title}&' +
-        'viewport_width=${availableScreenWidth}&' +
-        'viewport_height=${availableScreenHeight}',
-    'datetime': 'timestamp=${timestamp}&' +
-        'tz=${timezone}&lang=${browserLanguage}',
-    'pageview': '${base}&referrer=${documentReferrer}&' +
-        'screen_size=${screenWidth}x${screenHeight}&' +
-        'content_load_ms=${contentLoadTime}&' +
-        'page_view_id=${pageViewId}',
-    'event': '${base}&' +
-        'scroll_y=${scrollTop}&scroll_x=${scrollLeft}',
+    'base':
+      '${host}/event?${tealium}&' +
+      '${dom1}&${dom2}&${datetime}&' +
+      'tealium_event=${tealium_event}&' +
+      'amp_version=${ampVersion}&' +
+      'amp_request_count=${requestCount}',
+    'tealium':
+      'tealium_account=${account}&' +
+      'tealium_profile=${profile}&' +
+      'tealium_datasource=${datasource}&' +
+      'tealium_visitor_id=${visitor_id}',
+    'dom1':
+      'url=${sourceUrl}&ampdoc_url=${ampdocUrl}&' +
+      'domain=${sourceHost}&pathname=${sourcePath}&' +
+      'amp_hostname=${ampdocHostname}&' +
+      'canonical_hostname=${canonicalHostname}',
+    'dom2':
+      'title=${title}&' +
+      'viewport_width=${availableScreenWidth}&' +
+      'viewport_height=${availableScreenHeight}',
+    'datetime': 'timestamp=${timestamp}&tz=${timezone}&lang=${browserLanguage}',
+    'pageview':
+      '${base}&referrer=${documentReferrer}&' +
+      'screen_size=${screenWidth}x${screenHeight}&' +
+      'content_load_ms=${contentLoadTime}&' +
+      'page_view_id=${pageViewId}',
+    'event': '${base}&scroll_y=${scrollTop}&scroll_x=${scrollLeft}',
   },
   'triggers': {
     'defaultPageview': {
@@ -63,4 +66,3 @@ export const TEALIUMCOLLECT_CONFIG = /** @type {!JsonObject} */ ({
     },
   },
 });
-
diff --git a/extensions/amp-analytics/0.1/vendors/top100.js b/extensions/amp-analytics/0.1/vendors/top100.js
index ad01f0d02947..57985d364fe9 100644
--- a/extensions/amp-analytics/0.1/vendors/top100.js
+++ b/extensions/amp-analytics/0.1/vendors/top100.js
@@ -23,23 +23,24 @@ export const TOP100_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'host': 'https://kraken.rambler.ru',
-    'base': '${host}/cnt/?pid=${pid}' +
-                        '&rid=${rid}' +
-                        '&v=${version}' +
-                        '&rn=${random}' +
-                        '&ruid=${ruid}' +
-                        '&ct=amp',
-    'pageview': '${base}&et=pv' +
-                '${_pageData}' +
-                '${_screenData}',
-    '_screenData': '&sr=${screenWidth}x${screenHeight}' +
-                   '&cd=${screenColorDepth}-bit' +
-                   '&bs=${scrollWidth}x${scrollHeight}',
-    '_pageData': '&pt=${title}' +
-                 '&rf=${documentReferrer}' +
-                 '&en=${documentCharset}' +
-                 '&la=${browserLanguage}' +
-                 '&tz=${timezone}',
+    'base':
+      '${host}/cnt/?pid=${pid}' +
+      '&rid=${rid}' +
+      '&v=${version}' +
+      '&rn=${random}' +
+      '&ruid=${ruid}' +
+      '&ct=amp',
+    'pageview': '${base}&et=pv${_pageData}${_screenData}',
+    '_screenData':
+      '&sr=${screenWidth}x${screenHeight}' +
+      '&cd=${screenColorDepth}-bit' +
+      '&bs=${scrollWidth}x${scrollHeight}',
+    '_pageData':
+      '&pt=${title}' +
+      '&rf=${documentReferrer}' +
+      '&en=${documentCharset}' +
+      '&la=${browserLanguage}' +
+      '&tz=${timezone}',
   },
   'triggers': {
     'trackPageview': {
diff --git a/extensions/amp-analytics/0.1/vendors/topmailru.js b/extensions/amp-analytics/0.1/vendors/topmailru.js
index 995062c0d447..26da8bc32850 100644
--- a/extensions/amp-analytics/0.1/vendors/topmailru.js
+++ b/extensions/amp-analytics/0.1/vendors/topmailru.js
@@ -26,17 +26,20 @@ export const TOPMAILRU_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'pageView': '${_domain}/counter?${_basicMessage};title=${title}',
-    'reachGoal': '${_domain}/tracker?${_basicMessage};title=${title}' +
-                 ';e=RG%3A${value}%2F${goal}',
-    'sendEvent': '${_domain}/tracker?${_basicMessage}' +
-                 ';e=CE%3A${value}%2F${category}%3B${action}%3B${label}',
+    'reachGoal':
+      '${_domain}/tracker?${_basicMessage};title=${title}' +
+      ';e=RG%3A${value}%2F${goal}',
+    'sendEvent':
+      '${_domain}/tracker?${_basicMessage}' +
+      ';e=CE%3A${value}%2F${category}%3B${action}%3B${label}',
     '_domain': 'https://top-fwz1.mail.ru',
-    '_basicMessage': 'js=13;id=${id};u=${url};r=${referrer}' +
-                     ';s=${screenWidth}*${screenHeight}' +
-                     ';vp=${viewportWidth}*${viewportHeight}' +
-                     ';st=${start};gender=${gender};age=${age}' +
-                     ';pid=${pid};userid=${userid};device=${device}' +
-                     ';params=${params};_=${random}',
+    '_basicMessage':
+      'js=13;id=${id};u=${url};r=${referrer}' +
+      ';s=${screenWidth}*${screenHeight}' +
+      ';vp=${viewportWidth}*${viewportHeight}' +
+      ';st=${start};gender=${gender};age=${age}' +
+      ';pid=${pid};userid=${userid};device=${device}' +
+      ';params=${params};_=${random}',
   },
   'triggers': {
     'pageView': {
diff --git a/extensions/amp-analytics/0.1/vendors/treasuredata.js b/extensions/amp-analytics/0.1/vendors/treasuredata.js
index 4754b3eee9c6..b78d0def0cec 100644
--- a/extensions/amp-analytics/0.1/vendors/treasuredata.js
+++ b/extensions/amp-analytics/0.1/vendors/treasuredata.js
@@ -23,7 +23,8 @@ export const TREASUREDATA_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'base': 'https://${host}/postback/v3/event/${database}',
-    'baseParams': 'td_write_key=${writeKey}' +
+    'baseParams':
+      'td_write_key=${writeKey}' +
       '&td_global_id=td_global_id' +
       '&td_client_id=CLIENT_ID(_td)' +
       '&td_charset=DOCUMENT_CHARSET' +
diff --git a/extensions/amp-analytics/0.1/vendors/umenganalytics.js b/extensions/amp-analytics/0.1/vendors/umenganalytics.js
index b75b084707b3..c12e352a96dc 100644
--- a/extensions/amp-analytics/0.1/vendors/umenganalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/umenganalytics.js
@@ -22,16 +22,17 @@ export const UMENGANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
     'eventProps': '',
   },
   'requests': {
-    'base': 'https://b.cnzz.com/utrack?' +
-    '&_siteid=${siteid}' +
-    '&_distinct_id=${clientId(umeng_amp_id)}' +
-    '&_t=${timestamp}' +
-    '&_s=google' +
-    '&_b=web' +
-    '&_r=${externalReferrer}' +
-    '&_h=${screenHeight}' +
-    '&_w=${screenWidth}' +
-    '&_ivt=${initial_view_time}',
+    'base':
+      'https://b.cnzz.com/utrack?' +
+      '&_siteid=${siteid}' +
+      '&_distinct_id=${clientId(umeng_amp_id)}' +
+      '&_t=${timestamp}' +
+      '&_s=google' +
+      '&_b=web' +
+      '&_r=${externalReferrer}' +
+      '&_h=${screenHeight}' +
+      '&_w=${screenWidth}' +
+      '&_ivt=${initial_view_time}',
     'pageview': '${base}&_ename=$w_page_view&_eprops=${eventProps}',
     'event': '${base}&_ename=${eventName}&_eprops=${eventProps}',
   },
diff --git a/extensions/amp-analytics/0.1/vendors/upscore.js b/extensions/amp-analytics/0.1/vendors/upscore.js
index e98bac80e80e..6b2fb1b1b82e 100644
--- a/extensions/amp-analytics/0.1/vendors/upscore.js
+++ b/extensions/amp-analytics/0.1/vendors/upscore.js
@@ -14,27 +14,29 @@
  * limitations under the License.
  */
 
-export const UPSCORE_CONFIG = /**@type {!JsonObject} */({
+export const UPSCORE_CONFIG = /**@type {!JsonObject} */ ({
   'requests': {
     'host': 'https://hit-pool.upscore.com/amp?',
-    'basePrefix': 'u_id=${clientId(upscore)}&' +
-            'hit_id=${pageViewId}&' +
-            'scTop=${scrollTop}&' +
-            'scHeight=${scrollHeight}&' +
-            'vHeight=${viewportHeight}&' +
-            'domain=${domain}&' +
-            'load=${domInteractiveTime}&' +
-            'timespent=${totalEngagedTime}',
-    'initialHit': 'author=${author}&' +
-            'creator=${creator}&' +
-            'o_id=${object_id}&' +
-            'o_type=${object_type}&' +
-            'pubdate=${pubdate}&' +
-            'ref=${documentReferrer}&' +
-            'section=${section}&' +
-            'url=${ampdocUrl}&' +
-            'agent=${userAgent}&' +
-            'location=${ampGeo(ISOCountry)}',
+    'basePrefix':
+      'u_id=${clientId(upscore)}&' +
+      'hit_id=${pageViewId}&' +
+      'scTop=${scrollTop}&' +
+      'scHeight=${scrollHeight}&' +
+      'vHeight=${viewportHeight}&' +
+      'domain=${domain}&' +
+      'load=${domInteractiveTime}&' +
+      'timespent=${totalEngagedTime}',
+    'initialHit':
+      'author=${author}&' +
+      'creator=${creator}&' +
+      'o_id=${object_id}&' +
+      'o_type=${object_type}&' +
+      'pubdate=${pubdate}&' +
+      'ref=${documentReferrer}&' +
+      'section=${section}&' +
+      'url=${ampdocUrl}&' +
+      'agent=${userAgent}&' +
+      'location=${ampGeo(ISOCountry)}',
     'finalbeat': '${host}${basePrefix}&type=final',
     'heartbeat': '${host}${basePrefix}&type=pulse',
     'pageview': '${host}${basePrefix}&${initialHit}&type=init',
diff --git a/extensions/amp-analytics/0.1/vendors/vponanalytics.js b/extensions/amp-analytics/0.1/vendors/vponanalytics.js
index ce2372d656da..1523da8ee1b2 100644
--- a/extensions/amp-analytics/0.1/vendors/vponanalytics.js
+++ b/extensions/amp-analytics/0.1/vendors/vponanalytics.js
@@ -21,17 +21,20 @@ export const VPONANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'host': 'https://tags-dmp.vpadn.com',
     'sync': 'https://ids-dmp.vpadn.com/set?t=${timestamp}&dn=&ctid=${ctid}',
-    'scroll': '${host}/et?t=${timestamp}&sdkn=j&sdkv=1.2.0&lk=${licence_key}' +
-    '&en=UTF-8&ctid=${ctid}&ev=element_interact&' +
-    'pl={\"name\":\"${category}\",\"action\":\"${action}\",' +
-    '\"value\":\"${documentReferrer}\"}',
-    'event': '${host}/et?t=${timestamp}&sdkn=j&sdkv=1.2.0&lk=${licence_key}' +
-    '&en=UTF-8&ctid=${ctid}&ev=${ev_name}&pl=${payload}',
-    'elementInteract': '${host}/et?t=${timestamp}&sdkn=j&' +
-    'sdkv=1.2.0&lk=${licence_key}' +
-    '&en=UTF-8&ctid=${ctid}&ev=element_interact&' +
-    'pl={\"name\":\"${category}\",\"action\":\"${action}\",' +
-    '\"value\":\"${label}\"}',
+    'scroll':
+      '${host}/et?t=${timestamp}&sdkn=j&sdkv=1.2.0&lk=${licence_key}' +
+      '&en=UTF-8&ctid=${ctid}&ev=element_interact&' +
+      'pl={"name":"${category}","action":"${action}",' +
+      '"value":"${documentReferrer}"}',
+    'event':
+      '${host}/et?t=${timestamp}&sdkn=j&sdkv=1.2.0&lk=${licence_key}' +
+      '&en=UTF-8&ctid=${ctid}&ev=${ev_name}&pl=${payload}',
+    'elementInteract':
+      '${host}/et?t=${timestamp}&sdkn=j&' +
+      'sdkv=1.2.0&lk=${licence_key}' +
+      '&en=UTF-8&ctid=${ctid}&ev=element_interact&' +
+      'pl={"name":"${category}","action":"${action}",' +
+      '"value":"${label}"}',
   },
   'extraUrlParams': {
     'is_amp': '1',
@@ -47,8 +50,9 @@ export const VPONANALYTICS_CONFIG = /** @type {!JsonObject} */ ({
       'request': 'event',
       'vars': {
         'ev_name': 'page_view',
-        'payload': '{\"title\":\"${title}\",\"current\":\"${canonicalUrl}\"' +
-        ',\"previous\":\"${documentReferrer}\"}',
+        'payload':
+          '{"title":"${title}","current":"${canonicalUrl}"' +
+          ',"previous":"${documentReferrer}"}',
       },
     },
   },
diff --git a/extensions/amp-analytics/0.1/vendors/webtrekk.js b/extensions/amp-analytics/0.1/vendors/webtrekk.js
index 97c0415d79ac..f705ee86bdf5 100644
--- a/extensions/amp-analytics/0.1/vendors/webtrekk.js
+++ b/extensions/amp-analytics/0.1/vendors/webtrekk.js
@@ -17,30 +17,36 @@
 export const WEBTREKK_CONFIG = /** @type {!JsonObject} */ ({
   'requests': {
     'trackURL': 'https://${trackDomain}/${trackId}/wt',
-    'parameterPrefix': '?p=432,${contentId},1,' +
+    'parameterPrefix':
+      '?p=432,${contentId},1,' +
       '${screenWidth}x${screenHeight},${screenColorDepth},1,' +
       '${timestamp},${documentReferrer},${viewportWidth}x' +
       '${viewportHeight},0&tz=${timezone}' +
       '&eid=${clientId(amp-wt3-eid)}&la=${browserLanguage}',
     'parameterSuffix': '&pu=${sourceUrl}',
-    'pageParameter': '&cp1=${pageParameter1}' +
+    'pageParameter':
+      '&cp1=${pageParameter1}' +
       '&cp2=${pageParameter2}&cp3=${pageParameter3}' +
       '&cp4=${pageParameter4}&cp5=${pageParameter5}' +
       '&cp6=${pageParameter6}&cp7=${pageParameter7}' +
       '&cp8=${pageParameter8}&cp9=${pageParameter9}' +
       '&cp10=${pageParameter10}',
-    'pageCategories': '&cg1=${pageCategory1}' +
+    'pageCategories':
+      '&cg1=${pageCategory1}' +
       '&cg2=${pageCategory2}&cg3=${pageCategory3}' +
       '&cg4=${pageCategory4}&cg5=${pageCategory5}' +
       '&cg6=${pageCategory6}&cg7=${pageCategory7}' +
       '&cg8=${pageCategory8}&cg9=${pageCategory9}' +
       '&cg10=${pageCategory10}',
-    'pageview': '${trackURL}${parameterPrefix}${pageParameter}' +
+    'pageview':
+      '${trackURL}${parameterPrefix}${pageParameter}' +
       '${pageCategories}${parameterSuffix}',
-    'actionParameter': '&ck1=${actionParameter1}' +
+    'actionParameter':
+      '&ck1=${actionParameter1}' +
       '&ck2=${actionParameter2}&ck3=${actionParameter3}' +
       '&ck4=${actionParameter4}&ck5=${actionParameter5}',
-    'event': '${trackURL}${parameterPrefix}&ct=${actionName}' +
+    'event':
+      '${trackURL}${parameterPrefix}&ct=${actionName}' +
       '${actionParameter}${parameterSuffix}',
   },
   'transport': {
diff --git a/extensions/amp-analytics/0.1/vendors/webtrekk_v2.js b/extensions/amp-analytics/0.1/vendors/webtrekk_v2.js
index e8d94d41e9c3..3a852c40cb63 100644
--- a/extensions/amp-analytics/0.1/vendors/webtrekk_v2.js
+++ b/extensions/amp-analytics/0.1/vendors/webtrekk_v2.js
@@ -23,22 +23,27 @@ export const WEBTREKK_V2_CONFIG = /** @type {!JsonObject} */ ({
   },
   'requests': {
     'trackURL': 'https://${trackDomain}/${trackId}/wt',
-    'basePrefix': '?p=440,${contentId},1,' +
+    'basePrefix':
+      '?p=440,${contentId},1,' +
       '${screenWidth}x${screenHeight},${screenColorDepth},1,',
-    'baseSuffix': ',${documentReferrer},' +
+    'baseSuffix':
+      ',${documentReferrer},' +
       '${viewportWidth}x${viewportHeight},0' +
       '&tz=${timezone}&eid=${everId}&la=${browserLanguage}',
     'parameterPrefix': '${basePrefix}${timestamp}${baseSuffix}',
     'parameterSuffix': '&pu=${sourceUrl}&eor=1',
-    'pageview': '${trackURL}${parameterPrefix}&${extraUrlParams}' +
+    'pageview':
+      '${trackURL}${parameterPrefix}&${extraUrlParams}' +
       '&cp570=${pageLoadTime}${parameterSuffix}',
-    'event': '${trackURL}${parameterPrefix}&ct=${actionName}' +
+    'event':
+      '${trackURL}${parameterPrefix}&ct=${actionName}' +
       '&${extraUrlParams}${parameterSuffix}',
-    'scroll': '${trackURL}${parameterPrefix}&ct=${actionName}' +
+    'scroll':
+      '${trackURL}${parameterPrefix}&ct=${actionName}' +
       '&ck540=${verticalScrollBoundary}${parameterSuffix}',
-    'mediaPrefix': '${trackURL}${basePrefix}${baseSuffix}' +
-      '&mi=${mediaName}',
-    'mediaSuffix': '&mt1=${currentTime}&mt2=${duration}' +
+    'mediaPrefix': '${trackURL}${basePrefix}${baseSuffix}&mi=${mediaName}',
+    'mediaSuffix':
+      '&mt1=${currentTime}&mt2=${duration}' +
       '&${extraUrlParams}${parameterSuffix}&x=${playedTotal}',
     'mediaPlay': '${mediaPrefix}&mk=play${mediaSuffix}',
     'mediaPause': '${mediaPrefix}&mk=pause${mediaSuffix}',
diff --git a/extensions/amp-analytics/0.1/visibility-manager-for-mapp.js b/extensions/amp-analytics/0.1/visibility-manager-for-mapp.js
index 76dd2301f5d7..b741ab589c07 100644
--- a/extensions/amp-analytics/0.1/visibility-manager-for-mapp.js
+++ b/extensions/amp-analytics/0.1/visibility-manager-for-mapp.js
@@ -52,7 +52,8 @@ export class VisibilityManagerForMApp extends VisibilityManager {
 
     // Initate the listener
     this.visibilityInterface_.onVisibilityChange(
-        this.onVisibilityChangeHandler_.bind(this));
+      this.onVisibilityChangeHandler_.bind(this)
+    );
   }
 
   /** @override */
@@ -81,23 +82,27 @@ export class VisibilityManagerForMApp extends VisibilityManager {
     return this.backgroundedAtStart_;
   }
 
-
   /** @override */
   getRootMinOpacity() {
     // Copied the implementation from VisibilityManagerForDoc,
     // doesn't count iframe opacity
     const root = this.ampdoc.getRootNode();
     const rootElement = dev().assertElement(
-        root.documentElement || root.body || root);
+      root.documentElement || root.body || root
+    );
     return getMinOpacity(rootElement);
   }
 
   /** @override */
   listenElement() {
     // #listenElement not supported in mApp
-    devAssert(false, '%s: element level visibility not supported, ' +
+    devAssert(
+      false,
+      '%s: element level visibility not supported, ' +
         'getElementIntersectionRect should not be called in ' +
-        'VisibilityManager for mApp', TAG);
+        'VisibilityManager for mApp',
+      TAG
+    );
     return () => {};
   }
 
@@ -107,8 +112,9 @@ export class VisibilityManagerForMApp extends VisibilityManager {
   getRootLayoutBox() {
     // By the time `#getRootLayoutBox` is called, it is guaranteed that
     // onVisibilityChangeHandler has been called at least once
-    return /** @type {!../../../src/layout-rect.LayoutRectDef} */ (
-      devAssert(this.intersectionRect_));
+    return /** @type {!../../../src/layout-rect.LayoutRectDef} */ (devAssert(
+      this.intersectionRect_
+    ));
   }
 
   /**
@@ -132,9 +138,13 @@ export class VisibilityManagerForMApp extends VisibilityManager {
    * @override
    */
   observe() {
-    devAssert(false, '%s: element level visibility not supported, ' +
+    devAssert(
+      false,
+      '%s: element level visibility not supported, ' +
         'getElementIntersectionRect should not be called in ' +
-        'VisibilityManager for mApp', TAG);
+        'VisibilityManager for mApp',
+      TAG
+    );
     return () => {};
   }
 
@@ -142,9 +152,13 @@ export class VisibilityManagerForMApp extends VisibilityManager {
    * @override
    */
   getElementVisibility() {
-    devAssert(false, '%s: element level visibility not supported, ' +
+    devAssert(
+      false,
+      '%s: element level visibility not supported, ' +
         'getElementIntersectionRect should not be called in ' +
-        'VisibilityManager for mApp', TAG);
+        'VisibilityManager for mApp',
+      TAG
+    );
     return 0;
   }
 
@@ -153,9 +167,12 @@ export class VisibilityManagerForMApp extends VisibilityManager {
    * @return {?JsonObject}
    */
   getElementIntersectionRect() {
-    dev().error(TAG, 'element level visibility not supported, ' +
+    dev().error(
+      TAG,
+      'element level visibility not supported, ' +
         'getElementIntersectionRect should not be called in ' +
-        'VisibilityManager for mApp');
+        'VisibilityManager for mApp'
+    );
     return dict({});
   }
 }
diff --git a/extensions/amp-analytics/0.1/visibility-manager.js b/extensions/amp-analytics/0.1/visibility-manager.js
index 7d64ec7fa6ae..4e3e4ba739f8 100644
--- a/extensions/amp-analytics/0.1/visibility-manager.js
+++ b/extensions/amp-analytics/0.1/visibility-manager.js
@@ -51,7 +51,6 @@ function getElementId(element) {
   return id;
 }
 
-
 /**
  * A base class for `VisibilityManagerForDoc` and `VisibilityManagerForEmbed`.
  * The instance of this class corresponds 1:1 to `AnalyticsRoot`. It represents
@@ -178,11 +177,11 @@ export class VisibilityManager {
   isBackgroundedAtStart() {}
 
   /**
-  * Returns the root's, root's parent's and root's children's
-  * lowest opacity value
-  * @return {number}
-  * @abstract
-  */
+   * Returns the root's, root's parent's and root's children's
+   * lowest opacity value
+   * @return {number}
+   * @abstract
+   */
   getRootMinOpacity() {}
 
   /**
@@ -252,8 +251,13 @@ export class VisibilityManager {
    */
   listenRoot(spec, readyPromise, createReportPromiseFunc, callback) {
     const calcVisibility = this.getRootVisibility.bind(this);
-    return this.createModelAndListen_(calcVisibility, spec, readyPromise,
-        createReportPromiseFunc, callback);
+    return this.createModelAndListen_(
+      calcVisibility,
+      spec,
+      readyPromise,
+      createReportPromiseFunc,
+      callback
+    );
   }
 
   /**
@@ -268,10 +272,21 @@ export class VisibilityManager {
    * @return {!UnlistenDef}
    */
   listenElement(
-    element, spec, readyPromise, createReportPromiseFunc, callback) {
+    element,
+    spec,
+    readyPromise,
+    createReportPromiseFunc,
+    callback
+  ) {
     const calcVisibility = this.getElementVisibility.bind(this, element);
-    return this.createModelAndListen_(calcVisibility, spec, readyPromise,
-        createReportPromiseFunc, callback, element);
+    return this.createModelAndListen_(
+      calcVisibility,
+      spec,
+      readyPromise,
+      createReportPromiseFunc,
+      callback,
+      element
+    );
   }
 
   /**
@@ -284,11 +299,19 @@ export class VisibilityManager {
    * @param {!Element=} opt_element
    * @return {!UnlistenDef}
    */
-  createModelAndListen_(calcVisibility, spec,
-    readyPromise, createReportPromiseFunc, callback, opt_element) {
-    if (spec['visiblePercentageThresholds'] &&
-        spec['visiblePercentageMin'] == undefined &&
-        spec['visiblePercentageMax'] == undefined) {
+  createModelAndListen_(
+    calcVisibility,
+    spec,
+    readyPromise,
+    createReportPromiseFunc,
+    callback,
+    opt_element
+  ) {
+    if (
+      spec['visiblePercentageThresholds'] &&
+      spec['visiblePercentageMin'] == undefined &&
+      spec['visiblePercentageMax'] == undefined
+    ) {
       const unlisteners = [];
       const ranges = spec['visiblePercentageThresholds'];
       if (!ranges || !isArray(ranges)) {
@@ -298,14 +321,18 @@ export class VisibilityManager {
       for (let i = 0; i < ranges.length; i++) {
         const percents = ranges[i];
         if (!isArray(percents) || percents.length != 2) {
-          user().error(TAG,
-              'visiblePercentageThresholds entry length is not 2');
+          user().error(
+            TAG,
+            'visiblePercentageThresholds entry length is not 2'
+          );
           continue;
         }
         if (!isFiniteNumber(percents[0]) || !isFiniteNumber(percents[1])) {
           // not valid number
-          user().error(TAG,
-              'visiblePercentageThresholds entry is not valid number');
+          user().error(
+            TAG,
+            'visiblePercentageThresholds entry is not valid number'
+          );
           continue;
         }
         const min = Number(percents[0]);
@@ -315,26 +342,46 @@ export class VisibilityManager {
         // special cases: if min and max are both 0, or both 100, then both
         // are inclusive. Otherwise it would not be possible to trigger an
         // event on exactly 0% or 100%.
-        if (min < 0 || max > 100 || min > max ||
-            (min == max && min != 100 && max != 0)) {
-          user().error(TAG,
-              'visiblePercentageThresholds entry invalid min/max value');
+        if (
+          min < 0 ||
+          max > 100 ||
+          min > max ||
+          (min == max && min != 100 && max != 0)
+        ) {
+          user().error(
+            TAG,
+            'visiblePercentageThresholds entry invalid min/max value'
+          );
           continue;
         }
         const newSpec = spec;
         newSpec['visiblePercentageMin'] = min;
         newSpec['visiblePercentageMax'] = max;
         const model = new VisibilityModel(newSpec, calcVisibility);
-        unlisteners.push(this.listen_(model, spec, readyPromise,
-            createReportPromiseFunc, callback, opt_element));
+        unlisteners.push(
+          this.listen_(
+            model,
+            spec,
+            readyPromise,
+            createReportPromiseFunc,
+            callback,
+            opt_element
+          )
+        );
       }
       return () => {
         unlisteners.forEach(unlistener => unlistener());
       };
     }
     const model = new VisibilityModel(spec, calcVisibility);
-    return this.listen_(model, spec, readyPromise,
-        createReportPromiseFunc, callback, opt_element);
+    return this.listen_(
+      model,
+      spec,
+      readyPromise,
+      createReportPromiseFunc,
+      callback,
+      opt_element
+    );
   }
 
   /**
@@ -347,8 +394,14 @@ export class VisibilityManager {
    * @return {!UnlistenDef}
    * @private
    */
-  listen_(model, spec,
-    readyPromise, createReportPromiseFunc, callback, opt_element) {
+  listen_(
+    model,
+    spec,
+    readyPromise,
+    createReportPromiseFunc,
+    callback,
+    opt_element
+  ) {
     if (createReportPromiseFunc) {
       model.setReportReady(createReportPromiseFunc);
     }
@@ -382,19 +435,21 @@ export class VisibilityManager {
       let layoutBox;
       if (opt_element) {
         state['opacity'] = getMinOpacity(opt_element);
-        const resource =
-            this.resources_.getResourceForElementOptional(opt_element);
-        layoutBox =
-            resource ?
-              resource.getLayoutBox() :
-              viewport.getLayoutRect(opt_element);
+        const resource = this.resources_.getResourceForElementOptional(
+          opt_element
+        );
+        layoutBox = resource
+          ? resource.getLayoutBox()
+          : viewport.getLayoutRect(opt_element);
         const intersectionRatio = this.getElementVisibility(opt_element);
         const intersectionRect = this.getElementIntersectionRect(opt_element);
-        Object.assign(state, dict({
-          'intersectionRatio': intersectionRatio,
-          'intersectionRect': JSON.stringify(intersectionRect),
-        }));
-
+        Object.assign(
+          state,
+          dict({
+            'intersectionRatio': intersectionRatio,
+            'intersectionRect': JSON.stringify(intersectionRect),
+          })
+        );
       } else {
         state['opacity'] = this.getRootMinOpacity();
         state['intersectionRatio'] = this.getRootVisibility();
@@ -403,16 +458,25 @@ export class VisibilityManager {
       model.maybeDispose();
 
       if (layoutBox) {
-        Object.assign(state, dict({
-          'elementX': layoutBox.left,
-          'elementY': layoutBox.top,
-          'elementWidth': layoutBox.width,
-          'elementHeight': layoutBox.height,
-        }));
+        Object.assign(
+          state,
+          dict({
+            'elementX': layoutBox.left,
+            'elementY': layoutBox.top,
+            'elementWidth': layoutBox.width,
+            'elementHeight': layoutBox.height,
+          })
+        );
         state['initialScrollDepth'] = layoutPositionRelativeToScrolledViewport(
-            layoutBox, viewport, model.getInitialScrollDepth());
+          layoutBox,
+          viewport,
+          model.getInitialScrollDepth()
+        );
         state['maxScrollDepth'] = layoutPositionRelativeToScrolledViewport(
-            layoutBox, viewport, this.getMaxScrollDepth());
+          layoutBox,
+          viewport,
+          this.getMaxScrollDepth()
+        );
       }
       callback(state);
     });
@@ -466,7 +530,6 @@ export class VisibilityManager {
   getElementIntersectionRect(unusedElement) {}
 }
 
-
 /**
  * The implementation of `VisibilityManager` for an AMP document. Two
  * distinct modes are supported: the main AMP doc and a in-a-box doc.
@@ -507,20 +570,23 @@ export class VisibilityManagerForDoc extends VisibilityManager {
       // In-a-box: visibility depends on the InOb.
       const root = this.ampdoc.getRootNode();
       const rootElement = dev().assertElement(
-          root.documentElement || root.body || root);
-      this.unsubscribe(this.observe(
-          rootElement,
-          this.setRootVisibility.bind(this)));
+        root.documentElement || root.body || root
+      );
+      this.unsubscribe(
+        this.observe(rootElement, this.setRootVisibility.bind(this))
+      );
     } else {
       // Main document: visibility is based on the viewer.
       this.setRootVisibility(this.viewer_.isVisible() ? 1 : 0);
-      this.unsubscribe(this.viewer_.onVisibilityChanged(() => {
-        const isVisible = this.viewer_.isVisible();
-        if (!isVisible) {
-          this.backgrounded_ = true;
-        }
-        this.setRootVisibility(isVisible ? 1 : 0);
-      }));
+      this.unsubscribe(
+        this.viewer_.onVisibilityChanged(() => {
+          const isVisible = this.viewer_.isVisible();
+          if (!isVisible) {
+            this.backgrounded_ = true;
+          }
+          this.setRootVisibility(isVisible ? 1 : 0);
+        })
+      );
     }
   }
 
@@ -552,7 +618,8 @@ export class VisibilityManagerForDoc extends VisibilityManager {
   getRootMinOpacity() {
     const root = this.ampdoc.getRootNode();
     const rootElement = dev().assertElement(
-        root.documentElement || root.body || root);
+      root.documentElement || root.body || root
+    );
     return getMinOpacity(rootElement);
   }
 
@@ -561,7 +628,8 @@ export class VisibilityManagerForDoc extends VisibilityManager {
     // This code is the same for "in-a-box" and standalone doc.
     const root = this.ampdoc.getRootNode();
     const rootElement = dev().assertElement(
-        root.documentElement || root.body || root);
+      root.documentElement || root.body || root
+    );
     return this.viewport_.getLayoutRect(rootElement);
   }
 
@@ -648,14 +716,16 @@ export class VisibilityManagerForDoc extends VisibilityManager {
     const {win} = this.ampdoc;
     if (nativeIntersectionObserverSupported(win)) {
       return new win.IntersectionObserver(
-          this.onIntersectionChanges_.bind(this),
-          {threshold: DEFAULT_THRESHOLD});
+        this.onIntersectionChanges_.bind(this),
+        {threshold: DEFAULT_THRESHOLD}
+      );
     }
 
     // Polyfill.
     const intersectionObserverPolyfill = new IntersectionObserverPolyfill(
-        this.onIntersectionChanges_.bind(this),
-        {threshold: DEFAULT_THRESHOLD});
+      this.onIntersectionChanges_.bind(this),
+      {threshold: DEFAULT_THRESHOLD}
+    );
     const ticker = () => {
       intersectionObserverPolyfill.tick(this.viewport_.getRect());
     };
@@ -695,14 +765,17 @@ export class VisibilityManagerForDoc extends VisibilityManager {
       let intersection = change.intersectionRect;
       // IntersectionRect type now changed from ClientRect to DOMRectReadOnly.
       // TODO(@zhouyx): Fix all InOb related type.
-      intersection = layoutRectLtwh(Number(intersection.left),
-          Number(intersection.top),
-          Number(intersection.width),
-          Number(intersection.height));
+      intersection = layoutRectLtwh(
+        Number(intersection.left),
+        Number(intersection.top),
+        Number(intersection.width),
+        Number(intersection.height)
+      );
       this.onIntersectionChange_(
-          change.target,
-          change.intersectionRatio,
-          intersection);
+        change.target,
+        change.intersectionRatio,
+        intersection
+      );
     });
   }
 
@@ -726,7 +799,6 @@ export class VisibilityManagerForDoc extends VisibilityManager {
   }
 }
 
-
 /**
  * The implementation of `VisibilityManager` for a FIE embed. This visibility
  * root delegates most of tracking functions to its parent, the ampdoc root.
@@ -745,9 +817,12 @@ export class VisibilityManagerForEmbed extends VisibilityManager {
     /** @const @private {boolean} */
     this.backgroundedAtStart_ = this.parent.isBackgrounded();
 
-    this.unsubscribe(this.parent.observe(
+    this.unsubscribe(
+      this.parent.observe(
         dev().assertElement(embed.host),
-        this.setRootVisibility.bind(this)));
+        this.setRootVisibility.bind(this)
+      )
+    );
   }
 
   /** @override */
@@ -812,5 +887,4 @@ export class VisibilityManagerForEmbed extends VisibilityManager {
     }
     return this.parent.getElementIntersectionRect(element);
   }
-
 }
diff --git a/extensions/amp-analytics/0.1/visibility-model.js b/extensions/amp-analytics/0.1/visibility-model.js
index 8b870c5d9eed..98781ee02aad 100644
--- a/extensions/amp-analytics/0.1/visibility-model.js
+++ b/extensions/amp-analytics/0.1/visibility-model.js
@@ -161,8 +161,10 @@ export class VisibilityModel {
    * @private
    */
   reset_() {
-    devAssert(!this.eventResolver_,
-        'Attempt to refresh visible event before previous one resolve');
+    devAssert(
+      !this.eventResolver_,
+      'Attempt to refresh visible event before previous one resolve'
+    );
     const deferred = new Deferred();
     this.eventPromise_ = deferred.promise;
     this.eventResolver_ = deferred.resolve;
@@ -320,7 +322,7 @@ export class VisibilityModel {
     // When ignoreVisibilityForReport_ is true, we update counters but fire the
     // event when the report ready promise is resolved.
     const conditionsMet =
-        this.updateCounters_(visibility) || this.ignoreVisibilityForReport_;
+      this.updateCounters_(visibility) || this.ignoreVisibilityForReport_;
     if (conditionsMet) {
       if (this.scheduledUpdateTimeoutId_) {
         clearTimeout(this.scheduledUpdateTimeoutId_);
@@ -366,8 +368,11 @@ export class VisibilityModel {
    * @return {boolean}
    */
   isVisibilityMatch_(visibility) {
-    devAssert(visibility >= 0 && visibility <= 1,
-        'invalid visibility value: %s', visibility);
+    devAssert(
+      visibility >= 0 && visibility <= 1,
+      'invalid visibility value: %s',
+      visibility
+    );
     // Special case: If visiblePercentageMin is 100%, then it doesn't make
     // sense to do the usual (min, max] since that would never be true.
     if (this.spec_['visiblePercentageMin'] == 1) {
@@ -378,8 +383,10 @@ export class VisibilityModel {
     if (this.spec_['visiblePercentageMax'] == 0) {
       return visibility == 0;
     }
-    return visibility > this.spec_['visiblePercentageMin'] &&
-        visibility <= this.spec_['visiblePercentageMax'];
+    return (
+      visibility > this.spec_['visiblePercentageMin'] &&
+      visibility <= this.spec_['visiblePercentageMax']
+    );
   }
 
   /**
@@ -388,8 +395,11 @@ export class VisibilityModel {
    * @private
    */
   updateCounters_(visibility) {
-    devAssert(visibility >= 0 && visibility <= 1,
-        'invalid visibility value: %s', visibility);
+    devAssert(
+      visibility >= 0 && visibility <= 1,
+      'invalid visibility value: %s',
+      visibility
+    );
     const now = Date.now();
 
     if (visibility > 0) {
@@ -397,14 +407,15 @@ export class VisibilityModel {
       this.lastSeenTime_ = now;
       // Consider it as load time visibility if this happens within 300ms of
       // page load.
-      if (!this.loadTimeVisibility_ && (now - this.createdTime_) < 300) {
+      if (!this.loadTimeVisibility_ && now - this.createdTime_ < 300) {
         this.loadTimeVisibility_ = visibility;
       }
     }
 
     const prevMatchesVisibility = this.matchesVisibility_;
-    const timeSinceLastUpdate =
-        this.lastVisibleUpdateTime_ ? now - this.lastVisibleUpdateTime_ : 0;
+    const timeSinceLastUpdate = this.lastVisibleUpdateTime_
+      ? now - this.lastVisibleUpdateTime_
+      : 0;
     this.matchesVisibility_ = this.isVisibilityMatch_(visibility);
     if (this.matchesVisibility_) {
       this.everMatchedVisibility_ = true;
@@ -412,8 +423,10 @@ export class VisibilityModel {
         // Keep counting.
         this.totalVisibleTime_ += timeSinceLastUpdate;
         this.continuousTime_ += timeSinceLastUpdate;
-        this.maxContinuousVisibleTime_ =
-            Math.max(this.maxContinuousVisibleTime_, this.continuousTime_);
+        this.maxContinuousVisibleTime_ = Math.max(
+          this.maxContinuousVisibleTime_,
+          this.continuousTime_
+        );
       } else {
         // The resource came into view: start counting.
         devAssert(!this.lastVisibleUpdateTime_);
@@ -421,19 +434,22 @@ export class VisibilityModel {
       }
       this.lastVisibleUpdateTime_ = now;
       this.minVisiblePercentage_ =
-          this.minVisiblePercentage_ > 0 ?
-            Math.min(this.minVisiblePercentage_, visibility) :
-            visibility;
-      this.maxVisiblePercentage_ =
-          Math.max(this.maxVisiblePercentage_, visibility);
+        this.minVisiblePercentage_ > 0
+          ? Math.min(this.minVisiblePercentage_, visibility)
+          : visibility;
+      this.maxVisiblePercentage_ = Math.max(
+        this.maxVisiblePercentage_,
+        visibility
+      );
       this.lastVisibleTime_ = now;
     } else if (prevMatchesVisibility) {
       // The resource went out of view. Do final calculations and reset state.
       devAssert(this.lastVisibleUpdateTime_ > 0);
 
       this.maxContinuousVisibleTime_ = Math.max(
-          this.maxContinuousVisibleTime_,
-          this.continuousTime_ + timeSinceLastUpdate);
+        this.maxContinuousVisibleTime_,
+        this.continuousTime_ + timeSinceLastUpdate
+      );
 
       // Reset for next visibility event.
       this.lastVisibleUpdateTime_ = 0;
@@ -442,11 +458,13 @@ export class VisibilityModel {
       this.lastVisibleTime_ = now;
     }
 
-    return this.everMatchedVisibility_ &&
-        (this.totalVisibleTime_ >= this.spec_['totalTimeMin']) &&
-        (this.totalVisibleTime_ <= this.spec_['totalTimeMax']) &&
-        (this.maxContinuousVisibleTime_ >= this.spec_['continuousTimeMin']) &&
-        (this.maxContinuousVisibleTime_ <= this.spec_['continuousTimeMax']);
+    return (
+      this.everMatchedVisibility_ &&
+      this.totalVisibleTime_ >= this.spec_['totalTimeMin'] &&
+      this.totalVisibleTime_ <= this.spec_['totalTimeMax'] &&
+      this.maxContinuousVisibleTime_ >= this.spec_['continuousTimeMin'] &&
+      this.maxContinuousVisibleTime_ <= this.spec_['continuousTimeMax']
+    );
   }
 
   /**
@@ -478,18 +496,22 @@ export class VisibilityModel {
    */
   computeTimeToWait_() {
     const waitForContinuousTime = Math.max(
-        this.spec_['continuousTimeMin'] - this.continuousTime_, 0);
+      this.spec_['continuousTimeMin'] - this.continuousTime_,
+      0
+    );
     const waitForTotalTime = Math.max(
-        this.spec_['totalTimeMin'] - this.totalVisibleTime_, 0);
+      this.spec_['totalTimeMin'] - this.totalVisibleTime_,
+      0
+    );
     const maxWaitTime = Math.max(waitForContinuousTime, waitForTotalTime);
     return Math.min(
-        maxWaitTime,
-        waitForContinuousTime || Infinity,
-        waitForTotalTime || Infinity);
+      maxWaitTime,
+      waitForContinuousTime || Infinity,
+      waitForTotalTime || Infinity
+    );
   }
 }
 
-
 /**
  * Calculates the specified time based on the given `baseTime`.
  * @param {time} time
diff --git a/extensions/amp-anim/0.1/amp-anim.js b/extensions/amp-anim/0.1/amp-anim.js
index c189593d4820..4cb901442db8 100644
--- a/extensions/amp-anim/0.1/amp-anim.js
+++ b/extensions/amp-anim/0.1/amp-anim.js
@@ -21,15 +21,19 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {propagateObjectFitStyles} from '../../../src/style';
 
 const TAG = 'amp-anim';
-const BUILD_ATTRIBUTES = ['alt', 'aria-label', 'aria-describedby',
-  'aria-labelledby'];
+const BUILD_ATTRIBUTES = [
+  'alt',
+  'aria-label',
+  'aria-describedby',
+  'aria-labelledby',
+];
 const LAYOUT_ATTRIBUTES = ['src', 'srcset'];
 /** @visibleForTesting */
-export const SRC_PLACEHOLDER = 'data:image/gif;base64,' +
-'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+export const SRC_PLACEHOLDER =
+  'data:image/gif;base64,' +
+  'R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
 
 export class AmpAnim extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -59,15 +63,16 @@ export class AmpAnim extends AMP.BaseElement {
     if (this.element.getAttribute('role') == 'img') {
       this.element.removeAttribute('role');
       this.user().error(
-          'AMP-ANIM', 'Setting role=img on amp-anim elements ' +
+        'AMP-ANIM',
+        'Setting role=img on amp-anim elements ' +
           'breaks screen readers. Please just set alt or ARIA attributes, ' +
           'they will be correctly propagated for the underlying <img> ' +
-          'element.');
+          'element.'
+      );
     }
 
     // The image is initially hidden if a placeholder is available.
-    st.toggle(dev().assertElement(this.img_),
-        !this.getPlaceholder());
+    st.toggle(dev().assertElement(this.img_), !this.getPlaceholder());
 
     this.element.appendChild(this.img_);
   }
diff --git a/extensions/amp-anim/0.1/test/test-amp-anim.js b/extensions/amp-anim/0.1/test/test-amp-anim.js
index 82e961c1f547..823a9bb825cb 100644
--- a/extensions/amp-anim/0.1/test/test-amp-anim.js
+++ b/extensions/amp-anim/0.1/test/test-amp-anim.js
@@ -19,114 +19,117 @@ import {AmpAnim, SRC_PLACEHOLDER} from '../amp-anim';
 const EXAMPLE_SRCSET = `https://media.giphy.com/media/yFQ0ywscgobJK/giphy.gif 1282w,
 https://media.giphy.com/media/vFKqnCdLPNOKc/giphy.gif 1923w`;
 
-describes.realWin('amp-anim', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-anim'],
+describes.realWin(
+  'amp-anim',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-anim'],
+    },
   },
-}, env => {
-
-  it('should propagate ARIA attributes', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('srcset', EXAMPLE_SRCSET);
-    el.setAttribute('width', 100);
-    el.setAttribute('height', 100);
-    el.setAttribute('aria-label', 'Hello');
-    el.setAttribute('aria-labelledby', 'id2');
-    el.setAttribute('aria-describedby', 'id3');
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.getAttribute('aria-label')).to.equal('Hello');
-    expect(img.getAttribute('aria-labelledby')).to.equal('id2');
-    expect(img.getAttribute('aria-describedby')).to.equal('id3');
-    expect(img.getAttribute('decoding')).to.equal('async');
-  });
-
-  it('should propagate src and srcset', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('srcset', EXAMPLE_SRCSET);
-    el.setAttribute('width', 100);
-    el.setAttribute('height', 100);
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.getAttribute('src')).to.equal('test.jpg');
-    expect(img.getAttribute('srcset')).to.equal(EXAMPLE_SRCSET);
-  });
-
-  it('should set src to placeholder on unlayout and reset on layout', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('srcset', EXAMPLE_SRCSET);
-    el.setAttribute('width', 100);
-    el.setAttribute('height', 100);
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.getAttribute('src')).to.equal('test.jpg');
-    expect(img.getAttribute('srcset')).to.equal(EXAMPLE_SRCSET);
-
-    impl.unlayoutCallback();
-    expect(img.getAttribute('src')).to.equal(SRC_PLACEHOLDER);
-
-    impl.layoutCallback();
-    expect(img.getAttribute('src')).to.equal('test.jpg');
-  });
-
-  it('should propagate the object-fit attribute', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('object-fit', 'cover');
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.style.objectFit).to.equal('cover');
-  });
-
-  it('should not propagate the object-fit attribute if invalid', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('object-fit', 'foo 80%');
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.style.objectFit).to.be.empty;
-  });
-
-  it('should propagate the object-position attribute', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('object-position', '20% 80%');
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.style.objectPosition).to.equal('20% 80%');
-  });
-
-  it('should not propagate the object-position attribute if invalid', () => {
-    const el = env.win.document.createElement('amp-anim');
-    el.setAttribute('src', 'test.jpg');
-    el.setAttribute('object-position', 'url:("example.com")');
-
-    const impl = new AmpAnim(el);
-    impl.buildCallback();
-    impl.layoutCallback();
-    const img = el.querySelector('img');
-    expect(img.style.objectPosition).to.be.empty;
-  });
-});
+  env => {
+    it('should propagate ARIA attributes', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('srcset', EXAMPLE_SRCSET);
+      el.setAttribute('width', 100);
+      el.setAttribute('height', 100);
+      el.setAttribute('aria-label', 'Hello');
+      el.setAttribute('aria-labelledby', 'id2');
+      el.setAttribute('aria-describedby', 'id3');
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.getAttribute('aria-label')).to.equal('Hello');
+      expect(img.getAttribute('aria-labelledby')).to.equal('id2');
+      expect(img.getAttribute('aria-describedby')).to.equal('id3');
+      expect(img.getAttribute('decoding')).to.equal('async');
+    });
+
+    it('should propagate src and srcset', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('srcset', EXAMPLE_SRCSET);
+      el.setAttribute('width', 100);
+      el.setAttribute('height', 100);
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.getAttribute('src')).to.equal('test.jpg');
+      expect(img.getAttribute('srcset')).to.equal(EXAMPLE_SRCSET);
+    });
+
+    it('should set src to placeholder on unlayout and reset on layout', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('srcset', EXAMPLE_SRCSET);
+      el.setAttribute('width', 100);
+      el.setAttribute('height', 100);
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.getAttribute('src')).to.equal('test.jpg');
+      expect(img.getAttribute('srcset')).to.equal(EXAMPLE_SRCSET);
+
+      impl.unlayoutCallback();
+      expect(img.getAttribute('src')).to.equal(SRC_PLACEHOLDER);
+
+      impl.layoutCallback();
+      expect(img.getAttribute('src')).to.equal('test.jpg');
+    });
+
+    it('should propagate the object-fit attribute', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('object-fit', 'cover');
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.style.objectFit).to.equal('cover');
+    });
+
+    it('should not propagate the object-fit attribute if invalid', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('object-fit', 'foo 80%');
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.style.objectFit).to.be.empty;
+    });
+
+    it('should propagate the object-position attribute', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('object-position', '20% 80%');
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.style.objectPosition).to.equal('20% 80%');
+    });
+
+    it('should not propagate the object-position attribute if invalid', () => {
+      const el = env.win.document.createElement('amp-anim');
+      el.setAttribute('src', 'test.jpg');
+      el.setAttribute('object-position', 'url:("example.com")');
+
+      const impl = new AmpAnim(el);
+      impl.buildCallback();
+      impl.layoutCallback();
+      const img = el.querySelector('img');
+      expect(img.style.objectPosition).to.be.empty;
+    });
+  }
+);
diff --git a/extensions/amp-animation/0.1/amp-animation.js b/extensions/amp-animation/0.1/amp-animation.js
index 62580045f5ab..60a3803a7bd9 100644
--- a/extensions/amp-animation/0.1/amp-animation.js
+++ b/extensions/amp-animation/0.1/amp-animation.js
@@ -23,8 +23,7 @@ import {WebAnimationService} from './web-animation-service';
 import {childElementByTag} from '../../../src/dom';
 import {clamp} from '../../../src/utils/math';
 import {getDetail, listen} from '../../../src/event-helper';
-import {getFriendlyIframeEmbedOptional}
-  from '../../../src/friendly-iframe-embed';
+import {getFriendlyIframeEmbedOptional} from '../../../src/friendly-iframe-embed';
 import {getParentWindowFrameElement} from '../../../src/service';
 import {installWebAnimationsIfNecessary} from './web-animations-polyfill';
 import {isFiniteNumber} from '../../../src/types';
@@ -34,9 +33,7 @@ import {user, userAssert} from '../../../src/log';
 
 const TAG = 'amp-animation';
 
-
 export class AmpAnimation extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -77,24 +74,28 @@ export class AmpAnimation extends AMP.BaseElement {
     const trigger = this.element.getAttribute('trigger');
     if (trigger) {
       this.triggerOnVisibility_ = userAssert(
-          trigger == 'visibility',
-          'Only allowed value for "trigger" is "visibility": %s',
-          this.element);
+        trigger == 'visibility',
+        'Only allowed value for "trigger" is "visibility": %s',
+        this.element
+      );
     }
 
     // TODO(dvoytenko): Remove once we support direct parent visibility.
     if (trigger == 'visibility') {
       userAssert(
-          this.element.parentNode == this.element.ownerDocument.body ||
+        this.element.parentNode == this.element.ownerDocument.body ||
           this.element.parentNode == ampdoc.getBody(),
-          '%s is only allowed as a direct child of <body> element when trigger'
-          + ' is visibility. This restriction will be removed soon.', TAG);
+        '%s is only allowed as a direct child of <body> element when trigger' +
+          ' is visibility. This restriction will be removed soon.',
+        TAG
+      );
     }
 
     // Parse config.
     const scriptElement = userAssert(
-        childElementByTag(this.element, 'script'),
-        '"<script type=application/json>" must be present');
+      childElementByTag(this.element, 'script'),
+      '"<script type=application/json>" must be present'
+    );
     this.configJson_ = tryParseJson(scriptElement.textContent, error => {
       throw user().createError('failed to parse animation script', error);
     });
@@ -118,18 +119,20 @@ export class AmpAnimation extends AMP.BaseElement {
 
     // Restart with debounce.
     this.restartPass_ = new Pass(
-        this.win,
-        () => {
-          if (!this.pausedByAction_) {
-            this.startOrResume_();
-          }
-        },
-        /* delay */ 50);
+      this.win,
+      () => {
+        if (!this.pausedByAction_) {
+          this.startOrResume_();
+        }
+      },
+      /* delay */ 50
+    );
 
     // Visibility.
     const frameElement = getParentWindowFrameElement(this.element, ampdoc.win);
-    const embed =
-        frameElement ? getFriendlyIframeEmbedOptional(frameElement) : null;
+    const embed = frameElement
+      ? getFriendlyIframeEmbedOptional(frameElement)
+      : null;
     if (embed) {
       this.embed_ = embed;
       this.setVisible_(embed.isVisible());
@@ -152,25 +155,46 @@ export class AmpAnimation extends AMP.BaseElement {
 
     // Actions.
     this.registerDefaultAction(
-        this.startAction_.bind(this),
-        'start',
-        ActionTrust.LOW);
-    this.registerAction('restart',
-        this.restartAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('pause',
-        this.pauseAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('resume',
-        this.resumeAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('togglePause',
-        this.togglePauseAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('seekTo',
-        this.seekToAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('reverse',
-        this.reverseAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('finish',
-        this.finishAction_.bind(this), ActionTrust.LOW);
-    this.registerAction('cancel',
-        this.cancelAction_.bind(this), ActionTrust.LOW);
+      this.startAction_.bind(this),
+      'start',
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'restart',
+      this.restartAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction('pause', this.pauseAction_.bind(this), ActionTrust.LOW);
+    this.registerAction(
+      'resume',
+      this.resumeAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'togglePause',
+      this.togglePauseAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'seekTo',
+      this.seekToAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'reverse',
+      this.reverseAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'finish',
+      this.finishAction_.bind(this),
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'cancel',
+      this.cancelAction_.bind(this),
+      ActionTrust.LOW
+    );
   }
 
   /**
@@ -288,7 +312,7 @@ export class AmpAnimation extends AMP.BaseElement {
 
     let positionObserverData = null;
     if (invocation.event) {
-      const detail = getDetail(/** @type {!Event} */(invocation.event));
+      const detail = getDetail(/** @type {!Event} */ (invocation.event));
       if (detail) {
         positionObserverData = detail['positionObserverData'] || null;
       }
@@ -416,7 +440,9 @@ export class AmpAnimation extends AMP.BaseElement {
   createRunnerIfNeeded_(opt_args, opt_positionObserverData) {
     if (!this.runnerPromise_) {
       this.runnerPromise_ = this.createRunner_(
-          opt_args, opt_positionObserverData).then(runner => {
+        opt_args,
+        opt_positionObserverData
+      ).then(runner => {
         this.runner_ = runner;
         this.runner_.onPlayStateChanged(this.playStateChanged_.bind(this));
         this.runner_.init();
@@ -457,26 +483,28 @@ export class AmpAnimation extends AMP.BaseElement {
   createRunner_(opt_args, opt_positionObserverData) {
     // Force cast to `WebAnimationDef`. It will be validated during preparation
     // phase.
-    const configJson = /** @type {!./web-animation-types.WebAnimationDef} */ (
-      this.configJson_);
-    const args = /** @type {?./web-animation-types.WebAnimationDef} */ (
-      opt_args || null);
+    const configJson = /** @type {!./web-animation-types.WebAnimationDef} */ (this
+      .configJson_);
+    const args =
+      /** @type {?./web-animation-types.WebAnimationDef} */ (opt_args || null);
 
     // Ensure polyfill is installed.
     installWebAnimationsIfNecessary(this.win);
 
     const ampdoc = this.getAmpDoc();
-    const readyPromise = this.embed_ ? this.embed_.whenReady() :
-      ampdoc.whenReady();
+    const readyPromise = this.embed_
+      ? this.embed_.whenReady()
+      : ampdoc.whenReady();
     const hostWin = this.embed_ ? this.embed_.win : this.win;
     const baseUrl = this.embed_ ? this.embed_.getUrl() : ampdoc.getUrl();
     return readyPromise.then(() => {
       const builder = new Builder(
-          hostWin,
-          this.getRootNode_(),
-          baseUrl,
-          this.getVsync(),
-          this.element.getResources());
+        hostWin,
+        this.getRootNode_(),
+        baseUrl,
+        this.getVsync(),
+        this.element.getResources()
+      );
       return builder.createRunner(configJson, args, opt_positionObserverData);
     });
   }
@@ -486,9 +514,9 @@ export class AmpAnimation extends AMP.BaseElement {
    * @private
    */
   getRootNode_() {
-    return this.embed_ ?
-      this.embed_.win.document :
-      this.getAmpDoc().getRootNode();
+    return this.embed_
+      ? this.embed_.win.document
+      : this.getAmpDoc().getRootNode();
   }
 
   /** @private */
@@ -509,8 +537,6 @@ export class AmpAnimation extends AMP.BaseElement {
   }
 }
 
-
-
 AMP.extension(TAG, '0.1', function(AMP) {
   AMP.registerElement(TAG, AmpAnimation);
   AMP.registerServiceForDoc('web-animation', WebAnimationService);
diff --git a/extensions/amp-animation/0.1/parsers/css-expr-ast.js b/extensions/amp-animation/0.1/parsers/css-expr-ast.js
index 9d62c5e64101..d8d67bd4e3f7 100644
--- a/extensions/amp-animation/0.1/parsers/css-expr-ast.js
+++ b/extensions/amp-animation/0.1/parsers/css-expr-ast.js
@@ -15,13 +15,12 @@
  */
 
 const FINAL_URL_RE = /^(data|https)\:/i;
-const DEG_TO_RAD = 2 * Math.PI / 360;
+const DEG_TO_RAD = (2 * Math.PI) / 360;
 const GRAD_TO_RAD = Math.PI / 200;
 const VAR_CSS_RE = /(calc|var|url|rand|index|width|height|num|length)\(/i;
 const NORM_CSS_RE = /\d(%|em|rem|vw|vh|vmin|vmax|s|deg|grad)/i;
 const INFINITY_RE = /^(infinity|infinite)$/i;
 
-
 /**
  * Returns `true` if the CSS expression contains variable components. The CSS
  * parsing and evaluation is heavy, but used relatively rarely. This method
@@ -39,7 +38,6 @@ export function isVarCss(css, normalize) {
  * @interface
  */
 export class CssContext {
-
   /**
    * Returns a resolved URL. The result must be an allowed URL for execution,
    * with HTTPS restrictions.
@@ -116,7 +114,6 @@ export class CssContext {
   withDimension(unusedDim, unusedCallback) {}
 }
 
-
 /**
  * A base class for all CSS node components defined in the
  * `css-expr-impl.jison`.
@@ -174,7 +171,6 @@ export class CssNode {
   }
 }
 
-
 /**
  * A CSS expression that's simply passed through from the original expression.
  * Used for `url()`, colors, etc.
@@ -193,7 +189,6 @@ export class CssPassthroughNode extends CssNode {
   }
 }
 
-
 /**
  * A concatenation of CSS expressions: `translateX(...) rotate(...)`,
  * `1s normal`, etc.
@@ -235,7 +230,9 @@ export class CssConcatNode extends CssNode {
   /** @override */
   isConst(normalize) {
     return this.array_.reduce(
-        (acc, node) => acc && node.isConst(normalize), true);
+      (acc, node) => acc && node.isConst(normalize),
+      true
+    );
   }
 
   /** @override */
@@ -254,7 +251,6 @@ export class CssConcatNode extends CssNode {
   }
 }
 
-
 /**
  * Verifies that URL is an HTTPS URL.
  */
@@ -287,7 +283,6 @@ export class CssUrlNode extends CssNode {
   }
 }
 
-
 /**
  * @abstract
  */
@@ -354,7 +349,6 @@ export class CssNumericNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS number: `100`, `1e2`, `1e-2`, `0.5`, etc.
  */
@@ -387,7 +381,6 @@ export class CssNumberNode extends CssNumericNode {
   }
 }
 
-
 /**
  * A CSS percent value: `100%`, `0.5%`, etc.
  */
@@ -416,7 +409,6 @@ export class CssPercentNode extends CssNumericNode {
   }
 }
 
-
 /**
  * A CSS length value: `100px`, `80vw`, etc.
  */
@@ -436,7 +428,7 @@ export class CssLengthNode extends CssNumericNode {
 
   /** @override */
   isNorm() {
-    return (this.units_ == 'px');
+    return this.units_ == 'px';
   }
 
   /** @override */
@@ -447,20 +439,23 @@ export class CssLengthNode extends CssNumericNode {
 
     // Font-based: em/rem.
     if (this.units_ == 'em' || this.units_ == 'rem') {
-      const fontSize = this.units_ == 'em' ?
-        context.getCurrentFontSize() :
-        context.getRootFontSize();
+      const fontSize =
+        this.units_ == 'em'
+          ? context.getCurrentFontSize()
+          : context.getRootFontSize();
       return new CssLengthNode(this.num_ * fontSize, 'px');
     }
 
     // Viewport based: vw, vh, vmin, vmax.
-    if (this.units_ == 'vw' ||
-        this.units_ == 'vh' ||
-        this.units_ == 'vmin' ||
-        this.units_ == 'vmax') {
+    if (
+      this.units_ == 'vw' ||
+      this.units_ == 'vh' ||
+      this.units_ == 'vmin' ||
+      this.units_ == 'vmax'
+    ) {
       const vp = context.getViewportSize();
-      const vw = vp.width * this.num_ / 100;
-      const vh = vp.height * this.num_ / 100;
+      const vw = (vp.width * this.num_) / 100;
+      const vh = (vp.height * this.num_) / 100;
       let num = 0;
       if (this.units_ == 'vw') {
         num = vw;
@@ -483,11 +478,10 @@ export class CssLengthNode extends CssNumericNode {
     const dim = context.getDimension();
     const size = context.getCurrentElementSize();
     const side = getDimSide(dim, size);
-    return new CssLengthNode(side * percent / 100, 'px');
+    return new CssLengthNode((side * percent) / 100, 'px');
   }
 }
 
-
 /**
  * A CSS angle value: `45deg`, `0.5rad`, etc.
  */
@@ -507,7 +501,7 @@ export class CssAngleNode extends CssNumericNode {
 
   /** @override */
   isNorm() {
-    return (this.units_ == 'rad');
+    return this.units_ == 'rad';
   }
 
   /** @override */
@@ -525,7 +519,6 @@ export class CssAngleNode extends CssNumericNode {
   }
 }
 
-
 /**
  * A CSS time value: `1s`, `600ms`.
  */
@@ -545,7 +538,7 @@ export class CssTimeNode extends CssNumericNode {
 
   /** @override */
   isNorm() {
-    return (this.units_ == 'ms');
+    return this.units_ == 'ms';
   }
 
   /** @override */
@@ -585,7 +578,6 @@ export class CssTimeNode extends CssNumericNode {
   }
 }
 
-
 /**
  * A CSS generic function: `rgb(1, 1, 1)`, `translateX(300px)`, etc.
  */
@@ -614,7 +606,9 @@ export class CssFuncNode extends CssNode {
   /** @override */
   isConst(normalize) {
     return this.args_.reduce(
-        (acc, node) => acc && node.isConst(normalize), true);
+      (acc, node) => acc && node.isConst(normalize),
+      true
+    );
   }
 
   /** @override */
@@ -624,8 +618,9 @@ export class CssFuncNode extends CssNode {
       const node = this.args_[i];
       let resolved;
       if (this.dimensions_ && i < this.dimensions_.length) {
-        resolved = context.withDimension(this.dimensions_[i],
-            () => node.resolve(context, normalize));
+        resolved = context.withDimension(this.dimensions_[i], () =>
+          node.resolve(context, normalize)
+        );
       } else {
         resolved = node.resolve(context, normalize);
       }
@@ -640,7 +635,6 @@ export class CssFuncNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS translate family of functions:
  * - `translate(x, y)`
@@ -655,18 +649,26 @@ export class CssTranslateNode extends CssFuncNode {
    * @param {!Array<!CssNode>} args
    */
   constructor(suffix, args) {
-    super(`translate${suffix.toUpperCase()}`, args,
-        suffix == '' ? ['w', 'h'] :
-          suffix == 'x' ? ['w'] :
-            suffix == 'y' ? ['h'] :
-              suffix == 'z' ? ['z'] :
-                suffix == '3d' ? ['w', 'h', 'z'] : null);
+    super(
+      `translate${suffix.toUpperCase()}`,
+      args,
+      suffix == ''
+        ? ['w', 'h']
+        : suffix == 'x'
+        ? ['w']
+        : suffix == 'y'
+        ? ['h']
+        : suffix == 'z'
+        ? ['z']
+        : suffix == '3d'
+        ? ['w', 'h', 'z']
+        : null
+    );
     /** @const @private {string} */
     this.suffix_ = suffix;
   }
 }
 
-
 /**
  * AMP-specific `width()` and `height()` functions.
  */
@@ -698,15 +700,13 @@ export class CssDimSizeNode extends CssNode {
 
   /** @override */
   calc(context) {
-    const size =
-        this.selector_ ?
-          context.getElementSize(this.selector_, this.selectionMethod_) :
-          context.getCurrentElementSize();
+    const size = this.selector_
+      ? context.getElementSize(this.selector_, this.selectionMethod_)
+      : context.getCurrentElementSize();
     return new CssLengthNode(getDimSide(this.dim_, size), 'px');
   }
 }
 
-
 /**
  * AMP-specific `num()` function. Format is `num(value)`. Returns a numeric
  * representation of the value. E.g. `11px` -> 11, `12em` -> 12, `10s` -> 10.
@@ -750,7 +750,6 @@ export class CssNumConvertNode extends CssNode {
   }
 }
 
-
 /**
  * AMP-specific `rand()` function. Has two forms:
  * - `rand()` - returns a random number value between 0 and 1.
@@ -796,8 +795,10 @@ export class CssRandNode extends CssNode {
     if (left == null || right == null) {
       return null;
     }
-    if (!(left instanceof CssNumericNode) ||
-        !(right instanceof CssNumericNode)) {
+    if (
+      !(left instanceof CssNumericNode) ||
+      !(right instanceof CssNumericNode)
+    ) {
       throw new Error('left and right must be both numerical');
     }
     if (left.type_ != right.type_) {
@@ -819,7 +820,6 @@ export class CssRandNode extends CssNode {
   }
 }
 
-
 /**
  * AMP-specific `index()` function. Returns 0-based index of the current
  * target in a list of all selected targets.
@@ -848,7 +848,6 @@ export class CssIndexNode extends CssNode {
   }
 }
 
-
 /**
  * AMP-specific `length()` function. Returns number of targets selected.
  */
@@ -876,7 +875,6 @@ export class CssLengthFuncNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS `var()` expression: `var(--name)`, `var(--name, 100px)`, etc.
  * See https://www.w3.org/TR/css-variables/.
@@ -917,7 +915,6 @@ export class CssVarNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS `calc()` expression: `calc(100px)`, `calc(80vw - 30em)`, etc.
  * See https://drafts.csswg.org/css-values-3/#calc-notation.
@@ -946,7 +943,6 @@ export class CssCalcNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS `calc()` sum expression: `100px + 20em`, `80vw - 30em`, etc.
  */
@@ -990,8 +986,10 @@ export class CssCalcSumNode extends CssNode {
     if (left == null || right == null) {
       return null;
     }
-    if (!(left instanceof CssNumericNode) ||
-        !(right instanceof CssNumericNode)) {
+    if (
+      !(left instanceof CssNumericNode) ||
+      !(right instanceof CssNumericNode)
+    ) {
       throw new Error('left and right must be both numerical');
     }
     if (left.type_ != right.type_) {
@@ -1017,7 +1015,6 @@ export class CssCalcSumNode extends CssNode {
   }
 }
 
-
 /**
  * A CSS `calc()` product expression: `100px * 2`, `80vw / 2`, etc.
  */
@@ -1054,8 +1051,10 @@ export class CssCalcProductNode extends CssNode {
     if (left == null || right == null) {
       return null;
     }
-    if (!(left instanceof CssNumericNode) ||
-        !(right instanceof CssNumericNode)) {
+    if (
+      !(left instanceof CssNumericNode) ||
+      !(right instanceof CssNumericNode)
+    ) {
       throw new Error('left and right must be both numerical');
     }
 
@@ -1097,7 +1096,6 @@ export class CssCalcProductNode extends CssNode {
   }
 }
 
-
 /**
  * @param {string} units
  * @return {!Error}
@@ -1106,7 +1104,6 @@ function unknownUnits(units) {
   return new Error('unknown units: ' + units);
 }
 
-
 /**
  * @return {!Error}
  */
@@ -1114,12 +1111,11 @@ function noCss() {
   return new Error('no css');
 }
 
-
 /**
  * @param {?string} dim
  * @param {!{width: number, height: number}} size
  * @return {number}
  */
 function getDimSide(dim, size) {
-  return (dim == 'w' ? size.width : dim == 'h' ? size.height : 0);
+  return dim == 'w' ? size.width : dim == 'h' ? size.height : 0;
 }
diff --git a/extensions/amp-animation/0.1/parsers/css-expr.js b/extensions/amp-animation/0.1/parsers/css-expr.js
index 07b5038b57fb..563eb324b394 100644
--- a/extensions/amp-animation/0.1/parsers/css-expr.js
+++ b/extensions/amp-animation/0.1/parsers/css-expr.js
@@ -16,7 +16,6 @@
 
 import {cssParser as parser} from './css-expr-impl';
 
-
 /**
  * @param {string} cssString
  * @return {?./css-expr-ast.CssNode}
diff --git a/extensions/amp-animation/0.1/parsers/keyframes-extractor.js b/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
index 375444c0dbfb..ab9c337eebbb 100644
--- a/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
+++ b/extensions/amp-animation/0.1/parsers/keyframes-extractor.js
@@ -32,7 +32,10 @@ export function extractKeyframes(rootNode, name) {
   // Go from the last to first since the last rule wins in CSS.
   for (let i = styleSheets.length - 1; i >= 0; i--) {
     const keyframes = scanStyle(
-        win, /** @type {!CSSStyleSheet} */ (styleSheets[i]), name);
+      win,
+      /** @type {!CSSStyleSheet} */ (styleSheets[i]),
+      name
+    );
     if (keyframes) {
       return keyframes;
     }
@@ -40,7 +43,6 @@ export function extractKeyframes(rootNode, name) {
   return null;
 }
 
-
 /**
  * @param {!Window} win
  * @param {!CSSStyleSheet} styleSheet
@@ -58,15 +60,16 @@ function scanStyle(win, styleSheet, name) {
     return null;
   }
   // Exlcude AMP's own styles.
-  if (!styleNode.hasAttribute('amp-custom') &&
-      !styleNode.hasAttribute('amp-keyframes')) {
+  if (
+    !styleNode.hasAttribute('amp-custom') &&
+    !styleNode.hasAttribute('amp-keyframes')
+  ) {
     return null;
   }
 
   return scanRules(win, styleSheet.cssRules, name);
 }
 
-
 /**
  * @param {!Window} win
  * @param {!CSSRuleList} rules
@@ -82,8 +85,10 @@ function scanRules(win, rules, name) {
       if (rule.name == name && isEnabled(win, rule)) {
         return buildKeyframes(keyframesRule);
       }
-    } else if (rule.type == /* CSSMediaRule */ 4 ||
-          rule.type == /* CSSSupportsRule */ 12) {
+    } else if (
+      rule.type == /* CSSMediaRule */ 4 ||
+      rule.type == /* CSSSupportsRule */ 12
+    ) {
       // Go recursively inside. The media/supports match will be checked only
       // when the corresponding @keyframes have been found.
       const found = scanRules(win, rule.cssRules, name);
@@ -95,7 +100,6 @@ function scanRules(win, rules, name) {
   return null;
 }
 
-
 /**
  * @param {!Window} win
  * @param {!CSSRule} rule
@@ -110,10 +114,11 @@ function isEnabled(win, rule) {
     }
   }
   if (rule.type == /* CSSSupportsRule */ 12) {
-    if (!win.CSS ||
-        !win.CSS.supports ||
-        !win.CSS.supports(
-            /** @type {!CSSSupportsRule} */ (rule).conditionText)) {
+    if (
+      !win.CSS ||
+      !win.CSS.supports ||
+      !win.CSS.supports(/** @type {!CSSSupportsRule} */ (rule).conditionText)
+    ) {
       return false;
     }
   }
@@ -125,7 +130,6 @@ function isEnabled(win, rule) {
   return true;
 }
 
-
 /**
  * @param {!CSSKeyframesRule} keyframesRule
  * @return {!../web-animation-types.WebKeyframesDef}
@@ -133,13 +137,15 @@ function isEnabled(win, rule) {
 function buildKeyframes(keyframesRule) {
   const array = [];
   for (let i = 0; i < keyframesRule.cssRules.length; i++) {
-    const keyframeRule = /** @type {!CSSKeyframeRule} */ (
-      keyframesRule.cssRules[i]);
+    const keyframeRule =
+      /** @type {!CSSKeyframeRule} */ (keyframesRule.cssRules[i]);
     const keyframe = {};
     keyframe['offset'] =
-        keyframeRule.keyText == 'from' ? 0 :
-          keyframeRule.keyText == 'to' ? 1 :
-            parseFloat(keyframeRule.keyText) / 100;
+      keyframeRule.keyText == 'from'
+        ? 0
+        : keyframeRule.keyText == 'to'
+        ? 1
+        : parseFloat(keyframeRule.keyText) / 100;
     const {style} = keyframeRule;
     for (let j = 0; j < style.length; j++) {
       const styleName = style[j];
diff --git a/extensions/amp-animation/0.1/runners/animation-runner.js b/extensions/amp-animation/0.1/runners/animation-runner.js
index 403b8da0e75b..aaa954c89a41 100644
--- a/extensions/amp-animation/0.1/runners/animation-runner.js
+++ b/extensions/amp-animation/0.1/runners/animation-runner.js
@@ -21,7 +21,6 @@ import {
 /**
  */
 export class AnimationRunner {
-
   /**
    * @param {!Array<!../web-animation-types.InternalWebAnimationRequestDef>} requests
    */
@@ -33,66 +32,54 @@ export class AnimationRunner {
   /**
    * @return {!WebAnimationPlayState}
    */
-  getPlayState() {
-  }
+  getPlayState() {}
 
   /**
    * @param {function(!WebAnimationPlayState)} unusedHandler
    * @return {!UnlistenDef}
    */
-  onPlayStateChanged(unusedHandler) {
-  }
+  onPlayStateChanged(unusedHandler) {}
 
   /**
-  * Initializes the players but does not change the state.
+   * Initializes the players but does not change the state.
    */
-  init() {
-  }
+  init() {}
 
   /**
    * Initializes the players if not already initialized,
    * and starts playing the animations.
    */
-  start() {
-  }
+  start() {}
 
   /**
    */
-  pause() {
-  }
+  pause() {}
 
   /**
    */
-  resume() {
-  }
+  resume() {}
 
   /**
    */
-  reverse() {
-  }
+  reverse() {}
 
   /**
    * @param {time} unusedTime
    */
-  seekTo(unusedTime) {
-  }
+  seekTo(unusedTime) {}
 
   /**
    * Seeks to a relative position within the animation timeline given a
    * percentage (0 to 1 number).
    * @param {number} unusedPercent between 0 and 1
    */
-  seekToPercent(unusedPercent) {
-  }
+  seekToPercent(unusedPercent) {}
 
   /**
    */
-  finish() {
-  }
+  finish() {}
 
   /**
    */
-  cancel() {
-  }
-
+  cancel() {}
 }
diff --git a/extensions/amp-animation/0.1/runners/native-web-animation-runner.js b/extensions/amp-animation/0.1/runners/native-web-animation-runner.js
index 67b295e66567..54a9dfef8ff7 100644
--- a/extensions/amp-animation/0.1/runners/native-web-animation-runner.js
+++ b/extensions/amp-animation/0.1/runners/native-web-animation-runner.js
@@ -28,17 +28,13 @@ import {
   WebMultiAnimationDef,
   WebSwitchAnimationDef,
 } from '../web-animation-types';
-import {
-  assertDoesNotContainDisplay,
-  setStyles,
-} from '../../../../src/style';
+import {assertDoesNotContainDisplay, setStyles} from '../../../../src/style';
 import {devAssert} from '../../../../src/log';
 import {getTotalDuration} from './utils';
 
 /**
  */
 export class NativeWebAnimationRunner extends AnimationRunner {
-
   /**
    * @param {!Array<!../web-animation-types.InternalWebAnimationRequestDef>} requests
    */
@@ -84,11 +80,9 @@ export class NativeWebAnimationRunner extends AnimationRunner {
     this.players_ = this.requests_.map(request => {
       // Apply vars.
       if (request.vars) {
-        setStyles(request.target,
-            assertDoesNotContainDisplay(request.vars));
+        setStyles(request.target, assertDoesNotContainDisplay(request.vars));
       }
-      const player = request.target.animate(
-          request.keyframes, request.timing);
+      const player = request.target.animate(request.keyframes, request.timing);
       player.pause();
       return player;
     });
@@ -140,8 +134,10 @@ export class NativeWebAnimationRunner extends AnimationRunner {
     this.setPlayState_(WebAnimationPlayState.RUNNING);
     this.runningCount_ = 0;
     this.players_.forEach(player => {
-      if (oldRunnerPlayState != WebAnimationPlayState.PAUSED ||
-          player.playState == WebAnimationPlayState.PAUSED) {
+      if (
+        oldRunnerPlayState != WebAnimationPlayState.PAUSED ||
+        player.playState == WebAnimationPlayState.PAUSED
+      ) {
         player.play();
         this.runningCount_++;
       }
@@ -231,5 +227,4 @@ export class NativeWebAnimationRunner extends AnimationRunner {
   getTotalDuration_() {
     return getTotalDuration(this.requests_);
   }
-
 }
diff --git a/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js b/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js
index f3e23a1ab9f9..092e54bb2e49 100644
--- a/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js
+++ b/extensions/amp-animation/0.1/runners/scrolltimeline-worklet-runner.js
@@ -30,7 +30,6 @@ let workletModulePromise;
 /**
  */
 export class ScrollTimelineWorkletRunner extends AnimationRunner {
-
   /**
    * @param {!Window} win
    * @param {!Array<!../web-animation-types.InternalWebAnimationRequestDef>} requests
@@ -56,10 +55,10 @@ export class ScrollTimelineWorkletRunner extends AnimationRunner {
   }
 
   /**
-  * @override
-  * Initializes the players but does not change the state.
-  * @suppress {missingProperties}
-  */
+   * @override
+   * Initializes the players but does not change the state.
+   * @suppress {missingProperties}
+   */
   init() {
     const {documentElement} = this.win_.document;
     const viewportService = Services.viewportForDoc(documentElement);
@@ -72,30 +71,38 @@ export class ScrollTimelineWorkletRunner extends AnimationRunner {
     this.requests_.map(request => {
       // Apply vars.
       if (request.vars) {
-        setStyles(request.target,
-            assertDoesNotContainDisplay(request.vars));
+        setStyles(request.target, assertDoesNotContainDisplay(request.vars));
       }
-      getOrAddWorkletModule(this.win_).then(() => {
-        const scrollTimeline = new this.win_.ScrollTimeline({
-          scrollSource,
-          orientation: 'block',
-          startScrollOffset: `${px(this.startScrollOffset_)}`,
-          endScrollOffset: `${px(this.endScrollOffset_)}`,
-          timeRange: adjustedTimeRange,
-          fill: 'both',
-        });
-        const keyframeEffect = new KeyframeEffect(request.target,
-            request.keyframes, request.timing);
-        const player = new this.win_.WorkletAnimation(`${moduleName}`,
+      getOrAddWorkletModule(this.win_).then(
+        () => {
+          const scrollTimeline = new this.win_.ScrollTimeline({
+            scrollSource,
+            orientation: 'block',
+            startScrollOffset: `${px(this.startScrollOffset_)}`,
+            endScrollOffset: `${px(this.endScrollOffset_)}`,
+            timeRange: adjustedTimeRange,
+            fill: 'both',
+          });
+          const keyframeEffect = new KeyframeEffect(
+            request.target,
+            request.keyframes,
+            request.timing
+          );
+          const player = new this.win_.WorkletAnimation(
+            `${moduleName}`,
             [keyframeEffect],
-            scrollTimeline, {
+            scrollTimeline,
+            {
               'initial-element-offset': initialElementOffset,
-            });
-        player.play();
-        this.players_.push(player);
-      }, e => {
-        dev().error('AMP-ANIMATION', e);
-      });
+            }
+          );
+          player.play();
+          this.players_.push(player);
+        },
+        e => {
+          dev().error('AMP-ANIMATION', e);
+        }
+      );
     });
   }
 
@@ -121,7 +128,6 @@ export class ScrollTimelineWorkletRunner extends AnimationRunner {
       player.cancel();
     });
   }
-
 }
 
 /**
@@ -132,8 +138,7 @@ function getOrAddWorkletModule(win) {
   if (workletModulePromise) {
     return workletModulePromise;
   }
-  const blob =
- `registerAnimator('${moduleName}', class {
+  const blob = `registerAnimator('${moduleName}', class {
     constructor(options = {
       'current-element-offset': 0
     }) {
@@ -150,8 +155,8 @@ function getOrAddWorkletModule(win) {
   `;
 
   workletModulePromise = win.CSS.animationWorklet.addModule(
-      URL.createObjectURL(new Blob([blob],
-          {type: 'text/javascript'})));
+    URL.createObjectURL(new Blob([blob], {type: 'text/javascript'}))
+  );
 
   return workletModulePromise;
 }
diff --git a/extensions/amp-animation/0.1/runners/utils.js b/extensions/amp-animation/0.1/runners/utils.js
index 3e5031aa6c50..63089c26d8f5 100644
--- a/extensions/amp-animation/0.1/runners/utils.js
+++ b/extensions/amp-animation/0.1/runners/utils.js
@@ -26,13 +26,16 @@ export function getTotalDuration(requests) {
   for (let i = 0; i < requests.length; i++) {
     const {timing} = requests[i];
 
-    userAssert(isFinite(timing.iterations), 'Animation has infinite ' +
-    'timeline, we can not seek to a relative position within an infinite ' +
-    'timeline. Use "time" for seekTo or remove infinite iterations');
+    userAssert(
+      isFinite(timing.iterations),
+      'Animation has infinite ' +
+        'timeline, we can not seek to a relative position within an infinite ' +
+        'timeline. Use "time" for seekTo or remove infinite iterations'
+    );
 
     const iteration = timing.iterations - timing.iterationStart;
-    const totalDuration = (timing.duration * iteration) +
-        timing.delay + timing.endDelay;
+    const totalDuration =
+      timing.duration * iteration + timing.delay + timing.endDelay;
 
     if (totalDuration > maxTotalDuration) {
       maxTotalDuration = totalDuration;
diff --git a/extensions/amp-animation/0.1/test/test-amp-animation.js b/extensions/amp-animation/0.1/test/test-amp-animation.js
index ff01806c0d80..90b4232f644b 100644
--- a/extensions/amp-animation/0.1/test/test-amp-animation.js
+++ b/extensions/amp-animation/0.1/test/test-amp-animation.js
@@ -20,7 +20,6 @@ import {NativeWebAnimationRunner} from '../runners/native-web-animation-runner';
 import {WebAnimationPlayState} from '../web-animation-types';
 
 describes.sandboxed('AmpAnimation', {}, () => {
-
   function createAnimInWindow(win, attrs, config) {
     const element = win.document.createElement('amp-animation');
     element.setAttribute('id', 'anim1');
@@ -44,730 +43,833 @@ describes.sandboxed('AmpAnimation', {}, () => {
     return element.build().then(() => element.implementation_);
   }
 
-
-  describes.realWin('in top-level doc', {
-    amp: {
-      ampdoc: 'single',
-      extensions: ['amp-animation'],
+  describes.realWin(
+    'in top-level doc',
+    {
+      amp: {
+        ampdoc: 'single',
+        extensions: ['amp-animation'],
+      },
     },
-  }, env => {
-    let win;
-    let viewer;
-    let createRunnerStub;
-    let runner;
-    let runnerMock;
-
-    beforeEach(() => {
-      win = env.win;
-      viewer = win.services.viewer.obj;
-      viewer.setVisibilityState_('hidden');
-      runner = new NativeWebAnimationRunner([]);
-      runnerMock = sandbox.mock(runner);
-      createRunnerStub =
-          sandbox.stub(AmpAnimation.prototype, 'createRunner_').callsFake(
-              () => Promise.resolve(runner));
-    });
-
-    afterEach(() => {
-      runnerMock.verify();
-    });
-
-    function createAnim(attrs, config) {
-      return createAnimInWindow(win, attrs, config);
-    }
+    env => {
+      let win;
+      let viewer;
+      let createRunnerStub;
+      let runner;
+      let runnerMock;
 
-    it('should load and parse config', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      expect(anim.configJson_).to.deep.equal({duration: 1001});
-    });
-
-    it('should fail without config', () => {
-      return createAnim({}, null).then(() => {
-        throw new Error('must have failed');
-      }, reason => {
-        expect(reason.message)
-            .to.match(/\"<script type=application\/json>\" must be present/);
-      });
-    });
-
-    it('should fail with malformed config', () => {
-      return createAnim({}, 'broken').then(() => {
-        throw new Error('must have failed');
-      }, reason => {
-        expect(reason.message)
-            .to.match(/failed to parse animation script/);
-      });
-    });
-
-    it('should default trigger to none', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      expect(anim.triggerOnVisibility_).to.be.false;
-    });
-
-    it('should parse visibility trigger', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      expect(anim.triggerOnVisibility_).to.be.true;
-
-      // Animation is made to be always in viewport via mutateElement.
-      expect(anim.element.style['position']).to.not.equal('fixed');
-      return anim.mutateElement(() => {}).then(() => {
-        expect(anim.element.style['position']).to.equal('fixed');
-        expect(anim.element.style['visibility']).to.equal('hidden');
-        expect(anim.element.style['top']).to.equal('0px');
-        expect(anim.element.style['left']).to.equal('0px');
-        expect(anim.element.style['width']).to.equal('1px');
-        expect(anim.element.style['height']).to.equal('1px');
-        expect(anim.element).to.have.display('block');
-      });
-    });
-
-    it('should fail on invalid trigger', () => {
-      return createAnim({trigger: 'unknown'}, {duration: 1001}).then(() => {
-        throw new Error('must have failed');
-      }, reason => {
-        expect(reason.message)
-            .to.match(/Only allowed value for \"trigger\" is \"visibility\"/);
-      });
-    });
-
-    it('should update visibility from viewer', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      expect(anim.visible_).to.be.false;
-
-      viewer.setVisibilityState_('visible');
-      expect(anim.visible_).to.be.true;
-    });
-
-    it('should update visibility when paused', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      viewer.setVisibilityState_('visible');
-      expect(anim.visible_).to.be.true;
-
-      anim.pauseCallback();
-      expect(anim.visible_).to.be.false;
-    });
-
-    it('should not activate w/o visibility trigger', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      const activateStub = sandbox.stub(anim, 'startAction_');
-      viewer.setVisibilityState_('visible');
-      yield anim.layoutCallback();
-      expect(activateStub).to.not.be.called;
-    });
-
-    it('should activate with visibility trigger', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const activateStub = sandbox.stub(anim, 'startAction_');
-      viewer.setVisibilityState_('visible');
-      yield anim.layoutCallback();
-      expect(activateStub).to.be.calledOnce;
-    });
-
-    it('should trigger animation, but not start when invisible', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const startStub = sandbox.stub(anim, 'startOrResume_');
-      anim.startAction_();
-      expect(anim.triggered_).to.be.true;
-      expect(startStub).to.not.be.called;
-    });
-
-    it('should trigger animation and start when visible', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const startStub = sandbox.stub(anim, 'startOrResume_');
-      viewer.setVisibilityState_('visible');
-      anim.startAction_();
-      expect(anim.triggered_).to.be.true;
-      expect(startStub).to.be.calledOnce;
-    });
-
-    it('should resume/pause when visibility changes', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const startStub = sandbox.stub(anim, 'startOrResume_');
-      const pauseStub = sandbox.stub(anim, 'pause_');
-      anim.startAction_();
-      expect(anim.triggered_).to.be.true;
-
-      // Go to visible state.
-      viewer.setVisibilityState_('visible');
-      expect(startStub).to.be.calledOnce;
-      expect(pauseStub).to.not.be.called;
-
-      // Go to hidden state.
-      viewer.setVisibilityState_('hidden');
-      expect(pauseStub).to.be.calledOnce;
-      expect(startStub).to.be.calledOnce; // Doesn't change.
-    });
-
-    it('should NOT resume/pause when visible, but not triggered', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const startStub = sandbox.stub(anim, 'startOrResume_');
-      const pauseStub = sandbox.stub(anim, 'pause_');
-      expect(anim.triggered_).to.be.false;
-
-      // Go to visible state.
-      viewer.setVisibilityState_('visible');
-      expect(startStub).to.not.be.called;
-      expect(pauseStub).to.not.be.called;
-
-      // Go to hidden state.
-      viewer.setVisibilityState_('hidden');
-      expect(pauseStub).to.not.be.called;
-      expect(startStub).to.not.be.called;
-    });
-
-    it('should NOT resume when visible if paused by an action', function* () {
-      const anim = yield createAnim({trigger: 'visibility'}, {duration: 1001});
-      const startStub = sandbox.stub(anim, 'startOrResume_');
-      const pauseStub = sandbox.stub(anim, 'pause_');
-      anim.startAction_();
-      anim.pausedByAction_ = true;
-      expect(anim.triggered_).to.be.true;
-
-      // Go to visible state.
-      viewer.setVisibilityState_('visible');
-      expect(startStub).to.not.be.called;
-      expect(pauseStub).to.not.be.called;
-    });
-
-    it('should create runner', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.startAction_();
-      anim.visible_ = true;
-      runnerMock.expects('start').once();
-      runnerMock.expects('finish').never();
-      yield anim.startOrResume_();
-      expect(anim.triggered_).to.be.true;
-      expect(anim.runner_).to.exist;
-    });
-
-    it('should finish animation and runner', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.startAction_();
-      anim.visible_ = true;
-      runnerMock.expects('start').once();
-      runnerMock.expects('finish').once();
-      yield anim.startOrResume_();
-      anim.finish_();
-      expect(anim.triggered_).to.be.false;
-      expect(anim.runner_).to.be.null;
-    });
-
-    it('should pause/resume animation and runner', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.startAction_();
-      anim.visible_ = true;
-      runnerMock.expects('start').once();
-      runnerMock.expects('pause').once();
-      yield anim.startOrResume_();
-      anim.pause_();
-      expect(anim.triggered_).to.be.true;
-
-      runnerMock.expects('resume').once();
-      anim.startOrResume_();
-      expect(anim.triggered_).to.be.true;
-    });
-
-    it('should finish when animation is complete', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.startAction_();
-      anim.visible_ = true;
-      yield anim.startOrResume_();
-      expect(anim.triggered_).to.be.true;
-      expect(anim.runner_).to.exist;
-
-      runner.setPlayState_(WebAnimationPlayState.FINISHED);
-      expect(anim.triggered_).to.be.false;
-      expect(anim.runner_).to.be.null;
-    });
-
-    it('should resize from ampdoc viewport', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      const stub = sandbox.stub(anim, 'onResize_');
-      const viewport = win.services.viewport.obj;
-
-      // No size changes.
-      viewport.resizeObservable_.fire({relayoutAll: false});
-      expect(stub).to.not.be.called;
-
-      // Size has changed.
-      viewport.resizeObservable_.fire({relayoutAll: true});
-      expect(stub).to.be.calledOnce;
-    });
-
-    it('should cancel running animation on resize and schedule restart',
-        function* () {
-          const anim = yield createAnim({trigger: 'visibility'},
-              {duration: 1001, animations: []});
-          anim.startAction_();
-          anim.visible_ = true;
-          yield anim.startOrResume_();
-          expect(anim.runner_).to.exist;
-
-          runnerMock.expects('cancel').once();
-          anim.onResize_();
-          expect(anim.runner_).to.be.null;
-          expect(anim.triggered_).to.be.true;
-          expect(anim.restartPass_.isPending()).to.be.true;
-          anim.restartPass_.cancel();
-        });
+      beforeEach(() => {
+        win = env.win;
+        viewer = win.services.viewer.obj;
+        viewer.setVisibilityState_('hidden');
+        runner = new NativeWebAnimationRunner([]);
+        runnerMock = sandbox.mock(runner);
+        createRunnerStub = sandbox
+          .stub(AmpAnimation.prototype, 'createRunner_')
+          .callsFake(() => Promise.resolve(runner));
+      });
 
-    it('should ignore not-triggered animation on resize', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.visible_ = true;
-      expect(anim.runner_).to.not.exist;
-      runnerMock.expects('cancel').never();
-      anim.onResize_();
-      expect(anim.runner_).to.be.null;
-      expect(anim.triggered_).to.be.false;
-      expect(anim.restartPass_.isPending()).to.be.false;
-    });
-
-    it('should cancel and NOT restart hidden animation on resize',
-        function* () {
-          const anim = yield createAnim({trigger: 'visibility'},
-              {duration: 1001, animations: []});
-          anim.startAction_();
-          anim.visible_ = true;
-          yield anim.startOrResume_();
-          expect(anim.runner_).to.exist;
+      afterEach(() => {
+        runnerMock.verify();
+      });
 
-          anim.visible_ = false;
-          runnerMock.expects('cancel').once();
-          anim.onResize_();
-          expect(anim.runner_).to.be.null;
-          expect(anim.triggered_).to.be.true;
-          expect(anim.restartPass_.isPending()).to.be.false;
-        });
+      function createAnim(attrs, config) {
+        return createAnimInWindow(win, attrs, config);
+      }
 
-    it('should ignore start when not triggered', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.visible_ = true;
-      expect(anim.startOrResume_()).to.be.null;
-    });
+      it('should load and parse config', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        expect(anim.configJson_).to.deep.equal({duration: 1001});
+      });
 
-    it('should ignore start when not triggered', function* () {
-      const anim = yield createAnim({trigger: 'visibility'},
-          {duration: 1001, animations: []});
-      anim.startAction_();
-      anim.visible_ = false;
-      expect(anim.startOrResume_()).to.be.null;
-    });
+      it('should fail without config', () => {
+        return createAnim({}, null).then(
+          () => {
+            throw new Error('must have failed');
+          },
+          reason => {
+            expect(reason.message).to.match(
+              /\"<script type=application\/json>\" must be present/
+            );
+          }
+        );
+      });
 
-    describe('actions', () => {
-      let anim;
+      it('should fail with malformed config', () => {
+        return createAnim({}, 'broken').then(
+          () => {
+            throw new Error('must have failed');
+          },
+          reason => {
+            expect(reason.message).to.match(/failed to parse animation script/);
+          }
+        );
+      });
 
-      beforeEach(() => {
-        return createAnim({}, {duration: 1001}).then(a => {
-          anim = a;
-          anim.visible_ = true;
-        });
+      it('should default trigger to none', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        expect(anim.triggerOnVisibility_).to.be.false;
       });
 
-      it('should trigger activate', () => {
-        const args = {};
-        const invocation = {
-          method: DEFAULT_ACTION,
-          args,
-          satisfiesTrust: () => true,
-        };
-        expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
-        expect(anim.triggered_).to.be.false;
+      it('should parse visibility trigger', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        expect(anim.triggerOnVisibility_).to.be.true;
+
+        // Animation is made to be always in viewport via mutateElement.
+        expect(anim.element.style['position']).to.not.equal('fixed');
+        return anim
+          .mutateElement(() => {})
+          .then(() => {
+            expect(anim.element.style['position']).to.equal('fixed');
+            expect(anim.element.style['visibility']).to.equal('hidden');
+            expect(anim.element.style['top']).to.equal('0px');
+            expect(anim.element.style['left']).to.equal('0px');
+            expect(anim.element.style['width']).to.equal('1px');
+            expect(anim.element.style['height']).to.equal('1px');
+            expect(anim.element).to.have.display('block');
+          });
+      });
 
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
-        });
+      it('should fail on invalid trigger', () => {
+        return createAnim({trigger: 'unknown'}, {duration: 1001}).then(
+          () => {
+            throw new Error('must have failed');
+          },
+          reason => {
+            expect(reason.message).to.match(
+              /Only allowed value for \"trigger\" is \"visibility\"/
+            );
+          }
+        );
       });
 
-      it('should trigger start', () => {
-        const args = {};
-        const invocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
-        expect(anim.triggered_).to.be.false;
+      it('should update visibility from viewer', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        expect(anim.visible_).to.be.false;
 
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
-        });
+        viewer.setVisibilityState_('visible');
+        expect(anim.visible_).to.be.true;
       });
 
-      it('should create runner with args', () => {
-        const args = {foo: 'bar'};
-        const invocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
+      it('should update visibility when paused', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        viewer.setVisibilityState_('visible');
+        expect(anim.visible_).to.be.true;
 
-        expect(createRunnerStub).not.to.be.called;
+        anim.pauseCallback();
+        expect(anim.visible_).to.be.false;
+      });
 
-        return anim.executeAction(invocation).then(() => {
-          expect(createRunnerStub).to.be.calledWith(args);
-        });
+      it('should not activate w/o visibility trigger', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        const activateStub = sandbox.stub(anim, 'startAction_');
+        viewer.setVisibilityState_('visible');
+        yield anim.layoutCallback();
+        expect(activateStub).to.not.be.called;
       });
 
-      it('should trigger but not start if not visible', () => {
-        anim.visible_ = false;
-        const args = {};
-        const invocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
-        expect(anim.triggered_).to.be.false;
+      it('should activate with visibility trigger', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        const activateStub = sandbox.stub(anim, 'startAction_');
+        viewer.setVisibilityState_('visible');
+        yield anim.layoutCallback();
+        expect(activateStub).to.be.calledOnce;
+      });
 
-        return anim.executeAction(invocation).then(() => {
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
-          expect(anim.triggered_).to.be.true;
-        });
+      it('should trigger animation, but not start when invisible', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        const startStub = sandbox.stub(anim, 'startOrResume_');
+        anim.startAction_();
+        expect(anim.triggered_).to.be.true;
+        expect(startStub).to.not.be.called;
       });
 
-      it('should trigger restart', () => {
-        const cancelStub = sandbox.stub(anim, 'cancel_');
-        const args = {};
-        const invocation = {
-          method: 'restart',
-          args,
-          satisfiesTrust: () => true,
-        };
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(cancelStub).to.be.calledOnce;
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
-        });
+      it('should trigger animation and start when visible', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        const startStub = sandbox.stub(anim, 'startOrResume_');
+        viewer.setVisibilityState_('visible');
+        anim.startAction_();
+        expect(anim.triggered_).to.be.true;
+        expect(startStub).to.be.calledOnce;
       });
 
-      it('should trigger pause after start', () => {
-        const args = {};
-        const startInvocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const pauseInvocation = {
-          method: 'pause',
-          args,
-          satisfiesTrust: () => true,
-        };
-        anim.executeAction(startInvocation);
-        return anim.executeAction(pauseInvocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
-        });
+      it('should resume/pause when visibility changes', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        const startStub = sandbox.stub(anim, 'startOrResume_');
+        const pauseStub = sandbox.stub(anim, 'pause_');
+        anim.startAction_();
+        expect(anim.triggered_).to.be.true;
+
+        // Go to visible state.
+        viewer.setVisibilityState_('visible');
+        expect(startStub).to.be.calledOnce;
+        expect(pauseStub).to.not.be.called;
+
+        // Go to hidden state.
+        viewer.setVisibilityState_('hidden');
+        expect(pauseStub).to.be.calledOnce;
+        expect(startStub).to.be.calledOnce; // Doesn't change.
       });
 
-      it('should ignore pause before start', () => {
-        runnerMock.expects('pause').never();
-        return anim.executeAction(
-            {method: 'pause', satisfiesTrust: () => true}
+      it('should NOT resume/pause when visible, but not triggered', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
         );
+        const startStub = sandbox.stub(anim, 'startOrResume_');
+        const pauseStub = sandbox.stub(anim, 'pause_');
+        expect(anim.triggered_).to.be.false;
+
+        // Go to visible state.
+        viewer.setVisibilityState_('visible');
+        expect(startStub).to.not.be.called;
+        expect(pauseStub).to.not.be.called;
+
+        // Go to hidden state.
+        viewer.setVisibilityState_('hidden');
+        expect(pauseStub).to.not.be.called;
+        expect(startStub).to.not.be.called;
       });
 
-      it('should trigger resume after start follwed by pause', () => {
-        const args = {};
-        const startInvocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const pauseInvocation = {
-          method: 'pause',
-          args,
-          satisfiesTrust: () => true,
-        };
-        anim.executeAction(startInvocation);
-        return anim.executeAction(pauseInvocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
-          const resumeInvocation = {
-            method: 'resume',
-            args,
-            satisfiesTrust: () => true,
-          };
-          return anim.executeAction(resumeInvocation);
-        }).then(() => {
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
-        });
+      it('should NOT resume when visible if paused by an action', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001}
+        );
+        const startStub = sandbox.stub(anim, 'startOrResume_');
+        const pauseStub = sandbox.stub(anim, 'pause_');
+        anim.startAction_();
+        anim.pausedByAction_ = true;
+        expect(anim.triggered_).to.be.true;
+
+        // Go to visible state.
+        viewer.setVisibilityState_('visible');
+        expect(startStub).to.not.be.called;
+        expect(pauseStub).to.not.be.called;
       });
 
-      it('should ignore resume before start', () => {
-        runnerMock.expects('resume').never();
-        return anim.executeAction(
-            {method: 'resume', satisfiesTrust: () => true}
+      it('should create runner', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
         );
+        anim.startAction_();
+        anim.visible_ = true;
+        runnerMock.expects('start').once();
+        runnerMock.expects('finish').never();
+        yield anim.startOrResume_();
+        expect(anim.triggered_).to.be.true;
+        expect(anim.runner_).to.exist;
       });
 
-      it('should toggle pause/resume after start', () => {
-        const args = {};
-        const startInvocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const togglePauseInvocation = {
-          method: 'togglePause',
-          args,
-          satisfiesTrust: () => true,
-        };
-        anim.executeAction(startInvocation);
-        return anim.executeAction(togglePauseInvocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
-          return anim.executeAction(togglePauseInvocation);
-        }).then(() => {
-          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
-        });
+      it('should finish animation and runner', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.startAction_();
+        anim.visible_ = true;
+        runnerMock.expects('start').once();
+        runnerMock.expects('finish').once();
+        yield anim.startOrResume_();
+        anim.finish_();
+        expect(anim.triggered_).to.be.false;
+        expect(anim.runner_).to.be.null;
       });
 
-      it('should ignore toggle pause/resume before start', () => {
-        runnerMock.expects('resume').never();
-        runnerMock.expects('pause').never();
-        return anim.executeAction(
-            {method: 'togglePause', satisfiesTrust: () => true}
+      it('should pause/resume animation and runner', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
         );
+        anim.startAction_();
+        anim.visible_ = true;
+        runnerMock.expects('start').once();
+        runnerMock.expects('pause').once();
+        yield anim.startOrResume_();
+        anim.pause_();
+        expect(anim.triggered_).to.be.true;
+
+        runnerMock.expects('resume').once();
+        anim.startOrResume_();
+        expect(anim.triggered_).to.be.true;
       });
 
-      it('should seek-to (time) regardless of start', () => {
-        const invocation = {
-          method: 'seekTo',
-          args: {time: 100},
-          satisfiesTrust: () => true,
-        };
+      it('should finish when animation is complete', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.startAction_();
+        anim.visible_ = true;
+        yield anim.startOrResume_();
+        expect(anim.triggered_).to.be.true;
+        expect(anim.runner_).to.exist;
 
-        runnerMock.expects('seekTo').withExactArgs(100).once();
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-        });
+        runner.setPlayState_(WebAnimationPlayState.FINISHED);
+        expect(anim.triggered_).to.be.false;
+        expect(anim.runner_).to.be.null;
       });
 
-      it('should seek-to (percent) regardless of start', () => {
-        const invocation = {
-          method: 'seekTo',
-          args: {percent: 0.5},
-          satisfiesTrust: () => true,
-        };
+      it('should resize from ampdoc viewport', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        const stub = sandbox.stub(anim, 'onResize_');
+        const viewport = win.services.viewport.obj;
 
-        runnerMock.expects('seekToPercent').withExactArgs(0.5).once();
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-        });
+        // No size changes.
+        viewport.resizeObservable_.fire({relayoutAll: false});
+        expect(stub).to.not.be.called;
+
+        // Size has changed.
+        viewport.resizeObservable_.fire({relayoutAll: true});
+        expect(stub).to.be.calledOnce;
       });
 
-      it('should clamp percent (upper) seekTo', () => {
-        const invocation = {
-          method: 'seekTo',
-          args: {percent: 1.5},
-          satisfiesTrust: () => true,
-        };
+      it('should cancel running animation on resize and schedule restart', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.startAction_();
+        anim.visible_ = true;
+        yield anim.startOrResume_();
+        expect(anim.runner_).to.exist;
+
+        runnerMock.expects('cancel').once();
+        anim.onResize_();
+        expect(anim.runner_).to.be.null;
+        expect(anim.triggered_).to.be.true;
+        expect(anim.restartPass_.isPending()).to.be.true;
+        anim.restartPass_.cancel();
+      });
 
-        runnerMock.expects('seekToPercent').withExactArgs(1).once();
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-        });
+      it('should ignore not-triggered animation on resize', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.visible_ = true;
+        expect(anim.runner_).to.not.exist;
+        runnerMock.expects('cancel').never();
+        anim.onResize_();
+        expect(anim.runner_).to.be.null;
+        expect(anim.triggered_).to.be.false;
+        expect(anim.restartPass_.isPending()).to.be.false;
       });
 
-      it('should clamp percent (lower) seekTo', () => {
-        const invocation = {
-          method: 'seekTo',
-          args: {percent: -2},
-          satisfiesTrust: () => true,
-        };
+      it('should cancel and NOT restart hidden animation on resize', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.startAction_();
+        anim.visible_ = true;
+        yield anim.startOrResume_();
+        expect(anim.runner_).to.exist;
 
-        runnerMock.expects('seekToPercent').withExactArgs(0).once();
-        return anim.executeAction(invocation).then(() => {
-          expect(anim.triggered_).to.be.true;
-        });
+        anim.visible_ = false;
+        runnerMock.expects('cancel').once();
+        anim.onResize_();
+        expect(anim.runner_).to.be.null;
+        expect(anim.triggered_).to.be.true;
+        expect(anim.restartPass_.isPending()).to.be.false;
       });
 
-      it('should trigger reverse after start', () => {
-        const args = {};
-        const startInvocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const invocation = {
-          method: 'reverse',
-          args,
-          satisfiesTrust: () => true,
-        };
-        anim.executeAction(startInvocation);
-        runnerMock.expects('reverse').once();
-        return anim.executeAction(invocation);
-      });
-
-      it('should ignore reverse before start', () => {
-        runnerMock.expects('reverse').never();
-        return anim.executeAction(
-            {method: 'reverse', satisfiesTrust: () => true}
+      it('should ignore start when not triggered', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
         );
+        anim.visible_ = true;
+        expect(anim.startOrResume_()).to.be.null;
       });
 
-      it('should trigger finish after start', () => {
-        anim.triggered_ = true;
-        return anim.startOrResume_().then(() => {
-          runnerMock.expects('finish').once();
-          anim.executeAction({method: 'finish', satisfiesTrust: () => true});
-        });
+      it('should ignore start when not triggered', function*() {
+        const anim = yield createAnim(
+          {trigger: 'visibility'},
+          {duration: 1001, animations: []}
+        );
+        anim.startAction_();
+        anim.visible_ = false;
+        expect(anim.startOrResume_()).to.be.null;
       });
 
-      it('should trigger cancel after start', () => {
-        anim.triggered_ = true;
-        return anim.startOrResume_().then(() => {
-          runnerMock.expects('cancel').once();
-          anim.executeAction({method: 'cancel', satisfiesTrust: () => true});
+      describe('actions', () => {
+        let anim;
+
+        beforeEach(() => {
+          return createAnim({}, {duration: 1001}).then(a => {
+            anim = a;
+            anim.visible_ = true;
+          });
         });
-      });
 
-      it('should set paused by action properly', () => {
-        const args = {};
-        const startInvocation = {
-          method: 'start',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const pauseInvocation = {
-          method: 'pause',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const resumeInvocation = {
-          method: 'resume',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const togglePauseInvocation = {
-          method: 'togglePause',
-          args,
-          satisfiesTrust: () => true,
-        };
-        const cancelInvocation = {
-          method: 'cancel',
-          args,
-          satisfiesTrust: () => true,
-        };
-        expect(anim.pausedByAction_).to.be.false;
-
-        return anim.executeAction(startInvocation).then(() => {
-          expect(anim.pausedByAction_).to.be.false;
-          return anim.executeAction(pauseInvocation);
-        }).then(() => {
-          expect(anim.pausedByAction_).to.be.true;
-          return anim.executeAction(resumeInvocation);
-        }).then(() => {
-          expect(anim.pausedByAction_).to.be.false;
-          return anim.executeAction(togglePauseInvocation);
-        }).then(() => {
-          expect(anim.pausedByAction_).to.be.true;
-          return anim.executeAction(cancelInvocation);
-        }).then(() => {
-          expect(anim.pausedByAction_).to.be.false;
+        it('should trigger activate', () => {
+          const args = {};
+          const invocation = {
+            method: DEFAULT_ACTION,
+            args,
+            satisfiesTrust: () => true,
+          };
+          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
+          expect(anim.triggered_).to.be.false;
+
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+            expect(runner.getPlayState()).to.equal(
+              WebAnimationPlayState.RUNNING
+            );
+          });
         });
-      });
 
-      it.skip('should set paused by action flag', () => {
-        anim.triggered_ = true;
-        return anim.startOrResume_().then(() => {
-          expect(anim.pausedByAction_).to.be.false;
-          let invocation = {
+        it('should trigger start', () => {
+          const args = {};
+          const invocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
+          expect(anim.triggered_).to.be.false;
+
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+            expect(runner.getPlayState()).to.equal(
+              WebAnimationPlayState.RUNNING
+            );
+          });
+        });
+
+        it('should create runner with args', () => {
+          const args = {foo: 'bar'};
+          const invocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+
+          expect(createRunnerStub).not.to.be.called;
+
+          return anim.executeAction(invocation).then(() => {
+            expect(createRunnerStub).to.be.calledWith(args);
+          });
+        });
+
+        it('should trigger but not start if not visible', () => {
+          anim.visible_ = false;
+          const args = {};
+          const invocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
+          expect(anim.triggered_).to.be.false;
+
+          return anim.executeAction(invocation).then(() => {
+            expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
+            expect(anim.triggered_).to.be.true;
+          });
+        });
+
+        it('should trigger restart', () => {
+          const cancelStub = sandbox.stub(anim, 'cancel_');
+          const args = {};
+          const invocation = {
+            method: 'restart',
+            args,
+            satisfiesTrust: () => true,
+          };
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+            expect(cancelStub).to.be.calledOnce;
+            expect(anim.triggered_).to.be.true;
+            expect(runner.getPlayState()).to.equal(
+              WebAnimationPlayState.RUNNING
+            );
+          });
+        });
+
+        it('should trigger pause after start', () => {
+          const args = {};
+          const startInvocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const pauseInvocation = {
+            method: 'pause',
+            args,
+            satisfiesTrust: () => true,
+          };
+          anim.executeAction(startInvocation);
+          return anim.executeAction(pauseInvocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+            expect(runner.getPlayState()).to.equal(
+              WebAnimationPlayState.PAUSED
+            );
+          });
+        });
+
+        it('should ignore pause before start', () => {
+          runnerMock.expects('pause').never();
+          return anim.executeAction({
+            method: 'pause',
+            satisfiesTrust: () => true,
+          });
+        });
+
+        it('should trigger resume after start follwed by pause', () => {
+          const args = {};
+          const startInvocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const pauseInvocation = {
             method: 'pause',
-            args: {},
+            args,
             satisfiesTrust: () => true,
           };
-          anim.executeAction(invocation);
-          expect(anim.pausedByAction_).to.be.true;
+          anim.executeAction(startInvocation);
+          return anim
+            .executeAction(pauseInvocation)
+            .then(() => {
+              expect(anim.triggered_).to.be.true;
+              expect(runner.getPlayState()).to.equal(
+                WebAnimationPlayState.PAUSED
+              );
+              const resumeInvocation = {
+                method: 'resume',
+                args,
+                satisfiesTrust: () => true,
+              };
+              return anim.executeAction(resumeInvocation);
+            })
+            .then(() => {
+              expect(runner.getPlayState()).to.equal(
+                WebAnimationPlayState.RUNNING
+              );
+            });
+        });
 
-          invocation = {
+        it('should ignore resume before start', () => {
+          runnerMock.expects('resume').never();
+          return anim.executeAction({
             method: 'resume',
-            args: {},
+            satisfiesTrust: () => true,
+          });
+        });
+
+        it('should toggle pause/resume after start', () => {
+          const args = {};
+          const startInvocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const togglePauseInvocation = {
+            method: 'togglePause',
+            args,
+            satisfiesTrust: () => true,
+          };
+          anim.executeAction(startInvocation);
+          return anim
+            .executeAction(togglePauseInvocation)
+            .then(() => {
+              expect(anim.triggered_).to.be.true;
+              expect(runner.getPlayState()).to.equal(
+                WebAnimationPlayState.PAUSED
+              );
+              return anim.executeAction(togglePauseInvocation);
+            })
+            .then(() => {
+              expect(runner.getPlayState()).to.equal(
+                WebAnimationPlayState.RUNNING
+              );
+            });
+        });
+
+        it('should ignore toggle pause/resume before start', () => {
+          runnerMock.expects('resume').never();
+          runnerMock.expects('pause').never();
+          return anim.executeAction({
+            method: 'togglePause',
+            satisfiesTrust: () => true,
+          });
+        });
+
+        it('should seek-to (time) regardless of start', () => {
+          const invocation = {
+            method: 'seekTo',
+            args: {time: 100},
+            satisfiesTrust: () => true,
+          };
+
+          runnerMock
+            .expects('seekTo')
+            .withExactArgs(100)
+            .once();
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+          });
+        });
+
+        it('should seek-to (percent) regardless of start', () => {
+          const invocation = {
+            method: 'seekTo',
+            args: {percent: 0.5},
+            satisfiesTrust: () => true,
+          };
+
+          runnerMock
+            .expects('seekToPercent')
+            .withExactArgs(0.5)
+            .once();
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+          });
+        });
+
+        it('should clamp percent (upper) seekTo', () => {
+          const invocation = {
+            method: 'seekTo',
+            args: {percent: 1.5},
+            satisfiesTrust: () => true,
+          };
+
+          runnerMock
+            .expects('seekToPercent')
+            .withExactArgs(1)
+            .once();
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+          });
+        });
+
+        it('should clamp percent (lower) seekTo', () => {
+          const invocation = {
+            method: 'seekTo',
+            args: {percent: -2},
+            satisfiesTrust: () => true,
+          };
+
+          runnerMock
+            .expects('seekToPercent')
+            .withExactArgs(0)
+            .once();
+          return anim.executeAction(invocation).then(() => {
+            expect(anim.triggered_).to.be.true;
+          });
+        });
+
+        it('should trigger reverse after start', () => {
+          const args = {};
+          const startInvocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const invocation = {
+            method: 'reverse',
+            args,
+            satisfiesTrust: () => true,
+          };
+          anim.executeAction(startInvocation);
+          runnerMock.expects('reverse').once();
+          return anim.executeAction(invocation);
+        });
+
+        it('should ignore reverse before start', () => {
+          runnerMock.expects('reverse').never();
+          return anim.executeAction({
+            method: 'reverse',
+            satisfiesTrust: () => true,
+          });
+        });
+
+        it('should trigger finish after start', () => {
+          anim.triggered_ = true;
+          return anim.startOrResume_().then(() => {
+            runnerMock.expects('finish').once();
+            anim.executeAction({method: 'finish', satisfiesTrust: () => true});
+          });
+        });
+
+        it('should trigger cancel after start', () => {
+          anim.triggered_ = true;
+          return anim.startOrResume_().then(() => {
+            runnerMock.expects('cancel').once();
+            anim.executeAction({method: 'cancel', satisfiesTrust: () => true});
+          });
+        });
+
+        it('should set paused by action properly', () => {
+          const args = {};
+          const startInvocation = {
+            method: 'start',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const pauseInvocation = {
+            method: 'pause',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const resumeInvocation = {
+            method: 'resume',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const togglePauseInvocation = {
+            method: 'togglePause',
+            args,
+            satisfiesTrust: () => true,
+          };
+          const cancelInvocation = {
+            method: 'cancel',
+            args,
             satisfiesTrust: () => true,
           };
-          anim.executeAction(invocation);
           expect(anim.pausedByAction_).to.be.false;
+
+          return anim
+            .executeAction(startInvocation)
+            .then(() => {
+              expect(anim.pausedByAction_).to.be.false;
+              return anim.executeAction(pauseInvocation);
+            })
+            .then(() => {
+              expect(anim.pausedByAction_).to.be.true;
+              return anim.executeAction(resumeInvocation);
+            })
+            .then(() => {
+              expect(anim.pausedByAction_).to.be.false;
+              return anim.executeAction(togglePauseInvocation);
+            })
+            .then(() => {
+              expect(anim.pausedByAction_).to.be.true;
+              return anim.executeAction(cancelInvocation);
+            })
+            .then(() => {
+              expect(anim.pausedByAction_).to.be.false;
+            });
+        });
+
+        it.skip('should set paused by action flag', () => {
+          anim.triggered_ = true;
+          return anim.startOrResume_().then(() => {
+            expect(anim.pausedByAction_).to.be.false;
+            let invocation = {
+              method: 'pause',
+              args: {},
+              satisfiesTrust: () => true,
+            };
+            anim.executeAction(invocation);
+            expect(anim.pausedByAction_).to.be.true;
+
+            invocation = {
+              method: 'resume',
+              args: {},
+              satisfiesTrust: () => true,
+            };
+            anim.executeAction(invocation);
+            expect(anim.pausedByAction_).to.be.false;
+          });
         });
       });
-    });
-  });
+    }
+  );
+
+  describes.realWin(
+    'in FIE',
+    {
+      amp: {
+        ampdoc: 'fie',
+        extensions: ['amp-animation'],
+      },
+    },
+    env => {
+      let embed;
 
+      beforeEach(() => {
+        embed = env.embed;
+        embed.setVisible_(false);
+      });
 
-  describes.realWin('in FIE', {
-    amp: {
-      ampdoc: 'fie',
-      extensions: ['amp-animation'],
-    },
-  }, env => {
-    let embed;
+      function createAnim(attrs, config) {
+        return createAnimInWindow(embed.win, attrs, config);
+      }
 
-    beforeEach(() => {
-      embed = env.embed;
-      embed.setVisible_(false);
-    });
+      it('should update visibility from embed', function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        expect(anim.visible_).to.be.false;
 
-    function createAnim(attrs, config) {
-      return createAnimInWindow(embed.win, attrs, config);
-    }
+        embed.setVisible_(true);
+        expect(anim.visible_).to.be.true;
+      });
+
+      it('should find target in the embed only via selector', function*() {
+        const parentWin = env.ampdoc.win;
+        const embedWin = embed.win;
+        const anim = yield createAnim(
+          {},
+          {duration: 1001, selector: '#target1', keyframes: {}}
+        );
+        const targetInDoc = parentWin.document.createElement('div');
+        targetInDoc.setAttribute('id', 'target1');
+        parentWin.document.body.appendChild(targetInDoc);
+        const targetInEmbed = embedWin.document.createElement('div');
+        targetInEmbed.setAttribute('id', 'target1');
+        embedWin.document.body.appendChild(targetInEmbed);
+        return anim.createRunner_().then(runner => {
+          const requests = runner.requests_;
+          expect(requests).to.have.length(1);
+          expect(requests[0].target).to.equal(targetInEmbed);
+        });
+      });
 
-    it('should update visibility from embed', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      expect(anim.visible_).to.be.false;
-
-      embed.setVisible_(true);
-      expect(anim.visible_).to.be.true;
-    });
-
-    it('should find target in the embed only via selector', function* () {
-      const parentWin = env.ampdoc.win;
-      const embedWin = embed.win;
-      const anim = yield createAnim({},
-          {duration: 1001, selector: '#target1', keyframes: {}});
-      const targetInDoc = parentWin.document.createElement('div');
-      targetInDoc.setAttribute('id', 'target1');
-      parentWin.document.body.appendChild(targetInDoc);
-      const targetInEmbed = embedWin.document.createElement('div');
-      targetInEmbed.setAttribute('id', 'target1');
-      embedWin.document.body.appendChild(targetInEmbed);
-      return anim.createRunner_().then(runner => {
-        const requests = runner.requests_;
-        expect(requests).to.have.length(1);
-        expect(requests[0].target).to.equal(targetInEmbed);
-      });
-    });
-
-    it('should find target in the embed only via target', function* () {
-      const parentWin = env.ampdoc.win;
-      const embedWin = embed.win;
-      const anim = yield createAnim({},
-          {duration: 1001, target: 'target1', keyframes: {}});
-      const targetInDoc = parentWin.document.createElement('div');
-      targetInDoc.setAttribute('id', 'target1');
-      parentWin.document.body.appendChild(targetInDoc);
-      const targetInEmbed = embedWin.document.createElement('div');
-      targetInEmbed.setAttribute('id', 'target1');
-      embedWin.document.body.appendChild(targetInEmbed);
-      return anim.createRunner_().then(runner => {
-        const requests = runner.requests_;
-        expect(requests).to.have.length(1);
-        expect(requests[0].target).to.equal(targetInEmbed);
-      });
-    });
-
-    it('should take resize from embed\'s window', function* () {
-      const anim = yield createAnim({}, {duration: 1001});
-      const stub = sandbox.stub(anim, 'onResize_');
-      embed.win.eventListeners.fire({type: 'resize'});
-      expect(stub).to.be.calledOnce;
-    });
-  });
+      it('should find target in the embed only via target', function*() {
+        const parentWin = env.ampdoc.win;
+        const embedWin = embed.win;
+        const anim = yield createAnim(
+          {},
+          {duration: 1001, target: 'target1', keyframes: {}}
+        );
+        const targetInDoc = parentWin.document.createElement('div');
+        targetInDoc.setAttribute('id', 'target1');
+        parentWin.document.body.appendChild(targetInDoc);
+        const targetInEmbed = embedWin.document.createElement('div');
+        targetInEmbed.setAttribute('id', 'target1');
+        embedWin.document.body.appendChild(targetInEmbed);
+        return anim.createRunner_().then(runner => {
+          const requests = runner.requests_;
+          expect(requests).to.have.length(1);
+          expect(requests[0].target).to.equal(targetInEmbed);
+        });
+      });
+
+      it("should take resize from embed's window", function*() {
+        const anim = yield createAnim({}, {duration: 1001});
+        const stub = sandbox.stub(anim, 'onResize_');
+        embed.win.eventListeners.fire({type: 'resize'});
+        expect(stub).to.be.calledOnce;
+      });
+    }
+  );
 });
diff --git a/extensions/amp-animation/0.1/test/test-css-expr.js b/extensions/amp-animation/0.1/test/test-css-expr.js
index 0ed4b44e17e7..619e695f424c 100644
--- a/extensions/amp-animation/0.1/test/test-css-expr.js
+++ b/extensions/amp-animation/0.1/test/test-css-expr.js
@@ -17,9 +17,7 @@
 import * as ast from '../parsers/css-expr-ast';
 import {parseCss} from '../parsers/css-expr';
 
-
 describe('CSS parse', () => {
-
   /**
    * @param {string} cssString
    * @return {string}
@@ -32,7 +30,6 @@ describe('CSS parse', () => {
     return pseudo(node);
   }
 
-
   /**
    * @param {!CssNode} n
    * @return {string}
@@ -48,25 +45,33 @@ describe('CSS parse', () => {
       return `CON<${pseudoArray(n.array_)}>`;
     }
     if (n instanceof ast.CssNumericNode) {
-      return `${n.type_}<${n.num_}` +
-          `${n.units_ && n.units_ != '%' ? ' ' + n.units_.toUpperCase() : ''}>`;
+      return (
+        `${n.type_}<${n.num_}` +
+        `${n.units_ && n.units_ != '%' ? ' ' + n.units_.toUpperCase() : ''}>`
+      );
     }
     if (n instanceof ast.CssTranslateNode) {
-      return 'TRANSLATE' +
-          `${n.suffix_ ? '-' + n.suffix_.toUpperCase() : ''}` +
-          `<${pseudoArray(n.args_)}>`;
+      return (
+        'TRANSLATE' +
+        `${n.suffix_ ? '-' + n.suffix_.toUpperCase() : ''}` +
+        `<${pseudoArray(n.args_)}>`
+      );
     }
     if (n instanceof ast.CssDimSizeNode) {
-      return `DIM<${n.dim_}` +
-          `, ${n.selector_ ? '"' + n.selector_ + '"' : null}` +
-          `, ${n.selectionMethod_}>`;
+      return (
+        `DIM<${n.dim_}` +
+        `, ${n.selector_ ? '"' + n.selector_ + '"' : null}` +
+        `, ${n.selectionMethod_}>`
+      );
     }
     if (n instanceof ast.CssNumConvertNode) {
       return `NUMC<${n.value_ ? pseudo(n.value_) : null}>`;
     }
     if (n instanceof ast.CssRandNode) {
-      return `RAND<${n.left_ ? pseudo(n.left_) : null}` +
-          `, ${n.right_ ? pseudo(n.right_) : null}>`;
+      return (
+        `RAND<${n.left_ ? pseudo(n.left_) : null}` +
+        `, ${n.right_ ? pseudo(n.right_) : null}>`
+      );
     }
     if (n instanceof ast.CssIndexNode) {
       return 'INDEX<>';
@@ -81,12 +86,16 @@ describe('CSS parse', () => {
       return `CALC<${pseudo(n.expr_)}>`;
     }
     if (n instanceof ast.CssCalcSumNode) {
-      return `${n.op_ == '+' ? 'ADD' : 'SUB'}` +
-          `<${pseudo(n.left_)}, ${pseudo(n.right_)}>`;
+      return (
+        `${n.op_ == '+' ? 'ADD' : 'SUB'}` +
+        `<${pseudo(n.left_)}, ${pseudo(n.right_)}>`
+      );
     }
     if (n instanceof ast.CssCalcProductNode) {
-      return `${n.op_ == '*' ? 'MUL' : 'DIV'}` +
-          `<${pseudo(n.left_)}, ${pseudo(n.right_)}>`;
+      return (
+        `${n.op_ == '*' ? 'MUL' : 'DIV'}` +
+        `<${pseudo(n.left_)}, ${pseudo(n.right_)}>`
+      );
     }
     if (n instanceof ast.CssFuncNode) {
       return `${n.name_.toUpperCase()}<${pseudoArray(n.args_)}>`;
@@ -111,7 +120,7 @@ describe('CSS parse', () => {
 
   it('should parse string', () => {
     expect(parsePseudo('"abc"')).to.equal('"abc"');
-    expect(parsePseudo('\'abc\'')).to.equal('\'abc\'');
+    expect(parsePseudo("'abc'")).to.equal("'abc'");
   });
 
   it('should parse ident', () => {
@@ -188,17 +197,18 @@ describe('CSS parse', () => {
   });
 
   it('should parse url', () => {
-    expect(parsePseudo('url("https://acme.org/abc")'))
-        .to.equal('URL<https://acme.org/abc>');
-    expect(parsePseudo('url(\'https://acme.org/abc\')'))
-        .to.equal('URL<https://acme.org/abc>');
-    expect(parsePseudo('url(\'data:abc\')'))
-        .to.equal('URL<data:abc>');
+    expect(parsePseudo('url("https://acme.org/abc")')).to.equal(
+      'URL<https://acme.org/abc>'
+    );
+    expect(parsePseudo("url('https://acme.org/abc')")).to.equal(
+      'URL<https://acme.org/abc>'
+    );
+    expect(parsePseudo("url('data:abc')")).to.equal('URL<data:abc>');
     // HTTP and relative are allowed at this stage.
-    expect(parsePseudo('url(\'http://acme.org/abc\')'))
-        .to.equal('URL<http://acme.org/abc>');
-    expect(parsePseudo('url(\'/relative\')'))
-        .to.equal('URL</relative>');
+    expect(parsePseudo("url('http://acme.org/abc')")).to.equal(
+      'URL<http://acme.org/abc>'
+    );
+    expect(parsePseudo("url('/relative')")).to.equal('URL</relative>');
   });
 
   it('should parse hexcolor', () => {
@@ -215,109 +225,122 @@ describe('CSS parse', () => {
   it('should parse a function', () => {
     expect(parsePseudo('unknown()')).to.equal('UNKNOWN<>');
     expect(parsePseudo('unknown( )')).to.equal('UNKNOWN<>');
-    expect(parsePseudo('rgb(10, 20, 30)'))
-        .to.equal('RGB<NUM<10>, NUM<20>, NUM<30>>');
-    expect(parsePseudo('translate(100px, 200px)'))
-        .to.equal('TRANSLATE<LEN<100 PX>, LEN<200 PX>>');
+    expect(parsePseudo('rgb(10, 20, 30)')).to.equal(
+      'RGB<NUM<10>, NUM<20>, NUM<30>>'
+    );
+    expect(parsePseudo('translate(100px, 200px)')).to.equal(
+      'TRANSLATE<LEN<100 PX>, LEN<200 PX>>'
+    );
   });
 
   it('should parse a translate()', () => {
-    expect(parsePseudo('translate(100px)'))
-        .to.equal('TRANSLATE<LEN<100 PX>>');
-    expect(parsePseudo('translate(100px, 200px)'))
-        .to.equal('TRANSLATE<LEN<100 PX>, LEN<200 PX>>');
-    expect(parsePseudo('translateX(100px)'))
-        .to.equal('TRANSLATE-X<LEN<100 PX>>');
-    expect(parsePseudo('TRANSLATEX(100px)'))
-        .to.equal('TRANSLATE-X<LEN<100 PX>>');
-    expect(parsePseudo('translatex(100px)'))
-        .to.equal('TRANSLATE-X<LEN<100 PX>>');
-    expect(parsePseudo('translateY(100px)'))
-        .to.equal('TRANSLATE-Y<LEN<100 PX>>');
-    expect(parsePseudo('translateZ(100px)'))
-        .to.equal('TRANSLATE-Z<LEN<100 PX>>');
-    expect(parsePseudo('translate3d(1px, 2px, 3px)'))
-        .to.equal('TRANSLATE-3D<LEN<1 PX>, LEN<2 PX>, LEN<3 PX>>');
+    expect(parsePseudo('translate(100px)')).to.equal('TRANSLATE<LEN<100 PX>>');
+    expect(parsePseudo('translate(100px, 200px)')).to.equal(
+      'TRANSLATE<LEN<100 PX>, LEN<200 PX>>'
+    );
+    expect(parsePseudo('translateX(100px)')).to.equal(
+      'TRANSLATE-X<LEN<100 PX>>'
+    );
+    expect(parsePseudo('TRANSLATEX(100px)')).to.equal(
+      'TRANSLATE-X<LEN<100 PX>>'
+    );
+    expect(parsePseudo('translatex(100px)')).to.equal(
+      'TRANSLATE-X<LEN<100 PX>>'
+    );
+    expect(parsePseudo('translateY(100px)')).to.equal(
+      'TRANSLATE-Y<LEN<100 PX>>'
+    );
+    expect(parsePseudo('translateZ(100px)')).to.equal(
+      'TRANSLATE-Z<LEN<100 PX>>'
+    );
+    expect(parsePseudo('translate3d(1px, 2px, 3px)')).to.equal(
+      'TRANSLATE-3D<LEN<1 PX>, LEN<2 PX>, LEN<3 PX>>'
+    );
   });
 
   it('should parse a concat of functions', () => {
-    expect(parsePseudo('translateX(100px) rotate(45deg)'))
-        .to.equal('CON<TRANSLATE-X<LEN<100 PX>>, ROTATE<ANG<45 DEG>>>');
+    expect(parsePseudo('translateX(100px) rotate(45deg)')).to.equal(
+      'CON<TRANSLATE-X<LEN<100 PX>>, ROTATE<ANG<45 DEG>>>'
+    );
   });
 
   it('should allow two-way concatenation', () => {
     // This is currently doesn't happen in parse, but by API possible with
     // minor changes to parsing order. Thus it's re-tested separately here.
-    expect(pseudo(ast.CssConcatNode.concat(
-        new ast.CssConcatNode([new ast.CssPassthroughNode('A')]),
-        new ast.CssConcatNode([new ast.CssPassthroughNode('B')]))))
-        .to.equal('CON<A, B>');
-    expect(pseudo(ast.CssConcatNode.concat(
-        new ast.CssPassthroughNode('A'),
-        new ast.CssConcatNode([new ast.CssPassthroughNode('B')]))))
-        .to.equal('CON<A, B>');
+    expect(
+      pseudo(
+        ast.CssConcatNode.concat(
+          new ast.CssConcatNode([new ast.CssPassthroughNode('A')]),
+          new ast.CssConcatNode([new ast.CssPassthroughNode('B')])
+        )
+      )
+    ).to.equal('CON<A, B>');
+    expect(
+      pseudo(
+        ast.CssConcatNode.concat(
+          new ast.CssPassthroughNode('A'),
+          new ast.CssConcatNode([new ast.CssPassthroughNode('B')])
+        )
+      )
+    ).to.equal('CON<A, B>');
   });
 
   it('should parse a dimension function', () => {
     // Current.
-    expect(parsePseudo('width()'))
-        .to.equal('DIM<w, null, null>');
-    expect(parsePseudo('height()'))
-        .to.equal('DIM<h, null, null>');
+    expect(parsePseudo('width()')).to.equal('DIM<w, null, null>');
+    expect(parsePseudo('height()')).to.equal('DIM<h, null, null>');
 
     // Query.
-    expect(parsePseudo('width(".sel")'))
-        .to.equal('DIM<w, ".sel", null>');
-    expect(parsePseudo('WIDTH(".sel > div")'))
-        .to.equal('DIM<w, ".sel > div", null>');
-    expect(parsePseudo('height(".sel")'))
-        .to.equal('DIM<h, ".sel", null>');
+    expect(parsePseudo('width(".sel")')).to.equal('DIM<w, ".sel", null>');
+    expect(parsePseudo('WIDTH(".sel > div")')).to.equal(
+      'DIM<w, ".sel > div", null>'
+    );
+    expect(parsePseudo('height(".sel")')).to.equal('DIM<h, ".sel", null>');
 
     // Closest.
-    expect(parsePseudo('width(closest(".sel"))'))
-        .to.equal('DIM<w, ".sel", closest>');
-    expect(parsePseudo('height(closest(".sel"))'))
-        .to.equal('DIM<h, ".sel", closest>');
+    expect(parsePseudo('width(closest(".sel"))')).to.equal(
+      'DIM<w, ".sel", closest>'
+    );
+    expect(parsePseudo('height(closest(".sel"))')).to.equal(
+      'DIM<h, ".sel", closest>'
+    );
   });
 
   it('should parse a num-convert function', () => {
-    expect(parsePseudo('num(10)'))
-        .to.equal('NUMC<NUM<10>>');
-    expect(parsePseudo('num(10px)'))
-        .to.equal('NUMC<LEN<10 PX>>');
-    expect(parsePseudo('num(10em)'))
-        .to.equal('NUMC<LEN<10 EM>>');
-    expect(parsePseudo('num(10s)'))
-        .to.equal('NUMC<TME<10 S>>');
-    expect(parsePseudo('num(10rad)'))
-        .to.equal('NUMC<ANG<10 RAD>>');
-    expect(parsePseudo('num(10%)'))
-        .to.equal('NUMC<PRC<10>>');
-    expect(parsePseudo('num(var(--x))'))
-        .to.equal('NUMC<VAR<--x>>');
+    expect(parsePseudo('num(10)')).to.equal('NUMC<NUM<10>>');
+    expect(parsePseudo('num(10px)')).to.equal('NUMC<LEN<10 PX>>');
+    expect(parsePseudo('num(10em)')).to.equal('NUMC<LEN<10 EM>>');
+    expect(parsePseudo('num(10s)')).to.equal('NUMC<TME<10 S>>');
+    expect(parsePseudo('num(10rad)')).to.equal('NUMC<ANG<10 RAD>>');
+    expect(parsePseudo('num(10%)')).to.equal('NUMC<PRC<10>>');
+    expect(parsePseudo('num(var(--x))')).to.equal('NUMC<VAR<--x>>');
   });
 
   it('should parse a rand function', () => {
-    expect(parsePseudo('rand()'))
-        .to.equal('RAND<null, null>');
-    expect(parsePseudo('rand(10, 20)'))
-        .to.equal('RAND<NUM<10>, NUM<20>>');
-    expect(parsePseudo('rand(10px, 20px)'))
-        .to.equal('RAND<LEN<10 PX>, LEN<20 PX>>');
-    expect(parsePseudo('rand(10em, 20em)'))
-        .to.equal('RAND<LEN<10 EM>, LEN<20 EM>>');
-    expect(parsePseudo('rand(10px, 20em)'))
-        .to.equal('RAND<LEN<10 PX>, LEN<20 EM>>');
-    expect(parsePseudo('rand(10s, 20s)'))
-        .to.equal('RAND<TME<10 S>, TME<20 S>>');
-    expect(parsePseudo('rand(10rad, 20rad)'))
-        .to.equal('RAND<ANG<10 RAD>, ANG<20 RAD>>');
-    expect(parsePseudo('rand(10%, 20%)'))
-        .to.equal('RAND<PRC<10>, PRC<20>>');
-    expect(parsePseudo('rand(var(--x), var(--y))'))
-        .to.equal('RAND<VAR<--x>, VAR<--y>>');
-    expect(parsePseudo('rand(10px, var(--y))'))
-        .to.equal('RAND<LEN<10 PX>, VAR<--y>>');
+    expect(parsePseudo('rand()')).to.equal('RAND<null, null>');
+    expect(parsePseudo('rand(10, 20)')).to.equal('RAND<NUM<10>, NUM<20>>');
+    expect(parsePseudo('rand(10px, 20px)')).to.equal(
+      'RAND<LEN<10 PX>, LEN<20 PX>>'
+    );
+    expect(parsePseudo('rand(10em, 20em)')).to.equal(
+      'RAND<LEN<10 EM>, LEN<20 EM>>'
+    );
+    expect(parsePseudo('rand(10px, 20em)')).to.equal(
+      'RAND<LEN<10 PX>, LEN<20 EM>>'
+    );
+    expect(parsePseudo('rand(10s, 20s)')).to.equal(
+      'RAND<TME<10 S>, TME<20 S>>'
+    );
+    expect(parsePseudo('rand(10rad, 20rad)')).to.equal(
+      'RAND<ANG<10 RAD>, ANG<20 RAD>>'
+    );
+    expect(parsePseudo('rand(10%, 20%)')).to.equal('RAND<PRC<10>, PRC<20>>');
+    expect(parsePseudo('rand(var(--x), var(--y))')).to.equal(
+      'RAND<VAR<--x>, VAR<--y>>'
+    );
+    expect(parsePseudo('rand(10px, var(--y))')).to.equal(
+      'RAND<LEN<10 PX>, VAR<--y>>'
+    );
   });
 
   it('should parse an index function', () => {
@@ -336,69 +359,88 @@ describe('CSS parse', () => {
     expect(parsePseudo('var(--abc-d)')).to.equal('VAR<--abc-d>');
     expect(parsePseudo('VAR(--abc)')).to.equal('VAR<--abc>');
     expect(parsePseudo('var(--ABC)')).to.equal('VAR<--ABC>');
-    expect(parsePseudo('var(--abc, 100px)'))
-        .to.equal('VAR<--abc, LEN<100 PX>>');
-    expect(parsePseudo('var(--abc, var(--def))'))
-        .to.equal('VAR<--abc, VAR<--def>>');
-    expect(parsePseudo('var(--abc, var(--def, 200px))'))
-        .to.equal('VAR<--abc, VAR<--def, LEN<200 PX>>>');
-    expect(parsePseudo('var(--abc, rgb(1, 2, 3))'))
-        .to.equal('VAR<--abc, RGB<NUM<1>, NUM<2>, NUM<3>>>');
+    expect(parsePseudo('var(--abc, 100px)')).to.equal(
+      'VAR<--abc, LEN<100 PX>>'
+    );
+    expect(parsePseudo('var(--abc, var(--def))')).to.equal(
+      'VAR<--abc, VAR<--def>>'
+    );
+    expect(parsePseudo('var(--abc, var(--def, 200px))')).to.equal(
+      'VAR<--abc, VAR<--def, LEN<200 PX>>>'
+    );
+    expect(parsePseudo('var(--abc, rgb(1, 2, 3))')).to.equal(
+      'VAR<--abc, RGB<NUM<1>, NUM<2>, NUM<3>>>'
+    );
   });
 
   it('should parse a calc()', () => {
-    expect(parsePseudo('calc(100px)'))
-        .to.equal('CALC<LEN<100 PX>>');
-    expect(parsePseudo('calc((100px))'))
-        .to.equal('CALC<LEN<100 PX>>');
+    expect(parsePseudo('calc(100px)')).to.equal('CALC<LEN<100 PX>>');
+    expect(parsePseudo('calc((100px))')).to.equal('CALC<LEN<100 PX>>');
 
     // calc_sum
-    expect(parsePseudo('calc(100px + 200px)'))
-        .to.equal('CALC<ADD<LEN<100 PX>, LEN<200 PX>>>');
-    expect(parsePseudo('calc(100px - 200px)'))
-        .to.equal('CALC<SUB<LEN<100 PX>, LEN<200 PX>>>');
-    expect(parsePseudo('calc((100px + 200px))'))
-        .to.equal('CALC<ADD<LEN<100 PX>, LEN<200 PX>>>');
+    expect(parsePseudo('calc(100px + 200px)')).to.equal(
+      'CALC<ADD<LEN<100 PX>, LEN<200 PX>>>'
+    );
+    expect(parsePseudo('calc(100px - 200px)')).to.equal(
+      'CALC<SUB<LEN<100 PX>, LEN<200 PX>>>'
+    );
+    expect(parsePseudo('calc((100px + 200px))')).to.equal(
+      'CALC<ADD<LEN<100 PX>, LEN<200 PX>>>'
+    );
 
     // calc_product
-    expect(parsePseudo('calc(100px * 2)'))
-        .to.equal('CALC<MUL<LEN<100 PX>, NUM<2>>>');
-    expect(parsePseudo('calc(2 * 100px)'))
-        .to.equal('CALC<MUL<NUM<2>, LEN<100 PX>>>');
-    expect(parsePseudo('calc(100px / 2)'))
-        .to.equal('CALC<DIV<LEN<100 PX>, NUM<2>>>');
-    expect(parsePseudo('calc((100px * 2))'))
-        .to.equal('CALC<MUL<LEN<100 PX>, NUM<2>>>');
+    expect(parsePseudo('calc(100px * 2)')).to.equal(
+      'CALC<MUL<LEN<100 PX>, NUM<2>>>'
+    );
+    expect(parsePseudo('calc(2 * 100px)')).to.equal(
+      'CALC<MUL<NUM<2>, LEN<100 PX>>>'
+    );
+    expect(parsePseudo('calc(100px / 2)')).to.equal(
+      'CALC<DIV<LEN<100 PX>, NUM<2>>>'
+    );
+    expect(parsePseudo('calc((100px * 2))')).to.equal(
+      'CALC<MUL<LEN<100 PX>, NUM<2>>>'
+    );
 
     // precedence
-    expect(parsePseudo('calc(100px + 200px + 300px)'))
-        .to.equal('CALC<ADD<ADD<LEN<100 PX>, LEN<200 PX>>, LEN<300 PX>>>');
-    expect(parsePseudo('calc(100px * 2 * 3)'))
-        .to.equal('CALC<MUL<MUL<LEN<100 PX>, NUM<2>>, NUM<3>>>');
-    expect(parsePseudo('calc(100px * 2 / 3)'))
-        .to.equal('CALC<DIV<MUL<LEN<100 PX>, NUM<2>>, NUM<3>>>');
-    expect(parsePseudo('calc(100px + 200px * 0.5)'))
-        .to.equal('CALC<ADD<LEN<100 PX>, MUL<LEN<200 PX>, NUM<0.5>>>>');
-    expect(parsePseudo('calc(100px - 200px / 0.5)'))
-        .to.equal('CALC<SUB<LEN<100 PX>, DIV<LEN<200 PX>, NUM<0.5>>>>');
-    expect(parsePseudo('calc((100px + 200px) * 0.5)'))
-        .to.equal('CALC<MUL<ADD<LEN<100 PX>, LEN<200 PX>>, NUM<0.5>>>');
-    expect(parsePseudo('calc((100px - 200px) / 0.5)'))
-        .to.equal('CALC<DIV<SUB<LEN<100 PX>, LEN<200 PX>>, NUM<0.5>>>');
-    expect(parsePseudo('calc(100px * 0.5 + 200px)'))
-        .to.equal('CALC<ADD<MUL<LEN<100 PX>, NUM<0.5>>, LEN<200 PX>>>');
-    expect(parsePseudo('calc(100px / 0.5 - 200px)'))
-        .to.equal('CALC<SUB<DIV<LEN<100 PX>, NUM<0.5>>, LEN<200 PX>>>');
-    expect(parsePseudo('calc(0.5 * (100px + 200px))'))
-        .to.equal('CALC<MUL<NUM<0.5>, ADD<LEN<100 PX>, LEN<200 PX>>>>');
+    expect(parsePseudo('calc(100px + 200px + 300px)')).to.equal(
+      'CALC<ADD<ADD<LEN<100 PX>, LEN<200 PX>>, LEN<300 PX>>>'
+    );
+    expect(parsePseudo('calc(100px * 2 * 3)')).to.equal(
+      'CALC<MUL<MUL<LEN<100 PX>, NUM<2>>, NUM<3>>>'
+    );
+    expect(parsePseudo('calc(100px * 2 / 3)')).to.equal(
+      'CALC<DIV<MUL<LEN<100 PX>, NUM<2>>, NUM<3>>>'
+    );
+    expect(parsePseudo('calc(100px + 200px * 0.5)')).to.equal(
+      'CALC<ADD<LEN<100 PX>, MUL<LEN<200 PX>, NUM<0.5>>>>'
+    );
+    expect(parsePseudo('calc(100px - 200px / 0.5)')).to.equal(
+      'CALC<SUB<LEN<100 PX>, DIV<LEN<200 PX>, NUM<0.5>>>>'
+    );
+    expect(parsePseudo('calc((100px + 200px) * 0.5)')).to.equal(
+      'CALC<MUL<ADD<LEN<100 PX>, LEN<200 PX>>, NUM<0.5>>>'
+    );
+    expect(parsePseudo('calc((100px - 200px) / 0.5)')).to.equal(
+      'CALC<DIV<SUB<LEN<100 PX>, LEN<200 PX>>, NUM<0.5>>>'
+    );
+    expect(parsePseudo('calc(100px * 0.5 + 200px)')).to.equal(
+      'CALC<ADD<MUL<LEN<100 PX>, NUM<0.5>>, LEN<200 PX>>>'
+    );
+    expect(parsePseudo('calc(100px / 0.5 - 200px)')).to.equal(
+      'CALC<SUB<DIV<LEN<100 PX>, NUM<0.5>>, LEN<200 PX>>>'
+    );
+    expect(parsePseudo('calc(0.5 * (100px + 200px))')).to.equal(
+      'CALC<MUL<NUM<0.5>, ADD<LEN<100 PX>, LEN<200 PX>>>>'
+    );
 
     // func
-    expect(parsePseudo('calc(var(--abc, 100px) + 200px)'))
-        .to.equal('CALC<ADD<VAR<--abc, LEN<100 PX>>, LEN<200 PX>>>');
+    expect(parsePseudo('calc(var(--abc, 100px) + 200px)')).to.equal(
+      'CALC<ADD<VAR<--abc, LEN<100 PX>>, LEN<200 PX>>>'
+    );
   });
 });
 
-
 describes.sandboxed('CSS resolve', {}, () => {
   const normalize = true;
   let context;
@@ -421,8 +463,14 @@ describes.sandboxed('CSS resolve', {}, () => {
   it('should not resolve value for a const', () => {
     const node = new ast.CssNode();
     const nodeMock = sandbox.mock(node);
-    nodeMock.expects('css').returns('CSS').atLeast(1);
-    nodeMock.expects('isConst').returns(true).atLeast(1);
+    nodeMock
+      .expects('css')
+      .returns('CSS')
+      .atLeast(1);
+    nodeMock
+      .expects('isConst')
+      .returns(true)
+      .atLeast(1);
     nodeMock.expects('calc').never();
     expect(node.css()).to.equal('CSS');
     expect(node.resolve(context)).to.equal(node);
@@ -435,9 +483,18 @@ describes.sandboxed('CSS resolve', {}, () => {
     const node2 = new ast.CssNode();
     node2.css = () => 'CSS2';
     const nodeMock = sandbox.mock(node);
-    nodeMock.expects('isConst').returns(false).atLeast(1);
-    nodeMock.expects('css').returns('CSS').atLeast(1);
-    nodeMock.expects('calc').returns(node2).atLeast(1);
+    nodeMock
+      .expects('isConst')
+      .returns(false)
+      .atLeast(1);
+    nodeMock
+      .expects('css')
+      .returns('CSS')
+      .atLeast(1);
+    nodeMock
+      .expects('calc')
+      .returns(node2)
+      .atLeast(1);
     expect(node.css()).to.equal('CSS');
     expect(node.resolve(context)).to.equal(node2);
     expect(resolvedCss(node)).to.equal('CSS2');
@@ -471,10 +528,11 @@ describes.sandboxed('CSS resolve', {}, () => {
     expect(ast.isVarCss('VAR(--x)', false)).to.be.true;
     expect(ast.isVarCss('Var(--x)', false)).to.be.true;
     expect(ast.isVarCss('var(--x)', normalize)).to.be.true;
-    contextMock.expects('getVar')
-        .withExactArgs('--var1')
-        .returns(new ast.CssPassthroughNode('val1'))
-        .twice();
+    contextMock
+      .expects('getVar')
+      .withExactArgs('--var1')
+      .returns(new ast.CssPassthroughNode('val1'))
+      .twice();
     const node = new ast.CssConcatNode([
       new ast.CssPassthroughNode('css1'),
       new ast.CssVarNode('--var1'),
@@ -487,10 +545,11 @@ describes.sandboxed('CSS resolve', {}, () => {
   });
 
   it('should resolve a null concat node', () => {
-    contextMock.expects('getVar')
-        .withExactArgs('--var1')
-        .returns(null)
-        .twice();
+    contextMock
+      .expects('getVar')
+      .withExactArgs('--var1')
+      .returns(null)
+      .twice();
     const node = new ast.CssConcatNode([
       new ast.CssPassthroughNode('css1'),
       new ast.CssVarNode('--var1'),
@@ -527,9 +586,13 @@ describes.sandboxed('CSS resolve', {}, () => {
   });
 
   it('should resolve a percent node w/dimension', () => {
-    contextMock.expects('getDimension').returns('w').twice();
-    contextMock.expects('getCurrentElementSize')
-        .returns({width: 110, height: 220});
+    contextMock
+      .expects('getDimension')
+      .returns('w')
+      .twice();
+    contextMock
+      .expects('getCurrentElementSize')
+      .returns({width: 110, height: 220});
     expect(ast.isVarCss('11.5%', false)).to.be.false;
     const node = new ast.CssPercentNode(11.5);
     expect(node.isConst()).to.be.true;
@@ -569,10 +632,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should re-resolve an HTTP url', () => {
       contextMock
-          .expects('resolveUrl')
-          .withExactArgs('http://acme.org/non-secure')
-          .returns('broken')
-          .twice();
+        .expects('resolveUrl')
+        .withExactArgs('http://acme.org/non-secure')
+        .returns('broken')
+        .twice();
       const node = new ast.CssUrlNode('http://acme.org/non-secure');
       expect(node.isConst()).to.be.false;
       expect(node.isConst(normalize)).to.be.false;
@@ -583,26 +646,28 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should re-resolve a relative url', () => {
       contextMock
-          .expects('resolveUrl')
-          .withExactArgs('/relative')
-          .returns('https://acme.org/relative')
-          .twice();
+        .expects('resolveUrl')
+        .withExactArgs('/relative')
+        .returns('https://acme.org/relative')
+        .twice();
       const node = new ast.CssUrlNode('/relative');
       expect(node.isConst()).to.be.false;
       expect(node.isConst(normalize)).to.be.false;
       expect(node.css()).to.equal('url("/relative")');
-      expect(node.calc(context).css())
-          .to.equal('url("https://acme.org/relative")');
-      expect(node.calc(context, normalize).css())
-          .to.equal('url("https://acme.org/relative")');
+      expect(node.calc(context).css()).to.equal(
+        'url("https://acme.org/relative")'
+      );
+      expect(node.calc(context, normalize).css()).to.equal(
+        'url("https://acme.org/relative")'
+      );
     });
 
     it('should fail when context resolution fails', () => {
       contextMock
-          .expects('resolveUrl')
-          .withExactArgs('http://acme.org/non-secure')
-          .throws(new Error('intentional'))
-          .once();
+        .expects('resolveUrl')
+        .withExactArgs('http://acme.org/non-secure')
+        .throws(new Error('intentional'))
+        .once();
       const node = new ast.CssUrlNode('http://acme.org/non-secure');
       expect(() => {
         node.calc(context);
@@ -644,7 +709,10 @@ describes.sandboxed('CSS resolve', {}, () => {
       expect(resolvedCss(node)).to.equal('11.5em');
       expect(node.createSameUnits(20.5).css()).to.equal('20.5em');
 
-      contextMock.expects('getCurrentFontSize').returns(10).twice();
+      contextMock
+        .expects('getCurrentFontSize')
+        .returns(10)
+        .twice();
       const norm = node.norm(context);
       expect(norm).to.not.equal(node);
       expect(norm.css()).to.equal('115px');
@@ -659,7 +727,10 @@ describes.sandboxed('CSS resolve', {}, () => {
       expect(resolvedCss(node)).to.equal('11.5rem');
       expect(node.createSameUnits(20.5).css()).to.equal('20.5rem');
 
-      contextMock.expects('getRootFontSize').returns(2).twice();
+      contextMock
+        .expects('getRootFontSize')
+        .returns(2)
+        .twice();
       const norm = node.norm(context);
       expect(norm).to.not.equal(node);
       expect(norm.css()).to.equal('23px');
@@ -669,9 +740,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     describe('vw-length', () => {
       beforeEach(() => {
-        contextMock.expects('getViewportSize')
-            .returns({width: 200, height: 400})
-            .atLeast(1);
+        contextMock
+          .expects('getViewportSize')
+          .returns({width: 200, height: 400})
+          .atLeast(1);
       });
 
       it('should resolve a vw-length node', () => {
@@ -739,9 +811,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should resolve a percent-length in w-direction', () => {
       contextMock.expects('getDimension').returns('w');
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220})
-          .once();
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .once();
       const node = new ast.CssLengthNode(11.5, 'px');
       const percent = node.calcPercent(10, context);
       expect(percent.css()).to.equal('11px');
@@ -749,18 +822,20 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should resolve a percent-length in h-direction', () => {
       contextMock.expects('getDimension').returns('h');
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220})
-          .once();
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .once();
       const node = new ast.CssLengthNode(11.5, 'px');
       const percent = node.calcPercent(10, context);
       expect(percent.css()).to.equal('22px');
     });
 
     it('should resolve a percent-length in unknown direction', () => {
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220})
-          .once();
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .once();
       const node = new ast.CssLengthNode(11.5, 'px');
       const percent = node.calcPercent(10, context);
       expect(percent.css()).to.equal('0px');
@@ -877,10 +952,11 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should resolve a var-arg function', () => {
       contextMock.expects('withDimension').never();
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssNumberNode(11))
-          .twice();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssNumberNode(11))
+        .twice();
       const node = new ast.CssFuncNode('rgb', [
         new ast.CssNumberNode(201),
         new ast.CssNumberNode(202),
@@ -894,10 +970,18 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should norm function', () => {
-      contextMock.expects('getDimension').returns('w').atLeast(1);
-      contextMock.expects('getCurrentFontSize').returns(10).atLeast(1);
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220}).atLeast(1);
+      contextMock
+        .expects('getDimension')
+        .returns('w')
+        .atLeast(1);
+      contextMock
+        .expects('getCurrentFontSize')
+        .returns(10)
+        .atLeast(1);
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .atLeast(1);
       const node = new ast.CssFuncNode('xyz', [
         new ast.CssLengthNode(11, 'px'),
         new ast.CssLengthNode(11.5, 'em'),
@@ -944,17 +1028,17 @@ describes.sandboxed('CSS resolve', {}, () => {
         return new ast.CssPassthroughNode('-');
       };
 
-      const node = new ast.CssFuncNode('rgb',
-          [arg1, arg2, arg3], ['w', 'h']);
+      const node = new ast.CssFuncNode('rgb', [arg1, arg2, arg3], ['w', 'h']);
       expect(node.calc(context).css()).to.equal('rgb(w,h,-)');
       expect(index).to.equal(3);
     });
 
     it('should resolve a var-arg function with nulls', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(null)
-          .atLeast(1);
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(null)
+        .atLeast(1);
       const node = new ast.CssFuncNode('rgb', [
         new ast.CssNumberNode(201),
         new ast.CssNumberNode(202),
@@ -979,10 +1063,11 @@ describes.sandboxed('CSS resolve', {}, () => {
         dimStack.pop();
         return res;
       };
-      sandbox.stub(ast.CssPassthroughNode.prototype, 'resolve').callsFake(
-          function() {
-            return new ast.CssPassthroughNode(this.css_ + dimStack.join(''));
-          });
+      sandbox
+        .stub(ast.CssPassthroughNode.prototype, 'resolve')
+        .callsFake(function() {
+          return new ast.CssPassthroughNode(this.css_ + dimStack.join(''));
+        });
     });
 
     it('should always consider as const', () => {
@@ -1046,10 +1131,11 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve translate with null args to null', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(null)
-          .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(null)
+        .once();
       const node = new ast.CssTranslateNode('', [
         new ast.CssPassthroughNode('X'),
         new ast.CssVarNode('--var1'),
@@ -1133,76 +1219,73 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve num from a number', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssNumberNode(10));
+      const node = new ast.CssNumConvertNode(new ast.CssNumberNode(10));
       expect(resolvedCss(node)).to.equal('10');
     });
 
     it('should resolve num from a zero', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssNumberNode(0));
+      const node = new ast.CssNumConvertNode(new ast.CssNumberNode(0));
       expect(resolvedCss(node)).to.equal('0');
     });
 
     it('should resolve num from a length', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssLengthNode(10, 'px'));
+      const node = new ast.CssNumConvertNode(new ast.CssLengthNode(10, 'px'));
       expect(resolvedCss(node)).to.equal('10');
     });
 
     it('should resolve num from a zero length', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssLengthNode(0, 'px'));
+      const node = new ast.CssNumConvertNode(new ast.CssLengthNode(0, 'px'));
       expect(resolvedCss(node)).to.equal('0');
     });
 
     it('should resolve num from a time', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssTimeNode(10, 's'));
+      const node = new ast.CssNumConvertNode(new ast.CssTimeNode(10, 's'));
       expect(resolvedCss(node)).to.equal('10');
       expect(resolvedCss(node, normalize)).to.equal('10000');
     });
 
     it('should resolve num from a percent', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssPercentNode(10));
+      const node = new ast.CssNumConvertNode(new ast.CssPercentNode(10));
       expect(resolvedCss(node)).to.equal('10');
 
-      contextMock.expects('getDimension').returns('w').atLeast(1);
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220}).atLeast(1);
+      contextMock
+        .expects('getDimension')
+        .returns('w')
+        .atLeast(1);
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .atLeast(1);
       expect(resolvedCss(node, normalize)).to.equal('11');
     });
 
     it('should resolve num from an expression', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssLengthNode(100, 'px'))
-          .once();
-      const node = new ast.CssNumConvertNode(
-          new ast.CssVarNode('--var1'));
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssLengthNode(100, 'px'))
+        .once();
+      const node = new ast.CssNumConvertNode(new ast.CssVarNode('--var1'));
       expect(resolvedCss(node)).to.equal('100');
     });
 
     it('should resolve num with a null arg', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(null)
-          .once();
-      const node = new ast.CssNumConvertNode(
-          new ast.CssVarNode('--var1'));
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(null)
+        .once();
+      const node = new ast.CssNumConvertNode(new ast.CssVarNode('--var1'));
       expect(resolvedCss(node)).to.be.null;
     });
 
     it('should resolve num from a string', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssPassthroughNode('11x'));
+      const node = new ast.CssNumConvertNode(new ast.CssPassthroughNode('11x'));
       expect(resolvedCss(node)).to.equal('11');
     });
 
     it('should resolve num from a non-parseable string', () => {
-      const node = new ast.CssNumConvertNode(
-          new ast.CssPassthroughNode('A'));
+      const node = new ast.CssNumConvertNode(new ast.CssPassthroughNode('A'));
       expect(resolvedCss(node)).to.be.null;
     });
   });
@@ -1232,79 +1315,96 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should rand two numbers', () => {
       const node = new ast.CssRandNode(
-          new ast.CssNumberNode(10),
-          new ast.CssNumberNode(20));
+        new ast.CssNumberNode(10),
+        new ast.CssNumberNode(20)
+      );
       expect(resolvedCss(node)).to.equal('12.5');
     });
 
     it('should rand two numbers in opposite direction', () => {
       const node = new ast.CssRandNode(
-          new ast.CssNumberNode(200),
-          new ast.CssNumberNode(100));
+        new ast.CssNumberNode(200),
+        new ast.CssNumberNode(100)
+      );
       expect(resolvedCss(node)).to.equal('125');
     });
 
     it('should rand two same-unit values - length', () => {
       const node = new ast.CssRandNode(
-          new ast.CssLengthNode(10, 'px'),
-          new ast.CssLengthNode(20, 'px'));
+        new ast.CssLengthNode(10, 'px'),
+        new ast.CssLengthNode(20, 'px')
+      );
       expect(resolvedCss(node)).to.equal('12.5px');
     });
 
     it('should rand two same-unit values - times', () => {
       const node = new ast.CssRandNode(
-          new ast.CssTimeNode(10, 's'),
-          new ast.CssTimeNode(20, 's'));
+        new ast.CssTimeNode(10, 's'),
+        new ast.CssTimeNode(20, 's')
+      );
       expect(resolvedCss(node)).to.equal('12.5s');
       expect(resolvedCss(node, normalize)).to.equal('12500ms');
     });
 
     it('should rand two same-unit values - percent', () => {
       const node = new ast.CssRandNode(
-          new ast.CssPercentNode(10),
-          new ast.CssPercentNode(20));
+        new ast.CssPercentNode(10),
+        new ast.CssPercentNode(20)
+      );
       expect(resolvedCss(node)).to.equal('12.5%');
 
-      contextMock.expects('getDimension').returns('w').atLeast(1);
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220}).atLeast(1);
+      contextMock
+        .expects('getDimension')
+        .returns('w')
+        .atLeast(1);
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .atLeast(1);
       expect(resolvedCss(node, normalize)).to.equal('13.75px');
     });
 
     it('should resolve both parts', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssLengthNode(100, 'px'))
-          .once();
-      contextMock.expects('getVar')
-          .withExactArgs('--var2')
-          .returns(new ast.CssLengthNode(200, 'px'))
-          .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssLengthNode(100, 'px'))
+        .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var2')
+        .returns(new ast.CssLengthNode(200, 'px'))
+        .once();
       const node = new ast.CssRandNode(
-          new ast.CssVarNode('--var1'),
-          new ast.CssVarNode('--var2'));
+        new ast.CssVarNode('--var1'),
+        new ast.CssVarNode('--var2')
+      );
       expect(resolvedCss(node)).to.equal('125px');
     });
 
     it('should resolve to null with null args', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssLengthNode(100, 'px'))
-          .once();
-      contextMock.expects('getVar')
-          .withExactArgs('--var2')
-          .returns(null)
-          .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssLengthNode(100, 'px'))
+        .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var2')
+        .returns(null)
+        .once();
       const node = new ast.CssRandNode(
-          new ast.CssVarNode('--var1'),
-          new ast.CssVarNode('--var2'));
+        new ast.CssVarNode('--var1'),
+        new ast.CssVarNode('--var2')
+      );
       expect(resolvedCss(node)).to.be.null;
     });
 
     it('should only allow numerics', () => {
       const node = new ast.CssRandNode(
-          new ast.CssPassthroughNode('A'),
-          new ast.CssPassthroughNode('B'));
+        new ast.CssPassthroughNode('A'),
+        new ast.CssPassthroughNode('B')
+      );
       expect(() => {
         resolvedCss(node);
       }).to.throw(/both numerical/);
@@ -1312,19 +1412,27 @@ describes.sandboxed('CSS resolve', {}, () => {
 
     it('should only allow same-type', () => {
       const node = new ast.CssRandNode(
-          new ast.CssLengthNode(30, 'px'),
-          new ast.CssTimeNode(20, 's'));
+        new ast.CssLengthNode(30, 'px'),
+        new ast.CssTimeNode(20, 's')
+      );
       expect(() => {
         resolvedCss(node);
       }).to.throw(/same type/);
     });
 
     it('should normalize units', () => {
-      contextMock.expects('getCurrentFontSize').returns(1).once();
-      contextMock.expects('getRootFontSize').returns(2).once();
+      contextMock
+        .expects('getCurrentFontSize')
+        .returns(1)
+        .once();
+      contextMock
+        .expects('getRootFontSize')
+        .returns(2)
+        .once();
       const node = new ast.CssRandNode(
-          new ast.CssLengthNode(10, 'em'),
-          new ast.CssLengthNode(10, 'rem'));
+        new ast.CssLengthNode(10, 'em'),
+        new ast.CssLengthNode(10, 'rem')
+      );
       expect(resolvedCss(node)).to.equal('12.5px');
     });
   });
@@ -1343,17 +1451,24 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve a no-arg', () => {
-      contextMock.expects('getCurrentIndex').withExactArgs().returns(11);
+      contextMock
+        .expects('getCurrentIndex')
+        .withExactArgs()
+        .returns(11);
       const node = new ast.CssIndexNode();
       expect(resolvedCss(node)).to.equal('11');
     });
 
     it('should combine with calc', () => {
-      contextMock.expects('getCurrentIndex').withExactArgs().returns(11);
+      contextMock
+        .expects('getCurrentIndex')
+        .withExactArgs()
+        .returns(11);
       const node = new ast.CssCalcProductNode(
-          new ast.CssTimeNode(2, 's'),
-          new ast.CssIndexNode(),
-          '*');
+        new ast.CssTimeNode(2, 's'),
+        new ast.CssIndexNode(),
+        '*'
+      );
       expect(node.isConst()).to.be.false;
       expect(resolvedCss(node)).to.equal('22s');
     });
@@ -1373,17 +1488,24 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve a no-arg', () => {
-      contextMock.expects('getTargetLength').withExactArgs().returns(12);
+      contextMock
+        .expects('getTargetLength')
+        .withExactArgs()
+        .returns(12);
       const node = new ast.CssLengthFuncNode();
       expect(resolvedCss(node)).to.equal('12');
     });
 
     it('should combine with calc', () => {
-      contextMock.expects('getTargetLength').withExactArgs().returns(12);
+      contextMock
+        .expects('getTargetLength')
+        .withExactArgs()
+        .returns(12);
       const node = new ast.CssCalcProductNode(
-          new ast.CssTimeNode(2, 's'),
-          new ast.CssLengthFuncNode(),
-          '*');
+        new ast.CssTimeNode(2, 's'),
+        new ast.CssLengthFuncNode(),
+        '*'
+      );
       expect(node.isConst()).to.be.false;
       expect(resolvedCss(node)).to.equal('24s');
     });
@@ -1398,10 +1520,11 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve a var node', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssPassthroughNode('val1'))
-          .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssPassthroughNode('val1'))
+        .once();
       const node = new ast.CssVarNode('--var1');
       expect(node.isConst()).to.be.false;
       expect(node.css()).to.equal('var(--var1)');
@@ -1409,13 +1532,19 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve a var node and normalize', () => {
-      contextMock.expects('getDimension').returns('w').atLeast(1);
-      contextMock.expects('getCurrentElementSize')
-          .returns({width: 110, height: 220}).atLeast(1);
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssPercentNode(11.5))
-          .atLeast(1);
+      contextMock
+        .expects('getDimension')
+        .returns('w')
+        .atLeast(1);
+      contextMock
+        .expects('getCurrentElementSize')
+        .returns({width: 110, height: 220})
+        .atLeast(1);
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssPercentNode(11.5))
+        .atLeast(1);
       const node = new ast.CssVarNode('--var1');
       expect(node.isConst()).to.be.false;
       expect(node.isConst(normalize)).to.be.false;
@@ -1425,47 +1554,57 @@ describes.sandboxed('CSS resolve', {}, () => {
     });
 
     it('should resolve a var node with def', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(new ast.CssPassthroughNode('val1'))
-          .once();
-      const node = new ast.CssVarNode('--var1',
-          new ast.CssPassthroughNode('10px'));
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(new ast.CssPassthroughNode('val1'))
+        .once();
+      const node = new ast.CssVarNode(
+        '--var1',
+        new ast.CssPassthroughNode('10px')
+      );
       expect(node.isConst()).to.be.false;
       expect(node.css()).to.equal('var(--var1,10px)');
       expect(resolvedCss(node)).to.equal('val1');
     });
 
     it('should resolve a var node by fallback to def', () => {
-      contextMock.expects('getVar').returns(null).once();
-      const node = new ast.CssVarNode('--var1',
-          new ast.CssPassthroughNode('10px'));
+      contextMock
+        .expects('getVar')
+        .returns(null)
+        .once();
+      const node = new ast.CssVarNode(
+        '--var1',
+        new ast.CssPassthroughNode('10px')
+      );
       expect(node.isConst()).to.be.false;
       expect(node.css()).to.equal('var(--var1,10px)');
       expect(resolvedCss(node)).to.equal('10px');
     });
 
     it('should resolve a var node with def as var', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(null)
-          .once();
-      contextMock.expects('getVar')
-          .withExactArgs('--var2')
-          .returns(new ast.CssPassthroughNode('val2'))
-          .once();
-      const node = new ast.CssVarNode('--var1',
-          new ast.CssVarNode('--var2'));
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(null)
+        .once();
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var2')
+        .returns(new ast.CssPassthroughNode('val2'))
+        .once();
+      const node = new ast.CssVarNode('--var1', new ast.CssVarNode('--var2'));
       expect(node.isConst()).to.be.false;
       expect(node.css()).to.equal('var(--var1,var(--var2))');
       expect(resolvedCss(node)).to.equal('val2');
     });
 
     it('should resolve a var node w/o fallback to def', () => {
-      contextMock.expects('getVar')
-          .withExactArgs('--var1')
-          .returns(null)
-          .atLeast(1);
+      contextMock
+        .expects('getVar')
+        .withExactArgs('--var1')
+        .returns(null)
+        .atLeast(1);
       const node = new ast.CssVarNode('--var1');
       expect(node.css()).to.equal('var(--var1)');
       expect(node.isConst()).to.be.false;
@@ -1493,9 +1632,10 @@ describes.sandboxed('CSS resolve', {}, () => {
     describe('sum', () => {
       it('should add two same-unit values', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssLengthNode(20, 'px'),
-            '+');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssLengthNode(20, 'px'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10px + 20px');
         expect(resolvedCss(node)).to.equal('30px');
@@ -1503,23 +1643,28 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should add two same-unit values and normalize', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(10, 'em'),
-            new ast.CssLengthNode(20, 'em'),
-            '+');
+          new ast.CssLengthNode(10, 'em'),
+          new ast.CssLengthNode(20, 'em'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10em + 20em');
         expect(resolvedCss(node)).to.equal('30em');
 
-        contextMock.expects('getCurrentFontSize').returns(10).atLeast(1);
+        contextMock
+          .expects('getCurrentFontSize')
+          .returns(10)
+          .atLeast(1);
         expect(node.isConst(normalize)).to.be.false;
         expect(resolvedCss(node, normalize)).to.equal('300px');
       });
 
       it('should add two same-unit values - times', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssTimeNode(10, 's'),
-            new ast.CssTimeNode(20, 's'),
-            '+');
+          new ast.CssTimeNode(10, 's'),
+          new ast.CssTimeNode(20, 's'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10s + 20s');
         expect(resolvedCss(node)).to.equal('30s');
@@ -1527,45 +1672,52 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should subtract two same-unit values', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(30, 'px'),
-            new ast.CssLengthNode(20, 'px'),
-            '-');
+          new ast.CssLengthNode(30, 'px'),
+          new ast.CssLengthNode(20, 'px'),
+          '-'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('30px - 20px');
         expect(resolvedCss(node)).to.equal('10px');
       });
 
       it('should resolve both parts', () => {
-        contextMock.expects('getVar')
-            .withExactArgs('--var1')
-            .returns(new ast.CssLengthNode(5, 'px'))
-            .once();
-        contextMock.expects('getVar')
-            .withExactArgs('--var2')
-            .returns(new ast.CssLengthNode(1, 'px'))
-            .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var1')
+          .returns(new ast.CssLengthNode(5, 'px'))
+          .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var2')
+          .returns(new ast.CssLengthNode(1, 'px'))
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssVarNode('--var1'),
-            new ast.CssVarNode('--var2'),
-            '+');
+          new ast.CssVarNode('--var1'),
+          new ast.CssVarNode('--var2'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('var(--var1) + var(--var2)');
         expect(resolvedCss(node)).to.equal('6px');
       });
 
       it('should resolve to null with null args', () => {
-        contextMock.expects('getVar')
-            .withExactArgs('--var1')
-            .returns(new ast.CssLengthNode(5, 'px'))
-            .once();
-        contextMock.expects('getVar')
-            .withExactArgs('--var2')
-            .returns(null)
-            .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var1')
+          .returns(new ast.CssLengthNode(5, 'px'))
+          .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var2')
+          .returns(null)
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssVarNode('--var1'),
-            new ast.CssVarNode('--var2'),
-            '+');
+          new ast.CssVarNode('--var1'),
+          new ast.CssVarNode('--var2'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('var(--var1) + var(--var2)');
         expect(resolvedCss(node)).to.be.null;
@@ -1573,9 +1725,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should only allow numerics', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssPassthroughNode('A'),
-            new ast.CssPassthroughNode('B'),
-            '+');
+          new ast.CssPassthroughNode('A'),
+          new ast.CssPassthroughNode('B'),
+          '+'
+        );
         expect(() => {
           resolvedCss(node);
         }).to.throw(/both numerical/);
@@ -1583,21 +1736,29 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should only allow same-type', () => {
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(30, 'px'),
-            new ast.CssTimeNode(20, 's'),
-            '+');
+          new ast.CssLengthNode(30, 'px'),
+          new ast.CssTimeNode(20, 's'),
+          '+'
+        );
         expect(() => {
           resolvedCss(node);
         }).to.throw(/same type/);
       });
 
       it('should normalize units', () => {
-        contextMock.expects('getCurrentFontSize').returns(1).once();
-        contextMock.expects('getRootFontSize').returns(2).once();
+        contextMock
+          .expects('getCurrentFontSize')
+          .returns(1)
+          .once();
+        contextMock
+          .expects('getRootFontSize')
+          .returns(2)
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(10, 'em'),
-            new ast.CssLengthNode(10, 'rem'),
-            '+');
+          new ast.CssLengthNode(10, 'em'),
+          new ast.CssLengthNode(10, 'rem'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10em + 10rem');
         // 1 * 10px + 2 * 10px = 30px
@@ -1606,13 +1767,15 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should resolve left as percent', () => {
         contextMock.expects('getDimension').returns('w');
-        contextMock.expects('getCurrentElementSize')
-            .returns({width: 110, height: 220})
-            .once();
+        contextMock
+          .expects('getCurrentElementSize')
+          .returns({width: 110, height: 220})
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssPercentNode(10),
-            new ast.CssLengthNode(10, 'px'),
-            '+');
+          new ast.CssPercentNode(10),
+          new ast.CssLengthNode(10, 'px'),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10% + 10px');
         // 10% * 110 + 10px = 11px + 10px = 21px
@@ -1621,13 +1784,15 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should resolve right as percent', () => {
         contextMock.expects('getDimension').returns('h');
-        contextMock.expects('getCurrentElementSize')
-            .returns({width: 110, height: 220})
-            .once();
+        contextMock
+          .expects('getCurrentElementSize')
+          .returns({width: 110, height: 220})
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssPercentNode(10),
-            '+');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssPercentNode(10),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10px + 10%');
         // 10px + 10% * 220 = 10px + 22px = 32px
@@ -1635,15 +1800,20 @@ describes.sandboxed('CSS resolve', {}, () => {
       });
 
       it('should normalize the non-percent part', () => {
-        contextMock.expects('getCurrentFontSize').returns(2).once();
+        contextMock
+          .expects('getCurrentFontSize')
+          .returns(2)
+          .once();
         contextMock.expects('getDimension').returns('h');
-        contextMock.expects('getCurrentElementSize')
-            .returns({width: 110, height: 220})
-            .once();
+        contextMock
+          .expects('getCurrentElementSize')
+          .returns({width: 110, height: 220})
+          .once();
         const node = new ast.CssCalcSumNode(
-            new ast.CssLengthNode(10, 'em'),
-            new ast.CssPercentNode(10),
-            '+');
+          new ast.CssLengthNode(10, 'em'),
+          new ast.CssPercentNode(10),
+          '+'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10em + 10%');
         // 10em * 2px + 10% * 220 = 20px + 22px = 42px
@@ -1651,13 +1821,15 @@ describes.sandboxed('CSS resolve', {}, () => {
       });
 
       it('should resolve with dimension function', () => {
-        contextMock.expects('getElementSize')
-            .returns({width: 111, height: 222})
-            .twice();
+        contextMock
+          .expects('getElementSize')
+          .returns({width: 111, height: 222})
+          .twice();
         const node = new ast.CssCalcSumNode(
-            new ast.CssDimSizeNode('w', '.sel'),
-            new ast.CssDimSizeNode('h', '.sel'),
-            '+');
+          new ast.CssDimSizeNode('w', '.sel'),
+          new ast.CssDimSizeNode('h', '.sel'),
+          '+'
+        );
         // 111px + 222px = 333px
         expect(resolvedCss(node)).to.equal('333px');
       });
@@ -1666,9 +1838,10 @@ describes.sandboxed('CSS resolve', {}, () => {
     describe('product', () => {
       it('should only allow numerics', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssPassthroughNode('A'),
-            new ast.CssPassthroughNode('B'),
-            '*');
+          new ast.CssPassthroughNode('A'),
+          new ast.CssPassthroughNode('B'),
+          '*'
+        );
         expect(() => {
           resolvedCss(node);
         }).to.throw(/both numerical/);
@@ -1676,9 +1849,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should multiply with right number', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssNumberNode(2),
-            '*');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssNumberNode(2),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10px * 2');
         expect(resolvedCss(node)).to.equal('20px');
@@ -1686,9 +1860,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should multiply with left number', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssNumberNode(2),
-            new ast.CssLengthNode(10, 'px'),
-            '*');
+          new ast.CssNumberNode(2),
+          new ast.CssLengthNode(10, 'px'),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('2 * 10px');
         expect(resolvedCss(node)).to.equal('20px');
@@ -1696,9 +1871,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should multiply for non-norm', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'em'),
-            new ast.CssNumberNode(2),
-            '*');
+          new ast.CssLengthNode(10, 'em'),
+          new ast.CssNumberNode(2),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10em * 2');
         expect(resolvedCss(node)).to.equal('20em');
@@ -1706,9 +1882,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should multiply for time', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssTimeNode(10, 's'),
-            new ast.CssNumberNode(2),
-            '*');
+          new ast.CssTimeNode(10, 's'),
+          new ast.CssNumberNode(2),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10s * 2');
         expect(resolvedCss(node)).to.equal('20s');
@@ -1716,9 +1893,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should require at least one number', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssLengthNode(20, 'px'),
-            '*');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssLengthNode(20, 'px'),
+          '*'
+        );
         expect(() => {
           resolvedCss(node);
         }).to.throw(/one of sides in multiplication must be a number/);
@@ -1726,9 +1904,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should divide with right number', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssNumberNode(2),
-            '/');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssNumberNode(2),
+          '/'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10px / 2');
         expect(resolvedCss(node)).to.equal('5px');
@@ -1736,9 +1915,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should divide for non-norm', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'em'),
-            new ast.CssNumberNode(2),
-            '/');
+          new ast.CssLengthNode(10, 'em'),
+          new ast.CssNumberNode(2),
+          '/'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10em / 2');
         expect(resolvedCss(node)).to.equal('5em');
@@ -1746,9 +1926,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should divide for time', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssTimeNode(10, 's'),
-            new ast.CssNumberNode(2),
-            '/');
+          new ast.CssTimeNode(10, 's'),
+          new ast.CssNumberNode(2),
+          '/'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10s / 2');
         expect(resolvedCss(node)).to.equal('5s');
@@ -1756,9 +1937,10 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should only allow number denominator', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssTimeNode(10, 's'),
-            new ast.CssTimeNode(2, 's'),
-            '/');
+          new ast.CssTimeNode(10, 's'),
+          new ast.CssTimeNode(2, 's'),
+          '/'
+        );
         expect(() => {
           resolvedCss(node);
         }).to.throw(/denominator must be a number/);
@@ -1766,45 +1948,52 @@ describes.sandboxed('CSS resolve', {}, () => {
 
       it('should resolve divide-by-zero as null', () => {
         const node = new ast.CssCalcProductNode(
-            new ast.CssLengthNode(10, 'px'),
-            new ast.CssNumberNode(0),
-            '/');
+          new ast.CssLengthNode(10, 'px'),
+          new ast.CssNumberNode(0),
+          '/'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('10px / 0');
         expect(resolvedCss(node)).to.be.null;
       });
 
       it('should resolve both parts', () => {
-        contextMock.expects('getVar')
-            .withExactArgs('--var1')
-            .returns(new ast.CssLengthNode(10, 'px'))
-            .once();
-        contextMock.expects('getVar')
-            .withExactArgs('--var2')
-            .returns(new ast.CssNumberNode(2))
-            .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var1')
+          .returns(new ast.CssLengthNode(10, 'px'))
+          .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var2')
+          .returns(new ast.CssNumberNode(2))
+          .once();
         const node = new ast.CssCalcProductNode(
-            new ast.CssVarNode('--var1'),
-            new ast.CssVarNode('--var2'),
-            '*');
+          new ast.CssVarNode('--var1'),
+          new ast.CssVarNode('--var2'),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('var(--var1) * var(--var2)');
         expect(resolvedCss(node)).to.equal('20px');
       });
 
       it('should resolve to null for null args', () => {
-        contextMock.expects('getVar')
-            .withExactArgs('--var1')
-            .returns(new ast.CssLengthNode(10, 'px'))
-            .once();
-        contextMock.expects('getVar')
-            .withExactArgs('--var2')
-            .returns(null)
-            .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var1')
+          .returns(new ast.CssLengthNode(10, 'px'))
+          .once();
+        contextMock
+          .expects('getVar')
+          .withExactArgs('--var2')
+          .returns(null)
+          .once();
         const node = new ast.CssCalcProductNode(
-            new ast.CssVarNode('--var1'),
-            new ast.CssVarNode('--var2'),
-            '*');
+          new ast.CssVarNode('--var1'),
+          new ast.CssVarNode('--var2'),
+          '*'
+        );
         expect(node.isConst()).to.be.false;
         expect(node.css()).to.equal('var(--var1) * var(--var2)');
         expect(resolvedCss(node)).to.be.null;
diff --git a/extensions/amp-animation/0.1/test/test-keyframes-extractor.js b/extensions/amp-animation/0.1/test/test-keyframes-extractor.js
index 56bd81127a10..ce246782dd97 100644
--- a/extensions/amp-animation/0.1/test/test-keyframes-extractor.js
+++ b/extensions/amp-animation/0.1/test/test-keyframes-extractor.js
@@ -17,7 +17,6 @@
 import {extractKeyframes} from '../parsers/keyframes-extractor';
 import {poll} from '../../../../testing/iframe';
 
-
 describes.realWin('extractKeyframes', {amp: 1}, env => {
   let win, doc;
 
@@ -44,10 +43,12 @@ describes.realWin('extractKeyframes', {amp: 1}, env => {
   }
 
   function keyframesCss(name, css) {
-    return keyframesCssWithVendor(name, css, '') +
-        keyframesCssWithVendor(name, css, '-webkit-') +
-        keyframesCssWithVendor(name, css, '-moz-') +
-        keyframesCssWithVendor(name, css, '-ms-');
+    return (
+      keyframesCssWithVendor(name, css, '') +
+      keyframesCssWithVendor(name, css, '-webkit-') +
+      keyframesCssWithVendor(name, css, '-moz-') +
+      keyframesCssWithVendor(name, css, '-ms-')
+    );
   }
 
   function keyframesCssWithVendor(name, css, prefix) {
@@ -74,11 +75,12 @@ describes.realWin('extractKeyframes', {amp: 1}, env => {
     });
 
     it('should find simplest keyframes in amp-custom', () => {
-      const kf1 = keyframesCss('anim1',
-          'from{opacity: 0; visibility: hidden}' +
-          ' to{opacity: 1; visibility: visible}');
-      const kf2 = keyframesCss('anim2',
-          'from{opacity: 0} to{opacity: 0.5}');
+      const kf1 = keyframesCss(
+        'anim1',
+        'from{opacity: 0; visibility: hidden}' +
+          ' to{opacity: 1; visibility: visible}'
+      );
+      const kf2 = keyframesCss('anim2', 'from{opacity: 0} to{opacity: 0.5}');
       return createStyle({'amp-custom': ''}, kf1 + kf2).then(() => {
         expect(extractKeyframes(doc, 'anim1')).to.jsonEqual([
           {offset: 0, opacity: '0', visibility: 'hidden'},
@@ -92,11 +94,12 @@ describes.realWin('extractKeyframes', {amp: 1}, env => {
     });
 
     it('should find simplest keyframes in amp-keyframes', () => {
-      const kf1 = keyframesCss('anim1',
-          'from{opacity: 0; visibility: hidden}' +
-          ' to{opacity: 1; visibility: visible}');
-      const kf2 = keyframesCss('anim2',
-          'from{opacity: 0} to{opacity: 0.5}');
+      const kf1 = keyframesCss(
+        'anim1',
+        'from{opacity: 0; visibility: hidden}' +
+          ' to{opacity: 1; visibility: visible}'
+      );
+      const kf2 = keyframesCss('anim2', 'from{opacity: 0} to{opacity: 0.5}');
       return createStyle({'amp-keyframes': ''}, kf1 + kf2).then(() => {
         expect(extractKeyframes(doc, 'anim1')).to.jsonEqual([
           {offset: 0, opacity: '0', visibility: 'hidden'},
@@ -110,47 +113,49 @@ describes.realWin('extractKeyframes', {amp: 1}, env => {
     });
 
     it('should replace easing property', () => {
-      const css = 'from{opacity: 0; animation-timing-function: ease}' +
-          ' to{opacity: 1}';
-      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css))
-          .then(() => {
-            const keyframes = extractKeyframes(doc, 'anim1');
-            expect(keyframes).to.jsonEqual([
-              {offset: 0, opacity: '0', easing: 'ease'},
-              {offset: 1, opacity: '1'},
-            ]);
-          });
+      const css =
+        'from{opacity: 0; animation-timing-function: ease} to{opacity: 1}';
+      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css)).then(
+        () => {
+          const keyframes = extractKeyframes(doc, 'anim1');
+          expect(keyframes).to.jsonEqual([
+            {offset: 0, opacity: '0', easing: 'ease'},
+            {offset: 1, opacity: '1'},
+          ]);
+        }
+      );
     });
 
     it('should remove vendor prefixes', () => {
-      const css = 'to{' +
-          '-webkit-transform: translateX(10px);' +
-          '-moz-transform: translateX(10px);' +
-          '-ms-transform: translateX(10px);' +
-          'transform: translateX(10px);' +
-          '}';
-      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css))
-          .then(() => {
-            const keyframes = extractKeyframes(doc, 'anim1');
-            expect(keyframes).to.jsonEqual([
-              {offset: 1, transform: 'translateX(10px)'},
-            ]);
-          });
+      const css =
+        'to{' +
+        '-webkit-transform: translateX(10px);' +
+        '-moz-transform: translateX(10px);' +
+        '-ms-transform: translateX(10px);' +
+        'transform: translateX(10px);' +
+        '}';
+      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css)).then(
+        () => {
+          const keyframes = extractKeyframes(doc, 'anim1');
+          expect(keyframes).to.jsonEqual([
+            {offset: 1, transform: 'translateX(10px)'},
+          ]);
+        }
+      );
     });
 
     it('should support different offsets', () => {
-      const css = '0%{opacity: 0}' +
-          ' 25%{opacity: 0.5}' +
-          ' 100%{opacity: 1}';
-      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css))
-          .then(() => {
-            const keyframes = extractKeyframes(doc, 'anim1');
-            expect(keyframes).to.jsonEqual([
-              {offset: 0, opacity: '0'},
-              {offset: 0.25, opacity: '0.5'},
-              {offset: 1, opacity: '1'},
-            ]);
-          });
+      const css = '0%{opacity: 0} 25%{opacity: 0.5} 100%{opacity: 1}';
+      return createStyle({'amp-custom': ''}, keyframesCss('anim1', css)).then(
+        () => {
+          const keyframes = extractKeyframes(doc, 'anim1');
+          expect(keyframes).to.jsonEqual([
+            {offset: 0, opacity: '0'},
+            {offset: 0.25, opacity: '0.5'},
+            {offset: 1, opacity: '1'},
+          ]);
+        }
+      );
     });
 
     it('should select the latest keyframes', () => {
@@ -159,12 +164,14 @@ describes.realWin('extractKeyframes', {amp: 1}, env => {
       const css3 = 'from{opacity: 0} to{opacity: 0.3}';
       const css4 = 'from{opacity: 0} to{opacity: 0.4}';
       return Promise.all([
-        createStyle({'amp-custom': ''},
-            keyframesCss('anim1', css1) +
-            keyframesCss('anim1', css2)),
-        createStyle({'amp-custom': ''},
-            keyframesCss('anim1', css3) +
-            keyframesCss('anim1', css4)),
+        createStyle(
+          {'amp-custom': ''},
+          keyframesCss('anim1', css1) + keyframesCss('anim1', css2)
+        ),
+        createStyle(
+          {'amp-custom': ''},
+          keyframesCss('anim1', css3) + keyframesCss('anim1', css4)
+        ),
       ]).then(() => {
         const keyframes = extractKeyframes(doc, 'anim1');
         expect(keyframes).to.jsonEqual([
diff --git a/extensions/amp-animation/0.1/test/test-web-animations.js b/extensions/amp-animation/0.1/test/test-web-animations.js
index 0731c170b80a..a377883aeada 100644
--- a/extensions/amp-animation/0.1/test/test-web-animations.js
+++ b/extensions/amp-animation/0.1/test/test-web-animations.js
@@ -20,7 +20,6 @@ import {isArray, isObject} from '../../../../src/types';
 import {poll} from '../../../../testing/iframe';
 import {user} from '../../../../src/log';
 
-
 describes.realWin('MeasureScanner', {amp: 1}, env => {
   let win, doc;
   let vsync;
@@ -78,8 +77,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   function scan(spec) {
-    const builder = new Builder(win, doc, 'https://acme.org/',
-        /* vsync */ null, /* resources */ null);
+    const builder = new Builder(
+      win,
+      doc,
+      'https://acme.org/',
+      /* vsync */ null,
+      /* resources */ null
+    );
     sandbox.stub(builder, 'requireLayout');
     const scanner = builder.createScanner_([]);
     const success = scanner.scan(spec);
@@ -103,10 +107,10 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     const style = doc.createElement('style');
     style.setAttribute('amp-custom', '');
     style.textContent =
-        `@-ms-keyframes ${name} {${css}}` +
-        `@-moz-keyframes ${name} {${css}}` +
-        `@-webkit-keyframes ${name} {${css}}` +
-        `@keyframes ${name} {${css}}`;
+      `@-ms-keyframes ${name} {${css}}` +
+      `@-moz-keyframes ${name} {${css}}` +
+      `@-webkit-keyframes ${name} {${css}}` +
+      `@keyframes ${name} {${css}}`;
     doc.head.appendChild(style);
     return poll('wait for style', () => {
       for (let i = 0; i < doc.styleSheets.length; i++) {
@@ -130,13 +134,18 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     expect(scanTiming({duration: 'var(--unk, 11ms)'}).duration).to.equal(11);
     allowConsoleError(() => {
       expect(() => scanTiming({duration: 'a'})).to.throw(
-          /"duration" is invalid/);
+        /"duration" is invalid/
+      );
       expect(() => scanTiming({duration: -1})).to.throw(
-          /"duration" is invalid/);
+        /"duration" is invalid/
+      );
     });
-    expect(warnStub).to.not.be.calledWith(sinon.match.any, sinon.match(arg => {
-      return /fractional/.test(arg);
-    }));
+    expect(warnStub).to.not.be.calledWith(
+      sinon.match.any,
+      sinon.match(arg => {
+        return /fractional/.test(arg);
+      })
+    );
   });
 
   it('should parse/validate timing delay', () => {
@@ -164,9 +173,11 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     expect(scanTiming({endDelay: 'calc(10ms)'}).endDelay).to.equal(10);
     allowConsoleError(() => {
       expect(() => scanTiming({endDelay: 'a'})).to.throw(
-          /"endDelay" is invalid/);
+        /"endDelay" is invalid/
+      );
       expect(() => scanTiming({endDelay: -1})).to.throw(
-          /"endDelay" is invalid/);
+        /"endDelay" is invalid/
+      );
     });
   });
 
@@ -182,21 +193,26 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     expect(scanTiming({iterations: 'INFINITE'}).iterations).to.equal(Infinity);
     allowConsoleError(() => {
       expect(() => scanTiming({iterations: 'a'})).to.throw(
-          /"iterations" is invalid/);
+        /"iterations" is invalid/
+      );
       expect(() => scanTiming({iterations: -1})).to.throw(
-          /"iterations" is invalid/);
+        /"iterations" is invalid/
+      );
     });
 
     expect(scanTiming({}).iterationStart).to.equal(0);
     expect(scanTiming({iterationStart: 0}).iterationStart).to.equal(0);
     expect(scanTiming({iterationStart: 10}).iterationStart).to.equal(10);
-    expect(scanTiming({iterationStart: 'calc(10)'}).iterationStart)
-        .to.equal(10);
+    expect(scanTiming({iterationStart: 'calc(10)'}).iterationStart).to.equal(
+      10
+    );
     allowConsoleError(() => {
       expect(() => scanTiming({iterationStart: 'a'})).to.throw(
-          /"iterationStart" is invalid/);
+        /"iterationStart" is invalid/
+      );
       expect(() => scanTiming({iterationStart: -1})).to.throw(
-          /"iterationStart" is invalid/);
+        /"iterationStart" is invalid/
+      );
     });
   });
 
@@ -216,29 +232,34 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   it('should parse/validate timing easing', () => {
     expect(scanTiming({}).easing).to.equal('linear');
     expect(scanTiming({easing: 'ease-in'}).easing).to.equal('ease-in');
-    expect(scanTiming({easing: 'var(--unk, ease-out)'}).easing)
-        .to.equal('ease-out');
+    expect(scanTiming({easing: 'var(--unk, ease-out)'}).easing).to.equal(
+      'ease-out'
+    );
   });
 
   it('should parse/validate timing direction', () => {
     expect(scanTiming({}).direction).to.equal('normal');
     expect(scanTiming({direction: 'reverse'}).direction).to.equal('reverse');
-    expect(scanTiming({direction: 'var(--unk, reverse)'}).direction)
-        .to.equal('reverse');
+    expect(scanTiming({direction: 'var(--unk, reverse)'}).direction).to.equal(
+      'reverse'
+    );
     allowConsoleError(() => {
       expect(() => scanTiming({direction: 'invalid'})).to.throw(
-          /Unknown direction value/);
+        /Unknown direction value/
+      );
     });
   });
 
   it('should parse/validate timing fill', () => {
     expect(scanTiming({}).fill).to.equal('none');
     expect(scanTiming({fill: 'both'}).fill).to.equal('both');
-    expect(scanTiming({fill: 'var(--unk, backwards)'}).fill)
-        .to.equal('backwards');
+    expect(scanTiming({fill: 'var(--unk, backwards)'}).fill).to.equal(
+      'backwards'
+    );
     allowConsoleError(() => {
       expect(() => scanTiming({fill: 'invalid'})).to.throw(
-          /Unknown fill value/);
+        /Unknown fill value/
+      );
     });
   });
 
@@ -317,30 +338,36 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should accept switch-animation with first match', () => {
-    const requests = scan({switch: [
-      {media: 'match', target: target1, keyframes: {}},
-      {media: 'match', target: target2, duration: 300, keyframes: {}},
-    ]});
+    const requests = scan({
+      switch: [
+        {media: 'match', target: target1, keyframes: {}},
+        {media: 'match', target: target2, duration: 300, keyframes: {}},
+      ],
+    });
     expect(requests).to.have.length(1);
     expect(requests[0].target).to.equal(target1);
     expect(requests[0].timing.duration).to.equal(0);
   });
 
   it('should accept switch-animation with second match', () => {
-    const requests = scan({switch: [
-      {media: 'not-match', target: target1, keyframes: {}},
-      {media: 'match', target: target2, duration: 300, keyframes: {}},
-    ]});
+    const requests = scan({
+      switch: [
+        {media: 'not-match', target: target1, keyframes: {}},
+        {media: 'match', target: target2, duration: 300, keyframes: {}},
+      ],
+    });
     expect(requests).to.have.length(1);
     expect(requests[0].target).to.equal(target2);
     expect(requests[0].timing.duration).to.equal(300);
   });
 
   it('should accept switch-animation with no matches', () => {
-    const requests = scan({switch: [
-      {media: 'not-match', target: target1, keyframes: {}},
-      {media: 'not-match', target: target2, duration: 300, keyframes: {}},
-    ]});
+    const requests = scan({
+      switch: [
+        {media: 'not-match', target: target1, keyframes: {}},
+        {media: 'not-match', target: target2, duration: 300, keyframes: {}},
+      ],
+    });
     expect(requests).to.have.length(0);
   });
 
@@ -363,8 +390,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       '--var1': '10px',
       animations: [
         {target: target1, keyframes: {}, '--var1': '20px', '--var2': '30px'},
-        {target: target2, duration: 300, keyframes: {},
-          '--var2': '40px', '--var3': 'var(--var4)'},
+        {
+          target: target2,
+          duration: 300,
+          keyframes: {},
+          '--var2': '40px',
+          '--var3': 'var(--var4)',
+        },
       ],
     });
     expect(requests).to.have.length(2);
@@ -387,19 +419,21 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     const requests = scan({
       '--parent1': '11px',
       '--parent2': '12px',
-      animations: [{
-        target: target1,
-        '--child1': '21px',
-        '--parent2': '22px', // Override parent.
-        '--child2': 'var(--child1)',
-        '--child3': 'var(--parent1)',
-        '--child4': 'var(--parent2)',
-        '--child5': 'var(--child6)', // Reverse order dependency.
-        '--child6': '23px',
-        keyframes: {
-          transform: 'translate(var(--child3), var(--child4))',
+      animations: [
+        {
+          target: target1,
+          '--child1': '21px',
+          '--parent2': '22px', // Override parent.
+          '--child2': 'var(--child1)',
+          '--child3': 'var(--parent1)',
+          '--child4': 'var(--parent2)',
+          '--child5': 'var(--child6)', // Reverse order dependency.
+          '--child6': '23px',
+          keyframes: {
+            transform: 'translate(var(--child3), var(--child4))',
+          },
         },
-      }],
+      ],
     });
     expect(requests).to.have.length(1);
     expect(requests[0].vars).to.jsonEqual({
@@ -412,51 +446,52 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       '--child5': '23px',
       '--child6': '23px',
     });
-    expect(requests[0].keyframes.transform[1])
-        .to.equal('translate(11px,22px)');
+    expect(requests[0].keyframes.transform[1]).to.equal('translate(11px,22px)');
   });
 
   it('should override vars in subtargets with index', () => {
     const requests = scan({
       '--parent1': '11px',
       '--parent2': '12px',
-      animations: [{
-        selector: '.target',
-        '--child1': '21px',
-        '--parent2': '22px', // Override parent.
-        '--child2': 'var(--child1)',
-        '--child3': 'var(--parent1)',
-        '--child4': 'var(--parent2)',
-        '--child5': 'var(--child6)', // Reverse order dependency.
-        '--child6': '23px',
-        subtargets: [
-          // By index.
-          {
-            index: 0,
-            '--child6': '31px',
-          },
-          {
-            index: 1,
-            '--child6': '32px',
-          },
-          // By selector.
-          {
-            selector: '#target1',
-            '--child1': '33px',
-          },
-          {
-            selector: '#target2',
-            '--child1': '34px',
-          },
-          {
-            selector: 'div',
-            '--child2': '35px',
+      animations: [
+        {
+          selector: '.target',
+          '--child1': '21px',
+          '--parent2': '22px', // Override parent.
+          '--child2': 'var(--child1)',
+          '--child3': 'var(--parent1)',
+          '--child4': 'var(--parent2)',
+          '--child5': 'var(--child6)', // Reverse order dependency.
+          '--child6': '23px',
+          subtargets: [
+            // By index.
+            {
+              index: 0,
+              '--child6': '31px',
+            },
+            {
+              index: 1,
+              '--child6': '32px',
+            },
+            // By selector.
+            {
+              selector: '#target1',
+              '--child1': '33px',
+            },
+            {
+              selector: '#target2',
+              '--child1': '34px',
+            },
+            {
+              selector: 'div',
+              '--child2': '35px',
+            },
+          ],
+          keyframes: {
+            transform: 'translate(var(--child6), var(--child1))',
           },
-        ],
-        keyframes: {
-          transform: 'translate(var(--child6), var(--child1))',
         },
-      }],
+      ],
     });
     expect(requests).to.have.length(2);
 
@@ -562,30 +597,19 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   it('should parse array keyframe', () => {
     const {keyframes} = scan({
       target: target1,
-      keyframes: [
-        {opacity: '0'},
-        {opacity: '1'},
-      ],
+      keyframes: [{opacity: '0'}, {opacity: '1'}],
     })[0];
     expect(isArray(keyframes)).to.be.true;
-    expect(keyframes).to.deep.equal([
-      {opacity: '0'},
-      {opacity: '1'},
-    ]);
+    expect(keyframes).to.deep.equal([{opacity: '0'}, {opacity: '1'}]);
   });
 
   it('should parse array keyframe w/partial offsets', () => {
     target1.style.opacity = 0;
     const {keyframes} = scan({
       target: target1,
-      keyframes: [
-        {opacity: '1'},
-      ],
+      keyframes: [{opacity: '1'}],
     })[0];
-    expect(keyframes).to.deep.equal([
-      {opacity: '0'},
-      {opacity: '1'},
-    ]);
+    expect(keyframes).to.deep.equal([{opacity: '0'}, {opacity: '1'}]);
   });
 
   it('should parse array keyframe w/non-zero offset', () => {
@@ -608,10 +632,7 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     target1.style.opacity = 0;
     const {keyframes} = scan({
       target: target1,
-      keyframes: [
-        {easing: 'ease-in'},
-        {opacity: '1'},
-      ],
+      keyframes: [{easing: 'ease-in'}, {opacity: '1'}],
     })[0];
     expect(keyframes).to.deep.equal([
       {easing: 'ease-in', opacity: '0'},
@@ -623,10 +644,7 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     target1.style.opacity = 0;
     const {keyframes} = scan({
       target: target1,
-      keyframes: [
-        {offset: 0, easing: 'ease-in'},
-        {opacity: '1'},
-      ],
+      keyframes: [{offset: 0, easing: 'ease-in'}, {opacity: '1'}],
     })[0];
     expect(keyframes).to.deep.equal([
       {offset: 0, easing: 'ease-in', opacity: '0'},
@@ -637,16 +655,10 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   it('should parse array keyframe with parsing', () => {
     const {keyframes} = scan({
       target: target1,
-      keyframes: [
-        {opacity: 'calc(0)'},
-        {opacity: 'calc(1)'},
-      ],
+      keyframes: [{opacity: 'calc(0)'}, {opacity: 'calc(1)'}],
     })[0];
     expect(isArray(keyframes)).to.be.true;
-    expect(keyframes).to.deep.equal([
-      {opacity: '0'},
-      {opacity: '1'},
-    ]);
+    expect(keyframes).to.deep.equal([{opacity: '0'}, {opacity: '1'}]);
   });
 
   it('should parse width/height functions', () => {
@@ -672,10 +684,7 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     const {keyframes} = scan({
       target: target1,
       keyframes: {
-        opacity: [
-          0,
-          'rand(0.5, 0.6)',
-        ],
+        opacity: [0, 'rand(0.5, 0.6)'],
       },
     })[0];
     expect(keyframes.opacity).to.jsonEqual(['0', '0.525']);
@@ -699,7 +708,8 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   it('should fail when cannot discover style keyframes', () => {
     allowConsoleError(() => {
       expect(() => scan({target: target1, keyframes: 'keyframes1'})).to.throw(
-          /Keyframes not found/);
+        /Keyframes not found/
+      );
     });
   });
 
@@ -768,8 +778,12 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       duration: 500,
       animations: [
         {supports: 'supported: 0', target: target1, keyframes: {}},
-        {supports: 'supported: 1', target: target2,
-          duration: 300, keyframes: {}},
+        {
+          supports: 'supported: 1',
+          target: target2,
+          duration: 300,
+          keyframes: {},
+        },
       ],
     });
     expect(requests).to.have.length(1);
@@ -777,8 +791,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should interprete absent CSS/supports as false', () => {
-    const builder = new Builder(win, doc, 'https://acme.org/',
-        vsync, /* resources */ null);
+    const builder = new Builder(
+      win,
+      doc,
+      'https://acme.org/',
+      vsync,
+      /* resources */ null
+    );
     const cssContext = builder.css_;
     expect(cssContext.supports('supported: 0')).to.be.false;
     expect(cssContext.supports('supported: 1')).to.be.true;
@@ -793,31 +812,39 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
 
   it('should check media AND supports', () => {
     // Both true -> true.
-    expect(scan({
-      media: 'match',
-      supports: 'supported: 1',
-      target: target1,
-      keyframes: {},
-    })).to.have.length(1);
+    expect(
+      scan({
+        media: 'match',
+        supports: 'supported: 1',
+        target: target1,
+        keyframes: {},
+      })
+    ).to.have.length(1);
     // One false -> false.
-    expect(scan({
-      media: 'not-match',
-      supports: 'supported: 1',
-      target: target1,
-      keyframes: {},
-    })).to.be.null;
-    expect(scan({
-      media: 'match',
-      supports: 'supported: 0',
-      target: target1,
-      keyframes: {},
-    })).to.be.null;
-    expect(scan({
-      media: 'not-match',
-      supports: 'supported: 0',
-      target: target1,
-      keyframes: {},
-    })).to.be.null;
+    expect(
+      scan({
+        media: 'not-match',
+        supports: 'supported: 1',
+        target: target1,
+        keyframes: {},
+      })
+    ).to.be.null;
+    expect(
+      scan({
+        media: 'match',
+        supports: 'supported: 0',
+        target: target1,
+        keyframes: {},
+      })
+    ).to.be.null;
+    expect(
+      scan({
+        media: 'not-match',
+        supports: 'supported: 0',
+        target: target1,
+        keyframes: {},
+      })
+    ).to.be.null;
   });
 
   it('should find targets by selector', () => {
@@ -841,9 +868,7 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should find targets by complex selector', () => {
-    const requests = scan([
-      {selector: '#target1.target', keyframes: {}},
-    ]);
+    const requests = scan([{selector: '#target1.target', keyframes: {}}]);
     expect(requests).to.have.length(1);
     // `#target1.target`
     expect(requests[0].target).to.equal(target1);
@@ -851,9 +876,7 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should find target by ID', () => {
-    const requests = scan([
-      {target: 'target1', keyframes: {}},
-    ]);
+    const requests = scan([{target: 'target1', keyframes: {}}]);
     expect(requests).to.have.length(1);
     // `#target1`
     expect(requests[0].target).to.equal(target1);
@@ -868,16 +891,26 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should require any target spec', () => {
-    allowConsoleError(() => { expect(() => {
-      scan([{duration: 400, keyframes: {}}]);
-    }).to.throw(/No target specified/); });
+    allowConsoleError(() => {
+      expect(() => {
+        scan([{duration: 400, keyframes: {}}]);
+      }).to.throw(/No target specified/);
+    });
   });
 
   it('should not allow both selector and target spec', () => {
-    allowConsoleError(() => { expect(() => {
-      scan([{selector: '#target1', target: 'target1',
-        duration: 400, keyframes: {}}]);
-    }).to.throw(/Both/); });
+    allowConsoleError(() => {
+      expect(() => {
+        scan([
+          {
+            selector: '#target1',
+            target: 'target1',
+            duration: 400,
+            keyframes: {},
+          },
+        ]);
+      }).to.throw(/Both/);
+    });
   });
 
   it('should build keyframe for multiple targets', () => {
@@ -900,15 +933,19 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     expect(request1.timing.duration).to.equal(100);
     expect(request1.timing.delay).to.equal(10);
     expect(request1.keyframes.opacity).to.deep.equal(['0', '1']);
-    expect(request1.keyframes.transform)
-        .to.deep.equal(['translateY(0px)', 'translateY(100px)']);
+    expect(request1.keyframes.transform).to.deep.equal([
+      'translateY(0px)',
+      'translateY(100px)',
+    ]);
     // `#target2`
     expect(request2.target).to.equal(target2);
     expect(request2.timing.duration).to.equal(100);
     expect(request2.timing.delay).to.equal(10);
     expect(request2.keyframes.opacity).to.deep.equal(['0.1', '1']);
-    expect(request2.keyframes.transform)
-        .to.deep.equal(['translateY(0px)', 'translateY(100px)']);
+    expect(request2.keyframes.transform).to.deep.equal([
+      'translateY(0px)',
+      'translateY(100px)',
+    ]);
   });
 
   it('should resolve index() for multiple targets', () => {
@@ -933,8 +970,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
   });
 
   it('should be able to resolve animation with args', () => {
-    const builder = new Builder(win, doc, 'https://acme.org/',
-        vsync, /* resources */ null);
+    const builder = new Builder(
+      win,
+      doc,
+      'https://acme.org/',
+      vsync,
+      /* resources */ null
+    );
     sandbox.stub(builder, 'requireLayout');
     const spec = {target: target1, delay: 101, keyframes: {}};
     const args = {
@@ -968,34 +1010,40 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       animation2.id = 'animation2';
       doc.body.appendChild(animation2);
 
-      builder = new Builder(win, doc, 'https://acme.org/',
-          vsync, resources);
+      builder = new Builder(win, doc, 'https://acme.org/', vsync, resources);
       sandbox.stub(builder, 'requireLayout');
       scanner = builder.createScanner_([]);
     });
 
     it('should fail when animation cannot be found', () => {
-      allowConsoleError(() => { expect(() => {
-        scanner.resolveRequests({animation: 'animation3'});
-      }).to.throw(/Animation not found/); });
+      allowConsoleError(() => {
+        expect(() => {
+          scanner.resolveRequests({animation: 'animation3'});
+        }).to.throw(/Animation not found/);
+      });
     });
 
     it('should fail when animation reference is not an amp-animation', () => {
       const animation3 = env.createAmpElement('amp-other');
       animation3.id = 'animation3';
       doc.body.appendChild(animation3);
-      allowConsoleError(() => { expect(() => {
-        scanner.resolveRequests({animation: 'animation3'});
-      }).to.throw(/Element is not an animation/); });
+      allowConsoleError(() => {
+        expect(() => {
+          scanner.resolveRequests({animation: 'animation3'});
+        }).to.throw(/Element is not an animation/);
+      });
     });
 
     it('should fail the recursive animation', () => {
       animation2Spec = {animation: 'animation2'};
-      return scanner.resolveRequests({animation: 'animation2'}).then(() => {
-        throw new Error('must have failed');
-      }, reason => {
-        expect(reason.message).to.match(/Recursive animations/);
-      });
+      return scanner.resolveRequests({animation: 'animation2'}).then(
+        () => {
+          throw new Error('must have failed');
+        },
+        reason => {
+          expect(reason.message).to.match(/Recursive animations/);
+        }
+      );
     });
 
     it('should resolve animation w/o target', () => {
@@ -1004,16 +1052,18 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests({
-        animation: 'animation2',
-        delay: 100,
-      }).then(requests => {
-        expect(requests).to.have.length(1);
-        expect(requests[0].target).to.equal(target1);
-        expect(requests[0].timing.duration).to.equal(2000);
-        expect(requests[0].timing.delay).to.equal(100);
-        expect(requests[0].vars).to.deep.equal({});
-      });
+      return scanner
+        .resolveRequests({
+          animation: 'animation2',
+          delay: 100,
+        })
+        .then(requests => {
+          expect(requests).to.have.length(1);
+          expect(requests[0].target).to.equal(target1);
+          expect(requests[0].timing.duration).to.equal(2000);
+          expect(requests[0].timing.delay).to.equal(100);
+          expect(requests[0].vars).to.deep.equal({});
+        });
     });
 
     it('should combine animations', () => {
@@ -1022,23 +1072,25 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests([
-        {
-          target: target2,
-          delay: 100,
-          keyframes: {},
-        },
-        {
-          animation: 'animation2',
-          delay: 200,
-        },
-      ]).then(requests => {
-        expect(requests).to.have.length(2);
-        expect(requests[0].target).to.equal(target2);
-        expect(requests[0].timing.delay).to.equal(100);
-        expect(requests[1].target).to.equal(target1);
-        expect(requests[1].timing.delay).to.equal(200);
-      });
+      return scanner
+        .resolveRequests([
+          {
+            target: target2,
+            delay: 100,
+            keyframes: {},
+          },
+          {
+            animation: 'animation2',
+            delay: 200,
+          },
+        ])
+        .then(requests => {
+          expect(requests).to.have.length(2);
+          expect(requests[0].target).to.equal(target2);
+          expect(requests[0].timing.delay).to.equal(100);
+          expect(requests[1].target).to.equal(target1);
+          expect(requests[1].timing.delay).to.equal(200);
+        });
     });
 
     it('should NOT override the target', () => {
@@ -1047,17 +1099,19 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests({
-        target: target2,
-        animation: 'animation2',
-        delay: 100,
-      }).then(requests => {
-        expect(requests).to.have.length(1);
-        expect(requests[0].target).to.equal(target1);
-        expect(requests[0].timing.duration).to.equal(2000);
-        expect(requests[0].timing.delay).to.equal(100);
-        expect(requests[0].vars).to.deep.equal({});
-      });
+      return scanner
+        .resolveRequests({
+          target: target2,
+          animation: 'animation2',
+          delay: 100,
+        })
+        .then(requests => {
+          expect(requests).to.have.length(1);
+          expect(requests[0].target).to.equal(target1);
+          expect(requests[0].timing.duration).to.equal(2000);
+          expect(requests[0].timing.delay).to.equal(100);
+          expect(requests[0].vars).to.deep.equal({});
+        });
     });
 
     it('should NOT override the target in nested animations', () => {
@@ -1077,21 +1131,23 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
           },
         ],
       };
-      return scanner.resolveRequests({
-        target: target2,
-        animation: 'animation2',
-        delay: 100,
-      }).then(requests => {
-        expect(requests).to.have.length(2);
-        expect(requests[0].target).to.equal(target2);
-        expect(requests[0].timing.duration).to.equal(2000);
-        expect(requests[0].timing.delay).to.equal(100);
-        expect(requests[0].vars).to.deep.equal({});
-        expect(requests[1].target).to.equal(target1);
-        expect(requests[1].timing.duration).to.equal(2500);
-        expect(requests[1].timing.delay).to.equal(400);
-        expect(requests[1].vars).to.deep.equal({});
-      });
+      return scanner
+        .resolveRequests({
+          target: target2,
+          animation: 'animation2',
+          delay: 100,
+        })
+        .then(requests => {
+          expect(requests).to.have.length(2);
+          expect(requests[0].target).to.equal(target2);
+          expect(requests[0].timing.duration).to.equal(2000);
+          expect(requests[0].timing.delay).to.equal(100);
+          expect(requests[0].vars).to.deep.equal({});
+          expect(requests[1].target).to.equal(target1);
+          expect(requests[1].timing.duration).to.equal(2500);
+          expect(requests[1].timing.delay).to.equal(400);
+          expect(requests[1].vars).to.deep.equal({});
+        });
     });
 
     it('should multiply animations by selector', () => {
@@ -1099,21 +1155,23 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests({
-        selector: '.target',
-        animation: 'animation2',
-        delay: 100,
-      }).then(requests => {
-        expect(requests).to.have.length(2);
-        expect(requests[0].target).to.equal(target1);
-        expect(requests[0].timing.duration).to.equal(2000);
-        expect(requests[0].timing.delay).to.equal(100);
-        expect(requests[0].vars).to.deep.equal({});
-        expect(requests[1].target).to.equal(target2);
-        expect(requests[1].timing.duration).to.equal(2000);
-        expect(requests[1].timing.delay).to.equal(100);
-        expect(requests[1].vars).to.deep.equal({});
-      });
+      return scanner
+        .resolveRequests({
+          selector: '.target',
+          animation: 'animation2',
+          delay: 100,
+        })
+        .then(requests => {
+          expect(requests).to.have.length(2);
+          expect(requests[0].target).to.equal(target1);
+          expect(requests[0].timing.duration).to.equal(2000);
+          expect(requests[0].timing.delay).to.equal(100);
+          expect(requests[0].vars).to.deep.equal({});
+          expect(requests[1].target).to.equal(target2);
+          expect(requests[1].timing.duration).to.equal(2000);
+          expect(requests[1].timing.delay).to.equal(100);
+          expect(requests[1].vars).to.deep.equal({});
+        });
     });
 
     it('should propagate vars', () => {
@@ -1123,21 +1181,24 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         '--y': '200px',
         keyframes: {transform: 'translate(var(--x), var(--y))'},
       };
-      return scanner.resolveRequests({
-        animation: 'animation2',
-        '--duration': 1500,
-        '--x': '100px',
-      }).then(requests => {
-        expect(requests).to.have.length(1);
-        expect(requests[0].timing.duration).to.equal(1500);
-        expect(requests[0].keyframes.transform[1])
-            .to.equal('translate(100px,200px)');
-        expect(requests[0].vars).to.deep.equal({
-          '--duration': '1500',
+      return scanner
+        .resolveRequests({
+          animation: 'animation2',
+          '--duration': 1500,
           '--x': '100px',
-          '--y': '200px',
+        })
+        .then(requests => {
+          expect(requests).to.have.length(1);
+          expect(requests[0].timing.duration).to.equal(1500);
+          expect(requests[0].keyframes.transform[1]).to.equal(
+            'translate(100px,200px)'
+          );
+          expect(requests[0].vars).to.deep.equal({
+            '--duration': '1500',
+            '--x': '100px',
+            '--y': '200px',
+          });
         });
-      });
     });
 
     it('should propagate vars and index by selector from parent', () => {
@@ -1145,44 +1206,42 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests({
-        selector: '.target',
-        animation: 'animation2',
-        delay: 'calc((index() + 1) * 1s)',
-        subtargets: [
-          {index: 0, '--y': '11px'},
-          {index: 1, '--y': '12px'},
-        ],
-      }).then(requests => {
-        expect(requests).to.have.length(2);
-        expect(requests[0].timing.delay).to.equal(1000);
-        expect(requests[0].vars).to.deep.equal({'--y': '11px'});
-        expect(requests[1].timing.delay).to.equal(2000);
-        expect(requests[1].vars).to.deep.equal({'--y': '12px'});
-      });
+      return scanner
+        .resolveRequests({
+          selector: '.target',
+          animation: 'animation2',
+          delay: 'calc((index() + 1) * 1s)',
+          subtargets: [{index: 0, '--y': '11px'}, {index: 1, '--y': '12px'}],
+        })
+        .then(requests => {
+          expect(requests).to.have.length(2);
+          expect(requests[0].timing.delay).to.equal(1000);
+          expect(requests[0].vars).to.deep.equal({'--y': '11px'});
+          expect(requests[1].timing.delay).to.equal(2000);
+          expect(requests[1].vars).to.deep.equal({'--y': '12px'});
+        });
     });
 
     it('should propagate vars and index by selector from child', () => {
       animation2Spec = {
         delay: 'calc((index() + 1) * 1s)',
-        subtargets: [
-          {index: 0, '--y': '11px'},
-          {index: 1, '--y': '12px'},
-        ],
+        subtargets: [{index: 0, '--y': '11px'}, {index: 1, '--y': '12px'}],
         duration: 2000,
         keyframes: {},
       };
-      return scanner.resolveRequests({
-        selector: '.target',
-        animation: 'animation2',
-        delay: 100,
-      }).then(requests => {
-        expect(requests).to.have.length(2);
-        expect(requests[0].timing.delay).to.equal(1000);
-        expect(requests[0].vars).to.deep.equal({'--y': '11px'});
-        expect(requests[1].timing.delay).to.equal(2000);
-        expect(requests[1].vars).to.deep.equal({'--y': '12px'});
-      });
+      return scanner
+        .resolveRequests({
+          selector: '.target',
+          animation: 'animation2',
+          delay: 100,
+        })
+        .then(requests => {
+          expect(requests).to.have.length(2);
+          expect(requests[0].timing.delay).to.equal(1000);
+          expect(requests[0].vars).to.deep.equal({'--y': '11px'});
+          expect(requests[1].timing.delay).to.equal(2000);
+          expect(requests[1].vars).to.deep.equal({'--y': '12px'});
+        });
     });
   });
 
@@ -1192,8 +1251,12 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
 
     beforeEach(() => {
       const builder = new Builder(
-          win, doc, 'https://acme.org/',
-          /* vsync */ null, /* resources */ null);
+        win,
+        doc,
+        'https://acme.org/',
+        /* vsync */ null,
+        /* resources */ null
+      );
       css = builder.css_;
       parseSpy = sandbox.spy(css, 'resolveAsNode_');
     });
@@ -1245,14 +1308,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       target1.style.width = '110px';
       css.withTarget(target1, 0, () => {
         expect(css.resolveCss('10em')).to.equal('100px');
-        expect(css.resolveCss('translateX(10em)'))
-            .to.equal('translatex(100px)');
-        expect(css.resolveCss('translateX(10%)'))
-            .to.equal('translatex(11px)');
+        expect(css.resolveCss('translateX(10em)')).to.equal(
+          'translatex(100px)'
+        );
+        expect(css.resolveCss('translateX(10%)')).to.equal('translatex(11px)');
       });
       expect(css.resolveCss('10vh')).to.equal('15px');
-      expect(css.resolveCss('translateY(10vh)'))
-          .to.equal('translatey(15px)');
+      expect(css.resolveCss('translateY(10vh)')).to.equal('translatey(15px)');
       expect(parseSpy).to.be.called;
     });
 
@@ -1264,12 +1326,13 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     it('should require target for CSS that need element context', () => {
       allowConsoleError(() => {
         expect(() => css.resolveCss('calc(10em + 10px)')).to.throw(
-            /target is specified/);
+          /target is specified/
+        );
       });
       target1.style.fontSize = '10px';
-      expect(css.withTarget(target1, 0,
-          () => css.resolveCss('calc(10em + 10px)')))
-          .to.equal('110px');
+      expect(
+        css.withTarget(target1, 0, () => css.resolveCss('calc(10em + 10px)'))
+      ).to.equal('110px');
     });
 
     it('should resolve simple time CSS w/o evaluation', () => {
@@ -1294,7 +1357,6 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       expect(parseSpy).to.be.called;
     });
 
-
     it('should resolve simple number CSS w/o evaluation', () => {
       expect(css.resolveNumber(null, 1)).to.equal(1);
       expect(css.resolveNumber('', 1)).to.equal(1);
@@ -1327,8 +1389,9 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       // With element.
       warnStub.reset();
       stub.reset();
-      expect(css.withTarget(target1, 0, () => css.getVar('--var1')).num_)
-          .to.equal(10);
+      expect(
+        css.withTarget(target1, 0, () => css.getVar('--var1')).num_
+      ).to.equal(10);
       expect(stub).to.be.calledWith(target1, '--var1');
       expect(warnStub).to.have.callCount(0);
 
@@ -1339,8 +1402,9 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
         // No element, but predefined vars.
         expect(css.getVar('--var1').num_).to.equal(11);
         // Predefined vars override the element.
-        expect(css.withTarget(target1, 0, () => css.getVar('--var1')).num_)
-            .to.equal(11);
+        expect(
+          css.withTarget(target1, 0, () => css.getVar('--var1')).num_
+        ).to.equal(11);
 
         expect(stub).to.not.be.called;
         expect(warnStub).to.have.callCount(0);
@@ -1348,23 +1412,26 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     });
 
     it('should disallow recursive vars', () => {
-      css.withVars({
-        '--var1': '11',
-        '--var2': 'var(--var1)',
-        '--rec1': 'var(--rec2)',
-        '--rec2': 'var(--rec1)',
-        '--rec3': 'var(--rec4)',
-        '--rec4': 'var(--rec1)',
-      }, () => {
-        expect(css.getVar('--var1').num_).to.equal(11);
-        expect(css.getVar('--var2').num_).to.equal(11);
-        allowConsoleError(() => {
-          expect(() => css.getVar('--rec1')).to.throw(/Recursive/);
-          expect(() => css.getVar('--rec2')).to.throw(/Recursive/);
-          expect(() => css.getVar('--rec3')).to.throw(/Recursive/);
-          expect(() => css.getVar('--rec4')).to.throw(/Recursive/);
-        });
-      });
+      css.withVars(
+        {
+          '--var1': '11',
+          '--var2': 'var(--var1)',
+          '--rec1': 'var(--rec2)',
+          '--rec2': 'var(--rec1)',
+          '--rec3': 'var(--rec4)',
+          '--rec4': 'var(--rec1)',
+        },
+        () => {
+          expect(css.getVar('--var1').num_).to.equal(11);
+          expect(css.getVar('--var2').num_).to.equal(11);
+          allowConsoleError(() => {
+            expect(() => css.getVar('--rec1')).to.throw(/Recursive/);
+            expect(() => css.getVar('--rec2')).to.throw(/Recursive/);
+            expect(() => css.getVar('--rec3')).to.throw(/Recursive/);
+            expect(() => css.getVar('--rec4')).to.throw(/Recursive/);
+          });
+        }
+      );
     });
 
     it('should propagate dimension', () => {
@@ -1388,10 +1455,12 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       allowConsoleError(() => {
         expect(() => css.getCurrentIndex()).to.throw(/target is specified/);
       });
-      expect(css.withTarget(target1, 0, () => css.getCurrentIndex()))
-          .to.equal(0);
-      expect(css.withTarget(target1, 11, () => css.getCurrentIndex()))
-          .to.equal(11);
+      expect(css.withTarget(target1, 0, () => css.getCurrentIndex())).to.equal(
+        0
+      );
+      expect(css.withTarget(target1, 11, () => css.getCurrentIndex())).to.equal(
+        11
+      );
     });
 
     it('should resolve current and root font size', () => {
@@ -1402,10 +1471,12 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       allowConsoleError(() => {
         expect(() => css.getCurrentFontSize()).to.throw(/target is specified/);
       });
-      expect(css.withTarget(target1, 0, () => css.getCurrentFontSize()))
-          .to.equal(16);
-      expect(css.withTarget(target2, 0, () => css.getCurrentFontSize()))
-          .to.equal(12);
+      expect(
+        css.withTarget(target1, 0, () => css.getCurrentFontSize())
+      ).to.equal(16);
+      expect(
+        css.withTarget(target2, 0, () => css.getCurrentFontSize())
+      ).to.equal(12);
     });
 
     it('should resolve current element size', () => {
@@ -1413,10 +1484,12 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       target1.style.height = '12px';
       allowConsoleError(() => {
         expect(() => css.getCurrentElementSize()).to.throw(
-            /target is specified/);
+          /target is specified/
+        );
       });
-      expect(css.withTarget(target1, 0, () => css.getCurrentElementSize()))
-          .to.deep.equal({width: 11, height: 12});
+      expect(
+        css.withTarget(target1, 0, () => css.getCurrentElementSize())
+      ).to.deep.equal({width: 11, height: 12});
     });
 
     it('should resolve the selected element size', () => {
@@ -1427,27 +1500,30 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       target1.appendChild(child);
 
       // Normal selectors search whole DOM and don't need context.
-      expect(css.getElementSize('#target1', null))
-          .to.deep.equal({width: 11, height: 12});
-      expect(css.withTarget(target2, 0,
-          () => css.getElementSize('#target1', null)))
-          .to.deep.equal({width: 11, height: 12});
+      expect(css.getElementSize('#target1', null)).to.deep.equal({
+        width: 11,
+        height: 12,
+      });
+      expect(
+        css.withTarget(target2, 0, () => css.getElementSize('#target1', null))
+      ).to.deep.equal({width: 11, height: 12});
 
       // Closest selectors always need a context node.
       allowConsoleError(() => {
         expect(() => css.getElementSize('#target1', 'closest')).to.throw(
-            /target is specified/);
+          /target is specified/
+        );
       });
-      expect(css.withTarget(child, 0,
-          () => css.getElementSize('.parent', 'closest')))
-          .to.deep.equal({width: 11, height: 12});
+      expect(
+        css.withTarget(child, 0, () => css.getElementSize('.parent', 'closest'))
+      ).to.deep.equal({width: 11, height: 12});
     });
 
     it('should resolve a valid URL', () => {
-      expect(css.resolveUrl('/path'))
-          .to.equal('https://acme.org/path');
-      expect(css.resolveUrl('//example.org/path'))
-          .to.equal('https://example.org/path');
+      expect(css.resolveUrl('/path')).to.equal('https://acme.org/path');
+      expect(css.resolveUrl('//example.org/path')).to.equal(
+        'https://example.org/path'
+      );
     });
 
     it('should NOT resolve an invalid URL', () => {
@@ -1457,7 +1533,6 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     });
   });
 
-
   describe('createRunner', () => {
     let amp1, amp2;
 
@@ -1475,15 +1550,20 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
     });
 
     function waitForNextMicrotask() {
-      return vsync.measurePromise(() => {})
-          .then(() => Promise.resolve())
-          .then(() => Promise.all([Promise.resolve()]));
+      return vsync
+        .measurePromise(() => {})
+        .then(() => Promise.resolve())
+        .then(() => Promise.all([Promise.resolve()]));
     }
 
     function createRunner(spec) {
       const builder = new Builder(
-          win, doc, 'https://acme.org/',
-          vsync, resources);
+        win,
+        doc,
+        'https://acme.org/',
+        vsync,
+        resources
+      );
       return builder.createRunner(spec);
     }
 
@@ -1516,29 +1596,32 @@ describes.realWin('MeasureScanner', {amp: 1}, env => {
       ]).then(res => {
         runner = res;
       });
-      return waitForNextMicrotask().then(() => {
-        expect(runner).to.be.undefined;
-        r1.loadPromiseResolve_();
-        return waitForNextMicrotask();
-      }).then(() => {
-        expect(runner).to.be.undefined;
-        r2.loadPromiseResolve_();
-        return Promise.all([r1.loadedOnce(), r2.loadedOnce()])
-            .then(() => waitForNextMicrotask());
-      }).then(() => {
-        expect(runner).to.be.ok;
-        expect(runner.requests_).to.have.length(2);
-        expect(runner.requests_[0].target).to.equal(amp1);
-        expect(runner.requests_[1].target).to.equal(amp2);
-        expect(requireLayoutSpy).to.have.callCount(2);
-        expect(requireLayoutSpy).to.be.calledWith(amp1);
-        expect(requireLayoutSpy).to.be.calledWith(amp2);
-      });
+      return waitForNextMicrotask()
+        .then(() => {
+          expect(runner).to.be.undefined;
+          r1.loadPromiseResolve_();
+          return waitForNextMicrotask();
+        })
+        .then(() => {
+          expect(runner).to.be.undefined;
+          r2.loadPromiseResolve_();
+          return Promise.all([r1.loadedOnce(), r2.loadedOnce()]).then(() =>
+            waitForNextMicrotask()
+          );
+        })
+        .then(() => {
+          expect(runner).to.be.ok;
+          expect(runner.requests_).to.have.length(2);
+          expect(runner.requests_[0].target).to.equal(amp1);
+          expect(runner.requests_[1].target).to.equal(amp2);
+          expect(requireLayoutSpy).to.have.callCount(2);
+          expect(requireLayoutSpy).to.be.calledWith(amp1);
+          expect(requireLayoutSpy).to.be.calledWith(amp2);
+        });
     });
   });
 });
 
-
 describes.sandboxed('NativeWebAnimationRunner', {}, () => {
   let target1, target2;
   let target1Mock, target2Mock;
@@ -1615,14 +1698,16 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
   }
 
   it('should call init on all animations and stay in IDLE state', () => {
-    target1Mock.expects('animate')
-        .withExactArgs(keyframes1, timing1)
-        .returns(anim1)
-        .once();
-    target2Mock.expects('animate')
-        .withExactArgs(keyframes2, timing2)
-        .returns(anim2)
-        .once();
+    target1Mock
+      .expects('animate')
+      .withExactArgs(keyframes1, timing1)
+      .returns(anim1)
+      .once();
+    target2Mock
+      .expects('animate')
+      .withExactArgs(keyframes2, timing2)
+      .returns(anim2)
+      .once();
 
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
     runner.init();
@@ -1634,14 +1719,16 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
   });
 
   it('should call start on all animations', () => {
-    target1Mock.expects('animate')
-        .withExactArgs(keyframes1, timing1)
-        .returns(anim1)
-        .once();
-    target2Mock.expects('animate')
-        .withExactArgs(keyframes2, timing2)
-        .returns(anim2)
-        .once();
+    target1Mock
+      .expects('animate')
+      .withExactArgs(keyframes1, timing1)
+      .returns(anim1)
+      .once();
+    target2Mock
+      .expects('animate')
+      .withExactArgs(keyframes2, timing2)
+      .returns(anim2)
+      .once();
 
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.IDLE);
     runner.start();
@@ -1655,9 +1742,11 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
 
   it('should fail to init twice', () => {
     runner.init();
-    allowConsoleError(() => { expect(() => {
-      runner.init();
-    }).to.throw(); });
+    allowConsoleError(() => {
+      expect(() => {
+        runner.init();
+      }).to.throw();
+    });
   });
 
   it('should set vars on start', () => {
@@ -1668,10 +1757,11 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
     runner = new NativeWebAnimationRunner([
       {vars, target: target1, keyframes: keyframes1, timing: timing1},
     ]);
-    target1Mock.expects('animate')
-        .withExactArgs(keyframes1, timing1)
-        .returns(anim1)
-        .once();
+    target1Mock
+      .expects('animate')
+      .withExactArgs(keyframes1, timing1)
+      .returns(anim1)
+      .once();
 
     runner.start();
     expect(target1.style['--var1']).to.equal('1px');
@@ -1697,29 +1787,49 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
     runner.start();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
-    anim1Mock.expects('pause').callThrough().once();
-    anim2Mock.expects('pause').callThrough().once();
+    anim1Mock
+      .expects('pause')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('pause')
+      .callThrough()
+      .once();
     runner.pause();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
   });
 
   it('should only allow pause when started', () => {
-    allowConsoleError(() => { expect(() => {
-      runner.pause();
-    }).to.throw(); });
+    allowConsoleError(() => {
+      expect(() => {
+        runner.pause();
+      }).to.throw();
+    });
   });
 
   it('should resume all animations', () => {
     runner.start();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
-    anim1Mock.expects('pause').callThrough().once();
-    anim2Mock.expects('pause').callThrough().once();
+    anim1Mock
+      .expects('pause')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('pause')
+      .callThrough()
+      .once();
     runner.pause();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
 
-    anim1Mock.expects('play').callThrough().once();
-    anim2Mock.expects('play').callThrough().once();
+    anim1Mock
+      .expects('play')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('play')
+      .callThrough()
+      .once();
     runner.resume();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
@@ -1743,13 +1853,25 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
     anim1.finish();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
-    anim1Mock.expects('pause').callThrough().never();
-    anim2Mock.expects('pause').callThrough().once();
+    anim1Mock
+      .expects('pause')
+      .callThrough()
+      .never();
+    anim2Mock
+      .expects('pause')
+      .callThrough()
+      .once();
     runner.pause();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
 
-    anim1Mock.expects('play').callThrough().never();
-    anim2Mock.expects('play').callThrough().once();
+    anim1Mock
+      .expects('play')
+      .callThrough()
+      .never();
+    anim2Mock
+      .expects('play')
+      .callThrough()
+      .once();
     runner.resume();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
@@ -1764,9 +1886,11 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
   });
 
   it('should only allow resume when started', () => {
-    allowConsoleError(() => { expect(() => {
-      runner.resume();
-    }).to.throw(); });
+    allowConsoleError(() => {
+      expect(() => {
+        runner.resume();
+      }).to.throw();
+    });
   });
 
   it('should reverse all animations', () => {
@@ -1780,17 +1904,25 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
   });
 
   it('should only allow reverse when started', () => {
-    allowConsoleError(() => { expect(() => {
-      runner.reverse();
-    }).to.throw(); });
+    allowConsoleError(() => {
+      expect(() => {
+        runner.reverse();
+      }).to.throw();
+    });
   });
 
   it('should finish all animations', () => {
     runner.start();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
-    anim1Mock.expects('finish').callThrough().once();
-    anim2Mock.expects('finish').callThrough().once();
+    anim1Mock
+      .expects('finish')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('finish')
+      .callThrough()
+      .once();
     runner.finish();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.FINISHED);
   });
@@ -1819,8 +1951,14 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
     runner.start();
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
-    anim1Mock.expects('pause').callThrough().once();
-    anim2Mock.expects('pause').callThrough().once();
+    anim1Mock
+      .expects('pause')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('pause')
+      .callThrough()
+      .once();
     runner.seekTo(101);
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
     expect(anim1.currentTime).to.equal(101);
@@ -1832,8 +1970,14 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.RUNNING);
 
     sandbox.stub(runner, 'getTotalDuration_').returns(500);
-    anim1Mock.expects('pause').callThrough().once();
-    anim2Mock.expects('pause').callThrough().once();
+    anim1Mock
+      .expects('pause')
+      .callThrough()
+      .once();
+    anim2Mock
+      .expects('pause')
+      .callThrough()
+      .once();
     runner.seekToPercent(0.5);
     expect(runner.getPlayState()).to.equal(WebAnimationPlayState.PAUSED);
     expect(anim1.currentTime).to.equal(250);
@@ -1911,7 +2055,7 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
         {target: target1, keyframes: keyframes1, timing},
       ]);
       // iterationStart is 2.5, the first 2.5 out of 3 iterations are ignored.
-      expect(runner.getTotalDuration_()).to.equal(250);// 0.5*100 + 100 + 100
+      expect(runner.getTotalDuration_()).to.equal(250); // 0.5*100 + 100 + 100
     });
 
     it('single request, infinite iteration', () => {
@@ -2038,6 +2182,5 @@ describes.sandboxed('NativeWebAnimationRunner', {}, () => {
         expect(() => runner.getTotalDuration_()).to.throw(/has infinite/);
       });
     });
-
   });
 });
diff --git a/extensions/amp-animation/0.1/web-animation-service.js b/extensions/amp-animation/0.1/web-animation-service.js
index 5984ce0cbc7d..2eab3785da3c 100644
--- a/extensions/amp-animation/0.1/web-animation-service.js
+++ b/extensions/amp-animation/0.1/web-animation-service.js
@@ -17,7 +17,6 @@ import {Builder} from './web-animations';
 import {Services} from '../../../src/services';
 import {installWebAnimationsIfNecessary} from './web-animations-polyfill';
 
-
 export class WebAnimationService {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -33,7 +32,6 @@ export class WebAnimationService {
     this.resources_ = Services.resourcesForDoc(ampdoc);
   }
 
-
   /**
    * @return {!Builder}
    */
@@ -41,10 +39,11 @@ export class WebAnimationService {
     installWebAnimationsIfNecessary(this.ampdoc_.win);
 
     return new Builder(
-        this.ampdoc_.win,
-        this.ampdoc_.getRootNode(),
-        this.ampdoc_.getUrl(),
-        this.vsync_,
-        this.resources_);
+      this.ampdoc_.win,
+      this.ampdoc_.getRootNode(),
+      this.ampdoc_.getUrl(),
+      this.vsync_,
+      this.resources_
+    );
   }
 }
diff --git a/extensions/amp-animation/0.1/web-animation-types.js b/extensions/amp-animation/0.1/web-animation-types.js
index d914eb94a67c..b306f75c107b 100644
--- a/extensions/amp-animation/0.1/web-animation-types.js
+++ b/extensions/amp-animation/0.1/web-animation-types.js
@@ -43,7 +43,6 @@ export let InternalWebAnimationRequestDef;
  */
 export let WebAnimationDef;
 
-
 /**
  * @mixes WebAnimationSelectorDef
  * @mixes WebAnimationTimingDef
@@ -55,7 +54,6 @@ export let WebAnimationDef;
  */
 export let WebMultiAnimationDef;
 
-
 /**
  * @mixes WebAnimationSelectorDef
  * @mixes WebAnimationTimingDef
@@ -67,7 +65,6 @@ export let WebMultiAnimationDef;
  */
 export let WebSwitchAnimationDef;
 
-
 /**
  * @mixes WebAnimationSelectorDef
  * @mixes WebAnimationTimingDef
@@ -79,7 +76,6 @@ export let WebSwitchAnimationDef;
  */
 export let WebCompAnimationDef;
 
-
 /**
  * @mixes WebAnimationSelectorDef
  * @mixes WebAnimationTimingDef
@@ -91,13 +87,11 @@ export let WebCompAnimationDef;
  */
 export let WebKeyframeAnimationDef;
 
-
 /**
  * @typedef {!Object<string, *>|!Array<!Object<string, *>>}
  */
 export let WebKeyframesDef;
 
-
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingProperties
  *
@@ -115,7 +109,6 @@ export let WebKeyframesDef;
  */
 export let WebAnimationTimingDef;
 
-
 /**
  * Indicates an extension to a type that allows specifying vars. Vars are
  * specified as properties with the name in the format of `--varName`.
@@ -125,7 +118,6 @@ export let WebAnimationTimingDef;
  */
 export let WebAnimationVarsDef;
 
-
 /**
  * Defines media parameters for an animation.
  *
@@ -137,7 +129,6 @@ export let WebAnimationVarsDef;
  */
 export let WebAnimationConditionalDef;
 
-
 /**
  * @typedef {{
  *   target: (!Element|undefined),
@@ -147,7 +138,6 @@ export let WebAnimationConditionalDef;
  */
 export let WebAnimationSelectorDef;
 
-
 /**
  * @mixes WebAnimationTimingDef
  * @mixes WebAnimationVarsDef
@@ -159,7 +149,6 @@ export let WebAnimationSelectorDef;
  */
 export let WebAnimationSubtargetDef;
 
-
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/Animation/playState
  * @enum {string}
@@ -172,7 +161,6 @@ export const WebAnimationPlayState = {
   FINISHED: 'finished',
 };
 
-
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingProperties/direction
  * @enum {string}
@@ -184,7 +172,6 @@ export const WebAnimationTimingDirection = {
   ALTERNATE_REVERSE: 'alternate-reverse',
 };
 
-
 /**
  * See https://developer.mozilla.org/en-US/docs/Web/API/AnimationEffectTimingProperties/fill
  * @enum {string}
@@ -197,7 +184,6 @@ export const WebAnimationTimingFill = {
   AUTO: 'auto',
 };
 
-
 /** @const {!Object<string, boolean>} */
 const WHITELISTED_RPOPS = {
   'opacity': true,
@@ -208,7 +194,6 @@ const WHITELISTED_RPOPS = {
   'offsetDistance': true,
 };
 
-
 /**
  * @param {string} prop
  * @return {boolean}
diff --git a/extensions/amp-animation/0.1/web-animations-polyfill.js b/extensions/amp-animation/0.1/web-animations-polyfill.js
index 73d77f4b5c60..cda01f66b3e4 100644
--- a/extensions/amp-animation/0.1/web-animations-polyfill.js
+++ b/extensions/amp-animation/0.1/web-animations-polyfill.js
@@ -15,10 +15,8 @@
  */
 import {installWebAnimations} from 'web-animations-js/web-animations.install';
 
-
 const POLYFILLED = '__AMP_WA';
 
-
 /**
  * @param {!Window} win
  */
diff --git a/extensions/amp-animation/0.1/web-animations.js b/extensions/amp-animation/0.1/web-animations.js
index 37e98ddc3755..427f622890c9 100644
--- a/extensions/amp-animation/0.1/web-animations.js
+++ b/extensions/amp-animation/0.1/web-animations.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {CssNumberNode, CssTimeNode, isVarCss} from './parsers/css-expr-ast';
 import {
   InternalWebAnimationRequestDef, // eslint-disable-line no-unused-vars
@@ -32,15 +31,10 @@ import {
   isWhitelistedProp,
 } from './web-animation-types';
 import {NativeWebAnimationRunner} from './runners/native-web-animation-runner';
-import {
-  ScrollTimelineWorkletRunner,
-} from './runners/scrolltimeline-worklet-runner';
+import {ScrollTimelineWorkletRunner} from './runners/scrolltimeline-worklet-runner';
 import {assertHttpsUrl, resolveRelativeUrl} from '../../../src/url';
 import {closestAncestorElementBySelector, matches} from '../../../src/dom';
-import {
-  computedStyle,
-  getVendorJsPropertyName,
-} from '../../../src/style';
+import {computedStyle, getVendorJsPropertyName} from '../../../src/style';
 import {dashToCamelCase, startsWith} from '../../../src/string';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {extractKeyframes} from './parsers/keyframes-extractor';
@@ -51,7 +45,6 @@ import {isInFie} from '../../../src/friendly-iframe-embed';
 import {map} from '../../../src/utils/object';
 import {parseCss} from './parsers/css-expr';
 
-
 /** @const {string} */
 const TAG = 'amp-animation';
 const TARGET_ANIM_ID = '__AMP_ANIM_ID';
@@ -77,7 +70,6 @@ const SERVICE_PROPS = {
  * @abstract
  */
 class Scanner {
-
   /**
    * @param {!WebAnimationDef|!Array<!WebAnimationDef>} spec
    * @return {boolean}
@@ -144,12 +136,12 @@ class Scanner {
 
   /** @param {!Object} unusedSpec */
   onUnknownAnimation(unusedSpec) {
-    throw dev().createError('unknown animation type:' +
-        ' must have "animations" or "keyframes" field');
+    throw dev().createError(
+      'unknown animation type: must have "animations" or "keyframes" field'
+    );
   }
 }
 
-
 /**
  * Builds animation runners based on the provided spec.
  */
@@ -189,17 +181,19 @@ export class Builder {
    * @param {?JsonObject=} opt_positionObserverData
    * @return {!Promise<!./runners/animation-runner.AnimationRunner>}
    */
-  createRunner(spec, opt_args,
-    opt_positionObserverData = null) {
+  createRunner(spec, opt_args, opt_positionObserverData = null) {
     return this.resolveRequests([], spec, opt_args).then(requests => {
       if (getMode().localDev || getMode().development) {
         user().fine(TAG, 'Animation: ', requests);
       }
       return Promise.all(this.loaders_).then(() => {
-        return this.isAnimationWorkletSupported_() && opt_positionObserverData ?
-          new ScrollTimelineWorkletRunner(this.win_, requests,
-              opt_positionObserverData) :
-          new NativeWebAnimationRunner(requests);
+        return this.isAnimationWorkletSupported_() && opt_positionObserverData
+          ? new ScrollTimelineWorkletRunner(
+              this.win_,
+              requests,
+              opt_positionObserverData
+            )
+          : new NativeWebAnimationRunner(requests);
       });
     });
   }
@@ -215,11 +209,19 @@ export class Builder {
    * @return {!Promise<!Array<!InternalWebAnimationRequestDef>>}
    * @protected
    */
-  resolveRequests(path, spec, args,
-    target = null, index = null, vars = null, timing = null) {
+  resolveRequests(
+    path,
+    spec,
+    args,
+    target = null,
+    index = null,
+    vars = null,
+    timing = null
+  ) {
     const scanner = this.createScanner_(path, target, index, vars, timing);
-    return this.vsync_.measurePromise(
-        () => scanner.resolveRequests(spec, args));
+    return this.vsync_.measurePromise(() =>
+      scanner.resolveRequests(spec, args)
+    );
   }
 
   /**
@@ -242,8 +244,15 @@ export class Builder {
    * @private
    */
   createScanner_(path, target, index, vars, timing) {
-    return new MeasureScanner(this, this.css_, path,
-        target, index, vars, timing);
+    return new MeasureScanner(
+      this,
+      this.css_,
+      path,
+      target,
+      index,
+      vars,
+      timing
+    );
   }
 
   /**
@@ -251,21 +260,21 @@ export class Builder {
    * @private
    */
   isAnimationWorkletSupported_() {
-    return isExperimentOn(this.win_, 'chrome-animation-worklet') &&
-    'animationWorklet' in CSS &&
-    getMode(this.win_).runtime != 'inabox' &&
-    !isInFie(this.win_.document.documentElement);
+    return (
+      isExperimentOn(this.win_, 'chrome-animation-worklet') &&
+      'animationWorklet' in CSS &&
+      getMode(this.win_).runtime != 'inabox' &&
+      !isInFie(this.win_.document.documentElement)
+    );
   }
 }
 
-
 /**
  * The scanner that evaluates all expressions and builds the final
  * `AnimationRunner` instance for the target animation. It must be
  * executed in the "measure" vsync phase.
  */
 export class MeasureScanner extends Scanner {
-
   /**
    * @param {!Builder} builder
    * @param {!CssContextImpl} css
@@ -374,16 +383,21 @@ export class MeasureScanner extends Scanner {
 
   /** @override */
   onCompAnimation(spec) {
-    userAssert(this.path_.indexOf(spec.animation) == -1,
-        `Recursive animations are not allowed: "${spec.animation}"`);
+    userAssert(
+      this.path_.indexOf(spec.animation) == -1,
+      `Recursive animations are not allowed: "${spec.animation}"`
+    );
     const newPath = this.path_.concat(spec.animation);
     const animationElement = user().assertElement(
-        this.css_.getElementById(spec.animation),
-        `Animation not found: "${spec.animation}"`);
+      this.css_.getElementById(spec.animation),
+      `Animation not found: "${spec.animation}"`
+    );
     // Currently, only `<amp-animation>` supplies animations. In the future
     // this could become an interface.
-    userAssert(animationElement.tagName == 'AMP-ANIMATION',
-        `Element is not an animation: "${spec.animation}"`);
+    userAssert(
+      animationElement.tagName == 'AMP-ANIMATION',
+      `Element is not an animation: "${spec.animation}"`
+    );
     const otherSpecPromise = animationElement.getImpl().then(impl => {
       return impl.getAnimationSpec();
     });
@@ -394,15 +408,24 @@ export class MeasureScanner extends Scanner {
         vars_: vars,
         timing_: timing,
       } = this;
-      const promise = otherSpecPromise.then(otherSpec => {
-        if (!otherSpec) {
-          return;
-        }
-        return this.builder_.resolveRequests(
-            newPath, otherSpec, /* args */ null, target, index, vars, timing);
-      }).then(requests => {
-        requests.forEach(request => this.requests_.push(request));
-      });
+      const promise = otherSpecPromise
+        .then(otherSpec => {
+          if (!otherSpec) {
+            return;
+          }
+          return this.builder_.resolveRequests(
+            newPath,
+            otherSpec,
+            /* args */ null,
+            target,
+            index,
+            vars,
+            timing
+          );
+        })
+        .then(requests => {
+          requests.forEach(request => this.requests_.push(request));
+        });
       this.deps_.push(promise);
     });
   }
@@ -432,8 +455,10 @@ export class MeasureScanner extends Scanner {
     if (typeof specKeyframes == 'string') {
       // Keyframes name to be extracted from `<style>`.
       const keyframes = extractKeyframes(this.css_.rootNode_, specKeyframes);
-      userAssert(keyframes,
-          `Keyframes not found in stylesheet: "${specKeyframes}"`);
+      userAssert(
+        keyframes,
+        `Keyframes not found in stylesheet: "${specKeyframes}"`
+      );
       specKeyframes = keyframes;
     }
 
@@ -476,8 +501,9 @@ export class MeasureScanner extends Scanner {
       /** @type {!WebKeyframesDef} */
       const keyframes = [];
       const addStartFrame = array.length == 1 || array[0].offset > 0;
-      const startFrame = addStartFrame ? map() :
-        this.css_.resolveCssMap(array[0]);
+      const startFrame = addStartFrame
+        ? map()
+        : this.css_.resolveCssMap(array[0]);
       keyframes.push(startFrame);
       const start = addStartFrame ? 0 : 1;
       for (let i = start; i < array.length; i++) {
@@ -504,8 +530,10 @@ export class MeasureScanner extends Scanner {
 
   /** @override */
   onUnknownAnimation() {
-    throw user().createError('unknown animation type:' +
-        ' must have "animation", "animations" or "keyframes" field');
+    throw user().createError(
+      'unknown animation type:' +
+        ' must have "animation", "animations" or "keyframes" field'
+    );
   }
 
   /**
@@ -516,8 +544,11 @@ export class MeasureScanner extends Scanner {
     if (SERVICE_PROPS[prop]) {
       return;
     }
-    userAssert(isWhitelistedProp(prop),
-        'Property is not whitelisted for animation: %s', prop);
+    userAssert(
+      isWhitelistedProp(prop),
+      'Property is not whitelisted for animation: %s',
+      prop
+    );
   }
 
   /**
@@ -537,18 +568,15 @@ export class MeasureScanner extends Scanner {
 
     // Push new context and perform calculations.
     const targets =
-        (spec.target || spec.selector) ?
-          this.resolveTargets_(spec) :
-          [null];
+      spec.target || spec.selector ? this.resolveTargets_(spec) : [null];
     this.css_.setTargetLength(targets.length);
     targets.forEach((target, index) => {
       this.target_ = target || prevTarget;
       this.index_ = target ? index : prevIndex;
       this.css_.withTarget(this.target_, this.index_, () => {
-        const subtargetSpec =
-            this.target_ ?
-              this.matchSubtargets_(this.target_, this.index_ || 0, spec) :
-              spec;
+        const subtargetSpec = this.target_
+          ? this.matchSubtargets_(this.target_, this.index_ || 0, spec)
+          : spec;
         this.vars_ = this.mergeVars_(subtargetSpec, prevVars);
         this.css_.withVars(this.vars_, () => {
           this.timing_ = this.mergeTiming_(subtargetSpec, prevTiming);
@@ -572,8 +600,7 @@ export class MeasureScanner extends Scanner {
   resolveTargets_(spec) {
     let targets;
     if (spec.selector) {
-      userAssert(!spec.target,
-          'Both "selector" and "target" are not allowed');
+      userAssert(!spec.target, 'Both "selector" and "target" are not allowed');
       targets = this.css_.queryElements(spec.selector);
       if (targets.length == 0) {
         user().warn(TAG, `Target not found: "${spec.selector}"`);
@@ -584,10 +611,11 @@ export class MeasureScanner extends Scanner {
         user().error(TAG, 'string targets are deprecated');
       }
       const target = user().assertElement(
-          typeof spec.target == 'string' ?
-            this.css_.getElementById(spec.target) :
-            spec.target,
-          `Target not found: "${spec.target}"`);
+        typeof spec.target == 'string'
+          ? this.css_.getElementById(spec.target)
+          : spec.target,
+        `Target not found: "${spec.target}"`
+      );
       targets = [target];
     } else if (this.target_) {
       targets = [this.target_];
@@ -625,9 +653,10 @@ export class MeasureScanner extends Scanner {
       return spec.matcher;
     }
     userAssert(
-        (spec.index !== undefined || spec.selector !== undefined) &&
+      (spec.index !== undefined || spec.selector !== undefined) &&
         (spec.index === undefined || spec.selector === undefined),
-        'Only one "index" or "selector" must be specified');
+      'Only one "index" or "selector" must be specified'
+    );
 
     let matcher;
     if (spec.index !== undefined) {
@@ -642,11 +671,13 @@ export class MeasureScanner extends Scanner {
           return matches(target, specSelector);
         } catch (e) {
           throw user().createError(
-              `Bad subtarget selector: "${specSelector}"`, e);
+            `Bad subtarget selector: "${specSelector}"`,
+            e
+          );
         }
       };
     }
-    return spec.matcher = matcher;
+    return (spec.matcher = matcher);
   }
 
   /**
@@ -686,41 +717,60 @@ export class MeasureScanner extends Scanner {
   mergeTiming_(newTiming, prevTiming) {
     // CSS time values in milliseconds.
     const duration = this.css_.resolveMillis(
-        newTiming.duration, prevTiming.duration);
-    const delay = this.css_.resolveMillis(
-        newTiming.delay, prevTiming.delay);
+      newTiming.duration,
+      prevTiming.duration
+    );
+    const delay = this.css_.resolveMillis(newTiming.delay, prevTiming.delay);
     const endDelay = this.css_.resolveMillis(
-        newTiming.endDelay, prevTiming.endDelay);
+      newTiming.endDelay,
+      prevTiming.endDelay
+    );
 
     // Numeric.
     const iterations = this.css_.resolveNumber(
-        newTiming.iterations,
-        dev().assertNumber(prevTiming.iterations));
+      newTiming.iterations,
+      dev().assertNumber(prevTiming.iterations)
+    );
     const iterationStart = this.css_.resolveNumber(
-        newTiming.iterationStart, prevTiming.iterationStart);
+      newTiming.iterationStart,
+      prevTiming.iterationStart
+    );
 
     // Identifier CSS values.
-    const easing =
-        this.css_.resolveIdent(newTiming.easing, prevTiming.easing);
-    const direction = /** @type {!WebAnimationTimingDirection} */
-        (this.css_.resolveIdent(newTiming.direction, prevTiming.direction));
-    const fill = /** @type {!WebAnimationTimingFill} */
-        (this.css_.resolveIdent(newTiming.fill, prevTiming.fill));
-
+    const easing = this.css_.resolveIdent(newTiming.easing, prevTiming.easing);
+    const direction = /** @type {!WebAnimationTimingDirection} */ (this.css_.resolveIdent(
+      newTiming.direction,
+      prevTiming.direction
+    ));
+    const fill = /** @type {!WebAnimationTimingFill} */ (this.css_.resolveIdent(
+      newTiming.fill,
+      prevTiming.fill
+    ));
 
     // Validate.
     this.validateTime_(duration, newTiming.duration, 'duration');
     this.validateTime_(delay, newTiming.delay, 'delay', /* negative */ true);
     this.validateTime_(endDelay, newTiming.endDelay, 'endDelay');
-    userAssert(iterations != null && iterations >= 0,
-        '"iterations" is invalid: %s', newTiming.iterations);
-    userAssert(iterationStart != null &&
-        iterationStart >= 0 && isFinite(iterationStart),
-    '"iterationStart" is invalid: %s', newTiming.iterationStart);
-    user().assertEnumValue(WebAnimationTimingDirection,
-        /** @type {string} */ (direction), 'direction');
-    user().assertEnumValue(WebAnimationTimingFill,
-        /** @type {string} */ (fill), 'fill');
+    userAssert(
+      iterations != null && iterations >= 0,
+      '"iterations" is invalid: %s',
+      newTiming.iterations
+    );
+    userAssert(
+      iterationStart != null && iterationStart >= 0 && isFinite(iterationStart),
+      '"iterationStart" is invalid: %s',
+      newTiming.iterationStart
+    );
+    user().assertEnumValue(
+      WebAnimationTimingDirection,
+      /** @type {string} */ (direction),
+      'direction'
+    );
+    user().assertEnumValue(
+      WebAnimationTimingFill,
+      /** @type {string} */ (fill),
+      'fill'
+    );
     return {
       duration,
       delay,
@@ -743,19 +793,23 @@ export class MeasureScanner extends Scanner {
   validateTime_(value, newValue, field, opt_allowNegative) {
     // Ensure that positive or zero values are only allowed.
     userAssert(
-        value != null && (value >= 0 || (value < 0 && opt_allowNegative)),
-        '"%s" is invalid: %s', field, newValue);
+      value != null && (value >= 0 || (value < 0 && opt_allowNegative)),
+      '"%s" is invalid: %s',
+      field,
+      newValue
+    );
     // Make sure that the values are in milliseconds: show a warning if
     // time is fractional.
     if (newValue != null && Math.floor(value) != value && value < 1) {
-      user().warn(TAG,
-          `"${field}" is fractional.`
-          + ' Note that all times are in milliseconds.');
+      user().warn(
+        TAG,
+        `"${field}" is fractional.` +
+          ' Note that all times are in milliseconds.'
+      );
     }
   }
 }
 
-
 /**
  * @implements {./parsers/css-expr-ast.CssContext}
  */
@@ -836,7 +890,7 @@ class CssContextImpl {
    */
   queryElements(selector) {
     try {
-      return toArray(this.rootNode_./*OK*/querySelectorAll(selector));
+      return toArray(this.rootNode_./*OK*/ querySelectorAll(selector));
     } catch (e) {
       throw user().createError(`Bad query selector: "${selector}"`, e);
     }
@@ -859,14 +913,15 @@ class CssContextImpl {
     let styles = this.computedStyleCache_[targetId];
     if (!styles) {
       styles = computedStyle(this.win_, target);
-      this.computedStyleCache_[targetId] =
-        /** @type {!CSSStyleDeclaration} */ (styles);
+      this.computedStyleCache_[
+        targetId
+      ] = /** @type {!CSSStyleDeclaration} */ (styles);
     }
 
     // Resolve a var or a property.
-    return startsWith(prop, '--') ?
-      styles.getPropertyValue(prop) :
-      styles[getVendorJsPropertyName(styles, dashToCamelCase(prop))];
+    return startsWith(prop, '--')
+      ? styles.getPropertyValue(prop)
+      : styles[getVendorJsPropertyName(styles, dashToCamelCase(prop))];
   }
 
   /**
@@ -917,8 +972,9 @@ class CssContextImpl {
    */
   resolveCss(input) {
     // Will always return a valid string, since the default value is `''`.
-    return dev().assertString(this.resolveCss_(
-        input, /* def */ '', /* normalize */ true));
+    return dev().assertString(
+      this.resolveCss_(input, /* def */ '', /* normalize */ true)
+    );
   }
 
   /**
@@ -1038,21 +1094,25 @@ class CssContextImpl {
    * @private
    */
   requireTarget_() {
-    return user().assertElement(this.currentTarget_,
-        'Only allowed when target is specified');
+    return user().assertElement(
+      this.currentTarget_,
+      'Only allowed when target is specified'
+    );
   }
 
   /** @override */
   getVar(varName) {
     userAssert(
-        this.varPath_.indexOf(varName) == -1,
-        `Recursive variable: "${varName}"`);
+      this.varPath_.indexOf(varName) == -1,
+      `Recursive variable: "${varName}"`
+    );
     this.varPath_.push(varName);
-    const rawValue = (this.vars_ && this.vars_[varName] != undefined) ?
-      this.vars_[varName] :
-      this.currentTarget_ ?
-        this.measure(this.currentTarget_, varName) :
-        null;
+    const rawValue =
+      this.vars_ && this.vars_[varName] != undefined
+        ? this.vars_[varName]
+        : this.currentTarget_
+        ? this.measure(this.currentTarget_, varName)
+        : null;
     if (rawValue == null || rawValue === '') {
       user().warn(TAG, `Variable not found: "${varName}"`);
     }
@@ -1080,8 +1140,8 @@ class CssContextImpl {
   getViewportSize() {
     if (!this.viewportSize_) {
       this.viewportSize_ = {
-        width: this.win_./*OK*/innerWidth,
-        height: this.win_./*OK*/innerHeight,
+        width: this.win_./*OK*/ innerWidth,
+        height: this.win_./*OK*/ innerHeight,
       };
     }
     return this.viewportSize_;
@@ -1136,15 +1196,19 @@ class CssContextImpl {
    */
   getElement_(selector, selectionMethod) {
     devAssert(
-        selectionMethod == null || selectionMethod == 'closest',
-        'Unknown selection method: %s', selectionMethod);
+      selectionMethod == null || selectionMethod == 'closest',
+      'Unknown selection method: %s',
+      selectionMethod
+    );
     let element;
     try {
       if (selectionMethod == 'closest') {
-        element =
-          closestAncestorElementBySelector(this.requireTarget_(), selector);
+        element = closestAncestorElementBySelector(
+          this.requireTarget_(),
+          selector
+        );
       } else {
-        element = this.rootNode_./*OK*/querySelector(selector);
+        element = this.rootNode_./*OK*/ querySelector(selector);
       }
     } catch (e) {
       throw user().createError(`Bad query selector: "${selector}"`, e);
@@ -1158,7 +1222,7 @@ class CssContextImpl {
    * @private
    */
   getElementSize_(target) {
-    const b = target./*OK*/getBoundingClientRect();
+    const b = target./*OK*/ getBoundingClientRect();
     return {width: b.width, height: b.height};
   }
 
diff --git a/extensions/amp-apester-media/0.1/amp-apester-media.js b/extensions/amp-apester-media/0.1/amp-apester-media.js
index 9c1626437eed..39c6b0b056d9 100644
--- a/extensions/amp-apester-media/0.1/amp-apester-media.js
+++ b/extensions/amp-apester-media/0.1/amp-apester-media.js
@@ -15,9 +15,7 @@
  */
 import {CSS} from '../../../build/amp-apester-media-0.1.css';
 import {CustomEventReporterBuilder} from '../../../src/extension-analytics';
-import {
-  IntersectionObserverApi,
-} from '../../../src/intersection-observer-polyfill';
+import {IntersectionObserverApi} from '../../../src/intersection-observer-polyfill';
 import {Services} from '../../../src/services';
 import {addParamsToUrl} from '../../../src/url';
 import {dev, userAssert} from '../../../src/log';
@@ -140,11 +138,11 @@ class AmpApesterMedia extends AMP.BaseElement {
     this.height_ = getLengthNumeral(height);
     this.random_ = this.element.hasAttribute('data-apester-channel-token');
     this.mediaAttribute_ = userAssert(
-        this.element.getAttribute('data-apester-media-id') ||
+      this.element.getAttribute('data-apester-media-id') ||
         this.element.getAttribute('data-apester-channel-token'),
-        'Either the data-apester-media-id or the data-apester-channel-token ' +
+      'Either the data-apester-media-id or the data-apester-channel-token ' +
         'attributes must be specified for <amp-apester-media> %s',
-        this.element
+      this.element
     );
     this.embedOptions_ = {
       playlist: this.random_,
@@ -152,7 +150,7 @@ class AmpApesterMedia extends AMP.BaseElement {
       inative: this.element.getAttribute('data-apester-inative') === 'true',
       fallback: this.element.getAttribute('data-apester-fallback'),
       distributionChannelId: this.element.getAttribute(
-          'data-apester-channel-id'
+        'data-apester-channel-id'
       ),
       renderer: true,
       tags: extractTags(this.getAmpDoc().getRootNode(), this.element),
@@ -187,7 +185,7 @@ class AmpApesterMedia extends AMP.BaseElement {
       tags,
     } = this.embedOptions_;
     const encodedMediaAttribute = encodeURIComponent(
-        dev().assertString(this.mediaAttribute_)
+      dev().assertString(this.mediaAttribute_)
     );
     let suffix = '';
     const queryParams = dict();
@@ -217,15 +215,15 @@ class AmpApesterMedia extends AMP.BaseElement {
   queryMedia_() {
     const url = this.buildUrl_();
     return Services.xhrFor(this.win)
-        .fetchJson(url, {
-          requireAmpResponseSourceOrigin: false,
-        })
-        .then(res => {
-          if (res.status === 200) {
-            return res.json();
-          }
-          return res;
-        });
+      .fetchJson(url, {
+        requireAmpResponseSourceOrigin: false,
+      })
+      .then(res => {
+        if (res.status === 200) {
+          return res.json();
+        }
+        return res;
+      });
   }
 
   /** @param {string} id
@@ -240,14 +238,14 @@ class AmpApesterMedia extends AMP.BaseElement {
       : 'editorial';
     queryParams['platform'] = getPlatform();
     queryParams['cannonicalUrl'] = Services.documentInfoForDoc(
-        this.element
+      this.element
     ).canonicalUrl;
     queryParams['sdk'] = 'amp';
 
     return addParamsToUrl(
-        `${this.rendererBaseUrl_}/${usePlayer ? 'v2' : 'interaction'}/`
-         + `${encodeURIComponent(id)}`,
-        queryParams
+      `${this.rendererBaseUrl_}/${usePlayer ? 'v2' : 'interaction'}/` +
+        `${encodeURIComponent(id)}`,
+      queryParams
     );
   }
 
@@ -315,81 +313,80 @@ class AmpApesterMedia extends AMP.BaseElement {
     this.element.classList.add('amp-apester-container');
     const vsync = Services.vsyncFor(this.win);
     return this.queryMedia_().then(
-        response => {
-          if (!response || response['status'] === 204) {
-            dev().error(TAG, 'Display', 'No Content for provided tag');
-            return this.unlayoutCallback();
-          }
-          const payload = response['payload'];
-          // If it's a playlist we choose a media randomly.
-          // The response will be an array.
-          const media = /** @type {JsonObject} */ (this.embedOptions_.playlist
-            ? payload[Math.floor(Math.random() * payload.length)]
-            : payload);
+      response => {
+        if (!response || response['status'] === 204) {
+          dev().error(TAG, 'Display', 'No Content for provided tag');
+          return this.unlayoutCallback();
+        }
+        const payload = response['payload'];
+        // If it's a playlist we choose a media randomly.
+        // The response will be an array.
+        const media = /** @type {JsonObject} */ (this.embedOptions_.playlist
+          ? payload[Math.floor(Math.random() * payload.length)]
+          : payload);
 
-          const interactionId = media['interactionId'];
-          const usePlayer = media['usePlayer'];
+        const interactionId = media['interactionId'];
+        const usePlayer = media['usePlayer'];
 
-          const src = this.constructUrlFromMedia_(interactionId, usePlayer);
-          const iframe = this.constructIframe_(src);
-          this.intersectionObserverApi_ = new IntersectionObserverApi(
-              this,
-              iframe
-          );
+        const src = this.constructUrlFromMedia_(interactionId, usePlayer);
+        const iframe = this.constructIframe_(src);
+        this.intersectionObserverApi_ = new IntersectionObserverApi(
+          this,
+          iframe
+        );
 
-          this.mediaId_ = interactionId;
-          this.iframe_ = iframe;
-          this.registerToApesterEvents_();
+        this.mediaId_ = interactionId;
+        this.iframe_ = iframe;
+        this.registerToApesterEvents_();
 
-          return vsync
-              .mutatePromise(() => {
-                const overflow = this.constructOverflow_();
-                this.element.appendChild(overflow);
-                this.element.appendChild(iframe);
-              })
-              .then(() => {
-                return this.loadPromise(iframe).then(() => {
-                  return vsync.mutatePromise(() => {
-                    if (this.iframe_) {
-                      this.iframe_.classList
-                          .add('i-amphtml-apester-iframe-ready');
-                      if (media['campaignData']) {
-                        this.iframe_.contentWindow./*OK*/ postMessage(
-                            /** @type {JsonObject} */ ({
-                              type: 'campaigns',
-                              data: media['campaignData'],
-                            }),
-                            '*'
-                        );
-                      }
-                    }
-                    this.togglePlaceholder(false);
-                    this.report3rdPartyPixel_(media['publisher']);
-                    this.ready_ = true;
-                    let height = 0;
-                    if (media && media['data'] && media['data']['size']) {
-                      height = media['data']['size']['height'];
-                    }
-                    if (height != this.height_) {
-                      this.height_ = height;
-                      if (this.random_) {
-                        this./*OK*/ attemptChangeHeight(height);
-                      } else {
-                        this./*OK*/ changeHeight(height);
-                      }
-                    }
-                  });
-                });
-              })
-              .catch(error => {
-                dev().error(TAG, 'Display', error);
-                return undefined;
+        return vsync
+          .mutatePromise(() => {
+            const overflow = this.constructOverflow_();
+            this.element.appendChild(overflow);
+            this.element.appendChild(iframe);
+          })
+          .then(() => {
+            return this.loadPromise(iframe).then(() => {
+              return vsync.mutatePromise(() => {
+                if (this.iframe_) {
+                  this.iframe_.classList.add('i-amphtml-apester-iframe-ready');
+                  if (media['campaignData']) {
+                    this.iframe_.contentWindow./*OK*/ postMessage(
+                      /** @type {JsonObject} */ ({
+                        type: 'campaigns',
+                        data: media['campaignData'],
+                      }),
+                      '*'
+                    );
+                  }
+                }
+                this.togglePlaceholder(false);
+                this.report3rdPartyPixel_(media['publisher']);
+                this.ready_ = true;
+                let height = 0;
+                if (media && media['data'] && media['data']['size']) {
+                  height = media['data']['size']['height'];
+                }
+                if (height != this.height_) {
+                  this.height_ = height;
+                  if (this.random_) {
+                    this./*OK*/ attemptChangeHeight(height);
+                  } else {
+                    this./*OK*/ changeHeight(height);
+                  }
+                }
               });
-        },
-        error => {
-          dev().error(TAG, 'Display', error);
-          return undefined;
-        }
+            });
+          })
+          .catch(error => {
+            dev().error(TAG, 'Display', error);
+            return undefined;
+          });
+      },
+      error => {
+        dev().error(TAG, 'Display', error);
+        return undefined;
+      }
     );
   }
 
@@ -399,8 +396,8 @@ class AmpApesterMedia extends AMP.BaseElement {
     const image = this.constructLoaderImg_();
     if (this.element.hasAttribute('aria-label')) {
       placeholder.setAttribute(
-          'aria-label',
-          'Loading - ' + this.element.getAttribute('aria-label')
+        'aria-label',
+        'Loading - ' + this.element.getAttribute('aria-label')
       );
     } else {
       placeholder.setAttribute('aria-label', 'Loading Apester Media');
@@ -444,39 +441,39 @@ class AmpApesterMedia extends AMP.BaseElement {
    */
   registerToApesterEvents_() {
     registerEvent(
-        apesterEventNames.SET_FULL_SCREEN,
-        data => {
+      apesterEventNames.SET_FULL_SCREEN,
+      data => {
         // User clicked full screen button.
-          if (this.mediaId_ === data.id) {
-            setFullscreenOn(this.element);
-          }
-        },
-        this.win,
-        /** @type {!Element}*/ (this.iframe_),
-        this.unlisteners_
+        if (this.mediaId_ === data.id) {
+          setFullscreenOn(this.element);
+        }
+      },
+      this.win,
+      /** @type {!Element}*/ (this.iframe_),
+      this.unlisteners_
     );
     registerEvent(
-        apesterEventNames.REMOVE_FULL_SCREEN,
-        data => {
+      apesterEventNames.REMOVE_FULL_SCREEN,
+      data => {
         // User clicked close full screen button.
-          if (this.mediaId_ === data.id) {
-            setFullscreenOff(this.element);
-          }
-        },
-        this.win,
-        /** @type {!Element}*/ (this.iframe_),
-        this.unlisteners_
+        if (this.mediaId_ === data.id) {
+          setFullscreenOff(this.element);
+        }
+      },
+      this.win,
+      /** @type {!Element}*/ (this.iframe_),
+      this.unlisteners_
     );
     registerEvent(
-        apesterEventNames.RESIZE_UNIT,
-        data => {
-          if (this.mediaId_ === data.id && data.height) {
-            this.attemptChangeHeight(data.height);
-          }
-        },
-        this.win,
-        /** @type {!Element}*/ (this.iframe_),
-        this.unlisteners_
+      apesterEventNames.RESIZE_UNIT,
+      data => {
+        if (this.mediaId_ === data.id && data.height) {
+          this.attemptChangeHeight(data.height);
+        }
+      },
+      this.win,
+      /** @type {!Element}*/ (this.iframe_),
+      this.unlisteners_
     );
   }
 }
diff --git a/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js b/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
index 733fc90b345d..618ca6beba3a 100644
--- a/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
+++ b/extensions/amp-apester-media/0.1/test/test-amp-apester-media-utils.js
@@ -22,7 +22,6 @@ import {
 } from '../utils';
 
 describes.realWin('amp-apester-media-utils', {}, unused => {
-
   beforeEach(() => {
     document.body.textContent = '';
     document.head.textContent = '';
@@ -176,8 +175,8 @@ describes.realWin('amp-apester-media-utils', {}, unused => {
     const meta = document.createElement('meta');
     meta.setAttribute('name', 'keywords');
     meta.setAttribute(
-        'content',
-        'sport,Eddie Jones,England Rugby Union Team,' +
+      'content',
+      'sport,Eddie Jones,England Rugby Union Team,' +
         'Argentina Rugby Union Team,Rugby Union'
     );
     document.head.appendChild(meta);
diff --git a/extensions/amp-apester-media/0.1/test/test-amp-apester-media.js b/extensions/amp-apester-media/0.1/test/test-amp-apester-media.js
index 2986f6edc315..4e151ef7b5fd 100644
--- a/extensions/amp-apester-media/0.1/test/test-amp-apester-media.js
+++ b/extensions/amp-apester-media/0.1/test/test-amp-apester-media.js
@@ -17,35 +17,52 @@ import '../amp-apester-media';
 import {Services} from '../../../../src/services';
 
 describes.realWin(
-    'amp-apester-media',
-    {
-      amp: {
-        extensions: ['amp-apester-media'],
-      },
+  'amp-apester-media',
+  {
+    amp: {
+      extensions: ['amp-apester-media'],
     },
-    env => {
-      let win, doc;
-      let xhrMock;
-      let changeSizeSpy;
-      let attemptChangeSizeSpy;
+  },
+  env => {
+    let win, doc;
+    let xhrMock;
+    let changeSizeSpy;
+    let attemptChangeSizeSpy;
 
-      beforeEach(() => {
-        win = env.win;
-        doc = win.document;
-      });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-      afterEach(() => {
-        if (xhrMock) {
-          xhrMock.verify();
-        }
-      });
+    afterEach(() => {
+      if (xhrMock) {
+        xhrMock.verify();
+      }
+    });
 
-      function getApester(attributes, opt_responsive) {
-        const media = doc.createElement('amp-apester-media');
-        const regularResponse = {
-          status: 200,
-          message: 'ok',
-          payload: {
+    function getApester(attributes, opt_responsive) {
+      const media = doc.createElement('amp-apester-media');
+      const regularResponse = {
+        status: 200,
+        message: 'ok',
+        payload: {
+          interactionId: '5aaa70c79aaf0c5443078d31',
+          data: {
+            size: {width: '600', height: '404'},
+          },
+          layout: {
+            id: '557d52c059081084b94845c3',
+            name: 'multi poll two',
+            directive: 'multi-poll-two',
+          },
+          language: 'en',
+        },
+      };
+      const playlistResponse = {
+        status: 200,
+        message: 'ok',
+        payload: [
+          {
             interactionId: '5aaa70c79aaf0c5443078d31',
             data: {
               size: {width: '600', height: '404'},
@@ -57,156 +74,138 @@ describes.realWin(
             },
             language: 'en',
           },
-        };
-        const playlistResponse = {
-          status: 200,
-          message: 'ok',
-          payload: [
-            {
-              interactionId: '5aaa70c79aaf0c5443078d31',
-              data: {
-                size: {width: '600', height: '404'},
-              },
-              layout: {
-                id: '557d52c059081084b94845c3',
-                name: 'multi poll two',
-                directive: 'multi-poll-two',
-              },
-              language: 'en',
-            },
-          ],
-        };
-        const currentResopnse =
+        ],
+      };
+      const currentResopnse =
         attributes && attributes['data-apester-channel-token']
           ? playlistResponse
           : regularResponse;
 
-        changeSizeSpy = sandbox.spy(media.implementation_, 'changeHeight');
-        attemptChangeSizeSpy = sandbox.spy(
-            media.implementation_,
-            'attemptChangeHeight'
+      changeSizeSpy = sandbox.spy(media.implementation_, 'changeHeight');
+      attemptChangeSizeSpy = sandbox.spy(
+        media.implementation_,
+        'attemptChangeHeight'
+      );
+      xhrMock = sandbox.mock(Services.xhrFor(win));
+      if (attributes) {
+        xhrMock.expects('fetchJson').returns(
+          Promise.resolve({
+            status: 200,
+            json() {
+              return Promise.resolve(currentResopnse);
+            },
+          })
         );
-        xhrMock = sandbox.mock(Services.xhrFor(win));
-        if (attributes) {
-          xhrMock.expects('fetchJson').returns(
-              Promise.resolve({
-                status: 200,
-                json() {
-                  return Promise.resolve(currentResopnse);
-                },
-              })
-          );
-        } else {
-          xhrMock.expects('fetchJson').never();
-        }
-        for (const key in attributes) {
-          media.setAttribute(key, attributes[key]);
-        }
-        media.setAttribute('width', '600');
-        media.setAttribute('height', '390');
-        //todo test width?
-        if (opt_responsive) {
-          media.setAttribute('layout', 'responsive');
-        }
-        doc.body.appendChild(media);
-        return media
-            .build()
-            .then(() => {
-              return media.layoutCallback();
-            })
-            .then(() => media);
+      } else {
+        xhrMock.expects('fetchJson').never();
+      }
+      for (const key in attributes) {
+        media.setAttribute(key, attributes[key]);
       }
+      media.setAttribute('width', '600');
+      media.setAttribute('height', '390');
+      //todo test width?
+      if (opt_responsive) {
+        media.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(media);
+      return media
+        .build()
+        .then(() => {
+          return media.layoutCallback();
+        })
+        .then(() => media);
+    }
 
-      it('renders', () => {
-        return getApester({
-          'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
-        }).then(ape => {
-          const iframe = ape.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.src).not.to.be.null;
-          const placeholder = ape.querySelector('div[placeholder]');
-          expect(placeholder).to.not.be.null;
-          expect(placeholder.getAttribute('aria-label'))
-              .to.equal('Loading Apester Media');
-          const url = new URL(iframe.src);
-          const qs = new URLSearchParams(url.searchParams);
-          expect(url.hostname).to.equal('renderer.apester.com');
-          expect(url.pathname)
-              .to.equal('/interaction/5aaa70c79aaf0c5443078d31');
-          expect(qs.get('sdk')).to.equal('amp');
-          expect(qs.get('type')).to.equal('editorial');
-          expect(changeSizeSpy).to.be.calledOnce;
-          expect(changeSizeSpy.args[0][0]).to.equal('404');
-        });
+    it('renders', () => {
+      return getApester({
+        'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
+      }).then(ape => {
+        const iframe = ape.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).not.to.be.null;
+        const placeholder = ape.querySelector('div[placeholder]');
+        expect(placeholder).to.not.be.null;
+        expect(placeholder.getAttribute('aria-label')).to.equal(
+          'Loading Apester Media'
+        );
+        const url = new URL(iframe.src);
+        const qs = new URLSearchParams(url.searchParams);
+        expect(url.hostname).to.equal('renderer.apester.com');
+        expect(url.pathname).to.equal('/interaction/5aaa70c79aaf0c5443078d31');
+        expect(qs.get('sdk')).to.equal('amp');
+        expect(qs.get('type')).to.equal('editorial');
+        expect(changeSizeSpy).to.be.calledOnce;
+        expect(changeSizeSpy.args[0][0]).to.equal('404');
       });
-      it('propagates aria label to placeholder image', () => {
-        return getApester({
-          'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
-          'aria-label': 'scintilating video',
-        }).then(ape => {
-          const placeholder = ape.querySelector('div[placeholder]');
-          expect(placeholder).to.not.be.null;
-          expect(placeholder.getAttribute('aria-label'))
-              .to.equal('Loading - scintilating video');
-        });
+    });
+    it('propagates aria label to placeholder image', () => {
+      return getApester({
+        'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
+        'aria-label': 'scintilating video',
+      }).then(ape => {
+        const placeholder = ape.querySelector('div[placeholder]');
+        expect(placeholder).to.not.be.null;
+        expect(placeholder.getAttribute('aria-label')).to.equal(
+          'Loading - scintilating video'
+        );
       });
-      it('render playlist', () => {
-        return getApester({
-          'data-apester-channel-token': '57a36e1e96cd505a7f01ed12',
-        }).then(ape => {
-          const iframe = ape.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.src).not.to.be.null;
-          const url = new URL(iframe.src);
-          const qs = new URLSearchParams(url.searchParams);
-          expect(url.hostname).to.equal('renderer.apester.com');
-          expect(url.pathname)
-              .to.equal('/interaction/5aaa70c79aaf0c5443078d31');
-          expect(qs.get('sdk')).to.equal('amp');
-          expect(qs.get('type')).to.equal('playlist');
-          expect(attemptChangeSizeSpy).to.be.calledOnce;
-          expect(attemptChangeSizeSpy.args[0][0]).to.equal('404');
-
-        });
+    });
+    it('render playlist', () => {
+      return getApester({
+        'data-apester-channel-token': '57a36e1e96cd505a7f01ed12',
+      }).then(ape => {
+        const iframe = ape.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).not.to.be.null;
+        const url = new URL(iframe.src);
+        const qs = new URLSearchParams(url.searchParams);
+        expect(url.hostname).to.equal('renderer.apester.com');
+        expect(url.pathname).to.equal('/interaction/5aaa70c79aaf0c5443078d31');
+        expect(qs.get('sdk')).to.equal('amp');
+        expect(qs.get('type')).to.equal('playlist');
+        expect(attemptChangeSizeSpy).to.be.calledOnce;
+        expect(attemptChangeSizeSpy.args[0][0]).to.equal('404');
       });
+    });
 
-      //todo responsive layout isn't fully supported yet, just a stub
-      it('renders responsively', () => {
-        return getApester(
-            {
-              'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
-              width: '500',
-            },
-            true
-        ).then(ape => {
-          const iframe = ape.querySelector('iframe');
-          expect(iframe.className).to.match(/i-amphtml-fill-content/);
-        });
+    //todo responsive layout isn't fully supported yet, just a stub
+    it('renders responsively', () => {
+      return getApester(
+        {
+          'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
+          width: '500',
+        },
+        true
+      ).then(ape => {
+        const iframe = ape.querySelector('iframe');
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
       });
+    });
 
-      it('removes iframe after unlayoutCallback', () => {
-        return getApester({
-          'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
-        }).then(ape => {
-          const iframe = ape.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.src).not.to.be.null;
-          const url = new URL(iframe.src);
-          expect(url.hostname).to.equal('renderer.apester.com');
-          expect(url.pathname)
-              .to.equal('/interaction/5aaa70c79aaf0c5443078d31');
-          const tag = ape.implementation_;
-          tag.unlayoutCallback();
-          expect(ape.querySelector('iframe')).to.be.null;
-          expect(tag.iframe_).to.be.null;
-        });
+    it('removes iframe after unlayoutCallback', () => {
+      return getApester({
+        'data-apester-media-id': '5aaa70c79aaf0c5443078d31',
+      }).then(ape => {
+        const iframe = ape.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).not.to.be.null;
+        const url = new URL(iframe.src);
+        expect(url.hostname).to.equal('renderer.apester.com');
+        expect(url.pathname).to.equal('/interaction/5aaa70c79aaf0c5443078d31');
+        const tag = ape.implementation_;
+        tag.unlayoutCallback();
+        expect(ape.querySelector('iframe')).to.be.null;
+        expect(tag.iframe_).to.be.null;
       });
+    });
 
-      it('requires media-id or channel-token', () => {
-        allowConsoleError(() => {
-          expect(getApester()).to.be.rejectedWith(
-              /The media-id attribute is required for/);
-        });
+    it('requires media-id or channel-token', () => {
+      allowConsoleError(() => {
+        expect(getApester()).to.be.rejectedWith(
+          /The media-id attribute is required for/
+        );
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-apester-media/0.1/utils.js b/extensions/amp-apester-media/0.1/utils.js
index e550e8e3b3d7..b6eead2df941 100644
--- a/extensions/amp-apester-media/0.1/utils.js
+++ b/extensions/amp-apester-media/0.1/utils.js
@@ -55,10 +55,10 @@ function isMobileDevice() {
   const userAgent = navigator.userAgent || navigator.vendor || window.opera;
   return (
     /(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(
-        userAgent
+      userAgent
     ) ||
     /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
-        userAgent.substr(0, 4)
+      userAgent.substr(0, 4)
     )
   );
 }
@@ -91,26 +91,28 @@ export function extractElementTags(element) {
  * @return {!Array<string>}
  */
 export function extratctTitle(root) {
-  const scriptTags = toArray(root.querySelectorAll(
-      'script[type="application/ld+json"]')
+  const scriptTags = toArray(
+    root.querySelectorAll('script[type="application/ld+json"]')
   );
-  return scriptTags.map(scriptTag => {
-    if (!scriptTag || !isJsonLdScriptTag(scriptTag)) {
-      return {};
-    }
-    return tryParseJson(scriptTag.textContent) || {};
-  }).map(jsonLd => jsonLd && jsonLd['headline'])
-      .filter(e => typeof e === 'string')
-      .map(title =>
-        title
-            .trim()
-            .split(' ')
-            .filter(w => w.length > 2)
-      )
-      .reduce((result, headline) => {
-        return result.concat(headline);
-      }, [])
-      .slice(0, 5);
+  return scriptTags
+    .map(scriptTag => {
+      if (!scriptTag || !isJsonLdScriptTag(scriptTag)) {
+        return {};
+      }
+      return tryParseJson(scriptTag.textContent) || {};
+    })
+    .map(jsonLd => jsonLd && jsonLd['headline'])
+    .filter(e => typeof e === 'string')
+    .map(title =>
+      title
+        .trim()
+        .split(' ')
+        .filter(w => w.length > 2)
+    )
+    .reduce((result, headline) => {
+      return result.concat(headline);
+    }, [])
+    .slice(0, 5);
 }
 /**
  * Extracts article meta keywords
@@ -121,10 +123,10 @@ export function extractArticleTags(root) {
     content: '',
   };
   return metaKeywords.content
-      .trim()
-      .split(',')
-      .filter(e => e)
-      .map(e => e.trim());
+    .trim()
+    .split(',')
+    .filter(e => e)
+    .map(e => e.trim());
 }
 
 /**
@@ -137,11 +139,11 @@ export function extractTags(root, element) {
   const extractedTags = extractElementTags(element) || [];
   const articleMetaTags = extractArticleTags(root);
   const concatedTags = extractedTags.concat(
-      articleMetaTags.length ? articleMetaTags : extratctTitle(root) || []
+    articleMetaTags.length ? articleMetaTags : extratctTitle(root) || []
   );
   const loweredCase = concatedTags.map(tag => tag.toLowerCase().trim());
   const noDuplication = loweredCase.filter(
-      (item, pos, self) => self.indexOf(item) === pos
+    (item, pos, self) => self.indexOf(item) === pos
   );
   return noDuplication;
 }
@@ -195,8 +197,8 @@ export function generatePixelURL(publisherId, affiliateId) {
   };
 
   const qs = Object.keys(qsObj)
-      .map(key => `${key}=${qsObj[key]}`)
-      .join('&');
+    .map(key => `${key}=${qsObj[key]}`)
+    .join('&');
 
   return `${ampPixelURL}?${qs}`;
 }
diff --git a/extensions/amp-app-banner/0.1/amp-app-banner.js b/extensions/amp-app-banner/0.1/amp-app-banner.js
index fd50ae964683..f4fc71169b5d 100644
--- a/extensions/amp-app-banner/0.1/amp-app-banner.js
+++ b/extensions/amp-app-banner/0.1/amp-app-banner.js
@@ -28,7 +28,6 @@ const OPEN_LINK_TIMEOUT = 1500;
  * @abstract
  */
 export class AbstractAppBanner extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -69,13 +68,15 @@ export class AbstractAppBanner extends AMP.BaseElement {
    */
   addDismissButton_() {
     const paddingBar = this.win.document.createElement(
-        'i-amphtml-app-banner-top-padding');
+      'i-amphtml-app-banner-top-padding'
+    );
     this.element.appendChild(paddingBar);
     const dismissButton = this.win.document.createElement('button');
     dismissButton.classList.add('amp-app-banner-dismiss-button');
-    dismissButton.setAttribute('aria-label',
-        this.element.getAttribute('data-dismiss-button-aria-label') ||
-        'Dismiss');
+    dismissButton.setAttribute(
+      'aria-label',
+      this.element.getAttribute('data-dismiss-button-aria-label') || 'Dismiss'
+    );
     const boundOnDismissButtonClick = this.onDismissButtonClick_.bind(this);
     dismissButton.addEventListener('click', boundOnDismissButtonClick);
     this.element.appendChild(dismissButton);
@@ -86,32 +87,40 @@ export class AbstractAppBanner extends AMP.BaseElement {
    * @protected
    */
   onDismissButtonClick_() {
-    this.getVsync().run({
-      measure: undefined,
-      mutate: handleDismiss,
-    }, {
-      element: this.element,
-      viewport: this.getViewport(),
-      storagePromise: Services.storageForDoc(this.getAmpDoc()),
-      storageKey: this.getStorageKey_(),
-    });
+    this.getVsync().run(
+      {
+        measure: undefined,
+        mutate: handleDismiss,
+      },
+      {
+        element: this.element,
+        viewport: this.getViewport(),
+        storagePromise: Services.storageForDoc(this.getAmpDoc()),
+        storageKey: this.getStorageKey_(),
+      }
+    );
   }
 
   /** @private */
   getStorageKey_() {
-    const elementId = userAssert(this.element.id,
-        'amp-app-banner should have an id.');
+    const elementId = userAssert(
+      this.element.id,
+      'amp-app-banner should have an id.'
+    );
     return 'amp-app-banner:' + elementId;
   }
 
   /** @protected */
   isDismissed() {
     return Services.storageForDoc(this.getAmpDoc())
-        .then(storage => storage.get(this.getStorageKey_()))
-        .then(persistedValue => !!persistedValue, reason => {
+      .then(storage => storage.get(this.getStorageKey_()))
+      .then(
+        persistedValue => !!persistedValue,
+        reason => {
           dev().error(TAG, 'Failed to read storage', reason);
           return false;
-        });
+        }
+      );
   }
 
   /** @protected */
@@ -122,31 +131,37 @@ export class AbstractAppBanner extends AMP.BaseElement {
       } else {
         this.addDismissButton_();
         this.updateViewportPadding_();
-        this./*OK*/expand();
+        this./*OK*/ expand();
       }
     });
   }
 
   /** @protected */
   hide_() {
-    return this.getVsync().runPromise({
-      measure: undefined,
-      mutate: hideBanner,
-    }, {
-      element: this.element,
-      viewport: this.getViewport(),
-    });
+    return this.getVsync().runPromise(
+      {
+        measure: undefined,
+        mutate: hideBanner,
+      },
+      {
+        element: this.element,
+        viewport: this.getViewport(),
+      }
+    );
   }
 
   /** @protected */
   updateViewportPadding_() {
-    this.getVsync().run({
-      measure: measureBanner,
-      mutate: updateViewportPadding,
-    }, {
-      element: this.element,
-      viewport: this.getViewport(),
-    });
+    this.getVsync().run(
+      {
+        measure: measureBanner,
+        mutate: updateViewportPadding,
+      },
+      {
+        element: this.element,
+        viewport: this.getViewport(),
+      }
+    );
   }
 }
 
@@ -154,7 +169,6 @@ export class AbstractAppBanner extends AMP.BaseElement {
  * @private visible for testing.
  */
 export class AmpAppBanner extends AbstractAppBanner {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -182,7 +196,6 @@ export class AmpAppBanner extends AbstractAppBanner {
  * @private visible for testing.
  */
 export class AmpIosAppBanner extends AbstractAppBanner {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -212,31 +225,39 @@ export class AmpIosAppBanner extends AbstractAppBanner {
 
     // We want to fallback to browser builtin mechanism when possible.
     const platform = Services.platformFor(this.win);
-    this.canShowBuiltinBanner_ = !this.viewer_.isEmbedded()
-        && platform.isSafari();
+    this.canShowBuiltinBanner_ =
+      !this.viewer_.isEmbedded() && platform.isSafari();
     if (this.canShowBuiltinBanner_) {
-      user().info(TAG,
-          'Browser supports builtin banners. Not rendering amp-app-banner.');
+      user().info(
+        TAG,
+        'Browser supports builtin banners. Not rendering amp-app-banner.'
+      );
       this.hide_();
       return;
     }
 
-    if (this.viewer_.isEmbedded() &&
-        !this.viewer_.hasCapability('navigateTo')) {
+    if (
+      this.viewer_.isEmbedded() &&
+      !this.viewer_.hasCapability('navigateTo')
+    ) {
       this.hide_();
       return;
     }
 
     this.metaTag_ = this.win.document.head.querySelector(
-        'meta[name=apple-itunes-app]');
+      'meta[name=apple-itunes-app]'
+    );
     if (!this.metaTag_) {
       this.hide_();
       return;
     }
 
     this.openButton_ = userAssert(
-        this.element.querySelector('button[open-button]'),
-        '<button open-button> is required inside %s: %s', TAG, this.element);
+      this.element.querySelector('button[open-button]'),
+      '<button open-button> is required inside %s: %s',
+      TAG,
+      this.element
+    );
 
     this.parseIosMetaContent_(this.metaTag_.getAttribute('content'));
     this.checkIfDismissed_();
@@ -275,7 +296,7 @@ export class AmpIosAppBanner extends AbstractAppBanner {
    * @private
    */
   parseIosMetaContent_(metaContent) {
-    const parts = metaContent.replace(/\s/,'').split(',');
+    const parts = metaContent.replace(/\s/, '').split(',');
     const config = {};
     parts.forEach(part => {
       const keyValuePair = part.split('=');
@@ -286,28 +307,34 @@ export class AmpIosAppBanner extends AbstractAppBanner {
     const openUrl = config['app-argument'];
 
     if (openUrl) {
-      userAssert(Services.urlForDoc(this.element).isProtocolValid(openUrl),
-          'The url in app-argument has invalid protocol: %s', openUrl);
+      userAssert(
+        Services.urlForDoc(this.element).isProtocolValid(openUrl),
+        'The url in app-argument has invalid protocol: %s',
+        openUrl
+      );
     } else {
-      user().error(TAG,
-          '<meta name="apple-itunes-app">\'s content should contain ' +
+      user().error(
+        TAG,
+        '<meta name="apple-itunes-app">\'s content should contain ' +
           'app-argument to allow opening an already installed application ' +
-          'on iOS.');
+          'on iOS.'
+      );
     }
 
     const installAppUrl = `https://itunes.apple.com/us/app/id${appId}`;
     const openInAppUrl = openUrl || installAppUrl;
     this.setupOpenButton_(
-        dev().assertElement(this.openButton_), openInAppUrl, installAppUrl);
+      dev().assertElement(this.openButton_),
+      openInAppUrl,
+      installAppUrl
+    );
   }
 }
 
-
 /**
  * @private visible for testing.
  */
 export class AmpAndroidAppBanner extends AbstractAppBanner {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -341,9 +368,9 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
   buildCallback() {
     const {win, element} = this;
     const viewer = Services.viewerForDoc(this.getAmpDoc());
-    this.manifestLink_ = /** @type {?HTMLLinkElement} */ (
-      win.document.head.querySelector(
-          'link[rel=manifest],link[rel=origin-manifest]'));
+    this.manifestLink_ = /** @type {?HTMLLinkElement} */ (win.document.head.querySelector(
+      'link[rel=manifest],link[rel=origin-manifest]'
+    ));
 
     const platform = Services.platformFor(win);
     const url = Services.urlForDoc(element);
@@ -353,13 +380,13 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
     const isProxyOrigin = url.isProxyOrigin(win.location);
 
     this.canShowBuiltinBanner_ =
-        !isProxyOrigin &&
-          !viewer.isEmbedded() &&
-          isChromeAndroid;
+      !isProxyOrigin && !viewer.isEmbedded() && isChromeAndroid;
 
     if (this.canShowBuiltinBanner_) {
-      user().info(TAG,
-          'Browser supports builtin banners. Not rendering amp-app-banner.');
+      user().info(
+        TAG,
+        'Browser supports builtin banners. Not rendering amp-app-banner.'
+      );
       this.hide_();
       return;
     }
@@ -376,8 +403,11 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
     url.assertHttpsUrl(this.manifestHref_, element, 'manifest href');
 
     this.openButton_ = userAssert(
-        element.querySelector('button[open-button]'),
-        '<button open-button> is required inside %s: %s', TAG, element);
+      element.querySelector('button[open-button]'),
+      '<button open-button> is required inside %s: %s',
+      TAG,
+      element
+    );
 
     this.checkIfDismissed_();
   }
@@ -392,14 +422,16 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
       return Promise.resolve();
     }
 
-    return Services.xhrFor(this.win).fetchJson(this.manifestHref_, {
-      requireAmpResponseSourceOrigin: false,
-    }).then(res => res.json())
-        .then(json => this.parseManifest_(json))
-        .catch(error => {
-          this.hide_();
-          rethrowAsync(error);
-        });
+    return Services.xhrFor(this.win)
+      .fetchJson(this.manifestHref_, {
+        requireAmpResponseSourceOrigin: false,
+      })
+      .then(res => res.json())
+      .then(json => this.parseManifest_(json))
+      .catch(error => {
+        this.hide_();
+        rethrowAsync(error);
+      });
   }
 
   /** @override */
@@ -425,26 +457,35 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
   parseManifest_(manifestJson) {
     const apps = manifestJson['related_applications'];
     if (!apps) {
-      user().warn(TAG,
-          'related_applications is missing from manifest.json file: %s',
-          this.element);
+      user().warn(
+        TAG,
+        'related_applications is missing from manifest.json file: %s',
+        this.element
+      );
       return;
     }
 
     for (let i = 0; i < apps.length; i++) {
       const app = apps[i];
       if (app['platform'] == 'play') {
-        const installAppUrl = 'https://play.google.com/store/apps/details' +
-            `?id=${app['id']}`;
+        const installAppUrl = `https://play.google.com/store/apps/details?id=${
+          app['id']
+        }`;
         const openInAppUrl = this.getAndroidIntentForUrl_(app['id']);
         this.setupOpenButton_(
-            dev().assertElement(this.openButton_), openInAppUrl, installAppUrl);
+          dev().assertElement(this.openButton_),
+          openInAppUrl,
+          installAppUrl
+        );
         return;
       }
     }
 
-    user().warn(TAG, 'Could not find a platform=play app in manifest: %s',
-        this.element);
+    user().warn(
+      TAG,
+      'Could not find a platform=play app in manifest: %s',
+      this.element
+    );
   }
 
   /**
@@ -462,7 +503,6 @@ export class AmpAndroidAppBanner extends AbstractAppBanner {
   }
 }
 
-
 /**
  * Dismisses the app banner and persist dismissal.
  * @param {!Object} state
@@ -474,7 +514,6 @@ function handleDismiss(state) {
   });
 }
 
-
 /**
  * Hides the app banner.
  * @param {!Object} state
@@ -485,7 +524,6 @@ function hideBanner(state) {
   state.viewport.updatePaddingBottom(0);
 }
 
-
 /**
  * Measures banner layout rectangle and sets it on the state.
  * @param {!Object} state
@@ -494,7 +532,6 @@ function measureBanner(state) {
   state.bannerHeight = state.viewport.getLayoutRect(state.element).height;
 }
 
-
 /**
  * Updates viewport padding to add padding on the bottom.
  * @param {!Object} state
@@ -504,7 +541,6 @@ function updateViewportPadding(state) {
   state.viewport.addToFixedLayer(state.element);
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpAppBanner, CSS);
 });
diff --git a/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js b/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
index b929e5d252ad..87f4c9d527b2 100644
--- a/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
+++ b/extensions/amp-app-banner/0.1/test/test-amp-app-banner.js
@@ -22,528 +22,582 @@ import {
 } from '../amp-app-banner';
 import {Services} from '../../../../src/services';
 
-
-describes.realWin('amp-app-banner', {
-  amp: {
-    extensions: ['amp-app-banner'],
-    canonicalUrl: 'https://example.com/amps.html',
-  },
-}, env => {
-  let win, doc, ampdoc;
-  let vsync;
-  let platform;
-  let isAndroid = false;
-  let isIos = false;
-  let isChrome = false;
-  let isSafari = false;
-  let isFirefox = false;
-  let isEdge = false;
-  let isEmbedded = false;
-  let hasNavigateToCapability = true;
-
-  const iosMeta = {
-    content: 'app-id=828256236, app-argument=medium://p/cb7f223fad86',
-  };
-  const androidManifest = {
-    href: 'https://example.com/manifest.json',
-    content: {
-      'prefer_related_applications': true,
-      'related_applications': [
-        {
-          'platform': 'play',
-          'id': 'com.medium.reader',
-          'url': 'https://play.google.com/com.medium.reader',
-        },
-      ],
+describes.realWin(
+  'amp-app-banner',
+  {
+    amp: {
+      extensions: ['amp-app-banner'],
+      canonicalUrl: 'https://example.com/amps.html',
     },
-  };
-
-  function runTask(task, state) {
-    if (task.measure) {
-      task.measure(state);
-    }
-    if (task.mutate) {
-      task.mutate(state);
+  },
+  env => {
+    let win, doc, ampdoc;
+    let vsync;
+    let platform;
+    let isAndroid = false;
+    let isIos = false;
+    let isChrome = false;
+    let isSafari = false;
+    let isFirefox = false;
+    let isEdge = false;
+    let isEmbedded = false;
+    let hasNavigateToCapability = true;
+
+    const iosMeta = {
+      content: 'app-id=828256236, app-argument=medium://p/cb7f223fad86',
+    };
+    const androidManifest = {
+      href: 'https://example.com/manifest.json',
+      content: {
+        'prefer_related_applications': true,
+        'related_applications': [
+          {
+            'platform': 'play',
+            'id': 'com.medium.reader',
+            'url': 'https://play.google.com/com.medium.reader',
+          },
+        ],
+      },
+    };
+
+    function runTask(task, state) {
+      if (task.measure) {
+        task.measure(state);
+      }
+      if (task.mutate) {
+        task.mutate(state);
+      }
     }
-  }
 
-  function getAppBanner(config = {}) {
-    if (config.iosMeta) {
-      const meta = doc.createElement('meta');
-      meta.setAttribute('name', 'apple-itunes-app');
-      meta.setAttribute('content', config.iosMeta.content);
-      doc.head.appendChild(meta);
+    function getAppBanner(config = {}) {
+      if (config.iosMeta) {
+        const meta = doc.createElement('meta');
+        meta.setAttribute('name', 'apple-itunes-app');
+        meta.setAttribute('content', config.iosMeta.content);
+        doc.head.appendChild(meta);
+      }
+
+      const manifestObj = config.originManifest || config.androidManifest;
+      if (manifestObj) {
+        const rel = config.originManifest ? 'origin-manifest' : 'manifest';
+        const manifest = doc.createElement('link');
+        manifest.setAttribute('rel', rel);
+        manifest.setAttribute('href', manifestObj.href);
+        doc.head.appendChild(manifest);
+        sandbox
+          .mock(Services.xhrFor(win))
+          .expects('fetchJson')
+          .returns(
+            Promise.resolve({
+              json() {
+                return Promise.resolve(manifestObj.content);
+              },
+            })
+          );
+      }
+
+      const banner = doc.createElement('amp-app-banner');
+      banner.setAttribute('layout', 'nodisplay');
+      if (!config.noOpenButton) {
+        const openButton = doc.createElement('button');
+        openButton.setAttribute('open-button', '');
+        banner.appendChild(openButton);
+      }
+
+      banner.id = 'banner0';
+      doc.body.appendChild(banner);
+      return banner
+        .build()
+        .then(() => banner.layoutCallback())
+        .then(() => banner);
     }
 
-    const manifestObj = config.originManifest || config.androidManifest;
-    if (manifestObj) {
-      const rel = config.originManifest ? 'origin-manifest' : 'manifest';
-      const manifest = doc.createElement('link');
-      manifest.setAttribute('rel', rel);
-      manifest.setAttribute('href', manifestObj.href);
-      doc.head.appendChild(manifest);
-      sandbox.mock(Services.xhrFor(win)).expects('fetchJson')
-          .returns(Promise.resolve({
-            json() {
-              return Promise.resolve(manifestObj.content);
-            },
-          }));
+    function testSetupAndShowBanner() {
+      return getAppBanner({iosMeta, androidManifest}).then(banner => {
+        return banner.implementation_.isDismissed().then(() => {
+          expect(banner.parentElement).to.not.be.null;
+          expect(banner).to.not.have.display('none');
+          const bannerTop = banner.querySelector(
+            'i-amphtml-app-banner-top-padding'
+          );
+          expect(bannerTop).to.exist;
+          const dismissBtn = banner.querySelector(
+            '.amp-app-banner-dismiss-button'
+          );
+          expect(dismissBtn).to.exist;
+        });
+      });
     }
 
-    const banner = doc.createElement('amp-app-banner');
-    banner.setAttribute('layout', 'nodisplay');
-    if (!config.noOpenButton) {
-      const openButton = doc.createElement('button');
-      openButton.setAttribute('open-button', '');
-      banner.appendChild(openButton);
+    function testRemoveBanner(config = {iosMeta, androidManifest}) {
+      return getAppBanner(config).then(banner => {
+        expect(banner.parentElement).to.be.null;
+      });
     }
 
-    banner.id = 'banner0';
-    doc.body.appendChild(banner);
-    return banner.build()
-        .then(() => banner.layoutCallback())
-        .then(() => banner);
-  }
-
-  function testSetupAndShowBanner() {
-    return getAppBanner({iosMeta, androidManifest}).then(banner => {
-      return banner.implementation_.isDismissed().then(() => {
-        expect(banner.parentElement).to.not.be.null;
-        expect(banner).to.not.have.display('none');
-        const bannerTop = banner.querySelector(
-            'i-amphtml-app-banner-top-padding');
-        expect(bannerTop).to.exist;
-        const dismissBtn = banner.querySelector(
-            '.amp-app-banner-dismiss-button');
-        expect(dismissBtn).to.exist;
+    function testButtonMissing() {
+      return allowConsoleError(() => {
+        return getAppBanner({
+          iosMeta,
+          androidManifest,
+          noOpenButton: true,
+        }).should.eventually.be.rejectedWith(
+          /<button open-button> is required/
+        );
       });
-    });
-  }
-
-  function testRemoveBanner(config = {iosMeta, androidManifest}) {
-    return getAppBanner(config).then(banner => {
-      expect(banner.parentElement).to.be.null;
-    });
-  }
-
-  function testButtonMissing() {
-    return allowConsoleError(() => { return getAppBanner({
-      iosMeta,
-      androidManifest,
-      noOpenButton: true,
-    }).should.eventually.be.rejectedWith(
-        /<button open-button> is required/);
-    });
-  }
-
-  function testRemoveBannerIfDismissed() {
-    sandbox.stub(AbstractAppBanner.prototype, 'isDismissed').callsFake(() => {
-      return Promise.resolve(true);
-    });
-    return testRemoveBanner();
-  }
+    }
 
-  function testSuiteIos() {
-    it('should preconnect to app store', () => {
-      return getAppBanner({iosMeta}).then(banner => {
-        const impl = banner.implementation_;
-        sandbox.stub(impl.preconnect, 'url');
-        impl.preconnectCallback(true);
-        expect(impl.preconnect.url.called).to.be.true;
-        expect(impl.preconnect.url).to.be.calledOnce;
-        expect(impl.preconnect.url)
-            .to.have.been.calledWith('https://itunes.apple.com');
+    function testRemoveBannerIfDismissed() {
+      sandbox.stub(AbstractAppBanner.prototype, 'isDismissed').callsFake(() => {
+        return Promise.resolve(true);
       });
-    });
+      return testRemoveBanner();
+    }
 
-    // TODO(alanorozco, #15844): Unskip.
-    it.skip('should show banner and set up correctly', testSetupAndShowBanner);
+    function testSuiteIos() {
+      it('should preconnect to app store', () => {
+        return getAppBanner({iosMeta}).then(banner => {
+          const impl = banner.implementation_;
+          sandbox.stub(impl.preconnect, 'url');
+          impl.preconnectCallback(true);
+          expect(impl.preconnect.url.called).to.be.true;
+          expect(impl.preconnect.url).to.be.calledOnce;
+          expect(impl.preconnect.url).to.have.been.calledWith(
+            'https://itunes.apple.com'
+          );
+        });
+      });
 
-    it('should throw if open button is missing', testButtonMissing);
+      // TODO(alanorozco, #15844): Unskip.
+      it.skip(
+        'should show banner and set up correctly',
+        testSetupAndShowBanner
+      );
 
-    // TODO(#16916): Make this test work with synchronous throws.
-    it.skip('should remove banner if already dismissed',
-        testRemoveBannerIfDismissed);
+      it('should throw if open button is missing', testButtonMissing);
 
-    it('should remove banner if meta is not provided', () => {
-      testRemoveBanner({iosMeta: null});
-    });
+      // TODO(#16916): Make this test work with synchronous throws.
+      it.skip(
+        'should remove banner if already dismissed',
+        testRemoveBannerIfDismissed
+      );
 
-    it('should parse meta content and setup hrefs', () => {
-      sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
-      return getAppBanner({iosMeta}).then(el => {
-        expect(AbstractAppBanner.prototype.setupOpenButton_)
-            .to.have.been.calledWith(
-                el.querySelector('button[open-button]'),
-                'medium://p/cb7f223fad86',
-                'https://itunes.apple.com/us/app/id828256236');
+      it('should remove banner if meta is not provided', () => {
+        testRemoveBanner({iosMeta: null});
       });
-    });
 
-    it('should parse meta content and setup hrefs if app-argument is ' +
-        'not provided', () => {
-      expectAsyncConsoleError(
-          '[amp-app-banner] <meta name="apple-itunes-app">\'s content ' +
-          'should contain app-argument to allow opening an already ' +
-          'installed application on iOS.');
-      sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
-      return getAppBanner({
-        iosMeta: {content: 'app-id=828256236'},
-      }).then(el => {
-        expect(AbstractAppBanner.prototype.setupOpenButton_)
-            .to.have.been.calledWith(
-                el.querySelector('button[open-button]'),
-                'https://itunes.apple.com/us/app/id828256236',
-                'https://itunes.apple.com/us/app/id828256236');
+      it('should parse meta content and setup hrefs', () => {
+        sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
+        return getAppBanner({iosMeta}).then(el => {
+          expect(
+            AbstractAppBanner.prototype.setupOpenButton_
+          ).to.have.been.calledWith(
+            el.querySelector('button[open-button]'),
+            'medium://p/cb7f223fad86',
+            'https://itunes.apple.com/us/app/id828256236'
+          );
+        });
       });
-    });
 
-    it('should parse meta content and validate app-argument url', () => {
-      return allowConsoleError(() => { return getAppBanner({
-        iosMeta: {content:
-            'app-id=828256236, app-argument=javascript:alert("foo");'},
-      }).should.eventually.be.rejectedWith(
-          /The url in app-argument has invalid protocol/);
+      it(
+        'should parse meta content and setup hrefs if app-argument is ' +
+          'not provided',
+        () => {
+          expectAsyncConsoleError(
+            '[amp-app-banner] <meta name="apple-itunes-app">\'s content ' +
+              'should contain app-argument to allow opening an already ' +
+              'installed application on iOS.'
+          );
+          sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
+          return getAppBanner({
+            iosMeta: {content: 'app-id=828256236'},
+          }).then(el => {
+            expect(
+              AbstractAppBanner.prototype.setupOpenButton_
+            ).to.have.been.calledWith(
+              el.querySelector('button[open-button]'),
+              'https://itunes.apple.com/us/app/id828256236',
+              'https://itunes.apple.com/us/app/id828256236'
+            );
+          });
+        }
+      );
+
+      it('should parse meta content and validate app-argument url', () => {
+        return allowConsoleError(() => {
+          return getAppBanner({
+            iosMeta: {
+              content:
+                'app-id=828256236, app-argument=javascript:alert("foo");',
+            },
+          }).should.eventually.be.rejectedWith(
+            /The url in app-argument has invalid protocol/
+          );
+        });
       });
-    });
-  }
+    }
 
-  function testSuiteAndroid() {
-    it('should preconnect to play store and preload manifest', () => {
-      return getAppBanner({androidManifest}).then(banner => {
-        const impl = banner.implementation_;
-        sandbox.stub(impl.preconnect, 'url');
-        sandbox.stub(impl.preconnect, 'preload');
-        impl.preconnectCallback(true);
-        expect(impl.preconnect.url.called).to.be.true;
-        expect(impl.preconnect.url).to.have.been.calledOnce;
-        expect(impl.preconnect.url)
-            .to.have.been.calledWith('https://play.google.com');
-        expect(impl.preconnect.preload.called).to.be.true;
-        expect(impl.preconnect.preload).to.be.calledOnce;
-        expect(impl.preconnect.preload).to.have.been.calledWith(
-            'https://example.com/manifest.json');
+    function testSuiteAndroid() {
+      it('should preconnect to play store and preload manifest', () => {
+        return getAppBanner({androidManifest}).then(banner => {
+          const impl = banner.implementation_;
+          sandbox.stub(impl.preconnect, 'url');
+          sandbox.stub(impl.preconnect, 'preload');
+          impl.preconnectCallback(true);
+          expect(impl.preconnect.url.called).to.be.true;
+          expect(impl.preconnect.url).to.have.been.calledOnce;
+          expect(impl.preconnect.url).to.have.been.calledWith(
+            'https://play.google.com'
+          );
+          expect(impl.preconnect.preload.called).to.be.true;
+          expect(impl.preconnect.preload).to.be.calledOnce;
+          expect(impl.preconnect.preload).to.have.been.calledWith(
+            'https://example.com/manifest.json'
+          );
+        });
       });
-    });
 
-    it('should preconnect to play store and preload origin-manifest', () => {
-      return getAppBanner({originManifest: androidManifest}).then(banner => {
-        const impl = banner.implementation_;
-        sandbox.stub(impl.preconnect, 'url');
-        sandbox.stub(impl.preconnect, 'preload');
-        impl.preconnectCallback(true);
-        expect(impl.preconnect.url.called).to.be.true;
-        expect(impl.preconnect.url).to.have.been.calledOnce;
-        expect(impl.preconnect.url)
-            .to.have.been.calledWith('https://play.google.com');
-        expect(impl.preconnect.preload.called).to.be.true;
-        expect(impl.preconnect.preload).to.be.calledOnce;
-        expect(impl.preconnect.preload).to.have.been.calledWith(
-            'https://example.com/manifest.json');
+      it('should preconnect to play store and preload origin-manifest', () => {
+        return getAppBanner({originManifest: androidManifest}).then(banner => {
+          const impl = banner.implementation_;
+          sandbox.stub(impl.preconnect, 'url');
+          sandbox.stub(impl.preconnect, 'preload');
+          impl.preconnectCallback(true);
+          expect(impl.preconnect.url.called).to.be.true;
+          expect(impl.preconnect.url).to.have.been.calledOnce;
+          expect(impl.preconnect.url).to.have.been.calledWith(
+            'https://play.google.com'
+          );
+          expect(impl.preconnect.preload.called).to.be.true;
+          expect(impl.preconnect.preload).to.be.calledOnce;
+          expect(impl.preconnect.preload).to.have.been.calledWith(
+            'https://example.com/manifest.json'
+          );
+        });
       });
-    });
-
-    it('should show banner and set up correctly', testSetupAndShowBanner);
 
-    it('should throw if open button is missing', testButtonMissing);
+      it('should show banner and set up correctly', testSetupAndShowBanner);
 
-    // TODO(#16916): Make this test work with synchronous throws.
-    it.skip('should remove banner if already dismissed',
-        testRemoveBannerIfDismissed);
+      it('should throw if open button is missing', testButtonMissing);
 
-    it('should remove banner if manifest is not provided', () => {
-      testRemoveBanner({androidManifest: null, originManifest: null});
-    });
+      // TODO(#16916): Make this test work with synchronous throws.
+      it.skip(
+        'should remove banner if already dismissed',
+        testRemoveBannerIfDismissed
+      );
 
-    it('should parse manifest and set hrefs', () => {
-      sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
-      return getAppBanner({androidManifest}).then(el => {
-        expect(AbstractAppBanner.prototype.setupOpenButton_)
-            .to.have.been.calledWith(
-                el.querySelector('button[open-button]'),
-                'android-app://com.medium.reader/https/example.com/amps.html',
-                'https://play.google.com/store/apps/details?id=com.medium.reader'
-            );
+      it('should remove banner if manifest is not provided', () => {
+        testRemoveBanner({androidManifest: null, originManifest: null});
       });
-    });
 
-    it('should parse origin manifest and set hrefs', () => {
-      sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
-      return getAppBanner({originManifest: androidManifest}).then(el => {
-        expect(AbstractAppBanner.prototype.setupOpenButton_)
-            .to.have.been.calledWith(
-                el.querySelector('button[open-button]'),
-                'android-app://com.medium.reader/https/example.com/amps.html',
-                'https://play.google.com/store/apps/details?id=com.medium.reader'
-            );
+      it('should parse manifest and set hrefs', () => {
+        sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
+        return getAppBanner({androidManifest}).then(el => {
+          expect(
+            AbstractAppBanner.prototype.setupOpenButton_
+          ).to.have.been.calledWith(
+            el.querySelector('button[open-button]'),
+            'android-app://com.medium.reader/https/example.com/amps.html',
+            'https://play.google.com/store/apps/details?id=com.medium.reader'
+          );
+        });
       });
-    });
-  }
 
-  beforeEach(() => {
-    isAndroid = false;
-    isIos = false;
-    isChrome = false;
-    isSafari = false;
-    isFirefox = false;
-    isEdge = false;
-    isEmbedded = false;
-    hasNavigateToCapability = true;
-
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    const viewer = Services.viewerForDoc(ampdoc);
-    sandbox.stub(viewer, 'isEmbedded').callsFake(() => isEmbedded);
-    sandbox.stub(viewer, 'hasCapability').callsFake(
-        () => hasNavigateToCapability);
-    platform = Services.platformFor(win);
-    sandbox.stub(platform, 'isIos').callsFake(() => isIos);
-    sandbox.stub(platform, 'isAndroid').callsFake(() => isAndroid);
-    sandbox.stub(platform, 'isChrome').callsFake(() => isChrome);
-    sandbox.stub(platform, 'isSafari').callsFake(() => isSafari);
-    sandbox.stub(platform, 'isFirefox').callsFake(() => isFirefox);
-    sandbox.stub(platform, 'isEdge').callsFake(() => isEdge);
-
-    vsync = Services.vsyncFor(win);
-    sandbox.stub(vsync, 'runPromise').callsFake((task, state) => {
-      runTask(task, state);
-      return Promise.resolve();
-    });
-    sandbox.stub(vsync, 'run').callsFake(runTask);
-  });
+      it('should parse origin manifest and set hrefs', () => {
+        sandbox.spy(AbstractAppBanner.prototype, 'setupOpenButton_');
+        return getAppBanner({originManifest: androidManifest}).then(el => {
+          expect(
+            AbstractAppBanner.prototype.setupOpenButton_
+          ).to.have.been.calledWith(
+            el.querySelector('button[open-button]'),
+            'android-app://com.medium.reader/https/example.com/amps.html',
+            'https://play.google.com/store/apps/details?id=com.medium.reader'
+          );
+        });
+      });
+    }
 
-  describe('Choosing platform', () => {
-    it('should upgrade to AmpIosAppBanner on iOS', () => {
-      isIos = true;
-      return getAppBanner({iosMeta, androidManifest}).then(banner => {
-        expect(banner.implementation_).to.be.instanceof(AmpIosAppBanner);
+    beforeEach(() => {
+      isAndroid = false;
+      isIos = false;
+      isChrome = false;
+      isSafari = false;
+      isFirefox = false;
+      isEdge = false;
+      isEmbedded = false;
+      hasNavigateToCapability = true;
+
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      const viewer = Services.viewerForDoc(ampdoc);
+      sandbox.stub(viewer, 'isEmbedded').callsFake(() => isEmbedded);
+      sandbox
+        .stub(viewer, 'hasCapability')
+        .callsFake(() => hasNavigateToCapability);
+      platform = Services.platformFor(win);
+      sandbox.stub(platform, 'isIos').callsFake(() => isIos);
+      sandbox.stub(platform, 'isAndroid').callsFake(() => isAndroid);
+      sandbox.stub(platform, 'isChrome').callsFake(() => isChrome);
+      sandbox.stub(platform, 'isSafari').callsFake(() => isSafari);
+      sandbox.stub(platform, 'isFirefox').callsFake(() => isFirefox);
+      sandbox.stub(platform, 'isEdge').callsFake(() => isEdge);
+
+      vsync = Services.vsyncFor(win);
+      sandbox.stub(vsync, 'runPromise').callsFake((task, state) => {
+        runTask(task, state);
+        return Promise.resolve();
       });
+      sandbox.stub(vsync, 'run').callsFake(runTask);
     });
 
-    it('should upgrade to AmpAndroidAppBanner on Android', () => {
-      isAndroid = true;
-      return getAppBanner({iosMeta, androidManifest}).then(banner => {
-        expect(banner.implementation_).to.be.instanceof(AmpAndroidAppBanner);
+    describe('Choosing platform', () => {
+      it('should upgrade to AmpIosAppBanner on iOS', () => {
+        isIos = true;
+        return getAppBanner({iosMeta, androidManifest}).then(banner => {
+          expect(banner.implementation_).to.be.instanceof(AmpIosAppBanner);
+        });
       });
-    });
 
-    it('should not upgrade if platform not supported', () => {
-      isEdge = true;
-      return getAppBanner({iosMeta, androidManifest}).then(banner => {
-        expect(banner.implementation_).to.be.instanceof(AmpAppBanner);
-        expect(banner.implementation_.upgradeCallback()).to.be.null;
+      it('should upgrade to AmpAndroidAppBanner on Android', () => {
+        isAndroid = true;
+        return getAppBanner({iosMeta, androidManifest}).then(banner => {
+          expect(banner.implementation_).to.be.instanceof(AmpAndroidAppBanner);
+        });
       });
-    });
-  });
 
-  describe('non-supported platform', () => {
-    it('should remove the banner', () => {
-      return getAppBanner().then(banner => {
-        expect(banner.parentElement).to.be.null;
+      it('should not upgrade if platform not supported', () => {
+        isEdge = true;
+        return getAppBanner({iosMeta, androidManifest}).then(banner => {
+          expect(banner.implementation_).to.be.instanceof(AmpAppBanner);
+          expect(banner.implementation_.upgradeCallback()).to.be.null;
+        });
       });
     });
-  });
 
-  describe('iOS', () => {
-    beforeEach(() => {
-      isIos = true;
+    describe('non-supported platform', () => {
+      it('should remove the banner', () => {
+        return getAppBanner().then(banner => {
+          expect(banner.parentElement).to.be.null;
+        });
+      });
     });
 
-    describe('Embedded', () => {
+    describe('iOS', () => {
       beforeEach(() => {
-        isEmbedded = true;
+        isIos = true;
       });
 
-      describe('Safari', () => {
+      describe('Embedded', () => {
         beforeEach(() => {
-          isSafari = true;
+          isEmbedded = true;
         });
 
-        testSuiteIos();
-
-        it('should hide banner if embedded but viewer does not support ' +
-            'navigateTo', () => {
-          hasNavigateToCapability = false;
-          testRemoveBanner();
+        describe('Safari', () => {
+          beforeEach(() => {
+            isSafari = true;
+          });
+
+          testSuiteIos();
+
+          it(
+            'should hide banner if embedded but viewer does not support ' +
+              'navigateTo',
+            () => {
+              hasNavigateToCapability = false;
+              testRemoveBanner();
+            }
+          );
         });
-      });
 
-      describe('Chrome', () => {
-        beforeEach(() => {
-          isChrome = true;
+        describe('Chrome', () => {
+          beforeEach(() => {
+            isChrome = true;
+          });
+
+          testSuiteIos();
+
+          it(
+            'should hide banner if embedded but viewer does not support ' +
+              'navigateTo',
+            () => {
+              hasNavigateToCapability = false;
+              testRemoveBanner();
+            }
+          );
         });
 
-        testSuiteIos();
-
-        it('should hide banner if embedded but viewer does not support ' +
-            'navigateTo', () => {
-          hasNavigateToCapability = false;
-          testRemoveBanner();
+        describe('Firefox', () => {
+          beforeEach(() => {
+            isFirefox = true;
+          });
+
+          testSuiteIos();
+
+          it(
+            'should hide banner if embedded but viewer does not support ' +
+              'navigateTo',
+            () => {
+              hasNavigateToCapability = false;
+              testRemoveBanner();
+            }
+          );
         });
       });
 
-      describe('Firefox', () => {
+      describe('Non-embedded', () => {
         beforeEach(() => {
-          isFirefox = true;
+          isEmbedded = false;
         });
 
-        testSuiteIos();
+        describe('Safari', () => {
+          beforeEach(() => {
+            isSafari = true;
+          });
 
-        it('should hide banner if embedded but viewer does not support ' +
-            'navigateTo', () => {
-          hasNavigateToCapability = false;
-          testRemoveBanner();
+          // TODO(#18655): Fails with "Cannot read property 'getItem' of null'"
+          it.skip('should NOT show banner', testRemoveBanner);
         });
-      });
-
-    });
 
-    describe('Non-embedded', () => {
-      beforeEach(() => {
-        isEmbedded = false;
-      });
+        describe('Chrome', () => {
+          beforeEach(() => {
+            isChrome = true;
+          });
 
-      describe('Safari', () => {
-        beforeEach(() => {
-          isSafari = true;
+          testSuiteIos();
         });
 
-        // TODO(#18655): Fails with "Cannot read property 'getItem' of null'"
-        it.skip('should NOT show banner', testRemoveBanner);
-      });
-
-      describe('Chrome', () => {
-        beforeEach(() => {
-          isChrome = true;
-        });
+        describe('Firefox', () => {
+          beforeEach(() => {
+            isFirefox = true;
+          });
 
-        testSuiteIos();
-      });
-
-      describe('Firefox', () => {
-        beforeEach(() => {
-          isFirefox = true;
+          testSuiteIos();
         });
-
-        testSuiteIos();
       });
     });
-  });
-
-  describe('Android', () => {
-    beforeEach(() => {
-      isAndroid = true;
-    });
 
-    describe('Embedded', () => {
+    describe('Android', () => {
       beforeEach(() => {
-        isEmbedded = true;
+        isAndroid = true;
       });
 
-      describe('Chrome', () => {
+      describe('Embedded', () => {
         beforeEach(() => {
-          isChrome = true;
+          isEmbedded = true;
         });
 
-        testSuiteAndroid();
+        describe('Chrome', () => {
+          beforeEach(() => {
+            isChrome = true;
+          });
+
+          testSuiteAndroid();
+
+          it(
+            'should hide banner if embedded but viewer does not support ' +
+              'navigateTo',
+            () => {
+              hasNavigateToCapability = false;
+              testRemoveBanner();
+            }
+          );
+        });
 
-        it('should hide banner if embedded but viewer does not support ' +
-            'navigateTo', () => {
-          hasNavigateToCapability = false;
-          testRemoveBanner();
+        describe('Firefox', () => {
+          beforeEach(() => {
+            isFirefox = true;
+          });
+
+          testSuiteAndroid();
+
+          it(
+            'should hide banner if embedded but viewer does not support ' +
+              'navigateTo',
+            () => {
+              hasNavigateToCapability = false;
+              testRemoveBanner();
+            }
+          );
         });
       });
 
-      describe('Firefox', () => {
+      describe('Non-embedded', () => {
         beforeEach(() => {
-          isFirefox = true;
+          isEmbedded = false;
         });
 
-        testSuiteAndroid();
+        describe('Chrome', () => {
+          beforeEach(() => {
+            isChrome = true;
+          });
 
-        it('should hide banner if embedded but viewer does not support ' +
-            'navigateTo', () => {
-          hasNavigateToCapability = false;
-          testRemoveBanner();
+          // TODO(#18655): Fails with "Cannot read property 'getItem' of null'"
+          it.skip('should NOT show banner', testRemoveBanner);
         });
-      });
 
+        describe('Firefox', () => {
+          beforeEach(() => {
+            isFirefox = true;
+          });
+
+          testSuiteAndroid();
+        });
+      });
     });
 
-    describe('Non-embedded', () => {
+    describe('Windows Edge', () => {
       beforeEach(() => {
-        isEmbedded = false;
+        isEdge = true;
       });
 
-      describe('Chrome', () => {
-        beforeEach(() => {
-          isChrome = true;
-        });
-
-        // TODO(#18655): Fails with "Cannot read property 'getItem' of null'"
-        it.skip('should NOT show banner', testRemoveBanner);
+      it('Embedded should NOT show banner', () => {
+        isEmbedded = true;
+        testRemoveBanner();
       });
 
-      describe('Firefox', () => {
-        beforeEach(() => {
-          isFirefox = true;
-        });
-
-        testSuiteAndroid();
+      it('Non-embedded should NOT show banner', () => {
+        isEmbedded = false;
+        testRemoveBanner();
       });
     });
-  });
-
-  describe('Windows Edge', () => {
-    beforeEach(() => {
-      isEdge = true;
-    });
-
-    it('Embedded should NOT show banner', () => {
-      isEmbedded = true;
-      testRemoveBanner();
-    });
 
-    it('Non-embedded should NOT show banner', () => {
-      isEmbedded = false;
-      testRemoveBanner();
-    });
-  });
-
-  describe('Abstract App Banner', () => {
-    it('should setup click listener', () => {
-      const element = doc.createElement('div');
-      doc.body.appendChild(element);
-      const openButton = doc.createElement('button');
-      element.appendChild(openButton);
-      openButton.setAttribute('open-button', '');
-      openButton.addEventListener = sandbox.spy();
-      const banner = new AbstractAppBanner(element);
-      banner.setupOpenButton_(openButton, 'open-button', 'install-link');
-      expect(openButton.addEventListener).to.have.been.calledWith('click');
-    });
+    describe('Abstract App Banner', () => {
+      it('should setup click listener', () => {
+        const element = doc.createElement('div');
+        doc.body.appendChild(element);
+        const openButton = doc.createElement('button');
+        element.appendChild(openButton);
+        openButton.setAttribute('open-button', '');
+        openButton.addEventListener = sandbox.spy();
+        const banner = new AbstractAppBanner(element);
+        banner.setupOpenButton_(openButton, 'open-button', 'install-link');
+        expect(openButton.addEventListener).to.have.been.calledWith('click');
+      });
 
-    it('should create dismiss button and setup click listener', () => {
-      const element = doc.createElement('div');
-      element.id = 'banner1';
-      element.getAmpDoc = () => ampdoc;
-      doc.body.appendChild(element);
-      const banner = new AbstractAppBanner(element);
-      banner.addDismissButton_();
-
-      const bannerTop = element.querySelector(
-          'i-amphtml-app-banner-top-padding');
-      expect(bannerTop).to.exist;
-      const dismissBtn = element.querySelector(
-          '.amp-app-banner-dismiss-button');
-      expect(dismissBtn).to.not.be.null;
-      expect(dismissBtn.parentElement).to.be.equal(element);
-      dismissBtn.dispatchEvent(new Event('click'));
-      return banner.isDismissed().then(value => {
-        expect(element.parentElement).to.be.null;
-        expect(value).to.be.true;
+      it('should create dismiss button and setup click listener', () => {
+        const element = doc.createElement('div');
+        element.id = 'banner1';
+        element.getAmpDoc = () => ampdoc;
+        doc.body.appendChild(element);
+        const banner = new AbstractAppBanner(element);
+        banner.addDismissButton_();
+
+        const bannerTop = element.querySelector(
+          'i-amphtml-app-banner-top-padding'
+        );
+        expect(bannerTop).to.exist;
+        const dismissBtn = element.querySelector(
+          '.amp-app-banner-dismiss-button'
+        );
+        expect(dismissBtn).to.not.be.null;
+        expect(dismissBtn.parentElement).to.be.equal(element);
+        dismissBtn.dispatchEvent(new Event('click'));
+        return banner.isDismissed().then(value => {
+          expect(element.parentElement).to.be.null;
+          expect(value).to.be.true;
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-audio/0.1/amp-audio.js b/extensions/amp-audio/0.1/amp-audio.js
index 044694d167cb..3ed148e486d9 100644
--- a/extensions/amp-audio/0.1/amp-audio.js
+++ b/extensions/amp-audio/0.1/amp-audio.js
@@ -30,12 +30,10 @@ import {listen} from '../../../src/event-helper';
 
 const TAG = 'amp-audio';
 
-
 /**
  * Visible for testing only.
  */
 export class AmpAudio extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -48,7 +46,6 @@ export class AmpAudio extends AMP.BaseElement {
 
     /** @public {boolean} */
     this.isPlaying = false;
-
   }
 
   /** @override */
@@ -86,15 +83,24 @@ export class AmpAudio extends AMP.BaseElement {
       assertHttpsUrl(src, this.element);
     }
     this.propagateAttributes(
-        ['src', 'preload', 'autoplay', 'muted', 'loop', 'aria-label',
-          'aria-describedby', 'aria-labelledby', 'controlsList'],
-        audio);
+      [
+        'src',
+        'preload',
+        'autoplay',
+        'muted',
+        'loop',
+        'aria-label',
+        'aria-describedby',
+        'aria-labelledby',
+        'controlsList',
+      ],
+      audio
+    );
 
     this.applyFillContent(audio);
     this.getRealChildNodes().forEach(child => {
       if (child.getAttribute && child.getAttribute('src')) {
-        assertHttpsUrl(child.getAttribute('src'),
-            dev().assertElement(child));
+        assertHttpsUrl(child.getAttribute('src'), dev().assertElement(child));
       }
       audio.appendChild(child);
     });
@@ -114,14 +120,18 @@ export class AmpAudio extends AMP.BaseElement {
     // Gather metadata
     const {document} = this.getAmpDoc().win;
     const artist = this.getElementAttribute_('artist') || '';
-    const title = this.getElementAttribute_('title')
-                  || this.getElementAttribute_('aria-label')
-                  || document.title || '';
+    const title =
+      this.getElementAttribute_('title') ||
+      this.getElementAttribute_('aria-label') ||
+      document.title ||
+      '';
     const album = this.getElementAttribute_('album') || '';
-    const artwork = this.getElementAttribute_('artwork')
-                   || parseSchemaImage(document)
-                   || parseOgImage(document)
-                   || parseFavicon(document) || '';
+    const artwork =
+      this.getElementAttribute_('artwork') ||
+      parseSchemaImage(document) ||
+      parseOgImage(document) ||
+      parseFavicon(document) ||
+      '';
     this.metadata_ = {
       title,
       artist,
@@ -168,8 +178,11 @@ export class AmpAudio extends AMP.BaseElement {
       return false;
     }
     if (this.isStoryDescendant_()) {
-      user().warn(TAG, '<amp-story> elements do not support actions on ' +
-        '<amp-audio> elements');
+      user().warn(
+        TAG,
+        '<amp-story> elements do not support actions on ' +
+          '<amp-audio> elements'
+      );
       return false;
     }
     return true;
@@ -229,12 +242,16 @@ export class AmpAudio extends AMP.BaseElement {
     };
 
     // Update the media session
-    setMediaSession(this.element, this.win, this.metadata_,
-        playHandler, pauseHandler);
+    setMediaSession(
+      this.element,
+      this.win,
+      this.metadata_,
+      playHandler,
+      pauseHandler
+    );
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpAudio);
 });
diff --git a/extensions/amp-audio/0.1/test/test-amp-audio.js b/extensions/amp-audio/0.1/test/test-amp-audio.js
index a0f8403f2375..c06c5beefe1f 100644
--- a/extensions/amp-audio/0.1/test/test-amp-audio.js
+++ b/extensions/amp-audio/0.1/test/test-amp-audio.js
@@ -17,49 +17,52 @@
 import {AmpAudio} from '../amp-audio';
 import {naturalDimensions_} from '../../../../src/layout';
 
-
-describes.realWin('amp-audio', {
-  amp: {
-    extensions: ['amp-audio'],
+describes.realWin(
+  'amp-audio',
+  {
+    amp: {
+      extensions: ['amp-audio'],
+    },
   },
-}, env => {
-  let win, doc;
-  let ampAudio;
+  env => {
+    let win, doc;
+    let ampAudio;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getAmpAudio(attributes, opt_childNodesAttrs) {
-    ampAudio = doc.createElement('amp-audio');
-    for (const key in attributes) {
-      ampAudio.setAttribute(key, attributes[key]);
-    }
-    if (opt_childNodesAttrs) {
-      opt_childNodesAttrs.forEach(childNodeAttrs => {
-        let child;
-        if (childNodeAttrs.tag === 'text') {
-          child = doc.createTextNode(childNodeAttrs.text);
-        } else {
-          child = doc.createElement(childNodeAttrs.tag);
-          for (const key in childNodeAttrs) {
-            if (key !== 'tag') {
-              child.setAttribute(key, childNodeAttrs[key]);
+    function getAmpAudio(attributes, opt_childNodesAttrs) {
+      ampAudio = doc.createElement('amp-audio');
+      for (const key in attributes) {
+        ampAudio.setAttribute(key, attributes[key]);
+      }
+      if (opt_childNodesAttrs) {
+        opt_childNodesAttrs.forEach(childNodeAttrs => {
+          let child;
+          if (childNodeAttrs.tag === 'text') {
+            child = doc.createTextNode(childNodeAttrs.text);
+          } else {
+            child = doc.createElement(childNodeAttrs.tag);
+            for (const key in childNodeAttrs) {
+              if (key !== 'tag') {
+                child.setAttribute(key, childNodeAttrs[key]);
+              }
             }
           }
-        }
-        ampAudio.appendChild(child);
-      });
+          ampAudio.appendChild(child);
+        });
+      }
+      doc.body.appendChild(ampAudio);
+      return ampAudio;
     }
-    doc.body.appendChild(ampAudio);
-    return ampAudio;
-  }
 
-  function attachAndRun(attributes, opt_childNodesAttrs) {
-    naturalDimensions_['AMP-AUDIO'] = {width: '300px', height: '30px'};
-    const ampAudio = getAmpAudio(attributes, opt_childNodesAttrs);
-    return ampAudio.build()
+    function attachAndRun(attributes, opt_childNodesAttrs) {
+      naturalDimensions_['AMP-AUDIO'] = {width: '300px', height: '30px'};
+      const ampAudio = getAmpAudio(attributes, opt_childNodesAttrs);
+      return ampAudio
+        .build()
         .then(() => ampAudio.layoutCallback())
         .then(() => ampAudio)
         .catch(error => {
@@ -70,19 +73,20 @@ describes.realWin('amp-audio', {
             throw error;
           }
         });
-  }
-
-  function attachToAmpStoryAndRun(attributes) {
-    naturalDimensions_['AMP-AUDIO'] = {width: '300px', height: '30px'};
-    const ampAudio = doc.createElement('amp-audio');
-    const ampStory = doc.createElement('amp-story');
-    for (const key in attributes) {
-      ampAudio.setAttribute(key, attributes[key]);
     }
-    ampStory.appendChild(ampAudio);
-    doc.body.appendChild(ampStory);
 
-    return ampAudio.build()
+    function attachToAmpStoryAndRun(attributes) {
+      naturalDimensions_['AMP-AUDIO'] = {width: '300px', height: '30px'};
+      const ampAudio = doc.createElement('amp-audio');
+      const ampStory = doc.createElement('amp-story');
+      for (const key in attributes) {
+        ampAudio.setAttribute(key, attributes[key]);
+      }
+      ampStory.appendChild(ampAudio);
+      doc.body.appendChild(ampStory);
+
+      return ampAudio
+        .build()
         .then(() => ampAudio.layoutCallback())
         .then(() => ampAudio)
         .catch(error => {
@@ -93,184 +97,189 @@ describes.realWin('amp-audio', {
             throw error;
           }
         });
-  }
+    }
 
-  it('should load audio through attribute', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-    }).then(a => {
-      const audio = a.querySelector('audio');
-      expect(audio.tagName).to.equal('AUDIO');
-      expect(audio.getAttribute('src'))
-          .to.equal('audio.mp3');
-      expect(audio.hasAttribute('controls')).to.be.true;
-      expect(a.style.width).to.be.equal('300px');
-      expect(a.style.height).to.be.equal('30px');
+    it('should load audio through attribute', () => {
+      return attachAndRun({
+        src: 'audio.mp3',
+      }).then(a => {
+        const audio = a.querySelector('audio');
+        expect(audio.tagName).to.equal('AUDIO');
+        expect(audio.getAttribute('src')).to.equal('audio.mp3');
+        expect(audio.hasAttribute('controls')).to.be.true;
+        expect(a.style.width).to.be.equal('300px');
+        expect(a.style.height).to.be.equal('30px');
+      });
     });
-  });
 
-  it('should not preload audio', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-      preload: 'none',
-    }).then(a => {
-      const audio = a.querySelector('audio');
-      expect(audio.getAttribute('preload')).to.be.equal('none');
+    it('should not preload audio', () => {
+      return attachAndRun({
+        src: 'audio.mp3',
+        preload: 'none',
+      }).then(a => {
+        const audio = a.querySelector('audio');
+        expect(audio.getAttribute('preload')).to.be.equal('none');
+      });
     });
-  });
 
-  it('should only preload audio metadata', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-      preload: 'metadata',
-    }).then(a => {
-      const audio = a.querySelector('audio');
-      expect(audio.getAttribute('preload')).to.be.equal('metadata');
+    it('should only preload audio metadata', () => {
+      return attachAndRun({
+        src: 'audio.mp3',
+        preload: 'metadata',
+      }).then(a => {
+        const audio = a.querySelector('audio');
+        expect(audio.getAttribute('preload')).to.be.equal('metadata');
+      });
     });
-  });
 
-  it('should attach `<audio>` element and execute relevant actions for ' +
-  'layout="nodisplay"', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-      preload: 'none',
-      layout: 'nodisplay',
-    }).then(ampAudio => {
-      const audio = ampAudio.querySelector('audio');
-      expect(audio).to.not.be.null;
+    it(
+      'should attach `<audio>` element and execute relevant actions for ' +
+        'layout="nodisplay"',
+      () => {
+        return attachAndRun({
+          src: 'audio.mp3',
+          preload: 'none',
+          layout: 'nodisplay',
+        }).then(ampAudio => {
+          const audio = ampAudio.querySelector('audio');
+          expect(audio).to.not.be.null;
 
-      const impl = ampAudio.implementation_;
-      impl.executeAction({method: 'play', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.true;
+          const impl = ampAudio.implementation_;
+          impl.executeAction({method: 'play', satisfiesTrust: () => true});
+          expect(impl.isPlaying).to.be.true;
 
-      impl.executeAction({method: 'pause', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.false;
-    });
-  });
+          impl.executeAction({method: 'pause', satisfiesTrust: () => true});
+          expect(impl.isPlaying).to.be.false;
+        });
+      }
+    );
 
-  it('should load audio through sources', () => {
-    return attachAndRun({
-      width: 503,
-      height: 53,
-      autoplay: '',
-      preload: '',
-      muted: '',
-      loop: '',
-    }, [
-      {tag: 'source', src: 'audio.mp3',
-        type: 'audio/mpeg'},
-      {tag: 'source', src: 'audio.ogg', type: 'audio/ogg'},
-      {tag: 'text', text: 'Unsupported.'},
-    ]).then(a => {
-      const audio = a.querySelector('audio');
-      expect(audio.tagName).to.equal('AUDIO');
-      expect(a.getAttribute('width')).to.be.equal('503');
-      expect(a.getAttribute('height')).to.be.equal('53');
-      expect(audio.offsetWidth).to.be.greaterThan(1);
-      expect(audio.offsetHeight).to.be.greaterThan(1);
-      expect(audio.hasAttribute('controls')).to.be.true;
-      expect(audio.hasAttribute('autoplay')).to.be.true;
-      expect(audio.hasAttribute('muted')).to.be.true;
-      expect(audio.hasAttribute('preload')).to.be.true;
-      expect(audio.hasAttribute('loop')).to.be.true;
-      expect(audio.hasAttribute('src')).to.be.false;
-      expect(audio.childNodes[0].tagName).to.equal('SOURCE');
-      expect(audio.childNodes[0].getAttribute('src'))
-          .to.equal('audio.mp3');
-      expect(audio.childNodes[1].tagName).to.equal('SOURCE');
-      expect(audio.childNodes[1].getAttribute('src'))
-          .to.equal('audio.ogg');
-      expect(audio.childNodes[2].nodeType).to.equal(Node.TEXT_NODE);
-      expect(audio.childNodes[2].textContent).to.equal('Unsupported.');
+    it('should load audio through sources', () => {
+      return attachAndRun(
+        {
+          width: 503,
+          height: 53,
+          autoplay: '',
+          preload: '',
+          muted: '',
+          loop: '',
+        },
+        [
+          {tag: 'source', src: 'audio.mp3', type: 'audio/mpeg'},
+          {tag: 'source', src: 'audio.ogg', type: 'audio/ogg'},
+          {tag: 'text', text: 'Unsupported.'},
+        ]
+      ).then(a => {
+        const audio = a.querySelector('audio');
+        expect(audio.tagName).to.equal('AUDIO');
+        expect(a.getAttribute('width')).to.be.equal('503');
+        expect(a.getAttribute('height')).to.be.equal('53');
+        expect(audio.offsetWidth).to.be.greaterThan(1);
+        expect(audio.offsetHeight).to.be.greaterThan(1);
+        expect(audio.hasAttribute('controls')).to.be.true;
+        expect(audio.hasAttribute('autoplay')).to.be.true;
+        expect(audio.hasAttribute('muted')).to.be.true;
+        expect(audio.hasAttribute('preload')).to.be.true;
+        expect(audio.hasAttribute('loop')).to.be.true;
+        expect(audio.hasAttribute('src')).to.be.false;
+        expect(audio.childNodes[0].tagName).to.equal('SOURCE');
+        expect(audio.childNodes[0].getAttribute('src')).to.equal('audio.mp3');
+        expect(audio.childNodes[1].tagName).to.equal('SOURCE');
+        expect(audio.childNodes[1].getAttribute('src')).to.equal('audio.ogg');
+        expect(audio.childNodes[2].nodeType).to.equal(Node.TEXT_NODE);
+        expect(audio.childNodes[2].textContent).to.equal('Unsupported.');
+      });
     });
-  });
 
-  it('should set its dimensions to the browser natural', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-    }).then(a => {
-      const audio = a.querySelector('audio');
-      expect(a.style.width).to.be.equal('300px');
-      expect(a.style.height).to.be.equal('30px');
-      if (/Safari|Firefox/.test(navigator.userAgent)) {
-        // Safari has default sizes for audio tags that cannot
-        // be overridden.
-        return;
-      }
-      expect(audio.offsetWidth).to.be.equal(300);
-      expect(audio.offsetHeight).to.be.equal(30);
+    it('should set its dimensions to the browser natural', () => {
+      return attachAndRun({
+        src: 'audio.mp3',
+      }).then(a => {
+        const audio = a.querySelector('audio');
+        expect(a.style.width).to.be.equal('300px');
+        expect(a.style.height).to.be.equal('30px');
+        if (/Safari|Firefox/.test(navigator.userAgent)) {
+          // Safari has default sizes for audio tags that cannot
+          // be overridden.
+          return;
+        }
+        expect(audio.offsetWidth).to.be.equal(300);
+        expect(audio.offsetHeight).to.be.equal(30);
+      });
     });
-  });
 
-  it('should set its natural dimension only if not specified', () => {
-    return attachAndRun({
-      'width': '500',
-      src: 'audio.mp3',
-    }).then(a => {
-      expect(a.style.width).to.be.equal('500px');
-      expect(a.style.height).to.be.equal('30px');
+    it('should set its natural dimension only if not specified', () => {
+      return attachAndRun({
+        'width': '500',
+        src: 'audio.mp3',
+      }).then(a => {
+        expect(a.style.width).to.be.equal('500px');
+        expect(a.style.height).to.be.equal('30px');
+      });
     });
-  });
 
-  it('should fallback when not available', () => {
-    const savedCreateElement = doc.createElement;
-    doc.createElement = name => {
-      if (name == 'audio') {
-        return savedCreateElement.call(doc, 'audio2');
-      }
-      return savedCreateElement.call(doc, name);
-    };
-    const element = doc.createElement('div');
-    element.toggleFallback = sandbox.spy();
-    const audio = new AmpAudio(element);
-    const promise = audio.buildAudioElement();
-    doc.createElement = savedCreateElement;
-    return promise.then(() => {
-      expect(element.toggleFallback).to.be.calledOnce;
+    it('should fallback when not available', () => {
+      const savedCreateElement = doc.createElement;
+      doc.createElement = name => {
+        if (name == 'audio') {
+          return savedCreateElement.call(doc, 'audio2');
+        }
+        return savedCreateElement.call(doc, name);
+      };
+      const element = doc.createElement('div');
+      element.toggleFallback = sandbox.spy();
+      const audio = new AmpAudio(element);
+      const promise = audio.buildAudioElement();
+      doc.createElement = savedCreateElement;
+      return promise.then(() => {
+        expect(element.toggleFallback).to.be.calledOnce;
+      });
     });
-  });
 
-  it('should propagate ARIA attributes', () => {
-    return attachAndRun({
-      src: 'audio.mp3',
-      'aria-label': 'Hello',
-      'aria-labelledby': 'id2',
-      'aria-describedby': 'id3',
-    }).then(a => {
-      const audio = a.querySelector('audio');
-      expect(audio.getAttribute('aria-label')).to.equal('Hello');
-      expect(audio.getAttribute('aria-labelledby')).to.equal('id2');
-      expect(audio.getAttribute('aria-describedby')).to.equal('id3');
+    it('should propagate ARIA attributes', () => {
+      return attachAndRun({
+        src: 'audio.mp3',
+        'aria-label': 'Hello',
+        'aria-labelledby': 'id2',
+        'aria-describedby': 'id3',
+      }).then(a => {
+        const audio = a.querySelector('audio');
+        expect(audio.getAttribute('aria-label')).to.equal('Hello');
+        expect(audio.getAttribute('aria-labelledby')).to.equal('id2');
+        expect(audio.getAttribute('aria-describedby')).to.equal('id3');
+      });
     });
-  });
 
-  it('should play/pause when `play`/`pause` actions are called', () => {
-    return attachAndRun({
-      'width': '500',
-      src: 'audio.mp3',
-    }).then(ampAudio => {
-      const impl = ampAudio.implementation_;
-      impl.executeAction({method: 'play', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.true;
+    it('should play/pause when `play`/`pause` actions are called', () => {
+      return attachAndRun({
+        'width': '500',
+        src: 'audio.mp3',
+      }).then(ampAudio => {
+        const impl = ampAudio.implementation_;
+        impl.executeAction({method: 'play', satisfiesTrust: () => true});
+        expect(impl.isPlaying).to.be.true;
 
-      impl.executeAction({method: 'pause', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.false;
+        impl.executeAction({method: 'pause', satisfiesTrust: () => true});
+        expect(impl.isPlaying).to.be.false;
+      });
     });
-  });
 
-  it('should not play/pause when `amp-audio` is a direct descendant ' +
-    'of `amp-story`', () => {
-    return attachToAmpStoryAndRun({
-      'width': '500',
-      src: 'audio.mp3',
-    }).then(ampAudio => {
-      const impl = ampAudio.implementation_;
-      impl.executeAction({method: 'play', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.false;
+    it(
+      'should not play/pause when `amp-audio` is a direct descendant ' +
+        'of `amp-story`',
+      () => {
+        return attachToAmpStoryAndRun({
+          'width': '500',
+          src: 'audio.mp3',
+        }).then(ampAudio => {
+          const impl = ampAudio.implementation_;
+          impl.executeAction({method: 'play', satisfiesTrust: () => true});
+          expect(impl.isPlaying).to.be.false;
 
-      impl.executeAction({method: 'pause', satisfiesTrust: () => true});
-      expect(impl.isPlaying).to.be.false;
-    });
-  });
-
-});
+          impl.executeAction({method: 'pause', satisfiesTrust: () => true});
+          expect(impl.isPlaying).to.be.false;
+        });
+      }
+    );
+  }
+);
diff --git a/extensions/amp-auto-ads/0.1/ad-network-config.js b/extensions/amp-auto-ads/0.1/ad-network-config.js
index 469abe274791..a71ba0191de8 100644
--- a/extensions/amp-auto-ads/0.1/ad-network-config.js
+++ b/extensions/amp-auto-ads/0.1/ad-network-config.js
@@ -21,7 +21,6 @@ import {getMode} from '../../../src/mode';
 import {parseUrlDeprecated} from '../../../src/url';
 import {tryParseJson} from '../../../src/json';
 
-
 /** @typedef {{width: (number|undefined), height: (number|undefined)}} */
 export let SizeInfoDef;
 
@@ -31,7 +30,6 @@ export let SizeInfoDef;
  * @interface
  */
 class AdNetworkConfigDef {
-
   /**
    * Indicates whether amp-auto-ads should be enabled on this pageview.
    * @param {!Window} unusedWin
@@ -116,8 +114,12 @@ class PingNetworkConfig {
 
   /** @override */
   getConfigUrl() {
-    return buildUrl('//lh3.googleusercontent.com/' +
-      'pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n', {}, 4096);
+    return buildUrl(
+      '//lh3.googleusercontent.com/' +
+        'pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n',
+      {},
+      4096
+    );
   }
 
   /** @override */
@@ -129,8 +131,9 @@ class PingNetworkConfig {
 
   /** @override */
   getDefaultAdConstraints() {
-    const viewportHeight =
-      Services.viewportForDoc(this.autoAmpAdsElement_).getSize().height;
+    const viewportHeight = Services.viewportForDoc(
+      this.autoAmpAdsElement_
+    ).getSize().height;
     return {
       initialMinSpacing: viewportHeight,
       subsequentMinSpacing: [
@@ -145,10 +148,8 @@ class PingNetworkConfig {
   getSizing() {
     return {};
   }
-
 }
 
-
 /**
  * @implements {AdNetworkConfigDef}
  */
@@ -176,12 +177,16 @@ class AdSenseNetworkConfig {
   getConfigUrl() {
     const docInfo = Services.documentInfoForDoc(this.autoAmpAdsElement_);
     const canonicalHostname = parseUrlDeprecated(docInfo.canonicalUrl).hostname;
-    return buildUrl('//pagead2.googlesyndication.com/getconfig/ama', {
-      'client': this.autoAmpAdsElement_.getAttribute('data-ad-client'),
-      'plah': canonicalHostname,
-      'ama_t': 'amp',
-      'url': docInfo.canonicalUrl,
-    }, 4096);
+    return buildUrl(
+      '//pagead2.googlesyndication.com/getconfig/ama',
+      {
+        'client': this.autoAmpAdsElement_.getAttribute('data-ad-client'),
+        'plah': canonicalHostname,
+        'ama_t': 'amp',
+        'url': docInfo.canonicalUrl,
+      },
+      4096
+    );
   }
 
   /** @override */
@@ -199,8 +204,9 @@ class AdSenseNetworkConfig {
 
   /** @override */
   getDefaultAdConstraints() {
-    const viewportHeight =
-        Services.viewportForDoc(this.autoAmpAdsElement_).getSize().height;
+    const viewportHeight = Services.viewportForDoc(
+      this.autoAmpAdsElement_
+    ).getSize().height;
     return {
       initialMinSpacing: viewportHeight,
       subsequentMinSpacing: [
@@ -217,7 +223,6 @@ class AdSenseNetworkConfig {
   }
 }
 
-
 /**
  * @implements {AdNetworkConfigDef}
  */
@@ -247,12 +252,16 @@ class DoubleclickNetworkConfig {
   getConfigUrl() {
     const docInfo = Services.documentInfoForDoc(this.autoAmpAdsElement_);
     const canonicalHostname = parseUrlDeprecated(docInfo.canonicalUrl).hostname;
-    return buildUrl('//pagead2.googlesyndication.com/getconfig/ama', {
-      'client': this.autoAmpAdsElement_.getAttribute('data-ad-legacy-client'),
-      'plah': canonicalHostname,
-      'ama_t': 'amp',
-      'url': docInfo.canonicalUrl,
-    }, 4096);
+    return buildUrl(
+      '//pagead2.googlesyndication.com/getconfig/ama',
+      {
+        'client': this.autoAmpAdsElement_.getAttribute('data-ad-legacy-client'),
+        'plah': canonicalHostname,
+        'ama_t': 'amp',
+        'url': docInfo.canonicalUrl,
+      },
+      4096
+    );
   }
 
   /** @override */
@@ -267,8 +276,9 @@ class DoubleclickNetworkConfig {
 
   /** @override */
   getDefaultAdConstraints() {
-    const viewportHeight =
-        Services.viewportForDoc(this.autoAmpAdsElement_).getSize().height;
+    const viewportHeight = Services.viewportForDoc(
+      this.autoAmpAdsElement_
+    ).getSize().height;
     return {
       initialMinSpacing: viewportHeight,
       subsequentMinSpacing: [
@@ -282,13 +292,16 @@ class DoubleclickNetworkConfig {
   /** @override */
   getSizing() {
     const experimentJson = tryParseJson(
-        this.autoAmpAdsElement_.getAttribute('data-experiment'));
+      this.autoAmpAdsElement_.getAttribute('data-experiment')
+    );
     if (experimentJson) {
       return {
-        height: experimentJson['height'] ?
-          Number(experimentJson['height']) : 250,
-        width: experimentJson['width'] ?
-          Number(experimentJson['width']) : undefined,
+        height: experimentJson['height']
+          ? Number(experimentJson['height'])
+          : 250,
+        width: experimentJson['width']
+          ? Number(experimentJson['width'])
+          : undefined,
       };
     }
     return {};
diff --git a/extensions/amp-auto-ads/0.1/ad-strategy.js b/extensions/amp-auto-ads/0.1/ad-strategy.js
index 2e3cece2b0fd..5b0a442a8100 100644
--- a/extensions/amp-auto-ads/0.1/ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/ad-strategy.js
@@ -31,7 +31,6 @@ const TAG = 'amp-auto-ads';
 export let StrategyResult;
 
 export class AdStrategy {
-
   /**
    * @param {!Array<!./placement.Placement>} placements
    * @param {!JsonObject<string, string>} baseAttributes Any attributes that
@@ -41,8 +40,13 @@ export class AdStrategy {
    * @param {!./ad-tracker.AdTracker} adTracker
    * @param {boolean} isResponsiveEnabled
    */
-  constructor(placements, baseAttributes, sizing, adTracker,
-    isResponsiveEnabled = false) {
+  constructor(
+    placements,
+    baseAttributes,
+    sizing,
+    adTracker,
+    isResponsiveEnabled = false
+  ) {
     this.availablePlacements_ = placements.slice(0);
 
     /** @private {!JsonObject<string, string>} */
@@ -100,19 +104,21 @@ export class AdStrategy {
       user().info(TAG, 'unable to fulfill ad strategy');
       return Promise.resolve(false);
     }
-    return nextPlacement.placeAd(
+    return nextPlacement
+      .placeAd(
         this.baseAttributes_,
         this.sizing_,
         this.adTracker_,
-        this.isResponsiveEnabled_)
-        .then(state => {
-          if (state == PlacementState.PLACED) {
-            this.adTracker_.addAd(nextPlacement.getAdElement());
-            this.adsPlaced_++;
-            return true;
-          } else {
-            return this.placeNextAd_();
-          }
-        });
+        this.isResponsiveEnabled_
+      )
+      .then(state => {
+        if (state == PlacementState.PLACED) {
+          this.adTracker_.addAd(nextPlacement.getAdElement());
+          this.adsPlaced_++;
+          return true;
+        } else {
+          return this.placeNextAd_();
+        }
+      });
   }
 }
diff --git a/extensions/amp-auto-ads/0.1/ad-tracker.js b/extensions/amp-auto-ads/0.1/ad-tracker.js
index da781f618a5f..dee5fb8cafa4 100644
--- a/extensions/amp-auto-ads/0.1/ad-tracker.js
+++ b/extensions/amp-auto-ads/0.1/ad-tracker.js
@@ -21,7 +21,6 @@ import {user} from '../../../src/log';
 /** @const */
 const TAG = 'amp-auto-ads';
 
-
 /**
  * Structure for defining contraints about the placement of ads.
  *
@@ -50,9 +49,7 @@ const TAG = 'amp-auto-ads';
  */
 export let AdConstraints;
 
-
 export class AdTracker {
-
   /**
    * @param {!Array<!Element>} ads
    * @param {!AdConstraints} adConstraints
@@ -65,10 +62,11 @@ export class AdTracker {
     this.initialMinSpacing_ = adConstraints.initialMinSpacing;
 
     /** @type {!Array<!{adCount: number, spacing: number}>} */
-    this.subsequentMinSpacing_ = adConstraints.subsequentMinSpacing.slice(0)
-        .sort((a, b) => {
-          return a.adCount - b.adCount;
-        });
+    this.subsequentMinSpacing_ = adConstraints.subsequentMinSpacing
+      .slice(0)
+      .sort((a, b) => {
+        return a.adCount - b.adCount;
+      });
 
     /** @type {number} */
     this.maxAdCount_ = adConstraints.maxAdCount;
@@ -119,13 +117,14 @@ export class AdTracker {
     if (adIndex >= this.ads_.length) {
       return Promise.resolve(false);
     }
-    return this.getDistanceFromAd_(yPosition, this.ads_[adIndex])
-        .then(distance => {
-          if (distance < this.minAdSpacing_) {
-            return true;
-          }
-          return this.isWithinMinDistanceOfAd_(yPosition, adIndex + 1);
-        });
+    return this.getDistanceFromAd_(yPosition, this.ads_[adIndex]).then(
+      distance => {
+        if (distance < this.minAdSpacing_) {
+          return true;
+        }
+        return this.isWithinMinDistanceOfAd_(yPosition, adIndex + 1);
+      }
+    );
   }
 
   /**
@@ -136,14 +135,18 @@ export class AdTracker {
    * @private
    */
   getDistanceFromAd_(yPosition, ad) {
-    return Services.resourcesForDoc(ad).getElementLayoutBox(ad).then(box => {
-      if (yPosition >= box.top && yPosition <= box.bottom) {
-        return 0;
-      } else {
-        return Math.min(Math.abs(yPosition - box.top),
-            Math.abs(yPosition - box.bottom));
-      }
-    });
+    return Services.resourcesForDoc(ad)
+      .getElementLayoutBox(ad)
+      .then(box => {
+        if (yPosition >= box.top && yPosition <= box.bottom) {
+          return 0;
+        } else {
+          return Math.min(
+            Math.abs(yPosition - box.top),
+            Math.abs(yPosition - box.bottom)
+          );
+        }
+      });
   }
 
   /**
@@ -168,14 +171,15 @@ export class AdTracker {
  * @return {!Array<!Element>}
  */
 export function getExistingAds(ampdoc) {
-  return [].slice.call(ampdoc.getRootNode().querySelectorAll('AMP-AD'))
-      .filter(ad => {
-        // Filters out AMP-STICKY-AD.
-        if (ad.parentElement && ad.parentElement.tagName == 'AMP-STICKY-AD') {
-          return false;
-        }
-        return true;
-      });
+  return [].slice
+    .call(ampdoc.getRootNode().querySelectorAll('AMP-AD'))
+    .filter(ad => {
+      // Filters out AMP-STICKY-AD.
+      if (ad.parentElement && ad.parentElement.tagName == 'AMP-STICKY-AD') {
+        return false;
+      }
+      return true;
+    });
 }
 
 /**
@@ -191,8 +195,10 @@ export function getAdConstraintsFromConfigObj(ampdoc, configObj) {
 
   const viewportHeight = Services.viewportForDoc(ampdoc).getHeight();
 
-  const initialMinSpacing =
-      getValueFromString(obj['initialMinSpacing'], viewportHeight);
+  const initialMinSpacing = getValueFromString(
+    obj['initialMinSpacing'],
+    viewportHeight
+  );
   if (initialMinSpacing == null) {
     user().warn(TAG, 'Invalid initial min spacing');
     return null;
diff --git a/extensions/amp-auto-ads/0.1/amp-auto-ads.js b/extensions/amp-auto-ads/0.1/amp-auto-ads.js
index 3c1b4f62e778..3120500ebedc 100644
--- a/extensions/amp-auto-ads/0.1/amp-auto-ads.js
+++ b/extensions/amp-auto-ads/0.1/amp-auto-ads.js
@@ -34,13 +34,10 @@ const TAG = 'amp-auto-ads';
 /** @const */
 const AD_TAG = 'amp-ad';
 
-
 export class AmpAutoAds extends AMP.BaseElement {
-
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-auto-ads'),
-        'Experiment is off');
+    userAssert(isExperimentOn(this.win, 'amp-auto-ads'), 'Experiment is off');
 
     const type = this.element.getAttribute('type');
     userAssert(type, 'Missing type attribute');
@@ -53,39 +50,47 @@ export class AmpAutoAds extends AMP.BaseElement {
     }
 
     const ampdoc = this.getAmpDoc();
-    Services.extensionsFor(this.win)./*OK*/installExtensionForDoc(
-        ampdoc, AD_TAG);
+    Services.extensionsFor(this.win)./*OK*/ installExtensionForDoc(
+      ampdoc,
+      AD_TAG
+    );
 
     const viewer = Services.viewerForDoc(this.getAmpDoc());
     const whenVisible = viewer.whenFirstVisible();
 
-    whenVisible.then(() => {
-      return this.getConfig_(adNetwork.getConfigUrl());
-    }).then(configObj => {
-      if (!configObj) {
-        return;
-      }
-      const noConfigReason = configObj['noConfigReason'];
-      if (noConfigReason) {
-        this.user().warn(TAG, noConfigReason);
-        return;
-      }
-
-      const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-      const attributes = /** @type {!JsonObject} */ (
-        Object.assign(adNetwork.getAttributes(),
-            getAttributesFromConfigObj(configObj)));
-      const sizing = adNetwork.getSizing();
-      const adConstraints = getAdConstraintsFromConfigObj(ampdoc, configObj) ||
+    whenVisible
+      .then(() => {
+        return this.getConfig_(adNetwork.getConfigUrl());
+      })
+      .then(configObj => {
+        if (!configObj) {
+          return;
+        }
+        const noConfigReason = configObj['noConfigReason'];
+        if (noConfigReason) {
+          this.user().warn(TAG, noConfigReason);
+          return;
+        }
+
+        const placements = getPlacementsFromConfigObj(ampdoc, configObj);
+        const attributes = /** @type {!JsonObject} */ (Object.assign(
+          adNetwork.getAttributes(),
+          getAttributesFromConfigObj(configObj)
+        ));
+        const sizing = adNetwork.getSizing();
+        const adConstraints =
+          getAdConstraintsFromConfigObj(ampdoc, configObj) ||
           adNetwork.getDefaultAdConstraints();
-      const adTracker = new AdTracker(getExistingAds(ampdoc), adConstraints);
-      new AdStrategy(placements,
+        const adTracker = new AdTracker(getExistingAds(ampdoc), adConstraints);
+        new AdStrategy(
+          placements,
           attributes,
           sizing,
           adTracker,
-          adNetwork.isResponsiveEnabled()).run();
-      new AnchorAdStrategy(ampdoc, attributes, configObj).run();
-    });
+          adNetwork.isResponsiveEnabled()
+        ).run();
+        new AnchorAdStrategy(ampdoc, attributes, configObj).run();
+      });
   }
 
   /** @override */
@@ -109,17 +114,15 @@ export class AmpAutoAds extends AMP.BaseElement {
       requireAmpResponseSourceOrigin: false,
     };
     return Services.xhrFor(this.win)
-        .fetchJson(configUrl, xhrInit)
-        .then(res => res.json())
-        .catch(reason => {
-          this.user().error(
-              TAG, 'amp-auto-ads config xhr failed: ' + reason);
-          return null;
-        });
+      .fetchJson(configUrl, xhrInit)
+      .then(res => res.json())
+      .catch(reason => {
+        this.user().error(TAG, 'amp-auto-ads config xhr failed: ' + reason);
+        return null;
+      });
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpAutoAds);
 });
diff --git a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
index 3bbb1abffa57..c42f94d64a53 100644
--- a/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/anchor-ad-strategy.js
@@ -22,7 +22,6 @@ const TAG = 'amp-auto-ads';
 const STICKY_AD_TAG = 'amp-sticky-ad';
 const OPT_IN_STATUS_ANCHOR_ADS = 2;
 
-
 export class AnchorAdStrategy {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -52,8 +51,11 @@ export class AnchorAdStrategy {
       user().warn(TAG, 'exists <amp-sticky-ad>');
       return Promise.resolve(false);
     }
-    Services.extensionsFor(this.ampdoc.win)./*OK*/installExtensionForDoc(
-        this.ampdoc, STICKY_AD_TAG, '1.0');
+    Services.extensionsFor(this.ampdoc.win)./*OK*/ installExtensionForDoc(
+      this.ampdoc,
+      STICKY_AD_TAG,
+      '1.0'
+    );
     this.placeStickyAd_();
     return Promise.resolve(true);
   }
@@ -87,18 +89,22 @@ export class AnchorAdStrategy {
    * @private
    */
   placeStickyAd_() {
-    const viewportWidth =
-        Services.viewportForDoc(this.ampdoc).getWidth();
-    const attributes = /** @type {!JsonObject} */ (
-      Object.assign(dict(), this.baseAttributes_, dict({
+    const viewportWidth = Services.viewportForDoc(this.ampdoc).getWidth();
+    const attributes = /** @type {!JsonObject} */ (Object.assign(
+      dict(),
+      this.baseAttributes_,
+      dict({
         'width': String(viewportWidth),
         'height': '100',
-      })));
+      })
+    ));
     const doc = this.ampdoc.win.document;
-    const ampAd = createElementWithAttributes(
-        doc, 'amp-ad', attributes);
+    const ampAd = createElementWithAttributes(doc, 'amp-ad', attributes);
     const stickyAd = createElementWithAttributes(
-        doc, 'amp-sticky-ad', dict({'layout': 'nodisplay'}));
+      doc,
+      'amp-sticky-ad',
+      dict({'layout': 'nodisplay'})
+    );
     stickyAd.appendChild(ampAd);
     const body = this.ampdoc.getBody();
     body.insertBefore(stickyAd, body.firstChild);
diff --git a/extensions/amp-auto-ads/0.1/attributes.js b/extensions/amp-auto-ads/0.1/attributes.js
index a3fab3cd9177..34a05253bcd8 100644
--- a/extensions/amp-auto-ads/0.1/attributes.js
+++ b/extensions/amp-auto-ads/0.1/attributes.js
@@ -55,9 +55,12 @@ function parseAttributes(attributeObject) {
       user().warn(TAG, 'Attribute not whitlisted: ' + key);
       continue;
     }
-    const valueType = (typeof attributeObject[key]);
-    if (valueType != 'number' && valueType != 'string' &&
-        valueType != 'boolean') {
+    const valueType = typeof attributeObject[key];
+    if (
+      valueType != 'number' &&
+      valueType != 'string' &&
+      valueType != 'boolean'
+    ) {
       user().warn(TAG, 'Attribute type not supported: ' + valueType);
       continue;
     }
diff --git a/extensions/amp-auto-ads/0.1/placement.js b/extensions/amp-auto-ads/0.1/placement.js
index b6c0a1328311..d742007fcc3b 100644
--- a/extensions/amp-auto-ads/0.1/placement.js
+++ b/extensions/amp-auto-ads/0.1/placement.js
@@ -80,10 +80,7 @@ const Position = {
  * extensions/amp-ad/.../validator-amp-ad.protoascii.
  * @const {!Array<string>}
  */
-const BLACKLISTED_ANCESTOR_TAGS = [
-  'AMP-SIDEBAR',
-  'AMP-APP-BANNER',
-];
+const BLACKLISTED_ANCESTOR_TAGS = ['AMP-SIDEBAR', 'AMP-APP-BANNER'];
 
 /**
  * @const {!Object<!Position, function(!Element, !Element)>}
@@ -94,7 +91,9 @@ INJECTORS[Position.BEFORE] = (anchorElement, elementToInject) => {
 };
 INJECTORS[Position.AFTER] = (anchorElement, elementToInject) => {
   anchorElement.parentNode.insertBefore(
-      elementToInject, anchorElement.nextSibling);
+    elementToInject,
+    anchorElement.nextSibling
+  );
 };
 INJECTORS[Position.FIRST_CHILD] = (anchorElement, elementToInject) => {
   anchorElement.insertBefore(elementToInject, anchorElement.firstChild);
@@ -113,8 +112,15 @@ export class Placement {
    * @param {!JsonObject<string, string>} attributes
    * @param {!../../../src/layout-rect.LayoutMarginsChangeDef=} opt_margins
    */
-  constructor(ampdoc, resources, anchorElement, position, injector, attributes,
-    opt_margins) {
+  constructor(
+    ampdoc,
+    resources,
+    anchorElement,
+    position,
+    injector,
+    attributes,
+    opt_margins
+  ) {
     /** @const {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc = ampdoc;
 
@@ -160,10 +166,11 @@ export class Placement {
    * @return {!Promise<number>}
    */
   getEstimatedPosition() {
-    return this.resources_.getElementLayoutBox(this.anchorElement_).then(
-        layoutBox => {
-          return this.getEstimatedPositionFromAchorLayout_(layoutBox);
-        });
+    return this.resources_
+      .getElementLayoutBox(this.anchorElement_)
+      .then(layoutBox => {
+        return this.getEstimatedPositionFromAchorLayout_(layoutBox);
+      });
   }
 
   /**
@@ -205,27 +212,33 @@ export class Placement {
         this.adElement_ = this.createAdElement_(baseAttributes, sizing.width);
         this.injector_(this.anchorElement_, this.getAdElement());
 
-        return this.getPlacementSizing_(sizing, isResponsiveEnabled)
-            .then(placement => {
+        return this.getPlacementSizing_(sizing, isResponsiveEnabled).then(
+          placement => {
             // CustomElement polyfill does not call connectedCallback
             // synchronously. So we explicitly wait for CustomElement to be
             // ready.
-              return whenUpgradedToCustomElement(this.getAdElement())
-                  .then(() => this.getAdElement().whenBuilt())
-                  .then(() => {
-                    return this.resources_.attemptChangeSize(
-                        this.getAdElement(),
-                        placement.height,
-                        placement.width,
-                        placement.margins);
-                  }) .then(() => {
-                    this.state_ = PlacementState.PLACED;
-                    return this.state_;
-                  }, () => {
-                    this.state_ = PlacementState.RESIZE_FAILED;
-                    return this.state_;
-                  });
-            });
+            return whenUpgradedToCustomElement(this.getAdElement())
+              .then(() => this.getAdElement().whenBuilt())
+              .then(() => {
+                return this.resources_.attemptChangeSize(
+                  this.getAdElement(),
+                  placement.height,
+                  placement.width,
+                  placement.margins
+                );
+              })
+              .then(
+                () => {
+                  this.state_ = PlacementState.PLACED;
+                  return this.state_;
+                },
+                () => {
+                  this.state_ = PlacementState.RESIZE_FAILED;
+                  return this.state_;
+                }
+              );
+          }
+        );
       });
     });
   }
@@ -245,36 +258,40 @@ export class Placement {
     const viewportWidth = viewport.getWidth();
     if (isResponsiveEnabled && viewportWidth <= MAXIMUM_RESPONSIVE_WIDTH) {
       const viewportHeight = viewport.getHeight();
-      const responsiveHeight =
-        getResponsiveHeightForContext_(viewportWidth, viewportHeight);
+      const responsiveHeight = getResponsiveHeightForContext_(
+        viewportWidth,
+        viewportHeight
+      );
       let margins = cloneLayoutMarginsChangeDef(this.margins_);
       return Services.resourcesForDoc(this.anchorElement_)
-          .getElementLayoutBox(this.anchorElement_)
-          .then(layoutBox => {
-            const direction =
-                  computedStyle(this.ampdoc.win, this.anchorElement_)
-                      ['direction'];
-            if (layoutBox.left !== 0) {
-              margins = margins || {};
-              if (direction == 'rtl') {
-                margins.right = layoutBox.left;
-              } else {
-                margins.left = -layoutBox.left;
-              }
+        .getElementLayoutBox(this.anchorElement_)
+        .then(layoutBox => {
+          const direction = computedStyle(this.ampdoc.win, this.anchorElement_)[
+            'direction'
+          ];
+          if (layoutBox.left !== 0) {
+            margins = margins || {};
+            if (direction == 'rtl') {
+              margins.right = layoutBox.left;
+            } else {
+              margins.left = -layoutBox.left;
             }
-          })
-          .then(() => {
-            return Promise.resolve({
-              width: viewportWidth,
-              height: responsiveHeight,
-              margins,
-            });
+          }
+        })
+        .then(() => {
+          return Promise.resolve({
+            width: viewportWidth,
+            height: responsiveHeight,
+            margins,
           });
+        });
     } else {
-      return Promise.resolve(/** @type {!PlacementSizingDef} */ ({
-        height: (sizing.height || TARGET_AD_HEIGHT_PX),
-        margins: this.margins_,
-      }));
+      return Promise.resolve(
+        /** @type {!PlacementSizingDef} */ ({
+          height: sizing.height || TARGET_AD_HEIGHT_PX,
+          margins: this.margins_,
+        })
+      );
     }
   }
 
@@ -285,18 +302,24 @@ export class Placement {
    * @private
    */
   createAdElement_(baseAttributes, width) {
-    const attributes = /** @type {!JsonObject} */ (Object.assign(dict({
-      'layout': width ? 'fixed' : 'fixed-height',
-      'height': '0',
-      'width': width ? width : 'auto',
-      'class': 'i-amphtml-layout-awaiting-size',
-    }), baseAttributes, this.attributes_));
+    const attributes = /** @type {!JsonObject} */ (Object.assign(
+      dict({
+        'layout': width ? 'fixed' : 'fixed-height',
+        'height': '0',
+        'width': width ? width : 'auto',
+        'class': 'i-amphtml-layout-awaiting-size',
+      }),
+      baseAttributes,
+      this.attributes_
+    ));
     return createElementWithAttributes(
-        this.ampdoc.win.document, 'amp-ad', attributes);
+      this.ampdoc.win.document,
+      'amp-ad',
+      attributes
+    );
   }
 }
 
-
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @param {!JsonObject} configObj
@@ -315,7 +338,6 @@ export function getPlacementsFromConfigObj(ampdoc, configObj) {
   return placements;
 }
 
-
 /**
  * Validates that the placementObj represents a valid placement and if so
  * constructs and returns an instance of the Placement class for it.
@@ -355,18 +377,20 @@ function getPlacementsFromObject(ampdoc, placementObj, placements) {
       return;
     }
     const attributes = getAttributesFromConfigObj(placementObj);
-    placements.push(new Placement(
+    placements.push(
+      new Placement(
         ampdoc,
         Services.resourcesForDoc(anchorElement),
         anchorElement,
         placementObj['pos'],
         injector,
         attributes,
-        margins));
+        margins
+      )
+    );
   });
 }
 
-
 /**
  * Looks up the element(s) addresses by the anchorObj.
  *
@@ -380,8 +404,9 @@ function getAnchorElements(rootElement, anchorObj) {
     user().warn(TAG, 'No selector in anchor');
     return [];
   }
-  let elements = [].slice.call(scopedQuerySelectorAll(
-      rootElement.documentElement || rootElement, selector));
+  let elements = [].slice.call(
+    scopedQuerySelectorAll(rootElement.documentElement || rootElement, selector)
+  );
 
   const minChars = anchorObj['min_c'] || 0;
   if (minChars > 0) {
@@ -409,7 +434,6 @@ function getAnchorElements(rootElement, anchorObj) {
   return elements;
 }
 
-
 /**
  * @param {!Element} anchorElement
  * @param {!Position} position
@@ -417,8 +441,9 @@ function getAnchorElements(rootElement, anchorObj) {
  */
 function isPositionValid(anchorElement, position) {
   const elementToCheckOrNull =
-      position == Position.BEFORE || position == Position.AFTER ?
-        anchorElement.parentElement : anchorElement;
+    position == Position.BEFORE || position == Position.AFTER
+      ? anchorElement.parentElement
+      : anchorElement;
   if (!elementToCheckOrNull) {
     user().warn(TAG, 'Parentless anchor with BEFORE/AFTER position.');
     return false;
@@ -433,7 +458,6 @@ function isPositionValid(anchorElement, position) {
   });
 }
 
-
 /**
  * Calculates the appropriate height for a full-width responsive ad.
  * @param {number} viewportWidth
diff --git a/extensions/amp-auto-ads/0.1/test/test-ad-network-config.js b/extensions/amp-auto-ads/0.1/test/test-ad-network-config.js
index fe88c588d8a0..1d87faf0179f 100644
--- a/extensions/amp-auto-ads/0.1/test/test-ad-network-config.js
+++ b/extensions/amp-auto-ads/0.1/test/test-ad-network-config.js
@@ -17,183 +17,198 @@
 import {Services} from '../../../../src/services';
 import {getAdNetworkConfig} from '../ad-network-config';
 
-describes.realWin('ad-network-config', {
-  amp: {
-    canonicalUrl: 'https://foo.bar/baz',
-    runtimeOn: true,
-    ampdoc: 'single',
+describes.realWin(
+  'ad-network-config',
+  {
+    amp: {
+      canonicalUrl: 'https://foo.bar/baz',
+      runtimeOn: true,
+      ampdoc: 'single',
+    },
   },
-}, env => {
+  env => {
+    let ampAutoAdsElem;
+    let document;
 
-  let ampAutoAdsElem;
-  let document;
-
-  beforeEach(() => {
-    document = env.win.document;
-    ampAutoAdsElem = document.createElement('amp-auto-ads');
-    env.win.document.body.appendChild(ampAutoAdsElem);
-  });
-
-  afterEach(() => {
-    env.win.document.body.removeChild(ampAutoAdsElem);
-  });
+    beforeEach(() => {
+      document = env.win.document;
+      ampAutoAdsElem = document.createElement('amp-auto-ads');
+      env.win.document.body.appendChild(ampAutoAdsElem);
+    });
 
-  describe('AdSense', () => {
+    afterEach(() => {
+      env.win.document.body.removeChild(ampAutoAdsElem);
+    });
 
-    const AD_CLIENT = 'ca-pub-1234';
-    const AD_HOST = 'ca-pub-5678';
+    describe('AdSense', () => {
+      const AD_CLIENT = 'ca-pub-1234';
+      const AD_HOST = 'ca-pub-5678';
 
-    beforeEach(() => {
-      ampAutoAdsElem.setAttribute('data-ad-client', AD_CLIENT);
-    });
+      beforeEach(() => {
+        ampAutoAdsElem.setAttribute('data-ad-client', AD_CLIENT);
+      });
 
-    it('should generate the config fetch URL', () => {
-      const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
-      expect(adNetwork.getConfigUrl()).to.equal(
+      it('should generate the config fetch URL', () => {
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        expect(adNetwork.getConfigUrl()).to.equal(
           '//pagead2.googlesyndication.com/getconfig/ama?client=' +
-          AD_CLIENT + '&plah=foo.bar&ama_t=amp&' +
-          'url=https%3A%2F%2Ffoo.bar%2Fbaz');
-    });
+            AD_CLIENT +
+            '&plah=foo.bar&ama_t=amp&' +
+            'url=https%3A%2F%2Ffoo.bar%2Fbaz'
+        );
+      });
 
-    it('should report responsive-enabled',
-        () => {
-          const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
-          expect(adNetwork.isResponsiveEnabled()).to.equal(true);
-        });
+      it('should report responsive-enabled', () => {
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        expect(adNetwork.isResponsiveEnabled()).to.equal(true);
+      });
 
-    // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
-    it.skip('should truncate the URL if it\'s too long', () => {
-      const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+      // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
+      it.skip("should truncate the URL if it's too long", () => {
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
 
-      const canonicalUrl = 'http://foo.bar/' + 'a'.repeat(4050)
-          + 'shouldnt_be_included';
+        const canonicalUrl =
+          'http://foo.bar/a'.repeat(4050) + 'shouldnt_be_included';
 
-      const docInfo = Services.documentInfoForDoc(ampAutoAdsElem);
-      sandbox.stub(docInfo, 'canonicalUrl').callsFake(canonicalUrl);
+        const docInfo = Services.documentInfoForDoc(ampAutoAdsElem);
+        sandbox.stub(docInfo, 'canonicalUrl').callsFake(canonicalUrl);
 
-      const url = adNetwork.getConfigUrl();
-      expect(url).to.contain('ama_t=amp');
-      expect(url).to.contain('url=http%3A%2F%2Ffoo.bar');
-      expect(url).not.to.contain('shouldnt_be_included');
-    });
+        const url = adNetwork.getConfigUrl();
+        expect(url).to.contain('ama_t=amp');
+        expect(url).to.contain('url=http%3A%2F%2Ffoo.bar');
+        expect(url).not.to.contain('shouldnt_be_included');
+      });
 
-    it('should generate the attributes', () => {
-      const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
-      expect(adNetwork.getAttributes()).to.deep.equal({
-        'type': 'adsense',
-        'data-ad-client': 'ca-pub-1234',
+      it('should generate the attributes', () => {
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        expect(adNetwork.getAttributes()).to.deep.equal({
+          'type': 'adsense',
+          'data-ad-client': 'ca-pub-1234',
+        });
       });
-    });
 
-    it('should add data-ad-host to attributes if set on ampAutoAdsElem', () => {
-      ampAutoAdsElem.setAttribute('data-ad-host', AD_HOST);
-      const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
-      expect(adNetwork.getAttributes()).to.deep.equal({
-        'type': 'adsense',
-        'data-ad-client': AD_CLIENT,
-        'data-ad-host': AD_HOST,
+      it('should add data-ad-host to attributes if set on ampAutoAdsElem', () => {
+        ampAutoAdsElem.setAttribute('data-ad-host', AD_HOST);
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        expect(adNetwork.getAttributes()).to.deep.equal({
+          'type': 'adsense',
+          'data-ad-client': AD_CLIENT,
+          'data-ad-host': AD_HOST,
+        });
+        ampAutoAdsElem.removeAttribute('data-ad-host');
       });
-      ampAutoAdsElem.removeAttribute('data-ad-host');
-    });
 
-    it('should get the default ad constraints', () => {
-      const viewportMock =
-          sandbox.mock(Services.viewportForDoc(env.win.document));
-      viewportMock.expects('getSize').returns(
-          {width: 320, height: 500}).atLeast(1);
-
-      const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
-      expect(adNetwork.getDefaultAdConstraints()).to.deep.equal({
-        initialMinSpacing: 500,
-        subsequentMinSpacing: [
-          {adCount: 3, spacing: 1000},
-          {adCount: 6, spacing: 1500},
-        ],
-        maxAdCount: 8,
+      it('should get the default ad constraints', () => {
+        const viewportMock = sandbox.mock(
+          Services.viewportForDoc(env.win.document)
+        );
+        viewportMock
+          .expects('getSize')
+          .returns({width: 320, height: 500})
+          .atLeast(1);
+
+        const adNetwork = getAdNetworkConfig('adsense', ampAutoAdsElem);
+        expect(adNetwork.getDefaultAdConstraints()).to.deep.equal({
+          initialMinSpacing: 500,
+          subsequentMinSpacing: [
+            {adCount: 3, spacing: 1000},
+            {adCount: 6, spacing: 1500},
+          ],
+          maxAdCount: 8,
+        });
       });
     });
-  });
-
-  describe('Doubleclick', () => {
 
-    const AD_LEGACY_CLIENT = 'ca-pub-1234';
+    describe('Doubleclick', () => {
+      const AD_LEGACY_CLIENT = 'ca-pub-1234';
 
-    const TARGETING_JSON = {'Categories': 'A'};
+      const TARGETING_JSON = {'Categories': 'A'};
 
-    const EXPERIMENT_SETTINGS = {'width': 300, 'height': 250};
+      const EXPERIMENT_SETTINGS = {'width': 300, 'height': 250};
 
-    const AD_SLOT = '1234/example.com/SLOT_1';
+      const AD_SLOT = '1234/example.com/SLOT_1';
 
-    beforeEach(() => {
-      ampAutoAdsElem.setAttribute('data-ad-legacy-client', AD_LEGACY_CLIENT);
-      ampAutoAdsElem.setAttribute('data-experiment',
-          JSON.stringify(EXPERIMENT_SETTINGS));
-      ampAutoAdsElem.setAttribute('data-json', JSON.stringify(TARGETING_JSON));
-      ampAutoAdsElem.setAttribute('data-slot', AD_SLOT);
-    });
+      beforeEach(() => {
+        ampAutoAdsElem.setAttribute('data-ad-legacy-client', AD_LEGACY_CLIENT);
+        ampAutoAdsElem.setAttribute(
+          'data-experiment',
+          JSON.stringify(EXPERIMENT_SETTINGS)
+        );
+        ampAutoAdsElem.setAttribute(
+          'data-json',
+          JSON.stringify(TARGETING_JSON)
+        );
+        ampAutoAdsElem.setAttribute('data-slot', AD_SLOT);
+      });
 
-    it('should report enabled always', () => {
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
-      expect(adNetwork.isEnabled(env.win)).to.equal(true);
-    });
+      it('should report enabled always', () => {
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+        expect(adNetwork.isEnabled(env.win)).to.equal(true);
+      });
 
-    it('should generate the config fetch URL', () => {
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
-      expect(adNetwork.getConfigUrl()).to.equal(
+      it('should generate the config fetch URL', () => {
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+        expect(adNetwork.getConfigUrl()).to.equal(
           '//pagead2.googlesyndication.com/getconfig/ama?client=' +
-          AD_LEGACY_CLIENT + '&plah=foo.bar&ama_t=amp&' +
-          'url=https%3A%2F%2Ffoo.bar%2Fbaz');
-    });
+            AD_LEGACY_CLIENT +
+            '&plah=foo.bar&ama_t=amp&' +
+            'url=https%3A%2F%2Ffoo.bar%2Fbaz'
+        );
+      });
 
-    // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
-    it.skip('should truncate the URL if it\'s too long', () => {
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+      // TODO(bradfrizzell, #12476): Make this test work with sinon 4.0.
+      it.skip("should truncate the URL if it's too long", () => {
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
 
-      const canonicalUrl = 'http://foo.bar/' + 'a'.repeat(4050)
-          + 'shouldnt_be_included';
+        const canonicalUrl =
+          'http://foo.bar/a'.repeat(4050) + 'shouldnt_be_included';
 
-      const docInfo = Services.documentInfoForDoc(ampAutoAdsElem);
-      sandbox.stub(docInfo, 'canonicalUrl').callsFake(canonicalUrl);
+        const docInfo = Services.documentInfoForDoc(ampAutoAdsElem);
+        sandbox.stub(docInfo, 'canonicalUrl').callsFake(canonicalUrl);
 
-      const url = adNetwork.getConfigUrl();
-      expect(url).to.contain('ama_t=amp');
-      expect(url).to.contain('url=http%3A%2F%2Ffoo.bar');
-      expect(url).not.to.contain('shouldnt_be_included');
-    });
+        const url = adNetwork.getConfigUrl();
+        expect(url).to.contain('ama_t=amp');
+        expect(url).to.contain('url=http%3A%2F%2Ffoo.bar');
+        expect(url).not.to.contain('shouldnt_be_included');
+      });
 
-    it('should generate the attributes', () => {
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
-      expect(adNetwork.getAttributes()).to.deep.equal({
-        'type': 'doubleclick',
-        'json': JSON.stringify(TARGETING_JSON),
-        'data-slot': AD_SLOT,
+      it('should generate the attributes', () => {
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+        expect(adNetwork.getAttributes()).to.deep.equal({
+          'type': 'doubleclick',
+          'json': JSON.stringify(TARGETING_JSON),
+          'data-slot': AD_SLOT,
+        });
       });
-    });
 
-    it('should get the default ad constraints', () => {
-      const viewportMock =
-          sandbox.mock(Services.viewportForDoc(env.win.document));
-      viewportMock.expects('getSize').returns(
-          {width: 320, height: 500}).atLeast(1);
-
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
-      expect(adNetwork.getDefaultAdConstraints()).to.deep.equal({
-        initialMinSpacing: 500,
-        subsequentMinSpacing: [
-          {adCount: 3, spacing: 1000},
-          {adCount: 6, spacing: 1500},
-        ],
-        maxAdCount: 8,
+      it('should get the default ad constraints', () => {
+        const viewportMock = sandbox.mock(
+          Services.viewportForDoc(env.win.document)
+        );
+        viewportMock
+          .expects('getSize')
+          .returns({width: 320, height: 500})
+          .atLeast(1);
+
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+        expect(adNetwork.getDefaultAdConstraints()).to.deep.equal({
+          initialMinSpacing: 500,
+          subsequentMinSpacing: [
+            {adCount: 3, spacing: 1000},
+            {adCount: 6, spacing: 1500},
+          ],
+          maxAdCount: 8,
+        });
       });
-    });
 
-    it('should not be responsive-enabled', () => {
-      const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
-      expect(adNetwork.isResponsiveEnabled()).to.be.false;
+      it('should not be responsive-enabled', () => {
+        const adNetwork = getAdNetworkConfig('doubleclick', ampAutoAdsElem);
+        expect(adNetwork.isResponsiveEnabled()).to.be.false;
+      });
     });
-  });
 
-  it('should return null for unknown type', () => {
-    expect(getAdNetworkConfig('unknowntype', ampAutoAdsElem)).to.be.null;
-  });
-});
+    it('should return null for unknown type', () => {
+      expect(getAdNetworkConfig('unknowntype', ampAutoAdsElem)).to.be.null;
+    });
+  }
+);
diff --git a/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js b/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
index ea3b89ab2ade..d2ef3cda27f7 100644
--- a/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/test/test-ad-strategy.js
@@ -14,43 +14,238 @@
  * limitations under the License.
  */
 
-
 import {AdStrategy} from '../ad-strategy';
 import {AdTracker} from '../ad-tracker';
 import {PlacementState, getPlacementsFromConfigObj} from '../placement';
 
-
-describes.realWin('amp-strategy', {
-  amp: {
-    runtimeOn: true,
-    ampdoc: 'single',
-    extensions: ['amp-ad'],
+describes.realWin(
+  'amp-strategy',
+  {
+    amp: {
+      runtimeOn: true,
+      ampdoc: 'single',
+      extensions: ['amp-ad'],
+    },
   },
-}, env => {
-  let win, doc, ampdoc;
-  let container;
+  env => {
+    let win, doc, ampdoc;
+    let container;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+
+      env.iframe.style.height = '1000px';
+
+      const belowFoldSpacer = doc.createElement('div');
+      belowFoldSpacer.style.height = '1000px';
+      doc.body.appendChild(belowFoldSpacer);
+
+      container = doc.createElement('div');
+      doc.body.appendChild(container);
+    });
+
+    it('should call placeAd with correct parameters', () => {
+      const anchor1 = doc.createElement('div');
+      anchor1.id = 'anchor1Id';
+      container.appendChild(anchor1);
+
+      const configObj = {
+        placements: [
+          {
+            anchor: {
+              selector: 'DIV#anchor1Id',
+            },
+            pos: 2,
+            type: 1,
+          },
+        ],
+      };
+      const placements = getPlacementsFromConfigObj(ampdoc, configObj);
+      expect(placements).to.have.lengthOf(1);
+
+      const placeAdSpy = sandbox.spy(placements[0], 'placeAd');
+
+      const attributes = {
+        'type': 'adsense',
+        'data-custom-att-1': 'val-1',
+        'data-custom-att-2': 'val-2',
+      };
+
+      const sizing = {};
+
+      const adTracker = new AdTracker([], {
+        initialMinSpacing: 0,
+        subsequentMinSpacing: [],
+        maxAdCount: 1,
+      });
+      const adStrategy = new AdStrategy(
+        placements,
+        attributes,
+        sizing,
+        adTracker,
+        true
+      );
+
+      return adStrategy.run().then(unused => {
+        expect(placeAdSpy).to.be.calledWith(
+          attributes,
+          sizing,
+          adTracker,
+          true
+        );
+      });
+    });
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
+    it('should place an ad in the first placement only with correct attributes', () => {
+      const anchor1 = doc.createElement('div');
+      anchor1.id = 'anchor1Id';
+      container.appendChild(anchor1);
+
+      const anchor2 = doc.createElement('div');
+      anchor2.id = 'anchor2Id';
+      container.appendChild(anchor2);
+
+      const configObj = {
+        placements: [
+          {
+            anchor: {
+              selector: 'DIV#anchor1Id',
+            },
+            pos: 2,
+            type: 1,
+          },
+          {
+            anchor: {
+              selector: 'DIV#anchor2Id',
+            },
+            pos: 2,
+            type: 1,
+          },
+        ],
+      };
+      const placements = getPlacementsFromConfigObj(ampdoc, configObj);
+      expect(placements).to.have.lengthOf(2);
+
+      const attributes = {
+        'type': 'adsense',
+        'data-custom-att-1': 'val-1',
+        'data-custom-att-2': 'val-2',
+      };
+
+      const sizing = {};
+
+      const adTracker = new AdTracker([], {
+        initialMinSpacing: 0,
+        subsequentMinSpacing: [],
+        maxAdCount: 1,
+      });
+      const adStrategy = new AdStrategy(
+        placements,
+        attributes,
+        sizing,
+        adTracker
+      );
+
+      return adStrategy.run().then(result => {
+        expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
+        expect(anchor1.childNodes).to.have.lengthOf(1);
+        expect(anchor2.childNodes).to.have.lengthOf(0);
+        const adElement = anchor1.childNodes[0];
+        expect(adElement.tagName).to.equal('AMP-AD');
+        expect(adElement.getAttribute('type')).to.equal('adsense');
+        expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
+        expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
+      });
+    });
+
+    it('should place the second ad when placing the first one fails', () => {
+      const anchor1 = doc.createElement('div');
+      anchor1.id = 'anchor1Id';
+      container.appendChild(anchor1);
+
+      const anchor2 = doc.createElement('div');
+      anchor2.id = 'anchor2Id';
+      container.appendChild(anchor2);
+
+      const configObj = {
+        placements: [
+          {
+            anchor: {
+              selector: 'DIV#anchor1Id',
+            },
+            pos: 2,
+            type: 1,
+          },
+          {
+            anchor: {
+              selector: 'DIV#anchor2Id',
+            },
+            pos: 2,
+            type: 1,
+          },
+        ],
+      };
+      const placements = getPlacementsFromConfigObj(ampdoc, configObj);
+
+      expect(placements).to.have.lengthOf(2);
+      sandbox.stub(placements[0], 'placeAd').callsFake(() => {
+        return Promise.resolve(PlacementState.REIZE_FAILED);
+      });
 
-    env.iframe.style.height = '1000px';
+      const attributes = {
+        'type': 'adsense',
+        'data-custom-att-1': 'val-1',
+        'data-custom-att-2': 'val-2',
+      };
 
-    const belowFoldSpacer = doc.createElement('div');
-    belowFoldSpacer.style.height = '1000px';
-    doc.body.appendChild(belowFoldSpacer);
+      const sizing = {};
 
-    container = doc.createElement('div');
-    doc.body.appendChild(container);
-  });
+      const adTracker = new AdTracker([], {
+        initialMinSpacing: 0,
+        subsequentMinSpacing: [],
+        maxAdCount: 1,
+      });
+      const adStrategy = new AdStrategy(
+        placements,
+        attributes,
+        sizing,
+        adTracker
+      );
+
+      return adStrategy.run().then(result => {
+        expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
+        expect(anchor1.childNodes).to.have.lengthOf(0);
+        expect(anchor2.childNodes).to.have.lengthOf(1);
+        const adElement = anchor2.childNodes[0];
+        expect(adElement.tagName).to.equal('AMP-AD');
+        expect(adElement.getAttribute('type')).to.equal('adsense');
+        expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
+        expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
+      });
+    });
 
-  it('should call placeAd with correct parameters',
+    it(
+      'should place an ad in the first placement only when second placement ' +
+        'too close.',
       () => {
+        const belowViewportSpacer = doc.createElement('div');
+        belowViewportSpacer.style.height = '1000px';
+        container.appendChild(belowViewportSpacer);
+
         const anchor1 = doc.createElement('div');
         anchor1.id = 'anchor1Id';
         container.appendChild(anchor1);
 
+        const spacer = doc.createElement('div');
+        spacer.style.height = '199px';
+        container.appendChild(spacer);
+
+        const anchor2 = doc.createElement('div');
+        anchor2.id = 'anchor2Id';
+        container.appendChild(anchor2);
+
         const configObj = {
           placements: [
             {
@@ -60,12 +255,17 @@ describes.realWin('amp-strategy', {
               pos: 2,
               type: 1,
             },
+            {
+              anchor: {
+                selector: 'DIV#anchor2Id',
+              },
+              pos: 2,
+              type: 1,
+            },
           ],
         };
         const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-        expect(placements).to.have.lengthOf(1);
-
-        const placeAdSpy = sandbox.spy(placements[0], 'placeAd');
+        expect(placements).to.have.lengthOf(2);
 
         const attributes = {
           'type': 'adsense',
@@ -76,25 +276,46 @@ describes.realWin('amp-strategy', {
         const sizing = {};
 
         const adTracker = new AdTracker([], {
-          initialMinSpacing: 0,
+          initialMinSpacing: 200,
           subsequentMinSpacing: [],
-          maxAdCount: 1,
+          maxAdCount: 2,
         });
         const adStrategy = new AdStrategy(
-            placements, attributes, sizing, adTracker, true);
+          placements,
+          attributes,
+          sizing,
+          adTracker
+        );
 
-        return adStrategy.run().then(unused => {
-          expect(placeAdSpy).to.be.calledWith(attributes, sizing,
-              adTracker, true);
+        return adStrategy.run().then(result => {
+          expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
+          expect(anchor1.childNodes).to.have.lengthOf(1);
+          expect(anchor2.childNodes).to.have.lengthOf(0);
+          const adElement = anchor1.childNodes[0];
+          expect(adElement.tagName).to.equal('AMP-AD');
+          expect(adElement.getAttribute('type')).to.equal('adsense');
+          expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
+          expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
         });
-      });
+      }
+    );
 
-  it('should place an ad in the first placement only with correct attributes',
+    it(
+      'should place an ad in the first placement and second placement when ' +
+        'sufficiently far apart.',
       () => {
+        const belowViewportSpacer = doc.createElement('div');
+        belowViewportSpacer.style.height = '1000px';
+        container.appendChild(belowViewportSpacer);
+
         const anchor1 = doc.createElement('div');
         anchor1.id = 'anchor1Id';
         container.appendChild(anchor1);
 
+        const spacer = doc.createElement('div');
+        spacer.style.height = '200px';
+        container.appendChild(spacer);
+
         const anchor2 = doc.createElement('div');
         anchor2.id = 'anchor2Id';
         container.appendChild(anchor2);
@@ -129,351 +350,184 @@ describes.realWin('amp-strategy', {
         const sizing = {};
 
         const adTracker = new AdTracker([], {
-          initialMinSpacing: 0,
+          initialMinSpacing: 200,
           subsequentMinSpacing: [],
-          maxAdCount: 1,
+          maxAdCount: 2,
         });
         const adStrategy = new AdStrategy(
-            placements, attributes, sizing, adTracker);
+          placements,
+          attributes,
+          sizing,
+          adTracker
+        );
 
         return adStrategy.run().then(result => {
-          expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
+          expect(result).to.deep.equal({adsPlaced: 2, totalAdsOnPage: 2});
           expect(anchor1.childNodes).to.have.lengthOf(1);
-          expect(anchor2.childNodes).to.have.lengthOf(0);
-          const adElement = anchor1.childNodes[0];
-          expect(adElement.tagName).to.equal('AMP-AD');
-          expect(adElement.getAttribute('type')).to.equal('adsense');
-          expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
-          expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
+          expect(anchor2.childNodes).to.have.lengthOf(1);
+          const adElement1 = anchor1.childNodes[0];
+          expect(adElement1.tagName).to.equal('AMP-AD');
+          expect(adElement1.getAttribute('type')).to.equal('adsense');
+          expect(adElement1.getAttribute('data-custom-att-1')).to.equal(
+            'val-1'
+          );
+          expect(adElement1.getAttribute('data-custom-att-2')).to.equal(
+            'val-2'
+          );
+          const adElement2 = anchor2.childNodes[0];
+          expect(adElement2.tagName).to.equal('AMP-AD');
+          expect(adElement2.getAttribute('type')).to.equal('adsense');
+          expect(adElement2.getAttribute('data-custom-att-1')).to.equal(
+            'val-1'
+          );
+          expect(adElement2.getAttribute('data-custom-att-2')).to.equal(
+            'val-2'
+          );
         });
-      });
+      }
+    );
 
-  it('should place the second ad when placing the first one fails', () => {
-    const anchor1 = doc.createElement('div');
-    anchor1.id = 'anchor1Id';
-    container.appendChild(anchor1);
+    it(
+      'should place an ad in the first placement only when already an ad on ' +
+        'the page.',
+      () => {
+        const fakeExistingAd = doc.createElement('div');
+        container.appendChild(fakeExistingAd);
 
-    const anchor2 = doc.createElement('div');
-    anchor2.id = 'anchor2Id';
-    container.appendChild(anchor2);
+        const belowViewportSpacer = doc.createElement('div');
+        belowViewportSpacer.style.height = '1000px';
+        container.appendChild(belowViewportSpacer);
 
-    const configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anchor1Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anchor2Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-      ],
-    };
-    const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-
-    expect(placements).to.have.lengthOf(2);
-    sandbox.stub(placements[0], 'placeAd').callsFake(() => {
-      return Promise.resolve(PlacementState.REIZE_FAILED);
-    });
+        const anchor1 = doc.createElement('div');
+        anchor1.id = 'anchor1Id';
+        container.appendChild(anchor1);
 
-    const attributes = {
-      'type': 'adsense',
-      'data-custom-att-1': 'val-1',
-      'data-custom-att-2': 'val-2',
-    };
+        const spacer = doc.createElement('div');
+        spacer.style.height = '200px';
+        container.appendChild(spacer);
 
-    const sizing = {};
+        const anchor2 = doc.createElement('div');
+        anchor2.id = 'anchor2Id';
+        container.appendChild(anchor2);
 
-    const adTracker = new AdTracker([], {
-      initialMinSpacing: 0,
-      subsequentMinSpacing: [],
-      maxAdCount: 1,
-    });
-    const adStrategy = new AdStrategy(
-        placements, attributes, sizing, adTracker);
-
-    return adStrategy.run().then(result => {
-      expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
-      expect(anchor1.childNodes).to.have.lengthOf(0);
-      expect(anchor2.childNodes).to.have.lengthOf(1);
-      const adElement = anchor2.childNodes[0];
-      expect(adElement.tagName).to.equal('AMP-AD');
-      expect(adElement.getAttribute('type')).to.equal('adsense');
-      expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
-      expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
-    });
-  });
-
-  it('should place an ad in the first placement only when second placement ' +
-      'too close.', () => {
-    const belowViewportSpacer = doc.createElement('div');
-    belowViewportSpacer.style.height = '1000px';
-    container.appendChild(belowViewportSpacer);
-
-    const anchor1 = doc.createElement('div');
-    anchor1.id = 'anchor1Id';
-    container.appendChild(anchor1);
-
-    const spacer = doc.createElement('div');
-    spacer.style.height = '199px';
-    container.appendChild(spacer);
-
-    const anchor2 = doc.createElement('div');
-    anchor2.id = 'anchor2Id';
-    container.appendChild(anchor2);
-
-    const configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anchor1Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anchor2Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-      ],
-    };
-    const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-    expect(placements).to.have.lengthOf(2);
-
-    const attributes = {
-      'type': 'adsense',
-      'data-custom-att-1': 'val-1',
-      'data-custom-att-2': 'val-2',
-    };
-
-    const sizing = {};
-
-    const adTracker = new AdTracker([], {
-      initialMinSpacing: 200,
-      subsequentMinSpacing: [],
-      maxAdCount: 2,
-    });
-    const adStrategy = new AdStrategy(
-        placements, attributes, sizing, adTracker);
-
-    return adStrategy.run().then(result => {
-      expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 1});
-      expect(anchor1.childNodes).to.have.lengthOf(1);
-      expect(anchor2.childNodes).to.have.lengthOf(0);
-      const adElement = anchor1.childNodes[0];
-      expect(adElement.tagName).to.equal('AMP-AD');
-      expect(adElement.getAttribute('type')).to.equal('adsense');
-      expect(adElement.getAttribute('data-custom-att-1')).to.equal('val-1');
-      expect(adElement.getAttribute('data-custom-att-2')).to.equal('val-2');
-    });
-  });
-
-  it('should place an ad in the first placement and second placement when ' +
-      'sufficiently far apart.', () => {
-    const belowViewportSpacer = doc.createElement('div');
-    belowViewportSpacer.style.height = '1000px';
-    container.appendChild(belowViewportSpacer);
-
-    const anchor1 = doc.createElement('div');
-    anchor1.id = 'anchor1Id';
-    container.appendChild(anchor1);
-
-    const spacer = doc.createElement('div');
-    spacer.style.height = '200px';
-    container.appendChild(spacer);
-
-    const anchor2 = doc.createElement('div');
-    anchor2.id = 'anchor2Id';
-    container.appendChild(anchor2);
-
-    const configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anchor1Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anchor2Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-      ],
-    };
-    const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-    expect(placements).to.have.lengthOf(2);
-
-    const attributes = {
-      'type': 'adsense',
-      'data-custom-att-1': 'val-1',
-      'data-custom-att-2': 'val-2',
-    };
-
-    const sizing = {};
-
-    const adTracker = new AdTracker([], {
-      initialMinSpacing: 200,
-      subsequentMinSpacing: [],
-      maxAdCount: 2,
-    });
-    const adStrategy = new AdStrategy(
-        placements, attributes, sizing, adTracker);
-
-    return adStrategy.run().then(result => {
-      expect(result).to.deep.equal({adsPlaced: 2, totalAdsOnPage: 2});
-      expect(anchor1.childNodes).to.have.lengthOf(1);
-      expect(anchor2.childNodes).to.have.lengthOf(1);
-      const adElement1 = anchor1.childNodes[0];
-      expect(adElement1.tagName).to.equal('AMP-AD');
-      expect(adElement1.getAttribute('type')).to.equal('adsense');
-      expect(adElement1.getAttribute('data-custom-att-1')).to.equal('val-1');
-      expect(adElement1.getAttribute('data-custom-att-2')).to.equal('val-2');
-      const adElement2 = anchor2.childNodes[0];
-      expect(adElement2.tagName).to.equal('AMP-AD');
-      expect(adElement2.getAttribute('type')).to.equal('adsense');
-      expect(adElement2.getAttribute('data-custom-att-1')).to.equal('val-1');
-      expect(adElement2.getAttribute('data-custom-att-2')).to.equal('val-2');
-    });
-  });
-
-  it('should place an ad in the first placement only when already an ad on ' +
-      'the page.', () => {
-    const fakeExistingAd = doc.createElement('div');
-    container.appendChild(fakeExistingAd);
-
-    const belowViewportSpacer = doc.createElement('div');
-    belowViewportSpacer.style.height = '1000px';
-    container.appendChild(belowViewportSpacer);
-
-    const anchor1 = doc.createElement('div');
-    anchor1.id = 'anchor1Id';
-    container.appendChild(anchor1);
-
-    const spacer = doc.createElement('div');
-    spacer.style.height = '200px';
-    container.appendChild(spacer);
-
-    const anchor2 = doc.createElement('div');
-    anchor2.id = 'anchor2Id';
-    container.appendChild(anchor2);
-
-    const configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anchor1Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anchor2Id',
-          },
-          pos: 2,
-          type: 1,
-        },
-      ],
-    };
-    const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-    expect(placements).to.have.lengthOf(2);
-
-    const attributes = {
-      'type': 'adsense',
-      'data-custom-att-1': 'val-1',
-      'data-custom-att-2': 'val-2',
-    };
-
-    const sizing = {};
-
-    const adTracker = new AdTracker([fakeExistingAd], {
-      initialMinSpacing: 200,
-      subsequentMinSpacing: [],
-      maxAdCount: 2,
-    });
-    const adStrategy = new AdStrategy(
-        placements, attributes, sizing, adTracker);
-
-    return adStrategy.run().then(result => {
-      expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 2});
-      expect(anchor1.childNodes).to.have.lengthOf(1);
-      expect(anchor2.childNodes).to.have.lengthOf(0);
-      const adElement1 = anchor1.childNodes[0];
-      expect(adElement1.tagName).to.equal('AMP-AD');
-      expect(adElement1.getAttribute('type')).to.equal('adsense');
-      expect(adElement1.getAttribute('data-custom-att-1')).to.equal('val-1');
-      expect(adElement1.getAttribute('data-custom-att-2')).to.equal('val-2');
-    });
-  });
-
-  it('should report unable to place either ad', () => {
-    const anchor1 = doc.createElement('div');
-    anchor1.id = 'anchor1Id';
-    container.appendChild(anchor1);
-
-    const anchor2 = doc.createElement('div');
-    anchor2.id = 'anchor2Id';
-    container.appendChild(anchor2);
-
-    const configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anchor1Id',
+        const configObj = {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anchor1Id',
+              },
+              pos: 2,
+              type: 1,
+            },
+            {
+              anchor: {
+                selector: 'DIV#anchor2Id',
+              },
+              pos: 2,
+              type: 1,
+            },
+          ],
+        };
+        const placements = getPlacementsFromConfigObj(ampdoc, configObj);
+        expect(placements).to.have.lengthOf(2);
+
+        const attributes = {
+          'type': 'adsense',
+          'data-custom-att-1': 'val-1',
+          'data-custom-att-2': 'val-2',
+        };
+
+        const sizing = {};
+
+        const adTracker = new AdTracker([fakeExistingAd], {
+          initialMinSpacing: 200,
+          subsequentMinSpacing: [],
+          maxAdCount: 2,
+        });
+        const adStrategy = new AdStrategy(
+          placements,
+          attributes,
+          sizing,
+          adTracker
+        );
+
+        return adStrategy.run().then(result => {
+          expect(result).to.deep.equal({adsPlaced: 1, totalAdsOnPage: 2});
+          expect(anchor1.childNodes).to.have.lengthOf(1);
+          expect(anchor2.childNodes).to.have.lengthOf(0);
+          const adElement1 = anchor1.childNodes[0];
+          expect(adElement1.tagName).to.equal('AMP-AD');
+          expect(adElement1.getAttribute('type')).to.equal('adsense');
+          expect(adElement1.getAttribute('data-custom-att-1')).to.equal(
+            'val-1'
+          );
+          expect(adElement1.getAttribute('data-custom-att-2')).to.equal(
+            'val-2'
+          );
+        });
+      }
+    );
+
+    it('should report unable to place either ad', () => {
+      const anchor1 = doc.createElement('div');
+      anchor1.id = 'anchor1Id';
+      container.appendChild(anchor1);
+
+      const anchor2 = doc.createElement('div');
+      anchor2.id = 'anchor2Id';
+      container.appendChild(anchor2);
+
+      const configObj = {
+        placements: [
+          {
+            anchor: {
+              selector: 'DIV#anchor1Id',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anchor2Id',
+          {
+            anchor: {
+              selector: 'DIV#anchor2Id',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-      ],
-    };
-    const placements = getPlacementsFromConfigObj(ampdoc, configObj);
-
-    expect(placements).to.have.lengthOf(2);
-    sandbox.stub(placements[0], 'placeAd').callsFake(() => {
-      return Promise.resolve(PlacementState.REIZE_FAILED);
-    });
-    sandbox.stub(placements[1], 'placeAd').callsFake(() => {
-      return Promise.resolve(PlacementState.REIZE_FAILED);
-    });
+        ],
+      };
+      const placements = getPlacementsFromConfigObj(ampdoc, configObj);
 
-    const attributes = {
-      'type': 'adsense',
-    };
+      expect(placements).to.have.lengthOf(2);
+      sandbox.stub(placements[0], 'placeAd').callsFake(() => {
+        return Promise.resolve(PlacementState.REIZE_FAILED);
+      });
+      sandbox.stub(placements[1], 'placeAd').callsFake(() => {
+        return Promise.resolve(PlacementState.REIZE_FAILED);
+      });
 
-    const sizing = {};
+      const attributes = {
+        'type': 'adsense',
+      };
 
-    const adTracker = new AdTracker([], {
-      initialMinSpacing: 0,
-      subsequentMinSpacing: [],
-      maxAdCount: 1,
-    });
-    const adStrategy = new AdStrategy(
-        placements, attributes, sizing, adTracker);
+      const sizing = {};
 
-    return adStrategy.run().then(result => {
-      expect(result).to.deep.equal({adsPlaced: 0, totalAdsOnPage: 0});
-      expect(anchor1.childNodes).to.have.lengthOf(0);
-      expect(anchor2.childNodes).to.have.lengthOf(0);
+      const adTracker = new AdTracker([], {
+        initialMinSpacing: 0,
+        subsequentMinSpacing: [],
+        maxAdCount: 1,
+      });
+      const adStrategy = new AdStrategy(
+        placements,
+        attributes,
+        sizing,
+        adTracker
+      );
+
+      return adStrategy.run().then(result => {
+        expect(result).to.deep.equal({adsPlaced: 0, totalAdsOnPage: 0});
+        expect(anchor1.childNodes).to.have.lengthOf(0);
+        expect(anchor2.childNodes).to.have.lengthOf(0);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-auto-ads/0.1/test/test-ad-tracker.js b/extensions/amp-auto-ads/0.1/test/test-ad-tracker.js
index 41bd4d357f95..8e49596c6d3f 100644
--- a/extensions/amp-auto-ads/0.1/test/test-ad-tracker.js
+++ b/extensions/amp-auto-ads/0.1/test/test-ad-tracker.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {
   AdTracker,
   getAdConstraintsFromConfigObj,
@@ -23,7 +22,6 @@ import {
 import {Services} from '../../../../src/services';
 import {layoutRectLtwh} from '../../../../src/layout-rect';
 
-
 describes.realWin('ad-tracker', {amp: true}, env => {
   let win, doc;
   let resources;
@@ -69,9 +67,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     expect(adTracker.getAdCount()).to.equal(1);
 
     adTracker.addAd(addAd(layoutRectLtwh(0, 100, 300, 50)));
@@ -85,9 +84,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     return adTracker.isTooNearAnAd(149).then(tooNear => {
       expect(tooNear).to.equal(true);
     });
@@ -100,9 +100,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 100, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 100, 300, 50))],
+      adConstraints
+    );
     return adTracker.isTooNearAnAd(1).then(tooNear => {
       expect(tooNear).to.equal(true);
     });
@@ -115,9 +116,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     return adTracker.isTooNearAnAd(25).then(tooNear => {
       expect(tooNear).to.equal(true);
     });
@@ -130,10 +132,13 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-      addAd(layoutRectLtwh(0, 250, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [
+        addAd(layoutRectLtwh(0, 0, 300, 50)),
+        addAd(layoutRectLtwh(0, 250, 300, 50)),
+      ],
+      adConstraints
+    );
     return adTracker.isTooNearAnAd(150).then(tooNear => {
       expect(tooNear).to.equal(false);
     });
@@ -146,24 +151,24 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     return checkMinSpacing(adTracker, 549, 550);
   });
 
   it('should use a subsequent ad spacing when an existing ad present', () => {
     const adConstraints = {
       initialMinSpacing: 500,
-      subsequentMinSpacing: [
-        {adCount: 1, spacing: 600},
-      ],
+      subsequentMinSpacing: [{adCount: 1, spacing: 600}],
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     return checkMinSpacing(adTracker, 649, 650);
   });
 
@@ -177,10 +182,13 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [
+        addAd(layoutRectLtwh(0, 0, 300, 50)),
+        addAd(layoutRectLtwh(0, 0, 300, 50)),
+      ],
+      adConstraints
+    );
     return checkMinSpacing(adTracker, 749, 750);
   });
 
@@ -195,9 +203,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     return checkMinSpacing(adTracker, 649, 650).then(() => {
       adTracker.addAd(addAd(layoutRectLtwh(0, 0, 300, 50)));
       return checkMinSpacing(adTracker, 649, 650).then(() => {
@@ -217,9 +226,10 @@ describes.realWin('ad-tracker', {amp: true}, env => {
       maxAdCount: 10,
     };
 
-    const adTracker = new AdTracker([
-      addAd(layoutRectLtwh(0, 0, 300, 50)),
-    ], adConstraints);
+    const adTracker = new AdTracker(
+      [addAd(layoutRectLtwh(0, 0, 300, 50))],
+      adConstraints
+    );
     adTracker.addAd(addAd(layoutRectLtwh(0, 100, 300, 50)));
     return adTracker.isTooNearAnAd(150).then(tooNear => {
       expect(tooNear).to.equal(true);
@@ -227,7 +237,6 @@ describes.realWin('ad-tracker', {amp: true}, env => {
   });
 });
 
-
 describes.realWin('getExistingAds', {amp: true}, env => {
   let win;
   let doc;
@@ -258,7 +267,6 @@ describes.realWin('getExistingAds', {amp: true}, env => {
   });
 });
 
-
 describes.realWin('getAdConstraintsFromConfigObj', {amp: true}, env => {
   let ampdoc;
 
@@ -302,7 +310,10 @@ describes.realWin('getAdConstraintsFromConfigObj', {amp: true}, env => {
 
   it('should get from viewport values', () => {
     const viewportMock = sandbox.mock(Services.viewportForDoc(ampdoc));
-    viewportMock.expects('getHeight').returns(500).atLeast(1);
+    viewportMock
+      .expects('getHeight')
+      .returns(500)
+      .atLeast(1);
 
     const configObj = {
       adConstraints: {
diff --git a/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js b/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
index 65061e13f0c1..6a5aefa2183b 100644
--- a/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
+++ b/extensions/amp-auto-ads/0.1/test/test-amp-auto-ads.js
@@ -17,403 +17,448 @@
 import '../../../amp-ad/0.1/amp-ad';
 import '../amp-auto-ads';
 import {Services} from '../../../../src/services';
-import {
-  toggleExperiment,
-} from '../../../../src/experiments';
+import {toggleExperiment} from '../../../../src/experiments';
 import {waitForChild} from '../../../../src/dom';
 
-describes.realWin('amp-auto-ads', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-ad', 'amp-auto-ads'],
+describes.realWin(
+  'amp-auto-ads',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-ad', 'amp-auto-ads'],
+    },
   },
-}, env => {
-
-  const OPT_IN_STATUS_ANCHOR_ADS = 2;
-
-  let win;
-  let doc;
-  let sandbox;
-  let container;
-  let anchor1;
-  let anchor2;
-  let anchor3;
-  let anchor4;
-  let xhr;
-  let whenVisible;
-  let configObj;
-
-  beforeEach(() => {
-
-    win = env.win;
-    doc = win.document;
-    sandbox = env.sandbox;
-
-    toggleExperiment(win, 'amp-auto-ads', true);
-
-    // There seem to be a lot of tests that don't clean up after themselves,
-    // meaning there are a lot of <AMP-AD>s left over in the DOM.
-    // An alternative to doing this clean up would be for this test to do all
-    // its DOM stuff in a dedicated window, but trying that seems to result in a
-    // lot of errors.
-    const ampAds = doc.getElementsByTagName('AMP-AD');
-    while (ampAds.length) {
-      ampAds[0].parentNode.removeChild(ampAds[0]);
-    }
-
-    const extensions = Services.extensionsFor(win);
-    sandbox.stub(extensions, 'loadElementClass').callsFake(
-        () => Promise.resolve(() => {}));
-
-    const viewportMock =
-        sandbox.mock(Services.viewportForDoc(doc));
-    viewportMock.expects('getSize').returns(
-        {width: 320, height: 500}).atLeast(1);
-
-    container = doc.createElement('div');
-    doc.body.appendChild(container);
-
-    anchor1 = doc.createElement('div');
-    anchor1.id = 'anId1';
-    container.appendChild(anchor1);
-
-    const spacer = doc.createElement('div');
-    spacer.style.height = '1000px';
-    container.appendChild(spacer);
+  env => {
+    const OPT_IN_STATUS_ANCHOR_ADS = 2;
+
+    let win;
+    let doc;
+    let sandbox;
+    let container;
+    let anchor1;
+    let anchor2;
+    let anchor3;
+    let anchor4;
+    let xhr;
+    let whenVisible;
+    let configObj;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      sandbox = env.sandbox;
+
+      toggleExperiment(win, 'amp-auto-ads', true);
+
+      // There seem to be a lot of tests that don't clean up after themselves,
+      // meaning there are a lot of <AMP-AD>s left over in the DOM.
+      // An alternative to doing this clean up would be for this test to do all
+      // its DOM stuff in a dedicated window, but trying that seems to result in a
+      // lot of errors.
+      const ampAds = doc.getElementsByTagName('AMP-AD');
+      while (ampAds.length) {
+        ampAds[0].parentNode.removeChild(ampAds[0]);
+      }
+
+      const extensions = Services.extensionsFor(win);
+      sandbox
+        .stub(extensions, 'loadElementClass')
+        .callsFake(() => Promise.resolve(() => {}));
+
+      const viewportMock = sandbox.mock(Services.viewportForDoc(doc));
+      viewportMock
+        .expects('getSize')
+        .returns({width: 320, height: 500})
+        .atLeast(1);
+
+      container = doc.createElement('div');
+      doc.body.appendChild(container);
+
+      anchor1 = doc.createElement('div');
+      anchor1.id = 'anId1';
+      container.appendChild(anchor1);
+
+      const spacer = doc.createElement('div');
+      spacer.style.height = '1000px';
+      container.appendChild(spacer);
+
+      anchor2 = doc.createElement('div');
+      anchor2.id = 'anId2';
+      container.appendChild(anchor2);
+
+      const spacer2 = doc.createElement('div');
+      spacer2.style.height = '499px';
+      container.appendChild(spacer2);
+
+      anchor3 = doc.createElement('div');
+      anchor3.id = 'anId3';
+      container.appendChild(anchor3);
+
+      const spacer3 = doc.createElement('div');
+      spacer3.style.height = '500px';
+      container.appendChild(spacer3);
+
+      anchor4 = doc.createElement('div');
+      anchor4.id = 'anId4';
+      container.appendChild(anchor4);
 
-    anchor2 = doc.createElement('div');
-    anchor2.id = 'anId2';
-    container.appendChild(anchor2);
-
-    const spacer2 = doc.createElement('div');
-    spacer2.style.height = '499px';
-    container.appendChild(spacer2);
-
-    anchor3 = doc.createElement('div');
-    anchor3.id = 'anId3';
-    container.appendChild(anchor3);
-
-    const spacer3 = doc.createElement('div');
-    spacer3.style.height = '500px';
-    container.appendChild(spacer3);
-
-    anchor4 = doc.createElement('div');
-    anchor4.id = 'anId4';
-    container.appendChild(anchor4);
-
-    configObj = {
-      placements: [
-        {
-          anchor: {
-            selector: 'DIV#anId1',
+      configObj = {
+        placements: [
+          {
+            anchor: {
+              selector: 'DIV#anId1',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anId2',
+          {
+            anchor: {
+              selector: 'DIV#anId2',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anId3',
+          {
+            anchor: {
+              selector: 'DIV#anId3',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-        {
-          anchor: {
-            selector: 'DIV#anId4',
+          {
+            anchor: {
+              selector: 'DIV#anId4',
+            },
+            pos: 2,
+            type: 1,
           },
-          pos: 2,
-          type: 1,
-        },
-      ],
-      optInStatus: [1],
-    };
-
-    xhr = Services.xhrFor(win);
-    xhr.fetchJson = () => {
-      return Promise.resolve({
-        json() {
-          return Promise.resolve(configObj);
-        },
+        ],
+        optInStatus: [1],
+      };
+
+      xhr = Services.xhrFor(win);
+      xhr.fetchJson = () => {
+        return Promise.resolve({
+          json() {
+            return Promise.resolve(configObj);
+          },
+        });
+      };
+      sandbox.spy(xhr, 'fetchJson');
+
+      const viewer = Services.viewerForDoc(env.ampdoc);
+      whenVisible = sandbox.stub(viewer, 'whenFirstVisible');
+      whenVisible.returns(Promise.resolve());
+    });
+
+    function getAmpAutoAds(type) {
+      const ampAutoAds = doc.createElement('amp-auto-ads');
+      if (type !== 'NONE') {
+        ampAutoAds.setAttribute('type', type || '_ping_');
+      }
+      doc.body.appendChild(ampAutoAds);
+      return ampAutoAds.build().then(() => {
+        return ampAutoAds.layoutCallback();
       });
-    };
-    sandbox.spy(xhr, 'fetchJson');
-
-    const viewer = Services.viewerForDoc(env.ampdoc);
-    whenVisible = sandbox.stub(viewer, 'whenFirstVisible');
-    whenVisible.returns(Promise.resolve());
-  });
-
-  function getAmpAutoAds(type) {
-    const ampAutoAds = doc.createElement('amp-auto-ads');
-    if (type !== 'NONE') {
-      ampAutoAds.setAttribute('type', type || '_ping_');
     }
-    doc.body.appendChild(ampAutoAds);
-    return ampAutoAds.build().then(() => {
-      return ampAutoAds.layoutCallback();
-    });
-  }
 
-  function verifyAdElement(adElement) {
-    expect(adElement.tagName).to.equal('AMP-AD');
-    expect(adElement.getAttribute('type')).to.equal('_ping_');
-  }
+    function verifyAdElement(adElement) {
+      expect(adElement.tagName).to.equal('AMP-AD');
+      expect(adElement.getAttribute('type')).to.equal('_ping_');
+    }
 
-  it('should wait for viewer visible', () => {
+    it('should wait for viewer visible', () => {
+      let resolve;
+      const visible = new Promise(res => {
+        resolve = res;
+      });
+      whenVisible.returns(visible);
 
-    let resolve;
-    const visible = new Promise(res => {
-      resolve = res;
-    });
-    whenVisible.returns(visible);
-
-    return getAmpAutoAds().then(() => {
-      return Promise.resolve().then(() => {
-        expect(xhr.fetchJson).to.not.have.been.called;
-        resolve();
-        return visible;
-      }).then(() => {
-        expect(xhr.fetchJson).to.have.been.called;
+      return getAmpAutoAds().then(() => {
+        return Promise.resolve()
+          .then(() => {
+            expect(xhr.fetchJson).to.not.have.been.called;
+            resolve();
+            return visible;
+          })
+          .then(() => {
+            expect(xhr.fetchJson).to.have.been.called;
+          });
       });
     });
-  });
-
-  it('should insert three ads on page using config', () => {
-
-    return getAmpAutoAds().then(() => {
-      return new Promise(resolve => {
-        waitForChild(anchor4, parent => {
-          return parent.childNodes.length > 0;
-        }, () => {
-          expect(anchor1.childNodes).to.have.lengthOf(1);
-          expect(anchor2.childNodes).to.have.lengthOf(1);
-          expect(anchor3.childNodes).to.have.lengthOf(0);
-          expect(anchor4.childNodes).to.have.lengthOf(1);
-          verifyAdElement(anchor1.childNodes[0]);
-          verifyAdElement(anchor2.childNodes[0]);
-          verifyAdElement(anchor4.childNodes[0]);
-          resolve();
+
+    it('should insert three ads on page using config', () => {
+      return getAmpAutoAds().then(() => {
+        return new Promise(resolve => {
+          waitForChild(
+            anchor4,
+            parent => {
+              return parent.childNodes.length > 0;
+            },
+            () => {
+              expect(anchor1.childNodes).to.have.lengthOf(1);
+              expect(anchor2.childNodes).to.have.lengthOf(1);
+              expect(anchor3.childNodes).to.have.lengthOf(0);
+              expect(anchor4.childNodes).to.have.lengthOf(1);
+              verifyAdElement(anchor1.childNodes[0]);
+              verifyAdElement(anchor2.childNodes[0]);
+              verifyAdElement(anchor4.childNodes[0]);
+              resolve();
+            }
+          );
         });
       });
     });
-  });
-
-  it('should insert ads with the config provided attributes', () => {
-    configObj.attributes = {
-      'bad-name': 'should be filtered',
-      'data-custom-att-1': 'val-1',
-      'data-custom-att-2': 'val-2',
-    };
-
-    return getAmpAutoAds().then(() => {
-      return new Promise(resolve => {
-        waitForChild(anchor4, parent => {
-          return parent.childNodes.length > 0;
-        }, () => {
-          expect(anchor1.childNodes).to.have.lengthOf(1);
-          expect(anchor1.childNodes[0].getAttribute('data-custom-att-1'))
-              .to.equal('val-1');
-          expect(anchor1.childNodes[0].getAttribute('data-custom-att-2'))
-              .to.equal('val-2');
-
-          expect(anchor2.childNodes).to.have.lengthOf(1);
-          expect(anchor2.childNodes[0].getAttribute('data-custom-att-1'))
-              .to.equal('val-1');
-          expect(anchor2.childNodes[0].getAttribute('data-custom-att-2'))
-              .to.equal('val-2');
-
-          expect(anchor4.childNodes).to.have.lengthOf(1);
-          expect(anchor4.childNodes[0].getAttribute('data-custom-att-1'))
-              .to.equal('val-1');
-          expect(anchor4.childNodes[0].getAttribute('data-custom-att-2'))
-              .to.equal('val-2');
-          resolve();
+
+    it('should insert ads with the config provided attributes', () => {
+      configObj.attributes = {
+        'bad-name': 'should be filtered',
+        'data-custom-att-1': 'val-1',
+        'data-custom-att-2': 'val-2',
+      };
+
+      return getAmpAutoAds().then(() => {
+        return new Promise(resolve => {
+          waitForChild(
+            anchor4,
+            parent => {
+              return parent.childNodes.length > 0;
+            },
+            () => {
+              expect(anchor1.childNodes).to.have.lengthOf(1);
+              expect(
+                anchor1.childNodes[0].getAttribute('data-custom-att-1')
+              ).to.equal('val-1');
+              expect(
+                anchor1.childNodes[0].getAttribute('data-custom-att-2')
+              ).to.equal('val-2');
+
+              expect(anchor2.childNodes).to.have.lengthOf(1);
+              expect(
+                anchor2.childNodes[0].getAttribute('data-custom-att-1')
+              ).to.equal('val-1');
+              expect(
+                anchor2.childNodes[0].getAttribute('data-custom-att-2')
+              ).to.equal('val-2');
+
+              expect(anchor4.childNodes).to.have.lengthOf(1);
+              expect(
+                anchor4.childNodes[0].getAttribute('data-custom-att-1')
+              ).to.equal('val-1');
+              expect(
+                anchor4.childNodes[0].getAttribute('data-custom-att-2')
+              ).to.equal('val-2');
+              resolve();
+            }
+          );
         });
       });
     });
-  });
 
-  it('should override ad network type with config provided attribute',
-      () => {
-        configObj.attributes = {
-          'type': '_ping_',
-        };
+    it('should override ad network type with config provided attribute', () => {
+      configObj.attributes = {
+        'type': '_ping_',
+      };
 
-        return getAmpAutoAds('doubleclick').then(() => {
-          return new Promise(resolve => {
-            waitForChild(anchor4, parent => {
+      return getAmpAutoAds('doubleclick').then(() => {
+        return new Promise(resolve => {
+          waitForChild(
+            anchor4,
+            parent => {
               return parent.childNodes.length > 0;
-            }, () => {
+            },
+            () => {
               expect(anchor1.childNodes).to.have.lengthOf(1);
-              expect(anchor1.childNodes[0].getAttribute('type'))
-                  .to.equal('_ping_');
+              expect(anchor1.childNodes[0].getAttribute('type')).to.equal(
+                '_ping_'
+              );
 
               expect(anchor2.childNodes).to.have.lengthOf(1);
-              expect(anchor2.childNodes[0].getAttribute('type'))
-                  .to.equal('_ping_');
+              expect(anchor2.childNodes[0].getAttribute('type')).to.equal(
+                '_ping_'
+              );
 
               expect(anchor4.childNodes).to.have.lengthOf(1);
-              expect(anchor4.childNodes[0].getAttribute('type'))
-                  .to.equal('_ping_');
+              expect(anchor4.childNodes[0].getAttribute('type')).to.equal(
+                '_ping_'
+              );
               resolve();
-            });
-          });
+            }
+          );
         });
       });
+    });
 
-  it('should fetch a config from the correct URL', () => {
-    return getAmpAutoAds().then(() => {
-      expect(xhr.fetchJson).to.have.been.calledWith(
+    it('should fetch a config from the correct URL', () => {
+      return getAmpAutoAds().then(() => {
+        expect(xhr.fetchJson).to.have.been.calledWith(
           '//lh3.googleusercontent.com/' +
-        'pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n', {
+            'pSECrJ82R7-AqeBCOEPGPM9iG9OEIQ_QXcbubWIOdkY=w400-h300-no-n',
+          {
             mode: 'cors',
             method: 'GET',
             credentials: 'omit',
             requireAmpResponseSourceOrigin: false,
-          });
-      expect(xhr.fetchJson).to.be.calledOnce;
-    });
-  });
-
-  it('should throw an error if no type', () => {
-    return allowConsoleError(() => {
-      return getAmpAutoAds('NONE').catch(err => {
-        expect(err.message).to.include('Missing type attribute');
-        expect(xhr.fetchJson).not.to.have.been.called;
+          }
+        );
+        expect(xhr.fetchJson).to.be.calledOnce;
       });
     });
-  });
 
-  it('should not try and fetch config if unknown type', () => {
-    return allowConsoleError(() => {
-      return getAmpAutoAds('unknowntype').catch(err => {
-        expect(err.message).to.include('No AdNetworkConfig for type');
-        expect(xhr.fetchJson).not.to.have.been.called;
+    it('should throw an error if no type', () => {
+      return allowConsoleError(() => {
+        return getAmpAutoAds('NONE').catch(err => {
+          expect(err.message).to.include('Missing type attribute');
+          expect(xhr.fetchJson).not.to.have.been.called;
+        });
       });
     });
-  });
-
-  it('should not try and fetch config if experiment off', () => {
-    return allowConsoleError(() => {
-      toggleExperiment(env.win, 'amp-auto-ads', false);
-      return getAmpAutoAds().catch(err => {
-        expect(err.message).to.include('Experiment is off');
-        expect(xhr.fetchJson).not.to.have.been.called;
+
+    it('should not try and fetch config if unknown type', () => {
+      return allowConsoleError(() => {
+        return getAmpAutoAds('unknowntype').catch(err => {
+          expect(err.message).to.include('No AdNetworkConfig for type');
+          expect(xhr.fetchJson).not.to.have.been.called;
+        });
       });
     });
-  });
 
-  describe('Anchor Ad', () => {
-    it('should not insert anchor ad if not opted in', () => {
-      return getAmpAutoAds().then(() => {
-        return new Promise(resolve => {
-          setTimeout(() => {
-            expect(env.win.document.getElementsByTagName('AMP-STICKY-AD'))
-                .to.have.lengthOf(0);
-            resolve();
-          }, 500);
+    it('should not try and fetch config if experiment off', () => {
+      return allowConsoleError(() => {
+        toggleExperiment(env.win, 'amp-auto-ads', false);
+        return getAmpAutoAds().catch(err => {
+          expect(err.message).to.include('Experiment is off');
+          expect(xhr.fetchJson).not.to.have.been.called;
         });
       });
     });
 
-    it('should insert three ads plus anchor ad', () => {
-      configObj['optInStatus'].push(OPT_IN_STATUS_ANCHOR_ADS);
-
-      return getAmpAutoAds().then(() => {
-        const bannerAdsPromise = new Promise(resolve => {
-          waitForChild(anchor4, parent => {
-            return parent.childNodes.length > 0;
-          }, () => {
-            expect(anchor1.childNodes).to.have.lengthOf(1);
-            expect(anchor2.childNodes).to.have.lengthOf(1);
-            expect(anchor3.childNodes).to.have.lengthOf(0);
-            expect(anchor4.childNodes).to.have.lengthOf(1);
-            verifyAdElement(anchor1.childNodes[0]);
-            verifyAdElement(anchor2.childNodes[0]);
-            verifyAdElement(anchor4.childNodes[0]);
-            resolve();
+    describe('Anchor Ad', () => {
+      it('should not insert anchor ad if not opted in', () => {
+        return getAmpAutoAds().then(() => {
+          return new Promise(resolve => {
+            setTimeout(() => {
+              expect(
+                env.win.document.getElementsByTagName('AMP-STICKY-AD')
+              ).to.have.lengthOf(0);
+              resolve();
+            }, 500);
           });
         });
+      });
 
-        const anchorAdPromise = new Promise(resolve => {
-          waitForChild(env.win.document.body, parent => {
-            return parent.firstChild.tagName == 'AMP-STICKY-AD';
-          }, () => {
-            resolve();
+      it('should insert three ads plus anchor ad', () => {
+        configObj['optInStatus'].push(OPT_IN_STATUS_ANCHOR_ADS);
+
+        return getAmpAutoAds().then(() => {
+          const bannerAdsPromise = new Promise(resolve => {
+            waitForChild(
+              anchor4,
+              parent => {
+                return parent.childNodes.length > 0;
+              },
+              () => {
+                expect(anchor1.childNodes).to.have.lengthOf(1);
+                expect(anchor2.childNodes).to.have.lengthOf(1);
+                expect(anchor3.childNodes).to.have.lengthOf(0);
+                expect(anchor4.childNodes).to.have.lengthOf(1);
+                verifyAdElement(anchor1.childNodes[0]);
+                verifyAdElement(anchor2.childNodes[0]);
+                verifyAdElement(anchor4.childNodes[0]);
+                resolve();
+              }
+            );
+          });
+
+          const anchorAdPromise = new Promise(resolve => {
+            waitForChild(
+              env.win.document.body,
+              parent => {
+                return parent.firstChild.tagName == 'AMP-STICKY-AD';
+              },
+              () => {
+                resolve();
+              }
+            );
           });
-        });
 
-        return Promise.all([bannerAdsPromise, anchorAdPromise]);
+          return Promise.all([bannerAdsPromise, anchorAdPromise]);
+        });
       });
-    });
 
-    it('should insert anchor anchor ad only', () => {
-      configObj = {
-        optInStatus: [2],
-      };
+      it('should insert anchor anchor ad only', () => {
+        configObj = {
+          optInStatus: [2],
+        };
 
-      return getAmpAutoAds().then(() => {
-        return new Promise(resolve => {
-          waitForChild(env.win.document.body, parent => {
-            return parent.firstChild.tagName == 'AMP-STICKY-AD';
-          }, () => {
-            resolve();
+        return getAmpAutoAds().then(() => {
+          return new Promise(resolve => {
+            waitForChild(
+              env.win.document.body,
+              parent => {
+                return parent.firstChild.tagName == 'AMP-STICKY-AD';
+              },
+              () => {
+                resolve();
+              }
+            );
           });
         });
       });
     });
-  });
 
-  describe('ad constraints', () => {
-    it('should insert 3 ads when using the default ad contraints', () => {
-      return getAmpAutoAds().then(() => {
-        return new Promise(resolve => {
-          waitForChild(anchor4, parent => {
-            return parent.childNodes.length > 0;
-          }, () => {
-            expect(anchor1.childNodes).to.have.lengthOf(1);
-            expect(anchor2.childNodes).to.have.lengthOf(1);
-            expect(anchor3.childNodes).to.have.lengthOf(0);
-            expect(anchor4.childNodes).to.have.lengthOf(1);
-            verifyAdElement(anchor1.childNodes[0]);
-            verifyAdElement(anchor2.childNodes[0]);
-            verifyAdElement(anchor4.childNodes[0]);
-            resolve();
+    describe('ad constraints', () => {
+      it('should insert 3 ads when using the default ad contraints', () => {
+        return getAmpAutoAds().then(() => {
+          return new Promise(resolve => {
+            waitForChild(
+              anchor4,
+              parent => {
+                return parent.childNodes.length > 0;
+              },
+              () => {
+                expect(anchor1.childNodes).to.have.lengthOf(1);
+                expect(anchor2.childNodes).to.have.lengthOf(1);
+                expect(anchor3.childNodes).to.have.lengthOf(0);
+                expect(anchor4.childNodes).to.have.lengthOf(1);
+                verifyAdElement(anchor1.childNodes[0]);
+                verifyAdElement(anchor2.childNodes[0]);
+                verifyAdElement(anchor4.childNodes[0]);
+                resolve();
+              }
+            );
           });
         });
       });
-    });
 
-    it('should insert 4 ads when using the config ad constraints', () => {
-      configObj.adConstraints = {
-        initialMinSpacing: '499px',
-        maxAdCount: 8,
-      };
+      it('should insert 4 ads when using the config ad constraints', () => {
+        configObj.adConstraints = {
+          initialMinSpacing: '499px',
+          maxAdCount: 8,
+        };
 
-      return getAmpAutoAds().then(() => {
-        return new Promise(resolve => {
-          waitForChild(anchor4, parent => {
-            return parent.childNodes.length > 0;
-          }, () => {
-            expect(anchor1.childNodes).to.have.lengthOf(1);
-            expect(anchor2.childNodes).to.have.lengthOf(1);
-            expect(anchor3.childNodes).to.have.lengthOf(1);
-            expect(anchor4.childNodes).to.have.lengthOf(1);
-            verifyAdElement(anchor1.childNodes[0]);
-            verifyAdElement(anchor2.childNodes[0]);
-            verifyAdElement(anchor3.childNodes[0]);
-            verifyAdElement(anchor4.childNodes[0]);
-            resolve();
+        return getAmpAutoAds().then(() => {
+          return new Promise(resolve => {
+            waitForChild(
+              anchor4,
+              parent => {
+                return parent.childNodes.length > 0;
+              },
+              () => {
+                expect(anchor1.childNodes).to.have.lengthOf(1);
+                expect(anchor2.childNodes).to.have.lengthOf(1);
+                expect(anchor3.childNodes).to.have.lengthOf(1);
+                expect(anchor4.childNodes).to.have.lengthOf(1);
+                verifyAdElement(anchor1.childNodes[0]);
+                verifyAdElement(anchor2.childNodes[0]);
+                verifyAdElement(anchor3.childNodes[0]);
+                verifyAdElement(anchor4.childNodes[0]);
+                resolve();
+              }
+            );
           });
         });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js b/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
index 282754ce464a..2c677b0aca77 100644
--- a/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
+++ b/extensions/amp-auto-ads/0.1/test/test-anchor-ad-strategy.js
@@ -19,102 +19,128 @@ import {AnchorAdStrategy} from '../anchor-ad-strategy';
 import {Services} from '../../../../src/services';
 import {waitForChild} from '../../../../src/dom';
 
-
-describes.realWin('anchor-ad-strategy', {
-  amp: {
-    runtimeOn: true,
-    ampdoc: 'single',
-    extensions: ['amp-ad'],
+describes.realWin(
+  'anchor-ad-strategy',
+  {
+    amp: {
+      runtimeOn: true,
+      ampdoc: 'single',
+      extensions: ['amp-ad'],
+    },
   },
-}, env => {
-  let configObj;
-  let attributes;
-
-  beforeEach(() => {
-    const viewportMock =
-        sandbox.mock(Services.viewportForDoc(env.win.document));
-    viewportMock.expects('getWidth').returns(360).atLeast(1);
-
-    configObj = {
-      optInStatus: [1],
-    };
-
-    attributes = {
-      'data-ad-client': 'ca-pub-test',
-      'type': 'adsense',
-    };
-  });
-
-  describe('run', () => {
-    it('should insert sticky ad if opted in', () => {
-      configObj['optInStatus'].push(2);
-
-      const anchorAdStrategy = new AnchorAdStrategy(
-          env.ampdoc, attributes, configObj);
-
-      const strategyPromise = anchorAdStrategy.run().then(placed => {
-        expect(placed).to.equal(true);
-      });
+  env => {
+    let configObj;
+    let attributes;
+
+    beforeEach(() => {
+      const viewportMock = sandbox.mock(
+        Services.viewportForDoc(env.win.document)
+      );
+      viewportMock
+        .expects('getWidth')
+        .returns(360)
+        .atLeast(1);
+
+      configObj = {
+        optInStatus: [1],
+      };
+
+      attributes = {
+        'data-ad-client': 'ca-pub-test',
+        'type': 'adsense',
+      };
+    });
+
+    describe('run', () => {
+      it('should insert sticky ad if opted in', () => {
+        configObj['optInStatus'].push(2);
+
+        const anchorAdStrategy = new AnchorAdStrategy(
+          env.ampdoc,
+          attributes,
+          configObj
+        );
 
-      const expectPromise = new Promise(resolve => {
-        waitForChild(env.win.document.body, parent => {
-          return parent.firstChild.tagName == 'AMP-STICKY-AD';
-        }, () => {
-          const stickyAd = env.win.document.body.firstChild;
-          expect(stickyAd.getAttribute('layout')).to.equal('nodisplay');
-          const ampAd = stickyAd.firstChild;
-          expect(ampAd.getAttribute('type')).to.equal('adsense');
-          expect(ampAd.getAttribute('width')).to.equal('360');
-          expect(ampAd.getAttribute('height')).to.equal('100');
-          expect(ampAd.getAttribute('data-ad-client')).to.equal('ca-pub-test');
-          resolve();
+        const strategyPromise = anchorAdStrategy.run().then(placed => {
+          expect(placed).to.equal(true);
         });
+
+        const expectPromise = new Promise(resolve => {
+          waitForChild(
+            env.win.document.body,
+            parent => {
+              return parent.firstChild.tagName == 'AMP-STICKY-AD';
+            },
+            () => {
+              const stickyAd = env.win.document.body.firstChild;
+              expect(stickyAd.getAttribute('layout')).to.equal('nodisplay');
+              const ampAd = stickyAd.firstChild;
+              expect(ampAd.getAttribute('type')).to.equal('adsense');
+              expect(ampAd.getAttribute('width')).to.equal('360');
+              expect(ampAd.getAttribute('height')).to.equal('100');
+              expect(ampAd.getAttribute('data-ad-client')).to.equal(
+                'ca-pub-test'
+              );
+              resolve();
+            }
+          );
+        });
+
+        return Promise.all([strategyPromise, expectPromise]);
       });
 
-      return Promise.all([strategyPromise, expectPromise]);
-    });
+      it('should not insert sticky ad if not opted in', () => {
+        const anchorAdStrategy = new AnchorAdStrategy(
+          env.ampdoc,
+          attributes,
+          configObj
+        );
 
-    it('should not insert sticky ad if not opted in', () => {
-      const anchorAdStrategy = new AnchorAdStrategy(
-          env.ampdoc, attributes, configObj);
+        const strategyPromise = anchorAdStrategy.run().then(placed => {
+          expect(placed).to.equal(false);
+        });
 
-      const strategyPromise = anchorAdStrategy.run().then(placed => {
-        expect(placed).to.equal(false);
-      });
+        const expectPromise = new Promise(resolve => {
+          setTimeout(() => {
+            expect(
+              env.win.document.getElementsByTagName('AMP-STICKY-AD')
+            ).to.have.lengthOf(0);
+            resolve();
+          }, 500);
+        });
 
-      const expectPromise = new Promise(resolve => {
-        setTimeout(() => {
-          expect(env.win.document.getElementsByTagName('AMP-STICKY-AD'))
-              .to.have.lengthOf(0);
-          resolve();
-        }, 500);
+        return Promise.all([strategyPromise, expectPromise]);
       });
 
-      return Promise.all([strategyPromise, expectPromise]);
-    });
+      it('should not insert sticky ad if exists one', () => {
+        configObj['optInStatus'].push(2);
 
-    it('should not insert sticky ad if exists one', () => {
-      configObj['optInStatus'].push(2);
+        const existingStickyAd = env.win.document.createElement(
+          'amp-sticky-ad'
+        );
+        env.win.document.body.appendChild(existingStickyAd);
 
-      const existingStickyAd = env.win.document.createElement('amp-sticky-ad');
-      env.win.document.body.appendChild(existingStickyAd);
+        const anchorAdStrategy = new AnchorAdStrategy(
+          env.ampdoc,
+          attributes,
+          configObj
+        );
 
-      const anchorAdStrategy = new AnchorAdStrategy(
-          env.ampdoc, attributes, configObj);
+        const strategyPromise = anchorAdStrategy.run().then(placed => {
+          expect(placed).to.equal(false);
+        });
 
-      const strategyPromise = anchorAdStrategy.run().then(placed => {
-        expect(placed).to.equal(false);
-      });
+        const expectPromise = new Promise(resolve => {
+          setTimeout(() => {
+            expect(
+              env.win.document.getElementsByTagName('AMP-STICKY-AD')
+            ).to.have.lengthOf(1);
+            resolve();
+          }, 500);
+        });
 
-      const expectPromise = new Promise(resolve => {
-        setTimeout(() => {
-          expect(env.win.document.getElementsByTagName('AMP-STICKY-AD'))
-              .to.have.lengthOf(1);
-          resolve();
-        }, 500);
+        return Promise.all([strategyPromise, expectPromise]);
       });
-
-      return Promise.all([strategyPromise, expectPromise]);
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-auto-ads/0.1/test/test-attributes.js b/extensions/amp-auto-ads/0.1/test/test-attributes.js
index 4a3a8feca3a4..c242038f4861 100644
--- a/extensions/amp-auto-ads/0.1/test/test-attributes.js
+++ b/extensions/amp-auto-ads/0.1/test/test-attributes.js
@@ -17,13 +17,9 @@
 import {getAttributesFromConfigObj} from '../attributes';
 
 describe('attributes', () => {
-
   it('should ignore attributes field if an array', () => {
     const configObj = {
-      attributes: [
-        'val1',
-        'val2',
-      ],
+      attributes: ['val1', 'val2'],
     };
 
     expect(getAttributesFromConfigObj(configObj)).to.deep.equal({});
diff --git a/extensions/amp-auto-ads/0.1/test/test-placement.js b/extensions/amp-auto-ads/0.1/test/test-placement.js
index 6b97bf74cd68..8938562e4d6a 100644
--- a/extensions/amp-auto-ads/0.1/test/test-placement.js
+++ b/extensions/amp-auto-ads/0.1/test/test-placement.js
@@ -19,279 +19,286 @@ import {AdTracker} from '../ad-tracker';
 import {PlacementState, getPlacementsFromConfigObj} from '../placement';
 import {Services} from '../../../../src/services';
 
-describes.realWin('placement', {
-  amp: {
-    runtimeOn: true,
-    ampdoc: 'single',
-    extensions: ['amp-ad'],
+describes.realWin(
+  'placement',
+  {
+    amp: {
+      runtimeOn: true,
+      ampdoc: 'single',
+      extensions: ['amp-ad'],
+    },
   },
-}, env => {
-  let win, doc, ampdoc;
-  let container;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    env.iframe.style.height = '1000px';
-
-    const belowFoldSpacer = doc.createElement('div');
-    belowFoldSpacer.style.height = '1000px';
-    doc.body.appendChild(belowFoldSpacer);
-
-    container = doc.createElement('div');
-    doc.body.appendChild(container);
-  });
-
-  describe('getAdElement', () => {
-    it('should get ad Element when ad placed', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+  env => {
+    let win, doc, ampdoc;
+    let container;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      env.iframe.style.height = '1000px';
+
+      const belowFoldSpacer = doc.createElement('div');
+      belowFoldSpacer.style.height = '1000px';
+      doc.body.appendChild(belowFoldSpacer);
+
+      container = doc.createElement('div');
+      doc.body.appendChild(container);
+    });
+
+    describe('getAdElement', () => {
+      it('should get ad Element when ad placed', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
 
-      const result = placements[0].placeAd(attributes, sizing, adTracker);
-      env.flushVsync();
-      return result.then(() => {
-        expect(placements[0].getAdElement()).to.equal(anchor.childNodes[0]);
+        const result = placements[0].placeAd(attributes, sizing, adTracker);
+        env.flushVsync();
+        return result.then(() => {
+          expect(placements[0].getAdElement()).to.equal(anchor.childNodes[0]);
+        });
       });
-    });
 
-    it('should throw an error if ad not placed', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should throw an error if ad not placed', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      allowConsoleError(() => {
-        expect(() => placements[0].getAdElement()).to.throw(/No ad element/);
+        allowConsoleError(() => {
+          expect(() => placements[0].getAdElement()).to.throw(/No ad element/);
+        });
       });
     });
-  });
-
-  describe('getEstimatedPosition', () => {
-    it('should estimate the position when before anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.style.position = 'absolute';
-      anchor.style.top = '15px';
-      anchor.style.height = '100px';
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+
+    describe('getEstimatedPosition', () => {
+      it('should estimate the position when before anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.style.position = 'absolute';
+        anchor.style.top = '15px';
+        anchor.style.height = '100px';
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      return placements[0].getEstimatedPosition(yPosition => {
-        expect(yPosition).to.equal(15);
+        return placements[0].getEstimatedPosition(yPosition => {
+          expect(yPosition).to.equal(15);
+        });
       });
-    });
 
-    it('should estimate the position when first child of anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.style.position = 'absolute';
-      anchor.style.top = '15px';
-      anchor.style.height = '100px';
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should estimate the position when first child of anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.style.position = 'absolute';
+        anchor.style.top = '15px';
+        anchor.style.height = '100px';
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      return placements[0].getEstimatedPosition(yPosition => {
-        expect(yPosition).to.equal(15);
+        return placements[0].getEstimatedPosition(yPosition => {
+          expect(yPosition).to.equal(15);
+        });
       });
-    });
 
-    it('should estimate the position when last child of anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.style.position = 'absolute';
-      anchor.style.top = '15px';
-      anchor.style.height = '100px';
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should estimate the position when last child of anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.style.position = 'absolute';
+        anchor.style.top = '15px';
+        anchor.style.height = '100px';
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 3,
+              type: 1,
             },
-            pos: 3,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      return placements[0].getEstimatedPosition(yPosition => {
-        expect(yPosition).to.equal(115);
+        return placements[0].getEstimatedPosition(yPosition => {
+          expect(yPosition).to.equal(115);
+        });
       });
-    });
 
-    it('should estimate the position when after anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.style.position = 'absolute';
-      anchor.style.top = '15px';
-      anchor.style.height = '100px';
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should estimate the position when after anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.style.position = 'absolute';
+        anchor.style.top = '15px';
+        anchor.style.height = '100px';
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 4,
+              type: 1,
             },
-            pos: 4,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      return placements[0].getEstimatedPosition(yPosition => {
-        expect(yPosition).to.equal(115);
+        return placements[0].getEstimatedPosition(yPosition => {
+          expect(yPosition).to.equal(115);
+        });
       });
     });
-  });
-
-  describe('placeAd', () => {
-    it('should place an ad with the correct base attributes', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+
+    describe('placeAd', () => {
+      it('should place an ad with the correct base attributes', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const baseAttributes = {
-        'type': '_ping_',
-        'data-custom-att-1': 'val-1',
-        'data-custom-att-2': 'val-2',
-      };
+        const baseAttributes = {
+          'type': '_ping_',
+          'data-custom-att-1': 'val-1',
+          'data-custom-att-2': 'val-2',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(baseAttributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(baseAttributes, sizing, adTracker)
           .then(() => {
             const adElement = anchor.firstChild;
             expect(adElement.tagName).to.equal('AMP-AD');
             expect(adElement.getAttribute('type')).to.equal('_ping_');
             expect(adElement.getAttribute('layout')).to.equal('fixed-height');
             expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.getAttribute('data-custom-att-1'))
-                .to.equal('val-1');
-            expect(adElement.getAttribute('data-custom-att-2'))
-                .to.equal('val-2');
+            expect(adElement.getAttribute('data-custom-att-1')).to.equal(
+              'val-1'
+            );
+            expect(adElement.getAttribute('data-custom-att-2')).to.equal(
+              'val-2'
+            );
           });
-    });
+      });
 
-    it('should place an ad with fixed layouts', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with fixed layouts', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
-
-      const baseAttributes = {
-        'type': '_ping_',
-        'data-custom-att-1': 'val-1',
-        'data-custom-att-2': 'val-2',
-      };
-
-      const sizing = {
-        width: '300',
-        height: '250',
-      };
-
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(baseAttributes, sizing, adTracker)
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+
+        const baseAttributes = {
+          'type': '_ping_',
+          'data-custom-att-1': 'val-1',
+          'data-custom-att-2': 'val-2',
+        };
+
+        const sizing = {
+          width: '300',
+          height: '250',
+        };
+
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(baseAttributes, sizing, adTracker)
           .then(() => {
             const adElement = anchor.firstChild;
             expect(adElement.tagName).to.equal('AMP-AD');
@@ -299,1094 +306,1108 @@ describes.realWin('placement', {
             expect(adElement.getAttribute('layout')).to.equal('fixed');
             expect(adElement.getAttribute('height')).to.equal('0');
             expect(adElement.getAttribute('width')).to.equal('300');
-            expect(adElement.getAttribute('style'))
-                .to.equal('width: 300px; height: 250px;');
-            expect(adElement.getAttribute('data-custom-att-1'))
-                .to.equal('val-1');
-            expect(adElement.getAttribute('data-custom-att-2'))
-                .to.equal('val-2');
+            expect(adElement.getAttribute('style')).to.equal(
+              'width: 300px; height: 250px;'
+            );
+            expect(adElement.getAttribute('data-custom-att-1')).to.equal(
+              'val-1'
+            );
+            expect(adElement.getAttribute('data-custom-att-2')).to.equal(
+              'val-2'
+            );
           });
-    });
-
+      });
 
-    it('should place an ad with the correct placement attributes', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with the correct placement attributes', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-            },
-            pos: 2,
-            type: 1,
-            attributes: {
-              'type': 'adsense',
-              'data-custom-att-1': 'val-1',
-              'data-custom-att-2': 'val-2',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
+              attributes: {
+                'type': 'adsense',
+                'data-custom-att-1': 'val-1',
+                'data-custom-att-2': 'val-2',
+              },
             },
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const baseAttributes = {
-        'type': '_ping_',
-        'data-custom-att-2': 'val-3',
-        'data-custom-att-3': 'val-4',
-      };
+        const baseAttributes = {
+          'type': '_ping_',
+          'data-custom-att-2': 'val-3',
+          'data-custom-att-3': 'val-4',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(baseAttributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(baseAttributes, sizing, adTracker)
           .then(() => {
             const adElement = anchor.firstChild;
             expect(adElement.tagName).to.equal('AMP-AD');
             expect(adElement.getAttribute('type')).to.equal('adsense');
             expect(adElement.getAttribute('layout')).to.equal('fixed-height');
             expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.getAttribute('data-custom-att-1'))
-                .to.equal('val-1');
-            expect(adElement.getAttribute('data-custom-att-2'))
-                .to.equal('val-2');
-            expect(adElement.getAttribute('data-custom-att-3'))
-                .to.equal('val-4');
+            expect(adElement.getAttribute('data-custom-att-1')).to.equal(
+              'val-1'
+            );
+            expect(adElement.getAttribute('data-custom-att-2')).to.equal(
+              'val-2'
+            );
+            expect(adElement.getAttribute('data-custom-att-3')).to.equal(
+              'val-4'
+            );
           });
-    });
+      });
 
-    it('should place an ad with i-amphtml-layout-awaiting-size class.', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with i-amphtml-layout-awaiting-size class.', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const baseAttributes = {
-        'type': '_ping_',
-      };
+        const baseAttributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
 
-      const resources = Services.resourcesForDoc(anchor);
-      sandbox.stub(resources, 'attemptChangeSize').callsFake(() => {
-        return Promise.reject();
-      });
+        const resources = Services.resourcesForDoc(anchor);
+        sandbox.stub(resources, 'attemptChangeSize').callsFake(() => {
+          return Promise.reject();
+        });
 
-      return placements[0].placeAd(baseAttributes, sizing, adTracker)
+        return placements[0]
+          .placeAd(baseAttributes, sizing, adTracker)
           .then(() => {
             const adElement = anchor.firstChild;
             expect(adElement.tagName).to.equal('AMP-AD');
             expect(adElement.getAttribute('type')).to.equal('_ping_');
             expect(adElement.getAttribute('layout')).to.equal('fixed-height');
             expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.classList.contains(
-                'i-amphtml-layout-awaiting-size')).to.be.true;
+            expect(
+              adElement.classList.contains('i-amphtml-layout-awaiting-size')
+            ).to.be.true;
           });
-    });
+      });
 
-    it('should place an ad with the correct margins', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with the correct margins', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-            },
-            pos: 2,
-            type: 1,
-            style: {
-              'top_m': 5,
-              'bot_m': 6,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
+              style: {
+                'top_m': 5,
+                'bot_m': 6,
+              },
             },
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0].placeAd(attributes, sizing, adTracker).then(() => {
+          const adElement = anchor.firstChild;
+          expect(adElement.tagName).to.equal('AMP-AD');
+          expect(adElement.getAttribute('type')).to.equal('_ping_');
+          expect(adElement.getAttribute('layout')).to.equal('fixed-height');
+          expect(adElement.getAttribute('height')).to.equal('0');
+          expect(adElement.style.marginTop).to.equal('5px');
+          expect(adElement.style.marginBottom).to.equal('6px');
+          expect(adElement.style.marginLeft).to.equal('');
+          expect(adElement.style.marginRight).to.equal('');
+        });
       });
-      return placements[0].placeAd(attributes, sizing, adTracker)
-          .then(() => {
-            const adElement = anchor.firstChild;
-            expect(adElement.tagName).to.equal('AMP-AD');
-            expect(adElement.getAttribute('type')).to.equal('_ping_');
-            expect(adElement.getAttribute('layout')).to.equal('fixed-height');
-            expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.style.marginTop).to.equal('5px');
-            expect(adElement.style.marginBottom).to.equal('6px');
-            expect(adElement.style.marginLeft).to.equal('');
-            expect(adElement.style.marginRight).to.equal('');
-          });
-    });
 
-    it('should place an ad with top margin only', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with top margin only', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-            },
-            pos: 2,
-            type: 1,
-            style: {
-              'top_m': 5,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
+              style: {
+                'top_m': 5,
+              },
             },
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0].placeAd(attributes, sizing, adTracker).then(() => {
+          const adElement = anchor.firstChild;
+          expect(adElement.tagName).to.equal('AMP-AD');
+          expect(adElement.getAttribute('type')).to.equal('_ping_');
+          expect(adElement.getAttribute('layout')).to.equal('fixed-height');
+          expect(adElement.getAttribute('height')).to.equal('0');
+          expect(adElement.style.marginTop).to.equal('5px');
+          expect(adElement.style.marginBottom).to.equal('');
+          expect(adElement.style.marginLeft).to.equal('');
+          expect(adElement.style.marginRight).to.equal('');
+        });
       });
-      return placements[0].placeAd(attributes, sizing, adTracker)
-          .then(() => {
-            const adElement = anchor.firstChild;
-            expect(adElement.tagName).to.equal('AMP-AD');
-            expect(adElement.getAttribute('type')).to.equal('_ping_');
-            expect(adElement.getAttribute('layout')).to.equal('fixed-height');
-            expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.style.marginTop).to.equal('5px');
-            expect(adElement.style.marginBottom).to.equal('');
-            expect(adElement.style.marginLeft).to.equal('');
-            expect(adElement.style.marginRight).to.equal('');
-          });
-    });
 
-    it('should place an ad with bottom margin only', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with bottom margin only', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-            },
-            pos: 2,
-            type: 1,
-            style: {
-              'bot_m': 6,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
+              style: {
+                'bot_m': 6,
+              },
             },
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0].placeAd(attributes, sizing, adTracker).then(() => {
+          const adElement = anchor.firstChild;
+          expect(adElement.tagName).to.equal('AMP-AD');
+          expect(adElement.getAttribute('type')).to.equal('_ping_');
+          expect(adElement.getAttribute('layout')).to.equal('fixed-height');
+          expect(adElement.getAttribute('height')).to.equal('0');
+          expect(adElement.style.marginTop).to.equal('');
+          expect(adElement.style.marginBottom).to.equal('6px');
+          expect(adElement.style.marginLeft).to.equal('');
+          expect(adElement.style.marginRight).to.equal('');
+        });
       });
-      return placements[0].placeAd(attributes, sizing, adTracker)
-          .then(() => {
-            const adElement = anchor.firstChild;
-            expect(adElement.tagName).to.equal('AMP-AD');
-            expect(adElement.getAttribute('type')).to.equal('_ping_');
-            expect(adElement.getAttribute('layout')).to.equal('fixed-height');
-            expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.style.marginTop).to.equal('');
-            expect(adElement.style.marginBottom).to.equal('6px');
-            expect(adElement.style.marginLeft).to.equal('');
-            expect(adElement.style.marginRight).to.equal('');
-          });
-    });
 
-    it('should place an ad with no margins', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place an ad with no margins', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
+              style: {},
             },
-            pos: 2,
-            type: 1,
-            style: {},
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0].placeAd(attributes, sizing, adTracker).then(() => {
+          const adElement = anchor.firstChild;
+          expect(adElement.tagName).to.equal('AMP-AD');
+          expect(adElement.getAttribute('type')).to.equal('_ping_');
+          expect(adElement.getAttribute('layout')).to.equal('fixed-height');
+          expect(adElement.getAttribute('height')).to.equal('0');
+          expect(adElement.style.marginTop).to.equal('');
+          expect(adElement.style.marginBottom).to.equal('');
+          expect(adElement.style.marginLeft).to.equal('');
+          expect(adElement.style.marginRight).to.equal('');
+        });
       });
-      return placements[0].placeAd(attributes, sizing, adTracker)
-          .then(() => {
-            const adElement = anchor.firstChild;
-            expect(adElement.tagName).to.equal('AMP-AD');
-            expect(adElement.getAttribute('type')).to.equal('_ping_');
-            expect(adElement.getAttribute('layout')).to.equal('fixed-height');
-            expect(adElement.getAttribute('height')).to.equal('0');
-            expect(adElement.style.marginTop).to.equal('');
-            expect(adElement.style.marginBottom).to.equal('');
-            expect(adElement.style.marginLeft).to.equal('');
-            expect(adElement.style.marginRight).to.equal('');
-          });
-    });
 
-    it('should not resize to full-width responsive if width exceeds limit',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+      it('should not resize to full-width responsive if width exceeds limit', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const resource = Services.resourcesForDoc(anchor);
-          sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-            return Promise.resolve();
-          });
-          sandbox.stub(resource.viewport_, 'getWidth').callsFake(() => 2000);
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.resolve();
+        });
+        sandbox.stub(resource.viewport_, 'getWidth').callsFake(() => 2000);
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
-                },
-                pos: 2,
-                type: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
-            ],
-          });
-          expect(placements).to.have.lengthOf(1);
+              pos: 2,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-          const attributes = {
-            'type': '_ping_',
-          };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-          const sizing = {};
+        const sizing = {};
 
-          const adTracker = new AdTracker([], {
-            initialMinSpacing: 0,
-            subsequentMinSpacing: [],
-            maxAdCount: 10,
-          });
-          return placements[0].placeAd(attributes, sizing, adTracker, true)
-              .then(placementState => {
-                expect(resource.attemptChangeSize).to.have.been.calledWith(
-                    anchor.firstChild, 250, undefined);
-                expect(placementState).to.equal(PlacementState.PLACED);
-              });
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
         });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker, true)
+          .then(placementState => {
+            expect(resource.attemptChangeSize).to.have.been.calledWith(
+              anchor.firstChild,
+              250,
+              undefined
+            );
+            expect(placementState).to.equal(PlacementState.PLACED);
+          });
+      });
 
-    it('should resize to full-width responsive correctly in ltr',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+      it('should resize to full-width responsive correctly in ltr', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const resource = Services.resourcesForDoc(anchor);
-          sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-            return Promise.resolve();
-          });
-          sandbox.stub(win, 'getComputedStyle').callsFake(() => {
-            return {direction: 'ltr'};
-          });
-          sandbox.stub(resource, 'getElementLayoutBox').callsFake(() => {
-            return Promise.resolve({left: 20});
-          });
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.resolve();
+        });
+        sandbox.stub(win, 'getComputedStyle').callsFake(() => {
+          return {direction: 'ltr'};
+        });
+        sandbox.stub(resource, 'getElementLayoutBox').callsFake(() => {
+          return Promise.resolve({left: 20});
+        });
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
-                },
-                pos: 2,
-                type: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
-            ],
-          });
-          expect(placements).to.have.lengthOf(1);
+              pos: 2,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-          const attributes = {
-            'type': '_ping_',
-          };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-          const sizing = {};
+        const sizing = {};
 
-          const adTracker = new AdTracker([], {
-            initialMinSpacing: 0,
-            subsequentMinSpacing: [],
-            maxAdCount: 10,
-          });
-          return placements[0].placeAd(attributes, sizing, adTracker, true)
-              .then(placementState => {
-                expect(resource.attemptChangeSize).to.have.been.calledWith(
-                    anchor.firstChild, 150, 300, {left: -20});
-                expect(placementState).to.equal(PlacementState.PLACED);
-              });
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
         });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker, true)
+          .then(placementState => {
+            expect(resource.attemptChangeSize).to.have.been.calledWith(
+              anchor.firstChild,
+              150,
+              300,
+              {left: -20}
+            );
+            expect(placementState).to.equal(PlacementState.PLACED);
+          });
+      });
 
-    it('should resize to full-width responsive correctly in rtl',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+      it('should resize to full-width responsive correctly in rtl', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const resource = Services.resourcesForDoc(anchor);
-          sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-            return Promise.resolve();
-          });
-          sandbox.stub(win, 'getComputedStyle').callsFake(() => {
-            return {direction: 'rtl'};
-          });
-          sandbox.stub(resource, 'getElementLayoutBox').callsFake(() => {
-            return Promise.resolve({left: 20});
-          });
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.resolve();
+        });
+        sandbox.stub(win, 'getComputedStyle').callsFake(() => {
+          return {direction: 'rtl'};
+        });
+        sandbox.stub(resource, 'getElementLayoutBox').callsFake(() => {
+          return Promise.resolve({left: 20});
+        });
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
-                },
-                pos: 2,
-                type: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
-            ],
-          });
-          expect(placements).to.have.lengthOf(1);
+              pos: 2,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-          const attributes = {
-            'type': '_ping_',
-          };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-          const sizing = {};
+        const sizing = {};
 
-          const adTracker = new AdTracker([], {
-            initialMinSpacing: 0,
-            subsequentMinSpacing: [],
-            maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker, true)
+          .then(placementState => {
+            expect(resource.attemptChangeSize).to.have.been.calledWith(
+              anchor.firstChild,
+              150,
+              300,
+              {right: 20}
+            );
+            expect(placementState).to.equal(PlacementState.PLACED);
           });
-          return placements[0].placeAd(attributes, sizing, adTracker, true)
-              .then(placementState => {
-                expect(resource.attemptChangeSize).to.have.been.calledWith(
-                    anchor.firstChild, 150, 300, {right: 20});
-                expect(placementState).to.equal(PlacementState.PLACED);
-              });
-        });
-
-    it('should report placement placed when resize allowed', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const resource = Services.resourcesForDoc(anchor);
-      sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-        return Promise.resolve();
       });
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should report placement placed when resize allowed', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.resolve();
+        });
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(resource.attemptChangeSize).to.have.been.calledWith(
-                anchor.firstChild, 250, undefined);
+              anchor.firstChild,
+              250,
+              undefined
+            );
             expect(placementState).to.equal(PlacementState.PLACED);
           });
-    });
+      });
 
-    it('should report resize failed when resize not allowed - responsive',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+      it('should report resize failed when resize not allowed - responsive', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const resource = Services.resourcesForDoc(anchor);
-          sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-            return Promise.reject(new Error('Resize failed'));
-          });
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.reject(new Error('Resize failed'));
+        });
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
-                },
-                pos: 2,
-                type: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
-            ],
-          });
-          expect(placements).to.have.lengthOf(1);
+              pos: 2,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-          const attributes = {
-            'type': '_ping_',
-          };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-          const sizing = {};
+        const sizing = {};
 
-          const adTracker = new AdTracker([], {
-            initialMinSpacing: 0,
-            subsequentMinSpacing: [],
-            maxAdCount: 10,
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker, true)
+          .then(placementState => {
+            expect(resource.attemptChangeSize).to.have.been.calledWith(
+              anchor.firstChild,
+              150,
+              300,
+              undefined
+            );
+            expect(placementState).to.equal(PlacementState.RESIZE_FAILED);
           });
-          return placements[0].placeAd(attributes, sizing, adTracker, true)
-              .then(placementState => {
-                expect(resource.attemptChangeSize).to.have.been.calledWith(
-                    anchor.firstChild, 150, 300, undefined);
-                expect(placementState).to.equal(PlacementState.RESIZE_FAILED);
-              });
-        });
-
-    it('should report resize failed when resize not allowed', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const resource = Services.resourcesForDoc(anchor);
-      sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
-        return Promise.reject(new Error('Resize failed'));
       });
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should report resize failed when resize not allowed', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const resource = Services.resourcesForDoc(anchor);
+        sandbox.stub(resource, 'attemptChangeSize').callsFake(() => {
+          return Promise.reject(new Error('Resize failed'));
+        });
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(resource.attemptChangeSize).to.have.been.calledWith(
-                anchor.firstChild, 250, undefined);
+              anchor.firstChild,
+              250,
+              undefined
+            );
             expect(placementState).to.equal(PlacementState.RESIZE_FAILED);
           });
-    });
+      });
 
-    it('should report too near existing ad', () => {
-      const fakeAd = doc.createElement('div');
-      container.appendChild(fakeAd);
+      it('should report too near existing ad', () => {
+        const fakeAd = doc.createElement('div');
+        container.appendChild(fakeAd);
 
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const adTracker = new AdTracker([fakeAd], {
-        initialMinSpacing: 100,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
+        const adTracker = new AdTracker([fakeAd], {
+          initialMinSpacing: 100,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
 
-      const sizing = {};
+        const sizing = {};
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(
-                PlacementState.TOO_NEAR_EXISTING_AD);
+              PlacementState.TOO_NEAR_EXISTING_AD
+            );
           });
+      });
     });
-  });
-
-  describe('Ad positioning', () => {
-    it('should place the ad before the anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+
+    describe('Ad positioning', () => {
+      it('should place the ad before the anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(PlacementState.PLACED);
             expect(container.childNodes).to.have.lengthOf(2);
             expect(container.childNodes[0].tagName).to.equal('AMP-AD');
           });
-    });
+      });
 
-    it('should place the ad after the anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should place the ad after the anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 4,
+              type: 1,
             },
-            pos: 4,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(PlacementState.PLACED);
             expect(container.childNodes).to.have.lengthOf(2);
             expect(container.childNodes[1].tagName).to.equal('AMP-AD');
           });
-    });
+      });
 
-    it('should place the ad as the first child of the anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-      anchor.appendChild(doc.createElement('div'));
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+      it('should place the ad as the first child of the anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+        anchor.appendChild(doc.createElement('div'));
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(PlacementState.PLACED);
             expect(container.childNodes).to.have.lengthOf(1);
             expect(anchor.childNodes[0].tagName).to.equal('AMP-AD');
           });
-    });
+      });
+
+      it('should place the ad as the last child of the anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+        anchor.appendChild(doc.createElement('div'));
 
-    it('should place the ad as the last child of the anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-      anchor.appendChild(doc.createElement('div'));
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 3,
+              type: 1,
             },
-            pos: 3,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(PlacementState.PLACED);
             expect(container.childNodes).to.have.lengthOf(1);
             expect(anchor.childNodes[1].tagName).to.equal('AMP-AD');
           });
-    });
+      });
+
+      it('should place the ad inside the 2nd anchor with class name', () => {
+        const anchor1 = doc.createElement('div');
+        anchor1.className = 'aClass';
+        container.appendChild(anchor1);
 
-    it('should place the ad inside the 2nd anchor with class name', () => {
-      const anchor1 = doc.createElement('div');
-      anchor1.className = 'aClass';
-      container.appendChild(anchor1);
-
-      const anchor2 = doc.createElement('div');
-      anchor2.className = 'aClass';
-      container.appendChild(anchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV.aClass',
-              index: 1,
+        const anchor2 = doc.createElement('div');
+        anchor2.className = 'aClass';
+        container.appendChild(anchor2);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV.aClass',
+                index: 1,
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
 
-      const attributes = {
-        'type': '_ping_',
-      };
+        const attributes = {
+          'type': '_ping_',
+        };
 
-      const sizing = {};
+        const sizing = {};
 
-      const adTracker = new AdTracker([], {
-        initialMinSpacing: 0,
-        subsequentMinSpacing: [],
-        maxAdCount: 10,
-      });
-      return placements[0].placeAd(attributes, sizing, adTracker)
+        const adTracker = new AdTracker([], {
+          initialMinSpacing: 0,
+          subsequentMinSpacing: [],
+          maxAdCount: 10,
+        });
+        return placements[0]
+          .placeAd(attributes, sizing, adTracker)
           .then(placementState => {
             expect(placementState).to.equal(PlacementState.PLACED);
             expect(anchor1.childNodes).to.have.lengthOf(0);
             expect(anchor2.childNodes).to.have.lengthOf(1);
             expect(anchor2.childNodes[0].tagName).to.equal('AMP-AD');
           });
-    });
-  });
-
-  describe('getPlacementsFromConfigObj', () => {
-    it('should get a placement from the config object', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-            },
-            pos: 1,
-            type: 1,
-          },
-        ],
       });
-      expect(placements).to.have.lengthOf(1);
     });
 
-    it('should return empty array when no placements array', () => {
-      const placements = getPlacementsFromConfigObj(ampdoc, {});
-      expect(placements).to.be.empty;
-    });
+    describe('getPlacementsFromConfigObj', () => {
+      it('should get a placement from the config object', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 1,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+      });
 
-    it('should not return a placement with no anchor property', () => {
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            pos: 1,
-            type: 1,
-          },
-        ],
+      it('should return empty array when no placements array', () => {
+        const placements = getPlacementsFromConfigObj(ampdoc, {});
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.be.empty;
-    });
 
-    it('should not return a placement with no selector in the anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {},
-            pos: 1,
-            type: 1,
-          },
-        ],
+      it('should not return a placement with no anchor property', () => {
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              pos: 1,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.be.empty;
-    });
 
-    it('should not return a placement with an invalid position', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it('should not return a placement with no selector in the anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {},
+              pos: 1,
+              type: 1,
             },
-            pos: 5,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.be.empty;
-    });
 
-    it('should not return placement if its anchor doesn\'t exist on the page',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'wrongId';
-          container.appendChild(anchor);
+      it('should not return a placement with an invalid position', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
-                },
-                pos: 1,
-                type: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
-            ],
-          });
-          expect(placements).to.be.empty;
+              pos: 5,
+              type: 1,
+            },
+          ],
         });
+        expect(placements).to.be.empty;
+      });
 
-    it('should get a placement for the 2nd anchor with class name', () => {
-      const anchor1 = doc.createElement('div');
-      anchor1.className = 'aClass';
-      container.appendChild(anchor1);
-
-      const anchor2 = doc.createElement('div');
-      anchor2.className = 'aClass';
-      container.appendChild(anchor2);
+      it("should not return placement if its anchor doesn't exist on the page", () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'wrongId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV.aClass',
-              index: 1,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+              },
+              pos: 1,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.have.lengthOf(1);
 
-      expect(placements[0].anchorElement_).to.eql(anchor2);
-    });
+      it('should get a placement for the 2nd anchor with class name', () => {
+        const anchor1 = doc.createElement('div');
+        anchor1.className = 'aClass';
+        container.appendChild(anchor1);
+
+        const anchor2 = doc.createElement('div');
+        anchor2.className = 'aClass';
+        container.appendChild(anchor2);
 
-    it('should get a placement for all the anchors with class name', () => {
-      const anchor1 = doc.createElement('div');
-      anchor1.className = 'aClass';
-      container.appendChild(anchor1);
-
-      const anchor2 = doc.createElement('div');
-      anchor2.className = 'aClass';
-      container.appendChild(anchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV.aClass',
-              all: true,
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV.aClass',
+                index: 1,
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+
+        expect(placements[0].anchorElement_).to.eql(anchor2);
       });
-      expect(placements).to.have.lengthOf(2);
 
-      expect(placements[0].anchorElement_).to.eql(anchor1);
-      expect(placements[1].anchorElement_).to.eql(anchor2);
-    });
+      it('should get a placement for all the anchors with class name', () => {
+        const anchor1 = doc.createElement('div');
+        anchor1.className = 'aClass';
+        container.appendChild(anchor1);
 
-    it('should get a placement for the 2nd anchor with class name when ' +
-        'index and all both specified.', () => {
-      const anchor1 = doc.createElement('div');
-      anchor1.className = 'aClass';
-      container.appendChild(anchor1);
-
-      const anchor2 = doc.createElement('div');
-      anchor2.className = 'aClass';
-      container.appendChild(anchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV.aClass',
-              index: 0,
-              all: true,
+        const anchor2 = doc.createElement('div');
+        anchor2.className = 'aClass';
+        container.appendChild(anchor2);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV.aClass',
+                all: true,
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
+          ],
+        });
+        expect(placements).to.have.lengthOf(2);
 
-      expect(placements[0].anchorElement_).to.eql(anchor1);
-    });
+        expect(placements[0].anchorElement_).to.eql(anchor1);
+        expect(placements[1].anchorElement_).to.eql(anchor2);
+      });
 
-    it('should only get placement for element with sufficient textContent',
+      it(
+        'should get a placement for the 2nd anchor with class name when ' +
+          'index and all both specified.',
         () => {
-          const nonAnchor = doc.createElement('div');
-          nonAnchor.className = 'class1';
-          container.appendChild(nonAnchor);
-          nonAnchor.appendChild(doc.createTextNode('abc'));
+          const anchor1 = doc.createElement('div');
+          anchor1.className = 'aClass';
+          container.appendChild(anchor1);
 
-          const anchor = doc.createElement('div');
-          anchor.className = 'class1';
-          container.appendChild(anchor);
-          anchor.appendChild(doc.createTextNode('abcd'));
+          const anchor2 = doc.createElement('div');
+          anchor2.className = 'aClass';
+          container.appendChild(anchor2);
 
           const placements = getPlacementsFromConfigObj(ampdoc, {
             placements: [
               {
                 anchor: {
-                  selector: '.class1',
-                  'min_c': 4,
+                  selector: 'DIV.aClass',
+                  index: 0,
+                  all: true,
                 },
-                pos: 1,
+                pos: 2,
                 type: 1,
               },
             ],
           });
           expect(placements).to.have.lengthOf(1);
-          expect(placements[0].anchorElement_).to.eql(anchor);
-        });
-
-    it('should not return a placement that\'s inside an amp-sidebar', () => {
-      const anchor = doc.createElement('amp-sidebar');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'AMP-SIDEBAR#anId',
+          expect(placements[0].anchorElement_).to.eql(anchor1);
+        }
+      );
+
+      it('should only get placement for element with sufficient textContent', () => {
+        const nonAnchor = doc.createElement('div');
+        nonAnchor.className = 'class1';
+        container.appendChild(nonAnchor);
+        nonAnchor.appendChild(doc.createTextNode('abc'));
+
+        const anchor = doc.createElement('div');
+        anchor.className = 'class1';
+        container.appendChild(anchor);
+        anchor.appendChild(doc.createTextNode('abcd'));
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: '.class1',
+                'min_c': 4,
+              },
+              pos: 1,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+        expect(placements[0].anchorElement_).to.eql(anchor);
       });
-      expect(placements).to.be.empty;
-    });
 
-    it('should not return a placement that\'s inside an amp-app-banner', () => {
-      const anchor = doc.createElement('amp-app-banner');
-      anchor.setAttribute('layout', 'nodisplay');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'AMP-APP-BANNER#anId',
+      it("should not return a placement that's inside an amp-sidebar", () => {
+        const anchor = doc.createElement('amp-sidebar');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'AMP-SIDEBAR#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 2,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.be.empty;
-    });
 
-    it('should get a placement when outside amp-sidebar', () => {
-      const anchor = doc.createElement('amp-sidebar');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
+      it("should not return a placement that's inside an amp-app-banner", () => {
+        const anchor = doc.createElement('amp-app-banner');
+        anchor.setAttribute('layout', 'nodisplay');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'AMP-SIDEBAR#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'AMP-APP-BANNER#anId',
+              },
+              pos: 2,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.be.empty;
       });
-      expect(placements).to.have.lengthOf(1);
-    });
-
-    it('should not return a placement that is a child of a blacklisted ' +
-        'ancestor.', () => {
-      const parent = doc.createElement('amp-sidebar');
-      container.appendChild(parent);
 
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      parent.appendChild(anchor);
+      it('should get a placement when outside amp-sidebar', () => {
+        const anchor = doc.createElement('amp-sidebar');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'AMP-SIDEBAR#anId',
+              },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
       });
-      expect(placements).to.have.lengthOf(0);
-    });
 
-    it('should get a placement when anchor parent of blacklisted ancestor.',
+      it(
+        'should not return a placement that is a child of a blacklisted ' +
+          'ancestor.',
         () => {
+          const parent = doc.createElement('amp-sidebar');
+          container.appendChild(parent);
+
           const anchor = doc.createElement('div');
           anchor.id = 'anId';
-          container.appendChild(anchor);
-
-          const child = doc.createElement('amp-sidebar');
-          anchor.appendChild(child);
+          parent.appendChild(anchor);
 
           const placements = getPlacementsFromConfigObj(ampdoc, {
             placements: [
@@ -1399,276 +1420,224 @@ describes.realWin('placement', {
               },
             ],
           });
-          expect(placements).to.have.lengthOf(1);
-        });
-  });
-
-  describe('getPlacementsFromConfigObj, sub-anchors', () => {
-    it('should get placements using the sub anchor', () => {
-      const nonAnchor = doc.createElement('div');
-      nonAnchor.id = 'anId';
-      container.appendChild(nonAnchor);
-
-      const nonSubAnchor1 = doc.createElement('div');
-      nonSubAnchor1.className = 'sub-class';
-      nonAnchor.appendChild(nonSubAnchor1);
-
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const subAnchor1 = doc.createElement('div');
-      subAnchor1.className = 'sub-class';
-      anchor.appendChild(subAnchor1);
-
-      const nonSubAnchor2 = doc.createElement('div');
-      nonSubAnchor2.className = 'non-sub-class';
-      anchor.appendChild(nonSubAnchor2);
-
-      const subAnchor2 = doc.createElement('div');
-      subAnchor2.className = 'sub-class';
-      anchor.appendChild(subAnchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-              index: 1,
-              sub: {
-                selector: '.sub-class',
-                all: true,
+          expect(placements).to.have.lengthOf(0);
+        }
+      );
+
+      it('should get a placement when anchor parent of blacklisted ancestor.', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const child = doc.createElement('amp-sidebar');
+        anchor.appendChild(child);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
               },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
       });
-      expect(placements).to.have.lengthOf(2);
-      expect(placements[0].anchorElement_).to.eql(subAnchor1);
-      expect(placements[1].anchorElement_).to.eql(subAnchor2);
     });
 
-    it('should get placement only for anchor indexed in sub-anchor', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const subAnchor1 = doc.createElement('div');
-      subAnchor1.className = 'sub-class';
-      anchor.appendChild(subAnchor1);
-
-      const subAnchor2 = doc.createElement('div');
-      subAnchor2.className = 'sub-class';
-      anchor.appendChild(subAnchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-              sub: {
-                selector: '.sub-class',
+    describe('getPlacementsFromConfigObj, sub-anchors', () => {
+      it('should get placements using the sub anchor', () => {
+        const nonAnchor = doc.createElement('div');
+        nonAnchor.id = 'anId';
+        container.appendChild(nonAnchor);
+
+        const nonSubAnchor1 = doc.createElement('div');
+        nonSubAnchor1.className = 'sub-class';
+        nonAnchor.appendChild(nonSubAnchor1);
+
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const subAnchor1 = doc.createElement('div');
+        subAnchor1.className = 'sub-class';
+        anchor.appendChild(subAnchor1);
+
+        const nonSubAnchor2 = doc.createElement('div');
+        nonSubAnchor2.className = 'non-sub-class';
+        anchor.appendChild(nonSubAnchor2);
+
+        const subAnchor2 = doc.createElement('div');
+        subAnchor2.className = 'sub-class';
+        anchor.appendChild(subAnchor2);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
                 index: 1,
-              },
-            },
-            pos: 1,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(1);
-      expect(placements[0].anchorElement_).to.eql(subAnchor2);
-    });
-
-    it('should get placements using recursive sub anchors', () => {
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const subAnchor1 = doc.createElement('div');
-      subAnchor1.className = 'sub-class1';
-      anchor.appendChild(subAnchor1);
-
-      const subSubAnchor1 = doc.createElement('div');
-      subSubAnchor1.className = 'sub-class2';
-      subAnchor1.appendChild(subSubAnchor1);
-
-      const nonSubSubAnchor = doc.createElement('div');
-      nonSubSubAnchor.className = 'sub-class3';
-      subAnchor1.appendChild(nonSubSubAnchor);
-
-      const subAnchor2 = doc.createElement('div');
-      subAnchor2.className = 'sub-class1';
-      anchor.appendChild(subAnchor2);
-
-      const subSubAnchor2 = doc.createElement('div');
-      subSubAnchor2.className = 'sub-class2';
-      subAnchor2.appendChild(subSubAnchor2);
-
-      const nonSubAnchor = doc.createElement('div');
-      nonSubAnchor.className = 'sub-class1';
-      anchor.appendChild(nonSubAnchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-              sub: {
-                selector: '.sub-class1',
-                all: true,
                 sub: {
-                  selector: '.sub-class2',
+                  selector: '.sub-class',
                   all: true,
                 },
               },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(2);
+        expect(placements[0].anchorElement_).to.eql(subAnchor1);
+        expect(placements[1].anchorElement_).to.eql(subAnchor2);
       });
-      expect(placements).to.have.lengthOf(2);
-      expect(placements[0].anchorElement_).to.eql(subSubAnchor1);
-      expect(placements[1].anchorElement_).to.eql(subSubAnchor2);
-    });
 
-    it('should not return placement when no element matches sub anchor', () => {
-      const nonAnchor = doc.createElement('div');
-      nonAnchor.id = 'anId';
-      container.appendChild(nonAnchor);
-
-      const nonSubAnchor1 = doc.createElement('div');
-      nonSubAnchor1.className = 'sub-class';
-      nonAnchor.appendChild(nonSubAnchor1);
-
-      const anchor = doc.createElement('div');
-      anchor.id = 'anId';
-      container.appendChild(anchor);
-
-      const nonSubAnchor2 = doc.createElement('div');
-      nonSubAnchor2.className = 'non-sub-class';
-      anchor.appendChild(nonSubAnchor2);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'DIV#anId',
-              index: 1,
-              sub: {
-                selector: '.sub-class',
-              },
-            },
-            pos: 1,
-            type: 1,
-          },
-        ],
-      });
-      expect(placements).to.have.lengthOf(0);
-    });
+      it('should get placement only for anchor indexed in sub-anchor', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-    it('sub anchor query selector matching should be scoped to within parent ' +
-        'anchor element', () => {
-      const wrapper = doc.createElement('div');
-      wrapper.className = 'class1';
-      container.appendChild(wrapper);
-
-      const anchor = doc.createElement('div');
-      anchor.className = 'class2';
-      wrapper.appendChild(anchor);
-
-      const subAnchor = doc.createElement('div');
-      subAnchor.className = 'class3';
-      anchor.appendChild(subAnchor);
-
-      const placements = getPlacementsFromConfigObj(ampdoc, {
-        placements: [
-          {
-            anchor: {
-              selector: 'body DIV.class2',
-              sub: {
-                selector: 'DIV.class1 DIV.class3',
-                all: true,
+        const subAnchor1 = doc.createElement('div');
+        subAnchor1.className = 'sub-class';
+        anchor.appendChild(subAnchor1);
+
+        const subAnchor2 = doc.createElement('div');
+        subAnchor2.className = 'sub-class';
+        anchor.appendChild(subAnchor2);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+                sub: {
+                  selector: '.sub-class',
+                  index: 1,
+                },
               },
+              pos: 1,
+              type: 1,
             },
-            pos: 1,
-            type: 1,
-          },
-        ],
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+        expect(placements[0].anchorElement_).to.eql(subAnchor2);
       });
-      expect(placements).to.have.lengthOf(0);
-    });
 
-    it('should only get placements for elements with sufficient textContent',
-        () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+      it('should get placements using recursive sub anchors', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
 
-          const subAnchor1 = doc.createElement('div');
-          subAnchor1.className = 'sub-class';
-          anchor.appendChild(subAnchor1);
-          subAnchor1.appendChild(doc.createTextNode('abc'));
+        const subAnchor1 = doc.createElement('div');
+        subAnchor1.className = 'sub-class1';
+        anchor.appendChild(subAnchor1);
 
-          const subAnchor2 = doc.createElement('div');
-          subAnchor2.className = 'sub-class';
-          anchor.appendChild(subAnchor2);
-          subAnchor2.appendChild(doc.createTextNode('abcd'));
+        const subSubAnchor1 = doc.createElement('div');
+        subSubAnchor1.className = 'sub-class2';
+        subAnchor1.appendChild(subSubAnchor1);
 
-          const subAnchor3 = doc.createElement('div');
-          subAnchor3.className = 'sub-class';
-          anchor.appendChild(subAnchor3);
-          subAnchor3.appendChild(doc.createTextNode('abcd'));
+        const nonSubSubAnchor = doc.createElement('div');
+        nonSubSubAnchor.className = 'sub-class3';
+        subAnchor1.appendChild(nonSubSubAnchor);
 
-          const placements = getPlacementsFromConfigObj(ampdoc, {
-            placements: [
-              {
-                anchor: {
-                  selector: 'DIV#anId',
+        const subAnchor2 = doc.createElement('div');
+        subAnchor2.className = 'sub-class1';
+        anchor.appendChild(subAnchor2);
+
+        const subSubAnchor2 = doc.createElement('div');
+        subSubAnchor2.className = 'sub-class2';
+        subAnchor2.appendChild(subSubAnchor2);
+
+        const nonSubAnchor = doc.createElement('div');
+        nonSubAnchor.className = 'sub-class1';
+        anchor.appendChild(nonSubAnchor);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+                sub: {
+                  selector: '.sub-class1',
+                  all: true,
                   sub: {
-                    selector: '.sub-class',
-                    'min_c': 4,
+                    selector: '.sub-class2',
                     all: true,
                   },
                 },
-                pos: 1,
-                type: 1,
               },
-            ],
-          });
-          expect(placements).to.have.lengthOf(2);
-          expect(placements[0].anchorElement_).to.eql(subAnchor2);
-          expect(placements[1].anchorElement_).to.eql(subAnchor3);
+              pos: 1,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(2);
+        expect(placements[0].anchorElement_).to.eql(subSubAnchor1);
+        expect(placements[1].anchorElement_).to.eql(subSubAnchor2);
+      });
+
+      it('should not return placement when no element matches sub anchor', () => {
+        const nonAnchor = doc.createElement('div');
+        nonAnchor.id = 'anId';
+        container.appendChild(nonAnchor);
+
+        const nonSubAnchor1 = doc.createElement('div');
+        nonSubAnchor1.className = 'sub-class';
+        nonAnchor.appendChild(nonSubAnchor1);
+
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const nonSubAnchor2 = doc.createElement('div');
+        nonSubAnchor2.className = 'non-sub-class';
+        anchor.appendChild(nonSubAnchor2);
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+                index: 1,
+                sub: {
+                  selector: '.sub-class',
+                },
+              },
+              pos: 1,
+              type: 1,
+            },
+          ],
         });
+        expect(placements).to.have.lengthOf(0);
+      });
 
-    it('should only get placement for element with sufficient textContent',
+      it(
+        'sub anchor query selector matching should be scoped to within parent ' +
+          'anchor element',
         () => {
-          const anchor = doc.createElement('div');
-          anchor.id = 'anId';
-          container.appendChild(anchor);
+          const wrapper = doc.createElement('div');
+          wrapper.className = 'class1';
+          container.appendChild(wrapper);
 
-          const subAnchor1 = doc.createElement('div');
-          subAnchor1.className = 'sub-class';
-          anchor.appendChild(subAnchor1);
-          subAnchor1.appendChild(doc.createTextNode('abc'));
+          const anchor = doc.createElement('div');
+          anchor.className = 'class2';
+          wrapper.appendChild(anchor);
 
-          const subAnchor2 = doc.createElement('div');
-          subAnchor2.className = 'sub-class';
-          anchor.appendChild(subAnchor2);
-          subAnchor2.appendChild(doc.createTextNode('abcd'));
+          const subAnchor = doc.createElement('div');
+          subAnchor.className = 'class3';
+          anchor.appendChild(subAnchor);
 
           const placements = getPlacementsFromConfigObj(ampdoc, {
             placements: [
               {
                 anchor: {
-                  selector: 'DIV#anId',
+                  selector: 'body DIV.class2',
                   sub: {
-                    selector: '.sub-class',
-                    'min_c': 4,
-                    index: 0,
+                    selector: 'DIV.class1 DIV.class3',
+                    all: true,
                   },
                 },
                 pos: 1,
@@ -1676,8 +1645,85 @@ describes.realWin('placement', {
               },
             ],
           });
-          expect(placements).to.have.lengthOf(1);
-          expect(placements[0].anchorElement_).to.eql(subAnchor2);
+          expect(placements).to.have.lengthOf(0);
+        }
+      );
+
+      it('should only get placements for elements with sufficient textContent', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const subAnchor1 = doc.createElement('div');
+        subAnchor1.className = 'sub-class';
+        anchor.appendChild(subAnchor1);
+        subAnchor1.appendChild(doc.createTextNode('abc'));
+
+        const subAnchor2 = doc.createElement('div');
+        subAnchor2.className = 'sub-class';
+        anchor.appendChild(subAnchor2);
+        subAnchor2.appendChild(doc.createTextNode('abcd'));
+
+        const subAnchor3 = doc.createElement('div');
+        subAnchor3.className = 'sub-class';
+        anchor.appendChild(subAnchor3);
+        subAnchor3.appendChild(doc.createTextNode('abcd'));
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+                sub: {
+                  selector: '.sub-class',
+                  'min_c': 4,
+                  all: true,
+                },
+              },
+              pos: 1,
+              type: 1,
+            },
+          ],
         });
-  });
-});
+        expect(placements).to.have.lengthOf(2);
+        expect(placements[0].anchorElement_).to.eql(subAnchor2);
+        expect(placements[1].anchorElement_).to.eql(subAnchor3);
+      });
+
+      it('should only get placement for element with sufficient textContent', () => {
+        const anchor = doc.createElement('div');
+        anchor.id = 'anId';
+        container.appendChild(anchor);
+
+        const subAnchor1 = doc.createElement('div');
+        subAnchor1.className = 'sub-class';
+        anchor.appendChild(subAnchor1);
+        subAnchor1.appendChild(doc.createTextNode('abc'));
+
+        const subAnchor2 = doc.createElement('div');
+        subAnchor2.className = 'sub-class';
+        anchor.appendChild(subAnchor2);
+        subAnchor2.appendChild(doc.createTextNode('abcd'));
+
+        const placements = getPlacementsFromConfigObj(ampdoc, {
+          placements: [
+            {
+              anchor: {
+                selector: 'DIV#anId',
+                sub: {
+                  selector: '.sub-class',
+                  'min_c': 4,
+                  index: 0,
+                },
+              },
+              pos: 1,
+              type: 1,
+            },
+          ],
+        });
+        expect(placements).to.have.lengthOf(1);
+        expect(placements[0].anchorElement_).to.eql(subAnchor2);
+      });
+    });
+  }
+);
diff --git a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
index a7530f30bbf2..7df31bbba10c 100644
--- a/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
+++ b/extensions/amp-auto-lightbox/0.1/amp-auto-lightbox.js
@@ -38,7 +38,6 @@ import {resolveFalse, resolveTrue} from './utils/promise';
 import {toArray} from '../../../src/types';
 import {tryParseJson} from '../../../src/json';
 
-
 const TAG = 'amp-auto-lightbox';
 
 export const REQUIRED_EXTENSION = 'amp-lightbox-gallery';
@@ -115,7 +114,6 @@ const DISABLED_ANCESTORS = [
   'amp-carousel',
 ].join(',');
 
-
 const SCRIPT_LD_JSON = 'script[type="application/ld+json"]';
 const META_OG_TYPE = 'meta[property="og:type"]';
 
@@ -128,17 +126,17 @@ const NOOP = () => {};
  */
 const getRootNode = ampdoc => ampdoc.getRootNode();
 
-
 /** @visibleForTesting */
 export class Criteria {
-
   /**
    * @param {!Element} element
    * @return {!Promise<boolean>}
    */
   static meetsAll(element) {
-    if (!Criteria.meetsSimpleCriteria(element) ||
-        !Criteria.meetsTreeShapeCriteria(element)) {
+    if (
+      !Criteria.meetsSimpleCriteria(element) ||
+      !Criteria.meetsTreeShapeCriteria(element)
+    ) {
       return resolveFalse();
     }
     return Criteria.meetsComplexCriteria(element);
@@ -176,15 +174,19 @@ export class Criteria {
    */
   static meetsTreeShapeCriteria(element) {
     const disabledSelector = `${DISABLED_ANCESTORS},${DISABLED_BY_ATTR}`;
-    const disabledAncestor =
-        closestAncestorElementBySelector(element, disabledSelector);
+    const disabledAncestor = closestAncestorElementBySelector(
+      element,
+      disabledSelector
+    );
     // since we lookup both amp-img and amp-carousel at the same level, and
     // we'd like to give amp-carousel special treatment by containing amp-img's,
     // we need to filter out images inside carousels, but not carousels
     // themselves.
-    if (disabledAncestor &&
-        (disabledAncestor != element ||
-        matches(disabledAncestor, DISABLED_BY_ATTR))) {
+    if (
+      disabledAncestor &&
+      (disabledAncestor != element ||
+        matches(disabledAncestor, DISABLED_BY_ATTR))
+    ) {
       return false;
     }
     const actions = Services.actionServiceForDoc(element);
@@ -198,8 +200,9 @@ class ImageCriteria {
    * @return {boolean}
    */
   static meetsSizingCriteria(element) {
-    const {naturalWidth, naturalHeight} =
-        dev().assertElement(element.querySelector('img'));
+    const {naturalWidth, naturalHeight} = dev().assertElement(
+      element.querySelector('img')
+    );
 
     const {width: renderWidth, height: renderHeight} = element.getLayoutBox();
 
@@ -207,16 +210,16 @@ class ImageCriteria {
     const {width: vw, height: vh} = viewport.getSize();
 
     return meetsSizingCriteria(
-        renderWidth,
-        renderHeight,
-        naturalWidth,
-        naturalHeight,
-        vw,
-        vh);
+      renderWidth,
+      renderHeight,
+      naturalWidth,
+      naturalHeight,
+      vw,
+      vh
+    );
   }
 }
 
-
 /**
  * @param {number} renderWidth
  * @param {number} renderHeight
@@ -233,26 +236,22 @@ export function meetsSizingCriteria(
   naturalWidth,
   naturalHeight,
   vw,
-  vh) {
-
+  vh
+) {
   const viewportArea = vw * vh;
   const naturalArea = naturalWidth * naturalHeight;
   const renderArea = renderWidth * renderHeight;
 
-  const isShrunk =
-    (naturalArea / renderArea) >= RENDER_AREA_RATIO;
+  const isShrunk = naturalArea / renderArea >= RENDER_AREA_RATIO;
 
   const isCoveringSignificantArea =
-    (renderArea / viewportArea) >= VIEWPORT_AREA_RATIO;
+    renderArea / viewportArea >= VIEWPORT_AREA_RATIO;
 
   const isLargerThanViewport = naturalWidth > vw || naturalHeight > vh;
 
-  return isShrunk ||
-    isLargerThanViewport ||
-    isCoveringSignificantArea;
+  return isShrunk || isLargerThanViewport || isCoveringSignificantArea;
 }
 
-
 /**
  * Marks a lightbox candidate as visited as not to rescan on DOM update.
  * @param {!Element} candidate
@@ -264,7 +263,6 @@ function markAsVisited(candidate) {
   });
 }
 
-
 /**
  * @param {string} tagName
  * @return {string}
@@ -273,20 +271,18 @@ function candidateSelector(tagName) {
   return `${tagName}:not([${LIGHTBOXABLE_ATTR}]):not([${VISITED_ATTR}])`;
 }
 
-
 /**
  * @param {!Element} element
  * @return {!Promise}
  */
 function whenLoaded(element) {
   return whenUpgradedToCustomElement(element).then(element =>
-    element.signals().whenSignal(CommonSignals.LOAD_END));
+    element.signals().whenSignal(CommonSignals.LOAD_END)
+  );
 }
 
-
 /** @visibleForTesting */
 export class Scanner {
-
   /**
    * Gets all unvisited lightbox candidates.
    * @param {!Document|!Element} root
@@ -300,14 +296,12 @@ export class Scanner {
   }
 }
 
-
 /**
  * Parses document metadata annotations as defined by either LD+JSON schema or
  * Open Graph <meta> tags.
  * @visibleForTesting
  */
 export class DocMetaAnnotations {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @return {string|undefined}
@@ -335,8 +329,8 @@ export class DocMetaAnnotations {
    */
   static getAllLdJsonTypes(ampdoc) {
     return toArray(getRootNode(ampdoc).querySelectorAll(SCRIPT_LD_JSON))
-        .map(({textContent}) => ((tryParseJson(textContent) || {})['@type']))
-        .filter(typeOrUndefined => typeOrUndefined);
+      .map(({textContent}) => (tryParseJson(textContent) || {})['@type'])
+      .filter(typeOrUndefined => typeOrUndefined);
   }
 
   /**
@@ -346,12 +340,12 @@ export class DocMetaAnnotations {
    * @return {boolean}
    */
   static hasValidLdJsonType(ampdoc) {
-    return DocMetaAnnotations.getAllLdJsonTypes(ampdoc)
-        .some(type => ENABLED_LD_JSON_TYPES[type]);
+    return DocMetaAnnotations.getAllLdJsonTypes(ampdoc).some(
+      type => ENABLED_LD_JSON_TYPES[type]
+    );
   }
 }
 
-
 /**
  * Wrapper for an element-implementation-mutate sequence for readability and
  * mocking in tests.
@@ -364,12 +358,12 @@ export class Mutation {
    * @return {!Promise}
    */
   static mutate(ampEl, mutator) {
-    return whenUpgradedToCustomElement(ampEl)
-        .then(ampEl => ampEl.getResources().mutateElement(ampEl, mutator));
+    return whenUpgradedToCustomElement(ampEl).then(ampEl =>
+      ampEl.getResources().mutateElement(ampEl, mutator)
+    );
   }
 }
 
-
 /**
  * Determines whether a document uses `amp-lightbox-gallery` explicitly by
  * including the extension and explicitly lightboxing at least one element.
@@ -378,19 +372,17 @@ export class Mutation {
  */
 function usesLightboxExplicitly(ampdoc) {
   // TODO(alanorozco): Backport into Extensions service.
-  const requiredExtensionSelector =
-      `script[custom-element="${REQUIRED_EXTENSION}"]`;
+  const requiredExtensionSelector = `script[custom-element="${REQUIRED_EXTENSION}"]`;
 
-  const lightboxedElementsSelector =
-      `[${LIGHTBOXABLE_ATTR}]:not([${VISITED_ATTR}])`;
+  const lightboxedElementsSelector = `[${LIGHTBOXABLE_ATTR}]:not([${VISITED_ATTR}])`;
 
   const exists = selector => !!getRootNode(ampdoc).querySelector(selector);
 
-  return exists(requiredExtensionSelector) &&
-      exists(lightboxedElementsSelector);
+  return (
+    exists(requiredExtensionSelector) && exists(lightboxedElementsSelector)
+  );
 }
 
-
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @return {boolean}
@@ -415,7 +407,6 @@ function isProxyOriginOrLocalDev(ampdoc) {
   return Services.urlForDoc(firstElementChild).isProxyOrigin(win.location);
 }
 
-
 /**
  * Determines whether auto-lightbox is enabled for a document.
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -426,18 +417,18 @@ export function isEnabledForDoc(ampdoc) {
   if (usesLightboxExplicitly(ampdoc)) {
     return false;
   }
-  if (!DocMetaAnnotations.hasValidOgType(ampdoc) &&
-      !DocMetaAnnotations.hasValidLdJsonType(ampdoc)) {
+  if (
+    !DocMetaAnnotations.hasValidOgType(ampdoc) &&
+    !DocMetaAnnotations.hasValidLdJsonType(ampdoc)
+  ) {
     return false;
   }
   return isProxyOriginOrLocalDev(ampdoc);
 }
 
-
 /** @private {number} */
 let uid = 0;
 
-
 /**
  * Generates a unique id for lightbox grouping.
  * @return {string}
@@ -446,7 +437,6 @@ function generateLightboxUid() {
   return `i-amphtml-auto-lightbox-${uid++}`;
 }
 
-
 /**
  * Lightboxes an element.
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -458,8 +448,10 @@ export function apply(ampdoc, element) {
   return Mutation.mutate(element, () => {
     element.setAttribute(LIGHTBOXABLE_ATTR, generateLightboxUid());
   }).then(() => {
-    Services.extensionsFor(ampdoc.win)
-        .installExtensionForDoc(ampdoc, REQUIRED_EXTENSION);
+    Services.extensionsFor(ampdoc.win).installExtensionForDoc(
+      ampdoc,
+      REQUIRED_EXTENSION
+    );
 
     element.dispatchCustomEvent(AutoLightboxEvents.NEWLY_SET);
 
@@ -467,7 +459,6 @@ export function apply(ampdoc, element) {
   });
 }
 
-
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @param {!Array<!Element>} candidates
@@ -483,10 +474,10 @@ export function runCandidates(ampdoc, candidates) {
         dev().info(TAG, 'apply', candidate);
         return apply(ampdoc, candidate);
       });
-    }, NOOP));
+    }, NOOP)
+  );
 }
 
-
 /**
  * Scans a document on initialization to lightbox elements that meet criteria.
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -502,7 +493,6 @@ export function scan(ampdoc, opt_root) {
   return runCandidates(ampdoc, Scanner.getCandidates(root));
 }
 
-
 AMP.extension(TAG, '0.1', ({ampdoc}) => {
   ampdoc.whenReady().then(() => {
     getRootNode(ampdoc).addEventListener(AmpEvents.DOM_UPDATE, ({target}) => {
diff --git a/extensions/amp-auto-lightbox/0.1/carousel-criteria.js b/extensions/amp-auto-lightbox/0.1/carousel-criteria.js
index 8bf6b7f74935..33f6de2cfc1e 100644
--- a/extensions/amp-auto-lightbox/0.1/carousel-criteria.js
+++ b/extensions/amp-auto-lightbox/0.1/carousel-criteria.js
@@ -62,7 +62,6 @@ export class CarouselCriteria {
 }
 
 class SlideCriteria {
-
   /**
    * @param {!Element} element
    * @return {!Promise<boolean>}
@@ -77,8 +76,10 @@ class SlideCriteria {
       return resolveFalse();
     }
 
-    const slideMeetsSizingPromise =
-        SlideCriteria.meetsSizingCriteria(img, element);
+    const slideMeetsSizingPromise = SlideCriteria.meetsSizingCriteria(
+      img,
+      element
+    );
 
     return slideMeetsSizingPromise.then(slideMeetsSizingCriteria => {
       if (!slideMeetsSizingCriteria) {
@@ -96,23 +97,23 @@ class SlideCriteria {
   static meetsSizingCriteria(img, slide) {
     devAssert(img.tagName == 'AMP-IMG');
 
-    return img.getImpl().then(impl => new Promise(resolve => {
-      impl.measureElement(() => {
-        const {
-          width: imgWidth,
-          height: imgHeight,
-        } = img.getLayoutBox();
+    return img.getImpl().then(
+      impl =>
+        new Promise(resolve => {
+          impl.measureElement(() => {
+            const {width: imgWidth, height: imgHeight} = img.getLayoutBox();
 
-        const {
-          width: slideWidth,
-          height: slideHeight,
-        } = slide./*OK*/getBoundingClientRect();
+            const {
+              width: slideWidth,
+              height: slideHeight,
+            } = slide./*OK*/ getBoundingClientRect();
 
-        const imgArea = imgWidth * imgHeight;
-        const slideArea = slideWidth * slideHeight;
+            const imgArea = imgWidth * imgHeight;
+            const slideArea = slideWidth * slideHeight;
 
-        resolve((imgArea / slideArea) >= MIN_IMG_SLIDE_AREA_RATIO);
-      });
-    }));
+            resolve(imgArea / slideArea >= MIN_IMG_SLIDE_AREA_RATIO);
+          });
+        })
+    );
   }
 }
diff --git a/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js b/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
index 8b9c2b44aa2c..df1b2e63b5eb 100644
--- a/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
+++ b/extensions/amp-auto-lightbox/0.1/test/test-amp-auto-lightbox.js
@@ -40,669 +40,769 @@ import {htmlFor} from '../../../../src/static-template';
 import {isArray} from '../../../../src/types';
 import {tryResolve} from '../../../../src/utils/promise';
 
-
 const TAG = 'amp-auto-lightbox';
 
-
-describes.realWin(TAG, {
-  amp: {
-    amp: true,
-    ampdoc: 'single',
+describes.realWin(
+  TAG,
+  {
+    amp: {
+      amp: true,
+      ampdoc: 'single',
+    },
   },
-}, env => {
-
-  let html;
+  env => {
+    let html;
 
-  const {any} = sinon.match;
+    const {any} = sinon.match;
 
-  const ldJsonSchemaTypes = Object.keys(ENABLED_LD_JSON_TYPES);
-  const ogTypes = [ENABLED_OG_TYPE_ARTICLE];
+    const ldJsonSchemaTypes = Object.keys(ENABLED_LD_JSON_TYPES);
+    const ogTypes = [ENABLED_OG_TYPE_ARTICLE];
 
-  const firstElementLeaf = el =>
-    el.firstElementChild ? firstElementLeaf(el.firstElementChild) : el;
+    const firstElementLeaf = el =>
+      el.firstElementChild ? firstElementLeaf(el.firstElementChild) : el;
 
-  function wrap(el, wrapper) {
-    firstElementLeaf(wrapper).appendChild(el);
-    return wrapper;
-  }
+    function wrap(el, wrapper) {
+      firstElementLeaf(wrapper).appendChild(el);
+      return wrapper;
+    }
 
-  const stubAllCriteriaMet = () => env.sandbox.stub(Criteria, 'meetsAll');
-  const mockAllCriteriaMet = isMet =>
-    stubAllCriteriaMet().returns(tryResolve(() => isMet));
+    const stubAllCriteriaMet = () => env.sandbox.stub(Criteria, 'meetsAll');
+    const mockAllCriteriaMet = isMet =>
+      stubAllCriteriaMet().returns(tryResolve(() => isMet));
 
-  function mockCandidates(candidates) {
-    env.sandbox.stub(Scanner, 'getCandidates').returns(candidates);
-    return candidates;
-  }
+    function mockCandidates(candidates) {
+      env.sandbox.stub(Scanner, 'getCandidates').returns(candidates);
+      return candidates;
+    }
 
-  const mockLdJsonSchemaTypes = type =>
-    env.sandbox.stub(DocMetaAnnotations, 'getAllLdJsonTypes')
+    const mockLdJsonSchemaTypes = type =>
+      env.sandbox
+        .stub(DocMetaAnnotations, 'getAllLdJsonTypes')
         .returns(isArray(type) ? type : [type]);
 
-  const mockOgType = type =>
-    env.sandbox.stub(DocMetaAnnotations, 'getOgType').returns(type);
+    const mockOgType = type =>
+      env.sandbox.stub(DocMetaAnnotations, 'getOgType').returns(type);
 
-  const iterProduct = (a, b, callback) => a.forEach(itemA =>
-    b.forEach(itemB => callback(itemA, itemB)));
+    const iterProduct = (a, b, callback) =>
+      a.forEach(itemA => b.forEach(itemB => callback(itemA, itemB)));
 
-  const squaredCompare = (set, callback) => iterProduct(set, set, (a, b) => {
-    if (a != b) {
-      callback(a, b);
-    }
-  });
-
-  function mockIsProxyOrigin(isProxyOrigin) {
-    env.sandbox.stub(Services, 'urlForDoc').returns({
-      isProxyOrigin() {
-        return isProxyOrigin;
-      },
-    });
-  }
+    const squaredCompare = (set, callback) =>
+      iterProduct(set, set, (a, b) => {
+        if (a != b) {
+          callback(a, b);
+        }
+      });
 
-  function spyInstallExtensionsForDoc() {
-    const installExtensionForDoc = env.sandbox.spy();
+    function mockIsProxyOrigin(isProxyOrigin) {
+      env.sandbox.stub(Services, 'urlForDoc').returns({
+        isProxyOrigin() {
+          return isProxyOrigin;
+        },
+      });
+    }
 
-    env.sandbox.stub(Services, 'extensionsFor').returns({
-      installExtensionForDoc,
-    });
+    function spyInstallExtensionsForDoc() {
+      const installExtensionForDoc = env.sandbox.spy();
 
-    return installExtensionForDoc;
-  }
+      env.sandbox.stub(Services, 'extensionsFor').returns({
+        installExtensionForDoc,
+      });
 
-  // necessary since element matching `withArgs` deep equals and overflows
-  const matchEquals = comparison =>
-    sinon.match(subject => subject == comparison);
-
-  function mockLoadedSignal(element, isLoadedSuccessfully) {
-    const signals = new Signals();
-    element.signals = () => signals;
-    if (isLoadedSuccessfully) {
-      signals.signal(CommonSignals.LOAD_END);
-    } else {
-      signals.rejectSignal(CommonSignals.LOAD_END, 'Mocked rejection');
+      return installExtensionForDoc;
     }
-    return element;
-  }
 
-  beforeEach(() => {
-    html = htmlFor(env.win.document);
-
-    env.sandbox.stub(Mutation, 'mutate').callsFake((_, mutator) =>
-      tryResolve(mutator));
-  });
+    // necessary since element matching `withArgs` deep equals and overflows
+    const matchEquals = comparison =>
+      sinon.match(subject => subject == comparison);
+
+    function mockLoadedSignal(element, isLoadedSuccessfully) {
+      const signals = new Signals();
+      element.signals = () => signals;
+      if (isLoadedSuccessfully) {
+        signals.signal(CommonSignals.LOAD_END);
+      } else {
+        signals.rejectSignal(CommonSignals.LOAD_END, 'Mocked rejection');
+      }
+      return element;
+    }
 
-  describe('meetsTreeShapeCriteria', () => {
+    beforeEach(() => {
+      html = htmlFor(env.win.document);
 
-    const meetsTreeShapeCriteriaMsg = ({outerHtml}) =>
-      `Criteria.meetsTreeShapeCriteria(html\`${outerHtml}\`)`;
+      env.sandbox
+        .stub(Mutation, 'mutate')
+        .callsFake((_, mutator) => tryResolve(mutator));
+    });
 
-    function itAcceptsOrRejects(scenarios) {
-      scenarios.forEach(({rejects, accepts, mutate, wrapWith}) => {
-        const maybeWrap = root => wrapWith ? wrap(root, wrapWith()) : root;
-        const maybeMutate = root => mutate && mutate(root);
+    describe('meetsTreeShapeCriteria', () => {
+      const meetsTreeShapeCriteriaMsg = ({outerHtml}) =>
+        `Criteria.meetsTreeShapeCriteria(html\`${outerHtml}\`)`;
+
+      function itAcceptsOrRejects(scenarios) {
+        scenarios.forEach(({rejects, accepts, mutate, wrapWith}) => {
+          const maybeWrap = root => (wrapWith ? wrap(root, wrapWith()) : root);
+          const maybeMutate = root => mutate && mutate(root);
+
+          it(`${accepts ? 'accepts' : 'rejects'} ${accepts || rejects}`, () => {
+            [
+              html`
+                <amp-img src="asada.png"></amp-img>
+              `,
+              html`
+                <div><amp-img src="adobada.png"></amp-img></div>
+              `,
+              html`
+                <div>
+                  <div><amp-img src="carnitas.png"></amp-img></div>
+                </div>
+              `,
+            ].forEach(unwrapped => {
+              maybeMutate(unwrapped);
+
+              const scenario = maybeWrap(unwrapped);
+              const candidate = firstElementLeaf(scenario);
+
+              env.win.document.body.appendChild(scenario);
+
+              expect(candidate).to.be.ok;
+              expect(candidate.tagName).to.equal('AMP-IMG');
+
+              expect(
+                Criteria.meetsTreeShapeCriteria(candidate),
+                meetsTreeShapeCriteriaMsg(scenario)
+              ).to.equal(!!accepts);
+            });
+          });
+        });
+      }
 
-        it(`${accepts ? 'accepts' : 'rejects'} ${accepts || rejects}`, () => {
-          [
-            html`<amp-img src="asada.png"></amp-img>`,
-            html`<div><amp-img src="adobada.png"></amp-img></div>`,
-            html`<div><div><amp-img src="carnitas.png"></amp-img></div></div>`,
-          ].forEach(unwrapped => {
-            maybeMutate(unwrapped);
+      describe('self-test', () => {
+        const criteriaIsMetThereforeAcceptsOrRejects = (isMet, scenarios) => {
+          describe(`Criteria ${isMet ? 'met' : 'unmet'}`, () => {
+            beforeEach(() => {
+              env.sandbox
+                .stub(Criteria, 'meetsTreeShapeCriteria')
+                .returns(isMet);
+            });
+            itAcceptsOrRejects(scenarios);
+          });
+        };
+        criteriaIsMetThereforeAcceptsOrRejects(true, [{accepts: 'any'}]);
+        criteriaIsMetThereforeAcceptsOrRejects(false, [{rejects: 'any'}]);
+      });
 
-            const scenario = maybeWrap(unwrapped);
-            const candidate = firstElementLeaf(scenario);
+      beforeEach(() => {
+        // Insert element for valid tap actions to be resolved.
+        env.win.document.body.appendChild(
+          html`
+            <div id="valid"></div>
+          `
+        );
+      });
 
-            env.win.document.body.appendChild(scenario);
+      itAcceptsOrRejects([
+        {
+          accepts: 'elements by default',
+        },
+        {
+          accepts: 'elements with a non-tap action',
+          mutate: el => el.setAttribute('on', 'nottap:valid'),
+        },
+        {
+          accepts: 'elements with a tap action that does not resolve to a node',
+          mutate: el => el.setAttribute('on', 'tap:i-do-not-exist'),
+        },
+        {
+          accepts: 'elements inside non-clickable anchor',
+          wrapWith: () =>
+            html`
+              <a id="my-anchor"></a>
+            `,
+        },
+        {
+          rejects: 'explicitly opted-out subnodes',
+          mutate: el => el.setAttribute('data-amp-auto-lightbox-disable', ''),
+        },
+        {
+          rejects: 'amp-subscriptions subnodes',
+          mutate: el => el.setAttribute('subscriptions-action', ''),
+        },
+        {
+          rejects: 'placeholder subnodes',
+          mutate: el => el.setAttribute('placeholder', ''),
+        },
+        {
+          rejects: 'items actionable by tap with a single action',
+          mutate: el => el.setAttribute('on', 'tap:valid'),
+        },
+        {
+          rejects: 'items actionable by tap with multiple actions',
+          mutate: el => el.setAttribute('on', 'whatever:something;tap:valid'),
+        },
+        {
+          rejects: 'items inside an amp-selector',
+          mutate: el => el.setAttribute('option', ''),
+          wrapWith: () =>
+            html`
+              <amp-selector></amp-selector>
+            `,
+        },
+        {
+          rejects: 'items inside a button',
+          wrapWith: () =>
+            html`
+              <button></button>
+            `,
+        },
+        {
+          rejects: 'items inside amp-script',
+          wrapWith: () =>
+            html`
+              <amp-script></amp-script>
+            `,
+        },
+        {
+          rejects: 'items inside amp-story',
+          wrapWith: () =>
+            html`
+              <amp-story></amp-story>
+            `,
+        },
+        {
+          rejects: 'items inside amp-lightbox',
+          wrapWith: () =>
+            html`
+              <amp-lightbox></amp-lightbox>
+            `,
+        },
+        {
+          rejects: 'items inside a clickable link',
+          wrapWith: () =>
+            html`
+              <a href="http://hamberders.com"></a>
+            `,
+        },
+      ]);
+    });
 
-            expect(candidate).to.be.ok;
-            expect(candidate.tagName).to.equal('AMP-IMG');
+    describe('meetsSizingCriteria', () => {
+      const areaDeltaPerc = RENDER_AREA_RATIO * 100;
+      const {vw, vh} = {vw: 1000, vh: 600};
+
+      const expectMeetsSizingCriteria = (
+        renderWidth,
+        renderHeight,
+        naturalWidth,
+        naturalHeight
+      ) =>
+        expect(
+          meetsSizingCriteria(
+            renderWidth,
+            renderHeight,
+            naturalWidth,
+            naturalHeight,
+            vw,
+            vh
+          )
+        );
 
-            expect(Criteria.meetsTreeShapeCriteria(candidate),
-                meetsTreeShapeCriteriaMsg(scenario)).to.equal(!!accepts);
-          });
-        });
-      });
-    }
+      it(`accepts elements ${areaDeltaPerc}%+ of size than render area`, () => {
+        const renderWidth = 1000;
+        const renderHeight = 200;
 
-    describe('self-test', () => {
-      const criteriaIsMetThereforeAcceptsOrRejects = (isMet, scenarios) => {
-        describe(`Criteria ${isMet ? 'met' : 'unmet'}`, () => {
-          beforeEach(() => {
-            env.sandbox.stub(Criteria, 'meetsTreeShapeCriteria').returns(isMet);
-          });
-          itAcceptsOrRejects(scenarios);
-        });
-      };
-      criteriaIsMetThereforeAcceptsOrRejects(true, [{accepts: 'any'}]);
-      criteriaIsMetThereforeAcceptsOrRejects(false, [{rejects: 'any'}]);
-    });
+        const renderArea = renderWidth * renderHeight;
 
-    beforeEach(() => {
-      // Insert element for valid tap actions to be resolved.
-      env.win.document.body.appendChild(html`<div id="valid"></div>`);
-    });
+        const minArea = renderArea * RENDER_AREA_RATIO;
+        const minDim = Math.sqrt(minArea);
 
-    itAcceptsOrRejects([
-      {
-        accepts: 'elements by default',
-      },
-      {
-        accepts: 'elements with a non-tap action',
-        mutate: el => el.setAttribute('on', 'nottap:valid'),
-      },
-      {
-        accepts: 'elements with a tap action that does not resolve to a node',
-        mutate: el => el.setAttribute('on', 'tap:i-do-not-exist'),
-      },
-      {
-        accepts: 'elements inside non-clickable anchor',
-        wrapWith: () => html`<a id=my-anchor></a>`,
-      },
-      {
-        rejects: 'explicitly opted-out subnodes',
-        mutate: el => el.setAttribute('data-amp-auto-lightbox-disable', ''),
-      },
-      {
-        rejects: 'amp-subscriptions subnodes',
-        mutate: el => el.setAttribute('subscriptions-action', ''),
-      },
-      {
-        rejects: 'placeholder subnodes',
-        mutate: el => el.setAttribute('placeholder', ''),
-      },
-      {
-        rejects: 'items actionable by tap with a single action',
-        mutate: el => el.setAttribute('on', 'tap:valid'),
-      },
-      {
-        rejects: 'items actionable by tap with multiple actions',
-        mutate: el => el.setAttribute('on', 'whatever:something;tap:valid'),
-      },
-      {
-        rejects: 'items inside an amp-selector',
-        mutate: el => el.setAttribute('option', ''),
-        wrapWith: () => html`<amp-selector></amp-selector>`,
-      },
-      {
-        rejects: 'items inside a button',
-        wrapWith: () => html`<button></button>`,
-      },
-      {
-        rejects: 'items inside amp-script',
-        wrapWith: () => html`<amp-script></amp-script>`,
-      },
-      {
-        rejects: 'items inside amp-story',
-        wrapWith: () => html`<amp-story></amp-story>`,
-      },
-      {
-        rejects: 'items inside amp-lightbox',
-        wrapWith: () => html`<amp-lightbox></amp-lightbox>`,
-      },
-      {
-        rejects: 'items inside a clickable link',
-        wrapWith: () => html`<a href="http://hamberders.com"></a>`,
-      },
-    ]);
-
-  });
-
-  describe('meetsSizingCriteria', () => {
-    const areaDeltaPerc = RENDER_AREA_RATIO * 100;
-    const {vw, vh} = {vw: 1000, vh: 600};
-
-    const expectMeetsSizingCriteria = (
-      renderWidth, renderHeight, naturalWidth, naturalHeight) =>
-      expect(meetsSizingCriteria(
-          renderWidth, renderHeight, naturalWidth, naturalHeight, vw, vh));
-
-    it(`accepts elements ${areaDeltaPerc}%+ of size than render area`, () => {
-      const renderWidth = 1000;
-      const renderHeight = 200;
-
-      const renderArea = renderWidth * renderHeight;
-
-      const minArea = (renderArea) * RENDER_AREA_RATIO;
-      const minDim = Math.sqrt(minArea);
-
-      const axisRange = [minDim + 1, minDim + 10, minDim + 100];
-      iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-        expectMeetsSizingCriteria(
+        const axisRange = [minDim + 1, minDim + 10, minDim + 100];
+        iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             naturalWidth,
-            naturalHeight).to.be.true;
+            naturalHeight
+          ).to.be.true;
+        });
       });
-    });
 
-    it(`rejects elements < ${areaDeltaPerc}%+ of size of render area`, () => {
-      const renderWidth = 100;
-      const renderHeight = 100;
+      it(`rejects elements < ${areaDeltaPerc}%+ of size of render area`, () => {
+        const renderWidth = 100;
+        const renderHeight = 100;
 
-      const renderArea = renderWidth * renderHeight;
+        const renderArea = renderWidth * renderHeight;
 
-      const minArea = (renderArea) * (RENDER_AREA_RATIO - 0.1);
-      const minDim = Math.sqrt(minArea);
+        const minArea = renderArea * (RENDER_AREA_RATIO - 0.1);
+        const minDim = Math.sqrt(minArea);
 
-      const axisRange = [minDim, minDim - 10, minDim - 100];
-      iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-        expectMeetsSizingCriteria(
+        const axisRange = [minDim, minDim - 10, minDim - 100];
+        iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             naturalWidth,
-            naturalHeight).to.be.false;
+            naturalHeight
+          ).to.be.false;
+        });
       });
-    });
 
-    const minAreaPerc = VIEWPORT_AREA_RATIO * 100;
+      const minAreaPerc = VIEWPORT_AREA_RATIO * 100;
 
-    it(`accepts elements that cover ${minAreaPerc}%+ of the viewport`, () => {
-      const minArea = (vw * vh) * VIEWPORT_AREA_RATIO;
-      const minDim = Math.sqrt(minArea);
+      it(`accepts elements that cover ${minAreaPerc}%+ of the viewport`, () => {
+        const minArea = vw * vh * VIEWPORT_AREA_RATIO;
+        const minDim = Math.sqrt(minArea);
 
-      const naturalWidth = 100;
-      const naturalHeight = 100;
+        const naturalWidth = 100;
+        const naturalHeight = 100;
 
-      const axisRange = [minDim, minDim + 10, minDim + 100];
-      iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
-        expectMeetsSizingCriteria(
+        const axisRange = [minDim, minDim + 10, minDim + 100];
+        iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             naturalWidth,
-            naturalHeight).to.be.true;
+            naturalHeight
+          ).to.be.true;
+        });
       });
 
-    });
-
-    it(`rejects elements that cover < ${minAreaPerc}% of the viewport`, () => {
-      const minArea = (vw * vh) * VIEWPORT_AREA_RATIO;
-      const minDim = Math.sqrt(minArea);
+      it(`rejects elements that cover < ${minAreaPerc}% of the viewport`, () => {
+        const minArea = vw * vh * VIEWPORT_AREA_RATIO;
+        const minDim = Math.sqrt(minArea);
 
-      const axisRange = [minDim - 1, minDim - 10, minDim - 100];
-      iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
-        expectMeetsSizingCriteria(
+        const axisRange = [minDim - 1, minDim - 10, minDim - 100];
+        iterProduct(axisRange, axisRange, (renderWidth, renderHeight) => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             /* naturalWidth */ renderWidth,
-            /* naturalHeight */ renderHeight).to.be.false;
+            /* naturalHeight */ renderHeight
+          ).to.be.false;
+        });
       });
-    });
 
-    it('accepts elements with height > than viewport\'s', () => {
-      const renderWidth = vw;
-      const renderHeight = vh;
+      it("accepts elements with height > than viewport's", () => {
+        const renderWidth = vw;
+        const renderHeight = vh;
 
-      [
-        vh + 1,
-        vh + 10,
-        vh + 100,
-      ].forEach(naturalHeight => {
-        expectMeetsSizingCriteria(
+        [vh + 1, vh + 10, vh + 100].forEach(naturalHeight => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             /* naturalWidth */ renderWidth,
-            naturalHeight).to.be.true;
+            naturalHeight
+          ).to.be.true;
+        });
       });
-    });
 
-    it('accepts elements with width > than viewport\'s', () => {
-      const renderWidth = vw;
-      const renderHeight = vh;
+      it("accepts elements with width > than viewport's", () => {
+        const renderWidth = vw;
+        const renderHeight = vh;
 
-      [
-        vw + 1,
-        vw + 10,
-        vw + 100,
-      ].forEach(naturalWidth => {
-        expectMeetsSizingCriteria(
+        [vw + 1, vw + 10, vw + 100].forEach(naturalWidth => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             naturalWidth,
-            /* naturalHeight */ renderHeight).to.be.true;
+            /* naturalHeight */ renderHeight
+          ).to.be.true;
+        });
       });
-    });
 
-    it('rejects elements with dimensions <= than viewport\'s', () => {
-      const renderWidth = 100;
-      const renderHeight = 100;
+      it("rejects elements with dimensions <= than viewport's", () => {
+        const renderWidth = 100;
+        const renderHeight = 100;
 
-      const axisRange = [renderWidth, renderWidth - 10, renderWidth - 100];
-      iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
-        expectMeetsSizingCriteria(
+        const axisRange = [renderWidth, renderWidth - 10, renderWidth - 100];
+        iterProduct(axisRange, axisRange, (naturalWidth, naturalHeight) => {
+          expectMeetsSizingCriteria(
             renderWidth,
             renderHeight,
             naturalWidth,
-            naturalHeight).to.be.false;
+            naturalHeight
+          ).to.be.false;
+        });
       });
     });
 
-  });
-
-  describe('scan', () => {
-
-    const waitForAllScannedToBeResolved = () => {
-      const scanned = scan(env.ampdoc);
-      if (scanned) {
-        return Promise.all(scanned);
-      }
-    };
-
-    beforeEach(() => {
-      // mock valid type
-      mockLdJsonSchemaTypes(ldJsonSchemaTypes[0]);
-    });
-
-    it('does not load extension if no candidates found', async() => {
-      const installExtensionForDoc = spyInstallExtensionsForDoc();
-
-      mockIsProxyOrigin(true);
-      mockCandidates([]);
-
-      await waitForAllScannedToBeResolved();
-
-      expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION))
-          .to.not.have.been.called;
-    });
-
-    it('loads extension if >= 1 candidates meet criteria', async() => {
-      const installExtensionForDoc = spyInstallExtensionsForDoc();
-
-      mockIsProxyOrigin(true);
-      mockCandidates([mockLoadedSignal(html`<amp-img></amp-img>`, true)]);
-
-      mockAllCriteriaMet(true);
-
-      await waitForAllScannedToBeResolved();
-
-      expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION))
-          .to.have.been.calledOnce;
-    });
+    describe('scan', () => {
+      const waitForAllScannedToBeResolved = () => {
+        const scanned = scan(env.ampdoc);
+        if (scanned) {
+          return Promise.all(scanned);
+        }
+      };
 
-    it('does not load extension if no candidates meet criteria', async() => {
-      const installExtensionForDoc = spyInstallExtensionsForDoc();
+      beforeEach(() => {
+        // mock valid type
+        mockLdJsonSchemaTypes(ldJsonSchemaTypes[0]);
+      });
 
-      mockCandidates([mockLoadedSignal(html`<amp-img></amp-img>`, true)]);
+      it('does not load extension if no candidates found', async () => {
+        const installExtensionForDoc = spyInstallExtensionsForDoc();
 
-      mockAllCriteriaMet(false);
-      mockIsProxyOrigin(true);
+        mockIsProxyOrigin(true);
+        mockCandidates([]);
 
-      await waitForAllScannedToBeResolved();
+        await waitForAllScannedToBeResolved();
 
-      expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION))
-          .to.not.have.been.called;
-    });
+        expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION)).to.not
+          .have.been.called;
+      });
 
-    it('sets attribute only for candidates that meet criteria', async() => {
-      const a = mockLoadedSignal(html`<amp-img src="a.png"></amp-img>`, true);
-      const b = mockLoadedSignal(html`<amp-img src="b.png"></amp-img>`, true);
-      const c = mockLoadedSignal(html`<amp-img src="c.png"></amp-img>`, true);
+      it('loads extension if >= 1 candidates meet criteria', async () => {
+        const installExtensionForDoc = spyInstallExtensionsForDoc();
 
-      const allCriteriaMet = stubAllCriteriaMet();
+        mockIsProxyOrigin(true);
+        mockCandidates([
+          mockLoadedSignal(
+            html`
+              <amp-img></amp-img>
+            `,
+            true
+          ),
+        ]);
 
-      allCriteriaMet.withArgs(matchEquals(a)).returns(tryResolve(() => true));
-      allCriteriaMet.withArgs(matchEquals(b)).returns(tryResolve(() => false));
-      allCriteriaMet.withArgs(matchEquals(c)).returns(tryResolve(() => true));
+        mockAllCriteriaMet(true);
 
-      mockCandidates([a, b, c]);
-      mockIsProxyOrigin(true);
+        await waitForAllScannedToBeResolved();
 
-      await waitForAllScannedToBeResolved();
+        expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION)).to.have
+          .been.calledOnce;
+      });
 
-      expect(a).to.have.attribute(LIGHTBOXABLE_ATTR);
-      expect(b).to.not.have.attribute(LIGHTBOXABLE_ATTR);
-      expect(c).to.have.attribute(LIGHTBOXABLE_ATTR);
-    });
+      it('does not load extension if no candidates meet criteria', async () => {
+        const installExtensionForDoc = spyInstallExtensionsForDoc();
 
-    it('sets unique group for candidates that meet criteria', async() => {
-      const candidates = mockCandidates([1, 2, 3].map(() =>
-        mockLoadedSignal(html`<amp-img src="a.png"></amp-img>`, true)));
+        mockCandidates([
+          mockLoadedSignal(
+            html`
+              <amp-img></amp-img>
+            `,
+            true
+          ),
+        ]);
 
-      mockAllCriteriaMet(true);
-      mockIsProxyOrigin(true);
+        mockAllCriteriaMet(false);
+        mockIsProxyOrigin(true);
 
-      await waitForAllScannedToBeResolved();
+        await waitForAllScannedToBeResolved();
 
-      squaredCompare(candidates, (a, b) => {
-        expect(a.getAttribute(LIGHTBOXABLE_ATTR))
-            .not.to.equal(b.getAttribute(LIGHTBOXABLE_ATTR));
+        expect(installExtensionForDoc.withArgs(any, REQUIRED_EXTENSION)).to.not
+          .have.been.called;
       });
-    });
-
-  });
 
-  describe('runCandidates', () => {
-
-    it('filters out candidates that fail to load', async() => {
-      const shouldNotLoad = mockLoadedSignal(
-          html`<amp-img src="bla.png"></amp-img>`,
-          false);
+      it('sets attribute only for candidates that meet criteria', async () => {
+        const a = mockLoadedSignal(
+          html`
+            <amp-img src="a.png"></amp-img>
+          `,
+          true
+        );
+        const b = mockLoadedSignal(
+          html`
+            <amp-img src="b.png"></amp-img>
+          `,
+          true
+        );
+        const c = mockLoadedSignal(
+          html`
+            <amp-img src="c.png"></amp-img>
+          `,
+          true
+        );
+
+        const allCriteriaMet = stubAllCriteriaMet();
+
+        allCriteriaMet.withArgs(matchEquals(a)).returns(tryResolve(() => true));
+        allCriteriaMet
+          .withArgs(matchEquals(b))
+          .returns(tryResolve(() => false));
+        allCriteriaMet.withArgs(matchEquals(c)).returns(tryResolve(() => true));
+
+        mockCandidates([a, b, c]);
+        mockIsProxyOrigin(true);
 
-      const shouldLoad = mockLoadedSignal(
-          html`<amp-img src="bla.png"></amp-img>`,
-          true);
+        await waitForAllScannedToBeResolved();
 
-      const candidates = [shouldNotLoad, shouldLoad];
+        expect(a).to.have.attribute(LIGHTBOXABLE_ATTR);
+        expect(b).to.not.have.attribute(LIGHTBOXABLE_ATTR);
+        expect(c).to.have.attribute(LIGHTBOXABLE_ATTR);
+      });
 
-      mockAllCriteriaMet(true);
+      it('sets unique group for candidates that meet criteria', async () => {
+        const candidates = mockCandidates(
+          [1, 2, 3].map(() =>
+            mockLoadedSignal(
+              html`
+                <amp-img src="a.png"></amp-img>
+              `,
+              true
+            )
+          )
+        );
+
+        mockAllCriteriaMet(true);
+        mockIsProxyOrigin(true);
 
-      const elected = await Promise.all(runCandidates(env.ampdoc, candidates));
+        await waitForAllScannedToBeResolved();
 
-      expect(elected).to.have.length(2);
-      expect(elected[0]).to.be.undefined;
-      expect(elected[1]).to.equal(shouldLoad);
+        squaredCompare(candidates, (a, b) => {
+          expect(a.getAttribute(LIGHTBOXABLE_ATTR)).not.to.equal(
+            b.getAttribute(LIGHTBOXABLE_ATTR)
+          );
+        });
+      });
     });
 
-  });
-
-  describe('isEnabledForDoc', () => {
-
-    const expectIsEnabled = shouldBeEnabled => {
-      env.sandbox.stub(env.ampdoc, 'getBody').returns({
-        // only needs to be truthy since its ref req is mocked
-        firstElementChild: true,
+    describe('runCandidates', () => {
+      it('filters out candidates that fail to load', async () => {
+        const shouldNotLoad = mockLoadedSignal(
+          html`
+            <amp-img src="bla.png"></amp-img>
+          `,
+          false
+        );
+
+        const shouldLoad = mockLoadedSignal(
+          html`
+            <amp-img src="bla.png"></amp-img>
+          `,
+          true
+        );
+
+        const candidates = [shouldNotLoad, shouldLoad];
+
+        mockAllCriteriaMet(true);
+
+        const elected = await Promise.all(
+          runCandidates(env.ampdoc, candidates)
+        );
+
+        expect(elected).to.have.length(2);
+        expect(elected[0]).to.be.undefined;
+        expect(elected[1]).to.equal(shouldLoad);
       });
-      expect(isEnabledForDoc(env.ampdoc)).to.equal(shouldBeEnabled);
-    };
-
-    it('rejects documents without any type annotation', () => {
-      mockIsProxyOrigin(true);
-      expectIsEnabled(false);
     });
 
-    describe('DOM selection', () => {
-
-      const mockRootNodeContent = els => {
-        const fakeRoot = html`<div></div>`;
-        els.forEach(el => {
-          fakeRoot.appendChild(el);
+    describe('isEnabledForDoc', () => {
+      const expectIsEnabled = shouldBeEnabled => {
+        env.sandbox.stub(env.ampdoc, 'getBody').returns({
+          // only needs to be truthy since its ref req is mocked
+          firstElementChild: true,
         });
-        env.sandbox.stub(env.ampdoc, 'getRootNode').returns(fakeRoot);
+        expect(isEnabledForDoc(env.ampdoc)).to.equal(shouldBeEnabled);
       };
 
-      describe('getOgType', () => {
-
-        it('returns empty', () => {
-          expect(DocMetaAnnotations.getOgType(env.ampdoc)).to.be.undefined;
-        });
+      it('rejects documents without any type annotation', () => {
+        mockIsProxyOrigin(true);
+        expectIsEnabled(false);
+      });
 
-        it('returns tag', () => {
-          mockRootNodeContent([
-            // Expected:
-            html`<meta property="og:type" content="foo">`,
+      describe('DOM selection', () => {
+        const mockRootNodeContent = els => {
+          const fakeRoot = html`
+            <div></div>
+          `;
+          els.forEach(el => {
+            fakeRoot.appendChild(el);
+          });
+          env.sandbox.stub(env.ampdoc, 'getRootNode').returns(fakeRoot);
+        };
 
-            // Filler:
-            html`<meta property="og:something" content="bar">`,
-            html`<meta property="vims and emacs are both awful" content="baz">`,
-            html`<meta name="description" content="My Website">`,
-          ]);
+        describe('getOgType', () => {
+          it('returns empty', () => {
+            expect(DocMetaAnnotations.getOgType(env.ampdoc)).to.be.undefined;
+          });
 
-          expect(DocMetaAnnotations.getOgType(env.ampdoc)).to.equal('foo');
+          it('returns tag', () => {
+            mockRootNodeContent([
+              // Expected:
+              html`
+                <meta property="og:type" content="foo" />
+              `,
+
+              // Filler:
+              html`
+                <meta property="og:something" content="bar" />
+              `,
+              html`
+                <meta property="vims and emacs are both awful" content="baz" />
+              `,
+              html`
+                <meta name="description" content="My Website" />
+              `,
+            ]);
+
+            expect(DocMetaAnnotations.getOgType(env.ampdoc)).to.equal('foo');
+          });
         });
 
-      });
-
-      describe('getAllLdJsonTypes', () => {
-
-        const createLdJsonTag = content => {
-          const tag = html`<script type="application/ld+json"></script>`;
-          tag.textContent = JSON.stringify(content);
-          return tag;
-        };
+        describe('getAllLdJsonTypes', () => {
+          const createLdJsonTag = content => {
+            const tag = html`
+              <script type="application/ld+json"></script>
+            `;
+            tag.textContent = JSON.stringify(content);
+            return tag;
+          };
+
+          it('returns empty', () => {
+            expect(DocMetaAnnotations.getAllLdJsonTypes(env.ampdoc)).to.be
+              .empty;
+          });
 
-        it('returns empty', () => {
-          expect(DocMetaAnnotations.getAllLdJsonTypes(env.ampdoc)).to.be.empty;
+          it('returns all found @types', () => {
+            const expectedA = 'foo';
+            const expectedB = 'bar';
+            const expectedC = 'baz';
+
+            mockRootNodeContent([
+              html`
+                <script></script>
+              `,
+              createLdJsonTag({'@type': expectedA}),
+              createLdJsonTag({'tacos': 'sí por favor'}),
+              createLdJsonTag({'@type': expectedB}),
+              createLdJsonTag({'@type': expectedC}),
+              createLdJsonTag(''),
+            ]);
+
+            expect(
+              DocMetaAnnotations.getAllLdJsonTypes(env.ampdoc)
+            ).to.deep.equal([expectedA, expectedB, expectedC]);
+          });
         });
+      });
 
-        it('returns all found @types', () => {
-          const expectedA = 'foo';
-          const expectedB = 'bar';
-          const expectedC = 'baz';
-
-          mockRootNodeContent([
-            html`<script></script>`,
-            createLdJsonTag({'@type': expectedA}),
-            createLdJsonTag({'tacos': 'sí por favor'}),
-            createLdJsonTag({'@type': expectedB}),
-            createLdJsonTag({'@type': expectedC}),
-            createLdJsonTag(''),
-          ]);
-
-          expect(DocMetaAnnotations.getAllLdJsonTypes(env.ampdoc))
-              .to.deep.equal([
-                expectedA,
-                expectedB,
-                expectedC,
-              ]);
+      describe('by LD+JSON @type', () => {
+        it('rejects doc with invalid LD+JSON @type', () => {
+          mockIsProxyOrigin(true);
+          mockLdJsonSchemaTypes('hamberder');
+          expectIsEnabled(false);
         });
 
-      });
-
-    });
+        ldJsonSchemaTypes.forEach(type => {
+          const typeSubObj = `{..."@type": "${type}"}`;
 
-    describe('by LD+JSON @type', () => {
+          it(`accepts docs with ${typeSubObj} schema and proxy origin`, () => {
+            mockLdJsonSchemaTypes(type);
+            mockIsProxyOrigin(true);
+            expectIsEnabled(true);
+          });
 
-      it('rejects doc with invalid LD+JSON @type', () => {
-        mockIsProxyOrigin(true);
-        mockLdJsonSchemaTypes('hamberder');
-        expectIsEnabled(false);
-      });
+          it(`rejects docs with ${typeSubObj} schema, lightbox explicit`, () => {
+            const doc = env.win.document;
 
-      ldJsonSchemaTypes.forEach(type => {
-        const typeSubObj = `{..."@type": "${type}"}`;
+            const extensionScript = createElementWithAttributes(doc, 'script', {
+              'custom-element': REQUIRED_EXTENSION,
+            });
 
-        it(`accepts docs with ${typeSubObj} schema and proxy origin`, () => {
-          mockLdJsonSchemaTypes(type);
-          mockIsProxyOrigin(true);
-          expectIsEnabled(true);
-        });
+            const lightboxable = createElementWithAttributes(doc, 'amp-img', {
+              [LIGHTBOXABLE_ATTR]: '',
+            });
 
-        it(`rejects docs with ${typeSubObj} schema, lightbox explicit`, () => {
-          const doc = env.win.document;
+            doc.head.appendChild(extensionScript);
+            doc.body.appendChild(lightboxable);
 
-          const extensionScript = createElementWithAttributes(doc, 'script', {
-            'custom-element': REQUIRED_EXTENSION,
+            mockLdJsonSchemaTypes(type);
+            mockIsProxyOrigin(true);
+            expectIsEnabled(false);
           });
 
-          const lightboxable = createElementWithAttributes(doc, 'amp-img', {
-            [LIGHTBOXABLE_ATTR]: '',
+          it(`rejects docs with ${typeSubObj} schema, non-proxy origin`, () => {
+            mockLdJsonSchemaTypes(type);
+            mockIsProxyOrigin(false);
+            expectIsEnabled(false);
           });
-
-          doc.head.appendChild(extensionScript);
-          doc.body.appendChild(lightboxable);
-
-          mockLdJsonSchemaTypes(type);
-          mockIsProxyOrigin(true);
-          expectIsEnabled(false);
         });
+      });
 
-        it(`rejects docs with ${typeSubObj} schema, non-proxy origin`, () => {
-          mockLdJsonSchemaTypes(type);
-          mockIsProxyOrigin(false);
+      describe('by og:type', () => {
+        it('rejects doc with invalid <meta property="og:type">', () => {
+          mockIsProxyOrigin(true);
+          mockOgType('cinnamonroll');
           expectIsEnabled(false);
         });
 
-      });
-    });
+        ogTypes.forEach(type => {
+          const ogTypeMeta = `<meta property="og:type" content="${type}">`;
 
-    describe('by og:type', () => {
+          it(`accepts docs with ${ogTypeMeta} and proxy origin`, () => {
+            mockOgType(type);
+            mockIsProxyOrigin(true);
+            expectIsEnabled(true);
+          });
 
-      it('rejects doc with invalid <meta property="og:type">', () => {
-        mockIsProxyOrigin(true);
-        mockOgType('cinnamonroll');
-        expectIsEnabled(false);
-      });
+          it(`rejects docs with ${ogTypeMeta}, but lightbox explicit`, () => {
+            const doc = env.win.document;
 
-      ogTypes.forEach(type => {
-        const ogTypeMeta = `<meta property="og:type" content="${type}">`;
+            const extensionScript = createElementWithAttributes(doc, 'script', {
+              'custom-element': REQUIRED_EXTENSION,
+            });
 
-        it(`accepts docs with ${ogTypeMeta} and proxy origin`, () => {
-          mockOgType(type);
-          mockIsProxyOrigin(true);
-          expectIsEnabled(true);
-        });
+            const lightboxable = createElementWithAttributes(doc, 'amp-img', {
+              [LIGHTBOXABLE_ATTR]: '',
+            });
 
-        it(`rejects docs with ${ogTypeMeta}, but lightbox explicit`, () => {
-          const doc = env.win.document;
+            doc.head.appendChild(extensionScript);
+            doc.body.appendChild(lightboxable);
 
-          const extensionScript = createElementWithAttributes(doc, 'script', {
-            'custom-element': REQUIRED_EXTENSION,
+            mockOgType(type);
+            mockIsProxyOrigin(true);
+            expectIsEnabled(false);
           });
 
-          const lightboxable = createElementWithAttributes(doc, 'amp-img', {
-            [LIGHTBOXABLE_ATTR]: '',
+          it(`rejects docs with ${ogTypeMeta} for non-proxy origin`, () => {
+            mockOgType(type);
+            mockIsProxyOrigin(false);
+            expectIsEnabled(false);
           });
-
-          doc.head.appendChild(extensionScript);
-          doc.body.appendChild(lightboxable);
-
-          mockOgType(type);
-          mockIsProxyOrigin(true);
-          expectIsEnabled(false);
         });
-
-        it(`rejects docs with ${ogTypeMeta} for non-proxy origin`, () => {
-          mockOgType(type);
-          mockIsProxyOrigin(false);
-          expectIsEnabled(false);
-        });
-
       });
     });
 
-  });
-
-  describe('apply', () => {
+    describe('apply', () => {
+      it('sets attribute', async () => {
+        const element = html`
+          <amp-img src="chabuddy.g"></amp-img>
+        `;
 
-    it('sets attribute', async() => {
-      const element = html`<amp-img src="chabuddy.g"></amp-img>`;
+        await apply(env.ampdoc, element);
 
-      await apply(env.ampdoc, element);
-
-      expect(element).to.have.attribute(LIGHTBOXABLE_ATTR);
-    });
+        expect(element).to.have.attribute(LIGHTBOXABLE_ATTR);
+      });
 
-    it('sets unique group for each element', async() => {
-      const candidates = [1, 2, 3].map(() => html`<amp-img></amp-img>`);
+      it('sets unique group for each element', async () => {
+        const candidates = [1, 2, 3].map(
+          () =>
+            html`
+              <amp-img></amp-img>
+            `
+        );
 
-      await Promise.all(candidates.map(c => apply(env.ampdoc, c)));
+        await Promise.all(candidates.map(c => apply(env.ampdoc, c)));
 
-      squaredCompare(candidates, (a, b) => {
-        expect(a.getAttribute(LIGHTBOXABLE_ATTR))
-            .not.to.equal(b.getAttribute(LIGHTBOXABLE_ATTR));
+        squaredCompare(candidates, (a, b) => {
+          expect(a.getAttribute(LIGHTBOXABLE_ATTR)).not.to.equal(
+            b.getAttribute(LIGHTBOXABLE_ATTR)
+          );
+        });
       });
-    });
 
-    it('dispatches event', async() => {
-      const element = html`<amp-img src="chabuddy.g"></amp-img>`;
+      it('dispatches event', async () => {
+        const element = html`
+          <amp-img src="chabuddy.g"></amp-img>
+        `;
 
-      element.dispatchCustomEvent = env.sandbox.spy();
+        element.dispatchCustomEvent = env.sandbox.spy();
 
-      await apply(env.ampdoc, element);
+        await apply(env.ampdoc, element);
 
-      expect(element.dispatchCustomEvent.withArgs(AutoLightboxEvents.NEWLY_SET))
-          .to.have.been.calledOnce;
+        expect(
+          element.dispatchCustomEvent.withArgs(AutoLightboxEvents.NEWLY_SET)
+        ).to.have.been.calledOnce;
+      });
     });
-
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-auto-lightbox/0.1/test/test-carousel-criteria.js b/extensions/amp-auto-lightbox/0.1/test/test-carousel-criteria.js
index f468a4f2a262..b0f4744c1221 100644
--- a/extensions/amp-auto-lightbox/0.1/test/test-carousel-criteria.js
+++ b/extensions/amp-auto-lightbox/0.1/test/test-carousel-criteria.js
@@ -18,119 +18,177 @@ import {CarouselCriteria} from '../carousel-criteria';
 import {htmlFor} from '../../../../src/static-template';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
 const TAG = 'amp-auto-lightbox';
 
-
-describes.realWin(TAG, {
-  amp: {
-    amp: true,
-    ampdoc: 'single',
-    experiments: ['amp-auto-lightbox-carousel'],
+describes.realWin(
+  TAG,
+  {
+    amp: {
+      amp: true,
+      ampdoc: 'single',
+      experiments: ['amp-auto-lightbox-carousel'],
+    },
   },
-}, env => {
+  env => {
+    let html;
+
+    function buildCarousel(slides) {
+      const element = html`
+        <amp-carousel></amp-carousel>
+      `;
+      slides.forEach(slide => {
+        slide.classList.add('amp-carousel-slide');
+        element.appendChild(slide);
+      });
+      env.win.document.body.appendChild(element);
+      return element;
+    }
+
+    beforeEach(() => {
+      html = htmlFor(env.win.document.body);
+      toggleExperiment(env.win, 'amp-auto-lightbox-carousel', true);
+    });
+
+    it('rejects carousels without <amp-img>', () => {
+      const root = buildCarousel([
+        html`
+          <div>Slide 1</div>
+        `,
+        html`
+          <div>Slide 2</div>
+        `,
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
+    });
 
-  let html;
+    it('rejects carousels with <amp-img> but non-image slides', () => {
+      const root = buildCarousel([
+        html`
+          <amp-img></amp-img>
+        `,
+        html`
+          <amp-img></amp-img>
+        `,
+        html`
+          <div>Slide</div>
+        `,
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
+    });
 
-  function buildCarousel(slides) {
-    const element = html`<amp-carousel></amp-carousel>`;
-    slides.forEach(slide => {
-      slide.classList.add('amp-carousel-slide');
-      element.appendChild(slide);
+    it('accepts carousels with only <amp-img>', () => {
+      const root = buildCarousel([
+        html`
+          <amp-img></amp-img>
+        `,
+        html`
+          <amp-img></amp-img>
+        `,
+        html`
+          <amp-img></amp-img>
+        `,
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
     });
-    env.win.document.body.appendChild(element);
-    return element;
-  }
 
-  beforeEach(() => {
-    html = htmlFor(env.win.document.body);
-    toggleExperiment(env.win, 'amp-auto-lightbox-carousel', true);
-  });
-
-  it('rejects carousels without <amp-img>', () => {
-    const root = buildCarousel([
-      html`<div>Slide 1</div>`,
-      html`<div>Slide 2</div>`,
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
-  });
-
-  it('rejects carousels with <amp-img> but non-image slides', () => {
-    const root = buildCarousel([
-      html`<amp-img></amp-img>`,
-      html`<amp-img></amp-img>`,
-      html`<div>Slide</div>`,
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
-  });
-
-  it('accepts carousels with only <amp-img>', () => {
-    const root = buildCarousel([
-      html`<amp-img></amp-img>`,
-      html`<amp-img></amp-img>`,
-      html`<amp-img></amp-img>`,
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
-  });
-
-  it('accepts carousels with only <amp-img> (nested)', () => {
-    const root = buildCarousel([
-      html`<div><amp-img></amp-img></div>`,
-      html`<div><amp-img></amp-img></div>`,
-      html`<div><amp-img></amp-img></div>`,
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
-  });
-
-  it('accepts carousels with <amp-img> in every slide (mixed)', () => {
-    const root = buildCarousel([
-      html`<div><amp-img></amp-img> Hello world!</div>`,
-      html`<amp-img></amp-img>`,
-      html`<div><amp-img></amp-img><div><strong>Hola</strong></div>`,
-      html`<div><h1>My Image</h1><amp-img></amp-img></div>`,
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
-  });
-
-  it('rejects deep trees with only <amp-img>', () => {
-    const deep = html`<div><div><div><div><div><div><div><div><div>
-      <amp-img></amp-img>
-    </div></div></div></div></div></div></div></div></div>`;
-
-    const root = buildCarousel([
-      deep,
-      deep.cloneNode(/* deep */ true),
-      deep.cloneNode(/* deep */ true),
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
-  });
-
-  it('rejects wide trees with only <amp-img>', () => {
-    const wide = html`<div>
-      <amp-img></amp-img>
-      <div></div>
-      <div></div>
-      <div></div>
-      <div></div>
-      <div></div>
-      <div></div>
-      <div></div>
-      <div></div>
-    </div>`;
-
-    const root = buildCarousel([
-      wide,
-      wide.cloneNode(/* deep */ true),
-      wide.cloneNode(/* deep */ true),
-    ]);
-
-    expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
-  });
-
-});
+    it('accepts carousels with only <amp-img> (nested)', () => {
+      const root = buildCarousel([
+        html`
+          <div><amp-img></amp-img></div>
+        `,
+        html`
+          <div><amp-img></amp-img></div>
+        `,
+        html`
+          <div><amp-img></amp-img></div>
+        `,
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
+    });
+
+    it('accepts carousels with <amp-img> in every slide (mixed)', () => {
+      const root = buildCarousel([
+        html`
+          <div><amp-img></amp-img> Hello world!</div>
+        `,
+        html`
+          <amp-img></amp-img>
+        `,
+        html`
+          <div>
+            <amp-img></amp-img>
+            <div><strong>Hola</strong></div>
+          </div>
+        `,
+        html`
+          <div>
+            <h1>My Image</h1>
+            <amp-img></amp-img>
+          </div>
+        `,
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.true;
+    });
+
+    it('rejects deep trees with only <amp-img>', () => {
+      const deep = html`
+        <div>
+          <div>
+            <div>
+              <div>
+                <div>
+                  <div>
+                    <div>
+                      <div>
+                        <div>
+                          <amp-img></amp-img>
+                        </div>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      `;
+
+      const root = buildCarousel([
+        deep,
+        deep.cloneNode(/* deep */ true),
+        deep.cloneNode(/* deep */ true),
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
+    });
+
+    it('rejects wide trees with only <amp-img>', () => {
+      const wide = html`
+        <div>
+          <amp-img></amp-img>
+          <div></div>
+          <div></div>
+          <div></div>
+          <div></div>
+          <div></div>
+          <div></div>
+          <div></div>
+          <div></div>
+        </div>
+      `;
+
+      const root = buildCarousel([
+        wide,
+        wide.cloneNode(/* deep */ true),
+        wide.cloneNode(/* deep */ true),
+      ]);
+
+      expect(CarouselCriteria.meetsAll(root)).to.eventually.be.false;
+    });
+  }
+);
diff --git a/extensions/amp-autocomplete/0.1/amp-autocomplete.js b/extensions/amp-autocomplete/0.1/amp-autocomplete.js
index 8f1d31115642..30de9d19b678 100644
--- a/extensions/amp-autocomplete/0.1/amp-autocomplete.js
+++ b/extensions/amp-autocomplete/0.1/amp-autocomplete.js
@@ -19,8 +19,10 @@ import {CSS} from '../../../build/amp-autocomplete-0.1.css';
 import {Keys} from '../../../src/utils/key-codes';
 import {Layout} from '../../../src/layout';
 import {Services} from '../../../src/services';
-import {UrlReplacementPolicy,
-  batchFetchJsonFor} from '../../../src/batched-json';
+import {
+  UrlReplacementPolicy,
+  batchFetchJsonFor,
+} from '../../../src/batched-json';
 import {childElementsByTag, removeChildren} from '../../../src/dom';
 import {createCustomEvent} from '../../../src/event-helper';
 import {dev, user, userAssert} from '../../../src/log';
@@ -49,7 +51,6 @@ export const FilterType = {
 };
 
 export class AmpAutocomplete extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -141,62 +142,85 @@ export class AmpAutocomplete extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-autocomplete'),
-        `Experiment ${EXPERIMENT} is not turned on.`);
+    userAssert(
+      isExperimentOn(this.win, 'amp-autocomplete'),
+      `Experiment ${EXPERIMENT} is not turned on.`
+    );
 
     this.action_ = Services.actionServiceForDoc(this.element);
     this.viewport_ = Services.viewportForDoc(this.element);
 
-    const jsonScript =
-      this.element.querySelector('script[type="application/json"]');
+    const jsonScript = this.element.querySelector(
+      'script[type="application/json"]'
+    );
     if (jsonScript) {
       this.sourceData_ = this.getInlineData_(jsonScript);
     } else if (!this.element.hasAttribute('src')) {
-      user().warn(TAG, 'Expected a <script type="application/json"> child or '
-        + 'a URL specified in "src".');
+      user().warn(
+        TAG,
+        'Expected a <script type="application/json"> child or ' +
+          'a URL specified in "src".'
+      );
     }
 
     const inputElements = childElementsByTag(this.element, 'INPUT');
-    userAssert(inputElements.length === 1,
-        `${TAG} should contain exactly one <input> child`);
+    userAssert(
+      inputElements.length === 1,
+      `${TAG} should contain exactly one <input> child`
+    );
     this.inputElement_ = /** @type {!HTMLInputElement} */ (inputElements[0]);
-    userAssert(this.inputElement_.hasAttribute('type'),
-        `${TAG} requires the "type" attribute on <input>`);
+    userAssert(
+      this.inputElement_.hasAttribute('type'),
+      `${TAG} requires the "type" attribute on <input>`
+    );
     const inputType = this.inputElement_.getAttribute('type');
-    userAssert(inputType === 'text' || inputType === 'search',
-        `${TAG} requires the "type=text|search" attribute on <input>`);
+    userAssert(
+      inputType === 'text' || inputType === 'search',
+      `${TAG} requires the "type=text|search" attribute on <input>`
+    );
     this.inputElement_.setAttribute('dir', 'auto');
 
     userAssert(this.inputElement_.form, `${TAG} should be inside a <form> tag`);
     if (this.inputElement_.form.hasAttribute('autocomplete')) {
-      this.initialAutocompleteAttr_ =
-      this.inputElement_.form.getAttribute('autocomplete');
+      this.initialAutocompleteAttr_ = this.inputElement_.form.getAttribute(
+        'autocomplete'
+      );
     }
 
-    if (this.templates_.hasTemplate(
-        this.element, 'template, script[template]')) {
-      this.templateElement_ =
-        this.templates_.findTemplate(this.element,
-            'template, script[template]');
+    if (
+      this.templates_.hasTemplate(this.element, 'template, script[template]')
+    ) {
+      this.templateElement_ = this.templates_.findTemplate(
+        this.element,
+        'template, script[template]'
+      );
       // Dummy render to verify existence of "data-value" attribute.
-      this.templates_.renderTemplate(this.templateElement_,
-          /** @type {!JsonObject} */({})).then(
-          renderedEl => {
-            userAssert(renderedEl.hasAttribute('data-value') ||
+      this.templates_
+        .renderTemplate(this.templateElement_, /** @type {!JsonObject} */ ({}))
+        .then(renderedEl => {
+          userAssert(
+            renderedEl.hasAttribute('data-value') ||
               renderedEl.hasAttribute('data-disabled'),
-            `${TAG} requires a "data-value" or "data-disabled" attribute.`);
-          });
+            `${TAG} requires a "data-value" or "data-disabled" attribute.`
+          );
+        });
     }
 
-    this.filter_ = userAssert(this.element.getAttribute('filter'),
-        `${TAG} requires "filter" attribute.`);
-    userAssert(isEnumValue(FilterType, this.filter_),
-        `Unexpected filter: ${this.filter_}`);
-
-    this.minChars_ = this.element.hasAttribute('min-characters') ?
-      parseInt(this.element.getAttribute('min-characters'), 10) : 1;
-    this.maxEntries_ = this.element.hasAttribute('max-entries') ?
-      parseInt(this.element.getAttribute('max-entries'), 10) : null;
+    this.filter_ = userAssert(
+      this.element.getAttribute('filter'),
+      `${TAG} requires "filter" attribute.`
+    );
+    userAssert(
+      isEnumValue(FilterType, this.filter_),
+      `Unexpected filter: ${this.filter_}`
+    );
+
+    this.minChars_ = this.element.hasAttribute('min-characters')
+      ? parseInt(this.element.getAttribute('min-characters'), 10)
+      : 1;
+    this.maxEntries_ = this.element.hasAttribute('max-entries')
+      ? parseInt(this.element.getAttribute('max-entries'), 10)
+      : null;
     this.submitOnEnter_ = this.element.hasAttribute('submit-on-enter');
 
     this.container_ = this.createContainer_();
@@ -211,14 +235,16 @@ export class AmpAutocomplete extends AMP.BaseElement {
    * @private
    */
   getInlineData_(script) {
-    const json = tryParseJson(script.textContent,
-        error => {
-          throw error;
-        });
+    const json = tryParseJson(script.textContent, error => {
+      throw error;
+    });
     const items = json['items'];
     if (!items) {
-      user().warn(TAG, 'Expected key "items" in data but found nothing. '
-        + 'Rendering empty results.');
+      user().warn(
+        TAG,
+        'Expected key "items" in data but found nothing. ' +
+          'Rendering empty results.'
+      );
       return [];
     }
     return items;
@@ -233,12 +259,19 @@ export class AmpAutocomplete extends AMP.BaseElement {
   getRemoteData_() {
     const ampdoc = this.getAmpDoc();
     const policy = UrlReplacementPolicy.ALL;
-    return batchFetchJsonFor(ampdoc, this.element, /* opt_expr */ undefined,
-        policy).then(json => {
+    return batchFetchJsonFor(
+      ampdoc,
+      this.element,
+      /* opt_expr */ undefined,
+      policy
+    ).then(json => {
       const items = json['items'];
       if (!items) {
-        user().warn(TAG, 'Expected key "items" in data but found nothing. '
-          + 'Rendering empty results.');
+        user().warn(
+          TAG,
+          'Expected key "items" in data but found nothing. ' +
+            'Rendering empty results.'
+        );
         return [];
       }
       return items;
@@ -287,8 +320,11 @@ export class AmpAutocomplete extends AMP.BaseElement {
     let remoteDataPromise = Promise.resolve();
     if (this.element.hasAttribute('src')) {
       if (this.sourceData_) {
-        user().warn(TAG, 'Discovered both inline <script> and remote "src"'
-        + ' data. Was providing two datasets intended?');
+        user().warn(
+          TAG,
+          'Discovered both inline <script> and remote "src"' +
+            ' data. Was providing two datasets intended?'
+        );
       }
       remoteDataPromise = this.getRemoteData_();
     }
@@ -314,8 +350,10 @@ export class AmpAutocomplete extends AMP.BaseElement {
     }
     if (typeof src === 'object') {
       this.sourceData_ = src['items'] || [];
-      return this.filterDataAndRenderResults_(this.sourceData_,
-          this.userInput_);
+      return this.filterDataAndRenderResults_(
+        this.sourceData_,
+        this.userInput_
+      );
     }
     user().error(TAG, 'Unexpected "src" type: ' + src);
   }
@@ -337,10 +375,10 @@ export class AmpAutocomplete extends AMP.BaseElement {
   }
 
   /**
-  * Handle rendering results on user input.
-  * @return {!Promise}
-  * @private
-  */
+   * Handle rendering results on user input.
+   * @return {!Promise}
+   * @private
+   */
   inputHandler_() {
     this.userInput_ = this.inputElement_.value;
     return this.mutateElement(() => {
@@ -372,13 +410,18 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   filterDataAndRenderResults_(sourceData, opt_input = '') {
     this.clearAllItems_();
-    if (opt_input.length < this.minChars_ || !sourceData ||
-      !sourceData.length) {
+    if (
+      opt_input.length < this.minChars_ ||
+      !sourceData ||
+      !sourceData.length
+    ) {
       return Promise.resolve();
     }
     const filteredData = this.filterData_(sourceData, opt_input);
-    return this.renderResults_(filteredData,
-        dev().assertElement(this.container_));
+    return this.renderResults_(
+      filteredData,
+      dev().assertElement(this.container_)
+    );
   }
 
   /**
@@ -392,23 +435,27 @@ export class AmpAutocomplete extends AMP.BaseElement {
     let renderPromise = Promise.resolve();
     this.resetActiveElement_();
     if (this.templateElement_) {
-      renderPromise = this.templates_.renderTemplateArray(this.templateElement_,
-          filteredData).then(renderedChildren => {
-        renderedChildren.map(child => {
-          if (child.hasAttribute('data-disabled')) {
-            child.setAttribute('aria-disabled', 'true');
-          }
-          child.classList.add('i-amphtml-autocomplete-item');
-          child.setAttribute('role', 'listitem');
-          container.appendChild(child);
+      renderPromise = this.templates_
+        .renderTemplateArray(this.templateElement_, filteredData)
+        .then(renderedChildren => {
+          renderedChildren.map(child => {
+            if (child.hasAttribute('data-disabled')) {
+              child.setAttribute('aria-disabled', 'true');
+            }
+            child.classList.add('i-amphtml-autocomplete-item');
+            child.setAttribute('role', 'listitem');
+            container.appendChild(child);
+          });
         });
-      });
     } else {
       filteredData.forEach(item => {
-        userAssert(typeof item === 'string',
-            `${TAG} data must provide template for non-string items.`);
-        container.appendChild(this.createElementFromItem_(
-            /** @type {string} */ (item)));
+        userAssert(
+          typeof item === 'string',
+          `${TAG} data must provide template for non-string items.`
+        );
+        container.appendChild(
+          this.createElementFromItem_(/** @type {string} */ (item))
+        );
       });
     }
     return renderPromise;
@@ -432,10 +479,12 @@ export class AmpAutocomplete extends AMP.BaseElement {
     const itemsExpr = this.element.getAttribute('filter-value') || 'value';
     const filteredData = data.filter(item => {
       if (typeof item === 'object') {
-        item = getValueForExpr(/** @type {!JsonObject} */(item), itemsExpr);
+        item = getValueForExpr(/** @type {!JsonObject} */ (item), itemsExpr);
       }
-      userAssert(typeof item === 'string',
-          `${TAG} data property "${itemsExpr}" must map to string type.`);
+      userAssert(
+        typeof item === 'string',
+        `${TAG} data property "${itemsExpr}" must map to string type.`
+      );
       item = item.toLocaleLowerCase();
       switch (this.filter_) {
         case FilterType.SUBSTRING:
@@ -509,10 +558,13 @@ export class AmpAutocomplete extends AMP.BaseElement {
 
     // Return that the last input token is a prefix of one of the item tokens
     const remainingItemTokens = Object.keys(itemTokensMap);
-    return match && (lastInputToken === '' ||
-      remainingItemTokens.some(itemToken => {
-        return startsWith(itemToken, lastInputToken);
-      }));
+    return (
+      match &&
+      (lastInputToken === '' ||
+        remainingItemTokens.some(itemToken => {
+          return startsWith(itemToken, lastInputToken);
+        }))
+    );
   }
 
   /**
@@ -537,8 +589,9 @@ export class AmpAutocomplete extends AMP.BaseElement {
   mapFromTokensArray_(tokens) {
     const tokensMap = map();
     tokens.forEach(token => {
-      const count = hasOwn(tokensMap, token) ?
-        ownProperty(tokensMap, token) + 1 : 1;
+      const count = hasOwn(tokensMap, token)
+        ? ownProperty(tokensMap, token) + 1
+        : 1;
       tokensMap[token] = count;
     });
     return tokensMap;
@@ -578,25 +631,30 @@ export class AmpAutocomplete extends AMP.BaseElement {
     if (display) {
       this.inputElement_.form.setAttribute('autocomplete', 'off');
     } else if (this.initialAutocompleteAttr_) {
-      this.inputElement_.form.setAttribute('autocomplete',
-          this.initialAutocompleteAttr_);
+      this.inputElement_.form.setAttribute(
+        'autocomplete',
+        this.initialAutocompleteAttr_
+      );
     } else {
       this.inputElement_.form.removeAttribute('autocomplete');
     }
 
     // Toggle results.
     let renderAbove = false;
-    return this.measureMutateElement(() => {
-      renderAbove = this.shouldRenderAbove_();
-    }, () => {
-      if (!display) {
-        this.userInput_ = this.inputElement_.value;
-        this.filterDataAndRenderResults_(this.sourceData_, this.userInput_);
-        this.resetActiveElement_();
-        this.setResultDisplayDirection_(renderAbove);
+    return this.measureMutateElement(
+      () => {
+        renderAbove = this.shouldRenderAbove_();
+      },
+      () => {
+        if (!display) {
+          this.userInput_ = this.inputElement_.value;
+          this.filterDataAndRenderResults_(this.sourceData_, this.userInput_);
+          this.resetActiveElement_();
+          this.setResultDisplayDirection_(renderAbove);
+        }
+        this.toggleResults_(display);
       }
-      this.toggleResults_(display);
-    });
+    );
   }
 
   /**
@@ -607,7 +665,9 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   setResultDisplayDirection_(renderAbove) {
     this.container_.classList.toggle(
-        'i-amphtml-autocomplete-results-up', renderAbove);
+      'i-amphtml-autocomplete-results-up',
+      renderAbove
+    );
   }
 
   /**
@@ -618,8 +678,9 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   shouldRenderAbove_() {
     const viewHeight = this.viewport_.getHeight() || 0;
-    return this.inputElement_./*OK*/getBoundingClientRect().top
-      > (viewHeight / 2);
+    return (
+      this.inputElement_./*OK*/ getBoundingClientRect().top > viewHeight / 2
+    );
   }
 
   /**
@@ -628,8 +689,10 @@ export class AmpAutocomplete extends AMP.BaseElement {
    * @private
    */
   resultsShowing_() {
-    return !this.container_.hasAttribute('hidden') &&
-      this.container_.children.length > 0;
+    return (
+      !this.container_.hasAttribute('hidden') &&
+      this.container_.children.length > 0
+    );
   }
 
   /**
@@ -657,8 +720,9 @@ export class AmpAutocomplete extends AMP.BaseElement {
     if (element === null || element.hasAttribute('data-disabled')) {
       return;
     }
-    this.inputElement_.value = this.userInput_ =
-      element.getAttribute('data-value');
+    this.inputElement_.value = this.userInput_ = element.getAttribute(
+      'data-value'
+    );
     this.fireSelectEvent_(this.userInput_);
     this.clearAllItems_();
   }
@@ -670,8 +734,11 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   fireSelectEvent_(value) {
     const name = 'select';
-    const selectEvent = createCustomEvent(this.win,
-        `amp-autocomplete.${name}`, /** @type {!JsonObject} */({value}));
+    const selectEvent = createCustomEvent(
+      this.win,
+      `amp-autocomplete.${name}`,
+      /** @type {!JsonObject} */ ({value})
+    );
     this.action_.trigger(this.element, name, selectEvent, ActionTrust.HIGH);
   }
 
@@ -700,22 +767,28 @@ export class AmpAutocomplete extends AMP.BaseElement {
     // Element visibility logic
     let shouldScroll, newTop;
 
-    return this.measureMutateElement(() => {
-      const {offsetTop: itemTop, offsetHeight: itemHeight} = newActiveElement;
-      const {scrollTop: resultTop, offsetHeight: resultHeight} =
-        this.container_;
-      shouldScroll = (resultTop > itemTop ||
-        resultTop + resultHeight < itemTop + itemHeight);
-      newTop = delta > 0 ? itemTop + itemHeight - resultHeight : itemTop;
-    }, () => {
-      if (shouldScroll) {
-        this.container_./*OK*/scrollTop = newTop;
+    return this.measureMutateElement(
+      () => {
+        const {offsetTop: itemTop, offsetHeight: itemHeight} = newActiveElement;
+        const {
+          scrollTop: resultTop,
+          offsetHeight: resultHeight,
+        } = this.container_;
+        shouldScroll =
+          resultTop > itemTop ||
+          resultTop + resultHeight < itemTop + itemHeight;
+        newTop = delta > 0 ? itemTop + itemHeight - resultHeight : itemTop;
+      },
+      () => {
+        if (shouldScroll) {
+          this.container_./*OK*/ scrollTop = newTop;
+        }
+        this.resetActiveElement_();
+        newActiveElement.classList.add('i-amphtml-autocomplete-item-active');
+        this.activeIndex_ = activeIndex;
+        this.activeElement_ = newActiveElement;
       }
-      this.resetActiveElement_();
-      newActiveElement.classList.add('i-amphtml-autocomplete-item-active');
-      this.activeIndex_ = activeIndex;
-      this.activeElement_ = newActiveElement;
-    });
+    );
   }
 
   /** Returns all item elements in the results container that do not have the
@@ -725,7 +798,8 @@ export class AmpAutocomplete extends AMP.BaseElement {
    */
   getEnabledItems_() {
     return this.container_.querySelectorAll(
-        '.i-amphtml-autocomplete-item:not([data-disabled])');
+      '.i-amphtml-autocomplete-item:not([data-disabled])'
+    );
   }
 
   /**
@@ -747,7 +821,9 @@ export class AmpAutocomplete extends AMP.BaseElement {
       return;
     }
     this.activeElement_.classList.toggle(
-        'i-amphtml-autocomplete-item-active', false);
+      'i-amphtml-autocomplete-item-active',
+      false
+    );
     this.activeElement_ = null;
     this.activeIndex_ = -1;
   }
diff --git a/extensions/amp-autocomplete/0.1/test-e2e/test-amp-autocomplete.js b/extensions/amp-autocomplete/0.1/test-e2e/test-amp-autocomplete.js
index f6c1cf1e536e..4abf2948de72 100644
--- a/extensions/amp-autocomplete/0.1/test-e2e/test-amp-autocomplete.js
+++ b/extensions/amp-autocomplete/0.1/test-e2e/test-amp-autocomplete.js
@@ -14,105 +14,126 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-autocomplete', {
-  testUrl: 'http://localhost:8000/test/manual/amp-autocomplete/amp-autocomplete.amp.html',
-  // TODO: Restore 'environments' to default after supporting fourth test in
-  // shadow environment.
-  environments: ['single', 'viewer-demo'],
-  experiments: ['amp-autocomplete'],
-  initialRect: {width: 800, height: 800},
-}, env => {
-  let controller;
+describes.endtoend(
+  'amp-autocomplete',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-autocomplete/amp-autocomplete.amp.html',
+    // TODO: Restore 'environments' to default after supporting fourth test in
+    // shadow environment.
+    environments: ['single', 'viewer-demo'],
+    experiments: ['amp-autocomplete'],
+    initialRect: {width: 800, height: 800},
+  },
+  env => {
+    let controller;
 
-  beforeEach(() => {
-    controller = env.controller;
-  });
+    beforeEach(() => {
+      controller = env.controller;
+    });
 
-  it('<amp-autocomplete> should render', async() => {
-    const autocomplete = await controller.findElement('#autocomplete');
-    await expect(controller.getElementProperty(autocomplete, 'children'))
-        .to.have.length(3);
+    it('<amp-autocomplete> should render', async () => {
+      const autocomplete = await controller.findElement('#autocomplete');
+      await expect(
+        controller.getElementProperty(autocomplete, 'children')
+      ).to.have.length(3);
 
-    const input = await controller.findElement('#input');
-    await expect(controller.getElementAttribute(input, 'type'))
-        .to.equal('text');
+      const input = await controller.findElement('#input');
+      await expect(controller.getElementAttribute(input, 'type')).to.equal(
+        'text'
+      );
 
-    const script = await controller.findElement('#script');
-    await expect(controller.getElementAttribute(script, 'type'))
-        .to.equal('application/json');
+      const script = await controller.findElement('#script');
+      await expect(controller.getElementAttribute(script, 'type')).to.equal(
+        'application/json'
+      );
 
-    const renderedResults =
-      await controller.findElement('.i-amphtml-autocomplete-results');
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(3);
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
+      const renderedResults = await controller.findElement(
+        '.i-amphtml-autocomplete-results'
+      );
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(3);
+      await expect(controller.getElementAttribute(renderedResults, 'hidden'))
         .not.to.be.null;
-  });
+    });
 
-  it('<amp-autocomplete> should display results on focus', async() => {
-    const renderedResults =
-      await controller.findElement('.i-amphtml-autocomplete-results');
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(3);
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
+    it('<amp-autocomplete> should display results on focus', async () => {
+      const renderedResults = await controller.findElement(
+        '.i-amphtml-autocomplete-results'
+      );
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(3);
+      await expect(controller.getElementAttribute(renderedResults, 'hidden'))
         .not.to.be.null;
-    const focusButton = await controller.findElement('#focusButton');
-    await controller.click(focusButton);
+      const focusButton = await controller.findElement('#focusButton');
+      await controller.click(focusButton);
 
-    // Displays all suggested items on focus.
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
-        .to.be.null;
-  });
+      // Displays all suggested items on focus.
+      await expect(controller.getElementAttribute(renderedResults, 'hidden')).to
+        .be.null;
+    });
 
-  it('<amp-autocomplete> should narrow suggestions to input', async() => {
-    const renderedResults =
-      await controller.findElement('.i-amphtml-autocomplete-results');
-    const focusButton = await controller.findElement('#focusButton');
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
+    it('<amp-autocomplete> should narrow suggestions to input', async () => {
+      const renderedResults = await controller.findElement(
+        '.i-amphtml-autocomplete-results'
+      );
+      const focusButton = await controller.findElement('#focusButton');
+      await expect(controller.getElementAttribute(renderedResults, 'hidden'))
         .not.to.be.null;
-    await controller.click(focusButton);
+      await controller.click(focusButton);
 
-    // Displays all suggested items on focus.
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
-        .to.be.null;
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(3);
+      // Displays all suggested items on focus.
+      await expect(controller.getElementAttribute(renderedResults, 'hidden')).to
+        .be.null;
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(3);
 
-    // New input narrows down suggested items.
-    const input = await controller.findElement('#input');
-    await controller.type(input, 'an');
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
-        .to.be.null;
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(2);
-  });
+      // New input narrows down suggested items.
+      const input = await controller.findElement('#input');
+      await controller.type(input, 'an');
+      await expect(controller.getElementAttribute(renderedResults, 'hidden')).to
+        .be.null;
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(2);
+    });
 
-  it('<amp-autocomplete> should select an item', async() => {
-    const renderedResults =
-      await controller.findElement('.i-amphtml-autocomplete-results');
-    const focusButton = await controller.findElement('#focusButton');
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
+    it('<amp-autocomplete> should select an item', async () => {
+      const renderedResults = await controller.findElement(
+        '.i-amphtml-autocomplete-results'
+      );
+      const focusButton = await controller.findElement('#focusButton');
+      await expect(controller.getElementAttribute(renderedResults, 'hidden'))
         .not.to.be.null;
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(3);
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(3);
 
-    // Displays all suggested items on focus.
-    await controller.click(focusButton);
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
-        .to.be.null;
-    const itemElements =
-      await controller.findElements('.i-amphtml-autocomplete-item');
-    await expect(controller.getElementText(itemElements[0])).to.equal('apple');
-    await controller.click(itemElements[0]);
+      // Displays all suggested items on focus.
+      await controller.click(focusButton);
+      await expect(controller.getElementAttribute(renderedResults, 'hidden')).to
+        .be.null;
+      const itemElements = await controller.findElements(
+        '.i-amphtml-autocomplete-item'
+      );
+      await expect(controller.getElementText(itemElements[0])).to.equal(
+        'apple'
+      );
+      await controller.click(itemElements[0]);
 
-    // Displays no items after selecting one.
-    await expect(controller.getElementAttribute(renderedResults, 'hidden'))
+      // Displays no items after selecting one.
+      await expect(controller.getElementAttribute(renderedResults, 'hidden'))
         .not.to.be.null;
-    await expect(controller.getElementProperty(renderedResults, 'children'))
-        .to.have.length(1);
-    const input = await controller.findElement('#input');
-    await expect(controller.getElementProperty(input, 'value'))
-        .to.equal('apple');
-  });
-
-});
+      await expect(
+        controller.getElementProperty(renderedResults, 'children')
+      ).to.have.length(1);
+      const input = await controller.findElement('#input');
+      await expect(controller.getElementProperty(input, 'value')).to.equal(
+        'apple'
+      );
+    });
+  }
+);
diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
index bb13be47eeaa..d168f15b9a0c 100644
--- a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
+++ b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete-init.js
@@ -17,229 +17,268 @@
 import '../amp-autocomplete';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-autocomplete init', {
-  amp: {
-    extensions: ['amp-autocomplete'],
+describes.realWin(
+  'amp-autocomplete init',
+  {
+    amp: {
+      extensions: ['amp-autocomplete'],
+    },
   },
-}, env => {
-
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    toggleExperiment(win, 'amp-autocomplete', true);
-  });
-
-  function setupAutocomplete(attributes,
-    json = '{ "items" : ["apple", "banana", "orange"] }',
-    wantInlineData = true) {
-    const ampAutocomplete = doc.createElement('amp-autocomplete');
-    ampAutocomplete.setAttribute('layout', 'container');
-    for (const key in attributes) {
-      ampAutocomplete.setAttribute(key, attributes[key]);
-    }
+  env => {
+    let win, doc;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'amp-autocomplete', true);
+    });
+
+    function setupAutocomplete(
+      attributes,
+      json = '{ "items" : ["apple", "banana", "orange"] }',
+      wantInlineData = true
+    ) {
+      const ampAutocomplete = doc.createElement('amp-autocomplete');
+      ampAutocomplete.setAttribute('layout', 'container');
+      for (const key in attributes) {
+        ampAutocomplete.setAttribute(key, attributes[key]);
+      }
+
+      const input = win.document.createElement('input');
+      input.setAttribute('type', 'text');
+      ampAutocomplete.appendChild(input);
+
+      if (wantInlineData) {
+        const script = win.document.createElement('script');
+        script.setAttribute('type', 'application/json');
+        script.innerHTML = json;
+        ampAutocomplete.appendChild(script);
+      } else {
+        sandbox
+          .stub(ampAutocomplete.implementation_, 'getRemoteData_')
+          .resolves(json.items);
+      }
 
-    const input = win.document.createElement('input');
-    input.setAttribute('type', 'text');
-    ampAutocomplete.appendChild(input);
-
-    if (wantInlineData) {
-      const script = win.document.createElement('script');
-      script.setAttribute('type', 'application/json');
-      script.innerHTML = json;
-      ampAutocomplete.appendChild(script);
-    } else {
-      sandbox.stub(ampAutocomplete.implementation_, 'getRemoteData_').resolves(
-          json.items);
+      return ampAutocomplete;
     }
 
-    return ampAutocomplete;
-  }
+    function getAutocomplete(
+      attributes,
+      json,
+      wantInlineData,
+      formAutocompleteValue = null
+    ) {
+      const form = doc.createElement('form');
+      if (formAutocompleteValue) {
+        form.setAttribute('autocomplete', formAutocompleteValue);
+      }
 
-  function getAutocomplete(attributes, json, wantInlineData,
-    formAutocompleteValue = null) {
-    const form = doc.createElement('form');
-    if (formAutocompleteValue) {
-      form.setAttribute('autocomplete', formAutocompleteValue);
+      const ampAutocomplete = setupAutocomplete(
+        attributes,
+        json,
+        wantInlineData
+      );
+      form.appendChild(ampAutocomplete);
+      doc.body.appendChild(form);
+      return ampAutocomplete.build().then(() => ampAutocomplete);
     }
 
-    const ampAutocomplete =
-      setupAutocomplete(attributes, json, wantInlineData);
-    form.appendChild(ampAutocomplete);
-    doc.body.appendChild(form);
-    return ampAutocomplete.build().then(() => ampAutocomplete);
-  }
+    it('should layout with experiment on', () => {
+      let impl, filterAndRenderSpy, clearAllSpy, filterSpy, renderSpy;
+      return getAutocomplete({
+        'filter': 'substring',
+      })
+        .then(ampAutocomplete => {
+          impl = ampAutocomplete.implementation_;
+          const expectedItems = ['apple', 'banana', 'orange'];
+          expect(impl.sourceData_).to.have.ordered.members(expectedItems);
+          expect(impl.inputElement_).not.to.be.null;
+          expect(impl.container_).not.to.be.null;
+          expect(impl.filter_).to.equal('substring');
+          filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
+          clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
+          filterSpy = sandbox.spy(impl, 'filterData_');
+          renderSpy = sandbox.spy(impl, 'renderResults_');
+          return ampAutocomplete.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.inputElement_.hasAttribute('autocomplete')).to.be.true;
+          expect(filterAndRenderSpy).to.have.been.calledOnce;
+          expect(clearAllSpy).to.have.been.calledOnce;
+          expect(filterSpy).not.to.have.been.called;
+          expect(renderSpy).not.to.have.been.called;
+        });
+    });
+
+    it('should render with experiment on', () => {
+      let impl, filterAndRenderSpy, clearAllSpy, filterSpy, renderSpy;
+      return getAutocomplete({
+        'filter': 'substring',
+        'min-characters': '0',
+      })
+        .then(ampAutocomplete => {
+          impl = ampAutocomplete.implementation_;
+          const expectedItems = ['apple', 'banana', 'orange'];
+          expect(impl.sourceData_).to.have.ordered.members(expectedItems);
+          expect(impl.inputElement_).not.to.be.null;
+          expect(impl.container_).not.to.be.null;
+          expect(impl.filter_).to.equal('substring');
+          filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
+          clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
+          filterSpy = sandbox.spy(impl, 'filterData_');
+          renderSpy = sandbox.spy(impl, 'renderResults_');
+          return ampAutocomplete.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.inputElement_.hasAttribute('autocomplete')).to.be.true;
+          expect(filterAndRenderSpy).to.have.been.calledOnce;
+          expect(clearAllSpy).to.have.been.calledOnce;
+          expect(filterSpy).to.have.been.calledOnce;
+          expect(renderSpy).to.have.been.calledOnce;
+        });
+    });
+
+    it('should require filter attribute', () => {
+      return allowConsoleError(() => {
+        return expect(getAutocomplete({})).to.be.rejectedWith(
+          'amp-autocomplete requires "filter" attribute.​​​'
+        );
+      });
+    });
+
+    it('should require valid filter attribute', () => {
+      return allowConsoleError(() => {
+        return expect(
+          getAutocomplete({
+            'filter': 'invalid-option',
+          })
+        ).to.be.rejectedWith('Unexpected filter: invalid-option');
+      });
+    });
+
+    it('should render with min-characters passed', () => {
+      return getAutocomplete({
+        'filter': 'substring',
+        'min-characters': '3',
+      }).then(ampAutocomplete => {
+        expect(ampAutocomplete.implementation_.minChars_).to.equal(3);
+      });
+    });
 
-  it('should layout with experiment on', () => {
-    let impl, filterAndRenderSpy, clearAllSpy, filterSpy, renderSpy;
-    return getAutocomplete({
-      'filter': 'substring',
-    }).then(ampAutocomplete => {
-      impl = ampAutocomplete.implementation_;
-      const expectedItems = ['apple', 'banana', 'orange'];
-      expect(impl.sourceData_).to.have.ordered.members(expectedItems);
-      expect(impl.inputElement_).not.to.be.null;
-      expect(impl.container_).not.to.be.null;
-      expect(impl.filter_).to.equal('substring');
-      filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
-      clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
-      filterSpy = sandbox.spy(impl, 'filterData_');
-      renderSpy = sandbox.spy(impl, 'renderResults_');
-      return ampAutocomplete.layoutCallback();
-    }).then(() => {
-      expect(impl.inputElement_.hasAttribute('autocomplete')).to.be.true;
-      expect(filterAndRenderSpy).to.have.been.calledOnce;
-      expect(clearAllSpy).to.have.been.calledOnce;
-      expect(filterSpy).not.to.have.been.called;
-      expect(renderSpy).not.to.have.been.called;
-    });
-  });
-
-  it('should render with experiment on', () => {
-    let impl, filterAndRenderSpy, clearAllSpy, filterSpy, renderSpy;
-    return getAutocomplete({
-      'filter': 'substring',
-      'min-characters': '0',
-    }).then(ampAutocomplete => {
-      impl = ampAutocomplete.implementation_;
-      const expectedItems = ['apple', 'banana', 'orange'];
-      expect(impl.sourceData_).to.have.ordered.members(expectedItems);
-      expect(impl.inputElement_).not.to.be.null;
-      expect(impl.container_).not.to.be.null;
-      expect(impl.filter_).to.equal('substring');
-      filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
-      clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
-      filterSpy = sandbox.spy(impl, 'filterData_');
-      renderSpy = sandbox.spy(impl, 'renderResults_');
-      return ampAutocomplete.layoutCallback();
-    }).then(() => {
-      expect(impl.inputElement_.hasAttribute('autocomplete')).to.be.true;
-      expect(filterAndRenderSpy).to.have.been.calledOnce;
-      expect(clearAllSpy).to.have.been.calledOnce;
-      expect(filterSpy).to.have.been.calledOnce;
-      expect(renderSpy).to.have.been.calledOnce;
-    });
-  });
-
-  it('should require filter attribute', () => {
-    return allowConsoleError(() => {
-      return expect(getAutocomplete({})).to.be
-          .rejectedWith('amp-autocomplete requires "filter" attribute.​​​');
-    });
-  });
-
-  it('should require valid filter attribute', () => {
-    return allowConsoleError(() => {
-      return expect(getAutocomplete({
-        'filter': 'invalid-option',
-      })).to.be.rejectedWith('Unexpected filter: invalid-option');
-    });
-  });
-
-  it('should render with min-characters passed', () => {
-    return getAutocomplete({
-      'filter': 'substring',
-      'min-characters': '3',
-    }).then(ampAutocomplete => {
-      expect(ampAutocomplete.implementation_.minChars_).to.equal(3);
-    });
-  });
-
-  it('should render with max-entries passed', () => {
-    return getAutocomplete({
-      'filter': 'substring',
-      'max-entries': '10',
-    }).then(ampAutocomplete => {
-      expect(ampAutocomplete.implementation_.maxEntries_).to.equal(10);
-    });
-  });
-
-  it('should not render with experiment off', () => {
-    toggleExperiment(win, 'amp-autocomplete', false);
-    return allowConsoleError(() => {
-      return expect(getAutocomplete({})).to.be.rejectedWith(
-          'Experiment amp-autocomplete is not turned on.');
-    });
-  });
-
-  it('should error with invalid JSON script', () => {
-    expectAsyncConsoleError('Unexpected token o in JSON at position'
-      + ' 32 [object HTMLElement]');
-    return expect(getAutocomplete({
-      'filter': 'substring',
-    }, '{ "items" : ["apple", "banana", orange] }')).to.be.rejectedWith(
-        'Unexpected token o in JSON at position 32');
-  });
-
-  it('should accept empty JSON script', () => {
-    return getAutocomplete({
-      'filter': 'substring',
-    }, '{}').then(ampAutocomplete => {
-      const impl = ampAutocomplete.implementation_;
-      expect(impl.sourceData_).to.be.an('array').that.is.empty;
-    });
-  });
-
-  it('should accept empty items JSON script', () => {
-    return getAutocomplete({
-      'filter': 'substring',
-    }, '{ "items" : [] }').then(ampAutocomplete => {
-      const impl = ampAutocomplete.implementation_;
-      expect(impl.sourceData_).to.be.an('array').that.is.empty;
-    });
-  });
-
-  it('should fetch remote data when specified in src', () => {
-    const data = {
-      items: [
-        'Albany, New York',
-        'Annapolis, Maryland',
-        'Atlanta, Georgia',
-        'Augusta, Maine',
-        'Austin, Texas',
-      ],
-    };
-    return getAutocomplete({
-      'filter': 'substring',
-      'src': 'https://examples.com/json',
-    }, data, false).then(ampAutocomplete => {
-      ampAutocomplete.layoutCallback().then(() => {
+    it('should render with max-entries passed', () => {
+      return getAutocomplete({
+        'filter': 'substring',
+        'max-entries': '10',
+      }).then(ampAutocomplete => {
+        expect(ampAutocomplete.implementation_.maxEntries_).to.equal(10);
+      });
+    });
+
+    it('should not render with experiment off', () => {
+      toggleExperiment(win, 'amp-autocomplete', false);
+      return allowConsoleError(() => {
+        return expect(getAutocomplete({})).to.be.rejectedWith(
+          'Experiment amp-autocomplete is not turned on.'
+        );
+      });
+    });
+
+    it('should error with invalid JSON script', () => {
+      expectAsyncConsoleError(
+        'Unexpected token o in JSON at position 32 [object HTMLElement]'
+      );
+      return expect(
+        getAutocomplete(
+          {
+            'filter': 'substring',
+          },
+          '{ "items" : ["apple", "banana", orange] }'
+        )
+      ).to.be.rejectedWith('Unexpected token o in JSON at position 32');
+    });
+
+    it('should accept empty JSON script', () => {
+      return getAutocomplete(
+        {
+          'filter': 'substring',
+        },
+        '{}'
+      ).then(ampAutocomplete => {
         const impl = ampAutocomplete.implementation_;
-        expect(impl.sourceData_).to.have.ordered.members(data.items);
+        expect(impl.sourceData_).to.be.an('array').that.is.empty;
       });
     });
-  });
 
-  it('should error without the form ancestor', () => {
-    return allowConsoleError(() => {
-      const autocomplete = setupAutocomplete({'filter': 'substring'});
-      doc.body.appendChild(autocomplete);
-      return expect(autocomplete.build()).to.be.rejectedWith(
-          'amp-autocomplete should be inside a <form> tag');
+    it('should accept empty items JSON script', () => {
+      return getAutocomplete(
+        {
+          'filter': 'substring',
+        },
+        '{ "items" : [] }'
+      ).then(ampAutocomplete => {
+        const impl = ampAutocomplete.implementation_;
+        expect(impl.sourceData_).to.be.an('array').that.is.empty;
+      });
     });
-  });
 
-  it('should read the autocomplete attribute on the form as null', () => {
-    return getAutocomplete({'filter': 'substring'}).then(ampAutocomplete => {
-      const impl = ampAutocomplete.implementation_;
-      expect(impl.initialAutocompleteAttr_).to.be.null;
+    it('should fetch remote data when specified in src', () => {
+      const data = {
+        items: [
+          'Albany, New York',
+          'Annapolis, Maryland',
+          'Atlanta, Georgia',
+          'Augusta, Maine',
+          'Austin, Texas',
+        ],
+      };
+      return getAutocomplete(
+        {
+          'filter': 'substring',
+          'src': 'https://examples.com/json',
+        },
+        data,
+        false
+      ).then(ampAutocomplete => {
+        ampAutocomplete.layoutCallback().then(() => {
+          const impl = ampAutocomplete.implementation_;
+          expect(impl.sourceData_).to.have.ordered.members(data.items);
+        });
+      });
     });
-  });
 
-  it('should read the autocomplete attribute on the form as on', () => {
-    return getAutocomplete({'filter': 'substring'}, '{}', true, 'on').then(
+    it('should error without the form ancestor', () => {
+      return allowConsoleError(() => {
+        const autocomplete = setupAutocomplete({'filter': 'substring'});
+        doc.body.appendChild(autocomplete);
+        return expect(autocomplete.build()).to.be.rejectedWith(
+          'amp-autocomplete should be inside a <form> tag'
+        );
+      });
+    });
+
+    it('should read the autocomplete attribute on the form as null', () => {
+      return getAutocomplete({'filter': 'substring'}).then(ampAutocomplete => {
+        const impl = ampAutocomplete.implementation_;
+        expect(impl.initialAutocompleteAttr_).to.be.null;
+      });
+    });
+
+    it('should read the autocomplete attribute on the form as on', () => {
+      return getAutocomplete({'filter': 'substring'}, '{}', true, 'on').then(
         ampAutocomplete => {
           const impl = ampAutocomplete.implementation_;
           expect(impl.initialAutocompleteAttr_).to.equal('on');
-        });
-  });
+        }
+      );
+    });
 
-  it('should read the autocomplete attribute on the form as off', () => {
-    return getAutocomplete({'filter': 'substring'}, '{}', true, 'off').then(
+    it('should read the autocomplete attribute on the form as off', () => {
+      return getAutocomplete({'filter': 'substring'}, '{}', true, 'off').then(
         ampAutocomplete => {
           const impl = ampAutocomplete.implementation_;
           expect(impl.initialAutocompleteAttr_).to.equal('off');
-        });
-  });
-});
+        }
+      );
+    });
+  }
+);
diff --git a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
index b6ec484bd92d..769169aef1f9 100644
--- a/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
+++ b/extensions/amp-autocomplete/0.1/test/test-amp-autocomplete.js
@@ -18,668 +18,787 @@ import '../amp-autocomplete';
 import {Keys} from '../../../../src/utils/key-codes';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-autocomplete unit tests', {
-  amp: {
-    extensions: ['amp-autocomplete'],
+describes.realWin(
+  'amp-autocomplete unit tests',
+  {
+    amp: {
+      extensions: ['amp-autocomplete'],
+    },
   },
-}, env => {
-
-  let win, doc, element, impl;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    toggleExperiment(win, 'amp-autocomplete', true);
-
-    const form = doc.createElement('form');
-    const ampAutocomplete = doc.createElement('amp-autocomplete');
-    ampAutocomplete.setAttribute('layout', 'container');
-    ampAutocomplete.setAttribute('filter', 'substring');
-
-    const input = win.document.createElement('input');
-    input.setAttribute('type', 'text');
-    ampAutocomplete.appendChild(input);
-
-    const script = win.document.createElement('script');
-    script.setAttribute('type', 'application/json');
-    script.innerHTML = '{ "items" : ["apple", "banana", "orange"] }';
-    ampAutocomplete.appendChild(script);
-
-    form.appendChild(ampAutocomplete);
-    doc.body.appendChild(form);
-    return ampAutocomplete.build().then(() => {
-      element = ampAutocomplete;
-      impl = element.implementation_;
-    });
-  });
-
-  describe('mutatedAttributesCallback_()', () => {
-    let remoteDataSpy;
-    let filterAndRenderSpy;
+  env => {
+    let win, doc, element, impl;
 
     beforeEach(() => {
-      remoteDataSpy = sandbox.stub(impl, 'getRemoteData_').resolves(
-          ['a', 'b', 'c']);
-      filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
-    });
-
-    it('should resolve when param is {}', () => {
-      return impl.mutatedAttributesCallback({}).then(() => {
-        expect(remoteDataSpy).not.to.have.been.called;
-        expect(filterAndRenderSpy).not.to.have.been.called;
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'amp-autocomplete', true);
+
+      const form = doc.createElement('form');
+      const ampAutocomplete = doc.createElement('amp-autocomplete');
+      ampAutocomplete.setAttribute('layout', 'container');
+      ampAutocomplete.setAttribute('filter', 'substring');
+
+      const input = win.document.createElement('input');
+      input.setAttribute('type', 'text');
+      ampAutocomplete.appendChild(input);
+
+      const script = win.document.createElement('script');
+      script.setAttribute('type', 'application/json');
+      script.innerHTML = '{ "items" : ["apple", "banana", "orange"] }';
+      ampAutocomplete.appendChild(script);
+
+      form.appendChild(ampAutocomplete);
+      doc.body.appendChild(form);
+      return ampAutocomplete.build().then(() => {
+        element = ampAutocomplete;
+        impl = element.implementation_;
       });
     });
 
-    it('should resolve when src is undefined', () => {
-      return impl.mutatedAttributesCallback({'src': undefined}).then(() => {
-        expect(remoteDataSpy).not.to.have.been.called;
-        expect(filterAndRenderSpy).not.to.have.been.called;
+    describe('mutatedAttributesCallback_()', () => {
+      let remoteDataSpy;
+      let filterAndRenderSpy;
+
+      beforeEach(() => {
+        remoteDataSpy = sandbox
+          .stub(impl, 'getRemoteData_')
+          .resolves(['a', 'b', 'c']);
+        filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
       });
-    });
 
-    it('should resolve when src is null', () => {
-      return impl.mutatedAttributesCallback({'src': null}).then(() => {
-        expect(remoteDataSpy).not.to.have.been.called;
-        expect(filterAndRenderSpy).not.to.have.been.called;
+      it('should resolve when param is {}', () => {
+        return impl.mutatedAttributesCallback({}).then(() => {
+          expect(remoteDataSpy).not.to.have.been.called;
+          expect(filterAndRenderSpy).not.to.have.been.called;
+        });
       });
-    });
 
-    it('should pass on calls when src is type str', () => {
-      return impl.mutatedAttributesCallback(
-          {'src': 'example.json'}).then(() => {
-        expect(remoteDataSpy).to.have.been.calledOnce;
-        expect(impl.sourceData_).to.have.ordered.members(['a', 'b', 'c']);
-        expect(filterAndRenderSpy).to.have.been.calledOnce;
-        expect(filterAndRenderSpy).to.have.been.calledWith(['a', 'b', 'c'], '');
+      it('should resolve when src is undefined', () => {
+        return impl.mutatedAttributesCallback({'src': undefined}).then(() => {
+          expect(remoteDataSpy).not.to.have.been.called;
+          expect(filterAndRenderSpy).not.to.have.been.called;
+        });
       });
-    });
 
-    it('should pass on calls when src is type object with "items"', () => {
-      return impl.mutatedAttributesCallback(
-          {'src': {'items': ['a', 'b', 'c']}}).then(() => {
-        expect(remoteDataSpy).not.to.have.been.called;
-        expect(impl.sourceData_).to.have.ordered.members(['a', 'b', 'c']);
-        expect(filterAndRenderSpy).to.have.been.calledOnce;
-        expect(filterAndRenderSpy).to.have.been.calledWith(['a', 'b', 'c'], '');
+      it('should resolve when src is null', () => {
+        return impl.mutatedAttributesCallback({'src': null}).then(() => {
+          expect(remoteDataSpy).not.to.have.been.called;
+          expect(filterAndRenderSpy).not.to.have.been.called;
+        });
       });
-    });
 
-    it('should pass on calls when src is type object without "items"', () => {
-      return impl.mutatedAttributesCallback(
-          {'src': {'random': 'value'}}).then(() => {
-        expect(remoteDataSpy).not.to.have.been.called;
-        expect(impl.sourceData_).to.be.an('array').that.is.empty;
-        expect(filterAndRenderSpy).to.have.been.calledOnce;
-        expect(filterAndRenderSpy).to.have.been.calledWith([], '');
+      it('should pass on calls when src is type str', () => {
+        return impl
+          .mutatedAttributesCallback({'src': 'example.json'})
+          .then(() => {
+            expect(remoteDataSpy).to.have.been.calledOnce;
+            expect(impl.sourceData_).to.have.ordered.members(['a', 'b', 'c']);
+            expect(filterAndRenderSpy).to.have.been.calledOnce;
+            expect(filterAndRenderSpy).to.have.been.calledWith(
+              ['a', 'b', 'c'],
+              ''
+            );
+          });
       });
-    });
-  });
-
-  it('createElementFromItem_() should return element', () => {
-    let element = impl.createElementFromItem_('hello');
-    expect(element).not.to.be.null;
-    expect(element).to.have.class('i-amphtml-autocomplete-item');
-    expect(element.hasAttribute('role')).to.be.true;
-    expect(element.innerText).to.equal('hello');
-
-    element = impl.createElementFromItem_('');
-    expect(element).not.to.be.null;
-    expect(element).to.have.class('i-amphtml-autocomplete-item');
-    expect(element.hasAttribute('role')).to.be.true;
-    expect(element.innerText).to.equal('');
-  });
-
-  describe('filterDataAndRenderResults_()',
-      () => {
-        let clearAllItemsSpy;
-        let renderSpy;
-        let filterDataSpy;
-        beforeEach(() => {
-          expect(impl.container_).not.to.be.null;
-          expect(impl.container_.children.length).to.equal(0);
-          clearAllItemsSpy = sandbox.spy(impl, 'clearAllItems_');
-          filterDataSpy = sandbox.spy(impl, 'filterData_');
-          renderSpy = sandbox.spy(impl, 'renderResults_');
-        });
 
-        it('should only clear if input < minChars_', () => {
-          impl.minChars_ = 3;
-          return impl.filterDataAndRenderResults_([], 'ap').then(() => {
-            expect(clearAllItemsSpy).to.have.been.calledOnce;
-            expect(filterDataSpy).not.to.have.been.called;
-            expect(renderSpy).not.to.have.been.called;
+      it('should pass on calls when src is type object with "items"', () => {
+        return impl
+          .mutatedAttributesCallback({'src': {'items': ['a', 'b', 'c']}})
+          .then(() => {
+            expect(remoteDataSpy).not.to.have.been.called;
+            expect(impl.sourceData_).to.have.ordered.members(['a', 'b', 'c']);
+            expect(filterAndRenderSpy).to.have.been.calledOnce;
+            expect(filterAndRenderSpy).to.have.been.calledWith(
+              ['a', 'b', 'c'],
+              ''
+            );
           });
-        });
+      });
 
-        it('should only clear if data is null', () => {
-          return impl.filterDataAndRenderResults_(null, 'ap').then(() => {
-            expect(clearAllItemsSpy).to.have.been.calledOnce;
-            expect(filterDataSpy).not.to.have.been.called;
-            expect(renderSpy).not.to.have.been.called;
+      it('should pass on calls when src is type object without "items"', () => {
+        return impl
+          .mutatedAttributesCallback({'src': {'random': 'value'}})
+          .then(() => {
+            expect(remoteDataSpy).not.to.have.been.called;
+            expect(impl.sourceData_).to.be.an('array').that.is.empty;
+            expect(filterAndRenderSpy).to.have.been.calledOnce;
+            expect(filterAndRenderSpy).to.have.been.calledWith([], '');
           });
+      });
+    });
+
+    it('createElementFromItem_() should return element', () => {
+      let element = impl.createElementFromItem_('hello');
+      expect(element).not.to.be.null;
+      expect(element).to.have.class('i-amphtml-autocomplete-item');
+      expect(element.hasAttribute('role')).to.be.true;
+      expect(element.innerText).to.equal('hello');
+
+      element = impl.createElementFromItem_('');
+      expect(element).not.to.be.null;
+      expect(element).to.have.class('i-amphtml-autocomplete-item');
+      expect(element.hasAttribute('role')).to.be.true;
+      expect(element.innerText).to.equal('');
+    });
+
+    describe('filterDataAndRenderResults_()', () => {
+      let clearAllItemsSpy;
+      let renderSpy;
+      let filterDataSpy;
+      beforeEach(() => {
+        expect(impl.container_).not.to.be.null;
+        expect(impl.container_.children.length).to.equal(0);
+        clearAllItemsSpy = sandbox.spy(impl, 'clearAllItems_');
+        filterDataSpy = sandbox.spy(impl, 'filterData_');
+        renderSpy = sandbox.spy(impl, 'renderResults_');
+      });
+
+      it('should only clear if input < minChars_', () => {
+        impl.minChars_ = 3;
+        return impl.filterDataAndRenderResults_([], 'ap').then(() => {
+          expect(clearAllItemsSpy).to.have.been.calledOnce;
+          expect(filterDataSpy).not.to.have.been.called;
+          expect(renderSpy).not.to.have.been.called;
         });
+      });
 
-        it('should only clear if data is []', () => {
-          return impl.filterDataAndRenderResults_([], 'ap').then(() => {
-            expect(clearAllItemsSpy).to.have.been.calledOnce;
-            expect(filterDataSpy).not.to.have.been.called;
-            expect(renderSpy).not.to.have.been.called;
-          });
+      it('should only clear if data is null', () => {
+        return impl.filterDataAndRenderResults_(null, 'ap').then(() => {
+          expect(clearAllItemsSpy).to.have.been.calledOnce;
+          expect(filterDataSpy).not.to.have.been.called;
+          expect(renderSpy).not.to.have.been.called;
         });
+      });
 
-        it('should pass on valid arguments', () => {
-          impl.minChars_ = 2;
-          return impl.filterDataAndRenderResults_(impl.sourceData_, 'ap').then(
-              () => {
-                expect(clearAllItemsSpy).to.have.been.calledOnce;
-                expect(filterDataSpy).to.have.been.calledWith(
-                    impl.sourceData_, 'ap');
-                expect(renderSpy).to.have.been.calledWith(
-                    ['apple'], impl.container_);
-                expect(impl.container_.children.length).to.equal(1);
-                expect(impl.container_.children[0].innerText).to.equal('apple');
-              });
+      it('should only clear if data is []', () => {
+        return impl.filterDataAndRenderResults_([], 'ap').then(() => {
+          expect(clearAllItemsSpy).to.have.been.calledOnce;
+          expect(filterDataSpy).not.to.have.been.called;
+          expect(renderSpy).not.to.have.been.called;
         });
       });
 
-  it('renderResults_() should update the container_ with plain text', () => {
-    const createSpy = sandbox.spy(impl, 'createElementFromItem_');
-    return impl.renderResults_(['apple'], impl.container_).then(() => {
-      expect(impl.container_.children.length).to.equal(1);
-      expect(impl.container_.children[0].innerText).to.equal('apple');
-      expect(createSpy).to.have.been.calledOnce;
-      expect(createSpy).to.have.been.calledWith('apple');
+      it('should pass on valid arguments', () => {
+        impl.minChars_ = 2;
+        return impl
+          .filterDataAndRenderResults_(impl.sourceData_, 'ap')
+          .then(() => {
+            expect(clearAllItemsSpy).to.have.been.calledOnce;
+            expect(filterDataSpy).to.have.been.calledWith(
+              impl.sourceData_,
+              'ap'
+            );
+            expect(renderSpy).to.have.been.calledWith(
+              ['apple'],
+              impl.container_
+            );
+            expect(impl.container_.children.length).to.equal(1);
+            expect(impl.container_.children[0].innerText).to.equal('apple');
+          });
+      });
     });
-  });
-
-  it('renderResults_() should update the container_ with rich text', () => {
-    const sourceData = [{value: 'apple'}, {value: 'mango'}, {value: 'pear'}];
-    impl.templateElement_ = doc.createElement('template');
-    const renderedChildren = [];
-    sourceData.forEach(item => {
-      const renderedChild = doc.createElement('div');
-      renderedChild.setAttribute('data-value', item.value);
-      renderedChildren.push(renderedChild);
+
+    it('renderResults_() should update the container_ with plain text', () => {
+      const createSpy = sandbox.spy(impl, 'createElementFromItem_');
+      return impl.renderResults_(['apple'], impl.container_).then(() => {
+        expect(impl.container_.children.length).to.equal(1);
+        expect(impl.container_.children[0].innerText).to.equal('apple');
+        expect(createSpy).to.have.been.calledOnce;
+        expect(createSpy).to.have.been.calledWith('apple');
+      });
     });
-    const renderTemplateSpy =
-        sandbox.stub(impl.templates_, 'renderTemplateArray').returns(
-            Promise.resolve(renderedChildren));
-
-    return impl.renderResults_(sourceData, impl.container_).then(() => {
-      expect(impl.container_.children.length).to.equal(3);
-      expect(impl.container_.children[0].getAttribute('data-value')).to.equal(
-          'apple');
-      expect(impl.container_.children[1].getAttribute('data-value')).to.equal(
-          'mango');
-      expect(impl.container_.children[2].getAttribute('data-value')).to.equal(
-          'pear');
-      expect(renderTemplateSpy).to.have.been.calledOnce;
+
+    it('renderResults_() should update the container_ with rich text', () => {
+      const sourceData = [{value: 'apple'}, {value: 'mango'}, {value: 'pear'}];
+      impl.templateElement_ = doc.createElement('template');
+      const renderedChildren = [];
+      sourceData.forEach(item => {
+        const renderedChild = doc.createElement('div');
+        renderedChild.setAttribute('data-value', item.value);
+        renderedChildren.push(renderedChild);
+      });
+      const renderTemplateSpy = sandbox
+        .stub(impl.templates_, 'renderTemplateArray')
+        .returns(Promise.resolve(renderedChildren));
+
+      return impl.renderResults_(sourceData, impl.container_).then(() => {
+        expect(impl.container_.children.length).to.equal(3);
+        expect(impl.container_.children[0].getAttribute('data-value')).to.equal(
+          'apple'
+        );
+        expect(impl.container_.children[1].getAttribute('data-value')).to.equal(
+          'mango'
+        );
+        expect(impl.container_.children[2].getAttribute('data-value')).to.equal(
+          'pear'
+        );
+        expect(renderTemplateSpy).to.have.been.calledOnce;
+      });
     });
-  });
-
-  it('filterData_() should filter based on all types', () => {
-    // Substring filter
-    expect(impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'a')).to.have
-        .ordered.members(['a', 'ab', 'ba']);
-    expect(impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'A')).to.have
-        .ordered.members(['a', 'ab', 'ba']);
-    // Prefix filter
-    impl.filter_ = 'prefix';
-    expect(impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'a')).to.have
-        .ordered.members(['a', 'ab']);
-    // Token-prefix filter
-    impl.filter_ = 'token-prefix';
-    expect(impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a')).to.have
-        .ordered.members(['a', 'b a', 'ab', 'c a']);
-    expect(impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a c')).to.have
-        .ordered.members(['c a']);
-    // None filter
-    impl.filter_ = 'none';
-    expect(impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a')).to.have
-        .ordered.members(['a', 'b a', 'ab', 'ba', 'c a']);
-    // Remaining filters should error
-    impl.filter_ = 'fuzzy';
-    expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
-        'Filter not yet supported: fuzzy');
-    impl.filter_ = 'custom';
-    expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
-        'Filter not yet supported: custom');
-    impl.filter_ = 'invalid';
-    expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
-        'Unexpected filter: invalid');
-  });
-
-  it('tokenizeString_ should return an array of tokens', () => {
-    expect(impl.tokenizeString_('')).to.have.ordered.members(['']);
-    expect(impl.tokenizeString_('a b c')).to.have.ordered.members(
-        ['a', 'b', 'c']);
-    expect(impl.tokenizeString_('a-b-c')).to.have.ordered.members(
-        ['a', 'b', 'c']);
-    expect(impl.tokenizeString_('a. ...b).c')).to.have.ordered.members(
-        ['a', 'b', 'c']);
-  });
-
-  it('mapFromTokensArray_ should return a map of token counts', () => {
-    expect(impl.mapFromTokensArray_([])).to.be.empty;
-    expect(impl.mapFromTokensArray_(['a', 'b', 'c'])).to.have.all.keys(
-        'a', 'b', 'c');
-    expect(impl.mapFromTokensArray_(['a', 'b', 'c', 'a', 'a']))
-        .to.have.all.keys('a', 'b', 'c');
-  });
-
-  it('tokenPrefixMatch_ should exhaustively match on complex cases', () => {
-    const item = 'washington, district of columbia (d.c.)';
-    expect(impl.tokenPrefixMatch_(item, 'washington')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'district of columbia')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'of colum')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item,
-        'district washington columbia of')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'dc')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'washington dc')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'washington, d.c.')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'washington, (dc)')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'w.a.s.h.i.n.g.t.o.n.')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'district-of-columbia')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, "washington 'dc'")).to.be.true;
-    expect(impl.tokenPrefixMatch_(item,
-        'washin.gton,   (..dc)+++++')).to.be.true;
-    expect(impl.tokenPrefixMatch_(item, 'ashington dc')).to.be.false;
-    expect(impl.tokenPrefixMatch_(item, 'washi distri')).to.be.false;
-    expect(impl.tokenPrefixMatch_(item, 'columbia columbia')).to.be.false;
-    expect(impl.tokenPrefixMatch_(item, 'd c')).to.be.false;
-  });
-
-  it('truncateToMaxEntries_() should truncate given data', () => {
-    expect(impl.truncateToMaxEntries_(['a', 'b', 'c', 'd'])).to.have.ordered
-        .members(['a', 'b', 'c', 'd']);
-    impl.maxEntries_ = 3;
-    expect(impl.truncateToMaxEntries_(['a', 'b', 'c', 'd'])).to.have.ordered
-        .members(['a', 'b', 'c']);
-    expect(impl.truncateToMaxEntries_(['a', 'b', 'c'])).to.have.ordered
-        .members(['a', 'b', 'c']);
-    expect(impl.truncateToMaxEntries_(['a', 'b'])).to.have.ordered
-        .members(['a', 'b']);
-  });
-
-  it('should show and hide results on toggle', () => {
-    expect(impl.resultsShowing_()).to.be.false;
-    return impl.renderResults_(['apple'], impl.container_).then(() => {
-      expect(impl.resultsShowing_()).to.be.false;
-      impl.toggleResults_(true);
-      expect(impl.resultsShowing_()).to.be.true;
-      impl.toggleResults_(false);
+
+    it('filterData_() should filter based on all types', () => {
+      // Substring filter
+      expect(
+        impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'a')
+      ).to.have.ordered.members(['a', 'ab', 'ba']);
+      expect(
+        impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'A')
+      ).to.have.ordered.members(['a', 'ab', 'ba']);
+      // Prefix filter
+      impl.filter_ = 'prefix';
+      expect(
+        impl.filterData_(['a', 'b', 'ab', 'ba', 'c'], 'a')
+      ).to.have.ordered.members(['a', 'ab']);
+      // Token-prefix filter
+      impl.filter_ = 'token-prefix';
+      expect(
+        impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a')
+      ).to.have.ordered.members(['a', 'b a', 'ab', 'c a']);
+      expect(
+        impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a c')
+      ).to.have.ordered.members(['c a']);
+      // None filter
+      impl.filter_ = 'none';
+      expect(
+        impl.filterData_(['a', 'b a', 'ab', 'ba', 'c a'], 'a')
+      ).to.have.ordered.members(['a', 'b a', 'ab', 'ba', 'c a']);
+      // Remaining filters should error
+      impl.filter_ = 'fuzzy';
+      expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
+        'Filter not yet supported: fuzzy'
+      );
+      impl.filter_ = 'custom';
+      expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
+        'Filter not yet supported: custom'
+      );
+      impl.filter_ = 'invalid';
+      expect(() => impl.filterData_(['a', 'b', 'c'], 'a')).to.throw(
+        'Unexpected filter: invalid'
+      );
+    });
+
+    it('tokenizeString_ should return an array of tokens', () => {
+      expect(impl.tokenizeString_('')).to.have.ordered.members(['']);
+      expect(impl.tokenizeString_('a b c')).to.have.ordered.members([
+        'a',
+        'b',
+        'c',
+      ]);
+      expect(impl.tokenizeString_('a-b-c')).to.have.ordered.members([
+        'a',
+        'b',
+        'c',
+      ]);
+      expect(impl.tokenizeString_('a. ...b).c')).to.have.ordered.members([
+        'a',
+        'b',
+        'c',
+      ]);
+    });
+
+    it('mapFromTokensArray_ should return a map of token counts', () => {
+      expect(impl.mapFromTokensArray_([])).to.be.empty;
+      expect(impl.mapFromTokensArray_(['a', 'b', 'c'])).to.have.all.keys(
+        'a',
+        'b',
+        'c'
+      );
+      expect(
+        impl.mapFromTokensArray_(['a', 'b', 'c', 'a', 'a'])
+      ).to.have.all.keys('a', 'b', 'c');
+    });
+
+    it('tokenPrefixMatch_ should exhaustively match on complex cases', () => {
+      const item = 'washington, district of columbia (d.c.)';
+      expect(impl.tokenPrefixMatch_(item, 'washington')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'district of columbia')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'of colum')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'district washington columbia of')).to
+        .be.true;
+      expect(impl.tokenPrefixMatch_(item, 'dc')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'washington dc')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'washington, d.c.')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'washington, (dc)')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'w.a.s.h.i.n.g.t.o.n.')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'district-of-columbia')).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, "washington 'dc'")).to.be.true;
+      expect(impl.tokenPrefixMatch_(item, 'washin.gton,   (..dc)+++++')).to.be
+        .true;
+      expect(impl.tokenPrefixMatch_(item, 'ashington dc')).to.be.false;
+      expect(impl.tokenPrefixMatch_(item, 'washi distri')).to.be.false;
+      expect(impl.tokenPrefixMatch_(item, 'columbia columbia')).to.be.false;
+      expect(impl.tokenPrefixMatch_(item, 'd c')).to.be.false;
+    });
+
+    it('truncateToMaxEntries_() should truncate given data', () => {
+      expect(
+        impl.truncateToMaxEntries_(['a', 'b', 'c', 'd'])
+      ).to.have.ordered.members(['a', 'b', 'c', 'd']);
+      impl.maxEntries_ = 3;
+      expect(
+        impl.truncateToMaxEntries_(['a', 'b', 'c', 'd'])
+      ).to.have.ordered.members(['a', 'b', 'c']);
+      expect(
+        impl.truncateToMaxEntries_(['a', 'b', 'c'])
+      ).to.have.ordered.members(['a', 'b', 'c']);
+      expect(impl.truncateToMaxEntries_(['a', 'b'])).to.have.ordered.members([
+        'a',
+        'b',
+      ]);
+    });
+
+    it('should show and hide results on toggle', () => {
       expect(impl.resultsShowing_()).to.be.false;
+      return impl.renderResults_(['apple'], impl.container_).then(() => {
+        expect(impl.resultsShowing_()).to.be.false;
+        impl.toggleResults_(true);
+        expect(impl.resultsShowing_()).to.be.true;
+        impl.toggleResults_(false);
+        expect(impl.resultsShowing_()).to.be.false;
+      });
     });
-  });
-
-  it('should call inputHandler_() on input', () => {
-    let renderSpy, toggleResultsSpy;
-    return element.layoutCallback().then(() => {
-      impl.inputElement_.value = 'a';
-      renderSpy = sandbox.spy(impl, 'renderResults_');
-      toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
-      return impl.inputHandler_();
-    }).then(() => {
-      expect(renderSpy).to.have.been.calledOnce;
-      expect(toggleResultsSpy).to.have.been.calledWith(true);
-      expect(impl.container_.children.length).to.equal(3);
+
+    it('should call inputHandler_() on input', () => {
+      let renderSpy, toggleResultsSpy;
+      return element
+        .layoutCallback()
+        .then(() => {
+          impl.inputElement_.value = 'a';
+          renderSpy = sandbox.spy(impl, 'renderResults_');
+          toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
+          return impl.inputHandler_();
+        })
+        .then(() => {
+          expect(renderSpy).to.have.been.calledOnce;
+          expect(toggleResultsSpy).to.have.been.calledWith(true);
+          expect(impl.container_.children.length).to.equal(3);
+        });
     });
-  });
 
-  describe('keyDownHandler_() on arrow keys', () => {
-    const event = {key: Keys.DOWN_ARROW, preventDefault: () => {}};
-    let displayInputSpy, updateActiveSpy, eventPreventSpy;
+    describe('keyDownHandler_() on arrow keys', () => {
+      const event = {key: Keys.DOWN_ARROW, preventDefault: () => {}};
+      let displayInputSpy, updateActiveSpy, eventPreventSpy;
 
-    beforeEach(() => {
-      displayInputSpy = sandbox.spy(impl, 'displayUserInput_');
-      updateActiveSpy = sandbox.spy(impl, 'updateActiveItem_');
-      eventPreventSpy = sandbox.spy(event, 'preventDefault');
-    });
+      beforeEach(() => {
+        displayInputSpy = sandbox.spy(impl, 'displayUserInput_');
+        updateActiveSpy = sandbox.spy(impl, 'updateActiveItem_');
+        eventPreventSpy = sandbox.spy(event, 'preventDefault');
+      });
 
-    it('should updateActiveItem_ when results showing on Down arrow', () => {
-      sandbox.stub(impl, 'resultsShowing_').onFirstCall().returns(true);
-      return element.layoutCallback().then(() => {
-        impl.activeIndex_ = 0;
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(displayInputSpy).not.to.have.been.called;
-        expect(updateActiveSpy).to.have.been.calledWith(1);
+      it('should updateActiveItem_ when results showing on Down arrow', () => {
+        sandbox
+          .stub(impl, 'resultsShowing_')
+          .onFirstCall()
+          .returns(true);
+        return element
+          .layoutCallback()
+          .then(() => {
+            impl.activeIndex_ = 0;
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(displayInputSpy).not.to.have.been.called;
+            expect(updateActiveSpy).to.have.been.calledWith(1);
+          });
       });
-    });
 
-    it('should displayUserInput_ when looping on Down arrow', () => {
-      sandbox.stub(impl, 'resultsShowing_').returns(true);
-      return element.layoutCallback().then(() => {
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(displayInputSpy).to.have.been.calledOnce;
-        expect(updateActiveSpy).not.to.have.been.called;
+      it('should displayUserInput_ when looping on Down arrow', () => {
+        sandbox.stub(impl, 'resultsShowing_').returns(true);
+        return element
+          .layoutCallback()
+          .then(() => {
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(displayInputSpy).to.have.been.calledOnce;
+            expect(updateActiveSpy).not.to.have.been.called;
+          });
       });
-    });
 
-    it('should display results if not already on Down arrow', () => {
-      let filterAndRenderSpy, toggleResultsSpy;
-      return element.layoutCallback().then(() => {
-        filterAndRenderSpy = sandbox.spy(impl, 'filterDataAndRenderResults_');
-        toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(filterAndRenderSpy).to.have.been.calledOnce;
-        expect(toggleResultsSpy).to.have.been.calledWith(true);
-        expect(displayInputSpy).not.to.have.been.called;
-        expect(updateActiveSpy).not.to.have.been.called;
+      it('should display results if not already on Down arrow', () => {
+        let filterAndRenderSpy, toggleResultsSpy;
+        return element
+          .layoutCallback()
+          .then(() => {
+            filterAndRenderSpy = sandbox.spy(
+              impl,
+              'filterDataAndRenderResults_'
+            );
+            toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(filterAndRenderSpy).to.have.been.calledOnce;
+            expect(toggleResultsSpy).to.have.been.calledWith(true);
+            expect(displayInputSpy).not.to.have.been.called;
+            expect(updateActiveSpy).not.to.have.been.called;
+          });
       });
-    });
 
-    it('should updateActiveItem_ on Up arrow', () => {
-      return element.layoutCallback().then(() => {
-        event.key = Keys.UP_ARROW;
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(displayInputSpy).not.to.have.been.called;
-        expect(updateActiveSpy).to.have.been.calledWith(-1);
+      it('should updateActiveItem_ on Up arrow', () => {
+        return element
+          .layoutCallback()
+          .then(() => {
+            event.key = Keys.UP_ARROW;
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(displayInputSpy).not.to.have.been.called;
+            expect(updateActiveSpy).to.have.been.calledWith(-1);
+          });
       });
-    });
 
-    it('should displayUserInput_ when looping on Up arrow', () => {
-      return element.layoutCallback().then(() => {
-        event.key = Keys.UP_ARROW;
-        impl.activeIndex_ = 0;
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(displayInputSpy).to.have.been.calledOnce;
-        expect(updateActiveSpy).not.to.have.been.called;
+      it('should displayUserInput_ when looping on Up arrow', () => {
+        return element
+          .layoutCallback()
+          .then(() => {
+            event.key = Keys.UP_ARROW;
+            impl.activeIndex_ = 0;
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(displayInputSpy).to.have.been.calledOnce;
+            expect(updateActiveSpy).not.to.have.been.called;
+          });
       });
     });
-  });
-
-  describe('keyDownHandler_() on Enter', () => {
-    const event = {
-      key: Keys.ENTER,
-      preventDefault: () => {},
-      target: {textContent: 'hello'},
-    };
-    let selectItemSpy, resetSpy, clearAllSpy, eventPreventSpy;
-    function layoutAndSetSpies() {
-      return element.layoutCallback().then(() => {
-        eventPreventSpy = sandbox.spy(event, 'preventDefault');
-        selectItemSpy = sandbox.spy(impl, 'selectItem_');
-        resetSpy = sandbox.spy(impl, 'resetActiveElement_');
-        clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
-      });
-    }
-
-    it('should do nothing when there is no active item', () => {
-      return layoutAndSetSpies().then(() => {
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(impl.inputElement_.value).to.equal('');
-        expect(selectItemSpy).not.to.have.been.called;
-        expect(clearAllSpy).not.to.have.been.called;
-        expect(resetSpy).not.to.have.been.called;
-        expect(eventPreventSpy).not.to.have.been.called;
+
+    describe('keyDownHandler_() on Enter', () => {
+      const event = {
+        key: Keys.ENTER,
+        preventDefault: () => {},
+        target: {textContent: 'hello'},
+      };
+      let selectItemSpy, resetSpy, clearAllSpy, eventPreventSpy;
+      function layoutAndSetSpies() {
+        return element.layoutCallback().then(() => {
+          eventPreventSpy = sandbox.spy(event, 'preventDefault');
+          selectItemSpy = sandbox.spy(impl, 'selectItem_');
+          resetSpy = sandbox.spy(impl, 'resetActiveElement_');
+          clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
+        });
+      }
+
+      it('should do nothing when there is no active item', () => {
+        return layoutAndSetSpies()
+          .then(() => {
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(impl.inputElement_.value).to.equal('');
+            expect(selectItemSpy).not.to.have.been.called;
+            expect(clearAllSpy).not.to.have.been.called;
+            expect(resetSpy).not.to.have.been.called;
+            expect(eventPreventSpy).not.to.have.been.called;
+          });
       });
-    });
 
-    it('should call selectItem_ and resetActiveElement_ as expected', () => {
-      return layoutAndSetSpies().then(() => {
-        impl.activeElement_ = impl.createElementFromItem_('abc');
-        sandbox.stub(impl, 'resultsShowing_').returns(true);
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(impl.inputElement_.value).to.equal('abc');
-        expect(selectItemSpy).to.have.been.calledOnce;
-        expect(clearAllSpy).to.have.been.calledOnce;
-        expect(resetSpy).to.have.been.calledOnce;
-        expect(eventPreventSpy).to.have.been.calledOnce;
-        expect(impl.submitOnEnter_).to.be.false;
+      it('should call selectItem_ and resetActiveElement_ as expected', () => {
+        return layoutAndSetSpies()
+          .then(() => {
+            impl.activeElement_ = impl.createElementFromItem_('abc');
+            sandbox.stub(impl, 'resultsShowing_').returns(true);
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(impl.inputElement_.value).to.equal('abc');
+            expect(selectItemSpy).to.have.been.calledOnce;
+            expect(clearAllSpy).to.have.been.calledOnce;
+            expect(resetSpy).to.have.been.calledOnce;
+            expect(eventPreventSpy).to.have.been.calledOnce;
+            expect(impl.submitOnEnter_).to.be.false;
+          });
       });
-    });
 
-    it('should call event.preventDefault when submitOnEnter_ is true', () => {
-      return layoutAndSetSpies().then(() => {
-        impl.submitOnEnter_ = true;
-        impl.activeElement_ = impl.createElementFromItem_('abc');
-        return impl.keyDownHandler_(event);
-      }).then(() => {
-        expect(impl.inputElement_.value).to.equal('abc');
-        expect(selectItemSpy).to.have.been.calledOnce;
-        expect(clearAllSpy).to.have.been.calledOnce;
-        expect(resetSpy).to.have.been.calledOnce;
-        expect(eventPreventSpy).not.to.have.been.called;
-        expect(impl.submitOnEnter_).to.be.true;
+      it('should call event.preventDefault when submitOnEnter_ is true', () => {
+        return layoutAndSetSpies()
+          .then(() => {
+            impl.submitOnEnter_ = true;
+            impl.activeElement_ = impl.createElementFromItem_('abc');
+            return impl.keyDownHandler_(event);
+          })
+          .then(() => {
+            expect(impl.inputElement_.value).to.equal('abc');
+            expect(selectItemSpy).to.have.been.calledOnce;
+            expect(clearAllSpy).to.have.been.calledOnce;
+            expect(resetSpy).to.have.been.calledOnce;
+            expect(eventPreventSpy).not.to.have.been.called;
+            expect(impl.submitOnEnter_).to.be.true;
+          });
       });
     });
-  });
-
-  it('should call keyDownHandler_() on Enter not event.preventDefault', () => {
-    const event = {
-      key: Keys.ENTER,
-      preventDefault: () => {},
-      target: {textContent: 'hello'},
-    };
-    let selectItemSpy, resetSpy, clearAllSpy, eventPreventSpy;
-    return element.layoutCallback().then(() => {
-      eventPreventSpy = sandbox.spy(event, 'preventDefault');
-      selectItemSpy = sandbox.spy(impl, 'selectItem_');
-      resetSpy = sandbox.spy(impl, 'resetActiveElement_');
-      clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
-      sandbox.stub(impl, 'resultsShowing_').returns(true);
-      return impl.keyDownHandler_(event);
-    }).then(() => {
-      expect(impl.inputElement_.value).to.equal('');
-      expect(selectItemSpy).not.to.have.been.called;
-      expect(clearAllSpy).not.to.have.been.called;
-      expect(resetSpy).not.to.have.been.called;
-      expect(eventPreventSpy).to.have.been.calledOnce;
-      impl.activeElement_ = impl.createElementFromItem_('abc');
-      return impl.keyDownHandler_(event);
-    }).then(() => {
-      expect(impl.inputElement_.value).to.equal('abc');
-      expect(selectItemSpy).to.have.been.calledOnce;
-      expect(clearAllSpy).to.have.been.calledOnce;
-      expect(resetSpy).to.have.been.calledOnce;
-      expect(eventPreventSpy).to.have.been.calledTwice;
-      expect(impl.submitOnEnter_).to.be.false;
-      impl.submitOnEnter_ = true;
-      impl.activeElement_ = impl.createElementFromItem_('abc');
-      return impl.keyDownHandler_(event);
-    }).then(() => {
-      expect(impl.inputElement_.value).to.equal('abc');
-      expect(selectItemSpy).to.have.been.calledTwice;
-      expect(clearAllSpy).to.have.been.calledTwice;
-      expect(resetSpy).to.have.been.calledTwice;
-      expect(eventPreventSpy).to.have.been.calledTwice;
-      expect(impl.submitOnEnter_).to.be.true;
+
+    it('should call keyDownHandler_() on Enter not event.preventDefault', () => {
+      const event = {
+        key: Keys.ENTER,
+        preventDefault: () => {},
+        target: {textContent: 'hello'},
+      };
+      let selectItemSpy, resetSpy, clearAllSpy, eventPreventSpy;
+      return element
+        .layoutCallback()
+        .then(() => {
+          eventPreventSpy = sandbox.spy(event, 'preventDefault');
+          selectItemSpy = sandbox.spy(impl, 'selectItem_');
+          resetSpy = sandbox.spy(impl, 'resetActiveElement_');
+          clearAllSpy = sandbox.spy(impl, 'clearAllItems_');
+          sandbox.stub(impl, 'resultsShowing_').returns(true);
+          return impl.keyDownHandler_(event);
+        })
+        .then(() => {
+          expect(impl.inputElement_.value).to.equal('');
+          expect(selectItemSpy).not.to.have.been.called;
+          expect(clearAllSpy).not.to.have.been.called;
+          expect(resetSpy).not.to.have.been.called;
+          expect(eventPreventSpy).to.have.been.calledOnce;
+          impl.activeElement_ = impl.createElementFromItem_('abc');
+          return impl.keyDownHandler_(event);
+        })
+        .then(() => {
+          expect(impl.inputElement_.value).to.equal('abc');
+          expect(selectItemSpy).to.have.been.calledOnce;
+          expect(clearAllSpy).to.have.been.calledOnce;
+          expect(resetSpy).to.have.been.calledOnce;
+          expect(eventPreventSpy).to.have.been.calledTwice;
+          expect(impl.submitOnEnter_).to.be.false;
+          impl.submitOnEnter_ = true;
+          impl.activeElement_ = impl.createElementFromItem_('abc');
+          return impl.keyDownHandler_(event);
+        })
+        .then(() => {
+          expect(impl.inputElement_.value).to.equal('abc');
+          expect(selectItemSpy).to.have.been.calledTwice;
+          expect(clearAllSpy).to.have.been.calledTwice;
+          expect(resetSpy).to.have.been.calledTwice;
+          expect(eventPreventSpy).to.have.been.calledTwice;
+          expect(impl.submitOnEnter_).to.be.true;
+        });
     });
-  });
-
-  it('should call keyDownHandler_() on Esc', () => {
-    const event = {key: Keys.ESCAPE};
-    const displayInputSpy = sandbox.spy(impl, 'displayUserInput_');
-    const resetSpy = sandbox.spy(impl, 'resetActiveElement_');
-    const toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
-    return element.layoutCallback().then(() => {
-      impl.userInput_ = 'a';
-      return impl.renderResults_(impl.sourceData_, impl.container_);
-    }).then(() => {
-      expect(impl.container_.children.length).to.equal(3);
-      expect(resetSpy).to.have.been.calledOnce;
-      impl.toggleResults_(true);
-      expect(impl.resultsShowing_()).to.be.true;
-      return impl.keyDownHandler_(event);
-    }).then(() => {
-      expect(displayInputSpy).to.have.been.calledOnce;
-      expect(resetSpy).to.have.been.calledTwice;
-      expect(toggleResultsSpy).to.have.been.calledWith(false);
-      expect(impl.resultsShowing_()).to.be.false;
+
+    it('should call keyDownHandler_() on Esc', () => {
+      const event = {key: Keys.ESCAPE};
+      const displayInputSpy = sandbox.spy(impl, 'displayUserInput_');
+      const resetSpy = sandbox.spy(impl, 'resetActiveElement_');
+      const toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
+      return element
+        .layoutCallback()
+        .then(() => {
+          impl.userInput_ = 'a';
+          return impl.renderResults_(impl.sourceData_, impl.container_);
+        })
+        .then(() => {
+          expect(impl.container_.children.length).to.equal(3);
+          expect(resetSpy).to.have.been.calledOnce;
+          impl.toggleResults_(true);
+          expect(impl.resultsShowing_()).to.be.true;
+          return impl.keyDownHandler_(event);
+        })
+        .then(() => {
+          expect(displayInputSpy).to.have.been.calledOnce;
+          expect(resetSpy).to.have.been.calledTwice;
+          expect(toggleResultsSpy).to.have.been.calledWith(false);
+          expect(impl.resultsShowing_()).to.be.false;
+        });
     });
-  });
-
-  it('should call keyDownHandler_() on Tab', () => {
-    const event = {key: Keys.TAB};
-    impl.inputElement_.value = 'expected';
-    impl.activeElement_ = doc.createElement('div');
-    expect(impl.userInput_).not.to.equal(impl.inputElement_.value);
-    const fireEventSpy = sandbox.spy(impl, 'fireSelectEvent_');
-    return element.layoutCallback().then(() => {
-      return impl.keyDownHandler_(event);
-    }).then(() => {
-      expect(impl.userInput_).to.equal(impl.inputElement_.value);
-      expect(fireEventSpy).to.have.been.calledWith(impl.userInput_);
+
+    it('should call keyDownHandler_() on Tab', () => {
+      const event = {key: Keys.TAB};
+      impl.inputElement_.value = 'expected';
+      impl.activeElement_ = doc.createElement('div');
+      expect(impl.userInput_).not.to.equal(impl.inputElement_.value);
+      const fireEventSpy = sandbox.spy(impl, 'fireSelectEvent_');
+      return element
+        .layoutCallback()
+        .then(() => {
+          return impl.keyDownHandler_(event);
+        })
+        .then(() => {
+          expect(impl.userInput_).to.equal(impl.inputElement_.value);
+          expect(fireEventSpy).to.have.been.calledWith(impl.userInput_);
+        });
     });
-  });
 
-  it('should call keyDownHandler_() and fallthrough on any other key', () => {
-    const event = {key: Keys.LEFT_ARROW};
-    return element.layoutCallback().then(() => {
-      return expect(impl.keyDownHandler_(event)).to.be.fulfilled;
+    it('should call keyDownHandler_() and fallthrough on any other key', () => {
+      const event = {key: Keys.LEFT_ARROW};
+      return element.layoutCallback().then(() => {
+        return expect(impl.keyDownHandler_(event)).to.be.fulfilled;
+      });
     });
-  });
-
-  it('should call toggleResultsHandler_()', () => {
-    const toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
-    const resetSpy = sandbox.spy(impl, 'resetActiveElement_');
-    return element.layoutCallback().then(() => {
-      return impl.toggleResultsHandler_(true);
-    }).then(() => {
-      expect(toggleResultsSpy).to.have.been.calledOnce;
-      expect(impl.inputElement_.form.getAttribute('autocomplete')).to.equal(
-          'off');
-      expect(resetSpy).not.to.have.been.called;
-      return impl.toggleResultsHandler_(false);
-    }).then(() => {
-      expect(toggleResultsSpy).to.have.been.calledTwice;
-      expect(impl.inputElement_.form.hasAttribute('autocomplete')).to.be.false;
-      expect(resetSpy).to.have.been.calledOnce;
+
+    it('should call toggleResultsHandler_()', () => {
+      const toggleResultsSpy = sandbox.spy(impl, 'toggleResults_');
+      const resetSpy = sandbox.spy(impl, 'resetActiveElement_');
+      return element
+        .layoutCallback()
+        .then(() => {
+          return impl.toggleResultsHandler_(true);
+        })
+        .then(() => {
+          expect(toggleResultsSpy).to.have.been.calledOnce;
+          expect(impl.inputElement_.form.getAttribute('autocomplete')).to.equal(
+            'off'
+          );
+          expect(resetSpy).not.to.have.been.called;
+          return impl.toggleResultsHandler_(false);
+        })
+        .then(() => {
+          expect(toggleResultsSpy).to.have.been.calledTwice;
+          expect(impl.inputElement_.form.hasAttribute('autocomplete')).to.be
+            .false;
+          expect(resetSpy).to.have.been.calledOnce;
+        });
     });
-  });
-
-  it('should call selectHandler_() on mousedown', () => {
-    const getItemSpy = sandbox.spy(impl, 'getItemElement_');
-    const selectItemSpy = sandbox.spy(impl, 'selectItem_');
-    let mockEl = doc.createElement('div');
-    return element.layoutCallback().then(() => {
-      impl.toggleResults_(true);
-      mockEl.textContent = 'test';
-      return impl.selectHandler_({target: mockEl});
-    }).then(() => {
-      expect(getItemSpy).to.have.been.calledTwice;
-      expect(selectItemSpy).to.have.been.called;
-      expect(impl.inputElement_.value).to.equal('');
-      mockEl = impl.createElementFromItem_('abc');
-      return impl.selectHandler_({target: mockEl});
-    }).then(() => {
-      expect(getItemSpy).to.have.been.calledWith(mockEl);
-      expect(selectItemSpy).to.have.been.calledWith(mockEl);
-      expect(impl.inputElement_.value).to.equal('abc');
+
+    it('should call selectHandler_() on mousedown', () => {
+      const getItemSpy = sandbox.spy(impl, 'getItemElement_');
+      const selectItemSpy = sandbox.spy(impl, 'selectItem_');
+      let mockEl = doc.createElement('div');
+      return element
+        .layoutCallback()
+        .then(() => {
+          impl.toggleResults_(true);
+          mockEl.textContent = 'test';
+          return impl.selectHandler_({target: mockEl});
+        })
+        .then(() => {
+          expect(getItemSpy).to.have.been.calledTwice;
+          expect(selectItemSpy).to.have.been.called;
+          expect(impl.inputElement_.value).to.equal('');
+          mockEl = impl.createElementFromItem_('abc');
+          return impl.selectHandler_({target: mockEl});
+        })
+        .then(() => {
+          expect(getItemSpy).to.have.been.calledWith(mockEl);
+          expect(selectItemSpy).to.have.been.calledWith(mockEl);
+          expect(impl.inputElement_.value).to.equal('abc');
+        });
     });
-  });
-
-  it('should fire select event from selectItem_', () => {
-    const fireEventSpy = sandbox.spy(impl, 'fireSelectEvent_');
-    const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-    const mockEl = doc.createElement('div');
-    return element.layoutCallback().then(() => {
-      impl.toggleResults_(true);
-      mockEl.setAttribute('data-value', 'test');
-      impl.selectItem_(mockEl);
-      expect(fireEventSpy).to.have.been.calledOnce;
-      expect(fireEventSpy).to.have.been.calledWith('test');
-      expect(triggerSpy).to.have.been.calledOnce;
+
+    it('should fire select event from selectItem_', () => {
+      const fireEventSpy = sandbox.spy(impl, 'fireSelectEvent_');
+      const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+      const mockEl = doc.createElement('div');
+      return element.layoutCallback().then(() => {
+        impl.toggleResults_(true);
+        mockEl.setAttribute('data-value', 'test');
+        impl.selectItem_(mockEl);
+        expect(fireEventSpy).to.have.been.calledOnce;
+        expect(fireEventSpy).to.have.been.calledWith('test');
+        expect(triggerSpy).to.have.been.calledOnce;
+      });
     });
-  });
-
-  it('should support marking active items', () => {
-    let resetSpy;
-    return element.layoutCallback().then(() => {
-      expect(impl.activeElement_).to.be.null;
-      expect(impl.activeIndex_).to.equal(-1);
-      impl.userInput_ = 'a';
-      return impl.renderResults_(impl.sourceData_, impl.container_);
-    }).then(() => {
-      expect(impl.container_.children.length).to.equal(3);
-      impl.activeElement_ = doc.createElement('div');
-      expect(impl.activeElement_).not.to.be.null;
-      expect(impl.resetActiveElement_()).to.equal();
-      expect(impl.activeElement_).to.be.null;
-      impl.toggleResults_(true);
-      resetSpy = sandbox.spy(impl, 'resetActiveElement_');
-      return impl.updateActiveItem_(1);
-    }).then(() => {
-      expect(resetSpy).to.have.been.calledOnce;
-      expect(impl.activeIndex_).to.equal(0);
-      expect(impl.activeElement_).not.to.be.null;
-      expect(impl.activeElement_).to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[1]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[2]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      return impl.updateActiveItem_(-1);
-    }).then(() => {
-      expect(resetSpy).to.have.been.calledTwice;
-      expect(impl.activeIndex_).to.equal(2);
-      expect(impl.activeElement_).not.to.be.null;
-      expect(impl.activeElement_).to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[0]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[1]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      return impl.updateActiveItem_(-1);
-    }).then(() => {
-      expect(resetSpy).to.have.been.calledThrice;
-      expect(impl.activeIndex_).to.equal(1);
-      expect(impl.activeElement_).not.to.be.null;
-      expect(impl.activeElement_).to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[0]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[2]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      return impl.updateActiveItem_(0);
-    }).then(() => {
-      expect(resetSpy).to.have.been.calledThrice;
-      expect(impl.activeIndex_).to.equal(1);
-      expect(impl.activeElement_).not.to.be.null;
-      expect(impl.activeElement_).to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[0]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
-      expect(impl.container_.children[2]).not.to.have.class(
-          'i-amphtml-autocomplete-item-active');
+
+    it('should support marking active items', () => {
+      let resetSpy;
+      return element
+        .layoutCallback()
+        .then(() => {
+          expect(impl.activeElement_).to.be.null;
+          expect(impl.activeIndex_).to.equal(-1);
+          impl.userInput_ = 'a';
+          return impl.renderResults_(impl.sourceData_, impl.container_);
+        })
+        .then(() => {
+          expect(impl.container_.children.length).to.equal(3);
+          impl.activeElement_ = doc.createElement('div');
+          expect(impl.activeElement_).not.to.be.null;
+          expect(impl.resetActiveElement_()).to.equal();
+          expect(impl.activeElement_).to.be.null;
+          impl.toggleResults_(true);
+          resetSpy = sandbox.spy(impl, 'resetActiveElement_');
+          return impl.updateActiveItem_(1);
+        })
+        .then(() => {
+          expect(resetSpy).to.have.been.calledOnce;
+          expect(impl.activeIndex_).to.equal(0);
+          expect(impl.activeElement_).not.to.be.null;
+          expect(impl.activeElement_).to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[1]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[2]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          return impl.updateActiveItem_(-1);
+        })
+        .then(() => {
+          expect(resetSpy).to.have.been.calledTwice;
+          expect(impl.activeIndex_).to.equal(2);
+          expect(impl.activeElement_).not.to.be.null;
+          expect(impl.activeElement_).to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[0]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[1]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          return impl.updateActiveItem_(-1);
+        })
+        .then(() => {
+          expect(resetSpy).to.have.been.calledThrice;
+          expect(impl.activeIndex_).to.equal(1);
+          expect(impl.activeElement_).not.to.be.null;
+          expect(impl.activeElement_).to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[0]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[2]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          return impl.updateActiveItem_(0);
+        })
+        .then(() => {
+          expect(resetSpy).to.have.been.calledThrice;
+          expect(impl.activeIndex_).to.equal(1);
+          expect(impl.activeElement_).not.to.be.null;
+          expect(impl.activeElement_).to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[0]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+          expect(impl.container_.children[2]).not.to.have.class(
+            'i-amphtml-autocomplete-item-active'
+          );
+        });
     });
-  });
-
-  it('should not select disabled items', () => {
-    const disabledItem = doc.createElement('div');
-    disabledItem.setAttribute('data-disabled', '');
-    expect(impl.selectItem_(disabledItem)).to.be.undefined;
-  });
-
-  it('should not return disabled items from getEnabledItems_()', () => {
-    impl.templateElement_ = doc.createElement('template');
-    const sourceData = ['apple', 'mango', 'pear'];
-    const renderedChildren = sourceData.map(item => {
-      const renderedChild = doc.createElement('div');
-      renderedChild.setAttribute('data-value', item);
-      return renderedChild;
+
+    it('should not select disabled items', () => {
+      const disabledItem = doc.createElement('div');
+      disabledItem.setAttribute('data-disabled', '');
+      expect(impl.selectItem_(disabledItem)).to.be.undefined;
     });
-    renderedChildren[2].setAttribute('data-disabled', '');
-    sandbox.stub(impl.templates_, 'renderTemplateArray').returns(
-        Promise.resolve(renderedChildren));
-
-    return impl.renderResults_(sourceData, impl.container_).then(() => {
-      expect(impl.container_.children.length).to.equal(3);
-      expect(impl.getEnabledItems_().length).to.equal(2);
-      expect(impl.container_.children[2].hasAttribute(
-          'aria-disabled')).to.be.true;
+
+    it('should not return disabled items from getEnabledItems_()', () => {
+      impl.templateElement_ = doc.createElement('template');
+      const sourceData = ['apple', 'mango', 'pear'];
+      const renderedChildren = sourceData.map(item => {
+        const renderedChild = doc.createElement('div');
+        renderedChild.setAttribute('data-value', item);
+        return renderedChild;
+      });
+      renderedChildren[2].setAttribute('data-disabled', '');
+      sandbox
+        .stub(impl.templates_, 'renderTemplateArray')
+        .returns(Promise.resolve(renderedChildren));
+
+      return impl.renderResults_(sourceData, impl.container_).then(() => {
+        expect(impl.container_.children.length).to.equal(3);
+        expect(impl.getEnabledItems_().length).to.equal(2);
+        expect(impl.container_.children[2].hasAttribute('aria-disabled')).to.be
+          .true;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/action-source.js b/extensions/amp-base-carousel/0.1/action-source.js
index db99c1c8ef7f..dc72b2b498dc 100644
--- a/extensions/amp-base-carousel/0.1/action-source.js
+++ b/extensions/amp-base-carousel/0.1/action-source.js
@@ -15,8 +15,8 @@
  */
 
 /**
-  * @enum {number}
-  */
+ * @enum {number}
+ */
 export const ActionSource = {
   GENERIC_HIGH_TRUST: 0,
   GENERIC_LOW_TRUST: 1,
diff --git a/extensions/amp-base-carousel/0.1/amp-base-carousel.js b/extensions/amp-base-carousel/0.1/amp-base-carousel.js
index 060a55d540cc..a00bf6eb5750 100644
--- a/extensions/amp-base-carousel/0.1/amp-base-carousel.js
+++ b/extensions/amp-base-carousel/0.1/amp-base-carousel.js
@@ -36,7 +36,6 @@ import {isExperimentOn} from '../../../src/experiments';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {toArray} from '../../../src/types';
 
-
 /**
  * @param {!Element} el The Element to check.
  * @return {boolean} Whether or not the Element is a sizer Element.
@@ -147,7 +146,8 @@ class AmpCarousel extends AMP.BaseElement {
     element.appendChild(this.renderContainerDom_());
 
     const scrollContainer = dev().assertElement(
-        this.element.querySelector('.i-amphtml-carousel-scroll'));
+      this.element.querySelector('.i-amphtml-carousel-scroll')
+    );
 
     this.carousel_ = new Carousel({
       win,
@@ -163,9 +163,11 @@ class AmpCarousel extends AMP.BaseElement {
       scrollContainer.appendChild(slide);
     });
     this.prevArrowSlot_ = this.element.querySelector(
-        '.i-amphtml-carousel-arrow-prev-slot');
+      '.i-amphtml-carousel-arrow-prev-slot'
+    );
     this.nextArrowSlot_ = this.element.querySelector(
-        '.i-amphtml-carousel-arrow-next-slot');
+      '.i-amphtml-carousel-arrow-next-slot'
+    );
     // Slot the arrows, with defaults
     this.prevArrowSlot_.appendChild(prevArrow || this.createPrevArrow_());
     this.nextArrowSlot_.appendChild(nextArrow || this.createNextArrow_());
@@ -203,7 +205,9 @@ class AmpCarousel extends AMP.BaseElement {
     // TODO(sparhami) #19259 Tracks a more generic way to do this. Remove once
     // we have something better.
     const isScaled = closestAncestorElementBySelector(
-        this.element, '[i-amphtml-scale-animation]');
+      this.element,
+      '[i-amphtml-scale-animation]'
+    );
     if (isScaled) {
       return Promise.resolve();
     }
@@ -275,9 +279,10 @@ class AmpCarousel extends AMP.BaseElement {
   createNextArrow_() {
     const html = htmlFor(this.element);
     return html`
-      <button class="i-amphtml-carousel-next"
-          aria-label="Next item in carousel">
-      </button>
+      <button
+        class="i-amphtml-carousel-next"
+        aria-label="Next item in carousel"
+      ></button>
     `;
   }
 
@@ -288,9 +293,10 @@ class AmpCarousel extends AMP.BaseElement {
   createPrevArrow_() {
     const html = htmlFor(this.element);
     return html`
-      <button class="i-amphtml-carousel-prev"
-          aria-label="Previous item in carousel">
-      </button>
+      <button
+        class="i-amphtml-carousel-prev"
+        aria-label="Previous item in carousel"
+      ></button>
     `;
   }
 
@@ -300,26 +306,38 @@ class AmpCarousel extends AMP.BaseElement {
    * @return {!ActionSource}
    */
   getActionSource_(trust) {
-    return trust == ActionTrust.HIGH ?
-      ActionSource.GENERIC_HIGH_TRUST :
-      ActionSource.GENERIC_LOW_TRUST ;
+    return trust == ActionTrust.HIGH
+      ? ActionSource.GENERIC_HIGH_TRUST
+      : ActionSource.GENERIC_LOW_TRUST;
   }
 
   /**
    * @private
    */
   setupActions_() {
-    this.registerAction('prev', ({trust}) => {
-      this.carousel_.prev(this.getActionSource_(trust));
-    }, ActionTrust.LOW);
-    this.registerAction('next', ({trust}) => {
-      this.carousel_.next(this.getActionSource_(trust));
-    }, ActionTrust.LOW);
-    this.registerAction('goToSlide', ({args, trust}) => {
-      this.carousel_.goToSlide(args['index'] || -1, {
-        actionSource: this.getActionSource_(trust),
-      });
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'prev',
+      ({trust}) => {
+        this.carousel_.prev(this.getActionSource_(trust));
+      },
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'next',
+      ({trust}) => {
+        this.carousel_.next(this.getActionSource_(trust));
+      },
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'goToSlide',
+      ({args, trust}) => {
+        this.carousel_.goToSlide(args['index'] || -1, {
+          actionSource: this.getActionSource_(trust),
+        });
+      },
+      ActionTrust.LOW
+    );
   }
 
   /**
@@ -341,7 +359,10 @@ class AmpCarousel extends AMP.BaseElement {
       toggleAttribute(child, 'disabled', disabled);
     });
     toggleAttribute(
-        this.element, 'i-amphtml-carousel-hide-buttons', this.hadTouch_);
+      this.element,
+      'i-amphtml-carousel-hide-buttons',
+      this.hadTouch_
+    );
   }
 
   /**
@@ -359,9 +380,11 @@ class AmpCarousel extends AMP.BaseElement {
    * @private
    */
   isHighTrustActionSource_(actionSource) {
-    return actionSource == ActionSource.WHEEL ||
-        actionSource == ActionSource.TOUCH ||
-        actionSource == ActionSource.GENERIC_HIGH_TRUST;
+    return (
+      actionSource == ActionSource.WHEEL ||
+      actionSource == ActionSource.TOUCH ||
+      actionSource == ActionSource.GENERIC_HIGH_TRUST
+    );
   }
 
   /**
@@ -395,8 +418,10 @@ class AmpCarousel extends AMP.BaseElement {
 }
 
 AMP.extension('amp-base-carousel', '0.1', AMP => {
-  if (!isExperimentOn(AMP.win, 'amp-base-carousel') &&
-      !isExperimentOn(AMP.win, 'amp-lightbox-gallery-base-carousel')) {
+  if (
+    !isExperimentOn(AMP.win, 'amp-base-carousel') &&
+    !isExperimentOn(AMP.win, 'amp-lightbox-gallery-base-carousel')
+  ) {
     return;
   }
 
diff --git a/extensions/amp-base-carousel/0.1/auto-advance.js b/extensions/amp-base-carousel/0.1/auto-advance.js
index 677be9992338..304e8dacce8f 100644
--- a/extensions/amp-base-carousel/0.1/auto-advance.js
+++ b/extensions/amp-base-carousel/0.1/auto-advance.js
@@ -42,11 +42,7 @@ export class AutoAdvance {
    *   advanceable: !AdvanceDef
    * }} config
    */
-  constructor({
-    win,
-    scrollContainer,
-    advanceable,
-  }) {
+  constructor({win, scrollContainer, advanceable}) {
     /** @private @const */
     this.win_ = win;
 
@@ -82,9 +78,15 @@ export class AutoAdvance {
 
     this.createDebouncedAdvance_(this.autoAdvanceInterval_);
     this.scrollContainer_.addEventListener(
-        'scroll', () => this.handleScroll_(), true);
+      'scroll',
+      () => this.handleScroll_(),
+      true
+    );
     this.scrollContainer_.addEventListener(
-        'touchstart', () => this.handleTouchStart_(), true);
+      'touchstart',
+      () => this.handleTouchStart_(),
+      true
+    );
   }
 
   /**
@@ -144,7 +146,9 @@ export class AutoAdvance {
    */
   updateAutoAdvanceInterval(autoAdvanceInterval) {
     this.autoAdvanceInterval_ = Math.max(
-        autoAdvanceInterval, MIN_AUTO_ADVANCE_INTERVAL);
+      autoAdvanceInterval,
+      MIN_AUTO_ADVANCE_INTERVAL
+    );
     this.createDebouncedAdvance_(this.autoAdvanceInterval_);
     this.resetAutoAdvance_();
   }
@@ -164,7 +168,10 @@ export class AutoAdvance {
    */
   createDebouncedAdvance_(interval) {
     this.debouncedAdvance_ = debounce(
-        this.win_, () => this.advance_(), interval);
+      this.win_,
+      () => this.advance_(),
+      interval
+    );
   }
 
   /**
@@ -173,11 +180,16 @@ export class AutoAdvance {
   handleTouchStart_() {
     this.pause();
 
-    listenOnce(window, 'touchend', () => {
-      this.resume();
-    }, {
-      capture: true,
-    });
+    listenOnce(
+      window,
+      'touchend',
+      () => {
+        this.resume();
+      },
+      {
+        capture: true,
+      }
+    );
   }
 
   /**
@@ -185,10 +197,12 @@ export class AutoAdvance {
    * @private
    */
   shouldAutoAdvance_() {
-    return this.autoAdvance_ &&
-        !this.paused_ &&
-        !this.stopped_ &&
-        this.advances_ < this.maxAdvances_;
+    return (
+      this.autoAdvance_ &&
+      !this.paused_ &&
+      !this.stopped_ &&
+      this.advances_ < this.maxAdvances_
+    );
   }
 
   /**
diff --git a/extensions/amp-base-carousel/0.1/carousel-accessibility.js b/extensions/amp-base-carousel/0.1/carousel-accessibility.js
index 4b939066a3ac..02a9a3e2ac83 100644
--- a/extensions/amp-base-carousel/0.1/carousel-accessibility.js
+++ b/extensions/amp-base-carousel/0.1/carousel-accessibility.js
@@ -37,13 +37,7 @@ export class CarouselAccessibility {
    *   stoppable: !StoppableDef,
    * }} config
    */
-  constructor({
-    win,
-    element,
-    scrollContainer,
-    runMutate,
-    stoppable,
-  }) {
+  constructor({win, element, scrollContainer, runMutate, stoppable}) {
     /** @private @const */
     this.win_ = win;
 
@@ -68,9 +62,13 @@ export class CarouselAccessibility {
     /** @private {number} */
     this.index_ = 0;
 
-    element.addEventListener('focus', () => {
-      stoppable.stop();
-    }, true);
+    element.addEventListener(
+      'focus',
+      () => {
+        stoppable.stop();
+      },
+      true
+    );
     element.addEventListener('indexchange', event => {
       this.onIndexChanged_(event);
     });
diff --git a/extensions/amp-base-carousel/0.1/carousel.js b/extensions/amp-base-carousel/0.1/carousel.js
index 6a05abea34a4..3131b555bf02 100644
--- a/extensions/amp-base-carousel/0.1/carousel.js
+++ b/extensions/amp-base-carousel/0.1/carousel.js
@@ -28,10 +28,7 @@ import {
 } from './dimensions.js';
 import {AutoAdvance} from './auto-advance';
 import {CarouselAccessibility} from './carousel-accessibility';
-import {
-  backwardWrappingDistance,
-  forwardWrappingDistance,
-} from './array-util';
+import {backwardWrappingDistance, forwardWrappingDistance} from './array-util';
 import {createCustomEvent, listenOnce} from '../../../src/event-helper';
 import {debounce} from '../../../src/utils/rate-limit';
 import {dict} from '../../../src/utils/object';
@@ -146,19 +143,14 @@ function sum(arr) {
  */
 export class Carousel {
   /**
-  * @param {{
-  *   win: !Window,
-  *   element: !Element,
-  *   scrollContainer: !Element,
-  *   runMutate: function(function()),
-  * }} config
-  */
-  constructor({
-    win,
-    element,
-    scrollContainer,
-    runMutate,
-  }) {
+   * @param {{
+   *   win: !Window,
+   *   element: !Element,
+   *   scrollContainer: !Element,
+   *   runMutate: function(function()),
+   * }} config
+   */
+  constructor({win, element, scrollContainer, runMutate}) {
     /** @private @const */
     this.win_ = win;
 
@@ -189,8 +181,10 @@ export class Carousel {
 
     /** @private @const */
     this.debouncedResetScrollReferencePoint_ = debounce(
-        win, () => this.resetScrollReferencePoint_(),
-        RESET_SCROLL_REFERENCE_POINT_WAIT_MS);
+      win,
+      () => this.resetScrollReferencePoint_(),
+      RESET_SCROLL_REFERENCE_POINT_WAIT_MS
+    );
 
     /** @private {number} */
     this.advanceCount_ = 1;
@@ -223,18 +217,18 @@ export class Carousel {
     this.allSpacers_ = [];
 
     /**
-    * Set from sources of programmatic scrolls to avoid doing work associated
-    * with regular scrolling.
-    * @private {boolean}
-    */
+     * Set from sources of programmatic scrolls to avoid doing work associated
+     * with regular scrolling.
+     * @private {boolean}
+     */
     this.ignoreNextScroll_ = false;
 
     /**
-    * The offset from the start edge for the element at the current index.
-    * This is used to preserve relative scroll position when updating the UI
-    * after things have moved (e.g. on rotate).
-    * @private {number}
-    */
+     * The offset from the start edge for the element at the current index.
+     * This is used to preserve relative scroll position when updating the UI
+     * after things have moved (e.g. on rotate).
+     * @private {number}
+     */
     this.currentElementOffset_ = 0;
 
     /**
@@ -247,21 +241,21 @@ export class Carousel {
     this.requestedIndex_ = null;
 
     /**
-    * The reference index where the the scrollable area last stopped
-    * scrolling. This slide is not translated and other slides are translated
-    * to move before or after as needed. This is also used when looping to
-    * prevent a single swipe from wrapping past the starting point.
-    * @private {number}
-    */
+     * The reference index where the the scrollable area last stopped
+     * scrolling. This slide is not translated and other slides are translated
+     * to move before or after as needed. This is also used when looping to
+     * prevent a single swipe from wrapping past the starting point.
+     * @private {number}
+     */
     this.restingIndex_ = NaN;
 
     /**
-    * Whether or not the user is currently touching the scrollable area. This
-    * is used to avoid resetting the resting point while the user is touching
-    * (e.g. they have dragged part way to the next slide, but have not yet
-    * released their finger).
-    * @private {boolean}
-    */
+     * Whether or not the user is currently touching the scrollable area. This
+     * is used to avoid resetting the resting point while the user is touching
+     * (e.g. they have dragged part way to the next slide, but have not yet
+     * released their finger).
+     * @private {boolean}
+     */
     this.touching_ = false;
 
     /**
@@ -308,11 +302,20 @@ export class Carousel {
     this.visibleCount_ = 1;
 
     this.scrollContainer_.addEventListener(
-        'scroll', () => this.handleScroll_(), true);
+      'scroll',
+      () => this.handleScroll_(),
+      true
+    );
     this.scrollContainer_.addEventListener(
-        'touchstart', () => this.handleTouchStart_(), true);
+      'touchstart',
+      () => this.handleTouchStart_(),
+      true
+    );
     this.scrollContainer_.addEventListener(
-        'wheel', () => this.handleWheel_(), true);
+      'wheel',
+      () => this.handleWheel_(),
+      true
+    );
   }
 
   /**
@@ -370,8 +373,11 @@ export class Carousel {
     let slideIndex;
     if (this.loop_) {
       slideIndex = mod(newIndex, endIndex + 1);
-    } else if (delta > 0 && this.inLastWindow_(index) &&
-        this.inLastWindow_(newIndex)) {
+    } else if (
+      delta > 0 &&
+      this.inLastWindow_(index) &&
+      this.inLastWindow_(newIndex)
+    ) {
       slideIndex = 0;
     } else if ((passingStart && atStart) || (passingEnd && !atEnd)) {
       slideIndex = endIndex;
@@ -580,7 +586,9 @@ export class Carousel {
       this.updating_ = false;
       this.scrollContainer_.setAttribute('mixed-length', this.mixedLength_);
       this.scrollContainer_.setAttribute(
-          'user-scrollable', this.userScrollable_);
+        'user-scrollable',
+        this.userScrollable_
+      );
       this.scrollContainer_.setAttribute('horizontal', this.axis_ == Axis.X);
       this.scrollContainer_.setAttribute('loop', this.loop_);
       this.scrollContainer_.setAttribute('snap', this.snap_);
@@ -594,11 +602,12 @@ export class Carousel {
       }
 
       this.autoAdvance_.updateMaxAdvances(
-          (this.autoAdvanceLoops_ * this.slides_.length) - 1);
+        this.autoAdvanceLoops_ * this.slides_.length - 1
+      );
       this.updateSpacers_();
       this.setChildrenSnapAlign_();
       this.hideSpacersAndSlides_();
-      this.resetScrollReferencePoint_(/* force */true);
+      this.resetScrollReferencePoint_(/* force */ true);
     });
   }
 
@@ -620,10 +629,15 @@ export class Carousel {
   updateRestingIndex_(restingIndex) {
     this.restingIndex_ = restingIndex;
     this.element_.dispatchEvent(
-        createCustomEvent(this.win_, 'indexchange', dict({
+      createCustomEvent(
+        this.win_,
+        'indexchange',
+        dict({
           'index': restingIndex,
           'actionSource': this.actionSource_,
-        })));
+        })
+      )
+    );
   }
 
   /**
@@ -636,12 +650,17 @@ export class Carousel {
     this.actionSource_ = ActionSource.TOUCH;
     this.requestedIndex_ = null;
 
-    listenOnce(window, 'touchend', () => {
-      this.touching_ = false;
-      this.debouncedResetScrollReferencePoint_();
-    }, {
-      capture: true,
-    });
+    listenOnce(
+      window,
+      'touchend',
+      () => {
+        this.touching_ = false;
+        this.debouncedResetScrollReferencePoint_();
+      },
+      {
+        capture: true,
+      }
+    );
   }
 
   /**
@@ -674,9 +693,11 @@ export class Carousel {
    *    user flicked the carousel and there is a momentum scroll in progress.
    */
   isUserScrolling_() {
-    return this.scrolling_ && (
-      this.actionSource_ == ActionSource.TOUCH ||
-      this.actionSource_ == ActionSource.WHEEL);
+    return (
+      this.scrolling_ &&
+      (this.actionSource_ == ActionSource.TOUCH ||
+        this.actionSource_ == ActionSource.WHEEL)
+    );
   }
 
   /**
@@ -688,8 +709,7 @@ export class Carousel {
    * @private
    */
   setElementTransform_(el, revolutions, revolutionLength) {
-    setTransformTranslateStyle(
-        this.axis_, el, revolutions * revolutionLength);
+    setTransformTranslateStyle(this.axis_, el, revolutions * revolutionLength);
     el._revolutions = revolutions;
   }
 
@@ -774,8 +794,10 @@ export class Carousel {
       this.scrollContainer_.appendChild(spacer);
     });
 
-    this.allSpacers_ = this.beforeSpacers_
-        .concat(this.replacementSpacers_, this.afterSpacers_);
+    this.allSpacers_ = this.beforeSpacers_.concat(
+      this.replacementSpacers_,
+      this.afterSpacers_
+    );
   }
 
   /**
@@ -785,7 +807,7 @@ export class Carousel {
    */
   setChildrenSnapAlign_() {
     const slideCount = this.slides_.length;
-    const startAligned = this.alignment_ == Alignment.START ;
+    const startAligned = this.alignment_ == Alignment.START;
     const oddVisibleCount = mod(this.visibleCount_, 2) == 1;
     // For the legacy scroll-snap-coordinate, when center aligning with an odd
     // count, actually use a start coordinate. Otherwise it will snap to the
@@ -824,25 +846,22 @@ export class Carousel {
    * @private
    */
   hideSpacersAndSlides_() {
-    const {
-      afterSpacers_,
-      beforeSpacers_,
-      currentIndex_,
-      slides_,
-    } = this;
+    const {afterSpacers_, beforeSpacers_, currentIndex_, slides_} = this;
     const numBeforeSpacers = Math.max(0, slides_.length - currentIndex_ - 1);
     const numAfterSpacers = Math.max(0, currentIndex_ - 1);
 
     beforeSpacers_.forEach((el, i) => {
       const distance = backwardWrappingDistance(
-          currentIndex_, i, beforeSpacers_);
+        currentIndex_,
+        i,
+        beforeSpacers_
+      );
       const tooFar = distance > slides_.length - 1;
       el.hidden = tooFar || i < slides_.length - numBeforeSpacers;
     });
 
     afterSpacers_.forEach((el, i) => {
-      const distance = forwardWrappingDistance(
-          currentIndex_, i, afterSpacers_);
+      const distance = forwardWrappingDistance(currentIndex_, i, afterSpacers_);
       const tooFar = distance > slides_.length - 1;
       el.hidden = tooFar || i > numAfterSpacers;
     });
@@ -870,8 +889,13 @@ export class Carousel {
     // themselves.
     const items = loop_ ? allSpacers_ : slides_;
     const startIndex = loop_ ? currentIndex_ + slides_.length : currentIndex_;
-    const overlappingIndex =
-        findOverlappingIndex(axis_, alignment_, element_, items, startIndex);
+    const overlappingIndex = findOverlappingIndex(
+      axis_,
+      alignment_,
+      element_,
+      items,
+      startIndex
+    );
 
     // Currently not over a slide (e.g. on top of overscroll area).
     if (overlappingIndex === undefined) {
@@ -898,7 +922,6 @@ export class Carousel {
     });
   }
 
-
   /**
    * Resets the frame of reference for scrolling, centering things around the
    * current index and moving things as appropriate.
@@ -919,9 +942,11 @@ export class Carousel {
     // we stopped scrolling. If so, we do not want move anything or fire an
     // event. If we have a programmatic scroll request, we still need to move
     // to that index.
-    if (this.restingIndex_ == this.currentIndex_ &&
-        this.requestedIndex_ != null &&
-        !force) {
+    if (
+      this.restingIndex_ == this.currentIndex_ &&
+      this.requestedIndex_ != null &&
+      !force
+    ) {
       return;
     }
 
@@ -961,8 +986,8 @@ export class Carousel {
     } = this;
     const currentElement = slides_[currentIndex_];
     const {length, start} = getDimension(axis_, scrollContainer_);
-    const currentElementStart = Math.abs(currentElementOffset_) <= length ?
-      currentElementOffset_ : 0;
+    const currentElementStart =
+      Math.abs(currentElementOffset_) <= length ? currentElementOffset_ : 0;
     // Use the offsetStart to figure out the scroll position of the current
     // element. Note that this only works because the element is not translated
     // at this point.
@@ -983,16 +1008,14 @@ export class Carousel {
    * }} options
    * @private
    */
-  scrollSlideIntoView_(slide, {
-    smoothScroll,
-  }) {
+  scrollSlideIntoView_(slide, {smoothScroll}) {
     const runner = smoothScroll ? (el, cb) => cb() : runDisablingSmoothScroll;
     runner(this.scrollContainer_, () => {
       scrollContainerToElement(
-          slide,
-          this.scrollContainer_,
-          this.axis_,
-          this.alignment_
+        slide,
+        this.scrollContainer_,
+        this.axis_,
+        this.alignment_
       );
     });
   }
@@ -1008,11 +1031,11 @@ export class Carousel {
   moveSlidesBeforeOrAfter__(totalLength, count, isAfter) {
     const {currentIndex_, restingIndex_, slides_} = this;
     const current = slides_[currentIndex_];
-    const currentRevolutions = (current._revolutions || 0);
+    const currentRevolutions = current._revolutions || 0;
     const dir = isAfter ? 1 : -1;
 
     for (let i = 1; i <= count; i++) {
-      const elIndex = mod(currentIndex_ + (i * dir), slides_.length);
+      const elIndex = mod(currentIndex_ + i * dir, slides_.length);
 
       // We do not want to move the slide that we started at.
       if (elIndex === restingIndex_ && currentIndex_ !== restingIndex_) {
@@ -1022,8 +1045,9 @@ export class Carousel {
       const el = slides_[elIndex];
       // Check if the element is on the wrong side of the current index.
       const needsMove = elIndex > currentIndex_ !== isAfter;
-      const revolutions = needsMove ? currentRevolutions + dir :
-        currentRevolutions;
+      const revolutions = needsMove
+        ? currentRevolutions + dir
+        : currentRevolutions;
 
       this.setElementTransform_(el, revolutions, totalLength);
     }
diff --git a/extensions/amp-base-carousel/0.1/dimensions.js b/extensions/amp-base-carousel/0.1/dimensions.js
index 5beec4182132..897869b1485d 100644
--- a/extensions/amp-base-carousel/0.1/dimensions.js
+++ b/extensions/amp-base-carousel/0.1/dimensions.js
@@ -55,7 +55,7 @@ export function getDimension(axis, el) {
     left,
     right,
     width,
-  } = el./*OK*/getBoundingClientRect();
+  } = el./*OK*/ getBoundingClientRect();
 
   return {
     start: axis == Axis.X ? left : top,
@@ -91,7 +91,7 @@ export function getStart(axis, el) {
  *    the axis.
  */
 export function getOffsetStart(axis, el) {
-  return axis == Axis.X ? el./*OK*/offsetLeft : el./*OK*/offsetTop;
+  return axis == Axis.X ? el./*OK*/ offsetLeft : el./*OK*/ offsetTop;
 }
 
 /**
@@ -148,10 +148,16 @@ export function overlaps(axis, el, position) {
  * @return {number|undefined} The overlapping index, if one exists.
  */
 export function findOverlappingIndex(
-  axis, alignment, container, children, startIndex) {
-  const pos = alignment == Alignment.START ?
-    getStart(axis, container) + 1 :
-    getCenter(axis, container);
+  axis,
+  alignment,
+  container,
+  children,
+  startIndex
+) {
+  const pos =
+    alignment == Alignment.START
+      ? getStart(axis, container) + 1
+      : getCenter(axis, container);
 
   // First look at the start index, since is the most likely to overlap.
   if (overlaps(axis, children[startIndex], pos)) {
@@ -173,7 +179,6 @@ export function findOverlappingIndex(
   }
 }
 
-
 /**
  * Gets the current scroll position for an element along a given axis.
  * @param {!Axis} axis The axis to set the scroll position for.
@@ -182,10 +187,10 @@ export function findOverlappingIndex(
  */
 export function getScrollPosition(axis, el) {
   if (axis == Axis.X) {
-    return el./*OK*/scrollLeft;
+    return el./*OK*/ scrollLeft;
   }
 
-  return el./*OK*/scrollTop;
+  return el./*OK*/ scrollTop;
 }
 
 /**
@@ -196,11 +201,10 @@ export function getScrollPosition(axis, el) {
  */
 export function setScrollPosition(axis, el, position) {
   if (axis == Axis.X) {
-    el./*OK*/scrollLeft = position;
+    el./*OK*/ scrollLeft = position;
   } else {
-    el./*OK*/scrollTop = position;
+    el./*OK*/ scrollTop = position;
   }
-
 }
 
 /**
@@ -225,8 +229,9 @@ export function updateScrollPosition(axis, el, delta) {
 export function scrollContainerToElement(el, container, axis, alignment) {
   const startAligned = alignment == Alignment.START;
   const snapOffset = startAligned ? getStart(axis, el) : getCenter(axis, el);
-  const scrollOffset = startAligned ? getStart(axis, container) :
-    getCenter(axis, container);
+  const scrollOffset = startAligned
+    ? getStart(axis, container)
+    : getCenter(axis, container);
   const delta = snapOffset - scrollOffset;
 
   updateScrollPosition(axis, container, delta);
diff --git a/extensions/amp-base-carousel/0.1/responsive-attributes.js b/extensions/amp-base-carousel/0.1/responsive-attributes.js
index f4bdbfe44123..98d2115fbb7b 100644
--- a/extensions/amp-base-carousel/0.1/responsive-attributes.js
+++ b/extensions/amp-base-carousel/0.1/responsive-attributes.js
@@ -27,7 +27,9 @@ let MediaQueriesListAndValueDef;
  * @return {!Array<!MediaQueriesListAndValueDef>}
  */
 function getMediaQueryListsAndValues(value) {
-  return value.split(',')
+  return (
+    value
+      .split(',')
       .map(part => {
         // Find the value portion by looking at the end.
         const result = /[a-z0-9.]+$/.exec(part);
@@ -48,7 +50,8 @@ function getMediaQueryListsAndValues(value) {
       })
       // Remove any items that did not match the regex above and are
       // undefined as a result.
-      .filter(item => item);
+      .filter(item => item)
+  );
 }
 
 /**
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/helpers.js b/extensions/amp-base-carousel/0.1/test-e2e/helpers.js
index 1273340d4c9f..e6dec986428a 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/helpers.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/helpers.js
@@ -24,8 +24,9 @@ const PREV_ARROW_SELECTOR = `${PREV_ARROW_SLOT_SELECTOR} :first-child`;
 const NEXT_ARROW_SELECTOR = `${NEXT_ARROW_SLOT_SELECTOR} :first-child`;
 
 async function waitForImgLoad(controller, el) {
-  await expect(controller.getElementProperty(el, 'naturalWidth'))
-      .to.be.greaterThan(0);
+  await expect(
+    controller.getElementProperty(el, 'naturalWidth')
+  ).to.be.greaterThan(0);
 }
 
 export async function waitForCarouselImg(controller, n) {
@@ -33,8 +34,8 @@ export async function waitForCarouselImg(controller, n) {
   // container. We query all the imgs upfront, since they might not have
   // laid out yet.
   const el = await controller.findElementXPath(
-      `//${TAG_NAME}//*[contains(@class, "${SLOTTED_CLASS}")][${n + 1}]` +
-      '//img');
+    `//${TAG_NAME}//*[contains(@class, "${SLOTTED_CLASS}")][${n + 1}]//img`
+  );
   return await waitForImgLoad(controller, el);
 }
 
@@ -55,11 +56,7 @@ export async function getSpacersForSlide(controller, n) {
   const spacers = await getSpacers(controller);
   const slideCount = spacers.length / 3;
 
-  return [
-    spacers[n],
-    spacers[n + slideCount],
-    spacers[n + 2 * slideCount],
-  ];
+  return [spacers[n], spacers[n + slideCount], spacers[n + 2 * slideCount]];
 }
 
 export async function getScrollingElement(controller) {
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
index 2a67497a4588..e5859c77f66d 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows-non-looping.js
@@ -14,55 +14,56 @@
  * limitations under the License.
  */
 
-import {
-  getNextArrow,
-  getPrevArrow,
-  getScrollingElement,
-} from './helpers';
+import {getNextArrow, getPrevArrow, getScrollingElement} from './helpers';
 
 /** The total number of slides in the carousel */
 const SLIDE_COUNT = 4;
 const pageWidth = 600;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel arrows when non-looping', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/non-looping.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  //TODO(spaharmi): fails on shadow demo
-  environments: ['single', 'viewer-demo'],
-}, async env => {
-  let controller;
-  let prevArrow;
-  let nextArrow;
+describes.endtoend(
+  'AMP carousel arrows when non-looping',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/non-looping.amp.html',
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    //TODO(spaharmi): fails on shadow demo
+    environments: ['single', 'viewer-demo'],
+  },
+  async env => {
+    let controller;
+    let prevArrow;
+    let nextArrow;
 
-  function css(handle, name) {
-    return controller.getElementCssValue(handle, name);
-  }
+    function css(handle, name) {
+      return controller.getElementCssValue(handle, name);
+    }
 
-  beforeEach(async() => {
-    controller = env.controller;
+    beforeEach(async () => {
+      controller = env.controller;
 
-    prevArrow = await getPrevArrow(controller);
-    nextArrow = await getNextArrow(controller);
-  });
+      prevArrow = await getPrevArrow(controller);
+      nextArrow = await getNextArrow(controller);
+    });
 
-  it('should have the arrows in the correct initial state', async() => {
-    await expect(css(prevArrow, 'opacity')).to.equal('0');
-    await expect(css(nextArrow, 'opacity')).to.equal('1');
-  });
+    it('should have the arrows in the correct initial state', async () => {
+      await expect(css(prevArrow, 'opacity')).to.equal('0');
+      await expect(css(nextArrow, 'opacity')).to.equal('1');
+    });
 
-  it('should show the prev arrow when going to the first slide', async() => {
-    await controller.click(nextArrow);
-    await expect(css(prevArrow, 'opacity')).to.equal('1');
-    await expect(css(nextArrow, 'opacity')).to.equal('1');
-  });
+    it('should show the prev arrow when going to the first slide', async () => {
+      await controller.click(nextArrow);
+      await expect(css(prevArrow, 'opacity')).to.equal('1');
+      await expect(css(nextArrow, 'opacity')).to.equal('1');
+    });
 
-  it('should hide the next arrow when going to the end', async() => {
-    const el = await getScrollingElement(controller);
-    await controller.scrollTo(el, {left: (SLIDE_COUNT - 1) * pageWidth});
+    it('should hide the next arrow when going to the end', async () => {
+      const el = await getScrollingElement(controller);
+      await controller.scrollTo(el, {left: (SLIDE_COUNT - 1) * pageWidth});
 
-    await expect(css(prevArrow, 'opacity')).to.equal('1');
-    await expect(css(nextArrow, 'opacity')).to.equal('0');
-  });
-});
+      await expect(css(prevArrow, 'opacity')).to.equal('1');
+      await expect(css(nextArrow, 'opacity')).to.equal('0');
+    });
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows.js b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows.js
index e06db2b856f4..0779328d230a 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-arrows.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-arrows.js
@@ -14,48 +14,48 @@
  * limitations under the License.
  */
 
-import {
-  getNextArrow,
-  getPrevArrow,
-  getSlide,
-} from './helpers';
+import {getNextArrow, getPrevArrow, getSlide} from './helpers';
 
 /** The total number of slides in the carousel */
 const SLIDE_COUNT = 7;
 
-describes.endtoend('AMP carousel arrows with custom arrows', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/custom-arrows.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  //TODO(spaharmi): fails on shadow demo
-  environments: ['single', 'viewer-demo'],
-}, async function(env) {
-  let controller;
-  let prevArrow;
-  let nextArrow;
-
-  beforeEach(async() => {
-    controller = env.controller;
-
-    nextArrow = await getNextArrow(controller);
-    prevArrow = await getPrevArrow(controller);
-  });
-
-  it('should go to the next slide', async() => {
-    const secondSlide = await getSlide(controller, 1);
-
-    await controller.click(nextArrow);
-    await expect(controller.getElementRect(secondSlide)).to.include({
-      'x': 0,
+describes.endtoend(
+  'AMP carousel arrows with custom arrows',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/custom-arrows.amp.html',
+    experiments: ['amp-base-carousel', 'layers'],
+    //TODO(spaharmi): fails on shadow demo
+    environments: ['single', 'viewer-demo'],
+  },
+  async function(env) {
+    let controller;
+    let prevArrow;
+    let nextArrow;
+
+    beforeEach(async () => {
+      controller = env.controller;
+
+      nextArrow = await getNextArrow(controller);
+      prevArrow = await getPrevArrow(controller);
     });
-  });
 
+    it('should go to the next slide', async () => {
+      const secondSlide = await getSlide(controller, 1);
 
-  it('should go to the previous slide', async() => {
-    const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+      await controller.click(nextArrow);
+      await expect(controller.getElementRect(secondSlide)).to.include({
+        'x': 0,
+      });
+    });
+
+    it('should go to the previous slide', async () => {
+      const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
 
-    await controller.click(prevArrow);
-    await expect(controller.getElementRect(lastSlide)).to.include({
-      'x': 0,
+      await controller.click(prevArrow);
+      await expect(controller.getElementRect(lastSlide)).to.include({
+        'x': 0,
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-autoadvance.js b/extensions/amp-base-carousel/0.1/test-e2e/test-autoadvance.js
index a0a3f8df0328..e02fdf068b66 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-autoadvance.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-autoadvance.js
@@ -14,37 +14,40 @@
  * limitations under the License.
  */
 
-import {
-  getSlides,
-} from './helpers';
+import {getSlides} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel autoadvance', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/autoadvance.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  let controller;
-
-  function rect(el) {
-    return controller.getElementRect(el);
+describes.endtoend(
+  'AMP carousel autoadvance',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/autoadvance.amp.html',
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    let controller;
+
+    function rect(el) {
+      return controller.getElementRect(el);
+    }
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    it('should move forwards', async () => {
+      const slides = await getSlides(controller);
+
+      await expect(rect(slides[1])).to.include({x: 0});
+      await expect(rect(slides[2])).to.include({x: 0});
+      await expect(rect(slides[0])).to.include({x: 0});
+    });
+
+    it.skip('should not advance while the user is touching', async () => {
+      // TODO(sparhami) Implement when touch actions are supported.
+    });
   }
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should move forwards', async() => {
-    const slides = await getSlides(controller);
-
-    await expect(rect(slides[1])).to.include({x: 0});
-    await expect(rect(slides[2])).to.include({x: 0});
-    await expect(rect(slides[0])).to.include({x: 0});
-  });
-
-  it.skip('should not advance while the user is touching', async() => {
-    // TODO(sparhami) Implement when touch actions are supported.
-  });
-});
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js b/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
index 714c10a8494a..ab72631cf9c9 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-carousel.js
@@ -14,225 +14,229 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlide,
-  waitForCarouselImg,
-} from './helpers';
+import {getScrollingElement, getSlide, waitForCarouselImg} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/basic.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  //TODO(spaharmi): fails on shadow demo
-  environments: ['single', 'viewer-demo'],
-}, async env => {
-  /** The total number of slides in the carousel */
-  const SLIDE_COUNT = 7;
-  let controller;
-
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
-  }
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render correctly', async() => {
-    const el = await getScrollingElement(controller);
-
-    // We should have space for SLIDE_COUNT - 1 on either side + 1 for the
-    // current slide.
-    await expect(prop(el, 'scrollWidth'))
-        .to.equal(pageWidth * (2 * (SLIDE_COUNT - 1) + 1));
-    await waitForCarouselImg(controller, 0);
-    await controller.takeScreenshot('screenshots/render.png');
-  });
-
-  it('should layout the two adjacent slides', async() => {
-    // TODO(sparhami) Verify this is on the right of the 0th slide
-    await waitForCarouselImg(controller, 1);
-    // TODO(sparhami) Verify this is on the left of the 0th slide
-    await waitForCarouselImg(controller, SLIDE_COUNT - 1);
-  });
-
-  it('should snap when scrolling', async() => {
-    const el = await getScrollingElement(controller);
-    const firstSlide = await getSlide(controller, 0);
-
-    // Wait for the first two slides's imgs to load.
-    await waitForCarouselImg(controller, 0);
-    await waitForCarouselImg(controller, 1);
-
-    const slideWidth = await prop(firstSlide, 'offsetWidth');
-    const scrollLeft = await prop(el, 'scrollLeft');
-    const snappedScrollLeft = scrollLeft + slideWidth;
-    const requestedScrollLeft = snappedScrollLeft + 1;
-
-    await controller.scroll(el, {left: requestedScrollLeft});
-    // We should have snapped to the edge of the slide rather than the
-    // requested scroll position.
-    await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-    await controller.takeScreenshot('screenshots/snapped.png');
-  });
-
-  it('should reset the window after scroll', async() => {
-    const el = await getScrollingElement(controller);
-    const firstSlide = await getSlide(controller, 0);
-
-    // Wait for the first two slides's imgs to load.
-    await waitForCarouselImg(controller, 0);
-    await waitForCarouselImg(controller, 1);
-
-    const slideWidth = await prop(firstSlide, 'offsetWidth');
-    const scrollWidth = await prop(el, 'scrollWidth');
-    const scrollLeft = await prop(el, 'scrollLeft');
-    const snappedScrollLeft = scrollLeft + slideWidth;
-    const requestedScrollLeft = snappedScrollLeft + 1;
-
-    await controller.scroll(el, {left: requestedScrollLeft});
-    // Wait for the scrolling to settle
-    await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-    // The new scroll width/left should eventually be the same as before,
-    // since the windowing should have been reset around the new element.
-    await expect(prop(el, 'scrollWidth')).to.equal(scrollWidth);
-    await expect(prop(el, 'scrollLeft')).to.equal(scrollLeft);
-    await controller.takeScreenshot('screenshots/after-reset.png');
-  });
-
-  it('should have the correct scroll position when resizing', async() => {
-    // Note: 513 seems to be the smallest settable width.
-    await controller.setWindowRect({
-      width: 800,
-      height: 600,
+describes.endtoend(
+  'AMP carousel',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/basic.amp.html',
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    //TODO(spaharmi): fails on shadow demo
+    environments: ['single', 'viewer-demo'],
+  },
+  async env => {
+    /** The total number of slides in the carousel */
+    const SLIDE_COUNT = 7;
+    let controller;
+
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
+
+    beforeEach(async () => {
+      controller = env.controller;
     });
 
-    const firstSlide = await getSlide(controller, 0);
-
-    // Wait for the first two slides's imgs to load.
-    await waitForCarouselImg(controller, 0);
-    await waitForCarouselImg(controller, 1);
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      'x': 0,
-      'width': 800,
-    });
+    it('should render correctly', async () => {
+      const el = await getScrollingElement(controller);
 
-    await controller.setWindowRect({
-      width: 900,
-      height: 600,
+      // We should have space for SLIDE_COUNT - 1 on either side + 1 for the
+      // current slide.
+      await expect(prop(el, 'scrollWidth')).to.equal(
+        pageWidth * (2 * (SLIDE_COUNT - 1) + 1)
+      );
+      await waitForCarouselImg(controller, 0);
+      await controller.takeScreenshot('screenshots/render.png');
     });
 
-    // Normally, resizing would cause the position to change. We're testing
-    // that the carousel moves this to the correct position again.
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      'x': 0,
-      'width': 900,
+    it('should layout the two adjacent slides', async () => {
+      // TODO(sparhami) Verify this is on the right of the 0th slide
+      await waitForCarouselImg(controller, 1);
+      // TODO(sparhami) Verify this is on the left of the 0th slide
+      await waitForCarouselImg(controller, SLIDE_COUNT - 1);
     });
-    await controller.takeScreenshot('screenshots/after-resize.png');
-  });
 
-  describe('looping', () => {
-    it('should show the last slide when looping', async() => {
+    it('should snap when scrolling', async () => {
       const el = await getScrollingElement(controller);
-      const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+      const firstSlide = await getSlide(controller, 0);
 
-      // Wait for the first and last slides to load.
+      // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
-      await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+      await waitForCarouselImg(controller, 1);
 
-      // Scroll to the previous slide by moving left by the last slide's width.
-      const slideWidth = await prop(lastSlide, 'offsetWidth');
-      const restingScrollLeft = await prop(el, 'scrollLeft');
-      const snappedScrollLeft = restingScrollLeft - slideWidth;
-      const requestedScrollLeft = snappedScrollLeft - 1;
-      await controller.scroll(el, {left: requestedScrollLeft});
+      const slideWidth = await prop(firstSlide, 'offsetWidth');
+      const scrollLeft = await prop(el, 'scrollLeft');
+      const snappedScrollLeft = scrollLeft + slideWidth;
+      const requestedScrollLeft = snappedScrollLeft + 1;
 
+      await controller.scroll(el, {left: requestedScrollLeft});
+      // We should have snapped to the edge of the slide rather than the
+      // requested scroll position.
       await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-      await controller.takeScreenshot('screenshots/loop-past-start.png');
+      await controller.takeScreenshot('screenshots/snapped.png');
     });
 
-    it('should show the first slide when looping', async() => {
+    it('should reset the window after scroll', async () => {
       const el = await getScrollingElement(controller);
-      const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+      const firstSlide = await getSlide(controller, 0);
 
-      // Wait for the first and last slides to load.
+      // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
-      await waitForCarouselImg(controller, SLIDE_COUNT - 1);
-
-      // Go to the last slide, wait for scrolling to move and window to reset.
-      const slideWidth = await prop(lastSlide, 'offsetWidth');
-      const restingScrollLeft = await prop(el, 'scrollLeft');
-      const lastSlideScrollPos = restingScrollLeft - slideWidth;
-      await controller.scroll(el, {left: lastSlideScrollPos});
-      await expect(prop(el, 'scrollLeft')).to.equal(lastSlideScrollPos);
-      await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
+      await waitForCarouselImg(controller, 1);
 
-      // Go to the next slide by moving the slides width to the right.
-      const snappedScrollLeft = restingScrollLeft + slideWidth;
+      const slideWidth = await prop(firstSlide, 'offsetWidth');
+      const scrollWidth = await prop(el, 'scrollWidth');
+      const scrollLeft = await prop(el, 'scrollLeft');
+      const snappedScrollLeft = scrollLeft + slideWidth;
       const requestedScrollLeft = snappedScrollLeft + 1;
-      await controller.scroll(el, {left: requestedScrollLeft});
 
+      await controller.scroll(el, {left: requestedScrollLeft});
+      // Wait for the scrolling to settle
       await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-      await controller.takeScreenshot('screenshots/loop-past-end.png');
+      // The new scroll width/left should eventually be the same as before,
+      // since the windowing should have been reset around the new element.
+      await expect(prop(el, 'scrollWidth')).to.equal(scrollWidth);
+      await expect(prop(el, 'scrollLeft')).to.equal(scrollLeft);
+      await controller.takeScreenshot('screenshots/after-reset.png');
     });
 
-    // When resting the last few slides should be translated to the left.
-    // Make sure we can move all the way forwards to the last slide and that it
-    // is in the right place.
-    it('should display slides correctly when moving forwards', async() => {
-      const el = await getScrollingElement(controller);
-      const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+    it('should have the correct scroll position when resizing', async () => {
+      // Note: 513 seems to be the smallest settable width.
+      await controller.setWindowRect({
+        width: 800,
+        height: 600,
+      });
+
+      const firstSlide = await getSlide(controller, 0);
 
-      // Wait for the first and last slides to load.
+      // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
-      await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+      await waitForCarouselImg(controller, 1);
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        'x': 0,
+        'width': 800,
+      });
 
-      // Go to the last slide, wait for scrolling to move.
-      const slideWidth = await prop(lastSlide, 'offsetWidth');
-      const restingScrollLeft = await prop(el, 'scrollLeft');
-      await controller.scrollTo(el, {
-        left: slideWidth * (SLIDE_COUNT - 2),
+      await controller.setWindowRect({
+        width: 900,
+        height: 600,
       });
 
-      await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
-      await expect(controller.getElementRect(lastSlide)).to.include({
-        x: 0,
-        width: slideWidth,
+      // Normally, resizing would cause the position to change. We're testing
+      // that the carousel moves this to the correct position again.
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        'x': 0,
+        'width': 900,
       });
-      await controller.takeScreenshot(
-          'screenshots/loop-move-forwards-to-end.png');
+      await controller.takeScreenshot('screenshots/after-resize.png');
     });
 
-    // When resting the first few slides should be translated to the right.
-    // Make sure we can move all the way backwards to the second slide and that
-    // it is in the right place.
-    it('should display slides correctly when moving backwards', async() => {
-      const el = await getScrollingElement(controller);
-      const secondSlide = await getSlide(controller, 1);
+    describe('looping', () => {
+      it('should show the last slide when looping', async () => {
+        const el = await getScrollingElement(controller);
+        const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
 
-      // Wait for the first and second slides to load.
-      await waitForCarouselImg(controller, 0);
-      await waitForCarouselImg(controller, 1);
+        // Wait for the first and last slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+
+        // Scroll to the previous slide by moving left by the last slide's width.
+        const slideWidth = await prop(lastSlide, 'offsetWidth');
+        const restingScrollLeft = await prop(el, 'scrollLeft');
+        const snappedScrollLeft = restingScrollLeft - slideWidth;
+        const requestedScrollLeft = snappedScrollLeft - 1;
+        await controller.scroll(el, {left: requestedScrollLeft});
+
+        await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+        await controller.takeScreenshot('screenshots/loop-past-start.png');
+      });
+
+      it('should show the first slide when looping', async () => {
+        const el = await getScrollingElement(controller);
+        const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+
+        // Wait for the first and last slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+
+        // Go to the last slide, wait for scrolling to move and window to reset.
+        const slideWidth = await prop(lastSlide, 'offsetWidth');
+        const restingScrollLeft = await prop(el, 'scrollLeft');
+        const lastSlideScrollPos = restingScrollLeft - slideWidth;
+        await controller.scroll(el, {left: lastSlideScrollPos});
+        await expect(prop(el, 'scrollLeft')).to.equal(lastSlideScrollPos);
+        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
+
+        // Go to the next slide by moving the slides width to the right.
+        const snappedScrollLeft = restingScrollLeft + slideWidth;
+        const requestedScrollLeft = snappedScrollLeft + 1;
+        await controller.scroll(el, {left: requestedScrollLeft});
+
+        await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+        await controller.takeScreenshot('screenshots/loop-past-end.png');
+      });
 
-      // Go to the last slide, wait for scrolling to move.
-      const slideWidth = await prop(secondSlide, 'offsetWidth');
-      const restingScrollLeft = await prop(el, 'scrollLeft');
-      await controller.scrollTo(el, {
-        left: -(slideWidth * (SLIDE_COUNT - 2)),
+      // When resting the last few slides should be translated to the left.
+      // Make sure we can move all the way forwards to the last slide and that it
+      // is in the right place.
+      it('should display slides correctly when moving forwards', async () => {
+        const el = await getScrollingElement(controller);
+        const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+
+        // Wait for the first and last slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+
+        // Go to the last slide, wait for scrolling to move.
+        const slideWidth = await prop(lastSlide, 'offsetWidth');
+        const restingScrollLeft = await prop(el, 'scrollLeft');
+        await controller.scrollTo(el, {
+          left: slideWidth * (SLIDE_COUNT - 2),
+        });
+
+        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
+        await expect(controller.getElementRect(lastSlide)).to.include({
+          x: 0,
+          width: slideWidth,
+        });
+        await controller.takeScreenshot(
+          'screenshots/loop-move-forwards-to-end.png'
+        );
       });
 
-      await expect(prop(el, 'scrollLeft')).to.not.equal(restingScrollLeft);
-      await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
-      await expect(controller.getElementRect(secondSlide)).to.include({
-        x: 0,
-        width: slideWidth,
+      // When resting the first few slides should be translated to the right.
+      // Make sure we can move all the way backwards to the second slide and that
+      // it is in the right place.
+      it('should display slides correctly when moving backwards', async () => {
+        const el = await getScrollingElement(controller);
+        const secondSlide = await getSlide(controller, 1);
+
+        // Wait for the first and second slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, 1);
+
+        // Go to the last slide, wait for scrolling to move.
+        const slideWidth = await prop(secondSlide, 'offsetWidth');
+        const restingScrollLeft = await prop(el, 'scrollLeft');
+        await controller.scrollTo(el, {
+          left: -(slideWidth * (SLIDE_COUNT - 2)),
+        });
+
+        await expect(prop(el, 'scrollLeft')).to.not.equal(restingScrollLeft);
+        await expect(prop(el, 'scrollLeft')).to.equal(restingScrollLeft);
+        await expect(controller.getElementRect(secondSlide)).to.include({
+          x: 0,
+          width: slideWidth,
+        });
+        await controller.takeScreenshot(
+          'screenshots/loop-move-backwards-to-second.png'
+        );
       });
-      await controller.takeScreenshot(
-          'screenshots/loop-move-backwards-to-second.png');
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-grouping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-grouping.js
index 5f700c8971f5..2d3c9c7f4556 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-grouping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-grouping.js
@@ -14,70 +14,71 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlides,
-} from './helpers';
+import {getScrollingElement, getSlides} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel grouping', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'AMP carousel grouping',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'grouping-move-by-2.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  const slideWidth = pageWidth / 2;
-  let controller;
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    const slideWidth = pageWidth / 2;
+    let controller;
 
-  function rect(el) {
-    return controller.getElementRect(el);
-  }
-
-  beforeEach(function() {
-    controller = env.controller;
-    this.timeout(3 * 1000);
-  });
+    function rect(el) {
+      return controller.getElementRect(el);
+    }
 
-  it('should snap on next group when past the midpoint', async() => {
-    const el = await getScrollingElement(controller);
-    const slides = await getSlides(controller);
+    beforeEach(function() {
+      controller = env.controller;
+      this.timeout(3 * 1000);
+    });
 
-    await controller.scrollTo(el, {left: slideWidth + 1});
-    await expect(rect(slides[2])).to.include({x: 0});
-  });
+    it('should snap on next group when past the midpoint', async () => {
+      const el = await getScrollingElement(controller);
+      const slides = await getSlides(controller);
 
-  it('should snap on current group when before the midpoint', async() => {
-    const el = await getScrollingElement(controller);
-    const slides = await getSlides(controller);
+      await controller.scrollTo(el, {left: slideWidth + 1});
+      await expect(rect(slides[2])).to.include({x: 0});
+    });
 
-    await controller.scrollTo(el, {left: slideWidth - 1});
-    await expect(rect(slides[0])).to.include({x: 0});
-  });
+    it('should snap on current group when before the midpoint', async () => {
+      const el = await getScrollingElement(controller);
+      const slides = await getSlides(controller);
 
-  it.skip('should move forwards by the advance-count', async() => {
-    const slides = await getSlides(controller);
-    const btn = await controller.findElement('[on="tap:carousel-1.next()"]');
+      await controller.scrollTo(el, {left: slideWidth - 1});
+      await expect(rect(slides[0])).to.include({x: 0});
+    });
 
-    await controller.click(btn);
-    await expect(rect(slides[2])).to.include({x: 0});
-    await controller.click(btn);
-    await expect(rect(slides[4])).to.include({x: 0});
-    await controller.click(btn);
-    await expect(rect(slides[0])).to.include({x: 0});
-  });
+    it.skip('should move forwards by the advance-count', async () => {
+      const slides = await getSlides(controller);
+      const btn = await controller.findElement('[on="tap:carousel-1.next()"]');
 
-  it.skip('should move backwards by the advance-count', async() => {
-    const slides = await getSlides(controller);
-    const btn = await controller.findElement('[on="tap:carousel-1.prev()"]');
+      await controller.click(btn);
+      await expect(rect(slides[2])).to.include({x: 0});
+      await controller.click(btn);
+      await expect(rect(slides[4])).to.include({x: 0});
+      await controller.click(btn);
+      await expect(rect(slides[0])).to.include({x: 0});
+    });
 
-    await controller.click(btn);
-    await expect(rect(slides[4])).to.include({x: 0});
-    await controller.click(btn);
-    await expect(rect(slides[2])).to.include({x: 0});
-    await controller.click(btn);
-    await expect(rect(slides[0])).to.include({x: 0});
-  });
-});
+    it.skip('should move backwards by the advance-count', async () => {
+      const slides = await getSlides(controller);
+      const btn = await controller.findElement('[on="tap:carousel-1.prev()"]');
 
+      await controller.click(btn);
+      await expect(rect(slides[4])).to.include({x: 0});
+      await controller.click(btn);
+      await expect(rect(slides[2])).to.include({x: 0});
+      await controller.click(btn);
+      await expect(rect(slides[0])).to.include({x: 0});
+    });
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-initial-slide.js b/extensions/amp-base-carousel/0.1/test-e2e/test-initial-slide.js
index c20b2e147cdf..62b69ba11ff5 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-initial-slide.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-initial-slide.js
@@ -14,34 +14,37 @@
  * limitations under the License.
  */
 
-import {
-  getSlide,
-} from './helpers';
+import {getSlide} from './helpers';
 
 const pageWidth = 600;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'AMP carousel',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'initial-slide.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  let controller;
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  //TODO(spaharmi): fails on all environments
-  it.skip('should render with the correct initial slide', async() => {
-    const thirdSlide = await getSlide(controller, 2);
+    //TODO(spaharmi): fails on all environments
+    it.skip('should render with the correct initial slide', async () => {
+      const thirdSlide = await getSlide(controller, 2);
 
-    // Normally, resizing would cause the position to change. We're testing
-    // that the carousel moves this to the correct position again.
-    await expect(controller.getElementRect(thirdSlide)).to.include({
-      'x': 0,
-      'width': pageWidth,
+      // Normally, resizing would cause the position to change. We're testing
+      // that the carousel moves this to the correct position again.
+      await expect(controller.getElementRect(thirdSlide)).to.include({
+        'x': 0,
+        'width': pageWidth,
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths-no-snap.js b/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths-no-snap.js
index 512ecea25e78..191a5c47e674 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths-no-snap.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths-no-snap.js
@@ -14,65 +14,66 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlides,
-  getSpacersForSlide,
-} from './helpers';
+import {getScrollingElement, getSlides, getSpacersForSlide} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel mixed length slides', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'AMP carousel mixed length slides',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'mixed-lengths-no-snap.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  //TODO(spaharmi): fails on viewer and shadow demo
-  environments: ['single'],
-}, async env => {
-  let controller;
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    //TODO(spaharmi): fails on viewer and shadow demo
+    environments: ['single'],
+  },
+  async env => {
+    let controller;
 
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
-  }
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
 
-  async function assertSpacerWidth(index, width) {
-    const spacers = await getSpacersForSlide(controller, index);
-    await expect(prop(spacers[1], 'offsetWidth')).to.equal(width);
-  }
+    async function assertSpacerWidth(index, width) {
+      const spacers = await getSpacersForSlide(controller, index);
+      await expect(prop(spacers[1], 'offsetWidth')).to.equal(width);
+    }
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  // Test mixed lengths without snapping. This is start aligned as that seems
-  // make the most sense for non-snapping mixed lengths.
-  describe('no snap', () => {
-    const slideOneWidth = 600;
-    const slideTwoWidth = 400;
+    // Test mixed lengths without snapping. This is start aligned as that seems
+    // make the most sense for non-snapping mixed lengths.
+    describe('no snap', () => {
+      const slideOneWidth = 600;
+      const slideTwoWidth = 400;
 
-    it('should have the correct initial slide positions', async() => {
-      const slides = await getSlides(controller);
+      it('should have the correct initial slide positions', async () => {
+        const slides = await getSlides(controller);
 
-      // First slide has width 75%, and viewport is 600 pixels wide
-      await expect(prop(slides[0], 'offsetWidth')).to.equal(slideOneWidth);
-      await expect(controller.getElementRect(slides[0])).to.include({x: 0});
-      await assertSpacerWidth(0, slideOneWidth);
-      // Second slide has width 50%, and viewport is 400 pixels wide
-      await expect(prop(slides[1], 'offsetWidth')).to.equal(slideTwoWidth);
-      await expect(controller.getElementRect(slides[1])).to.include({
-        x: slideOneWidth,
+        // First slide has width 75%, and viewport is 600 pixels wide
+        await expect(prop(slides[0], 'offsetWidth')).to.equal(slideOneWidth);
+        await expect(controller.getElementRect(slides[0])).to.include({x: 0});
+        await assertSpacerWidth(0, slideOneWidth);
+        // Second slide has width 50%, and viewport is 400 pixels wide
+        await expect(prop(slides[1], 'offsetWidth')).to.equal(slideTwoWidth);
+        await expect(controller.getElementRect(slides[1])).to.include({
+          x: slideOneWidth,
+        });
+        await assertSpacerWidth(1, slideTwoWidth);
       });
-      await assertSpacerWidth(1, slideTwoWidth);
-    });
 
-    it('should scroll freely', async() => {
-      const el = await getScrollingElement(controller);
-      const slides = await getSlides(controller);
+      it('should scroll freely', async () => {
+        const el = await getScrollingElement(controller);
+        const slides = await getSlides(controller);
 
-      await controller.scrollBy(el, {left: 10});
-      await expect(controller.getElementRect(slides[0])).to.include({x: -10});
+        await controller.scrollBy(el, {left: 10});
+        await expect(controller.getElementRect(slides[0])).to.include({x: -10});
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths.js b/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths.js
index 3cf6b177e9b1..9c629c52069c 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-mixed-lengths.js
@@ -14,62 +14,63 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlides,
-  getSpacersForSlide,
-} from './helpers';
+import {getScrollingElement, getSlides, getSpacersForSlide} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('AMP carousel mixed length slides', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'AMP carousel mixed length slides',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'mixed-lengths.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  let controller;
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    let controller;
 
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
-  }
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
 
-  async function assertSpacerWidth(index, width) {
-    const spacers = await getSpacersForSlide(controller, index);
-    await expect(prop(spacers[1], 'offsetWidth')).to.equal(width);
-  }
+    async function assertSpacerWidth(index, width) {
+      const spacers = await getSpacersForSlide(controller, index);
+      await expect(prop(spacers[1], 'offsetWidth')).to.equal(width);
+    }
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  // Test mixed lengths with snapping. This is center aligned as that seems
-  // make the most sense for snapping mixed lengths.
-  describe('snap', () => {
-    const slideOneWidth = 600;
-    const slideTwoWidth = 400;
+    // Test mixed lengths with snapping. This is center aligned as that seems
+    // make the most sense for snapping mixed lengths.
+    describe('snap', () => {
+      const slideOneWidth = 600;
+      const slideTwoWidth = 400;
 
-    it('should have the correct initial slide positions', async() => {
-      const slides = await getSlides(controller);
+      it('should have the correct initial slide positions', async () => {
+        const slides = await getSlides(controller);
 
-      // First slide has width 75%, and viewport is 600 pixels wide
-      await expect(prop(slides[0], 'offsetWidth')).to.equal(slideOneWidth);
-      await expect(controller.getElementRect(slides[0])).to.include({
-        x: (pageWidth - slideOneWidth) / 2,
-      });
-      await assertSpacerWidth(0, slideOneWidth);
-      // Second slide has width 50%, and viewport is 400 pixels wide
-      await expect(prop(slides[1], 'offsetWidth')).to.equal(slideTwoWidth);
-      await expect(controller.getElementRect(slides[1])).to.include({
-        x: slideOneWidth + (pageWidth - slideOneWidth) / 2,
+        // First slide has width 75%, and viewport is 600 pixels wide
+        await expect(prop(slides[0], 'offsetWidth')).to.equal(slideOneWidth);
+        await expect(controller.getElementRect(slides[0])).to.include({
+          x: (pageWidth - slideOneWidth) / 2,
+        });
+        await assertSpacerWidth(0, slideOneWidth);
+        // Second slide has width 50%, and viewport is 400 pixels wide
+        await expect(prop(slides[1], 'offsetWidth')).to.equal(slideTwoWidth);
+        await expect(controller.getElementRect(slides[1])).to.include({
+          x: slideOneWidth + (pageWidth - slideOneWidth) / 2,
+        });
+        await assertSpacerWidth(1, slideTwoWidth);
       });
-      await assertSpacerWidth(1, slideTwoWidth);
-    });
 
-    //TODO(sparhami): fails on shadow demo
-    it.configure().skipShadowDemo().run(
-        'should snap on the center point', async() => {
+      //TODO(sparhami): fails on shadow demo
+      it.configure()
+        .skipShadowDemo()
+        .run('should snap on the center point', async () => {
           const el = await getScrollingElement(controller);
           const slides = await getSlides(controller);
           const scrollAmount = 1 + (slideOneWidth + slideTwoWidth) / 2;
@@ -79,5 +80,6 @@ describes.endtoend('AMP carousel mixed length slides', {
             x: (pageWidth - slideTwoWidth) / 2,
           });
         });
-  });
-});
+    });
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-non-looping.js b/extensions/amp-base-carousel/0.1/test-e2e/test-non-looping.js
index 298b2d88cb61..95646be612c1 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-non-looping.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-non-looping.js
@@ -14,96 +14,101 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlide,
-  waitForCarouselImg,
-} from './helpers';
+import {getScrollingElement, getSlide, waitForCarouselImg} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('Non-looping AMP carousel', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'Non-looping AMP carousel',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'non-looping.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  /** The total number of slides in the carousel */
-  const SLIDE_COUNT = 4;
-  let controller;
-
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    /** The total number of slides in the carousel */
+    const SLIDE_COUNT = 4;
+    let controller;
+
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    it('should render correctly', async () => {
+      const el = await getScrollingElement(controller);
+
+      await expect(prop(el, 'scrollWidth')).to.equal(pageWidth * SLIDE_COUNT);
+      await waitForCarouselImg(controller, 0);
+      await controller.takeScreenshot('screenshots/render.png');
+    });
+
+    it('should layout the adjacent slide', async () => {
+      // TODO(sparhami) Verify this is on the right of the 0th slide
+      await waitForCarouselImg(controller, 1);
+    });
+
+    it('should snap when scrolling', async () => {
+      const el = await getScrollingElement(controller);
+      const firstSlide = await getSlide(controller, 0);
+
+      // Wait for the first two slides's imgs to load.
+      await waitForCarouselImg(controller, 0);
+      await waitForCarouselImg(controller, 1);
+
+      const slideWidth = await prop(firstSlide, 'offsetWidth');
+      const scrollLeft = await prop(el, 'scrollLeft');
+      const snappedScrollLeft = scrollLeft + slideWidth;
+      const requestedScrollLeft = snappedScrollLeft + 1;
+
+      await controller.scroll(el, {left: requestedScrollLeft});
+      // We should have snapped to the edge of the slide rather than the
+      // requested scroll position.
+      await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
+      await controller.takeScreenshot('screenshots/snapped.png');
+    });
+
+    //TODO(sparhami): fails on shadow demo
+    it.configure()
+      .skipShadowDemo()
+      .run(
+        'should have the correct scroll position when resizing',
+        async () => {
+          // Note: 513 seems to be the smallest settable width.
+          await controller.setWindowRect({
+            width: 800,
+            height: 600,
+          });
+
+          const firstSlide = await getSlide(controller, 0);
+
+          // Wait for the first two slides's imgs to load.
+          await waitForCarouselImg(controller, 0);
+          await waitForCarouselImg(controller, 1);
+          await expect(controller.getElementRect(firstSlide)).to.include({
+            'x': 0,
+            'width': 800,
+          });
+
+          await controller.setWindowRect({
+            width: 900,
+            height: 600,
+          });
+
+          // Normally, resizing would cause the position to change. We're testing
+          // that the carousel moves this to the correct position again.
+          await expect(controller.getElementRect(firstSlide)).to.include({
+            'x': 0,
+            'width': 900,
+          });
+          await controller.takeScreenshot('screenshots/after-resize.png');
+        }
+      );
   }
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render correctly', async() => {
-    const el = await getScrollingElement(controller);
-
-    await expect(prop(el, 'scrollWidth')).to.equal(pageWidth * SLIDE_COUNT);
-    await waitForCarouselImg(controller, 0);
-    await controller.takeScreenshot('screenshots/render.png');
-  });
-
-  it('should layout the adjacent slide', async() => {
-    // TODO(sparhami) Verify this is on the right of the 0th slide
-    await waitForCarouselImg(controller, 1);
-  });
-
-  it('should snap when scrolling', async() => {
-    const el = await getScrollingElement(controller);
-    const firstSlide = await getSlide(controller, 0);
-
-    // Wait for the first two slides's imgs to load.
-    await waitForCarouselImg(controller, 0);
-    await waitForCarouselImg(controller, 1);
-
-    const slideWidth = await prop(firstSlide, 'offsetWidth');
-    const scrollLeft = await prop(el, 'scrollLeft');
-    const snappedScrollLeft = scrollLeft + slideWidth;
-    const requestedScrollLeft = snappedScrollLeft + 1;
-
-    await controller.scroll(el, {left: requestedScrollLeft});
-    // We should have snapped to the edge of the slide rather than the
-    // requested scroll position.
-    await expect(prop(el, 'scrollLeft')).to.equal(snappedScrollLeft);
-    await controller.takeScreenshot('screenshots/snapped.png');
-  });
-
-  //TODO(sparhami): fails on shadow demo
-  it.configure().skipShadowDemo().run(
-      'should have the correct scroll position when resizing', async() => {
-        // Note: 513 seems to be the smallest settable width.
-        await controller.setWindowRect({
-          width: 800,
-          height: 600,
-        });
-
-        const firstSlide = await getSlide(controller, 0);
-
-        // Wait for the first two slides's imgs to load.
-        await waitForCarouselImg(controller, 0);
-        await waitForCarouselImg(controller, 1);
-        await expect(controller.getElementRect(firstSlide)).to.include({
-          'x': 0,
-          'width': 800,
-        });
-
-        await controller.setWindowRect({
-          width: 900,
-          height: 600,
-        });
-
-        // Normally, resizing would cause the position to change. We're testing
-        // that the carousel moves this to the correct position again.
-        await expect(controller.getElementRect(firstSlide)).to.include({
-          'x': 0,
-          'width': 900,
-        });
-        await controller.takeScreenshot('screenshots/after-resize.png');
-      });
-});
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-responsive.js b/extensions/amp-base-carousel/0.1/test-e2e/test-responsive.js
index 81288f72c2b1..15b73190e37a 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-responsive.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-responsive.js
@@ -14,98 +14,99 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlide,
-  waitForCarouselImg,
-} from './helpers';
+import {getScrollingElement, getSlide, waitForCarouselImg} from './helpers';
 
 const pageWidth = 1000;
 const pageHeight = 600;
 
-describes.endtoend('AMP Carousel responsive attributes', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'AMP Carousel responsive attributes',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'responsive.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  //TODO(spaharmi): fails on shadow demo
-  environments: ['single', 'viewer-demo'],
-}, async env => {
-  let controller;
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    //TODO(spaharmi): fails on shadow demo
+    environments: ['single', 'viewer-demo'],
+  },
+  async env => {
+    let controller;
 
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
-  }
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should layout correctly initially', async() => {
-    const firstSlide = await getSlide(controller, 0);
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
 
-    await waitForCarouselImg(controller, 0);
-    // 3 slides width width 1000 = 333 width per slide.
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      width: 333,
-      x: 0,
+    beforeEach(async () => {
+      controller = env.controller;
     });
-  });
 
-  it('should layout correctly after resize', async() => {
-    const firstSlide = await getSlide(controller, 0);
+    it('should layout correctly initially', async () => {
+      const firstSlide = await getSlide(controller, 0);
 
-    await waitForCarouselImg(controller, 0);
-    await controller.setWindowRect({
-      width: 600,
-      height: 600,
+      await waitForCarouselImg(controller, 0);
+      // 3 slides width width 1000 = 333 width per slide.
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        width: 333,
+        x: 0,
+      });
     });
-    // 2 slides width width 600 = 300 width per slide.
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      width: 300,
-      x: 0,
-    });
-  });
 
-  it('should retain position when changing the visible count', async() => {
-    const el = await getScrollingElement(controller);
-    const secondSlide = await getSlide(controller, 1);
+    it('should layout correctly after resize', async () => {
+      const firstSlide = await getSlide(controller, 0);
 
-    await controller.scroll(el, {left: 333});
-    await expect(prop(el, 'scrollLeft')).to.equal(333);
-    await controller.setWindowRect({
-      width: 600,
-      height: 600,
+      await waitForCarouselImg(controller, 0);
+      await controller.setWindowRect({
+        width: 600,
+        height: 600,
+      });
+      // 2 slides width width 600 = 300 width per slide.
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        width: 300,
+        x: 0,
+      });
     });
 
-    await expect(controller.getElementRect(secondSlide)).to.include({x: 0});
-  });
+    it('should retain position when changing the visible count', async () => {
+      const el = await getScrollingElement(controller);
+      const secondSlide = await getSlide(controller, 1);
 
-  it('should respond to attribute changes', async() => {
-    const firstSlide = await getSlide(controller, 0);
+      await controller.scroll(el, {left: 333});
+      await expect(prop(el, 'scrollLeft')).to.equal(333);
+      await controller.setWindowRect({
+        width: 600,
+        height: 600,
+      });
 
-    // 3 slides width width 1000 = 333 width per slide.
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      width: 333,
-      x: 0,
-    });
-    // Switch over to `visible-count="(min-width: 650px) 5, 4".
-    const btn = await controller.findElement('#responsive-5-4');
-    await controller.click(btn);
-    // 5 slides width width 1000 = 200 width per slide
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      width: 200,
-      x: 0,
+      await expect(controller.getElementRect(secondSlide)).to.include({x: 0});
     });
-    // Now make sure new media query is active.
-    await controller.setWindowRect({
-      width: 600,
-      height: 600,
-    });
-    // 4 slides width width 600 = 150 width per slide.
-    await expect(controller.getElementRect(firstSlide)).to.include({
-      width: 150,
-      x: 0,
+
+    it('should respond to attribute changes', async () => {
+      const firstSlide = await getSlide(controller, 0);
+
+      // 3 slides width width 1000 = 333 width per slide.
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        width: 333,
+        x: 0,
+      });
+      // Switch over to `visible-count="(min-width: 650px) 5, 4".
+      const btn = await controller.findElement('#responsive-5-4');
+      await controller.click(btn);
+      // 5 slides width width 1000 = 200 width per slide
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        width: 200,
+        x: 0,
+      });
+      // Now make sure new media query is active.
+      await controller.setWindowRect({
+        width: 600,
+        height: 600,
+      });
+      // 4 slides width width 600 = 150 width per slide.
+      await expect(controller.getElementRect(firstSlide)).to.include({
+        width: 150,
+        x: 0,
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js b/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
index ffebe038db4f..1cd721502fa3 100644
--- a/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
+++ b/extensions/amp-base-carousel/0.1/test-e2e/test-vertical.js
@@ -14,138 +14,140 @@
  * limitations under the License.
  */
 
-import {
-  getScrollingElement,
-  getSlide,
-  waitForCarouselImg,
-} from './helpers';
+import {getScrollingElement, getSlide, waitForCarouselImg} from './helpers';
 
 const pageWidth = 800;
 const pageHeight = 600;
 
-describes.endtoend('Vertical AMP carousel', {
-  testUrl: 'http://localhost:8000/test/manual/amp-base-carousel/' +
+describes.endtoend(
+  'Vertical AMP carousel',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-base-carousel/' +
       'vertical.amp.html',
-  experiments: ['amp-base-carousel', 'layers'],
-  initialRect: {width: pageWidth, height: pageHeight},
-}, async env => {
-  /** The total number of slides in the carousel */
-  const SLIDE_COUNT = 7;
-  let controller;
-
-  function prop(el, name) {
-    return controller.getElementProperty(el, name);
-  }
+    experiments: ['amp-base-carousel', 'layers'],
+    initialRect: {width: pageWidth, height: pageHeight},
+  },
+  async env => {
+    /** The total number of slides in the carousel */
+    const SLIDE_COUNT = 7;
+    let controller;
+
+    function prop(el, name) {
+      return controller.getElementProperty(el, name);
+    }
+
+    function rect(el) {
+      return controller.getElementRect(el);
+    }
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  function rect(el) {
-    return controller.getElementRect(el);
-  }
+    it('should render correctly', async () => {
+      // We should have space for SLIDE_COUNT - 1 on either side + 1 for the
+      // current slide.
+      // TODO(sparhami) Chrome has the wrong value here for scrollHeight?
+      // const el = await getScrollingElement(controller);
+      // await expect(prop(el, 'scrollHeight'))
+      //     .to.equal(carouselHeight * (2 * (SLIDE_COUNT - 1) + 1));
+      await waitForCarouselImg(controller, 0);
+      await controller.takeScreenshot('screenshots/vertical/render.png');
+    });
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render correctly', async() => {
-    // We should have space for SLIDE_COUNT - 1 on either side + 1 for the
-    // current slide.
-    // TODO(sparhami) Chrome has the wrong value here for scrollHeight?
-    // const el = await getScrollingElement(controller);
-    // await expect(prop(el, 'scrollHeight'))
-    //     .to.equal(carouselHeight * (2 * (SLIDE_COUNT - 1) + 1));
-    await waitForCarouselImg(controller, 0);
-    await controller.takeScreenshot('screenshots/vertical/render.png');
-  });
-
-  // TODO(sparhami): unskip
-  it.skip('should layout the two adjacent slides', async() => {
-    // TODO(sparhami) Verify this is on the right of the 0th slide
-    await waitForCarouselImg(controller, 1);
-    // TODO(sparhami) Verify this is on the left of the 0th slide
-    await waitForCarouselImg(controller, SLIDE_COUNT - 1);
-  });
-
-  // TODO(sparhami): unskip
-  it.skip('should snap when scrolling', async() => {
-    const el = await getScrollingElement(controller);
-    const firstSlide = await getSlide(controller, 0);
-
-    // Wait for the first two slides's imgs to load.
-    await waitForCarouselImg(controller, 0);
-    await waitForCarouselImg(controller, 1);
-
-    const {y: carouselTop} = await rect(el);
-    const slideHeight = await prop(firstSlide, 'offsetHeight');
-    const scrollTop = await prop(el, 'scrollTop');
-    const snappedScrollTop = scrollTop + slideHeight;
-    const requestedScrollTop = snappedScrollTop + 1;
-
-    await controller.scroll(el, {top: requestedScrollTop});
-    // We should have snapped to the edge of the slide rather than the
-    // requested scroll position.
-    await expect(rect(firstSlide)).to.include({y: carouselTop - slideHeight});
-    await controller.takeScreenshot('screenshots/vertical/snapped.png');
-  });
-
-  describe('looping', () => {
-    // When resting the last few slides should be translated to the top.
-    // Make sure we can move all the way forwards to the last slide and that it
-    // is in the right place.
     // TODO(sparhami): unskip
-    it.skip('should display slides correctly when moving forwards', async() => {
-      const el = await getScrollingElement(controller);
-      const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
-
-      // Wait for the first and last slides to load.
-      await waitForCarouselImg(controller, 0);
+    it.skip('should layout the two adjacent slides', async () => {
+      // TODO(sparhami) Verify this is on the right of the 0th slide
+      await waitForCarouselImg(controller, 1);
+      // TODO(sparhami) Verify this is on the left of the 0th slide
       await waitForCarouselImg(controller, SLIDE_COUNT - 1);
-
-      // Go to the last slide, wait for scrolling to move.
-      const {y: carouselTop} = await rect(el);
-      const slideHeight = await prop(lastSlide, 'offsetHeight');
-      const restingScrollTop = await prop(el, 'scrollTop');
-      await controller.scrollBy(el, {
-        top: slideHeight * (SLIDE_COUNT - 1),
-      });
-
-      await expect(prop(el, 'scrollLeft')).to.not.equal(restingScrollTop);
-      await expect(prop(el, 'scrollTop')).to.equal(restingScrollTop);
-      await expect(controller.getElementRect(lastSlide)).to.include({
-        y: carouselTop,
-        height: slideHeight,
-      });
-      await controller.takeScreenshot(
-          'screenshots/vertical/loop-move-forwards-to-end.png');
     });
 
-    // When resting the first few slides should be translated to the bottom.
-    // Make sure we can move all the way backwards to the second slide and that
-    // it is in the right place.
     // TODO(sparhami): unskip
-    it.skip('should display slides correctly when ' +
-        'moving backwards', async() => {
+    it.skip('should snap when scrolling', async () => {
       const el = await getScrollingElement(controller);
-      const secondSlide = await getSlide(controller, 1);
+      const firstSlide = await getSlide(controller, 0);
 
-      // Wait for the first and second slides to load.
+      // Wait for the first two slides's imgs to load.
       await waitForCarouselImg(controller, 0);
       await waitForCarouselImg(controller, 1);
 
-      // Go to the last slide, wait for scrolling to move.
       const {y: carouselTop} = await rect(el);
-      const slideHeight = await prop(secondSlide, 'offsetHeight');
-      const restingScrollTop = await prop(el, 'scrollTop');
-      await controller.scrollBy(el, {
-        top: -(slideHeight * (SLIDE_COUNT - 1)),
+      const slideHeight = await prop(firstSlide, 'offsetHeight');
+      const scrollTop = await prop(el, 'scrollTop');
+      const snappedScrollTop = scrollTop + slideHeight;
+      const requestedScrollTop = snappedScrollTop + 1;
+
+      await controller.scroll(el, {top: requestedScrollTop});
+      // We should have snapped to the edge of the slide rather than the
+      // requested scroll position.
+      await expect(rect(firstSlide)).to.include({y: carouselTop - slideHeight});
+      await controller.takeScreenshot('screenshots/vertical/snapped.png');
+    });
+
+    describe('looping', () => {
+      // When resting the last few slides should be translated to the top.
+      // Make sure we can move all the way forwards to the last slide and that it
+      // is in the right place.
+      // TODO(sparhami): unskip
+      it.skip('should display slides correctly when moving forwards', async () => {
+        const el = await getScrollingElement(controller);
+        const lastSlide = await getSlide(controller, SLIDE_COUNT - 1);
+
+        // Wait for the first and last slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, SLIDE_COUNT - 1);
+
+        // Go to the last slide, wait for scrolling to move.
+        const {y: carouselTop} = await rect(el);
+        const slideHeight = await prop(lastSlide, 'offsetHeight');
+        const restingScrollTop = await prop(el, 'scrollTop');
+        await controller.scrollBy(el, {
+          top: slideHeight * (SLIDE_COUNT - 1),
+        });
+
+        await expect(prop(el, 'scrollLeft')).to.not.equal(restingScrollTop);
+        await expect(prop(el, 'scrollTop')).to.equal(restingScrollTop);
+        await expect(controller.getElementRect(lastSlide)).to.include({
+          y: carouselTop,
+          height: slideHeight,
+        });
+        await controller.takeScreenshot(
+          'screenshots/vertical/loop-move-forwards-to-end.png'
+        );
       });
 
-      await expect(prop(el, 'scrollTop')).to.not.equal(restingScrollTop);
-      await expect(prop(el, 'scrollTop')).to.equal(restingScrollTop);
-      await expect(controller.getElementRect(secondSlide)).to.include({
-        y: carouselTop,
-        height: slideHeight,
+      // When resting the first few slides should be translated to the bottom.
+      // Make sure we can move all the way backwards to the second slide and that
+      // it is in the right place.
+      // TODO(sparhami): unskip
+      it.skip('should display slides correctly when moving backwards', async () => {
+        const el = await getScrollingElement(controller);
+        const secondSlide = await getSlide(controller, 1);
+
+        // Wait for the first and second slides to load.
+        await waitForCarouselImg(controller, 0);
+        await waitForCarouselImg(controller, 1);
+
+        // Go to the last slide, wait for scrolling to move.
+        const {y: carouselTop} = await rect(el);
+        const slideHeight = await prop(secondSlide, 'offsetHeight');
+        const restingScrollTop = await prop(el, 'scrollTop');
+        await controller.scrollBy(el, {
+          top: -(slideHeight * (SLIDE_COUNT - 1)),
+        });
+
+        await expect(prop(el, 'scrollTop')).to.not.equal(restingScrollTop);
+        await expect(prop(el, 'scrollTop')).to.equal(restingScrollTop);
+        await expect(controller.getElementRect(secondSlide)).to.include({
+          y: carouselTop,
+          height: slideHeight,
+        });
+        await controller.takeScreenshot(
+          'screenshots/vertical/loop-move-backwards-to-second.png'
+        );
       });
-      await controller.takeScreenshot(
-          'screenshots/vertical/loop-move-backwards-to-second.png');
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-base-carousel/0.1/test/test-responsive-attributes.js b/extensions/amp-base-carousel/0.1/test/test-responsive-attributes.js
index af15dd70d601..7a10fef4bf77 100644
--- a/extensions/amp-base-carousel/0.1/test/test-responsive-attributes.js
+++ b/extensions/amp-base-carousel/0.1/test/test-responsive-attributes.js
@@ -25,7 +25,7 @@ describe('ResponsiveAttributes', () => {
     matchMediaStub.withArgs('').returns({matches: true});
   });
 
-  it('should choose the first matching media query' , () => {
+  it('should choose the first matching media query', () => {
     matchMediaStub.withArgs('(min-width: 600px)').returns({matches: true});
     matchMediaStub.withArgs('(min-width: 300px)').returns({matches: true});
 
@@ -35,12 +35,14 @@ describe('ResponsiveAttributes', () => {
     });
 
     ra.updateAttribute(
-        'one', '(min-width: 600px) foo, (min-width: 300px) bar, baz');
+      'one',
+      '(min-width: 600px) foo, (min-width: 300px) bar, baz'
+    );
     expect(spy).to.have.been.calledOnce;
     expect(spy).to.have.been.calledWith('foo');
   });
 
-  it('should pass non-matching media queries' , () => {
+  it('should pass non-matching media queries', () => {
     matchMediaStub.withArgs('(min-width: 300px)').returns({matches: true});
 
     const spy = sandbox.spy();
@@ -49,31 +51,34 @@ describe('ResponsiveAttributes', () => {
     });
 
     ra.updateAttribute(
-        'one', '(min-width: 600px) foo, (min-width: 300px) bar, baz');
+      'one',
+      '(min-width: 600px) foo, (min-width: 300px) bar, baz'
+    );
     expect(spy).to.have.been.calledOnce;
     expect(spy).to.have.been.calledWith('bar');
   });
 
-  it('should fall back to the default value' , () => {
+  it('should fall back to the default value', () => {
     const spy = sandbox.spy();
     const ra = new ResponsiveAttributes({
       'one': spy,
     });
 
     ra.updateAttribute(
-        'one', '(min-width: 600px) foo, (min-width: 300px) bar, baz');
+      'one',
+      '(min-width: 600px) foo, (min-width: 300px) bar, baz'
+    );
     expect(spy).to.have.been.calledOnce;
     expect(spy).to.have.been.calledWith('baz');
   });
 
-  it('should handle empty groups' , () => {
+  it('should handle empty groups', () => {
     const spy = sandbox.spy();
     const ra = new ResponsiveAttributes({
       'one': spy,
     });
 
-    ra.updateAttribute(
-        'one', '(min-width: 600px) foo, , baz');
+    ra.updateAttribute('one', '(min-width: 600px) foo, , baz');
     expect(spy).to.have.been.calledOnce;
     expect(spy).to.have.been.calledWith('baz');
   });
@@ -93,7 +98,7 @@ describe('ResponsiveAttributes', () => {
     expect(spy).to.have.been.calledWith('hello');
   });
 
-  it('should update when the media query triggers onchange', async() => {
+  it('should update when the media query triggers onchange', async () => {
     let callback;
     let matches = false;
 
@@ -124,7 +129,7 @@ describe('ResponsiveAttributes', () => {
     expect(spy).to.have.been.calledWith('foo');
   });
 
-  it('should clear onchange when the attribute value changes', async() => {
+  it('should clear onchange when the attribute value changes', async () => {
     const onchangeSpy = sandbox.spy();
 
     matchMediaStub.withArgs('(min-width: 600px)').returns({
@@ -149,7 +154,7 @@ describe('ResponsiveAttributes', () => {
     expect(onchangeSpy.secondCall).to.have.been.calledWith(null);
   });
 
-  it('should handle number values' , () => {
+  it('should handle number values', () => {
     matchMediaStub.withArgs('(min-width: 600px)').returns({matches: true});
 
     const spy = sandbox.spy();
@@ -157,10 +162,8 @@ describe('ResponsiveAttributes', () => {
       'one': spy,
     });
 
-    ra.updateAttribute(
-        'one', '(min-width: 600px) 4.2, 7');
+    ra.updateAttribute('one', '(min-width: 600px) 4.2, 7');
     expect(spy).to.have.been.calledOnce;
     expect(spy).to.have.been.calledWith('4.2');
   });
-
 });
diff --git a/extensions/amp-beopinion/0.1/amp-beopinion.js b/extensions/amp-beopinion/0.1/amp-beopinion.js
index 82992896a808..8616fb619f66 100644
--- a/extensions/amp-beopinion/0.1/amp-beopinion.js
+++ b/extensions/amp-beopinion/0.1/amp-beopinion.js
@@ -23,7 +23,6 @@ import {removeElement} from '../../../src/dom';
 const TAG = 'amp-beopinion';
 
 class AmpBeOpinion extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -65,19 +64,29 @@ class AmpBeOpinion extends AMP.BaseElement {
   layoutCallback() {
     const iframe = getIframe(this.win, this.element, 'beopinion');
     this.applyFillContent(iframe);
-    listenFor(iframe, 'embed-size', data => {
-      // We only get the message if and when there is a tweet to display,
-      // so hide the placeholder
-      this.togglePlaceholder(false);
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
-    listenFor(iframe, 'no-content', () => {
-      if (this.getFallback()) {
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        // We only get the message if and when there is a tweet to display,
+        // so hide the placeholder
         this.togglePlaceholder(false);
-        this.toggleFallback(true);
-      }
-      // else keep placeholder displayed since there's no fallback
-    }, /* opt_is3P */true);
+        this./*OK*/ changeHeight(data['height']);
+      },
+      /* opt_is3P */ true
+    );
+    listenFor(
+      iframe,
+      'no-content',
+      () => {
+        if (this.getFallback()) {
+          this.togglePlaceholder(false);
+          this.toggleFallback(true);
+        }
+        // else keep placeholder displayed since there's no fallback
+      },
+      /* opt_is3P */ true
+    );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
     return this.loadPromise(iframe);
diff --git a/extensions/amp-beopinion/0.1/test/test-amp-beopinion.js b/extensions/amp-beopinion/0.1/test/test-amp-beopinion.js
index 5d1936dde412..bff4fb046441 100644
--- a/extensions/amp-beopinion/0.1/test/test-amp-beopinion.js
+++ b/extensions/amp-beopinion/0.1/test/test-amp-beopinion.js
@@ -17,72 +17,76 @@
 import '../amp-beopinion';
 import {beopinion} from '../../../../3p/beopinion';
 
-describes.realWin('amp-beopinion', {
-  amp: {
-    extensions: ['amp-beopinion'],
-    canonicalUrl: 'https://foo.bar/baz',
+describes.realWin(
+  'amp-beopinion',
+  {
+    amp: {
+      extensions: ['amp-beopinion'],
+      canonicalUrl: 'https://foo.bar/baz',
+    },
   },
-}, env => {
-  const accountId = '589446dd42ee0d6fdd9c3dfd';
-  const contentId = '5a703a2f46e0fb00016d51b3';
-  let win, doc;
+  env => {
+    const accountId = '589446dd42ee0d6fdd9c3dfd';
+    const contentId = '5a703a2f46e0fb00016d51b3';
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getAmpBeOpinion(accountId) {
-    const ampBeOpinion = doc.createElement('amp-beopinion');
-    ampBeOpinion.setAttribute('data-account', accountId);
-    ampBeOpinion.setAttribute('data-content', contentId);
-    ampBeOpinion.setAttribute('width', '111');
-    ampBeOpinion.setAttribute('height', '222');
-    doc.body.appendChild(ampBeOpinion);
-    return ampBeOpinion.build()
+    function getAmpBeOpinion(accountId) {
+      const ampBeOpinion = doc.createElement('amp-beopinion');
+      ampBeOpinion.setAttribute('data-account', accountId);
+      ampBeOpinion.setAttribute('data-content', contentId);
+      ampBeOpinion.setAttribute('width', '111');
+      ampBeOpinion.setAttribute('height', '222');
+      doc.body.appendChild(ampBeOpinion);
+      return ampBeOpinion
+        .build()
         .then(() => ampBeOpinion.layoutCallback())
         .then(() => ampBeOpinion);
-  }
+    }
 
-  it('renders iframe in amp-beopinion', () => {
-    return getAmpBeOpinion(accountId).then(ampBeOpinion => {
-      const iframe = ampBeOpinion.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.getAttribute('width')).to.equal('111');
-      expect(iframe.getAttribute('height')).to.equal('222');
+    it('renders iframe in amp-beopinion', () => {
+      return getAmpBeOpinion(accountId).then(ampBeOpinion => {
+        const iframe = ampBeOpinion.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('width')).to.equal('111');
+        expect(iframe.getAttribute('height')).to.equal('222');
+      });
     });
-  });
 
-  it('adds container element correctly', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      canonicalUrl: 'https://foo.bar/baz',
-      tagName: 'AMP-BEOPINION',
-    };
+    it('adds container element correctly', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      win.context = {
+        canonicalUrl: 'https://foo.bar/baz',
+        tagName: 'AMP-BEOPINION',
+      };
 
-    beopinion(win, {
-      account: accountId,
-      content: contentId,
-      width: 111,
-      height: 222,
+      beopinion(win, {
+        account: accountId,
+        content: contentId,
+        width: 111,
+        height: 222,
+      });
+      const content = doc.body.querySelector('.BeOpinionWidget');
+      expect(content).not.to.be.undefined;
     });
-    const content = doc.body.querySelector('.BeOpinionWidget');
-    expect(content).not.to.be.undefined;
-  });
 
-  it('removes iframe after unlayoutCallback', () => {
-    return getAmpBeOpinion(accountId).then(ampBeOpinion => {
-      const iframe = ampBeOpinion.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = ampBeOpinion.implementation_;
-      obj.unlayoutCallback();
-      expect(ampBeOpinion.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(obj.unlayoutOnPause()).to.be.true;
+    it('removes iframe after unlayoutCallback', () => {
+      return getAmpBeOpinion(accountId).then(ampBeOpinion => {
+        const iframe = ampBeOpinion.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = ampBeOpinion.implementation_;
+        obj.unlayoutCallback();
+        expect(ampBeOpinion.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(obj.unlayoutOnPause()).to.be.true;
+      });
     });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-bind/0.1/amp-bind-macro.js b/extensions/amp-bind/0.1/amp-bind-macro.js
index 1f360ff11c15..7c81bcf4321e 100644
--- a/extensions/amp-bind/0.1/amp-bind-macro.js
+++ b/extensions/amp-bind/0.1/amp-bind-macro.js
@@ -49,7 +49,8 @@ export class AmpBindMacro extends AMP.BaseElement {
    * @private
    */
   getName_() {
-    return '<amp-bind-macro> ' +
-        (this.element.getAttribute('id') || '<unknown id>');
+    return (
+      '<amp-bind-macro> ' + (this.element.getAttribute('id') || '<unknown id>')
+    );
   }
 }
diff --git a/extensions/amp-bind/0.1/amp-state.js b/extensions/amp-bind/0.1/amp-state.js
index dac6c0a21870..e330d1ce803b 100644
--- a/extensions/amp-bind/0.1/amp-state.js
+++ b/extensions/amp-bind/0.1/amp-state.js
@@ -70,11 +70,17 @@ export class AmpState extends AMP.BaseElement {
       this.fetchAndUpdate_(/* isInit */ true);
     }
 
-    this.registerAction('refresh', () => {
-      userAssert(this.element.hasAttribute('src'),
-          'Can\'t refresh <amp-state> without "src" attribute.');
-      this.fetchAndUpdate_(/* isInit */ false, /* opt_refresh */ true);
-    }, ActionTrust.HIGH);
+    this.registerAction(
+      'refresh',
+      () => {
+        userAssert(
+          this.element.hasAttribute('src'),
+          'Can\'t refresh <amp-state> without "src" attribute.'
+        );
+        this.fetchAndUpdate_(/* isInit */ false, /* opt_refresh */ true);
+      },
+      ActionTrust.HIGH
+    );
   }
 
   /** @override */
@@ -110,8 +116,10 @@ export class AmpState extends AMP.BaseElement {
     }
     const firstChild = children[0];
     if (!isJsonScriptTag(firstChild)) {
-      this.user().error(TAG,
-          'State should be in a <script> tag with type="application/json".');
+      this.user().error(
+        TAG,
+        'State should be in a <script> tag with type="application/json".'
+      );
       return;
     }
     const json = tryParseJson(firstChild.textContent, e => {
@@ -130,8 +138,14 @@ export class AmpState extends AMP.BaseElement {
    * @private
    */
   fetch_(ampdoc, policy, opt_refresh, token = undefined) {
-    return batchFetchJsonFor(ampdoc, this.element, /* opt_expr */ undefined,
-        policy, opt_refresh, token);
+    return batchFetchJsonFor(
+      ampdoc,
+      this.element,
+      /* opt_expr */ undefined,
+      policy,
+      opt_refresh,
+      token
+    );
   }
 
   /**
@@ -146,18 +160,22 @@ export class AmpState extends AMP.BaseElement {
 
     const src = element.getAttribute('src');
     const isCorsFetch =
-        (getSourceOrigin(src) !== getSourceOrigin(ampdoc.win.location));
+      getSourceOrigin(src) !== getSourceOrigin(ampdoc.win.location);
     // Require opt-in for URL variable replacements on CORS fetches triggered
     // by [src] mutation. @see spec/amp-var-substitutions.md
-    const policy = (isCorsFetch && !isInit)
-      ? UrlReplacementPolicy.OPT_IN
-      : UrlReplacementPolicy.ALL;
+    const policy =
+      isCorsFetch && !isInit
+        ? UrlReplacementPolicy.OPT_IN
+        : UrlReplacementPolicy.ALL;
 
     return getViewerAuthTokenIfAvailable(element).then(token =>
       this.fetch_(ampdoc, policy, opt_refresh, token).catch(error => {
         const event = error
-          ? createCustomEvent(this.win, 'amp-state.error',
-              dict({'response': error.response}))
+          ? createCustomEvent(
+              this.win,
+              'amp-state.error',
+              dict({'response': error.response})
+            )
           : null;
         // Trigger "fetch-error" event on fetch failure.
         const actions = Services.actionServiceForDoc(element);
@@ -175,9 +193,10 @@ export class AmpState extends AMP.BaseElement {
   fetchAndUpdate_(isInit, opt_refresh) {
     // Don't fetch in prerender mode.
     const viewer = Services.viewerForDoc(this.element);
-    return viewer.whenFirstVisible()
-        .then(() => this.prepareAndSendFetch_(isInit, opt_refresh))
-        .then(json => this.updateState_(json, isInit));
+    return viewer
+      .whenFirstVisible()
+      .then(() => this.prepareAndSendFetch_(isInit, opt_refresh))
+      .then(json => this.updateState_(json, isInit));
   }
 
   /**
@@ -207,7 +226,6 @@ export class AmpState extends AMP.BaseElement {
    * @private
    */
   getName_() {
-    return '<amp-state> ' +
-        (this.element.getAttribute('id') || '<unknown id>');
+    return '<amp-state> ' + (this.element.getAttribute('id') || '<unknown id>');
   }
 }
diff --git a/extensions/amp-bind/0.1/bind-evaluator.js b/extensions/amp-bind/0.1/bind-evaluator.js
index ecf3e0317658..826b487c7637 100644
--- a/extensions/amp-bind/0.1/bind-evaluator.js
+++ b/extensions/amp-bind/0.1/bind-evaluator.js
@@ -76,8 +76,10 @@ export class BindEvaluator {
       expressionsToRemove[expressionString] = true;
     });
 
-    remove(this.bindings_, binding =>
-      !!expressionsToRemove[binding.expressionString]);
+    remove(
+      this.bindings_,
+      binding => !!expressionsToRemove[binding.expressionString]
+    );
   }
 
   /**
@@ -125,8 +127,9 @@ export class BindEvaluator {
       }
       const expression = this.expressions_[expressionString];
       if (!expression) {
-        const error =
-            new Error(`Expression "${expressionString}"" is not cached.`);
+        const error = new Error(
+          `Expression "${expressionString}"" is not cached.`
+        );
         errors[expressionString] = {message: error.message, stack: error.stack};
         return;
       }
@@ -153,8 +156,9 @@ export class BindEvaluator {
         // TODO(choumx): If this expression string is used in another
         // tagName/property which is valid, we ought to allow it.
         delete cache[expressionString];
-        const error =
-            new Error(`"${result}" is not a valid result for [${property}].`);
+        const error = new Error(
+          `"${result}" is not a valid result for [${property}].`
+        );
         errors[expressionString] = {message: error.message, stack: error.stack};
       }
     });
diff --git a/extensions/amp-bind/0.1/bind-expr-defines.js b/extensions/amp-bind/0.1/bind-expr-defines.js
index 79fd19feee59..d3e6ca6a4518 100644
--- a/extensions/amp-bind/0.1/bind-expr-defines.js
+++ b/extensions/amp-bind/0.1/bind-expr-defines.js
@@ -81,4 +81,3 @@ export const AstNodeType = {
  * @typedef {(boolean|string|number|null)}
  */
 export let AstNodeValue;
-
diff --git a/extensions/amp-bind/0.1/bind-expression.js b/extensions/amp-bind/0.1/bind-expression.js
index b810153c3b7e..0d246be47090 100644
--- a/extensions/amp-bind/0.1/bind-expression.js
+++ b/extensions/amp-bind/0.1/bind-expression.js
@@ -181,8 +181,11 @@ function generateFunctionWhitelist() {
     Object.keys(functionsForType).forEach(name => {
       const func = functionsForType[name];
       if (func) {
-        devAssert(!func.name || name === func.name, 'Listed function name ' +
-            `"${name}" doesn't match name property "${func.name}".`);
+        devAssert(
+          !func.name || name === func.name,
+          'Listed function name ' +
+            `"${name}" doesn't match name property "${func.name}".`
+        );
         out[type][name] = func;
       } else {
         // This can happen if a browser doesn't support a built-in function.
@@ -231,8 +234,10 @@ export class BindExpression {
     const maxSize = opt_maxAstSize || MAX_AST_SIZE;
     const skipConstraint = getMode().localDev && !getMode().test;
     if (this.expressionSize > maxSize && !skipConstraint) {
-      throw new Error(`Expression size (${this.expressionSize}) exceeds max ` +
-          `(${maxSize}). Please reduce number of operands.`);
+      throw new Error(
+        `Expression size (${this.expressionSize}) exceeds max ` +
+          `(${maxSize}). Please reduce number of operands.`
+      );
     }
   }
 
@@ -282,7 +287,7 @@ export class BindExpression {
    */
   isMacroInvocationNode_(ast) {
     const isInvocationWithNoCaller =
-        (ast.type === AstNodeType.INVOCATION && !ast.args[0]);
+      ast.type === AstNodeType.INVOCATION && !ast.args[0];
     if (isInvocationWithNoCaller) {
       const macroExistsWithValue = this.macros_[String(ast.value)] != null;
       return macroExistsWithValue;
@@ -300,8 +305,9 @@ export class BindExpression {
   argumentsForInvocation_(ast) {
     // The INVOCATION node may or may not contain an ARGS child node.
     const argsNode =
-        (ast.args.length === 2 && ast.args[1].type === AstNodeType.ARGS)
-          ? ast.args[1] : null;
+      ast.args.length === 2 && ast.args[1].type === AstNodeType.ARGS
+        ? ast.args[1]
+        : null;
     if (argsNode) {
       // An ARGS node can either have an empty array or an ARRAY child.
       const {args} = argsNode;
@@ -343,7 +349,7 @@ export class BindExpression {
 
       case AstNodeType.INVOCATION:
         // Built-in functions and macros don't have a caller object.
-        const isBuiltInOrMacro = (args[0] === undefined);
+        const isBuiltInOrMacro = args[0] === undefined;
 
         const caller = this.eval_(args[0], scope);
         const params = this.eval_(args[1], scope);
@@ -357,7 +363,9 @@ export class BindExpression {
           if (macro) {
             validFunction = function() {
               return macro.evaluate(
-                  scope, Array.prototype.slice.call(arguments));
+                scope,
+                Array.prototype.slice.call(arguments)
+              );
             };
           } else {
             validFunction = FUNCTION_WHITELIST[CUSTOM_FUNCTIONS][method];
@@ -367,8 +375,10 @@ export class BindExpression {
           }
         } else {
           if (caller === null) {
-            user().warn(TAG, `Cannot invoke method ${method} on null; ` +
-                'returning null.');
+            user().warn(
+              TAG,
+              `Cannot invoke method ${method} on null; returning null.`
+            );
             return null;
           }
           const callerType = Object.prototype.toString.call(caller);
@@ -382,8 +392,7 @@ export class BindExpression {
             }
           }
           if (!validFunction) {
-            unsupportedError =
-                `${callerType}.${method} is not a supported function.`;
+            unsupportedError = `${callerType}.${method} is not a supported function.`;
           }
         }
 
@@ -430,15 +439,13 @@ export class BindExpression {
 
       case AstNodeType.ARGS:
       case AstNodeType.ARRAY_LITERAL:
-        return (args.length > 0) ? this.eval_(args[0], scope) : [];
+        return args.length > 0 ? this.eval_(args[0], scope) : [];
 
       case AstNodeType.ARRAY:
         return args.map(element => this.eval_(element, scope));
 
       case AstNodeType.OBJECT_LITERAL:
-        return (args.length > 0)
-          ? this.eval_(args[0], scope)
-          : map();
+        return args.length > 0 ? this.eval_(args[0], scope) : map();
 
       case AstNodeType.OBJECT:
         const object = map();
@@ -467,20 +474,28 @@ export class BindExpression {
         return this.eval_(args[0], scope) + this.eval_(args[1], scope);
 
       case AstNodeType.MINUS:
-        return Number(this.eval_(args[0], scope)) -
-            Number(this.eval_(args[1], scope));
+        return (
+          Number(this.eval_(args[0], scope)) -
+          Number(this.eval_(args[1], scope))
+        );
 
       case AstNodeType.MULTIPLY:
-        return Number(this.eval_(args[0], scope)) *
-            Number(this.eval_(args[1], scope));
+        return (
+          Number(this.eval_(args[0], scope)) *
+          Number(this.eval_(args[1], scope))
+        );
 
       case AstNodeType.DIVIDE:
-        return Number(this.eval_(args[0], scope)) /
-            Number(this.eval_(args[1], scope));
+        return (
+          Number(this.eval_(args[0], scope)) /
+          Number(this.eval_(args[1], scope))
+        );
 
       case AstNodeType.MODULO:
-        return Number(this.eval_(args[0], scope)) %
-            Number(this.eval_(args[1], scope));
+        return (
+          Number(this.eval_(args[0], scope)) %
+          Number(this.eval_(args[1], scope))
+        );
 
       case AstNodeType.LOGICAL_AND:
         return this.eval_(args[0], scope) && this.eval_(args[1], scope);
diff --git a/extensions/amp-bind/0.1/bind-impl.js b/extensions/amp-bind/0.1/bind-impl.js
index e4f89f5f4bf2..01fc02bc572c 100644
--- a/extensions/amp-bind/0.1/bind-impl.js
+++ b/extensions/amp-bind/0.1/bind-impl.js
@@ -115,10 +115,13 @@ export class Bind {
     this.actionSequenceIds_ = [];
 
     /** @const @private {!Function} */
-    this.eventuallyClearActionSequenceIds_ = debounce(this.win_,
-        () => {
-          this.actionSequenceIds_.length = 0;
-        }, 5000);
+    this.eventuallyClearActionSequenceIds_ = debounce(
+      this.win_,
+      () => {
+        this.actionSequenceIds_.length = 0;
+      },
+      5000
+    );
 
     /** @private {!Array<BoundElementDef>} */
     this.boundElements_ = [];
@@ -171,20 +174,21 @@ export class Bind {
      * Resolved when the service finishes scanning the document for bindings.
      * @const @private {Promise}
      */
-    this.initializePromise_ = this.viewer_.whenFirstVisible()
-        .then(() => {
-          if (opt_win) {
-            // In FIE, scan the document node of the iframe window.
-            const {document} = opt_win;
-            return whenDocumentReady(document).then(() => document);
-          } else {
-            // Otherwise, scan the root node of the ampdoc.
-            return ampdoc.whenReady().then(() => ampdoc.getRootNode());
-          }
-        })
-        .then(root => {
-          return this.initialize_(root);
-        });
+    this.initializePromise_ = this.viewer_
+      .whenFirstVisible()
+      .then(() => {
+        if (opt_win) {
+          // In FIE, scan the document node of the iframe window.
+          const {document} = opt_win;
+          return whenDocumentReady(document).then(() => document);
+        } else {
+          // Otherwise, scan the root node of the ampdoc.
+          return ampdoc.whenReady().then(() => ampdoc.getRootNode());
+        }
+      })
+      .then(root => {
+        return this.initialize_(root);
+      });
 
     /** @private {Promise} */
     this.setStatePromise_ = null;
@@ -201,8 +205,7 @@ export class Bind {
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(
-        embedWin, 'bind', new Bind(ampdoc, embedWin));
+    installServiceInEmbedScope(embedWin, 'bind', new Bind(ampdoc, embedWin));
   }
 
   /**
@@ -234,8 +237,8 @@ export class Bind {
     }
 
     const promise = this.initializePromise_
-        .then(() => this.evaluate_())
-        .then(results => this.apply_(results, opt_skipAmpState));
+      .then(() => this.evaluate_())
+      .then(results => this.apply_(results, opt_skipAmpState));
 
     if (getMode().test) {
       promise.then(() => {
@@ -243,7 +246,7 @@ export class Bind {
       });
     }
 
-    return this.setStatePromise_ = promise;
+    return (this.setStatePromise_ = promise);
   }
 
   /**
@@ -267,8 +270,10 @@ export class Bind {
     const expression = args[RAW_OBJECT_ARGS_KEY];
     if (expression) {
       // Increment bindings limit by 500 on each invocation to a max of 2000.
-      this.maxNumberOfBindings_ = Math.min(2000,
-          Math.max(1000, this.maxNumberOfBindings_ + 500));
+      this.maxNumberOfBindings_ = Math.min(
+        2000,
+        Math.max(1000, this.maxNumberOfBindings_ + 500)
+      );
 
       this.signals_.signal('FIRST_MUTATE');
 
@@ -282,13 +287,17 @@ export class Bind {
         case 'pushState':
           return this.pushStateWithExpression(expression, scope);
         default:
-          return Promise.reject(dev().createError('Unrecognized method: %s.%s',
-              tagOrTarget, method));
+          return Promise.reject(
+            dev().createError('Unrecognized method: %s.%s', tagOrTarget, method)
+          );
       }
     } else {
-      user().error('AMP-BIND', 'Please use the object-literal syntax, '
-          + 'e.g. "AMP.setState({foo: \'bar\'})" instead of '
-          + '"AMP.setState(foo=\'bar\')".');
+      user().error(
+        'AMP-BIND',
+        'Please use the object-literal syntax, ' +
+          'e.g. "AMP.setState({foo: \'bar\'})" instead of ' +
+          '"AMP.setState(foo=\'bar\')".'
+      );
     }
     return Promise.resolve();
   }
@@ -303,14 +312,14 @@ export class Bind {
   setStateWithExpression(expression, scope) {
     dev().info(TAG, 'setState:', `"${expression}"`);
     this.setStatePromise_ = this.evaluateExpression_(expression, scope)
-        .then(result => this.setState(result))
-        .then(() => this.getDataForHistory_())
-        .then(data => {
-          // Don't bother calling History.replace with empty data.
-          if (data) {
-            this.history_.replace(data);
-          }
-        });
+      .then(result => this.setState(result))
+      .then(() => this.getDataForHistory_())
+      .then(data => {
+        // Don't bother calling History.replace with empty data.
+        if (data) {
+          this.history_.replace(data);
+        }
+      });
     return this.setStatePromise_;
   }
 
@@ -337,10 +346,10 @@ export class Bind {
 
       const onPop = () => this.setState(oldState);
       return this.setState(result)
-          .then(() => this.getDataForHistory_())
-          .then(data => {
-            this.history_.push(onPop, data);
-          });
+        .then(() => this.getDataForHistory_())
+        .then(data => {
+          this.history_.push(onPop, data);
+        });
     });
   }
 
@@ -361,7 +370,7 @@ export class Bind {
     // Only pass state for history updates to trusted viewers, since they
     // may contain user data e.g. form input.
     return this.viewer_.isTrustedViewer().then(trusted => {
-      return (trusted) ? data : null;
+      return trusted ? data : null;
     });
   }
 
@@ -404,8 +413,14 @@ export class Bind {
      */
     const cleanup = added => {
       this.removeBindingsForNodes_(removedElements).then(removed => {
-        dev().info(TAG,
-            '⤷', 'Δ:', (added - removed), ', ∑:', this.numberOfBindings());
+        dev().info(
+          TAG,
+          '⤷',
+          'Δ:',
+          added - removed,
+          ', ∑:',
+          this.numberOfBindings()
+        );
       });
       return Promise.resolve();
     };
@@ -431,15 +446,21 @@ export class Bind {
     if (added === 0) {
       return cleanup(0);
     }
-    const promise = this.sendBindingsToWorker_(bindings).then(() => {
-      return this.evaluate_().then(results =>
-        this.applyElements_(results, addedElements));
-    }).then(() => {
-      // Remove bindings at the end to reduce evaluation/apply latency.
-      cleanup(added);
-    });
-    return this.timer_.timeoutPromise(timeout, promise,
-        'Timed out waiting for amp-bind to process rendered template.');
+    const promise = this.sendBindingsToWorker_(bindings)
+      .then(() => {
+        return this.evaluate_().then(results =>
+          this.applyElements_(results, addedElements)
+        );
+      })
+      .then(() => {
+        // Remove bindings at the end to reduce evaluation/apply latency.
+        cleanup(added);
+      });
+    return this.timer_.timeoutPromise(
+      timeout,
+      promise,
+      'Timed out waiting for amp-bind to process rendered template.'
+    );
   }
 
   /**
@@ -451,7 +472,7 @@ export class Bind {
   getStateValue(expr) {
     const value = getValueForExpr(this.state_, expr);
     if (isObject(value) || isArray(value)) {
-      return JSON.stringify(/** @type {JsonObject} */(value));
+      return JSON.stringify(/** @type {JsonObject} */ (value));
     } else {
       return String(value);
     }
@@ -470,20 +491,23 @@ export class Bind {
 
     // The web worker's evaluator also has an instance of BindValidator
     // that should be initialized with the same `allowUrlProperties` value.
-    return this.ww_('bind.init', [allowUrlProperties]).then(() => {
-      return Promise.all([
-        this.addMacros_(),
-        this.addBindingsForNodes_([root]),
-      ]);
-    }).then(results => {
-      dev().info(TAG, '⤷', 'Δ:', results);
-      // Listen for DOM updates (e.g. template render) to rescan for bindings.
-      root.addEventListener(AmpEvents.DOM_UPDATE, e => this.onDomUpdate_(e));
-      // In dev mode, check default values against initial expression results.
-      if (getMode().development) {
-        return this.evaluate_().then(results => this.verify_(results));
-      }
-    }).then(() => this.checkReadiness_(root));
+    return this.ww_('bind.init', [allowUrlProperties])
+      .then(() => {
+        return Promise.all([
+          this.addMacros_(),
+          this.addBindingsForNodes_([root]),
+        ]);
+      })
+      .then(results => {
+        dev().info(TAG, '⤷', 'Δ:', results);
+        // Listen for DOM updates (e.g. template render) to rescan for bindings.
+        root.addEventListener(AmpEvents.DOM_UPDATE, e => this.onDomUpdate_(e));
+        // In dev mode, check default values against initial expression results.
+        if (getMode().development) {
+          return this.evaluate_().then(results => this.verify_(results));
+        }
+      })
+      .then(() => this.checkReadiness_(root));
   }
 
   /**
@@ -516,8 +540,8 @@ export class Bind {
    */
   isAmp4Email_() {
     const html = this.localWin_.document.documentElement;
-    const amp4email = html.hasAttribute('amp4email')
-        || html.hasAttribute('⚡4email');
+    const amp4email =
+      html.hasAttribute('amp4email') || html.hasAttribute('⚡4email');
     return amp4email;
   }
 
@@ -562,9 +586,12 @@ export class Bind {
         }
       });
       if (ignoredKeys.length > 0) {
-        user().warn(TAG, 'Some state keys could not be premutated ' +
-              'because they are missing the overridable attribute: ' +
-              ignoredKeys.join(', '));
+        user().warn(
+          TAG,
+          'Some state keys could not be premutated ' +
+            'because they are missing the overridable attribute: ' +
+            ignoredKeys.join(', ')
+        );
       }
       return this.setState(data['state']);
     });
@@ -595,8 +622,8 @@ export class Bind {
     const macros = /** @type {!Array<!BindMacroDef>} */ ([]);
     iterateCursor(elements, element => {
       const argumentNames = (element.getAttribute('arguments') || '')
-          .split(',')
-          .map(s => s.trim());
+        .split(',')
+        .map(s => s.trim());
       macros.push({
         id: element.getAttribute('id'),
         argumentNames,
@@ -610,7 +637,10 @@ export class Bind {
         // Report macros that failed to parse (e.g. expression size exceeded).
         errors.forEach((e, i) => {
           this.reportWorkerError_(
-              e, `${TAG}: Parsing amp-bind-macro failed.`, elements[i]);
+            e,
+            `${TAG}: Parsing amp-bind-macro failed.`,
+            elements[i]
+          );
         });
         return macros.length;
       });
@@ -632,9 +662,10 @@ export class Bind {
     // For each node, scan it for bindings and store them.
     const scanPromises = nodes.map(node => {
       // Limit number of total bindings (unless in local manual testing).
-      const limit = (getMode().localDev && !getMode().test)
-        ? Number.POSITIVE_INFINITY
-        : this.maxNumberOfBindings_ - this.numberOfBindings();
+      const limit =
+        getMode().localDev && !getMode().test
+          ? Number.POSITIVE_INFINITY
+          : this.maxNumberOfBindings_ - this.numberOfBindings();
 
       return this.scanNode_(node, limit).then(results => {
         const {bindings, limitExceeded} = results;
@@ -651,15 +682,18 @@ export class Bind {
       // `results` is a 2D array where results[i] is an array of bindings.
       // Flatten this into a 1D array of bindings via concat.
       const bindings = Array.prototype.concat.apply([], results);
-      return (bindings.length > 0) ? this.sendBindingsToWorker_(bindings) : 0;
+      return bindings.length > 0 ? this.sendBindingsToWorker_(bindings) : 0;
     });
   }
 
   /** Emits console error stating that the binding limit was exceeded. */
   emitMaxBindingsExceededError_() {
-    dev().expectedError(TAG, 'Maximum number of bindings reached ' +
+    dev().expectedError(
+      TAG,
+      'Maximum number of bindings reached ' +
         '(%s). Additional elements with bindings will be ignored.',
-    this.maxNumberOfBindings_);
+      this.maxNumberOfBindings_
+    );
   }
 
   /**
@@ -673,9 +707,11 @@ export class Bind {
       Object.keys(parseErrors).forEach(expressionString => {
         const elements = this.expressionToElements_[expressionString];
         if (elements.length > 0) {
-          this.reportWorkerError_(parseErrors[expressionString],
-              `${TAG}: Expression compile error in "${expressionString}".`,
-              elements[0]);
+          this.reportWorkerError_(
+            parseErrors[expressionString],
+            `${TAG}: Expression compile error in "${expressionString}".`,
+            elements[0]
+          );
         }
       });
       return bindings.length;
@@ -725,8 +761,9 @@ export class Bind {
     // Remove the bindings from the evaluator.
     const removed = deletedExpressions.length;
     if (removed > 0) {
-      return this.ww_('bind.removeBindingsWithExpressionStrings',
-          [deletedExpressions]).then(() => removed);
+      return this.ww_('bind.removeBindingsWithExpressionStrings', [
+        deletedExpressions,
+      ]).then(() => removed);
     } else {
       return Promise.resolve(0);
     }
@@ -743,11 +780,17 @@ export class Bind {
   scanNode_(node, limit) {
     /** @type {!Array<!BindBindingDef>} */
     const bindings = [];
-    const doc = devAssert(node.nodeType == Node.DOCUMENT_NODE
-      ? node : node.ownerDocument, 'ownerDocument is null.');
+    const doc = devAssert(
+      node.nodeType == Node.DOCUMENT_NODE ? node : node.ownerDocument,
+      'ownerDocument is null.'
+    );
     // Third and fourth params of `createTreeWalker` are not optional on IE11.
-    const walker = doc.createTreeWalker(node, NodeFilter.SHOW_ELEMENT, null,
-        /* entityReferenceExpansion */ false);
+    const walker = doc.createTreeWalker(
+      node,
+      NodeFilter.SHOW_ELEMENT,
+      null,
+      /* entityReferenceExpansion */ false
+    );
     // Set to true if number of bindings in `node` exceeds `limit`.
     let limitExceeded = false;
     // Helper function for scanning the tree walker's next node.
@@ -876,7 +919,11 @@ export class Bind {
         return {property, expressionString: attribute.value};
       } else {
         const err = user().createError(
-            '%s: Binding to [%s] on <%s> is not allowed.', TAG, property, tag);
+          '%s: Binding to [%s] on <%s> is not allowed.',
+          TAG,
+          property,
+          tag
+        );
         this.reportError_(err, element);
       }
     }
@@ -890,20 +937,25 @@ export class Bind {
    * @return {!Promise<!JsonObject>}
    */
   evaluateExpression_(expression, scope) {
-    return this.initializePromise_.then(() => {
-      // Allow expression to reference current state in addition to event state.
-      Object.assign(scope, this.state_);
-      return this.ww_('bind.evaluateExpression', [expression, scope]);
-    }).then(returnValue => {
-      const {result, error} = returnValue;
-      if (error) {
-        // Throw to reject promise.
-        throw this.reportWorkerError_(error, `${TAG}: Expression eval failed.`);
-      } else {
-        dev().info(TAG, '⤷', result);
-        return result;
-      }
-    });
+    return this.initializePromise_
+      .then(() => {
+        // Allow expression to reference current state in addition to event state.
+        Object.assign(scope, this.state_);
+        return this.ww_('bind.evaluateExpression', [expression, scope]);
+      })
+      .then(returnValue => {
+        const {result, error} = returnValue;
+        if (error) {
+          // Throw to reject promise.
+          throw this.reportWorkerError_(
+            error,
+            `${TAG}: Expression eval failed.`
+          );
+        } else {
+          dev().info(TAG, '⤷', result);
+          return result;
+        }
+      });
   }
 
   /**
@@ -921,8 +973,11 @@ export class Bind {
         if (elements.length > 0) {
           const evalError = errors[expressionString];
           const userError = user().createError(
-              '%s: Expression evaluation error in "%s". %s', TAG,
-              expressionString, evalError.message);
+            '%s: Expression evaluation error in "%s". %s',
+            TAG,
+            expressionString,
+            evalError.message
+          );
           userError.stack = evalError.stack;
           this.reportError_(userError, elements[0]);
         }
@@ -973,11 +1028,14 @@ export class Bind {
         mismatches[`${tagName}[${property}]${expected}:${actual}`] = true;
 
         if (warn) {
-          user().warn(TAG, `Default value (${actual}) does not match first `
-            + `result (${expected}) for <${tagName} [${property}]="`
-            + `${expressionString}">. We recommend writing expressions with `
-            + 'matching default values, but this can be safely ignored if '
-            + 'intentional.');
+          user().warn(
+            TAG,
+            `Default value (${actual}) does not match first ` +
+              `result (${expected}) for <${tagName} [${property}]="` +
+              `${expressionString}">. We recommend writing expressions with ` +
+              'matching default values, but this can be safely ignored if ' +
+              'intentional.'
+          );
         }
       });
     });
@@ -1017,8 +1075,10 @@ export class Bind {
       const newValue = results[expressionString];
       // Support equality checks for arrays of objects containing arrays.
       // Useful for rendering amp-list with amp-bind state via [src].
-      if (newValue === undefined ||
-          deepEquals(newValue, previousResult, /* depth */ 10)) {
+      if (
+        newValue === undefined ||
+        deepEquals(newValue, previousResult, /* depth */ 10)
+      ) {
       } else {
         boundProperty.previousResult = newValue;
         updates.push({boundProperty, newValue});
@@ -1102,7 +1162,7 @@ export class Bind {
         // TODO(choumx): Add new Resources method for adding change-size
         // request without scheduling vsync pass since `mutateElement()`
         // will schedule a pass after a short delay anyways.
-        this.resources_./*OK*/changeSize(element, height, width);
+        this.resources_./*OK*/ changeSize(element, height, width);
       }
 
       if (typeof element.mutatedAttributesCallback === 'function') {
@@ -1111,8 +1171,12 @@ export class Bind {
         try {
           element.mutatedAttributesCallback(mutations);
         } catch (e) {
-          const error = user().createError('%s: Applying expression results' +
-              ' (%s) failed with error,', TAG, JSON.stringify(mutations), e);
+          const error = user().createError(
+            '%s: Applying expression results (%s) failed with error,',
+            TAG,
+            JSON.stringify(mutations),
+            e
+          );
           this.reportError_(error, element);
         }
       }
@@ -1139,8 +1203,10 @@ export class Bind {
       case 'text':
         const stringValue = String(newValue);
         // If <title> element in the <head>, also update the document title.
-        if (tag === 'TITLE'
-            && element.parentNode === this.localWin_.document.head) {
+        if (
+          tag === 'TITLE' &&
+          element.parentNode === this.localWin_.document.head
+        ) {
           this.localWin_.document.title = stringValue;
         }
         // For <textarea>, [text] sets `value` (current value), while
@@ -1167,7 +1233,10 @@ export class Bind {
           element.setAttribute('class', ampClasses.join(' '));
         } else {
           const err = user().createError(
-              '%s: "%s" is not a valid result for [class].', TAG, newValue);
+            '%s: "%s" is not a valid result for [class].',
+            TAG,
+            newValue
+          );
           this.reportError_(err, element);
         }
         break;
@@ -1177,7 +1246,7 @@ export class Bind {
         // property (current value) for bindings e.g. [value].
         // TODO(choumx): Investigate if splitting into [value] and
         // [defaultValue] is possible without version bump.
-        const updateProperty = (tag === 'INPUT' && property in element);
+        const updateProperty = tag === 'INPUT' && property in element;
         const oldValue = element.getAttribute(property);
 
         let mutated = false;
@@ -1202,7 +1271,11 @@ export class Bind {
           }
         } else if (newValue !== oldValue) {
           mutated = this.rewriteAttributes_(
-              element, property, String(newValue), updateProperty);
+            element,
+            property,
+            String(newValue),
+            updateProperty
+          );
         }
 
         if (mutated) {
@@ -1259,12 +1332,21 @@ export class Bind {
     // `url#parseUrl` which uses <a>. Worker has URL API but not on IE11.
     try {
       rewriteAttributesForElement(
-          element, attrName, value, /* opt_location */ undefined,
-          updateProperty);
+        element,
+        attrName,
+        value,
+        /* opt_location */ undefined,
+        updateProperty
+      );
       return true;
     } catch (e) {
-      const error = user().createError('%s: "%s" is not a ' +
-          'valid result for [%]', TAG, value, attrName, e);
+      const error = user().createError(
+        '%s: "%s" is not a valid result for [%]',
+        TAG,
+        value,
+        attrName,
+        e
+      );
       this.reportError_(error, element);
     }
     return false;
@@ -1297,7 +1379,7 @@ export class Bind {
       case 'text':
         initialValue = element.textContent;
         expectedValue = String(expectedValue);
-        match = (initialValue.trim() === expectedValue.trim());
+        match = initialValue.trim() === expectedValue.trim();
         break;
 
       case 'class':
@@ -1321,8 +1403,10 @@ export class Bind {
           }
         } else {
           const err = user().createError(
-              '%s: "%s" is not a valid result for [class].',
-              TAG, expectedValue);
+            '%s: "%s" is not a valid result for [class].',
+            TAG,
+            expectedValue
+          );
           this.reportError_(err, element);
         }
         match = this.compareStringArrays_(initialValue, classes);
@@ -1332,13 +1416,13 @@ export class Bind {
         initialValue = element.getAttribute(property);
         // Boolean attributes return values of either '' or null.
         if (expectedValue === true) {
-          match = (initialValue === '');
+          match = initialValue === '';
         } else if (expectedValue === false) {
-          match = (initialValue === null);
+          match = initialValue === null;
         } else if (typeof expectedValue === 'number') {
-          match = (Number(initialValue) === expectedValue);
+          match = Number(initialValue) === expectedValue;
         } else {
-          match = (initialValue === expectedValue);
+          match = initialValue === expectedValue;
         }
         break;
     }
@@ -1374,15 +1458,21 @@ export class Bind {
   removeThenAdd_(remove, add) {
     let removed = 0;
     return this.removeBindingsForNodes_(remove)
-        .then(r => {
-          removed = r;
-          return this.addBindingsForNodes_(add);
-        })
-        .then(added => {
-          dev().info(TAG,
-              '⤷', 'Δ:', (added - removed), ', ∑:', this.numberOfBindings());
-          return {added, removed};
-        });
+      .then(r => {
+        removed = r;
+        return this.addBindingsForNodes_(add);
+      })
+      .then(added => {
+        dev().info(
+          TAG,
+          '⤷',
+          'Δ:',
+          added - removed,
+          ', ∑:',
+          this.numberOfBindings()
+        );
+        return {added, removed};
+      });
   }
 
   /**
@@ -1474,9 +1564,12 @@ export class Bind {
         const element = user().assertElement(opt_elementOrExpr);
         this.debugPrintElement_(element);
       } else {
-        user().info(TAG, 'Invalid argument. Pass a JSON expression or an ' +
+        user().info(
+          TAG,
+          'Invalid argument. Pass a JSON expression or an ' +
             'element instead e.g. AMP.printState("foo.bar") or ' +
-            'AMP.printState($0) after selecting an element.');
+            'AMP.printState($0) after selecting an element.'
+        );
       }
     } else {
       user().info(TAG, this.state_);
diff --git a/extensions/amp-bind/0.1/bind-macro.js b/extensions/amp-bind/0.1/bind-macro.js
index 8cd07a8fab1f..d6f889d2396f 100644
--- a/extensions/amp-bind/0.1/bind-macro.js
+++ b/extensions/amp-bind/0.1/bind-macro.js
@@ -29,8 +29,10 @@ export class BindMacro {
     this.argumentNames_ = data.argumentNames || [];
 
     /** @const @private {!BindExpression} */
-    this.expression_ =
-        new BindExpression(data.expressionString, referableMacros);
+    this.expression_ = new BindExpression(
+      data.expressionString,
+      referableMacros
+    );
   }
 
   /**
diff --git a/extensions/amp-bind/0.1/bind-validator.js b/extensions/amp-bind/0.1/bind-validator.js
index d7212cc00e8e..d90112f00faa 100644
--- a/extensions/amp-bind/0.1/bind-validator.js
+++ b/extensions/amp-bind/0.1/bind-validator.js
@@ -93,7 +93,7 @@ export class BindValidator {
    * @return {boolean}
    */
   canBind(tag, property) {
-    return (this.rulesForTagAndProperty_(tag, property) !== undefined);
+    return this.rulesForTagAndProperty_(tag, property) !== undefined;
   }
 
   /**
diff --git a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
index 7298113981b4..58ccc468bacf 100644
--- a/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
+++ b/extensions/amp-bind/0.1/test/integration/test-bind-impl.js
@@ -74,13 +74,19 @@ function onBindReady(env, bind) {
  * @return {!Promise}
  */
 function onBindReadyAndSetState(env, bind, state, opt_isAmpStateMutation) {
-  return bind.initializePromiseForTesting().then(() => {
-    return bind.setState(
-        state, /* opt_skipEval */ undefined, opt_isAmpStateMutation);
-  }).then(() => {
-    env.flushVsync();
-    return bind.setStatePromiseForTesting();
-  });
+  return bind
+    .initializePromiseForTesting()
+    .then(() => {
+      return bind.setState(
+        state,
+        /* opt_skipEval */ undefined,
+        opt_isAmpStateMutation
+      );
+    })
+    .then(() => {
+      env.flushVsync();
+      return bind.setStatePromiseForTesting();
+    });
 }
 
 /**
@@ -91,12 +97,15 @@ function onBindReadyAndSetState(env, bind, state, opt_isAmpStateMutation) {
  * @return {!Promise}
  */
 function onBindReadyAndSetStateWithExpression(env, bind, expression, scope) {
-  return bind.initializePromiseForTesting().then(() => {
-    return bind.setStateWithExpression(expression, scope);
-  }).then(() => {
-    env.flushVsync();
-    return bind.setStatePromiseForTesting();
-  });
+  return bind
+    .initializePromiseForTesting()
+    .then(() => {
+      return bind.setStateWithExpression(expression, scope);
+    })
+    .then(() => {
+      env.flushVsync();
+      return bind.setStatePromiseForTesting();
+    });
 }
 
 /**
@@ -107,11 +116,14 @@ function onBindReadyAndSetStateWithExpression(env, bind, expression, scope) {
  * @return {!Promise}
  */
 function onBindReadyAndScanAndApply(env, bind, added, removed) {
-  return bind.initializePromiseForTesting().then(() => {
-    return bind.scanAndApply(added, removed);
-  }).then(() => {
-    env.flushVsync();
-  });
+  return bind
+    .initializePromiseForTesting()
+    .then(() => {
+      return bind.scanAndApply(added, removed);
+    })
+    .then(() => {
+      env.flushVsync();
+    });
 }
 
 /**
@@ -129,828 +141,1004 @@ function waitForEvent(env, name) {
   });
 }
 
-describe.configure().ifChrome().run('Bind', function() {
-  // Give more than default 2000ms timeout for local testing.
-  const TIMEOUT = Math.max(window.ampTestRuntimeConfig.mochaTimeout, 4000);
-  this.timeout(TIMEOUT);
-
-  describes.realWin('in FIE', {
-    amp: {
-      ampdoc: 'fie',
-      runtimeOn: false,
-    },
-    mockFetch: false,
-  }, env => {
-    let fieBind;
-    let fieBody;
-    let fieWindow;
-
-    let hostWindow;
-
-    beforeEach(() => {
-      // Make sure we have a chunk instance for testing.
-      chunkInstanceForTesting(env.ampdoc);
-
-      fieWindow = env.embed.win;
-      fieBind = new Bind(env.ampdoc, fieWindow);
-      fieBody = env.embed.getBodyElement();
-
-      hostWindow = env.ampdoc.win;
-    });
+describe
+  .configure()
+  .ifChrome()
+  .run('Bind', function() {
+    // Give more than default 2000ms timeout for local testing.
+    const TIMEOUT = Math.max(window.ampTestRuntimeConfig.mochaTimeout, 4000);
+    this.timeout(TIMEOUT);
+
+    describes.realWin(
+      'in FIE',
+      {
+        amp: {
+          ampdoc: 'fie',
+          runtimeOn: false,
+        },
+        mockFetch: false,
+      },
+      env => {
+        let fieBind;
+        let fieBody;
+        let fieWindow;
 
-    it('should scan for bindings when ampdoc is ready', () => {
-      createElement(env, fieBody, '[text]="1+1"');
-      expect(fieBind.numberOfBindings()).to.equal(0);
-      return onBindReady(env, fieBind).then(() => {
-        expect(fieBind.numberOfBindings()).to.equal(1);
-      });
-    });
+        let hostWindow;
 
-    it('should not update host document title for <title> elements', () => {
-      createElement(env, fieBody, '[text]="\'bar\'"', 'title',
-          /* opt_amp */ false, /* opt_head */ true);
-      fieWindow.document.title = 'foo';
-      hostWindow.document.title = 'foo';
-      return onBindReadyAndSetState(env, fieBind, {}).then(() => {
-        // Make sure it does not update the host window's document title.
-        expect(fieWindow.document.title).to.equal('bar');
-        expect(hostWindow.document.title).to.equal('foo');
-      });
-    });
+        beforeEach(() => {
+          // Make sure we have a chunk instance for testing.
+          chunkInstanceForTesting(env.ampdoc);
 
-    describe('with Bind in host window', () => {
-      let hostBind;
-      let hostBody;
-
-      beforeEach(() => {
-        hostBind = new Bind(env.ampdoc);
-        hostBody = env.ampdoc.getBody();
-      });
-
-      it('should only scan elements in provided window', () => {
-        createElement(env, fieBody, '[text]="1+1"');
-        createElement(env, hostBody, '[text]="2+2"');
-        return Promise.all([
-          onBindReady(env, fieBind),
-          onBindReady(env, hostBind),
-        ]).then(() => {
-          expect(fieBind.numberOfBindings()).to.equal(1);
-          expect(hostBind.numberOfBindings()).to.equal(1);
-        });
-      });
-
-      it('should not be able to access variables from other windows', () => {
-        const element =
-            createElement(env, fieBody, '[text]="foo + bar"');
-        const parentElement =
-            createElement(env, hostBody, '[text]="foo + bar"');
-        const promises = [
-          onBindReadyAndSetState(env, fieBind, {foo: '123', bar: '456'}),
-          onBindReadyAndSetState(env, hostBind, {foo: 'ABC', bar: 'DEF'}),
-        ];
-        return Promise.all(promises).then(() => {
-          // `element` only sees `foo` and `parentElement` only sees `bar`.
-          expect(element.textContent).to.equal('123456');
-          expect(parentElement.textContent).to.equal('ABCDEF');
-        });
-      });
-    });
-  }); // in FIE
-
-  describes.realWin('in shadow ampdoc', {
-    amp: {
-      ampdoc: 'shadow',
-      runtimeOn: false,
-    },
-    mockFetch: false,
-  }, env => {
-    let bind;
-    let container;
-
-    beforeEach(() => {
-      // Make sure we have a chunk instance for testing.
-      chunkInstanceForTesting(env.ampdoc);
-
-      bind = new Bind(env.ampdoc);
-      container = env.ampdoc.getBody();
-    });
+          fieWindow = env.embed.win;
+          fieBind = new Bind(env.ampdoc, fieWindow);
+          fieBody = env.embed.getBodyElement();
 
-    it('should scan for bindings when ampdoc is ready', () => {
-      createElement(env, container, '[text]="1+1"');
-      expect(bind.numberOfBindings()).to.equal(0);
-      return onBindReady(env, bind).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-      });
-    });
+          hostWindow = env.ampdoc.win;
+        });
 
-    it('should not update document title for <title> elements', () => {
-      createElement(env, container, '[text]="\'bar\'"', 'title',
-          /* opt_amp */ false, /* opt_head */ true);
-      env.win.document.title = 'foo';
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        // Make sure does not update the host window's document title.
-        expect(env.win.document.title).to.equal('foo');
-      });
-    });
-  }); // in shadow ampdoc
+        it('should scan for bindings when ampdoc is ready', () => {
+          createElement(env, fieBody, '[text]="1+1"');
+          expect(fieBind.numberOfBindings()).to.equal(0);
+          return onBindReady(env, fieBind).then(() => {
+            expect(fieBind.numberOfBindings()).to.equal(1);
+          });
+        });
 
-  describes.realWin('in single ampdoc', {
-    amp: {
-      ampdoc: 'single',
-      runtimeOn: false,
-    },
-    mockFetch: false,
-  }, env => {
-    let bind;
-    let clock;
-    let container;
-    let history;
-    let viewer;
-    let sandbox;
+        it('should not update host document title for <title> elements', () => {
+          createElement(
+            env,
+            fieBody,
+            '[text]="\'bar\'"',
+            'title',
+            /* opt_amp */ false,
+            /* opt_head */ true
+          );
+          fieWindow.document.title = 'foo';
+          hostWindow.document.title = 'foo';
+          return onBindReadyAndSetState(env, fieBind, {}).then(() => {
+            // Make sure it does not update the host window's document title.
+            expect(fieWindow.document.title).to.equal('bar');
+            expect(hostWindow.document.title).to.equal('foo');
+          });
+        });
 
-    beforeEach(() => {
-      const {ampdoc, win} = env;
-      sandbox = env.sandbox;
+        describe('with Bind in host window', () => {
+          let hostBind;
+          let hostBody;
 
-      // Make sure we have a chunk instance for testing.
-      chunkInstanceForTesting(ampdoc);
+          beforeEach(() => {
+            hostBind = new Bind(env.ampdoc);
+            hostBody = env.ampdoc.getBody();
+          });
 
-      viewer = Services.viewerForDoc(ampdoc);
-      sandbox.stub(viewer, 'sendMessage');
+          it('should only scan elements in provided window', () => {
+            createElement(env, fieBody, '[text]="1+1"');
+            createElement(env, hostBody, '[text]="2+2"');
+            return Promise.all([
+              onBindReady(env, fieBind),
+              onBindReady(env, hostBind),
+            ]).then(() => {
+              expect(fieBind.numberOfBindings()).to.equal(1);
+              expect(hostBind.numberOfBindings()).to.equal(1);
+            });
+          });
 
-      bind = new Bind(ampdoc);
+          it('should not be able to access variables from other windows', () => {
+            const element = createElement(env, fieBody, '[text]="foo + bar"');
+            const parentElement = createElement(
+              env,
+              hostBody,
+              '[text]="foo + bar"'
+            );
+            const promises = [
+              onBindReadyAndSetState(env, fieBind, {foo: '123', bar: '456'}),
+              onBindReadyAndSetState(env, hostBind, {foo: 'ABC', bar: 'DEF'}),
+            ];
+            return Promise.all(promises).then(() => {
+              // `element` only sees `foo` and `parentElement` only sees `bar`.
+              expect(element.textContent).to.equal('123456');
+              expect(parentElement.textContent).to.equal('ABCDEF');
+            });
+          });
+        });
+      }
+    ); // in FIE
+
+    describes.realWin(
+      'in shadow ampdoc',
+      {
+        amp: {
+          ampdoc: 'shadow',
+          runtimeOn: false,
+        },
+        mockFetch: false,
+      },
+      env => {
+        let bind;
+        let container;
 
-      // Connected <div> element created by describes.js.
-      container = win.document.getElementById('parent');
+        beforeEach(() => {
+          // Make sure we have a chunk instance for testing.
+          chunkInstanceForTesting(env.ampdoc);
 
-      history = bind.historyForTesting();
+          bind = new Bind(env.ampdoc);
+          container = env.ampdoc.getBody();
+        });
 
-      clock = lolex.install({target: win, toFake: ['Date', 'setTimeout']});
-    });
+        it('should scan for bindings when ampdoc is ready', () => {
+          createElement(env, container, '[text]="1+1"');
+          expect(bind.numberOfBindings()).to.equal(0);
+          return onBindReady(env, bind).then(() => {
+            expect(bind.numberOfBindings()).to.equal(1);
+          });
+        });
 
-    afterEach(() => {
-      clock.uninstall();
-    });
+        it('should not update document title for <title> elements', () => {
+          createElement(
+            env,
+            container,
+            '[text]="\'bar\'"',
+            'title',
+            /* opt_amp */ false,
+            /* opt_head */ true
+          );
+          env.win.document.title = 'foo';
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            // Make sure does not update the host window's document title.
+            expect(env.win.document.title).to.equal('foo');
+          });
+        });
+      }
+    ); // in shadow ampdoc
+
+    describes.realWin(
+      'in single ampdoc',
+      {
+        amp: {
+          ampdoc: 'single',
+          runtimeOn: false,
+        },
+        mockFetch: false,
+      },
+      env => {
+        let bind;
+        let clock;
+        let container;
+        let history;
+        let viewer;
+        let sandbox;
 
-    it('should send "bindReady" to viewer on init', () => {
-      expect(viewer.sendMessage).to.not.be.called;
+        beforeEach(() => {
+          const {ampdoc, win} = env;
+          sandbox = env.sandbox;
 
-      return onBindReady(env, bind).then(() => {
-        expect(viewer.sendMessage).to.be.calledOnce;
-        expect(viewer.sendMessage).to.be.calledWith('bindReady');
-      });
-    });
+          // Make sure we have a chunk instance for testing.
+          chunkInstanceForTesting(ampdoc);
 
-    it('should not send "bindReady" until all <amp-state> are built', () => {
-      const element = createElement(env, container, '', 'amp-state', true);
-      let buildAmpState;
-      const builtPromise = new Promise(resolve => {
-        buildAmpState = resolve;
-      });
-      element.whenBuilt = () => builtPromise;
-
-      return onBindReady(env, bind).then(() => {
-        expect(viewer.sendMessage).to.not.be.called;
-        buildAmpState();
-        return element.whenBuilt();
-      }).then(() => {
-        expect(viewer.sendMessage).to.be.calledOnce;
-        expect(viewer.sendMessage).to.be.calledWith('bindReady');
-      });
-    });
+          viewer = Services.viewerForDoc(ampdoc);
+          sandbox.stub(viewer, 'sendMessage');
 
-    it('should scan for bindings when ampdoc is ready', () => {
-      createElement(env, container, '[text]="1+1"');
-      expect(bind.numberOfBindings()).to.equal(0);
-      return onBindReady(env, bind).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-      });
-    });
+          bind = new Bind(ampdoc);
 
-    it('should scan fixed layer for bindings', () => {
-      // Mimic FixedLayer by creating a sibling <body> element.
-      const doc = env.win.document;
-      const pseudoFixedLayer = doc.body.cloneNode(false);
-      doc.documentElement.appendChild(pseudoFixedLayer);
-
-      // Make sure that the sibling <body> is scanned for bindings.
-      createElement(env, pseudoFixedLayer, '[text]="1+1"');
-      return onBindReady(env, bind).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-      });
-    });
+          // Connected <div> element created by describes.js.
+          container = win.document.getElementById('parent');
 
-    it('should support data-amp-bind-* syntax', () => {
-      const element = createElement(env, container, 'data-amp-bind-text="1+1"');
-      expect(bind.numberOfBindings()).to.equal(0);
-      expect(element.textContent).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-        expect(element.textContent).to.equal('2');
-      });
-    });
+          history = bind.historyForTesting();
 
-    it('should prefer [foo] over data-amp-bind-foo', () => {
-      const element = createElement(
-          env, container, '[text]="1+1" data-amp-bind-text="2+2"');
-      expect(bind.numberOfBindings()).to.equal(0);
-      expect(element.textContent).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-        expect(element.textContent).to.equal('2');
-      });
-    });
+          clock = lolex.install({target: win, toFake: ['Date', 'setTimeout']});
+        });
 
-    it('should call createTreeWalker() with all params', () => {
-      const spy = sandbox.spy(env.win.document, 'createTreeWalker');
-      createElement(env, container, '[text]="1+1"');
-      return onBindReady(env, bind).then(() => {
-        // createTreeWalker() on IE does not support optional arguments.
-        expect(spy.callCount).to.equal(1);
-        expect(spy.firstCall.args.length).to.equal(4);
-      });
-    });
+        afterEach(() => {
+          clock.uninstall();
+        });
 
-    it('should have same state after removing + re-adding a subtree', () => {
-      for (let i = 0; i < 5; i++) {
-        createElement(env, container, '[text]="1+1"');
-      }
-      expect(bind.numberOfBindings()).to.equal(0);
-      return onBindReady(env, bind).then(() => {
-        expect(bind.numberOfBindings()).to.equal(5);
-        return bind.removeBindingsForNodes_([container]);
-      }).then(() => {
-        expect(bind.numberOfBindings()).to.equal(0);
-        return bind.addBindingsForNodes_([container]);
-      }).then(() => {
-        expect(bind.numberOfBindings()).to.equal(5);
-      });
-    });
+        it('should send "bindReady" to viewer on init', () => {
+          expect(viewer.sendMessage).to.not.be.called;
 
-    it('should dynamically detect new bindings under dynamic tags', () => {
-      const doc = env.win.document;
-      const dynamicTag = doc.createElement('div');
-      container.appendChild(dynamicTag);
-      return onBindReady(env, bind).then(() => {
-        expect(bind.numberOfBindings()).to.equal(0);
-        const element = createElement(env, container, '[text]="1+1"');
-        dynamicTag.appendChild(element);
-        dynamicTag.dispatchEvent(
-            new Event(AmpEvents.DOM_UPDATE, {bubbles: true}));
-        return waitForEvent(env, BindEvents.RESCAN_TEMPLATE);
-      }).then(() => {
-        expect(bind.numberOfBindings()).to.equal(1);
-      });
-    });
+          return onBindReady(env, bind).then(() => {
+            expect(viewer.sendMessage).to.be.calledOnce;
+            expect(viewer.sendMessage).to.be.calledWith('bindReady');
+          });
+        });
 
-    it('should NOT apply expressions on first load', () => {
-      const element = createElement(env, container, '[text]="1+1"');
-      expect(element.textContent).to.equal('');
-      return onBindReady(env, bind).then(() => {
-        expect(element.textContent).to.equal('');
-      });
-    });
+        it('should not send "bindReady" until all <amp-state> are built', () => {
+          const element = createElement(env, container, '', 'amp-state', true);
+          let buildAmpState;
+          const builtPromise = new Promise(resolve => {
+            buildAmpState = resolve;
+          });
+          element.whenBuilt = () => builtPromise;
+
+          return onBindReady(env, bind)
+            .then(() => {
+              expect(viewer.sendMessage).to.not.be.called;
+              buildAmpState();
+              return element.whenBuilt();
+            })
+            .then(() => {
+              expect(viewer.sendMessage).to.be.calledOnce;
+              expect(viewer.sendMessage).to.be.calledWith('bindReady');
+            });
+        });
 
-    it('should verify class bindings in dev mode', () => {
-      window.AMP_MODE = {development: true, test: true};
-      createElement(env, container, '[class]="\'foo\'" class="foo"');
-      createElement(env, container, '[class]="\'foo\'" class=" foo "');
-      createElement(env, container, '[class]="\'\'"');
-      createElement(env, container, '[class]="\'bar\'" class="qux"'); // Error
-      const warnSpy = sandbox.spy(user(), 'warn');
-      return onBindReady(env, bind).then(() => {
-        expect(warnSpy).to.be.calledOnce;
-        expect(warnSpy).calledWithMatch('amp-bind', /\[class\]/);
-      });
-    });
+        it('should scan for bindings when ampdoc is ready', () => {
+          createElement(env, container, '[text]="1+1"');
+          expect(bind.numberOfBindings()).to.equal(0);
+          return onBindReady(env, bind).then(() => {
+            expect(bind.numberOfBindings()).to.equal(1);
+          });
+        });
 
-    it('should verify string attribute bindings in dev mode', () => {
-      window.AMP_MODE = {development: true, test: true};
-      // Only the initial value for [a] binding does not match.
-      createElement(env, container, '[text]="\'a\'" [class]="\'b\'" class="b"');
-      const warnSpy = sandbox.spy(user(), 'warn');
-      return onBindReady(env, bind).then(() => {
-        expect(warnSpy).to.be.calledOnce;
-        expect(warnSpy).calledWithMatch('amp-bind', /\[text\]/);
-      });
-    });
+        it('should scan fixed layer for bindings', () => {
+          // Mimic FixedLayer by creating a sibling <body> element.
+          const doc = env.win.document;
+          const pseudoFixedLayer = doc.body.cloneNode(false);
+          doc.documentElement.appendChild(pseudoFixedLayer);
 
-    it('should verify boolean attribute bindings in dev mode', () => {
-      window.AMP_MODE = {development: true, test: true};
-      createElement(env, container, '[disabled]="true" disabled', 'button');
-      createElement(env, container, '[disabled]="false"', 'button');
-      createElement(env, container, '[disabled]="true"', 'button'); // Mismatch.
-      const warnSpy = sandbox.spy(user(), 'warn');
-      return onBindReady(env, bind).then(() => {
-        expect(warnSpy).to.be.calledOnce;
-        expect(warnSpy).calledWithMatch('amp-bind', /\[disabled\]/);
-      });
-    });
+          // Make sure that the sibling <body> is scanned for bindings.
+          createElement(env, pseudoFixedLayer, '[text]="1+1"');
+          return onBindReady(env, bind).then(() => {
+            expect(bind.numberOfBindings()).to.equal(1);
+          });
+        });
 
-    it('should skip digest if specified in setState()', () => {
-      const element = createElement(env, container, '[text]="1+1"');
-      expect(element.textContent).to.equal('');
-      return onBindReady(env, bind).then(() => {
-        bind.setState({}, /* opt_skipDigest */ true);
-        env.flushVsync();
-        expect(element.textContent).to.equal('');
-      });
-    });
+        it('should support data-amp-bind-* syntax', () => {
+          const element = createElement(
+            env,
+            container,
+            'data-amp-bind-text="1+1"'
+          );
+          expect(bind.numberOfBindings()).to.equal(0);
+          expect(element.textContent).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(bind.numberOfBindings()).to.equal(1);
+            expect(element.textContent).to.equal('2');
+          });
+        });
 
-    it('should support binding to string attributes', () => {
-      const element = createElement(env, container, '[text]="1+1"');
-      expect(element.textContent).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.textContent).to.equal('2');
-      });
-    });
+        it('should prefer [foo] over data-amp-bind-foo', () => {
+          const element = createElement(
+            env,
+            container,
+            '[text]="1+1" data-amp-bind-text="2+2"'
+          );
+          expect(bind.numberOfBindings()).to.equal(0);
+          expect(element.textContent).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(bind.numberOfBindings()).to.equal(1);
+            expect(element.textContent).to.equal('2');
+          });
+        });
 
-    it('should support binding to boolean attributes', () => {
-      const element = createElement(env,
-          container,
-          '[checked]="true" [disabled]="false" disabled',
-          /* opt_tagName */ 'input');
-      expect(element.getAttribute('checked')).to.equal(null);
-      expect(element.getAttribute('disabled')).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.getAttribute('checked')).to.equal('');
-        expect(element.getAttribute('disabled')).to.equal(null);
-      });
-    });
+        it('should call createTreeWalker() with all params', () => {
+          const spy = sandbox.spy(env.win.document, 'createTreeWalker');
+          createElement(env, container, '[text]="1+1"');
+          return onBindReady(env, bind).then(() => {
+            // createTreeWalker() on IE does not support optional arguments.
+            expect(spy.callCount).to.equal(1);
+            expect(spy.firstCall.args.length).to.equal(4);
+          });
+        });
 
-    it('should update values first, then attributes', () => {
-      const {sandbox} = env;
-      const spy = sandbox.spy();
-      const element = createElement(env, container, '[value]="foo"', 'input');
-      sandbox.stub(element, 'value').set(spy);
-      sandbox.stub(element, 'setAttribute').callsFake(spy);
-      return onBindReadyAndSetState(env, bind, {'foo': '2'}).then(() => {
-        // Note: This tests a workaround for a browser bug. There is nothing
-        // about the element itself we can verify. Only the order of operations
-        // matters.
-        expect(spy.firstCall).to.be.calledWithExactly('2');
-        expect(spy.secondCall).to.be.calledWithExactly('value', '2');
-      });
-    });
+        it('should have same state after removing + re-adding a subtree', () => {
+          for (let i = 0; i < 5; i++) {
+            createElement(env, container, '[text]="1+1"');
+          }
+          expect(bind.numberOfBindings()).to.equal(0);
+          return onBindReady(env, bind)
+            .then(() => {
+              expect(bind.numberOfBindings()).to.equal(5);
+              return bind.removeBindingsForNodes_([container]);
+            })
+            .then(() => {
+              expect(bind.numberOfBindings()).to.equal(0);
+              return bind.addBindingsForNodes_([container]);
+            })
+            .then(() => {
+              expect(bind.numberOfBindings()).to.equal(5);
+            });
+        });
 
-    it('should update properties for empty strings', function* () {
-      const element = createElement(env, container, '[value]="foo"', 'input');
-      yield onBindReadyAndSetState(env, bind, {'foo': 'bar'});
-      expect(element.value).to.equal('bar');
-      yield onBindReadyAndSetState(env, bind, {'foo': ''});
-      expect(element.value).to.equal('');
-    });
+        it('should dynamically detect new bindings under dynamic tags', () => {
+          const doc = env.win.document;
+          const dynamicTag = doc.createElement('div');
+          container.appendChild(dynamicTag);
+          return onBindReady(env, bind)
+            .then(() => {
+              expect(bind.numberOfBindings()).to.equal(0);
+              const element = createElement(env, container, '[text]="1+1"');
+              dynamicTag.appendChild(element);
+              dynamicTag.dispatchEvent(
+                new Event(AmpEvents.DOM_UPDATE, {bubbles: true})
+              );
+              return waitForEvent(env, BindEvents.RESCAN_TEMPLATE);
+            })
+            .then(() => {
+              expect(bind.numberOfBindings()).to.equal(1);
+            });
+        });
 
-    it('should support binding to Node.textContent', () => {
-      const element = createElement(
-          env, container, '[text]="\'abc\'"');
-      expect(element.textContent).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.textContent).to.equal('abc');
-      });
-    });
+        it('should NOT apply expressions on first load', () => {
+          const element = createElement(env, container, '[text]="1+1"');
+          expect(element.textContent).to.equal('');
+          return onBindReady(env, bind).then(() => {
+            expect(element.textContent).to.equal('');
+          });
+        });
 
-    it('should set value for [text] in <textarea>', () => {
-      const element = createElement(
-          env, container, '[text]="\'abc\'"', 'textarea');
-      expect(element.textContent).to.equal('');
-      expect(element.value).to.equal('');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.textContent).to.equal('');
-        expect(element.value).to.equal('abc');
-      });
-    });
+        it('should verify class bindings in dev mode', () => {
+          window.AMP_MODE = {development: true, test: true};
+          createElement(env, container, '[class]="\'foo\'" class="foo"');
+          createElement(env, container, '[class]="\'foo\'" class=" foo "');
+          createElement(env, container, '[class]="\'\'"');
+          createElement(env, container, '[class]="\'bar\'" class="qux"'); // Error
+          const warnSpy = sandbox.spy(user(), 'warn');
+          return onBindReady(env, bind).then(() => {
+            expect(warnSpy).to.be.calledOnce;
+            expect(warnSpy).calledWithMatch('amp-bind', /\[class\]/);
+          });
+        });
 
-    it('should set textContent for [defaultText] in <textarea>', () => {
-      const element = createElement(
-          env, container, '[defaultText]="\'abc\'"', 'textarea');
-      expect(element.textContent).to.equal('');
-      expect(element.value).to.equal('');
-      // Setting `textContent` will also update `value` before interaction.
-      element.value = '123';
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.textContent).to.equal('abc');
-        expect(element.value).to.equal('123');
-      });
-    });
+        it('should verify string attribute bindings in dev mode', () => {
+          window.AMP_MODE = {development: true, test: true};
+          // Only the initial value for [a] binding does not match.
+          createElement(
+            env,
+            container,
+            '[text]="\'a\'" [class]="\'b\'" class="b"'
+          );
+          const warnSpy = sandbox.spy(user(), 'warn');
+          return onBindReady(env, bind).then(() => {
+            expect(warnSpy).to.be.calledOnce;
+            expect(warnSpy).calledWithMatch('amp-bind', /\[text\]/);
+          });
+        });
 
-    it('should update document title for <title> elements', () => {
-      const element = createElement(env, container, '[text]="\'bar\'"',
-          'title', /* opt_amp */ false, /* opt_head */ true);
-      element.textContent = 'foo';
-      env.win.document.title = 'foo';
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.textContent).to.equal('bar');
-        expect(env.win.document.title).to.equal('bar');
-      });
-    });
+        it('should verify boolean attribute bindings in dev mode', () => {
+          window.AMP_MODE = {development: true, test: true};
+          createElement(env, container, '[disabled]="true" disabled', 'button');
+          createElement(env, container, '[disabled]="false"', 'button');
+          createElement(env, container, '[disabled]="true"', 'button'); // Mismatch.
+          const warnSpy = sandbox.spy(user(), 'warn');
+          return onBindReady(env, bind).then(() => {
+            expect(warnSpy).to.be.calledOnce;
+            expect(warnSpy).calledWithMatch('amp-bind', /\[disabled\]/);
+          });
+        });
 
-    it('should not update document title for <title> elements in body', () => {
-      // Add a <title> element to <head> because if we don't, setting
-      // `textContent` on a <title> element in the <body> will strangely update
-      // `document.title`.
-      const title = env.win.document.createElement('title');
-      title.textContent = 'foo';
-      env.win.document.head.appendChild(title);
-      // Add <title [text]="'bar'"> to <body>.
-      createElement(env, container, '[text]="\'bar\'"', 'title');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(env.win.document.title).to.equal('foo');
-      });
-    });
+        it('should skip digest if specified in setState()', () => {
+          const element = createElement(env, container, '[text]="1+1"');
+          expect(element.textContent).to.equal('');
+          return onBindReady(env, bind).then(() => {
+            bind.setState({}, /* opt_skipDigest */ true);
+            env.flushVsync();
+            expect(element.textContent).to.equal('');
+          });
+        });
 
-    it('should support binding to CSS classes with strings', () => {
-      const element = createElement(env, container, '[class]="[\'abc\']"');
-      expect(toArray(element.classList)).to.deep.equal([]);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal(['abc']);
-      });
-    });
+        it('should support binding to string attributes', () => {
+          const element = createElement(env, container, '[text]="1+1"');
+          expect(element.textContent).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.textContent).to.equal('2');
+          });
+        });
 
-    it('should support binding to CSS classes with arrays', () => {
-      const element = createElement(env, container, '[class]="[\'a\',\'b\']"');
-      expect(toArray(element.classList)).to.deep.equal([]);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal(['a', 'b']);
-      });
-    });
+        it('should support binding to boolean attributes', () => {
+          const element = createElement(
+            env,
+            container,
+            '[checked]="true" [disabled]="false" disabled',
+            /* opt_tagName */ 'input'
+          );
+          expect(element.getAttribute('checked')).to.equal(null);
+          expect(element.getAttribute('disabled')).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.getAttribute('checked')).to.equal('');
+            expect(element.getAttribute('disabled')).to.equal(null);
+          });
+        });
 
-    it('should support binding to CSS classes with a null value', () => {
-      const element = createElement(env, container, '[class]="null"');
-      expect(toArray(element.classList)).to.deep.equal([]);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal([]);
-      });
-    });
+        it('should update values first, then attributes', () => {
+          const {sandbox} = env;
+          const spy = sandbox.spy();
+          const element = createElement(
+            env,
+            container,
+            '[value]="foo"',
+            'input'
+          );
+          sandbox.stub(element, 'value').set(spy);
+          sandbox.stub(element, 'setAttribute').callsFake(spy);
+          return onBindReadyAndSetState(env, bind, {'foo': '2'}).then(() => {
+            // Note: This tests a workaround for a browser bug. There is nothing
+            // about the element itself we can verify. Only the order of operations
+            // matters.
+            expect(spy.firstCall).to.be.calledWithExactly('2');
+            expect(spy.secondCall).to.be.calledWithExactly('value', '2');
+          });
+        });
 
-    it('should support binding to CSS classes for svg tags', () => {
-      const element = createElement(
-          env, container, '[class]="[\'abc\']"', 'svg');
-      expect(toArray(element.classList)).to.deep.equal([]);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal(['abc']);
-      });
-    });
+        it('should update properties for empty strings', function*() {
+          const element = createElement(
+            env,
+            container,
+            '[value]="foo"',
+            'input'
+          );
+          yield onBindReadyAndSetState(env, bind, {'foo': 'bar'});
+          expect(element.value).to.equal('bar');
+          yield onBindReadyAndSetState(env, bind, {'foo': ''});
+          expect(element.value).to.equal('');
+        });
 
-    it('supports binding to CSS classes for svg tags with a null value', () => {
-      const element = createElement(env, container, '[class]="null"', 'svg');
-      expect(toArray(element.classList)).to.deep.equal([]);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal([]);
-      });
-    });
+        it('should support binding to Node.textContent', () => {
+          const element = createElement(env, container, '[text]="\'abc\'"');
+          expect(element.textContent).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.textContent).to.equal('abc');
+          });
+        });
 
-    it('should support handling actions with invoke()', () => {
-      const {sandbox} = env;
-      sandbox.stub(bind, 'setStateWithExpression');
-      sandbox.stub(bind, 'pushStateWithExpression');
+        it('should set value for [text] in <textarea>', () => {
+          const element = createElement(
+            env,
+            container,
+            '[text]="\'abc\'"',
+            'textarea'
+          );
+          expect(element.textContent).to.equal('');
+          expect(element.value).to.equal('');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.textContent).to.equal('');
+            expect(element.value).to.equal('abc');
+          });
+        });
 
-      const invocation = {
-        method: 'setState',
-        args: {
-          [RAW_OBJECT_ARGS_KEY]: '{foo: bar}',
-        },
-        event: {
-          detail: {bar: 123},
-        },
-        sequenceId: 0,
-      };
-
-      bind.invoke(invocation);
-      expect(bind.setStateWithExpression).to.be.calledOnce;
-      expect(bind.setStateWithExpression).to.be.calledWithExactly(
-          '{foo: bar}', sinon.match({event: {bar: 123}}));
-
-      invocation.method = 'pushState';
-      invocation.sequenceId++;
-      bind.invoke(invocation);
-      expect(bind.pushStateWithExpression).to.be.calledOnce;
-      expect(bind.pushStateWithExpression).to.be.calledWithExactly(
-          '{foo: bar}', sinon.match({event: {bar: 123}}));
-    });
+        it('should set textContent for [defaultText] in <textarea>', () => {
+          const element = createElement(
+            env,
+            container,
+            '[defaultText]="\'abc\'"',
+            'textarea'
+          );
+          expect(element.textContent).to.equal('');
+          expect(element.value).to.equal('');
+          // Setting `textContent` will also update `value` before interaction.
+          element.value = '123';
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.textContent).to.equal('abc');
+            expect(element.value).to.equal('123');
+          });
+        });
 
-    // TODO(choumx, #16721): Causes browser crash for some reason.
-    it.skip('should only allow one action per event in invoke()', () => {
-      const {sandbox} = env;
-      sandbox.stub(bind, 'setStateWithExpression');
-      const userError = sandbox.stub(user(), 'error');
+        it('should update document title for <title> elements', () => {
+          const element = createElement(
+            env,
+            container,
+            '[text]="\'bar\'"',
+            'title',
+            /* opt_amp */ false,
+            /* opt_head */ true
+          );
+          element.textContent = 'foo';
+          env.win.document.title = 'foo';
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.textContent).to.equal('bar');
+            expect(env.win.document.title).to.equal('bar');
+          });
+        });
 
-      const invocation = {
-        method: 'setState',
-        args: {
-          [RAW_OBJECT_ARGS_KEY]: '{foo: bar}',
-        },
-        event: {
-          detail: {bar: 123},
-        },
-        sequenceId: 0,
-      };
-
-      bind.invoke(invocation);
-      expect(bind.setStateWithExpression).to.be.calledOnce;
-      expect(bind.setStateWithExpression).to.be.calledWithExactly(
-          '{foo: bar}', sinon.match({event: {bar: 123}}));
-
-      // Second invocation with the same sequenceId should fail.
-      bind.invoke(invocation);
-      expect(bind.setStateWithExpression).to.be.calledOnce;
-      expect(userError).to.be.calledWith('amp-bind',
-          'One state action allowed per event.');
-
-      // Invocation with the same sequenceid will be allowed after 5 seconds,
-      // which is how long it takes for stored sequenceIds to be purged.
-      clock.tick(5000);
-      bind.invoke(invocation);
-      expect(bind.setStateWithExpression).to.be.calledTwice;
-    });
+        it('should not update document title for <title> elements in body', () => {
+          // Add a <title> element to <head> because if we don't, setting
+          // `textContent` on a <title> element in the <body> will strangely update
+          // `document.title`.
+          const title = env.win.document.createElement('title');
+          title.textContent = 'foo';
+          env.win.document.head.appendChild(title);
+          // Add <title [text]="'bar'"> to <body>.
+          createElement(env, container, '[text]="\'bar\'"', 'title');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(env.win.document.title).to.equal('foo');
+          });
+        });
 
-    it('should support parsing exprs in setStateWithExpression()', () => {
-      const element = createElement(env, container, '[text]="onePlusOne"');
-      expect(element.textContent).to.equal('');
-      const promise = onBindReadyAndSetStateWithExpression(
-          env, bind, '{"onePlusOne": one + one}', {one: 1});
-      return promise.then(() => {
-        expect(element.textContent).to.equal('2');
-      });
-    });
+        it('should support binding to CSS classes with strings', () => {
+          const element = createElement(env, container, '[class]="[\'abc\']"');
+          expect(toArray(element.classList)).to.deep.equal([]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal(['abc']);
+          });
+        });
 
-    describe('history', () => {
-      beforeEach(() => {
-        sandbox.spy(history, 'replace');
-        sandbox.spy(history, 'push');
-        sandbox.stub(viewer, 'isEmbedded').returns(true);
-      });
+        it('should support binding to CSS classes with arrays', () => {
+          const element = createElement(
+            env,
+            container,
+            "[class]=\"['a','b']\""
+          );
+          expect(toArray(element.classList)).to.deep.equal([]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal(['a', 'b']);
+          });
+        });
 
-      describe('with untrusted viewer', () => {
-        it('should not replace history on AMP.setState()', () => {
-          const promise = onBindReadyAndSetStateWithExpression(
-              env, bind, '{"onePlusOne": one + one}', {one: 1});
-          return promise.then(() => {
-            // Shouldn't call replace() with null `data`.
-            expect(history.replace).to.not.be.called;
+        it('should support binding to CSS classes with a null value', () => {
+          const element = createElement(env, container, '[class]="null"');
+          expect(toArray(element.classList)).to.deep.equal([]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal([]);
           });
         });
 
-        it('should push history (no data) on AMP.pushState()', () => {
-          const promise = bind.pushStateWithExpression('{"foo": "bar"}', {});
-          return promise.then(() => {
-            expect(history.push).to.be.called;
-            // `data` param should be null on untrusted viewers.
-            expect(history.push).to.be.calledWith(sinon.match.func, null);
+        it('should support binding to CSS classes for svg tags', () => {
+          const element = createElement(
+            env,
+            container,
+            '[class]="[\'abc\']"',
+            'svg'
+          );
+          expect(toArray(element.classList)).to.deep.equal([]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal(['abc']);
           });
         });
-      });
 
-      describe('with trusted viewer', () => {
-        beforeEach(() => {
-          sandbox.stub(viewer, 'isTrustedViewer')
-              .returns(Promise.resolve(true));
+        it('supports binding to CSS classes for svg tags with a null value', () => {
+          const element = createElement(
+            env,
+            container,
+            '[class]="null"',
+            'svg'
+          );
+          expect(toArray(element.classList)).to.deep.equal([]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal([]);
+          });
+        });
+
+        it('should support handling actions with invoke()', () => {
+          const {sandbox} = env;
+          sandbox.stub(bind, 'setStateWithExpression');
+          sandbox.stub(bind, 'pushStateWithExpression');
+
+          const invocation = {
+            method: 'setState',
+            args: {
+              [RAW_OBJECT_ARGS_KEY]: '{foo: bar}',
+            },
+            event: {
+              detail: {bar: 123},
+            },
+            sequenceId: 0,
+          };
+
+          bind.invoke(invocation);
+          expect(bind.setStateWithExpression).to.be.calledOnce;
+          expect(bind.setStateWithExpression).to.be.calledWithExactly(
+            '{foo: bar}',
+            sinon.match({event: {bar: 123}})
+          );
+
+          invocation.method = 'pushState';
+          invocation.sequenceId++;
+          bind.invoke(invocation);
+          expect(bind.pushStateWithExpression).to.be.calledOnce;
+          expect(bind.pushStateWithExpression).to.be.calledWithExactly(
+            '{foo: bar}',
+            sinon.match({event: {bar: 123}})
+          );
         });
 
-        it('should replace history on AMP.setState()', () => {
+        // TODO(choumx, #16721): Causes browser crash for some reason.
+        it.skip('should only allow one action per event in invoke()', () => {
+          const {sandbox} = env;
+          sandbox.stub(bind, 'setStateWithExpression');
+          const userError = sandbox.stub(user(), 'error');
+
+          const invocation = {
+            method: 'setState',
+            args: {
+              [RAW_OBJECT_ARGS_KEY]: '{foo: bar}',
+            },
+            event: {
+              detail: {bar: 123},
+            },
+            sequenceId: 0,
+          };
+
+          bind.invoke(invocation);
+          expect(bind.setStateWithExpression).to.be.calledOnce;
+          expect(bind.setStateWithExpression).to.be.calledWithExactly(
+            '{foo: bar}',
+            sinon.match({event: {bar: 123}})
+          );
+
+          // Second invocation with the same sequenceId should fail.
+          bind.invoke(invocation);
+          expect(bind.setStateWithExpression).to.be.calledOnce;
+          expect(userError).to.be.calledWith(
+            'amp-bind',
+            'One state action allowed per event.'
+          );
+
+          // Invocation with the same sequenceid will be allowed after 5 seconds,
+          // which is how long it takes for stored sequenceIds to be purged.
+          clock.tick(5000);
+          bind.invoke(invocation);
+          expect(bind.setStateWithExpression).to.be.calledTwice;
+        });
+
+        it('should support parsing exprs in setStateWithExpression()', () => {
+          const element = createElement(env, container, '[text]="onePlusOne"');
+          expect(element.textContent).to.equal('');
           const promise = onBindReadyAndSetStateWithExpression(
-              env, bind, '{"onePlusOne": one + one}', {one: 1});
+            env,
+            bind,
+            '{"onePlusOne": one + one}',
+            {one: 1}
+          );
           return promise.then(() => {
-            expect(history.replace).calledOnce;
-            // `data` param should exist on trusted viewers.
-            expect(history.replace).calledWith({
-              data: {'amp-bind': {'onePlusOne': 2}},
-              title: '',
+            expect(element.textContent).to.equal('2');
+          });
+        });
+
+        describe('history', () => {
+          beforeEach(() => {
+            sandbox.spy(history, 'replace');
+            sandbox.spy(history, 'push');
+            sandbox.stub(viewer, 'isEmbedded').returns(true);
+          });
+
+          describe('with untrusted viewer', () => {
+            it('should not replace history on AMP.setState()', () => {
+              const promise = onBindReadyAndSetStateWithExpression(
+                env,
+                bind,
+                '{"onePlusOne": one + one}',
+                {one: 1}
+              );
+              return promise.then(() => {
+                // Shouldn't call replace() with null `data`.
+                expect(history.replace).to.not.be.called;
+              });
+            });
+
+            it('should push history (no data) on AMP.pushState()', () => {
+              const promise = bind.pushStateWithExpression(
+                '{"foo": "bar"}',
+                {}
+              );
+              return promise.then(() => {
+                expect(history.push).to.be.called;
+                // `data` param should be null on untrusted viewers.
+                expect(history.push).to.be.calledWith(sinon.match.func, null);
+              });
+            });
+          });
+
+          describe('with trusted viewer', () => {
+            beforeEach(() => {
+              sandbox
+                .stub(viewer, 'isTrustedViewer')
+                .returns(Promise.resolve(true));
+            });
+
+            it('should replace history on AMP.setState()', () => {
+              const promise = onBindReadyAndSetStateWithExpression(
+                env,
+                bind,
+                '{"onePlusOne": one + one}',
+                {one: 1}
+              );
+              return promise.then(() => {
+                expect(history.replace).calledOnce;
+                // `data` param should exist on trusted viewers.
+                expect(history.replace).calledWith({
+                  data: {'amp-bind': {'onePlusOne': 2}},
+                  title: '',
+                });
+              });
+            });
+
+            it('should push history on AMP.pushState()', () => {
+              const promise = bind.pushStateWithExpression(
+                '{"foo": "bar"}',
+                {}
+              );
+              return promise.then(() => {
+                expect(history.push).calledOnce;
+                // `data` param should exist on trusted viewers.
+                expect(history.push).calledWith(sinon.match.func, {
+                  data: {'amp-bind': {foo: 'bar'}},
+                  title: '',
+                });
+              });
             });
           });
         });
 
-        it('should push history on AMP.pushState()', () => {
+        it('should support pushStateWithExpression()', () => {
+          sandbox.spy(history, 'push');
+
+          const element = createElement(env, container, '[text]="foo"');
+          expect(element.textContent).to.equal('');
           const promise = bind.pushStateWithExpression('{"foo": "bar"}', {});
-          return promise.then(() => {
-            expect(history.push).calledOnce;
-            // `data` param should exist on trusted viewers.
-            expect(history.push).calledWith(sinon.match.func, {
-              data: {'amp-bind': {foo: 'bar'}},
-              title: '',
+          return promise
+            .then(() => {
+              env.flushVsync();
+              expect(element.textContent).to.equal('bar');
+
+              expect(history.push).calledOnce;
+              // Pop callback should restore `foo` to original value (null).
+              const onPopCallback = history.push.firstCall.args[0];
+              return onPopCallback();
+            })
+            .then(() => {
+              expect(element.textContent).to.equal('null');
             });
-          });
         });
-      });
-    });
 
-    it('should support pushStateWithExpression()', () => {
-      sandbox.spy(history, 'push');
-
-      const element = createElement(env, container, '[text]="foo"');
-      expect(element.textContent).to.equal('');
-      const promise = bind.pushStateWithExpression('{"foo": "bar"}', {});
-      return promise.then(() => {
-        env.flushVsync();
-        expect(element.textContent).to.equal('bar');
-
-        expect(history.push).calledOnce;
-        // Pop callback should restore `foo` to original value (null).
-        const onPopCallback = history.push.firstCall.args[0];
-        return onPopCallback();
-      }).then(() => {
-        expect(element.textContent).to.equal('null');
-      });
-    });
+        it('pushStateWithExpression() should work with nested objects', () => {
+          sandbox.spy(history, 'push');
+
+          const element = createElement(env, container, '[text]="foo.bar"');
+          expect(element.textContent).to.equal('');
+          return bind
+            .pushStateWithExpression('{foo: {bar: 0}}', {})
+            .then(() => {
+              env.flushVsync();
+              expect(element.textContent).to.equal('0');
+
+              return bind.pushStateWithExpression('{foo: {bar: 1}}', {});
+            })
+            .then(() => {
+              env.flushVsync();
+              expect(element.textContent).to.equal('1');
+
+              expect(history.push).calledTwice;
+              // Pop callback should restore `foo.bar` to second pushed value (0).
+              const onPopCallback = history.push.secondCall.args[0];
+              return onPopCallback();
+            })
+            .then(() => {
+              expect(element.textContent).to.equal('0');
+            });
+        });
 
-    it('pushStateWithExpression() should work with nested objects', () => {
-      sandbox.spy(history, 'push');
-
-      const element = createElement(env, container, '[text]="foo.bar"');
-      expect(element.textContent).to.equal('');
-      return bind.pushStateWithExpression('{foo: {bar: 0}}', {}).then(() => {
-        env.flushVsync();
-        expect(element.textContent).to.equal('0');
-
-        return bind.pushStateWithExpression('{foo: {bar: 1}}', {});
-      }).then(() => {
-        env.flushVsync();
-        expect(element.textContent).to.equal('1');
-
-        expect(history.push).calledTwice;
-        // Pop callback should restore `foo.bar` to second pushed value (0).
-        const onPopCallback = history.push.secondCall.args[0];
-        return onPopCallback();
-      }).then(() => {
-        expect(element.textContent).to.equal('0');
-      });
-    });
+        it('should ignore <amp-state> updates if specified in setState()', () => {
+          const element = createElement(
+            env,
+            container,
+            '[src]="foo"',
+            'amp-state'
+          );
+          element.whenBuilt = () => Promise.resolve();
+          expect(element.getAttribute('src')).to.be.null;
+
+          const promise = onBindReadyAndSetState(
+            env,
+            bind,
+            {foo: '/foo'},
+            /* opt_isAmpStateMutation */ true
+          );
+          return promise.then(() => {
+            // Should _not_ be updated if `opt_isAmpStateMutation` is true.
+            expect(element.getAttribute('src')).to.be.null;
+          });
+        });
 
-    it('should ignore <amp-state> updates if specified in setState()', () => {
-      const element = createElement(env, container, '[src]="foo"', 'amp-state');
-      element.whenBuilt = () => Promise.resolve();
-      expect(element.getAttribute('src')).to.be.null;
-
-      const promise = onBindReadyAndSetState(env, bind,
-          {foo: '/foo'}, /* opt_isAmpStateMutation */ true);
-      return promise.then(() => {
-        // Should _not_ be updated if `opt_isAmpStateMutation` is true.
-        expect(element.getAttribute('src')).to.be.null;
-      });
-    });
+        it('should support NOT override internal AMP CSS classes', () => {
+          const element = createElement(
+            env,
+            container,
+            '[class]="[\'abc\']"',
+            /* opt_tagName */ undefined,
+            /* opt_amp */ true
+          );
+          expect(toArray(element.classList)).to.deep.equal([
+            'i-amphtml-foo',
+            '-amp-foo',
+            'amp-foo',
+          ]);
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(toArray(element.classList)).to.deep.equal([
+              'i-amphtml-foo',
+              '-amp-foo',
+              'amp-foo',
+              'abc',
+            ]);
+          });
+        });
 
-    it('should support NOT override internal AMP CSS classes', () => {
-      const element = createElement(env, container, '[class]="[\'abc\']"',
-          /* opt_tagName */ undefined, /* opt_amp */ true);
-      expect(toArray(element.classList)).to.deep.equal(
-          ['i-amphtml-foo', '-amp-foo', 'amp-foo']);
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(toArray(element.classList)).to.deep.equal(
-            ['i-amphtml-foo', '-amp-foo', 'amp-foo', 'abc']);
-      });
-    });
+        it('should call mutatedAttributesCallback on AMP elements', () => {
+          const binding =
+            '[text]="1+1" [value]="\'4\'" value="4" ' +
+            'checked [checked]="false" [disabled]="true" [multiple]="false"';
+          const element = createElement(
+            env,
+            container,
+            binding,
+            /* opt_tagName */ 'input',
+            /* opt_amp */ true
+          );
+          const spy = sandbox.spy(element, 'mutatedAttributesCallback');
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(spy).calledWithMatch({
+              checked: false,
+              disabled: true,
+            });
+            // Callback shouldn't include global attributes (text, class) or those
+            // whose values haven't changed.
+            expect(
+              spy.neverCalledWithMatch({
+                text: 2,
+                value: 4,
+                multiple: false,
+              })
+            ).to.be.true; // sinon-chai doesn't support "never" API.
+          });
+        });
 
-    it('should call mutatedAttributesCallback on AMP elements', () => {
-      const binding = '[text]="1+1" [value]="\'4\'" value="4" '
-          + 'checked [checked]="false" [disabled]="true" [multiple]="false"';
-      const element = createElement(env, container, binding,
-          /* opt_tagName */ 'input', /* opt_amp */ true);
-      const spy = sandbox.spy(element, 'mutatedAttributesCallback');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(spy).calledWithMatch({
-          checked: false,
-          disabled: true,
-        });
-        // Callback shouldn't include global attributes (text, class) or those
-        // whose values haven't changed.
-        expect(spy.neverCalledWithMatch({
-          text: 2,
-          value: 4,
-          multiple: false,
-        })).to.be.true; // sinon-chai doesn't support "never" API.
-      });
-    });
+        it('should support scope variable references', () => {
+          const binding = '[text]="foo + bar + baz.qux.join(\',\')"';
+          const element = createElement(env, container, binding);
+          expect(element.textContent).to.equal('');
+          return onBindReadyAndSetState(env, bind, {
+            foo: 'abc',
+            bar: 123,
+            baz: {
+              qux: ['x', 'y', 'z'],
+            },
+          }).then(() => {
+            expect(element.textContent).to.equal('abc123x,y,z');
+          });
+        });
 
-    it('should support scope variable references', () => {
-      const binding = '[text]="foo + bar + baz.qux.join(\',\')"';
-      const element = createElement(env, container, binding);
-      expect(element.textContent).to.equal('');
-      return onBindReadyAndSetState(env, bind, {
-        foo: 'abc',
-        bar: 123,
-        baz: {
-          qux: ['x', 'y', 'z'],
-        },
-      }).then(() => {
-        expect(element.textContent).to.equal('abc123x,y,z');
-      });
-    });
+        it('should NOT mutate elements if expression result is unchanged', () => {
+          const binding =
+            '[value]="foo" [class]="\'abc\'" [text]="\'a\'+\'b\'"';
+          const element = createElement(env, container, binding, 'input');
+          element.mutatedAttributesCallback = sandbox.spy();
+          return onBindReadyAndSetState(env, bind, {foo: {bar: [1]}})
+            .then(() => {
+              expect(element.textContent.length).to.not.equal(0);
+              expect(element.classList.length).to.not.equal(0);
+              expect(element.attributes.length).to.not.equal(0);
+              expect(element.mutatedAttributesCallback).to.be.calledOnce;
+
+              element.textContent = '';
+              element.className = '';
+              while (element.attributes.length > 0) {
+                element.removeAttribute(element.attributes[0].name);
+              }
+
+              return onBindReadyAndSetState(env, bind, {});
+            })
+            .then(() => {
+              // Attributes should not be updated and mutatedAttributesCallback
+              // should not be called since the expression results haven't changed.
+              expect(element.textContent).to.equal('');
+              expect(element.className).to.equal('');
+              expect(element.attributes.length).to.equal(0);
+              expect(element.mutatedAttributesCallback).to.be.calledOnce;
+            });
+        });
 
-    it('should NOT mutate elements if expression result is unchanged', () => {
-      const binding = '[value]="foo" [class]="\'abc\'" [text]="\'a\'+\'b\'"';
-      const element = createElement(env, container, binding, 'input');
-      element.mutatedAttributesCallback = sandbox.spy();
-      return onBindReadyAndSetState(env, bind, {foo: {bar: [1]}}).then(() => {
-        expect(element.textContent.length).to.not.equal(0);
-        expect(element.classList.length).to.not.equal(0);
-        expect(element.attributes.length).to.not.equal(0);
-        expect(element.mutatedAttributesCallback).to.be.calledOnce;
-
-        element.textContent = '';
-        element.className = '';
-        while (element.attributes.length > 0) {
-          element.removeAttribute(element.attributes[0].name);
-        }
-
-        return onBindReadyAndSetState(env, bind, {});
-      }).then(() => {
-        // Attributes should not be updated and mutatedAttributesCallback
-        // should not be called since the expression results haven't changed.
-        expect(element.textContent).to.equal('');
-        expect(element.className).to.equal('');
-        expect(element.attributes.length).to.equal(0);
-        expect(element.mutatedAttributesCallback).to.be.calledOnce;
-      });
-    });
+        it('should NOT evaluate expression if binding is NOT allowed', () => {
+          const element = createElement(
+            env,
+            container,
+            '[invalidBinding]="1+1"'
+          );
+          return onBindReadyAndSetState(env, bind, {}).then(() => {
+            expect(element.getAttribute('invalidbinding')).to.be.null;
+          });
+        });
 
-    it('should NOT evaluate expression if binding is NOT allowed', () => {
-      const element = createElement(env, container, '[invalidBinding]="1+1"');
-      return onBindReadyAndSetState(env, bind, {}).then(() => {
-        expect(element.getAttribute('invalidbinding')).to.be.null;
-      });
-    });
+        it('should rewrite attribute values regardless of result type', () => {
+          const withString = createElement(env, container, '[href]="foo"', 'a');
+          const withArray = createElement(env, container, '[href]="bar"', 'a');
+          return onBindReadyAndSetState(env, bind, {
+            foo: '?__amp_source_origin',
+            bar: ['?__amp_source_origin'],
+          }).then(() => {
+            expect(withString.getAttribute('href')).to.equal(null);
+            expect(withArray.getAttribute('href')).to.equal(null);
+          });
+        });
 
-    it('should rewrite attribute values regardless of result type', () => {
-      const withString = createElement(env, container, '[href]="foo"', 'a');
-      const withArray = createElement(env, container, '[href]="bar"', 'a');
-      return onBindReadyAndSetState(env, bind, {
-        foo: '?__amp_source_origin',
-        bar: ['?__amp_source_origin'],
-      }).then(() => {
-        expect(withString.getAttribute('href')).to.equal(null);
-        expect(withArray.getAttribute('href')).to.equal(null);
-      });
-    });
+        it('should stop scanning once max number of bindings is reached', () => {
+          bind.setMaxNumberOfBindingsForTesting(2);
+          const errorStub = sandbox.stub(dev(), 'expectedError');
+
+          const foo = createElement(env, container, '[text]="foo"');
+          const bar = createElement(
+            env,
+            container,
+            '[text]="bar" [class]="baz"'
+          );
+          const qux = createElement(env, container, '[text]="qux"');
+
+          return onBindReadyAndSetState(env, bind, {
+            foo: 1,
+            bar: 2,
+            baz: 3,
+            qux: 4,
+          }).then(() => {
+            expect(foo.textContent).to.equal('1');
+            expect(bar.textContent).to.equal('2');
+            // Max number of bindings exceeded with [baz].
+            expect(bar.className).to.be.equal('');
+            expect(qux.textContent).to.be.equal('');
+
+            expect(errorStub).to.have.been.calledWith(
+              'amp-bind',
+              sinon.match(/Maximum number of bindings reached/)
+            );
+          });
+        });
 
-    it('should stop scanning once max number of bindings is reached', () => {
-      bind.setMaxNumberOfBindingsForTesting(2);
-      const errorStub = sandbox.stub(dev(), 'expectedError');
-
-      const foo = createElement(env, container, '[text]="foo"');
-      const bar = createElement(env, container, '[text]="bar" [class]="baz"');
-      const qux = createElement(env, container, '[text]="qux"');
-
-      return onBindReadyAndSetState(env, bind, {
-        foo: 1, bar: 2, baz: 3, qux: 4,
-      }).then(() => {
-        expect(foo.textContent).to.equal('1');
-        expect(bar.textContent).to.equal('2');
-        // Max number of bindings exceeded with [baz].
-        expect(bar.className).to.be.equal('');
-        expect(qux.textContent).to.be.equal('');
-
-        expect(errorStub).to.have.been.calledWith('amp-bind',
-            sinon.match(/Maximum number of bindings reached/));
-      });
-    });
+        it('should update premutate keys that are overridable', () => {
+          bind.addOverridableKey('foo');
+          bind.addOverridableKey('bar');
+
+          const foo = createElement(env, container, '[text]="foo"');
+          const bar = createElement(env, container, '[text]="bar"');
+          const baz = createElement(env, container, '[text]="baz"');
+          const qux = createElement(env, container, '[text]="qux"');
+
+          return onBindReadyAndSetState(env, bind, {
+            foo: 1,
+            bar: 2,
+            baz: 3,
+            qux: 4,
+          }).then(() => {
+            return viewer
+              .receiveMessage('premutate', {
+                state: {
+                  foo: 'foo',
+                  bar: 'bar',
+                  baz: 'baz',
+                  qux: 'qux',
+                },
+              })
+              .then(() => {
+                expect(foo.textContent).to.equal('foo');
+                expect(bar.textContent).to.equal('bar');
+                expect(baz.textContent).to.be.equal('3');
+                expect(qux.textContent).to.be.equal('4');
+              });
+          });
+        });
 
-    it('should update premutate keys that are overridable', () => {
-      bind.addOverridableKey('foo');
-      bind.addOverridableKey('bar');
-
-      const foo = createElement(env, container, '[text]="foo"');
-      const bar = createElement(env, container, '[text]="bar"');
-      const baz = createElement(env, container, '[text]="baz"');
-      const qux = createElement(env, container, '[text]="qux"');
-
-      return onBindReadyAndSetState(env, bind, {
-        foo: 1, bar: 2, baz: 3, qux: 4,
-      }).then(() => {
-        return viewer.receiveMessage('premutate', {
-          state: {
-            foo: 'foo',
-            bar: 'bar',
-            baz: 'baz',
-            qux: 'qux',
-          },
-        }).then(() => {
+        it('should scanAndApply()', function*() {
+          const foo = createElement(env, container, '[text]="foo"');
+          yield onBindReadyAndSetState(env, bind, {foo: 'foo'});
           expect(foo.textContent).to.equal('foo');
-          expect(bar.textContent).to.equal('bar');
-          expect(baz.textContent).to.be.equal('3');
-          expect(qux.textContent).to.be.equal('4');
-        });
-      });
-    });
 
-    it('should scanAndApply()', function*() {
-      const foo = createElement(env, container, '[text]="foo"');
-      yield onBindReadyAndSetState(env, bind, {foo: 'foo'});
-      expect(foo.textContent).to.equal('foo');
-
-      // The new `onePlusOne` element should be scanned and evaluated despite
-      // not being attached to the DOM.
-      const onePlusOne = createElement(
-          env, /* container */ null, '[text]="1+1"');
-      // Required marker attribute for elements with bindings.
-      onePlusOne.setAttribute('i-amphtml-binding', '');
-      yield onBindReadyAndScanAndApply(env, bind,
-          /* added */ [onePlusOne], /* removed */ [foo]);
-      expect(onePlusOne.textContent).to.equal('2');
-
-      // The binding for the `foo` element should have been removed, so
-      // performing AMP.setState({foo: ...}) should not change it.
-      yield onBindReadyAndSetState(env, bind, {foo: 'bar'});
-      expect(foo.textContent).to.not.equal('bar');
-    });
-  }); // in single ampdoc
-});
+          // The new `onePlusOne` element should be scanned and evaluated despite
+          // not being attached to the DOM.
+          const onePlusOne = createElement(
+            env,
+            /* container */ null,
+            '[text]="1+1"'
+          );
+          // Required marker attribute for elements with bindings.
+          onePlusOne.setAttribute('i-amphtml-binding', '');
+          yield onBindReadyAndScanAndApply(
+            env,
+            bind,
+            /* added */ [onePlusOne],
+            /* removed */ [foo]
+          );
+          expect(onePlusOne.textContent).to.equal('2');
+
+          // The binding for the `foo` element should have been removed, so
+          // performing AMP.setState({foo: ...}) should not change it.
+          yield onBindReadyAndSetState(env, bind, {foo: 'bar'});
+          expect(foo.textContent).to.not.equal('bar');
+        });
+      }
+    ); // in single ampdoc
+  });
diff --git a/extensions/amp-bind/0.1/test/test-amp-state.js b/extensions/amp-bind/0.1/test/test-amp-state.js
index e3787a7bd2e1..df87b993c7d7 100644
--- a/extensions/amp-bind/0.1/test/test-amp-state.js
+++ b/extensions/amp-bind/0.1/test/test-amp-state.js
@@ -19,219 +19,247 @@ import * as xhrUtils from '../../../../src/utils/xhr-utils';
 import {ActionTrust} from '../../../../src/action-constants';
 import {Services} from '../../../../src/services';
 
-describes.realWin('AmpState', {
-  amp: {
-    runtimeOn: false,
-    extensions: ['amp-bind:0.1'],
+describes.realWin(
+  'AmpState',
+  {
+    amp: {
+      runtimeOn: false,
+      extensions: ['amp-bind:0.1'],
+    },
   },
-}, env => {
-  let win;
-  let sandbox;
-  let fetchStub;
-  let getViewerAuthTokenIfAvailableStub;
-
-  let element;
-  let ampState;
-
-  // Viewer-related vars.
-  let viewer;
-  let whenFirstVisiblePromise;
-  let whenFirstVisiblePromiseResolve;
-
-  function getAmpState() {
-    const el = win.document.createElement('amp-state');
-    el.setAttribute('id', 'myAmpState');
-    win.document.body.appendChild(el);
-    return el;
-  }
-
-  beforeEach(() => {
-    ({win, sandbox} = env);
-
-    viewer = Services.viewerForDoc(win.document);
-
-    whenFirstVisiblePromise = new Promise(resolve => {
-      whenFirstVisiblePromiseResolve = resolve;
-    });
-    sandbox.stub(viewer, 'whenFirstVisible')
+  env => {
+    let win;
+    let sandbox;
+    let fetchStub;
+    let getViewerAuthTokenIfAvailableStub;
+
+    let element;
+    let ampState;
+
+    // Viewer-related vars.
+    let viewer;
+    let whenFirstVisiblePromise;
+    let whenFirstVisiblePromiseResolve;
+
+    function getAmpState() {
+      const el = win.document.createElement('amp-state');
+      el.setAttribute('id', 'myAmpState');
+      win.document.body.appendChild(el);
+      return el;
+    }
+
+    beforeEach(() => {
+      ({win, sandbox} = env);
+
+      viewer = Services.viewerForDoc(win.document);
+
+      whenFirstVisiblePromise = new Promise(resolve => {
+        whenFirstVisiblePromiseResolve = resolve;
+      });
+      sandbox
+        .stub(viewer, 'whenFirstVisible')
         .callsFake(() => whenFirstVisiblePromise);
 
-    element = getAmpState();
-    ampState = element.implementation_;
-
-    sandbox.spy(ampState, 'fetchAndUpdate_');
-    sandbox.spy(ampState, 'prepareAndSendFetch_');
-    sandbox.stub(ampState, 'updateState_');
-    getViewerAuthTokenIfAvailableStub = sandbox.stub(
-        xhrUtils, 'getViewerAuthTokenIfAvailable').returns(Promise.resolve());
-    fetchStub = sandbox.stub(ampState, 'fetch_')
+      element = getAmpState();
+      ampState = element.implementation_;
+
+      sandbox.spy(ampState, 'fetchAndUpdate_');
+      sandbox.spy(ampState, 'prepareAndSendFetch_');
+      sandbox.stub(ampState, 'updateState_');
+      getViewerAuthTokenIfAvailableStub = sandbox
+        .stub(xhrUtils, 'getViewerAuthTokenIfAvailable')
+        .returns(Promise.resolve());
+      fetchStub = sandbox
+        .stub(ampState, 'fetch_')
         .returns(Promise.resolve({baz: 'qux'}));
-  });
-
-  it('should fetch json if `src` attribute exists', () => {
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
-
-    // IMPORTANT: No CORS fetch should happen until viewer is visible.
-    expect(ampState.fetch_).to.not.have.been.called;
-    expect(ampState.updateState_).to.not.have.been.called;
-
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise.then(() => {
-      expect(ampState.fetchAndUpdate_).calledWithExactly(/* isInit */ true);
-      return getViewerAuthTokenIfAvailableStub();
-    }).then(() => {
-      return ampState.fetch_();
-    }).then(() => {
-      expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
     });
-  });
 
-  it('should trigger "fetch-error" if fetch fails', function*() {
-    whenFirstVisiblePromiseResolve();
-    fetchStub.returns(Promise.reject());
+    it('should fetch json if `src` attribute exists', () => {
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
+
+      // IMPORTANT: No CORS fetch should happen until viewer is visible.
+      expect(ampState.fetch_).to.not.have.been.called;
+      expect(ampState.updateState_).to.not.have.been.called;
 
-    const actions = {trigger: sandbox.spy()};
-    sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+      whenFirstVisiblePromiseResolve();
+      return whenFirstVisiblePromise
+        .then(() => {
+          expect(ampState.fetchAndUpdate_).calledWithExactly(/* isInit */ true);
+          return getViewerAuthTokenIfAvailableStub();
+        })
+        .then(() => {
+          return ampState.fetch_();
+        })
+        .then(() => {
+          expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
+        });
+    });
 
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
+    it('should trigger "fetch-error" if fetch fails', function*() {
+      whenFirstVisiblePromiseResolve();
+      fetchStub.returns(Promise.reject());
 
-    yield whenFirstVisiblePromise;
-    yield getViewerAuthTokenIfAvailableStub();
-    yield ampState.fetch_();
+      const actions = {trigger: sandbox.spy()};
+      sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
 
-    expect(ampState.updateState_).to.not.be.called;
-    expect(actions.trigger).to.be.calledWithExactly(
-        ampState, 'fetch-error', /* event */ null, ActionTrust.LOW);
-  });
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
 
-  it('should register action refresh', () => {
-    sandbox.spy(ampState, 'registerAction');
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
+      yield whenFirstVisiblePromise;
+      yield getViewerAuthTokenIfAvailableStub();
+      yield ampState.fetch_();
 
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise.then(() => {
-      expect(ampState.registerAction)
-          .calledWithExactly('refresh', sinon.match.any, ActionTrust.HIGH);
+      expect(ampState.updateState_).to.not.be.called;
+      expect(actions.trigger).to.be.calledWithExactly(
+        ampState,
+        'fetch-error',
+        /* event */ null,
+        ActionTrust.LOW
+      );
     });
-  });
-
-  it('should call fetchAndUpdate on refresh', () => {
-    sandbox.spy(ampState, 'registerAction');
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
-
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise.then(() => {
-      return ampState.executeAction({
-        method: 'refresh',
-        satisfiesTrust: () => true,
+
+    it('should register action refresh', () => {
+      sandbox.spy(ampState, 'registerAction');
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
+
+      whenFirstVisiblePromiseResolve();
+      return whenFirstVisiblePromise.then(() => {
+        expect(ampState.registerAction).calledWithExactly(
+          'refresh',
+          sinon.match.any,
+          ActionTrust.HIGH
+        );
       });
-    }).then(() => {
-      expect(ampState.fetchAndUpdate_)
-          .calledWithExactly(/* isInit */ false, /* opt_refresh */ true);
     });
-  });
 
-  it('should parse its child script', () => {
-    element.innerHTML =
+    it('should call fetchAndUpdate on refresh', () => {
+      sandbox.spy(ampState, 'registerAction');
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
+
+      whenFirstVisiblePromiseResolve();
+      return whenFirstVisiblePromise
+        .then(() => {
+          return ampState.executeAction({
+            method: 'refresh',
+            satisfiesTrust: () => true,
+          });
+        })
+        .then(() => {
+          expect(ampState.fetchAndUpdate_).calledWithExactly(
+            /* isInit */ false,
+            /* opt_refresh */ true
+          );
+        });
+    });
+
+    it('should parse its child script', () => {
+      element.innerHTML =
         '<script type="application/json">{"foo": "bar"}</script>';
-    element.build();
+      element.build();
 
-    expect(ampState.fetchAndUpdate_).to.not.have.been.called;
-    expect(ampState.fetch_).to.not.have.been.called;
-    expect(ampState.updateState_).calledWithMatch({foo: 'bar'});
-  });
+      expect(ampState.fetchAndUpdate_).to.not.have.been.called;
+      expect(ampState.fetch_).to.not.have.been.called;
+      expect(ampState.updateState_).calledWithMatch({foo: 'bar'});
+    });
 
-  it('should parse child and fetch `src` if both provided', () => {
-    element.innerHTML = '<script type="application/json">' +
-        '{"foo": "bar"}</script>';
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
+    it('should parse child and fetch `src` if both provided', () => {
+      element.innerHTML =
+        '<script type="application/json">{"foo": "bar"}</script>';
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
 
-    // IMPORTANT: No CORS fetch should happen until viewer is visible.
-    expect(ampState.fetch_).to.not.have.been.called;
+      // IMPORTANT: No CORS fetch should happen until viewer is visible.
+      expect(ampState.fetch_).to.not.have.been.called;
 
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise.then(() => {
-      expect(ampState.updateState_).calledWithMatch({foo: 'bar'});
-      expect(ampState.fetchAndUpdate_).calledWithExactly(/* isInit */ true);
-      return getViewerAuthTokenIfAvailableStub();
-    }).then(() => {
-      return ampState.fetch_();
-    }).then(() => {
-      expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
+      whenFirstVisiblePromiseResolve();
+      return whenFirstVisiblePromise
+        .then(() => {
+          expect(ampState.updateState_).calledWithMatch({foo: 'bar'});
+          expect(ampState.fetchAndUpdate_).calledWithExactly(/* isInit */ true);
+          return getViewerAuthTokenIfAvailableStub();
+        })
+        .then(() => {
+          return ampState.fetch_();
+        })
+        .then(() => {
+          expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
+        });
     });
-  });
 
-  it('should fetch json if `src` is mutated', () => {
-    sandbox.stub(viewer, 'hasBeenVisible').returns(false);
+    it('should fetch json if `src` is mutated', () => {
+      sandbox.stub(viewer, 'hasBeenVisible').returns(false);
 
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.build();
+      element.setAttribute('src', 'https://foo.com/bar?baz=1');
+      element.build();
 
-    // IMPORTANT: No CORS fetch should happen until viewer is visible.
-    expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
-    expect(ampState.fetch_).to.not.have.been.called;
+      // IMPORTANT: No CORS fetch should happen until viewer is visible.
+      expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
+      expect(ampState.fetch_).to.not.have.been.called;
 
-    allowConsoleError(() => {
-      element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
-    });
+      allowConsoleError(() => {
+        element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
+      });
 
-    expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
-    expect(ampState.fetch_).to.not.have.been.called;
+      expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
+      expect(ampState.fetch_).to.not.have.been.called;
 
-    viewer.hasBeenVisible.returns(true);
-    element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
+      viewer.hasBeenVisible.returns(true);
+      element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
 
-    expect(ampState.fetchAndUpdate_).to.have.been.calledTwice;
-    expect(ampState.fetch_).to.not.have.been.called;
+      expect(ampState.fetchAndUpdate_).to.have.been.calledTwice;
+      expect(ampState.fetch_).to.not.have.been.called;
 
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise
+      whenFirstVisiblePromiseResolve();
+      return whenFirstVisiblePromise
         .then(() => getViewerAuthTokenIfAvailableStub())
         .then(() => ampState.fetch_())
         .then(() => {
           expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
         });
-  });
-
-  it('should fetch with auth token if `crossorigin` attribute exists'
-      + ' with `amp-viewer-auth-token-via-post`', () => {
-    sandbox.stub(viewer, 'hasBeenVisible').returns(false);
-    getViewerAuthTokenIfAvailableStub.returns(Promise.resolve('idToken'));
-
-    element.setAttribute('src', 'https://foo.com/bar?baz=1');
-    element.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
-    element.build();
-
-    // IMPORTANT: No CORS fetch should happen until viewer is visible.
-    expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
-    expect(ampState.fetch_).to.not.have.been.called;
-
-    allowConsoleError(() => {
-      element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
     });
 
-    expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
-    expect(ampState.fetch_).to.not.have.been.called;
+    it(
+      'should fetch with auth token if `crossorigin` attribute exists' +
+        ' with `amp-viewer-auth-token-via-post`',
+      () => {
+        sandbox.stub(viewer, 'hasBeenVisible').returns(false);
+        getViewerAuthTokenIfAvailableStub.returns(Promise.resolve('idToken'));
 
-    viewer.hasBeenVisible.returns(true);
-    element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
+        element.setAttribute('src', 'https://foo.com/bar?baz=1');
+        element.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
+        element.build();
 
-    expect(ampState.fetchAndUpdate_).to.have.been.calledTwice;
-    expect(ampState.fetch_).to.not.have.been.called;
+        // IMPORTANT: No CORS fetch should happen until viewer is visible.
+        expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
+        expect(ampState.fetch_).to.not.have.been.called;
 
-    whenFirstVisiblePromiseResolve();
-    return whenFirstVisiblePromise
-        .then(() => ampState.prepareAndSendFetch_({win}, element))
-        .then(() => {
-          expect(fetchStub).to.have.been.called;
-          expect(fetchStub.firstCall.args.slice(-1).pop())
-              .to.be.equal('idToken');
-          expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
+        allowConsoleError(() => {
+          element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
         });
-  });
-});
+
+        expect(ampState.fetchAndUpdate_).to.have.been.calledOnce;
+        expect(ampState.fetch_).to.not.have.been.called;
+
+        viewer.hasBeenVisible.returns(true);
+        element.mutatedAttributesCallback({src: 'https://foo.com/bar?baz=1'});
+
+        expect(ampState.fetchAndUpdate_).to.have.been.calledTwice;
+        expect(ampState.fetch_).to.not.have.been.called;
+
+        whenFirstVisiblePromiseResolve();
+        return whenFirstVisiblePromise
+          .then(() => ampState.prepareAndSendFetch_({win}, element))
+          .then(() => {
+            expect(fetchStub).to.have.been.called;
+            expect(fetchStub.firstCall.args.slice(-1).pop()).to.be.equal(
+              'idToken'
+            );
+            expect(ampState.updateState_).calledWithMatch({baz: 'qux'});
+          });
+      }
+    );
+  }
+);
diff --git a/extensions/amp-bind/0.1/test/test-bind-evaluator.js b/extensions/amp-bind/0.1/test/test-bind-evaluator.js
index dd910fe7ab1e..990ef1c38a2f 100644
--- a/extensions/amp-bind/0.1/test/test-bind-evaluator.js
+++ b/extensions/amp-bind/0.1/test/test-bind-evaluator.js
@@ -42,33 +42,41 @@ describe('BindEvaluator', () => {
 
   it('should allow callers to add bindings multiple times', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'oneplusone + 2',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'oneplusone + 2',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
-    evaluator.addBindings([{
-      tagName: 'SPAN',
-      property: 'text',
-      expressionString: 'oneplusone + 3',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'SPAN',
+        property: 'text',
+        expressionString: 'oneplusone + 3',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(2);
   });
 
   it('should allow callers to remove bindings', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'oneplusone + 2',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'oneplusone + 2',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
-    evaluator.addBindings([{
-      tagName: 'SPAN',
-      property: 'text',
-      expressionString: 'oneplusone + 3',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'SPAN',
+        property: 'text',
+        expressionString: 'oneplusone + 3',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(2);
     evaluator.removeBindingsWithExpressionStrings(['oneplusone + 2']);
     expect(numberOfBindings()).to.equal(1);
@@ -77,15 +85,18 @@ describe('BindEvaluator', () => {
   });
 
   it('should only evaluate duplicate expressions once', () => {
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: '1+1',
-    }, {
-      tagName: 'DIV',
-      property: 'text',
-      expressionString: '1+1',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: '1+1',
+      },
+      {
+        tagName: 'DIV',
+        property: 'text',
+        expressionString: '1+1',
+      },
+    ]);
     const stub = sandbox.stub(BindExpression.prototype, 'evaluate');
     stub.returns('stubbed');
     evaluator.evaluateBindings({});
@@ -94,15 +105,18 @@ describe('BindEvaluator', () => {
 
   it('should clean up removed expressions from its cache', () => {
     expect(numberOfCachedExpressions()).to.equal(0);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'oneplusone + 2',
-    }, {
-      tagName: 'A',
-      property: 'href',
-      expressionString: 'url',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'oneplusone + 2',
+      },
+      {
+        tagName: 'A',
+        property: 'href',
+        expressionString: 'url',
+      },
+    ]);
     expect(numberOfCachedExpressions()).to.equal(2);
     evaluator.removeBindingsWithExpressionStrings(['url']);
     expect(numberOfCachedExpressions()).to.equal(1);
@@ -110,11 +124,13 @@ describe('BindEvaluator', () => {
 
   it('should evaluate expressions given a scope with needed bindings', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'oneplusone + 2',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'oneplusone + 2',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
     const {results, errors} = evaluator.evaluateBindings({oneplusone: 2});
     expect(results['oneplusone + 2']).to.equal(4);
@@ -123,11 +139,13 @@ describe('BindEvaluator', () => {
 
   it('should treat out-of-scope vars as null', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'outOfScope',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'outOfScope',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
     const {results, errors} = evaluator.evaluateBindings({});
     expect(results['outOfScope']).to.be.null;
@@ -136,22 +154,27 @@ describe('BindEvaluator', () => {
 
   it('should validate a common expression on each respective binding', () => {
     const string = /* eslint no-script-url: 0 */ '"javascript:alert(1)"';
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: string,
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: string,
+      },
+    ]);
     let {results, errors} = evaluator.evaluateBindings({});
-    expect(results[string])
-        .to.equal(/* eslint no-script-url: 0 */ 'javascript:alert(1)');
+    expect(results[string]).to.equal(
+      /* eslint no-script-url: 0 */ 'javascript:alert(1)'
+    );
     expect(errors[string]).to.be.undefined;
 
     // An expression used in a single invalid binding should be removed.
-    evaluator.addBindings([{
-      tagName: 'A',
-      property: 'href',
-      expressionString: string,
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'A',
+        property: 'href',
+        expressionString: string,
+      },
+    ]);
     ({results, errors} = evaluator.evaluateBindings({}));
     expect(results[string]).to.be.undefined;
     expect(errors[string].message).to.match(/not a valid result/);
@@ -159,16 +182,20 @@ describe('BindEvaluator', () => {
 
   it('should evaluate expressions with macros', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addMacros([{
-      id: 'add',
-      argumentNames: ['a', 'b'],
-      expressionString: 'a + b',
-    }]);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'add(oneplusone, 2)',
-    }]);
+    evaluator.addMacros([
+      {
+        id: 'add',
+        argumentNames: ['a', 'b'],
+        expressionString: 'a + b',
+      },
+    ]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'add(oneplusone, 2)',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
     const {results, errors} = evaluator.evaluateBindings({oneplusone: 2});
     expect(results['add(oneplusone, 2)']).to.equal(4);
@@ -177,20 +204,25 @@ describe('BindEvaluator', () => {
 
   it('should evaluate expressions with nested macros', () => {
     expect(numberOfBindings()).to.equal(0);
-    evaluator.addMacros([{
-      id: 'add',
-      argumentNames: ['a', 'b'],
-      expressionString: 'a + b',
-    }, {
-      id: 'addThree',
-      argumentNames: ['a', 'b', 'c'],
-      expressionString: 'add(add(a, b), c)',
-    }]);
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'addThree(oneplusone, 2, 2)',
-    }]);
+    evaluator.addMacros([
+      {
+        id: 'add',
+        argumentNames: ['a', 'b'],
+        expressionString: 'a + b',
+      },
+      {
+        id: 'addThree',
+        argumentNames: ['a', 'b', 'c'],
+        expressionString: 'add(add(a, b), c)',
+      },
+    ]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'addThree(oneplusone, 2, 2)',
+      },
+    ]);
     expect(numberOfBindings()).to.equal(1);
     const {results, errors} = evaluator.evaluateBindings({oneplusone: 2});
     expect(results['addThree(oneplusone, 2, 2)']).to.equal(6);
@@ -198,43 +230,52 @@ describe('BindEvaluator', () => {
   });
 
   it('should not allow recursive macros', () => {
-    evaluator.addMacros([{
-      id: 'recurse',
-      expressionString: 'recurse()',
-    }]);
+    evaluator.addMacros([
+      {
+        id: 'recurse',
+        expressionString: 'recurse()',
+      },
+    ]);
 
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'recurse()',
-    }]);
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'recurse()',
+      },
+    ]);
 
     const {results, errors} = evaluator.evaluateBindings({});
     expect(results['recurse()']).to.be.undefined;
     expect(errors['recurse()'].message).to.match(
-        /recurse is not a supported function/);
+      /recurse is not a supported function/
+    );
   });
 
   it('should not allow cyclic references in macros', () => {
-    evaluator.addMacros([{
-      id: 'foo',
-      argumentNames: ['x'],
-      expressionString: 'bar(x)',
-    }, {
-      id: 'bar',
-      argumentNames: ['x'],
-      expressionString: 'foo(x)',
-    }]);
-
-    evaluator.addBindings([{
-      tagName: 'P',
-      property: 'text',
-      expressionString: 'bar()',
-    }]);
+    evaluator.addMacros([
+      {
+        id: 'foo',
+        argumentNames: ['x'],
+        expressionString: 'bar(x)',
+      },
+      {
+        id: 'bar',
+        argumentNames: ['x'],
+        expressionString: 'foo(x)',
+      },
+    ]);
+
+    evaluator.addBindings([
+      {
+        tagName: 'P',
+        property: 'text',
+        expressionString: 'bar()',
+      },
+    ]);
 
     const {results, errors} = evaluator.evaluateBindings({});
     expect(results['bar()']).to.be.undefined;
-    expect(errors['bar()'].message).to.match(
-        /bar is not a supported function/);
+    expect(errors['bar()'].message).to.match(/bar is not a supported function/);
   });
 });
diff --git a/extensions/amp-bind/0.1/test/test-bind-expression.js b/extensions/amp-bind/0.1/test/test-bind-expression.js
index 14ca226aa296..d5138f9bbc48 100644
--- a/extensions/amp-bind/0.1/test/test-bind-expression.js
+++ b/extensions/amp-bind/0.1/test/test-bind-expression.js
@@ -74,27 +74,69 @@ describe('BindExpression', () => {
     });
 
     it('disallow: operators with side effects', () => {
-      expect(() => { evaluate('foo = 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo += 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo -= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo *= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo /= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo %= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo **= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo <<= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo >>= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo >>>= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo &= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo ^= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo |= 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo++', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo--', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('~foo', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo << 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo >> 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('foo >>> 1', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('new Object()', {foo: 0}); }).to.throw();
-      expect(() => { evaluate('delete foo', {foo: 0}); }).to.throw();
+      expect(() => {
+        evaluate('foo = 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo += 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo -= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo *= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo /= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo %= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo **= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo <<= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo >>= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo >>>= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo &= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo ^= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo |= 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo++', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo--', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('~foo', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo << 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo >> 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('foo >>> 1', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('new Object()', {foo: 0});
+      }).to.throw();
+      expect(() => {
+        evaluate('delete foo', {foo: 0});
+      }).to.throw();
     });
 
     /** @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators */
@@ -109,10 +151,18 @@ describe('BindExpression', () => {
       expect(evaluate('new')).to.be.null;
       expect(evaluate('super')).to.be.null;
 
-      expect(() => { evaluate('function*'); }).to.throw();
-      expect(() => { evaluate('/ab+c/i'); }).to.throw();
-      expect(() => { evaluate('yield*'); }).to.throw();
-      expect(() => { evaluate('async function*'); }).to.throw();
+      expect(() => {
+        evaluate('function*');
+      }).to.throw();
+      expect(() => {
+        evaluate('/ab+c/i');
+      }).to.throw();
+      expect(() => {
+        evaluate('yield*');
+      }).to.throw();
+      expect(() => {
+        evaluate('async function*');
+      }).to.throw();
     });
   });
 
@@ -162,8 +212,7 @@ describe('BindExpression', () => {
       expect(evaluate('"abc".indexOf("b")')).to.equal(1);
       expect(evaluate('"aaa".lastIndexOf("a")')).to.equal(2);
       expect(evaluate('"abc".slice(0, 2)')).to.equal('ab');
-      expect(evaluate('"a-b-c".split("-")'))
-          .to.deep.equal(['a', 'b', 'c']);
+      expect(evaluate('"a-b-c".split("-")')).to.deep.equal(['a', 'b', 'c']);
       expect(evaluate('"abc".substr(1)')).to.equal('bc');
       expect(evaluate('"abc".substring(0, 2)')).to.equal('ab');
       expect(evaluate('"ABC".toLowerCase()')).to.equal('abc');
@@ -215,10 +264,12 @@ describe('BindExpression', () => {
       expect(evaluate('foo', {foo: 'bar'})).to.equal('bar');
       expect(evaluate('foo', {foo: 1})).to.equal(1);
       expect(evaluate('foo', {foo: [1, 2, 3]})).to.deep.equal([1, 2, 3]);
-      expect(evaluate('foo', {foo: {'bar': 'qux'}}))
-          .to.deep.equal({bar: 'qux'});
-      expect(evaluate('{"foo": bar}', {bar: 'qux'}))
-          .to.deep.equal({foo: 'qux'});
+      expect(evaluate('foo', {foo: {'bar': 'qux'}})).to.deep.equal({
+        bar: 'qux',
+      });
+      expect(evaluate('{"foo": bar}', {bar: 'qux'})).to.deep.equal({
+        foo: 'qux',
+      });
       expect(evaluate('[foo]', {foo: 'bar'})).to.deep.equal(['bar']);
       expect(evaluate('foo[1]', {foo: ['b', 'c']})).to.equal('c');
       expect(evaluate('foo.length', {foo: [1, 2, 3]})).to.equal(3);
@@ -230,17 +281,15 @@ describe('BindExpression', () => {
     it('literals', () => {
       expect(evaluate('[]')).to.deep.equal([]);
       expect(evaluate('["a", "b"].length')).to.equal(2);
-      expect(evaluate('[1, "a", [], {}]'))
-          .to.deep.equal([1, 'a', [], {}]);
+      expect(evaluate('[1, "a", [], {}]')).to.deep.equal([1, 'a', [], {}]);
       expect(evaluate('["a", "b"][1]')).to.equal('b');
       expect(evaluate('["a", foo][1]', {foo: 'b'})).to.equal('b');
     });
 
     it('trailing commas in literals', () => {
-      expect(evaluate('[1,2,3,]')).to.deep.equal([1,2,3]);
+      expect(evaluate('[1,2,3,]')).to.deep.equal([1, 2, 3]);
       expect(evaluate('["a", "b",].length')).to.equal(2);
-      expect(evaluate('[1, "a", [], {},]'))
-          .to.deep.equal([1, 'a', [], {}]);
+      expect(evaluate('[1, "a", [], {},]')).to.deep.equal([1, 'a', [], {}]);
       expect(evaluate('["a", "b",][1]')).to.equal('b');
       expect(evaluate('["a", foo,][1]', {foo: 'b'})).to.equal('b');
     });
@@ -255,29 +304,44 @@ describe('BindExpression', () => {
     });
 
     it('prototype functions', () => {
-      expect(evaluate('["a", "b"].concat(["c", "d"])'))
-          .to.deep.equal(['a', 'b', 'c', 'd']);
+      expect(evaluate('["a", "b"].concat(["c", "d"])')).to.deep.equal([
+        'a',
+        'b',
+        'c',
+        'd',
+      ]);
       expect(evaluate('["a", "a"].indexOf("a")')).to.equal(0);
       expect(evaluate('["a", "b", "c"].join("-")')).to.equal('a-b-c');
       expect(evaluate('["a", "a"].lastIndexOf("a")')).to.equal(1);
-      expect(evaluate('["a", "b", "c"].slice(1, 2)'))
-          .to.deep.equal(['b']);
+      expect(evaluate('["a", "b", "c"].slice(1, 2)')).to.deep.equal(['b']);
       expect(evaluate('[1, 2, 3, 4, 5].includes(3)')).to.be.true;
     });
 
     it('custom Array#sort()', () => {
       expect(evaluate('[11, 1, 2].sort()')).to.deep.equal([1, 11, 2]);
-      expect(evaluate('[11, 1, 2].sort((x, y) => x - y)'))
-          .to.deep.equal([1, 2, 11]);
+      expect(evaluate('[11, 1, 2].sort((x, y) => x - y)')).to.deep.equal([
+        1,
+        2,
+        11,
+      ]);
 
       const a = [11, 1, 2];
       expect(evaluate('a.sort()', {a})).to.deep.equal([1, 11, 2]);
-      expect(evaluate('a.sort((x, y) => x - y)', {a}))
-          .to.deep.equal([1, 2, 11]);
+      expect(evaluate('a.sort((x, y) => x - y)', {a})).to.deep.equal([
+        1,
+        2,
+        11,
+      ]);
 
       // Sort should be out-of-place i.e. does not sort the caller.
-      expect(evaluate('a.sort().concat(a)', {a}))
-          .to.deep.equal([1, 11, 2, 11, 1, 2]);
+      expect(evaluate('a.sort().concat(a)', {a})).to.deep.equal([
+        1,
+        11,
+        2,
+        11,
+        1,
+        2,
+      ]);
     });
 
     it('custom Array#splice()', () => {
@@ -293,8 +357,12 @@ describe('BindExpression', () => {
       expect(evaluate('a.splice(1, 1, 47)', {a})).to.deep.equal([1, 47, 3]);
 
       // Splice should be out-of-place i.e. does not splice the caller.
-      expect(evaluate('a.splice(1).concat(a)', {a}))
-          .to.deep.equal([1, 1, 2, 3]);
+      expect(evaluate('a.splice(1).concat(a)', {a})).to.deep.equal([
+        1,
+        1,
+        2,
+        3,
+      ]);
     });
 
     it('non-whitelisted functions', () => {
@@ -396,10 +464,12 @@ describe('BindExpression', () => {
     });
 
     it('encodeURI and encodeURIComponent', () => {
-      expect(evaluate('encodeURI("http://google.com/s p a c e.html")'))
-          .to.equal('http://google.com/s%20p%20a%20c%20e.html');
-      expect(evaluate('encodeURIComponent("http://google.com/foo?foo=bar")'))
-          .to.equal('http%3A%2F%2Fgoogle.com%2Ffoo%3Ffoo%3Dbar');
+      expect(
+        evaluate('encodeURI("http://google.com/s p a c e.html")')
+      ).to.equal('http://google.com/s%20p%20a%20c%20e.html');
+      expect(
+        evaluate('encodeURIComponent("http://google.com/foo?foo=bar")')
+      ).to.equal('http%3A%2F%2Fgoogle.com%2Ffoo%3Ffoo%3Dbar');
     });
 
     it('splice()', () => {
@@ -429,26 +499,45 @@ describe('BindExpression', () => {
     });
 
     it('disallow: function declarations', () => {
-      expect(() => { evaluate('(function() {})'); }).to.throw();
-      expect(() => { evaluate('function foo() {}'); }).to.throw();
-      expect(() => { evaluate('new Function()'); }).to.throw();
-      expect(() => { evaluate('Function()'); }).to.throw();
-      expect(() => { evaluate('() => {}'); }).to.throw();
-      expect(() => { evaluate('class Foo {}'); }).to.throw();
+      expect(() => {
+        evaluate('(function() {})');
+      }).to.throw();
+      expect(() => {
+        evaluate('function foo() {}');
+      }).to.throw();
+      expect(() => {
+        evaluate('new Function()');
+      }).to.throw();
+      expect(() => {
+        evaluate('Function()');
+      }).to.throw();
+      expect(() => {
+        evaluate('() => {}');
+      }).to.throw();
+      expect(() => {
+        evaluate('class Foo {}');
+      }).to.throw();
     });
 
     it('disallow: invocation of custom functions in scope', () => {
       const scope = {
         foo: {
-          bar: () => { 'bar'; },
+          bar: () => {
+            'bar';
+          },
+        },
+        baz: () => {
+          'baz';
         },
-        baz: () => { 'baz'; },
         qux: window.Function,
       };
       // baz() throws a parse error because functions must have a caller.
-      expect(() => { evaluate('baz()', scope); }).to.throw();
-      expect(() => { evaluate('foo.bar()', scope); })
-          .to.throw(Error, unsupportedFunctionError);
+      expect(() => {
+        evaluate('baz()', scope);
+      }).to.throw();
+      expect(() => {
+        evaluate('foo.bar()', scope);
+      }).to.throw(Error, unsupportedFunctionError);
       expect(() => {
         evaluate('foo.qux("a", "return a")', scope);
       }).to.throw(unsupportedFunctionError);
@@ -490,8 +579,11 @@ describe('BindExpression', () => {
       // Only allow objects in arguments for some functions.
       expect(evaluate('keys({x: 2})')).to.deep.equal(['x']);
       expect(evaluate('values({x: 2})')).to.deep.equal([2]);
-      expect(evaluate('splice([1, 3], 1, 0, {x: 2})'))
-          .to.deep.equal([1, {x: 2}, 3]);
+      expect(evaluate('splice([1, 3], 1, 0, {x: 2})')).to.deep.equal([
+        1,
+        {x: 2},
+        3,
+      ]);
     });
   });
 
@@ -542,13 +634,21 @@ describe('BindExpression', () => {
     });
 
     it('disallow: loops', () => {
-      expect(() => { evaluate('if (foo) "bar"', {foo: 0}); }).to.throw();
+      expect(() => {
+        evaluate('if (foo) "bar"', {foo: 0});
+      }).to.throw();
       expect(() => {
         evaluate('switch (foo) { case 0: "bar" }', {foo: 0});
       }).to.throw();
-      expect(() => { evaluate('for (;;) {}'); }).to.throw();
-      expect(() => { evaluate('while (true) {}'); }).to.throw();
-      expect(() => { evaluate('do {} while (true)'); }).to.throw();
+      expect(() => {
+        evaluate('for (;;) {}');
+      }).to.throw();
+      expect(() => {
+        evaluate('while (true) {}');
+      }).to.throw();
+      expect(() => {
+        evaluate('do {} while (true)');
+      }).to.throw();
       expect(() => {
         evaluate('for (var i in foo) {}', {foo: [1, 2, 3]});
       }).to.throw();
@@ -566,16 +666,36 @@ describe('BindExpression', () => {
       expect(evaluate('NaN')).to.be.null;
       expect(evaluate('undefined')).to.be.null;
 
-      expect(() => { evaluate('eval()'); }).to.throw();
-      expect(() => { evaluate('uneval()'); }).to.throw();
-      expect(() => { evaluate('isFinite()'); }).to.throw();
-      expect(() => { evaluate('isNaN()'); }).to.throw();
-      expect(() => { evaluate('parseFloat()'); }).to.throw();
-      expect(() => { evaluate('parseInt()'); }).to.throw();
-      expect(() => { evaluate('decodeURI()'); }).to.throw();
-      expect(() => { evaluate('decodeURIComponent()'); }).to.throw();
-      expect(() => { evaluate('escape()'); }).to.throw();
-      expect(() => { evaluate('unescape()'); }).to.throw();
+      expect(() => {
+        evaluate('eval()');
+      }).to.throw();
+      expect(() => {
+        evaluate('uneval()');
+      }).to.throw();
+      expect(() => {
+        evaluate('isFinite()');
+      }).to.throw();
+      expect(() => {
+        evaluate('isNaN()');
+      }).to.throw();
+      expect(() => {
+        evaluate('parseFloat()');
+      }).to.throw();
+      expect(() => {
+        evaluate('parseInt()');
+      }).to.throw();
+      expect(() => {
+        evaluate('decodeURI()');
+      }).to.throw();
+      expect(() => {
+        evaluate('decodeURIComponent()');
+      }).to.throw();
+      expect(() => {
+        evaluate('escape()');
+      }).to.throw();
+      expect(() => {
+        evaluate('unescape()');
+      }).to.throw();
 
       expect(evaluate('Object')).to.be.null;
       expect(evaluate('Function')).to.be.null;
@@ -635,8 +755,8 @@ describe('BindExpression', () => {
     });
 
     it('disallow: exceeding maximum AST size', () => {
-      expect(new BindExpression('1 + 1', {}, /* maxAstSize */ 3))
-          .to.not.be.null;
+      expect(new BindExpression('1 + 1', {}, /* maxAstSize */ 3)).to.not.be
+        .null;
 
       // The expression '1 + 1' should have an AST size of 3 -- one for each
       // literal, and a PLUS expression wrapping them.
@@ -653,16 +773,16 @@ describe('BindExpression', () => {
       expect(add.getExpressionSize()).to.equal(3);
 
       // The expression add(1, 1) should have an AST size of 3.
-      expect(new BindExpression('add(1, 1)', {add}, /* maxAstSize */ 3))
-          .to.not.be.null;
+      expect(new BindExpression('add(1, 1)', {add}, /* maxAstSize */ 3)).to.not
+        .be.null;
 
       expect(() => {
         new BindExpression('add(1, 1)', {add}, /* maxAstSize */ 2);
       }).to.throw(expressionSizeExceededError);
 
       // The expression add(1, 1 + 1) should have an AST size of 5.
-      expect(new BindExpression('add(1, 1 + 1)', {add}, /* maxAstSize */ 5))
-          .to.not.be.null;
+      expect(new BindExpression('add(1, 1 + 1)', {add}, /* maxAstSize */ 5)).to
+        .not.be.null;
 
       expect(() => {
         new BindExpression('add(1, 1 + 1)', {add}, /* maxAstSize */ 4);
@@ -704,27 +824,51 @@ describe('BindExpression', () => {
     });
 
     it('disallow: usage other than as function parameter', () => {
-      expect(() => { evaluate('() => 123'); }).to.throw();
-      expect(() => { evaluate('x => 123'); }).to.throw();
-      expect(() => { evaluate('(x, y) => 123'); }).to.throw();
+      expect(() => {
+        evaluate('() => 123');
+      }).to.throw();
+      expect(() => {
+        evaluate('x => 123');
+      }).to.throw();
+      expect(() => {
+        evaluate('(x, y) => 123');
+      }).to.throw();
 
-      expect(() => { evaluate('(() => 123).constructor()'); }).to.throw();
-      expect(() => { evaluate('(x => 123).constructor()'); }).to.throw();
-      expect(() => { evaluate('((x, y) => 123).constructor()'); }).to.throw();
+      expect(() => {
+        evaluate('(() => 123).constructor()');
+      }).to.throw();
+      expect(() => {
+        evaluate('(x => 123).constructor()');
+      }).to.throw();
+      expect(() => {
+        evaluate('((x, y) => 123).constructor()');
+      }).to.throw();
 
-      expect(() => { evaluate('(() => 123).name'); }).to.throw();
-      expect(() => { evaluate('(x => 123).name'); }).to.throw();
-      expect(() => { evaluate('((x, y) => 123).name'); }).to.throw();
+      expect(() => {
+        evaluate('(() => 123).name');
+      }).to.throw();
+      expect(() => {
+        evaluate('(x => 123).name');
+      }).to.throw();
+      expect(() => {
+        evaluate('((x, y) => 123).name');
+      }).to.throw();
     });
 
     it('disallow: `arguments` or `this`', () => {
       const a = [1, 2, 3];
-      expect(evaluate('a.map(() => arguments)', {a}))
-          .to.deep.equal([null, null, null]);
+      expect(evaluate('a.map(() => arguments)', {a})).to.deep.equal([
+        null,
+        null,
+        null,
+      ]);
       expect(evaluate('a.reduce(() => arguments)', {a})).to.deep.equal(null);
 
-      expect(evaluate('a.map(() => this)', {a}))
-          .to.deep.equal([null, null, null]);
+      expect(evaluate('a.map(() => this)', {a})).to.deep.equal([
+        null,
+        null,
+        null,
+      ]);
       expect(evaluate('a.reduce(() => this)', {a})).to.deep.equal(null);
     });
   });
diff --git a/extensions/amp-bind/0.1/test/test-bind-validator.js b/extensions/amp-bind/0.1/test/test-bind-validator.js
index 496d4a9b5abc..1686c3dbf5e0 100644
--- a/extensions/amp-bind/0.1/test/test-bind-validator.js
+++ b/extensions/amp-bind/0.1/test/test-bind-validator.js
@@ -126,35 +126,64 @@ describe('BindValidator (allowUrlProperties=true)', () => {
     it('should NOT allow invalid "class" attribute values', () => {
       expect(val.isResultValid('DIV', 'class', 'foo')).to.be.true;
 
-      expect(val.isResultValid(
-          'DIV', 'class', 'i-amphtml-foo')).to.be.false;
-      expect(val.isResultValid(
-          'DIV', 'class', 'foo i-amphtml-bar')).to.be.false;
+      expect(val.isResultValid('DIV', 'class', 'i-amphtml-foo')).to.be.false;
+      expect(val.isResultValid('DIV', 'class', 'foo i-amphtml-bar')).to.be
+        .false;
     });
 
     it('should NOT sanitize "text" attribute values', () => {
       expect(val.isResultValid('P', 'text', 'Hello World')).to.be.true;
       expect(val.isResultValid('P', 'text', '')).to.be.true;
       expect(val.isResultValid('P', 'text', null)).to.be.true;
-      expect(val.isResultValid(
-          'P', 'text', '<script>alert(1);</script>')).to.be.true;
+      expect(val.isResultValid('P', 'text', '<script>alert(1);</script>')).to.be
+        .true;
     });
 
     it('should block dangerous attribute URLs in standard elements', () => {
-      expect(val.isResultValid('A', 'href',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)')).to.be.false;
-      expect(val.isResultValid('A', 'href',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
-
-      expect(val.isResultValid('SOURCE', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)')).to.be.false;
-      expect(val.isResultValid('SOURCE', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
-
-      expect(val.isResultValid('TRACK', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)')).to.be.false;
-      expect(val.isResultValid('TRACK', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
+      expect(
+        val.isResultValid(
+          'A',
+          'href',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)'
+        )
+      ).to.be.false;
+      expect(
+        val.isResultValid(
+          'A',
+          'href',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
+
+      expect(
+        val.isResultValid(
+          'SOURCE',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)'
+        )
+      ).to.be.false;
+      expect(
+        val.isResultValid(
+          'SOURCE',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
+
+      expect(
+        val.isResultValid(
+          'TRACK',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)'
+        )
+      ).to.be.false;
+      expect(
+        val.isResultValid(
+          'TRACK',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
     });
 
     it('should NOT allow unsupported <input> "type" values', () => {
@@ -184,25 +213,39 @@ describe('BindValidator (allowUrlProperties=true)', () => {
     it('should support <amp-img>', () => {
       expect(val.canBind('AMP-IMG', 'src')).to.be.true;
 
-      expect(val.isResultValid(
-          'AMP-IMG', 'src', 'http://foo.com/bar.jpg')).to.be.true;
-      expect(val.isResultValid('AMP-IMG', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
-      expect(val.isResultValid(
-          'AMP-IMG', 'src', '?__amp_source_origin=foo')).to.be.false;
-
-      expect(val.isResultValid(
+      expect(val.isResultValid('AMP-IMG', 'src', 'http://foo.com/bar.jpg')).to
+        .be.true;
+      expect(
+        val.isResultValid(
+          'AMP-IMG',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
+      expect(val.isResultValid('AMP-IMG', 'src', '?__amp_source_origin=foo')).to
+        .be.false;
+
+      expect(
+        val.isResultValid(
           'AMP-IMG',
           'srcset',
-          'http://a.com/b.jpg 1x, http://c.com/d.jpg 2x')).to.be.true;
-      expect(val.isResultValid(
+          'http://a.com/b.jpg 1x, http://c.com/d.jpg 2x'
+        )
+      ).to.be.true;
+      expect(
+        val.isResultValid(
           'AMP-IMG',
           'srcset',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1);')).to.be.false;
-      expect(val.isResultValid(
+          /* eslint no-script-url: 0 */ 'javascript:alert(1);'
+        )
+      ).to.be.false;
+      expect(
+        val.isResultValid(
           'AMP-IMG',
           'src',
-          'http://a.com/b.jpg 1x, ?__amp_source_origin=foo 2x')).to.be.false;
+          'http://a.com/b.jpg 1x, ?__amp_source_origin=foo 2x'
+        )
+      ).to.be.false;
     });
 
     it('should support <amp-carousel>', () => {
@@ -223,12 +266,12 @@ describe('BindValidator (allowUrlProperties=true)', () => {
     it('should support <amp-state>', () => {
       expect(val.canBind('AMP-STATE', 'src')).to.be.true;
 
-      expect(val.isResultValid(
-          'AMP-STATE', 'src', 'https://foo.com/bar.json')).to.be.true;
-      expect(val.isResultValid(
-          'AMP-STATE', 'src', 'http://foo.com/bar.json')).to.be.false;
-      expect(val.isResultValid(
-          'AMP-STATE', 'src', 'data://foo.com/bar.json')).to.be.false;
+      expect(val.isResultValid('AMP-STATE', 'src', 'https://foo.com/bar.json'))
+        .to.be.true;
+      expect(val.isResultValid('AMP-STATE', 'src', 'http://foo.com/bar.json'))
+        .to.be.false;
+      expect(val.isResultValid('AMP-STATE', 'src', 'data://foo.com/bar.json'))
+        .to.be.false;
     });
 
     it('should support <amp-video>', () => {
@@ -236,18 +279,28 @@ describe('BindValidator (allowUrlProperties=true)', () => {
       expect(val.canBind('AMP-VIDEO', 'poster')).to.be.true;
       expect(val.canBind('AMP-VIDEO', 'src')).to.be.true;
 
-      expect(val.isResultValid(
-          'AMP-VIDEO', 'src', 'https://foo.com/bar.mp4')).to.be.true;
-      expect(val.isResultValid(
-          'AMP-VIDEO', 'src', 'http://foo.com/bar.mp4')).to.be.false;
-      expect(val.isResultValid('AMP-VIDEO', 'src',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
+      expect(val.isResultValid('AMP-VIDEO', 'src', 'https://foo.com/bar.mp4'))
+        .to.be.true;
+      expect(val.isResultValid('AMP-VIDEO', 'src', 'http://foo.com/bar.mp4')).to
+        .be.false;
+      expect(
+        val.isResultValid(
+          'AMP-VIDEO',
+          'src',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
     });
 
     it('should support (svg) image', () => {
       expect(val.canBind('IMAGE', 'xlink:href')).to.be.true;
-      expect(val.isResultValid('IMAGE', 'xlink:href',
-          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;')).to.be.false;
+      expect(
+        val.isResultValid(
+          'IMAGE',
+          'xlink:href',
+          /* eslint no-script-url: 0 */ 'javascript:alert(1)\n;'
+        )
+      ).to.be.false;
     });
   });
 });
@@ -269,13 +322,16 @@ describe('BindValidator (allowUrlProperties=false)', () => {
 
   it('should not validate results of URL properties', () => {
     expect(val.isResultValid('A', 'href', 'https://google.com')).to.be.false;
-    expect(val.isResultValid('AMP-IMG', 'src', 'https://foo.com/bar.jpg'))
-        .to.be.false;
-    expect(val.isResultValid(
+    expect(val.isResultValid('AMP-IMG', 'src', 'https://foo.com/bar.jpg')).to.be
+      .false;
+    expect(
+      val.isResultValid(
         'AMP-IMG',
         'srcset',
-        'http://a.com/b.jpg 1x, http://c.com/d.jpg 2x')).to.be.false;
+        'http://a.com/b.jpg 1x, http://c.com/d.jpg 2x'
+      )
+    ).to.be.false;
     expect(val.isResultValid('IMAGE', 'xlink:href', 'https://foo.com/bar.jpg'))
-        .to.be.false;
+      .to.be.false;
   });
 });
diff --git a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
index 9d4128f35fe2..a938713dacd4 100644
--- a/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
+++ b/extensions/amp-bodymovin-animation/0.1/amp-bodymovin-animation.js
@@ -33,7 +33,6 @@ import {userAssert} from '../../../src/log';
 const TAG = 'amp-bodymovin-animation';
 
 export class AmpBodymovinAnimation extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -73,9 +72,10 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
    * @override
    */
   preconnectCallback(opt_onLayout) {
-    const scriptToLoad = this.renderer_ === 'svg' ?
-      'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin_light.min.js' :
-      'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js';
+    const scriptToLoad =
+      this.renderer_ === 'svg'
+        ? 'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin_light.min.js'
+        : 'https://cdnjs.cloudflare.com/ajax/libs/bodymovin/4.13.0/bodymovin.min.js';
     preloadBootstrap(this.win, this.preconnect);
     this.preconnect.url(scriptToLoad, opt_onLayout);
   }
@@ -85,23 +85,47 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
     this.loop_ = this.element.getAttribute('loop') || 'true';
     this.autoplay_ = !this.element.hasAttribute('noautoplay');
     this.renderer_ = this.element.getAttribute('renderer') || 'svg';
-    userAssert(this.element.hasAttribute('src'),
-        'The src attribute must be specified for <amp-bodymovin-animation>');
+    userAssert(
+      this.element.hasAttribute('src'),
+      'The src attribute must be specified for <amp-bodymovin-animation>'
+    );
     assertHttpsUrl(this.element.getAttribute('src'), this.element);
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
     this.playerReadyResolver_ = deferred.resolve;
 
     // Register relevant actions
-    this.registerAction('play', () => { this.play_(); }, ActionTrust.LOW);
-    this.registerAction('pause', () => { this.pause_(); }, ActionTrust.LOW);
-    this.registerAction('stop', () => { this.stop_(); }, ActionTrust.LOW);
-    this.registerAction('seekTo', invocation => {
-      const {args} = invocation;
-      if (args) {
-        this.seekTo_(args);
-      }
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'play',
+      () => {
+        this.play_();
+      },
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'pause',
+      () => {
+        this.pause_();
+      },
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'stop',
+      () => {
+        this.stop_();
+      },
+      ActionTrust.LOW
+    );
+    this.registerAction(
+      'seekTo',
+      invocation => {
+        const {args} = invocation;
+        if (args) {
+          this.seekTo_(args);
+        }
+      },
+      ActionTrust.LOW
+    );
   }
 
   /** @override */
@@ -115,19 +139,25 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
         animationData: data,
       };
       const iframe = getIframe(
-          this.win, this.element, 'bodymovinanimation', opt_context);
-      return Services.vsyncFor(this.win).mutatePromise(() => {
-        this.applyFillContent(iframe);
-        this.unlistenMessage_ = listen(
+        this.win,
+        this.element,
+        'bodymovinanimation',
+        opt_context
+      );
+      return Services.vsyncFor(this.win)
+        .mutatePromise(() => {
+          this.applyFillContent(iframe);
+          this.unlistenMessage_ = listen(
             this.win,
             'message',
             this.handleBodymovinMessages_.bind(this)
-        );
-        this.element.appendChild(iframe);
-        this.iframe_ = iframe;
-      }).then(() => {
-        return this.playerReadyPromise_;
-      });
+          );
+          this.element.appendChild(iframe);
+          this.iframe_ = iframe;
+        })
+        .then(() => {
+          return this.playerReadyPromise_;
+        });
     });
   }
 
@@ -154,8 +184,13 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
     if (this.iframe_ && event.source != this.iframe_.contentWindow) {
       return;
     }
-    if (!getData(event) || !(isObject(getData(event))
-        || startsWith(/** @type {string} */ (getData(event)), '{'))) {
+    if (
+      !getData(event) ||
+      !(
+        isObject(getData(event)) ||
+        startsWith(/** @type {string} */ (getData(event)), '{')
+      )
+    ) {
       return; // Doesn't look like JSON.
     }
 
@@ -181,12 +216,14 @@ export class AmpBodymovinAnimation extends AMP.BaseElement {
   sendCommand_(action, opt_valueType, opt_value) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(dict({
-          'action': action,
-          'valueType': opt_valueType || '',
-          'value': opt_value || '',
-        }));
-        this.iframe_.contentWindow. /*OK*/postMessage(message, '*');
+        const message = JSON.stringify(
+          dict({
+            'action': action,
+            'valueType': opt_valueType || '',
+            'value': opt_value || '',
+          })
+        );
+        this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
   }
diff --git a/extensions/amp-bodymovin-animation/0.1/test/integration/test-amp-bodymovin-animation.js b/extensions/amp-bodymovin-animation/0.1/test/integration/test-amp-bodymovin-animation.js
index 04af04b91a67..30637a67bfdf 100644
--- a/extensions/amp-bodymovin-animation/0.1/test/integration/test-amp-bodymovin-animation.js
+++ b/extensions/amp-bodymovin-animation/0.1/test/integration/test-amp-bodymovin-animation.js
@@ -14,30 +14,41 @@
  * limitations under the License.
  */
 
-describe.configure().ifChrome().run('amp-bodymovin-animation', function() {
-  const extensions = ['amp-bodymovin-animation'];
-  const bodymovinBody = `
+describe
+  .configure()
+  .ifChrome()
+  .run('amp-bodymovin-animation', function() {
+    const extensions = ['amp-bodymovin-animation'];
+    const bodymovinBody = `
     <amp-bodymovin-animation id="anim"
       layout="fixed" width="200" height="200"
       src="testresource.json">
     </amp-bodymovin-animation>
     <div id="stop" on="tap:anim.stop">Stop</div>`;
 
-  describes.integration('amp-bodymovin-animation iframe renders', {
-    body: bodymovinBody,
-    extensions,
-  }, unusedEnv => {
-    // TODO(nainar): Add test.
-  });
+    describes.integration(
+      'amp-bodymovin-animation iframe renders',
+      {
+        body: bodymovinBody,
+        extensions,
+      },
+      unusedEnv => {
+        // TODO(nainar): Add test.
+      }
+    );
 
-  describes.integration('amp-bodymovin-animation actions work', {
-    body: bodymovinBody,
-    extensions,
-  }, unusedEnv => {
-    // TODO(nainar): Add test.
-  });
+    describes.integration(
+      'amp-bodymovin-animation actions work',
+      {
+        body: bodymovinBody,
+        extensions,
+      },
+      unusedEnv => {
+        // TODO(nainar): Add test.
+      }
+    );
 
-  const bodymovinNoAutoplayBody = `
+    const bodymovinNoAutoplayBody = `
     <amp-bodymovin-animation id="anim"
       layout="fixed" width="200" height="200"
       src="testresource.json"
@@ -46,14 +57,18 @@ describe.configure().ifChrome().run('amp-bodymovin-animation', function() {
     <div id="play" on="tap:anim.play">Play</div>
     <div id="pause" on="tap:anim.pause">Pause</div>`;
 
-  describes.integration('amp-bodymovin-animation actions work', {
-    body: bodymovinNoAutoplayBody,
-    extensions,
-  }, unusedEnv => {
-    // TODO(nainar): Add test.
-  });
+    describes.integration(
+      'amp-bodymovin-animation actions work',
+      {
+        body: bodymovinNoAutoplayBody,
+        extensions,
+      },
+      unusedEnv => {
+        // TODO(nainar): Add test.
+      }
+    );
 
-  const bodymovinSeekToBody = `
+    const bodymovinSeekToBody = `
     <amp-bodymovin-animation id="anim"
       layout="fixed" width="200" height="200"
       src="testresource.json"
@@ -61,10 +76,14 @@ describe.configure().ifChrome().run('amp-bodymovin-animation', function() {
     </amp-bodymovin-animation>
     <div id="seekToHalf" on="tap:anim.seekTo(percent=0.5)">Seek to 1/2</div>`;
 
-  describes.integration('amp-bodymovin-animation actions work', {
-    body: bodymovinSeekToBody,
-    extensions,
-  }, unusedEnv => {
-    // TODO(nainar): Add test.
+    describes.integration(
+      'amp-bodymovin-animation actions work',
+      {
+        body: bodymovinSeekToBody,
+        extensions,
+      },
+      unusedEnv => {
+        // TODO(nainar): Add test.
+      }
+    );
   });
-});
diff --git a/extensions/amp-brid-player/0.1/amp-brid-player.js b/extensions/amp-brid-player/0.1/amp-brid-player.js
index 691ef1c4e8fa..bf761cd1a731 100644
--- a/extensions/amp-brid-player/0.1/amp-brid-player.js
+++ b/extensions/amp-brid-player/0.1/amp-brid-player.js
@@ -33,9 +33,7 @@ import {
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
 import {htmlFor} from '../../../src/static-template';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 const TAG = 'amp-brid-player';
@@ -44,7 +42,6 @@ const TAG = 'amp-brid-player';
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpBridPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -115,11 +112,18 @@ class AmpBridPlayer extends AMP.BaseElement {
     }
 
     //Create iframe
-    const src = 'https://services.brid.tv/services/iframe/' +
-        encodeURIComponent(feedType) +
-        '/' + encodeURIComponent(this.feedID_) +
-        '/' + encodeURIComponent(this.partnerID_) +
-        '/' + encodeURIComponent(this.playerID_) + '/0/' + itemsNum + '/?amp=1';
+    const src =
+      'https://services.brid.tv/services/iframe/' +
+      encodeURIComponent(feedType) +
+      '/' +
+      encodeURIComponent(this.feedID_) +
+      '/' +
+      encodeURIComponent(this.partnerID_) +
+      '/' +
+      encodeURIComponent(this.playerID_) +
+      '/0/' +
+      itemsNum +
+      '/?amp=1';
 
     this.videoIframeSrc_ = assertAbsoluteHttpOrHttpsUrl(src);
 
@@ -131,21 +135,25 @@ class AmpBridPlayer extends AMP.BaseElement {
     const {element} = this;
 
     this.partnerID_ = userAssert(
-        element.getAttribute('data-partner'),
-        'The data-partner attribute is required for <amp-brid-player> %s',
-        element);
+      element.getAttribute('data-partner'),
+      'The data-partner attribute is required for <amp-brid-player> %s',
+      element
+    );
 
-    this.playerID_ = userAssert(element.getAttribute('data-player'),
-        'The data-player attribute is required for <amp-brid-player> %s',
-        element);
+    this.playerID_ = userAssert(
+      element.getAttribute('data-player'),
+      'The data-player attribute is required for <amp-brid-player> %s',
+      element
+    );
 
     this.feedID_ = userAssert(
-        (element.getAttribute('data-video') ||
-            element.getAttribute('data-playlist') ||
-            element.getAttribute('data-outstream')),
-        'Either the data-video or the data-playlist or the data-outstream ' +
+      element.getAttribute('data-video') ||
+        element.getAttribute('data-playlist') ||
+        element.getAttribute('data-outstream'),
+      'Either the data-video or the data-playlist or the data-outstream ' +
         'attributes must be specified for <amp-brid-player> %s',
-        element);
+      element
+    );
 
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
@@ -162,13 +170,12 @@ class AmpBridPlayer extends AMP.BaseElement {
     this.iframe_ = /** @type {HTMLIFrameElement} */ (iframe);
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleBridMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleBridMessage_.bind(this)
     );
 
-    return this.loadPromise(iframe)
-        .then(() => this.playerReadyPromise_);
+    return this.loadPromise(iframe).then(() => this.playerReadyPromise_);
   }
 
   /** @override */
@@ -196,8 +203,10 @@ class AmpBridPlayer extends AMP.BaseElement {
   createPlaceholderCallback() {
     const {element} = this;
 
-    if (!element.hasAttribute('data-video') &&
-        !element.hasAttribute('data-playlist')) {
+    if (
+      !element.hasAttribute('data-video') &&
+      !element.hasAttribute('data-playlist')
+    ) {
       return;
     }
 
@@ -213,13 +222,15 @@ class AmpBridPlayer extends AMP.BaseElement {
     this.propagateAttributes(['aria-label'], placeholder);
     this.applyFillContent(placeholder);
 
-    placeholder.setAttribute('src',
-        `https://cdn.brid.tv/live/partners/${encodeURIComponent(partnerID)}` +
-        `/snapshot/${encodeURIComponent(feedID)}.jpg`);
+    placeholder.setAttribute(
+      'src',
+      `https://cdn.brid.tv/live/partners/${encodeURIComponent(partnerID)}` +
+        `/snapshot/${encodeURIComponent(feedID)}.jpg`
+    );
 
-    const altText = placeholder.hasAttribute('aria-label') ?
-      'Loading video - ' + placeholder.getAttribute('aria-label') :
-      'Loading video';
+    const altText = placeholder.hasAttribute('aria-label')
+      ? 'Loading video - ' + placeholder.getAttribute('aria-label')
+      : 'Loading video';
 
     placeholder.setAttribute('alt', altText);
 
@@ -233,12 +244,11 @@ class AmpBridPlayer extends AMP.BaseElement {
    * @private
    * */
   sendCommand_(command, opt_arg) {
-
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
         const args = opt_arg === undefined ? '' : '|' + opt_arg;
         const message = 'Brid|' + command + args;
-        this.iframe_.contentWindow./*OK*/postMessage(message, '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
   }
@@ -388,7 +398,6 @@ class AmpBridPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpBridPlayer);
 });
diff --git a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
index 30f76f52a8e1..37631b0bec76 100644
--- a/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
+++ b/extensions/amp-brid-player/0.1/test/test-amp-brid-player.js
@@ -19,100 +19,118 @@ import {Services} from '../../../../src/services';
 import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 
-
-describes.realWin('amp-brid-player', {
-  amp: {
-    extensions: ['amp-brid-player'],
+describes.realWin(
+  'amp-brid-player',
+  {
+    amp: {
+      extensions: ['amp-brid-player'],
+    },
   },
-}, env => {
-  let win, doc;
-  let timer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-  });
-
-  function getBridPlayer(attributes, opt_responsive) {
-    const bc = doc.createElement('amp-brid-player');
+  env => {
+    let win, doc;
+    let timer;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+    });
 
-    for (const key in attributes) {
-      bc.setAttribute(key, attributes[key]);
-    }
-    bc.setAttribute('width', '640');
-    bc.setAttribute('height', '360');
-    if (opt_responsive) {
-      bc.setAttribute('layout', 'responsive');
+    function getBridPlayer(attributes, opt_responsive) {
+      const bc = doc.createElement('amp-brid-player');
+
+      for (const key in attributes) {
+        bc.setAttribute(key, attributes[key]);
+      }
+      bc.setAttribute('width', '640');
+      bc.setAttribute('height', '360');
+      if (opt_responsive) {
+        bc.setAttribute('layout', 'responsive');
+      }
+
+      // see yt test implementation
+      timer.promise(50).then(() => {
+        const bridTimerIframe = bc.querySelector('iframe');
+
+        bc.implementation_.handleBridMessage_({
+          origin: 'https://services.brid.tv',
+          source: bridTimerIframe.contentWindow,
+          data: 'Brid|0|trigger|ready',
+        });
+      });
+      doc.body.appendChild(bc);
+      return bc
+        .build()
+        .then(() => {
+          bc.layoutCallback();
+        })
+        .then(() => bc);
     }
 
-    // see yt test implementation
-    timer.promise(50).then(() => {
-      const bridTimerIframe = bc.querySelector('iframe');
-
-      bc.implementation_.handleBridMessage_({
-        origin: 'https://services.brid.tv',
-        source: bridTimerIframe.contentWindow,
-        data: 'Brid|0|trigger|ready',
+    it('renders', () => {
+      return getBridPlayer({
+        'data-partner': '264',
+        'data-player': '4144',
+        'data-video': '13663',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://services.brid.tv/services/iframe/video/13663/264/4144/0/1/?amp=1'
+        );
       });
     });
-    doc.body.appendChild(bc);
-    return bc.build().then(() => { bc.layoutCallback(); }).then(() => bc);
-  }
-
-  it('renders', () => {
-    return getBridPlayer({
-      'data-partner': '264',
-      'data-player': '4144',
-      'data-video': '13663',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://services.brid.tv/services/iframe/video/13663/264/4144/0/1/?amp=1');
-    });
-  });
 
-  it('renders responsively', () => {
-    return getBridPlayer({
-      'data-partner': '1177',
-      'data-player': '979',
-      'data-video': '5204',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getBridPlayer(
+        {
+          'data-partner': '1177',
+          'data-player': '979',
+          'data-video': '5204',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-partner', () => {
-    return allowConsoleError(() => { return getBridPlayer({
-      'data-player': '4144',
-      'data-video': '13663',
-    }).should.eventually.be.rejectedWith(
-        /The data-partner attribute is required for/);
+    it('requires data-partner', () => {
+      return allowConsoleError(() => {
+        return getBridPlayer({
+          'data-player': '4144',
+          'data-video': '13663',
+        }).should.eventually.be.rejectedWith(
+          /The data-partner attribute is required for/
+        );
+      });
     });
-  });
 
-  it('requires data-player', () => {
-    return allowConsoleError(() => { return getBridPlayer({
-      'data-partner': '264',
-      'data-video': '13663',
-    }).should.eventually.be.rejectedWith(
-        /The data-player attribute is required for/);
+    it('requires data-player', () => {
+      return allowConsoleError(() => {
+        return getBridPlayer({
+          'data-partner': '264',
+          'data-video': '13663',
+        }).should.eventually.be.rejectedWith(
+          /The data-player attribute is required for/
+        );
+      });
     });
-  });
 
-  it('should forward events from brid-player to the amp element', () => {
-    return getBridPlayer({
-      'data-partner': '1177',
-      'data-player': '979',
-      'data-video': '5204',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-
-      return Promise.resolve()
+    it('should forward events from brid-player to the amp element', () => {
+      return getBridPlayer(
+        {
+          'data-partner': '1177',
+          'data-player': '979',
+          'data-video': '5204',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+
+        return Promise.resolve()
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.PLAYING);
             sendFakeMessage(bc, iframe, 'trigger|play');
@@ -133,62 +151,66 @@ describes.realWin('amp-brid-player', {
             sendFakeMessage(bc, iframe, 'volume|1');
             return p;
           });
+      });
     });
-  });
 
+    function sendFakeMessage(bc, iframe, command) {
+      bc.implementation_.handleBridMessage_({
+        origin: 'https://services.brid.tv',
+        source: iframe.contentWindow,
+        data: 'Brid|0|' + command,
+      });
+    }
 
-  function sendFakeMessage(bc, iframe, command) {
-    bc.implementation_.handleBridMessage_({
-      origin: 'https://services.brid.tv',
-      source: iframe.contentWindow,
-      data: 'Brid|0|' + command,
-    });
-  }
-
-  describe('createPlaceholderCallback', () => {
-    it('should create a placeholder image', () => {
-      return getBridPlayer({
-        'data-partner': '264',
-        'data-player': '979',
-        'data-video': '13663',
-      }).then(brid => {
-        const img = brid.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
-            'https://cdn.brid.tv/live/partners/264/snapshot/13663.jpg');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('alt')).to.equal('Loading video');
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+    describe('createPlaceholderCallback', () => {
+      it('should create a placeholder image', () => {
+        return getBridPlayer({
+          'data-partner': '264',
+          'data-player': '979',
+          'data-video': '13663',
+        }).then(brid => {
+          const img = brid.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
+            'https://cdn.brid.tv/live/partners/264/snapshot/13663.jpg'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('alt')).to.equal('Loading video');
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+        });
       });
-    });
-    it('should propagate aria label for placeholder image', () => {
-      return getBridPlayer({
-        'data-partner': '264',
-        'data-player': '979',
-        'data-video': '13663',
-        'aria-label': 'great video',
-      }).then(brid => {
-        const img = brid.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('alt')).to.equal('Loading video - great video');
+      it('should propagate aria label for placeholder image', () => {
+        return getBridPlayer({
+          'data-partner': '264',
+          'data-player': '979',
+          'data-video': '13663',
+          'aria-label': 'great video',
+        }).then(brid => {
+          const img = brid.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('alt')).to.equal(
+            'Loading video - great video'
+          );
+        });
       });
-    });
-    it('should create a fallback for default snapshot', () => {
-      return getBridPlayer({
-        'data-partner': '264',
-        'data-player': '979',
-        'data-video': '13663',
-      }).then(brid => {
-        const img = brid.querySelector('amp-img');
-        const fallbackImg = img.querySelector('amp-img');
-        expect(fallbackImg).to.not.be.null;
-        expect(fallbackImg.getAttribute('src')).to.equal(
-            'https://cdn.brid.tv/live/default/defaultSnapshot.png');
-        expect(fallbackImg.getAttribute('layout')).to.equal('fill');
-        expect(fallbackImg.hasAttribute('fallback')).to.be.true;
-        expect(fallbackImg.getAttribute('referrerpolicy')).to.equal('origin');
+      it('should create a fallback for default snapshot', () => {
+        return getBridPlayer({
+          'data-partner': '264',
+          'data-player': '979',
+          'data-video': '13663',
+        }).then(brid => {
+          const img = brid.querySelector('amp-img');
+          const fallbackImg = img.querySelector('amp-img');
+          expect(fallbackImg).to.not.be.null;
+          expect(fallbackImg.getAttribute('src')).to.equal(
+            'https://cdn.brid.tv/live/default/defaultSnapshot.png'
+          );
+          expect(fallbackImg.getAttribute('layout')).to.equal('fill');
+          expect(fallbackImg.hasAttribute('fallback')).to.be.true;
+          expect(fallbackImg.getAttribute('referrerpolicy')).to.equal('origin');
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-brightcove/0.1/amp-brightcove.js b/extensions/amp-brightcove/0.1/amp-brightcove.js
index e8785a592b88..5f58c60a8b05 100644
--- a/extensions/amp-brightcove/0.1/amp-brightcove.js
+++ b/extensions/amp-brightcove/0.1/amp-brightcove.js
@@ -35,19 +35,14 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
-
 /** @private @const {string} */
 const TAG = 'amp-brightcove';
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpBrightcove extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -118,12 +113,17 @@ class AmpBrightcove extends AMP.BaseElement {
     this.playerReadyResolver_ = deferred.resolve;
 
     // Warn if the player does not have video interface support
-    this.readyTimeout_ = /** @type {number} */ (
-      Services.timerFor(window).delay(() => {
-        user().warn(TAG,
-            'Did not receive ready callback from player %s.' +
-          ' Ensure it has the videojs-amp-support plugin.', this.playerId_);
-      }, 3000));
+    this.readyTimeout_ = /** @type {number} */ (Services.timerFor(window).delay(
+      () => {
+        user().warn(
+          TAG,
+          'Did not receive ready callback from player %s.' +
+            ' Ensure it has the videojs-amp-support plugin.',
+          this.playerId_
+        );
+      },
+      3000
+    ));
 
     this.playerReadyResolver_(this.iframe_);
   }
@@ -134,13 +134,11 @@ class AmpBrightcove extends AMP.BaseElement {
 
     this.iframe_ = iframe;
 
-    this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        e => this.handlePlayerMessage_(e));
+    this.unlistenMessage_ = listen(this.win, 'message', e =>
+      this.handlePlayerMessage_(e)
+    );
 
-    return this.loadPromise(iframe)
-        .then(() => this.playerReadyPromise_);
+    return this.loadPromise(iframe).then(() => this.playerReadyPromise_);
   }
 
   /**
@@ -154,10 +152,15 @@ class AmpBrightcove extends AMP.BaseElement {
       // We still need to check this.iframe_ as the component may have
       // been unlaid out by now.
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow. /*OK*/ postMessage(JSON.stringify(dict({
-          'command': command,
-          'args': arg,
-        })), 'https://players.brightcove.net');
+        this.iframe_.contentWindow./*OK*/ postMessage(
+          JSON.stringify(
+            dict({
+              'command': command,
+              'args': arg,
+            })
+          ),
+          'https://players.brightcove.net'
+        );
       }
     });
   }
@@ -209,21 +212,22 @@ class AmpBrightcove extends AMP.BaseElement {
       this.duration_ = data['dur'];
     }
 
-    if (redispatch(element, eventType, {
-      'ready': VideoEvents.LOAD,
-      'playing': VideoEvents.PLAYING,
-      'pause': VideoEvents.PAUSE,
-      'ended': VideoEvents.ENDED,
-      'ads-ad-started': VideoEvents.AD_START,
-      'ads-ad-ended': VideoEvents.AD_END,
-    })) {
+    if (
+      redispatch(element, eventType, {
+        'ready': VideoEvents.LOAD,
+        'playing': VideoEvents.PLAYING,
+        'pause': VideoEvents.PAUSE,
+        'ended': VideoEvents.ENDED,
+        'ads-ad-started': VideoEvents.AD_START,
+        'ads-ad-ended': VideoEvents.AD_END,
+      })
+    ) {
       return;
     }
 
     if (eventType === 'volumechange') {
       const muted = data['muted'];
-      if (muted == null ||
-          this.muted_ == muted) {
+      if (muted == null || this.muted_ == muted) {
         return;
       }
       this.muted_ = muted;
@@ -239,18 +243,20 @@ class AmpBrightcove extends AMP.BaseElement {
   onReady_(data) {
     this.hasAmpSupport_ = true;
 
-    Services.timerFor(this.win)
-        .cancel(this.readyTimeout_);
+    Services.timerFor(this.win).cancel(this.readyTimeout_);
 
     const {element} = this;
 
     installVideoManagerForDoc(element);
     Services.videoManagerForDoc(element).register(this);
 
-    dev().info(TAG,
-        'Player %s ready. ' +
+    dev().info(
+      TAG,
+      'Player %s ready. ' +
         'Brightcove Player version: %s AMP Support version: %s',
-        this.playerId_, data['bcVersion'], data['ampSupportVersion']
+      this.playerId_,
+      data['bcVersion'],
+      data['ampSupportVersion']
     );
   }
 
@@ -261,34 +267,34 @@ class AmpBrightcove extends AMP.BaseElement {
   getIframeSrc_() {
     const {element: el} = this;
     const account = userAssert(
-        el.getAttribute('data-account'),
-        'The data-account attribute is required for <amp-brightcove> %s',
-        el);
-    const embed = (el.getAttribute('data-embed') || 'default');
+      el.getAttribute('data-account'),
+      'The data-account attribute is required for <amp-brightcove> %s',
+      el
+    );
+    const embed = el.getAttribute('data-embed') || 'default';
 
-    this.playerId_ = (el.getAttribute('data-player') ||
+    this.playerId_ =
+      el.getAttribute('data-player') ||
       el.getAttribute('data-player-id') ||
-      'default');
+      'default';
 
     const src =
-        `https://players.brightcove.net/${encodeURIComponent(account)}` +
-        `/${encodeURIComponent(this.playerId_)}` +
-        `_${encodeURIComponent(embed)}/index.html` +
-        // These are encodeURIComponent'd in encodeId_().
-        (el.getAttribute('data-playlist-id') ?
-          '?playlistId=' + this.encodeId_(el.getAttribute('data-playlist-id')) :
-          (el.getAttribute('data-video-id') ?
-            '?videoId=' + this.encodeId_(el.getAttribute('data-video-id')) :
-            ''
-          )
-        );
+      `https://players.brightcove.net/${encodeURIComponent(account)}` +
+      `/${encodeURIComponent(this.playerId_)}` +
+      `_${encodeURIComponent(embed)}/index.html` +
+      // These are encodeURIComponent'd in encodeId_().
+      (el.getAttribute('data-playlist-id')
+        ? '?playlistId=' + this.encodeId_(el.getAttribute('data-playlist-id'))
+        : el.getAttribute('data-video-id')
+        ? '?videoId=' + this.encodeId_(el.getAttribute('data-video-id'))
+        : '');
 
     const customReferrer = el.getAttribute('data-referrer');
 
     if (customReferrer) {
       el.setAttribute(
-          'data-param-referrer',
-          this.urlReplacements_.expandUrlSync(customReferrer)
+        'data-param-referrer',
+        this.urlReplacements_.expandUrlSync(customReferrer)
       );
     }
 
@@ -305,9 +311,13 @@ class AmpBrightcove extends AMP.BaseElement {
     const embed = mutations['data-embed'];
     const playlistId = mutations['data-playlist-id'];
     const videoId = mutations['data-video-id'];
-    if (account !== undefined || playerId !== undefined ||
-      playlistId !== undefined || embed !== undefined ||
-      videoId !== undefined) {
+    if (
+      account !== undefined ||
+      playerId !== undefined ||
+      playlistId !== undefined ||
+      embed !== undefined ||
+      videoId !== undefined
+    ) {
       if (this.iframe_) {
         this.iframe_.src = this.getIframeSrc_();
       }
@@ -315,10 +325,10 @@ class AmpBrightcove extends AMP.BaseElement {
   }
 
   /**
-    * @param {string} id
-    * @return {string}
-    * @private
-    */
+   * @param {string} id
+   * @return {string}
+   * @private
+   */
   encodeId_(id) {
     /* id is either a Brightcove-assigned id, or a customer-generated
        reference id. reference ids are prefixed 'ref:' and the colon
@@ -331,8 +341,12 @@ class AmpBrightcove extends AMP.BaseElement {
 
   /** @override */
   pauseCallback() {
-    if (this.iframe_ && this.iframe_.contentWindow &&
-      this.hasAmpSupport_ && this.playing_) {
+    if (
+      this.iframe_ &&
+      this.iframe_.contentWindow &&
+      this.hasAmpSupport_ &&
+      this.playing_
+    ) {
       this.pause();
     }
   }
@@ -463,7 +477,6 @@ class AmpBrightcove extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpBrightcove);
 });
diff --git a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
index 803261c69160..20a9890ddcc2 100644
--- a/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
+++ b/extensions/amp-brightcove/0.1/test/test-amp-brightcove.js
@@ -19,174 +19,190 @@ import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 import {parseUrlDeprecated} from '../../../../src/url';
 
-
-describes.realWin('amp-brightcove', {
-  amp: {
-    extensions: ['amp-brightcove'],
+describes.realWin(
+  'amp-brightcove',
+  {
+    amp: {
+      extensions: ['amp-brightcove'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getBrightcove(attributes, opt_responsive) {
-    const bc = doc.createElement('amp-brightcove');
-    for (const key in attributes) {
-      bc.setAttribute(key, attributes[key]);
+  env => {
+    let win, doc;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
+
+    function getBrightcove(attributes, opt_responsive) {
+      const bc = doc.createElement('amp-brightcove');
+      for (const key in attributes) {
+        bc.setAttribute(key, attributes[key]);
+      }
+      bc.setAttribute('width', '111');
+      bc.setAttribute('height', '222');
+      if (opt_responsive) {
+        bc.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(bc);
+      return bc
+        .build()
+        .then(() => bc.layoutCallback())
+        .then(() => bc);
     }
-    bc.setAttribute('width', '111');
-    bc.setAttribute('height', '222');
-    if (opt_responsive) {
-      bc.setAttribute('layout', 'responsive');
+
+    function fakePostMessage(bc, info) {
+      bc.implementation_.handlePlayerMessage_({
+        origin: 'https://players.brightcove.net',
+        source: bc.querySelector('iframe').contentWindow,
+        data: JSON.stringify(info),
+      });
     }
-    doc.body.appendChild(bc);
-    return bc.build().then(() => bc.layoutCallback()).then(() => bc);
-  }
 
-  function fakePostMessage(bc, info) {
-    bc.implementation_.handlePlayerMessage_({
-      origin: 'https://players.brightcove.net',
-      source: bc.querySelector('iframe').contentWindow,
-      data: JSON.stringify(info),
+    it('renders', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://players.brightcove.net/1290862519001/default_default' +
+            '/index.html?videoId=ref:amp-test-video&playsinline=true'
+        );
+      });
     });
-  }
 
-  it('renders', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://players.brightcove.net/1290862519001/default_default' +
-          '/index.html?videoId=ref:amp-test-video&playsinline=true');
+    it('renders responsively', () => {
+      return getBrightcove(
+        {
+          'data-account': '1290862519001',
+          'data-video-id': 'ref:amp-test-video',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
-
-  it('renders responsively', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+
+    it('requires data-account', () => {
+      expectAsyncConsoleError(/The data-account attribute is required for/, 1);
+      return getBrightcove({}).should.eventually.be.rejectedWith(
+        /The data-account attribute is required for/
+      );
     });
-  });
-
-  it('requires data-account', () => {
-    expectAsyncConsoleError(/The data-account attribute is required for/, 1);
-    return getBrightcove({}).should.eventually.be.rejectedWith(
-        /The data-account attribute is required for/);
-  });
-
-  it('removes iframe after unlayoutCallback', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = bc.implementation_;
-      obj.unlayoutCallback();
-      expect(bc.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
+
+    it('removes iframe after unlayoutCallback', () => {
+      return getBrightcove(
+        {
+          'data-account': '1290862519001',
+          'data-video-id': 'ref:amp-test-video',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = bc.implementation_;
+        obj.unlayoutCallback();
+        expect(bc.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+      });
     });
-  });
-
-  it('should pass data-param-* attributes to the iframe src', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-      'data-param-my-param': 'hello world',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      const params = parseUrlDeprecated(iframe.src).search.split('&');
-      expect(params).to.contain('myParam=hello%20world');
+
+    it('should pass data-param-* attributes to the iframe src', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+        'data-param-my-param': 'hello world',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        const params = parseUrlDeprecated(iframe.src).search.split('&');
+        expect(params).to.contain('myParam=hello%20world');
+      });
     });
-  });
 
-  it('should propagate mutated attributes', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
+    it('should propagate mutated attributes', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
 
-      expect(iframe.src).to.equal(
+        expect(iframe.src).to.equal(
           'https://players.brightcove.net/1290862519001/default_default' +
-          '/index.html?videoId=ref:amp-test-video&playsinline=true');
+            '/index.html?videoId=ref:amp-test-video&playsinline=true'
+        );
 
-      bc.setAttribute('data-account', '12345');
-      bc.setAttribute('data-video-id', 'abcdef');
-      bc.mutatedAttributesCallback({
-        'data-account': '12345',
-        'data-video-id': 'abcdef',
-      });
+        bc.setAttribute('data-account', '12345');
+        bc.setAttribute('data-video-id', 'abcdef');
+        bc.mutatedAttributesCallback({
+          'data-account': '12345',
+          'data-video-id': 'abcdef',
+        });
 
-      expect(iframe.src).to.equal('https://players.brightcove.net/' +
-          '12345/default_default/index.html?videoId=abcdef&playsinline=true');
+        expect(iframe.src).to.equal(
+          'https://players.brightcove.net/' +
+            '12345/default_default/index.html?videoId=abcdef&playsinline=true'
+        );
+      });
     });
-  });
-
-  it('should give precedence to playlist id', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-      'data-playlist-id': 'ref:test-playlist',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-
-      expect(iframe.src).to.contain('playlistId=ref:test-playlist');
-      expect(iframe.src).not.to.contain('videoId');
+
+    it('should give precedence to playlist id', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+        'data-playlist-id': 'ref:test-playlist',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+
+        expect(iframe.src).to.contain('playlistId=ref:test-playlist');
+        expect(iframe.src).not.to.contain('videoId');
+      });
     });
-  });
 
-  it('should allow both playlist and video id to be unset', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
+    it('should allow both playlist and video id to be unset', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
 
-      expect(iframe.src).not.to.contain('&playlistId');
-      expect(iframe.src).not.to.contain('&videoId');
+        expect(iframe.src).not.to.contain('&playlistId');
+        expect(iframe.src).not.to.contain('&videoId');
+      });
     });
-  });
 
-  it('should pass referrer', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-referrer': 'COUNTER',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
+    it('should pass referrer', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-referrer': 'COUNTER',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
 
-      expect(iframe.src).to.contain('referrer=1');
+        expect(iframe.src).to.contain('referrer=1');
+      });
     });
-  });
 
-  it('should force playsinline', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-      'data-param-playsinline': 'false',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
+    it('should force playsinline', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+        'data-param-playsinline': 'false',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
 
-      expect(iframe.src).to.contain('playsinline=true');
+        expect(iframe.src).to.contain('playsinline=true');
+      });
     });
-  });
-
-  it('should forward events', () => {
-    return getBrightcove({
-      'data-account': '1290862519001',
-      'data-video-id': 'ref:amp-test-video',
-    }).then(bc => {
-      return Promise.resolve()
+
+    it('should forward events', () => {
+      return getBrightcove({
+        'data-account': '1290862519001',
+        'data-video-id': 'ref:amp-test-video',
+      }).then(bc => {
+        return Promise.resolve()
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.LOAD);
             fakePostMessage(bc, {event: 'ready', muted: false, playing: false});
@@ -194,32 +210,47 @@ describes.realWin('amp-brightcove', {
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.AD_START);
-            fakePostMessage(bc,
-                {event: 'ads-ad-started', muted: false, playing: false});
+            fakePostMessage(bc, {
+              event: 'ads-ad-started',
+              muted: false,
+              playing: false,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.AD_END);
-            fakePostMessage(bc,
-                {event: 'ads-ad-ended', muted: false, playing: false});
+            fakePostMessage(bc, {
+              event: 'ads-ad-ended',
+              muted: false,
+              playing: false,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.PLAYING);
-            fakePostMessage(bc,
-                {event: 'playing', muted: false, playing: true});
+            fakePostMessage(bc, {
+              event: 'playing',
+              muted: false,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.MUTED);
-            fakePostMessage(bc,
-                {event: 'volumechange', muted: true, playing: true});
+            fakePostMessage(bc, {
+              event: 'volumechange',
+              muted: true,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.UNMUTED);
-            fakePostMessage(bc,
-                {event: 'volumechange', muted: false, playing: true});
+            fakePostMessage(bc, {
+              event: 'volumechange',
+              muted: false,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
@@ -232,6 +263,7 @@ describes.realWin('amp-brightcove', {
             fakePostMessage(bc, {event: 'ended', muted: false, playing: false});
             return p;
           });
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-byside-content/0.1/amp-byside-content.js b/extensions/amp-byside-content/0.1/amp-byside-content.js
index 3f566d6fae6d..561117df387b 100644
--- a/extensions/amp-byside-content/0.1/amp-byside-content.js
+++ b/extensions/amp-byside-content/0.1/amp-byside-content.js
@@ -65,7 +65,6 @@ const DEFAULT_LANG_ = 'pt';
 let iframeCount_ = 0;
 
 export class AmpBysideContent extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -111,9 +110,11 @@ export class AmpBysideContent extends AMP.BaseElement {
 
     /** @const {function()} */
     this.boundUpdateSize_ = debounce(
-        this.win, data => {
-          this.updateSize_(/** @type {Object} */ (data));
-        }, 100
+      this.win,
+      data => {
+        this.updateSize_(/** @type {Object} */ (data));
+      },
+      100
     );
   }
 
@@ -135,28 +136,28 @@ export class AmpBysideContent extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.webcareId_ = userAssert(
-        this.element.getAttribute('data-webcare-id'),
-        'The data-webcare-id attribute is required for <%s> %s',
-        TAG_,
-        this.element
+      this.element.getAttribute('data-webcare-id'),
+      'The data-webcare-id attribute is required for <%s> %s',
+      TAG_,
+      this.element
     );
 
     this.label_ = userAssert(
-        this.element.getAttribute('data-label'),
-        'The data-label attribute is required for <%s> %s',
-        TAG_,
-        this.element
+      this.element.getAttribute('data-label'),
+      'The data-label attribute is required for <%s> %s',
+      TAG_,
+      this.element
     );
 
-    this.webcareZone_ = (this.element.getAttribute('data-webcare-zone') ||
-        DEFAULT_WEBCARE_ZONE_);
-    this.channel_ = (this.element.getAttribute('data-channel') || '');
-    this.lang_ = (this.element.getAttribute('data-lang') || DEFAULT_LANG_);
-    this.fid_ = (this.element.getAttribute('data-fid') || '');
+    this.webcareZone_ =
+      this.element.getAttribute('data-webcare-zone') || DEFAULT_WEBCARE_ZONE_;
+    this.channel_ = this.element.getAttribute('data-channel') || '';
+    this.lang_ = this.element.getAttribute('data-lang') || DEFAULT_LANG_;
+    this.fid_ = this.element.getAttribute('data-fid') || '';
 
     this.origin_ = this.composeOrigin_();
-    this.baseUrl_ = this.origin_ + '/BWA' +
-        encodeURIComponent(this.webcareId_) + '/amp/';
+    this.baseUrl_ =
+      this.origin_ + '/BWA' + encodeURIComponent(this.webcareId_) + '/amp/';
   }
 
   /** @override */
@@ -183,8 +184,8 @@ export class AmpBysideContent extends AMP.BaseElement {
     iframe.setAttribute('allowtransparency', 'true');
     iframe.setAttribute('allowfullscreen', 'true');
     iframe.setAttribute(
-        'sandbox',
-        'allow-scripts allow-same-origin allow-popups'
+      'sandbox',
+      'allow-scripts allow-same-origin allow-popups'
     );
 
     setStyles(iframe, {
@@ -194,30 +195,33 @@ export class AmpBysideContent extends AMP.BaseElement {
     this.element.appendChild(this.getOverflowElement_());
     this.applyFillContent(iframe);
 
-    return this.composeSrcUrl_().then(src => {
-      this.iframeSrc_ = assertHttpsUrl(src, this.element, this.getName_());
-      iframe.src = this.iframeSrc_;
+    return this.composeSrcUrl_()
+      .then(src => {
+        this.iframeSrc_ = assertHttpsUrl(src, this.element, this.getName_());
+        iframe.src = this.iframeSrc_;
 
-      const unlisten = listenFor(iframe, 'embed-size', this.boundUpdateSize_);
-      this.unlisteners_.push(unlisten);
+        const unlisten = listenFor(iframe, 'embed-size', this.boundUpdateSize_);
+        this.unlisteners_.push(unlisten);
 
-      this.element.appendChild(iframe);
+        this.element.appendChild(iframe);
 
-      return (this.iframePromise_ = this.loadPromise(iframe));
-    }).then(() => {
-      this.getVsync().mutate(() => {
-        setStyles(iframe, {
-          'opacity': 1,
+        return (this.iframePromise_ = this.loadPromise(iframe));
+      })
+      .then(() => {
+        this.getVsync().mutate(() => {
+          setStyles(iframe, {
+            'opacity': 1,
+          });
         });
       });
-    });
   }
 
   /** @private */
   composeOrigin_() {
-    const subDomain = this.webcareZone_ === MAIN_WEBCARE_ZONE_ ?
-      MAIN_WEBCARE_ZONE_SUBDOMAIN_ :
-      this.webcareZone_;
+    const subDomain =
+      this.webcareZone_ === MAIN_WEBCARE_ZONE_
+        ? MAIN_WEBCARE_ZONE_SUBDOMAIN_
+        : this.webcareZone_;
 
     return 'https://' + encodeURIComponent(subDomain) + '.' + BYSIDE_DOMAIN_;
   }
@@ -231,7 +235,7 @@ export class AmpBysideContent extends AMP.BaseElement {
       'bwch': this.channel_ || '',
       'lang': this.lang_ || '',
       'fid': this.fid_ || '',
-      'bwit': (this.fid_ ? 'I' : 'A'),
+      'bwit': this.fid_ ? 'I' : 'A',
       'tuid': 'CLIENT_ID(byside_webcare_tuid)',
       'suid': '',
       'puid': 'PAGE_VIEW_IDpTIMESTAMP',
@@ -272,16 +276,28 @@ export class AmpBysideContent extends AMP.BaseElement {
    */
   getOverflowElement_() {
     const doc = /** @type {!Document} */ (this.element.ownerDocument);
-    const overflow = createElementWithAttributes(doc, 'div', dict({
-      'class': 'i-amphtml-byside-content-overflow',
-      'overflow': '',
-    }));
-    const overflowContent = createElementWithAttributes(doc, 'div', dict({
-      'class': 'i-amphtml-byside-content-overflow-content',
-    }));
-    const arrow = createElementWithAttributes(doc, 'div', dict({
-      'class': 'i-amphtml-byside-content-arrow-down',
-    }));
+    const overflow = createElementWithAttributes(
+      doc,
+      'div',
+      dict({
+        'class': 'i-amphtml-byside-content-overflow',
+        'overflow': '',
+      })
+    );
+    const overflowContent = createElementWithAttributes(
+      doc,
+      'div',
+      dict({
+        'class': 'i-amphtml-byside-content-overflow-content',
+      })
+    );
+    const arrow = createElementWithAttributes(
+      doc,
+      'div',
+      dict({
+        'class': 'i-amphtml-byside-content-arrow-down',
+      })
+    );
     overflowContent.appendChild(arrow);
     overflow.appendChild(overflowContent);
 
@@ -291,12 +307,20 @@ export class AmpBysideContent extends AMP.BaseElement {
   /** @return {!Element} @private */
   createBySideLoader_() {
     const doc = /** @type {!Document} */ (this.element.ownerDocument);
-    const loadingContainer = createElementWithAttributes(doc, 'div', dict({
-      'class': 'i-amphtml-byside-content-loading-container',
-    }));
-    const loadingAnimation = createElementWithAttributes(doc, 'div', dict({
-      'class': 'i-amphtml-byside-content-loading-animation',
-    }));
+    const loadingContainer = createElementWithAttributes(
+      doc,
+      'div',
+      dict({
+        'class': 'i-amphtml-byside-content-loading-container',
+      })
+    );
+    const loadingAnimation = createElementWithAttributes(
+      doc,
+      'div',
+      dict({
+        'class': 'i-amphtml-byside-content-loading-animation',
+      })
+    );
     loadingContainer.appendChild(loadingAnimation);
 
     return loadingContainer;
@@ -316,33 +340,41 @@ export class AmpBysideContent extends AMP.BaseElement {
       const height = parseInt(data['height'], 10);
       if (!isNaN(height)) {
         newHeight = Math.max(
-            height + (this.element./*OK*/offsetHeight
-            - this.iframe_./*OK*/offsetHeight),
-            height);
+          height +
+            (this.element./*OK*/ offsetHeight -
+              this.iframe_./*OK*/ offsetHeight),
+          height
+        );
       }
 
       const width = parseInt(data['width'], 10);
       if (!isNaN(width)) {
         newWidth = Math.max(
-            width + (this.element./*OK*/offsetWidth
-              - this.iframe_./*OK*/offsetWidth),
-            width);
+          width +
+            (this.element./*OK*/ offsetWidth - this.iframe_./*OK*/ offsetWidth),
+          width
+        );
       }
 
       if (newHeight !== undefined || newWidth !== undefined) {
-        this.attemptChangeSize(newHeight, newWidth).then(() => {
-          if (newHeight !== undefined) {
-            this.element.setAttribute('height', newHeight);
-          }
-          if (newWidth !== undefined) {
-            this.element.setAttribute('width', newWidth);
-          }
-        }, () => {});
+        this.attemptChangeSize(newHeight, newWidth).then(
+          () => {
+            if (newHeight !== undefined) {
+              this.element.setAttribute('height', newHeight);
+            }
+            if (newWidth !== undefined) {
+              this.element.setAttribute('width', newWidth);
+            }
+          },
+          () => {}
+        );
       } else {
-        user().warn(TAG_,
-            'Ignoring embed-size request because '
-            + 'no width or height value is provided',
-            this.element);
+        user().warn(
+          TAG_,
+          'Ignoring embed-size request because ' +
+            'no width or height value is provided',
+          this.element
+        );
       }
     });
   }
diff --git a/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js b/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js
index d71b1b008322..3ebe84906e8f 100644
--- a/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js
+++ b/extensions/amp-byside-content/0.1/test/test-amp-byside-content.js
@@ -17,173 +17,184 @@
 import '../amp-byside-content';
 import {mockServiceForDoc} from '../../../../testing/test-helper';
 
-describes.realWin('amp-byside-content', {
-  amp: {
-    extensions: ['amp-byside-content'],
+describes.realWin(
+  'amp-byside-content',
+  {
+    amp: {
+      extensions: ['amp-byside-content'],
+    },
+    ampAdCss: true,
   },
-  ampAdCss: true,
-}, env => {
-  let win, doc, urlMock;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    urlMock = mockServiceForDoc(sandbox, env.ampdoc, 'url-replace', [
-      'expandUrlAsync',
-    ]);
-  });
-
-  function getElement(attributes, opt_responsive, opt_beforeLayoutCallback) {
-    const elem = doc.createElement('amp-byside-content');
-
-    for (const key in attributes) {
-      elem.setAttribute(key, attributes[key]);
-    }
+  env => {
+    let win, doc, urlMock;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      urlMock = mockServiceForDoc(sandbox, env.ampdoc, 'url-replace', [
+        'expandUrlAsync',
+      ]);
+    });
 
-    elem.setAttribute('width', '640');
-    elem.setAttribute('height', '360');
-    if (opt_responsive) {
-      elem.setAttribute('layout', 'responsive');
-    }
+    function getElement(attributes, opt_responsive, opt_beforeLayoutCallback) {
+      const elem = doc.createElement('amp-byside-content');
 
-    doc.body.appendChild(elem);
-    return elem.build().then(() => {
-      urlMock.expandUrlAsync
-          .returns(Promise.resolve(elem.implementation_.baseUrl_))
-          .withArgs(sinon.match.any);
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(elem);
+      for (const key in attributes) {
+        elem.setAttribute(key, attributes[key]);
       }
 
-      return elem.layoutCallback();
-    }).then(() => elem);
-  }
+      elem.setAttribute('width', '640');
+      elem.setAttribute('height', '360');
+      if (opt_responsive) {
+        elem.setAttribute('layout', 'responsive');
+      }
 
-  function testIframe(elem) {
-    const iframe = elem.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.getAttribute('frameborder')).to.equal('0');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-    expect(iframe.fakeSrc).to.satisfy(src => {
-      return src.startsWith(elem.implementation_.baseUrl_);
-    });
-  }
+      doc.body.appendChild(elem);
+      return elem
+        .build()
+        .then(() => {
+          urlMock.expandUrlAsync
+            .returns(Promise.resolve(elem.implementation_.baseUrl_))
+            .withArgs(sinon.match.any);
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(elem);
+          }
+
+          return elem.layoutCallback();
+        })
+        .then(() => elem);
+    }
 
-  it('renders', () => {
-    return getElement({
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'amp-simple',
-    }).then(elem => {
-      testIframe(elem);
+    function testIframe(elem) {
+      const iframe = elem.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.getAttribute('frameborder')).to.equal('0');
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      expect(iframe.fakeSrc).to.satisfy(src => {
+        return src.startsWith(elem.implementation_.baseUrl_);
+      });
+    }
+
+    it('renders', () => {
+      return getElement({
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'amp-simple',
+      }).then(elem => {
+        testIframe(elem);
+      });
     });
-  });
 
-  it('requires data-label', () => {
-    return allowConsoleError(() => { return getElement({
-      'data-webcare-id': 'D6604AE5D0',
-    }).should.eventually.be.rejectedWith(
-        /The data-label attribute is required for/);
+    it('requires data-label', () => {
+      return allowConsoleError(() => {
+        return getElement({
+          'data-webcare-id': 'D6604AE5D0',
+        }).should.eventually.be.rejectedWith(
+          /The data-label attribute is required for/
+        );
+      });
     });
-  });
 
-  it('requires data-webcare-id', () => {
-    return allowConsoleError(() => { return getElement({
-      'data-label': 'placeholder-label',
-    }).should.eventually.be.rejectedWith(
-        /The data-webcare-id attribute is required for/);
+    it('requires data-webcare-id', () => {
+      return allowConsoleError(() => {
+        return getElement({
+          'data-label': 'placeholder-label',
+        }).should.eventually.be.rejectedWith(
+          /The data-webcare-id attribute is required for/
+        );
+      });
     });
-  });
-
-  it('generates correct default origin', () => {
-    return getElement({
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-    }).then(elem => {
-      expect(elem.implementation_.origin_).to.equal(
+
+    it('generates correct default origin', () => {
+      return getElement({
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+      }).then(elem => {
+        expect(elem.implementation_.origin_).to.equal(
           'https://webcare.byside.com'
-      );
+        );
+      });
     });
-  });
 
-  it('generates correct provided webcare zone', () => {
-    const webcareZone = 'sa1';
+    it('generates correct provided webcare zone', () => {
+      const webcareZone = 'sa1';
 
-    return getElement({
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-      'data-webcare-zone': webcareZone,
-    }).then(elem => {
-      expect(elem.implementation_.origin_).to.equal(
+      return getElement({
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+        'data-webcare-zone': webcareZone,
+      }).then(elem => {
+        expect(elem.implementation_.origin_).to.equal(
           'https://' + webcareZone + '.byside.com'
-      );
+        );
+      });
     });
-  });
-
-  it('should create a loading animation', () => {
-    return getElement({
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-    }).then(elem => {
-      const loader = elem.querySelector(
+
+    it('should create a loading animation', () => {
+      return getElement({
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+      }).then(elem => {
+        const loader = elem.querySelector(
           '.i-amphtml-byside-content-loading-animation'
-      );
-      expect(loader).to.not.be.null;
+        );
+        expect(loader).to.not.be.null;
+      });
     });
-  });
 
-  it('builds a placeholder loading animation without inserting iframe', () => {
-    const attributes = {
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-    };
+    it('builds a placeholder loading animation without inserting iframe', () => {
+      const attributes = {
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+      };
 
-    return getElement(attributes, true, elem => {
-      const placeholder = elem.querySelector('[placeholder]');
-      const iframe = elem.querySelector('iframe');
-      expect(iframe).to.be.null;
-      expect(placeholder).to.not.have.display('none');
-    }).then(elem => {
-      const placeholder = elem.querySelector('[placeholder]');
-      elem.getVsync = () => {
-        return {
-          mutate: fn => fn(),
+      return getElement(attributes, true, elem => {
+        const placeholder = elem.querySelector('[placeholder]');
+        const iframe = elem.querySelector('iframe');
+        expect(iframe).to.be.null;
+        expect(placeholder).to.not.have.display('none');
+      }).then(elem => {
+        const placeholder = elem.querySelector('[placeholder]');
+        elem.getVsync = () => {
+          return {
+            mutate: fn => fn(),
+          };
         };
-      };
 
-      // test iframe
-      testIframe(elem);
+        // test iframe
+        testIframe(elem);
 
-      // test placeholder too
-      elem.implementation_.iframePromise_.then(() => {
-        expect(placeholder).to.have.display('none');
+        // test placeholder too
+        elem.implementation_.iframePromise_.then(() => {
+          expect(placeholder).to.have.display('none');
+        });
       });
     });
-  });
 
-  it('passes down sandbox attribute to iframe', () => {
-    const sandbox = 'allow-scripts allow-same-origin allow-popups';
-    const attributes = {
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-    };
+    it('passes down sandbox attribute to iframe', () => {
+      const sandbox = 'allow-scripts allow-same-origin allow-popups';
+      const attributes = {
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+      };
 
-    return getElement(attributes, false).then(elem => {
-      const iframe = elem.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.getAttribute('sandbox')).to.equal(sandbox);
+      return getElement(attributes, false).then(elem => {
+        const iframe = elem.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.getAttribute('sandbox')).to.equal(sandbox);
+      });
     });
-  });
 
-  it('sets scrollable atribute in iframe', () => {
-    const attributes = {
-      'data-webcare-id': 'D6604AE5D0',
-      'data-label': 'placeholder-label',
-    };
+    it('sets scrollable atribute in iframe', () => {
+      const attributes = {
+        'data-webcare-id': 'D6604AE5D0',
+        'data-label': 'placeholder-label',
+      };
 
-    return getElement(attributes, false).then(elem => {
-      const iframe = elem.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.getAttribute('scrolling')).to.equal('no');
+      return getElement(attributes, false).then(elem => {
+        const iframe = elem.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.getAttribute('scrolling')).to.equal('no');
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-call-tracking/0.1/amp-call-tracking.js b/extensions/amp-call-tracking/0.1/amp-call-tracking.js
index 1a8e34ca9e0b..3a3dc08e0e7e 100644
--- a/extensions/amp-call-tracking/0.1/amp-call-tracking.js
+++ b/extensions/amp-call-tracking/0.1/amp-call-tracking.js
@@ -19,14 +19,12 @@ import {Services} from '../../../src/services';
 import {assertHttpsUrl} from '../../../src/url';
 import {user, userAssert} from '../../../src/log';
 
-
 /**
  * Bookkeeps all unique URL requests so that no URL is called twice.
  * @type {!Object<string, !Promise>}
  */
 let cachedResponsePromises_ = {};
 
-
 /**
  * Fetches vendor response.
  * @param {!Window} win
@@ -36,25 +34,22 @@ let cachedResponsePromises_ = {};
 function fetch_(win, url) {
   if (!(url in cachedResponsePromises_)) {
     cachedResponsePromises_[url] = Services.xhrFor(win)
-        .fetchJson(url, {credentials: 'include'})
-        .then(res => res.json());
+      .fetchJson(url, {credentials: 'include'})
+      .then(res => res.json());
   }
   return cachedResponsePromises_[url];
 }
 
-
 /** @visibleForTesting */
 export function clearResponseCacheForTesting() {
   cachedResponsePromises_ = {};
 }
 
-
 /**
  * Implementation of `amp-call-tracking` component. See
  * {@link ../amp-call-tracking.md} for the spec.
  */
 export class AmpCallTracking extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -74,7 +69,9 @@ export class AmpCallTracking extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.configUrl_ = assertHttpsUrl(
-        this.element.getAttribute('config'), this.element);
+      this.element.getAttribute('config'),
+      this.element
+    );
 
     this.hyperlink_ = this.element.firstElementChild;
   }
@@ -82,21 +79,22 @@ export class AmpCallTracking extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     return Services.urlReplacementsForDoc(this.element)
-        .expandUrlAsync(user().assertString(this.configUrl_))
-        .then(url => fetch_(this.win, url))
-        .then(data => {
-          userAssert('phoneNumber' in data,
-              'Response must contain a non-empty phoneNumber field %s',
-              this.element);
-
-          this.hyperlink_.setAttribute('href', `tel:${data['phoneNumber']}`);
-          this.hyperlink_.textContent = data['formattedPhoneNumber']
-            || data['phoneNumber'];
-        });
+      .expandUrlAsync(user().assertString(this.configUrl_))
+      .then(url => fetch_(this.win, url))
+      .then(data => {
+        userAssert(
+          'phoneNumber' in data,
+          'Response must contain a non-empty phoneNumber field %s',
+          this.element
+        );
+
+        this.hyperlink_.setAttribute('href', `tel:${data['phoneNumber']}`);
+        this.hyperlink_.textContent =
+          data['formattedPhoneNumber'] || data['phoneNumber'];
+      });
   }
 }
 
-
 AMP.extension('amp-call-tracking', '0.1', AMP => {
   AMP.registerElement('amp-call-tracking', AmpCallTracking);
 });
diff --git a/extensions/amp-call-tracking/0.1/test/test-amp-call-tracking.js b/extensions/amp-call-tracking/0.1/test/test-amp-call-tracking.js
index 4ea093fd8946..30f626dae49d 100644
--- a/extensions/amp-call-tracking/0.1/test/test-amp-call-tracking.js
+++ b/extensions/amp-call-tracking/0.1/test/test-amp-call-tracking.js
@@ -18,113 +18,126 @@ import '../amp-call-tracking';
 import {Services} from '../../../../src/services';
 import {clearResponseCacheForTesting} from '../amp-call-tracking';
 
-
-describes.realWin('amp-call-tracking', {
-  amp: {
-    extensions: ['amp-call-tracking'],
+describes.realWin(
+  'amp-call-tracking',
+  {
+    amp: {
+      extensions: ['amp-call-tracking'],
+    },
   },
-}, env => {
-  let win, doc;
-  let xhrMock;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    xhrMock = sandbox.mock(Services.xhrFor(win));
-  });
+  env => {
+    let win, doc;
+    let xhrMock;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      xhrMock = sandbox.mock(Services.xhrFor(win));
+    });
 
-  afterEach(() => {
-    clearResponseCacheForTesting();
-    xhrMock.verify();
-  });
+    afterEach(() => {
+      clearResponseCacheForTesting();
+      xhrMock.verify();
+    });
 
-  function getCallTrackingEl(config = {}) {
-    const hyperlink = doc.createElement('a');
-    const callTrackingEl = doc.createElement('amp-call-tracking');
+    function getCallTrackingEl(config = {}) {
+      const hyperlink = doc.createElement('a');
+      const callTrackingEl = doc.createElement('amp-call-tracking');
 
-    callTrackingEl.setAttribute('config', config.url);
+      callTrackingEl.setAttribute('config', config.url);
 
-    hyperlink.setAttribute('href', `tel:${config.defaultNumber}`);
-    hyperlink.textContent = config.defaultContent || config.defaultNumber;
+      hyperlink.setAttribute('href', `tel:${config.defaultNumber}`);
+      hyperlink.textContent = config.defaultContent || config.defaultNumber;
 
-    callTrackingEl.appendChild(hyperlink);
+      callTrackingEl.appendChild(hyperlink);
 
-    doc.body.appendChild(callTrackingEl);
-    return callTrackingEl.build().then(() => {
-      return callTrackingEl.layoutCallback();
-    }).then(() => callTrackingEl);
-  }
+      doc.body.appendChild(callTrackingEl);
+      return callTrackingEl
+        .build()
+        .then(() => {
+          return callTrackingEl.layoutCallback();
+        })
+        .then(() => callTrackingEl);
+    }
 
-  function mockXhrResponse(url, response) {
-    xhrMock
+    function mockXhrResponse(url, response) {
+      xhrMock
         .expects('fetchJson')
         .withArgs(url, sandbox.match(init => init.credentials == 'include'))
-        .returns(Promise.resolve({
-          json() {
-            return Promise.resolve(response);
-          },
-        }));
-  }
-
-  function expectHyperlinkToBe(callTrackingEl, href, textContent) {
-    const hyperlink = callTrackingEl.getRealChildren()[0];
-
-    expect(hyperlink.getAttribute('href')).to.equal(href);
-    expect(hyperlink.textContent).to.equal(textContent);
-  }
-
-  it('should render with required response fields', () => {
-    const url = 'https://example.com/test.json';
-
-    const defaultNumber = '123456';
-    const defaultContent = '+1 (23) 456';
-
-    const phoneNumber = '981234';
-
-    mockXhrResponse(url, {phoneNumber});
-
-    return getCallTrackingEl({
-      url,
-      defaultNumber,
-      defaultContent,
-    }).then(callTrackingEl => {
-      expectHyperlinkToBe(callTrackingEl, `tel:${phoneNumber}`, phoneNumber);
+        .returns(
+          Promise.resolve({
+            json() {
+              return Promise.resolve(response);
+            },
+          })
+        );
+    }
+
+    function expectHyperlinkToBe(callTrackingEl, href, textContent) {
+      const hyperlink = callTrackingEl.getRealChildren()[0];
+
+      expect(hyperlink.getAttribute('href')).to.equal(href);
+      expect(hyperlink.textContent).to.equal(textContent);
+    }
+
+    it('should render with required response fields', () => {
+      const url = 'https://example.com/test.json';
+
+      const defaultNumber = '123456';
+      const defaultContent = '+1 (23) 456';
+
+      const phoneNumber = '981234';
+
+      mockXhrResponse(url, {phoneNumber});
+
+      return getCallTrackingEl({
+        url,
+        defaultNumber,
+        defaultContent,
+      }).then(callTrackingEl => {
+        expectHyperlinkToBe(callTrackingEl, `tel:${phoneNumber}`, phoneNumber);
+      });
     });
-  });
 
-  it('should use all response fields to compose hyperlink', () => {
-    const url = 'https://example.com/test.json';
+    it('should use all response fields to compose hyperlink', () => {
+      const url = 'https://example.com/test.json';
 
-    const defaultNumber = '123456';
-    const defaultContent = '+1 (23) 456';
+      const defaultNumber = '123456';
+      const defaultContent = '+1 (23) 456';
 
-    const phoneNumber = '187654321';
-    const formattedPhoneNumber = '+1 (87) 654-321';
+      const phoneNumber = '187654321';
+      const formattedPhoneNumber = '+1 (87) 654-321';
 
-    mockXhrResponse(url, {phoneNumber, formattedPhoneNumber});
+      mockXhrResponse(url, {phoneNumber, formattedPhoneNumber});
 
-    return getCallTrackingEl({
-      url,
-      defaultNumber,
-      defaultContent,
-    }).then(callTrackingEl => {
-      expectHyperlinkToBe(
-          callTrackingEl, `tel:${phoneNumber}`, formattedPhoneNumber);
+      return getCallTrackingEl({
+        url,
+        defaultNumber,
+        defaultContent,
+      }).then(callTrackingEl => {
+        expectHyperlinkToBe(
+          callTrackingEl,
+          `tel:${phoneNumber}`,
+          formattedPhoneNumber
+        );
+      });
     });
-  });
 
-  it('should fail when response does not contain a phoneNumber field', () => {
-    const url = 'https://example.com/test.json';
+    it('should fail when response does not contain a phoneNumber field', () => {
+      const url = 'https://example.com/test.json';
 
-    const defaultNumber = '123456';
-    const defaultContent = '+1 (23) 456';
+      const defaultNumber = '123456';
+      const defaultContent = '+1 (23) 456';
 
-    mockXhrResponse(url, {});
+      mockXhrResponse(url, {});
 
-    return expect(getCallTrackingEl({
-      url,
-      defaultNumber,
-      defaultContent,
-    })).rejectedWith(/Response must contain a non-empty phoneNumber field/);
-  });
-});
+      return expect(
+        getCallTrackingEl({
+          url,
+          defaultNumber,
+          defaultContent,
+        })
+      ).rejectedWith(/Response must contain a non-empty phoneNumber field/);
+    });
+  }
+);
diff --git a/extensions/amp-carousel/0.1/base-carousel.js b/extensions/amp-carousel/0.1/base-carousel.js
index 4154adf87c1a..a31ae2a44921 100644
--- a/extensions/amp-carousel/0.1/base-carousel.js
+++ b/extensions/amp-carousel/0.1/base-carousel.js
@@ -20,7 +20,6 @@ import {Services} from '../../../src/services';
  * @abstract
  */
 export class BaseCarousel extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -38,8 +37,8 @@ export class BaseCarousel extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     const input = Services.inputFor(this.win);
-    this.showControls_ = input.isMouseDetected() ||
-        this.element.hasAttribute('controls');
+    this.showControls_ =
+      input.isMouseDetected() || this.element.hasAttribute('controls');
 
     if (this.showControls_) {
       this.element.classList.add('i-amphtml-carousel-has-controls');
@@ -174,9 +173,13 @@ export class BaseCarousel extends AMP.BaseElement {
         this.mutateElement(() => {
           this.element.classList.remove(className);
           this.prevButton_.classList.toggle(
-              'i-amphtml-screen-reader', !this.showControls_);
+            'i-amphtml-screen-reader',
+            !this.showControls_
+          );
           this.nextButton_.classList.toggle(
-              'i-amphtml-screen-reader', !this.showControls_);
+            'i-amphtml-screen-reader',
+            !this.showControls_
+          );
         });
       }, 4000);
     });
@@ -199,8 +202,10 @@ export class BaseCarousel extends AMP.BaseElement {
    * @protected
    */
   getNextButtonTitle() {
-    return this.element.getAttribute('data-next-button-aria-label')
-        || 'Next item in carousel';
+    return (
+      this.element.getAttribute('data-next-button-aria-label') ||
+      'Next item in carousel'
+    );
   }
 
   /**
@@ -208,8 +213,10 @@ export class BaseCarousel extends AMP.BaseElement {
    * @protected
    */
   getPrevButtonTitle() {
-    return this.element.getAttribute('data-prev-button-aria-label')
-        || 'Previous item in carousel';
+    return (
+      this.element.getAttribute('data-prev-button-aria-label') ||
+      'Previous item in carousel'
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-carousel/0.1/base-slides.js b/extensions/amp-carousel/0.1/base-slides.js
index ce87e6193a71..6bc7fb8ec32b 100644
--- a/extensions/amp-carousel/0.1/base-slides.js
+++ b/extensions/amp-carousel/0.1/base-slides.js
@@ -21,7 +21,6 @@ import {isFiniteNumber} from '../../../src/types';
 import {userAssert} from '../../../src/log';
 
 export class BaseSlides extends BaseCarousel {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -74,14 +73,18 @@ export class BaseSlides extends BaseCarousel {
       this.setupAutoplay_();
     }
 
-    this.registerAction('toggleAutoplay', invocation => {
-      const {args} = invocation;
-      if (args && args['toggleOn'] !== undefined) {
-        this.toggleAutoplay_(args['toggleOn']);
-      } else {
-        this.toggleAutoplay_(!this.hasAutoplay_);
-      }
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'toggleAutoplay',
+      invocation => {
+        const {args} = invocation;
+        if (args && args['toggleOn'] !== undefined) {
+          this.toggleAutoplay_(args['toggleOn']);
+        } else {
+          this.toggleAutoplay_(!this.hasAutoplay_);
+        }
+      },
+      ActionTrust.LOW
+    );
   }
 
   /**
@@ -129,18 +132,18 @@ export class BaseSlides extends BaseCarousel {
   updateViewportState(unusedInViewport) {}
 
   /**
-  * Checks if a carousel is eligible to loop, regardless of the loop attribute.
-  * @return {boolean}
-  * @protected
-  */
+   * Checks if a carousel is eligible to loop, regardless of the loop attribute.
+   * @return {boolean}
+   * @protected
+   */
   isLoopingEligible() {
     return false;
   }
 
   /**
-  * Sets up the `autoplay` configuration.
-  * @private
-  */
+   * Sets up the `autoplay` configuration.
+   * @private
+   */
   setupAutoplay_() {
     const delayValue = Number(this.element.getAttribute('delay'));
     // If it isn't a number and is not greater than 0 then don't assign
@@ -162,19 +165,20 @@ export class BaseSlides extends BaseCarousel {
   }
 
   /**
-  * Starts the autoplay delay if allowed.
-  * @private
-  */
+   * Starts the autoplay delay if allowed.
+   * @private
+   */
   autoplay_() {
     if (!this.shouldAutoplay_ || this.autoplayLoops_ == 0) {
       return;
     }
     this.clearAutoplay();
-    this.autoplayTimeoutId_ = /** @type {number} */ (
-      Services.timerFor(this.win).delay(
-          this.go.bind(
-              this, /* dir */ 1, /* animate */ true, /* autoplay */ true),
-          this.autoplayDelay_));
+    this.autoplayTimeoutId_ = /** @type {number} */ (Services.timerFor(
+      this.win
+    ).delay(
+      this.go.bind(this, /* dir */ 1, /* animate */ true, /* autoplay */ true),
+      this.autoplayDelay_
+    ));
   }
 
   /**
@@ -204,9 +208,9 @@ export class BaseSlides extends BaseCarousel {
   }
 
   /**
-  * Clear the autoplay timer.
-  * @protected
-  */
+   * Clear the autoplay timer.
+   * @protected
+   */
   clearAutoplay() {
     if (this.autoplayTimeoutId_ !== null) {
       Services.timerFor(this.win).cancel(this.autoplayTimeoutId_);
@@ -215,9 +219,9 @@ export class BaseSlides extends BaseCarousel {
   }
 
   /**
-  * Remove autoplay.
-  * @protected
-  */
+   * Remove autoplay.
+   * @protected
+   */
   removeAutoplay() {
     this.clearAutoplay();
     if (this.loopAdded_) {
diff --git a/extensions/amp-carousel/0.1/scrollable-carousel.js b/extensions/amp-carousel/0.1/scrollable-carousel.js
index 545e5d37c35e..266d996af234 100644
--- a/extensions/amp-carousel/0.1/scrollable-carousel.js
+++ b/extensions/amp-carousel/0.1/scrollable-carousel.js
@@ -27,7 +27,6 @@ import {numeric} from '../../../src/transition';
 const TAG = 'amp-scrollable-carousel';
 
 export class AmpScrollableCarousel extends BaseCarousel {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -64,8 +63,9 @@ export class AmpScrollableCarousel extends BaseCarousel {
     this.container_.classList.add('i-amphtml-scrollable-carousel-container');
     this.element.appendChild(this.container_);
 
-    this.useLayers_ = isExperimentOn(this.win, 'layers') && isExperimentOn(
-        this.win, 'layers-prioritization');
+    this.useLayers_ =
+      isExperimentOn(this.win, 'layers') &&
+      isExperimentOn(this.win, 'layers-prioritization');
 
     this.cells_.forEach(cell => {
       if (!this.useLayers_) {
@@ -78,16 +78,19 @@ export class AmpScrollableCarousel extends BaseCarousel {
 
     this.cancelTouchEvents_();
 
-    this.container_.addEventListener(
-        'scroll', this.scrollHandler_.bind(this));
+    this.container_.addEventListener('scroll', this.scrollHandler_.bind(this));
 
-    this.registerAction('goToSlide', invocation => {
-      const {args} = invocation;
-      if (args) {
-        const index = parseInt(args['index'], 10);
-        this.goToSlide_(index);
-      }
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'goToSlide',
+      invocation => {
+        const {args} = invocation;
+        if (args) {
+          const index = parseInt(args['index'], 10);
+          this.goToSlide_(index);
+        }
+      },
+      ActionTrust.LOW
+    );
 
     if (this.useLayers_) {
       this.declareLayer(this.container_);
@@ -122,15 +125,20 @@ export class AmpScrollableCarousel extends BaseCarousel {
 
     if (!animate) {
       this.commitSwitch_(newPos);
-      this.container_./*OK*/scrollLeft = newPos;
+      this.container_./*OK*/ scrollLeft = newPos;
     } else {
       /** @const {!TransitionDef<number>} */
       const interpolate = numeric(oldPos, newPos);
       const duration = 200;
       const curve = 'ease-in-out';
-      Animation.animate(this.element, pos => {
-        this.container_./*OK*/scrollLeft = interpolate(pos);
-      }, duration, curve).thenAlways(() => {
+      Animation.animate(
+        this.element,
+        pos => {
+          this.container_./*OK*/ scrollLeft = interpolate(pos);
+        },
+        duration,
+        curve
+      ).thenAlways(() => {
         this.commitSwitch_(newPos);
       });
     }
@@ -164,9 +172,14 @@ export class AmpScrollableCarousel extends BaseCarousel {
       const interpolate = numeric(oldPos, newPos);
       const duration = 200;
       const curve = 'ease-in-out';
-      Animation.animate(this.element, pos => {
-        this.container_./*OK*/scrollLeft = interpolate(pos);
-      }, duration, curve).thenAlways(() => {
+      Animation.animate(
+        this.element,
+        pos => {
+          this.container_./*OK*/ scrollLeft = interpolate(pos);
+        },
+        duration,
+        curve
+      ).thenAlways(() => {
         this.commitSwitch_(newPos);
       });
     };
@@ -179,9 +192,9 @@ export class AmpScrollableCarousel extends BaseCarousel {
    * @param {number} index
    */
   getPosForSlideIndex_(index) {
-    const containerWidth = this.element./*OK*/offsetWidth;
-    const targetPosition = this.cells_[index]./*OK*/offsetLeft;
-    const targetWidth = this.cells_[index]./*OK*/offsetWidth;
+    const containerWidth = this.element./*OK*/ offsetWidth;
+    const targetPosition = this.cells_[index]./*OK*/ offsetLeft;
+    const targetWidth = this.cells_[index]./*OK*/ offsetWidth;
     return targetPosition - (containerWidth - targetWidth) / 2;
   }
 
@@ -190,7 +203,7 @@ export class AmpScrollableCarousel extends BaseCarousel {
    * @private
    */
   scrollHandler_() {
-    const currentScrollLeft = this.container_./*OK*/scrollLeft;
+    const currentScrollLeft = this.container_./*OK*/ scrollLeft;
     this.pos_ = currentScrollLeft;
 
     if (this.scrollTimerId_ === null) {
@@ -203,20 +216,29 @@ export class AmpScrollableCarousel extends BaseCarousel {
    * @private
    */
   waitForScroll_(startingScrollLeft) {
-    this.scrollTimerId_ = /** @type {number} */ (
-      Services.timerFor(this.win).delay(() => {
-        // TODO(yuxichen): test out the threshold for identifying fast scrolling
-        if (Math.abs(startingScrollLeft - this.pos_) < 30) {
-          dev().fine(TAG, 'slow scrolling: %s - %s',
-              startingScrollLeft, this.pos_);
-          this.scrollTimerId_ = null;
-          this.commitSwitch_(this.pos_);
-        } else {
-          dev().fine(TAG, 'fast scrolling: %s - %s',
-              startingScrollLeft, this.pos_);
-          this.waitForScroll_(this.pos_);
-        }
-      }, 100));
+    this.scrollTimerId_ = /** @type {number} */ (Services.timerFor(
+      this.win
+    ).delay(() => {
+      // TODO(yuxichen): test out the threshold for identifying fast scrolling
+      if (Math.abs(startingScrollLeft - this.pos_) < 30) {
+        dev().fine(
+          TAG,
+          'slow scrolling: %s - %s',
+          startingScrollLeft,
+          this.pos_
+        );
+        this.scrollTimerId_ = null;
+        this.commitSwitch_(this.pos_);
+      } else {
+        dev().fine(
+          TAG,
+          'fast scrolling: %s - %s',
+          startingScrollLeft,
+          this.pos_
+        );
+        this.waitForScroll_(this.pos_);
+      }
+    }, 100));
   }
 
   /**
@@ -244,14 +266,13 @@ export class AmpScrollableCarousel extends BaseCarousel {
    */
   nextPos_(pos, dir) {
     // TODO(jridgewell): this could be using cached values from Layers.
-    const containerWidth = this.element./*OK*/offsetWidth;
-    const fullWidth = this.container_./*OK*/scrollWidth;
+    const containerWidth = this.element./*OK*/ offsetWidth;
+    const fullWidth = this.container_./*OK*/ scrollWidth;
     const newPos = pos + dir * containerWidth;
     if (newPos < 0) {
       return 0;
     }
-    if (fullWidth >= containerWidth &&
-            newPos > fullWidth - containerWidth) {
+    if (fullWidth >= containerWidth && newPos > fullWidth - containerWidth) {
       return fullWidth - containerWidth;
     }
     return newPos;
@@ -266,8 +287,10 @@ export class AmpScrollableCarousel extends BaseCarousel {
     const containerWidth = this.getLayoutWidth();
     for (let i = 0; i < this.cells_.length; i++) {
       const cell = this.cells_[i];
-      if (cell./*OK*/offsetLeft + cell./*OK*/offsetWidth >= pos &&
-            cell./*OK*/offsetLeft <= pos + containerWidth) {
+      if (
+        cell./*OK*/ offsetLeft + cell./*OK*/ offsetWidth >= pos &&
+        cell./*OK*/ offsetLeft <= pos + containerWidth
+      ) {
         callback(cell);
       }
     }
@@ -327,7 +350,7 @@ export class AmpScrollableCarousel extends BaseCarousel {
   hasNext() {
     // TODO(jridgewell): this could be using cached values from Layers.
     const containerWidth = this.getLayoutWidth();
-    const scrollWidth = this.container_./*OK*/scrollWidth;
+    const scrollWidth = this.container_./*OK*/ scrollWidth;
     const maxPos = Math.max(scrollWidth - containerWidth, 0);
     return this.pos_ != maxPos;
   }
diff --git a/extensions/amp-carousel/0.1/slidescroll.js b/extensions/amp-carousel/0.1/slidescroll.js
index 682941da970e..6b44a35f3b20 100644
--- a/extensions/amp-carousel/0.1/slidescroll.js
+++ b/extensions/amp-carousel/0.1/slidescroll.js
@@ -52,7 +52,6 @@ const CUSTOM_SNAP_TIMEOUT = 100;
 const TAG = 'AMP-CAROUSEL';
 
 export class AmpSlideScroll extends BaseSlides {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -132,9 +131,13 @@ export class AmpSlideScroll extends BaseSlides {
     // - Non iOS devices with the flag turned off.
     /** @private {boolean} */
     this.shouldDisableCssSnap_ = startsWith(
-        Services.platformFor(this.win).getIosVersionString(),
-        '10.3') ? true : this.isIos_ ? false : !isExperimentOn(
-          this.win, 'amp-carousel-chrome-scroll-snap');
+      Services.platformFor(this.win).getIosVersionString(),
+      '10.3'
+    )
+      ? true
+      : this.isIos_
+      ? false
+      : !isExperimentOn(this.win, 'amp-carousel-chrome-scroll-snap');
   }
 
   /** @override */
@@ -147,8 +150,8 @@ export class AmpSlideScroll extends BaseSlides {
     this.vsync_ = this.getVsync();
     this.action_ = Services.actionServiceForDoc(this.element);
 
-    this.hasNativeSnapPoints_ = (
-      getStyle(this.element, 'scrollSnapType') != undefined);
+    this.hasNativeSnapPoints_ =
+      getStyle(this.element, 'scrollSnapType') != undefined;
 
     if (this.shouldDisableCssSnap_) {
       this.hasNativeSnapPoints_ = false;
@@ -185,7 +188,8 @@ export class AmpSlideScroll extends BaseSlides {
 
     this.slides_.forEach((slide, index) => {
       this.dataSlideIdArr_.push(
-          slide.getAttribute('data-slide-id') || index.toString());
+        slide.getAttribute('data-slide-id') || index.toString()
+      );
       this.setAsOwner(slide);
       slide.classList.add('amp-carousel-slide');
 
@@ -201,20 +205,30 @@ export class AmpSlideScroll extends BaseSlides {
     this.cancelTouchEvents_();
 
     this.slidesContainer_.addEventListener(
-        'scroll', this.scrollHandler_.bind(this));
+      'scroll',
+      this.scrollHandler_.bind(this)
+    );
 
     this.slidesContainer_.addEventListener(
-        'touchmove', this.touchMoveHandler_.bind(this));
+      'touchmove',
+      this.touchMoveHandler_.bind(this)
+    );
 
     this.slidesContainer_.addEventListener(
-        'touchend', this.touchEndHandler_.bind(this));
-
-    this.registerAction('goToSlide', invocation => {
-      const {args} = invocation;
-      if (args) {
-        this.goToSlide(args['index']);
-      }
-    }, ActionTrust.LOW);
+      'touchend',
+      this.touchEndHandler_.bind(this)
+    );
+
+    this.registerAction(
+      'goToSlide',
+      invocation => {
+        const {args} = invocation;
+        if (args) {
+          this.goToSlide(args['index']);
+        }
+      },
+      ActionTrust.LOW
+    );
   }
 
   /** @override */
@@ -254,19 +268,21 @@ export class AmpSlideScroll extends BaseSlides {
       if (this.scrollTimeout_) {
         Services.timerFor(this.win).cancel(this.scrollTimeout_);
       }
-      const timeout = this.shouldDisableCssSnap_ ? IOS_TOUCH_TIMEOUT
+      const timeout = this.shouldDisableCssSnap_
+        ? IOS_TOUCH_TIMEOUT
         : NATIVE_TOUCH_TIMEOUT;
       // Timer that detects scroll end and/or end of snap scroll.
-      this.touchEndTimeout_ = /** @type {number} */ (
-        Services.timerFor(this.win).delay(() => {
-          const currentScrollLeft = this.slidesContainer_./*OK*/scrollLeft;
+      this.touchEndTimeout_ = /** @type {number} */ (Services.timerFor(
+        this.win
+      ).delay(() => {
+        const currentScrollLeft = this.slidesContainer_./*OK*/ scrollLeft;
 
-          if (this.snappingInProgress_) {
-            return;
-          }
-          this.updateOnScroll_(currentScrollLeft);
-          this.touchEndTimeout_ = null;
-        }, timeout));
+        if (this.snappingInProgress_) {
+          return;
+        }
+        this.updateOnScroll_(currentScrollLeft);
+        this.touchEndTimeout_ = null;
+      }, timeout));
     }
     this.hasTouchMoved_ = false;
   }
@@ -281,7 +297,9 @@ export class AmpSlideScroll extends BaseSlides {
     // TODO(sparhami) #19259 Tracks a more generic way to do this. Remove once
     // we have something better.
     const isScaled = closestAncestorElementBySelector(
-        this.element, '[i-amphtml-scale-animation]');
+      this.element,
+      '[i-amphtml-scale-animation]'
+    );
     if (isScaled) {
       return Promise.resolve();
     }
@@ -290,7 +308,9 @@ export class AmpSlideScroll extends BaseSlides {
       this.showSlide_(this.initialSlideIndex_);
     } else {
       const index = user().assertNumber(
-          this.slideIndex_, 'E#19457 this.slideIndex_');
+        this.slideIndex_,
+        'E#19457 this.slideIndex_'
+      );
       const scrollLeft = this.getScrollLeftForIndex_(index);
       // When display is toggled on a partcular media or element resizes,
       // it will need to be re-laid-out. This is only needed when the slide
@@ -299,7 +319,7 @@ export class AmpSlideScroll extends BaseSlides {
       this.scheduleLayout(this.slides_[index]);
       // Reset scrollLeft on orientationChange or anything that changes the
       // size of the carousel.
-      this.slidesContainer_./*OK*/scrollLeft = scrollLeft;
+      this.slidesContainer_./*OK*/ scrollLeft = scrollLeft;
       this.previousScrollLeft_ = scrollLeft;
     }
     return Promise.resolve();
@@ -315,8 +335,11 @@ export class AmpSlideScroll extends BaseSlides {
   updateViewportState(inViewport) {
     if (this.slideIndex_ !== null) {
       this.updateInViewport(
-          this.slides_[user().assertNumber(this.slideIndex_,
-              'E#19457 this.slideIndex_')], inViewport);
+        this.slides_[
+          user().assertNumber(this.slideIndex_, 'E#19457 this.slideIndex_')
+        ],
+        inViewport
+      );
     }
   }
 
@@ -335,17 +358,15 @@ export class AmpSlideScroll extends BaseSlides {
     if (this.slideIndex_ !== null) {
       const hasNext = this.hasNext();
       const hasPrev = this.hasPrev();
-      if ((dir == 1 && hasNext) ||
-          (dir == -1 && hasPrev)) {
-        let newIndex = (dev().assertNumber(this.slideIndex_)) + dir;
+      if ((dir == 1 && hasNext) || (dir == -1 && hasPrev)) {
+        let newIndex = dev().assertNumber(this.slideIndex_) + dir;
         if (newIndex == -1) {
           newIndex = this.noOfSlides_ - 1;
         } else if (newIndex >= this.noOfSlides_) {
           newIndex = 0;
         }
         if (animate) {
-          const currentScrollLeft =
-              (dir == 1 && !hasPrev) ? 0 : this.slideWidth_;
+          const currentScrollLeft = dir == 1 && !hasPrev ? 0 : this.slideWidth_;
           this.customSnap_(currentScrollLeft, dir);
         } else {
           this.showSlideAndTriggerAction_(newIndex);
@@ -364,27 +385,31 @@ export class AmpSlideScroll extends BaseSlides {
       Services.timerFor(this.win).cancel(this.scrollTimeout_);
     }
 
-    const currentScrollLeft = this.slidesContainer_./*OK*/scrollLeft;
+    const currentScrollLeft = this.slidesContainer_./*OK*/ scrollLeft;
 
     if (!this.isIos_) {
       this.handleCustomElasticScroll_(currentScrollLeft);
     }
 
     if (!this.touchEndTimeout_) {
-      const timeout = this.hasNativeSnapPoints_ ? NATIVE_SNAP_TIMEOUT : (
-        this.isIos_ ? IOS_CUSTOM_SNAP_TIMEOUT : CUSTOM_SNAP_TIMEOUT);
+      const timeout = this.hasNativeSnapPoints_
+        ? NATIVE_SNAP_TIMEOUT
+        : this.isIos_
+        ? IOS_CUSTOM_SNAP_TIMEOUT
+        : CUSTOM_SNAP_TIMEOUT;
       // Timer that detects scroll end and/or end of snap scroll.
-      this.scrollTimeout_ = /** @type {number} */ (
-        Services.timerFor(this.win).delay(() => {
-          if (this.snappingInProgress_) {
-            return;
-          }
-          if (this.hasNativeSnapPoints_) {
-            this.updateOnScroll_(currentScrollLeft);
-          } else {
-            this.customSnap_(currentScrollLeft);
-          }
-        }, timeout));
+      this.scrollTimeout_ = /** @type {number} */ (Services.timerFor(
+        this.win
+      ).delay(() => {
+        if (this.snappingInProgress_) {
+          return;
+        }
+        if (this.hasNativeSnapPoints_) {
+          this.updateOnScroll_(currentScrollLeft);
+        } else {
+          this.customSnap_(currentScrollLeft);
+        }
+      }, timeout));
     }
     this.previousScrollLeft_ = currentScrollLeft;
   }
@@ -394,15 +419,19 @@ export class AmpSlideScroll extends BaseSlides {
    * @param {number} currentScrollLeft scrollLeft value of the slides container.
    */
   handleCustomElasticScroll_(currentScrollLeft) {
-    const scrollWidth = this.slidesContainer_./*OK*/scrollWidth;
-    if (this.elasticScrollState_ == -1 &&
-        currentScrollLeft >= this.previousScrollLeft_) {
+    const scrollWidth = this.slidesContainer_./*OK*/ scrollWidth;
+    if (
+      this.elasticScrollState_ == -1 &&
+      currentScrollLeft >= this.previousScrollLeft_
+    ) {
       // Elastic Scroll is reversing direction take control.
       this.customSnap_(currentScrollLeft).then(() => {
         this.elasticScrollState_ = 0;
       });
-    } else if (this.elasticScrollState_ == 1 &&
-        currentScrollLeft <= this.previousScrollLeft_) {
+    } else if (
+      this.elasticScrollState_ == 1 &&
+      currentScrollLeft <= this.previousScrollLeft_
+    ) {
       // Elastic Scroll is reversing direction take control.
       this.customSnap_(currentScrollLeft).then(() => {
         this.elasticScrollState_ = 0;
@@ -410,7 +439,7 @@ export class AmpSlideScroll extends BaseSlides {
     } else if (currentScrollLeft < 0) {
       // Direction = -1.
       this.elasticScrollState_ = -1;
-    } else if ((currentScrollLeft + this.slideWidth_) > scrollWidth) {
+    } else if (currentScrollLeft + this.slideWidth_ > scrollWidth) {
       // Direction = +1.
       this.elasticScrollState_ = 1;
     } else {
@@ -437,8 +466,7 @@ export class AmpSlideScroll extends BaseSlides {
       diff = opt_forceDir;
     }
 
-    if (diff == 1 ||
-        (diff != -1 && diff == -1 * (this.noOfSlides_ - 1))) {
+    if (diff == 1 || (diff != -1 && diff == -1 * (this.noOfSlides_ - 1))) {
       // Move fwd.
       toScrollLeft = hasPrev ? this.slideWidth_ * 2 : this.slideWidth_;
     } else if (diff == -1 || diff == this.noOfSlides_ - 1) {
@@ -480,11 +508,19 @@ export class AmpSlideScroll extends BaseSlides {
     let newIndex = this.slideIndex_ + updateValue;
 
     if (this.shouldLoop) {
-      newIndex = (newIndex < 0) ? this.noOfSlides_ - 1 :
-        (newIndex >= this.noOfSlides_) ? 0 : newIndex;
+      newIndex =
+        newIndex < 0
+          ? this.noOfSlides_ - 1
+          : newIndex >= this.noOfSlides_
+          ? 0
+          : newIndex;
     } else {
-      newIndex = (newIndex < 0) ? 0 :
-        (newIndex >= this.noOfSlides_) ? this.noOfSlides_ - 1 : newIndex;
+      newIndex =
+        newIndex < 0
+          ? 0
+          : newIndex >= this.noOfSlides_
+          ? this.noOfSlides_ - 1
+          : newIndex;
     }
     return newIndex;
   }
@@ -496,8 +532,9 @@ export class AmpSlideScroll extends BaseSlides {
    * @private
    */
   getButtonSuffixFormat_() {
-    return this.element.getAttribute('data-button-count-format') ||
-        '(%s of %s)';
+    return (
+      this.element.getAttribute('data-button-count-format') || '(%s of %s)'
+    );
   }
 
   /**
@@ -508,8 +545,12 @@ export class AmpSlideScroll extends BaseSlides {
   getButtonTitleSuffix_(buttonIndex) {
     const index = String(buttonIndex + 1);
     const count = String(this.noOfSlides_);
-    return ' ' + this.getButtonSuffixFormat_().replace('%s', index)
-        .replace('%s', count);
+    return (
+      ' ' +
+      this.getButtonSuffixFormat_()
+        .replace('%s', index)
+        .replace('%s', count)
+    );
   }
 
   /**
@@ -588,8 +629,11 @@ export class AmpSlideScroll extends BaseSlides {
    * @private
    */
   getPrevIndex_(currentIndex) {
-    return (currentIndex - 1 >= 0) ? currentIndex - 1 :
-      (this.shouldLoop) ? this.noOfSlides_ - 1 : null;
+    return currentIndex - 1 >= 0
+      ? currentIndex - 1
+      : this.shouldLoop
+      ? this.noOfSlides_ - 1
+      : null;
   }
 
   /**
@@ -599,8 +643,11 @@ export class AmpSlideScroll extends BaseSlides {
    * @private
    */
   getNextIndex_(currentIndex) {
-    return (currentIndex + 1 < this.noOfSlides_) ? currentIndex + 1 :
-      (this.shouldLoop) ? 0 : null;
+    return currentIndex + 1 < this.noOfSlides_
+      ? currentIndex + 1
+      : this.shouldLoop
+      ? 0
+      : null;
   }
 
   /**
@@ -614,9 +661,11 @@ export class AmpSlideScroll extends BaseSlides {
   showSlide_(newIndex) {
     const {noOfSlides_} = this;
     newIndex = dev().assertNumber(newIndex);
-    if (newIndex < 0 ||
-        newIndex >= noOfSlides_ ||
-        this.slideIndex_ == newIndex) {
+    if (
+      newIndex < 0 ||
+      newIndex >= noOfSlides_ ||
+      this.slideIndex_ == newIndex
+    ) {
       return false;
     }
     const prevIndex = this.getPrevIndex_(newIndex);
@@ -631,15 +680,22 @@ export class AmpSlideScroll extends BaseSlides {
       showIndexArr.push(nextIndex);
     }
     if (this.slideIndex_ !== null) {
-      this.updateInViewport(this.slides_[
-          user().assertNumber(this.slideIndex_, 'E#19457 this.slideIndex_')],
-      false);
+      this.updateInViewport(
+        this.slides_[
+          user().assertNumber(this.slideIndex_, 'E#19457 this.slideIndex_')
+        ],
+        false
+      );
     }
     const newSlideInView = this.slides_[newIndex];
 
     if (newSlideInView === undefined) {
-      dev().error(TAG, 'Attempting to access a non-existant slide %s / %s',
-          newIndex, noOfSlides_);
+      dev().error(
+        TAG,
+        'Attempting to access a non-existant slide %s / %s',
+        newIndex,
+        noOfSlides_
+      );
       return false;
     }
     this.updateInViewport(newSlideInView, true);
@@ -657,8 +713,9 @@ export class AmpSlideScroll extends BaseSlides {
         this.slides_[showIndex].setAttribute('aria-hidden', 'true');
       }
     });
-    this.slidesContainer_./*OK*/scrollLeft =
-        this.getScrollLeftForIndex_(newIndex);
+    this.slidesContainer_./*OK*/ scrollLeft = this.getScrollLeftForIndex_(
+      newIndex
+    );
     this.triggerAnalyticsEvent_(newIndex);
     this.slideIndex_ = newIndex;
     // If we have a specified number of autoplay loops and
@@ -687,9 +744,11 @@ export class AmpSlideScroll extends BaseSlides {
 
     if (slideChanged) {
       const name = 'slideChange';
-      const event =
-          createCustomEvent(this.win, `slidescroll.${name}`,
-              dict({'index': newIndex}));
+      const event = createCustomEvent(
+        this.win,
+        `slidescroll.${name}`,
+        dict({'index': newIndex})
+      );
       this.action_.trigger(this.element, name, event, ActionTrust.HIGH);
 
       this.element.dispatchCustomEvent(name, {index: newIndex});
@@ -731,8 +790,9 @@ export class AmpSlideScroll extends BaseSlides {
         if (this.shouldLoop) {
           setStyle(this.slideWrappers_[i], 'order', '');
         }
-        dev().assertElement(this.slideWrappers_[i]).classList
-            .remove(SHOWN_CSS_CLASS);
+        dev()
+          .assertElement(this.slideWrappers_[i])
+          .classList.remove(SHOWN_CSS_CLASS);
         this.slides_[i].removeAttribute('aria-hidden');
       }
       // Pause if not the current slide
@@ -758,9 +818,14 @@ export class AmpSlideScroll extends BaseSlides {
     const curve = bezierCurve(0.8, 0, 0.6, 1); // ease-in
     const duration = 80;
     const slidesContainer = dev().assertElement(this.slidesContainer_);
-    return Animation.animate(slidesContainer, pos => {
-      this.slidesContainer_./*OK*/scrollLeft = interpolate(pos);
-    }, duration, curve).thenAlways();
+    return Animation.animate(
+      slidesContainer,
+      pos => {
+        this.slidesContainer_./*OK*/ scrollLeft = interpolate(pos);
+      },
+      duration,
+      curve
+    ).thenAlways();
   }
 
   /**
@@ -794,8 +859,9 @@ export class AmpSlideScroll extends BaseSlides {
       }
     }
     const fromSlide =
-        this.slideIndex_ === null ?
-          'null' : this.dataSlideIdArr_[dev().assertNumber(this.slideIndex_)];
+      this.slideIndex_ === null
+        ? 'null'
+        : this.dataSlideIdArr_[dev().assertNumber(this.slideIndex_)];
 
     const vars = dict({
       'fromSlide': fromSlide,
diff --git a/extensions/amp-carousel/0.1/test/test-base-slide.js b/extensions/amp-carousel/0.1/test/test-base-slide.js
index 433c1cab9fdf..f9f303e00fd9 100644
--- a/extensions/amp-carousel/0.1/test/test-base-slide.js
+++ b/extensions/amp-carousel/0.1/test/test-base-slide.js
@@ -48,7 +48,6 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   let autoplaySpy;
   let clearAutoplaySpy;
 
-
   beforeEach(() => {
     win = env.win;
     doc = win.document;
@@ -60,16 +59,16 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
     setupAutoplaySpy = sandbox.spy(BaseSlides.prototype, 'setupAutoplay_');
     buildButtonsSpy = sandbox.spy(BaseSlides.prototype, 'buildButtons');
     setupGesturesSpy = sandbox.spy(BaseSlides.prototype, 'setupGestures');
-    setControlsStateSpy =
-        sandbox.spy(BaseSlides.prototype, 'setControlsState');
+    setControlsStateSpy = sandbox.spy(BaseSlides.prototype, 'setControlsState');
     hintControlsSpy = sandbox.spy(BaseSlides.prototype, 'hintControls');
     autoplaySpy = sandbox.spy(BaseSlides.prototype, 'autoplay_');
     clearAutoplaySpy = sandbox.spy(BaseSlides.prototype, 'clearAutoplay');
-    onViewportCallbackSpy =
-        sandbox.spy(BaseSlides.prototype, 'onViewportCallback');
+    onViewportCallbackSpy = sandbox.spy(
+      BaseSlides.prototype,
+      'onViewportCallback'
+    );
   });
 
-
   function setElement(options) {
     const element = doc.createElement('div');
     if (options.loop) {
@@ -89,9 +88,7 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
     return element;
   }
 
-
   class TestCarousel extends BaseSlides {
-
     /** @override */
     buildSlides() {
       buildSlidesSpy();
@@ -119,9 +116,11 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   }
 
   it('should do the right buildCallback processing', () => {
-    const carouselLoopOnly = new TestCarousel(setElement({
-      loop: true,
-    }));
+    const carouselLoopOnly = new TestCarousel(
+      setElement({
+        loop: true,
+      })
+    );
 
     carouselLoopOnly.buildCallback();
 
@@ -132,9 +131,11 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
     expect(setupGesturesSpy).to.be.calledOnce;
     expect(setControlsStateSpy).to.be.calledOnce;
 
-    const carouselAutoplayOnly = new TestCarousel(setElement({
-      autoplay: true,
-    }));
+    const carouselAutoplayOnly = new TestCarousel(
+      setElement({
+        autoplay: true,
+      })
+    );
 
     carouselAutoplayOnly.buildCallback();
 
@@ -145,10 +146,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
     expect(setupGesturesSpy).to.have.callCount(2);
     expect(setControlsStateSpy).to.have.callCount(2);
 
-    const carouselAutoplayWithLoop = new TestCarousel(setElement({
-      loop: true,
-      autoplay: true,
-    }));
+    const carouselAutoplayWithLoop = new TestCarousel(
+      setElement({
+        loop: true,
+        autoplay: true,
+      })
+    );
 
     carouselAutoplayWithLoop.buildCallback();
 
@@ -161,10 +164,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should handle viewportCallback when in viewport', () => {
-    const carousel = new TestCarousel(setElement({
-      loop: true,
-      autoplay: true,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        loop: true,
+        autoplay: true,
+      })
+    );
 
     carousel.viewportCallback(true);
     expect(onViewportCallbackSpy).to.have.been.calledWith(true);
@@ -174,10 +179,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should handle viewportCallback when not in viewport', () => {
-    const carousel = new TestCarousel(setElement({
-      loop: true,
-      autoplay: true,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        loop: true,
+        autoplay: true,
+      })
+    );
 
     carousel.viewportCallback(false);
     expect(onViewportCallbackSpy).to.have.been.calledWith(false);
@@ -187,9 +194,11 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should setup autoplay with no delay set', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+      })
+    );
     carousel.autoplayDelay_ = 5000;
     expect(carousel.element.hasAttribute('loop')).to.be.false;
     carousel.setupAutoplay_();
@@ -200,10 +209,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should setup autoplay with specified number of loops', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      autoplayLoops: 5,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        autoplayLoops: 5,
+      })
+    );
     expect(carousel.element.hasAttribute('loop')).to.be.false;
     carousel.buildCallback();
     expect(carousel.element.hasAttribute('loop')).to.be.true;
@@ -212,12 +223,13 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
     expect(carousel.shouldLoop).to.be.true;
   });
 
-
   it('should setup autoplay with delay set', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 3000,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 3000,
+      })
+    );
     carousel.autoplayDelay_ = 5000;
     expect(carousel.element.hasAttribute('loop')).to.be.false;
     carousel.setupAutoplay_();
@@ -228,10 +240,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should setup autoplay with delay set lower', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 300,
+      })
+    );
     carousel.autoplayDelay_ = 5000;
     expect(carousel.element.hasAttribute('loop')).to.be.false;
     carousel.setupAutoplay_();
@@ -242,10 +256,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should start timer on autoplay', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
     carousel.autoplay_();
 
@@ -254,9 +270,11 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should not start timer on when there is no autoplay', () => {
-    const carousel = new TestCarousel(setElement({
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
     carousel.autoplay_();
 
@@ -265,10 +283,12 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('should clear timeout', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
     carousel.autoplay_();
 
@@ -280,62 +300,83 @@ describes.fakeWin('BaseSlides', {amp: true}, env => {
   });
 
   it('toggle autoPlay status using speficied value & autoplay=true', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
     carousel.autoplay_();
 
     expect(carousel.shouldAutoplay_).to.be.true;
 
     const args = {'toggleOn': false};
-    carousel.executeAction(
-        {method: 'toggleAutoplay', args, satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      args,
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.false;
 
     args['toggleOn'] = true;
-    carousel.executeAction(
-        {method: 'toggleAutoplay', args, satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      args,
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.true;
   });
 
   it('toggle autoPlay status using speficied value & autoplay=false', () => {
-    const carousel = new TestCarousel(setElement({
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
 
     expect(carousel.shouldAutoplay_).to.be.false;
 
     const args = {'toggleOn': true};
-    carousel.executeAction(
-        {method: 'toggleAutoplay', args, satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      args,
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.true;
 
     args['toggleOn'] = false;
-    carousel.executeAction(
-        {method: 'toggleAutoplay', args, satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      args,
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.false;
   });
 
   it('toggle autoPlay status without speficied value & autoplay=true', () => {
-    const carousel = new TestCarousel(setElement({
-      autoplay: true,
-      delay: 300,
-    }));
+    const carousel = new TestCarousel(
+      setElement({
+        autoplay: true,
+        delay: 300,
+      })
+    );
     carousel.buildCallback();
     carousel.autoplay_();
 
     expect(carousel.shouldAutoplay_).to.be.true;
 
-    carousel.executeAction(
-        {method: 'toggleAutoplay', satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.false;
 
-    carousel.executeAction(
-        {method: 'toggleAutoplay', satisfiesTrust: () => true});
+    carousel.executeAction({
+      method: 'toggleAutoplay',
+      satisfiesTrust: () => true,
+    });
     expect(carousel.shouldAutoplay_).to.be.true;
   });
-
 });
diff --git a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
index 8a43fa6b2ee3..dc923e8ef8a1 100644
--- a/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
+++ b/extensions/amp-carousel/0.1/test/test-scrollable-carousel.js
@@ -16,289 +16,387 @@
 
 import '../amp-carousel';
 
-
-describes.realWin('test-scrollable-carousel', {
-  amp: {
-    extensions: ['amp-carousel'],
+describes.realWin(
+  'test-scrollable-carousel',
+  {
+    amp: {
+      extensions: ['amp-carousel'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    env.iframe.width = '300';
-    env.iframe.height = '200';
-  });
-
-  function getAmpScrollableCarousel() {
-    const imgUrl = 'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
+  env => {
+    let win, doc;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      env.iframe.width = '300';
+      env.iframe.height = '200';
+    });
+
+    function getAmpScrollableCarousel() {
+      const imgUrl =
+        'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
         'Rf78IofLb9QjS5_0mqsY1zEFc=w300-h200-no';
 
-    const carouselElement = doc.createElement('amp-carousel');
-    carouselElement.setAttribute('width', '300');
-    carouselElement.setAttribute('height', '100');
-
-    const slideCount = 7;
-    for (let i = 0; i < slideCount; i++) {
-      const img = document.createElement('amp-img');
-      img.setAttribute('src', imgUrl);
-      img.setAttribute('width', '120');
-      img.setAttribute('height', '100');
-      img.style.width = '120px';
-      img.style.height = '100px';
-      img.id = 'img-' + i;
-      carouselElement.appendChild(img);
+      const carouselElement = doc.createElement('amp-carousel');
+      carouselElement.setAttribute('width', '300');
+      carouselElement.setAttribute('height', '100');
+
+      const slideCount = 7;
+      for (let i = 0; i < slideCount; i++) {
+        const img = document.createElement('amp-img');
+        img.setAttribute('src', imgUrl);
+        img.setAttribute('width', '120');
+        img.setAttribute('height', '100');
+        img.style.width = '120px';
+        img.style.height = '100px';
+        img.id = 'img-' + i;
+        carouselElement.appendChild(img);
+      }
+
+      doc.body.appendChild(carouselElement);
+      return carouselElement
+        .build()
+        .then(() => {
+          carouselElement.updateLayoutBox({
+            top: 0,
+            left: 0,
+            width: 300,
+            height: 100,
+          });
+          return carouselElement.layoutCallback();
+        })
+        .then(() => carouselElement);
     }
 
-    doc.body.appendChild(carouselElement);
-    return carouselElement.build().then(() => {
-      carouselElement.updateLayoutBox(
-          {top: 0, left: 0, width: 300, height: 100});
-      return carouselElement.layoutCallback();
-    }).then(() => carouselElement);
+    it(
+      'should initialize correctly: create container, build initial slides ' +
+        'and show control buttons',
+      () => {
+        return getAmpScrollableCarousel().then(carousel => {
+          const impl = carousel.implementation_;
+
+          // create container
+          expect(
+            carousel.getElementsByClassName(
+              'i-amphtml-scrollable-carousel-container'
+            ).length
+          ).to.equal(1);
+          const container = carousel.getElementsByClassName(
+            'i-amphtml-scrollable-carousel-container'
+          )[0];
+          const containerStyle = win.getComputedStyle(container, null);
+
+          expect(containerStyle.getPropertyValue('overflow-x')).to.equal(
+            'auto'
+          );
+          expect(containerStyle.getPropertyValue('overflow-y')).to.equal(
+            'hidden'
+          );
+          expect(containerStyle.getPropertyValue('white-space')).to.equal(
+            'nowrap'
+          );
+
+          // build child slides
+          const carouselSlideEls = container.getElementsByClassName(
+            'amp-carousel-slide'
+          );
+          expect(carouselSlideEls.length).to.equal(7);
+          expect(carouselSlideEls[0]).to.have.display('inline-block');
+
+          // show control buttons correctly
+          expect(impl.hasPrev()).to.be.false;
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .true;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+        });
+      }
+    );
+
+    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+    it.skip(
+      'should behave correctly when clicking on next button and the ' +
+        'space to the right is MORE than containerWidth',
+      () => {
+        return getAmpScrollableCarousel().then(carousel => {
+          const impl = carousel.implementation_;
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+
+          // click on the next button
+          impl.goCallback(1, /*animate*/ false);
+
+          // scroll to the correct position
+          expect(impl.container_./*OK*/ scrollLeft).to.equal(300);
+
+          // load new slides in viewport
+          expect(updateInViewportSpy).to.have.callCount(5);
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[2],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[3],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[4],
+            true
+          );
+
+          // unload and pause old slides in viewport
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[0],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[1],
+            false
+          );
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[0]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[1]);
+
+          // schedule layout for new slides
+          expect(scheduleLayoutSpy).to.have.callCount(3);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[3]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
+
+          // preload slides in viewport
+          expect(schedulePreloadSpy).to.have.callCount(3);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[4]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[5]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[6]);
+
+          // set control buttons correctly
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+        });
+      }
+    );
+
+    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+    it.skip(
+      'should behave correctly when clicking on next button and the ' +
+        'space to the right is LESS than containerWidth',
+      () => {
+        return getAmpScrollableCarousel().then(carousel => {
+          const impl = carousel.implementation_;
+
+          // click on the next button the first time
+          impl.goCallback(1, /*animate*/ false);
+
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+
+          // click on the next button the second time
+          impl.goCallback(1, /*animate*/ false);
+
+          // scroll to the correct position
+          // note the correct scrollLeft is not 600 (300 * 2) but 588 (888 - 300)
+          expect(impl.container_./*OK*/ scrollLeft).to.equal(588);
+
+          // load new slides in viewport
+          expect(updateInViewportSpy).to.have.callCount(5);
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[4],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[5],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[6],
+            true
+          );
+
+          // unload and pause old slides in viewport
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[2],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[3],
+            false
+          );
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[2]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[3]);
+
+          // schedule layout for new slides
+          expect(scheduleLayoutSpy).to.have.callCount(3);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[5]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[6]);
+
+          // preload slides in viewport
+          expect(schedulePreloadSpy).to.have.not.been.called;
+
+          // set control buttons correctly
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.hasNext()).to.be.false;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .true;
+        });
+      }
+    );
+
+    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+    it.skip(
+      'should behave correctly when clicking on previous button and the ' +
+        'space to the left is MORE than containerWidth',
+      () => {
+        return getAmpScrollableCarousel().then(carousel => {
+          const impl = carousel.implementation_;
+
+          // click on the next button twice to reach the right end
+          // scrollLeft after second click is 588
+          impl.goCallback(1, /*animate*/ false);
+          impl.goCallback(1, /*animate*/ false);
+
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+
+          // click on the previous button
+          impl.goCallback(-1, /*animate*/ false);
+
+          // scroll to the correct position
+          expect(impl.container_./*OK*/ scrollLeft).to.equal(288);
+
+          // load new slides in viewport
+          expect(updateInViewportSpy).to.have.callCount(5);
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[2],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[3],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[4],
+            true
+          );
+
+          // unload and pause old slides in viewport
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[5],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[6],
+            false
+          );
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[5]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[6]);
+
+          // schedule layout for new slides
+          expect(scheduleLayoutSpy).to.have.callCount(3);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[3]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
+
+          // preload slides in viewport
+          expect(schedulePreloadSpy).to.have.callCount(3);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[0]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[1]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[2]);
+
+          // set control buttons correctly
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+        });
+      }
+    );
+
+    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+    it.skip(
+      'should behave correctly when clicking on previous button and the ' +
+        'space to the left is LESS than containerWidth',
+      () => {
+        return getAmpScrollableCarousel().then(carousel => {
+          const impl = carousel.implementation_;
+
+          // click on the next button twice to reach the right end and click on
+          // the previous button once, scrollLeft after third click is 288
+          impl.goCallback(1, /*animate*/ false);
+          impl.goCallback(1, /*animate*/ false);
+          impl.goCallback(-1, /*animate*/ false);
+
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+
+          // click on the previous button
+          impl.goCallback(-1, /*animate*/ false);
+
+          // scroll to the correct position
+          expect(impl.container_./*OK*/ scrollLeft).to.equal(0);
+
+          // load new slides in viewport
+          expect(updateInViewportSpy).to.have.callCount(5);
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[0],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[1],
+            true
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[2],
+            true
+          );
+
+          // unload and pause old slides in viewport
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[3],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.cells_[4],
+            false
+          );
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[3]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[4]);
+
+          // schedule layout for new slides
+          expect(scheduleLayoutSpy).to.have.callCount(3);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[0]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[1]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
+
+          // preload slides in viewport
+          expect(schedulePreloadSpy).to.have.not.been.called;
+
+          // set control buttons correctly
+          expect(impl.hasPrev()).to.be.false;
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .true;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+        });
+      }
+    );
   }
-
-  it('should initialize correctly: create container, build initial slides ' +
-      'and show control buttons', () => {
-    return getAmpScrollableCarousel().then(carousel => {
-      const impl = carousel.implementation_;
-
-      // create container
-      expect(carousel.getElementsByClassName(
-          'i-amphtml-scrollable-carousel-container').length).to.equal(1);
-      const container = carousel.getElementsByClassName(
-          'i-amphtml-scrollable-carousel-container')[0];
-      const containerStyle = win.getComputedStyle(container, null);
-
-      expect(containerStyle.getPropertyValue('overflow-x')).to.equal('auto');
-      expect(containerStyle.getPropertyValue('overflow-y')).to.equal('hidden');
-      expect(containerStyle.getPropertyValue('white-space')).to.equal('nowrap');
-
-      // build child slides
-      const carouselSlideEls =
-        container.getElementsByClassName('amp-carousel-slide');
-      expect(carouselSlideEls.length).to.equal(7);
-      expect(carouselSlideEls[0]).to.have.display('inline-block');
-
-      // show control buttons correctly
-      expect(impl.hasPrev()).to.be.false;
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.true;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should behave correctly when clicking on next button and the ' +
-      'space to the right is MORE than containerWidth', () => {
-    return getAmpScrollableCarousel().then(carousel => {
-      const impl = carousel.implementation_;
-      const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-      const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-
-      // click on the next button
-      impl.goCallback(1, /*animate*/ false);
-
-      // scroll to the correct position
-      expect(impl.container_./*OK*/scrollLeft).to.equal(300);
-
-      // load new slides in viewport
-      expect(updateInViewportSpy).to.have.callCount(5);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[2], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[3], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[4], true);
-
-      // unload and pause old slides in viewport
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[0], false);
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[1], false);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[0]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[1]);
-
-      // schedule layout for new slides
-      expect(scheduleLayoutSpy).to.have.callCount(3);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[3]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
-
-      // preload slides in viewport
-      expect(schedulePreloadSpy).to.have.callCount(3);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[4]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[5]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[6]);
-
-      // set control buttons correctly
-      expect(impl.hasPrev()).to.be.true;
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should behave correctly when clicking on next button and the ' +
-      'space to the right is LESS than containerWidth', () => {
-    return getAmpScrollableCarousel().then(carousel => {
-      const impl = carousel.implementation_;
-
-      // click on the next button the first time
-      impl.goCallback(1, /*animate*/ false);
-
-      const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-      const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-
-      // click on the next button the second time
-      impl.goCallback(1, /*animate*/ false);
-
-      // scroll to the correct position
-      // note the correct scrollLeft is not 600 (300 * 2) but 588 (888 - 300)
-      expect(impl.container_./*OK*/scrollLeft).to.equal(588);
-
-      // load new slides in viewport
-      expect(updateInViewportSpy).to.have.callCount(5);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[4], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[5], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[6], true);
-
-      // unload and pause old slides in viewport
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[2], false);
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[3], false);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[2]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[3]);
-
-      // schedule layout for new slides
-      expect(scheduleLayoutSpy).to.have.callCount(3);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[5]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[6]);
-
-      // preload slides in viewport
-      expect(schedulePreloadSpy).to.have.not.been.called;
-
-      // set control buttons correctly
-      expect(impl.hasPrev()).to.be.true;
-      expect(impl.hasNext()).to.be.false;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.true;
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should behave correctly when clicking on previous button and the ' +
-      'space to the left is MORE than containerWidth', () => {
-    return getAmpScrollableCarousel().then(carousel => {
-      const impl = carousel.implementation_;
-
-      // click on the next button twice to reach the right end
-      // scrollLeft after second click is 588
-      impl.goCallback(1, /*animate*/ false);
-      impl.goCallback(1, /*animate*/ false);
-
-      const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-      const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-
-      // click on the previous button
-      impl.goCallback(-1, /*animate*/ false);
-
-      // scroll to the correct position
-      expect(impl.container_./*OK*/scrollLeft).to.equal(288);
-
-      // load new slides in viewport
-      expect(updateInViewportSpy).to.have.callCount(5);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[2], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[3], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[4], true);
-
-      // unload and pause old slides in viewport
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[5], false);
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[6], false);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[5]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[6]);
-
-      // schedule layout for new slides
-      expect(scheduleLayoutSpy).to.have.callCount(3);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[3]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[4]);
-
-      // preload slides in viewport
-      expect(schedulePreloadSpy).to.have.callCount(3);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[0]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[1]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.cells_[2]);
-
-      // set control buttons correctly
-      expect(impl.hasPrev()).to.be.true;
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should behave correctly when clicking on previous button and the ' +
-      'space to the left is LESS than containerWidth', () => {
-    return getAmpScrollableCarousel().then(carousel => {
-      const impl = carousel.implementation_;
-
-      // click on the next button twice to reach the right end and click on
-      // the previous button once, scrollLeft after third click is 288
-      impl.goCallback(1, /*animate*/ false);
-      impl.goCallback(1, /*animate*/ false);
-      impl.goCallback(-1, /*animate*/ false);
-
-      const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-      const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-
-      // click on the previous button
-      impl.goCallback(-1, /*animate*/ false);
-
-      // scroll to the correct position
-      expect(impl.container_./*OK*/scrollLeft).to.equal(0);
-
-      // load new slides in viewport
-      expect(updateInViewportSpy).to.have.callCount(5);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[0], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[1], true);
-      expect(updateInViewportSpy).to.have.been.calledWith(impl.cells_[2], true);
-
-      // unload and pause old slides in viewport
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[3], false);
-      expect(updateInViewportSpy).to.have.been
-          .calledWith(impl.cells_[4], false);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[3]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.cells_[4]);
-
-      // schedule layout for new slides
-      expect(scheduleLayoutSpy).to.have.callCount(3);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[0]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[1]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.cells_[2]);
-
-      // preload slides in viewport
-      expect(schedulePreloadSpy).to.have.not.been.called;
-
-      // set control buttons correctly
-      expect(impl.hasPrev()).to.be.false;
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.true;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-    });
-  });
-});
+);
diff --git a/extensions/amp-carousel/0.1/test/test-slidescroll.js b/extensions/amp-carousel/0.1/test/test-slidescroll.js
index 3cedf1aedd56..dc9902802bfb 100644
--- a/extensions/amp-carousel/0.1/test/test-slidescroll.js
+++ b/extensions/amp-carousel/0.1/test/test-slidescroll.js
@@ -16,846 +16,352 @@
 
 import '../amp-carousel';
 
-
-describes.realWin('SlideScroll', {
-  amp: {
-    extensions: ['amp-carousel'],
+describes.realWin(
+  'SlideScroll',
+  {
+    amp: {
+      extensions: ['amp-carousel'],
+    },
   },
-}, env => {
-  const SHOW_CLASS = 'i-amphtml-slide-item-show';
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    env.iframe.width = '1000';
-    env.iframe.height = '1000';
-  });
-
-  function getAmpSlideScroll(
-    opt_hasLooping, opt_slideCount = 5, opt_attachToDom = true,
-    opt_hasAutoplay = false, opt_autoplayLoops) {
-    const imgUrl = 'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
+  env => {
+    const SHOW_CLASS = 'i-amphtml-slide-item-show';
+    let win, doc;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      env.iframe.width = '1000';
+      env.iframe.height = '1000';
+    });
+
+    function getAmpSlideScroll(
+      opt_hasLooping,
+      opt_slideCount = 5,
+      opt_attachToDom = true,
+      opt_hasAutoplay = false,
+      opt_autoplayLoops
+    ) {
+      const imgUrl =
+        'https://lh3.googleusercontent.com/5rcQ32ml8E5ONp9f9-' +
         'Rf78IofLb9QjS5_0mqsY1zEFc=w300-h200-no';
-    const ampSlideScroll = doc.createElement('amp-carousel');
-    ampSlideScroll.setAttribute('type', 'slides');
-    ampSlideScroll.setAttribute('width', '400');
-    ampSlideScroll.setAttribute('height', '300');
-    ampSlideScroll.style.position = 'relative';
-    ampSlideScroll.setAttribute('controls', '');
-    if (opt_hasLooping) {
-      ampSlideScroll.setAttribute('loop', '');
-    }
-    if (opt_hasAutoplay) {
-      if (!opt_autoplayLoops) {
-        ampSlideScroll.setAttribute('autoplay', '');
-      } else {
-        ampSlideScroll.setAttribute('autoplay', opt_autoplayLoops);
+      const ampSlideScroll = doc.createElement('amp-carousel');
+      ampSlideScroll.setAttribute('type', 'slides');
+      ampSlideScroll.setAttribute('width', '400');
+      ampSlideScroll.setAttribute('height', '300');
+      ampSlideScroll.style.position = 'relative';
+      ampSlideScroll.setAttribute('controls', '');
+      if (opt_hasLooping) {
+        ampSlideScroll.setAttribute('loop', '');
+      }
+      if (opt_hasAutoplay) {
+        if (!opt_autoplayLoops) {
+          ampSlideScroll.setAttribute('autoplay', '');
+        } else {
+          ampSlideScroll.setAttribute('autoplay', opt_autoplayLoops);
+        }
       }
-    }
 
-    for (let i = 0; i < opt_slideCount; i++) {
-      const img = doc.createElement('amp-img');
-      img.setAttribute('src', imgUrl);
-      img.setAttribute('width', '400');
-      img.setAttribute('height', '300');
-      // See https://github.com/ampproject/amphtml/issues/3989
-      img.style.display = 'inline';
-      if (i == 0) {
-        img.setAttribute('data-slide-id', 'slide-id');
+      for (let i = 0; i < opt_slideCount; i++) {
+        const img = doc.createElement('amp-img');
+        img.setAttribute('src', imgUrl);
+        img.setAttribute('width', '400');
+        img.setAttribute('height', '300');
+        // See https://github.com/ampproject/amphtml/issues/3989
+        img.style.display = 'inline';
+        if (i == 0) {
+          img.setAttribute('data-slide-id', 'slide-id');
+        }
+        ampSlideScroll.appendChild(img);
       }
-      ampSlideScroll.appendChild(img);
-    }
 
-    if (opt_attachToDom) {
-      doc.body.appendChild(ampSlideScroll);
-      return ampSlideScroll.build().then(() => {
-        ampSlideScroll.updateLayoutBox(
-            {top: 0, left: 0, width: 400, height: 300});
-        return ampSlideScroll.layoutCallback();
-      }).then(() => ampSlideScroll);
+      if (opt_attachToDom) {
+        doc.body.appendChild(ampSlideScroll);
+        return ampSlideScroll
+          .build()
+          .then(() => {
+            ampSlideScroll.updateLayoutBox({
+              top: 0,
+              left: 0,
+              width: 400,
+              height: 300,
+            });
+            return ampSlideScroll.layoutCallback();
+          })
+          .then(() => ampSlideScroll);
+      }
+      return Promise.resolve(ampSlideScroll);
     }
-    return Promise.resolve(ampSlideScroll);
-  }
 
-  it('should create container and wrappers and show initial slides', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      expect(
+    it('should create container and wrappers and show initial slides', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
+        expect(
           ampSlideScroll.getElementsByClassName('i-amphtml-slides-container')
-              .length).to.equal(1);
-      expect(
+            .length
+        ).to.equal(1);
+        expect(
           ampSlideScroll.querySelectorAll(
-              '.i-amphtml-slides-container > .i-amphtml-slide-item').length)
-          .to.equal(5);
-      expect(
-          ampSlideScroll.getElementsByClassName('amp-carousel-slide').length)
-          .to.equal(5);
-      expect(ampSlideScroll.querySelector('.i-amphtml-slides-container')
-          .getAttribute('aria-live')).to.equal('polite');
-      const impl = ampSlideScroll.implementation_;
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
-      expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
-    });
-  });
-
-  it('should go to the correct slide on button click', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const showSlideSpy = sandbox.spy(impl, 'showSlide_');
-
-      impl.goCallback(1);
-      expect(showSlideSpy).to.have.been.calledWith(1);
-      expect(showSlideSpy).to.be.calledOnce;
-
-      impl.goCallback(-1);
-      expect(showSlideSpy).to.have.been.calledWith(0);
-      expect(showSlideSpy).to.have.callCount(2);
-
-      impl.goCallback(0);
-      expect(showSlideSpy).to.have.callCount(2);
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should show the correct slide', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-      const hideRestOfTheSlidesSpy = sandbox.spy(impl, 'hideRestOfTheSlides_');
-      const setControlsStateSpy = sandbox.spy(impl, 'setControlsState');
-      const analyticsEventSpy = sandbox.spy(impl, 'analyticsEvent_');
-
-      expect(impl.showSlide_(-1)).to.be.false;
-      expect(updateInViewportSpy).to.not.have.been.called;
-      expect(scheduleLayoutSpy).to.not.have.been.called;
-      expect(schedulePreloadSpy).to.not.have.been.called;
-      expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
-      expect(setControlsStateSpy).to.not.have.been.called;
-      expect(analyticsEventSpy).to.not.have.been.called;
-
-      expect(impl.showSlide_(5)).to.be.false;
-      expect(updateInViewportSpy).to.not.have.been.called;
-      expect(scheduleLayoutSpy).to.not.have.been.called;
-      expect(schedulePreloadSpy).to.not.have.been.called;
-      expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
-      expect(setControlsStateSpy).to.not.have.been.called;
-      expect(analyticsEventSpy).to.not.have.been.called;
-
-      expect(impl.showSlide_(impl.slideIndex_)).to.be.false;
-      expect(updateInViewportSpy).to.not.have.been.called;
-      expect(scheduleLayoutSpy).to.not.have.been.called;
-      expect(schedulePreloadSpy).to.not.have.been.called;
-      expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
-      expect(setControlsStateSpy).to.not.have.been.called;
-      expect(analyticsEventSpy).to.not.have.been.called;
-
-      expect(impl.showSlide_(1)).to.be.true;
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[0], false);
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[1], true);
-      expect(updateInViewportSpy).to.have.callCount(2);
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[1]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[2]);
-      expect(scheduleLayoutSpy).to.be.calledOnce;
-      expect(schedulePreloadSpy).to.have.callCount(2);
-      expect(impl.slideIndex_).to.equal(1);
-      expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(impl.slideWidth_);
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
-      expect(hideRestOfTheSlidesSpy).to.be.calledOnce;
-      expect(setControlsStateSpy).to.be.calledOnce;
-      expect(analyticsEventSpy).to.have.callCount(2);
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-next', {'fromSlide': 'slide-id', 'toSlide': '1'});
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-change', {'fromSlide': 'slide-id', 'toSlide': '1'});
-      expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
-      expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('false');
-      expect(impl.slides_[2].getAttribute('aria-hidden')).to.equal('true');
-
-      expect(impl.showSlide_(0)).to.be.true;
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[1], false);
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[0], true);
-      expect(updateInViewportSpy).to.have.callCount(4);
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[0]);
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[1]);
-      expect(scheduleLayoutSpy).to.have.callCount(2);
-      expect(schedulePreloadSpy).to.have.callCount(3);
-      expect(impl.slideIndex_).to.equal(0);
-      expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(0);
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
-      expect(hideRestOfTheSlidesSpy).to.have.callCount(2);
-      expect(setControlsStateSpy).to.have.callCount(2);
-      expect(analyticsEventSpy).to.have.callCount(4);
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-prev', {'fromSlide': '1', 'toSlide': 'slide-id'});
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-change', {'fromSlide': '1', 'toSlide': 'slide-id'});
-      expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
-      expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
-
-      expect(impl.showSlide_(4)).to.be.true;
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[0], false);
-      expect(updateInViewportSpy).to.have.been.calledWith(
-          impl.slides_[4], true);
-      expect(updateInViewportSpy).to.have.callCount(6);
-      expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[3]);
-      expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[4]);
-      expect(scheduleLayoutSpy).to.have.callCount(3);
-      expect(schedulePreloadSpy).to.have.callCount(4);
-      expect(impl.slideIndex_).to.equal(4);
-      expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(impl.slideWidth_);
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4]);
-      expect(hideRestOfTheSlidesSpy).to.have.callCount(3);
-      expect(setControlsStateSpy).to.have.callCount(3);
-      expect(analyticsEventSpy).to.have.callCount(6);
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-prev', {'fromSlide': 'slide-id', 'toSlide': '4'});
-      expect(analyticsEventSpy).to.have.been.calledWith(
-          'amp-carousel-change', {'fromSlide': 'slide-id', 'toSlide': '4'});
-      expect(impl.slides_[3].getAttribute('aria-hidden')).to.equal('true');
-      expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('false');
-      expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal(null);
-    });
-  });
-
-  // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-  it.skip('should hide the unwanted slides', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-      const hideRestOfTheSlidesSpy = sandbox.spy(impl, 'hideRestOfTheSlides_');
-
-      impl.showSlide_(1);
-
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
-      expect(schedulePauseSpy).to.have.callCount(2);
-
-      impl.showSlide_(0);
-
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0,1]);
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
-      expect(schedulePauseSpy).to.have.callCount(4);
-
-      impl.showSlide_(4);
-
-      expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4]);
-
-      expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-          .to.be.false;
-      expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-          .to.be.true;
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
-      expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[3]);
-      expect(schedulePauseSpy).to.have.callCount(7);
-    });
-  });
-
-  it('should show/hide the correct controls', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-
-      impl.showSlide_(1);
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.hasPrev()).to.be.true;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
-
-      impl.showSlide_(0);
-      expect(impl.hasNext()).to.be.true;
-      expect(impl.hasPrev()).to.be.false;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.true;
-
-      impl.showSlide_(4);
-      expect(impl.hasNext()).to.be.false;
-      expect(impl.hasPrev()).to.be.true;
-      expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.true;
-      expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
-    });
-  });
-
-  it('should set the correct scrollLeft when there is only one slide', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-
-      impl.noOfSlides_ = 1;
-      impl.showSlide_(0);
-      expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(0);
-    });
-  });
-
-  it('should update to the right slide on scroll', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const showSlideSpy = sandbox.spy(impl, 'showSlide_');
-
-      impl.vsync_ = {
-        mutatePromise: cb => {
-          cb();
-          return {
-            then: cb2 => {
-              cb2();
-            },
-          };
-        },
-        mutate: cb => {
-          cb();
-        },
-      };
-
-      // Move to slide 1 (from slide 0).
-      impl.showSlide_(1);
-      expect(showSlideSpy).to.be.calledWith(1);
-      expect(impl.snappingInProgress_).to.be.false;
-
-      //Move to slide 0 - via scrolling back.
-      impl.updateOnScroll_(1);
-      expect(showSlideSpy).to.be.calledWith(0);
-      expect(impl.slideIndex_).to.equal(0);
-
-      // Try scrolling Fwd and move to slide 1.
-      impl.updateOnScroll_(401);
-      expect(showSlideSpy).to.be.calledWith(1);
-      expect(impl.slideIndex_).to.equal(1);
-
-
-      impl.updateOnScroll_(700);
-      expect(showSlideSpy).to.be.calledWith(2);
-      expect(impl.slideIndex_).to.equal(2);
-
-      impl.showSlide_(4);
-      impl.updateOnScroll_(700);
-      expect(showSlideSpy).to.be.calledWith(4);
-      expect(impl.slideIndex_).to.equal(4);
-    });
-  });
-
-  it('should get the correct next slide index for a scrollLeft' , () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-
-      // Already at slide 0;
-      expect(impl.getNextSlideIndex_(0)).to.equal(0);
-      expect(impl.getNextSlideIndex_(100)).to.equal(0);
-      expect(impl.getNextSlideIndex_(200)).to.equal(1);
-      expect(impl.getNextSlideIndex_(400)).to.equal(1);
-
-      impl.showSlide_(3);
-
-      expect(impl.getNextSlideIndex_(0)).to.equal(2);
-      expect(impl.getNextSlideIndex_(100)).to.equal(2);
-      expect(impl.getNextSlideIndex_(200)).to.equal(3);
-      expect(impl.getNextSlideIndex_(400)).to.equal(3);
-      expect(impl.getNextSlideIndex_(500)).to.equal(3);
-      expect(impl.getNextSlideIndex_(600)).to.equal(4);
-      expect(impl.getNextSlideIndex_(800)).to.equal(4);
-
-      impl.showSlide_(4);
-      expect(impl.getNextSlideIndex_(0)).to.equal(3);
-      expect(impl.getNextSlideIndex_(100)).to.equal(3);
-      expect(impl.getNextSlideIndex_(200)).to.equal(4);
-      expect(impl.getNextSlideIndex_(400)).to.equal(4);
-    });
-  });
-
-  it('should custom snap to the correct slide', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const animateScrollLeftSpy = sandbox.spy(impl, 'animateScrollLeft_');
-
-      impl.customSnap_(0);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
-      impl.customSnap_(100);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
-      impl.customSnap_(200);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
-      impl.customSnap_(400);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
-
-      impl.showSlide_(3);
-
-      impl.customSnap_(0);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
-      impl.customSnap_(100);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
-      impl.customSnap_(200);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
-      impl.customSnap_(400);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
-      impl.customSnap_(500);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(500, 400);
-      impl.customSnap_(600);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(600, 800);
-      impl.customSnap_(800);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(800, 800);
-
-      impl.showSlide_(4);
-
-      impl.customSnap_(0);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
-      impl.customSnap_(100);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
-      impl.customSnap_(200);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
-      impl.customSnap_(400);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
-
-      impl.showSlide_(0);
-
-      impl.customSnap_(0, -1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
-      impl.customSnap_(0, 1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
-
-      impl.showSlide_(3);
-
-      impl.customSnap_(400, -1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
-      impl.customSnap_(400, 1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
-
-      impl.showSlide_(4);
-
-      impl.customSnap_(400, -1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
-      impl.customSnap_(400, 1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
-    });
-  });
-
-  it('should custom snap to the correct slide - special case', () => {
-    return getAmpSlideScroll(null, 2).then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const animateScrollLeftSpy = sandbox.spy(impl, 'animateScrollLeft_');
-
-      impl.customSnap_(0, 1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
-
-      impl.showSlide_(1);
-
-      impl.customSnap_(400, -1);
-      expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
-    });
-  });
-
-  it('should handle custom elastic scroll', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const customSnapSpy = sandbox.stub(impl, 'customSnap_').callsFake(() => {
-        return {
-          then: cb => {
-            cb();
-          },
-        };
+            '.i-amphtml-slides-container > .i-amphtml-slide-item'
+          ).length
+        ).to.equal(5);
+        expect(
+          ampSlideScroll.getElementsByClassName('amp-carousel-slide').length
+        ).to.equal(5);
+        expect(
+          ampSlideScroll
+            .querySelector('.i-amphtml-slides-container')
+            .getAttribute('aria-live')
+        ).to.equal('polite');
+        const impl = ampSlideScroll.implementation_;
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
+        expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
       });
-
-      impl.handleCustomElasticScroll_(-10);
-      expect(impl.elasticScrollState_).to.equal(-1);
-      impl.previousScrollLeft_ = -10;
-      impl.handleCustomElasticScroll_(-5);
-      expect(customSnapSpy).to.have.been.calledWith(-5);
-
-      impl.previousScrollLeft_ = null;
-
-      impl.handleCustomElasticScroll_(410);
-      expect(impl.elasticScrollState_).to.equal(1);
-      impl.previousScrollLeft_ = 410;
-      impl.handleCustomElasticScroll_(405);
-      expect(customSnapSpy).to.have.been.calledWith(405);
     });
-  });
-
-  it('should handle layout measures (orientation changes)', async() => {
-    const ampSlideScroll = await getAmpSlideScroll();
-    const impl = ampSlideScroll.implementation_;
-    const getLayoutWidthStub = sandbox.stub(impl, 'getLayoutWidth');
-
-    getLayoutWidthStub.returns(200);
-    impl.onLayoutMeasure();
-    expect(getLayoutWidthStub).to.have.been.calledOnce;
-    expect(impl.slideWidth_).to.equal(200);
-
-    // Show the first slide, make sure the scroll position is correct.
-    impl.showSlide_(1);
-    expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(200);
-
-    // Now do a layout measure letting the component know it changed size.
-    getLayoutWidthStub.returns(400);
-    impl.onLayoutMeasure();
-    expect(getLayoutWidthStub).to.have.callCount(2);
-    expect(impl.slideWidth_).to.equal(400);
-    expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(200);
-
-    // Make sure the scroll position is correct after layoutCallback.
-    await impl.layoutCallback();
-    expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(400);
-  });
-
-  it('should relayout the current slide on layoutCallback', () => {
-    return getAmpSlideScroll().then(ampSlideScroll => {
-      const impl = ampSlideScroll.implementation_;
-      const scheduleLayoutSpy_ = sandbox.spy(impl, 'scheduleLayout');
-      impl.slideIndex_ = null;
-      impl.layoutCallback();
-      expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.slides_[0]);
 
-      impl.showSlide_(1);
-      impl.layoutCallback();
-      expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.slides_[1]);
-    });
-  });
+    it('should go to the correct slide on button click', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
+        const impl = ampSlideScroll.implementation_;
+        const showSlideSpy = sandbox.spy(impl, 'showSlide_');
 
-  describe('Looping', () => {
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-    });
+        impl.goCallback(1);
+        expect(showSlideSpy).to.have.been.calledWith(1);
+        expect(showSlideSpy).to.be.calledOnce;
 
-    afterEach(() => {
-      sandbox.restore();
-    });
+        impl.goCallback(-1);
+        expect(showSlideSpy).to.have.been.calledWith(0);
+        expect(showSlideSpy).to.have.callCount(2);
 
-    it('should create container and wrappers and show initial slides', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
-        const impl = ampSlideScroll.implementation_;
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
+        impl.goCallback(0);
+        expect(showSlideSpy).to.have.callCount(2);
       });
     });
 
     // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-    it.skip('should show the correct slides when looping', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it.skip('should show the correct slide', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
         const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
         const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
         const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-        const hideRestOfTheSlidesSpy =
-            sandbox.spy(impl, 'hideRestOfTheSlides_');
+        const hideRestOfTheSlidesSpy = sandbox.spy(
+          impl,
+          'hideRestOfTheSlides_'
+        );
         const setControlsStateSpy = sandbox.spy(impl, 'setControlsState');
-
-        expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('true');
-        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
-        expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
-
-        impl.showSlide_(1);
-
+        const analyticsEventSpy = sandbox.spy(impl, 'analyticsEvent_');
+
+        expect(impl.showSlide_(-1)).to.be.false;
+        expect(updateInViewportSpy).to.not.have.been.called;
+        expect(scheduleLayoutSpy).to.not.have.been.called;
+        expect(schedulePreloadSpy).to.not.have.been.called;
+        expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
+        expect(setControlsStateSpy).to.not.have.been.called;
+        expect(analyticsEventSpy).to.not.have.been.called;
+
+        expect(impl.showSlide_(5)).to.be.false;
+        expect(updateInViewportSpy).to.not.have.been.called;
+        expect(scheduleLayoutSpy).to.not.have.been.called;
+        expect(schedulePreloadSpy).to.not.have.been.called;
+        expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
+        expect(setControlsStateSpy).to.not.have.been.called;
+        expect(analyticsEventSpy).to.not.have.been.called;
+
+        expect(impl.showSlide_(impl.slideIndex_)).to.be.false;
+        expect(updateInViewportSpy).to.not.have.been.called;
+        expect(scheduleLayoutSpy).to.not.have.been.called;
+        expect(schedulePreloadSpy).to.not.have.been.called;
+        expect(hideRestOfTheSlidesSpy).to.not.have.been.called;
+        expect(setControlsStateSpy).to.not.have.been.called;
+        expect(analyticsEventSpy).to.not.have.been.called;
+
+        expect(impl.showSlide_(1)).to.be.true;
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[0], false);
+          impl.slides_[0],
+          false
+        );
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[1], true);
+          impl.slides_[1],
+          true
+        );
         expect(updateInViewportSpy).to.have.callCount(2);
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-            .to.be.true;
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+          .true;
         expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
         expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[1]);
         expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[2]);
         expect(scheduleLayoutSpy).to.be.calledOnce;
         expect(schedulePreloadSpy).to.have.callCount(2);
         expect(impl.slideIndex_).to.equal(1);
-        expect(impl.slidesContainer_./*OK*/scrollLeft)
-            .to.equal(impl.slideWidth_);
+        expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(
+          impl.slideWidth_
+        );
         expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
         expect(hideRestOfTheSlidesSpy).to.be.calledOnce;
         expect(setControlsStateSpy).to.be.calledOnce;
+        expect(analyticsEventSpy).to.have.callCount(2);
+        expect(analyticsEventSpy).to.have.been.calledWith('amp-carousel-next', {
+          'fromSlide': 'slide-id',
+          'toSlide': '1',
+        });
+        expect(analyticsEventSpy).to.have.been.calledWith(
+          'amp-carousel-change',
+          {'fromSlide': 'slide-id', 'toSlide': '1'}
+        );
         expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
         expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('false');
         expect(impl.slides_[2].getAttribute('aria-hidden')).to.equal('true');
 
-        impl.showSlide_(0);
-
+        expect(impl.showSlide_(0)).to.be.true;
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[1], false);
+          impl.slides_[1],
+          false
+        );
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[0], true);
+          impl.slides_[0],
+          true
+        );
         expect(updateInViewportSpy).to.have.callCount(4);
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-            .to.be.false;
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+          .false;
         expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[0]);
         expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[1]);
-        expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[4]);
         expect(scheduleLayoutSpy).to.have.callCount(2);
-        expect(schedulePreloadSpy).to.have.callCount(4);
+        expect(schedulePreloadSpy).to.have.callCount(3);
         expect(impl.slideIndex_).to.equal(0);
-        expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(400);
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([4, 0, 1]);
+        expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(0);
+        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
         expect(hideRestOfTheSlidesSpy).to.have.callCount(2);
         expect(setControlsStateSpy).to.have.callCount(2);
-        expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('true');
+        expect(analyticsEventSpy).to.have.callCount(4);
+        expect(analyticsEventSpy).to.have.been.calledWith('amp-carousel-prev', {
+          'fromSlide': '1',
+          'toSlide': 'slide-id',
+        });
+        expect(analyticsEventSpy).to.have.been.calledWith(
+          'amp-carousel-change',
+          {'fromSlide': '1', 'toSlide': 'slide-id'}
+        );
         expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
         expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
 
-        impl.showSlide_(4);
-
+        expect(impl.showSlide_(4)).to.be.true;
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[0], false);
+          impl.slides_[0],
+          false
+        );
         expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[4], true);
+          impl.slides_[4],
+          true
+        );
         expect(updateInViewportSpy).to.have.callCount(6);
-        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
+        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+          .true;
         expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[3]);
-        expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
         expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[4]);
         expect(scheduleLayoutSpy).to.have.callCount(3);
-        expect(schedulePreloadSpy).to.have.callCount(6);
+        expect(schedulePreloadSpy).to.have.callCount(4);
         expect(impl.slideIndex_).to.equal(4);
-        expect(impl.slidesContainer_./*OK*/scrollLeft)
-            .to.equal(impl.slideWidth_);
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4, 0]);
+        expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(
+          impl.slideWidth_
+        );
+        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4]);
         expect(hideRestOfTheSlidesSpy).to.have.callCount(3);
         expect(setControlsStateSpy).to.have.callCount(3);
+        expect(analyticsEventSpy).to.have.callCount(6);
+        expect(analyticsEventSpy).to.have.been.calledWith('amp-carousel-prev', {
+          'fromSlide': 'slide-id',
+          'toSlide': '4',
+        });
+        expect(analyticsEventSpy).to.have.been.calledWith(
+          'amp-carousel-change',
+          {'fromSlide': 'slide-id', 'toSlide': '4'}
+        );
         expect(impl.slides_[3].getAttribute('aria-hidden')).to.equal('true');
         expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('false');
-        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
-
-      });
-    });
-
-    it('show correct slides when looping with `autoplay` for 2 slides', () => {
-      return getAmpSlideScroll(true, 2).then(ampSlideScroll => {
-        const impl = ampSlideScroll.implementation_;
-        const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
-        const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-        const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
-        const hideRestOfTheSlidesSpy =
-            sandbox.spy(impl, 'hideRestOfTheSlides_');
-        const setControlsStateSpy = sandbox.spy(impl, 'setControlsState');
-
-        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
-        expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
-
-        impl.showSlide_(1);
-
-        expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[0], false);
-        expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[1], true);
-        expect(updateInViewportSpy).to.have.callCount(2);
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
-        expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[1]);
-        expect(scheduleLayoutSpy).to.be.calledOnce;
-        expect(schedulePreloadSpy).to.have.callCount(1);
-        expect(impl.slideIndex_).to.equal(1);
-        expect(impl.slidesContainer_./*OK*/scrollLeft)
-            .to.equal(impl.slideWidth_);
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
-        expect(hideRestOfTheSlidesSpy).to.be.calledOnce;
-        expect(setControlsStateSpy).to.be.calledOnce;
-        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
-        expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('false');
-
-        impl.showSlide_(0);
-
-        expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[1], false);
-        expect(updateInViewportSpy).to.have.been.calledWith(
-            impl.slides_[0], true);
-        expect(updateInViewportSpy).to.have.callCount(4);
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[0]);
-        expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[1]);
-        expect(scheduleLayoutSpy).to.have.callCount(2);
-        expect(schedulePreloadSpy).to.have.callCount(2);
-        expect(impl.slideIndex_).to.equal(0);
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
-        expect(hideRestOfTheSlidesSpy).to.have.callCount(2);
-        expect(setControlsStateSpy).to.have.callCount(2);
-        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
-        expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
-      });
-    });
-
-    it('do not set `autoplay` status if `autoplay=0` specified', () => {
-      return getAmpSlideScroll(false, 3, true, true, 0).then(ampSlideScroll => {
-        const impl = ampSlideScroll.implementation_;
-        const setupAutoplaySpy = sandbox.spy(impl, 'setupAutoplay_');
-        expect(setupAutoplaySpy).to.not.have.been.called;
-      });
-    });
-
-    it('removes `autoplay` status after provided loops are made', () => {
-      return getAmpSlideScroll(false, 3, true, true, 2).then(ampSlideScroll => {
-        const impl = ampSlideScroll.implementation_;
-        const removeAutoplaySpy = sandbox.spy(impl, 'removeAutoplay');
-        impl.showSlide_(1);
-        impl.showSlide_(2);
-        expect(impl.loopsMade_).to.equal(1);
-        impl.showSlide_(0);
-        impl.showSlide_(1);
-        impl.showSlide_(2);
-        expect(impl.loopsMade_).to.equal(2);
-        expect(removeAutoplaySpy).to.have.been.called;
-        expect(ampSlideScroll.hasAttribute('loop')).to.be.false;
+        expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal(null);
       });
     });
 
     // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-    it.skip('should hide unwanted slides when looping', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it.skip('should hide the unwanted slides', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
         const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
-        const hideRestOfTheSlidesSpy =
-            sandbox.spy(impl, 'hideRestOfTheSlides_');
+        const hideRestOfTheSlidesSpy = sandbox.spy(
+          impl,
+          'hideRestOfTheSlides_'
+        );
 
         impl.showSlide_(1);
 
         expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-            .to.be.false;
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.false;
-
-        expect(impl.slideWrappers_[0].style.order).to.equal('1');
-        expect(impl.slideWrappers_[1].style.order).to.equal('2');
-        expect(impl.slideWrappers_[2].style.order).to.equal('3');
-        expect(impl.slideWrappers_[3].style.order).to.equal('');
-        expect(impl.slideWrappers_[4].style.order).to.equal('');
-
-        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[4]);
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+          .false;
         expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
         expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
-        expect(schedulePauseSpy).to.have.callCount(3);
+        expect(schedulePauseSpy).to.have.callCount(2);
 
         impl.showSlide_(0);
 
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([4, 0, 1]);
-
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-            .to.be.false;
-        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-            .to.be.false;
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[0].style.order).to.equal('2');
-        expect(impl.slideWrappers_[1].style.order).to.equal('3');
-        expect(impl.slideWrappers_[2].style.order).to.equal('');
-        expect(impl.slideWrappers_[3].style.order).to.equal('');
-        expect(impl.slideWrappers_[4].style.order).to.equal('1');
-        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
-        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[4]);
+        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+          .false;
         expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
-        expect(schedulePauseSpy).to.have.callCount(6);
+        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
+        expect(schedulePauseSpy).to.have.callCount(4);
 
         impl.showSlide_(4);
 
-        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4, 0]);
-
-        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS))
-            .to.be.false;
-        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS))
-            .to.be.false;
-        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS))
-            .to.be.true;
-        expect(impl.slideWrappers_[0].style.order).to.equal('3');
-        expect(impl.slideWrappers_[1].style.order).to.equal('');
-        expect(impl.slideWrappers_[2].style.order).to.equal('');
-        expect(impl.slideWrappers_[3].style.order).to.equal('1');
-        expect(impl.slideWrappers_[4].style.order).to.equal('2');
-        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[3]);
+        expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4]);
+
+        expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+          .false;
+        expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+          .true;
+        expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+          .true;
         expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
         expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
-        expect(schedulePauseSpy).to.have.callCount(9);
+        expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[3]);
+        expect(schedulePauseSpy).to.have.callCount(7);
       });
     });
 
-    it('should show/hide the correct controls when looping', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it('should show/hide the correct controls', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
 
         impl.showSlide_(1);
@@ -866,34 +372,42 @@ describes.realWin('SlideScroll', {
 
         impl.showSlide_(0);
         expect(impl.hasNext()).to.be.true;
-        expect(impl.hasPrev()).to.be.true;
+        expect(impl.hasPrev()).to.be.false;
         expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
-        expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
+        expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.true;
 
         impl.showSlide_(4);
-        expect(impl.hasNext()).to.be.true;
+        expect(impl.hasNext()).to.be.false;
         expect(impl.hasPrev()).to.be.true;
-        expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.false;
+        expect(impl.nextButton_.classList.contains('amp-disabled')).to.be.true;
         expect(impl.prevButton_.classList.contains('amp-disabled')).to.be.false;
       });
     });
 
     it('should set the correct scrollLeft when there is only one slide', () => {
-      return getAmpSlideScroll(true, 1).then(ampSlideScroll => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
 
         impl.noOfSlides_ = 1;
         impl.showSlide_(0);
-        expect(impl.slidesContainer_./*OK*/scrollLeft).to.equal(0);
+        expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(0);
       });
     });
 
     it('should update to the right slide on scroll', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
         const showSlideSpy = sandbox.spy(impl, 'showSlide_');
 
         impl.vsync_ = {
+          mutatePromise: cb => {
+            cb();
+            return {
+              then: cb2 => {
+                cb2();
+              },
+            };
+          },
           mutate: cb => {
             cb();
           },
@@ -909,39 +423,31 @@ describes.realWin('SlideScroll', {
         expect(showSlideSpy).to.be.calledWith(0);
         expect(impl.slideIndex_).to.equal(0);
 
-        // Try scrolling Fwd and move a little fwd to stay in the same slide.
+        // Try scrolling Fwd and move to slide 1.
         impl.updateOnScroll_(401);
-        expect(showSlideSpy).to.be.calledWith(0);
-        expect(impl.slideIndex_).to.equal(0);
-
-        impl.updateOnScroll_(700);
         expect(showSlideSpy).to.be.calledWith(1);
         expect(impl.slideIndex_).to.equal(1);
 
-        impl.showSlide_(4);
         impl.updateOnScroll_(700);
-        expect(showSlideSpy).to.be.calledWith(0);
-        expect(impl.slideIndex_).to.equal(0);
+        expect(showSlideSpy).to.be.calledWith(2);
+        expect(impl.slideIndex_).to.equal(2);
 
-        impl.updateOnScroll_(1);
+        impl.showSlide_(4);
+        impl.updateOnScroll_(700);
         expect(showSlideSpy).to.be.calledWith(4);
         expect(impl.slideIndex_).to.equal(4);
       });
     });
 
-    it('should get the correct next slide index for a scrollLeft' , () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it('should get the correct next slide index for a scrollLeft', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
 
         // Already at slide 0;
-
-        expect(impl.getNextSlideIndex_(0)).to.equal(4);
-        expect(impl.getNextSlideIndex_(100)).to.equal(4);
-        expect(impl.getNextSlideIndex_(200)).to.equal(0);
-        expect(impl.getNextSlideIndex_(400)).to.equal(0);
-        expect(impl.getNextSlideIndex_(500)).to.equal(0);
-        expect(impl.getNextSlideIndex_(600)).to.equal(1);
-        expect(impl.getNextSlideIndex_(800)).to.equal(1);
+        expect(impl.getNextSlideIndex_(0)).to.equal(0);
+        expect(impl.getNextSlideIndex_(100)).to.equal(0);
+        expect(impl.getNextSlideIndex_(200)).to.equal(1);
+        expect(impl.getNextSlideIndex_(400)).to.equal(1);
 
         impl.showSlide_(3);
 
@@ -958,17 +464,25 @@ describes.realWin('SlideScroll', {
         expect(impl.getNextSlideIndex_(100)).to.equal(3);
         expect(impl.getNextSlideIndex_(200)).to.equal(4);
         expect(impl.getNextSlideIndex_(400)).to.equal(4);
-        expect(impl.getNextSlideIndex_(500)).to.equal(4);
-        expect(impl.getNextSlideIndex_(600)).to.equal(0);
-        expect(impl.getNextSlideIndex_(800)).to.equal(0);
       });
     });
 
     it('should custom snap to the correct slide', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
         const animateScrollLeftSpy = sandbox.spy(impl, 'animateScrollLeft_');
 
+        impl.customSnap_(0);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
+        impl.customSnap_(100);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
+        impl.customSnap_(200);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
+        impl.customSnap_(400);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
+
+        impl.showSlide_(3);
+
         impl.customSnap_(0);
         expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
         impl.customSnap_(100);
@@ -984,217 +498,806 @@ describes.realWin('SlideScroll', {
         impl.customSnap_(800);
         expect(animateScrollLeftSpy).to.have.been.calledWith(800, 800);
 
+        impl.showSlide_(4);
+
+        impl.customSnap_(0);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
+        impl.customSnap_(100);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
+        impl.customSnap_(200);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
+        impl.customSnap_(400);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
+
+        impl.showSlide_(0);
+
+        impl.customSnap_(0, -1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
+        impl.customSnap_(0, 1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
+
+        impl.showSlide_(3);
+
         impl.customSnap_(400, -1);
         expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
         impl.customSnap_(400, 1);
-        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 800);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
+
+        impl.showSlide_(4);
+
+        impl.customSnap_(400, -1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
+        impl.customSnap_(400, 1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
       });
     });
 
-    it('should go to the correct slide on button click', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it('should custom snap to the correct slide - special case', () => {
+      return getAmpSlideScroll(null, 2).then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
-        const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+        const animateScrollLeftSpy = sandbox.spy(impl, 'animateScrollLeft_');
 
-        impl.goCallback(-1);
-        expect(showSlideSpy).to.have.been.calledWith(4);
-        expect(showSlideSpy).to.be.calledOnce;
+        impl.customSnap_(0, 1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(0, 400);
 
-        impl.goCallback(1);
-        expect(showSlideSpy).to.have.been.calledWith(0);
-        expect(showSlideSpy).to.have.callCount(2);
+        impl.showSlide_(1);
 
-        impl.goCallback(1);
-        expect(showSlideSpy).to.have.been.calledWith(1);
-        expect(showSlideSpy).to.have.callCount(3);
+        impl.customSnap_(400, -1);
+        expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
       });
     });
 
-    // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
-    it.skip('should update slide when `slide` attribute is mutated', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
-        expectAsyncConsoleError(/Invalid \[slide\] value:/, 1);
-
+    it('should handle custom elastic scroll', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
-        const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+        const customSnapSpy = sandbox
+          .stub(impl, 'customSnap_')
+          .callsFake(() => {
+            return {
+              then: cb => {
+                cb();
+              },
+            };
+          });
+
+        impl.handleCustomElasticScroll_(-10);
+        expect(impl.elasticScrollState_).to.equal(-1);
+        impl.previousScrollLeft_ = -10;
+        impl.handleCustomElasticScroll_(-5);
+        expect(customSnapSpy).to.have.been.calledWith(-5);
+
+        impl.previousScrollLeft_ = null;
+
+        impl.handleCustomElasticScroll_(410);
+        expect(impl.elasticScrollState_).to.equal(1);
+        impl.previousScrollLeft_ = 410;
+        impl.handleCustomElasticScroll_(405);
+        expect(customSnapSpy).to.have.been.calledWith(405);
+      });
+    });
 
-        impl.mutatedAttributesCallback({slide: 2});
-        expect(showSlideSpy).to.have.been.calledWith(2);
+    it('should handle layout measures (orientation changes)', async () => {
+      const ampSlideScroll = await getAmpSlideScroll();
+      const impl = ampSlideScroll.implementation_;
+      const getLayoutWidthStub = sandbox.stub(impl, 'getLayoutWidth');
 
-        impl.mutatedAttributesCallback({slide: 0});
-        expect(showSlideSpy).to.have.been.calledWith(0);
+      getLayoutWidthStub.returns(200);
+      impl.onLayoutMeasure();
+      expect(getLayoutWidthStub).to.have.been.calledOnce;
+      expect(impl.slideWidth_).to.equal(200);
 
-        // Don't call showSlide_() if slide is not finite.
-        showSlideSpy.resetHistory();
-        impl.mutatedAttributesCallback({slide: Number.POSITIVE_INFINITY});
-        expect(showSlideSpy.called).to.be.false;
-      });
+      // Show the first slide, make sure the scroll position is correct.
+      impl.showSlide_(1);
+      expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(200);
+
+      // Now do a layout measure letting the component know it changed size.
+      getLayoutWidthStub.returns(400);
+      impl.onLayoutMeasure();
+      expect(getLayoutWidthStub).to.have.callCount(2);
+      expect(impl.slideWidth_).to.equal(400);
+      expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(200);
+
+      // Make sure the scroll position is correct after layoutCallback.
+      await impl.layoutCallback();
+      expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(400);
     });
 
-    it('should trigger `slideChange` action when user changes slides', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
+    it('should relayout the current slide on layoutCallback', () => {
+      return getAmpSlideScroll().then(ampSlideScroll => {
         const impl = ampSlideScroll.implementation_;
-        const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-
-        impl.goCallback(-1, /* animate */ false);
-        expect(triggerSpy).to.have.been.calledWith(
-            ampSlideScroll,
-            'slideChange',
-            /* CustomEvent */ sinon.match.has('detail', {index: 4}));
+        const scheduleLayoutSpy_ = sandbox.spy(impl, 'scheduleLayout');
+        impl.slideIndex_ = null;
+        impl.layoutCallback();
+        expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.slides_[0]);
 
-        impl.goCallback(1, /* animate */ false);
-        expect(triggerSpy).to.have.been.calledWith(
-            ampSlideScroll,
-            'slideChange',
-            /* CustomEvent */ sinon.match.has('detail', {index: 0}));
+        impl.showSlide_(1);
+        impl.layoutCallback();
+        expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.slides_[1]);
       });
     });
 
-    it('should goToSlide on action', () => {
-      return getAmpSlideScroll(true).then(ampSlideScroll => {
-        expectAsyncConsoleError(/Invalid \[slide\] value:/, 4);
+    describe('Looping', () => {
+      beforeEach(() => {
+        sandbox = sinon.sandbox;
+      });
 
-        const impl = ampSlideScroll.implementation_;
-        const showSlideSpy = sandbox.spy(impl, 'showSlide_');
-        const satisfiesTrust = () => true;
+      afterEach(() => {
+        sandbox.restore();
+      });
 
-        let args = {'index': '123'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.not.have.been.called;
+      it('should create container and wrappers and show initial slides', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+        });
+      });
 
-        args = {'index': '5'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.not.have.been.called;
+      // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+      it.skip('should show the correct slides when looping', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+          const hideRestOfTheSlidesSpy = sandbox.spy(
+            impl,
+            'hideRestOfTheSlides_'
+          );
+          const setControlsStateSpy = sandbox.spy(impl, 'setControlsState');
+
+          expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('true');
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
+
+          impl.showSlide_(1);
+
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[0],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[1],
+            true
+          );
+          expect(updateInViewportSpy).to.have.callCount(2);
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[2]);
+          expect(scheduleLayoutSpy).to.be.calledOnce;
+          expect(schedulePreloadSpy).to.have.callCount(2);
+          expect(impl.slideIndex_).to.equal(1);
+          expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(
+            impl.slideWidth_
+          );
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
+          expect(hideRestOfTheSlidesSpy).to.be.calledOnce;
+          expect(setControlsStateSpy).to.be.calledOnce;
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[2].getAttribute('aria-hidden')).to.equal('true');
+
+          impl.showSlide_(0);
+
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[1],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[0],
+            true
+          );
+          expect(updateInViewportSpy).to.have.callCount(4);
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[4]);
+          expect(scheduleLayoutSpy).to.have.callCount(2);
+          expect(schedulePreloadSpy).to.have.callCount(4);
+          expect(impl.slideIndex_).to.equal(0);
+          expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(400);
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([4, 0, 1]);
+          expect(hideRestOfTheSlidesSpy).to.have.callCount(2);
+          expect(setControlsStateSpy).to.have.callCount(2);
+          expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('true');
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
+
+          impl.showSlide_(4);
+
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[0],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[4],
+            true
+          );
+          expect(updateInViewportSpy).to.have.callCount(6);
+          expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[3]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[4]);
+          expect(scheduleLayoutSpy).to.have.callCount(3);
+          expect(schedulePreloadSpy).to.have.callCount(6);
+          expect(impl.slideIndex_).to.equal(4);
+          expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(
+            impl.slideWidth_
+          );
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4, 0]);
+          expect(hideRestOfTheSlidesSpy).to.have.callCount(3);
+          expect(setControlsStateSpy).to.have.callCount(3);
+          expect(impl.slides_[3].getAttribute('aria-hidden')).to.equal('true');
+          expect(impl.slides_[4].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
+        });
+      });
 
-        args = {'index': 'ssds11'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.not.have.been.called;
+      it('show correct slides when looping with `autoplay` for 2 slides', () => {
+        return getAmpSlideScroll(true, 2).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const updateInViewportSpy = sandbox.spy(impl, 'updateInViewport');
+          const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          const schedulePreloadSpy = sandbox.spy(impl, 'schedulePreload');
+          const hideRestOfTheSlidesSpy = sandbox.spy(
+            impl,
+            'hideRestOfTheSlides_'
+          );
+          const setControlsStateSpy = sandbox.spy(impl, 'setControlsState');
+
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
+
+          impl.showSlide_(1);
+
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[0],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[1],
+            true
+          );
+          expect(updateInViewportSpy).to.have.callCount(2);
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(scheduleLayoutSpy).to.be.calledOnce;
+          expect(schedulePreloadSpy).to.have.callCount(1);
+          expect(impl.slideIndex_).to.equal(1);
+          expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(
+            impl.slideWidth_
+          );
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
+          expect(hideRestOfTheSlidesSpy).to.be.calledOnce;
+          expect(setControlsStateSpy).to.be.calledOnce;
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('true');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('false');
+
+          impl.showSlide_(0);
+
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[1],
+            false
+          );
+          expect(updateInViewportSpy).to.have.been.calledWith(
+            impl.slides_[0],
+            true
+          );
+          expect(updateInViewportSpy).to.have.callCount(4);
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(scheduleLayoutSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(schedulePreloadSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(scheduleLayoutSpy).to.have.callCount(2);
+          expect(schedulePreloadSpy).to.have.callCount(2);
+          expect(impl.slideIndex_).to.equal(0);
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1]);
+          expect(hideRestOfTheSlidesSpy).to.have.callCount(2);
+          expect(setControlsStateSpy).to.have.callCount(2);
+          expect(impl.slides_[0].getAttribute('aria-hidden')).to.equal('false');
+          expect(impl.slides_[1].getAttribute('aria-hidden')).to.equal('true');
+        });
+      });
 
-        args = {'index': '-1'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.not.have.been.called;
+      it('do not set `autoplay` status if `autoplay=0` specified', () => {
+        return getAmpSlideScroll(false, 3, true, true, 0).then(
+          ampSlideScroll => {
+            const impl = ampSlideScroll.implementation_;
+            const setupAutoplaySpy = sandbox.spy(impl, 'setupAutoplay_');
+            expect(setupAutoplaySpy).to.not.have.been.called;
+          }
+        );
+      });
 
-        args = {'index': '0'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.have.been.calledWith(0);
+      it('removes `autoplay` status after provided loops are made', () => {
+        return getAmpSlideScroll(false, 3, true, true, 2).then(
+          ampSlideScroll => {
+            const impl = ampSlideScroll.implementation_;
+            const removeAutoplaySpy = sandbox.spy(impl, 'removeAutoplay');
+            impl.showSlide_(1);
+            impl.showSlide_(2);
+            expect(impl.loopsMade_).to.equal(1);
+            impl.showSlide_(0);
+            impl.showSlide_(1);
+            impl.showSlide_(2);
+            expect(impl.loopsMade_).to.equal(2);
+            expect(removeAutoplaySpy).to.have.been.called;
+            expect(ampSlideScroll.hasAttribute('loop')).to.be.false;
+          }
+        );
+      });
 
-        args = {'index': '4'};
-        impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-        expect(showSlideSpy).to.have.been.calledWith(4);
+      // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+      it.skip('should hide unwanted slides when looping', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const schedulePauseSpy = sandbox.spy(impl, 'schedulePause');
+          const hideRestOfTheSlidesSpy = sandbox.spy(
+            impl,
+            'hideRestOfTheSlides_'
+          );
+
+          impl.showSlide_(1);
+
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([0, 1, 2]);
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .false;
+
+          expect(impl.slideWrappers_[0].style.order).to.equal('1');
+          expect(impl.slideWrappers_[1].style.order).to.equal('2');
+          expect(impl.slideWrappers_[2].style.order).to.equal('3');
+          expect(impl.slideWrappers_[3].style.order).to.equal('');
+          expect(impl.slideWrappers_[4].style.order).to.equal('');
+
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[4]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
+          expect(schedulePauseSpy).to.have.callCount(3);
+
+          impl.showSlide_(0);
+
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([4, 0, 1]);
+
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[0].style.order).to.equal('2');
+          expect(impl.slideWrappers_[1].style.order).to.equal('3');
+          expect(impl.slideWrappers_[2].style.order).to.equal('');
+          expect(impl.slideWrappers_[3].style.order).to.equal('');
+          expect(impl.slideWrappers_[4].style.order).to.equal('1');
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[2]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[4]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(schedulePauseSpy).to.have.callCount(6);
+
+          impl.showSlide_(4);
+
+          expect(hideRestOfTheSlidesSpy).to.have.been.calledWith([3, 4, 0]);
+
+          expect(impl.slideWrappers_[0].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[1].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(impl.slideWrappers_[2].classList.contains(SHOW_CLASS)).to.be
+            .false;
+          expect(impl.slideWrappers_[3].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[4].classList.contains(SHOW_CLASS)).to.be
+            .true;
+          expect(impl.slideWrappers_[0].style.order).to.equal('3');
+          expect(impl.slideWrappers_[1].style.order).to.equal('');
+          expect(impl.slideWrappers_[2].style.order).to.equal('');
+          expect(impl.slideWrappers_[3].style.order).to.equal('1');
+          expect(impl.slideWrappers_[4].style.order).to.equal('2');
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[3]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[0]);
+          expect(schedulePauseSpy).to.have.been.calledWith(impl.slides_[1]);
+          expect(schedulePauseSpy).to.have.callCount(9);
+        });
       });
-    });
 
-    it('should NOT call showSlide_ before layout', () => {
-      const promise = getAmpSlideScroll(true, 5, /* opt_attachToDom */ false);
-      return promise.then(ampSlideScroll => {
+      it('should show/hide the correct controls when looping', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
 
-        // Layout happens asynchronously after attaching to DOM, so we can
-        // test pre-layoutCallback logic now.
-        doc.body.appendChild(ampSlideScroll);
-        return ampSlideScroll.build().then(() => {
+          impl.showSlide_(1);
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+
+          impl.showSlide_(0);
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+
+          impl.showSlide_(4);
+          expect(impl.hasNext()).to.be.true;
+          expect(impl.hasPrev()).to.be.true;
+          expect(impl.nextButton_.classList.contains('amp-disabled')).to.be
+            .false;
+          expect(impl.prevButton_.classList.contains('amp-disabled')).to.be
+            .false;
+        });
+      });
+
+      it('should set the correct scrollLeft when there is only one slide', () => {
+        return getAmpSlideScroll(true, 1).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+
+          impl.noOfSlides_ = 1;
+          impl.showSlide_(0);
+          expect(impl.slidesContainer_./*OK*/ scrollLeft).to.equal(0);
+        });
+      });
+
+      it('should update to the right slide on scroll', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
           const impl = ampSlideScroll.implementation_;
           const showSlideSpy = sandbox.spy(impl, 'showSlide_');
-          const satisfiesTrust = () => true;
 
-          const args = {'index': '3'};
-          impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
-          expect(showSlideSpy).to.not.have.been.called;
+          impl.vsync_ = {
+            mutate: cb => {
+              cb();
+            },
+          };
 
-          impl.mutatedAttributesCallback({slide: 2});
-          expect(showSlideSpy).to.not.have.been.called;
+          // Move to slide 1 (from slide 0).
+          impl.showSlide_(1);
+          expect(showSlideSpy).to.be.calledWith(1);
+          expect(impl.snappingInProgress_).to.be.false;
+
+          //Move to slide 0 - via scrolling back.
+          impl.updateOnScroll_(1);
+          expect(showSlideSpy).to.be.calledWith(0);
+          expect(impl.slideIndex_).to.equal(0);
+
+          // Try scrolling Fwd and move a little fwd to stay in the same slide.
+          impl.updateOnScroll_(401);
+          expect(showSlideSpy).to.be.calledWith(0);
+          expect(impl.slideIndex_).to.equal(0);
+
+          impl.updateOnScroll_(700);
+          expect(showSlideSpy).to.be.calledWith(1);
+          expect(impl.slideIndex_).to.equal(1);
+
+          impl.showSlide_(4);
+          impl.updateOnScroll_(700);
+          expect(showSlideSpy).to.be.calledWith(0);
+          expect(impl.slideIndex_).to.equal(0);
+
+          impl.updateOnScroll_(1);
+          expect(showSlideSpy).to.be.calledWith(4);
+          expect(impl.slideIndex_).to.equal(4);
+        });
+      });
 
-          impl.onLayoutMeasure();
-          ampSlideScroll.layoutCallback();
+      it('should get the correct next slide index for a scrollLeft', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
 
-          // Should show the last slide index requested before layout.
-          expect(showSlideSpy).to.have.been.calledWith(2);
+          // Already at slide 0;
+
+          expect(impl.getNextSlideIndex_(0)).to.equal(4);
+          expect(impl.getNextSlideIndex_(100)).to.equal(4);
+          expect(impl.getNextSlideIndex_(200)).to.equal(0);
+          expect(impl.getNextSlideIndex_(400)).to.equal(0);
+          expect(impl.getNextSlideIndex_(500)).to.equal(0);
+          expect(impl.getNextSlideIndex_(600)).to.equal(1);
+          expect(impl.getNextSlideIndex_(800)).to.equal(1);
+
+          impl.showSlide_(3);
+
+          expect(impl.getNextSlideIndex_(0)).to.equal(2);
+          expect(impl.getNextSlideIndex_(100)).to.equal(2);
+          expect(impl.getNextSlideIndex_(200)).to.equal(3);
+          expect(impl.getNextSlideIndex_(400)).to.equal(3);
+          expect(impl.getNextSlideIndex_(500)).to.equal(3);
+          expect(impl.getNextSlideIndex_(600)).to.equal(4);
+          expect(impl.getNextSlideIndex_(800)).to.equal(4);
+
+          impl.showSlide_(4);
+          expect(impl.getNextSlideIndex_(0)).to.equal(3);
+          expect(impl.getNextSlideIndex_(100)).to.equal(3);
+          expect(impl.getNextSlideIndex_(200)).to.equal(4);
+          expect(impl.getNextSlideIndex_(400)).to.equal(4);
+          expect(impl.getNextSlideIndex_(500)).to.equal(4);
+          expect(impl.getNextSlideIndex_(600)).to.equal(0);
+          expect(impl.getNextSlideIndex_(800)).to.equal(0);
+        });
+      });
+
+      it('should custom snap to the correct slide', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const animateScrollLeftSpy = sandbox.spy(impl, 'animateScrollLeft_');
+
+          impl.customSnap_(0);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(0, 0);
+          impl.customSnap_(100);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(100, 0);
+          impl.customSnap_(200);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(200, 400);
+          impl.customSnap_(400);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(400, 400);
+          impl.customSnap_(500);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(500, 400);
+          impl.customSnap_(600);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(600, 800);
+          impl.customSnap_(800);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(800, 800);
+
+          impl.customSnap_(400, -1);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(400, 0);
+          impl.customSnap_(400, 1);
+          expect(animateScrollLeftSpy).to.have.been.calledWith(400, 800);
+        });
+      });
+
+      it('should go to the correct slide on button click', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+
+          impl.goCallback(-1);
+          expect(showSlideSpy).to.have.been.calledWith(4);
           expect(showSlideSpy).to.be.calledOnce;
+
+          impl.goCallback(1);
+          expect(showSlideSpy).to.have.been.calledWith(0);
+          expect(showSlideSpy).to.have.callCount(2);
+
+          impl.goCallback(1);
+          expect(showSlideSpy).to.have.been.calledWith(1);
+          expect(showSlideSpy).to.have.callCount(3);
         });
       });
-    });
 
-    it('should NOT call showSlide_ before re-layout', () => {
-      return getAmpSlideScroll(false, 5, false).then(ampSlideScroll => {
+      // TODO(#17197): This test triggers sinonjs/sinon issues 1709 and 1321.
+      it.skip('should update slide when `slide` attribute is mutated', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          expectAsyncConsoleError(/Invalid \[slide\] value:/, 1);
+
+          const impl = ampSlideScroll.implementation_;
+          const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+
+          impl.mutatedAttributesCallback({slide: 2});
+          expect(showSlideSpy).to.have.been.calledWith(2);
+
+          impl.mutatedAttributesCallback({slide: 0});
+          expect(showSlideSpy).to.have.been.calledWith(0);
+
+          // Don't call showSlide_() if slide is not finite.
+          showSlideSpy.resetHistory();
+          impl.mutatedAttributesCallback({slide: Number.POSITIVE_INFINITY});
+          expect(showSlideSpy.called).to.be.false;
+        });
+      });
+
+      it('should trigger `slideChange` action when user changes slides', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          const impl = ampSlideScroll.implementation_;
+          const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+
+          impl.goCallback(-1, /* animate */ false);
+          expect(triggerSpy).to.have.been.calledWith(
+            ampSlideScroll,
+            'slideChange',
+            /* CustomEvent */ sinon.match.has('detail', {index: 4})
+          );
+
+          impl.goCallback(1, /* animate */ false);
+          expect(triggerSpy).to.have.been.calledWith(
+            ampSlideScroll,
+            'slideChange',
+            /* CustomEvent */ sinon.match.has('detail', {index: 0})
+          );
+        });
+      });
+
+      it('should goToSlide on action', () => {
+        return getAmpSlideScroll(true).then(ampSlideScroll => {
+          expectAsyncConsoleError(/Invalid \[slide\] value:/, 4);
 
-        doc.body.appendChild(ampSlideScroll);
-        return ampSlideScroll.build().then(() => {
           const impl = ampSlideScroll.implementation_;
           const showSlideSpy = sandbox.spy(impl, 'showSlide_');
           const satisfiesTrust = () => true;
 
-          // Test that showSlide_ due to goToSlide(index=1) is not called before
-          // layout.
-          let args = {'index': '1'};
+          let args = {'index': '123'};
           impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
           expect(showSlideSpy).to.not.have.been.called;
 
-          // Test that showSlide_ is called after layout.
-          impl.onLayoutMeasure();
-          ampSlideScroll.layoutCallback();
-
-          expect(showSlideSpy).to.have.been.calledWith(1);
-          expect(showSlideSpy).to.be.calledOnce;
+          args = {'index': '5'};
+          impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+          expect(showSlideSpy).to.not.have.been.called;
 
-          // Unlayout
-          showSlideSpy.resetHistory();
-          impl.unlayoutCallback();
+          args = {'index': 'ssds11'};
+          impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+          expect(showSlideSpy).to.not.have.been.called;
 
-          // Test that showSlide_ due to goToSlide(index=4) is not called before
-          // layout.
-          args = {'index': '4'};
+          args = {'index': '-1'};
           impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
           expect(showSlideSpy).to.not.have.been.called;
 
-          // Test that showSlide_ is called after layout.
-          impl.onLayoutMeasure();
-          ampSlideScroll.layoutCallback();
+          args = {'index': '0'};
+          impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+          expect(showSlideSpy).to.have.been.calledWith(0);
 
+          args = {'index': '4'};
+          impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
           expect(showSlideSpy).to.have.been.calledWith(4);
-          expect(showSlideSpy).to.be.calledOnce;
+        });
+      });
+
+      it('should NOT call showSlide_ before layout', () => {
+        const promise = getAmpSlideScroll(true, 5, /* opt_attachToDom */ false);
+        return promise.then(ampSlideScroll => {
+          // Layout happens asynchronously after attaching to DOM, so we can
+          // test pre-layoutCallback logic now.
+          doc.body.appendChild(ampSlideScroll);
+          return ampSlideScroll.build().then(() => {
+            const impl = ampSlideScroll.implementation_;
+            const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+            const satisfiesTrust = () => true;
+
+            const args = {'index': '3'};
+            impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+            expect(showSlideSpy).to.not.have.been.called;
+
+            impl.mutatedAttributesCallback({slide: 2});
+            expect(showSlideSpy).to.not.have.been.called;
+
+            impl.onLayoutMeasure();
+            ampSlideScroll.layoutCallback();
+
+            // Should show the last slide index requested before layout.
+            expect(showSlideSpy).to.have.been.calledWith(2);
+            expect(showSlideSpy).to.be.calledOnce;
+          });
+        });
+      });
+
+      it('should NOT call showSlide_ before re-layout', () => {
+        return getAmpSlideScroll(false, 5, false).then(ampSlideScroll => {
+          doc.body.appendChild(ampSlideScroll);
+          return ampSlideScroll.build().then(() => {
+            const impl = ampSlideScroll.implementation_;
+            const showSlideSpy = sandbox.spy(impl, 'showSlide_');
+            const satisfiesTrust = () => true;
+
+            // Test that showSlide_ due to goToSlide(index=1) is not called before
+            // layout.
+            let args = {'index': '1'};
+            impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+            expect(showSlideSpy).to.not.have.been.called;
+
+            // Test that showSlide_ is called after layout.
+            impl.onLayoutMeasure();
+            ampSlideScroll.layoutCallback();
+
+            expect(showSlideSpy).to.have.been.calledWith(1);
+            expect(showSlideSpy).to.be.calledOnce;
+
+            // Unlayout
+            showSlideSpy.resetHistory();
+            impl.unlayoutCallback();
+
+            // Test that showSlide_ due to goToSlide(index=4) is not called before
+            // layout.
+            args = {'index': '4'};
+            impl.executeAction({method: 'goToSlide', args, satisfiesTrust});
+            expect(showSlideSpy).to.not.have.been.called;
+
+            // Test that showSlide_ is called after layout.
+            impl.onLayoutMeasure();
+            ampSlideScroll.layoutCallback();
+
+            expect(showSlideSpy).to.have.been.calledWith(4);
+            expect(showSlideSpy).to.be.calledOnce;
+          });
         });
       });
     });
-  });
 
-  describe('button titles', () => {
-    function getNextTitle(el) {
-      return el.querySelector('.amp-carousel-button-next')
+    describe('button titles', () => {
+      function getNextTitle(el) {
+        return el
+          .querySelector('.amp-carousel-button-next')
           .getAttribute('title');
-    }
+      }
 
-    function getPrevTitle(el) {
-      return el.querySelector('.amp-carousel-button-prev')
+      function getPrevTitle(el) {
+        return el
+          .querySelector('.amp-carousel-button-prev')
           .getAttribute('title');
-    }
+      }
 
-    describe('when not looping', () => {
-      it('should have the correct values on the first index', function* () {
-        const el = yield getAmpSlideScroll(false, 3);
-        expect(getPrevTitle(el)).to.equal('Previous item in carousel (1 of 3)');
-        expect(getNextTitle(el)).to.equal('Next item in carousel (2 of 3)');
-      });
+      describe('when not looping', () => {
+        it('should have the correct values on the first index', function*() {
+          const el = yield getAmpSlideScroll(false, 3);
+          expect(getPrevTitle(el)).to.equal(
+            'Previous item in carousel (1 of 3)'
+          );
+          expect(getNextTitle(el)).to.equal('Next item in carousel (2 of 3)');
+        });
 
-      it('should have the correct values on the last index', function* () {
-        const el = yield getAmpSlideScroll(false, 3);
-        el.implementation_.showSlide_(2);
-        expect(getPrevTitle(el)).to.equal('Previous item in carousel (2 of 3)');
-        expect(getNextTitle(el)).to.equal('Next item in carousel (3 of 3)');
+        it('should have the correct values on the last index', function*() {
+          const el = yield getAmpSlideScroll(false, 3);
+          el.implementation_.showSlide_(2);
+          expect(getPrevTitle(el)).to.equal(
+            'Previous item in carousel (2 of 3)'
+          );
+          expect(getNextTitle(el)).to.equal('Next item in carousel (3 of 3)');
+        });
       });
-    });
 
-    describe('when looping', () => {
-      it('should have the correct values on the first index', function* () {
-        const el = yield getAmpSlideScroll(true, 3);
-        expect(getPrevTitle(el)).to.equal('Previous item in carousel (3 of 3)');
-        expect(getNextTitle(el)).to.equal('Next item in carousel (2 of 3)');
-      });
+      describe('when looping', () => {
+        it('should have the correct values on the first index', function*() {
+          const el = yield getAmpSlideScroll(true, 3);
+          expect(getPrevTitle(el)).to.equal(
+            'Previous item in carousel (3 of 3)'
+          );
+          expect(getNextTitle(el)).to.equal('Next item in carousel (2 of 3)');
+        });
 
-      it('should have the correct values on the last index', function* () {
-        const el = yield getAmpSlideScroll(true, 3);
-        el.implementation_.showSlide_(2);
-        expect(getPrevTitle(el)).to.equal('Previous item in carousel (2 of 3)');
-        expect(getNextTitle(el)).to.equal('Next item in carousel (1 of 3)');
+        it('should have the correct values on the last index', function*() {
+          const el = yield getAmpSlideScroll(true, 3);
+          el.implementation_.showSlide_(2);
+          expect(getPrevTitle(el)).to.equal(
+            'Previous item in carousel (2 of 3)'
+          );
+          expect(getNextTitle(el)).to.equal('Next item in carousel (1 of 3)');
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-connatix-player/0.1/amp-connatix-player.js b/extensions/amp-connatix-player/0.1/amp-connatix-player.js
index 18a16dc34edc..4b37053ff934 100644
--- a/extensions/amp-connatix-player/0.1/amp-connatix-player.js
+++ b/extensions/amp-connatix-player/0.1/amp-connatix-player.js
@@ -22,7 +22,6 @@ import {removeElement} from '../../../src/dom';
 import {userAssert} from '../../../src/log';
 
 export class AmpConnatixPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -50,8 +49,10 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
   sendCommand_(command) {
     if (this.iframe_ && this.iframe_.contentWindow) {
       // Send message to the player
-      this.iframe_.contentWindow./*OK*/postMessage(command,
-          this.iframeDomain_);
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        command,
+        this.iframeDomain_
+      );
     }
   }
 
@@ -93,13 +94,13 @@ export class AmpConnatixPlayer extends AMP.BaseElement {
 
     // Player id is mandatory
     this.playerId_ = userAssert(
-        element.getAttribute('data-player-id'),
-        'The data-player-id attribute is required for <amp-connatix-player> %s',
-        element);
+      element.getAttribute('data-player-id'),
+      'The data-player-id attribute is required for <amp-connatix-player> %s',
+      element
+    );
 
     // Media id is optional
-    this.mediaId_ = element.getAttribute('data-media-id') ||
-        '';
+    this.mediaId_ = element.getAttribute('data-media-id') || '';
 
     this.bindToPlayerCommands_();
   }
diff --git a/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js b/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
index bce547030c0a..facd1a5c6970 100644
--- a/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
+++ b/extensions/amp-connatix-player/0.1/test/test-amp-connatix-player.js
@@ -16,75 +16,84 @@
 
 import '../amp-connatix-player';
 
-describes.realWin('amp-connatix-player', {
-  amp: {
-    extensions: ['amp-connatix-player'],
+describes.realWin(
+  'amp-connatix-player',
+  {
+    amp: {
+      extensions: ['amp-connatix-player'],
+    },
   },
-}, env => {
+  env => {
+    let win;
+    let doc;
 
-  let win;
-  let doc;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    function getConnatixPlayer(attributes) {
+      const cnx = doc.createElement('amp-connatix-player');
+      for (const key in attributes) {
+        cnx.setAttribute(key, attributes[key]);
+      }
+      cnx.setAttribute('width', '480');
+      cnx.setAttribute('height', '270');
+      cnx.setAttribute('layout', 'responsive');
 
-  function getConnatixPlayer(attributes) {
-    const cnx = doc.createElement('amp-connatix-player');
-    for (const key in attributes) {
-      cnx.setAttribute(key, attributes[key]);
+      doc.body.appendChild(cnx);
+      return cnx.build().then(() => {
+        cnx.layoutCallback();
+        return cnx;
+      });
     }
-    cnx.setAttribute('width', '480');
-    cnx.setAttribute('height', '270');
-    cnx.setAttribute('layout', 'responsive');
-
-    doc.body.appendChild(cnx);
-    return cnx.build().then(() => { cnx.layoutCallback(); return cnx; });
-  }
 
-  it('renders', async() => {
-    const cnx = await getConnatixPlayer({
-      'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+    it('renders', async () => {
+      const cnx = await getConnatixPlayer({
+        'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+      });
+      const iframe = cnx.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://cds.connatix.com/embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9'
+      );
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
     });
-    const iframe = cnx.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://cds.connatix.com/embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-  });
 
-  it('renders with a mediaId', async() => {
-    const cnx = await getConnatixPlayer({
-      'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
-      'data-media-id': '527207df-2007-43c4-b87a-f90814bafd2e',
+    it('renders with a mediaId', async () => {
+      const cnx = await getConnatixPlayer({
+        'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+        'data-media-id': '527207df-2007-43c4-b87a-f90814bafd2e',
+      });
+      const iframe = cnx.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://cds.connatix.com/embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&mediaId=527207df-2007-43c4-b87a-f90814bafd2e'
+      );
     });
-    const iframe = cnx.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://cds.connatix.com/embed/index.html?playerId=f721b0d8-7a79-42b6-b637-fa4e86138ed9&mediaId=527207df-2007-43c4-b87a-f90814bafd2e');
-  });
 
-  it('fails if no playerId is specified', () => {
-    return allowConsoleError(() => { return getConnatixPlayer({
-      'data-media-id': '527207df-2007-43c4-b87a-f90814bafd2e',
-    }).should.eventually.be.rejectedWith(
-        /The data-player-id attribute is required for/);
+    it('fails if no playerId is specified', () => {
+      return allowConsoleError(() => {
+        return getConnatixPlayer({
+          'data-media-id': '527207df-2007-43c4-b87a-f90814bafd2e',
+        }).should.eventually.be.rejectedWith(
+          /The data-player-id attribute is required for/
+        );
+      });
     });
-  });
 
-  it('removes iframe after unlayoutCallback', async() => {
-    const cnx = await getConnatixPlayer({
-      'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+    it('removes iframe after unlayoutCallback', async () => {
+      const cnx = await getConnatixPlayer({
+        'data-player-id': 'f721b0d8-7a79-42b6-b637-fa4e86138ed9',
+      });
+      const iframe = cnx.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      const obj = cnx.implementation_;
+      obj.unlayoutCallback();
+      expect(cnx.querySelector('iframe')).to.be.null;
+      expect(obj.iframe_).to.be.null;
     });
-    const iframe = cnx.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    const obj = cnx.implementation_;
-    obj.unlayoutCallback();
-    expect(cnx.querySelector('iframe')).to.be.null;
-    expect(obj.iframe_).to.be.null;
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-consent/0.1/amp-consent.js b/extensions/amp-consent/0.1/amp-consent.js
index 52e1c9adc322..17720370366e 100644
--- a/extensions/amp-consent/0.1/amp-consent.js
+++ b/extensions/amp-consent/0.1/amp-consent.js
@@ -110,8 +110,10 @@ export class AmpConsent extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(this.element.getAttribute('id'),
-        'amp-consent should have an id');
+    userAssert(
+      this.element.getAttribute('id'),
+      'amp-consent should have an id'
+    );
 
     const config = new ConsentConfig(this.element);
 
@@ -121,8 +123,11 @@ export class AmpConsent extends AMP.BaseElement {
     this.consentId_ = this.consentConfig_['consentInstanceId'];
 
     if (this.consentConfig_['postPromptUI']) {
-      this.postPromptUI_ =
-          new ConsentUI(this, dict({}), this.consentConfig_['postPromptUI']);
+      this.postPromptUI_ = new ConsentUI(
+        this,
+        dict({}),
+        this.consentConfig_['postPromptUI']
+      );
     }
 
     /**
@@ -145,7 +150,9 @@ export class AmpConsent extends AMP.BaseElement {
     const policyConfig = this.consentConfig_['policy'] || dict({});
 
     this.policyConfig_ = expandPolicyConfig(
-        policyConfig, /** @type {string} */ (this.consentId_));
+      policyConfig,
+      /** @type {string} */ (this.consentId_)
+    );
 
     const children = this.getRealChildren();
     for (let i = 0; i < children.length; i++) {
@@ -155,44 +162,47 @@ export class AmpConsent extends AMP.BaseElement {
       this.setAsOwner(child);
     }
 
-    const consentPolicyManagerPromise =
-        getServicePromiseForDoc(this.getAmpDoc(), CONSENT_POLICY_MANAGER)
-            .then(manager => {
-              this.consentPolicyManager_ = /** @type {!ConsentPolicyManager} */ (
-                manager);
-              this.consentPolicyManager_.setLegacyConsentInstanceId(
-                  /** @type {string} */ (this.consentId_));
-              const policyKeys =
-                  Object.keys(/** @type {!Object} */ (this.policyConfig_));
-              for (let i = 0; i < policyKeys.length; i++) {
-                this.consentPolicyManager_.registerConsentPolicyInstance(
-                    policyKeys[i], this.policyConfig_[policyKeys[i]]);
-              }
-            });
-
-    const consentStateManagerPromise =
-        getServicePromiseForDoc(this.getAmpDoc(), CONSENT_STATE_MANAGER)
-            .then(manager => {
-              manager.registerConsentInstance(
-                  this.consentId_, this.consentConfig_);
-              this.consentStateManager_ = /** @type {!ConsentStateManager} */ (
-                manager);
-            });
-
-    const notificationUiManagerPromise =
-        getServicePromiseForDoc(this.getAmpDoc(), NOTIFICATION_UI_MANAGER)
-            .then(manager => {
-              this.notificationUiManager_ = /** @type {!NotificationUiManager} */ (
-                manager);
-            });
+    const consentPolicyManagerPromise = getServicePromiseForDoc(
+      this.getAmpDoc(),
+      CONSENT_POLICY_MANAGER
+    ).then(manager => {
+      this.consentPolicyManager_ = /** @type {!ConsentPolicyManager} */ (manager);
+      this.consentPolicyManager_.setLegacyConsentInstanceId(
+        /** @type {string} */ (this.consentId_)
+      );
+      const policyKeys = Object.keys(
+        /** @type {!Object} */ (this.policyConfig_)
+      );
+      for (let i = 0; i < policyKeys.length; i++) {
+        this.consentPolicyManager_.registerConsentPolicyInstance(
+          policyKeys[i],
+          this.policyConfig_[policyKeys[i]]
+        );
+      }
+    });
+
+    const consentStateManagerPromise = getServicePromiseForDoc(
+      this.getAmpDoc(),
+      CONSENT_STATE_MANAGER
+    ).then(manager => {
+      manager.registerConsentInstance(this.consentId_, this.consentConfig_);
+      this.consentStateManager_ = /** @type {!ConsentStateManager} */ (manager);
+    });
+
+    const notificationUiManagerPromise = getServicePromiseForDoc(
+      this.getAmpDoc(),
+      NOTIFICATION_UI_MANAGER
+    ).then(manager => {
+      this.notificationUiManager_ = /** @type {!NotificationUiManager} */ (manager);
+    });
 
     Promise.all([
       consentStateManagerPromise,
       notificationUiManagerPromise,
-      consentPolicyManagerPromise])
-        .then(() => {
-          this.init_();
-        });
+      consentPolicyManagerPromise,
+    ]).then(() => {
+      this.init_();
+    });
   }
 
   /**
@@ -238,18 +248,27 @@ export class AmpConsent extends AMP.BaseElement {
         user().error(TAG, 'consent-response message missing required info');
         return;
       }
-      if (isExperimentOn(this.win, 'amp-consent-v2') &&
-          data['info'] !== undefined) {
+      if (
+        isExperimentOn(this.win, 'amp-consent-v2') &&
+        data['info'] !== undefined
+      ) {
         if (typeof data['info'] != 'string') {
-          user().error(TAG, 'consent-response info only supports string, ' +
-              '%s, treated as undefined', data['info']);
+          user().error(
+            TAG,
+            'consent-response info only supports string, ' +
+              '%s, treated as undefined',
+            data['info']
+          );
           data['info'] = undefined;
         }
         if (data['action'] === ACTION_TYPE.DISMISS) {
           if (data['info']) {
-            this.user().error(TAG,
-                'Consent string value %s not applicable on user dismiss, ' +
-              'stored value will be kept and used', consentString);
+            this.user().error(
+              TAG,
+              'Consent string value %s not applicable on user dismiss, ' +
+                'stored value will be kept and used',
+              consentString
+            );
           }
           data['info'] = undefined;
         }
@@ -293,7 +312,7 @@ export class AmpConsent extends AMP.BaseElement {
 
     this.consentUIPending_ = true;
     this.notificationUiManager_.registerUI(
-        this.show_.bind(this, isActionPromptTrigger)
+      this.show_.bind(this, isActionPromptTrigger)
     );
   }
 
@@ -305,8 +324,7 @@ export class AmpConsent extends AMP.BaseElement {
    */
   show_(isActionPromptTrigger) {
     if (this.isPromptUIOn_) {
-      dev().error(TAG,
-          'Attempt to show an already displayed prompt UI');
+      dev().error(TAG, 'Attempt to show an already displayed prompt UI');
     }
 
     this.vsync_.mutate(() => {
@@ -362,16 +380,19 @@ export class AmpConsent extends AMP.BaseElement {
     if (action == ACTION_TYPE.ACCEPT) {
       //accept
       this.consentStateManager_.updateConsentInstanceState(
-          CONSENT_ITEM_STATE.ACCEPTED,
-          consentString);
+        CONSENT_ITEM_STATE.ACCEPTED,
+        consentString
+      );
     } else if (action == ACTION_TYPE.REJECT) {
       // reject
       this.consentStateManager_.updateConsentInstanceState(
-          CONSENT_ITEM_STATE.REJECTED,
-          consentString);
+        CONSENT_ITEM_STATE.REJECTED,
+        consentString
+      );
     } else if (action == ACTION_TYPE.DISMISS) {
       this.consentStateManager_.updateConsentInstanceState(
-          CONSENT_ITEM_STATE.DISMISSED);
+        CONSENT_ITEM_STATE.DISMISSED
+      );
     }
 
     // Hide current dialog
@@ -385,16 +406,19 @@ export class AmpConsent extends AMP.BaseElement {
     this.passSharedData_();
     this.maybeSetDirtyBit_();
 
-    this.getConsentRequiredPromise_().then(isConsentRequired => {
-      return this.initPromptUI_(isConsentRequired);
-    }).then(isPostPromptUIRequired => {
-      if (isPostPromptUIRequired) {
-        this.handlePostPromptUI_();
-      }
-      this.consentPolicyManager_.enableTimeout();
-    }).catch(unusedError => {
-      // TODO: Handle errors
-    });
+    this.getConsentRequiredPromise_()
+      .then(isConsentRequired => {
+        return this.initPromptUI_(isConsentRequired);
+      })
+      .then(isPostPromptUIRequired => {
+        if (isPostPromptUIRequired) {
+          this.handlePostPromptUI_();
+        }
+        this.consentPolicyManager_.enableTimeout();
+      })
+      .catch(unusedError => {
+        // TODO: Handle errors
+      });
 
     this.enableInteractions_();
   }
@@ -405,27 +429,34 @@ export class AmpConsent extends AMP.BaseElement {
    * @return {!Promise<boolean>}
    */
   getConsentRequiredPromise_() {
-    userAssert(this.consentConfig_['checkConsentHref'] ||
+    userAssert(
+      this.consentConfig_['checkConsentHref'] ||
         this.consentConfig_['promptIfUnknownForGeoGroup'],
-    'neither checkConsentHref nor ' +
-    'promptIfUnknownForGeoGroup is defined');
+      'neither checkConsentHref nor promptIfUnknownForGeoGroup is defined'
+    );
     let consentRequiredPromise = null;
     if (this.consentConfig_['promptIfUnknownForGeoGroup']) {
       const geoGroup = this.consentConfig_['promptIfUnknownForGeoGroup'];
       consentRequiredPromise = this.isConsentRequiredGeo_(geoGroup);
     } else {
-      consentRequiredPromise =
-          this.getConsentRemote_().then(remoteConfigResponse => {
-            if (!remoteConfigResponse ||
-                !hasOwn(remoteConfigResponse, 'promptIfUnknown')) {
-              this.user().error(TAG, 'Expecting promptIfUnknown from ' +
+      consentRequiredPromise = this.getConsentRemote_().then(
+        remoteConfigResponse => {
+          if (
+            !remoteConfigResponse ||
+            !hasOwn(remoteConfigResponse, 'promptIfUnknown')
+          ) {
+            this.user().error(
+              TAG,
+              'Expecting promptIfUnknown from ' +
                 'checkConsentHref when promptIfUnknownForGeoGroup is not ' +
-                'specified');
-              // Set to false if not defined
-              return false;
-            }
-            return !!remoteConfigResponse['promptIfUnknown'];
-          });
+                'specified'
+            );
+            // Set to false if not defined
+            return false;
+          }
+          return !!remoteConfigResponse['promptIfUnknown'];
+        }
+      );
     }
     return consentRequiredPromise.then(required => {
       return !!required;
@@ -466,9 +497,8 @@ export class AmpConsent extends AMP.BaseElement {
    */
   isConsentRequiredGeo_(geoGroup) {
     return Services.geoForDocOrNull(this.element).then(geo => {
-      userAssert(geo,
-          'requires <amp-geo> to use promptIfUnknownForGeoGroup');
-      return (geo.isInCountryGroup(geoGroup) == GEO_IN_GROUP.IN);
+      userAssert(geo, 'requires <amp-geo> to use promptIfUnknownForGeoGroup');
+      return geo.isInCountryGroup(geoGroup) == GEO_IN_GROUP.IN;
     });
   }
 
@@ -484,8 +514,7 @@ export class AmpConsent extends AMP.BaseElement {
     if (!this.consentConfig_['checkConsentHref']) {
       this.remoteConfigPromise_ = Promise.resolve(null);
     } else {
-      const storeConsentPromise =
-          this.consentStateManager_.getLastConsentInstanceInfo();
+      const storeConsentPromise = this.consentStateManager_.getLastConsentInstanceInfo();
       this.remoteConfigPromise_ = storeConsentPromise.then(storedInfo => {
         // Note: Expect the request to look different in following versions.
         const request = /** @type {!JsonObject} */ ({
@@ -503,8 +532,7 @@ export class AmpConsent extends AMP.BaseElement {
           body: request,
           requireAmpResponseSourceOrigin: false,
         };
-        const href =
-          this.consentConfig_['checkConsentHref'];
+        const href = this.consentConfig_['checkConsentHref'];
         assertHttpsUrl(href, this.element);
         const ampdoc = this.getAmpDoc();
         const sourceBase = getSourceUrl(ampdoc.getUrl());
@@ -512,8 +540,8 @@ export class AmpConsent extends AMP.BaseElement {
         const viewer = Services.viewerForDoc(ampdoc);
         return viewer.whenFirstVisible().then(() => {
           return Services.xhrFor(this.win)
-              .fetchJson(resolvedHref, init)
-              .then(res => res.json());
+            .fetchJson(resolvedHref, init)
+            .then(res => res.json());
         });
       });
     }
@@ -526,31 +554,35 @@ export class AmpConsent extends AMP.BaseElement {
    * @return {Promise<boolean>}
    */
   initPromptUI_(isConsentRequired) {
-    this.consentUI_ = new ConsentUI(this,
-        /** @type {!JsonObject} */ (
-          devAssert(this.consentConfig_, 'consent config not found')));
+    this.consentUI_ = new ConsentUI(
+      this,
+      /** @type {!JsonObject} */ (devAssert(
+        this.consentConfig_,
+        'consent config not found'
+      ))
+    );
 
     // Get current consent state
-    return this.consentStateManager_.getConsentInstanceInfo()
-        .then(info => {
-          if (hasStoredValue(info)) {
-            // Has user stored value, no need to prompt
-            return true;
-          }
-          if (!isConsentRequired) {
-            // no need to prompt if remote reponse say so
-            // Also no need to display postPromptUI
-            this.consentStateManager_.updateConsentInstanceState(
-                CONSENT_ITEM_STATE.NOT_REQUIRED);
-            return false;
-          }
-          // Prompt
-          this.scheduleDisplay_(false);
-          return true;
-          // TODO(@zhouyx):
-          // Race condition on consent state change between schedule to
-          // display and display. Add one more check before display
-        });
+    return this.consentStateManager_.getConsentInstanceInfo().then(info => {
+      if (hasStoredValue(info)) {
+        // Has user stored value, no need to prompt
+        return true;
+      }
+      if (!isConsentRequired) {
+        // no need to prompt if remote reponse say so
+        // Also no need to display postPromptUI
+        this.consentStateManager_.updateConsentInstanceState(
+          CONSENT_ITEM_STATE.NOT_REQUIRED
+        );
+        return false;
+      }
+      // Prompt
+      this.scheduleDisplay_(false);
+      return true;
+      // TODO(@zhouyx):
+      // Race condition on consent state change between schedule to
+      // display and display. Add one more check before display
+    });
   }
 
   /**
@@ -577,7 +609,6 @@ export class AmpConsent extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-consent', '0.1', AMP => {
   AMP.registerElement('amp-consent', AmpConsent, CSS);
   AMP.registerServiceForDoc(NOTIFICATION_UI_MANAGER, NotificationUiManager);
diff --git a/extensions/amp-consent/0.1/cmps.js b/extensions/amp-consent/0.1/cmps.js
index f4e03e4ec8f5..1460e2a1100c 100644
--- a/extensions/amp-consent/0.1/cmps.js
+++ b/extensions/amp-consent/0.1/cmps.js
@@ -25,7 +25,7 @@ import {getMode} from '../../../src/mode';
  * }
  */
 
-export const CMP_CONFIG = ({});
+export const CMP_CONFIG = {};
 
 if (getMode().test || getMode().localDev) {
   CMP_CONFIG['_ping_'] = {
diff --git a/extensions/amp-consent/0.1/consent-config.js b/extensions/amp-consent/0.1/consent-config.js
index 6de1562210f7..adfb44b6f610 100644
--- a/extensions/amp-consent/0.1/consent-config.js
+++ b/extensions/amp-consent/0.1/consent-config.js
@@ -32,7 +32,6 @@ const ALLOWED_DEPR_CONSENTINSTANCE_ATTRS = {
 };
 
 export class ConsentConfig {
-
   /** @param {!Element} element */
   constructor(element) {
     /** @private {!Element} */
@@ -64,8 +63,11 @@ export class ConsentConfig {
     const consentsConfigDepr = config['consents'];
     if (!isExperimentOn(this.win_, 'amp-consent-v2')) {
       userAssert(consentsConfigDepr, '%s: consents config is required', TAG);
-      userAssert(Object.keys(consentsConfigDepr).length != 0,
-          '%s: can\'t find consent instance', TAG);
+      userAssert(
+        Object.keys(consentsConfigDepr).length != 0,
+        "%s: can't find consent instance",
+        TAG
+      );
     }
 
     if (!config['consents']) {
@@ -75,8 +77,11 @@ export class ConsentConfig {
     // Assert single consent instance
     const keys = Object.keys(consentsConfigDepr);
 
-    userAssert(keys.length <= 1,
-        '%s: only single consent instance is supported', TAG);
+    userAssert(
+      keys.length <= 1,
+      '%s: only single consent instance is supported',
+      TAG
+    );
 
     if (keys.length > 0) {
       config['consentInstanceId'] = keys[0];
@@ -108,16 +113,25 @@ export class ConsentConfig {
    */
   validateAndParseConfig_() {
     const inlineConfig = this.convertInlineConfigFormat_(
-        /** @type {!JsonObject} */ (
-          userAssert(this.getInlineConfig_(), '%s: Inline config not found')));
+      /** @type {!JsonObject} */ (userAssert(
+        this.getInlineConfig_(),
+        '%s: Inline config not found'
+      ))
+    );
 
     const cmpConfig = this.getCMPConfig_();
 
-    const config = /** @type {!JsonObject} */
-        (deepMerge(cmpConfig || {}, inlineConfig || {}, 1));
+    const config = /** @type {!JsonObject} */ (deepMerge(
+      cmpConfig || {},
+      inlineConfig || {},
+      1
+    ));
 
-    userAssert(config['consentInstanceId'],
-        '%s: consentInstanceId to store consent info is required', TAG);
+    userAssert(
+      config['consentInstanceId'],
+      '%s: consentInstanceId to store consent info is required',
+      TAG
+    );
 
     if (config['policy']) {
       // Only respect 'default' consent policy;
@@ -125,8 +139,11 @@ export class ConsentConfig {
       // TODO (@zhouyx): Validate waitFor value
       for (let i = 0; i < keys.length; i++) {
         if (keys[i] != 'default') {
-          user().warn(TAG, 'policy %s is currently not supported ' +
-            'and will be ignored', keys[i]);
+          user().warn(
+            TAG,
+            'policy %s is currently not supported and will be ignored',
+            keys[i]
+          );
           delete config['policy'][keys[i]];
         }
       }
@@ -182,8 +199,11 @@ export class ConsentConfig {
    * @param {!JsonObject} config
    */
   validateCMPConfig_(config) {
-    const assertValues =
-        ['consentInstanceId', 'checkConsentHref', 'promptUISrc'];
+    const assertValues = [
+      'consentInstanceId',
+      'checkConsentHref',
+      'promptUISrc',
+    ];
     for (let i = 0; i < assertValues.length; i++) {
       const attribute = assertValues[i];
       devAssert(config[attribute], 'CMP config must specify %s', attribute);
diff --git a/extensions/amp-consent/0.1/consent-info.js b/extensions/amp-consent/0.1/consent-info.js
index 2cbb834da425..78bb073fca9a 100644
--- a/extensions/amp-consent/0.1/consent-info.js
+++ b/extensions/amp-consent/0.1/consent-info.js
@@ -18,7 +18,6 @@ import {dev} from '../../../src/log';
 import {hasOwn, map} from '../../../src/utils/object';
 import {isEnumValue, isObject} from '../../../src/types';
 
-
 /**
  * Key values for retriving/storing consent info object.
  * STATE: Set when user accept or reject consent.
@@ -64,7 +63,10 @@ export let ConsentInfoDef;
 export function getStoredConsentInfo(value) {
   if (value === undefined) {
     return constructConsentInfo(
-        CONSENT_ITEM_STATE.UNKNOWN, undefined, undefined);
+      CONSENT_ITEM_STATE.UNKNOWN,
+      undefined,
+      undefined
+    );
   }
   if (typeof value === 'boolean') {
     // legacy format
@@ -75,9 +77,11 @@ export function getStoredConsentInfo(value) {
   }
 
   const consentState = convertValueToState(value[STORAGE_KEY.STATE]);
-  return constructConsentInfo(consentState,
-      value[STORAGE_KEY.STRING],
-      (value[STORAGE_KEY.IS_DIRTY] && value[STORAGE_KEY.IS_DIRTY] === 1));
+  return constructConsentInfo(
+    consentState,
+    value[STORAGE_KEY.STRING],
+    value[STORAGE_KEY.IS_DIRTY] && value[STORAGE_KEY.IS_DIRTY] === 1
+  );
 }
 
 /**
@@ -104,8 +108,10 @@ export function recalculateConsentStateValue(newState, previousState) {
   if (!isEnumValue(CONSENT_ITEM_STATE, newState)) {
     newState = CONSENT_ITEM_STATE.UNKNOWN;
   }
-  if (newState == CONSENT_ITEM_STATE.DISMISSED ||
-      newState == CONSENT_ITEM_STATE.UNKNOWN) {
+  if (
+    newState == CONSENT_ITEM_STATE.DISMISSED ||
+    newState == CONSENT_ITEM_STATE.UNKNOWN
+  ) {
     return previousState || CONSENT_ITEM_STATE.UNKNOWN;
   }
   if (newState == CONSENT_ITEM_STATE.NOT_REQUIRED) {
@@ -123,9 +129,11 @@ export function recalculateConsentStateValue(newState, previousState) {
  * @return {?boolean|Object}
  */
 export function composeStoreValue(consentInfo, opt_forceNew) {
-  if (!opt_forceNew &&
-      !consentInfo['consentString'] &&
-      consentInfo['isDirty'] === undefined) {
+  if (
+    !opt_forceNew &&
+    !consentInfo['consentString'] &&
+    consentInfo['isDirty'] === undefined
+  ) {
     // TODO: Remove after turn on amp-consent-v2
     return calculateLegacyStateValue(consentInfo['consentState']);
   }
@@ -183,10 +191,11 @@ export function isConsentInfoStoredValueSame(infoA, infoB, opt_isDirty) {
     return true;
   }
   if (infoA && infoB) {
-    const stateEqual = calculateLegacyStateValue(infoA['consentState']) ===
-        calculateLegacyStateValue(infoB['consentState']);
+    const stateEqual =
+      calculateLegacyStateValue(infoA['consentState']) ===
+      calculateLegacyStateValue(infoB['consentState']);
     const stringEqual =
-        ((infoA['consentString'] || '') === (infoB['consentString'] || ''));
+      (infoA['consentString'] || '') === (infoB['consentString'] || '');
     let isDirtyEqual;
     if (opt_isDirty) {
       isDirtyEqual = !!infoA['isDirty'] === !!opt_isDirty;
@@ -215,8 +224,11 @@ function getLegacyStoredConsentInfo(value) {
  * @param {boolean=} opt_isDirty
  * @return {!ConsentInfoDef}
  */
-export function constructConsentInfo(consentState,
-  opt_consentString, opt_isDirty) {
+export function constructConsentInfo(
+  consentState,
+  opt_consentString,
+  opt_isDirty
+) {
   return {
     'consentState': consentState,
     'consentString': opt_consentString,
@@ -246,8 +258,10 @@ export function hasStoredValue(info) {
   if (info['consentString']) {
     return true;
   }
-  return info['consentState'] === CONSENT_ITEM_STATE.ACCEPTED ||
-      info['consentState'] === CONSENT_ITEM_STATE.REJECTED;
+  return (
+    info['consentState'] === CONSENT_ITEM_STATE.ACCEPTED ||
+    info['consentState'] === CONSENT_ITEM_STATE.REJECTED
+  );
 }
 
 /**
diff --git a/extensions/amp-consent/0.1/consent-policy-manager.js b/extensions/amp-consent/0.1/consent-policy-manager.js
index f11345efc53a..3bc528fff3eb 100644
--- a/extensions/amp-consent/0.1/consent-policy-manager.js
+++ b/extensions/amp-consent/0.1/consent-policy-manager.js
@@ -24,8 +24,6 @@ import {isFiniteNumber, isObject} from '../../../src/types';
 import {map} from '../../../src/utils/object';
 import {user, userAssert} from '../../../src/log';
 
-
-
 const CONSENT_STATE_MANAGER = 'consentStateManager';
 const TAG = 'consent-policy-manager';
 
@@ -36,7 +34,6 @@ const WHITELIST_POLICY = {
   '_auto_reject': true,
 };
 
-
 export class ConsentPolicyManager {
   /**
    * Creates an instance of ConsentPolicyManager.
@@ -53,8 +50,10 @@ export class ConsentPolicyManager {
     this.instances_ = map();
 
     /** @private {!Promise} */
-    this.ConsentStateManagerPromise_ =
-        getServicePromiseForDoc(this.ampdoc_, CONSENT_STATE_MANAGER);
+    this.ConsentStateManagerPromise_ = getServicePromiseForDoc(
+      this.ampdoc_,
+      CONSENT_STATE_MANAGER
+    );
 
     /** @private {!Deferred} */
     this.consentPromptInitiated_ = new Deferred();
@@ -127,8 +126,10 @@ export class ConsentPolicyManager {
 
     const waitFor = Object.keys(config['waitFor'] || {});
     if (waitFor.length !== 1 || waitFor[0] !== this.consentInstanceIdDepr_) {
-      user().error(TAG,
-          'invalid waitFor value, consent policy will never resolve');
+      user().error(
+        TAG,
+        'invalid waitFor value, consent policy will never resolve'
+      );
       return;
     }
 
@@ -198,8 +199,8 @@ export class ConsentPolicyManager {
 
     if (state == CONSENT_ITEM_STATE.NOT_REQUIRED) {
       const shouldOverwrite =
-          this.consentState_ != CONSENT_ITEM_STATE.ACCEPTED &&
-          this.consentState_ != CONSENT_ITEM_STATE.REJECTED;
+        this.consentState_ != CONSENT_ITEM_STATE.ACCEPTED &&
+        this.consentState_ != CONSENT_ITEM_STATE.REJECTED;
       // Ignore the consent item state and overwrite state value.
       if (shouldOverwrite) {
         this.consentState_ = CONSENT_ITEM_STATE.NOT_REQUIRED;
@@ -225,8 +226,11 @@ export class ConsentPolicyManager {
   whenPolicyResolved(policyId) {
     // If customized policy is not supported
     if (!WHITELIST_POLICY[policyId]) {
-      user().error(TAG, 'can not find policy %s, ' +
-        'only predefined policies are supported', policyId);
+      user().error(
+        TAG,
+        'can not find policy %s, only predefined policies are supported',
+        policyId
+      );
       return Promise.resolve(CONSENT_POLICY_STATE.UNKNOWN);
     }
     return this.whenPolicyInstanceRegistered_(policyId).then(() => {
@@ -244,8 +248,11 @@ export class ConsentPolicyManager {
   whenPolicyUnblock(policyId) {
     // If customized policy is not supported
     if (!WHITELIST_POLICY[policyId]) {
-      user().error(TAG, 'can not find policy %s, ' +
-        'only predefined policies are supported', policyId);
+      user().error(
+        TAG,
+        'can not find policy %s, only predefined policies are supported',
+        policyId
+      );
       return Promise.resolve(false);
     }
     return this.whenPolicyInstanceRegistered_(policyId).then(() => {
@@ -266,10 +273,10 @@ export class ConsentPolicyManager {
    */
   getMergedSharedData(policyId) {
     return this.whenPolicyResolved(policyId)
-        .then(() => this.ConsentStateManagerPromise_)
-        .then(manager => {
-          return manager.getConsentInstanceSharedData();
-        });
+      .then(() => this.ConsentStateManagerPromise_)
+      .then(manager => {
+        return manager.getConsentInstanceSharedData();
+      });
   }
 
   /**
@@ -296,8 +303,8 @@ export class ConsentPolicyManager {
     if (!this.policyInstancesDeferred_[policyId]) {
       this.policyInstancesDeferred_[policyId] = new Deferred();
     }
-    return /** @type {!Promise} */ (
-      this.policyInstancesDeferred_[policyId].promise);
+    return /** @type {!Promise} */ (this.policyInstancesDeferred_[policyId]
+      .promise);
   }
 }
 
@@ -322,9 +329,10 @@ export class ConsentPolicyInstance {
     this.status_ = CONSENT_POLICY_STATE.UNKNOWN;
 
     /** @private {!Array<CONSENT_POLICY_STATE>} */
-    this.unblockStateLists_ = config['unblockOn'] ||
-        [CONSENT_POLICY_STATE.SUFFICIENT,
-          CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED];
+    this.unblockStateLists_ = config['unblockOn'] || [
+      CONSENT_POLICY_STATE.SUFFICIENT,
+      CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED,
+    ];
   }
 
   /**
@@ -345,20 +353,30 @@ export class ConsentPolicyInstance {
          *   "fallbackAction": "reject"
          * }
          */
-        if (timeoutConfig['fallbackAction'] &&
-            timeoutConfig['fallbackAction'] == 'reject') {
+        if (
+          timeoutConfig['fallbackAction'] &&
+          timeoutConfig['fallbackAction'] == 'reject'
+        ) {
           fallbackState = CONSENT_ITEM_STATE.REJECTED;
-        } else if (timeoutConfig['fallbackAction'] &&
-            timeoutConfig['fallbackAction'] != 'dismiss') {
-          user().error(TAG, 'unsupported fallbackAction %s',
-              timeoutConfig['fallbackAction']);
+        } else if (
+          timeoutConfig['fallbackAction'] &&
+          timeoutConfig['fallbackAction'] != 'dismiss'
+        ) {
+          user().error(
+            TAG,
+            'unsupported fallbackAction %s',
+            timeoutConfig['fallbackAction']
+          );
         }
         timeoutSecond = timeoutConfig['seconds'];
       } else {
         timeoutSecond = timeoutConfig;
       }
-      userAssert(isFiniteNumber(timeoutSecond),
-          'invalid timeout value %s', timeoutSecond);
+      userAssert(
+        isFiniteNumber(timeoutSecond),
+        'invalid timeout value %s',
+        timeoutSecond
+      );
     }
 
     if (timeoutSecond != null) {
@@ -368,7 +386,6 @@ export class ConsentPolicyInstance {
         this.evaluate(fallbackState, true);
       }, timeoutSecond * 1000);
     }
-
   }
 
   /**
@@ -427,6 +444,6 @@ export class ConsentPolicyInstance {
    * @return {boolean}
    */
   shouldUnblock() {
-    return (this.unblockStateLists_.indexOf(this.status_) > -1);
+    return this.unblockStateLists_.indexOf(this.status_) > -1;
   }
 }
diff --git a/extensions/amp-consent/0.1/consent-state-manager.js b/extensions/amp-consent/0.1/consent-state-manager.js
index 2e70431b1ab0..2a9bfb71a32a 100644
--- a/extensions/amp-consent/0.1/consent-state-manager.js
+++ b/extensions/amp-consent/0.1/consent-state-manager.js
@@ -32,7 +32,6 @@ import {assertHttpsUrl} from '../../../src/url';
 import {dev, devAssert, user} from '../../../src/log';
 import {isExperimentOn} from '../../../src/experiments';
 
-
 const TAG = 'CONSENT-STATE-MANAGER';
 const CID_SCOPE = 'AMP-CONSENT';
 
@@ -68,9 +67,13 @@ export class ConsentStateManager {
    */
   registerConsentInstance(instanceId, config) {
     if (this.instance_) {
-      dev().error(TAG, 'Cannot register consent instance %s, ' +
+      dev().error(
+        TAG,
+        'Cannot register consent instance %s, ' +
           'instance %s has already been registered.',
-      instanceId, this.instanceId_);
+        instanceId,
+        this.instanceId_
+      );
       return;
     }
 
@@ -107,8 +110,7 @@ export class ConsentStateManager {
    * @return {Promise<!ConsentInfoDef>}
    */
   getLastConsentInstanceInfo() {
-    devAssert(this.instance_,
-        '%s: cannot find the instance', TAG);
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
     return this.instance_.get();
   }
 
@@ -117,8 +119,7 @@ export class ConsentStateManager {
    * @return {Promise<!ConsentInfoDef>}
    */
   getConsentInstanceInfo() {
-    devAssert(this.instance_,
-        '%s: cannot find the instance', TAG);
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
     return this.instance_.get().then(info => {
       if (hasDirtyBit(info)) {
         return constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
@@ -132,11 +133,13 @@ export class ConsentStateManager {
    * @param {function(!ConsentInfoDef)} handler
    */
   onConsentStateChange(handler) {
-    devAssert(this.instance_,
-        '%s: cannot find the instance', TAG);
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
 
-    devAssert(!this.consentChangeHandler_,
-        '%s: Duplicate consent change handler, will be ignored', TAG);
+    devAssert(
+      !this.consentChangeHandler_,
+      '%s: Duplicate consent change handler, will be ignored',
+      TAG
+    );
 
     this.consentChangeHandler_ = handler;
 
@@ -146,7 +149,6 @@ export class ConsentStateManager {
     });
   }
 
-
   /**
    * Sets a promise which resolves to a shareData object that is to be returned
    * from the remote endpoint.
@@ -154,8 +156,7 @@ export class ConsentStateManager {
    * @param {Promise<?Object>} sharedDataPromise
    */
   setConsentInstanceSharedData(sharedDataPromise) {
-    devAssert(this.instance_,
-        '%s: cannot find the instance', TAG);
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
     this.instance_.sharedDataPromise = sharedDataPromise;
   }
 
@@ -174,8 +175,7 @@ export class ConsentStateManager {
    * @return {?Promise<?Object>}
    */
   getConsentInstanceSharedData() {
-    devAssert(this.instance_,
-        '%s: cannot find the instance', TAG);
+    devAssert(this.instance_, '%s: cannot find the instance', TAG);
     return this.instance_.sharedDataPromise;
   }
 
@@ -210,8 +210,10 @@ export class ConsentInstance {
     this.ampdoc_ = ampdoc;
 
     /** @private {boolean} */
-    this.isAmpConsentV2ExperimentOn_ =
-        isExperimentOn(ampdoc.win, 'amp-consent-v2');
+    this.isAmpConsentV2ExperimentOn_ = isExperimentOn(
+      ampdoc.win,
+      'amp-consent-v2'
+    );
 
     /** @private {string} */
     this.id_ = id;
@@ -267,16 +269,17 @@ export class ConsentInstance {
    */
   update(state, consentString, opt_systemUpdate) {
     const localState =
-        this.localConsentInfo_ && this.localConsentInfo_['consentState'];
+      this.localConsentInfo_ && this.localConsentInfo_['consentState'];
     const localConsentStr =
-        this.localConsentInfo_ && this.localConsentInfo_['consentString'];
-    const calculatedState =
-        recalculateConsentStateValue(state, localState);
+      this.localConsentInfo_ && this.localConsentInfo_['consentString'];
+    const calculatedState = recalculateConsentStateValue(state, localState);
 
     if (state === CONSENT_ITEM_STATE.DISMISSED) {
       // If state is dismissed, use the old consent string.
-      this.localConsentInfo_ =
-          constructConsentInfo(calculatedState, localConsentStr);
+      this.localConsentInfo_ = constructConsentInfo(
+        calculatedState,
+        localConsentStr
+      );
       return;
     }
 
@@ -285,16 +288,24 @@ export class ConsentInstance {
     const oldValue = this.localConsentInfo_;
     if (opt_systemUpdate && hasDirtyBit(oldValue)) {
       this.localConsentInfo_ = constructConsentInfo(
-          calculatedState, consentString, true);
+        calculatedState,
+        consentString,
+        true
+      );
     } else {
       // Any user update makes the current state valid, thus remove dirtyBit
       // from localConsentInfo_
       this.localConsentInfo_ = constructConsentInfo(
-          calculatedState, consentString);
+        calculatedState,
+        consentString
+      );
     }
 
     const newConsentInfo = constructConsentInfo(
-        calculatedState, consentString, this.hasDirtyBitNext_);
+      calculatedState,
+      consentString,
+      this.hasDirtyBitNext_
+    );
 
     if (isConsentInfoStoredValueSame(newConsentInfo, this.savedConsentInfo_)) {
       // Only update/save to localstorage if it's not dismiss
@@ -312,8 +323,13 @@ export class ConsentInstance {
    */
   updateStoredValue_(consentInfo) {
     this.storagePromise_.then(storage => {
-      if (!isConsentInfoStoredValueSame(
-          consentInfo, this.localConsentInfo_, this.hasDirtyBitNext_)) {
+      if (
+        !isConsentInfoStoredValueSame(
+          consentInfo,
+          this.localConsentInfo_,
+          this.hasDirtyBitNext_
+        )
+      ) {
         // If state has changed. do not store outdated value.
         return;
       }
@@ -323,9 +339,11 @@ export class ConsentInstance {
         // Verify the length of consentString.
         // 150 * 2 (utf8Encode) * 4/3 (base64) = 400 bytes.
         // TODO: Need utf8Encode if necessary.
-        user().error(TAG,
-            'Cannot store consentString which length exceeds 150 ' +
-            'Previous stored consentInfo will be cleared');
+        user().error(
+          TAG,
+          'Cannot store consentString which length exceeds 150 ' +
+            'Previous stored consentInfo will be cleared'
+        );
         // If new consentInfo value cannot be stored, need to remove previous
         // value
         storage.remove(this.storageKey_);
@@ -334,7 +352,9 @@ export class ConsentInstance {
       }
 
       const value = composeStoreValue(
-          consentInfo, this.isAmpConsentV2ExperimentOn_);
+        consentInfo,
+        this.isAmpConsentV2ExperimentOn_
+      );
       if (value == null) {
         // Value can be false, do not use !value check
         // Nothing to store to localStorage
@@ -357,34 +377,38 @@ export class ConsentInstance {
     }
 
     let storage;
-    return this.storagePromise_.then(s => {
-      storage = s;
-      return storage.get(this.storageKey_);
-    }).then(storedValue => {
-      if (this.localConsentInfo_) {
-        // If local value has been updated, return most updated value;
+    return this.storagePromise_
+      .then(s => {
+        storage = s;
+        return storage.get(this.storageKey_);
+      })
+      .then(storedValue => {
+        if (this.localConsentInfo_) {
+          // If local value has been updated, return most updated value;
+          return this.localConsentInfo_;
+        }
+
+        const consentInfo = getStoredConsentInfo(storedValue);
+        this.savedConsentInfo_ = consentInfo;
+
+        if (hasDirtyBit(consentInfo)) {
+          // clear stored value.
+          this.sendUpdateHrefRequest_(
+            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+          );
+          storage.remove(this.storageKey_);
+          this.savedConsentInfo_ = null;
+        }
+        // Note: this.localConsentInfo dirtyBit can only be set to false
+        // if the stored value has dirtyBit.
+        // Any local update reset the value to true.
+        this.localConsentInfo_ = consentInfo;
         return this.localConsentInfo_;
-      }
-
-      const consentInfo = getStoredConsentInfo(storedValue);
-      this.savedConsentInfo_ = consentInfo;
-
-      if (hasDirtyBit(consentInfo)) {
-        // clear stored value.
-        this.sendUpdateHrefRequest_(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
-        storage.remove(this.storageKey_);
-        this.savedConsentInfo_ = null;
-      }
-      // Note: this.localConsentInfo dirtyBit can only be set to false
-      // if the stored value has dirtyBit.
-      // Any local update reset the value to true.
-      this.localConsentInfo_ = consentInfo;
-      return this.localConsentInfo_;
-    }).catch(e => {
-      dev().error(TAG, 'Failed to read storage', e);
-      return constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
-    });
+      })
+      .catch(e => {
+        dev().error(TAG, 'Failed to read storage', e);
+        return constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
+      });
   }
 
   /**
@@ -400,11 +424,14 @@ export class ConsentInstance {
       // No need to send update request if the stored consent info is dirty
       return;
     }
-    const legacyConsentState =
-        calculateLegacyStateValue(consentInfo['consentState']);
+    const legacyConsentState = calculateLegacyStateValue(
+      consentInfo['consentState']
+    );
     const cidPromise = Services.cidForDoc(this.ampdoc_).then(cid => {
-      return cid.get({scope: CID_SCOPE, createCookieIfNotPresent: true},
-          Promise.resolve());
+      return cid.get(
+        {scope: CID_SCOPE, createCookieIfNotPresent: true},
+        Promise.resolve()
+      );
     });
     cidPromise.then(userId => {
       const request = /** @type {!JsonObject} */ ({
@@ -415,8 +442,9 @@ export class ConsentInstance {
       if (legacyConsentState != null) {
         request['consentState'] = legacyConsentState;
       }
-      request['consentStateValue'] =
-          getConsentStateValue(consentInfo['consentState']);
+      request['consentStateValue'] = getConsentStateValue(
+        consentInfo['consentState']
+      );
       if (consentInfo['consentString']) {
         request['consentString'] = consentInfo['consentString'];
       }
@@ -426,10 +454,14 @@ export class ConsentInstance {
         body: request,
         ampCors: false,
       };
-      Services.viewerForDoc(this.ampdoc_).whenFirstVisible().then(() => {
-        Services.xhrFor(this.ampdoc_.win).fetchJson(
-            /** @type {string} */ (this.onUpdateHref_), init);
-      });
+      Services.viewerForDoc(this.ampdoc_)
+        .whenFirstVisible()
+        .then(() => {
+          Services.xhrFor(this.ampdoc_.win).fetchJson(
+            /** @type {string} */ (this.onUpdateHref_),
+            init
+          );
+        });
     });
   }
 }
diff --git a/extensions/amp-consent/0.1/consent-ui.js b/extensions/amp-consent/0.1/consent-ui.js
index b1e2c5b1e250..20b27267496b 100644
--- a/extensions/amp-consent/0.1/consent-ui.js
+++ b/extensions/amp-consent/0.1/consent-ui.js
@@ -16,9 +16,7 @@
 
 import {Deferred} from '../../../src/utils/promise';
 import {Services} from '../../../src/services';
-import {
-  assertHttpsUrl,
-} from '../../../src/url';
+import {assertHttpsUrl} from '../../../src/url';
 import {dev, user} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {
@@ -52,14 +50,12 @@ export const consentUiClasses = {
 };
 
 export class ConsentUI {
-
   /**
    * @param {!AMP.BaseElement} baseInstance
    * @param {!JsonObject} config
    * @param {string=} opt_postPromptUI
    */
   constructor(baseInstance, config, opt_postPromptUI) {
-
     /** @private {!AMP.BaseElement} */
     this.baseInstance_ = baseInstance;
 
@@ -82,7 +78,8 @@ export class ConsentUI {
     this.ui_ = null;
 
     /** @private {boolean} */
-    this.overlayEnabled_ = isExperimentOn(baseInstance.win, 'amp-consent-v2') &&
+    this.overlayEnabled_ =
+      isExperimentOn(baseInstance.win, 'amp-consent-v2') &&
       config['uiConfig'] &&
       config['uiConfig']['overlay'] === true;
 
@@ -137,11 +134,13 @@ export class ConsentUI {
    */
   init_(config, opt_postPromptUI) {
     if (opt_postPromptUI) {
-      const postPromptUI =
-          this.ampdoc_.getElementById(opt_postPromptUI);
+      const postPromptUI = this.ampdoc_.getElementById(opt_postPromptUI);
       if (!postPromptUI) {
-        user().error(TAG, 'postPromptUI element with ' +
-          'id=%s not found', opt_postPromptUI);
+        user().error(
+          TAG,
+          'postPromptUI element with id=%s not found',
+          opt_postPromptUI
+        );
       }
       this.ui_ = dev().assertElement(postPromptUI);
       this.isPostPrompt_ = true;
@@ -153,15 +152,17 @@ export class ConsentUI {
       // Always respect promptUI first
       const promptElement = this.ampdoc_.getElementById(promptUI);
       if (!promptElement || !this.parent_.contains(promptElement)) {
-        user().error(TAG, 'child element of <amp-consent> with ' +
-          'promptUI id %s not found', promptUI);
+        user().error(
+          TAG,
+          'child element of <amp-consent> with promptUI id %s not found',
+          promptUI
+        );
       }
       this.ui_ = dev().assertElement(promptElement);
     } else if (promptUISrc && isExperimentOn(this.win_, 'amp-consent-v2')) {
       // Create an iframe element with the provided src
       this.isCreatedIframe_ = true;
-      this.ui_ =
-          this.createPromptIframeFromSrc_(promptUISrc);
+      this.ui_ = this.createPromptIframeFromSrc_(promptUISrc);
       this.placeholder_ = this.createPlaceholder_();
       this.clientConfig_ = config['clientConfig'] || null;
     }
@@ -189,7 +190,6 @@ export class ConsentUI {
         // being hidden. CMP iframe is responsible to call consent-iframe-ready
         // API before consent-response API.
         this.baseInstance_.mutateElement(() => {
-
           if (!this.isPostPrompt_) {
             this.elementWithFocusBeforeShowing_ = this.document_.activeElement;
           }
@@ -199,7 +199,7 @@ export class ConsentUI {
           this.showIframe_();
 
           if (!this.isPostPrompt_) {
-            this.ui_./*OK*/focus();
+            this.ui_./*OK*/ focus();
           }
         });
       });
@@ -212,7 +212,6 @@ export class ConsentUI {
         toggle(this.ui_, true);
 
         if (!this.isPostPrompt_) {
-
           this.elementWithFocusBeforeShowing_ = this.document_.activeElement;
 
           this.maybeShowOverlay_();
@@ -222,16 +221,14 @@ export class ConsentUI {
           // for example <amp-iframe>
           this.baseInstance_.scheduleLayout(this.ui_);
 
-          this.ui_./*OK*/focus();
+          this.ui_./*OK*/ focus();
         }
       };
 
       // If the UI is an AMP Element, wait until it's built before showing it,
       // to avoid race conditions where the UI would be hidden by the runtime
       // at build time. (see #18841).
-      isAmpElement(this.ui_) ?
-        this.ui_.whenBuilt().then(() => show()) :
-        show();
+      isAmpElement(this.ui_) ? this.ui_.whenBuilt().then(() => show()) : show();
     }
 
     this.isVisible_ = true;
@@ -241,7 +238,6 @@ export class ConsentUI {
    * Hide the UI
    */
   hide() {
-
     if (!this.ui_) {
       // Nothing to hide from;
       return;
@@ -276,12 +272,12 @@ export class ConsentUI {
       this.isVisible_ = false;
 
       if (this.elementWithFocusBeforeShowing_) {
-        this.elementWithFocusBeforeShowing_./*OK*/focus();
+        this.elementWithFocusBeforeShowing_./*OK*/ focus();
         this.elementWithFocusBeforeShowing_ = null;
       } else if (this.win_.document.body.children.length > 0) {
         // TODO (torch2424): Find if the first child can not be
         // focusable due to styling.
-        this.win_.document.body.children[0]./*OK*/focus();
+        this.win_.document.body.children[0]./*OK*/ focus();
       }
     });
   }
@@ -291,31 +287,31 @@ export class ConsentUI {
    * @param {!JsonObject} data
    */
   handleReady_(data) {
-
     this.initialHeight_ = DEFAULT_INITIAL_HEIGHT;
     this.enableBorder_ = DEFAULT_ENABLE_BORDER;
 
     // Set our initial height
     if (data['initialHeight']) {
-      if (typeof data['initialHeight'] === 'string' &&
-        data['initialHeight'].indexOf('vh') >= 0) {
-
+      if (
+        typeof data['initialHeight'] === 'string' &&
+        data['initialHeight'].indexOf('vh') >= 0
+      ) {
         const dataHeight = parseInt(data['initialHeight'], 10);
 
         if (dataHeight >= 10 && dataHeight <= 60) {
           this.initialHeight_ = `${dataHeight}vh`;
         } else {
           user().error(
-              TAG,
-              `Inavlid initial height: ${data['initialHeight']}.` +
-            'Minimum: 10vh. Maximum: 60vh.'
+            TAG,
+            `Inavlid initial height: ${data['initialHeight']}.` +
+              'Minimum: 10vh. Maximum: 60vh.'
           );
         }
       } else {
         user().error(
-            TAG,
-            `Inavlid initial height: ${data['initialHeight']}.` +
-          'Must be a string in "vh" units.'
+          TAG,
+          `Inavlid initial height: ${data['initialHeight']}.` +
+            'Must be a string in "vh" units.'
         );
       }
     }
@@ -411,22 +407,26 @@ export class ConsentUI {
    * @return {!Promise<JsonObject>}
    */
   getClientInfoPromise_(isActionPromptTrigger) {
-    const consentStatePromise =
-        getServicePromiseForDoc(this.ampdoc_, CONSENT_STATE_MANAGER);
+    const consentStatePromise = getServicePromiseForDoc(
+      this.ampdoc_,
+      CONSENT_STATE_MANAGER
+    );
     return consentStatePromise.then(consentStateManager => {
-      return consentStateManager.getLastConsentInstanceInfo().then(
-          consentInfo => {
-            return dict({
-              'clientConfig': this.clientConfig_,
-              // consentState to be deprecated
-              'consentState': getConsentStateValue(consentInfo['consentState']),
-              'consentStateValue':
-                  getConsentStateValue(consentInfo['consentState']),
-              'consentString': consentInfo['consentString'],
-              'promptTrigger': isActionPromptTrigger ? 'action' : 'load',
-              'isDirty': !!consentInfo['isDirty'],
-            });
+      return consentStateManager
+        .getLastConsentInstanceInfo()
+        .then(consentInfo => {
+          return dict({
+            'clientConfig': this.clientConfig_,
+            // consentState to be deprecated
+            'consentState': getConsentStateValue(consentInfo['consentState']),
+            'consentStateValue': getConsentStateValue(
+              consentInfo['consentState']
+            ),
+            'consentString': consentInfo['consentString'],
+            'promptTrigger': isActionPromptTrigger ? 'action' : 'load',
+            'isDirty': !!consentInfo['isDirty'],
           });
+        });
     });
   }
 
@@ -440,28 +440,22 @@ export class ConsentUI {
     this.iframeReady_ = new Deferred();
     const {classList} = this.parent_;
     if (!elementByTag(this.parent_, 'placeholder')) {
-      insertAfterOrAtStart(this.parent_,
-          dev().assertElement(this.placeholder_), null);
+      insertAfterOrAtStart(
+        this.parent_,
+        dev().assertElement(this.placeholder_),
+        null
+      );
     }
     classList.add(consentUiClasses.loading);
     toggle(dev().assertElement(this.ui_), false);
 
-    const iframePromise = this.getClientInfoPromise_(isActionPromptTrigger)
-        .then(clientInfo => {
-          this.ui_.setAttribute(
-              'name',
-              JSON.stringify(clientInfo)
-          );
-          this.win_.addEventListener(
-              'message',
-              this.boundHandleIframeMessages_
-          );
-          insertAfterOrAtStart(
-              this.parent_,
-              dev().assertElement(this.ui_),
-              null
-          );
-        });
+    const iframePromise = this.getClientInfoPromise_(
+      isActionPromptTrigger
+    ).then(clientInfo => {
+      this.ui_.setAttribute('name', JSON.stringify(clientInfo));
+      this.win_.addEventListener('message', this.boundHandleIframeMessages_);
+      insertAfterOrAtStart(this.parent_, dev().assertElement(this.ui_), null);
+    });
 
     return Promise.all([
       iframePromise,
@@ -571,7 +565,7 @@ export class ConsentUI {
       this.parent_.ownerDocument.body.appendChild(mask);
       this.maskElement_ = mask;
     }
-    toggle(this.maskElement_, /* display */true);
+    toggle(this.maskElement_, /* display */ true);
     this.disableScroll_();
   }
 
@@ -586,7 +580,7 @@ export class ConsentUI {
     }
 
     if (this.maskElement_) {
-      toggle(this.maskElement_, /* display */false);
+      toggle(this.maskElement_, /* display */ false);
     }
     this.enableScroll_();
   }
@@ -645,11 +639,10 @@ export class ConsentUI {
     }
 
     if (data['action'] === 'ready') {
-      this.handleReady_(/** @type {!JsonObject} */(data));
+      this.handleReady_(/** @type {!JsonObject} */ (data));
     }
 
     if (data['action'] === 'enter-fullscreen') {
-
       // TODO (@torch2424) Send response back if enter fullscreen was succesful
       if (!this.isIframeVisible_) {
         return;
diff --git a/extensions/amp-consent/0.1/test/test-amp-consent.js b/extensions/amp-consent/0.1/test/test-amp-consent.js
index 42ef617ff138..4568cdfecf1e 100644
--- a/extensions/amp-consent/0.1/test/test-amp-consent.js
+++ b/extensions/amp-consent/0.1/test/test-amp-consent.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ACTION_TYPE,
-  AmpConsent,
-} from '../amp-consent';
+import {ACTION_TYPE, AmpConsent} from '../amp-consent';
 import {CONSENT_ITEM_STATE} from '../consent-info';
 import {GEO_IN_GROUP} from '../../../amp-geo/0.1/amp-geo-in-group';
 import {dict} from '../../../../src/utils/object';
@@ -28,489 +25,510 @@ import {
 } from '../../../../src/service';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-consent', {
-  amp: {
-    extensions: ['amp-consent'],
-    ampdoc: 'single',
+describes.realWin(
+  'amp-consent',
+  {
+    amp: {
+      extensions: ['amp-consent'],
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let win;
-  let doc;
-  let ampdoc;
-  let jsonMockResponses;
-  let storageValue;
-  let requestBody;
-  let ISOCountryGroups;
-  let xhrServiceMock;
-
-  beforeEach(() => {
-    doc = env.win.document;
-    ampdoc = env.ampdoc;
-    win = env.win;
-    toggleExperiment(win, 'amp-consent-v2', true);
-
-
-    storageValue = {};
-    jsonMockResponses = {
-      'https://response1/': '{"promptIfUnknown": true}',
-      'https://response2/': '{}',
-      'https://response3/': '{"promptIfUnknown": false}',
-    };
-
-    xhrServiceMock = {fetchJson: (url, init) => {
-      requestBody = init.body;
-      expect(init.credentials).to.equal('include');
-      expect(init.method).to.equal('POST');
-      return Promise.resolve({
-        json() {
-          return Promise.resolve(JSON.parse(jsonMockResponses[url]));
+  env => {
+    let win;
+    let doc;
+    let ampdoc;
+    let jsonMockResponses;
+    let storageValue;
+    let requestBody;
+    let ISOCountryGroups;
+    let xhrServiceMock;
+
+    beforeEach(() => {
+      doc = env.win.document;
+      ampdoc = env.ampdoc;
+      win = env.win;
+      toggleExperiment(win, 'amp-consent-v2', true);
+
+      storageValue = {};
+      jsonMockResponses = {
+        'https://response1/': '{"promptIfUnknown": true}',
+        'https://response2/': '{}',
+        'https://response3/': '{"promptIfUnknown": false}',
+      };
+
+      xhrServiceMock = {
+        fetchJson: (url, init) => {
+          requestBody = init.body;
+          expect(init.credentials).to.equal('include');
+          expect(init.method).to.equal('POST');
+          return Promise.resolve({
+            json() {
+              return Promise.resolve(JSON.parse(jsonMockResponses[url]));
+            },
+          });
         },
+      };
+
+      resetServiceForTesting(win, 'xhr');
+      registerServiceBuilder(win, 'xhr', function() {
+        return xhrServiceMock;
       });
-    }};
 
-    resetServiceForTesting(win, 'xhr');
-    registerServiceBuilder(win, 'xhr', function() {
-      return xhrServiceMock;
-    });
+      resetServiceForTesting(win, 'geo');
+      registerServiceBuilder(win, 'geo', function() {
+        return Promise.resolve({
+          isInCountryGroup: group =>
+            ISOCountryGroups.indexOf(group) >= 0
+              ? GEO_IN_GROUP.IN
+              : GEO_IN_GROUP.NOT_IN,
+        });
+      });
 
-    resetServiceForTesting(win, 'geo');
-    registerServiceBuilder(win, 'geo', function() {
-      return Promise.resolve({
-        isInCountryGroup: group =>
-          ISOCountryGroups.indexOf(group) >= 0 ?
-            GEO_IN_GROUP.IN : GEO_IN_GROUP.NOT_IN,
+      resetServiceForTesting(win, 'storage');
+      registerServiceBuilder(win, 'storage', function() {
+        return Promise.resolve({
+          get: name => {
+            return Promise.resolve(storageValue[name]);
+          },
+          set: (name, value) => {
+            storageValue[name] = value;
+            return Promise.resolve();
+          },
+        });
       });
     });
 
-    resetServiceForTesting(win, 'storage');
-    registerServiceBuilder(win, 'storage', function() {
-      return Promise.resolve({
-        get: name => {
-          return Promise.resolve(storageValue[name]);
-        },
-        set: (name, value) => {
-          storageValue[name] = value;
-          return Promise.resolve();
-        },
+    describe('amp-consent', () => {
+      describe('consent config', () => {
+        let consentElement;
+
+        it('get consent/policy/postPromptUI config', () => {
+          consentElement = createConsentElement(
+            doc,
+            dict({
+              'consents': {
+                'test': {
+                  'checkConsentHref': '/override',
+                },
+              },
+              'clientConfig': {
+                'test': 'ABC',
+              },
+              'postPromptUI': 'test',
+            })
+          );
+          const postPromptUI = document.createElement('div');
+          postPromptUI.setAttribute('id', 'test');
+          consentElement.appendChild(postPromptUI);
+          doc.body.appendChild(consentElement);
+          const ampConsent = new AmpConsent(consentElement);
+          ampConsent.buildCallback();
+
+          expect(ampConsent.postPromptUI_).to.not.be.null;
+          expect(ampConsent.consentId_).to.equal('test');
+          expect(ampConsent.consentConfig_).to.deep.equal(
+            dict({
+              'consentInstanceId': 'test',
+              'checkConsentHref': '/override',
+              'postPromptUI': 'test',
+              'clientConfig': {
+                'test': 'ABC',
+              },
+            })
+          );
+
+          expect(Object.keys(ampConsent.policyConfig_)).to.have.length(4);
+          expect(ampConsent.policyConfig_['default']).to.be.ok;
+          expect(ampConsent.policyConfig_['_till_responded']).to.be.ok;
+          expect(ampConsent.policyConfig_['_till_accepted']).to.be.ok;
+          expect(ampConsent.policyConfig_['_auto_reject']).to.be.ok;
+        });
+
+        it('relative checkConsentHref is resolved', function*() {
+          const fetchSpy = sandbox.spy(xhrServiceMock, 'fetchJson');
+          consentElement = createConsentElement(
+            doc,
+            dict({
+              'consents': {
+                'XYZ': {
+                  'checkConsentHref': '/r/1',
+                },
+              },
+            })
+          );
+          const ampConsent = new AmpConsent(consentElement);
+          doc.body.appendChild(consentElement);
+          const getUrlStub = sandbox.stub(ampdoc, 'getUrl');
+          // return a cache Url to test origin source being used to resolve.
+          getUrlStub.callsFake(() => {
+            return 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0#h';
+          });
+          ampConsent.buildCallback();
+          yield macroTask();
+          expect(fetchSpy).to.be.calledOnce;
+          expect(win.testLocation.origin).not.to.be.empty;
+          expect(fetchSpy).to.be.calledWith('http://www.origin.com/r/1');
+        });
       });
     });
-  });
 
-  describe('amp-consent', () => {
-    describe('consent config', () => {
+    describe('server communication', () => {
+      let defaultConfig;
+      let ampConsent;
       let consentElement;
-
-      it('get consent/policy/postPromptUI config', () => {
-        consentElement = createConsentElement(doc, dict({
+      beforeEach(() => {
+        defaultConfig = dict({
           'consents': {
-            'test': {
-              'checkConsentHref': '/override',
+            'ABC': {
+              'checkConsentHref': 'https://response1',
             },
           },
-          'clientConfig': {
-            'test': 'ABC',
-          },
-          'postPromptUI': 'test',
-        }));
-        const postPromptUI = document.createElement('div');
-        postPromptUI.setAttribute('id', 'test');
-        consentElement.appendChild(postPromptUI);
+        });
+        consentElement = createConsentElement(doc, defaultConfig);
         doc.body.appendChild(consentElement);
-        const ampConsent = new AmpConsent(consentElement);
-        ampConsent.buildCallback();
+        ampConsent = new AmpConsent(consentElement);
+      });
 
-        expect(ampConsent.postPromptUI_).to.not.be.null;
-        expect(ampConsent.consentId_).to.equal('test');
-        expect(ampConsent.consentConfig_).to.deep.equal(dict({
-          'consentInstanceId': 'test',
-          'checkConsentHref': '/override',
-          'postPromptUI': 'test',
-          'clientConfig': {
-            'test': 'ABC',
-          },
-        }));
+      it('send post request to server', function*() {
+        ampConsent.buildCallback();
+        yield macroTask();
+        expect(requestBody).to.deep.equal({
+          'consentInstanceId': 'ABC',
+          'consentStateValue': 'unknown',
+          'consentString': undefined,
+          'isDirty': false,
+        });
+      });
 
-        expect(Object.keys(ampConsent.policyConfig_)).to.have.length(4);
-        expect(ampConsent.policyConfig_['default']).to.be.ok;
-        expect(ampConsent.policyConfig_['_till_responded']).to.be.ok;
-        expect(ampConsent.policyConfig_['_till_accepted']).to.be.ok;
-        expect(ampConsent.policyConfig_['_auto_reject']).to.be.ok;
+      it('read promptIfUnknown from server response', function*() {
+        ampConsent.buildCallback();
+        yield macroTask();
+        return ampConsent.getConsentRequiredPromise_().then(isRequired => {
+          expect(isRequired).to.be.true;
+        });
       });
+    });
 
-      it('relative checkConsentHref is resolved', function* () {
-        const fetchSpy = sandbox.spy(xhrServiceMock, 'fetchJson');
-        consentElement = createConsentElement(doc, dict({
+    describe('amp-geo integration', () => {
+      let defaultConfig;
+      let ampConsent;
+      let consentElement;
+      beforeEach(() => {
+        defaultConfig = dict({
           'consents': {
-            'XYZ': {
-              'checkConsentHref': '/r/1',
+            'ABC': {
+              'promptIfUnknownForGeoGroup': 'testGroup',
             },
           },
-        }));
-        const ampConsent = new AmpConsent(consentElement);
-        doc.body.appendChild(consentElement);
-        const getUrlStub = sandbox.stub(ampdoc, 'getUrl');
-        // return a cache Url to test origin source being used to resolve.
-        getUrlStub.callsFake(() => {
-          return 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0#h';
         });
-        ampConsent.buildCallback();
-        yield macroTask();
-        expect(fetchSpy).to.be.calledOnce;
-        expect(win.testLocation.origin).not.to.be.empty;
-        expect(fetchSpy).to.be.calledWith('http://www.origin.com/r/1');
+        consentElement = createConsentElement(doc, defaultConfig);
       });
-    });
-  });
 
-  describe('server communication', () => {
-    let defaultConfig;
-    let ampConsent;
-    let consentElement;
-    beforeEach(() => {
-      defaultConfig = dict({
-        'consents': {
-          'ABC': {
-            'checkConsentHref': 'https://response1',
-          },
-        },
+      it('in geo group', function*() {
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+        ISOCountryGroups = ['unknown', 'testGroup'];
+        ampConsent.buildCallback();
+        return ampConsent.getConsentRequiredPromise_().then(isRequired => {
+          expect(isRequired).to.be.true;
+        });
       });
-      consentElement = createConsentElement(doc, defaultConfig);
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-    });
 
-    it('send post request to server', function* () {
-      ampConsent.buildCallback();
-      yield macroTask();
-      expect(requestBody).to.deep.equal({
-        'consentInstanceId': 'ABC',
-        'consentStateValue': 'unknown',
-        'consentString': undefined,
-        'isDirty': false,
+      it('not in geo group', function*() {
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+        ISOCountryGroups = ['unknown'];
+        ampConsent.buildCallback();
+        return ampConsent.getConsentRequiredPromise_().then(isRequired => {
+          expect(isRequired).to.be.false;
+        });
       });
-    });
 
-    it('read promptIfUnknown from server response', function* () {
-      ampConsent.buildCallback();
-      yield macroTask();
-      return ampConsent.getConsentRequiredPromise_().then(isRequired => {
-        expect(isRequired).to.be.true;
+      it('geo override promptIfUnknown', function*() {
+        ISOCountryGroups = ['unknown'];
+        consentElement = createConsentElement(
+          doc,
+          dict({
+            'consents': {
+              'ABC': {
+                'checkConsentHref': 'https://response1',
+                'promptIfUnknownForGeoGroup': 'testGroup',
+              },
+            },
+          })
+        );
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+        ampConsent.buildCallback();
+        return ampConsent.getConsentRequiredPromise_().then(isRequired => {
+          expect(isRequired).to.be.false;
+        });
       });
     });
-  });
 
-  describe('amp-geo integration', () => {
-    let defaultConfig;
-    let ampConsent;
-    let consentElement;
-    beforeEach(() => {
-      defaultConfig = dict({
-        'consents': {
-          'ABC': {
-            'promptIfUnknownForGeoGroup': 'testGroup',
+    describe('external consent action', () => {
+      let defaultConfig;
+      let ampConsent;
+      let actionSpy;
+      let event;
+      let ampIframe;
+      let iframe;
+      let consentElement;
+      beforeEach(() => {
+        defaultConfig = dict({
+          'consents': {
+            'ABC': {
+              'checkConsentHref': 'https://response1',
+            },
           },
-        },
+        });
+        consentElement = createConsentElement(doc, defaultConfig);
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+        actionSpy = sandbox.stub(ampConsent, 'handleAction_');
+        ampConsent.enableInteractions_();
+        ampIframe = document.createElement('amp-iframe');
+        iframe = doc.createElement('iframe');
+        ampIframe.appendChild(iframe);
+        ampConsent.element.appendChild(ampIframe);
+        ampConsent.isPromptUIOn_ = true;
+        event = new Event('message');
       });
-      consentElement = createConsentElement(doc, defaultConfig);
-    });
 
-    it('in geo group', function* () {
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-      ISOCountryGroups = ['unknown', 'testGroup'];
-      ampConsent.buildCallback();
-      return ampConsent.getConsentRequiredPromise_().then(isRequired => {
-        expect(isRequired).to.be.true;
+      it('listen to external consent response msg', () => {
+        event.data = {
+          'type': 'consent-response',
+          'action': 'accept',
+          'info': 'accept-string',
+        };
+        event.source = iframe.contentWindow;
+        win.dispatchEvent(event);
+        expect(actionSpy).to.be.calledWith(ACTION_TYPE.ACCEPT, 'accept-string');
       });
-    });
 
-    it('not in geo group', function* () {
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-      ISOCountryGroups = ['unknown'];
-      ampConsent.buildCallback();
-      return ampConsent.getConsentRequiredPromise_().then(isRequired => {
-        expect(isRequired).to.be.false;
+      it('ignore info when prompt UI is not displayed', () => {
+        ampConsent.isPromptUIOn_ = false;
+        event.data = {
+          'type': 'consent-response',
+          'action': 'accept',
+          'info': 'accept-string',
+        };
+        event.source = iframe.contentWindow;
+        win.dispatchEvent(event);
+        expect(actionSpy).to.not.be.called;
       });
-    });
 
-    it('geo override promptIfUnknown', function* () {
-      ISOCountryGroups = ['unknown'];
-      consentElement = createConsentElement(doc, dict({
-        'consents': {
-          'ABC': {
-            'checkConsentHref': 'https://response1',
-            'promptIfUnknownForGeoGroup': 'testGroup',
-          },
-        },
-      }));
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-      ampConsent.buildCallback();
-      return ampConsent.getConsentRequiredPromise_().then(isRequired => {
-        expect(isRequired).to.be.false;
-      });
-    });
-  });
-
-  describe('external consent action', () => {
-    let defaultConfig;
-    let ampConsent;
-    let actionSpy;
-    let event;
-    let ampIframe;
-    let iframe;
-    let consentElement;
-    beforeEach(() => {
-      defaultConfig = dict({
-        'consents': {
-          'ABC': {
-            'checkConsentHref': 'https://response1',
-          },
-        },
+      it('ignore info w/o amp-consent-v2 flag', () => {
+        // TODO(@zhouyx): Remove with amp-consent-v2 flag
+        toggleExperiment(win, 'amp-consent-v2', false);
+        event.data = {
+          'type': 'consent-response',
+          'action': 'accept',
+          'info': 'accept-string',
+        };
+        event.source = iframe.contentWindow;
+        win.dispatchEvent(event);
+        expect(actionSpy).to.be.calledWith(ACTION_TYPE.ACCEPT, undefined);
       });
-      consentElement = createConsentElement(doc, defaultConfig);
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-      actionSpy = sandbox.stub(ampConsent, 'handleAction_');
-      ampConsent.enableInteractions_();
-      ampIframe = document.createElement('amp-iframe');
-      iframe = doc.createElement('iframe');
-      ampIframe.appendChild(iframe);
-      ampConsent.element.appendChild(ampIframe);
-      ampConsent.isPromptUIOn_ = true;
-      event = new Event('message');
-    });
-
-    it('listen to external consent response msg', () => {
-      event.data = {
-        'type': 'consent-response',
-        'action': 'accept',
-        'info': 'accept-string',
-      };
-      event.source = iframe.contentWindow;
-      win.dispatchEvent(event);
-      expect(actionSpy).to.be.calledWith(ACTION_TYPE.ACCEPT,
-          'accept-string');
-    });
-
-    it('ignore info when prompt UI is not displayed', () => {
-      ampConsent.isPromptUIOn_ = false;
-      event.data = {
-        'type': 'consent-response',
-        'action': 'accept',
-        'info': 'accept-string',
-      };
-      event.source = iframe.contentWindow;
-      win.dispatchEvent(event);
-      expect(actionSpy).to.not.be.called;
-    });
-
-    it('ignore info w/o amp-consent-v2 flag', () => {
-      // TODO(@zhouyx): Remove with amp-consent-v2 flag
-      toggleExperiment(win, 'amp-consent-v2', false);
-      event.data = {
-        'type': 'consent-response',
-        'action': 'accept',
-        'info': 'accept-string',
-      };
-      event.source = iframe.contentWindow;
-      win.dispatchEvent(event);
-      expect(actionSpy).to.be.calledWith(ACTION_TYPE.ACCEPT,
-          undefined);
-    });
 
-    it('ignore msg from incorrect source', () => {
-      event.data = {
-        'type': 'consent-response',
-        'action': 'accept',
-      };
-      event.source = null;
-      win.dispatchEvent(event);
-      expect(actionSpy).to.not.be.called;
-    });
+      it('ignore msg from incorrect source', () => {
+        event.data = {
+          'type': 'consent-response',
+          'action': 'accept',
+        };
+        event.source = null;
+        win.dispatchEvent(event);
+        expect(actionSpy).to.not.be.called;
+      });
 
-    it('ignore info with action dismiss', () => {
-      expectAsyncConsoleError('[amp-consent] ' +
-          'Consent string value %s not applicable on user dismiss, ' +
-          'stored value will be kept and used ');
-      event.data = {
-        'type': 'consent-response',
-        'action': 'dismiss',
-        'info': 'test',
-      };
-      event.source = iframe.contentWindow;
-      win.dispatchEvent(event);
-      expect(actionSpy).to.be.calledWith(ACTION_TYPE.DISMISS);
+      it('ignore info with action dismiss', () => {
+        expectAsyncConsoleError(
+          '[amp-consent] ' +
+            'Consent string value %s not applicable on user dismiss, ' +
+            'stored value will be kept and used '
+        );
+        event.data = {
+          'type': 'consent-response',
+          'action': 'dismiss',
+          'info': 'test',
+        };
+        event.source = iframe.contentWindow;
+        win.dispatchEvent(event);
+        expect(actionSpy).to.be.calledWith(ACTION_TYPE.DISMISS);
+      });
     });
-  });
 
-  describe('UI', () => {
-    let uiElement;
-    let defaultConfig;
-    let ampConsent;
-    let updateConsentInstanceStateSpy;
-    let consentElement;
-    let postPromptUI;
+    describe('UI', () => {
+      let uiElement;
+      let defaultConfig;
+      let ampConsent;
+      let updateConsentInstanceStateSpy;
+      let consentElement;
+      let postPromptUI;
 
-    beforeEach(() => {
-      defaultConfig = dict({
-        'consents': {
-          'ABC': {
-            'checkConsentHref': 'https://response1',
-            'promptUI': '123',
+      beforeEach(() => {
+        defaultConfig = dict({
+          'consents': {
+            'ABC': {
+              'checkConsentHref': 'https://response1',
+              'promptUI': '123',
+            },
           },
-        },
-        'postPromptUI': 'test',
-      });
-      consentElement = createConsentElement(doc, defaultConfig);
-      uiElement = document.createElement('div');
-      uiElement.setAttribute('id', '123');
-      consentElement.appendChild(uiElement);
-      postPromptUI = document.createElement('div');
-      postPromptUI.setAttribute('id', 'test');
-      consentElement.appendChild(postPromptUI);
-      doc.body.appendChild(consentElement);
-      ampConsent = new AmpConsent(consentElement);
-      sandbox.stub(ampConsent.vsync_, 'mutate').callsFake(fn => {
-        fn();
-      });
-      sandbox.stub(ampConsent, 'mutateElement').callsFake(fn => {
-        fn();
+          'postPromptUI': 'test',
+        });
+        consentElement = createConsentElement(doc, defaultConfig);
+        uiElement = document.createElement('div');
+        uiElement.setAttribute('id', '123');
+        consentElement.appendChild(uiElement);
+        postPromptUI = document.createElement('div');
+        postPromptUI.setAttribute('id', 'test');
+        consentElement.appendChild(postPromptUI);
+        doc.body.appendChild(consentElement);
+        ampConsent = new AmpConsent(consentElement);
+        sandbox.stub(ampConsent.vsync_, 'mutate').callsFake(fn => {
+          fn();
+        });
+        sandbox.stub(ampConsent, 'mutateElement').callsFake(fn => {
+          fn();
+        });
       });
-    });
-
-    it('update current displaying status', function* () {
-      ampConsent.buildCallback();
-      yield macroTask();
-      updateConsentInstanceStateSpy =
-          sandbox.spy(ampConsent.consentStateManager_,
-              'updateConsentInstanceState');
-      yield macroTask();
-      expect(ampConsent.isPromptUIOn_).to.be.true;
-      yield macroTask();
-      ampConsent.handleAction_(ACTION_TYPE.ACCEPT);
-      expect(updateConsentInstanceStateSpy).to.be.calledWith(
-          CONSENT_ITEM_STATE.ACCEPTED);
-      yield macroTask();
-      expect(ampConsent.isPromptUIOn_).to.be.false;
-    });
-
-    it('ignore action when no consent prompt is displaying', function* () {
-      ampConsent.buildCallback();
-      yield macroTask();
-      updateConsentInstanceStateSpy =
-          sandbox.spy(ampConsent.consentStateManager_,
-              'updateConsentInstanceState');
-      ampConsent.handleAction_(ACTION_TYPE.DISMISS);
-      yield macroTask();
-      expect(updateConsentInstanceStateSpy).to.be.calledOnce;
-      updateConsentInstanceStateSpy.resetHistory();
-      expect(ampConsent.isPromptUIOn_).to.be.false;
-      ampConsent.handleAction_(ACTION_TYPE.DISMISS);
-      yield macroTask();
-      expect(updateConsentInstanceStateSpy).to.not.be.called;
-    });
 
-    describe('schedule display', () => {
-      it('should check for pending consent UI', function* () {
+      it('update current displaying status', function*() {
         ampConsent.buildCallback();
         yield macroTask();
-        expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
-        ampConsent.scheduleDisplay_();
-        expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
-        ampConsent.hide_();
+        updateConsentInstanceStateSpy = sandbox.spy(
+          ampConsent.consentStateManager_,
+          'updateConsentInstanceState'
+        );
         yield macroTask();
-        expect(ampConsent.notificationUiManager_.queueSize_).to.equal(0);
-        ampConsent.scheduleDisplay_();
-        ampConsent.scheduleDisplay_();
-        ampConsent.scheduleDisplay_();
-        expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
-      });
-    });
-
-    describe('postPromptUI', () => {
-      let postPromptUI;
-
-      beforeEach(() => {
-        postPromptUI = doc.getElementById('test');
+        expect(ampConsent.isPromptUIOn_).to.be.true;
+        yield macroTask();
+        ampConsent.handleAction_(ACTION_TYPE.ACCEPT);
+        expect(updateConsentInstanceStateSpy).to.be.calledWith(
+          CONSENT_ITEM_STATE.ACCEPTED
+        );
+        yield macroTask();
+        expect(ampConsent.isPromptUIOn_).to.be.false;
       });
 
-      it('handle postPromptUI', function* () {
-        storageValue = {
-          'amp-consent:ABC': true,
-        };
-
-        // Build the amp consent, and check that everything is
-        // initialized correctly
+      it('ignore action when no consent prompt is displaying', function*() {
         ampConsent.buildCallback();
-        ampConsent.element.classList.remove('i-amphtml-notbuilt');
-        expect(ampConsent.postPromptUI_).to.not.be.null;
-        expect(ampConsent.element).to.have.display('none');
-        expect(postPromptUI).to.have.display('none');
-
-        // Wait for all modifications to the element to be applied.
-        // Then make more assertions.
         yield macroTask();
-        expect(ampConsent.element).to.not.have.display('none');
-        expect(ampConsent.element.classList.contains('amp-active')).to.be.true;
-        expect(ampConsent.element.classList.contains('amp-hidden')).to.be.false;
-        expect(postPromptUI).to.not.have.display('none');
-
-        // Schedule the display of the element
-        ampConsent.scheduleDisplay_();
-
-        // Wait for the element to be displayed,
-        // And the postPrompt to be hidden.
+        updateConsentInstanceStateSpy = sandbox.spy(
+          ampConsent.consentStateManager_,
+          'updateConsentInstanceState'
+        );
+        ampConsent.handleAction_(ACTION_TYPE.DISMISS);
+        yield macroTask();
+        expect(updateConsentInstanceStateSpy).to.be.calledOnce;
+        updateConsentInstanceStateSpy.resetHistory();
+        expect(ampConsent.isPromptUIOn_).to.be.false;
+        ampConsent.handleAction_(ACTION_TYPE.DISMISS);
         yield macroTask();
-        expect(postPromptUI).to.have.display('none');
+        expect(updateConsentInstanceStateSpy).to.not.be.called;
       });
 
-      describe('hide/show postPromptUI', () => {
-        beforeEach(() => {
-          defaultConfig = dict({
-            'consents': {
-              'ABC': {
-                'checkConsentHref': 'https://response3',
-              },
-            },
-            // There's already an amp-consent from a parent beforeEach with a
-            // test postPromptUI
-            'postPromptUI': 'test2',
-          });
-          consentElement = createConsentElement(doc, defaultConfig);
-          postPromptUI = doc.createElement('div');
-          postPromptUI.setAttribute('id', 'test2');
-          consentElement.appendChild(postPromptUI);
-          doc.body.appendChild(consentElement);
-          ampConsent = new AmpConsent(consentElement);
-        });
-
-        it('hide postPromptUI', function* () {
+      describe('schedule display', () => {
+        it('should check for pending consent UI', function*() {
           ampConsent.buildCallback();
-          ampConsent.element.classList.remove('i-amphtml-notbuilt');
           yield macroTask();
+          expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
+          ampConsent.scheduleDisplay_();
+          expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
+          ampConsent.hide_();
+          yield macroTask();
+          expect(ampConsent.notificationUiManager_.queueSize_).to.equal(0);
+          ampConsent.scheduleDisplay_();
+          ampConsent.scheduleDisplay_();
+          ampConsent.scheduleDisplay_();
+          expect(ampConsent.notificationUiManager_.queueSize_).to.equal(1);
+        });
+      });
 
-          expect(postPromptUI).to.not.be.null;
-          expect(postPromptUI).to.have.display('none');
+      describe('postPromptUI', () => {
+        let postPromptUI;
+
+        beforeEach(() => {
+          postPromptUI = doc.getElementById('test');
         });
 
-        it('show postPromptUI', function* () {
+        it('handle postPromptUI', function*() {
           storageValue = {
             'amp-consent:ABC': true,
           };
+
+          // Build the amp consent, and check that everything is
+          // initialized correctly
           ampConsent.buildCallback();
           ampConsent.element.classList.remove('i-amphtml-notbuilt');
-          yield macroTask();
+          expect(ampConsent.postPromptUI_).to.not.be.null;
+          expect(ampConsent.element).to.have.display('none');
+          expect(postPromptUI).to.have.display('none');
 
-          expect(postPromptUI).to.not.be.null;
+          // Wait for all modifications to the element to be applied.
+          // Then make more assertions.
+          yield macroTask();
+          expect(ampConsent.element).to.not.have.display('none');
+          expect(ampConsent.element.classList.contains('amp-active')).to.be
+            .true;
+          expect(ampConsent.element.classList.contains('amp-hidden')).to.be
+            .false;
           expect(postPromptUI).to.not.have.display('none');
+
+          // Schedule the display of the element
+          ampConsent.scheduleDisplay_();
+
+          // Wait for the element to be displayed,
+          // And the postPrompt to be hidden.
+          yield macroTask();
+          expect(postPromptUI).to.have.display('none');
+        });
+
+        describe('hide/show postPromptUI', () => {
+          beforeEach(() => {
+            defaultConfig = dict({
+              'consents': {
+                'ABC': {
+                  'checkConsentHref': 'https://response3',
+                },
+              },
+              // There's already an amp-consent from a parent beforeEach with a
+              // test postPromptUI
+              'postPromptUI': 'test2',
+            });
+            consentElement = createConsentElement(doc, defaultConfig);
+            postPromptUI = doc.createElement('div');
+            postPromptUI.setAttribute('id', 'test2');
+            consentElement.appendChild(postPromptUI);
+            doc.body.appendChild(consentElement);
+            ampConsent = new AmpConsent(consentElement);
+          });
+
+          it('hide postPromptUI', function*() {
+            ampConsent.buildCallback();
+            ampConsent.element.classList.remove('i-amphtml-notbuilt');
+            yield macroTask();
+
+            expect(postPromptUI).to.not.be.null;
+            expect(postPromptUI).to.have.display('none');
+          });
+
+          it('show postPromptUI', function*() {
+            storageValue = {
+              'amp-consent:ABC': true,
+            };
+            ampConsent.buildCallback();
+            ampConsent.element.classList.remove('i-amphtml-notbuilt');
+            yield macroTask();
+
+            expect(postPromptUI).to.not.be.null;
+            expect(postPromptUI).to.not.have.display('none');
+          });
         });
       });
     });
-  });
-});
-
+  }
+);
 
 /**
  * Create an <amp-consent> element from config for testing
diff --git a/extensions/amp-consent/0.1/test/test-consent-config.js b/extensions/amp-consent/0.1/test/test-consent-config.js
index ac6513e46087..78b549e9933a 100644
--- a/extensions/amp-consent/0.1/test/test-consent-config.js
+++ b/extensions/amp-consent/0.1/test/test-consent-config.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {CONSENT_POLICY_STATE} from '../../../../src/consent-state';
 import {ConsentConfig, expandPolicyConfig} from '../consent-config';
 import {dict} from '../../../../src/utils/object';
@@ -47,111 +46,129 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
     it('read inline config', () => {
       appendConfigScriptElement(doc, element, defaultConfig);
       const consentConfig = new ConsentConfig(element);
-      expect(consentConfig.getConsentConfig()).to.deep.equal(dict({
-        'consentInstanceId': 'ABC',
-        'checkConsentHref': 'https://response1',
-      }));
+      expect(consentConfig.getConsentConfig()).to.deep.equal(
+        dict({
+          'consentInstanceId': 'ABC',
+          'checkConsentHref': 'https://response1',
+        })
+      );
     });
 
     it('read cmp config', () => {
       appendConfigScriptElement(doc, element, dict({}));
       element.setAttribute('type', '_ping_');
       const consentConfig = new ConsentConfig(element);
-      expect(consentConfig.getConsentConfig()).to.deep.equal(dict({
-        'consentInstanceId': '_ping_',
-        'checkConsentHref': '/get-consent-v1',
-        'promptUISrc':
-            '/test/manual/diy-consent.html',
-      }));
+      expect(consentConfig.getConsentConfig()).to.deep.equal(
+        dict({
+          'consentInstanceId': '_ping_',
+          'checkConsentHref': '/get-consent-v1',
+          'promptUISrc': '/test/manual/diy-consent.html',
+        })
+      );
     });
 
     it('support deprecated config format', () => {
-      appendConfigScriptElement(doc, element, dict({
-        'consents': {
-          'ABC': {
-            'promptIfUnknownForGeoGroup': 'eea',
-            'checkConsentHref': '/href',
-            'clientConfig': {
-              'test': 'error',
+      appendConfigScriptElement(
+        doc,
+        element,
+        dict({
+          'consents': {
+            'ABC': {
+              'promptIfUnknownForGeoGroup': 'eea',
+              'checkConsentHref': '/href',
+              'clientConfig': {
+                'test': 'error',
+              },
             },
           },
-        },
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'uiConfig': {
-          'overlay': true,
-        },
-        'postPromptUI': 'test',
-      }));
+          'clientConfig': {
+            'test': 'ABC',
+          },
+          'uiConfig': {
+            'overlay': true,
+          },
+          'postPromptUI': 'test',
+        })
+      );
       const consentConfig = new ConsentConfig(element);
-      expect(consentConfig.getConsentConfig()).to.deep.equal(dict({
-        'consentInstanceId': 'ABC',
-        'promptIfUnknownForGeoGroup': 'eea',
-        'checkConsentHref': '/href',
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'uiConfig': {
-          'overlay': true,
-        },
-        'postPromptUI': 'test',
-      }));
+      expect(consentConfig.getConsentConfig()).to.deep.equal(
+        dict({
+          'consentInstanceId': 'ABC',
+          'promptIfUnknownForGeoGroup': 'eea',
+          'checkConsentHref': '/href',
+          'clientConfig': {
+            'test': 'ABC',
+          },
+          'uiConfig': {
+            'overlay': true,
+          },
+          'postPromptUI': 'test',
+        })
+      );
     });
 
     it('merge inline config w/ cmp config', () => {
-      appendConfigScriptElement(doc, element, dict({
-        'consentInstanceId': '_ping_',
-        'promptIfUnknownForGeoGroup': 'eea',
-        'checkConsentHref': '/override',
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'uiConfig': {
-          'overlay': true,
-        },
-        'policy': {
-          'default': {
-            'waitFor': {},
+      appendConfigScriptElement(
+        doc,
+        element,
+        dict({
+          'consentInstanceId': '_ping_',
+          'promptIfUnknownForGeoGroup': 'eea',
+          'checkConsentHref': '/override',
+          'clientConfig': {
+            'test': 'ABC',
           },
-        },
-        'postPromptUI': 'test',
-      }));
+          'uiConfig': {
+            'overlay': true,
+          },
+          'policy': {
+            'default': {
+              'waitFor': {},
+            },
+          },
+          'postPromptUI': 'test',
+        })
+      );
       element.setAttribute('type', '_ping_');
       const consentConfig = new ConsentConfig(element);
-      expect(consentConfig.getConsentConfig()).to.deep.equal(dict({
-        'consentInstanceId': '_ping_',
-        'checkConsentHref': '/override',
-        'promptUISrc':
-            '/test/manual/diy-consent.html',
-        'promptIfUnknownForGeoGroup': 'eea',
-        'postPromptUI': 'test',
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'uiConfig': {
-          'overlay': true,
-        },
-        'policy': {
-          'default': {
-            'waitFor': {},
+      expect(consentConfig.getConsentConfig()).to.deep.equal(
+        dict({
+          'consentInstanceId': '_ping_',
+          'checkConsentHref': '/override',
+          'promptUISrc': '/test/manual/diy-consent.html',
+          'promptIfUnknownForGeoGroup': 'eea',
+          'postPromptUI': 'test',
+          'clientConfig': {
+            'test': 'ABC',
           },
-        },
-      }));
+          'uiConfig': {
+            'overlay': true,
+          },
+          'policy': {
+            'default': {
+              'waitFor': {},
+            },
+          },
+        })
+      );
     });
 
     it('assert valid config', () => {
-      const scriptTypeError = 'amp-consent/consent-config: <script> child ' +
-          'must have type="application/json"';
-      const consentExistError = 'amp-consent/consent-config: ' +
-          'consentInstanceId to store consent info is required';
+      const scriptTypeError =
+        'amp-consent/consent-config: <script> child ' +
+        'must have type="application/json"';
+      const consentExistError =
+        'amp-consent/consent-config: ' +
+        'consentInstanceId to store consent info is required';
       const multiScriptError =
-          'amp-consent/consent-config: Found 2 <script> children. Expected 1';
-      const invalidJsonError = 'amp-consent/consent-config: ' +
-          'Failed to parse <script> contents. Is it valid JSON?';
+        'amp-consent/consent-config: Found 2 <script> children. Expected 1';
+      const invalidJsonError =
+        'amp-consent/consent-config: ' +
+        'Failed to parse <script> contents. Is it valid JSON?';
       const invalidCMPError = 'amp-consent/consent-config: invalid CMP type';
-      const multiConsentError = 'amp-consent/consent-config: ' +
-          'only single consent instance is supported';
+      const multiConsentError =
+        'amp-consent/consent-config: ' +
+        'only single consent instance is supported';
       // Check script type equals to application/json
 
       const scriptElement = doc.createElement('script');
@@ -159,15 +176,17 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       scriptElement.setAttribute('type', '');
       element.appendChild(scriptElement);
 
-      expect(() => new ConsentConfig(element).getConsentConfig())
-          .to.throw(scriptTypeError);
+      expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+        scriptTypeError
+      );
 
       // Check consent config exists
       scriptElement.setAttribute('type', 'application/json');
       scriptElement.textContent = JSON.stringify({});
       allowConsoleError(() => {
-        expect(() => new ConsentConfig(element).getConsentConfig())
-            .to.throw(consentExistError);
+        expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+          consentExistError
+        );
       });
 
       scriptElement.textContent = JSON.stringify({
@@ -177,8 +196,9 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
         },
       });
       allowConsoleError(() => {
-        expect(() => new ConsentConfig(element).getConsentConfig())
-            .to.throw(multiConsentError);
+        expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+          multiConsentError
+        );
       });
 
       // Check invalid CMP
@@ -187,30 +207,37 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       });
       element.setAttribute('type', 'not_exist');
       allowConsoleError(() => {
-        expect(() => new ConsentConfig(element).getConsentConfig())
-            .to.throw(invalidCMPError);
+        expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+          invalidCMPError
+        );
       });
 
       scriptElement.textContent = '"abc": {"a",}';
-      expect(() => new ConsentConfig(element).getConsentConfig())
-          .to.throw(invalidJsonError);
+      expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+        invalidJsonError
+      );
 
       // Check there is only one script object
       scriptElement.textContent = JSON.stringify(defaultConfig);
       const script2 = doc.createElement('script');
       element.appendChild(script2);
-      expect(() => new ConsentConfig(element).getConsentConfig())
-          .to.throw(multiScriptError);
+      expect(() => new ConsentConfig(element).getConsentConfig()).to.throw(
+        multiScriptError
+      );
     });
 
     it('remove not supported policy', () => {
       toggleExperiment(win, 'multi-consent', false);
-      appendConfigScriptElement(doc, element, dict({
-        'consentInstanceId': 'ABC',
-        'policy': {
-          'ABC': undefined,
-        },
-      }));
+      appendConfigScriptElement(
+        doc,
+        element,
+        dict({
+          'consentInstanceId': 'ABC',
+          'policy': {
+            'ABC': undefined,
+          },
+        })
+      );
       const consentConfig = new ConsentConfig(element);
       expect(consentConfig.getConsentConfig()).to.deep.equal({
         'consentInstanceId': 'ABC',
@@ -229,7 +256,7 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       });
     });
 
-    it('create predefined _till_responded policy', function* () {
+    it('create predefined _till_responded policy', function*() {
       const policy = expandPolicyConfig(dict({}), 'ABC');
       expect(policy['_till_responded']).to.deep.equal({
         'waitFor': {
@@ -244,7 +271,7 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       });
     });
 
-    it('create predefined _till_accepted policy', function* () {
+    it('create predefined _till_accepted policy', function*() {
       const policy = expandPolicyConfig(dict({}), 'ABC');
       expect(policy['_till_accepted']).to.deep.equal({
         'waitFor': {
@@ -253,7 +280,7 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       });
     });
 
-    it('create default _auto_reject policy', function* () {
+    it('create default _auto_reject policy', function*() {
       const policy = expandPolicyConfig(dict({}), 'ABC');
       expect(policy['_auto_reject']).to.deep.equal({
         'waitFor': {
@@ -272,15 +299,18 @@ describes.realWin('ConsentConfig', {amp: 1}, env => {
       });
     });
 
-    it('override default policy', function* () {
-      const policy = expandPolicyConfig(dict({
-        'default': {
-          'waitFor': {
-            'ABC': [],
+    it('override default policy', function*() {
+      const policy = expandPolicyConfig(
+        dict({
+          'default': {
+            'waitFor': {
+              'ABC': [],
+            },
+            'timeout': 2,
           },
-          'timeout': 2,
-        },
-      }), 'ABC');
+        }),
+        'ABC'
+      );
       expect(policy['default']).to.deep.equal({
         'waitFor': {
           'ABC': [],
diff --git a/extensions/amp-consent/0.1/test/test-consent-info.js b/extensions/amp-consent/0.1/test/test-consent-info.js
index 2153c25fc0c1..c509310c6c48 100644
--- a/extensions/amp-consent/0.1/test/test-consent-info.js
+++ b/extensions/amp-consent/0.1/test/test-consent-info.js
@@ -24,77 +24,100 @@ import {
 } from '../consent-info';
 import {dict} from '../../../../src/utils/object';
 
-
 describes.fakeWin('ConsentInfo', {}, () => {
   describe('getStoredConsentInfo', () => {
     it('construct consentInfo from undefined', () => {
-      expect(getStoredConsentInfo(undefined)).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.UNKNOWN,
-        'consentString': undefined,
-        'isDirty': undefined,
-      }));
+      expect(getStoredConsentInfo(undefined)).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.UNKNOWN,
+          'consentString': undefined,
+          'isDirty': undefined,
+        })
+      );
     });
 
     it('construct consentInfo from legacy value', () => {
-      expect(getStoredConsentInfo(true)).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.ACCEPTED,
-        'consentString': undefined,
-        'isDirty': undefined,
-      }));
-      expect(getStoredConsentInfo(false)).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.REJECTED,
-        'consentString': undefined,
-        'isDirty': undefined,
-      }));
+      expect(getStoredConsentInfo(true)).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.ACCEPTED,
+          'consentString': undefined,
+          'isDirty': undefined,
+        })
+      );
+      expect(getStoredConsentInfo(false)).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.REJECTED,
+          'consentString': undefined,
+          'isDirty': undefined,
+        })
+      );
     });
 
     it('construct consentInfo from stored value', () => {
-      expect(getStoredConsentInfo({
-        's': 1,
-      })).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.ACCEPTED,
-        'consentString': undefined,
-        'isDirty': undefined,
-      }));
-      expect(getStoredConsentInfo({
-        's': 0,
-        'r': 'test',
-      })).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.REJECTED,
-        'consentString': 'test',
-        'isDirty': undefined,
-      }));
-      expect(getStoredConsentInfo({
-        's': -1,
-        'r': 'test',
-        'd': 1,
-      })).to.deep.equal(dict({
-        'consentState': CONSENT_ITEM_STATE.UNKNOWN,
-        'consentString': 'test',
-        'isDirty': true,
-      }));
+      expect(
+        getStoredConsentInfo({
+          's': 1,
+        })
+      ).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.ACCEPTED,
+          'consentString': undefined,
+          'isDirty': undefined,
+        })
+      );
+      expect(
+        getStoredConsentInfo({
+          's': 0,
+          'r': 'test',
+        })
+      ).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.REJECTED,
+          'consentString': 'test',
+          'isDirty': undefined,
+        })
+      );
+      expect(
+        getStoredConsentInfo({
+          's': -1,
+          'r': 'test',
+          'd': 1,
+        })
+      ).to.deep.equal(
+        dict({
+          'consentState': CONSENT_ITEM_STATE.UNKNOWN,
+          'consentString': 'test',
+          'isDirty': true,
+        })
+      );
     });
 
     it('throw error with invalid value', () => {
       expect(() => getStoredConsentInfo('invalid')).to.throw(
-          'Invalid stored consent value');
+        'Invalid stored consent value'
+      );
     });
   });
 
   it('composeStoreValue/getStoredConsentInfo', () => {
     let consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED);
-    expect(getStoredConsentInfo(composeStoreValue(consentInfo)))
-        .to.deep.equal(consentInfo);
-
-    consentInfo =
-        constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
-    expect(getStoredConsentInfo(composeStoreValue(consentInfo)))
-        .to.deep.equal(consentInfo);
-
-    consentInfo =
-        constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true);
-    expect(getStoredConsentInfo(composeStoreValue(consentInfo)))
-        .to.deep.equal(consentInfo);
+    expect(getStoredConsentInfo(composeStoreValue(consentInfo))).to.deep.equal(
+      consentInfo
+    );
+
+    consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
+    expect(getStoredConsentInfo(composeStoreValue(consentInfo))).to.deep.equal(
+      consentInfo
+    );
+
+    consentInfo = constructConsentInfo(
+      CONSENT_ITEM_STATE.ACCEPTED,
+      'test',
+      true
+    );
+    expect(getStoredConsentInfo(composeStoreValue(consentInfo))).to.deep.equal(
+      consentInfo
+    );
   });
 
   describe('composeStoreValue', () => {
@@ -144,33 +167,42 @@ describes.fakeWin('ConsentInfo', {}, () => {
     let newState, previousState;
     newState = CONSENT_ITEM_STATE.ACCEPTED;
     previousState = CONSENT_ITEM_STATE.REJECTED;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(newState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      newState
+    );
 
     // UNKNOWN/DISMISS/NOT_REQUIRED cannot override reject/accept
     newState = CONSENT_ITEM_STATE.UNKNOWN;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(previousState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      previousState
+    );
     newState = CONSENT_ITEM_STATE.DISMISSED;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(previousState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      previousState
+    );
     newState = CONSENT_ITEM_STATE.NOT_REQUIRED;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(previousState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      previousState
+    );
 
     // UNKNOWN/DISMISS cannot override NOT_REQUIRED
     previousState = CONSENT_ITEM_STATE.NOT_REQUIRED;
     newState = CONSENT_ITEM_STATE.UNKNOWN;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(previousState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      previousState
+    );
     newState = CONSENT_ITEM_STATE.DISMISSED;
-    expect(recalculateConsentStateValue(newState, previousState))
-        .to.equal(previousState);
+    expect(recalculateConsentStateValue(newState, previousState)).to.equal(
+      previousState
+    );
 
     // DISMISS is converted to UNKNOWN
-    expect(recalculateConsentStateValue(
-        CONSENT_ITEM_STATE.DISMISSED, CONSENT_ITEM_STATE.UNKNOWN))
-        .to.equal(CONSENT_ITEM_STATE.UNKNOWN);
+    expect(
+      recalculateConsentStateValue(
+        CONSENT_ITEM_STATE.DISMISSED,
+        CONSENT_ITEM_STATE.UNKNOWN
+      )
+    ).to.equal(CONSENT_ITEM_STATE.UNKNOWN);
   });
 
   it('isConsentInfoStoredValueSame', () => {
diff --git a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
index f885f266f6f4..3517d50f8904 100644
--- a/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
+++ b/extensions/amp-consent/0.1/test/test-consent-policy-manager.js
@@ -15,8 +15,7 @@
  */
 
 import * as lolex from 'lolex';
-import {CONSENT_ITEM_STATE,
-  constructConsentInfo} from '../consent-info';
+import {CONSENT_ITEM_STATE, constructConsentInfo} from '../consent-info';
 import {CONSENT_POLICY_STATE} from '../../../../src/consent-state';
 import {
   ConsentPolicyInstance,
@@ -31,482 +30,545 @@ import {
   resetServiceForTesting,
 } from '../../../../src/service';
 
-describes.realWin('ConsentPolicyManager', {
-  amp: {
-    extensions: ['amp-consent'],
-    ampdoc: 'single',
+describes.realWin(
+  'ConsentPolicyManager',
+  {
+    amp: {
+      extensions: ['amp-consent'],
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let win;
-  let ampdoc;
-  let consentManagerOnChangeSpy;
-  let consentInfo;
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    consentManagerOnChangeSpy = sandbox.spy();
-
-    resetServiceForTesting(win, 'consentStateManager');
-    registerServiceBuilder(win, 'consentStateManager', function() {
-      return Promise.resolve({
-        whenConsentReady: () => {return Promise.resolve();},
-        onConsentStateChange: handler => {
-          consentManagerOnChangeSpy(handler);
-          handler(consentInfo);
-        },
-        getConsentInstanceSharedData: () => {
-          return Promise.resolve(dict({
-            'shared': 'test',
-          }));
-        },
+  env => {
+    let win;
+    let ampdoc;
+    let consentManagerOnChangeSpy;
+    let consentInfo;
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      consentManagerOnChangeSpy = sandbox.spy();
+
+      resetServiceForTesting(win, 'consentStateManager');
+      registerServiceBuilder(win, 'consentStateManager', function() {
+        return Promise.resolve({
+          whenConsentReady: () => {
+            return Promise.resolve();
+          },
+          onConsentStateChange: handler => {
+            consentManagerOnChangeSpy(handler);
+            handler(consentInfo);
+          },
+          getConsentInstanceSharedData: () => {
+            return Promise.resolve(
+              dict({
+                'shared': 'test',
+              })
+            );
+          },
+        });
       });
     });
-  });
 
-  afterEach(() => {
-    consentInfo = null;
-  });
-
-  describe('Consent Policy Manager', () => {
-    let manager;
-    beforeEach(() => {
-      manager = new ConsentPolicyManager(ampdoc);
-      consentInfo =
-          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
-      manager.setLegacyConsentInstanceId('ABC');
+    afterEach(() => {
+      consentInfo = null;
     });
 
-    it('Initiate consent value', function* () {
-      yield macroTask();
-      expect(consentManagerOnChangeSpy).to.be.called;
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
-      expect(manager.consentString_).to.equal('test');
-    });
+    describe('Consent Policy Manager', () => {
+      let manager;
+      beforeEach(() => {
+        manager = new ConsentPolicyManager(ampdoc);
+        consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
+        manager.setLegacyConsentInstanceId('ABC');
+      });
 
-    describe('Register policy instance', () => {
-      it('Valid consent policy', function* () {
-        manager.registerConsentPolicyInstance('default', {
-          'waitFor': {
-            'ABC': undefined,
-          },
-        });
+      it('Initiate consent value', function*() {
         yield macroTask();
-        return manager.whenPolicyResolved('default').then(status => {
-          expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-        });
+        expect(consentManagerOnChangeSpy).to.be.called;
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
+        expect(manager.consentString_).to.equal('test');
       });
 
-      it('Invalid consent policy', function* () {
-        consentInfo =
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED);
-        expectAsyncConsoleError('[consent-policy-manager] ' +
-            'invalid waitFor value, consent policy will never resolve');
-        manager.registerConsentPolicyInstance('default', {
-          'waitFor': {
-            'ABC': undefined,
-            'invalid': undefined,
-          },
+      describe('Register policy instance', () => {
+        it('Valid consent policy', function*() {
+          manager.registerConsentPolicyInstance('default', {
+            'waitFor': {
+              'ABC': undefined,
+            },
+          });
+          yield macroTask();
+          return manager.whenPolicyResolved('default').then(status => {
+            expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
+          });
+        });
+
+        it('Invalid consent policy', function*() {
+          consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED);
+          expectAsyncConsoleError(
+            '[consent-policy-manager] ' +
+              'invalid waitFor value, consent policy will never resolve'
+          );
+          manager.registerConsentPolicyInstance('default', {
+            'waitFor': {
+              'ABC': undefined,
+              'invalid': undefined,
+            },
+          });
         });
       });
-    });
 
-    it('Handle consent state change', () => {
-      // UNKNOWN Init value
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
-      expect(manager.consentState_).to.be.null;
-
-      // Dismiss override unknown
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.UNKNOWN);
-
-      // Not required override unknown
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.NOT_REQUIRED);
-
-      // Accept
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
-
-      // UNKNOWN/NOT_REQUIRED/DISMISS cannot override ACCEPTED/REJECTED
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
-
-      // Reject
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.REJECTED);
-
-      // UNKNOWN/NOT_REQUIRED/DISMISS cannot override ACCEPTED/REJECTED
-      manager.consentStateChangeHandler_(
-          constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED));
-      expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.REJECTED);
-    });
+      it('Handle consent state change', () => {
+        // UNKNOWN Init value
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
+        expect(manager.consentState_).to.be.null;
+
+        // Dismiss override unknown
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.UNKNOWN);
+
+        // Not required override unknown
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.NOT_REQUIRED);
+
+        // Accept
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
+
+        // UNKNOWN/NOT_REQUIRED/DISMISS cannot override ACCEPTED/REJECTED
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.ACCEPTED);
+
+        // Reject
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.REJECTED);
+
+        // UNKNOWN/NOT_REQUIRED/DISMISS cannot override ACCEPTED/REJECTED
+        manager.consentStateChangeHandler_(
+          constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED)
+        );
+        expect(manager.consentState_).to.equal(CONSENT_ITEM_STATE.REJECTED);
+      });
 
-    describe('whenPolicyResolved/Unblock', () => {
-      it('Invalid policy value', () => {
-        expectAsyncConsoleError(/only predefined policies are supported/, 2);
-        return manager.whenPolicyResolved('invalid').then(state => {
-          expect(state).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
-          return manager.whenPolicyUnblock('invalid').then(shouldUnblock => {
-            expect(shouldUnblock).to.be.false;
+      describe('whenPolicyResolved/Unblock', () => {
+        it('Invalid policy value', () => {
+          expectAsyncConsoleError(/only predefined policies are supported/, 2);
+          return manager.whenPolicyResolved('invalid').then(state => {
+            expect(state).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
+            return manager.whenPolicyUnblock('invalid').then(shouldUnblock => {
+              expect(shouldUnblock).to.be.false;
+            });
           });
         });
-      });
 
-      it('return promise when policy is resolved', () => {
-        manager.registerConsentPolicyInstance('default', {
-          'waitFor': {
-            'ABC': undefined,
-          },
+        it('return promise when policy is resolved', () => {
+          manager.registerConsentPolicyInstance('default', {
+            'waitFor': {
+              'ABC': undefined,
+            },
+          });
+          return manager.whenPolicyResolved('default');
         });
-        return manager.whenPolicyResolved('default');
-      });
 
-      it('handle cases when requested before policy is registered', () => {
-        const promise = manager.whenPolicyResolved('default');
-        manager.registerConsentPolicyInstance('default', {
-          'waitFor': {
-            'ABC': undefined,
-          },
+        it('handle cases when requested before policy is registered', () => {
+          const promise = manager.whenPolicyResolved('default');
+          manager.registerConsentPolicyInstance('default', {
+            'waitFor': {
+              'ABC': undefined,
+            },
+          });
+          return promise;
         });
-        return promise;
       });
-    });
 
-    describe('Predefined consent policy', () => {
-      let policy;
-      beforeEach(() => {
-        manager = new ConsentPolicyManager(ampdoc);
-        consentInfo =
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
-        manager.setLegacyConsentInstanceId('ABC');
-        policy = expandPolicyConfig(dict({}), 'ABC');
-        const keys = Object.keys(policy);
-        for (let i = 0; i < keys.length; i++) {
-          manager.registerConsentPolicyInstance(keys[i], policy[keys[i]]);
-        }
-      });
+      describe('Predefined consent policy', () => {
+        let policy;
+        beforeEach(() => {
+          manager = new ConsentPolicyManager(ampdoc);
+          consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
+          manager.setLegacyConsentInstanceId('ABC');
+          policy = expandPolicyConfig(dict({}), 'ABC');
+          const keys = Object.keys(policy);
+          for (let i = 0; i < keys.length; i++) {
+            manager.registerConsentPolicyInstance(keys[i], policy[keys[i]]);
+          }
+        });
 
-      it('Not required', () => {
-        manager.consentStateChangeHandler_(
-            constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED));
-        const promises = [];
-        promises.push(manager.whenPolicyResolved('default').then(status => {
-          expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
-        }));
-        promises.push(manager.whenPolicyResolved('_till_accepted').then(
-            status => {
+        it('Not required', () => {
+          manager.consentStateChangeHandler_(
+            constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED)
+          );
+          const promises = [];
+          promises.push(
+            manager.whenPolicyResolved('default').then(status => {
               expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
-            }));
-        promises.push(manager.whenPolicyResolved('_till_responded').then(
-            status => {
+                CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+              );
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_accepted').then(status => {
               expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
-            }));
-        promises.push(manager.whenPolicyResolved('_auto_reject').then(
-            status => {
+                CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+              );
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_responded').then(status => {
               expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
-            }));
-
-        // Unblock
-        promises.push(manager.whenPolicyUnblock('default').then(toUnblock => {
-          expect(toUnblock).to.be.true;
-        }));
-
-        promises.push(manager.whenPolicyUnblock('_till_accepted').then(
-            toUnblock => {
+                CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+              );
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_auto_reject').then(status => {
+              expect(status).to.equal(
+                CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+              );
+            })
+          );
+
+          // Unblock
+          promises.push(
+            manager.whenPolicyUnblock('default').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_till_responded').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_till_accepted').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_auto_reject').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_till_responded').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
-        return Promise.all(promises);
-      });
+            })
+          );
 
-      it('Dismiss', () => {
-        manager.consentStateChangeHandler_(
-            constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED));
-        const promises = [];
-        promises.push(manager.whenPolicyResolved('default').then(status => {
-          expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
-        }));
-        promises.push(manager.whenPolicyResolved('_till_accepted').then(
-            status => {
-              expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN);
-            }));
-        promises.push(manager.whenPolicyResolved('_till_responded').then(
-            status => {
-              expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN);
-            }));
-        promises.push(manager.whenPolicyResolved('_auto_reject').then(
-            status => {
-              expect(status).to.equal(
-                  CONSENT_POLICY_STATE.UNKNOWN);
-            }));
+          promises.push(
+            manager.whenPolicyUnblock('_auto_reject').then(toUnblock => {
+              expect(toUnblock).to.be.true;
+            })
+          );
+          return Promise.all(promises);
+        });
 
-        // Unblock
-        promises.push(manager.whenPolicyUnblock('default').then(toUnblock => {
-          expect(toUnblock).to.be.false;
-        }));
+        it('Dismiss', () => {
+          manager.consentStateChangeHandler_(
+            constructConsentInfo(CONSENT_ITEM_STATE.DISMISSED)
+          );
+          const promises = [];
+          promises.push(
+            manager.whenPolicyResolved('default').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_accepted').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_responded').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_auto_reject').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.UNKNOWN);
+            })
+          );
+
+          // Unblock
+          promises.push(
+            manager.whenPolicyUnblock('default').then(toUnblock => {
+              expect(toUnblock).to.be.false;
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_till_accepted').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_till_accepted').then(toUnblock => {
               expect(toUnblock).to.be.false;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_till_responded').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_till_responded').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_auto_reject').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_auto_reject').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
-        return Promise.all(promises);
-      });
+            })
+          );
+          return Promise.all(promises);
+        });
 
-      it('Accept', () => {
-        manager.consentStateChangeHandler_(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
-        const promises = [];
-        promises.push(manager.whenPolicyResolved('default').then(status => {
-          expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-        }));
-        promises.push(manager.whenPolicyResolved('_till_accepted').then(
-            status => {
+        it('Accept', () => {
+          manager.consentStateChangeHandler_(
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+          );
+          const promises = [];
+          promises.push(
+            manager.whenPolicyResolved('default').then(status => {
               expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-            }));
-        promises.push(manager.whenPolicyResolved('_till_responded').then(
-            status => {
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_accepted').then(status => {
               expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-            }));
-        promises.push(manager.whenPolicyResolved('_auto_reject').then(
-            status => {
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_till_responded').then(status => {
               expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
-            }));
+            })
+          );
+          promises.push(
+            manager.whenPolicyResolved('_auto_reject').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.SUFFICIENT);
+            })
+          );
 
-        return Promise.all(promises);
-      });
+          return Promise.all(promises);
+        });
 
-      it('Reject', () => {
-        manager.consentStateChangeHandler_(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
-        const promises = [];
-        promises.push(manager.whenPolicyResolved('default').then(status => {
-          expect(status).to.equal(CONSENT_POLICY_STATE.INSUFFICIENT);
-        }));
-
-        promises.push(manager.whenPolicyUnblock('default').then(toUnblock => {
-          expect(toUnblock).to.be.false;
-        }));
-
-        promises.push(manager.whenPolicyUnblock('_till_accepted').then(
-            toUnblock => {
+        it('Reject', () => {
+          manager.consentStateChangeHandler_(
+            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+          );
+          const promises = [];
+          promises.push(
+            manager.whenPolicyResolved('default').then(status => {
+              expect(status).to.equal(CONSENT_POLICY_STATE.INSUFFICIENT);
+            })
+          );
+
+          promises.push(
+            manager.whenPolicyUnblock('default').then(toUnblock => {
               expect(toUnblock).to.be.false;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_till_responded').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_till_accepted').then(toUnblock => {
+              expect(toUnblock).to.be.false;
+            })
+          );
+
+          promises.push(
+            manager.whenPolicyUnblock('_till_responded').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
+            })
+          );
 
-        promises.push(manager.whenPolicyUnblock('_auto_reject').then(
-            toUnblock => {
+          promises.push(
+            manager.whenPolicyUnblock('_auto_reject').then(toUnblock => {
               expect(toUnblock).to.be.true;
-            }));
+            })
+          );
 
-        return Promise.all(promises);
+          return Promise.all(promises);
+        });
       });
     });
-  });
-
-  describe('Consent Policy Instance', () => {
-    let instance;
-    beforeEach(() => {
-      const config = {
-        'waitFor': {
-          'ABC': [],
-        },
-      };
-      instance = new ConsentPolicyInstance(config);
-    });
-
-    describe('timeout', () => {
-      let config1;
-      let config2;
-      let clock;
 
+    describe('Consent Policy Instance', () => {
+      let instance;
       beforeEach(() => {
-        config1 = {
+        const config = {
           'waitFor': {
             'ABC': [],
           },
-          'timeout': {
-            'seconds': 1,
-            'fallbackAction': 'reject',
-          },
         };
+        instance = new ConsentPolicyInstance(config);
+      });
 
-        config2 = {
-          'waitFor': {
-            'ABC': [],
-          },
-          'timeout': {
-            'seconds': 2,
-            'fallbackAction': 'reject',
-          },
-        };
+      describe('timeout', () => {
+        let config1;
+        let config2;
+        let clock;
+
+        beforeEach(() => {
+          config1 = {
+            'waitFor': {
+              'ABC': [],
+            },
+            'timeout': {
+              'seconds': 1,
+              'fallbackAction': 'reject',
+            },
+          };
+
+          config2 = {
+            'waitFor': {
+              'ABC': [],
+            },
+            'timeout': {
+              'seconds': 2,
+              'fallbackAction': 'reject',
+            },
+          };
+
+          clock = lolex.install({target: ampdoc.win});
+        });
 
-        clock = lolex.install({target: ampdoc.win});
-      });
+        it('consent policy should resolve after timeout', function*() {
+          instance = new ConsentPolicyInstance(config1);
+          let ready = false;
+          instance.getReadyPromise().then(() => (ready = true));
+          instance.startTimeout(ampdoc.win);
+          yield macroTask();
+          expect(ready).to.be.false;
+          clock.tick(999);
+          yield macroTask();
+          expect(ready).to.be.false;
+          clock.tick(1);
+          yield macroTask();
+          expect(ready).to.be.true;
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.INSUFFICIENT
+          );
+        });
 
-      it('consent policy should resolve after timeout', function* () {
-        instance = new ConsentPolicyInstance(config1);
-        let ready = false;
-        instance.getReadyPromise().then(() => ready = true);
-        instance.startTimeout(ampdoc.win);
-        yield macroTask();
-        expect(ready).to.be.false;
-        clock.tick(999);
-        yield macroTask();
-        expect(ready).to.be.false;
-        clock.tick(1);
-        yield macroTask();
-        expect(ready).to.be.true;
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.INSUFFICIENT);
+        it('consent policy resolve before timeout', function*() {
+          instance = new ConsentPolicyInstance(config2);
+          let ready = false;
+          instance.getReadyPromise().then(() => (ready = true));
+          instance.startTimeout(ampdoc.win);
+          yield macroTask();
+          expect(ready).to.be.false;
+          clock.tick(1000);
+          instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
+          yield macroTask();
+          expect(ready).to.be.true;
+          clock.tick(1001);
+          yield macroTask();
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.UNKNOWN
+          );
+        });
       });
 
-      it('consent policy resolve before timeout', function* () {
-        instance = new ConsentPolicyInstance(config2);
-        let ready = false;
-        instance.getReadyPromise().then(() => ready = true);
-        instance.startTimeout(ampdoc.win);
-        yield macroTask();
-        expect(ready).to.be.false;
-        clock.tick(1000);
-        instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
-        yield macroTask();
-        expect(ready).to.be.true;
-        clock.tick(1001);
-        yield macroTask();
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.UNKNOWN);
+      describe('getCurrentPolicyStatus', () => {
+        it('should return current policy state', function*() {
+          instance = new ConsentPolicyInstance({
+            'waitFor': {
+              'ABC': [],
+            },
+          });
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.UNKNOWN
+          );
+
+          instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.INSUFFICIENT
+          );
+
+          instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.SUFFICIENT
+          );
+
+          instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.UNKNOWN
+          );
+
+          instance.evaluate(CONSENT_ITEM_STATE.NOT_REQUIRED);
+          expect(instance.getCurrentPolicyStatus()).to.equal(
+            CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+          );
+        });
       });
-    });
 
+      describe('shouldBlock', () => {
+        it('default should block list', () => {
+          instance = new ConsentPolicyInstance({
+            'waitFor': {
+              'ABC': [],
+            },
+          });
+          instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
+          expect(instance.shouldUnblock()).to.equal(false);
 
-    describe('getCurrentPolicyStatus', () => {
-      it('should return current policy state', function* () {
-        instance = new ConsentPolicyInstance({
-          'waitFor': {
-            'ABC': [],
-          },
-        });
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.UNKNOWN);
+          instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
+          expect(instance.shouldUnblock()).to.equal(false);
 
-        instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.INSUFFICIENT);
+          instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
+          expect(instance.shouldUnblock()).to.equal(true);
+        });
 
-        instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.SUFFICIENT);
+        it('customized should block list', () => {
+          instance = new ConsentPolicyInstance({
+            'waitFor': {
+              'ABC': [],
+            },
+            'unblockOn': [
+              CONSENT_POLICY_STATE.UNKNOWN,
+              CONSENT_POLICY_STATE.SUFFICIENT,
+              CONSENT_POLICY_STATE.INSUFFICIENT,
+              CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED,
+            ],
+          });
+          instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
+          expect(instance.shouldUnblock()).to.equal(true);
 
-        instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.UNKNOWN);
+          instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
+          expect(instance.shouldUnblock()).to.equal(true);
 
-        instance.evaluate(CONSENT_ITEM_STATE.NOT_REQUIRED);
-        expect(instance.getCurrentPolicyStatus()).to.equal(
-            CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
+          instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
+          expect(instance.shouldUnblock()).to.equal(true);
+        });
       });
     });
 
-    describe('shouldBlock', () => {
-      it('default should block list', () => {
-        instance = new ConsentPolicyInstance({
-          'waitFor': {
-            'ABC': [],
-          },
-        });
-        instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
-        expect(instance.shouldUnblock()).to.equal(false);
-
-        instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
-        expect(instance.shouldUnblock()).to.equal(false);
+    describe('getMergedSharedData', () => {
+      let manager;
 
-        instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
-        expect(instance.shouldUnblock()).to.equal(true);
+      beforeEach(() => {
+        manager = new ConsentPolicyManager(ampdoc);
+        sandbox
+          .stub(ConsentPolicyInstance.prototype, 'getReadyPromise')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
+        manager.setLegacyConsentInstanceId('ABC');
       });
 
-      it('customized should block list', () => {
-        instance = new ConsentPolicyInstance({
+      it('should return sharedData', function*() {
+        manager.registerConsentPolicyInstance('default', {
           'waitFor': {
-            'ABC': [],
+            'ABC': undefined,
           },
-          'unblockOn': [
-            CONSENT_POLICY_STATE.UNKNOWN,
-            CONSENT_POLICY_STATE.SUFFICIENT,
-            CONSENT_POLICY_STATE.INSUFFICIENT,
-            CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED,
-          ],
         });
-        instance.evaluate(CONSENT_ITEM_STATE.DISMISSED);
-        expect(instance.shouldUnblock()).to.equal(true);
-
-        instance.evaluate(CONSENT_ITEM_STATE.REJECTED);
-        expect(instance.shouldUnblock()).to.equal(true);
-
-        instance.evaluate(CONSENT_ITEM_STATE.ACCEPTED);
-        expect(instance.shouldUnblock()).to.equal(true);
-      });
-    });
-  });
-
-  describe('getMergedSharedData', () => {
-    let manager;
-
-    beforeEach(() => {
-      manager = new ConsentPolicyManager(ampdoc);
-      sandbox.stub(ConsentPolicyInstance.prototype, 'getReadyPromise')
-          .callsFake(() => {return Promise.resolve();});
-      consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN);
-      manager.setLegacyConsentInstanceId('ABC');
-    });
-
-    it('should return sharedData', function*() {
-      manager.registerConsentPolicyInstance('default', {
-        'waitFor': {
-          'ABC': undefined,
-        },
+        yield macroTask();
+        return expect(
+          manager.getMergedSharedData('default')
+        ).to.eventually.deep.equal({
+          'shared': 'test',
+        });
       });
-      yield macroTask();
-      return expect(manager.getMergedSharedData('default'))
-          .to.eventually.deep.equal({
-            'shared': 'test',
-          });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-consent/0.1/test/test-consent-state-manager.js b/extensions/amp-consent/0.1/test/test-consent-state-manager.js
index 045fc6774302..25bd76949d79 100644
--- a/extensions/amp-consent/0.1/test/test-consent-state-manager.js
+++ b/extensions/amp-consent/0.1/test/test-consent-state-manager.js
@@ -18,10 +18,7 @@ import {
   composeStoreValue,
   constructConsentInfo,
 } from '../consent-info';
-import {
-  ConsentInstance,
-  ConsentStateManager,
-} from '../consent-state-manager';
+import {ConsentInstance, ConsentStateManager} from '../consent-state-manager';
 import {dev} from '../../../../src/log';
 import {macroTask} from '../../../../testing/yield';
 import {
@@ -29,8 +26,6 @@ import {
   resetServiceForTesting,
 } from '../../../../src/service';
 
-
-
 describes.realWin('ConsentStateManager', {amp: 1}, env => {
   let win;
   let ampdoc;
@@ -93,52 +88,62 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
     });
 
     describe('update/get consentInfo', () => {
-      it('get initial default consentInfo value', function* () {
+      it('get initial default consentInfo value', function*() {
         manager.registerConsentInstance('test', {});
         let value;
-        const p = manager.getConsentInstanceInfo().then(v => value = v);
+        const p = manager.getConsentInstanceInfo().then(v => (value = v));
         yield p;
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
       });
 
-      it('update/get consent state', function* () {
+      it('update/get consent state', function*() {
         manager.registerConsentInstance('test', {});
         manager.updateConsentInstanceState(CONSENT_ITEM_STATE.ACCEPTED);
         let value;
-        const p = manager.getConsentInstanceInfo().then(v => value = v);
+        const p = manager.getConsentInstanceInfo().then(v => (value = v));
         yield p;
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+        );
       });
 
-      it('update/get consent string', function* () {
+      it('update/get consent string', function*() {
         manager.registerConsentInstance('test', {});
         manager.updateConsentInstanceState(
-            CONSENT_ITEM_STATE.ACCEPTED, 'test-string');
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test-string'
+        );
         let value;
-        const p = manager.getConsentInstanceInfo().then(v => value = v);
+        const p = manager.getConsentInstanceInfo().then(v => (value = v));
         yield p;
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test-string'));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test-string')
+        );
       });
 
-      it('getConsentInstanceInfo getLastConsentInstanceInfo', function* () {
+      it('getConsentInstanceInfo getLastConsentInstanceInfo', function*() {
         let currentValue;
         let lastValue;
         manager.registerConsentInstance('test', {});
-        const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true);
+        const testConsentInfo = constructConsentInfo(
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test',
+          true
+        );
         storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
-        yield manager.getConsentInstanceInfo().then(v => currentValue = v);
-        yield manager.getLastConsentInstanceInfo().then(v => lastValue = v);
+        yield manager.getConsentInstanceInfo().then(v => (currentValue = v));
+        yield manager.getLastConsentInstanceInfo().then(v => (lastValue = v));
         expect(currentValue).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
         expect(lastValue).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true)
+        );
       });
 
-      it('update consent string that exceeds max size', function* () {
+      it('update consent string that exceeds max size', function*() {
         expectAsyncConsoleError(/Cannot store consentString/);
         manager.registerConsentInstance('test', {});
         const MAX_LENGTH = 150;
@@ -147,12 +152,15 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
           testStr += 'a';
         }
         manager.updateConsentInstanceState(
-            CONSENT_ITEM_STATE.ACCEPTED, testStr);
+          CONSENT_ITEM_STATE.ACCEPTED,
+          testStr
+        );
         let value;
-        const p = manager.getConsentInstanceInfo().then(v => value = v);
+        const p = manager.getConsentInstanceInfo().then(v => (value = v));
         yield p;
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, testStr));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, testStr)
+        );
       });
     });
 
@@ -168,15 +176,16 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         manager.onConsentStateChange(spy);
         manager.updateConsentInstanceState(CONSENT_ITEM_STATE.REJECTED);
         expect(spy).to.be.calledWith(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
       });
 
       it('should call handler when consent is ignored', () => {
         manager.onConsentStateChange(spy);
-        manager.updateConsentInstanceState(
-            CONSENT_ITEM_STATE.NOT_REQUIRED);
+        manager.updateConsentInstanceState(CONSENT_ITEM_STATE.NOT_REQUIRED);
         expect(spy).to.be.calledWith(
-            constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED));
+          constructConsentInfo(CONSENT_ITEM_STATE.NOT_REQUIRED)
+        );
       });
 
       it('should call handler when register observable', function*() {
@@ -184,20 +193,23 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         yield macroTask();
         expect(spy).to.be.calledOnce;
         expect(spy).to.be.calledWith(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
       });
 
-      it('handles race condition', function* () {
+      it('handles race condition', function*() {
         manager.onConsentStateChange(spy);
         manager.updateConsentInstanceState(CONSENT_ITEM_STATE.REJECTED);
         expect(spy).to.be.calledOnce;
         expect(spy).to.be.calledWith(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
         yield macroTask();
         // Called with updated state value REJECT instead of UNKNOWN
         expect(spy).to.be.calledTwice;
         expect(spy).to.be.calledWith(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
       });
     });
   });
@@ -211,7 +223,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
 
     describe('update', () => {
       describe('update value', () => {
-        it('invalid consent state', function* () {
+        it('invalid consent state', function*() {
           instance.update(-1);
           yield macroTask();
           expect(storageSetSpy).to.not.be.called;
@@ -221,7 +233,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
           expect(storageSetSpy).to.not.be.called;
         });
 
-        it('single consent state value', function* () {
+        it('single consent state value', function*() {
           instance.update(CONSENT_ITEM_STATE.UNKNOWN);
           yield macroTask();
           expect(storageSetSpy).to.not.be.called;
@@ -244,34 +256,41 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
           expect(storageSetSpy).to.be.calledWith('amp-consent:test', false);
         });
 
-        it('update consent info with consent string', function* () {
+        it('update consent info with consent string', function*() {
           instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'accept');
           yield macroTask();
-          let consentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'accept');
+          let consentInfo = constructConsentInfo(
+            CONSENT_ITEM_STATE.ACCEPTED,
+            'accept'
+          );
           expect(storageSetSpy).to.be.calledOnce;
           expect(storageSetSpy).to.be.calledWith(
-              'amp-consent:test', composeStoreValue(consentInfo));
+            'amp-consent:test',
+            composeStoreValue(consentInfo)
+          );
           storageSetSpy.resetHistory();
 
           instance.update(CONSENT_ITEM_STATE.REJECTED, 'reject');
           yield macroTask();
-          consentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.REJECTED, 'reject');
+          consentInfo = constructConsentInfo(
+            CONSENT_ITEM_STATE.REJECTED,
+            'reject'
+          );
           expect(storageSetSpy).to.be.calledOnce;
           expect(storageSetSpy).to.be.calledWith(
-              'amp-consent:test', composeStoreValue(consentInfo));
+            'amp-consent:test',
+            composeStoreValue(consentInfo)
+          );
         });
 
-        it('remove consentInfo when consentStr length exceeds', function* () {
+        it('remove consentInfo when consentStr length exceeds', function*() {
           expectAsyncConsoleError(/Cannot store consentString/);
           const MAX_LENGTH = 150;
           let testStr = 'a';
           for (let i = 0; i < MAX_LENGTH; i++) {
             testStr += 'a';
           }
-          instance.update(
-              CONSENT_ITEM_STATE.ACCEPTED, testStr);
+          instance.update(CONSENT_ITEM_STATE.ACCEPTED, testStr);
           yield macroTask();
           expect(storageSetSpy).to.not.be.called;
           expect(storageRemoveSpy).to.be.calledOnce;
@@ -279,7 +298,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
       });
 
       describe('should override stored value correctly', () => {
-        it('other state cannot override accept/reject', function* () {
+        it('other state cannot override accept/reject', function*() {
           instance.update(CONSENT_ITEM_STATE.ACCEPTED);
           yield macroTask();
           storageSetSpy.resetHistory();
@@ -294,42 +313,48 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
           expect(storageSetSpy).to.not.be.called;
         });
 
-        it('undefined consent string', function* () {
+        it('undefined consent string', function*() {
           instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'old');
           yield macroTask();
           storageSetSpy.resetHistory();
           instance.update(CONSENT_ITEM_STATE.REJECTED);
           yield macroTask();
-          const consentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.REJECTED);
+          const consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.REJECTED);
           expect(storageSetSpy).to.be.calledOnce;
           expect(storageSetSpy).to.be.calledWith(
-              'amp-consent:test', composeStoreValue(consentInfo));
+            'amp-consent:test',
+            composeStoreValue(consentInfo)
+          );
         });
 
-        it('new consent string override old one', function* () {
+        it('new consent string override old one', function*() {
           instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'old');
           yield macroTask();
           storageSetSpy.resetHistory();
           // override old value
           instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'new');
           yield macroTask();
-          let consentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'new');
+          let consentInfo = constructConsentInfo(
+            CONSENT_ITEM_STATE.ACCEPTED,
+            'new'
+          );
           expect(storageSetSpy).to.be.calledOnce;
           expect(storageSetSpy).to.be.calledWith(
-              'amp-consent:test', composeStoreValue(consentInfo));
+            'amp-consent:test',
+            composeStoreValue(consentInfo)
+          );
           // empty consent string erase old value
           storageSetSpy.resetHistory();
           yield instance.update(CONSENT_ITEM_STATE.ACCEPTED, '');
-          consentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED);
+          consentInfo = constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED);
           expect(storageSetSpy).to.be.calledWith(
-              'amp-consent:test', composeStoreValue(consentInfo));
+            'amp-consent:test',
+            composeStoreValue(consentInfo)
+          );
         });
       });
 
-      it('should not write localStorage with same value', function* () {
+      it('should not write localStorage with same value', function*() {
         instance.update(CONSENT_ITEM_STATE.ACCEPTED);
         yield macroTask();
         expect(storageSetSpy).to.be.calledOnce;
@@ -344,14 +369,15 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(storageSetSpy).to.be.calledTwice;
       });
 
-      it('should handle race condition store latest value', function* () {
+      it('should handle race condition store latest value', function*() {
         instance.update(CONSENT_ITEM_STATE.ACCEPTED);
         instance.update(CONSENT_ITEM_STATE.REJECTED);
         yield macroTask();
         expect(storageSetSpy).to.be.calledOnce;
-        expect(storageSetSpy).to.be.calledWith('amp-consent:test',
-            composeStoreValue(
-                constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)));
+        expect(storageSetSpy).to.be.calledWith(
+          'amp-consent:test',
+          composeStoreValue(constructConsentInfo(CONSENT_ITEM_STATE.REJECTED))
+        );
       });
     });
 
@@ -362,12 +388,14 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         requestSpy = sandbox.spy();
         resetServiceForTesting(win, 'xhr');
         registerServiceBuilder(win, 'xhr', function() {
-          return {fetchJson: (url, init) => {
-            requestSpy(url);
-            requestBody = init.body;
-            expect(init.credentials).to.equal('include');
-            expect(init.method).to.equal('POST');
-          }};
+          return {
+            fetchJson: (url, init) => {
+              requestSpy(url);
+              requestBody = init.body;
+              expect(init.credentials).to.equal('include');
+              expect(init.method).to.equal('POST');
+            },
+          };
         });
 
         instance = new ConsentInstance(ampdoc, 'test', {
@@ -375,7 +403,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         });
       });
 
-      it('send update request on reject/accept', function* () {
+      it('send update request on reject/accept', function*() {
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED);
         yield macroTask();
         expect(requestSpy).to.be.calledOnce;
@@ -393,7 +421,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestBody.consentString).to.be.undefined;
       });
 
-      it('send update request on consentString change', function* () {
+      it('send update request on consentString change', function*() {
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'old');
         yield macroTask();
         expect(requestSpy).to.be.calledOnce;
@@ -408,7 +436,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestBody.consentString).to.equal('new');
       });
 
-      it('do not send update request on dismiss/notRequied', function* () {
+      it('do not send update request on dismiss/notRequied', function*() {
         instance.update(CONSENT_ITEM_STATE.DISMISSED);
         yield macroTask();
         expect(requestSpy).to.not.be.called;
@@ -417,7 +445,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestSpy).to.not.be.called;
       });
 
-      it('do not send update request when no change', function* () {
+      it('do not send update request when no change', function*() {
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'abc');
         yield macroTask();
         expect(requestSpy).to.calledOnce;
@@ -426,7 +454,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestSpy).to.calledOnce;
       });
 
-      it('send update request on local storage state change', function* () {
+      it('send update request on local storage state change', function*() {
         storageValue['amp-consent:test'] = true;
         instance.get();
         yield macroTask();
@@ -440,9 +468,12 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestBody.consentStateValue).to.equal('rejected');
       });
 
-      it('send update request on local stroage removal', function* () {
-        const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true);
+      it('send update request on local stroage removal', function*() {
+        const testConsentInfo = constructConsentInfo(
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test',
+          true
+        );
         storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
         yield instance.get();
         expect(storageRemoveSpy).to.be.calledOnce;
@@ -452,7 +483,7 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         expect(requestBody.consentStateValue).to.equal('unknown');
       });
 
-      it('do not send update request with dirtyBit', function* () {
+      it('do not send update request with dirtyBit', function*() {
         instance.setDirtyBit();
         instance.update(CONSENT_ITEM_STATE.ACCEPTED);
         yield macroTask();
@@ -465,49 +496,57 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
 
     describe('get', () => {
       describe('should be able to read from stored value', () => {
-        it('legacy boolean value', function* () {
+        it('legacy boolean value', function*() {
           yield instance.get().then(value => {
             expect(value).to.deep.equal(
-                constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+              constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+            );
           });
           instance.localConsentInfo_ = null;
           storageValue['amp-consent:test'] = true;
           yield instance.get().then(value => {
             expect(value).to.deep.equal(
-                constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
+              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+            );
           });
           instance.localConsentInfo_ = null;
           storageValue['amp-consent:test'] = false;
           yield instance.get().then(value => {
             expect(value).to.deep.equal(
-                constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+              constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+            );
           });
         });
 
-        it('consentInfo value', function* () {
+        it('consentInfo value', function*() {
           instance.localConsentInfo_ = null;
-          const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
+          const testConsentInfo = constructConsentInfo(
+            CONSENT_ITEM_STATE.ACCEPTED,
+            'test'
+          );
           storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
           yield instance.get().then(value => {
             expect(value).to.deep.equal(testConsentInfo);
           });
         });
 
-        it('unsupporte stored value', function* () {
+        it('unsupporte stored value', function*() {
           expectAsyncConsoleError(/Invalid stored consent value/);
           storageValue['amp-consent:test'] = 'invalid';
           yield instance.get().then(value => {
             expect(value).to.deep.equal(
-                constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+              constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+            );
           });
         });
 
-
-        it('erase stored value with dirtyBit', function* () {
+        it('erase stored value with dirtyBit', function*() {
           instance.localConsentInfo_ = null;
-          const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true);
+          const testConsentInfo = constructConsentInfo(
+            CONSENT_ITEM_STATE.ACCEPTED,
+            'test',
+            true
+          );
           storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
           yield instance.get().then(value => {
             expect(value).to.deep.equal(testConsentInfo);
@@ -521,35 +560,42 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         });
       });
 
-      it('should be able to get local value', function* () {
+      it('should be able to get local value', function*() {
         let value;
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
         yield instance.update(CONSENT_ITEM_STATE.DISMISSED);
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+          constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+        );
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED);
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+        );
         yield instance.update(CONSENT_ITEM_STATE.REJECTED, 'test1');
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED, 'test1'));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED, 'test1')
+        );
         yield instance.update(CONSENT_ITEM_STATE.DISMISSED);
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED, 'test1'));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED, 'test1')
+        );
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'test2');
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test2'));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test2')
+        );
         yield instance.update(CONSENT_ITEM_STATE.ACCEPTED);
-        yield instance.get().then(v => value = v);
+        yield instance.get().then(v => (value = v));
         expect(value).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED)
+        );
       });
 
       it('should return unknown value with error', () => {
@@ -561,60 +607,76 @@ describes.realWin('ConsentStateManager', {amp: 1}, env => {
         storageValue['amp-consent:test'] = true;
         return instance.get().then(value => {
           expect(value).to.deep.equal(
-              constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN));
+            constructConsentInfo(CONSENT_ITEM_STATE.UNKNOWN)
+          );
         });
       });
 
-      it('should handle race condition return latest value', function* () {
+      it('should handle race condition return latest value', function*() {
         let value1, value2;
         storageValue['amp-consent:test'] = true;
-        instance.get().then(v => value1 = v);
+        instance.get().then(v => (value1 = v));
         instance.update(CONSENT_ITEM_STATE.REJECTED);
-        instance.get().then(v => value2 = v);
+        instance.get().then(v => (value2 = v));
         yield macroTask();
         expect(value1).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
         expect(value2).to.deep.equal(
-            constructConsentInfo(CONSENT_ITEM_STATE.REJECTED));
+          constructConsentInfo(CONSENT_ITEM_STATE.REJECTED)
+        );
       });
     });
 
     describe('dirtyBit storage value', () => {
-      it('remove dirtyBit after user update', function* () {
-        const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true);
+      it('remove dirtyBit after user update', function*() {
+        const testConsentInfo = constructConsentInfo(
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test',
+          true
+        );
         storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
         yield instance.get().then(v => {
           expect(v).to.deep.equal(
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true));
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true)
+          );
         });
 
         instance.update(CONSENT_ITEM_STATE.ACCEPTED, 'test');
         yield macroTask();
         expect(storageSetSpy).to.be.calledOnce;
-        expect(storageSetSpy).to.be.calledWith('amp-consent:test',
-            composeStoreValue(
-                constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test')));
+        expect(storageSetSpy).to.be.calledWith(
+          'amp-consent:test',
+          composeStoreValue(
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test')
+          )
+        );
         yield instance.get().then(v => {
           expect(v).to.deep.equal(
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test'));
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test')
+          );
         });
       });
 
-      it('refresh stored consent info when setting dirtyBit', function* () {
-        const testConsentInfo =
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test');
+      it('refresh stored consent info when setting dirtyBit', function*() {
+        const testConsentInfo = constructConsentInfo(
+          CONSENT_ITEM_STATE.ACCEPTED,
+          'test'
+        );
         storageValue['amp-consent:test'] = composeStoreValue(testConsentInfo);
         instance.setDirtyBit();
         yield macroTask();
         expect(storageSetSpy).to.be.calledOnce;
-        expect(storageSetSpy).to.be.calledWith('amp-consent:test',
-            composeStoreValue(
-                constructConsentInfo(
-                    CONSENT_ITEM_STATE.ACCEPTED, 'test', true)));
+        expect(storageSetSpy).to.be.calledWith(
+          'amp-consent:test',
+          composeStoreValue(
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test', true)
+          )
+        );
         yield instance.get().then(v => {
           expect(v).to.deep.equal(
-              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test'));
+            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test')
+          );
         });
       });
     });
diff --git a/extensions/amp-consent/0.1/test/test-consent-ui.js b/extensions/amp-consent/0.1/test/test-consent-ui.js
index 89626d7b28dd..d472e1ecfd95 100644
--- a/extensions/amp-consent/0.1/test/test-consent-ui.js
+++ b/extensions/amp-consent/0.1/test/test-consent-ui.js
@@ -14,14 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  CONSENT_ITEM_STATE,
-  constructConsentInfo,
-} from '../consent-info';
-import {
-  ConsentUI,
-  consentUiClasses,
-} from '../consent-ui';
+import {CONSENT_ITEM_STATE, constructConsentInfo} from '../consent-info';
+import {ConsentUI, consentUiClasses} from '../consent-ui';
 import {dict} from '../../../../src/utils/object';
 import {elementByTag} from '../../../../src/dom';
 import {macroTask} from '../../../../testing/yield';
@@ -32,375 +26,337 @@ import {
 import {toggleExperiment} from '../../../../src/experiments';
 import {whenCalled} from '../../../../testing/test-helper.js';
 
-describes.realWin('consent-ui', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'consent-ui',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let sandbox;
-  let win;
-  let doc;
-  let ampdoc;
-  let consentUI;
-  let mockInstance;
-  let parent;
-
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    doc = env.win.document;
-    ampdoc = env.ampdoc;
-    win = env.win;
-    parent = doc.createElement('div');
-    const test1 = document.createElement('div');
-    test1.setAttribute('id', 'test1');
-    parent.appendChild(test1);
-    const postPrompt = document.createElement('div');
-    postPrompt.setAttribute('id', 'testPost');
-    parent.appendChild(postPrompt);
-    doc.body.appendChild(parent);
-    mockInstance = {
-      getAmpDoc: () => {return ampdoc;},
-      element: parent,
-      win,
-      getViewport: () => {
-        return {
-          addToFixedLayer: () => {},
-          removeFromFixedLayer: () => {},
-        };
-      },
-      getVsync: () => {
-        return {
-          mutate: callback => {callback();},
-        };
-      },
-      scheduleLayout: () => {},
-      mutateElement: callback => {
-        callback();
-        return Promise.resolve();
-      },
-    };
-    resetServiceForTesting(win, 'consentStateManager');
-    registerServiceBuilder(win, 'consentStateManager', function() {
-      return Promise.resolve({
-        getLastConsentInstanceInfo: () => {return Promise.resolve(
-            constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test'));},
+  env => {
+    let sandbox;
+    let win;
+    let doc;
+    let ampdoc;
+    let consentUI;
+    let mockInstance;
+    let parent;
+
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      doc = env.win.document;
+      ampdoc = env.ampdoc;
+      win = env.win;
+      parent = doc.createElement('div');
+      const test1 = document.createElement('div');
+      test1.setAttribute('id', 'test1');
+      parent.appendChild(test1);
+      const postPrompt = document.createElement('div');
+      postPrompt.setAttribute('id', 'testPost');
+      parent.appendChild(postPrompt);
+      doc.body.appendChild(parent);
+      mockInstance = {
+        getAmpDoc: () => {
+          return ampdoc;
+        },
+        element: parent,
+        win,
+        getViewport: () => {
+          return {
+            addToFixedLayer: () => {},
+            removeFromFixedLayer: () => {},
+          };
+        },
+        getVsync: () => {
+          return {
+            mutate: callback => {
+              callback();
+            },
+          };
+        },
+        scheduleLayout: () => {},
+        mutateElement: callback => {
+          callback();
+          return Promise.resolve();
+        },
+      };
+      resetServiceForTesting(win, 'consentStateManager');
+      registerServiceBuilder(win, 'consentStateManager', function() {
+        return Promise.resolve({
+          getLastConsentInstanceInfo: () => {
+            return Promise.resolve(
+              constructConsentInfo(CONSENT_ITEM_STATE.ACCEPTED, 'test')
+            );
+          },
+        });
       });
-    });
-
-    toggleExperiment(win, 'amp-consent-v2', true);
-  });
 
-  afterEach(() => sandbox.restore());
-
-  const getReadyIframeCmpConsentUi = () => {
-    const config = dict({
-      'promptUISrc': 'https//promptUISrc',
-    });
-    const consentUI =
-      new ConsentUI(mockInstance, config);
-    const showIframeSpy = sandbox.spy(consentUI, 'showIframe_');
-    consentUI.show(false);
-    consentUI.iframeReady_.resolve();
-    return whenCalled(showIframeSpy).then(() => Promise.resolve(consentUI));
-  };
-
-  describe('init', () => {
-    it('should repsect postPromptUI if there is one', function* () {
-      consentUI =
-          new ConsentUI(mockInstance, dict({'promptUI': 'test1'}), 'testPost');
-      expect(consentUI.ui_.id).to.equal('testPost');
+      toggleExperiment(win, 'amp-consent-v2', true);
     });
 
-    it('should ignore promptUISrc w/ promptUI', function* () {
-      const config = dict({
-        'promptUI': 'test1',
-        'promptUISrc': 'https//promptUISrc',
-      });
-      consentUI =
-          new ConsentUI(mockInstance, config);
-      expect(consentUI.ui_.id).to.equal('test1');
-    });
+    afterEach(() => sandbox.restore());
 
-    it('should create iframe from promptUISrc', function* () {
+    const getReadyIframeCmpConsentUi = () => {
       const config = dict({
         'promptUISrc': 'https//promptUISrc',
       });
-      consentUI =
-          new ConsentUI(mockInstance, config);
-      expect(consentUI.ui_.tagName).to.equal('IFRAME');
-    });
-  });
-
-  describe('show/hide', () => {
-    it('toggle display', () => {
-      const config = dict({
-        'promptUI': 'test1',
-      });
-      consentUI =
-          new ConsentUI(mockInstance, config);
-      expect(parent.classList.contains('amp-active')).to.be.false;
-      expect(parent.classList.contains('amp-hidden')).to.be.false;
+      const consentUI = new ConsentUI(mockInstance, config);
+      const showIframeSpy = sandbox.spy(consentUI, 'showIframe_');
       consentUI.show(false);
-      expect(parent.classList.contains('amp-active')).to.be.true;
-      expect(parent).to.not.have.display('none');
-      consentUI.hide();
-      expect(parent.classList.contains('amp-active')).to.be.false;
-      expect(parent.classList.contains('amp-hidden')).to.be.true;
-    });
+      consentUI.iframeReady_.resolve();
+      return whenCalled(showIframeSpy).then(() => Promise.resolve(consentUI));
+    };
 
-    it('append/remove iframe', function* () {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
+    describe('init', () => {
+      it('should repsect postPromptUI if there is one', function*() {
+        consentUI = new ConsentUI(
+          mockInstance,
+          dict({'promptUI': 'test1'}),
+          'testPost'
+        );
+        expect(consentUI.ui_.id).to.equal('testPost');
       });
-      consentUI =
-          new ConsentUI(mockInstance, config);
-      expect(elementByTag(parent, 'iframe')).to.be.null;
-      consentUI.show(false);
-      yield macroTask();
-      expect(elementByTag(parent, 'iframe')).to.not.be.null;
-      consentUI.hide();
-      expect(elementByTag(parent, 'iframe')).to.be.null;
-    });
-
-    it('should not lock scrolling', () => {
 
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
+      it('should ignore promptUISrc w/ promptUI', function*() {
+        const config = dict({
+          'promptUI': 'test1',
+          'promptUISrc': 'https//promptUISrc',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(consentUI.ui_.id).to.equal('test1');
       });
-      consentUI =
-        new ConsentUI(mockInstance, config);
 
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.show(false);
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.hide();
-      expect(consentUI.scrollEnabled_).to.be.true;
-
-      consentUI.show(false);
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.disableScroll_();
-      expect(consentUI.scrollEnabled_).to.be.false;
-      consentUI.enableScroll_();
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.disableScroll_();
-      consentUI.hide();
-      expect(consentUI.scrollEnabled_).to.be.true;
-    });
-  });
-
-  describe('placeholder', () => {
-    it('should be created / shown' +
-      ' while loading CMP Iframe', async() => {
-
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
+      it('should create iframe from promptUISrc', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(consentUI.ui_.tagName).to.equal('IFRAME');
       });
-      consentUI =
-          new ConsentUI(mockInstance, config);
-
-      const placeholder = consentUI.placeholder_;
-      expect(placeholder).to.be.ok;
-      expect(placeholder.hidden).to.be.true;
-
-      consentUI.show(false);
-
-      // Pop onto the back of the event queue,
-      // so we expect() once our mutate element in show() resolves
-      await mockInstance.mutateElement(() => {});
-
-      expect(placeholder.hidden).to.be.false;
-      expect(placeholder.childNodes).to.not.be.empty;
     });
-  });
-
-
-  describe('CMP Iframe', () => {
 
-    it('should load the iframe, ' +
-      'then show it with correct state CSS classes', () => {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
+    describe('show/hide', () => {
+      it('toggle display', () => {
+        const config = dict({
+          'promptUI': 'test1',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(parent.classList.contains('amp-active')).to.be.false;
+        expect(parent.classList.contains('amp-hidden')).to.be.false;
+        consentUI.show(false);
+        expect(parent.classList.contains('amp-active')).to.be.true;
+        expect(parent).to.not.have.display('none');
+        consentUI.hide();
+        expect(parent.classList.contains('amp-active')).to.be.false;
+        expect(parent.classList.contains('amp-hidden')).to.be.true;
       });
-      consentUI =
-        new ConsentUI(mockInstance, config);
-      expect(parent.classList.contains('amp-active')).to.be.false;
-      expect(parent.classList.contains('amp-hidden')).to.be.false;
-
-      const showIframeSpy = sandbox.spy(consentUI, 'showIframe_');
-      const applyInitialStylesSpy =
-          sandbox.spy(consentUI, 'applyInitialStyles_');
 
-      consentUI.show(false);
-      expect(parent.classList.contains('amp-active')).to.be.true;
-      expect(parent.classList.contains(consentUiClasses.loading)).to.be.true;
-      expect(parent).to.not.have.display('none');
-
-      // Resolve the iframe ready
-      consentUI.iframeReady_.resolve();
+      it('append/remove iframe', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        expect(elementByTag(parent, 'iframe')).to.be.null;
+        consentUI.show(false);
+        yield macroTask();
+        expect(elementByTag(parent, 'iframe')).to.not.be.null;
+        consentUI.hide();
+        expect(elementByTag(parent, 'iframe')).to.be.null;
+      });
 
-      return whenCalled(showIframeSpy).then(() => {
-        expect(
-            parent.classList.contains(consentUiClasses.iframeActive)
-        ).to.be.true;
+      it('should not lock scrolling', () => {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
 
-        return whenCalled(applyInitialStylesSpy);
-      });
-    });
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.show(false);
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.hide();
+        expect(consentUI.scrollEnabled_).to.be.true;
 
-    it('should pass the info to the iframe', function* () {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
-        'clientConfig': {
-          'test': 'ABC',
-        },
+        consentUI.show(false);
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.disableScroll_();
+        expect(consentUI.scrollEnabled_).to.be.false;
+        consentUI.enableScroll_();
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.disableScroll_();
+        consentUI.hide();
+        expect(consentUI.scrollEnabled_).to.be.true;
       });
-      consentUI = new ConsentUI(mockInstance, config);
-      consentUI.show(false);
-      yield macroTask();
-
-      expect(consentUI.ui_.getAttribute('name')).to.deep.equal(JSON.stringify({
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'consentState': 'accepted',
-        'consentStateValue': 'accepted',
-        'consentString': 'test',
-        'promptTrigger': 'load',
-        'isDirty': false,
-      }));
     });
 
-    it('should pass the promptTrigger reason to the iframe', function* () {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
-        'clientConfig': {
-          'test': 'ABC',
-        },
-      });
-      consentUI = new ConsentUI(mockInstance, config);
-      consentUI.show(true);
-      yield macroTask();
+    describe('placeholder', () => {
+      it('should be created / shown while loading CMP Iframe', async () => {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+        });
+        consentUI = new ConsentUI(mockInstance, config);
 
-      expect(consentUI.ui_.getAttribute('name')).to.deep.equal(JSON.stringify({
-        'clientConfig': {
-          'test': 'ABC',
-        },
-        'consentState': 'accepted',
-        'consentStateValue': 'accepted',
-        'consentString': 'test',
-        'promptTrigger': 'action',
-        'isDirty': false,
-      }));
-    });
+        const placeholder = consentUI.placeholder_;
+        expect(placeholder).to.be.ok;
+        expect(placeholder.hidden).to.be.true;
 
-  });
+        consentUI.show(false);
 
-  describe('overlay', () => {
+        // Pop onto the back of the event queue,
+        // so we expect() once our mutate element in show() resolves
+        await mockInstance.mutateElement(() => {});
 
-    it('should not enable the overlay if not configured', function* () {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
-        'uiConfig': {},
+        expect(placeholder.hidden).to.be.false;
+        expect(placeholder.childNodes).to.not.be.empty;
       });
-      consentUI =
-        new ConsentUI(mockInstance, config);
-      // Mock out load Iframe_
-      consentUI.loadIframe_ = () => {
-        return Promise.resolve();
-      };
-      expect(consentUI.maskElement_).to.be.null;
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.show(false);
-      yield macroTask();
-      expect(consentUI.maskElement_).to.be.null;
-      expect(consentUI.scrollEnabled_).to.be.true;
     });
 
-    it('append/hide/show overlay', function* () {
-      const config = dict({
-        'promptUISrc': 'https//promptUISrc',
-        'uiConfig': {
-          'overlay': true,
-        },
+    describe('CMP Iframe', () => {
+      it(
+        'should load the iframe, ' +
+          'then show it with correct state CSS classes',
+        () => {
+          const config = dict({
+            'promptUISrc': 'https//promptUISrc',
+          });
+          consentUI = new ConsentUI(mockInstance, config);
+          expect(parent.classList.contains('amp-active')).to.be.false;
+          expect(parent.classList.contains('amp-hidden')).to.be.false;
+
+          const showIframeSpy = sandbox.spy(consentUI, 'showIframe_');
+          const applyInitialStylesSpy = sandbox.spy(
+            consentUI,
+            'applyInitialStyles_'
+          );
+
+          consentUI.show(false);
+          expect(parent.classList.contains('amp-active')).to.be.true;
+          expect(parent.classList.contains(consentUiClasses.loading)).to.be
+            .true;
+          expect(parent).to.not.have.display('none');
+
+          // Resolve the iframe ready
+          consentUI.iframeReady_.resolve();
+
+          return whenCalled(showIframeSpy).then(() => {
+            expect(parent.classList.contains(consentUiClasses.iframeActive)).to
+              .be.true;
+
+            return whenCalled(applyInitialStylesSpy);
+          });
+        }
+      );
+
+      it('should pass the info to the iframe', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+          'clientConfig': {
+            'test': 'ABC',
+          },
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        consentUI.show(false);
+        yield macroTask();
+
+        expect(consentUI.ui_.getAttribute('name')).to.deep.equal(
+          JSON.stringify({
+            'clientConfig': {
+              'test': 'ABC',
+            },
+            'consentState': 'accepted',
+            'consentStateValue': 'accepted',
+            'consentString': 'test',
+            'promptTrigger': 'load',
+            'isDirty': false,
+          })
+        );
       });
-      consentUI =
-        new ConsentUI(mockInstance, config);
-      // Mock out load Iframe_
-      consentUI.loadIframe_ = () => {
-        return Promise.resolve();
-      };
 
-      expect(consentUI.overlayEnabled_).to.be.true;
-
-      expect(consentUI.maskElement_).to.be.null;
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.show(false);
-      yield macroTask();
-      expect(consentUI.maskElement_).to.not.be.null;
-      expect(consentUI.scrollEnabled_).to.be.false;
-      consentUI.hide();
-      yield macroTask();
-      expect(consentUI.maskElement_.hasAttribute('hidden')).to.be.ok;
-      expect(consentUI.scrollEnabled_).to.be.true;
-      consentUI.show(false);
-      yield macroTask();
-      expect(consentUI.maskElement_.hasAttribute('hidden')).to.not.be.ok;
-      expect(consentUI.scrollEnabled_).to.be.false;
-      consentUI.hide();
-      yield macroTask();
-      expect(consentUI.maskElement_.hasAttribute('hidden')).to.be.ok;
-      expect(consentUI.scrollEnabled_).to.be.true;
-    });
-  });
-
-  describe('ready', () => {
-
-    it('should respond to the ready event', () => {
-      return getReadyIframeCmpConsentUi().then(consentUI => {
-        const handleReadyStub = sandbox.stub(consentUI, 'handleReady_');
-
-        consentUI.ui_ = {
-          contentWindow: 'mock-src',
-        };
-        consentUI.handleIframeMessages_({
-          source: 'mock-src',
-          data: {
-            type: 'consent-ui',
-            action: 'ready',
+      it('should pass the promptTrigger reason to the iframe', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+          'clientConfig': {
+            'test': 'ABC',
           },
         });
-
-        expect(handleReadyStub).to.be.calledOnce;
+        consentUI = new ConsentUI(mockInstance, config);
+        consentUI.show(true);
+        yield macroTask();
+
+        expect(consentUI.ui_.getAttribute('name')).to.deep.equal(
+          JSON.stringify({
+            'clientConfig': {
+              'test': 'ABC',
+            },
+            'consentState': 'accepted',
+            'consentStateValue': 'accepted',
+            'consentString': 'test',
+            'promptTrigger': 'action',
+            'isDirty': false,
+          })
+        );
       });
     });
 
-    it('should handle a valid initial height', () => {
-      return getReadyIframeCmpConsentUi().then(consentUI => {
-
-        expect(consentUI.initialHeight_).to.be.equal('30vh');
-
-        consentUI.ui_ = {
-          contentWindow: 'mock-src',
+    describe('overlay', () => {
+      it('should not enable the overlay if not configured', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+          'uiConfig': {},
+        });
+        consentUI = new ConsentUI(mockInstance, config);
+        // Mock out load Iframe_
+        consentUI.loadIframe_ = () => {
+          return Promise.resolve();
         };
-        consentUI.handleIframeMessages_({
-          source: 'mock-src',
-          data: {
-            type: 'consent-ui',
-            action: 'ready',
-            initialHeight: '50vh',
+        expect(consentUI.maskElement_).to.be.null;
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.show(false);
+        yield macroTask();
+        expect(consentUI.maskElement_).to.be.null;
+        expect(consentUI.scrollEnabled_).to.be.true;
+      });
+
+      it('append/hide/show overlay', function*() {
+        const config = dict({
+          'promptUISrc': 'https//promptUISrc',
+          'uiConfig': {
+            'overlay': true,
           },
         });
+        consentUI = new ConsentUI(mockInstance, config);
+        // Mock out load Iframe_
+        consentUI.loadIframe_ = () => {
+          return Promise.resolve();
+        };
+
+        expect(consentUI.overlayEnabled_).to.be.true;
 
-        expect(consentUI.initialHeight_).to.be.equal('50vh');
+        expect(consentUI.maskElement_).to.be.null;
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.show(false);
+        yield macroTask();
+        expect(consentUI.maskElement_).to.not.be.null;
+        expect(consentUI.scrollEnabled_).to.be.false;
+        consentUI.hide();
+        yield macroTask();
+        expect(consentUI.maskElement_.hasAttribute('hidden')).to.be.ok;
+        expect(consentUI.scrollEnabled_).to.be.true;
+        consentUI.show(false);
+        yield macroTask();
+        expect(consentUI.maskElement_.hasAttribute('hidden')).to.not.be.ok;
+        expect(consentUI.scrollEnabled_).to.be.false;
+        consentUI.hide();
+        yield macroTask();
+        expect(consentUI.maskElement_.hasAttribute('hidden')).to.be.ok;
+        expect(consentUI.scrollEnabled_).to.be.true;
       });
     });
 
-    it('should throw an error on an invalid initial height', () => {
-      return getReadyIframeCmpConsentUi().then(consentUI => {
-
-        expect(consentUI.initialHeight_).to.be.equal('30vh');
+    describe('ready', () => {
+      it('should respond to the ready event', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          const handleReadyStub = sandbox.stub(consentUI, 'handleReady_');
 
-        return allowConsoleError(() => {
           consentUI.ui_ = {
             contentWindow: 'mock-src',
           };
@@ -409,120 +365,163 @@ describes.realWin('consent-ui', {
             data: {
               type: 'consent-ui',
               action: 'ready',
-              initialHeight: '9vh',
             },
           });
 
-          expect(consentUI.initialHeight_).to.be.equal('30vh');
+          expect(handleReadyStub).to.be.calledOnce;
         });
       });
-    });
 
-    it('should handle a border value', () => {
-      return getReadyIframeCmpConsentUi().then(consentUI => {
+      it('should handle a valid initial height', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          expect(consentUI.initialHeight_).to.be.equal('30vh');
 
-        expect(consentUI.enableBorder_).to.be.equal(true);
+          consentUI.ui_ = {
+            contentWindow: 'mock-src',
+          };
+          consentUI.handleIframeMessages_({
+            source: 'mock-src',
+            data: {
+              type: 'consent-ui',
+              action: 'ready',
+              initialHeight: '50vh',
+            },
+          });
 
-        consentUI.ui_ = {
-          contentWindow: 'mock-src',
-        };
-        consentUI.handleIframeMessages_({
-          source: 'mock-src',
-          data: {
-            type: 'consent-ui',
-            action: 'ready',
-            border: false,
-          },
+          expect(consentUI.initialHeight_).to.be.equal('50vh');
         });
-
-        expect(consentUI.enableBorder_).to.be.equal(false);
       });
-    });
-  });
 
-  describe('fullscreen', () => {
+      it('should throw an error on an invalid initial height', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          expect(consentUI.initialHeight_).to.be.equal('30vh');
 
-    it('should respond to the fullscreen event', () => {
+          return allowConsoleError(() => {
+            consentUI.ui_ = {
+              contentWindow: 'mock-src',
+            };
+            consentUI.handleIframeMessages_({
+              source: 'mock-src',
+              data: {
+                type: 'consent-ui',
+                action: 'ready',
+                initialHeight: '9vh',
+              },
+            });
+
+            expect(consentUI.initialHeight_).to.be.equal('30vh');
+          });
+        });
+      });
 
-      return getReadyIframeCmpConsentUi().then(consentUI => {
-        const enterFullscreenStub = sandbox.stub(consentUI, 'enterFullscreen_');
+      it('should handle a border value', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          expect(consentUI.enableBorder_).to.be.equal(true);
 
-        consentUI.ui_ = {
-          contentWindow: 'mock-src',
-        };
-        consentUI.handleIframeMessages_({
-          source: 'mock-src',
-          data: {
-            type: 'consent-ui',
-            action: 'enter-fullscreen',
-          },
-        });
+          consentUI.ui_ = {
+            contentWindow: 'mock-src',
+          };
+          consentUI.handleIframeMessages_({
+            source: 'mock-src',
+            data: {
+              type: 'consent-ui',
+              action: 'ready',
+              border: false,
+            },
+          });
 
-        expect(enterFullscreenStub).to.be.calledOnce;
+          expect(consentUI.enableBorder_).to.be.equal(false);
+        });
       });
     });
 
-    it('should not handle the fullscreen event, ' +
-      'if the iframe wasn\'t visible', () => {
+    describe('fullscreen', () => {
+      it('should respond to the fullscreen event', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          const enterFullscreenStub = sandbox.stub(
+            consentUI,
+            'enterFullscreen_'
+          );
 
-      return getReadyIframeCmpConsentUi().then(consentUI => {
-        const enterFullscreenStub = sandbox.stub(consentUI, 'enterFullscreen_');
+          consentUI.ui_ = {
+            contentWindow: 'mock-src',
+          };
+          consentUI.handleIframeMessages_({
+            source: 'mock-src',
+            data: {
+              type: 'consent-ui',
+              action: 'enter-fullscreen',
+            },
+          });
 
-        consentUI.ui_ = {
-          contentWindow: 'mock-src',
-        };
-        consentUI.isIframeVisible_ = false;
-        consentUI.handleIframeMessages_({
-          source: 'mock-src',
-          data: {
-            type: 'consent-ui',
-            action: 'enter-fullscreen',
-          },
+          expect(enterFullscreenStub).to.be.calledOnce;
         });
-
-        expect(enterFullscreenStub).to.not.be.called;
       });
-    });
 
+      it(
+        'should not handle the fullscreen event, ' +
+          "if the iframe wasn't visible",
+        () => {
+          return getReadyIframeCmpConsentUi().then(consentUI => {
+            const enterFullscreenStub = sandbox.stub(
+              consentUI,
+              'enterFullscreen_'
+            );
+
+            consentUI.ui_ = {
+              contentWindow: 'mock-src',
+            };
+            consentUI.isIframeVisible_ = false;
+            consentUI.handleIframeMessages_({
+              source: 'mock-src',
+              data: {
+                type: 'consent-ui',
+                action: 'enter-fullscreen',
+              },
+            });
+
+            expect(enterFullscreenStub).to.not.be.called;
+          });
+        }
+      );
 
-    describe('enterFullscreen', () => {
-      it('should add fullscreen classes and set fullscreen state', () => {
-        return getReadyIframeCmpConsentUi().then(consentUI => {
-          consentUI.enterFullscreen_();
+      describe('enterFullscreen', () => {
+        it('should add fullscreen classes and set fullscreen state', () => {
+          return getReadyIframeCmpConsentUi().then(consentUI => {
+            consentUI.enterFullscreen_();
 
-          expect(
-              parent.classList.contains(consentUiClasses.iframeFullscreen)
-          ).to.be.true;
-          expect(consentUI.isFullscreen_).to.be.true;
+            expect(parent.classList.contains(consentUiClasses.iframeFullscreen))
+              .to.be.true;
+            expect(consentUI.isFullscreen_).to.be.true;
+          });
         });
-      });
 
-      it('should not enter fullscreen if already fullscreen', () => {
-        return getReadyIframeCmpConsentUi().then(consentUI => {
-          consentUI.isFullscreen_ = true;
-          consentUI.enterFullscreen_();
+        it('should not enter fullscreen if already fullscreen', () => {
+          return getReadyIframeCmpConsentUi().then(consentUI => {
+            consentUI.isFullscreen_ = true;
+            consentUI.enterFullscreen_();
 
-          expect(
-              parent.classList.contains(consentUiClasses.iframeFullscreen)
-          ).to.be.false;
+            expect(parent.classList.contains(consentUiClasses.iframeFullscreen))
+              .to.be.false;
+          });
         });
       });
-    });
-
-    it('should disable scrolling', () => {
-      return getReadyIframeCmpConsentUi().then(consentUI => {
 
-        expect(consentUI.scrollEnabled_).to.be.true;
+      it('should disable scrolling', () => {
+        return getReadyIframeCmpConsentUi().then(consentUI => {
+          expect(consentUI.scrollEnabled_).to.be.true;
 
-        consentUI.enterFullscreen_();
+          consentUI.enterFullscreen_();
 
-        expect(consentUI.scrollEnabled_).to.be.false;
+          expect(consentUI.scrollEnabled_).to.be.false;
 
-        sandbox.stub(consentUI, 'baseInstance_')
+          sandbox
+            .stub(consentUI, 'baseInstance_')
             .callsFake(callback => callback());
-        consentUI.hide();
-        expect(consentUI.scrollEnabled_).to.be.true;
+          consentUI.hide();
+          expect(consentUI.scrollEnabled_).to.be.true;
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-dailymotion/0.1/amp-dailymotion.js b/extensions/amp-dailymotion/0.1/amp-dailymotion.js
index bad8eaf850b7..5b6c7e38edb9 100644
--- a/extensions/amp-dailymotion/0.1/amp-dailymotion.js
+++ b/extensions/amp-dailymotion/0.1/amp-dailymotion.js
@@ -37,15 +37,11 @@ import {
   isFullscreenElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
-
 const TAG = 'amp-dailymotion';
 
-
 /**
  * Player events reverse-engineered from the Dailymotion API
  * NOTE: 'unstarted' isn't part of the API, just a placeholder
@@ -80,7 +76,6 @@ const DailymotionEvents = {
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpDailymotion extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -110,13 +105,12 @@ class AmpDailymotion extends AMP.BaseElement {
 
     /** @private {boolean} */
     this.isFullscreen_ = false;
-
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://www.dailymotion.com', opt_onLayout);
     // Host that Dailymotion uses to serve JS needed by player.
@@ -151,9 +145,10 @@ class AmpDailymotion extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.videoid_ = userAssert(
-        this.element.getAttribute('data-videoid'),
-        'The data-videoid attribute is required for <amp-dailymotion> %s',
-        this.element);
+      this.element.getAttribute('data-videoid'),
+      'The data-videoid attribute is required for <amp-dailymotion> %s',
+      this.element
+    );
 
     installVideoManagerForDoc(this.element);
     Services.videoManagerForDoc(this.element).register(this);
@@ -216,11 +211,11 @@ class AmpDailymotion extends AMP.BaseElement {
         break;
 
       case DailymotionEvents.VOLUMECHANGE:
-        const isMuted =
-            data['volume'] == 0 ||
-              (data['muted'] == 'true');
-        if (this.playerState_ == DailymotionEvents.UNSTARTED
-            || this.muted_ != isMuted) {
+        const isMuted = data['volume'] == 0 || data['muted'] == 'true';
+        if (
+          this.playerState_ == DailymotionEvents.UNSTARTED ||
+          this.muted_ != isMuted
+        ) {
           this.muted_ = isMuted;
           this.element.dispatchCustomEvent(mutedOrUnmutedEvent(isMuted));
         }
@@ -248,20 +243,23 @@ class AmpDailymotion extends AMP.BaseElement {
     const endpoint = 'https://www.dailymotion.com';
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(dict({
-          'command': command,
-          'parameters': opt_args || [],
-        }));
-        this.iframe_.contentWindow./*OK*/postMessage(message, endpoint);
+        const message = JSON.stringify(
+          dict({
+            'command': command,
+            'parameters': opt_args || [],
+          })
+        );
+        this.iframe_.contentWindow./*OK*/ postMessage(message, endpoint);
       }
     });
   }
 
   /** @private */
   getIframeSrc_() {
-
-    let iframeSrc = 'https://www.dailymotion.com/embed/video/' +
-       encodeURIComponent(this.videoid_ || '') + '?api=1&html=1&app=amp';
+    let iframeSrc =
+      'https://www.dailymotion.com/embed/video/' +
+      encodeURIComponent(this.videoid_ || '') +
+      '?api=1&html=1&app=amp';
 
     const explicitParamsAttributes = [
       'mute',
@@ -434,7 +432,6 @@ class AmpDailymotion extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpDailymotion);
 });
diff --git a/extensions/amp-dailymotion/0.1/test/test-amp-dailymotion.js b/extensions/amp-dailymotion/0.1/test/test-amp-dailymotion.js
index 0d8ef532c3b5..a5445706c80b 100644
--- a/extensions/amp-dailymotion/0.1/test/test-amp-dailymotion.js
+++ b/extensions/amp-dailymotion/0.1/test/test-amp-dailymotion.js
@@ -16,68 +16,77 @@
 
 import '../amp-dailymotion';
 
-
-describes.realWin('amp-dailymotion', {
-  amp: {
-    extensions: ['amp-dailymotion'],
+describes.realWin(
+  'amp-dailymotion',
+  {
+    amp: {
+      extensions: ['amp-dailymotion'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getDailymotion(videoId, optResponsive, optCustomSettings) {
-    const dailymotion = doc.createElement('amp-dailymotion');
-    dailymotion.setAttribute('data-videoid', videoId);
-    dailymotion.setAttribute('width', '111');
-    dailymotion.setAttribute('height', '222');
-    if (optResponsive) {
-      dailymotion.setAttribute('layout', 'responsive');
-    }
-    if (optCustomSettings) {
-      dailymotion.setAttribute('data-start', 123);
-      dailymotion.setAttribute('data-param-origin', 'example&.org');
+    function getDailymotion(videoId, optResponsive, optCustomSettings) {
+      const dailymotion = doc.createElement('amp-dailymotion');
+      dailymotion.setAttribute('data-videoid', videoId);
+      dailymotion.setAttribute('width', '111');
+      dailymotion.setAttribute('height', '222');
+      if (optResponsive) {
+        dailymotion.setAttribute('layout', 'responsive');
+      }
+      if (optCustomSettings) {
+        dailymotion.setAttribute('data-start', 123);
+        dailymotion.setAttribute('data-param-origin', 'example&.org');
+      }
+      doc.body.appendChild(dailymotion);
+      return dailymotion
+        .build()
+        .then(() => {
+          dailymotion.layoutCallback();
+        })
+        .then(() => dailymotion);
     }
-    doc.body.appendChild(dailymotion);
-    return dailymotion.build().then(() => {
-      dailymotion.layoutCallback();
-    }).then(() => dailymotion);
-  }
 
-  it('renders', () => {
-    return getDailymotion('x2m8jpp').then(dailymotion => {
-      const iframe = dailymotion.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://www.dailymotion.com/embed/video/x2m8jpp?api=1&html=1&app=amp');
+    it('renders', () => {
+      return getDailymotion('x2m8jpp').then(dailymotion => {
+        const iframe = dailymotion.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://www.dailymotion.com/embed/video/x2m8jpp?api=1&html=1&app=amp'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getDailymotion('x2m8jpp', true).then(dailymotion => {
-      const iframe = dailymotion.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getDailymotion('x2m8jpp', true).then(dailymotion => {
+        const iframe = dailymotion.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('renders with custom settings', () => {
-    return getDailymotion('x2m8jpp', false, true).then(dailymotion => {
-      const iframe = dailymotion.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.src).to.equal(
-          'https://www.dailymotion.com/embed/video/x2m8jpp?api=1&html=1&app=amp&start=123&origin=example%26.org');
+    it('renders with custom settings', () => {
+      return getDailymotion('x2m8jpp', false, true).then(dailymotion => {
+        const iframe = dailymotion.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.equal(
+          'https://www.dailymotion.com/embed/video/x2m8jpp?api=1&html=1&app=amp&start=123&origin=example%26.org'
+        );
+      });
     });
-  });
 
-  it('requires data-videoid', () => {
-    return allowConsoleError(() => {
-      return getDailymotion('').should.eventually.be.rejectedWith(
-          /The data-videoid attribute is required for/);
+    it('requires data-videoid', () => {
+      return allowConsoleError(() => {
+        return getDailymotion('').should.eventually.be.rejectedWith(
+          /The data-videoid attribute is required for/
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-date-countdown/0.1/amp-date-countdown.js b/extensions/amp-date-countdown/0.1/amp-date-countdown.js
index 90c8be0686d2..9a7c5b248db4 100644
--- a/extensions/amp-date-countdown/0.1/amp-date-countdown.js
+++ b/extensions/amp-date-countdown/0.1/amp-date-countdown.js
@@ -47,7 +47,6 @@ const MILLISECONDS_IN_MINUTE = 60 * 1000;
 /** @const {number} */
 const MILLISECONDS_IN_SECOND = 1000;
 
-
 /** @const {Object} */
 //https://ctrlq.org/code/19899-google-translate-languages refer to google code
 const LOCALE_WORD = {
@@ -70,7 +69,6 @@ const LOCALE_WORD = {
 };
 
 export class AmpDateCountdown extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -114,7 +112,6 @@ export class AmpDateCountdown extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-
     // Store this in buildCallback() because `this.element` sometimes
     // is missing attributes in the constructor.
 
@@ -124,43 +121,45 @@ export class AmpDateCountdown extends AMP.BaseElement {
     this.endDate_ = this.element.getAttribute('end-date');
 
     /** @private {number} */
-    this.timeleftMs_
-       = Number(this.element.getAttribute('timeleft-ms'));
+    this.timeleftMs_ = Number(this.element.getAttribute('timeleft-ms'));
 
     /** @private {number} */
     this.timestampMs_ = Number(this.element.getAttribute('timestamp-ms'));
 
     /** @private {number} */
-    this.timestampSeconds_
-       = Number(this.element.getAttribute('timestamp-seconds'));
+    this.timestampSeconds_ = Number(
+      this.element.getAttribute('timestamp-seconds')
+    );
 
     /** @private {number} */
-    this.offsetSeconds_
-       = Number(this.element.getAttribute('offset-seconds'))
-       || DEFAULT_OFFSET_SECONDS;
+    this.offsetSeconds_ =
+      Number(this.element.getAttribute('offset-seconds')) ||
+      DEFAULT_OFFSET_SECONDS;
 
     /** @private {string} */
-    this.locale_
-       = (this.element.getAttribute('locale')
-       || DEFAULT_LOCALE).toLowerCase();
+    this.locale_ = (
+      this.element.getAttribute('locale') || DEFAULT_LOCALE
+    ).toLowerCase();
 
     /** @private {string} */
-    this.whenEnded_
-       = (this.element.getAttribute('when-ended')
-       || DEFAULT_WHEN_ENDED).toLowerCase();
+    this.whenEnded_ = (
+      this.element.getAttribute('when-ended') || DEFAULT_WHEN_ENDED
+    ).toLowerCase();
 
     /** @private {string} */
-    this.biggestUnit_
-       = (this.element.getAttribute('biggest-unit')
-       || DEFAULT_BIGGEST_UNIT).toUpperCase();
+    this.biggestUnit_ = (
+      this.element.getAttribute('biggest-unit') || DEFAULT_BIGGEST_UNIT
+    ).toUpperCase();
 
     /** @private {!Object|null} */
     this.localeWordList_ = this.getLocaleWord_(this.locale_);
 
-    Services.viewerForDoc(this.getAmpDoc()).whenFirstVisible().then(() => {
-      const EPOCH = this.getEpoch_() + (this.offsetSeconds_ * 1000);
-      this.tickCountDown_(new Date(EPOCH) - new Date());
-    });
+    Services.viewerForDoc(this.getAmpDoc())
+      .whenFirstVisible()
+      .then(() => {
+        const EPOCH = this.getEpoch_() + this.offsetSeconds_ * 1000;
+        this.tickCountDown_(new Date(EPOCH) - new Date());
+      });
   }
   /** @override */
   renderOutsideViewport() {
@@ -170,7 +169,7 @@ export class AmpDateCountdown extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     const DELAY = 1000;
-    const EPOCH = this.getEpoch_() + (this.offsetSeconds_ * DELAY);
+    const EPOCH = this.getEpoch_() + this.offsetSeconds_ * DELAY;
     let differentBetween = new Date(EPOCH) - new Date() - DELAY; //substract delay (1000ms) here because of buildCallback show the initial time
     this.countDownTimer_ = this.win.setInterval(() => {
       this.tickCountDown_(differentBetween);
@@ -198,14 +197,18 @@ export class AmpDateCountdown extends AMP.BaseElement {
     const items = /** @type {!JsonObject} */ ({});
     const DIFF = this.getYDHMSFromMs_(differentBetween) || {};
     if (this.whenEnded_ === 'stop' && differentBetween < 1000) {
-      Services.actionServiceForDoc(this.element)
-          .trigger(this.element, 'timeout', null, ActionTrust.LOW);
+      Services.actionServiceForDoc(this.element).trigger(
+        this.element,
+        'timeout',
+        null,
+        ActionTrust.LOW
+      );
       this.win.clearInterval(this.countDownTimer_);
     }
     items['data'] = Object.assign(DIFF, this.localeWordList_);
     this.templates_
-        .findAndRenderTemplate(this.element, items['data'])
-        .then(this.boundRendered_);
+      .findAndRenderTemplate(this.element, items['data'])
+      .then(this.boundRendered_);
   }
 
   /**
@@ -225,9 +228,11 @@ export class AmpDateCountdown extends AMP.BaseElement {
       epoch = this.timestampSeconds_ * 1000;
     }
 
-    userAssert(!isNaN(epoch),
-        'One of end-date, timeleft-ms, timestamp-ms, timestamp-seconds ' +
-        'is required');
+    userAssert(
+      !isNaN(epoch),
+      'One of end-date, timeleft-ms, timestamp-ms, timestamp-seconds ' +
+        'is required'
+    );
     return epoch;
   }
 
@@ -259,7 +264,6 @@ export class AmpDateCountdown extends AMP.BaseElement {
    * @private
    */
   getYDHMSFromMs_(ms) {
-
     /** @enum {number} */
     const TimeUnit = {
       DAYS: 1,
@@ -268,25 +272,32 @@ export class AmpDateCountdown extends AMP.BaseElement {
       SECONDS: 4,
     };
     //Math.trunc is used instead of Math.floor to support negative past date
-    const d = TimeUnit[this.biggestUnit_] == TimeUnit.DAYS
-      ? this.supportBackDate_(Math.floor((ms) / MILLISECONDS_IN_DAY))
-      : 0;
-    const h = TimeUnit[this.biggestUnit_] == TimeUnit.HOURS
-      ? this.supportBackDate_(Math.floor((ms) / MILLISECONDS_IN_HOUR))
-      : TimeUnit[this.biggestUnit_] < TimeUnit.HOURS
+    const d =
+      TimeUnit[this.biggestUnit_] == TimeUnit.DAYS
+        ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_DAY))
+        : 0;
+    const h =
+      TimeUnit[this.biggestUnit_] == TimeUnit.HOURS
+        ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_HOUR))
+        : TimeUnit[this.biggestUnit_] < TimeUnit.HOURS
         ? this.supportBackDate_(
-            Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR))
+            Math.floor((ms % MILLISECONDS_IN_DAY) / MILLISECONDS_IN_HOUR)
+          )
         : 0;
-    const m = TimeUnit[this.biggestUnit_] == TimeUnit.MINUTES
-      ? this.supportBackDate_(Math.floor((ms) / MILLISECONDS_IN_MINUTE))
-      : TimeUnit[this.biggestUnit_] < TimeUnit.MINUTES
+    const m =
+      TimeUnit[this.biggestUnit_] == TimeUnit.MINUTES
+        ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_MINUTE))
+        : TimeUnit[this.biggestUnit_] < TimeUnit.MINUTES
         ? this.supportBackDate_(
-            Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE))
+            Math.floor((ms % MILLISECONDS_IN_HOUR) / MILLISECONDS_IN_MINUTE)
+          )
         : 0;
-    const s = TimeUnit[this.biggestUnit_] == TimeUnit.SECONDS
-      ? this.supportBackDate_(Math.floor((ms) / MILLISECONDS_IN_SECOND))
-      : this.supportBackDate_(
-          Math.floor((ms % MILLISECONDS_IN_MINUTE) / MILLISECONDS_IN_SECOND));
+    const s =
+      TimeUnit[this.biggestUnit_] == TimeUnit.SECONDS
+        ? this.supportBackDate_(Math.floor(ms / MILLISECONDS_IN_SECOND))
+        : this.supportBackDate_(
+            Math.floor((ms % MILLISECONDS_IN_MINUTE) / MILLISECONDS_IN_SECOND)
+          );
 
     return {
       d,
diff --git a/extensions/amp-date-countdown/0.1/test/test-amp-date-countdown.js b/extensions/amp-date-countdown/0.1/test/test-amp-date-countdown.js
index 8ee22cf91db6..5b534285a0b7 100644
--- a/extensions/amp-date-countdown/0.1/test/test-amp-date-countdown.js
+++ b/extensions/amp-date-countdown/0.1/test/test-amp-date-countdown.js
@@ -16,221 +16,290 @@
 import '../amp-date-countdown';
 //import {Services} from '../../../../src/services';
 
-describes.realWin('amp-date-countdown', {
-  amp: {
-    // runtimeOn: true,
-    extensions: ['amp-date-countdown'],
+describes.realWin(
+  'amp-date-countdown',
+  {
+    amp: {
+      // runtimeOn: true,
+      extensions: ['amp-date-countdown'],
+    },
   },
-}, env => {
+  env => {
+    let win;
+    // let sandbox;
 
-  let win;
-  // let sandbox;
+    // Viewer-related vars.
+    // let viewer;
+    // let whenFirstVisiblePromise;
+    //let whenFirstVisiblePromiseResolve;
 
-  // Viewer-related vars.
-  // let viewer;
-  // let whenFirstVisiblePromise;
-  //let whenFirstVisiblePromiseResolve;
+    let element;
+    let impl;
+    const ISOEndDate = '2020-06-01T00:00:00+08:00';
+    const endDate = new Date(ISOEndDate);
+    const twoDaysBeforeEndDate = new Date(endDate - 86400000 * 2); //substract 2 days
 
-  let element;
-  let impl;
-  const ISOEndDate = '2020-06-01T00:00:00+08:00';
-  const endDate = new Date(ISOEndDate);
-  const twoDaysBeforeEndDate = new Date(endDate - (86400000 * 2)); //substract 2 days
+    beforeEach(() => {
+      ({win /*, sandbox*/} = env);
+      // viewer = Services.viewerForDoc(win.document);
 
-  beforeEach(() => {
-    ({win/*, sandbox*/} = env);
-    // viewer = Services.viewerForDoc(win.document);
+      // whenFirstVisiblePromise = new Promise(resolve => {
+      //   whenFirstVisiblePromiseResolve = resolve;
+      // });
+      // sandbox.stub(viewer, 'whenFirstVisible')
+      //     .callsFake(() => whenFirstVisiblePromise);
 
-    // whenFirstVisiblePromise = new Promise(resolve => {
-    //   whenFirstVisiblePromiseResolve = resolve;
-    // });
-    // sandbox.stub(viewer, 'whenFirstVisible')
-    //     .callsFake(() => whenFirstVisiblePromise);
-
-    element = win.document.createElement('amp-date-countdown');
-    element.setAttribute('end-date', ISOEndDate);
-    win.document.body.appendChild(element);
-    //element.build();
-    impl = element.implementation_;
-
-    // sandbox.stub(impl, 'buildCallback');
-    // sandbox.spy(impl, 'getYDHMSFromMs_');
-    // sandbox.spy(impl, 'getLocaleWord_');
-  });
-
-  it('should display timeleft in the format ' +
-    '{d} {days} {h} {hours} {m} {minutes} {s} {seconds}', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
-          impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-          impl.getLocaleWord_('en')); //English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-      timeObj.h + ' ' + timeObj.hours + ' ' +
-      timeObj.m + ' ' + timeObj.minutes + ' ' +
-      timeObj.s + ' ' + timeObj.seconds ;
-    expect(itemElement.textContent)
-        .to.equal('2 Days 0 Hours 0 Minutes 0 Seconds');
-  });
-
-  it('should display timeleft in the format ' +
-    '{d} {days} {h} {hours} {m} {minutes} {s} {seconds},' +
-    'in i18n Chinese Simplified', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
+      element = win.document.createElement('amp-date-countdown');
+      element.setAttribute('end-date', ISOEndDate);
+      win.document.body.appendChild(element);
+      //element.build();
+      impl = element.implementation_;
+
+      // sandbox.stub(impl, 'buildCallback');
+      // sandbox.spy(impl, 'getYDHMSFromMs_');
+      // sandbox.spy(impl, 'getLocaleWord_');
+    });
+
+    it(
+      'should display timeleft in the format ' +
+        '{d} {days} {h} {hours} {m} {minutes} {s} {seconds}',
+      () => {
+        element.build();
+        const timeObj = Object.assign(
           impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-          impl.getLocaleWord_('zh-cn')); // Chinese
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-      timeObj.h + ' ' + timeObj.hours + ' ' +
-      timeObj.m + ' ' + timeObj.minutes + ' ' +
-      timeObj.s + ' ' + timeObj.seconds ;
-    expect(itemElement.textContent).to.equal('2 天 0 小时 0 分钟 0 秒');
-  });
-
-  it('should display timeleft in the format {hh}:{mm}:{ss}', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
+          impl.getLocaleWord_('en')
+        ); //English
+        const itemElement = win.document.createElement('div');
+        itemElement.textContent =
+          timeObj.d +
+          ' ' +
+          timeObj.days +
+          ' ' +
+          timeObj.h +
+          ' ' +
+          timeObj.hours +
+          ' ' +
+          timeObj.m +
+          ' ' +
+          timeObj.minutes +
+          ' ' +
+          timeObj.s +
+          ' ' +
+          timeObj.seconds;
+        expect(itemElement.textContent).to.equal(
+          '2 Days 0 Hours 0 Minutes 0 Seconds'
+        );
+      }
+    );
+
+    it(
+      'should display timeleft in the format ' +
+        '{d} {days} {h} {hours} {m} {minutes} {s} {seconds},' +
+        'in i18n Chinese Simplified',
+      () => {
+        element.build();
+        const timeObj = Object.assign(
           impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-          impl.getLocaleWord_('en')); //English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.dd + ':' +
-      timeObj.hh + ':' +
-      timeObj.mm + ':' +
-      timeObj.ss;
-    expect(itemElement.textContent)
-        .to.equal('02:00:00:00');
-  });
-
-  it('should display timeleft in the format ' +
-    '{h} {hours} and {m} {minutes} and {s} {seconds}', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
-          impl.getYDHMSFromMs_((endDate - twoDaysBeforeEndDate) - 1000),
-          impl.getLocaleWord_('en')); //English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.h + ' ' + timeObj.hours + ' and ' +
-      timeObj.m + ' ' + timeObj.minutes + ' and ' +
-      timeObj.s + ' ' + timeObj.seconds;
-    expect(itemElement.textContent)
-        .to.equal('23 Hours and 59 Minutes and 59 Seconds');
-    //1 day 23 Hours and 59 minutes and 59 seconds
-  });
-
-  it('should display timeleft in the format ' +
-    '{d} {days} {h}:{mm}', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
-          impl.getYDHMSFromMs_((endDate - twoDaysBeforeEndDate) - 1000),
-          impl.getLocaleWord_('en')); //English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-      timeObj.h + ':' + timeObj.mm;
-    expect(itemElement.textContent)
-        .to.equal('1 Days 23:59');
-  });
-
-  it('should calculate the timeleft after added offset-seconds', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
-          impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate
-            + (24 * 60 * 60 * 1000)), // hours * minutes * seconds * ms
-          impl.getLocaleWord_('en')); // English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-      timeObj.h + ' ' + timeObj.hours + ' ' +
-      timeObj.m + ' ' + timeObj.minutes + ' ' +
-      timeObj.s + ' ' + timeObj.seconds ;
-    expect(itemElement.textContent)
-        .to.equal('3 Days 0 Hours 0 Minutes 0 Seconds');
-  });
-
-  it('should calculate the timeleft after substracted offset-seconds', () => {
-    element.build();
-    const timeObj =
-      Object.assign(
-          impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate
-            + (-1 * 24 * 60 * 60 * 1000)), // hours * minutes * seconds * ms
-          impl.getLocaleWord_('en')); // English
-    const itemElement = win.document.createElement('div');
-    itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-      timeObj.h + ' ' + timeObj.hours + ' ' +
-      timeObj.m + ' ' + timeObj.minutes + ' ' +
-      timeObj.s + ' ' + timeObj.seconds ;
-    expect(itemElement.textContent)
-        .to.equal('1 Days 0 Hours 0 Minutes 0 Seconds');
-  });
-
-  // it('should calculate timeleft and have biggest-unit up to hours', () => {
-  //   element.setAttribute('biggest-unit', 'HOURS');
-  //   element.build();
-  //   let timeObj;
-  //   let itemElement;
-  //   Services.viewerForDoc(win.document).whenFirstVisible().then(() => {
-  //     debugger;
-  //     //cant even come in here
-  //     timeObj = Object.assign(
-  //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-  //         impl.getLocaleWord_('en'));
-  //     itemElement = win.document.createElement('div');
-  //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-  //       timeObj.h + ' ' + timeObj.hours + ' ' +
-  //       timeObj.m + ' ' + timeObj.minutes + ' ' +
-  //       timeObj.s + ' ' + timeObj.seconds ;
-  //   }).then(() => {
-  //     expect(itemElement.textContent)
-  //         .to.equal('0 Days 48 Hours 0 Minutes 0 Seconds');
-  //   });
-  // });
-
-  // it('should calculate timeleft and have biggest-unit up to minutes', () => {
-  //   element.setAttribute('biggest-unit', 'MINUTES');
-  //   element.build();
-
-  //   whenFirstVisiblePromiseResolve();
-
-  //   let timeObj;
-  //   return whenFirstVisiblePromise.then(() => {
-  //     timeObj = Object.assign(
-  //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-  //         impl.getLocaleWord_('en'));
-  //   }).then(() => {
-  //     const itemElement = win.document.createElement('div');
-  //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-  //       timeObj.h + ' ' + timeObj.hours + ' ' +
-  //       timeObj.m + ' ' + timeObj.minutes + ' ' +
-  //       timeObj.s + ' ' + timeObj.seconds ;
-  //     expect(itemElement.textContent)
-  //         .to.equal('0 Days 0 Hours 2880 Minutes 0 Seconds');
-  //   });
-  // });
-
-  // it('should calculate timeleft and have biggest-unit up to seconds', () => {
-  //   element.setAttribute('biggest-unit', 'SECONDS');
-  //   element.build();
-
-  //   whenFirstVisiblePromiseResolve();
-
-  //   let timeObj;
-  //   return whenFirstVisiblePromise.then(() => {
-  //     timeObj = Object.assign(
-  //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
-  //         impl.getLocaleWord_('en'));
-  //   }).then(() => {
-  //     const itemElement = win.document.createElement('div');
-  //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
-  //       timeObj.h + ' ' + timeObj.hours + ' ' +
-  //       timeObj.m + ' ' + timeObj.minutes + ' ' +
-  //       timeObj.s + ' ' + timeObj.seconds ;
-  //     expect(itemElement.textContent)
-  //         .to.equal('0 Days 0 Hours 0 Minutes 172800 Seconds');
-  //   });
-  // });
-
-});
+          impl.getLocaleWord_('zh-cn')
+        ); // Chinese
+        const itemElement = win.document.createElement('div');
+        itemElement.textContent =
+          timeObj.d +
+          ' ' +
+          timeObj.days +
+          ' ' +
+          timeObj.h +
+          ' ' +
+          timeObj.hours +
+          ' ' +
+          timeObj.m +
+          ' ' +
+          timeObj.minutes +
+          ' ' +
+          timeObj.s +
+          ' ' +
+          timeObj.seconds;
+        expect(itemElement.textContent).to.equal('2 天 0 小时 0 分钟 0 秒');
+      }
+    );
+
+    it('should display timeleft in the format {hh}:{mm}:{ss}', () => {
+      element.build();
+      const timeObj = Object.assign(
+        impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
+        impl.getLocaleWord_('en')
+      ); //English
+      const itemElement = win.document.createElement('div');
+      itemElement.textContent =
+        timeObj.dd + ':' + timeObj.hh + ':' + timeObj.mm + ':' + timeObj.ss;
+      expect(itemElement.textContent).to.equal('02:00:00:00');
+    });
+
+    it(
+      'should display timeleft in the format ' +
+        '{h} {hours} and {m} {minutes} and {s} {seconds}',
+      () => {
+        element.build();
+        const timeObj = Object.assign(
+          impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate - 1000),
+          impl.getLocaleWord_('en')
+        ); //English
+        const itemElement = win.document.createElement('div');
+        itemElement.textContent =
+          timeObj.h +
+          ' ' +
+          timeObj.hours +
+          ' and ' +
+          timeObj.m +
+          ' ' +
+          timeObj.minutes +
+          ' and ' +
+          timeObj.s +
+          ' ' +
+          timeObj.seconds;
+        expect(itemElement.textContent).to.equal(
+          '23 Hours and 59 Minutes and 59 Seconds'
+        );
+        //1 day 23 Hours and 59 minutes and 59 seconds
+      }
+    );
+
+    it('should display timeleft in the format {d} {days} {h}:{mm}', () => {
+      element.build();
+      const timeObj = Object.assign(
+        impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate - 1000),
+        impl.getLocaleWord_('en')
+      ); //English
+      const itemElement = win.document.createElement('div');
+      itemElement.textContent =
+        timeObj.d + ' ' + timeObj.days + ' ' + timeObj.h + ':' + timeObj.mm;
+      expect(itemElement.textContent).to.equal('1 Days 23:59');
+    });
+
+    it('should calculate the timeleft after added offset-seconds', () => {
+      element.build();
+      const timeObj = Object.assign(
+        impl.getYDHMSFromMs_(
+          endDate - twoDaysBeforeEndDate + 24 * 60 * 60 * 1000
+        ), // hours * minutes * seconds * ms
+        impl.getLocaleWord_('en')
+      ); // English
+      const itemElement = win.document.createElement('div');
+      itemElement.textContent =
+        timeObj.d +
+        ' ' +
+        timeObj.days +
+        ' ' +
+        timeObj.h +
+        ' ' +
+        timeObj.hours +
+        ' ' +
+        timeObj.m +
+        ' ' +
+        timeObj.minutes +
+        ' ' +
+        timeObj.s +
+        ' ' +
+        timeObj.seconds;
+      expect(itemElement.textContent).to.equal(
+        '3 Days 0 Hours 0 Minutes 0 Seconds'
+      );
+    });
+
+    it('should calculate the timeleft after substracted offset-seconds', () => {
+      element.build();
+      const timeObj = Object.assign(
+        impl.getYDHMSFromMs_(
+          endDate - twoDaysBeforeEndDate + -1 * 24 * 60 * 60 * 1000
+        ), // hours * minutes * seconds * ms
+        impl.getLocaleWord_('en')
+      ); // English
+      const itemElement = win.document.createElement('div');
+      itemElement.textContent =
+        timeObj.d +
+        ' ' +
+        timeObj.days +
+        ' ' +
+        timeObj.h +
+        ' ' +
+        timeObj.hours +
+        ' ' +
+        timeObj.m +
+        ' ' +
+        timeObj.minutes +
+        ' ' +
+        timeObj.s +
+        ' ' +
+        timeObj.seconds;
+      expect(itemElement.textContent).to.equal(
+        '1 Days 0 Hours 0 Minutes 0 Seconds'
+      );
+    });
+
+    // it('should calculate timeleft and have biggest-unit up to hours', () => {
+    //   element.setAttribute('biggest-unit', 'HOURS');
+    //   element.build();
+    //   let timeObj;
+    //   let itemElement;
+    //   Services.viewerForDoc(win.document).whenFirstVisible().then(() => {
+    //     debugger;
+    //     //cant even come in here
+    //     timeObj = Object.assign(
+    //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
+    //         impl.getLocaleWord_('en'));
+    //     itemElement = win.document.createElement('div');
+    //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
+    //       timeObj.h + ' ' + timeObj.hours + ' ' +
+    //       timeObj.m + ' ' + timeObj.minutes + ' ' +
+    //       timeObj.s + ' ' + timeObj.seconds ;
+    //   }).then(() => {
+    //     expect(itemElement.textContent)
+    //         .to.equal('0 Days 48 Hours 0 Minutes 0 Seconds');
+    //   });
+    // });
+
+    // it('should calculate timeleft and have biggest-unit up to minutes', () => {
+    //   element.setAttribute('biggest-unit', 'MINUTES');
+    //   element.build();
+
+    //   whenFirstVisiblePromiseResolve();
+
+    //   let timeObj;
+    //   return whenFirstVisiblePromise.then(() => {
+    //     timeObj = Object.assign(
+    //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
+    //         impl.getLocaleWord_('en'));
+    //   }).then(() => {
+    //     const itemElement = win.document.createElement('div');
+    //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
+    //       timeObj.h + ' ' + timeObj.hours + ' ' +
+    //       timeObj.m + ' ' + timeObj.minutes + ' ' +
+    //       timeObj.s + ' ' + timeObj.seconds ;
+    //     expect(itemElement.textContent)
+    //         .to.equal('0 Days 0 Hours 2880 Minutes 0 Seconds');
+    //   });
+    // });
+
+    // it('should calculate timeleft and have biggest-unit up to seconds', () => {
+    //   element.setAttribute('biggest-unit', 'SECONDS');
+    //   element.build();
+
+    //   whenFirstVisiblePromiseResolve();
+
+    //   let timeObj;
+    //   return whenFirstVisiblePromise.then(() => {
+    //     timeObj = Object.assign(
+    //         impl.getYDHMSFromMs_(endDate - twoDaysBeforeEndDate),
+    //         impl.getLocaleWord_('en'));
+    //   }).then(() => {
+    //     const itemElement = win.document.createElement('div');
+    //     itemElement.textContent = timeObj.d + ' ' + timeObj.days + ' ' +
+    //       timeObj.h + ' ' + timeObj.hours + ' ' +
+    //       timeObj.m + ' ' + timeObj.minutes + ' ' +
+    //       timeObj.s + ' ' + timeObj.seconds ;
+    //     expect(itemElement.textContent)
+    //         .to.equal('0 Days 0 Hours 0 Minutes 172800 Seconds');
+    //   });
+    // });
+  }
+);
diff --git a/extensions/amp-date-display/0.1/amp-date-display.js b/extensions/amp-date-display/0.1/amp-date-display.js
index 52b227ccc769..b8a9f11ec53b 100644
--- a/extensions/amp-date-display/0.1/amp-date-display.js
+++ b/extensions/amp-date-display/0.1/amp-date-display.js
@@ -112,10 +112,12 @@ export class AmpDateDisplay extends AMP.BaseElement {
     this.datetime_ = this.element.getAttribute('datetime') || '';
 
     this.timestampSeconds_ = Number(
-        this.element.getAttribute('timestamp-seconds'));
+      this.element.getAttribute('timestamp-seconds')
+    );
 
     this.timestampMiliseconds_ = Number(
-        this.element.getAttribute('timestamp-ms'));
+      this.element.getAttribute('timestamp-ms')
+    );
 
     this.displayIn_ = this.element.getAttribute('display-in') || '';
 
@@ -125,10 +127,10 @@ export class AmpDateDisplay extends AMP.BaseElement {
 
     this.locale_ = this.element.getAttribute('locale') || DEFAULT_LOCALE;
 
-    const data = /** @type {!JsonObject} */(this.getDataForTemplate_());
+    const data = /** @type {!JsonObject} */ (this.getDataForTemplate_());
     this.templates_
-        .findAndRenderTemplate(this.element, data)
-        .then(this.boundRendered_);
+      .findAndRenderTemplate(this.element, data)
+      .then(this.boundRendered_);
   }
 
   /** @override */
@@ -173,8 +175,10 @@ export class AmpDateDisplay extends AMP.BaseElement {
       epoch = this.timestampSeconds_ * 1000;
     }
 
-    userAssert(epoch !== undefined,
-        'One of datetime, timestamp-ms, or timestamp-seconds is required');
+    userAssert(
+      epoch !== undefined,
+      'One of datetime, timestamp-ms, or timestamp-seconds is required'
+    );
 
     return epoch;
   }
@@ -248,18 +252,17 @@ export class AmpDateDisplay extends AMP.BaseElement {
     const hour12 = data.hour % 12 || 12;
 
     // Override type since Object.assign is not understood
-    return /** @type {!EnhancedVariablesDef} */(
-      Object.assign({}, data, {
-        yearTwoDigit: this.padStart_(data.year % 100),
-        monthTwoDigit: this.padStart_(data.month),
-        dayTwoDigit: this.padStart_(data.day),
-        hourTwoDigit: this.padStart_(data.hour),
-        hour12,
-        hour12TwoDigit: this.padStart_(hour12),
-        minuteTwoDigit: this.padStart_(data.minute),
-        secondTwoDigit: this.padStart_(data.second),
-        dayPeriod: data.hour < 12 ? 'am' : 'pm',
-      }));
+    return /** @type {!EnhancedVariablesDef} */ (Object.assign({}, data, {
+      yearTwoDigit: this.padStart_(data.year % 100),
+      monthTwoDigit: this.padStart_(data.month),
+      dayTwoDigit: this.padStart_(data.day),
+      hourTwoDigit: this.padStart_(data.hour),
+      hour12,
+      hour12TwoDigit: this.padStart_(hour12),
+      minuteTwoDigit: this.padStart_(data.minute),
+      secondTwoDigit: this.padStart_(data.second),
+      dayPeriod: data.hour < 12 ? 'am' : 'pm',
+    }));
   }
 
   /**
@@ -285,10 +288,10 @@ export class AmpDateDisplay extends AMP.BaseElement {
       this.container_.appendChild(element);
 
       const event = createCustomEvent(
-          this.win,
-          AmpEvents.DOM_UPDATE,
-          /* detail */ null,
-          {bubbles: true}
+        this.win,
+        AmpEvents.DOM_UPDATE,
+        /* detail */ null,
+        {bubbles: true}
       );
       this.element.dispatchEvent(event);
     });
diff --git a/extensions/amp-date-display/0.1/test/test-amp-date-display.js b/extensions/amp-date-display/0.1/test/test-amp-date-display.js
index e6c322ea7168..0f86a9d0ce23 100644
--- a/extensions/amp-date-display/0.1/test/test-amp-date-display.js
+++ b/extensions/amp-date-display/0.1/test/test-amp-date-display.js
@@ -18,179 +18,191 @@ import '../amp-date-display';
 import * as lolex from 'lolex';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
-describes.realWin('amp-date-display', {
-  amp: {
-    extensions: ['amp-date-display'],
+describes.realWin(
+  'amp-date-display',
+  {
+    amp: {
+      extensions: ['amp-date-display'],
+    },
   },
-}, env => {
-
-  let win;
-  let element;
-  let impl;
-  let clock;
-
-  beforeEach(() => {
-    win = env.win;
-    clock = lolex.install({
-      target: win,
-      now: new Date('2018-01-01T08:00:00Z'),
+  env => {
+    let win;
+    let element;
+    let impl;
+    let clock;
+
+    beforeEach(() => {
+      win = env.win;
+      clock = lolex.install({
+        target: win,
+        now: new Date('2018-01-01T08:00:00Z'),
+      });
+
+      toggleExperiment(win, 'amp-date-display', true);
+      element = win.document.createElement('amp-date-display');
+      win.document.body.appendChild(element);
+      impl = element.implementation_;
+      env.sandbox.stub(impl.templates_, 'findAndRenderTemplate').resolves();
+      env.sandbox.stub(impl, 'boundRendered_');
     });
 
-    toggleExperiment(win, 'amp-date-display', true);
-    element = win.document.createElement('amp-date-display');
-    win.document.body.appendChild(element);
-    impl = element.implementation_;
-    env.sandbox.stub(impl.templates_, 'findAndRenderTemplate').resolves();
-    env.sandbox.stub(impl, 'boundRendered_');
-  });
-
-  afterEach(() => {
-    clock.uninstall();
-  });
-
-  // Unfortunately, we cannot test the most interesting case of UTC datetime
-  // displayed in local, because the test would work in only one time zone.
-
-  it('provides all variables in UTC and English (default)', () => {
-    element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
-    element.setAttribute('display-in', 'UTC');
-    element.build();
-
-    const data = impl.getDataForTemplate_();
-
-    expect(data.year).to.equal(2001);
-    expect(data.yearTwoDigit).to.equal('01');
-    expect(data.month).to.equal(2);
-    expect(data.monthTwoDigit).to.equal('02');
-    expect(data.monthName).to.equal('February');
-    expect(data.monthNameShort).to.equal('Feb');
-    expect(data.day).to.equal(3);
-    expect(data.dayTwoDigit).to.equal('03');
-    expect(data.dayName).to.equal('Saturday');
-    expect(data.dayNameShort).to.equal('Sat');
-    expect(data.hour).to.equal(4);
-    expect(data.hourTwoDigit).to.equal('04');
-    expect(data.hour12).to.equal(4);
-    expect(data.hour12TwoDigit).to.equal('04');
-    expect(data.minute).to.equal(5);
-    expect(data.minuteTwoDigit).to.equal('05');
-    expect(data.second).to.equal(6);
-    expect(data.secondTwoDigit).to.equal('06');
-    expect(data.dayPeriod).to.equal('am');
-  });
-
-  it('provides all variables in local and English (default)', () => {
-    element.setAttribute('datetime', '2001-02-03T04:05:06.007');
-    element.build();
-
-    const data = impl.getDataForTemplate_();
-
-    expect(data.year).to.equal(2001);
-    expect(data.yearTwoDigit).to.equal('01');
-    expect(data.month).to.equal(2);
-    expect(data.monthTwoDigit).to.equal('02');
-    expect(data.monthName).to.equal('February');
-    expect(data.monthNameShort).to.equal('Feb');
-    expect(data.day).to.equal(3);
-    expect(data.dayTwoDigit).to.equal('03');
-    expect(data.dayName).to.equal('Saturday');
-    expect(data.dayNameShort).to.equal('Sat');
-    expect(data.hour).to.equal(4);
-    expect(data.hourTwoDigit).to.equal('04');
-    expect(data.hour12).to.equal(4);
-    expect(data.hour12TwoDigit).to.equal('04');
-    expect(data.minute).to.equal(5);
-    expect(data.minuteTwoDigit).to.equal('05');
-    expect(data.second).to.equal(6);
-    expect(data.secondTwoDigit).to.equal('06');
-    expect(data.dayPeriod).to.equal('am');
-  });
-
-  describe('correctly parses', () => {
-    it('now keyword', () => {
-      element.setAttribute('datetime', 'now');
-      element.build();
-
-      const {iso} = impl.getDataForTemplate_();
-      const dateFromParsed = new win.Date(iso);
-
-      // Because of the runtime there could be a several ms difference.
-      expect(dateFromParsed.getTime()).to.equal(win.Date.now());
+    afterEach(() => {
+      clock.uninstall();
     });
 
-    it('day only ISO 8601 date', () => {
-      element.setAttribute('datetime', '2001-02-03');
-      element.build();
-      expect(impl.getDataForTemplate_().iso)
-          .to.equal('2001-02-03T00:00:00.000Z');
-    });
+    // Unfortunately, we cannot test the most interesting case of UTC datetime
+    // displayed in local, because the test would work in only one time zone.
 
-    it('full ISO 8601 date in UTC time zone', () => {
+    it('provides all variables in UTC and English (default)', () => {
       element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
+      element.setAttribute('display-in', 'UTC');
       element.build();
-      expect(impl.getDataForTemplate_().iso)
-          .to.equal('2001-02-03T04:05:06.007Z');
+
+      const data = impl.getDataForTemplate_();
+
+      expect(data.year).to.equal(2001);
+      expect(data.yearTwoDigit).to.equal('01');
+      expect(data.month).to.equal(2);
+      expect(data.monthTwoDigit).to.equal('02');
+      expect(data.monthName).to.equal('February');
+      expect(data.monthNameShort).to.equal('Feb');
+      expect(data.day).to.equal(3);
+      expect(data.dayTwoDigit).to.equal('03');
+      expect(data.dayName).to.equal('Saturday');
+      expect(data.dayNameShort).to.equal('Sat');
+      expect(data.hour).to.equal(4);
+      expect(data.hourTwoDigit).to.equal('04');
+      expect(data.hour12).to.equal(4);
+      expect(data.hour12TwoDigit).to.equal('04');
+      expect(data.minute).to.equal(5);
+      expect(data.minuteTwoDigit).to.equal('05');
+      expect(data.second).to.equal(6);
+      expect(data.secondTwoDigit).to.equal('06');
+      expect(data.dayPeriod).to.equal('am');
     });
 
-    it('full ISO 8601 date without time zone (interpreted as local)', () => {
+    it('provides all variables in local and English (default)', () => {
       element.setAttribute('datetime', '2001-02-03T04:05:06.007');
       element.build();
 
       const data = impl.getDataForTemplate_();
-      const result = `${data.year}-${data.monthTwoDigit}-${data.dayTwoDigit}` +
-        `T${data.hourTwoDigit}:${data.minuteTwoDigit}:${data.secondTwoDigit}`;
 
-      expect(result).to.equal('2001-02-03T04:05:06');
+      expect(data.year).to.equal(2001);
+      expect(data.yearTwoDigit).to.equal('01');
+      expect(data.month).to.equal(2);
+      expect(data.monthTwoDigit).to.equal('02');
+      expect(data.monthName).to.equal('February');
+      expect(data.monthNameShort).to.equal('Feb');
+      expect(data.day).to.equal(3);
+      expect(data.dayTwoDigit).to.equal('03');
+      expect(data.dayName).to.equal('Saturday');
+      expect(data.dayNameShort).to.equal('Sat');
+      expect(data.hour).to.equal(4);
+      expect(data.hourTwoDigit).to.equal('04');
+      expect(data.hour12).to.equal(4);
+      expect(data.hour12TwoDigit).to.equal('04');
+      expect(data.minute).to.equal(5);
+      expect(data.minuteTwoDigit).to.equal('05');
+      expect(data.second).to.equal(6);
+      expect(data.secondTwoDigit).to.equal('06');
+      expect(data.dayPeriod).to.equal('am');
     });
 
-    it('full ISO 8601 date in a custom time zone', () => {
-      element.setAttribute('datetime', '2001-02-03T04:05:06.007+08:00');
+    describe('correctly parses', () => {
+      it('now keyword', () => {
+        element.setAttribute('datetime', 'now');
+        element.build();
+
+        const {iso} = impl.getDataForTemplate_();
+        const dateFromParsed = new win.Date(iso);
+
+        // Because of the runtime there could be a several ms difference.
+        expect(dateFromParsed.getTime()).to.equal(win.Date.now());
+      });
+
+      it('day only ISO 8601 date', () => {
+        element.setAttribute('datetime', '2001-02-03');
+        element.build();
+        expect(impl.getDataForTemplate_().iso).to.equal(
+          '2001-02-03T00:00:00.000Z'
+        );
+      });
+
+      it('full ISO 8601 date in UTC time zone', () => {
+        element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
+        element.build();
+        expect(impl.getDataForTemplate_().iso).to.equal(
+          '2001-02-03T04:05:06.007Z'
+        );
+      });
+
+      it('full ISO 8601 date without time zone (interpreted as local)', () => {
+        element.setAttribute('datetime', '2001-02-03T04:05:06.007');
+        element.build();
+
+        const data = impl.getDataForTemplate_();
+        const result =
+          `${data.year}-${data.monthTwoDigit}-${data.dayTwoDigit}` +
+          `T${data.hourTwoDigit}:${data.minuteTwoDigit}:${data.secondTwoDigit}`;
+
+        expect(result).to.equal('2001-02-03T04:05:06');
+      });
+
+      it('full ISO 8601 date in a custom time zone', () => {
+        element.setAttribute('datetime', '2001-02-03T04:05:06.007+08:00');
+        element.build();
+        expect(impl.getDataForTemplate_().iso).to.equal(
+          '2001-02-02T20:05:06.007Z'
+        );
+      });
+
+      it('seconds since the UNIX epoch', () => {
+        element.setAttribute('timestamp-seconds', '981173106');
+        element.build();
+        expect(impl.getDataForTemplate_().iso).to.equal(
+          '2001-02-03T04:05:06.000Z'
+        );
+      });
+
+      it('miliseconds since the UNIX epoch', () => {
+        element.setAttribute('timestamp-ms', '981173106007');
+        element.build();
+        expect(impl.getDataForTemplate_().iso).to.equal(
+          '2001-02-03T04:05:06.007Z'
+        );
+      });
+    });
+
+    it('adds offset seconds', () => {
+      element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
+      element.setAttribute('offset-seconds', '1234567');
       element.build();
-      expect(impl.getDataForTemplate_().iso)
-          .to.equal('2001-02-02T20:05:06.007Z');
+      expect(impl.getDataForTemplate_().iso).to.equal(
+        '2001-02-17T11:01:13.007Z'
+      );
     });
 
-    it('seconds since the UNIX epoch', () => {
-      element.setAttribute('timestamp-seconds', '981173106');
+    it('subtracts offset seconds', () => {
+      element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
+      element.setAttribute('offset-seconds', '-1234567');
       element.build();
-      expect(impl.getDataForTemplate_().iso)
-          .to.equal('2001-02-03T04:05:06.000Z');
+      expect(impl.getDataForTemplate_().iso).to.equal(
+        '2001-01-19T21:08:59.007Z'
+      );
     });
 
-    it('miliseconds since the UNIX epoch', () => {
-      element.setAttribute('timestamp-ms', '981173106007');
+    it('provides variables in Czech when "cs" locale is passed', () => {
+      element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
+      element.setAttribute('display-in', 'UTC');
+      element.setAttribute('locale', 'cs');
       element.build();
-      expect(impl.getDataForTemplate_().iso)
-          .to.equal('2001-02-03T04:05:06.007Z');
+
+      const data = impl.getDataForTemplate_();
+
+      expect(data.monthName).to.equal('únor');
+      expect(data.monthNameShort).to.equal('úno');
+      expect(data.dayName).to.equal('sobota');
+      expect(data.dayNameShort).to.equal('so');
     });
-  });
-
-  it('adds offset seconds', () => {
-    element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
-    element.setAttribute('offset-seconds', '1234567');
-    element.build();
-    expect(impl.getDataForTemplate_().iso).to.equal('2001-02-17T11:01:13.007Z');
-  });
-
-  it('subtracts offset seconds', () => {
-    element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
-    element.setAttribute('offset-seconds', '-1234567');
-    element.build();
-    expect(impl.getDataForTemplate_().iso).to.equal('2001-01-19T21:08:59.007Z');
-  });
-
-  it('provides variables in Czech when "cs" locale is passed', () => {
-    element.setAttribute('datetime', '2001-02-03T04:05:06.007Z');
-    element.setAttribute('display-in', 'UTC');
-    element.setAttribute('locale', 'cs');
-    element.build();
-
-    const data = impl.getDataForTemplate_();
-
-    expect(data.monthName).to.equal('únor');
-    expect(data.monthNameShort).to.equal('úno');
-    expect(data.dayName).to.equal('sobota');
-    expect(data.dayNameShort).to.equal('so');
-  });
-});
+  }
+);
diff --git a/extensions/amp-date-picker/0.1/amp-date-picker.js b/extensions/amp-date-picker/0.1/amp-date-picker.js
index de8fa48846fd..7dd4739e7625 100644
--- a/extensions/amp-date-picker/0.1/amp-date-picker.js
+++ b/extensions/amp-date-picker/0.1/amp-date-picker.js
@@ -43,7 +43,6 @@ import {escapeCssSelectorIdent} from '../../../src/css';
 import {once} from '../../../src/utils/function';
 import {requireExternal} from '../../../src/module';
 
-
 /**
  * @typedef {{
  *   dates: !DatesList,
@@ -52,7 +51,6 @@ import {requireExternal} from '../../../src/module';
  */
 let DateTemplateMapDef;
 
-
 /** @dict @extends {JsonObject} */
 class BindDateDetails {
   /**
@@ -165,8 +163,7 @@ const DEFAULT_TRANSITION_CONTAINER_MIN_HEIGHT = '354px';
  */
 const RESIZE_BUG_CSS = 'amp-date-picker-resize-bug';
 
-const TRANSITION_CONTAINER_SELECTOR =
-    `.${RESIZE_BUG_CSS} .DayPicker_transitionContainer`;
+const TRANSITION_CONTAINER_SELECTOR = `.${RESIZE_BUG_CSS} .DayPicker_transitionContainer`;
 
 const DEFAULT_FIRST_DAY_OF_WEEK = 0; // Sunday
 
@@ -210,16 +207,18 @@ export class AmpDatePicker extends AMP.BaseElement {
     this.reactRender_ = requireExternal('react-dom').render;
 
     /** @private @const */
-    this.ReactDates_ = /** @type {!JsonObject} */ (
-      requireExternal('react-dates'));
+    this.ReactDates_ = /** @type {!JsonObject} */ (requireExternal(
+      'react-dates'
+    ));
 
     /**
      * @private
      * @const
      * @dict
      */
-    this.ReactDatesConstants_ = /** @type {!JsonObject} */ (
-      requireExternal('react-dates/constants'));
+    this.ReactDatesConstants_ = /** @type {!JsonObject} */ (requireExternal(
+      'react-dates/constants'
+    ));
 
     /** @private {?../../../src/service/action-impl.ActionService} */
     this.action_ = null;
@@ -317,7 +316,10 @@ export class AmpDatePicker extends AMP.BaseElement {
     /** @private @const */
     this.container_ = this.document_.createElement('div');
     this.container_.classList.add(
-        CALENDAR_CONTAINER_CSS, PRIVATE_CALENDAR_CONTAINER_CSS, RESIZE_BUG_CSS);
+      CALENDAR_CONTAINER_CSS,
+      PRIVATE_CALENDAR_CONTAINER_CSS,
+      RESIZE_BUG_CSS
+    );
 
     /** @private */
     this.renderedTemplates_ = dict();
@@ -346,8 +348,7 @@ export class AmpDatePicker extends AMP.BaseElement {
     this.state_ = null;
 
     /** @private @const */
-    this.warnDaySizeOnce_ =
-        once(this.warnDaySize_.bind(this));
+    this.warnDaySizeOnce_ = once(this.warnDaySize_.bind(this));
   }
 
   /** @override */
@@ -390,28 +391,33 @@ export class AmpDatePicker extends AMP.BaseElement {
       this.type_ = type;
     }
 
-    this.pickerClass_ = (this.type_ === DatePickerType.RANGE ?
-      createDateRangePicker() :
-      createSingleDatePicker()); // default
+    this.pickerClass_ =
+      this.type_ === DatePickerType.RANGE
+        ? createDateRangePicker()
+        : createSingleDatePicker(); // default
 
     const mode = this.element.getAttribute('mode');
     if (mode) {
       this.mode_ = /** @type {!DatePickerMode} */ (mode);
     }
 
-    this.weekDayFormat_ = this.element.getAttribute('week-day-format') ||
-        DEFAULT_WEEK_DAY_FORMAT;
+    this.weekDayFormat_ =
+      this.element.getAttribute('week-day-format') || DEFAULT_WEEK_DAY_FORMAT;
 
-    this.allowBlockedRanges_ =
-        this.element.hasAttribute('allow-blocked-ranges');
+    this.allowBlockedRanges_ = this.element.hasAttribute(
+      'allow-blocked-ranges'
+    );
 
-    this.allowBlockedEndDate_ =
-        this.element.hasAttribute('allow-blocked-end-date');
+    this.allowBlockedEndDate_ = this.element.hasAttribute(
+      'allow-blocked-end-date'
+    );
 
     this.fullscreen_ = this.element.hasAttribute('fullscreen');
     if (this.fullscreen_) {
-      userAssert(this.mode_ == DatePickerMode.STATIC,
-          'amp-date-picker mode must be "static" to use fullscreen attribute');
+      userAssert(
+        this.mode_ == DatePickerMode.STATIC,
+        'amp-date-picker mode must be "static" to use fullscreen attribute'
+      );
     }
 
     this.openAfterClear_ = this.element.hasAttribute('open-after-clear');
@@ -419,7 +425,8 @@ export class AmpDatePicker extends AMP.BaseElement {
     this.openAfterSelect_ = this.element.hasAttribute('open-after-select');
 
     this.elementTemplates_ = this.parseElementTemplates_(
-        this.element.querySelectorAll('[date-template][dates]'));
+      this.element.querySelectorAll('[date-template][dates]')
+    );
 
     this.locale_ = this.element.getAttribute('locale');
     this.moment_.locale(this.locale_);
@@ -430,54 +437,70 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     if (this.type_ === DatePickerType.SINGLE) {
       this.dateField_ = this.setupDateField_(DateFieldType.DATE);
-      if (this.mode_ == DatePickerMode.OVERLAY &&
-          this.dateField_ === null) {
-        user().error(TAG,
-            'Overlay single pickers must specify "input-selector" to ' +
-            'an existing input element.');
+      if (this.mode_ == DatePickerMode.OVERLAY && this.dateField_ === null) {
+        user().error(
+          TAG,
+          'Overlay single pickers must specify "input-selector" to ' +
+            'an existing input element.'
+        );
       }
     } else if (this.type_ === DatePickerType.RANGE) {
       this.startDateField_ = this.setupDateField_(DateFieldType.START_DATE);
       this.endDateField_ = this.setupDateField_(DateFieldType.END_DATE);
 
-      if (this.mode_ == DatePickerMode.OVERLAY &&
-          (!this.startDateField_ || !this.endDateField_)) {
-        user().error(TAG,
-            'Overlay range pickers must "start-input-selector" and ' +
-            '"end-input-selector" to existing start and end input elements.');
+      if (
+        this.mode_ == DatePickerMode.OVERLAY &&
+        (!this.startDateField_ || !this.endDateField_)
+      ) {
+        user().error(
+          TAG,
+          'Overlay range pickers must "start-input-selector" and ' +
+            '"end-input-selector" to existing start and end input elements.'
+        );
       }
     } else {
       user().error(TAG, 'Invalid date picker type', this.type_);
     }
 
-    const initialState = (this.mode_ == DatePickerMode.OVERLAY ?
-      DatePickerState.OVERLAY_CLOSED :
-      DatePickerState.STATIC);
+    const initialState =
+      this.mode_ == DatePickerMode.OVERLAY
+        ? DatePickerState.OVERLAY_CLOSED
+        : DatePickerState.STATIC;
     this.stateMachine_ = this.setupStateMachine_(initialState);
 
     this.props_ = this.getProps_();
 
-    this.registerAction('setDate',
-        invocation => this.handleSetDateFromString_(invocation.args['date']));
-    this.registerAction('setDates',
-        invocation => this.handleSetDatesFromString_(
-            invocation.args['startDate'],
-            invocation.args['endDate']));
+    this.registerAction('setDate', invocation =>
+      this.handleSetDateFromString_(invocation.args['date'])
+    );
+    this.registerAction('setDates', invocation =>
+      this.handleSetDatesFromString_(
+        invocation.args['startDate'],
+        invocation.args['endDate']
+      )
+    );
     this.registerAction('clear', () => this.handleClear_());
-    this.registerAction('today',
-        this.todayAction_.bind(this, d => this.handleSetDate_(d)));
-    this.registerAction('startToday',
-        this.todayAction_.bind(this, d => this.handleSetDates_(d, null)));
-    this.registerAction('endToday',
-        this.todayAction_.bind(this, d => this.handleSetDates_(null, d)));
+    this.registerAction(
+      'today',
+      this.todayAction_.bind(this, d => this.handleSetDate_(d))
+    );
+    this.registerAction(
+      'startToday',
+      this.todayAction_.bind(this, d => this.handleSetDates_(d, null))
+    );
+    this.registerAction(
+      'endToday',
+      this.todayAction_.bind(this, d => this.handleSetDates_(null, d))
+    );
 
     return this.mutateElement(() => {
       // NOTE(cvializ): There is no standard date format for just the first
       // letter of the week-day. So we hack it in with this CSS class and don't
       // apply the CSS class if there is a week-day-format specified.
       this.element.classList.toggle(
-          DEFAULT_WEEK_DAY_FORMAT_CSS,
-          this.weekDayFormat_ == DEFAULT_WEEK_DAY_FORMAT);
+        DEFAULT_WEEK_DAY_FORMAT_CSS,
+        this.weekDayFormat_ == DEFAULT_WEEK_DAY_FORMAT
+      );
       this.element.classList.toggle(FULLSCREEN_CSS, this.fullscreen_);
       this.element.appendChild(this.container_);
       this.state_ = this.getInitialState_();
@@ -524,20 +547,22 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     // Make sure it's rendered and measured properly. Then if possible, attempt
     // to adjust expand the height to fit the element for static pickers.
-    return srcAttributesPromise.then(() => {
-      return this.render(this.state_);
-    }).then(() => {
-      if (this.mode_ == DatePickerMode.STATIC) {
-        this.measureElement(() => {
-          const scrollHeight = this.container_./*OK*/scrollHeight;
-          const height = this.element./*OK*/offsetHeight;
-          if (scrollHeight > height) {
-            // Add 1px to allow the bottom border to show
-            this./*OK*/changeHeight(scrollHeight + 1);
-          }
-        });
-      }
-    });
+    return srcAttributesPromise
+      .then(() => {
+        return this.render(this.state_);
+      })
+      .then(() => {
+        if (this.mode_ == DatePickerMode.STATIC) {
+          this.measureElement(() => {
+            const scrollHeight = this.container_./*OK*/ scrollHeight;
+            const height = this.element./*OK*/ offsetHeight;
+            if (scrollHeight > height) {
+              // Add 1px to allow the bottom border to show
+              this./*OK*/ changeHeight(scrollHeight + 1);
+            }
+          });
+        }
+      });
   }
 
   /** @override */
@@ -564,56 +589,66 @@ export class AmpDatePicker extends AMP.BaseElement {
     sm.addTransition(STATIC, STATIC, noop);
 
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_INPUT, () => {
-      this.setState_(dict({
-        'isOpen': true,
-        'isFocused': false,
-        'focused': false,
-      })).then(() => {
+      this.setState_(
+        dict({
+          'isOpen': true,
+          'isFocused': false,
+          'focused': false,
+        })
+      ).then(() => {
         this.triggerEvent_(DatePickerEvent.ACTIVATE);
       });
     });
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_OPEN_PICKER, () => {
-      this.setState_(dict({
-        'isOpen': true,
-        'isFocused': true,
-        'focused': true,
-      }));
+      this.setState_(
+        dict({
+          'isOpen': true,
+          'isFocused': true,
+          'focused': true,
+        })
+      );
     });
     sm.addTransition(OVERLAY_CLOSED, OVERLAY_CLOSED, noop);
 
-
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_OPEN_PICKER, () => {
-      this.setState_(dict({
-        'isOpen': true,
-        'isFocused': true,
-        'focused': true,
-      }));
+      this.setState_(
+        dict({
+          'isOpen': true,
+          'isFocused': true,
+          'focused': true,
+        })
+      );
     });
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_CLOSED, () => {
       this.updateDateFieldFocus_(null);
-      this.setState_(dict({
-        'isOpen': false,
-        'isFocused': false,
-        'focused': false,
-      }));
+      this.setState_(
+        dict({
+          'isOpen': false,
+          'isFocused': false,
+          'focused': false,
+        })
+      );
     });
     sm.addTransition(OVERLAY_OPEN_INPUT, OVERLAY_OPEN_INPUT, noop);
 
-
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_OPEN_PICKER, noop);
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_OPEN_INPUT, () => {
-      this.setState_(dict({
-        'isFocused': false,
-        'focused': false,
-      }));
+      this.setState_(
+        dict({
+          'isFocused': false,
+          'focused': false,
+        })
+      );
     });
     sm.addTransition(OVERLAY_OPEN_PICKER, OVERLAY_CLOSED, () => {
       this.updateDateFieldFocus_(null);
-      this.setState_(dict({
-        'isOpen': false,
-        'isFocused': false,
-        'focused': false,
-      }));
+      this.setState_(
+        dict({
+          'isOpen': false,
+          'isFocused': false,
+          'focused': false,
+        })
+      );
     });
 
     return sm;
@@ -691,7 +726,9 @@ export class AmpDatePicker extends AMP.BaseElement {
     if (startDate) {
       state['startDate'] = startDate;
       this.element.setAttribute(
-          'start-date', this.getFormattedDate_(startDate));
+        'start-date',
+        this.getFormattedDate_(startDate)
+      );
       this.updateDateField_(this.startDateField_, startDate);
     }
     if (endDate) {
@@ -733,7 +770,7 @@ export class AmpDatePicker extends AMP.BaseElement {
     if (!input) {
       return null;
     }
-    const isISO8601Duration = (input[0] == 'P');
+    const isISO8601Duration = input[0] == 'P';
 
     if (isISO8601Duration) {
       const duration = this.moment_.duration(input);
@@ -755,12 +792,14 @@ export class AmpDatePicker extends AMP.BaseElement {
     this.element.removeAttribute('start-date');
     this.element.removeAttribute('end-date');
 
-    this.setState_(dict({
-      'date': null,
-      'startDate': null,
-      'endDate': null,
-      'focusedInput': this.ReactDatesConstants_['START_DATE'],
-    }));
+    this.setState_(
+      dict({
+        'date': null,
+        'startDate': null,
+        'endDate': null,
+        'focusedInput': this.ReactDatesConstants_['START_DATE'],
+      })
+    );
     this.triggerEvent_(DatePickerEvent.SELECT, null);
 
     if (this.props_['reopenPickerOnClearDate']) {
@@ -770,7 +809,6 @@ export class AmpDatePicker extends AMP.BaseElement {
     }
   }
 
-
   /**
    * Get the initial value for properties that change during the lifetime of
    * the AMP element.
@@ -778,14 +816,17 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   getInitialState_() {
     const {element} = this;
-    const date = this.createOffsetMoment_(element.getAttribute('date') ||
-        (this.dateField_ && this.dateField_.value));
+    const date = this.createOffsetMoment_(
+      element.getAttribute('date') || (this.dateField_ && this.dateField_.value)
+    );
     const startDate = this.createOffsetMoment_(
-        element.getAttribute('start-date') ||
-        (this.startDateField_ && this.startDateField_.value));
+      element.getAttribute('start-date') ||
+        (this.startDateField_ && this.startDateField_.value)
+    );
     const endDate = this.createOffsetMoment_(
-        element.getAttribute('end-date') ||
-        (this.endDateField_ && this.endDateField_.value));
+      element.getAttribute('end-date') ||
+        (this.endDateField_ && this.endDateField_.value)
+    );
 
     if (date && this.dateField_) {
       this.dateField_.value = this.getFormattedDate_(date);
@@ -819,8 +860,12 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @param {!JsonObject} newState
    */
   setState_(newState) {
-    return this.render(/** @type {!JsonObject} */ (
-      Object.assign(/** @type {!Object} */ (this.state_), newState)));
+    return this.render(
+      /** @type {!JsonObject} */ (Object.assign(
+        /** @type {!Object} */ (this.state_),
+        newState
+      ))
+    );
   }
 
   /**
@@ -831,12 +876,15 @@ export class AmpDatePicker extends AMP.BaseElement {
   setupDateField_(type) {
     const input = Services.inputFor(this.win);
     const fieldSelector = this.element.getAttribute(`${type}-selector`);
-    const existingField = this.getAmpDoc().getRootNode().querySelector(
-        fieldSelector);
+    const existingField = this.getAmpDoc()
+      .getRootNode()
+      .querySelector(fieldSelector);
     if (existingField) {
-      if (!this.element.hasAttribute('touch-keyboard-editable') &&
+      if (
+        !this.element.hasAttribute('touch-keyboard-editable') &&
         this.mode_ == DatePickerMode.OVERLAY &&
-        input.isTouchDetected()) {
+        input.isTouchDetected()
+      ) {
         existingField.readOnly = true;
       }
       return existingField;
@@ -879,9 +927,10 @@ export class AmpDatePicker extends AMP.BaseElement {
     }
 
     user().error(
-        TAG,
-        'Multiple date-pickers with implicit %s fields need to have IDs',
-        name);
+      TAG,
+      'Multiple date-pickers with implicit %s fields need to have IDs',
+      name
+    );
     return '';
   }
 
@@ -925,9 +974,8 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   handleClick_(e) {
     const target = dev().assertElement(e.target);
-    const clickWasInDatePicker = (
-      this.container_.contains(target) || this.isDateField_(target)
-    );
+    const clickWasInDatePicker =
+      this.container_.contains(target) || this.isDateField_(target);
 
     if (!clickWasInDatePicker) {
       this.transitionTo_(DatePickerState.OVERLAY_CLOSED);
@@ -952,14 +1000,18 @@ export class AmpDatePicker extends AMP.BaseElement {
     if (this.isDateField_(target)) {
       if (target == this.startDateField_) {
         this.updateDateFieldFocus_(this.startDateField_);
-        this.setState_(dict({
-          'focusedInput': this.ReactDatesConstants_['START_DATE'],
-        }));
+        this.setState_(
+          dict({
+            'focusedInput': this.ReactDatesConstants_['START_DATE'],
+          })
+        );
       } else if (target == this.endDateField_) {
         this.updateDateFieldFocus_(this.endDateField_);
-        this.setState_(dict({
-          'focusedInput': this.ReactDatesConstants_['END_DATE'],
-        }));
+        this.setState_(
+          dict({
+            'focusedInput': this.ReactDatesConstants_['END_DATE'],
+          })
+        );
       } else if (target == this.dateField_) {
         this.updateDateFieldFocus_(this.dateField_);
       }
@@ -982,13 +1034,16 @@ export class AmpDatePicker extends AMP.BaseElement {
     }
 
     const property =
-        (target === this.dateField_ ? 'date' :
-          (target === this.startDateField_ ? 'startDate' :
-            (target === this.endDateField_ ? 'endDate' : '')));
+      target === this.dateField_
+        ? 'date'
+        : target === this.startDateField_
+        ? 'startDate'
+        : target === this.endDateField_
+        ? 'endDate'
+        : '';
     const moment = this.createMoment_(target.value);
-    const isValid = (moment &&
-        moment.isValid() &&
-        moment.year() > MIN_PICKER_YEAR);
+    const isValid =
+      moment && moment.isValid() && moment.year() > MIN_PICKER_YEAR;
     this.setState_(dict({[property]: isValid ? moment : null}));
   }
 
@@ -1013,9 +1068,11 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @private
    */
   handleDocumentKeydown_(e) {
-    if (e.key == Keys.ESCAPE &&
-        this.mode_ == DatePickerMode.OVERLAY &&
-        this.element.contains(this.document_.activeElement)) {
+    if (
+      e.key == Keys.ESCAPE &&
+      this.mode_ == DatePickerMode.OVERLAY &&
+      this.element.contains(this.document_.activeElement)
+    ) {
       this.transitionTo_(DatePickerState.OVERLAY_CLOSED);
     }
     return true;
@@ -1039,7 +1096,7 @@ export class AmpDatePicker extends AMP.BaseElement {
         this.triggerEvent_(DatePickerEvent.ACTIVATE);
         const toFocus = this.container_.querySelector('[tabindex="0"]');
         if (toFocus) {
-          this.mutateElement(() => toFocus./*OK*/focus());
+          this.mutateElement(() => toFocus./*OK*/ focus());
         }
       }
       e.preventDefault();
@@ -1060,7 +1117,8 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   listen_(element, eventType, listener, opt_evtListenerOpts) {
     this.unlisteners_.push(
-        listen(element, eventType, listener, opt_evtListenerOpts));
+      listen(element, eventType, listener, opt_evtListenerOpts)
+    );
   }
 
   /**
@@ -1079,19 +1137,19 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   setupTemplates_() {
     return this.fetchSrc_()
-        .then(json => this.parseSrcTemplates_(json))
-        .then(parsedTemplates => {
-          if (parsedTemplates) {
-            const {srcTemplates, srcDefaultTemplate} = parsedTemplates;
-            this.srcTemplates_ = srcTemplates;
-            this.srcDefaultTemplate_ = srcDefaultTemplate;
-          }
+      .then(json => this.parseSrcTemplates_(json))
+      .then(parsedTemplates => {
+        if (parsedTemplates) {
+          const {srcTemplates, srcDefaultTemplate} = parsedTemplates;
+          this.srcTemplates_ = srcTemplates;
+          this.srcDefaultTemplate_ = srcDefaultTemplate;
+        }
 
-          this.templatesReadyResolver_();
-        })
-        .catch(error => {
-          user().error(TAG, 'Failed fetching date src data', error);
-        });
+        this.templatesReadyResolver_();
+      })
+      .catch(error => {
+        user().error(TAG, 'Failed fetching date src data', error);
+      });
   }
 
   /**
@@ -1108,7 +1166,7 @@ export class AmpDatePicker extends AMP.BaseElement {
       // We should only set the value if the field is empty or absent.
       const shouldSetDate = !this.dateField_ || !this.dateField_.value;
       const shouldSetStartDate =
-          !this.startDateField_ || !this.startDateField_.value;
+        !this.startDateField_ || !this.startDateField_.value;
       const shouldSetEndDate = !this.endDateField_ || !this.endDateField_.value;
 
       const date = shouldSetDate ? json['date'] : null;
@@ -1140,9 +1198,9 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @private
    */
   fetchSrc_() {
-    return this.element.getAttribute('src') ?
-      batchFetchJsonFor(this.getAmpDoc(), this.element) :
-      Promise.resolve();
+    return this.element.getAttribute('src')
+      ? batchFetchJsonFor(this.getAmpDoc(), this.element)
+      : Promise.resolve();
   }
 
   /**
@@ -1158,16 +1216,17 @@ export class AmpDatePicker extends AMP.BaseElement {
     }
     const ampdoc = this.getAmpDoc();
     const srcTemplates = templates
-        .filter(t => t.dates)
-        .map(t => ({
-          dates: new DatesList(t.dates),
-          template: ampdoc.getRootNode().querySelector(
-              `#${escapeCssSelectorIdent(t.id)}[date-template]`),
-        }));
+      .filter(t => t.dates)
+      .map(t => ({
+        dates: new DatesList(t.dates),
+        template: ampdoc
+          .getRootNode()
+          .querySelector(`#${escapeCssSelectorIdent(t.id)}[date-template]`),
+      }));
 
     const srcDefaultTemplate = templates
-        .filter(t => t.dates == null)
-        .map(t => ampdoc.getElementById(t.id))[0];
+      .filter(t => t.dates == null)
+      .map(t => ampdoc.getElementById(t.id))[0];
 
     return {
       srcTemplates,
@@ -1202,8 +1261,9 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   parseElementTemplates_(templates) {
     const parsed = [];
-    iterateCursor(templates,
-        template => parsed.push(this.parseElementTemplate_(template)));
+    iterateCursor(templates, template =>
+      parsed.push(this.parseElementTemplate_(template))
+    );
     return parsed;
   }
 
@@ -1259,8 +1319,9 @@ export class AmpDatePicker extends AMP.BaseElement {
   onDatesChange(param) {
     const startDate = param['startDate'];
     const endDate = param['endDate'];
-    const isFinalSelection = (!this.props_['keepOpenOnDateSelect'] &&
-        this.state_['focusedInput'] != this.ReactDatesConstants_['END_DATE']);
+    const isFinalSelection =
+      !this.props_['keepOpenOnDateSelect'] &&
+      this.state_['focusedInput'] != this.ReactDatesConstants_['END_DATE'];
 
     if (this.isBlockedRange_(startDate, endDate)) {
       return;
@@ -1268,19 +1329,19 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     const selectData = this.getSelectData_(startDate, endDate);
     this.triggerEvent_(DatePickerEvent.SELECT, selectData);
-    this.setState_(dict({
-      'startDate': startDate,
-      'endDate': endDate,
-      'isFocused': this.mode_ == DatePickerMode.STATIC || !isFinalSelection,
-    }));
+    this.setState_(
+      dict({
+        'startDate': startDate,
+        'endDate': endDate,
+        'isFocused': this.mode_ == DatePickerMode.STATIC || !isFinalSelection,
+      })
+    );
     this.updateDateField_(this.startDateField_, startDate);
     this.element.setAttribute('start-date', this.getFormattedDate_(startDate));
     this.updateDateField_(this.endDateField_, endDate);
     this.element.setAttribute('end-date', this.getFormattedDate_(endDate));
 
-    if (isFinalSelection &&
-        startDate &&
-        endDate) {
+    if (isFinalSelection && startDate && endDate) {
       this.transitionTo_(DatePickerState.OVERLAY_CLOSED);
       this.triggerEvent_(DatePickerEvent.DEACTIVATE);
     }
@@ -1310,9 +1371,11 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     // If allow-blocked-end-date is enabled, we do not consider the range
     // blocked when the end date is the only blocked date.
-    if (blockedCount == 1 &&
-        this.allowBlockedEndDate_ &&
-        isSameDay(endDate, this.blocked_.firstDateAfter(startDate))) {
+    if (
+      blockedCount == 1 &&
+      this.allowBlockedEndDate_ &&
+      isSameDay(endDate, this.blocked_.firstDateAfter(startDate))
+    ) {
       return false;
     }
 
@@ -1348,16 +1411,21 @@ export class AmpDatePicker extends AMP.BaseElement {
     const START_DATE = this.ReactDatesConstants_['START_DATE'];
     const END_DATE = this.ReactDatesConstants_['END_DATE'];
     const focusedField =
-      (focusedInput === START_DATE ? this.startDateField_ :
-        (focusedInput === END_DATE ? this.endDateField_ : this.dateField_));
+      focusedInput === START_DATE
+        ? this.startDateField_
+        : focusedInput === END_DATE
+        ? this.endDateField_
+        : this.dateField_;
     this.updateDateFieldFocus_(focusedField, this.state_['isOpen']);
 
-    this.setState_(dict({
-      'focusedInput': !focusedInput ?
-        this.ReactDatesConstants_['START_DATE'] :
-        focusedInput,
-      'focused': this.mode_ == DatePickerMode.STATIC,
-    }));
+    this.setState_(
+      dict({
+        'focusedInput': !focusedInput
+          ? this.ReactDatesConstants_['START_DATE']
+          : focusedInput,
+        'focused': this.mode_ == DatePickerMode.STATIC,
+      })
+    );
   }
 
   /**
@@ -1402,8 +1470,9 @@ export class AmpDatePicker extends AMP.BaseElement {
     if (this.type_ == DatePickerType.SINGLE) {
       return this.getBindDate_(dateOrStartDate);
     } else if (this.type_ == DatePickerType.RANGE) {
-      return dateOrStartDate ?
-        this.getBindDates_(dateOrStartDate, endDate) : null;
+      return dateOrStartDate
+        ? this.getBindDates_(dateOrStartDate, endDate)
+        : null;
     } else {
       dev().error(TAG, 'Invalid date picker type');
       return null;
@@ -1433,9 +1502,10 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   updateDateField_(field, date) {
     if (field) {
-      field.value = (field.type == 'date' ?
-        this.getFormattedDate_(date, DEFAULT_FORMAT, DEFAULT_LOCALE) :
-        this.getFormattedDate_(date));
+      field.value =
+        field.type == 'date'
+          ? this.getFormattedDate_(date, DEFAULT_FORMAT, DEFAULT_LOCALE)
+          : this.getFormattedDate_(date);
     }
   }
 
@@ -1463,7 +1533,9 @@ export class AmpDatePicker extends AMP.BaseElement {
 
     const template = this.getDayTemplate_(date);
     const details = new BindDateDetails(
-        this.getFormattedDate_(date), template && template.id);
+      this.getFormattedDate_(date),
+      template && template.id
+    );
     return details;
   }
 
@@ -1521,9 +1593,13 @@ export class AmpDatePicker extends AMP.BaseElement {
     }
     const format = opt_format || this.format_;
     const isUnixTimestamp = format.match(/[Xx]/);
-    const locale =
-        isUnixTimestamp ? DEFAULT_LOCALE : (opt_locale || this.locale_);
-    return date.clone().locale(locale).format(format);
+    const locale = isUnixTimestamp
+      ? DEFAULT_LOCALE
+      : opt_locale || this.locale_;
+    return date
+      .clone()
+      .locale(locale)
+      .format(format);
   }
 
   /**
@@ -1537,10 +1613,13 @@ export class AmpDatePicker extends AMP.BaseElement {
       return cachedDay;
     }
 
-    const templatePromise =
-        this.templatesReadyPromise_.then(() => this.renderDayTemplate_(date));
+    const templatePromise = this.templatesReadyPromise_.then(() =>
+      this.renderDayTemplate_(date)
+    );
     const rendered = this.renderPromiseIntoReact_(
-        templatePromise, date.format('D'));
+      templatePromise,
+      date.format('D')
+    );
 
     this.renderedTemplates_[key] = rendered;
     return rendered;
@@ -1615,11 +1694,10 @@ export class AmpDatePicker extends AMP.BaseElement {
   renderInfoTemplate_() {
     const template = this.element.querySelector('[info-template]');
     if (template) {
-      return this.renderTemplateElement_(template)
-          .then(element => {
-            element.classList.add(INFO_TEMPLATE_AREA_CSS);
-            return this.getRenderedTemplateString_(element);
-          });
+      return this.renderTemplateElement_(template).then(element => {
+        element.classList.add(INFO_TEMPLATE_AREA_CSS);
+        return this.getRenderedTemplateString_(element);
+      });
     } else {
       return Promise.resolve('');
     }
@@ -1650,8 +1728,9 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   renderTemplate_(template, opt_data, opt_fallback = '') {
     if (template) {
-      return this.renderTemplateElement_(template, opt_data)
-          .then(rendered => this.getRenderedTemplateString_(rendered));
+      return this.renderTemplateElement_(template, opt_data).then(rendered =>
+        this.getRenderedTemplateString_(rendered)
+      );
     } else {
       return Promise.resolve(opt_fallback);
     }
@@ -1664,7 +1743,7 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @private
    */
   getRenderedTemplateString_(rendered) {
-    return rendered./*OK*/outerHTML;
+    return rendered./*OK*/ outerHTML;
   }
 
   /**
@@ -1698,11 +1777,12 @@ export class AmpDatePicker extends AMP.BaseElement {
    */
   renderPromiseIntoReact_(promise, opt_initial) {
     if (!this.templateThen_) {
-      this.templateThen_ = html => this.react_.createElement('div', {
-        // This should be safe because this HTML is rendered through
-        // amp-mustache and is sanitized.
-        dangerouslySetInnerHTML: {__html: html},
-      });
+      this.templateThen_ = html =>
+        this.react_.createElement('div', {
+          // This should be safe because this HTML is rendered through
+          // amp-mustache and is sanitized.
+          dangerouslySetInnerHTML: {__html: html},
+        });
     }
 
     return this.react_.createElement(createDeferred(), {
@@ -1726,10 +1806,11 @@ export class AmpDatePicker extends AMP.BaseElement {
       });
     } else {
       const renderedEvent = createCustomEvent(
-          this.win,
-          AmpEvents.DOM_UPDATE,
-          /* detail */ null,
-          {bubbles: true});
+        this.win,
+        AmpEvents.DOM_UPDATE,
+        /* detail */ null,
+        {bubbles: true}
+      );
       this.element.dispatchEvent(renderedEvent);
     }
   }
@@ -1745,17 +1826,19 @@ export class AmpDatePicker extends AMP.BaseElement {
       // Check to see if the publisher has fixed the bug by updating the height
       const {minHeight} = computedStyle(this.win, container);
       if (minHeight === DEFAULT_TRANSITION_CONTAINER_MIN_HEIGHT) {
-        user().warn(TAG,
-            '%s\n The "day-size" attribute is changed from the default value '
-            + '%s. You must specify a new "min-height" `for the %s element in '
-            + 'your AMP CSS.\n This is necessary due to a bug in the '
-            + 'date-picker library. When the bug is fixed, the %s CSS class '
-            + 'will be removed. '
-            + 'See https://github.com/ampproject/amphtml/issues/13897',
-            this.element,
-            DEFAULT_DAY_SIZE,
-            TRANSITION_CONTAINER_SELECTOR,
-            RESIZE_BUG_CSS);
+        user().warn(
+          TAG,
+          '%s\n The "day-size" attribute is changed from the default value ' +
+            '%s. You must specify a new "min-height" `for the %s element in ' +
+            'your AMP CSS.\n This is necessary due to a bug in the ' +
+            'date-picker library. When the bug is fixed, the %s CSS class ' +
+            'will be removed. ' +
+            'See https://github.com/ampproject/amphtml/issues/13897',
+          this.element,
+          DEFAULT_DAY_SIZE,
+          TRANSITION_CONTAINER_SELECTOR,
+          RESIZE_BUG_CSS
+        );
       }
     }
   }
@@ -1766,8 +1849,11 @@ export class AmpDatePicker extends AMP.BaseElement {
    * @return {!Promise}
    */
   render(opt_additionalProps) {
-    const props = /** @type {!JsonObject} */ (
-      Object.assign({}, this.props_, opt_additionalProps));
+    const props = /** @type {!JsonObject} */ (Object.assign(
+      {},
+      this.props_,
+      opt_additionalProps
+    ));
     const shouldBeOpen = props['isOpen'] || this.mode_ == DatePickerMode.STATIC;
     const Picker = shouldBeOpen ? this.pickerClass_ : null;
 
@@ -1779,45 +1865,55 @@ export class AmpDatePicker extends AMP.BaseElement {
         // the picker expands 1 behind where it should for the number of weeks
         // in the month.
         this.reactRender_(
-            this.react_.createElement(Picker, Object.assign({}, dict({
-              'allowBlockedEndDate': this.allowBlockedEndDate_,
-              'min': props['min'],
-              'max': props['max'],
-              'date': props['date'],
-              'startDate': props['startDate'],
-              'endDate': props['endDate'],
-              'isRTL': this.isRTL_,
-              'onDateChange': this.onDateChange,
-              'onDatesChange': this.onDatesChange,
-              'onFocusChange': this.onFocusChange,
-              'onMount': this.onMount,
-              'renderDay': this.renderDay,
-              'blocked': this.blocked_,
-              'highlighted': this.highlighted_,
-              'firstDayOfWeek': this.firstDayOfWeek_,
-              'daySize': this.daySize_,
-              'weekDayFormat': this.weekDayFormat_,
-              'isFocused': props['isFocused'], // should automatically focus
-              'focused': props['focused'],
-            }), props)),
-            this.container_);
+          this.react_.createElement(
+            Picker,
+            Object.assign(
+              {},
+              dict({
+                'allowBlockedEndDate': this.allowBlockedEndDate_,
+                'min': props['min'],
+                'max': props['max'],
+                'date': props['date'],
+                'startDate': props['startDate'],
+                'endDate': props['endDate'],
+                'isRTL': this.isRTL_,
+                'onDateChange': this.onDateChange,
+                'onDatesChange': this.onDatesChange,
+                'onFocusChange': this.onFocusChange,
+                'onMount': this.onMount,
+                'renderDay': this.renderDay,
+                'blocked': this.blocked_,
+                'highlighted': this.highlighted_,
+                'firstDayOfWeek': this.firstDayOfWeek_,
+                'daySize': this.daySize_,
+                'weekDayFormat': this.weekDayFormat_,
+                'isFocused': props['isFocused'], // should automatically focus
+                'focused': props['focused'],
+              }),
+              props
+            )
+          ),
+          this.container_
+        );
       } else {
         this.reactRender_(null, this.container_);
       }
     }).then(() => {
       this.measureElement(() => {
-        const transitionContainer =
-            scopedQuerySelector(this.element, TRANSITION_CONTAINER_SELECTOR);
+        const transitionContainer = scopedQuerySelector(
+          this.element,
+          TRANSITION_CONTAINER_SELECTOR
+        );
         if (transitionContainer) {
           this.warnDaySizeOnce_(transitionContainer);
         }
 
         if (this.mode_ === DatePickerMode.STATIC) {
-          const scrollHeight = this.container_./*OK*/scrollHeight;
-          const height = this.element./*OK*/offsetHeight;
+          const scrollHeight = this.container_./*OK*/ scrollHeight;
+          const height = this.element./*OK*/ offsetHeight;
           if (scrollHeight > height) {
             // Add 1px to allow the bottom border to show
-            this./*OK*/changeHeight(scrollHeight + 1);
+            this./*OK*/ changeHeight(scrollHeight + 1);
           }
         }
       });
diff --git a/extensions/amp-date-picker/0.1/date-picker-common.js b/extensions/amp-date-picker/0.1/date-picker-common.js
index e90e42b195f0..f54e2e35cb37 100644
--- a/extensions/amp-date-picker/0.1/date-picker-common.js
+++ b/extensions/amp-date-picker/0.1/date-picker-common.js
@@ -17,7 +17,6 @@
 import {dict, omit} from '../../../src/utils/object';
 import {requireExternal} from '../../../src/module';
 
-
 /**
  * A higher-order component that wraps a specific date-picker implmentation
  * with common functionality.
@@ -57,8 +56,9 @@ export function withDatePickerCommon(WrappedComponent) {
    * @return {boolean}
    */
   function isInclusivelyBetween(date, min, max) {
-    return isInclusivelyAfterDay(date, min) &&
-        isInclusivelyBeforeDay(date, max);
+    return (
+      isInclusivelyAfterDay(date, min) && isInclusivelyBeforeDay(date, max)
+    );
   }
 
   /**
@@ -144,8 +144,13 @@ export function withDatePickerCommon(WrappedComponent) {
       const min = props['min'];
       const startDate = props['startDate'];
 
-      this.isDayBlocked = isDayBlocked.bind(null,
-          blocked, startDate, endDate, allowBlockedEndDate);
+      this.isDayBlocked = isDayBlocked.bind(
+        null,
+        blocked,
+        startDate,
+        endDate,
+        allowBlockedEndDate
+      );
       this.isDayHighlighted = datesListContains.bind(null, highlighted);
       this.isOutsideRange = isOutsideRange.bind(null, min, max);
     }
@@ -171,12 +176,19 @@ export function withDatePickerCommon(WrappedComponent) {
         this.isOutsideRange = isOutsideRange.bind(null, min, max);
       }
 
-      if (blocked != this.props['blocked'] ||
+      if (
+        blocked != this.props['blocked'] ||
         allowBlockedEndDate != this.props['allowBlockedEndDate'] ||
         startDate != this.props['startDate'] ||
-        endDate != this.props['endDate']) {
-        this.isDayBlocked = isDayBlocked.bind(null,
-            blocked, startDate, endDate, allowBlockedEndDate);
+        endDate != this.props['endDate']
+      ) {
+        this.isDayBlocked = isDayBlocked.bind(
+          null,
+          blocked,
+          startDate,
+          endDate,
+          allowBlockedEndDate
+        );
       }
 
       if (highlighted != this.props['highlighted']) {
@@ -186,8 +198,10 @@ export function withDatePickerCommon(WrappedComponent) {
 
     /** @override */
     render() {
-      const props = /** @type {!JsonObject} */ (
-        omit(this.props, Object.keys(defaultProps)));
+      const props = /** @type {!JsonObject} */ (omit(
+        this.props,
+        Object.keys(defaultProps)
+      ));
 
       const date = props['date'];
       const daySize = props['daySize'];
@@ -196,16 +210,22 @@ export function withDatePickerCommon(WrappedComponent) {
       const startDate = props['startDate'];
 
       const initialDate =
-          initialVisibleMonth || date || startDate || endDate || undefined;
+        initialVisibleMonth || date || startDate || endDate || undefined;
       props['initialVisibleMonth'] = () => moment(initialDate);
 
-      return React.createElement(WrappedComponent, Object.assign({}, props,
+      return React.createElement(
+        WrappedComponent,
+        Object.assign(
+          {},
+          props,
           dict({
             'daySize': Number(daySize),
             'isDayBlocked': this.isDayBlocked,
             'isDayHighlighted': this.isDayHighlighted,
             'isOutsideRange': this.isOutsideRange,
-          })));
+          })
+        )
+      );
     }
   }
 
diff --git a/extensions/amp-date-picker/0.1/date-range-picker.js b/extensions/amp-date-picker/0.1/date-range-picker.js
index 37afaf118ac9..0ed247818f93 100644
--- a/extensions/amp-date-picker/0.1/date-range-picker.js
+++ b/extensions/amp-date-picker/0.1/date-range-picker.js
@@ -25,12 +25,14 @@ import {wrap as withMaximumNights} from './wrappers/maximum-nights';
  * @return {function(new:React.Component, !JsonObject)} A date range picker component class
  */
 function createDateRangePickerBase() {
-  const constants = /** @type {JsonObject} */ (
-    requireExternal('react-dates/constants'));
+  const constants = /** @type {JsonObject} */ (requireExternal(
+    'react-dates/constants'
+  ));
   const DAY_SIZE = constants['DAY_SIZE'];
   const HORIZONTAL_ORIENTATION = constants['HORIZONTAL_ORIENTATION'];
-  const DayPickerRangeController = /** @type {function(new: React.Component, !JsonObject)} */ (
-    requireExternal('react-dates')['DayPickerRangeController']);
+  const DayPickerRangeController = /** @type {function(new: React.Component, !JsonObject)} */ (requireExternal(
+    'react-dates'
+  )['DayPickerRangeController']);
 
   const defaultProps = dict({
     'startDate': null, // TODO: use null
@@ -84,8 +86,9 @@ function createDateRangePickerBase() {
     'isRTL': false,
   });
 
-  const WrappedDayPickerRangeController =
-      withDatePickerCommon(withMaximumNights(DayPickerRangeController));
+  const WrappedDayPickerRangeController = withDatePickerCommon(
+    withMaximumNights(DayPickerRangeController)
+  );
   WrappedDayPickerRangeController['defaultProps'] = defaultProps;
 
   return WrappedDayPickerRangeController;
diff --git a/extensions/amp-date-picker/0.1/dates-list.js b/extensions/amp-date-picker/0.1/dates-list.js
index 5eac306ed262..3b382ca1950e 100644
--- a/extensions/amp-date-picker/0.1/dates-list.js
+++ b/extensions/amp-date-picker/0.1/dates-list.js
@@ -17,7 +17,6 @@
 import {requireExternal} from '../../../src/module';
 import RRule from '../../../third_party/rrule/rrule';
 
-
 /** @enum {string} */
 const DateType = {
   INVALID: 'invalid',
@@ -33,24 +32,24 @@ export class DatesList {
    * @param {!Array<string>} dates
    */
   constructor(dates) {
-
     /** @private @const */
-    this.ReactDates_ = /** @type {!JsonObject} */ (
-      requireExternal('react-dates'));
+    this.ReactDates_ = /** @type {!JsonObject} */ (requireExternal(
+      'react-dates'
+    ));
 
     /** @private @const */
     this.moment_ = requireExternal('moment');
 
     /** @private @const */
     this.rrulestrs_ = dates
-        .filter(d => this.getDateType_(d) === DateType.RRULE)
-        .map(d => tryParseRrulestr(d));
+      .filter(d => this.getDateType_(d) === DateType.RRULE)
+      .map(d => tryParseRrulestr(d));
 
     /** @private @const */
     this.dates_ = dates
-        .filter(d => this.getDateType_(d) == DateType.DATE)
-        .map(d => this.moment_(d))
-        .sort((a, b) => a.toDate() - b.toDate());
+      .filter(d => this.getDateType_(d) == DateType.DATE)
+      .map(d => this.moment_(d))
+      .sort((a, b) => a.toDate() - b.toDate());
   }
 
   /**
@@ -80,8 +79,8 @@ export class DatesList {
       }
     }
     const rruleDates = this.rrulestrs_
-        .map(rrule => rrule.after(m.toDate()))
-        .filter(Boolean);
+      .map(rrule => rrule.after(m.toDate()))
+      .filter(Boolean);
     firstDatesAfter.concat(rruleDates);
 
     return firstDatesAfter.sort((a, b) => a.toDate() - b.toDate())[0];
@@ -104,7 +103,11 @@ export class DatesList {
    * @private
    */
   matchesRrule_(date) {
-    const nextDate = date.clone().startOf('day').add(1, 'day').toDate();
+    const nextDate = date
+      .clone()
+      .startOf('day')
+      .add(1, 'day')
+      .toDate();
     return this.rrulestrs_.some(rrule => {
       const rruleDay = this.moment_(rrule.before(nextDate));
       return this.ReactDates_['isSameDay'](rruleDay, date);
diff --git a/extensions/amp-date-picker/0.1/defaultPhrases.js b/extensions/amp-date-picker/0.1/defaultPhrases.js
index 12cdc729e640..7829a62f37e1 100644
--- a/extensions/amp-date-picker/0.1/defaultPhrases.js
+++ b/extensions/amp-date-picker/0.1/defaultPhrases.js
@@ -32,7 +32,7 @@ const escape = 'Escape key';
 const questionMark = 'Question mark';
 const selectFocusedDate = 'Select the date in focus.';
 const moveFocusByOneDay =
-    'Move backward (left) and forward (right) by one day.';
+  'Move backward (left) and forward (right) by one day.';
 const moveFocusByOneWeek = 'Move backward (up) and forward (down) by one week.';
 const moveFocusByOneMonth = 'Switch months.';
 const moveFocustoStartAndEndOfWeek = 'Go to the first or last day of a week.';
diff --git a/extensions/amp-date-picker/0.1/react-utils.js b/extensions/amp-date-picker/0.1/react-utils.js
index 3a47887eb1db..581e08c89510 100644
--- a/extensions/amp-date-picker/0.1/react-utils.js
+++ b/extensions/amp-date-picker/0.1/react-utils.js
@@ -16,7 +16,6 @@
 
 import {requireExternal} from '../../../src/module';
 
-
 /**
  * Create a React component that can render Promises.
  * Note: The nested class cannot be named Deferred, since src/promise.js already
@@ -45,8 +44,9 @@ function createDeferred_() {
 
     /** @override */
     shouldComponentUpdate(props, state) {
-      return shallowDiffers(this.props, props) ||
-          shallowDiffers(this.state, state);
+      return (
+        shallowDiffers(this.props, props) || shallowDiffers(this.state, state)
+      );
     }
 
     /** @override */
@@ -101,4 +101,3 @@ export function createDeferred() {
   }
   return DeferredType_;
 }
-
diff --git a/extensions/amp-date-picker/0.1/single-date-picker.js b/extensions/amp-date-picker/0.1/single-date-picker.js
index 65f372b7fce9..fe65701551c1 100644
--- a/extensions/amp-date-picker/0.1/single-date-picker.js
+++ b/extensions/amp-date-picker/0.1/single-date-picker.js
@@ -19,19 +19,20 @@ import {dict} from '../../../src/utils/object';
 import {requireExternal} from '../../../src/module';
 import {withDatePickerCommon} from './date-picker-common';
 
-
 /**
  * Create a SingleDatePicker React component
  * @return {function(new:React.Component, !JsonObject)} A single date picker component class
  */
 function createSingleDatePickerBase() {
-  const constants = /** @type {!JsonObject} */ (
-    requireExternal('react-dates/constants'));
+  const constants = /** @type {!JsonObject} */ (requireExternal(
+    'react-dates/constants'
+  ));
 
   const DAY_SIZE = constants['DAY_SIZE'];
   const HORIZONTAL_ORIENTATION = constants['HORIZONTAL_ORIENTATION'];
-  const DayPickerSingleDateController = /** @type {function(new: React.Component, !JsonObject)} */ (
-    requireExternal('react-dates')['DayPickerSingleDateController']);
+  const DayPickerSingleDateController = /** @type {function(new: React.Component, !JsonObject)} */ (requireExternal(
+    'react-dates'
+  )['DayPickerSingleDateController']);
 
   const defaultProps = dict({
     'date': null,
@@ -83,8 +84,9 @@ function createSingleDatePickerBase() {
     'isRTL': false,
   });
 
-  const WrappedDayPickerSingleDateController =
-      withFocusedTrueHack(withDatePickerCommon(DayPickerSingleDateController));
+  const WrappedDayPickerSingleDateController = withFocusedTrueHack(
+    withDatePickerCommon(DayPickerSingleDateController)
+  );
   WrappedDayPickerSingleDateController.defaultProps = defaultProps;
 
   return WrappedDayPickerSingleDateController;
diff --git a/extensions/amp-date-picker/0.1/test-e2e/test-blocked-dates.js b/extensions/amp-date-picker/0.1/test-e2e/test-blocked-dates.js
index aab2077c4155..2d73fbcf16f8 100644
--- a/extensions/amp-date-picker/0.1/test-e2e/test-blocked-dates.js
+++ b/extensions/amp-date-picker/0.1/test-e2e/test-blocked-dates.js
@@ -14,94 +14,107 @@
  * limitations under the License.
  */
 
-import {Key} from
-  '../../../../build-system/tasks/e2e/functional-test-controller';
-
-describes.endtoend('amp-date-picker', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-date-picker/blocked-dates.html',
-  environments: ['single', 'viewer-demo'],
-}, async env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  function selectDate(controller, id, date) {
-    const day = date.getDate();
-    const selector =
+import {Key} from '../../../../build-system/tasks/e2e/functional-test-controller';
+
+describes.endtoend(
+  'amp-date-picker',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-date-picker/blocked-dates.html',
+    environments: ['single', 'viewer-demo'],
+  },
+  async env => {
+    let controller;
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    function selectDate(controller, id, date) {
+      const day = date.getDate();
+      const selector =
         `//amp-date-picker[@id="${id}"]` +
         '//td[not(contains(@class,"CalendarDay__blocked_out_of_range"))]' +
         `[button/div[normalize-space(text())="${day}"]]`;
-    return controller.findElementXPath(selector);
-  }
-
-  describe('with allow-blocked-end-date', () => {
-    const ID = 'allow-blocked';
-    it('should be able to select an available date', async() => {
-      const today = new Date();
-      const tomorrow = new Date(new Date().setDate(today.getDate() + 1));
-      const todayCell = await selectDate(controller, ID, today);
-
-      await controller.click(todayCell);
-      await expect(controller.getElementAttribute(todayCell, 'class'))
-          .to.contain('CalendarDay__selected_start');
-
-      // This command selects the date one day after the start since the
-      // initial focused cell is the date after the start date.
-      await controller.type(null, Key.Enter);
-
-      const endCell = await controller.findElement(
-          '.CalendarDay__selected_end');
-      await expect(controller.getElementText(endCell))
-          .to.equal(String(tomorrow.getDate()));
+      return controller.findElementXPath(selector);
+    }
+
+    describe('with allow-blocked-end-date', () => {
+      const ID = 'allow-blocked';
+      it('should be able to select an available date', async () => {
+        const today = new Date();
+        const tomorrow = new Date(new Date().setDate(today.getDate() + 1));
+        const todayCell = await selectDate(controller, ID, today);
+
+        await controller.click(todayCell);
+        await expect(
+          controller.getElementAttribute(todayCell, 'class')
+        ).to.contain('CalendarDay__selected_start');
+
+        // This command selects the date one day after the start since the
+        // initial focused cell is the date after the start date.
+        await controller.type(null, Key.Enter);
+
+        const endCell = await controller.findElement(
+          '.CalendarDay__selected_end'
+        );
+        await expect(controller.getElementText(endCell)).to.equal(
+          String(tomorrow.getDate())
+        );
+      });
+
+      it('should be able to select the first blocked date', async () => {
+        const today = new Date();
+        const nextWeek = new Date(new Date().setDate(today.getDate() + 7));
+        const todayCell = await selectDate(controller, ID, today);
+        const nextWeekCell = await selectDate(controller, ID, nextWeek);
+
+        await controller.click(todayCell);
+        await expect(
+          controller.getElementAttribute(todayCell, 'class')
+        ).to.contain('CalendarDay__selected_start');
+
+        // This sequence of commands selects the date one week after the start
+        // date since the initial focused cell is the date after the start date.
+        await controller.type(null, Key.ArrowLeft);
+        await controller.type(null, Key.ArrowDown);
+        await controller.type(null, Key.Enter);
+
+        await expect(
+          controller.getElementAttribute(nextWeekCell, 'class')
+        ).to.contain('CalendarDay__selected_end');
+        await expect(controller.getElementText(nextWeekCell)).to.equal(
+          String(nextWeek.getDate())
+        );
+      });
     });
 
-    it('should be able to select the first blocked date', async() => {
-      const today = new Date();
-      const nextWeek = new Date(new Date().setDate(today.getDate() + 7));
-      const todayCell = await selectDate(controller, ID, today);
-      const nextWeekCell = await selectDate(controller, ID, nextWeek);
-
-      await controller.click(todayCell);
-      await expect(controller.getElementAttribute(todayCell, 'class'))
-          .to.contain('CalendarDay__selected_start');
-
-      // This sequence of commands selects the date one week after the start
-      // date since the initial focused cell is the date after the start date.
-      await controller.type(null, Key.ArrowLeft);
-      await controller.type(null, Key.ArrowDown);
-      await controller.type(null, Key.Enter);
-
-      await expect(controller.getElementAttribute(nextWeekCell, 'class'))
-          .to.contain('CalendarDay__selected_end');
-      await expect(controller.getElementText(nextWeekCell))
-          .to.equal(String(nextWeek.getDate()));
-    });
-  });
-
-  describe('without allow-blocked-end-date', () => {
-    const ID = 'disallow-blocked';
-    it('should NOT be able to select the first blocked date', async() => {
-      const today = new Date();
-      const nextWeek = new Date(new Date().setDate(today.getDate() + 7));
-      const todayCell = await selectDate(controller, ID, today);
-      const nextWeekCell = await selectDate(controller, ID, nextWeek);
-
-      await controller.click(todayCell);
-      await expect(controller.getElementAttribute(todayCell, 'class'))
-          .to.contain('CalendarDay__selected_start');
-
-      // This sequence of commands selects a date one week after the start date
-      // since the initial focused cell is the date after the start date.
-      await controller.type(null, Key.ArrowLeft);
-      await controller.type(null, Key.ArrowDown);
-      await controller.type(null, Key.Enter);
-
-      await expect(controller.getElementAttribute(nextWeekCell, 'class'))
-          .to.not.contain('CalendarDay__selected_end');
-      await expect(controller.getElementText(nextWeekCell))
-          .to.equal(String(nextWeek.getDate()));
+    describe('without allow-blocked-end-date', () => {
+      const ID = 'disallow-blocked';
+      it('should NOT be able to select the first blocked date', async () => {
+        const today = new Date();
+        const nextWeek = new Date(new Date().setDate(today.getDate() + 7));
+        const todayCell = await selectDate(controller, ID, today);
+        const nextWeekCell = await selectDate(controller, ID, nextWeek);
+
+        await controller.click(todayCell);
+        await expect(
+          controller.getElementAttribute(todayCell, 'class')
+        ).to.contain('CalendarDay__selected_start');
+
+        // This sequence of commands selects a date one week after the start date
+        // since the initial focused cell is the date after the start date.
+        await controller.type(null, Key.ArrowLeft);
+        await controller.type(null, Key.ArrowDown);
+        await controller.type(null, Key.Enter);
+
+        await expect(
+          controller.getElementAttribute(nextWeekCell, 'class')
+        ).to.not.contain('CalendarDay__selected_end');
+        await expect(controller.getElementText(nextWeekCell)).to.equal(
+          String(nextWeek.getDate())
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js
index 17f7d2b5f1e0..c1309f3a94c6 100644
--- a/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js
+++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-amp-date-picker-actions.js
@@ -17,7 +17,10 @@
 import * as lolex from 'lolex';
 import {poll} from '../../../../../testing/iframe';
 
-const config = describe.configure().ifChrome().skipSinglePass();
+const config = describe
+  .configure()
+  .ifChrome()
+  .skipSinglePass();
 config.skip('amp-date-picker', function() {
   this.timeout(10000);
 
@@ -37,37 +40,41 @@ config.skip('amp-date-picker', function() {
     <button id="clear" on="tap:picker.clear">Clear</button>
   `;
 
-  describes.integration('picker.clear', {
-    body: singlePickerWithDateBody + clearButtonBody,
-    extensions,
-    experiments,
-  }, env => {
-    let clock;
-    let win;
-    let document;
-
-    beforeEach(() => {
-      win = env.win;
-      document = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
+  describes.integration(
+    'picker.clear',
+    {
+      body: singlePickerWithDateBody + clearButtonBody,
+      extensions,
+      experiments,
+    },
+    env => {
+      let clock;
+      let win;
+      let document;
+
+      beforeEach(() => {
+        win = env.win;
+        document = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
       });
-    });
 
-    afterEach(() => {
-      clock.uninstall();
-    });
+      afterEach(() => {
+        clock.uninstall();
+      });
 
-    it('clears the current day', () => {
-      const picker = document.getElementById('picker');
-      const clear = document.getElementById('clear');
+      it('clears the current day', () => {
+        const picker = document.getElementById('picker');
+        const clear = document.getElementById('clear');
 
-      const promise = waitForFalsyAttribute(picker, 'date');
-      clear.click();
-      return promise;
-    });
-  });
+        const promise = waitForFalsyAttribute(picker, 'date');
+        clear.click();
+        return promise;
+      });
+    }
+  );
 
   const singlePickerBody = `
     <amp-date-picker
@@ -92,61 +99,65 @@ config.skip('amp-date-picker', function() {
     <button id="yesterday" on="tap:picker.today(offset=-1)">Yesterday</button>
   `;
 
-  describes.integration('picker.today', {
-    body: singlePickerBody + singleButtonBody,
-    extensions,
-    experiments,
-  }, env => {
-    let clock;
-    let win;
-    let document;
-
-    beforeEach(() => {
-      win = env.win;
-      document = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
+  describes.integration(
+    'picker.today',
+    {
+      body: singlePickerBody + singleButtonBody,
+      extensions,
+      experiments,
+    },
+    env => {
+      let clock;
+      let win;
+      let document;
+
+      beforeEach(() => {
+        win = env.win;
+        document = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
       });
-    });
 
-    afterEach(() => {
-      clock.uninstall();
-    });
+      afterEach(() => {
+        clock.uninstall();
+      });
 
-    it('sets the current date to today', () => {
-      const picker = document.getElementById('picker');
-      const today = document.getElementById('today');
+      it('sets the current date to today', () => {
+        const picker = document.getElementById('picker');
+        const today = document.getElementById('today');
 
-      const promise = waitForAttribute(picker, 'date');
-      today.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-01');
+        const promise = waitForAttribute(picker, 'date');
+        today.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-01');
+        });
       });
-    });
 
-    it('sets the current date to today with an offset', () => {
-      const picker = document.getElementById('picker');
-      const tomorrow = document.getElementById('tomorrow');
+      it('sets the current date to today with an offset', () => {
+        const picker = document.getElementById('picker');
+        const tomorrow = document.getElementById('tomorrow');
 
-      const promise = waitForAttribute(picker, 'date');
-      tomorrow.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-02');
+        const promise = waitForAttribute(picker, 'date');
+        tomorrow.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-02');
+        });
       });
-    });
 
-    it('sets the current date to today with a negative offset', () => {
-      const picker = document.getElementById('picker');
-      const yesterday = document.getElementById('yesterday');
+      it('sets the current date to today with a negative offset', () => {
+        const picker = document.getElementById('picker');
+        const yesterday = document.getElementById('yesterday');
 
-      const promise = waitForAttribute(picker, 'date');
-      yesterday.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2017-12-31');
+        const promise = waitForAttribute(picker, 'date');
+        yesterday.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2017-12-31');
+        });
       });
-    });
-  });
+    }
+  );
 
   const startTodayButtonBody = `
     <button id="today" on="tap:picker.startToday">Today</button>
@@ -156,62 +167,66 @@ config.skip('amp-date-picker', function() {
     </button>
   `;
 
-  describes.integration('picker.startToday', {
-    body: rangePickerBody + startTodayButtonBody,
-    extensions,
-    experiments,
-  }, env => {
-    let win;
-    let document;
-    let clock;
-
-    beforeEach(() => {
-      win = env.win;
-      document = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
+  describes.integration(
+    'picker.startToday',
+    {
+      body: rangePickerBody + startTodayButtonBody,
+      extensions,
+      experiments,
+    },
+    env => {
+      let win;
+      let document;
+      let clock;
+
+      beforeEach(() => {
+        win = env.win;
+        document = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
       });
-    });
 
-    afterEach(() => {
-      clock.uninstall();
-    });
+      afterEach(() => {
+        clock.uninstall();
+      });
 
-    it('sets the current start date to today', () => {
-      const picker = document.getElementById('picker');
-      const today = document.getElementById('today');
+      it('sets the current start date to today', () => {
+        const picker = document.getElementById('picker');
+        const today = document.getElementById('today');
 
-      const promise = waitForAttribute(picker, 'start-date');
-      today.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-01');
-        picker.removeAttribute('start-date');
+        const promise = waitForAttribute(picker, 'start-date');
+        today.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-01');
+          picker.removeAttribute('start-date');
+        });
       });
-    });
 
-    it('sets the current start date to today with an offset', () => {
-      const picker = document.getElementById('picker');
-      const tomorrow = document.getElementById('tomorrow');
+      it('sets the current start date to today with an offset', () => {
+        const picker = document.getElementById('picker');
+        const tomorrow = document.getElementById('tomorrow');
 
-      const promise = waitForAttribute(picker, 'start-date');
-      tomorrow.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-02');
+        const promise = waitForAttribute(picker, 'start-date');
+        tomorrow.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-02');
+        });
       });
-    });
 
-    it('sets the current start date to today with a negative offset', () => {
-      const picker = document.getElementById('picker');
-      const yesterday = document.getElementById('yesterday');
+      it('sets the current start date to today with a negative offset', () => {
+        const picker = document.getElementById('picker');
+        const yesterday = document.getElementById('yesterday');
 
-      const promise = waitForAttribute(picker, 'start-date');
-      yesterday.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2017-12-31');
+        const promise = waitForAttribute(picker, 'start-date');
+        yesterday.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2017-12-31');
+        });
       });
-    });
-  });
+    }
+  );
 
   const endTodayButtonBody = `
     <button id="today" on="tap:picker.endToday">Today</button>
@@ -221,71 +236,85 @@ config.skip('amp-date-picker', function() {
     </button>
   `;
 
-  describes.integration('picker.endToday', {
-    body: rangePickerBody + endTodayButtonBody,
-    extensions,
-    experiments,
-  }, env => {
-    let win;
-    let document;
-    let clock;
-
-    beforeEach(() => {
-      win = env.win;
-      document = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
+  describes.integration(
+    'picker.endToday',
+    {
+      body: rangePickerBody + endTodayButtonBody,
+      extensions,
+      experiments,
+    },
+    env => {
+      let win;
+      let document;
+      let clock;
+
+      beforeEach(() => {
+        win = env.win;
+        document = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
       });
-    });
 
-    afterEach(() => {
-      clock.uninstall();
-    });
+      afterEach(() => {
+        clock.uninstall();
+      });
 
-    it('sets the current end date to today', () => {
-      const picker = document.getElementById('picker');
-      const today = document.getElementById('today');
+      it('sets the current end date to today', () => {
+        const picker = document.getElementById('picker');
+        const today = document.getElementById('today');
 
-      const promise = waitForAttribute(picker, 'end-date');
-      today.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-01');
+        const promise = waitForAttribute(picker, 'end-date');
+        today.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-01');
+        });
       });
-    });
 
-    it('sets the current end date to today with an offset', () => {
-      const picker = document.getElementById('picker');
-      const tomorrow = document.getElementById('tomorrow');
+      it('sets the current end date to today with an offset', () => {
+        const picker = document.getElementById('picker');
+        const tomorrow = document.getElementById('tomorrow');
 
-      const promise = waitForAttribute(picker, 'end-date');
-      tomorrow.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2018-01-02');
+        const promise = waitForAttribute(picker, 'end-date');
+        tomorrow.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2018-01-02');
+        });
       });
-    });
 
-    it('sets the current end date to today with a negative offset', () => {
-      const picker = document.getElementById('picker');
-      const yesterday = document.getElementById('yesterday');
+      it('sets the current end date to today with a negative offset', () => {
+        const picker = document.getElementById('picker');
+        const yesterday = document.getElementById('yesterday');
 
-      const promise = waitForAttribute(picker, 'end-date');
-      yesterday.click();
-      return promise.then(attribute => {
-        expect(attribute).to.equal('2017-12-31');
+        const promise = waitForAttribute(picker, 'end-date');
+        yesterday.click();
+        return promise.then(attribute => {
+          expect(attribute).to.equal('2017-12-31');
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 function waitForAttribute(element, attribute) {
-  return poll(`wait for attribute ${attribute} on ${element.tagName}`, () => {
-    return element.getAttribute(attribute);
-  }, undefined, 8000);
+  return poll(
+    `wait for attribute ${attribute} on ${element.tagName}`,
+    () => {
+      return element.getAttribute(attribute);
+    },
+    undefined,
+    8000
+  );
 }
 
 function waitForFalsyAttribute(element, attribute) {
-  return poll(`wait for attribute ${attribute} on ${element.tagName}`, () => {
-    return element.getAttribute(attribute) == null;
-  }, undefined, 8000);
+  return poll(
+    `wait for attribute ${attribute} on ${element.tagName}`,
+    () => {
+      return element.getAttribute(attribute) == null;
+    },
+    undefined,
+    8000
+  );
 }
diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js
index f79328e9111a..264d3d39eb41 100644
--- a/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js
+++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-dates-attributes.js
@@ -18,35 +18,41 @@ import * as lolex from 'lolex';
 import {htmlFor} from '../../../../../src/static-template';
 import {poll} from '../../../../../testing/iframe';
 
-const config = describe.configure().ifChrome().skipSinglePass();
+const config = describe
+  .configure()
+  .ifChrome()
+  .skipSinglePass();
 
 config.run('amp-date-picker', function() {
   this.timeout(10000);
 
   const extensions = ['amp-date-picker'];
 
-  describes.integration('single date attribute', {
-    // TODO(cvializ): The beforeEach timers are not installed soon enough
-    // so the date picker uses the non-fake time when the element is built.
-    // Adding the elements to the body after the fake timer is installed
-    // solves the problem. I believe this could be resolved if the `body`
-    // property here was added after the beforeEach runs.
-    body: '',
-    extensions,
-  }, env => {
-    let win;
-    let document;
-    let clock;
+  describes.integration(
+    'single date attribute',
+    {
+      // TODO(cvializ): The beforeEach timers are not installed soon enough
+      // so the date picker uses the non-fake time when the element is built.
+      // Adding the elements to the body after the fake timer is installed
+      // solves the problem. I believe this could be resolved if the `body`
+      // property here was added after the beforeEach runs.
+      body: '',
+      extensions,
+    },
+    env => {
+      let win;
+      let document;
+      let clock;
 
-    beforeEach(() => {
-      win = env.win;
-      document = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
-      });
+      beforeEach(() => {
+        win = env.win;
+        document = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
 
-      document.body.appendChild(htmlFor(document)`
+        document.body.appendChild(htmlFor(document)`
       <div>
         <input id="today-explicit-date">
         <amp-date-picker
@@ -66,33 +72,38 @@ config.run('amp-date-picker', function() {
           input-selector="#today-duration-date"
         ></amp-date-picker>
       </div>`);
-    });
+      });
 
-    after(() => {
-      clock.uninstall();
-    });
+      after(() => {
+        clock.uninstall();
+      });
 
-    it('sets the date to today explicitly', () => {
-      const date = document.getElementById('today-explicit-date');
+      it('sets the date to today explicitly', () => {
+        const date = document.getElementById('today-explicit-date');
 
-      return waitForProperty(date, 'value').then(() => {
-        expect(date.value).to.equal('2018-01-01');
+        return waitForProperty(date, 'value').then(() => {
+          expect(date.value).to.equal('2018-01-01');
+        });
       });
-    });
 
-    it('sets the date to today with a duration', () => {
-      const date = document.getElementById('today-duration-date');
+      it('sets the date to today with a duration', () => {
+        const date = document.getElementById('today-duration-date');
 
-      return waitForProperty(date, 'value').then(() => {
-        expect(date.value).to.equal('2018-01-01');
+        return waitForProperty(date, 'value').then(() => {
+          expect(date.value).to.equal('2018-01-01');
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 function waitForProperty(element, property) {
-  return poll(`wait for property ${property} on ${element.id}`, () => {
-    return element[property];
-  }, undefined, 8000);
+  return poll(
+    `wait for property ${property} on ${element.id}`,
+    () => {
+      return element[property];
+    },
+    undefined,
+    8000
+  );
 }
-
diff --git a/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js b/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js
index 6e18b8bd9e2d..aac22c101db6 100644
--- a/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js
+++ b/extensions/amp-date-picker/0.1/test/integration/test-integration-maximum-nights.js
@@ -18,35 +18,41 @@ import * as lolex from 'lolex';
 import {htmlFor} from '../../../../../src/static-template';
 import {poll} from '../../../../../testing/iframe';
 
-const config = describe.configure().ifChrome().skipSinglePass();
+const config = describe
+  .configure()
+  .ifChrome()
+  .skipSinglePass();
 
 config.run('amp-date-picker', function() {
   this.timeout(10000);
 
   const extensions = ['amp-date-picker'];
 
-  describes.integration('single date attribute', {
-    // TODO(cvializ): The beforeEach timers are not installed soon enough
-    // so the date picker uses the non-fake time when the element is built.
-    // Adding the elements to the body after the fake timer is installed
-    // solves the problem. I believe this could be resolved if the `body`
-    // property here was added after the beforeEach runs.
-    body: '',
-    extensions,
-  }, env => {
-    let win;
-    let doc;
-    let clock;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = env.win.document;
-      clock = lolex.install({
-        target: win,
-        now: new Date('2018-01-01T08:00:00Z'),
-      });
-
-      doc.body.appendChild(htmlFor(doc)`
+  describes.integration(
+    'single date attribute',
+    {
+      // TODO(cvializ): The beforeEach timers are not installed soon enough
+      // so the date picker uses the non-fake time when the element is built.
+      // Adding the elements to the body after the fake timer is installed
+      // solves the problem. I believe this could be resolved if the `body`
+      // property here was added after the beforeEach runs.
+      body: '',
+      extensions,
+    },
+    env => {
+      let win;
+      let doc;
+      let clock;
+
+      beforeEach(() => {
+        win = env.win;
+        doc = env.win.document;
+        clock = lolex.install({
+          target: win,
+          now: new Date('2018-01-01T08:00:00Z'),
+        });
+
+        doc.body.appendChild(htmlFor(doc)`
       <div>
         <amp-date-picker
           layout="fixed-height"
@@ -58,54 +64,64 @@ config.run('amp-date-picker', function() {
           maximum-nights="3"
         ></amp-date-picker>
       </div>`);
-      const picker = doc.getElementById('picker');
-      return picker.implementation_.buildCallback().then(
-          () => picker.implementation_.layoutCallback());
-    });
-
-    after(() => {
-      clock.uninstall();
-    });
-
-    function getCalendarButtonByDay(calendar, day) {
-      const cells = calendar.querySelectorAll('.CalendarDay_button');
-      const {length} = cells;
-
-      for (let i = 0; i < length; i++) {
-        const text = cells[i].textContent.trim();
-        if (text == day) {
-          return cells[i];
-        }
-      }
+        const picker = doc.getElementById('picker');
+        return picker.implementation_
+          .buildCallback()
+          .then(() => picker.implementation_.layoutCallback());
+      });
 
-      return null;
-    }
+      after(() => {
+        clock.uninstall();
+      });
+
+      function getCalendarButtonByDay(calendar, day) {
+        const cells = calendar.querySelectorAll('.CalendarDay_button');
+        const {length} = cells;
 
-    it('should appear as blocked when a date is beyond the maximum', () => {
-      const picker = doc.getElementById('picker');
-      const startButton = getCalendarButtonByDay(picker, '6');
-      const beyondButton = getCalendarButtonByDay(picker, '10');
+        for (let i = 0; i < length; i++) {
+          const text = cells[i].textContent.trim();
+          if (text == day) {
+            return cells[i];
+          }
+        }
 
-      const hasBlockedClass = beyondButton.parentElement.classList.contains(
-          'CalendarDay__blocked_out_of_range');
-      expect(hasBlockedClass).to.be.false;
+        return null;
+      }
 
-      const waitForStart = waitForClassName(
-          startButton.parentElement, 'CalendarDay__selected_start');
-      startButton.click();
+      it('should appear as blocked when a date is beyond the maximum', () => {
+        const picker = doc.getElementById('picker');
+        const startButton = getCalendarButtonByDay(picker, '6');
+        const beyondButton = getCalendarButtonByDay(picker, '10');
 
-      waitForStart.then(() => {
         const hasBlockedClass = beyondButton.parentElement.classList.contains(
-            'CalendarDay__blocked_out_of_range');
-        expect(hasBlockedClass).to.be.true;
+          'CalendarDay__blocked_out_of_range'
+        );
+        expect(hasBlockedClass).to.be.false;
+
+        const waitForStart = waitForClassName(
+          startButton.parentElement,
+          'CalendarDay__selected_start'
+        );
+        startButton.click();
+
+        waitForStart.then(() => {
+          const hasBlockedClass = beyondButton.parentElement.classList.contains(
+            'CalendarDay__blocked_out_of_range'
+          );
+          expect(hasBlockedClass).to.be.true;
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 function waitForClassName(element, className) {
-  return poll(`wait for className ${className} on ${element.id}`, () => {
-    return element.classList.contains(className);
-  }, undefined, 8000);
+  return poll(
+    `wait for className ${className} on ${element.id}`,
+    () => {
+      return element.classList.contains(className);
+    },
+    undefined,
+    8000
+  );
 }
-
diff --git a/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js b/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
index 7acdeb37b71c..c89aecefeef4 100644
--- a/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
+++ b/extensions/amp-date-picker/0.1/test/test-amp-date-picker.js
@@ -19,18 +19,21 @@ import {AmpDatePicker} from '../amp-date-picker';
 import {createElementWithAttributes} from '../../../../src/dom.js';
 import {requireExternal} from '../../../../src/module';
 
-describes.realWin('amp-date-picker', {
-  amp: {
-    runtimeOn: false,
-    extensions: ['amp-date-picker'],
+describes.realWin(
+  'amp-date-picker',
+  {
+    amp: {
+      runtimeOn: false,
+      extensions: ['amp-date-picker'],
+    },
   },
-}, env => {
-  const moment = requireExternal('moment');
-  let clock;
-  let win;
-  let document;
+  env => {
+    const moment = requireExternal('moment');
+    let clock;
+    let win;
+    let document;
 
-  const templateJson = `{
+    const templateJson = `{
     "templates": [{
       "id": "srcTemplate",
       "dates": [
@@ -42,380 +45,411 @@ describes.realWin('amp-date-picker', {
     }]
   }`;
 
-  const DEFAULT_ATTRS = {
-    layout: 'fixed-height',
-    height: '360',
-  };
-
-  function createDatePicker(opt_attrs, opt_parent = document.body) {
-    const attrs = Object.assign({}, DEFAULT_ATTRS, opt_attrs);
-    const element = createElementWithAttributes(
-        document, 'amp-date-picker', attrs);
-
-    opt_parent.appendChild(element);
-    const picker = new AmpDatePicker(element);
-
-    return {
-      element,
-      picker,
-      buildCallback() {
-        return Promise.resolve(picker.buildCallback());
-      },
-      layoutCallback() {
-        return Promise.resolve(picker.buildCallback())
-            .then(() => picker.layoutCallback());
-      },
+    const DEFAULT_ATTRS = {
+      layout: 'fixed-height',
+      height: '360',
     };
-  }
-
-  /**
-   * Create a template element
-   * @param {string} body
-   */
-  function createTemplate(body) {
-    const template = document.createElement('template');
-    template.setAttribute('type', 'amp-mustache');
-    template.content.appendChild(document.createTextNode(body));
-    return template;
-  }
 
-  const DEFAULT_TEMPLATE_ATTRS = {
-    'date-template': '',
-  };
-
-  /**
-   * Create a template from a body and attributes
-   * @param {string} body
-   * @param {!Object<string, string>=} opt_attrs
-   */
-  function createDateTemplate(body, opt_attrs) {
-    const template = createTemplate(body);
-    const attrs = Object.assign({}, DEFAULT_TEMPLATE_ATTRS, opt_attrs);
-    for (const key in attrs) {
-      template.setAttribute(key, attrs[key]);
+    function createDatePicker(opt_attrs, opt_parent = document.body) {
+      const attrs = Object.assign({}, DEFAULT_ATTRS, opt_attrs);
+      const element = createElementWithAttributes(
+        document,
+        'amp-date-picker',
+        attrs
+      );
+
+      opt_parent.appendChild(element);
+      const picker = new AmpDatePicker(element);
+
+      return {
+        element,
+        picker,
+        buildCallback() {
+          return Promise.resolve(picker.buildCallback());
+        },
+        layoutCallback() {
+          return Promise.resolve(picker.buildCallback()).then(() =>
+            picker.layoutCallback()
+          );
+        },
+      };
     }
-    return template;
-  }
-
-  beforeEach(() => {
-    win = env.win;
-    document = env.win.document;
-    clock = lolex.install({
-      // Use the global window and not env.win. There is no way to inject the
-      // env.win into moment right now.
-      target: window,
-      now: new Date('2018-01-01T08:00:00Z'),
-    });
-  });
-
-  afterEach(() => {
-    clock.uninstall();
-  });
 
-  it('should render in the simplest case', () => {
-    const {picker, layoutCallback} = createDatePicker({
-      layout: 'fixed-height',
-      height: 360,
-    });
-
-    return layoutCallback().then(() => {
-      const container = picker.container_;
-      expect(container.children.length).to.be.greaterThan(0);
-    });
-  });
-
-  describe('initial dates', () => {
-    it('should use the value of a single input at load-time', () => {
-      const input = document.createElement('input');
-      input.id = 'date';
-      input.value = '2018-01-01';
-      document.body.appendChild(input);
-
-      const {picker, buildCallback} = createDatePicker({
-        'layout': 'fixed-height',
-        'height': '360',
-        'input-selector': '#date',
-      });
+    /**
+     * Create a template element
+     * @param {string} body
+     */
+    function createTemplate(body) {
+      const template = document.createElement('template');
+      template.setAttribute('type', 'amp-mustache');
+      template.content.appendChild(document.createTextNode(body));
+      return template;
+    }
 
-      return buildCallback().then(() => {
-        expect(picker.state_.date.isSame('2018-01-01')).to.be.true;
-      });
-    });
+    const DEFAULT_TEMPLATE_ATTRS = {
+      'date-template': '',
+    };
 
-    it('should use the value of a range input at load-time', () => {
-      const startInput = document.createElement('input');
-      startInput.id = 'startdate';
-      startInput.value = '2018-01-01';
-      document.body.appendChild(startInput);
-
-      const endInput = document.createElement('input');
-      endInput.id = 'enddate';
-      endInput.value = '2018-01-02';
-      document.body.appendChild(endInput);
-
-      const {picker, buildCallback} = createDatePicker({
-        'layout': 'fixed-height',
-        'height': '360',
-        'type': 'range',
-        'start-input-selector': '#startdate',
-        'end-input-selector': '#enddate',
-      });
+    /**
+     * Create a template from a body and attributes
+     * @param {string} body
+     * @param {!Object<string, string>=} opt_attrs
+     */
+    function createDateTemplate(body, opt_attrs) {
+      const template = createTemplate(body);
+      const attrs = Object.assign({}, DEFAULT_TEMPLATE_ATTRS, opt_attrs);
+      for (const key in attrs) {
+        template.setAttribute(key, attrs[key]);
+      }
+      return template;
+    }
 
-      return buildCallback().then(() => {
-        expect(picker.state_.startDate.isSame('2018-01-01')).to.be.true;
-        expect(picker.state_.endDate.isSame('2018-01-02')).to.be.true;
+    beforeEach(() => {
+      win = env.win;
+      document = env.win.document;
+      clock = lolex.install({
+        // Use the global window and not env.win. There is no way to inject the
+        // env.win into moment right now.
+        target: window,
+        now: new Date('2018-01-01T08:00:00Z'),
       });
     });
 
-    it('should use the "date" value from src data', () => {
-      const {picker, layoutCallback} = createDatePicker({
-        'layout': 'fixed-height',
-        'height': '360',
-      });
-      sandbox.stub(picker, 'fetchSrc_').resolves({'date': '2018-01-01'});
-
-      return layoutCallback().then(() => {
-        expect(picker.state_.date.isSame('2018-01-01')).to.be.true;
-      });
+    afterEach(() => {
+      clock.uninstall();
     });
 
-    it('should use the "startDate" and "endDate" values from src data', () => {
+    it('should render in the simplest case', () => {
       const {picker, layoutCallback} = createDatePicker({
-        'layout': 'fixed-height',
-        'height': '360',
-        'type': 'range',
-      });
-      sandbox.stub(picker, 'fetchSrc_').resolves({
-        'startDate': '2018-01-01',
-        'endDate': '2018-01-02',
+        layout: 'fixed-height',
+        height: 360,
       });
 
       return layoutCallback().then(() => {
-        expect(picker.state_.startDate.isSame('2018-01-01')).to.be.true;
-        expect(picker.state_.endDate.isSame('2018-01-02')).to.be.true;
-      });
-    });
-  });
-
-  describe('getFormattedDate_', () => {
-    it('should render dates in the default format', () => {
-      const {picker} = createDatePicker({locale: 'en'});
-      const date = moment();
-      const formattedDate = picker.getFormattedDate_(date);
-      expect(formattedDate).to.equal('2018-01-01');
-    });
-
-    it('should always render Unix epoch seconds in english digits', () => {
-      const {picker} = createDatePicker({locale: 'en', format: 'X'});
-      const date = moment();
-      return picker.buildCallback().then(() => {
-        const formattedDate = picker.getFormattedDate_(date);
-        expect(formattedDate).to.equal('1514793600');
-      });
-    });
-
-    it('should always render Unix epoch millis in english digits', () => {
-      const {picker} = createDatePicker({locale: 'en', format: 'x'});
-      const date = moment();
-      return picker.buildCallback().then(() => {
-        const formattedDate = picker.getFormattedDate_(date);
-        expect(formattedDate).to.equal('1514793600000');
+        const container = picker.container_;
+        expect(container.children.length).to.be.greaterThan(0);
       });
     });
-  });
 
-  describe('templates', () => {
-    describe('element templates', () => {
-      it('should parse RRULE and date templates', () => {
-        const template = createDateTemplate('{{template}}', {
-          dates: '2018-01-01',
+    describe('initial dates', () => {
+      it('should use the value of a single input at load-time', () => {
+        const input = document.createElement('input');
+        input.id = 'date';
+        input.value = '2018-01-01';
+        document.body.appendChild(input);
+
+        const {picker, buildCallback} = createDatePicker({
+          'layout': 'fixed-height',
+          'height': '360',
+          'input-selector': '#date',
         });
-        const {picker} = createDatePicker();
-        const results = picker.parseElementTemplates_([template]);
-        expect(results[0].dates.contains('2018-01-01')).to.be.true;
-        expect(results[0].dates.contains('2018-01-02')).to.be.false;
-        expect(results[0].template).to.equal(template);
-      });
-    });
 
-    describe('src templates', () => {
-      it('should parse RRULE and date templates', function() {
-        this.timeout(4000);
-        const template = createDateTemplate('{{val}}', {
-          dates: '2018-01-01',
-          id: 'srcTemplate',
-        });
-        const defaultTemplate = createDateTemplate('{{val}}', {
-          id: 'defaultTemplate',
+        return buildCallback().then(() => {
+          expect(picker.state_.date.isSame('2018-01-01')).to.be.true;
         });
-        const {element, picker} = createDatePicker();
-        element.appendChild(template);
-        element.appendChild(defaultTemplate);
-
-        const {srcTemplates, srcDefaultTemplate} =
-            picker.parseSrcTemplates_(win.JSON.parse(templateJson));
-        expect(srcTemplates[0].dates.contains('2018-01-01')).to.be.true;
-        expect(srcTemplates[0].dates.contains('2018-01-02')).to.be.false;
-        expect(srcTemplates[0].dates.contains('2018-01-03')).to.be.true;
-        expect(srcTemplates[0].template).to.equal(template);
-        expect(srcDefaultTemplate).to.equal(defaultTemplate);
       });
-    });
 
-    describe('hidden inputs in single date picker in forms', () => {
-      it('should not create hidden inputs outside of forms', () => {
-        const {element} = createDatePicker();
+      it('should use the value of a range input at load-time', () => {
+        const startInput = document.createElement('input');
+        startInput.id = 'startdate';
+        startInput.value = '2018-01-01';
+        document.body.appendChild(startInput);
+
+        const endInput = document.createElement('input');
+        endInput.id = 'enddate';
+        endInput.value = '2018-01-02';
+        document.body.appendChild(endInput);
+
+        const {picker, buildCallback} = createDatePicker({
+          'layout': 'fixed-height',
+          'height': '360',
+          'type': 'range',
+          'start-input-selector': '#startdate',
+          'end-input-selector': '#enddate',
+        });
 
-        expect(element.querySelector('input[type="hidden"]')).to.be.null;
+        return buildCallback().then(() => {
+          expect(picker.state_.startDate.isSame('2018-01-01')).to.be.true;
+          expect(picker.state_.endDate.isSame('2018-01-02')).to.be.true;
+        });
       });
 
-      it('should create a hidden input when inside a form', () => {
-        const form = document.createElement('form');
-        document.body.appendChild(form);
-        const {element, layoutCallback} = createDatePicker({}, form);
+      it('should use the "date" value from src data', () => {
+        const {picker, layoutCallback} = createDatePicker({
+          'layout': 'fixed-height',
+          'height': '360',
+        });
+        sandbox.stub(picker, 'fetchSrc_').resolves({'date': '2018-01-01'});
 
         return layoutCallback().then(() => {
-          const input = element.querySelector('input[type="hidden"]');
-          expect(input).to.not.be.null;
-          expect(input.name).to.equal('date');
+          expect(picker.state_.date.isSame('2018-01-01')).to.be.true;
         });
       });
 
-      it('should name the input `${id}-date` when another ' +
-          '#date input exists', () => {
-        const form = document.createElement('form');
-        const dateInput = document.createElement('input');
-        dateInput.type = 'hidden';
-        dateInput.name = 'date';
-        form.appendChild(dateInput);
-        document.body.appendChild(form);
-        const {element, layoutCallback} =
-            createDatePicker({id: 'delivery'}, form);
+      it('should use the "startDate" and "endDate" values from src data', () => {
+        const {picker, layoutCallback} = createDatePicker({
+          'layout': 'fixed-height',
+          'height': '360',
+          'type': 'range',
+        });
+        sandbox.stub(picker, 'fetchSrc_').resolves({
+          'startDate': '2018-01-01',
+          'endDate': '2018-01-02',
+        });
 
         return layoutCallback().then(() => {
-          const input = element.querySelector('input[type="hidden"]');
-          expect(input).to.not.be.null;
-          expect(input.name).to.equal('delivery-date');
+          expect(picker.state_.startDate.isSame('2018-01-01')).to.be.true;
+          expect(picker.state_.endDate.isSame('2018-01-02')).to.be.true;
         });
       });
+    });
 
-      it('should error if the input when another ' +
-          '#date input exists and the picker has no ID', () => {
-        const form = document.createElement('form');
-        const dateInput = document.createElement('input');
-        dateInput.type = 'hidden';
-        dateInput.name = 'date';
-        form.appendChild(dateInput);
-        document.body.appendChild(form);
+    describe('getFormattedDate_', () => {
+      it('should render dates in the default format', () => {
+        const {picker} = createDatePicker({locale: 'en'});
+        const date = moment();
+        const formattedDate = picker.getFormattedDate_(date);
+        expect(formattedDate).to.equal('2018-01-01');
+      });
 
-        const {layoutCallback} = createDatePicker({}, form);
+      it('should always render Unix epoch seconds in english digits', () => {
+        const {picker} = createDatePicker({locale: 'en', format: 'X'});
+        const date = moment();
+        return picker.buildCallback().then(() => {
+          const formattedDate = picker.getFormattedDate_(date);
+          expect(formattedDate).to.equal('1514793600');
+        });
+      });
 
-        allowConsoleError(() => {
-          expect(layoutCallback()).to.be.rejectedWith(
-              'another #date input exists');
+      it('should always render Unix epoch millis in english digits', () => {
+        const {picker} = createDatePicker({locale: 'en', format: 'x'});
+        const date = moment();
+        return picker.buildCallback().then(() => {
+          const formattedDate = picker.getFormattedDate_(date);
+          expect(formattedDate).to.equal('1514793600000');
         });
       });
     });
 
-    describe('hidden inputs in range date picker in forms', () => {
-      it('should not create hidden inputs outside of forms', () => {
-        const {element} = createDatePicker({type: 'range'});
-
-        expect(element.querySelector('input[type="hidden"]')).to.be.null;
+    describe('templates', () => {
+      describe('element templates', () => {
+        it('should parse RRULE and date templates', () => {
+          const template = createDateTemplate('{{template}}', {
+            dates: '2018-01-01',
+          });
+          const {picker} = createDatePicker();
+          const results = picker.parseElementTemplates_([template]);
+          expect(results[0].dates.contains('2018-01-01')).to.be.true;
+          expect(results[0].dates.contains('2018-01-02')).to.be.false;
+          expect(results[0].template).to.equal(template);
+        });
       });
 
-      it('should create a hidden input when inside a form', () => {
-        const form = document.createElement('form');
-        document.body.appendChild(form);
-        const {element, layoutCallback} =
-            createDatePicker({type: 'range'}, form);
-
-        return layoutCallback().then(() => {
-          const inputs = element.querySelectorAll('input[type="hidden"]');
-          expect(inputs.length).to.equal(2);
-          expect(inputs[0].name).to.equal('start-date');
-          expect(inputs[1].name).to.equal('end-date');
+      describe('src templates', () => {
+        it('should parse RRULE and date templates', function() {
+          this.timeout(4000);
+          const template = createDateTemplate('{{val}}', {
+            dates: '2018-01-01',
+            id: 'srcTemplate',
+          });
+          const defaultTemplate = createDateTemplate('{{val}}', {
+            id: 'defaultTemplate',
+          });
+          const {element, picker} = createDatePicker();
+          element.appendChild(template);
+          element.appendChild(defaultTemplate);
+
+          const {srcTemplates, srcDefaultTemplate} = picker.parseSrcTemplates_(
+            win.JSON.parse(templateJson)
+          );
+          expect(srcTemplates[0].dates.contains('2018-01-01')).to.be.true;
+          expect(srcTemplates[0].dates.contains('2018-01-02')).to.be.false;
+          expect(srcTemplates[0].dates.contains('2018-01-03')).to.be.true;
+          expect(srcTemplates[0].template).to.equal(template);
+          expect(srcDefaultTemplate).to.equal(defaultTemplate);
         });
       });
 
-      it('should name an input `${id}-(start|end)-date` when another ' +
-          '#(start|end)-date input exists', () => {
-        const form = document.createElement('form');
-        const startDateInput = document.createElement('input');
-        startDateInput.type = 'hidden';
-        startDateInput.name = 'start-date';
-        form.appendChild(startDateInput);
-        document.body.appendChild(form);
-        const {element, layoutCallback} =
-            createDatePicker({type: 'range', id: 'delivery'}, form);
+      describe('hidden inputs in single date picker in forms', () => {
+        it('should not create hidden inputs outside of forms', () => {
+          const {element} = createDatePicker();
 
-        return layoutCallback().then(() => {
-          const inputs = element.querySelectorAll('input[type="hidden"]');
-          expect(inputs.length).to.equal(2);
-          expect(inputs[0].name).to.equal('delivery-start-date');
-          expect(inputs[1].name).to.equal('end-date');
+          expect(element.querySelector('input[type="hidden"]')).to.be.null;
         });
-      });
 
-      it('should name both inputs `${id}-(start|end)-date` when other ' +
-          '#start-date and #end-date inputs exists', () => {
-        const form = document.createElement('form');
-        const startDateInput = document.createElement('input');
-        startDateInput.type = 'hidden';
-        startDateInput.name = 'start-date';
-        form.appendChild(startDateInput);
-        const endDateInput = document.createElement('input');
-        endDateInput.type = 'hidden';
-        endDateInput.name = 'end-date';
-        form.appendChild(endDateInput);
-        document.body.appendChild(form);
-        const {element, layoutCallback} =
-            createDatePicker({type: 'range', id: 'delivery'}, form);
+        it('should create a hidden input when inside a form', () => {
+          const form = document.createElement('form');
+          document.body.appendChild(form);
+          const {element, layoutCallback} = createDatePicker({}, form);
 
-        return layoutCallback().then(() => {
-          const inputs = element.querySelectorAll('input[type="hidden"]');
-          expect(inputs.length).to.equal(2);
-          expect(inputs[0].name).to.equal('delivery-start-date');
-          expect(inputs[1].name).to.equal('delivery-end-date');
+          return layoutCallback().then(() => {
+            const input = element.querySelector('input[type="hidden"]');
+            expect(input).to.not.be.null;
+            expect(input.name).to.equal('date');
+          });
         });
+
+        it(
+          'should name the input `${id}-date` when another ' +
+            '#date input exists',
+          () => {
+            const form = document.createElement('form');
+            const dateInput = document.createElement('input');
+            dateInput.type = 'hidden';
+            dateInput.name = 'date';
+            form.appendChild(dateInput);
+            document.body.appendChild(form);
+            const {element, layoutCallback} = createDatePicker(
+              {id: 'delivery'},
+              form
+            );
+
+            return layoutCallback().then(() => {
+              const input = element.querySelector('input[type="hidden"]');
+              expect(input).to.not.be.null;
+              expect(input.name).to.equal('delivery-date');
+            });
+          }
+        );
+
+        it(
+          'should error if the input when another ' +
+            '#date input exists and the picker has no ID',
+          () => {
+            const form = document.createElement('form');
+            const dateInput = document.createElement('input');
+            dateInput.type = 'hidden';
+            dateInput.name = 'date';
+            form.appendChild(dateInput);
+            document.body.appendChild(form);
+
+            const {layoutCallback} = createDatePicker({}, form);
+
+            allowConsoleError(() => {
+              expect(layoutCallback()).to.be.rejectedWith(
+                'another #date input exists'
+              );
+            });
+          }
+        );
       });
 
-      it('should error if the input when another ' +
-          '#date input exists and the picker has no ID', () => {
-        const form = document.createElement('form');
-        const dateInput = document.createElement('input');
-        dateInput.type = 'hidden';
-        dateInput.name = 'start-date';
-        form.appendChild(dateInput);
-        document.body.appendChild(form);
+      describe('hidden inputs in range date picker in forms', () => {
+        it('should not create hidden inputs outside of forms', () => {
+          const {element} = createDatePicker({type: 'range'});
 
-        const {layoutCallback} = createDatePicker({type: 'range'}, form);
+          expect(element.querySelector('input[type="hidden"]')).to.be.null;
+        });
 
-        allowConsoleError(() => {
-          expect(layoutCallback()).to.be.rejectedWith(
-              'another #start-date input exists');
+        it('should create a hidden input when inside a form', () => {
+          const form = document.createElement('form');
+          document.body.appendChild(form);
+          const {element, layoutCallback} = createDatePicker(
+            {type: 'range'},
+            form
+          );
+
+          return layoutCallback().then(() => {
+            const inputs = element.querySelectorAll('input[type="hidden"]');
+            expect(inputs.length).to.equal(2);
+            expect(inputs[0].name).to.equal('start-date');
+            expect(inputs[1].name).to.equal('end-date');
+          });
         });
+
+        it(
+          'should name an input `${id}-(start|end)-date` when another ' +
+            '#(start|end)-date input exists',
+          () => {
+            const form = document.createElement('form');
+            const startDateInput = document.createElement('input');
+            startDateInput.type = 'hidden';
+            startDateInput.name = 'start-date';
+            form.appendChild(startDateInput);
+            document.body.appendChild(form);
+            const {element, layoutCallback} = createDatePicker(
+              {type: 'range', id: 'delivery'},
+              form
+            );
+
+            return layoutCallback().then(() => {
+              const inputs = element.querySelectorAll('input[type="hidden"]');
+              expect(inputs.length).to.equal(2);
+              expect(inputs[0].name).to.equal('delivery-start-date');
+              expect(inputs[1].name).to.equal('end-date');
+            });
+          }
+        );
+
+        it(
+          'should name both inputs `${id}-(start|end)-date` when other ' +
+            '#start-date and #end-date inputs exists',
+          () => {
+            const form = document.createElement('form');
+            const startDateInput = document.createElement('input');
+            startDateInput.type = 'hidden';
+            startDateInput.name = 'start-date';
+            form.appendChild(startDateInput);
+            const endDateInput = document.createElement('input');
+            endDateInput.type = 'hidden';
+            endDateInput.name = 'end-date';
+            form.appendChild(endDateInput);
+            document.body.appendChild(form);
+            const {element, layoutCallback} = createDatePicker(
+              {type: 'range', id: 'delivery'},
+              form
+            );
+
+            return layoutCallback().then(() => {
+              const inputs = element.querySelectorAll('input[type="hidden"]');
+              expect(inputs.length).to.equal(2);
+              expect(inputs[0].name).to.equal('delivery-start-date');
+              expect(inputs[1].name).to.equal('delivery-end-date');
+            });
+          }
+        );
+
+        it(
+          'should error if the input when another ' +
+            '#date input exists and the picker has no ID',
+          () => {
+            const form = document.createElement('form');
+            const dateInput = document.createElement('input');
+            dateInput.type = 'hidden';
+            dateInput.name = 'start-date';
+            form.appendChild(dateInput);
+            document.body.appendChild(form);
+
+            const {layoutCallback} = createDatePicker({type: 'range'}, form);
+
+            allowConsoleError(() => {
+              expect(layoutCallback()).to.be.rejectedWith(
+                'another #start-date input exists'
+              );
+            });
+          }
+        );
       });
-    });
 
-    describe('src attribute', () => {
-      it('should set highlighted and blocked dates', () => {
-        const {element} = createDatePicker({
-          src: 'http://localhost:9876/date-picker/src-data/get',
-        });
+      describe('src attribute', () => {
+        it('should set highlighted and blocked dates', () => {
+          const {element} = createDatePicker({
+            src: 'http://localhost:9876/date-picker/src-data/get',
+          });
 
-        const impl = element.implementation_;
+          const impl = element.implementation_;
 
-        sandbox.stub(impl, 'fetchSrc_').resolves({
-          blocked: ['2018-01-03'],
-          highlighted: ['2018-01-04'],
-        });
+          sandbox.stub(impl, 'fetchSrc_').resolves({
+            blocked: ['2018-01-03'],
+            highlighted: ['2018-01-04'],
+          });
 
-        return impl.setupSrcAttributes_().then(() => {
-          expect(impl.blocked_.contains('2018-01-03')).to.be.true;
-          expect(impl.highlighted_.contains('2018-01-04')).to.be.true;
+          return impl.setupSrcAttributes_().then(() => {
+            expect(impl.blocked_.contains('2018-01-03')).to.be.true;
+            expect(impl.highlighted_.contains('2018-01-04')).to.be.true;
+          });
         });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-date-picker/0.1/test/test-dates-list.js b/extensions/amp-date-picker/0.1/test/test-dates-list.js
index e69b66c3080d..46e525efab65 100644
--- a/extensions/amp-date-picker/0.1/test/test-dates-list.js
+++ b/extensions/amp-date-picker/0.1/test/test-dates-list.js
@@ -25,7 +25,7 @@ describes.sandboxed('DatesList', {}, () => {
     const containedDate = '09/04/1998';
     const notContainedDate = '09/03/1998';
     const containedRrule =
-        'FREQ=WEEKLY;DTSTART=20180101T000000Z;WKST=SU;BYDAY=TU,SA';
+      'FREQ=WEEKLY;DTSTART=20180101T000000Z;WKST=SU;BYDAY=TU,SA';
     const matchesRrule = '01/02/2018';
     const datesList = new DatesList([containedDate, containedRrule]);
 
diff --git a/extensions/amp-date-picker/0.1/wrappers/maximum-nights.js b/extensions/amp-date-picker/0.1/wrappers/maximum-nights.js
index bb50dec93f2b..ee03cb850b86 100644
--- a/extensions/amp-date-picker/0.1/wrappers/maximum-nights.js
+++ b/extensions/amp-date-picker/0.1/wrappers/maximum-nights.js
@@ -46,11 +46,11 @@ export function wrap(WrappedComponent) {
     componentWillReceiveProps(nextProps) {
       const {props} = this;
       const shouldUpdate =
-          props['isOutsideRange'] != nextProps['isOutsideRange'] ||
-          props['startDate'] != nextProps['startDate'] ||
-          props['endDate'] != nextProps['endDate'] ||
-          props['focusedInput'] != nextProps['focusedInput'] ||
-          props['maximumNights'] != nextProps['maximumNights'];
+        props['isOutsideRange'] != nextProps['isOutsideRange'] ||
+        props['startDate'] != nextProps['startDate'] ||
+        props['endDate'] != nextProps['endDate'] ||
+        props['focusedInput'] != nextProps['focusedInput'] ||
+        props['maximumNights'] != nextProps['maximumNights'];
       if (shouldUpdate) {
         this.isOutsideRange_ = getIsOutsideRange(nextProps);
       }
@@ -83,20 +83,26 @@ export function wrap(WrappedComponent) {
     }
 
     if (startDate && focusedInput == END_DATE) {
-      const firstIneligibleDay =
-          startDate.clone().add(maximumNights + 1, 'days');
+      const firstIneligibleDay = startDate
+        .clone()
+        .add(maximumNights + 1, 'days');
       return date => {
-        return isOutsideRange(date) ||
-            isInclusivelyAfterDay(date, firstIneligibleDay);
+        return (
+          isOutsideRange(date) ||
+          isInclusivelyAfterDay(date, firstIneligibleDay)
+        );
       };
     }
 
     if (endDate && focusedInput == START_DATE) {
-      const lastIneligibleDay =
-          endDate.clone().add(-1 * (maximumNights + 1), 'days');
+      const lastIneligibleDay = endDate
+        .clone()
+        .add(-1 * (maximumNights + 1), 'days');
       return date => {
-        return isOutsideRange(date) ||
-            isInclusivelyBeforeDay(date, lastIneligibleDay);
+        return (
+          isOutsideRange(date) ||
+          isInclusivelyBeforeDay(date, lastIneligibleDay)
+        );
       };
     }
 
diff --git a/extensions/amp-delight-player/0.1/amp-delight-player.js b/extensions/amp-delight-player/0.1/amp-delight-player.js
index 399e8329bd7e..680db41e85fb 100644
--- a/extensions/amp-delight-player/0.1/amp-delight-player.js
+++ b/extensions/amp-delight-player/0.1/amp-delight-player.js
@@ -17,15 +17,9 @@ import {Deferred} from '../../../src/utils/promise';
 import {Services} from '../../../src/services';
 import {VideoAttributes, VideoEvents} from '../../../src/video-interface';
 import {createFrameFor, objOrParseJson} from '../../../src/iframe-video';
-import {
-  getData,
-  listen,
-  listenOncePromise,
-} from '../../../src/event-helper';
+import {getData, listen, listenOncePromise} from '../../../src/event-helper';
 import {htmlFor} from '../../../src/static-template';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {removeElement} from '../../../src/dom';
 import {setStyle} from '../../../src/style';
@@ -70,7 +64,6 @@ const DelightEvent = {
 
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpDelightPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -137,8 +130,8 @@ class AmpDelightPlayer extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.contentID_ = userAssert(
-        this.element.getAttribute('data-content-id'),
-        'The data-content-id attribute is required'
+      this.element.getAttribute('data-content-id'),
+      'The data-content-id attribute is required'
     );
 
     const deferred = new Deferred();
@@ -198,8 +191,9 @@ class AmpDelightPlayer extends AMP.BaseElement {
   /** @override */
   createPlaceholderCallback() {
     const html = htmlFor(this.element);
-    const placeholder =
-        html`<div placeholder><amp-img layout=fill></amp-img></div>`;
+    const placeholder = html`
+      <div placeholder><amp-img layout="fill"></amp-img></div>
+    `;
 
     const src = `${this.baseURL_}/poster/${this.contentID_}`;
 
@@ -257,11 +251,16 @@ class AmpDelightPlayer extends AMP.BaseElement {
       case DelightEvent.PING: {
         const guid = data['guid'];
         if (guid) {
-          this.iframe_.contentWindow./*OK*/postMessage(JSON.stringify(/** @type {JsonObject} */ ({
-            type: DelightEvent.PONG,
-            guid,
-            idx: 0,
-          })), '*');
+          this.iframe_.contentWindow./*OK*/ postMessage(
+            JSON.stringify(
+              /** @type {JsonObject} */ ({
+                type: DelightEvent.PONG,
+                guid,
+                idx: 0,
+              })
+            ),
+            '*'
+          );
         }
         break;
       }
@@ -329,8 +328,9 @@ class AmpDelightPlayer extends AMP.BaseElement {
   sendCommand_(type, payload = {}) {
     this.playerReadyPromise_.then(iframe => {
       if (iframe && iframe.contentWindow) {
-        iframe.contentWindow./*OK*/postMessage(
-            JSON.stringify(/** @type {JsonObject} */ ({type, payload})), '*'
+        iframe.contentWindow./*OK*/ postMessage(
+          JSON.stringify(/** @type {JsonObject} */ ({type, payload})),
+          '*'
         );
       }
     });
@@ -358,9 +358,10 @@ class AmpDelightPlayer extends AMP.BaseElement {
    */
   registerEventHandlers_() {
     const dispatchScreenOrientationChangeEvents = () => {
-      const orientation = window.screen.orientation ||
-                          window.screen.mozOrientation ||
-                          window.screen.msOrientation;
+      const orientation =
+        window.screen.orientation ||
+        window.screen.mozOrientation ||
+        window.screen.msOrientation;
       this.sendCommand_(DelightEvent.SCREEN_CHANGE, {
         orientation: {
           angle: orientation.angle,
@@ -405,38 +406,39 @@ class AmpDelightPlayer extends AMP.BaseElement {
       });
     };
     if (window.screen) {
-      const screen = window.screen.orientation ||
-                     window.screen.mozOrientation ||
-                     window.screen.msOrientation;
+      const screen =
+        window.screen.orientation ||
+        window.screen.mozOrientation ||
+        window.screen.msOrientation;
       if (screen && screen.addEventListener) {
         this.unlistenScreenOrientationChange_ = listen(
-            screen,
-            'change',
-            dispatchScreenOrientationChangeEvents
+          screen,
+          'change',
+          dispatchScreenOrientationChangeEvents
         );
       } else {
         this.unlistenOrientationChange_ = listen(
-            this.win,
-            'orientationchange',
-            dispatchOrientationChangeEvents
+          this.win,
+          'orientationchange',
+          dispatchOrientationChangeEvents
         );
       }
     } else {
       this.unlistenOrientationChange_ = listen(
-          this.win,
-          'orientationchange',
-          dispatchOrientationChangeEvents
+        this.win,
+        'orientationchange',
+        dispatchOrientationChangeEvents
       );
     }
     this.unlistenDeviceOrientation_ = listen(
-        this.win,
-        'deviceorientation',
-        dispatchDeviceOrientationEvents
+      this.win,
+      'deviceorientation',
+      dispatchDeviceOrientationEvents
     );
     this.unlistenDeviceMotion_ = listen(
-        this.win,
-        'devicemotion',
-        dispatchDeviceMotionEvents
+      this.win,
+      'devicemotion',
+      dispatchDeviceMotionEvents
     );
   }
 
diff --git a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
index d3faa5b2933e..26300370b971 100644
--- a/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
+++ b/extensions/amp-delight-player/0.1/test/test-amp-delight-player.js
@@ -16,52 +16,59 @@
 
 import '../amp-delight-player';
 
-describes.realWin('amp-delight-player', {
-  amp: {
-    extensions: ['amp-delight-player'],
+describes.realWin(
+  'amp-delight-player',
+  {
+    amp: {
+      extensions: ['amp-delight-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getDelightPlayer(attributes) {
-    const delight = doc.createElement('amp-delight-player');
-    for (const key in attributes) {
-      delight.setAttribute(key, attributes[key]);
-    }
-    delight.setAttribute('width', '640');
-    delight.setAttribute('height', '360');
-    delight.setAttribute('layout', 'responsive');
-    doc.body.appendChild(delight);
-    return delight.build()
+    function getDelightPlayer(attributes) {
+      const delight = doc.createElement('amp-delight-player');
+      for (const key in attributes) {
+        delight.setAttribute(key, attributes[key]);
+      }
+      delight.setAttribute('width', '640');
+      delight.setAttribute('height', '360');
+      delight.setAttribute('layout', 'responsive');
+      doc.body.appendChild(delight);
+      return delight
+        .build()
         .then(() => delight.layoutCallback())
         .then(() => delight);
-  }
+    }
 
-  it('renders', () => {
-    return getDelightPlayer({
-      'data-content-id': '-LLoCCZqWi18O73b6M0w',
-    }).then(delight => {
-      const iframe = delight.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://players.delight-vr.com/player/-LLoCCZqWi18O73b6M0w?amp=1');
-      expect(iframe.allow).to.equal('vr');
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders', () => {
+      return getDelightPlayer({
+        'data-content-id': '-LLoCCZqWi18O73b6M0w',
+      }).then(delight => {
+        const iframe = delight.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://players.delight-vr.com/player/-LLoCCZqWi18O73b6M0w?amp=1'
+        );
+        expect(iframe.allow).to.equal('vr');
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('fails if no content is specified', () => {
-    return allowConsoleError(() => { return getDelightPlayer({
-      'data-content-id': '',
-    }).should.eventually.be.rejectedWith(
-        /The data-content-id attribute is required/);
+    it('fails if no content is specified', () => {
+      return allowConsoleError(() => {
+        return getDelightPlayer({
+          'data-content-id': '',
+        }).should.eventually.be.rejectedWith(
+          /The data-content-id attribute is required/
+        );
+      });
     });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-dynamic-css-classes/0.1/amp-dynamic-css-classes.js b/extensions/amp-dynamic-css-classes/0.1/amp-dynamic-css-classes.js
index 07f329279969..f7b35f42a942 100644
--- a/extensions/amp-dynamic-css-classes/0.1/amp-dynamic-css-classes.js
+++ b/extensions/amp-dynamic-css-classes/0.1/amp-dynamic-css-classes.js
@@ -82,7 +82,6 @@ function normalizedReferrers(ampdoc) {
   return referrers_(referrer);
 }
 
-
 /**
  * Adds CSS classes onto the HTML element.
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -92,12 +91,10 @@ function addDynamicCssClasses(ampdoc, classes) {
   if (ampdoc.isBodyAvailable()) {
     addCssClassesToBody(ampdoc.getBody(), classes);
   } else {
-    ampdoc.whenBodyAvailable().then(
-        body => addCssClassesToBody(body, classes));
+    ampdoc.whenBodyAvailable().then(body => addCssClassesToBody(body, classes));
   }
 }
 
-
 /**
  * @param {!Element} body
  * @param {!Array<string>} classes
@@ -109,7 +106,6 @@ function addCssClassesToBody(body, classes) {
   }
 }
 
-
 /**
  * Adds dynamic css classes based on the referrer, with a separate class for
  * each level of subdomain specificity.
@@ -126,7 +122,6 @@ function addReferrerClasses(ampdoc) {
   });
 }
 
-
 /**
  * Adds a dynamic css class `amp-viewer` if this document is inside a viewer.
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -140,7 +135,6 @@ function addViewerClass(ampdoc) {
   }
 }
 
-
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  */
@@ -171,7 +165,5 @@ class AmpDynamicCssClasses {
 
 // Register doc-service factory.
 AMP.extension('amp-dynamic-css-classes', '0.1', AMP => {
-  AMP.registerServiceForDoc(
-      'amp-dynamic-css-classes',
-      AmpDynamicCssClasses);
+  AMP.registerServiceForDoc('amp-dynamic-css-classes', AmpDynamicCssClasses);
 });
diff --git a/extensions/amp-dynamic-css-classes/0.1/test/test-runtime-classes.js b/extensions/amp-dynamic-css-classes/0.1/test/test-runtime-classes.js
index 497264bdf4c8..4adb109a5fd0 100644
--- a/extensions/amp-dynamic-css-classes/0.1/test/test-runtime-classes.js
+++ b/extensions/amp-dynamic-css-classes/0.1/test/test-runtime-classes.js
@@ -19,65 +19,70 @@ import {Services} from '../../../../src/services';
 import {vsyncForTesting} from '../../../../src/service/vsync-impl';
 
 const tcoReferrer = 'http://t.co/xyzabc123';
-const PinterestUA = 'Mozilla/5.0 (Linux; Android 5.1.1; SM-G920F' +
+const PinterestUA =
+  'Mozilla/5.0 (Linux; Android 5.1.1; SM-G920F' +
   ' Build/LMY47X; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0' +
   ' Chrome/47.0.2526.100 Mobile Safari/537.36 [Pinterest/Android]';
 
+describes.fakeWin(
+  'dynamic classes are inserted at runtime',
+  {
+    amp: true, // Extension will be installed manually in tests.
+    location: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+  },
+  env => {
+    let win, doc, ampdoc;
+    let body;
+    let viewer;
 
-describes.fakeWin('dynamic classes are inserted at runtime', {
-  amp: true, // Extension will be installed manually in tests.
-  location: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
-}, env => {
-  let win, doc, ampdoc;
-  let body;
-  let viewer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    body = doc.body;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      body = doc.body;
+    });
 
-  function setup(embeded, userAgent, referrer) {
-    const vsync = vsyncForTesting(win);
-    vsync.schedule_ = () => {
-      vsync.runScheduledTasks_();
-    };
-    viewer = Services.viewerForDoc(ampdoc);
-    viewer.isEmbedded = () => !!embeded;
-    if (userAgent !== undefined) {
-      win.navigator.userAgent = userAgent;
+    function setup(embeded, userAgent, referrer) {
+      const vsync = vsyncForTesting(win);
+      vsync.schedule_ = () => {
+        vsync.runScheduledTasks_();
+      };
+      viewer = Services.viewerForDoc(ampdoc);
+      viewer.isEmbedded = () => !!embeded;
+      if (userAgent !== undefined) {
+        win.navigator.userAgent = userAgent;
+      }
+      if (referrer !== undefined) {
+        sandbox
+          .stub(viewer, 'getUnconfirmedReferrerUrl')
+          .callsFake(() => referrer);
+      }
+      env.installExtension('amp-dynamic-css-classes');
     }
-    if (referrer !== undefined) {
-      sandbox.stub(viewer, 'getUnconfirmedReferrerUrl').callsFake(
-          () => referrer);
-    }
-    env.installExtension('amp-dynamic-css-classes');
-  }
 
-  describe('when embedded', () => {
-    beforeEach(() => {
-      setup(true);
-    });
+    describe('when embedded', () => {
+      beforeEach(() => {
+        setup(true);
+      });
 
-    it('should include viewer class', () => {
-      expect(body).to.have.class('amp-viewer');
+      it('should include viewer class', () => {
+        expect(body).to.have.class('amp-viewer');
+      });
     });
-  });
 
-  describe('Normalizing Referrers', () => {
-    it('should normalize twitter shortlinks to twitter', () => {
-      setup(false, '', tcoReferrer);
-      expect(body).to.have.class('amp-referrer-com');
-      expect(body).to.have.class('amp-referrer-twitter-com');
-    });
+    describe('Normalizing Referrers', () => {
+      it('should normalize twitter shortlinks to twitter', () => {
+        setup(false, '', tcoReferrer);
+        expect(body).to.have.class('amp-referrer-com');
+        expect(body).to.have.class('amp-referrer-twitter-com');
+      });
 
-    it('should normalize pinterest on android', () => {
-      setup(false, PinterestUA, '');
-      expect(body).to.have.class('amp-referrer-com');
-      expect(body).to.have.class('amp-referrer-pinterest-com');
-      expect(body).to.have.class('amp-referrer-www-pinterest-com');
+      it('should normalize pinterest on android', () => {
+        setup(false, PinterestUA, '');
+        expect(body).to.have.class('amp-referrer-com');
+        expect(body).to.have.class('amp-referrer-pinterest-com');
+        expect(body).to.have.class('amp-referrer-www-pinterest-com');
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
index d8d314ba7862..b776bb82783e 100644
--- a/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
+++ b/extensions/amp-embedly-card/0.1/amp-embedly-card-impl.js
@@ -39,7 +39,6 @@ const API_KEY_ATTR_NAME = 'data-card-key';
  * See {@link ../amp-embedly-card.md} for the spec.
  */
 export class AmpEmbedlyCard extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -54,8 +53,11 @@ export class AmpEmbedlyCard extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     userAssert(
-        this.element.getAttribute('data-url'),
-        'The data-url attribute is required for <%s> %s', TAG, this.element);
+      this.element.getAttribute('data-url'),
+      'The data-url attribute is required for <%s> %s',
+      TAG,
+      this.element
+    );
 
     const ampEmbedlyKeyElement = document.querySelector(KEY_TAG);
     if (ampEmbedlyKeyElement) {
@@ -74,9 +76,14 @@ export class AmpEmbedlyCard extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'embedly');
 
     const opt_is3P = true;
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, opt_is3P);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this./*OK*/ changeHeight(data['height']);
+      },
+      opt_is3P
+    );
 
     this.applyFillContent(iframe);
     this.getVsync().mutate(() => {
diff --git a/extensions/amp-embedly-card/0.1/amp-embedly-key.js b/extensions/amp-embedly-card/0.1/amp-embedly-key.js
index 48543bf396a2..4e67804690f7 100644
--- a/extensions/amp-embedly-card/0.1/amp-embedly-key.js
+++ b/extensions/amp-embedly-card/0.1/amp-embedly-key.js
@@ -36,8 +36,11 @@ export class AmpEmbedlyKey extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     userAssert(
-        this.element.getAttribute('value'),
-        'The value attribute is required for <%s>', TAG, this.element);
+      this.element.getAttribute('value'),
+      'The value attribute is required for <%s>',
+      TAG,
+      this.element
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-embedly-card/0.1/test/test-amp-embedly-card.js b/extensions/amp-embedly-card/0.1/test/test-amp-embedly-card.js
index 538ca38503f1..5b05cd0dbf3a 100644
--- a/extensions/amp-embedly-card/0.1/test/test-amp-embedly-card.js
+++ b/extensions/amp-embedly-card/0.1/test/test-amp-embedly-card.js
@@ -16,62 +16,69 @@
 
 import '../amp-embedly-card';
 
-describes.realWin('amp-embedly-card', {
-  amp: {
-    extensions: ['amp-embedly-card'],
+describes.realWin(
+  'amp-embedly-card',
+  {
+    amp: {
+      extensions: ['amp-embedly-card'],
+    },
   },
-}, env => {
-
-  let win;
-  let element;
-
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-embedly-card');
-    win.document.body.appendChild(element);
-  });
+  env => {
+    let win;
+    let element;
+
+    beforeEach(() => {
+      win = env.win;
+      element = win.document.createElement('amp-embedly-card');
+      win.document.body.appendChild(element);
+    });
 
-  function createEmbedlyCard(dataUrl) {
-    const element = win.document.createElement('amp-embedly-card');
+    function createEmbedlyCard(dataUrl) {
+      const element = win.document.createElement('amp-embedly-card');
 
-    element.setAttribute('data-url', dataUrl);
-    element.setAttribute('height', '100');
+      element.setAttribute('data-url', dataUrl);
+      element.setAttribute('height', '100');
 
-    win.document.body.appendChild(element);
+      win.document.body.appendChild(element);
 
-    return element.build()
+      return element
+        .build()
         .then(() => element.layoutCallback())
         .then(() => element);
-  }
+    }
 
-  it('renders responsively', () => {
-    return createEmbedlyCard('https://twitter.com/AMPhtml/status/986750295077040128')
-        .then(element => {
-          const iframe = element.querySelector('iframe');
+    it('renders responsively', () => {
+      return createEmbedlyCard(
+        'https://twitter.com/AMPhtml/status/986750295077040128'
+      ).then(element => {
+        const iframe = element.querySelector('iframe');
 
-          expect(iframe).to.not.be.null;
-          expect(iframe.className).to.match(/i-amphtml-fill-content/);
-        });
-  });
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
+    });
 
-  it('throws when data-url is not given', () => {
-    allowConsoleError(() => expect(createEmbedlyCard('')).to.be.rejectedWith(
-        /The data-url attribute is required for/
-    ));
-  });
+    it('throws when data-url is not given', () => {
+      allowConsoleError(() =>
+        expect(createEmbedlyCard('')).to.be.rejectedWith(
+          /The data-url attribute is required for/
+        )
+      );
+    });
 
-  it('removes iframe after unlayoutCallback', () => {
-    return createEmbedlyCard('https://twitter.com/AMPhtml').then(element => {
-      const iframe = element.querySelector('iframe');
+    it('removes iframe after unlayoutCallback', () => {
+      return createEmbedlyCard('https://twitter.com/AMPhtml').then(element => {
+        const iframe = element.querySelector('iframe');
 
-      expect(iframe).to.not.be.null;
+        expect(iframe).to.not.be.null;
 
-      const instance = element.implementation_;
+        const instance = element.implementation_;
 
-      instance.unlayoutCallback();
+        instance.unlayoutCallback();
 
-      expect(element.querySelector('iframe')).to.be.null;
-      expect(instance.iframe_).to.be.null;
+        expect(element.querySelector('iframe')).to.be.null;
+        expect(instance.iframe_).to.be.null;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-experiment/0.1/amp-experiment.js b/extensions/amp-experiment/0.1/amp-experiment.js
index 058ca2eb0c49..cc43f81ece8e 100644
--- a/extensions/amp-experiment/0.1/amp-experiment.js
+++ b/extensions/amp-experiment/0.1/amp-experiment.js
@@ -23,9 +23,7 @@ import {parseJson} from '../../../src/json';
 const TAG = 'amp-experiment';
 const ATTR_PREFIX = 'amp-x-';
 
-
 export class AmpExperiment extends AMP.BaseElement {
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.NODISPLAY || layout == Layout.CONTAINER;
@@ -33,45 +31,50 @@ export class AmpExperiment extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    return getServicePromiseForDoc(this.getAmpDoc(), 'variant')
-        .then(variantsService => {
-          try {
-            const config = this.getConfig_();
-            const results = Object.create(null);
-            const variants = Object.keys(config).map(experimentName => {
-              return allocateVariant(
-                  this.getAmpDoc(), experimentName, config[experimentName])
-                  .then(variantName => {
-                    results[experimentName] = variantName;
-                  });
+    return getServicePromiseForDoc(this.getAmpDoc(), 'variant').then(
+      variantsService => {
+        try {
+          const config = this.getConfig_();
+          const results = Object.create(null);
+          const variants = Object.keys(config).map(experimentName => {
+            return allocateVariant(
+              this.getAmpDoc(),
+              experimentName,
+              config[experimentName]
+            ).then(variantName => {
+              results[experimentName] = variantName;
             });
+          });
 
-            /** @private @const {!Promise<!Object<string, ?string>>} */
-            const experimentVariants = Promise.all(variants)
-                .then(() => results)
-                .then(this.addToBody_.bind(this));
+          /** @private @const {!Promise<!Object<string, ?string>>} */
+          const experimentVariants = Promise.all(variants)
+            .then(() => results)
+            .then(this.addToBody_.bind(this));
 
-            variantsService.init(experimentVariants);
-          } catch (e) {
-            // Ensure downstream consumers don't wait for the promise forever.
-            variantsService.init({});
-            throw e;
-          }
-        });
+          variantsService.init(experimentVariants);
+        } catch (e) {
+          // Ensure downstream consumers don't wait for the promise forever.
+          variantsService.init({});
+          throw e;
+        }
+      }
+    );
   }
 
   /** @return {!JsonObject} [description] */
   getConfig_() {
     const {children} = this.element;
     userAssert(
-        children.length == 1 && children[0].tagName == 'SCRIPT'
-            && children[0].getAttribute('type').toUpperCase()
-                == 'APPLICATION/JSON',
-        '<amp-experiment> should contain exactly one ' +
-        '<script type="application/json"> child.');
+      children.length == 1 &&
+        children[0].tagName == 'SCRIPT' &&
+        children[0].getAttribute('type').toUpperCase() == 'APPLICATION/JSON',
+      '<amp-experiment> should contain exactly one ' +
+        '<script type="application/json"> child.'
+    );
 
-    return /** @type {!JsonObject} */ (
-      devAssert(parseJson(children[0].textContent)));
+    return /** @type {!JsonObject} */ (devAssert(
+      parseJson(children[0].textContent)
+    ));
   }
 
   /**
@@ -87,8 +90,10 @@ export class AmpExperiment extends AMP.BaseElement {
     return doc.whenBodyAvailable().then(body => {
       for (const name in experiments) {
         if (experiments[name]) {
-          body.setAttribute(ATTR_PREFIX + name,
-              dev().assertString(experiments[name]));
+          body.setAttribute(
+            ATTR_PREFIX + name,
+            dev().assertString(experiments[name])
+          );
         }
       }
       return experiments;
@@ -96,7 +101,6 @@ export class AmpExperiment extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerServiceForDoc('variant', Variants);
   AMP.registerElement(TAG, AmpExperiment);
diff --git a/extensions/amp-experiment/0.1/test/test-amp-experiment.js b/extensions/amp-experiment/0.1/test/test-amp-experiment.js
index 7df075f21313..b447027927a4 100644
--- a/extensions/amp-experiment/0.1/test/test-amp-experiment.js
+++ b/extensions/amp-experiment/0.1/test/test-amp-experiment.js
@@ -19,123 +19,135 @@ import {AmpExperiment} from '../amp-experiment';
 import {Services} from '../../../../src/services';
 import {hasOwn} from '../../../../src/utils/object';
 
-
-describes.realWin('amp-experiment', {
-  amp: {
-    extensions: ['amp-experiment'],
+describes.realWin(
+  'amp-experiment',
+  {
+    amp: {
+      extensions: ['amp-experiment'],
+    },
   },
-}, env => {
-
-  const config = {
-    'experiment-1': {
-      variants: {
-        'variant-a': 50,
-        'variant-b': 50,
+  env => {
+    const config = {
+      'experiment-1': {
+        variants: {
+          'variant-a': 50,
+          'variant-b': 50,
+        },
       },
-    },
-    'experiment-2': {
-      variants: {
-        'variant-c': 50,
-        'variant-d': 50,
+      'experiment-2': {
+        variants: {
+          'variant-c': 50,
+          'variant-d': 50,
+        },
       },
-    },
-    'experiment-3': {
-      variants: {
-        'variant-e': 1,
+      'experiment-3': {
+        variants: {
+          'variant-e': 1,
+        },
       },
-    },
-  };
-
-  let win, doc;
-  let ampdoc;
-  let experiment;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    const el = doc.createElement('amp-experiment');
-    el.ampdoc_ = ampdoc;
-    experiment = new AmpExperiment(el);
-  });
+    };
+
+    let win, doc;
+    let ampdoc;
+    let experiment;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      const el = doc.createElement('amp-experiment');
+      el.ampdoc_ = ampdoc;
+      experiment = new AmpExperiment(el);
+    });
 
-  function addConfigElement(opt_elementName, opt_type, opt_textContent) {
-    const child = doc.createElement(opt_elementName || 'script');
-    child.setAttribute('type', opt_type || 'application/json');
-    child.textContent = opt_textContent || JSON.stringify(config);
-    experiment.element.appendChild(child);
-  }
+    function addConfigElement(opt_elementName, opt_type, opt_textContent) {
+      const child = doc.createElement(opt_elementName || 'script');
+      child.setAttribute('type', opt_type || 'application/json');
+      child.textContent = opt_textContent || JSON.stringify(config);
+      experiment.element.appendChild(child);
+    }
 
-  function expectBodyHasAttributes(attributes) {
-    for (const attributeName in attributes) {
-      if (hasOwn(attributes, attributeName)) {
-        expect(doc.body.getAttribute(attributeName))
-            .to.equal(attributes[attributeName]);
+    function expectBodyHasAttributes(attributes) {
+      for (const attributeName in attributes) {
+        if (hasOwn(attributes, attributeName)) {
+          expect(doc.body.getAttribute(attributeName)).to.equal(
+            attributes[attributeName]
+          );
+        }
       }
     }
-  }
 
-  it('should not throw on valid config', () => {
-    expect(() => {
-      addConfigElement('script');
-      experiment.buildCallback();
-    }).to.not.throw();
-  });
+    it('should not throw on valid config', () => {
+      expect(() => {
+        addConfigElement('script');
+        experiment.buildCallback();
+      }).to.not.throw();
+    });
 
-  it('should throw if it has no child element', () => {
-    expectAsyncConsoleError(/should contain exactly one/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/should contain exactly one/);
-  });
+    it('should throw if it has no child element', () => {
+      expectAsyncConsoleError(/should contain exactly one/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /should contain exactly one/
+      );
+    });
 
-  it('should throw if it has multiple child elements', () => {
-    addConfigElement('script');
-    addConfigElement('script');
-    expectAsyncConsoleError(/should contain exactly one/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/should contain exactly one/);
-  });
+    it('should throw if it has multiple child elements', () => {
+      addConfigElement('script');
+      addConfigElement('script');
+      expectAsyncConsoleError(/should contain exactly one/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /should contain exactly one/
+      );
+    });
 
-  it('should throw if the child element is not a <script> element', () => {
-    addConfigElement('a');
-    expectAsyncConsoleError(/script/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/script/);
-  });
+    it('should throw if the child element is not a <script> element', () => {
+      addConfigElement('a');
+      expectAsyncConsoleError(/script/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /script/
+      );
+    });
 
-  it('should throw if the child script element is not json typed', () => {
-    addConfigElement('script', 'wrongtype');
-    expectAsyncConsoleError(/application\/json/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/application\/json/);
-  });
+    it('should throw if the child script element is not json typed', () => {
+      addConfigElement('script', 'wrongtype');
+      expectAsyncConsoleError(/application\/json/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /application\/json/
+      );
+    });
 
-  it('should throw if the child script element has non-JSON content', () => {
-    addConfigElement('script', 'application/json', '{not json}');
-    expectAsyncConsoleError();
-    return experiment.buildCallback().then(() => {
-      throw new Error('must have failed');
-    }, () => {
-      return Services.variantsForDocOrNull(ampdoc.getHeadNode())
-          .then(service => service.getVariants())
-          .then(variants => {
-            expect(variants).to.deep.equal({});
-          });
+    it('should throw if the child script element has non-JSON content', () => {
+      addConfigElement('script', 'application/json', '{not json}');
+      expectAsyncConsoleError();
+      return experiment.buildCallback().then(
+        () => {
+          throw new Error('must have failed');
+        },
+        () => {
+          return Services.variantsForDocOrNull(ampdoc.getHeadNode())
+            .then(service => service.getVariants())
+            .then(variants => {
+              expect(variants).to.deep.equal({});
+            });
+        }
+      );
     });
-  });
 
-  it('should add attributes to body element for the allocated variants', () => {
-    addConfigElement('script');
-    const stub = sandbox.stub(variant, 'allocateVariant');
-    stub.withArgs(ampdoc, 'experiment-1', config['experiment-1'])
+    it('should add attributes to body element for the allocated variants', () => {
+      addConfigElement('script');
+      const stub = sandbox.stub(variant, 'allocateVariant');
+      stub
+        .withArgs(ampdoc, 'experiment-1', config['experiment-1'])
         .returns(Promise.resolve('variant-a'));
-    stub.withArgs(ampdoc, 'experiment-2', config['experiment-2'])
+      stub
+        .withArgs(ampdoc, 'experiment-2', config['experiment-2'])
         .returns(Promise.resolve('variant-d'));
-    stub.withArgs(ampdoc, 'experiment-3', config['experiment-3'])
+      stub
+        .withArgs(ampdoc, 'experiment-3', config['experiment-3'])
         .returns(Promise.resolve(null));
 
-    experiment.buildCallback();
-    return Services.variantsForDocOrNull(ampdoc.getHeadNode())
+      experiment.buildCallback();
+      return Services.variantsForDocOrNull(ampdoc.getHeadNode())
         .then(variantsService => variantsService.getVariants())
         .then(variants => {
           expect(variants).to.jsonEqual({
@@ -147,8 +159,8 @@ describes.realWin('amp-experiment', {
             'amp-x-experiment-1': 'variant-a',
             'amp-x-experiment-2': 'variant-d',
           });
-          expect(doc.body.getAttribute('amp-x-experiment-3'))
-              .to.equal(null);
+          expect(doc.body.getAttribute('amp-x-experiment-3')).to.equal(null);
         });
-  });
-});
+    });
+  }
+);
diff --git a/extensions/amp-experiment/0.1/test/test-variant.js b/extensions/amp-experiment/0.1/test/test-variant.js
index 065f61d70945..0fdf5c58f800 100644
--- a/extensions/amp-experiment/0.1/test/test-variant.js
+++ b/extensions/amp-experiment/0.1/test/test-variant.js
@@ -47,28 +47,40 @@ describes.sandboxed('allocateVariant', {}, env => {
     fakeHead = {};
 
     getCidStub = sandbox.stub();
-    sandbox.stub(Services, 'cidForDoc').withArgs(ampdoc)
-        .returns(Promise.resolve({
+    sandbox
+      .stub(Services, 'cidForDoc')
+      .withArgs(ampdoc)
+      .returns(
+        Promise.resolve({
           get: getCidStub,
-        }));
+        })
+      );
 
     uniformStub = sandbox.stub();
-    sandbox.stub(Services, 'cryptoFor').withArgs(fakeWin)
-        .returns({
-          uniform: uniformStub,
-        });
+    sandbox
+      .stub(Services, 'cryptoFor')
+      .withArgs(fakeWin)
+      .returns({
+        uniform: uniformStub,
+      });
 
     getNotificationStub = sandbox.stub();
-    sandbox.stub(Services, 'userNotificationManagerForDoc').withArgs(fakeHead)
-        .returns(Promise.resolve({
+    sandbox
+      .stub(Services, 'userNotificationManagerForDoc')
+      .withArgs(fakeHead)
+      .returns(
+        Promise.resolve({
           getNotification: getNotificationStub,
-        }));
+        })
+      );
 
     getParamStub = sandbox.stub();
-    sandbox.stub(Services, 'viewerForDoc').withArgs(ampdoc)
-        .returns({
-          getParam: getParamStub,
-        });
+    sandbox
+      .stub(Services, 'viewerForDoc')
+      .withArgs(ampdoc)
+      .returns({
+        getParam: getParamStub,
+      });
 
     sandbox.stub(ampdoc, 'getHeadNode').returns(fakeHead);
   });
@@ -82,79 +94,99 @@ describes.sandboxed('allocateVariant', {}, env => {
       allocateVariant(ampdoc, 'name', undefined);
     }).to.throw();
 
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {});
-    }).to.throw(/Missing experiment variants config/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {variants: {}});
-    }).to.throw(/Missing experiment variants config/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'invalid_char_%_in_name': 1,
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'variant_1': 50,
-          'variant_2': 51,
-        },
-      });
-    }).to.throw(/Total percentage is bigger than 100/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'negative_percentage': -1,
-        },
-      });
-    }).to.throw(/Invalid percentage/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'too_big_percentage': 101,
-        },
-      });
-    }).to.throw(/Invalid percentage/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'non_number_percentage': '50',
-        },
-      });
-    }).to.throw(/Invalid percentage/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'invalid_name!', {
-        variants: {
-          'variant_1': 50,
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, '', {
-        variants: {
-          'variant_1': 50,
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        group: 'invalid_group_name!',
-        variants: {
-          'variant_1': 50,
-        },
-      });
-    }).to.throw(/Invalid name/); });
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {});
+      }).to.throw(/Missing experiment variants config/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {variants: {}});
+      }).to.throw(/Missing experiment variants config/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'invalid_char_%_in_name': 1,
+          },
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'variant_1': 50,
+            'variant_2': 51,
+          },
+        });
+      }).to.throw(/Total percentage is bigger than 100/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'negative_percentage': -1,
+          },
+        });
+      }).to.throw(/Invalid percentage/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'too_big_percentage': 101,
+          },
+        });
+      }).to.throw(/Invalid percentage/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'non_number_percentage': '50',
+          },
+        });
+      }).to.throw(/Invalid percentage/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'invalid_name!', {
+          variants: {
+            'variant_1': 50,
+          },
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, '', {
+          variants: {
+            'variant_1': 50,
+          },
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          group: 'invalid_group_name!',
+          variants: {
+            'variant_1': 50,
+          },
+        });
+      }).to.throw(/Invalid name/);
+    });
   });
 
   it('should work around float rounding error', () => {
@@ -172,153 +204,184 @@ describes.sandboxed('allocateVariant', {}, env => {
   });
 
   it('should work in non-sticky mode', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': 56.1,
-        '-Variant_2': 23.3,
-      },
-    })).to.eventually.equal('-Variant_2');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': 56.1,
+          '-Variant_2': 23.3,
+        },
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
   it('should allocate variant in name order', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_2': 50,
-        '-Variant_1': 50,
-      },
-    })).to.eventually.equal('-Variant_2');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_2': 50,
+          '-Variant_1': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
-  it('can have no variant allocated if variants don\'t add up to 100', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': 2.1,
-        '-Variant_2': 23.3,
-        '-Variant_3': 20.123,
-      },
-    })).to.eventually.equal(null);
+  it("can have no variant allocated if variants don't add up to 100", () => {
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': 2.1,
+          '-Variant_2': 23.3,
+          '-Variant_3': 20.123,
+        },
+      })
+    ).to.eventually.equal(null);
   });
 
   it('allow variant override from URL fragment', () => {
     getParamStub.withArgs('amp-x-Name').returns('-Variant_1');
-    return expect(allocateVariant(ampdoc, 'Name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_1');
+    return expect(
+      allocateVariant(ampdoc, 'Name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('variant override should ignore non-existed variant name', () => {
     getParamStub.withArgs('amp-x-name').returns('-Variant_3');
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_2');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
   it('should work in sticky mode with default CID scope', () => {
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_1');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should work in sticky mode with custom CID scope', () => {
-    getCidStub.withArgs({
-      scope: 'custom-scope',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'custom-scope',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      cidScope: 'custom-scope',
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_1');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        cidScope: 'custom-scope',
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should work in sticky mode with custom group', () => {
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('custom-group:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      group: 'custom-group',
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_1');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        group: 'custom-group',
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should have variant allocated if consent is given', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve({
-          isDismissed: () => {
-            return (Promise.resolve(true));
-          },
-        }));
-
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getNotificationStub.withArgs('notif-1').returns(
+      Promise.resolve({
+        isDismissed: () => {
+          return Promise.resolve(true);
+        },
+      })
+    );
+
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal('-Variant_1');
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should have no variant allocated if notification not found', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve(null));
-
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.be.rejectedWith('Notification not found: notif-1');
+    getNotificationStub.withArgs('notif-1').returns(Promise.resolve(null));
+
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.be.rejectedWith('Notification not found: notif-1');
   });
 
   it('should have no variant allocated if consent is missing', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve({
-          isDismissed: () => {
-            return (Promise.resolve(false));
-          },
-        }));
+    getNotificationStub.withArgs('notif-1').returns(
+      Promise.resolve({
+        isDismissed: () => {
+          return Promise.resolve(false);
+        },
+      })
+    );
 
     getCidStub.returns(Promise.resolve('123abc'));
     uniformStub.returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': 50,
-        '-Variant_2': 50,
-      },
-    })).to.eventually.equal(null);
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': 50,
+          '-Variant_2': 50,
+        },
+      })
+    ).to.eventually.equal(null);
   });
 });
diff --git a/extensions/amp-experiment/0.1/variant.js b/extensions/amp-experiment/0.1/variant.js
index 06dcad5abd92..38ff2ecf2a81 100644
--- a/extensions/amp-experiment/0.1/variant.js
+++ b/extensions/amp-experiment/0.1/variant.js
@@ -23,13 +23,11 @@ import {isObject} from '../../../src/types';
 const ATTR_PREFIX = 'amp-x-';
 const nameValidator = /^[\w-]+$/;
 
-
 /**
  * Variants service provides VARIANT variables for the experiment config.
  * @implements {../../../src/render-delaying-services.RenderDelayingService}
  */
 export class Variants {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -69,7 +67,6 @@ export class Variants {
   }
 }
 
-
 /**
  * Allocates the current page view to an experiment variant based on the given
  * experiment config.
@@ -97,13 +94,14 @@ export function allocateVariant(ampdoc, experimentName, config) {
   if (sticky && config['consentNotificationId']) {
     const element = ampdoc.getHeadNode();
     hasConsentPromise = Services.userNotificationManagerForDoc(element)
-        .then(manager => manager.getNotification(
-            config['consentNotificationId']))
-        .then(userNotification => {
-          userAssert(userNotification,
-              `Notification not found: ${config['consentNotificationId']}`);
-          return userNotification.isDismissed();
-        });
+      .then(manager => manager.getNotification(config['consentNotificationId']))
+      .then(userNotification => {
+        userAssert(
+          userNotification,
+          `Notification not found: ${config['consentNotificationId']}`
+        );
+        return userNotification.isDismissed();
+      });
   }
 
   return hasConsentPromise.then(hasConsent => {
@@ -111,21 +109,22 @@ export function allocateVariant(ampdoc, experimentName, config) {
       return null;
     }
     const group = config['group'] || experimentName;
-    return getBucketTicket(ampdoc, group, sticky ? cidScope : null)
-        .then(ticket => {
-          let upperBound = 0;
-
-          // Loop through keys in a specific order since the default object key
-          // enumeration is implementation (browser) dependent.
-          const variantNames = Object.keys(config['variants']).sort();
-          for (let i = 0; i < variantNames.length; i++) {
-            upperBound += config['variants'][variantNames[i]];
-            if (ticket < upperBound) {
-              return variantNames[i];
-            }
+    return getBucketTicket(ampdoc, group, sticky ? cidScope : null).then(
+      ticket => {
+        let upperBound = 0;
+
+        // Loop through keys in a specific order since the default object key
+        // enumeration is implementation (browser) dependent.
+        const variantNames = Object.keys(config['variants']).sort();
+        for (let i = 0; i < variantNames.length; i++) {
+          upperBound += config['variants'][variantNames[i]];
+          if (ticket < upperBound) {
+            return variantNames[i];
           }
-          return null;
-        });
+        }
+        return null;
+      }
+    );
   });
 }
 
@@ -136,8 +135,10 @@ export function allocateVariant(ampdoc, experimentName, config) {
  */
 function validateConfig(config) {
   const variants = config['variants'];
-  userAssert(isObject(variants) && Object.keys(variants).length > 0,
-      'Missing experiment variants config.');
+  userAssert(
+    isObject(variants) && Object.keys(variants).length > 0,
+    'Missing experiment variants config.'
+  );
   if (config['group']) {
     assertName(config['group']);
   }
@@ -147,15 +148,19 @@ function validateConfig(config) {
       assertName(variantName);
       const percentage = variants[variantName];
       userAssert(
-          typeof percentage === 'number' && percentage > 0 && percentage < 100,
-          'Invalid percentage %s:%s.'
-              + ' Has to be greater than 0 and less than 100',
-          variantName, percentage);
+        typeof percentage === 'number' && percentage > 0 && percentage < 100,
+        'Invalid percentage %s:%s.' +
+          ' Has to be greater than 0 and less than 100',
+        variantName,
+        percentage
+      );
       totalPercentage += percentage;
     }
   }
-  userAssert(totalPercentage./*avoid float precision*/toFixed(6) <= 100,
-      'Total percentage is bigger than 100: ' + totalPercentage);
+  userAssert(
+    totalPercentage./*avoid float precision*/ toFixed(6) <= 100,
+    'Total percentage is bigger than 100: ' + totalPercentage
+  );
 }
 
 /**
@@ -173,14 +178,18 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
   }
 
   const cidPromise = Services.cidForDoc(ampdoc).then(cidService =>
-    cidService.get({
-      scope: dev().assertString(opt_cidScope),
-      createCookieIfNotPresent: true,
-    }, Promise.resolve()));
+    cidService.get(
+      {
+        scope: dev().assertString(opt_cidScope),
+        createCookieIfNotPresent: true,
+      },
+      Promise.resolve()
+    )
+  );
 
   return Promise.all([cidPromise, Services.cryptoFor(ampdoc.win)])
-      .then(results => results[1].uniform(group + ':' + results[0]))
-      .then(hash => hash * 100);
+    .then(results => results[1].uniform(group + ':' + results[0]))
+    .then(hash => hash * 100);
 }
 
 /**
@@ -188,6 +197,9 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
  * @param {string} name
  */
 function assertName(name) {
-  userAssert(nameValidator.test(name),
-      'Invalid name: %s. Allowed chars are [a-zA-Z0-9-_].', name);
+  userAssert(
+    nameValidator.test(name),
+    'Invalid name: %s. Allowed chars are [a-zA-Z0-9-_].',
+    name
+  );
 }
diff --git a/extensions/amp-experiment/1.0/amp-experiment.js b/extensions/amp-experiment/1.0/amp-experiment.js
index 800e715223af..43ce1ea00be1 100644
--- a/extensions/amp-experiment/1.0/amp-experiment.js
+++ b/extensions/amp-experiment/1.0/amp-experiment.js
@@ -15,10 +15,7 @@
  */
 
 import {Layout} from '../../../src/layout';
-import {
-  Variants,
-  allocateVariant,
-} from './variant';
+import {Variants, allocateVariant} from './variant';
 import {devAssert, user, userAssert} from '../../../src/log';
 import {getServicePromiseForDoc} from '../../../src/service';
 import {
@@ -32,7 +29,6 @@ import {parseMutation} from './mutation-parser';
 const TAG = 'amp-experiment';
 
 export class AmpExperiment extends AMP.BaseElement {
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.NODISPLAY || layout == Layout.CONTAINER;
@@ -40,7 +36,6 @@ export class AmpExperiment extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-
     const buildCallbackPromises = [
       getServicePromiseForDoc(this.getAmpDoc(), 'variant'),
       this.isExperimentEnabled_(),
@@ -56,9 +51,7 @@ export class AmpExperiment extends AMP.BaseElement {
         // Ensure downstream consumers don't wait for the promise forever.
         variantsService.init(Promise.resolve({}));
 
-        return Promise.reject(
-            'Experiment amp-experiment-1.0 is not enabled.'
-        );
+        return Promise.reject('Experiment amp-experiment-1.0 is not enabled.');
       }
 
       try {
@@ -66,16 +59,18 @@ export class AmpExperiment extends AMP.BaseElement {
         const results = Object.create(null);
         const variants = Object.keys(config).map(experimentName => {
           return allocateVariant(
-              this.getAmpDoc(), experimentName, config[experimentName])
-              .then(variantName => {
-                results[experimentName] = variantName;
-              });
+            this.getAmpDoc(),
+            experimentName,
+            config[experimentName]
+          ).then(variantName => {
+            results[experimentName] = variantName;
+          });
         });
 
         /** @private @const {!Promise<!Object<string, ?string>>} */
         const experimentVariants = Promise.all(variants)
-            .then(() => results)
-            .then(this.applyExperimentVariants_.bind(this, config));
+          .then(() => results)
+          .then(this.applyExperimentVariants_.bind(this, config));
 
         variantsService.init(experimentVariants);
       } catch (e) {
@@ -106,14 +101,16 @@ export class AmpExperiment extends AMP.BaseElement {
   getConfig_() {
     const {children} = this.element;
     userAssert(
-        children.length == 1 && children[0].tagName == 'SCRIPT'
-            && children[0].getAttribute('type').toUpperCase()
-                == 'APPLICATION/JSON',
-        '<amp-experiment> should contain exactly one ' +
-        '<script type="application/json"> child.');
-
-    return /** @type {!JsonObject} */ (
-      devAssert(parseJson(children[0].textContent)));
+      children.length == 1 &&
+        children[0].tagName == 'SCRIPT' &&
+        children[0].getAttribute('type').toUpperCase() == 'APPLICATION/JSON',
+      '<amp-experiment> should contain exactly one ' +
+        '<script type="application/json"> child.'
+    );
+
+    return /** @type {!JsonObject} */ (devAssert(
+      parseJson(children[0].textContent)
+    ));
   }
 
   /**
@@ -137,7 +134,6 @@ export class AmpExperiment extends AMP.BaseElement {
    * @private
    */
   applyExperimentVariants_(config, experimentToVariant) {
-
     const appliedExperimentToVariantPromises = [];
 
     for (const experimentName in experimentToVariant) {
@@ -145,13 +141,14 @@ export class AmpExperiment extends AMP.BaseElement {
       if (variantName) {
         const variantObject = config[experimentName]['variants'][variantName];
         appliedExperimentToVariantPromises.push(
-            this.applyMutations_(experimentName, variantObject)
+          this.applyMutations_(experimentName, variantObject)
         );
       }
     }
 
-    return Promise.all(appliedExperimentToVariantPromises)
-        .then(() => experimentToVariant);
+    return Promise.all(appliedExperimentToVariantPromises).then(
+      () => experimentToVariant
+    );
   }
 
   /**
@@ -165,16 +162,13 @@ export class AmpExperiment extends AMP.BaseElement {
   applyMutations_(experimentName, variantObject) {
     const doc = this.getAmpDoc();
     return doc.whenBodyAvailable().then(() => {
-
       // Parse / Validate all of our mutations
-      const mutationOperations = variantObject['mutations'].map(
-          mutation => parseMutation(mutation, this.win.document)
+      const mutationOperations = variantObject['mutations'].map(mutation =>
+        parseMutation(mutation, this.win.document)
       );
 
       // Apply our mutations
-      mutationOperations.forEach(
-          mutationOperation => mutationOperation()
-      );
+      mutationOperations.forEach(mutationOperation => mutationOperation());
     });
   }
 
@@ -184,7 +178,6 @@ export class AmpExperiment extends AMP.BaseElement {
    * @return {!Promise<boolean>}
    */
   isExperimentEnabled_() {
-
     // Check if we are enabled by AMP.toggleExperiment
     if (isExperimentOn(this.win, 'amp-experiment-1.0')) {
       return Promise.resolve(true);
@@ -193,14 +186,13 @@ export class AmpExperiment extends AMP.BaseElement {
     // Check if we are enabled by an origin trial
     installOriginExperimentsForDoc(this.getAmpDoc());
     return originExperimentsForDoc(this.element)
-        .getExperiments()
-        .then(trials => {
-          return trials && trials.includes('amp-experiment-1.0');
-        });
+      .getExperiments()
+      .then(trials => {
+        return trials && trials.includes('amp-experiment-1.0');
+      });
   }
 }
 
-
 AMP.extension(TAG, '1.0', AMP => {
   AMP.registerServiceForDoc('variant', Variants);
   AMP.registerElement(TAG, AmpExperiment);
diff --git a/extensions/amp-experiment/1.0/mutation-parser.js b/extensions/amp-experiment/1.0/mutation-parser.js
index 848b640f04e8..0b6b81df8746 100644
--- a/extensions/amp-experiment/1.0/mutation-parser.js
+++ b/extensions/amp-experiment/1.0/mutation-parser.js
@@ -25,15 +25,10 @@ const TAG = 'amp-experiment mutation-parser';
  * from the WorkerDOM MutationRecord.
  * This is the value set to the 'type' key.
  */
-const MUTATION_TYPES = [
-  'attributes',
-  'characterData',
-  'childList',
-];
+const MUTATION_TYPES = ['attributes', 'characterData', 'childList'];
 
 const SUPPORTED_ATTRIBUTES = {
   style: value => {
-
     // Do not allow Important or HTML Comments
     if (value.match(/(!\s*important|<!--)/)) {
       return false;
@@ -45,7 +40,9 @@ const SUPPORTED_ATTRIBUTES = {
     }
 
     // Allow Background color
-    if (value.match(/^background-color:\s*#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3});?$/)) {
+    if (
+      value.match(/^background-color:\s*#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3});?$/)
+    ) {
       return true;
     }
 
@@ -68,7 +65,6 @@ const SUPPORTED_ATTRIBUTES = {
  * @return {!Function}
  */
 export function parseMutation(mutation, document) {
-
   const mutationRecord = assertMutationRecord(mutation);
 
   const stringifiedMutation = JSON.stringify(mutation);
@@ -76,17 +72,15 @@ export function parseMutation(mutation, document) {
   setSelectorToElement('target', mutationRecord, document);
 
   if (mutationRecord['type'] === 'attributes') {
-
     assertAttributeMutation(mutationRecord, stringifiedMutation);
 
     return () => {
       mutationRecord['targetElement'].setAttribute(
-          mutationRecord['attributeName'],
-          mutationRecord['value']
+        mutationRecord['attributeName'],
+        mutationRecord['value']
       );
     };
   } else if (mutationRecord['type'] === 'characterData') {
-
     assertCharacterDataMutation(mutationRecord, stringifiedMutation);
 
     return () => {
@@ -96,9 +90,8 @@ export function parseMutation(mutation, document) {
     // childList type of mutation
 
     user().error(
-        TAG,
-        'childList mutations not supported ' +
-      'in the current experiment state.'
+      TAG,
+      'childList mutations not supported in the current experiment state.'
     );
 
     // TODO (torch2424): Remove this NOOP after reviews
@@ -114,35 +107,32 @@ export function parseMutation(mutation, document) {
  * @return {!Object}
  */
 function assertMutationRecord(mutation) {
-
   // Assert that the mutation is an object
   userAssert(
-      isObject(mutation),
-      'Mutation %s must be an object.',
-      JSON.stringify(mutation)
+    isObject(mutation),
+    'Mutation %s must be an object.',
+    JSON.stringify(mutation)
   );
 
   // Assert the mutation type
   userAssert(
-      mutation['type'] !== undefined &&
-    typeof mutation['type'] === 'string',
-      'Mutation %s must have a type.',
-      JSON.stringify(mutation)
+    mutation['type'] !== undefined && typeof mutation['type'] === 'string',
+    'Mutation %s must have a type.',
+    JSON.stringify(mutation)
   );
 
   // Assert the mutation type is one of the following keys
   userAssert(
-      MUTATION_TYPES.indexOf(mutation['type']) >= 0,
-      'Mutation %s must have a type.',
-      JSON.stringify(mutation)
+    MUTATION_TYPES.indexOf(mutation['type']) >= 0,
+    'Mutation %s must have a type.',
+    JSON.stringify(mutation)
   );
 
   // Assert the mutation target
   userAssert(
-      mutation['target'] !== undefined &&
-    typeof mutation['target'] === 'string',
-      'Mutation %s must have a target.',
-      JSON.stringify(mutation)
+    mutation['target'] !== undefined && typeof mutation['target'] === 'string',
+    'Mutation %s must have a target.',
+    JSON.stringify(mutation)
   );
 
   return mutation;
@@ -160,9 +150,9 @@ function setSelectorToElement(selectorKey, mutationRecord, document) {
   const targetElement = document.querySelector(mutationRecord[selectorKey]);
 
   userAssert(
-      targetElement !== null,
-      'No element on the document matches the selector, %s .',
-      mutationRecord[selectorKey]
+    targetElement !== null,
+    'No element on the document matches the selector, %s .',
+    mutationRecord[selectorKey]
   );
 
   mutationRecord[selectorKey + 'Element'] = targetElement;
@@ -177,37 +167,36 @@ function setSelectorToElement(selectorKey, mutationRecord, document) {
 function assertAttributeMutation(mutationRecord, stringifiedMutation) {
   // Assert the mutation value
   userAssert(
-      mutationRecord['value'] !== undefined &&
-    typeof mutationRecord['value'] === 'string',
-      'Mutation %s must have a value.',
-      stringifiedMutation
+    mutationRecord['value'] !== undefined &&
+      typeof mutationRecord['value'] === 'string',
+    'Mutation %s must have a value.',
+    stringifiedMutation
   );
 
   // Assert mutation attributeName
   userAssert(
-      mutationRecord['attributeName'] !== undefined &&
-    typeof mutationRecord['attributeName'] === 'string',
-      'Mutation %s must have a attributeName.',
-      stringifiedMutation
+    mutationRecord['attributeName'] !== undefined &&
+      typeof mutationRecord['attributeName'] === 'string',
+    'Mutation %s must have a attributeName.',
+    stringifiedMutation
   );
 
-  const supportedAttributeKeys =
-    Object.keys(SUPPORTED_ATTRIBUTES);
+  const supportedAttributeKeys = Object.keys(SUPPORTED_ATTRIBUTES);
 
   // Assert the mutation attribute is one of the following keys
   userAssert(
-      supportedAttributeKeys.indexOf(mutationRecord['attributeName']) >= 0,
-      'Mutation %s has an unsupported attributeName.',
-      stringifiedMutation
+    supportedAttributeKeys.indexOf(mutationRecord['attributeName']) >= 0,
+    'Mutation %s has an unsupported attributeName.',
+    stringifiedMutation
   );
 
   // Assert the mutation attribute passes it's check
   userAssert(
-      SUPPORTED_ATTRIBUTES[mutationRecord['attributeName']](
-          mutationRecord['value']
-      ),
-      'Mutation %s has an an unsupported value.',
-      stringifiedMutation
+    SUPPORTED_ATTRIBUTES[mutationRecord['attributeName']](
+      mutationRecord['value']
+    ),
+    'Mutation %s has an an unsupported value.',
+    stringifiedMutation
   );
 }
 
@@ -220,9 +209,9 @@ function assertAttributeMutation(mutationRecord, stringifiedMutation) {
 function assertCharacterDataMutation(mutationRecord, stringifiedMutation) {
   // Assert the mutation value
   userAssert(
-      mutationRecord['value'] !== undefined &&
-    typeof mutationRecord['value'] === 'string',
-      'Mutation %s must have a value.',
-      stringifiedMutation
+    mutationRecord['value'] !== undefined &&
+      typeof mutationRecord['value'] === 'string',
+    'Mutation %s must have a value.',
+    stringifiedMutation
   );
 }
diff --git a/extensions/amp-experiment/1.0/test/test-amp-experiment.js b/extensions/amp-experiment/1.0/test/test-amp-experiment.js
index f2f6eb32d68f..5aba399ecbb7 100644
--- a/extensions/amp-experiment/1.0/test/test-amp-experiment.js
+++ b/extensions/amp-experiment/1.0/test/test-amp-experiment.js
@@ -19,148 +19,159 @@ import {AmpExperiment} from '../amp-experiment';
 import {Services} from '../../../../src/services';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-experiment', {
-  amp: {
-    extensions: ['amp-experiment:1.0'],
+describes.realWin(
+  'amp-experiment',
+  {
+    amp: {
+      extensions: ['amp-experiment:1.0'],
+    },
   },
-}, env => {
-
-  // Config has empty mutations
-  // As mutation parser tests will handle this
-  const config = {
-    'experiment-1': {
-      variants: {
-        'variant-a': {
-          weight: 50,
-          mutations: [{}],
-        },
-        'variant-b': {
-          weight: 50,
-          mutations: [{}],
+  env => {
+    // Config has empty mutations
+    // As mutation parser tests will handle this
+    const config = {
+      'experiment-1': {
+        variants: {
+          'variant-a': {
+            weight: 50,
+            mutations: [{}],
+          },
+          'variant-b': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
       },
-    },
-    'experiment-2': {
-      variants: {
-        'variant-c': {
-          weight: 50,
-          mutations: [{}],
-        },
-        'variant-d': {
-          weight: 50,
-          mutations: [{}],
+      'experiment-2': {
+        variants: {
+          'variant-c': {
+            weight: 50,
+            mutations: [{}],
+          },
+          'variant-d': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
       },
-    },
-    'experiment-3': {
-      variants: {
-        'variant-e': {
-          weight: 1,
-          mutations: [{}],
+      'experiment-3': {
+        variants: {
+          'variant-e': {
+            weight: 1,
+            mutations: [{}],
+          },
         },
       },
-    },
-  };
-
-  let win, doc;
-  let ampdoc;
-  let experiment;
-  let el;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-
-    toggleExperiment(win, 'amp-experiment-1.0', true);
-
-    el = doc.createElement('amp-experiment');
-    el.ampdoc_ = ampdoc;
-    experiment = new AmpExperiment(el);
-  });
-
-  function addConfigElement(opt_elementName, opt_type, opt_textContent) {
-    const child = doc.createElement(opt_elementName || 'script');
-    child.setAttribute('type', opt_type || 'application/json');
-    child.textContent = opt_textContent || JSON.stringify(config);
-    experiment.element.appendChild(child);
-  }
+    };
+
+    let win, doc;
+    let ampdoc;
+    let experiment;
+    let el;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
 
-  it('Rejects because experiment is not enabled', () => {
-    toggleExperiment(win, 'amp-experiment-1.0', false);
+      toggleExperiment(win, 'amp-experiment-1.0', true);
 
-    expectAsyncConsoleError(/Experiment/);
-    addConfigElement('script');
-    doc.body.appendChild(el);
-    return experiment.buildCallback()
-        .should.eventually.be.rejectedWith(
-            /Experiment/
-        );
-  });
+      el = doc.createElement('amp-experiment');
+      el.ampdoc_ = ampdoc;
+      experiment = new AmpExperiment(el);
+    });
+
+    function addConfigElement(opt_elementName, opt_type, opt_textContent) {
+      const child = doc.createElement(opt_elementName || 'script');
+      child.setAttribute('type', opt_type || 'application/json');
+      child.textContent = opt_textContent || JSON.stringify(config);
+      experiment.element.appendChild(child);
+    }
+
+    it('Rejects because experiment is not enabled', () => {
+      toggleExperiment(win, 'amp-experiment-1.0', false);
 
-  it('should not throw on valid config', () => {
-    expect(() => {
+      expectAsyncConsoleError(/Experiment/);
       addConfigElement('script');
-      experiment.buildCallback();
-    }).to.not.throw();
-  });
-
-  it('should throw if it has no child element', () => {
-    expectAsyncConsoleError(/should contain exactly one/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/should contain exactly one/);
-  });
-
-  it('should throw if it has multiple child elements', () => {
-    addConfigElement('script');
-    addConfigElement('script');
-    expectAsyncConsoleError(/should contain exactly one/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/should contain exactly one/);
-  });
-
-  it('should throw if the child element is not a <script> element', () => {
-    addConfigElement('a');
-    expectAsyncConsoleError(/script/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/script/);
-  });
-
-  it('should throw if the child script element is not json typed', () => {
-    addConfigElement('script', 'wrongtype');
-    expectAsyncConsoleError(/application\/json/);
-    return expect(experiment.buildCallback()).to.eventually
-        .be.rejectedWith(/application\/json/);
-  });
-
-  it('should throw if the child script element has non-JSON content', () => {
-    addConfigElement('script', 'application/json', '{not json}');
-    expectAsyncConsoleError();
-    return experiment.buildCallback().then(() => {
-      throw new Error('must have failed');
-    }, () => {
-      return Services.variantsForDocOrNull(ampdoc.getHeadNode())
-          .then(service => service.getVariants())
-          .then(variants => {
-            expect(variants).to.deep.equal({});
-          });
+      doc.body.appendChild(el);
+      return experiment
+        .buildCallback()
+        .should.eventually.be.rejectedWith(/Experiment/);
+    });
+
+    it('should not throw on valid config', () => {
+      expect(() => {
+        addConfigElement('script');
+        experiment.buildCallback();
+      }).to.not.throw();
     });
-  });
 
-  it('should apply the mutations from the variant', () => {
-    addConfigElement('script');
-    const stub = sandbox.stub(variant, 'allocateVariant');
-    stub.withArgs(ampdoc, 'experiment-1', config['experiment-1'])
+    it('should throw if it has no child element', () => {
+      expectAsyncConsoleError(/should contain exactly one/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /should contain exactly one/
+      );
+    });
+
+    it('should throw if it has multiple child elements', () => {
+      addConfigElement('script');
+      addConfigElement('script');
+      expectAsyncConsoleError(/should contain exactly one/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /should contain exactly one/
+      );
+    });
+
+    it('should throw if the child element is not a <script> element', () => {
+      addConfigElement('a');
+      expectAsyncConsoleError(/script/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /script/
+      );
+    });
+
+    it('should throw if the child script element is not json typed', () => {
+      addConfigElement('script', 'wrongtype');
+      expectAsyncConsoleError(/application\/json/);
+      return expect(experiment.buildCallback()).to.eventually.be.rejectedWith(
+        /application\/json/
+      );
+    });
+
+    it('should throw if the child script element has non-JSON content', () => {
+      addConfigElement('script', 'application/json', '{not json}');
+      expectAsyncConsoleError();
+      return experiment.buildCallback().then(
+        () => {
+          throw new Error('must have failed');
+        },
+        () => {
+          return Services.variantsForDocOrNull(ampdoc.getHeadNode())
+            .then(service => service.getVariants())
+            .then(variants => {
+              expect(variants).to.deep.equal({});
+            });
+        }
+      );
+    });
+
+    it('should apply the mutations from the variant', () => {
+      addConfigElement('script');
+      const stub = sandbox.stub(variant, 'allocateVariant');
+      stub
+        .withArgs(ampdoc, 'experiment-1', config['experiment-1'])
         .returns(Promise.resolve('variant-a'));
-    stub.withArgs(ampdoc, 'experiment-2', config['experiment-2'])
+      stub
+        .withArgs(ampdoc, 'experiment-2', config['experiment-2'])
         .returns(Promise.resolve('variant-d'));
-    stub.withArgs(ampdoc, 'experiment-3', config['experiment-3'])
+      stub
+        .withArgs(ampdoc, 'experiment-3', config['experiment-3'])
         .returns(Promise.resolve(null));
 
-    const applyStub = sandbox.stub(experiment, 'applyMutations_');
+      const applyStub = sandbox.stub(experiment, 'applyMutations_');
 
-    experiment.buildCallback();
-    return Services.variantsForDocOrNull(ampdoc.getHeadNode())
+      experiment.buildCallback();
+      return Services.variantsForDocOrNull(ampdoc.getHeadNode())
         .then(variantsService => variantsService.getVariants())
         .then(variants => {
           expect(variants).to.jsonEqual({
@@ -171,5 +182,6 @@ describes.realWin('amp-experiment', {
 
           expect(applyStub).to.be.calledTwice;
         });
-  });
-});
+    });
+  }
+);
diff --git a/extensions/amp-experiment/1.0/test/test-mutation-parser.js b/extensions/amp-experiment/1.0/test/test-mutation-parser.js
index b371dadbe670..4a12bd02094a 100644
--- a/extensions/amp-experiment/1.0/test/test-mutation-parser.js
+++ b/extensions/amp-experiment/1.0/test/test-mutation-parser.js
@@ -27,13 +27,9 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
 
   function setupMutationSelector() {
     const targetId = 'mutation-parser-test';
-    const targetElement = createElementWithAttributes(
-        doc,
-        'div',
-        {
-          'id': targetId,
-        }
-    );
+    const targetElement = createElementWithAttributes(doc, 'div', {
+      'id': targetId,
+    });
 
     doc.body.appendChild(targetElement);
 
@@ -41,7 +37,6 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
   }
 
   function getAttributeMutation(opt_attributeName, opt_value) {
-
     const selector = setupMutationSelector();
 
     return {
@@ -53,7 +48,6 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
   }
 
   function getCharacterDataMutation(opt_value) {
-
     const selector = setupMutationSelector();
 
     return {
@@ -180,8 +174,7 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
       });
     });
 
-    it('should return an operation that,' +
-      ' changes attribute of selector', () => {
+    it('should return an operation that, changes attribute of selector', () => {
       const expectedStyle = 'color: #FFF';
       const mutation = getAttributeMutation('style', expectedStyle);
       const mutationOperation = parseMutation(mutation, doc);
@@ -189,7 +182,7 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
       mutationOperation();
 
       expect(
-          doc.querySelector(mutation['target']).getAttribute('style')
+        doc.querySelector(mutation['target']).getAttribute('style')
       ).to.be.equal(expectedStyle);
     });
   });
@@ -211,17 +204,16 @@ describes.realWin('amp-experiment mutation-parser', {}, env => {
       });
     });
 
-    it('should return an operation that,' +
-      ' changes textContent of selector', () => {
+    it('should return an operation that, changes textContent of selector', () => {
       const expectedTextContent = 'Expected';
       const mutation = getCharacterDataMutation(expectedTextContent);
       const mutationOperation = parseMutation(mutation, doc);
 
       mutationOperation();
 
-      expect(
-          doc.querySelector(mutation['target']).textContent
-      ).to.be.equal(expectedTextContent);
+      expect(doc.querySelector(mutation['target']).textContent).to.be.equal(
+        expectedTextContent
+      );
     });
   });
 });
diff --git a/extensions/amp-experiment/1.0/test/test-variant.js b/extensions/amp-experiment/1.0/test/test-variant.js
index 67984004aa31..a5e279491d5d 100644
--- a/extensions/amp-experiment/1.0/test/test-variant.js
+++ b/extensions/amp-experiment/1.0/test/test-variant.js
@@ -47,28 +47,40 @@ describes.sandboxed('allocateVariant', {}, env => {
     fakeHead = {};
 
     getCidStub = sandbox.stub();
-    sandbox.stub(Services, 'cidForDoc').withArgs(ampdoc)
-        .returns(Promise.resolve({
+    sandbox
+      .stub(Services, 'cidForDoc')
+      .withArgs(ampdoc)
+      .returns(
+        Promise.resolve({
           get: getCidStub,
-        }));
+        })
+      );
 
     uniformStub = sandbox.stub();
-    sandbox.stub(Services, 'cryptoFor').withArgs(fakeWin)
-        .returns({
-          uniform: uniformStub,
-        });
+    sandbox
+      .stub(Services, 'cryptoFor')
+      .withArgs(fakeWin)
+      .returns({
+        uniform: uniformStub,
+      });
 
     getNotificationStub = sandbox.stub();
-    sandbox.stub(Services, 'userNotificationManagerForDoc').withArgs(fakeHead)
-        .returns(Promise.resolve({
+    sandbox
+      .stub(Services, 'userNotificationManagerForDoc')
+      .withArgs(fakeHead)
+      .returns(
+        Promise.resolve({
           getNotification: getNotificationStub,
-        }));
+        })
+      );
 
     getParamStub = sandbox.stub();
-    sandbox.stub(Services, 'viewerForDoc').withArgs(ampdoc)
-        .returns({
-          getParam: getParamStub,
-        });
+    sandbox
+      .stub(Services, 'viewerForDoc')
+      .withArgs(ampdoc)
+      .returns({
+        getParam: getParamStub,
+      });
 
     sandbox.stub(ampdoc, 'getHeadNode').returns(fakeHead);
   });
@@ -82,132 +94,158 @@ describes.sandboxed('allocateVariant', {}, env => {
       allocateVariant(ampdoc, 'name', undefined);
     }).to.throw();
 
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {});
-    }).to.throw(/Missing variants/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {variants: 52});
-    }).to.throw(/Missing variants/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {variants: {}});
-    }).to.throw(/Missing variants/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'invalid_char_%_in_name': 1,
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'variant_1': {
-            weight: 51,
-            mutations: [{}],
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {});
+      }).to.throw(/Missing variants/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {variants: 52});
+      }).to.throw(/Missing variants/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {variants: {}});
+      }).to.throw(/Missing variants/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'invalid_char_%_in_name': 1,
           },
-          'variant_2': {
-            weight: 51,
-            mutations: [{}],
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'variant_1': {
+              weight: 51,
+              mutations: [{}],
+            },
+            'variant_2': {
+              weight: 51,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Total percentage is bigger than 100/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'negative_percentage': {
-            weight: -1,
-            mutations: [{}],
+        });
+      }).to.throw(/Total percentage is bigger than 100/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'negative_percentage': {
+              weight: -1,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Invalid weight percentage/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'too_big_percentage': {
-            weight: 101,
-            mutations: [{}],
+        });
+      }).to.throw(/Invalid weight percentage/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'too_big_percentage': {
+              weight: 101,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Invalid weight percentage/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'non_number_percentage': {
-            weight: '50',
-            mutations: [{}],
+        });
+      }).to.throw(/Invalid weight percentage/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'non_number_percentage': {
+              weight: '50',
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/must have a number weight/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'invalid_name!', {
-        variants: {
-          'variant_1': {
-            weight: 50,
-            mutations: [{}],
+        });
+      }).to.throw(/must have a number weight/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'invalid_name!', {
+          variants: {
+            'variant_1': {
+              weight: 50,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, '', {
-        variants: {
-          'variant_1': {
-            weight: 50,
-            mutations: [{}],
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, '', {
+          variants: {
+            'variant_1': {
+              weight: 50,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Invalid name/); });
-
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        group: 'invalid_group_name!',
-        variants: {
-          'variant_1': {
-            weight: 50,
-            mutations: [{}],
+        });
+      }).to.throw(/Invalid name/);
+    });
+
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          group: 'invalid_group_name!',
+          variants: {
+            'variant_1': {
+              weight: 50,
+              mutations: [{}],
+            },
           },
-        },
-      });
-    }).to.throw(/Invalid name/); });
+        });
+      }).to.throw(/Invalid name/);
+    });
   });
 
   it('should check that mutations exist', () => {
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'variant_1': {
-            weight: 50,
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'variant_1': {
+              weight: 50,
+            },
           },
-        },
-      });
-    }).to.throw(/mutations array/); });
+        });
+      }).to.throw(/mutations array/);
+    });
   });
 
   it('should check that has at least one mutation', () => {
-    allowConsoleError(() => { expect(() => {
-      allocateVariant(ampdoc, 'name', {
-        variants: {
-          'variant_1': {
-            weight: 50,
-            mutations: [],
+    allowConsoleError(() => {
+      expect(() => {
+        allocateVariant(ampdoc, 'name', {
+          variants: {
+            'variant_1': {
+              weight: 50,
+              mutations: [],
+            },
           },
-        },
-      });
-    }).to.throw(/one mutation/); });
+        });
+      }).to.throw(/one mutation/);
+    });
   });
 
   it('should work around float rounding error', () => {
@@ -237,222 +275,253 @@ describes.sandboxed('allocateVariant', {}, env => {
   });
 
   it('should work in non-sticky mode', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': {
-          weight: 56.1,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 23.3,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': {
+            weight: 56.1,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 23.3,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_2');
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
   it('should allocate variant in name order', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_2');
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
-  it('can have no variant allocated if variants don\'t add up to 100', () => {
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': {
-          weight: 2.1,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 23.3,
-          mutations: [{}],
-        },
-        '-Variant_3': {
-          weight: 20.123,
-          mutations: [{}],
+  it("can have no variant allocated if variants don't add up to 100", () => {
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': {
+            weight: 2.1,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 23.3,
+            mutations: [{}],
+          },
+          '-Variant_3': {
+            weight: 20.123,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal(null);
+      })
+    ).to.eventually.equal(null);
   });
 
   it('allow variant override from URL fragment', () => {
     getParamStub.withArgs('amp-x-Name').returns('-Variant_1');
-    return expect(allocateVariant(ampdoc, 'Name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'Name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_1');
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('variant override should ignore non-existed variant name', () => {
     getParamStub.withArgs('amp-x-name').returns('-Variant_3');
-    return expect(allocateVariant(ampdoc, 'name', {
-      sticky: false,
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        sticky: false,
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_2');
+      })
+    ).to.eventually.equal('-Variant_2');
   });
 
   it('should work in sticky mode with default CID scope', () => {
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_1');
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should work in sticky mode with custom CID scope', () => {
-    getCidStub.withArgs({
-      scope: 'custom-scope',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'custom-scope',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      cidScope: 'custom-scope',
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        cidScope: 'custom-scope',
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_1');
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should work in sticky mode with custom group', () => {
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('custom-group:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      group: 'custom-group',
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        group: 'custom-group',
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_1');
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should have variant allocated if consent is given', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve({
-          isDismissed: () => {
-            return (Promise.resolve(true));
-          },
-        }));
-
-    getCidStub.withArgs({
-      scope: 'amp-experiment',
-      createCookieIfNotPresent: true,
-    }).returns(Promise.resolve('123abc'));
+    getNotificationStub.withArgs('notif-1').returns(
+      Promise.resolve({
+        isDismissed: () => {
+          return Promise.resolve(true);
+        },
+      })
+    );
+
+    getCidStub
+      .withArgs({
+        scope: 'amp-experiment',
+        createCookieIfNotPresent: true,
+      })
+      .returns(Promise.resolve('123abc'));
     uniformStub.withArgs('name:123abc').returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal('-Variant_1');
+      })
+    ).to.eventually.equal('-Variant_1');
   });
 
   it('should have no variant allocated if notification not found', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve(null));
-
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    getNotificationStub.withArgs('notif-1').returns(Promise.resolve(null));
+
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.be.rejectedWith('Notification not found: notif-1');
+      })
+    ).to.eventually.be.rejectedWith('Notification not found: notif-1');
   });
 
   it('should have no variant allocated if consent is missing', () => {
-    getNotificationStub.withArgs('notif-1')
-        .returns(Promise.resolve({
-          isDismissed: () => {
-            return (Promise.resolve(false));
-          },
-        }));
+    getNotificationStub.withArgs('notif-1').returns(
+      Promise.resolve({
+        isDismissed: () => {
+          return Promise.resolve(false);
+        },
+      })
+    );
 
     getCidStub.returns(Promise.resolve('123abc'));
     uniformStub.returns(Promise.resolve(0.4));
-    return expect(allocateVariant(ampdoc, 'name', {
-      consentNotificationId: 'notif-1',
-      variants: {
-        '-Variant_1': {
-          weight: 50,
-          mutations: [{}],
-        },
-        '-Variant_2': {
-          weight: 50,
-          mutations: [{}],
+    return expect(
+      allocateVariant(ampdoc, 'name', {
+        consentNotificationId: 'notif-1',
+        variants: {
+          '-Variant_1': {
+            weight: 50,
+            mutations: [{}],
+          },
+          '-Variant_2': {
+            weight: 50,
+            mutations: [{}],
+          },
         },
-      },
-    })).to.eventually.equal(null);
+      })
+    ).to.eventually.equal(null);
   });
 });
diff --git a/extensions/amp-experiment/1.0/variant.js b/extensions/amp-experiment/1.0/variant.js
index 93cb37cc5b39..bab13b25bf87 100644
--- a/extensions/amp-experiment/1.0/variant.js
+++ b/extensions/amp-experiment/1.0/variant.js
@@ -28,7 +28,6 @@ const nameValidator = /^[\w-]+$/;
  * @implements {../../../src/render-delaying-services.RenderDelayingService}
  */
 export class Variants {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -46,9 +45,7 @@ export class Variants {
    * @restricted
    */
   init(variants) {
-    variants.then(result =>
-      this.variantsDeferred_.resolve(result)
-    );
+    variants.then(result => this.variantsDeferred_.resolve(result));
   }
 
   /**
@@ -97,14 +94,17 @@ export function allocateVariant(ampdoc, experimentName, experimentObject) {
   if (sticky && experimentObject['consentNotificationId']) {
     const element = ampdoc.getHeadNode();
     hasConsentPromise = Services.userNotificationManagerForDoc(element)
-        .then(manager => manager.getNotification(
-            experimentObject['consentNotificationId']))
-        .then(userNotification => {
-          userAssert(userNotification,
-              'Notification not found: ' +
-            `${experimentObject['consentNotificationId']}`);
-          return userNotification.isDismissed();
-        });
+      .then(manager =>
+        manager.getNotification(experimentObject['consentNotificationId'])
+      )
+      .then(userNotification => {
+        userAssert(
+          userNotification,
+          'Notification not found: ' +
+            `${experimentObject['consentNotificationId']}`
+        );
+        return userNotification.isDismissed();
+      });
   }
 
   return hasConsentPromise.then(hasConsent => {
@@ -112,22 +112,23 @@ export function allocateVariant(ampdoc, experimentName, experimentObject) {
       return null;
     }
     const group = experimentObject['group'] || experimentName;
-    return getBucketTicket(ampdoc, group, sticky ? cidScope : null)
-        .then(ticket => {
-          let upperBound = 0;
-
-          // Loop through keys in a specific order since the default object key
-          // enumeration is implementation (browser) dependent.
-          const variants = experimentObject['variants'];
-          const variantNames = Object.keys(variants).sort();
-          for (let i = 0; i < variantNames.length; i++) {
-            upperBound += variants[variantNames[i]]['weight'];
-            if (ticket < upperBound) {
-              return variantNames[i];
-            }
+    return getBucketTicket(ampdoc, group, sticky ? cidScope : null).then(
+      ticket => {
+        let upperBound = 0;
+
+        // Loop through keys in a specific order since the default object key
+        // enumeration is implementation (browser) dependent.
+        const variants = experimentObject['variants'];
+        const variantNames = Object.keys(variants).sort();
+        for (let i = 0; i < variantNames.length; i++) {
+          upperBound += variants[variantNames[i]]['weight'];
+          if (ticket < upperBound) {
+            return variantNames[i];
           }
-          return null;
-        });
+        }
+        return null;
+      }
+    );
   });
 }
 
@@ -139,8 +140,10 @@ export function allocateVariant(ampdoc, experimentName, experimentObject) {
  */
 function validateExperiment(experimentName, experimentObject) {
   const variants = experimentObject['variants'];
-  userAssert(isObject(variants) && Object.keys(variants).length > 0,
-      'Missing variants object from experiment.');
+  userAssert(
+    isObject(variants) && Object.keys(variants).length > 0,
+    'Missing variants object from experiment.'
+  );
   if (experimentObject['group']) {
     assertName(experimentObject['group']);
   }
@@ -151,18 +154,16 @@ function validateExperiment(experimentName, experimentObject) {
       assertName(variantName);
 
       const variant = variants[variantName];
-      assertVariant(
-          variant,
-          experimentName,
-          variantName
-      );
+      assertVariant(variant, experimentName, variantName);
 
       const percentage = variant['weight'];
       totalPercentage += percentage;
     }
   }
-  userAssert(totalPercentage./*avoid float precision*/toFixed(6) <= 100,
-      'Total percentage is bigger than 100: ' + totalPercentage);
+  userAssert(
+    totalPercentage./*avoid float precision*/ toFixed(6) <= 100,
+    'Total percentage is bigger than 100: ' + totalPercentage
+  );
 }
 
 /**
@@ -180,14 +181,18 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
   }
 
   const cidPromise = Services.cidForDoc(ampdoc).then(cidService =>
-    cidService.get({
-      scope: dev().assertString(opt_cidScope),
-      createCookieIfNotPresent: true,
-    }, Promise.resolve()));
+    cidService.get(
+      {
+        scope: dev().assertString(opt_cidScope),
+        createCookieIfNotPresent: true,
+      },
+      Promise.resolve()
+    )
+  );
 
   return Promise.all([cidPromise, Services.cryptoFor(ampdoc.win)])
-      .then(results => results[1].uniform(group + ':' + results[0]))
-      .then(hash => hash * 100);
+    .then(results => results[1].uniform(group + ':' + results[0]))
+    .then(hash => hash * 100);
 }
 
 /**
@@ -195,8 +200,11 @@ function getBucketTicket(ampdoc, group, opt_cidScope) {
  * @param {string} name
  */
 function assertName(name) {
-  userAssert(nameValidator.test(name),
-      'Invalid name: %s. Allowed chars are [a-zA-Z0-9-_].', name);
+  userAssert(
+    nameValidator.test(name),
+    'Invalid name: %s. Allowed chars are [a-zA-Z0-9-_].',
+    name
+  );
 }
 
 /**
@@ -207,37 +215,38 @@ function assertName(name) {
  * @throws {!Error}
  */
 function assertVariant(variant, experimentName, variantName) {
-
   // Assert that the variant is an object
   userAssert(
-      isObject(variant),
-      `${experimentName}.variants.${variantName} must be an object.`);
+    isObject(variant),
+    `${experimentName}.variants.${variantName} must be an object.`
+  );
 
   // Assert the variant weight
   userAssert(
-      variant['weight'] !== undefined &&
-    typeof variant['weight'] === 'number',
-      `${experimentName}.variants.${variantName} must have a number weight.`);
+    variant['weight'] !== undefined && typeof variant['weight'] === 'number',
+    `${experimentName}.variants.${variantName} must have a number weight.`
+  );
 
   // Assert the variant weight is a percentage
   const percentage = variant['weight'];
   userAssert(
-      percentage > 0 && percentage < 100,
-      'Invalid weight percentage %s.'
-    + ` ${experimentName}.variants.${variantName}` +
-    ' Has to be greater than 0 and less than 100',
-      percentage);
-
+    percentage > 0 && percentage < 100,
+    'Invalid weight percentage %s.' +
+      ` ${experimentName}.variants.${variantName}` +
+      ' Has to be greater than 0 and less than 100',
+    percentage
+  );
 
   // Assert the variant mutations
   userAssert(
-      variant['mutations'] && isArray(variant['mutations']),
-      `${experimentName}.variants.${variantName} must have a mutations array.`);
+    variant['mutations'] && isArray(variant['mutations']),
+    `${experimentName}.variants.${variantName} must have a mutations array.`
+  );
 
   // Assert the variant has mutations
   userAssert(
-      variant['mutations'].length > 0,
-      `${experimentName}.variants.${variantName} mutations`
-    + ' must have at least one mutation.');
+    variant['mutations'].length > 0,
+    `${experimentName}.variants.${variantName} mutations` +
+      ' must have at least one mutation.'
+  );
 }
-
diff --git a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
index f2703b91943d..565234471423 100644
--- a/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
+++ b/extensions/amp-facebook-comments/0.1/amp-facebook-comments.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {dashToUnderline} from '../../../src/string';
 import {getData, listen} from '../../../src/event-helper';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
@@ -25,7 +24,6 @@ import {removeElement} from '../../../src/dom';
 import {tryParseJson} from '../../../src/json';
 
 class AmpFacebookComments extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -34,9 +32,9 @@ class AmpFacebookComments extends AMP.BaseElement {
     this.iframe_ = null;
 
     /** @private @const {string} */
-    this.dataLocale_ = element.hasAttribute('data-locale') ?
-      element.getAttribute('data-locale') :
-      dashToUnderline(window.navigator.language);
+    this.dataLocale_ = element.hasAttribute('data-locale')
+      ? element.getAttribute('data-locale')
+      : dashToUnderline(window.navigator.language);
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
@@ -58,7 +56,9 @@ class AmpFacebookComments extends AMP.BaseElement {
     this.preconnect.url('https://facebook.com', opt_onLayout);
     // Hosts the facebook SDK.
     this.preconnect.preload(
-        'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js', 'script');
+      'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js',
+      'script'
+    );
     preloadBootstrap(this.win, this.preconnect);
   }
 
@@ -72,13 +72,18 @@ class AmpFacebookComments extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'facebook');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this./*OK*/ changeHeight(data['height']);
+      },
+      /* opt_is3P */ true
+    );
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleFacebookMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleFacebookMessages_.bind(this)
     );
     this.toggleLoading(true);
     this.element.appendChild(iframe);
@@ -99,8 +104,9 @@ class AmpFacebookComments extends AMP.BaseElement {
       return;
     }
 
-    const parsedEventData = isObject(eventData) ?
-      eventData : tryParseJson(eventData);
+    const parsedEventData = isObject(eventData)
+      ? eventData
+      : tryParseJson(eventData);
     if (!parsedEventData) {
       return;
     }
@@ -122,7 +128,6 @@ class AmpFacebookComments extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-facebook-comments', '0.1', AMP => {
   AMP.registerElement('amp-facebook-comments', AmpFacebookComments);
 });
diff --git a/extensions/amp-facebook-like/0.1/amp-facebook-like.js b/extensions/amp-facebook-like/0.1/amp-facebook-like.js
index 2e8aed879c23..913ada55a9ef 100644
--- a/extensions/amp-facebook-like/0.1/amp-facebook-like.js
+++ b/extensions/amp-facebook-like/0.1/amp-facebook-like.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {dashToUnderline} from '../../../src/string';
 import {getData, listen} from '../../../src/event-helper';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
@@ -25,7 +24,6 @@ import {removeElement} from '../../../src/dom';
 import {tryParseJson} from '../../../src/json';
 
 class AmpFacebookLike extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -34,9 +32,9 @@ class AmpFacebookLike extends AMP.BaseElement {
     this.iframe_ = null;
 
     /** @private @const {string} */
-    this.dataLocale_ = element.hasAttribute('data-locale') ?
-      element.getAttribute('data-locale') :
-      dashToUnderline(window.navigator.language);
+    this.dataLocale_ = element.hasAttribute('data-locale')
+      ? element.getAttribute('data-locale')
+      : dashToUnderline(window.navigator.language);
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
@@ -58,7 +56,9 @@ class AmpFacebookLike extends AMP.BaseElement {
     this.preconnect.url('https://facebook.com', opt_onLayout);
     // Hosts the facebook SDK.
     this.preconnect.preload(
-        'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js', 'script');
+      'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js',
+      'script'
+    );
     preloadBootstrap(this.win, this.preconnect);
   }
 
@@ -72,15 +72,20 @@ class AmpFacebookLike extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'facebook');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this.attemptChangeHeight(data['height']).catch(() => {
-        /* ignore failures */
-      });
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this.attemptChangeHeight(data['height']).catch(() => {
+          /* ignore failures */
+        });
+      },
+      /* opt_is3P */ true
+    );
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleFacebookMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleFacebookMessages_.bind(this)
     );
     this.toggleLoading(true);
     this.element.appendChild(iframe);
@@ -101,8 +106,9 @@ class AmpFacebookLike extends AMP.BaseElement {
       return;
     }
 
-    const parsedEventData = isObject(eventData) ?
-      eventData : tryParseJson(eventData);
+    const parsedEventData = isObject(eventData)
+      ? eventData
+      : tryParseJson(eventData);
     if (!parsedEventData) {
       return;
     }
@@ -124,7 +130,6 @@ class AmpFacebookLike extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-facebook-like', '0.1', AMP => {
   AMP.registerElement('amp-facebook-like', AmpFacebookLike);
 });
diff --git a/extensions/amp-facebook-page/0.1/amp-facebook-page.js b/extensions/amp-facebook-page/0.1/amp-facebook-page.js
index b71bcfdd0d02..e45ed01d0480 100644
--- a/extensions/amp-facebook-page/0.1/amp-facebook-page.js
+++ b/extensions/amp-facebook-page/0.1/amp-facebook-page.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {dashToUnderline} from '../../../src/string';
 import {getData, listen} from '../../../src/event-helper';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
@@ -25,7 +24,6 @@ import {removeElement} from '../../../src/dom';
 import {tryParseJson} from '../../../src/json';
 
 class AmpFacebookPage extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -34,9 +32,9 @@ class AmpFacebookPage extends AMP.BaseElement {
     this.iframe_ = null;
 
     /** @private @const {string} */
-    this.dataLocale_ = element.hasAttribute('data-locale') ?
-      element.getAttribute('data-locale') :
-      dashToUnderline(window.navigator.language);
+    this.dataLocale_ = element.hasAttribute('data-locale')
+      ? element.getAttribute('data-locale')
+      : dashToUnderline(window.navigator.language);
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
@@ -58,7 +56,9 @@ class AmpFacebookPage extends AMP.BaseElement {
     this.preconnect.url('https://facebook.com', opt_onLayout);
     // Hosts the facebook SDK.
     this.preconnect.preload(
-        'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js', 'script');
+      'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js',
+      'script'
+    );
     preloadBootstrap(this.win, this.preconnect);
   }
 
@@ -72,15 +72,20 @@ class AmpFacebookPage extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'facebook');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this.attemptChangeHeight(data['height']).catch(() => {
-        /* ignore failures */
-      });
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this.attemptChangeHeight(data['height']).catch(() => {
+          /* ignore failures */
+        });
+      },
+      /* opt_is3P */ true
+    );
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleFacebookMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleFacebookMessages_.bind(this)
     );
     this.toggleLoading(true);
     this.element.appendChild(iframe);
@@ -101,8 +106,9 @@ class AmpFacebookPage extends AMP.BaseElement {
       return;
     }
 
-    const parsedEventData = isObject(eventData) ?
-      eventData : tryParseJson(eventData);
+    const parsedEventData = isObject(eventData)
+      ? eventData
+      : tryParseJson(eventData);
     if (!parsedEventData) {
       return;
     }
@@ -124,7 +130,6 @@ class AmpFacebookPage extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-facebook-page', '0.1', AMP => {
   AMP.registerElement('amp-facebook-page', AmpFacebookPage);
 });
diff --git a/extensions/amp-facebook/0.1/amp-facebook.js b/extensions/amp-facebook/0.1/amp-facebook.js
index 1f8c19563dfe..eb80c2e6c89e 100644
--- a/extensions/amp-facebook/0.1/amp-facebook.js
+++ b/extensions/amp-facebook/0.1/amp-facebook.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {dashToUnderline} from '../../../src/string';
 import {getData, listen} from '../../../src/event-helper';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
@@ -26,7 +25,6 @@ import {removeElement} from '../../../src/dom';
 import {tryParseJson} from '../../../src/json';
 
 class AmpFacebook extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -35,16 +33,15 @@ class AmpFacebook extends AMP.BaseElement {
     this.iframe_ = null;
 
     /** @private @const {string} */
-    this.dataLocale_ = element.hasAttribute('data-locale') ?
-      element.getAttribute('data-locale') :
-      dashToUnderline(window.navigator.language);
+    this.dataLocale_ = element.hasAttribute('data-locale')
+      ? element.getAttribute('data-locale')
+      : dashToUnderline(window.navigator.language);
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
 
     /** @private {number} */
     this.toggleLoadingCounter_ = 0;
-
   }
 
   /** @override */
@@ -63,7 +60,9 @@ class AmpFacebook extends AMP.BaseElement {
     this.preconnect.url('https://facebook.com', opt_onLayout);
     // Hosts the facebook SDK.
     this.preconnect.preload(
-        'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js', 'script');
+      'https://connect.facebook.net/' + this.dataLocale_ + '/sdk.js',
+      'script'
+    );
     preloadBootstrap(this.win, this.preconnect);
   }
 
@@ -77,13 +76,18 @@ class AmpFacebook extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'facebook');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this./*OK*/ changeHeight(data['height']);
+      },
+      /* opt_is3P */ true
+    );
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleFacebookMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleFacebookMessages_.bind(this)
     );
     this.toggleLoading(true);
     if (getMode().test) {
@@ -107,8 +111,9 @@ class AmpFacebook extends AMP.BaseElement {
       return;
     }
 
-    const parsedEventData = isObject(eventData) ?
-      eventData : tryParseJson(eventData);
+    const parsedEventData = isObject(eventData)
+      ? eventData
+      : tryParseJson(eventData);
     if (!parsedEventData) {
       return;
     }
@@ -138,7 +143,6 @@ class AmpFacebook extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-facebook', '0.1', AMP => {
   AMP.registerElement('amp-facebook', AmpFacebook);
 });
diff --git a/extensions/amp-facebook/0.1/test/test-amp-facebook.js b/extensions/amp-facebook/0.1/test/test-amp-facebook.js
index 2ca752a12226..1fb0f9a1c7ba 100644
--- a/extensions/amp-facebook/0.1/test/test-amp-facebook.js
+++ b/extensions/amp-facebook/0.1/test/test-amp-facebook.js
@@ -20,255 +20,276 @@ import {resetServiceForTesting} from '../../../../src/service';
 import {setDefaultBootstrapBaseUrlForTesting} from '../../../../src/3p-frame';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-facebook', {
-  amp: {
-    extensions: ['amp-facebook'],
-    canonicalUrl: 'https://foo.bar/baz',
+describes.realWin(
+  'amp-facebook',
+  {
+    amp: {
+      extensions: ['amp-facebook'],
+      canonicalUrl: 'https://foo.bar/baz',
+    },
   },
-}, function(env) {
-  this.timeout(5000);
+  function(env) {
+    this.timeout(5000);
 
-  const fbPostHref = 'https://www.facebook.com/zuck/posts/10102593740125791';
-  const fbVideoHref = 'https://www.facebook.com/zuck/videos/10102509264909801/';
-  const fbPageHref = 'https://www.facebook.com/itsdougthepug';
-  let win, doc;
+    const fbPostHref = 'https://www.facebook.com/zuck/posts/10102593740125791';
+    const fbVideoHref =
+      'https://www.facebook.com/zuck/videos/10102509264909801/';
+    const fbPageHref = 'https://www.facebook.com/itsdougthepug';
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getAmpFacebook(href, opt_embedAs, opt_locale) {
-    const ampFB = doc.createElement('amp-facebook');
-    ampFB.setAttribute('data-href', href);
-    ampFB.setAttribute('width', '111');
-    ampFB.setAttribute('height', '222');
-    if (opt_embedAs) {
-      ampFB.setAttribute('data-embed-as', opt_embedAs);
-    }
-    if (opt_locale) {
-      ampFB.setAttribute('data-locale', opt_locale);
-    } else {
-      ampFB.setAttribute('data-locale', 'en_US');
+    function getAmpFacebook(href, opt_embedAs, opt_locale) {
+      const ampFB = doc.createElement('amp-facebook');
+      ampFB.setAttribute('data-href', href);
+      ampFB.setAttribute('width', '111');
+      ampFB.setAttribute('height', '222');
+      if (opt_embedAs) {
+        ampFB.setAttribute('data-embed-as', opt_embedAs);
+      }
+      if (opt_locale) {
+        ampFB.setAttribute('data-locale', opt_locale);
+      } else {
+        ampFB.setAttribute('data-locale', 'en_US');
+      }
+      doc.body.appendChild(ampFB);
+      return ampFB
+        .build()
+        .then(() => {
+          return ampFB.layoutCallback();
+        })
+        .then(() => ampFB);
     }
-    doc.body.appendChild(ampFB);
-    return ampFB.build().then(() => {
-      return ampFB.layoutCallback();
-    }).then(() => ampFB);
-  }
 
-  it('renders iframe in amp-facebook', () => {
-    return getAmpFacebook(fbPostHref).then(ampFB => {
-      const iframe = ampFB.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders iframe in amp-facebook', () => {
+      return getAmpFacebook(fbPostHref).then(ampFB => {
+        const iframe = ampFB.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('ensures iframe is not sandboxed in amp-facebook', () => {
-    // We sandbox all 3P iframes however facebook embeds completely break in
-    // sandbox mode since they need access to document.domain, so we
-    // exclude facebook.
-    toggleExperiment(win, 'sandbox-ads', true);
-    return getAmpFacebook(fbPostHref).then(ampFB => {
-      const iframe = ampFB.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.hasAttribute('sandbox')).to.be.false;
+    it('ensures iframe is not sandboxed in amp-facebook', () => {
+      // We sandbox all 3P iframes however facebook embeds completely break in
+      // sandbox mode since they need access to document.domain, so we
+      // exclude facebook.
+      toggleExperiment(win, 'sandbox-ads', true);
+      return getAmpFacebook(fbPostHref).then(ampFB => {
+        const iframe = ampFB.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.hasAttribute('sandbox')).to.be.false;
+      });
     });
-  });
 
-  it('renders iframe in amp-facebook with video', () => {
-    return getAmpFacebook(fbVideoHref, 'video').then(ampFB => {
-      const iframe = ampFB.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders iframe in amp-facebook with video', () => {
+      return getAmpFacebook(fbVideoHref, 'video').then(ampFB => {
+        const iframe = ampFB.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('renders amp-facebook with detected locale', () => {
-    return getAmpFacebook(fbVideoHref, 'post').then(ampFB => {
-      expect(ampFB).not.to.be.undefined;
-      expect(ampFB.getAttribute('data-locale')).to.equal('en_US');
+    it('renders amp-facebook with detected locale', () => {
+      return getAmpFacebook(fbVideoHref, 'post').then(ampFB => {
+        expect(ampFB).not.to.be.undefined;
+        expect(ampFB.getAttribute('data-locale')).to.equal('en_US');
+      });
     });
-  });
 
-  it('renders amp-facebook with specified locale', () => {
-    return getAmpFacebook(fbVideoHref, 'post', 'fr_FR').then(ampFB => {
-      expect(ampFB).not.to.be.undefined;
-      expect(ampFB.getAttribute('data-locale')).to.equal('fr_FR');
+    it('renders amp-facebook with specified locale', () => {
+      return getAmpFacebook(fbVideoHref, 'post', 'fr_FR').then(ampFB => {
+        expect(ampFB).not.to.be.undefined;
+        expect(ampFB.getAttribute('data-locale')).to.equal('fr_FR');
+      });
     });
-  });
 
-  it('adds loading element correctly', () => {
-    return getAmpFacebook(fbVideoHref, 'post').then(ampFB => {
-      expect(ampFB.implementation_.toggleLoadingCounter_).to.equal(1);
+    it('adds loading element correctly', () => {
+      return getAmpFacebook(fbVideoHref, 'post').then(ampFB => {
+        expect(ampFB.implementation_.toggleLoadingCounter_).to.equal(1);
+      });
     });
-  });
 
-  it('adds fb-post element correctly', () => {
-    const div = document.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK',
-    };
+    it('adds fb-post element correctly', () => {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      win.context = {
+        tagName: 'AMP-FACEBOOK',
+      };
 
-    facebook(win, {
-      href: fbPostHref,
-      width: 111,
-      height: 222,
+      facebook(win, {
+        href: fbPostHref,
+        width: 111,
+        height: 222,
+      });
+      const fbPost = doc.body.getElementsByClassName('fb-post')[0];
+      expect(fbPost).not.to.be.undefined;
+      expect(fbPost.getAttribute('data-href')).to.equal(fbPostHref);
     });
-    const fbPost = doc.body.getElementsByClassName('fb-post')[0];
-    expect(fbPost).not.to.be.undefined;
-    expect(fbPost.getAttribute('data-href')).to.equal(fbPostHref);
-  });
 
-  it('adds fb-video element correctly', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK',
-    };
+    it('adds fb-video element correctly', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      win.context = {
+        tagName: 'AMP-FACEBOOK',
+      };
 
-    facebook(win, {
-      href: fbVideoHref,
-      width: 111,
-      height: 222,
-      embedAs: 'video',
+      facebook(win, {
+        href: fbVideoHref,
+        width: 111,
+        height: 222,
+        embedAs: 'video',
+      });
+      const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
+      expect(fbVideo).not.to.be.undefined;
+      expect(fbVideo.getAttribute('data-href')).to.equal(fbVideoHref);
     });
-    const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
-    expect(fbVideo).not.to.be.undefined;
-    expect(fbVideo.getAttribute('data-href')).to.equal(fbVideoHref);
-  });
 
-  it('adds fb-video element with `data-embed-as` and `data-show-text` ' +
-    'attributes set correctly', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK',
-    };
+    it(
+      'adds fb-video element with `data-embed-as` and `data-show-text` ' +
+        'attributes set correctly',
+      () => {
+        const div = doc.createElement('div');
+        div.setAttribute('id', 'c');
+        doc.body.appendChild(div);
+        win.context = {
+          tagName: 'AMP-FACEBOOK',
+        };
 
-    facebook(win, {
-      href: fbVideoHref,
-      width: 111,
-      height: 222,
-    });
-    const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
-    expect(fbVideo).not.to.be.undefined;
-    expect(fbVideo.classList.contains('fb-video')).to.be.true;
-    expect(fbVideo.getAttribute('data-embed-as')).to.equal('video');
-    expect(fbVideo.getAttribute('data-show-text')).to.equal('true');
-  });
+        facebook(win, {
+          href: fbVideoHref,
+          width: 111,
+          height: 222,
+        });
+        const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
+        expect(fbVideo).not.to.be.undefined;
+        expect(fbVideo.classList.contains('fb-video')).to.be.true;
+        expect(fbVideo.getAttribute('data-embed-as')).to.equal('video');
+        expect(fbVideo.getAttribute('data-show-text')).to.equal('true');
+      }
+    );
 
-  it('retains fb-video element with `data-embed-as=\'video\'`', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK',
-    };
+    it("retains fb-video element with `data-embed-as='video'`", () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      win.context = {
+        tagName: 'AMP-FACEBOOK',
+      };
 
-    facebook(win, {
-      embedAs: 'video',
-      href: fbVideoHref,
-      width: 111,
-      height: 222,
+      facebook(win, {
+        embedAs: 'video',
+        href: fbVideoHref,
+        width: 111,
+        height: 222,
+      });
+      const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
+      expect(fbVideo).not.to.be.undefined;
+      expect(fbVideo.classList.contains('fb-video')).to.be.true;
     });
-    const fbVideo = doc.body.getElementsByClassName('fb-video')[0];
-    expect(fbVideo).not.to.be.undefined;
-    expect(fbVideo.classList.contains('fb-video')).to.be.true;
-  });
 
-  it('retains fb-video element with `data-embed-as=\'post\'`', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK',
-    };
+    it("retains fb-video element with `data-embed-as='post'`", () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      win.context = {
+        tagName: 'AMP-FACEBOOK',
+      };
 
-    facebook(win, {
-      embedAs: 'post',
-      href: fbVideoHref,
-      width: 111,
-      height: 222,
+      facebook(win, {
+        embedAs: 'post',
+        href: fbVideoHref,
+        width: 111,
+        height: 222,
+      });
+      const fbVideo = doc.body.getElementsByClassName('fb-post')[0];
+      expect(fbVideo).not.to.be.undefined;
+      expect(fbVideo.classList.contains('fb-post')).to.be.true;
     });
-    const fbVideo = doc.body.getElementsByClassName('fb-post')[0];
-    expect(fbVideo).not.to.be.undefined;
-    expect(fbVideo.classList.contains('fb-post')).to.be.true;
-  });
 
-  it('check that fb-page element correctly sets `data-adapt-container-width` ' +
-    'attribute to \'true\'', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    win.context = {
-      tagName: 'AMP-FACEBOOK-PAGE',
-    };
+    it(
+      'check that fb-page element correctly sets `data-adapt-container-width` ' +
+        "attribute to 'true'",
+      () => {
+        const div = doc.createElement('div');
+        div.setAttribute('id', 'c');
+        doc.body.appendChild(div);
+        win.context = {
+          tagName: 'AMP-FACEBOOK-PAGE',
+        };
 
-    facebook(win, {
-      href: fbPageHref,
-      width: 200,
-      height: 200,
-    });
-    const fbPage = doc.body.getElementsByClassName('fb-page')[0];
-    expect(fbPage).not.to.be.undefined;
-    expect(fbPage.getAttribute('data-adapt-container-width')).to.equal('true');
-  });
+        facebook(win, {
+          href: fbPageHref,
+          width: 200,
+          height: 200,
+        });
+        const fbPage = doc.body.getElementsByClassName('fb-page')[0];
+        expect(fbPage).not.to.be.undefined;
+        expect(fbPage.getAttribute('data-adapt-container-width')).to.equal(
+          'true'
+        );
+      }
+    );
 
-  it('removes iframe after unlayoutCallback', () => {
-    return getAmpFacebook(fbPostHref).then(ampFB => {
-      const iframe = ampFB.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = ampFB.implementation_;
-      obj.unlayoutCallback();
-      expect(ampFB.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(obj.unlayoutOnPause()).to.be.true;
+    it('removes iframe after unlayoutCallback', () => {
+      return getAmpFacebook(fbPostHref).then(ampFB => {
+        const iframe = ampFB.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = ampFB.implementation_;
+        obj.unlayoutCallback();
+        expect(ampFB.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(obj.unlayoutOnPause()).to.be.true;
+      });
     });
-  });
 
-  describes.realWin('resize', {
-    amp: {
-      extensions: ['amp-facebook'],
-      canonicalUrl: 'https://foo.bar/baz',
-    },
-    allowExternalResources: true,
-  }, function(env) {
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
+    describes.realWin(
+      'resize',
+      {
+        amp: {
+          extensions: ['amp-facebook'],
+          canonicalUrl: 'https://foo.bar/baz',
+        },
+        allowExternalResources: true,
+      },
+      function(env) {
+        beforeEach(() => {
+          win = env.win;
+          doc = win.document;
+        });
 
-    it('resizes facebook posts', () => {
-      const iframeSrc = 'http://ads.localhost:' + location.port +
-          '/test/fixtures/served/iframe.html';
-      resetServiceForTesting(win, 'bootstrapBaseUrl');
-      setDefaultBootstrapBaseUrlForTesting(iframeSrc);
-      return getAmpFacebook(fbPostHref).then(ampFB => {
-        return new Promise((resolve, unusedReject) => {
-          const {firstChild: iframe, implementation_: impl} = ampFB;
-          impl.changeHeight = newHeight => {
-            expect(newHeight).to.equal(666);
-            resolve(ampFB);
-          };
-          const message = {
-            type: 'requestHeight',
-            is3p: true,
-            height: 666,
-          };
-          message['sentinel'] = iframe.getAttribute(
-              'data-amp-3p-sentinel');
-          iframe.contentWindow.postMessage(message, '*');
+        it('resizes facebook posts', () => {
+          const iframeSrc =
+            'http://ads.localhost:' +
+            location.port +
+            '/test/fixtures/served/iframe.html';
+          resetServiceForTesting(win, 'bootstrapBaseUrl');
+          setDefaultBootstrapBaseUrlForTesting(iframeSrc);
+          return getAmpFacebook(fbPostHref).then(ampFB => {
+            return new Promise((resolve, unusedReject) => {
+              const {firstChild: iframe, implementation_: impl} = ampFB;
+              impl.changeHeight = newHeight => {
+                expect(newHeight).to.equal(666);
+                resolve(ampFB);
+              };
+              const message = {
+                type: 'requestHeight',
+                is3p: true,
+                height: 666,
+              };
+              message['sentinel'] = iframe.getAttribute('data-amp-3p-sentinel');
+              iframe.contentWindow.postMessage(message, '*');
+            });
+          });
         });
-      });
-    });
-  });
-});
+      }
+    );
+  }
+);
diff --git a/extensions/amp-fit-text/0.1/amp-fit-text.js b/extensions/amp-fit-text/0.1/amp-fit-text.js
index 6863476afe7b..ffa372100073 100644
--- a/extensions/amp-fit-text/0.1/amp-fit-text.js
+++ b/extensions/amp-fit-text/0.1/amp-fit-text.js
@@ -21,9 +21,7 @@ import {px, setStyle, setStyles} from '../../../src/style';
 const TAG = 'amp-fit-text';
 const LINE_HEIGHT_EM_ = 1.15;
 
-
 class AmpFitText extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -74,15 +72,15 @@ class AmpFitText extends AMP.BaseElement {
     this.getRealChildNodes().forEach(node => {
       this.contentWrapper_.appendChild(node);
     });
-    this.measurer_./*OK*/innerHTML = this.contentWrapper_./*OK*/innerHTML;
+    this.measurer_./*OK*/ innerHTML = this.contentWrapper_./*OK*/ innerHTML;
     this.element.appendChild(this.content_);
     this.element.appendChild(this.measurer_);
 
-    this.minFontSize_ = getLengthNumeral(this.element.getAttribute(
-        'min-font-size')) || 6;
+    this.minFontSize_ =
+      getLengthNumeral(this.element.getAttribute('min-font-size')) || 6;
 
-    this.maxFontSize_ = getLengthNumeral(this.element.getAttribute(
-        'max-font-size')) || 72;
+    this.maxFontSize_ =
+      getLengthNumeral(this.element.getAttribute('max-font-size')) || 72;
   }
 
   /** @override */
@@ -104,17 +102,20 @@ class AmpFitText extends AMP.BaseElement {
 
   /** @private */
   updateFontSize_() {
-    const maxHeight = this.element./*OK*/offsetHeight;
-    const maxWidth = this.element./*OK*/offsetWidth;
-    const fontSize = calculateFontSize_(this.measurer_, maxHeight, maxWidth,
-        this.minFontSize_, this.maxFontSize_);
+    const maxHeight = this.element./*OK*/ offsetHeight;
+    const maxWidth = this.element./*OK*/ offsetWidth;
+    const fontSize = calculateFontSize_(
+      this.measurer_,
+      maxHeight,
+      maxWidth,
+      this.minFontSize_,
+      this.maxFontSize_
+    );
     setStyle(this.contentWrapper_, 'fontSize', px(fontSize));
-    updateOverflow_(this.contentWrapper_, this.measurer_, maxHeight,
-        fontSize);
+    updateOverflow_(this.contentWrapper_, this.measurer_, maxHeight, fontSize);
   }
 }
 
-
 /**
  * @param {Element} measurer
  * @param {number} expectedHeight
@@ -124,15 +125,20 @@ class AmpFitText extends AMP.BaseElement {
  * @return {number}
  * @private  Visible for testing only!
  */
-export function calculateFontSize_(measurer, expectedHeight, expectedWidth,
-  minFontSize, maxFontSize) {
+export function calculateFontSize_(
+  measurer,
+  expectedHeight,
+  expectedWidth,
+  minFontSize,
+  maxFontSize
+) {
   maxFontSize++;
   // Binomial search for the best font size.
   while (maxFontSize - minFontSize > 1) {
     const mid = Math.floor((minFontSize + maxFontSize) / 2);
     setStyle(measurer, 'fontSize', px(mid));
-    const height = measurer./*OK*/offsetHeight;
-    const width = measurer./*OK*/offsetWidth;
+    const height = measurer./*OK*/ offsetHeight;
+    const width = measurer./*OK*/ offsetWidth;
     if (height > expectedHeight || width > expectedWidth) {
       maxFontSize = mid;
     } else {
@@ -142,7 +148,6 @@ export function calculateFontSize_(measurer, expectedHeight, expectedWidth,
   return minFontSize;
 }
 
-
 /**
  * @param {Element} content
  * @param {Element} measurer
@@ -152,7 +157,7 @@ export function calculateFontSize_(measurer, expectedHeight, expectedWidth,
  */
 export function updateOverflow_(content, measurer, maxHeight, fontSize) {
   setStyle(measurer, 'fontSize', px(fontSize));
-  const overflown = measurer./*OK*/offsetHeight > maxHeight;
+  const overflown = measurer./*OK*/ offsetHeight > maxHeight;
   const lineHeight = fontSize * LINE_HEIGHT_EM_;
   const numberOfLines = Math.floor(maxHeight / lineHeight);
   content.classList.toggle('i-amphtml-fit-text-content-overflown', overflown);
@@ -162,7 +167,6 @@ export function updateOverflow_(content, measurer, maxHeight, fontSize) {
   });
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpFitText, CSS);
 });
diff --git a/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js b/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
index e353bc7eba05..7d0f632191cd 100644
--- a/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
+++ b/extensions/amp-fit-text/0.1/test/test-amp-fit-text.js
@@ -14,53 +14,55 @@
  * limitations under the License.
  */
 
-import {
-  calculateFontSize_,
-  updateOverflow_,
-} from '../amp-fit-text';
-
-
-describes.realWin('amp-fit-text component', {
-  amp: {
-    extensions: ['amp-fit-text'],
+import {calculateFontSize_, updateOverflow_} from '../amp-fit-text';
+
+describes.realWin(
+  'amp-fit-text component',
+  {
+    amp: {
+      extensions: ['amp-fit-text'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getFitText(text, opt_responsive) {
-    const ft = doc.createElement('amp-fit-text');
-    ft.setAttribute('width', '111');
-    ft.setAttribute('height', '222');
-    ft.style.fontFamily = 'Arial';
-    ft.style.fontSize = '17px';
-    ft.style.lineHeight = '17px';
-    ft.style.overflow = 'hidden';
-    ft.style.width = '111px';
-    ft.style.height = '222px';
-    ft.style.position = 'relative';
-    if (opt_responsive) {
-      ft.setAttribute('layout', 'responsive');
+    function getFitText(text, opt_responsive) {
+      const ft = doc.createElement('amp-fit-text');
+      ft.setAttribute('width', '111');
+      ft.setAttribute('height', '222');
+      ft.style.fontFamily = 'Arial';
+      ft.style.fontSize = '17px';
+      ft.style.lineHeight = '17px';
+      ft.style.overflow = 'hidden';
+      ft.style.width = '111px';
+      ft.style.height = '222px';
+      ft.style.position = 'relative';
+      if (opt_responsive) {
+        ft.setAttribute('layout', 'responsive');
+      }
+      ft.textContent = text;
+      doc.body.appendChild(ft);
+      return ft
+        .build()
+        .then(() => ft.layoutCallback())
+        .then(() => ft);
     }
-    ft.textContent = text;
-    doc.body.appendChild(ft);
-    return ft.build().then(() => ft.layoutCallback()).then(() => ft);
-  }
 
-  it('renders', () => {
-    const text = 'Lorem ipsum';
-    return getFitText(text).then(ft => {
-      const content = ft.querySelector('.i-amphtml-fit-text-content');
-      expect(content).to.not.equal(null);
-      expect(content.textContent).to.equal(text);
+    it('renders', () => {
+      const text = 'Lorem ipsum';
+      return getFitText(text).then(ft => {
+        const content = ft.querySelector('.i-amphtml-fit-text-content');
+        expect(content).to.not.equal(null);
+        expect(content.textContent).to.equal(text);
+      });
     });
-  });
-});
-
+  }
+);
 
 describes.realWin('amp-fit-text calculateFontSize', {}, env => {
   let win, doc;
@@ -80,50 +82,49 @@ describes.realWin('amp-fit-text calculateFontSize', {}, env => {
   });
 
   it('should always fit on one line w/ enough width', () => {
-    element./*OK*/innerHTML = 'A';
+    element./*OK*/ innerHTML = 'A';
     expect(calculateFontSize_(element, 20, 200, 6, 72)).to.equal(20);
     expect(calculateFontSize_(element, 10, 200, 6, 72)).to.equal(10);
     expect(calculateFontSize_(element, 40, 200, 6, 72)).to.equal(40);
   });
 
   it('should always fit the width w/ enough height', () => {
-    element./*OK*/innerHTML = 'A';
+    element./*OK*/ innerHTML = 'A';
     expect(calculateFontSize_(element, 200, 10, 6, 72)).to.equal(15);
     expect(calculateFontSize_(element, 200, 20, 6, 72)).to.equal(30);
     expect(calculateFontSize_(element, 200, 40, 6, 72)).to.equal(60);
   });
 
   it('should hit min w/ small height and enough width', () => {
-    element./*OK*/innerHTML = 'A';
+    element./*OK*/ innerHTML = 'A';
     expect(calculateFontSize_(element, 6, 200, 6, 72)).to.equal(6);
     expect(calculateFontSize_(element, 3, 200, 6, 72)).to.equal(6);
   });
 
   it('should hit min w/ small width and enough height', () => {
-    element./*OK*/innerHTML = 'A';
+    element./*OK*/ innerHTML = 'A';
     expect(calculateFontSize_(element, 200, 2, 6, 72)).to.equal(6);
     expect(calculateFontSize_(element, 200, 4, 6, 72)).to.equal(6);
   });
 
   it('should hit max w/ enough width', () => {
-    element./*OK*/innerHTML = 'A';
+    element./*OK*/ innerHTML = 'A';
     expect(calculateFontSize_(element, 72, 200, 6, 72)).to.equal(72);
     expect(calculateFontSize_(element, 80, 200, 6, 72)).to.equal(72);
   });
 
   it('should hit max w/ enough height', () => {
-    element./*OK*/innerHTML = 'A';
-    expect(calculateFontSize_(element, 200, 48, 6,72)).to.equal(72);
+    element./*OK*/ innerHTML = 'A';
+    expect(calculateFontSize_(element, 200, 48, 6, 72)).to.equal(72);
     expect(calculateFontSize_(element, 200, 60, 6, 72)).to.equal(72);
   });
 
   it('should always fit on two lines w/ enough width', () => {
-    element./*OK*/innerHTML = 'A<br>B';
+    element./*OK*/ innerHTML = 'A<br>B';
     expect(calculateFontSize_(element, 20, 200, 6, 72)).to.equal(10);
   });
 });
 
-
 describes.realWin('amp-fit-text updateOverflow', {}, env => {
   let win, doc;
   let content;
@@ -161,7 +162,7 @@ describes.realWin('amp-fit-text updateOverflow', {}, env => {
   }
 
   it('should always fit on one line', () => {
-    measurer./*OK*/innerHTML = 'A';
+    measurer./*OK*/ innerHTML = 'A';
     updateOverflow_(content, measurer, 24, 20);
     expect(classToggles['i-amphtml-fit-text-content-overflown']).to.be.false;
     expect(getLineClamp()).to.equal('');
@@ -169,7 +170,7 @@ describes.realWin('amp-fit-text updateOverflow', {}, env => {
   });
 
   it('should always fit on two lines', () => {
-    measurer./*OK*/innerHTML = 'A<br>B';
+    measurer./*OK*/ innerHTML = 'A<br>B';
     updateOverflow_(content, measurer, 24, 20);
     expect(classToggles['i-amphtml-fit-text-content-overflown']).to.equal(true);
     expect(getLineClamp()).to.equal(1);
diff --git a/extensions/amp-font/0.1/amp-font.js b/extensions/amp-font/0.1/amp-font.js
index 7c2483e31afa..46e5515a85a9 100644
--- a/extensions/amp-font/0.1/amp-font.js
+++ b/extensions/amp-font/0.1/amp-font.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Triggers and monitors loading of custom fonts on AMP pages.
  * Example:
@@ -69,9 +68,7 @@ const DEFAULT_SIZE_ = 'medium';
  */
 const CACHED_FONT_LOAD_TIME_ = 100;
 
-
 export class AmpFont extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -97,23 +94,22 @@ export class AmpFont extends AMP.BaseElement {
     return true;
   }
 
-
   /** @override */
   buildCallback() {
-    this.fontFamily_ = userAssert(this.element.getAttribute('font-family'),
-        'The font-family attribute is required for <amp-font> %s',
-        this.element);
+    this.fontFamily_ = userAssert(
+      this.element.getAttribute('font-family'),
+      'The font-family attribute is required for <amp-font> %s',
+      this.element
+    );
     this.fontWeight_ =
-        this.element.getAttribute('font-weight') || DEFAULT_WEIGHT_;
-    this.fontStyle_ =
-        this.element.getAttribute('font-style') || DEFAULT_STYLE_;
+      this.element.getAttribute('font-weight') || DEFAULT_WEIGHT_;
+    this.fontStyle_ = this.element.getAttribute('font-style') || DEFAULT_STYLE_;
     this.fontVariant_ =
-        this.element.getAttribute('font-variant') || DEFAULT_VARIANT_;
+      this.element.getAttribute('font-variant') || DEFAULT_VARIANT_;
     this.fontLoader_ = new FontLoader(this.getAmpDoc());
     this.startLoad_();
   }
 
-
   /**
    * Starts to download the font.
    * @private
@@ -126,37 +122,35 @@ export class AmpFont extends AMP.BaseElement {
       size: DEFAULT_SIZE_,
       family: this.fontFamily_,
     };
-    this.fontLoader_.load(fontConfig, this.getTimeout_()).then(() => {
-      this.onFontLoadSuccess_();
-    }).catch(unusedError => {
-      this.onFontLoadError_();
-      user().warn(TAG, 'Font download timed out for ' + this.fontFamily_);
-    });
+    this.fontLoader_
+      .load(fontConfig, this.getTimeout_())
+      .then(() => {
+        this.onFontLoadSuccess_();
+      })
+      .catch(unusedError => {
+        this.onFontLoadError_();
+        user().warn(TAG, 'Font download timed out for ' + this.fontFamily_);
+      });
   }
 
-
   /**
    * @private
    */
   onFontLoadSuccess_() {
     const addClassName = this.element.getAttribute('on-load-add-class');
-    const removeClassName =
-        this.element.getAttribute('on-load-remove-class');
+    const removeClassName = this.element.getAttribute('on-load-remove-class');
     this.onFontLoadFinish_(addClassName, removeClassName);
   }
 
-
   /**
    * @private
    */
   onFontLoadError_() {
     const addClassName = this.element.getAttribute('on-error-add-class');
-    const removeClassName =
-        this.element.getAttribute('on-error-remove-class');
+    const removeClassName = this.element.getAttribute('on-error-remove-class');
     this.onFontLoadFinish_(addClassName, removeClassName);
   }
 
-
   /**
    * @param {?string} addClassName css class to be added to the
    *    document-element.
@@ -177,7 +171,6 @@ export class AmpFont extends AMP.BaseElement {
     this.dispose_();
   }
 
-
   /**
    * @private
    */
@@ -185,7 +178,6 @@ export class AmpFont extends AMP.BaseElement {
     this.fontLoader_ = null;
   }
 
-
   /**
    * Computes and returns the time (in ms) to wait for font download.
    * @return {number} time (in ms) to wait for font download.
@@ -193,17 +185,18 @@ export class AmpFont extends AMP.BaseElement {
    */
   getTimeout_() {
     let timeoutInMs = parseInt(this.element.getAttribute('timeout'), 10);
-    timeoutInMs = !isFiniteNumber(timeoutInMs) ||
-        timeoutInMs < 0 ? DEFAULT_TIMEOUT_ : timeoutInMs;
+    timeoutInMs =
+      !isFiniteNumber(timeoutInMs) || timeoutInMs < 0
+        ? DEFAULT_TIMEOUT_
+        : timeoutInMs;
     timeoutInMs = Math.max(
-        (timeoutInMs - Services.timerFor(this.win).timeSinceStart()),
-        CACHED_FONT_LOAD_TIME_
+      timeoutInMs - Services.timerFor(this.win).timeSinceStart(),
+      CACHED_FONT_LOAD_TIME_
     );
     return timeoutInMs;
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpFont);
 });
diff --git a/extensions/amp-font/0.1/fontloader.js b/extensions/amp-font/0.1/fontloader.js
index 58760f62376b..8f130b5d28e0 100644
--- a/extensions/amp-font/0.1/fontloader.js
+++ b/extensions/amp-font/0.1/fontloader.js
@@ -25,21 +25,17 @@
  */
 let FontConfigDef;
 
-
 const DEFAULT_FONTS_ = ['sans-serif', 'serif'];
 
 const TEST_STRING_ = 'MAxmTYklsjo190QW';
 
 const TOLERANCE_ = 2;
 
-
 import {Services} from '../../../src/services';
 import {removeElement} from '../../../src/dom';
 import {setStyles} from '../../../src/style';
 
-
 export class FontLoader {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -63,7 +59,6 @@ export class FontLoader {
     this.fontLoadRejected_ = false;
   }
 
-
   /**
    * Triggers the font load. Returns promise that will complete when loading
    * is considered to be complete.
@@ -76,18 +71,20 @@ export class FontLoader {
   load(fontConfig, timeout) {
     this.fontConfig_ = fontConfig;
     return Services.timerFor(this.ampdoc_.win)
-        .timeoutPromise(timeout, this.load_())
-        .then(() => {
+      .timeoutPromise(timeout, this.load_())
+      .then(
+        () => {
           this.fontLoadResolved_ = true;
           this.dispose_();
-        }, reason => {
+        },
+        reason => {
           this.fontLoadRejected_ = true;
           this.dispose_();
           throw reason;
-        });
+        }
+      );
   }
 
-
   /**
    * Triggers the font load. Returns promise that will complete when loading
    * is considered to be complete.
@@ -98,12 +95,17 @@ export class FontLoader {
     return new Promise((resolve, reject) => {
       /* style | variant | weight | size/line-height | family */
       /* font: italic small-caps bolder 16px/3 cursive; */
-      const fontString = (
-        this.fontConfig_.fontStyle + ' ' +
-        this.fontConfig_.variant + ' ' +
-        this.fontConfig_.weight + ' ' +
-        this.fontConfig_.size + ' \'' +
-        this.fontConfig_.family + '\'');
+      const fontString =
+        this.fontConfig_.fontStyle +
+        ' ' +
+        this.fontConfig_.variant +
+        ' ' +
+        this.fontConfig_.weight +
+        ' ' +
+        this.fontConfig_.size +
+        " '" +
+        this.fontConfig_.family +
+        "'";
 
       if (this.canUseNativeApis_()) {
         // Check if font already exists.
@@ -111,18 +113,26 @@ export class FontLoader {
           resolve();
         } else {
           // Load font with native api if supported.
-          this.document_.fonts.load(fontString).then(() => {
-            // Workaround for chrome bug
-            // https://bugs.chromium.org/p/chromium/issues/detail?id=347460
-            return this.document_.fonts.load(fontString);
-          }).then(() => {
-            if (this.document_.fonts.check(fontString)) {
-              resolve();
-            } else {
-              reject(new Error('Font could not be loaded,'
-                  + ' probably due to incorrect @font-face.'));
-            }
-          }).catch(reject);
+          this.document_.fonts
+            .load(fontString)
+            .then(() => {
+              // Workaround for chrome bug
+              // https://bugs.chromium.org/p/chromium/issues/detail?id=347460
+              return this.document_.fonts.load(fontString);
+            })
+            .then(() => {
+              if (this.document_.fonts.check(fontString)) {
+                resolve();
+              } else {
+                reject(
+                  new Error(
+                    'Font could not be loaded,' +
+                      ' probably due to incorrect @font-face.'
+                  )
+                );
+              }
+            })
+            .catch(reject);
         }
       } else {
         // Load font with polyfill if native api is not supported.
@@ -131,7 +141,6 @@ export class FontLoader {
     });
   }
 
-
   /**
    * @return {boolean} True when native font api is supported by the browser.
    * @private
@@ -140,7 +149,6 @@ export class FontLoader {
     return 'fonts' in this.document_;
   }
 
-
   /**
    * Make the browsers that don't support font loading events to download the
    * custom font by creating an element (with text) not visible on the viewport.
@@ -171,7 +179,6 @@ export class FontLoader {
     });
   }
 
-
   /**
    * Create hidden divs and measure dimensions for fonts.
    * @return {!Array<!FontComparator>} An array of comparators, one for each
@@ -179,8 +186,9 @@ export class FontLoader {
    * @private
    */
   createFontComparators_() {
-    const containerElement = this.container_ =
-        this.document_.createElement('div');
+    const containerElement = (this.container_ = this.document_.createElement(
+      'div'
+    ));
     setStyles(containerElement, {
       // Use larger font-size to better detect font load.
       fontSize: '40px',
@@ -196,13 +204,18 @@ export class FontLoader {
       visibility: 'hidden',
     });
 
-    const comparators = DEFAULT_FONTS_.map(defaultFont => new FontComparator(
-        containerElement, this.fontConfig_.family, defaultFont));
+    const comparators = DEFAULT_FONTS_.map(
+      defaultFont =>
+        new FontComparator(
+          containerElement,
+          this.fontConfig_.family,
+          defaultFont
+        )
+    );
     this.ampdoc_.getBody().appendChild(containerElement);
     return comparators;
   }
 
-
   /**
    * @private
    */
@@ -215,7 +228,6 @@ export class FontLoader {
 }
 
 class FontComparator {
-
   /**
    * Create two elements to compare fonts and insert them into a container.
    * @param {!Element} container Contains the backing font comparison elements
@@ -236,7 +248,6 @@ class FontComparator {
     container.appendChild(this.testFontElement_);
   }
 
-
   /**
    * Create and style a DOM element to use to compare two fonts.
    * @param {?Document} doc
@@ -257,23 +268,22 @@ class FontComparator {
     return element;
   }
 
-
   /**
    * Compare dimensions between elements styled with default and custom fonts.
    * If the divs are identical, the custom font has not loaded.
    * @return {boolean} Returns true if the dimensions are noticeably different.
    */
   compare() {
-    const hasWidthChanged = (
+    const hasWidthChanged =
       Math.abs(
-          this.defaultFontElement_./*OK*/offsetWidth -
-            this.testFontElement_./*OK*/offsetWidth) >
-            TOLERANCE_);
-    const hasHeightChanged = (
+        this.defaultFontElement_./*OK*/ offsetWidth -
+          this.testFontElement_./*OK*/ offsetWidth
+      ) > TOLERANCE_;
+    const hasHeightChanged =
       Math.abs(
-          this.defaultFontElement_./*OK*/offsetHeight -
-            this.testFontElement_./*OK*/offsetHeight) >
-            TOLERANCE_);
-    return (hasWidthChanged || hasHeightChanged);
+        this.defaultFontElement_./*OK*/ offsetHeight -
+          this.testFontElement_./*OK*/ offsetHeight
+      ) > TOLERANCE_;
+    return hasWidthChanged || hasHeightChanged;
   }
 }
diff --git a/extensions/amp-font/0.1/test/test-amp-font.js b/extensions/amp-font/0.1/test/test-amp-font.js
index 0ca593745162..9e7af7f0901a 100644
--- a/extensions/amp-font/0.1/test/test-amp-font.js
+++ b/extensions/amp-font/0.1/test/test-amp-font.js
@@ -17,58 +17,70 @@
 import '../amp-font';
 import {FontLoader} from '../fontloader';
 
-describes.repeated('', {
-  'single ampdoc': {ampdoc: 'single'},
-  'shadow ampdoc': {ampdoc: 'shadow'},
-}, (name, variant) => {
+describes.repeated(
+  '',
+  {
+    'single ampdoc': {ampdoc: 'single'},
+    'shadow ampdoc': {ampdoc: 'shadow'},
+  },
+  (name, variant) => {
+    describes.realWin(
+      'amp-font',
+      {
+        amp: {
+          ampdoc: variant.ampdoc,
+          extensions: ['amp-font'],
+        },
+      },
+      function(env) {
+        let ampdoc, doc, root, body;
 
-  describes.realWin('amp-font', {
-    amp: {
-      ampdoc: variant.ampdoc,
-      extensions: ['amp-font'],
-    },
-  }, function(env) {
-    let ampdoc, doc, root, body;
+        beforeEach(() => {
+          ampdoc = env.ampdoc;
+          doc = env.win.document;
+          root =
+            variant.ampdoc === 'single'
+              ? doc.documentElement
+              : ampdoc.getBody();
+          body = variant.ampdoc === 'single' ? doc.body : root;
+        });
 
-    beforeEach(() => {
-      ampdoc = env.ampdoc;
-      doc = env.win.document;
-      root = (variant.ampdoc === 'single' ?
-        doc.documentElement : ampdoc.getBody());
-      body = (variant.ampdoc === 'single' ?
-        doc.body : root);
-    });
+        function getAmpFont() {
+          root.classList.add('comic-amp-font-loading');
+          const font = doc.createElement('amp-font');
+          font.setAttribute('layout', 'nodisplay');
+          font.setAttribute('font-family', 'Comic AMP');
+          font.setAttribute('timeout', '1000');
+          font.setAttribute('while-loading-class', '');
+          font.setAttribute('on-error-add-class', 'comic-amp-font-missing');
+          font.setAttribute('on-load-add-class', 'comic-amp-font-loaded');
+          font.setAttribute('on-error-remove-class', 'comic-amp-font-loading');
+          font.setAttribute('on-load-remove-class', 'comic-amp-font-loading');
+          body.appendChild(font);
+          return font
+            .build()
+            .then(() => font.layoutCallback())
+            .then(() => font);
+        }
 
-    function getAmpFont() {
-      root.classList.add('comic-amp-font-loading');
-      const font = doc.createElement('amp-font');
-      font.setAttribute('layout', 'nodisplay');
-      font.setAttribute('font-family', 'Comic AMP');
-      font.setAttribute('timeout', '1000');
-      font.setAttribute('while-loading-class', '');
-      font.setAttribute('on-error-add-class', 'comic-amp-font-missing');
-      font.setAttribute('on-load-add-class', 'comic-amp-font-loaded');
-      font.setAttribute('on-error-remove-class', 'comic-amp-font-loading');
-      font.setAttribute('on-load-remove-class', 'comic-amp-font-loading');
-      body.appendChild(font);
-      return font.build().then(() => font.layoutCallback()).then(() => font);
-    }
+        it('should timeout while loading custom font', function() {
+          sandbox
+            .stub(FontLoader.prototype, 'load')
+            .returns(Promise.reject('mock rejection'));
+          return getAmpFont().then(() => {
+            expect(root).to.have.class('comic-amp-font-missing');
+            expect(root).to.not.have.class('comic-amp-font-loading');
+          });
+        });
 
-    it('should timeout while loading custom font', function() {
-      sandbox.stub(FontLoader.prototype, 'load')
-          .returns(Promise.reject('mock rejection'));
-      return getAmpFont().then(() => {
-        expect(root).to.have.class('comic-amp-font-missing');
-        expect(root).to.not.have.class('comic-amp-font-loading');
-      });
-    });
-
-    it('should load custom font', function() {
-      sandbox.stub(FontLoader.prototype, 'load').returns(Promise.resolve());
-      return getAmpFont().then(() => {
-        expect(root).to.have.class('comic-amp-font-loaded');
-        expect(root).to.not.have.class('comic-amp-font-loading');
-      });
-    });
-  });
-});
+        it('should load custom font', function() {
+          sandbox.stub(FontLoader.prototype, 'load').returns(Promise.resolve());
+          return getAmpFont().then(() => {
+            expect(root).to.have.class('comic-amp-font-loaded');
+            expect(root).to.not.have.class('comic-amp-font-loading');
+          });
+        });
+      }
+    );
+  }
+);
diff --git a/extensions/amp-font/0.1/test/test-fontloader.js b/extensions/amp-font/0.1/test/test-fontloader.js
index dcab764d2bad..139b14e19cd4 100644
--- a/extensions/amp-font/0.1/test/test-fontloader.js
+++ b/extensions/amp-font/0.1/test/test-fontloader.js
@@ -16,185 +16,232 @@
 
 import {FontLoader} from '../fontloader';
 
-describes.repeated('', {
-  'single ampdoc': {ampdoc: 'single'},
-  'shadow ampdoc': {ampdoc: 'shadow'},
-}, (name, variant) => {
-
-  const FONT_FACE_ = `
+describes.repeated(
+  '',
+  {
+    'single ampdoc': {ampdoc: 'single'},
+    'shadow ampdoc': {ampdoc: 'shadow'},
+  },
+  (name, variant) => {
+    const FONT_FACE_ = `
 @font-face {
   font-family: 'Comic AMP';
   src: url(/examples/fonts/ComicAMP.ttf) format('truetype');
 }
 `;
 
-  const CSS_RULES_ = `
+    const CSS_RULES_ = `
 .comic-amp-font-loaded {
   font-family: 'Comic AMP', serif, sans-serif;
   color: #0f0;
 }
 `;
 
-  /** @private @const {!FontConfig} */
-  const FONT_CONFIG = {
-    fontStyle: 'normal',
-    variant: 'normal',
-    weight: '400',
-    size: 'medium',
-    family: 'Comic AMP',
-  };
-
-  /** @private @const {!FontConfig} */
-  const FAILURE_FONT_CONFIG = {
-    fontStyle: 'normal',
-    variant: 'normal',
-    weight: '400',
-    size: 'medium',
-    family: 'Comic BLAH',
-  };
-
-  describes.realWin('FontLoader', {
-    amp: {
-      ampdoc: variant.ampdoc,
-    },
-  }, env => {
-    let fontloader;
-    let setupFontCheckSpy;
-    let setupFontLoadSpy;
-    let setupLoadWithPolyfillSpy;
-    let setupDisposeSpy;
-    let setupCreateFontComparatorsSpy;
-
-    let ampdoc, doc, root, body;
-
-    beforeEach(() => {
-      ampdoc = env.ampdoc;
-      doc = env.win.document;
-      root = (variant.ampdoc === 'single' ?
-        doc.documentElement : ampdoc.getBody());
-      body = (variant.ampdoc === 'single' ?
-        doc.body : root);
-    });
-
-    beforeEach(() => {
-      ampdoc = env.ampdoc;
-      doc = env.win.document;
-      root = (variant.ampdoc === 'single' ?
-        doc.documentElement : ampdoc.getBody());
-      body = (variant.ampdoc === 'single' ?
-        doc.body : root);
-
-      setupLoadWithPolyfillSpy =
-          sandbox.spy(FontLoader.prototype, 'loadWithPolyfill_');
-      setupCreateFontComparatorsSpy =
-          sandbox.spy(FontLoader.prototype, 'createFontComparators_');
-      setupDisposeSpy = sandbox.spy(FontLoader.prototype, 'dispose_');
-
-      const style = doc.createElement('style');
-      style.textContent = FONT_FACE_ + CSS_RULES_;
-      doc.head.appendChild(style);
-      const textEl = doc.createElement('p');
-      textEl.textContent =
-          'Neque porro quisquam est qui dolorem ipsum quia dolor';
-      body.appendChild(textEl);
-      setupFontCheckSpy = sandbox./*OK*/spy(doc.fonts, 'check');
-      setupFontLoadSpy = sandbox./*OK*/spy(doc.fonts, 'load');
-      fontloader = new FontLoader(env.ampdoc);
-    });
-
-    it('should check and load font via native api', () => {
-      fontloader.load(FONT_CONFIG, 3000).then(() => {
-        root.classList.add('comic-amp-font-loaded');
-        body.classList.add('comic-amp-font-loaded');
-        expect(setupFontCheckSpy).to.be.calledOnce;
-        expect(setupFontLoadSpy).to.be.calledOnce;
-        expect(setupDisposeSpy).to.be.calledOnce;
-      }).catch(() => {
-        assert.fail('Font load failed');
-      });
-    });
-
-    it('should check and load font via polyfill', () => {
-      sandbox.stub(FontLoader.prototype, 'canUseNativeApis_').returns(false);
-      fontloader.load(FONT_CONFIG, 3000).then(() => {
-        root.classList.add('comic-amp-font-loaded');
-        body.classList.add('comic-amp-font-loaded');
-        expect(setupFontCheckSpy).to.have.not.been.called;
-        expect(setupFontLoadSpy).to.have.not.been.called;
-        expect(setupLoadWithPolyfillSpy).to.be.calledOnce;
-        expect(setupCreateFontComparatorsSpy).to.be.calledOnce;
-        expect(setupDisposeSpy).to.be.calledOnce;
-      }).catch(() => {
-        assert.fail('Font load failed');
-      });
-    });
-
-    it('should error when font is not available', () => {
-      fontloader.load(FAILURE_FONT_CONFIG, 3000).then(() => {
-        assert.fail('Font loaded when it should have failed.');
-      }).catch(() => {
-        expect(setupFontCheckSpy).to.be.calledOnce;
-        expect(setupFontLoadSpy).to.be.calledOnce;
-        expect(setupDisposeSpy).to.be.calledOnce;
-      });
-    });
-
-    it('should error when font is not available via polyfill', () => {
-      sandbox.stub(FontLoader.prototype, 'canUseNativeApis_').returns(false);
-      fontloader.load(FONT_CONFIG, 3000).then(() => {
-        root.classList.add('comic-amp-font-loaded');
-        body.classList.add('comic-amp-font-loaded');
-        assert.fail('Font loaded when it should have failed.');
-      }).catch(() => {
-        expect(setupFontCheckSpy).to.have.not.been.called;
-        expect(setupFontLoadSpy).to.have.not.been.called;
-        expect(setupLoadWithPolyfillSpy).to.be.calledOnce;
-        expect(setupCreateFontComparatorsSpy).to.be.calledOnce;
-        expect(setupDisposeSpy).to.be.calledOnce;
-      });
-    });
-
-    it('should check if elements are being created when using polyfill', () => {
-      sandbox.stub(FontLoader.prototype, 'canUseNativeApis_').returns(false);
-      setupDisposeSpy/*OK*/.restore();
-      setupDisposeSpy =
-          sandbox.stub(FontLoader.prototype, 'dispose_').returns(undefined);
-      const initialElementsCount = doc.getElementsByTagName('*').length;
-      fontloader.load(FONT_CONFIG, 3000).then(() => {
-        root.classList.add('comic-amp-font-loaded');
-        body.classList.add('comic-amp-font-loaded');
-        const finalElementsCount = doc.getElementsByTagName('*').length;
-        expect(initialElementsCount).to.be.below(finalElementsCount);
-        const createdContainer = doc.querySelectorAll('body > div')[1];
-        expect(createdContainer.fontStyle).to.equal('normal');
-        expect(createdContainer.fontWeight).to.equal('400');
-        expect(createdContainer.fontVariant).to.equal('normal');
-      }).catch(() => {
-        assert.fail('Font load failed');
-      });
-    });
-
-    it('should check if elements created using the polyfill ' +
-        'are disposed', () => {
-      sandbox.stub(FontLoader.prototype, 'canUseNativeApis_').returns(false);
-      const initialElementsCount = doc.getElementsByTagName('*').length;
-      fontloader.load(FONT_CONFIG, 3000).then(() => {
-        root.classList.add('comic-amp-font-loaded');
-        body.classList.add('comic-amp-font-loaded');
-        const finalElementsCount = doc.getElementsByTagName('*').length;
-        expect(initialElementsCount).to.equal(finalElementsCount);
-      }).catch(() => {
-        assert.fail('Font load failed');
-      });
-    });
-
-    it('should check compare elements', () => {
-      return fontloader.load(FONT_CONFIG, 3000).then(() => {
-        const comparators = fontloader.createFontComparators_();
-        expect(comparators.some(c => c.compare())).to.be.true;
-      }).catch(() => {
-        assert.fail('Font load failed');
-      });
-    });
-  });
-});
+    /** @private @const {!FontConfig} */
+    const FONT_CONFIG = {
+      fontStyle: 'normal',
+      variant: 'normal',
+      weight: '400',
+      size: 'medium',
+      family: 'Comic AMP',
+    };
+
+    /** @private @const {!FontConfig} */
+    const FAILURE_FONT_CONFIG = {
+      fontStyle: 'normal',
+      variant: 'normal',
+      weight: '400',
+      size: 'medium',
+      family: 'Comic BLAH',
+    };
+
+    describes.realWin(
+      'FontLoader',
+      {
+        amp: {
+          ampdoc: variant.ampdoc,
+        },
+      },
+      env => {
+        let fontloader;
+        let setupFontCheckSpy;
+        let setupFontLoadSpy;
+        let setupLoadWithPolyfillSpy;
+        let setupDisposeSpy;
+        let setupCreateFontComparatorsSpy;
+
+        let ampdoc, doc, root, body;
+
+        beforeEach(() => {
+          ampdoc = env.ampdoc;
+          doc = env.win.document;
+          root =
+            variant.ampdoc === 'single'
+              ? doc.documentElement
+              : ampdoc.getBody();
+          body = variant.ampdoc === 'single' ? doc.body : root;
+        });
+
+        beforeEach(() => {
+          ampdoc = env.ampdoc;
+          doc = env.win.document;
+          root =
+            variant.ampdoc === 'single'
+              ? doc.documentElement
+              : ampdoc.getBody();
+          body = variant.ampdoc === 'single' ? doc.body : root;
+
+          setupLoadWithPolyfillSpy = sandbox.spy(
+            FontLoader.prototype,
+            'loadWithPolyfill_'
+          );
+          setupCreateFontComparatorsSpy = sandbox.spy(
+            FontLoader.prototype,
+            'createFontComparators_'
+          );
+          setupDisposeSpy = sandbox.spy(FontLoader.prototype, 'dispose_');
+
+          const style = doc.createElement('style');
+          style.textContent = FONT_FACE_ + CSS_RULES_;
+          doc.head.appendChild(style);
+          const textEl = doc.createElement('p');
+          textEl.textContent =
+            'Neque porro quisquam est qui dolorem ipsum quia dolor';
+          body.appendChild(textEl);
+          setupFontCheckSpy = sandbox./*OK*/ spy(doc.fonts, 'check');
+          setupFontLoadSpy = sandbox./*OK*/ spy(doc.fonts, 'load');
+          fontloader = new FontLoader(env.ampdoc);
+        });
+
+        it('should check and load font via native api', () => {
+          fontloader
+            .load(FONT_CONFIG, 3000)
+            .then(() => {
+              root.classList.add('comic-amp-font-loaded');
+              body.classList.add('comic-amp-font-loaded');
+              expect(setupFontCheckSpy).to.be.calledOnce;
+              expect(setupFontLoadSpy).to.be.calledOnce;
+              expect(setupDisposeSpy).to.be.calledOnce;
+            })
+            .catch(() => {
+              assert.fail('Font load failed');
+            });
+        });
+
+        it('should check and load font via polyfill', () => {
+          sandbox
+            .stub(FontLoader.prototype, 'canUseNativeApis_')
+            .returns(false);
+          fontloader
+            .load(FONT_CONFIG, 3000)
+            .then(() => {
+              root.classList.add('comic-amp-font-loaded');
+              body.classList.add('comic-amp-font-loaded');
+              expect(setupFontCheckSpy).to.have.not.been.called;
+              expect(setupFontLoadSpy).to.have.not.been.called;
+              expect(setupLoadWithPolyfillSpy).to.be.calledOnce;
+              expect(setupCreateFontComparatorsSpy).to.be.calledOnce;
+              expect(setupDisposeSpy).to.be.calledOnce;
+            })
+            .catch(() => {
+              assert.fail('Font load failed');
+            });
+        });
+
+        it('should error when font is not available', () => {
+          fontloader
+            .load(FAILURE_FONT_CONFIG, 3000)
+            .then(() => {
+              assert.fail('Font loaded when it should have failed.');
+            })
+            .catch(() => {
+              expect(setupFontCheckSpy).to.be.calledOnce;
+              expect(setupFontLoadSpy).to.be.calledOnce;
+              expect(setupDisposeSpy).to.be.calledOnce;
+            });
+        });
+
+        it('should error when font is not available via polyfill', () => {
+          sandbox
+            .stub(FontLoader.prototype, 'canUseNativeApis_')
+            .returns(false);
+          fontloader
+            .load(FONT_CONFIG, 3000)
+            .then(() => {
+              root.classList.add('comic-amp-font-loaded');
+              body.classList.add('comic-amp-font-loaded');
+              assert.fail('Font loaded when it should have failed.');
+            })
+            .catch(() => {
+              expect(setupFontCheckSpy).to.have.not.been.called;
+              expect(setupFontLoadSpy).to.have.not.been.called;
+              expect(setupLoadWithPolyfillSpy).to.be.calledOnce;
+              expect(setupCreateFontComparatorsSpy).to.be.calledOnce;
+              expect(setupDisposeSpy).to.be.calledOnce;
+            });
+        });
+
+        it('should check if elements are being created when using polyfill', () => {
+          sandbox
+            .stub(FontLoader.prototype, 'canUseNativeApis_')
+            .returns(false);
+          setupDisposeSpy /*OK*/
+            .restore();
+          setupDisposeSpy = sandbox
+            .stub(FontLoader.prototype, 'dispose_')
+            .returns(undefined);
+          const initialElementsCount = doc.getElementsByTagName('*').length;
+          fontloader
+            .load(FONT_CONFIG, 3000)
+            .then(() => {
+              root.classList.add('comic-amp-font-loaded');
+              body.classList.add('comic-amp-font-loaded');
+              const finalElementsCount = doc.getElementsByTagName('*').length;
+              expect(initialElementsCount).to.be.below(finalElementsCount);
+              const createdContainer = doc.querySelectorAll('body > div')[1];
+              expect(createdContainer.fontStyle).to.equal('normal');
+              expect(createdContainer.fontWeight).to.equal('400');
+              expect(createdContainer.fontVariant).to.equal('normal');
+            })
+            .catch(() => {
+              assert.fail('Font load failed');
+            });
+        });
+
+        it(
+          'should check if elements created using the polyfill ' +
+            'are disposed',
+          () => {
+            sandbox
+              .stub(FontLoader.prototype, 'canUseNativeApis_')
+              .returns(false);
+            const initialElementsCount = doc.getElementsByTagName('*').length;
+            fontloader
+              .load(FONT_CONFIG, 3000)
+              .then(() => {
+                root.classList.add('comic-amp-font-loaded');
+                body.classList.add('comic-amp-font-loaded');
+                const finalElementsCount = doc.getElementsByTagName('*').length;
+                expect(initialElementsCount).to.equal(finalElementsCount);
+              })
+              .catch(() => {
+                assert.fail('Font load failed');
+              });
+          }
+        );
+
+        it('should check compare elements', () => {
+          return fontloader
+            .load(FONT_CONFIG, 3000)
+            .then(() => {
+              const comparators = fontloader.createFontComparators_();
+              expect(comparators.some(c => c.compare())).to.be.true;
+            })
+            .catch(() => {
+              assert.fail('Font load failed');
+            });
+        });
+      }
+    );
+  }
+);
diff --git a/extensions/amp-form/0.1/amp-form-textarea.js b/extensions/amp-form/0.1/amp-form-textarea.js
index 14726b98cf58..43c690bf3435 100644
--- a/extensions/amp-form/0.1/amp-form-textarea.js
+++ b/extensions/amp-form/0.1/amp-form-textarea.js
@@ -75,7 +75,7 @@ export class AmpFormTextarea {
     const root = ampdoc.getRootNode();
 
     /** @private @const */
-    this.doc_ = (root.ownerDocument || root);
+    this.doc_ = root.ownerDocument || root;
 
     /** @private @const */
     this.win_ = /** @type {!Window} */ (devAssert(this.doc_.defaultView));
@@ -86,40 +86,52 @@ export class AmpFormTextarea {
     /** @private */
     this.unlisteners_ = [];
 
-    this.unlisteners_.push(listen(root, 'input', e => {
-      const element = dev().assertElement(e.target);
-      if (element.tagName != 'TEXTAREA' ||
-          !element.hasAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR)) {
-        return;
-      }
-
-      maybeResizeTextarea(element);
-    }));
-
-    this.unlisteners_.push(listen(root, 'mousedown', e => {
-      if (e.which != 1) {
-        return;
-      }
-
-      const element = dev().assertElement(e.target);
-      // Handle all text area drag as we want to measure mutate and notify
-      // the viewer of possible doc height changes.
-      if (element.tagName != 'TEXTAREA') {
-        return;
-      }
-
-      handleTextareaDrag(element);
-    }));
+    this.unlisteners_.push(
+      listen(root, 'input', e => {
+        const element = dev().assertElement(e.target);
+        if (
+          element.tagName != 'TEXTAREA' ||
+          !element.hasAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR)
+        ) {
+          return;
+        }
+
+        maybeResizeTextarea(element);
+      })
+    );
+
+    this.unlisteners_.push(
+      listen(root, 'mousedown', e => {
+        if (e.which != 1) {
+          return;
+        }
+
+        const element = dev().assertElement(e.target);
+        // Handle all text area drag as we want to measure mutate and notify
+        // the viewer of possible doc height changes.
+        if (element.tagName != 'TEXTAREA') {
+          return;
+        }
+
+        handleTextareaDrag(element);
+      })
+    );
 
     let cachedTextareaElements = root.querySelectorAll('textarea');
-    this.unlisteners_.push(listen(root, AmpEvents.DOM_UPDATE, () => {
-      cachedTextareaElements = root.querySelectorAll('textarea');
-    }));
-    const throttledResize = throttle(this.win_, e => {
-      if (e.relayoutAll) {
-        resizeTextareaElements(cachedTextareaElements);
-      }
-    }, MIN_EVENT_INTERVAL_MS);
+    this.unlisteners_.push(
+      listen(root, AmpEvents.DOM_UPDATE, () => {
+        cachedTextareaElements = root.querySelectorAll('textarea');
+      })
+    );
+    const throttledResize = throttle(
+      this.win_,
+      e => {
+        if (e.relayoutAll) {
+          resizeTextareaElements(cachedTextareaElements);
+        }
+      },
+      MIN_EVENT_INTERVAL_MS
+    );
     this.unlisteners_.push(this.viewport_.onResize(throttledResize));
 
     handleInitialOverflowElements(cachedTextareaElements);
@@ -140,17 +152,21 @@ export class AmpFormTextarea {
  * @return {!Promise}
  */
 export function handleInitialOverflowElements(textareas) {
-  return Promise.all(toArray(textareas).map(element => {
-    return getHasOverflow(element).then(hasOverflow => {
-      if (hasOverflow) {
-        user().warn('AMP-FORM',
+  return Promise.all(
+    toArray(textareas).map(element => {
+      return getHasOverflow(element).then(hasOverflow => {
+        if (hasOverflow) {
+          user().warn(
+            'AMP-FORM',
             '"textarea[autoexpand]" with initially scrolling content ' +
-            'will not autoexpand.\n' +
-            'See https://github.com/ampproject/amphtml/issues/20839');
-        element.removeAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR);
-      }
-    });
-  }));
+              'will not autoexpand.\n' +
+              'See https://github.com/ampproject/amphtml/issues/20839'
+          );
+          element.removeAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR);
+        }
+      });
+    })
+  );
 }
 
 /**
@@ -162,7 +178,7 @@ export function handleInitialOverflowElements(textareas) {
 export function getHasOverflow(element) {
   const resources = Services.resourcesForDoc(element);
   return resources.measureElement(() => {
-    return element./*OK*/scrollHeight > element./*OK*/clientHeight;
+    return element./*OK*/ scrollHeight > element./*OK*/ clientHeight;
   });
 }
 
@@ -172,8 +188,10 @@ export function getHasOverflow(element) {
  */
 function resizeTextareaElements(elements) {
   iterateCursor(elements, element => {
-    if (element.tagName != 'TEXTAREA' ||
-        !element.hasAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR)) {
+    if (
+      element.tagName != 'TEXTAREA' ||
+      !element.hasAttribute(AMP_FORM_TEXTAREA_EXPAND_ATTR)
+    ) {
       return;
     }
 
@@ -191,17 +209,21 @@ function handleTextareaDrag(element) {
   const resources = Services.resourcesForDoc(element);
 
   Promise.all([
-    resources.measureElement(() => element./*OK*/scrollHeight),
+    resources.measureElement(() => element./*OK*/ scrollHeight),
     listenOncePromise(element, 'mouseup'),
   ]).then(results => {
     const heightMouseDown = results[0];
     let heightMouseUp = 0;
 
-    return resources.measureMutateElement(element, () => {
-      heightMouseUp = element./*OK*/scrollHeight;
-    }, () => {
-      maybeRemoveResizeBehavior(element, heightMouseDown, heightMouseUp);
-    });
+    return resources.measureMutateElement(
+      element,
+      () => {
+        heightMouseUp = element./*OK*/ scrollHeight;
+      },
+      () => {
+        maybeRemoveResizeBehavior(element, heightMouseDown, heightMouseUp);
+      }
+    );
   });
 }
 
@@ -227,8 +249,9 @@ function maybeRemoveResizeBehavior(element, startHeight, endHeight) {
  */
 export function maybeResizeTextarea(element) {
   const resources = Services.resourcesForDoc(element);
-  const win = /** @type {!Window} */ (
-    devAssert(element.ownerDocument.defaultView));
+  const win = /** @type {!Window} */ (devAssert(
+    element.ownerDocument.defaultView
+  ));
 
   let offset = 0;
   let scrollHeight = 0;
@@ -240,42 +263,48 @@ export function maybeResizeTextarea(element) {
   // element's content, or 2. the element itself.
   const minScrollHeightPromise = getShrinkHeight(element);
 
-  return resources.measureMutateElement(element, () => {
-    const computed = computedStyle(win, element);
-    scrollHeight = element./*OK*/scrollHeight;
+  return resources.measureMutateElement(
+    element,
+    () => {
+      const computed = computedStyle(win, element);
+      scrollHeight = element./*OK*/ scrollHeight;
 
-    const maybeMaxHeight =
-        parseInt(computed.getPropertyValue('max-height'), 10);
-    maxHeight = isNaN(maybeMaxHeight) ? Infinity : maybeMaxHeight;
+      const maybeMaxHeight = parseInt(
+        computed.getPropertyValue('max-height'),
+        10
+      );
+      maxHeight = isNaN(maybeMaxHeight) ? Infinity : maybeMaxHeight;
 
-    if (computed.getPropertyValue('box-sizing') == 'content-box') {
-      offset =
+      if (computed.getPropertyValue('box-sizing') == 'content-box') {
+        offset =
           -parseInt(computed.getPropertyValue('padding-top'), 10) +
           -parseInt(computed.getPropertyValue('padding-bottom'), 10);
-    } else {
-      offset =
+      } else {
+        offset =
           parseInt(computed.getPropertyValue('border-top-width'), 10) +
           parseInt(computed.getPropertyValue('border-bottom-width'), 10);
-    }
-  }, () => {
-    return minScrollHeightPromise.then(minScrollHeight => {
-      const height = minScrollHeight + offset;
-      // Prevent the scrollbar from appearing
-      // unless the text is beyond the max-height
-      element.classList.toggle(AMP_FORM_TEXTAREA_MAX_CSS, height > maxHeight);
-
-      // Prevent the textarea from shrinking if it has not yet expanded.
-      const hasExpanded =
-          AMP_FORM_TEXTAREA_HAS_EXPANDED_DATA in element.dataset;
-      const shouldResize = (hasExpanded || scrollHeight <= minScrollHeight);
-
-      if (shouldResize) {
-        element.dataset[AMP_FORM_TEXTAREA_HAS_EXPANDED_DATA] = '';
-        // Set the textarea height to the height of the text
-        setStyle(element, 'height', px(minScrollHeight + offset));
       }
-    });
-  });
+    },
+    () => {
+      return minScrollHeightPromise.then(minScrollHeight => {
+        const height = minScrollHeight + offset;
+        // Prevent the scrollbar from appearing
+        // unless the text is beyond the max-height
+        element.classList.toggle(AMP_FORM_TEXTAREA_MAX_CSS, height > maxHeight);
+
+        // Prevent the textarea from shrinking if it has not yet expanded.
+        const hasExpanded =
+          AMP_FORM_TEXTAREA_HAS_EXPANDED_DATA in element.dataset;
+        const shouldResize = hasExpanded || scrollHeight <= minScrollHeight;
+
+        if (shouldResize) {
+          element.dataset[AMP_FORM_TEXTAREA_HAS_EXPANDED_DATA] = '';
+          // Set the textarea height to the height of the text
+          setStyle(element, 'height', px(minScrollHeight + offset));
+        }
+      });
+    }
+  );
 }
 
 /**
@@ -299,30 +328,41 @@ function getShrinkHeight(textarea) {
   let resultingHeight = 0;
   let shouldKeepTop = false;
 
-  return resources.measureMutateElement(body, () => {
-    const computed = computedStyle(win, textarea);
-    const maxHeight = parseInt(computed.getPropertyValue('max-height'), 10); // TODO(cvializ): what if it's a percent?
-    cloneWidth = parseInt(computed.getPropertyValue('width'), 10);
-    // maxHeight is NaN if the max-height property is 'none'.
-    shouldKeepTop =
-        (isNaN(maxHeight) || textarea./*OK*/scrollHeight < maxHeight);
-  }, () => {
-    // Prevent a jump from the textarea element scrolling
-    if (shouldKeepTop) {
-      textarea./*OK*/scrollTop = 0;
-    }
-
-    // Keep the clone's width consistent if the textarea was sized relative
-    // to its parent element.
-    setStyle(clone, 'width', px(cloneWidth));
-
-    // Append the clone to the DOM so its scrollHeight can be read
-    doc.body.appendChild(clone);
-  }).then(() => {
-    return resources.measureMutateElement(body, () => {
-      resultingHeight = clone./*OK*/scrollHeight;
-    }, () => {
-      removeElement(clone);
-    });
-  }).then(() => resultingHeight);
+  return resources
+    .measureMutateElement(
+      body,
+      () => {
+        const computed = computedStyle(win, textarea);
+        const maxHeight = parseInt(computed.getPropertyValue('max-height'), 10); // TODO(cvializ): what if it's a percent?
+        cloneWidth = parseInt(computed.getPropertyValue('width'), 10);
+        // maxHeight is NaN if the max-height property is 'none'.
+        shouldKeepTop =
+          isNaN(maxHeight) || textarea./*OK*/ scrollHeight < maxHeight;
+      },
+      () => {
+        // Prevent a jump from the textarea element scrolling
+        if (shouldKeepTop) {
+          textarea./*OK*/ scrollTop = 0;
+        }
+
+        // Keep the clone's width consistent if the textarea was sized relative
+        // to its parent element.
+        setStyle(clone, 'width', px(cloneWidth));
+
+        // Append the clone to the DOM so its scrollHeight can be read
+        doc.body.appendChild(clone);
+      }
+    )
+    .then(() => {
+      return resources.measureMutateElement(
+        body,
+        () => {
+          resultingHeight = clone./*OK*/ scrollHeight;
+        },
+        () => {
+          removeElement(clone);
+        }
+      );
+    })
+    .then(() => resultingHeight);
 }
diff --git a/extensions/amp-form/0.1/amp-form.js b/extensions/amp-form/0.1/amp-form.js
index 6db4255a302b..fe367dc31e27 100644
--- a/extensions/amp-form/0.1/amp-form.js
+++ b/extensions/amp-form/0.1/amp-form.js
@@ -51,10 +51,7 @@ import {
   getFormAsObject,
   setFormForElement,
 } from '../../../src/form';
-import {
-  getFormValidator,
-  isCheckValiditySupported,
-} from './form-validators';
+import {getFormValidator, isCheckValiditySupported} from './form-validators';
 import {getMode} from '../../../src/mode';
 import {
   getViewerAuthTokenIfAvailable,
@@ -74,9 +71,7 @@ const TAG = 'amp-form';
  * A list of external dependencies that can be included in forms.
  * @const {!Array<string>}
  */
-const EXTERNAL_DEPS = [
-  'amp-selector',
-];
+const EXTERNAL_DEPS = ['amp-selector'];
 
 /** @const @enum {string} */
 const FormState = {
@@ -104,10 +99,7 @@ const REDIRECT_TO_HEADER = 'AMP-Redirect-To';
  */
 const SUBMIT_TIMEOUT = 10000;
 
-
-
 export class AmpForm {
-
   /**
    * Adds functionality to the passed form element and listens to submit event.
    * @param {!HTMLFormElement} element
@@ -161,7 +153,10 @@ export class AmpForm {
      * @private
      */
     this.ssrTemplateHelper_ = new SsrTemplateHelper(
-        TAG, this.viewer_, this.templates_);
+      TAG,
+      this.viewer_,
+      this.templates_
+    );
 
     /** @const @private {string} */
     this.method_ = (this.form_.getAttribute('method') || 'GET').toUpperCase();
@@ -192,19 +187,24 @@ export class AmpForm {
     const inputs = this.form_.elements;
     for (let i = 0; i < inputs.length; i++) {
       const {name} = inputs[i];
-      userAssert(name != SOURCE_ORIGIN_PARAM && name != FORM_VERIFY_PARAM,
-          'Illegal input name, %s found: %s', name, inputs[i]);
+      userAssert(
+        name != SOURCE_ORIGIN_PARAM && name != FORM_VERIFY_PARAM,
+        'Illegal input name, %s found: %s',
+        name,
+        inputs[i]
+      );
     }
 
     /** @const @private {!./form-validators.FormValidator} */
     this.validator_ = getFormValidator(this.form_);
 
     /** @const @private {!./form-verifiers.FormVerifier} */
-    this.verifier_ = getFormVerifier(
-        this.form_, () => this.handleXhrVerify_());
+    this.verifier_ = getFormVerifier(this.form_, () => this.handleXhrVerify_());
 
     this.actions_.installActionHandler(
-        this.form_, this.actionHandler_.bind(this));
+      this.form_,
+      this.actionHandler_.bind(this)
+    );
     this.installEventHandlers_();
     this.installInputMasking_();
 
@@ -229,10 +229,12 @@ export class AmpForm {
     if (url) {
       const urlService = Services.urlForDoc(this.form_);
       urlService.assertHttpsUrl(url, this.form_, attribute);
-      userAssert(!urlService.isProxyOrigin(url),
-          'form %s should not be on AMP CDN: %s',
-          attribute,
-          this.form_);
+      userAssert(
+        !urlService.isProxyOrigin(url),
+        'form %s should not be on AMP CDN: %s',
+        attribute,
+        this.form_
+      );
     }
     return url;
   }
@@ -288,8 +290,10 @@ export class AmpForm {
 
     return getViewerAuthTokenIfAvailable(this.form_).then(token => {
       if (token) {
-        userAssert(request.fetchOpt['method'] == 'POST',
-            'Cannot attach auth token with GET request.');
+        userAssert(
+          request.fetchOpt['method'] == 'POST',
+          'Cannot attach auth token with GET request.'
+        );
         body.append('ampViewerAuthToken', token);
       }
       return request;
@@ -335,12 +339,15 @@ export class AmpForm {
     if (this.dependenciesPromise_) {
       return this.dependenciesPromise_;
     }
-    const depElements = this.form_./*OK*/querySelectorAll(
-        EXTERNAL_DEPS.join(','));
+    const depElements = this.form_./*OK*/ querySelectorAll(
+      EXTERNAL_DEPS.join(',')
+    );
     // Wait for an element to be built to make sure it is ready.
     const promises = toArray(depElements).map(el => el.whenBuilt());
-    return this.dependenciesPromise_ = this.waitOnPromisesOrTimeout_(promises,
-        2000);
+    return (this.dependenciesPromise_ = this.waitOnPromisesOrTimeout_(
+      promises,
+      2000
+    ));
   }
 
   /** @private */
@@ -353,15 +360,19 @@ export class AmpForm {
     });
 
     this.form_.addEventListener(
-        'submit',
-        this.handleSubmitEvent_.bind(this),
-        true
+      'submit',
+      this.handleSubmitEvent_.bind(this),
+      true
     );
 
-    this.form_.addEventListener('blur', e => {
-      checkUserValidityAfterInteraction_(dev().assertElement(e.target));
-      this.validator_.onBlur(e);
-    }, true);
+    this.form_.addEventListener(
+      'blur',
+      e => {
+        checkUserValidityAfterInteraction_(dev().assertElement(e.target));
+        this.validator_.onBlur(e);
+      },
+      true
+    );
 
     //  Form verification is not supported when SSRing templates is enabled.
     if (!this.ssrTemplateHelper_.isSupported()) {
@@ -450,14 +461,16 @@ export class AmpForm {
     this.form_.classList.remove('user-invalid');
 
     const validityElements = this.form_.querySelectorAll(
-        '.user-valid, .user-invalid');
+      '.user-valid, .user-invalid'
+    );
     iterateCursor(validityElements, element => {
       element.classList.remove('user-valid');
       element.classList.remove('user-invalid');
     });
 
     const messageElements = this.form_.querySelectorAll(
-        '.visible[validation-for]');
+      '.visible[validation-for]'
+    );
     iterateCursor(messageElements, element => {
       element.classList.remove('visible');
     });
@@ -518,10 +531,10 @@ export class AmpForm {
     }
 
     // Get our special fields
-    const varSubsFields =
-      this.getVarSubsFields_();
-    const asyncInputs =
-      this.form_.getElementsByClassName(AsyncInputClasses.ASYNC_INPUT);
+    const varSubsFields = this.getVarSubsFields_();
+    const asyncInputs = this.form_.getElementsByClassName(
+      AsyncInputClasses.ASYNC_INPUT
+    );
 
     // Do any assertions we may need to do
     // For NonXhrGET
@@ -533,7 +546,6 @@ export class AmpForm {
 
       // If we have no async inputs, we can just submit synchronously
       if (asyncInputs.length === 0) {
-
         for (let i = 0; i < varSubsFields.length; i++) {
           this.urlReplacement_.expandInputValueSync(varSubsFields[i]);
         }
@@ -564,17 +576,17 @@ export class AmpForm {
     });
 
     return this.waitOnPromisesOrTimeout_(
-        presubmitPromises,
-        SUBMIT_TIMEOUT
+      presubmitPromises,
+      SUBMIT_TIMEOUT
     ).then(
-        () => this.handlePresubmitSuccess_(trust),
-        error => {
-          const detail = dict();
-          if (error && error.message) {
-            detail['error'] = error.message;
-          }
-          return this.handleSubmitFailure_(error, detail);
+      () => this.handlePresubmitSuccess_(trust),
+      error => {
+        const detail = dict();
+        if (error && error.message) {
+          detail['error'] = error.message;
         }
+        return this.handleSubmitFailure_(error, detail);
+      }
     );
   }
 
@@ -599,7 +611,7 @@ export class AmpForm {
     } else if (this.method_ == 'POST') {
       this.handleNonXhrPost_();
     } else if (this.method_ == 'GET') {
-      this.handleNonXhrGet_(/* shouldSubmitFormElement */true);
+      this.handleNonXhrGet_(/* shouldSubmitFormElement */ true);
     }
     return Promise.resolve();
   }
@@ -616,8 +628,9 @@ export class AmpForm {
     this.setState_(FormState.VERIFYING);
     this.triggerAction_(FormEvents.VERIFY, null);
 
-    return this.doVarSubs_(this.getVarSubsFields_())
-        .then(() => this.doVerifyXhr_());
+    return this.doVarSubs_(this.getVarSubsFields_()).then(() =>
+      this.doVerifyXhr_()
+    );
   }
 
   /**
@@ -632,8 +645,8 @@ export class AmpForm {
     } else {
       this.submittingWithTrust_(trust);
       p = this.doActionXhr_().then(
-          response => this.handleXhrSubmitSuccess_(response),
-          error => this.handleXhrSubmitFailure_(error)
+        response => this.handleXhrSubmitSuccess_(response),
+        error => this.handleXhrSubmitFailure_(error)
       );
     }
     if (getMode().test) {
@@ -653,30 +666,49 @@ export class AmpForm {
     // Render template for the form submitting state.
     const values = this.getFormAsObject_();
     return this.renderTemplate_(values)
-        .then(() => this.actions_.trigger(
-            this.form_, FormEvents.SUBMIT, /* event */ null, trust))
-        .then(() => this.requestForFormFetch(
-            dev().assertString(this.xhrAction_), this.method_))
-        .then(formRequest => {
-          request = formRequest;
-          request.fetchOpt = setupInit(request.fetchOpt);
-          request.fetchOpt = setupAMPCors(
-              this.win_, request.xhrUrl, request.fetchOpt);
-          request.xhrUrl = setupInput(
-              this.win_, request.xhrUrl, request.fetchOpt);
-          return this.ssrTemplateHelper_.fetchAndRenderTemplate(
-              this.form_,
-              request,
-              this.templatesForSsr_());
-        }).then(
-            response => this.handleSsrTemplateSuccess_(response, request),
-            error => {
-              const detail = dict();
-              if (error && error.message) {
-                detail['error'] = error.message;
-              }
-              return this.handleSubmitFailure_(error, detail);
-            });
+      .then(() =>
+        this.actions_.trigger(
+          this.form_,
+          FormEvents.SUBMIT,
+          /* event */ null,
+          trust
+        )
+      )
+      .then(() =>
+        this.requestForFormFetch(
+          dev().assertString(this.xhrAction_),
+          this.method_
+        )
+      )
+      .then(formRequest => {
+        request = formRequest;
+        request.fetchOpt = setupInit(request.fetchOpt);
+        request.fetchOpt = setupAMPCors(
+          this.win_,
+          request.xhrUrl,
+          request.fetchOpt
+        );
+        request.xhrUrl = setupInput(
+          this.win_,
+          request.xhrUrl,
+          request.fetchOpt
+        );
+        return this.ssrTemplateHelper_.fetchAndRenderTemplate(
+          this.form_,
+          request,
+          this.templatesForSsr_()
+        );
+      })
+      .then(
+        response => this.handleSsrTemplateSuccess_(response, request),
+        error => {
+          const detail = dict();
+          if (error && error.message) {
+            detail['error'] = error.message;
+          }
+          return this.handleSubmitFailure_(error, detail);
+        }
+      );
   }
 
   /**
@@ -727,7 +759,11 @@ export class AmpForm {
     // messages with the submitting attribute.
     this.renderTemplate_(values).then(() => {
       this.actions_.trigger(
-          this.form_, FormEvents.SUBMIT, /* event */ null, trust);
+        this.form_,
+        FormEvents.SUBMIT,
+        /* event */ null,
+        trust
+      );
     });
   }
 
@@ -741,7 +777,8 @@ export class AmpForm {
     const varSubPromises = [];
     for (let i = 0; i < varSubsFields.length; i++) {
       varSubPromises.push(
-          this.urlReplacement_.expandInputValueAsync(varSubsFields[i]));
+        this.urlReplacement_.expandInputValueAsync(varSubsFields[i])
+      );
     }
     return this.waitOnPromisesOrTimeout_(varSubPromises, 100);
   }
@@ -754,29 +791,29 @@ export class AmpForm {
    * @private
    */
   getValueForAsyncInput_(asyncInput) {
-    return asyncInput.getImpl()
-        .then(implementation => implementation.getValue())
-        .then(value => {
-          const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
-          let input = this.form_.querySelector(
-              `input[name=${escapeCssSelectorIdent(name)}]`
+    return asyncInput
+      .getImpl()
+      .then(implementation => implementation.getValue())
+      .then(value => {
+        const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
+        let input = this.form_.querySelector(
+          `input[name=${escapeCssSelectorIdent(name)}]`
+        );
+        if (!input) {
+          input = createElementWithAttributes(
+            this.win_.document,
+            'input',
+            dict({
+              'name': asyncInput.getAttribute(AsyncInputAttributes.NAME),
+              'hidden': 'true',
+            })
           );
-          if (!input) {
-            input = createElementWithAttributes(
-                this.win_.document,
-                'input',
-                dict({
-                  'name': asyncInput.getAttribute(AsyncInputAttributes.NAME),
-                  'hidden': 'true',
-                })
-            );
-          }
-          input.setAttribute('value', value);
-          this.form_.appendChild(input);
-        });
+        }
+        input.setAttribute('value', value);
+        this.form_.appendChild(input);
+      });
   }
 
-
   /**
    * Send a request to the form's action endpoint.
    * @return {!Promise<!Response>}
@@ -792,13 +829,19 @@ export class AmpForm {
    * @private
    */
   doVerifyXhr_() {
-    const noVerifyFields = toArray(this.form_.querySelectorAll(
-        `[${escapeCssSelectorIdent(FORM_VERIFY_OPTOUT)}]`));
+    const noVerifyFields = toArray(
+      this.form_.querySelectorAll(
+        `[${escapeCssSelectorIdent(FORM_VERIFY_OPTOUT)}]`
+      )
+    );
     const blacklist = noVerifyFields.map(field => field.name || field.id);
 
-    return this.doXhr_(dev().assertString(this.xhrVerify_), this.method_,
-        /**opt_extraFields*/ {[FORM_VERIFY_PARAM]: true},
-        /**opt_fieldBlacklist*/ blacklist);
+    return this.doXhr_(
+      dev().assertString(this.xhrVerify_),
+      this.method_,
+      /**opt_extraFields*/ {[FORM_VERIFY_PARAM]: true},
+      /**opt_fieldBlacklist*/ blacklist
+    );
   }
 
   /**
@@ -813,8 +856,11 @@ export class AmpForm {
   doXhr_(url, method, opt_extraFields, opt_fieldBlacklist) {
     this.assertSsrTemplate_(false, 'XHRs should be proxied.');
     return this.requestForFormFetch(
-        url, method, opt_extraFields, opt_fieldBlacklist)
-        .then(request => this.xhr_.fetch(request.xhrUrl, request.fetchOpt));
+      url,
+      method,
+      opt_extraFields,
+      opt_fieldBlacklist
+    ).then(request => this.xhr_.fetch(request.xhrUrl, request.fetchOpt));
   }
 
   /**
@@ -837,14 +883,17 @@ export class AmpForm {
    * @private visible for testing
    */
   handleSubmitSuccess_(jsonPromise) {
-    return jsonPromise.then(json => {
-      this.setState_(FormState.SUBMIT_SUCCESS);
-      this.renderTemplate_(json || {}).then(() => {
-        this.triggerAction_(FormEvents.SUBMIT_SUCCESS, json);
-      });
-    }, error => {
-      user().error(TAG, 'Failed to parse response JSON: %s', error);
-    });
+    return jsonPromise.then(
+      json => {
+        this.setState_(FormState.SUBMIT_SUCCESS);
+        this.renderTemplate_(json || {}).then(() => {
+          this.triggerAction_(FormEvents.SUBMIT_SUCCESS, json);
+        });
+      },
+      error => {
+        user().error(TAG, 'Failed to parse response JSON: %s', error);
+      }
+    );
   }
 
   /**
@@ -887,10 +936,12 @@ export class AmpForm {
   /** @private */
   handleNonXhrPost_() {
     // non-XHR POST requests are not supported.
-    userAssert(false,
-        'Only XHR based (via action-xhr attribute) submissions are supported ' +
+    userAssert(
+      false,
+      'Only XHR based (via action-xhr attribute) submissions are supported ' +
         'for POST requests. %s',
-        this.form_);
+      this.form_
+    );
   }
 
   /**
@@ -917,7 +968,10 @@ export class AmpForm {
   assertSsrTemplate_(value, msg) {
     const supported = this.ssrTemplateHelper_.isSupported();
     userAssert(
-        supported === value, '[amp-form]: viewerRenderTemplate | %s', msg);
+      supported === value,
+      '[amp-form]: viewerRenderTemplate | %s',
+      msg
+    );
   }
 
   /**
@@ -927,10 +981,13 @@ export class AmpForm {
    */
   assertNoSensitiveFields_() {
     const fields = this.form_.querySelectorAll(
-        'input[type=password],input[type=file]');
-    userAssert(fields.length == 0,
-        'input[type=password] or input[type=file] ' +
-        'may only appear in form[method=post]');
+      'input[type=password],input[type=file]'
+    );
+    userAssert(
+      fields.length == 0,
+      'input[type=password] or input[type=file] ' +
+        'may only appear in form[method=post]'
+    );
   }
 
   /**
@@ -963,16 +1020,23 @@ export class AmpForm {
     }
     const redirectTo = response.headers.get(REDIRECT_TO_HEADER);
     if (redirectTo) {
-      userAssert(this.target_ != '_blank',
-          'Redirecting to target=_blank using AMP-Redirect-To is currently ' +
-          'not supported, use target=_top instead. %s', this.form_);
+      userAssert(
+        this.target_ != '_blank',
+        'Redirecting to target=_blank using AMP-Redirect-To is currently ' +
+          'not supported, use target=_top instead. %s',
+        this.form_
+      );
       try {
         const urlService = Services.urlForDoc(this.form_);
         urlService.assertAbsoluteHttpOrHttpsUrl(redirectTo);
         urlService.assertHttpsUrl(redirectTo, 'AMP-Redirect-To', 'Url');
       } catch (e) {
-        userAssert(false, 'The `AMP-Redirect-To` header value must be an ' +
-            'absolute URL starting with https://. Found %s', redirectTo);
+        userAssert(
+          false,
+          'The `AMP-Redirect-To` header value must be an ' +
+            'absolute URL starting with https://. Found %s',
+          redirectTo
+        );
       }
       const navigator = Services.navigationForDoc(this.form_);
       navigator.navigateTo(this.win_, redirectTo, REDIRECT_TO_HEADER);
@@ -986,8 +1050,11 @@ export class AmpForm {
    * @private
    */
   triggerAction_(name, detail) {
-    const event = createCustomEvent(this.win_, `${TAG}.${name}`,
-        dict({'response': detail}));
+    const event = createCustomEvent(
+      this.win_,
+      `${TAG}.${name}`,
+      dict({'response': detail})
+    );
     this.actions_.trigger(this.form_, name, event, ActionTrust.HIGH);
   }
 
@@ -999,8 +1066,7 @@ export class AmpForm {
    * @private
    */
   waitOnPromisesOrTimeout_(promises, timeout) {
-    return Promise.race(
-        [Promise.all(promises), this.timer_.promise(timeout)]);
+    return Promise.race([Promise.all(promises), this.timer_.promise(timeout)]);
   }
 
   /**
@@ -1041,7 +1107,7 @@ export class AmpForm {
    * @private
    */
   renderTemplate_(data) {
-    const container = this.form_./*OK*/querySelector(`[${this.state_}]`);
+    const container = this.form_./*OK*/ querySelector(`[${this.state_}]`);
     let p = Promise.resolve();
     if (container) {
       const messageId = `rendered-message-${this.id_}`;
@@ -1049,22 +1115,25 @@ export class AmpForm {
       container.setAttribute('aria-labeledby', messageId);
       container.setAttribute('aria-live', 'assertive');
       if (this.templates_.hasTemplate(container)) {
-        p = this.ssrTemplateHelper_.renderTemplate(devAssert(container), data)
-            .then(rendered => {
-              rendered.id = messageId;
-              rendered.setAttribute('i-amphtml-rendered', '');
-              return this.resources_.mutateElement(
-                  dev().assertElement(container),
-                  () => {
-                    container.appendChild(rendered);
-                    const renderedEvent = createCustomEvent(
-                        this.win_,
-                        AmpEvents.DOM_UPDATE,
-                        /* detail */ null,
-                        {bubbles: true});
-                    container.dispatchEvent(renderedEvent);
-                  });
-            });
+        p = this.ssrTemplateHelper_
+          .renderTemplate(devAssert(container), data)
+          .then(rendered => {
+            rendered.id = messageId;
+            rendered.setAttribute('i-amphtml-rendered', '');
+            return this.resources_.mutateElement(
+              dev().assertElement(container),
+              () => {
+                container.appendChild(rendered);
+                const renderedEvent = createCustomEvent(
+                  this.win_,
+                  AmpEvents.DOM_UPDATE,
+                  /* detail */ null,
+                  {bubbles: true}
+                );
+                container.dispatchEvent(renderedEvent);
+              }
+            );
+          });
       } else {
         // TODO(vializ): This is to let AMP know that the AMP elements inside
         // this container are now visible so they get scheduled for layout.
@@ -1087,7 +1156,7 @@ export class AmpForm {
    * @private
    */
   cleanupRenderedTemplate_(state) {
-    const container = this.form_./*OK*/querySelector(`[${state}]`);
+    const container = this.form_./*OK*/ querySelector(`[${state}]`);
     if (!container) {
       return;
     }
@@ -1116,7 +1185,6 @@ export class AmpForm {
   }
 }
 
-
 /**
  * Checks user validity for all inputs, fieldsets and the form.
  * @param {!HTMLFormElement} form
@@ -1128,7 +1196,6 @@ function checkUserValidityOnSubmission(form) {
   return checkUserValidity(form);
 }
 
-
 /**
  * Returns the user validity state of the element.
  * @param {!Element} element
@@ -1144,7 +1211,6 @@ function getUserValidityStateFor(element) {
   return UserValidityState.NONE;
 }
 
-
 /**
  * Updates class names on the element to reflect the active invalid types on it.
  *
@@ -1167,9 +1233,12 @@ function removeValidityStateClasses(form) {
   const dummyInput = document.createElement('input');
   for (const validityState in dummyInput.validity) {
     const elements = form.querySelectorAll(
-        `.${escapeCssSelectorIdent(validityState)}`);
+      `.${escapeCssSelectorIdent(validityState)}`
+    );
     iterateCursor(elements, element => {
-      dev().assertElement(element).classList.remove(validityState);
+      dev()
+        .assertElement(element)
+        .classList.remove(validityState);
     });
   }
 }
@@ -1201,14 +1270,18 @@ function checkUserValidity(element, propagate = false) {
   let shouldPropagate = false;
   const previousValidityState = getUserValidityStateFor(element);
   const isCurrentlyValid = element.checkValidity();
-  if (previousValidityState != UserValidityState.USER_VALID &&
-      isCurrentlyValid) {
+  if (
+    previousValidityState != UserValidityState.USER_VALID &&
+    isCurrentlyValid
+  ) {
     element.classList.add('user-valid');
     element.classList.remove('user-invalid');
     // Don't propagate user-valid unless it was marked invalid before.
     shouldPropagate = previousValidityState == UserValidityState.USER_INVALID;
-  } else if (previousValidityState != UserValidityState.USER_INVALID &&
-      !isCurrentlyValid) {
+  } else if (
+    previousValidityState != UserValidityState.USER_INVALID &&
+    !isCurrentlyValid
+  ) {
     element.classList.add('user-invalid');
     element.classList.remove('user-valid');
     // Always propagate an invalid state change. One invalid input field is
@@ -1232,7 +1305,6 @@ function checkUserValidity(element, propagate = false) {
   return isCurrentlyValid;
 }
 
-
 /**
  * Responds to user interaction with an input by checking user validity of the
  * input and possibly its input-related ancestors (e.g. feildset, form).
@@ -1243,7 +1315,6 @@ export function checkUserValidityAfterInteraction_(input) {
   checkUserValidity(input, /* propagate */ true);
 }
 
-
 /**
  * Bootstraps the amp-form elements
  */
@@ -1253,15 +1324,17 @@ export class AmpFormService {
    */
   constructor(ampdoc) {
     /** @const @private {!Promise} */
-    this.whenInitialized_ = this.installStyles_(ampdoc)
-        .then(() => this.installHandlers_(ampdoc));
+    this.whenInitialized_ = this.installStyles_(ampdoc).then(() =>
+      this.installHandlers_(ampdoc)
+    );
 
     // Dispatch a test-only event for integration tests.
     if (getMode().test) {
       this.whenInitialized_.then(() => {
         const {win} = ampdoc;
-        const event = createCustomEvent(
-            win, FormEvents.SERVICE_INIT, null, {bubbles: true});
+        const event = createCustomEvent(win, FormEvents.SERVICE_INIT, null, {
+          bubbles: true,
+        });
         win.dispatchEvent(event);
       });
     }
@@ -1335,7 +1408,6 @@ export class AmpFormService {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerServiceForDoc('form-submit-service', FormSubmitService);
   AMP.registerServiceForDoc(TAG, AmpFormService);
diff --git a/extensions/amp-form/0.1/form-proxy.js b/extensions/amp-form/0.1/form-proxy.js
index 241ae3ebbc0d..22493e0e8c25 100644
--- a/extensions/amp-form/0.1/form-proxy.js
+++ b/extensions/amp-form/0.1/form-proxy.js
@@ -19,14 +19,12 @@ import {dev, devAssert} from '../../../src/log';
 import {startsWith} from '../../../src/string';
 import {toWin} from '../../../src/types';
 
-
 /**
  * Blacklisted properties. Used mainly fot testing.
  * @type {?Array<string>}
  */
 let blacklistedProperties = null;
 
-
 /**
  * @param {?Array<string>} properties
  * @visibleForTesting
@@ -35,7 +33,6 @@ export function setBlacklistedPropertiesForTesting(properties) {
   blacklistedProperties = properties;
 }
 
-
 /**
  * Creates a proxy object `form.$p` that proxies all of the methods and
  * properties to the original DOM APIs. This is to work around the problematic
@@ -59,7 +56,6 @@ export function installFormProxy(form) {
   return proxy;
 }
 
-
 /**
  * @param {!Window} win
  * @return {function(new:Object, !HTMLFormElement)}
@@ -71,13 +67,11 @@ function getFormProxyConstr(win) {
   return win.FormProxy;
 }
 
-
 /**
  * @param {!Window} win
  * @return {function(new:Object, !HTMLFormElement)}
  */
 function createFormProxyConstr(win) {
-
   /**
    * @param {!HTMLFormElement} form
    * @constructor
@@ -94,10 +88,7 @@ function createFormProxyConstr(win) {
   // Hierarchy:
   //   Node  <==  Element <== HTMLElement <== HTMLFormElement
   //   EventTarget  <==  HTMLFormElement
-  const baseClasses = [
-    win.HTMLFormElement,
-    win.EventTarget,
-  ];
+  const baseClasses = [win.HTMLFormElement, win.EventTarget];
   const inheritance = baseClasses.reduce((all, klass) => {
     let proto = klass && klass.prototype;
     while (proto && proto !== ObjectProto) {
@@ -114,34 +105,39 @@ function createFormProxyConstr(win) {
   inheritance.forEach(proto => {
     for (const name in proto) {
       const property = win.Object.getOwnPropertyDescriptor(proto, name);
-      if (!property ||
-          // Exclude constants.
-          name.toUpperCase() == name ||
-          // Exclude on-events.
-          startsWith(name, 'on') ||
-          // Exclude properties that already been created.
-          ObjectProto.hasOwnProperty.call(FormProxyProto, name) ||
-          // Exclude some properties. Currently only used for testing.
-          (blacklistedProperties && blacklistedProperties.includes(name))) {
+      if (
+        !property ||
+        // Exclude constants.
+        name.toUpperCase() == name ||
+        // Exclude on-events.
+        startsWith(name, 'on') ||
+        // Exclude properties that already been created.
+        ObjectProto.hasOwnProperty.call(FormProxyProto, name) ||
+        // Exclude some properties. Currently only used for testing.
+        (blacklistedProperties && blacklistedProperties.includes(name))
+      ) {
         continue;
       }
       if (typeof property.value == 'function') {
         // A method call. Call the original prototype method via `call`.
         const method = property.value;
         FormProxyProto[name] = function() {
-          return method.apply(/** @type {!FormProxy} */(this).form_, arguments);
+          return method.apply(
+            /** @type {!FormProxy} */ (this).form_,
+            arguments
+          );
         };
       } else {
         // A read/write property. Call the original prototype getter/setter.
         const spec = {};
         if (property.get) {
           spec.get = function() {
-            return property.get.call(/** @type {!FormProxy} */(this).form_);
+            return property.get.call(/** @type {!FormProxy} */ (this).form_);
           };
         }
         if (property.set) {
           spec.set = function(v) {
-            return property.set.call(/** @type {!FormProxy} */(this).form_, v);
+            return property.set.call(/** @type {!FormProxy} */ (this).form_, v);
           };
         }
         win.Object.defineProperty(FormProxyProto, name, spec);
@@ -152,7 +148,6 @@ function createFormProxyConstr(win) {
   return FormProxy;
 }
 
-
 /**
  * This is a very heavy-handed way to support browsers that do not have
  * properties defined in the prototype chain. Specifically, this is necessary
@@ -167,13 +162,17 @@ function createFormProxyConstr(win) {
 function setupLegacyProxy(form, proxy) {
   const win = form.ownerDocument.defaultView;
   const proto = win.HTMLFormElement.prototype.cloneNode.call(
-      form, /* deep */ false);
+    form,
+    /* deep */ false
+  );
   for (const name in proto) {
-    if (name in proxy ||
-        // Exclude constants.
-        name.toUpperCase() == name ||
-        // Exclude on-events.
-        startsWith(name, 'on')) {
+    if (
+      name in proxy ||
+      // Exclude constants.
+      name.toUpperCase() == name ||
+      // Exclude on-events.
+      startsWith(name, 'on')
+    ) {
       continue;
     }
     const desc = LEGACY_PROPS[name];
@@ -213,10 +212,10 @@ function setupLegacyProxy(form, proxy) {
               return desc.def;
             }
             if (desc.type == LegacyPropDataType.BOOL) {
-              return (value === 'true');
+              return value === 'true';
             }
             if (desc.type == LegacyPropDataType.TOGGLE) {
-              return (value != null);
+              return value != null;
             }
             if (desc.type == LegacyPropDataType.URL) {
               // URLs, e.g. in `action` attribute are resolved against the
@@ -258,7 +257,6 @@ function setupLegacyProxy(form, proxy) {
   }
 }
 
-
 /**
  * @enum {number}
  */
@@ -267,7 +265,6 @@ const LegacyPropAccessType = {
   READ_ONCE: 2,
 };
 
-
 /**
  * @enum {number}
  */
@@ -277,7 +274,6 @@ const LegacyPropDataType = {
   TOGGLE: 3,
 };
 
-
 /**
  * @const {!Object<string, {
  *   access: !LegacyPropAccessType,
diff --git a/extensions/amp-form/0.1/form-submit-service.js b/extensions/amp-form/0.1/form-submit-service.js
index 1fe3768cac9b..9884cc929a46 100644
--- a/extensions/amp-form/0.1/form-submit-service.js
+++ b/extensions/amp-form/0.1/form-submit-service.js
@@ -16,7 +16,6 @@
 
 import {Observable} from '../../../src/observable';
 
-
 /**
  * @typedef {{
  *   form: !HTMLFormElement,
@@ -25,7 +24,6 @@ import {Observable} from '../../../src/observable';
  */
 export let FormSubmitEventDef;
 
-
 export class FormSubmitService {
   /**
    * Global service used to register callbacks we wish to execute when an
diff --git a/extensions/amp-form/0.1/form-validators.js b/extensions/amp-form/0.1/form-validators.js
index e4282c95fd94..4c94baf5eb91 100644
--- a/extensions/amp-form/0.1/form-validators.js
+++ b/extensions/amp-form/0.1/form-validators.js
@@ -34,7 +34,6 @@ const VISIBLE_VALIDATION_CACHE = '__AMP_VISIBLE_VALIDATION';
  */
 const CUSTOM_PATTERN_ERROR = 'Please match the requested format.';
 
-
 /** @type {boolean|undefined} */
 let reportValiditySupported;
 
@@ -44,7 +43,6 @@ let checkValiditySupported;
 /** @type {number} */
 let validationBubbleCount = 0;
 
-
 /**
  * @param {boolean} isSupported
  * @private visible for testing.
@@ -53,7 +51,6 @@ export function setReportValiditySupportedForTesting(isSupported) {
   reportValiditySupported = isSupported;
 }
 
-
 /**
  * @param {boolean} isSupported
  * @private visible for testing.
@@ -62,7 +59,6 @@ export function setCheckValiditySupportedForTesting(isSupported) {
   checkValiditySupported = isSupported;
 }
 
-
 /** @const @enum {string} */
 const CustomValidationTypes = {
   AsYouGo: 'as-you-go',
@@ -71,13 +67,11 @@ const CustomValidationTypes = {
   ShowFirstOnSubmit: 'show-first-on-submit',
 };
 
-
 /**
  * Form validator interface.
  * @abstract
  */
 export class FormValidator {
-
   /**
    * @param {!HTMLFormElement} form
    */
@@ -132,8 +126,10 @@ export class FormValidator {
     if (input.tagName === 'TEXTAREA' && input.hasAttribute('pattern')) {
       // FormVerifier also uses setCustomValidity() to signal verification
       // errors. Make sure we only override pattern errors here.
-      if (input.checkValidity()
-          || input.validationMessage === CUSTOM_PATTERN_ERROR) {
+      if (
+        input.checkValidity() ||
+        input.validationMessage === CUSTOM_PATTERN_ERROR
+      ) {
         const pattern = input.getAttribute('pattern');
         const re = new RegExp(`^${pattern}$`, 'm');
         const valid = re.test(input.value);
@@ -196,10 +192,8 @@ export class FormValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class DefaultValidator extends FormValidator {
-
   /** @override */
   report() {
     this.reportFormValidity(this.form);
@@ -207,10 +201,8 @@ export class DefaultValidator extends FormValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class PolyfillDefaultValidator extends FormValidator {
-
   /**
    * Creates an instance of PolyfillDefaultValidator.
    * @param {!HTMLFormElement} form
@@ -227,7 +219,7 @@ export class PolyfillDefaultValidator extends FormValidator {
     const inputs = this.inputs();
     for (let i = 0; i < inputs.length; i++) {
       if (!this.checkInputValidity(inputs[i])) {
-        inputs[i]./*REVIEW*/focus();
+        inputs[i]./*REVIEW*/ focus();
         this.validationBubble_.show(inputs[i], inputs[i].validationMessage);
         break;
       }
@@ -264,13 +256,11 @@ export class PolyfillDefaultValidator extends FormValidator {
   }
 }
 
-
 /**
  * @abstract
  * @private visible for testing
  */
 export class AbstractCustomValidator extends FormValidator {
-
   /**
    * Creates an instance of AbstractCustomValidator.
    * @param {!HTMLFormElement} form
@@ -316,8 +306,9 @@ export class AbstractCustomValidator extends FormValidator {
     }
     const property = VALIDATION_CACHE_PREFIX + invalidType;
     if (!(property in input)) {
-      const selector = `[visible-when-invalid=${invalidType}]`
-          + `[validation-for=${input.id}]`;
+      const selector =
+        `[visible-when-invalid=${invalidType}]` +
+        `[validation-for=${input.id}]`;
       input[property] = this.root.querySelector(selector);
     }
     return input[property];
@@ -337,10 +328,12 @@ export class AbstractCustomValidator extends FormValidator {
     }
     input[VISIBLE_VALIDATION_CACHE] = validation;
 
-    this.resources.mutateElement(input,
-        () => input.setAttribute('aria-invalid', 'true'));
-    this.resources.mutateElement(validation,
-        () => validation.classList.add('visible'));
+    this.resources.mutateElement(input, () =>
+      input.setAttribute('aria-invalid', 'true')
+    );
+    this.resources.mutateElement(validation, () =>
+      validation.classList.add('visible')
+    );
   }
 
   /**
@@ -353,10 +346,12 @@ export class AbstractCustomValidator extends FormValidator {
     }
     delete input[VISIBLE_VALIDATION_CACHE];
 
-    this.resources.mutateElement(input,
-        () => input.removeAttribute('aria-invalid'));
-    this.resources.mutateElement(visibleValidation,
-        () => visibleValidation.classList.remove('visible'));
+    this.resources.mutateElement(input, () =>
+      input.removeAttribute('aria-invalid')
+    );
+    this.resources.mutateElement(visibleValidation, () =>
+      visibleValidation.classList.remove('visible')
+    );
   }
 
   /**
@@ -382,7 +377,7 @@ export class AbstractCustomValidator extends FormValidator {
   onInteraction(event) {
     const input = dev().assertElement(event.target);
     const shouldValidate =
-        !!input.checkValidity && this.shouldValidateOnInteraction(input);
+      !!input.checkValidity && this.shouldValidateOnInteraction(input);
 
     this.hideValidationFor(input);
     if (shouldValidate && !this.checkInputValidity(input)) {
@@ -401,10 +396,8 @@ export class AbstractCustomValidator extends FormValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class ShowFirstOnSubmitValidator extends AbstractCustomValidator {
-
   /** @override */
   report() {
     this.hideAllValidations();
@@ -412,7 +405,7 @@ export class ShowFirstOnSubmitValidator extends AbstractCustomValidator {
     for (let i = 0; i < inputs.length; i++) {
       if (!this.checkInputValidity(inputs[i])) {
         this.reportInput(inputs[i]);
-        inputs[i]./*REVIEW*/focus();
+        inputs[i]./*REVIEW*/ focus();
         break;
       }
     }
@@ -426,10 +419,8 @@ export class ShowFirstOnSubmitValidator extends AbstractCustomValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class ShowAllOnSubmitValidator extends AbstractCustomValidator {
-
   /** @override */
   report() {
     this.hideAllValidations();
@@ -443,7 +434,7 @@ export class ShowAllOnSubmitValidator extends AbstractCustomValidator {
     }
 
     if (firstInvalidInput) {
-      firstInvalidInput./*REVIEW*/focus();
+      firstInvalidInput./*REVIEW*/ focus();
     }
 
     this.fireValidityEventIfNecessary();
@@ -455,7 +446,6 @@ export class ShowAllOnSubmitValidator extends AbstractCustomValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class AsYouGoValidator extends AbstractCustomValidator {
   /** @override */
@@ -470,7 +460,6 @@ export class AsYouGoValidator extends AbstractCustomValidator {
   }
 }
 
-
 /** @private visible for testing */
 export class InteractAndSubmitValidator extends ShowAllOnSubmitValidator {
   /** @override */
@@ -485,7 +474,6 @@ export class InteractAndSubmitValidator extends ShowAllOnSubmitValidator {
   }
 }
 
-
 /**
  * Returns the form validator instance.
  *
@@ -493,8 +481,7 @@ export class InteractAndSubmitValidator extends ShowAllOnSubmitValidator {
  * @return {!FormValidator}
  */
 export function getFormValidator(form) {
-  const customValidation = form.getAttribute(
-      'custom-validation-reporting');
+  const customValidation = form.getAttribute('custom-validation-reporting');
   switch (customValidation) {
     case CustomValidationTypes.AsYouGo:
       return new AsYouGoValidator(form);
@@ -513,7 +500,6 @@ export function getFormValidator(form) {
   return new PolyfillDefaultValidator(form);
 }
 
-
 /**
  * Returns whether reportValidity API is supported.
  * @param {?Document} doc
@@ -526,7 +512,6 @@ function isReportValiditySupported(doc) {
   return !!reportValiditySupported;
 }
 
-
 /**
  * Returns whether reportValidity API is supported.
  * @param {!Document} doc
@@ -539,7 +524,6 @@ export function isCheckValiditySupported(doc) {
   return checkValiditySupported;
 }
 
-
 /**
  * Returns invalid error type on the input.
  * @see https://developer.mozilla.org/en-US/docs/Web/API/ValidityState
@@ -556,7 +540,6 @@ function getInvalidType(input) {
     }
   }
   // Finding error type with value true
-  const response = validityTypes.filter(type =>
-    input.validity[type] === true);
+  const response = validityTypes.filter(type => input.validity[type] === true);
   return response.length ? response[0] : null;
 }
diff --git a/extensions/amp-form/0.1/form-verifiers.js b/extensions/amp-form/0.1/form-verifiers.js
index 64ce019e95c4..3a389633d765 100644
--- a/extensions/amp-form/0.1/form-verifiers.js
+++ b/extensions/amp-form/0.1/form-verifiers.js
@@ -80,10 +80,12 @@ export class FormVerifier {
     if (this.isDirty_()) {
       return this.verify_();
     } else {
-      return Promise.resolve(/** @type {UpdatedErrorsDef} */ ({
-        updatedElements: [],
-        errors: [],
-      }));
+      return Promise.resolve(
+        /** @type {UpdatedErrorsDef} */ ({
+          updatedElements: [],
+          errors: [],
+        })
+      );
     }
   }
 
@@ -94,10 +96,12 @@ export class FormVerifier {
    * @protected
    */
   verify_() {
-    return Promise.resolve(/** @type {UpdatedErrorsDef} */ ({
-      updatedElements: [],
-      errors: [],
-    }));
+    return Promise.resolve(
+      /** @type {UpdatedErrorsDef} */ ({
+        updatedElements: [],
+        errors: [],
+      })
+    );
   }
 
   /**
@@ -156,7 +160,7 @@ export class FormVerifier {
  * A no-op verifier.
  * @visibleForTesting
  */
-export class DefaultVerifier extends FormVerifier { }
+export class DefaultVerifier extends FormVerifier {}
 
 /**
  * A verifier that verifies values via an XHR
@@ -182,14 +186,18 @@ export class AsyncVerifier extends FormVerifier {
 
   /** @override */
   verify_() {
-    const xhrConsumeErrors = this.doXhr_().then(() => {
-      return [];
-    }, error => {
-      return getResponseErrorData_(/** @type {!Error} */(error));
-    });
+    const xhrConsumeErrors = this.doXhr_().then(
+      () => {
+        return [];
+      },
+      error => {
+        return getResponseErrorData_(/** @type {!Error} */ (error));
+      }
+    );
 
-    return this.addToResolver_(xhrConsumeErrors)
-        .then(errors => this.applyErrors_(errors));
+    return this.addToResolver_(xhrConsumeErrors).then(errors =>
+      this.applyErrors_(errors)
+    );
   }
 
   /**
@@ -202,7 +210,7 @@ export class AsyncVerifier extends FormVerifier {
   addToResolver_(promise) {
     if (!this.xhrResolver_) {
       this.xhrResolver_ = new LastAddedResolver();
-      const cleanup = () => this.xhrResolver_ = null;
+      const cleanup = () => (this.xhrResolver_ = null);
       this.xhrResolver_.then(cleanup, cleanup);
     }
     return this.xhrResolver_.add(promise);
@@ -226,15 +234,20 @@ export class AsyncVerifier extends FormVerifier {
     // Set the error message on each element that caused an error.
     for (let i = 0; i < errors.length; i++) {
       const error = errors[i];
-      const name = user().assertString(error.name,
-          'Verification errors must have a name property');
-      const message = user().assertString(error.message,
-          'Verification errors must have a message property');
+      const name = user().assertString(
+        error.name,
+        'Verification errors must have a name property'
+      );
+      const message = user().assertString(
+        error.message,
+        'Verification errors must have a message property'
+      );
       // If multiple elements share the same name, the first should be selected.
       // This matches the behavior of HTML5 validation, e.g. with radio buttons.
       const element = user().assertElement(
-          this.form_./*OK*/querySelector(`[name="${name}"]`),
-          'Verification error name property must match a field name');
+        this.form_./*OK*/ querySelector(`[name="${name}"]`),
+        'Verification error name property must match a field name'
+      );
 
       // Only put verification errors on elements that are client-side valid.
       // This prevents errors from appearing on elements that have not been
@@ -246,10 +259,11 @@ export class AsyncVerifier extends FormVerifier {
     }
 
     // Create a list of form elements that had an error, but are now fixed.
-    const isFixed = previousError => errors.every(
-        error => previousError.name !== error.name);
-    const fixedElements = previousErrors.filter(isFixed)
-        .map(e => this.form_./*OK*/querySelector(`[name="${e.name}"]`));
+    const isFixed = previousError =>
+      errors.every(error => previousError.name !== error.name);
+    const fixedElements = previousErrors
+      .filter(isFixed)
+      .map(e => this.form_./*OK*/ querySelector(`[name="${e.name}"]`));
 
     return /** @type {!UpdatedErrorsDef} */ ({
       updatedElements: errorElements.concat(fixedElements),
@@ -269,7 +283,5 @@ function getResponseErrorData_(error) {
     return Promise.resolve([]);
   }
 
-  return response.json().then(
-      json => json.verifyErrors || [],
-      () => []);
+  return response.json().then(json => json.verifyErrors || [], () => []);
 }
diff --git a/extensions/amp-form/0.1/test-e2e/test-ssr.js b/extensions/amp-form/0.1/test-e2e/test-ssr.js
index 972179fc5721..5d7ae2192ea2 100644
--- a/extensions/amp-form/0.1/test-e2e/test-ssr.js
+++ b/extensions/amp-form/0.1/test-e2e/test-ssr.js
@@ -14,58 +14,72 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-form', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-form/amp-form.html',
-  environments: ['single'],
-}, async env => {
-  let controller;
+describes.endtoend(
+  'amp-form',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-form/amp-form.html',
+    environments: ['single'],
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  it('should render form response', async() => {
-    const searchInput =
-        await controller.findElement('#xhr-get input[name=term]');
-    await controller.type(searchInput, 'search term');
-    const submitForm =
-        await controller.findElement('#xhr-get input[type=submit]');
-    await controller.click(submitForm);
+    it('should render form response', async () => {
+      const searchInput = await controller.findElement(
+        '#xhr-get input[name=term]'
+      );
+      await controller.type(searchInput, 'search term');
+      const submitForm = await controller.findElement(
+        '#xhr-get input[type=submit]'
+      );
+      await controller.click(submitForm);
 
-    const renderedTemplate = await controller.findElement(
-        'div[i-amphtml-rendered]');
-    await expect(controller.getElementText(renderedTemplate)).to.equal(
-        'Here are the results for the search:\nResult 1\nResult 2\nResult 3');
+      const renderedTemplate = await controller.findElement(
+        'div[i-amphtml-rendered]'
+      );
+      await expect(controller.getElementText(renderedTemplate)).to.equal(
+        'Here are the results for the search:\nResult 1\nResult 2\nResult 3'
+      );
 
-    await controller.takeScreenshot('screenshots/amp-form-ssr.png');
-  });
+      await controller.takeScreenshot('screenshots/amp-form-ssr.png');
+    });
+  }
+);
 
-});
+describes.endtoend(
+  'amp-form SSR templates',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-form/amp-form.html',
+    environments: ['viewer-demo'],
+  },
+  async env => {
+    let controller;
 
-describes.endtoend('amp-form SSR templates', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-form/amp-form.html',
-  environments: ['viewer-demo'],
-}, async env => {
-  let controller;
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    it('should render form response', async () => {
+      const searchInput = await controller.findElement(
+        '#xhr-get input[name=term]'
+      );
+      await controller.type(searchInput, 'search term');
+      const submitForm = await controller.findElement(
+        '#xhr-get input[type=submit]'
+      );
+      await controller.click(submitForm);
 
-  it('should render form response', async() => {
-    const searchInput =
-        await controller.findElement('#xhr-get input[name=term]');
-    await controller.type(searchInput, 'search term');
-    const submitForm =
-        await controller.findElement('#xhr-get input[type=submit]');
-    await controller.click(submitForm);
+      const renderedTemplate = await controller.findElement(
+        'div[i-amphtml-rendered]'
+      );
+      await expect(controller.getElementText(renderedTemplate)).to.equal(
+        'SSR response'
+      );
 
-    const renderedTemplate = await controller.findElement(
-        'div[i-amphtml-rendered]');
-    await expect(controller.getElementText(renderedTemplate)).to.equal(
-        'SSR response');
-
-    await controller.takeScreenshot('screenshots/amp-form.png');
-  });
-
-});
+      await controller.takeScreenshot('screenshots/amp-form.png');
+    });
+  }
+);
diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js b/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js
index 568e8718eead..d7d10116ee5a 100644
--- a/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js
+++ b/extensions/amp-form/0.1/test/integration/test-integration-form-verifiers.js
@@ -17,7 +17,10 @@ import {poll} from '../../../../../testing/iframe';
 
 const RENDER_TIMEOUT = 15000;
 
-const describeChrome = describe.configure().ifChrome().skipSinglePass();
+const describeChrome = describe
+  .configure()
+  .ifChrome()
+  .skipSinglePass();
 
 // TODO(cvializ, #19647): Broken on SL Chrome 71.
 describeChrome.skip('amp-form verifiers', function() {
@@ -26,9 +29,11 @@ describeChrome.skip('amp-form verifiers', function() {
 
   this.timeout(RENDER_TIMEOUT);
 
-  describes.integration('verify-error template', {
-    extensions: ['amp-form', 'amp-mustache'],
-    body: `
+  describes.integration(
+    'verify-error template',
+    {
+      extensions: ['amp-form', 'amp-mustache'],
+      body: `
 <form
   target="_top"
   method="POST"
@@ -45,30 +50,38 @@ describeChrome.skip('amp-form verifiers', function() {
   </div>
 </form>
 `,
-  }, env => {
-
-    let win, doc;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
-
-    it('should render when the verifier runs', function() {
-      const email = doc.getElementById('email');
-      email.value = 'x@x';
-
-      const waitForMessage = poll('message to be rendered',
-          () => doc.getElementById('message'), undefined, RENDER_TIMEOUT, win);
-      email.dispatchEvent(new Event('change', {bubbles: true}));
-
-      return waitForMessage;
-    });
-  });
-
-  describes.integration('verify-error action', {
-    extensions: ['amp-form'],
-    body: `
+    },
+    env => {
+      let win, doc;
+
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+      });
+
+      it('should render when the verifier runs', function() {
+        const email = doc.getElementById('email');
+        email.value = 'x@x';
+
+        const waitForMessage = poll(
+          'message to be rendered',
+          () => doc.getElementById('message'),
+          undefined,
+          RENDER_TIMEOUT,
+          win
+        );
+        email.dispatchEvent(new Event('change', {bubbles: true}));
+
+        return waitForMessage;
+      });
+    }
+  );
+
+  describes.integration(
+    'verify-error action',
+    {
+      extensions: ['amp-form'],
+      body: `
 <form
   target="_top"
   method="POST"
@@ -82,26 +95,33 @@ describeChrome.skip('amp-form verifiers', function() {
 </form>
 <span id="message" hidden>Mistakes were triggered</span>
 `,
-  }, env => {
-    this.timeout(RENDER_TIMEOUT);
-
-    let win, doc;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
-
-    it('should trigger when the verifier runs', function() {
-      const email = doc.getElementById('email');
-      const message = doc.getElementById('message');
-      const waitForMessage = poll('message to be shown',
-          () => !message.hidden, undefined, RENDER_TIMEOUT, win);
-
-      email.value = 'x@x';
-      email.dispatchEvent(new Event('change', {bubbles: true}));
-
-      return waitForMessage;
-    });
-  });
+    },
+    env => {
+      this.timeout(RENDER_TIMEOUT);
+
+      let win, doc;
+
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+      });
+
+      it('should trigger when the verifier runs', function() {
+        const email = doc.getElementById('email');
+        const message = doc.getElementById('message');
+        const waitForMessage = poll(
+          'message to be shown',
+          () => !message.hidden,
+          undefined,
+          RENDER_TIMEOUT,
+          win
+        );
+
+        email.value = 'x@x';
+        email.dispatchEvent(new Event('change', {bubbles: true}));
+
+        return waitForMessage;
+      });
+    }
+  );
 });
diff --git a/extensions/amp-form/0.1/test/integration/test-integration-form.js b/extensions/amp-form/0.1/test/integration/test-integration-form.js
index dfaeace3d48a..a87e7c46ecc5 100644
--- a/extensions/amp-form/0.1/test/integration/test-integration-form.js
+++ b/extensions/amp-form/0.1/test/integration/test-integration-form.js
@@ -18,325 +18,362 @@ import {AmpEvents} from '../../../../../src/amp-events';
 import {AmpForm, AmpFormService} from '../../amp-form';
 import {AmpMustache} from '../../../../amp-mustache/0.1/amp-mustache';
 import {Services} from '../../../../../src/services';
-import {
-  installGlobalSubmitListenerForDoc,
-} from '../../../../../src/document-submit';
+import {installGlobalSubmitListenerForDoc} from '../../../../../src/document-submit';
 import {listenOncePromise} from '../../../../../src/event-helper';
 import {poll} from '../../../../../testing/iframe';
-import {registerExtendedTemplate} from
-  '../../../../../src/service/template-impl';
+import {registerExtendedTemplate} from '../../../../../src/service/template-impl';
 
 /** @const {number} */
 const RENDER_TIMEOUT = 15000;
 
-describes.realWin('AmpForm Integration', {
-  amp: {
-    runtimeOn: true,
-    ampdoc: 'single',
+describes.realWin(
+  'AmpForm Integration',
+  {
+    amp: {
+      runtimeOn: true,
+      ampdoc: 'single',
+    },
+    mockFetch: false,
   },
-  mockFetch: false,
-}, env => {
-  const {testServerPort} = window.ampTestRuntimeConfig;
-  const baseUrl = `http://localhost:${testServerPort}`;
-  let doc;
-  let sandbox;
-
-  const realSetTimeout = window.setTimeout;
-  const stubSetTimeout = (callback, delay) => {
-    realSetTimeout(() => {
-      try {
-        callback();
-      } catch (e) {}
-    }, delay);
-  };
-
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    doc = env.win.document;
-
-    sandbox.stub(Services, 'formSubmitForDoc')
-        .returns(() => { fire: () => {}; });
-
-    const mustache = document.createElement('script');
-    mustache.setAttribute('custom-template', 'amp-mustache');
-    doc.body.appendChild(mustache);
-    registerExtendedTemplate(env.win, 'amp-mustache', AmpMustache);
-
-    const form = document.createElement('script');
-    form.setAttribute('custom-element', 'amp-form');
-    doc.head.appendChild(form);
-
-    new AmpFormService(env.ampdoc);
-
-    // Wait for submit listener to be installed before starting tests.
-    return installGlobalSubmitListenerForDoc(env.ampdoc);
-  });
-
-  function getForm(config) {
-    const form = doc.createElement('form');
-    form.id = config.id || 'test-form';
-    form.setAttribute('method', config.method || 'POST');
-    form.setAttribute('target', config.target || '_top');
-
-    const nameInput = doc.createElement('input');
-    nameInput.setAttribute('name', 'name');
-    nameInput.setAttribute('value', 'John Miller');
-    form.appendChild(nameInput);
-    if (config.actionXhr) {
-      form.setAttribute('action-xhr', config.actionXhr);
-    }
-    if (config.action) {
-      form.setAttribute('action', config.action);
-    }
-    const submitButton = doc.createElement('input');
-    submitButton.setAttribute('type', 'submit');
-    form.appendChild(submitButton);
+  env => {
+    const {testServerPort} = window.ampTestRuntimeConfig;
+    const baseUrl = `http://localhost:${testServerPort}`;
+    let doc;
+    let sandbox;
+
+    const realSetTimeout = window.setTimeout;
+    const stubSetTimeout = (callback, delay) => {
+      realSetTimeout(() => {
+        try {
+          callback();
+        } catch (e) {}
+      }, delay);
+    };
+
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      doc = env.win.document;
+
+      sandbox.stub(Services, 'formSubmitForDoc').returns(() => {
+        fire: () => {};
+      });
 
-    if (config.on) {
-      form.setAttribute('on', config.on);
-    }
+      const mustache = document.createElement('script');
+      mustache.setAttribute('custom-template', 'amp-mustache');
+      doc.body.appendChild(mustache);
+      registerExtendedTemplate(env.win, 'amp-mustache', AmpMustache);
+
+      const form = document.createElement('script');
+      form.setAttribute('custom-element', 'amp-form');
+      doc.head.appendChild(form);
+
+      new AmpFormService(env.ampdoc);
+
+      // Wait for submit listener to be installed before starting tests.
+      return installGlobalSubmitListenerForDoc(env.ampdoc);
+    });
 
-    if (config.success) {
-      const {message, template} = config.success;
-      const successDiv = doc.createElement('div');
-      successDiv.setAttribute('submit-success', '');
-      if (template) {
-        const child = doc.createElement('template');
-        child.setAttribute('type', 'amp-mustache');
-        child./*OK*/innerHTML = message;
-        successDiv.appendChild(child);
-      } else {
-        successDiv./*OK*/innerHTML = message;
+    function getForm(config) {
+      const form = doc.createElement('form');
+      form.id = config.id || 'test-form';
+      form.setAttribute('method', config.method || 'POST');
+      form.setAttribute('target', config.target || '_top');
+
+      const nameInput = doc.createElement('input');
+      nameInput.setAttribute('name', 'name');
+      nameInput.setAttribute('value', 'John Miller');
+      form.appendChild(nameInput);
+      if (config.actionXhr) {
+        form.setAttribute('action-xhr', config.actionXhr);
       }
+      if (config.action) {
+        form.setAttribute('action', config.action);
+      }
+      const submitButton = doc.createElement('input');
+      submitButton.setAttribute('type', 'submit');
+      form.appendChild(submitButton);
 
-      form.appendChild(successDiv);
-    }
+      if (config.on) {
+        form.setAttribute('on', config.on);
+      }
 
-    if (config.error) {
-      const {message, template} = config.error;
-      const errorDiv = doc.createElement('div');
-      errorDiv.setAttribute('submit-error', '');
-      if (template) {
-        const child = doc.createElement('template');
-        child.setAttribute('type', 'amp-mustache');
-        child./*OK*/innerHTML = message;
-        errorDiv.appendChild(child);
-      } else {
-        errorDiv./*OK*/innerHTML = message;
+      if (config.success) {
+        const {message, template} = config.success;
+        const successDiv = doc.createElement('div');
+        successDiv.setAttribute('submit-success', '');
+        if (template) {
+          const child = doc.createElement('template');
+          child.setAttribute('type', 'amp-mustache');
+          child./*OK*/ innerHTML = message;
+          successDiv.appendChild(child);
+        } else {
+          successDiv./*OK*/ innerHTML = message;
+        }
+
+        form.appendChild(successDiv);
       }
-      form.appendChild(errorDiv);
-    }
 
-    doc.body.appendChild(form);
-    return form;
-  }
+      if (config.error) {
+        const {message, template} = config.error;
+        const errorDiv = doc.createElement('div');
+        errorDiv.setAttribute('submit-error', '');
+        if (template) {
+          const child = doc.createElement('template');
+          child.setAttribute('type', 'amp-mustache');
+          child./*OK*/ innerHTML = message;
+          errorDiv.appendChild(child);
+        } else {
+          errorDiv./*OK*/ innerHTML = message;
+        }
+        form.appendChild(errorDiv);
+      }
 
-  const describeChrome =
-      describe.configure().skipFirefox().skipSafari().skipEdge();
+      doc.body.appendChild(form);
+      return form;
+    }
 
-  describeChrome.run('on=submit:form.submit', () => {
-    it('should be protected from recursive-submission', () => {
-      const form = getForm({
-        id: 'sameform',
-        actionXhr: baseUrl + '/form/post',
-        on: 'submit:sameform.submit',
-      });
-      const ampForm = new AmpForm(form, 'sameform');
-      sandbox.spy(ampForm, 'handleXhrSubmit_');
-      sandbox.spy(ampForm, 'handleSubmitAction_');
-      sandbox.spy(ampForm.xhr_, 'fetch');
-      const fetch = poll('submit request sent',
-          () => ampForm.xhrSubmitPromiseForTesting());
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => {
-        // Due to recursive nature of 'on=submit:sameform.submit' we expect
-        // the action handler to be called twice, the first time for the
-        // actual user submission.
-        // The second time in response to the `submit` event being triggered
-        // and sameform.submit being invoked.
-        expect(ampForm.handleSubmitAction_).to.have.been.calledTwice;
-        // However, only the first invocation should be handled completely.
-        // and any subsequent calls should be stopped early-on.
-        expect(ampForm.handleXhrSubmit_).to.have.been.calledOnce;
-        expect(ampForm.xhr_.fetch).to.have.been.calledOnce;
+    const describeChrome = describe
+      .configure()
+      .skipFirefox()
+      .skipSafari()
+      .skipEdge();
+
+    describeChrome.run('on=submit:form.submit', () => {
+      it('should be protected from recursive-submission', () => {
+        const form = getForm({
+          id: 'sameform',
+          actionXhr: baseUrl + '/form/post',
+          on: 'submit:sameform.submit',
+        });
+        const ampForm = new AmpForm(form, 'sameform');
+        sandbox.spy(ampForm, 'handleXhrSubmit_');
+        sandbox.spy(ampForm, 'handleSubmitAction_');
+        sandbox.spy(ampForm.xhr_, 'fetch');
+        const fetch = poll('submit request sent', () =>
+          ampForm.xhrSubmitPromiseForTesting()
+        );
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch.then(() => {
+          // Due to recursive nature of 'on=submit:sameform.submit' we expect
+          // the action handler to be called twice, the first time for the
+          // actual user submission.
+          // The second time in response to the `submit` event being triggered
+          // and sameform.submit being invoked.
+          expect(ampForm.handleSubmitAction_).to.have.been.calledTwice;
+          // However, only the first invocation should be handled completely.
+          // and any subsequent calls should be stopped early-on.
+          expect(ampForm.handleXhrSubmit_).to.have.been.calledOnce;
+          expect(ampForm.xhr_.fetch).to.have.been.calledOnce;
+        });
       });
     });
-  });
-
-  // TODO(cvializ, #19647): Broken on SL Chrome 71.
-  describeChrome.skip('Submit xhr-POST', function() {
-    this.timeout(RENDER_TIMEOUT);
-
-    it('should submit and render success', () => {
-      const form = getForm({
-        id: 'form1',
-        actionXhr: baseUrl + '/form/post/success',
-        success: {
-          message: 'Thanks {{name}} for adding your interests:' +
+
+    // TODO(cvializ, #19647): Broken on SL Chrome 71.
+    describeChrome.skip('Submit xhr-POST', function() {
+      this.timeout(RENDER_TIMEOUT);
+
+      it('should submit and render success', () => {
+        const form = getForm({
+          id: 'form1',
+          actionXhr: baseUrl + '/form/post/success',
+          success: {
+            message:
+              'Thanks {{name}} for adding your interests:' +
               ' {{#interests}}{{title}} {{/interests}}.',
-          template: true,
-        },
-        error: {message: 'Should not render this.', template: true},
-      });
-      const ampForm = new AmpForm(form, 'form1');
-      const fetch = poll('submit request sent',
-          () => ampForm.xhrSubmitPromiseForTesting());
-      const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => render).then(() => {
-        const rendered = form.querySelector('[i-amphtml-rendered]');
-        expect(rendered.textContent).to.equal(
-            'Thanks John Miller for adding your interests: ' +
-            'Football Basketball Writing .');
+            template: true,
+          },
+          error: {message: 'Should not render this.', template: true},
+        });
+        const ampForm = new AmpForm(form, 'form1');
+        const fetch = poll('submit request sent', () =>
+          ampForm.xhrSubmitPromiseForTesting()
+        );
+        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch
+          .then(() => render)
+          .then(() => {
+            const rendered = form.querySelector('[i-amphtml-rendered]');
+            expect(rendered.textContent).to.equal(
+              'Thanks John Miller for adding your interests: ' +
+                'Football Basketball Writing .'
+            );
+          });
       });
-    });
 
-    it('should submit and render error', () => {
-      // Stubbing timeout to catch async-thrown errors and expect
-      // them. These catch errors thrown inside the catch-clause of the
-      // xhr request using rethrowAsync.
-      sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
-
-      const form = getForm({
-        id: 'form1',
-        actionXhr: baseUrl + '/form/post/error',
-        success: {message: 'Should not render this.', template: true},
-        error: {
-          message: 'Oops. {{name}} your email {{email}} is already ' +
-              'subscribed.',
-          template: true,
-        },
-      });
-      const ampForm = new AmpForm(form, 'form1');
-      const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
-      const fetch = poll('submit request sent', () => fetchSpy.returnValues[0]);
-      const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => {
-        throw new Error('UNREACHABLE');
-      }, fetchError => {
-        expect(fetchError.message).to.match(/HTTP error 500/);
-        return render.then(() => {
-          const rendered = form.querySelector('[i-amphtml-rendered]');
-          expect(rendered.textContent).to.equal(
-              'Oops. John Miller your email john@miller.what is already ' +
-              'subscribed.');
+      it('should submit and render error', () => {
+        // Stubbing timeout to catch async-thrown errors and expect
+        // them. These catch errors thrown inside the catch-clause of the
+        // xhr request using rethrowAsync.
+        sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
+
+        const form = getForm({
+          id: 'form1',
+          actionXhr: baseUrl + '/form/post/error',
+          success: {message: 'Should not render this.', template: true},
+          error: {
+            message:
+              'Oops. {{name}} your email {{email}} is already subscribed.',
+            template: true,
+          },
         });
+        const ampForm = new AmpForm(form, 'form1');
+        const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
+        const fetch = poll(
+          'submit request sent',
+          () => fetchSpy.returnValues[0]
+        );
+        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch.then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          fetchError => {
+            expect(fetchError.message).to.match(/HTTP error 500/);
+            return render.then(() => {
+              const rendered = form.querySelector('[i-amphtml-rendered]');
+              expect(rendered.textContent).to.equal(
+                'Oops. John Miller your email john@miller.what is already ' +
+                  'subscribed.'
+              );
+            });
+          }
+        );
       });
     });
-  });
-
-  // TODO(cvializ, #19647): Broken on SL Chrome 71.
-  describeChrome.skip('Submit xhr-GET', function() {
-    this.timeout(RENDER_TIMEOUT);
-
-    it('should submit and render success', () => {
-      const form = getForm({
-        id: 'form1',
-        method: 'GET',
-        actionXhr: baseUrl + '/form/post/success',
-        success: {
-          message: 'Thanks {{name}} for adding your interests:' +
+
+    // TODO(cvializ, #19647): Broken on SL Chrome 71.
+    describeChrome.skip('Submit xhr-GET', function() {
+      this.timeout(RENDER_TIMEOUT);
+
+      it('should submit and render success', () => {
+        const form = getForm({
+          id: 'form1',
+          method: 'GET',
+          actionXhr: baseUrl + '/form/post/success',
+          success: {
+            message:
+              'Thanks {{name}} for adding your interests:' +
               ' {{#interests}}{{title}} {{/interests}}.',
-          template: true,
-        },
-        error: {message: 'Should not render this.', template: true},
-      });
-      const ampForm = new AmpForm(form, 'form1');
-      const fetch = poll('submit request sent',
-          () => ampForm.xhrSubmitPromiseForTesting());
-      const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => render).then(() => {
-        const rendered = form.querySelectorAll('[i-amphtml-rendered]');
-        expect(rendered.length).to.equal(1);
-        expect(rendered[0].textContent).to.equal(
-            'Thanks John Miller for adding your interests: ' +
-            'Football Basketball Writing .');
+            template: true,
+          },
+          error: {message: 'Should not render this.', template: true},
+        });
+        const ampForm = new AmpForm(form, 'form1');
+        const fetch = poll('submit request sent', () =>
+          ampForm.xhrSubmitPromiseForTesting()
+        );
+        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch
+          .then(() => render)
+          .then(() => {
+            const rendered = form.querySelectorAll('[i-amphtml-rendered]');
+            expect(rendered.length).to.equal(1);
+            expect(rendered[0].textContent).to.equal(
+              'Thanks John Miller for adding your interests: ' +
+                'Football Basketball Writing .'
+            );
+          });
       });
-    });
 
-    it('should submit and render error', () => {
-      // Stubbing timeout to catch async-thrown errors and expect
-      // them. These catch errors thrown inside the catch-clause of the
-      // xhr request using rethrowAsync.
-      sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
-
-      const form = getForm({
-        id: 'form1',
-        actionXhr: baseUrl + '/form/post/error',
-        success: {message: 'Should not render this.', template: true},
-        error: {
-          message: 'Oops. {{name}} your email {{email}} is already ' +
-              'subscribed.',
-          template: true,
-        },
-      });
-      const ampForm = new AmpForm(form, 'form1');
-      const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
-      const fetch = poll('submit request sent', () => fetchSpy.returnValues[0]);
-      const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => {
-        throw new Error('UNREACHABLE');
-      }, fetchError => {
-        expect(fetchError.message).to.match(/HTTP error 500/);
-        return render.then(() => {
-          const rendered = form.querySelector('[i-amphtml-rendered]');
-          expect(rendered.textContent).to.equal(
-              'Oops. John Miller your email john@miller.what is already ' +
-              'subscribed.');
+      it('should submit and render error', () => {
+        // Stubbing timeout to catch async-thrown errors and expect
+        // them. These catch errors thrown inside the catch-clause of the
+        // xhr request using rethrowAsync.
+        sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
+
+        const form = getForm({
+          id: 'form1',
+          actionXhr: baseUrl + '/form/post/error',
+          success: {message: 'Should not render this.', template: true},
+          error: {
+            message:
+              'Oops. {{name}} your email {{email}} is already subscribed.',
+            template: true,
+          },
         });
+        const ampForm = new AmpForm(form, 'form1');
+        const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
+        const fetch = poll(
+          'submit request sent',
+          () => fetchSpy.returnValues[0]
+        );
+        const render = listenOncePromise(form, AmpEvents.DOM_UPDATE);
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch.then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          fetchError => {
+            expect(fetchError.message).to.match(/HTTP error 500/);
+            return render.then(() => {
+              const rendered = form.querySelector('[i-amphtml-rendered]');
+              expect(rendered.textContent).to.equal(
+                'Oops. John Miller your email john@miller.what is already ' +
+                  'subscribed.'
+              );
+            });
+          }
+        );
       });
     });
-  });
-
-  // TODO(cvializ, #19647): Broken on SL Chrome 71.
-  describeChrome.skip('Submit result message', () => {
-    it('should render messages with or without a template', () => {
-      // Stubbing timeout to catch async-thrown errors and expect
-      // them. These catch errors thrown inside the catch-clause of the
-      // xhr request using rethrowAsync.
-      sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
-
-      const form = getForm({
-        id: 'form1',
-        actionXhr: baseUrl + '/form/post/error',
-        success: {message: 'Should not render this.', template: false},
-        error: {
-          message: 'Oops! Your email is already subscribed.' +
+
+    // TODO(cvializ, #19647): Broken on SL Chrome 71.
+    describeChrome.skip('Submit result message', () => {
+      it('should render messages with or without a template', () => {
+        // Stubbing timeout to catch async-thrown errors and expect
+        // them. These catch errors thrown inside the catch-clause of the
+        // xhr request using rethrowAsync.
+        sandbox.stub(window, 'setTimeout').callsFake(stubSetTimeout);
+
+        const form = getForm({
+          id: 'form1',
+          actionXhr: baseUrl + '/form/post/error',
+          success: {message: 'Should not render this.', template: false},
+          error: {
+            message:
+              'Oops! Your email is already subscribed.' +
               '<amp-img src="/examples/img/ampicon.png" ' +
               'width="42" height="42"></amp-img>',
-          template: false,
-        },
-      });
-      const ampForm = new AmpForm(form, 'form1');
-      const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
-      const fetch = poll('submit request sent', () => fetchSpy.returnValues[0]);
-
-      form.dispatchEvent(new Event('submit'));
-      return fetch.then(() => {
-        throw new Error('UNREACHABLE');
-      }, fetchError => {
-        expect(fetchError.message).to.match(/HTTP error 500/);
-
-        // It shouldn't have the i-amphtml-rendered attribute since no
-        // template was rendered.
-        const rendered = form.querySelectorAll('[i-amphtml-rendered]');
-        expect(rendered.length).to.equal(0);
-
-        // Any amp elements inside the message should be layed out.
-        const layout = listenOncePromise(form, AmpEvents.LOAD_START);
-        return layout.then(() => {
-          const img = form.querySelector('amp-img img');
-          expect(img.src).to.contain('/examples/img/ampicon.png');
+            template: false,
+          },
         });
+        const ampForm = new AmpForm(form, 'form1');
+        const fetchSpy = sandbox.spy(ampForm.xhr_, 'fetch');
+        const fetch = poll(
+          'submit request sent',
+          () => fetchSpy.returnValues[0]
+        );
+
+        form.dispatchEvent(new Event('submit'));
+        return fetch.then(
+          () => {
+            throw new Error('UNREACHABLE');
+          },
+          fetchError => {
+            expect(fetchError.message).to.match(/HTTP error 500/);
+
+            // It shouldn't have the i-amphtml-rendered attribute since no
+            // template was rendered.
+            const rendered = form.querySelectorAll('[i-amphtml-rendered]');
+            expect(rendered.length).to.equal(0);
+
+            // Any amp elements inside the message should be layed out.
+            const layout = listenOncePromise(form, AmpEvents.LOAD_START);
+            return layout.then(() => {
+              const img = form.querySelector('amp-img img');
+              expect(img.src).to.contain('/examples/img/ampicon.png');
+            });
+          }
+        );
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-form/0.1/test/test-amp-form-textarea.js b/extensions/amp-form/0.1/test/test-amp-form-textarea.js
index dbf9ed6febee..c3ffd6e3d748 100644
--- a/extensions/amp-form/0.1/test/test-amp-form-textarea.js
+++ b/extensions/amp-form/0.1/test/test-amp-form-textarea.js
@@ -25,170 +25,179 @@ import {CSS} from '../../../../build/amp-form-0.1.css';
 import {Services} from '../../../../src/services';
 import {installStylesForDoc} from '../../../../src/style-installer';
 
-describes.realWin('amp-form textarea[autoexpand]', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'amp-form textarea[autoexpand]',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let doc;
-  let sandbox;
-  beforeEach(() => {
-    doc = env.ampdoc.getRootNode();
-    installStylesForDoc(env.ampdoc, CSS, () => {}, false, 'amp-form');
-    sandbox = env.sandbox;
-  });
-
-  describe('handleInitialOverflowElements', () => {
-    it('should remove autoexpand on elements with initial overflow', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '1');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'big text'.repeat(30);
-      doc.body.appendChild(textarea);
-
-      return handleInitialOverflowElements([textarea]).then(() => {
-        expect(textarea).to.not.have.attribute('autoexpand');
-      });
+  env => {
+    let doc;
+    let sandbox;
+    beforeEach(() => {
+      doc = env.ampdoc.getRootNode();
+      installStylesForDoc(env.ampdoc, CSS, () => {}, false, 'amp-form');
+      sandbox = env.sandbox;
     });
-  });
-
-  describe('getHasOverflow', () => {
-    it('should detect if an element has overflow', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '1');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'big text'.repeat(30);
-      doc.body.appendChild(textarea);
-
-      return expect(getHasOverflow(textarea)).to.eventually.be.true;
+
+    describe('handleInitialOverflowElements', () => {
+      it('should remove autoexpand on elements with initial overflow', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '1');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'big text'.repeat(30);
+        doc.body.appendChild(textarea);
+
+        return handleInitialOverflowElements([textarea]).then(() => {
+          expect(textarea).to.not.have.attribute('autoexpand');
+        });
+      });
     });
 
-    it('should detect if an element does not have overflow', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '1');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'small text';
-      doc.body.appendChild(textarea);
+    describe('getHasOverflow', () => {
+      it('should detect if an element has overflow', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '1');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'big text'.repeat(30);
+        doc.body.appendChild(textarea);
 
-      return expect(getHasOverflow(textarea)).to.eventually.be.false;
-    });
-  });
-
-  describe('maybeResizeTextarea', () => {
-    it('should not resize an element that has not expanded', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '4');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'small text';
-      doc.body.appendChild(textarea);
-
-      const fakeResources = {
-        measureMutateElement(unusedElement, measurer, mutator) {
-          measurer();
-          return mutator() || Promise.resolve();
-        },
-      };
-      sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
-
-      const initialHeight = textarea.clientHeight;
-      return maybeResizeTextarea(textarea).then(() => {
-        expect(textarea.clientHeight).to.equal(initialHeight);
+        return expect(getHasOverflow(textarea)).to.eventually.be.true;
       });
-    });
 
-    it('should expand an element that exceeds its boundary', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '4');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'big text'.repeat(100);
-      doc.body.appendChild(textarea);
-
-      const fakeResources = {
-        measureMutateElement(unusedElement, measurer, mutator) {
-          measurer();
-          return mutator() || Promise.resolve();
-        },
-      };
-      sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
-
-      const initialHeight = textarea.clientHeight;
-      return maybeResizeTextarea(textarea).then(() => {
-        expect(textarea.clientHeight).to.be.greaterThan(initialHeight);
+      it('should detect if an element does not have overflow', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '1');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'small text';
+        doc.body.appendChild(textarea);
+
+        return expect(getHasOverflow(textarea)).to.eventually.be.false;
       });
     });
 
-    it('should shrink an element that expands and then reduces', () => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '4');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'big text'.repeat(100);
-      doc.body.appendChild(textarea);
-
-      const fakeResources = {
-        measureMutateElement(unusedElement, measurer, mutator) {
-          measurer();
-          return mutator() || Promise.resolve();
-        },
-      };
-      sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
-
-      const initialHeight = textarea.clientHeight;
-      let increasedHeight;
-      return maybeResizeTextarea(textarea).then(() => {
-        increasedHeight = textarea.clientHeight;
-        expect(increasedHeight).to.be.greaterThan(initialHeight);
-      }).then(() => {
+    describe('maybeResizeTextarea', () => {
+      it('should not resize an element that has not expanded', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '4');
+        textarea.setAttribute('cols', '80');
         textarea.innerHTML = 'small text';
-        return maybeResizeTextarea(textarea);
-      }).then(() => {
-        expect(textarea.clientHeight).to.be.lessThan(increasedHeight);
+        doc.body.appendChild(textarea);
+
+        const fakeResources = {
+          measureMutateElement(unusedElement, measurer, mutator) {
+            measurer();
+            return mutator() || Promise.resolve();
+          },
+        };
+        sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
+
+        const initialHeight = textarea.clientHeight;
+        return maybeResizeTextarea(textarea).then(() => {
+          expect(textarea.clientHeight).to.equal(initialHeight);
+        });
+      });
+
+      it('should expand an element that exceeds its boundary', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '4');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'big text'.repeat(100);
+        doc.body.appendChild(textarea);
+
+        const fakeResources = {
+          measureMutateElement(unusedElement, measurer, mutator) {
+            measurer();
+            return mutator() || Promise.resolve();
+          },
+        };
+        sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
+
+        const initialHeight = textarea.clientHeight;
+        return maybeResizeTextarea(textarea).then(() => {
+          expect(textarea.clientHeight).to.be.greaterThan(initialHeight);
+        });
+      });
+
+      it('should shrink an element that expands and then reduces', () => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '4');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'big text'.repeat(100);
+        doc.body.appendChild(textarea);
+
+        const fakeResources = {
+          measureMutateElement(unusedElement, measurer, mutator) {
+            measurer();
+            return mutator() || Promise.resolve();
+          },
+        };
+        sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
+
+        const initialHeight = textarea.clientHeight;
+        let increasedHeight;
+        return maybeResizeTextarea(textarea)
+          .then(() => {
+            increasedHeight = textarea.clientHeight;
+            expect(increasedHeight).to.be.greaterThan(initialHeight);
+          })
+          .then(() => {
+            textarea.innerHTML = 'small text';
+            return maybeResizeTextarea(textarea);
+          })
+          .then(() => {
+            expect(textarea.clientHeight).to.be.lessThan(increasedHeight);
+          });
       });
     });
-  });
-
-  describe('handleTextareaDrag', () => {
-    it('should handle text area drag', done => {
-      const textarea = doc.createElement('textarea');
-      textarea.setAttribute('autoexpand', '');
-      textarea.setAttribute('rows', '4');
-      textarea.setAttribute('cols', '80');
-      textarea.innerHTML = 'small text';
-      doc.body.appendChild(textarea);
-      new AmpFormTextarea(doc);
-      let callCount = 0;
-      const fakeResources = {
-        measureElement(unused) {
-          return Promise.resolve();
-        },
-        measureMutateElement(unusedElement, measurer, mutator) {
-          callCount++;
-          measurer();
-          return mutator() || Promise.resolve();
-        },
-      };
-      sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
-      sandbox.stub(eventHelper, 'listenOncePromise').returns(Promise.resolve());
-
-      let mouseDownEvent;
-      if (doc.createEvent) {
-        mouseDownEvent = new MouseEvent('mousedown');
-      } else {
-        mouseDownEvent = doc.createEventObject();
-        mouseDownEvent.type = 'mousedown';
-      }
-      Object.defineProperty(mouseDownEvent, 'target', {value: textarea});
-      // Given 2 mousedown events on the textarea.
-      doc.dispatchEvent(mouseDownEvent);
-      doc.dispatchEvent(mouseDownEvent);
-      done();
-      // Expect measure mutate to have been called twice.
-      expect(callCount).to.equal(2);
+
+    describe('handleTextareaDrag', () => {
+      it('should handle text area drag', done => {
+        const textarea = doc.createElement('textarea');
+        textarea.setAttribute('autoexpand', '');
+        textarea.setAttribute('rows', '4');
+        textarea.setAttribute('cols', '80');
+        textarea.innerHTML = 'small text';
+        doc.body.appendChild(textarea);
+        new AmpFormTextarea(doc);
+        let callCount = 0;
+        const fakeResources = {
+          measureElement(unused) {
+            return Promise.resolve();
+          },
+          measureMutateElement(unusedElement, measurer, mutator) {
+            callCount++;
+            measurer();
+            return mutator() || Promise.resolve();
+          },
+        };
+        sandbox.stub(Services, 'resourcesForDoc').returns(fakeResources);
+        sandbox
+          .stub(eventHelper, 'listenOncePromise')
+          .returns(Promise.resolve());
+
+        let mouseDownEvent;
+        if (doc.createEvent) {
+          mouseDownEvent = new MouseEvent('mousedown');
+        } else {
+          mouseDownEvent = doc.createEventObject();
+          mouseDownEvent.type = 'mousedown';
+        }
+        Object.defineProperty(mouseDownEvent, 'target', {value: textarea});
+        // Given 2 mousedown events on the textarea.
+        doc.dispatchEvent(mouseDownEvent);
+        doc.dispatchEvent(mouseDownEvent);
+        done();
+        // Expect measure mutate to have been called twice.
+        expect(callCount).to.equal(2);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-form/0.1/test/test-amp-form.js b/extensions/amp-form/0.1/test/test-amp-form.js
index 999942d95b7a..86f162adae89 100644
--- a/extensions/amp-form/0.1/test/test-amp-form.js
+++ b/extensions/amp-form/0.1/test/test-amp-form.js
@@ -29,9 +29,7 @@ import {
   AsyncInputClasses,
 } from '../../../../src/async-input';
 import {Services} from '../../../../src/services';
-import {
-  cidServiceForDocForTesting,
-} from '../../../../src/service/cid-impl';
+import {cidServiceForDocForTesting} from '../../../../src/service/cid-impl';
 import {
   createFormDataWrapper,
   isFormDataWrapper,
@@ -44,2550 +42,2861 @@ import {
 import {user} from '../../../../src/log';
 import {whenCalled} from '../../../../testing/test-helper.js';
 
-describes.repeated('', {
-  'single ampdoc': {ampdoc: 'single'},
-  'shadow ampdoc': {ampdoc: 'shadow'},
-}, (name, variant) => {
-
-  describes.realWin('amp-form', {
-    amp: {
-      runtimeOn: true,
-      ampdoc: variant.ampdoc,
-      extensions: ['amp-form', 'amp-selector'], // amp-form is installed as service.
-    },
-  }, env => {
-
-    let sandbox;
-    let document;
-    let timer;
-    let createElement;
-    let createTextNode;
-    let mutateElementStub;
-
-    beforeEach(() => {
-      sandbox = env.sandbox;
-      document = env.ampdoc.getRootNode();
-      timer = Services.timerFor(env.win);
-      const ownerDoc = document.ownerDocument || document;
-      createElement = ownerDoc.createElement.bind(ownerDoc);
-      createTextNode = ownerDoc.createTextNode.bind(ownerDoc);
-
-      // Force sync mutateElement to make testing easier.
-      const resources = Services.resourcesForDoc(env.ampdoc);
-      mutateElementStub = sandbox.stub(resources, 'mutateElement').callsArg(1);
-
-      // This needs to be stubbed to stop the function from,
-      // hanging and timing out on tests that make proper XHR requests
-      sandbox.stub(xhrUtils, 'getViewerInterceptResponse')
-          .returns(Promise.resolve(null));
-    });
-
-    afterEach(() => sandbox.restore());
-
-    function getAmpForm(form, canonical = 'https://example.com/amps.html') {
-      new AmpFormService(env.ampdoc);
-      Services.documentInfoForDoc(env.ampdoc).canonicalUrl = canonical;
-      const cidService = cidServiceForDocForTesting(env.ampdoc);
-      sandbox.stub(cidService, 'get').returns(Promise.resolve('amp-cid'));
-      env.ampdoc.getBody().appendChild(form);
-      const ampForm = new AmpForm(form, 'amp-form-test-id');
-      sandbox.stub(ampForm.ssrTemplateHelper_, 'isSupported').returns(false);
-      return Promise.resolve(ampForm);
-    }
-
-    function getForm(button1 = true, button2 = false,
-      button3 = false) {
-      const form = createElement('form');
-      form.setAttribute('method', 'POST');
-
-      const nameInput = createElement('input');
-      nameInput.setAttribute('name', 'name');
-      nameInput.setAttribute('value', 'John Miller');
-      form.appendChild(nameInput);
-      form.setAttribute('action-xhr', 'https://example.com');
-      form.setAttribute('action', 'https://example.com');
-
-      if (button1) {
-        const submitBtn = createElement('input');
-        submitBtn.setAttribute('type', 'submit');
-        form.appendChild(submitBtn);
-      }
+describes.repeated(
+  '',
+  {
+    'single ampdoc': {ampdoc: 'single'},
+    'shadow ampdoc': {ampdoc: 'shadow'},
+  },
+  (name, variant) => {
+    describes.realWin(
+      'amp-form',
+      {
+        amp: {
+          runtimeOn: true,
+          ampdoc: variant.ampdoc,
+          extensions: ['amp-form', 'amp-selector'], // amp-form is installed as service.
+        },
+      },
+      env => {
+        let sandbox;
+        let document;
+        let timer;
+        let createElement;
+        let createTextNode;
+        let mutateElementStub;
+
+        beforeEach(() => {
+          sandbox = env.sandbox;
+          document = env.ampdoc.getRootNode();
+          timer = Services.timerFor(env.win);
+          const ownerDoc = document.ownerDocument || document;
+          createElement = ownerDoc.createElement.bind(ownerDoc);
+          createTextNode = ownerDoc.createTextNode.bind(ownerDoc);
+
+          // Force sync mutateElement to make testing easier.
+          const resources = Services.resourcesForDoc(env.ampdoc);
+          mutateElementStub = sandbox
+            .stub(resources, 'mutateElement')
+            .callsArg(1);
+
+          // This needs to be stubbed to stop the function from,
+          // hanging and timing out on tests that make proper XHR requests
+          sandbox
+            .stub(xhrUtils, 'getViewerInterceptResponse')
+            .returns(Promise.resolve(null));
+        });
 
-      if (button2) {
-        const submitBtn = createElement('input');
-        submitBtn.setAttribute('type', 'submit');
-        form.appendChild(submitBtn);
-      }
+        afterEach(() => sandbox.restore());
+
+        function getAmpForm(form, canonical = 'https://example.com/amps.html') {
+          new AmpFormService(env.ampdoc);
+          Services.documentInfoForDoc(env.ampdoc).canonicalUrl = canonical;
+          const cidService = cidServiceForDocForTesting(env.ampdoc);
+          sandbox.stub(cidService, 'get').returns(Promise.resolve('amp-cid'));
+          env.ampdoc.getBody().appendChild(form);
+          const ampForm = new AmpForm(form, 'amp-form-test-id');
+          sandbox
+            .stub(ampForm.ssrTemplateHelper_, 'isSupported')
+            .returns(false);
+          return Promise.resolve(ampForm);
+        }
+
+        function getForm(button1 = true, button2 = false, button3 = false) {
+          const form = createElement('form');
+          form.setAttribute('method', 'POST');
+
+          const nameInput = createElement('input');
+          nameInput.setAttribute('name', 'name');
+          nameInput.setAttribute('value', 'John Miller');
+          form.appendChild(nameInput);
+          form.setAttribute('action-xhr', 'https://example.com');
+          form.setAttribute('action', 'https://example.com');
+
+          if (button1) {
+            const submitBtn = createElement('input');
+            submitBtn.setAttribute('type', 'submit');
+            form.appendChild(submitBtn);
+          }
 
-      if (button3) {
-        const submitBtn = createElement('button');
-        submitBtn.setAttribute('type', 'submit');
-        form.appendChild(submitBtn);
-      }
+          if (button2) {
+            const submitBtn = createElement('input');
+            submitBtn.setAttribute('type', 'submit');
+            form.appendChild(submitBtn);
+          }
 
-      return form;
-    }
-
-    function getVerificationForm() {
-      const form = getForm(/*button1*/ false);
-      form.setAttribute('verify-xhr', '');
-
-      const noVerifyInput = createElement('input');
-      noVerifyInput.id = 'noVerify';
-      noVerifyInput.setAttribute('name', 'noVerify');
-      noVerifyInput.setAttribute('type', 'text');
-      noVerifyInput.setAttribute('no-verify', '');
-      form.appendChild(noVerifyInput); // This one is not required
-
-      return form;
-    }
-
-    function getAmpFormWithAsyncInput() {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-
-        // Create our async input element
-        // With the required fields
-        const asyncInput = createElement('amp-mock-async-input');
-        asyncInput.classList.add(AsyncInputClasses.ASYNC_INPUT);
-        asyncInput.setAttribute(
-            AsyncInputAttributes.NAME,
-            'mock-async-input'
-        );
+          if (button3) {
+            const submitBtn = createElement('button');
+            submitBtn.setAttribute('type', 'submit');
+            form.appendChild(submitBtn);
+          }
+
+          return form;
+        }
+
+        function getVerificationForm() {
+          const form = getForm(/*button1*/ false);
+          form.setAttribute('verify-xhr', '');
+
+          const noVerifyInput = createElement('input');
+          noVerifyInput.id = 'noVerify';
+          noVerifyInput.setAttribute('name', 'noVerify');
+          noVerifyInput.setAttribute('type', 'text');
+          noVerifyInput.setAttribute('no-verify', '');
+          form.appendChild(noVerifyInput); // This one is not required
+
+          return form;
+        }
+
+        function getAmpFormWithAsyncInput() {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+
+            // Create our async input element
+            // With the required fields
+            const asyncInput = createElement('amp-mock-async-input');
+            asyncInput.classList.add(AsyncInputClasses.ASYNC_INPUT);
+            asyncInput.setAttribute(
+              AsyncInputAttributes.NAME,
+              'mock-async-input'
+            );
+
+            // Create stubs that can be used for observing the async input
+            const asyncInputValue = 'async-input-value';
+            const getValueStub = sandbox
+              .stub()
+              .returns(Promise.resolve(asyncInputValue));
+            asyncInput.getImpl = () =>
+              Promise.resolve({
+                getValue: getValueStub,
+              });
+
+            form.appendChild(asyncInput);
+            return Promise.resolve({
+              ampForm,
+              asyncInput,
+              asyncInputValue,
+              getValueStub,
+            });
+          });
+        }
 
-        // Create stubs that can be used for observing the async input
-        const asyncInputValue = 'async-input-value';
-        const getValueStub = sandbox.stub()
-            .returns(Promise.resolve(asyncInputValue));
-        asyncInput.getImpl = () => Promise.resolve({
-          getValue: getValueStub,
+        afterEach(() => {
+          // Reset supported state for checkValidity and reportValidity.
+          setCheckValiditySupportedForTesting(undefined);
+          setReportValiditySupportedForTesting(undefined);
         });
 
+        describe('Server side template rendering', () => {
+          let getSsrAmpFormPromise;
+          let event;
+
+          beforeEach(() => {
+            getSsrAmpFormPromise = getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
+              form.id = 'registration';
+              event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: form,
+                preventDefault: sandbox.spy(),
+              };
+              const emailInput = createElement('input');
+              emailInput.setAttribute('name', 'email');
+              emailInput.setAttribute('type', 'email');
+              emailInput.setAttribute('value', 'j@hnmiller.com');
+              form.appendChild(emailInput);
+
+              ampForm.method_ = 'GET';
+              sandbox.stub(form, 'submit');
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm, 'analyticsEvent_');
+              ampForm.ssrTemplateHelper_.isSupported.restore();
+              sandbox
+                .stub(ampForm.ssrTemplateHelper_, 'isSupported')
+                .returns(true);
+
+              return ampForm;
+            });
+          });
+
+          it('should throw error if using non-xhr get', () => {
+            return getSsrAmpFormPromise.then(ampForm => {
+              ampForm.xhrAction_ = null;
+
+              const errorRe = /Non-XHR GETs not supported./;
+              expectAsyncConsoleError(errorRe);
+              try {
+                return ampForm.handleSubmitEvent_(event);
+              } catch (error) {
+                return Promise.resolve();
+              }
+            });
+          });
+
+          it('should server side render templates if enabled', () => {
+            sandbox.spy(xhrUtils, 'setupInput');
+            sandbox.spy(xhrUtils, 'setupAMPCors');
+            sandbox.stub(xhrUtils, 'fromStructuredCloneable');
+            sandbox.stub(xhrUtils, 'verifyAmpCORSHeaders');
+
+            return getSsrAmpFormPromise.then(ampForm => {
+              const form = ampForm.form_;
+              const template = createElement('template');
+              template.setAttribute('type', 'amp-mustache');
+              template.content.appendChild(createTextNode('Some {{template}}'));
+              form.id = 'registration';
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: form,
+                preventDefault: sandbox.spy(),
+              };
+              const successTemplateContainer = createElement('div');
+              successTemplateContainer.setAttribute('submit-success', '');
+              successTemplateContainer.appendChild(template);
+
+              form.appendChild(successTemplateContainer);
+
+              form.xhrAction_ = 'https://www.xhr-action.org';
+
+              sandbox.stub(ampForm.viewer_, 'sendMessageAwaitResponse').returns(
+                Promise.resolve({
+                  data: {html: '<div>much success</div>'},
+                })
+              );
+              const renderedTemplate = createElement('div');
+              renderedTemplate.innerText = 'much success';
+              sandbox
+                .stub(ampForm.ssrTemplateHelper_.templates_, 'findTemplate')
+                .returns(template);
+
+              const fetchAndRenderTemplate = sandbox.stub(
+                ampForm.ssrTemplateHelper_,
+                'fetchAndRenderTemplate'
+              );
+              fetchAndRenderTemplate
+                .onFirstCall()
+                .returns(Promise.resolve({html: '<div>much success</div>'}))
+                .onSecondCall()
+                .returns(Promise.resolve({html: '<div>mushc success</div>'}));
+
+              const handleSubmitEventPromise = ampForm.handleSubmitEvent_(
+                event
+              );
+              return whenCalled(fetchAndRenderTemplate).then(() => {
+                expect(ampForm.ssrTemplateHelper_.fetchAndRenderTemplate).to
+                  .have.been.called;
+                expect(
+                  ampForm.ssrTemplateHelper_.fetchAndRenderTemplate
+                ).to.have.been.calledWith(
+                  form,
+                  sinon.match.object,
+                  sinon.match.object
+                );
+                return handleSubmitEventPromise;
+              });
+            });
+          });
 
-        form.appendChild(asyncInput);
-        return Promise.resolve({
-          ampForm,
-          asyncInput,
-          asyncInputValue,
-          getValueStub,
+          it('should set html bypassing mustache rendering', () => {
+            sandbox.spy(xhrUtils, 'setupInput');
+            sandbox.spy(xhrUtils, 'setupAMPCors');
+            sandbox.stub(xhrUtils, 'fromStructuredCloneable');
+            sandbox.stub(xhrUtils, 'verifyAmpCORSHeaders');
+
+            return getSsrAmpFormPromise.then(ampForm => {
+              const form = ampForm.form_;
+              const template = createElement('template');
+              template.setAttribute('type', 'amp-mustache');
+              template.content.appendChild(createTextNode('Some {{template}}'));
+              form.id = 'registration';
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: form,
+                preventDefault: sandbox.spy(),
+              };
+              const successTemplateContainer = createElement('div');
+              successTemplateContainer.setAttribute('submit-success', '');
+              successTemplateContainer.appendChild(template);
+
+              form.appendChild(successTemplateContainer);
+
+              form.xhrAction_ = 'https://www.xhr-action.org';
+
+              sandbox.stub(ampForm.viewer_, 'sendMessageAwaitResponse').returns(
+                Promise.resolve({
+                  data: '<div>much success</div>',
+                })
+              );
+              const renderedTemplate = createElement('div');
+              renderedTemplate.innerText = 'much success';
+              sandbox
+                .stub(ampForm.ssrTemplateHelper_.templates_, 'findTemplate')
+                .returns(template);
+
+              const fetchAndRenderTemplate = sandbox.stub(
+                ampForm.ssrTemplateHelper_,
+                'renderTemplate'
+              );
+              fetchAndRenderTemplate
+                .onFirstCall()
+                .returns(Promise.resolve({html: renderedTemplate}))
+                .onSecondCall()
+                .returns(Promise.resolve({html: template}));
+
+              const renderTemplate = sandbox.spy(ampForm, 'renderTemplate_');
+
+              const handleSubmitEventPromise = ampForm.handleSubmitEvent_(
+                event
+              );
+              return whenCalled(renderTemplate, 2).then(() => {
+                expect(ampForm.ssrTemplateHelper_.renderTemplate).to.have.been
+                  .called;
+                return handleSubmitEventPromise;
+              });
+            });
+          });
         });
-      });
-    }
 
-    afterEach(() => {
-      // Reset supported state for checkValidity and reportValidity.
-      setCheckValiditySupportedForTesting(undefined);
-      setReportValiditySupportedForTesting(undefined);
-    });
+        it('should fire the form submit service', () => {
+          const fireStub = sandbox.stub();
+          sandbox.stub(Services, 'formSubmitForDoc').returns({
+            fire: fireStub,
+          });
 
-    describe('Server side template rendering', () => {
-      let getSsrAmpFormPromise;
-      let event;
+          const form = getForm();
+          return getAmpForm(form).then(ampForm => {
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            sandbox.stub(ampForm, 'handleXhrSubmitSuccess_');
+
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: ampForm.form_,
+              preventDefault: sandbox.spy(),
+            };
+
+            return ampForm.handleSubmitEvent_(event).then(() => {
+              expect(fireStub.calledOnce).to.be.true;
+              return expect(fireStub).calledWith({
+                form,
+                actionXhrMutator: sinon.match.func,
+              });
+            });
+          });
+        });
+
+        it('should assert valid action-xhr when provided', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          form.setAttribute('action-xhr', 'http://example.com');
+          allowConsoleError(() => {
+            expect(() => new AmpForm(form)).to.throw(
+              /form action-xhr must start with/
+            );
+          });
+          form.setAttribute(
+            'action-xhr',
+            'https://cdn.ampproject.org/example.com'
+          );
+          allowConsoleError(() => {
+            expect(() => new AmpForm(form)).to.throw(
+              /form action-xhr should not be on AMP CDN/
+            );
+          });
+          form.setAttribute('action-xhr', 'https://example.com');
+          expect(() => new AmpForm(form)).to.not.throw;
+          document.body.removeChild(form);
+        });
 
-      beforeEach(() => {
+        it('should assert none of the inputs named __amp_source_origin', () => {
+          const form = getForm(/*button1*/ true, /*button2*/ false);
+          document.body.appendChild(form);
+          const illegalInput = createElement('input');
+          illegalInput.setAttribute('type', 'hidden');
+          illegalInput.setAttribute('name', '__amp_source_origin');
+          illegalInput.value = 'https://example.com';
+          form.appendChild(illegalInput);
+          allowConsoleError(() => {
+            expect(() => new AmpForm(form)).to.throw(
+              /Illegal input name, __amp_source_origin found/
+            );
+          });
+          document.body.removeChild(form);
+        });
+
+        it('should listen to submit, blur and input events', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          form.addEventListener = sandbox.spy();
+          form.setAttribute('action-xhr', 'https://example.com');
+          new AmpForm(form);
+          expect(form.addEventListener).to.be.called;
+          expect(form.addEventListener).to.be.calledWith('submit');
+          expect(form.addEventListener).to.be.calledWith('blur');
+          expect(form.addEventListener).to.be.calledWith('input');
+          expect(form.className).to.contain('i-amphtml-form');
+          document.body.removeChild(form);
+        });
 
-        getSsrAmpFormPromise = getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          form.id = 'registration';
-          event = {
+        it('should autofocus elements with the autofocus attribute', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          sandbox.stub(form, 'addEventListener');
+          form.setAttribute('action-xhr', 'https://example.com');
+          const button1 = form.querySelector('input');
+          button1.setAttribute('autofocus', '');
+          new AmpForm(form);
+
+          const viewer = Services.viewerForDoc(env.ampdoc);
+          let resolve_ = null;
+          sandbox.stub(viewer, 'whenNextVisible').returns(
+            new Promise(resolve => {
+              resolve_ = resolve;
+            })
+          );
+
+          expect(document.activeElement).to.not.equal(button1);
+          viewer.whenNextVisible().then(() => {
+            expect(document.activeElement).to.equal(button1);
+          });
+          return timer.promise(1).then(() => resolve_());
+        });
+
+        it('should install proxy', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          form.setAttribute('action-xhr', 'https://example.com');
+          new AmpForm(form);
+          expect(form.$p).to.be.ok;
+          expect(form.$p.getAttribute('action-xhr')).to.equal(
+            'https://example.com'
+          );
+          document.body.removeChild(form);
+        });
+
+        it('should do nothing if already submitted', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          const ampForm = new AmpForm(form);
+          ampForm.state_ = 'submitting';
+          const event = {
             stopImmediatePropagation: sandbox.spy(),
             target: form,
             preventDefault: sandbox.spy(),
           };
-          const emailInput = createElement('input');
-          emailInput.setAttribute('name', 'email');
-          emailInput.setAttribute('type', 'email');
-          emailInput.setAttribute('value', 'j@hnmiller.com');
-          form.appendChild(emailInput);
 
-          ampForm.method_ = 'GET';
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm, 'analyticsEvent_');
-          ampForm.ssrTemplateHelper_.isSupported.restore();
-          sandbox.stub(ampForm.ssrTemplateHelper_, 'isSupported').returns(true);
+          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+          sandbox.spy(form, 'checkValidity');
+          const submitEventPromise = ampForm.handleSubmitEvent_(event);
+          expect(event.stopImmediatePropagation).to.be.called;
 
-          return ampForm;
+          return submitEventPromise.then(() => {
+            document.body.removeChild(form);
+            expect(form.checkValidity).to.not.be.called;
+            expect(ampForm.xhr_.fetch).to.not.be.called;
+          });
         });
-      });
 
-      it('should throw error if using non-xhr get', () => {
-        return getSsrAmpFormPromise.then(ampForm => {
-          ampForm.xhrAction_ = null;
-
-          const errorRe =
-            /Non-XHR GETs not supported./;
+        it('should not trigger amp-form-submit analytics event', () => {
+          const form = getForm();
+          form.removeAttribute('action-xhr');
+          document.body.appendChild(form);
+          const ampForm = new AmpForm(form);
+          const event = {
+            stopImmediatePropagation: sandbox.spy(),
+            target: form,
+            preventDefault: sandbox.spy(),
+          };
+          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+          sandbox.stub(ampForm, 'analyticsEvent_');
+          sandbox.spy(form, 'checkValidity');
+          const errorRe = /Only XHR based \(via action-xhr attribute\) submissions are supported/;
           expectAsyncConsoleError(errorRe);
-          try {
-            return ampForm.handleSubmitEvent_(event);
-          } catch (error) {
-            return Promise.resolve();
-          }
+          return ampForm.handleSubmitEvent_(event).catch(() => {
+            expect(event.preventDefault).to.be.called;
+            expect(ampForm.analyticsEvent_).to.have.not.been.called;
+            document.body.removeChild(form);
+          });
         });
-      });
-
-      it('should server side render templates if enabled', () => {
-        sandbox.spy(xhrUtils, 'setupInput');
-        sandbox.spy(xhrUtils, 'setupAMPCors');
-        sandbox.stub(xhrUtils, 'fromStructuredCloneable');
-        sandbox.stub(xhrUtils, 'verifyAmpCORSHeaders');
-
-        return getSsrAmpFormPromise.then(ampForm => {
-          const form = ampForm.form_;
-          const template = createElement('template');
-          template.setAttribute('type', 'amp-mustache');
-          template.content.appendChild(createTextNode('Some {{template}}'));
-          form.id = 'registration';
+
+        it('should respect novalidate on a form', () => {
+          setReportValiditySupportedForTesting(true);
+          const form = getForm();
+          document.body.appendChild(form);
+          form.setAttribute('novalidate', '');
+          const emailInput = createElement('input');
+          emailInput.setAttribute('name', 'email');
+          emailInput.setAttribute('type', 'email');
+          emailInput.setAttribute('required', '');
+          form.appendChild(emailInput);
+          const ampForm = new AmpForm(form);
+          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
           const event = {
             stopImmediatePropagation: sandbox.spy(),
             target: form,
             preventDefault: sandbox.spy(),
           };
-          const successTemplateContainer = createElement('div');
-          successTemplateContainer.setAttribute('submit-success', '');
-          successTemplateContainer.appendChild(template);
-
-          form.appendChild(successTemplateContainer);
-
-          form.xhrAction_ = 'https://www.xhr-action.org';
-
-          sandbox.stub(ampForm.viewer_, 'sendMessageAwaitResponse')
-              .returns(
-                  Promise.resolve({
-                    data: {html: '<div>much success</div>'},
-                  }));
-          const renderedTemplate = createElement('div');
-          renderedTemplate.innerText = 'much success';
-          sandbox.stub(ampForm.ssrTemplateHelper_.templates_, 'findTemplate')
-              .returns(template);
-
-          const fetchAndRenderTemplate = sandbox.stub(
-              ampForm.ssrTemplateHelper_, 'fetchAndRenderTemplate');
-          fetchAndRenderTemplate
-              .onFirstCall().returns(
-                  Promise.resolve({html: '<div>much success</div>'}))
-              .onSecondCall().returns(
-                  Promise.resolve({html: '<div>mushc success</div>'}));
-
-          const handleSubmitEventPromise = ampForm.handleSubmitEvent_(event);
-          return whenCalled(fetchAndRenderTemplate)
-              .then(() => {
-                expect(ampForm.ssrTemplateHelper_.fetchAndRenderTemplate)
-                    .to.have.been.called;
-                expect(ampForm.ssrTemplateHelper_.fetchAndRenderTemplate)
-                    .to.have.been.calledWith(
-                        form, sinon.match.object, sinon.match.object);
-                return handleSubmitEventPromise;
-              });
+
+          sandbox.spy(form, 'checkValidity');
+          sandbox.spy(emailInput, 'reportValidity');
+
+          sandbox
+            .stub(ampForm, 'handleXhrSubmitSuccess_')
+            .returns(Promise.resolve());
+          return ampForm.handleSubmitEvent_(event).then(() => {
+            expect(form.hasAttribute('amp-novalidate')).to.be.true;
+            document.body.removeChild(form);
+
+            // Check validity should always be called regardless of novalidate.
+            expect(form.checkValidity).to.be.called;
+
+            // However reporting validity shouldn't happen when novalidate.
+            expect(emailInput.reportValidity).to.not.be.called;
+          });
         });
-      });
-
-      it('should set html bypassing mustache rendering', () => {
-        sandbox.spy(xhrUtils, 'setupInput');
-        sandbox.spy(xhrUtils, 'setupAMPCors');
-        sandbox.stub(xhrUtils, 'fromStructuredCloneable');
-        sandbox.stub(xhrUtils, 'verifyAmpCORSHeaders');
-
-        return getSsrAmpFormPromise.then(ampForm => {
-          const form = ampForm.form_;
-          const template = createElement('template');
-          template.setAttribute('type', 'amp-mustache');
-          template.content.appendChild(createTextNode('Some {{template}}'));
-          form.id = 'registration';
+
+        it('should throw error if POST non-xhr', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          form.removeAttribute('action-xhr');
+          document.body.appendChild(form);
+          const ampForm = new AmpForm(form);
           const event = {
             stopImmediatePropagation: sandbox.spy(),
             target: form,
             preventDefault: sandbox.spy(),
           };
-          const successTemplateContainer = createElement('div');
-          successTemplateContainer.setAttribute('submit-success', '');
-          successTemplateContainer.appendChild(template);
-
-          form.appendChild(successTemplateContainer);
-
-          form.xhrAction_ = 'https://www.xhr-action.org';
-
-          sandbox.stub(ampForm.viewer_, 'sendMessageAwaitResponse')
-              .returns(
-                  Promise.resolve({
-                    data: '<div>much success</div>',
-                  }));
-          const renderedTemplate = createElement('div');
-          renderedTemplate.innerText = 'much success';
-          sandbox.stub(ampForm.ssrTemplateHelper_.templates_, 'findTemplate')
-              .returns(template);
-
-          const fetchAndRenderTemplate = sandbox.stub(
-              ampForm.ssrTemplateHelper_, 'renderTemplate');
-          fetchAndRenderTemplate
-              .onFirstCall().returns(Promise.resolve({html: renderedTemplate}))
-              .onSecondCall().returns(Promise.resolve({html: template}));
-
-          const renderTemplate = sandbox.spy(ampForm, 'renderTemplate_');
-
-          const handleSubmitEventPromise = ampForm.handleSubmitEvent_(event);
-          return whenCalled(renderTemplate, 2)
-              .then(() => {
-                expect(ampForm.ssrTemplateHelper_.renderTemplate)
-                    .to.have.been.called;
-                return handleSubmitEventPromise;
-              });
-        });
-      });
-    });
-
-    it('should fire the form submit service', () => {
-      const fireStub = sandbox.stub();
-      sandbox.stub(Services, 'formSubmitForDoc').returns({
-        fire: fireStub,
-      });
-
-      const form = getForm();
-      return getAmpForm(form).then(ampForm => {
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-        sandbox.stub(ampForm, 'handleXhrSubmitSuccess_');
-
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: ampForm.form_,
-          preventDefault: sandbox.spy(),
-        };
-
-        return ampForm.handleSubmitEvent_(event).then(() => {
-          expect(fireStub.calledOnce).to.be.true;
-          return expect(fireStub).calledWith({
-            form,
-            actionXhrMutator: sinon.match.func,
+          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+          sandbox.spy(form, 'checkValidity');
+          const submitErrorRe = /Only XHR based \(via action-xhr attribute\) submissions are supported/;
+          expectAsyncConsoleError(submitErrorRe);
+          return ampForm.handleSubmitEvent_(event).catch(() => {
+            expect(event.preventDefault).to.be.called;
+            document.body.removeChild(form);
           });
         });
-      });
-    });
-
-    it('should assert valid action-xhr when provided', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      form.setAttribute('action-xhr', 'http://example.com');
-      allowConsoleError(() => {
-        expect(() => new AmpForm(form)).to.throw(
-            /form action-xhr must start with/);
-      });
-      form.setAttribute('action-xhr', 'https://cdn.ampproject.org/example.com');
-      allowConsoleError(() => {
-        expect(() => new AmpForm(form)).to.throw(
-            /form action-xhr should not be on AMP CDN/);
-      });
-      form.setAttribute('action-xhr', 'https://example.com');
-      expect(() => new AmpForm(form)).to.not.throw;
-      document.body.removeChild(form);
-    });
-
-    it('should assert none of the inputs named __amp_source_origin', () => {
-      const form = getForm(/*button1*/ true, /*button2*/ false);
-      document.body.appendChild(form);
-      const illegalInput = createElement('input');
-      illegalInput.setAttribute('type', 'hidden');
-      illegalInput.setAttribute('name', '__amp_source_origin');
-      illegalInput.value = 'https://example.com';
-      form.appendChild(illegalInput);
-      allowConsoleError(() => {
-        expect(() => new AmpForm(form)).to.throw(
-            /Illegal input name, __amp_source_origin found/);
-      });
-      document.body.removeChild(form);
-    });
-
-    it('should listen to submit, blur and input events', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      form.addEventListener = sandbox.spy();
-      form.setAttribute('action-xhr', 'https://example.com');
-      new AmpForm(form);
-      expect(form.addEventListener).to.be.called;
-      expect(form.addEventListener).to.be.calledWith('submit');
-      expect(form.addEventListener).to.be.calledWith('blur');
-      expect(form.addEventListener).to.be.calledWith('input');
-      expect(form.className).to.contain('i-amphtml-form');
-      document.body.removeChild(form);
-    });
-
-    it('should autofocus elements with the autofocus attribute', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      sandbox.stub(form, 'addEventListener');
-      form.setAttribute('action-xhr', 'https://example.com');
-      const button1 = form.querySelector('input');
-      button1.setAttribute('autofocus', '');
-      new AmpForm(form);
-
-      const viewer = Services.viewerForDoc(env.ampdoc);
-      let resolve_ = null;
-      sandbox.stub(viewer, 'whenNextVisible').returns(new Promise(resolve => {
-        resolve_ = resolve;
-      }));
-
-      expect(document.activeElement).to.not.equal(button1);
-      viewer.whenNextVisible().then(() => {
-        expect(document.activeElement).to.equal(button1);
-      });
-      return timer.promise(1).then(() => resolve_());
-    });
-
-    it('should install proxy', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      form.setAttribute('action-xhr', 'https://example.com');
-      new AmpForm(form);
-      expect(form.$p).to.be.ok;
-      expect(form.$p.getAttribute('action-xhr')).to.equal(
-          'https://example.com');
-      document.body.removeChild(form);
-    });
-
-    it('should do nothing if already submitted', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      const ampForm = new AmpForm(form);
-      ampForm.state_ = 'submitting';
-      const event = {
-        stopImmediatePropagation: sandbox.spy(),
-        target: form,
-        preventDefault: sandbox.spy(),
-      };
-
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-      sandbox.spy(form, 'checkValidity');
-      const submitEventPromise = ampForm.handleSubmitEvent_(event);
-      expect(event.stopImmediatePropagation).to.be.called;
-
-      return submitEventPromise.then(() => {
-        document.body.removeChild(form);
-        expect(form.checkValidity).to.not.be.called;
-        expect(ampForm.xhr_.fetch).to.not.be.called;
-      });
-    });
-
-    it('should not trigger amp-form-submit analytics event', () => {
-      const form = getForm();
-      form.removeAttribute('action-xhr');
-      document.body.appendChild(form);
-      const ampForm = new AmpForm(form);
-      const event = {
-        stopImmediatePropagation: sandbox.spy(),
-        target: form,
-        preventDefault: sandbox.spy(),
-      };
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-      sandbox.stub(ampForm, 'analyticsEvent_');
-      sandbox.spy(form, 'checkValidity');
-      const errorRe =
-        /Only XHR based \(via action-xhr attribute\) submissions are supported/;
-      expectAsyncConsoleError(errorRe);
-      return ampForm.handleSubmitEvent_(event).catch(() => {
-        expect(event.preventDefault).to.be.called;
-        expect(ampForm.analyticsEvent_).to.have.not.been.called;
-        document.body.removeChild(form);
-      });
-    });
-
-    it('should respect novalidate on a form', () => {
-      setReportValiditySupportedForTesting(true);
-      const form = getForm();
-      document.body.appendChild(form);
-      form.setAttribute('novalidate', '');
-      const emailInput = createElement('input');
-      emailInput.setAttribute('name', 'email');
-      emailInput.setAttribute('type', 'email');
-      emailInput.setAttribute('required', '');
-      form.appendChild(emailInput);
-      const ampForm = new AmpForm(form);
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-      const event = {
-        stopImmediatePropagation: sandbox.spy(),
-        target: form,
-        preventDefault: sandbox.spy(),
-      };
-
-      sandbox.spy(form, 'checkValidity');
-      sandbox.spy(emailInput, 'reportValidity');
-
-      sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-          .returns(Promise.resolve());
-      return ampForm.handleSubmitEvent_(event).then(() => {
-        expect(form.hasAttribute('amp-novalidate')).to.be.true;
-        document.body.removeChild(form);
-
-        // Check validity should always be called regardless of novalidate.
-        expect(form.checkValidity).to.be.called;
-
-        // However reporting validity shouldn't happen when novalidate.
-        expect(emailInput.reportValidity).to.not.be.called;
-      });
-    });
-
-    it('should throw error if POST non-xhr', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      form.removeAttribute('action-xhr');
-      document.body.appendChild(form);
-      const ampForm = new AmpForm(form);
-      const event = {
-        stopImmediatePropagation: sandbox.spy(),
-        target: form,
-        preventDefault: sandbox.spy(),
-      };
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-      sandbox.spy(form, 'checkValidity');
-      const submitErrorRe =
-        /Only XHR based \(via action-xhr attribute\) submissions are supported/;
-      expectAsyncConsoleError(submitErrorRe);
-      return ampForm.handleSubmitEvent_(event).catch(() => {
-        expect(event.preventDefault).to.be.called;
-        document.body.removeChild(form);
-      });
-    });
-
-    it('should check validity and report when invalid', () => {
-      setReportValiditySupportedForTesting(false);
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('required', '');
-        form.appendChild(emailInput);
-        sandbox.spy(form, 'checkValidity');
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: ampForm.form_,
-          preventDefault: sandbox.spy(),
-        };
-
-        const bubbleEl = env.ampdoc.getRootNode().querySelector(
-            '.i-amphtml-validation-bubble');
-        const validationBubble = bubbleEl['__BUBBLE_OBJ'];
-        sandbox.spy(validationBubble, 'show');
-        sandbox.spy(validationBubble, 'hide');
-        ampForm.handleSubmitEvent_(event);
-        expect(event.stopImmediatePropagation).to.be.called;
-        expect(form.checkValidity).to.be.called;
-        expect(ampForm.xhr_.fetch).to.not.be.called;
-
-        const showCall1 = validationBubble.show.getCall(0);
-        expect(showCall1.args[0]).to.equal(emailInput);
-        expect(showCall1.args[1]).to.not.be.null;
-
-        // Check bubble would show with a new message when user
-        // change its content.
-        emailInput.value = 'cool';
-        ampForm.validator_.onInput({target: emailInput});
-        const showCall2 = validationBubble.show.getCall(1);
-        expect(showCall2.args[0]).to.equal(emailInput);
-        expect(showCall2.args[1]).to.not.be.null;
-        expect(showCall2.args[1]).to.not.equal(showCall1.args[0]);
-        expect(ampForm.xhr_.fetch).to.not.be.called;
-
-        // Check bubble would hide when input becomes valid.
-        emailInput.value = 'cool@bea.ns';
-        ampForm.validator_.onInput({target: emailInput});
-        expect(validationBubble.hide.calledOnce).to.be.true;
-        expect(validationBubble.show.calledTwice).to.be.true;
-
-        // Check that we'd hide the bubble when user move out.
-        ampForm.validator_.onBlur({target: emailInput});
-        expect(validationBubble.hide.calledTwice).to.be.true;
-
-        ampForm.validator_.onInput({target: emailInput});
-        expect(validationBubble.show.calledThrice).to.be.false;
-
-        // Check xhr goes through when form is valid.
-        emailInput.value = 'cool@bea.ns';
-
-        sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-            .returns(Promise.resolve());
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
 
-        return whenCalled(ampForm.xhr_.fetch).then(() => {
-          expect(ampForm.xhr_.fetch).to.have.been.calledOnce;
+        it('should check validity and report when invalid', () => {
+          setReportValiditySupportedForTesting(false);
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('required', '');
+            form.appendChild(emailInput);
+            sandbox.spy(form, 'checkValidity');
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: ampForm.form_,
+              preventDefault: sandbox.spy(),
+            };
+
+            const bubbleEl = env.ampdoc
+              .getRootNode()
+              .querySelector('.i-amphtml-validation-bubble');
+            const validationBubble = bubbleEl['__BUBBLE_OBJ'];
+            sandbox.spy(validationBubble, 'show');
+            sandbox.spy(validationBubble, 'hide');
+            ampForm.handleSubmitEvent_(event);
+            expect(event.stopImmediatePropagation).to.be.called;
+            expect(form.checkValidity).to.be.called;
+            expect(ampForm.xhr_.fetch).to.not.be.called;
+
+            const showCall1 = validationBubble.show.getCall(0);
+            expect(showCall1.args[0]).to.equal(emailInput);
+            expect(showCall1.args[1]).to.not.be.null;
+
+            // Check bubble would show with a new message when user
+            // change its content.
+            emailInput.value = 'cool';
+            ampForm.validator_.onInput({target: emailInput});
+            const showCall2 = validationBubble.show.getCall(1);
+            expect(showCall2.args[0]).to.equal(emailInput);
+            expect(showCall2.args[1]).to.not.be.null;
+            expect(showCall2.args[1]).to.not.equal(showCall1.args[0]);
+            expect(ampForm.xhr_.fetch).to.not.be.called;
+
+            // Check bubble would hide when input becomes valid.
+            emailInput.value = 'cool@bea.ns';
+            ampForm.validator_.onInput({target: emailInput});
+            expect(validationBubble.hide.calledOnce).to.be.true;
+            expect(validationBubble.show.calledTwice).to.be.true;
 
-          return submitEventPromise;
-        });
-      });
-    });
-
-    it('should not check validity if .checkValidity is not supported', () => {
-      setCheckValiditySupportedForTesting(false);
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('required', '');
-        form.appendChild(emailInput);
-        sandbox.spy(form, 'checkValidity');
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: ampForm.form_,
-          preventDefault: sandbox.spy(),
-        };
-
-
-        sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-            .returns(Promise.resolve());
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
+            // Check that we'd hide the bubble when user move out.
+            ampForm.validator_.onBlur({target: emailInput});
+            expect(validationBubble.hide.calledTwice).to.be.true;
 
-        return whenCalled(ampForm.xhr_.fetch).then(() => {
-          expect(event.stopImmediatePropagation).to.not.be.called;
-          expect(form.checkValidity).to.not.be.called;
-          expect(ampForm.xhr_.fetch).to.be.called;
+            ampForm.validator_.onInput({target: emailInput});
+            expect(validationBubble.show.calledThrice).to.be.false;
 
-          return submitEventPromise;
-        });
-      });
-    });
-
-    it('should allow verifying elements with a presubmit request', () => {
-      const formPromise = getAmpForm(getVerificationForm());
-      const fetchRejectPromise = Promise.reject({
-        response: {
-          status: 400,
-          json() {
-            return Promise.resolve({
-              verifyErrors: [{
-                name: 'name',
-                message: 'This name is just wrong.',
-              }],
+            // Check xhr goes through when form is valid.
+            emailInput.value = 'cool@bea.ns';
+
+            sandbox
+              .stub(ampForm, 'handleXhrSubmitSuccess_')
+              .returns(Promise.resolve());
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+            return whenCalled(ampForm.xhr_.fetch).then(() => {
+              expect(ampForm.xhr_.fetch).to.have.been.calledOnce;
+
+              return submitEventPromise;
             });
-          },
-        },
-      });
+          });
+        });
 
-      return formPromise.then(ampForm => {
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchRejectPromise);
+        it('should not check validity if .checkValidity is not supported', () => {
+          setCheckValiditySupportedForTesting(false);
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('required', '');
+            form.appendChild(emailInput);
+            sandbox.spy(form, 'checkValidity');
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: ampForm.form_,
+              preventDefault: sandbox.spy(),
+            };
+
+            sandbox
+              .stub(ampForm, 'handleXhrSubmitSuccess_')
+              .returns(Promise.resolve());
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
 
-        const form = ampForm.form_;
-        const input = form.name;
-        form.name.value = 'Frank';
+            return whenCalled(ampForm.xhr_.fetch).then(() => {
+              expect(event.stopImmediatePropagation).to.not.be.called;
+              expect(form.checkValidity).to.not.be.called;
+              expect(ampForm.xhr_.fetch).to.be.called;
 
-        return ampForm.verifier_.onCommit().then(() => {
-          expect(input.validity.customError).to.be.true;
-          expect(input.validationMessage).to.equal('This name is just wrong.');
+              return submitEventPromise;
+            });
+          });
         });
-      });
-    });
-
-    it('should only use the more recent verify request', () => {
-      const formPromise = getAmpForm(getVerificationForm());
-
-      return formPromise.then(ampForm => {
-        const xhrStub = sandbox.stub(ampForm.xhr_, 'fetch');
-        xhrStub.onCall(0).returns(Promise.reject({
-          response: {
-            status: 400,
-            json() {
-              return Promise.resolve({
-                verifyErrors: [{name: 'name', message: 'First request error'}],
-              });
-            },
-          },
-        }));
-        xhrStub.onCall(1).returns(new Promise((res, reject) => {
-          setTimeout(() => {
-            reject({
-              response: {
-                status: 400,
-                json() {
-                  return Promise.resolve({
-                    verifyErrors: [{
+
+        it('should allow verifying elements with a presubmit request', () => {
+          const formPromise = getAmpForm(getVerificationForm());
+          const fetchRejectPromise = Promise.reject({
+            response: {
+              status: 400,
+              json() {
+                return Promise.resolve({
+                  verifyErrors: [
+                    {
                       name: 'name',
-                      message: 'Second request error',
-                    }],
-                  });
-                },
+                      message: 'This name is just wrong.',
+                    },
+                  ],
+                });
               },
-            });
-          }, 10);
-        }));
-        const form = ampForm.form_;
-        const input = form.name;
-        input.value = 'Carlos';
-
-        return ampForm.verifier_.onCommit().then(() => {
-          input.value = 'Frank';
-          return ampForm.verifier_.onCommit();
-        }).then(() => {
-          expect(input.validity.customError).to.be.true;
-          expect(input.validationMessage).to.equal('Second request error');
-        });
-      });
-    });
-
-    it('should not send verifying elements with a no-verify attribute', () => {
-      const formPromise = getAmpForm(getVerificationForm());
-      const fetchRejectPromise = Promise.reject({
-        response: {
-          status: 400,
-          json() {
-            return Promise.resolve({
-              verifyErrors: [{
-                name: 'name',
-                message: 'This name is just wrong.',
-              }],
-            });
-          },
-        },
-      });
+            },
+          });
 
-      return formPromise.then(ampForm => {
-        const fetchStub =
+          return formPromise.then(ampForm => {
             sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchRejectPromise);
 
-        const form = ampForm.form_;
-        const input = form.name;
-        form.name.value = 'Frank';
-        const noVerifyInput = form.noVerify;
-        noVerifyInput.value = 'do not send';
-
-        return ampForm.verifier_.onCommit().then(() => {
-          expect(fromIterator(fetchStub.getCall(0).args[1].body.entries())).to
-              .deep.equal([['name', 'Frank'], ['__amp_form_verify', 'true']]);
-          expect(input.validity.customError).to.be.true;
-          expect(input.validationMessage).to.equal('This name is just wrong.');
-        });
-      });
-    });
-
-    it('should allow rendering responses through inlined templates', () => {
-      return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-        const form = ampForm.form_;
-        // Add a div[submit-error] with a template child.
-        const errorContainer = createElement('div');
-        errorContainer.setAttribute('submit-error', '');
-        form.appendChild(errorContainer);
-        const errorTemplate = createElement('template');
-        errorTemplate.setAttribute('type', 'amp-mustache');
-        errorTemplate.content.appendChild(createTextNode('Error: {{message}}'));
-        errorContainer.appendChild(errorTemplate);
-        let renderedTemplate = createElement('div');
-        renderedTemplate.innerText = 'Error: hello there';
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.reject({
-          response: {
-            status: 400,
-            json() {
-              return Promise.resolve({message: 'hello there'});
-            },
-          },
-        }));
-        sandbox.stub(ampForm.templates_, 'findAndRenderTemplate')
-            .returns(Promise.resolve(renderedTemplate));
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-        return ampForm.handleSubmitEvent_(event).then(() => {
-          const findTemplateStub = ampForm.templates_.findAndRenderTemplate;
-          expect(ampForm.xhrSubmitPromiseForTesting())
-              .to.eventually.be.rejected;
-          return ampForm.xhrSubmitPromiseForTesting().catch(() => {
-            expect(mutateElementStub).to.have.been.calledOnce;
-            expect(findTemplateStub).to.be.called;
-            // Template should have rendered an error
-            expect(findTemplateStub).to.have.been.calledWith(
-                errorContainer, {message: 'hello there'});
-            // Check that form has a rendered div with class
-            // .submit-error-message.
-            renderedTemplate = form.querySelector('[i-amphtml-rendered]');
-            expect(renderedTemplate).to.not.be.null;
+            const form = ampForm.form_;
+            const input = form.name;
+            form.name.value = 'Frank';
+
+            return ampForm.verifier_.onCommit().then(() => {
+              expect(input.validity.customError).to.be.true;
+              expect(input.validationMessage).to.equal(
+                'This name is just wrong.'
+              );
+            });
           });
         });
-      });
-    });
-
-    it('should allow rendering responses through referenced templates', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-
-        const successTemplate = createElement('template');
-        successTemplate.id = 'successTemplate';
-        successTemplate.setAttribute('type', 'amp-mustache');
-        successTemplate.content.appendChild(createTextNode('Hello, {{name}}'));
-        form.appendChild(successTemplate);
-
-        const messageContainer = createElement('div');
-        messageContainer.id = 'message';
-        messageContainer.setAttribute('submit-success', '');
-        messageContainer.setAttribute('template', 'successTemplate');
-        form.appendChild(messageContainer);
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(Promise.resolve({
-              json: () => {
-                return Promise.resolve({'name': 'John Smith'});
-              },
-            }));
-        const renderedTemplate = createElement('div');
-        renderedTemplate.innerText = 'Hello, John Smith';
-        sandbox.stub(ampForm.templates_, 'findAndRenderTemplate')
-            .returns(Promise.resolve(renderedTemplate));
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
-
-        return whenCalled(ampForm.templates_.findAndRenderTemplate).then(() => {
-          return ampForm.renderTemplatePromiseForTesting();
-        }).then(() => {
-          expect(ampForm.templates_.findAndRenderTemplate).to.be.called;
-          expect(ampForm.templates_.findAndRenderTemplate.calledWith(
-              messageContainer, {'name': 'John Smith'})).to.be.true;
-          expect(mutateElementStub).to.have.been.calledOnce;
-          expect(messageContainer.firstChild).to.equal(renderedTemplate);
-
-          return submitEventPromise;
-        });
-      });
-    });
-
-    it('should replace previously rendered responses', () => {
-      return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-        const form = ampForm.form_;
-        const successContainer = createElement('div');
-        successContainer.setAttribute('submit-success', '');
-        form.appendChild(successContainer);
-        const successTemplate = createElement('template');
-        successTemplate.setAttribute('type', 'amp-mustache');
-        successTemplate.content.appendChild(
-            createTextNode('Success: {{message}}'));
-        successContainer.appendChild(successTemplate);
-        const renderedTemplate = createElement('div');
-        renderedTemplate.innerText = 'Success: hello';
-        renderedTemplate.setAttribute('i-amphtml-rendered', '');
-        successContainer.appendChild(renderedTemplate);
-        ampForm.state_ = 'submit-success';
-
-        const newRender = createElement('div');
-        newRender.innerText = 'New Success: What What';
-
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(Promise.resolve({
-              json: () => {
-                return Promise.resolve({'message': 'What What'});
-              },
-            }));
-        const findAndRenderTemplateStub = sandbox.stub(ampForm.templates_,
-            'findAndRenderTemplate');
-        findAndRenderTemplateStub.returns(Promise.resolve(newRender));
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-        ampForm.handleSubmitEvent_(event);
-        return whenCalled(findAndRenderTemplateStub).then(() => {
-          return ampForm.renderTemplatePromiseForTesting();
-        }).then(() => {
-          expect(mutateElementStub).to.have.been.calledOnce;
-          expect(ampForm.templates_.findAndRenderTemplate).to.be.called;
-          expect(ampForm.templates_.findAndRenderTemplate.calledWith(
-              successContainer, {'message': 'What What'})).to.be.true;
-          const renderedTemplates = form.querySelectorAll(
-              '[i-amphtml-rendered]');
-          expect(renderedTemplates[0]).to.not.be.null;
-          expect(renderedTemplates.length).to.equal(1);
-          expect(renderedTemplates[0]).to.equal(newRender);
+
+        it('should only use the more recent verify request', () => {
+          const formPromise = getAmpForm(getVerificationForm());
+
+          return formPromise.then(ampForm => {
+            const xhrStub = sandbox.stub(ampForm.xhr_, 'fetch');
+            xhrStub.onCall(0).returns(
+              Promise.reject({
+                response: {
+                  status: 400,
+                  json() {
+                    return Promise.resolve({
+                      verifyErrors: [
+                        {name: 'name', message: 'First request error'},
+                      ],
+                    });
+                  },
+                },
+              })
+            );
+            xhrStub.onCall(1).returns(
+              new Promise((res, reject) => {
+                setTimeout(() => {
+                  reject({
+                    response: {
+                      status: 400,
+                      json() {
+                        return Promise.resolve({
+                          verifyErrors: [
+                            {
+                              name: 'name',
+                              message: 'Second request error',
+                            },
+                          ],
+                        });
+                      },
+                    },
+                  });
+                }, 10);
+              })
+            );
+            const form = ampForm.form_;
+            const input = form.name;
+            input.value = 'Carlos';
+
+            return ampForm.verifier_
+              .onCommit()
+              .then(() => {
+                input.value = 'Frank';
+                return ampForm.verifier_.onCommit();
+              })
+              .then(() => {
+                expect(input.validity.customError).to.be.true;
+                expect(input.validationMessage).to.equal(
+                  'Second request error'
+                );
+              });
+          });
         });
-      });
-    });
-
-    it('should dispatch "amp:template-rendered" event after render', () => {
-      return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-        const form = ampForm.form_;
-
-        const successContainer = createElement('div');
-        successContainer.setAttribute('submit-success', '');
-        form.appendChild(successContainer);
-        const successTemplate = createElement('template');
-        successTemplate.setAttribute('type', 'amp-mustache');
-        successContainer.appendChild(successTemplate);
-        const renderedTemplate = createElement('div');
-
-        const spyDispatchEvent =
-            sandbox.spy(successContainer, 'dispatchEvent');
-        const spyAppendTemplate = sandbox.spy(successContainer, 'appendChild');
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(Promise.resolve({
+
+        it('should not send verifying elements with a no-verify attribute', () => {
+          const formPromise = getAmpForm(getVerificationForm());
+          const fetchRejectPromise = Promise.reject({
+            response: {
+              status: 400,
               json() {
-                return Promise.resolve({'message': 'What What'});
+                return Promise.resolve({
+                  verifyErrors: [
+                    {
+                      name: 'name',
+                      message: 'This name is just wrong.',
+                    },
+                  ],
+                });
               },
-            }));
-        const findAndRenderTemplateStub = sandbox.stub(ampForm.templates_,
-            'findAndRenderTemplate');
-        findAndRenderTemplateStub.returns(Promise.resolve(renderedTemplate));
-
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-        return ampForm.handleSubmitEvent_(event).then(() => {
-          return ampForm.xhrSubmitPromiseForTesting().then(() => {
-            return ampForm.renderTemplatePromiseForTesting();
-          }).then(() => {
-            expect(spyDispatchEvent.calledOnce).to.be.true;
-            expect(spyDispatchEvent).calledWithMatch({
-              type: AmpEvents.DOM_UPDATE,
-              bubbles: true,
+            },
+          });
+
+          return formPromise.then(ampForm => {
+            const fetchStub = sandbox
+              .stub(ampForm.xhr_, 'fetch')
+              .returns(fetchRejectPromise);
+
+            const form = ampForm.form_;
+            const input = form.name;
+            form.name.value = 'Frank';
+            const noVerifyInput = form.noVerify;
+            noVerifyInput.value = 'do not send';
+
+            return ampForm.verifier_.onCommit().then(() => {
+              expect(
+                fromIterator(fetchStub.getCall(0).args[1].body.entries())
+              ).to.deep.equal([
+                ['name', 'Frank'],
+                ['__amp_form_verify', 'true'],
+              ]);
+              expect(input.validity.customError).to.be.true;
+              expect(input.validationMessage).to.equal(
+                'This name is just wrong.'
+              );
             });
-            sinon.assert.callOrder(spyAppendTemplate, spyDispatchEvent);
           });
         });
-      });
-    });
 
-    it('should call fetch with the xhr action and form data', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+        it('should allow rendering responses through inlined templates', () => {
+          return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+            const form = ampForm.form_;
+            // Add a div[submit-error] with a template child.
+            const errorContainer = createElement('div');
+            errorContainer.setAttribute('submit-error', '');
+            form.appendChild(errorContainer);
+            const errorTemplate = createElement('template');
+            errorTemplate.setAttribute('type', 'amp-mustache');
+            errorTemplate.content.appendChild(
+              createTextNode('Error: {{message}}')
+            );
+            errorContainer.appendChild(errorTemplate);
+            let renderedTemplate = createElement('div');
+            renderedTemplate.innerText = 'Error: hello there';
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.reject({
+                response: {
+                  status: 400,
+                  json() {
+                    return Promise.resolve({message: 'hello there'});
+                  },
+                },
+              })
+            );
+            sandbox
+              .stub(ampForm.templates_, 'findAndRenderTemplate')
+              .returns(Promise.resolve(renderedTemplate));
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+            return ampForm.handleSubmitEvent_(event).then(() => {
+              const findTemplateStub = ampForm.templates_.findAndRenderTemplate;
+              expect(ampForm.xhrSubmitPromiseForTesting()).to.eventually.be
+                .rejected;
+              return ampForm.xhrSubmitPromiseForTesting().catch(() => {
+                expect(mutateElementStub).to.have.been.calledOnce;
+                expect(findTemplateStub).to.be.called;
+                // Template should have rendered an error
+                expect(findTemplateStub).to.have.been.calledWith(
+                  errorContainer,
+                  {message: 'hello there'}
+                );
+                // Check that form has a rendered div with class
+                // .submit-error-message.
+                renderedTemplate = form.querySelector('[i-amphtml-rendered]');
+                expect(renderedTemplate).to.not.be.null;
+              });
+            });
+          });
+        });
 
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: ampForm.form_,
-          preventDefault: sandbox.spy(),
-        };
+        it('should allow rendering responses through referenced templates', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
 
-        sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-            .returns(Promise.resolve());
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
-        expect(event.preventDefault).to.be.calledOnce;
-
-        return whenCalled(ampForm.xhr_.fetch).then(() => {
-          expect(ampForm.xhr_.fetch).to.be.calledOnce;
-          expect(ampForm.xhr_.fetch).to.be.calledWith('https://example.com');
-
-          const xhrCall = ampForm.xhr_.fetch.getCall(0);
-          const config = xhrCall.args[1];
-          expect(isFormDataWrapper(config.body)).to.be.true;
-          const entriesInForm =
-              fromIterator(createFormDataWrapper(env.win, getForm()).entries());
-          expect(fromIterator(config.body.entries())).to.have.deep.members(
-              entriesInForm);
-          expect(config.method).to.equal('POST');
-          expect(config.credentials).to.equal('include');
-
-          return submitEventPromise;
+            const successTemplate = createElement('template');
+            successTemplate.id = 'successTemplate';
+            successTemplate.setAttribute('type', 'amp-mustache');
+            successTemplate.content.appendChild(
+              createTextNode('Hello, {{name}}')
+            );
+            form.appendChild(successTemplate);
+
+            const messageContainer = createElement('div');
+            messageContainer.id = 'message';
+            messageContainer.setAttribute('submit-success', '');
+            messageContainer.setAttribute('template', 'successTemplate');
+            form.appendChild(messageContainer);
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.resolve({
+                json: () => {
+                  return Promise.resolve({'name': 'John Smith'});
+                },
+              })
+            );
+            const renderedTemplate = createElement('div');
+            renderedTemplate.innerText = 'Hello, John Smith';
+            sandbox
+              .stub(ampForm.templates_, 'findAndRenderTemplate')
+              .returns(Promise.resolve(renderedTemplate));
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+            return whenCalled(ampForm.templates_.findAndRenderTemplate)
+              .then(() => {
+                return ampForm.renderTemplatePromiseForTesting();
+              })
+              .then(() => {
+                expect(ampForm.templates_.findAndRenderTemplate).to.be.called;
+                expect(
+                  ampForm.templates_.findAndRenderTemplate.calledWith(
+                    messageContainer,
+                    {'name': 'John Smith'}
+                  )
+                ).to.be.true;
+                expect(mutateElementStub).to.have.been.calledOnce;
+                expect(messageContainer.firstChild).to.equal(renderedTemplate);
+
+                return submitEventPromise;
+              });
+          });
         });
-      });
-    });
-
-    it('should trigger amp-form-submit analytics event with form data', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve({
-          json: () => Promise.resolve({}),
-        }));
-        sandbox.stub(ampForm, 'analyticsEvent_');
-
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: ampForm.form_,
-          preventDefault: sandbox.spy(),
-        };
-        const expectedFormData = {
-          'formId': '',
-          'formFields[name]': 'John Miller',
-        };
-
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
-        expect(event.preventDefault).to.be.calledOnce;
-        whenCalled(ampForm.doVarSubs_).then(() => {
-          expect(ampForm.analyticsEvent_).to.be.calledWith(
-              'amp-form-submit',
-              expectedFormData
-          ) ;
+
+        it('should replace previously rendered responses', () => {
+          return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+            const form = ampForm.form_;
+            const successContainer = createElement('div');
+            successContainer.setAttribute('submit-success', '');
+            form.appendChild(successContainer);
+            const successTemplate = createElement('template');
+            successTemplate.setAttribute('type', 'amp-mustache');
+            successTemplate.content.appendChild(
+              createTextNode('Success: {{message}}')
+            );
+            successContainer.appendChild(successTemplate);
+            const renderedTemplate = createElement('div');
+            renderedTemplate.innerText = 'Success: hello';
+            renderedTemplate.setAttribute('i-amphtml-rendered', '');
+            successContainer.appendChild(renderedTemplate);
+            ampForm.state_ = 'submit-success';
+
+            const newRender = createElement('div');
+            newRender.innerText = 'New Success: What What';
+
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.resolve({
+                json: () => {
+                  return Promise.resolve({'message': 'What What'});
+                },
+              })
+            );
+            const findAndRenderTemplateStub = sandbox.stub(
+              ampForm.templates_,
+              'findAndRenderTemplate'
+            );
+            findAndRenderTemplateStub.returns(Promise.resolve(newRender));
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+            ampForm.handleSubmitEvent_(event);
+            return whenCalled(findAndRenderTemplateStub)
+              .then(() => {
+                return ampForm.renderTemplatePromiseForTesting();
+              })
+              .then(() => {
+                expect(mutateElementStub).to.have.been.calledOnce;
+                expect(ampForm.templates_.findAndRenderTemplate).to.be.called;
+                expect(
+                  ampForm.templates_.findAndRenderTemplate.calledWith(
+                    successContainer,
+                    {'message': 'What What'}
+                  )
+                ).to.be.true;
+                const renderedTemplates = form.querySelectorAll(
+                  '[i-amphtml-rendered]'
+                );
+                expect(renderedTemplates[0]).to.not.be.null;
+                expect(renderedTemplates.length).to.equal(1);
+                expect(renderedTemplates[0]).to.equal(newRender);
+              });
+          });
         });
-        return whenCalled(ampForm.xhr_.fetch).then(() => {
-          expect(ampForm.xhr_.fetch).to.be.calledOnce;
-          expect(ampForm.xhr_.fetch).to.be.calledWith('https://example.com');
 
-          const xhrCall = ampForm.xhr_.fetch.getCall(0);
-          const config = xhrCall.args[1];
-          expect(config.body).to.not.be.null;
-          expect(config.method).to.equal('POST');
-          expect(config.credentials).to.equal('include');
+        it('should dispatch "amp:template-rendered" event after render', () => {
+          return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+            const form = ampForm.form_;
+
+            const successContainer = createElement('div');
+            successContainer.setAttribute('submit-success', '');
+            form.appendChild(successContainer);
+            const successTemplate = createElement('template');
+            successTemplate.setAttribute('type', 'amp-mustache');
+            successContainer.appendChild(successTemplate);
+            const renderedTemplate = createElement('div');
+
+            const spyDispatchEvent = sandbox.spy(
+              successContainer,
+              'dispatchEvent'
+            );
+            const spyAppendTemplate = sandbox.spy(
+              successContainer,
+              'appendChild'
+            );
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.resolve({
+                json() {
+                  return Promise.resolve({'message': 'What What'});
+                },
+              })
+            );
+            const findAndRenderTemplateStub = sandbox.stub(
+              ampForm.templates_,
+              'findAndRenderTemplate'
+            );
+            findAndRenderTemplateStub.returns(
+              Promise.resolve(renderedTemplate)
+            );
 
-          return submitEventPromise;
-        });
-      });
-    });
-
-    it('should trigger amp-form-submit after variables substitution', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        const clientIdField = createElement('input');
-        clientIdField.setAttribute('name', 'clientId');
-        clientIdField.setAttribute('type', 'hidden');
-        clientIdField.value = 'CLIENT_ID(form)';
-        clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
-        form.appendChild(clientIdField);
-        const canonicalUrlField = createElement('input');
-        canonicalUrlField.setAttribute('name', 'canonicalUrl');
-        canonicalUrlField.setAttribute('type', 'hidden');
-        canonicalUrlField.value = 'CANONICAL_URL';
-        canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
-        form.appendChild(canonicalUrlField);
-
-        sandbox.stub(form, 'checkValidity').returns(true);
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve({
-          json: () => Promise.resolve({}),
-        }));
-        sandbox.spy(ampForm.urlReplacement_, 'expandInputValueAsync');
-        sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
-        sandbox.stub(ampForm, 'analyticsEvent_');
-
-        // Setup some Promises
-        const submitPromise = ampForm.submit_(ActionTrust.HIGH);
-
-        // Fetch
-        expect(ampForm.xhr_.fetch).to.have.not.been.called;
-        const fetchWhenCalledPromise = whenCalled(ampForm.xhr_.fetch)
-            .then(() => {
-              expect(ampForm.xhr_.fetch).to.be.called;
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+
+            return ampForm.handleSubmitEvent_(event).then(() => {
+              return ampForm
+                .xhrSubmitPromiseForTesting()
+                .then(() => {
+                  return ampForm.renderTemplatePromiseForTesting();
+                })
+                .then(() => {
+                  expect(spyDispatchEvent.calledOnce).to.be.true;
+                  expect(spyDispatchEvent).calledWithMatch({
+                    type: AmpEvents.DOM_UPDATE,
+                    bubbles: true,
+                  });
+                  sinon.assert.callOrder(spyAppendTemplate, spyDispatchEvent);
+                });
             });
+          });
+        });
 
-        return Promise.all([submitPromise, fetchWhenCalledPromise]).then(() => {
-          const expectedFormData = {
-            'formId': '',
-            'formFields[name]': 'John Miller',
-            'formFields[clientId]': sinon.match(/amp-.+/),
-            'formFields[canonicalUrl]': 'https%3A%2F%2Fexample.com%2Famps.html',
-          };
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.not.have.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledTwice;
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledWith(clientIdField);
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledWith(canonicalUrlField);
-          expect(clientIdField.value).to.match(/amp-.+/);
-          expect(canonicalUrlField.value).to.equal(
-              'https%3A%2F%2Fexample.com%2Famps.html');
-          expect(ampForm.analyticsEvent_).to.be.calledWith(
-              'amp-form-submit',
-              expectedFormData
-          );
+        it('should call fetch with the xhr action and form data', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
 
-        });
-      });
-    });
-
-    it('should block multiple submissions and disable buttons', () => {
-      const formPromise = getAmpForm(
-          getForm(/*button1*/ true, /*button2*/ true, /*button3*/true));
-      return formPromise.then(ampForm => {
-        let fetchResolver;
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(
-            new Promise(resolve => fetchResolver = resolve));
-
-        const form = ampForm.form_;
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-        const initialSubmitEventPromise = ampForm.handleSubmitEvent_(event);
-        expect(ampForm.state_).to.equal('submitting');
-
-        return whenCalled(ampForm.xhr_.fetch).then(() => {
-          expect(ampForm.xhr_.fetch.calledOnce).to.be.true;
-
-          ampForm.handleSubmitEvent_(event);
-          ampForm.handleSubmitEvent_(event);
-          expect(event.preventDefault.called).to.be.true;
-          expect(event.preventDefault).to.have.callCount(3);
-          expect(event.stopImmediatePropagation).to.have.callCount(2);
-          expect(ampForm.xhr_.fetch.calledOnce).to.be.true;
-          expect(form.className).to.contain('amp-form-submitting');
-          expect(form.className).to.not.contain('amp-form-submit-error');
-          expect(form.className).to.not.contain('amp-form-submit-success');
-          fetchResolver({json: () => Promise.resolve()});
-          sandbox.stub(ampForm, 'maybeHandleRedirect_');
-
-          return whenCalled(ampForm.maybeHandleRedirect_).then(() => {
-            expect(ampForm.state_).to.equal('submit-success');
-            expect(form.className).to.not.contain('amp-form-submitting');
-            expect(form.className).to.not.contain('amp-form-submit-error');
-            expect(form.className).to.contain('amp-form-submit-success');
-
-            return initialSubmitEventPromise;
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: ampForm.form_,
+              preventDefault: sandbox.spy(),
+            };
+
+            sandbox
+              .stub(ampForm, 'handleXhrSubmitSuccess_')
+              .returns(Promise.resolve());
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
+            expect(event.preventDefault).to.be.calledOnce;
+
+            return whenCalled(ampForm.xhr_.fetch).then(() => {
+              expect(ampForm.xhr_.fetch).to.be.calledOnce;
+              expect(ampForm.xhr_.fetch).to.be.calledWith(
+                'https://example.com'
+              );
+
+              const xhrCall = ampForm.xhr_.fetch.getCall(0);
+              const config = xhrCall.args[1];
+              expect(isFormDataWrapper(config.body)).to.be.true;
+              const entriesInForm = fromIterator(
+                createFormDataWrapper(env.win, getForm()).entries()
+              );
+              expect(fromIterator(config.body.entries())).to.have.deep.members(
+                entriesInForm
+              );
+              expect(config.method).to.equal('POST');
+              expect(config.credentials).to.equal('include');
+
+              return submitEventPromise;
+            });
           });
         });
-      });
-    });
-
-    it('should manage form state classes (submitting, success)', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        let fetchResolver;
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(new Promise(resolve => {
-          fetchResolver = resolve;
-        }));
-        sandbox.stub(ampForm, 'analyticsEvent_');
-        sandbox.stub(ampForm.actions_, 'trigger');
-        const form = ampForm.form_;
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-
-        const submitPromise = ampForm.handleSubmitEvent_(event);
-
-        sandbox.spy(ampForm, 'handlePresubmitSuccess_');
-        whenCalled(ampForm.handlePresubmitSuccess_).then(() => {
-          expect(event.preventDefault).to.be.called;
-          expect(ampForm.state_).to.equal('submitting');
-          expect(form.className).to.contain('amp-form-submitting');
-          expect(form.className).to.not.contain('amp-form-submit-error');
-          expect(form.className).to.not.contain('amp-form-submit-success');
-          fetchResolver({json: () => Promise.resolve()});
-        });
-
 
-        return submitPromise.then(() => {
-          expect(ampForm.actions_.trigger).to.be.called;
-          expect(ampForm.actions_.trigger).to.be.calledWith(form, 'submit');
-          expect(ampForm.state_).to.equal('submit-success');
-          expect(form.className).to.not.contain('amp-form-submitting');
-          expect(form.className).to.not.contain('amp-form-submit-error');
-          expect(form.className).to.contain('amp-form-submit-success');
-          expect(ampForm.actions_.trigger).to.be.called;
-          expect(ampForm.actions_.trigger).to.be.calledWith(
-              form, 'submit-success',
-              /** CustomEvent */ sinon.match.has('detail'));
-          expect(ampForm.analyticsEvent_).to.be.calledWith(
-              'amp-form-submit-success');
-        }, () => {
-          assert.fail('Submit should have succeeded.');
+        it('should trigger amp-form-submit analytics event with form data', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.resolve({
+                json: () => Promise.resolve({}),
+              })
+            );
+            sandbox.stub(ampForm, 'analyticsEvent_');
+
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: ampForm.form_,
+              preventDefault: sandbox.spy(),
+            };
+            const expectedFormData = {
+              'formId': '',
+              'formFields[name]': 'John Miller',
+            };
+
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
+            expect(event.preventDefault).to.be.calledOnce;
+            whenCalled(ampForm.doVarSubs_).then(() => {
+              expect(ampForm.analyticsEvent_).to.be.calledWith(
+                'amp-form-submit',
+                expectedFormData
+              );
+            });
+            return whenCalled(ampForm.xhr_.fetch).then(() => {
+              expect(ampForm.xhr_.fetch).to.be.calledOnce;
+              expect(ampForm.xhr_.fetch).to.be.calledWith(
+                'https://example.com'
+              );
+
+              const xhrCall = ampForm.xhr_.fetch.getCall(0);
+              const config = xhrCall.args[1];
+              expect(config.body).to.not.be.null;
+              expect(config.method).to.equal('POST');
+              expect(config.credentials).to.equal('include');
+
+              return submitEventPromise;
+            });
+          });
         });
 
-      });
-    });
-
-    it('should manage form state classes (submitting, error)', () => {
-      return getAmpForm(getForm(
-          /*button1*/ true, /*button2*/ true)).then(ampForm => {
-        let fetchRejecter;
-        sandbox.stub(ampForm, 'analyticsEvent_');
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(new Promise((unusedResolve, reject) => {
-              fetchRejecter = reject;
-            }));
-        sandbox.stub(ampForm.actions_, 'trigger');
-        const form = ampForm.form_;
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
-        expect(event.preventDefault).to.be.called;
-        expect(event.stopImmediatePropagation).to.not.be.called;
-        expect(ampForm.state_).to.equal('submitting');
-        expect(form.className).to.contain('amp-form-submitting');
-        expect(form.className).to.not.contain('amp-form-submit-error');
-        expect(form.className).to.not.contain('amp-form-submit-success');
-        fetchRejecter();
-
-        return submitEventPromise.then(() => {
-          assert.fail('Submit should have failed.');
-        }, () => {
-          expect(ampForm.state_).to.equal('submit-error');
-          expect(form.className).to.not.contain('amp-form-submitting');
-          expect(form.className).to.not.contain('amp-form-submit-success');
-          expect(form.className).to.contain('amp-form-submit-error');
-          expect(ampForm.actions_.trigger).to.be.called;
-          expect(ampForm.actions_.trigger.calledWith(
-              form,
-              'submit-error',
-              /** CustomEvent */ sinon.match.has('detail'))).to.be.true;
-          expect(ampForm.analyticsEvent_).to.be.calledWith(
-              'amp-form-submit-error');
+        it('should trigger amp-form-submit after variables substitution', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            const clientIdField = createElement('input');
+            clientIdField.setAttribute('name', 'clientId');
+            clientIdField.setAttribute('type', 'hidden');
+            clientIdField.value = 'CLIENT_ID(form)';
+            clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
+            form.appendChild(clientIdField);
+            const canonicalUrlField = createElement('input');
+            canonicalUrlField.setAttribute('name', 'canonicalUrl');
+            canonicalUrlField.setAttribute('type', 'hidden');
+            canonicalUrlField.value = 'CANONICAL_URL';
+            canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
+            form.appendChild(canonicalUrlField);
+
+            sandbox.stub(form, 'checkValidity').returns(true);
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              Promise.resolve({
+                json: () => Promise.resolve({}),
+              })
+            );
+            sandbox.spy(ampForm.urlReplacement_, 'expandInputValueAsync');
+            sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
+            sandbox.stub(ampForm, 'analyticsEvent_');
+
+            // Setup some Promises
+            const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+
+            // Fetch
+            expect(ampForm.xhr_.fetch).to.have.not.been.called;
+            const fetchWhenCalledPromise = whenCalled(ampForm.xhr_.fetch).then(
+              () => {
+                expect(ampForm.xhr_.fetch).to.be.called;
+              }
+            );
+
+            return Promise.all([submitPromise, fetchWhenCalledPromise]).then(
+              () => {
+                const expectedFormData = {
+                  'formId': '',
+                  'formFields[name]': 'John Miller',
+                  'formFields[clientId]': sinon.match(/amp-.+/),
+                  'formFields[canonicalUrl]':
+                    'https%3A%2F%2Fexample.com%2Famps.html',
+                };
+                expect(ampForm.urlReplacement_.expandInputValueSync).to.not.have
+                  .been.called;
+                expect(ampForm.urlReplacement_.expandInputValueAsync).to.have
+                  .been.calledTwice;
+                expect(
+                  ampForm.urlReplacement_.expandInputValueAsync
+                ).to.have.been.calledWith(clientIdField);
+                expect(
+                  ampForm.urlReplacement_.expandInputValueAsync
+                ).to.have.been.calledWith(canonicalUrlField);
+                expect(clientIdField.value).to.match(/amp-.+/);
+                expect(canonicalUrlField.value).to.equal(
+                  'https%3A%2F%2Fexample.com%2Famps.html'
+                );
+                expect(ampForm.analyticsEvent_).to.be.calledWith(
+                  'amp-form-submit',
+                  expectedFormData
+                );
+              }
+            );
+          });
         });
-      });
-    });
 
-    describe('GET requests', () => {
-      it('should allow GET submissions', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          ampForm.method_ = 'GET';
-          ampForm.form_.setAttribute('method', 'GET');
+        it('should block multiple submissions and disable buttons', () => {
+          const formPromise = getAmpForm(
+            getForm(/*button1*/ true, /*button2*/ true, /*button3*/ true)
+          );
+          return formPromise.then(ampForm => {
+            let fetchResolver;
+            sandbox
+              .stub(ampForm.xhr_, 'fetch')
+              .returns(new Promise(resolve => (fetchResolver = resolve)));
+
+            const form = ampForm.form_;
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+
+            const initialSubmitEventPromise = ampForm.handleSubmitEvent_(event);
+            expect(ampForm.state_).to.equal('submitting');
 
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          const event = {
-            stopImmediatePropagation: sandbox.spy(),
-            target: ampForm.form_,
-            preventDefault: sandbox.spy(),
-          };
+            return whenCalled(ampForm.xhr_.fetch).then(() => {
+              expect(ampForm.xhr_.fetch.calledOnce).to.be.true;
+
+              ampForm.handleSubmitEvent_(event);
+              ampForm.handleSubmitEvent_(event);
+              expect(event.preventDefault.called).to.be.true;
+              expect(event.preventDefault).to.have.callCount(3);
+              expect(event.stopImmediatePropagation).to.have.callCount(2);
+              expect(ampForm.xhr_.fetch.calledOnce).to.be.true;
+              expect(form.className).to.contain('amp-form-submitting');
+              expect(form.className).to.not.contain('amp-form-submit-error');
+              expect(form.className).to.not.contain('amp-form-submit-success');
+              fetchResolver({json: () => Promise.resolve()});
+              sandbox.stub(ampForm, 'maybeHandleRedirect_');
+
+              return whenCalled(ampForm.maybeHandleRedirect_).then(() => {
+                expect(ampForm.state_).to.equal('submit-success');
+                expect(form.className).to.not.contain('amp-form-submitting');
+                expect(form.className).to.not.contain('amp-form-submit-error');
+                expect(form.className).to.contain('amp-form-submit-success');
+
+                return initialSubmitEventPromise;
+              });
+            });
+          });
+        });
 
-          sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-              .returns(Promise.resolve());
-          const submitEventPromise = ampForm.handleSubmitEvent_(event);
-          expect(event.preventDefault).to.be.calledOnce;
+        it('should manage form state classes (submitting, success)', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            let fetchResolver;
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              new Promise(resolve => {
+                fetchResolver = resolve;
+              })
+            );
+            sandbox.stub(ampForm, 'analyticsEvent_');
+            sandbox.stub(ampForm.actions_, 'trigger');
+            const form = ampForm.form_;
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
 
-          return whenCalled(ampForm.xhr_.fetch).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller');
+            const submitPromise = ampForm.handleSubmitEvent_(event);
 
-            const xhrCall = ampForm.xhr_.fetch.getCall(0);
-            const config = xhrCall.args[1];
-            expect(config.body).to.be.undefined;
-            expect(config.method).to.equal('GET');
-            expect(config.credentials).to.equal('include');
+            sandbox.spy(ampForm, 'handlePresubmitSuccess_');
+            whenCalled(ampForm.handlePresubmitSuccess_).then(() => {
+              expect(event.preventDefault).to.be.called;
+              expect(ampForm.state_).to.equal('submitting');
+              expect(form.className).to.contain('amp-form-submitting');
+              expect(form.className).to.not.contain('amp-form-submit-error');
+              expect(form.className).to.not.contain('amp-form-submit-success');
+              fetchResolver({json: () => Promise.resolve()});
+            });
 
-            return submitEventPromise;
+            return submitPromise.then(
+              () => {
+                expect(ampForm.actions_.trigger).to.be.called;
+                expect(ampForm.actions_.trigger).to.be.calledWith(
+                  form,
+                  'submit'
+                );
+                expect(ampForm.state_).to.equal('submit-success');
+                expect(form.className).to.not.contain('amp-form-submitting');
+                expect(form.className).to.not.contain('amp-form-submit-error');
+                expect(form.className).to.contain('amp-form-submit-success');
+                expect(ampForm.actions_.trigger).to.be.called;
+                expect(ampForm.actions_.trigger).to.be.calledWith(
+                  form,
+                  'submit-success',
+                  /** CustomEvent */ sinon.match.has('detail')
+                );
+                expect(ampForm.analyticsEvent_).to.be.calledWith(
+                  'amp-form-submit-success'
+                );
+              },
+              () => {
+                assert.fail('Submit should have succeeded.');
+              }
+            );
           });
         });
-      });
 
-      it('should not send disabled or nameless inputs', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          form.setAttribute('method', 'GET');
+        it('should manage form state classes (submitting, error)', () => {
+          return getAmpForm(getForm(/*button1*/ true, /*button2*/ true)).then(
+            ampForm => {
+              let fetchRejecter;
+              sandbox.stub(ampForm, 'analyticsEvent_');
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(
+                new Promise((unusedResolve, reject) => {
+                  fetchRejecter = reject;
+                })
+              );
+              sandbox.stub(ampForm.actions_, 'trigger');
+              const form = ampForm.form_;
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: form,
+                preventDefault: sandbox.spy(),
+              };
+
+              const submitEventPromise = ampForm.handleSubmitEvent_(event);
+              expect(event.preventDefault).to.be.called;
+              expect(event.stopImmediatePropagation).to.not.be.called;
+              expect(ampForm.state_).to.equal('submitting');
+              expect(form.className).to.contain('amp-form-submitting');
+              expect(form.className).to.not.contain('amp-form-submit-error');
+              expect(form.className).to.not.contain('amp-form-submit-success');
+              fetchRejecter();
+
+              return submitEventPromise.then(
+                () => {
+                  assert.fail('Submit should have failed.');
+                },
+                () => {
+                  expect(ampForm.state_).to.equal('submit-error');
+                  expect(form.className).to.not.contain('amp-form-submitting');
+                  expect(form.className).to.not.contain(
+                    'amp-form-submit-success'
+                  );
+                  expect(form.className).to.contain('amp-form-submit-error');
+                  expect(ampForm.actions_.trigger).to.be.called;
+                  expect(
+                    ampForm.actions_.trigger.calledWith(
+                      form,
+                      'submit-error',
+                      /** CustomEvent */ sinon.match.has('detail')
+                    )
+                  ).to.be.true;
+                  expect(ampForm.analyticsEvent_).to.be.calledWith(
+                    'amp-form-submit-error'
+                  );
+                }
+              );
+            }
+          );
+        });
 
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          const fieldset = createElement('fieldset');
-          const emailInput = createElement('input');
-          emailInput.setAttribute('name', 'email');
-          emailInput.setAttribute('type', 'email');
-          emailInput.setAttribute('required', '');
-          fieldset.appendChild(emailInput);
-          const usernameInput = createElement('input');
-          usernameInput.setAttribute('name', 'nickname');
-          usernameInput.setAttribute('required', '');
-          fieldset.appendChild(usernameInput);
-          form.appendChild(fieldset);
-          const event = {
-            stopImmediatePropagation: sandbox.spy(),
-            target: ampForm.form_,
-            preventDefault: sandbox.spy(),
-          };
+        describe('GET requests', () => {
+          it('should allow GET submissions', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              ampForm.method_ = 'GET';
+              ampForm.form_.setAttribute('method', 'GET');
+
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: ampForm.form_,
+                preventDefault: sandbox.spy(),
+              };
+
+              sandbox
+                .stub(ampForm, 'handleXhrSubmitSuccess_')
+                .returns(Promise.resolve());
+              const submitEventPromise = ampForm.handleSubmitEvent_(event);
+              expect(event.preventDefault).to.be.calledOnce;
+
+              return whenCalled(ampForm.xhr_.fetch).then(() => {
+                expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                expect(ampForm.xhr_.fetch).to.be.calledWith(
+                  'https://example.com?name=John%20Miller'
+                );
+
+                const xhrCall = ampForm.xhr_.fetch.getCall(0);
+                const config = xhrCall.args[1];
+                expect(config.body).to.be.undefined;
+                expect(config.method).to.equal('GET');
+                expect(config.credentials).to.equal('include');
+
+                return submitEventPromise;
+              });
+            });
+          });
 
-          usernameInput.disabled = true;
-          usernameInput.value = 'coolbeans';
-          emailInput.value = 'cool@bea.ns';
+          it('should not send disabled or nameless inputs', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
+              ampForm.method_ = 'GET';
+              form.setAttribute('method', 'GET');
+
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              const fieldset = createElement('fieldset');
+              const emailInput = createElement('input');
+              emailInput.setAttribute('name', 'email');
+              emailInput.setAttribute('type', 'email');
+              emailInput.setAttribute('required', '');
+              fieldset.appendChild(emailInput);
+              const usernameInput = createElement('input');
+              usernameInput.setAttribute('name', 'nickname');
+              usernameInput.setAttribute('required', '');
+              fieldset.appendChild(usernameInput);
+              form.appendChild(fieldset);
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: ampForm.form_,
+                preventDefault: sandbox.spy(),
+              };
+
+              usernameInput.disabled = true;
+              usernameInput.value = 'coolbeans';
+              emailInput.value = 'cool@bea.ns';
+
+              sandbox
+                .stub(ampForm, 'handleXhrSubmitSuccess_')
+                .returns(Promise.resolve());
+              let submitEventPromise;
+              submitEventPromise = ampForm.handleSubmitEvent_(event);
+              expect(event.preventDefault).to.be.calledOnce;
+
+              return whenCalled(ampForm.xhr_.fetch)
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&email=cool%40bea.ns'
+                  );
+                  return submitEventPromise;
+                })
+                .then(() => {
+                  ampForm.setState_('submit-success');
+                  ampForm.xhr_.fetch.reset();
+                  ampForm.xhr_.fetch.returns(Promise.resolve());
+                  usernameInput.removeAttribute('disabled');
+                  usernameInput.value = 'coolbeans';
+                  emailInput.value = 'cool@bea.ns';
+
+                  submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+                  return whenCalled(ampForm.xhr_.fetch);
+                })
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&email=cool%40bea.ns&' +
+                      'nickname=coolbeans'
+                  );
+
+                  return submitEventPromise;
+                })
+                .then(() => {
+                  ampForm.setState_('submit-success');
+                  ampForm.xhr_.fetch.reset();
+                  ampForm.xhr_.fetch.returns(Promise.resolve());
+                  fieldset.disabled = true;
+
+                  submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+                  return whenCalled(ampForm.xhr_.fetch);
+                })
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller'
+                  );
+                  return submitEventPromise;
+                })
+                .then(() => {
+                  ampForm.setState_('submit-success');
+                  ampForm.xhr_.fetch.reset();
+                  ampForm.xhr_.fetch.returns(Promise.resolve());
+
+                  fieldset.removeAttribute('disabled');
+                  usernameInput.removeAttribute('name');
+                  emailInput.removeAttribute('required');
+                  emailInput.value = '';
+                  submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+                  return whenCalled(ampForm.xhr_.fetch);
+                })
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&email='
+                  );
+                });
+            });
+          });
 
-          sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-              .returns(Promise.resolve());
-          let submitEventPromise;
-          submitEventPromise = ampForm.handleSubmitEvent_(event);
-          expect(event.preventDefault).to.be.calledOnce;
+          it('should properly serialize inputs to query params', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
+              ampForm.method_ = 'GET';
+              form.setAttribute('method', 'GET');
+
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+
+              const otherNamesFS = createElement('fieldset');
+              const otherName1Input = createElement('input');
+              otherName1Input.setAttribute('name', 'name');
+              otherNamesFS.appendChild(otherName1Input);
+              const otherName2Input = createElement('input');
+              otherName2Input.setAttribute('name', 'name');
+              otherNamesFS.appendChild(otherName2Input);
+              form.appendChild(otherNamesFS);
+
+              // Group of Radio buttons.
+              const genderFS = createElement('fieldset');
+              const maleRadio = createElement('input');
+              maleRadio.setAttribute('type', 'radio');
+              maleRadio.setAttribute('name', 'gender');
+              maleRadio.setAttribute('value', 'Male');
+              genderFS.appendChild(maleRadio);
+              const femaleRadio = createElement('input');
+              femaleRadio.setAttribute('type', 'radio');
+              femaleRadio.setAttribute('name', 'gender');
+              femaleRadio.setAttribute('value', 'Female');
+              genderFS.appendChild(femaleRadio);
+              form.appendChild(genderFS);
+
+              // Group of Checkboxes.
+              const interestsFS = createElement('fieldset');
+              const basketballCB = createElement('input');
+              basketballCB.setAttribute('type', 'checkbox');
+              basketballCB.setAttribute('name', 'interests');
+              basketballCB.setAttribute('value', 'Basketball');
+              interestsFS.appendChild(basketballCB);
+              const footballCB = createElement('input');
+              footballCB.setAttribute('type', 'checkbox');
+              footballCB.setAttribute('name', 'interests');
+              footballCB.setAttribute('value', 'Football');
+              interestsFS.appendChild(footballCB);
+              const foodCB = createElement('input');
+              foodCB.setAttribute('type', 'checkbox');
+              foodCB.setAttribute('name', 'interests');
+              foodCB.setAttribute('value', 'Food');
+              interestsFS.appendChild(foodCB);
+              form.appendChild(interestsFS);
+
+              // Select w/ options.
+              const citySelect = createElement('select');
+              citySelect.setAttribute('name', 'city');
+              const sfOption = createElement('option');
+              sfOption.setAttribute('value', 'San Francisco');
+              citySelect.appendChild(sfOption);
+              const mtvOption = createElement('option');
+              mtvOption.setAttribute('value', 'Mountain View');
+              citySelect.appendChild(mtvOption);
+              const nyOption = createElement('option');
+              nyOption.setAttribute('value', 'New York');
+              citySelect.appendChild(nyOption);
+              form.appendChild(citySelect);
+
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: ampForm.form_,
+                preventDefault: sandbox.spy(),
+              };
+
+              sandbox
+                .stub(ampForm, 'handleXhrSubmitSuccess_')
+                .returns(Promise.resolve());
+              let submitEventPromise;
+              submitEventPromise = ampForm.handleSubmitEvent_(event);
+              expect(event.preventDefault).to.be.calledOnce;
+
+              return whenCalled(ampForm.xhr_.fetch)
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&name=&name=&' +
+                      'city=San%20Francisco'
+                  );
+                  return submitEventPromise;
+                })
+                .then(() => {
+                  ampForm.setState_('submit-success');
+                  ampForm.xhr_.fetch.reset();
+                  ampForm.xhr_.fetch.returns(Promise.resolve());
+                  foodCB.checked = true;
+                  footballCB.checked = true;
+                  submitEventPromise = ampForm.handleSubmitEvent_(event);
+
+                  return whenCalled(ampForm.xhr_.fetch);
+                })
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&name=&name=' +
+                      '&interests=Football&interests=Food&city=San%20Francisco'
+                  );
+                  return submitEventPromise;
+                })
+                .then(() => {
+                  ampForm.setState_('submit-success');
+                  femaleRadio.checked = true;
+                  otherName1Input.value = 'John Maller';
+                  ampForm.xhr_.fetch.reset();
+                  ampForm.xhr_.fetch.returns(Promise.resolve());
+
+                  submitEventPromise = ampForm.handleSubmitEvent_(event);
+                  return whenCalled(ampForm.xhr_.fetch);
+                })
+                .then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.calledOnce;
+                  expect(ampForm.xhr_.fetch).to.be.calledWith(
+                    'https://example.com?name=John%20Miller&name=John%20Maller' +
+                      '&name=&gender=Female&interests=Football&interests=Food&' +
+                      'city=San%20Francisco'
+                  );
+                  return submitEventPromise;
+                });
+            });
+          });
+        });
+
+        describe('User Validity', () => {
+          it('should manage valid/invalid on input/fieldset/form on submit', () => {
+            expectAsyncConsoleError(/Form submission failed/);
+            setReportValiditySupportedForTesting(false);
+            return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+              const form = ampForm.form_;
+              const fieldset = createElement('fieldset');
+              const emailInput = createElement('input');
+              emailInput.setAttribute('name', 'email');
+              emailInput.setAttribute('type', 'email');
+              emailInput.setAttribute('required', '');
+              fieldset.appendChild(emailInput);
+              form.appendChild(fieldset);
+              sandbox.spy(form, 'checkValidity');
+              sandbox.spy(emailInput, 'checkValidity');
+              sandbox.spy(fieldset, 'checkValidity');
+
+              const event = {
+                target: ampForm.form_,
+                stopImmediatePropagation: sandbox.spy(),
+                preventDefault: sandbox.spy(),
+              };
+
+              // Submit an invalid form
+              const invalidFormPromiseResponse = ampForm.handleSubmitEvent_(
+                event
+              );
+              return invalidFormPromiseResponse
+                .then(() => {
+                  expect(form.checkValidity).to.be.called;
+                  expect(emailInput.checkValidity).to.be.called;
+                  expect(fieldset.checkValidity).to.be.called;
+                  expect(form.className).to.contain('user-invalid');
+                  expect(emailInput.className).to.contain('user-invalid');
+                  expect(event.preventDefault).to.be.called;
+                  expect(event.stopImmediatePropagation).to.be.called;
+
+                  emailInput.value = 'cool@bea.ns';
+
+                  const submitPromise = ampForm.handleSubmitEvent_(event);
+                  expect(submitPromise).to.be.ok;
+                  return submitPromise;
+                })
+                .then(() => {
+                  expect(form.className).to.contain('user-valid');
+                  expect(emailInput.className).to.contain('user-valid');
+                });
+            });
+          });
 
-          return whenCalled(ampForm.xhr_.fetch).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&email=cool%40bea.ns');
-            return submitEventPromise;
-          }).then(() => {
-            ampForm.setState_('submit-success');
-            ampForm.xhr_.fetch.reset();
-            ampForm.xhr_.fetch.returns(Promise.resolve());
-            usernameInput.removeAttribute('disabled');
-            usernameInput.value = 'coolbeans';
-            emailInput.value = 'cool@bea.ns';
+          it('should manage valid/invalid on input user interaction', () => {
+            setReportValiditySupportedForTesting(false);
+            return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+              const form = ampForm.form_;
+              const fieldset = createElement('fieldset');
+              const emailInput = createElement('input');
+              emailInput.setAttribute('name', 'email');
+              emailInput.setAttribute('type', 'email');
+              emailInput.setAttribute('required', '');
+              fieldset.appendChild(emailInput);
+              const usernameInput = createElement('input');
+              usernameInput.setAttribute('name', 'nickname');
+              usernameInput.setAttribute('required', '');
+              fieldset.appendChild(usernameInput);
+              form.appendChild(fieldset);
+              sandbox.spy(form, 'checkValidity');
+              sandbox.spy(emailInput, 'checkValidity');
+              sandbox.spy(fieldset, 'checkValidity');
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+
+              checkUserValidityAfterInteraction_(emailInput);
+              expect(form.checkValidity).to.be.called;
+              expect(emailInput.checkValidity).to.be.called;
+              expect(fieldset.checkValidity).to.be.called;
+              expect(form.className).to.contain('user-invalid');
+              expect(emailInput.className).to.contain('user-invalid');
+
+              // No interaction happened with usernameInput, so no user-class should
+              // be added at this point.
+              expect(usernameInput.className).to.not.contain('user-invalid');
+              expect(usernameInput.className).to.not.contain('user-valid');
+
+              emailInput.value = 'cool@bea.ns';
+              checkUserValidityAfterInteraction_(emailInput);
+              expect(emailInput.className).to.contain('user-valid');
+              expect(form.className).to.contain('user-invalid');
+
+              // Still no interaction.
+              expect(usernameInput.className).to.not.contain('user-invalid');
+              expect(usernameInput.className).to.not.contain('user-valid');
+
+              // Both inputs back to invalid.
+              emailInput.value = 'invalid-value';
+              checkUserValidityAfterInteraction_(emailInput);
+              expect(emailInput.className).to.contain('user-invalid');
+              expect(form.className).to.contain('user-invalid');
+
+              // Still no interaction.
+              expect(usernameInput.className).to.not.contain('user-invalid');
+              expect(usernameInput.className).to.not.contain('user-valid');
+
+              // Only email input is invalid now.
+              usernameInput.value = 'coolbeans';
+              checkUserValidityAfterInteraction_(usernameInput);
+              expect(emailInput.className).to.contain('user-invalid');
+              expect(form.className).to.contain('user-invalid');
+              expect(usernameInput.className).to.contain('user-valid');
+
+              // Both input are finally valid.
+              emailInput.value = 'cool@bea.ns';
+              checkUserValidityAfterInteraction_(emailInput);
+              expect(emailInput.className).to.contain('user-valid');
+              expect(usernameInput.className).to.contain('user-valid');
+              expect(form.className).to.contain('user-valid');
+            });
+          });
 
-            submitEventPromise = ampForm.handleSubmitEvent_(event);
-
-            return whenCalled(ampForm.xhr_.fetch);
-          }).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&email=cool%40bea.ns&' +
-              'nickname=coolbeans');
-
-            return submitEventPromise;
-          }).then(() => {
-            ampForm.setState_('submit-success');
-            ampForm.xhr_.fetch.reset();
-            ampForm.xhr_.fetch.returns(Promise.resolve());
-            fieldset.disabled = true;
-
-            submitEventPromise = ampForm.handleSubmitEvent_(event);
-
-            return whenCalled(ampForm.xhr_.fetch);
-          }).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller');
-            return submitEventPromise;
-          }).then(() => {
-            ampForm.setState_('submit-success');
-            ampForm.xhr_.fetch.reset();
-            ampForm.xhr_.fetch.returns(Promise.resolve());
-
-            fieldset.removeAttribute('disabled');
-            usernameInput.removeAttribute('name');
-            emailInput.removeAttribute('required');
-            emailInput.value = '';
-            submitEventPromise = ampForm.handleSubmitEvent_(event);
-
-            return whenCalled(ampForm.xhr_.fetch);
-          }).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&email=');
+          it('should propagates user-valid only when going from invalid', () => {
+            setReportValiditySupportedForTesting(false);
+            return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
+              const form = ampForm.form_;
+              const fieldset = createElement('fieldset');
+              const emailInput = createElement('input');
+              emailInput.setAttribute('name', 'email');
+              emailInput.setAttribute('type', 'email');
+              emailInput.setAttribute('required', '');
+              fieldset.appendChild(emailInput);
+              form.appendChild(fieldset);
+              sandbox.spy(form, 'checkValidity');
+              sandbox.spy(emailInput, 'checkValidity');
+              sandbox.spy(fieldset, 'checkValidity');
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+
+              emailInput.value = 'cool@bea.ns';
+              checkUserValidityAfterInteraction_(emailInput);
+
+              expect(emailInput.checkValidity).to.be.called;
+              expect(form.checkValidity).to.not.be.called;
+              expect(fieldset.checkValidity).to.not.be.called;
+              expect(emailInput.className).to.contain('user-valid');
+              expect(form.className).to.not.contain('user-valid');
+            });
           });
         });
-      });
-
 
-      it('should properly serialize inputs to query params', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          form.setAttribute('method', 'GET');
+        it('should install action handler and handle submit action', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+          const actions = Services.actionServiceForDoc(form);
 
+          sandbox.stub(actions, 'installActionHandler');
+          const ampForm = new AmpForm(form);
           sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
 
-          const otherNamesFS = createElement('fieldset');
-          const otherName1Input = createElement('input');
-          otherName1Input.setAttribute('name', 'name');
-          otherNamesFS.appendChild(otherName1Input);
-          const otherName2Input = createElement('input');
-          otherName2Input.setAttribute('name', 'name');
-          otherNamesFS.appendChild(otherName2Input);
-          form.appendChild(otherNamesFS);
-
-          // Group of Radio buttons.
-          const genderFS = createElement('fieldset');
-          const maleRadio = createElement('input');
-          maleRadio.setAttribute('type', 'radio');
-          maleRadio.setAttribute('name', 'gender');
-          maleRadio.setAttribute('value', 'Male');
-          genderFS.appendChild(maleRadio);
-          const femaleRadio = createElement('input');
-          femaleRadio.setAttribute('type', 'radio');
-          femaleRadio.setAttribute('name', 'gender');
-          femaleRadio.setAttribute('value', 'Female');
-          genderFS.appendChild(femaleRadio);
-          form.appendChild(genderFS);
-
-          // Group of Checkboxes.
-          const interestsFS = createElement('fieldset');
-          const basketballCB = createElement('input');
-          basketballCB.setAttribute('type', 'checkbox');
-          basketballCB.setAttribute('name', 'interests');
-          basketballCB.setAttribute('value', 'Basketball');
-          interestsFS.appendChild(basketballCB);
-          const footballCB = createElement('input');
-          footballCB.setAttribute('type', 'checkbox');
-          footballCB.setAttribute('name', 'interests');
-          footballCB.setAttribute('value', 'Football');
-          interestsFS.appendChild(footballCB);
-          const foodCB = createElement('input');
-          foodCB.setAttribute('type', 'checkbox');
-          foodCB.setAttribute('name', 'interests');
-          foodCB.setAttribute('value', 'Food');
-          interestsFS.appendChild(foodCB);
-          form.appendChild(interestsFS);
-
-          // Select w/ options.
-          const citySelect = createElement('select');
-          citySelect.setAttribute('name', 'city');
-          const sfOption = createElement('option');
-          sfOption.setAttribute('value', 'San Francisco');
-          citySelect.appendChild(sfOption);
-          const mtvOption = createElement('option');
-          mtvOption.setAttribute('value', 'Mountain View');
-          citySelect.appendChild(mtvOption);
-          const nyOption = createElement('option');
-          nyOption.setAttribute('value', 'New York');
-          citySelect.appendChild(nyOption);
-          form.appendChild(citySelect);
+          expect(actions.installActionHandler).to.be.calledWith(form);
+          sandbox.spy(ampForm, 'handleSubmitAction_');
+          ampForm.actionHandler_({
+            method: 'anything',
+            satisfiesTrust: () => true,
+          });
+          expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+          ampForm.actionHandler_({
+            method: 'submit',
+            satisfiesTrust: () => true,
+          });
 
-          const event = {
-            stopImmediatePropagation: sandbox.spy(),
-            target: ampForm.form_,
-            preventDefault: sandbox.spy(),
-          };
+          return whenCalled(ampForm.xhr_.fetch).then(() => {
+            expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
+            document.body.removeChild(form);
+          });
+        });
 
-          sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-              .returns(Promise.resolve());
-          let submitEventPromise;
-          submitEventPromise = ampForm.handleSubmitEvent_(event);
-          expect(event.preventDefault).to.be.calledOnce;
+        it('should not invoke low-trust action invocations', () => {
+          const form = getForm();
+          document.body.appendChild(form);
 
-          return whenCalled(ampForm.xhr_.fetch).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&name=&name=&' +
-              'city=San%20Francisco');
-            return submitEventPromise;
-          }).then(() => {
-            ampForm.setState_('submit-success');
-            ampForm.xhr_.fetch.reset();
-            ampForm.xhr_.fetch.returns(Promise.resolve());
-            foodCB.checked = true;
-            footballCB.checked = true;
-            submitEventPromise = ampForm.handleSubmitEvent_(event);
-
-            return whenCalled(ampForm.xhr_.fetch);
-          }).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&name=&name=' +
-              '&interests=Football&interests=Food&city=San%20Francisco');
-            return submitEventPromise;
-          }).then(() => {
-            ampForm.setState_('submit-success');
-            femaleRadio.checked = true;
-            otherName1Input.value = 'John Maller';
-            ampForm.xhr_.fetch.reset();
-            ampForm.xhr_.fetch.returns(Promise.resolve());
-
-            submitEventPromise = ampForm.handleSubmitEvent_(event);
-            return whenCalled(ampForm.xhr_.fetch);
-          }).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.calledOnce;
-            expect(ampForm.xhr_.fetch).to.be.calledWith(
-                'https://example.com?name=John%20Miller&name=John%20Maller' +
-              '&name=&gender=Female&interests=Football&interests=Food&' +
-              'city=San%20Francisco');
-            return submitEventPromise;
+          const ampForm = new AmpForm(form);
+          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+
+          sandbox.spy(ampForm, 'handleSubmitAction_');
+          ampForm.actionHandler_({
+            method: 'submit',
+            satisfiesTrust: () => false,
           });
+          expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+
+          document.body.removeChild(form);
         });
-      });
-    });
-
-    describe('User Validity', () => {
-      it('should manage valid/invalid on input/fieldset/form on submit', () => {
-        expectAsyncConsoleError(/Form submission failed/);
-        setReportValiditySupportedForTesting(false);
-        return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-          const form = ampForm.form_;
-          const fieldset = createElement('fieldset');
+
+        it('should handle clear action and restore initial values', () => {
+          const form = getForm();
+          document.body.appendChild(form);
+
           const emailInput = createElement('input');
           emailInput.setAttribute('name', 'email');
+          emailInput.setAttribute('id', 'email');
           emailInput.setAttribute('type', 'email');
-          emailInput.setAttribute('required', '');
-          fieldset.appendChild(emailInput);
-          form.appendChild(fieldset);
-          sandbox.spy(form, 'checkValidity');
-          sandbox.spy(emailInput, 'checkValidity');
-          sandbox.spy(fieldset, 'checkValidity');
+          emailInput.setAttribute('value', 'jack@poc.com');
+          form.appendChild(emailInput);
 
-          const event = {
-            target: ampForm.form_,
-            stopImmediatePropagation: sandbox.spy(),
-            preventDefault: sandbox.spy(),
-          };
+          return getAmpForm(form).then(ampForm => {
+            const initalFormValues = ampForm.getFormAsObject_();
 
-          // Submit an invalid form
-          const invalidFormPromiseResponse = ampForm.handleSubmitEvent_(event);
-          return invalidFormPromiseResponse.then(() => {
-            expect(form.checkValidity).to.be.called;
-            expect(emailInput.checkValidity).to.be.called;
-            expect(fieldset.checkValidity).to.be.called;
-            expect(form.className).to.contain('user-invalid');
-            expect(emailInput.className).to.contain('user-invalid');
-            expect(event.preventDefault).to.be.called;
-            expect(event.stopImmediatePropagation).to.be.called;
+            ampForm.form_.elements.name.value = 'Jack Sparrow';
 
-            emailInput.value = 'cool@bea.ns';
+            sandbox.spy(ampForm, 'handleClearAction_');
+            ampForm.actionHandler_({
+              method: 'anything',
+              satisfiesTrust: () => true,
+            });
+            expect(ampForm.handleClearAction_).to.have.not.been.called;
 
-            const submitPromise = ampForm.handleSubmitEvent_(event);
-            expect(submitPromise).to.be.ok;
-            return submitPromise;
-          }).then(() => {
-            expect(form.className).to.contain('user-valid');
-            expect(emailInput.className).to.contain('user-valid');
+            expect(ampForm.getFormAsObject_()).to.not.deep.equal(
+              initalFormValues
+            );
+            ampForm.actionHandler_({
+              method: 'clear',
+              satisfiesTrust: () => true,
+            });
+            expect(ampForm.handleClearAction_).to.have.been.called;
+
+            expect(ampForm.getFormAsObject_()).to.deep.equal(initalFormValues);
           });
         });
-      });
 
-      it('should manage valid/invalid on input user interaction', () => {
-        setReportValiditySupportedForTesting(false);
-        return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-          const form = ampForm.form_;
+        it('should remove all form state classes when form is cleared', () => {
+          const form = getForm();
+          form.setAttribute('method', 'GET');
+          document.body.appendChild(form);
+
+          form.setAttribute(
+            'custom-validation-reporting',
+            'show-all-on-submit'
+          );
+
           const fieldset = createElement('fieldset');
-          const emailInput = createElement('input');
-          emailInput.setAttribute('name', 'email');
-          emailInput.setAttribute('type', 'email');
-          emailInput.setAttribute('required', '');
-          fieldset.appendChild(emailInput);
           const usernameInput = createElement('input');
-          usernameInput.setAttribute('name', 'nickname');
+          usernameInput.setAttribute('name', 'username');
+          usernameInput.setAttribute('id', 'username');
+          usernameInput.setAttribute('type', 'text');
           usernameInput.setAttribute('required', '');
+          usernameInput.setAttribute('value', 'Jack Sparrow');
           fieldset.appendChild(usernameInput);
-          form.appendChild(fieldset);
-          sandbox.spy(form, 'checkValidity');
-          sandbox.spy(emailInput, 'checkValidity');
-          sandbox.spy(fieldset, 'checkValidity');
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-
-          checkUserValidityAfterInteraction_(emailInput);
-          expect(form.checkValidity).to.be.called;
-          expect(emailInput.checkValidity).to.be.called;
-          expect(fieldset.checkValidity).to.be.called;
-          expect(form.className).to.contain('user-invalid');
-          expect(emailInput.className).to.contain('user-invalid');
-
-          // No interaction happened with usernameInput, so no user-class should
-          // be added at this point.
-          expect(usernameInput.className).to.not.contain('user-invalid');
-          expect(usernameInput.className).to.not.contain('user-valid');
-
-
-          emailInput.value = 'cool@bea.ns';
-          checkUserValidityAfterInteraction_(emailInput);
-          expect(emailInput.className).to.contain('user-valid');
-          expect(form.className).to.contain('user-invalid');
-
-          // Still no interaction.
-          expect(usernameInput.className).to.not.contain('user-invalid');
-          expect(usernameInput.className).to.not.contain('user-valid');
-
-          // Both inputs back to invalid.
-          emailInput.value = 'invalid-value';
-          checkUserValidityAfterInteraction_(emailInput);
-          expect(emailInput.className).to.contain('user-invalid');
-          expect(form.className).to.contain('user-invalid');
-
-          // Still no interaction.
-          expect(usernameInput.className).to.not.contain('user-invalid');
-          expect(usernameInput.className).to.not.contain('user-valid');
-
-          // Only email input is invalid now.
-          usernameInput.value = 'coolbeans';
-          checkUserValidityAfterInteraction_(usernameInput);
-          expect(emailInput.className).to.contain('user-invalid');
-          expect(form.className).to.contain('user-invalid');
-          expect(usernameInput.className).to.contain('user-valid');
-
-          // Both input are finally valid.
-          emailInput.value = 'cool@bea.ns';
-          checkUserValidityAfterInteraction_(emailInput);
-          expect(emailInput.className).to.contain('user-valid');
-          expect(usernameInput.className).to.contain('user-valid');
-          expect(form.className).to.contain('user-valid');
-        });
-      });
 
-      it('should propagates user-valid only when going from invalid', () => {
-        setReportValiditySupportedForTesting(false);
-        return getAmpForm(getForm(/*button1*/ true)).then(ampForm => {
-          const form = ampForm.form_;
-          const fieldset = createElement('fieldset');
           const emailInput = createElement('input');
           emailInput.setAttribute('name', 'email');
+          emailInput.setAttribute('id', 'email1');
           emailInput.setAttribute('type', 'email');
           emailInput.setAttribute('required', '');
+          emailInput.setAttribute('value', '');
           fieldset.appendChild(emailInput);
+
+          const validationMessage = createElement('span');
+          validationMessage.setAttribute(
+            'visible-when-invalid',
+            'valueMissing'
+          );
+          validationMessage.setAttribute('validation-for', 'email1');
+          fieldset.appendChild(validationMessage);
+
           form.appendChild(fieldset);
-          sandbox.spy(form, 'checkValidity');
-          sandbox.spy(emailInput, 'checkValidity');
-          sandbox.spy(fieldset, 'checkValidity');
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
 
-          emailInput.value = 'cool@bea.ns';
-          checkUserValidityAfterInteraction_(emailInput);
+          return getAmpForm(form).then(ampForm => {
+            // trigger form validations
+            ampForm.checkValidity_();
+            const formValidator = ampForm.validator_;
+            // show validity message
+            formValidator.report();
 
-          expect(emailInput.checkValidity).to.be.called;
-          expect(form.checkValidity).to.not.be.called;
-          expect(fieldset.checkValidity).to.not.be.called;
-          expect(emailInput.className).to.contain('user-valid');
-          expect(form.className).to.not.contain('user-valid');
-        });
-      });
-    });
-
-    it('should install action handler and handle submit action', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-      const actions = Services.actionServiceForDoc(form);
-
-      sandbox.stub(actions, 'installActionHandler');
-      const ampForm = new AmpForm(form);
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-
-      expect(actions.installActionHandler).to.be.calledWith(form);
-      sandbox.spy(ampForm, 'handleSubmitAction_');
-      ampForm.actionHandler_({method: 'anything', satisfiesTrust: () => true});
-      expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-      ampForm.actionHandler_({method: 'submit', satisfiesTrust: () => true});
-
-      return whenCalled(ampForm.xhr_.fetch).then(() => {
-        expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
-        document.body.removeChild(form);
-      });
-    });
-
-    it('should not invoke low-trust action invocations', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-
-      const ampForm = new AmpForm(form);
-      sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-
-      sandbox.spy(ampForm, 'handleSubmitAction_');
-      ampForm.actionHandler_({method: 'submit', satisfiesTrust: () => false});
-      expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-
-      document.body.removeChild(form);
-    });
-
-    it('should handle clear action and restore initial values', () => {
-      const form = getForm();
-      document.body.appendChild(form);
-
-      const emailInput = createElement('input');
-      emailInput.setAttribute('name', 'email');
-      emailInput.setAttribute('id', 'email');
-      emailInput.setAttribute('type', 'email');
-      emailInput.setAttribute('value', 'jack@poc.com');
-      form.appendChild(emailInput);
-
-      return getAmpForm(form).then(ampForm => {
-        const initalFormValues = ampForm.getFormAsObject_();
-
-        ampForm.form_.elements.name.value = 'Jack Sparrow';
-
-        sandbox.spy(ampForm, 'handleClearAction_');
-        ampForm.actionHandler_({
-          method: 'anything',
-          satisfiesTrust: () => true,
-        });
-        expect(ampForm.handleClearAction_).to.have.not.been.called;
-
-        expect(ampForm.getFormAsObject_()).to.not.deep.equal(initalFormValues);
-        ampForm.actionHandler_({method: 'clear', satisfiesTrust: () => true});
-        expect(ampForm.handleClearAction_).to.have.been.called;
-
-        expect(ampForm.getFormAsObject_()).to.deep.equal(initalFormValues);
-      });
-    });
-
-    it('should remove all form state classes when form is cleared', () => {
-      const form = getForm();
-      form.setAttribute('method', 'GET');
-      document.body.appendChild(form);
-
-      form.setAttribute('custom-validation-reporting', 'show-all-on-submit');
-
-      const fieldset = createElement('fieldset');
-      const usernameInput = createElement('input');
-      usernameInput.setAttribute('name', 'username');
-      usernameInput.setAttribute('id', 'username');
-      usernameInput.setAttribute('type', 'text');
-      usernameInput.setAttribute('required', '');
-      usernameInput.setAttribute('value', 'Jack Sparrow');
-      fieldset.appendChild(usernameInput);
-
-      const emailInput = createElement('input');
-      emailInput.setAttribute('name', 'email');
-      emailInput.setAttribute('id', 'email1');
-      emailInput.setAttribute('type', 'email');
-      emailInput.setAttribute('required', '');
-      emailInput.setAttribute('value', '');
-      fieldset.appendChild(emailInput);
-
-      const validationMessage = createElement('span');
-      validationMessage.setAttribute('visible-when-invalid', 'valueMissing');
-      validationMessage.setAttribute('validation-for', 'email1');
-      fieldset.appendChild(validationMessage);
-
-      form.appendChild(fieldset);
-
-      return getAmpForm(form).then(ampForm => {
-        // trigger form validations
-        ampForm.checkValidity_();
-        const formValidator = ampForm.validator_;
-        // show validity message
-        formValidator.report();
-
-        expect(usernameInput.className).to.contain('user-valid');
-        expect(emailInput.className).to.contain('user-invalid');
-        expect(emailInput.className).to.contain('valueMissing');
-        expect(fieldset.className).to.contain('user-valid');
-        expect(ampForm.form_.className).to.contain('user-invalid');
-        expect(validationMessage.className).to.contain('visible');
-
-        ampForm.handleClearAction_();
-
-        expect(usernameInput.className).to.not.contain('user-valid');
-        expect(emailInput.className).to.not.contain('user-invalid');
-        expect(emailInput.className).to.not.contain('valueMissing');
-        expect(fieldset.className).to.not.contain('user-valid');
-        expect(ampForm.form_.className).to.contain('amp-form-initial');
-        expect(validationMessage.className).to.not.contain('visible');
-      });
-    });
-
-    it('should submit after timeout of waiting for amp-selector', function() {
-      expectAsyncConsoleError(/Form submission failed/);
-      this.timeout(3000);
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        const selector = createElement('amp-selector');
-        selector.setAttribute('name', 'color');
-        form.appendChild(selector);
-
-        sandbox.stub(selector, 'whenBuilt')
-            .returns(new Promise(unusedResolve => {}));
-        sandbox.spy(ampForm, 'handleSubmitAction_');
-
-        const submitPromise = ampForm.actionHandler_({
-          method: 'submit',
-          satisfiesTrust: () => true,
-        });
-        expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-        return timer.promise(1).then(() => {
-          expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-          return timer.promise(2000);
-        }).then(() => {
-          expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
-          return submitPromise;
+            expect(usernameInput.className).to.contain('user-valid');
+            expect(emailInput.className).to.contain('user-invalid');
+            expect(emailInput.className).to.contain('valueMissing');
+            expect(fieldset.className).to.contain('user-valid');
+            expect(ampForm.form_.className).to.contain('user-invalid');
+            expect(validationMessage.className).to.contain('visible');
+
+            ampForm.handleClearAction_();
+
+            expect(usernameInput.className).to.not.contain('user-valid');
+            expect(emailInput.className).to.not.contain('user-invalid');
+            expect(emailInput.className).to.not.contain('valueMissing');
+            expect(fieldset.className).to.not.contain('user-valid');
+            expect(ampForm.form_.className).to.contain('amp-form-initial');
+            expect(validationMessage.className).to.not.contain('visible');
+          });
         });
-      });
-    });
-
-    it('should wait for amp-selector to build before submitting', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        let builtPromiseResolver_;
-        const form = ampForm.form_;
-        const selector = createElement('amp-selector');
-        selector.setAttribute('name', 'color');
-        form.appendChild(selector);
-
-        sandbox.stub(selector, 'whenBuilt').returns(new Promise(resolve => {
-          builtPromiseResolver_ = resolve;
-        }));
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(Promise.resolve());
-        sandbox.spy(ampForm, 'handleSubmitAction_');
 
-        ampForm.actionHandler_({method: 'submit', satisfiesTrust: () => true});
-        expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-        return timer.promise(1).then(() => {
-          expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-          return timer.promise(100);
-        }).then(() => {
-          expect(ampForm.handleSubmitAction_).to.have.not.been.called;
-          builtPromiseResolver_();
-          return timer.promise(1);
-        }).then(() => {
-          expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
-        });
-      });
-    });
-
-    describe('Var Substitution', () => {
-      it('should substitute hidden fields variables in XHR async', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          const clientIdField = createElement('input');
-          clientIdField.setAttribute('name', 'clientId');
-          clientIdField.setAttribute('type', 'hidden');
-          clientIdField.value = 'CLIENT_ID(form)';
-          clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
-          form.appendChild(clientIdField);
-          const canonicalUrlField = createElement('input');
-          canonicalUrlField.setAttribute('name', 'clientId');
-          canonicalUrlField.setAttribute('type', 'hidden');
-          canonicalUrlField.value = 'CANONICAL_URL';
-          canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
-          form.appendChild(canonicalUrlField);
-
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          sandbox.stub(ampForm, 'handleSubmitSuccess_');
-          sandbox.spy(ampForm.urlReplacement_, 'expandInputValueAsync');
-          sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
-
-          const submitPromise = ampForm.submit_(ActionTrust.HIGH);
-          expect(ampForm.xhr_.fetch).to.have.not.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.not.have.been.called;
-
-          submitPromise.then(() => {
-            expect(ampForm.urlReplacement_.expandInputValueAsync)
-                .to.have.been.calledTwice;
-            expect(ampForm.urlReplacement_.expandInputValueAsync)
-                .to.have.been.calledWith(clientIdField);
-            expect(ampForm.urlReplacement_.expandInputValueAsync)
-                .to.have.been.calledWith(canonicalUrlField);
-            return whenCalled(ampForm.xhr_.fetch).then(() => {
-              expect(ampForm.xhr_.fetch).to.be.called;
-              expect(clientIdField.value).to.match(/amp-.+/);
-              expect(canonicalUrlField.value).to.equal(
-                  'https%3A%2F%2Fexample.com%2Famps.html');
+        it('should submit after timeout of waiting for amp-selector', function() {
+          expectAsyncConsoleError(/Form submission failed/);
+          this.timeout(3000);
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            const selector = createElement('amp-selector');
+            selector.setAttribute('name', 'color');
+            form.appendChild(selector);
+
+            sandbox
+              .stub(selector, 'whenBuilt')
+              .returns(new Promise(unusedResolve => {}));
+            sandbox.spy(ampForm, 'handleSubmitAction_');
+
+            const submitPromise = ampForm.actionHandler_({
+              method: 'submit',
+              satisfiesTrust: () => true,
             });
+            expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+            return timer
+              .promise(1)
+              .then(() => {
+                expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+                return timer.promise(2000);
+              })
+              .then(() => {
+                expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
+                return submitPromise;
+              });
           });
         });
-      });
-
-      it('should send request if vars did not resolve after a timeout', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const expandAsyncStringResolvers = [];
-          const form = ampForm.form_;
-          const clientIdField = createElement('input');
-          clientIdField.setAttribute('name', 'clientId');
-          clientIdField.setAttribute('type', 'hidden');
-          clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
-          clientIdField.value = 'CLIENT_ID(form)';
-          form.appendChild(clientIdField);
-          const canonicalUrlField = createElement('input');
-          canonicalUrlField.setAttribute('name', 'clientId');
-          canonicalUrlField.setAttribute('type', 'hidden');
-          canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
-          canonicalUrlField.value = 'CANONICAL_URL';
-          form.appendChild(canonicalUrlField);
-
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          sandbox.stub(ampForm, 'handleSubmitSuccess_');
-          sandbox.stub(ampForm.urlReplacement_, 'expandInputValueAsync')
-              .returns(new Promise(resolve => {
-                expandAsyncStringResolvers.push(resolve);
-              }));
-          sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
-
-          sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-              .returns(Promise.resolve());
-          const submitPromise = ampForm.submit_(ActionTrust.HIGH);
-
-          expect(ampForm.xhr_.fetch).to.have.not.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.not.have.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledTwice;
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledWith(clientIdField);
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.have.been.calledWith(canonicalUrlField);
 
-          return whenCalled(ampForm.xhr_.fetch).then(() => {
-            expect(ampForm.xhr_.fetch).to.be.called;
-            expect(clientIdField.value).to.equal('CLIENT_ID(form)');
-            expect(canonicalUrlField.value).to.equal('CANONICAL_URL');
+        it('should wait for amp-selector to build before submitting', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            let builtPromiseResolver_;
+            const form = ampForm.form_;
+            const selector = createElement('amp-selector');
+            selector.setAttribute('name', 'color');
+            form.appendChild(selector);
+
+            sandbox.stub(selector, 'whenBuilt').returns(
+              new Promise(resolve => {
+                builtPromiseResolver_ = resolve;
+              })
+            );
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            sandbox.spy(ampForm, 'handleSubmitAction_');
 
-            return submitPromise;
+            ampForm.actionHandler_({
+              method: 'submit',
+              satisfiesTrust: () => true,
+            });
+            expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+            return timer
+              .promise(1)
+              .then(() => {
+                expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+                return timer.promise(100);
+              })
+              .then(() => {
+                expect(ampForm.handleSubmitAction_).to.have.not.been.called;
+                builtPromiseResolver_();
+                return timer.promise(1);
+              })
+              .then(() => {
+                expect(ampForm.handleSubmitAction_).to.have.been.calledOnce;
+              });
           });
         });
-      });
-
-      it('should substitute hidden fields variables ' +
-          'in non-XHR via sync', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-          const clientIdField = createElement('input');
-          clientIdField.setAttribute('name', 'clientId');
-          clientIdField.setAttribute('type', 'hidden');
-          clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
-          clientIdField.value = 'CLIENT_ID(form)';
-          form.appendChild(clientIdField);
-          const canonicalUrlField = createElement('input');
-          canonicalUrlField.setAttribute('name', 'clientId');
-          canonicalUrlField.setAttribute('type', 'hidden');
-          canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
-          canonicalUrlField.value = 'CANONICAL_URL';
-          form.appendChild(canonicalUrlField);
-
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm, 'handleSubmitSuccess_');
-          sandbox.stub(ampForm.urlReplacement_, 'expandInputValueAsync');
-          sandbox.spy(ampForm.urlReplacement_, 'expandInputValueSync');
-
-          sandbox.stub(ampForm, 'handleNonXhrGet_')
-              .returns(Promise.resolve());
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          expect(ampForm.urlReplacement_.expandInputValueAsync)
-              .to.not.have.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.have.been.called;
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.have.been.calledWith(clientIdField);
-          expect(ampForm.urlReplacement_.expandInputValueSync)
-              .to.have.been.calledWith(canonicalUrlField);
-
-          return whenCalled(ampForm.handleNonXhrGet_).then(() => {
-            expect(form.submit).to.not.have.been.called;
-            expect(clientIdField.value).to.equal('');
-            expect(canonicalUrlField.value).to.equal(
-                'https%3A%2F%2Fexample.com%2Famps.html');
 
-            return submitActionPromise;
+        describe('Var Substitution', () => {
+          it('should substitute hidden fields variables in XHR async', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
+              const clientIdField = createElement('input');
+              clientIdField.setAttribute('name', 'clientId');
+              clientIdField.setAttribute('type', 'hidden');
+              clientIdField.value = 'CLIENT_ID(form)';
+              clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
+              form.appendChild(clientIdField);
+              const canonicalUrlField = createElement('input');
+              canonicalUrlField.setAttribute('name', 'clientId');
+              canonicalUrlField.setAttribute('type', 'hidden');
+              canonicalUrlField.value = 'CANONICAL_URL';
+              canonicalUrlField.setAttribute(
+                'data-amp-replace',
+                'CANONICAL_URL'
+              );
+              form.appendChild(canonicalUrlField);
+
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              sandbox.stub(ampForm, 'handleSubmitSuccess_');
+              sandbox.spy(ampForm.urlReplacement_, 'expandInputValueAsync');
+              sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
+
+              const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+              expect(ampForm.xhr_.fetch).to.have.not.been.called;
+              expect(ampForm.urlReplacement_.expandInputValueSync).to.not.have
+                .been.called;
+
+              submitPromise.then(() => {
+                expect(ampForm.urlReplacement_.expandInputValueAsync).to.have
+                  .been.calledTwice;
+                expect(
+                  ampForm.urlReplacement_.expandInputValueAsync
+                ).to.have.been.calledWith(clientIdField);
+                expect(
+                  ampForm.urlReplacement_.expandInputValueAsync
+                ).to.have.been.calledWith(canonicalUrlField);
+                return whenCalled(ampForm.xhr_.fetch).then(() => {
+                  expect(ampForm.xhr_.fetch).to.be.called;
+                  expect(clientIdField.value).to.match(/amp-.+/);
+                  expect(canonicalUrlField.value).to.equal(
+                    'https%3A%2F%2Fexample.com%2Famps.html'
+                  );
+                });
+              });
+            });
           });
-        });
-      });
-    });
-
-    describes.fakeWin('XHR', {
-      amp: {
-        ampdoc: 'single',
-      },
-      win: {
-        location: 'https://example.com',
-        top: {
-          location: 'https://example-top.com',
-        },
-      },
-    }, () => {
-      let form;
-      let ampForm;
-      let redirectToValue;
-      const headersMock = {
-        get: header => {
-          if (header == 'AMP-Redirect-To') {
-            return redirectToValue;
-          }
-        },
-      };
-      const fetchResolvePromise = Promise.resolve({
-        json: () => Promise.resolve(),
-        headers: headersMock,
-      });
-      const error = new Error('Error');
-      error.response = {
-        headers: headersMock,
-        json() {
-          return Promise.resolve();
-        },
-      };
-      const fetchRejectPromise = Promise.reject(error);
-      fetchRejectPromise.catch(() => {
-        // Just avoiding a global uncaught promise exception.
-      });
-      let navigateTo;
-
-      beforeEach(() => {
-        form = getForm();
-        document.body.appendChild(form);
-        sandbox.stub(form, 'checkValidity').returns(true);
-        ampForm = new AmpForm(form);
-        ampForm.target_ = '_top';
-
-        navigateTo = sandbox.spy();
-        sandbox.stub(Services, 'navigationForDoc').returns({navigateTo});
-        sandbox.stub(ampForm.ssrTemplateHelper_, 'isSupported').returns(false);
-      });
-
-      describe('AMP-Redirect-To', () => {
-        it('should redirect users if header is set', () => {
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchResolvePromise);
-          redirectToValue = 'https://google.com/';
-
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          expect(navigateTo).to.not.be.called;
 
-          return submitActionPromise.then(() => {
-            expect(navigateTo).to.be.calledOnce;
-            const {args} = navigateTo.firstCall;
-            expect(args[1]).to.equal('https://google.com/');
-            expect(args[2]).to.equal('AMP-Redirect-To');
+          it('should send request if vars did not resolve after a timeout', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const expandAsyncStringResolvers = [];
+              const form = ampForm.form_;
+              const clientIdField = createElement('input');
+              clientIdField.setAttribute('name', 'clientId');
+              clientIdField.setAttribute('type', 'hidden');
+              clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
+              clientIdField.value = 'CLIENT_ID(form)';
+              form.appendChild(clientIdField);
+              const canonicalUrlField = createElement('input');
+              canonicalUrlField.setAttribute('name', 'clientId');
+              canonicalUrlField.setAttribute('type', 'hidden');
+              canonicalUrlField.setAttribute(
+                'data-amp-replace',
+                'CANONICAL_URL'
+              );
+              canonicalUrlField.value = 'CANONICAL_URL';
+              form.appendChild(canonicalUrlField);
+
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              sandbox.stub(ampForm, 'handleSubmitSuccess_');
+              sandbox
+                .stub(ampForm.urlReplacement_, 'expandInputValueAsync')
+                .returns(
+                  new Promise(resolve => {
+                    expandAsyncStringResolvers.push(resolve);
+                  })
+                );
+              sandbox.stub(ampForm.urlReplacement_, 'expandInputValueSync');
+
+              sandbox
+                .stub(ampForm, 'handleXhrSubmitSuccess_')
+                .returns(Promise.resolve());
+              const submitPromise = ampForm.submit_(ActionTrust.HIGH);
+
+              expect(ampForm.xhr_.fetch).to.have.not.been.called;
+              expect(ampForm.urlReplacement_.expandInputValueSync).to.not.have
+                .been.called;
+              expect(ampForm.urlReplacement_.expandInputValueAsync).to.have.been
+                .calledTwice;
+              expect(
+                ampForm.urlReplacement_.expandInputValueAsync
+              ).to.have.been.calledWith(clientIdField);
+              expect(
+                ampForm.urlReplacement_.expandInputValueAsync
+              ).to.have.been.calledWith(canonicalUrlField);
+
+              return whenCalled(ampForm.xhr_.fetch).then(() => {
+                expect(ampForm.xhr_.fetch).to.be.called;
+                expect(clientIdField.value).to.equal('CLIENT_ID(form)');
+                expect(canonicalUrlField.value).to.equal('CANONICAL_URL');
+
+                return submitPromise;
+              });
+            });
           });
-        });
-
-        it('should fail to redirect to non-secure urls', () => {
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchResolvePromise);
-          redirectToValue = 'http://google.com/';
 
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          // Make it a sync error for testing convenience
-          sandbox.stub(user(), 'assert').throws();
-
-          return submitActionPromise.then(() => {
-            assert.fail('Submit should have failed.');
-          }, () => {
-            expect(navigateTo).to.not.be.called;
-          });
+          it(
+            'should substitute hidden fields variables ' +
+              'in non-XHR via sync',
+            () => {
+              return getAmpForm(getForm()).then(ampForm => {
+                const form = ampForm.form_;
+                ampForm.method_ = 'GET';
+                ampForm.xhrAction_ = null;
+                const clientIdField = createElement('input');
+                clientIdField.setAttribute('name', 'clientId');
+                clientIdField.setAttribute('type', 'hidden');
+                clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
+                clientIdField.value = 'CLIENT_ID(form)';
+                form.appendChild(clientIdField);
+                const canonicalUrlField = createElement('input');
+                canonicalUrlField.setAttribute('name', 'clientId');
+                canonicalUrlField.setAttribute('type', 'hidden');
+                canonicalUrlField.setAttribute(
+                  'data-amp-replace',
+                  'CANONICAL_URL'
+                );
+                canonicalUrlField.value = 'CANONICAL_URL';
+                form.appendChild(canonicalUrlField);
+
+                sandbox.stub(form, 'submit');
+                sandbox.stub(form, 'checkValidity').returns(true);
+                sandbox.stub(ampForm, 'handleSubmitSuccess_');
+                sandbox.stub(ampForm.urlReplacement_, 'expandInputValueAsync');
+                sandbox.spy(ampForm.urlReplacement_, 'expandInputValueSync');
+
+                sandbox
+                  .stub(ampForm, 'handleNonXhrGet_')
+                  .returns(Promise.resolve());
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                expect(ampForm.urlReplacement_.expandInputValueAsync).to.not
+                  .have.been.called;
+                expect(ampForm.urlReplacement_.expandInputValueSync).to.have
+                  .been.called;
+                expect(
+                  ampForm.urlReplacement_.expandInputValueSync
+                ).to.have.been.calledWith(clientIdField);
+                expect(
+                  ampForm.urlReplacement_.expandInputValueSync
+                ).to.have.been.calledWith(canonicalUrlField);
+
+                return whenCalled(ampForm.handleNonXhrGet_).then(() => {
+                  expect(form.submit).to.not.have.been.called;
+                  expect(clientIdField.value).to.equal('');
+                  expect(canonicalUrlField.value).to.equal(
+                    'https%3A%2F%2Fexample.com%2Famps.html'
+                  );
+
+                  return submitActionPromise;
+                });
+              });
+            }
+          );
         });
 
-        it('should fail to redirect to non-absolute urls', () => {
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchResolvePromise);
-          redirectToValue = '/hello';
+        describes.fakeWin(
+          'XHR',
+          {
+            amp: {
+              ampdoc: 'single',
+            },
+            win: {
+              location: 'https://example.com',
+              top: {
+                location: 'https://example-top.com',
+              },
+            },
+          },
+          () => {
+            let form;
+            let ampForm;
+            let redirectToValue;
+            const headersMock = {
+              get: header => {
+                if (header == 'AMP-Redirect-To') {
+                  return redirectToValue;
+                }
+              },
+            };
+            const fetchResolvePromise = Promise.resolve({
+              json: () => Promise.resolve(),
+              headers: headersMock,
+            });
+            const error = new Error('Error');
+            error.response = {
+              headers: headersMock,
+              json() {
+                return Promise.resolve();
+              },
+            };
+            const fetchRejectPromise = Promise.reject(error);
+            fetchRejectPromise.catch(() => {
+              // Just avoiding a global uncaught promise exception.
+            });
+            let navigateTo;
+
+            beforeEach(() => {
+              form = getForm();
+              document.body.appendChild(form);
+              sandbox.stub(form, 'checkValidity').returns(true);
+              ampForm = new AmpForm(form);
+              ampForm.target_ = '_top';
+
+              navigateTo = sandbox.spy();
+              sandbox.stub(Services, 'navigationForDoc').returns({navigateTo});
+              sandbox
+                .stub(ampForm.ssrTemplateHelper_, 'isSupported')
+                .returns(false);
+            });
 
+            describe('AMP-Redirect-To', () => {
+              it('should redirect users if header is set', () => {
+                sandbox
+                  .stub(ampForm.xhr_, 'fetch')
+                  .returns(fetchResolvePromise);
+                redirectToValue = 'https://google.com/';
+
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                expect(navigateTo).to.not.be.called;
+
+                return submitActionPromise.then(() => {
+                  expect(navigateTo).to.be.calledOnce;
+                  const {args} = navigateTo.firstCall;
+                  expect(args[1]).to.equal('https://google.com/');
+                  expect(args[2]).to.equal('AMP-Redirect-To');
+                });
+              });
 
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          // Make it a sync error for testing convenience
-          sandbox.stub(user(), 'assert').throws();
+              it('should fail to redirect to non-secure urls', () => {
+                sandbox
+                  .stub(ampForm.xhr_, 'fetch')
+                  .returns(fetchResolvePromise);
+                redirectToValue = 'http://google.com/';
+
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                // Make it a sync error for testing convenience
+                sandbox.stub(user(), 'assert').throws();
+
+                return submitActionPromise.then(
+                  () => {
+                    assert.fail('Submit should have failed.');
+                  },
+                  () => {
+                    expect(navigateTo).to.not.be.called;
+                  }
+                );
+              });
 
-          return submitActionPromise.then(() => {
-            assert.fail('Submit should have failed.');
-          }, () => {
-            expect(navigateTo).to.not.be.called;
-          });
-        });
+              it('should fail to redirect to non-absolute urls', () => {
+                sandbox
+                  .stub(ampForm.xhr_, 'fetch')
+                  .returns(fetchResolvePromise);
+                redirectToValue = '/hello';
+
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                // Make it a sync error for testing convenience
+                sandbox.stub(user(), 'assert').throws();
+
+                return submitActionPromise.then(
+                  () => {
+                    assert.fail('Submit should have failed.');
+                  },
+                  () => {
+                    expect(navigateTo).to.not.be.called;
+                  }
+                );
+              });
 
-        it('should fail to redirect to when target != _top', () => {
-          ampForm.target_ = '_blank';
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchResolvePromise);
-          redirectToValue = 'http://google.com/';
+              it('should fail to redirect to when target != _top', () => {
+                ampForm.target_ = '_blank';
+                sandbox
+                  .stub(ampForm.xhr_, 'fetch')
+                  .returns(fetchResolvePromise);
+                redirectToValue = 'http://google.com/';
+
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                // Make it a sync error for testing convenience
+                sandbox.stub(user(), 'assert').throws();
+
+                return submitActionPromise.then(
+                  () => {
+                    assert.fail('Submit should have failed.');
+                  },
+                  () => {
+                    expect(navigateTo).to.not.be.called;
+                  }
+                );
+              });
 
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          // Make it a sync error for testing convenience
-          sandbox.stub(user(), 'assert').throws();
+              it('should redirect on error and header is set', () => {
+                sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchRejectPromise);
+                redirectToValue = 'https://example2.com/hello';
+                const logSpy = sandbox.stub(user(), 'error');
+
+                const submitActionPromise = ampForm.handleSubmitAction_(
+                  /* invocation */ {}
+                );
+                expect(navigateTo).to.not.be.called;
+
+                return submitActionPromise.then(() => {
+                  expect(logSpy).to.be.calledOnce;
+                  const error = logSpy.getCall(0).args[1];
+                  expect(error).to.match(/Form submission failed/);
+
+                  expect(navigateTo).to.be.calledOnce;
+                  const {args} = navigateTo.firstCall;
+                  expect(args[1]).to.equal('https://example2.com/hello');
+                  expect(args[2]).to.equal('AMP-Redirect-To');
+                });
+              });
+            });
+          }
+        );
 
-          return submitActionPromise.then(() => {
-            assert.fail('Submit should have failed.');
-          }, () => {
-            expect(navigateTo).to.not.be.called;
-          });
-        });
+        describe('non-XHR GET', () => {
+          it('should execute form submit when not triggered through event', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
 
-        it('should redirect on error and header is set', () => {
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(fetchRejectPromise);
-          redirectToValue = 'https://example2.com/hello';
-          const logSpy = sandbox.stub(user(), 'error');
+              // Non XHR Get
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
+              sandbox.stub(form, 'submit');
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
 
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
-          expect(navigateTo).to.not.be.called;
+              sandbox
+                .stub(ampForm, 'handleXhrSubmitSuccess_')
+                .returns(Promise.resolve());
+              const submitActionPromise = ampForm.handleSubmitAction_(
+                /* invocation */ {}
+              );
 
-          return submitActionPromise.then(() => {
-            expect(logSpy).to.be.calledOnce;
-            const error = logSpy.getCall(0).args[1];
-            expect(error).to.match(/Form submission failed/);
+              expect(form.submit).to.have.been.called;
 
-            expect(navigateTo).to.be.calledOnce;
-            const {args} = navigateTo.firstCall;
-            expect(args[1]).to.equal('https://example2.com/hello');
-            expect(args[2]).to.equal('AMP-Redirect-To');
+              return submitActionPromise;
+            });
           });
-        });
-      });
-    });
-
-    describe('non-XHR GET', () => {
-      it('should execute form submit when not triggered through event', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-
-          // Non XHR Get
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-
-          sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-              .returns(Promise.resolve());
-          const submitActionPromise =
-            ampForm.handleSubmitAction_(/* invocation */ {});
 
-          expect(form.submit).to.have.been.called;
-
-          return submitActionPromise;
-        });
-      });
-
-      it('should not execute form submit when triggered through event', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          const event = {
-            stopImmediatePropagation: sandbox.spy(),
-            target: form,
-            preventDefault: sandbox.spy(),
-          };
-          return ampForm.handleSubmitEvent_(event).then(() => {
-            expect(form.submit).to.have.not.been.called;
+          it('should not execute form submit when triggered through event', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              const form = ampForm.form_;
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
+              sandbox.stub(form, 'submit');
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              const event = {
+                stopImmediatePropagation: sandbox.spy(),
+                target: form,
+                preventDefault: sandbox.spy(),
+              };
+              return ampForm.handleSubmitEvent_(event).then(() => {
+                expect(form.submit).to.have.not.been.called;
+              });
+            });
           });
-        });
-      });
-
-      it('should not execute form submit with password field present', () => {
-        const form = getForm();
-        const input = createElement('input');
-        input.type = 'password';
-        form.appendChild(input);
-
-        return getAmpForm(form).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          allowConsoleError(() => {
-            expect(() => ampForm.handleSubmitAction_(/* invocation */ {}))
-                .to.throw('input[type=password]');
+
+          it('should not execute form submit with password field present', () => {
+            const form = getForm();
+            const input = createElement('input');
+            input.type = 'password';
+            form.appendChild(input);
+
+            return getAmpForm(form).then(ampForm => {
+              const form = ampForm.form_;
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
+              sandbox.stub(form, 'submit');
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              allowConsoleError(() => {
+                expect(() =>
+                  ampForm.handleSubmitAction_(/* invocation */ {})
+                ).to.throw('input[type=password]');
+              });
+              expect(form.submit).to.have.not.been.called;
+            });
           });
-          expect(form.submit).to.have.not.been.called;
-        });
-      });
-
-      it('should not execute form submit with file field present', () => {
-        const form = getForm();
-        const input = createElement('input');
-        input.type = 'file';
-        form.appendChild(input);
-
-        return getAmpForm(form).then(ampForm => {
-          const form = ampForm.form_;
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-          sandbox.stub(form, 'submit');
-          sandbox.stub(form, 'checkValidity').returns(true);
-          sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-          allowConsoleError(() => {
-            expect(() => ampForm.handleSubmitAction_(/* invocation */ {}))
-                .to.throw('input[type=file]');
+
+          it('should not execute form submit with file field present', () => {
+            const form = getForm();
+            const input = createElement('input');
+            input.type = 'file';
+            form.appendChild(input);
+
+            return getAmpForm(form).then(ampForm => {
+              const form = ampForm.form_;
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
+              sandbox.stub(form, 'submit');
+              sandbox.stub(form, 'checkValidity').returns(true);
+              sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+              allowConsoleError(() => {
+                expect(() =>
+                  ampForm.handleSubmitAction_(/* invocation */ {})
+                ).to.throw('input[type=file]');
+              });
+              expect(form.submit).to.have.not.been.called;
+            });
           });
-          expect(form.submit).to.have.not.been.called;
         });
-      });
-    });
-
-    it('should trigger amp-form-submit analytics event with form data', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        form.id = 'registration';
-
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('value', 'j@hnmiller.com');
-        form.appendChild(emailInput);
-
-        const unnamedInput = createElement('input');
-        unnamedInput.setAttribute('type', 'text');
-        unnamedInput.setAttribute('value', 'unnamed');
-        form.appendChild(unnamedInput);
-
-        // Non XHR Get
-        ampForm.method_ = 'GET';
-        ampForm.xhrAction_ = null;
-        sandbox.stub(form, 'submit');
-        sandbox.stub(form, 'checkValidity').returns(true);
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-        sandbox.stub(ampForm, 'analyticsEvent_');
-
-        sandbox.stub(ampForm, 'handleXhrSubmitSuccess_')
-            .returns(Promise.resolve());
-        const submitActionPromise =
-          ampForm.handleSubmitAction_(/* invocation */ {});
-
-        const expectedFormData = {
-          'formId': 'registration',
-          'formFields[name]': 'John Miller',
-          'formFields[email]': 'j@hnmiller.com',
-        };
-        expect(form.submit).to.have.been.called;
-        expect(ampForm.analyticsEvent_).to.be.calledWith(
-            'amp-form-submit',
-            expectedFormData
-        );
 
-        return submitActionPromise;
-      });
-    });
-
-    it('should trigger submit-success analytics event with form data', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        form.id = 'registration';
-
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('value', 'j@hnmiller.com');
-        form.appendChild(emailInput);
-
-        const unnamedInput = createElement('input');
-        unnamedInput.setAttribute('type', 'text');
-        unnamedInput.setAttribute('value', 'unnamed');
-        form.appendChild(unnamedInput);
-
-        let fetchResolver;
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(new Promise(resolve => {
-          fetchResolver = resolve;
-        }));
-        sandbox.stub(ampForm, 'analyticsEvent_');
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-        ampForm.handleSubmitEvent_(event).then(() => {
-          expect(ampForm.state_).to.equal('submitting');
-          fetchResolver({json: () => Promise.resolve()});
-
-          const expectedFormData = {
-            'formId': 'registration',
-            'formFields[name]': 'John Miller',
-            'formFields[email]': 'j@hnmiller.com',
-          };
+        it('should trigger amp-form-submit analytics event with form data', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            form.id = 'registration';
+
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('value', 'j@hnmiller.com');
+            form.appendChild(emailInput);
+
+            const unnamedInput = createElement('input');
+            unnamedInput.setAttribute('type', 'text');
+            unnamedInput.setAttribute('value', 'unnamed');
+            form.appendChild(unnamedInput);
+
+            // Non XHR Get
+            ampForm.method_ = 'GET';
+            ampForm.xhrAction_ = null;
+            sandbox.stub(form, 'submit');
+            sandbox.stub(form, 'checkValidity').returns(true);
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            sandbox.stub(ampForm, 'analyticsEvent_');
+
+            sandbox
+              .stub(ampForm, 'handleXhrSubmitSuccess_')
+              .returns(Promise.resolve());
+            const submitActionPromise = ampForm.handleSubmitAction_(
+              /* invocation */ {}
+            );
 
-          return ampForm.xhrSubmitPromiseForTesting().then(() => {
-            expect(ampForm.state_).to.equal('submit-success');
+            const expectedFormData = {
+              'formId': 'registration',
+              'formFields[name]': 'John Miller',
+              'formFields[email]': 'j@hnmiller.com',
+            };
+            expect(form.submit).to.have.been.called;
             expect(ampForm.analyticsEvent_).to.be.calledWith(
-                'amp-form-submit-success',
-                expectedFormData
-            );
-          }, () => {
-            assert.fail('Submit should have succeeded.');
-          });
-        });
-      });
-    });
-
-    it('should trigger submit-error analytics event with form data', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        form.id = 'registration';
-
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('value', 'j@hnmiller.com');
-        form.appendChild(emailInput);
-
-        const unnamedInput = createElement('input');
-        unnamedInput.setAttribute('type', 'text');
-        unnamedInput.setAttribute('value', 'unnamed');
-        form.appendChild(unnamedInput);
-
-        let fetchRejecter;
-        sandbox.stub(ampForm.xhr_, 'fetch')
-            .returns(new Promise((unusedResolve, reject) => {
-              fetchRejecter = reject;
-            }));
-        sandbox.stub(ampForm, 'analyticsEvent_');
-        const event = {
-          stopImmediatePropagation: sandbox.spy(),
-          target: form,
-          preventDefault: sandbox.spy(),
-        };
-
-        const submitEventPromise = ampForm.handleSubmitEvent_(event);
-        expect(ampForm.state_).to.equal('submitting');
-        fetchRejecter();
-
-        const expectedFormData = {
-          'formId': 'registration',
-          'formFields[name]': 'John Miller',
-          'formFields[email]': 'j@hnmiller.com',
-        };
-
-        return submitEventPromise.then(() => {
-          assert.fail('Submit should have failed.');
-        }, () => {
-          expect(ampForm.state_).to.equal('submit-error');
-          expect(ampForm.analyticsEvent_).to.be.calledWith(
-              'amp-form-submit-error',
+              'amp-form-submit',
               expectedFormData
-          );
-        });
-      });
-    });
-
-    it('should trigger amp-form-submit after variables substitution', () => {
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        form.id = 'registration';
-
-        // Non XHR Get
-        ampForm.method_ = 'GET';
-        ampForm.xhrAction_ = null;
-        const clientIdField = createElement('input');
-        clientIdField.setAttribute('name', 'clientId');
-        clientIdField.setAttribute('type', 'hidden');
-        clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
-        clientIdField.value = 'CLIENT_ID(form)';
-        form.appendChild(clientIdField);
-        const canonicalUrlField = createElement('input');
-        canonicalUrlField.setAttribute('name', 'canonicalUrl');
-        canonicalUrlField.setAttribute('type', 'hidden');
-        canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
-        canonicalUrlField.value = 'CANONICAL_URL';
-        form.appendChild(canonicalUrlField);
-
-        sandbox.stub(form, 'submit');
-        sandbox.stub(form, 'checkValidity').returns(true);
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
-        sandbox.stub(ampForm.urlReplacement_, 'expandInputValueAsync');
-        sandbox.spy(ampForm.urlReplacement_, 'expandInputValueSync');
-        sandbox.stub(ampForm, 'analyticsEvent_');
-        ampForm.handleSubmitAction_(/* invocation */ {});
-
-        const expectedFormData = {
-          'formId': 'registration',
-          'formFields[name]': 'John Miller',
-          'formFields[canonicalUrl]': 'https%3A%2F%2Fexample.com%2Famps.html',
-          'formFields[clientId]': '',
-        };
-        expect(ampForm.analyticsEvent_).to.be.calledWith(
-            'amp-form-submit',
-            expectedFormData
-        );
-        expect(ampForm.urlReplacement_.expandInputValueAsync)
-            .to.not.have.been.called;
-        expect(ampForm.urlReplacement_.expandInputValueSync)
-            .to.have.been.called;
-        expect(ampForm.urlReplacement_.expandInputValueSync)
-            .to.have.been.calledWith(clientIdField);
-        expect(ampForm.urlReplacement_.expandInputValueSync)
-            .to.have.been.calledWith(canonicalUrlField);
-
-        expect(form.submit).to.have.been.calledOnce;
-        expect(clientIdField.value).to.equal('');
-        expect(canonicalUrlField.value).to.equal(
-            'https%3A%2F%2Fexample.com%2Famps.html');
-      });
-    });
-
-    it('should attach auth token with crossorigin attribute', () => {
-      sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
-          Promise.resolve({
-            getIdTokenPromise: (() => Promise.resolve('idToken')),
-          }));
-      return getAmpForm(getForm()).then(ampForm => {
-        const form = ampForm.form_;
-        form.id = 'registration';
-
-        const emailInput = createElement('input');
-        emailInput.setAttribute('name', 'email');
-        emailInput.setAttribute('type', 'email');
-        emailInput.setAttribute('value', 'j@hnmiller.com');
-        form.appendChild(emailInput);
-
-        const unnamedInput = createElement('input');
-        unnamedInput.setAttribute('type', 'text');
-        unnamedInput.setAttribute('value', 'unnamed');
-        form.appendChild(unnamedInput);
-
-        ampForm.method_ = 'POST';
-        ampForm.form_.setAttribute(
-            'crossorigin', 'amp-viewer-auth-token-via-post');
-        sandbox.stub(ampForm.xhr_, 'fetch').returns(
-            Promise.resolve({json: (() => Promise.resolve())}));
-
-        return ampForm.handleSubmitAction_(/* invocation */ {}).then(() => {
-          return ampForm.xhrSubmitPromiseForTesting().then(() => {
-            expect(Services.viewerAssistanceForDocOrNull).to.be.called;
-            const fetchCallFormData =
-                ampForm.xhr_.fetch.firstCall.args[1].body.getFormData();
-            expect(fetchCallFormData.get('ampViewerAuthToken'))
-                .to.equal('idToken');
-          });
-        });
-      });
-    });
-
-    describe('Async Inputs', () => {
-
-      it('NonXHRGet should submit sync if no Async Input', () => {
-        return getAmpForm(getForm()).then(ampForm => {
-
-          // Make the form a NonXHRGet
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-
-          const assertNoSensitiveFieldsStub =
-            sandbox.stub(ampForm, 'assertNoSensitiveFields_');
+            );
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(assertNoSensitiveFieldsStub).to.be.called;
+            return submitActionPromise;
           });
         });
-      });
 
-      it('NonXHRGet should submit async if Async Input', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, getValueStub} = response;
-
-          // Make the form a NonXHRGet
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
-
-          const formElementSubmitSpy =
-            sandbox.spy(ampForm.form_, 'submit');
-
-          const mockEvent = {
-            preventDefault: () => {},
-          };
-
-          return ampForm.submit_(ActionTrust.HIGH, mockEvent).then(() => {
-            expect(getValueStub).to.be.called;
-            expect(formElementSubmitSpy).to.be.calledOnce;
+        it('should trigger submit-success analytics event with form data', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            form.id = 'registration';
+
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('value', 'j@hnmiller.com');
+            form.appendChild(emailInput);
+
+            const unnamedInput = createElement('input');
+            unnamedInput.setAttribute('type', 'text');
+            unnamedInput.setAttribute('value', 'unnamed');
+            form.appendChild(unnamedInput);
+
+            let fetchResolver;
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              new Promise(resolve => {
+                fetchResolver = resolve;
+              })
+            );
+            sandbox.stub(ampForm, 'analyticsEvent_');
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+            ampForm.handleSubmitEvent_(event).then(() => {
+              expect(ampForm.state_).to.equal('submitting');
+              fetchResolver({json: () => Promise.resolve()});
+
+              const expectedFormData = {
+                'formId': 'registration',
+                'formFields[name]': 'John Miller',
+                'formFields[email]': 'j@hnmiller.com',
+              };
+
+              return ampForm.xhrSubmitPromiseForTesting().then(
+                () => {
+                  expect(ampForm.state_).to.equal('submit-success');
+                  expect(ampForm.analyticsEvent_).to.be.calledWith(
+                    'amp-form-submit-success',
+                    expectedFormData
+                  );
+                },
+                () => {
+                  assert.fail('Submit should have succeeded.');
+                }
+              );
+            });
           });
         });
-      });
 
-      it('should call getValue() on Async Input Elements', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, getValueStub} = response;
-
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(getValueStub).to.be.called;
+        it('should trigger submit-error analytics event with form data', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            form.id = 'registration';
+
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('value', 'j@hnmiller.com');
+            form.appendChild(emailInput);
+
+            const unnamedInput = createElement('input');
+            unnamedInput.setAttribute('type', 'text');
+            unnamedInput.setAttribute('value', 'unnamed');
+            form.appendChild(unnamedInput);
+
+            let fetchRejecter;
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(
+              new Promise((unusedResolve, reject) => {
+                fetchRejecter = reject;
+              })
+            );
+            sandbox.stub(ampForm, 'analyticsEvent_');
+            const event = {
+              stopImmediatePropagation: sandbox.spy(),
+              target: form,
+              preventDefault: sandbox.spy(),
+            };
+
+            const submitEventPromise = ampForm.handleSubmitEvent_(event);
+            expect(ampForm.state_).to.equal('submitting');
+            fetchRejecter();
+
+            const expectedFormData = {
+              'formId': 'registration',
+              'formFields[name]': 'John Miller',
+              'formFields[email]': 'j@hnmiller.com',
+            };
+
+            return submitEventPromise.then(
+              () => {
+                assert.fail('Submit should have failed.');
+              },
+              () => {
+                expect(ampForm.state_).to.equal('submit-error');
+                expect(ampForm.analyticsEvent_).to.be.calledWith(
+                  'amp-form-submit-error',
+                  expectedFormData
+                );
+              }
+            );
           });
         });
-      });
 
-      it('should create a hidden input for Async Input Elements,' +
-        'with the correct name attribute', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, asyncInput} = response;
-
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
+        it('should trigger amp-form-submit after variables substitution', () => {
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            form.id = 'registration';
+
+            // Non XHR Get
+            ampForm.method_ = 'GET';
+            ampForm.xhrAction_ = null;
+            const clientIdField = createElement('input');
+            clientIdField.setAttribute('name', 'clientId');
+            clientIdField.setAttribute('type', 'hidden');
+            clientIdField.setAttribute('data-amp-replace', 'CLIENT_ID');
+            clientIdField.value = 'CLIENT_ID(form)';
+            form.appendChild(clientIdField);
+            const canonicalUrlField = createElement('input');
+            canonicalUrlField.setAttribute('name', 'canonicalUrl');
+            canonicalUrlField.setAttribute('type', 'hidden');
+            canonicalUrlField.setAttribute('data-amp-replace', 'CANONICAL_URL');
+            canonicalUrlField.value = 'CANONICAL_URL';
+            form.appendChild(canonicalUrlField);
+
+            sandbox.stub(form, 'submit');
+            sandbox.stub(form, 'checkValidity').returns(true);
+            sandbox.stub(ampForm.xhr_, 'fetch').returns(Promise.resolve());
+            sandbox.stub(ampForm.urlReplacement_, 'expandInputValueAsync');
+            sandbox.spy(ampForm.urlReplacement_, 'expandInputValueSync');
+            sandbox.stub(ampForm, 'analyticsEvent_');
+            ampForm.handleSubmitAction_(/* invocation */ {});
 
-            const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
-            const hiddenInput = ampForm.form_
-                .querySelector(`input[hidden][name=${name}]`);
-            expect(hiddenInput).to.be.ok;
+            const expectedFormData = {
+              'formId': 'registration',
+              'formFields[name]': 'John Miller',
+              'formFields[canonicalUrl]':
+                'https%3A%2F%2Fexample.com%2Famps.html',
+              'formFields[clientId]': '',
+            };
+            expect(ampForm.analyticsEvent_).to.be.calledWith(
+              'amp-form-submit',
+              expectedFormData
+            );
+            expect(ampForm.urlReplacement_.expandInputValueAsync).to.not.have
+              .been.called;
+            expect(ampForm.urlReplacement_.expandInputValueSync).to.have.been
+              .called;
+            expect(
+              ampForm.urlReplacement_.expandInputValueSync
+            ).to.have.been.calledWith(clientIdField);
+            expect(
+              ampForm.urlReplacement_.expandInputValueSync
+            ).to.have.been.calledWith(canonicalUrlField);
+
+            expect(form.submit).to.have.been.calledOnce;
+            expect(clientIdField.value).to.equal('');
+            expect(canonicalUrlField.value).to.equal(
+              'https%3A%2F%2Fexample.com%2Famps.html'
+            );
           });
         });
-      });
-
-      it('should add the resolved value for, ' +
-        'hidden input for Async Input Elements', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, asyncInput, asyncInputValue} = response;
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-
-            const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
-            const hiddenInput = ampForm.form_
-                .querySelector(`input[hidden][name=${name}]`);
-            const value = hiddenInput.getAttribute('value');
-            expect(value).to.be.equal(asyncInputValue);
+        it('should attach auth token with crossorigin attribute', () => {
+          sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
+            Promise.resolve({
+              getIdTokenPromise: () => Promise.resolve('idToken'),
+            })
+          );
+          return getAmpForm(getForm()).then(ampForm => {
+            const form = ampForm.form_;
+            form.id = 'registration';
+
+            const emailInput = createElement('input');
+            emailInput.setAttribute('name', 'email');
+            emailInput.setAttribute('type', 'email');
+            emailInput.setAttribute('value', 'j@hnmiller.com');
+            form.appendChild(emailInput);
+
+            const unnamedInput = createElement('input');
+            unnamedInput.setAttribute('type', 'text');
+            unnamedInput.setAttribute('value', 'unnamed');
+            form.appendChild(unnamedInput);
+
+            ampForm.method_ = 'POST';
+            ampForm.form_.setAttribute(
+              'crossorigin',
+              'amp-viewer-auth-token-via-post'
+            );
+            sandbox
+              .stub(ampForm.xhr_, 'fetch')
+              .returns(Promise.resolve({json: () => Promise.resolve()}));
+
+            return ampForm.handleSubmitAction_(/* invocation */ {}).then(() => {
+              return ampForm.xhrSubmitPromiseForTesting().then(() => {
+                expect(Services.viewerAssistanceForDocOrNull).to.be.called;
+                const fetchCallFormData = ampForm.xhr_.fetch.firstCall.args[1].body.getFormData();
+                expect(fetchCallFormData.get('ampViewerAuthToken')).to.equal(
+                  'idToken'
+                );
+              });
+            });
           });
         });
-      });
 
-      it('should recycle already created ' +
-        'hidden inputs for Async Inputs', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, asyncInput, asyncInputValue, getValueStub} = response;
+        describe('Async Inputs', () => {
+          it('NonXHRGet should submit sync if no Async Input', () => {
+            return getAmpForm(getForm()).then(ampForm => {
+              // Make the form a NonXHRGet
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
 
-          const newAsyncInputValue = 'new-async-input-value';
-          let hiddenInput;
-          let previousHiddenInputCount;
+              const assertNoSensitiveFieldsStub = sandbox.stub(
+                ampForm,
+                'assertNoSensitiveFields_'
+              );
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
+              return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                expect(assertNoSensitiveFieldsStub).to.be.called;
+              });
+            });
+          });
 
-            previousHiddenInputCount = ampForm.form_
-                .querySelectorAll('input[hidden]').length;
-            const name = asyncInput.getAttribute(AsyncInputAttributes.NAME);
-            hiddenInput = ampForm.form_
-                .querySelector(`input[hidden][name=${name}]`);
-            const value = hiddenInput.getAttribute('value');
-            expect(value).to.be.equal(asyncInputValue);
+          it('NonXHRGet should submit async if Async Input', () => {
+            return getAmpFormWithAsyncInput().then(response => {
+              const {ampForm, getValueStub} = response;
 
-            getValueStub.returns(Promise.resolve(newAsyncInputValue));
-            return ampForm.submit_(ActionTrust.HIGH);
-          }).then(() => {
+              // Make the form a NonXHRGet
+              ampForm.method_ = 'GET';
+              ampForm.xhrAction_ = null;
 
-            const totalHiddenInputs = ampForm.form_
-                .querySelectorAll('input[hidden]');
-            expect(totalHiddenInputs.length)
-                .to.be.equal(previousHiddenInputCount);
-            expect(hiddenInput).to.be.ok;
+              const formElementSubmitSpy = sandbox.spy(ampForm.form_, 'submit');
 
-            const newValue = hiddenInput.getAttribute('value');
+              const mockEvent = {
+                preventDefault: () => {},
+              };
 
-            expect(newValue).to.be.equal(newAsyncInputValue);
+              return ampForm.submit_(ActionTrust.HIGH, mockEvent).then(() => {
+                expect(getValueStub).to.be.called;
+                expect(formElementSubmitSpy).to.be.calledOnce;
+              });
+            });
           });
-        });
-      });
-
-      it('should continue submitting when, ' +
-        'Async Input Elements getValue() resolve', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm} = response;
 
-          const handlePresubmitSuccessStub =
-            sandbox.stub(ampForm, 'handlePresubmitSuccess_');
+          it('should call getValue() on Async Input Elements', () => {
+            return getAmpFormWithAsyncInput().then(response => {
+              const {ampForm, getValueStub} = response;
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(handlePresubmitSuccessStub).to.be.called;
+              return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                expect(getValueStub).to.be.called;
+              });
+            });
           });
-        });
-      });
 
-      it('should handle errors when, ' +
-        'AsyncInput Elements getValue() reject', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, getValueStub} = response;
+          it(
+            'should create a hidden input for Async Input Elements,' +
+              'with the correct name attribute',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm, asyncInput} = response;
+
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  const name = asyncInput.getAttribute(
+                    AsyncInputAttributes.NAME
+                  );
+                  const hiddenInput = ampForm.form_.querySelector(
+                    `input[hidden][name=${name}]`
+                  );
+                  expect(hiddenInput).to.be.ok;
+                });
+              });
+            }
+          );
+
+          it(
+            'should add the resolved value for, ' +
+              'hidden input for Async Input Elements',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm, asyncInput, asyncInputValue} = response;
+
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  const name = asyncInput.getAttribute(
+                    AsyncInputAttributes.NAME
+                  );
+                  const hiddenInput = ampForm.form_.querySelector(
+                    `input[hidden][name=${name}]`
+                  );
+                  const value = hiddenInput.getAttribute('value');
+                  expect(value).to.be.equal(asyncInputValue);
+                });
+              });
+            }
+          );
 
-          const getValueError = new Error('amp-async-input-error');
-          getValueStub.returns(Promise.reject(getValueError));
+          it(
+            'should recycle already created ' +
+              'hidden inputs for Async Inputs',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {
+                  ampForm,
+                  asyncInput,
+                  asyncInputValue,
+                  getValueStub,
+                } = response;
+
+                const newAsyncInputValue = 'new-async-input-value';
+                let hiddenInput;
+                let previousHiddenInputCount;
+
+                return ampForm
+                  .submit_(ActionTrust.HIGH)
+                  .then(() => {
+                    previousHiddenInputCount = ampForm.form_.querySelectorAll(
+                      'input[hidden]'
+                    ).length;
+                    const name = asyncInput.getAttribute(
+                      AsyncInputAttributes.NAME
+                    );
+                    hiddenInput = ampForm.form_.querySelector(
+                      `input[hidden][name=${name}]`
+                    );
+                    const value = hiddenInput.getAttribute('value');
+                    expect(value).to.be.equal(asyncInputValue);
+
+                    getValueStub.returns(Promise.resolve(newAsyncInputValue));
+                    return ampForm.submit_(ActionTrust.HIGH);
+                  })
+                  .then(() => {
+                    const totalHiddenInputs = ampForm.form_.querySelectorAll(
+                      'input[hidden]'
+                    );
+                    expect(totalHiddenInputs.length).to.be.equal(
+                      previousHiddenInputCount
+                    );
+                    expect(hiddenInput).to.be.ok;
+
+                    const newValue = hiddenInput.getAttribute('value');
+
+                    expect(newValue).to.be.equal(newAsyncInputValue);
+                  });
+              });
+            }
+          );
 
-          const stub = sandbox.stub(ampForm, 'handleSubmitFailure_');
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(stub).to.be.called;
-            expect(stub).to.be.calledWith(getValueError,
-                {'error': 'amp-async-input-error'});
-          });
-        });
-      });
+          it(
+            'should continue submitting when, ' +
+              'Async Input Elements getValue() resolve',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm} = response;
+
+                const handlePresubmitSuccessStub = sandbox.stub(
+                  ampForm,
+                  'handlePresubmitSuccess_'
+                );
+
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  expect(handlePresubmitSuccessStub).to.be.called;
+                });
+              });
+            }
+          );
 
-      it('should enter the submitting state when, ' +
-        'waiting for Async Input Elements getValue() to resolve', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm} = response;
+          it(
+            'should handle errors when, ' +
+              'AsyncInput Elements getValue() reject',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm, getValueStub} = response;
+
+                const getValueError = new Error('amp-async-input-error');
+                getValueStub.returns(Promise.reject(getValueError));
+
+                const stub = sandbox.stub(ampForm, 'handleSubmitFailure_');
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  expect(stub).to.be.called;
+                  expect(stub).to.be.calledWith(getValueError, {
+                    'error': 'amp-async-input-error',
+                  });
+                });
+              });
+            }
+          );
 
-          const setStateStub = sandbox.stub(ampForm, 'setState_');
+          it(
+            'should enter the submitting state when, ' +
+              'waiting for Async Input Elements getValue() to resolve',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm} = response;
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(setStateStub)
-                .to.be.calledWith('submitting');
-          });
-        });
-      });
+                const setStateStub = sandbox.stub(ampForm, 'setState_');
 
-      it('should enter the initial state when, ' +
-        'No Async Inputs and NonXhrGet', () => {
-        return getAmpForm(getForm()).then(ampForm => {
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  expect(setStateStub).to.be.calledWith('submitting');
+                });
+              });
+            }
+          );
 
-          // Make the form a NonXHRGet
-          ampForm.method_ = 'GET';
-          ampForm.xhrAction_ = null;
+          it(
+            'should enter the initial state when, ' +
+              'No Async Inputs and NonXhrGet',
+            () => {
+              return getAmpForm(getForm()).then(ampForm => {
+                // Make the form a NonXHRGet
+                ampForm.method_ = 'GET';
+                ampForm.xhrAction_ = null;
 
-          const setStateStub = sandbox.stub(ampForm, 'setState_');
+                const setStateStub = sandbox.stub(ampForm, 'setState_');
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(setStateStub)
-                .to.be.calledWith('initial');
-          });
-        });
-      });
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  expect(setStateStub).to.be.calledWith('initial');
+                });
+              });
+            }
+          );
 
-      it('should enter the submit error state when, ' +
-      'Async Input Elements getValue() rejects', () => {
-        return getAmpFormWithAsyncInput().then(response => {
-          const {ampForm, getValueStub} = response;
+          it(
+            'should enter the submit error state when, ' +
+              'Async Input Elements getValue() rejects',
+            () => {
+              return getAmpFormWithAsyncInput().then(response => {
+                const {ampForm, getValueStub} = response;
 
-          const getValueError = new Error('amp-async-input-error');
-          getValueStub.returns(Promise.reject(getValueError));
-          const setStateStub = sandbox.stub(ampForm, 'setState_');
+                const getValueError = new Error('amp-async-input-error');
+                getValueStub.returns(Promise.reject(getValueError));
+                const setStateStub = sandbox.stub(ampForm, 'setState_');
 
-          return ampForm.submit_(ActionTrust.HIGH).then(() => {
-            expect(setStateStub)
-                .to.be.calledWith('submit-error');
-          });
+                return ampForm.submit_(ActionTrust.HIGH).then(() => {
+                  expect(setStateStub).to.be.calledWith('submit-error');
+                });
+              });
+            }
+          );
         });
-      });
-    });
-  });
-});
+      }
+    );
+  }
+);
diff --git a/extensions/amp-form/0.1/test/test-form-proxy.js b/extensions/amp-form/0.1/test/test-form-proxy.js
index c5a39dd9b58e..c6b533d97872 100644
--- a/extensions/amp-form/0.1/test/test-form-proxy.js
+++ b/extensions/amp-form/0.1/test/test-form-proxy.js
@@ -20,279 +20,292 @@ import {
 } from '../form-proxy';
 import {parseUrlDeprecated} from '../../../../src/url';
 
-const PROPS = ['id', 'action', 'method', 'style', 'acceptCharset',
-  'attributes', 'elements', 'children', 'draggable', 'hidden',
-  'autocomplete'];
-
-
-describes.repeated('installFormProxy', {
-  'modern w/o inputs': {},
-  'modern w/inputs': {inputs: true},
-  'legacy w/o inputs': {blacklist: true},
-  'legacy w/ inputs': {blacklist: true, inputs: true},
-  'no EventTarget': {eventTarget: true},
-}, (name, variant) => {
-  let form;
-  let inputs;
-  let sandbox;
-
-  before(() => {
-    sandbox = sinon.sandbox;
-
-    // Stub only to work around the fact that there's no Ampdoc, so the service
-    // cannot be retrieved.
-    // Otherwise this test would barf because `form` is detached.
-    sandbox.stub(Services, 'urlForDoc').returns({
-      parse: parseUrlDeprecated,
-    });
-  });
-
-  after(() => {
-    sandbox.restore();
-  });
-
-  beforeEach(() => {
-    form = document.createElement('form');
-    form.id = 'form1';
-    form.action = 'https://example.org/submit';
-    form.method = 'post';
-    form.setAttribute('accept-charset', 'OTHER');
-
-    // Inputs.
-    if (variant.inputs) {
-      const inputNames = PROPS.slice(0);
-      // Also, add some methods, which are never blacklisted.
-      inputNames.push('getAttribute');
-      inputNames.push('submit');
-      inputs = {};
-      inputNames.forEach(name => {
-        const input = document.createElement('input');
-        input.id = name;
-        form.appendChild(input);
-        inputs[name] = input;
+const PROPS = [
+  'id',
+  'action',
+  'method',
+  'style',
+  'acceptCharset',
+  'attributes',
+  'elements',
+  'children',
+  'draggable',
+  'hidden',
+  'autocomplete',
+];
+
+describes.repeated(
+  'installFormProxy',
+  {
+    'modern w/o inputs': {},
+    'modern w/inputs': {inputs: true},
+    'legacy w/o inputs': {blacklist: true},
+    'legacy w/ inputs': {blacklist: true, inputs: true},
+    'no EventTarget': {eventTarget: true},
+  },
+  (name, variant) => {
+    let form;
+    let inputs;
+    let sandbox;
+
+    before(() => {
+      sandbox = sinon.sandbox;
+
+      // Stub only to work around the fact that there's no Ampdoc, so the service
+      // cannot be retrieved.
+      // Otherwise this test would barf because `form` is detached.
+      sandbox.stub(Services, 'urlForDoc').returns({
+        parse: parseUrlDeprecated,
       });
-    }
-
-    // Test blacklist.
-    if (variant.blacklist) {
-      setBlacklistedPropertiesForTesting(PROPS);
-    }
-
-    const eventTarget = window.EventTarget;
-    if (variant.eventTarget) {
-      window.EventTarget = null;
-    }
-
-    // Install proxy.
-    installFormProxy(form);
-
-    if (eventTarget) {
-      window.EventTarget = eventTarget;
-    }
-  });
-
-  afterEach(() => {
-    delete window.FormProxy;
-    setBlacklistedPropertiesForTesting(null);
-  });
-
-  it('should initialize correctly', () => {
-    expect(form.$p).to.be.ok;
-    expect(form.$p.form_).to.equal(form);
-  });
-
-  it('should NOT proxy consts', () => {
-    expect(form.ELEMENT_NODE).to.equal(1);
-    expect(form.$p.ELEMENT_NODE).to.be.undefined;
-  });
-
-  it('should proxy methods', () => {
-    expect(form.$p.getAttribute('id')).to.equal('form1');
-    expect(form.$p.submit).to.be.a('function');
-    if (inputs) {
-      expect(form.getAttribute).to.equal(inputs.getAttribute);
-      expect(form.submit).to.equal(inputs.submit);
-    } else {
-      expect(form.getAttribute).to.be.a('function');
-      expect(form.getAttribute('id')).to.equal('form1');
-      expect(form.submit).to.be.a('function');
-    }
-  });
-
-  it('should proxy attribute-based properties', () => {
-    expect(form.$p.id).to.equal('form1');
-    expect(form.$p.method).to.equal('post');
-    expect(form.$p.acceptCharset).to.equal('OTHER');
-    if (inputs) {
-      expect(form.id).to.equal(inputs.id);
-      expect(form.method).to.equal(inputs.method);
-      expect(form.acceptCharset).to.equal(inputs.acceptCharset);
-    } else {
-      expect(form.id).to.equal('form1');
-      expect(form.method).to.equal('post');
-      expect(form.acceptCharset).to.equal('OTHER');
-    }
-  });
-
-  it('should proxy attribute-based property writes', () => {
-    form.$p.id = 'form2';
-    expect(form.$p.id).to.equal('form2');
-    expect(form.$p.getAttribute('id')).to.equal('form2');
-    if (inputs) {
-      expect(form.id).to.equal(inputs.id);
-      expect(form.getAttribute).to.equal(inputs.getAttribute);
-    } else {
-      expect(form.id).to.equal('form2');
-      expect(form.getAttribute('id')).to.equal('form2');
-    }
-  });
-
-  it('should proxy draggable attribute', () => {
-    expect(form.$p.draggable).to.be.false;
-
-    form.$p.setAttribute('draggable', 'true');
-    expect(form.$p.draggable).to.be.true;
-
-    form.$p.setAttribute('draggable', 'false');
-    expect(form.$p.draggable).to.be.false;
-
-    form.$p.draggable = true;
-    expect(form.$p.getAttribute('draggable')).to.equal('true');
-
-    form.$p.draggable = false;
-    expect(form.$p.getAttribute('draggable')).to.equal('false');
-  });
-
-  it('should proxy hidden attribute', () => {
-    expect(form.$p.hidden).to.be.false;
-
-    form.$p.setAttribute('hidden', '');
-    expect(form.$p.hidden).to.be.true;
-
-    form.$p.setAttribute('hidden', 'true');
-    expect(form.$p.hidden).to.be.true;
-
-    form.$p.setAttribute('hidden', 'false');
-    expect(form.$p.hidden).to.be.true;
-
-    form.$p.removeAttribute('hidden');
-    expect(form.$p.hidden).to.be.false;
-
-    form.$p.hidden = true;
-    expect(form.$p.getAttribute('hidden')).to.equal('');
-
-    form.$p.hidden = false;
-    expect(form.$p.getAttribute('hidden')).to.be.null;
-  });
-
-  it('should proxy novalidate attribute', () => {
-    expect(form.$p.noValidate).to.be.false;
-
-    form.$p.setAttribute('novalidate', '');
-    expect(form.$p.noValidate).to.be.true;
-
-    form.$p.setAttribute('novalidate', 'true');
-    expect(form.$p.noValidate).to.be.true;
-
-    form.$p.setAttribute('novalidate', 'false');
-    expect(form.$p.noValidate).to.be.true;
-
-    form.$p.removeAttribute('novalidate');
-    expect(form.$p.noValidate).to.be.false;
-
-    form.$p.noValidate = true;
-    expect(form.$p.getAttribute('novalidate')).to.equal('');
-
-    form.$p.noValidate = false;
-    expect(form.$p.getAttribute('novalidate')).to.be.null;
-  });
-
-  it('should proxy autocomplete attribute', () => {
-    // "on" by default.
-    expect(form.$p.autocomplete).to.equal('on');
-
-    form.$p.setAttribute('autocomplete', 'off');
-    expect(form.$p.autocomplete).to.equal('off');
-
-    form.$p.autocomplete = 'on';
-    expect(form.$p.getAttribute('autocomplete')).to.equal('on');
-  });
-
-  it('should proxy action', () => {
-    expect(form.$p.action).to.equal('https://example.org/submit');
-    if (inputs) {
-      expect(form.action).to.equal(inputs.action);
-    } else {
-      expect(form.action).to.equal('https://example.org/submit');
-    }
-
-    // Relative URLs should also work.
-    form.$p.setAttribute('action', 'submit2');
-    expect(form.$p.action).to.match(/http?\:\/\/.*\/submit2/);
-    if (inputs) {
-      expect(form.action).to.equal(inputs.action);
-    } else {
-      expect(form.action).to.match(/http?\:\/\/.*\/submit2/);
-    }
-  });
-
-  it('should proxy style', () => {
-    expect(form.$p.style.display).to.equal('');
-    if (inputs) {
-      expect(form.style).to.equal(inputs.style);
-    } else {
-      expect(form.style.display).to.equal('');
-    }
-
-    form.$p.style.display = 'none';
-    expect(form.$p.style.display).to.equal('none');
-    if (inputs) {
-      expect(form.style).to.equal(inputs.style);
-    } else {
-      expect(form.style.display).to.equal('none');
-    }
-  });
-
-  it('should proxy elements and children', () => {
-    const allInputs = [];
-    if (inputs) {
-      for (const k in inputs) {
-        allInputs.push(inputs[k]);
+    });
+
+    after(() => {
+      sandbox.restore();
+    });
+
+    beforeEach(() => {
+      form = document.createElement('form');
+      form.id = 'form1';
+      form.action = 'https://example.org/submit';
+      form.method = 'post';
+      form.setAttribute('accept-charset', 'OTHER');
+
+      // Inputs.
+      if (variant.inputs) {
+        const inputNames = PROPS.slice(0);
+        // Also, add some methods, which are never blacklisted.
+        inputNames.push('getAttribute');
+        inputNames.push('submit');
+        inputs = {};
+        inputNames.forEach(name => {
+          const input = document.createElement('input');
+          input.id = name;
+          form.appendChild(input);
+          inputs[name] = input;
+        });
       }
-    }
-    const allChildren = allInputs.slice(0);
-    expect(form.$p.elements.length).to.equal(allInputs.length);
-    expect(form.$p.children.length).to.equal(allChildren.length);
-
-    // Create one input and one non-input.
-    const input1 = document.createElement('input');
-    form.$p.appendChild(input1);
-    allInputs.push(input1);
-    allChildren.push(input1);
-    const div1 = document.createElement('div');
-    form.$p.appendChild(div1);
-    allChildren.push(div1);
-
-    expect(form.$p.elements.length).to.equal(allInputs.length);
-    for (let i = 0; i < form.$p.elements.length; i++) {
-      expect(allInputs).to.contain(form.$p.elements[i]);
-    }
-    expect(form.$p.children.length).to.equal(allChildren.length);
-    for (let i = 0; i < form.$p.children.length; i++) {
-      expect(allChildren).to.contain(form.$p.children[i]);
-    }
-  });
-
-  it('should proxy attributes', () => {
-    const iniCount = form.$p.attributes.length;
-    form.$p.setAttribute('other', '');
-    expect(form.$p.attributes.length).to.equal(iniCount + 1);
-    expect(form.$p.attributes['other']).to.be.ok;
-  });
-
-  it('should proxy dataset', () => {
-    expect(form.$p.dataset['other']).to.not.exist;
-    form.$p.setAttribute('data-other', '');
-    expect(form.$p.dataset['other']).to.exist;
-  });
-});
+
+      // Test blacklist.
+      if (variant.blacklist) {
+        setBlacklistedPropertiesForTesting(PROPS);
+      }
+
+      const eventTarget = window.EventTarget;
+      if (variant.eventTarget) {
+        window.EventTarget = null;
+      }
+
+      // Install proxy.
+      installFormProxy(form);
+
+      if (eventTarget) {
+        window.EventTarget = eventTarget;
+      }
+    });
+
+    afterEach(() => {
+      delete window.FormProxy;
+      setBlacklistedPropertiesForTesting(null);
+    });
+
+    it('should initialize correctly', () => {
+      expect(form.$p).to.be.ok;
+      expect(form.$p.form_).to.equal(form);
+    });
+
+    it('should NOT proxy consts', () => {
+      expect(form.ELEMENT_NODE).to.equal(1);
+      expect(form.$p.ELEMENT_NODE).to.be.undefined;
+    });
+
+    it('should proxy methods', () => {
+      expect(form.$p.getAttribute('id')).to.equal('form1');
+      expect(form.$p.submit).to.be.a('function');
+      if (inputs) {
+        expect(form.getAttribute).to.equal(inputs.getAttribute);
+        expect(form.submit).to.equal(inputs.submit);
+      } else {
+        expect(form.getAttribute).to.be.a('function');
+        expect(form.getAttribute('id')).to.equal('form1');
+        expect(form.submit).to.be.a('function');
+      }
+    });
+
+    it('should proxy attribute-based properties', () => {
+      expect(form.$p.id).to.equal('form1');
+      expect(form.$p.method).to.equal('post');
+      expect(form.$p.acceptCharset).to.equal('OTHER');
+      if (inputs) {
+        expect(form.id).to.equal(inputs.id);
+        expect(form.method).to.equal(inputs.method);
+        expect(form.acceptCharset).to.equal(inputs.acceptCharset);
+      } else {
+        expect(form.id).to.equal('form1');
+        expect(form.method).to.equal('post');
+        expect(form.acceptCharset).to.equal('OTHER');
+      }
+    });
+
+    it('should proxy attribute-based property writes', () => {
+      form.$p.id = 'form2';
+      expect(form.$p.id).to.equal('form2');
+      expect(form.$p.getAttribute('id')).to.equal('form2');
+      if (inputs) {
+        expect(form.id).to.equal(inputs.id);
+        expect(form.getAttribute).to.equal(inputs.getAttribute);
+      } else {
+        expect(form.id).to.equal('form2');
+        expect(form.getAttribute('id')).to.equal('form2');
+      }
+    });
+
+    it('should proxy draggable attribute', () => {
+      expect(form.$p.draggable).to.be.false;
+
+      form.$p.setAttribute('draggable', 'true');
+      expect(form.$p.draggable).to.be.true;
+
+      form.$p.setAttribute('draggable', 'false');
+      expect(form.$p.draggable).to.be.false;
+
+      form.$p.draggable = true;
+      expect(form.$p.getAttribute('draggable')).to.equal('true');
+
+      form.$p.draggable = false;
+      expect(form.$p.getAttribute('draggable')).to.equal('false');
+    });
+
+    it('should proxy hidden attribute', () => {
+      expect(form.$p.hidden).to.be.false;
+
+      form.$p.setAttribute('hidden', '');
+      expect(form.$p.hidden).to.be.true;
+
+      form.$p.setAttribute('hidden', 'true');
+      expect(form.$p.hidden).to.be.true;
+
+      form.$p.setAttribute('hidden', 'false');
+      expect(form.$p.hidden).to.be.true;
+
+      form.$p.removeAttribute('hidden');
+      expect(form.$p.hidden).to.be.false;
+
+      form.$p.hidden = true;
+      expect(form.$p.getAttribute('hidden')).to.equal('');
+
+      form.$p.hidden = false;
+      expect(form.$p.getAttribute('hidden')).to.be.null;
+    });
+
+    it('should proxy novalidate attribute', () => {
+      expect(form.$p.noValidate).to.be.false;
+
+      form.$p.setAttribute('novalidate', '');
+      expect(form.$p.noValidate).to.be.true;
+
+      form.$p.setAttribute('novalidate', 'true');
+      expect(form.$p.noValidate).to.be.true;
+
+      form.$p.setAttribute('novalidate', 'false');
+      expect(form.$p.noValidate).to.be.true;
+
+      form.$p.removeAttribute('novalidate');
+      expect(form.$p.noValidate).to.be.false;
+
+      form.$p.noValidate = true;
+      expect(form.$p.getAttribute('novalidate')).to.equal('');
+
+      form.$p.noValidate = false;
+      expect(form.$p.getAttribute('novalidate')).to.be.null;
+    });
+
+    it('should proxy autocomplete attribute', () => {
+      // "on" by default.
+      expect(form.$p.autocomplete).to.equal('on');
+
+      form.$p.setAttribute('autocomplete', 'off');
+      expect(form.$p.autocomplete).to.equal('off');
+
+      form.$p.autocomplete = 'on';
+      expect(form.$p.getAttribute('autocomplete')).to.equal('on');
+    });
+
+    it('should proxy action', () => {
+      expect(form.$p.action).to.equal('https://example.org/submit');
+      if (inputs) {
+        expect(form.action).to.equal(inputs.action);
+      } else {
+        expect(form.action).to.equal('https://example.org/submit');
+      }
+
+      // Relative URLs should also work.
+      form.$p.setAttribute('action', 'submit2');
+      expect(form.$p.action).to.match(/http?\:\/\/.*\/submit2/);
+      if (inputs) {
+        expect(form.action).to.equal(inputs.action);
+      } else {
+        expect(form.action).to.match(/http?\:\/\/.*\/submit2/);
+      }
+    });
+
+    it('should proxy style', () => {
+      expect(form.$p.style.display).to.equal('');
+      if (inputs) {
+        expect(form.style).to.equal(inputs.style);
+      } else {
+        expect(form.style.display).to.equal('');
+      }
+
+      form.$p.style.display = 'none';
+      expect(form.$p.style.display).to.equal('none');
+      if (inputs) {
+        expect(form.style).to.equal(inputs.style);
+      } else {
+        expect(form.style.display).to.equal('none');
+      }
+    });
+
+    it('should proxy elements and children', () => {
+      const allInputs = [];
+      if (inputs) {
+        for (const k in inputs) {
+          allInputs.push(inputs[k]);
+        }
+      }
+      const allChildren = allInputs.slice(0);
+      expect(form.$p.elements.length).to.equal(allInputs.length);
+      expect(form.$p.children.length).to.equal(allChildren.length);
+
+      // Create one input and one non-input.
+      const input1 = document.createElement('input');
+      form.$p.appendChild(input1);
+      allInputs.push(input1);
+      allChildren.push(input1);
+      const div1 = document.createElement('div');
+      form.$p.appendChild(div1);
+      allChildren.push(div1);
+
+      expect(form.$p.elements.length).to.equal(allInputs.length);
+      for (let i = 0; i < form.$p.elements.length; i++) {
+        expect(allInputs).to.contain(form.$p.elements[i]);
+      }
+      expect(form.$p.children.length).to.equal(allChildren.length);
+      for (let i = 0; i < form.$p.children.length; i++) {
+        expect(allChildren).to.contain(form.$p.children[i]);
+      }
+    });
+
+    it('should proxy attributes', () => {
+      const iniCount = form.$p.attributes.length;
+      form.$p.setAttribute('other', '');
+      expect(form.$p.attributes.length).to.equal(iniCount + 1);
+      expect(form.$p.attributes['other']).to.be.ok;
+    });
+
+    it('should proxy dataset', () => {
+      expect(form.$p.dataset['other']).to.not.exist;
+      form.$p.setAttribute('data-other', '');
+      expect(form.$p.dataset['other']).to.exist;
+    });
+  }
+);
diff --git a/extensions/amp-form/0.1/test/test-form-validators.js b/extensions/amp-form/0.1/test/test-form-validators.js
index e179141acce8..4386aea760d3 100644
--- a/extensions/amp-form/0.1/test/test-form-validators.js
+++ b/extensions/amp-form/0.1/test/test-form-validators.js
@@ -54,10 +54,12 @@ describes.realWin('form-validators', {amp: true}, env => {
     [name, email, text, submit].forEach(c => form.appendChild(c));
 
     if (isCustomValidations) {
-      const {noName, noEmail, invalidEmail, invalidText}
-          = getCustomValidations(doc);
-      [noName, noEmail, invalidEmail, invalidText]
-          .forEach(c => doc.body.appendChild(c));
+      const {noName, noEmail, invalidEmail, invalidText} = getCustomValidations(
+        doc
+      );
+      [noName, noEmail, invalidEmail, invalidText].forEach(c =>
+        doc.body.appendChild(c)
+      );
     }
 
     return form;
@@ -124,8 +126,7 @@ describes.realWin('form-validators', {amp: true}, env => {
       setReportValiditySupportedForTesting(true);
       expect(getFormValidator(form)).to.be.instanceOf(DefaultValidator);
       setReportValiditySupportedForTesting(false);
-      expect(getFormValidator(form)).to.be.instanceOf(
-          PolyfillDefaultValidator);
+      expect(getFormValidator(form)).to.be.instanceOf(PolyfillDefaultValidator);
     });
 
     it('should return custom validator instances', () => {
@@ -133,18 +134,16 @@ describes.realWin('form-validators', {amp: true}, env => {
       const form = getForm(doc);
       form.setAttribute('custom-validation-reporting', 'as-you-go');
       expect(getFormValidator(form)).to.be.instanceOf(AsYouGoValidator);
-      form.setAttribute(
-          'custom-validation-reporting', 'show-all-on-submit');
-      expect(getFormValidator(form)).to.be.instanceOf(
-          ShowAllOnSubmitValidator);
-      form.setAttribute(
-          'custom-validation-reporting', 'interact-and-submit');
+      form.setAttribute('custom-validation-reporting', 'show-all-on-submit');
+      expect(getFormValidator(form)).to.be.instanceOf(ShowAllOnSubmitValidator);
+      form.setAttribute('custom-validation-reporting', 'interact-and-submit');
       expect(getFormValidator(form)).to.be.instanceOf(
-          InteractAndSubmitValidator);
-      form.setAttribute(
-          'custom-validation-reporting', 'show-first-on-submit');
+        InteractAndSubmitValidator
+      );
+      form.setAttribute('custom-validation-reporting', 'show-first-on-submit');
       expect(getFormValidator(form)).to.be.instanceOf(
-          ShowFirstOnSubmitValidator);
+        ShowFirstOnSubmitValidator
+      );
     });
   });
 
@@ -247,7 +246,9 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(doc.activeElement).to.equal(form.elements[0]);
       expect(validator.validationBubble_.show).to.be.calledOnce;
       expect(validator.validationBubble_.show).to.be.calledWith(
-          form.elements[0], form.elements[0].validationMessage);
+        form.elements[0],
+        form.elements[0].validationMessage
+      );
     });
 
     it('should hide validation bubble onblur', () => {
@@ -270,7 +271,9 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(validator.validationBubble_.show).to.be.calledOnce;
       expect(validator.validationBubble_.hide).to.not.be.called;
       expect(validator.validationBubble_.show).to.be.calledWith(
-          form.elements[0], form.elements[0].validationMessage);
+        form.elements[0],
+        form.elements[0].validationMessage
+      );
 
       sandbox.stub(validator.validationBubble_, 'isActiveOn').returns(true);
       validator.onInput({target: form.elements[0]});
@@ -372,8 +375,7 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(validations[0].className).to.not.contain('visible');
       expect(validations[1].className).to.not.contain('visible');
       expect(validations[2].className).to.contain('visible');
-      expect(validations[2].textContent).to.not.equal(
-          'Email format is wrong');
+      expect(validations[2].textContent).to.not.equal('Email format is wrong');
       expect(validations[2].textContent).to.equal(emailTypeValidationMsg);
       expect(validations[3].className).to.not.contain('visible');
 
@@ -486,8 +488,7 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(validations[1].className).to.not.contain('visible');
       expect(validations[2].className).to.contain('visible');
       expect(validations[3].className).to.contain('visible');
-      expect(validations[2].textContent).to.not.equal(
-          'Email format is wrong');
+      expect(validations[2].textContent).to.not.equal('Email format is wrong');
       expect(validations[2].textContent).to.equal(emailTypeValidationMsg);
 
       form.elements[1].value = 'valid@email.com';
@@ -569,8 +570,7 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(validations[1].className).to.not.contain('visible');
       expect(validations[2].className).to.contain('visible');
       expect(validations[3].className).to.not.contain('visible');
-      expect(validations[2].textContent).to.not.equal(
-          'Email format is wrong');
+      expect(validations[2].textContent).to.not.equal('Email format is wrong');
       expect(validations[2].textContent).to.equal(emailTypeValidationMsg);
 
       form.elements[1].value = 'valid@email.com';
@@ -662,8 +662,7 @@ describes.realWin('form-validators', {amp: true}, env => {
       expect(validations[1].className).to.not.contain('visible');
       expect(validations[2].className).to.contain('visible');
       expect(validations[3].className).to.not.contain('visible');
-      expect(validations[2].textContent).to.not.equal(
-          'Email format is wrong');
+      expect(validations[2].textContent).to.not.equal('Email format is wrong');
       expect(validations[2].textContent).to.equal(emailTypeValidationMsg);
 
       form.elements[1].value = 'valid@email.com';
@@ -715,10 +714,12 @@ describes.realWin('form-validators', {amp: true}, env => {
       [name, email, submit].forEach(c => form.appendChild(c));
 
       validations.forEach(v => v.parentNode.removeChild(v));
-      const {noName, noEmail, invalidEmail, invalidText}
-          = getCustomValidations(doc);
-      [noName, noEmail, invalidEmail, invalidText]
-          .forEach(c => doc.body.appendChild(c));
+      const {noName, noEmail, invalidEmail, invalidText} = getCustomValidations(
+        doc
+      );
+      [noName, noEmail, invalidEmail, invalidText].forEach(c =>
+        doc.body.appendChild(c)
+      );
       validations = doc.querySelectorAll('[visible-when-invalid]');
 
       // Test that validation still works.
diff --git a/extensions/amp-form/0.1/test/test-form-verifiers.js b/extensions/amp-form/0.1/test/test-form-verifiers.js
index eaf048c50593..58128c88a66a 100644
--- a/extensions/amp-form/0.1/test/test-form-verifiers.js
+++ b/extensions/amp-form/0.1/test/test-form-verifiers.js
@@ -124,35 +124,41 @@ describes.fakeWin('amp-form async verification', {}, env => {
       });
     });
 
-    it('should submit when an element is filled out, mutated, ' +
-          'and committed', () => {
-      const xhrSpy = sandbox.spy(() => Promise.resolve());
-      const form = getForm(env.win.document);
-      const verifier = getFormVerifier(form, xhrSpy);
-
-      form.email.value = 'test@example.com';
-
-      return verifier.onCommit().then(() => {
-        expect(xhrSpy).to.be.calledOnce;
-      });
-    });
-
-    it('should assign an error to elements that the server ' +
-        'fails to verify', () => {
+    it(
+      'should submit when an element is filled out, mutated, ' +
+        'and committed',
+      () => {
+        const xhrSpy = sandbox.spy(() => Promise.resolve());
+        const form = getForm(env.win.document);
+        const verifier = getFormVerifier(form, xhrSpy);
+
+        form.email.value = 'test@example.com';
+
+        return verifier.onCommit().then(() => {
+          expect(xhrSpy).to.be.calledOnce;
+        });
+      }
+    );
+
+    it('should assign an error to elements that the server fails to verify', () => {
       const errorMessage = 'Zip code and city do not match';
       const errorResponse = {
         json() {
           return Promise.resolve({
-            verifyErrors: [{
-              name: 'zip',
-              message: errorMessage,
-            }],
+            verifyErrors: [
+              {
+                name: 'zip',
+                message: errorMessage,
+              },
+            ],
           });
         },
       };
-      const xhrSpy = sandbox.spy(() => Promise.reject({
-        response: errorResponse,
-      }));
+      const xhrSpy = sandbox.spy(() =>
+        Promise.reject({
+          response: errorResponse,
+        })
+      );
       const form = getForm(env.win.document);
       const verifier = getFormVerifier(form, xhrSpy);
 
@@ -164,70 +170,86 @@ describes.fakeWin('amp-form async verification', {}, env => {
       });
     });
 
-    it('should clear errors when any sibling of an input with an error ' +
-        'is mutated', () => {
-      const errorMessage = 'Zip code and city do not match';
-      const errorResponse = {
-        json() {
-          return Promise.resolve({
-            verifyErrors: [{
-              name: 'zip',
-              message: errorMessage,
-            }],
+    it(
+      'should clear errors when any sibling of an input with an error ' +
+        'is mutated',
+      () => {
+        const errorMessage = 'Zip code and city do not match';
+        const errorResponse = {
+          json() {
+            return Promise.resolve({
+              verifyErrors: [
+                {
+                  name: 'zip',
+                  message: errorMessage,
+                },
+              ],
+            });
+          },
+        };
+        const xhrStub = sandbox.stub();
+        xhrStub.onCall(0).returns(Promise.reject({response: errorResponse}));
+        xhrStub.onCall(1).returns(Promise.resolve());
+
+        const form = getForm(env.win.document);
+        const verifier = getFormVerifier(form, xhrStub);
+        form.city.value = 'Palo Alto';
+        form.zip.value = '94043';
+
+        return verifier
+          .onCommit()
+          .then(() => {
+            expect(form.zip.validity.customError).to.be.true;
+            expect(form.zip.validationMessage).to.equal(errorMessage);
+            form.city.value = 'Mountain View';
+            return verifier.onCommit();
+          })
+          .then(() => {
+            expect(form.zip.validity.customError).to.be.false;
+            expect(form.zip.validationMessage).to.be.empty;
           });
-        },
-      };
-      const xhrStub = sandbox.stub();
-      xhrStub.onCall(0).returns(Promise.reject({response: errorResponse}));
-      xhrStub.onCall(1).returns(Promise.resolve());
+      }
+    );
+
+    it(
+      'should not assign verification errors to elements ' +
+        'that are not valid',
+      () => {
+        const zipMessage = 'Zip code and city do not match.';
+        const emailMessage = 'This email is already taken.';
+        const errorResponse = {
+          json() {
+            return Promise.resolve({
+              verifyErrors: [
+                {
+                  name: 'zip',
+                  message: zipMessage,
+                },
+                {
+                  name: 'email',
+                  message: emailMessage,
+                },
+              ],
+            });
+          },
+        };
+        const xhrSpy = sandbox.spy(() =>
+          Promise.reject({
+            response: errorResponse,
+          })
+        );
+        const form = getForm(env.win.document);
+        const verifier = getFormVerifier(form, xhrSpy);
 
-      const form = getForm(env.win.document);
-      const verifier = getFormVerifier(form, xhrStub);
-      form.city.value = 'Palo Alto';
-      form.zip.value = '94043';
-
-      return verifier.onCommit().then(() => {
-        expect(form.zip.validity.customError).to.be.true;
-        expect(form.zip.validationMessage).to.equal(errorMessage);
         form.city.value = 'Mountain View';
-        return verifier.onCommit();
-      }).then(() => {
-        expect(form.zip.validity.customError).to.be.false;
-        expect(form.zip.validationMessage).to.be.empty;
-      });
-    });
-
-    it('should not assign verification errors to elements ' +
-        'that are not valid', () => {
-      const zipMessage = 'Zip code and city do not match.';
-      const emailMessage = 'This email is already taken.';
-      const errorResponse = {
-        json() {
-          return Promise.resolve({
-            verifyErrors: [{
-              name: 'zip',
-              message: zipMessage,
-            },{
-              name: 'email',
-              message: emailMessage,
-            }],
-          });
-        },
-      };
-      const xhrSpy = sandbox.spy(() => Promise.reject({
-        response: errorResponse,
-      }));
-      const form = getForm(env.win.document);
-      const verifier = getFormVerifier(form, xhrSpy);
-
-      form.city.value = 'Mountain View';
-      form.zip.value = '94043';
-      return verifier.onCommit().then(() => {
-        expect(form.zip.validity.customError).to.be.true;
-        expect(form.zip.validationMessage).to.equal(zipMessage);
-        expect(form.email.validity.customError).to.be.false;
-        expect(form.email.validationMessage).to.not.equal(emailMessage);
-      });
-    });
+        form.zip.value = '94043';
+        return verifier.onCommit().then(() => {
+          expect(form.zip.validity.customError).to.be.true;
+          expect(form.zip.validationMessage).to.equal(zipMessage);
+          expect(form.email.validity.customError).to.be.false;
+          expect(form.email.validationMessage).to.not.equal(emailMessage);
+        });
+      }
+    );
   });
 });
diff --git a/extensions/amp-form/0.1/test/test-validation-bubble.js b/extensions/amp-form/0.1/test/test-validation-bubble.js
index eacff250474c..0babf9ca74b4 100644
--- a/extensions/amp-form/0.1/test/test-validation-bubble.js
+++ b/extensions/amp-form/0.1/test/test-validation-bubble.js
@@ -22,8 +22,8 @@ describes.realWin('validation-bubble', {amp: true}, env => {
     const document = ampdoc.getRootNode();
 
     new ValidationBubble(ampdoc);
-    expect(document.querySelector('.i-amphtml-validation-bubble'))
-        .to.not.be.null;
+    expect(document.querySelector('.i-amphtml-validation-bubble')).to.not.be
+      .null;
   });
 
   it('should show and hide bubble', () => {
diff --git a/extensions/amp-form/0.1/validation-bubble.js b/extensions/amp-form/0.1/validation-bubble.js
index d267403d8d62..afa331e04cff 100644
--- a/extensions/amp-form/0.1/validation-bubble.js
+++ b/extensions/amp-form/0.1/validation-bubble.js
@@ -22,7 +22,6 @@ import {setStyles, toggle} from '../../../src/style';
 const OBJ_PROP = '__BUBBLE_OBJ';
 
 export class ValidationBubble {
-
   /**
    * Creates a bubble component to display messages in.
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -76,12 +75,15 @@ export class ValidationBubble {
     this.currentTargetElement_ = null;
     this.currentMessage_ = '';
 
-    this.vsync_.run({
-      measure: undefined,
-      mutate: hideBubble,
-    }, {
-      bubbleElement: this.bubbleElement_,
-    });
+    this.vsync_.run(
+      {
+        measure: undefined,
+        mutate: hideBubble,
+      },
+      {
+        bubbleElement: this.bubbleElement_,
+      }
+    );
   }
 
   /**
@@ -104,14 +106,16 @@ export class ValidationBubble {
       viewport: this.viewport_,
       id: this.id_,
     };
-    this.vsync_.run({
-      measure: measureTargetElement,
-      mutate: showBubbleElement,
-    }, state);
+    this.vsync_.run(
+      {
+        measure: measureTargetElement,
+        mutate: showBubbleElement,
+      },
+      state
+    );
   }
 }
 
-
 /**
  * Hides the bubble element passed through state object.
  * @param {!Object} state
@@ -124,7 +128,6 @@ function hideBubble(state) {
   toggle(state.bubbleElement, false);
 }
 
-
 /**
  * Measures the layout for the target element passed through state object.
  * @param {!Object} state
@@ -134,7 +137,6 @@ function measureTargetElement(state) {
   state.targetRect = state.viewport.getLayoutRect(state.targetElement);
 }
 
-
 /**
  * Updates text content, positions and displays the bubble.
  * @param {!Object} state
diff --git a/extensions/amp-fx-collection/0.1/amp-fx-collection.js b/extensions/amp-fx-collection/0.1/amp-fx-collection.js
index 42662d191ca6..7ac326f6ccc8 100644
--- a/extensions/amp-fx-collection/0.1/amp-fx-collection.js
+++ b/extensions/amp-fx-collection/0.1/amp-fx-collection.js
@@ -38,12 +38,10 @@ const TAG = 'amp-fx-collection';
  * @visibleForTesting
  */
 export class AmpFxCollection {
-
   /**
    * @param  {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
   constructor(ampdoc) {
-
     /** @private @const {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -53,16 +51,15 @@ export class AmpFxCollection {
     /** @private @const {!../../../src/service/viewer-impl.Viewer} */
     this.viewer_ = Services.viewerForDoc(ampdoc);
 
-    Promise.all([
-      ampdoc.whenReady(),
-      this.viewer_.whenFirstVisible(),
-    ]).then(() => {
-      const root = this.ampdoc_.getRootNode();
-      // Scan when page becomes visible.
-      this.scan_();
-      // Rescan as DOM changes happen.
-      listen(root, AmpEvents.DOM_UPDATE, () => this.scan_());
-    });
+    Promise.all([ampdoc.whenReady(), this.viewer_.whenFirstVisible()]).then(
+      () => {
+        const root = this.ampdoc_.getRootNode();
+        // Scan when page becomes visible.
+        this.scan_();
+        // Rescan as DOM changes happen.
+        listen(root, AmpEvents.DOM_UPDATE, () => this.scan_());
+      }
+    );
   }
 
   /**
diff --git a/extensions/amp-fx-collection/0.1/fx-type.js b/extensions/amp-fx-collection/0.1/fx-type.js
index f5458de5c3d4..1a6528ddc1f6 100644
--- a/extensions/amp-fx-collection/0.1/fx-type.js
+++ b/extensions/amp-fx-collection/0.1/fx-type.js
@@ -188,8 +188,11 @@ export function isValidTypeCombination(fxTypeA, fxTypeB) {
  * @return {boolean}
  */
 export function userAssertIsValidType(type) {
-  return userAssert(validFxTypes.indexOf(type) > -1,
-      'Invalid amp-fx type `%s`', type);
+  return userAssert(
+    validFxTypes.indexOf(type) > -1,
+    'Invalid amp-fx type `%s`',
+    type
+  );
 }
 
 /**
@@ -202,17 +205,17 @@ export function userAssertIsValidType(type) {
  */
 export function getFxTypes(element) {
   devAssert(element.hasAttribute('amp-fx'));
-  const fxTypes = element.getAttribute('amp-fx')
-      .trim()
-      .toLowerCase()
-      .split(/\s+/);
+  const fxTypes = element
+    .getAttribute('amp-fx')
+    .trim()
+    .toLowerCase()
+    .split(/\s+/);
 
   userAssert(fxTypes.length, 'No value provided for `amp-fx` attribute');
 
   return sanitizeFxTypes(fxTypes.filter(userAssertIsValidType));
 }
 
-
 /**
  * Removes the conflicting types from an array of fx types.
  * Kept by order.
@@ -230,9 +233,13 @@ export function sanitizeFxTypes(types) {
     for (let j = i + 1; j < types.length; j++) {
       const fxTypeB = types[j];
       if (!isValidTypeCombination(fxTypeA, fxTypeB)) {
-        user().warn(TAG,
-            '%s preset can\'t be combined with %s preset as the resulting ' +
-            'animation isn\'t valid.', fxTypeA, fxTypeB);
+        user().warn(
+          TAG,
+          "%s preset can't be combined with %s preset as the resulting " +
+            "animation isn't valid.",
+          fxTypeA,
+          fxTypeB
+        );
         types.splice(j--, 1);
       }
     }
diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
index 47107940b8ce..89f083b42608 100644
--- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
+++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets-utils.js
@@ -44,9 +44,11 @@ export function convertEasingKeyword(keyword) {
   if (curves[keyword]) {
     return curves[keyword];
   }
-  userAssert(startsWith(keyword, 'cubic-bezier'),
-      'All custom bezier curves should be specified by following the ' +
-        '`cubic-bezier()` function notation.');
+  userAssert(
+    startsWith(keyword, 'cubic-bezier'),
+    'All custom bezier curves should be specified by following the ' +
+      '`cubic-bezier()` function notation.'
+  );
   return keyword;
 }
 
@@ -117,9 +119,15 @@ export function defaultDurationValues(ampdoc, fxType) {
     case FxType.FLY_IN_LEFT:
     case FxType.FLY_IN_RIGHT:
       const {width} = Services.viewportForDoc(ampdoc).getSize();
-      return mapRange(
-          Math.min(1000, width), MAX_MOBILE_WIDTH, MAX_TABLET_WIDTH, 400, 600)
-          + 'ms';
+      return (
+        mapRange(
+          Math.min(1000, width),
+          MAX_MOBILE_WIDTH,
+          MAX_TABLET_WIDTH,
+          400,
+          600
+        ) + 'ms'
+      );
     default:
       return '1ms';
   }
@@ -137,7 +145,8 @@ export function defaultFlyInDistanceValues(ampdoc, fxType) {
     case FxType.FLY_IN_BOTTOM:
     case FxType.FLY_IN_TOP:
       const {width} = Services.viewportForDoc(ampdoc).getSize();
-      if (width < MAX_TABLET_WIDTH) { // mobile and tablets
+      if (width < MAX_TABLET_WIDTH) {
+        // mobile and tablets
         return 25;
       }
       // laptops and desktops
diff --git a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
index f0515db3c232..f658a2ddf106 100644
--- a/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
+++ b/extensions/amp-fx-collection/0.1/providers/amp-fx-presets.js
@@ -51,7 +51,7 @@ function flyIn(fxElement, axis, coeff) {
   // Not using interpolation in the following assignment since closure compiles
   // to a leading, useless empty string.
   const flyInDistanceAsLength =
-      coeff * fxElement.flyInDistance + (axisIsX ? 'vw' : 'vh');
+    coeff * fxElement.flyInDistance + (axisIsX ? 'vw' : 'vh');
 
   // only do this on the first element
   if (!fxElement.initialTrigger) {
@@ -60,9 +60,7 @@ function flyIn(fxElement, axis, coeff) {
       const prop = axisIsX ? 'left' : 'top';
       const propAsLength = style[prop] === 'auto' ? '0px' : style[prop];
       const position =
-          style.position === 'static' ?
-            'relative' :
-            style.position;
+        style.position === 'static' ? 'relative' : style.position;
       const styles = {
         position,
         visibility: 'visible',
@@ -89,9 +87,12 @@ function flyIn(fxElement, axis, coeff) {
 function marginStartAsserts(element) {
   const marginStart = parseFloat(element.getAttribute('data-margin-start'));
   if (marginStart) {
-    userAssert(marginStart >= 0 && marginStart <= 100,
-        'data-margin-start must be a percentage value ' +
-        'and be between 0% and 100% for: %s', element);
+    userAssert(
+      marginStart >= 0 && marginStart <= 100,
+      'data-margin-start must be a percentage value ' +
+        'and be between 0% and 100% for: %s',
+      element
+    );
   }
   return marginStart;
 }
@@ -113,9 +114,11 @@ function topFromPosObsEntryOrNull(entry) {
 function isInViewportForTopAxis(entry, fxElement, coeff) {
   const top = topFromPosObsEntryOrNull(entry);
   devAssert(Math.abs(coeff) == 1);
-  return !!top &&
-    ((top + (coeff * fxElement.viewportHeight * fxElement.flyInDistance / 100))
-      <= (1 - fxElement.marginStart) * fxElement.viewportHeight);
+  return (
+    !!top &&
+    top + (coeff * fxElement.viewportHeight * fxElement.flyInDistance) / 100 <=
+      (1 - fxElement.marginStart) * fxElement.viewportHeight
+  );
 }
 
 /**
@@ -135,12 +138,15 @@ export const Presets = {
   [FxType.PARALLAX]: {
     userAsserts(element) {
       const factorValue = userAssert(
-          element.getAttribute('data-parallax-factor'),
-          'data-parallax-factor=<number> attribute must be provided for: %s',
-          element);
-      userAssert(parseFloat(factorValue) > 0,
-          'data-parallax-factor must be a number and greater than 0 for: %s',
-          element);
+        element.getAttribute('data-parallax-factor'),
+        'data-parallax-factor=<number> attribute must be provided for: %s',
+        element
+      );
+      userAssert(
+        parseFloat(factorValue) > 0,
+        'data-parallax-factor must be a number and greater than 0 for: %s',
+        element
+      );
     },
     update(entry) {
       const fxElement = this;
@@ -161,9 +167,9 @@ export const Presets = {
 
       // If above the threshold of trigger-position
       // Translate the element offset pixels.
-      setStyles(fxElement.element,
-          {transform:
-            `translateY(${fxElement.offset.toFixed(0)}px)`});
+      setStyles(fxElement.element, {
+        transform: `translateY(${fxElement.offset.toFixed(0)}px)`,
+      });
     },
   },
   [FxType.FLY_IN_BOTTOM]: {
@@ -237,21 +243,31 @@ export const Presets = {
         return;
       }
 
-      userAssert(marginEnd >= 0 && marginEnd <= 100,
-          'data-margin-end must be a percentage value ' +
-          'and be between 0% and 100% for: %s', element);
+      userAssert(
+        marginEnd >= 0 && marginEnd <= 100,
+        'data-margin-end must be a percentage value ' +
+          'and be between 0% and 100% for: %s',
+        element
+      );
 
-      userAssert(marginEnd > marginStart,
-          'data-margin-end must be greater than data-margin-start for: %s',
-          element);
+      userAssert(
+        marginEnd > marginStart,
+        'data-margin-end must be greater than data-margin-start for: %s',
+        element
+      );
     },
     update(entry) {
       const fxElement = this;
       const {viewportHeight, marginStart} = fxElement;
       devAssert(fxElement.adjustedViewportHeight);
 
-      if (!isInViewportConsideringMargins(
-          entry, fxElement, fxElement.adjustedViewportHeight)) {
+      if (
+        !isInViewportConsideringMargins(
+          entry,
+          fxElement,
+          fxElement.adjustedViewportHeight
+        )
+      ) {
         return;
       }
 
@@ -266,8 +282,8 @@ export const Presets = {
       // Offset is how much extra to move the element which is position within
       // viewport times adjusted factor.
       const offset =
-        1 * (viewportHeight - top - (marginStart * viewportHeight)) /
-          (marginDelta * viewportHeight);
+        (1 * (viewportHeight - top - marginStart * viewportHeight)) /
+        (marginDelta * viewportHeight);
       fxElement.offset = offset;
 
       // If above the threshold of trigger-position
diff --git a/extensions/amp-fx-collection/0.1/providers/fx-provider.js b/extensions/amp-fx-collection/0.1/providers/fx-provider.js
index 84d847aeba7f..6a7f1f065ec6 100644
--- a/extensions/amp-fx-collection/0.1/providers/fx-provider.js
+++ b/extensions/amp-fx-collection/0.1/providers/fx-provider.js
@@ -15,9 +15,7 @@
  */
 
 import {FxType} from '../fx-type'; // eslint-disable-line no-unused-vars
-import {
-  PositionObserverFidelity,
-} from '../../../../src/service/position-observer/position-observer-worker';
+import {PositionObserverFidelity} from '../../../../src/service/position-observer/position-observer-worker';
 import {Presets} from './amp-fx-presets';
 import {
   ScrollToggleDispatch,
@@ -48,10 +46,7 @@ import {
   getServiceForDoc,
   registerServiceBuilderForDoc,
 } from '../../../../src/service';
-import {
-  installPositionObserverServiceForDoc,
-} from '../../../../src/service/position-observer/position-observer-impl';
-
+import {installPositionObserverServiceForDoc} from '../../../../src/service/position-observer/position-observer-impl';
 
 /**
  * @param {!../../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -84,8 +79,11 @@ export function installScrollToggledFx(ampdoc, element, type) {
     }
 
     dispatch.observe(isShown => {
-      scrollToggle(element, isShown,
-          /** @type {!ScrollTogglePosition} */ (devAssert(position)));
+      scrollToggle(
+        element,
+        isShown,
+        /** @type {!ScrollTogglePosition} */ (devAssert(position))
+      );
     });
   };
 
@@ -115,8 +113,11 @@ function scrollToggle(element, isShown, position) {
     scrollToggleFloatIn(element, offset);
   };
 
-  Services.resourcesForDoc(element)
-      .measureMutateElement(element, measure, mutate);
+  Services.resourcesForDoc(element).measureMutateElement(
+    element,
+    measure,
+    mutate
+  );
 }
 
 /**
@@ -127,8 +128,7 @@ function scrollToggle(element, isShown, position) {
 export function installPositionBoundFx(ampdoc, element, type) {
   installPositionObserverServiceForDoc(ampdoc);
   new FxElement(ampdoc, element, type);
-  setStyles(element,
-      assertDoesNotContainDisplay(installStyles(element, type)));
+  setStyles(element, assertDoesNotContainDisplay(installStyles(element, type)));
 }
 
 /**
@@ -141,7 +141,6 @@ export class FxElement {
    * @param {!FxType} fxType
    */
   constructor(ampdoc, element, fxType) {
-
     /** @public @const  {!Window} */
     this.win = ampdoc.win;
 
@@ -175,30 +174,33 @@ export class FxElement {
     this.factor = parseFloat(element.getAttribute('data-parallax-factor'));
 
     /** @public @const {number} */
-    this.marginStart = element.hasAttribute('data-margin-start') ?
-      /** @type {number} */
-      (resolvePercentageToNumber(element.getAttribute('data-margin-start'))) :
-      defaultMarginValues(fxType)['start'];
+    this.marginStart = element.hasAttribute('data-margin-start')
+      ? /** @type {number} */
+        (resolvePercentageToNumber(element.getAttribute('data-margin-start')))
+      : defaultMarginValues(fxType)['start'];
 
     /** @public @const {number} */
-    this.marginEnd = element.hasAttribute('data-margin-end') ?
-      /** @type {number} */
-      (resolvePercentageToNumber(element.getAttribute('data-margin-end'))) :
-      defaultMarginValues(fxType)['end'];
+    this.marginEnd = element.hasAttribute('data-margin-end')
+      ? /** @type {number} */
+        (resolvePercentageToNumber(element.getAttribute('data-margin-end')))
+      : defaultMarginValues(fxType)['end'];
 
     /** @public @const {string} */
-    this.easing = convertEasingKeyword(element.hasAttribute('data-easing') ?
-      element.getAttribute('data-easing') : defaultEasingValues(fxType));
+    this.easing = convertEasingKeyword(
+      element.hasAttribute('data-easing')
+        ? element.getAttribute('data-easing')
+        : defaultEasingValues(fxType)
+    );
 
     /** @public @const {string} */
-    this.duration = element.hasAttribute('data-duration') ?
-      element.getAttribute('data-duration') :
-      defaultDurationValues(ampdoc, fxType);
+    this.duration = element.hasAttribute('data-duration')
+      ? element.getAttribute('data-duration')
+      : defaultDurationValues(ampdoc, fxType);
 
     /** @public @const {number} */
-    this.flyInDistance = element.hasAttribute('data-fly-in-distance') ?
-      parseFloat(element.getAttribute('data-fly-in-distance')) :
-      defaultFlyInDistanceValues(ampdoc, fxType);
+    this.flyInDistance = element.hasAttribute('data-fly-in-distance')
+      ? parseFloat(element.getAttribute('data-fly-in-distance'))
+      : defaultFlyInDistanceValues(ampdoc, fxType);
 
     /**
      * Boolean dictating whether or not the amp-fx preset has the `repeat`
@@ -227,8 +229,10 @@ export class FxElement {
    * @private
    */
   observePositionChanges_() {
-    this.positionObserver_.observe(this.element, PositionObserverFidelity.HIGH,
-        Presets[this.fxType_].update.bind(this)
+    this.positionObserver_.observe(
+      this.element,
+      PositionObserverFidelity.HIGH,
+      Presets[this.fxType_].update.bind(this)
     );
 
     this.viewport_.onResize(() => {
@@ -261,10 +265,10 @@ export class FxElement {
       const viewportHeight = this.viewport_.getHeight();
 
       let offsetTop = 0;
-      for (let node = this.element; node; node = node./*OK*/offsetParent) {
-        offsetTop += node./*OK*/offsetTop;
+      for (let node = this.element; node; node = node./*OK*/ offsetParent) {
+        offsetTop += node./*OK*/ offsetTop;
       }
-      const aboveTheFold = (offsetTop < viewportHeight);
+      const aboveTheFold = offsetTop < viewportHeight;
 
       return aboveTheFold ? offsetTop : viewportHeight;
     });
diff --git a/extensions/amp-fx-collection/0.1/scroll-toggle.js b/extensions/amp-fx-collection/0.1/scroll-toggle.js
index b0e3b29840c5..2d1bf5aa29ae 100644
--- a/extensions/amp-fx-collection/0.1/scroll-toggle.js
+++ b/extensions/amp-fx-collection/0.1/scroll-toggle.js
@@ -35,13 +35,10 @@ export const ANIMATION_THRESHOLD_PX = 80;
 export const ANIMATION_CURVE = 'ease';
 export const ANIMATION_DURATION_MS = 300;
 
-
 /** Dispatches a signal when an element is supposed to be toggled on scroll. */
 export class ScrollToggleDispatch {
-
   /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
   constructor(ampdoc) {
-
     /** @private @const {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -92,13 +89,11 @@ export class ScrollToggleDispatch {
 
     // If we are scrolling in the direction that doesn't change our
     // header status, update the base scroll position.
-    if ((!this.isShown_ && delta > 0) ||
-        (this.isShown_ && delta < 0)) {
+    if ((!this.isShown_ && delta > 0) || (this.isShown_ && delta < 0)) {
       this.baseScrollTop_ = this.lastScrollTop_;
     }
 
-    if (!this.isShown_ &&
-        this.lastScrollTop_ <= HEIGHT_PX) {
+    if (!this.isShown_ && this.lastScrollTop_ <= HEIGHT_PX) {
       // If we reached the top, then we need to immediately animate
       // the target back in irrespective of our current animation
       // state.
@@ -106,15 +101,13 @@ export class ScrollToggleDispatch {
       this.baseScrollTop_ = this.lastScrollTop_;
       return;
     }
-    if (!this.isShown_ &&
-        delta < -RETURN_THRESHOLD_PX) {
+    if (!this.isShown_ && delta < -RETURN_THRESHOLD_PX) {
       // If we scrolled up enough up to show the target again, do so.
       this.toggle_(true);
       this.baseScrollTop_ = this.lastScrollTop_;
       return;
     }
-    if (this.isShown_ &&
-        delta > ANIMATION_THRESHOLD_PX) {
+    if (this.isShown_ && delta > ANIMATION_THRESHOLD_PX) {
       // If we scrolled down enough to animate the target out, do so.
       this.toggle_(false);
       this.baseScrollTop_ = this.lastScrollTop_;
@@ -157,14 +150,13 @@ export function getScrollToggleFloatInOffset(element, isShown, position) {
   if (isShown) {
     return 0;
   }
-  const offset = element./*OK*/getBoundingClientRect().height;
+  const offset = element./*OK*/ getBoundingClientRect().height;
   if (position == ScrollTogglePosition.TOP) {
     return -offset;
   }
   return offset;
 }
 
-
 /**
  * @param {!Element} element
  * @param {!Object<string, string>} computedStyle
@@ -173,7 +165,8 @@ export function getScrollToggleFloatInOffset(element, isShown, position) {
 export function assertValidScrollToggleElement(element, computedStyle) {
   return (
     assertStyleOrWarn(computedStyle, 'overflow', 'hidden', element) &&
-    assertStyleOrWarn(computedStyle, 'position', 'fixed', element));
+    assertStyleOrWarn(computedStyle, 'position', 'fixed', element)
+  );
 }
 
 /**
@@ -189,8 +182,15 @@ export function getScrollTogglePosition(element, type, computedStyle) {
 
   // naming convention win:
   // position `top` should have `top: 0` and `bottom` should have `bottom: 0`
-  if (!assertStyleOrWarn(
-      computedStyle, position, px(0), element, `amp-fx=${type}`)) {
+  if (
+    !assertStyleOrWarn(
+      computedStyle,
+      position,
+      px(0),
+      element,
+      `amp-fx=${type}`
+    )
+  ) {
     return null;
   }
 
@@ -213,20 +213,19 @@ export function installScrollToggleStyles(element) {
  * @param {string=} opt_suffix
  * @return {boolean}
  */
-function assertStyleOrWarn(
-  computed, prop, expected, element, opt_suffix) {
-
+function assertStyleOrWarn(computed, prop, expected, element, opt_suffix) {
   if (computed[prop] == expected) {
     return true;
   }
   const suffix = opt_suffix ? ` ${opt_suffix}` : '';
   const shorthand = elementShorthand(element);
-  user().warn(TAG,
-      `FX element must have \`${prop}: ${expected}\` [${shorthand}]${suffix}.`);
+  user().warn(
+    TAG,
+    `FX element must have \`${prop}: ${expected}\` [${shorthand}]${suffix}.`
+  );
   return false;
 }
 
-
 /**
  * Creates a human-readable shorthand for an element similar to a CSS selector.
  * e.g.
diff --git a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in-scroll.js b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in-scroll.js
index 2d8f400c830f..d189e4e73368 100644
--- a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in-scroll.js
+++ b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in-scroll.js
@@ -16,7 +16,6 @@
 
 const config = describe.configure().ifChrome();
 config.run('amp-fx-collection', function() {
-
   const css = `
     .spacer {
       height: 100vh;
@@ -42,45 +41,53 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in-scroll'", {
-    body: defaultBody,
-    css,
-    extensions,
-    timeout: 20000,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs fade-in-scroll animation with default parameters', () => {
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in-scroll'",
+    {
+      body: defaultBody,
+      css,
+      extensions,
+      timeout: 20000,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs fade-in-scroll animation with default parameters', () => {
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
-          // Since the animation is spread over 50% of the viewport,
-          // scrolling 10% of the viewport should change the opacity by 20%
+            // Since the animation is spread over 50% of the viewport,
+            // scrolling 10% of the viewport should change the opacity by 20%
             expect(getOpacity(win)).to.equal(0.2);
             win.scrollTo(0, 0.4 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0.8);
             win.scrollTo(0, 0.5 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
             win.scrollTo(0, 0.7 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
             win.scrollTo(0, 0.4 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
           });
-    });
-  });
+      });
+    }
+  );
 
   const marginSpecifiedBody = `
     <div class="spacer"></div>
@@ -92,35 +99,41 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in-scroll'", {
-    body: marginSpecifiedBody,
-    css,
-    extensions,
-    timeout: 15000,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs fade-in-scroll animation with margins specified', () => {
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in-scroll'",
+    {
+      body: marginSpecifiedBody,
+      css,
+      extensions,
+      timeout: 15000,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs fade-in-scroll animation with margins specified', () => {
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0);
             win.scrollTo(0, 0.2 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0);
             win.scrollTo(0, 0.4 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0.4);
           });
-    });
-  });
+      });
+    }
+  );
 
   const repeatSpecifiedBody = `
     <div class="spacer"></div>
@@ -131,43 +144,51 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in-scroll'", {
-    body: repeatSpecifiedBody,
-    css,
-    extensions,
-    timeout: 20000,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs fade-in-scroll animation with repeat specified', () => {
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in-scroll'",
+    {
+      body: repeatSpecifiedBody,
+      css,
+      extensions,
+      timeout: 20000,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs fade-in-scroll animation with repeat specified', () => {
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0.2);
             win.scrollTo(0, 0.4 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0.8);
             win.scrollTo(0, 0.5 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
             win.scrollTo(0, 0.7 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
             win.scrollTo(0, 0.4 * getViewportHeight(win));
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(0.8);
           });
-    });
-  });
+      });
+    }
+  );
 });
 
 function getOpacity(win) {
@@ -182,4 +203,3 @@ function getViewportHeight(win) {
 function timeout(ms) {
   return () => new Promise(resolve => setTimeout(resolve, ms));
 }
-
diff --git a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in.js b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in.js
index 21bfd1034fbe..455f2aea67aa 100644
--- a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in.js
+++ b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fade-in.js
@@ -16,7 +16,6 @@
 
 const config = describe.configure().ifChrome();
 config.run('amp-fx-collection', function() {
-
   const css = `
     .spacer {
       height: 100vh;
@@ -42,27 +41,31 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in'", {
-    body: defaultBody,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs fade-in animation with default parameters', () => {
-      // Not visible yet, opacity = 0;
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, 0.2 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in'",
+    {
+      body: defaultBody,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs fade-in animation with default parameters', () => {
+        // Not visible yet, opacity = 0;
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, 0.2 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
           });
-    });
-  });
+      });
+    }
+  );
 
   const marginSpecific = `
     <div class="spacer"></div>
@@ -73,27 +76,31 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in'", {
-    body: marginSpecific,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('margin-start specified', () => {
-      // Not visible yet, opacity = 0;
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, 0.5 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in'",
+    {
+      body: marginSpecific,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('margin-start specified', () => {
+        // Not visible yet, opacity = 0;
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, 0.5 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
           });
-    });
-  });
+      });
+    }
+  );
 
   const durationSpecific = `
     <div class="spacer"></div>
@@ -104,31 +111,36 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fade-in'", {
-    body: durationSpecific,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('duration specified', () => {
-      // Not visible yet, opacity = 0;
-      expect(getOpacity(win)).to.equal(0);
-      win.scrollTo(0, getViewportHeight(win));
-      Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='fade-in'",
+    {
+      body: durationSpecific,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('duration specified', () => {
+        // Not visible yet, opacity = 0;
+        expect(getOpacity(win)).to.equal(0);
+        win.scrollTo(0, getViewportHeight(win));
+        Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.be.above(0);
             expect(getOpacity(win)).to.be.below(1);
-          }).then(timeout(2000))
+          })
+          .then(timeout(2000))
           .then(() => {
             expect(getOpacity(win)).to.equal(1);
           });
-    });
-  });
+      });
+    }
+  );
 });
 
 function getOpacity(win) {
@@ -143,4 +155,3 @@ function getViewportHeight(win) {
 function timeout(ms) {
   return () => new Promise(resolve => setTimeout(resolve, ms));
 }
-
diff --git a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
index 316c933d58d1..93e67b9d1bf8 100644
--- a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
+++ b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-fly-in.js
@@ -17,7 +17,6 @@
 import {isExperimentOn, toggleExperiment} from '../../../../../src/experiments';
 
 describe.skip('amp-fx-collection', function() {
-
   const css = `
     .spacer {
       height: 100vh;
@@ -35,7 +34,6 @@ describe.skip('amp-fx-collection', function() {
 
   const extensions = ['amp-fx-collection'];
 
-
   // Can't test a default `fly-in-left` animation as the
   // `data-fly-in-distance` and `data-duration` parameters differ/device.
   const bodyLeft = `
@@ -49,27 +47,30 @@ describe.skip('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fly-in-left'", {
-    body: bodyLeft,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-      toggleExperiment(win, 'amp-fx-fly-in', true, false);
-    });
-    //TODO(esth, #19392): Fails on Firefox 63.0.0
-    it.skip('runs fly-in-left animation with default parameters', () => {
-      expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
-      const initialLeft = getComputedLeft(win);
-      win.scrollTo(0, 0.5 * getViewportHeight(win));
-      return timeout(2000).then(() => {
-        expect(getComputedLeft(win)).to.be.above(initialLeft);
+  describes.integration(
+    "amp-fx='fly-in-left'",
+    {
+      body: bodyLeft,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+        toggleExperiment(win, 'amp-fx-fly-in', true, false);
       });
-    });
-  });
+      //TODO(esth, #19392): Fails on Firefox 63.0.0
+      it.skip('runs fly-in-left animation with default parameters', () => {
+        expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
+        const initialLeft = getComputedLeft(win);
+        win.scrollTo(0, 0.5 * getViewportHeight(win));
+        return timeout(2000).then(() => {
+          expect(getComputedLeft(win)).to.be.above(initialLeft);
+        });
+      });
+    }
+  );
 
   // Can't test a default `fly-in-right` animation as the
   // `data-fly-in-distance` and `data-duration` parameters differ/device.
@@ -84,27 +85,30 @@ describe.skip('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fly-in-right'", {
-    body: bodyRight,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-      toggleExperiment(win, 'amp-fx-fly-in', true, false);
-    });
-    //TODO(esth, #19392): Fails on Firefox 63.0.0
-    it.skip('runs fly-in-right animation with default parameters', () => {
-      expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
-      const initialLeft = getComputedLeft(win);
-      win.scrollTo(0, 0.5 * getViewportHeight(win));
-      return timeout(2000).then(() => {
-        expect(getComputedLeft(win)).to.be.below(initialLeft);
+  describes.integration(
+    "amp-fx='fly-in-right'",
+    {
+      body: bodyRight,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+        toggleExperiment(win, 'amp-fx-fly-in', true, false);
       });
-    });
-  });
+      //TODO(esth, #19392): Fails on Firefox 63.0.0
+      it.skip('runs fly-in-right animation with default parameters', () => {
+        expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
+        const initialLeft = getComputedLeft(win);
+        win.scrollTo(0, 0.5 * getViewportHeight(win));
+        return timeout(2000).then(() => {
+          expect(getComputedLeft(win)).to.be.below(initialLeft);
+        });
+      });
+    }
+  );
 
   // Can't test a default `fly-in-bottom` animation as the
   // `data-fly-in-distance` and `data-duration` parameters differ/device.
@@ -119,27 +123,30 @@ describe.skip('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='fly-in-bottom'", {
-    body: bodyBottom,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-      toggleExperiment(win, 'amp-fx-fly-in', true, false);
-    });
+  describes.integration(
+    "amp-fx='fly-in-bottom'",
+    {
+      body: bodyBottom,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+        toggleExperiment(win, 'amp-fx-fly-in', true, false);
+      });
 
-    it('runs fly-in-bottom animation with default parameters', () => {
-      expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
-      const initialTop = getComputedTop(win);
-      win.scrollTo(0, 0.5 * getViewportHeight(win));
-      return timeout(2000).then(() => {
-        expect(getComputedTop(win)).to.be.below(initialTop);
+      it('runs fly-in-bottom animation with default parameters', () => {
+        expect(isExperimentOn(win, 'amp-fx-fly-in')).to.be.true;
+        const initialTop = getComputedTop(win);
+        win.scrollTo(0, 0.5 * getViewportHeight(win));
+        return timeout(2000).then(() => {
+          expect(getComputedTop(win)).to.be.below(initialTop);
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 function getComputedTop(win) {
diff --git a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-parallax.js b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-parallax.js
index 3b92a00edb4d..1ce687094e2e 100644
--- a/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-parallax.js
+++ b/extensions/amp-fx-collection/0.1/test/integration/test-amp-fx-parallax.js
@@ -16,7 +16,6 @@
 
 const config = describe.configure().ifChrome();
 config.run('amp-fx-collection', function() {
-
   const css = `
     .spacer {
       height: 100vh;
@@ -43,26 +42,30 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='parallax'", {
-    body: normalParallaxBody,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs parallax animation with normal parallax', () => {
-      expect(getTop(win)).to.equal(getViewportHeight(win));
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='parallax'",
+    {
+      body: normalParallaxBody,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs parallax animation with normal parallax', () => {
+        expect(getTop(win)).to.equal(getViewportHeight(win));
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getTop(win)).to.equal(0.9 * getViewportHeight(win));
           });
-    });
-  });
+      });
+    }
+  );
 
   const fastParallaxBody = `
     <div class="spacer"></div>
@@ -73,26 +76,30 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='parallax'", {
-    body: fastParallaxBody,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs parallax animation with fast parallax', () => {
-      expect(getTop(win)).to.equal(getViewportHeight(win));
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='parallax'",
+    {
+      body: fastParallaxBody,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs parallax animation with fast parallax', () => {
+        expect(getTop(win)).to.equal(getViewportHeight(win));
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getTop(win)).to.be.below(0.9 * getViewportHeight(win));
           });
-    });
-  });
+      });
+    }
+  );
 
   const slowParallaxBody = `
     <div class="spacer"></div>
@@ -103,26 +110,30 @@ config.run('amp-fx-collection', function() {
     <div class="spacer"></div>
   `;
 
-  describes.integration("amp-fx='parallax'", {
-    body: slowParallaxBody,
-    css,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('runs parallax animation with slow parallax', () => {
-      expect(getTop(win)).to.equal(getViewportHeight(win));
-      win.scrollTo(0, 0.1 * getViewportHeight(win));
-      return Promise.resolve().then(timeout(2000))
+  describes.integration(
+    "amp-fx='parallax'",
+    {
+      body: slowParallaxBody,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      beforeEach(() => {
+        win = env.win;
+      });
+
+      it('runs parallax animation with slow parallax', () => {
+        expect(getTop(win)).to.equal(getViewportHeight(win));
+        win.scrollTo(0, 0.1 * getViewportHeight(win));
+        return Promise.resolve()
+          .then(timeout(2000))
           .then(() => {
             expect(getTop(win)).to.be.above(0.9 * getViewportHeight(win));
           });
-    });
-  });
+      });
+    }
+  );
 });
 
 function getTop(win) {
diff --git a/extensions/amp-fx-collection/0.1/test/test-amp-fx-collection.js b/extensions/amp-fx-collection/0.1/test/test-amp-fx-collection.js
index a134e71c9a57..b25e5c22cad3 100644
--- a/extensions/amp-fx-collection/0.1/test/test-amp-fx-collection.js
+++ b/extensions/amp-fx-collection/0.1/test/test-amp-fx-collection.js
@@ -17,61 +17,65 @@
 import {AmpFxCollection} from '../amp-fx-collection';
 import {createElementWithAttributes} from '../../../../src/dom';
 
-describes.fakeWin('amp-fx-collection', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-fx-collection'],
+describes.fakeWin(
+  'amp-fx-collection',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-fx-collection'],
+    },
   },
-}, env => {
-  let win;
-  let ampdoc;
+  env => {
+    let win;
+    let ampdoc;
 
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-  });
-
-  function createAmpFx(fxType, opt_attrs) {
-    const element = createElementWithAttributes(win.document, 'div', opt_attrs);
-    win.document.body.appendChild(element);
-    const ampFxCollection = new AmpFxCollection(ampdoc);
-    return ampFxCollection;
-  }
-
-  // TODO(alanorozco): Actually write tests. Like the goggles, these do nothing!
-  it.skip('creates amp-fx components correctly', () => {
-    let ampFx = createAmpFx('parallax', {
-      'data-parallax-factor': 1.2,
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
     });
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
-
-    ampFx = createAmpFx('fade-in');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
 
-    ampFx = createAmpFx('fade-in-scroll');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
+    function createAmpFx(fxType, opt_attrs) {
+      const element = createElementWithAttributes(
+        win.document,
+        'div',
+        opt_attrs
+      );
+      win.document.body.appendChild(element);
+      const ampFxCollection = new AmpFxCollection(ampdoc);
+      return ampFxCollection;
+    }
 
-    ampFx = createAmpFx('fly-in-bottom');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
+    // TODO(alanorozco): Actually write tests. Like the goggles, these do nothing!
+    it.skip('creates amp-fx components correctly', () => {
+      let ampFx = createAmpFx('parallax', {
+        'data-parallax-factor': 1.2,
+      });
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
-    ampFx = createAmpFx('fly-in-top');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
+      ampFx = createAmpFx('fade-in');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
-    ampFx = createAmpFx('fly-in-left');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
+      ampFx = createAmpFx('fade-in-scroll');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
-    ampFx = createAmpFx('fly-in-right');
-    expect(ampFx).to.not.be.null;
-    expect(ampFx.getFxProvider_()).to.not.be.null;
-  });
-
-});
+      ampFx = createAmpFx('fly-in-bottom');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
+      ampFx = createAmpFx('fly-in-top');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
+      ampFx = createAmpFx('fly-in-left');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
 
+      ampFx = createAmpFx('fly-in-right');
+      expect(ampFx).to.not.be.null;
+      expect(ampFx.getFxProvider_()).to.not.be.null;
+    });
+  }
+);
diff --git a/extensions/amp-fx-collection/0.1/test/test-fx-type.js b/extensions/amp-fx-collection/0.1/test/test-fx-type.js
index 942e17477505..60a1d73cb52d 100644
--- a/extensions/amp-fx-collection/0.1/test/test-fx-type.js
+++ b/extensions/amp-fx-collection/0.1/test/test-fx-type.js
@@ -24,10 +24,8 @@ import {
 } from '../fx-type';
 
 describes.fakeWin('amp-fx types', {amp: false}, env => {
-
   function expectNoFalseDefinitions(objOrDef, id) {
-    const msg =
-      `FxBindings: False properties are unnecessary, just remove [${id}]`;
+    const msg = `FxBindings: False properties are unnecessary, just remove [${id}]`;
     expect(objOrDef, msg).not.to.be.false;
     if (typeof objOrDef != 'object') {
       return;
@@ -38,7 +36,6 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
   }
 
   describe('FX types definition', () => {
-
     const expectedKey = type => type.replace(/\-/g, '_').toUpperCase();
 
     it('has matching FxType for each type', () => {
@@ -53,26 +50,27 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
       const typeBindings = Object.keys(FxBindings);
       expect(typeBindings, 'FxBindings').to.have.length(validFxTypes.length);
       typeBindings.forEach(type => {
-        expect(FxBindings[type], `FxBindings.${expectedKey(type)}`)
-            .not.to.be.empty;
+        expect(FxBindings[type], `FxBindings.${expectedKey(type)}`).not.to.be
+          .empty;
       });
     });
 
     it('has no false definitions', () => {
       Object.keys(FxBindings).forEach(type => {
-        expectNoFalseDefinitions(FxBindings[type],
-            `FxBindings.${expectedKey(type)}`);
+        expectNoFalseDefinitions(
+          FxBindings[type],
+          `FxBindings.${expectedKey(type)}`
+        );
       });
     });
-
   });
 
   describe('isValidTypeCombination', () => {
     it('allows', () => {
       expect(isValidTypeCombination('parallax', 'fade-in')).to.be.true;
       expect(isValidTypeCombination('fly-in-top', 'fade-in')).to.be.true;
-      expect(isValidTypeCombination('fly-in-bottom', 'fade-in-scroll'))
-          .to.be.true;
+      expect(isValidTypeCombination('fly-in-bottom', 'fade-in-scroll')).to.be
+        .true;
     });
     it('restricts', () => {
       // dupes
@@ -80,17 +78,16 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
 
       // translating along the same axis
       expect(isValidTypeCombination('parallax', 'fly-in-top')).to.be.false;
-      expect(isValidTypeCombination('float-in-top', 'float-in-bottom'))
-          .to.be.false;
+      expect(isValidTypeCombination('float-in-top', 'float-in-bottom')).to.be
+        .false;
 
       // both change opacity
-      expect(isValidTypeCombination('fade-in', 'fade-in-scroll'))
-          .to.be.false;
+      expect(isValidTypeCombination('fade-in', 'fade-in-scroll')).to.be.false;
 
       // different signal types
       expect(isValidTypeCombination('fade-in', 'float-in-bottom')).to.be.false;
-      expect(isValidTypeCombination('fly-in-left', 'float-in-bottom'))
-          .to.be.false;
+      expect(isValidTypeCombination('fly-in-left', 'float-in-bottom')).to.be
+        .false;
     });
   });
 
@@ -147,7 +144,6 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
   });
 
   describe('getFxTypes', () => {
-
     function randomWhitespaceChar() {
       const chars = ['\n', ' ', '\t'];
       return chars[Math.floor(Math.random() * chars.length)];
@@ -155,13 +151,21 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
 
     function randomWhitespace(min = 0) {
       const amount = Math.round(min + Math.random() * 5);
-      return Array(amount).fill(null).map(randomWhitespaceChar).join('');
+      return Array(amount)
+        .fill(null)
+        .map(randomWhitespaceChar)
+        .join('');
     }
 
     function elementWithTypesRandomWhitespace(types) {
       const element = env.win.document.createElement('div');
-      element.setAttribute('amp-fx', types.reduce(
-          (acc, type, i) => acc + randomWhitespace(Math.min(i, 1)) + type, ''));
+      element.setAttribute(
+        'amp-fx',
+        types.reduce(
+          (acc, type, i) => acc + randomWhitespace(Math.min(i, 1)) + type,
+          ''
+        )
+      );
       return element;
     }
 
@@ -177,8 +181,9 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
         ['fly-in-bottom', 'fly-in-right', 'fade-in-scroll'],
         ['fly-in-top', 'fly-in-left', 'fade-in'],
       ].forEach(validSet => {
-        expect(getFxTypes(elementWithTypesRandomWhitespace(validSet)))
-            .to.deep.equal(validSet);
+        expect(
+          getFxTypes(elementWithTypesRandomWhitespace(validSet))
+        ).to.deep.equal(validSet);
       });
     });
 
@@ -212,10 +217,10 @@ describes.fakeWin('amp-fx types', {amp: false}, env => {
           sanitized: ['fly-in-top'],
         },
       ].forEach(({invalid, sanitized}) => {
-        expect(getFxTypes(elementWithTypesRandomWhitespace(invalid)))
-            .to.deep.equal(sanitized);
+        expect(
+          getFxTypes(elementWithTypesRandomWhitespace(invalid))
+        ).to.deep.equal(sanitized);
       });
     });
   });
-
 });
diff --git a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
index b3f782e83699..cffbdf723fcc 100644
--- a/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
+++ b/extensions/amp-fx-flying-carpet/0.1/amp-fx-flying-carpet.js
@@ -23,9 +23,7 @@ import {setStyle} from '../../../src/style';
 
 const TAG = 'amp-fx-flying-carpet';
 
-
 export class AmpFlyingCarpet extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -34,7 +32,7 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
      * Preserved so that we may keep track of the "good" children. When an
      * element collapses, we remove it from the list.
      *
-     * @type{!Array<!Element>}
+     * @type {!Array<!Element>}
      * @private
      */
     this.children_ = [];
@@ -61,7 +59,6 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
     this.firstLayoutCompleted_ = false;
   }
 
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.FIXED_HEIGHT;
@@ -69,7 +66,6 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-
     const doc = this.element.ownerDocument;
     const container = doc.createElement('div');
 
@@ -92,7 +88,10 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
     // Make the fixed-layer track the container, but never transfer it out of
     // this DOM tree. Tracking allows us to compensate for the Viewer's header,
     // but transferring would break the clipping UI.
-    this.getViewport().addToFixedLayer(container, /* opt_forceTransfer */false);
+    this.getViewport().addToFixedLayer(
+      container,
+      /* opt_forceTransfer */ false
+    );
   }
 
   /** @override */
@@ -129,19 +128,21 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
     const minTop = viewportHeight * 0.75;
     const maxTop = docHeight - viewportHeight * 0.95;
     userAssert(
-        layoutBox.top >= minTop,
-        '<amp-fx-flying-carpet> elements must be positioned after the 75% of' +
-      ' first viewport: %s Current position: %s. Min: %s',
-        this.element,
-        layoutBox.top,
-        minTop);
+      layoutBox.top >= minTop,
+      '<amp-fx-flying-carpet> elements must be positioned after the 75% of' +
+        ' first viewport: %s Current position: %s. Min: %s',
+      this.element,
+      layoutBox.top,
+      minTop
+    );
     userAssert(
-        layoutBox.top <= maxTop,
-        '<amp-fx-flying-carpet> elements must be positioned before the last ' +
-      'viewport: %s Current position: %s. Max: %s',
-        this.element,
-        layoutBox.top,
-        maxTop);
+      layoutBox.top <= maxTop,
+      '<amp-fx-flying-carpet> elements must be positioned before the last ' +
+        'viewport: %s Current position: %s. Max: %s',
+      this.element,
+      layoutBox.top,
+      maxTop
+    );
   }
 
   /** @override */
@@ -150,7 +151,7 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
       this.assertPosition_();
     } catch (e) {
       // Collapse the element if the effect is broken by the viewport location.
-      this./*OK*/collapse();
+      this./*OK*/ collapse();
       throw e;
     }
     this.scheduleLayout(this.children_);
@@ -216,7 +217,6 @@ export class AmpFlyingCarpet extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpFlyingCarpet, CSS);
 });
diff --git a/extensions/amp-fx-flying-carpet/0.1/test/test-amp-fx-flying-carpet.js b/extensions/amp-fx-flying-carpet/0.1/test/test-amp-fx-flying-carpet.js
index 8701255ed4a3..e75f4e945635 100644
--- a/extensions/amp-fx-flying-carpet/0.1/test/test-amp-fx-flying-carpet.js
+++ b/extensions/amp-fx-flying-carpet/0.1/test/test-amp-fx-flying-carpet.js
@@ -18,206 +18,223 @@ import {AmpFlyingCarpet} from '../amp-fx-flying-carpet';
 import {Resource} from '../../../../src/service/resource';
 import {Services} from '../../../../src/services';
 
-
-describes.realWin('amp-fx-flying-carpet', {
-  amp: {
-    extensions: ['amp-fx-flying-carpet'],
+describes.realWin(
+  'amp-fx-flying-carpet',
+  {
+    amp: {
+      extensions: ['amp-fx-flying-carpet'],
+    },
   },
-}, env => {
-  let win, doc;
-  let viewport;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    viewport = Services.viewportForDoc(env.ampdoc);
-  });
-
-  function getAmpFlyingCarpet(opt_childrenCallback, opt_top) {
-    const top = opt_top || '200vh';
-
-    const bodyResizer = doc.createElement('div');
-    bodyResizer.style.height = '400vh';
-    bodyResizer.style.width = '1px';
-    doc.body.appendChild(bodyResizer);
-
-    doc.body.style.position = 'relative';
-    viewport.resize_();
-
-    const parent = doc.querySelector('#parent');
-    parent.style.position = 'absolute';
-    parent.style.top = top;
-
-    const flyingCarpet = doc.createElement('amp-fx-flying-carpet');
-    flyingCarpet.setAttribute('height', '10px');
-    if (opt_childrenCallback) {
-      const children = opt_childrenCallback(flyingCarpet);
-      children.forEach(child => {
-        flyingCarpet.appendChild(child);
-      });
+  env => {
+    let win, doc;
+    let viewport;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      viewport = Services.viewportForDoc(env.ampdoc);
+    });
+
+    function getAmpFlyingCarpet(opt_childrenCallback, opt_top) {
+      const top = opt_top || '200vh';
+
+      const bodyResizer = doc.createElement('div');
+      bodyResizer.style.height = '400vh';
+      bodyResizer.style.width = '1px';
+      doc.body.appendChild(bodyResizer);
+
+      doc.body.style.position = 'relative';
+      viewport.resize_();
+
+      const parent = doc.querySelector('#parent');
+      parent.style.position = 'absolute';
+      parent.style.top = top;
+
+      const flyingCarpet = doc.createElement('amp-fx-flying-carpet');
+      flyingCarpet.setAttribute('height', '10px');
+      if (opt_childrenCallback) {
+        const children = opt_childrenCallback(flyingCarpet);
+        children.forEach(child => {
+          flyingCarpet.appendChild(child);
+        });
+      }
+
+      parent.appendChild(flyingCarpet);
+      return flyingCarpet
+        .build()
+        .then(() => {
+          const resource = Resource.forElement(flyingCarpet);
+          resource.measure();
+          return flyingCarpet.layoutCallback();
+        })
+        .then(
+          () => {
+            viewport.setScrollTop(parseInt(top, 10));
+            return flyingCarpet;
+          },
+          error => {
+            return Promise.reject({error, flyingCarpet});
+          }
+        );
     }
 
-    parent.appendChild(flyingCarpet);
-    return flyingCarpet.build().then(() => {
-      const resource = Resource.forElement(flyingCarpet);
-      resource.measure();
-      return flyingCarpet.layoutCallback();
-    }).then(() => {
-      viewport.setScrollTop(parseInt(top, 10));
-      return flyingCarpet;
-    }, error => {
-      return Promise.reject({error, flyingCarpet});
+    it('should move children into wrapping divs', () => {
+      let img;
+      return getAmpFlyingCarpet(() => {
+        img = doc.createElement('amp-img');
+        img.setAttribute('src', '/examples/img/sample.jpg');
+        img.setAttribute('width', 300);
+        img.setAttribute('height', 200);
+        return [img];
+      }).then(flyingCarpet => {
+        const clip = flyingCarpet.firstChild;
+        expect(clip.tagName).to.equal('DIV');
+        expect(clip).to.have.class('i-amphtml-fx-flying-carpet-clip');
+
+        const container = clip.firstChild;
+        expect(container.tagName).to.equal('DIV');
+        expect(container).to.have.class('i-amphtml-fx-flying-carpet-container');
+
+        expect(container.firstChild).to.equal(img);
+      });
     });
-  }
 
-  it('should move children into wrapping divs', () => {
-    let img;
-    return getAmpFlyingCarpet(() => {
-      img = doc.createElement('amp-img');
-      img.setAttribute('src', '/examples/img/sample.jpg');
-      img.setAttribute('width', 300);
-      img.setAttribute('height', 200);
-      return [img];
-    }).then(flyingCarpet => {
-      const clip = flyingCarpet.firstChild;
-      expect(clip.tagName).to.equal('DIV');
-      expect(clip).to.have.class('i-amphtml-fx-flying-carpet-clip');
-
-      const container = clip.firstChild;
-      expect(container.tagName).to.equal('DIV');
-      expect(container).to.have.class('i-amphtml-fx-flying-carpet-container');
-
-      expect(container.firstChild).to.equal(img);
-    });
-  });
-
-  it('should move text into wrapping divs', () => {
-    let text;
-    return getAmpFlyingCarpet(() => {
-      text = doc.createTextNode('test');
-      return [text];
-    }).then(flyingCarpet => {
-      const clip = flyingCarpet.firstChild;
-      expect(clip.tagName).to.equal('DIV');
-      expect(clip).to.have.class('i-amphtml-fx-flying-carpet-clip');
-
-      const container = clip.firstChild;
-      expect(container.tagName).to.equal('DIV');
-      expect(container).to.have.class('i-amphtml-fx-flying-carpet-container');
-
-      expect(container.firstChild).to.equal(text);
+    it('should move text into wrapping divs', () => {
+      let text;
+      return getAmpFlyingCarpet(() => {
+        text = doc.createTextNode('test');
+        return [text];
+      }).then(flyingCarpet => {
+        const clip = flyingCarpet.firstChild;
+        expect(clip.tagName).to.equal('DIV');
+        expect(clip).to.have.class('i-amphtml-fx-flying-carpet-clip');
+
+        const container = clip.firstChild;
+        expect(container.tagName).to.equal('DIV');
+        expect(container).to.have.class('i-amphtml-fx-flying-carpet-container');
+
+        expect(container.firstChild).to.equal(text);
+      });
     });
-  });
-
-  it('should listen to build callback of children', () => {
-    const scheduleLayoutStub = sandbox.stub(
-        AmpFlyingCarpet.prototype, 'scheduleLayout');
-    let img;
-    return getAmpFlyingCarpet(() => {
-      // Add the image
-      img = doc.createElement('amp-img');
-      img.setAttribute('src', '/examples/img/sample.jpg');
-      img.setAttribute('width', 300);
-      img.setAttribute('height', 200);
-      return [img];
-    }).then(() => {
-      expect(scheduleLayoutStub).to.have.been.called;
-      expect(scheduleLayoutStub).to.have.been.calledWith([img]);
+
+    it('should listen to build callback of children', () => {
+      const scheduleLayoutStub = sandbox.stub(
+        AmpFlyingCarpet.prototype,
+        'scheduleLayout'
+      );
+      let img;
+      return getAmpFlyingCarpet(() => {
+        // Add the image
+        img = doc.createElement('amp-img');
+        img.setAttribute('src', '/examples/img/sample.jpg');
+        img.setAttribute('width', 300);
+        img.setAttribute('height', 200);
+        return [img];
+      }).then(() => {
+        expect(scheduleLayoutStub).to.have.been.called;
+        expect(scheduleLayoutStub).to.have.been.calledWith([img]);
+      });
     });
-  });
 
-  it('should sync width of fixed container', () => {
-    return getAmpFlyingCarpet().then(flyingCarpet => {
-      const impl = flyingCarpet.implementation_;
-      const container = flyingCarpet.firstChild.firstChild;
-      let width = 10;
+    it('should sync width of fixed container', () => {
+      return getAmpFlyingCarpet().then(flyingCarpet => {
+        const impl = flyingCarpet.implementation_;
+        const container = flyingCarpet.firstChild.firstChild;
+        let width = 10;
 
-      impl.mutateElement = function(callback) {
-        callback();
-      };
-      impl.getLayoutWidth = () => width;
+        impl.mutateElement = function(callback) {
+          callback();
+        };
+        impl.getLayoutWidth = () => width;
 
-      impl.onMeasureChanged();
-      expect(container.style.width).to.equal(width + 'px');
+        impl.onMeasureChanged();
+        expect(container.style.width).to.equal(width + 'px');
 
-      width++;
-      impl.onMeasureChanged();
-      expect(container.style.width).to.equal(width + 'px');
+        width++;
+        impl.onMeasureChanged();
+        expect(container.style.width).to.equal(width + 'px');
+      });
     });
-  });
-
-  it('should not render in the 75% of first viewport', () => {
-    return getAmpFlyingCarpet(null, '74vh').then(() => {
-      throw new Error('should never reach this');
-    }, ref => {
-      expect(ref.error.message).to.have.string(
-          'elements must be positioned after the 75% of first viewport'
+
+    it('should not render in the 75% of first viewport', () => {
+      return getAmpFlyingCarpet(null, '74vh').then(
+        () => {
+          throw new Error('should never reach this');
+        },
+        ref => {
+          expect(ref.error.message).to.have.string(
+            'elements must be positioned after the 75% of first viewport'
+          );
+          expect(ref.flyingCarpet).to.not.display;
+        }
       );
-      expect(ref.flyingCarpet).to.not.display;
     });
-  });
 
-  it('should render past 75% of first viewport', () => {
-    return getAmpFlyingCarpet(null, '80vh').then(flyingCarpet => {
-      expect(flyingCarpet).to.display;
+    it('should render past 75% of first viewport', () => {
+      return getAmpFlyingCarpet(null, '80vh').then(flyingCarpet => {
+        expect(flyingCarpet).to.display;
+      });
     });
-  });
-
-  it('should not render in the last viewport', () => {
-    // Doc: 600px
-    // Viewport: 150px
-    return getAmpFlyingCarpet(null, '460px').then(() => {
-      throw new Error('should never reach this');
-    }, ref => {
-      expect(ref.error.message).to.have.string(
-          'elements must be positioned before the last viewport'
+
+    it('should not render in the last viewport', () => {
+      // Doc: 600px
+      // Viewport: 150px
+      return getAmpFlyingCarpet(null, '460px').then(
+        () => {
+          throw new Error('should never reach this');
+        },
+        ref => {
+          expect(ref.error.message).to.have.string(
+            'elements must be positioned before the last viewport'
+          );
+          expect(ref.flyingCarpet).to.not.display;
+        }
       );
-      expect(ref.flyingCarpet).to.not.display;
     });
-  });
 
-  it('should render close to the last viewport', () => {
-    // Doc: 600px
-    // Viewport: 150px
-    return getAmpFlyingCarpet(null, '455px').then(flyingCarpet => {
-      expect(flyingCarpet).to.display;
-    });
-  });
-
-  it('should attempt to collapse when its children collapse', () => {
-    let img;
-    return getAmpFlyingCarpet(() => {
-      // Usually, the children appear on a new line with indentation
-      const pretext = doc.createTextNode('\n  ');
-      img = doc.createElement('amp-img');
-      img.setAttribute('src', '/examples/img/sample.jpg');
-      img.setAttribute('width', 300);
-      img.setAttribute('height', 200);
-      // Usually, the closing node appears on a new line
-      const posttext = doc.createTextNode('\n');
-      return [pretext, img, posttext];
-    }).then(flyingCarpet => {
-      const attemptCollapse = sandbox.stub(flyingCarpet.implementation_,
-          'attemptCollapse').callsFake(() => {
-        return Promise.resolve();
+    it('should render close to the last viewport', () => {
+      // Doc: 600px
+      // Viewport: 150px
+      return getAmpFlyingCarpet(null, '455px').then(flyingCarpet => {
+        expect(flyingCarpet).to.display;
       });
-      expect(flyingCarpet.getBoundingClientRect().height).to.be.gt(0);
-      img.collapse();
-      expect(attemptCollapse).to.have.been.called;
     });
-  });
-
-  it('should relayout the content on onMeasureChanged', () => {
-    return getAmpFlyingCarpet().then(flyingCarpet => {
-      const impl = flyingCarpet.implementation_;
-      const scheduleLayoutSpy_ = sandbox.spy(impl, 'scheduleLayout');
-
-      impl.mutateElement = function(callback) {
-        callback();
-      };
-      impl.onMeasureChanged();
-      expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.children_);
+
+    it('should attempt to collapse when its children collapse', () => {
+      let img;
+      return getAmpFlyingCarpet(() => {
+        // Usually, the children appear on a new line with indentation
+        const pretext = doc.createTextNode('\n  ');
+        img = doc.createElement('amp-img');
+        img.setAttribute('src', '/examples/img/sample.jpg');
+        img.setAttribute('width', 300);
+        img.setAttribute('height', 200);
+        // Usually, the closing node appears on a new line
+        const posttext = doc.createTextNode('\n');
+        return [pretext, img, posttext];
+      }).then(flyingCarpet => {
+        const attemptCollapse = sandbox
+          .stub(flyingCarpet.implementation_, 'attemptCollapse')
+          .callsFake(() => {
+            return Promise.resolve();
+          });
+        expect(flyingCarpet.getBoundingClientRect().height).to.be.gt(0);
+        img.collapse();
+        expect(attemptCollapse).to.have.been.called;
+      });
     });
-  });
 
-});
+    it('should relayout the content on onMeasureChanged', () => {
+      return getAmpFlyingCarpet().then(flyingCarpet => {
+        const impl = flyingCarpet.implementation_;
+        const scheduleLayoutSpy_ = sandbox.spy(impl, 'scheduleLayout');
+
+        impl.mutateElement = function(callback) {
+          callback();
+        };
+        impl.onMeasureChanged();
+        expect(scheduleLayoutSpy_).to.have.been.calledWith(impl.children_);
+      });
+    });
+  }
+);
diff --git a/extensions/amp-geo/0.1/amp-geo.js b/extensions/amp-geo/0.1/amp-geo.js
index 834dc6bdf49d..d1085711289c 100644
--- a/extensions/amp-geo/0.1/amp-geo.js
+++ b/extensions/amp-geo/0.1/amp-geo.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Sets location specific CSS, bind variables, and attributes on
  * AMP pages
@@ -83,18 +82,16 @@ const mode = {
   GEO_OVERRIDE: 2, //  We've been overriden in test by #amp-geo=xx
 };
 
-
 /**
-  * @typedef {{
-  *   ISOCountry: string,
-  *   matchedISOCountryGroups: !Array<string>,
-  *   allISOCountryGroups: !Array<string>,
-  *   isInCountryGroup: (function(string):GEO_IN_GROUP),
-  * }}
-  */
+ * @typedef {{
+ *   ISOCountry: string,
+ *   matchedISOCountryGroups: !Array<string>,
+ *   allISOCountryGroups: !Array<string>,
+ *   isInCountryGroup: (function(string):GEO_IN_GROUP),
+ * }}
+ */
 export let GeoDef;
 
-
 export class AmpGeo extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
@@ -125,17 +122,17 @@ export class AmpGeo extends AMP.BaseElement {
     const {children} = this.element;
 
     if (children.length) {
-      this.assertWithErrorReturn_(children.length === 1 &&
-        isJsonScriptTag(children[0]),
-      `${TAG} can only have one <script type="application/json"> child`);
+      this.assertWithErrorReturn_(
+        children.length === 1 && isJsonScriptTag(children[0]),
+        `${TAG} can only have one <script type="application/json"> child`
+      );
     }
 
-    const config = children.length ?
-      tryParseJson(
-          children[0].textContent,
-          () => this.assertWithErrorReturn_(false,
-              `${TAG} Unable to parse JSON`)
-      ) : {};
+    const config = children.length
+      ? tryParseJson(children[0].textContent, () =>
+          this.assertWithErrorReturn_(false, `${TAG} Unable to parse JSON`)
+        )
+      : {};
 
     /** @type {!Promise<!GeoDef>} */
     const geo = this.addToBody_(config || {});
@@ -162,7 +159,6 @@ export class AmpGeo extends AMP.BaseElement {
     return shouldBeTrueish;
   }
 
-
   /**
    * findCountry_, sets this.country_ and this.mode_
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -180,15 +176,19 @@ export class AmpGeo extends AMP.BaseElement {
 
     // default country is 'unknown' which is also the zero length case
 
-    if (getMode(this.win).geoOverride &&
+    if (
+      getMode(this.win).geoOverride &&
       (isCanary(this.win) || getMode(this.win).localDev) &&
-      /^\w+$/.test(getMode(this.win).geoOverride)) {
+      /^\w+$/.test(getMode(this.win).geoOverride)
+    ) {
       // debug override case, only works in canary or localdev
       // match to \w characters only to prevent xss vector
       this.mode_ = mode.GEO_OVERRIDE;
       this.country_ = getMode(this.win).geoOverride.toLowerCase();
-    } else if (preRenderMatch &&
-        !Services.urlForDoc(this.element).isProxyOrigin(this.win.location)) {
+    } else if (
+      preRenderMatch &&
+      !Services.urlForDoc(this.element).isProxyOrigin(this.win.location)
+    ) {
       // pre-rendered by a publisher case, if we're a cache we ignore that
       // since there is no way the publisher could know the geo of the client.
       // When caches start pre-rendering geo we'll need to add specifc code
@@ -203,8 +203,10 @@ export class AmpGeo extends AMP.BaseElement {
       // We were not patched, if we're not in dev this is an error
       // and we leave the country at the default 'unknown'
       this.error_ = true;
-      dev().error(TAG,
-          'GEONOTPATCHED: amp-geo served unpatched, ISO country not set');
+      dev().error(
+        TAG,
+        'GEONOTPATCHED: amp-geo served unpatched, ISO country not set'
+      );
     }
   }
 
@@ -214,22 +216,26 @@ export class AmpGeo extends AMP.BaseElement {
    */
   matchCountryGroups_(config) {
     // ISOCountryGroups are optional but if specified at least one must exist
-    const ISOCountryGroups = /** @type {!Object<string, !Array<string>>} */(
-      config['ISOCountryGroups']);
+    const ISOCountryGroups =
+      /** @type {!Object<string, !Array<string>>} */ (config[
+        'ISOCountryGroups'
+      ]);
     const errorPrefix = '<amp-geo> ISOCountryGroups'; // code size
     if (ISOCountryGroups) {
       this.assertWithErrorReturn_(
-          isObject(ISOCountryGroups),
-          `${errorPrefix} must be an object`);
+        isObject(ISOCountryGroups),
+        `${errorPrefix} must be an object`
+      );
       this.definedGroups_ = Object.keys(ISOCountryGroups);
       this.definedGroups_.forEach(group => {
         this.assertWithErrorReturn_(
-            /^[a-z]+[a-z0-9]*$/i.test(group) &&
-            !/^amp/.test(group),
-            `${errorPrefix}[${group}] name is invalid`);
+          /^[a-z]+[a-z0-9]*$/i.test(group) && !/^amp/.test(group),
+          `${errorPrefix}[${group}] name is invalid`
+        );
         this.assertWithErrorReturn_(
-            isArray(ISOCountryGroups[group]),
-            `${errorPrefix}[${group}] must be an array`);
+          isArray(ISOCountryGroups[group]),
+          `${errorPrefix}[${group}] must be an array`
+        );
 
         if (this.checkGroup_(ISOCountryGroups[group])) {
           this.matchedGroups_.push(group);
@@ -246,18 +252,21 @@ export class AmpGeo extends AMP.BaseElement {
    */
   checkGroup_(countryGroup) {
     /** @type {!Array<string>} */
-    const expandedGroup = countryGroup.reduce((countries, country) => {
-      // If it's a valid preset then we expand it.
-      if (/^preset-/.test(country)) {
-        this.assertWithErrorReturn_(
+    const expandedGroup = countryGroup
+      .reduce((countries, country) => {
+        // If it's a valid preset then we expand it.
+        if (/^preset-/.test(country)) {
+          this.assertWithErrorReturn_(
             isArray(ampGeoPresets[country]),
-            `<amp-geo> preset ${country} not found`);
-        return countries.concat(ampGeoPresets[country]);
-      }
-      // Otherwise we add the country to the list
-      countries.push(country);
-      return countries;
-    }, []).map(c => c.toLowerCase());
+            `<amp-geo> preset ${country} not found`
+          );
+          return countries.concat(ampGeoPresets[country]);
+        }
+        // Otherwise we add the country to the list
+        countries.push(country);
+        return countries;
+      }, [])
+      .map(c => c.toLowerCase());
     return expandedGroup.includes(this.country_);
   }
 
@@ -271,7 +280,7 @@ export class AmpGeo extends AMP.BaseElement {
   clearPreRender_(body) {
     const {classList} = body;
     const classesToRemove = [];
-    const stripRe = new RegExp('^' + COUNTRY_PREFIX + '|^' + GROUP_PREFIX ,'i');
+    const stripRe = new RegExp('^' + COUNTRY_PREFIX + '|^' + GROUP_PREFIX, 'i');
     for (let i = classList.length - 1; i > 0; i--) {
       if (stripRe.test(classList[i])) {
         classesToRemove.push(classList[i]);
@@ -303,7 +312,7 @@ export class AmpGeo extends AMP.BaseElement {
       switch (self.mode_) {
         case mode.GEO_OVERRIDE:
           classesToRemove = self.clearPreRender_(body);
-          // Intentionally fall through.
+        // Intentionally fall through.
         case mode.GEO_HOT_PATCH:
           // Build the AMP State, add classes
           states.ISOCountry = self.country_;
@@ -346,8 +355,9 @@ export class AmpGeo extends AMP.BaseElement {
               const state = ampdoc.win.document.createElement('amp-state');
               const confScript = ampdoc.win.document.createElement('script');
               confScript.setAttribute('type', 'application/json');
-              confScript.textContent =
-                  JSON.stringify(/** @type {!JsonObject} */(states)) ;
+              confScript.textContent = JSON.stringify(
+                /** @type {!JsonObject} */ (states)
+              );
               state.appendChild(confScript);
               state.id = GEO_ID;
               body.appendChild(state);
@@ -369,7 +379,6 @@ export class AmpGeo extends AMP.BaseElement {
     });
   }
 
-
   /**
    * isInCountryGroup API
    * @param {string} targetGroup group or comma delimited list of groups
@@ -380,16 +389,20 @@ export class AmpGeo extends AMP.BaseElement {
     const targets = targetGroup.trim().split(/,\s*/);
 
     // If any of the group are missing it's an error
-    if (targets.filter(group => {
-      return this.definedGroups_.indexOf(group) >= 0;
-    }).length !== targets.length) {
+    if (
+      targets.filter(group => {
+        return this.definedGroups_.indexOf(group) >= 0;
+      }).length !== targets.length
+    ) {
       return GEO_IN_GROUP.NOT_DEFINED;
     }
 
     // If any of the groups match it's a match
-    if (targets.filter(group => {
-      return this.matchedGroups_.indexOf(group) >= 0;
-    }).length > 0) {
+    if (
+      targets.filter(group => {
+        return this.matchedGroups_.indexOf(group) >= 0;
+      }).length > 0
+    ) {
       return GEO_IN_GROUP.IN;
     }
 
@@ -398,7 +411,6 @@ export class AmpGeo extends AMP.BaseElement {
   }
 }
 
-
 /**
  * Create the service promise at load time to prevent race between extensions
  */
diff --git a/extensions/amp-geo/0.1/test/test-amp-geo.js b/extensions/amp-geo/0.1/test/test-amp-geo.js
index 2b0ad5509ca8..2d4909398cb2 100644
--- a/extensions/amp-geo/0.1/test/test-amp-geo.js
+++ b/extensions/amp-geo/0.1/test/test-amp-geo.js
@@ -20,439 +20,431 @@ import {Services} from '../../../../src/services';
 import {user} from '../../../../src/log';
 import {vsyncForTesting} from '../../../../src/service/vsync-impl';
 
-
-describes.realWin('amp-geo', {
-  amp: {
-    extensions: ['amp-geo'],
+describes.realWin(
+  'amp-geo',
+  {
+    amp: {
+      extensions: ['amp-geo'],
+    },
   },
-}, env => {
-
-  const expectedState = '<amp-state id="ampGeo"><script type="application/json">{"ISOCountry":"unknown","nafta":true,"unknown":true,"ISOCountryGroups":["nafta","unknown"]}</script></amp-state>'; // eslint-disable-line
-
+  env => {
+    const expectedState =
+      '<amp-state id="ampGeo"><script type="application/json">{"ISOCountry":"unknown","nafta":true,"unknown":true,"ISOCountryGroups":["nafta","unknown"]}</script></amp-state>'; // eslint-disable-line
+
+    const config = {
+      ISOCountryGroups: {
+        nafta: ['ca', 'mx', 'us', 'unknown'],
+        unknown: ['unknown'],
+        eea: ['preset-eea'],
+        myGroup: ['preset-eea', 'us'],
+        anz: ['au', 'nz'],
+      },
+    };
 
-  const config = {
-    ISOCountryGroups: {
-      nafta: ['ca', 'mx', 'us', 'unknown'],
-      unknown: ['unknown'],
-      eea: ['preset-eea'],
-      myGroup: ['preset-eea', 'us'],
-      anz: ['au', 'nz'],
-    },
-  };
-
-  const configWithState = {
-    AmpBind: true,
-    ISOCountryGroups: {
-      nafta: ['ca', 'mx', 'us', 'unknown'],
-      unknown: ['unknown'],
-      anz: ['au', 'nz'],
-    },
-  };
+    const configWithState = {
+      AmpBind: true,
+      ISOCountryGroups: {
+        nafta: ['ca', 'mx', 'us', 'unknown'],
+        unknown: ['unknown'],
+        anz: ['au', 'nz'],
+      },
+    };
 
-  const configWithUppercase = {
-    ISOCountryGroups: {
-      nafta: ['CA', 'mx', 'us', 'unknown'],
-      unknown: ['unknown'],
-      anz: ['au', 'NZ'],
-    },
-  };
-
-  let win, doc;
-  let ampdoc;
-  let geo;
-  let el;
-  let userErrorStub;
-
-  beforeEach(() => {
-    userErrorStub = sandbox.stub(user(), 'error');
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    el = doc.createElement('amp-geo');
-    el.setAttribute('layout', 'nodisplay');
-    doc.body.appendChild(el);
-    el.ampdoc_ = ampdoc;
-    const vsync = vsyncForTesting(win);
-    vsync.schedule_ = () => {
-      vsync.runScheduledTasks_();
+    const configWithUppercase = {
+      ISOCountryGroups: {
+        nafta: ['CA', 'mx', 'us', 'unknown'],
+        unknown: ['unknown'],
+        anz: ['au', 'NZ'],
+      },
     };
 
-    geo = new AmpGeo(el);
-  });
+    let win, doc;
+    let ampdoc;
+    let geo;
+    let el;
+    let userErrorStub;
+
+    beforeEach(() => {
+      userErrorStub = sandbox.stub(user(), 'error');
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      el = doc.createElement('amp-geo');
+      el.setAttribute('layout', 'nodisplay');
+      doc.body.appendChild(el);
+      el.ampdoc_ = ampdoc;
+      const vsync = vsyncForTesting(win);
+      vsync.schedule_ = () => {
+        vsync.runScheduledTasks_();
+      };
+
+      geo = new AmpGeo(el);
+    });
 
-  afterEach(() => {
-    delete win.AMP_MODE.geoOverride;
-  });
+    afterEach(() => {
+      delete win.AMP_MODE.geoOverride;
+    });
 
-  function addConfigElement(opt_elementName, opt_type, opt_textContent) {
-    const child = doc.createElement(opt_elementName || 'script');
-    child.setAttribute('type', opt_type || 'application/json');
-    child.textContent = opt_textContent || JSON.stringify(config);
-    geo.element.appendChild(child);
-  }
+    function addConfigElement(opt_elementName, opt_type, opt_textContent) {
+      const child = doc.createElement(opt_elementName || 'script');
+      child.setAttribute('type', opt_type || 'application/json');
+      child.textContent = opt_textContent || JSON.stringify(config);
+      geo.element.appendChild(child);
+    }
 
-  function expectBodyHasClass(klasses, expected) {
-    for (const k in klasses) {
-      expect(doc.body.classList.contains(klasses[k]))
-          .to.equal(expected);
+    function expectBodyHasClass(klasses, expected) {
+      for (const k in klasses) {
+        expect(doc.body.classList.contains(klasses[k])).to.equal(expected);
+      }
     }
-  }
 
-  it('should not throw or error on empty config', () => {
-    expect(() => {
-      geo.buildCallback();
-    }).to.not.throw();
-    expect(userErrorStub).to.not.be.called;
-  });
+    it('should not throw or error on empty config', () => {
+      expect(() => {
+        geo.buildCallback();
+      }).to.not.throw();
+      expect(userErrorStub).to.not.be.called;
+    });
+
+    it('should not throw or error on valid config', () => {
+      expect(() => {
+        addConfigElement('script');
+        geo.buildCallback();
+      }).to.not.throw();
+      expect(userErrorStub).to.not.be.called;
+    });
 
-  it('should not throw or error on valid config', () => {
-    expect(() => {
+    it('should add classes to body element for the geo', () => {
       addConfigElement('script');
+
       geo.buildCallback();
-    }).to.not.throw();
-    expect(userErrorStub).to.not.be.called;
-  });
-
-  it('should add classes to body element for the geo', () => {
-    addConfigElement('script');
-
-    geo.buildCallback();
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('unknown');
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], false);
-    });
-  });
-
-  it('should remove amp-geo-pending class from body element', () => {
-    addConfigElement('script');
-    doc.body.classList.add('amp-geo-pending');
-
-    expectBodyHasClass([
-      'amp-geo-pending',
-    ], true);
-
-    geo.buildCallback();
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('unknown');
-      expectBodyHasClass([
-        'amp-geo-pending',
-      ], false);
-    });
-  });
-
-  it('should insert an amp-state if enabled', () => {
-    addConfigElement('script', 'application/json',
-        JSON.stringify(configWithState));
-    geo.buildCallback();
-
-    // Make an amp-state that should be removed and replaced.
-    const child = doc.createElement('amp-state');
-    child.setAttribute('id', 'ampGeo');
-    child.textContent = 'bad state';
-    doc.body.appendChild(child);
-
-    return Services.geoForDocOrNull(el).then(() => {
-      expect(win.document.getElementById('ampGeo').outerHTML)
-          .to.equal(expectedState);
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('unknown');
+        expectBodyHasClass(
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          true
+        );
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], false);
+      });
     });
-  });
 
-  it('should not insert an amp-state by default', () => {
-    addConfigElement('script');
-    geo.buildCallback();
+    it('should remove amp-geo-pending class from body element', () => {
+      addConfigElement('script');
+      doc.body.classList.add('amp-geo-pending');
+
+      expectBodyHasClass(['amp-geo-pending'], true);
 
-    return Services.geoForDocOrNull(el).then(() => {
-      expect(win.document.getElementById('ampGeo'))
-          .to.equal(null);
+      geo.buildCallback();
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('unknown');
+        expectBodyHasClass(['amp-geo-pending'], false);
+      });
     });
-  });
-
-  it('should allow hash to override geo in test', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-        'amp-geo-no-group',
-        'amp-geo-group-eea',
-        'amp-geo-group-myGroup',
-      ], false);
+
+    it('should insert an amp-state if enabled', () => {
+      addConfigElement(
+        'script',
+        'application/json',
+        JSON.stringify(configWithState)
+      );
+      geo.buildCallback();
+
+      // Make an amp-state that should be removed and replaced.
+      const child = doc.createElement('amp-state');
+      child.setAttribute('id', 'ampGeo');
+      child.textContent = 'bad state';
+      doc.body.appendChild(child);
+
+      return Services.geoForDocOrNull(el).then(() => {
+        expect(win.document.getElementById('ampGeo').outerHTML).to.equal(
+          expectedState
+        );
+      });
     });
-  });
-
-  it('should allow preset country groups', () => {
-    win.AMP_MODE.geoOverride = 'fr';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('fr');
-      expectBodyHasClass([
-        'amp-iso-country-fr',
-        'amp-geo-group-eea',
-        'amp-geo-group-myGroup',
-      ], true);
-      expectBodyHasClass([,
-        'amp-geo-no-group',
-      ], false);
+
+    it('should not insert an amp-state by default', () => {
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(() => {
+        expect(win.document.getElementById('ampGeo')).to.equal(null);
+      });
     });
-  });
-
-
-  it('should set amp-geo-no-group if no group matches', () => {
-    win.AMP_MODE.geoOverride = 'za';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('za');
-      expectBodyHasClass([
-        'amp-iso-country-za',
-        'amp-geo-no-group',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-        'amp-geo-group-anz',
-      ], false);
+
+    it('should allow hash to override geo in test', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
+        expectBodyHasClass(
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-nafta',
+            'amp-geo-no-group',
+            'amp-geo-group-eea',
+            'amp-geo-group-myGroup',
+          ],
+          false
+        );
+      });
     });
-  });
-
-  it('should return configured and matched groups in `geo` service', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expect(geo.allISOCountryGroups)
-          .to.deep.equal(Object.keys(config.ISOCountryGroups));
-      expect(geo.matchedISOCountryGroups)
-          .to.deep.equal(['anz']);
+
+    it('should allow preset country groups', () => {
+      win.AMP_MODE.geoOverride = 'fr';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('fr');
+        expectBodyHasClass(
+          ['amp-iso-country-fr', 'amp-geo-group-eea', 'amp-geo-group-myGroup'],
+          true
+        );
+        expectBodyHasClass([, 'amp-geo-no-group'], false);
+      });
     });
-  });
-
-  it('isInCountryGroup works with multiple group targets', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-
-      /* multi group case */
-      expect(geo.isInCountryGroup('nafta, anz'))
-          .to.equal(GEO_IN_GROUP.IN);
-      expect(geo.isInCountryGroup('nafta, unknown'))
-          .to.equal(GEO_IN_GROUP.NOT_IN);
-      expect(geo.isInCountryGroup('nafta, foobar'))
-          .to.equal(GEO_IN_GROUP.NOT_DEFINED);
+
+    it('should set amp-geo-no-group if no group matches', () => {
+      win.AMP_MODE.geoOverride = 'za';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('za');
+        expectBodyHasClass(['amp-iso-country-za', 'amp-geo-no-group'], true);
+        expectBodyHasClass(
+          [
+            'amp-iso-country-unknown',
+            'amp-geo-group-nafta',
+            'amp-geo-group-anz',
+          ],
+          false
+        );
+      });
     });
-  });
-
-  it('isInCountryGroup works with single group targets', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-
-      /* single group case */
-      expect(geo.isInCountryGroup('anz'))
-          .to.equal(GEO_IN_GROUP.IN);
-      expect(geo.isInCountryGroup('nafta'))
-          .to.equal(GEO_IN_GROUP.NOT_IN);
-      expect(geo.isInCountryGroup('foobar'))
-          .to.equal(GEO_IN_GROUP.NOT_DEFINED);
+
+    it('should return configured and matched groups in `geo` service', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expect(geo.allISOCountryGroups).to.deep.equal(
+          Object.keys(config.ISOCountryGroups)
+        );
+        expect(geo.matchedISOCountryGroups).to.deep.equal(['anz']);
+      });
     });
-  });
-
-  it('should allow uppercase hash to override geo in test', () => {
-    win.AMP_MODE.geoOverride = 'NZ';
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-      ], false);
+
+    it('isInCountryGroup works with multiple group targets', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+
+        /* multi group case */
+        expect(geo.isInCountryGroup('nafta, anz')).to.equal(GEO_IN_GROUP.IN);
+        expect(geo.isInCountryGroup('nafta, unknown')).to.equal(
+          GEO_IN_GROUP.NOT_IN
+        );
+        expect(geo.isInCountryGroup('nafta, foobar')).to.equal(
+          GEO_IN_GROUP.NOT_DEFINED
+        );
+      });
     });
-  });
-
-  it('should accept uppercase country codes in config', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    addConfigElement('script', 'application/json',
-        JSON.stringify(configWithUppercase));
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-      ], false);
+
+    it('isInCountryGroup works with single group targets', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+
+        /* single group case */
+        expect(geo.isInCountryGroup('anz')).to.equal(GEO_IN_GROUP.IN);
+        expect(geo.isInCountryGroup('nafta')).to.equal(GEO_IN_GROUP.NOT_IN);
+        expect(geo.isInCountryGroup('foobar')).to.equal(
+          GEO_IN_GROUP.NOT_DEFINED
+        );
+      });
     });
-  });
-
-  /**
-   * pre-rendered geo is the the case where a publisher uses their own
-   * infrastructure to add a country tag to the body.
-   */
-  it('should respect pre-rendered geo tags', () => {
-    addConfigElement('script');
-    doc.body.classList.add('amp-iso-country-nz', 'amp-geo-group-anz');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-      ], false);
+
+    it('should allow uppercase hash to override geo in test', () => {
+      win.AMP_MODE.geoOverride = 'NZ';
+      addConfigElement('script');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
+        expectBodyHasClass(
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
     });
-  });
-
-  it('should allow hash to override pre-rendered geo in test', () => {
-    win.AMP_MODE.geoOverride = 'nz';
-    doc.body.classList.add('amp-iso-country-mx', 'amp-geo-group-nafta');
-    addConfigElement('script');
-    geo.buildCallback();
-
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('nz');
-      expectBodyHasClass([
-        'amp-iso-country-nz',
-        'amp-geo-group-anz',
-      ], true);
-      expectBodyHasClass([
-        'amp-iso-country-unknown',
-        'amp-geo-group-nafta',
-      ], false);
+
+    it('should accept uppercase country codes in config', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      addConfigElement(
+        'script',
+        'application/json',
+        JSON.stringify(configWithUppercase)
+      );
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
+        expectBodyHasClass(
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
     });
-  });
 
+    /**
+     * pre-rendered geo is the the case where a publisher uses their own
+     * infrastructure to add a country tag to the body.
+     */
+    it('should respect pre-rendered geo tags', () => {
+      addConfigElement('script');
+      doc.body.classList.add('amp-iso-country-nz', 'amp-geo-group-anz');
+      geo.buildCallback();
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
+        expectBodyHasClass(
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
+    });
 
-  it('geo service should resolve correctly.', () => {
-    addConfigElement('script');
-    geo.buildCallback();
+    it('should allow hash to override pre-rendered geo in test', () => {
+      win.AMP_MODE.geoOverride = 'nz';
+      doc.body.classList.add('amp-iso-country-mx', 'amp-geo-group-nafta');
+      addConfigElement('script');
+      geo.buildCallback();
 
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('unknown');
-      expect(geo.matchedISOCountryGroups).to.deep.equal(['nafta', 'unknown']);
-      expect(geo.allISOCountryGroups).to
-          .deep.equal(['nafta', 'unknown', 'eea', 'myGroup', 'anz']);
-      expect(geo.isInCountryGroup).to.be.a('function');
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('nz');
+        expectBodyHasClass(['amp-iso-country-nz', 'amp-geo-group-anz'], true);
+        expectBodyHasClass(
+          ['amp-iso-country-unknown', 'amp-geo-group-nafta'],
+          false
+        );
+      });
     });
-  });
 
-  it('geo service should return null on bad config. ', () => {
-    addConfigElement('script');
-    addConfigElement('script');
-    expect(() => allowConsoleError(() => {
+    it('geo service should resolve correctly.', () => {
+      addConfigElement('script');
       geo.buildCallback();
-    })).to.throw();
-
-    return expect(Services.geoForDocOrNull(el)).to.eventually.equal(null);
-  });
-
-  it('geo should log an error if unpatched in production. ', () => {
-    expectAsyncConsoleError(/GEONOTPATCHED/);
-    sandbox.stub(win.AMP_MODE, 'localDev').value(false);
-    addConfigElement('script');
-
-    geo.buildCallback();
-    return Services.geoForDocOrNull(el).then(geo => {
-      expect(geo.ISOCountry).to.equal('unknown');
-      expectBodyHasClass([
-        'amp-geo-error',
-      ], true);
+
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('unknown');
+        expect(geo.matchedISOCountryGroups).to.deep.equal(['nafta', 'unknown']);
+        expect(geo.allISOCountryGroups).to.deep.equal([
+          'nafta',
+          'unknown',
+          'eea',
+          'myGroup',
+          'anz',
+        ]);
+        expect(geo.isInCountryGroup).to.be.a('function');
+      });
     });
-  });
 
-  it('should throw if it has multiple script child elements', () => {
-    expect(() => {
+    it('geo service should return null on bad config. ', () => {
       addConfigElement('script');
       addConfigElement('script');
-      allowConsoleError(() => {
-        geo.buildCallback();
-      });
-    }).to.throw(/can only have one <script type="application\/json"> child​​​/);
-  });
+      expect(() =>
+        allowConsoleError(() => {
+          geo.buildCallback();
+        })
+      ).to.throw();
 
-  it('should throw if the child element is not a <script> element', () => {
-    expect(() => {
-      addConfigElement('a');
-      allowConsoleError(() => {
-        geo.buildCallback();
-      });
-    }).to.throw(/script/);
-  });
+      return expect(Services.geoForDocOrNull(el)).to.eventually.equal(null);
+    });
 
-  it('should throw if the child script element is not json typed', () => {
-    expect(() => {
-      addConfigElement('script', 'wrongtype');
-      allowConsoleError(() => {
-        geo.buildCallback();
-      });
-    }).to.throw(/application\/json/);
-  });
+    it('geo should log an error if unpatched in production. ', () => {
+      expectAsyncConsoleError(/GEONOTPATCHED/);
+      sandbox.stub(win.AMP_MODE, 'localDev').value(false);
+      addConfigElement('script');
 
-  it('should error if the child script element has non-JSON content', () => {
-    expect(() => {
-      addConfigElement('script', 'application/json', '{not json}');
-      allowConsoleError(() => {
-        geo.buildCallback();
-      });
-    }).to.throw(/JSON/);
-  });
-
-  it('should throw if the group name is not valid', () => {
-    expect(() => {
-      addConfigElement('script', 'application/json',
-          {'ISOCountryGroups': {'foo<': ['us']}});
-      allowConsoleError(() => {
-        geo.buildCallback();
-      });
-    }).to.throw();
-  });
-
-  it('should throw if the preset name is not valid', () => {
-    expect(() => {
-      addConfigElement('script', 'application/json',
-          {'ISOCountryGroups': {'foo': ['preset-foo']}});
-      allowConsoleError(() => {
-        geo.buildCallback();
+      geo.buildCallback();
+      return Services.geoForDocOrNull(el).then(geo => {
+        expect(geo.ISOCountry).to.equal('unknown');
+        expectBodyHasClass(['amp-geo-error'], true);
       });
-    }).to.throw();
-  });
-});
+    });
+
+    it('should throw if it has multiple script child elements', () => {
+      expect(() => {
+        addConfigElement('script');
+        addConfigElement('script');
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw(
+        /can only have one <script type="application\/json"> child​​​/
+      );
+    });
+
+    it('should throw if the child element is not a <script> element', () => {
+      expect(() => {
+        addConfigElement('a');
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw(/script/);
+    });
+
+    it('should throw if the child script element is not json typed', () => {
+      expect(() => {
+        addConfigElement('script', 'wrongtype');
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw(/application\/json/);
+    });
+
+    it('should error if the child script element has non-JSON content', () => {
+      expect(() => {
+        addConfigElement('script', 'application/json', '{not json}');
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw(/JSON/);
+    });
+
+    it('should throw if the group name is not valid', () => {
+      expect(() => {
+        addConfigElement('script', 'application/json', {
+          'ISOCountryGroups': {'foo<': ['us']},
+        });
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw();
+    });
+
+    it('should throw if the preset name is not valid', () => {
+      expect(() => {
+        addConfigElement('script', 'application/json', {
+          'ISOCountryGroups': {'foo': ['preset-foo']},
+        });
+        allowConsoleError(() => {
+          geo.buildCallback();
+        });
+      }).to.throw();
+    });
+  }
+);
diff --git a/extensions/amp-gfycat/0.1/amp-gfycat.js b/extensions/amp-gfycat/0.1/amp-gfycat.js
index 6e064ede0f23..e51248087644 100644
--- a/extensions/amp-gfycat/0.1/amp-gfycat.js
+++ b/extensions/amp-gfycat/0.1/amp-gfycat.js
@@ -20,9 +20,7 @@ import {addParamsToUrl} from '../../../src/url';
 import {dev, userAssert} from '../../../src/log';
 import {getData, listen} from '../../../src/event-helper';
 import {getDataParamsFromAttributes, removeElement} from '../../../src/dom';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 const TAG = 'amp-gfycat';
@@ -31,7 +29,6 @@ const TAG = 'amp-gfycat';
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpGfycat extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -87,19 +84,23 @@ class AmpGfycat extends AMP.BaseElement {
     const placeholder = this.win.document.createElement('amp-img');
     const videoid = dev().assertString(this.videoid_);
     this.propagateAttributes(['alt', 'aria-label'], placeholder);
-    placeholder.setAttribute('src',
-        'https://thumbs.gfycat.com/' +
-        encodeURIComponent(videoid) + '-poster.jpg');
+    placeholder.setAttribute(
+      'src',
+      'https://thumbs.gfycat.com/' + encodeURIComponent(videoid) + '-poster.jpg'
+    );
     placeholder.setAttribute('layout', 'fill');
     placeholder.setAttribute('placeholder', '');
     placeholder.setAttribute('referrerpolicy', 'origin');
     if (this.element.hasAttribute('aria-label')) {
-      placeholder.setAttribute('alt',
-          'Loading gif ' + this.element.getAttribute('aria-label')
+      placeholder.setAttribute(
+        'alt',
+        'Loading gif ' + this.element.getAttribute('aria-label')
       );
     } else if (this.element.hasAttribute('alt')) {
-      placeholder.setAttribute('alt',
-          'Loading gif ' + this.element.getAttribute('alt'));
+      placeholder.setAttribute(
+        'alt',
+        'Loading gif ' + this.element.getAttribute('alt')
+      );
     } else {
       placeholder.setAttribute('alt', 'Loading gif');
     }
@@ -114,9 +115,10 @@ class AmpGfycat extends AMP.BaseElement {
    */
   getVideoId_() {
     return userAssert(
-        this.element.getAttribute('data-gfyid'),
-        'The data-gfyid attribute is required for <amp-gfycat> %s',
-        this.element);
+      this.element.getAttribute('data-gfyid'),
+      'The data-gfyid attribute is required for <amp-gfycat> %s',
+      this.element
+    );
   }
 
   /** @return {string} */
@@ -135,7 +137,7 @@ class AmpGfycat extends AMP.BaseElement {
       params['autoplay'] = '0';
     }
     src = addParamsToUrl(src, params);
-    return this.videoIframeSrc_ = src;
+    return (this.videoIframeSrc_ = src);
   }
 
   /** @override */
@@ -149,9 +151,9 @@ class AmpGfycat extends AMP.BaseElement {
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleGfycatMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleGfycatMessages_.bind(this)
     );
 
     this.element.appendChild(iframe);
@@ -181,7 +183,7 @@ class AmpGfycat extends AMP.BaseElement {
   sendCommand_(command, opt_arg) {
     if (this.iframe_ && this.iframe_.contentWindow) {
       const message = command;
-      this.iframe_.contentWindow./*OK*/postMessage(message, '*');
+      this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
     }
   }
 
@@ -192,9 +194,11 @@ class AmpGfycat extends AMP.BaseElement {
   handleGfycatMessages_(event) {
     const eventData = /** @type {?string|undefined} */ (getData(event));
 
-    if (event.origin !== 'https://gfycat.com' ||
-        event.source != this.iframe_.contentWindow ||
-        typeof eventData !== 'string') {
+    if (
+      event.origin !== 'https://gfycat.com' ||
+      event.source != this.iframe_.contentWindow ||
+      typeof eventData !== 'string'
+    ) {
       return;
     }
 
@@ -313,7 +317,6 @@ class AmpGfycat extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpGfycat);
 });
diff --git a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
index e1ce3cb7ed62..4aab7ac8602b 100644
--- a/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
+++ b/extensions/amp-gfycat/0.1/test/test-amp-gfycat.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
  *
@@ -19,74 +18,83 @@ import '../amp-gfycat';
 import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 
-describes.realWin('amp-gfycat', {
-  amp: {
-    extensions: ['amp-gfycat'],
+describes.realWin(
+  'amp-gfycat',
+  {
+    amp: {
+      extensions: ['amp-gfycat'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getGfycat(gfyId, opt_params) {
-    const gfycat = doc.createElement('amp-gfycat');
-    gfycat.setAttribute('data-gfyid', gfyId);
-    gfycat.setAttribute('width', 640);
-    gfycat.setAttribute('height', 640);
-    if (opt_params && opt_params.withAlt) {
-      gfycat.setAttribute('alt', 'test alt label');
-    }
-    if (opt_params && opt_params.withAria) {
-      gfycat.setAttribute('aria-label', 'test aria label');
-    }
-    if (opt_params && opt_params.responsive) {
-      gfycat.setAttribute('layout', 'responsive');
-    }
-    if (opt_params && opt_params.noautoplay) {
-      gfycat.setAttribute('noautoplay', '');
+    function getGfycat(gfyId, opt_params) {
+      const gfycat = doc.createElement('amp-gfycat');
+      gfycat.setAttribute('data-gfyid', gfyId);
+      gfycat.setAttribute('width', 640);
+      gfycat.setAttribute('height', 640);
+      if (opt_params && opt_params.withAlt) {
+        gfycat.setAttribute('alt', 'test alt label');
+      }
+      if (opt_params && opt_params.withAria) {
+        gfycat.setAttribute('aria-label', 'test aria label');
+      }
+      if (opt_params && opt_params.responsive) {
+        gfycat.setAttribute('layout', 'responsive');
+      }
+      if (opt_params && opt_params.noautoplay) {
+        gfycat.setAttribute('noautoplay', '');
+      }
+      doc.body.appendChild(gfycat);
+      return gfycat
+        .build()
+        .then(() => {
+          return gfycat.layoutCallback();
+        })
+        .then(() => gfycat);
     }
-    doc.body.appendChild(gfycat);
-    return gfycat.build().then(() => {
-      return gfycat.layoutCallback();
-    }).then(() => gfycat);
-  }
 
-  it('renders', () => {
-    return getGfycat('LeanMediocreBeardeddragon').then(gfycat => {
-      const iframe = gfycat.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal('https://gfycat.com/ifr/LeanMediocreBeardeddragon');
+    it('renders', () => {
+      return getGfycat('LeanMediocreBeardeddragon').then(gfycat => {
+        const iframe = gfycat.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://gfycat.com/ifr/LeanMediocreBeardeddragon'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getGfycat('LeanMediocreBeardeddragon', {
-      responsive: true,
-    }).then(gfycat => {
-      const iframe = gfycat.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getGfycat('LeanMediocreBeardeddragon', {
+        responsive: true,
+      }).then(gfycat => {
+        const iframe = gfycat.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
-  it('noautoplay', () => {
-    return getGfycat('LeanMediocreBeardeddragon', {
-      noautoplay: true,
-    }).then(gfycat => {
-      const iframe = gfycat.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.src)
-          .to.equal('https://gfycat.com/ifr/LeanMediocreBeardeddragon?autoplay=0');
+    it('noautoplay', () => {
+      return getGfycat('LeanMediocreBeardeddragon', {
+        noautoplay: true,
+      }).then(gfycat => {
+        const iframe = gfycat.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.equal(
+          'https://gfycat.com/ifr/LeanMediocreBeardeddragon?autoplay=0'
+        );
+      });
     });
-  });
 
-  it('should forward events from gfycat player to the amp element', () => {
-    return getGfycat('LeanMediocreBeardeddragon').then(gfycat => {
-      const iframe = gfycat.querySelector('iframe');
-      return Promise.resolve()
+    it('should forward events from gfycat player to the amp element', () => {
+      return getGfycat('LeanMediocreBeardeddragon').then(gfycat => {
+        const iframe = gfycat.querySelector('iframe');
+        return Promise.resolve()
           .then(() => {
             const p = listenOncePromise(gfycat, VideoEvents.PLAYING);
             sendFakeMessage(gfycat, iframe, 'playing');
@@ -97,42 +105,46 @@ describes.realWin('amp-gfycat', {
             sendFakeMessage(gfycat, iframe, 'paused');
             return p;
           });
+      });
     });
-  });
 
-  function sendFakeMessage(gfycat, iframe, command) {
-    gfycat.implementation_.handleGfycatMessages_({
-      origin: 'https://gfycat.com',
-      source: iframe.contentWindow,
-      data: command,
-    });
-  }
+    function sendFakeMessage(gfycat, iframe, command) {
+      gfycat.implementation_.handleGfycatMessages_({
+        origin: 'https://gfycat.com',
+        source: iframe.contentWindow,
+        data: command,
+      });
+    }
 
-  it('requires data-gfyid', () => {
-    return allowConsoleError(() => {
-      return getGfycat('').should.eventually.be.rejectedWith(
-          /The data-gfyid attribute is required for/);
+    it('requires data-gfyid', () => {
+      return allowConsoleError(() => {
+        return getGfycat('').should.eventually.be.rejectedWith(
+          /The data-gfyid attribute is required for/
+        );
+      });
     });
-  });
 
-  it('renders placeholder with an alt', () => {
-    return getGfycat('LeanMediocreBeardeddragon', {
-      withAlt: true,
-    }).then(gfycat => {
-      const placeHolder = gfycat.querySelector('amp-img');
-      expect(placeHolder).to.not.be.null;
-      expect(placeHolder.getAttribute('alt')).to.equal(
-          'Loading gif test alt label');
+    it('renders placeholder with an alt', () => {
+      return getGfycat('LeanMediocreBeardeddragon', {
+        withAlt: true,
+      }).then(gfycat => {
+        const placeHolder = gfycat.querySelector('amp-img');
+        expect(placeHolder).to.not.be.null;
+        expect(placeHolder.getAttribute('alt')).to.equal(
+          'Loading gif test alt label'
+        );
+      });
     });
-  });
-  it('renders placeholder with an aria-label', () => {
-    return getGfycat('LeanMediocreBeardeddragon', {
-      withAria: true,
-    }).then(gfycat => {
-      const placeHolder = gfycat.querySelector('amp-img');
-      expect(placeHolder).to.not.be.null;
-      expect(placeHolder.getAttribute('alt')).to.equal(
-          'Loading gif test aria label');
+    it('renders placeholder with an aria-label', () => {
+      return getGfycat('LeanMediocreBeardeddragon', {
+        withAria: true,
+      }).then(gfycat => {
+        const placeHolder = gfycat.querySelector('amp-img');
+        expect(placeHolder).to.not.be.null;
+        expect(placeHolder.getAttribute('alt')).to.equal(
+          'Loading gif test aria label'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-gist/0.1/amp-gist.js b/extensions/amp-gist/0.1/amp-gist.js
index 67b60b5d647e..05f9ce34ca8e 100644
--- a/extensions/amp-gist/0.1/amp-gist.js
+++ b/extensions/amp-gist/0.1/amp-gist.js
@@ -33,7 +33,6 @@ import {listenFor} from '../../../src/iframe-helper';
 import {removeElement} from '../../../src/dom';
 
 export class AmpGist extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -43,9 +42,9 @@ export class AmpGist extends AMP.BaseElement {
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://gist.github.com/', opt_onLayout);
   }
@@ -61,9 +60,14 @@ export class AmpGist extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'github');
     this.applyFillContent(iframe);
     // Triggered by window.context.requestResize() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this./*OK*/ changeHeight(data['height']);
+      },
+      /* opt_is3P */ true
+    );
 
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
@@ -82,7 +86,6 @@ export class AmpGist extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-gist', '0.1', AMP => {
   AMP.registerElement('amp-gist', AmpGist);
 });
diff --git a/extensions/amp-gist/0.1/test/test-amp-gist.js b/extensions/amp-gist/0.1/test/test-amp-gist.js
index cbf66b938d09..37dfb5cd6589 100644
--- a/extensions/amp-gist/0.1/test/test-amp-gist.js
+++ b/extensions/amp-gist/0.1/test/test-amp-gist.js
@@ -16,49 +16,58 @@
 
 import '../amp-gist';
 
-
-describes.realWin('amp-gist', {
-  amp: {
-    extensions: ['amp-gist'],
+describes.realWin(
+  'amp-gist',
+  {
+    amp: {
+      extensions: ['amp-gist'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getIns(gistid, file) {
-    const ins = doc.createElement('amp-gist');
-    ins.setAttribute('data-gistid', gistid);
-    ins.setAttribute('height', '237');
-    if (file) {
-      ins.setAttribute('data-file', file);
+    function getIns(gistid, file) {
+      const ins = doc.createElement('amp-gist');
+      ins.setAttribute('data-gistid', gistid);
+      ins.setAttribute('height', '237');
+      if (file) {
+        ins.setAttribute('data-file', file);
+      }
+      doc.body.appendChild(ins);
+      return ins
+        .build()
+        .then(() => ins.layoutCallback())
+        .then(() => ins);
     }
-    doc.body.appendChild(ins);
-    return ins.build().then(() => ins.layoutCallback()).then(() => ins);
-  }
 
-  it('renders responsively', () => {
-    return getIns('b9bb35bc68df68259af94430f012425f').then(ins => {
-      const iframe = ins.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getIns('b9bb35bc68df68259af94430f012425f').then(ins => {
+        const iframe = ins.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('renders responsively with specific file', () => {
-    return getIns('b9bb35bc68df68259af94430f012425f', 'hello-world.html')
-        .then(ins => {
-          const iframe = ins.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.className).to.match(/i-amphtml-fill-content/);
-        });
-  });
+    it('renders responsively with specific file', () => {
+      return getIns(
+        'b9bb35bc68df68259af94430f012425f',
+        'hello-world.html'
+      ).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
+    });
 
-  it('Rejects because data-gistid is missing', () => {
-    expect(getIns('')).to.be.rejectedWith(
-        /The data-gistid attribute is required for/);
-  });
-});
+    it('Rejects because data-gistid is missing', () => {
+      expect(getIns('')).to.be.rejectedWith(
+        /The data-gistid attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js b/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js
index ceb96338e939..17bc45f38434 100644
--- a/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js
+++ b/extensions/amp-google-document-embed/0.1/amp-google-document-embed.js
@@ -34,14 +34,11 @@ import {removeElement} from '../../../src/dom';
 
 export const TAG = 'amp-google-document-embed';
 
-const ATTRIBUTES_TO_PROPAGATE = [
-  'title',
-];
+const ATTRIBUTES_TO_PROPAGATE = ['title'];
 
 const GOOGLE_DOCS_EMBED_RE = /^https?:\/\/docs\.google\.com.+\/pub.*\??/;
 
 export class AmpDriveViewer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -75,9 +72,10 @@ export class AmpDriveViewer extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     userAssert(
-        this.element.getAttribute('src'),
-        'The src attribute is required for <amp-google-document-embed> %s',
-        this.element);
+      this.element.getAttribute('src'),
+      'The src attribute is required for <amp-google-document-embed> %s',
+      this.element
+    );
   }
 
   /** @override */
@@ -99,7 +97,8 @@ export class AmpDriveViewer extends AMP.BaseElement {
   /** @override */
   mutatedAttributesCallback(mutations) {
     const attrs = ATTRIBUTES_TO_PROPAGATE.filter(
-        value => mutations[value] !== undefined);
+      value => mutations[value] !== undefined
+    );
     const iframe = dev().assertElement(this.iframe_);
     this.propagateAttributes(attrs, iframe, /* opt_removeMissingAttrs */ true);
     const src = mutations['src'];
@@ -119,7 +118,10 @@ export class AmpDriveViewer extends AMP.BaseElement {
       return src;
     }
     return addParamToUrl(
-        'https://docs.google.com/gview?embedded=true', 'url', src);
+      'https://docs.google.com/gview?embedded=true',
+      'url',
+      src
+    );
   }
 
   /** @override */
@@ -137,7 +139,6 @@ export class AmpDriveViewer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-google-document-embed', '0.1', AMP => {
   AMP.registerElement('amp-google-document-embed', AmpDriveViewer);
 });
diff --git a/extensions/amp-google-document-embed/0.1/test/test-amp-google-document-embed.js b/extensions/amp-google-document-embed/0.1/test/test-amp-google-document-embed.js
index 81f9d2c0127a..ee2e653ce78e 100644
--- a/extensions/amp-google-document-embed/0.1/test/test-amp-google-document-embed.js
+++ b/extensions/amp-google-document-embed/0.1/test/test-amp-google-document-embed.js
@@ -16,58 +16,66 @@
 
 import '../amp-google-document-embed';
 
-describes.realWin('amp-google-document-embed', {
-  amp: {
-    extensions: ['amp-google-document-embed'],
+describes.realWin(
+  'amp-google-document-embed',
+  {
+    amp: {
+      extensions: ['amp-google-document-embed'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getDriveViewer(src, opt_responsive) {
-    const element = doc.createElement('amp-google-document-embed');
-    element.setAttribute('width', '100');
-    element.setAttribute('height', '100');
-    if (src) {
-      element.setAttribute('src', src);
-    }
-    if (opt_responsive) {
-      element.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(element);
+    function getDriveViewer(src, opt_responsive) {
+      const element = doc.createElement('amp-google-document-embed');
+      element.setAttribute('width', '100');
+      element.setAttribute('height', '100');
+      if (src) {
+        element.setAttribute('src', src);
+      }
+      if (opt_responsive) {
+        element.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(element);
 
-    return element.build()
+      return element
+        .build()
         .then(() => element.layoutCallback())
         .then(() => element);
-  }
+    }
 
-  it('renders arbitrary documents', () => {
-    return getDriveViewer('https://example.com/doc.pdf').then(element => {
-      const iframe = element.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.src).to.equal('https://docs.google.com/gview?embedded=true&url=https%3A%2F%2Fexample.com%2Fdoc.pdf');
+    it('renders arbitrary documents', () => {
+      return getDriveViewer('https://example.com/doc.pdf').then(element => {
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.equal(
+          'https://docs.google.com/gview?embedded=true&url=https%3A%2F%2Fexample.com%2Fdoc.pdf'
+        );
+      });
     });
-  });
 
-  it('renders Google Docs documents', () => {
-    const googleDocumentUrl = 'https://docs.google.com/document/d/e/2PACX-1vQcy6GoJ2yCKMxe4SNALCPCYWV2Ufg-e6D3djyaJluQXubAfKA3toPqVxWaWK-lJFm4Nyxv-swrkvyN/pub';
-    return getDriveViewer(googleDocumentUrl).then(element => {
-      const iframe = element.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.src).to.equal(googleDocumentUrl);
+    it('renders Google Docs documents', () => {
+      const googleDocumentUrl =
+        'https://docs.google.com/document/d/e/2PACX-1vQcy6GoJ2yCKMxe4SNALCPCYWV2Ufg-e6D3djyaJluQXubAfKA3toPqVxWaWK-lJFm4Nyxv-swrkvyN/pub';
+      return getDriveViewer(googleDocumentUrl).then(element => {
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.src).to.equal(googleDocumentUrl);
+      });
     });
-  });
 
-  it('removes iframe after unlayoutCallback', () => {
-    return getDriveViewer('https://example.com/doc.pdf').then(element => {
-      const impl = element.implementation_;
-      impl.unlayoutCallback();
-      expect(element.querySelector('iframe')).to.be.null;
-      expect(impl.iframe_).to.be.null;
+    it('removes iframe after unlayoutCallback', () => {
+      return getDriveViewer('https://example.com/doc.pdf').then(element => {
+        const impl = element.implementation_;
+        impl.unlayoutCallback();
+        expect(element.querySelector('iframe')).to.be.null;
+        expect(impl.iframe_).to.be.null;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-google-vrview-image/0.1/amp-google-vrview-image.js b/extensions/amp-google-vrview-image/0.1/amp-google-vrview-image.js
index 51564d81e108..455178b3258b 100644
--- a/extensions/amp-google-vrview-image/0.1/amp-google-vrview-image.js
+++ b/extensions/amp-google-vrview-image/0.1/amp-google-vrview-image.js
@@ -22,9 +22,7 @@ import {userAssert} from '../../../src/log';
 /** @const */
 const TAG = 'amp-google-vrview-image';
 
-
 class AmpGoogleVrviewImage extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -34,7 +32,6 @@ class AmpGoogleVrviewImage extends AMP.BaseElement {
 
     /** @private {string} */
     this.src_ = '';
-
   }
 
   /** @override */
@@ -44,11 +41,15 @@ class AmpGoogleVrviewImage extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-google-vrview-image'),
-        'TAG amp-google-vrview-image disabled');
-
-    this.imageSrc_ = assertHttpsUrl(this.element.getAttribute('src'),
-        this.element);
+    userAssert(
+      isExperimentOn(this.win, 'amp-google-vrview-image'),
+      'TAG amp-google-vrview-image disabled'
+    );
+
+    this.imageSrc_ = assertHttpsUrl(
+      this.element.getAttribute('src'),
+      this.element
+    );
     // TODO(dvoytenko): Consider recompiling and hosting viewer on the
     // cdn.ampproject.org as an iframe viewer or even possibly compiling
     // it as an AMP element.
@@ -98,7 +99,6 @@ class AmpGoogleVrviewImage extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpGoogleVrviewImage);
 });
diff --git a/extensions/amp-google-vrview-image/0.1/test/test-amp-google-vrview-image.js b/extensions/amp-google-vrview-image/0.1/test/test-amp-google-vrview-image.js
index b40e8e6797ae..8759e1ded3d0 100644
--- a/extensions/amp-google-vrview-image/0.1/test/test-amp-google-vrview-image.js
+++ b/extensions/amp-google-vrview-image/0.1/test/test-amp-google-vrview-image.js
@@ -17,79 +17,91 @@
 import '../amp-google-vrview-image';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
-describes.realWin('amp-google-vrview-image', {
-  amp: {
-    extensions: ['amp-google-vrview-image'],
+describes.realWin(
+  'amp-google-vrview-image',
+  {
+    amp: {
+      extensions: ['amp-google-vrview-image'],
+    },
   },
-}, function(env) {
-  let win, doc;
+  function(env) {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    toggleExperiment(win, 'amp-google-vrview-image', true);
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'amp-google-vrview-image', true);
+    });
 
-  function getVrImage(attributes, opt_responsive, opt_beforeLayoutCallback) {
-    const vr = doc.createElement('amp-google-vrview-image');
-    for (const key in attributes) {
-      vr.setAttribute(key, attributes[key]);
-    }
-    vr.setAttribute('width', '111');
-    vr.setAttribute('height', '222');
-    if (opt_responsive) {
-      vr.setAttribute('layout', 'responsive');
+    function getVrImage(attributes, opt_responsive, opt_beforeLayoutCallback) {
+      const vr = doc.createElement('amp-google-vrview-image');
+      for (const key in attributes) {
+        vr.setAttribute(key, attributes[key]);
+      }
+      vr.setAttribute('width', '111');
+      vr.setAttribute('height', '222');
+      if (opt_responsive) {
+        vr.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(vr);
+      return vr
+        .build()
+        .then(() => vr.layoutCallback())
+        .then(() => vr);
     }
-    doc.body.appendChild(vr);
-    return vr.build().then(() => vr.layoutCallback()).then(() => vr);
-  }
 
-  it('renders', () => {
-    return getVrImage({'src': 'https://example.com/image1'}).then(vr => {
-      const iframe = vr.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.getAttribute('src')).to.equal(
+    it('renders', () => {
+      return getVrImage({'src': 'https://example.com/image1'}).then(vr => {
+        const iframe = vr.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('src')).to.equal(
           'https://storage.googleapis.com/vrview/2.0/index.html' +
-          '?image=' + encodeURIComponent('https://example.com/image1'));
+            '?image=' +
+            encodeURIComponent('https://example.com/image1')
+        );
+      });
     });
-  });
 
-  it('renders as stereo', () => {
-    return getVrImage({
-      'src': 'https://example.com/image1',
-      'stereo': '',
-    }).then(vr => {
-      const iframe = vr.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.getAttribute('src')).to.equal(
+    it('renders as stereo', () => {
+      return getVrImage({
+        'src': 'https://example.com/image1',
+        'stereo': '',
+      }).then(vr => {
+        const iframe = vr.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('src')).to.equal(
           'https://storage.googleapis.com/vrview/2.0/index.html' +
-          '?image=' + encodeURIComponent('https://example.com/image1') +
-          '&is_stereo=true');
+            '?image=' +
+            encodeURIComponent('https://example.com/image1') +
+            '&is_stereo=true'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getVrImage({'src': 'https://example.com/image1'}).then(vr => {
-      const iframe = vr.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getVrImage({'src': 'https://example.com/image1'}).then(vr => {
+        const iframe = vr.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires src', () => {
-    return allowConsoleError(() => {
-      return getVrImage({}).should.eventually.be.rejectedWith(
-          /must be available/);
+    it('requires src', () => {
+      return allowConsoleError(() => {
+        return getVrImage({}).should.eventually.be.rejectedWith(
+          /must be available/
+        );
+      });
     });
-  });
 
-  it('requires https src', () => {
-    return allowConsoleError(() => {
-      return getVrImage({'src': 'http://example.com/image1'})
-          .should.eventually.be.rejectedWith(/https/);
+    it('requires https src', () => {
+      return allowConsoleError(() => {
+        return getVrImage({
+          'src': 'http://example.com/image1',
+        }).should.eventually.be.rejectedWith(/https/);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
index ab7e2f80cea6..a7232b8acf8e 100644
--- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
+++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation-impl.js
@@ -106,8 +106,10 @@ const LOG_ID = 'GWD';
  * @private
  */
 function getCounter(receiver, counterName) {
-  if (receiver[GOTO_COUNTER_PROP] &&
-      hasOwn(receiver[GOTO_COUNTER_PROP], counterName)) {
+  if (
+    receiver[GOTO_COUNTER_PROP] &&
+    hasOwn(receiver[GOTO_COUNTER_PROP], counterName)
+  ) {
     return receiver[GOTO_COUNTER_PROP][counterName];
   }
   return 0;
@@ -165,8 +167,9 @@ export class AmpGwdRuntimeService {
     this.boundOnAnimationEndEvent_ = this.onAnimationEndEvent_.bind(this);
 
     // Initialize once the body and DOM is ready.
-    const docReadyPromise =
-        opt_win ? waitForBodyPromise(this.doc_) : ampdoc.whenBodyAvailable();
+    const docReadyPromise = opt_win
+      ? waitForBodyPromise(this.doc_)
+      : ampdoc.whenBodyAvailable();
     docReadyPromise.then(() => {
       // If the page deck is not yet in the DOM, wait until it is. The page deck
       // must be present in the body before the runtime can be initialized, as
@@ -177,17 +180,23 @@ export class AmpGwdRuntimeService {
       // in a FIE.
       const body = dev().assertElement(this.doc_.body);
       waitForChild(
-          body,
-          () => !!body.querySelector(
-              `.${escapeCssSelectorIdent(GWD_PAGE_WRAPPER_CLASS)}`),
-          this.initialize_.bind(this));
+        body,
+        () =>
+          !!body.querySelector(
+            `.${escapeCssSelectorIdent(GWD_PAGE_WRAPPER_CLASS)}`
+          ),
+        this.initialize_.bind(this)
+      );
     });
   }
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
     installServiceInEmbedScope(
-        embedWin, GWD_SERVICE_NAME, new AmpGwdRuntimeService(ampdoc, embedWin));
+      embedWin,
+      GWD_SERVICE_NAME,
+      new AmpGwdRuntimeService(ampdoc, embedWin)
+    );
   }
 
   /**
@@ -232,22 +241,26 @@ export class AmpGwdRuntimeService {
    */
   setCurrentPage(index) {
     const gwdPages = this.doc_.body.querySelectorAll(
-        `.${escapeCssSelectorIdent(GWD_PAGE_WRAPPER_CLASS)}`);
+      `.${escapeCssSelectorIdent(GWD_PAGE_WRAPPER_CLASS)}`
+    );
 
     if (gwdPages.length == 0) {
-      user().warn(LOG_ID,
-          'Could not set current page. No pages were found in the document.');
+      user().warn(
+        LOG_ID,
+        'Could not set current page. No pages were found in the document.'
+      );
       return;
     }
 
     // Deactivate the outgoing current page, if there is one.
     // TODO(sklobovskaya): Decide if it's worth just storing the index.
-    const activePageSelector =
-        `.${escapeCssSelectorIdent(GWD_PAGE_WRAPPER_CLASS)}.${
-          escapeCssSelectorIdent(PlaybackCssClass.PLAY)
-        }`;
-    const currentPageEl =
-        scopedQuerySelector(this.doc_.body, activePageSelector);
+    const activePageSelector = `.${escapeCssSelectorIdent(
+      GWD_PAGE_WRAPPER_CLASS
+    )}.${escapeCssSelectorIdent(PlaybackCssClass.PLAY)}`;
+    const currentPageEl = scopedQuerySelector(
+      this.doc_.body,
+      activePageSelector
+    );
 
     if (currentPageEl) {
       this.deactivatePage_(currentPageEl);
@@ -285,8 +298,8 @@ export class AmpGwdRuntimeService {
 
     // Reset other animation state on the page and all descendants.
     [pageEl]
-        .concat(toArray(pageEl.querySelectorAll('*')))
-        .forEach(el => this.resetAnimatedElement_(el));
+      .concat(toArray(pageEl.querySelectorAll('*')))
+      .forEach(el => this.resetAnimatedElement_(el));
   }
 
   /**
@@ -307,8 +320,9 @@ export class AmpGwdRuntimeService {
     // removed above, but because goto animations are activated with a special
     // class, the class must be removed manually.
     if (element.hasAttribute(CURRENT_LABEL_ANIMATION_ATTR)) {
-      const activeGotoAnimation =
-          element.getAttribute(CURRENT_LABEL_ANIMATION_ATTR);
+      const activeGotoAnimation = element.getAttribute(
+        CURRENT_LABEL_ANIMATION_ATTR
+      );
       element.classList.remove(activeGotoAnimation);
       element.removeAttribute(CURRENT_LABEL_ANIMATION_ATTR);
     }
@@ -470,8 +484,7 @@ export class AmpGwdRuntimeService {
     receiver.classList.remove(PlaybackCssClass.PAUSE);
 
     // If another goto animation is currently active on this element, stop it.
-    const currentLabel =
-        receiver.getAttribute(CURRENT_LABEL_ANIMATION_ATTR);
+    const currentLabel = receiver.getAttribute(CURRENT_LABEL_ANIMATION_ATTR);
 
     if (currentLabel) {
       receiver.classList.remove(currentLabel);
@@ -510,8 +523,11 @@ export class AmpGwdRuntimeService {
       'eventName': userEventName,
       'sourceEvent': event,
     });
-    const timelineEvent =
-        createCustomEvent(this.win_, GWD_TIMELINE_EVENT, detail);
+    const timelineEvent = createCustomEvent(
+      this.win_,
+      GWD_TIMELINE_EVENT,
+      detail
+    );
 
     this.doc_.dispatchEvent(timelineEvent);
   }
@@ -522,7 +538,10 @@ export class AmpGwdRuntimeService {
   listenForAnimationEnd_() {
     for (let i = 0; i < VENDOR_ANIMATIONEND_EVENTS.length; i++) {
       this.doc_.body.addEventListener(
-          VENDOR_ANIMATIONEND_EVENTS[i], this.boundOnAnimationEndEvent_, true);
+        VENDOR_ANIMATIONEND_EVENTS[i],
+        this.boundOnAnimationEndEvent_,
+        true
+      );
     }
   }
 
@@ -532,7 +551,10 @@ export class AmpGwdRuntimeService {
   unlistenForAnimationEnd_() {
     for (let i = 0; i < VENDOR_ANIMATIONEND_EVENTS.length; i++) {
       this.doc_.body.removeEventListener(
-          VENDOR_ANIMATIONEND_EVENTS[i], this.boundOnAnimationEndEvent_, true);
+        VENDOR_ANIMATIONEND_EVENTS[i],
+        this.boundOnAnimationEndEvent_,
+        true
+      );
     }
   }
 
@@ -553,6 +575,6 @@ function reflow(element) {
   // effects.
   const globalRef = '__AMP_GWD_TEMP';
   // Reading `offsetWidth` is what actually causes reflow.
-  self[globalRef] = element./*OK*/offsetWidth;
+  self[globalRef] = element./*OK*/ offsetWidth;
   delete self[globalRef];
 }
diff --git a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
index 6f8b68349bc7..fb5c1f2da19d 100644
--- a/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
+++ b/extensions/amp-gwd-animation/0.1/amp-gwd-animation.js
@@ -22,10 +22,11 @@ import {
 import {CSS} from '../../../build/amp-gwd-animation-0.1.css';
 import {Services} from '../../../src/services';
 import {getDetail} from '../../../src/event-helper';
-import {getExistingServiceForDocInEmbedScope, getParentWindowFrameElement}
-  from '../../../src/service';
-import {getFriendlyIframeEmbedOptional}
-  from '../../../src/friendly-iframe-embed';
+import {
+  getExistingServiceForDocInEmbedScope,
+  getParentWindowFrameElement,
+} from '../../../src/service';
+import {getFriendlyIframeEmbedOptional} from '../../../src/friendly-iframe-embed';
 import {userAssert} from '../../../src/log';
 
 /**
@@ -81,8 +82,12 @@ const ACTION_IMPL_ARGS = {
   'togglePlay': ['args.id'],
   'gotoAndPlay': ['args.id', 'args.label'],
   'gotoAndPause': ['args.id', 'args.label'],
-  'gotoAndPlayNTimes':
-      ['args.id', 'args.label', 'args.N', 'event.detail.eventName'],
+  'gotoAndPlayNTimes': [
+    'args.id',
+    'args.label',
+    'args.N',
+    'event.detail.eventName',
+  ],
   'setCurrentPage': ['args.index'],
 };
 
@@ -113,11 +118,13 @@ export class GwdAnimation extends AMP.BaseElement {
   buildCallback() {
     // Record the timeline event prefix.
     this.timelineEventPrefix_ =
-        this.element.getAttribute('timeline-event-prefix') || '';
+      this.element.getAttribute('timeline-event-prefix') || '';
 
     // Record whether the extension is in a FIE.
-    const frameElement =
-        getParentWindowFrameElement(this.element, this.getAmpDoc().win);
+    const frameElement = getParentWindowFrameElement(
+      this.element,
+      this.getAmpDoc().win
+    );
     if (frameElement) {
       this.fie_ = getFriendlyIframeEmbedOptional(frameElement);
     }
@@ -129,7 +136,10 @@ export class GwdAnimation extends AMP.BaseElement {
     // Listen for GWD timeline events to re-broadcast them via the doc action
     // service.
     root.addEventListener(
-        GWD_TIMELINE_EVENT, this.boundOnGwdTimelineEvent_, true);
+      GWD_TIMELINE_EVENT,
+      this.boundOnGwdTimelineEvent_,
+      true
+    );
 
     // If the document has a GWD pagedeck, automatically generate listeners for
     // `slideChange` events, on which the active animations context must be
@@ -138,10 +148,10 @@ export class GwdAnimation extends AMP.BaseElement {
     if (gwdPageDeck) {
       userAssert(this.element.id, `The ${TAG} element must have an id.`);
 
-      const setCurrentPageAction =
-          `${this.element.id}.setCurrentPage(index=event.index)`;
-      addAction(this.element, gwdPageDeck, 'slideChange',
-          setCurrentPageAction);
+      const setCurrentPageAction = `${
+        this.element.id
+      }.setCurrentPage(index=event.index)`;
+      addAction(this.element, gwdPageDeck, 'slideChange', setCurrentPageAction);
     }
 
     // Register handlers for supported actions.
@@ -159,9 +169,7 @@ export class GwdAnimation extends AMP.BaseElement {
    * @private
    */
   getRoot_() {
-    return this.fie_ ?
-      this.fie_.win.document :
-      this.getAmpDoc().getRootNode();
+    return this.fie_ ? this.fie_.win.document : this.getAmpDoc().getRootNode();
   }
 
   /**
@@ -210,12 +218,14 @@ export class GwdAnimation extends AMP.BaseElement {
    */
   executeInvocation_(invocation) {
     const service = userAssert(
-        getExistingServiceForDocInEmbedScope(this.element, GWD_SERVICE_NAME),
-        'Cannot execute action because the GWD service is not registered.');
+      getExistingServiceForDocInEmbedScope(this.element, GWD_SERVICE_NAME),
+      'Cannot execute action because the GWD service is not registered.'
+    );
 
     const argPaths = ACTION_IMPL_ARGS[invocation.method];
-    const actionArgs =
-        argPaths.map(argPath => getValueForExpr(invocation, argPath));
+    const actionArgs = argPaths.map(argPath =>
+      getValueForExpr(invocation, argPath)
+    );
 
     service[invocation.method].apply(service, actionArgs);
   }
@@ -233,13 +243,20 @@ export class GwdAnimation extends AMP.BaseElement {
     const timelineEventName = `${this.timelineEventPrefix_}${eventName}`;
 
     actionService.trigger(
-        this.element, timelineEventName, event, ActionTrust.HIGH);
+      this.element,
+      timelineEventName,
+      event,
+      ActionTrust.HIGH
+    );
   }
 
   /** @override */
   detachedCallback() {
     this.getRoot_().removeEventListener(
-        GWD_TIMELINE_EVENT, this.boundOnGwdTimelineEvent_, true);
+      GWD_TIMELINE_EVENT,
+      this.boundOnGwdTimelineEvent_,
+      true
+    );
     return true;
   }
 }
@@ -266,9 +283,10 @@ export function addAction(context, target, event, actionStr) {
     const actionsStartIndex = eventActionsIndex + eventPrefix.length;
 
     newActionsStr =
-        currentActionsStr.substr(0, actionsStartIndex) +
-        actionStr + ',' +
-        currentActionsStr.substr(actionsStartIndex);
+      currentActionsStr.substr(0, actionsStartIndex) +
+      actionStr +
+      ',' +
+      currentActionsStr.substr(actionsStartIndex);
   } else {
     // No actions defined yet for this event. Create the event:action string and
     // append it to the existing actions string.
diff --git a/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js b/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js
index c2cd3174b9a3..f21193eb09f7 100644
--- a/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js
+++ b/extensions/amp-gwd-animation/0.1/test/test-amp-gwd-animation.js
@@ -22,11 +22,7 @@ import {
   GWD_TIMELINE_EVENT,
   PlaybackCssClass,
 } from '../amp-gwd-animation-impl';
-import {
-  GWD_PAGEDECK_ID,
-  TAG,
-  addAction,
-} from '../amp-gwd-animation';
+import {GWD_PAGEDECK_ID, TAG, addAction} from '../amp-gwd-animation';
 import {Services} from '../../../../src/services';
 import {createCustomEvent} from '../../../../src/event-helper';
 import {getExistingServiceForDocInEmbedScope} from '../../../../src/service';
@@ -67,38 +63,44 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
     });
   }
 
-  describes.repeated('', {
-    'in top-level document': {ampdoc: 'single'},
-    'in FIE document': {ampdoc: 'fie'},
-  }, (name, variant) => {
-    describes.realWin('', {
-      amp: {
-        ampdoc: variant.ampdoc,
-        extensions: ['amp-gwd-animation'],
-      },
-    }, env => {
-      let sandbox;
-      let ampdoc;
-      let element;
-      let impl;
-      let page1Elem;
-      let embed;
-      let win;
-      let doc;
-      let runtime;
-
-      beforeEach(() => {
-        sandbox = sinon.sandbox;
-        ampdoc = env.ampdoc;
-        embed = env.embed;
-        win = variant.ampdoc == 'fie' ? embed.win : ampdoc.win;
-        doc = variant.ampdoc == 'fie' ?
-          embed.win.document :
-          ampdoc.getRootNode();
-
-        // Create a test amp-carousel GWD page deck.
-        doc.body.innerHTML =
-            `<amp-carousel id="pagedeck"
+  describes.repeated(
+    '',
+    {
+      'in top-level document': {ampdoc: 'single'},
+      'in FIE document': {ampdoc: 'fie'},
+    },
+    (name, variant) => {
+      describes.realWin(
+        '',
+        {
+          amp: {
+            ampdoc: variant.ampdoc,
+            extensions: ['amp-gwd-animation'],
+          },
+        },
+        env => {
+          let sandbox;
+          let ampdoc;
+          let element;
+          let impl;
+          let page1Elem;
+          let embed;
+          let win;
+          let doc;
+          let runtime;
+
+          beforeEach(() => {
+            sandbox = sinon.sandbox;
+            ampdoc = env.ampdoc;
+            embed = env.embed;
+            win = variant.ampdoc == 'fie' ? embed.win : ampdoc.win;
+            doc =
+              variant.ampdoc == 'fie'
+                ? embed.win.document
+                : ampdoc.getRootNode();
+
+            // Create a test amp-carousel GWD page deck.
+            doc.body.innerHTML = `<amp-carousel id="pagedeck"
                 on="slideChange:node1.hide;event1:node1.show">
               <div id="page1" class="${GWD_PAGE_WRAPPER_CLASS}">
                 <div>
@@ -111,30 +113,32 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
               <div id="page2" class="${GWD_PAGE_WRAPPER_CLASS}"></div>
             </amp-carousel>`;
 
-        // Create a test amp-gwd-animation element.
-        const config = {
-          'id': 'gwdAnim',
-          'timeline-event-prefix': 'tl_',
-          'layout': 'nodisplay',
-        };
-        return createGwdAnimationElement(doc, config).then(el => {
-          element = el;
-          impl = element.implementation_;
-          runtime = getExistingServiceForDocInEmbedScope(
-              element, GWD_SERVICE_NAME);
-          page1Elem = doc.getElementById('page1');
-        });
-      });
+            // Create a test amp-gwd-animation element.
+            const config = {
+              'id': 'gwdAnim',
+              'timeline-event-prefix': 'tl_',
+              'layout': 'nodisplay',
+            };
+            return createGwdAnimationElement(doc, config).then(el => {
+              element = el;
+              impl = element.implementation_;
+              runtime = getExistingServiceForDocInEmbedScope(
+                element,
+                GWD_SERVICE_NAME
+              );
+              page1Elem = doc.getElementById('page1');
+            });
+          });
 
-      afterEach(() => {
-        doc.body.innerHTML = '';
-      });
+          afterEach(() => {
+            doc.body.innerHTML = '';
+          });
 
-      // TODO(#7846): This test case verifies the GWD runtime disables itself
-      // initially. It skips doing so for now because the AMP runtime does not
-      // yet invoke setEnabled. Uncomment the test case when this integration is
-      // complete.
-      /*
+          // TODO(#7846): This test case verifies the GWD runtime disables itself
+          // initially. It skips doing so for now because the AMP runtime does not
+          // yet invoke setEnabled. Uncomment the test case when this integration is
+          // complete.
+          /*
       it('should immediately disable animations', () => {
         return ampdoc.whenBodyAvailable().then(() => {
           expect(doc.body.classList.contains(ANIMATIONS_DISABLED_CLASS))
@@ -143,350 +147,362 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
       });
       */
 
-      it('should initially enable animations on GWD page 1', () => {
-        // Page 1 should have been enabled.
-        const page1 = doc.getElementById('page1');
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-
-        // Page 2 should remain unaffected.
-        const page2 = doc.getElementById('page2');
-        expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
-      });
-
-      it('should install slideChange listeners on the GWD pagedeck', () => {
-        const pagedeck = doc.getElementById(GWD_PAGEDECK_ID);
-        expect(pagedeck.getAttribute('on')).to.contain('setCurrentPage');
-        // @see addAction test case below.
-      });
-
-      it('should change the current page on pagedeck slideChange', () => {
-        const pagedeck = doc.getElementById(GWD_PAGEDECK_ID);
-        const page1 = doc.getElementById('page1');
-        const page2 = doc.getElementById('page2');
-
-        // Verify the first page was activated on initialization.
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-
-        // Trigger a setCurrentPage action as though it originated from a
-        // pagedeck slideChange event and verify that page 2 is activated.
-        const setCurrentPageInvocation = {
-          method: 'setCurrentPage',
-          args: {index: 1},
-          source: pagedeck,
-          caller: pagedeck,
-          satisfiesTrust: () => true,
-        };
-        impl.executeAction(setCurrentPageInvocation);
-
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
-        expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-
-        // Simulate setCurrentPage from a slideChange event which originated
-        // from some other carousel. There should be no page change.
-        const otherSetCurrentPageInvocation = {
-          method: 'setCurrentPage',
-          args: {index: 0},
-          source: null,
-          caller: pagedeck,
-          satisfiesTrust: () => true,
-        };
-        impl.executeAction(otherSetCurrentPageInvocation);
-
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
-        expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-
-        // Remove the pagedeck element and verify that triggering
-        // setCurrentPage does not throw errors. Set a null source on the
-        // dummy invocation to test the comparison to a null pagedeck
-        // reference.
-        pagedeck.remove();
-        otherSetCurrentPageInvocation.source = null;
-        impl.executeAction(otherSetCurrentPageInvocation);
-      });
-
-      it('should activate and deactivate pages', () => {
-        const page1 = doc.getElementById('page1');
-        const grandchild = page1.querySelector('#grandchild');
-        const page2 = doc.getElementById('page2');
-
-        // Activate page 1.
-        runtime.setCurrentPage(0);
-
-        // Animations should be enabled on page1 only.
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-        expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
-
-        // Set an active label animation, goto counters, and a pause on
-        // several descendant elements and the page element itself to test
-        // that this state is reset when the page is deactivated.
-        page1.classList.add(PlaybackCssClass.PAUSE);
-        grandchild.classList.add(PlaybackCssClass.PAUSE);
-        page1[GOTO_COUNTER_PROP] = {};
-        grandchild[GOTO_COUNTER_PROP] = {};
-        page1.setAttribute(CURRENT_LABEL_ANIMATION_ATTR, 'someLabel1');
-        grandchild.setAttribute(CURRENT_LABEL_ANIMATION_ATTR, 'someLabel2');
-
-        // Change to page 2.
-        runtime.setCurrentPage(1);
-
-        // Animations should be enabled on page2 only.
-        expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
-        expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
-
-        // Pause, goto counters, and current label animation data should have
-        // been cleared from all elements under page1, including the page
-        // itself.
-        expect(page1.classList.contains(PlaybackCssClass.PAUSE)).to.be.false;
-        expect(grandchild.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.false;
-        expect(page1).to.not.have.property(GOTO_COUNTER_PROP);
-        expect(grandchild).to.not.have.property(GOTO_COUNTER_PROP);
-        expect(page1.hasAttribute(CURRENT_LABEL_ANIMATION_ATTR)).to.be.false;
-        expect(grandchild.hasAttribute(CURRENT_LABEL_ANIMATION_ATTR))
-            .to.be.false;
-      });
-
-      it('should disable and re-enable', () => {
-        runtime.setEnabled(true);
-        expect(doc.body.classList.contains(ANIMATIONS_DISABLED_CLASS))
-            .to.be.false;
-
-        runtime.setEnabled(false);
-        expect(doc.body.classList.contains(ANIMATIONS_DISABLED_CLASS))
-            .to.be.true;
-      });
-
-      it('should execute play', () => {
-        // Pause an animation to test resuming it.
-        const pauseInvocation = {
-          method: 'pause',
-          args: {id: 'page1'},
-          satisfiesTrust: () => true,
-        };
-        impl.executeAction(pauseInvocation);
-
-        const playInvocation = {
-          method: 'play',
-          args: {id: 'page1'},
-          satisfiesTrust: () => true,
-        };
-        impl.executeAction(playInvocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.false;
-
-        // Repeated play invocations should have no change.
-        impl.executeAction(playInvocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.false;
-
-        // Test handling missing arguments.
-        invokeWithSomeArgsUndefined(impl, playInvocation);
-      });
-
-      it('should execute pause', () => {
-        const invocation = {
-          method: 'pause',
-          args: {id: 'page1'},
-          satisfiesTrust: () => true,
-        };
-
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.true;
-
-        // Repeated pause invocations should have no change.
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.true;
-
-        // Test handling missing arguments.
-        invokeWithSomeArgsUndefined(impl, invocation);
-      });
-
-      it('should execute togglePlay', () => {
-        const invocation = {
-          method: 'togglePlay',
-          args: {id: 'page1'},
-          satisfiesTrust: () => true,
-        };
-
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.true;
-
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.false;
-
-        // Test handling missing arguments.
-        invokeWithSomeArgsUndefined(impl, invocation);
-      });
-
-      it('should execute gotoAndPlay', () => {
-        const invocation = {
-          method: 'gotoAndPlay',
-          args: {id: 'page1', label: 'foo'},
-          satisfiesTrust: () => true,
-        };
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-        expect(page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR))
-            .to.equal('foo');
-
-        // Repeated invocations should have no effect (animation will be
-        // restarted, however).
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-        expect(page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR))
-            .to.equal('foo');
-
-        // Change to a different label.
-        invocation.args.label = 'bar';
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.false;
-        expect(page1Elem.classList.contains('bar')).to.be.true;
-        expect(page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR))
-            .to.equal('bar');
-
-        // Test handling missing arguments.
-        invokeWithSomeArgsUndefined(impl, invocation);
-      });
-
-      it('should execute gotoAndPause', () => {
-        // Test handling missing arguments.
-        const invocation = {
-          method: 'gotoAndPause',
-          args: {id: 'page1', label: 'foo'},
-          satisfiesTrust: () => true,
-        };
-        invokeWithSomeArgsUndefined(impl, invocation);
-
-        // gotoAndPause invokes a pause after a short delay, but waiting for
-        // this time to pass makes the test flaky. Stub setTimeout to
-        // execute the callback synchronously.
-        const origSetTimeout = win.setTimeout;
-        win.setTimeout = func => func();
-
-        // Test a valid gotoAndPause invocation. Verify animation was
-        // switched to the label and has been paused.
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-        expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE))
-            .to.be.true;
-
-        win.setTimeout = origSetTimeout;
-      });
-
-      it('should execute gotoAndPlayNTimes', () => {
-        const testEvent = createCustomEvent(
-            win, GWD_TIMELINE_EVENT, {'eventName': 'event-1'});
-
-        // Invoking gotoAndPlayNTimes with a negative N value is a no-op.
-        const invocationWithBadNValue = {
-          method: 'gotoAndPlayNTimes',
-          args: {id: 'page1', label: 'foo', N: -5},
-          event: testEvent,
-          satisfiesTrust: () => true,
-        };
-
-        allowConsoleError(() => {
-          impl.executeAction(invocationWithBadNValue);
-        });
-        expect(page1Elem.classList.contains('foo')).to.be.false;
-
-        // Initialize a valid gotoAndPlayNTimes invocation from some event.
-        const invocation = {
-          method: 'gotoAndPlayNTimes',
-          args: {id: 'page1', label: 'foo', N: 2},
-          event: testEvent,
-          satisfiesTrust: () => true,
-        };
-
-        // gotoAndPlay call #1 from 'event-1'.
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-
-        page1Elem.classList.remove('foo');
-
-        // gotoAndPlay call #2 from 'event-1'.
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-
-        page1Elem.classList.remove('foo');
-
-        // gotoAndPlay call #3 from 'event-1'. The number of invocations
-        // from event 'event-1' is now past the specified max count, so this
-        // and subsequent gotoAndPlayNTimes invocations from this event should
-        // have no effect.
-        impl.executeAction(invocation);
-        impl.executeAction(invocation);
-        expect(page1Elem.classList.contains('foo')).to.be.false;
-
-        // gotoAndPlayNTimes invocations originating from a different timeline
-        // event begin their own counters.
-        const testEvent2 = createCustomEvent(
-            ampdoc.win, GWD_TIMELINE_EVENT, {'eventName': 'event-2'});
-        const invocationFromEvent2 = {
-          method: 'gotoAndPlayNTimes',
-          args: {id: 'page1', label: 'foo', N: 1},
-          event: testEvent2,
-          satisfiesTrust: () => true,
-        };
-
-        impl.executeAction(invocationFromEvent2);
-        expect(page1Elem.classList.contains('foo')).to.be.true;
-
-        page1Elem.classList.remove('foo');
-
-        // Counter for 'event-2' has now run out; no more gotoAndPlays may
-        // execute.
-        impl.executeAction(invocationFromEvent2);
-        expect(page1Elem.classList.contains('foo')).to.be.false;
-
-        // Test handling missing arguments.
-        invokeWithSomeArgsUndefined(impl, invocation);
-      });
-
-      it('should trigger timeline events', () => {
-        const triggeredAmpEventNames = [];
-        const triggeredEvents = [];
-
-        const actionService = Services.actionServiceForDoc(element);
-        sandbox.stub(actionService, 'trigger').callsFake(
-            (target, name, event) => {
-              triggeredAmpEventNames.push(name);
-              triggeredEvents.push(event);
+          it('should initially enable animations on GWD page 1', () => {
+            // Page 1 should have been enabled.
+            const page1 = doc.getElementById('page1');
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+
+            // Page 2 should remain unaffected.
+            const page2 = doc.getElementById('page2');
+            expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
+          });
+
+          it('should install slideChange listeners on the GWD pagedeck', () => {
+            const pagedeck = doc.getElementById(GWD_PAGEDECK_ID);
+            expect(pagedeck.getAttribute('on')).to.contain('setCurrentPage');
+            // @see addAction test case below.
+          });
+
+          it('should change the current page on pagedeck slideChange', () => {
+            const pagedeck = doc.getElementById(GWD_PAGEDECK_ID);
+            const page1 = doc.getElementById('page1');
+            const page2 = doc.getElementById('page2');
+
+            // Verify the first page was activated on initialization.
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+
+            // Trigger a setCurrentPage action as though it originated from a
+            // pagedeck slideChange event and verify that page 2 is activated.
+            const setCurrentPageInvocation = {
+              method: 'setCurrentPage',
+              args: {index: 1},
+              source: pagedeck,
+              caller: pagedeck,
+              satisfiesTrust: () => true,
+            };
+            impl.executeAction(setCurrentPageInvocation);
+
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
+            expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+
+            // Simulate setCurrentPage from a slideChange event which originated
+            // from some other carousel. There should be no page change.
+            const otherSetCurrentPageInvocation = {
+              method: 'setCurrentPage',
+              args: {index: 0},
+              source: null,
+              caller: pagedeck,
+              satisfiesTrust: () => true,
+            };
+            impl.executeAction(otherSetCurrentPageInvocation);
+
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
+            expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+
+            // Remove the pagedeck element and verify that triggering
+            // setCurrentPage does not throw errors. Set a null source on the
+            // dummy invocation to test the comparison to a null pagedeck
+            // reference.
+            pagedeck.remove();
+            otherSetCurrentPageInvocation.source = null;
+            impl.executeAction(otherSetCurrentPageInvocation);
+          });
+
+          it('should activate and deactivate pages', () => {
+            const page1 = doc.getElementById('page1');
+            const grandchild = page1.querySelector('#grandchild');
+            const page2 = doc.getElementById('page2');
+
+            // Activate page 1.
+            runtime.setCurrentPage(0);
+
+            // Animations should be enabled on page1 only.
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+            expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
+
+            // Set an active label animation, goto counters, and a pause on
+            // several descendant elements and the page element itself to test
+            // that this state is reset when the page is deactivated.
+            page1.classList.add(PlaybackCssClass.PAUSE);
+            grandchild.classList.add(PlaybackCssClass.PAUSE);
+            page1[GOTO_COUNTER_PROP] = {};
+            grandchild[GOTO_COUNTER_PROP] = {};
+            page1.setAttribute(CURRENT_LABEL_ANIMATION_ATTR, 'someLabel1');
+            grandchild.setAttribute(CURRENT_LABEL_ANIMATION_ATTR, 'someLabel2');
+
+            // Change to page 2.
+            runtime.setCurrentPage(1);
+
+            // Animations should be enabled on page2 only.
+            expect(page1.classList.contains(PlaybackCssClass.PLAY)).to.be.false;
+            expect(page2.classList.contains(PlaybackCssClass.PLAY)).to.be.true;
+
+            // Pause, goto counters, and current label animation data should have
+            // been cleared from all elements under page1, including the page
+            // itself.
+            expect(page1.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .false;
+            expect(grandchild.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .false;
+            expect(page1).to.not.have.property(GOTO_COUNTER_PROP);
+            expect(grandchild).to.not.have.property(GOTO_COUNTER_PROP);
+            expect(page1.hasAttribute(CURRENT_LABEL_ANIMATION_ATTR)).to.be
+              .false;
+            expect(grandchild.hasAttribute(CURRENT_LABEL_ANIMATION_ATTR)).to.be
+              .false;
+          });
+
+          it('should disable and re-enable', () => {
+            runtime.setEnabled(true);
+            expect(doc.body.classList.contains(ANIMATIONS_DISABLED_CLASS)).to.be
+              .false;
+
+            runtime.setEnabled(false);
+            expect(doc.body.classList.contains(ANIMATIONS_DISABLED_CLASS)).to.be
+              .true;
+          });
+
+          it('should execute play', () => {
+            // Pause an animation to test resuming it.
+            const pauseInvocation = {
+              method: 'pause',
+              args: {id: 'page1'},
+              satisfiesTrust: () => true,
+            };
+            impl.executeAction(pauseInvocation);
+
+            const playInvocation = {
+              method: 'play',
+              args: {id: 'page1'},
+              satisfiesTrust: () => true,
+            };
+            impl.executeAction(playInvocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .false;
+
+            // Repeated play invocations should have no change.
+            impl.executeAction(playInvocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .false;
+
+            // Test handling missing arguments.
+            invokeWithSomeArgsUndefined(impl, playInvocation);
+          });
+
+          it('should execute pause', () => {
+            const invocation = {
+              method: 'pause',
+              args: {id: 'page1'},
+              satisfiesTrust: () => true,
+            };
+
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .true;
+
+            // Repeated pause invocations should have no change.
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .true;
+
+            // Test handling missing arguments.
+            invokeWithSomeArgsUndefined(impl, invocation);
+          });
+
+          it('should execute togglePlay', () => {
+            const invocation = {
+              method: 'togglePlay',
+              args: {id: 'page1'},
+              satisfiesTrust: () => true,
+            };
+
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .true;
+
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .false;
+
+            // Test handling missing arguments.
+            invokeWithSomeArgsUndefined(impl, invocation);
+          });
+
+          it('should execute gotoAndPlay', () => {
+            const invocation = {
+              method: 'gotoAndPlay',
+              args: {id: 'page1', label: 'foo'},
+              satisfiesTrust: () => true,
+            };
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+            expect(
+              page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR)
+            ).to.equal('foo');
+
+            // Repeated invocations should have no effect (animation will be
+            // restarted, however).
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+            expect(
+              page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR)
+            ).to.equal('foo');
+
+            // Change to a different label.
+            invocation.args.label = 'bar';
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.false;
+            expect(page1Elem.classList.contains('bar')).to.be.true;
+            expect(
+              page1Elem.getAttribute(CURRENT_LABEL_ANIMATION_ATTR)
+            ).to.equal('bar');
+
+            // Test handling missing arguments.
+            invokeWithSomeArgsUndefined(impl, invocation);
+          });
+
+          it('should execute gotoAndPause', () => {
+            // Test handling missing arguments.
+            const invocation = {
+              method: 'gotoAndPause',
+              args: {id: 'page1', label: 'foo'},
+              satisfiesTrust: () => true,
+            };
+            invokeWithSomeArgsUndefined(impl, invocation);
+
+            // gotoAndPause invokes a pause after a short delay, but waiting for
+            // this time to pass makes the test flaky. Stub setTimeout to
+            // execute the callback synchronously.
+            const origSetTimeout = win.setTimeout;
+            win.setTimeout = func => func();
+
+            // Test a valid gotoAndPause invocation. Verify animation was
+            // switched to the label and has been paused.
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+            expect(page1Elem.classList.contains(PlaybackCssClass.PAUSE)).to.be
+              .true;
+
+            win.setTimeout = origSetTimeout;
+          });
+
+          it('should execute gotoAndPlayNTimes', () => {
+            const testEvent = createCustomEvent(win, GWD_TIMELINE_EVENT, {
+              'eventName': 'event-1',
             });
 
-        const animationendEvent =
-            new AnimationEvent('animationend', {bubbles: true});
-
-        // Dispatch `animationend` events on GWD event elements and on a
-        // non-event element (to test it is ignored).
-        doc.getElementById('event1').dispatchEvent(
-            animationendEvent);
-        doc.getElementById('event2').dispatchEvent(
-            animationendEvent);
-        doc.getElementById('not-an-event').dispatchEvent(
-            animationendEvent);
-
-        expect(triggeredAmpEventNames)
-            .to.deep.equal(['tl_event-1', 'tl_event-2']);
-        expect(triggeredEvents.map(event => event.detail.eventName))
-            .to.deep.equal(['event-1', 'event-2']);
-      });
+            // Invoking gotoAndPlayNTimes with a negative N value is a no-op.
+            const invocationWithBadNValue = {
+              method: 'gotoAndPlayNTimes',
+              args: {id: 'page1', label: 'foo', N: -5},
+              event: testEvent,
+              satisfiesTrust: () => true,
+            };
 
-      it('should get the receiver element by id if it exists', () => {
-        expect(runtime.getReceiver('document.body')).to.equal(
-            doc.body);
-        expect(runtime.getReceiver('page1')).to.equal(page1Elem);
+            allowConsoleError(() => {
+              impl.executeAction(invocationWithBadNValue);
+            });
+            expect(page1Elem.classList.contains('foo')).to.be.false;
+
+            // Initialize a valid gotoAndPlayNTimes invocation from some event.
+            const invocation = {
+              method: 'gotoAndPlayNTimes',
+              args: {id: 'page1', label: 'foo', N: 2},
+              event: testEvent,
+              satisfiesTrust: () => true,
+            };
+
+            // gotoAndPlay call #1 from 'event-1'.
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+
+            page1Elem.classList.remove('foo');
+
+            // gotoAndPlay call #2 from 'event-1'.
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+
+            page1Elem.classList.remove('foo');
+
+            // gotoAndPlay call #3 from 'event-1'. The number of invocations
+            // from event 'event-1' is now past the specified max count, so this
+            // and subsequent gotoAndPlayNTimes invocations from this event should
+            // have no effect.
+            impl.executeAction(invocation);
+            impl.executeAction(invocation);
+            expect(page1Elem.classList.contains('foo')).to.be.false;
+
+            // gotoAndPlayNTimes invocations originating from a different timeline
+            // event begin their own counters.
+            const testEvent2 = createCustomEvent(
+              ampdoc.win,
+              GWD_TIMELINE_EVENT,
+              {'eventName': 'event-2'}
+            );
+            const invocationFromEvent2 = {
+              method: 'gotoAndPlayNTimes',
+              args: {id: 'page1', label: 'foo', N: 1},
+              event: testEvent2,
+              satisfiesTrust: () => true,
+            };
+
+            impl.executeAction(invocationFromEvent2);
+            expect(page1Elem.classList.contains('foo')).to.be.true;
+
+            page1Elem.classList.remove('foo');
+
+            // Counter for 'event-2' has now run out; no more gotoAndPlays may
+            // execute.
+            impl.executeAction(invocationFromEvent2);
+            expect(page1Elem.classList.contains('foo')).to.be.false;
+
+            // Test handling missing arguments.
+            invokeWithSomeArgsUndefined(impl, invocation);
+          });
+
+          it('should trigger timeline events', () => {
+            const triggeredAmpEventNames = [];
+            const triggeredEvents = [];
+
+            const actionService = Services.actionServiceForDoc(element);
+            sandbox
+              .stub(actionService, 'trigger')
+              .callsFake((target, name, event) => {
+                triggeredAmpEventNames.push(name);
+                triggeredEvents.push(event);
+              });
+
+            const animationendEvent = new AnimationEvent('animationend', {
+              bubbles: true,
+            });
 
-        allowConsoleError(() => {
-          expect(runtime.getReceiver('nonexistentElement')).to.be.null;
-        });
-      });
-    });
-  });
+            // Dispatch `animationend` events on GWD event elements and on a
+            // non-event element (to test it is ignored).
+            doc.getElementById('event1').dispatchEvent(animationendEvent);
+            doc.getElementById('event2').dispatchEvent(animationendEvent);
+            doc.getElementById('not-an-event').dispatchEvent(animationendEvent);
+
+            expect(triggeredAmpEventNames).to.deep.equal([
+              'tl_event-1',
+              'tl_event-2',
+            ]);
+            expect(
+              triggeredEvents.map(event => event.detail.eventName)
+            ).to.deep.equal(['event-1', 'event-2']);
+          });
+
+          it('should get the receiver element by id if it exists', () => {
+            expect(runtime.getReceiver('document.body')).to.equal(doc.body);
+            expect(runtime.getReceiver('page1')).to.equal(page1Elem);
+
+            allowConsoleError(() => {
+              expect(runtime.getReceiver('nonexistentElement')).to.be.null;
+            });
+          });
+        }
+      );
+    }
+  );
 
   describe('addAction', () => {
     let element;
@@ -495,8 +511,10 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
     beforeEach(() => {
       actionService = {setActions: sandbox.stub()};
       element = document.createElement('div');
-      sandbox.stub(Services, 'actionServiceForDoc')
-          .withArgs(element).returns(actionService);
+      sandbox
+        .stub(Services, 'actionServiceForDoc')
+        .withArgs(element)
+        .returns(actionService);
     });
 
     it('should insert when no existing actions', () => {
@@ -509,16 +527,20 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
       const target = document.createElement('div');
       target.setAttribute('on', 'event1:node2.hide;event2:node2.show');
       addAction(element, target, 'event1', 'node1.foo()');
-      expect(actionService.setActions).calledWith(target,
-          'event1:node1.foo(),node2.hide;event2:node2.show');
+      expect(actionService.setActions).calledWith(
+        target,
+        'event1:node1.foo(),node2.hide;event2:node2.show'
+      );
     });
 
     it('should insert when actions defined for other events only', () => {
       const target = document.createElement('div');
       target.setAttribute('on', 'event2:node2.hide');
       addAction(element, target, 'event1', 'node1.foo()');
-      expect(actionService.setActions).calledWith(target,
-          'event2:node2.hide;event1:node1.foo()');
+      expect(actionService.setActions).calledWith(
+        target,
+        'event2:node2.hide;event1:node1.foo()'
+      );
     });
 
     it('should insert in FIE', () => {
@@ -531,8 +553,10 @@ describes.sandboxed('AMP GWD Animation', {}, () => {
       addAction(target, target, 'event1', 'node1.foo()');
       // Only the FIE's ActionService should be called.
       expect(actionService.setActions).to.not.be.called;
-      expect(fieActionService.setActions).calledWith(target,
-          'event2:node2.hide;event1:node1.foo()');
+      expect(fieActionService.setActions).calledWith(
+        target,
+        'event2:node2.hide;event1:node1.foo()'
+      );
     });
   });
 });
diff --git a/extensions/amp-hulu/0.1/amp-hulu.js b/extensions/amp-hulu/0.1/amp-hulu.js
index 4c574f560c72..4d2cf2b2cd36 100644
--- a/extensions/amp-hulu/0.1/amp-hulu.js
+++ b/extensions/amp-hulu/0.1/amp-hulu.js
@@ -71,19 +71,21 @@ class AmpHulu extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.eid_ = userAssert(
-        this.element.getAttribute('data-eid'),
-        'The data-eid attribute is required for <amp-hulu> %s',
-        this.element);
+      this.element.getAttribute('data-eid'),
+      'The data-eid attribute is required for <amp-hulu> %s',
+      this.element
+    );
   }
 
   /** @return {string} */
   getVideoIframeSrc_() {
     devAssert(this.eid_);
-    return `https://player.hulu.com/site/dash/mobile_embed.html?amp=1&eid=${encodeURIComponent(this.eid_ || '')}`;
+    return `https://player.hulu.com/site/dash/mobile_embed.html?amp=1&eid=${encodeURIComponent(
+      this.eid_ || ''
+    )}`;
   }
 }
 
-
 AMP.extension('amp-hulu', '0.1', AMP => {
   AMP.registerElement('amp-hulu', AmpHulu);
 });
diff --git a/extensions/amp-hulu/0.1/test/test-amp-hulu.js b/extensions/amp-hulu/0.1/test/test-amp-hulu.js
index 8802a2587f56..ab3ed6608fd0 100644
--- a/extensions/amp-hulu/0.1/test/test-amp-hulu.js
+++ b/extensions/amp-hulu/0.1/test/test-amp-hulu.js
@@ -16,53 +16,61 @@
 
 import '../amp-hulu';
 
-
-describes.realWin('amp-hulu', {
-  amp: {
-    extensions: ['amp-hulu'],
+describes.realWin(
+  'amp-hulu',
+  {
+    amp: {
+      extensions: ['amp-hulu'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getHulu(eid, opt_responsive) {
-    const hulu = doc.createElement('amp-hulu');
-    hulu.setAttribute('data-eid', eid);
-    hulu.setAttribute('width', '111');
-    hulu.setAttribute('height', '222');
-    if (opt_responsive) {
-      hulu.setAttribute('layout', 'responsive');
+    function getHulu(eid, opt_responsive) {
+      const hulu = doc.createElement('amp-hulu');
+      hulu.setAttribute('data-eid', eid);
+      hulu.setAttribute('width', '111');
+      hulu.setAttribute('height', '222');
+      if (opt_responsive) {
+        hulu.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(hulu);
+      return hulu.build().then(() => {
+        hulu.layoutCallback();
+        return hulu;
+      });
     }
-    doc.body.appendChild(hulu);
-    return hulu.build().then(() => { hulu.layoutCallback(); return hulu; });
-  }
 
-  it('renders', () => {
-    return getHulu('4Dk5F2PYTtrgciuvloH3UA').then(hulu => {
-      const iframe = hulu.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src)
-          .to.equal('https://player.hulu.com/site/dash/mobile_embed.html?amp=1&eid=4Dk5F2PYTtrgciuvloH3UA');
+    it('renders', () => {
+      return getHulu('4Dk5F2PYTtrgciuvloH3UA').then(hulu => {
+        const iframe = hulu.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://player.hulu.com/site/dash/mobile_embed.html?amp=1&eid=4Dk5F2PYTtrgciuvloH3UA'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getHulu('4Dk5F2PYTtrgciuvloH3UA', true).then(hulu => {
-      const iframe = hulu.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getHulu('4Dk5F2PYTtrgciuvloH3UA', true).then(hulu => {
+        const iframe = hulu.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-eid', () => {
-    return allowConsoleError(() => {
-      return getHulu('').should.eventually.be.rejectedWith(
-          /The data-eid attribute is required for/);
+    it('requires data-eid', () => {
+      return allowConsoleError(() => {
+        return getHulu('').should.eventually.be.rejectedWith(
+          /The data-eid attribute is required for/
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-iframe/0.1/amp-iframe.js b/extensions/amp-iframe/0.1/amp-iframe.js
index 9402927738b3..4d57df74af1e 100644
--- a/extensions/amp-iframe/0.1/amp-iframe.js
+++ b/extensions/amp-iframe/0.1/amp-iframe.js
@@ -15,9 +15,7 @@
  */
 
 import {ActionTrust} from '../../../src/action-constants';
-import {
-  IntersectionObserverApi,
-} from '../../../src/intersection-observer-polyfill';
+import {IntersectionObserverApi} from '../../../src/intersection-observer-polyfill';
 import {LayoutPriority, isLayoutSizeDefined} from '../../../src/layout';
 import {Services} from '../../../src/services';
 import {base64EncodeFromBytes} from '../../../src/utils/base64.js';
@@ -64,7 +62,6 @@ let trackingIframeCount = 0;
 let trackingIframeTimeout = 5000;
 
 export class AmpIframe extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -144,38 +141,47 @@ export class AmpIframe extends AMP.BaseElement {
     // Checks are mostly there to prevent people easily do something
     // they did not mean to.
     userAssert(
-        urlService.isSecure(src) || protocol == 'data:',
-        'Invalid <amp-iframe> src. Must start with https://. Found %s',
-        element);
+      urlService.isSecure(src) || protocol == 'data:',
+      'Invalid <amp-iframe> src. Must start with https://. Found %s',
+      element
+    );
     const containerUrl = urlService.parse(containerSrc);
     userAssert(
-        !this.sandboxContainsToken_(sandbox, 'allow-same-origin') ||
+      !this.sandboxContainsToken_(sandbox, 'allow-same-origin') ||
         (origin != containerUrl.origin && protocol != 'data:'),
-        'Origin of <amp-iframe> must not be equal to container %s' +
+      'Origin of <amp-iframe> must not be equal to container %s' +
         'if allow-same-origin is set. See https://github.com/ampproject/' +
         'amphtml/blob/master/spec/amp-iframe-origin-policy.md for details.',
-        element);
-    userAssert(!(endsWith(hostname, `.${urls.thirdPartyFrameHost}`) ||
-        endsWith(hostname, '.ampproject.org')),
-    'amp-iframe does not allow embedding of frames from ' +
-        'ampproject.*: %s', src);
+      element
+    );
+    userAssert(
+      !(
+        endsWith(hostname, `.${urls.thirdPartyFrameHost}`) ||
+        endsWith(hostname, '.ampproject.org')
+      ),
+      'amp-iframe does not allow embedding of frames from ' +
+        'ampproject.*: %s',
+      src
+    );
     return src;
   }
 
   /** @private */
   assertPosition_() {
     const pos = this.element.getLayoutBox();
-    const minTop = Math.min(600, this.getViewport().getSize().height * .75);
-    userAssert(pos.top >= minTop,
-        '<amp-iframe> elements must be positioned outside the first 75% ' +
+    const minTop = Math.min(600, this.getViewport().getSize().height * 0.75);
+    userAssert(
+      pos.top >= minTop,
+      '<amp-iframe> elements must be positioned outside the first 75% ' +
         'of the viewport or 600px from the top (whichever is smaller): %s ' +
         ' Current position %s. Min: %s' +
-        'Positioning rules don\'t apply for iframes that use `placeholder`.' +
+        "Positioning rules don't apply for iframes that use `placeholder`." +
         'See https://github.com/ampproject/amphtml/blob/master/extensions/' +
         'amp-iframe/amp-iframe.md#iframe-with-placeholder for details.',
-        this.element,
-        pos.top,
-        minTop);
+      this.element,
+      pos.top,
+      minTop
+    );
   }
 
   /**
@@ -230,24 +236,34 @@ export class AmpIframe extends AMP.BaseElement {
       return;
     }
     userAssert(
-        !((' ' + sandbox + ' ').match(/\s+allow-same-origin\s+/i)),
-        'allow-same-origin is not allowed with the srcdoc attribute %s.',
-        this.element);
+      !(' ' + sandbox + ' ').match(/\s+allow-same-origin\s+/i),
+      'allow-same-origin is not allowed with the srcdoc attribute %s.',
+      this.element
+    );
 
-    return 'data:text/html;charset=utf-8;base64,' +
-        base64EncodeFromBytes(utf8Encode(srcdoc));
+    return (
+      'data:text/html;charset=utf-8;base64,' +
+      base64EncodeFromBytes(utf8Encode(srcdoc))
+    );
   }
 
   /** @override */
   firstAttachedCallback() {
     this.sandbox_ = this.element.getAttribute('sandbox');
 
-    const iframeSrc = /** @type {string} */ (
-      this.transformSrc_(this.element.getAttribute('src')) ||
-      this.transformSrcDoc_(this.element.getAttribute('srcdoc'), this.sandbox_)
-    );
+    const iframeSrc =
+      /** @type {string} */ (this.transformSrc_(
+        this.element.getAttribute('src')
+      ) ||
+      this.transformSrcDoc_(
+        this.element.getAttribute('srcdoc'),
+        this.sandbox_
+      ));
     this.iframeSrc = this.assertSource_(
-        iframeSrc, window.location.href, this.sandbox_);
+      iframeSrc,
+      window.location.href,
+      this.sandbox_
+    );
   }
 
   /**
@@ -289,8 +305,8 @@ export class AmpIframe extends AMP.BaseElement {
 
     this.isAdLike_ = isAdLike(element);
     this.isTrackingFrame_ = this.looksLikeTrackingIframe_();
-    this.isDisallowedAsAd_ = this.isAdLike_ &&
-        !isAdPositionAllowed(element, this.win);
+    this.isDisallowedAsAd_ =
+      this.isAdLike_ && !isAdPositionAllowed(element, this.win);
 
     // When the framework has the need to remeasure us, our position might
     // have changed. Send an intersection record if needed. This can be done by
@@ -334,24 +350,30 @@ export class AmpIframe extends AMP.BaseElement {
       this.measureIframeLayoutBox_();
     }
 
-    const iframe = /** @type {!../../../src/layout-rect.LayoutRectDef} */(
-      devAssert(this.iframeLayoutBox_));
+    const iframe = /** @type {!../../../src/layout-rect.LayoutRectDef} */ (devAssert(
+      this.iframeLayoutBox_
+    ));
     return moveLayoutRect(iframe, box.left, box.top);
   }
 
   /** @override */
   layoutCallback() {
-    userAssert(!this.isDisallowedAsAd_, 'amp-iframe is not used for ' +
-        'displaying fixed ad. Please use amp-sticky-ad and amp-ad instead.');
+    userAssert(
+      !this.isDisallowedAsAd_,
+      'amp-iframe is not used for ' +
+        'displaying fixed ad. Please use amp-sticky-ad and amp-ad instead.'
+    );
 
     if (!this.isClickToPlay_) {
       this.assertPosition_();
     }
 
     if (this.isResizable_) {
-      userAssert(this.getOverflowElement(),
-          'Overflow element must be defined for resizable frames: %s',
-          this.element);
+      userAssert(
+        this.getOverflowElement(),
+        'Overflow element must be defined for resizable frames: %s',
+        this.element
+      );
     }
 
     if (!this.iframeSrc) {
@@ -362,10 +384,13 @@ export class AmpIframe extends AMP.BaseElement {
     if (this.isTrackingFrame_) {
       trackingIframeCount++;
       if (trackingIframeCount > 1) {
-        console/*OK*/.error('Only 1 analytics/tracking iframe allowed per ' +
-            'page. Please use amp-analytics instead or file a GitHub issue ' +
-            'for your use case: ' +
-            'https://github.com/ampproject/amphtml/issues/new');
+        console /*OK*/
+          .error(
+            'Only 1 analytics/tracking iframe allowed per ' +
+              'page. Please use amp-analytics instead or file a GitHub issue ' +
+              'for your use case: ' +
+              'https://github.com/ampproject/amphtml/issues/new'
+          );
         return Promise.resolve();
       }
     }
@@ -409,20 +434,26 @@ export class AmpIframe extends AMP.BaseElement {
         // Prevent this iframe from ever being recreated.
         this.iframeSrc = null;
 
-        Services.timerFor(this.win).promise(trackingIframeTimeout).then(() => {
-          removeElement(iframe);
-          this.element.setAttribute('amp-removed', '');
-          this.iframe_ = null;
-        });
+        Services.timerFor(this.win)
+          .promise(trackingIframeTimeout)
+          .then(() => {
+            removeElement(iframe);
+            this.element.setAttribute('amp-removed', '');
+            this.iframe_ = null;
+          });
       }
     };
 
-    listenFor(iframe, 'embed-size', data => {
-      this.updateSize_(data['height'], data['width']);
-    },
-    /*opt_is3P*/ undefined,
-    /*opt_includingNestedWindows*/ undefined,
-    /*opt_allowOpaqueOrigin*/ true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this.updateSize_(data['height'], data['width']);
+      },
+      /*opt_is3P*/ undefined,
+      /*opt_includingNestedWindows*/ undefined,
+      /*opt_allowOpaqueOrigin*/ true
+    );
 
     if (this.isClickToPlay_) {
       listenFor(iframe, 'embed-ready', this.activateIframe_.bind(this));
@@ -494,13 +525,13 @@ export class AmpIframe extends AMP.BaseElement {
   mutatedAttributesCallback(mutations) {
     const src = mutations['src'];
     if (src !== undefined) {
-      this.iframeSrc =
-        /** @type {?string} */ (this.transformSrc_(src));
+      this.iframeSrc = /** @type {?string} */ (this.transformSrc_(src));
       if (this.iframe_) {
         this.iframe_.src = this.assertSource_(
-            /** @type {string} */ (this.iframeSrc),
-            window.location.href,
-            this.sandbox_);
+          /** @type {string} */ (this.iframeSrc),
+          window.location.href,
+          this.sandbox_
+        );
       }
     }
   }
@@ -524,8 +555,7 @@ export class AmpIframe extends AMP.BaseElement {
    * No need for the default behavior, we'll call togglePlaceholder ourselves.
    * @override
    */
-  firstLayoutCompleted() {
-  }
+  firstLayoutCompleted() {}
 
   /**
    * Throws an error if window navigation is disallowed by this element.
@@ -534,9 +564,11 @@ export class AmpIframe extends AMP.BaseElement {
    */
   throwIfCannotNavigate() {
     if (!this.sandboxContainsToken_(this.sandbox_, 'allow-top-navigation')) {
-      throw user().createError('"AMP.navigateTo" is only allowed on ' +
+      throw user().createError(
+        '"AMP.navigateTo" is only allowed on ' +
           '<amp-iframe> when its "sandbox" attribute contains ' +
-          '"allow-top-navigation".');
+          '"allow-top-navigation".'
+      );
     }
   }
 
@@ -549,18 +581,22 @@ export class AmpIframe extends AMP.BaseElement {
    */
   updateSize_(height, width) {
     if (!this.isResizable_) {
-      this.user().error(TAG_,
-          'Ignoring embed-size request because this iframe is not resizable',
-          this.element);
+      this.user().error(
+        TAG_,
+        'Ignoring embed-size request because this iframe is not resizable',
+        this.element
+      );
       return;
     }
 
     if (height < 100) {
-      this.user().error(TAG_,
-          'Ignoring embed-size request because the resize height is less ' +
+      this.user().error(
+        TAG_,
+        'Ignoring embed-size request because the resize height is less ' +
           'than 100px. If you are using amp-iframe to display ads, consider ' +
           'using amp-ad instead.',
-          this.element);
+        this.element
+      );
       return;
     }
 
@@ -570,32 +606,39 @@ export class AmpIframe extends AMP.BaseElement {
     height = parseInt(height, 10);
     if (!isNaN(height)) {
       newHeight = Math.max(
-          height + (this.element./*OK*/offsetHeight
-              - this.iframe_./*OK*/offsetHeight),
-          height);
+        height +
+          (this.element./*OK*/ offsetHeight - this.iframe_./*OK*/ offsetHeight),
+        height
+      );
     }
     width = parseInt(width, 10);
     if (!isNaN(width)) {
       newWidth = Math.max(
-          width + (this.element./*OK*/offsetWidth
-              - this.iframe_./*OK*/offsetWidth),
-          width);
+        width +
+          (this.element./*OK*/ offsetWidth - this.iframe_./*OK*/ offsetWidth),
+        width
+      );
     }
 
     if (newHeight !== undefined || newWidth !== undefined) {
-      this.attemptChangeSize(newHeight, newWidth).then(() => {
-        if (newHeight !== undefined) {
-          this.element.setAttribute('height', newHeight);
-        }
-        if (newWidth !== undefined) {
-          this.element.setAttribute('width', newWidth);
-        }
-      }, () => {});
+      this.attemptChangeSize(newHeight, newWidth).then(
+        () => {
+          if (newHeight !== undefined) {
+            this.element.setAttribute('height', newHeight);
+          }
+          if (newWidth !== undefined) {
+            this.element.setAttribute('width', newWidth);
+          }
+        },
+        () => {}
+      );
     } else {
-      this.user().error(TAG_,
-          'Ignoring embed-size request because '
-          + 'no width or height value is provided',
-          this.element);
+      this.user().error(
+        TAG_,
+        'Ignoring embed-size request because ' +
+          'no width or height value is provided',
+        this.element
+      );
     }
   }
 
@@ -616,15 +659,24 @@ export class AmpIframe extends AMP.BaseElement {
 
     // Register action (even if targetOrigin_ is not available so we can
     // provide a helpful error message).
-    this.registerAction('postMessage', invocation => {
-      if (this.targetOrigin_) {
-        this.iframe_.contentWindow./*OK*/postMessage(
-            invocation.args, this.targetOrigin_);
-      } else {
-        user().error(TAG_, '"postMessage" action is only allowed with "src"' +
-            'attribute with an origin.');
-      }
-    }, ActionTrust.HIGH);
+    this.registerAction(
+      'postMessage',
+      invocation => {
+        if (this.targetOrigin_) {
+          this.iframe_.contentWindow./*OK*/ postMessage(
+            invocation.args,
+            this.targetOrigin_
+          );
+        } else {
+          user().error(
+            TAG_,
+            '"postMessage" action is only allowed with "src"' +
+              'attribute with an origin.'
+          );
+        }
+      },
+      ActionTrust.HIGH
+    );
 
     // However, don't listen for 'message' event if targetOrigin_ is null.
     if (!this.targetOrigin_) {
@@ -640,18 +692,28 @@ export class AmpIframe extends AMP.BaseElement {
         return;
       }
       if (e.origin !== this.targetOrigin_) {
-        user().error(TAG_, '"message" received from unexpected origin: ' +
-            e.origin + '. Only allowed from: ' + this.targetOrigin_);
+        user().error(
+          TAG_,
+          '"message" received from unexpected origin: ' +
+            e.origin +
+            '. Only allowed from: ' +
+            this.targetOrigin_
+        );
         return;
       }
       if (!this.isUserGesture_()) {
         unexpectedMessages++;
-        user().error(TAG_, '"message" event may only be triggered ' +
-            'from a user gesture.');
+        user().error(
+          TAG_,
+          '"message" event may only be triggered from a user gesture.'
+        );
         // Disable the 'message' event if the iframe is behaving badly.
         if (unexpectedMessages >= maxUnexpectedMessages) {
-          user().error(TAG_, 'Too many non-gesture-triggered "message" ' +
-              'events; detaching event listener.');
+          user().error(
+            TAG_,
+            'Too many non-gesture-triggered "message" ' +
+              'events; detaching event listener.'
+          );
           this.win.removeEventListener('message', listener);
         }
         return;
@@ -664,9 +726,11 @@ export class AmpIframe extends AMP.BaseElement {
         user().error(TAG_, 'Data from "message" event must be JSON.');
         return;
       }
-      const event =
-          createCustomEvent(this.win, 'amp-iframe:message',
-              dict({'data': sanitized}));
+      const event = createCustomEvent(
+        this.win,
+        'amp-iframe:message',
+        dict({'data': sanitized})
+      );
       const actionService = Services.actionServiceForDoc(this.element);
       actionService.trigger(this.element, 'message', event, ActionTrust.HIGH);
     };
@@ -723,7 +787,8 @@ function setSandbox(element, iframe, sandbox) {
 function makeIOsScrollable(element) {
   if (element.getAttribute('scrolling') != 'no') {
     const wrapper = element.ownerDocument.createElement(
-        'i-amphtml-scroll-container');
+      'i-amphtml-scroll-container'
+    );
     element.appendChild(wrapper);
     return wrapper;
   }
diff --git a/extensions/amp-iframe/0.1/test/test-amp-iframe.js b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
index 1619d9e38f8a..c018a381506a 100644
--- a/extensions/amp-iframe/0.1/test/test-amp-iframe.js
+++ b/extensions/amp-iframe/0.1/test/test-amp-iframe.js
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-
 import {ActionTrust} from '../../../../src/action-constants';
-import {
-  AmpIframe,
-  setTrackingIframeTimeoutForTesting,
-} from '../amp-iframe';
+import {AmpIframe, setTrackingIframeTimeoutForTesting} from '../amp-iframe';
 import {CommonSignals} from '../../../../src/common-signals';
 import {LayoutPriority} from '../../../../src/layout';
 import {Services} from '../../../../src/services';
@@ -35,483 +31,574 @@ import {user} from '../../../../src/log';
 /** @const {number} */
 const IFRAME_MESSAGE_TIMEOUT = 50;
 
-describes.realWin('amp-iframe', {
-  allowExternalResources: true,
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-iframe'],
-    ampdoc: 'single',
+describes.realWin(
+  'amp-iframe',
+  {
+    allowExternalResources: true,
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-iframe'],
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  describe('amp-iframe', () => {
-    let iframeSrc;
-    let clickableIframeSrc;
-    let timer;
-    let ranJs;
-    let content;
-    let win;
-    let doc;
-
-    beforeEach(() => {
-      iframeSrc = 'http://iframe.localhost:' + location.port +
-        '/test/fixtures/served/iframe.html';
-      clickableIframeSrc = 'http://iframe.localhost:' + location.port +
-        '/test/fixtures/served/iframe-clicktoplay.html';
-      win = env.win;
-      doc = win.document;
-      timer = Services.timerFor(win);
-      ranJs = 0;
-      content = '';
-      timer = Services.timerFor(env.win);
-      win.addEventListener('message', message => {
-        if (typeof message.data != 'string') {
-          return;
-        }
-        if (message.data == 'loaded-iframe') {
-          ranJs++;
-        }
-        if (message.data.indexOf('content-iframe:') == 0) {
-          content = message.data.replace('content-iframe:', '');
-        }
+  env => {
+    describe('amp-iframe', () => {
+      let iframeSrc;
+      let clickableIframeSrc;
+      let timer;
+      let ranJs;
+      let content;
+      let win;
+      let doc;
+
+      beforeEach(() => {
+        iframeSrc =
+          'http://iframe.localhost:' +
+          location.port +
+          '/test/fixtures/served/iframe.html';
+        clickableIframeSrc =
+          'http://iframe.localhost:' +
+          location.port +
+          '/test/fixtures/served/iframe-clicktoplay.html';
+        win = env.win;
+        doc = win.document;
+        timer = Services.timerFor(win);
+        ranJs = 0;
+        content = '';
+        timer = Services.timerFor(env.win);
+        win.addEventListener('message', message => {
+          if (typeof message.data != 'string') {
+            return;
+          }
+          if (message.data == 'loaded-iframe') {
+            ranJs++;
+          }
+          if (message.data.indexOf('content-iframe:') == 0) {
+            content = message.data.replace('content-iframe:', '');
+          }
+        });
+        setTrackingIframeTimeoutForTesting(20);
       });
-      setTrackingIframeTimeoutForTesting(20);
-    });
 
-    function waitForJsInIframe(opt_ranJs = 1, opt_timeout = 300) {
-      return poll('waiting for JS to run', () => {
-        return ranJs >= opt_ranJs;
-      }, undefined, opt_timeout);
-    }
-
-    function waitForAmpIframeLayoutPromise(doc, ampIframe) {
-      const viewport = Services.viewportForDoc(doc);
-      viewport.setScrollTop(600);
-      return whenUpgradedToCustomElement(ampIframe).then(element => {
-        return element.signals().whenSignal(CommonSignals.LOAD_END);
-      });
-    }
-
-    function createAmpIframe(env, opt_attributes, opt_top, opt_height,
-      opt_translateY, opt_container) {
-      const doc = env.win.document;
-      env.win.innerHeight = opt_height;
-      const attributes = opt_attributes || {
-        src: iframeSrc,
-        width: 100,
-        height: 100,
-      };
-      const ampIframe =
-          createElementWithAttributes(doc, 'amp-iframe', attributes);
-      if (attributes.resizable) {
-        const overflowEl = doc.createElement('div');
-        overflowEl.setAttribute('overflow', '');
-        ampIframe.appendChild(overflowEl);
+      function waitForJsInIframe(opt_ranJs = 1, opt_timeout = 300) {
+        return poll(
+          'waiting for JS to run',
+          () => {
+            return ranJs >= opt_ranJs;
+          },
+          undefined,
+          opt_timeout
+        );
       }
-      if (attributes.poster) {
-        const img = createElementWithAttributes(doc, 'amp-img', {
-          'layout': 'fill',
-          'src': attributes.poster,
-          'placeholder': '',
+
+      function waitForAmpIframeLayoutPromise(doc, ampIframe) {
+        const viewport = Services.viewportForDoc(doc);
+        viewport.setScrollTop(600);
+        return whenUpgradedToCustomElement(ampIframe).then(element => {
+          return element.signals().whenSignal(CommonSignals.LOAD_END);
         });
-        ampIframe.appendChild(img);
-      }
-      if (opt_container) {
-        const container = doc.createElement('div');
-        container.classList.add('i-amphtml-overlay');
-        container.appendChild(ampIframe);
-        doc.body.appendChild(container);
-      } else {
-        doc.body.appendChild(ampIframe);
       }
-      const viewport = Services.viewportForDoc(doc);
-      viewport.resize_();
-      ampIframe.style.top = '600px';
-      if (opt_top != undefined) {
-        ampIframe.style.top = opt_top.toString() + 'px';
-      }
-      const {top} = ampIframe.style;
-      ampIframe.style.position = 'absolute'; //opt_position
-      if (opt_translateY) {
-        ampIframe.style.transform = `translateY(${opt_translateY}px)`;//'translateY(' + opt_translateY + ')';
-      }
-      if (attributes.resizable !== undefined) {
-        const overflowEl = doc.createElement('div');
-        overflowEl.setAttribute('overflow', '');
-        ampIframe.appendChild(overflowEl);
-      }
-      if (attributes.poster) {
-        const img = doc.createElement('amp-img');
-        img.setAttribute('layout', 'fill');
-        img.setAttribute('src', attributes.poster);
-        img.setAttribute('placeholder', '');
-        ampIframe.appendChild(img);
-      }
-      if (attributes.position) {
-        ampIframe.style.position = attributes.position;
+
+      function createAmpIframe(
+        env,
+        opt_attributes,
+        opt_top,
+        opt_height,
+        opt_translateY,
+        opt_container
+      ) {
+        const doc = env.win.document;
+        env.win.innerHeight = opt_height;
+        const attributes = opt_attributes || {
+          src: iframeSrc,
+          width: 100,
+          height: 100,
+        };
+        const ampIframe = createElementWithAttributes(
+          doc,
+          'amp-iframe',
+          attributes
+        );
+        if (attributes.resizable) {
+          const overflowEl = doc.createElement('div');
+          overflowEl.setAttribute('overflow', '');
+          ampIframe.appendChild(overflowEl);
+        }
+        if (attributes.poster) {
+          const img = createElementWithAttributes(doc, 'amp-img', {
+            'layout': 'fill',
+            'src': attributes.poster,
+            'placeholder': '',
+          });
+          ampIframe.appendChild(img);
+        }
+        if (opt_container) {
+          const container = doc.createElement('div');
+          container.classList.add('i-amphtml-overlay');
+          container.appendChild(ampIframe);
+          doc.body.appendChild(container);
+        } else {
+          doc.body.appendChild(ampIframe);
+        }
+        const viewport = Services.viewportForDoc(doc);
+        viewport.resize_();
+        ampIframe.style.top = '600px';
+        if (opt_top != undefined) {
+          ampIframe.style.top = opt_top.toString() + 'px';
+        }
+        const {top} = ampIframe.style;
+        ampIframe.style.position = 'absolute'; //opt_position
+        if (opt_translateY) {
+          ampIframe.style.transform = `translateY(${opt_translateY}px)`; //'translateY(' + opt_translateY + ')';
+        }
+        if (attributes.resizable !== undefined) {
+          const overflowEl = doc.createElement('div');
+          overflowEl.setAttribute('overflow', '');
+          ampIframe.appendChild(overflowEl);
+        }
+        if (attributes.poster) {
+          const img = doc.createElement('amp-img');
+          img.setAttribute('layout', 'fill');
+          img.setAttribute('src', attributes.poster);
+          img.setAttribute('placeholder', '');
+          ampIframe.appendChild(img);
+        }
+        if (attributes.position) {
+          ampIframe.style.position = attributes.position;
+        }
+        viewport.setScrollTop(parseInt(top, 10));
+
+        return ampIframe;
       }
-      viewport.setScrollTop(parseInt(top, 10));
-
-      return ampIframe;
-    }
-
-    it('should render iframe', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 100,
-        height: 100,
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.src).to.equal(iframeSrc + '#amp=1');
-      expect(iframe.getAttribute('sandbox')).to.equal('');
-      const scrollWrapper =
-          ampIframe.querySelector('i-amphtml-scroll-container');
-      expect(iframe.parentNode).to.equal(scrollWrapper);
-      expect(impl.looksLikeTrackingIframe_()).to.be.false;
-      expect(impl.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
-      yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
-      expect(ranJs).to.equal(0);
-    });
 
-    it('should only propagate supported attributes', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 100,
-        height: 100,
-        allowfullscreen: '',
-        allowpaymentrequest: '',
-        allowtransparency: '',
-        allow: 'microphone; camera',
-        referrerpolicy: 'no-referrer',
-        frameborder: 3,
-        longdesc: 'foo',
-        marginwidth: 5,
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.getAttribute('allowfullscreen')).to.equal('');
-      expect(iframe.getAttribute('allowpaymentrequest')).to.equal('');
-      expect(iframe.getAttribute('allowtransparency')).to.equal('');
-      expect(iframe.getAttribute('allow')).to.equal('microphone; camera');
-      expect(iframe.getAttribute('referrerpolicy')).to.equal('no-referrer');
-      expect(iframe.getAttribute('frameborder')).to.equal('3');
-      // unsupproted attributes
-      expect(iframe.getAttribute('longdesc')).to.be.null;
-      expect(iframe.getAttribute('marginwidth')).to.be.null;
-    });
+      it('should render iframe', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          width: 100,
+          height: 100,
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.src).to.equal(iframeSrc + '#amp=1');
+        expect(iframe.getAttribute('sandbox')).to.equal('');
+        const scrollWrapper = ampIframe.querySelector(
+          'i-amphtml-scroll-container'
+        );
+        expect(iframe.parentNode).to.equal(scrollWrapper);
+        expect(impl.looksLikeTrackingIframe_()).to.be.false;
+        expect(impl.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
+        expect(ranJs).to.equal(0);
+      });
 
-    // This is temporary.
-    // TODO(aghassemi, #21247)
-    it('should disable allow=autoplay', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 100,
-        height: 100,
-        allow: 'microphone; autoplay; camera',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.getAttribute('allow')).to
-          .equal('microphone; autoplay-disabled; camera');
-    });
+      it('should only propagate supported attributes', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          width: 100,
+          height: 100,
+          allowfullscreen: '',
+          allowpaymentrequest: '',
+          allowtransparency: '',
+          allow: 'microphone; camera',
+          referrerpolicy: 'no-referrer',
+          frameborder: 3,
+          longdesc: 'foo',
+          marginwidth: 5,
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.getAttribute('allowfullscreen')).to.equal('');
+        expect(iframe.getAttribute('allowpaymentrequest')).to.equal('');
+        expect(iframe.getAttribute('allowtransparency')).to.equal('');
+        expect(iframe.getAttribute('allow')).to.equal('microphone; camera');
+        expect(iframe.getAttribute('referrerpolicy')).to.equal('no-referrer');
+        expect(iframe.getAttribute('frameborder')).to.equal('3');
+        // unsupproted attributes
+        expect(iframe.getAttribute('longdesc')).to.be.null;
+        expect(iframe.getAttribute('marginwidth')).to.be.null;
+      });
 
-    it('should default frameborder to 0 if not set', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 100,
-        height: 100,
+      // This is temporary.
+      // TODO(aghassemi, #21247)
+      it('should disable allow=autoplay', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          width: 100,
+          height: 100,
+          allow: 'microphone; autoplay; camera',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.getAttribute('allow')).to.equal(
+          'microphone; autoplay-disabled; camera'
+        );
       });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.getAttribute('frameborder')).to.equal('0');
-    });
 
-    it('should allow JS and propagate scrolling and have lower priority',
-        function* () {
-          const ampIframe = createAmpIframe(env, {
-            src: iframeSrc,
-            sandbox: 'allow-scripts',
-            width: 320,
-            height: 250,
-            scrolling: 'no',
-          });
-          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-          expect(ampIframe.implementation_.getLayoutPriority()).to.equal(
-              LayoutPriority.ADS);
-          expect(ampIframe.getAttribute('sandbox')).to.equal('allow-scripts');
-          return waitForJsInIframe().then(() => {
-            expect(ranJs).to.equal(1);
-            expect(ampIframe.querySelector(
-                'i-amphtml-scroll-container')).to.be.null;
-          });
+      it('should default frameborder to 0 if not set', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          width: 100,
+          height: 100,
         });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.getAttribute('frameborder')).to.equal('0');
+      });
 
-    it('should not render at the top', function* () {
-      expectAsyncConsoleError(/position/);
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-      }, 599, 1000);
-      yield whenUpgradedToCustomElement(ampIframe);
-      yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
-    });
+      it('should allow JS and propagate scrolling and have lower priority', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 320,
+          height: 250,
+          scrolling: 'no',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        expect(ampIframe.implementation_.getLayoutPriority()).to.equal(
+          LayoutPriority.ADS
+        );
+        expect(ampIframe.getAttribute('sandbox')).to.equal('allow-scripts');
+        return waitForJsInIframe().then(() => {
+          expect(ranJs).to.equal(1);
+          expect(ampIframe.querySelector('i-amphtml-scroll-container')).to.be
+            .null;
+        });
+      });
 
-    it('should respect translations', function* () {
-      expectAsyncConsoleError(/position/);
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-      }, 650, 1000, -600);
-      yield whenUpgradedToCustomElement(ampIframe);
-      yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
-    });
+      it('should not render at the top', function*() {
+        expectAsyncConsoleError(/position/);
+        const ampIframe = createAmpIframe(
+          env,
+          {
+            src: iframeSrc,
+            sandbox: 'allow-scripts',
+            width: 100,
+            height: 100,
+          },
+          599,
+          1000
+        );
+        yield whenUpgradedToCustomElement(ampIframe);
+        yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      });
 
-    it('should render if further than 75% vh away from top', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-      }, 75, 100);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      expect(ampIframe.querySelector('iframe')).to.not.be.null;
-    });
+      it('should respect translations', function*() {
+        expectAsyncConsoleError(/position/);
+        const ampIframe = createAmpIframe(
+          env,
+          {
+            src: iframeSrc,
+            sandbox: 'allow-scripts',
+            width: 100,
+            height: 100,
+          },
+          650,
+          1000,
+          -600
+        );
+        yield whenUpgradedToCustomElement(ampIframe);
+        yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      });
 
-    it('should deny http', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: 'http://google.com/fpp',
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
+      it('should render if further than 75% vh away from top', function*() {
+        const ampIframe = createAmpIframe(
+          env,
+          {
+            src: iframeSrc,
+            sandbox: 'allow-scripts',
+            width: 100,
+            height: 100,
+          },
+          75,
+          100
+        );
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        expect(ampIframe.querySelector('iframe')).to.not.be.null;
       });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      expect(ampIframe.querySelector('iframe')).to.be.null;
-    });
 
-    it('should allow data-uri', function* () {
-      const dataUri = 'data:text/html;charset=utf-8;base64,' +
+      it('should deny http', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: 'http://google.com/fpp',
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        expect(ampIframe.querySelector('iframe')).to.be.null;
+      });
+
+      it('should allow data-uri', function*() {
+        const dataUri =
+          'data:text/html;charset=utf-8;base64,' +
           'PHNjcmlwdD5kb2N1bWVudC53cml0ZSgnUiAnICsgZG9jdW1lbnQucmVmZXJyZXIgK' +
           'yAnLCAnICsgbG9jYXRpb24uaHJlZik8L3NjcmlwdD4=';
-      const ampIframe = createAmpIframe(env, {
-        src: dataUri,
-        width: 100,
-        height: 100,
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.src).to.equal(dataUri);
-      expect(iframe.getAttribute('sandbox')).to.equal('');
-      const scrollWrapper =
-          ampIframe.querySelector('i-amphtml-scroll-container');
-      expect(iframe.parentNode).to.equal(scrollWrapper);
-      yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
-      expect(ranJs).to.equal(0);
-    });
+        const ampIframe = createAmpIframe(env, {
+          src: dataUri,
+          width: 100,
+          height: 100,
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.src).to.equal(dataUri);
+        expect(iframe.getAttribute('sandbox')).to.equal('');
+        const scrollWrapper = ampIframe.querySelector(
+          'i-amphtml-scroll-container'
+        );
+        expect(iframe.parentNode).to.equal(scrollWrapper);
+        yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
+        expect(ranJs).to.equal(0);
+      });
 
-    it('should support srcdoc', function* () {
-      const ampIframe = createAmpIframe(env, {
-        width: 100,
-        height: 100,
-        sandbox: 'allow-scripts',
-        srcdoc: '<div id="content"><p>௵Z加䅌ਇ☎Èʘغޝ</p></div>' +
-          '<script>try{parent.location.href}catch(e){' +
-          'parent./*OK*/postMessage(\'loaded-iframe\', \'*\');' +
-          'var c = document.querySelector(\'#content\').innerHTML;' +
-          'parent./*OK*/postMessage(\'content-iframe:\' + c, \'*\');' +
-          '}</script>',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe.src).to.match(
-          /^data\:text\/html;charset=utf-8;base64,/);
-      expect(iframe.getAttribute('srcdoc')).to.be.null;
-      expect(iframe.getAttribute('sandbox')).to.equal(
-          'allow-scripts');
-      const scrollWrapper =
-          ampIframe.querySelector('i-amphtml-scroll-container');
-      expect(iframe.parentNode).to.equal(scrollWrapper);
-      return waitForJsInIframe().then(() => {
-        expect(ranJs).to.equal(1);
-        expect(content).to.equal('<p>௵Z加䅌ਇ☎Èʘغޝ</p>');
+      it('should support srcdoc', function*() {
+        const ampIframe = createAmpIframe(env, {
+          width: 100,
+          height: 100,
+          sandbox: 'allow-scripts',
+          srcdoc:
+            '<div id="content"><p>௵Z加䅌ਇ☎Èʘغޝ</p></div>' +
+            '<script>try{parent.location.href}catch(e){' +
+            "parent./*OK*/postMessage('loaded-iframe', '*');" +
+            "var c = document.querySelector('#content').innerHTML;" +
+            "parent./*OK*/postMessage('content-iframe:' + c, '*');" +
+            '}</script>',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe.src).to.match(/^data\:text\/html;charset=utf-8;base64,/);
+        expect(iframe.getAttribute('srcdoc')).to.be.null;
+        expect(iframe.getAttribute('sandbox')).to.equal('allow-scripts');
+        const scrollWrapper = ampIframe.querySelector(
+          'i-amphtml-scroll-container'
+        );
+        expect(iframe.parentNode).to.equal(scrollWrapper);
+        return waitForJsInIframe().then(() => {
+          expect(ranJs).to.equal(1);
+          expect(content).to.equal('<p>௵Z加䅌ਇ☎Èʘغޝ</p>');
+        });
       });
-    });
 
-    it('should deny srcdoc with allow-same-origin', function* () {
-      const ampIframe = createAmpIframe(env, {
-        width: 100,
-        height: 100,
-        sandbox: 'allow-same-origin',
-        srcdoc: '',
+      it('should deny srcdoc with allow-same-origin', function*() {
+        const ampIframe = createAmpIframe(env, {
+          width: 100,
+          height: 100,
+          sandbox: 'allow-same-origin',
+          srcdoc: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe).to.be.null;
       });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe).to.be.null;
-    });
 
-    it('should deny data uri with allow-same-origin', function* () {
-      const ampIframe = createAmpIframe(env, {
-        width: 100,
-        height: 100,
-        sandbox: 'allow-same-origin',
-        src: 'data:text/html;charset=utf-8;base64,' +
-          'PHNjcmlwdD5kb2N1bWVudC53cml0ZSgnUiAnICsgZG9jdW1lbnQucmVmZXJyZXIgK' +
-          'yAnLCAnICsgbG9jYXRpb24uaHJlZik8L3NjcmlwdD4=',
+      it('should deny data uri with allow-same-origin', function*() {
+        const ampIframe = createAmpIframe(env, {
+          width: 100,
+          height: 100,
+          sandbox: 'allow-same-origin',
+          src:
+            'data:text/html;charset=utf-8;base64,' +
+            'PHNjcmlwdD5kb2N1bWVudC53cml0ZSgnUiAnICsgZG9jdW1lbnQucmVmZXJyZXIgK' +
+            'yAnLCAnICsgbG9jYXRpb24uaHJlZik8L3NjcmlwdD4=',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe).to.be.null;
       });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe).to.be.null;
-    });
 
-    it('should deny DATA uri with allow-same-origin', function* () {
-      const ampIframe = createAmpIframe(env, {
-        width: 100,
-        height: 100,
-        sandbox: 'allow-same-origin',
-        src: 'DATA:text/html;charset=utf-8;base64,' +
-          'PHNjcmlwdD5kb2N1bWVudC53cml0ZSgnUiAnICsgZG9jdW1lbnQucmVmZXJyZXIgK' +
-          'yAnLCAnICsgbG9jYXRpb24uaHJlZik8L3NjcmlwdD4=',
+      it('should deny DATA uri with allow-same-origin', function*() {
+        const ampIframe = createAmpIframe(env, {
+          width: 100,
+          height: 100,
+          sandbox: 'allow-same-origin',
+          src:
+            'DATA:text/html;charset=utf-8;base64,' +
+            'PHNjcmlwdD5kb2N1bWVudC53cml0ZSgnUiAnICsgZG9jdW1lbnQucmVmZXJyZXIgK' +
+            'yAnLCAnICsgbG9jYXRpb24uaHJlZik8L3NjcmlwdD4=',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        expect(iframe).to.be.null;
       });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      expect(iframe).to.be.null;
-    });
 
-    it('should deny same origin', () => {
-      const ampIframe = createAmpIframe(env);
-      const impl = ampIframe.implementation_;
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('https://google.com/fpp', 'https://google.com/abc',
-            'allow-same-origin');
-      }).to.throw(/must not be equal to container/); });
-
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('https://google.com/fpp', 'https://google.com/abc',
-            'Allow-same-origin');
-      }).to.throw(/must not be equal to container/); });
-
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('https://google.com/fpp', 'https://google.com/abc',
-            'allow-same-origin allow-scripts');
-      }).to.throw(/must not be equal to container/); });
-      // Same origin, but sandboxed.
-      impl.assertSource_('https://google.com/fpp', 'https://google.com/abc', '');
-
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('http://google.com/', 'https://foo.com', '');
-      }).to.throw(/Must start with https/); });
-
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('./foo', location.href, 'allow-same-origin');
-      }).to.throw(/must not be equal to container/); });
-
-      impl.assertSource_('http://iframe.localhost:123/foo',
-          'https://foo.com', '');
-      impl.assertSource_('https://container.com', 'https://foo.com', '');
-      ampIframe.setAttribute('srcdoc', 'abc');
-      ampIframe.setAttribute('sandbox', 'allow-same-origin');
-
-      allowConsoleError(() => { expect(() => {
-        impl.transformSrcDoc_('<script>try{parent.location.href}catch(e){' +
-          'parent.parent./*OK*/postMessage(\'loaded-iframe\', \'*\');}' +
-          '</script>', 'Allow-Same-Origin');
-      }).to.throw(
-          /allow-same-origin is not allowed with the srcdoc attribute/);
-      });
-
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('https://3p.ampproject.net:999/t',
-            'https://google.com/abc');
-      }).to.throw(/not allow embedding of frames from ampproject\.\*/); });
-      allowConsoleError(() => { expect(() => {
-        impl.assertSource_('https://3p.ampproject.net:999/t',
-            'https://google.com/abc');
-      }).to.throw(/not allow embedding of frames from ampproject\.\*/); });
-    });
+      it('should deny same origin', () => {
+        const ampIframe = createAmpIframe(env);
+        const impl = ampIframe.implementation_;
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_(
+              'https://google.com/fpp',
+              'https://google.com/abc',
+              'allow-same-origin'
+            );
+          }).to.throw(/must not be equal to container/);
+        });
 
-    it('should transform source', () => {
-      const ampIframe = createAmpIframe(env);
-      const impl = ampIframe.implementation_;
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_(
+              'https://google.com/fpp',
+              'https://google.com/abc',
+              'Allow-same-origin'
+            );
+          }).to.throw(/must not be equal to container/);
+        });
 
-      // null -> undefined
-      expect(impl.transformSrc_(null)).to.be.undefined;
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_(
+              'https://google.com/fpp',
+              'https://google.com/abc',
+              'allow-same-origin allow-scripts'
+            );
+          }).to.throw(/must not be equal to container/);
+        });
+        // Same origin, but sandboxed.
+        impl.assertSource_(
+          'https://google.com/fpp',
+          'https://google.com/abc',
+          ''
+        );
+
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_('http://google.com/', 'https://foo.com', '');
+          }).to.throw(/Must start with https/);
+        });
 
-      // data: is unchanged
-      expect(impl.transformSrc_('data:abc')).to.equal('data:abc');
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_('./foo', location.href, 'allow-same-origin');
+          }).to.throw(/must not be equal to container/);
+        });
 
-      // URL with fragment is unchanged.
-      expect(impl.transformSrc_('https://example.com/#1'))
-          .to.equal('https://example.com/#1');
+        impl.assertSource_(
+          'http://iframe.localhost:123/foo',
+          'https://foo.com',
+          ''
+        );
+        impl.assertSource_('https://container.com', 'https://foo.com', '');
+        ampIframe.setAttribute('srcdoc', 'abc');
+        ampIframe.setAttribute('sandbox', 'allow-same-origin');
+
+        allowConsoleError(() => {
+          expect(() => {
+            impl.transformSrcDoc_(
+              '<script>try{parent.location.href}catch(e){' +
+                "parent.parent./*OK*/postMessage('loaded-iframe', '*');}" +
+                '</script>',
+              'Allow-Same-Origin'
+            );
+          }).to.throw(
+            /allow-same-origin is not allowed with the srcdoc attribute/
+          );
+        });
 
-      // URL w/o fragment is modified.
-      expect(impl.transformSrc_('https://example.com/'))
-          .to.equal('https://example.com/#amp=1');
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_(
+              'https://3p.ampproject.net:999/t',
+              'https://google.com/abc'
+            );
+          }).to.throw(/not allow embedding of frames from ampproject\.\*/);
+        });
+        allowConsoleError(() => {
+          expect(() => {
+            impl.assertSource_(
+              'https://3p.ampproject.net:999/t',
+              'https://google.com/abc'
+            );
+          }).to.throw(/not allow embedding of frames from ampproject\.\*/);
+        });
+      });
 
-      // URL with empty fragment is modified.
-      expect(impl.transformSrc_('https://example.com/#'))
-          .to.equal('https://example.com/#amp=1');
-    });
+      it('should transform source', () => {
+        const ampIframe = createAmpIframe(env);
+        const impl = ampIframe.implementation_;
 
-    it('should listen for resize events', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      return new Promise((resolve, unusedReject) => {
-        impl.updateSize_ = (height, width) => {
-          resolve({height, width});
-        };
-        const iframe = ampIframe.querySelector('iframe');
-        iframe.contentWindow.postMessage({
-          sentinel: 'amp-test',
-          type: 'requestHeight',
-          height: 217,
-          width: 113,
-        }, '*');
-      }).then(res => {
-        expect(res.height).to.equal(217);
-        expect(res.width).to.equal(113);
+        // null -> undefined
+        expect(impl.transformSrc_(null)).to.be.undefined;
+
+        // data: is unchanged
+        expect(impl.transformSrc_('data:abc')).to.equal('data:abc');
+
+        // URL with fragment is unchanged.
+        expect(impl.transformSrc_('https://example.com/#1')).to.equal(
+          'https://example.com/#1'
+        );
+
+        // URL w/o fragment is modified.
+        expect(impl.transformSrc_('https://example.com/')).to.equal(
+          'https://example.com/#amp=1'
+        );
+
+        // URL with empty fragment is modified.
+        expect(impl.transformSrc_('https://example.com/#')).to.equal(
+          'https://example.com/#amp=1'
+        );
       });
-    });
 
-    it('should allow resize events w/o allow-same-origin', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      return new Promise((resolve, unusedReject) => {
-        impl.updateSize_ = (height, width) => {
-          resolve({height, width});
-        };
-        const iframe = ampIframe.querySelector('iframe');
-        iframe.contentWindow.postMessage({
-          sentinel: 'amp-test',
-          type: 'requestHeight',
-          height: 217,
-          width: 113,
-        }, '*');
-      }).then(res => {
-        expect(res.height).to.equal(217);
-        expect(res.width).to.equal(113);
+      it('should listen for resize events', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        return new Promise((resolve, unusedReject) => {
+          impl.updateSize_ = (height, width) => {
+            resolve({height, width});
+          };
+          const iframe = ampIframe.querySelector('iframe');
+          iframe.contentWindow.postMessage(
+            {
+              sentinel: 'amp-test',
+              type: 'requestHeight',
+              height: 217,
+              width: 113,
+            },
+            '*'
+          );
+        }).then(res => {
+          expect(res.height).to.equal(217);
+          expect(res.width).to.equal(113);
+        });
       });
-    });
 
-    it('should allow resize events w/ srcdoc', function* () {
-      const srcdoc = `
+      it('should allow resize events w/o allow-same-origin', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        return new Promise((resolve, unusedReject) => {
+          impl.updateSize_ = (height, width) => {
+            resolve({height, width});
+          };
+          const iframe = ampIframe.querySelector('iframe');
+          iframe.contentWindow.postMessage(
+            {
+              sentinel: 'amp-test',
+              type: 'requestHeight',
+              height: 217,
+              width: 113,
+            },
+            '*'
+          );
+        }).then(res => {
+          expect(res.height).to.equal(217);
+          expect(res.width).to.equal(113);
+        });
+      });
+
+      it('should allow resize events w/ srcdoc', function*() {
+        const srcdoc = `
         <!doctype html>
         <html>
          <body>
@@ -528,401 +615,429 @@ describes.realWin('amp-iframe', {
          </body>
         </html>
       `;
-      const ampIframe = createAmpIframe(env, {
-        srcdoc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      return new Promise((resolve, unusedReject) => {
-        impl.updateSize_ = (height, width) => {
-          resolve({height, width});
-        };
-      }).then(res => {
-        expect(res.height).to.equal(200);
-        expect(res.width).to.equal(300);
+        const ampIframe = createAmpIframe(env, {
+          srcdoc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        return new Promise((resolve, unusedReject) => {
+          impl.updateSize_ = (height, width) => {
+            resolve({height, width});
+          };
+        }).then(res => {
+          expect(res.height).to.equal(200);
+          expect(res.width).to.equal(300);
+        });
       });
-    });
 
-    it('should resize amp-iframe', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
-      impl.updateSize_(217, '114' /* be tolerant to string number */);
-      expect(attemptChangeSize).to.be.calledWith(217, 114);
-    });
-
-    it('should resize amp-iframe when only height is provided', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
-      impl.updateSize_(217);
-      expect(attemptChangeSize).to.be.calledOnce;
-      expect(attemptChangeSize.firstCall.args[0]).to.equal(217);
-      expect(attemptChangeSize.firstCall.args[1]).to.be.undefined;
-    });
+      it('should resize amp-iframe', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
+        impl.updateSize_(217, '114' /* be tolerant to string number */);
+        expect(attemptChangeSize).to.be.calledWith(217, 114);
+      });
 
-    it('should not resize amp-iframe if request height is small', function* () {
-      expectAsyncConsoleError(/resize height is less than 100px/);
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-        resizable: '',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
-      impl.updateSize_(50, 114);
-      expect(attemptChangeSize).to.have.not.been.called;
-    });
+      it('should resize amp-iframe when only height is provided', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
+        impl.updateSize_(217);
+        expect(attemptChangeSize).to.be.calledOnce;
+        expect(attemptChangeSize.firstCall.args[0]).to.equal(217);
+        expect(attemptChangeSize.firstCall.args[1]).to.be.undefined;
+      });
 
-    it('should not resize amp-iframe if it is non-resizable', function* () {
-      expectAsyncConsoleError(/iframe is not resizable/);
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts',
-        width: 100,
-        height: 100,
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
-      impl.updateSize_(217, 114);
-      expect(attemptChangeSize).to.have.not.been.called;
-    });
+      it('should not resize amp-iframe if request height is small', function*() {
+        expectAsyncConsoleError(/resize height is less than 100px/);
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+          resizable: '',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
+        impl.updateSize_(50, 114);
+        expect(attemptChangeSize).to.have.not.been.called;
+      });
 
-    it('should listen for embed-ready event', function* () {
-      const activateIframeSpy_ =
-          sandbox./*OK*/spy(AmpIframe.prototype, 'activateIframe_');
-      const ampIframe = createAmpIframe(env, {
-        src: clickableIframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 480,
-        height: 360,
-        poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const iframe = ampIframe.querySelector('iframe');
-      yield timer.promise(100);
-      expect(iframe.style.zIndex).to.equal('0');
-      expect(activateIframeSpy_).to.have.callCount(2);
-    });
+      it('should not resize amp-iframe if it is non-resizable', function*() {
+        expectAsyncConsoleError(/iframe is not resizable/);
+        const ampIframe = createAmpIframe(env, {
+          src: iframeSrc,
+          sandbox: 'allow-scripts',
+          width: 100,
+          height: 100,
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        const attemptChangeSize = sandbox.spy(impl, 'attemptChangeSize');
+        impl.updateSize_(217, 114);
+        expect(attemptChangeSize).to.have.not.been.called;
+      });
 
-    it('should detect non-tracking iframe', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: clickableIframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 11,
-        height: 11,
-        poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      expect(impl.looksLikeTrackingIframe_()).to.be.false;
-    });
+      it('should listen for embed-ready event', function*() {
+        const activateIframeSpy_ = sandbox./*OK*/ spy(
+          AmpIframe.prototype,
+          'activateIframe_'
+        );
+        const ampIframe = createAmpIframe(env, {
+          src: clickableIframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 480,
+          height: 360,
+          poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const iframe = ampIframe.querySelector('iframe');
+        yield timer.promise(100);
+        expect(iframe.style.zIndex).to.equal('0');
+        expect(activateIframeSpy_).to.have.callCount(2);
+      });
 
-    it('should detect tracking iframes', function* () {
-      expectAsyncConsoleError(/Only 1 analytics\/tracking iframe allowed/);
-      const ampIframe1 = createAmpIframe(env, {
-        src: clickableIframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 5,
-        height: 5,
-        poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
-      });
-      const ampIframe2 = createAmpIframe(env, {
-        src: clickableIframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 10,
-        height: 10,
-        poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
-      });
-      const ampIframe3 = createAmpIframe(env, {
-        src: clickableIframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 100,
-        height: 100,
-        poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe1);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe2);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe3);
-      // 5*5
-      const impl1 = ampIframe1.implementation_;
-      // 10*10
-      const impl2 = ampIframe2.implementation_;
-      // 100*100
-      const impl3 = ampIframe3.implementation_;
-      // appended amp-iframe 5x5
-      expect(impl1.looksLikeTrackingIframe_()).to.be.true;
-      // appended amp-iframe 10x10
-      expect(impl2.looksLikeTrackingIframe_()).to.be.true;
-      expect(impl2.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
-      // appended amp-iframe 100x100
-      expect(impl3.looksLikeTrackingIframe_()).to.be.false;
-      expect(impl3.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
-      yield Services.timerFor(env.win).promise(21);
-      expect(doc.querySelectorAll('[amp-removed]')).to.have.length(1);
-      expect(doc.querySelectorAll('iframe')).to.have.length(1);
-      expect(ampIframe3.querySelector('iframe')).to.not.be.null;
-    });
+      it('should detect non-tracking iframe', function*() {
+        const ampIframe = createAmpIframe(env, {
+          src: clickableIframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 11,
+          height: 11,
+          poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        const impl = ampIframe.implementation_;
+        expect(impl.looksLikeTrackingIframe_()).to.be.false;
+      });
 
-    it('should not detect traking iframe in amp container', function* () {
-      expectAsyncConsoleError(/Only 1 analytics\/tracking iframe allowed/);
-      const ampIframeRealTracking = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 5,
-        height: 5,
-      });
-      const ampIframeInLightbox = createAmpIframe(env, {
-        src: iframeSrc,
-        width: 5,
-        height: 5,
-      }, undefined, undefined, undefined, true);
-      const ampIframe = createAmpIframe(env);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframeRealTracking);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframeInLightbox);
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-
-      expect(ampIframeRealTracking.implementation_.looksLikeTrackingIframe_())
-          .to.be.true;
-      expect(ampIframe.implementation_.looksLikeTrackingIframe_())
-          .to.be.false;
-      expect(ampIframeInLightbox.implementation_.looksLikeTrackingIframe_())
-          .to.be.false;
-    });
+      it('should detect tracking iframes', function*() {
+        expectAsyncConsoleError(/Only 1 analytics\/tracking iframe allowed/);
+        const ampIframe1 = createAmpIframe(env, {
+          src: clickableIframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 5,
+          height: 5,
+          poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
+        });
+        const ampIframe2 = createAmpIframe(env, {
+          src: clickableIframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 10,
+          height: 10,
+          poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
+        });
+        const ampIframe3 = createAmpIframe(env, {
+          src: clickableIframeSrc,
+          sandbox: 'allow-scripts allow-same-origin',
+          width: 100,
+          height: 100,
+          poster: 'https://i.ytimg.com/vi/cMcCTVAFBWM/hqdefault.jpg',
+        });
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe1);
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe2);
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe3);
+        // 5*5
+        const impl1 = ampIframe1.implementation_;
+        // 10*10
+        const impl2 = ampIframe2.implementation_;
+        // 100*100
+        const impl3 = ampIframe3.implementation_;
+        // appended amp-iframe 5x5
+        expect(impl1.looksLikeTrackingIframe_()).to.be.true;
+        // appended amp-iframe 10x10
+        expect(impl2.looksLikeTrackingIframe_()).to.be.true;
+        expect(impl2.getLayoutPriority()).to.equal(LayoutPriority.METADATA);
+        // appended amp-iframe 100x100
+        expect(impl3.looksLikeTrackingIframe_()).to.be.false;
+        expect(impl3.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
+        yield Services.timerFor(env.win).promise(21);
+        expect(doc.querySelectorAll('[amp-removed]')).to.have.length(1);
+        expect(doc.querySelectorAll('iframe')).to.have.length(1);
+        expect(ampIframe3.querySelector('iframe')).to.not.be.null;
+      });
 
-    it('should correctly classify ads', () => {
-      function e(width, height) {
-        return {
-          getLayoutBox() {
-            return {width, height};
+      it('should not detect traking iframe in amp container', function*() {
+        expectAsyncConsoleError(/Only 1 analytics\/tracking iframe allowed/);
+        const ampIframeRealTracking = createAmpIframe(env, {
+          src: iframeSrc,
+          width: 5,
+          height: 5,
+        });
+        const ampIframeInLightbox = createAmpIframe(
+          env,
+          {
+            src: iframeSrc,
+            width: 5,
+            height: 5,
           },
-        };
-      }
-      expect(isAdLike(e(300, 250))).to.be.true;
-      expect(isAdLike(e(320, 270))).to.be.true;
-      expect(isAdLike(e(299, 249))).to.be.false;
-      expect(isAdLike(e(320, 100))).to.be.true;
-      expect(isAdLike(e(335, 100))).to.be.true;
-      expect(isAdLike(e(341, 100))).to.be.false;
-    });
+          undefined,
+          undefined,
+          undefined,
+          true
+        );
+        const ampIframe = createAmpIframe(env);
+        yield waitForAmpIframeLayoutPromise(doc, ampIframeRealTracking);
+        yield waitForAmpIframeLayoutPromise(doc, ampIframeInLightbox);
+        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
 
-    it('should not render fixed ad', function* () {
-      expectAsyncConsoleError(/not used for displaying fixed ad/);
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 300,
-        height: 250,
-        position: 'fixed',
-      }, 0);
-      yield whenUpgradedToCustomElement(ampIframe);
-      yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
-    });
+        expect(ampIframeRealTracking.implementation_.looksLikeTrackingIframe_())
+          .to.be.true;
+        expect(ampIframe.implementation_.looksLikeTrackingIframe_()).to.be
+          .false;
+        expect(ampIframeInLightbox.implementation_.looksLikeTrackingIframe_())
+          .to.be.false;
+      });
 
-    it('should not cache intersection box', function* () {
-      const ampIframe = createAmpIframe(env, {
-        src: iframeSrc,
-        sandbox: 'allow-scripts allow-same-origin',
-        width: 300,
-        height: 250,
-      });
-      yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-      const impl = ampIframe.implementation_;
-      const stub = sandbox.stub(impl, 'getLayoutBox');
-      const box = {
-        top: 100,
-        bottom: 200,
-        left: 0,
-        right: 100,
-        width: 100,
-        height: 100,
-      };
-      stub.returns(box);
-
-      impl.onLayoutMeasure();
-      const intersection = impl.getIntersectionElementLayoutBox();
-      // Simulate a fixed position element "moving" 100px by scrolling down
-      // the page.
-      box.top += 100;
-      box.bottom += 100;
-      const newIntersection = impl.getIntersectionElementLayoutBox();
-      expect(newIntersection).not.to.deep.equal(intersection);
-      expect(newIntersection.top).to.equal(intersection.top + 100);
-      expect(newIntersection.width).to.equal(300);
-      expect(newIntersection.height).to.equal(250);
-    });
+      it('should correctly classify ads', () => {
+        function e(width, height) {
+          return {
+            getLayoutBox() {
+              return {width, height};
+            },
+          };
+        }
+        expect(isAdLike(e(300, 250))).to.be.true;
+        expect(isAdLike(e(320, 270))).to.be.true;
+        expect(isAdLike(e(299, 249))).to.be.false;
+        expect(isAdLike(e(320, 100))).to.be.true;
+        expect(isAdLike(e(335, 100))).to.be.true;
+        expect(isAdLike(e(341, 100))).to.be.false;
+      });
 
-    it('should propagate `src` when container attribute is mutated',
-        function* () {
-          const ampIframe = createAmpIframe(env, {
+      it('should not render fixed ad', function*() {
+        expectAsyncConsoleError(/not used for displaying fixed ad/);
+        const ampIframe = createAmpIframe(
+          env,
+          {
             src: iframeSrc,
-            width: 100,
-            height: 100,
-          });
-          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
-          const impl = ampIframe.implementation_;
-          const iframe = ampIframe.querySelector('iframe');
-          const newSrc = 'https://foo.bar';
-          ampIframe.setAttribute('src', newSrc);
-          impl.mutatedAttributesCallback({src: newSrc});
-          expect(impl.iframeSrc).to.contain(newSrc);
-          expect(iframe.getAttribute('src')).to.contain(newSrc);
-        });
+            sandbox: 'allow-scripts allow-same-origin',
+            width: 300,
+            height: 250,
+            position: 'fixed',
+          },
+          0
+        );
+        yield whenUpgradedToCustomElement(ampIframe);
+        yield ampIframe.signals().whenSignal(CommonSignals.LOAD_START);
+      });
 
-    describe('throwIfCannotNavigate()', () => {
-      it('should do nothing if top navigation is allowed', function*() {
+      it('should not cache intersection box', function*() {
         const ampIframe = createAmpIframe(env, {
           src: iframeSrc,
-          sandbox: 'allow-scripts allow-same-origin allow-top-navigation',
+          sandbox: 'allow-scripts allow-same-origin',
           width: 300,
           height: 250,
         });
         yield waitForAmpIframeLayoutPromise(doc, ampIframe);
         const impl = ampIframe.implementation_;
-        // Should be allowed if `allow-top-navigation` is set.
-        expect(() => impl.throwIfCannotNavigate()).to.not.throw();
+        const stub = sandbox.stub(impl, 'getLayoutBox');
+        const box = {
+          top: 100,
+          bottom: 200,
+          left: 0,
+          right: 100,
+          width: 100,
+          height: 100,
+        };
+        stub.returns(box);
+
+        impl.onLayoutMeasure();
+        const intersection = impl.getIntersectionElementLayoutBox();
+        // Simulate a fixed position element "moving" 100px by scrolling down
+        // the page.
+        box.top += 100;
+        box.bottom += 100;
+        const newIntersection = impl.getIntersectionElementLayoutBox();
+        expect(newIntersection).not.to.deep.equal(intersection);
+        expect(newIntersection.top).to.equal(intersection.top + 100);
+        expect(newIntersection.width).to.equal(300);
+        expect(newIntersection.height).to.equal(250);
       });
 
-      it('should throw error if top navigation is not allowed', function*() {
+      it('should propagate `src` when container attribute is mutated', function*() {
         const ampIframe = createAmpIframe(env, {
           src: iframeSrc,
-          sandbox: 'allow-scripts allow-same-origin',
-          width: 300,
-          height: 250,
+          width: 100,
+          height: 100,
         });
         yield waitForAmpIframeLayoutPromise(doc, ampIframe);
         const impl = ampIframe.implementation_;
-        // Should be allowed if `allow-top-navigation` is set.
-        expect(() => impl.throwIfCannotNavigate())
-            .to.throw(/allow-top-navigation/);
+        const iframe = ampIframe.querySelector('iframe');
+        const newSrc = 'https://foo.bar';
+        ampIframe.setAttribute('src', newSrc);
+        impl.mutatedAttributesCallback({src: newSrc});
+        expect(impl.iframeSrc).to.contain(newSrc);
+        expect(iframe.getAttribute('src')).to.contain(newSrc);
       });
-    });
 
-    describe('two-way messaging', function() {
-      let messagingSrc;
+      describe('throwIfCannotNavigate()', () => {
+        it('should do nothing if top navigation is allowed', function*() {
+          const ampIframe = createAmpIframe(env, {
+            src: iframeSrc,
+            sandbox: 'allow-scripts allow-same-origin allow-top-navigation',
+            width: 300,
+            height: 250,
+          });
+          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+          const impl = ampIframe.implementation_;
+          // Should be allowed if `allow-top-navigation` is set.
+          expect(() => impl.throwIfCannotNavigate()).to.not.throw();
+        });
 
-      beforeEach(() => {
-        messagingSrc = 'http://iframe.localhost:' + location.port +
-            '/test/fixtures/served/iframe-messaging.html';
-        toggleExperiment(win, 'iframe-messaging', true, true);
+        it('should throw error if top navigation is not allowed', function*() {
+          const ampIframe = createAmpIframe(env, {
+            src: iframeSrc,
+            sandbox: 'allow-scripts allow-same-origin',
+            width: 300,
+            height: 250,
+          });
+          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+          const impl = ampIframe.implementation_;
+          // Should be allowed if `allow-top-navigation` is set.
+          expect(() => impl.throwIfCannotNavigate()).to.throw(
+            /allow-top-navigation/
+          );
+        });
       });
 
-      afterEach(() => {
-        toggleExperiment(win, 'iframe-messaging', false, true);
-      });
+      describe('two-way messaging', function() {
+        let messagingSrc;
 
-      it('should support "postMessage" action', function*() {
-        const ampIframe = createAmpIframe(env, {
-          src: messagingSrc,
-          sandbox: 'allow-scripts allow-same-origin',
-          width: 100,
-          height: 100});
-        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+        beforeEach(() => {
+          messagingSrc =
+            'http://iframe.localhost:' +
+            location.port +
+            '/test/fixtures/served/iframe-messaging.html';
+          toggleExperiment(win, 'iframe-messaging', true, true);
+        });
 
-        const impl = ampIframe.implementation_;
-        impl.executeAction({
-          method: 'postMessage',
-          args: 'foo-123',
-          satisfiesTrust: () => true,
+        afterEach(() => {
+          toggleExperiment(win, 'iframe-messaging', false, true);
         });
 
-        yield waitForJsInIframe(1);
-        expect(content).to.equal('foo-123');
-      });
+        it('should support "postMessage" action', function*() {
+          const ampIframe = createAmpIframe(env, {
+            src: messagingSrc,
+            sandbox: 'allow-scripts allow-same-origin',
+            width: 100,
+            height: 100,
+          });
+          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
 
-      it('should not allow "postMessage" on srcdoc amp-iframe', function*() {
-        const ampIframe = createAmpIframe(env, {
-          srcdoc: '<script>addEventListener("message", e => {' +
-            '  parent./*OK*/postMessage("content-iframe:" + e.data, "*");' +
-            '  parent./*OK*/postMessage("loaded-iframe", "*");' +
-            '});</script>',
-          sandbox: 'allow-scripts',
-          width: 100,
-          height: 100});
-        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+          const impl = ampIframe.implementation_;
+          impl.executeAction({
+            method: 'postMessage',
+            args: 'foo-123',
+            satisfiesTrust: () => true,
+          });
 
-        const userError = sandbox.stub(user(), 'error');
-        const addEventListener = sandbox.stub(win, 'addEventListener');
-        ampIframe.implementation_.executeAction({
-          method: 'postMessage',
-          args: 'foo-123',
-          satisfiesTrust: () => true,
+          yield waitForJsInIframe(1);
+          expect(content).to.equal('foo-123');
         });
-        expect(userError).to.be.calledOnce;
-        expect(userError).to.be.calledWithMatch('amp-iframe',
-            /"postMessage" action is only allowed with "src"/);
 
-        yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
-        // The iframe's <script> will only post 'loaded-frame' on receipt of
-        // a message from the parent, which should be disallowed above.
-        expect(ranJs).to.equal(0);
-        // Normally, amp-iframe sets up a listener for "message" events
-        // for iframe -> host messaging, but not if targetOrigin_ is invalid.
-        expect(addEventListener).to.not.be.called;
-      });
+        it('should not allow "postMessage" on srcdoc amp-iframe', function*() {
+          const ampIframe = createAmpIframe(env, {
+            srcdoc:
+              '<script>addEventListener("message", e => {' +
+              '  parent./*OK*/postMessage("content-iframe:" + e.data, "*");' +
+              '  parent./*OK*/postMessage("loaded-iframe", "*");' +
+              '});</script>',
+            sandbox: 'allow-scripts',
+            width: 100,
+            height: 100,
+          });
+          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
 
-      it('should receive "message" events from <iframe>', function*() {
-        const ampIframe = createAmpIframe(env, {
-          src: messagingSrc,
-          sandbox: 'allow-scripts allow-same-origin',
-          width: 100,
-          height: 100});
-        yield waitForAmpIframeLayoutPromise(doc, ampIframe);
+          const userError = sandbox.stub(user(), 'error');
+          const addEventListener = sandbox.stub(win, 'addEventListener');
+          ampIframe.implementation_.executeAction({
+            method: 'postMessage',
+            args: 'foo-123',
+            satisfiesTrust: () => true,
+          });
+          expect(userError).to.be.calledOnce;
+          expect(userError).to.be.calledWithMatch(
+            'amp-iframe',
+            /"postMessage" action is only allowed with "src"/
+          );
+
+          yield timer.promise(IFRAME_MESSAGE_TIMEOUT);
+          // The iframe's <script> will only post 'loaded-frame' on receipt of
+          // a message from the parent, which should be disallowed above.
+          expect(ranJs).to.equal(0);
+          // Normally, amp-iframe sets up a listener for "message" events
+          // for iframe -> host messaging, but not if targetOrigin_ is invalid.
+          expect(addEventListener).to.not.be.called;
+        });
 
-        const userError = sandbox.stub(user(), 'error');
-        const actions = {trigger: sandbox.spy()};
-        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+        it('should receive "message" events from <iframe>', function*() {
+          const ampIframe = createAmpIframe(env, {
+            src: messagingSrc,
+            sandbox: 'allow-scripts allow-same-origin',
+            width: 100,
+            height: 100,
+          });
+          yield waitForAmpIframeLayoutPromise(doc, ampIframe);
 
-        const impl = ampIframe.implementation_;
-        impl.executeAction({
-          method: 'postMessage',
-          args: 'foo-123',
-          satisfiesTrust: () => true,
-        });
+          const userError = sandbox.stub(user(), 'error');
+          const actions = {trigger: sandbox.spy()};
+          sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
 
-        yield waitForJsInIframe(1);
-        expect(actions.trigger).to.not.be.called;
-        expect(userError).calledWithMatch('amp-iframe',
-            /may only be triggered from a user gesture/);
+          const impl = ampIframe.implementation_;
+          impl.executeAction({
+            method: 'postMessage',
+            args: 'foo-123',
+            satisfiesTrust: () => true,
+          });
 
-        sandbox.stub(impl, 'isUserGesture_').returns(true);
-        impl.executeAction({
-          method: 'postMessage',
-          args: 'bar-456',
-          satisfiesTrust: () => true,
-        });
+          yield waitForJsInIframe(1);
+          expect(actions.trigger).to.not.be.called;
+          expect(userError).calledWithMatch(
+            'amp-iframe',
+            /may only be triggered from a user gesture/
+          );
+
+          sandbox.stub(impl, 'isUserGesture_').returns(true);
+          impl.executeAction({
+            method: 'postMessage',
+            args: 'bar-456',
+            satisfiesTrust: () => true,
+          });
 
-        yield waitForJsInIframe(2);
-        // Once for 'loaded-iframe' and once for 'content-iframe'.
-        expect(actions.trigger).to.be.calledTwice;
-        const eventMatcher = sinon.match({
-          type: 'amp-iframe:message',
-          detail: sinon.match({data: 'content-iframe:bar-456'}),
+          yield waitForJsInIframe(2);
+          // Once for 'loaded-iframe' and once for 'content-iframe'.
+          expect(actions.trigger).to.be.calledTwice;
+          const eventMatcher = sinon.match({
+            type: 'amp-iframe:message',
+            detail: sinon.match({data: 'content-iframe:bar-456'}),
+          });
+          expect(actions.trigger).to.be.calledWith(
+            ampIframe,
+            'message',
+            eventMatcher,
+            ActionTrust.HIGH
+          );
         });
-        expect(actions.trigger).to.be.calledWith(ampIframe, 'message',
-            eventMatcher, ActionTrust.HIGH);
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ima-video/0.1/amp-ima-video.js b/extensions/amp-ima-video/0.1/amp-ima-video.js
index dd5bfd9c2daf..452fbd76c3f1 100644
--- a/extensions/amp-ima-video/0.1/amp-ima-video.js
+++ b/extensions/amp-ima-video/0.1/amp-ima-video.js
@@ -27,14 +27,9 @@ import {
 } from '../../../src/dom';
 import {dict} from '../../../src/utils/object';
 import {getConsentPolicyState} from '../../../src/consent';
-import {
-  getData,
-  listen,
-} from '../../../src/event-helper';
+import {getData, listen} from '../../../src/event-helper';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isEnumValue, isObject, toArray} from '../../../src/types';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
@@ -45,7 +40,6 @@ const TAG = 'amp-ima-video';
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpImaVideo extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -88,26 +82,28 @@ class AmpImaVideo extends AMP.BaseElement {
   buildCallback() {
     this.viewport_ = this.getViewport();
     if (this.element.getAttribute('data-delay-ad-request') === 'true') {
-      this.unlisteners_['onFirstScroll'] =
-          this.viewport_.onScroll(() => {
-            this.sendCommand_('onFirstScroll');
-          });
+      this.unlisteners_['onFirstScroll'] = this.viewport_.onScroll(() => {
+        this.sendCommand_('onFirstScroll');
+      });
       // Request ads after 3 seconds, if something else doesn't trigger an ad
       // request before that.
-      Services.timerFor(this.win).delay(
-          () => { this.sendCommand_('onAdRequestDelayTimeout'); }, 3000);
-
+      Services.timerFor(this.win).delay(() => {
+        this.sendCommand_('onAdRequestDelayTimeout');
+      }, 3000);
     }
 
-    assertHttpsUrl(this.element.getAttribute('data-tag'),
-        'The data-tag attribute is required for <amp-video-ima> and must be ' +
-            'https');
+    assertHttpsUrl(
+      this.element.getAttribute('data-tag'),
+      'The data-tag attribute is required for <amp-video-ima> and must be ' +
+        'https'
+    );
 
     // Handle <source> and <track> children
     const sourceElements = childElementsByTag(this.element, 'SOURCE');
     const trackElements = childElementsByTag(this.element, 'TRACK');
-    const childElements =
-        toArray(sourceElements).concat(toArray(trackElements));
+    const childElements = toArray(sourceElements).concat(
+      toArray(trackElements)
+    );
     if (childElements.length > 0) {
       const children = [];
       childElements.forEach(child => {
@@ -117,17 +113,21 @@ class AmpImaVideo extends AMP.BaseElement {
         } else if (child.tagName == 'TRACK' && !this.preconnectTrack_) {
           this.preconnectTrack_ = child.src;
         }
-        children.push(child./*OK*/outerHTML);
+        children.push(child./*OK*/ outerHTML);
       });
       this.element.setAttribute(
-          'data-child-elements', JSON.stringify(children));
+        'data-child-elements',
+        JSON.stringify(children)
+      );
     }
 
     // Handle IMASetting JSON
     const scriptElement = childElementsByTag(this.element, 'SCRIPT')[0];
     if (scriptElement && isJsonScriptTag(scriptElement)) {
       this.element.setAttribute(
-          'data-ima-settings', scriptElement./*OK*/innerHTML);
+        'data-ima-settings',
+        scriptElement./*OK*/ innerHTML
+      );
     }
   }
 
@@ -135,7 +135,9 @@ class AmpImaVideo extends AMP.BaseElement {
   preconnectCallback() {
     const {element, preconnect} = this;
     preconnect.preload(
-        'https://imasdk.googleapis.com/js/sdkloader/ima3.js', 'script');
+      'https://imasdk.googleapis.com/js/sdkloader/ima3.js',
+      'script'
+    );
     const source = element.getAttribute('data-src');
     if (source) {
       preconnect.url(source);
@@ -168,8 +170,13 @@ class AmpImaVideo extends AMP.BaseElement {
       ? getConsentPolicyState(element, consentPolicyId)
       : Promise.resolve(null);
     return consentPromise.then(initialConsentState => {
-      const iframe = getIframe(win, element, 'ima-video',
-          {initialConsentState}, {allowFullscreen: true});
+      const iframe = getIframe(
+        win,
+        element,
+        'ima-video',
+        {initialConsentState},
+        {allowFullscreen: true}
+      );
 
       this.applyFillContent(iframe);
 
@@ -183,8 +190,9 @@ class AmpImaVideo extends AMP.BaseElement {
       this.playerReadyPromise_ = deferred.promise;
       this.playerReadyResolver_ = deferred.resolve;
 
-      this.unlistenMessage_ = listen(this.win, 'message',
-          e => this.handlePlayerMessage_(/** @type {!Event} */ (e)));
+      this.unlistenMessage_ = listen(this.win, 'message', e =>
+        this.handlePlayerMessage_(/** @type {!Event} */ (e))
+      );
 
       element.appendChild(iframe);
 
@@ -195,7 +203,6 @@ class AmpImaVideo extends AMP.BaseElement {
     });
   }
 
-
   /** @override */
   viewportCallback(visible) {
     this.element.dispatchCustomEvent(VideoEvents.VISIBILITY, {visible});
@@ -237,11 +244,16 @@ class AmpImaVideo extends AMP.BaseElement {
   sendCommand_(command, opt_args) {
     if (this.iframe_ && this.iframe_.contentWindow) {
       this.playerReadyPromise_.then(() => {
-        this.iframe_.contentWindow./*OK*/postMessage(JSON.stringify(dict({
-          'event': 'command',
-          'func': command,
-          'args': opt_args || '',
-        })), '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(
+          JSON.stringify(
+            dict({
+              'event': 'command',
+              'func': command,
+              'args': opt_args || '',
+            })
+          ),
+          '*'
+        );
       });
     }
     // If we have an unlistener for this command, call it.
@@ -273,7 +285,7 @@ class AmpImaVideo extends AMP.BaseElement {
       return;
     }
     if (videoEvent == ImaPlayerData.IMA_PLAYER_DATA) {
-      this.playerData_ = /** @type {!ImaPlayerData} */(eventData['data']);
+      this.playerData_ = /** @type {!ImaPlayerData} */ (eventData['data']);
       return;
     }
     if (videoEvent == 'fullscreenchange') {
@@ -375,7 +387,6 @@ class AmpImaVideo extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpImaVideo);
 });
diff --git a/extensions/amp-ima-video/0.1/ima-player-data.js b/extensions/amp-ima-video/0.1/ima-player-data.js
index c8ff098f67aa..671dfd79eb64 100644
--- a/extensions/amp-ima-video/0.1/ima-player-data.js
+++ b/extensions/amp-ima-video/0.1/ima-player-data.js
@@ -15,7 +15,6 @@
  */
 
 export class ImaPlayerData {
-
   /**
    * Create a new ImaPlayerData object.
    *
diff --git a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
index 0cb3545a965f..0db7f22e03b4 100644
--- a/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
+++ b/extensions/amp-ima-video/0.1/test/test-amp-ima-video.js
@@ -20,1113 +20,1038 @@ import * as imaVideoObj from '../../../../ads/google/imaVideo';
 import {CONSENT_POLICY_STATE} from '../../../../src/consent-state';
 import {Services} from '../../../../src/services';
 
-describes.realWin('amp-ima-video', {
-  amp: {
-    extensions: ['amp-ima-video'],
+describes.realWin(
+  'amp-ima-video',
+  {
+    amp: {
+      extensions: ['amp-ima-video'],
+    },
   },
-}, env => {
-  const srcUrl = 'http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4';
-  const adTagUrl = 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=';
-
-  let win, doc, timer;
-
-  beforeEach(() => {
-    win = env.win;
-    win.context = {};
-    doc = win.document;
-    timer = Services.timerFor(env.win);
-  });
-
-  function getVideoPlayerMock() {
-    return {
-      load: function() {},
-      addEventListener: function() {},
-      removeEventListener: function() {},
-      play: function() {},
-      pause: function() {},
-      muted: false,
-      played: {
-        length: 0,
-      },
-    };
-  }
+  env => {
+    const srcUrl = 'http://rmcdn.2mdn.net/Demo/vast_inspector/android.mp4';
+    const adTagUrl =
+      'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=';
+
+    let win, doc, timer;
+
+    beforeEach(() => {
+      win = env.win;
+      win.context = {};
+      doc = win.document;
+      timer = Services.timerFor(env.win);
+    });
 
-  it('adds ad container', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+    function getVideoPlayerMock() {
+      return {
+        load: function() {},
+        addEventListener: function() {},
+        removeEventListener: function() {},
+        play: function() {},
+        pause: function() {},
+        muted: false,
+        played: {
+          length: 0,
+        },
+      };
+    }
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    const video = doc.body.querySelector('#ima-content-player');
-    expect(video).not.to.be.undefined;
-  });
-
-  it('adds video element', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    const video = doc.body.querySelector('#ima-ad-container');
-    expect(video).not.to.be.undefined;
-  });
-
-  it('handles click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+    it('adds ad container', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const video = doc.body.querySelector('#ima-content-player');
+      expect(video).not.to.be.undefined;
     });
-    const bigPlayDivMock = {
-      style: {
-        display: '',
-      },
-      removeEventListener() {},
-    };
-    const adDisplayContainerMock = {initialize() {}};
-    const initSpy = sandbox.spy(adDisplayContainerMock, 'initialize');
-    const videoPlayerMock = getVideoPlayerMock();
-    const loadSpy = sandbox.spy(videoPlayerMock, 'load');
-    const mockAdsLoader = {requestAds() {}};
-    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
-    //const playAdsSpy = sandbox.spy(imaVideoObj, 'playAds');
-    //const playAdsFunc = imaVideoObj.playAds;
-    //const playAdsSpy = sandbox.spy(playAdsFunc);
-    imaVideoObj.setBigPlayDivForTesting(bigPlayDivMock);
-    imaVideoObj.setAdDisplayContainerForTesting(adDisplayContainerMock);
-    imaVideoObj.setVideoPlayerForTesting(videoPlayerMock);
-
-    imaVideoObj.onBigPlayClick();
-
-    expect(imaVideoObj.getPropertiesForTesting().playbackStarted).to.be.true;
-    expect(imaVideoObj.getPropertiesForTesting().uiTicker)
-        .to.exist;
-    expect(bigPlayDivMock.style.display).to.eql('none');
-    expect(initSpy).to.be.called;
-    expect(loadSpy).to.be.called;
-    // TODO - Fix one I figure out how to spy on internals.
-    //expect(playAdsSpy).to.be.called;
-  });
-
-  it('updates ad countdown timer', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    const videoDefaults = {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    };
-    const tests = [
-      {
-        'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 0},
-        'expected': 'Ad (1 of 1): 0:00',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 2},
-        'expected': 'Ad (1 of 1): 0:02',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 3.923462062},
-        'expected': 'Ad (1 of 1): 0:03',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 1},
-        'expected': 'Ad (1 of 3): 0:01',
-      },
-      {
-        'mock': {'adPosition': 2, 'totalAds': 79, 'remainingTime': 7600},
-        'expected': 'Ad (2 of 79): 126:40',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 0},
-        'label': 'Publicidad',
-        'expected': 'Publicidad: 0:00',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 0},
-        'label': 'Publicidad (%s de %s)',
-        'expected': 'Publicidad (1 de 1): 0:00',
-      },
-      {
-        'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 0},
-        'label': 'Publicidad %s',
-        'expected': 'Publicidad 1: 0:00',
-      },
-    ];
-
-    tests.forEach(({mock, label, expected}) => {
-      let defaults = videoDefaults;
-      if (label) {
-        defaults = Object.assign(defaults, {adLabel: label});
-      }
-      imaVideoObj.imaVideo(win, defaults);
-      const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
-      const countdownDiv = controlsDiv.querySelector('#ima-countdown > div');
-      imaVideoObj.setAdsManagerForTesting({
-        getRemainingTime: () => mock.remainingTime,
+
+    it('adds video element', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
       });
-      imaVideoObj.onAdProgress({
-        getAdData: () => mock,
+      const video = doc.body.querySelector('#ima-ad-container');
+      expect(video).not.to.be.undefined;
+    });
+
+    it('handles click', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
       });
-      expect(countdownDiv.textContent).to.eql(expected);
+      const bigPlayDivMock = {
+        style: {
+          display: '',
+        },
+        removeEventListener() {},
+      };
+      const adDisplayContainerMock = {initialize() {}};
+      const initSpy = sandbox.spy(adDisplayContainerMock, 'initialize');
+      const videoPlayerMock = getVideoPlayerMock();
+      const loadSpy = sandbox.spy(videoPlayerMock, 'load');
+      const mockAdsLoader = {requestAds() {}};
+      imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+      //const playAdsSpy = sandbox.spy(imaVideoObj, 'playAds');
+      //const playAdsFunc = imaVideoObj.playAds;
+      //const playAdsSpy = sandbox.spy(playAdsFunc);
+      imaVideoObj.setBigPlayDivForTesting(bigPlayDivMock);
+      imaVideoObj.setAdDisplayContainerForTesting(adDisplayContainerMock);
+      imaVideoObj.setVideoPlayerForTesting(videoPlayerMock);
+
+      imaVideoObj.onBigPlayClick();
+
+      expect(imaVideoObj.getPropertiesForTesting().playbackStarted).to.be.true;
+      expect(imaVideoObj.getPropertiesForTesting().uiTicker).to.exist;
+      expect(bigPlayDivMock.style.display).to.eql('none');
+      expect(initSpy).to.be.called;
+      expect(loadSpy).to.be.called;
+      // TODO - Fix one I figure out how to spy on internals.
+      //expect(playAdsSpy).to.be.called;
     });
-  });
-
-  it('plays ads with ads manager', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('updates ad countdown timer', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      const videoDefaults = {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      };
+      const tests = [
+        {
+          'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 0},
+          'expected': 'Ad (1 of 1): 0:00',
+        },
+        {
+          'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 2},
+          'expected': 'Ad (1 of 1): 0:02',
+        },
+        {
+          'mock': {
+            'adPosition': 1,
+            'totalAds': 1,
+            'remainingTime': 3.923462062,
+          },
+          'expected': 'Ad (1 of 1): 0:03',
+        },
+        {
+          'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 1},
+          'expected': 'Ad (1 of 3): 0:01',
+        },
+        {
+          'mock': {'adPosition': 2, 'totalAds': 79, 'remainingTime': 7600},
+          'expected': 'Ad (2 of 79): 126:40',
+        },
+        {
+          'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 0},
+          'label': 'Publicidad',
+          'expected': 'Publicidad: 0:00',
+        },
+        {
+          'mock': {'adPosition': 1, 'totalAds': 1, 'remainingTime': 0},
+          'label': 'Publicidad (%s de %s)',
+          'expected': 'Publicidad (1 de 1): 0:00',
+        },
+        {
+          'mock': {'adPosition': 1, 'totalAds': 3, 'remainingTime': 0},
+          'label': 'Publicidad %s',
+          'expected': 'Publicidad 1: 0:00',
+        },
+      ];
+
+      tests.forEach(({mock, label, expected}) => {
+        let defaults = videoDefaults;
+        if (label) {
+          defaults = Object.assign(defaults, {adLabel: label});
+        }
+        imaVideoObj.imaVideo(win, defaults);
+        const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
+        const countdownDiv = controlsDiv.querySelector('#ima-countdown > div');
+        imaVideoObj.setAdsManagerForTesting({
+          getRemainingTime: () => mock.remainingTime,
+        });
+        imaVideoObj.onAdProgress({
+          getAdData: () => mock,
+        });
+        expect(countdownDiv.textContent).to.eql(expected);
+      });
     });
-    const mockGlobal = {};
-    mockGlobal.google = {
-      ima: {
-        ViewMode: {
-          NORMAL: 'normal',
+
+    it('plays ads with ads manager', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const mockGlobal = {};
+      mockGlobal.google = {
+        ima: {
+          ViewMode: {
+            NORMAL: 'normal',
+          },
         },
-      },
-    };
-    const mockAdsManager = {};
-    mockAdsManager.init = function() {};
-    mockAdsManager.start = function() {};
-    const initSpy = sandbox.spy(mockAdsManager, 'init');
-    const startSpy = sandbox.spy(mockAdsManager, 'start');
-    imaVideoObj.setAdsManagerForTesting(mockAdsManager);
-    imaVideoObj.setVideoWidthAndHeightForTesting(100, 200);
-
-    imaVideoObj.playAds(mockGlobal);
-
-    expect(initSpy).to.be.calledWith(100, 200, 'normal');
-    expect(startSpy).to.be.called;
-  });
-
-  it('plays ads with ads manager ad request failed', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      };
+      const mockAdsManager = {};
+      mockAdsManager.init = function() {};
+      mockAdsManager.start = function() {};
+      const initSpy = sandbox.spy(mockAdsManager, 'init');
+      const startSpy = sandbox.spy(mockAdsManager, 'start');
+      imaVideoObj.setAdsManagerForTesting(mockAdsManager);
+      imaVideoObj.setVideoWidthAndHeightForTesting(100, 200);
+
+      imaVideoObj.playAds(mockGlobal);
+
+      expect(initSpy).to.be.calledWith(100, 200, 'normal');
+      expect(startSpy).to.be.called;
     });
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
-
-    imaVideoObj.playAds();
-
-    // TODO - Fix when I can spy on internals.
-    //expect(playVideoSpy).to.be.called;
-    // Just here so the test passes until I fix above issues
-    expect(true).to.be.true;
-  });
-
-  it('handles content ended', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('plays ads with ads manager ad request failed', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
+
+      imaVideoObj.playAds();
+
+      // TODO - Fix when I can spy on internals.
+      //expect(playVideoSpy).to.be.called;
+      // Just here so the test passes until I fix above issues
+      expect(true).to.be.true;
     });
-    const mockAdsLoader = {contentComplete() {}};
-    const completeSpy = sandbox.spy(mockAdsLoader, 'contentComplete');
-    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
-
-    imaVideoObj.onContentEnded();
-
-    expect(imaVideoObj.getPropertiesForTesting().contentComplete).to.be.true;
-    expect(completeSpy).to.have.been.called;
-  });
-
-  it('handles ads manager loaded', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('handles content ended', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const mockAdsLoader = {contentComplete() {}};
+      const completeSpy = sandbox.spy(mockAdsLoader, 'contentComplete');
+      imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+
+      imaVideoObj.onContentEnded();
+
+      expect(imaVideoObj.getPropertiesForTesting().contentComplete).to.be.true;
+      expect(completeSpy).to.have.been.called;
     });
-    const mockAdsRenderingSettings = {};
-    const mockGlobal = {};
-    mockGlobal.google = {};
-    mockGlobal.google.ima = {};
-    mockGlobal.google.ima.AdsRenderingSettings = function() {
-      return mockAdsRenderingSettings;
-    };
-    mockGlobal.google.ima.AdErrorEvent = {};
-    mockGlobal.google.ima.AdErrorEvent.Type = {
-      AD_ERROR: 'aderror',
-    };
-    mockGlobal.google.ima.AdEvent = {};
-    mockGlobal.google.ima.AdEvent.Type = {
-      AD_PROGRESS: 'adprogress',
-      CONTENT_PAUSE_REQUESTED: 'cpr',
-      CONTENT_RESUME_REQUESTED: 'crr',
-    };
-    const mockAdsManager = {
-      addEventListener() {},
-      setVolume() {},
-    };
-    const mockAdsManagerLoadedEvent = {
-      getAdsManager() {
-        return mockAdsManager;
-      },
-    };
-    const amleSpy = sandbox.spy(mockAdsManagerLoadedEvent, 'getAdsManager');
-    const addEventListenerSpy =
-        sandbox.spy(mockAdsManager, 'addEventListener');
-    const mockVideoPlayer = {};
-    imaVideoObj.setVideoPlayerForTesting(mockVideoPlayer);
-    imaVideoObj.setMuteAdsManagerOnLoadedForTesting(false);
-
-    imaVideoObj.onAdsManagerLoaded(mockGlobal, mockAdsManagerLoadedEvent);
-
-    expect(
-        mockAdsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete)
-        .to.be.true;
-    expect(amleSpy).to.be.calledWith(
-        mockVideoPlayer, mockAdsRenderingSettings);
-    expect(addEventListenerSpy).to.be.calledWith('aderror');
-    expect(addEventListenerSpy).to.be.calledWith('adprogress');
-    expect(addEventListenerSpy).to.be.calledWith('cpr');
-    expect(addEventListenerSpy).to.be.calledWith('crr');
-  });
-
-  it('handles ads manager loaded and muted', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('handles ads manager loaded', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const mockAdsRenderingSettings = {};
+      const mockGlobal = {};
+      mockGlobal.google = {};
+      mockGlobal.google.ima = {};
+      mockGlobal.google.ima.AdsRenderingSettings = function() {
+        return mockAdsRenderingSettings;
+      };
+      mockGlobal.google.ima.AdErrorEvent = {};
+      mockGlobal.google.ima.AdErrorEvent.Type = {
+        AD_ERROR: 'aderror',
+      };
+      mockGlobal.google.ima.AdEvent = {};
+      mockGlobal.google.ima.AdEvent.Type = {
+        AD_PROGRESS: 'adprogress',
+        CONTENT_PAUSE_REQUESTED: 'cpr',
+        CONTENT_RESUME_REQUESTED: 'crr',
+      };
+      const mockAdsManager = {
+        addEventListener() {},
+        setVolume() {},
+      };
+      const mockAdsManagerLoadedEvent = {
+        getAdsManager() {
+          return mockAdsManager;
+        },
+      };
+      const amleSpy = sandbox.spy(mockAdsManagerLoadedEvent, 'getAdsManager');
+      const addEventListenerSpy = sandbox.spy(
+        mockAdsManager,
+        'addEventListener'
+      );
+      const mockVideoPlayer = {};
+      imaVideoObj.setVideoPlayerForTesting(mockVideoPlayer);
+      imaVideoObj.setMuteAdsManagerOnLoadedForTesting(false);
+
+      imaVideoObj.onAdsManagerLoaded(mockGlobal, mockAdsManagerLoadedEvent);
+
+      expect(
+        mockAdsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete
+      ).to.be.true;
+      expect(amleSpy).to.be.calledWith(
+        mockVideoPlayer,
+        mockAdsRenderingSettings
+      );
+      expect(addEventListenerSpy).to.be.calledWith('aderror');
+      expect(addEventListenerSpy).to.be.calledWith('adprogress');
+      expect(addEventListenerSpy).to.be.calledWith('cpr');
+      expect(addEventListenerSpy).to.be.calledWith('crr');
     });
-    const mockAdsRenderingSettings = {};
-    const mockGlobal = {};
-    mockGlobal.google = {};
-    mockGlobal.google.ima = {};
-    mockGlobal.google.ima.AdsRenderingSettings = function() {
-      return mockAdsRenderingSettings;
-    };
-    mockGlobal.google.ima.AdErrorEvent = {};
-    mockGlobal.google.ima.AdErrorEvent.Type = {
-      AD_ERROR: 'aderror',
-    };
-    mockGlobal.google.ima.AdEvent = {};
-    mockGlobal.google.ima.AdEvent.Type = {
-      AD_PROGRESS: 'adprogress',
-      CONTENT_PAUSE_REQUESTED: 'cpr',
-      CONTENT_RESUME_REQUESTED: 'crr',
-    };
-    const mockAdsManager = {
-      addEventListener() {},
-      setVolume() {},
-    };
-    const mockAdsManagerLoadedEvent = {
-      getAdsManager() {
-        return mockAdsManager;
-      },
-    };
-    const amleSpy = sandbox.spy(mockAdsManagerLoadedEvent, 'getAdsManager');
-    const addEventListenerSpy =
-        sandbox.spy(mockAdsManager, 'addEventListener');
-    const setVolumeSpy = sandbox.spy(mockAdsManager, 'setVolume');
-    const mockVideoPlayer = {};
-    imaVideoObj.setVideoPlayerForTesting(mockVideoPlayer);
-    imaVideoObj.setMuteAdsManagerOnLoadedForTesting(true);
-
-    imaVideoObj.onAdsManagerLoaded(mockGlobal, mockAdsManagerLoadedEvent);
-
-    expect(
-        mockAdsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete)
-        .to.be.true;
-    expect(amleSpy).to.be.calledWith(
-        mockVideoPlayer, mockAdsRenderingSettings);
-    expect(addEventListenerSpy).to.be.calledWith('aderror');
-    expect(addEventListenerSpy).to.be.calledWith('adprogress');
-    expect(addEventListenerSpy).to.be.calledWith('cpr');
-    expect(addEventListenerSpy).to.be.calledWith('crr');
-    expect(setVolumeSpy).to.be.calledWith(0);
-  });
-
-  it('handles ads loader error', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('handles ads manager loaded and muted', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const mockAdsRenderingSettings = {};
+      const mockGlobal = {};
+      mockGlobal.google = {};
+      mockGlobal.google.ima = {};
+      mockGlobal.google.ima.AdsRenderingSettings = function() {
+        return mockAdsRenderingSettings;
+      };
+      mockGlobal.google.ima.AdErrorEvent = {};
+      mockGlobal.google.ima.AdErrorEvent.Type = {
+        AD_ERROR: 'aderror',
+      };
+      mockGlobal.google.ima.AdEvent = {};
+      mockGlobal.google.ima.AdEvent.Type = {
+        AD_PROGRESS: 'adprogress',
+        CONTENT_PAUSE_REQUESTED: 'cpr',
+        CONTENT_RESUME_REQUESTED: 'crr',
+      };
+      const mockAdsManager = {
+        addEventListener() {},
+        setVolume() {},
+      };
+      const mockAdsManagerLoadedEvent = {
+        getAdsManager() {
+          return mockAdsManager;
+        },
+      };
+      const amleSpy = sandbox.spy(mockAdsManagerLoadedEvent, 'getAdsManager');
+      const addEventListenerSpy = sandbox.spy(
+        mockAdsManager,
+        'addEventListener'
+      );
+      const setVolumeSpy = sandbox.spy(mockAdsManager, 'setVolume');
+      const mockVideoPlayer = {};
+      imaVideoObj.setVideoPlayerForTesting(mockVideoPlayer);
+      imaVideoObj.setMuteAdsManagerOnLoadedForTesting(true);
+
+      imaVideoObj.onAdsManagerLoaded(mockGlobal, mockAdsManagerLoadedEvent);
+
+      expect(
+        mockAdsRenderingSettings.restoreCustomPlaybackStateOnAdBreakComplete
+      ).to.be.true;
+      expect(amleSpy).to.be.calledWith(
+        mockVideoPlayer,
+        mockAdsRenderingSettings
+      );
+      expect(addEventListenerSpy).to.be.calledWith('aderror');
+      expect(addEventListenerSpy).to.be.calledWith('adprogress');
+      expect(addEventListenerSpy).to.be.calledWith('cpr');
+      expect(addEventListenerSpy).to.be.calledWith('crr');
+      expect(setVolumeSpy).to.be.calledWith(0);
     });
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
 
-    imaVideoObj.onAdsLoaderError();
+    it('handles ads loader error', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    expect(imaVideoObj.getPropertiesForTesting().adRequestFailed).to.be.true;
-    // TODO - Fix when I can spy on internals.
-    //expect(playVideoSpy).to.have.been.called;
-  });
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
 
-  it.skip('handles ad error', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      imaVideoObj.onAdsLoaderError();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(imaVideoObj.getPropertiesForTesting().adRequestFailed).to.be.true;
+      // TODO - Fix when I can spy on internals.
+      //expect(playVideoSpy).to.have.been.called;
     });
-    const adsManagerMock = {destroy() {}};
-    const destroySpy = sandbox.spy(adsManagerMock, 'destroy');
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
-    imaVideoObj.setAdsManagerForTesting(adsManagerMock);
-
-    imaVideoObj.onAdError();
-
-    expect(destroySpy).to.have.been.called;
-    // TODO - Fix when I can spy on internals.
-    //expect(playVideoSpy).to.have.been.called;
-  });
-
-  it.skip('pauses content', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it.skip('handles ad error', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const adsManagerMock = {destroy() {}};
+      const destroySpy = sandbox.spy(adsManagerMock, 'destroy');
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
+      imaVideoObj.setAdsManagerForTesting(adsManagerMock);
+
+      imaVideoObj.onAdError();
+
+      expect(destroySpy).to.have.been.called;
+      // TODO - Fix when I can spy on internals.
+      //expect(playVideoSpy).to.have.been.called;
     });
-    const videoMock = getVideoPlayerMock();
-    const removeEventListenerSpy =
-        sandbox.spy(videoMock, 'removeEventListener');
-    //const hideControlsSpy = sandbox.spy(imaVideoObj, 'hideControls');
-    const pauseSpy = sandbox.spy(videoMock, 'pause');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-
-    imaVideoObj.onContentPauseRequested();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.true;
-    expect(removeEventListenerSpy).to.have.been.calledWith(
-        imaVideoObj.getPropertiesForTesting().interactEvent);
-    expect(imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display)
-        .to.eql('block');
-    expect(removeEventListenerSpy).to.have.been.calledWith('ended');
-    // TODO - Fix when I can spy on internals.
-    //expect(hideControlsSpy).to.have.been.called;
-    expect(pauseSpy).to.have.been.called;
-  });
-
-  it('pauses content and resizes ads manager', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it.skip('pauses content', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const removeEventListenerSpy = sandbox.spy(
+        videoMock,
+        'removeEventListener'
+      );
+      //const hideControlsSpy = sandbox.spy(imaVideoObj, 'hideControls');
+      const pauseSpy = sandbox.spy(videoMock, 'pause');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+
+      imaVideoObj.onContentPauseRequested();
+
+      expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.true;
+      expect(removeEventListenerSpy).to.have.been.calledWith(
+        imaVideoObj.getPropertiesForTesting().interactEvent
+      );
+      expect(
+        imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display
+      ).to.eql('block');
+      expect(removeEventListenerSpy).to.have.been.calledWith('ended');
+      // TODO - Fix when I can spy on internals.
+      //expect(hideControlsSpy).to.have.been.called;
+      expect(pauseSpy).to.have.been.called;
     });
-    const videoMock = getVideoPlayerMock();
-    const removeEventListenerSpy =
-        sandbox.spy(videoMock, 'removeEventListener');
-    //const hideControlsSpy = sandbox.spy(imaVideoObj, 'hideControls');
-    const pauseSpy = sandbox.spy(videoMock, 'pause');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    const adsManagerMock = {resize: () => {}};
-    const mockGlobal = {
-      google: {
-        ima: {
-          ViewMode: {
-            NORMAL: 'normal',
+
+    it('pauses content and resizes ads manager', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const removeEventListenerSpy = sandbox.spy(
+        videoMock,
+        'removeEventListener'
+      );
+      //const hideControlsSpy = sandbox.spy(imaVideoObj, 'hideControls');
+      const pauseSpy = sandbox.spy(videoMock, 'pause');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      const adsManagerMock = {resize: () => {}};
+      const mockGlobal = {
+        google: {
+          ima: {
+            ViewMode: {
+              NORMAL: 'normal',
+            },
           },
         },
-      },
-    };
-    const resizeSpy = sandbox.spy(adsManagerMock, 'resize');
-    imaVideoObj.setAdsManagerDimensionsOnLoadForTesting(100, 200);
-    imaVideoObj.setAdsManagerForTesting(adsManagerMock);
-
-    imaVideoObj.onContentPauseRequested(mockGlobal);
-
-    expect(resizeSpy).to.have.been.calledWith(100, 200, 'normal');
-    expect(imaVideoObj.getPropertiesForTesting().adsManagerWidthOnLoad)
-        .to.be.null;
-    expect(imaVideoObj.getPropertiesForTesting().adsManagerHeightOnLoad)
-        .to.be.null;
-
-    expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.true;
-    expect(removeEventListenerSpy).to.have.been.calledWith(
-        imaVideoObj.getPropertiesForTesting().interactEvent);
-    expect(imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display)
-        .to.eql('block');
-    expect(removeEventListenerSpy).to.have.been.calledWith('ended');
-    // TODO - Fix when I can spy on internals.
-    //expect(hideControlsSpy).to.have.been.called;
-    expect(pauseSpy).to.have.been.called;
-  });
-
-  it('shows modified controls when content is paused', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      };
+      const resizeSpy = sandbox.spy(adsManagerMock, 'resize');
+      imaVideoObj.setAdsManagerDimensionsOnLoadForTesting(100, 200);
+      imaVideoObj.setAdsManagerForTesting(adsManagerMock);
+
+      imaVideoObj.onContentPauseRequested(mockGlobal);
+
+      expect(resizeSpy).to.have.been.calledWith(100, 200, 'normal');
+      expect(imaVideoObj.getPropertiesForTesting().adsManagerWidthOnLoad).to.be
+        .null;
+      expect(imaVideoObj.getPropertiesForTesting().adsManagerHeightOnLoad).to.be
+        .null;
+
+      expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.true;
+      expect(removeEventListenerSpy).to.have.been.calledWith(
+        imaVideoObj.getPropertiesForTesting().interactEvent
+      );
+      expect(
+        imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display
+      ).to.eql('block');
+      expect(removeEventListenerSpy).to.have.been.calledWith('ended');
+      // TODO - Fix when I can spy on internals.
+      //expect(hideControlsSpy).to.have.been.called;
+      expect(pauseSpy).to.have.been.called;
     });
-    const videoMock = getVideoPlayerMock();
-    const adsManagerMock = {
-      resize: function() {},
-    };
-    const mockGlobal = {
-      google: {
-        ima: {
-          ViewMode: {
-            NORMAL: 'normal',
+
+    it('shows modified controls when content is paused', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const adsManagerMock = {
+        resize: function() {},
+      };
+      const mockGlobal = {
+        google: {
+          ima: {
+            ViewMode: {
+              NORMAL: 'normal',
+            },
           },
         },
-      },
-    };
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    imaVideoObj.setAdsManagerDimensionsOnLoadForTesting(100, 200);
-    imaVideoObj.setAdsManagerForTesting(adsManagerMock);
-    const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
-    expect(controlsDiv).not.to.be.null;
-    const countdownWrapperDiv = controlsDiv.querySelector('#ima-countdown');
-    expect(countdownWrapperDiv).not.to.be.null;
-    const playPauseDiv = controlsDiv.querySelector('#ima-play-pause');
-    expect(playPauseDiv).not.to.be.null;
-    const timeDiv = controlsDiv.querySelector('#ima-time');
-    expect(timeDiv).not.to.be.null;
-    const progressBarWrapperDiv
-      = controlsDiv.querySelector('#ima-progress-wrapper');
-    expect(progressBarWrapperDiv).not.to.be.null;
-    const muteUnmuteDiv = controlsDiv.querySelector('#ima-mute-unmute');
-    expect(muteUnmuteDiv).not.to.be.null;
-    const fullscreenDiv = controlsDiv.querySelector('#ima-fullscreen');
-    expect(fullscreenDiv).not.to.be.null;
-    // expect controls to be hidden initially
-    expect(controlsDiv.style.display).to.eql('none');
-    expect(countdownWrapperDiv.style.display).to.eql('none');
-    // call pause function to display ads
-    imaVideoObj.onContentPauseRequested(mockGlobal);
-    // expect a subset of controls to be hidden / displayed
-    expect(controlsDiv.style.display).not.to.eql('none');
-    expect(countdownWrapperDiv.style.display).not.to.eql('none');
-    expect(playPauseDiv.style.display).to.eql('none');
-    expect(timeDiv.style.display).to.eql('none');
-    expect(progressBarWrapperDiv.style.display).to.eql('none');
-    expect(muteUnmuteDiv.style.display).not.to.eql('none');
-    expect(fullscreenDiv.style.display).not.to.eql('none');
-  });
-
-  it('resumes content', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      };
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      imaVideoObj.setAdsManagerDimensionsOnLoadForTesting(100, 200);
+      imaVideoObj.setAdsManagerForTesting(adsManagerMock);
+      const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
+      expect(controlsDiv).not.to.be.null;
+      const countdownWrapperDiv = controlsDiv.querySelector('#ima-countdown');
+      expect(countdownWrapperDiv).not.to.be.null;
+      const playPauseDiv = controlsDiv.querySelector('#ima-play-pause');
+      expect(playPauseDiv).not.to.be.null;
+      const timeDiv = controlsDiv.querySelector('#ima-time');
+      expect(timeDiv).not.to.be.null;
+      const progressBarWrapperDiv = controlsDiv.querySelector(
+        '#ima-progress-wrapper'
+      );
+      expect(progressBarWrapperDiv).not.to.be.null;
+      const muteUnmuteDiv = controlsDiv.querySelector('#ima-mute-unmute');
+      expect(muteUnmuteDiv).not.to.be.null;
+      const fullscreenDiv = controlsDiv.querySelector('#ima-fullscreen');
+      expect(fullscreenDiv).not.to.be.null;
+      // expect controls to be hidden initially
+      expect(controlsDiv.style.display).to.eql('none');
+      expect(countdownWrapperDiv.style.display).to.eql('none');
+      // call pause function to display ads
+      imaVideoObj.onContentPauseRequested(mockGlobal);
+      // expect a subset of controls to be hidden / displayed
+      expect(controlsDiv.style.display).not.to.eql('none');
+      expect(countdownWrapperDiv.style.display).not.to.eql('none');
+      expect(playPauseDiv.style.display).to.eql('none');
+      expect(timeDiv.style.display).to.eql('none');
+      expect(progressBarWrapperDiv.style.display).to.eql('none');
+      expect(muteUnmuteDiv.style.display).not.to.eql('none');
+      expect(fullscreenDiv.style.display).not.to.eql('none');
     });
-    const videoMock = getVideoPlayerMock();
-    const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    imaVideoObj.setContentCompleteForTesting(false);
-
-    imaVideoObj.onContentResumeRequested();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.false;
-    expect(addEventListenerSpy).to.have.been.calledWith(
-        imaVideoObj.getPropertiesForTesting().interactEvent);
-    expect(addEventListenerSpy).to.have.been.calledWith('ended');
-    // TODO - Fix when I can spy on internals.
-    //expect(playVideoSpy).to.have.been.called;
-  });
-
-  it('resumes content with content complete', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('resumes content', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      imaVideoObj.setContentCompleteForTesting(false);
+
+      imaVideoObj.onContentResumeRequested();
+
+      expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.false;
+      expect(addEventListenerSpy).to.have.been.calledWith(
+        imaVideoObj.getPropertiesForTesting().interactEvent
+      );
+      expect(addEventListenerSpy).to.have.been.calledWith('ended');
+      // TODO - Fix when I can spy on internals.
+      //expect(playVideoSpy).to.have.been.called;
     });
-    const videoMock = getVideoPlayerMock();
-    const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    imaVideoObj.setContentCompleteForTesting(true);
-
-    imaVideoObj.onContentResumeRequested();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.false;
-    expect(addEventListenerSpy).to.have.been.calledWith(
-        imaVideoObj.getPropertiesForTesting().interactEvent);
-    expect(addEventListenerSpy).to.have.been.calledWith('ended');
-    // TODO - Fix when I can spy on internals.
-    //expect(playVideoSpy).to.have.been.called;
-  });
-
-  it('controls are restored after content resumes', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('resumes content with content complete', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      imaVideoObj.setContentCompleteForTesting(true);
+
+      imaVideoObj.onContentResumeRequested();
+
+      expect(imaVideoObj.getPropertiesForTesting().adsActive).to.be.false;
+      expect(addEventListenerSpy).to.have.been.calledWith(
+        imaVideoObj.getPropertiesForTesting().interactEvent
+      );
+      expect(addEventListenerSpy).to.have.been.calledWith('ended');
+      // TODO - Fix when I can spy on internals.
+      //expect(playVideoSpy).to.have.been.called;
     });
-    imaVideoObj.setVideoPlayerForTesting(getVideoPlayerMock());
-    imaVideoObj.setContentCompleteForTesting(true);
-    // expect a subset of controls to be hidden / displayed during ad
-    const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
-    expect(controlsDiv).not.to.be.null;
-    const countdownWrapperDiv = controlsDiv.querySelector('#ima-countdown');
-    expect(countdownWrapperDiv).not.to.be.null;
-    const playPauseDiv = controlsDiv.querySelector('#ima-play-pause');
-    expect(playPauseDiv).not.to.be.null;
-    const timeDiv = controlsDiv.querySelector('#ima-time');
-    expect(timeDiv).not.to.be.null;
-    const progressBarWrapperDiv
-      = controlsDiv.querySelector('#ima-progress-wrapper');
-    expect(progressBarWrapperDiv).not.to.be.null;
-    const muteUnmuteDiv = controlsDiv.querySelector('#ima-mute-unmute');
-    expect(muteUnmuteDiv).not.to.be.null;
-    const fullscreenDiv = controlsDiv.querySelector('#ima-fullscreen');
-    expect(fullscreenDiv).not.to.be.null;
-    imaVideoObj.showAdControls();
-    expect(controlsDiv.style.display).not.to.eql('none');
-    expect(countdownWrapperDiv.style.display).not.to.eql('none');
-    expect(playPauseDiv.style.display).to.eql('none');
-    expect(timeDiv.style.display).to.eql('none');
-    expect(progressBarWrapperDiv.style.display).to.eql('none');
-    expect(muteUnmuteDiv.style.display).not.to.eql('none');
-    expect(fullscreenDiv.style.display).not.to.eql('none');
-    // resume content after ad finishes
-    imaVideoObj.onContentResumeRequested();
-    // expect default control buttons to be displayed again
-    expect(countdownWrapperDiv.style.display).to.eql('none');
-    expect(playPauseDiv.style.display).not.to.eql('none');
-    expect(timeDiv.style.display).not.to.eql('none');
-    expect(progressBarWrapperDiv.style.display).not.to.eql('none');
-    expect(muteUnmuteDiv.style.display).not.to.eql('none');
-    expect(fullscreenDiv.style.display).not.to.eql('none');
-    expect(controlsDiv.style.display).not.to.eql('none');
-  });
-
-  it('ad controls are smaller when skippable on mobile', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    const videoDefaults = {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    };
-    imaVideoObj.imaVideo(win, videoDefaults);
-
-    const ad = {
-      skippable: {getSkipTimeOffset: () => 30},
-      unskippable: {getSkipTimeOffset: () => -1},
-    };
-    const video = {
-      hasMobileStyles: 400,
-      noMobileStyles: 401,
-    };
-
-    const tests = [
-      {
-        msg: 'Controls should be small when ad is skippable and mobile',
-        ad: ad.skippable,
-        videoSize: video.hasMobileStyles,
-        expected: {heightControls: '20px', heightButtons: '18px'},
-      },
-      {
-        msg: 'Controls should be tall when ad is not skippable',
-        ad: ad.unskippable,
-        videoSize: video.hasMobileStyles,
-        expected: {heightControls: '30px', heightButtons: '22px'},
-      },
-      {
-        msg: 'Controls should be tall when ad is not mobile',
-        ad: ad.skippable,
-        videoSize: video.noMobileStyles,
-        expected: {heightControls: '30px', heightButtons: '22px'},
-      },
-    ];
-    tests.forEach(({ad, videoSize, expected, msg}) => {
-      imaVideoObj.setVideoWidthAndHeightForTesting(videoSize, 300);
-      imaVideoObj.onAdLoad({getAd: () => ad});
-      imaVideoObj.showAdControls();
+
+    it('controls are restored after content resumes', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      imaVideoObj.setVideoPlayerForTesting(getVideoPlayerMock());
+      imaVideoObj.setContentCompleteForTesting(true);
+      // expect a subset of controls to be hidden / displayed during ad
       const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
+      expect(controlsDiv).not.to.be.null;
+      const countdownWrapperDiv = controlsDiv.querySelector('#ima-countdown');
+      expect(countdownWrapperDiv).not.to.be.null;
+      const playPauseDiv = controlsDiv.querySelector('#ima-play-pause');
+      expect(playPauseDiv).not.to.be.null;
+      const timeDiv = controlsDiv.querySelector('#ima-time');
+      expect(timeDiv).not.to.be.null;
+      const progressBarWrapperDiv = controlsDiv.querySelector(
+        '#ima-progress-wrapper'
+      );
+      expect(progressBarWrapperDiv).not.to.be.null;
       const muteUnmuteDiv = controlsDiv.querySelector('#ima-mute-unmute');
+      expect(muteUnmuteDiv).not.to.be.null;
       const fullscreenDiv = controlsDiv.querySelector('#ima-fullscreen');
-      expect(controlsDiv.style.height).to.eql(expected.heightControls, msg);
-      expect(muteUnmuteDiv.style.height).to.eql(expected.heightButtons, msg);
-      expect(fullscreenDiv.style.height).to.eql(expected.heightButtons, msg);
-    });
-  });
-
-  it('shows bigPlayDiv with content complete, ' +
-    'when content resume is called', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(fullscreenDiv).not.to.be.null;
+      imaVideoObj.showAdControls();
+      expect(controlsDiv.style.display).not.to.eql('none');
+      expect(countdownWrapperDiv.style.display).not.to.eql('none');
+      expect(playPauseDiv.style.display).to.eql('none');
+      expect(timeDiv.style.display).to.eql('none');
+      expect(progressBarWrapperDiv.style.display).to.eql('none');
+      expect(muteUnmuteDiv.style.display).not.to.eql('none');
+      expect(fullscreenDiv.style.display).not.to.eql('none');
+      // resume content after ad finishes
+      imaVideoObj.onContentResumeRequested();
+      // expect default control buttons to be displayed again
+      expect(countdownWrapperDiv.style.display).to.eql('none');
+      expect(playPauseDiv.style.display).not.to.eql('none');
+      expect(timeDiv.style.display).not.to.eql('none');
+      expect(progressBarWrapperDiv.style.display).not.to.eql('none');
+      expect(muteUnmuteDiv.style.display).not.to.eql('none');
+      expect(fullscreenDiv.style.display).not.to.eql('none');
+      expect(controlsDiv.style.display).not.to.eql('none');
     });
-    const videoMock = getVideoPlayerMock();
-    const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    imaVideoObj.setContentCompleteForTesting(true);
-
-    imaVideoObj.onContentResumeRequested();
-
-    const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
-
-    expect(imaVideoProperties.adsActive).to.be.false;
-    expect(addEventListenerSpy).to.have.been.calledWith(
-        imaVideoProperties.interactEvent);
-    expect(addEventListenerSpy).to.have.been.calledWith('ended');
-    expect(imaVideoProperties.bigPlayDiv.style.display)
-        .to.be.equal('table-cell');
-  });
-
-  it('shows bigPlayDiv with allAdsCompleted, and content ended', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('ad controls are smaller when skippable on mobile', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      const videoDefaults = {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      };
+      imaVideoObj.imaVideo(win, videoDefaults);
+
+      const ad = {
+        skippable: {getSkipTimeOffset: () => 30},
+        unskippable: {getSkipTimeOffset: () => -1},
+      };
+      const video = {
+        hasMobileStyles: 400,
+        noMobileStyles: 401,
+      };
+
+      const tests = [
+        {
+          msg: 'Controls should be small when ad is skippable and mobile',
+          ad: ad.skippable,
+          videoSize: video.hasMobileStyles,
+          expected: {heightControls: '20px', heightButtons: '18px'},
+        },
+        {
+          msg: 'Controls should be tall when ad is not skippable',
+          ad: ad.unskippable,
+          videoSize: video.hasMobileStyles,
+          expected: {heightControls: '30px', heightButtons: '22px'},
+        },
+        {
+          msg: 'Controls should be tall when ad is not mobile',
+          ad: ad.skippable,
+          videoSize: video.noMobileStyles,
+          expected: {heightControls: '30px', heightButtons: '22px'},
+        },
+      ];
+      tests.forEach(({ad, videoSize, expected, msg}) => {
+        imaVideoObj.setVideoWidthAndHeightForTesting(videoSize, 300);
+        imaVideoObj.onAdLoad({getAd: () => ad});
+        imaVideoObj.showAdControls();
+        const {controlsDiv} = imaVideoObj.getPropertiesForTesting();
+        const muteUnmuteDiv = controlsDiv.querySelector('#ima-mute-unmute');
+        const fullscreenDiv = controlsDiv.querySelector('#ima-fullscreen');
+        expect(controlsDiv.style.height).to.eql(expected.heightControls, msg);
+        expect(muteUnmuteDiv.style.height).to.eql(expected.heightButtons, msg);
+        expect(fullscreenDiv.style.height).to.eql(expected.heightButtons, msg);
+      });
     });
-    imaVideoObj.setAllAdsCompletedForTesting(true);
 
-    imaVideoObj.onContentEnded();
+    it(
+      'shows bigPlayDiv with content complete, ' +
+        'when content resume is called',
+      () => {
+        const div = doc.createElement('div');
+        div.setAttribute('id', 'c');
+        doc.body.appendChild(div);
+
+        imaVideoObj.imaVideo(win, {
+          width: 640,
+          height: 360,
+          src: srcUrl,
+          tag: adTagUrl,
+        });
+        const videoMock = getVideoPlayerMock();
+        const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
+        imaVideoObj.setVideoPlayerForTesting(videoMock);
+        imaVideoObj.setContentCompleteForTesting(true);
+
+        imaVideoObj.onContentResumeRequested();
+
+        const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
+
+        expect(imaVideoProperties.adsActive).to.be.false;
+        expect(addEventListenerSpy).to.have.been.calledWith(
+          imaVideoProperties.interactEvent
+        );
+        expect(addEventListenerSpy).to.have.been.calledWith('ended');
+        expect(imaVideoProperties.bigPlayDiv.style.display).to.be.equal(
+          'table-cell'
+        );
+      }
+    );
 
-    const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
+    it('shows bigPlayDiv with allAdsCompleted, and content ended', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    expect(imaVideoProperties.bigPlayDiv.style.display)
-        .to.be.equal('table-cell');
-  });
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      imaVideoObj.setAllAdsCompletedForTesting(true);
 
-  it('does not show bigPlayDiv when content is resumed, ' +
-    'and not content complete', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      imaVideoObj.onContentEnded();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    const videoMock = getVideoPlayerMock();
-    const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-
-    imaVideoObj.onBigPlayClick();
-    imaVideoObj.onContentResumeRequested();
-
-    const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
-
-    expect(imaVideoProperties.adsActive).to.be.false;
-    expect(addEventListenerSpy).to.have.been.calledWith(
-        imaVideoProperties.interactEvent);
-    expect(addEventListenerSpy).to.have.been.calledWith('ended');
-    expect(imaVideoProperties.bigPlayDiv.style.display).to.be.equal('none');
-  });
-
-  it('updates UI', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
+      const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
 
-    imaVideoObj.updateUi(0, 60);
-    expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent)
-        .to.eql('0:00 / 1:00');
-    expect(imaVideoObj.getPropertiesForTesting().progressLine.style.width)
-        .to.eql('0%');
-    expect(imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left)
-        .to.eql('-1%');
-    imaVideoObj.updateUi(30, 60);
-    expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent)
-        .to.eql('0:30 / 1:00');
-    expect(imaVideoObj.getPropertiesForTesting().progressLine.style.width)
-        .to.eql('50%');
-    expect(imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left)
-        .to.eql('49%');
-    imaVideoObj.updateUi(60, 60);
-    expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent)
-        .to.eql('1:00 / 1:00');
-    expect(imaVideoObj.getPropertiesForTesting().progressLine.style.width)
-        .to.eql('100%');
-    expect(imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left)
-        .to.eql('99%');
-  });
-
-  it('formats time', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(imaVideoProperties.bigPlayDiv.style.display).to.be.equal(
+        'table-cell'
+      );
     });
 
-    let formattedTime = imaVideoObj.formatTime(0);
-    expect(formattedTime).to.eql('0:00');
-    formattedTime = imaVideoObj.formatTime(55);
-    expect(formattedTime).to.eql('0:55');
-    formattedTime = imaVideoObj.formatTime(60);
-    expect(formattedTime).to.eql('1:00');
-    formattedTime = imaVideoObj.formatTime(65);
-    expect(formattedTime).to.eql('1:05');
-    formattedTime = imaVideoObj.formatTime(3600);
-    expect(formattedTime).to.eql('1:00:00');
-    formattedTime = imaVideoObj.formatTime(3605);
-    expect(formattedTime).to.eql('1:00:05');
-    formattedTime = imaVideoObj.formatTime(3665);
-    expect(formattedTime).to.eql('1:01:05');
-  });
-
-  it('zero pads', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
+    it(
+      'does not show bigPlayDiv when content is resumed, ' +
+        'and not content complete',
+      () => {
+        const div = doc.createElement('div');
+        div.setAttribute('id', 'c');
+        doc.body.appendChild(div);
+
+        imaVideoObj.imaVideo(win, {
+          width: 640,
+          height: 360,
+          src: srcUrl,
+          tag: adTagUrl,
+        });
+        const videoMock = getVideoPlayerMock();
+        const addEventListenerSpy = sandbox.spy(videoMock, 'addEventListener');
+        imaVideoObj.setVideoPlayerForTesting(videoMock);
+
+        imaVideoObj.onBigPlayClick();
+        imaVideoObj.onContentResumeRequested();
+
+        const imaVideoProperties = imaVideoObj.getPropertiesForTesting();
+
+        expect(imaVideoProperties.adsActive).to.be.false;
+        expect(addEventListenerSpy).to.have.been.calledWith(
+          imaVideoProperties.interactEvent
+        );
+        expect(addEventListenerSpy).to.have.been.calledWith('ended');
+        expect(imaVideoProperties.bigPlayDiv.style.display).to.be.equal('none');
+      }
+    );
 
-    let padded = imaVideoObj.zeroPad(11);
-    expect(padded).to.eql('11');
-    padded = imaVideoObj.zeroPad(1);
-    expect(padded).to.eql('01');
-  });
-
-  // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
-  it('plays on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    imaVideoObj.setPlayerStateForTesting(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED);
-    //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
-
-    imaVideoObj.onPlayPauseClick();
-
-    //expect(playVideoSpy).to.have.been.called;
-    expect(true).to.be.true;
-  });
-
-  // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
-  it('pauses on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    imaVideoObj.setPlayerStateForTesting(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING);
-    //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
-
-    imaVideoObj.onPlayPauseClick();
-
-    //expect(pauseVideoSpy).to.have.been.called;
-    expect(true).to.be.true;
-  });
-
-  it('plays video', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    const videoMock = getVideoPlayerMock();
-    const playSpy = sandbox.spy(videoMock, 'play');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-
-    imaVideoObj.playVideo();
-
-    expect(imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display)
-        .to.eql('none');
-    expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING);
-    // TODO - Why doesn't this work?
-    //expect(showControlsSpy).to.have.been.called;
-    expect(playSpy).to.have.been.called;
-  });
-
-  it('pauses video', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
-    const videoMock = getVideoPlayerMock();
-    const pauseSpy = sandbox.spy(videoMock, 'pause');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    //const showControlsSpy = sandbox.spy(imaVideoObj, 'showControls');
-    imaVideoObj.getPropertiesForTesting().playerState =
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING;
-
-    imaVideoObj.pauseVideo({});
-
-    expect(pauseSpy).to.have.been.called;
-    expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED);
-    // TODO - Why doesn't this work?
-    //expect(showControlsSpy).to.have.been.called;
-  });
-
-  it('mutes on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+    it('updates UI', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+
+      imaVideoObj.updateUi(0, 60);
+      expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent).to.eql(
+        '0:00 / 1:00'
+      );
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressLine.style.width
+      ).to.eql('0%');
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left
+      ).to.eql('-1%');
+      imaVideoObj.updateUi(30, 60);
+      expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent).to.eql(
+        '0:30 / 1:00'
+      );
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressLine.style.width
+      ).to.eql('50%');
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left
+      ).to.eql('49%');
+      imaVideoObj.updateUi(60, 60);
+      expect(imaVideoObj.getPropertiesForTesting().timeNode.textContent).to.eql(
+        '1:00 / 1:00'
+      );
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressLine.style.width
+      ).to.eql('100%');
+      expect(
+        imaVideoObj.getPropertiesForTesting().progressMarkerDiv.style.left
+      ).to.eql('99%');
     });
-    const videoMock = getVideoPlayerMock();
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    const adsManagerMock = {};
-    adsManagerMock.setVolume = () => {};
-    imaVideoObj.setAdsManagerForTesting(adsManagerMock);
-    imaVideoObj.setVideoPlayerMutedForTesting(false);
-    //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
-
-    imaVideoObj.onMuteUnmuteClick();
-
-    const isMuted = imaVideoObj.getPropertiesForTesting().videoPlayer.muted;
-
-    //expect(pauseVideoSpy).to.have.been.called;
-    expect(isMuted).to.be.true;
-  });
-
-  it('unmutes on click', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('formats time', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+
+      let formattedTime = imaVideoObj.formatTime(0);
+      expect(formattedTime).to.eql('0:00');
+      formattedTime = imaVideoObj.formatTime(55);
+      expect(formattedTime).to.eql('0:55');
+      formattedTime = imaVideoObj.formatTime(60);
+      expect(formattedTime).to.eql('1:00');
+      formattedTime = imaVideoObj.formatTime(65);
+      expect(formattedTime).to.eql('1:05');
+      formattedTime = imaVideoObj.formatTime(3600);
+      expect(formattedTime).to.eql('1:00:00');
+      formattedTime = imaVideoObj.formatTime(3605);
+      expect(formattedTime).to.eql('1:00:05');
+      formattedTime = imaVideoObj.formatTime(3665);
+      expect(formattedTime).to.eql('1:01:05');
     });
-    const videoMock = getVideoPlayerMock();
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    const adsManagerMock = {};
-    adsManagerMock.setVolume = () => {};
-    imaVideoObj.setAdsManagerForTesting(adsManagerMock);
-    imaVideoObj.setVideoPlayerMutedForTesting(true);
-    //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
 
-    imaVideoObj.onMuteUnmuteClick();
+    it('zero pads', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    const isMuted = imaVideoObj.getPropertiesForTesting().videoPlayer.muted;
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
 
-    //expect(pauseVideoSpy).to.have.been.called;
-    expect(isMuted).to.be.false;
-  });
+      let padded = imaVideoObj.zeroPad(11);
+      expect(padded).to.eql('11');
+      padded = imaVideoObj.zeroPad(1);
+      expect(padded).to.eql('01');
+    });
 
+    // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
+    it('plays on click', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      imaVideoObj.setPlayerStateForTesting(
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED
+      );
+      //const playVideoSpy = sandbox.spy(imaVideoObj, 'playVideo');
 
-  it('pauses video after webkit end fullscreen', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      imaVideoObj.onPlayPauseClick();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      //expect(playVideoSpy).to.have.been.called;
+      expect(true).to.be.true;
     });
-    const videoMock = getVideoPlayerMock();
-    const pauseSpy = sandbox.spy(videoMock, 'pause');
-    const removeEventListenerSpy =
-      sandbox.spy(videoMock, 'removeEventListener');
-    imaVideoObj.setVideoPlayerForTesting(videoMock);
-    //const showControlsSpy = sandbox.spy(imaVideoObj, 'showControls');
-    imaVideoObj.getPropertiesForTesting().playerState =
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING;
-
-    imaVideoObj.pauseVideo({type: 'webkitendfullscreen'});
-
-    expect(pauseSpy).to.have.been.called;
-    expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED);
-    // TODO - Why doesn't this work?
-    //expect(showControlsSpy).to.have.been.called;
-    expect(removeEventListenerSpy).to.have.been.called;
-  });
-
-  it('shows controls when paused', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    // TODO - FIX ONCE I FIGURE OUT HOW TO SPY ON INTERNAL METHODS
+    it('pauses on click', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      imaVideoObj.setPlayerStateForTesting(
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING
+      );
+      //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
+
+      imaVideoObj.onPlayPauseClick();
+
+      //expect(pauseVideoSpy).to.have.been.called;
+      expect(true).to.be.true;
     });
-    imaVideoObj.getPropertiesForTesting().playerState =
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED;
-    imaVideoObj.setHideControlsTimeoutForTesting(null);
-
-    imaVideoObj.showControls();
-
-    expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-        .to.eql('flex');
-    expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout)
-        .to.be.null;
-  });
-
-  it('shows controls when playing', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('plays video', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const playSpy = sandbox.spy(videoMock, 'play');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+
+      imaVideoObj.playVideo();
+
+      expect(
+        imaVideoObj.getPropertiesForTesting().adContainerDiv.style.display
+      ).to.eql('none');
+      expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING
+      );
+      // TODO - Why doesn't this work?
+      //expect(showControlsSpy).to.have.been.called;
+      expect(playSpy).to.have.been.called;
     });
-    imaVideoObj.setPlayerStateForTesting(
-        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING);
-
-    imaVideoObj.showControls();
-
-    expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-        .to.eql('flex');
-    expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout)
-        .not.to.be.undefined;
-  });
-
-  it('hides controls', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('pauses video', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const pauseSpy = sandbox.spy(videoMock, 'pause');
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      //const showControlsSpy = sandbox.spy(imaVideoObj, 'showControls');
+      imaVideoObj.getPropertiesForTesting().playerState = imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING;
+
+      imaVideoObj.pauseVideo({});
+
+      expect(pauseSpy).to.have.been.called;
+      expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED
+      );
+      // TODO - Why doesn't this work?
+      //expect(showControlsSpy).to.have.been.called;
     });
 
-    imaVideoObj.hideControls();
+    it('mutes on click', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-        .to.eql('none');
-  });
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      const adsManagerMock = {};
+      adsManagerMock.setVolume = () => {};
+      imaVideoObj.setAdsManagerForTesting(adsManagerMock);
+      imaVideoObj.setVideoPlayerMutedForTesting(false);
+      //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
+
+      imaVideoObj.onMuteUnmuteClick();
+
+      const isMuted = imaVideoObj.getPropertiesForTesting().videoPlayer.muted;
+
+      //expect(pauseVideoSpy).to.have.been.called;
+      expect(isMuted).to.be.true;
+    });
 
-  const hoverEventsToTest = ['click', 'mousemove'];
-  hoverEventsToTest.forEach(hoverEvent => {
-    it(`shows controls on ${hoverEvent} (hover)` +
-      ' while playing after hidden', () => {
+    it('unmutes on click', () => {
       const div = doc.createElement('div');
       div.setAttribute('id', 'c');
       doc.body.appendChild(div);
@@ -1137,35 +1062,55 @@ describes.realWin('amp-ima-video', {
         src: srcUrl,
         tag: adTagUrl,
       });
+      const videoMock = getVideoPlayerMock();
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      const adsManagerMock = {};
+      adsManagerMock.setVolume = () => {};
+      imaVideoObj.setAdsManagerForTesting(adsManagerMock);
+      imaVideoObj.setVideoPlayerMutedForTesting(true);
+      //const pauseVideoSpy = sandbox.spy(imaVideoObj, 'pauseVideo');
 
-      imaVideoObj.hideControls();
+      imaVideoObj.onMuteUnmuteClick();
 
-      expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be.false;
-      expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-          .to.eql('none');
+      const isMuted = imaVideoObj.getPropertiesForTesting().videoPlayer.muted;
 
-      const interactEvent = new Event(hoverEvent);
-      const videoPlayerElement = imaVideoObj
-          .getPropertiesForTesting().videoPlayer;
+      //expect(pauseVideoSpy).to.have.been.called;
+      expect(isMuted).to.be.false;
+    });
 
-      imaVideoObj.setPlayerStateForTesting(
-          imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING);
-      imaVideoObj.addHoverEventToElement(
-          videoPlayerElement,
-          imaVideoObj.getShowControlsThrottledForTesting()
+    it('pauses video after webkit end fullscreen', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+      const videoMock = getVideoPlayerMock();
+      const pauseSpy = sandbox.spy(videoMock, 'pause');
+      const removeEventListenerSpy = sandbox.spy(
+        videoMock,
+        'removeEventListener'
       );
-      videoPlayerElement.dispatchEvent(interactEvent);
+      imaVideoObj.setVideoPlayerForTesting(videoMock);
+      //const showControlsSpy = sandbox.spy(imaVideoObj, 'showControls');
+      imaVideoObj.getPropertiesForTesting().playerState = imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING;
 
-      expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be.true;
-      expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-          .to.eql('flex');
-      expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout)
-          .not.to.be.undefined;
-    });
+      imaVideoObj.pauseVideo({type: 'webkitendfullscreen'});
 
-    it(`throttles ${hoverEvent} (hover)` +
-      ' for showing controls', function() {
+      expect(pauseSpy).to.have.been.called;
+      expect(imaVideoObj.getPropertiesForTesting().playerState).to.eql(
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED
+      );
+      // TODO - Why doesn't this work?
+      //expect(showControlsSpy).to.have.been.called;
+      expect(removeEventListenerSpy).to.have.been.called;
+    });
 
+    it('shows controls when paused', () => {
       const div = doc.createElement('div');
       div.setAttribute('id', 'c');
       doc.body.appendChild(div);
@@ -1176,162 +1121,292 @@ describes.realWin('amp-ima-video', {
         src: srcUrl,
         tag: adTagUrl,
       });
+      imaVideoObj.getPropertiesForTesting().playerState = imaVideoObj.getPropertiesForTesting().PlayerStates.PAUSED;
+      imaVideoObj.setHideControlsTimeoutForTesting(null);
 
-      imaVideoObj.hideControls();
-      expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be.false;
-      expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-          .to.eql('none');
+      imaVideoObj.showControls();
 
-      const interactEvent = new Event(hoverEvent);
-      const videoPlayerElement = imaVideoObj
-          .getPropertiesForTesting().videoPlayer;
+      expect(
+        imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+      ).to.eql('flex');
+      expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout).to.be
+        .null;
+    });
 
+    it('shows controls when playing', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
       imaVideoObj.setPlayerStateForTesting(
-          imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING);
-      imaVideoObj.addHoverEventToElement(
-          videoPlayerElement,
-          imaVideoObj.getShowControlsThrottledForTesting()
+        imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING
       );
-      videoPlayerElement.dispatchEvent(interactEvent);
 
-      expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be.true;
-      expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-          .to.eql('flex');
+      imaVideoObj.showControls();
+
+      expect(
+        imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+      ).to.eql('flex');
+      expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout).not.to
+        .be.undefined;
+    });
+
+    it('hides controls', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
 
       imaVideoObj.hideControls();
-      expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be.false;
-      expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-          .to.eql('none');
 
-      return timer.promise(100).then(() => {
-        videoPlayerElement.dispatchEvent(interactEvent);
+      expect(
+        imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+      ).to.eql('none');
+    });
+
+    const hoverEventsToTest = ['click', 'mousemove'];
+    hoverEventsToTest.forEach(hoverEvent => {
+      it(
+        `shows controls on ${hoverEvent} (hover)` +
+          ' while playing after hidden',
+        () => {
+          const div = doc.createElement('div');
+          div.setAttribute('id', 'c');
+          doc.body.appendChild(div);
+
+          imaVideoObj.imaVideo(win, {
+            width: 640,
+            height: 360,
+            src: srcUrl,
+            tag: adTagUrl,
+          });
+
+          imaVideoObj.hideControls();
+
+          expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+            .false;
+          expect(
+            imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+          ).to.eql('none');
+
+          const interactEvent = new Event(hoverEvent);
+          const videoPlayerElement = imaVideoObj.getPropertiesForTesting()
+            .videoPlayer;
+
+          imaVideoObj.setPlayerStateForTesting(
+            imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING
+          );
+          imaVideoObj.addHoverEventToElement(
+            videoPlayerElement,
+            imaVideoObj.getShowControlsThrottledForTesting()
+          );
+          videoPlayerElement.dispatchEvent(interactEvent);
+
+          expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+            .true;
+          expect(
+            imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+          ).to.eql('flex');
+          expect(imaVideoObj.getPropertiesForTesting().hideControlsTimeout).not
+            .to.be.undefined;
+        }
+      );
 
+      it(`throttles ${hoverEvent} (hover) for showing controls`, function() {
+        const div = doc.createElement('div');
+        div.setAttribute('id', 'c');
+        doc.body.appendChild(div);
+
+        imaVideoObj.imaVideo(win, {
+          width: 640,
+          height: 360,
+          src: srcUrl,
+          tag: adTagUrl,
+        });
+
+        imaVideoObj.hideControls();
+        expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+          .false;
         expect(
-            imaVideoObj.getPropertiesForTesting().controlsVisible
-        ).to.be.false;
-        expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-            .to.eql('none');
+          imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+        ).to.eql('none');
 
+        const interactEvent = new Event(hoverEvent);
+        const videoPlayerElement = imaVideoObj.getPropertiesForTesting()
+          .videoPlayer;
 
-        return timer.promise(950);
-      }).then(() => {
+        imaVideoObj.setPlayerStateForTesting(
+          imaVideoObj.getPropertiesForTesting().PlayerStates.PLAYING
+        );
+        imaVideoObj.addHoverEventToElement(
+          videoPlayerElement,
+          imaVideoObj.getShowControlsThrottledForTesting()
+        );
         videoPlayerElement.dispatchEvent(interactEvent);
 
+        expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+          .true;
+        expect(
+          imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+        ).to.eql('flex');
+
+        imaVideoObj.hideControls();
+        expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+          .false;
         expect(
-            imaVideoObj.getPropertiesForTesting().controlsVisible
-        ).to.be.true;
-        expect(imaVideoObj.getPropertiesForTesting().controlsDiv.style.display)
-            .to.eql('flex');
+          imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+        ).to.eql('none');
+
+        return timer
+          .promise(100)
+          .then(() => {
+            videoPlayerElement.dispatchEvent(interactEvent);
+
+            expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+              .false;
+            expect(
+              imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+            ).to.eql('none');
+
+            return timer.promise(950);
+          })
+          .then(() => {
+            videoPlayerElement.dispatchEvent(interactEvent);
+
+            expect(imaVideoObj.getPropertiesForTesting().controlsVisible).to.be
+              .true;
+            expect(
+              imaVideoObj.getPropertiesForTesting().controlsDiv.style.display
+            ).to.eql('flex');
+          });
       });
     });
-  });
-
-  it('suppresses IMA load with unknown consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    win.context.initialConsentState = CONSENT_POLICY_STATE.UNKNOWN;
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+
+    it('suppresses IMA load with unknown consent', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      win.context.initialConsentState = CONSENT_POLICY_STATE.UNKNOWN;
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+
+      // TODO: When I can spy on internals, verify that onImaLoadSuccess() is not
+      // called, and that onImaLoadFail is called.
+      expect(imaVideoObj.getPropertiesForTesting().imaLoadAllowed).to.eql(
+        false
+      );
     });
 
-    // TODO: When I can spy on internals, verify that onImaLoadSuccess() is not
-    // called, and that onImaLoadFail is called.
-    expect(imaVideoObj.getPropertiesForTesting().imaLoadAllowed).to.eql(false);
-  });
+    it('handles unknown consent with request ads call', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
 
-  it('handles unknown consent with request ads call', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      imaVideoObj.imaLoadAllowed = true;
+      imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.UNKNOWN);
+      imaVideoObj.requestAds();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(imaVideoObj.getPropertiesForTesting().imaLoadAllowed).to.eql(
+        false
+      );
     });
 
-    imaVideoObj.imaLoadAllowed = true;
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.UNKNOWN);
-    imaVideoObj.requestAds();
+    it('handles insufficient consent', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    expect(imaVideoObj.getPropertiesForTesting().imaLoadAllowed).to.eql(false);
-  });
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
 
-  it('handles insufficient consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      const mockAdsLoader = {requestAds() {}};
+      const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+      imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+      imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
+      imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.INSUFFICIENT);
+      imaVideoObj.requestAds();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
+        'vast.mxl&npa=1'
+      );
     });
 
+    it('handles sufficient consent', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
-    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
-    imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.INSUFFICIENT);
-    imaVideoObj.requestAds();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl)
-        .to.eql('vast.mxl&npa=1');
-  });
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
 
-  it('handles sufficient consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+      const mockAdsLoader = {requestAds() {}};
+      const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+      imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+      imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
+      imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.SUFFICIENT);
+      imaVideoObj.requestAds();
 
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
+      expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
+        'vast.mxl'
+      );
     });
 
-    const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
-    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
-    imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(CONSENT_POLICY_STATE.SUFFICIENT);
-    imaVideoObj.requestAds();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl)
-        .to.eql('vast.mxl');
-  });
-
-  it('handles unknown_not_required consent', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    imaVideoObj.imaVideo(win, {
-      width: 640,
-      height: 360,
-      src: srcUrl,
-      tag: adTagUrl,
-    });
+    it('handles unknown_not_required consent', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
 
-    const mockAdsLoader = {requestAds() {}};
-    const mockAdsRequest = {adTagUrl: 'vast.mxl'};
-    imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
-    imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
-    imaVideoObj.setConsentStateForTesting(
-        CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED);
-    imaVideoObj.requestAds();
-
-    expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl)
-        .to.eql('vast.mxl');
-  });
-});
+      imaVideoObj.imaVideo(win, {
+        width: 640,
+        height: 360,
+        src: srcUrl,
+        tag: adTagUrl,
+      });
+
+      const mockAdsLoader = {requestAds() {}};
+      const mockAdsRequest = {adTagUrl: 'vast.mxl'};
+      imaVideoObj.setAdsLoaderForTesting(mockAdsLoader);
+      imaVideoObj.setAdsRequestForTesting(mockAdsRequest);
+      imaVideoObj.setConsentStateForTesting(
+        CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+      );
+      imaVideoObj.requestAds();
+
+      expect(imaVideoObj.getPropertiesForTesting().adsRequest.adTagUrl).to.eql(
+        'vast.mxl'
+      );
+    });
+  }
+);
diff --git a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
index 47bd28a168db..09ed307c1622 100644
--- a/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/amp-image-lightbox.js
@@ -50,8 +50,7 @@ const SUPPORTED_ELEMENTS_ = {
 };
 
 /** @private @const */
-const ARIA_ATTRIBUTES = ['aria-label', 'aria-describedby',
-  'aria-labelledby'];
+const ARIA_ATTRIBUTES = ['aria-label', 'aria-describedby', 'aria-labelledby'];
 
 /** @private @const {!../../../src/curve.CurveDef} */
 const ENTER_CURVE_ = bezierCurve(0.4, 0, 0.2, 1);
@@ -234,11 +233,11 @@ export class ImageViewer {
    */
   setSourceDimensions_(ampImg, img) {
     if (img) {
-      this.sourceWidth_ = img.naturalWidth || ampImg./*OK*/offsetWidth;
-      this.sourceHeight_ = img.naturalHeight || ampImg./*OK*/offsetHeight;
+      this.sourceWidth_ = img.naturalWidth || ampImg./*OK*/ offsetWidth;
+      this.sourceHeight_ = img.naturalHeight || ampImg./*OK*/ offsetHeight;
     } else {
-      this.sourceWidth_ = ampImg./*OK*/offsetWidth;
-      this.sourceHeight_ = ampImg./*OK*/offsetHeight;
+      this.sourceWidth_ = ampImg./*OK*/ offsetWidth;
+      this.sourceHeight_ = ampImg./*OK*/ offsetHeight;
     }
   }
 
@@ -269,32 +268,36 @@ export class ImageViewer {
    * @return {!Promise}
    */
   measure() {
-    this.viewerBox_ = layoutRectFromDomRect(this.viewer_
-        ./*OK*/getBoundingClientRect());
+    this.viewerBox_ = layoutRectFromDomRect(
+      this.viewer_./*OK*/ getBoundingClientRect()
+    );
     const sourceAspectRatio = this.sourceWidth_ / this.sourceHeight_;
     let height = Math.min(
-        this.viewerBox_.width / sourceAspectRatio,
-        this.viewerBox_.height
+      this.viewerBox_.width / sourceAspectRatio,
+      this.viewerBox_.height
     );
     let width = Math.min(
-        this.viewerBox_.height * sourceAspectRatio,
-        this.viewerBox_.width
+      this.viewerBox_.height * sourceAspectRatio,
+      this.viewerBox_.width
     );
 
     // TODO(dvoytenko): This is to reduce very small expansions that often
     // look like a stutter. To be evaluated if this is still the right
     // idea.
-    if (Math.abs(width - this.sourceWidth_) <= 16
-        && Math.abs(height - this.sourceHeight_) <= 16) {
+    if (
+      Math.abs(width - this.sourceWidth_) <= 16 &&
+      Math.abs(height - this.sourceHeight_) <= 16
+    ) {
       width = this.sourceWidth_;
       height = this.sourceHeight_;
     }
 
     this.imageBox_ = layoutRectLtwh(
-        Math.round((this.viewerBox_.width - width) / 2),
-        Math.round((this.viewerBox_.height - height) / 2),
-        Math.round(width),
-        Math.round(height));
+      Math.round((this.viewerBox_.width - width) / 2),
+      Math.round((this.viewerBox_.height - height) / 2),
+      Math.round(width),
+      Math.round(height)
+    );
 
     setStyles(this.image_, {
       top: st.px(this.imageBox_.top),
@@ -306,8 +309,8 @@ export class ImageViewer {
     // If aspect ratio is off by too much, adjust max scale
     const viewerBoxRatio = this.viewerBox_.width / this.viewerBox_.height;
     const maxScale = Math.max(
-        viewerBoxRatio / sourceAspectRatio,
-        sourceAspectRatio / viewerBoxRatio
+      viewerBoxRatio / sourceAspectRatio,
+      sourceAspectRatio / viewerBoxRatio
     );
     this.maxScale_ = Math.max(DEFAULT_MAX_SCALE, maxScale);
 
@@ -339,10 +342,12 @@ export class ImageViewer {
     // Notice that we will wait until the next event cycle to set the "src".
     // This ensures that the already available image will show immediately
     // and then naturally upgrade to a higher quality image.
-    return Services.timerFor(this.win).promise(1).then(() => {
-      this.image_.setAttribute('src', src);
-      return this.loadPromise_(this.image_);
-    });
+    return Services.timerFor(this.win)
+      .promise(1)
+      .then(() => {
+        this.image_.setAttribute('src', src);
+        return this.loadPromise_(this.image_);
+      });
   }
 
   /** @private */
@@ -382,11 +387,21 @@ export class ImageViewer {
       });
     });
     gestures.onGesture(TapzoomRecognizer, e => {
-      this.onZoomInc_(e.data.centerClientX, e.data.centerClientY,
-          e.data.deltaX, e.data.deltaY);
+      this.onZoomInc_(
+        e.data.centerClientX,
+        e.data.centerClientY,
+        e.data.deltaX,
+        e.data.deltaY
+      );
       if (e.data.last) {
-        this.onZoomRelease_(e.data.centerClientX, e.data.centerClientY,
-            e.data.deltaX, e.data.deltaY, e.data.velocityY, e.data.velocityY);
+        this.onZoomRelease_(
+          e.data.centerClientX,
+          e.data.centerClientY,
+          e.data.deltaX,
+          e.data.deltaY,
+          e.data.velocityY,
+          e.data.velocityY
+        );
       }
     });
   }
@@ -412,8 +427,12 @@ export class ImageViewer {
    * @private
    */
   boundScale_(s, allowExtent) {
-    return this.boundValue_(s, this.minScale_, this.maxScale_,
-        allowExtent ? 0.25 : 0);
+    return this.boundValue_(
+      s,
+      this.minScale_,
+      this.maxScale_,
+      allowExtent ? 0.25 : 0
+    );
   }
 
   /**
@@ -424,8 +443,12 @@ export class ImageViewer {
    * @private
    */
   boundX_(x, allowExtent) {
-    return this.boundValue_(x, this.minX_, this.maxX_,
-        allowExtent && this.scale_ > 1 ? this.viewerBox_.width * 0.25 : 0);
+    return this.boundValue_(
+      x,
+      this.minX_,
+      this.maxX_,
+      allowExtent && this.scale_ > 1 ? this.viewerBox_.width * 0.25 : 0
+    );
   }
 
   /**
@@ -436,8 +459,12 @@ export class ImageViewer {
    * @private
    */
   boundY_(y, allowExtent) {
-    return this.boundValue_(y, this.minY_, this.maxY_,
-        allowExtent ? this.viewerBox_.height * 0.25 : 0);
+    return this.boundValue_(
+      y,
+      this.minY_,
+      this.maxY_,
+      allowExtent ? this.viewerBox_.height * 0.25 : 0
+    );
   }
 
   /**
@@ -480,8 +507,8 @@ export class ImageViewer {
    */
   updatePanZoom_() {
     setStyles(this.image_, {
-      transform: st.translate(this.posX_, this.posY_) +
-          ' ' + st.scale(this.scale_),
+      transform:
+        st.translate(this.posX_, this.posY_) + ' ' + st.scale(this.scale_),
     });
     if (this.scale_ != 1) {
       this.lightbox_.toggleViewMode(true);
@@ -516,19 +543,26 @@ export class ImageViewer {
     }
 
     // Continue motion.
-    this.motion_ = continueMotion(this.image_,
-        this.posX_, this.posY_, veloX, veloY,
-        (x, y) => {
-          const newPosX = this.boundX_(x, true);
-          const newPosY = this.boundY_(y, true);
-          if (Math.abs(newPosX - this.posX_) < 1 &&
-                Math.abs(newPosY - this.posY_) < 1) {
-            // Hit the wall: stop motion.
-            return false;
-          }
-          this.set_(this.scale_, newPosX, newPosY, false);
-          return true;
-        });
+    this.motion_ = continueMotion(
+      this.image_,
+      this.posX_,
+      this.posY_,
+      veloX,
+      veloY,
+      (x, y) => {
+        const newPosX = this.boundX_(x, true);
+        const newPosY = this.boundY_(y, true);
+        if (
+          Math.abs(newPosX - this.posX_) < 1 &&
+          Math.abs(newPosY - this.posY_) < 1
+        ) {
+          // Hit the wall: stop motion.
+          return false;
+        }
+        this.set_(this.scale_, newPosX, newPosY, false);
+        return true;
+      }
+    );
 
     // Snap back.
     this.motion_.thenAlways(() => {
@@ -548,13 +582,15 @@ export class ImageViewer {
   onZoomInc_(centerClientX, centerClientY, deltaX, deltaY) {
     const dist = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
 
-    const zoomSign = Math.abs(deltaY) > Math.abs(deltaX) ?
-      Math.sign(deltaY) : Math.sign(-deltaX);
+    const zoomSign =
+      Math.abs(deltaY) > Math.abs(deltaX)
+        ? Math.sign(deltaY)
+        : Math.sign(-deltaX);
     if (zoomSign == 0) {
       return;
     }
 
-    const newScale = this.startScale_ * (1 + zoomSign * dist / 100);
+    const newScale = this.startScale_ * (1 + (zoomSign * dist) / 100);
     const deltaCenterX = this.viewerBox_.width / 2 - centerClientX;
     const deltaCenterY = this.viewerBox_.height / 2 - centerClientY;
     deltaX = Math.min(deltaCenterX, deltaCenterX * (dist / 100));
@@ -581,8 +617,12 @@ export class ImageViewer {
 
     const newPosX = this.boundX_(this.startX_ + deltaX * newScale, false);
     const newPosY = this.boundY_(this.startY_ + deltaY * newScale, false);
-    return /** @type {!Promise|undefined} */ (
-      this.set_(newScale, newPosX, newPosY, animate));
+    return /** @type {!Promise|undefined} */ (this.set_(
+      newScale,
+      newPosX,
+      newPosY,
+      animate
+    ));
   }
 
   /**
@@ -602,22 +642,29 @@ export class ImageViewer {
     if (veloX == 0 && veloY == 0) {
       promise = Promise.resolve();
     } else {
-      promise = continueMotion(this.image_,
-          deltaX, deltaY, veloX, veloY,
-          (x, y) => {
-            this.onZoomInc_(centerClientX, centerClientY, x, y);
-            return true;
-          }).thenAlways();
+      promise = continueMotion(
+        this.image_,
+        deltaX,
+        deltaY,
+        veloX,
+        veloY,
+        (x, y) => {
+          this.onZoomInc_(centerClientX, centerClientY, x, y);
+          return true;
+        }
+      ).thenAlways();
     }
 
     const relayout = this.scale_ > this.startScale_;
-    return promise.then(() => {
-      return this.release_();
-    }).then(() => {
-      if (relayout) {
-        this.updateSrc_();
-      }
-    });
+    return promise
+      .then(() => {
+        return this.release_();
+      })
+      .then(() => {
+        if (relayout) {
+          this.updateSrc_();
+        }
+      });
   }
 
   /**
@@ -638,9 +685,13 @@ export class ImageViewer {
     let dur = 0;
     if (animate) {
       const maxDur = 250;
-      dur = Math.min(maxDur, Math.max(
+      dur = Math.min(
+        maxDur,
+        Math.max(
           maxDur * dist * 0.01, // Moving component.
-          maxDur * Math.abs(ds))); // Zooming component.
+          maxDur * Math.abs(ds)
+        )
+      ); // Zooming component.
     }
 
     let promise;
@@ -651,12 +702,17 @@ export class ImageViewer {
       const xFunc = tr.numeric(this.posX_, newPosX);
       /** @const {!TransitionDef<number>} */
       const yFunc = tr.numeric(this.posY_, newPosY);
-      promise = Animation.animate(this.image_, time => {
-        this.scale_ = scaleFunc(time);
-        this.posX_ = xFunc(time);
-        this.posY_ = yFunc(time);
-        this.updatePanZoom_();
-      }, dur, PAN_ZOOM_CURVE_).thenAlways(() => {
+      promise = Animation.animate(
+        this.image_,
+        time => {
+          this.scale_ = scaleFunc(time);
+          this.posX_ = xFunc(time);
+          this.posY_ = yFunc(time);
+          this.updatePanZoom_();
+        },
+        dur,
+        PAN_ZOOM_CURVE_
+      ).thenAlways(() => {
         this.scale_ = newScale;
         this.posX_ = newPosX;
         this.posY_ = newPosY;
@@ -687,8 +743,8 @@ export class ImageViewer {
     if (newScale != this.scale_) {
       this.updatePanZoomBounds_(newScale);
     }
-    const newPosX = this.boundX_(this.posX_ / this.scale_ * newScale, false);
-    const newPosY = this.boundY_(this.posY_ / this.scale_ * newScale, false);
+    const newPosX = this.boundX_((this.posX_ / this.scale_) * newScale, false);
+    const newPosY = this.boundY_((this.posY_ / this.scale_) * newScale, false);
     return this.set_(newScale, newPosX, newPosY, true).then(() => {
       this.startScale_ = this.scale_;
       this.startX_ = this.posX_;
@@ -697,12 +753,10 @@ export class ImageViewer {
   }
 }
 
-
 /**
  * This class implements "amp-image-lightbox" extension element.
  */
 class AmpImageLightbox extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -737,8 +791,7 @@ class AmpImageLightbox extends AMP.BaseElement {
     /** @private {!Function} */
     this.boundCloseOnEscape_ = this.closeOnEscape_.bind(this);
 
-    this.registerDefaultAction(
-        invocation => this.open_(invocation), 'open');
+    this.registerDefaultAction(invocation => this.open_(invocation), 'open');
   }
 
   /**
@@ -753,26 +806,33 @@ class AmpImageLightbox extends AMP.BaseElement {
     this.container_.classList.add('i-amphtml-image-lightbox-container');
     this.element.appendChild(this.container_);
 
-    this.imageViewer_ = new ImageViewer(this, this.win,
-        this.loadPromise.bind(this));
+    this.imageViewer_ = new ImageViewer(
+      this,
+      this.win,
+      this.loadPromise.bind(this)
+    );
     this.container_.appendChild(this.imageViewer_.getElement());
 
     this.captionElement_ = this.element.ownerDocument.createElement('div');
 
     // Set id to the captionElement_ for accessibility reason
-    this.captionElement_.setAttribute('id', this.element.getAttribute('id')
-        + '-caption');
+    this.captionElement_.setAttribute(
+      'id',
+      this.element.getAttribute('id') + '-caption'
+    );
 
     this.captionElement_.classList.add('amp-image-lightbox-caption');
     this.captionElement_.classList.add('i-amphtml-image-lightbox-caption');
     this.container_.appendChild(this.captionElement_);
 
     // Invisible close button at the end of lightbox for screen-readers.
-    const screenReaderCloseButton = this.element.ownerDocument
-        .createElement('button');
+    const screenReaderCloseButton = this.element.ownerDocument.createElement(
+      'button'
+    );
     // TODO(aghassemi, #4146) i18n
-    const ariaLabel = this.element.getAttribute('data-close-button-aria-label')
-        || 'Close the lightbox';
+    const ariaLabel =
+      this.element.getAttribute('data-close-button-aria-label') ||
+      'Close the lightbox';
     screenReaderCloseButton.textContent = ariaLabel;
     screenReaderCloseButton.classList.add('i-amphtml-screen-reader');
 
@@ -785,9 +845,10 @@ class AmpImageLightbox extends AMP.BaseElement {
 
     const gestures = Gestures.get(this.element);
     this.element.addEventListener('click', e => {
-      if (!this.entering_ &&
-            !this.imageViewer_.getImage().contains(/** @type {?Node} */ (
-              e.target))) {
+      if (
+        !this.entering_ &&
+        !this.imageViewer_.getImage().contains(/** @type {?Node} */ (e.target))
+      ) {
         this.close();
       }
     });
@@ -812,15 +873,20 @@ class AmpImageLightbox extends AMP.BaseElement {
     this.buildLightbox_();
 
     const source = invocation.caller;
-    userAssert(source && SUPPORTED_ELEMENTS_[source.tagName.toLowerCase()],
-        'Unsupported element: %s', source.tagName);
+    userAssert(
+      source && SUPPORTED_ELEMENTS_[source.tagName.toLowerCase()],
+      'Unsupported element: %s',
+      source.tagName
+    );
 
     this.active_ = true;
     this.reset_();
     this.init_(source);
 
     this.win.document.documentElement.addEventListener(
-        'keydown', this.boundCloseOnEscape_);
+      'keydown',
+      this.boundCloseOnEscape_
+    );
 
     // Prepare to enter in lightbox
     this.getViewport().enterLightboxMode();
@@ -833,8 +899,12 @@ class AmpImageLightbox extends AMP.BaseElement {
         // element size depends on window size directly and the measurement
         // happens in window.resize event. Adding a timeout for correct
         // measurement. See https://github.com/ampproject/amphtml/issues/8479
-        if (startsWith(
-            Services.platformFor(this.win).getIosVersionString(), '10.3')) {
+        if (
+          startsWith(
+            Services.platformFor(this.win).getIosVersionString(),
+            '10.3'
+          )
+        ) {
           Services.timerFor(this.win).delay(() => {
             this.imageViewer_.measure();
           }, 500);
@@ -844,9 +914,11 @@ class AmpImageLightbox extends AMP.BaseElement {
       }
     });
 
-    this.getHistory_().push(this.close.bind(this)).then(historyId => {
-      this.historyId_ = historyId;
-    });
+    this.getHistory_()
+      .push(this.close.bind(this))
+      .then(historyId => {
+        this.historyId_ = historyId;
+      });
   }
 
   /**
@@ -883,7 +955,9 @@ class AmpImageLightbox extends AMP.BaseElement {
       this.getHistory_().pop(this.historyId_);
     }
     this.win.document.documentElement.removeEventListener(
-        'keydown', this.boundCloseOnEscape_);
+      'keydown',
+      this.boundCloseOnEscape_
+    );
     if (this.sourceElement_) {
       dom.tryFocus(this.sourceElement_);
     }
@@ -896,7 +970,9 @@ class AmpImageLightbox extends AMP.BaseElement {
   toggleViewMode(opt_on) {
     if (opt_on !== undefined) {
       this.container_.classList.toggle(
-          'i-amphtml-image-lightbox-view-mode', opt_on);
+        'i-amphtml-image-lightbox-view-mode',
+        opt_on
+      );
     } else {
       this.container_.classList.toggle('i-amphtml-image-lightbox-view-mode');
     }
@@ -917,8 +993,10 @@ class AmpImageLightbox extends AMP.BaseElement {
     let caption = null;
 
     // 1. Check <figure> and <figcaption>.
-    const figure = dom.closestAncestorElementBySelector(sourceElement,
-        'figure');
+    const figure = dom.closestAncestorElementBySelector(
+      sourceElement,
+      'figure'
+    );
     if (figure) {
       caption = dom.elementByTag(figure, 'figcaption');
     }
@@ -931,8 +1009,12 @@ class AmpImageLightbox extends AMP.BaseElement {
 
     if (caption) {
       dom.copyChildren(caption, dev().assertElement(this.captionElement_));
-      this.imageViewer_.getImage().setAttribute('aria-describedby',
-          this.captionElement_.getAttribute('id'));
+      this.imageViewer_
+        .getImage()
+        .setAttribute(
+          'aria-describedby',
+          this.captionElement_.getAttribute('id')
+        );
     }
 
     this.captionElement_.classList.toggle('i-amphtml-empty', !caption);
@@ -964,20 +1046,31 @@ class AmpImageLightbox extends AMP.BaseElement {
     const dur = 500;
 
     // Lightbox background fades in.
-    anim.add(0, tr.setStyles(this.element, {
-      opacity: tr.numeric(0, 1),
-    }), 0.6, ENTER_CURVE_);
+    anim.add(
+      0,
+      tr.setStyles(this.element, {
+        opacity: tr.numeric(0, 1),
+      }),
+      0.6,
+      ENTER_CURVE_
+    );
 
     // Try to transition from the source image.
     let transLayer = null;
-    if (this.sourceImage_ && isLoaded(this.sourceImage_) &&
-            this.sourceImage_.src) {
+    if (
+      this.sourceImage_ &&
+      isLoaded(this.sourceImage_) &&
+      this.sourceImage_.src
+    ) {
       transLayer = this.element.ownerDocument.createElement('div');
       transLayer.classList.add('i-amphtml-image-lightbox-trans');
-      this.getAmpDoc().getBody().appendChild(transLayer);
+      this.getAmpDoc()
+        .getBody()
+        .appendChild(transLayer);
 
-      const rect = layoutRectFromDomRect(this.sourceImage_
-          ./*OK*/getBoundingClientRect());
+      const rect = layoutRectFromDomRect(
+        this.sourceImage_./*OK*/ getBoundingClientRect()
+      );
       const imageBox = this.imageViewer_.getImageBox();
       const clone = this.sourceImage_.cloneNode(true);
       clone.className = '';
@@ -1000,24 +1093,42 @@ class AmpImageLightbox extends AMP.BaseElement {
       const scaleX = rect.width != 0 ? imageBox.width / rect.width : 1;
       // Duration will be somewhere between 0.2 and 0.8 depending on how far
       // the image needs to move.
-      const motionTime = Math.max(0.2, Math.min(0.8, Math.abs(dy) / 250 * 0.8));
-      anim.add(0, tr.setStyles(clone, {
-        transform: tr.concat([
-          tr.translate(tr.numeric(0, dx), tr.numeric(0, dy)),
-          tr.scale(tr.numeric(1, scaleX)),
-        ]),
-      }), motionTime, ENTER_CURVE_);
+      const motionTime = Math.max(
+        0.2,
+        Math.min(0.8, (Math.abs(dy) / 250) * 0.8)
+      );
+      anim.add(
+        0,
+        tr.setStyles(clone, {
+          transform: tr.concat([
+            tr.translate(tr.numeric(0, dx), tr.numeric(0, dy)),
+            tr.scale(tr.numeric(1, scaleX)),
+          ]),
+        }),
+        motionTime,
+        ENTER_CURVE_
+      );
 
       // Fade in the container. This will mostly affect the caption.
       setStyles(dev().assertElement(this.container_), {opacity: 0});
-      anim.add(0.8, tr.setStyles(dev().assertElement(this.container_), {
-        opacity: tr.numeric(0, 1),
-      }), 0.1, ENTER_CURVE_);
+      anim.add(
+        0.8,
+        tr.setStyles(dev().assertElement(this.container_), {
+          opacity: tr.numeric(0, 1),
+        }),
+        0.1,
+        ENTER_CURVE_
+      );
 
       // At the end, fade out the transition image.
-      anim.add(0.9, tr.setStyles(transLayer, {
-        opacity: tr.numeric(1, 0.01),
-      }), 0.1, EXIT_CURVE_);
+      anim.add(
+        0.9,
+        tr.setStyles(transLayer, {
+          opacity: tr.numeric(1, 0.01),
+        }),
+        0.1,
+        EXIT_CURVE_
+      );
     }
 
     return anim.start(dur).thenAlways(() => {
@@ -1025,7 +1136,9 @@ class AmpImageLightbox extends AMP.BaseElement {
       setStyles(this.element, {opacity: ''});
       setStyles(dev().assertElement(this.container_), {opacity: ''});
       if (transLayer) {
-        this.getAmpDoc().getBody().removeChild(transLayer);
+        this.getAmpDoc()
+          .getBody()
+          .removeChild(transLayer);
       }
     });
   }
@@ -1042,19 +1155,27 @@ class AmpImageLightbox extends AMP.BaseElement {
     let dur = 500;
 
     // Lightbox background fades out.
-    anim.add(0, tr.setStyles(this.element, {
-      opacity: tr.numeric(1, 0),
-    }), 0.9, EXIT_CURVE_);
+    anim.add(
+      0,
+      tr.setStyles(this.element, {
+        opacity: tr.numeric(1, 0),
+      }),
+      0.9,
+      EXIT_CURVE_
+    );
 
     // Try to transition to the source image.
     let transLayer = null;
     if (isLoaded(image) && image.src && this.sourceImage_) {
       transLayer = this.element.ownerDocument.createElement('div');
       transLayer.classList.add('i-amphtml-image-lightbox-trans');
-      this.getAmpDoc().getBody().appendChild(transLayer);
+      this.getAmpDoc()
+        .getBody()
+        .appendChild(transLayer);
 
-      const rect = layoutRectFromDomRect(this.sourceImage_
-          ./*OK*/getBoundingClientRect());
+      const rect = layoutRectFromDomRect(
+        this.sourceImage_./*OK*/ getBoundingClientRect()
+      );
       const clone = image.cloneNode(true);
       setStyles(clone, {
         position: 'absolute',
@@ -1069,9 +1190,14 @@ class AmpImageLightbox extends AMP.BaseElement {
       transLayer.appendChild(clone);
 
       // Fade out the container.
-      anim.add(0, tr.setStyles(dev().assertElement(this.container_), {
-        opacity: tr.numeric(1, 0),
-      }), 0.1, EXIT_CURVE_);
+      anim.add(
+        0,
+        tr.setStyles(dev().assertElement(this.container_), {
+          opacity: tr.numeric(1, 0),
+        }),
+        0.1,
+        EXIT_CURVE_
+      );
 
       // Move and resize the image back to where it is in the article.
       const dx = rect.left - imageBox.left;
@@ -1088,35 +1214,50 @@ class AmpImageLightbox extends AMP.BaseElement {
       // Duration will be somewhere between 0.2 and 0.8 depending on how far
       // the image needs to move. Start the motion later too, but no later
       // than 0.2.
-      const motionTime = Math.max(0.2, Math.min(0.8, Math.abs(dy) / 250 * 0.8));
-      anim.add(Math.min(0.8 - motionTime, 0.2), (time, complete) => {
-        moveAndScale(time);
-        if (complete) {
-          this.sourceImage_.classList.remove('i-amphtml-ghost');
-        }
-      }, motionTime, EXIT_CURVE_);
+      const motionTime = Math.max(
+        0.2,
+        Math.min(0.8, (Math.abs(dy) / 250) * 0.8)
+      );
+      anim.add(
+        Math.min(0.8 - motionTime, 0.2),
+        (time, complete) => {
+          moveAndScale(time);
+          if (complete) {
+            this.sourceImage_.classList.remove('i-amphtml-ghost');
+          }
+        },
+        motionTime,
+        EXIT_CURVE_
+      );
 
       // Fade out the transition image.
-      anim.add(0.8, tr.setStyles(transLayer, {
-        opacity: tr.numeric(1, 0.01),
-      }), 0.2, EXIT_CURVE_);
+      anim.add(
+        0.8,
+        tr.setStyles(transLayer, {
+          opacity: tr.numeric(1, 0.01),
+        }),
+        0.2,
+        EXIT_CURVE_
+      );
 
       // Duration will be somewhere between 300ms and 700ms depending on
       // how far the image needs to move.
-      dur = Math.max(Math.min(Math.abs(dy) / 250 * dur, dur), 300);
+      dur = Math.max(Math.min((Math.abs(dy) / 250) * dur, dur), 300);
     }
 
     return anim.start(dur).thenAlways(() => {
       if (this.sourceImage_) {
         this.sourceImage_.classList.remove('i-amphtml-ghost');
       }
-      this./*OK*/collapse();
+      this./*OK*/ collapse();
       setStyles(this.element, {
         opacity: '',
       });
       setStyles(dev().assertElement(this.container_), {opacity: ''});
       if (transLayer) {
-        this.getAmpDoc().getBody().removeChild(transLayer);
+        this.getAmpDoc()
+          .getBody()
+          .removeChild(transLayer);
       }
       this.reset_();
     });
@@ -1128,7 +1269,6 @@ class AmpImageLightbox extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpImageLightbox, CSS);
 });
diff --git a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
index e8743d496e0e..782435a5cd1c 100644
--- a/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/test/integration/test-amp-image-lightbox.js
@@ -16,10 +16,13 @@
 
 import {poll} from '../../../../../testing/iframe';
 
-describe.configure().skipFirefox().run('amp-image-lightbox', function() {
-  this.timeout(5000);
-  const extensions = ['amp-image-lightbox'];
-  const imageLightboxBody = `
+describe
+  .configure()
+  .skipFirefox()
+  .run('amp-image-lightbox', function() {
+    this.timeout(5000);
+    const extensions = ['amp-image-lightbox'];
+    const imageLightboxBody = `
   <figure>
   <amp-img id="img0"
       srcset="
@@ -39,39 +42,47 @@ describe.configure().skipFirefox().run('amp-image-lightbox', function() {
   data-close-button-aria-label="Close">
 </amp-image-lightbox>
   `;
-  describes.integration('amp-image-lightbox opens', {
-    body: imageLightboxBody,
-    extensions,
-  }, env => {
+    describes.integration(
+      'amp-image-lightbox opens',
+      {
+        body: imageLightboxBody,
+        extensions,
+      },
+      env => {
+        let win;
+        beforeEach(() => {
+          win = env.win;
+        });
 
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    it('should activate on tap of source image', () => {
-      const lightbox = win.document.getElementById('image-lightbox-1');
-      expect(lightbox).to.have.display('none');
-      const ampImage = win.document.getElementById('img0');
-      const imageLoadedPromise = waitForImageToLoad(ampImage);
-      return imageLoadedPromise.then(() => {
-        const ampImage = win.document.getElementById('img0');
-        // Simulate a click on the img inside the amp-img, because this is
-        // what people tend to actually click on.
-        const openerImage = ampImage.querySelector('img[amp-img-id="img0"]');
-        const openedPromise = waitForLightboxOpen(win.document);
-        openerImage.click();
-        return openedPromise;
-      }).then(() => {
-        const imageSelection = win.document
-            .getElementsByClassName('i-amphtml-image-lightbox-viewer-image');
-        expect(imageSelection.length).to.equal(1);
-        const image = imageSelection[0];
-        expect(image.tagName).to.equal('IMG');
-      });
-    });
+        it('should activate on tap of source image', () => {
+          const lightbox = win.document.getElementById('image-lightbox-1');
+          expect(lightbox).to.have.display('none');
+          const ampImage = win.document.getElementById('img0');
+          const imageLoadedPromise = waitForImageToLoad(ampImage);
+          return imageLoadedPromise
+            .then(() => {
+              const ampImage = win.document.getElementById('img0');
+              // Simulate a click on the img inside the amp-img, because this is
+              // what people tend to actually click on.
+              const openerImage = ampImage.querySelector(
+                'img[amp-img-id="img0"]'
+              );
+              const openedPromise = waitForLightboxOpen(win.document);
+              openerImage.click();
+              return openedPromise;
+            })
+            .then(() => {
+              const imageSelection = win.document.getElementsByClassName(
+                'i-amphtml-image-lightbox-viewer-image'
+              );
+              expect(imageSelection.length).to.equal(1);
+              const image = imageSelection[0];
+              expect(image.tagName).to.equal('IMG');
+            });
+        });
+      }
+    );
   });
-});
 
 function waitForLightboxOpen(document) {
   return poll('wait for image-lightbox-1 to open', () => {
diff --git a/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js b/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
index a7432c36f096..c9fddb380f47 100644
--- a/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
+++ b/extensions/amp-image-lightbox/0.1/test/test-amp-image-lightbox.js
@@ -17,507 +17,533 @@
 import '../amp-image-lightbox';
 import * as dom from '../../../../src/dom';
 import * as lolex from 'lolex';
-import {
-  ImageViewer,
-} from '../amp-image-lightbox';
+import {ImageViewer} from '../amp-image-lightbox';
 import {Keys} from '../../../../src/utils/key-codes';
 import {Services} from '../../../../src/services';
 import {parseSrcset} from '../../../../src/srcset';
 
-describes.realWin('amp-image-lightbox component', {
-  amp: {
-    extensions: ['amp-image-lightbox'],
+describes.realWin(
+  'amp-image-lightbox component',
+  {
+    amp: {
+      extensions: ['amp-image-lightbox'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getImageLightbox() {
-    const el = doc.createElement('amp-image-lightbox');
-    el.setAttribute('layout', 'nodisplay');
-    doc.body.appendChild(el);
-    return el.build().then(() => el.layoutCallback()).then(() => el);
-  }
+  env => {
+    let win, doc;
 
-  it('should not render if not activated', () => {
-    return getImageLightbox().then(lightbox => {
-      const container = lightbox
-          .querySelector('.i-amphtml-image-lightbox-container');
-      expect(container).to.equal(null);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
+
+    function getImageLightbox() {
+      const el = doc.createElement('amp-image-lightbox');
+      el.setAttribute('layout', 'nodisplay');
+      doc.body.appendChild(el);
+      return el
+        .build()
+        .then(() => el.layoutCallback())
+        .then(() => el);
+    }
+
+    it('should not render if not activated', () => {
+      return getImageLightbox().then(lightbox => {
+        const container = lightbox.querySelector(
+          '.i-amphtml-image-lightbox-container'
+        );
+        expect(container).to.equal(null);
+      });
+    });
+
+    it('should render correctly', () => {
+      return getImageLightbox().then(lightbox => {
+        const impl = lightbox.implementation_;
+        const noop = () => {};
+        impl.getViewport = () => {
+          return {
+            onChanged: noop,
+            enterLightboxMode: noop,
+          };
+        };
+        impl.getHistory_ = () => {
+          return {
+            push: () => {
+              return Promise.resolve();
+            },
+          };
+        };
+        impl.enter_ = noop;
+
+        const ampImage = doc.createElement('amp-img');
+        ampImage.setAttribute('src', 'data:');
+        impl.open_({caller: ampImage});
+
+        const container = lightbox.querySelector(
+          '.i-amphtml-image-lightbox-container'
+        );
+        expect(container).to.not.equal(null);
+
+        const caption = container.querySelector(
+          '.i-amphtml-image-lightbox-caption'
+        );
+        expect(caption).to.not.equal(null);
+        expect(caption).to.have.class('amp-image-lightbox-caption');
+
+        const viewer = container.querySelector(
+          '.i-amphtml-image-lightbox-viewer'
+        );
+        expect(viewer).to.not.equal(null);
+
+        const image = viewer.querySelector(
+          '.i-amphtml-image-lightbox-viewer-image'
+        );
+        expect(image).to.not.equal(null);
+
+        // Very important. Image must have transform-origin=50% 50%.
+        const win = image.ownerDocument.defaultView;
+        expect(win.getComputedStyle(image)['transform-origin']).to.equal(
+          '50% 50%'
+        );
+      });
+    });
+
+    it('should activate all steps', () => {
+      return getImageLightbox().then(lightbox => {
+        const impl = lightbox.implementation_;
+        const viewportOnChanged = sandbox.spy();
+        const enterLightboxMode = sandbox.spy();
+        const leaveLightboxMode = sandbox.spy();
+        impl.getViewport = () => {
+          return {
+            onChanged: viewportOnChanged,
+            enterLightboxMode,
+            leaveLightboxMode,
+          };
+        };
+        const historyPush = sandbox.spy();
+        impl.getHistory_ = () => {
+          return {
+            push: () => {
+              historyPush();
+              return Promise.resolve(11);
+            },
+          };
+        };
+        const enter = sandbox.spy();
+        impl.enter_ = enter;
+
+        const ampImage = doc.createElement('amp-img');
+        ampImage.setAttribute('src', 'data:');
+        impl.open_({caller: ampImage});
+
+        expect(viewportOnChanged).to.be.calledOnce;
+        expect(impl.unlistenViewport_).to.not.equal(null);
+        expect(historyPush).to.be.calledOnce;
+        expect(enter).to.be.calledOnce;
+        expect(impl.sourceElement_).to.equal(ampImage);
+        expect(enterLightboxMode).to.be.calledOnce;
+        expect(leaveLightboxMode).to.have.not.been.called;
+      });
     });
-  });
-
-  it('should render correctly', () => {
-    return getImageLightbox().then(lightbox => {
-      const impl = lightbox.implementation_;
-      const noop = () => {};
-      impl.getViewport = () => {return {
-        onChanged: noop,
-        enterLightboxMode: noop,
-      };};
-      impl.getHistory_ = () => {
-        return {push: () => {
-          return Promise.resolve();
-        }};
-      };
-      impl.enter_ = noop;
 
-      const ampImage = doc.createElement('amp-img');
-      ampImage.setAttribute('src', 'data:');
-      impl.open_({caller: ampImage});
+    it('should deactivate all steps', () => {
+      return getImageLightbox().then(lightbox => {
+        const impl = lightbox.implementation_;
+        impl.active_ = true;
+        impl.historyId_ = 11;
+        const viewportOnChangedUnsubscribed = sandbox.spy();
+        impl.unlistenViewport_ = viewportOnChangedUnsubscribed;
+        const enterLightboxMode = sandbox.spy();
+        const leaveLightboxMode = sandbox.spy();
+        impl.getViewport = () => {
+          return {enterLightboxMode, leaveLightboxMode};
+        };
+        const historyPop = sandbox.spy();
+        impl.getHistory_ = () => {
+          return {pop: historyPop};
+        };
+        const exit = sandbox.spy();
+        impl.exit_ = exit;
+
+        impl.close();
+
+        expect(impl.active_).to.equal(false);
+        expect(exit).to.be.calledOnce;
+        expect(viewportOnChangedUnsubscribed).to.be.calledOnce;
+        expect(impl.unlistenViewport_).to.equal(null);
+        expect(leaveLightboxMode).to.be.calledOnce;
+        expect(enterLightboxMode).to.have.not.been.called;
+        expect(historyPop).to.be.calledOnce;
+      });
+    });
 
-      const container = lightbox
-          .querySelector('.i-amphtml-image-lightbox-container');
-      expect(container).to.not.equal(null);
+    it('should close on ESC', () => {
+      return getImageLightbox().then(lightbox => {
+        const impl = lightbox.implementation_;
+        const setupCloseSpy = sandbox.spy(impl, 'close');
+        const nullAddEventListenerSpy = sandbox
+          .spy(impl.win.document.documentElement, 'addEventListener')
+          .withArgs('keydown', null);
+        const viewportOnChanged = sandbox.spy();
+        const enterLightboxMode = sandbox.spy();
+        const leaveLightboxMode = sandbox.spy();
+        impl.getViewport = () => {
+          return {
+            onChanged: viewportOnChanged,
+            enterLightboxMode,
+            leaveLightboxMode,
+          };
+        };
+        const historyPush = sandbox.spy();
+        impl.getHistory_ = () => {
+          return {
+            push: () => {
+              historyPush();
+              return Promise.resolve(11);
+            },
+          };
+        };
+        const enter = sandbox.spy();
+        impl.enter_ = enter;
+
+        const ampImage = doc.createElement('amp-img');
+        ampImage.setAttribute('src', 'data:');
+        ampImage.setAttribute('width', '100');
+        ampImage.setAttribute('height', '100');
+        impl.open_({caller: ampImage});
+        impl.closeOnEscape_(new KeyboardEvent('keydown', {key: Keys.ESCAPE}));
+        expect(setupCloseSpy).to.be.calledOnce;
+
+        // Regression test: ensure escape event listener is bound properly
+        expect(nullAddEventListenerSpy).to.have.not.been.called;
+        impl.open_({caller: ampImage});
+        expect(nullAddEventListenerSpy).to.have.not.been.called;
+      });
+    });
+
+    // Accessibility
+    it('should return focus to source element after close', () => {
+      return getImageLightbox().then(lightbox => {
+        const impl = lightbox.implementation_;
+        impl.enter_ = () => {};
+        impl.getHistory_ = () => {
+          return {
+            pop: () => {},
+            push: () => Promise.resolve(11),
+          };
+        };
 
-      const caption = container.querySelector(
-          '.i-amphtml-image-lightbox-caption');
-      expect(caption).to.not.equal(null);
-      expect(caption).to.have.class('amp-image-lightbox-caption');
+        const tryFocus = sandbox.spy(dom, 'tryFocus');
 
-      const viewer = container.querySelector(
-          '.i-amphtml-image-lightbox-viewer');
-      expect(viewer).to.not.equal(null);
+        const sourceElement = doc.createElement('amp-img');
+        sourceElement.setAttribute('src', 'data:');
 
-      const image = viewer.querySelector(
-          '.i-amphtml-image-lightbox-viewer-image');
-      expect(image).to.not.equal(null);
+        impl.open_({caller: sourceElement});
+        impl.close();
 
-      // Very important. Image must have transform-origin=50% 50%.
-      const win = image.ownerDocument.defaultView;
-      expect(win.getComputedStyle(image)['transform-origin']).to.equal(
-          '50% 50%');
+        expect(tryFocus).to.be.calledOnce;
+      });
     });
-  });
-
-  it('should activate all steps', () => {
-    return getImageLightbox().then(lightbox => {
-      const impl = lightbox.implementation_;
-      const viewportOnChanged = sandbox.spy();
-      const enterLightboxMode = sandbox.spy();
-      const leaveLightboxMode = sandbox.spy();
-      impl.getViewport = () => {return {
-        onChanged: viewportOnChanged,
-        enterLightboxMode,
-        leaveLightboxMode,
-      };};
-      const historyPush = sandbox.spy();
-      impl.getHistory_ = () => {
-        return {push: () => {
-          historyPush();
-          return Promise.resolve(11);
-        }};
+  }
+);
+
+describes.realWin(
+  'amp-image-lightbox image viewer',
+  {
+    amp: {
+      extensions: ['amp-image-lightbox'],
+    },
+  },
+  env => {
+    let win, doc;
+    let clock;
+    let lightbox;
+    let lightboxMock;
+    let imageViewer;
+    let loadPromiseStub;
+
+    const sourceElement = {
+      offsetWidth: 101,
+      offsetHeight: 201,
+      getAttribute: name => {
+        if (name == 'src') {
+          return 'image1';
+        }
+        return undefined;
+      },
+      hasAttribute: () => undefined,
+      getImpl: () => Promise.resolve(sourceElement.implementation_),
+    };
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      clock = lolex.install();
+
+      lightbox = {
+        getDpr: () => 1,
+        element: {
+          ownerDocument: doc,
+        },
       };
-      const enter = sandbox.spy();
-      impl.enter_ = enter;
-
-      const ampImage = doc.createElement('amp-img');
-      ampImage.setAttribute('src', 'data:');
-      impl.open_({caller: ampImage});
-
-      expect(viewportOnChanged).to.be.calledOnce;
-      expect(impl.unlistenViewport_).to.not.equal(null);
-      expect(historyPush).to.be.calledOnce;
-      expect(enter).to.be.calledOnce;
-      expect(impl.sourceElement_).to.equal(ampImage);
-      expect(enterLightboxMode).to.be.calledOnce;
-      expect(leaveLightboxMode).to.have.not.been.called;
+      lightboxMock = sandbox.mock(lightbox);
+      loadPromiseStub = sandbox.stub().returns(Promise.resolve());
+
+      sandbox
+        .stub(Services.timerFor(win), 'promise')
+        .returns(Promise.resolve());
+      imageViewer = new ImageViewer(lightbox, win, loadPromiseStub);
+      doc.body.appendChild(imageViewer.getElement());
     });
-  });
-
-  it('should deactivate all steps', () => {
-    return getImageLightbox().then(lightbox => {
-      const impl = lightbox.implementation_;
-      impl.active_ = true;
-      impl.historyId_ = 11;
-      const viewportOnChangedUnsubscribed = sandbox.spy();
-      impl.unlistenViewport_ = viewportOnChangedUnsubscribed;
-      const enterLightboxMode = sandbox.spy();
-      const leaveLightboxMode = sandbox.spy();
-      impl.getViewport = () => {
-        return {enterLightboxMode, leaveLightboxMode};
-      };
-      const historyPop = sandbox.spy();
-      impl.getHistory_ = () => {
-        return {pop: historyPop};
-      };
-      const exit = sandbox.spy();
-      impl.exit_ = exit;
-
-      impl.close();
-
-      expect(impl.active_).to.equal(false);
-      expect(exit).to.be.calledOnce;
-      expect(viewportOnChangedUnsubscribed).to.be.calledOnce;
-      expect(impl.unlistenViewport_).to.equal(null);
-      expect(leaveLightboxMode).to.be.calledOnce;
-      expect(enterLightboxMode).to.have.not.been.called;
-      expect(historyPop).to.be.calledOnce;
+
+    afterEach(() => {
+      clock.uninstall();
+      doc.body.removeChild(imageViewer.getElement());
+      lightboxMock.verify();
     });
-  });
-
-  it('should close on ESC', () => {
-    return getImageLightbox().then(lightbox => {
-      const impl = lightbox.implementation_;
-      const setupCloseSpy = sandbox.spy(impl, 'close');
-      const nullAddEventListenerSpy = sandbox.spy(
-          impl.win.document.documentElement, 'addEventListener')
-          .withArgs('keydown', null);
-      const viewportOnChanged = sandbox.spy();
-      const enterLightboxMode = sandbox.spy();
-      const leaveLightboxMode = sandbox.spy();
-      impl.getViewport = () => {return {
-        onChanged: viewportOnChanged,
-        enterLightboxMode,
-        leaveLightboxMode,
-      };};
-      const historyPush = sandbox.spy();
-      impl.getHistory_ = () => {
-        return {push: () => {
-          historyPush();
-          return Promise.resolve(11);
-        }};
+
+    it('should have 0 initial dimensions', () => {
+      expect(imageViewer.getImage().src).to.equal('');
+      expect(imageViewer.getViewerBox().width).to.equal(0);
+      expect(imageViewer.getImageBox().width).to.equal(0);
+      expect(imageViewer.sourceWidth_).to.equal(0);
+      expect(imageViewer.sourceHeight_).to.equal(0);
+    });
+
+    it('should init to the source element without image', () => {
+      imageViewer.init(sourceElement, null);
+      expect(imageViewer.sourceWidth_).to.equal(101);
+      expect(imageViewer.sourceHeight_).to.equal(201);
+      expect(imageViewer.getImage().src).to.equal('');
+    });
+
+    it('should init to the source element with unloaded image', () => {
+      const sourceImage = {
+        complete: false,
+        src: 'image1-smaller',
       };
-      const enter = sandbox.spy();
-      impl.enter_ = enter;
-
-      const ampImage = doc.createElement('amp-img');
-      ampImage.setAttribute('src', 'data:');
-      ampImage.setAttribute('width', '100');
-      ampImage.setAttribute('height', '100');
-      impl.open_({caller: ampImage});
-      impl.closeOnEscape_(new KeyboardEvent('keydown', {key: Keys.ESCAPE}));
-      expect(setupCloseSpy).to.be.calledOnce;
-
-      // Regression test: ensure escape event listener is bound properly
-      expect(nullAddEventListenerSpy).to.have.not.been.called;
-      impl.open_({caller: ampImage});
-      expect(nullAddEventListenerSpy).to.have.not.been.called;
+      imageViewer.init(sourceElement, sourceImage);
+
+      expect(imageViewer.getImage().src).to.equal('');
     });
-  });
-
-  // Accessibility
-  it('should return focus to source element after close', () => {
-    return getImageLightbox().then(lightbox => {
-      const impl = lightbox.implementation_;
-      impl.enter_ = () => {};
-      impl.getHistory_ = () => {
-        return {
-          pop: () => {},
-          push: () => Promise.resolve(11),
-        };
+
+    it('should init to the source element with loaded image', () => {
+      const sourceImage = {
+        complete: true,
+        src: 'image1-smaller',
       };
+      imageViewer.init(sourceElement, sourceImage);
 
-      const tryFocus = sandbox.spy(dom, 'tryFocus');
+      expect(imageViewer.getImage().getAttribute('src')).to.equal(
+        'image1-smaller'
+      );
+    });
 
-      const sourceElement = doc.createElement('amp-img');
-      sourceElement.setAttribute('src', 'data:');
+    it('should reset', () => {
+      imageViewer.sourceWidth_ = 101;
+      imageViewer.sourceHeight_ = 201;
+      imageViewer.getImage().setAttribute('src', 'image1');
 
-      impl.open_({caller: sourceElement});
-      impl.close();
+      imageViewer.reset();
 
-      expect(tryFocus).to.be.calledOnce;
+      expect(imageViewer.sourceWidth_).to.equal(0);
+      expect(imageViewer.sourceHeight_).to.equal(0);
+      expect(imageViewer.getImage().getAttribute('src')).to.equal('');
+      expect(imageViewer.srcset_).to.equal(null);
+      expect(imageViewer.imageBox_.width).to.equal(0);
     });
-  });
-});
 
+    it('should measure horiz aspect ratio and assign image.src', () => {
+      imageViewer.getElement().style.width = '100px';
+      imageViewer.getElement().style.height = '200px';
+      imageViewer.srcset_ = parseSrcset('image1');
+      imageViewer.sourceWidth_ = 80;
+      imageViewer.sourceHeight_ = 60;
 
-describes.realWin('amp-image-lightbox image viewer', {
-  amp: {
-    extensions: ['amp-image-lightbox'],
-  },
-}, env => {
-  let win, doc;
-  let clock;
-  let lightbox;
-  let lightboxMock;
-  let imageViewer;
-  let loadPromiseStub;
-
-  const sourceElement = {
-    offsetWidth: 101,
-    offsetHeight: 201,
-    getAttribute: name => {
-      if (name == 'src') {
-        return 'image1';
-      }
-      return undefined;
-    },
-    hasAttribute: () => undefined,
-    getImpl: () => Promise.resolve(sourceElement.implementation_),
-  };
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    clock = lolex.install();
-
-    lightbox = {
-      getDpr: () => 1,
-      element: {
-        ownerDocument: doc,
-      },
-    };
-    lightboxMock = sandbox.mock(lightbox);
-    loadPromiseStub = sandbox.stub().returns(Promise.resolve());
+      const promise = imageViewer.measure();
 
-    sandbox.stub(Services.timerFor(win), 'promise')
-        .returns(Promise.resolve());
-    imageViewer = new ImageViewer(lightbox, win, loadPromiseStub);
-    doc.body.appendChild(imageViewer.getElement());
-  });
-
-  afterEach(() => {
-    clock.uninstall();
-    doc.body.removeChild(imageViewer.getElement());
-    lightboxMock.verify();
-  });
-
-
-  it('should have 0 initial dimensions', () => {
-    expect(imageViewer.getImage().src).to.equal('');
-    expect(imageViewer.getViewerBox().width).to.equal(0);
-    expect(imageViewer.getImageBox().width).to.equal(0);
-    expect(imageViewer.sourceWidth_).to.equal(0);
-    expect(imageViewer.sourceHeight_).to.equal(0);
-  });
-
-
-  it('should init to the source element without image', () => {
-    imageViewer.init(sourceElement, null);
-    expect(imageViewer.sourceWidth_).to.equal(101);
-    expect(imageViewer.sourceHeight_).to.equal(201);
-    expect(imageViewer.getImage().src).to.equal('');
-  });
-
-  it('should init to the source element with unloaded image', () => {
-    const sourceImage = {
-      complete: false,
-      src: 'image1-smaller',
-    };
-    imageViewer.init(sourceElement, sourceImage);
+      expect(imageViewer.viewerBox_.width).to.equal(100);
+      expect(imageViewer.viewerBox_.height).to.equal(200);
 
-    expect(imageViewer.getImage().src).to.equal('');
-  });
+      expect(imageViewer.imageBox_.width).to.equal(100);
+      expect(imageViewer.imageBox_.height).to.equal(75);
+      expect(imageViewer.imageBox_.left).to.equal(0);
+      expect(imageViewer.imageBox_.top).to.be.closeTo(62.5, 1);
 
-  it('should init to the source element with loaded image', () => {
-    const sourceImage = {
-      complete: true,
-      src: 'image1-smaller',
-    };
-    imageViewer.init(sourceElement, sourceImage);
+      expect(imageViewer.getImage().style.left).to.equal('0px');
+      expect(imageViewer.getImage().style.top).to.equal('63px');
+      expect(imageViewer.getImage().style.width).to.equal('100px');
+      expect(imageViewer.getImage().style.height).to.equal('75px');
+
+      clock.tick(10);
+      const checkSrc = () => {
+        expect(imageViewer.getImage().getAttribute('src')).to.equal('image1');
+      };
+      return promise.then(checkSrc, checkSrc);
+    });
+
+    it('should measure vert aspect ratio but small height', () => {
+      imageViewer.getElement().style.width = '100px';
+      imageViewer.getElement().style.height = '200px';
+      imageViewer.srcset_ = parseSrcset('image1');
+      imageViewer.sourceWidth_ = 80;
+      imageViewer.sourceHeight_ = 120;
+
+      imageViewer.measure();
+      expect(imageViewer.imageBox_.width).to.equal(100);
+      expect(imageViewer.imageBox_.height).to.equal(150);
+      expect(imageViewer.imageBox_.left).to.equal(0);
+      expect(imageViewer.imageBox_.top).to.be.closeTo(25, 1);
+    });
+
+    it('should measure vert aspect ratio but high height', () => {
+      imageViewer.getElement().style.width = '100px';
+      imageViewer.getElement().style.height = '200px';
+      imageViewer.srcset_ = parseSrcset('image1');
+      imageViewer.sourceWidth_ = 40;
+      imageViewer.sourceHeight_ = 100;
+
+      imageViewer.measure();
+      expect(imageViewer.imageBox_.width).to.be.closeTo(80, 1);
+      expect(imageViewer.imageBox_.height).to.equal(200);
+      expect(imageViewer.imageBox_.left).to.be.closeTo(10, 1);
+      expect(imageViewer.imageBox_.top).to.equal(0);
+    });
+
+    it('should use the load function passed in when switching images', () => {
+      expect(loadPromiseStub).to.have.not.been.called;
+      imageViewer.getElement().style.width = '100px';
+      imageViewer.getElement().style.height = '200px';
+      imageViewer.srcset_ = parseSrcset('image1');
+      imageViewer.sourceWidth_ = 80;
+      imageViewer.sourceHeight_ = 60;
+      return imageViewer.measure().then(() => {
+        expect(loadPromiseStub).to.be.calledOnce;
+      });
+    });
+  }
+);
+
+describes.realWin(
+  'amp-image-lightbox image viewer gestures',
+  {
+    amp: {
+      extensions: ['amp-image-lightbox'],
+    },
+  },
+  env => {
+    let win, doc;
+    let lightbox;
+    let lightboxMock;
+    let imageViewer;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      lightbox = {
+        getDpr: () => 1,
+        close: () => {},
+        toggleViewMode: () => {},
+        element: {
+          ownerDocument: doc,
+        },
+      };
+      lightboxMock = sandbox.mock(lightbox);
 
-    expect(imageViewer.getImage().getAttribute('src')).to
-        .equal('image1-smaller');
-  });
+      imageViewer = new ImageViewer(lightbox, win);
+      doc.body.appendChild(imageViewer.getElement());
 
-  it('should reset', () => {
-    imageViewer.sourceWidth_ = 101;
-    imageViewer.sourceHeight_ = 201;
-    imageViewer.getImage().setAttribute('src', 'image1');
+      imageViewer.getElement().style.width = '100px';
+      imageViewer.getElement().style.height = '200px';
+      imageViewer.srcset_ = parseSrcset('image1');
+      imageViewer.sourceWidth_ = 100;
+      imageViewer.sourceHeight_ = 80;
+      imageViewer.measure();
+    });
 
-    imageViewer.reset();
+    afterEach(() => {
+      doc.body.removeChild(imageViewer.getElement());
+      lightboxMock.verify();
+    });
 
-    expect(imageViewer.sourceWidth_).to.equal(0);
-    expect(imageViewer.sourceHeight_).to.equal(0);
-    expect(imageViewer.getImage().getAttribute('src')).to.equal('');
-    expect(imageViewer.srcset_).to.equal(null);
-    expect(imageViewer.imageBox_.width).to.equal(0);
-  });
+    it('should have initial bounds', () => {
+      expect(imageViewer.minX_).to.equal(0);
+      expect(imageViewer.maxX_).to.equal(0);
+      expect(imageViewer.minY_).to.equal(0);
+      expect(imageViewer.maxY_).to.equal(0);
+    });
 
+    it('should update bounds but fits Y-axis', () => {
+      imageViewer.updatePanZoomBounds_(2);
+      expect(imageViewer.minX_).to.equal(-50);
+      expect(imageViewer.maxX_).to.equal(50);
+      expect(imageViewer.minY_).to.equal(0);
+      expect(imageViewer.maxY_).to.equal(0);
+    });
 
-  it('should measure horiz aspect ratio and assign image.src', () => {
-    imageViewer.getElement().style.width = '100px';
-    imageViewer.getElement().style.height = '200px';
-    imageViewer.srcset_ = parseSrcset('image1');
-    imageViewer.sourceWidth_ = 80;
-    imageViewer.sourceHeight_ = 60;
+    it('should update bounds and covers both axis', () => {
+      imageViewer.updatePanZoomBounds_(3);
+      expect(imageViewer.minX_).to.equal(-100);
+      expect(imageViewer.maxX_).to.equal(100);
+      expect(imageViewer.minY_).to.equal(-20);
+      expect(imageViewer.maxY_).to.equal(20);
+    });
 
-    const promise = imageViewer.measure();
+    it('should pan on swipe', () => {
+      imageViewer.updatePanZoomBounds_(2);
+      imageViewer.onMove_(-25, -25, false);
 
-    expect(imageViewer.viewerBox_.width).to.equal(100);
-    expect(imageViewer.viewerBox_.height).to.equal(200);
+      // X is within the bounds and Y is within the extent.
+      expect(imageViewer.posX_).to.equal(-25);
+      expect(imageViewer.posY_).to.equal(-25);
 
-    expect(imageViewer.imageBox_.width).to.equal(100);
-    expect(imageViewer.imageBox_.height).to.equal(75);
-    expect(imageViewer.imageBox_.left).to.equal(0);
-    expect(imageViewer.imageBox_.top).to.be.closeTo(62.5, 1);
+      // Start X/Y don't change until release
+      expect(imageViewer.startX_).to.equal(0);
+      expect(imageViewer.startY_).to.equal(0);
+    });
 
-    expect(imageViewer.getImage().style.left).to.equal('0px');
-    expect(imageViewer.getImage().style.top).to.equal('63px');
-    expect(imageViewer.getImage().style.width).to.equal('100px');
-    expect(imageViewer.getImage().style.height).to.equal('75px');
+    it('should correct pan on swipe within bounds', () => {
+      imageViewer.updatePanZoomBounds_(2);
+      imageViewer.onMove_(-100, -100, false);
 
-    clock.tick(10);
-    const checkSrc = () => {
-      expect(imageViewer.getImage().getAttribute('src')).to.equal('image1');
-    };
-    return promise.then(checkSrc, checkSrc);
-  });
-
-  it('should measure vert aspect ratio but small height', () => {
-    imageViewer.getElement().style.width = '100px';
-    imageViewer.getElement().style.height = '200px';
-    imageViewer.srcset_ = parseSrcset('image1');
-    imageViewer.sourceWidth_ = 80;
-    imageViewer.sourceHeight_ = 120;
-
-    imageViewer.measure();
-    expect(imageViewer.imageBox_.width).to.equal(100);
-    expect(imageViewer.imageBox_.height).to.equal(150);
-    expect(imageViewer.imageBox_.left).to.equal(0);
-    expect(imageViewer.imageBox_.top).to.be.closeTo(25, 1);
-  });
-
-  it('should measure vert aspect ratio but high height', () => {
-    imageViewer.getElement().style.width = '100px';
-    imageViewer.getElement().style.height = '200px';
-    imageViewer.srcset_ = parseSrcset('image1');
-    imageViewer.sourceWidth_ = 40;
-    imageViewer.sourceHeight_ = 100;
-
-    imageViewer.measure();
-    expect(imageViewer.imageBox_.width).to.be.closeTo(80, 1);
-    expect(imageViewer.imageBox_.height).to.equal(200);
-    expect(imageViewer.imageBox_.left).to.be.closeTo(10, 1);
-    expect(imageViewer.imageBox_.top).to.equal(0);
-  });
-
-  it('should use the load function passed in when switching images', () => {
-    expect(loadPromiseStub).to.have.not.been.called;
-    imageViewer.getElement().style.width = '100px';
-    imageViewer.getElement().style.height = '200px';
-    imageViewer.srcset_ = parseSrcset('image1');
-    imageViewer.sourceWidth_ = 80;
-    imageViewer.sourceHeight_ = 60;
-    return imageViewer.measure().then(() => {
-      expect(loadPromiseStub).to.be.calledOnce;
+      // X and Y are constrained by the bounds.
+      expect(imageViewer.posX_).to.equal(-50);
+      expect(imageViewer.posY_).to.equal(-50);
     });
-  });
-});
 
+    it('should cancel lightbox when pulled down at scale = 1', () => {
+      lightboxMock.expects('close').once();
+      imageViewer.onMove_(0, -100, false);
+      imageViewer.onMoveRelease_(0, 0.5);
+    });
+
+    it('should zoom step', () => {
+      imageViewer.onZoomInc_(10, 10, -10, -10);
 
-describes.realWin('amp-image-lightbox image viewer gestures', {
-  amp: {
-    extensions: ['amp-image-lightbox'],
-  },
-}, env => {
-  let win, doc;
-  let lightbox;
-  let lightboxMock;
-  let imageViewer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    lightbox = {
-      getDpr: () => 1,
-      close: () => {},
-      toggleViewMode: () => {},
-      element: {
-        ownerDocument: doc,
-      },
-    };
-    lightboxMock = sandbox.mock(lightbox);
-
-    imageViewer = new ImageViewer(lightbox, win);
-    doc.body.appendChild(imageViewer.getElement());
-
-    imageViewer.getElement().style.width = '100px';
-    imageViewer.getElement().style.height = '200px';
-    imageViewer.srcset_ = parseSrcset('image1');
-    imageViewer.sourceWidth_ = 100;
-    imageViewer.sourceHeight_ = 80;
-    imageViewer.measure();
-  });
-
-  afterEach(() => {
-    doc.body.removeChild(imageViewer.getElement());
-    lightboxMock.verify();
-  });
-
-  it('should have initial bounds', () => {
-    expect(imageViewer.minX_).to.equal(0);
-    expect(imageViewer.maxX_).to.equal(0);
-    expect(imageViewer.minY_).to.equal(0);
-    expect(imageViewer.maxY_).to.equal(0);
-  });
-
-  it('should update bounds but fits Y-axis', () => {
-    imageViewer.updatePanZoomBounds_(2);
-    expect(imageViewer.minX_).to.equal(-50);
-    expect(imageViewer.maxX_).to.equal(50);
-    expect(imageViewer.minY_).to.equal(0);
-    expect(imageViewer.maxY_).to.equal(0);
-  });
-
-  it('should update bounds and covers both axis', () => {
-    imageViewer.updatePanZoomBounds_(3);
-    expect(imageViewer.minX_).to.equal(-100);
-    expect(imageViewer.maxX_).to.equal(100);
-    expect(imageViewer.minY_).to.equal(-20);
-    expect(imageViewer.maxY_).to.equal(20);
-  });
-
-
-  it('should pan on swipe', () => {
-    imageViewer.updatePanZoomBounds_(2);
-    imageViewer.onMove_(-25, -25, false);
-
-    // X is within the bounds and Y is within the extent.
-    expect(imageViewer.posX_).to.equal(-25);
-    expect(imageViewer.posY_).to.equal(-25);
-
-    // Start X/Y don't change until release
-    expect(imageViewer.startX_).to.equal(0);
-    expect(imageViewer.startY_).to.equal(0);
-  });
-
-  it('should correct pan on swipe within bounds', () => {
-    imageViewer.updatePanZoomBounds_(2);
-    imageViewer.onMove_(-100, -100, false);
-
-    // X and Y are constrained by the bounds.
-    expect(imageViewer.posX_).to.equal(-50);
-    expect(imageViewer.posY_).to.equal(-50);
-  });
-
-  it('should cancel lightbox when pulled down at scale = 1', () => {
-    lightboxMock.expects('close').once();
-    imageViewer.onMove_(0, -100, false);
-    imageViewer.onMoveRelease_(0, 0.5);
-  });
-
-
-  it('should zoom step', () => {
-    imageViewer.onZoomInc_(10, 10, -10, -10);
-
-    expect(imageViewer.posX_).to.be.closeTo(6.5, 1e-1);
-    expect(imageViewer.posY_).to.equal(0);
-    expect(imageViewer.scale_).to.be.closeTo(1.1, 1e-1);
-
-    // Start X/Y/scale don't change until release
-    expect(imageViewer.startX_).to.equal(0);
-    expect(imageViewer.startY_).to.equal(0);
-    expect(imageViewer.startScale_).to.equal(1);
-  });
-
-  it('should zoom release', () => {
-    const updateSrc = sandbox.spy();
-    imageViewer.updateSrc_ = updateSrc;
-    imageViewer.onZoomInc_(10, 10, -10, -10);
-    return imageViewer.onZoomRelease_(10, 10, -10, -10, 0, 0).then(() => {
-      expect(updateSrc).to.be.calledOnce;
       expect(imageViewer.posX_).to.be.closeTo(6.5, 1e-1);
-      expect(imageViewer.startX_).to.be.closeTo(6.5, 1e-1);
       expect(imageViewer.posY_).to.equal(0);
-      expect(imageViewer.startY_).to.equal(0);
       expect(imageViewer.scale_).to.be.closeTo(1.1, 1e-1);
-      expect(imageViewer.startScale_).to.be.closeTo(1.1, 1e-1);
+
+      // Start X/Y/scale don't change until release
+      expect(imageViewer.startX_).to.equal(0);
+      expect(imageViewer.startY_).to.equal(0);
+      expect(imageViewer.startScale_).to.equal(1);
     });
-  });
-});
+
+    it('should zoom release', () => {
+      const updateSrc = sandbox.spy();
+      imageViewer.updateSrc_ = updateSrc;
+      imageViewer.onZoomInc_(10, 10, -10, -10);
+      return imageViewer.onZoomRelease_(10, 10, -10, -10, 0, 0).then(() => {
+        expect(updateSrc).to.be.calledOnce;
+        expect(imageViewer.posX_).to.be.closeTo(6.5, 1e-1);
+        expect(imageViewer.startX_).to.be.closeTo(6.5, 1e-1);
+        expect(imageViewer.posY_).to.equal(0);
+        expect(imageViewer.startY_).to.equal(0);
+        expect(imageViewer.scale_).to.be.closeTo(1.1, 1e-1);
+        expect(imageViewer.startScale_).to.be.closeTo(1.1, 1e-1);
+      });
+    });
+  }
+);
diff --git a/extensions/amp-image-slider/0.1/amp-image-slider.js b/extensions/amp-image-slider/0.1/amp-image-slider.js
index 831a88b22632..71db76f438ea 100644
--- a/extensions/amp-image-slider/0.1/amp-image-slider.js
+++ b/extensions/amp-image-slider/0.1/amp-image-slider.js
@@ -28,7 +28,6 @@ import {listen} from '../../../src/event-helper';
 import {setStyles} from '../../../src/style';
 
 export class AmpImageSlider extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -87,12 +86,14 @@ export class AmpImageSlider extends AMP.BaseElement {
 
     // Step size on keyboard action, 0.1 = 10%
     /** @private {number} */
-    this.stepSize_ = this.element.hasAttribute('step-size') ?
-      (Number(this.element.getAttribute('step-size')) || 0.1) : 0.1;
+    this.stepSize_ = this.element.hasAttribute('step-size')
+      ? Number(this.element.getAttribute('step-size')) || 0.1
+      : 0.1;
 
     /** @private {boolean} */
-    this.shouldHintReappear_ =
-      !this.element.hasAttribute('disable-hint-reappear');
+    this.shouldHintReappear_ = !this.element.hasAttribute(
+      'disable-hint-reappear'
+    );
 
     /** @private {Gestures|null} */
     this.gestures_ = null;
@@ -118,8 +119,10 @@ export class AmpImageSlider extends AMP.BaseElement {
         } else if (!this.rightAmpImage_) {
           this.rightAmpImage_ = child;
         } else {
-          user().error('AMP-IMAGE-SLIDER',
-              'Should not contain more than 2 <amp-img>s.');
+          user().error(
+            'AMP-IMAGE-SLIDER',
+            'Should not contain more than 2 <amp-img>s.'
+          );
         }
       } else if (child.tagName.toLowerCase() === 'div') {
         if (child.hasAttribute('first')) {
@@ -127,19 +130,25 @@ export class AmpImageSlider extends AMP.BaseElement {
         } else if (child.hasAttribute('second')) {
           this.rightLabel_ = child;
         } else {
-          user().error('AMP-IMAGE-SLIDER',
-              'Should not contain <div>s without ' +
-              '"first" or "second" attributes.');
+          user().error(
+            'AMP-IMAGE-SLIDER',
+            'Should not contain <div>s without ' +
+              '"first" or "second" attributes.'
+          );
         }
       }
     }
 
-    userAssert(this.leftAmpImage_ && this.rightAmpImage_,
-        '2 <amp-img>s must be provided for comparison');
+    userAssert(
+      this.leftAmpImage_ && this.rightAmpImage_,
+      '2 <amp-img>s must be provided for comparison'
+    );
 
     // TODO(kqian): remove this after layer launch
-    if (!isExperimentOn(this.win, 'layers') ||
-        !isExperimentOn(this.win, 'layers-prioritization')) {
+    if (
+      !isExperimentOn(this.win, 'layers') ||
+      !isExperimentOn(this.win, 'layers-prioritization')
+    ) {
       // see comment in layoutCallback
       // When layers not enabled
       this.setAsOwner(dev().assertElement(this.leftAmpImage_));
@@ -155,22 +164,26 @@ export class AmpImageSlider extends AMP.BaseElement {
     this.buildHint_();
     this.checkARIA_();
 
-    this.registerAction('seekTo', invocation => {
-      const {args} = invocation;
-      if (args) {
-        if (args['percent'] !== undefined) {
-          const percent = args['percent'];
-          user().assertNumber(percent,
-              'value to seek to must be a number');
-          this.mutateElement(() => {
-            this.updatePositions_(percent);
-          });
+    this.registerAction(
+      'seekTo',
+      invocation => {
+        const {args} = invocation;
+        if (args) {
+          if (args['percent'] !== undefined) {
+            const percent = args['percent'];
+            user().assertNumber(percent, 'value to seek to must be a number');
+            this.mutateElement(() => {
+              this.updatePositions_(percent);
+            });
+          }
         }
-      }
-    }, ActionTrust.LOW);
+      },
+      ActionTrust.LOW
+    );
 
-    const initialPositionString =
-        this.element.getAttribute('initial-slider-position');
+    const initialPositionString = this.element.getAttribute(
+      'initial-slider-position'
+    );
     // TODO(kqian): move this before building child components on issue
     // This is the only step when content tree is attached to document
     return this.mutateElement(() => {
@@ -206,8 +219,9 @@ export class AmpImageSlider extends AMP.BaseElement {
 
     if (this.leftLabel_) {
       this.leftLabelWrapper_ = this.doc_.createElement('div');
-      this.leftLabelWrapper_.classList
-          .add('i-amphtml-image-slider-label-wrapper');
+      this.leftLabelWrapper_.classList.add(
+        'i-amphtml-image-slider-label-wrapper'
+      );
       this.leftLabelWrapper_.appendChild(this.leftLabel_);
       this.leftMask_.appendChild(this.leftLabelWrapper_);
     }
@@ -217,10 +231,10 @@ export class AmpImageSlider extends AMP.BaseElement {
     this.rightAmpImage_.classList.add('i-amphtml-image-slider-push-left');
     if (this.rightLabel_) {
       this.rightLabelWrapper_ = this.doc_.createElement('div');
-      this.rightLabelWrapper_.classList
-          .add('i-amphtml-image-slider-label-wrapper');
-      this.rightLabelWrapper_.classList
-          .add('i-amphtml-image-slider-push-left');
+      this.rightLabelWrapper_.classList.add(
+        'i-amphtml-image-slider-label-wrapper'
+      );
+      this.rightLabelWrapper_.classList.add('i-amphtml-image-slider-push-left');
       this.rightLabelWrapper_.appendChild(this.rightLabel_);
       this.rightMask_.appendChild(this.rightLabelWrapper_);
     }
@@ -285,42 +299,58 @@ export class AmpImageSlider extends AMP.BaseElement {
   checkARIA_() {
     const leftAmpImage = dev().assertElement(this.leftAmpImage_);
     const rightAmpImage = dev().assertElement(this.rightAmpImage_);
-    leftAmpImage.signals().whenSignal(CommonSignals.LOAD_END).then(() => {
-      if (leftAmpImage.childElementCount > 0) {
-        const img = leftAmpImage.querySelector('img');
-        let newAltText;
-        this.measureMutateElement(() => {
-          const ariaSuffix =
-            leftAmpImage.getAttribute('data-left-image-aria-suffix')
-              || 'left image';
-          if (leftAmpImage.hasAttribute('alt')) {
-            newAltText = `${leftAmpImage.getAttribute('alt')}, ${ariaSuffix}`;
-          } else {
-            newAltText = ariaSuffix;
-          }
-        }, () => {
-          img.setAttribute('alt', newAltText);
-        });
-      }
-    });
-    rightAmpImage.signals().whenSignal(CommonSignals.LOAD_END).then(() => {
-      if (rightAmpImage.childElementCount > 0) {
-        const img = rightAmpImage.querySelector('img');
-        let newAltText;
-        this.measureMutateElement(() => {
-          const ariaSuffix =
-            rightAmpImage.getAttribute('data-right-image-aria-suffix')
-              || 'right image';
-          if (rightAmpImage.hasAttribute('alt')) {
-            newAltText = `${rightAmpImage.getAttribute('alt')}, ${ariaSuffix}`;
-          } else {
-            newAltText = ariaSuffix;
-          }
-        }, () => {
-          img.setAttribute('alt', newAltText);
-        });
-      }
-    });
+    leftAmpImage
+      .signals()
+      .whenSignal(CommonSignals.LOAD_END)
+      .then(() => {
+        if (leftAmpImage.childElementCount > 0) {
+          const img = leftAmpImage.querySelector('img');
+          let newAltText;
+          this.measureMutateElement(
+            () => {
+              const ariaSuffix =
+                leftAmpImage.getAttribute('data-left-image-aria-suffix') ||
+                'left image';
+              if (leftAmpImage.hasAttribute('alt')) {
+                newAltText = `${leftAmpImage.getAttribute(
+                  'alt'
+                )}, ${ariaSuffix}`;
+              } else {
+                newAltText = ariaSuffix;
+              }
+            },
+            () => {
+              img.setAttribute('alt', newAltText);
+            }
+          );
+        }
+      });
+    rightAmpImage
+      .signals()
+      .whenSignal(CommonSignals.LOAD_END)
+      .then(() => {
+        if (rightAmpImage.childElementCount > 0) {
+          const img = rightAmpImage.querySelector('img');
+          let newAltText;
+          this.measureMutateElement(
+            () => {
+              const ariaSuffix =
+                rightAmpImage.getAttribute('data-right-image-aria-suffix') ||
+                'right image';
+              if (rightAmpImage.hasAttribute('alt')) {
+                newAltText = `${rightAmpImage.getAttribute(
+                  'alt'
+                )}, ${ariaSuffix}`;
+              } else {
+                newAltText = ariaSuffix;
+              }
+            },
+            () => {
+              img.setAttribute('alt', newAltText);
+            }
+          );
+        }
+      });
   }
 
   /**
@@ -339,8 +369,7 @@ export class AmpImageSlider extends AMP.BaseElement {
         // Disable hint reappearance timeout if needed
         this.animateHideHint_();
       }
-      this.pointerMoveX_(
-          e.data.startX + e.data.deltaX);
+      this.pointerMoveX_(e.data.startX + e.data.deltaX);
     });
 
     this.gestures_.onPointerDown(e => {
@@ -368,10 +397,10 @@ export class AmpImageSlider extends AMP.BaseElement {
    */
   animateShowHint_() {
     this.mutateElement(() => {
-      this.hintLeftBody_.classList
-          .remove('i-amphtml-image-slider-hint-hidden');
-      this.hintRightBody_.classList
-          .remove('i-amphtml-image-slider-hint-hidden');
+      this.hintLeftBody_.classList.remove('i-amphtml-image-slider-hint-hidden');
+      this.hintRightBody_.classList.remove(
+        'i-amphtml-image-slider-hint-hidden'
+      );
     });
   }
 
@@ -400,10 +429,16 @@ export class AmpImageSlider extends AMP.BaseElement {
     this.unlisten_(this.unlistenMouseMove_);
     this.unlisten_(this.unlistenMouseUp_);
 
-    this.unlistenMouseMove_ =
-        listen(this.win, 'mousemove', this.onMouseMove_.bind(this));
-    this.unlistenMouseUp_ =
-        listen(this.win, 'mouseup', this.onMouseUp_.bind(this));
+    this.unlistenMouseMove_ = listen(
+      this.win,
+      'mousemove',
+      this.onMouseMove_.bind(this)
+    );
+    this.unlistenMouseUp_ = listen(
+      this.win,
+      'mouseup',
+      this.onMouseUp_.bind(this)
+    );
 
     this.animateHideHint_();
   }
@@ -494,10 +529,16 @@ export class AmpImageSlider extends AMP.BaseElement {
     if (this.isEventRegistered) {
       return;
     }
-    this.unlistenMouseDown_ =
-        listen(this.element, 'mousedown', this.onMouseDown_.bind(this));
-    this.unlistenKeyDown_ =
-        listen(this.element, 'keydown', this.onKeyDown_.bind(this));
+    this.unlistenMouseDown_ = listen(
+      this.element,
+      'mousedown',
+      this.onMouseDown_.bind(this)
+    );
+    this.unlistenKeyDown_ = listen(
+      this.element,
+      'keydown',
+      this.onKeyDown_.bind(this)
+    );
     this.registerTouchGestures_();
     this.isEventRegistered = true;
   }
@@ -521,8 +562,7 @@ export class AmpImageSlider extends AMP.BaseElement {
    * @private
    */
   getCurrentSliderPercentage_() {
-    const {left: barLeft} =
-        this.bar_./*OK*/getBoundingClientRect();
+    const {left: barLeft} = this.bar_./*OK*/ getBoundingClientRect();
     const {left: boxLeft, width: boxWidth} = this.getLayoutBox();
     return (barLeft - boxLeft) / boxWidth;
   }
@@ -540,12 +580,16 @@ export class AmpImageSlider extends AMP.BaseElement {
       });
     } else {
       let newPercentage;
-      this.measureMutateElement(() => {
-        newPercentage = this.limitPercentage_(
-            this.getCurrentSliderPercentage_() - this.stepSize_);
-      }, () => {
-        this.updatePositions_(newPercentage);
-      });
+      this.measureMutateElement(
+        () => {
+          newPercentage = this.limitPercentage_(
+            this.getCurrentSliderPercentage_() - this.stepSize_
+          );
+        },
+        () => {
+          this.updatePositions_(newPercentage);
+        }
+      );
     }
   }
 
@@ -572,12 +616,16 @@ export class AmpImageSlider extends AMP.BaseElement {
       });
     } else {
       let newPercentage;
-      this.measureMutateElement(() => {
-        newPercentage = this.limitPercentage_(
-            this.getCurrentSliderPercentage_() + this.stepSize_);
-      }, () => {
-        this.updatePositions_(newPercentage);
-      });
+      this.measureMutateElement(
+        () => {
+          newPercentage = this.limitPercentage_(
+            this.getCurrentSliderPercentage_() + this.stepSize_
+          );
+        },
+        () => {
+          this.updatePositions_(newPercentage);
+        }
+      );
     }
   }
 
@@ -605,16 +653,19 @@ export class AmpImageSlider extends AMP.BaseElement {
       // This is to address the "snap to leftmost" bug that occurs on
       // pointer down after scrolling away and back 3+ slides
       // layoutBox is not updated correctly when first landed on page
-      this.measureMutateElement(() => {
-        const rect = this.element./*OK*/getBoundingClientRect();
-        width = rect.width;
-        left = rect.left;
-        right = rect.right;
-      }, () => {
-        const newPos = Math.max(left, Math.min(pointerX, right));
-        const newPercentage = (newPos - left) / width;
-        this.updatePositions_(newPercentage);
-      });
+      this.measureMutateElement(
+        () => {
+          const rect = this.element./*OK*/ getBoundingClientRect();
+          width = rect.width;
+          left = rect.left;
+          right = rect.right;
+        },
+        () => {
+          const newPos = Math.max(left, Math.min(pointerX, right));
+          const newPercentage = (newPos - left) / width;
+          this.updatePositions_(newPercentage);
+        }
+      );
     }
   }
 
@@ -679,19 +730,26 @@ export class AmpImageSlider extends AMP.BaseElement {
     this.registerEvents_();
 
     return Promise.all([
-      dev().assertElement(this.leftAmpImage_)
-          .signals().whenSignal(CommonSignals.LOAD_END),
-      dev().assertElement(this.rightAmpImage_)
-          .signals().whenSignal(CommonSignals.LOAD_END),
-    ]).then(() => {
-      // Notice: hints are attached after amp-img finished loading
-      this.container_.appendChild(this.hintLeftBody_);
-      this.container_.appendChild(this.hintRightBody_);
-    }, () => {
-      // Do the same thing when signal rejects
-      this.container_.appendChild(this.hintLeftBody_);
-      this.container_.appendChild(this.hintRightBody_);
-    });
+      dev()
+        .assertElement(this.leftAmpImage_)
+        .signals()
+        .whenSignal(CommonSignals.LOAD_END),
+      dev()
+        .assertElement(this.rightAmpImage_)
+        .signals()
+        .whenSignal(CommonSignals.LOAD_END),
+    ]).then(
+      () => {
+        // Notice: hints are attached after amp-img finished loading
+        this.container_.appendChild(this.hintLeftBody_);
+        this.container_.appendChild(this.hintRightBody_);
+      },
+      () => {
+        // Do the same thing when signal rejects
+        this.container_.appendChild(this.hintLeftBody_);
+        this.container_.appendChild(this.hintRightBody_);
+      }
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js b/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js
index 0c8da6448ee6..5741d03953b1 100644
--- a/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js
+++ b/extensions/amp-image-slider/0.1/test/integration/test-amp-image-slider.js
@@ -16,9 +16,10 @@
 
 import {createPointerEvent} from '../../../../../testing/test-helper';
 
-const t = describe.configure()
-    .ifChrome()
-    .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+const t = describe
+  .configure()
+  .ifChrome()
+  .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
 
 t.run('amp-image-slider', function() {
   this.timeout(20000);
@@ -67,907 +68,995 @@ t.run('amp-image-slider', function() {
 
   const extensions = ['amp-image-slider'];
 
-  describes.integration('amp-image-slider', {
-    body: sliderBody,
-    css,
-    extensions,
-  }, env => {
-    let win;
-    let doc;
-    let observer;
-    let observerTimeout;
-    let s1; // sliderInfo of slider 1
-    let s2; // sliderInfo of slider 2
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      return prep();
-    });
-
-    afterEach(() => {
-      // Just in case
-      cleanupObserver();
-    });
-
-    /* #region TESTS */
-
-    it('should build and layout', () => {
-      expect(s1.slider).to.not.be.null;
-      expect(s1.bar).to.not.be.null;
-      expect(s1.container).to.not.be.null;
-      expect(s1.leftMask).to.not.be.null;
-      expect(s1.rightMask).to.not.be.null;
-      expect(s1.leftAmpImg).to.not.be.null;
-      expect(s1.rightAmpImg).to.not.be.null;
-      expect(s1.leftLabel).to.not.be.null;
-      expect(s1.rightLabel).to.not.be.null;
-      expect(s1.leftHint).to.not.be.null;
-      expect(s1.rightHint).to.not.be.null;
-      expect(s1.leftHintArrow).to.not.be.null;
-      expect(s1.rightHintArrow).to.not.be.null;
-    });
-
-    it('should apply custom styling on labels and hints', () => {
-      expect(win.getComputedStyle(s1.leftHintArrow)['width']).to.equal('64px');
-      expect(win.getComputedStyle(s1.leftLabel)['padding']).to.equal('16px');
-    });
-
-    describe('using mouse', () => {
-      it('should move slider bar to position on mousedown', () => {
-        // Perform a mousedown
-        // eventPos == targetPos
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createMouseDownEvent,
-              pos: s1.pos.percent40,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        );
+  describes.integration(
+    'amp-image-slider',
+    {
+      body: sliderBody,
+      css,
+      extensions,
+    },
+    env => {
+      let win;
+      let doc;
+      let observer;
+      let observerTimeout;
+      let s1; // sliderInfo of slider 1
+      let s2; // sliderInfo of slider 2
+
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        return prep();
       });
 
-      it('should move slider bar to position on mousemove ' +
-        'when pointer is inside of the slider',
-      () => {
-        // Mouse down first to enable mousemove follow
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Perform a mousemove
-        // eventPos == targetPos
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: win,
-              cstr: createMouseMoveEvent,
-              pos: s1.pos.percent40,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
+      afterEach(() => {
+        // Just in case
+        cleanupObserver();
+      });
+
+      /* #region TESTS */
+
+      it('should build and layout', () => {
+        expect(s1.slider).to.not.be.null;
+        expect(s1.bar).to.not.be.null;
+        expect(s1.container).to.not.be.null;
+        expect(s1.leftMask).to.not.be.null;
+        expect(s1.rightMask).to.not.be.null;
+        expect(s1.leftAmpImg).to.not.be.null;
+        expect(s1.rightAmpImg).to.not.be.null;
+        expect(s1.leftLabel).to.not.be.null;
+        expect(s1.rightLabel).to.not.be.null;
+        expect(s1.leftHint).to.not.be.null;
+        expect(s1.rightHint).to.not.be.null;
+        expect(s1.leftHintArrow).to.not.be.null;
+        expect(s1.rightHintArrow).to.not.be.null;
+      });
+
+      it('should apply custom styling on labels and hints', () => {
+        expect(win.getComputedStyle(s1.leftHintArrow)['width']).to.equal(
+          '64px'
         );
+        expect(win.getComputedStyle(s1.leftLabel)['padding']).to.equal('16px');
       });
 
-      it('should be able to subsequently move slider bar to position ' +
-        'on mousemove when pointer inside slider, ' +
-        'after an initial mousemove', () => {
-        // Mouse down first to enable mousemove follow
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Perform a mousemove
-        return verifyPositionUpdateAfterEventDispatch(
+      describe('using mouse', () => {
+        it('should move slider bar to position on mousedown', () => {
+          // Perform a mousedown
+          // eventPos == targetPos
+          return verifyPositionUpdateAfterEventDispatch(
             /*eventConfig*/
             {
-              target: win,
-              cstr: createMouseMoveEvent,
+              target: s1.slider,
+              cstr: createMouseDownEvent,
               pos: s1.pos.percent40,
             },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Performing a second mousemove
-          return verifyPositionUpdateAfterEventDispatch(
+            /*observeTarget*/ s1.slider,
+            /*sliderInfo*/ s1,
+            /*targetPos*/ s1.pos.percent40
+          );
+        });
+
+        it(
+          'should move slider bar to position on mousemove ' +
+            'when pointer is inside of the slider',
+          () => {
+            // Mouse down first to enable mousemove follow
+            s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+            // Perform a mousemove
+            // eventPos == targetPos
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: win,
                 cstr: createMouseMoveEvent,
-                pos: s1.pos.percent50,
+                pos: s1.pos.percent40,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent50
-          );
-        });
-      });
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            );
+          }
+        );
 
-      // We are only testing mousemove here
-      // since it is impossible to invoke a mousedown on the slider
-      // outside of the slider
-      it('should cap slider bar movements on mousemove ' +
-        'that goes beyond slider boundary', () => {
-        // Mouse down first to enable mousemove follow
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Capped to 100% from left
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: win,
-              cstr: createMouseMoveEvent,
-              pos: s1.pos.percent110,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent100 // capped to right boundary
+        it(
+          'should be able to subsequently move slider bar to position ' +
+            'on mousemove when pointer inside slider, ' +
+            'after an initial mousemove',
+          () => {
+            // Mouse down first to enable mousemove follow
+            s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+            // Perform a mousemove
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: win,
+                cstr: createMouseMoveEvent,
+                pos: s1.pos.percent40,
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            ).then(() => {
+              // Performing a second mousemove
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: win,
+                  cstr: createMouseMoveEvent,
+                  pos: s1.pos.percent50,
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent50
+              );
+            });
+          }
         );
-      });
 
-      it('should allow continued slider bar movements on mousemove ' +
-        'with mouse button down, going outside of slider boundary, ' +
-        'and coming back into slider', () => {
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Goes outside of the slider
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: win,
-              cstr: createMouseMoveEvent,
-              pos: s1.pos.percent110,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent100
-        ).then(() => {
-          // Moves back into slider.
-          // Make sure subsequent mousemove still works.
-          return verifyPositionUpdateAfterEventDispatch(
+        // We are only testing mousemove here
+        // since it is impossible to invoke a mousedown on the slider
+        // outside of the slider
+        it(
+          'should cap slider bar movements on mousemove ' +
+            'that goes beyond slider boundary',
+          () => {
+            // Mouse down first to enable mousemove follow
+            s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+            // Capped to 100% from left
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: win,
                 cstr: createMouseMoveEvent,
-                pos: s1.pos.percent50,
+                pos: s1.pos.percent110,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent50
-          );
-        });
-      });
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent100 // capped to right boundary
+            );
+          }
+        );
+
+        it(
+          'should allow continued slider bar movements on mousemove ' +
+            'with mouse button down, going outside of slider boundary, ' +
+            'and coming back into slider',
+          () => {
+            s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+            // Goes outside of the slider
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: win,
+                cstr: createMouseMoveEvent,
+                pos: s1.pos.percent110,
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent100
+            ).then(() => {
+              // Moves back into slider.
+              // Make sure subsequent mousemove still works.
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: win,
+                  cstr: createMouseMoveEvent,
+                  pos: s1.pos.percent50,
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent50
+              );
+            });
+          }
+        );
 
-      it('should not move slider bar after mouse button up', () => {
-        // Mouse down first to enable mousemove follow
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Test to guarantee we are in mousemove mode
-        return verifyPositionUpdateAfterEventDispatch(
+        it('should not move slider bar after mouse button up', () => {
+          // Mouse down first to enable mousemove follow
+          s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+          // Test to guarantee we are in mousemove mode
+          return verifyPositionUpdateAfterEventDispatch(
             /*eventConfig*/
             {
               target: win,
               cstr: createMouseMoveEvent,
               pos: s1.pos.percent40,
             },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Release mouse
-          win.dispatchEvent(createMouseUpEvent(s1.pos.percent40));
-          // Should not move now
-          win.dispatchEvent(createMouseMoveEvent(s1.pos.percent50));
-          return verifyPositionAfterTimeout(
-              /*sliderInfo*/s1, /*targetPos*/s1.pos.percent40);
+            /*observeTarget*/ s1.slider,
+            /*sliderInfo*/ s1,
+            /*targetPos*/ s1.pos.percent40
+          ).then(() => {
+            // Release mouse
+            win.dispatchEvent(createMouseUpEvent(s1.pos.percent40));
+            // Should not move now
+            win.dispatchEvent(createMouseMoveEvent(s1.pos.percent50));
+            return verifyPositionAfterTimeout(
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            );
+          });
         });
-      });
 
-      it('slider bar should move with mousedown after mouseup', () => {
-        // Mouse down first to enable mousemove follow
-        s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
-        // Test to guarantee we are in mousemove mode
-        return verifyPositionUpdateAfterEventDispatch(
+        it('slider bar should move with mousedown after mouseup', () => {
+          // Mouse down first to enable mousemove follow
+          s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent50));
+          // Test to guarantee we are in mousemove mode
+          return verifyPositionUpdateAfterEventDispatch(
             /*eventConfig*/
             {
               target: win,
               cstr: createMouseMoveEvent,
               pos: s1.pos.percent40,
             },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Release mouse
-          win.dispatchEvent(createMouseUpEvent(s1.pos.percent40));
-          // Should be able to trigger mousedown again
-          return verifyPositionUpdateAfterEventDispatch(
+            /*observeTarget*/ s1.slider,
+            /*sliderInfo*/ s1,
+            /*targetPos*/ s1.pos.percent40
+          ).then(() => {
+            // Release mouse
+            win.dispatchEvent(createMouseUpEvent(s1.pos.percent40));
+            // Should be able to trigger mousedown again
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: s1.slider,
                 cstr: createMouseDownEvent,
                 pos: s1.pos.percent60,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent60
-          );
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent60
+            );
+          });
         });
       });
-    });
 
-    describe('using touchscreen', () => {
-      it('should move slider bar to position on touchstart', () => {
-        // Perform a touchstart
-        // eventPos == targetPos
-        return verifyPositionUpdateAfterEventDispatch(
+      describe('using touchscreen', () => {
+        it('should move slider bar to position on touchstart', () => {
+          // Perform a touchstart
+          // eventPos == targetPos
+          return verifyPositionUpdateAfterEventDispatch(
             /*eventConfig*/
             {
               target: s1.slider,
               cstr: createTouchStartEvent,
               pos: s1.pos.percent40,
             },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        );
-      });
+            /*observeTarget*/ s1.slider,
+            /*sliderInfo*/ s1,
+            /*targetPos*/ s1.pos.percent40
+          );
+        });
 
-      it('should move slider bar to position on touchmove ' +
-        'when pointer is inside of the slider',
-      () => {
-        // Touch start first to enable touchmove follow
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Perform a touchmove
-        // eventPos == targetPos
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createTouchMoveEvent,
-              pos: s1.pos.percent40,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
+        it(
+          'should move slider bar to position on touchmove ' +
+            'when pointer is inside of the slider',
+          () => {
+            // Touch start first to enable touchmove follow
+            s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+            // Perform a touchmove
+            // eventPos == targetPos
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createTouchMoveEvent,
+                pos: s1.pos.percent40,
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            );
+          }
         );
-      });
 
-      it('should be able to subsequently move slider bar to position ' +
-        'on touchmove when pointer inside slider, ' +
-        'after an initial touchmove', () => {
-        // Mouse down first to enable touchmove follow
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Perform a touchmove
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createTouchMoveEvent,
-              pos: s1.pos.percent40,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Performing a second touchmove
-          return verifyPositionUpdateAfterEventDispatch(
+        it(
+          'should be able to subsequently move slider bar to position ' +
+            'on touchmove when pointer inside slider, ' +
+            'after an initial touchmove',
+          () => {
+            // Mouse down first to enable touchmove follow
+            s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+            // Perform a touchmove
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: s1.slider,
                 cstr: createTouchMoveEvent,
-                pos: s1.pos.percent50,
+                pos: s1.pos.percent40,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent50
-          );
-        });
-      });
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            ).then(() => {
+              // Performing a second touchmove
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: s1.slider,
+                  cstr: createTouchMoveEvent,
+                  pos: s1.pos.percent50,
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent50
+              );
+            });
+          }
+        );
 
-      // We are only testing touchmove here
-      // since it is impossible to invoke a touchstart on the slider
-      // outside of the slider
-      it('should cap slider bar movements on touchmove ' +
-        'that goes beyond slider boundary', () => {
-        // Touch start first to enable touchmove follow
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Capped to 100% from left
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createTouchMoveEvent,
-              pos: s1.pos.percent110,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent100
+        // We are only testing touchmove here
+        // since it is impossible to invoke a touchstart on the slider
+        // outside of the slider
+        it(
+          'should cap slider bar movements on touchmove ' +
+            'that goes beyond slider boundary',
+          () => {
+            // Touch start first to enable touchmove follow
+            s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+            // Capped to 100% from left
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createTouchMoveEvent,
+                pos: s1.pos.percent110,
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent100
+            );
+          }
         );
-      });
 
-      it('should allow continued slider bar movements on touchmove ' +
-        'with touch pressed, going outside of slider boundary, ' +
-        'and coming back into slider', () => {
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Goes outside of the slider
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createTouchMoveEvent,
-              pos: s1.pos.percent110,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent100
-        ).then(() => {
-          // Moves back into slider.
-          // Make sure subsequent touchmove still works.
-          return verifyPositionUpdateAfterEventDispatch(
+        it(
+          'should allow continued slider bar movements on touchmove ' +
+            'with touch pressed, going outside of slider boundary, ' +
+            'and coming back into slider',
+          () => {
+            s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+            // Goes outside of the slider
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: s1.slider,
                 cstr: createTouchMoveEvent,
-                pos: s1.pos.percent50,
+                pos: s1.pos.percent110,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent50
-          );
-        });
-      });
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent100
+            ).then(() => {
+              // Moves back into slider.
+              // Make sure subsequent touchmove still works.
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: s1.slider,
+                  cstr: createTouchMoveEvent,
+                  pos: s1.pos.percent50,
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent50
+              );
+            });
+          }
+        );
 
-      it('should not move slider bar after touch lifted', () => {
-        // Touch start first to enable touchmove follow
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Test to guarantee we are in touchmove mode
-        return verifyPositionUpdateAfterEventDispatch(
+        it('should not move slider bar after touch lifted', () => {
+          // Touch start first to enable touchmove follow
+          s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+          // Test to guarantee we are in touchmove mode
+          return verifyPositionUpdateAfterEventDispatch(
             /*eventConfig*/
             {
               target: s1.slider,
               cstr: createTouchMoveEvent,
               pos: s1.pos.percent40,
             },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Release touch
-          s1.slider.dispatchEvent(createTouchEndEvent(s1.pos.percent40));
-          // Should not move now
-          s1.slider.dispatchEvent(createMouseMoveEvent(s1.pos.percent50));
-          return verifyPositionAfterTimeout(
-              /*sliderInfo*/s1, /*targetPos*/s1.pos.percent40);
+            /*observeTarget*/ s1.slider,
+            /*sliderInfo*/ s1,
+            /*targetPos*/ s1.pos.percent40
+          ).then(() => {
+            // Release touch
+            s1.slider.dispatchEvent(createTouchEndEvent(s1.pos.percent40));
+            // Should not move now
+            s1.slider.dispatchEvent(createMouseMoveEvent(s1.pos.percent50));
+            return verifyPositionAfterTimeout(
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            );
+          });
         });
-      });
 
-      it('slider bar should follow touchstart ' +
-        'after finishing previous touch', () => {
-        // Touch start first to enable touchmove follow
-        s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
-        // Test to guarantee we are in touchmove mode
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createTouchMoveEvent,
-              pos: s1.pos.percent40,
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
-        ).then(() => {
-          // Release touch
-          s1.slider.dispatchEvent(createTouchEndEvent(s1.pos.percent40));
-          // Should be able to trigger touchend again
-          return verifyPositionUpdateAfterEventDispatch(
+        it(
+          'slider bar should follow touchstart ' +
+            'after finishing previous touch',
+          () => {
+            // Touch start first to enable touchmove follow
+            s1.slider.dispatchEvent(createTouchStartEvent(s1.pos.percent50));
+            // Test to guarantee we are in touchmove mode
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: s1.slider,
-                cstr: createTouchStartEvent,
-                pos: s1.pos.percent60,
+                cstr: createTouchMoveEvent,
+                pos: s1.pos.percent40,
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent60
-          );
-        });
-      });
-    });
-
-    describe('using a keyboard', () => {
-      it('pressing ArrowLeft should move slider bar by 10% to the left ' +
-        'when slider is focused', () => {
-        // Focus first!
-        s1.slider.focus();
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createKeyDownEvent,
-              key: 'ArrowLeft',
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent40
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            ).then(() => {
+              // Release touch
+              s1.slider.dispatchEvent(createTouchEndEvent(s1.pos.percent40));
+              // Should be able to trigger touchend again
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: s1.slider,
+                  cstr: createTouchStartEvent,
+                  pos: s1.pos.percent60,
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent60
+              );
+            });
+          }
         );
       });
 
-      it('pressing ArrowRight should move slider bar by 10% to the right ' +
-        'when slider is focused', () => {
-        // Focus first!
-        s1.slider.focus();
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createKeyDownEvent,
-              key: 'ArrowRight',
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent60
+      describe('using a keyboard', () => {
+        it(
+          'pressing ArrowLeft should move slider bar by 10% to the left ' +
+            'when slider is focused',
+          () => {
+            // Focus first!
+            s1.slider.focus();
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createKeyDownEvent,
+                key: 'ArrowLeft',
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent40
+            );
+          }
         );
-      });
 
-      it('pressing PageUp should move slider bar to leftmost ' +
-        'when slider is focused', () => {
-        // Focus first!
-        s1.slider.focus();
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createKeyDownEvent,
-              key: 'PageUp',
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent0
+        it(
+          'pressing ArrowRight should move slider bar by 10% to the right ' +
+            'when slider is focused',
+          () => {
+            // Focus first!
+            s1.slider.focus();
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createKeyDownEvent,
+                key: 'ArrowRight',
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent60
+            );
+          }
         );
-      });
 
-      it('pressing Home should move slider bar to center ' +
-        'when slider is focused', () => {
-        // To test center, we have to focus and move slider bar
-        // to somewhere not the center initially
-        s1.slider.focus();
-        // We have to guarantee that the slider is not at center first
-        // after dispatching event. (runtime scheduling non-determinism)
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createKeyDownEvent,
-              key: 'PageUp',
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent0
-        ).then(() => {
-          // Still focused!
-          return verifyPositionUpdateAfterEventDispatch(
+        it(
+          'pressing PageUp should move slider bar to leftmost ' +
+            'when slider is focused',
+          () => {
+            // Focus first!
+            s1.slider.focus();
+            return verifyPositionUpdateAfterEventDispatch(
               /*eventConfig*/
               {
                 target: s1.slider,
                 cstr: createKeyDownEvent,
-                key: 'Home',
+                key: 'PageUp',
               },
-              /*observeTarget*/s1.slider,
-              /*sliderInfo*/s1,
-              /*targetPos*/s1.pos.percent50
-          );
-        });
-      });
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent0
+            );
+          }
+        );
 
-      it('pressing PageDown should move slider bar to rightmost ' +
-        'when slider is focused', () => {
-        // Focus first!
-        s1.slider.focus();
-        return verifyPositionUpdateAfterEventDispatch(
-            /*eventConfig*/
-            {
-              target: s1.slider,
-              cstr: createKeyDownEvent,
-              key: 'PageDown',
-            },
-            /*observeTarget*/s1.slider,
-            /*sliderInfo*/s1,
-            /*targetPos*/s1.pos.percent100
+        it(
+          'pressing Home should move slider bar to center ' +
+            'when slider is focused',
+          () => {
+            // To test center, we have to focus and move slider bar
+            // to somewhere not the center initially
+            s1.slider.focus();
+            // We have to guarantee that the slider is not at center first
+            // after dispatching event. (runtime scheduling non-determinism)
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createKeyDownEvent,
+                key: 'PageUp',
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent0
+            ).then(() => {
+              // Still focused!
+              return verifyPositionUpdateAfterEventDispatch(
+                /*eventConfig*/
+                {
+                  target: s1.slider,
+                  cstr: createKeyDownEvent,
+                  key: 'Home',
+                },
+                /*observeTarget*/ s1.slider,
+                /*sliderInfo*/ s1,
+                /*targetPos*/ s1.pos.percent50
+              );
+            });
+          }
+        );
+
+        it(
+          'pressing PageDown should move slider bar to rightmost ' +
+            'when slider is focused',
+          () => {
+            // Focus first!
+            s1.slider.focus();
+            return verifyPositionUpdateAfterEventDispatch(
+              /*eventConfig*/
+              {
+                target: s1.slider,
+                cstr: createKeyDownEvent,
+                key: 'PageDown',
+              },
+              /*observeTarget*/ s1.slider,
+              /*sliderInfo*/ s1,
+              /*targetPos*/ s1.pos.percent100
+            );
+          }
         );
-      });
 
-      it('pressing buttons should not move slider bar ' +
-        'if slider is not focused', () => {
-        // Notice that we are not focusing on the slider here
-        s1.slider.dispatchEvent(createKeyDownEvent('PageUp'));
-        // Slider bar stays at original place (center by default)
-        return verifyPositionAfterTimeout(s1, s1.pos.percent50);
+        it(
+          'pressing buttons should not move slider bar ' +
+            'if slider is not focused',
+          () => {
+            // Notice that we are not focusing on the slider here
+            s1.slider.dispatchEvent(createKeyDownEvent('PageUp'));
+            // Slider bar stays at original place (center by default)
+            return verifyPositionAfterTimeout(s1, s1.pos.percent50);
+          }
+        );
       });
-    });
-
-    it('should seekTo correct position', () => {
-      // Button for seeking to 40% from left
-      const b1 = doc.querySelector('#b1');
-      const clickButtonFunction =
-        () => b1.click();
-      const observerCallback =
-        () => hasCorrectSliderPosition(s1, s1.pos.percent40);
-      // Click the button and observe slider bar position update
-      return invokeAndObserve(
-          /*invokeFunc*/clickButtonFunction,
-          /*target*/s1.slider,
-          /*cb*/observerCallback,
-          /*opt_errorMessage*/`Failed to seek to ${s1.pos.percent40}`
-      );
-    });
-
-    describe('hint behavior', () => {
-      it('should hide hint on user interaction (e.g. mousedown)', () => {
-        const dispatchMouseDownEventFunction =
-          () => s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent40));
-        const isHintHiddenCallback =
-          () => s1.leftHint.classList
-              .contains('i-amphtml-image-slider-hint-hidden');
-        // Initially hint should be displayed
-        expect(isHintHiddenCallback()).to.be.false;
-        // Make sure hint is hidden after interaction
+
+      it('should seekTo correct position', () => {
+        // Button for seeking to 40% from left
+        const b1 = doc.querySelector('#b1');
+        const clickButtonFunction = () => b1.click();
+        const observerCallback = () =>
+          hasCorrectSliderPosition(s1, s1.pos.percent40);
+        // Click the button and observe slider bar position update
         return invokeAndObserve(
-            /*invokeFunc*/dispatchMouseDownEventFunction,
-            /*target*/s1.slider,
-            /*cb*/isHintHiddenCallback,
-            /*opt_errorMessage*/'Hint failed to be hidden'
+          /*invokeFunc*/ clickButtonFunction,
+          /*target*/ s1.slider,
+          /*cb*/ observerCallback,
+          /*opt_errorMessage*/ `Failed to seek to ${s1.pos.percent40}`
         );
       });
 
-      // TODO: (#17581)
-      // This test flakes. May require events/signals to help solve the issue.
-      it.skip('should show hint again on slider scrolling back and ' +
-        'into viewport, after hint hidden and slider scrolled out of viewport',
-      () => {
-        const dispatchMouseDownEventFunction =
-          () => s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent40));
-        const isHintHiddenCallback =
-          () => s1.leftHint.classList
-              .contains('i-amphtml-image-slider-hint-hidden');
-        // Initially hint should be displayed
-        expect(isHintHiddenCallback()).to.be.false;
-        // Make sure hint is hidden after first interaction
-        return invokeAndObserve(
-            /*invokeFunc*/dispatchMouseDownEventFunction,
-            /*target*/s1.slider,
-            /*cb*/isHintHiddenCallback,
-            /*opt_errorMessage*/'Hint failed to be hidden'
-        ).then(() => {
-          // scroll slider outside of viewport
-          win.scrollTo(0, doc.body.scrollHeight);
-          // Wait to ensure runtime notices the update.
-          // Have to use timeout(...) here,
-          // no indication of proper viewportCallback trigger
-          return timeout(500);
-        }).then(() => {
-          // scroll page to top
-          const scrollToTopFunction =
-            () => win.scrollTo(0, s1.slider.offsetTop);
-          // Notice that this checks if hint is displayed
-          const isHintDisplayedCallback = () => !isHintHiddenCallback();
-          // Hint should reappear again
-          // We use invokeAndObserve() to ensure
-          // the mutation is captured (mount observer before scrolling)
+      describe('hint behavior', () => {
+        it('should hide hint on user interaction (e.g. mousedown)', () => {
+          const dispatchMouseDownEventFunction = () =>
+            s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent40));
+          const isHintHiddenCallback = () =>
+            s1.leftHint.classList.contains(
+              'i-amphtml-image-slider-hint-hidden'
+            );
+          // Initially hint should be displayed
+          expect(isHintHiddenCallback()).to.be.false;
+          // Make sure hint is hidden after interaction
           return invokeAndObserve(
-              /*invokeFunc*/scrollToTopFunction,
-              /*target*/s1.slider,
-              /*cb*/isHintDisplayedCallback,
-              /*opt_errorMessage*/'Hint failed to reappear'
+            /*invokeFunc*/ dispatchMouseDownEventFunction,
+            /*target*/ s1.slider,
+            /*cb*/ isHintHiddenCallback,
+            /*opt_errorMessage*/ 'Hint failed to be hidden'
           );
         });
-      });
 
-      it('should not show hint again on scroll back again into viewport ' +
-        'after initial interaction, if attribute`disable-hint-reappear` ' +
-        'is present', () => {
-        // Notice we are using s2 (sliderInfo of second slider) here
-        // on s2.slider, `disable-hint-reappear` is set.
-
-        const dispatchMouseDownEventFunction =
-          () => s2.slider.dispatchEvent(createMouseDownEvent(s2.pos.percent40));
-        const isHintHiddenCallback =
-          () => s2.leftHint.classList
-              .contains('i-amphtml-image-slider-hint-hidden');
-        // Initially hint should be displayed
-        expect(isHintHiddenCallback()).to.be.false;
-        // Make sure hint is hidden after interaction
-        return invokeAndObserve(
-            /*invokeFunc*/dispatchMouseDownEventFunction,
-            /*target*/s2.slider,
-            /*cb*/isHintHiddenCallback,
-            /*opt_errorMessage*/'Hint failed to be hidden'
-        ).then(() => {
-          // scroll slider outside of viewport
-          win.scrollTo(0, doc.body.scrollHeight);
-          // Wait to ensure runtime notices the update.
-          // Have to use timeout(...) here,
-          // no indication of proper viewportCallback trigger
-          return timeout(500);
-        }).then(() => {
-          // scroll page to top
-          win.scrollTo(0, s2.slider.offsetTop);
-          // Expect hint to still be hidden
-          const expectHintHiddenCallback =
-            () => expect(isHintHiddenCallback()).to.be.true;
-          // Wait for a while, and validate that the hint is still hidden
-          return timeout(DEFAULT_TIMEOUT).then(expectHintHiddenCallback);
-        });
+        // TODO: (#17581)
+        // This test flakes. May require events/signals to help solve the issue.
+        it.skip(
+          'should show hint again on slider scrolling back and ' +
+            'into viewport, after hint hidden and slider scrolled out of viewport',
+          () => {
+            const dispatchMouseDownEventFunction = () =>
+              s1.slider.dispatchEvent(createMouseDownEvent(s1.pos.percent40));
+            const isHintHiddenCallback = () =>
+              s1.leftHint.classList.contains(
+                'i-amphtml-image-slider-hint-hidden'
+              );
+            // Initially hint should be displayed
+            expect(isHintHiddenCallback()).to.be.false;
+            // Make sure hint is hidden after first interaction
+            return invokeAndObserve(
+              /*invokeFunc*/ dispatchMouseDownEventFunction,
+              /*target*/ s1.slider,
+              /*cb*/ isHintHiddenCallback,
+              /*opt_errorMessage*/ 'Hint failed to be hidden'
+            )
+              .then(() => {
+                // scroll slider outside of viewport
+                win.scrollTo(0, doc.body.scrollHeight);
+                // Wait to ensure runtime notices the update.
+                // Have to use timeout(...) here,
+                // no indication of proper viewportCallback trigger
+                return timeout(500);
+              })
+              .then(() => {
+                // scroll page to top
+                const scrollToTopFunction = () =>
+                  win.scrollTo(0, s1.slider.offsetTop);
+                // Notice that this checks if hint is displayed
+                const isHintDisplayedCallback = () => !isHintHiddenCallback();
+                // Hint should reappear again
+                // We use invokeAndObserve() to ensure
+                // the mutation is captured (mount observer before scrolling)
+                return invokeAndObserve(
+                  /*invokeFunc*/ scrollToTopFunction,
+                  /*target*/ s1.slider,
+                  /*cb*/ isHintDisplayedCallback,
+                  /*opt_errorMessage*/ 'Hint failed to reappear'
+                );
+              });
+          }
+        );
+
+        it(
+          'should not show hint again on scroll back again into viewport ' +
+            'after initial interaction, if attribute`disable-hint-reappear` ' +
+            'is present',
+          () => {
+            // Notice we are using s2 (sliderInfo of second slider) here
+            // on s2.slider, `disable-hint-reappear` is set.
+
+            const dispatchMouseDownEventFunction = () =>
+              s2.slider.dispatchEvent(createMouseDownEvent(s2.pos.percent40));
+            const isHintHiddenCallback = () =>
+              s2.leftHint.classList.contains(
+                'i-amphtml-image-slider-hint-hidden'
+              );
+            // Initially hint should be displayed
+            expect(isHintHiddenCallback()).to.be.false;
+            // Make sure hint is hidden after interaction
+            return invokeAndObserve(
+              /*invokeFunc*/ dispatchMouseDownEventFunction,
+              /*target*/ s2.slider,
+              /*cb*/ isHintHiddenCallback,
+              /*opt_errorMessage*/ 'Hint failed to be hidden'
+            )
+              .then(() => {
+                // scroll slider outside of viewport
+                win.scrollTo(0, doc.body.scrollHeight);
+                // Wait to ensure runtime notices the update.
+                // Have to use timeout(...) here,
+                // no indication of proper viewportCallback trigger
+                return timeout(500);
+              })
+              .then(() => {
+                // scroll page to top
+                win.scrollTo(0, s2.slider.offsetTop);
+                // Expect hint to still be hidden
+                const expectHintHiddenCallback = () =>
+                  expect(isHintHiddenCallback()).to.be.true;
+                // Wait for a while, and validate that the hint is still hidden
+                return timeout(DEFAULT_TIMEOUT).then(expectHintHiddenCallback);
+              });
+          }
+        );
       });
-    });
-
-    it('should place the slider bar to 60% from left when setting ' +
-      'initial-slider-position="0.6"' , () => {
-      // 0.6 means 60% from left
-      expect(hasCorrectSliderPosition(s2, s2.pos.percent60)).to.be.true;
-    });
-
-    it('should move the slider bar by 20% on arrow key press when setting ' +
-      'step-size="0.2"' , () => {
-      // To test center, we have to focus and move slider bar
-      // to somewhere not the center initially
-      s2.slider.focus();
-      // Moving slider bar from 60% lands on 40%
-      return verifyPositionUpdateAfterEventDispatch(
-          /*eventConfig*/
-          {
-            target: s2.slider,
-            cstr: createKeyDownEvent,
-            key: 'ArrowLeft',
-          },
-          /*observeTarget*/s2.slider,
-          /*sliderInfo*/s2,
-          /*targetPos*/s2.pos.percent40
-      );
-    });
 
-    /* #endregion */
+      it(
+        'should place the slider bar to 60% from left when setting ' +
+          'initial-slider-position="0.6"',
+        () => {
+          // 0.6 means 60% from left
+          expect(hasCorrectSliderPosition(s2, s2.pos.percent60)).to.be.true;
+        }
+      );
 
-    /* #region HELPER FUNCTIONS */
+      it(
+        'should move the slider bar by 20% on arrow key press when setting ' +
+          'step-size="0.2"',
+        () => {
+          // To test center, we have to focus and move slider bar
+          // to somewhere not the center initially
+          s2.slider.focus();
+          // Moving slider bar from 60% lands on 40%
+          return verifyPositionUpdateAfterEventDispatch(
+            /*eventConfig*/
+            {
+              target: s2.slider,
+              cstr: createKeyDownEvent,
+              key: 'ArrowLeft',
+            },
+            /*observeTarget*/ s2.slider,
+            /*sliderInfo*/ s2,
+            /*targetPos*/ s2.pos.percent40
+          );
+        }
+      );
 
-    // Wait for certain ms
-    function timeout(ms) {
-      return new Promise(resolve => win.setTimeout(resolve, ms));
-    }
+      /* #endregion */
 
-    // Preparing necessary information before tests
-    function prep() {
-      return areSlidersReady()
-          .then(setup);
-    }
+      /* #region HELPER FUNCTIONS */
 
-    // Ensure sliders has been properly laid out
-    function areSlidersReady() {
-      // Guaranteed that sliders are both here
-      const slider1 = doc.getElementById('s1');
-      const slider2 = doc.getElementById('s2');
-
-      // Check if signals have been installed
-      const areSignalsInstalled = () => !!slider1.signals && !!slider2.signals;
-      // LOAD_END promises of sliders
-      const haveSlidersLoadEnded = () => {
-        return Promise.all([
-          slider1.signals().whenSignal('load-end'),
-          slider2.signals().whenSignal('load-end'),
-        ]);
-      };
-      // Start observer first to capture signal
-      const observerPromise = startObserver(
-          /*target*/doc.body,
-          /*cb*/areSignalsInstalled,
-          /*opt_errorMessage*/'signals failed to be installed on sliders'
-      );
-      // Check if signals are installed
-      // (chances are that all DOM updates have already completed)
-      if (areSignalsInstalled()) {
-        // Stop observer
-        cleanupObserver();
-        // Get promises of slider load end
-        return haveSlidersLoadEnded();
+      // Wait for certain ms
+      function timeout(ms) {
+        return new Promise(resolve => win.setTimeout(resolve, ms));
       }
-      // Wait for signals to be installed and then wait for LOAD_END
-      // During element's life cycle, there will be a lot DOM changes
-      return observerPromise.then(haveSlidersLoadEnded);
-    }
 
-    // Populate variables and create slider groups and position groups
-    function setup() {
-      const slider1 = doc.getElementById('s1');
-      const slider2 = doc.getElementById('s2');
-
-      // Creates a sliderInfo of slider
-      // sliderInfo is a collection of information of the slider
-      // including some children elements and rect information
-      function createSliderInfo(slider) {
-        const ampImgs = slider.getElementsByTagName('amp-img');
-        const labelWrappers =
-          slider.querySelectorAll('.i-amphtml-image-slider-label-wrapper');
-        const rect = slider.getBoundingClientRect();
-        const hints = slider.querySelectorAll('.i-amphtml-image-slider-hint');
-        return {
-          slider,
-          bar: slider.querySelector('.i-amphtml-image-slider-bar'),
-          container: slider.querySelector('.i-amphtml-image-slider-container'),
-          leftMask: slider.querySelector('.i-amphtml-image-slider-left-mask'),
-          rightMask: slider.querySelector('.i-amphtml-image-slider-right-mask'),
-          leftAmpImg: ampImgs[0],
-          rightAmpImg: ampImgs[1],
-          leftLabel: labelWrappers[0].firstChild,
-          rightLabel: labelWrappers[1].firstChild,
-          leftHint: hints[0],
-          rightHint: hints[1],
-          leftHintArrow: slider.querySelector('.amp-image-slider-hint-left'),
-          rightHintArrow: slider.querySelector('.amp-image-slider-hint-right'),
-          rect,
-          pos: createPositionGroup(slider), // collection of useful slider bar pos
-        };
+      // Preparing necessary information before tests
+      function prep() {
+        return areSlidersReady().then(setup);
       }
 
-      // Creates a position group
-      // A position group is a group of x position info of the current slider
-      // in forms of percentX, where 'X' is the percent of slider bar from left
-      function createPositionGroup(slider) {
-        const rect = slider.getBoundingClientRect();
-        return {
-          percent0: rect.left,
-          percent40: rect.left + 0.4 * rect.width,
-          percent50: rect.left + 0.5 * rect.width,
-          percent60: rect.left + 0.6 * rect.width,
-          percent100: rect.right,
-          percent110: rect.right + 0.1 * rect.width,
+      // Ensure sliders has been properly laid out
+      function areSlidersReady() {
+        // Guaranteed that sliders are both here
+        const slider1 = doc.getElementById('s1');
+        const slider2 = doc.getElementById('s2');
+
+        // Check if signals have been installed
+        const areSignalsInstalled = () =>
+          !!slider1.signals && !!slider2.signals;
+        // LOAD_END promises of sliders
+        const haveSlidersLoadEnded = () => {
+          return Promise.all([
+            slider1.signals().whenSignal('load-end'),
+            slider2.signals().whenSignal('load-end'),
+          ]);
         };
+        // Start observer first to capture signal
+        const observerPromise = startObserver(
+          /*target*/ doc.body,
+          /*cb*/ areSignalsInstalled,
+          /*opt_errorMessage*/ 'signals failed to be installed on sliders'
+        );
+        // Check if signals are installed
+        // (chances are that all DOM updates have already completed)
+        if (areSignalsInstalled()) {
+          // Stop observer
+          cleanupObserver();
+          // Get promises of slider load end
+          return haveSlidersLoadEnded();
+        }
+        // Wait for signals to be installed and then wait for LOAD_END
+        // During element's life cycle, there will be a lot DOM changes
+        return observerPromise.then(haveSlidersLoadEnded);
       }
 
-      s1 = createSliderInfo(slider1);
-      s2 = createSliderInfo(slider2);
-
-      // The viewport test has been flaky for quite a while
-      // A possibility is that the viewport might be high enough to keep
-      // slider always in viewport
-      const viewportHeight =
-          Math.max(doc.documentElement.clientHeight, win.innerHeight || 0);
-      const sliderHeights = slider1.offsetHeight + slider2.offsetHeight;
-      // 10 times viewport height + 2 slider height, ensure slider is out
-      doc.querySelector('#pad').style.height =
-          `${sliderHeights + 10 * viewportHeight}px`;
-    }
-
-    // A collection of convenient event calls
+      // Populate variables and create slider groups and position groups
+      function setup() {
+        const slider1 = doc.getElementById('s1');
+        const slider2 = doc.getElementById('s2');
+
+        // Creates a sliderInfo of slider
+        // sliderInfo is a collection of information of the slider
+        // including some children elements and rect information
+        function createSliderInfo(slider) {
+          const ampImgs = slider.getElementsByTagName('amp-img');
+          const labelWrappers = slider.querySelectorAll(
+            '.i-amphtml-image-slider-label-wrapper'
+          );
+          const rect = slider.getBoundingClientRect();
+          const hints = slider.querySelectorAll('.i-amphtml-image-slider-hint');
+          return {
+            slider,
+            bar: slider.querySelector('.i-amphtml-image-slider-bar'),
+            container: slider.querySelector(
+              '.i-amphtml-image-slider-container'
+            ),
+            leftMask: slider.querySelector('.i-amphtml-image-slider-left-mask'),
+            rightMask: slider.querySelector(
+              '.i-amphtml-image-slider-right-mask'
+            ),
+            leftAmpImg: ampImgs[0],
+            rightAmpImg: ampImgs[1],
+            leftLabel: labelWrappers[0].firstChild,
+            rightLabel: labelWrappers[1].firstChild,
+            leftHint: hints[0],
+            rightHint: hints[1],
+            leftHintArrow: slider.querySelector('.amp-image-slider-hint-left'),
+            rightHintArrow: slider.querySelector(
+              '.amp-image-slider-hint-right'
+            ),
+            rect,
+            pos: createPositionGroup(slider), // collection of useful slider bar pos
+          };
+        }
+
+        // Creates a position group
+        // A position group is a group of x position info of the current slider
+        // in forms of percentX, where 'X' is the percent of slider bar from left
+        function createPositionGroup(slider) {
+          const rect = slider.getBoundingClientRect();
+          return {
+            percent0: rect.left,
+            percent40: rect.left + 0.4 * rect.width,
+            percent50: rect.left + 0.5 * rect.width,
+            percent60: rect.left + 0.6 * rect.width,
+            percent100: rect.right,
+            percent110: rect.right + 0.1 * rect.width,
+          };
+        }
+
+        s1 = createSliderInfo(slider1);
+        s2 = createSliderInfo(slider2);
+
+        // The viewport test has been flaky for quite a while
+        // A possibility is that the viewport might be high enough to keep
+        // slider always in viewport
+        const viewportHeight = Math.max(
+          doc.documentElement.clientHeight,
+          win.innerHeight || 0
+        );
+        const sliderHeights = slider1.offsetHeight + slider2.offsetHeight;
+        // 10 times viewport height + 2 slider height, ensure slider is out
+        doc.querySelector('#pad').style.height = `${sliderHeights +
+          10 * viewportHeight}px`;
+      }
 
-    function createMouseDownEvent(x) {
-      return createPointerEvent('mousedown', x, 0);
-    }
+      // A collection of convenient event calls
 
-    function createMouseMoveEvent(x) {
-      return createPointerEvent('mousemove', x, 0);
-    }
+      function createMouseDownEvent(x) {
+        return createPointerEvent('mousedown', x, 0);
+      }
 
-    function createMouseUpEvent(x) {
-      return createPointerEvent('mouseup', x, 0);
-    }
+      function createMouseMoveEvent(x) {
+        return createPointerEvent('mousemove', x, 0);
+      }
 
-    function createTouchStartEvent(x) {
-      return createPointerEvent('touchstart', x, 0);
-    }
+      function createMouseUpEvent(x) {
+        return createPointerEvent('mouseup', x, 0);
+      }
 
-    function createTouchMoveEvent(x) {
-      return createPointerEvent('touchmove', x, 0);
-    }
+      function createTouchStartEvent(x) {
+        return createPointerEvent('touchstart', x, 0);
+      }
 
-    function createTouchEndEvent(x) {
-      return createPointerEvent('touchend', x, 0);
-    }
+      function createTouchMoveEvent(x) {
+        return createPointerEvent('touchmove', x, 0);
+      }
 
-    // Create a keydown event, with given key
-    function createKeyDownEvent(key) {
-      return new KeyboardEvent('keydown', {key});
-    }
+      function createTouchEndEvent(x) {
+        return createPointerEvent('touchend', x, 0);
+      }
 
-    // Check if sliderInfo (sliderInfo) is at correct position to left
-    // Uses rounded comparison to avoid float issues in some browsers
-    function hasCorrectSliderPosition(sliderInfo, leftPos) {
-      // Rounded compare
-      function isEqualRounded(v1, v2) {
-        return Math.round(v1) === Math.round(v2);
+      // Create a keydown event, with given key
+      function createKeyDownEvent(key) {
+        return new KeyboardEvent('keydown', {key});
       }
-      // Check if it is aligned based on left border position
-      function isLeftAligned(element, expectedLeftPosition) {
-        return isEqualRounded(
-            element.getBoundingClientRect().left, expectedLeftPosition);
+
+      // Check if sliderInfo (sliderInfo) is at correct position to left
+      // Uses rounded comparison to avoid float issues in some browsers
+      function hasCorrectSliderPosition(sliderInfo, leftPos) {
+        // Rounded compare
+        function isEqualRounded(v1, v2) {
+          return Math.round(v1) === Math.round(v2);
+        }
+        // Check if it is aligned based on left border position
+        function isLeftAligned(element, expectedLeftPosition) {
+          return isEqualRounded(
+            element.getBoundingClientRect().left,
+            expectedLeftPosition
+          );
+        }
+        return (
+          isLeftAligned(sliderInfo.bar, leftPos) &&
+          isLeftAligned(sliderInfo.rightMask, leftPos) &&
+          isLeftAligned(sliderInfo.leftAmpImg, sliderInfo.rect.left) &&
+          isLeftAligned(sliderInfo.rightAmpImg, sliderInfo.rect.left) &&
+          isLeftAligned(sliderInfo.leftLabel, sliderInfo.rect.left) &&
+          isLeftAligned(sliderInfo.rightLabel, sliderInfo.rect.left)
+        );
       }
-      return isLeftAligned(sliderInfo.bar, leftPos) &&
-        isLeftAligned(sliderInfo.rightMask, leftPos) &&
-        isLeftAligned(sliderInfo.leftAmpImg, sliderInfo.rect.left) &&
-        isLeftAligned(sliderInfo.rightAmpImg, sliderInfo.rect.left) &&
-        isLeftAligned(sliderInfo.leftLabel, sliderInfo.rect.left) &&
-        isLeftAligned(sliderInfo.rightLabel, sliderInfo.rect.left);
-    }
 
-    // Race an observer and a timeout
-    // Resolves if cb(mutationList) returns true before timeout
-    // Rejects if timeout
-    function startObserver(
-      target, cb, opt_errorMessage) {
-      return new Promise((resolve, reject) => {
-        observer = new win.MutationObserver(mutationList => {
-          if (cb(mutationList)) {
+      // Race an observer and a timeout
+      // Resolves if cb(mutationList) returns true before timeout
+      // Rejects if timeout
+      function startObserver(target, cb, opt_errorMessage) {
+        return new Promise((resolve, reject) => {
+          observer = new win.MutationObserver(mutationList => {
+            if (cb(mutationList)) {
+              cleanupObserver();
+              resolve();
+            }
+          });
+          observerTimeout = win.setTimeout(() => {
+            // Cancel observer when times out
             cleanupObserver();
-            resolve();
-          }
+            reject(new Error(opt_errorMessage || 'Observer times out'));
+          }, DEFAULT_TIMEOUT);
+          observer.observe(target, {attributes: true, subtree: true});
         });
-        observerTimeout = win.setTimeout(() => {
-          // Cancel observer when times out
-          cleanupObserver();
-          reject(new Error(opt_errorMessage || 'Observer times out'));
-        }, DEFAULT_TIMEOUT);
-        observer.observe(target, {attributes: true, subtree: true});
-      });
-    }
+      }
 
-    // Invoke a function and observe
-    // Guarantees that function is invoked after observer is ready
-    // Resolves if cb(mutationList) returns true
-    // Rejects if timeout
-    function invokeAndObserve(
-      invokeFunc, target, cb, opt_errorMessage) {
-      const observerPromise =
-          startObserver(target, cb,
-              opt_errorMessage);
-      // Run func only after observer setup
-      invokeFunc();
-      return observerPromise;
-    }
+      // Invoke a function and observe
+      // Guarantees that function is invoked after observer is ready
+      // Resolves if cb(mutationList) returns true
+      // Rejects if timeout
+      function invokeAndObserve(invokeFunc, target, cb, opt_errorMessage) {
+        const observerPromise = startObserver(target, cb, opt_errorMessage);
+        // Run func only after observer setup
+        invokeFunc();
+        return observerPromise;
+      }
 
-    // Cleanup the observer
-    function cleanupObserver() {
-      if (observer) {
-        win.clearTimeout(observerTimeout);
-        observerTimeout = 0;
-        observer.disconnect();
-        observer = null;
+      // Cleanup the observer
+      function cleanupObserver() {
+        if (observer) {
+          win.clearTimeout(observerTimeout);
+          observerTimeout = 0;
+          observer.disconnect();
+          observer = null;
+        }
       }
-    }
 
-    /**
-     * Dispatch a event
-     * and see if the expected targetPos is reached
-     */
-    function verifyPositionUpdateAfterEventDispatch(
-      eventConfig, observeTarget, sliderInfo, targetPos) {
-      let event;
-      // If pos is provided in eventConfig
-      // use pos as argument
-      if (eventConfig.pos !== undefined) {
-        event = new eventConfig.cstr(eventConfig.pos);
-      } else if (eventConfig.key !== undefined) {
-        // Same for eventConfig.key
-        // serves for keydown events
-        event = new eventConfig.cstr(eventConfig.key);
-      } else {
-        throw new Error('Not enough params for event construction is provided');
+      /**
+       * Dispatch a event
+       * and see if the expected targetPos is reached
+       */
+      function verifyPositionUpdateAfterEventDispatch(
+        eventConfig,
+        observeTarget,
+        sliderInfo,
+        targetPos
+      ) {
+        let event;
+        // If pos is provided in eventConfig
+        // use pos as argument
+        if (eventConfig.pos !== undefined) {
+          event = new eventConfig.cstr(eventConfig.pos);
+        } else if (eventConfig.key !== undefined) {
+          // Same for eventConfig.key
+          // serves for keydown events
+          event = new eventConfig.cstr(eventConfig.key);
+        } else {
+          throw new Error(
+            'Not enough params for event construction is provided'
+          );
+        }
+        const eventDispatchFunction = () =>
+          eventConfig.target.dispatchEvent(event);
+        const observerCallback = () =>
+          hasCorrectSliderPosition(sliderInfo, targetPos);
+
+        return invokeAndObserve(
+          eventDispatchFunction,
+          observeTarget,
+          observerCallback,
+          `Slider failed to move to ${targetPos} before observer times out.`
+        );
       }
-      const eventDispatchFunction =
-        () => eventConfig.target.dispatchEvent(event);
-      const observerCallback =
-        () => hasCorrectSliderPosition(sliderInfo, targetPos);
-
-      return invokeAndObserve(
-          eventDispatchFunction, observeTarget, observerCallback,
-          `Slider failed to move to ${targetPos} before observer times out.`);
-    }
 
-    /**
-     * Wait for a certain period of time
-     * and then check if the target position is reached.
-     */
-    function verifyPositionAfterTimeout(sliderInfo, targetPos) {
-      return timeout(DEFAULT_TIMEOUT).then(() => {
-        expect(hasCorrectSliderPosition(sliderInfo, targetPos)).to.be.true;
-      });
-    }
+      /**
+       * Wait for a certain period of time
+       * and then check if the target position is reached.
+       */
+      function verifyPositionAfterTimeout(sliderInfo, targetPos) {
+        return timeout(DEFAULT_TIMEOUT).then(() => {
+          expect(hasCorrectSliderPosition(sliderInfo, targetPos)).to.be.true;
+        });
+      }
 
-    /* #endregion */
-  });
+      /* #endregion */
+    }
+  );
 });
diff --git a/extensions/amp-image-slider/0.1/test/test-amp-image-slider.js b/extensions/amp-image-slider/0.1/test/test-amp-image-slider.js
index ee0d437f4d42..91dfd44b2c89 100644
--- a/extensions/amp-image-slider/0.1/test/test-amp-image-slider.js
+++ b/extensions/amp-image-slider/0.1/test/test-amp-image-slider.js
@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
-describes.realWin('amp-image-slider component', {
-  amp: {
-    extensions: ['amp-image-slider'],
+describes.realWin(
+  'amp-image-slider component',
+  {
+    amp: {
+      extensions: ['amp-image-slider'],
+    },
   },
-}, () => {
-  it('should pass dummy test', () => {
-  });
-});
+  () => {
+    it('should pass dummy test', () => {});
+  }
+);
diff --git a/extensions/amp-image-viewer/0.1/amp-image-viewer.js b/extensions/amp-image-viewer/0.1/amp-image-viewer.js
index f48fd7e83bfc..156adf23afa6 100644
--- a/extensions/amp-image-viewer/0.1/amp-image-viewer.js
+++ b/extensions/amp-image-viewer/0.1/amp-image-viewer.js
@@ -44,8 +44,7 @@ import {srcsetFromElement} from '../../../src/srcset';
 
 const PAN_ZOOM_CURVE_ = bezierCurve(0.4, 0, 0.2, 1.4);
 const TAG = 'amp-image-viewer';
-const ARIA_ATTRIBUTES = ['aria-label', 'aria-describedby',
-  'aria-labelledby'];
+const ARIA_ATTRIBUTES = ['aria-label', 'aria-describedby', 'aria-labelledby'];
 const DEFAULT_MAX_SCALE = 2;
 
 const ELIGIBLE_TAGS = {
@@ -54,10 +53,8 @@ const ELIGIBLE_TAGS = {
 };
 
 export class AmpImageViewer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
-
     super(element);
 
     /** @private {?Element} */
@@ -130,14 +127,15 @@ export class AmpImageViewer extends AMP.BaseElement {
     const children = this.getRealChildren();
 
     userAssert(
-        children.length == 1,
-        '%s should have its target element as its one and only child',
-        TAG);
+      children.length == 1,
+      '%s should have its target element as its one and only child',
+      TAG
+    );
     userAssert(
-        this.elementIsSupported_(children[0]),
-        '%s is not supported by %s',
-        children[0].tagName,
-        TAG
+      this.elementIsSupported_(children[0]),
+      '%s is not supported by %s',
+      children[0].tagName,
+      TAG
     );
 
     this.sourceAmpImage_ = children[0];
@@ -149,7 +147,9 @@ export class AmpImageViewer extends AMP.BaseElement {
     // TODO(sparhami) #19259 Tracks a more generic way to do this. Remove once
     // we have something better.
     const isScaled = closestAncestorElementBySelector(
-        this.element, '[i-amphtml-scale-animation]');
+      this.element,
+      '[i-amphtml-scale-animation]'
+    );
     if (isScaled) {
       return;
     }
@@ -167,7 +167,9 @@ export class AmpImageViewer extends AMP.BaseElement {
     // TODO(sparhami) #19259 Tracks a more generic way to do this. Remove once
     // we have something better.
     const isScaled = closestAncestorElementBySelector(
-        this.element, '[i-amphtml-scale-animation]');
+      this.element,
+      '[i-amphtml-scale-animation]'
+    );
     if (isScaled) {
       return Promise.resolve();
     }
@@ -191,9 +193,9 @@ export class AmpImageViewer extends AMP.BaseElement {
     }
 
     this.loadPromise_ = laidOutPromise
-        .then(() => this.init_())
-        .then(() => this.resetImageDimensions_())
-        .then(() => this.setupGestures_());
+      .then(() => this.init_())
+      .then(() => this.resetImageDimensions_())
+      .then(() => this.setupGestures_());
     return this.loadPromise_;
   }
 
@@ -258,9 +260,9 @@ export class AmpImageViewer extends AMP.BaseElement {
     }
     const expansionScale = (this.scale_ - 1) / 2;
     return moveLayoutRect(
-        expandLayoutRect(this.imageBox_, expansionScale, expansionScale),
-        this.posX_,
-        this.posY_
+      expandLayoutRect(this.imageBox_, expansionScale, expansionScale),
+      this.posX_,
+      this.posY_
     );
   }
 
@@ -285,11 +287,11 @@ export class AmpImageViewer extends AMP.BaseElement {
     const img = elementByTag(ampImg, 'img');
     this.measureElement(() => {
       if (img) {
-        this.sourceWidth_ = img.naturalWidth || ampImg./*OK*/offsetWidth;
-        this.sourceHeight_ = img.naturalHeight || ampImg./*OK*/offsetHeight;
+        this.sourceWidth_ = img.naturalWidth || ampImg./*OK*/ offsetWidth;
+        this.sourceHeight_ = img.naturalHeight || ampImg./*OK*/ offsetHeight;
       } else {
-        this.sourceWidth_ = ampImg./*OK*/offsetWidth;
-        this.sourceHeight_ = ampImg./*OK*/offsetHeight;
+        this.sourceWidth_ = ampImg./*OK*/ offsetWidth;
+        this.sourceHeight_ = ampImg./*OK*/ offsetHeight;
       }
     });
   }
@@ -333,33 +335,40 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   measure_() {
-    this.elementBox_ = layoutRectFromDomRect(this.element
-        ./*OK*/getBoundingClientRect());
+    this.elementBox_ = layoutRectFromDomRect(
+      this.element./*OK*/ getBoundingClientRect()
+    );
 
     const sourceAspectRatio = this.sourceWidth_ / this.sourceHeight_;
-    let height = Math.min(this.elementBox_.width / sourceAspectRatio,
-        this.elementBox_.height);
-    let width = Math.min(this.elementBox_.height * sourceAspectRatio,
-        this.elementBox_.width);
+    let height = Math.min(
+      this.elementBox_.width / sourceAspectRatio,
+      this.elementBox_.height
+    );
+    let width = Math.min(
+      this.elementBox_.height * sourceAspectRatio,
+      this.elementBox_.width
+    );
 
-    if (Math.abs(width - this.sourceWidth_) <= 16
-    && Math.abs(height - this.sourceHeight_ <= 16)) {
+    if (
+      Math.abs(width - this.sourceWidth_) <= 16 &&
+      Math.abs(height - this.sourceHeight_ <= 16)
+    ) {
       width = this.sourceWidth_;
       height = this.sourceHeight_;
     }
 
     this.imageBox_ = layoutRectLtwh(
-        Math.round((this.elementBox_.width - width) / 2),
-        Math.round((this.elementBox_.height - height) / 2),
-        Math.round(width),
-        Math.round(height));
+      Math.round((this.elementBox_.width - width) / 2),
+      Math.round((this.elementBox_.height - height) / 2),
+      Math.round(width),
+      Math.round(height)
+    );
 
     // Adjust max scale to at least fit the screen.
-    const elementBoxRatio = this.elementBox_.width /
-     this.elementBox_.height;
+    const elementBoxRatio = this.elementBox_.width / this.elementBox_.height;
     const maxScale = Math.max(
-        elementBoxRatio / sourceAspectRatio,
-        sourceAspectRatio / elementBoxRatio
+      elementBoxRatio / sourceAspectRatio,
+      sourceAspectRatio / elementBoxRatio
     );
     this.maxScale_ = Math.max(DEFAULT_MAX_SCALE, maxScale);
 
@@ -376,21 +385,23 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @return {!Promise}
    */
   resetImageDimensions_() {
-    return this.measureElement(() => this.measure_()).then(() => {
-      const image = dev().assertElement(this.image_);
-      return this.mutateElement(() => {
-        // Set the actual dimensions of the image
-        setStyles(image, {
-          top: st.px(this.imageBox_.top),
-          left: st.px(this.imageBox_.left),
-          width: st.px(this.imageBox_.width),
-          height: st.px(this.imageBox_.height),
-        });
-
-        // Update translation and scaling
-        this.updatePanZoom_();
-      },image);
-    }).then(() => this.updateSrc_());
+    return this.measureElement(() => this.measure_())
+      .then(() => {
+        const image = dev().assertElement(this.image_);
+        return this.mutateElement(() => {
+          // Set the actual dimensions of the image
+          setStyles(image, {
+            top: st.px(this.imageBox_.top),
+            left: st.px(this.imageBox_.left),
+            width: st.px(this.imageBox_.width),
+            height: st.px(this.imageBox_.height),
+          });
+
+          // Update translation and scaling
+          this.updatePanZoom_();
+        }, image);
+      })
+      .then(() => this.updateSrc_());
   }
 
   /**
@@ -403,8 +414,8 @@ export class AmpImageViewer extends AMP.BaseElement {
     }
     this.maxSeenScale_ = Math.max(this.maxSeenScale_, this.scale_);
     const width = Math.max(
-        this.imageBox_.width * this.maxSeenScale_,
-        this.sourceWidth_
+      this.imageBox_.width * this.maxSeenScale_,
+      this.sourceWidth_
     );
     const src = this.srcset_.select(width, this.getDpr());
     if (src == this.image_.getAttribute('src')) {
@@ -431,8 +442,8 @@ export class AmpImageViewer extends AMP.BaseElement {
     this.gestures_.onGesture(DoubletapRecognizer, gesture => {
       const {data} = gesture;
       const newScale = this.scale_ == 1 ? this.maxScale_ : this.minScale_;
-      const deltaX = (this.elementBox_.width / 2) - data.clientX;
-      const deltaY = (this.elementBox_.height / 2) - data.clientY;
+      const deltaX = this.elementBox_.width / 2 - data.clientX;
+      const deltaY = this.elementBox_.height / 2 - data.clientY;
       this.onZoom_(newScale, deltaX, deltaY, true).then(() => {
         return this.onZoomRelease_();
       });
@@ -447,18 +458,33 @@ export class AmpImageViewer extends AMP.BaseElement {
 
     this.gestures_.onGesture(TapzoomRecognizer, gesture => {
       const {data} = gesture;
-      this.onTapZoom_(data.centerClientX, data.centerClientY,
-          data.deltaX, data.deltaY);
+      this.onTapZoom_(
+        data.centerClientX,
+        data.centerClientY,
+        data.deltaX,
+        data.deltaY
+      );
       if (data.last) {
-        this.onTapZoomRelease_(data.centerClientX, data.centerClientY,
-            data.deltaX, data.deltaY, data.velocityY, data.velocityY);
+        this.onTapZoomRelease_(
+          data.centerClientX,
+          data.centerClientY,
+          data.deltaX,
+          data.deltaY,
+          data.velocityY,
+          data.velocityY
+        );
       }
     });
 
     this.gestures_.onGesture(PinchRecognizer, gesture => {
       const {data} = gesture;
-      this.onPinchZoom_(data.centerClientX, data.centerClientY,
-          data.deltaX, data.deltaY, data.dir);
+      this.onPinchZoom_(
+        data.centerClientX,
+        data.centerClientY,
+        data.deltaX,
+        data.deltaY,
+        data.dir
+      );
       if (data.last) {
         this.onZoomRelease_();
       }
@@ -470,12 +496,7 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   propagateClickEvent_(target) {
-    const event = createCustomEvent(
-        this.win,
-        'click',
-        null,
-        {bubbles: true}
-    );
+    const event = createCustomEvent(this.win, 'click', null, {bubbles: true});
     target.dispatchEvent(event);
   }
 
@@ -486,14 +507,16 @@ export class AmpImageViewer extends AMP.BaseElement {
    */
   onZoomedIn_() {
     // Movable.
-    this.unlistenOnSwipePan_ = this.gestures_
-        .onGesture(SwipeXYRecognizer, gesture => {
-          const {data} = gesture;
-          this.onMove_(data.deltaX, data.deltaY, false);
-          if (data.last) {
-            this.onMoveRelease_(data.velocityX, data.velocityY);
-          }
-        });
+    this.unlistenOnSwipePan_ = this.gestures_.onGesture(
+      SwipeXYRecognizer,
+      gesture => {
+        const {data} = gesture;
+        this.onMove_(data.deltaX, data.deltaY, false);
+        if (data.last) {
+          this.onMoveRelease_(data.velocityX, data.velocityY);
+        }
+      }
+    );
 
     this.unlistenOnClickHaltMotion_ = this.gestures_.onPointerDown(() => {
       if (this.motion_) {
@@ -541,8 +564,12 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   boundScale_(s, allowExtent) {
-    return this.boundValue_(s, this.minScale_, this.maxScale_,
-        allowExtent ? 0.25 : 0);
+    return this.boundValue_(
+      s,
+      this.minScale_,
+      this.maxScale_,
+      allowExtent ? 0.25 : 0
+    );
   }
 
   /**
@@ -553,8 +580,12 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   boundX_(x, allowExtent) {
-    return this.boundValue_(x, this.minX_, this.maxX_,
-        allowExtent && this.scale_ > 1 ? this.elementBox_.width * 0.25 : 0);
+    return this.boundValue_(
+      x,
+      this.minX_,
+      this.maxX_,
+      allowExtent && this.scale_ > 1 ? this.elementBox_.width * 0.25 : 0
+    );
   }
 
   /**
@@ -565,8 +596,12 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   boundY_(y, allowExtent) {
-    return this.boundValue_(y, this.minY_, this.maxY_,
-        allowExtent ? this.elementBox_.height * 0.25 : 0);
+    return this.boundValue_(
+      y,
+      this.minY_,
+      this.maxY_,
+      allowExtent ? this.elementBox_.height * 0.25 : 0
+    );
   }
 
   /**
@@ -579,7 +614,7 @@ export class AmpImageViewer extends AMP.BaseElement {
   updatePanZoomBounds_(scale) {
     let maxY = 0;
     let minY = 0;
-    const dh = this.elementBox_.height - (this.imageBox_.height * scale);
+    const dh = this.elementBox_.height - this.imageBox_.height * scale;
     if (dh >= 0) {
       minY = maxY = 0;
     } else {
@@ -589,7 +624,7 @@ export class AmpImageViewer extends AMP.BaseElement {
 
     let maxX = 0;
     let minX = 0;
-    const dw = this.elementBox_.width - (this.imageBox_.width * scale);
+    const dw = this.elementBox_.width - this.imageBox_.width * scale;
     if (dw >= 0) {
       minX = maxX = 0;
     } else {
@@ -609,8 +644,8 @@ export class AmpImageViewer extends AMP.BaseElement {
    */
   updatePanZoom_() {
     setStyles(dev().assertElement(this.image_), {
-      transform: st.translate(this.posX_, this.posY_) +
-          ' ' + st.scale(this.scale_),
+      transform:
+        st.translate(this.posX_, this.posY_) + ' ' + st.scale(this.scale_),
     });
   }
 
@@ -636,19 +671,26 @@ export class AmpImageViewer extends AMP.BaseElement {
    */
   onMoveRelease_(veloX, veloY) {
     // Continue motion.
-    this.motion_ = continueMotion(dev().assertElement(this.image_),
-        this.posX_, this.posY_, veloX, veloY,
-        (x, y) => {
-          const newPosX = this.boundX_(x, false);
-          const newPosY = this.boundY_(y, false);
-          if (Math.abs(newPosX - this.posX_) < 1 &&
-                Math.abs(newPosY - this.posY_) < 1) {
-            // Hit the wall: stop motion.
-            return false;
-          }
-          this.set_(this.scale_, newPosX, newPosY, false);
-          return true;
-        });
+    this.motion_ = continueMotion(
+      dev().assertElement(this.image_),
+      this.posX_,
+      this.posY_,
+      veloX,
+      veloY,
+      (x, y) => {
+        const newPosX = this.boundX_(x, false);
+        const newPosY = this.boundY_(y, false);
+        if (
+          Math.abs(newPosX - this.posX_) < 1 &&
+          Math.abs(newPosY - this.posY_) < 1
+        ) {
+          // Hit the wall: stop motion.
+          return false;
+        }
+        this.set_(this.scale_, newPosX, newPosY, false);
+        return true;
+      }
+    );
 
     // Snap back.
     this.motion_.thenAlways(() => {
@@ -679,8 +721,10 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @private
    */
   onTapZoom_(centerClientX, centerClientY, deltaX, deltaY) {
-    const dir = Math.abs(deltaY) > Math.abs(deltaX) ?
-      Math.sign(deltaY) : Math.sign(-deltaX);
+    const dir =
+      Math.abs(deltaY) > Math.abs(deltaX)
+        ? Math.sign(deltaY)
+        : Math.sign(-deltaX);
     this.zoomToPoint_(centerClientX, centerClientY, deltaX, deltaY, dir);
   }
 
@@ -698,10 +742,10 @@ export class AmpImageViewer extends AMP.BaseElement {
     if (dir == 0) {
       return;
     }
-    const dist = Math.sqrt((deltaX * deltaX) + (deltaY * deltaY));
-    const newScale = this.startScale_ * (1 + (dir * dist / 100));
-    const deltaCenterX = (this.elementBox_.width / 2) - centerClientX;
-    const deltaCenterY = (this.elementBox_.height / 2) - centerClientY;
+    const dist = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+    const newScale = this.startScale_ * (1 + (dir * dist) / 100);
+    const deltaCenterX = this.elementBox_.width / 2 - centerClientX;
+    const deltaCenterY = this.elementBox_.height / 2 - centerClientY;
     deltaX = Math.min(deltaCenterX, deltaCenterX * (dist / 100));
     deltaY = Math.min(deltaCenterY, deltaCenterY * (dist / 100));
     this.onZoom_(newScale, deltaX, deltaY, false);
@@ -724,10 +768,14 @@ export class AmpImageViewer extends AMP.BaseElement {
 
     this.updatePanZoomBounds_(newScale);
 
-    const newPosX = this.boundX_(this.startX_ + (deltaX * newScale), false);
-    const newPosY = this.boundY_(this.startY_ + (deltaY * newScale), false);
-    return /** @type {!Promise|undefined} */ (
-      this.set_(newScale, newPosX, newPosY, animate));
+    const newPosX = this.boundX_(this.startX_ + deltaX * newScale, false);
+    const newPosY = this.boundY_(this.startY_ + deltaY * newScale, false);
+    return /** @type {!Promise|undefined} */ (this.set_(
+      newScale,
+      newPosX,
+      newPosY,
+      animate
+    ));
   }
 
   /**
@@ -742,18 +790,29 @@ export class AmpImageViewer extends AMP.BaseElement {
    * @return {!Promise}
    * @private
    */
-  onTapZoomRelease_(centerClientX, centerClientY,
-    deltaX, deltaY, veloX, veloY) {
+  onTapZoomRelease_(
+    centerClientX,
+    centerClientY,
+    deltaX,
+    deltaY,
+    veloX,
+    veloY
+  ) {
     let promise;
     if (veloX == 0 && veloY == 0) {
       promise = Promise.resolve();
     } else {
-      promise = continueMotion(dev().assertElement(this.image_),
-          deltaX, deltaY, veloX, veloY,
-          (x, y) => {
-            this.onTapZoom_(centerClientX, centerClientY, x, y);
-            return true;
-          }).thenAlways();
+      promise = continueMotion(
+        dev().assertElement(this.image_),
+        deltaX,
+        deltaY,
+        veloX,
+        veloY,
+        (x, y) => {
+          this.onTapZoom_(centerClientX, centerClientY, x, y);
+          return true;
+        }
+      ).thenAlways();
     }
     return promise.then(() => {
       this.onZoomRelease_();
@@ -794,14 +853,18 @@ export class AmpImageViewer extends AMP.BaseElement {
     const ds = newScale - this.scale_;
     const dx = newPosX - this.posX_;
     const dy = newPosY - this.posY_;
-    const dist = Math.sqrt((dx * dx) + (dy * dy));
+    const dist = Math.sqrt(dx * dx + dy * dy);
 
     let dur = 0;
     if (animate) {
       const maxDur = 250;
-      dur = Math.min(maxDur, Math.max(
+      dur = Math.min(
+        maxDur,
+        Math.max(
           maxDur * dist * 0.01, // Moving component.
-          maxDur * Math.abs(ds))); // Zooming component.
+          maxDur * Math.abs(ds)
+        )
+      ); // Zooming component.
     }
 
     let promise;
@@ -812,12 +875,17 @@ export class AmpImageViewer extends AMP.BaseElement {
       const xFunc = tr.numeric(this.posX_, newPosX);
       /** @const {!TransitionDef<number>} */
       const yFunc = tr.numeric(this.posY_, newPosY);
-      promise = Animation.animate(dev().assertElement(this.image_), time => {
-        this.scale_ = scaleFunc(time);
-        this.posX_ = xFunc(time);
-        this.posY_ = yFunc(time);
-        this.updatePanZoom_();
-      }, dur, PAN_ZOOM_CURVE_).thenAlways(() => {
+      promise = Animation.animate(
+        dev().assertElement(this.image_),
+        time => {
+          this.scale_ = scaleFunc(time);
+          this.posX_ = xFunc(time);
+          this.posY_ = yFunc(time);
+          this.updatePanZoom_();
+        },
+        dur,
+        PAN_ZOOM_CURVE_
+      ).thenAlways(() => {
         this.scale_ = newScale;
         this.posX_ = newPosX;
         this.posY_ = newPosY;
@@ -848,8 +916,8 @@ export class AmpImageViewer extends AMP.BaseElement {
     if (newScale != this.scale_) {
       this.updatePanZoomBounds_(newScale);
     }
-    const newPosX = this.boundX_(this.posX_ / this.scale_ * newScale, false);
-    const newPosY = this.boundY_(this.posY_ / this.scale_ * newScale, false);
+    const newPosX = this.boundX_((this.posX_ / this.scale_) * newScale, false);
+    const newPosY = this.boundY_((this.posY_ / this.scale_) * newScale, false);
     return this.set_(newScale, newPosX, newPosY, true).then(() => {
       this.startScale_ = this.scale_;
       this.startX_ = this.posX_;
diff --git a/extensions/amp-imgur/0.1/amp-imgur.js b/extensions/amp-imgur/0.1/amp-imgur.js
index 60178811712d..c3c75ddb6eae 100644
--- a/extensions/amp-imgur/0.1/amp-imgur.js
+++ b/extensions/amp-imgur/0.1/amp-imgur.js
@@ -15,17 +15,17 @@
  */
 
 /**
-  * @fileoverview Embeds a imgur
-  * Example:
-  * <code>
-  * <amp-imgur
-  *   layout="reponsive"
-  *   width="540"
-  *   height="663"
-  *   data-imgur-id="f462IUj">
-  * </amp-imgur>
-  * </code>
-  */
+ * @fileoverview Embeds a imgur
+ * Example:
+ * <code>
+ * <amp-imgur
+ *   layout="reponsive"
+ *   width="540"
+ *   height="663"
+ *   data-imgur-id="f462IUj">
+ * </amp-imgur>
+ * </code>
+ */
 
 import {getData, listen} from '../../../src/event-helper';
 import {isLayoutSizeDefined} from '../../../src/layout';
@@ -36,7 +36,6 @@ import {tryParseJson} from '../../../src/json';
 import {userAssert} from '../../../src/log';
 
 export class AmpImgur extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -59,9 +58,10 @@ export class AmpImgur extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.imgurid_ = userAssert(
-        this.element.getAttribute('data-imgur-id'),
-        'The data-imgur-id attribute is required for <amp-imgur> %s',
-        this.element);
+      this.element.getAttribute('data-imgur-id'),
+      'The data-imgur-id attribute is required for <amp-imgur> %s',
+      this.element
+    );
   }
 
   /** @override */
@@ -70,17 +70,19 @@ export class AmpImgur extends AMP.BaseElement {
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleImgurMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleImgurMessages_.bind(this)
     );
 
     iframe.setAttribute('scrolling', 'no');
     iframe.setAttribute('frameborder', '0');
     iframe.setAttribute('allowfullscreen', 'true');
 
-    iframe.src = 'https://imgur.com/' +
-      encodeURIComponent(this.imgurid_) + '/embed?pub=true';
+    iframe.src =
+      'https://imgur.com/' +
+      encodeURIComponent(this.imgurid_) +
+      '/embed?pub=true';
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
     return this.loadPromise(iframe);
@@ -91,13 +93,20 @@ export class AmpImgur extends AMP.BaseElement {
    * @private
    * */
   handleImgurMessages_(event) {
-    if (event.origin != 'https://imgur.com' ||
-        event.source != this.iframe_.contentWindow) {
+    if (
+      event.origin != 'https://imgur.com' ||
+      event.source != this.iframe_.contentWindow
+    ) {
       return;
     }
     const eventData = getData(event);
-    if (!eventData || !(isObject(eventData)
-        || startsWith(/** @type {string} */ (eventData), '{'))) {
+    if (
+      !eventData ||
+      !(
+        isObject(eventData) ||
+        startsWith(/** @type {string} */ (eventData), '{')
+      )
+    ) {
       return;
     }
     const data = isObject(eventData) ? eventData : tryParseJson(eventData);
@@ -120,7 +129,6 @@ export class AmpImgur extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-imgur', '0.1', AMP => {
   AMP.registerElement('amp-imgur', AmpImgur);
 });
diff --git a/extensions/amp-imgur/0.1/test/test-amp-imgur.js b/extensions/amp-imgur/0.1/test/test-amp-imgur.js
index fb7ee8d52bfb..3d469abb6fff 100644
--- a/extensions/amp-imgur/0.1/test/test-amp-imgur.js
+++ b/extensions/amp-imgur/0.1/test/test-amp-imgur.js
@@ -16,74 +16,81 @@
 
 import '../amp-imgur';
 
-
-describes.realWin('amp-imgur', {
-  amp: {
-    extensions: ['amp-imgur'],
+describes.realWin(
+  'amp-imgur',
+  {
+    amp: {
+      extensions: ['amp-imgur'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getIns(imgurId) {
-    const ins = doc.createElement('amp-imgur');
-    ins.setAttribute('data-imgur-id', imgurId);
-    ins.setAttribute('width', '1');
-    ins.setAttribute('height', '1');
-    ins.setAttribute('layout', 'responsive');
-    doc.body.appendChild(ins);
-    return ins.build().then(() => ins.layoutCallback()).then(() => ins);
-  }
+    function getIns(imgurId) {
+      const ins = doc.createElement('amp-imgur');
+      ins.setAttribute('data-imgur-id', imgurId);
+      ins.setAttribute('width', '1');
+      ins.setAttribute('height', '1');
+      ins.setAttribute('layout', 'responsive');
+      doc.body.appendChild(ins);
+      return ins
+        .build()
+        .then(() => ins.layoutCallback())
+        .then(() => ins);
+    }
 
-  function testIframe(iframe) {
-    expect(iframe).to.not.be.null;
-    expect(iframe.src).to.equal('https://imgur.com/2CnX7/embed?pub=true');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-  }
+    function testIframe(iframe) {
+      expect(iframe).to.not.be.null;
+      expect(iframe.src).to.equal('https://imgur.com/2CnX7/embed?pub=true');
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    }
 
-  it('renders', () => {
-    return getIns('2CnX7').then(ins => {
-      testIframe(ins.querySelector('iframe'));
+    it('renders', () => {
+      return getIns('2CnX7').then(ins => {
+        testIframe(ins.querySelector('iframe'));
+      });
     });
-  });
 
-  it('resizes with JSON String message', () => {
-    return getIns('2CnX7').then(ins => {
-      const impl = ins.implementation_;
-      const changeHeightSpy = sandbox.spy(impl, 'attemptChangeHeight');
-      expect(changeHeightSpy).not.to.have.been.called;
-      const event = {
-        origin: 'https://imgur.com',
-        source: impl.iframe_.contentWindow,
-        data: '{"message":"resize_imgur","href":"https://imgur.com/2CnX7/embed?pub=true","height":396,"width":1400,"context":true}',
-      };
-      impl.handleImgurMessages_(event);
-      expect(changeHeightSpy).to.have.been.calledWith(396);
+    it('resizes with JSON String message', () => {
+      return getIns('2CnX7').then(ins => {
+        const impl = ins.implementation_;
+        const changeHeightSpy = sandbox.spy(impl, 'attemptChangeHeight');
+        expect(changeHeightSpy).not.to.have.been.called;
+        const event = {
+          origin: 'https://imgur.com',
+          source: impl.iframe_.contentWindow,
+          data:
+            '{"message":"resize_imgur","href":"https://imgur.com/2CnX7/embed?pub=true","height":396,"width":1400,"context":true}',
+        };
+        impl.handleImgurMessages_(event);
+        expect(changeHeightSpy).to.have.been.calledWith(396);
+      });
     });
-  });
 
-  it('resizes with JSON Object message', () => {
-    return getIns('2CnX7').then(ins => {
-      const impl = ins.implementation_;
-      const changeHeightSpy = sandbox.spy(impl, 'attemptChangeHeight');
-      expect(changeHeightSpy).not.to.have.been.called;
-      const event = {
-        origin: 'https://imgur.com',
-        source: impl.iframe_.contentWindow,
-        data: {
-          'message': 'resize_imgur',
-          'href': 'https://imgur.com/2CnX7/embed?pub=true',
-          'height': 400,
-          'width': 1400,
-          'context': true,
-        },
-      };
-      impl.handleImgurMessages_(event);
-      expect(changeHeightSpy).to.have.been.calledWith(400);
+    it('resizes with JSON Object message', () => {
+      return getIns('2CnX7').then(ins => {
+        const impl = ins.implementation_;
+        const changeHeightSpy = sandbox.spy(impl, 'attemptChangeHeight');
+        expect(changeHeightSpy).not.to.have.been.called;
+        const event = {
+          origin: 'https://imgur.com',
+          source: impl.iframe_.contentWindow,
+          data: {
+            'message': 'resize_imgur',
+            'href': 'https://imgur.com/2CnX7/embed?pub=true',
+            'height': 400,
+            'width': 1400,
+            'context': true,
+          },
+        };
+        impl.handleImgurMessages_(event);
+        expect(changeHeightSpy).to.have.been.calledWith(400);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-inputmask/0.1/amp-inputmask.js b/extensions/amp-inputmask/0.1/amp-inputmask.js
index 33650f48e845..12fdd12451c7 100644
--- a/extensions/amp-inputmask/0.1/amp-inputmask.js
+++ b/extensions/amp-inputmask/0.1/amp-inputmask.js
@@ -34,7 +34,10 @@ export class AmpInputmaskService {
 
     /** @const */
     this.domUpdateUnlistener_ = listen(
-        this.ampdoc.getRootNode(), AmpEvents.DOM_UPDATE, () => this.install());
+      this.ampdoc.getRootNode(),
+      AmpEvents.DOM_UPDATE,
+      () => this.install()
+    );
   }
 
   /**
diff --git a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
index b36117d8b3ca..19f1c079e6ff 100644
--- a/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
+++ b/extensions/amp-inputmask/0.1/inputmask-custom-alias.js
@@ -58,8 +58,8 @@ export function getAliasDefinition() {
         const trimZeros = opts['trimZeros'] || 0;
 
         const processedValue = value
-            .replace(new RegExp(`^0{0,${trimZeros}}`), '')
-            .replace(/[\s]/g, '');
+          .replace(new RegExp(`^0{0,${trimZeros}}`), '')
+          .replace(/[\s]/g, '');
 
         return removePrefix(processedValue, prefixes);
       },
@@ -81,7 +81,7 @@ export const prefixRe = /^([^\*\[\]a\?9\\]+)[\*\[\]a\?9\\]/i;
  * @private visible for testing
  */
 export function getPrefixSubsets(mask) {
-  const masks = (typeof mask == 'string' ? [mask] : mask);
+  const masks = typeof mask == 'string' ? [mask] : mask;
 
   const prefixes = {};
   for (let i = 0; i < masks.length; i++) {
@@ -92,9 +92,11 @@ export function getPrefixSubsets(mask) {
     // The array of subprefixes grows with the factorial of prefix.length
     // so we cap it at 5! = 120
     if (prefix.length > 5) {
-      user().warn('AMP-INPUTMASK',
-          'amp-inputmask does not support prefix trimming for masks ' +
-          'that start with more than 5 non-mask characters.');
+      user().warn(
+        'AMP-INPUTMASK',
+        'amp-inputmask does not support prefix trimming for masks ' +
+          'that start with more than 5 non-mask characters.'
+      );
       continue;
     }
 
@@ -138,8 +140,8 @@ export function getMaskPrefix(mask) {
  */
 export function removePrefix(value, prefixes) {
   const longestPrefix = prefixes
-      .filter(prefix => startsWith(value, prefix))
-      .sort((a, b) => b.length - a.length)[0];
+    .filter(prefix => startsWith(value, prefix))
+    .sort((a, b) => b.length - a.length)[0];
 
   if (longestPrefix) {
     return value.slice(longestPrefix.length);
diff --git a/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js b/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
index ceb0a2964037..095316ad5da8 100644
--- a/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
+++ b/extensions/amp-inputmask/0.1/inputmask-payment-card-alias.js
@@ -24,38 +24,40 @@ import {dict} from '../../../src/utils/object';
 export function factory(Inputmask) {
   // TODO(cvializ): Improve card chunking support
   // https://baymard.com/checkout-usability/credit-card-patterns
-  Inputmask.extendAliases(dict({
-    'payment-card': {
-      'postValidation': buffer => /[\s\d]+/.test(buffer.join('')),
-      /** @param {!JsonObject} opts */
-      'mask': function(opts) {
-        opts['definitions'] = dict({
-          'x': {
-            'validator': function(chrs, buffer) {
-              const val = buffer.buffer.join('') + chrs;
-              const valExp2 = new RegExp('\\d\\d');
-              const regextest = valExp2.test(val);
-              return regextest && val != '34' && val != '37';
+  Inputmask.extendAliases(
+    dict({
+      'payment-card': {
+        'postValidation': buffer => /[\s\d]+/.test(buffer.join('')),
+        /** @param {!JsonObject} opts */
+        'mask': function(opts) {
+          opts['definitions'] = dict({
+            'x': {
+              'validator': function(chrs, buffer) {
+                const val = buffer.buffer.join('') + chrs;
+                const valExp2 = new RegExp('\\d\\d');
+                const regextest = valExp2.test(val);
+                return regextest && val != '34' && val != '37';
+              },
+              'cardinality': 2,
             },
-            'cardinality': 2,
-          },
-          'y': {
-            'validator': function(chrs, buffer) {
-              const val = buffer.buffer.join('') + chrs;
-              const valExp2 = /3(4|7)/;
-              const regextest = valExp2.test(val);
-              return regextest;
+            'y': {
+              'validator': function(chrs, buffer) {
+                const val = buffer.buffer.join('') + chrs;
+                const valExp2 = /3(4|7)/;
+                const regextest = valExp2.test(val);
+                return regextest;
+              },
+              'cardinality': 2,
             },
-            'cardinality': 2,
-          },
-        });
-        return [
-          'y99 999999 99999',
-          'x99 9999 9999 9999',
-          '9999 999999 99999',
-          '9999 9999 9999 9999',
-        ];
+          });
+          return [
+            'y99 999999 99999',
+            'x99 9999 9999 9999',
+            '9999 999999 99999',
+            '9999 9999 9999 9999',
+          ];
+        },
       },
-    },
-  }));
+    })
+  );
 }
diff --git a/extensions/amp-inputmask/0.1/mask-impl.js b/extensions/amp-inputmask/0.1/mask-impl.js
index 850fbc4732d6..5754b5505d31 100644
--- a/extensions/amp-inputmask/0.1/mask-impl.js
+++ b/extensions/amp-inputmask/0.1/mask-impl.js
@@ -14,17 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  MASK_SEPARATOR_CHAR,
-  MaskChars,
-  NamedMasks,
-} from './constants';
+import {MASK_SEPARATOR_CHAR, MaskChars, NamedMasks} from './constants';
 import {MaskInterface} from './mask-interface';
 import {dict} from '../../../src/utils/object';
 import {factory as inputmaskCustomAliasFactory} from './inputmask-custom-alias';
-import {
-  factory as inputmaskPaymentCardAliasFactory,
-} from './inputmask-payment-card-alias';
+import {factory as inputmaskPaymentCardAliasFactory} from './inputmask-payment-card-alias';
 import {requireExternal} from '../../../src/module';
 
 const NamedMasksToInputmask = dict({
@@ -114,22 +108,23 @@ export class Mask {
       return this.Inputmask_;
     }
 
-
     const inputmaskFactory = requireExternal('inputmaskFactory');
     const Inputmask = inputmaskFactory(element);
     inputmaskCustomAliasFactory(Inputmask);
     inputmaskPaymentCardAliasFactory(Inputmask);
 
-    Inputmask.extendDefaults(dict({
-      // A list of supported input type attribute values
-      'supportsInputType': [
-        'text',
-        'tel',
-        'search',
-        // 'password', // use-case?
-        // 'email', // doesn't support setSelectionRange. workaround?
-      ],
-    }));
+    Inputmask.extendDefaults(
+      dict({
+        // A list of supported input type attribute values
+        'supportsInputType': [
+          'text',
+          'tel',
+          'search',
+          // 'password', // use-case?
+          // 'email', // doesn't support setSelectionRange. workaround?
+        ],
+      })
+    );
 
     return Inputmask;
   }
@@ -152,7 +147,7 @@ export class Mask {
 
   /** @override */
   dispose() {
-    this.controller_./*OK*/remove();
+    this.controller_./*OK*/ remove();
     this.controller_ = null;
   }
 }
@@ -171,16 +166,19 @@ export class Mask {
  */
 function convertAmpMaskToInputmask(ampMask) {
   const masks = ampMask
-      .split(MASK_SEPARATOR_CHAR)
-      .map(m => m.replace(/_/g, ' '));
+    .split(MASK_SEPARATOR_CHAR)
+    .map(m => m.replace(/_/g, ' '));
   return masks.map(mask => {
     let escapeNext = false;
-    return mask.split('').map(c => {
-      const escape = escapeNext;
-      escapeNext = (c == MaskChars.ESCAPE);
-
-      return (escape ? c : MaskCharsToInputmask[c]) || c;
-    }).join('');
+    return mask
+      .split('')
+      .map(c => {
+        const escape = escapeNext;
+        escapeNext = c == MaskChars.ESCAPE;
+
+        return (escape ? c : MaskCharsToInputmask[c]) || c;
+      })
+      .join('');
   });
 }
 
diff --git a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask-date.js b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask-date.js
index 3076063597fe..ded616b4366e 100644
--- a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask-date.js
+++ b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask-date.js
@@ -16,57 +16,64 @@
 
 import {simulateKeyboardInteraction} from './utils';
 
-const config = describe.configure().retryOnSaucelabs().ifChrome();
+const config = describe
+  .configure()
+  .retryOnSaucelabs()
+  .ifChrome();
 config.skip('amp-inputmask', () => {
   const {testServerPort} = window.ampTestRuntimeConfig;
 
-  describes.integration('attributes', {
-    body: `
+  describes.integration(
+    'attributes',
+    {
+      body: `
     <form method="post" action-xhr="http://localhost:${testServerPort}/form/post" target="_blank">
       <input name="birthday" mask="date-mm-dd-yyyy" value="02/29">
     </form>
   `,
-    extensions: ['amp-form', 'amp-inputmask'],
-  }, env => {
-    let win, doc;
+      extensions: ['amp-form', 'amp-inputmask'],
+    },
+    env => {
+      let win, doc;
 
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+      });
 
-    describe('date attribute', () => {
-      it('should allow entering incomplete years', () => {
-        const input = doc.querySelector('[name="birthday"]');
+      describe('date attribute', () => {
+        it('should allow entering incomplete years', () => {
+          const input = doc.querySelector('[name="birthday"]');
 
-        return simulateKeyboardInteraction(win, input, '2').then(() => {
-          expect(input.value).to.equal('02/29/2');
+          return simulateKeyboardInteraction(win, input, '2').then(() => {
+            expect(input.value).to.equal('02/29/2');
+          });
         });
-      });
 
-      it('should allow entering valid leap years', () => {
-        const input = doc.querySelector('[name="birthday"]');
+        it('should allow entering valid leap years', () => {
+          const input = doc.querySelector('[name="birthday"]');
 
-        return simulateKeyboardInteraction(win, input, '2')
+          return simulateKeyboardInteraction(win, input, '2')
             .then(() => simulateKeyboardInteraction(win, input, '0'))
             .then(() => simulateKeyboardInteraction(win, input, '1'))
             .then(() => simulateKeyboardInteraction(win, input, '2'))
             .then(() => {
               expect(input.value).to.equal('02/29/2012');
             });
-      });
+        });
 
-      it('should prevent entering non-leap years', () => {
-        const input = doc.querySelector('[name="birthday"]');
+        it('should prevent entering non-leap years', () => {
+          const input = doc.querySelector('[name="birthday"]');
 
-        return simulateKeyboardInteraction(win, input, '2')
+          return simulateKeyboardInteraction(win, input, '2')
             .then(() => simulateKeyboardInteraction(win, input, '0'))
             .then(() => simulateKeyboardInteraction(win, input, '1'))
             .then(() => simulateKeyboardInteraction(win, input, '3'))
             .then(() => {
               expect(input.value).to.equal('02/29/201');
             });
+        });
       });
-    });
-  });
+    }
+  );
 });
diff --git a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js
index 620714873c60..b6675211f3ad 100644
--- a/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js
+++ b/extensions/amp-inputmask/0.1/test/integration/test-integration-amp-inputmask.js
@@ -17,63 +17,75 @@
 import {poll} from '../../../../../testing/iframe';
 import {simulateKeyboardInteraction} from './utils';
 
-const config = describe.configure().retryOnSaucelabs().ifChrome();
+const config = describe
+  .configure()
+  .retryOnSaucelabs()
+  .ifChrome();
 config.skip('amp-inputmask', () => {
   const {testServerPort} = window.ampTestRuntimeConfig;
 
-  describes.integration('attributes', {
-    body: `
+  describes.integration(
+    'attributes',
+    {
+      body: `
     <form method="post" action-xhr="http://localhost:${testServerPort}/form/post" target="_blank">
       <input name="alphabetic" mask="L">
       <input name="numeric" mask="0">
       <input name="mask-output-test" mask="(A)" mask-output="alphanumeric">
     </form>
   `,
-    extensions: ['amp-form', 'amp-inputmask'],
-  }, env => {
-    let win, doc;
+      extensions: ['amp-form', 'amp-inputmask'],
+    },
+    env => {
+      let win, doc;
 
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-    });
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+      });
 
-    describe('mask attribute', () => {
-      it('should allow input matching the mask', () => {
-        const input = doc.querySelector('[name="alphabetic"]');
+      describe('mask attribute', () => {
+        it('should allow input matching the mask', () => {
+          const input = doc.querySelector('[name="alphabetic"]');
 
-        return simulateKeyboardInteraction(win, input, 'A').then(() => {
-          expect(input.value).to.equal('A');
+          return simulateKeyboardInteraction(win, input, 'A').then(() => {
+            expect(input.value).to.equal('A');
+          });
         });
-      });
 
-      it('should prevent input not matching the mask', () => {
-        const input = doc.querySelector('[name="numeric"]');
+        it('should prevent input not matching the mask', () => {
+          const input = doc.querySelector('[name="numeric"]');
 
-        return simulateKeyboardInteraction(win, input, 'A').then(() => {
-          expect(input.value).to.equal('');
+          return simulateKeyboardInteraction(win, input, 'A').then(() => {
+            expect(input.value).to.equal('');
+          });
         });
       });
-    });
 
-    describe('form behavior', () => {
-      it('should add hidden input to form before submit', () => {
-        const input = doc.querySelector('[name="mask-output-test"]');
-        const form = doc.querySelector('form');
-        input.value = '(A)';
+      describe('form behavior', () => {
+        it('should add hidden input to form before submit', () => {
+          const input = doc.querySelector('[name="mask-output-test"]');
+          const form = doc.querySelector('form');
+          input.value = '(A)';
 
-        const waitForInput =
-            poll('hidden input to be added', () => {
+          const waitForInput = poll(
+            'hidden input to be added',
+            () => {
               return doc.querySelector('input[type=hidden]');
-            }, undefined, 2000, win);
+            },
+            undefined,
+            2000,
+            win
+          );
 
-        form.dispatchEvent(new Event('submit'));
-        return waitForInput.then(hidden => {
-          expect(form.hasAttribute('submit-success')).to.be.false;
-          expect(hidden.name).to.equal('mask-output-test-unmasked');
-          expect(hidden.value).to.equal('A');
+          form.dispatchEvent(new Event('submit'));
+          return waitForInput.then(hidden => {
+            expect(form.hasAttribute('submit-success')).to.be.false;
+            expect(hidden.name).to.equal('mask-output-test-unmasked');
+            expect(hidden.value).to.equal('A');
+          });
         });
       });
-    });
-  });
+    }
+  );
 });
diff --git a/extensions/amp-inputmask/0.1/test/test-inputmask-custom-alias.js b/extensions/amp-inputmask/0.1/test/test-inputmask-custom-alias.js
index 86b0538147e2..03bbf5c23ab2 100644
--- a/extensions/amp-inputmask/0.1/test/test-inputmask-custom-alias.js
+++ b/extensions/amp-inputmask/0.1/test/test-inputmask-custom-alias.js
@@ -22,9 +22,7 @@ import {
 } from '../inputmask-custom-alias';
 
 describes.sandboxed('inputmask "custom" alias', {}, () => {
-
   describe('removePrefix', () => {
-
     it('should remove a prefix from the given input string', () => {
       const value = '+1(555)555-5555';
       expect(removePrefix(value, ['+1('])).to.equal('555)555-5555');
@@ -35,16 +33,13 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
     it('should remove the longest prefix match from the input string', () => {
       const prefices = ['+1(', '+1', '+', '1(', '1', '('];
 
-      expect(removePrefix('+1555-555-5555', prefices))
-          .to.equal('555-555-5555');
-      expect(removePrefix('1555-555-5555', prefices))
-          .to.equal('555-555-5555');
-      expect(removePrefix('+1555-555-5555', prefices))
-          .to.equal('555-555-5555');
-      expect(removePrefix('15555555555', prefices))
-          .to.equal('5555555555');
-      expect(removePrefix('+1(555)-555-5555', prefices))
-          .to.equal('555)-555-5555');
+      expect(removePrefix('+1555-555-5555', prefices)).to.equal('555-555-5555');
+      expect(removePrefix('1555-555-5555', prefices)).to.equal('555-555-5555');
+      expect(removePrefix('+1555-555-5555', prefices)).to.equal('555-555-5555');
+      expect(removePrefix('15555555555', prefices)).to.equal('5555555555');
+      expect(removePrefix('+1(555)-555-5555', prefices)).to.equal(
+        '555)-555-5555'
+      );
     });
 
     it('should return the input string if no prefix matches', () => {
@@ -67,22 +62,34 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
   });
 
   describe('getPrefixSubsets', () => {
-    it('should return all substrings of a mask\'s non-mask prefix', () => {
+    it("should return all substrings of a mask's non-mask prefix", () => {
       expect(getPrefixSubsets('(999)999-9999')).to.have.members(['(']);
-      expect(getPrefixSubsets('1(999)999-9999')).to.have.members(
-          ['1(', '1', '(']);
-      expect(getPrefixSubsets('+1(999)999-9999')).to.have.members(
-          ['+1(', '+1', '+', '1(', '1', '(']);
+      expect(getPrefixSubsets('1(999)999-9999')).to.have.members([
+        '1(',
+        '1',
+        '(',
+      ]);
+      expect(getPrefixSubsets('+1(999)999-9999')).to.have.members([
+        '+1(',
+        '+1',
+        '+',
+        '1(',
+        '1',
+        '(',
+      ]);
     });
 
     it('should return no substrings of a mask with no non-mask prefix', () => {
       expect(getPrefixSubsets('999)999-9999')).to.have.members([]);
     });
 
-    it('should return no substrings of a mask if a non-mask prefix ' +
-        'has more than 5 characters', () => {
-      expect(getPrefixSubsets('++++1(999)999-9999')).to.have.members([]);
-    });
+    it(
+      'should return no substrings of a mask if a non-mask prefix ' +
+        'has more than 5 characters',
+      () => {
+        expect(getPrefixSubsets('++++1(999)999-9999')).to.have.members([]);
+      }
+    );
   });
 
   describe('alias config', () => {
@@ -91,8 +98,7 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
       const opts = {'customMask': '+1(999)999-9999'};
 
       alias.custom.mask(opts);
-      expect(opts.prefixes).to.have.members(
-          ['+1(', '+1', '+', '1(', '1', '(']);
+      expect(opts.prefixes).to.have.members(['+1(', '+1', '+', '1(', '1', '(']);
     });
 
     it('should trim leading zeros when configured', () => {
@@ -100,14 +106,18 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
       const opts = {'customMask': '+1(999)999-9999', trimZeros: 2};
 
       alias.custom.mask(opts);
-      expect(alias.custom.onBeforeMask('555-555-5555', opts))
-          .to.equal('555-555-5555');
-      expect(alias.custom.onBeforeMask('0555-555-5555', opts))
-          .to.equal('555-555-5555');
-      expect(alias.custom.onBeforeMask('00555-555-5555', opts))
-          .to.equal('555-555-5555');
-      expect(alias.custom.onBeforeMask('000555-555-5555', opts))
-          .to.equal('0555-555-5555');
+      expect(alias.custom.onBeforeMask('555-555-5555', opts)).to.equal(
+        '555-555-5555'
+      );
+      expect(alias.custom.onBeforeMask('0555-555-5555', opts)).to.equal(
+        '555-555-5555'
+      );
+      expect(alias.custom.onBeforeMask('00555-555-5555', opts)).to.equal(
+        '555-555-5555'
+      );
+      expect(alias.custom.onBeforeMask('000555-555-5555', opts)).to.equal(
+        '0555-555-5555'
+      );
     });
 
     it('should not trim leading zeros when not configured', () => {
@@ -115,8 +125,9 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
       const opts = {'customMask': '+1(999)999-9999', trimZeros: 0};
 
       alias.custom.mask(opts);
-      expect(alias.custom.onBeforeMask('00555-555-5555', opts))
-          .to.equal('00555-555-5555');
+      expect(alias.custom.onBeforeMask('00555-555-5555', opts)).to.equal(
+        '00555-555-5555'
+      );
     });
 
     it('should trim non-mask prefixes when configured', () => {
@@ -124,8 +135,9 @@ describes.sandboxed('inputmask "custom" alias', {}, () => {
       const opts = {'customMask': '+1(999)999-9999', trimZeros: 0};
 
       alias.custom.mask(opts);
-      expect(alias.custom.onBeforeMask('+1555-555-5555', opts))
-          .to.equal('555-555-5555');
+      expect(alias.custom.onBeforeMask('+1555-555-5555', opts)).to.equal(
+        '555-555-5555'
+      );
     });
   });
 });
diff --git a/extensions/amp-inputmask/0.1/test/test-mask-impl.js b/extensions/amp-inputmask/0.1/test/test-mask-impl.js
index 6b6ffdc41a94..791d0f4287fa 100644
--- a/extensions/amp-inputmask/0.1/test/test-mask-impl.js
+++ b/extensions/amp-inputmask/0.1/test/test-mask-impl.js
@@ -17,11 +17,9 @@
 import {Mask} from '../mask-impl';
 
 describes.sandboxed('amp-inputmask mask-impl', {}, () => {
-
   class FakeElement {}
 
   describe('config', () => {
-
     let constructorStub;
 
     beforeEach(() => {
@@ -33,37 +31,43 @@ describes.sandboxed('amp-inputmask mask-impl', {}, () => {
       FakeElement.prototype.getAttribute = sandbox.stub();
     });
 
-    it('should create a custom mask with the custom mask string' +
-        ' and default options', () => {
-      const fakeElement = new FakeElement();
-      const maskString = '0';
+    it(
+      'should create a custom mask with the custom mask string' +
+        ' and default options',
+      () => {
+        const fakeElement = new FakeElement();
+        const maskString = '0';
 
-      new Mask(fakeElement, maskString);
-      const results = constructorStub.getCall(0).args[0];
-      expect(results).to.include.deep({
-        'alias': 'custom',
-        'customMask': ['9'],
-        'jitMasking': true,
-        'noValuePatching': true,
-        'placeholder': '\u2000',
-        'showMaskOnFocus': false,
-        'showMaskOnHover': false,
-        'trimZeros': 2,
-      });
-    });
+        new Mask(fakeElement, maskString);
+        const results = constructorStub.getCall(0).args[0];
+        expect(results).to.include.deep({
+          'alias': 'custom',
+          'customMask': ['9'],
+          'jitMasking': true,
+          'noValuePatching': true,
+          'placeholder': '\u2000',
+          'showMaskOnFocus': false,
+          'showMaskOnHover': false,
+          'trimZeros': 2,
+        });
+      }
+    );
 
-    it('should create a custom mask with the custom mask string' +
-        ' and configurable zeros', () => {
-      const fakeElement = new FakeElement();
-      fakeElement.getAttribute.withArgs('mask-trim-zeros').returns('0');
-      const maskString = '0';
+    it(
+      'should create a custom mask with the custom mask string' +
+        ' and configurable zeros',
+      () => {
+        const fakeElement = new FakeElement();
+        fakeElement.getAttribute.withArgs('mask-trim-zeros').returns('0');
+        const maskString = '0';
 
-      new Mask(fakeElement, maskString);
+        new Mask(fakeElement, maskString);
 
-      const results = constructorStub.getCall(0).args[0];
-      expect(results).to.include.deep({
-        'trimZeros': 0,
-      });
-    });
+        const results = constructorStub.getCall(0).args[0];
+        expect(results).to.include.deep({
+          'trimZeros': 0,
+        });
+      }
+    );
   });
 });
diff --git a/extensions/amp-inputmask/0.1/text-mask.js b/extensions/amp-inputmask/0.1/text-mask.js
index a0a4f6ef9b59..35ba784a56ff 100644
--- a/extensions/amp-inputmask/0.1/text-mask.js
+++ b/extensions/amp-inputmask/0.1/text-mask.js
@@ -107,8 +107,12 @@ export class TextMask {
         if (name == hiddenName && TextMask.isMaskOutputElement(element)) {
           return;
         }
-        userAssert(name != hiddenName,
-            'Illegal input name, %s found: %s', name, element);
+        userAssert(
+          name != hiddenName,
+          'Illegal input name, %s found: %s',
+          name,
+          element
+        );
       });
 
       const hidden = this.document_.createElement('input');
@@ -120,8 +124,10 @@ export class TextMask {
       this.hiddenInput_ = hidden;
     }
 
-    this.hiddenInput_.value = this.outputMode_ == OutputMode.ALPHANUMERIC ?
-      this.controller_.getUnmaskedValue() : this.controller_.getValue();
+    this.hiddenInput_.value =
+      this.outputMode_ == OutputMode.ALPHANUMERIC
+        ? this.controller_.getUnmaskedValue()
+        : this.controller_.getValue();
   }
 
   /**
@@ -135,4 +141,3 @@ export class TextMask {
     this.controller_.dispose();
   }
 }
-
diff --git a/extensions/amp-instagram/0.1/amp-instagram.js b/extensions/amp-instagram/0.1/amp-instagram.js
index 8dfc2e64735f..e015ff4617cb 100644
--- a/extensions/amp-instagram/0.1/amp-instagram.js
+++ b/extensions/amp-instagram/0.1/amp-instagram.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Embeds an instagram photo. The data-shortcode attribute can be
  * easily copied from a normal instagram URL. Example: <code> <amp-instagram
@@ -47,7 +46,6 @@ import {tryParseJson} from '../../../src/json';
 import {userAssert} from '../../../src/log';
 
 class AmpInstagram extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -65,23 +63,25 @@ class AmpInstagram extends AMP.BaseElement {
     this.captioned_ = '';
 
     /**
-    * @private {?Promise}
-    * @visibleForTesting
-    */
+     * @private {?Promise}
+     * @visibleForTesting
+     */
     this.iframePromise_ = null;
   }
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     // See
     // https://instagram.com/developer/embedding/?hl=en
     this.preconnect.url('https://www.instagram.com', opt_onLayout);
     // Host instagram used for image serving. While the host name is
     // funky this appears to be stable in the post-domain sharding era.
-    this.preconnect.url('https://instagram.fsnc1-1.fna.fbcdn.net',
-        opt_onLayout);
+    this.preconnect.url(
+      'https://instagram.fsnc1-1.fna.fbcdn.net',
+      opt_onLayout
+    );
   }
 
   /** @override */
@@ -92,12 +92,14 @@ class AmpInstagram extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.shortcode_ = userAssert(
-        (this.element.getAttribute('data-shortcode') ||
-        this.element.getAttribute('shortcode')),
-        'The data-shortcode attribute is required for <amp-instagram> %s',
-        this.element);
-    this.captioned_ = this.element.hasAttribute('data-captioned') ?
-      'captioned/' : '';
+      this.element.getAttribute('data-shortcode') ||
+        this.element.getAttribute('shortcode'),
+      'The data-shortcode attribute is required for <amp-instagram> %s',
+      this.element
+    );
+    this.captioned_ = this.element.hasAttribute('data-captioned')
+      ? 'captioned/'
+      : '';
   }
 
   /** @override */
@@ -108,8 +110,12 @@ class AmpInstagram extends AMP.BaseElement {
     image.setAttribute('noprerender', '');
     // This will redirect to the image URL. By experimentation this is
     // always the same URL that is actually used inside of the embed.
-    image.setAttribute('src', 'https://www.instagram.com/p/' +
-        encodeURIComponent(this.shortcode_) + '/media/?size=l');
+    image.setAttribute(
+      'src',
+      'https://www.instagram.com/p/' +
+        encodeURIComponent(this.shortcode_) +
+        '/media/?size=l'
+    );
     image.setAttribute('layout', 'fill');
     image.setAttribute('referrerpolicy', 'origin');
 
@@ -144,32 +150,37 @@ class AmpInstagram extends AMP.BaseElement {
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleInstagramMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleInstagramMessages_.bind(this)
     );
 
     iframe.setAttribute('scrolling', 'no');
     iframe.setAttribute('frameborder', '0');
     iframe.setAttribute('allowtransparency', 'true');
     //Add title to the iframe for better accessibility.
-    iframe.setAttribute('title', 'Instagram: ' +
-        this.element.getAttribute('alt'));
-    iframe.src = 'https://www.instagram.com/p/' +
-        encodeURIComponent(this.shortcode_) + '/embed/' +
-        this.captioned_ + '?cr=1&v=9';
+    iframe.setAttribute(
+      'title',
+      'Instagram: ' + this.element.getAttribute('alt')
+    );
+    iframe.src =
+      'https://www.instagram.com/p/' +
+      encodeURIComponent(this.shortcode_) +
+      '/embed/' +
+      this.captioned_ +
+      '?cr=1&v=9';
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
     setStyles(iframe, {
       'opacity': 0,
     });
-    return this.iframePromise_ = this.loadPromise(iframe).then(() => {
+    return (this.iframePromise_ = this.loadPromise(iframe).then(() => {
       this.getVsync().mutate(() => {
         setStyles(iframe, {
           'opacity': 1,
         });
       });
-    });
+    }));
   }
 
   /**
@@ -177,13 +188,20 @@ class AmpInstagram extends AMP.BaseElement {
    * @private
    */
   handleInstagramMessages_(event) {
-    if (event.origin != 'https://www.instagram.com' ||
-        event.source != this.iframe_.contentWindow) {
+    if (
+      event.origin != 'https://www.instagram.com' ||
+      event.source != this.iframe_.contentWindow
+    ) {
       return;
     }
     const eventData = getData(event);
-    if (!eventData || !(isObject(eventData)
-        || startsWith(/** @type {string} */ (eventData), '{'))) {
+    if (
+      !eventData ||
+      !(
+        isObject(eventData) ||
+        startsWith(/** @type {string} */ (eventData), '{')
+      )
+    ) {
       return; // Doesn't look like JSON.
     }
     const data = isObject(eventData) ? eventData : tryParseJson(eventData);
@@ -193,8 +211,8 @@ class AmpInstagram extends AMP.BaseElement {
     if (data['type'] == 'MEASURE' && data['details']) {
       const height = data['details']['height'];
       this.getVsync().measure(() => {
-        if (this.iframe_ && this.iframe_./*OK*/offsetHeight !== height) {
-          this./*OK*/changeHeight(height);
+        if (this.iframe_ && this.iframe_./*OK*/ offsetHeight !== height) {
+          this./*OK*/ changeHeight(height);
         }
       });
     }
@@ -219,7 +237,6 @@ class AmpInstagram extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-instagram', '0.1', AMP => {
   AMP.registerElement('amp-instagram', AmpInstagram, CSS);
 });
diff --git a/extensions/amp-instagram/0.1/test/test-amp-instagram.js b/extensions/amp-instagram/0.1/test/test-amp-instagram.js
index ec7179171868..f021df394524 100644
--- a/extensions/amp-instagram/0.1/test/test-amp-instagram.js
+++ b/extensions/amp-instagram/0.1/test/test-amp-instagram.js
@@ -16,176 +16,196 @@
 
 import '../amp-instagram';
 
-
-describes.realWin('amp-instagram', {
-  amp: {
-    extensions: ['amp-instagram'],
+describes.realWin(
+  'amp-instagram',
+  {
+    amp: {
+      extensions: ['amp-instagram'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getIns(shortcode, opt_responsive,
-    opt_beforeLayoutCallback, opt_captioned) {
-    const ins = doc.createElement('amp-instagram');
-    ins.setAttribute('data-shortcode', shortcode);
-    ins.setAttribute('width', '111');
-    ins.setAttribute('height', '222');
-    ins.setAttribute('alt', 'Testing');
-    if (opt_responsive) {
-      ins.setAttribute('layout', 'responsive');
-    }
-    if (opt_captioned) {
-      ins.setAttribute('data-captioned', '');
-    }
-    ins.implementation_.getVsync = () => {
-      return {
-        mutate(cb) { cb(); },
-        measure(cb) { cb(); },
-        runPromise(task, state = {}) {
-          if (task.measure) {
-            task.measure(state);
-          }
-          if (task.mutate) {
-            task.mutate(state);
-          }
-          return Promise.resolve();
-        },
-      };
-    };
-    doc.body.appendChild(ins);
-    return ins.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(ins);
+  env => {
+    let win, doc;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
+
+    function getIns(
+      shortcode,
+      opt_responsive,
+      opt_beforeLayoutCallback,
+      opt_captioned
+    ) {
+      const ins = doc.createElement('amp-instagram');
+      ins.setAttribute('data-shortcode', shortcode);
+      ins.setAttribute('width', '111');
+      ins.setAttribute('height', '222');
+      ins.setAttribute('alt', 'Testing');
+      if (opt_responsive) {
+        ins.setAttribute('layout', 'responsive');
       }
-      return ins.layoutCallback();
-    }).then(() => ins);
-  }
+      if (opt_captioned) {
+        ins.setAttribute('data-captioned', '');
+      }
+      ins.implementation_.getVsync = () => {
+        return {
+          mutate(cb) {
+            cb();
+          },
+          measure(cb) {
+            cb();
+          },
+          runPromise(task, state = {}) {
+            if (task.measure) {
+              task.measure(state);
+            }
+            if (task.mutate) {
+              task.mutate(state);
+            }
+            return Promise.resolve();
+          },
+        };
+      };
+      doc.body.appendChild(ins);
+      return ins
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(ins);
+          }
+          return ins.layoutCallback();
+        })
+        .then(() => ins);
+    }
 
-  function testImage(image) {
-    expect(image).to.not.be.null;
-    expect(image.getAttribute('src')).to.equal(
-        'https://www.instagram.com/p/fBwFP/media/?size=l');
-    expect(image.getAttribute('layout')).to.equal('fill');
-    expect(image.getAttribute('alt')).to.equal('Testing');
-    expect(image.getAttribute('referrerpolicy')).to.equal('origin');
-  }
+    function testImage(image) {
+      expect(image).to.not.be.null;
+      expect(image.getAttribute('src')).to.equal(
+        'https://www.instagram.com/p/fBwFP/media/?size=l'
+      );
+      expect(image.getAttribute('layout')).to.equal('fill');
+      expect(image.getAttribute('alt')).to.equal('Testing');
+      expect(image.getAttribute('referrerpolicy')).to.equal('origin');
+    }
 
-  function testIframe(iframe) {
-    expect(iframe).to.not.be.null;
-    expect(iframe.src).to.equal('https://www.instagram.com/p/fBwFP/embed/?cr=1&v=9');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-    expect(iframe.getAttribute('title')).to.equal('Instagram: Testing');
-  }
+    function testIframe(iframe) {
+      expect(iframe).to.not.be.null;
+      expect(iframe.src).to.equal(
+        'https://www.instagram.com/p/fBwFP/embed/?cr=1&v=9'
+      );
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      expect(iframe.getAttribute('title')).to.equal('Instagram: Testing');
+    }
 
-  function testIframeCaptioned(iframe) {
-    expect(iframe).to.not.be.null;
-    expect(iframe.src).to.equal('https://www.instagram.com/p/fBwFP/embed/captioned/?cr=1&v=9');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-    expect(iframe.getAttribute('title')).to.equal('Instagram: Testing');
-  }
+    function testIframeCaptioned(iframe) {
+      expect(iframe).to.not.be.null;
+      expect(iframe.src).to.equal(
+        'https://www.instagram.com/p/fBwFP/embed/captioned/?cr=1&v=9'
+      );
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      expect(iframe.getAttribute('title')).to.equal('Instagram: Testing');
+    }
 
-  it('renders', () => {
-    return getIns('fBwFP').then(ins => {
-      testIframe(ins.querySelector('iframe'));
-      testImage(ins.querySelector('amp-img'));
+    it('renders', () => {
+      return getIns('fBwFP').then(ins => {
+        testIframe(ins.querySelector('iframe'));
+        testImage(ins.querySelector('amp-img'));
+      });
     });
-  });
 
-  it('renders captioned', () => {
-    return getIns('fBwFP', undefined, undefined, true).then(ins => {
-      testIframeCaptioned(ins.querySelector('iframe'));
-      testImage(ins.querySelector('amp-img'));
+    it('renders captioned', () => {
+      return getIns('fBwFP', undefined, undefined, true).then(ins => {
+        testIframeCaptioned(ins.querySelector('iframe'));
+        testImage(ins.querySelector('amp-img'));
+      });
     });
-  });
 
-  it('sets noprerender on amp-img', () => {
-    return getIns('fBwFP').then(ins => {
-      expect(ins.querySelector('amp-img').hasAttribute('noprerender'))
-          .to.be.true;
+    it('sets noprerender on amp-img', () => {
+      return getIns('fBwFP').then(ins => {
+        expect(ins.querySelector('amp-img').hasAttribute('noprerender')).to.be
+          .true;
+      });
     });
-  });
-
-  it('builds a placeholder image without inserting iframe', () => {
-    return getIns('fBwFP', true, ins => {
-      const placeholder = ins.querySelector('[placeholder]');
-      const iframe = ins.querySelector('iframe');
-      expect(iframe).to.be.null;
-      expect(placeholder).to.not.have.display('');
-      testImage(placeholder.querySelector('amp-img'));
-    }).then(ins => {
-      const placeholder = ins.querySelector('[placeholder]');
-      const iframe = ins.querySelector('iframe');
-      ins.getVsync = () => {
-        return {
-          mutate: fn => fn(),
+
+    it('builds a placeholder image without inserting iframe', () => {
+      return getIns('fBwFP', true, ins => {
+        const placeholder = ins.querySelector('[placeholder]');
+        const iframe = ins.querySelector('iframe');
+        expect(iframe).to.be.null;
+        expect(placeholder).to.not.have.display('');
+        testImage(placeholder.querySelector('amp-img'));
+      }).then(ins => {
+        const placeholder = ins.querySelector('[placeholder]');
+        const iframe = ins.querySelector('iframe');
+        ins.getVsync = () => {
+          return {
+            mutate: fn => fn(),
+          };
         };
-      };
-      testIframe(iframe);
-      testImage(placeholder.querySelector('amp-img'));
-      ins.implementation_.iframePromise_.then(() => {
-        expect(placeholder).to.be.have.display('none');
+        testIframe(iframe);
+        testImage(placeholder.querySelector('amp-img'));
+        ins.implementation_.iframePromise_.then(() => {
+          expect(placeholder).to.be.have.display('none');
+        });
       });
     });
-  });
-
-  it('removes iframe after unlayoutCallback', () => {
-    return getIns('fBwFP').then(ins => {
-      const placeholder = ins.querySelector('[placeholder]');
-      testIframe(ins.querySelector('iframe'));
-      const obj = ins.implementation_;
-      obj.unlayoutCallback();
-      expect(ins.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(obj.iframePromise_).to.be.null;
-      expect(placeholder).to.not.have.display('none');
+
+    it('removes iframe after unlayoutCallback', () => {
+      return getIns('fBwFP').then(ins => {
+        const placeholder = ins.querySelector('[placeholder]');
+        testIframe(ins.querySelector('iframe'));
+        const obj = ins.implementation_;
+        obj.unlayoutCallback();
+        expect(ins.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(obj.iframePromise_).to.be.null;
+        expect(placeholder).to.not.have.display('none');
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getIns('fBwFP', true).then(ins => {
-      expect(ins.className).to.match(/i-amphtml-layout-responsive/);
+    it('renders responsively', () => {
+      return getIns('fBwFP', true).then(ins => {
+        expect(ins.className).to.match(/i-amphtml-layout-responsive/);
+      });
     });
-  });
 
-  it('requires data-shortcode', () => {
-    allowConsoleError(() => {
-      expect(getIns('')).to.be.rejectedWith(
-          /The data-shortcode attribute is required for/);
+    it('requires data-shortcode', () => {
+      allowConsoleError(() => {
+        expect(getIns('')).to.be.rejectedWith(
+          /The data-shortcode attribute is required for/
+        );
+      });
     });
-  });
 
-  it('resizes in response to messages from Instagram iframe', () => {
-    return getIns('fBwFP', true).then(ins => {
-      const impl = ins.implementation_;
-      const iframe = ins.querySelector('iframe');
-      const changeHeight = sandbox.spy(impl, 'changeHeight');
-      const newHeight = 977;
+    it('resizes in response to messages from Instagram iframe', () => {
+      return getIns('fBwFP', true).then(ins => {
+        const impl = ins.implementation_;
+        const iframe = ins.querySelector('iframe');
+        const changeHeight = sandbox.spy(impl, 'changeHeight');
+        const newHeight = 977;
 
-      expect(iframe).to.not.be.null;
+        expect(iframe).to.not.be.null;
 
-      sendFakeMessage(ins, iframe, 'MEASURE', {
-        height: newHeight,
-      });
+        sendFakeMessage(ins, iframe, 'MEASURE', {
+          height: newHeight,
+        });
 
-      expect(changeHeight).to.be.calledOnce;
-      // Height minus padding
-      expect(changeHeight.firstCall.args[0]).to.equal(newHeight);
-    });
-  });
-
-  function sendFakeMessage(ins, iframe, type, details) {
-    ins.implementation_.handleInstagramMessages_({
-      origin: 'https://www.instagram.com',
-      source: iframe.contentWindow,
-      data: JSON.stringify({
-        type,
-        details,
-      }),
+        expect(changeHeight).to.be.calledOnce;
+        // Height minus padding
+        expect(changeHeight.firstCall.args[0]).to.equal(newHeight);
+      });
     });
+
+    function sendFakeMessage(ins, iframe, type, details) {
+      ins.implementation_.handleInstagramMessages_({
+        origin: 'https://www.instagram.com',
+        source: iframe.contentWindow,
+        data: JSON.stringify({
+          type,
+          details,
+        }),
+      });
+    }
   }
-});
+);
diff --git a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
index 728052a406c4..e8abcde1844e 100644
--- a/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
+++ b/extensions/amp-install-serviceworker/0.1/amp-install-serviceworker.js
@@ -37,7 +37,6 @@ const TAG = 'amp-install-serviceworker';
  * of the current page.
  */
 export class AmpInstallServiceWorker extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -63,8 +62,11 @@ export class AmpInstallServiceWorker extends AMP.BaseElement {
     const src = this.element.getAttribute('src');
     urlService.assertHttpsUrl(src, this.element);
 
-    if ((urlService.isProxyOrigin(src) ||
-        urlService.isProxyOrigin(win.location.href)) && !this.isSafari_) {
+    if (
+      (urlService.isProxyOrigin(src) ||
+        urlService.isProxyOrigin(win.location.href)) &&
+      !this.isSafari_
+    ) {
       const iframeSrc = this.element.getAttribute('data-iframe-src');
       if (iframeSrc) {
         urlService.assertHttpsUrl(iframeSrc, this.element);
@@ -73,33 +75,44 @@ export class AmpInstallServiceWorker extends AMP.BaseElement {
         const sourceUrl = urlService.parse(docInfo.sourceUrl);
         const canonicalUrl = urlService.parse(docInfo.canonicalUrl);
         userAssert(
-            origin == sourceUrl.origin ||
-            origin == canonicalUrl.origin,
-            'data-iframe-src (%s) should be a URL on the same origin as the ' +
+          origin == sourceUrl.origin || origin == canonicalUrl.origin,
+          'data-iframe-src (%s) should be a URL on the same origin as the ' +
             'source (%s) or canonical URL (%s) of the AMP-document.',
-            origin, sourceUrl.origin, canonicalUrl.origin);
+          origin,
+          sourceUrl.origin,
+          canonicalUrl.origin
+        );
         this.iframeSrc_ = iframeSrc;
         this.whenLoadedAndVisiblePromise_().then(() => {
           return this.insertIframe_();
         });
       }
-    } else if (urlService.parse(win.location.href).origin ==
-      urlService.parse(src).origin) {
+    } else if (
+      urlService.parse(win.location.href).origin == urlService.parse(src).origin
+    ) {
       this.whenLoadedAndVisiblePromise_().then(() => {
         return install(this.win, src, this.element);
       });
     } else {
-      this.user().error(TAG,
-          'Did not install ServiceWorker because it does not ' +
-          'match the current origin: ' + src);
+      this.user().error(
+        TAG,
+        'Did not install ServiceWorker because it does not ' +
+          'match the current origin: ' +
+          src
+      );
     }
 
-    if ((urlService.isProxyOrigin(src) ||
-    urlService.isProxyOrigin(win.location.href)) && this.isSafari_) {
+    if (
+      (urlService.isProxyOrigin(src) ||
+        urlService.isProxyOrigin(win.location.href)) &&
+      this.isSafari_
+    ) {
       // https://webkit.org/blog/8090/workers-at-your-service/
-      this.user().error(TAG,
-          'Did not install ServiceWorker because of safari double keyring ' +
-          'caching as it will not have any effect');
+      this.user().error(
+        TAG,
+        'Did not install ServiceWorker because of safari double keyring ' +
+          'caching as it will not have any effect'
+      );
     }
   }
 
@@ -144,34 +157,46 @@ export class AmpInstallServiceWorker extends AMP.BaseElement {
 
     // Read the url-rewrite config.
     const urlMatch = this.element.getAttribute(
-        'data-no-service-worker-fallback-url-match');
+      'data-no-service-worker-fallback-url-match'
+    );
     let shellUrl = this.element.getAttribute(
-        'data-no-service-worker-fallback-shell-url');
+      'data-no-service-worker-fallback-shell-url'
+    );
     if (!urlMatch && !shellUrl) {
       return;
     }
 
     // Check the url-rewrite config is valid.
-    userAssert(urlMatch && shellUrl,
-        'Both, "%s" and "%s" must be specified for url-rewrite',
-        'data-no-service-worker-fallback-url-match',
-        'data-no-service-worker-fallback-shell-url');
+    userAssert(
+      urlMatch && shellUrl,
+      'Both, "%s" and "%s" must be specified for url-rewrite',
+      'data-no-service-worker-fallback-url-match',
+      'data-no-service-worker-fallback-shell-url'
+    );
     shellUrl = removeFragment(shellUrl);
     let urlMatchExpr;
     try {
       urlMatchExpr = new RegExp(urlMatch);
     } catch (e) {
       throw user().createError(
-          'Invalid "data-no-service-worker-fallback-url-match" expression', e);
+        'Invalid "data-no-service-worker-fallback-url-match" expression',
+        e
+      );
     }
-    userAssert(urlService.getSourceOrigin(winUrl) ==
-      urlService.parse(shellUrl).origin,
-    'Shell source origin "%s" must be the same as source origin "%s"',
-    shellUrl, winUrl.href);
+    userAssert(
+      urlService.getSourceOrigin(winUrl) == urlService.parse(shellUrl).origin,
+      'Shell source origin "%s" must be the same as source origin "%s"',
+      shellUrl,
+      winUrl.href
+    );
 
     // Install URL rewriter.
-    this.urlRewriter_ = new UrlRewriter_(ampdoc, urlMatchExpr, shellUrl,
-        this.element);
+    this.urlRewriter_ = new UrlRewriter_(
+      ampdoc,
+      urlMatchExpr,
+      shellUrl,
+      this.element
+    );
 
     // Cache shell.
     if (urlService.isSecure(shellUrl)) {
@@ -229,13 +254,11 @@ export class AmpInstallServiceWorker extends AMP.BaseElement {
   }
 }
 
-
 /**
  * URL Rewriter intercepts all navigations and, if within the parameters,
  * rewrites the URL to go via shell.
  */
 class UrlRewriter_ {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!RegExp} urlMatchExpr
@@ -270,17 +293,21 @@ class UrlRewriter_ {
     if (event.defaultPrevented) {
       return;
     }
-    const target =
-      closestAncestorElementBySelector(dev().assertElement(event.target), 'A');
+    const target = closestAncestorElementBySelector(
+      dev().assertElement(event.target),
+      'A'
+    );
     if (!target || !target.href) {
       return;
     }
 
     // Check the URL matches the mask and doesn't match shell itself.
     const tgtLoc = this.urlService_.parse(target.href);
-    if (tgtLoc.origin != this.shellLoc_.origin ||
-            tgtLoc.pathname == this.shellLoc_.pathname ||
-            !this.urlMatchExpr_.test(tgtLoc.href)) {
+    if (
+      tgtLoc.origin != this.shellLoc_.origin ||
+      tgtLoc.pathname == this.shellLoc_.pathname ||
+      !this.urlMatchExpr_.test(tgtLoc.href)
+    ) {
       return;
     }
 
@@ -298,8 +325,10 @@ class UrlRewriter_ {
 
     // Rewrite URL.
     target.setAttribute('i-amphtml-orig-href', target.href);
-    target.href = this.shellUrl_ + '#href=' + encodeURIComponent(
-        `${tgtLoc.pathname}${tgtLoc.search}${tgtLoc.hash}`);
+    target.href =
+      this.shellUrl_ +
+      '#href=' +
+      encodeURIComponent(`${tgtLoc.pathname}${tgtLoc.search}${tgtLoc.hash}`);
   }
 }
 
@@ -315,33 +344,34 @@ function install(win, src, element) {
   if (element.hasAttribute('data-scope')) {
     options.scope = element.getAttribute('data-scope');
   }
-  return win.navigator.serviceWorker.register(src, options)
-      .then(function(registration) {
-        if (getMode().development) {
-          user().info(TAG, 'ServiceWorker registration successful with scope: ',
-              registration.scope);
-        }
-        // Check if there is a new service worker installing.
-        const installingSw = registration.installing;
-        if (installingSw) {
-          // if not already active, wait till it becomes active
-          installingSw.addEventListener('statechange', evt => {
-            if (evt.target.state === 'activated') {
-              performServiceWorkerOptimizations(
-                  registration,
-                  win,
-                  element
-              );
-            }
-          });
-        } else if (registration.active) {
-          performServiceWorkerOptimizations(registration, win, element);
-        }
-
-        return registration;
-      }, function(e) {
-        user().error(TAG, 'ServiceWorker registration failed:', e);
-      });
+  return win.navigator.serviceWorker.register(src, options).then(
+    function(registration) {
+      if (getMode().development) {
+        user().info(
+          TAG,
+          'ServiceWorker registration successful with scope: ',
+          registration.scope
+        );
+      }
+      // Check if there is a new service worker installing.
+      const installingSw = registration.installing;
+      if (installingSw) {
+        // if not already active, wait till it becomes active
+        installingSw.addEventListener('statechange', evt => {
+          if (evt.target.state === 'activated') {
+            performServiceWorkerOptimizations(registration, win, element);
+          }
+        });
+      } else if (registration.active) {
+        performServiceWorkerOptimizations(registration, win, element);
+      }
+
+      return registration;
+    },
+    function(e) {
+      user().error(TAG, 'ServiceWorker registration failed:', e);
+    }
+  );
 }
 
 /**
@@ -367,17 +397,24 @@ function performServiceWorkerOptimizations(registration, win, element) {
 function sendAmpScriptToSwOnFirstVisit(win, registration) {
   if ('performance' in win) {
     // Fetch all AMP-scripts used on the page
-    const ampScriptsUsed = win.performance.getEntriesByType('resource')
-        .filter(item => item.initiatorType === 'script' &&
-          startsWith(item.name, urls.cdn))
-        .map(script => script.name);
+    const ampScriptsUsed = win.performance
+      .getEntriesByType('resource')
+      .filter(
+        item =>
+          item.initiatorType === 'script' && startsWith(item.name, urls.cdn)
+      )
+      .map(script => script.name);
     const activeSW = registration.active;
     // using convention from https://github.com/redux-utilities/flux-standard-action.
     if (activeSW.postMessage) {
-      activeSW.postMessage(JSON.stringify(dict({
-        'type': 'AMP__FIRST-VISIT-CACHING',
-        'payload': ampScriptsUsed,
-      })));
+      activeSW.postMessage(
+        JSON.stringify(
+          dict({
+            'type': 'AMP__FIRST-VISIT-CACHING',
+            'payload': ampScriptsUsed,
+          })
+        )
+      );
     }
   }
 }
@@ -390,8 +427,10 @@ function sendAmpScriptToSwOnFirstVisit(win, registration) {
  */
 function prefetchOutgoingLinks(registration, win) {
   const {document} = win;
-  const links = [].map.call(document.querySelectorAll('a[data-rel=prefetch]'),
-      link => link.href);
+  const links = [].map.call(
+    document.querySelectorAll('a[data-rel=prefetch]'),
+    link => link.href
+  );
   if (supportsPrefetch(document)) {
     links.forEach(link => {
       const linkTag = document.createElement('link');
@@ -402,10 +441,14 @@ function prefetchOutgoingLinks(registration, win) {
   } else {
     const activeSW = registration.active;
     if (activeSW.postMessage) {
-      activeSW.postMessage(JSON.stringify(dict({
-        'type': 'AMP__LINK-PREFETCH',
-        'payload': links,
-      })));
+      activeSW.postMessage(
+        JSON.stringify(
+          dict({
+            'type': 'AMP__LINK-PREFETCH',
+            'payload': links,
+          })
+        )
+      );
     }
   }
 }
diff --git a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
index affa09d5598e..d72d34862756 100644
--- a/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
+++ b/extensions/amp-install-serviceworker/0.1/test/test-amp-install-serviceworker.js
@@ -30,7 +30,6 @@ import {
   resetServiceForTesting,
 } from '../../../../src/service';
 
-
 function stubUrlService(sandbox) {
   sandbox.stub(Services, 'urlForDoc').returns({
     assertHttpsUrl,
@@ -41,338 +40,320 @@ function stubUrlService(sandbox) {
   });
 }
 
-
-describes.realWin('amp-install-serviceworker', {
-  amp: {
-    runtimeOn: false,
-    ampdoc: 'single',
-    extensions: ['amp-install-serviceworker'],
+describes.realWin(
+  'amp-install-serviceworker',
+  {
+    amp: {
+      runtimeOn: false,
+      ampdoc: 'single',
+      extensions: ['amp-install-serviceworker'],
+    },
   },
-}, env => {
-
-  let doc;
-  let sandbox;
-  let container;
-  let ampdoc;
-  let maybeInstallUrlRewriteStub;
-  let whenVisible;
-
-  beforeEach(() => {
-    doc = env.win.document;
-    sandbox = env.sandbox;
-    ampdoc = Services.ampdocServiceFor(env.win).getAmpDoc();
-    container = doc.createElement('div');
-    env.win.document.body.appendChild(container);
-    stubUrlService(sandbox);
-    maybeInstallUrlRewriteStub = sandbox.stub(
+  env => {
+    let doc;
+    let sandbox;
+    let container;
+    let ampdoc;
+    let maybeInstallUrlRewriteStub;
+    let whenVisible;
+
+    beforeEach(() => {
+      doc = env.win.document;
+      sandbox = env.sandbox;
+      ampdoc = Services.ampdocServiceFor(env.win).getAmpDoc();
+      container = doc.createElement('div');
+      env.win.document.body.appendChild(container);
+      stubUrlService(sandbox);
+      maybeInstallUrlRewriteStub = sandbox.stub(
         AmpInstallServiceWorker.prototype,
-        'maybeInstallUrlRewrite_');
-  });
+        'maybeInstallUrlRewrite_'
+      );
+    });
 
-  it('should install for same origin', () => {
-    const install = doc.createElement('div');
-    container.appendChild(install);
-    install.getAmpDoc = () => ampdoc;
-    install.setAttribute('src', 'https://example.com/sw.js');
-    const implementation = new AmpInstallServiceWorker(install);
-    let calledSrc;
-    const p = new Promise(() => {});
-    implementation.win = {
-      complete: true,
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: (src, options) => {
-            expect(calledSrc).to.be.undefined;
-            expect(options.scope).to.be.undefined;
-            calledSrc = src;
-            return p;
+    it('should install for same origin', () => {
+      const install = doc.createElement('div');
+      container.appendChild(install);
+      install.getAmpDoc = () => ampdoc;
+      install.setAttribute('src', 'https://example.com/sw.js');
+      const implementation = new AmpInstallServiceWorker(install);
+      let calledSrc;
+      const p = new Promise(() => {});
+      implementation.win = {
+        complete: true,
+        location: {
+          href: 'https://example.com/some/path',
+        },
+        navigator: {
+          serviceWorker: {
+            register: (src, options) => {
+              expect(calledSrc).to.be.undefined;
+              expect(options.scope).to.be.undefined;
+              calledSrc = src;
+              return p;
+            },
           },
         },
-      },
-    };
-    whenVisible = Promise.resolve();
-    registerServiceBuilder(implementation.win, 'viewer', function() {
-      return {
-        whenFirstVisible: () => whenVisible,
-        isVisible: () => true,
       };
-    });
-    implementation.buildCallback();
-    expect(calledSrc).to.be.undefined;
-    return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
+      whenVisible = Promise.resolve();
+      registerServiceBuilder(implementation.win, 'viewer', function() {
+        return {
+          whenFirstVisible: () => whenVisible,
+          isVisible: () => true,
+        };
+      });
+      implementation.buildCallback();
+      expect(calledSrc).to.be.undefined;
+      return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
         () => {
           expect(calledSrc).to.equal('https://example.com/sw.js');
           // Should not be called before `register` resolves.
           expect(maybeInstallUrlRewriteStub).to.not.be.called;
-        });
-  });
+        }
+      );
+    });
 
-  it('should install for custom scope', () => {
-    const install = doc.createElement('div');
-    container.appendChild(install);
-    install.getAmpDoc = () => ampdoc;
-    install.setAttribute('src', 'https://example.com/sw.js');
-    install.setAttribute('data-scope', '/profile');
-    const implementation = new AmpInstallServiceWorker(install);
-    let calledSrc;
-    const p = new Promise(() => {});
-    implementation.win = {
-      complete: true,
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: (src, options) => {
-            expect(calledSrc).to.be.undefined;
-            expect(options.scope).to.be.equal('/profile');
-            calledSrc = src;
-            return p;
+    it('should install for custom scope', () => {
+      const install = doc.createElement('div');
+      container.appendChild(install);
+      install.getAmpDoc = () => ampdoc;
+      install.setAttribute('src', 'https://example.com/sw.js');
+      install.setAttribute('data-scope', '/profile');
+      const implementation = new AmpInstallServiceWorker(install);
+      let calledSrc;
+      const p = new Promise(() => {});
+      implementation.win = {
+        complete: true,
+        location: {
+          href: 'https://example.com/some/path',
+        },
+        navigator: {
+          serviceWorker: {
+            register: (src, options) => {
+              expect(calledSrc).to.be.undefined;
+              expect(options.scope).to.be.equal('/profile');
+              calledSrc = src;
+              return p;
+            },
           },
         },
-      },
-    };
-    whenVisible = Promise.resolve();
-    registerServiceBuilder(implementation.win, 'viewer', function() {
-      return {
-        whenFirstVisible: () => whenVisible,
-        isVisible: () => true,
       };
-    });
-    implementation.buildCallback();
-    expect(calledSrc).to.be.undefined;
-    return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
+      whenVisible = Promise.resolve();
+      registerServiceBuilder(implementation.win, 'viewer', function() {
+        return {
+          whenFirstVisible: () => whenVisible,
+          isVisible: () => true,
+        };
+      });
+      implementation.buildCallback();
+      expect(calledSrc).to.be.undefined;
+      return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
         () => {
           expect(calledSrc).to.equal('https://example.com/sw.js');
           // Should not be called before `register` resolves.
           expect(maybeInstallUrlRewriteStub).to.not.be.called;
-        });
-  });
+        }
+      );
+    });
 
-  it('should postMessage all AMP scripts used to the service worker', () => {
-    const install = doc.createElement('div');
-    container.appendChild(install);
-    install.getAmpDoc = () => ampdoc;
-    install.setAttribute('src', 'https://example.com/sw.js');
-    const implementation = new AmpInstallServiceWorker(install);
-    const AMP_SCRIPTS = [
-      'https://cdn.ampproject.org/rtv/001525381599226/v0.js',
-      'https://cdn.ampproject.org/rtv/001810022028350/v0/amp-mustache-0.1.js',
-    ];
-    const eventListener = (evtName, cb) => {
-      cb({
-        target: {
-          state: 'activated',
+    it('should postMessage all AMP scripts used to the service worker', () => {
+      const install = doc.createElement('div');
+      container.appendChild(install);
+      install.getAmpDoc = () => ampdoc;
+      install.setAttribute('src', 'https://example.com/sw.js');
+      const implementation = new AmpInstallServiceWorker(install);
+      const AMP_SCRIPTS = [
+        'https://cdn.ampproject.org/rtv/001525381599226/v0.js',
+        'https://cdn.ampproject.org/rtv/001810022028350/v0/amp-mustache-0.1.js',
+      ];
+      const eventListener = (evtName, cb) => {
+        cb({
+          target: {
+            state: 'activated',
+          },
+        });
+      };
+      const postMessageStub = sandbox.stub();
+      const fakeRegistration = {
+        installing: {
+          addEventListener: sandbox.spy(eventListener),
         },
-      });
-    };
-    const postMessageStub = sandbox.stub();
-    const fakeRegistration = {
-      installing: {
-        addEventListener: sandbox.spy(eventListener),
-      },
-      active: {
-        postMessage: postMessageStub,
-      },
-    };
-    const p = Promise.resolve(fakeRegistration);
-    implementation.win = {
-      complete: true,
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: () => {
-            return p;
+        active: {
+          postMessage: postMessageStub,
+        },
+      };
+      const p = Promise.resolve(fakeRegistration);
+      implementation.win = {
+        complete: true,
+        location: {
+          href: 'https://example.com/some/path',
+        },
+        navigator: {
+          serviceWorker: {
+            register: () => {
+              return p;
+            },
           },
         },
-      },
-      performance: {
-        getEntriesByType: () => {
-          return AMP_SCRIPTS.concat('https://code.jquery.com/jquery-3.3.1.min.js').map(script => {
-            return {
-              initiatorType: 'script',
-              name: script,
-            };
-          });
+        performance: {
+          getEntriesByType: () => {
+            return AMP_SCRIPTS.concat(
+              'https://code.jquery.com/jquery-3.3.1.min.js'
+            ).map(script => {
+              return {
+                initiatorType: 'script',
+                name: script,
+              };
+            });
+          },
         },
-      },
-    };
-    whenVisible = Promise.resolve();
-    registerServiceBuilder(implementation.win, 'viewer', function() {
-      return {
-        whenFirstVisible: () => whenVisible,
-        isVisible: () => true,
       };
-    });
-    implementation.buildCallback();
-    return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
+      whenVisible = Promise.resolve();
+      registerServiceBuilder(implementation.win, 'viewer', function() {
+        return {
+          whenFirstVisible: () => whenVisible,
+          isVisible: () => true,
+        };
+      });
+      implementation.buildCallback();
+      return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
         () => {
           return p.then(fakeRegistration => {
-            expect(fakeRegistration.installing.addEventListener)
-                .to.be.calledWith('statechange', sinon.match.func);
-            expect(postMessageStub).to.be.calledWith(JSON.stringify({
-              type: 'AMP__FIRST-VISIT-CACHING',
-              payload: AMP_SCRIPTS,
-            }));
+            expect(
+              fakeRegistration.installing.addEventListener
+            ).to.be.calledWith('statechange', sinon.match.func);
+            expect(postMessageStub).to.be.calledWith(
+              JSON.stringify({
+                type: 'AMP__FIRST-VISIT-CACHING',
+                payload: AMP_SCRIPTS,
+              })
+            );
           });
-        });
-  });
-
-  it('should postMessage all a[data-rel=prefetch] scripts used to'
-    + ' service worker for prefetching', () => {
-    const install = doc.createElement('div');
-    install.setAttribute('data-prefetch', true);
-    container.appendChild(install);
-    install.getAmpDoc = () => ampdoc;
-    install.setAttribute('src', 'https://example.com/sw.js');
-    const implementation = new AmpInstallServiceWorker(install);
-    const postMessageStub = sandbox.stub();
-    const fakeRegistration = {
-      active: {
-        postMessage: postMessageStub,
-      },
-    };
-    const p = Promise.resolve(fakeRegistration);
-    implementation.win = {
-      complete: true,
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: () => {
-            return p;
+        }
+      );
+    });
+
+    it(
+      'should postMessage all a[data-rel=prefetch] scripts used to' +
+        ' service worker for prefetching',
+      () => {
+        const install = doc.createElement('div');
+        install.setAttribute('data-prefetch', true);
+        container.appendChild(install);
+        install.getAmpDoc = () => ampdoc;
+        install.setAttribute('src', 'https://example.com/sw.js');
+        const implementation = new AmpInstallServiceWorker(install);
+        const postMessageStub = sandbox.stub();
+        const fakeRegistration = {
+          active: {
+            postMessage: postMessageStub,
           },
-        },
-      },
-      document: {
-        querySelectorAll: () => [
-          {
-            href: 'https://ampproject.org/',
+        };
+        const p = Promise.resolve(fakeRegistration);
+        implementation.win = {
+          complete: true,
+          location: {
+            href: 'https://example.com/some/path',
           },
-          {
-            href: 'https://ampbyexample.com/components/amp-accordion/',
+          navigator: {
+            serviceWorker: {
+              register: () => {
+                return p;
+              },
+            },
           },
-        ],
-        createElement: () => {
-          return {
-            relList: {
-              supports: () => false,
+          document: {
+            querySelectorAll: () => [
+              {
+                href: 'https://ampproject.org/',
+              },
+              {
+                href: 'https://ampbyexample.com/components/amp-accordion/',
+              },
+            ],
+            createElement: () => {
+              return {
+                relList: {
+                  supports: () => false,
+                },
+              };
             },
+          },
+        };
+        whenVisible = Promise.resolve();
+        registerServiceBuilder(implementation.win, 'viewer', function() {
+          return {
+            whenFirstVisible: () => whenVisible,
+            isVisible: () => true,
           };
-        },
-      },
-    };
-    whenVisible = Promise.resolve();
-    registerServiceBuilder(implementation.win, 'viewer', function() {
-      return {
-        whenFirstVisible: () => whenVisible,
-        isVisible: () => true,
-      };
-    });
-    implementation.buildCallback();
-    return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
-        () => {
-          return p.then(() => {
-            expect(postMessageStub).to.be.calledWith(JSON.stringify({
-              type: 'AMP__LINK-PREFETCH',
-              payload: ['https://ampproject.org/', 'https://ampbyexample.com/components/amp-accordion/'],
-            }));
-          });
         });
-  });
-
-  it('should be ok without service worker.', () => {
-    const install = doc.createElement('amp-install-serviceworker');
-    const implementation = install.implementation_;
-    expect(implementation).to.exist;
-    install.setAttribute('src', 'https://example.com/sw.js');
-    implementation.win = {
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-      },
-    };
-    implementation.buildCallback();
-    expect(maybeInstallUrlRewriteStub).to.be.calledOnce;
-  });
-
-  it('should do nothing with non-matching origins', () => {
-    const install = doc.createElement('amp-install-serviceworker');
-    const implementation = install.implementation_;
-    expect(implementation).to.exist;
-    install.setAttribute('src', 'https://other-origin.com/sw.js');
-    const p = new Promise(() => {});
-    implementation.win = {
-      location: {
-        href: 'https://example.com/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: () => {
-            return p;
-          },
+        implementation.buildCallback();
+        return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
+          () => {
+            return p.then(() => {
+              expect(postMessageStub).to.be.calledWith(
+                JSON.stringify({
+                  type: 'AMP__LINK-PREFETCH',
+                  payload: [
+                    'https://ampproject.org/',
+                    'https://ampbyexample.com/components/amp-accordion/',
+                  ],
+                })
+              );
+            });
+          }
+        );
+      }
+    );
+
+    it('should be ok without service worker.', () => {
+      const install = doc.createElement('amp-install-serviceworker');
+      const implementation = install.implementation_;
+      expect(implementation).to.exist;
+      install.setAttribute('src', 'https://example.com/sw.js');
+      implementation.win = {
+        location: {
+          href: 'https://example.com/some/path',
         },
-      },
-    };
-    allowConsoleError(() => {
+        navigator: {},
+      };
       implementation.buildCallback();
+      expect(maybeInstallUrlRewriteStub).to.be.calledOnce;
     });
-    expect(install.children).to.have.length(0);
-  });
 
-  it('should do nothing on proxy without iframe URL', () => {
-    const install = doc.createElement('amp-install-serviceworker');
-    const implementation = install.implementation_;
-    expect(implementation).to.exist;
-    install.setAttribute('src', 'https://cdn.ampproject.org/sw.js');
-    let calledSrc;
-    const p = new Promise(() => {});
-    implementation.win = {
-      location: {
-        href: 'https://cdn.ampproject.org/some/path',
-      },
-      navigator: {
-        serviceWorker: {
-          register: src => {
-            calledSrc = src;
-            return p;
+    it('should do nothing with non-matching origins', () => {
+      const install = doc.createElement('amp-install-serviceworker');
+      const implementation = install.implementation_;
+      expect(implementation).to.exist;
+      install.setAttribute('src', 'https://other-origin.com/sw.js');
+      const p = new Promise(() => {});
+      implementation.win = {
+        location: {
+          href: 'https://example.com/some/path',
+        },
+        navigator: {
+          serviceWorker: {
+            register: () => {
+              return p;
+            },
           },
         },
-      },
-    };
-    implementation.buildCallback();
-    expect(calledSrc).to.undefined;
-    expect(install.children).to.have.length(0);
-  });
-
-  // Rewrite as proper mock window test.
-  describe('proxy iframe injection', () => {
-
-    let docInfo;
-    let install;
-    let implementation;
-    let whenVisible;
-    let calledSrc;
+      };
+      allowConsoleError(() => {
+        implementation.buildCallback();
+      });
+      expect(install.children).to.have.length(0);
+    });
 
-    beforeEach(() => {
-      install = document.createElement('div');
-      container.appendChild(install);
-      install.getAmpDoc = () => ampdoc;
-      implementation = new AmpInstallServiceWorker(install);
-      install.setAttribute('src', 'https://www.example.com/sw.js');
-      calledSrc = undefined;
+    it('should do nothing on proxy without iframe URL', () => {
+      const install = doc.createElement('amp-install-serviceworker');
+      const implementation = install.implementation_;
+      expect(implementation).to.exist;
+      install.setAttribute('src', 'https://cdn.ampproject.org/sw.js');
+      let calledSrc;
       const p = new Promise(() => {});
-      const win = {
-        complete: true,
+      implementation.win = {
         location: {
-          href: 'https://cdn.ampproject.org/c/s/www.example.com/path',
+          href: 'https://cdn.ampproject.org/some/path',
         },
         navigator: {
           serviceWorker: {
@@ -382,369 +363,444 @@ describes.realWin('amp-install-serviceworker', {
             },
           },
         },
-        setTimeout: window.setTimeout,
-        clearTimeout: window.clearTimeout,
-        document: {
-          nodeType: /* doc */ 9,
-          createElement: doc.createElement.bind(doc),
-        },
-      };
-      win.document.defaultView = win;
-      implementation.win = win;
-      docInfo = {
-        canonicalUrl: 'https://www.example.com/path',
-        sourceUrl: 'https://source.example.com/path',
       };
-      resetServiceForTesting(env.win, 'documentInfo');
-      registerServiceBuilderForDoc(doc, 'documentInfo', function() {
-        return {
-          get: () => docInfo,
+      implementation.buildCallback();
+      expect(calledSrc).to.undefined;
+      expect(install.children).to.have.length(0);
+    });
+
+    // Rewrite as proper mock window test.
+    describe('proxy iframe injection', () => {
+      let docInfo;
+      let install;
+      let implementation;
+      let whenVisible;
+      let calledSrc;
+
+      beforeEach(() => {
+        install = document.createElement('div');
+        container.appendChild(install);
+        install.getAmpDoc = () => ampdoc;
+        implementation = new AmpInstallServiceWorker(install);
+        install.setAttribute('src', 'https://www.example.com/sw.js');
+        calledSrc = undefined;
+        const p = new Promise(() => {});
+        const win = {
+          complete: true,
+          location: {
+            href: 'https://cdn.ampproject.org/c/s/www.example.com/path',
+          },
+          navigator: {
+            serviceWorker: {
+              register: src => {
+                calledSrc = src;
+                return p;
+              },
+            },
+          },
+          setTimeout: window.setTimeout,
+          clearTimeout: window.clearTimeout,
+          document: {
+            nodeType: /* doc */ 9,
+            createElement: doc.createElement.bind(doc),
+          },
         };
-      });
-      whenVisible = Promise.resolve();
-      registerServiceBuilder(win, 'viewer', function() {
-        return {
-          whenFirstVisible: () => whenVisible,
-          isVisible: () => true,
+        win.document.defaultView = win;
+        implementation.win = win;
+        docInfo = {
+          canonicalUrl: 'https://www.example.com/path',
+          sourceUrl: 'https://source.example.com/path',
         };
+        resetServiceForTesting(env.win, 'documentInfo');
+        registerServiceBuilderForDoc(doc, 'documentInfo', function() {
+          return {
+            get: () => docInfo,
+          };
+        });
+        whenVisible = Promise.resolve();
+        registerServiceBuilder(win, 'viewer', function() {
+          return {
+            whenFirstVisible: () => whenVisible,
+            isVisible: () => true,
+          };
+        });
       });
-    });
 
-    function testIframe(callCount = 1) {
-      const iframeSrc = 'https://www.example.com/install-sw.html';
-      install.setAttribute('data-iframe-src', iframeSrc);
-      let iframe;
-      const {appendChild} = install;
-      install.appendChild = child => {
-        iframe = child;
-        iframe.complete = true; // Mark as loaded.
-        expect(iframe.src).to.equal(iframeSrc);
-        iframe.src = 'about:blank';
-        appendChild.call(install, iframe);
-      };
-      const mutateElement = sandbox.stub(implementation, 'mutateElement');
-      mutateElement.callsFake(fn => {
-        expect(iframe).to.be.undefined;
-        const returnedValue = fn();
-        expect(iframe).to.exist;
-        expect(calledSrc).to.undefined;
-        expect(install).to.have.display('none');
-        expect(iframe.tagName).to.equal('IFRAME');
-        expect(iframe.getAttribute('sandbox')).to.equal(
-            'allow-same-origin allow-scripts');
-        return returnedValue;
-      });
-      implementation.buildCallback();
-      return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
+      function testIframe(callCount = 1) {
+        const iframeSrc = 'https://www.example.com/install-sw.html';
+        install.setAttribute('data-iframe-src', iframeSrc);
+        let iframe;
+        const {appendChild} = install;
+        install.appendChild = child => {
+          iframe = child;
+          iframe.complete = true; // Mark as loaded.
+          expect(iframe.src).to.equal(iframeSrc);
+          iframe.src = 'about:blank';
+          appendChild.call(install, iframe);
+        };
+        const mutateElement = sandbox.stub(implementation, 'mutateElement');
+        mutateElement.callsFake(fn => {
+          expect(iframe).to.be.undefined;
+          const returnedValue = fn();
+          expect(iframe).to.exist;
+          expect(calledSrc).to.undefined;
+          expect(install).to.have.display('none');
+          expect(iframe.tagName).to.equal('IFRAME');
+          expect(iframe.getAttribute('sandbox')).to.equal(
+            'allow-same-origin allow-scripts'
+          );
+          return returnedValue;
+        });
+        implementation.buildCallback();
+        return Promise.all([whenVisible, loadPromise(implementation.win)]).then(
           () => {
             expect(mutateElement).to.have.been.callCount(callCount);
-          });
-    }
+          }
+        );
+      }
 
-    it('should inject iframe on proxy if provided (valid canonical)', () => {
-      return testIframe();
-    });
+      it('should inject iframe on proxy if provided (valid canonical)', () => {
+        return testIframe();
+      });
 
-    it('should inject iframe on proxy if provided (valid source)', () => {
-      docInfo = {
-        canonicalUrl: 'https://canonical.example.com/path',
-        sourceUrl: 'https://www.example.com/path',
-      };
-      testIframe();
-    });
+      it('should inject iframe on proxy if provided (valid source)', () => {
+        docInfo = {
+          canonicalUrl: 'https://canonical.example.com/path',
+          sourceUrl: 'https://www.example.com/path',
+        };
+        testIframe();
+      });
 
-    it('should reject bad iframe URL (not same origin)', () => {
-      install.setAttribute('data-iframe-src',
-          'https://www2.example.com/install-sw.html');
-      allowConsoleError(() => { expect(() => {
-        implementation.buildCallback();
-      }).to.throw(/should be a URL on the same origin as the source/); });
-    });
+      it('should reject bad iframe URL (not same origin)', () => {
+        install.setAttribute(
+          'data-iframe-src',
+          'https://www2.example.com/install-sw.html'
+        );
+        allowConsoleError(() => {
+          expect(() => {
+            implementation.buildCallback();
+          }).to.throw(/should be a URL on the same origin as the source/);
+        });
+      });
 
-    it('should reject bad iframe URL (not https)', () => {
-      install.setAttribute('data-iframe-src',
-          'http://www.example.com/install-sw.html');
-      allowConsoleError(() => { expect(() => {
-        implementation.buildCallback();
-      }).to.throw(/https/); });
-    });
+      it('should reject bad iframe URL (not https)', () => {
+        install.setAttribute(
+          'data-iframe-src',
+          'http://www.example.com/install-sw.html'
+        );
+        allowConsoleError(() => {
+          expect(() => {
+            implementation.buildCallback();
+          }).to.throw(/https/);
+        });
+      });
 
-    it('should not inject iframe on proxy if safari', () => {
-      implementation.isSafari_ = true;
-      return allowConsoleError(() => testIframe(0));
+      it('should not inject iframe on proxy if safari', () => {
+        implementation.isSafari_ = true;
+        return allowConsoleError(() => testIframe(0));
+      });
     });
-  });
-});
-
+  }
+);
 
-describes.fakeWin('url rewriter', {
-  win: {
-    location: 'https://example.com/thisdoc.amp.html',
+describes.fakeWin(
+  'url rewriter',
+  {
+    win: {
+      location: 'https://example.com/thisdoc.amp.html',
+    },
+    amp: 1,
   },
-  amp: 1,
-}, env => {
-  let win;
-  let ampdoc;
-  let viewer;
-  let element;
-  let implementation;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    viewer = win.services.viewer.obj;
-    stubUrlService(sandbox);
-    element = win.document.createElement('amp-install-serviceworker');
-    element.setAttribute('src', 'https://example.com/sw.js');
-    // This is a RegExp string.
-    element.setAttribute('data-no-service-worker-fallback-url-match',
-        '\\.amp\\.html');
-    element.setAttribute('data-no-service-worker-fallback-shell-url',
-        'https://example.com/shell');
-    element.getAmpDoc = () => ampdoc;
-    implementation = new AmpInstallServiceWorker(element);
-  });
+  env => {
+    let win;
+    let ampdoc;
+    let viewer;
+    let element;
+    let implementation;
 
-  describe('install conditions', () => {
     beforeEach(() => {
-      sandbox.stub(implementation, 'preloadShell_');
-    });
-
-    it('should install rewriter', () => {
-      implementation.maybeInstallUrlRewrite_();
-      expect(implementation.urlRewriter_).to.be.ok;
-      expect(implementation.urlRewriter_.urlMatchExpr_.source)
-          .to.equal('\\.amp\\.html');
-      expect(implementation.urlRewriter_.shellUrl_)
-          .to.equal('https://example.com/shell');
-    });
-
-    it('should strip fragment from shell URL', () => {
-      element.setAttribute('data-no-service-worker-fallback-shell-url',
-          'https://example.com/shell#abc');
-      implementation.maybeInstallUrlRewrite_();
-      expect(implementation.urlRewriter_.shellUrl_)
-          .to.equal('https://example.com/shell');
-    });
-
-    it('should not install in multi-doc environment', () => {
-      element.getAmpDoc = () => {
-        return {isSingleDoc: () => false};
-      };
-      implementation.maybeInstallUrlRewrite_();
-      expect(implementation.urlRewriter_).to.be.null;
-    });
-
-    it('should install on proxy', () => {
-      win.location.resetHref('https://cdn.ampproject.org/c/s/example.com/doc1');
-      implementation.maybeInstallUrlRewrite_();
-      expect(implementation.urlRewriter_).to.be.not.null;
-    });
+      win = env.win;
+      ampdoc = env.ampdoc;
+      viewer = win.services.viewer.obj;
+      stubUrlService(sandbox);
+      element = win.document.createElement('amp-install-serviceworker');
+      element.setAttribute('src', 'https://example.com/sw.js');
+      // This is a RegExp string.
+      element.setAttribute(
+        'data-no-service-worker-fallback-url-match',
+        '\\.amp\\.html'
+      );
+      element.setAttribute(
+        'data-no-service-worker-fallback-shell-url',
+        'https://example.com/shell'
+      );
+      element.getAmpDoc = () => ampdoc;
+      implementation = new AmpInstallServiceWorker(element);
+    });
+
+    describe('install conditions', () => {
+      beforeEach(() => {
+        sandbox.stub(implementation, 'preloadShell_');
+      });
 
-    it('should not install when mask/shell not configured', () => {
-      element.removeAttribute('data-no-service-worker-fallback-url-match');
-      element.removeAttribute('data-no-service-worker-fallback-shell-url');
-      implementation.maybeInstallUrlRewrite_();
-      expect(implementation.urlRewriter_).to.be.null;
-    });
+      it('should install rewriter', () => {
+        implementation.maybeInstallUrlRewrite_();
+        expect(implementation.urlRewriter_).to.be.ok;
+        expect(implementation.urlRewriter_.urlMatchExpr_.source).to.equal(
+          '\\.amp\\.html'
+        );
+        expect(implementation.urlRewriter_.shellUrl_).to.equal(
+          'https://example.com/shell'
+        );
+      });
 
-    it('should fail when only mask configured', () => {
-      element.removeAttribute('data-no-service-worker-fallback-shell-url');
-      allowConsoleError(() => { expect(() => {
+      it('should strip fragment from shell URL', () => {
+        element.setAttribute(
+          'data-no-service-worker-fallback-shell-url',
+          'https://example.com/shell#abc'
+        );
         implementation.maybeInstallUrlRewrite_();
-      }).to.throw(/must be specified/); });
-    });
+        expect(implementation.urlRewriter_.shellUrl_).to.equal(
+          'https://example.com/shell'
+        );
+      });
 
-    it('should fail when only shell configured', () => {
-      element.removeAttribute('data-no-service-worker-fallback-url-match');
-      allowConsoleError(() => { expect(() => {
+      it('should not install in multi-doc environment', () => {
+        element.getAmpDoc = () => {
+          return {isSingleDoc: () => false};
+        };
         implementation.maybeInstallUrlRewrite_();
-      }).to.throw(/must be specified/); });
-    });
+        expect(implementation.urlRewriter_).to.be.null;
+      });
 
-    it('should fail when shell is on different origin', () => {
-      element.setAttribute('data-no-service-worker-fallback-shell-url',
-          'https://acme.org/shell#abc');
-      allowConsoleError(() => { expect(() => {
+      it('should install on proxy', () => {
+        win.location.resetHref(
+          'https://cdn.ampproject.org/c/s/example.com/doc1'
+        );
         implementation.maybeInstallUrlRewrite_();
-      }).to.throw(/must be the same as source origin/); });
-    });
+        expect(implementation.urlRewriter_).to.be.not.null;
+      });
 
-    it('should fail when mask is an invalid expression', () => {
-      element.setAttribute('data-no-service-worker-fallback-url-match',
-          '?');
-      expect(() => {
+      it('should not install when mask/shell not configured', () => {
+        element.removeAttribute('data-no-service-worker-fallback-url-match');
+        element.removeAttribute('data-no-service-worker-fallback-shell-url');
         implementation.maybeInstallUrlRewrite_();
-      }).to.throw(/Invalid/);
+        expect(implementation.urlRewriter_).to.be.null;
+      });
+
+      it('should fail when only mask configured', () => {
+        element.removeAttribute('data-no-service-worker-fallback-shell-url');
+        allowConsoleError(() => {
+          expect(() => {
+            implementation.maybeInstallUrlRewrite_();
+          }).to.throw(/must be specified/);
+        });
+      });
+
+      it('should fail when only shell configured', () => {
+        element.removeAttribute('data-no-service-worker-fallback-url-match');
+        allowConsoleError(() => {
+          expect(() => {
+            implementation.maybeInstallUrlRewrite_();
+          }).to.throw(/must be specified/);
+        });
+      });
+
+      it('should fail when shell is on different origin', () => {
+        element.setAttribute(
+          'data-no-service-worker-fallback-shell-url',
+          'https://acme.org/shell#abc'
+        );
+        allowConsoleError(() => {
+          expect(() => {
+            implementation.maybeInstallUrlRewrite_();
+          }).to.throw(/must be the same as source origin/);
+        });
+      });
+
+      it('should fail when mask is an invalid expression', () => {
+        element.setAttribute('data-no-service-worker-fallback-url-match', '?');
+        expect(() => {
+          implementation.maybeInstallUrlRewrite_();
+        }).to.throw(/Invalid/);
+      });
     });
-  });
 
-  describe('start shell preload', () => {
-    let mutateElementStub;
-    let preloadStub;
+    describe('start shell preload', () => {
+      let mutateElementStub;
+      let preloadStub;
 
-    beforeEach(() => {
-      mutateElementStub = sandbox.stub(implementation, 'mutateElement')
+      beforeEach(() => {
+        mutateElementStub = sandbox
+          .stub(implementation, 'mutateElement')
           .callsFake(callback => callback());
-      preloadStub = sandbox.stub(implementation, 'preloadShell_');
-      viewer.setVisibilityState_('visible');
-    });
+        preloadStub = sandbox.stub(implementation, 'preloadShell_');
+        viewer.setVisibilityState_('visible');
+      });
 
-    it('should start preload wait', () => {
-      const stub = sandbox.stub(implementation, 'waitToPreloadShell_');
-      implementation.maybeInstallUrlRewrite_();
-      expect(stub).to.be.calledOnce;
-    });
+      it('should start preload wait', () => {
+        const stub = sandbox.stub(implementation, 'waitToPreloadShell_');
+        implementation.maybeInstallUrlRewrite_();
+        expect(stub).to.be.calledOnce;
+      });
 
-    it('should not preload non-HTTPS shell', () => {
-      win.location.resetHref('http://example.com/thisdoc.amp.html');
-      element.setAttribute('data-no-service-worker-fallback-shell-url',
-          'http://example.com/shell');
-      const stub = sandbox.stub(implementation, 'waitToPreloadShell_');
-      implementation.maybeInstallUrlRewrite_();
-      expect(stub).to.not.be.called;
-    });
+      it('should not preload non-HTTPS shell', () => {
+        win.location.resetHref('http://example.com/thisdoc.amp.html');
+        element.setAttribute(
+          'data-no-service-worker-fallback-shell-url',
+          'http://example.com/shell'
+        );
+        const stub = sandbox.stub(implementation, 'waitToPreloadShell_');
+        implementation.maybeInstallUrlRewrite_();
+        expect(stub).to.not.be.called;
+      });
 
-    it('should run preload when visible', () => {
-      implementation.waitToPreloadShell_('https://example.com/shell');
-      expect(preloadStub).to.not.be.called;
-      return loadPromise(win).then(() => {
-        return viewer.whenFirstVisible();
-      }).then(() => {
-        expect(preloadStub).to.be.calledOnce;
-        expect(mutateElementStub).to.be.calledOnce;
+      it('should run preload when visible', () => {
+        implementation.waitToPreloadShell_('https://example.com/shell');
+        expect(preloadStub).to.not.be.called;
+        return loadPromise(win)
+          .then(() => {
+            return viewer.whenFirstVisible();
+          })
+          .then(() => {
+            expect(preloadStub).to.be.calledOnce;
+            expect(mutateElementStub).to.be.calledOnce;
+          });
       });
     });
-  });
 
-  describe('shell preload', () => {
-    it('should install iframe', () => {
-      implementation.preloadShell_('https://example.com/shell');
-      const iframe = element.querySelector('iframe');
-      expect(iframe).to.exist;
-      expect(iframe.src).to.equal('https://example.com/shell#preload');
-      expect(iframe).to.have.attribute('hidden');
-      expect(iframe.getAttribute('sandbox'))
-          .to.equal('allow-scripts allow-same-origin');
-    });
+    describe('shell preload', () => {
+      it('should install iframe', () => {
+        implementation.preloadShell_('https://example.com/shell');
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.exist;
+        expect(iframe.src).to.equal('https://example.com/shell#preload');
+        expect(iframe).to.have.attribute('hidden');
+        expect(iframe.getAttribute('sandbox')).to.equal(
+          'allow-scripts allow-same-origin'
+        );
+      });
 
-    it('should remove iframe once laoded', () => {
-      implementation.preloadShell_('https://example.com/shell');
-      const iframe = element.querySelector('iframe');
-      expect(iframe).to.exist;
-      expect(iframe.eventListeners).to.exist;
-      expect(iframe.parentNode).to.equal(element);
-      const loaded = loadPromise(iframe);
-      iframe.eventListeners.fire({type: 'load'});
-      return loaded.then(() => {
-        expect(iframe.parentNode).to.be.null;
+      it('should remove iframe once laoded', () => {
+        implementation.preloadShell_('https://example.com/shell');
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.exist;
+        expect(iframe.eventListeners).to.exist;
+        expect(iframe.parentNode).to.equal(element);
+        const loaded = loadPromise(iframe);
+        iframe.eventListeners.fire({type: 'load'});
+        return loaded.then(() => {
+          expect(iframe.parentNode).to.be.null;
+        });
       });
     });
-  });
 
-  describe('UrlRewriter', () => {
-    let rewriter;
-    let event;
-    let anchor;
-    let span;
-    let other;
-    let origHref;
+    describe('UrlRewriter', () => {
+      let rewriter;
+      let event;
+      let anchor;
+      let span;
+      let other;
+      let origHref;
 
-    beforeEach(() => {
-      sandbox.stub(implementation, 'preloadShell_');
-      implementation.maybeInstallUrlRewrite_();
-      rewriter = implementation.urlRewriter_;
-      anchor = win.document.createElement('a');
-      origHref = 'https://example.com/doc1.amp.html';
-      anchor.setAttribute('href', origHref);
-      span = win.document.createElement('span');
-      anchor.appendChild(span);
-      other = win.document.createElement('div');
-      event = {
-        type: 'click',
-        target: anchor,
-        defaultPrevented: false,
-        preventDefault: () => {
-          event.defaultPrevented = true;
-        },
-      };
-    });
+      beforeEach(() => {
+        sandbox.stub(implementation, 'preloadShell_');
+        implementation.maybeInstallUrlRewrite_();
+        rewriter = implementation.urlRewriter_;
+        anchor = win.document.createElement('a');
+        origHref = 'https://example.com/doc1.amp.html';
+        anchor.setAttribute('href', origHref);
+        span = win.document.createElement('span');
+        anchor.appendChild(span);
+        other = win.document.createElement('div');
+        event = {
+          type: 'click',
+          target: anchor,
+          defaultPrevented: false,
+          preventDefault: () => {
+            event.defaultPrevented = true;
+          },
+        };
+      });
 
-    function testRewritten() {
-      expect(anchor.getAttribute('i-amphtml-orig-href'))
-          .to.equal('https://example.com/doc1.amp.html');
-      expect(anchor.href)
-          .to.equal('https://example.com/shell#href=%2Fdoc1.amp.html');
-      expect(event.defaultPrevented).to.be.false;
-    }
-
-    function testNotRewritten() {
-      expect(anchor.getAttribute('i-amphtml-orig-href')).to.be.null;
-      expect(anchor.href).to.equal(origHref);
-    }
-
-    it('should rewrite URL', () => {
-      rewriter.handle_(event);
-      testRewritten();
-    });
+      function testRewritten() {
+        expect(anchor.getAttribute('i-amphtml-orig-href')).to.equal(
+          'https://example.com/doc1.amp.html'
+        );
+        expect(anchor.href).to.equal(
+          'https://example.com/shell#href=%2Fdoc1.amp.html'
+        );
+        expect(event.defaultPrevented).to.be.false;
+      }
+
+      function testNotRewritten() {
+        expect(anchor.getAttribute('i-amphtml-orig-href')).to.be.null;
+        expect(anchor.href).to.equal(origHref);
+      }
+
+      it('should rewrite URL', () => {
+        rewriter.handle_(event);
+        testRewritten();
+      });
 
-    it('should rewrite URL from a child', () => {
-      event.target = span;
-      rewriter.handle_(event);
-      testRewritten();
-    });
+      it('should rewrite URL from a child', () => {
+        event.target = span;
+        rewriter.handle_(event);
+        testRewritten();
+      });
 
-    it('should not rewrite URL if event is canceled', () => {
-      event.preventDefault();
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite URL if event is canceled', () => {
+        event.preventDefault();
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite URL if anchor is not found', () => {
-      event.target = other;
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite URL if anchor is not found', () => {
+        event.target = other;
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite URL if anchor has no target', () => {
-      origHref = '';
-      anchor.removeAttribute('href');
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite URL if anchor has no target', () => {
+        origHref = '';
+        anchor.removeAttribute('href');
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite URL with different origin', () => {
-      origHref = 'https://acme.org/doc1.amp.html';
-      anchor.setAttribute('href', origHref);
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite URL with different origin', () => {
+        origHref = 'https://acme.org/doc1.amp.html';
+        anchor.setAttribute('href', origHref);
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite shell URL', () => {
-      origHref = 'https://example.com/shell?a=amp.html';
-      anchor.setAttribute('href', origHref);
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite shell URL', () => {
+        origHref = 'https://example.com/shell?a=amp.html';
+        anchor.setAttribute('href', origHref);
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite non-masked URL', () => {
-      origHref = 'https://example.com/doc1.html';
-      anchor.setAttribute('href', origHref);
-      rewriter.handle_(event);
-      testNotRewritten();
-    });
+      it('should not rewrite non-masked URL', () => {
+        origHref = 'https://example.com/doc1.html';
+        anchor.setAttribute('href', origHref);
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
 
-    it('should not rewrite already rewritten URL', () => {
-      anchor.setAttribute('i-amphtml-orig-href', 'rewritten');
-      rewriter.handle_(event);
-      expect(anchor.href).to.equal(origHref);
-    });
+      it('should not rewrite already rewritten URL', () => {
+        anchor.setAttribute('i-amphtml-orig-href', 'rewritten');
+        rewriter.handle_(event);
+        expect(anchor.href).to.equal(origHref);
+      });
 
-    it('should not rewrite fragment URL', () => {
-      origHref = 'https://example.com/thisdoc.amp.html#hash';
-      anchor.setAttribute('href', origHref);
-      rewriter.handle_(event);
-      testNotRewritten();
+      it('should not rewrite fragment URL', () => {
+        origHref = 'https://example.com/thisdoc.amp.html#hash';
+        anchor.setAttribute('href', origHref);
+        rewriter.handle_(event);
+        testNotRewritten();
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-izlesene/0.1/amp-izlesene.js b/extensions/amp-izlesene/0.1/amp-izlesene.js
index 3fbdb9ef75c2..2c147ae7fb87 100644
--- a/extensions/amp-izlesene/0.1/amp-izlesene.js
+++ b/extensions/amp-izlesene/0.1/amp-izlesene.js
@@ -20,7 +20,6 @@ import {dict} from '../../../src/utils/object';
 import {getDataParamsFromAttributes} from '../../../src/dom';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
-
 class AmpIzlesene extends AMP.BaseElement {
   /**
    *Creates an instance of AmpIzlesene.
@@ -54,9 +53,10 @@ class AmpIzlesene extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.videoid_ = userAssert(
-        this.element.getAttribute('data-videoid'),
-        'The data-videoid attribute is required for <amp-izlesene> %s',
-        this.element);
+      this.element.getAttribute('data-videoid'),
+      'The data-videoid attribute is required for <amp-izlesene> %s',
+      this.element
+    );
   }
 
   /** @return {string} */
@@ -66,7 +66,10 @@ class AmpIzlesene extends AMP.BaseElement {
     }
 
     devAssert(this.videoid_);
-    let src = 'https://www.izlesene.com/embedplayer/' + encodeURIComponent(this.videoid_ || '') + '/?';
+    let src =
+      'https://www.izlesene.com/embedplayer/' +
+      encodeURIComponent(this.videoid_ || '') +
+      '/?';
 
     const params = getDataParamsFromAttributes(this.element);
     if ('autoplay' in params) {
@@ -75,7 +78,7 @@ class AmpIzlesene extends AMP.BaseElement {
     }
 
     src = addParamsToUrl(src, params);
-    return this.videoIframeSrc_ = src;
+    return (this.videoIframeSrc_ = src);
   }
 
   /** @override */
@@ -96,14 +99,16 @@ class AmpIzlesene extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage(dict({
-        'command': 'pause',
-      }), '*');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        dict({
+          'command': 'pause',
+        }),
+        '*'
+      );
     }
   }
 }
 
-
 AMP.extension('amp-izlesene', '0.1', AMP => {
   AMP.registerElement('amp-izlesene', AmpIzlesene);
 });
diff --git a/extensions/amp-izlesene/0.1/test/test-amp-izlesene.js b/extensions/amp-izlesene/0.1/test/test-amp-izlesene.js
index f7607b0b73e3..02c1ee181350 100644
--- a/extensions/amp-izlesene/0.1/test/test-amp-izlesene.js
+++ b/extensions/amp-izlesene/0.1/test/test-amp-izlesene.js
@@ -16,55 +16,63 @@
 
 import '../amp-izlesene';
 
-
-describes.realWin('amp-izlesene', {
-  amp: {
-    extensions: ['amp-izlesene'],
+describes.realWin(
+  'amp-izlesene',
+  {
+    amp: {
+      extensions: ['amp-izlesene'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getIzlesene(videoId, opt_responsive) {
-    const izlesene = doc.createElement('amp-izlesene');
-    izlesene.setAttribute('data-videoid', videoId);
-    izlesene.setAttribute('width', '111');
-    izlesene.setAttribute('height', '222');
-    if (opt_responsive) {
-      izlesene.setAttribute('layout', 'responsive');
+    function getIzlesene(videoId, opt_responsive) {
+      const izlesene = doc.createElement('amp-izlesene');
+      izlesene.setAttribute('data-videoid', videoId);
+      izlesene.setAttribute('width', '111');
+      izlesene.setAttribute('height', '222');
+      if (opt_responsive) {
+        izlesene.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(izlesene);
+      return izlesene
+        .build()
+        .then(() => {
+          return izlesene.layoutCallback();
+        })
+        .then(() => izlesene);
     }
-    doc.body.appendChild(izlesene);
-    return izlesene.build().then(() => {
-      return izlesene.layoutCallback();
-    }).then(() => izlesene);
-  }
 
-  it('renders', () => {
-    return getIzlesene('7221390').then(izlesene => {
-      const iframe = izlesene.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://www.izlesene.com/embedplayer/7221390/?');
+    it('renders', () => {
+      return getIzlesene('7221390').then(izlesene => {
+        const iframe = izlesene.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://www.izlesene.com/embedplayer/7221390/?'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getIzlesene('7221390', true).then(izlesene => {
-      const iframe = izlesene.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getIzlesene('7221390', true).then(izlesene => {
+        const iframe = izlesene.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-videoid', () => {
-    return allowConsoleError(() => {
-      return getIzlesene('').should.eventually.be.rejectedWith(
-          /The data-videoid attribute is required for/);
+    it('requires data-videoid', () => {
+      return allowConsoleError(() => {
+        return getIzlesene('').should.eventually.be.rejectedWith(
+          /The data-videoid attribute is required for/
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-jwplayer/0.1/amp-jwplayer.js b/extensions/amp-jwplayer/0.1/amp-jwplayer.js
index 1660fd48140c..aac48482b9f7 100644
--- a/extensions/amp-jwplayer/0.1/amp-jwplayer.js
+++ b/extensions/amp-jwplayer/0.1/amp-jwplayer.js
@@ -20,9 +20,7 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {removeElement} from '../../../src/dom';
 import {userAssert} from '../../../src/log';
 
-
 class AmpJWPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -69,28 +67,26 @@ class AmpJWPlayer extends AMP.BaseElement {
   buildCallback() {
     const {element} = this;
     this.contentid_ = userAssert(
-        (element.getAttribute('data-playlist-id') ||
-        element.getAttribute('data-media-id')),
-        'Either the data-media-id or the data-playlist-id ' +
+      element.getAttribute('data-playlist-id') ||
+        element.getAttribute('data-media-id'),
+      'Either the data-media-id or the data-playlist-id ' +
         'attributes must be specified for <amp-jwplayer> %s',
-        element);
+      element
+    );
 
     this.playerid_ = userAssert(
-        element.getAttribute('data-player-id'),
-        'The data-player-id attribute is required for <amp-jwplayer> %s',
-        element);
-
-    this.contentSearch_ = element.getAttribute('data-content-search') ||
-        '';
-    this.contentContextual_ = element.getAttribute('data-content-contextual') ||
-        '';
-    this.contentRecency_ = element.getAttribute('data-content-recency') ||
-        '';
-    this.contentBackfill_ = element.getAttribute('data-content-backfill') ||
-        '';
+      element.getAttribute('data-player-id'),
+      'The data-player-id attribute is required for <amp-jwplayer> %s',
+      element
+    );
+
+    this.contentSearch_ = element.getAttribute('data-content-search') || '';
+    this.contentContextual_ =
+      element.getAttribute('data-content-contextual') || '';
+    this.contentRecency_ = element.getAttribute('data-content-recency') || '';
+    this.contentBackfill_ = element.getAttribute('data-content-backfill') || '';
   }
 
-
   /** @override */
   layoutCallback() {
     const iframe = this.element.ownerDocument.createElement('iframe');
@@ -120,8 +116,10 @@ class AmpJWPlayer extends AMP.BaseElement {
     if (this.iframe_ && this.iframe_.contentWindow) {
       // The /players page can respond to "play" and "pause" commands from the
       // iframe's parent
-      this.iframe_.contentWindow./*OK*/postMessage('pause',
-          'https://content.jwplatform.com');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        'pause',
+        'https://content.jwplatform.com'
+      );
     }
   }
 
@@ -141,14 +139,19 @@ class AmpJWPlayer extends AMP.BaseElement {
     }
     const placeholder = this.win.document.createElement('amp-img');
     this.propagateAttributes(['aria-label'], placeholder);
-    placeholder.setAttribute('src', 'https://content.jwplatform.com/thumbs/' +
-      encodeURIComponent(this.contentid_) + '-720.jpg');
+    placeholder.setAttribute(
+      'src',
+      'https://content.jwplatform.com/thumbs/' +
+        encodeURIComponent(this.contentid_) +
+        '-720.jpg'
+    );
     placeholder.setAttribute('layout', 'fill');
     placeholder.setAttribute('placeholder', '');
     placeholder.setAttribute('referrerpolicy', 'origin');
     if (placeholder.hasAttribute('aria-label')) {
-      placeholder.setAttribute('alt',
-          'Loading video - ' + placeholder.getAttribute('aria-label')
+      placeholder.setAttribute(
+        'alt',
+        'Loading video - ' + placeholder.getAttribute('aria-label')
       );
     } else {
       placeholder.setAttribute('alt', 'Loading video');
@@ -156,18 +159,19 @@ class AmpJWPlayer extends AMP.BaseElement {
     return placeholder;
   }
   /**
-  *
-  */
+   *
+   */
   getContextualVal() {
     if (this.contentSearch_ === '__CONTEXTUAL__') {
       const context = this.getAmpDoc().getHeadNode();
       const ogTitleElement = context.querySelector('meta[property="og:title"]');
-      const ogTitle = ogTitleElement ?
-        ogTitleElement.getAttribute('content') : null;
+      const ogTitle = ogTitleElement
+        ? ogTitleElement.getAttribute('content')
+        : null;
       const title = (context.querySelector('title') || {}).textContent;
       return ogTitle || title || '';
     }
-    return this.contentSearch_ ;
+    return this.contentSearch_;
   }
 }
 
diff --git a/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js b/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
index 1a441cd84b1c..10af83c0a250 100644
--- a/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
+++ b/extensions/amp-jwplayer/0.1/test/test-amp-jwplayer.js
@@ -17,177 +17,200 @@
 import '../amp-jwplayer';
 import {htmlFor} from '../../../../src/static-template';
 
-describes.realWin('amp-jwplayer', {
-  amp: {
-    extensions: ['amp-jwplayer'],
+describes.realWin(
+  'amp-jwplayer',
+  {
+    amp: {
+      extensions: ['amp-jwplayer'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getjwplayer(attributes) {
-    const jw = doc.createElement('amp-jwplayer');
-    for (const key in attributes) {
-      jw.setAttribute(key, attributes[key]);
-    }
-    jw.setAttribute('width', '320');
-    jw.setAttribute('height', '180');
-    jw.setAttribute('layout', 'responsive');
-    const html = htmlFor(env.win.document);
-    env.sandbox.stub(env.ampdoc.getHeadNode(), 'querySelector')
+    function getjwplayer(attributes) {
+      const jw = doc.createElement('amp-jwplayer');
+      for (const key in attributes) {
+        jw.setAttribute(key, attributes[key]);
+      }
+      jw.setAttribute('width', '320');
+      jw.setAttribute('height', '180');
+      jw.setAttribute('layout', 'responsive');
+      const html = htmlFor(env.win.document);
+      env.sandbox
+        .stub(env.ampdoc.getHeadNode(), 'querySelector')
         .withArgs('meta[property="og:title"]')
         .returns(
-            html`<meta property="og:title" content="title_tag" />`
+          html`
+            <meta property="og:title" content="title_tag" />
+          `
         );
-    doc.body.appendChild(jw);
-    return jw.build().then(() => { jw.layoutCallback(); return jw; });
-  }
-
-  it('renders', async() => {
-    const jw = await getjwplayer({
-      'data-media-id': 'Wferorsv',
-      'data-player-id': 'sDZEo0ea',
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/Wferorsv-sDZEo0ea.html');
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-  });
-
-  it('renders with a playlist', async() => {
-    const jw = await getjwplayer({
-      'data-playlist-id': '482jsTAr',
-      'data-player-id': 'sDZEo0ea',
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html');
-  });
-  it('renders with a playlist and parses contextual parameter', async() => {
-    const jw = await getjwplayer({
-      'data-playlist-id': '482jsTAr',
-      'data-player-id': 'sDZEo0ea',
-      'data-content-search': '__CONTEXTUAL__',
-      'data-content-contextual': true,
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?search=title_tag&contextual=true');
-  });
-  it('renders with a playlist and all parameters', async() => {
-    const jw = await getjwplayer({
-      'data-playlist-id': '482jsTAr',
-      'data-player-id': 'sDZEo0ea',
-      'data-content-search': 'dog',
-      'data-content-contextual': true,
-      'data-content-recency': '9D',
-      'data-content-backfill': true,
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?search=dog&contextual=true&recency=9D&backfill=true');
-  });
-  it('renders with a playlist and contextual, backfill parameters', async() => {
-    const jw = await getjwplayer({
-      'data-playlist-id': '482jsTAr',
-      'data-player-id': 'sDZEo0ea',
-      'data-content-contextual': true,
-      'data-content-backfill': true,
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?contextual=true&backfill=true');
-  });
-  it('renders with a playlist and contextual parameter', async() => {
-    const jw = await getjwplayer({
-      'data-playlist-id': '482jsTAr',
-      'data-player-id': 'sDZEo0ea',
-      'data-content-contextual': true,
-    });
-    const iframe = jw.querySelector('iframe');
-    expect(iframe).to.not.be.null;
-    expect(iframe.tagName).to.equal('IFRAME');
-    expect(iframe.src).to.equal(
-        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?contextual=true');
-  });
+      doc.body.appendChild(jw);
+      return jw.build().then(() => {
+        jw.layoutCallback();
+        return jw;
+      });
+    }
 
-  it('fails if no media is specified', () => {
-    return allowConsoleError(() => { return getjwplayer({
-      'data-player-id': 'sDZEo0ea',
-    }).should.eventually.be.rejectedWith(
-        /Either the data-media-id or the data-playlist-id attributes must be/);
+    it('renders', async () => {
+      const jw = await getjwplayer({
+        'data-media-id': 'Wferorsv',
+        'data-player-id': 'sDZEo0ea',
+      });
+      const iframe = jw.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://content.jwplatform.com/players/Wferorsv-sDZEo0ea.html'
+      );
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
     });
-  });
 
-  it('fails if no player is specified', () => {
-    return allowConsoleError(() => { return getjwplayer({
-      'data-media-id': 'Wferorsv',
-    }).should.eventually.be.rejectedWith(
-        /The data-player-id attribute is required for/);
+    it('renders with a playlist', async () => {
+      const jw = await getjwplayer({
+        'data-playlist-id': '482jsTAr',
+        'data-player-id': 'sDZEo0ea',
+      });
+      const iframe = jw.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html'
+      );
     });
-  });
-
-  it('renders with a bad playlist', () => {
-    return getjwplayer({
-      'data-playlist-id': 'zzz',
-      'data-player-id': 'sDZEo0ea',
-    }).then(jw => {
+    it('renders with a playlist and parses contextual parameter', async () => {
+      const jw = await getjwplayer({
+        'data-playlist-id': '482jsTAr',
+        'data-player-id': 'sDZEo0ea',
+        'data-content-search': '__CONTEXTUAL__',
+        'data-content-contextual': true,
+      });
       const iframe = jw.querySelector('iframe');
       expect(iframe).to.not.be.null;
       expect(iframe.tagName).to.equal('IFRAME');
       expect(iframe.src).to.equal(
-          'https://content.jwplatform.com/players/zzz-sDZEo0ea.html');
+        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?search=title_tag&contextual=true'
+      );
     });
-  });
-
-  describe('createPlaceholderCallback', () => {
-    it('should create a placeholder image', async() => {
+    it('renders with a playlist and all parameters', async () => {
       const jw = await getjwplayer({
-        'data-media-id': 'Wferorsv',
+        'data-playlist-id': '482jsTAr',
         'data-player-id': 'sDZEo0ea',
+        'data-content-search': 'dog',
+        'data-content-contextual': true,
+        'data-content-recency': '9D',
+        'data-content-backfill': true,
       });
-      const img = jw.querySelector('amp-img');
-      expect(img).to.not.be.null;
-      expect(img.getAttribute('src')).to.equal(
-          'https://content.jwplatform.com/thumbs/Wferorsv-720.jpg');
-      expect(img.getAttribute('layout')).to.equal('fill');
-      expect(img.hasAttribute('placeholder')).to.be.true;
-      expect(img.getAttribute('referrerpolicy')).to.equal('origin');
-      expect(img.getAttribute('alt')).to.equal('Loading video');
+      const iframe = jw.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?search=dog&contextual=true&recency=9D&backfill=true'
+      );
     });
-    it('should propagate aria-label to placeholder', async() => {
+    it('renders with a playlist and contextual, backfill parameters', async () => {
       const jw = await getjwplayer({
-        'data-media-id': 'Wferorsv',
+        'data-playlist-id': '482jsTAr',
         'data-player-id': 'sDZEo0ea',
-        'aria-label': 'interesting video',
+        'data-content-contextual': true,
+        'data-content-backfill': true,
       });
-      const img = jw.querySelector('amp-img');
-      expect(img).to.not.be.null;
-      expect(img.getAttribute('aria-label')).to.equal('interesting video');
-      expect(img.getAttribute('alt'))
-          .to.equal('Loading video - interesting video');
+      const iframe = jw.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?contextual=true&backfill=true'
+      );
     });
-    it('should not create a placeholder for playlists', async() => {
+    it('renders with a playlist and contextual parameter', async () => {
       const jw = await getjwplayer({
-        'data-playlist-id': 'Wferorsv',
+        'data-playlist-id': '482jsTAr',
+        'data-player-id': 'sDZEo0ea',
+        'data-content-contextual': true,
+      });
+      const iframe = jw.querySelector('iframe');
+      expect(iframe).to.not.be.null;
+      expect(iframe.tagName).to.equal('IFRAME');
+      expect(iframe.src).to.equal(
+        'https://content.jwplatform.com/players/482jsTAr-sDZEo0ea.html?contextual=true'
+      );
+    });
+
+    it('fails if no media is specified', () => {
+      return allowConsoleError(() => {
+        return getjwplayer({
+          'data-player-id': 'sDZEo0ea',
+        }).should.eventually.be.rejectedWith(
+          /Either the data-media-id or the data-playlist-id attributes must be/
+        );
+      });
+    });
+
+    it('fails if no player is specified', () => {
+      return allowConsoleError(() => {
+        return getjwplayer({
+          'data-media-id': 'Wferorsv',
+        }).should.eventually.be.rejectedWith(
+          /The data-player-id attribute is required for/
+        );
+      });
+    });
+
+    it('renders with a bad playlist', () => {
+      return getjwplayer({
+        'data-playlist-id': 'zzz',
         'data-player-id': 'sDZEo0ea',
+      }).then(jw => {
+        const iframe = jw.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://content.jwplatform.com/players/zzz-sDZEo0ea.html'
+        );
       });
-      const img = jw.querySelector('amp-img');
-      expect(img).to.be.null;
     });
-  });
-});
+
+    describe('createPlaceholderCallback', () => {
+      it('should create a placeholder image', async () => {
+        const jw = await getjwplayer({
+          'data-media-id': 'Wferorsv',
+          'data-player-id': 'sDZEo0ea',
+        });
+        const img = jw.querySelector('amp-img');
+        expect(img).to.not.be.null;
+        expect(img.getAttribute('src')).to.equal(
+          'https://content.jwplatform.com/thumbs/Wferorsv-720.jpg'
+        );
+        expect(img.getAttribute('layout')).to.equal('fill');
+        expect(img.hasAttribute('placeholder')).to.be.true;
+        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+        expect(img.getAttribute('alt')).to.equal('Loading video');
+      });
+      it('should propagate aria-label to placeholder', async () => {
+        const jw = await getjwplayer({
+          'data-media-id': 'Wferorsv',
+          'data-player-id': 'sDZEo0ea',
+          'aria-label': 'interesting video',
+        });
+        const img = jw.querySelector('amp-img');
+        expect(img).to.not.be.null;
+        expect(img.getAttribute('aria-label')).to.equal('interesting video');
+        expect(img.getAttribute('alt')).to.equal(
+          'Loading video - interesting video'
+        );
+      });
+      it('should not create a placeholder for playlists', async () => {
+        const jw = await getjwplayer({
+          'data-playlist-id': 'Wferorsv',
+          'data-player-id': 'sDZEo0ea',
+        });
+        const img = jw.querySelector('amp-img');
+        expect(img).to.be.null;
+      });
+    });
+  }
+);
diff --git a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
index 75cbd869f963..e14bf272ed2f 100644
--- a/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
+++ b/extensions/amp-kaltura-player/0.1/amp-kaltura-player.js
@@ -21,7 +21,6 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {userAssert} from '../../../src/log';
 
 class AmpKaltura extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -37,9 +36,9 @@ class AmpKaltura extends AMP.BaseElement {
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://cdnapisec.kaltura.com', opt_onLayout);
   }
@@ -52,21 +51,36 @@ class AmpKaltura extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.partnerId_ = userAssert(
-        this.element.getAttribute('data-partner'),
-        'The data-partner attribute is required for <amp-kaltura-player> %s',
-        this.element);
+      this.element.getAttribute('data-partner'),
+      'The data-partner attribute is required for <amp-kaltura-player> %s',
+      this.element
+    );
 
     this.entryId_ = this.element.getAttribute('data-entryid') || 'default';
   }
 
   /** @override */
   layoutCallback() {
-    const uiconfId = this.element.getAttribute('data-uiconf') ||
-        this.element.getAttribute('data-uiconf-id') || 'default';
+    const uiconfId =
+      this.element.getAttribute('data-uiconf') ||
+      this.element.getAttribute('data-uiconf-id') ||
+      'default';
     const iframe = this.element.ownerDocument.createElement('iframe');
-    let src = `https://cdnapisec.kaltura.com/p/${encodeURIComponent(this.partnerId_)}/sp/${encodeURIComponent(this.partnerId_)}00/embedIframeJs/uiconf_id/${encodeURIComponent(uiconfId)}/partner_id/${encodeURIComponent(this.partnerId_)}?iframeembed=true&playerId=kaltura_player_amp&entry_id=${encodeURIComponent(this.entryId_)}`;
+    let src = `https://cdnapisec.kaltura.com/p/${encodeURIComponent(
+      this.partnerId_
+    )}/sp/${encodeURIComponent(
+      this.partnerId_
+    )}00/embedIframeJs/uiconf_id/${encodeURIComponent(
+      uiconfId
+    )}/partner_id/${encodeURIComponent(
+      this.partnerId_
+    )}?iframeembed=true&playerId=kaltura_player_amp&entry_id=${encodeURIComponent(
+      this.entryId_
+    )}`;
     const params = getDataParamsFromAttributes(
-        this.element, key => `flashvars[${key}]`);
+      this.element,
+      key => `flashvars[${key}]`
+    );
     src = addParamsToUrl(src, params);
     iframe.setAttribute('frameborder', '0');
     iframe.setAttribute('allowfullscreen', 'true');
@@ -83,7 +97,9 @@ class AmpKaltura extends AMP.BaseElement {
     this.propagateAttributes(['aria-label'], placeholder);
     const width = this.element.getAttribute('width');
     const height = this.element.getAttribute('height');
-    let src = `https://cdnapisec.kaltura.com/p/${encodeURIComponent(this.partnerId_)}/thumbnail/entry_id/${encodeURIComponent(this.entryId_)}`;
+    let src = `https://cdnapisec.kaltura.com/p/${encodeURIComponent(
+      this.partnerId_
+    )}/thumbnail/entry_id/${encodeURIComponent(this.entryId_)}`;
     if (width) {
       src += `/width/${width}`;
     }
@@ -95,8 +111,9 @@ class AmpKaltura extends AMP.BaseElement {
     placeholder.setAttribute('placeholder', '');
     placeholder.setAttribute('referrerpolicy', 'origin');
     if (placeholder.hasAttribute('aria-label')) {
-      placeholder.setAttribute('alt',
-          'Loading video - ' + placeholder.getAttribute('aria-label')
+      placeholder.setAttribute(
+        'alt',
+        'Loading video - ' + placeholder.getAttribute('aria-label')
       );
     } else {
       placeholder.setAttribute('alt', 'Loading video');
@@ -107,15 +124,19 @@ class AmpKaltura extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage(JSON.stringify(dict({
-        'method': 'pause' ,
-        'value': '' ,
-      })) , '*');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify(
+          dict({
+            'method': 'pause',
+            'value': '',
+          })
+        ),
+        '*'
+      );
     }
   }
 }
 
-
 AMP.extension('amp-kaltura-player', '0.1', AMP => {
   AMP.registerElement('amp-kaltura-player', AmpKaltura);
 });
diff --git a/extensions/amp-kaltura-player/0.1/test/test-amp-kaltura-player.js b/extensions/amp-kaltura-player/0.1/test/test-amp-kaltura-player.js
index 2e7bace392b0..2006c230a399 100644
--- a/extensions/amp-kaltura-player/0.1/test/test-amp-kaltura-player.js
+++ b/extensions/amp-kaltura-player/0.1/test/test-amp-kaltura-player.js
@@ -16,112 +16,129 @@
 
 import '../amp-kaltura-player';
 
-
-describes.realWin('amp-kaltura-player', {
-  amp: {
-    extensions: ['amp-kaltura-player'],
+describes.realWin(
+  'amp-kaltura-player',
+  {
+    amp: {
+      extensions: ['amp-kaltura-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getKaltura(attributes, opt_responsive) {
-    const kalturaPlayer = doc.createElement('amp-kaltura-player');
-    for (const key in attributes) {
-      kalturaPlayer.setAttribute(key, attributes[key]);
-    }
-    kalturaPlayer.setAttribute('width', '111');
-    kalturaPlayer.setAttribute('height', '222');
-    if (opt_responsive) {
-      kalturaPlayer.setAttribute('layout', 'responsive');
+    function getKaltura(attributes, opt_responsive) {
+      const kalturaPlayer = doc.createElement('amp-kaltura-player');
+      for (const key in attributes) {
+        kalturaPlayer.setAttribute(key, attributes[key]);
+      }
+      kalturaPlayer.setAttribute('width', '111');
+      kalturaPlayer.setAttribute('height', '222');
+      if (opt_responsive) {
+        kalturaPlayer.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(kalturaPlayer);
+      return kalturaPlayer
+        .build()
+        .then(() => {
+          return kalturaPlayer.layoutCallback();
+        })
+        .then(() => kalturaPlayer);
     }
-    doc.body.appendChild(kalturaPlayer);
-    return kalturaPlayer.build().then(() => {
-      return kalturaPlayer.layoutCallback();
-    }).then(() => kalturaPlayer);
-  }
-
-  it('renders', () => {
-    return getKaltura({
-      'data-partner': '1281471',
-      'data-entryid': '1_3ts1ms9c',
-      'data-uiconf': '33502051',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://cdnapisec.kaltura.com/p/1281471/sp/128147100/embedIframeJs/uiconf_id/33502051/partner_id/1281471?iframeembed=true&playerId=kaltura_player_amp&entry_id=1_3ts1ms9c');
-    });
-  });
 
-  it('renders responsively', () => {
-    return getKaltura({
-      'data-partner': '1281471',
-      'data-entryid': '1_3ts1ms9c',
-      'data-uiconf': '33502051',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders', () => {
+      return getKaltura({
+        'data-partner': '1281471',
+        'data-entryid': '1_3ts1ms9c',
+        'data-uiconf': '33502051',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://cdnapisec.kaltura.com/p/1281471/sp/128147100/embedIframeJs/uiconf_id/33502051/partner_id/1281471?iframeembed=true&playerId=kaltura_player_amp&entry_id=1_3ts1ms9c'
+        );
+      });
     });
-  });
 
-  it('requires data-account', () => {
-    return allowConsoleError(() => { return getKaltura({}).then(kp => {
-      kp.build();
-    }).should.eventually.be.rejectedWith(
-        /The data-partner attribute is required for/);
+    it('renders responsively', () => {
+      return getKaltura(
+        {
+          'data-partner': '1281471',
+          'data-entryid': '1_3ts1ms9c',
+          'data-uiconf': '33502051',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('should pass data-param-* attributes to the iframe src', () => {
-    return getKaltura({
-      'data-partner': '1281471',
-      'data-entryid': '1_3ts1ms9c',
-      'data-uiconf': '33502051',
-      'data-param-my-param': 'hello world',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe.src).to.contain('flashvars%5BmyParam%5D=hello%20world');
+    it('requires data-account', () => {
+      return allowConsoleError(() => {
+        return getKaltura({})
+          .then(kp => {
+            kp.build();
+          })
+          .should.eventually.be.rejectedWith(
+            /The data-partner attribute is required for/
+          );
+      });
     });
-  });
 
-  describe('createPlaceholderCallback', () => {
-    it('should create a placeholder image', () => {
+    it('should pass data-param-* attributes to the iframe src', () => {
       return getKaltura({
         'data-partner': '1281471',
         'data-entryid': '1_3ts1ms9c',
         'data-uiconf': '33502051',
-      }).then(kp => {
-        const img = kp.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
-            'https://cdnapisec.kaltura.com/p/1281471/thumbnail/entry_id/' +
-            '1_3ts1ms9c/width/111/height/222');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
-        expect(img.getAttribute('alt')).to.equal('Loading video');
+        'data-param-my-param': 'hello world',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe.src).to.contain('flashvars%5BmyParam%5D=hello%20world');
       });
     });
-    it('should propagate aria label to placeholder image', () => {
-      return getKaltura({
-        'data-partner': '1281471',
-        'data-entryid': '1_3ts1ms9c',
-        'data-uiconf': '33502051',
-        'aria-label': 'great video',
-      }).then(kp => {
-        const img = kp.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('aria-label')).to.equal('great video');
-        expect(img.getAttribute('alt')).to.equal('Loading video - great video');
+
+    describe('createPlaceholderCallback', () => {
+      it('should create a placeholder image', () => {
+        return getKaltura({
+          'data-partner': '1281471',
+          'data-entryid': '1_3ts1ms9c',
+          'data-uiconf': '33502051',
+        }).then(kp => {
+          const img = kp.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
+            'https://cdnapisec.kaltura.com/p/1281471/thumbnail/entry_id/' +
+              '1_3ts1ms9c/width/111/height/222'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+          expect(img.getAttribute('alt')).to.equal('Loading video');
+        });
+      });
+      it('should propagate aria label to placeholder image', () => {
+        return getKaltura({
+          'data-partner': '1281471',
+          'data-entryid': '1_3ts1ms9c',
+          'data-uiconf': '33502051',
+          'aria-label': 'great video',
+        }).then(kp => {
+          const img = kp.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('aria-label')).to.equal('great video');
+          expect(img.getAttribute('alt')).to.equal(
+            'Loading video - great video'
+          );
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
index 6f98fed20442..292301dce9b5 100644
--- a/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/0.1/amp-lightbox-gallery.js
@@ -24,10 +24,7 @@ import {
 } from './service/lightbox-manager-impl';
 import {Gestures} from '../../../src/gesture';
 import {Keys} from '../../../src/utils/key-codes';
-import {
-  LightboxCaption,
-  OverflowState,
-} from './lightbox-caption';
+import {LightboxCaption, OverflowState} from './lightbox-caption';
 import {Services} from '../../../src/services';
 import {SwipeDef, SwipeYRecognizer} from '../../../src/gesture-recognizers';
 import {
@@ -43,14 +40,10 @@ import {dev, devAssert, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {escapeCssSelectorIdent} from '../../../src/css';
 import {getData, isLoaded, listen} from '../../../src/event-helper';
-import {
-  getElementServiceForDoc,
-} from '../../../src/element-service';
+import {getElementServiceForDoc} from '../../../src/element-service';
 import {htmlFor} from '../../../src/static-template';
 import {isExperimentOn} from '../../../src/experiments';
-import {
-  prepareImageAnimation,
-} from '@ampproject/animations/dist/animations.mjs';
+import {prepareImageAnimation} from '@ampproject/animations/dist/animations.mjs';
 import {reportError} from '../../../src/error';
 import {setStyle, setStyles, toggle} from '../../../src/style';
 import {toArray} from '../../../src/types';
@@ -60,7 +53,7 @@ import {triggerAnalyticsEvent} from '../../../src/analytics';
 const TAG = 'amp-lightbox-gallery';
 const DEFAULT_GALLERY_ID = 'amp-lightbox-gallery';
 const SLIDE_ITEM_SELECTOR =
-    '.i-amphtml-slide-item, .i-amphtml-carousel-slotted';
+  '.i-amphtml-slide-item, .i-amphtml-carousel-slotted';
 
 /**
  * Set of namespaces that indicate the lightbox controls mode.
@@ -192,14 +185,15 @@ function delayAfterDeferringToEventLoop(win, duration) {
  * @private visible for testing.
  */
 export class AmpLightboxGallery extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
     /** @private @const {boolean} */
-    this.useBaseCarousel_ =
-        isExperimentOn(this.win, 'amp-lightbox-gallery-base-carousel');
+    this.useBaseCarousel_ = isExperimentOn(
+      this.win,
+      'amp-lightbox-gallery-base-carousel'
+    );
 
     /** @private {!Document} */
     this.doc_ = this.win.document;
@@ -295,23 +289,27 @@ export class AmpLightboxGallery extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    return lightboxManagerForDoc(this.element).then(manager => {
-      this.manager_ = manager;
-      this.history_ = Services.historyForDoc(this.getAmpDoc());
-      this.action_ = Services.actionServiceForDoc(this.element);
-      const viewer = Services.viewerForDoc(this.getAmpDoc());
-      return viewer.whenFirstVisible();
-    }).then(() => {
-      this.container_ = htmlFor(/** @type {!Document} */ (this.doc_))`
+    return lightboxManagerForDoc(this.element)
+      .then(manager => {
+        this.manager_ = manager;
+        this.history_ = Services.historyForDoc(this.getAmpDoc());
+        this.action_ = Services.actionServiceForDoc(this.element);
+        const viewer = Services.viewerForDoc(this.getAmpDoc());
+        return viewer.whenFirstVisible();
+      })
+      .then(() => {
+        this.container_ = htmlFor(/** @type {!Document} */ (this.doc_))`
         <div class="i-amphtml-lbg">
           <div class="i-amphtml-lbg-mask"></div>
         </div>`;
-      this.mask_ = this.container_.querySelector('.i-amphtml-lbg-mask');
-      this.element.appendChild(this.container_);
-      this.manager_.maybeInit();
-      this.registerDefaultAction(
-          invocation => this.openAction_(invocation), 'open');
-    });
+        this.mask_ = this.container_.querySelector('.i-amphtml-lbg-mask');
+        this.element.appendChild(this.container_);
+        this.manager_.maybeInit();
+        this.registerDefaultAction(
+          invocation => this.openAction_(invocation),
+          'open'
+        );
+      });
   }
 
   /** @override */
@@ -363,8 +361,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   cloneLightboxableElement_(element) {
-    const deepClone = !element.classList.contains(
-        'i-amphtml-element');
+    const deepClone = !element.classList.contains('i-amphtml-element');
     const clonedNode = element.cloneNode(deepClone);
     clonedNode.removeAttribute('on');
     clonedNode.removeAttribute('id');
@@ -416,9 +413,10 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     devAssert(this.container_);
     const tag = this.useBaseCarousel_ ? 'amp-base-carousel' : 'amp-carousel';
     const existingCarousel = this.element.querySelector(
-        `${escapeCssSelectorIdent(tag)}[amp-lightbox-group=${
-          escapeCssSelectorIdent(lightboxGroupId)
-        }]`);
+      `${escapeCssSelectorIdent(
+        tag
+      )}[amp-lightbox-group=${escapeCssSelectorIdent(lightboxGroupId)}]`
+    );
     if (existingCarousel) {
       this.carousel_ = existingCarousel;
       return this.showCarousel_(lightboxGroupId);
@@ -447,33 +445,40 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   buildCarousel_(lightboxGroupId) {
-    const extension = this.useBaseCarousel_ ? 'amp-base-carousel' :
-      'amp-carousel';
+    const extension = this.useBaseCarousel_
+      ? 'amp-base-carousel'
+      : 'amp-carousel';
     return Promise.all([
       Services.extensionsFor(this.win).installExtensionForDoc(
-          this.getAmpDoc(), extension),
+        this.getAmpDoc(),
+        extension
+      ),
       Services.extensionsFor(this.win).installExtensionForDoc(
-          this.getAmpDoc(), 'amp-image-viewer'),
-    ]).then(() => {
-      return this.manager_.getElementsForLightboxGroup(lightboxGroupId);
-    }).then(list => {
-      this.carousel_ = this.useBaseCarousel_ ?
-        htmlFor(this.doc_)`
+        this.getAmpDoc(),
+        'amp-image-viewer'
+      ),
+    ])
+      .then(() => {
+        return this.manager_.getElementsForLightboxGroup(lightboxGroupId);
+      })
+      .then(list => {
+        this.carousel_ = this.useBaseCarousel_
+          ? htmlFor(this.doc_)`
           <amp-base-carousel type="slides" layout="fill" loop="true">
             <div slot="prev-arrow"></div>
             <div slot="next-arrow"></div>
           </amp-base-carousel>
-        ` :
-        htmlFor(this.doc_)`
+        `
+          : htmlFor(this.doc_)`
           <amp-carousel type="slides" layout="fill" loop="true"></amp-carousel>
         `;
-      this.carousel_.setAttribute('amp-lightbox-group', lightboxGroupId);
-      this.buildCarouselSlides_(list);
-      return this.mutateElement(() => {
-        this.carouselContainer_.appendChild(this.carousel_);
-        this.maybeEnableMultipleItemControls_(list.length);
+        this.carousel_.setAttribute('amp-lightbox-group', lightboxGroupId);
+        this.buildCarouselSlides_(list);
+        return this.mutateElement(() => {
+          this.carouselContainer_.appendChild(this.carousel_);
+          this.maybeEnableMultipleItemControls_(list.length);
+        });
       });
-    });
   }
 
   /**
@@ -489,8 +494,9 @@ export class AmpLightboxGallery extends AMP.BaseElement {
       '.i-amphtml-lbg-button-prev',
       '.i-amphtml-lbg-button-gallery',
     ].forEach(selector => {
-      dev().assertElement(scopedQuerySelector(container, selector))
-          .classList.toggle(ghost, isDisabled);
+      dev()
+        .assertElement(scopedQuerySelector(container, selector))
+        .classList.toggle(ghost, isDisabled);
     });
   }
 
@@ -518,13 +524,18 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   buildDescriptionBox_() {
     this.lightboxCaption_ = LightboxCaption.build(
-        this.doc_, (measure, mutate) => {
-          this.measureMutateElement(measure, mutate);
-        });
+      this.doc_,
+      (measure, mutate) => {
+        this.measureMutateElement(measure, mutate);
+      }
+    );
     const el = this.lightboxCaption_.getElement();
     el.addEventListener('click', event => {
       triggerAnalyticsEvent(
-          this.element, 'descriptionOverflowToggled', dict({}));
+        this.element,
+        'descriptionOverflowToggled',
+        dict({})
+      );
       this.lightboxCaption_.toggleOverflow();
       event.stopPropagation();
       event.preventDefault();
@@ -554,18 +565,22 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   nextSlide_() {
-    devAssert(this.carousel_).getImpl().then(carousel => {
-      carousel.interactionNext();
-    });
+    devAssert(this.carousel_)
+      .getImpl()
+      .then(carousel => {
+        carousel.interactionNext();
+      });
   }
 
   /**
    * @private
    */
   prevSlide_() {
-    devAssert(this.carousel_).getImpl().then(carousel => {
-      carousel.interactionPrev();
-    });
+    devAssert(this.carousel_)
+      .getImpl()
+      .then(carousel => {
+        carousel.interactionPrev();
+      });
   }
 
   /**
@@ -576,10 +591,16 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     const nextSlide = this.nextSlide_.bind(this);
     const prevSlide = this.prevSlide_.bind(this);
 
-    const nextButton = this.buildButton_('Next',
-        'i-amphtml-lbg-button-next', nextSlide);
-    const prevButton = this.buildButton_('Prev',
-        'i-amphtml-lbg-button-prev', prevSlide);
+    const nextButton = this.buildButton_(
+      'Next',
+      'i-amphtml-lbg-button-next',
+      nextSlide
+    );
+    const prevButton = this.buildButton_(
+      'Prev',
+      'i-amphtml-lbg-button-prev',
+      prevSlide
+    );
 
     const input = Services.inputFor(this.win);
     if (!input.isMouseDetected()) {
@@ -604,12 +625,21 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     const closeGallery = this.closeGallery_.bind(this);
 
     // TODO(aghassemi): i18n and customization. See https://git.io/v6JWu
-    const closeButton = this.buildButton_('Close',
-        'i-amphtml-lbg-button-close', close);
-    const openGalleryButton = this.buildButton_('Gallery',
-        'i-amphtml-lbg-button-gallery', openGallery);
-    const closeGalleryButton = this.buildButton_('Content',
-        'i-amphtml-lbg-button-slide', closeGallery);
+    const closeButton = this.buildButton_(
+      'Close',
+      'i-amphtml-lbg-button-close',
+      close
+    );
+    const openGalleryButton = this.buildButton_(
+      'Gallery',
+      'i-amphtml-lbg-button-gallery',
+      openGallery
+    );
+    const closeGalleryButton = this.buildButton_(
+      'Content',
+      'i-amphtml-lbg-button-slide',
+      closeGallery
+    );
 
     this.topBar_.appendChild(closeButton);
     this.topBar_.appendChild(openGalleryButton);
@@ -653,15 +683,24 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   shouldHandleClick_(e) {
     const target = dev().assertElement(e.target);
-    const consumingElement = closest(target, element => {
-      return element.tagName == 'BUTTON'
-        || element.tagName == 'A'
-        || element.getAttribute('role') == 'button';
-    }, this.container_);
+    const consumingElement = closest(
+      target,
+      element => {
+        return (
+          element.tagName == 'BUTTON' ||
+          element.tagName == 'A' ||
+          element.getAttribute('role') == 'button'
+        );
+      },
+      this.container_
+    );
 
     const clickConsumed = consumingElement !== null;
-    const hasTap = this.action_.hasAction(target, 'tap',
-        dev().assertElement(this.container_));
+    const hasTap = this.action_.hasAction(
+      target,
+      'tap',
+      dev().assertElement(this.container_)
+    );
     return !(clickConsumed || hasTap);
   }
 
@@ -706,8 +745,11 @@ export class AmpLightboxGallery extends AMP.BaseElement {
   setupEventListeners_() {
     devAssert(this.container_);
     const onToggleControls = this.onToggleControls_.bind(this);
-    this.unlistenClick_ = listen(dev().assertElement(this.container_),
-        'click', onToggleControls);
+    this.unlistenClick_ = listen(
+      dev().assertElement(this.container_),
+      'click',
+      onToggleControls
+    );
   }
 
   /**
@@ -784,7 +826,11 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   adjustForSwipePosition_(
-    carousel, carouselTransform = '', maskOpacity = '', controlsOpacity = '') {
+    carousel,
+    carouselTransform = '',
+    maskOpacity = '',
+    controlsOpacity = ''
+  ) {
     setStyles(carousel, {
       transform: carouselTransform,
       transition: '',
@@ -827,15 +873,21 @@ export class AmpLightboxGallery extends AMP.BaseElement {
 
     // We always want to carry momentum from the swipe forward, and then use
     // the resting point to decide if we should snap back or close.
-    return this.carrySwipeMomentum_(scale, finalDeltaX, finalDeltaY, velocity)
-        .then(() => {
-          if (finalDistance < SWIPE_TO_CLOSE_DISTANCE_THRESHOLD &&
-              velocity < SWIPE_TO_CLOSE_VELOCITY_THRESHOLD) {
-            return this.snapBackFromSwipe_(finalDistance);
-          }
+    return this.carrySwipeMomentum_(
+      scale,
+      finalDeltaX,
+      finalDeltaY,
+      velocity
+    ).then(() => {
+      if (
+        finalDistance < SWIPE_TO_CLOSE_DISTANCE_THRESHOLD &&
+        velocity < SWIPE_TO_CLOSE_VELOCITY_THRESHOLD
+      ) {
+        return this.snapBackFromSwipe_(finalDistance);
+      }
 
-          return this.close_();
-        });
+      return this.close_();
+    });
   }
 
   /**
@@ -853,12 +905,15 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     // We do not want the user dragging around to make the carousel think that
     // a scroll happened.
     this.preventCarouselScrollUnlistener_ = listen(
-        dev().assertElement(this.carousel_),
-        'scroll', event => {
-          event.stopPropagation();
-        }, {
-          capture: true,
-        });
+      dev().assertElement(this.carousel_),
+      'scroll',
+      event => {
+        event.stopPropagation();
+      },
+      {
+        capture: true,
+      }
+    );
     // TODO(sparhami) #19259 Tracks a more generic way to do this. Remove once
     // we have something better.
     this.element.setAttribute('i-amphtml-scale-animation', '');
@@ -892,8 +947,10 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     const {sourceElement} = this.getCurrentElement_();
     const distance = calculateDistance(0, 0, deltaX, deltaY);
     const releasePercentage = Math.min(distance / SWIPE_TO_CLOSE_DISTANCE, 1);
-    const hideControlsPercentage =
-        Math.min(distance / SWIPE_TO_HIDE_CONTROLS_DISTANCE, 1);
+    const hideControlsPercentage = Math.min(
+      distance / SWIPE_TO_HIDE_CONTROLS_DISTANCE,
+      1
+    );
     const scale = lerp(1, SWIPE_TO_CLOSE_MIN_SCALE, releasePercentage);
     const maskOpacity = lerp(1, SWIPE_TO_CLOSE_MIN_OPACITY, releasePercentage);
     const controlsOpacity = lerp(1, 0, hideControlsPercentage);
@@ -905,22 +962,24 @@ export class AmpLightboxGallery extends AMP.BaseElement {
       }
 
       if (last) {
-        this.releaseSwipe_(scale, velocityX, velocityY, deltaX, deltaY)
-            .then(() => {
-              // TODO(sparhami) These should be called in a `mutateElement`,
-              // but we are already in an animationFrame, and waiting for the
-              // next one will cause the UI to flicker.
-              this.adjustForSwipePosition_(dev().assertElement(carousel));
-              this.endSwipeToDismiss_(sourceElement);
-            });
+        this.releaseSwipe_(scale, velocityX, velocityY, deltaX, deltaY).then(
+          () => {
+            // TODO(sparhami) These should be called in a `mutateElement`,
+            // but we are already in an animationFrame, and waiting for the
+            // next one will cause the UI to flicker.
+            this.adjustForSwipePosition_(dev().assertElement(carousel));
+            this.endSwipeToDismiss_(sourceElement);
+          }
+        );
         return;
       }
 
       this.adjustForSwipePosition_(
-          dev().assertElement(carousel),
-          `scale(${scale}) translate(${deltaX}px, ${deltaY}px)`,
-          maskOpacity,
-          controlsOpacity);
+        dev().assertElement(carousel),
+        `scale(${scale}) translate(${deltaX}px, ${deltaY}px)`,
+        maskOpacity,
+        controlsOpacity
+      );
     });
   }
 
@@ -940,8 +999,9 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   pauseLightboxChildren_() {
     const lbgId = this.currentLightboxGroupId_;
-    const slides = this.elementsMetadata_[lbgId]
-        .map(elemMetadata => elemMetadata.element);
+    const slides = this.elementsMetadata_[lbgId].map(
+      elemMetadata => elemMetadata.element
+    );
     this.schedulePause(slides);
   }
 
@@ -952,7 +1012,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
   getCurrentElement_() {
     const lbgId = this.currentLightboxGroupId_;
     const currentElement = devAssert(
-        this.elementsMetadata_[lbgId][this.currentElemId_]
+      this.elementsMetadata_[lbgId][this.currentElemId_]
     );
     return currentElement;
   }
@@ -966,13 +1026,15 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   open(element, expandDescription = false) {
     return this.openLightboxGallery_(
-        dev().assertElement(element),
-        expandDescription
-    ).then(() => {
-      return this.history_.push(this.close_.bind(this));
-    }).then(historyId => {
-      this.historyId_ = historyId;
-    });
+      dev().assertElement(element),
+      expandDescription
+    )
+      .then(() => {
+        return this.history_.push(this.close_.bind(this));
+      })
+      .then(historyId => {
+        this.historyId_ = historyId;
+      });
   }
 
   /**
@@ -991,10 +1053,12 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     const args = invocation.args || {};
     const id = args['id'];
     const expandDescription = args['expandDescription'];
-    const target = id ? this.getAmpDoc().getElementById(id) :
-      invocation.caller;
-    userAssert(target,
-        'amp-lightbox-gallery.open: element with id: %s not found', id);
+    const target = id ? this.getAmpDoc().getElementById(id) : invocation.caller;
+    userAssert(
+      target,
+      'amp-lightbox-gallery.open: element with id: %s not found',
+      id
+    );
     this.open(dev().assertElement(target), expandDescription);
   }
 
@@ -1008,42 +1072,48 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   openLightboxGallery_(element, expandDescription) {
     this.sourceElement_ = element;
-    const lightboxGroupId = element.getAttribute('lightbox')
-      || 'default';
+    const lightboxGroupId = element.getAttribute('lightbox') || 'default';
     this.currentLightboxGroupId_ = lightboxGroupId;
     this.hasVerticalScrollbarWidth_ =
-        this.getViewport().getVerticalScrollbarWidth() > 0;
-    return this.findOrInitializeLightbox_(lightboxGroupId).then(() => {
-      return this.getViewport().enterLightboxMode();
-    }).then(() => {
-      return this.mutateElement(() => {
-        toggle(this.element, true);
-        setStyle(this.element, 'opacity', 0);
-        this.controlsContainer_.removeAttribute('i-amphtml-lbg-fade');
-      });
-    }).then(() => {
-      this.isActive_ = true;
-
-      this.updateInViewport(dev().assertElement(this.container_), true);
-      this.scheduleLayout(dev().assertElement(this.container_));
-
-      this.doc_.documentElement.addEventListener(
-          'keydown', this.boundOnKeyDown_);
-
-      this.carousel_.addEventListener(
-          'slideChange', this.boundSlideChangeHandler_);
-
-      this.setupGestures_();
-      this.setupEventListeners_();
-
-      return this.carousel_.signals().whenSignal(CommonSignals.LOAD_END);
-    })
-        .then(() => this.openLightboxForElement_(element, expandDescription))
-        .then(() => {
-          setStyle(this.element, 'opacity', '');
-          this.showControls_();
-          triggerAnalyticsEvent(this.element, 'lightboxOpened', dict({}));
+      this.getViewport().getVerticalScrollbarWidth() > 0;
+    return this.findOrInitializeLightbox_(lightboxGroupId)
+      .then(() => {
+        return this.getViewport().enterLightboxMode();
+      })
+      .then(() => {
+        return this.mutateElement(() => {
+          toggle(this.element, true);
+          setStyle(this.element, 'opacity', 0);
+          this.controlsContainer_.removeAttribute('i-amphtml-lbg-fade');
         });
+      })
+      .then(() => {
+        this.isActive_ = true;
+
+        this.updateInViewport(dev().assertElement(this.container_), true);
+        this.scheduleLayout(dev().assertElement(this.container_));
+
+        this.doc_.documentElement.addEventListener(
+          'keydown',
+          this.boundOnKeyDown_
+        );
+
+        this.carousel_.addEventListener(
+          'slideChange',
+          this.boundSlideChangeHandler_
+        );
+
+        this.setupGestures_();
+        this.setupEventListeners_();
+
+        return this.carousel_.signals().whenSignal(CommonSignals.LOAD_END);
+      })
+      .then(() => this.openLightboxForElement_(element, expandDescription))
+      .then(() => {
+        setStyle(this.element, 'opacity', '');
+        this.showControls_();
+        triggerAnalyticsEvent(this.element, 'lightboxOpened', dict({}));
+      });
   }
 
   /**
@@ -1058,8 +1128,9 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   openLightboxForElement_(element, expandDescription) {
     this.currentElemId_ = element.lightboxItemId;
-    devAssert(this.carousel_).getImpl()
-        .then(carousel => carousel.goToSlide(this.currentElemId_));
+    devAssert(this.carousel_)
+      .getImpl()
+      .then(carousel => carousel.goToSlide(this.currentElemId_));
     this.updateDescriptionBox_(expandDescription);
     return this.enter_();
   }
@@ -1134,23 +1205,25 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   transitionImg_(sourceElement, enter) {
-    return this.getCurrentElement_().imageViewer.getImpl()
-        .then(imageViewer => {
-          const {width, height} = imageViewer.getImageBoxWithOffset() || {};
-
-          // Check if our imageBox has a width or height. We may be in the
-          // gallery view if not, and we do not want to animate.
-          if (!width || !height) {
-            return this.fade_(/*fadeIn*/enter);
-          }
+    return this.getCurrentElement_()
+      .imageViewer.getImpl()
+      .then(imageViewer => {
+        const {width, height} = imageViewer.getImageBoxWithOffset() || {};
+
+        // Check if our imageBox has a width or height. We may be in the
+        // gallery view if not, and we do not want to animate.
+        if (!width || !height) {
+          return this.fade_(/*fadeIn*/ enter);
+        }
 
-          const lightboxImg = imageViewer.getImage();
-          const sourceImg = childElementByTag(sourceElement, 'img');
-          return this.runImgTransition_(
-              enter ? sourceImg : lightboxImg,
-              enter ? lightboxImg : sourceImg,
-              enter);
-        });
+        const lightboxImg = imageViewer.getImage();
+        const sourceImg = childElementByTag(sourceElement, 'img');
+        return this.runImgTransition_(
+          enter ? sourceImg : lightboxImg,
+          enter ? lightboxImg : sourceImg,
+          enter
+        );
+      });
   }
 
   /**
@@ -1162,8 +1235,8 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   getTransitionDurationFromElements_(srcImg, targetImg) {
-    const srcRect = srcImg./*OK*/getBoundingClientRect();
-    const destRect = targetImg./*OK*/getBoundingClientRect();
+    const srcRect = srcImg./*OK*/ getBoundingClientRect();
+    const destRect = targetImg./*OK*/ getBoundingClientRect();
     const viewportHeight = this.getViewport().getSize().height;
     const dy = Math.abs(destRect.top - srcRect.top);
 
@@ -1250,8 +1323,8 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     };
 
     return this.measureMutateElement(measure, mutate)
-        .then(() => delayAfterDeferringToEventLoop(this.win, duration))
-        .then(() => this.mutateElement(cleanup));
+      .then(() => delayAfterDeferringToEventLoop(this.win, duration))
+      .then(() => this.mutateElement(cleanup));
   }
 
   /**
@@ -1290,15 +1363,15 @@ export class AmpLightboxGallery extends AMP.BaseElement {
 
       this.element.setAttribute('i-amphtml-lbg-fade', fadeIn ? 'in' : 'out');
     })
-        .then(() => delayAfterDeferringToEventLoop(this.win, FADE_DURATION))
-        .then(() => {
-          this.element.removeAttribute('i-amphtml-lbg-fade');
+      .then(() => delayAfterDeferringToEventLoop(this.win, FADE_DURATION))
+      .then(() => {
+        this.element.removeAttribute('i-amphtml-lbg-fade');
 
-          if (!fadeIn) {
-            toggle(dev().assertElement(this.carousel_), false);
-            toggle(this.element, false);
-          }
-        });
+        if (!fadeIn) {
+          toggle(dev().assertElement(this.carousel_), false);
+          toggle(this.element, false);
+        }
+      });
   }
 
   /**
@@ -1306,15 +1379,17 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @return {!Promise}
    * @private
    */
-  enter_() { // TODO (cathyxz): make this generalizable to more than just images
+  enter_() {
+    // TODO (cathyxz): make this generalizable to more than just images
     const {sourceElement} = this.getCurrentElement_();
     if (!this.elementTypeCanBeAnimated_(sourceElement)) {
-      return this.fade_(/*fadeIn*/true);
+      return this.fade_(/*fadeIn*/ true);
     }
 
-    return this.getCurrentElement_().imageViewer.signals()
-        .whenSignal(CommonSignals.LOAD_END)
-        .then(() => this.transitionImgIn_(sourceElement));
+    return this.getCurrentElement_()
+      .imageViewer.signals()
+      .whenSignal(CommonSignals.LOAD_END)
+      .then(() => this.transitionImgIn_(sourceElement));
   }
 
   /**
@@ -1325,7 +1400,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
   exit_() {
     const {sourceElement} = this.getCurrentElement_();
     if (!this.shouldAnimateOut_()) {
-      return this.fade_(/*fadeIn*/false);
+      return this.fade_(/*fadeIn*/ false);
     }
 
     return this.transitionImgOut_(sourceElement);
@@ -1346,12 +1421,8 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     minDur = MIN_TRANSITION_DURATION,
     maxDur = MAX_TRANSITION_DURATION
   ) {
-    const distanceAdjustedDuration = Math.abs(dy) / maxY * maxDur;
-    return clamp(
-        distanceAdjustedDuration,
-        minDur,
-        maxDur
-    );
+    const distanceAdjustedDuration = (Math.abs(dy) / maxY) * maxDur;
+    return clamp(distanceAdjustedDuration, minDur, maxDur);
   }
 
   /**
@@ -1363,7 +1434,9 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     // TODO(#13011): change to a tag selector after `<amp-carousel>`
     // type='carousel' starts supporting goToSlide.
     return closestAncestorElementBySelector(
-        sourceElement, 'amp-carousel[type="slides"], amp-base-carousel');
+      sourceElement,
+      'amp-carousel[type="slides"], amp-base-carousel'
+    );
   }
 
   /**
@@ -1376,12 +1449,15 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     const parentCarousel = this.getSourceElementParentCarousel_(target);
     if (parentCarousel) {
       const allSlides = toArray(
-          scopedQuerySelectorAll(parentCarousel, SLIDE_ITEM_SELECTOR));
+        scopedQuerySelectorAll(parentCarousel, SLIDE_ITEM_SELECTOR)
+      );
       const targetSlide = dev().assertElement(
-          closestAncestorElementBySelector(target, SLIDE_ITEM_SELECTOR));
+        closestAncestorElementBySelector(target, SLIDE_ITEM_SELECTOR)
+      );
       const targetSlideIndex = allSlides.indexOf(targetSlide);
-      devAssert(parentCarousel).getImpl()
-          .then(carousel => carousel.goToSlide(targetSlideIndex));
+      devAssert(parentCarousel)
+        .getImpl()
+        .then(carousel => carousel.goToSlide(targetSlideIndex));
     }
   }
 
@@ -1402,10 +1478,14 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     this.cleanupEventListeners_();
 
     this.doc_.documentElement.removeEventListener(
-        'keydown', this.boundOnKeyDown_);
+      'keydown',
+      this.boundOnKeyDown_
+    );
 
     this.carousel_.removeEventListener(
-        'slideChange', this.boundSlideChangeHandler_);
+      'slideChange',
+      this.boundSlideChangeHandler_
+    );
 
     const gestures = Gestures.get(dev().assertElement(this.carousel_));
     gestures.cleanup();
@@ -1430,19 +1510,20 @@ export class AmpLightboxGallery extends AMP.BaseElement {
         this.gallery_.classList.add('i-amphtml-ghost');
         this.gallery_ = null;
       }
-    }).then(() => this.exit_())
-        .then(() => {
-          // Leave lightbox mode now that it will not affect the animation.
-          if (this.hasVerticalScrollbarWidth_) {
-            this.getViewport().leaveLightboxMode();
-          }
-          this.schedulePause(dev().assertElement(this.container_));
-          this.pauseLightboxChildren_();
-          this.carousel_ = null;
-          if (this.historyId_ != -1) {
-            this.history_.pop(this.historyId_);
-          }
-        });
+    })
+      .then(() => this.exit_())
+      .then(() => {
+        // Leave lightbox mode now that it will not affect the animation.
+        if (this.hasVerticalScrollbarWidth_) {
+          this.getViewport().leaveLightboxMode();
+        }
+        this.schedulePause(dev().assertElement(this.container_));
+        this.pauseLightboxChildren_();
+        this.carousel_ = null;
+        if (this.historyId_ != -1) {
+          this.history_.pop(this.historyId_);
+        }
+      });
   }
 
   /**
@@ -1467,7 +1548,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
         this.maybeSlideCarousel_(/*direction*/ 1);
         break;
       default:
-        // Key not registered. Do nothing.
+      // Key not registered. Do nothing.
     }
   }
 
@@ -1480,9 +1561,15 @@ export class AmpLightboxGallery extends AMP.BaseElement {
     if (isGalleryView) {
       return;
     }
-    devAssert(this.carousel_).getImpl().then(carousel => {
-      carousel.goCallback(direction, /* animate */ true, /* autoplay */ false);
-    });
+    devAssert(this.carousel_)
+      .getImpl()
+      .then(carousel => {
+        carousel.goCallback(
+          direction,
+          /* animate */ true,
+          /* autoplay */ false
+        );
+      });
   }
 
   /**
@@ -1523,9 +1610,10 @@ export class AmpLightboxGallery extends AMP.BaseElement {
   findOrBuildGallery_() {
     const group = this.currentLightboxGroupId_;
     this.gallery_ = this.element.querySelector(
-        `.i-amphtml-lbg-gallery[amp-lightbox-group=${
-          escapeCssSelectorIdent(group)
-        }]`);
+      `.i-amphtml-lbg-gallery[amp-lightbox-group=${escapeCssSelectorIdent(
+        group
+      )}]`
+    );
     if (this.gallery_) {
       this.gallery_.classList.remove('i-amphtml-ghost');
       this.updateVideoThumbnails_();
@@ -1533,8 +1621,10 @@ export class AmpLightboxGallery extends AMP.BaseElement {
       // Build gallery
       this.gallery_ = htmlFor(/** @type {!Document} */ (this.doc_))`
       <div class="i-amphtml-lbg-gallery"></div>`;
-      this.gallery_.setAttribute('amp-lightbox-group',
-          this.currentLightboxGroupId_);
+      this.gallery_.setAttribute(
+        'amp-lightbox-group',
+        this.currentLightboxGroupId_
+      );
 
       this.initializeThumbnails_();
 
@@ -1549,9 +1639,10 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    * @private
    */
   updateVideoThumbnails_() {
-    const thumbnails = this.manager_.getThumbnails(this.currentLightboxGroupId_)
-        .map((thumbnail, index) => Object.assign({index}, thumbnail))
-        .filter(thumbnail => VIDEO_TAGS[thumbnail.element.tagName]);
+    const thumbnails = this.manager_
+      .getThumbnails(this.currentLightboxGroupId_)
+      .map((thumbnail, index) => Object.assign({index}, thumbnail))
+      .filter(thumbnail => VIDEO_TAGS[thumbnail.element.tagName]);
 
     this.mutateElement(() => {
       thumbnails.forEach(thumbnail => {
@@ -1564,13 +1655,13 @@ export class AmpLightboxGallery extends AMP.BaseElement {
           }
           const timestamp = this.secondsToTimestampString_(ts);
           const thumbnailContainer = dev().assertElement(
-              this.gallery_.childNodes[thumbnail.index]);
+            this.gallery_.childNodes[thumbnail.index]
+          );
           const timestampDiv = childElementByTag(thumbnailContainer, 'div');
           if (timestampDiv.childNodes.length > 1) {
             timestampDiv.removeChild(timestampDiv.childNodes[1]);
           }
-          timestampDiv.appendChild(
-              this.doc_.createTextNode(timestamp));
+          timestampDiv.appendChild(this.doc_.createTextNode(timestamp));
           timestampDiv.classList.add('i-amphtml-lbg-has-timestamp');
         });
       });
@@ -1584,16 +1675,17 @@ export class AmpLightboxGallery extends AMP.BaseElement {
    */
   initializeThumbnails_() {
     const thumbnails = [];
-    this.manager_.getThumbnails(this.currentLightboxGroupId_)
-        .forEach(thumbnail => {
-          // Don't include thumbnails for ads, this may be subject to
-          // change pending user feedback or ux experiments after launch
-          if (thumbnail.element.tagName == 'AMP-AD') {
-            return;
-          }
-          const thumbnailElement = this.createThumbnailElement_(thumbnail);
-          thumbnails.push(thumbnailElement);
-        });
+    this.manager_
+      .getThumbnails(this.currentLightboxGroupId_)
+      .forEach(thumbnail => {
+        // Don't include thumbnails for ads, this may be subject to
+        // change pending user feedback or ux experiments after launch
+        if (thumbnail.element.tagName == 'AMP-AD') {
+          return;
+        }
+        const thumbnailElement = this.createThumbnailElement_(thumbnail);
+        thumbnails.push(thumbnailElement);
+      });
     this.mutateElement(() => {
       thumbnails.forEach(thumbnailElement => {
         this.gallery_.appendChild(thumbnailElement);
@@ -1687,8 +1779,7 @@ export class AmpLightboxGallery extends AMP.BaseElement {
           return;
         }
         const timestamp = this.secondsToTimestampString_(ts);
-        timestampDiv.appendChild(
-            this.doc_.createTextNode(timestamp));
+        timestampDiv.appendChild(this.doc_.createTextNode(timestamp));
         timestampDiv.classList.add('i-amphtml-lbg-has-timestamp');
       });
       element.appendChild(timestampDiv);
@@ -1710,17 +1801,18 @@ export class AmpLightboxGallery extends AMP.BaseElement {
 export function installLightboxGallery(ampdoc) {
   // Make sure to wait for the ampdoc to finish loading, see:
   // https://github.com/ampproject/amphtml/issues/19728#issuecomment-446033966
-  return ampdoc.whenReady()
-      .then(() => ampdoc.getBody())
-      .then(body => {
-        const existingGallery = elementByTag(ampdoc.getRootNode(), TAG);
-        if (!existingGallery) {
-          const gallery = ampdoc.win.document.createElement(TAG);
-          gallery.setAttribute('layout', 'nodisplay');
-          gallery.setAttribute('id', DEFAULT_GALLERY_ID);
-          body.appendChild(gallery);
-        }
-      });
+  return ampdoc
+    .whenReady()
+    .then(() => ampdoc.getBody())
+    .then(body => {
+      const existingGallery = elementByTag(ampdoc.getRootNode(), TAG);
+      if (!existingGallery) {
+        const gallery = ampdoc.win.document.createElement(TAG);
+        gallery.setAttribute('layout', 'nodisplay');
+        gallery.setAttribute('id', DEFAULT_GALLERY_ID);
+        body.appendChild(gallery);
+      }
+    });
 }
 
 /**
@@ -1729,9 +1821,11 @@ export function installLightboxGallery(ampdoc) {
  * @return {!Promise<?LightboxManager>}
  */
 function lightboxManagerForDoc(element) {
-  return /** @type {!Promise<?LightboxManager>} */ (
-    getElementServiceForDoc(
-        element, 'amp-lightbox-manager', 'amp-lightbox-gallery'));
+  return /** @type {!Promise<?LightboxManager>} */ (getElementServiceForDoc(
+    element,
+    'amp-lightbox-manager',
+    'amp-lightbox-gallery'
+  ));
 }
 
 AMP.extension(TAG, '0.1', AMP => {
diff --git a/extensions/amp-lightbox-gallery/0.1/events.js b/extensions/amp-lightbox-gallery/0.1/events.js
index 0393204a6c17..c0bf3d78c642 100644
--- a/extensions/amp-lightbox-gallery/0.1/events.js
+++ b/extensions/amp-lightbox-gallery/0.1/events.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /** @const @enum {string} */
 export const LightboxGalleryEvents = {
   // Triggered when the lightbox attribute is newly set on an item in order to
diff --git a/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js b/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js
index 5fd44b09f329..eabdd6d6882d 100644
--- a/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js
+++ b/extensions/amp-lightbox-gallery/0.1/lightbox-caption.js
@@ -44,11 +44,12 @@ export class LightboxCaption {
         <div class="i-amphtml-lbg-caption-mask"></div>
       </div>`;
     return new LightboxCaption(
-        el,
-        dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-scroll')),
-        dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-text')),
-        dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-mask')),
-        measureMutateElement);
+      el,
+      dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-scroll')),
+      dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-text')),
+      dev().assertElement(el.querySelector('.i-amphtml-lbg-caption-mask')),
+      measureMutateElement
+    );
   }
 
   /**
@@ -63,8 +64,8 @@ export class LightboxCaption {
     scrollContainer,
     textContainer,
     overflowMask,
-    measureMutateElement) {
-
+    measureMutateElement
+  ) {
     /** @private @const */
     this.element_ = element;
 
@@ -92,7 +93,7 @@ export class LightboxCaption {
    * @param {string} content The content for the caption.
    */
   setContent(content) {
-    this.textContainer_./*OK*/innerText = content;
+    this.textContainer_./*OK*/ innerText = content;
   }
 
   /**
@@ -106,8 +107,9 @@ export class LightboxCaption {
    * @return {!OverflowState} state
    */
   getOverflowState() {
-    return /** @type {OverflowState} */ (
-      this.scrollContainer_.getAttribute('i-amphtml-lbg-caption-state'));
+    return /** @type {OverflowState} */ (this.scrollContainer_.getAttribute(
+      'i-amphtml-lbg-caption-state'
+    ));
   }
 
   /**
@@ -119,15 +121,10 @@ export class LightboxCaption {
    * @return {!OverflowState} The new state.
    * @private
    */
-  nextOverflowState_(
-    overflowState,
-    overflows,
-    requestExpansion
-  ) {
+  nextOverflowState_(overflowState, overflows, requestExpansion) {
     const isExpanded = overflowState == OverflowState.EXPAND;
-    const expand = requestExpansion !== undefined ?
-      requestExpansion :
-      !isExpanded;
+    const expand =
+      requestExpansion !== undefined ? requestExpansion : !isExpanded;
     // If we are already expanded, we know we have some overflow, even if
     // we are not currently "overflowing".
     const hasOverflow = isExpanded || overflows;
@@ -136,9 +133,7 @@ export class LightboxCaption {
       return OverflowState.NONE;
     }
 
-    return expand ?
-      OverflowState.EXPAND :
-      OverflowState.CLIP;
+    return expand ? OverflowState.EXPAND : OverflowState.CLIP;
   }
 
   /**
@@ -148,10 +143,7 @@ export class LightboxCaption {
    *    current state is toggled.
    */
   toggleOverflow(requestExpansion) {
-    const {
-      scrollContainer_,
-      overflowMask_,
-    } = this;
+    const {scrollContainer_, overflowMask_} = this;
     let descriptionOverflows;
 
     const measureOverflowState = () => {
@@ -159,23 +151,26 @@ export class LightboxCaption {
       // The height of the overflow mask is set to 1 rem. We allow 3 lines
       // for the description and consider it to have overflow if more than 3
       // lines of text.
-      descriptionOverflows = scrollContainer_./*OK*/scrollHeight
-          - scrollContainer_./*OK*/clientHeight
-          >= overflowMask_./*OK*/clientHeight;
+      descriptionOverflows =
+        scrollContainer_./*OK*/ scrollHeight -
+          scrollContainer_./*OK*/ clientHeight >=
+        overflowMask_./*OK*/ clientHeight;
     };
 
     const mutateOverflowState = () => {
       const overflowState = this.getOverflowState();
       const newState = this.nextOverflowState_(
-          overflowState, descriptionOverflows, requestExpansion);
+        overflowState,
+        descriptionOverflows,
+        requestExpansion
+      );
 
       this.setOverflowState(newState);
       if (newState != OverflowState.EXPAND) {
-        scrollContainer_./*OK*/scrollTop = 0;
+        scrollContainer_./*OK*/ scrollTop = 0;
       }
     };
 
     this.measureMutateElement_(measureOverflowState, mutateOverflowState);
   }
-
 }
diff --git a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
index ae6b14fa8dbb..e8d7fadacbc9 100644
--- a/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
+++ b/extensions/amp-lightbox-gallery/0.1/service/lightbox-manager-impl.js
@@ -70,8 +70,10 @@ function getBaseElementForSlide(slide) {
     return figure;
   }
   const allImages = slide.querySelectorAll('amp-img');
-  userAssert(allImages.length == 1,
-      'Found more than one images or none in slide!');
+  userAssert(
+    allImages.length == 1,
+    'Found more than one images or none in slide!'
+  );
   return dev().assertElement(allImages[0]);
 }
 
@@ -93,12 +95,10 @@ export let LightboxThumbnailDataDef;
  *   `lightbox` attribute and possibly an on-tap handler to them
  */
 export class LightboxManager {
-
   /**
    * @param {!../../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
   constructor(ampdoc) {
-
     /** @const @private {!../../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -129,7 +129,6 @@ export class LightboxManager {
      * @private {!Array<!Element>}
      */
     this.seen_ = [];
-
   }
 
   /**
@@ -189,15 +188,16 @@ export class LightboxManager {
    * @param {!Element} carousel
    */
   processLightboxCarousel_(carousel) {
-    const lightboxGroupId = carousel.getAttribute('lightbox') ||
+    const lightboxGroupId =
+      carousel.getAttribute('lightbox') ||
       `carousel${carousel.getAttribute('id') || this.counter_++}`;
 
     this.getSlidesFromCarousel_(carousel).then(slides => {
       slides.forEach(slide => {
         const shouldExcludeSlide =
-            slide.hasAttribute('lightbox-exclude') || (
-              slide.hasAttribute('lightbox')
-                && slide.getAttribute('lightbox') !== lightboxGroupId);
+          slide.hasAttribute('lightbox-exclude') ||
+          (slide.hasAttribute('lightbox') &&
+            slide.getAttribute('lightbox') !== lightboxGroupId);
         if (shouldExcludeSlide) {
           return;
         }
@@ -239,8 +239,10 @@ export class LightboxManager {
   unwrapLightboxedFigure_(figure, lightboxGroupId) {
     // Assume that the lightbox target is whichever element inside the figure
     // that is not the figcaption.
-    const element = childElement(figure,
-        child => child.tagName !== 'FIGCAPTION');
+    const element = childElement(
+      figure,
+      child => child.tagName !== 'FIGCAPTION'
+    );
     if (element) {
       element.setAttribute('lightbox', lightboxGroupId);
     }
@@ -255,16 +257,21 @@ export class LightboxManager {
    */
   processBaseLightboxElement_(element, lightboxGroupId) {
     if (element.tagName == FIGURE_TAG) {
-      const unwrappedFigureElement = this.unwrapLightboxedFigure_(element,
-          lightboxGroupId);
+      const unwrappedFigureElement = this.unwrapLightboxedFigure_(
+        element,
+        lightboxGroupId
+      );
       if (!unwrappedFigureElement) {
         return;
       }
       element = unwrappedFigureElement;
     }
 
-    userAssert(this.baseElementIsSupported_(element),
-        'The element %s isn\'t supported in lightbox yet.', element.tagName);
+    userAssert(
+      this.baseElementIsSupported_(element),
+      "The element %s isn't supported in lightbox yet.",
+      element.tagName
+    );
 
     if (!this.lightboxGroups_[lightboxGroupId]) {
       this.lightboxGroups_[lightboxGroupId] = [];
@@ -285,9 +292,12 @@ export class LightboxManager {
    * @private
    */
   getSlidesFromCarousel_(element) {
-    return element.signals().whenSignal(CommonSignals.LOAD_END).then(() => {
-      return toArray(element./*OK*/querySelectorAll(SLIDE_SELECTOR));
-    });
+    return element
+      .signals()
+      .whenSignal(CommonSignals.LOAD_END)
+      .then(() => {
+        return toArray(element./*OK*/ querySelectorAll(SLIDE_SELECTOR));
+      });
   }
 
   /**
@@ -296,8 +306,9 @@ export class LightboxManager {
    * @return {!Promise<!Array<!Element>>}
    */
   getElementsForLightboxGroup(lightboxGroupId) {
-    return this.maybeInit()
-        .then(() => devAssert(this.lightboxGroups_[lightboxGroupId]));
+    return this.maybeInit().then(() =>
+      devAssert(this.lightboxGroups_[lightboxGroupId])
+    );
   }
 
   /**
@@ -312,14 +323,14 @@ export class LightboxManager {
     if (figureParent) {
       const figCaption = elementByTag(figureParent, 'figcaption');
       if (figCaption) {
-        return figCaption./*OK*/innerText;
+        return figCaption./*OK*/ innerText;
       }
     }
     const ariaDescribedBy = element.getAttribute('aria-describedby');
     if (ariaDescribedBy) {
       const descriptionElement = this.ampdoc_.getElementById(ariaDescribedBy);
       if (descriptionElement) {
-        return descriptionElement./*OK*/innerText;
+        return descriptionElement./*OK*/ innerText;
       }
     }
     return '';
@@ -332,8 +343,8 @@ export class LightboxManager {
    * @private
    */
   getVideoTimestamp_(element) {
-    return VIDEO_TAGS[element.tagName] ?
-      element.getImpl().then(videoPlayer => videoPlayer.getDuration())
+    return VIDEO_TAGS[element.tagName]
+      ? element.getImpl().then(videoPlayer => videoPlayer.getDuration())
       : Promise.resolve();
   }
 
@@ -344,13 +355,12 @@ export class LightboxManager {
    * @return {!Array<!LightboxThumbnailDataDef>}
    */
   getThumbnails(lightboxGroupId) {
-    return this.lightboxGroups_[lightboxGroupId]
-        .map(element => ({
-          srcset: this.getThumbnailSrcset_(dev().assertElement(element)),
-          placeholderSrc: this.getPlaceholderForElementType_(element),
-          element,
-          timestampPromise: this.getVideoTimestamp_(element),
-        }));
+    return this.lightboxGroups_[lightboxGroupId].map(element => ({
+      srcset: this.getThumbnailSrcset_(dev().assertElement(element)),
+      placeholderSrc: this.getPlaceholderForElementType_(element),
+      element,
+      timestampPromise: this.getVideoTimestamp_(element),
+    }));
   }
 
   /**
diff --git a/extensions/amp-lightbox-gallery/0.1/service/lightbox-placeholders.js b/extensions/amp-lightbox-gallery/0.1/service/lightbox-placeholders.js
index f82c73193672..40257db710ed 100644
--- a/extensions/amp-lightbox-gallery/0.1/service/lightbox-placeholders.js
+++ b/extensions/amp-lightbox-gallery/0.1/service/lightbox-placeholders.js
@@ -13,8 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export const LIGHTBOX_THUMBNAIL_UNKNOWN = 'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M9 20.5a1.5 1.5 0 0 1-3 0c0-6.488 5-8.53 5-13.5a4 4 0 1 0-8 0 1.5 1.5 0 0 1-3 0 7 7 0 1 1 14 0c0 5.483-5 7.485-5 13.5z" id="a"/><circle id="b" cx="7.5" cy="29.5" r="1.5"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M33 24.5h62a4 4 0 0 1 4 4v54.952L78.081 104.5H33a4 4 0 0 1-4-4v-72a4 4 0 0 1 4-4z" fill="#D1E5FF"/><g transform="translate(57 48)"><use fill="#225CAC" xlink:href="#a"/><path stroke="#225CAC" d="M9.5 20.5a2 2 0 1 1-4 0c0-2.85.756-4.755 2.58-7.59l.385-.595c.152-.236.265-.412.373-.584C10.006 9.873 10.5 8.601 10.5 7a3.5 3.5 0 1 0-7 0 2 2 0 1 1-4 0 7.5 7.5 0 0 1 15 0c0 2.273-.642 3.81-2.314 6.409l-.266.412C10.133 16.592 9.5 18.103 9.5 20.5z"/></g><g transform="translate(57 48)"><use fill="#225CAC" xlink:href="#b"/><circle stroke="#225CAC" cx="7.5" cy="29.5" r="2"/></g><path d="M82 83.5h17l-21 21v-17a4 4 0 0 1 4-4z" fill="#ACC8F0"/></g></svg>';
-export const LIGHTBOX_THUMBNAIL_AD = 'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><rect fill="#2B6AC0" x="34" y="74" width="8" height="30" rx="2"/><rect fill="#2B6AC0" x="87" y="74" width="8" height="30" rx="2"/><rect fill="#ACC8F0" x="24" y="30" width="81" height="54" rx="4"/><path fill="#D1E5FF" d="M29 35h71v44H29z"/><path d="M64 53.5V66a3 3 0 0 1-6 0v-4h-5v4a3 3 0 0 1-6 0V53.5a8.5 8.5 0 0 1 17 0zm-6 0a2.5 2.5 0 0 0-5 0V56h5v-2.5zM71 45h3v.041C80.16 45.55 85 50.71 85 57s-4.84 11.45-11 11.959V69h-3a3 3 0 0 1-3-3V48a3 3 0 0 1 3-3zm3 6.083v11.834a6.002 6.002 0 0 0 0-11.834z" fill="#225CAC"/></g></svg>';
-export const LIGHTBOX_THUMBNAIL_IFRAME = 'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M22 39h84v58a4 4 0 0 1-4 4H26a4 4 0 0 1-4-4V39z" fill="#D1E5FF"/><path d="M82.243 70l-6.718-6.718a3.5 3.5 0 0 1 4.95-4.95l9.192 9.193a3.5 3.5 0 0 1 0 4.95l-9.192 9.192a3.5 3.5 0 0 1-4.95-4.95L82.243 70zm-36.486 0l6.718 6.718a3.5 3.5 0 0 1-4.95 4.95l-9.192-9.193a3.5 3.5 0 0 1 0-4.95l9.192-9.192a3.5 3.5 0 0 1 4.95 4.95L45.757 70z" fill="#ACC8F0"/><rect fill="#ACC8F0" transform="rotate(15 64 70)" x="60.5" y="50" width="7" height="40" rx="3.5"/><path d="M26 27h76a4 4 0 0 1 4 4v8H22v-8a4 4 0 0 1 4-4z" fill="#225CAC"/><rect fill="#294975" x="97" y="31" width="4" height="4" rx="2"/><rect fill="#294975" x="90" y="31" width="4" height="4" rx="2"/><rect fill="#294975" x="83" y="31" width="4" height="4" rx="2"/></g></svg>';
-export const LIGHTBOX_THUMBNAIL_VIDEO = 'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M24 51h80v46a4 4 0 0 1-4 4H28a4 4 0 0 1-4-4V51z" fill="#225CAC"/><path fill="#1B519B" d="M24 49h80v12H24z"/><path fill="#D1E5FF" d="M56 49l-8 12h-9l8-12zm16 0l-8 12h-8l8-12zm32 0l-8 12h-8l8-12zm-16 0l-8 12h-8l8-12z"/><path d="M26.916 49.148l77.274-20.705-2.07-7.728a4 4 0 0 0-4.9-2.828L27.674 36.522a4 4 0 0 0-2.829 4.899l2.07 7.727z" fill="#1B519B"/><path fill="#D1E5FF" d="M57.826 40.866l-10.834-9.52-8.693 2.329 10.833 9.52zm15.454-4.141l-10.833-9.52-7.727 2.07 10.833 9.52zm30.91-8.282l-10.833-9.52-7.728 2.07 10.834 9.52zm-15.455 4.141l-10.833-9.52-7.728 2.07 10.834 9.52z"/><path d="M28 37h9.86a4 4 0 0 1 3.327 1.781L48 49l-8 12H24V41a4 4 0 0 1 4-4z" fill="#2B6AC0"/><circle fill="#D1E5FF" cx="29.5" cy="44.5" r="1.5"/><circle fill="#D1E5FF" cx="29.5" cy="55.5" r="1.5"/></g></svg>';
-export const LIGHTBOX_THUMBNAIL_TEXT = 'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M33 24.5h62a4 4 0 0 1 4 4v54.952L78.081 104.5H33a4 4 0 0 1-4-4v-72a4 4 0 0 1 4-4z" fill="#D1E5FF"/><path fill="#225CAC" d="M42 41h44v6H42zm0 13h44v6H42zm0 13h34v6H42z"/><path d="M82 83.5h17l-21 21v-17a4 4 0 0 1 4-4z" fill="#ACC8F0"/></g></svg>';
+export const LIGHTBOX_THUMBNAIL_UNKNOWN =
+  'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs><path d="M9 20.5a1.5 1.5 0 0 1-3 0c0-6.488 5-8.53 5-13.5a4 4 0 1 0-8 0 1.5 1.5 0 0 1-3 0 7 7 0 1 1 14 0c0 5.483-5 7.485-5 13.5z" id="a"/><circle id="b" cx="7.5" cy="29.5" r="1.5"/></defs><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M33 24.5h62a4 4 0 0 1 4 4v54.952L78.081 104.5H33a4 4 0 0 1-4-4v-72a4 4 0 0 1 4-4z" fill="#D1E5FF"/><g transform="translate(57 48)"><use fill="#225CAC" xlink:href="#a"/><path stroke="#225CAC" d="M9.5 20.5a2 2 0 1 1-4 0c0-2.85.756-4.755 2.58-7.59l.385-.595c.152-.236.265-.412.373-.584C10.006 9.873 10.5 8.601 10.5 7a3.5 3.5 0 1 0-7 0 2 2 0 1 1-4 0 7.5 7.5 0 0 1 15 0c0 2.273-.642 3.81-2.314 6.409l-.266.412C10.133 16.592 9.5 18.103 9.5 20.5z"/></g><g transform="translate(57 48)"><use fill="#225CAC" xlink:href="#b"/><circle stroke="#225CAC" cx="7.5" cy="29.5" r="2"/></g><path d="M82 83.5h17l-21 21v-17a4 4 0 0 1 4-4z" fill="#ACC8F0"/></g></svg>';
+export const LIGHTBOX_THUMBNAIL_AD =
+  'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><rect fill="#2B6AC0" x="34" y="74" width="8" height="30" rx="2"/><rect fill="#2B6AC0" x="87" y="74" width="8" height="30" rx="2"/><rect fill="#ACC8F0" x="24" y="30" width="81" height="54" rx="4"/><path fill="#D1E5FF" d="M29 35h71v44H29z"/><path d="M64 53.5V66a3 3 0 0 1-6 0v-4h-5v4a3 3 0 0 1-6 0V53.5a8.5 8.5 0 0 1 17 0zm-6 0a2.5 2.5 0 0 0-5 0V56h5v-2.5zM71 45h3v.041C80.16 45.55 85 50.71 85 57s-4.84 11.45-11 11.959V69h-3a3 3 0 0 1-3-3V48a3 3 0 0 1 3-3zm3 6.083v11.834a6.002 6.002 0 0 0 0-11.834z" fill="#225CAC"/></g></svg>';
+export const LIGHTBOX_THUMBNAIL_IFRAME =
+  'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M22 39h84v58a4 4 0 0 1-4 4H26a4 4 0 0 1-4-4V39z" fill="#D1E5FF"/><path d="M82.243 70l-6.718-6.718a3.5 3.5 0 0 1 4.95-4.95l9.192 9.193a3.5 3.5 0 0 1 0 4.95l-9.192 9.192a3.5 3.5 0 0 1-4.95-4.95L82.243 70zm-36.486 0l6.718 6.718a3.5 3.5 0 0 1-4.95 4.95l-9.192-9.193a3.5 3.5 0 0 1 0-4.95l9.192-9.192a3.5 3.5 0 0 1 4.95 4.95L45.757 70z" fill="#ACC8F0"/><rect fill="#ACC8F0" transform="rotate(15 64 70)" x="60.5" y="50" width="7" height="40" rx="3.5"/><path d="M26 27h76a4 4 0 0 1 4 4v8H22v-8a4 4 0 0 1 4-4z" fill="#225CAC"/><rect fill="#294975" x="97" y="31" width="4" height="4" rx="2"/><rect fill="#294975" x="90" y="31" width="4" height="4" rx="2"/><rect fill="#294975" x="83" y="31" width="4" height="4" rx="2"/></g></svg>';
+export const LIGHTBOX_THUMBNAIL_VIDEO =
+  'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M24 51h80v46a4 4 0 0 1-4 4H28a4 4 0 0 1-4-4V51z" fill="#225CAC"/><path fill="#1B519B" d="M24 49h80v12H24z"/><path fill="#D1E5FF" d="M56 49l-8 12h-9l8-12zm16 0l-8 12h-8l8-12zm32 0l-8 12h-8l8-12zm-16 0l-8 12h-8l8-12z"/><path d="M26.916 49.148l77.274-20.705-2.07-7.728a4 4 0 0 0-4.9-2.828L27.674 36.522a4 4 0 0 0-2.829 4.899l2.07 7.727z" fill="#1B519B"/><path fill="#D1E5FF" d="M57.826 40.866l-10.834-9.52-8.693 2.329 10.833 9.52zm15.454-4.141l-10.833-9.52-7.727 2.07 10.833 9.52zm30.91-8.282l-10.833-9.52-7.728 2.07 10.834 9.52zm-15.455 4.141l-10.833-9.52-7.728 2.07 10.834 9.52z"/><path d="M28 37h9.86a4 4 0 0 1 3.327 1.781L48 49l-8 12H24V41a4 4 0 0 1 4-4z" fill="#2B6AC0"/><circle fill="#D1E5FF" cx="29.5" cy="44.5" r="1.5"/><circle fill="#D1E5FF" cx="29.5" cy="55.5" r="1.5"/></g></svg>';
+export const LIGHTBOX_THUMBNAIL_TEXT =
+  'data:image/svg+xml;charset=utf-8,<svg width="128" height="128" xmlns="http://www.w3.org/2000/svg"><g fill="none" fill-rule="evenodd"><path fill="#1E3B63" d="M0 0h128v128H0z"/><path d="M33 24.5h62a4 4 0 0 1 4 4v54.952L78.081 104.5H33a4 4 0 0 1-4-4v-72a4 4 0 0 1 4-4z" fill="#D1E5FF"/><path fill="#225CAC" d="M42 41h44v6H42zm0 13h44v6H42zm0 13h34v6H42z"/><path d="M82 83.5h17l-21 21v-17a4 4 0 0 1 4-4z" fill="#ACC8F0"/></g></svg>';
diff --git a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js
index 23d572d98a96..7402a86f643e 100644
--- a/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/0.1/test/integration/test-amp-lightbox-gallery.js
@@ -34,117 +34,146 @@ describe.configure().skip('amp-lightbox-gallery', function() {
 </figure>
 `;
 
-  describes.integration('amp-lightbox-gallery with one image', {
-    body,
-    extensions,
-  }, env => {
-
-    let win;
-    let triggerAnalyticsEventSpy;
-
-    beforeEach(() => {
-      win = env.win;
-      win.AMP_MODE.localDev = true;
-      triggerAnalyticsEventSpy =
-        env.sandbox.spy(analytics, 'triggerAnalyticsEvent');
-    });
-
-    it('should open and close correctly', () => {
-      const lightbox = win.document.getElementById('amp-lightbox-gallery');
-      return openLightbox(win.document).then(() => {
-        expect(lightbox).to.not.have.display('none');
-        const carouselQuery = lightbox.getElementsByTagName('AMP-CAROUSEL');
-        expect(carouselQuery.length).to.equal(1);
-        const carousel = carouselQuery[0];
-        const imageViewerQuery = carousel
-            .getElementsByTagName('AMP-IMAGE-VIEWER');
-        expect(imageViewerQuery.length).to.equal(1);
-        const imageViewer = imageViewerQuery[0];
-        const img = imageViewer
-            .querySelector('img.i-amphtml-image-viewer-image');
-        expect(img.getAttribute('src')).to.equal('/examples/img/sample.jpg');
-        const closeButton = lightbox
-            .querySelector('.i-amphtml-lbg-button-close.i-amphtml-lbg-button');
-        const lightboxClose = waitForLightboxClose(lightbox, carousel);
-        closeButton.click();
-        return lightboxClose;
-      }).then(() => {
-        expect(lightbox).to.have.display('none');
+  describes.integration(
+    'amp-lightbox-gallery with one image',
+    {
+      body,
+      extensions,
+    },
+    env => {
+      let win;
+      let triggerAnalyticsEventSpy;
+
+      beforeEach(() => {
+        win = env.win;
+        win.AMP_MODE.localDev = true;
+        triggerAnalyticsEventSpy = env.sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
+      });
+
+      it('should open and close correctly', () => {
+        const lightbox = win.document.getElementById('amp-lightbox-gallery');
+        return openLightbox(win.document)
+          .then(() => {
+            expect(lightbox).to.not.have.display('none');
+            const carouselQuery = lightbox.getElementsByTagName('AMP-CAROUSEL');
+            expect(carouselQuery.length).to.equal(1);
+            const carousel = carouselQuery[0];
+            const imageViewerQuery = carousel.getElementsByTagName(
+              'AMP-IMAGE-VIEWER'
+            );
+            expect(imageViewerQuery.length).to.equal(1);
+            const imageViewer = imageViewerQuery[0];
+            const img = imageViewer.querySelector(
+              'img.i-amphtml-image-viewer-image'
+            );
+            expect(img.getAttribute('src')).to.equal(
+              '/examples/img/sample.jpg'
+            );
+            const closeButton = lightbox.querySelector(
+              '.i-amphtml-lbg-button-close.i-amphtml-lbg-button'
+            );
+            const lightboxClose = waitForLightboxClose(lightbox, carousel);
+            closeButton.click();
+            return lightboxClose;
+          })
+          .then(() => {
+            expect(lightbox).to.have.display('none');
+          });
       });
-    });
-
-    it('should show close button only for one lightboxed item', () => {
-      return openLightbox(win.document).then(() => {
-        const controlsContainerQuery =
-          win.document.getElementsByClassName('i-amphtml-lbg-controls');
-        expect(controlsContainerQuery.length).to.equal(1);
-        const controlsContainer = controlsContainerQuery[0];
-        expect(controlsContainer.classList
-            .contains('i-amphtml-lbg-single')).to.be.true;
-
-        const closeButton = getButton(win.document,
-            'i-amphtml-lbg-button-close');
-        expect(closeButton.getAttribute('aria-label')).to.equal('Close');
-        expect(closeButton).to.have.display('block');
-
-        const galleryButton = getButton(win.document,
-            'i-amphtml-lbg-button-gallery');
-        expect(galleryButton.getAttribute('aria-label')).to.equal('Gallery');
-        expect(galleryButton).to.have.display('none');
-
-        const prevButton = getButton(win.document, 'i-amphtml-lbg-button-prev');
-        expect(prevButton.getAttribute('aria-label')).to.equal('Prev');
-        expect(prevButton).to.have.display('none');
-
-        const nextButton = getButton(win.document, 'i-amphtml-lbg-button-next');
-        expect(nextButton.getAttribute('aria-label')).to.equal('Next');
-        expect(nextButton).to.have.display('none');
+
+      it('should show close button only for one lightboxed item', () => {
+        return openLightbox(win.document).then(() => {
+          const controlsContainerQuery = win.document.getElementsByClassName(
+            'i-amphtml-lbg-controls'
+          );
+          expect(controlsContainerQuery.length).to.equal(1);
+          const controlsContainer = controlsContainerQuery[0];
+          expect(controlsContainer.classList.contains('i-amphtml-lbg-single'))
+            .to.be.true;
+
+          const closeButton = getButton(
+            win.document,
+            'i-amphtml-lbg-button-close'
+          );
+          expect(closeButton.getAttribute('aria-label')).to.equal('Close');
+          expect(closeButton).to.have.display('block');
+
+          const galleryButton = getButton(
+            win.document,
+            'i-amphtml-lbg-button-gallery'
+          );
+          expect(galleryButton.getAttribute('aria-label')).to.equal('Gallery');
+          expect(galleryButton).to.have.display('none');
+
+          const prevButton = getButton(
+            win.document,
+            'i-amphtml-lbg-button-prev'
+          );
+          expect(prevButton.getAttribute('aria-label')).to.equal('Prev');
+          expect(prevButton).to.have.display('none');
+
+          const nextButton = getButton(
+            win.document,
+            'i-amphtml-lbg-button-next'
+          );
+          expect(nextButton.getAttribute('aria-label')).to.equal('Next');
+          expect(nextButton).to.have.display('none');
+        });
       });
-    });
-
-    it('should display text description', () => {
-      openLightbox(win.document).then(() => {
-        const descBoxQuery =
-          win.document.getElementsByClassName('i-amphtml-lbg-desc-box');
-        expect(descBoxQuery.length).to.equal(1);
-        const descBox = descBoxQuery[0];
-        expect(descBox.classList.contains('i-amphtml-lbg-standard')).to.be.true;
-        expect(descBox.children.length).to.equal(2);
-        const descriptionMask = descBox.children[0];
-        expect(descriptionMask.classList.contains('i-amphtml-lbg-desc-mask'))
+
+      it('should display text description', () => {
+        openLightbox(win.document).then(() => {
+          const descBoxQuery = win.document.getElementsByClassName(
+            'i-amphtml-lbg-desc-box'
+          );
+          expect(descBoxQuery.length).to.equal(1);
+          const descBox = descBoxQuery[0];
+          expect(descBox.classList.contains('i-amphtml-lbg-standard')).to.be
+            .true;
+          expect(descBox.children.length).to.equal(2);
+          const descriptionMask = descBox.children[0];
+          expect(descriptionMask.classList.contains('i-amphtml-lbg-desc-mask'))
             .to.be.true;
 
-        const descriptionText = descBox.children[1];
-        expect(descriptionText.classList.contains('i-amphtml-lbg-desc-text'))
+          const descriptionText = descBox.children[1];
+          expect(descriptionText.classList.contains('i-amphtml-lbg-desc-text'))
             .to.be.true;
-        expect(descriptionText.textContent).to.equal('This is a figcaption.');
+          expect(descriptionText.textContent).to.equal('This is a figcaption.');
+        });
       });
-    });
 
-    it('should trigger analytics events for description displayed', () => {
-      openLightbox(win.document).then(() => {
-        expect(triggerAnalyticsEventSpy).to.be.called;
-        expect(triggerAnalyticsEventSpy).to.be.calledWith(
+      it('should trigger analytics events for description displayed', () => {
+        openLightbox(win.document).then(() => {
+          expect(triggerAnalyticsEventSpy).to.be.called;
+          expect(triggerAnalyticsEventSpy).to.be.calledWith(
             win.document.getElementById('amp-lightbox-gallery'),
-            'controlsToggled');
+            'controlsToggled'
+          );
+        });
       });
-    });
-
-    it('should trigger analytics events for thumbnails displayed', () => {
-      openLightbox(win.document).then(() => {
-        const thumbnail =
-          document.getElementsByClassName('i-amphtml-lbg-button-gallery');
-        thumbnail[0].click();
-        const thumbnailQuery =
-          win.document.getElementsByClassName('i-amphtml-lbg-gallery');
-        expect(triggerAnalyticsEventSpy).to.be.called;
-        expect(triggerAnalyticsEventSpy).to.be.calledWith(
+
+      it('should trigger analytics events for thumbnails displayed', () => {
+        openLightbox(win.document).then(() => {
+          const thumbnail = document.getElementsByClassName(
+            'i-amphtml-lbg-button-gallery'
+          );
+          thumbnail[0].click();
+          const thumbnailQuery = win.document.getElementsByClassName(
+            'i-amphtml-lbg-gallery'
+          );
+          expect(triggerAnalyticsEventSpy).to.be.called;
+          expect(triggerAnalyticsEventSpy).to.be.calledWith(
             win.document.getElementById('amp-lightbox-gallery'),
-            'descriptionToggled');
-        expect(thumbnailQuery.length).to.equal(1);
+            'descriptionToggled'
+          );
+          expect(thumbnailQuery.length).to.equal(1);
+        });
       });
-    });
-  });
+    }
+  );
 
   const multipleImagesBody = `
   <figure>
@@ -169,34 +198,41 @@ describe.configure().skip('amp-lightbox-gallery', function() {
   </figure>
   `;
 
-  describes.integration('amp-lightbox-gallery with multiple images', {
-    multipleImagesBody,
-    extensions,
-  }, env => {
-
-    let win;
-    let triggerAnalyticsEventSpy;
-
-    beforeEach(() => {
-      win = env.win;
-      win.AMP_MODE.localDev = true;
-      triggerAnalyticsEventSpy =
-        env.sandbox.spy(analytics, 'triggerAnalyticsEvent');
-    });
-
-    it('should trigger analytics events for description toggled', () => {
-      const lightbox = win.document.getElementById('amp-lightbox-gallery');
-      openLightbox(win.document).then(() => {
-        const nextButton = lightbox
-            .querySelector('i-amphtml-lbg-button-next');
-        nextButton.click();
-        expect(triggerAnalyticsEventSpy).to.be.called;
-        expect(triggerAnalyticsEventSpy).to.be.calledWith(
+  describes.integration(
+    'amp-lightbox-gallery with multiple images',
+    {
+      multipleImagesBody,
+      extensions,
+    },
+    env => {
+      let win;
+      let triggerAnalyticsEventSpy;
+
+      beforeEach(() => {
+        win = env.win;
+        win.AMP_MODE.localDev = true;
+        triggerAnalyticsEventSpy = env.sandbox.spy(
+          analytics,
+          'triggerAnalyticsEvent'
+        );
+      });
+
+      it('should trigger analytics events for description toggled', () => {
+        const lightbox = win.document.getElementById('amp-lightbox-gallery');
+        openLightbox(win.document).then(() => {
+          const nextButton = lightbox.querySelector(
+            'i-amphtml-lbg-button-next'
+          );
+          nextButton.click();
+          expect(triggerAnalyticsEventSpy).to.be.called;
+          expect(triggerAnalyticsEventSpy).to.be.calledWith(
             win.document.getElementById('amp-lightbox-gallery'),
-            'descriptionToggled');
+            'descriptionToggled'
+          );
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 function openLightbox(document) {
diff --git a/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js b/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
index 57e34efee33a..f8a6b01145e7 100644
--- a/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
+++ b/extensions/amp-lightbox-gallery/0.1/test/test-amp-lightbox-gallery.js
@@ -18,34 +18,36 @@ import {installLightboxGallery} from '../amp-lightbox-gallery';
 
 const TAG = 'amp-lightbox-gallery';
 
-describes.realWin('amp-lightbox-gallery', {
-  amp: {
-    amp: true,
-    ampdoc: 'single',
-    extensions: [TAG],
+describes.realWin(
+  'amp-lightbox-gallery',
+  {
+    amp: {
+      amp: true,
+      ampdoc: 'single',
+      extensions: [TAG],
+    },
   },
-}, env => {
+  env => {
+    let win, doc, gallery;
 
-  let win, doc, gallery;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    return installLightboxGallery(env.ampdoc).then(() => {
-      gallery = doc.getElementById(TAG);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      return installLightboxGallery(env.ampdoc).then(() => {
+        gallery = doc.getElementById(TAG);
+      });
     });
-  });
 
-  describe('basic functionality', function() {
-    this.timeout(5000);
-    it('should contain a container on build', done => {
-      gallery.build().then(() => {
-        const container = doc.getElementsByClassName('i-amphtml-lbg');
-        expect(container.length).to.equal(1);
-        expect(container[0].tagName).to.equal('DIV');
-        done();
+    describe('basic functionality', function() {
+      this.timeout(5000);
+      it('should contain a container on build', done => {
+        gallery.build().then(() => {
+          const container = doc.getElementsByClassName('i-amphtml-lbg');
+          expect(container.length).to.equal(1);
+          expect(container[0].tagName).to.equal('DIV');
+          done();
+        });
       });
     });
-
-  });
-});
+  }
+);
diff --git a/extensions/amp-lightbox/0.1/amp-lightbox.js b/extensions/amp-lightbox/0.1/amp-lightbox.js
index 1624ce86945c..caf5b26f4f0b 100644
--- a/extensions/amp-lightbox/0.1/amp-lightbox.js
+++ b/extensions/amp-lightbox/0.1/amp-lightbox.js
@@ -103,7 +103,6 @@ function showCloseButtonHeader(header) {
 }
 
 class AmpLightbox extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -142,8 +141,9 @@ class AmpLightbox extends AMP.BaseElement {
     this.scrollTimerId_ = null;
 
     /** @private @const {string} */
-    this.animationPreset_ =
-        (element.getAttribute('animate-in') || DEFAULT_ANIMATION).toLowerCase();
+    this.animationPreset_ = (
+      element.getAttribute('animate-in') || DEFAULT_ANIMATION
+    ).toLowerCase();
 
     /** @private {?Element} */
     this.closeButtonHeader_ = null;
@@ -154,28 +154,33 @@ class AmpLightbox extends AMP.BaseElement {
     this.isIos_ = platform.isIos();
 
     /** @const {function()} */
-    this.boundReschedule_ = debounce(this.win, () => {
-      const container = user().assertElement(this.container_,
-          'E#19457 this.container_');
-      this.scheduleLayout(container);
-      this.scheduleResume(container);
-    }, 500);
+    this.boundReschedule_ = debounce(
+      this.win,
+      () => {
+        const container = user().assertElement(
+          this.container_,
+          'E#19457 this.container_'
+        );
+        this.scheduleLayout(container);
+        this.scheduleResume(container);
+      },
+      500
+    );
   }
 
   /** @override */
   buildCallback() {
     this.user().assert(
-        hasOwn(AnimationPresets, this.animationPreset_),
-        'Invalid `animate-in` value %s',
-        this.animationPreset_);
+      hasOwn(AnimationPresets, this.animationPreset_),
+      'Invalid `animate-in` value %s',
+      this.animationPreset_
+    );
 
     this.element.classList.add('i-amphtml-overlay');
     this.action_ = Services.actionServiceForDoc(this.element);
     this.maybeSetTransparentBody_();
 
-    this.registerDefaultAction(
-        unused => this.open_(),
-        'open');
+    this.registerDefaultAction(unused => this.open_(), 'open');
     this.registerAction('close', this.close.bind(this));
   }
 
@@ -260,15 +265,18 @@ class AmpLightbox extends AMP.BaseElement {
       return;
     }
     this.initialize_();
-    this.boundCloseOnEscape_ =
-      /** @type {?function(this:AmpLightbox, Event)} */ (
-        this.closeOnEscape_.bind(this));
+    this.boundCloseOnEscape_ = /** @type {?function(this:AmpLightbox, Event)} */ (this.closeOnEscape_.bind(
+      this
+    ));
     this.win.document.documentElement.addEventListener(
-        'keydown', this.boundCloseOnEscape_);
+      'keydown',
+      this.boundCloseOnEscape_
+    );
 
     const {promise, resolve} = new Deferred();
-    this.getViewport().enterLightboxMode(this.element, promise)
-        .then(() => this.finalizeOpen_(resolve));
+    this.getViewport()
+      .enterLightboxMode(this.element, promise)
+      .then(() => this.finalizeOpen_(resolve));
   }
 
   /** @override */
@@ -302,13 +310,17 @@ class AmpLightbox extends AMP.BaseElement {
   finalizeOpen_(callback) {
     const {element} = this;
 
-    const {durationSeconds, openStyle, closedStyle} =
-        this.getAnimationPresetDef_();
+    const {
+      durationSeconds,
+      openStyle,
+      closedStyle,
+    } = this.getAnimationPresetDef_();
 
     const props = Object.keys(openStyle);
 
-    const transition =
-        props.map(p => `${p} ${durationSeconds}s ease-in`).join(',');
+    const transition = props
+      .map(p => `${p} ${durationSeconds}s ease-in`)
+      .join(',');
 
     this.eventCounter_++;
 
@@ -324,7 +336,7 @@ class AmpLightbox extends AMP.BaseElement {
     toggle(element, true);
 
     this.mutateElement(() => {
-      element./*OK*/scrollTop = 0;
+      element./*OK*/ scrollTop = 0;
     });
 
     this.handleAutofocus_();
@@ -356,9 +368,11 @@ class AmpLightbox extends AMP.BaseElement {
     this.scheduleResume(container);
     this.triggerEvent_(LightboxEvents.OPEN);
 
-    this.getHistory_().push(this.close.bind(this)).then(historyId => {
-      this.historyId_ = historyId;
-    });
+    this.getHistory_()
+      .push(this.close.bind(this))
+      .then(historyId => {
+        this.historyId_ = historyId;
+      });
 
     this.active_ = true;
   }
@@ -381,17 +395,20 @@ class AmpLightbox extends AMP.BaseElement {
 
     let headerHeight;
 
-    this.measureMutateElement(() => {
-      headerHeight = header./*OK*/getBoundingClientRect().height;
-    }, () => {
-      // Done in vsync in order to apply transition.
-      showCloseButtonHeader(header);
-
-      setImportantStyles(dev().assertElement(this.container_), {
-        'margin-top': px(headerHeight),
-        'min-height': `calc(100vh - ${px(headerHeight)})`,
-      });
-    });
+    this.measureMutateElement(
+      () => {
+        headerHeight = header./*OK*/ getBoundingClientRect().height;
+      },
+      () => {
+        // Done in vsync in order to apply transition.
+        showCloseButtonHeader(header);
+
+        setImportantStyles(dev().assertElement(this.container_), {
+          'margin-top': px(headerHeight),
+          'min-height': `calc(100vh - ${px(headerHeight)})`,
+        });
+      }
+    );
   }
 
   /**
@@ -428,8 +445,9 @@ class AmpLightbox extends AMP.BaseElement {
       removeElement(this.closeButtonHeader_);
       this.closeButtonHeader_ = null;
     }
-    this.getViewport().leaveLightboxMode(this.element)
-        .then(() => this.finalizeClose_());
+    this.getViewport()
+      .leaveLightboxMode(this.element)
+      .then(() => this.finalizeClose_());
   }
 
   /**
@@ -444,7 +462,7 @@ class AmpLightbox extends AMP.BaseElement {
       if (event != this.eventCounter_) {
         return;
       }
-      this./*OK*/collapse();
+      this./*OK*/ collapse();
       this.boundReschedule_();
     };
 
@@ -457,14 +475,18 @@ class AmpLightbox extends AMP.BaseElement {
       element.addEventListener('animationend', collapseAndReschedule);
     }
 
-    setStyles(element, assertDoesNotContainDisplay(
-        this.getAnimationPresetDef_().closedStyle));
+    setStyles(
+      element,
+      assertDoesNotContainDisplay(this.getAnimationPresetDef_().closedStyle)
+    );
 
     if (this.historyId_ != -1) {
       this.getHistory_().pop(this.historyId_);
     }
     this.win.document.documentElement.removeEventListener(
-        'keydown', this.boundCloseOnEscape_);
+      'keydown',
+      this.boundCloseOnEscape_
+    );
     this.boundCloseOnEscape_ = null;
     this.schedulePause(dev().assertElement(this.container_));
     this.active_ = false;
@@ -486,15 +508,17 @@ class AmpLightbox extends AMP.BaseElement {
    * @private
    */
   scrollHandler_() {
-    const currentScrollTop = this.element./*OK*/scrollTop;
+    const currentScrollTop = this.element./*OK*/ scrollTop;
 
     if (this.isIos_) {
       // To avoid scroll-freeze issues in iOS, prevent reaching top/bottom
       if (currentScrollTop == 0) {
-        this.element./*OK*/scrollTop = 1;
-      } else if (this.element./*OK*/scrollHeight ==
-            currentScrollTop + this.element./*OK*/offsetHeight) {
-        this.element./*OK*/scrollTop = currentScrollTop - 1;
+        this.element./*OK*/ scrollTop = 1;
+      } else if (
+        this.element./*OK*/ scrollHeight ==
+        currentScrollTop + this.element./*OK*/ offsetHeight
+      ) {
+        this.element./*OK*/ scrollTop = currentScrollTop - 1;
       }
     }
 
@@ -512,19 +536,28 @@ class AmpLightbox extends AMP.BaseElement {
    * @private
    */
   waitForScroll_(startingScrollTop) {
-    this.scrollTimerId_ = /** @type {number} */ (
-      Services.timerFor(this.win).delay(() => {
-        if (Math.abs(startingScrollTop - this.pos_) < 30) {
-          dev().fine(TAG, 'slow scrolling: %s - %s',
-              startingScrollTop, this.pos_);
-          this.scrollTimerId_ = null;
-          this.update_(this.pos_);
-        } else {
-          dev().fine(TAG, 'fast scrolling: %s - %s',
-              startingScrollTop, this.pos_);
-          this.waitForScroll_(this.pos_);
-        }
-      }, 100));
+    this.scrollTimerId_ = /** @type {number} */ (Services.timerFor(
+      this.win
+    ).delay(() => {
+      if (Math.abs(startingScrollTop - this.pos_) < 30) {
+        dev().fine(
+          TAG,
+          'slow scrolling: %s - %s',
+          startingScrollTop,
+          this.pos_
+        );
+        this.scrollTimerId_ = null;
+        this.update_(this.pos_);
+      } else {
+        dev().fine(
+          TAG,
+          'fast scrolling: %s - %s',
+          startingScrollTop,
+          this.pos_
+        );
+        this.waitForScroll_(this.pos_);
+      }
+    }, 100));
   }
 
   /**
@@ -574,17 +607,21 @@ class AmpLightbox extends AMP.BaseElement {
     for (let i = 0; i < descendants.length; i++) {
       const descendant = descendants[i];
       let offsetTop = 0;
-      for (let n = descendant;
+      for (
+        let n = descendant;
         n && this.element.contains(n);
-        n = n./*OK*/offsetParent) {
-        offsetTop += n./*OK*/offsetTop;
+        n = n./*OK*/ offsetParent
+      ) {
+        offsetTop += n./*OK*/ offsetTop;
       }
       // Check whether child element is almost visible in the lightbox given
       // current scrollTop position of lightbox
       // We consider element visible if within 2x containerHeight distance.
       const visibilityMargin = 2 * containerHeight;
-      if (offsetTop + descendant./*OK*/offsetHeight >= pos - visibilityMargin &&
-        offsetTop <= pos + visibilityMargin) {
+      if (
+        offsetTop + descendant./*OK*/ offsetHeight >= pos - visibilityMargin &&
+        offsetTop <= pos + visibilityMargin
+      ) {
         callback(descendant);
       }
     }
@@ -597,8 +634,8 @@ class AmpLightbox extends AMP.BaseElement {
   getSize_() {
     if (!this.size_) {
       this.size_ = {
-        width: this.element./*OK*/clientWidth,
-        height: this.element./*OK*/clientHeight,
+        width: this.element./*OK*/ clientWidth,
+        height: this.element./*OK*/ clientHeight,
       };
     }
     return this.size_;
@@ -641,7 +678,6 @@ class AmpLightbox extends AMP.BaseElement {
   }
 }
 
-
 /**
  * Sets the document body to transparent to allow for frame "merging".
  * @param {!Window} win
@@ -652,33 +688,38 @@ function setTransparentBody(win, body) {
   const state = {};
   const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
 
-  Services.resourcesForDoc(ampdoc).measureMutateElement(body,
-      function measure() {
-        state.alreadyTransparent =
-            computedStyle(win, body)['background-color'] == 'rgba(0, 0, 0, 0)';
-      },
-      function mutate() {
-        if (!state.alreadyTransparent && !getMode().test) {
-          // TODO(alanorozco): Create documentation page and link it here once
-          // the A4A lightbox experiment is turned on.
-          user().warn(TAG,
-              'The background of the <body> element has been forced to ' +
-              'transparent. If you need to set background, use an ' +
-              'intermediate container.');
-        }
+  Services.resourcesForDoc(ampdoc).measureMutateElement(
+    body,
+    function measure() {
+      state.alreadyTransparent =
+        computedStyle(win, body)['background-color'] == 'rgba(0, 0, 0, 0)';
+    },
+    function mutate() {
+      if (!state.alreadyTransparent && !getMode().test) {
+        // TODO(alanorozco): Create documentation page and link it here once
+        // the A4A lightbox experiment is turned on.
+        user().warn(
+          TAG,
+          'The background of the <body> element has been forced to ' +
+            'transparent. If you need to set background, use an ' +
+            'intermediate container.'
+        );
+      }
 
-        // set as !important regardless to prevent changes
-        setImportantStyles(body, {background: 'transparent'});
-      });
+      // set as !important regardless to prevent changes
+      setImportantStyles(body, {background: 'transparent'});
+    }
+  );
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   // TODO(alanorozco): refactor this somehow so we don't need to do a direct
   // getMode check
   if (getMode().runtime == 'inabox') {
-    setTransparentBody(window, /** @type {!HTMLBodyElement} */ (
-      devAssert(document.body)));
+    setTransparentBody(
+      window,
+      /** @type {!HTMLBodyElement} */ (devAssert(document.body))
+    );
   }
 
   AMP.registerElement(TAG, AmpLightbox, CSS);
diff --git a/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js b/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
index b4aad65ef74d..15db38ca0ad0 100644
--- a/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/amp-link-rewriter.js
@@ -20,7 +20,6 @@ import {Priority} from '../../../src/service/navigation';
 import {Services} from '../../../src/services';
 
 export class AmpLinkRewriter extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -45,10 +44,11 @@ export class AmpLinkRewriter extends AMP.BaseElement {
      * We had to get referrerUrl here because when we use expandUrlSync()
      * inside LinkRewriter it doesn't retrieve the referrerUrl
      */
-    return this.ampDoc_.whenBodyAvailable()
-        .then(() => viewer.getReferrerUrl())
-        .then(referrer => this.referrer_ = referrer)
-        .then(this.letsRockIt_.bind(this));
+    return this.ampDoc_
+      .whenBodyAvailable()
+      .then(() => viewer.getReferrerUrl())
+      .then(referrer => (this.referrer_ = referrer))
+      .then(this.letsRockIt_.bind(this));
   }
 
   /**
@@ -56,9 +56,10 @@ export class AmpLinkRewriter extends AMP.BaseElement {
    */
   letsRockIt_() {
     this.rewriter_ = new LinkRewriter(
-        this.referrer_,
-        this.element,
-        this.ampDoc_);
+      this.referrer_,
+      this.element,
+      this.ampDoc_
+    );
 
     this.attachClickEvent_();
   }
diff --git a/extensions/amp-link-rewriter/0.1/config-options.js b/extensions/amp-link-rewriter/0.1/config-options.js
index 0a8514eb20c2..71905ee9bd02 100644
--- a/extensions/amp-link-rewriter/0.1/config-options.js
+++ b/extensions/amp-link-rewriter/0.1/config-options.js
@@ -15,10 +15,7 @@
  */
 import {getChildJsonConfig} from '../../../src/json';
 import {hasOwn} from '../../../src/utils/object';
-import {
-  user,
-  userAssert,
-} from '../../../src/log';
+import {user, userAssert} from '../../../src/log';
 
 /**
  * @typedef {{output: string, section:Array, attribute:Object, vars:Object}}
@@ -30,18 +27,19 @@ let ConfigOptsDef;
  * @return {!ConfigOptsDef}
  */
 export function getConfigOpts(element) {
-
   const config = getConfigJson(element);
-  userAssert(config['output'],
-      'amp-link-rewriter: output config property is required');
+  userAssert(
+    config['output'],
+    'amp-link-rewriter: output config property is required'
+  );
 
   return {
     output: config['output'].toString(),
     section: hasOwn(config, 'section') ? config['section'] : [],
 
-    attribute: hasOwn(config, 'attribute') ?
-      parseAttribute(config['attribute']) :
-      {},
+    attribute: hasOwn(config, 'attribute')
+      ? parseAttribute(config['attribute'])
+      : {},
 
     vars: hasOwn(config, 'vars') ? config['vars'] : {},
   };
diff --git a/extensions/amp-link-rewriter/0.1/link-rewriter.js b/extensions/amp-link-rewriter/0.1/link-rewriter.js
index 375301d1ddec..d09ec2f58ffb 100644
--- a/extensions/amp-link-rewriter/0.1/link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/link-rewriter.js
@@ -19,12 +19,7 @@ import {getConfigOpts} from './config-options';
 import {getDataParamsFromAttributes} from '../../../src/dom';
 import {getScopeElements} from './scope';
 
-const WL_ANCHOR_ATTR = [
-  'href',
-  'id',
-  'rel',
-  'rev',
-];
+const WL_ANCHOR_ATTR = ['href', 'id', 'rel', 'rev'];
 const PREFIX_DATA_ATTR = /^vars(.+)/;
 const REG_DOMAIN_URL = /^(?:https?:)?(?:\/\/)?([^\/?]+)/i;
 const PAGE_PROP_WHITELIST = {
@@ -75,16 +70,20 @@ export class LinkRewriter {
     if (!this.isListed_(anchor)) {
       return;
     }
-    const sourceTrimmedDomain = Services
-        .documentInfoForDoc(this.ampDoc_)
-        .sourceUrl.match(REG_DOMAIN_URL)[1];
-
-    const canonicalTrimmedDomain = Services
-        .documentInfoForDoc(this.ampDoc_)
-        .canonicalUrl.match(REG_DOMAIN_URL)[1];
-
-    if (this.isInternalLink_(anchor,
-        [sourceTrimmedDomain, canonicalTrimmedDomain])) {
+    const sourceTrimmedDomain = Services.documentInfoForDoc(
+      this.ampDoc_
+    ).sourceUrl.match(REG_DOMAIN_URL)[1];
+
+    const canonicalTrimmedDomain = Services.documentInfoForDoc(
+      this.ampDoc_
+    ).canonicalUrl.match(REG_DOMAIN_URL)[1];
+
+    if (
+      this.isInternalLink_(anchor, [
+        sourceTrimmedDomain,
+        canonicalTrimmedDomain,
+      ])
+    ) {
       return;
     }
 
@@ -98,8 +97,10 @@ export class LinkRewriter {
    * @private
    */
   isRewritten_(anchor) {
-    return anchor.href.match(REG_DOMAIN_URL)[1] ===
-      this.rewrittenUrl_.match(REG_DOMAIN_URL)[1];
+    return (
+      anchor.href.match(REG_DOMAIN_URL)[1] ===
+      this.rewrittenUrl_.match(REG_DOMAIN_URL)[1]
+    );
   }
 
   /**
@@ -157,14 +158,13 @@ export class LinkRewriter {
    * @return {string}
    */
   replacePageProp_() {
-    return this.urlReplacementService_
-        .expandUrlSync(
-            this.rewrittenUrl_,
-            /** expandUrlSync doesn't fill DOCUMENT_REFERRER so we pass it*/
-            {DOCUMENT_REFERRER: this.referrer_},
-            undefined,
-            PAGE_PROP_WHITELIST
-        );
+    return this.urlReplacementService_.expandUrlSync(
+      this.rewrittenUrl_,
+      /** expandUrlSync doesn't fill DOCUMENT_REFERRER so we pass it*/
+      {DOCUMENT_REFERRER: this.referrer_},
+      undefined,
+      PAGE_PROP_WHITELIST
+    );
   }
 
   /**
@@ -189,14 +189,17 @@ export class LinkRewriter {
      * overwrite 'vars config values'
      */
     const dataset = getDataParamsFromAttributes(
-        htmlElement,
-        /* computeParamNameFunc */ undefined,
-        PREFIX_DATA_ATTR);
+      htmlElement,
+      /* computeParamNameFunc */ undefined,
+      PREFIX_DATA_ATTR
+    );
 
     Object.assign(vars, dataset);
 
     /** add a random value to be use in the output pattern */
-    vars['random'] = Math.random().toString(32).substr(2);
+    vars['random'] = Math.random()
+      .toString(32)
+      .substr(2);
 
     /**
      * Replace placeholders for properties of the document, anchor attributes
@@ -205,8 +208,9 @@ export class LinkRewriter {
     Object.keys(vars).forEach(key => {
       if (vars[key]) {
         this.rewrittenUrl_ = this.rewrittenUrl_.replace(
-            '${' + key + '}',
-            encodeURIComponent(vars[key]));
+          '${' + key + '}',
+          encodeURIComponent(vars[key])
+        );
       }
     });
 
@@ -214,10 +218,9 @@ export class LinkRewriter {
      * Finally to clean up we leave empty all placeholders that
      * were not replace in previous steps
      */
-    this.rewrittenUrl_ = this.rewrittenUrl_
-        .replace(/\${[A-Za-z0-9]+}+/, () => {
-          return '';
-        });
+    this.rewrittenUrl_ = this.rewrittenUrl_.replace(/\${[A-Za-z0-9]+}+/, () => {
+      return '';
+    });
     return this.rewrittenUrl_;
   }
 }
diff --git a/extensions/amp-link-rewriter/0.1/scope.js b/extensions/amp-link-rewriter/0.1/scope.js
index c2b470fc668d..3a7d2a899447 100644
--- a/extensions/amp-link-rewriter/0.1/scope.js
+++ b/extensions/amp-link-rewriter/0.1/scope.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  *
  * @param {?../../../src/service/ampdoc-impl.AmpDoc} ampDoc
@@ -22,7 +21,6 @@
  * @return {!Array<!Element>}
  */
 export function getScopeElements(ampDoc, configOpts) {
-
   const doc = ampDoc.getRootNode();
   let cssSelector = configOpts.section.join(' a, ');
   let selection = doc.querySelectorAll('a');
diff --git a/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js b/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
index 7a470773e648..07d2033266ed 100644
--- a/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
+++ b/extensions/amp-link-rewriter/0.1/test/test-amp-link-rewriter.js
@@ -19,78 +19,81 @@ import {getConfigOpts} from '../config-options';
 import {getScopeElements} from '../scope';
 import helpersMaker from './test-helpers';
 
-describes.fakeWin('amp-link-rewriter', {
-  win: {
-    location: 'http://partnersite.com/123',
+describes.fakeWin(
+  'amp-link-rewriter',
+  {
+    win: {
+      location: 'http://partnersite.com/123',
+    },
+    amp: {
+      extensions: ['amp-link-rewriter'],
+    },
   },
-  amp: {
-    extensions: ['amp-link-rewriter'],
-  },
-}, env => {
-
-  let config, helpers, mockedHtml, win;
-
-  beforeEach(() => {
-    win = env.win;
-
-    helpers = helpersMaker(env);
-
-    config = {
-      'output': 'https://visit.foo.net/visit?pid=110&url=${href}&cid=${customerId}&ref=DOCUMENT_REFERRER&location=SOURCE_URL&rel=${rel}&productId=${eventId}',
-      'section': [
-        '#track-section',
-      ],
-      'attribute': {
-        'class': 'sidebar',
-        'href': '((?!\\bskip\\.com\\b).)*',
-      },
-      'vars': {
-        'customerId': '12345',
-      },
-    };
-
-    mockedHtml = '<div>' +
-      '<a class="sidebar" href="http://example.com">Example</a>' +
-      '</div>' +
-      '<div id="track-section">' +
-      '<a class="sidebar" href="http://retailer1.com">Retailer 1</a>' +
-      '<a class="sidebar" href="https://skip.com">Retailer 2</a>' +
-      '</div>';
-  });
-
-  afterEach(() => {
-    env.sandbox.restore();
-  });
-
-  it('Should match the built url', () => {
-    const linkRewriterElement = helpers.createLinkRewriterElement(config);
-    env.ampdoc.getRootNode().body.appendChild(linkRewriterElement);
-
-    const rewriter = new LinkRewriter('', linkRewriterElement, env.ampdoc);
-
-    const anchorElement = win.document.createElement('a');
-
-    anchorElement.href = 'http://example.com';
-    anchorElement.rel = '235';
-    anchorElement.setAttribute('data-vars-event-id', '567');
-
-    rewriter.handleClick(anchorElement);
-    expect(anchorElement.href)
-        .to.equal('https://visit.foo.net/visit?pid=110&url=http%3A%2F%2Fexample.com&cid=12345&ref=&location=http%3A%2F%2Fpartnersite.com%2F123&rel=235&productId=567');
-  });
-
-  it('Should return the number of anchors that match the config', () => {
-
-    const linkRewriterElement = helpers.createLinkRewriterElement(config);
-
-    const doc = document.implementation.createHTMLDocument('test document');
-    doc.body.appendChild(linkRewriterElement);
-    doc.body.insertAdjacentHTML('afterbegin', mockedHtml);
-
-    const configOpts_ = getConfigOpts(linkRewriterElement);
-
-    const list = getScopeElements(doc, configOpts_);
-
-    expect(list.length).to.equal(1);
-  });
-});
+  env => {
+    let config, helpers, mockedHtml, win;
+
+    beforeEach(() => {
+      win = env.win;
+
+      helpers = helpersMaker(env);
+
+      config = {
+        'output':
+          'https://visit.foo.net/visit?pid=110&url=${href}&cid=${customerId}&ref=DOCUMENT_REFERRER&location=SOURCE_URL&rel=${rel}&productId=${eventId}',
+        'section': ['#track-section'],
+        'attribute': {
+          'class': 'sidebar',
+          'href': '((?!\\bskip\\.com\\b).)*',
+        },
+        'vars': {
+          'customerId': '12345',
+        },
+      };
+
+      mockedHtml =
+        '<div>' +
+        '<a class="sidebar" href="http://example.com">Example</a>' +
+        '</div>' +
+        '<div id="track-section">' +
+        '<a class="sidebar" href="http://retailer1.com">Retailer 1</a>' +
+        '<a class="sidebar" href="https://skip.com">Retailer 2</a>' +
+        '</div>';
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    it('Should match the built url', () => {
+      const linkRewriterElement = helpers.createLinkRewriterElement(config);
+      env.ampdoc.getRootNode().body.appendChild(linkRewriterElement);
+
+      const rewriter = new LinkRewriter('', linkRewriterElement, env.ampdoc);
+
+      const anchorElement = win.document.createElement('a');
+
+      anchorElement.href = 'http://example.com';
+      anchorElement.rel = '235';
+      anchorElement.setAttribute('data-vars-event-id', '567');
+
+      rewriter.handleClick(anchorElement);
+      expect(anchorElement.href).to.equal(
+        'https://visit.foo.net/visit?pid=110&url=http%3A%2F%2Fexample.com&cid=12345&ref=&location=http%3A%2F%2Fpartnersite.com%2F123&rel=235&productId=567'
+      );
+    });
+
+    it('Should return the number of anchors that match the config', () => {
+      const linkRewriterElement = helpers.createLinkRewriterElement(config);
+
+      const doc = document.implementation.createHTMLDocument('test document');
+      doc.body.appendChild(linkRewriterElement);
+      doc.body.insertAdjacentHTML('afterbegin', mockedHtml);
+
+      const configOpts_ = getConfigOpts(linkRewriterElement);
+
+      const list = getScopeElements(doc, configOpts_);
+
+      expect(list.length).to.equal(1);
+    });
+  }
+);
diff --git a/extensions/amp-link-rewriter/0.1/test/test-helpers.js b/extensions/amp-link-rewriter/0.1/test/test-helpers.js
index edab2e783f5e..1fd71f66176b 100644
--- a/extensions/amp-link-rewriter/0.1/test/test-helpers.js
+++ b/extensions/amp-link-rewriter/0.1/test/test-helpers.js
@@ -15,10 +15,8 @@
  */
 
 const helpersMaker = () => {
-
   return {
     createLinkRewriterElement(config) {
-
       const element = document.createElement('amp-link-rewriter');
       element.setAttribute('layout', 'nodisplay');
 
diff --git a/extensions/amp-list/0.1/amp-list.js b/extensions/amp-list/0.1/amp-list.js
index d1272262936e..eb2e185f654f 100644
--- a/extensions/amp-list/0.1/amp-list.js
+++ b/extensions/amp-list/0.1/amp-list.js
@@ -49,7 +49,6 @@ import {removeChildren} from '../../../src/dom';
 /** @const {string} */
 const TAG = 'amp-list';
 
-
 /** @typedef {{
   data:(?JsonObject|string|undefined|!Array),
   resolver:!Function,
@@ -64,10 +63,8 @@ export let RenderItems;
  * the spec.
  */
 export class AmpList extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
-
     super(element);
 
     /** @private {?Element} */
@@ -124,16 +121,25 @@ export class AmpList extends AMP.BaseElement {
     /**@private {?UnlistenDef} */
     this.unlistenAutoLoadMore_ = null;
 
-    this.registerAction('refresh', () => {
-      if (this.layoutCompleted_) {
-        this.resetIfNecessary_();
-        return this.fetchList_(/* opt_append */ false, /* opt_refresh */ true);
-      }
-    }, ActionTrust.HIGH);
+    this.registerAction(
+      'refresh',
+      () => {
+        if (this.layoutCompleted_) {
+          this.resetIfNecessary_();
+          return this.fetchList_(
+            /* opt_append */ false,
+            /* opt_refresh */ true
+          );
+        }
+      },
+      ActionTrust.HIGH
+    );
 
-    this.registerAction('changeToLayoutContainer',
-        () => this.changeToLayoutContainer_(),
-        ActionTrust.HIGH);
+    this.registerAction(
+      'changeToLayoutContainer',
+      () => this.changeToLayoutContainer_(),
+      ActionTrust.HIGH
+    );
 
     /** @private {?../../../src/ssr-template-helper.SsrTemplateHelper} */
     this.ssrTemplateHelper_ = null;
@@ -149,7 +155,10 @@ export class AmpList extends AMP.BaseElement {
     this.viewport_ = this.getViewport();
     const viewer = Services.viewerForDoc(this.getAmpDoc());
     this.ssrTemplateHelper_ = new SsrTemplateHelper(
-        TAG, viewer, this.templates_);
+      TAG,
+      viewer,
+      this.templates_
+    );
 
     this.loadMoreEnabled_ = this.element.hasAttribute('load-more');
 
@@ -168,7 +177,9 @@ export class AmpList extends AMP.BaseElement {
     // It will relaunched under a new attribute (resizable-children) soon.
     // please see https://github.com/ampproject/amphtml/issues/18849
     if (this.element.hasAttribute('auto-resize')) {
-      user().warn(TAG, 'auto-resize attribute is deprecated and its behavior' +
+      user().warn(
+        TAG,
+        'auto-resize attribute is deprecated and its behavior' +
           ' is disabled. This feature will be relaunched under a new name' +
           ' soon. Please see https://github.com/ampproject/amphtml/issues/18849'
       );
@@ -217,10 +228,16 @@ export class AmpList extends AMP.BaseElement {
       this.element.warnOnMissingOverflow = false;
     }).then(() => {
       this.adjustContainerForLoadMoreButton_();
-      listen(this.getLoadMoreService_().getLoadMoreFailedClickable(),
-          'click', () => this.loadMoreCallback_(/*opt_reload*/ true));
-      listen(this.getLoadMoreService_().getLoadMoreButtonClickable(),
-          'click', () => this.loadMoreCallback_());
+      listen(
+        this.getLoadMoreService_().getLoadMoreFailedClickable(),
+        'click',
+        () => this.loadMoreCallback_(/*opt_reload*/ true)
+      );
+      listen(
+        this.getLoadMoreService_().getLoadMoreButtonClickable(),
+        'click',
+        () => this.loadMoreCallback_()
+      );
     });
   }
 
@@ -257,16 +274,19 @@ export class AmpList extends AMP.BaseElement {
   adjustContainerForLoadMoreButton_() {
     let buttonHeight;
     let listHeight;
-    return this.measureMutateElement(/* measurer */ () => {
-      buttonHeight = this.getLoadMoreService_()
-          .getLoadMoreButton()./*OK*/offsetHeight;
-      listHeight = this.element./*OK*/offsetHeight;
-    }, /* mutator */ () => {
-      setStyles(dev().assertElement(this.container_), {
-        'max-height': `calc(100% - ${px(buttonHeight)})`,
-      });
-      this.element./*OK*/changeSize(listHeight + buttonHeight);
-    });
+    return this.measureMutateElement(
+      /* measurer */ () => {
+        buttonHeight = this.getLoadMoreService_().getLoadMoreButton()
+          ./*OK*/ offsetHeight;
+        listHeight = this.element./*OK*/ offsetHeight;
+      },
+      /* mutator */ () => {
+        setStyles(dev().assertElement(this.container_), {
+          'max-height': `calc(100% - ${px(buttonHeight)})`,
+        });
+        this.element./*OK*/ changeSize(listHeight + buttonHeight);
+      }
+    );
   }
 
   /** @override */
@@ -376,8 +396,10 @@ export class AmpList extends AMP.BaseElement {
    * @param {boolean=} isFetch
    */
   resetIfNecessary_(isFetch = true) {
-    if ((isFetch && this.element.hasAttribute('reset-on-refresh'))
-      || this.element.getAttribute('reset-on-refresh') === 'always') {
+    if (
+      (isFetch && this.element.hasAttribute('reset-on-refresh')) ||
+      this.element.getAttribute('reset-on-refresh') === 'always'
+    ) {
       // Placeholder and loading don't need a mutate context.
       this.togglePlaceholder(true);
       this.toggleLoading(true, /* opt_force */ true);
@@ -417,9 +439,12 @@ export class AmpList extends AMP.BaseElement {
         if (itemsExpr != '.') {
           items = getValueForExpr(/**@type {!JsonObject}*/ (data), itemsExpr);
         }
-        userAssert(typeof items !== 'undefined',
-            'Response must contain an array or object at "%s". %s',
-            itemsExpr, this.element);
+        userAssert(
+          typeof items !== 'undefined',
+          'Response must contain an array or object at "%s". %s',
+          itemsExpr,
+          this.element
+        );
         if (this.element.hasAttribute('single-item') && !isArray(items)) {
           items = [items];
         }
@@ -428,7 +453,7 @@ export class AmpList extends AMP.BaseElement {
           items = this.truncateToMaxLen_(items);
         }
         if (this.loadMoreEnabled_) {
-          this.updateLoadMoreSrc_(/**@type {!JsonObject} */(data));
+          this.updateLoadMoreSrc_(/**@type {!JsonObject} */ (data));
         }
         return this.scheduleRender_(items, !!opt_append, data);
       });
@@ -436,8 +461,11 @@ export class AmpList extends AMP.BaseElement {
 
     return fetch.catch(error => {
       const event = error
-        ? createCustomEvent(this.win, `${TAG}.error`,
-            dict({'response': error.response}))
+        ? createCustomEvent(
+            this.win,
+            `${TAG}.error`,
+            dict({'response': error.response})
+          )
         : null;
       const actions = Services.actionServiceForDoc(this.element);
       actions.trigger(this.element, 'fetch-error', event, ActionTrust.LOW);
@@ -467,8 +495,8 @@ export class AmpList extends AMP.BaseElement {
    * @private
    */
   updateLoadMoreSrc_(data) {
-    const nextExpr = this.element.getAttribute('load-more-bookmark')
-      || 'load-more-src';
+    const nextExpr =
+      this.element.getAttribute('load-more-bookmark') || 'load-more-src';
     this.loadMoreSrc_ = /** @type {string} */ (getValueForExpr(data, nextExpr));
   }
 
@@ -481,36 +509,52 @@ export class AmpList extends AMP.BaseElement {
     let request;
     // Construct the fetch init data that would be called by the viewer
     // passed in as the 'originalRequest'.
-    return requestForBatchFetch(
-        this.element,
-        this.getPolicy_(),
-        refresh).then(r => {
-      request = r;
-
-      request.xhrUrl =
-         setupInput(this.win, request.xhrUrl, request.fetchOpt);
-      request.fetchOpt = setupAMPCors(
-          this.win, request.xhrUrl, request.fetchOpt);
-      setupJsonFetchInit(r.fetchOpt);
-
-      const attributes = dict({
-        'ampListAttributes': {
-          'items': this.element.getAttribute('items') || 'items',
-          'singleItem': this.element.hasAttribute('single-item'),
-          'maxItems': this.element.getAttribute('max-items'),
+    return requestForBatchFetch(this.element, this.getPolicy_(), refresh)
+      .then(r => {
+        request = r;
+
+        request.xhrUrl = setupInput(this.win, request.xhrUrl, request.fetchOpt);
+        request.fetchOpt = setupAMPCors(
+          this.win,
+          request.xhrUrl,
+          request.fetchOpt
+        );
+        setupJsonFetchInit(r.fetchOpt);
+
+        const attributes = dict({
+          'ampListAttributes': {
+            'items': this.element.getAttribute('items') || 'items',
+            'singleItem': this.element.hasAttribute('single-item'),
+            'maxItems': this.element.getAttribute('max-items'),
+          },
+        });
+        return this.ssrTemplateHelper_.fetchAndRenderTemplate(
+          this.element,
+          request,
+          /* opt_templates */ null,
+          attributes
+        );
+      })
+      .then(
+        response => {
+          userAssert(
+            response && response['html'],
+            'Expected response with format {html: <string>}. Received: ',
+            response
+          );
+          request.fetchOpt.responseType = 'application/json';
+          this.ssrTemplateHelper_.verifySsrResponse(
+            this.win,
+            response,
+            request
+          );
+          return response;
         },
-      });
-      return this.ssrTemplateHelper_.fetchAndRenderTemplate(
-          this.element, request, /* opt_templates */ null, attributes);
-    }).then(response => {
-      userAssert(response && response['html'], 'Expected response with ' +
-          'format {html: <string>}. Received: ', response);
-      request.fetchOpt.responseType = 'application/json';
-      this.ssrTemplateHelper_.verifySsrResponse(this.win, response, request);
-      return response;
-    }, error => {
-      throw user().createError('Error proxying amp-list templates', error);
-    }).then(data => this.scheduleRender_(data, /*append*/ false));
+        error => {
+          throw user().createError('Error proxying amp-list templates', error);
+        }
+      )
+      .then(data => this.scheduleRender_(data, /*append*/ false));
   }
 
   /**
@@ -531,8 +575,13 @@ export class AmpList extends AMP.BaseElement {
       this.renderPass_.schedule();
     }
 
-    this.renderItems_ = /** @type {?RenderItems} */ (
-      {data, append, resolver, rejecter, payload: opt_payload});
+    this.renderItems_ = /** @type {?RenderItems} */ ({
+      data,
+      append,
+      resolver,
+      rejecter,
+      payload: opt_payload,
+    });
 
     if (this.renderedItems_ && append) {
       this.renderItems_.payload =
@@ -569,15 +618,15 @@ export class AmpList extends AMP.BaseElement {
       current.rejecter();
     };
     const isSSR = this.ssrTemplateHelper_.isSupported();
-    let renderPromise = this.ssrTemplateHelper_.renderTemplate(
-        this.element, current.data)
-        .then(result => this.updateBindings_(result, current.append))
-        .then(elements => this.render_(elements, current.append));
+    let renderPromise = this.ssrTemplateHelper_
+      .renderTemplate(this.element, current.data)
+      .then(result => this.updateBindings_(result, current.append))
+      .then(elements => this.render_(elements, current.append));
     if (!isSSR) {
       const payload = /** @type {!JsonObject} */ (current.payload);
       renderPromise = renderPromise
-          .then(() => this.maybeRenderLoadMoreTemplates_(payload))
-          .then(() => this.maybeSetLoadMore_());
+        .then(() => this.maybeRenderLoadMoreTemplates_(payload))
+        .then(() => this.maybeSetLoadMore_());
     }
     renderPromise.then(onFulfilledCallback, onRejectedCallback);
   }
@@ -590,10 +639,18 @@ export class AmpList extends AMP.BaseElement {
   maybeRenderLoadMoreTemplates_(data) {
     if (this.loadMoreEnabled_) {
       const promises = [];
-      promises.push(this.maybeRenderLoadMoreElement_(
-          this.getLoadMoreService_().getLoadMoreButton(), data));
-      promises.push(this.maybeRenderLoadMoreElement_(
-          this.getLoadMoreService_().getLoadMoreEndElement(), data));
+      promises.push(
+        this.maybeRenderLoadMoreElement_(
+          this.getLoadMoreService_().getLoadMoreButton(),
+          data
+        )
+      );
+      promises.push(
+        this.maybeRenderLoadMoreElement_(
+          this.getLoadMoreService_().getLoadMoreEndElement(),
+          data
+        )
+      );
       return Promise.all(promises);
     } else {
       return Promise.resolve();
@@ -608,13 +665,14 @@ export class AmpList extends AMP.BaseElement {
    */
   maybeRenderLoadMoreElement_(elem, data) {
     if (elem && this.templates_.hasTemplate(elem)) {
-      return this.templates_.findAndRenderTemplate(elem, data)
-          .then(newContents => {
-            return this.mutateElement(() => {
-              removeChildren(dev().assertElement(elem));
-              elem.appendChild(newContents);
-            });
+      return this.templates_
+        .findAndRenderTemplate(elem, data)
+        .then(newContents => {
+          return this.mutateElement(() => {
+            removeChildren(dev().assertElement(elem));
+            elem.appendChild(newContents);
           });
+        });
     }
     return Promise.resolve();
   }
@@ -629,8 +687,9 @@ export class AmpList extends AMP.BaseElement {
    * @private
    */
   updateBindings_(elementOrElements, append) {
-    const elements = /** @type {!Array<!Element>} */
-      (isArray(elementOrElements) ? elementOrElements : [elementOrElements]);
+    const elements = /** @type {!Array<!Element>} */ (isArray(elementOrElements)
+      ? elementOrElements
+      : [elementOrElements]);
     const binding = this.element.getAttribute('binding');
     // "no": Always skip binding update.
     if (binding === 'no') {
@@ -639,8 +698,9 @@ export class AmpList extends AMP.BaseElement {
     const updateWith = bind => {
       const removedElements = append ? [] : [this.container_];
       // Forward elements to chained promise on success or failure.
-      return bind.scanAndApply(elements, removedElements)
-          .then(() => elements, () => elements);
+      return bind
+        .scanAndApply(elements, removedElements)
+        .then(() => elements, () => elements);
     };
     // "refresh": Do _not_ block on retrieval of the Bind service before the
     // first mutation (AMP.setState).
@@ -681,7 +741,7 @@ export class AmpList extends AMP.BaseElement {
         this.addElementsToContainer_(elements, newContainer);
 
         // Necessary to support both browserify and CC import semantics.
-        const diff = (setDOM.default || setDOM);
+        const diff = setDOM.default || setDOM;
         // Use `i-amphtml-key` as a node key for identifying when to skip
         // DOM diffing and replace. Needed for AMP elements, for example.
         diff.KEY = 'i-amphtml-key';
@@ -693,8 +753,12 @@ export class AmpList extends AMP.BaseElement {
         this.addElementsToContainer_(elements, container);
       }
 
-      const event = createCustomEvent(this.win,
-          AmpEvents.DOM_UPDATE, /* detail */ null, {bubbles: true});
+      const event = createCustomEvent(
+        this.win,
+        AmpEvents.DOM_UPDATE,
+        /* detail */ null,
+        {bubbles: true}
+      );
       this.container_.dispatchEvent(event);
 
       // Now that new contents have been rendered, clear pending size requests
@@ -722,8 +786,8 @@ export class AmpList extends AMP.BaseElement {
       return;
     }
     this.measureElement(() => {
-      const targetHeight = target./*OK*/scrollHeight;
-      const height = this.element./*OK*/offsetHeight;
+      const targetHeight = target./*OK*/ scrollHeight;
+      const height = this.element./*OK*/ offsetHeight;
       if (targetHeight > height) {
         this.attemptChangeHeight(targetHeight).catch(() => {});
       }
@@ -736,9 +800,9 @@ export class AmpList extends AMP.BaseElement {
    * @private
    */
   attemptToFitLoadMore_(target) {
-    const element = !!this.loadMoreSrc_ ?
-      this.getLoadMoreService_().getLoadMoreButton() :
-      this.getLoadMoreService_().getLoadMoreEndElement();
+    const element = !!this.loadMoreSrc_
+      ? this.getLoadMoreService_().getLoadMoreButton()
+      : this.getLoadMoreService_().getLoadMoreEndElement();
     this.attemptToFitLoadMoreElement_(element, target);
   }
 
@@ -752,26 +816,26 @@ export class AmpList extends AMP.BaseElement {
       return;
     }
     this.measureElement(() => {
-      const targetHeight = target./*OK*/scrollHeight;
-      const height = this.element./*OK*/offsetHeight;
-      const loadMoreHeight = element ? element./*OK*/offsetHeight : 0;
+      const targetHeight = target./*OK*/ scrollHeight;
+      const height = this.element./*OK*/ offsetHeight;
+      const loadMoreHeight = element ? element./*OK*/ offsetHeight : 0;
       if (targetHeight + loadMoreHeight > height) {
         this.attemptChangeHeight(targetHeight + loadMoreHeight)
-            .then(() => {
-              this.resizeFailed_ = false;
-              // If there were not enough items to fill the list, consider
-              // automatically loading more if load-more="auto" is enabled
-              if (this.element.getAttribute('load-more') === 'auto') {
-                this.maybeLoadMoreItems_();
-              }
-              setStyles(dev().assertElement(this.container_), {
-                'max-height': '',
-              });
-            })
-            .catch(() => {
-              this.resizeFailed_ = true;
-              this.adjustContainerForLoadMoreButton_();
+          .then(() => {
+            this.resizeFailed_ = false;
+            // If there were not enough items to fill the list, consider
+            // automatically loading more if load-more="auto" is enabled
+            if (this.element.getAttribute('load-more') === 'auto') {
+              this.maybeLoadMoreItems_();
+            }
+            setStyles(dev().assertElement(this.container_), {
+              'max-height': '',
             });
+          })
+          .catch(() => {
+            this.resizeFailed_ = true;
+            this.adjustContainerForLoadMoreButton_();
+          });
       }
     });
   }
@@ -812,10 +876,10 @@ export class AmpList extends AMP.BaseElement {
         this.element.classList.remove('i-amphtml-layout-intrinsic');
         break;
       default:
-        // fall through, always remove sizer and size-defined class
+      // fall through, always remove sizer and size-defined class
     }
     // The changeSize() call removes the sizer element.
-    this.element./*OK*/changeSize();
+    this.element./*OK*/ changeSize();
     this.element.classList.remove('i-amphtml-layout-size-defined');
   }
 
@@ -835,8 +899,8 @@ export class AmpList extends AMP.BaseElement {
     return this.mutateElement(() => {
       this.undoPreviousLayout_(previousLayout);
       this.container_.classList.remove(
-          'i-amphtml-fill-content',
-          'i-amphtml-replaced-content'
+        'i-amphtml-fill-content',
+        'i-amphtml-replaced-content'
       );
       // The overflow element is generally hidden with visibility hidden,
       // but after changing to layout container, this causes an undesirable
@@ -880,8 +944,9 @@ export class AmpList extends AMP.BaseElement {
         });
       });
     } else {
-      return this.mutateElement(
-          () => this.getLoadMoreService_().setLoadMoreEnded());
+      return this.mutateElement(() =>
+        this.getLoadMoreService_().setLoadMoreEnded()
+      );
     }
   }
 
@@ -906,32 +971,36 @@ export class AmpList extends AMP.BaseElement {
       this.getLoadMoreService_().toggleLoadMoreLoading(true);
     });
     return this.fetchList_(/* opt_append */ true)
-        .then(() => {
-          return this.mutateElement(() => {
-            if (this.loadMoreSrc_) {
-              this.getLoadMoreService_().toggleLoadMoreLoading(false);
-            } else {
-              this.getLoadMoreService_().setLoadMoreEnded();
-            }
-          });
-        }).then(() => {
-          // Necessary since load-more elements are toggled in the above block
-          this.attemptToFitLoadMore_(dev().assertElement(this.container_));
-        }).catch(() => {
-          this.handleLoadMoreFailed_();
+      .then(() => {
+        return this.mutateElement(() => {
+          if (this.loadMoreSrc_) {
+            this.getLoadMoreService_().toggleLoadMoreLoading(false);
+          } else {
+            this.getLoadMoreService_().setLoadMoreEnded();
+          }
         });
+      })
+      .then(() => {
+        // Necessary since load-more elements are toggled in the above block
+        this.attemptToFitLoadMore_(dev().assertElement(this.container_));
+      })
+      .catch(() => {
+        this.handleLoadMoreFailed_();
+      });
   }
 
   /**
    * @private
    */
   handleLoadMoreFailed_() {
-    this.mutateElement(() => this.getLoadMoreService_().setLoadMoreFailed())
-        .then(() => {
-          this.attemptToFitLoadMoreElement_(
-              this.getLoadMoreService_().getLoadMoreFailedElement(),
-              dev().assertElement(this.container_));
-        });
+    this.mutateElement(() =>
+      this.getLoadMoreService_().setLoadMoreFailed()
+    ).then(() => {
+      this.attemptToFitLoadMoreElement_(
+        this.getLoadMoreService_().getLoadMoreFailedElement(),
+        dev().assertElement(this.container_)
+      );
+    });
   }
 
   /**
@@ -941,8 +1010,14 @@ export class AmpList extends AMP.BaseElement {
    * @private
    */
   fetch_(opt_refresh = false, token = undefined) {
-    return batchFetchJsonFor(this.getAmpDoc(), this.element, '.',
-        this.getPolicy_(), opt_refresh, token);
+    return batchFetchJsonFor(
+      this.getAmpDoc(),
+      this.element,
+      '.',
+      this.getPolicy_(),
+      opt_refresh,
+      token
+    );
   }
 
   /**
@@ -950,8 +1025,9 @@ export class AmpList extends AMP.BaseElement {
    */
   setupLoadMoreAuto_() {
     if (!this.unlistenAutoLoadMore_) {
-      this.unlistenAutoLoadMore_ = this.viewport_.onChanged(
-          () => this.maybeLoadMoreItems_());
+      this.unlistenAutoLoadMore_ = this.viewport_.onChanged(() =>
+        this.maybeLoadMoreItems_()
+      );
     }
   }
 
@@ -966,14 +1042,15 @@ export class AmpList extends AMP.BaseElement {
     }
     const endoOfListMarker = this.container_.lastChild || this.container_;
 
-    this.viewport_.getClientRectAsync(dev().assertElement(endoOfListMarker))
-        .then(positionRect => {
-          const viewportHeight = this.viewport_.getHeight();
-          const viewportTop = this.viewport_.getScrollTop();
-          if (viewportTop + 3 * viewportHeight > positionRect.bottom) {
-            return this.loadMoreCallback_();
-          }
-        });
+    this.viewport_
+      .getClientRectAsync(dev().assertElement(endoOfListMarker))
+      .then(positionRect => {
+        const viewportHeight = this.viewport_.getHeight();
+        const viewportTop = this.viewport_.getScrollTop();
+        if (viewportTop + 3 * viewportHeight > positionRect.bottom) {
+          return this.loadMoreCallback_();
+        }
+      });
   }
 
   /**
@@ -995,9 +1072,10 @@ export class AmpList extends AMP.BaseElement {
     // Require opt-in for URL variable replacements on CORS fetches triggered
     // by [src] mutation. @see spec/amp-var-substitutions.md
     let policy = UrlReplacementPolicy.OPT_IN;
-    if (src == this.initialSrc_ ||
-       (getSourceOrigin(src)
-           == getSourceOrigin(this.getAmpDoc().win.location))) {
+    if (
+      src == this.initialSrc_ ||
+      getSourceOrigin(src) == getSourceOrigin(this.getAmpDoc().win.location)
+    ) {
       policy = UrlReplacementPolicy.ALL;
     }
     return policy;
diff --git a/extensions/amp-list/0.1/service/load-more-service.js b/extensions/amp-list/0.1/service/load-more-service.js
index 7a0b8f973abf..e1f05f230afb 100644
--- a/extensions/amp-list/0.1/service/load-more-service.js
+++ b/extensions/amp-list/0.1/service/load-more-service.js
@@ -20,7 +20,6 @@ import {htmlFor} from '../../../../src/static-template';
 import {setStyles} from '../../../../src/style';
 
 export class LoadMoreService {
-
   /**
    * @param {!Element} element
    */
@@ -55,7 +54,9 @@ export class LoadMoreService {
    */
   initializeLoadMoreButton_() {
     this.loadMoreButton_ = childElementByAttr(
-        this.ampListElement_, 'load-more-button');
+      this.ampListElement_,
+      'load-more-button'
+    );
 
     if (this.loadMoreButton_) {
       this.loadMoreButton_.classList.add('amp-visible');
@@ -83,7 +84,9 @@ export class LoadMoreService {
    */
   initializeLoadMoreLoadingElement_() {
     this.loadMoreLoadingElement_ = childElementByAttr(
-        this.ampListElement_, 'load-more-loading');
+      this.ampListElement_,
+      'load-more-loading'
+    );
 
     if (!this.loadMoreLoadingElement_) {
       this.loadMoreLoadingElement_ = htmlFor(this.ampListElement_)`
@@ -135,7 +138,9 @@ export class LoadMoreService {
    */
   initializeLoadMoreFailedElement_() {
     this.loadMoreFailedElement_ = childElementByAttr(
-        this.ampListElement_, 'load-more-failed');
+      this.ampListElement_,
+      'load-more-failed'
+    );
 
     if (!this.loadMoreFailedElement_) {
       this.loadMoreFailedElement_ = htmlFor(this.ampListElement_)`
@@ -174,8 +179,8 @@ export class LoadMoreService {
   getLoadMoreFailedClickable() {
     if (!this.loadMoreFailedClickable_) {
       const loadFailedElement = this.getLoadMoreFailedElement();
-      this.loadMoreFailedClickable_ = childElementByAttr(
-          loadFailedElement, 'load-more-clickable') ||
+      this.loadMoreFailedClickable_ =
+        childElementByAttr(loadFailedElement, 'load-more-clickable') ||
         loadFailedElement;
     }
     return this.loadMoreFailedClickable_;
@@ -187,7 +192,9 @@ export class LoadMoreService {
   initializeLoadMoreEndElement_() {
     if (!this.loadMoreEndElement_) {
       this.loadMoreEndElement_ = childElementByAttr(
-          this.ampListElement_, 'load-more-end');
+        this.ampListElement_,
+        'load-more-end'
+      );
       if (this.loadMoreEndElement_) {
         this.ampListElement_.appendChild(this.loadMoreEndElement_);
       }
@@ -247,5 +254,4 @@ export class LoadMoreService {
     loadMoreButton.classList.toggle('amp-visible', false);
     this.getLoadMoreLoadingElement().classList.toggle('amp-visible', false);
   }
-
 }
diff --git a/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js b/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
index 0698fda58823..d930534e9745 100644
--- a/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
+++ b/extensions/amp-list/0.1/test-e2e/test-load-more-auto.js
@@ -14,62 +14,71 @@
  * limitations under the License.
  */
 
-
 const pageWidth = 800;
 const pageHeight = 420; // unusually small to force a scrollbar
 
-describes.endtoend('AMP list load-more=auto', {
-  testUrl: 'http://localhost:8000/test/manual/amp-list/load-more-auto.amp.html',
-  experiments: ['amp-list-load-more'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  // TODO(cathyxz, cvializ): figure out why 'viewer' only shows 'FALLBACK'
-  // TODO(cathyxz): figure out why shadow-demo doesn't work
-  environments: ['single'],
-}, env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+describes.endtoend(
+  'AMP list load-more=auto',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-list/load-more-auto.amp.html',
+    experiments: ['amp-list-load-more'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    // TODO(cathyxz, cvializ): figure out why 'viewer' only shows 'FALLBACK'
+    // TODO(cathyxz): figure out why shadow-demo doesn't work
+    environments: ['single'],
+  },
+  env => {
+    let controller;
 
-  it('should render correctly', async() => {
-    const listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(2);
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-    const loader = await controller.findElement('[load-more-loading]');
-    await expect(loader).to.be.ok;
-    await expect(controller.getElementCssValue(loader, 'display'))
-        .to.equal('none');
+    it('should render correctly', async () => {
+      const listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(2);
 
-    const failedIndicator = await controller.findElement('[load-more-failed]');
-    await expect(failedIndicator).to.be.ok;
-    await expect(controller.getElementCssValue(failedIndicator, 'display'))
-        .to.equal('none');
+      const loader = await controller.findElement('[load-more-loading]');
+      await expect(loader).to.be.ok;
+      await expect(controller.getElementCssValue(loader, 'display')).to.equal(
+        'none'
+      );
 
-    const seeMore = await controller.findElement('[load-more-button]');
-    await expect(seeMore).to.be.ok;
-    await expect(controller.getElementCssValue(seeMore, 'visibility'))
-        .to.equal('visible');
-    await expect(controller.getElementCssValue(seeMore,'display'))
-        .to.equal('block');
+      const failedIndicator = await controller.findElement(
+        '[load-more-failed]'
+      );
+      await expect(failedIndicator).to.be.ok;
+      await expect(
+        controller.getElementCssValue(failedIndicator, 'display')
+      ).to.equal('none');
 
-    await controller.takeScreenshot('screenshots/amp-list-load-more.png');
-  });
+      const seeMore = await controller.findElement('[load-more-button]');
+      await expect(seeMore).to.be.ok;
+      await expect(
+        controller.getElementCssValue(seeMore, 'visibility')
+      ).to.equal('visible');
+      await expect(controller.getElementCssValue(seeMore, 'display')).to.equal(
+        'block'
+      );
 
-  it('should load more items on scroll', async() => {
-    let listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(2);
+      await controller.takeScreenshot('screenshots/amp-list-load-more.png');
+    });
 
-    // wait for load more to be ready?
-    await controller.findElement('[load-more-button]');
+    it('should load more items on scroll', async () => {
+      let listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(2);
 
-    const article = await controller.getDocumentElement();
-    await controller.scrollBy(article, {top: 100});
+      // wait for load more to be ready?
+      await controller.findElement('[load-more-button]');
 
-    const fourthItem = await controller.findElement('div.item:nth-child(4)');
-    await expect(fourthItem).to.be.ok;
-    listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(4);
-  });
+      const article = await controller.getDocumentElement();
+      await controller.scrollBy(article, {top: 100});
 
-});
+      const fourthItem = await controller.findElement('div.item:nth-child(4)');
+      await expect(fourthItem).to.be.ok;
+      listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(4);
+    });
+  }
+);
diff --git a/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js b/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
index 5a7eda5ea2c6..ddd7aae9e2f6 100644
--- a/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
+++ b/extensions/amp-list/0.1/test-e2e/test-load-more-manual.js
@@ -17,73 +17,87 @@
 const pageWidth = 600;
 const pageHeight = 600;
 
-describes.endtoend('AMP list load-more=manual', {
-  testUrl: 'http://localhost:8000/test/manual/amp-list/' +
+describes.endtoend(
+  'AMP list load-more=manual',
+  {
+    testUrl:
+      'http://localhost:8000/test/manual/amp-list/' +
       'load-more-manual.amp.html',
-  experiments: ['amp-list-load-more'],
-  initialRect: {width: pageWidth, height: pageHeight},
-  // TODO(cathyxz, cvializ): figure out why 'viewer-demo' only shows 'FALLBACK'
-  environments: ['single'],
-}, async env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render correctly', async() => {
-    const listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(2);
-    const seeMore = await controller.findElement('[load-more-button]');
-
-    // Can we assert its CSS be visible and display block?
-    await expect(seeMore).to.be.ok;
-
-    await expect(controller.getElementCssValue(seeMore, 'visibility'))
-        .to.equal('visible');
-    await expect(controller.getElementCssValue(seeMore, 'display'))
-        .to.equal('block');
-
-    const loader = await controller.findElement('[load-more-loading]');
-    await expect(loader).to.be.ok;
-
-    await expect(controller.getElementCssValue(loader, 'display'))
-        .to.equal('none');
-
-    const failedIndicator = await controller.findElement('[load-more-failed]');
-    await expect(failedIndicator).to.be.ok;
-    await expect(controller.getElementCssValue(failedIndicator, 'display'))
-        .to.equal('none');
-
-    await controller.takeScreenshot('screenshots/amp-list-load-more.png');
-  });
-
-  it('should load more items on click', async() => {
-    let listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(2);
-    const seeMore = await controller.findElement('[load-more-button]');
-
-    await controller.click(seeMore);
-
-    const fourthItem = await controller.findElement('div.item:nth-child(4)');
-    await expect(fourthItem).to.be.ok;
-    listItems = await controller.findElements('.item');
-    await expect(listItems).to.have.length(4);
-  });
-
-  it('should show load-more-end when done', async() => {
-    const seeMore = await controller.findElement('[load-more-button]');
-    await controller.click(seeMore);
-    await controller.findElement('div.item:nth-child(4)');
-
-    const loadMoreEnd = await controller.findElement('[load-more-end]');
-    await expect(controller.getElementCssValue(loadMoreEnd, 'display'))
-        .to.equal('block');
-
-    await expect(controller.getElementCssValue(seeMore, 'display'))
-        .to.equal('none');
-    const loader = await controller.findElement('[load-more-loading]');
-    await expect(controller.getElementCssValue(loader, 'display'))
-        .to.equal('none');
-  });
-});
+    experiments: ['amp-list-load-more'],
+    initialRect: {width: pageWidth, height: pageHeight},
+    // TODO(cathyxz, cvializ): figure out why 'viewer-demo' only shows 'FALLBACK'
+    environments: ['single'],
+  },
+  async env => {
+    let controller;
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    it('should render correctly', async () => {
+      const listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(2);
+      const seeMore = await controller.findElement('[load-more-button]');
+
+      // Can we assert its CSS be visible and display block?
+      await expect(seeMore).to.be.ok;
+
+      await expect(
+        controller.getElementCssValue(seeMore, 'visibility')
+      ).to.equal('visible');
+      await expect(controller.getElementCssValue(seeMore, 'display')).to.equal(
+        'block'
+      );
+
+      const loader = await controller.findElement('[load-more-loading]');
+      await expect(loader).to.be.ok;
+
+      await expect(controller.getElementCssValue(loader, 'display')).to.equal(
+        'none'
+      );
+
+      const failedIndicator = await controller.findElement(
+        '[load-more-failed]'
+      );
+      await expect(failedIndicator).to.be.ok;
+      await expect(
+        controller.getElementCssValue(failedIndicator, 'display')
+      ).to.equal('none');
+
+      await controller.takeScreenshot('screenshots/amp-list-load-more.png');
+    });
+
+    it('should load more items on click', async () => {
+      let listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(2);
+      const seeMore = await controller.findElement('[load-more-button]');
+
+      await controller.click(seeMore);
+
+      const fourthItem = await controller.findElement('div.item:nth-child(4)');
+      await expect(fourthItem).to.be.ok;
+      listItems = await controller.findElements('.item');
+      await expect(listItems).to.have.length(4);
+    });
+
+    it('should show load-more-end when done', async () => {
+      const seeMore = await controller.findElement('[load-more-button]');
+      await controller.click(seeMore);
+      await controller.findElement('div.item:nth-child(4)');
+
+      const loadMoreEnd = await controller.findElement('[load-more-end]');
+      await expect(
+        controller.getElementCssValue(loadMoreEnd, 'display')
+      ).to.equal('block');
+
+      await expect(controller.getElementCssValue(seeMore, 'display')).to.equal(
+        'none'
+      );
+      const loader = await controller.findElement('[load-more-loading]');
+      await expect(controller.getElementCssValue(loader, 'display')).to.equal(
+        'none'
+      );
+    });
+  }
+);
diff --git a/extensions/amp-list/0.1/test-e2e/test-ssr.js b/extensions/amp-list/0.1/test-e2e/test-ssr.js
index e94ac51e47a6..8d50025a2c4d 100644
--- a/extensions/amp-list/0.1/test-e2e/test-ssr.js
+++ b/extensions/amp-list/0.1/test-e2e/test-ssr.js
@@ -14,55 +14,62 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-list SSR templates', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-list/amp-list.html',
-  environments: ['viewer-demo'],
-}, async env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render ssr rendered list', async function() {
-    const container = await getListContainer(controller);
-    await verifyContainer(controller, container);
-
-    // Verify that all items rendered.
-    const listItems = await getListItems(controller);
-    await expect(listItems).to.have.length(6);
-
-    // Verify that bindings work.
-    await expect(controller.getElementText(listItems[0])).to.equal('Pineapple');
-
-    await controller.takeScreenshot('screenshots/amp-list-ssr.png');
-  });
-
-});
-
-describes.endtoend('amp-list', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-list/amp-list.html',
-  environments: ['single'],
-}, async env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  it('should render list', async function() {
-    const container = await getListContainer(controller);
-    await verifyContainer(controller, container);
-
-    // Verify that all items rendered.
-    const listItems = await getListItems(controller);
-    await expect(listItems).to.have.length(5);
-
-    await controller.takeScreenshot('screenshots/amp-list.png');
-  });
-
-});
-
+describes.endtoend(
+  'amp-list SSR templates',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-list/amp-list.html',
+    environments: ['viewer-demo'],
+  },
+  async env => {
+    let controller;
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    it('should render ssr rendered list', async function() {
+      const container = await getListContainer(controller);
+      await verifyContainer(controller, container);
+
+      // Verify that all items rendered.
+      const listItems = await getListItems(controller);
+      await expect(listItems).to.have.length(6);
+
+      // Verify that bindings work.
+      await expect(controller.getElementText(listItems[0])).to.equal(
+        'Pineapple'
+      );
+
+      await controller.takeScreenshot('screenshots/amp-list-ssr.png');
+    });
+  }
+);
+
+describes.endtoend(
+  'amp-list',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-list/amp-list.html',
+    environments: ['single'],
+  },
+  async env => {
+    let controller;
+
+    beforeEach(async () => {
+      controller = env.controller;
+    });
+
+    it('should render list', async function() {
+      const container = await getListContainer(controller);
+      await verifyContainer(controller, container);
+
+      // Verify that all items rendered.
+      const listItems = await getListItems(controller);
+      await expect(listItems).to.have.length(5);
+
+      await controller.takeScreenshot('screenshots/amp-list.png');
+    });
+  }
+);
 
 function getListContainer(controller) {
   return controller.findElement('div[role=list]');
@@ -73,6 +80,7 @@ function getListItems(controller) {
 }
 
 async function verifyContainer(controller, container) {
-  await expect(controller.getElementAttribute(container, 'class'))
-      .to.equal('i-amphtml-fill-content i-amphtml-replaced-content');
+  await expect(controller.getElementAttribute(container, 'class')).to.equal(
+    'i-amphtml-fill-content i-amphtml-replaced-content'
+  );
 }
diff --git a/extensions/amp-list/0.1/test/integration/test-amp-list.js b/extensions/amp-list/0.1/test/integration/test-amp-list.js
index 6c7546665c86..bad841d831a3 100644
--- a/extensions/amp-list/0.1/test/integration/test-amp-list.js
+++ b/extensions/amp-list/0.1/test/integration/test-amp-list.js
@@ -21,22 +21,19 @@ const TIMEOUT = 15000;
 describe('amp-list (integration)', function() {
   this.timeout(TIMEOUT);
 
-  const basicBody =
-    `<amp-list width=300 height=100 src="http://localhost:9876/list/fruit-data/get?cors=0">
+  const basicBody = `<amp-list width=300 height=100 src="http://localhost:9876/list/fruit-data/get?cors=0">
       <template type="amp-mustache">
         {{name}} : {{quantity}} @ {{unitPrice}}
       </template>
     '</amp-list>`;
 
-  const scriptTemplateBody =
-  `<amp-list width=300 height=100 src="http://localhost:9876/list/fruit-data/get?cors=0">
+  const scriptTemplateBody = `<amp-list width=300 height=100 src="http://localhost:9876/list/fruit-data/get?cors=0">
     <script type="text/plain" template="amp-mustache">
       {{name}} : {{quantity}} @ {{unitPrice}}
     </script>
   '</amp-list>`;
 
   const basicTests = env => {
-
     let browser;
     let doc;
     let win;
@@ -70,23 +67,39 @@ describe('amp-list (integration)', function() {
     });
   };
 
-  describes.integration('basic (mustache-0.1)', {
-    body: basicBody,
-    extensions: ['amp-list', 'amp-mustache:0.1'],
-  }, basicTests);
-
-  describes.integration('basic (mustache-0.2)', {
-    body: basicBody,
-    extensions: ['amp-list', 'amp-mustache:0.2'],
-  }, basicTests);
-
-  describes.integration('basic (mustache-0.1) script template', {
-    body: scriptTemplateBody,
-    extensions: ['amp-list', 'amp-mustache:0.1'],
-  }, basicTests);
-
-  describes.integration('basic (mustache-0.2) script template', {
-    body: scriptTemplateBody,
-    extensions: ['amp-list', 'amp-mustache:0.2'],
-  }, basicTests);
+  describes.integration(
+    'basic (mustache-0.1)',
+    {
+      body: basicBody,
+      extensions: ['amp-list', 'amp-mustache:0.1'],
+    },
+    basicTests
+  );
+
+  describes.integration(
+    'basic (mustache-0.2)',
+    {
+      body: basicBody,
+      extensions: ['amp-list', 'amp-mustache:0.2'],
+    },
+    basicTests
+  );
+
+  describes.integration(
+    'basic (mustache-0.1) script template',
+    {
+      body: scriptTemplateBody,
+      extensions: ['amp-list', 'amp-mustache:0.1'],
+    },
+    basicTests
+  );
+
+  describes.integration(
+    'basic (mustache-0.2) script template',
+    {
+      body: scriptTemplateBody,
+      extensions: ['amp-list', 'amp-mustache:0.2'],
+    },
+    basicTests
+  );
 });
diff --git a/extensions/amp-list/0.1/test/test-amp-list-container.js b/extensions/amp-list/0.1/test/test-amp-list-container.js
index 68ef6b555078..0ba2c449a0ea 100644
--- a/extensions/amp-list/0.1/test/test-amp-list-container.js
+++ b/extensions/amp-list/0.1/test/test-amp-list-container.js
@@ -23,71 +23,77 @@ import {
   mutateElementStub,
 } from '../../../../testing/test-helper';
 
-describes.realWin('amp-list layout container', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-list'],
+describes.realWin(
+  'amp-list layout container',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-list'],
+    },
   },
-}, env => {
-  let win;
-  let doc;
-  let ampdoc;
-  let sandbox;
-  let element, list;
-  let templates;
+  env => {
+    let win;
+    let doc;
+    let ampdoc;
+    let sandbox;
+    let element, list;
+    let templates;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    sandbox = env.sandbox;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      sandbox = env.sandbox;
 
-    templates = {
-      findAndSetHtmlForTemplate: sandbox.stub(),
-      findAndRenderTemplate: sandbox.stub(),
-      findAndRenderTemplateArray: sandbox.stub(),
-    };
-    sandbox.stub(Services, 'templatesFor').returns(templates);
-    sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
+      templates = {
+        findAndSetHtmlForTemplate: sandbox.stub(),
+        findAndRenderTemplate: sandbox.stub(),
+        findAndRenderTemplateArray: sandbox.stub(),
+      };
+      sandbox.stub(Services, 'templatesFor').returns(templates);
+      sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
 
-    element = doc.createElement('amp-list');
-    list = new AmpList(element);
+      element = doc.createElement('amp-list');
+      list = new AmpList(element);
 
-    sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
-    sandbox.stub(list, 'getFallback').returns(null);
+      sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
+      sandbox.stub(list, 'getFallback').returns(null);
 
-    sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
-    sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
-    sandbox.stub(list, 'measureMutateElement').callsFake(
-        measureMutateElementStub);
-    element.setAttribute('src', '/list');
-    element.setAttribute('layout', 'fixed');
-    element.setAttribute('width', '50');
-    element.setAttribute('height', '10');
-    doc.body.appendChild(element);
+      sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
+      sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
+      sandbox
+        .stub(list, 'measureMutateElement')
+        .callsFake(measureMutateElementStub);
+      element.setAttribute('src', '/list');
+      element.setAttribute('layout', 'fixed');
+      element.setAttribute('width', '50');
+      element.setAttribute('height', '10');
+      doc.body.appendChild(element);
 
-    sandbox.stub(list, 'getOverflowElement').returns(null);
-    sandbox.stub(list, 'fetchList_').returns(Promise.resolve());
-    list.element.changeSize = () => {};
-    list.buildCallback();
-  });
+      sandbox.stub(list, 'getOverflowElement').returns(null);
+      sandbox.stub(list, 'fetchList_').returns(Promise.resolve());
+      list.element.changeSize = () => {};
+      list.buildCallback();
+    });
 
-  it('should change to layout container', async() => {
-    await list.layoutCallback();
-    await list.changeToLayoutContainer_();
-    expect(element.style.height).to.equal('');
-    expect(element.getAttribute('layout')).to.equal('container');
-    expect(element.classList.contains('i-amphtml-layout-container')).to.be.true;
-    const containerClasses = list.container_.classList;
-    expect(containerClasses.contains('i-amphtml-fill-content')).to.be.false;
-    expect(containerClasses.contains('i-amphtml-replaced-content')).to.be.false;
-  });
+    it('should change to layout container', async () => {
+      await list.layoutCallback();
+      await list.changeToLayoutContainer_();
+      expect(element.style.height).to.equal('');
+      expect(element.getAttribute('layout')).to.equal('container');
+      expect(element.classList.contains('i-amphtml-layout-container')).to.be
+        .true;
+      const containerClasses = list.container_.classList;
+      expect(containerClasses.contains('i-amphtml-fill-content')).to.be.false;
+      expect(containerClasses.contains('i-amphtml-replaced-content')).to.be
+        .false;
+    });
 
-  it('should trigger on bind', async() => {
-    const changeSpy = sandbox.spy(list, 'changeToLayoutContainer_');
-    await list.layoutCallback();
-    await list.mutatedAttributesCallback({'is-layout-container': true});
-    expect(changeSpy).to.be.calledOnce;
-  });
-
-});
+    it('should trigger on bind', async () => {
+      const changeSpy = sandbox.spy(list, 'changeToLayoutContainer_');
+      await list.layoutCallback();
+      await list.mutatedAttributesCallback({'is-layout-container': true});
+      expect(changeSpy).to.be.calledOnce;
+    });
+  }
+);
diff --git a/extensions/amp-list/0.1/test/test-amp-list-load-more.js b/extensions/amp-list/0.1/test/test-amp-list-load-more.js
index 199f6444a623..ff6a439b9dc3 100644
--- a/extensions/amp-list/0.1/test/test-amp-list-load-more.js
+++ b/extensions/amp-list/0.1/test/test-amp-list-load-more.js
@@ -29,197 +29,208 @@ const HAS_MORE_ITEMS_PAYLOAD = {
   'load-more-src': '/list/infinite-scroll?items=2&left=0',
 };
 
-describes.realWin('amp-list component', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-list'],
+describes.realWin(
+  'amp-list component',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-list'],
+    },
   },
-}, env => {
-  let win;
-  let doc;
-  let ampdoc;
-  let sandbox;
-  let element, list;
-  let templates;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    sandbox = env.sandbox;
-
-    templates = {
-      findAndSetHtmlForTemplate: sandbox.stub(),
-      findAndRenderTemplate: sandbox.stub(),
-      findAndRenderTemplateArray: sandbox.stub(),
-    };
-    sandbox.stub(Services, 'templatesFor').returns(templates);
-    sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
-
-    toggleExperiment(win, 'amp-list-load-more', true);
-  });
-
-  describe('manual', () => {
+  env => {
+    let win;
+    let doc;
+    let ampdoc;
+    let sandbox;
+    let element, list;
+    let templates;
 
     beforeEach(() => {
-      expect(isExperimentOn(win, 'amp-list-load-more')).to.be.true;
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      sandbox = env.sandbox;
+
+      templates = {
+        findAndSetHtmlForTemplate: sandbox.stub(),
+        findAndRenderTemplate: sandbox.stub(),
+        findAndRenderTemplateArray: sandbox.stub(),
+      };
+      sandbox.stub(Services, 'templatesFor').returns(templates);
+      sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
+
+      toggleExperiment(win, 'amp-list-load-more', true);
+    });
 
-      element = doc.createElement('amp-list');
-      list = new AmpList(element);
+    describe('manual', () => {
+      beforeEach(() => {
+        expect(isExperimentOn(win, 'amp-list-load-more')).to.be.true;
 
-      sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
-      sandbox.stub(list, 'getFallback').returns(null);
+        element = doc.createElement('amp-list');
+        list = new AmpList(element);
 
-      sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
-      sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
-      sandbox.stub(list, 'measureMutateElement').callsFake(
-          measureMutateElementStub);
+        sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
+        sandbox.stub(list, 'getFallback').returns(null);
 
-      element.setAttribute('src', '/list/infinite-scroll?items=2&left=1');
-      element.setAttribute('load-more', 'manual');
-      element.setAttribute('layout', 'fixed');
-      element.setAttribute('width', '50');
-      element.setAttribute('height', '10');
+        sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
+        sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
+        sandbox
+          .stub(list, 'measureMutateElement')
+          .callsFake(measureMutateElementStub);
 
-      element.style.height = '10px';
-      doc.body.appendChild(element);
+        element.setAttribute('src', '/list/infinite-scroll?items=2&left=1');
+        element.setAttribute('load-more', 'manual');
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '50');
+        element.setAttribute('height', '10');
 
-      sandbox.stub(list, 'getOverflowElement').returns(null);
-      sandbox.stub(list, 'fetchList_').returns(Promise.resolve());
-      list.element.changeSize = () => {};
-      list.buildCallback();
-    });
+        element.style.height = '10px';
+        doc.body.appendChild(element);
 
-    it('should create load-more elements after init', async() => {
-      sandbox.stub(list, 'getPlaceholder').returns(null);
-      await list.initializeLoadMoreElements_();
+        sandbox.stub(list, 'getOverflowElement').returns(null);
+        sandbox.stub(list, 'fetchList_').returns(Promise.resolve());
+        list.element.changeSize = () => {};
+        list.buildCallback();
+      });
 
-      expect(list.element.querySelectorAll('[load-more-button]'))
-          .to.have.lengthOf(1);
-      expect(list.element.querySelectorAll('[load-more-failed]'))
-          .to.have.lengthOf(1);
-      expect(list.element.querySelector('[load-more-end]')).to.be.null;
-    });
+      it('should create load-more elements after init', async () => {
+        sandbox.stub(list, 'getPlaceholder').returns(null);
+        await list.initializeLoadMoreElements_();
+
+        expect(
+          list.element.querySelectorAll('[load-more-button]')
+        ).to.have.lengthOf(1);
+        expect(
+          list.element.querySelectorAll('[load-more-failed]')
+        ).to.have.lengthOf(1);
+        expect(list.element.querySelector('[load-more-end]')).to.be.null;
+      });
 
-    it('should hide load-more-button after init', async() => {
-      sandbox.stub(list, 'getPlaceholder').returns(null);
-      await list.initializeLoadMoreElements_();
+      it('should hide load-more-button after init', async () => {
+        sandbox.stub(list, 'getPlaceholder').returns(null);
+        await list.initializeLoadMoreElements_();
 
-      const button = list.element.querySelector('[load-more-button]');
-      const buttonStyles = win.getComputedStyle(button);
-      expect(buttonStyles).include({
-        'display': 'block',
-        'visibility': 'hidden',
+        const button = list.element.querySelector('[load-more-button]');
+        const buttonStyles = win.getComputedStyle(button);
+        expect(buttonStyles).include({
+          'display': 'block',
+          'visibility': 'hidden',
+        });
       });
-    });
 
-    it('should hide load-more-failed element after init', async() => {
-      sandbox.stub(list, 'getPlaceholder').returns(null);
-      await list.initializeLoadMoreElements_();
+      it('should hide load-more-failed element after init', async () => {
+        sandbox.stub(list, 'getPlaceholder').returns(null);
+        await list.initializeLoadMoreElements_();
 
-      const failedElement = list.element.querySelector('[load-more-failed]');
-      const failedStyles = win.getComputedStyle(failedElement);
-      expect(failedStyles.display).to.equal('none');
-    });
+        const failedElement = list.element.querySelector('[load-more-failed]');
+        const failedStyles = win.getComputedStyle(failedElement);
+        expect(failedStyles.display).to.equal('none');
+      });
 
-    it('should hide load-more-loading element after init', async() => {
-      sandbox.stub(list, 'getPlaceholder').returns(null);
-      await list.initializeLoadMoreElements_();
+      it('should hide load-more-loading element after init', async () => {
+        sandbox.stub(list, 'getPlaceholder').returns(null);
+        await list.initializeLoadMoreElements_();
 
-      const loader = list.element.querySelector('[load-more-loading]');
-      const loaderStyles = win.getComputedStyle(loader);
-      expect(loaderStyles.display).to.equal('none');
-    });
+        const loader = list.element.querySelector('[load-more-loading]');
+        const loaderStyles = win.getComputedStyle(loader);
+        expect(loaderStyles.display).to.equal('none');
+      });
 
-    it('should resize the list to fit a placeholder', async() => {
-      const attemptChangeHeightSpy = sandbox.spy(list, 'attemptChangeHeight');
-      const placeholder = doc.createElement('div');
-      placeholder.setAttribute('placeholder', '');
-      placeholder.style.height = '50px';
-      placeholder.style.width = '50px';
-      list.element.appendChild(placeholder);
-      sandbox.stub(list, 'getPlaceholder').returns(placeholder);
-      await list.layoutCallback();
-      expect(attemptChangeHeightSpy).to.be.calledOnceWith(50);
+      it('should resize the list to fit a placeholder', async () => {
+        const attemptChangeHeightSpy = sandbox.spy(list, 'attemptChangeHeight');
+        const placeholder = doc.createElement('div');
+        placeholder.setAttribute('placeholder', '');
+        placeholder.style.height = '50px';
+        placeholder.style.width = '50px';
+        list.element.appendChild(placeholder);
+        sandbox.stub(list, 'getPlaceholder').returns(placeholder);
+        await list.layoutCallback();
+        expect(attemptChangeHeightSpy).to.be.calledOnceWith(50);
+      });
     });
-  });
-
-  describe('loading states', () => {
 
-    beforeEach(() => {
-      expect(isExperimentOn(win, 'amp-list-load-more')).to.be.true;
-
-      element = doc.createElement('amp-list');
-      list = new AmpList(element);
-
-      sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
-      sandbox.stub(list, 'getFallback').returns(null);
-
-      sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
-      sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
-      sandbox.stub(list, 'measureMutateElement').callsFake(
-          measureMutateElementStub);
-
-      element.setAttribute('src', '/list/infinite-scroll?items=2&left=1');
-      element.setAttribute('load-more', 'manual');
-      element.setAttribute('layout', 'fixed');
-      element.setAttribute('width', '50');
-      element.setAttribute('height', '10');
-      element.style.height = '10px';
-      doc.body.appendChild(element);
-
-      sandbox.stub(list, 'getOverflowElement').returns(null);
-      sandbox.stub(list, 'prepareAndSendFetch_').returns(
-          Promise.resolve(HAS_MORE_ITEMS_PAYLOAD));
-      list.element.changeSize = () => {};
-      list.buildCallback();
-    });
+    describe('loading states', () => {
+      beforeEach(() => {
+        expect(isExperimentOn(win, 'amp-list-load-more')).to.be.true;
+
+        element = doc.createElement('amp-list');
+        list = new AmpList(element);
+
+        sandbox.stub(list, 'getAmpDoc').returns(ampdoc);
+        sandbox.stub(list, 'getFallback').returns(null);
+
+        sandbox.stub(list, 'mutateElement').callsFake(mutateElementStub);
+        sandbox.stub(list, 'measureElement').callsFake(measureElementStub);
+        sandbox
+          .stub(list, 'measureMutateElement')
+          .callsFake(measureMutateElementStub);
+
+        element.setAttribute('src', '/list/infinite-scroll?items=2&left=1');
+        element.setAttribute('load-more', 'manual');
+        element.setAttribute('layout', 'fixed');
+        element.setAttribute('width', '50');
+        element.setAttribute('height', '10');
+        element.style.height = '10px';
+        doc.body.appendChild(element);
+
+        sandbox.stub(list, 'getOverflowElement').returns(null);
+        sandbox
+          .stub(list, 'prepareAndSendFetch_')
+          .returns(Promise.resolve(HAS_MORE_ITEMS_PAYLOAD));
+        list.element.changeSize = () => {};
+        list.buildCallback();
+      });
 
-    it('should update the next loading src', async() => {
-      const fetchListSpy = sandbox.spy(list, 'fetchList_');
-      sandbox.stub(list, 'scheduleRender_').returns(Promise.resolve());
-      await list.layoutCallback();
-      expect(element.getAttribute('src')).to
-          .equal('/list/infinite-scroll?items=2&left=1');
-      expect(fetchListSpy).to.be.calledOnce;
-      await list.loadMoreCallback_();
-      expect(element.getAttribute('src')).to
-          .equal('/list/infinite-scroll?items=2&left=0');
-      expect(fetchListSpy).to.be.calledTwice;
-      expect(fetchListSpy).to.be.calledWith(true);
-    });
+      it('should update the next loading src', async () => {
+        const fetchListSpy = sandbox.spy(list, 'fetchList_');
+        sandbox.stub(list, 'scheduleRender_').returns(Promise.resolve());
+        await list.layoutCallback();
+        expect(element.getAttribute('src')).to.equal(
+          '/list/infinite-scroll?items=2&left=1'
+        );
+        expect(fetchListSpy).to.be.calledOnce;
+        await list.loadMoreCallback_();
+        expect(element.getAttribute('src')).to.equal(
+          '/list/infinite-scroll?items=2&left=0'
+        );
+        expect(fetchListSpy).to.be.calledTwice;
+        expect(fetchListSpy).to.be.calledWith(true);
+      });
 
-    it('should append items to the existing list', async() => {
-      const div1 = doc.createElement('div');
-      div1.textContent = '1';
+      it('should append items to the existing list', async () => {
+        const div1 = doc.createElement('div');
+        div1.textContent = '1';
 
-      const div2 = doc.createElement('div');
-      div2.textContent = '2';
-      sandbox.stub(list.ssrTemplateHelper_, 'renderTemplate')
+        const div2 = doc.createElement('div');
+        div2.textContent = '2';
+        sandbox
+          .stub(list.ssrTemplateHelper_, 'renderTemplate')
           .returns(Promise.resolve([]));
-      const updateBindingsStub = sandbox.stub(list, 'updateBindings_');
-      sandbox.stub(list, 'maybeRenderLoadMoreTemplates_')
+        const updateBindingsStub = sandbox.stub(list, 'updateBindings_');
+        sandbox
+          .stub(list, 'maybeRenderLoadMoreTemplates_')
           .returns(Promise.resolve([]));
-      updateBindingsStub.onCall(0).returns(Promise.resolve([div1, div2]));
-
-      const div3 = doc.createElement('div');
-      div3.textContent = '3';
-      const div4 = doc.createElement('div');
-      div4.textContent = '4';
-      updateBindingsStub.onCall(1).returns(Promise.resolve([div3, div4]));
-
-      const renderSpy = sandbox.spy(list, 'render_');
-      await list.layoutCallback();
-      expect(renderSpy).to.be.calledOnce;
-      expect(renderSpy).to.be.calledWith([div1, div2], false);
-      expect(list.container_.children).to.have.lengthOf(2);
-
-      await list.loadMoreCallback_();
-      expect(renderSpy).to.be.calledTwice;
-      expect(renderSpy).to.be.calledWith([div3, div4], true);
-
-      list.container_;
-      expect(list.container_.children).to.have.lengthOf(4);
+        updateBindingsStub.onCall(0).returns(Promise.resolve([div1, div2]));
+
+        const div3 = doc.createElement('div');
+        div3.textContent = '3';
+        const div4 = doc.createElement('div');
+        div4.textContent = '4';
+        updateBindingsStub.onCall(1).returns(Promise.resolve([div3, div4]));
+
+        const renderSpy = sandbox.spy(list, 'render_');
+        await list.layoutCallback();
+        expect(renderSpy).to.be.calledOnce;
+        expect(renderSpy).to.be.calledWith([div1, div2], false);
+        expect(list.container_.children).to.have.lengthOf(2);
+
+        await list.loadMoreCallback_();
+        expect(renderSpy).to.be.calledTwice;
+        expect(renderSpy).to.be.calledWith([div3, div4], true);
+
+        list.container_;
+        expect(list.container_.children).to.have.lengthOf(4);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-list/0.1/test/test-amp-list.js b/extensions/amp-list/0.1/test/test-amp-list.js
index 460450ac581d..c87fa785e7cc 100644
--- a/extensions/amp-list/0.1/test/test-amp-list.js
+++ b/extensions/amp-list/0.1/test/test-amp-list.js
@@ -22,767 +22,941 @@ import {Deferred} from '../../../../src/utils/promise';
 import {Services} from '../../../../src/services';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.repeated('amp-list', {
-  'with script[type=text/plain][template=amp-mustache]':
-      {templateType: 'script'},
-  'with template[type=amp-mustache]':
-      {templateType: 'template'},
-}, (name, variant) => {
-
-  describes.realWin('amp-list component', {
-    amp: {
-      ampdoc: 'single',
-      extensions: ['amp-list'],
+describes.repeated(
+  'amp-list',
+  {
+    'with script[type=text/plain][template=amp-mustache]': {
+      templateType: 'script',
     },
-  }, env => {
-    let win, doc, ampdoc, sandbox;
-    let element, list, listMock;
-    let resource;
-    let setBindService;
-    let ssrTemplateHelper;
-    let templates;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      ampdoc = env.ampdoc;
-      sandbox = env.sandbox;
-
-      templates = {
-        findAndSetHtmlForTemplate: sandbox.stub(),
-        findAndRenderTemplate: sandbox.stub(),
-        findAndRenderTemplateArray: sandbox.stub(),
-      };
-      sandbox.stub(Services, 'templatesFor').returns(templates);
-      sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
-
-      resource = {
-        resetPendingChangeSize: sandbox.stub(),
-      };
-      const resources = {
-        getResourceForElement: e => (e === element) ? resource : null,
-      };
-
-      element = doc.createElement('div');
-      element.setAttribute('src', 'https://data.com/list.json');
-      element.getAmpDoc = () => ampdoc;
-      element.getFallback = () => null;
-      element.getPlaceholder = () => null;
-      element.getResources = () => resources;
-
-      const {templateType} = variant;
-      const template = doc.createElement(templateType);
-
-      if (templateType == 'template') {
-        template.content.appendChild(doc.createTextNode('{{template}}'));
-      } else {
-        template.setAttribute('type', 'text/plain');
-        template.setAttribute('template', 'amp-mustache');
-        template.innerText = '{{template}}';
-      }
-
-      element.appendChild(template);
-
-      const {promise, resolve} = new Deferred();
-      sandbox.stub(Services, 'bindForDocOrNull').returns(promise);
-      setBindService = resolve;
-
-      ssrTemplateHelper = {
-        isSupported: () => false,
-        fetchAndRenderTemplate: () => Promise.resolve(),
-        renderTemplate: sandbox.stub(),
-        verifySsrResponse: () => Promise.resolve(),
-      };
-
-      list = new AmpList(element);
-      list.buildCallback();
-      list.ssrTemplateHelper_ = ssrTemplateHelper;
-      listMock = sandbox.mock(list);
-
-      element.style.height = '10px';
-      doc.body.appendChild(element);
-    });
-
-    afterEach(() => {
-      // There should only be one mock to verify.
-      listMock.verify();
-    });
-
-    const DEFAULT_LIST_OPTS = {
-      expr: 'items',
-      maxItems: 0,
-      singleItem: false,
-      refresh: false,
-      resetOnRefresh: false,
-    };
-    const DEFAULT_ITEMS = [{title: 'Title1'}];
-    const DEFAULT_FETCHED_DATA = {
-      items: DEFAULT_ITEMS,
-    };
-
-    /**
-     * @param {!Array|!Object} fetched
-     * @param {!Array<!Element>} rendered
-     * @param {Object=} opts
-     * @return {!Promise}
-     */
-    function expectFetchAndRender(fetched, rendered, opts = DEFAULT_LIST_OPTS) {
-      // Mock the actual network request.
-      listMock.expects('fetch_')
-          .withExactArgs(!!opts.refresh, /* token */ undefined)
-          .returns(Promise.resolve(fetched))
-          .atLeast(1);
-
-      // If "reset-on-refresh" is set, show loading/placeholder before fetch.
-      if (opts.resetOnRefresh) {
-        listMock.expects('togglePlaceholder').withExactArgs(true).once();
-        listMock.expects('toggleLoading').withExactArgs(true, true).once();
-      }
-
-      // Stub the rendering of the template.
-      let itemsToRender = fetched[opts.expr];
-      if (opts.singleItem) {
-        expect(itemsToRender).to.be.a('object');
-        itemsToRender = [fetched[opts.expr]];
-      } else if (opts.maxItems > 0) {
-        itemsToRender = fetched[opts.expr].slice(0, opts.maxItems);
-      }
-      ssrTemplateHelper.renderTemplate
-          .withArgs(element, itemsToRender)
-          .returns(Promise.resolve(rendered));
-
-      expectRender();
-    }
-
-    function expectRender() {
-      // Call mutate/measure during render.
-      listMock.expects('mutateElement').callsFake(m => m()).atLeast(1);
-      listMock.expects('measureElement').callsFake(m => m()).atLeast(1);
-
-      // Hide loading/placeholder during render.
-      listMock.expects('toggleLoading').withExactArgs(false).atLeast(1);
-      listMock.expects('togglePlaceholder').withExactArgs(false).atLeast(1);
-    }
-
-    describe('without amp-bind', () => {
-      beforeEach(() => {
-        setBindService(null);
-      });
-
-      it('should fetch and render', () => {
-        const itemElem = doc.createElement('div');
-        const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElem]);
-        return list.layoutCallback().then(() => rendered).then(() => {
-          expect(list.container_.contains(itemElem)).to.be.true;
-        });
-      });
-
-      it('should reset pending change-size request after render', function*() {
-        const itemElement = doc.createElement('div');
-        const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA,
-            [itemElement]);
-        yield list.layoutCallback();
-        yield rendered;
-        expect(resource.resetPendingChangeSize).calledOnce;
-      });
-
-      it('should attemptChangeHeight the placeholder, if present', () => {
-        const itemElement = doc.createElement('div');
-        const placeholder = doc.createElement('div');
-        placeholder.style.height = '1337px';
-        element.appendChild(placeholder);
-        element.getPlaceholder = () => placeholder;
-
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
+    'with template[type=amp-mustache]': {templateType: 'template'},
+  },
+  (name, variant) => {
+    describes.realWin(
+      'amp-list component',
+      {
+        amp: {
+          ampdoc: 'single',
+          extensions: ['amp-list'],
+        },
+      },
+      env => {
+        let win, doc, ampdoc, sandbox;
+        let element, list, listMock;
+        let resource;
+        let setBindService;
+        let ssrTemplateHelper;
+        let templates;
 
-        listMock.expects('attemptChangeHeight')
-            .withExactArgs(1337)
-            .returns(Promise.resolve());
-
-        return list.layoutCallback();
-      });
+        beforeEach(() => {
+          win = env.win;
+          doc = win.document;
+          ampdoc = env.ampdoc;
+          sandbox = env.sandbox;
+
+          templates = {
+            findAndSetHtmlForTemplate: sandbox.stub(),
+            findAndRenderTemplate: sandbox.stub(),
+            findAndRenderTemplateArray: sandbox.stub(),
+          };
+          sandbox.stub(Services, 'templatesFor').returns(templates);
+          sandbox.stub(AmpDocService.prototype, 'getAmpDoc').returns(ampdoc);
 
-      it('should attemptChangeHeight rendered contents', () => {
-        const itemElement = doc.createElement('div');
-        itemElement.style.height = '1337px';
+          resource = {
+            resetPendingChangeSize: sandbox.stub(),
+          };
+          const resources = {
+            getResourceForElement: e => (e === element ? resource : null),
+          };
 
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
+          element = doc.createElement('div');
+          element.setAttribute('src', 'https://data.com/list.json');
+          element.getAmpDoc = () => ampdoc;
+          element.getFallback = () => null;
+          element.getPlaceholder = () => null;
+          element.getResources = () => resources;
+
+          const {templateType} = variant;
+          const template = doc.createElement(templateType);
+
+          if (templateType == 'template') {
+            template.content.appendChild(doc.createTextNode('{{template}}'));
+          } else {
+            template.setAttribute('type', 'text/plain');
+            template.setAttribute('template', 'amp-mustache');
+            template.innerText = '{{template}}';
+          }
+
+          element.appendChild(template);
+
+          const {promise, resolve} = new Deferred();
+          sandbox.stub(Services, 'bindForDocOrNull').returns(promise);
+          setBindService = resolve;
+
+          ssrTemplateHelper = {
+            isSupported: () => false,
+            fetchAndRenderTemplate: () => Promise.resolve(),
+            renderTemplate: sandbox.stub(),
+            verifySsrResponse: () => Promise.resolve(),
+          };
 
-        listMock.expects('attemptChangeHeight')
-            .withExactArgs(1337)
-            .returns(Promise.resolve());
+          list = new AmpList(element);
+          list.buildCallback();
+          list.ssrTemplateHelper_ = ssrTemplateHelper;
+          listMock = sandbox.mock(list);
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(itemElement)).to.be.true;
+          element.style.height = '10px';
+          doc.body.appendChild(element);
         });
-      });
-
-      it('should fetch and render non-array if single-item is set', () => {
-        const fetched = {'items': {title: 'Title1'}};
-        const itemElement = doc.createElement('div');
-        element.setAttribute('single-item', 'true');
-
-        const rendered = expectFetchAndRender(
-            fetched, [itemElement], {expr: 'items', singleItem: true});
 
-        return list.layoutCallback().then(() => rendered).then(() => {
-          expect(list.container_.contains(itemElement)).to.be.true;
+        afterEach(() => {
+          // There should only be one mock to verify.
+          listMock.verify();
         });
-      });
-
-      it('should trim the results to max-items', () => {
-        const fetched = {items: [
-          {title: 'Title1'},
-          {title: 'Title2'},
-          {title: 'Title3'},
-        ]};
-        const itemElement = doc.createElement('div');
-        element.setAttribute('max-items', '2');
-
-        expectFetchAndRender(
-            fetched, [itemElement], {expr: 'items', maxItems: 2});
-
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(itemElement)).to.be.true;
-        });
-      });
-
-      it('should dispatch DOM_UPDATE event after render', () => {
-        const spy = sandbox.spy(list.container_, 'dispatchEvent');
 
-        const itemElement = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
+        const DEFAULT_LIST_OPTS = {
+          expr: 'items',
+          maxItems: 0,
+          singleItem: false,
+          refresh: false,
+          resetOnRefresh: false,
+        };
+        const DEFAULT_ITEMS = [{title: 'Title1'}];
+        const DEFAULT_FETCHED_DATA = {
+          items: DEFAULT_ITEMS,
+        };
 
-        return list.layoutCallback().then(() => {
-          expect(spy).to.have.been.calledOnce;
-          expect(spy).calledWithMatch({
-            type: AmpEvents.DOM_UPDATE,
-            bubbles: true,
-          });
-        });
-      });
+        /**
+         * @param {!Array|!Object} fetched
+         * @param {!Array<!Element>} rendered
+         * @param {Object=} opts
+         * @return {!Promise}
+         */
+        function expectFetchAndRender(
+          fetched,
+          rendered,
+          opts = DEFAULT_LIST_OPTS
+        ) {
+          // Mock the actual network request.
+          listMock
+            .expects('fetch_')
+            .withExactArgs(!!opts.refresh, /* token */ undefined)
+            .returns(Promise.resolve(fetched))
+            .atLeast(1);
 
-      it('should resize with viewport', () => {
-        const resize = sandbox.spy(list, 'attemptToFit_');
-        list.layoutCallback().then(() => {
-          list.viewport_.resize_();
-          expect(resize).to.have.been.called;
-        });
-      });
-
-      // TODO(choumx, #14772): Flaky.
-      it.skip('should only process one result at a time for rendering', () => {
-        const doRenderPassSpy = sandbox.spy(list, 'doRenderPass_');
-        const scheduleRenderSpy = sandbox.spy(list.renderPass_, 'schedule');
-
-        const items = [{title: 'foo'}];
-        const foo = doc.createElement('div');
-        expectFetchAndRender(items, [foo]);
-        const layout = list.layoutCallback();
-
-        // Execute another fetch-triggering action immediately (actually on
-        // the next tick to avoid losing the layoutCallback() promise resolver).
-        Promise.resolve().then(() => {
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': 'https://new.com/list.json'});
-        });
-        // TODO(#14772): this expectation is sometimes not met.
-        listMock.expects('toggleLoading').withExactArgs(false).once();
-        listMock.expects('togglePlaceholder').withExactArgs(false).once();
-
-        return layout.then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
-
-          // Only one render pass should be invoked at a time.
-          expect(doRenderPassSpy).to.be.calledOnce;
-          // But the next render pass should be scheduled.
-          expect(scheduleRenderSpy).to.be.calledTwice;
-          expect(scheduleRenderSpy).to.be.calledWith(1);
-        });
-      });
+          // If "reset-on-refresh" is set, show loading/placeholder before fetch.
+          if (opts.resetOnRefresh) {
+            listMock
+              .expects('togglePlaceholder')
+              .withExactArgs(true)
+              .once();
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(true, true)
+              .once();
+          }
+
+          // Stub the rendering of the template.
+          let itemsToRender = fetched[opts.expr];
+          if (opts.singleItem) {
+            expect(itemsToRender).to.be.a('object');
+            itemsToRender = [fetched[opts.expr]];
+          } else if (opts.maxItems > 0) {
+            itemsToRender = fetched[opts.expr].slice(0, opts.maxItems);
+          }
+          ssrTemplateHelper.renderTemplate
+            .withArgs(element, itemsToRender)
+            .returns(Promise.resolve(rendered));
 
-      it('should refetch if refresh action is called', () => {
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+          expectRender();
+        }
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+        function expectRender() {
+          // Call mutate/measure during render.
+          listMock
+            .expects('mutateElement')
+            .callsFake(m => m())
+            .atLeast(1);
+          listMock
+            .expects('measureElement')
+            .callsFake(m => m())
+            .atLeast(1);
 
-          expectFetchAndRender(DEFAULT_FETCHED_DATA,
-              [foo], {refresh: true, expr: 'items'});
+          // Hide loading/placeholder during render.
+          listMock
+            .expects('toggleLoading')
+            .withExactArgs(false)
+            .atLeast(1);
+          listMock
+            .expects('togglePlaceholder')
+            .withExactArgs(false)
+            .atLeast(1);
+        }
 
-          return list.executeAction({
-            method: 'refresh',
-            satisfiesTrust: () => true,
+        describe('without amp-bind', () => {
+          beforeEach(() => {
+            setBindService(null);
           });
-        });
-      });
-
-      it('should reset on refresh if `reset-on-refresh` is set', () => {
-        element.setAttribute('reset-on-refresh', '');
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
-
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
 
-          const opts = {refresh: true, resetOnRefresh: true, expr: 'items'};
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo], opts);
-
-          return list.executeAction({
-            method: 'refresh',
-            satisfiesTrust: () => true,
+          it('should fetch and render', () => {
+            const itemElem = doc.createElement('div');
+            const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA, [
+              itemElem,
+            ]);
+            return list
+              .layoutCallback()
+              .then(() => rendered)
+              .then(() => {
+                expect(list.container_.contains(itemElem)).to.be.true;
+              });
           });
-        });
-      });
-
-      it('fetch should resolve if `src` is empty', () => {
-        const spy = sandbox.spy(list, 'fetchList_');
-        element.setAttribute('src', '');
-
-        return list.layoutCallback().then(() => {
-          expect(spy).to.have.been.calledOnce;
-        });
-      });
-
-      it('should fail to load b/c data array is absent', () => {
-        expectAsyncConsoleError(/Response must contain an array/, 1);
-        listMock.expects('fetch_').returns(Promise.resolve({})).once();
-        listMock.expects('toggleLoading').withExactArgs(false).once();
-        return expect(list.layoutCallback()).to.eventually.be
-            .rejectedWith(/Response must contain an array/);
-      });
-
-      it('should fail to load b/c data single-item object is absent', () => {
-        expectAsyncConsoleError(/Response must contain an array or object/, 1);
-        element.setAttribute('single-item', 'true');
-        listMock.expects('fetch_').returns(Promise.resolve()).once();
-        listMock.expects('toggleLoading').withExactArgs(false).once();
-        return expect(list.layoutCallback()).to.eventually.be
-            .rejectedWith(/Response must contain an array or object/);
-      });
-
-      it('should load and render with a different root', () => {
-        const items = {different: [{title: 'Title1'}]};
-        const itemElement = doc.createElement('div');
-        element.setAttribute('items', 'different');
-        expectFetchAndRender(items, [itemElement], {expr: 'different'});
-
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(itemElement)).to.be.true;
-        });
-      });
-
-      it('should set accessibility roles', () => {
-        const itemElement = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
-
-        return list.layoutCallback().then(() => {
-          expect(list.container_.getAttribute('role')).to.equal('list');
-          expect(itemElement.getAttribute('role')).to.equal('listitem');
-        });
-      });
-
-      it('should preserve accessibility roles', () => {
-        element.setAttribute('role', 'list1');
-        const itemElement = doc.createElement('div');
-        itemElement.setAttribute('role', 'listitem1');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
-
-        return list.layoutCallback().then(() => {
-          expect(list.element.getAttribute('role')).to.equal('list1');
-          expect(itemElement.getAttribute('role')).to.equal('listitem1');
-        });
-      });
 
-      it('should not show placeholder on fetch failure', function*() {
-        // Stub fetch_() to fail.
-        listMock.expects('fetch_').returns(Promise.reject()).once();
-        listMock.expects('toggleLoading').withExactArgs(false).once();
-        listMock.expects('togglePlaceholder').never();
-
-        return list.layoutCallback();
-      });
-
-      it('should trigger "fetch-error" event on fetch failure', function*() {
-        const actions = {trigger: sandbox.spy()};
-        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-
-        // Stub fetch_() to fail.
-        listMock.expects('fetch_').returns(Promise.reject()).once();
-        listMock.expects('toggleLoading').withExactArgs(false).once();
-
-        yield list.layoutCallback();
-
-        expect(actions.trigger).to.be.calledWithExactly(list, 'fetch-error',
-            sinon.match.any, ActionTrust.LOW);
-      });
+          it('should reset pending change-size request after render', function*() {
+            const itemElement = doc.createElement('div');
+            const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA, [
+              itemElement,
+            ]);
+            yield list.layoutCallback();
+            yield rendered;
+            expect(resource.resetPendingChangeSize).calledOnce;
+          });
 
-      describe('DOM diffing', () => {
-        beforeEach(() => {
-          toggleExperiment(win, 'amp-list-diffing', true, true);
-        });
+          it('should attemptChangeHeight the placeholder, if present', () => {
+            const itemElement = doc.createElement('div');
+            const placeholder = doc.createElement('div');
+            placeholder.style.height = '1337px';
+            element.appendChild(placeholder);
+            element.getPlaceholder = () => placeholder;
 
-        it('should keep unchanged elements', function*() {
-          const itemElement = doc.createElement('div');
-          const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA,
-              [itemElement]);
-          yield list.layoutCallback().then(() => rendered);
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
 
-          const newFetched = [{title: 'Title2'}];
-          const newItemElement = doc.createElement('div');
-          ssrTemplateHelper.renderTemplate
-              .withArgs(element, newFetched)
-              .returns(Promise.resolve([newItemElement]));
-          yield list.mutatedAttributesCallback({src: newFetched});
+            listMock
+              .expects('attemptChangeHeight')
+              .withExactArgs(1337)
+              .returns(Promise.resolve());
 
-          expect(list.container_.contains(itemElement)).to.be.true;
-          expect(list.container_.contains(newItemElement)).to.be.false;
-        });
+            return list.layoutCallback();
+          });
 
-        it('should use i-amphtml-key as a replacement key', function*() {
-          const itemElement = doc.createElement('div');
-          itemElement.setAttribute('i-amphtml-key', '1');
-          const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA,
-              [itemElement]);
-          yield list.layoutCallback().then(() => rendered);
+          it('should attemptChangeHeight rendered contents', () => {
+            const itemElement = doc.createElement('div');
+            itemElement.style.height = '1337px';
 
-          const newFetched = [{title: 'Title2'}];
-          const newItemElement = doc.createElement('div');
-          newItemElement.setAttribute('i-amphtml-key', '2');
-          ssrTemplateHelper.renderTemplate
-              .withArgs(element, newFetched)
-              .returns(Promise.resolve([newItemElement]));
-          yield list.mutatedAttributesCallback({src: newFetched});
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
 
-          expect(list.container_.contains(itemElement)).to.be.false;
-          expect(list.container_.contains(newItemElement)).to.be.true;
-        });
-      });
+            listMock
+              .expects('attemptChangeHeight')
+              .withExactArgs(1337)
+              .returns(Promise.resolve());
 
-      describe('SSR templates', () => {
-        beforeEach(() => {
-          sandbox.stub(ssrTemplateHelper, 'isSupported').returns(true);
-        });
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(itemElement)).to.be.true;
+            });
+          });
 
-        it('should error if proxied fetch fails', () => {
-          sandbox.stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
-              .returns(Promise.reject());
+          it('should fetch and render non-array if single-item is set', () => {
+            const fetched = {'items': {title: 'Title1'}};
+            const itemElement = doc.createElement('div');
+            element.setAttribute('single-item', 'true');
+
+            const rendered = expectFetchAndRender(fetched, [itemElement], {
+              expr: 'items',
+              singleItem: true,
+            });
+
+            return list
+              .layoutCallback()
+              .then(() => rendered)
+              .then(() => {
+                expect(list.container_.contains(itemElement)).to.be.true;
+              });
+          });
 
-          listMock.expects('toggleLoading').withExactArgs(false).once();
+          it('should trim the results to max-items', () => {
+            const fetched = {
+              items: [{title: 'Title1'}, {title: 'Title2'}, {title: 'Title3'}],
+            };
+            const itemElement = doc.createElement('div');
+            element.setAttribute('max-items', '2');
+
+            expectFetchAndRender(fetched, [itemElement], {
+              expr: 'items',
+              maxItems: 2,
+            });
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(itemElement)).to.be.true;
+            });
+          });
 
-          return expect(list.layoutCallback()).to.eventually.be
-              .rejectedWith(/Error proxying amp-list templates/);
-        });
+          it('should dispatch DOM_UPDATE event after render', () => {
+            const spy = sandbox.spy(list.container_, 'dispatchEvent');
 
-        it('should error if proxied fetch returns invalid data', () => {
-          expectAsyncConsoleError(/Expected response with format/, 1);
-          sandbox.stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
-              .returns(Promise.resolve(undefined));
-          listMock.expects('toggleLoading').withExactArgs(false).once();
-          return expect(list.layoutCallback()).to.eventually.be
-              .rejectedWith(/Expected response with format/);
-        });
+            const itemElement = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
 
-        it('should delegate template rendering to viewer', function*() {
-          const rendered = doc.createElement('p');
-          const html = '<div role="list" class="i-amphtml-fill-content '
-                    + 'i-amphtml-replaced-content">'
-                    + '<div role="item">foo</div>'
-                    + '</div>';
-          const listContainer = document.createElement('div');
-          listContainer.setAttribute('role', 'list');
-          listContainer.setAttribute('class', 'i-amphtml-fill-content '
-              + 'i-amphtml-replace-content');
-          const listItem = document.createElement('div');
-          listItem.setAttribute('role', 'item');
-          listContainer.appendChild(listItem);
-          sandbox.stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
-              .returns(Promise.resolve({html}));
-          ssrTemplateHelper.renderTemplate
-              .returns(Promise.resolve(listContainer));
-          listMock.expects('updateBindings_')
-              .returns(Promise.resolve(listContainer)).once();
-          listMock.expects('render_').withExactArgs(listContainer, false)
-              .returns(Promise.resolve());
+            return list.layoutCallback().then(() => {
+              expect(spy).to.have.been.calledOnce;
+              expect(spy).calledWithMatch({
+                type: AmpEvents.DOM_UPDATE,
+                bubbles: true,
+              });
+            });
+          });
 
-          ssrTemplateHelper.renderTemplate
-              .withArgs(element, html)
-              .returns(Promise.resolve(rendered));
-
-          yield list.layoutCallback();
-
-          const request = sinon.match({
-            xhrUrl:
-                'https://data.com/list.json?__amp_source_origin=about%3Asrcdoc',
-            fetchOpt: sinon.match({
-              headers: {Accept: 'application/json'},
-              method: 'GET',
-              requireAmpResponseSourceOrigin: false,
-              responseType: 'application/json',
-            }),
-          });
-          const attrs = sinon.match({
-            ampListAttributes: sinon.match({
-              items: 'items', maxItems: null, singleItem: false}),
-          });
-          expect(ssrTemplateHelper.fetchAndRenderTemplate).to.be.calledOnce;
-          expect(ssrTemplateHelper.fetchAndRenderTemplate)
-              .to.be.calledWithExactly(element, request, null, attrs);
-        });
-      });
+          it('should resize with viewport', () => {
+            const resize = sandbox.spy(list, 'attemptToFit_');
+            list.layoutCallback().then(() => {
+              list.viewport_.resize_();
+              expect(resize).to.have.been.called;
+            });
+          });
 
-      // TODO(aghassemi, #12476): Make this test work with sinon 4.0.
-      describe.skip('with fallback', () => {
-        beforeEach(() => {
-          // Stub getFallback() with fake truthy value.
-          listMock.expects('getFallback').returns(true);
-          // Stub getVsync().mutate() to execute immediately.
-          listMock.expects('getVsync').returns({
-            measure: () => {},
-            mutate: block => block(),
-          }).atLeast(1);
-        });
+          // TODO(choumx, #14772): Flaky.
+          it.skip('should only process one result at a time for rendering', () => {
+            const doRenderPassSpy = sandbox.spy(list, 'doRenderPass_');
+            const scheduleRenderSpy = sandbox.spy(list.renderPass_, 'schedule');
+
+            const items = [{title: 'foo'}];
+            const foo = doc.createElement('div');
+            expectFetchAndRender(items, [foo]);
+            const layout = list.layoutCallback();
+
+            // Execute another fetch-triggering action immediately (actually on
+            // the next tick to avoid losing the layoutCallback() promise resolver).
+            Promise.resolve().then(() => {
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({
+                'src': 'https://new.com/list.json',
+              });
+            });
+            // TODO(#14772): this expectation is sometimes not met.
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(false)
+              .once();
+            listMock
+              .expects('togglePlaceholder')
+              .withExactArgs(false)
+              .once();
+
+            return layout.then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              // Only one render pass should be invoked at a time.
+              expect(doRenderPassSpy).to.be.calledOnce;
+              // But the next render pass should be scheduled.
+              expect(scheduleRenderSpy).to.be.calledTwice;
+              expect(scheduleRenderSpy).to.be.calledWith(1);
+            });
+          });
 
-        it('should hide fallback element on fetch success', () => {
-          // Stub fetch and render to succeed.
-          listMock.expects('fetch_').returns(Promise.resolve([])).once();
-          templates.findAndRenderTemplate.returns(Promise.resolve([]));
-          // Act as if a fallback is already displayed.
-          sandbox.stub(list, 'fallbackDisplayed_').callsFake(true);
+          it('should refetch if refresh action is called', () => {
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
 
-          listMock.expects('togglePlaceholder').never();
-          listMock.expects('toggleFallback').withExactArgs(false).once();
-          return list.layoutCallback().catch(() => {});
-        });
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
 
-        it('should hide placeholder and show fallback on fetch failure', () => {
-          // Stub fetch_() to fail.
-          listMock.expects('fetch_').returns(Promise.reject()).once();
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo], {
+                refresh: true,
+                expr: 'items',
+              });
 
-          listMock.expects('togglePlaceholder').withExactArgs(false).once();
-          listMock.expects('toggleFallback').withExactArgs(true).once();
-          return list.layoutCallback().catch(() => {});
-        });
-      });
-    }); // without amp-bind
-
-    describe('with amp-bind', () => {
-      let bind;
-
-      beforeEach(() => {
-        bind = {
-          scanAndApply: sandbox.stub().returns(Promise.resolve()),
-          signals: () => {
-            return {get: unusedName => false};
-          },
-        };
-        setBindService(bind);
-      });
+              return list.executeAction({
+                method: 'refresh',
+                satisfiesTrust: () => true,
+              });
+            });
+          });
 
-      it('should _not_ refetch if [src] attr changes (before layout)', () => {
-        // Not allowed before layout.
-        listMock.expects('fetchList_').never();
+          it('should reset on refresh if `reset-on-refresh` is set', () => {
+            element.setAttribute('reset-on-refresh', '');
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
 
-        element.setAttribute('src', 'https://new.com/list.json');
-        list.mutatedAttributesCallback({'src': 'https://new.com/list.json'});
-        expect(element.getAttribute('src')).to.equal('https://new.com/list.json');
-      });
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
 
-      it('should render and remove `src` if [src] points to local data', () => {
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+              const opts = {refresh: true, resetOnRefresh: true, expr: 'items'};
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo], opts);
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+              return list.executeAction({
+                method: 'refresh',
+                satisfiesTrust: () => true,
+              });
+            });
+          });
 
-          listMock.expects('fetchList_').never();
-          // Expect hiding of placeholder/loading after render.
-          listMock.expects('togglePlaceholder').withExactArgs(false).once();
-          listMock.expects('toggleLoading').withExactArgs(false).once();
+          it('fetch should resolve if `src` is empty', () => {
+            const spy = sandbox.spy(list, 'fetchList_');
+            element.setAttribute('src', '');
 
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': [{title: 'Title1'}]});
-          expect(element.getAttribute('src')).to.equal('');
-        });
-      });
-
-      it('should fetch with viewer auth token if \'crossorigin='
-          + 'amp-viewer-auth-token-via-post\' attribute is present', () => {
-        sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
-            Promise.resolve({
-              getIdTokenPromise: (() => Promise.resolve('idToken')),
-            }));
-        element.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
-        const fetched = {items: DEFAULT_ITEMS};
-        const foo = doc.createElement('div');
-        const rendered = [foo];
-        const opts = DEFAULT_LIST_OPTS;
-
-        listMock.expects('fetch_')
-            .withExactArgs(!!opts.refresh, 'idToken')
-            .returns(Promise.resolve(fetched))
-            .atLeast(1);
+            return list.layoutCallback().then(() => {
+              expect(spy).to.have.been.calledOnce;
+            });
+          });
 
-        // Stub the rendering of the template.
-        const itemsToRender = fetched[opts.expr];
-        ssrTemplateHelper.renderTemplate
-            .withArgs(element, itemsToRender)
-            .returns(Promise.resolve(rendered));
+          it('should fail to load b/c data array is absent', () => {
+            expectAsyncConsoleError(/Response must contain an array/, 1);
+            listMock
+              .expects('fetch_')
+              .returns(Promise.resolve({}))
+              .once();
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(false)
+              .once();
+            return expect(list.layoutCallback()).to.eventually.be.rejectedWith(
+              /Response must contain an array/
+            );
+          });
 
-        expectRender();
+          it('should fail to load b/c data single-item object is absent', () => {
+            expectAsyncConsoleError(
+              /Response must contain an array or object/,
+              1
+            );
+            element.setAttribute('single-item', 'true');
+            listMock
+              .expects('fetch_')
+              .returns(Promise.resolve())
+              .once();
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(false)
+              .once();
+            return expect(list.layoutCallback()).to.eventually.be.rejectedWith(
+              /Response must contain an array or object/
+            );
+          });
 
-        return list.layoutCallback().then(() => Promise.resolve());
-      });
+          it('should load and render with a different root', () => {
+            const items = {different: [{title: 'Title1'}]};
+            const itemElement = doc.createElement('div');
+            element.setAttribute('items', 'different');
+            expectFetchAndRender(items, [itemElement], {expr: 'different'});
 
-      it('should reset if `reset-on-refresh` is set (new URL)', () => {
-        element.setAttribute('reset-on-refresh', '');
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(itemElement)).to.be.true;
+            });
+          });
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+          it('should set accessibility roles', () => {
+            const itemElement = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
 
-          expectFetchAndRender(DEFAULT_FETCHED_DATA,
-              [foo], {resetOnRefresh: true});
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': 'https://new.com/list.json'});
-        });
-      });
+            return list.layoutCallback().then(() => {
+              expect(list.container_.getAttribute('role')).to.equal('list');
+              expect(itemElement.getAttribute('role')).to.equal('listitem');
+            });
+          });
 
-      it('should clear old bindings when resetting', () => {
-        element.setAttribute('reset-on-refresh', '');
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+          it('should preserve accessibility roles', () => {
+            element.setAttribute('role', 'list1');
+            const itemElement = doc.createElement('div');
+            itemElement.setAttribute('role', 'listitem1');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [itemElement]);
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+            return list.layoutCallback().then(() => {
+              expect(list.element.getAttribute('role')).to.equal('list1');
+              expect(itemElement.getAttribute('role')).to.equal('listitem1');
+            });
+          });
 
-          expectFetchAndRender(DEFAULT_FETCHED_DATA,
-              [foo], {resetOnRefresh: true});
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': 'https://new.com/list.json'});
+          it('should not show placeholder on fetch failure', function*() {
+            // Stub fetch_() to fail.
+            listMock
+              .expects('fetch_')
+              .returns(Promise.reject())
+              .once();
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(false)
+              .once();
+            listMock.expects('togglePlaceholder').never();
+
+            return list.layoutCallback();
+          });
 
-          expect(bind.scanAndApply).to.be.calledTwice;
-          expect(bind.scanAndApply).to.be.calledWith([], sinon.match.array);
-        });
-      });
+          it('should trigger "fetch-error" event on fetch failure', function*() {
+            const actions = {trigger: sandbox.spy()};
+            sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+
+            // Stub fetch_() to fail.
+            listMock
+              .expects('fetch_')
+              .returns(Promise.reject())
+              .once();
+            listMock
+              .expects('toggleLoading')
+              .withExactArgs(false)
+              .once();
+
+            yield list.layoutCallback();
+
+            expect(actions.trigger).to.be.calledWithExactly(
+              list,
+              'fetch-error',
+              sinon.match.any,
+              ActionTrust.LOW
+            );
+          });
 
-      it('should not reset if `reset-on-refresh=""` (new data)', () => {
-        element.setAttribute('reset-on-refresh', '');
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+          describe('DOM diffing', () => {
+            beforeEach(() => {
+              toggleExperiment(win, 'amp-list-diffing', true, true);
+            });
+
+            it('should keep unchanged elements', function*() {
+              const itemElement = doc.createElement('div');
+              const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA, [
+                itemElement,
+              ]);
+              yield list.layoutCallback().then(() => rendered);
+
+              const newFetched = [{title: 'Title2'}];
+              const newItemElement = doc.createElement('div');
+              ssrTemplateHelper.renderTemplate
+                .withArgs(element, newFetched)
+                .returns(Promise.resolve([newItemElement]));
+              yield list.mutatedAttributesCallback({src: newFetched});
+
+              expect(list.container_.contains(itemElement)).to.be.true;
+              expect(list.container_.contains(newItemElement)).to.be.false;
+            });
+
+            it('should use i-amphtml-key as a replacement key', function*() {
+              const itemElement = doc.createElement('div');
+              itemElement.setAttribute('i-amphtml-key', '1');
+              const rendered = expectFetchAndRender(DEFAULT_FETCHED_DATA, [
+                itemElement,
+              ]);
+              yield list.layoutCallback().then(() => rendered);
+
+              const newFetched = [{title: 'Title2'}];
+              const newItemElement = doc.createElement('div');
+              newItemElement.setAttribute('i-amphtml-key', '2');
+              ssrTemplateHelper.renderTemplate
+                .withArgs(element, newFetched)
+                .returns(Promise.resolve([newItemElement]));
+              yield list.mutatedAttributesCallback({src: newFetched});
+
+              expect(list.container_.contains(itemElement)).to.be.false;
+              expect(list.container_.contains(newItemElement)).to.be.true;
+            });
+          });
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+          describe('SSR templates', () => {
+            beforeEach(() => {
+              sandbox.stub(ssrTemplateHelper, 'isSupported').returns(true);
+            });
+
+            it('should error if proxied fetch fails', () => {
+              sandbox
+                .stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
+                .returns(Promise.reject());
+
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(false)
+                .once();
+
+              return expect(
+                list.layoutCallback()
+              ).to.eventually.be.rejectedWith(
+                /Error proxying amp-list templates/
+              );
+            });
+
+            it('should error if proxied fetch returns invalid data', () => {
+              expectAsyncConsoleError(/Expected response with format/, 1);
+              sandbox
+                .stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
+                .returns(Promise.resolve(undefined));
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(false)
+                .once();
+              return expect(
+                list.layoutCallback()
+              ).to.eventually.be.rejectedWith(/Expected response with format/);
+            });
+
+            it('should delegate template rendering to viewer', function*() {
+              const rendered = doc.createElement('p');
+              const html =
+                '<div role="list" class="i-amphtml-fill-content ' +
+                'i-amphtml-replaced-content">' +
+                '<div role="item">foo</div>' +
+                '</div>';
+              const listContainer = document.createElement('div');
+              listContainer.setAttribute('role', 'list');
+              listContainer.setAttribute(
+                'class',
+                'i-amphtml-fill-content i-amphtml-replace-content'
+              );
+              const listItem = document.createElement('div');
+              listItem.setAttribute('role', 'item');
+              listContainer.appendChild(listItem);
+              sandbox
+                .stub(ssrTemplateHelper, 'fetchAndRenderTemplate')
+                .returns(Promise.resolve({html}));
+              ssrTemplateHelper.renderTemplate.returns(
+                Promise.resolve(listContainer)
+              );
+              listMock
+                .expects('updateBindings_')
+                .returns(Promise.resolve(listContainer))
+                .once();
+              listMock
+                .expects('render_')
+                .withExactArgs(listContainer, false)
+                .returns(Promise.resolve());
+
+              ssrTemplateHelper.renderTemplate
+                .withArgs(element, html)
+                .returns(Promise.resolve(rendered));
+
+              yield list.layoutCallback();
+
+              const request = sinon.match({
+                xhrUrl:
+                  'https://data.com/list.json?__amp_source_origin=about%3Asrcdoc',
+                fetchOpt: sinon.match({
+                  headers: {Accept: 'application/json'},
+                  method: 'GET',
+                  requireAmpResponseSourceOrigin: false,
+                  responseType: 'application/json',
+                }),
+              });
+              const attrs = sinon.match({
+                ampListAttributes: sinon.match({
+                  items: 'items',
+                  maxItems: null,
+                  singleItem: false,
+                }),
+              });
+              expect(ssrTemplateHelper.fetchAndRenderTemplate).to.be.calledOnce;
+              expect(
+                ssrTemplateHelper.fetchAndRenderTemplate
+              ).to.be.calledWithExactly(element, request, null, attrs);
+            });
+          });
 
-          listMock.expects('fetchList_').never();
-          // Expect hiding of placeholder/loading after render.
-          listMock.expects('togglePlaceholder').withExactArgs(false).once();
-          listMock.expects('toggleLoading').withExactArgs(false).once();
+          // TODO(aghassemi, #12476): Make this test work with sinon 4.0.
+          describe.skip('with fallback', () => {
+            beforeEach(() => {
+              // Stub getFallback() with fake truthy value.
+              listMock.expects('getFallback').returns(true);
+              // Stub getVsync().mutate() to execute immediately.
+              listMock
+                .expects('getVsync')
+                .returns({
+                  measure: () => {},
+                  mutate: block => block(),
+                })
+                .atLeast(1);
+            });
+
+            it('should hide fallback element on fetch success', () => {
+              // Stub fetch and render to succeed.
+              listMock
+                .expects('fetch_')
+                .returns(Promise.resolve([]))
+                .once();
+              templates.findAndRenderTemplate.returns(Promise.resolve([]));
+              // Act as if a fallback is already displayed.
+              sandbox.stub(list, 'fallbackDisplayed_').callsFake(true);
+
+              listMock.expects('togglePlaceholder').never();
+              listMock
+                .expects('toggleFallback')
+                .withExactArgs(false)
+                .once();
+              return list.layoutCallback().catch(() => {});
+            });
+
+            it('should hide placeholder and show fallback on fetch failure', () => {
+              // Stub fetch_() to fail.
+              listMock
+                .expects('fetch_')
+                .returns(Promise.reject())
+                .once();
+
+              listMock
+                .expects('togglePlaceholder')
+                .withExactArgs(false)
+                .once();
+              listMock
+                .expects('toggleFallback')
+                .withExactArgs(true)
+                .once();
+              return list.layoutCallback().catch(() => {});
+            });
+          });
+        }); // without amp-bind
+
+        describe('with amp-bind', () => {
+          let bind;
+
+          beforeEach(() => {
+            bind = {
+              scanAndApply: sandbox.stub().returns(Promise.resolve()),
+              signals: () => {
+                return {get: unusedName => false};
+              },
+            };
+            setBindService(bind);
+          });
 
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': DEFAULT_ITEMS});
-        });
-      });
-
-      it('should reset if `reset-on-refresh="always"` (new data)', () => {
-        element.setAttribute('reset-on-refresh', 'always');
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
-
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
-
-          listMock.expects('fetchList_').never();
-          // Expect display of placeholder/loading before render.
-          listMock.expects('togglePlaceholder').withExactArgs(true).once();
-          listMock.expects('toggleLoading').withExactArgs(true, true).once();
-          // Expect hiding of placeholder/loading after render.
-          listMock.expects('togglePlaceholder').withExactArgs(false).once();
-          listMock.expects('toggleLoading').withExactArgs(false).once();
-
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': DEFAULT_ITEMS});
-        });
-      });
+          it('should _not_ refetch if [src] attr changes (before layout)', () => {
+            // Not allowed before layout.
+            listMock.expects('fetchList_').never();
+
+            element.setAttribute('src', 'https://new.com/list.json');
+            list.mutatedAttributesCallback({
+              'src': 'https://new.com/list.json',
+            });
+            expect(element.getAttribute('src')).to.equal(
+              'https://new.com/list.json'
+            );
+          });
 
-      it('should refetch if [src] attribute changes (after layout)', () => {
-        const foo = doc.createElement('div');
-        expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+          it('should render and remove `src` if [src] points to local data', () => {
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              listMock.expects('fetchList_').never();
+              // Expect hiding of placeholder/loading after render.
+              listMock
+                .expects('togglePlaceholder')
+                .withExactArgs(false)
+                .once();
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(false)
+                .once();
+
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({'src': [{title: 'Title1'}]});
+              expect(element.getAttribute('src')).to.equal('');
+            });
+          });
 
-        return list.layoutCallback().then(() => {
-          expect(list.container_.contains(foo)).to.be.true;
+          it(
+            "should fetch with viewer auth token if 'crossorigin=" +
+              "amp-viewer-auth-token-via-post' attribute is present",
+            () => {
+              sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
+                Promise.resolve({
+                  getIdTokenPromise: () => Promise.resolve('idToken'),
+                })
+              );
+              element.setAttribute(
+                'crossorigin',
+                'amp-viewer-auth-token-via-post'
+              );
+              const fetched = {items: DEFAULT_ITEMS};
+              const foo = doc.createElement('div');
+              const rendered = [foo];
+              const opts = DEFAULT_LIST_OPTS;
+
+              listMock
+                .expects('fetch_')
+                .withExactArgs(!!opts.refresh, 'idToken')
+                .returns(Promise.resolve(fetched))
+                .atLeast(1);
+
+              // Stub the rendering of the template.
+              const itemsToRender = fetched[opts.expr];
+              ssrTemplateHelper.renderTemplate
+                .withArgs(element, itemsToRender)
+                .returns(Promise.resolve(rendered));
+
+              expectRender();
+
+              return list.layoutCallback().then(() => Promise.resolve());
+            }
+          );
+
+          it('should reset if `reset-on-refresh` is set (new URL)', () => {
+            element.setAttribute('reset-on-refresh', '');
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo], {
+                resetOnRefresh: true,
+              });
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({
+                'src': 'https://new.com/list.json',
+              });
+            });
+          });
 
-          // Allowed post-layout.
-          listMock.expects('fetchList_').once();
+          it('should clear old bindings when resetting', () => {
+            element.setAttribute('reset-on-refresh', '');
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo], {
+                resetOnRefresh: true,
+              });
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({
+                'src': 'https://new.com/list.json',
+              });
+
+              expect(bind.scanAndApply).to.be.calledTwice;
+              expect(bind.scanAndApply).to.be.calledWith([], sinon.match.array);
+            });
+          });
 
-          element.setAttribute('src', 'https://new.com/list.json');
-          list.mutatedAttributesCallback({'src': 'https://new.com/list.json'});
-        });
-      });
-
-      describe('no `binding` attribute', () => {
-        it('should call scanAndApply()', function*() {
-          const output = [doc.createElement('div')];
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
-          yield list.layoutCallback();
-          expect(bind.scanAndApply).to.have.been.calledOnce;
-        });
-      });
+          it('should not reset if `reset-on-refresh=""` (new data)', () => {
+            element.setAttribute('reset-on-refresh', '');
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              listMock.expects('fetchList_').never();
+              // Expect hiding of placeholder/loading after render.
+              listMock
+                .expects('togglePlaceholder')
+                .withExactArgs(false)
+                .once();
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(false)
+                .once();
+
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({'src': DEFAULT_ITEMS});
+            });
+          });
 
-      describe('binding="always"', () => {
-        beforeEach(() => {
-          element.setAttribute('binding', 'always');
-        });
+          it('should reset if `reset-on-refresh="always"` (new data)', () => {
+            element.setAttribute('reset-on-refresh', 'always');
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
+
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
+
+              listMock.expects('fetchList_').never();
+              // Expect display of placeholder/loading before render.
+              listMock
+                .expects('togglePlaceholder')
+                .withExactArgs(true)
+                .once();
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(true, true)
+                .once();
+              // Expect hiding of placeholder/loading after render.
+              listMock
+                .expects('togglePlaceholder')
+                .withExactArgs(false)
+                .once();
+              listMock
+                .expects('toggleLoading')
+                .withExactArgs(false)
+                .once();
+
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({'src': DEFAULT_ITEMS});
+            });
+          });
 
-        it('should call scanAndApply()', function*() {
-          const output = [doc.createElement('div')];
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
-          yield list.layoutCallback();
-          expect(bind.scanAndApply).to.have.been.calledOnce;
-        });
-      });
+          it('should refetch if [src] attribute changes (after layout)', () => {
+            const foo = doc.createElement('div');
+            expectFetchAndRender(DEFAULT_FETCHED_DATA, [foo]);
 
-      describe('binding="refresh"', () => {
-        beforeEach(() => {
-          element.setAttribute('binding', 'refresh');
-        });
+            return list.layoutCallback().then(() => {
+              expect(list.container_.contains(foo)).to.be.true;
 
-        it('should not call scanAndApply() before FIRST_MUTATE', function*() {
-          const output = [doc.createElement('div')];
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
-          yield list.layoutCallback();
-          expect(bind.scanAndApply).to.not.have.been.called;
-        });
+              // Allowed post-layout.
+              listMock.expects('fetchList_').once();
 
-        it('should call scanAndApply() after FIRST_MUTATE', function*() {
-          bind.signals = () => {
-            return {get: name => (name === 'FIRST_MUTATE')};
-          };
-          const output = [doc.createElement('div')];
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
-          yield list.layoutCallback();
-          expect(bind.scanAndApply).to.have.been.calledOnce;
-          expect(bind.scanAndApply).calledWithExactly(
-              output, [list.container_]);
-        });
-      });
+              element.setAttribute('src', 'https://new.com/list.json');
+              list.mutatedAttributesCallback({
+                'src': 'https://new.com/list.json',
+              });
+            });
+          });
 
-      describe('binding="no"', () => {
-        beforeEach(() => {
-          element.setAttribute('binding', 'no');
-        });
+          describe('no `binding` attribute', () => {
+            it('should call scanAndApply()', function*() {
+              const output = [doc.createElement('div')];
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
+              yield list.layoutCallback();
+              expect(bind.scanAndApply).to.have.been.calledOnce;
+            });
+          });
 
-        it('should not call scanAndApply()', function*() {
-          const output = [doc.createElement('div')];
-          expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
-          yield list.layoutCallback();
-          expect(bind.scanAndApply).to.not.have.been.called;
-        });
-      });
-    }); // with amp-bind
+          describe('binding="always"', () => {
+            beforeEach(() => {
+              element.setAttribute('binding', 'always');
+            });
+
+            it('should call scanAndApply()', function*() {
+              const output = [doc.createElement('div')];
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
+              yield list.layoutCallback();
+              expect(bind.scanAndApply).to.have.been.calledOnce;
+            });
+          });
 
-  });
+          describe('binding="refresh"', () => {
+            beforeEach(() => {
+              element.setAttribute('binding', 'refresh');
+            });
+
+            it('should not call scanAndApply() before FIRST_MUTATE', function*() {
+              const output = [doc.createElement('div')];
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
+              yield list.layoutCallback();
+              expect(bind.scanAndApply).to.not.have.been.called;
+            });
+
+            it('should call scanAndApply() after FIRST_MUTATE', function*() {
+              bind.signals = () => {
+                return {get: name => name === 'FIRST_MUTATE'};
+              };
+              const output = [doc.createElement('div')];
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
+              yield list.layoutCallback();
+              expect(bind.scanAndApply).to.have.been.calledOnce;
+              expect(bind.scanAndApply).calledWithExactly(output, [
+                list.container_,
+              ]);
+            });
+          });
 
-});
+          describe('binding="no"', () => {
+            beforeEach(() => {
+              element.setAttribute('binding', 'no');
+            });
+
+            it('should not call scanAndApply()', function*() {
+              const output = [doc.createElement('div')];
+              expectFetchAndRender(DEFAULT_FETCHED_DATA, output);
+              yield list.layoutCallback();
+              expect(bind.scanAndApply).to.not.have.been.called;
+            });
+          });
+        }); // with amp-bind
+      }
+    );
+  }
+);
diff --git a/extensions/amp-live-list/0.1/amp-live-list.js b/extensions/amp-live-list/0.1/amp-live-list.js
index a0e81002a900..eaef4f20fed0 100644
--- a/extensions/amp-live-list/0.1/amp-live-list.js
+++ b/extensions/amp-live-list/0.1/amp-live-list.js
@@ -26,7 +26,6 @@ import {childElementByAttr} from '../../../src/dom';
 import {isExperimentOn} from '../../../src/experiments';
 import {user, userAssert} from '../../../src/log';
 
-
 /**
  * @enum {string}
  */
@@ -49,15 +48,13 @@ let MutateItemsDef;
  * @interface
  */
 export class LiveListInterface {
-
   /**
    * Update the underlying live list dom structure.
    *
    * @param {!Element} unusedElement
    * @return {time}
    */
-  update(unusedElement) {
-  }
+  update(unusedElement) {}
 
   /**
    * The interval of when the LiveList should be at best notified
@@ -97,7 +94,6 @@ export class LiveListInterface {
   getUpdateTime() {}
 }
 
-
 /**
  * Helper function that either returns a number derived from the given
  * string value if its greater than the default, else returns the default.
@@ -111,7 +107,6 @@ export function getNumberMaxOrDefault(value, defaultValue) {
   return Math.max(parseInt(value, 10) || 0, defaultValue);
 }
 
-
 /**
  * Component class that handles updates to its underlying children dom
  * structure.
@@ -119,7 +114,6 @@ export function getNumberMaxOrDefault(value, defaultValue) {
  * @implements {LiveListInterface}
  */
 export class AmpLiveList extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -204,36 +198,44 @@ export class AmpLiveList extends AMP.BaseElement {
     this.customSlotId_ = this.element[AMP_LIVE_LIST_CUSTOM_SLOT_ID];
 
     this.updateSlot_ = userAssert(
-        this.getUpdateSlot_(this.element),
-        'amp-live-list must have an "update" slot.');
+      this.getUpdateSlot_(this.element),
+      'amp-live-list must have an "update" slot.'
+    );
 
     this.itemsSlot_ = userAssert(
-        this.getItemsSlot_(this.element),
-        'amp-live-list must have an "items" slot.');
+      this.getItemsSlot_(this.element),
+      'amp-live-list must have an "items" slot.'
+    );
 
     this.paginationSlot_ = this.getPaginationSlot_(this.element);
 
-    this.liveListId_ = userAssert(this.element.getAttribute('id'),
-        'amp-live-list must have an id.');
+    this.liveListId_ = userAssert(
+      this.element.getAttribute('id'),
+      'amp-live-list must have an id.'
+    );
 
     this.pollInterval_ = getNumberMaxOrDefault(
-        this.element.getAttribute('data-poll-interval'),
-        LiveListManager.getMinDataPollInterval());
+      this.element.getAttribute('data-poll-interval'),
+      LiveListManager.getMinDataPollInterval()
+    );
 
     const maxItems = this.element.getAttribute('data-max-items-per-page');
-    userAssert(Number(maxItems) > 0 ||
-      this.element.hasAttribute('disable-pagination'),
-    'amp-live-list # %s must have data-max-items-per-page attribute with'
-    + ' numeric value. Found %s.',
-    this.liveListId_,
-    maxItems
+    userAssert(
+      Number(maxItems) > 0 || this.element.hasAttribute('disable-pagination'),
+      'amp-live-list # %s must have data-max-items-per-page attribute with' +
+        ' numeric value. Found %s.',
+      this.liveListId_,
+      maxItems
     );
 
-    const actualCount = ([].slice.call(this.itemsSlot_.children)
-        .filter(child => !child.hasAttribute('data-tombstone'))).length;
+    const actualCount = [].slice
+      .call(this.itemsSlot_.children)
+      .filter(child => !child.hasAttribute('data-tombstone')).length;
 
-    this.maxItemsPerPage_ = Math.max(getNumberMaxOrDefault(maxItems, 1),
-        actualCount);
+    this.maxItemsPerPage_ = Math.max(
+      getNumberMaxOrDefault(maxItems, 1),
+      actualCount
+    );
 
     if (isExperimentOn(this.win, 'amp-live-list-sorting')) {
       this.isReverseOrder_ = this.element.getAttribute('sort') === 'ascending';
@@ -247,8 +249,10 @@ export class AmpLiveList extends AMP.BaseElement {
       item.classList.add(classes.ITEM);
     });
 
-    this.curNumOfLiveItems_ = this.countAndCacheValidItems_(this.itemsSlot_,
-        true /** opt_cacheIds */);
+    this.curNumOfLiveItems_ = this.countAndCacheValidItems_(
+      this.itemsSlot_,
+      true /** opt_cacheIds */
+    );
 
     this.registerDefaultAction(this.updateAction_.bind(this), 'update');
     if (!this.element.hasAttribute('aria-live')) {
@@ -301,8 +305,10 @@ export class AmpLiveList extends AMP.BaseElement {
         this.toggleUpdateButton_(true);
         this.viewport_.updateFixedLayer();
       });
-    } else if (this.pendingItemsReplace_.length > 0 ||
-        this.pendingItemsTombstone_.length > 0) {
+    } else if (
+      this.pendingItemsReplace_.length > 0 ||
+      this.pendingItemsTombstone_.length > 0
+    ) {
       this.updateAction_();
     }
 
@@ -335,7 +341,9 @@ export class AmpLiveList extends AMP.BaseElement {
           child.classList.remove(classes.NEW_ITEM);
         });
         this.curNumOfLiveItems_ += this.insert_(
-            itemsSlot, this.pendingItemsInsert_);
+          itemsSlot,
+          this.pendingItemsInsert_
+        );
         this.pendingItemsInsert_.length = 0;
       }
 
@@ -346,17 +354,24 @@ export class AmpLiveList extends AMP.BaseElement {
 
       if (this.pendingItemsTombstone_.length > 0) {
         this.curNumOfLiveItems_ -= this.tombstone_(
-            itemsSlot, this.pendingItemsTombstone_);
+          itemsSlot,
+          this.pendingItemsTombstone_
+        );
         this.pendingItemsTombstone_.length = 0;
       }
 
       // Only replace the pagination reference point if there are items
       // to insert or tombstone as those are the times it makes sense
       // the pagination section would have changes (item count change)
-      if ((hasInsertItems || hasTombstoneItems) && this.paginationSlot_
-            && this.pendingPagination_) {
-        this.element.replaceChild(this.pendingPagination_,
-            this.paginationSlot_);
+      if (
+        (hasInsertItems || hasTombstoneItems) &&
+        this.paginationSlot_ &&
+        this.pendingPagination_
+      ) {
+        this.element.replaceChild(
+          this.pendingPagination_,
+          this.paginationSlot_
+        );
         this.paginationSlot_ = this.getPaginationSlot_(this.element);
       }
 
@@ -379,9 +394,10 @@ export class AmpLiveList extends AMP.BaseElement {
 
     if (hasInsertItems && !this.element.hasAttribute('disable-scrolling')) {
       promise = promise.then(() => {
-        const elementToScrollTo = this.isReverseOrder_ &&
-          this.itemsSlot_.lastElementChild ?
-          this.itemsSlot_.lastElementChild : this.element;
+        const elementToScrollTo =
+          this.isReverseOrder_ && this.itemsSlot_.lastElementChild
+            ? this.itemsSlot_.lastElementChild
+            : this.element;
         const pos = this.isReverseOrder_ ? 'bottom' : 'top';
         return this.viewport_.animateScrollIntoView(elementToScrollTo, pos);
       });
@@ -426,20 +442,22 @@ export class AmpLiveList extends AMP.BaseElement {
         }
 
         if (this.isReverseOrder_) {
-          for (let child = this.itemsSlot_.lastElementChild; child;
-            child = child.previousElementSibling) {
+          for (
+            let child = this.itemsSlot_.lastElementChild;
+            child;
+            child = child.previousElementSibling
+          ) {
             const childSortTime = this.getSortTime_(child);
             if (!this.isValidTime_(childSortTime)) {
               continue;
             }
 
             if (orphanSortTime >= childSortTime) {
-              this.itemsSlot_.insertBefore(orphan,
-                  child.nextElementSibling);
+              this.itemsSlot_.insertBefore(orphan, child.nextElementSibling);
               count++;
               break;
-            // If we've exhausted the list it should be appended as the first
-            // item.
+              // If we've exhausted the list it should be appended as the first
+              // item.
             } else if (!child.previousElementSibling) {
               this.itemsSlot_.insertBefore(orphan, child);
               count++;
@@ -451,8 +469,11 @@ export class AmpLiveList extends AMP.BaseElement {
             continue;
           }
         } else {
-          for (let child = this.itemsSlot_.firstElementChild; child;
-            child = child.nextElementSibling) {
+          for (
+            let child = this.itemsSlot_.firstElementChild;
+            child;
+            child = child.nextElementSibling
+          ) {
             const childSortTime = this.getSortTime_(child);
             if (!this.isValidTime_(childSortTime)) {
               continue;
@@ -461,8 +482,8 @@ export class AmpLiveList extends AMP.BaseElement {
               this.itemsSlot_.insertBefore(orphan, child);
               count++;
               break;
-            // We've exhausted the children list and the current orphan
-            // can be the last item.
+              // We've exhausted the children list and the current orphan
+              // can be the last item.
             } else if (!child.nextElementSibling) {
               this.itemsSlot_.appendChild(orphan);
               count++;
@@ -491,7 +512,7 @@ export class AmpLiveList extends AMP.BaseElement {
     let count = 0;
     orphans.forEach(orphan => {
       const orphanId = orphan.getAttribute('id');
-      const liveElement = parent./*OK*/querySelector(`#${orphanId}`);
+      const liveElement = parent./*OK*/ querySelector(`#${orphanId}`);
       // Don't bother updating if live element is tombstoned or
       // if we can't find it.
       if (!liveElement) {
@@ -518,7 +539,7 @@ export class AmpLiveList extends AMP.BaseElement {
     let count = 0;
     orphans.forEach(orphan => {
       const orphanId = orphan.getAttribute('id');
-      const liveElement = parent./*OK*/querySelector(`#${orphanId}`);
+      const liveElement = parent./*OK*/ querySelector(`#${orphanId}`);
       if (!liveElement) {
         return;
       }
@@ -550,8 +571,11 @@ export class AmpLiveList extends AMP.BaseElement {
     const actualDeleteItems = [];
 
     if (this.isReverseOrder_) {
-      for (let child = parent.firstElementChild; child;
-        child = child.nextElementSibling) {
+      for (
+        let child = parent.firstElementChild;
+        child;
+        child = child.nextElementSibling
+      ) {
         if (deleteItemsCandidates.length >= numOfItemsToDelete) {
           break;
         }
@@ -563,8 +587,11 @@ export class AmpLiveList extends AMP.BaseElement {
       // Walk through the children from last to first.
       // Only accumulate the items in this loop. Removing them here
       // will break the prev reference.
-      for (let child = parent.lastElementChild; child;
-        child = child.previousElementSibling) {
+      for (
+        let child = parent.lastElementChild;
+        child;
+        child = child.previousElementSibling
+      ) {
         if (deleteItemsCandidates.length >= numOfItemsToDelete) {
           break;
         }
@@ -634,7 +661,9 @@ export class AmpLiveList extends AMP.BaseElement {
     // Order doesn't matter since we do an in place replacement.
     items.forEach(elem => {
       const hasPendingCounterpart = this.hasMatchingPendingElement_(
-          this.pendingItemsReplace_, elem);
+        this.pendingItemsReplace_,
+        elem
+      );
       elem.classList.add('amp-live-list-item');
       if (hasPendingCounterpart == -1) {
         this.pendingItemsReplace_.push(elem);
@@ -694,8 +723,11 @@ export class AmpLiveList extends AMP.BaseElement {
     const replace = [];
     const tombstone = [];
 
-    for (let child = updatedElement.firstElementChild; child;
-      child = child.nextElementSibling) {
+    for (
+      let child = updatedElement.firstElementChild;
+      child;
+      child = child.nextElementSibling
+    ) {
       const id = child.getAttribute('id');
       const sortTime = this.getSortTime_(child);
       // An item might not have sort time when a custom slot is used
@@ -717,7 +749,7 @@ export class AmpLiveList extends AMP.BaseElement {
           this.updateTime_ = updateTime;
         }
         replace.push(orphan);
-      // To prevent multiple tombstoning of an item we mark it with a -1.
+        // To prevent multiple tombstoning of an item we mark it with a -1.
       } else if (this.isChildTombstone_(child) && this.knownItems_[id] != -1) {
         this.knownItems_[id] = -1;
         tombstone.push(child);
@@ -767,8 +799,11 @@ export class AmpLiveList extends AMP.BaseElement {
     const updateTime = this.getUpdateTime_(elem);
     // Known items with -1 value are previously tombstoned items which
     // means they can no longer be updated.
-    return id in this.knownItems_ && this.knownItems_[id] != -1 &&
-        updateTime > this.knownItems_[id];
+    return (
+      id in this.knownItems_ &&
+      this.knownItems_[id] != -1 &&
+      updateTime > this.knownItems_[id]
+    );
   }
 
   /**
@@ -806,8 +841,9 @@ export class AmpLiveList extends AMP.BaseElement {
    * @private
    */
   isValidChild_(child) {
-    return !!child.hasAttribute('id') &&
-      this.isValidTime_(this.getSortTime_(child));
+    return (
+      !!child.hasAttribute('id') && this.isValidTime_(this.getSortTime_(child))
+    );
   }
 
   /**
@@ -844,8 +880,11 @@ export class AmpLiveList extends AMP.BaseElement {
    * @private
    */
   eachChildElement_(parent, cb) {
-    for (let child = parent.firstElementChild; child;
-      child = child.nextElementSibling) {
+    for (
+      let child = parent.firstElementChild;
+      child;
+      child = child.nextElementSibling
+    ) {
       cb(child);
     }
   }
@@ -966,8 +1005,10 @@ export class AmpLiveList extends AMP.BaseElement {
       return this.viewport_.getLayoutRect(element).top > 0;
     }
 
-    return this.viewport_.getLayoutRect(element).top >
-        this.viewport_.getScrollTop() + this.viewport_.getSize().height;
+    return (
+      this.viewport_.getLayoutRect(element).top >
+      this.viewport_.getScrollTop() + this.viewport_.getSize().height
+    );
   }
 
   /**
@@ -977,8 +1018,10 @@ export class AmpLiveList extends AMP.BaseElement {
    * @return {boolean}
    */
   isElementAboveViewport_(element) {
-    return this.viewport_.getLayoutRect(element).bottom <
-        this.viewport_.getScrollTop();
+    return (
+      this.viewport_.getLayoutRect(element).bottom <
+      this.viewport_.getScrollTop()
+    );
   }
 
   /** @override */
@@ -996,7 +1039,6 @@ export class AmpLiveList extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-live-list', '0.1', function(AMP) {
   AMP.registerElement('amp-live-list', AmpLiveList, CSS);
 });
diff --git a/extensions/amp-live-list/0.1/live-list-manager.js b/extensions/amp-live-list/0.1/live-list-manager.js
index fe02a873142b..b13d41aa5453 100644
--- a/extensions/amp-live-list/0.1/live-list-manager.js
+++ b/extensions/amp-live-list/0.1/live-list-manager.js
@@ -45,7 +45,6 @@ export const AMP_LIVE_LIST_CUSTOM_SLOT_ID = 'AMP_LIVE_LIST_CUSTOM_SLOT_ID';
  * @implements {../../../src/service.Disposable}
  */
 export class LiveListManager {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -89,18 +88,20 @@ export class LiveListManager {
       // then make sure to stop polling if viewer is not visible.
       this.interval_ = Math.min.apply(Math, this.intervals_);
 
-      const initialUpdateTimes = Object.keys(this.liveLists_)
-          .map(key => this.liveLists_[key].getUpdateTime());
+      const initialUpdateTimes = Object.keys(this.liveLists_).map(key =>
+        this.liveLists_[key].getUpdateTime()
+      );
       this.latestUpdateTime_ = Math.max.apply(Math, initialUpdateTimes);
 
       // For testing purposes only, we speed up the interval of the update.
       // This should NEVER be allowed in production.
       if (getMode().localDev) {
         const path = this.ampdoc.win.location.pathname;
-        if (path.indexOf('/examples/live-list-update.amp.html') != -1 ||
-            path.indexOf('/examples/live-blog.amp.html') != -1 ||
-            path.indexOf(
-                '/examples/live-blog-non-floating-button.amp.html') != -1) {
+        if (
+          path.indexOf('/examples/live-list-update.amp.html') != -1 ||
+          path.indexOf('/examples/live-blog.amp.html') != -1 ||
+          path.indexOf('/examples/live-blog-non-floating-button.amp.html') != -1
+        ) {
           this.interval_ = 5000;
         }
       }
@@ -140,8 +141,11 @@ export class LiveListManager {
   fetchDocument_() {
     let url = this.url_;
     if (this.latestUpdateTime_ > 0) {
-      url = addParamToUrl(url, 'amp_latest_update_time',
-          String(this.latestUpdateTime_));
+      url = addParamToUrl(
+        url,
+        'amp_latest_update_time',
+        String(this.latestUpdateTime_)
+      );
     }
 
     if (this.isTransformed_) {
@@ -164,8 +168,9 @@ export class LiveListManager {
    */
   updateLiveLists_(doc) {
     this.installExtensionsForDoc_(doc);
-    const allLiveLists =
-      this.getLiveLists_(doc).concat(this.getCustomSlots_(doc));
+    const allLiveLists = this.getLiveLists_(doc).concat(
+      this.getCustomSlots_(doc)
+    );
     const updateTimes = allLiveLists.map(this.updateLiveList_.bind(this));
 
     const latestUpdateTime = Math.max.apply(Math, [0].concat(updateTimes));
@@ -188,7 +193,8 @@ export class LiveListManager {
    */
   getLiveLists_(doc) {
     return Array.prototype.slice.call(
-        doc.getElementsByTagName('amp-live-list'));
+      doc.getElementsByTagName('amp-live-list')
+    );
   }
 
   /**
@@ -202,11 +208,13 @@ export class LiveListManager {
    */
   getCustomSlots_(doc) {
     const liveListsWithCustomSlots = Object.keys(this.liveLists_).filter(id =>
-      this.liveLists_[id].hasCustomSlot());
+      this.liveLists_[id].hasCustomSlot()
+    );
 
     return liveListsWithCustomSlots.map(id => {
-      const customSlotId =
-        this.liveLists_[id].element[AMP_LIVE_LIST_CUSTOM_SLOT_ID];
+      const customSlotId = this.liveLists_[id].element[
+        AMP_LIVE_LIST_CUSTOM_SLOT_ID
+      ];
       return doc.getElementById(customSlotId);
     });
   }
@@ -220,12 +228,15 @@ export class LiveListManager {
   updateLiveList_(liveList) {
     // amp-live-list elements can be appended dynamically by another
     // component using the [dynamic-live-list] attribute.
-    const id = liveList.hasAttribute('dynamic-live-list') ?
-      liveList.getAttribute('dynamic-live-list') :
-      liveList.getAttribute('id');
+    const id = liveList.hasAttribute('dynamic-live-list')
+      ? liveList.getAttribute('dynamic-live-list')
+      : liveList.getAttribute('id');
     userAssert(id, 'amp-live-list must have an id.');
-    userAssert(id in this.liveLists_,
-        'amp-live-list#%s found but did not exist on original page load.', id);
+    userAssert(
+      id in this.liveLists_,
+      'amp-live-list#%s found but did not exist on original page load.',
+      id
+    );
 
     const inClientDomLiveList = this.liveLists_[id];
     inClientDomLiveList.toggle(!liveList.hasAttribute('disabled'));
@@ -280,11 +291,13 @@ export class LiveListManager {
    * @param {!Document} doc
    */
   installExtensionsForDoc_(doc) {
-    const extensions = toArray(doc
-        .querySelectorAll('script[custom-element], script[custom-template]'));
+    const extensions = toArray(
+      doc.querySelectorAll('script[custom-element], script[custom-template]')
+    );
     extensions.forEach(script => {
-      const extensionName = script.getAttribute('custom-element') ||
-          script.getAttribute('custom-template');
+      const extensionName =
+        script.getAttribute('custom-element') ||
+        script.getAttribute('custom-template');
       // This is a cheap operation if extension is already installed so no need
       // to over optimize checks.
       this.extensions_.installExtensionForDoc(this.ampdoc, extensionName);
@@ -331,10 +344,11 @@ function isDocTransformed(root) {
  */
 function installLiveListManager(ampdoc) {
   registerServiceBuilderForDoc(
-      ampdoc,
-      SERVICE_ID,
-      LiveListManager,
-      /* instantiate */ true);
+    ampdoc,
+    SERVICE_ID,
+    LiveListManager,
+    /* instantiate */ true
+  );
 }
 
 /**
diff --git a/extensions/amp-live-list/0.1/poller.js b/extensions/amp-live-list/0.1/poller.js
index bbb20d2c4380..c245aa97fa2b 100644
--- a/extensions/amp-live-list/0.1/poller.js
+++ b/extensions/amp-live-list/0.1/poller.js
@@ -14,17 +14,16 @@
  * limitations under the License.
  */
 
-
 import {Services} from '../../../src/services';
-import {exponentialBackoffClock, getJitter}
-  from '../../../src/exponential-backoff';
-
+import {
+  exponentialBackoffClock,
+  getJitter,
+} from '../../../src/exponential-backoff';
 
 /**
  * Poller with backoff functionality.
  */
 export class Poller {
-
   /**
    * Creates an instance of Poller.
    * @param {!Window} win
@@ -127,28 +126,31 @@ export class Poller {
 
     const work = () => {
       this.lastWorkPromise_ = this.work_()
-          .then(() => {
-            if (this.backoffClock_) {
-              this.backoffClock_ = null;
+        .then(() => {
+          if (this.backoffClock_) {
+            this.backoffClock_ = null;
+          }
+          this.poll_();
+        })
+        .catch(err => {
+          if (err.retriable) {
+            if (!this.backoffClock_) {
+              this.backoffClock_ = exponentialBackoffClock();
             }
             this.poll_();
-          }).catch(err => {
-            if (err.retriable) {
-              if (!this.backoffClock_) {
-                this.backoffClock_ = exponentialBackoffClock();
-              }
-              this.poll_();
-            } else {
-              throw err;
-            }
-          });
+          } else {
+            throw err;
+          }
+        });
     };
 
     if (opt_immediate) {
       work();
     } else {
-      this.lastTimeoutId_ =
-          Services.timerFor(this.win).delay(work, this.getTimeout_());
+      this.lastTimeoutId_ = Services.timerFor(this.win).delay(
+        work,
+        this.getTimeout_()
+      );
     }
   }
 }
diff --git a/extensions/amp-live-list/0.1/test/test-amp-live-list.js b/extensions/amp-live-list/0.1/test/test-amp-live-list.js
index ee6f6d6d1d1f..5036834c3d51 100644
--- a/extensions/amp-live-list/0.1/test/test-amp-live-list.js
+++ b/extensions/amp-live-list/0.1/test/test-amp-live-list.js
@@ -20,280 +20,593 @@ import {AmpLiveList, getNumberMaxOrDefault} from '../amp-live-list';
 import {LiveListManager} from '../live-list-manager';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
-describes.realWin('amp-live-list', {
-  amp: {
-    extensions: ['amp-live-list'],
+describes.realWin(
+  'amp-live-list',
+  {
+    amp: {
+      extensions: ['amp-live-list'],
+    },
   },
-}, function(env) {
-  let win;
-  let sandbox;
-  let ampdoc;
-  let liveList;
-  let elem;
-  let dftAttrs;
-  let itemsSlot;
-
-  beforeEach(() => {
-    win = env.win;
-    sandbox = sinon.sandbox;
-    ampdoc = new AmpDocSingle(win);
-    elem = document.createElement('amp-live-list');
-    elem.getAmpDoc = () => ampdoc;
-    const updateSlot = document.createElement('button');
-    itemsSlot = document.createElement('div');
-    updateSlot.setAttribute('update', '');
-    itemsSlot.setAttribute('items', '');
-    elem.appendChild(updateSlot);
-    elem.appendChild(itemsSlot);
-    dftAttrs = {
-      'id': 'my-list',
-      'data-poll-interval': 2000,
-      'data-max-items-per-page': 5,
-      'data-sort-time': Date.now(),
-    };
-  });
-
-  afterEach(() => {
-    sandbox.restore();
-  });
-
-  function buildElement(elem, attrs) {
-    for (const key in attrs) {
-      elem.setAttribute(key, attrs[key]);
-    }
-    liveList = new AmpLiveList(elem);
-    liveList.getVsync = () => {
-      return {
-        mutate(cb) { cb(); },
-        measure(cb) { cb(); },
-        runPromise(task, state = {}) {
-          if (task.measure) {
-            task.measure(state);
-          }
-          if (task.mutate) {
-            task.mutate(state);
-          }
-          return Promise.resolve();
-        },
+  function(env) {
+    let win;
+    let sandbox;
+    let ampdoc;
+    let liveList;
+    let elem;
+    let dftAttrs;
+    let itemsSlot;
+
+    beforeEach(() => {
+      win = env.win;
+      sandbox = sinon.sandbox;
+      ampdoc = new AmpDocSingle(win);
+      elem = document.createElement('amp-live-list');
+      elem.getAmpDoc = () => ampdoc;
+      const updateSlot = document.createElement('button');
+      itemsSlot = document.createElement('div');
+      updateSlot.setAttribute('update', '');
+      itemsSlot.setAttribute('items', '');
+      elem.appendChild(updateSlot);
+      elem.appendChild(itemsSlot);
+      dftAttrs = {
+        'id': 'my-list',
+        'data-poll-interval': 2000,
+        'data-max-items-per-page': 5,
+        'data-sort-time': Date.now(),
       };
-    };
-    liveList.mutateElement = (cb, opt_el) => {
-      return Promise.resolve().then(() => {
-        cb();
-      });
-    };
-    return elem;
-  }
+    });
 
-  /**
-   * @param {!Array<number>} childAttrs
-   * @param {!Element=} opt_pagination
-   * @return {!Element<!Element>}
-   */
-  function createFromServer(childAttrs = [], opt_pagination) {
-    const parent = document.createElement('div');
-    const itemsCont = document.createElement('div');
-    itemsCont.setAttribute('items', '');
-    parent.appendChild(itemsCont);
-    for (let i = 0; i < childAttrs.length; i++) {
-      const childAttr = childAttrs[i];
-      const child = document.createElement('div');
-      child.setAttribute('id', `${childAttr.id}`);
-      child.setAttribute('data-sort-time',
-          `${childAttr.sortTime || Date.now()}`);
-      if ('updateTime' in childAttr) {
-        child.setAttribute('data-update-time', `${childAttr.updateTime}`);
-      }
-      if ('tombstone' in childAttr) {
-        child.setAttribute('data-tombstone', '');
+    afterEach(() => {
+      sandbox.restore();
+    });
+
+    function buildElement(elem, attrs) {
+      for (const key in attrs) {
+        elem.setAttribute(key, attrs[key]);
       }
-      itemsCont.appendChild(child);
+      liveList = new AmpLiveList(elem);
+      liveList.getVsync = () => {
+        return {
+          mutate(cb) {
+            cb();
+          },
+          measure(cb) {
+            cb();
+          },
+          runPromise(task, state = {}) {
+            if (task.measure) {
+              task.measure(state);
+            }
+            if (task.mutate) {
+              task.mutate(state);
+            }
+            return Promise.resolve();
+          },
+        };
+      };
+      liveList.mutateElement = (cb, opt_el) => {
+        return Promise.resolve().then(() => {
+          cb();
+        });
+      };
+      return elem;
     }
-    if (opt_pagination) {
-      opt_pagination.setAttribute('pagination', '');
-      parent.appendChild(opt_pagination);
+
+    /**
+     * @param {!Array<number>} childAttrs
+     * @param {!Element=} opt_pagination
+     * @return {!Element<!Element>}
+     */
+    function createFromServer(childAttrs = [], opt_pagination) {
+      const parent = document.createElement('div');
+      const itemsCont = document.createElement('div');
+      itemsCont.setAttribute('items', '');
+      parent.appendChild(itemsCont);
+      for (let i = 0; i < childAttrs.length; i++) {
+        const childAttr = childAttrs[i];
+        const child = document.createElement('div');
+        child.setAttribute('id', `${childAttr.id}`);
+        child.setAttribute(
+          'data-sort-time',
+          `${childAttr.sortTime || Date.now()}`
+        );
+        if ('updateTime' in childAttr) {
+          child.setAttribute('data-update-time', `${childAttr.updateTime}`);
+        }
+        if ('tombstone' in childAttr) {
+          child.setAttribute('data-tombstone', '');
+        }
+        itemsCont.appendChild(child);
+      }
+      if (opt_pagination) {
+        opt_pagination.setAttribute('pagination', '');
+        parent.appendChild(opt_pagination);
+      }
+      return parent;
     }
-    return parent;
-  }
 
-  it('validates that elem has an id on initial load', () => {
-    buildElement(elem, {});
-    allowConsoleError(() => { expect(() => {
-      liveList.buildCallback();
-    }).to.throw(/must have an id/); });
+    it('validates that elem has an id on initial load', () => {
+      buildElement(elem, {});
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have an id/);
+      });
 
-    expect(() => {
-      liveList.element.setAttribute('id', 'my-list');
+      expect(() => {
+        liveList.element.setAttribute('id', 'my-list');
+        liveList.buildCallback();
+      }).to.not.throw(/must have an id/);
+    });
+
+    it('validates its items slot on initial load', () => {
+      const child = document.createElement('div');
+      elem.querySelector('[items]').appendChild(child);
+      buildElement(elem, dftAttrs);
+      const stub = sandbox.stub(liveList, 'countAndCacheValidItems_');
+      expect(stub).to.have.not.been.called;
       liveList.buildCallback();
-    }).to.not.throw(/must have an id/);
-  });
-
-  it('validates its items slot on initial load', () => {
-    const child = document.createElement('div');
-    elem.querySelector('[items]').appendChild(child);
-    buildElement(elem, dftAttrs);
-    const stub = sandbox.stub(liveList, 'countAndCacheValidItems_');
-    expect(stub).to.have.not.been.called;
-    liveList.buildCallback();
-    expect(stub).to.be.calledOnce;
-  });
-
-  it('only counts number of valid children', () => {
-    const child = document.createElement('div');
-    child.setAttribute('id', 'child-id');
-    child.setAttribute('data-sort-time', Date.now());
-    elem.querySelector('[items]').appendChild(child);
-
-    const invalidChild = document.createElement('div');
-    elem.querySelector('[items]').appendChild(invalidChild);
-
-    buildElement(elem, dftAttrs);
-    const spy = sandbox.spy(liveList, 'countAndCacheValidItems_');
-    liveList.buildCallback();
-    expect(spy).to.have.returned(1);
-  });
-
-  it('validates correctly', () => {
-    const child = document.createElement('div');
-    elem.querySelector('[items]').appendChild(child);
-    buildElement(elem, dftAttrs);
-
-    expect(() => {
+      expect(stub).to.be.calledOnce;
+    });
+
+    it('only counts number of valid children', () => {
+      const child = document.createElement('div');
       child.setAttribute('id', 'child-id');
-      liveList.buildCallback();
-    }).to.not.throw();
-  });
-
-  it('has a minimum interval', () => {
-    let attrs = Object.assign({}, dftAttrs, {'data-poll-interval': 17000});
-    buildElement(elem, attrs);
-    liveList.buildCallback();
-    expect(liveList.element.getAttribute('data-poll-interval'))
-        .to.equal('17000');
-    expect(liveList.getInterval())
-        .to.equal(17000);
-
-    attrs = Object.assign({}, dftAttrs, {'data-poll-interval': 4000});
-    buildElement(elem, attrs);
-    liveList.buildCallback();
-    expect(liveList.element.getAttribute('data-poll-interval'))
-        .to.equal('4000');
-    expect(liveList.getInterval())
-        .to.equal(LiveListManager.getMinDataPollInterval());
-  });
-
-  it('should enforce max-items-per-page', () => {
-    let attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': ''});
-    buildElement(elem, attrs);
-    // Errors out because no data-max-items-per-page is given
-    expect(liveList.element.getAttribute('data-max-items-per-page'))
-        .to.equal('');
-    allowConsoleError(() => { expect(() => {
-      liveList.buildCallback();
-    }).to.throw(/must have data-max-items-per-page/); });
-
-    // Errors out because data-max-items-per-page does not exist
-    attrs = Object.assign({}, dftAttrs);
-    expect('data-max-items-per-page' in attrs).to.be.true;
-    delete attrs['data-max-items-per-page'];
-    expect('data-max-items-per-page' in attrs).to.be.false;
-    buildElement(elem, attrs);
-    allowConsoleError(() => { expect(() => {
-      liveList.buildCallback();
-    }).to.throw(/must have data-max-items-per-page/); });
-
-    // Errors out because data-max-items-per-page is not parseable as a number
-    attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': 'hello'});
-    buildElement(elem, attrs);
-    expect(liveList.element.getAttribute('data-max-items-per-page'))
-        .to.equal('hello');
-    allowConsoleError(() => { expect(() => {
-      liveList.buildCallback();
-    }).to.throw(/must have data-max-items-per-page/); });
+      child.setAttribute('data-sort-time', Date.now());
+      elem.querySelector('[items]').appendChild(child);
+
+      const invalidChild = document.createElement('div');
+      elem.querySelector('[items]').appendChild(invalidChild);
 
-    attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': '10'});
-    buildElement(elem, attrs);
-    expect(liveList.element.getAttribute('data-max-items-per-page'))
-        .to.equal('10');
-    expect(() => {
+      buildElement(elem, dftAttrs);
+      const spy = sandbox.spy(liveList, 'countAndCacheValidItems_');
       liveList.buildCallback();
-      expect(liveList.maxItemsPerPage_).to.equal(10);
-    }).to.not.throw(/must have data-max-items-per-page/);
-  });
+      expect(spy).to.have.returned(1);
+    });
 
-  it('should use actual initial items count instead of ' +
-     'data-max-items-per-page if greater', () => {
-    for (let i = 0; i < 20; i++) {
+    it('validates correctly', () => {
       const child = document.createElement('div');
-      child.setAttribute('data-sort-time', Date.now());
-      child.setAttribute('id', i);
-      if (i == 15) {
-        child.setAttribute('data-tombstone', '');
-      }
-      itemsSlot.appendChild(child);
-    }
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-    expect(liveList.maxItemsPerPage_)
-        .to.not.equal(LiveListManager.getMinDataMaxItemsPerPage());
-    expect(liveList.maxItemsPerPage_)
-        .to.equal(19);
-  });
-
-  it('should enforce update slot', () => {
-    buildElement(elem, dftAttrs);
-    elem.removeChild(elem.querySelector('[update]'));
-    allowConsoleError(() => { expect(() => {
+      elem.querySelector('[items]').appendChild(child);
+      buildElement(elem, dftAttrs);
+
+      expect(() => {
+        child.setAttribute('id', 'child-id');
+        liveList.buildCallback();
+      }).to.not.throw();
+    });
+
+    it('has a minimum interval', () => {
+      let attrs = Object.assign({}, dftAttrs, {'data-poll-interval': 17000});
+      buildElement(elem, attrs);
       liveList.buildCallback();
-    }).to.throw(/must have an "update" slot/); });
-  });
+      expect(liveList.element.getAttribute('data-poll-interval')).to.equal(
+        '17000'
+      );
+      expect(liveList.getInterval()).to.equal(17000);
 
-  it('should enforce items slot', () => {
-    buildElement(elem, dftAttrs);
-    elem.removeChild(elem.querySelector('[items]'));
-    allowConsoleError(() => { expect(() => {
+      attrs = Object.assign({}, dftAttrs, {'data-poll-interval': 4000});
+      buildElement(elem, attrs);
       liveList.buildCallback();
-    }).to.throw(/must have an "items" slot/); });
-  });
-
-  it('should have aria-live=polite by default', () => {
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-    expect(liveList.element.getAttribute('aria-live')).to.equal('polite');
-  });
-
-  it('should use explicitly defined aria-live attribute value', () => {
-    buildElement(elem, {
-      'aria-live': 'assertive',
-      'id': 'my-list',
-      'data-poll-interval': 2000,
-      'data-max-items-per-page': 5,
-      'data-sort-time': Date.now(),
+      expect(liveList.element.getAttribute('data-poll-interval')).to.equal(
+        '4000'
+      );
+      expect(liveList.getInterval()).to.equal(
+        LiveListManager.getMinDataPollInterval()
+      );
     });
-    liveList.buildCallback();
-    expect(liveList.element.getAttribute('aria-live')).to.equal('assertive');
-  });
 
-  describe('#update', () => {
+    it('should enforce max-items-per-page', () => {
+      let attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': ''});
+      buildElement(elem, attrs);
+      // Errors out because no data-max-items-per-page is given
+      expect(liveList.element.getAttribute('data-max-items-per-page')).to.equal(
+        ''
+      );
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have data-max-items-per-page/);
+      });
 
-    beforeEach(() => {
+      // Errors out because data-max-items-per-page does not exist
+      attrs = Object.assign({}, dftAttrs);
+      expect('data-max-items-per-page' in attrs).to.be.true;
+      delete attrs['data-max-items-per-page'];
+      expect('data-max-items-per-page' in attrs).to.be.false;
+      buildElement(elem, attrs);
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have data-max-items-per-page/);
+      });
+
+      // Errors out because data-max-items-per-page is not parseable as a number
+      attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': 'hello'});
+      buildElement(elem, attrs);
+      expect(liveList.element.getAttribute('data-max-items-per-page')).to.equal(
+        'hello'
+      );
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have data-max-items-per-page/);
+      });
+
+      attrs = Object.assign({}, dftAttrs, {'data-max-items-per-page': '10'});
+      buildElement(elem, attrs);
+      expect(liveList.element.getAttribute('data-max-items-per-page')).to.equal(
+        '10'
+      );
+      expect(() => {
+        liveList.buildCallback();
+        expect(liveList.maxItemsPerPage_).to.equal(10);
+      }).to.not.throw(/must have data-max-items-per-page/);
+    });
+
+    it(
+      'should use actual initial items count instead of ' +
+        'data-max-items-per-page if greater',
+      () => {
+        for (let i = 0; i < 20; i++) {
+          const child = document.createElement('div');
+          child.setAttribute('data-sort-time', Date.now());
+          child.setAttribute('id', i);
+          if (i == 15) {
+            child.setAttribute('data-tombstone', '');
+          }
+          itemsSlot.appendChild(child);
+        }
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        expect(liveList.maxItemsPerPage_).to.not.equal(
+          LiveListManager.getMinDataMaxItemsPerPage()
+        );
+        expect(liveList.maxItemsPerPage_).to.equal(19);
+      }
+    );
+
+    it('should enforce update slot', () => {
       buildElement(elem, dftAttrs);
-      liveList.buildCallback();
+      elem.removeChild(elem.querySelector('[update]'));
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have an "update" slot/);
+      });
+    });
+
+    it('should enforce items slot', () => {
+      buildElement(elem, dftAttrs);
+      elem.removeChild(elem.querySelector('[items]'));
+      allowConsoleError(() => {
+        expect(() => {
+          liveList.buildCallback();
+        }).to.throw(/must have an "items" slot/);
+      });
     });
 
-    it('sends amp-dom-update event on new items', () => {
+    it('should have aria-live=polite by default', () => {
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
-      const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
-      const fromServer1 = createFromServer([{id: 'id0'}]);
-      liveList.update(fromServer1);
-      return liveList.updateAction_().then(() => {
-        expect(spy).to.have.been.calledOnce;
+      expect(liveList.element.getAttribute('aria-live')).to.equal('polite');
+    });
+
+    it('should use explicitly defined aria-live attribute value', () => {
+      buildElement(elem, {
+        'aria-live': 'assertive',
+        'id': 'my-list',
+        'data-poll-interval': 2000,
+        'data-max-items-per-page': 5,
+        'data-sort-time': Date.now(),
       });
+      liveList.buildCallback();
+      expect(liveList.element.getAttribute('aria-live')).to.equal('assertive');
     });
 
-    it('sends amp-dom-update event on replace items', () => {
+    describe('#update', () => {
+      beforeEach(() => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+      });
+
+      it('sends amp-dom-update event on new items', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        return liveList.updateAction_().then(() => {
+          expect(spy).to.have.been.calledOnce;
+        });
+      });
+
+      it('sends amp-dom-update event on replace items', () => {
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'id1');
+        child2.setAttribute('id', 'id2');
+        child1.setAttribute('data-sort-time', '123');
+        child2.setAttribute('data-sort-time', '124');
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        const fromServer1 = createFromServer([{id: 'id1', updateTime: 125}]);
+        const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
+        // We stub and restore to not trigger `update` calling `updateAction_`.
+        const stub = sinon./*OK*/ stub(liveList, 'updateAction_');
+        liveList.update(fromServer1);
+        stub./*OK*/ restore();
+        return liveList.updateAction_().then(() => {
+          expect(spy).to.have.been.calledOnce;
+        });
+      });
+
+      it('sends amp-dom-update event on tombstone items', () => {
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'id1');
+        child2.setAttribute('id', 'id2');
+        child1.setAttribute('data-sort-time', '123');
+        child2.setAttribute('data-sort-time', '124');
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        const fromServer1 = createFromServer([{id: 'id1', tombstone: null}]);
+        const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
+        // We stub and restore to not trigger `update` calling `updateAction_`.
+        const stub = sinon./*OK*/ stub(liveList, 'updateAction_');
+        liveList.update(fromServer1);
+        stub./*OK*/ restore();
+        return liveList.updateAction_().then(() => {
+          expect(spy).to.not.have.been.called;
+        });
+      });
+
+      it('dispatches "amp:template-rendered" event after render', () => {
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'id1');
+        child2.setAttribute('id', 'id2');
+        child1.setAttribute('data-sort-time', '123');
+        child2.setAttribute('data-sort-time', '124');
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        const fromServer1 = createFromServer([{id: 'id1', updateTime: 125}]);
+        const spy = sandbox.spy(liveList.itemsSlot_, 'dispatchEvent');
+        // We stub and restore to not trigger `update` calling `updateAction_`.
+        const stub = sinon./*OK*/ stub(liveList, 'updateAction_');
+        liveList.update(fromServer1);
+        stub./*OK*/ restore();
+        return liveList.updateAction_().then(() => {
+          expect(spy).to.have.been.calledOnce;
+          expect(spy).calledWithMatch({
+            type: AmpEvents.DOM_UPDATE,
+            bubbles: true,
+          });
+        });
+      });
+
+      it('validates children during update', () => {
+        const update = document.createElement('div');
+        const updateLiveListItems = document.createElement('div');
+        updateLiveListItems.setAttribute('items', '');
+        update.appendChild(updateLiveListItems);
+        updateLiveListItems.appendChild(document.createElement('div'));
+        const stub = sandbox.stub(liveList, 'countAndCacheValidItems_');
+        expect(stub).to.have.not.been.called;
+        liveList.update(update);
+        expect(stub).to.be.calledOnce;
+      });
+
+      it('should call updateFixedLayer on update with inserts', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        const spy = sandbox.spy(liveList.viewport_, 'updateFixedLayer');
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        expect(spy).to.have.not.been.called;
+        liveList.update(fromServer1);
+        return Promise.resolve().then(() => {
+          expect(spy).to.have.been.calledOnce;
+        });
+      });
+
+      it('no items slot on update should be a no op update', () => {
+        const update = document.createElement('div');
+        expect(() => {
+          liveList.update(update);
+        }).to.not.throw();
+      });
+
+      it('discovers children to insert when they have newly discovered ids', () => {
+        buildElement(elem, dftAttrs);
+
+        const child = document.createElement('div');
+        child.setAttribute('id', 'id0');
+        child.setAttribute('data-sort-time', '12345');
+        itemsSlot.appendChild(child);
+
+        liveList.buildCallback();
+        expect(liveList.itemsSlot_.childElementCount).to.equal(1);
+
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        expect(liveList.pendingItemsInsert_).to.have.length(0);
+
+        const fromServer2 = createFromServer([
+          {id: 'id0'},
+          {id: 'id1'},
+          {id: 'id2'},
+        ]);
+        const fromServer2ItemsCont = fromServer2.querySelector('[items]');
+        expect(fromServer2ItemsCont.childElementCount).to.equal(3);
+        expect(liveList.pendingItemsInsert_).to.have.length(0);
+        liveList.update(fromServer2);
+        expect(liveList.pendingItemsInsert_).to.have.length(2);
+      });
+
+      it('should wait for user interaction before inserting', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        expect(liveList.pendingItemsInsert_).to.have.length(1);
+        return liveList.updateAction_().then(() => {
+          expect(liveList.pendingItemsInsert_).to.have.length(0);
+          expect(liveList.itemsSlot_.childElementCount).to.equal(1);
+        });
+      });
+
+      // TODO(erwinm): remove the skip when we support scroll repositioning
+      // correctly with components that can ask for a resize like
+      // amp-twitter for example.
+      it.skip('should insert w/o user interaction', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+
+        const fromServer1 = createFromServer();
+        liveList.update(fromServer1);
+        expect(liveList.insertFragment_.childElementCount).to.equal(0);
+        expect(liveList.itemsSlot_.childElementCount).to.equal(1);
+      });
+
+      it('should add amp-live-list-item-new class for newly inserted items', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        return liveList.updateAction_().then(() => {
+          expect(liveList.itemsSlot_.firstElementChild).to.have.class(
+            'amp-live-list-item-new'
+          );
+        });
+      });
+
+      it('should remove amp-live-list-item-new when no longer latest items', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        return liveList.updateAction_().then(() => {
+          expect(liveList.itemsSlot_.lastElementChild).to.have.class(
+            'amp-live-list-item-new'
+          );
+          expect(liveList.itemsSlot_.childElementCount).to.equal(1);
+
+          const fromServer2 = createFromServer([{id: 'id1'}]);
+          liveList.update(fromServer2);
+          return liveList.updateAction_().then(() => {
+            expect(liveList.itemsSlot_.childElementCount).to.equal(2);
+            expect(liveList.itemsSlot_.lastElementChild).to.not.have.class(
+              'amp-live-list-item-new'
+            );
+          });
+        });
+      });
+
+      it('should always add amp-live-list-item class to children', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        return liveList.updateAction_().then(() => {
+          expect(liveList.itemsSlot_.lastElementChild).to.have.class(
+            'amp-live-list-item'
+          );
+
+          const fromServer2 = createFromServer([{id: 'id1'}]);
+          liveList.update(fromServer2);
+          return liveList.updateAction_().then(() => {
+            expect(liveList.itemsSlot_.childElementCount).to.equal(2);
+            expect(liveList.itemsSlot_.lastElementChild).to.have.class(
+              'amp-live-list-item'
+            );
+          });
+        });
+      });
+
+      it('should display update indicator', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+        expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
+
+        const fromServer1 = createFromServer([{id: 'id0'}]);
+        liveList.update(fromServer1);
+        expect(liveList.pendingItemsInsert_).to.have.length(1);
+        return Promise.resolve()
+          .then(() => {
+            expect(liveList.updateSlot_).to.not.have.class('amp-hidden');
+
+            return liveList.updateAction_(fromServer1);
+          })
+          .then(() => {
+            expect(liveList.updateSlot_).to.have.class('amp-hidden');
+          });
+      });
+
+      it('should have correct insertion by using data-sort-time', () => {
+        buildElement(elem, dftAttrs);
+        liveList.buildCallback();
+        expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+        expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
+
+        const oldDate = Date.now();
+
+        const fromServer1 = createFromServer([
+          {id: 'unique-id-num-3', sortTime: oldDate + 1},
+          {id: 'unique-id-num-4', sortTime: oldDate + 2},
+          {id: 'unique-id-num-5', sortTime: oldDate},
+        ]);
+
+        liveList.update(fromServer1);
+
+        // Sort order should be 5, 3, 4
+        expect(liveList.pendingItemsInsert_[0].getAttribute('id')).to.equal(
+          'unique-id-num-5'
+        );
+        expect(liveList.pendingItemsInsert_[1].getAttribute('id')).to.equal(
+          'unique-id-num-3'
+        );
+        expect(liveList.pendingItemsInsert_[2].getAttribute('id')).to.equal(
+          'unique-id-num-4'
+        );
+        return liveList.updateAction_().then(() => {
+          // Insertion order should be 4, 3, 5
+          expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+            'unique-id-num-4'
+          );
+          expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+            'unique-id-num-3'
+          );
+          expect(liveList.itemsSlot_.children[2].getAttribute('id')).to.equal(
+            'unique-id-num-5'
+          );
+          expect(liveList.itemsSlot_.children.length).to.equal(3);
+        });
+      });
+    });
+
+    it('should have the correct "update time"', () => {
       const child1 = document.createElement('div');
       const child2 = document.createElement('div');
       child1.setAttribute('id', 'id1');
@@ -303,22 +616,45 @@ describes.realWin('amp-live-list', {
       itemsSlot.appendChild(child1);
       itemsSlot.appendChild(child2);
       buildElement(elem, dftAttrs);
-      liveList.buildCallback();
+      expect(() => {
+        liveList.buildCallback();
+      }).to.not.throw();
+      expect(liveList.updateTime_).to.equal(124);
 
-      const fromServer1 = createFromServer([
-        {id: 'id1', updateTime: 125},
+      const fromServer1 = createFromServer([{id: 'id1', sortTime: 129}]);
+      // Does not get updated since it is a cached id.
+      expect(liveList.update(fromServer1)).to.equal(124);
+
+      // Find the highest data-sort-time
+      const fromServer2 = createFromServer([
+        {id: 'id3', sortTime: 130},
+        {id: 'id4', sortTime: 133},
       ]);
-      const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
-      // We stub and restore to not trigger `update` calling `updateAction_`.
-      const stub = sinon./*OK*/stub(liveList, 'updateAction_');
-      liveList.update(fromServer1);
-      stub./*OK*/restore();
-      return liveList.updateAction_().then(() => {
-        expect(spy).to.have.been.calledOnce;
-      });
+      expect(liveList.update(fromServer2)).to.equal(133);
+
+      // Find the highest data-update-time
+      const fromServer3 = createFromServer([
+        {id: 'id6', sortTime: 150, updateTime: 200},
+        {id: 'id7', sortTime: 150, updateTime: 180},
+      ]);
+      expect(liveList.update(fromServer3)).to.equal(200);
+
+      // No update is made since data-update-time did not change
+      // and only data-sort-time changed, but its treated
+      // immutable even if the server sent us a new value.
+      const fromServer4 = createFromServer([
+        {id: 'id6', sortTime: 300, updateTime: 200},
+      ]);
+      expect(liveList.update(fromServer4)).to.equal(200);
+
+      // data-update-time is used
+      const fromServer5 = createFromServer([
+        {id: 'id6', sortTime: 300, updateTime: 600},
+      ]);
+      expect(liveList.update(fromServer5)).to.equal(600);
     });
 
-    it('sends amp-dom-update event on tombstone items', () => {
+    it('should be able to accumulate insert items', () => {
       const child1 = document.createElement('div');
       const child2 = document.createElement('div');
       child1.setAttribute('id', 'id1');
@@ -331,19 +667,27 @@ describes.realWin('amp-live-list', {
       liveList.buildCallback();
 
       const fromServer1 = createFromServer([
-        {id: 'id1', tombstone: null},
+        {id: 'id1', updateTime: 125},
+        {id: 'id3'},
       ]);
-      const spy = sandbox.spy(liveList, 'sendAmpDomUpdateEvent_');
-      // We stub and restore to not trigger `update` calling `updateAction_`.
-      const stub = sinon./*OK*/stub(liveList, 'updateAction_');
+
+      const spy = sandbox.spy(liveList, 'updateAction_');
       liveList.update(fromServer1);
-      stub./*OK*/restore();
-      return liveList.updateAction_().then(() => {
-        expect(spy).to.not.have.been.called;
-      });
+
+      expect(liveList.pendingItemsInsert_).to.have.length(1);
+      expect(spy).to.have.not.been.called;
+
+      const fromServer2 = createFromServer([
+        {id: 'id4'},
+        {id: 'id7'},
+        {id: 'id9'},
+      ]);
+      liveList.update(fromServer2);
+      expect(liveList.pendingItemsInsert_).to.have.length(4);
+      expect(spy).to.have.not.been.called;
     });
 
-    it('dispatches "amp:template-rendered" event after render', () => {
+    it('should have pending replace items', () => {
       const child1 = document.createElement('div');
       const child2 = document.createElement('div');
       child1.setAttribute('id', 'id1');
@@ -357,914 +701,335 @@ describes.realWin('amp-live-list', {
 
       const fromServer1 = createFromServer([
         {id: 'id1', updateTime: 125},
+        {id: 'id3'},
       ]);
-      const spy = sandbox.spy(liveList.itemsSlot_, 'dispatchEvent');
-      // We stub and restore to not trigger `update` calling `updateAction_`.
-      const stub = sinon./*OK*/stub(liveList, 'updateAction_');
-      liveList.update(fromServer1);
-      stub./*OK*/restore();
-      return liveList.updateAction_().then(() => {
-        expect(spy).to.have.been.calledOnce;
-        expect(spy).calledWithMatch({
-          type: AmpEvents.DOM_UPDATE,
-          bubbles: true,
-        });
-      });
-    });
 
-    it('validates children during update', () => {
-      const update = document.createElement('div');
-      const updateLiveListItems = document.createElement('div');
-      updateLiveListItems.setAttribute('items', '');
-      update.appendChild(updateLiveListItems);
-      updateLiveListItems.appendChild(document.createElement('div'));
-      const stub = sandbox.stub(liveList, 'countAndCacheValidItems_');
-      expect(stub).to.have.not.been.called;
-      liveList.update(update);
-      expect(stub).to.be.calledOnce;
-    });
-
-    it('should call updateFixedLayer on update with inserts', () => {
-      buildElement(elem, dftAttrs);
-      liveList.buildCallback();
-      const spy = sandbox.spy(liveList.viewport_, 'updateFixedLayer');
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
-      const fromServer1 = createFromServer([{id: 'id0'}]);
-      expect(spy).to.have.not.been.called;
+      const spy = sandbox.spy(liveList, 'updateAction_');
       liveList.update(fromServer1);
-      return Promise.resolve().then(() => {
-        expect(spy).to.have.been.calledOnce;
-      });
-    });
 
-    it('no items slot on update should be a no op update', () => {
-      const update = document.createElement('div');
-      expect(() => {
-        liveList.update(update);
-      }).to.not.throw();
+      expect(liveList.pendingItemsInsert_).to.have.length(1);
+      expect(liveList.pendingItemsReplace_).to.have.length(1);
+      // Should wait for user action until `updateAction_`
+      expect(spy).to.have.not.been.called;
     });
 
-    it('discovers children to insert when they have newly discovered ' +
-       'ids', () => {
+    it('should have pending replace items even w/o new inserts', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
       buildElement(elem, dftAttrs);
-
-      const child = document.createElement('div');
-      child.setAttribute('id', 'id0');
-      child.setAttribute('data-sort-time', '12345');
-      itemsSlot.appendChild(child);
-
       liveList.buildCallback();
-      expect(liveList.itemsSlot_.childElementCount).to.equal(1);
 
-      const fromServer1 = createFromServer([{id: 'id0'}]);
+      const fromServer1 = createFromServer([{id: 'id1', updateTime: 125}]);
+
+      const spy = sandbox.spy(liveList, 'updateAction_');
       liveList.update(fromServer1);
-      expect(liveList.pendingItemsInsert_).to.have.length(0);
 
-      const fromServer2 = createFromServer([
-        {id: 'id0'}, {id: 'id1'}, {id: 'id2'},
-      ]);
-      const fromServer2ItemsCont = fromServer2
-          .querySelector('[items]');
-      expect(fromServer2ItemsCont.childElementCount).to.equal(3);
       expect(liveList.pendingItemsInsert_).to.have.length(0);
-      liveList.update(fromServer2);
-      expect(liveList.pendingItemsInsert_).to.have.length(2);
-    });
-
-    it('should wait for user interaction before inserting', () => {
-      buildElement(elem, dftAttrs);
-      liveList.buildCallback();
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
-      const fromServer1 = createFromServer([{id: 'id0'}]);
-      liveList.update(fromServer1);
-      expect(liveList.pendingItemsInsert_).to.have.length(1);
-      return liveList.updateAction_().then(() => {
-        expect(liveList.pendingItemsInsert_).to.have.length(0);
-        expect(liveList.itemsSlot_.childElementCount).to.equal(1);
-      });
+      expect(liveList.pendingItemsReplace_).to.have.length(1);
+      // If there is no pending items to insert, flush the replace items
+      // right away.
+      expect(spy).to.be.calledOnce;
     });
 
-    // TODO(erwinm): remove the skip when we support scroll repositioning
-    // correctly with components that can ask for a resize like
-    // amp-twitter for example.
-    it.skip('should insert w/o user interaction', () => {
+    it('should always use latest update to replace when in pending state', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
 
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+      const fromServer1 = createFromServer([
+        {id: 'id1', updateTime: 125},
+        {id: 'id3'},
+      ]);
 
-      const fromServer1 = createFromServer();
+      const spy = sandbox.spy(liveList, 'updateAction_');
       liveList.update(fromServer1);
-      expect(liveList.insertFragment_.childElementCount).to.equal(0);
-      expect(liveList.itemsSlot_.childElementCount).to.equal(1);
-    });
 
-    it('should add amp-live-list-item-new class for newly inserted ' +
-       'items', () => {
-      buildElement(elem, dftAttrs);
-      liveList.buildCallback();
+      expect(liveList.pendingItemsReplace_).to.have.length(1);
+      expect(liveList.pendingItemsReplace_[0].getAttribute('id')).to.equal(
+        'id1'
+      );
+      expect(
+        liveList.pendingItemsReplace_[0].getAttribute('data-update-time')
+      ).to.equal('125');
+      // Should wait for user action until `updateAction_`
+      expect(spy).to.have.not.been.called;
 
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+      const fromServer2 = createFromServer([{id: 'id1', updateTime: 127}]);
+      liveList.update(fromServer2);
 
-      const fromServer1 = createFromServer([
-        {id: 'id0'},
-      ]);
-      liveList.update(fromServer1);
-      return liveList.updateAction_().then(() => {
-        expect(liveList.itemsSlot_.firstElementChild)
-            .to.have.class('amp-live-list-item-new');
-      });
+      expect(liveList.pendingItemsReplace_).to.have.length(1);
+      expect(liveList.pendingItemsReplace_[0].getAttribute('id')).to.equal(
+        'id1'
+      );
+      expect(
+        liveList.pendingItemsReplace_[0].getAttribute('data-update-time')
+      ).to.equal('127');
+
+      expect(spy).to.have.not.been.called;
     });
 
-    it('should remove amp-live-list-item-new when no longer latest ' +
-       'items', () => {
+    it('should replace pagination section', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
+      const originalPagination = document.createElement('div');
+      originalPagination.setAttribute('pagination', '');
+      elem.appendChild(originalPagination);
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
 
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+      expect(liveList.paginationSlot_).to.equal(originalPagination);
+      expect(liveList.pendingPagination_).to.equal(null);
 
-      const fromServer1 = createFromServer([{id: 'id0'}]);
+      const newPagination = document.createElement('div');
+      const fromServer1 = createFromServer(
+        [
+          {id: 'id1', tombstone: null},
+          {id: 'id3'},
+          {id: 'id2', tombstone: null},
+        ],
+        newPagination
+      );
       liveList.update(fromServer1);
+
+      expect(liveList.pendingPagination_).to.equal(newPagination);
+      expect(liveList.paginationSlot_).to.equal(originalPagination);
+
       return liveList.updateAction_().then(() => {
-        expect(liveList.itemsSlot_.lastElementChild)
-            .to.have.class('amp-live-list-item-new');
-        expect(liveList.itemsSlot_.childElementCount).to.equal(1);
+        expect(liveList.pendingPagination_).to.equal(null);
+        expect(liveList.paginationSlot_).to.equal(newPagination);
 
-        const fromServer2 = createFromServer([{id: 'id1'}]);
+        const newPagination2 = document.createElement('div');
+        const fromServer2 = createFromServer([{id: 'id6'}], newPagination2);
         liveList.update(fromServer2);
+
+        expect(liveList.pendingPagination_).to.equal(newPagination2);
+        expect(liveList.paginationSlot_).to.equal(newPagination);
         return liveList.updateAction_().then(() => {
-          expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-          expect(liveList.itemsSlot_.lastElementChild)
-              .to.not.have.class('amp-live-list-item-new');
+          expect(liveList.pendingPagination_).to.equal(null);
+          expect(liveList.paginationSlot_).to.equal(newPagination2);
         });
       });
     });
 
-    it('should always add amp-live-list-item class to children', () => {
+    it('should not replace pagination if only no insert or tombstone', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
+      const originalPagination = document.createElement('div');
+      originalPagination.setAttribute('pagination', '');
+      elem.appendChild(originalPagination);
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
 
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
+      expect(liveList.paginationSlot_).to.equal(originalPagination);
+      expect(liveList.pendingPagination_).to.equal(null);
 
-      const fromServer1 = createFromServer([{id: 'id0'}]);
+      const newPagination = document.createElement('div');
+      const fromServer1 = createFromServer(
+        [{id: 'id1', updateTime: 999}],
+        newPagination
+      );
       liveList.update(fromServer1);
-      return liveList.updateAction_().then(() => {
-        expect(liveList.itemsSlot_.lastElementChild)
-            .to.have.class('amp-live-list-item');
 
-        const fromServer2 = createFromServer([{id: 'id1'}]);
-        liveList.update(fromServer2);
-        return liveList.updateAction_().then(() => {
-          expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-          expect(liveList.itemsSlot_.lastElementChild)
-              .to.have.class('amp-live-list-item');
-        });
+      expect(liveList.pendingPagination_).to.equal(newPagination);
+      expect(liveList.paginationSlot_).to.equal(originalPagination);
+
+      return liveList.updateAction_().then(() => {
+        expect(liveList.pendingPagination_).to.equal(null);
+        expect(liveList.paginationSlot_).to.equal(originalPagination);
       });
     });
 
-    it('should display update indicator', () => {
+    it('should find items to tombstone', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
-      expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
 
-      const fromServer1 = createFromServer([{id: 'id0'}]);
+      const fromServer1 = createFromServer([
+        {id: 'id1', tombstone: null},
+        {id: 'id3'},
+        {id: 'id2', tombstone: null},
+      ]);
+      expect(liveList.pendingItemsTombstone_).to.have.length(0);
+
       liveList.update(fromServer1);
-      expect(liveList.pendingItemsInsert_).to.have.length(1);
-      return Promise.resolve().then(() => {
-        expect(liveList.updateSlot_).to.not.have.class('amp-hidden');
 
-        return liveList.updateAction_(fromServer1);
-      }).then(() => {
-        expect(liveList.updateSlot_).to.have.class('amp-hidden');
-      });
+      expect(liveList.pendingItemsTombstone_).to.have.length(2);
     });
 
-    it('should have correct insertion by using data-sort-time', () => {
+    it('should empty out descendants of tombstones item', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
       buildElement(elem, dftAttrs);
       liveList.buildCallback();
-      expect(liveList.itemsSlot_.childElementCount).to.equal(0);
-      expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
-
-      const oldDate = Date.now();
 
       const fromServer1 = createFromServer([
-        {id: 'unique-id-num-3', sortTime: oldDate + 1},
-        {id: 'unique-id-num-4', sortTime: oldDate + 2},
-        {id: 'unique-id-num-5', sortTime: oldDate},
+        {id: 'id1', tombstone: null},
+        {id: 'id3'},
+        {id: 'id2', tombstone: null},
       ]);
+      expect(liveList.pendingItemsTombstone_).to.have.length(0);
 
       liveList.update(fromServer1);
 
-      // Sort order should be 5, 3, 4
-      expect(liveList.pendingItemsInsert_[0].getAttribute('id'))
-          .to.equal('unique-id-num-5');
-      expect(liveList.pendingItemsInsert_[1].getAttribute('id'))
-          .to.equal('unique-id-num-3');
-      expect(liveList.pendingItemsInsert_[2].getAttribute('id'))
-          .to.equal('unique-id-num-4');
+      expect(liveList.pendingItemsTombstone_).to.have.length(2);
+      expect(child1.childNodes).to.have.length(2);
+      expect(child2.childNodes).to.have.length(0);
+
       return liveList.updateAction_().then(() => {
-        // Insertion order should be 4, 3, 5
-        expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-            .to.equal('unique-id-num-4');
-        expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-            .to.equal('unique-id-num-3');
-        expect(liveList.itemsSlot_.children[2].getAttribute('id'))
-            .to.equal('unique-id-num-5');
-        expect(liveList.itemsSlot_.children.length).to.equal(3);
+        expect(child1.childNodes).to.have.length(0);
+        expect(child2.childNodes).to.have.length(0);
       });
     });
-  });
-
-  it('should have the correct "update time"', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    expect(() => {
-      liveList.buildCallback();
-    }).to.not.throw();
-    expect(liveList.updateTime_).to.equal(124);
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', sortTime: 129},
-    ]);
-    // Does not get updated since it is a cached id.
-    expect(liveList.update(fromServer1)).to.equal(124);
-
-    // Find the highest data-sort-time
-    const fromServer2 = createFromServer([
-      {id: 'id3', sortTime: 130},
-      {id: 'id4', sortTime: 133},
-    ]);
-    expect(liveList.update(fromServer2)).to.equal(133);
-
-    // Find the highest data-update-time
-    const fromServer3 = createFromServer([
-      {id: 'id6', sortTime: 150, updateTime: 200},
-      {id: 'id7', sortTime: 150, updateTime: 180},
-    ]);
-    expect(liveList.update(fromServer3)).to.equal(200);
-
-    // No update is made since data-update-time did not change
-    // and only data-sort-time changed, but its treated
-    // immutable even if the server sent us a new value.
-    const fromServer4 = createFromServer([
-      {id: 'id6', sortTime: 300, updateTime: 200},
-    ]);
-    expect(liveList.update(fromServer4)).to.equal(200);
-
-    // data-update-time is used
-    const fromServer5 = createFromServer([
-      {id: 'id6', sortTime: 300, updateTime: 600},
-    ]);
-    expect(liveList.update(fromServer5)).to.equal(600);
-  });
-
-  it('should be able to accumulate insert items', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 125},
-      {id: 'id3'},
-    ]);
-
-    const spy = sandbox.spy(liveList, 'updateAction_');
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsInsert_).to.have.length(1);
-    expect(spy).to.have.not.been.called;
-
-    const fromServer2 = createFromServer([
-      {id: 'id4'},
-      {id: 'id7'},
-      {id: 'id9'},
-    ]);
-    liveList.update(fromServer2);
-    expect(liveList.pendingItemsInsert_).to.have.length(4);
-    expect(spy).to.have.not.been.called;
-  });
-
-  it('should have pending replace items', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 125},
-      {id: 'id3'},
-    ]);
-
-    const spy = sandbox.spy(liveList, 'updateAction_');
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsInsert_).to.have.length(1);
-    expect(liveList.pendingItemsReplace_).to.have.length(1);
-    // Should wait for user action until `updateAction_`
-    expect(spy).to.have.not.been.called;
-  });
-
-  it('should have pending replace items even w/o new inserts', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 125},
-    ]);
-
-    const spy = sandbox.spy(liveList, 'updateAction_');
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsInsert_).to.have.length(0);
-    expect(liveList.pendingItemsReplace_).to.have.length(1);
-    // If there is no pending items to insert, flush the replace items
-    // right away.
-    expect(spy).to.be.calledOnce;
-  });
-
-  it('should always use latest update to replace when in pending state', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 125},
-      {id: 'id3'},
-    ]);
-
-    const spy = sandbox.spy(liveList, 'updateAction_');
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsReplace_).to.have.length(1);
-    expect(liveList.pendingItemsReplace_[0].getAttribute('id')).to.equal('id1');
-    expect(liveList.pendingItemsReplace_[0].getAttribute('data-update-time'))
-        .to.equal('125');
-    // Should wait for user action until `updateAction_`
-    expect(spy).to.have.not.been.called;
-
-    const fromServer2 = createFromServer([
-      {id: 'id1', updateTime: 127},
-    ]);
-    liveList.update(fromServer2);
-
-    expect(liveList.pendingItemsReplace_).to.have.length(1);
-    expect(liveList.pendingItemsReplace_[0].getAttribute('id')).to.equal('id1');
-    expect(liveList.pendingItemsReplace_[0].getAttribute('data-update-time'))
-        .to.equal('127');
-
-    expect(spy).to.have.not.been.called;
-  });
-
-  it('should replace pagination section', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    const originalPagination = document.createElement('div');
-    originalPagination.setAttribute('pagination', '');
-    elem.appendChild(originalPagination);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    expect(liveList.paginationSlot_).to.equal(originalPagination);
-    expect(liveList.pendingPagination_).to.equal(null);
-
-    const newPagination = document.createElement('div');
-    const fromServer1 = createFromServer([
-      {id: 'id1', tombstone: null},
-      {id: 'id3'},
-      {id: 'id2', tombstone: null},
-    ], newPagination);
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingPagination_).to.equal(newPagination);
-    expect(liveList.paginationSlot_).to.equal(originalPagination);
-
-    return liveList.updateAction_().then(() => {
-      expect(liveList.pendingPagination_).to.equal(null);
-      expect(liveList.paginationSlot_).to.equal(newPagination);
 
-      const newPagination2 = document.createElement('div');
-      const fromServer2 = createFromServer([
-        {id: 'id6'},
-      ], newPagination2);
-      liveList.update(fromServer2);
+    it('should not tombstone item multiple times', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
+      buildElement(elem, dftAttrs);
+      liveList.buildCallback();
 
-      expect(liveList.pendingPagination_).to.equal(newPagination2);
-      expect(liveList.paginationSlot_).to.equal(newPagination);
-      return liveList.updateAction_().then(() => {
-        expect(liveList.pendingPagination_).to.equal(null);
-        expect(liveList.paginationSlot_).to.equal(newPagination2);
-      });
-    });
-  });
-
-  it('should not replace pagination if only no insert or tombstone', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    const originalPagination = document.createElement('div');
-    originalPagination.setAttribute('pagination', '');
-    elem.appendChild(originalPagination);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    expect(liveList.paginationSlot_).to.equal(originalPagination);
-    expect(liveList.pendingPagination_).to.equal(null);
-
-    const newPagination = document.createElement('div');
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 999},
-    ], newPagination);
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingPagination_).to.equal(newPagination);
-    expect(liveList.paginationSlot_).to.equal(originalPagination);
-
-    return liveList.updateAction_().then(() => {
-      expect(liveList.pendingPagination_).to.equal(null);
-      expect(liveList.paginationSlot_).to.equal(originalPagination);
-    });
-  });
-
-  it('should find items to tombstone', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', tombstone: null},
-      {id: 'id3'},
-      {id: 'id2', tombstone: null},
-    ]);
-    expect(liveList.pendingItemsTombstone_).to.have.length(0);
-
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsTombstone_).to.have.length(2);
-  });
-
-  it('should empty out descendants of tombstones item', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', tombstone: null},
-      {id: 'id3'},
-      {id: 'id2', tombstone: null},
-    ]);
-    expect(liveList.pendingItemsTombstone_).to.have.length(0);
-
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsTombstone_).to.have.length(2);
-    expect(child1.childNodes).to.have.length(2);
-    expect(child2.childNodes).to.have.length(0);
-
-    return liveList.updateAction_().then(() => {
-      expect(child1.childNodes).to.have.length(0);
-      expect(child2.childNodes).to.have.length(0);
-    });
-  });
-
-  it('should not tombstone item multiple times', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', tombstone: null},
-      {id: 'id3'},
-      {id: 'id2', tombstone: null},
-    ]);
-    expect(liveList.pendingItemsTombstone_).to.have.length(0);
-
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsTombstone_).to.have.length(2);
-    expect(child1.childNodes).to.have.length(2);
-    expect(child2.childNodes).to.have.length(0);
-
-    return liveList.updateAction_().then(() => {
-      expect(child1.childNodes).to.have.length(0);
-      expect(child2.childNodes).to.have.length(0);
-    }).then(() => {
-      const fromServer2 = createFromServer([
+      const fromServer1 = createFromServer([
         {id: 'id1', tombstone: null},
         {id: 'id3'},
         {id: 'id2', tombstone: null},
       ]);
       expect(liveList.pendingItemsTombstone_).to.have.length(0);
-      liveList.update(fromServer2);
-      // Shouldn't find anything a second time around
-      expect(liveList.pendingItemsTombstone_).to.have.length(0);
-    });
-  });
-
-  it('should choose tombstone over update', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id1', updateTime: 999, tombstone: null},
-      {id: 'id3'},
-      {id: 'id2', tombstone: null},
-    ]);
-    expect(liveList.pendingItemsTombstone_).to.have.length(0);
-    expect(liveList.pendingItemsReplace_).to.have.length(0);
-
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsTombstone_).to.have.length(2);
-    expect(liveList.pendingItemsReplace_).to.have.length(0);
-  });
-
-
-  it('should choose tombstone over insert', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    itemsSlot.appendChild(child1);
-    itemsSlot.appendChild(child2);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer1 = createFromServer([
-      {id: 'id3', tombstone: null},
-    ]);
-    expect(liveList.pendingItemsTombstone_).to.have.length(0);
-    expect(liveList.pendingItemsInsert_).to.have.length(0);
-
-    liveList.update(fromServer1);
-
-    expect(liveList.pendingItemsTombstone_).to.have.length(1);
-    expect(liveList.pendingItemsInsert_).to.have.length(0);
-  });
-
-  it('should be able to toggle the `disabled` attribute', () => {
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-    expect(elem.hasAttribute('disabled')).to.be.false;
-    expect(liveList.isEnabled()).to.be.true;
-    liveList.toggle(false);
-    expect(elem.hasAttribute('disabled')).to.be.true;
-    expect(liveList.isEnabled()).to.be.false;
-    liveList.toggle(true);
-    expect(elem.hasAttribute('disabled')).to.be.false;
-    expect(liveList.isEnabled()).to.be.true;
-  });
-
-  it('should delete old items to accomodate new items', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    // append child 2 first
-    itemsSlot.appendChild(child2);
-    itemsSlot.appendChild(child1);
-    buildElement(elem, Object.assign({}, dftAttrs,
-        {'data-max-items-per-page': 2}));
-    sandbox.stub(liveList, 'isElementBelowViewport_').returns(true);
-    liveList.buildCallback();
-    const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
-
-    const fromServer1 = createFromServer([
-      {id: 'id3', sortTime: '122'},
-    ]);
-
-    // Insert 1 new item
-    expect(liveList.curNumOfLiveItems_).to.equal(2);
-    expect(liveList.pendingItemsInsert_).to.have.length(0);
-
-    liveList.update(fromServer1);
-    expect(liveList.pendingItemsInsert_).to.have.length(1);
-    expect(liveList.curNumOfLiveItems_).to.equal(2);
-    expect(removeChildSpy).to.have.not.been.called;
-
-    return liveList.updateAction_().then(() => {
-      expect(liveList.curNumOfLiveItems_).to.equal(2);
-      expect(liveList.pendingItemsInsert_).to.have.length(0);
 
-      expect(removeChildSpy).to.have.been.called;
+      liveList.update(fromServer1);
 
-      expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-          .to.equal('id2');
-      expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-          .to.equal('id1');
-      expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-    });
-  });
-
-  it('should only delete items below the viewport', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '123');
-    child2.setAttribute('data-sort-time', '124');
-    // append child 2 first
-    itemsSlot.appendChild(child2);
-    itemsSlot.appendChild(child1);
-    buildElement(elem, Object.assign({}, dftAttrs,
-        {'data-max-items-per-page': 2}));
-    const pred = sandbox.stub(liveList, 'isElementBelowViewport_');
-    // id1
-    pred.onCall(0).returns(true);
-    // Anything else
-    pred.returns(false);
-    liveList.buildCallback();
-    const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
-
-    const fromServer1 = createFromServer([
-      {id: 'id3'},
-      {id: 'id4'},
-      {id: 'id5'},
-      {id: 'id6'},
-    ]);
-
-    expect(liveList.curNumOfLiveItems_).to.equal(2);
-    expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-    expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-        .to.equal('id2');
-    expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-        .to.equal('id1');
-
-    liveList.update(fromServer1);
-    expect(removeChildSpy).to.have.not.been.called;
-
-    return liveList.updateAction_().then(() => {
-      // Will only remove id1 and not id2
-      expect(liveList.curNumOfLiveItems_).to.equal(5);
-      expect(liveList.itemsSlot_.childElementCount).to.equal(5);
-      expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-          .to.equal('id6');
-      expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-          .to.equal('id5');
-      expect(liveList.itemsSlot_.children[2].getAttribute('id'))
-          .to.equal('id4');
-      expect(liveList.itemsSlot_.children[3].getAttribute('id'))
-          .to.equal('id3');
-      expect(liveList.itemsSlot_.children[4].getAttribute('id'))
-          .to.equal('id2');
-      expect(removeChildSpy).to.be.calledOnce;
-    });
-  });
-
-
-  it('should keep correct count of live items', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id2');
-    child1.setAttribute('data-sort-time', '1');
-    child2.setAttribute('data-sort-time', '2');
-    // append child 2 first
-    itemsSlot.appendChild(child2);
-    itemsSlot.appendChild(child1);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-    sandbox.stub(liveList, 'isElementBelowViewport_').returns(true);
-    const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
-
-    const fromServer = createFromServer([
-      {id: 'id3', sortTime: 110},
-      {id: 'id4', sortTime: 111},
-    ]);
-    liveList.update(fromServer);
-    expect(liveList.curNumOfLiveItems_).to.equal(2);
-
-    return liveList.updateAction_().then(() => {
-      expect(liveList.curNumOfLiveItems_).to.equal(4);
-    }).then(() => {
-
-      // Currently 4 items, plus 4 insertions = 8, minus 1 tombstone item.
-      // This means we currently have 7 items and 2 items to "delete" from the
-      // live DOM.
-      const fromServer = createFromServer([
-        {id: 'id1', tombstone: null},
-        // Bad tombstone example to make sure it doesnt decrement incorrectly.
-        {id: 'id100', tombstone: null},
-        {id: 'id5'},
-        {id: 'id6'},
-        {id: 'id7'},
-        {id: 'id8'},
-      ]);
-      expect(liveList.itemsSlot_.lastElementChild.getAttribute('id'))
-          .to.equal('id1');
-      liveList.update(fromServer);
-      // Nothing removed yet
-      expect(removeChildSpy).to.have.not.been.called;
-      return liveList.updateAction_();
-    }).then(() => {
-      expect(liveList.curNumOfLiveItems_).to.equal(5);
-      expect(removeChildSpy).to.have.callCount(2);
-      // Deleted id1 and id2
-      expect(liveList.itemsSlot_.lastElementChild.getAttribute('id'))
-          .to.equal('id1');
-      expect(liveList.itemsSlot_
-          .lastElementChild.hasAttribute('data-tombstone')).to.be.true;
-      // Notice that id1's previous sibling is id3 and not id2
-      // as id2 has been deleted from the live DOM to make room for new items.
-      expect(liveList.itemsSlot_.lastElementChild
-          .previousElementSibling.getAttribute('id')).to.equal('id4');
-    });
-  });
-
-  it('should insert properly using sort-time', () => {
-    const child1 = document.createElement('div');
-    const child2 = document.createElement('div');
-    child1.setAttribute('id', 'id1');
-    child1.textContent = 'hello world';
-    child1.appendChild(document.createElement('div'));
-    child2.setAttribute('id', 'id4');
-    child1.setAttribute('data-sort-time', '1');
-    child2.setAttribute('data-sort-time', '4');
-    itemsSlot.appendChild(child2);
-    itemsSlot.appendChild(child1);
-    buildElement(elem, dftAttrs);
-    liveList.buildCallback();
-
-    const fromServer = createFromServer([
-      {id: 'id2', sortTime: 2},
-      {id: 'id3', sortTime: 3},
-    ]);
-
-    expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-        .to.equal('id4');
-    expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-        .to.equal('id1');
-
-    liveList.update(fromServer);
-    return liveList.updateAction_().then(() => {
-      expect(liveList.curNumOfLiveItems_).to.equal(4);
-      expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-          .to.equal('id4');
-      expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-          .to.equal('id3');
-      expect(liveList.itemsSlot_.children[2].getAttribute('id'))
-          .to.equal('id2');
-      expect(liveList.itemsSlot_.children[3].getAttribute('id'))
-          .to.equal('id1');
-    });
-  });
-
-  describe('#getNumberMaxOrDefault', () => {
-
-    it('should return correct value', () => {
-      expect(getNumberMaxOrDefault('', 10)).to.equal(10);
-      expect(getNumberMaxOrDefault(undefined, 10)).to.equal(10);
-      expect(getNumberMaxOrDefault(null, 10)).to.equal(10);
-      expect(getNumberMaxOrDefault('hello world', 10)).to.equal(10);
-      expect(getNumberMaxOrDefault(NaN, 10)).to.equal(10);
-      expect(getNumberMaxOrDefault('12', 10)).to.equal(12);
-      expect(getNumberMaxOrDefault('037', 10)).to.equal(37);
-      expect(getNumberMaxOrDefault('0', 10)).to.equal(10);
-      expect(getNumberMaxOrDefault(0, 10)).to.equal(10);
-    });
-  });
+      expect(liveList.pendingItemsTombstone_).to.have.length(2);
+      expect(child1.childNodes).to.have.length(2);
+      expect(child2.childNodes).to.have.length(0);
 
-  describe('sort=ascending', () => {
+      return liveList
+        .updateAction_()
+        .then(() => {
+          expect(child1.childNodes).to.have.length(0);
+          expect(child2.childNodes).to.have.length(0);
+        })
+        .then(() => {
+          const fromServer2 = createFromServer([
+            {id: 'id1', tombstone: null},
+            {id: 'id3'},
+            {id: 'id2', tombstone: null},
+          ]);
+          expect(liveList.pendingItemsTombstone_).to.have.length(0);
+          liveList.update(fromServer2);
+          // Shouldn't find anything a second time around
+          expect(liveList.pendingItemsTombstone_).to.have.length(0);
+        });
+    });
 
-    it('should have correct insertion by using data-sort-time', () => {
-      const oldDate = Date.now();
+    it('should choose tombstone over update', () => {
       const child1 = document.createElement('div');
       const child2 = document.createElement('div');
-      child1.setAttribute('id', 'unique-id-num-1');
-      child2.setAttribute('id', 'unique-id-num-2');
-      child1.setAttribute('data-sort-time', oldDate - 2);
-      child2.setAttribute('data-sort-time', oldDate - 1);
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
       itemsSlot.appendChild(child1);
       itemsSlot.appendChild(child2);
-      buildElement(elem, Object.assign({}, dftAttrs, {'sort': 'ascending'}));
-      toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
+      buildElement(elem, dftAttrs);
       liveList.buildCallback();
-      expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-      expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
-
 
       const fromServer1 = createFromServer([
-        {id: 'unique-id-num-4', sortTime: oldDate + 2},
-        {id: 'unique-id-num-3', sortTime: oldDate + 1},
-        {id: 'unique-id-num-5', sortTime: oldDate - 3},
+        {id: 'id1', updateTime: 999, tombstone: null},
+        {id: 'id3'},
+        {id: 'id2', tombstone: null},
       ]);
+      expect(liveList.pendingItemsTombstone_).to.have.length(0);
+      expect(liveList.pendingItemsReplace_).to.have.length(0);
 
       liveList.update(fromServer1);
 
-      // Sort order should be 5, 3, 4
-      expect(liveList.pendingItemsInsert_[0].getAttribute('id'))
-          .to.equal('unique-id-num-5');
-      expect(liveList.pendingItemsInsert_[1].getAttribute('id'))
-          .to.equal('unique-id-num-3');
-      expect(liveList.pendingItemsInsert_[2].getAttribute('id'))
-          .to.equal('unique-id-num-4');
-      return liveList.updateAction_().then(() => {
-        // Insertion order should be 5, 3, 4
-        expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-            .to.equal('unique-id-num-5');
-        expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-            .to.equal('unique-id-num-1');
-        expect(liveList.itemsSlot_.children[2].getAttribute('id'))
-            .to.equal('unique-id-num-2');
-        expect(liveList.itemsSlot_.children[3].getAttribute('id'))
-            .to.equal('unique-id-num-3');
-        expect(liveList.itemsSlot_.children[4].getAttribute('id'))
-            .to.equal('unique-id-num-4');
-        expect(liveList.itemsSlot_.children.length).to.equal(5);
-      });
+      expect(liveList.pendingItemsTombstone_).to.have.length(2);
+      expect(liveList.pendingItemsReplace_).to.have.length(0);
+    });
+
+    it('should choose tombstone over insert', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '123');
+      child2.setAttribute('data-sort-time', '124');
+      itemsSlot.appendChild(child1);
+      itemsSlot.appendChild(child2);
+      buildElement(elem, dftAttrs);
+      liveList.buildCallback();
+
+      const fromServer1 = createFromServer([{id: 'id3', tombstone: null}]);
+      expect(liveList.pendingItemsTombstone_).to.have.length(0);
+      expect(liveList.pendingItemsInsert_).to.have.length(0);
+
+      liveList.update(fromServer1);
+
+      expect(liveList.pendingItemsTombstone_).to.have.length(1);
+      expect(liveList.pendingItemsInsert_).to.have.length(0);
+    });
+
+    it('should be able to toggle the `disabled` attribute', () => {
+      buildElement(elem, dftAttrs);
+      liveList.buildCallback();
+      expect(elem.hasAttribute('disabled')).to.be.false;
+      expect(liveList.isEnabled()).to.be.true;
+      liveList.toggle(false);
+      expect(elem.hasAttribute('disabled')).to.be.true;
+      expect(liveList.isEnabled()).to.be.false;
+      liveList.toggle(true);
+      expect(elem.hasAttribute('disabled')).to.be.false;
+      expect(liveList.isEnabled()).to.be.true;
     });
 
     it('should delete old items to accomodate new items', () => {
@@ -1277,18 +1042,17 @@ describes.realWin('amp-live-list', {
       child1.setAttribute('data-sort-time', '123');
       child2.setAttribute('data-sort-time', '124');
       // append child 2 first
-      itemsSlot.appendChild(child1);
       itemsSlot.appendChild(child2);
-      buildElement(elem, Object.assign({}, dftAttrs,
-          {'data-max-items-per-page': 2, 'sort': 'ascending'}));
-      sandbox.stub(liveList, 'isElementAboveViewport_').returns(true);
-      toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
+      itemsSlot.appendChild(child1);
+      buildElement(
+        elem,
+        Object.assign({}, dftAttrs, {'data-max-items-per-page': 2})
+      );
+      sandbox.stub(liveList, 'isElementBelowViewport_').returns(true);
       liveList.buildCallback();
       const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
 
-      const fromServer1 = createFromServer([
-        {id: 'id3', sortTime: '125'},
-      ]);
+      const fromServer1 = createFromServer([{id: 'id3', sortTime: '122'}]);
 
       // Insert 1 new item
       expect(liveList.curNumOfLiveItems_).to.equal(2);
@@ -1305,15 +1069,17 @@ describes.realWin('amp-live-list', {
 
         expect(removeChildSpy).to.have.been.called;
 
-        expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-            .to.equal('id2');
-        expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-            .to.equal('id3');
+        expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+          'id2'
+        );
+        expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+          'id1'
+        );
         expect(liveList.itemsSlot_.childElementCount).to.equal(2);
       });
     });
 
-    it('should only delete items above the viewport', () => {
+    it('should only delete items below the viewport', () => {
       const child1 = document.createElement('div');
       const child2 = document.createElement('div');
       child1.setAttribute('id', 'id1');
@@ -1323,16 +1089,17 @@ describes.realWin('amp-live-list', {
       child1.setAttribute('data-sort-time', '123');
       child2.setAttribute('data-sort-time', '124');
       // append child 2 first
-      itemsSlot.appendChild(child1);
       itemsSlot.appendChild(child2);
-      buildElement(elem, Object.assign({}, dftAttrs,
-          {'data-max-items-per-page': 2, 'sort': 'ascending'}));
-      const pred = sandbox.stub(liveList, 'isElementAboveViewport_');
+      itemsSlot.appendChild(child1);
+      buildElement(
+        elem,
+        Object.assign({}, dftAttrs, {'data-max-items-per-page': 2})
+      );
+      const pred = sandbox.stub(liveList, 'isElementBelowViewport_');
       // id1
       pred.onCall(0).returns(true);
       // Anything else
       pred.returns(false);
-      toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
       liveList.buildCallback();
       const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
 
@@ -1345,30 +1112,342 @@ describes.realWin('amp-live-list', {
 
       expect(liveList.curNumOfLiveItems_).to.equal(2);
       expect(liveList.itemsSlot_.childElementCount).to.equal(2);
-      expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-          .to.equal('id1');
-      expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-          .to.equal('id2');
+      expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+        'id2'
+      );
+      expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+        'id1'
+      );
+
       liveList.update(fromServer1);
       expect(removeChildSpy).to.have.not.been.called;
 
       return liveList.updateAction_().then(() => {
         // Will only remove id1 and not id2
-        expect(removeChildSpy).to.be.calledOnce;
         expect(liveList.curNumOfLiveItems_).to.equal(5);
         expect(liveList.itemsSlot_.childElementCount).to.equal(5);
-        expect(liveList.itemsSlot_.children[0].getAttribute('id'))
-            .to.equal('id2');
-        expect(liveList.itemsSlot_.children[1].getAttribute('id'))
-            .to.equal('id3');
-        expect(liveList.itemsSlot_.children[2].getAttribute('id'))
-            .to.equal('id4');
-        expect(liveList.itemsSlot_.children[3].getAttribute('id'))
-            .to.equal('id5');
-        expect(liveList.itemsSlot_.children[4].getAttribute('id'))
-            .to.equal('id6');
+        expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+          'id6'
+        );
+        expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+          'id5'
+        );
+        expect(liveList.itemsSlot_.children[2].getAttribute('id')).to.equal(
+          'id4'
+        );
+        expect(liveList.itemsSlot_.children[3].getAttribute('id')).to.equal(
+          'id3'
+        );
+        expect(liveList.itemsSlot_.children[4].getAttribute('id')).to.equal(
+          'id2'
+        );
+        expect(removeChildSpy).to.be.calledOnce;
       });
     });
 
-  });
-});
+    it('should keep correct count of live items', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id2');
+      child1.setAttribute('data-sort-time', '1');
+      child2.setAttribute('data-sort-time', '2');
+      // append child 2 first
+      itemsSlot.appendChild(child2);
+      itemsSlot.appendChild(child1);
+      buildElement(elem, dftAttrs);
+      liveList.buildCallback();
+      sandbox.stub(liveList, 'isElementBelowViewport_').returns(true);
+      const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
+
+      const fromServer = createFromServer([
+        {id: 'id3', sortTime: 110},
+        {id: 'id4', sortTime: 111},
+      ]);
+      liveList.update(fromServer);
+      expect(liveList.curNumOfLiveItems_).to.equal(2);
+
+      return liveList
+        .updateAction_()
+        .then(() => {
+          expect(liveList.curNumOfLiveItems_).to.equal(4);
+        })
+        .then(() => {
+          // Currently 4 items, plus 4 insertions = 8, minus 1 tombstone item.
+          // This means we currently have 7 items and 2 items to "delete" from the
+          // live DOM.
+          const fromServer = createFromServer([
+            {id: 'id1', tombstone: null},
+            // Bad tombstone example to make sure it doesnt decrement incorrectly.
+            {id: 'id100', tombstone: null},
+            {id: 'id5'},
+            {id: 'id6'},
+            {id: 'id7'},
+            {id: 'id8'},
+          ]);
+          expect(
+            liveList.itemsSlot_.lastElementChild.getAttribute('id')
+          ).to.equal('id1');
+          liveList.update(fromServer);
+          // Nothing removed yet
+          expect(removeChildSpy).to.have.not.been.called;
+          return liveList.updateAction_();
+        })
+        .then(() => {
+          expect(liveList.curNumOfLiveItems_).to.equal(5);
+          expect(removeChildSpy).to.have.callCount(2);
+          // Deleted id1 and id2
+          expect(
+            liveList.itemsSlot_.lastElementChild.getAttribute('id')
+          ).to.equal('id1');
+          expect(
+            liveList.itemsSlot_.lastElementChild.hasAttribute('data-tombstone')
+          ).to.be.true;
+          // Notice that id1's previous sibling is id3 and not id2
+          // as id2 has been deleted from the live DOM to make room for new items.
+          expect(
+            liveList.itemsSlot_.lastElementChild.previousElementSibling.getAttribute(
+              'id'
+            )
+          ).to.equal('id4');
+        });
+    });
+
+    it('should insert properly using sort-time', () => {
+      const child1 = document.createElement('div');
+      const child2 = document.createElement('div');
+      child1.setAttribute('id', 'id1');
+      child1.textContent = 'hello world';
+      child1.appendChild(document.createElement('div'));
+      child2.setAttribute('id', 'id4');
+      child1.setAttribute('data-sort-time', '1');
+      child2.setAttribute('data-sort-time', '4');
+      itemsSlot.appendChild(child2);
+      itemsSlot.appendChild(child1);
+      buildElement(elem, dftAttrs);
+      liveList.buildCallback();
+
+      const fromServer = createFromServer([
+        {id: 'id2', sortTime: 2},
+        {id: 'id3', sortTime: 3},
+      ]);
+
+      expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+        'id4'
+      );
+      expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+        'id1'
+      );
+
+      liveList.update(fromServer);
+      return liveList.updateAction_().then(() => {
+        expect(liveList.curNumOfLiveItems_).to.equal(4);
+        expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+          'id4'
+        );
+        expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+          'id3'
+        );
+        expect(liveList.itemsSlot_.children[2].getAttribute('id')).to.equal(
+          'id2'
+        );
+        expect(liveList.itemsSlot_.children[3].getAttribute('id')).to.equal(
+          'id1'
+        );
+      });
+    });
+
+    describe('#getNumberMaxOrDefault', () => {
+      it('should return correct value', () => {
+        expect(getNumberMaxOrDefault('', 10)).to.equal(10);
+        expect(getNumberMaxOrDefault(undefined, 10)).to.equal(10);
+        expect(getNumberMaxOrDefault(null, 10)).to.equal(10);
+        expect(getNumberMaxOrDefault('hello world', 10)).to.equal(10);
+        expect(getNumberMaxOrDefault(NaN, 10)).to.equal(10);
+        expect(getNumberMaxOrDefault('12', 10)).to.equal(12);
+        expect(getNumberMaxOrDefault('037', 10)).to.equal(37);
+        expect(getNumberMaxOrDefault('0', 10)).to.equal(10);
+        expect(getNumberMaxOrDefault(0, 10)).to.equal(10);
+      });
+    });
+
+    describe('sort=ascending', () => {
+      it('should have correct insertion by using data-sort-time', () => {
+        const oldDate = Date.now();
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'unique-id-num-1');
+        child2.setAttribute('id', 'unique-id-num-2');
+        child1.setAttribute('data-sort-time', oldDate - 2);
+        child2.setAttribute('data-sort-time', oldDate - 1);
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(elem, Object.assign({}, dftAttrs, {'sort': 'ascending'}));
+        toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
+        liveList.buildCallback();
+        expect(liveList.itemsSlot_.childElementCount).to.equal(2);
+        expect(elem.querySelector('[update]')).to.have.class('amp-hidden');
+
+        const fromServer1 = createFromServer([
+          {id: 'unique-id-num-4', sortTime: oldDate + 2},
+          {id: 'unique-id-num-3', sortTime: oldDate + 1},
+          {id: 'unique-id-num-5', sortTime: oldDate - 3},
+        ]);
+
+        liveList.update(fromServer1);
+
+        // Sort order should be 5, 3, 4
+        expect(liveList.pendingItemsInsert_[0].getAttribute('id')).to.equal(
+          'unique-id-num-5'
+        );
+        expect(liveList.pendingItemsInsert_[1].getAttribute('id')).to.equal(
+          'unique-id-num-3'
+        );
+        expect(liveList.pendingItemsInsert_[2].getAttribute('id')).to.equal(
+          'unique-id-num-4'
+        );
+        return liveList.updateAction_().then(() => {
+          // Insertion order should be 5, 3, 4
+          expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+            'unique-id-num-5'
+          );
+          expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+            'unique-id-num-1'
+          );
+          expect(liveList.itemsSlot_.children[2].getAttribute('id')).to.equal(
+            'unique-id-num-2'
+          );
+          expect(liveList.itemsSlot_.children[3].getAttribute('id')).to.equal(
+            'unique-id-num-3'
+          );
+          expect(liveList.itemsSlot_.children[4].getAttribute('id')).to.equal(
+            'unique-id-num-4'
+          );
+          expect(liveList.itemsSlot_.children.length).to.equal(5);
+        });
+      });
+
+      it('should delete old items to accomodate new items', () => {
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'id1');
+        child1.textContent = 'hello world';
+        child1.appendChild(document.createElement('div'));
+        child2.setAttribute('id', 'id2');
+        child1.setAttribute('data-sort-time', '123');
+        child2.setAttribute('data-sort-time', '124');
+        // append child 2 first
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(
+          elem,
+          Object.assign({}, dftAttrs, {
+            'data-max-items-per-page': 2,
+            'sort': 'ascending',
+          })
+        );
+        sandbox.stub(liveList, 'isElementAboveViewport_').returns(true);
+        toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
+        liveList.buildCallback();
+        const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
+
+        const fromServer1 = createFromServer([{id: 'id3', sortTime: '125'}]);
+
+        // Insert 1 new item
+        expect(liveList.curNumOfLiveItems_).to.equal(2);
+        expect(liveList.pendingItemsInsert_).to.have.length(0);
+
+        liveList.update(fromServer1);
+        expect(liveList.pendingItemsInsert_).to.have.length(1);
+        expect(liveList.curNumOfLiveItems_).to.equal(2);
+        expect(removeChildSpy).to.have.not.been.called;
+
+        return liveList.updateAction_().then(() => {
+          expect(liveList.curNumOfLiveItems_).to.equal(2);
+          expect(liveList.pendingItemsInsert_).to.have.length(0);
+
+          expect(removeChildSpy).to.have.been.called;
+
+          expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+            'id2'
+          );
+          expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+            'id3'
+          );
+          expect(liveList.itemsSlot_.childElementCount).to.equal(2);
+        });
+      });
+
+      it('should only delete items above the viewport', () => {
+        const child1 = document.createElement('div');
+        const child2 = document.createElement('div');
+        child1.setAttribute('id', 'id1');
+        child1.textContent = 'hello world';
+        child1.appendChild(document.createElement('div'));
+        child2.setAttribute('id', 'id2');
+        child1.setAttribute('data-sort-time', '123');
+        child2.setAttribute('data-sort-time', '124');
+        // append child 2 first
+        itemsSlot.appendChild(child1);
+        itemsSlot.appendChild(child2);
+        buildElement(
+          elem,
+          Object.assign({}, dftAttrs, {
+            'data-max-items-per-page': 2,
+            'sort': 'ascending',
+          })
+        );
+        const pred = sandbox.stub(liveList, 'isElementAboveViewport_');
+        // id1
+        pred.onCall(0).returns(true);
+        // Anything else
+        pred.returns(false);
+        toggleExperiment(liveList.win, 'amp-live-list-sorting', true);
+        liveList.buildCallback();
+        const removeChildSpy = sandbox.spy(liveList.itemsSlot_, 'removeChild');
+
+        const fromServer1 = createFromServer([
+          {id: 'id3'},
+          {id: 'id4'},
+          {id: 'id5'},
+          {id: 'id6'},
+        ]);
+
+        expect(liveList.curNumOfLiveItems_).to.equal(2);
+        expect(liveList.itemsSlot_.childElementCount).to.equal(2);
+        expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+          'id1'
+        );
+        expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+          'id2'
+        );
+        liveList.update(fromServer1);
+        expect(removeChildSpy).to.have.not.been.called;
+
+        return liveList.updateAction_().then(() => {
+          // Will only remove id1 and not id2
+          expect(removeChildSpy).to.be.calledOnce;
+          expect(liveList.curNumOfLiveItems_).to.equal(5);
+          expect(liveList.itemsSlot_.childElementCount).to.equal(5);
+          expect(liveList.itemsSlot_.children[0].getAttribute('id')).to.equal(
+            'id2'
+          );
+          expect(liveList.itemsSlot_.children[1].getAttribute('id')).to.equal(
+            'id3'
+          );
+          expect(liveList.itemsSlot_.children[2].getAttribute('id')).to.equal(
+            'id4'
+          );
+          expect(liveList.itemsSlot_.children[3].getAttribute('id')).to.equal(
+            'id5'
+          );
+          expect(liveList.itemsSlot_.children[4].getAttribute('id')).to.equal(
+            'id6'
+          );
+        });
+      });
+    });
+  }
+);
diff --git a/extensions/amp-live-list/0.1/test/test-live-list-manager.js b/extensions/amp-live-list/0.1/test/test-live-list-manager.js
index 2e567c6b1f92..ad5b440cf8ac 100644
--- a/extensions/amp-live-list/0.1/test/test-live-list-manager.js
+++ b/extensions/amp-live-list/0.1/test/test-live-list-manager.js
@@ -40,9 +40,12 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     win = env.win;
     doc = win.document;
     ampdoc = env.ampdoc;
-    const docReadyPromise = new Promise(resolve => { ready = resolve; });
-    sandbox.stub(LiveListManager.prototype, 'whenDocReady_')
-        .returns(docReadyPromise);
+    const docReadyPromise = new Promise(resolve => {
+      ready = resolve;
+    });
+    sandbox
+      .stub(LiveListManager.prototype, 'whenDocReady_')
+      .returns(docReadyPromise);
     clock = sandbox.useFakeTimers();
     xhrs = setUpMockXhrs(sandbox);
     viewer = Services.viewerForDoc(ampdoc);
@@ -56,7 +59,7 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     const xhrs = [];
     const xhrResolvers = [];
     for (let i = 0; i < XHR_BUFFER_SIZE; i++) {
-      xhrs[i] = new Promise(resolve => xhrResolvers[i] = resolve);
+      xhrs[i] = new Promise(resolve => (xhrResolvers[i] = resolve));
     }
     let xhrCount = 0;
     mockXhr.onCreate = function(xhr) {
@@ -71,7 +74,6 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
 
   /** @implements {!LiveListInterface} */
   class AmpLiveListMock {
-
     constructor(el) {
       this.element = el;
     }
@@ -165,34 +167,40 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     });
   });
 
-  it('should use custom containers for live-lists dynamically appended ' +
-  'in the client', () => {
-    const customSlot = document.createElement('div');
-    customSlot.setAttribute('id', 'custom-slot');
-    customSlot.setAttribute('dynamic-live-list', 'custom-list');
-
-    const fromServer = doc.createElement('div');
-    fromServer.appendChild(customSlot);
-    fromServer.getElementById = () => {};
-    sandbox.stub(fromServer, 'getElementById').callsFake(id => {
-      return fromServer.querySelector(`#${id}`);
-    });
-
-    ready();
-    const clientLiveList = getLiveList({
-      'data-poll-interval': '9000',
-      'sort': 'ascending',
-      'disable-scrolling': '',
-      'disable-pagination': '',
-      'auto-insert': '',
-    }, 'custom-list');
-    clientLiveList.element[AMP_LIVE_LIST_CUSTOM_SLOT_ID] = customSlot.id;
-    clientLiveList.buildCallback();
+  it(
+    'should use custom containers for live-lists dynamically appended ' +
+      'in the client',
+    () => {
+      const customSlot = document.createElement('div');
+      customSlot.setAttribute('id', 'custom-slot');
+      customSlot.setAttribute('dynamic-live-list', 'custom-list');
+
+      const fromServer = doc.createElement('div');
+      fromServer.appendChild(customSlot);
+      fromServer.getElementById = () => {};
+      sandbox.stub(fromServer, 'getElementById').callsFake(id => {
+        return fromServer.querySelector(`#${id}`);
+      });
 
-    return manager.whenDocReady_().then(() => {
-      expect(manager.getCustomSlots_(fromServer)).to.have.length(1);
-    });
-  });
+      ready();
+      const clientLiveList = getLiveList(
+        {
+          'data-poll-interval': '9000',
+          'sort': 'ascending',
+          'disable-scrolling': '',
+          'disable-pagination': '',
+          'auto-insert': '',
+        },
+        'custom-list'
+      );
+      clientLiveList.element[AMP_LIVE_LIST_CUSTOM_SLOT_ID] = customSlot.id;
+      clientLiveList.buildCallback();
+
+      return manager.whenDocReady_().then(() => {
+        expect(manager.getCustomSlots_(fromServer)).to.have.length(1);
+      });
+    }
+  );
 
   it('should get the amp_latest_update_time on doc ready', () => {
     sandbox.stub(Math, 'random').callsFake(() => 1);
@@ -205,12 +213,13 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
       const tick = interval - jitterOffset;
       expect(manager.poller_.isRunning()).to.be.true;
       clock.tick(tick);
-      return xhrs[0].then(
-          xhr => expect(xhr.url).to.match(/amp_latest_update_time=2222/));
+      return xhrs[0].then(xhr =>
+        expect(xhr.url).to.match(/amp_latest_update_time=2222/)
+      );
     });
   });
 
-  it('should not poll if all amp-live-list\'s are disabled on register', () => {
+  it("should not poll if all amp-live-list's are disabled on register", () => {
     const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
 
     liveList.toggle(false);
@@ -226,42 +235,47 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     });
   });
 
-  it('should poll if at least one amp-live-list\'s is still active after  ' +
-     'register', () => {
-    const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
+  it(
+    "should poll if at least one amp-live-list's is still active after  " +
+      'register',
+    () => {
+      const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
 
-    ready();
-    // Important that we set this before build since then is when they register
-    liveList.buildCallback();
-    liveList2.buildCallback();
-    liveList.toggle(false);
-    liveList2.toggle(true);
-    return manager.whenDocReady_().then(() => {
+      ready();
+      // Important that we set this before build since then is when they register
+      liveList.buildCallback();
+      liveList2.buildCallback();
       liveList.toggle(false);
       liveList2.toggle(true);
-      expect(manager.poller_.isRunning()).to.be.true;
-    });
-  });
-
-  it('should not poll if no amp-live-list\'s is still active after  ' +
-     'register', () => {
-    const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
-
-    ready();
-    // Important that we set this before build since then is when they register
-    liveList.buildCallback();
-    liveList2.buildCallback();
-    liveList.toggle(false);
-    liveList2.toggle(false);
-    return manager.whenDocReady_().then(() => {
+      return manager.whenDocReady_().then(() => {
+        liveList.toggle(false);
+        liveList2.toggle(true);
+        expect(manager.poller_.isRunning()).to.be.true;
+      });
+    }
+  );
+
+  it(
+    "should not poll if no amp-live-list's is still active after  " +
+      'register',
+    () => {
+      const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
+
+      ready();
+      // Important that we set this before build since then is when they register
+      liveList.buildCallback();
+      liveList2.buildCallback();
       liveList.toggle(false);
       liveList2.toggle(false);
-      expect(manager.poller_.isRunning()).to.be.false;
-    });
-  });
+      return manager.whenDocReady_().then(() => {
+        liveList.toggle(false);
+        liveList2.toggle(false);
+        expect(manager.poller_.isRunning()).to.be.false;
+      });
+    }
+  );
 
-  it('should not poll if all amp-live-list\'s are disabled after ' +
-     'updates', () => {
+  it("should not poll if all amp-live-list's are disabled after updates", () => {
     const liveList2 = getLiveList({'data-poll-interval': '8000'}, 'id-2');
 
     ready();
@@ -368,22 +382,28 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
       expect(fetchSpy).to.have.not.been.called;
       clock.tick(tick);
       expect(fetchSpy).to.be.calledOnce;
-      xhrs[0].then(
-          xhr => xhr.respond(
-              200, {
-                'Content-Type': 'text/xml',
-              },
-              '<html></html>'));
+      xhrs[0].then(xhr =>
+        xhr.respond(
+          200,
+          {
+            'Content-Type': 'text/xml',
+          },
+          '<html></html>'
+        )
+      );
 
       return manager.poller_.lastWorkPromise_.then(() => {
         expect(manager.poller_.isRunning()).to.be.true;
         clock.tick(tick);
-        xhrs[1].then(
-            xhr => xhr.respond(
-                415, {
-                  'Content-Type': 'text/xml',
-                },
-                '<html></html>'));
+        xhrs[1].then(xhr =>
+          xhr.respond(
+            415,
+            {
+              'Content-Type': 'text/xml',
+            },
+            '<html></html>'
+          )
+        );
         expect(fetchSpy).to.have.callCount(2);
         expect(manager.poller_.backoffClock_).to.be.null;
         return manager.poller_.lastWorkPromise_.then(() => {
@@ -406,22 +426,28 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
       expect(fetchSpy).to.have.not.been.called;
       clock.tick(tick);
       expect(fetchSpy).to.be.calledOnce;
-      xhrs[0].then(
-          xhr => xhr.respond(
-              200, {
-                'Content-Type': 'text/xml',
-              },
-              '<html></html>'));
+      xhrs[0].then(xhr =>
+        xhr.respond(
+          200,
+          {
+            'Content-Type': 'text/xml',
+          },
+          '<html></html>'
+        )
+      );
 
       return manager.poller_.lastWorkPromise_.then(() => {
         expect(manager.poller_.isRunning()).to.be.true;
         clock.tick(tick);
-        xhrs[1].then(
-            xhr => xhr.respond(
-                500, {
-                  'Content-Type': 'text/xml',
-                },
-                '<html></html>'));
+        xhrs[1].then(xhr =>
+          xhr.respond(
+            500,
+            {
+              'Content-Type': 'text/xml',
+            },
+            '<html></html>'
+          )
+        );
         expect(fetchSpy).to.have.callCount(2);
         expect(manager.poller_.backoffClock_).to.be.null;
         return manager.poller_.lastWorkPromise_.then(() => {
@@ -446,24 +472,30 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
       clock.tick(tick);
       expect(fetchSpy).to.be.calledOnce;
       expect(manager.poller_.backoffClock_).to.be.null;
-      xhrs[0].then(
-          xhr => xhr.respond(
-              415, {
-                'Content-Type': 'text/xml',
-              },
-              '<html></html>'));
+      xhrs[0].then(xhr =>
+        xhr.respond(
+          415,
+          {
+            'Content-Type': 'text/xml',
+          },
+          '<html></html>'
+        )
+      );
       return manager.poller_.lastWorkPromise_.then(() => {
         expect(manager.poller_.isRunning()).to.be.true;
         expect(manager.poller_.backoffClock_).to.be.a('function');
         // tick 1 max initial backoff with random = 1
         clock.tick(700);
         expect(fetchSpy).to.have.callCount(2);
-        xhrs[1].then(
-            xhr => xhr.respond(
-                200, {
-                  'Content-Type': 'text/xml',
-                },
-                '<html></html>'));
+        xhrs[1].then(xhr =>
+          xhr.respond(
+            200,
+            {
+              'Content-Type': 'text/xml',
+            },
+            '<html></html>'
+          )
+        );
         return manager.poller_.lastWorkPromise_.then(() => {
           expect(manager.poller_.isRunning()).to.be.true;
           expect(manager.poller_.backoffClock_).to.be.null;
@@ -472,44 +504,47 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     });
   });
 
-  it('should stop all polling if viewer is not visible ' +
-    'and immediately fetch when visible', () => {
-    ready();
-    const fetchSpy = sandbox.spy(manager, 'work_');
-    expect(fetchSpy).to.have.not.been.called;
-    liveList.buildCallback();
-    return manager.whenDocReady_().then(() => {
-      expect(viewer.isVisible()).to.be.true;
-      expect(manager.poller_.isRunning()).to.be.true;
-      viewer.receiveMessage('visibilitychange', {
-        state: 'hidden',
-      });
+  it(
+    'should stop all polling if viewer is not visible ' +
+      'and immediately fetch when visible',
+    () => {
+      ready();
+      const fetchSpy = sandbox.spy(manager, 'work_');
       expect(fetchSpy).to.have.not.been.called;
-      expect(manager.poller_.isRunning()).to.be.false;
-      viewer.receiveMessage('visibilitychange', {
-        state: 'visible',
-      });
-      expect(fetchSpy).to.be.calledOnce;
-      expect(manager.poller_.isRunning()).to.be.true;
-      viewer.receiveMessage('visibilitychange', {
-        state: 'inactive',
-      });
-      expect(fetchSpy).to.be.calledOnce;
-      expect(manager.poller_.isRunning()).to.be.false;
-      viewer.receiveMessage('visibilitychange', {
-        state: 'visible',
-      });
-      expect(fetchSpy).to.have.callCount(2);
-      expect(manager.poller_.isRunning()).to.be.true;
-      viewer.receiveMessage('visibilitychange', {
-        state: 'prerender',
+      liveList.buildCallback();
+      return manager.whenDocReady_().then(() => {
+        expect(viewer.isVisible()).to.be.true;
+        expect(manager.poller_.isRunning()).to.be.true;
+        viewer.receiveMessage('visibilitychange', {
+          state: 'hidden',
+        });
+        expect(fetchSpy).to.have.not.been.called;
+        expect(manager.poller_.isRunning()).to.be.false;
+        viewer.receiveMessage('visibilitychange', {
+          state: 'visible',
+        });
+        expect(fetchSpy).to.be.calledOnce;
+        expect(manager.poller_.isRunning()).to.be.true;
+        viewer.receiveMessage('visibilitychange', {
+          state: 'inactive',
+        });
+        expect(fetchSpy).to.be.calledOnce;
+        expect(manager.poller_.isRunning()).to.be.false;
+        viewer.receiveMessage('visibilitychange', {
+          state: 'visible',
+        });
+        expect(fetchSpy).to.have.callCount(2);
+        expect(manager.poller_.isRunning()).to.be.true;
+        viewer.receiveMessage('visibilitychange', {
+          state: 'prerender',
+        });
+        expect(fetchSpy).to.have.callCount(2);
+        expect(manager.poller_.isRunning()).to.be.false;
+        clock.tick(20000);
+        expect(fetchSpy).to.have.callCount(2);
       });
-      expect(fetchSpy).to.have.callCount(2);
-      expect(manager.poller_.isRunning()).to.be.false;
-      clock.tick(20000);
-      expect(fetchSpy).to.have.callCount(2);
-    });
-  });
+    }
+  );
 
   it('should fetch with url', () => {
     sandbox.stub(Math, 'random').callsFake(() => 1);
@@ -533,55 +568,64 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
     });
   });
 
-  it('should fetch with url from the cache if on publisher origin ' +
-      'and is transformed', () => {
-    sandbox.stub(Math, 'random').callsFake(() => 1);
-    sandbox.stub(viewer, 'isVisible').returns(true);
-    manager.url_ = 'https://www.example.com/foo/bar?hello=world#dev=1';
-    manager.isTransformed_ = true;
-    ready();
-    const fetchSpy = sandbox.spy(manager, 'work_');
-    liveList.buildCallback();
-    return manager.whenDocReady_().then(() => {
-      const interval = liveList.getInterval();
-      const tick = interval - jitterOffset;
-      expect(manager.poller_.isRunning()).to.be.true;
-      expect(fetchSpy).to.have.not.been.called;
-      clock.tick(tick);
-      expect(fetchSpy).to.be.calledOnce;
-      return xhrs[0].then(xhr => {
-        expect(xhr.url).to.match(/^https:\/\/cdn\.ampproject\.org\/c\/www\.example\.com\/foo\/bar\?hello=world/);
-        expect(xhr.url).to.match(/#dev=1/);
-        expect(xhr.url).to.match(/amp_latest_update_time/);
+  it(
+    'should fetch with url from the cache if on publisher origin ' +
+      'and is transformed',
+    () => {
+      sandbox.stub(Math, 'random').callsFake(() => 1);
+      sandbox.stub(viewer, 'isVisible').returns(true);
+      manager.url_ = 'https://www.example.com/foo/bar?hello=world#dev=1';
+      manager.isTransformed_ = true;
+      ready();
+      const fetchSpy = sandbox.spy(manager, 'work_');
+      liveList.buildCallback();
+      return manager.whenDocReady_().then(() => {
+        const interval = liveList.getInterval();
+        const tick = interval - jitterOffset;
+        expect(manager.poller_.isRunning()).to.be.true;
+        expect(fetchSpy).to.have.not.been.called;
+        clock.tick(tick);
+        expect(fetchSpy).to.be.calledOnce;
+        return xhrs[0].then(xhr => {
+          expect(xhr.url).to.match(
+            /^https:\/\/cdn\.ampproject\.org\/c\/www\.example\.com\/foo\/bar\?hello=world/
+          );
+          expect(xhr.url).to.match(/#dev=1/);
+          expect(xhr.url).to.match(/amp_latest_update_time/);
+        });
       });
-    });
-  });
-
-  it('should not fetch with url from the cache if on cache origin ' +
-      'and is not transformed', () => {
-    sandbox.stub(Math, 'random').callsFake(() => 1);
-    sandbox.stub(viewer, 'isVisible').returns(true);
-    manager.url_ = 'www.example.com/foo/bar?hello=world#dev=1';
-    manager.isTransformed_ = false;
-    manager.location_ = 'https://cdn.ampproject.org' +
+    }
+  );
+
+  it(
+    'should not fetch with url from the cache if on cache origin ' +
+      'and is not transformed',
+    () => {
+      sandbox.stub(Math, 'random').callsFake(() => 1);
+      sandbox.stub(viewer, 'isVisible').returns(true);
+      manager.url_ = 'www.example.com/foo/bar?hello=world#dev=1';
+      manager.isTransformed_ = false;
+      manager.location_ =
+        'https://cdn.ampproject.org' +
         '/c/s/www.example.com/foo/bar?hello=world#dev=1';
-    ready();
-    const fetchSpy = sandbox.spy(manager, 'work_');
-    liveList.buildCallback();
-    return manager.whenDocReady_().then(() => {
-      const interval = liveList.getInterval();
-      const tick = interval - jitterOffset;
-      expect(manager.poller_.isRunning()).to.be.true;
-      expect(fetchSpy).to.have.not.been.called;
-      clock.tick(tick);
-      expect(fetchSpy).to.be.calledOnce;
-      return xhrs[0].then(xhr => {
-        expect(xhr.url).to.match(/^www\.example\.com\/foo\/bar\?hello=world/);
-        expect(xhr.url).to.match(/#dev=1/);
-        expect(xhr.url).to.match(/amp_latest_update_time/);
+      ready();
+      const fetchSpy = sandbox.spy(manager, 'work_');
+      liveList.buildCallback();
+      return manager.whenDocReady_().then(() => {
+        const interval = liveList.getInterval();
+        const tick = interval - jitterOffset;
+        expect(manager.poller_.isRunning()).to.be.true;
+        expect(fetchSpy).to.have.not.been.called;
+        clock.tick(tick);
+        expect(fetchSpy).to.be.calledOnce;
+        return xhrs[0].then(xhr => {
+          expect(xhr.url).to.match(/^www\.example\.com\/foo\/bar\?hello=world/);
+          expect(xhr.url).to.match(/#dev=1/);
+          expect(xhr.url).to.match(/amp_latest_update_time/);
+        });
       });
-    });
-  });
+    }
+  );
 
   it('should find highest "update time" from amp-live-list elements', () => {
     const doc = [];
@@ -618,65 +662,76 @@ describes.fakeWin('LiveListManager', {amp: true}, env => {
       xhrs[0].then(xhr => {
         expect(xhr.url).to.match(/amp_latest_update_time=1111/);
         xhr.respond(
-            200, {
-              'Content-Type': 'text/xml',
-            },
-            '<html><amp-live-list id="id-1"></amp-live-list></html>');
+          200,
+          {
+            'Content-Type': 'text/xml',
+          },
+          '<html><amp-live-list id="id-1"></amp-live-list></html>'
+        );
       });
       return manager.poller_.lastWorkPromise_.then(() => {
         clock.tick(tick);
         expect(fetchSpy).to.have.callCount(2);
-        return xhrs[1].then(
-            xhr => expect(xhr.url).to.match(/amp_latest_update_time=2500/));
+        return xhrs[1].then(xhr =>
+          expect(xhr.url).to.match(/amp_latest_update_time=2500/)
+        );
       });
     });
   });
 });
 
-describes.realWin('install scripts', {
-  amp: true,
-  fakeRegisterElement: true,
-}, env => {
-  let manager;
-  let ampdoc;
-  let win;
-  let doc;
-  let extensions;
-
-  beforeEach(function() {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    extensions = env.extensions;
-    manager = liveListManagerForDoc(ampdoc);
-  });
+describes.realWin(
+  'install scripts',
+  {
+    amp: true,
+    fakeRegisterElement: true,
+  },
+  env => {
+    let manager;
+    let ampdoc;
+    let win;
+    let doc;
+    let extensions;
+
+    beforeEach(function() {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      extensions = env.extensions;
+      manager = liveListManagerForDoc(ampdoc);
+    });
 
-  it('should install newly discovered script tags on xhr doc', () => {
-    // Emulate doc
-    const div = document.createElement('div');
-    const script1 = document.createElement('script');
-    const script2 = document.createElement('script');
-    script1.setAttribute('custom-element', 'amp-test');
-    script2.setAttribute('custom-template', 'amp-template');
-    div.appendChild(script1);
-    div.appendChild(script2);
-
-    expect(doc.head.querySelectorAll(
-        '[custom-element="amp-test"]')).to.have.length(0);
-    expect(extensions.extensions_['amp-test']).to.be.undefined;
-
-    expect(doc.head.querySelectorAll(
-        '[custom-template="amp-template"]')).to.have.length(0);
-    expect(extensions.extensions_['amp-template']).to.be.undefined;
-
-    manager.installExtensionsForDoc_(div);
-
-    expect(doc.head.querySelectorAll(
-        '[custom-element="amp-test"]')).to.have.length(1);
-    expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-
-    expect(doc.head.querySelectorAll(
-        '[custom-element="amp-template"]')).to.have.length(1);
-    expect(extensions.extensions_['amp-template'].scriptPresent).to.be.true;
-  });
-});
+    it('should install newly discovered script tags on xhr doc', () => {
+      // Emulate doc
+      const div = document.createElement('div');
+      const script1 = document.createElement('script');
+      const script2 = document.createElement('script');
+      script1.setAttribute('custom-element', 'amp-test');
+      script2.setAttribute('custom-template', 'amp-template');
+      div.appendChild(script1);
+      div.appendChild(script2);
+
+      expect(
+        doc.head.querySelectorAll('[custom-element="amp-test"]')
+      ).to.have.length(0);
+      expect(extensions.extensions_['amp-test']).to.be.undefined;
+
+      expect(
+        doc.head.querySelectorAll('[custom-template="amp-template"]')
+      ).to.have.length(0);
+      expect(extensions.extensions_['amp-template']).to.be.undefined;
+
+      manager.installExtensionsForDoc_(div);
+
+      expect(
+        doc.head.querySelectorAll('[custom-element="amp-test"]')
+      ).to.have.length(1);
+      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+
+      expect(
+        doc.head.querySelectorAll('[custom-element="amp-template"]')
+      ).to.have.length(1);
+      expect(extensions.extensions_['amp-template'].scriptPresent).to.be.true;
+    });
+  }
+);
diff --git a/extensions/amp-live-list/0.1/test/test-poller.js b/extensions/amp-live-list/0.1/test/test-poller.js
index f1359901be70..d7099b6fc67d 100644
--- a/extensions/amp-live-list/0.1/test/test-poller.js
+++ b/extensions/amp-live-list/0.1/test/test-poller.js
@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-
 import {Poller} from '../poller';
 import {Services} from '../../../../src/services';
 
-
 describe('Poller', () => {
   let sandbox;
   let clock;
@@ -68,16 +66,18 @@ describe('Poller', () => {
     poller.start();
     clock.tick(4000);
     expect(workStub).to.be.calledOnce;
-    return poller.lastWorkPromise_.then(() => {
-      clock.tick(2000);
-      expect(workStub).to.be.calledOnce;
-      clock.tick(2000);
-      expect(workStub).to.have.callCount(2);
-      poller.stop();
-    }).then(() => {
-      clock.tick(8000);
-      expect(workStub).to.have.callCount(2);
-    });
+    return poller.lastWorkPromise_
+      .then(() => {
+        clock.tick(2000);
+        expect(workStub).to.be.calledOnce;
+        clock.tick(2000);
+        expect(workStub).to.have.callCount(2);
+        poller.stop();
+      })
+      .then(() => {
+        clock.tick(8000);
+        expect(workStub).to.have.callCount(2);
+      });
   });
 
   it('should execute work w/o initial delay', () => {
@@ -85,20 +85,22 @@ describe('Poller', () => {
     expect(workStub).to.have.not.been.called;
     poller.start(true);
     expect(workStub).to.be.calledOnce;
-    return poller.lastWorkPromise_.then(() => {
-      expect(workStub).to.be.calledOnce;
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_.then(() => {
-        expect(workStub).to.have.callCount(2);
+    return poller.lastWorkPromise_
+      .then(() => {
+        expect(workStub).to.be.calledOnce;
         clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_.then(() => {
+          expect(workStub).to.have.callCount(2);
+          clock.tick(4000);
+          expect(workStub).to.have.callCount(3);
+          poller.stop();
+        });
+      })
+      .then(() => {
+        clock.tick(8000);
         expect(workStub).to.have.callCount(3);
-        poller.stop();
       });
-    }).then(() => {
-      clock.tick(8000);
-      expect(workStub).to.have.callCount(3);
-    });
   });
 
   it('should not double any work if already started', () => {
@@ -108,15 +110,17 @@ describe('Poller', () => {
     clock.tick(4000);
     expect(workStub).to.be.calledOnce;
     poller.start();
-    return poller.lastWorkPromise_.then(() => {
-      expect(workStub).to.be.calledOnce;
-      poller.start();
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(2);
-    });
+    return poller.lastWorkPromise_
+      .then(() => {
+        expect(workStub).to.be.calledOnce;
+        poller.start();
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(2);
+      });
   });
 
   it('should run backoff and recover on retriable error', () => {
@@ -134,43 +138,50 @@ describe('Poller', () => {
     clock.tick(4000);
     expect(workStub).to.be.calledOnce;
 
-    return poller.lastWorkPromise_.then(() => {
-      expect(workStub).to.be.calledOnce;
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(2);
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(3);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(3);
-      clock.tick(700);
-      expect(workStub).to.have.callCount(4);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(4);
-      clock.tick(700);
-      expect(workStub).to.have.callCount(4);
-      clock.tick(700);
-      expect(workStub).to.have.callCount(5);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(5);
-      clock.tick(2800);
-      expect(workStub).to.have.callCount(6);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(6);
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(7);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(7);
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(8);
-    });
+    return poller.lastWorkPromise_
+      .then(() => {
+        expect(workStub).to.be.calledOnce;
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(2);
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(3);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(3);
+        clock.tick(700);
+        expect(workStub).to.have.callCount(4);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(4);
+        clock.tick(700);
+        expect(workStub).to.have.callCount(4);
+        clock.tick(700);
+        expect(workStub).to.have.callCount(5);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(5);
+        clock.tick(2800);
+        expect(workStub).to.have.callCount(6);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(6);
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(7);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(7);
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(8);
+      });
   });
 
   it('should stop work if stopped', () => {
@@ -179,20 +190,23 @@ describe('Poller', () => {
     poller.start();
     clock.tick(4000);
     expect(workStub).to.be.calledOnce;
-    return poller.lastWorkPromise_.then(() => {
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      poller.stop();
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      clock.tick(4000);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_;
-    });
+    return poller.lastWorkPromise_
+      .then(() => {
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        poller.stop();
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        clock.tick(4000);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_;
+      });
   });
 
   it('should shutoff backoff if stopped', () => {
@@ -203,30 +217,35 @@ describe('Poller', () => {
     poller.start();
     clock.tick(4000);
     expect(workStub).to.be.calledOnce;
-    return poller.lastWorkPromise_.then(() => {
-      expect(workStub).to.be.calledOnce;
-      clock.tick(700);
-      expect(workStub).to.have.callCount(2);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      expect(workStub).to.have.callCount(2);
-      clock.tick(1400);
-      expect(workStub).to.have.callCount(3);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      poller.stop();
-      clock.tick(2800);
-      expect(workStub).to.have.callCount(3);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      clock.tick(5600);
-      expect(workStub).to.have.callCount(3);
-      return poller.lastWorkPromise_;
-    }).then(() => {
-      clock.tick(11200);
-      expect(workStub).to.have.callCount(3);
-      return poller.lastWorkPromise_;
-    });
+    return poller.lastWorkPromise_
+      .then(() => {
+        expect(workStub).to.be.calledOnce;
+        clock.tick(700);
+        expect(workStub).to.have.callCount(2);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        expect(workStub).to.have.callCount(2);
+        clock.tick(1400);
+        expect(workStub).to.have.callCount(3);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        poller.stop();
+        clock.tick(2800);
+        expect(workStub).to.have.callCount(3);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        clock.tick(5600);
+        expect(workStub).to.have.callCount(3);
+        return poller.lastWorkPromise_;
+      })
+      .then(() => {
+        clock.tick(11200);
+        expect(workStub).to.have.callCount(3);
+        return poller.lastWorkPromise_;
+      });
   });
 
   it('should clear timeout ids if stopped', () => {
diff --git a/extensions/amp-mathml/0.1/amp-mathml.js b/extensions/amp-mathml/0.1/amp-mathml.js
index 43f7f676d9b1..2e37e8b9a735 100644
--- a/extensions/amp-mathml/0.1/amp-mathml.js
+++ b/extensions/amp-mathml/0.1/amp-mathml.js
@@ -21,7 +21,6 @@ import {removeElement} from '../../../src/dom';
 import {setStyles} from '../../../src/style';
 
 export class AmpMathml extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -54,7 +53,6 @@ export class AmpMathml extends AMP.BaseElement {
         height: '1rem',
       });
     });
-
   }
 
   /**
@@ -66,14 +64,20 @@ export class AmpMathml extends AMP.BaseElement {
     const iframe = getIframe(this.win, this.element, 'mathml');
     this.applyFillContent(iframe);
     // Triggered by context.updateDimensions() inside the iframe.
-    listenFor(iframe, 'embed-size', data => {
-      if (!this.element.hasAttribute('inline')) {
-        // Don't change the width if not inlined.
-        data['width'] = undefined;
-      }
-      this.element.getResources()./*OK*/changeSize(
-          this.element, data['height'], data['width']);
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        if (!this.element.hasAttribute('inline')) {
+          // Don't change the width if not inlined.
+          data['width'] = undefined;
+        }
+        this.element
+          .getResources()
+          ./*OK*/ changeSize(this.element, data['height'], data['width']);
+      },
+      /* opt_is3P */ true
+    );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
     return this.loadPromise(iframe);
diff --git a/extensions/amp-mowplayer/0.1/amp-mowplayer.js b/extensions/amp-mowplayer/0.1/amp-mowplayer.js
index 4661ec0e3fc0..2e70a55ff34e 100644
--- a/extensions/amp-mowplayer/0.1/amp-mowplayer.js
+++ b/extensions/amp-mowplayer/0.1/amp-mowplayer.js
@@ -35,9 +35,7 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 const TAG = 'amp-mowplayer';
@@ -55,7 +53,6 @@ const PlayerStates = {
 
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpMowplayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -108,9 +105,10 @@ class AmpMowplayer extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.mediaid_ = userAssert(
-        (this.element.getAttribute('data-mediaid')),
-        '/The data-mediaid attribute is required for <amp-mowplayer> %s',
-        this.element);
+      this.element.getAttribute('data-mediaid'),
+      '/The data-mediaid attribute is required for <amp-mowplayer> %s',
+      this.element
+    );
 
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
@@ -131,10 +129,12 @@ class AmpMowplayer extends AMP.BaseElement {
     const params = dict({
       'code': this.mediaid_,
     });
-    const src = addParamsToUrl('https://cdn.mowplayer.com/player.html',
-        /** @type {!JsonObject} */ (params));
+    const src = addParamsToUrl(
+      'https://cdn.mowplayer.com/player.html',
+      /** @type {!JsonObject} */ (params)
+    );
 
-    return this.videoIframeSrc_ = src;
+    return (this.videoIframeSrc_ = src);
   }
 
   /** @override */
@@ -142,9 +142,9 @@ class AmpMowplayer extends AMP.BaseElement {
     const iframe = createFrameFor(this, this.getVideoIframeSrc_());
     this.iframe_ = iframe;
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleMowMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleMowMessage_.bind(this)
     );
     const loaded = this.loadPromise(this.iframe_).then(() => {
       // Tell mowplayer that we want to receive messages
@@ -197,12 +197,17 @@ class AmpMowplayer extends AMP.BaseElement {
   sendCommand_(command, opt_args) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(dict({
-          'event': 'command',
-          'func': command,
-          'args': opt_args || '',
-        }));
-        this.iframe_.contentWindow./*OK*/postMessage(message, 'https://cdn.mowplayer.com');
+        const message = JSON.stringify(
+          dict({
+            'event': 'command',
+            'func': command,
+            'args': opt_args || '',
+          })
+        );
+        this.iframe_.contentWindow./*OK*/ postMessage(
+          message,
+          'https://cdn.mowplayer.com'
+        );
       }
     });
   }
@@ -256,7 +261,6 @@ class AmpMowplayer extends AMP.BaseElement {
       element.dispatchCustomEvent(mutedOrUnmutedEvent(this.muted_));
       return;
     }
-
   }
 
   /**
@@ -274,7 +278,6 @@ class AmpMowplayer extends AMP.BaseElement {
       window.location.origin,
       true,
     ]);
-
   }
 
   /** @override */
@@ -380,7 +383,6 @@ class AmpMowplayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpMowplayer);
 });
diff --git a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
index a3614d446f53..d29cb96031c9 100644
--- a/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
+++ b/extensions/amp-mowplayer/0.1/test/test-amp-mowplayer.js
@@ -14,84 +14,100 @@
  * limitations under the License.
  */
 
-
 import '../amp-mowplayer';
 import {Services} from '../../../../src/services';
 import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 
 const EXAMPLE_VIDEOID = 'myfwarfx4tb';
-const EXAMPLE_VIDEOID_URL = 'https://cdn.mowplayer.com/player.html?code=myfwarfx4tb';
+const EXAMPLE_VIDEOID_URL =
+  'https://cdn.mowplayer.com/player.html?code=myfwarfx4tb';
 
-describes.realWin('amp-mowplayer', {
-  amp: {
-    extensions: ['amp-mowplayer'],
+describes.realWin(
+  'amp-mowplayer',
+  {
+    amp: {
+      extensions: ['amp-mowplayer'],
+    },
   },
-}, function(env) {
-  this.timeout(5000);
-  let win, doc;
-  let timer;
+  function(env) {
+    this.timeout(5000);
+    let win, doc;
+    let timer;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+    });
 
-  function getMowPlayer(attributes, opt_responsive, opt_beforeLayoutCallback) {
-    const mp = doc.createElement('amp-mowplayer');
-    for (const key in attributes) {
-      mp.setAttribute(key, attributes[key]);
-    }
-    mp.setAttribute('width', '250');
-    mp.setAttribute('height', '180');
-    if (opt_responsive) {
-      mp.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(mp);
-    return mp.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(mp);
+    function getMowPlayer(
+      attributes,
+      opt_responsive,
+      opt_beforeLayoutCallback
+    ) {
+      const mp = doc.createElement('amp-mowplayer');
+      for (const key in attributes) {
+        mp.setAttribute(key, attributes[key]);
       }
-      return mp.layoutCallback();
-    }).then(() => {
-      const mpIframe = mp.querySelector('iframe');
-      mp.implementation_.handleMowMessage_({
-        origin: 'https://cdn.mowplayer.com',
-        source: mpIframe.contentWindow,
-        data: JSON.stringify({event: 'onReady'}),
-      });
-    }).then(() => mp);
-  }
+      mp.setAttribute('width', '250');
+      mp.setAttribute('height', '180');
+      if (opt_responsive) {
+        mp.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(mp);
+      return mp
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(mp);
+          }
+          return mp.layoutCallback();
+        })
+        .then(() => {
+          const mpIframe = mp.querySelector('iframe');
+          mp.implementation_.handleMowMessage_({
+            origin: 'https://cdn.mowplayer.com',
+            source: mpIframe.contentWindow,
+            data: JSON.stringify({event: 'onReady'}),
+          });
+        })
+        .then(() => mp);
+    }
 
-  describe('with data-mediaid', function() {
-    runTestsForDatasource(EXAMPLE_VIDEOID);
-  });
+    describe('with data-mediaid', function() {
+      runTestsForDatasource(EXAMPLE_VIDEOID);
+    });
 
-  /**
+    /**
      * This function runs generic tests for components based on
      * data-videoid or data-live-channelid.
      * @param {string} datasource
      */
-  function runTestsForDatasource(datasource) {
-    it('renders', () => {
-      return getMowPlayer({'data-mediaid': EXAMPLE_VIDEOID}, true).then(mp => {
-        const iframe = mp.querySelector('iframe');
-        expect(iframe).to.not.be.null;
-        expect(iframe.tagName).to.equal('IFRAME');
-        expect(iframe.src).to.equal(EXAMPLE_VIDEOID_URL);
+    function runTestsForDatasource(datasource) {
+      it('renders', () => {
+        return getMowPlayer({'data-mediaid': EXAMPLE_VIDEOID}, true).then(
+          mp => {
+            const iframe = mp.querySelector('iframe');
+            expect(iframe).to.not.be.null;
+            expect(iframe.tagName).to.equal('IFRAME');
+            expect(iframe.src).to.equal(EXAMPLE_VIDEOID_URL);
+          }
+        );
       });
-    });
 
-    it('requires data-mediaid', () => allowConsoleError(() =>
-      getMowPlayer({}).should.eventually.be.rejectedWith(
-          /The data-mediaid attribute is required for/)));
+      it('requires data-mediaid', () =>
+        allowConsoleError(() =>
+          getMowPlayer({}).should.eventually.be.rejectedWith(
+            /The data-mediaid attribute is required for/
+          )
+        ));
 
-    it('should send events from mowplayer to the amp element', () => {
-      return getMowPlayer({'data-mediaid': datasource}).then(mp => {
-        const iframe = mp.querySelector('iframe');
+      it('should send events from mowplayer to the amp element', () => {
+        return getMowPlayer({'data-mediaid': datasource}).then(mp => {
+          const iframe = mp.querySelector('iframe');
 
-        return Promise.resolve()
+          return Promise.resolve()
             .then(() => {
               const p = listenOncePromise(mp, VideoEvents.MUTED);
               sendFakeInfoDeliveryMessage(mp, iframe, {muted: true});
@@ -111,7 +127,8 @@ describes.realWin('amp-mowplayer', {
               const p = listenOncePromise(mp, VideoEvents.UNMUTED);
               sendFakeInfoDeliveryMessage(mp, iframe, {muted: false});
               return p;
-            }).then(() => {
+            })
+            .then(() => {
               // Should not send the unmute event twice if already sent once.
               const p = listenOncePromise(mp, VideoEvents.UNMUTED).then(() => {
                 assert.fail('Should not have dispatch unmute message twice');
@@ -119,25 +136,27 @@ describes.realWin('amp-mowplayer', {
               sendFakeInfoDeliveryMessage(mp, iframe, {muted: false});
               const successTimeout = timer.promise(10);
               return Promise.race([p, successTimeout]);
-            }).then(() => {
+            })
+            .then(() => {
               // Make sure pause and end are triggered when video ends.
               const pEnded = listenOncePromise(mp, VideoEvents.ENDED);
               const pPause = listenOncePromise(mp, VideoEvents.PAUSE);
               sendFakeInfoDeliveryMessage(mp, iframe, {playerState: 0});
               return Promise.all([pEnded, pPause]);
             });
+        });
       });
-    });
-  }
+    }
 
-  function sendFakeInfoDeliveryMessage(mp, iframe, info) {
-    mp.implementation_.handleMowMessage_({
-      origin: 'https://cdn.mowplayer.com',
-      source: iframe.contentWindow,
-      data: JSON.stringify({
-        event: 'infoDelivery',
-        info,
-      }),
-    });
+    function sendFakeInfoDeliveryMessage(mp, iframe, info) {
+      mp.implementation_.handleMowMessage_({
+        origin: 'https://cdn.mowplayer.com',
+        source: iframe.contentWindow,
+        data: JSON.stringify({
+          event: 'infoDelivery',
+          info,
+        }),
+      });
+    }
   }
-});
+);
diff --git a/extensions/amp-mraid/0.1/amp-mraid.js b/extensions/amp-mraid/0.1/amp-mraid.js
index ad2e2d17d54c..d6db4c331d49 100644
--- a/extensions/amp-mraid/0.1/amp-mraid.js
+++ b/extensions/amp-mraid/0.1/amp-mraid.js
@@ -66,8 +66,9 @@ export class MraidInitializer {
     /** @private {boolean} */
     this.fallback_ = true;
 
-    const ampMraidScripts = this.ampdoc_.getHeadNode().querySelectorAll(
-        'script[host-service="amp-mraid"]');
+    const ampMraidScripts = this.ampdoc_
+      .getHeadNode()
+      .querySelectorAll('script[host-service="amp-mraid"]');
     if (ampMraidScripts.length > 1) {
       dev().error(TAG, 'Multiple amp-mraid scripts.');
       return;
@@ -122,26 +123,30 @@ export class MraidInitializer {
 
     if (this.mraid_.addEventListener) {
       HostServices.installVisibilityServiceForDoc(
-          this.ampdoc_, () => mraidService);
+        this.ampdoc_,
+        () => mraidService
+      );
     } else {
-      HostServices.rejectVisibilityServiceForDoc(
-          this.ampdoc_, {fallback: false});
+      HostServices.rejectVisibilityServiceForDoc(this.ampdoc_, {
+        fallback: false,
+      });
     }
 
     if (this.mraid_.expand && this.mraid_.close) {
       HostServices.installFullscreenServiceForDoc(
-          this.ampdoc_, () => mraidService);
+        this.ampdoc_,
+        () => mraidService
+      );
     } else {
-      HostServices.rejectFullscreenServiceForDoc(
-          this.ampdoc_, {fallback: false});
+      HostServices.rejectFullscreenServiceForDoc(this.ampdoc_, {
+        fallback: false,
+      });
     }
 
     if (this.mraid_.open) {
-      HostServices.installExitServiceForDoc(
-          this.ampdoc_, () => mraidService);
+      HostServices.installExitServiceForDoc(this.ampdoc_, () => mraidService);
     } else {
-      HostServices.rejectExitServiceForDoc(
-          this.ampdoc_, {fallback: true}); // always fallback for exit service
+      HostServices.rejectExitServiceForDoc(this.ampdoc_, {fallback: true}); // always fallback for exit service
     }
     this.registeredWithHostServices_ = true;
   }
@@ -169,12 +174,13 @@ export class MraidInitializer {
    * Called when we determine that MRAID isn't available.
    */
   handleMismatch_() {
-    HostServices.rejectVisibilityServiceForDoc(
-        this.ampdoc_, {fallback: this.fallback_});
-    HostServices.rejectExitServiceForDoc(
-        this.ampdoc_, {fallback: true}); // always fallback for exit service
-    HostServices.rejectFullscreenServiceForDoc(
-        this.ampdoc_, {fallback: this.fallback_});
+    HostServices.rejectVisibilityServiceForDoc(this.ampdoc_, {
+      fallback: this.fallback_,
+    });
+    HostServices.rejectExitServiceForDoc(this.ampdoc_, {fallback: true}); // always fallback for exit service
+    HostServices.rejectFullscreenServiceForDoc(this.ampdoc_, {
+      fallback: this.fallback_,
+    });
   }
 }
 
diff --git a/extensions/amp-mraid/0.1/mraid-service.js b/extensions/amp-mraid/0.1/mraid-service.js
index e3247ae1360c..e2f924d4a331 100644
--- a/extensions/amp-mraid/0.1/mraid-service.js
+++ b/extensions/amp-mraid/0.1/mraid-service.js
@@ -83,25 +83,26 @@ export class MraidService {
     //    subset of LayoutRectDef, though, with x/y position and width/height,
     //    and we can pass it through to the callback directly.
     this.mraid_.addEventListener(
-        'exposureChange',
-        (exposedPercentage,
-          visibleRectangle,
-          unusedOcclusionRectangles) => {
+      'exposureChange',
+      (exposedPercentage, visibleRectangle, unusedOcclusionRectangles) => {
+        // AMP handles intersectionRatio from 0.0 to 1.0
+        callback({
+          // Need to convert x/y to the AMP runtime used left/top
+          visibleRect: layoutRectLtwh(
+            visibleRectangle && visibleRectangle.x ? visibleRectangle.x : 0,
+            visibleRectangle && visibleRectangle.y ? visibleRectangle.y : 0,
+            visibleRectangle && visibleRectangle.width
+              ? visibleRectangle.width
+              : 0,
+            visibleRectangle && visibleRectangle.height
+              ? visibleRectangle.height
+              : 0
+          ),
           // AMP handles intersectionRatio from 0.0 to 1.0
-          callback({
-            // Need to convert x/y to the AMP runtime used left/top
-            visibleRect: layoutRectLtwh(
-                visibleRectangle && visibleRectangle.x ? visibleRectangle.x : 0,
-                visibleRectangle && visibleRectangle.y ? visibleRectangle.y : 0,
-                visibleRectangle && visibleRectangle.width ?
-                  visibleRectangle.width : 0,
-                visibleRectangle && visibleRectangle.height ?
-                  visibleRectangle.height : 0
-            ),
-            // AMP handles intersectionRatio from 0.0 to 1.0
-            visibleRatio: exposedPercentage / 100,
-          });
+          visibleRatio: exposedPercentage / 100,
         });
+      }
+    );
     // TODO: Return unlistener
   }
 
@@ -113,9 +114,11 @@ export class MraidService {
    *     indicating if the request was fulfilled
    */
   enterFullscreenOverlay(unusedTargetElement) {
-    if (this.expanded_) {return Promise.resolve(false);}
+    if (this.expanded_) {
+      return Promise.resolve(false);
+    }
 
-    this.mraid_./*OK*/expand();
+    this.mraid_./*OK*/ expand();
     this.expanded_ = true;
     return Promise.resolve(true);
   }
@@ -128,7 +131,9 @@ export class MraidService {
    *     indicating if the request was fulfilled
    */
   exitFullscreenOverlay(unusedTargetElement) {
-    if (!this.expanded_) {return Promise.resolve(false);}
+    if (!this.expanded_) {
+      return Promise.resolve(false);
+    }
 
     this.mraid_.close();
     this.expanded_ = false;
diff --git a/extensions/amp-mustache/0.1/amp-mustache.js b/extensions/amp-mustache/0.1/amp-mustache.js
index d750b1b57a07..0aca01a9de02 100644
--- a/extensions/amp-mustache/0.1/amp-mustache.js
+++ b/extensions/amp-mustache/0.1/amp-mustache.js
@@ -52,8 +52,11 @@ export class AmpMustache extends AMP.BaseTemplate {
     // Unescaped templating (triple mustache) has a special, strict sanitizer.
     mustache.setUnescapedSanitizer(sanitizeTagsForTripleMustache);
 
-    user().warn(TAG, 'The extension "amp-mustache-0.1.js" is deprecated. ' +
-        'Please use a more recent version of this extension.');
+    user().warn(
+      TAG,
+      'The extension "amp-mustache-0.1.js" is deprecated. ' +
+        'Please use a more recent version of this extension.'
+    );
   }
 
   /** @override */
@@ -83,7 +86,7 @@ export class AmpMustache extends AMP.BaseTemplate {
       this.processNestedTemplates_(content);
       const container = this.element.ownerDocument.createElement('div');
       container.appendChild(content);
-      return container./*OK*/innerHTML;
+      return container./*OK*/ innerHTML;
     } else if (this.element.tagName == 'SCRIPT') {
       return this.element.textContent;
     }
@@ -105,11 +108,14 @@ export class AmpMustache extends AMP.BaseTemplate {
     iterateCursor(templates, (nestedTemplate, index) => {
       const nestedTemplateKey = `__AMP_NESTED_TEMPLATE_${index}`;
       this.nestedTemplates_[nestedTemplateKey] =
-          nestedTemplate./*OK*/outerHTML;
-      const nestedTemplateAsVariable = this.element.ownerDocument
-          .createTextNode(`{{{${nestedTemplateKey}}}}`);
-      nestedTemplate.parentNode.replaceChild(nestedTemplateAsVariable,
-          nestedTemplate);
+        nestedTemplate./*OK*/ outerHTML;
+      const nestedTemplateAsVariable = this.element.ownerDocument.createTextNode(
+        `{{{${nestedTemplateKey}}}}`
+      );
+      nestedTemplate.parentNode.replaceChild(
+        nestedTemplateAsVariable,
+        nestedTemplate
+      );
     });
   }
 
@@ -124,8 +130,11 @@ export class AmpMustache extends AMP.BaseTemplate {
     if (typeof data === 'object') {
       mustacheData = Object.assign({}, data, this.nestedTemplates_);
     }
-    const html = mustache.render(this.template_, mustacheData,
-        /* partials */ undefined);
+    const html = mustache.render(
+      this.template_,
+      mustacheData,
+      /* partials */ undefined
+    );
     return this.serializeHtml_(html);
   }
 
@@ -140,7 +149,7 @@ export class AmpMustache extends AMP.BaseTemplate {
     const root = doc.createElement('div');
     const diffing = isExperimentOn(self, 'amp-list-diffing');
     const sanitized = sanitizeHtml(html, doc, diffing);
-    root./*OK*/innerHTML = sanitized;
+    root./*OK*/ innerHTML = sanitized;
     return this.unwrap(root);
   }
 }
diff --git a/extensions/amp-mustache/0.1/test/test-amp-mustache.js b/extensions/amp-mustache/0.1/test/test-amp-mustache.js
index 50109b54f04b..10c4a998a480 100644
--- a/extensions/amp-mustache/0.1/test/test-amp-mustache.js
+++ b/extensions/amp-mustache/0.1/test/test-amp-mustache.js
@@ -19,535 +19,581 @@ import * as service from '../../../../src/service';
 import {AmpMustache} from '../amp-mustache';
 import mustache from '../../../../third_party/mustache/mustache';
 
-describes.repeated('amp-mustache 0.1', {
-  'with script[type=text/plain][template=amp-mustache]':
-      {templateType: 'script'},
-  'with template[type=amp-mustache]':
-      {templateType: 'template'},
-}, (name, variant) => {
-
-  let sandbox;
-  let viewerCanRenderTemplates = false;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
-    const getServiceForDocStub = sandbox.stub(service, 'getServiceForDoc');
-    getServiceForDocStub.returns({
-      hasCapability: unused => viewerCanRenderTemplates,
-    });
-  });
-
-  afterEach(() => sandbox.restore());
-
-  let innerHtmlSetup;
-  let template;
-  let templateElement;
-  let textContentSetup;
-  let isTemplateType;
-  let isTemplateTypeScript;
-
-  beforeEach(() => {
-    const {templateType} = variant;
-    templateElement = document.createElement(templateType);
-    if (templateType == 'script') {
-      templateElement.setAttribute('type', 'amp-mustache');
-    }
-    template = new AmpMustache(templateElement);
-    isTemplateTypeScript = templateType == 'script';
-    isTemplateType = templateType == 'template';
-    textContentSetup = contents => {
-      if (isTemplateType) {
-        templateElement.content.textContent = contents;
-      } else if (isTemplateTypeScript) {
-        templateElement.textContent = contents;
-      }
-    };
-    innerHtmlSetup = html => {
-      if (isTemplateType) {
-        templateElement./*OK*/innerHTML = html;
-      } else if (isTemplateTypeScript) {
-        templateElement.textContent = html;
-      }
-    };
-  });
-
-  afterEach(() => viewerCanRenderTemplates = false);
-
-  it('should render', () => {
-    textContentSetup('value = {{value}}');
-    template.compileCallback();
-    const result = template.render({value: 'abc'});
-    expect(result./*OK*/innerHTML).to.equal('value = abc');
-  });
-
-  it('should render {{.}} from string', () => {
-    textContentSetup('value = {{.}}');
-    template.compileCallback();
-    const result = template.render('abc');
-    expect(result./*OK*/innerHTML).to.equal('value = abc');
-  });
-
-  it('should sanitize output', () => {
-    innerHtmlSetup('value = <a href="{{value}}">abc</a>');
-    template.compileCallback();
-    allowConsoleError(() => {
-      const result = template.render({
-        value: /*eslint no-script-url: 0*/ 'javascript:alert();',
+describes.repeated(
+  'amp-mustache 0.1',
+  {
+    'with script[type=text/plain][template=amp-mustache]': {
+      templateType: 'script',
+    },
+    'with template[type=amp-mustache]': {templateType: 'template'},
+  },
+  (name, variant) => {
+    let sandbox;
+    let viewerCanRenderTemplates = false;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
+      const getServiceForDocStub = sandbox.stub(service, 'getServiceForDoc');
+      getServiceForDocStub.returns({
+        hasCapability: unused => viewerCanRenderTemplates,
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <a target="_top">abc</a>');
     });
-  });
-
-  it('should sanitize templated tag names', () => {
-    innerHtmlSetup(
-        'value = <{{value}} href="javascript:alert(0)">abc</{{value}}>');
-    template.compileCallback();
-    const result = template.render({
-      value: 'a',
+
+    afterEach(() => sandbox.restore());
+
+    let innerHtmlSetup;
+    let template;
+    let templateElement;
+    let textContentSetup;
+    let isTemplateType;
+    let isTemplateTypeScript;
+
+    beforeEach(() => {
+      const {templateType} = variant;
+      templateElement = document.createElement(templateType);
+      if (templateType == 'script') {
+        templateElement.setAttribute('type', 'amp-mustache');
+      }
+      template = new AmpMustache(templateElement);
+      isTemplateTypeScript = templateType == 'script';
+      isTemplateType = templateType == 'template';
+      textContentSetup = contents => {
+        if (isTemplateType) {
+          templateElement.content.textContent = contents;
+        } else if (isTemplateTypeScript) {
+          templateElement.textContent = contents;
+        }
+      };
+      innerHtmlSetup = html => {
+        if (isTemplateType) {
+          templateElement./*OK*/ innerHTML = html;
+        } else if (isTemplateTypeScript) {
+          templateElement.textContent = html;
+        }
+      };
     });
-    expect(result./*OK*/innerHTML).to.not
-        .equal('<a href="javascript:alert(0)">abc</a>');
-  });
 
-  describe('Sanitizing data- attributes', () => {
-    it('should sanitize templated attribute names', () => {
-      innerHtmlSetup(
-          'value = <a {{value}}="javascript:alert(0)">abc</a>');
+    afterEach(() => (viewerCanRenderTemplates = false));
+
+    it('should render', () => {
+      textContentSetup('value = {{value}}');
       template.compileCallback();
-      allowConsoleError(() => {
-        const result = template.render({
-          value: 'href',
-        });
-        expect(result).to.not.equal('<a href="javascript:alert(0)">abc</a>');
-        expect(result.firstElementChild.getAttribute('href')).to.be.null;
-      });
+      const result = template.render({value: 'abc'});
+      expect(result./*OK*/ innerHTML).to.equal('value = abc');
     });
 
-    it('should sanitize templated bind attribute names', () => {
-      innerHtmlSetup('value = <p [{{value}}]="javascript:alert()">ALERT</p>');
+    it('should render {{.}} from string', () => {
+      textContentSetup('value = {{.}}');
       template.compileCallback();
-      allowConsoleError(() => {
-        const result = template.render({
-          value: 'onclick',
-        });
-        expect(result).to.not
-            .equal('<p [onclick]="javascript:alert()">ALERT</p>');
-        expect(result.firstElementChild.getAttribute('[onclick]')).to.be.null;
-        expect(result.firstElementChild.getAttribute('onclick')).to.be.null;
-      });
+      const result = template.render('abc');
+      expect(result./*OK*/ innerHTML).to.equal('value = abc');
     });
 
-    it('should parse data-&style=value output correctly', () => {
-      innerHtmlSetup('value = <a href="{{value}}"' +
-          ' data-&style="color:red;">abc</a>');
+    it('should sanitize output', () => {
+      innerHtmlSetup('value = <a href="{{value}}">abc</a>');
       template.compileCallback();
       allowConsoleError(() => {
         const result = template.render({
           value: /*eslint no-script-url: 0*/ 'javascript:alert();',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <a data-="" style="color:red;" target="_top">abc</a>');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <a target="_top">abc</a>'
+        );
       });
     });
 
-    it('should parse data-&attr=value output correctly', () => {
-      innerHtmlSetup('value = <a data-&href="{{value}}">abc</a>');
+    it('should sanitize templated tag names', () => {
+      innerHtmlSetup(
+        'value = <{{value}} href="javascript:alert(0)">abc</{{value}}>'
+      );
       template.compileCallback();
       const result = template.render({
-        value: 'https://google.com/',
+        value: 'a',
       });
-      expect(result./*OK*/innerHTML).to.equal('value = <a data-=""' +
-          ' href="https://google.com/" target="_top">abc</a>');
+      expect(result./*OK*/ innerHTML).to.not.equal(
+        '<a href="javascript:alert(0)">abc</a>'
+      );
     });
 
-    it('should allow for data-attr=value to output correctly', () => {
-      innerHtmlSetup('value = ' +
-          '<a data-my-attr="{{invalidValue}}"' +
-          'data-my-id="{{value}}">abc</a>');
-      template.compileCallback();
-      allowConsoleError(() => {
-        const result = template.render({
-          value: 'myid',
-          invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+    describe('Sanitizing data- attributes', () => {
+      it('should sanitize templated attribute names', () => {
+        innerHtmlSetup('value = <a {{value}}="javascript:alert(0)">abc</a>');
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'href',
+          });
+          expect(result).to.not.equal('<a href="javascript:alert(0)">abc</a>');
+          expect(result.firstElementChild.getAttribute('href')).to.be.null;
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <a data-my-id="myid">abc</a>');
       });
-    });
-  });
 
-  describe('Rendering Form Fields', () => {
-    it('should allow rendering inputs', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}"' +
-          'type="text" onchange="{{invalidValue}}">');
-      template.compileCallback();
-      allowConsoleError(() => {
-        const result = template.render({
-          value: 'myid',
-          invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+      it('should sanitize templated bind attribute names', () => {
+        innerHtmlSetup('value = <p [{{value}}]="javascript:alert()">ALERT</p>');
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'onclick',
+          });
+          expect(result).to.not.equal(
+            '<p [onclick]="javascript:alert()">ALERT</p>'
+          );
+          expect(result.firstElementChild.getAttribute('[onclick]')).to.be.null;
+          expect(result.firstElementChild.getAttribute('onclick')).to.be.null;
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid" type="text">');
       });
-    });
 
-    it('should allow rendering textarea', () => {
-      innerHtmlSetup('value = <textarea>{{value}}</textarea>');
-      template.compileCallback();
-      const result = template.render({
-        value: 'Cool story bro.',
+      it('should parse data-&style=value output correctly', () => {
+        innerHtmlSetup(
+          'value = <a href="{{value}}" data-&style="color:red;">abc</a>'
+        );
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: /*eslint no-script-url: 0*/ 'javascript:alert();',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <a data-="" style="color:red;" target="_top">abc</a>'
+          );
+        });
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <textarea>Cool story bro.</textarea>');
-    });
 
-    it('should not allow image/file input types rendering', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" type="{{type}}">');
-      template.compileCallback();
-      allowConsoleError(() => {
+      it('should parse data-&attr=value output correctly', () => {
+        innerHtmlSetup('value = <a data-&href="{{value}}">abc</a>');
+        template.compileCallback();
         const result = template.render({
-          value: 'myid',
-          type: 'image',
+          value: 'https://google.com/',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <a data-=""' +
+            ' href="https://google.com/" target="_top">abc</a>'
+        );
       });
 
-      allowConsoleError(() => {
-        const result = template.render({
-          value: 'myid',
-          type: 'button',
+      it('should allow for data-attr=value to output correctly', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<a data-my-attr="{{invalidValue}}"' +
+            'data-my-id="{{value}}">abc</a>'
+        );
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <a data-my-id="myid">abc</a>'
+          );
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
       });
+    });
 
-      const fileResult = template.render({
-        value: 'myid',
-        type: 'file',
+    describe('Rendering Form Fields', () => {
+      it('should allow rendering inputs', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<input value="{{value}}"' +
+            'type="text" onchange="{{invalidValue}}">'
+        );
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid" type="text">'
+          );
+        });
       });
-      expect(fileResult./*OK*/innerHTML).to.equal(
-          'value = <input value="myid" type="file">');
 
-      const passwordResult = template.render({
-        value: 'myid',
-        type: 'password',
+      it('should allow rendering textarea', () => {
+        innerHtmlSetup('value = <textarea>{{value}}</textarea>');
+        template.compileCallback();
+        const result = template.render({
+          value: 'Cool story bro.',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <textarea>Cool story bro.</textarea>'
+        );
       });
-      expect(passwordResult./*OK*/innerHTML).to.equal(
-          'value = <input value="myid" type="password">');
-    });
 
-    it('should allow text input type rendering', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" type="{{type}}">');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
-        type: 'text',
+      it('should not allow image/file input types rendering', () => {
+        innerHtmlSetup('value = <input value="{{value}}" type="{{type}}">');
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            type: 'image',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
+
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            type: 'button',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
+
+        const fileResult = template.render({
+          value: 'myid',
+          type: 'file',
+        });
+        expect(fileResult./*OK*/ innerHTML).to.equal(
+          'value = <input value="myid" type="file">'
+        );
+
+        const passwordResult = template.render({
+          value: 'myid',
+          type: 'password',
+        });
+        expect(passwordResult./*OK*/ innerHTML).to.equal(
+          'value = <input value="myid" type="password">'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <input value="myid" type="text">');
-    });
 
-    it('should sanitize form-related attrs properly', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" ' +
-          'formaction="javascript:javascript:alert(1)" ' +
-          'formmethod="get" form="form1" formtarget="blank" formnovalidate ' +
-          'formenctype="">');
-      template.compileCallback();
-      allowConsoleError(() => {
+      it('should allow text input type rendering', () => {
+        innerHtmlSetup('value = <input value="{{value}}" type="{{type}}">');
+        template.compileCallback();
         const result = template.render({
           value: 'myid',
+          type: 'text',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <input value="myid" type="text">'
+        );
       });
-    });
 
-    it('should not sanitize form tags', () => {
-      innerHtmlSetup('value = ' +
-          '<form><input value="{{value}}"></form><input value="hello">');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
+      it('should sanitize form-related attrs properly', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<input value="{{value}}" ' +
+            'formaction="javascript:javascript:alert(1)" ' +
+            'formmethod="get" form="form1" formtarget="blank" formnovalidate ' +
+            'formenctype="">'
+        );
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <form><input value="myid"></form><input value="hello">');
-    });
-  });
 
-  describe('Nested templates', () => {
+      it('should not sanitize form tags', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<form><input value="{{value}}"></form><input value="hello">'
+        );
+        template.compileCallback();
+        const result = template.render({
+          value: 'myid',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <form><input value="myid"></form><input value="hello">'
+        );
+      });
+    });
 
-    it('should not sanitize nested amp-mustache templates', () => {
-      innerHtmlSetup(
+    describe('Nested templates', () => {
+      it('should not sanitize nested amp-mustache templates', () => {
+        innerHtmlSetup(
           'text before a template ' +
-          '<template type="amp-mustache">text inside template</template> ' +
-          'text after a template');
-      template.compileCallback();
-      const result = template.render({});
-      expect(result./*OK*/innerHTML).to.equal(
+            '<template type="amp-mustache">text inside template</template> ' +
+            'text after a template'
+        );
+        template.compileCallback();
+        const result = template.render({});
+        expect(result./*OK*/ innerHTML).to.equal(
           'text before a template ' +
-          '<template type="amp-mustache">text inside template</template> ' +
-          'text after a template');
-    });
+            '<template type="amp-mustache">text inside template</template> ' +
+            'text after a template'
+        );
+      });
 
-    if (isTemplateType) {
-      it('should sanitize nested templates without type="amp-mustache"',
-          () => {
-            innerHtmlSetup(
-                'text before a template ' +
-                '<template>text inside template</template> ' +
-                'text after a template');
-            template.compileCallback();
-            const result = template.render({});
-            expect(result./*OK*/innerHTML).to.equal(
-                'text before a template  text after a template');
-          });
+      if (isTemplateType) {
+        it('should sanitize nested templates without type="amp-mustache"', () => {
+          innerHtmlSetup(
+            'text before a template ' +
+              '<template>text inside template</template> ' +
+              'text after a template'
+          );
+          template.compileCallback();
+          const result = template.render({});
+          expect(result./*OK*/ innerHTML).to.equal(
+            'text before a template  text after a template'
+          );
+        });
 
-      it('should not render variables inside a nested template', () => {
-        innerHtmlSetup(
+        it('should not render variables inside a nested template', () => {
+          innerHtmlSetup(
             'outer: {{outerOnlyValue}} {{mutualValue}} ' +
-            '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
-            ' {{mutualValue}}</template>');
-        template.compileCallback();
-        const result = template.render({
-          outerOnlyValue: 'Outer',
-          mutualValue: 'Mutual',
-          nestedOnlyValue: 'Nested',
-        });
-        expect(result./*OK*/innerHTML).to.equal(
+              '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
+              ' {{mutualValue}}</template>'
+          );
+          template.compileCallback();
+          const result = template.render({
+            outerOnlyValue: 'Outer',
+            mutualValue: 'Mutual',
+            nestedOnlyValue: 'Nested',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
             'outer: Outer Mutual ' +
-            '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
-            ' {{mutualValue}}</template>');
-      });
+              '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
+              ' {{mutualValue}}</template>'
+          );
+        });
 
-      it('should compile and render nested templates when invoked', () => {
-        const outerTemplateElement = document.createElement('template');
-        outerTemplateElement./*OK*/innerHTML =
+        it('should compile and render nested templates when invoked', () => {
+          const outerTemplateElement = document.createElement('template');
+          outerTemplateElement./*OK*/ innerHTML =
             'outer: {{value}} ' +
             '<template type="amp-mustache">nested: {{value}}</template>';
-        const outerTemplate = new AmpMustache(outerTemplateElement);
-        outerTemplate.compileCallback();
-        const outerResult = outerTemplate.render({
-          value: 'Outer',
-        });
-        const nestedTemplateElement = outerResult.querySelector('template');
-        const nestedTemplate = new AmpMustache(nestedTemplateElement);
-        nestedTemplate.compileCallback();
-        const nestedResult = nestedTemplate.render({
-          value: 'Nested',
+          const outerTemplate = new AmpMustache(outerTemplateElement);
+          outerTemplate.compileCallback();
+          const outerResult = outerTemplate.render({
+            value: 'Outer',
+          });
+          const nestedTemplateElement = outerResult.querySelector('template');
+          const nestedTemplate = new AmpMustache(nestedTemplateElement);
+          nestedTemplate.compileCallback();
+          const nestedResult = nestedTemplate.render({
+            value: 'Nested',
+          });
+          expect(nestedResult./*OK*/ innerHTML).to.equal('nested: Nested');
         });
-        expect(nestedResult./*OK*/innerHTML).to.equal('nested: Nested');
-      });
 
-      it('should sanitize the inner template when it gets rendered', () => {
-        const outerTemplateElement = document.createElement('template');
-        outerTemplateElement./*OK*/innerHTML =
+        it('should sanitize the inner template when it gets rendered', () => {
+          const outerTemplateElement = document.createElement('template');
+          outerTemplateElement./*OK*/ innerHTML =
             'outer: {{value}} ' +
             '<template type="amp-mustache">' +
             '<div onclick="javascript:alert(\'I am evil\')">nested</div>: ' +
             '{{value}}</template>';
-        const outerTemplate = new AmpMustache(outerTemplateElement);
-        outerTemplate.compileCallback();
-        const outerResult = outerTemplate.render({
-          value: 'Outer',
-        });
-        const nestedTemplateElement = outerResult.querySelector('template');
-        const nestedTemplate = new AmpMustache(nestedTemplateElement);
-        nestedTemplate.compileCallback();
-        allowConsoleError(() => {
-          const nestedResult = nestedTemplate.render({
-            value: 'Nested',
+          const outerTemplate = new AmpMustache(outerTemplateElement);
+          outerTemplate.compileCallback();
+          const outerResult = outerTemplate.render({
+            value: 'Outer',
+          });
+          const nestedTemplateElement = outerResult.querySelector('template');
+          const nestedTemplate = new AmpMustache(nestedTemplateElement);
+          nestedTemplate.compileCallback();
+          allowConsoleError(() => {
+            const nestedResult = nestedTemplate.render({
+              value: 'Nested',
+            });
+            expect(nestedResult./*OK*/ innerHTML).to.equal(
+              '<div>nested</div>: Nested'
+            );
           });
-          expect(nestedResult./*OK*/innerHTML).to.equal(
-              '<div>nested</div>: Nested');
         });
-      });
 
-      it('should not allow users to pass data having key that starts with ' +
-          '__AMP_NESTED_TEMPLATE_0 when there is a nested template', () => {
-        templateElement./*OK*/innerHTML =
-        'outer: {{value}} ' +
-        '<template type="amp-mustache">nested: {{value}}</template>';
+        it(
+          'should not allow users to pass data having key that starts with ' +
+            '__AMP_NESTED_TEMPLATE_0 when there is a nested template',
+          () => {
+            templateElement./*OK*/ innerHTML =
+              'outer: {{value}} ' +
+              '<template type="amp-mustache">nested: {{value}}</template>';
+            template.compileCallback();
+            const result = template.render({
+              __AMP_NESTED_TEMPLATE_0: 'MUST NOT RENDER THIS',
+              value: 'Outer',
+            });
+            expect(result./*OK*/ innerHTML).to.equal(
+              'outer: Outer ' +
+                '<template type="amp-mustache">nested: {{value}}</template>'
+            );
+          }
+        );
+
+        it(
+          'should render user data with a key __AMP_NESTED_TEMPLATE_0 when' +
+            ' there are no nested templates, even though it is not a weird name' +
+            ' for a template variable',
+          () => {
+            templateElement./*OK*/ innerHTML = '{{__AMP_NESTED_TEMPLATE_0}}';
+            template.compileCallback();
+            const result = template.render({
+              __AMP_NESTED_TEMPLATE_0: '123',
+            });
+            expect(result./*OK*/ innerHTML).to.equal('123');
+          }
+        );
+      }
+    });
+
+    describe('triple-mustache', () => {
+      it('should sanitize formatting related elements', () => {
+        textContentSetup('value = {{{value}}}');
         template.compileCallback();
         const result = template.render({
-          __AMP_NESTED_TEMPLATE_0: 'MUST NOT RENDER THIS',
-          value: 'Outer',
+          value:
+            '<b>abc</b><img><div>def</div>' +
+            '<br><code></code><del></del><em></em>' +
+            '<i></i><ins></ins><mark></mark><s></s>' +
+            '<small></small><strong></strong><sub></sub>' +
+            '<sup></sup><time></time><u></u><hr>',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'outer: Outer ' +
-            '<template type="amp-mustache">nested: {{value}}</template>');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <b>abc</b><div>def</div>' +
+            '<br><code></code><del></del><em></em>' +
+            '<i></i><ins></ins><mark></mark><s></s>' +
+            '<small></small><strong></strong><sub></sub>' +
+            '<sup></sup><time></time><u></u><hr>'
+        );
       });
 
-      it('should render user data with a key __AMP_NESTED_TEMPLATE_0 when' +
-          ' there are no nested templates, even though it is not a weird name' +
-          ' for a template variable', () => {
-        templateElement./*OK*/innerHTML = '{{__AMP_NESTED_TEMPLATE_0}}';
+      it('should sanitize table related elements and anchor tags', () => {
+        textContentSetup('value = {{{value}}}');
         template.compileCallback();
         const result = template.render({
-          __AMP_NESTED_TEMPLATE_0: '123',
+          value:
+            '<table class="valid-class">' +
+            '<caption>caption</caption>' +
+            '<thead><tr><th colspan="2">header</th></tr></thead>' +
+            '<tbody><tr><td>' +
+            '<a href="http://www.google.com">google</a>' +
+            '</td></tr></tbody>' +
+            '<tfoot><tr>' +
+            '<td colspan="2"><span>footer</span></td>' +
+            '</tr></tfoot>' +
+            '</table>',
         });
-        expect(result./*OK*/innerHTML).to.equal('123');
-      });
-    }
-
-  });
-
-  describe('triple-mustache', () => {
-    it('should sanitize formatting related elements', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      const result = template.render({
-        value: '<b>abc</b><img><div>def</div>'
-            + '<br><code></code><del></del><em></em>'
-            + '<i></i><ins></ins><mark></mark><s></s>'
-            + '<small></small><strong></strong><sub></sub>'
-            + '<sup></sup><time></time><u></u><hr>',
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <table class="valid-class">' +
+            '<caption>caption</caption>' +
+            '<thead><tr><th colspan="2">header</th></tr></thead>' +
+            '<tbody><tr><td>' +
+            '<a href="http://www.google.com/" target="_top">google</a>' +
+            '</td></tr></tbody>' +
+            '<tfoot><tr>' +
+            '<td colspan="2"><span>footer</span></td>' +
+            '</tr></tfoot>' +
+            '</table>'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <b>abc</b><div>def</div>'
-            + '<br><code></code><del></del><em></em>'
-            + '<i></i><ins></ins><mark></mark><s></s>'
-            + '<small></small><strong></strong><sub></sub>'
-            + '<sup></sup><time></time><u></u><hr>'
-      );
-    });
 
-    it('should sanitize table related elements and anchor tags', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      const result = template.render({
-        value: '<table class="valid-class">'
-            + '<caption>caption</caption>'
-            + '<thead><tr><th colspan="2">header</th></tr></thead>'
-            + '<tbody><tr><td>'
-            + '<a href="http://www.google.com">google</a>'
-            + '</td></tr></tbody>'
-            + '<tfoot><tr>'
-            + '<td colspan="2"><span>footer</span></td>'
-            + '</tr></tfoot>'
-            + '</table>',
-      });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <table class="valid-class">'
-          + '<caption>caption</caption>'
-          + '<thead><tr><th colspan="2">header</th></tr></thead>'
-          + '<tbody><tr><td>'
-          + '<a href="http://www.google.com/" target="_top">google</a>'
-          + '</td></tr></tbody>'
-          + '<tfoot><tr>'
-          + '<td colspan="2"><span>footer</span></td>'
-          + '</tr></tfoot>'
-          + '</table>'
-      );
-    });
-
-    it('should sanitize tags, removing unsafe attributes', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      allowConsoleError(() => {
-        const result = template.render({
-          value: '<a href="javascript:alert(\'XSS\')">test</a>'
-              + '<img src="x" onerror="alert(\'XSS\')" />',
+      it('should sanitize tags, removing unsafe attributes', () => {
+        textContentSetup('value = {{{value}}}');
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value:
+              '<a href="javascript:alert(\'XSS\')">test</a>' +
+              '<img src="x" onerror="alert(\'XSS\')" />',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <a target="_top">test</a>'
+          );
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <a target="_top">test</a>');
       });
     });
-  });
 
-  describe('tables', () => {
-    beforeEach(() => {
-      textContentSetup(
+    describe('tables', () => {
+      beforeEach(() => {
+        textContentSetup(
           '<table>' +
             '<tbody>' +
-              '<tr>' +
-                '<td>{{content}}</td>' +
-              '</tr>' +
-              '{{#replies}}' +
-              '<tr>' +
-                '<td>{{content}}</td>' +
-              '</tr>' +
+            '<tr>' +
+            '<td>{{content}}</td>' +
+            '</tr>' +
+            '{{#replies}}' +
+            '<tr>' +
+            '<td>{{content}}</td>' +
+            '</tr>' +
             '{{/replies}}' +
             '</tbody>' +
-          '</table>');
-      template.compileCallback();
-    });
-    if (isTemplateTypeScript) {
-      it('should not foster text nodes in script template', () => {
-        return allowConsoleError(() => {
-          const result = template.render({
-            'content': 'Howdy',
-            'replies': [{'content': 'hi'}],
-          });
-          expect(result.innerHTML).to.equal(
+            '</table>'
+        );
+        template.compileCallback();
+      });
+      if (isTemplateTypeScript) {
+        it('should not foster text nodes in script template', () => {
+          return allowConsoleError(() => {
+            const result = template.render({
+              'content': 'Howdy',
+              'replies': [{'content': 'hi'}],
+            });
+            expect(result.innerHTML).to.equal(
               '<tbody>' +
                 '<tr>' +
-                  '<td>Howdy</td>' +
+                '<td>Howdy</td>' +
                 '</tr>' +
                 '<tr>' +
-                  '<td>hi</td>' +
+                '<td>hi</td>' +
                 '</tr>' +
-              '</tbody>');
-        });
-      });
-    }
-    if (isTemplateType) {
-      it('should foster text nodes in template[type="amp-mustache"] '
-          + 'destroying the templating', () => {
-        return allowConsoleError(() => {
-          const result = template.render({
-            'content': 'Howdy',
-            'replies': [{'content': 'hi'}],
+                '</tbody>'
+            );
           });
-          // Given the mustache markup {{#replies}} is hoisted.
-          // Expect the rendered HTML not to be what's expected.
-          expect(result.innerHTML).to.equal(
-              '<tbody>' +
-                '<tr>' +
+        });
+      }
+      if (isTemplateType) {
+        it(
+          'should foster text nodes in template[type="amp-mustache"] ' +
+            'destroying the templating',
+          () => {
+            return allowConsoleError(() => {
+              const result = template.render({
+                'content': 'Howdy',
+                'replies': [{'content': 'hi'}],
+              });
+              // Given the mustache markup {{#replies}} is hoisted.
+              // Expect the rendered HTML not to be what's expected.
+              expect(result.innerHTML).to.equal(
+                '<tbody>' +
+                  '<tr>' +
                   '<td>Comment:</td>' +
                   '<td>Howdy</td>' +
-                '</tr>' +
-                '<tr>' +
+                  '</tr>' +
+                  '<tr>' +
                   '<td>Reply:</td>' +
                   '<td>Howdy</td>' +
-                '</tr>' +
-              '</tbody>');
-        });
+                  '</tr>' +
+                  '</tbody>'
+              );
+            });
+          }
+        );
+      }
+    });
+
+    describe('viewer can render templates', () => {
+      beforeEach(() => {
+        viewerCanRenderTemplates = true;
       });
-    }
-  });
 
-  describe('viewer can render templates', () => {
-    beforeEach(() => {
-      viewerCanRenderTemplates = true;
-    });
+      it('should not call mustache parsing', () => {
+        sandbox.spy(mustache, 'parse');
+        template.compileCallback();
+        expect(mustache.parse).to.have.not.been.called;
+      });
 
-    it('should not call mustache parsing', () => {
-      sandbox.spy(mustache, 'parse');
-      template.compileCallback();
-      expect(mustache.parse).to.have.not.been.called;
+      it('should not mustache render but still sanitize html', () => {
+        sandbox.spy(sanitizer, 'sanitizeHtml');
+        sandbox.spy(mustache, 'render');
+        template.setHtml('<div>test</div>');
+        expect(mustache.render).to.have.not.been.called;
+        expect(sanitizer.sanitizeHtml).to.have.been.called;
+      });
     });
 
-    it('should not mustache render but still sanitize html', () => {
-      sandbox.spy(sanitizer, 'sanitizeHtml');
-      sandbox.spy(mustache, 'render');
-      template.setHtml('<div>test</div>');
-      expect(mustache.render).to.have.not.been.called;
-      expect(sanitizer.sanitizeHtml).to.have.been.called;
+    it('should unwrap output', () => {
+      innerHtmlSetup('<a>abc</a>');
+      template.compileCallback();
+      const result = template.render({});
+      expect(result.tagName).to.equal('A');
+      expect(result./*OK*/ innerHTML).to.equal('abc');
     });
-  });
-
-  it('should unwrap output', () => {
-    innerHtmlSetup('<a>abc</a>');
-    template.compileCallback();
-    const result = template.render({});
-    expect(result.tagName).to.equal('A');
-    expect(result./*OK*/innerHTML).to.equal('abc');
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-mustache/0.2/amp-mustache.js b/extensions/amp-mustache/0.2/amp-mustache.js
index a56e3c44d40a..3b85c08d9378 100644
--- a/extensions/amp-mustache/0.2/amp-mustache.js
+++ b/extensions/amp-mustache/0.2/amp-mustache.js
@@ -47,7 +47,8 @@ export class AmpMustache extends AMP.BaseTemplate {
 
     // Unescaped templating (triple mustache) has a special, strict sanitizer.
     mustache.setUnescapedSanitizer(value =>
-      purifyTagsForTripleMustache(value, this.win.document));
+      purifyTagsForTripleMustache(value, this.win.document)
+    );
   }
 
   /** @override */
@@ -77,7 +78,7 @@ export class AmpMustache extends AMP.BaseTemplate {
       this.processNestedTemplates_(content);
       const container = this.element.ownerDocument.createElement('div');
       container.appendChild(content);
-      return container./*OK*/innerHTML;
+      return container./*OK*/ innerHTML;
     } else if (this.element.tagName == 'SCRIPT') {
       return this.element.textContent;
     }
@@ -100,7 +101,7 @@ export class AmpMustache extends AMP.BaseTemplate {
       const key = `__AMP_NESTED_TEMPLATE_${index}`;
 
       // Store the nested template markup, keyed by index.
-      this.nestedTemplates_[key] = template./*OK*/outerHTML;
+      this.nestedTemplates_[key] = template./*OK*/ outerHTML;
 
       // Replace the markup with a pointer.
       const pointer = this.element.ownerDocument.createTextNode(`{{{${key}}}}`);
@@ -120,8 +121,11 @@ export class AmpMustache extends AMP.BaseTemplate {
     if (typeof data === 'object') {
       mustacheData = Object.assign({}, data, this.nestedTemplates_);
     }
-    const html = mustache.render(this.template_, mustacheData,
-        /* partials */ undefined);
+    const html = mustache.render(
+      this.template_,
+      mustacheData,
+      /* partials */ undefined
+    );
     return this.purifyAndSetHtml_(html);
   }
 
@@ -136,7 +140,7 @@ export class AmpMustache extends AMP.BaseTemplate {
     // TODO(choumx): Remove innerHTML usage once DOMPurify bug is fixed.
     // https://github.com/cure53/DOMPurify/pull/295
     const root = this.win.document.createElement('div');
-    root./*OK*/innerHTML = body./*OK*/innerHTML;
+    root./*OK*/ innerHTML = body./*OK*/ innerHTML;
     return this.unwrap(root);
   }
 }
diff --git a/extensions/amp-mustache/0.2/test/test-amp-mustache.js b/extensions/amp-mustache/0.2/test/test-amp-mustache.js
index 7be52f941591..a68d5331d3ca 100644
--- a/extensions/amp-mustache/0.2/test/test-amp-mustache.js
+++ b/extensions/amp-mustache/0.2/test/test-amp-mustache.js
@@ -19,530 +19,573 @@ import * as service from '../../../../src/service';
 import {AmpMustache} from '../amp-mustache';
 import mustache from '../../../../third_party/mustache/mustache';
 
-describes.repeated('amp-mustache 0.2', {
-  'with script[type=text/plain][template=amp-mustache]':
-      {templateType: 'script'},
-  'with template[type=amp-mustache]':
-      {templateType: 'template'},
-}, (name, variant) => {
-
-  let sandbox;
-  let viewerCanRenderTemplates = false;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
-    const getServiceForDocStub = sandbox.stub(service, 'getServiceForDoc');
-    getServiceForDocStub.returns({
-      hasCapability: unused => viewerCanRenderTemplates});
-  });
-
-  afterEach(() => sandbox.restore());
-
-  // This test suite runs twice. First by creating templates of type template
-  // and then by creating templates encapsulated within script.
-  let innerHtmlSetup;
-  let isTemplateType;
-  let isTemplateTypeScript;
-  let template;
-  let templateElement;
-  let textContentSetup;
-
-  beforeEach(() => {
-    const {templateType} = variant;
-    templateElement = document.createElement(templateType);
-    if (templateType == 'script') {
-      templateElement.setAttribute('type', 'amp-mustache');
-    }
-    template = new AmpMustache(templateElement);
-    isTemplateTypeScript = templateType == 'script';
-    isTemplateType = templateType == 'template';
-    textContentSetup = contents => {
-      if (isTemplateType) {
-        templateElement.content.textContent = contents;
-      } else if (isTemplateTypeScript) {
-        templateElement.textContent = contents;
-      }
-    };
-    innerHtmlSetup = html => {
-      if (isTemplateType) {
-        templateElement./*OK*/innerHTML = html;
-      } else if (isTemplateTypeScript) {
-        templateElement.textContent = html;
-      }
-    };
-  });
-
-  afterEach(() => viewerCanRenderTemplates = false);
-
-  it('should render', () => {
-    textContentSetup('value = {{value}}');
-    template.compileCallback();
-    const result = template.render({value: 'abc'});
-    expect(result./*OK*/innerHTML).to.equal('value = abc');
-  });
-
-  it('should render {{.}} from string', () => {
-    textContentSetup('value = {{.}}');
-    template.compileCallback();
-    const result = template.render('abc');
-    expect(result./*OK*/innerHTML).to.equal('value = abc');
-  });
-
-  it('should sanitize output', () => {
-    innerHtmlSetup(
-        'value = <a href="{{value}}">abc</a>');
-    template.compileCallback();
-    const result = template.render({
-      value: /*eslint no-script-url: 0*/ 'javascript:alert();',
+describes.repeated(
+  'amp-mustache 0.2',
+  {
+    'with script[type=text/plain][template=amp-mustache]': {
+      templateType: 'script',
+    },
+    'with template[type=amp-mustache]': {templateType: 'template'},
+  },
+  (name, variant) => {
+    let sandbox;
+    let viewerCanRenderTemplates = false;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
+      const getServiceForDocStub = sandbox.stub(service, 'getServiceForDoc');
+      getServiceForDocStub.returns({
+        hasCapability: unused => viewerCanRenderTemplates,
+      });
     });
-    expect(result./*OK*/innerHTML).to.equal(
-        'value = <a target="_top">abc</a>');
-  });
-
-  it('should sanitize templated tag names', () => {
-    innerHtmlSetup(
-        'value = <{{value}} href="javascript:alert(0)">abc</{{value}}>');
-    template.compileCallback();
-    const result = template.render({
-      value: 'a',
+
+    afterEach(() => sandbox.restore());
+
+    // This test suite runs twice. First by creating templates of type template
+    // and then by creating templates encapsulated within script.
+    let innerHtmlSetup;
+    let isTemplateType;
+    let isTemplateTypeScript;
+    let template;
+    let templateElement;
+    let textContentSetup;
+
+    beforeEach(() => {
+      const {templateType} = variant;
+      templateElement = document.createElement(templateType);
+      if (templateType == 'script') {
+        templateElement.setAttribute('type', 'amp-mustache');
+      }
+      template = new AmpMustache(templateElement);
+      isTemplateTypeScript = templateType == 'script';
+      isTemplateType = templateType == 'template';
+      textContentSetup = contents => {
+        if (isTemplateType) {
+          templateElement.content.textContent = contents;
+        } else if (isTemplateTypeScript) {
+          templateElement.textContent = contents;
+        }
+      };
+      innerHtmlSetup = html => {
+        if (isTemplateType) {
+          templateElement./*OK*/ innerHTML = html;
+        } else if (isTemplateTypeScript) {
+          templateElement.textContent = html;
+        }
+      };
     });
-    expect(result./*OK*/innerHTML).to.not
-        .equal('<a href="javascript:alert(0)">abc</a>');
-  });
 
-  describe('Sanitizing data- attributes', () => {
+    afterEach(() => (viewerCanRenderTemplates = false));
 
-    it('should sanitize templated attribute names', () => {
-      innerHtmlSetup(
-          'value = <a {{value}}="javascript:alert(0)">abc</a>');
+    it('should render', () => {
+      textContentSetup('value = {{value}}');
       template.compileCallback();
-      const result = template.render({
-        value: 'href',
-      });
-      expect(result).to.not.equal('<a href="javascript:alert(0)">abc</a>');
-      expect(result.firstElementChild.getAttribute('href')).to.be.null;
+      const result = template.render({value: 'abc'});
+      expect(result./*OK*/ innerHTML).to.equal('value = abc');
     });
 
-    it('should sanitize templated bind attribute names', () => {
-      innerHtmlSetup(
-          'value = <p [{{value}}]="javascript:alert()">ALERT</p>');
+    it('should render {{.}} from string', () => {
+      textContentSetup('value = {{.}}');
       template.compileCallback();
-      const result = template.render({
-        value: 'onclick',
-      });
-      expect(result).to.not
-          .equal('<p [onclick]="javascript:alert()">ALERT</p>');
-      expect(result.firstElementChild.getAttribute('[onclick]')).to.be.null;
-      expect(result.firstElementChild.getAttribute('onclick')).to.be.null;
+      const result = template.render('abc');
+      expect(result./*OK*/ innerHTML).to.equal('value = abc');
     });
 
-    it('should parse data-&style=value output correctly', () => {
-      innerHtmlSetup('value = <a href="{{value}}"' +
-          ' data-&style="color:red;">abc</a>');
+    it('should sanitize output', () => {
+      innerHtmlSetup('value = <a href="{{value}}">abc</a>');
       template.compileCallback();
       const result = template.render({
         value: /*eslint no-script-url: 0*/ 'javascript:alert();',
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <a target="_top">abc</a>');
+      expect(result./*OK*/ innerHTML).to.equal(
+        'value = <a target="_top">abc</a>'
+      );
     });
 
-    it('should parse data-&attr=value output correctly', () => {
-      innerHtmlSetup('value = <a data-&href="{{value}}">abc</a>');
+    it('should sanitize templated tag names', () => {
+      innerHtmlSetup(
+        'value = <{{value}} href="javascript:alert(0)">abc</{{value}}>'
+      );
       template.compileCallback();
       const result = template.render({
-        value: 'https://google.com/',
+        value: 'a',
       });
-      expect(result./*OK*/innerHTML).to.equal('value = <a>abc</a>');
+      expect(result./*OK*/ innerHTML).to.not.equal(
+        '<a href="javascript:alert(0)">abc</a>'
+      );
     });
 
-    it('should allow for data-attr=value to output correctly', () => {
-      innerHtmlSetup('value = ' +
-          '<a data-my-attr="{{invalidValue}}" ' +
-          'data-my-id="{{value}}">abc</a>');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
-        invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+    describe('Sanitizing data- attributes', () => {
+      it('should sanitize templated attribute names', () => {
+        innerHtmlSetup('value = <a {{value}}="javascript:alert(0)">abc</a>');
+        template.compileCallback();
+        const result = template.render({
+          value: 'href',
+        });
+        expect(result).to.not.equal('<a href="javascript:alert(0)">abc</a>');
+        expect(result.firstElementChild.getAttribute('href')).to.be.null;
       });
-      expect(result./*OK*/innerHTML).to.equal('value = ' +
-          '<a data-my-id="myid" data-my-attr="javascript:alert();">abc</a>');
-    });
-  });
 
-  describe('Rendering Form Fields', () => {
-    it('should allow rendering inputs', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" onchange="{{invalidValue}}">');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
-        invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+      it('should sanitize templated bind attribute names', () => {
+        innerHtmlSetup('value = <p [{{value}}]="javascript:alert()">ALERT</p>');
+        template.compileCallback();
+        const result = template.render({
+          value: 'onclick',
+        });
+        expect(result).to.not.equal(
+          '<p [onclick]="javascript:alert()">ALERT</p>'
+        );
+        expect(result.firstElementChild.getAttribute('[onclick]')).to.be.null;
+        expect(result.firstElementChild.getAttribute('onclick')).to.be.null;
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <input value="myid">');
-    });
 
-    it('should allow rendering textarea', () => {
-      innerHtmlSetup('value = <textarea>{{value}}</textarea>');
-      template.compileCallback();
-      const result = template.render({
-        value: 'Cool story bro.',
+      it('should parse data-&style=value output correctly', () => {
+        innerHtmlSetup(
+          'value = <a href="{{value}}" data-&style="color:red;">abc</a>'
+        );
+        template.compileCallback();
+        const result = template.render({
+          value: /*eslint no-script-url: 0*/ 'javascript:alert();',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <a target="_top">abc</a>'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <textarea>Cool story bro.</textarea>');
-    });
 
-    it('should not allow image/file input types rendering', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" type="{{type}}">');
-      template.compileCallback();
-      allowConsoleError(() => {
+      it('should parse data-&attr=value output correctly', () => {
+        innerHtmlSetup('value = <a data-&href="{{value}}">abc</a>');
+        template.compileCallback();
         const result = template.render({
-          value: 'myid',
-          type: 'image',
+          value: 'https://google.com/',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
+        expect(result./*OK*/ innerHTML).to.equal('value = <a>abc</a>');
       });
 
-      allowConsoleError(() => {
+      it('should allow for data-attr=value to output correctly', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<a data-my-attr="{{invalidValue}}" ' +
+            'data-my-id="{{value}}">abc</a>'
+        );
+        template.compileCallback();
         const result = template.render({
           value: 'myid',
-          type: 'button',
+          invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = ' +
+            '<a data-my-id="myid" data-my-attr="javascript:alert();">abc</a>'
+        );
       });
+    });
 
-      const fileResult = template.render({
-        value: 'myid',
-        type: 'file',
+    describe('Rendering Form Fields', () => {
+      it('should allow rendering inputs', () => {
+        innerHtmlSetup(
+          'value = <input value="{{value}}" onchange="{{invalidValue}}">'
+        );
+        template.compileCallback();
+        const result = template.render({
+          value: 'myid',
+          invalidValue: /*eslint no-script-url: 0*/ 'javascript:alert();',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <input value="myid">'
+        );
       });
-      expect(fileResult./*OK*/innerHTML).to.equal(
-          'value = <input type="file" value="myid">');
 
-      const passwordResult = template.render({
-        value: 'myid',
-        type: 'password',
+      it('should allow rendering textarea', () => {
+        innerHtmlSetup('value = <textarea>{{value}}</textarea>');
+        template.compileCallback();
+        const result = template.render({
+          value: 'Cool story bro.',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <textarea>Cool story bro.</textarea>'
+        );
       });
-      expect(passwordResult./*OK*/innerHTML).to.equal(
-          'value = <input type="password" value="myid">');
-    });
 
-    it('should allow text input type rendering', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" type="{{type}}">');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
-        type: 'text',
+      it('should not allow image/file input types rendering', () => {
+        innerHtmlSetup('value = <input value="{{value}}" type="{{type}}">');
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            type: 'image',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
+
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+            type: 'button',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
+
+        const fileResult = template.render({
+          value: 'myid',
+          type: 'file',
+        });
+        expect(fileResult./*OK*/ innerHTML).to.equal(
+          'value = <input type="file" value="myid">'
+        );
+
+        const passwordResult = template.render({
+          value: 'myid',
+          type: 'password',
+        });
+        expect(passwordResult./*OK*/ innerHTML).to.equal(
+          'value = <input type="password" value="myid">'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <input type="text" value="myid">');
-    });
 
-    it('should sanitize form-related attrs properly', () => {
-      innerHtmlSetup('value = ' +
-          '<input value="{{value}}" ' +
-          'formaction="javascript:javascript:alert(1)" ' +
-          'formmethod="get" form="form1" formtarget="blank" formnovalidate ' +
-          'formenctype="">');
-      template.compileCallback();
-      allowConsoleError(() => {
+      it('should allow text input type rendering', () => {
+        innerHtmlSetup('value = <input value="{{value}}" type="{{type}}">');
+        template.compileCallback();
         const result = template.render({
           value: 'myid',
+          type: 'text',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'value = <input value="myid">');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <input type="text" value="myid">'
+        );
       });
-    });
 
-    it('should not sanitize form tags', () => {
-      innerHtmlSetup('value = ' +
-          '<form><input value="{{value}}"></form><input value="hello">');
-      template.compileCallback();
-      const result = template.render({
-        value: 'myid',
+      it('should sanitize form-related attrs properly', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<input value="{{value}}" ' +
+            'formaction="javascript:javascript:alert(1)" ' +
+            'formmethod="get" form="form1" formtarget="blank" formnovalidate ' +
+            'formenctype="">'
+        );
+        template.compileCallback();
+        allowConsoleError(() => {
+          const result = template.render({
+            value: 'myid',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
+            'value = <input value="myid">'
+          );
+        });
+      });
+
+      it('should not sanitize form tags', () => {
+        innerHtmlSetup(
+          'value = ' +
+            '<form><input value="{{value}}"></form><input value="hello">'
+        );
+        template.compileCallback();
+        const result = template.render({
+          value: 'myid',
+        });
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <form><input value="myid"></form><input value="hello">'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <form><input value="myid"></form><input value="hello">');
     });
-  });
 
-  describe('Nested templates', () => {
-    it('should not sanitize nested amp-mustache templates', () => {
-      innerHtmlSetup(
+    describe('Nested templates', () => {
+      it('should not sanitize nested amp-mustache templates', () => {
+        innerHtmlSetup(
           'text before a template ' +
-          '<template type="amp-mustache">text inside template</template> ' +
-          'text after a template');
-      template.compileCallback();
-      const result = template.render({});
-      expect(result./*OK*/innerHTML).to.equal(
+            '<template type="amp-mustache">text inside template</template> ' +
+            'text after a template'
+        );
+        template.compileCallback();
+        const result = template.render({});
+        expect(result./*OK*/ innerHTML).to.equal(
           'text before a template ' +
-          '<template type="amp-mustache">text inside template</template> ' +
-          'text after a template');
-    });
+            '<template type="amp-mustache">text inside template</template> ' +
+            'text after a template'
+        );
+      });
 
-    if (isTemplateType) {
-      it('should sanitize nested templates without type="amp-mustache"',
-          () => {
-            innerHtmlSetup(
-                'text before a template ' +
-                '<template>text inside template</template> ' +
-                'text after a template');
-            template.compileCallback();
-            const result = template.render({});
-            expect(result./*OK*/innerHTML).to.equal(
-                'text before a template  text after a template');
-          });
+      if (isTemplateType) {
+        it('should sanitize nested templates without type="amp-mustache"', () => {
+          innerHtmlSetup(
+            'text before a template ' +
+              '<template>text inside template</template> ' +
+              'text after a template'
+          );
+          template.compileCallback();
+          const result = template.render({});
+          expect(result./*OK*/ innerHTML).to.equal(
+            'text before a template  text after a template'
+          );
+        });
 
-      it('should not render variables inside a nested template', () => {
-        innerHtmlSetup(
+        it('should not render variables inside a nested template', () => {
+          innerHtmlSetup(
             'outer: {{outerOnlyValue}} {{mutualValue}} ' +
-            '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
-            ' {{mutualValue}}</template>');
-        template.compileCallback();
-        const result = template.render({
-          outerOnlyValue: 'Outer',
-          mutualValue: 'Mutual',
-          nestedOnlyValue: 'Nested',
-        });
-        expect(result./*OK*/innerHTML).to.equal(
+              '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
+              ' {{mutualValue}}</template>'
+          );
+          template.compileCallback();
+          const result = template.render({
+            outerOnlyValue: 'Outer',
+            mutualValue: 'Mutual',
+            nestedOnlyValue: 'Nested',
+          });
+          expect(result./*OK*/ innerHTML).to.equal(
             'outer: Outer Mutual ' +
-            '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
-            ' {{mutualValue}}</template>');
-      });
+              '<template type="amp-mustache">nested: {{nestedOnlyValue}}' +
+              ' {{mutualValue}}</template>'
+          );
+        });
 
-      it('should compile and render nested templates when invoked', () => {
-        const outerTemplateElement = document.createElement('template');
-        outerTemplateElement./*OK*/innerHTML =
+        it('should compile and render nested templates when invoked', () => {
+          const outerTemplateElement = document.createElement('template');
+          outerTemplateElement./*OK*/ innerHTML =
             'outer: {{value}} ' +
             '<template type="amp-mustache">nested: {{value}}</template>';
-        const outerTemplate = new AmpMustache(outerTemplateElement);
-        outerTemplate.compileCallback();
-        const outerResult = outerTemplate.render({
-          value: 'Outer',
-        });
-        const nestedTemplateElement = outerResult.querySelector('template');
-        const nestedTemplate = new AmpMustache(nestedTemplateElement);
-        nestedTemplate.compileCallback();
-        const nestedResult = nestedTemplate.render({
-          value: 'Nested',
+          const outerTemplate = new AmpMustache(outerTemplateElement);
+          outerTemplate.compileCallback();
+          const outerResult = outerTemplate.render({
+            value: 'Outer',
+          });
+          const nestedTemplateElement = outerResult.querySelector('template');
+          const nestedTemplate = new AmpMustache(nestedTemplateElement);
+          nestedTemplate.compileCallback();
+          const nestedResult = nestedTemplate.render({
+            value: 'Nested',
+          });
+          expect(nestedResult./*OK*/ innerHTML).to.equal('nested: Nested');
         });
-        expect(nestedResult./*OK*/innerHTML).to.equal('nested: Nested');
-      });
 
-      it('should sanitize the inner template when it gets rendered', () => {
-        const outerTemplateElement = document.createElement('template');
-        outerTemplateElement./*OK*/innerHTML =
+        it('should sanitize the inner template when it gets rendered', () => {
+          const outerTemplateElement = document.createElement('template');
+          outerTemplateElement./*OK*/ innerHTML =
             'outer: {{value}} ' +
             '<template type="amp-mustache">' +
             '<div onclick="javascript:alert(\'I am evil\')">nested</div>: ' +
             '{{value}}</template>';
-        const outerTemplate = new AmpMustache(outerTemplateElement);
-        outerTemplate.compileCallback();
-        const outerResult = outerTemplate.render({
-          value: 'Outer',
-        });
-        const nestedTemplateElement = outerResult.querySelector('template');
-        const nestedTemplate = new AmpMustache(nestedTemplateElement);
-        nestedTemplate.compileCallback();
-        const nestedResult = nestedTemplate.render({
-          value: 'Nested',
+          const outerTemplate = new AmpMustache(outerTemplateElement);
+          outerTemplate.compileCallback();
+          const outerResult = outerTemplate.render({
+            value: 'Outer',
+          });
+          const nestedTemplateElement = outerResult.querySelector('template');
+          const nestedTemplate = new AmpMustache(nestedTemplateElement);
+          nestedTemplate.compileCallback();
+          const nestedResult = nestedTemplate.render({
+            value: 'Nested',
+          });
+          expect(nestedResult./*OK*/ innerHTML).to.equal(
+            '<div>nested</div>: Nested'
+          );
         });
-        expect(nestedResult./*OK*/innerHTML).to.equal(
-            '<div>nested</div>: Nested');
+
+        it(
+          'should not allow users to pass data having key that starts with ' +
+            '__AMP_NESTED_TEMPLATE_0 when there is a nested template',
+          () => {
+            templateElement./*OK*/ innerHTML =
+              'outer: {{value}} ' +
+              '<template type="amp-mustache">nested: {{value}}</template>';
+            template.compileCallback();
+            const result = template.render({
+              __AMP_NESTED_TEMPLATE_0: 'MUST NOT RENDER THIS',
+              value: 'Outer',
+            });
+            expect(result./*OK*/ innerHTML).to.equal(
+              'outer: Outer ' +
+                '<template type="amp-mustache">nested: {{value}}</template>'
+            );
+          }
+        );
+
+        it(
+          'should render user data with a key __AMP_NESTED_TEMPLATE_0 when' +
+            ' there are no nested templates, even though it is not a weird name' +
+            ' for a template variable',
+          () => {
+            templateElement./*OK*/ innerHTML = '{{__AMP_NESTED_TEMPLATE_0}}';
+            template.compileCallback();
+            const result = template.render({
+              __AMP_NESTED_TEMPLATE_0: '123',
+            });
+            expect(result./*OK*/ innerHTML).to.equal('123');
+          }
+        );
+      }
+
+      // Need to test this since DOMPurify doesn't have an required-attribute
+      // tag whitelist API. Instead, we hack around it with custom hooks.
+      it('should not allow unsupported templates after a supported one', () => {
+        const html =
+          '1<template type="amp-mustache">2</template>3<template>' +
+          '4</template>5';
+        innerHtmlSetup('{{{html}}}');
+        template.compileCallback();
+        const result = template.render({html});
+        expect(result./*OK*/ innerHTML).to.equal(
+          '1<template type="amp-mustache">2</template>35'
+        );
       });
+    });
 
-      it('should not allow users to pass data having key that starts with ' +
-      '__AMP_NESTED_TEMPLATE_0 when there is a nested template', () => {
-        templateElement./*OK*/innerHTML =
-        'outer: {{value}} ' +
-        '<template type="amp-mustache">nested: {{value}}</template>';
+    describe('triple-mustache', () => {
+      it('should sanitize formatting related elements', () => {
+        textContentSetup('value = {{{value}}}');
         template.compileCallback();
         const result = template.render({
-          __AMP_NESTED_TEMPLATE_0: 'MUST NOT RENDER THIS',
-          value: 'Outer',
+          value:
+            '<b>abc</b><img><div>def</div>' +
+            '<br><code></code><del></del><em></em>' +
+            '<i></i><ins></ins><mark></mark><s></s>' +
+            '<small></small><strong></strong><sub></sub>' +
+            '<sup></sup><time></time><u></u><hr>',
         });
-        expect(result./*OK*/innerHTML).to.equal(
-            'outer: Outer ' +
-            '<template type="amp-mustache">nested: {{value}}</template>');
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <b>abc</b><div>def</div>' +
+            '<br><code></code><del></del><em></em>' +
+            '<i></i><ins></ins><mark></mark><s></s>' +
+            '<small></small><strong></strong><sub></sub>' +
+            '<sup></sup><time></time><u></u><hr>'
+        );
       });
 
-      it('should render user data with a key __AMP_NESTED_TEMPLATE_0 when' +
-          ' there are no nested templates, even though it is not a weird name' +
-          ' for a template variable', () => {
-        templateElement./*OK*/innerHTML = '{{__AMP_NESTED_TEMPLATE_0}}';
+      it('should sanitize table related elements and anchor tags', () => {
+        textContentSetup('value = {{{value}}}');
         template.compileCallback();
         const result = template.render({
-          __AMP_NESTED_TEMPLATE_0: '123',
+          value:
+            '<table class="valid-class">' +
+            '<caption>caption</caption>' +
+            '<thead><tr><th colspan="2">header</th></tr></thead>' +
+            '<tbody><tr><td>' +
+            '<a href="http://www.google.com">google</a>' +
+            '</td></tr></tbody>' +
+            '<tfoot><tr>' +
+            '<td colspan="2"><span>footer</span></td>' +
+            '</tr></tfoot>' +
+            '</table>',
         });
-        expect(result./*OK*/innerHTML).to.equal('123');
-      });
-    }
-
-    // Need to test this since DOMPurify doesn't have an required-attribute
-    // tag whitelist API. Instead, we hack around it with custom hooks.
-    it('should not allow unsupported templates after a supported one', () => {
-      const html =
-          '1<template type="amp-mustache">2</template>3<template>'
-          + '4</template>5';
-      innerHtmlSetup('{{{html}}}');
-      template.compileCallback();
-      const result = template.render({html});
-      expect(result./*OK*/innerHTML).to.equal(
-          '1<template type="amp-mustache">2</template>35');
-    });
-  });
-
-  describe('triple-mustache', () => {
-    it('should sanitize formatting related elements', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      const result = template.render({
-        value: '<b>abc</b><img><div>def</div>'
-            + '<br><code></code><del></del><em></em>'
-            + '<i></i><ins></ins><mark></mark><s></s>'
-            + '<small></small><strong></strong><sub></sub>'
-            + '<sup></sup><time></time><u></u><hr>',
-      });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <b>abc</b><div>def</div>'
-            + '<br><code></code><del></del><em></em>'
-            + '<i></i><ins></ins><mark></mark><s></s>'
-            + '<small></small><strong></strong><sub></sub>'
-            + '<sup></sup><time></time><u></u><hr>'
-      );
-    });
-
-    it('should sanitize table related elements and anchor tags', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      const result = template.render({
-        value: '<table class="valid-class">'
-            + '<caption>caption</caption>'
-            + '<thead><tr><th colspan="2">header</th></tr></thead>'
-            + '<tbody><tr><td>'
-            + '<a href="http://www.google.com">google</a>'
-            + '</td></tr></tbody>'
-            + '<tfoot><tr>'
-            + '<td colspan="2"><span>footer</span></td>'
-            + '</tr></tfoot>'
-            + '</table>',
+        expect(result./*OK*/ innerHTML).to.equal(
+          'value = <table class="valid-class">' +
+            '<caption>caption</caption>' +
+            '<thead><tr><th colspan="2">header</th></tr></thead>' +
+            '<tbody><tr><td>' +
+            '<a target="_top" href="http://www.google.com/">google</a>' +
+            '</td></tr></tbody>' +
+            '<tfoot><tr>' +
+            '<td colspan="2"><span>footer</span></td>' +
+            '</tr></tfoot>' +
+            '</table>'
+        );
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <table class="valid-class">'
-          + '<caption>caption</caption>'
-          + '<thead><tr><th colspan="2">header</th></tr></thead>'
-          + '<tbody><tr><td>'
-          + '<a target="_top" href="http://www.google.com/">google</a>'
-          + '</td></tr></tbody>'
-          + '<tfoot><tr>'
-          + '<td colspan="2"><span>footer</span></td>'
-          + '</tr></tfoot>'
-          + '</table>'
-      );
-    });
 
-    it('should sanitize tags, removing unsafe attributes', () => {
-      textContentSetup('value = {{{value}}}');
-      template.compileCallback();
-      const result = template.render({
-        value: '<a href="javascript:alert(\'XSS\')">test</a>'
-            + '<img src="x" onerror="alert(\'XSS\')" />',
+      it('should sanitize tags, removing unsafe attributes', () => {
+        textContentSetup('value = {{{value}}}');
+        template.compileCallback();
+        const result = template.render({
+          value:
+            '<a href="javascript:alert(\'XSS\')">test</a>' +
+            '<img src="x" onerror="alert(\'XSS\')" />',
+        });
+        expect(result./*OK*/ innerHTML).to.equal('value = <a>test</a>');
       });
-      expect(result./*OK*/innerHTML).to.equal(
-          'value = <a>test</a>');
     });
-  });
 
-  describe('tables', () => {
-    beforeEach(() => {
-      textContentSetup(
+    describe('tables', () => {
+      beforeEach(() => {
+        textContentSetup(
           '<table>' +
             '<tbody>' +
-              '<tr>' +
-                '<td>{{content}}</td>' +
-              '</tr>' +
-              '{{#replies}}' +
-              '<tr>' +
-                '<td>{{content}}</td>' +
-              '</tr>' +
+            '<tr>' +
+            '<td>{{content}}</td>' +
+            '</tr>' +
+            '{{#replies}}' +
+            '<tr>' +
+            '<td>{{content}}</td>' +
+            '</tr>' +
             '{{/replies}}' +
             '</tbody>' +
-          '</table>');
-      template.compileCallback();
-    });
-    if (isTemplateTypeScript) {
-      it('should not foster text nodes in script template', () => {
-        return allowConsoleError(() => {
-          const result = template.render({
-            'content': 'Howdy',
-            'replies': [{'content': 'hi'}],
-          });
-          expect(result.innerHTML).to.equal(
+            '</table>'
+        );
+        template.compileCallback();
+      });
+      if (isTemplateTypeScript) {
+        it('should not foster text nodes in script template', () => {
+          return allowConsoleError(() => {
+            const result = template.render({
+              'content': 'Howdy',
+              'replies': [{'content': 'hi'}],
+            });
+            expect(result.innerHTML).to.equal(
               '<tbody>' +
                 '<tr>' +
-                  '<td>Howdy</td>' +
+                '<td>Howdy</td>' +
                 '</tr>' +
                 '<tr>' +
-                  '<td>hi</td>' +
+                '<td>hi</td>' +
                 '</tr>' +
-              '</tbody>');
-        });
-      });
-    }
-    if (isTemplateType) {
-      it('should foster text nodes in template[type="amp-mustache"]'
-          + 'destroying the templating', () => {
-        return allowConsoleError(() => {
-          const result = template.render({
-            'content': 'Howdy',
-            'replies': [{'content': 'hi'}],
+                '</tbody>'
+            );
           });
-          // Given the mustache markup {{#replies}} is hoisted.
-          // Expect the rendered HTML not to be what's expected.
-          expect(result.innerHTML).to.equal(
-              '<tbody>' +
-                '<tr>' +
+        });
+      }
+      if (isTemplateType) {
+        it(
+          'should foster text nodes in template[type="amp-mustache"]' +
+            'destroying the templating',
+          () => {
+            return allowConsoleError(() => {
+              const result = template.render({
+                'content': 'Howdy',
+                'replies': [{'content': 'hi'}],
+              });
+              // Given the mustache markup {{#replies}} is hoisted.
+              // Expect the rendered HTML not to be what's expected.
+              expect(result.innerHTML).to.equal(
+                '<tbody>' +
+                  '<tr>' +
                   '<td>Howdy</td>' +
-                '</tr>' +
-                '<tr>' +
+                  '</tr>' +
+                  '<tr>' +
                   '<td>Howdy</td>' +
-                '</tr>' +
-              '</tbody>');
-        });
+                  '</tr>' +
+                  '</tbody>'
+              );
+            });
+          }
+        );
+      }
+    });
+
+    describe('viewer can render templates', () => {
+      beforeEach(() => {
+        viewerCanRenderTemplates = true;
       });
-    }
-  });
 
-  describe('viewer can render templates', () => {
-    beforeEach(() => {
-      viewerCanRenderTemplates = true;
-    });
+      it('should not call mustache parsing', () => {
+        sandbox.spy(mustache, 'parse');
+        template.compileCallback();
+        expect(mustache.parse).to.have.not.been.called;
+      });
 
-    it('should not call mustache parsing', () => {
-      sandbox.spy(mustache, 'parse');
-      template.compileCallback();
-      expect(mustache.parse).to.have.not.been.called;
+      it('should not mustache render but still purify html', () => {
+        sandbox.spy(purifier, 'purifyHtml');
+        sandbox.spy(mustache, 'render');
+        template.setHtml('<div>test</div>');
+        expect(mustache.render).to.have.not.been.called;
+        expect(purifier.purifyHtml).to.have.been.called;
+      });
     });
 
-    it('should not mustache render but still purify html', () => {
-      sandbox.spy(purifier, 'purifyHtml');
-      sandbox.spy(mustache, 'render');
-      template.setHtml('<div>test</div>');
-      expect(mustache.render).to.have.not.been.called;
-      expect(purifier.purifyHtml).to.have.been.called;
+    it('should unwrap output', () => {
+      templateElement./*OK*/ innerHTML = '<a>abc</a>';
+      template.compileCallback();
+      const result = template.setHtml('<a>abc</a>');
+      expect(result.tagName).to.equal('A');
+      expect(result./*OK*/ innerHTML).to.equal('abc');
     });
-  });
-
-  it('should unwrap output', () => {
-    templateElement./*OK*/innerHTML = '<a>abc</a>';
-    template.compileCallback();
-    const result = template.setHtml('<a>abc</a>');
-    expect(result.tagName).to.equal('A');
-    expect(result./*OK*/innerHTML).to.equal('abc');
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-next-page/0.1/amp-next-page.js b/extensions/amp-next-page/0.1/amp-next-page.js
index 8a32ade3a6ca..713df10a8c4f 100644
--- a/extensions/amp-next-page/0.1/amp-next-page.js
+++ b/extensions/amp-next-page/0.1/amp-next-page.js
@@ -45,7 +45,6 @@ const SERVICE_ID = 'next-page';
 const ADSENSE_BASE_URL = 'https://googleads.g.doubleclick.net/pagead/ads';
 
 export class AmpNextPage extends AMP.BaseElement {
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.CONTAINER;
@@ -53,12 +52,17 @@ export class AmpNextPage extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-next-page'),
-        'Experiment amp-next-page disabled');
+    userAssert(
+      isExperimentOn(this.win, 'amp-next-page'),
+      'Experiment amp-next-page disabled'
+    );
 
     const separatorElements = childElementsByAttr(this.element, 'separator');
-    userAssert(separatorElements.length <= 1,
-        '%s should contain at most one <div separator> child', TAG);
+    userAssert(
+      separatorElements.length <= 1,
+      '%s should contain at most one <div separator> child',
+      TAG
+    );
 
     let separator = null;
     if (separatorElements.length === 1) {
@@ -84,44 +88,60 @@ export class AmpNextPage extends AMP.BaseElement {
         const client = element.getAttribute('data-client');
         const slot = element.getAttribute('data-slot');
 
-        userAssert(/^ca-pub-\d+$/.test(client),
-            `${TAG} AdSense client should be of the format 'ca-pub-123456'`);
-        userAssert(/^\d+$/.test(slot),
-            `${TAG} AdSense slot should be a number`);
+        userAssert(
+          /^ca-pub-\d+$/.test(client),
+          `${TAG} AdSense client should be of the format 'ca-pub-123456'`
+        );
+        userAssert(
+          /^\d+$/.test(slot),
+          `${TAG} AdSense slot should be a number`
+        );
 
         const consentPolicyId = this.getConsentPolicy();
-        const consent = consentPolicyId ?
-          getConsentPolicyState(element, consentPolicyId)
-              .catch(err => {
-                user().error(TAG, 'Error determining consent state', err);
-                return CONSENT_POLICY_STATE.UNKNOWN;
-              }) : Promise.resolve(CONSENT_POLICY_STATE.SUFFICIENT);
-
-        pagesPromise = consent.then(
-            state => this.fetchAdSensePages_(client, slot,
-                state === CONSENT_POLICY_STATE.SUFFICIENT ||
-                state === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED))
-            .catch(error => {
-              user().warn(
-                  TAG, 'error fetching recommendations from AdSense', error);
-              // Resolve this promise with an empty array anyway so we can use
-              // the inline/src config as a fallback.
-              return [];
-            });
+        const consent = consentPolicyId
+          ? getConsentPolicyState(element, consentPolicyId).catch(err => {
+              user().error(TAG, 'Error determining consent state', err);
+              return CONSENT_POLICY_STATE.UNKNOWN;
+            })
+          : Promise.resolve(CONSENT_POLICY_STATE.SUFFICIENT);
+
+        pagesPromise = consent
+          .then(state =>
+            this.fetchAdSensePages_(
+              client,
+              slot,
+              state === CONSENT_POLICY_STATE.SUFFICIENT ||
+                state === CONSENT_POLICY_STATE.UNKNOWN_NOT_REQUIRED
+            )
+          )
+          .catch(error => {
+            user().warn(
+              TAG,
+              'error fetching recommendations from AdSense',
+              error
+            );
+            // Resolve this promise with an empty array anyway so we can use
+            // the inline/src config as a fallback.
+            return [];
+          });
       }
 
       const inlineConfig = this.getInlineConfig_();
 
       if (src) {
-        configPromise = this.fetchConfig_().catch(
-            error => user().error(TAG, 'error fetching config', error));
+        configPromise = this.fetchConfig_().catch(error =>
+          user().error(TAG, 'error fetching config', error)
+        );
       } else {
         configPromise = Promise.resolve(inlineConfig);
       }
 
-      userAssert(inlineConfig || src || type,
-          '%s should contain a <script> child, a URL specified in [src], or a '
-          + '[type]', TAG);
+      userAssert(
+        inlineConfig || src || type,
+        '%s should contain a <script> child, a URL specified in [src], or a ' +
+          '[type]',
+        TAG
+      );
 
       return Promise.all([configPromise, pagesPromise]).then(values => {
         const config = values[0] || {};
@@ -142,12 +162,16 @@ export class AmpNextPage extends AMP.BaseElement {
     if (!scriptElements.length) {
       return null;
     }
-    userAssert(scriptElements.length === 1,
-        `${TAG} should contain at most one <script> child`);
+    userAssert(
+      scriptElements.length === 1,
+      `${TAG} should contain at most one <script> child`
+    );
     const scriptElement = scriptElements[0];
-    userAssert(isJsonScriptTag(scriptElement),
-        `${TAG} config should ` +
-        'be inside a <script> tag with type="application/json"');
+    userAssert(
+      isJsonScriptTag(scriptElement),
+      `${TAG} config should ` +
+        'be inside a <script> tag with type="application/json"'
+    );
     return tryParseJson(scriptElement.textContent, error => {
       user().error(TAG, 'failed to parse config', error);
     });
@@ -165,14 +189,14 @@ export class AmpNextPage extends AMP.BaseElement {
    * @private
    */
   fetchAdSensePages_(client, slot, personalized) {
-    const adUrl = `${ADSENSE_BASE_URL}?client=${client}&slotname=${slot}`
-        + `&url=${encodeURIComponent(this.getAmpDoc().getUrl())}`
-        + '&ecr=1&crui=title&is_amp=3&output=xml';
+    const adUrl =
+      `${ADSENSE_BASE_URL}?client=${client}&slotname=${slot}` +
+      `&url=${encodeURIComponent(this.getAmpDoc().getUrl())}` +
+      '&ecr=1&crui=title&is_amp=3&output=xml';
     return fetchDocument(this.win, adUrl, {
       credentials: personalized ? 'include' : 'omit',
     }).then(doc => {
-      const urlService =
-              Services.urlForDoc(dev().assertElement(this.element));
+      const urlService = Services.urlForDoc(dev().assertElement(this.element));
       const {origin} = urlService.parse(this.getAmpDoc().getUrl());
 
       const recs = [];
@@ -231,7 +255,11 @@ export class AmpNextPage extends AMP.BaseElement {
     const ampdoc = this.getAmpDoc();
     const policy = UrlReplacementPolicy.ALL;
     return batchFetchJsonFor(
-        ampdoc, this.element, /* opt_expr */ undefined, policy);
+      ampdoc,
+      this.element,
+      /* opt_expr */ undefined,
+      policy
+    );
   }
 }
 
@@ -240,8 +268,10 @@ export class AmpNextPage extends AMP.BaseElement {
  * @return {!Promise<!NextPageService>}
  */
 function nextPageServiceForDoc(elementOrAmpDoc) {
-  return /** @type {!Promise<!NextPageService>} */ (
-    getServicePromiseForDoc(elementOrAmpDoc, SERVICE_ID));
+  return /** @type {!Promise<!NextPageService>} */ (getServicePromiseForDoc(
+    elementOrAmpDoc,
+    SERVICE_ID
+  ));
 }
 
 /**
diff --git a/extensions/amp-next-page/0.1/config.js b/extensions/amp-next-page/0.1/config.js
index efdf3e019f11..fa6d7e6f3329 100644
--- a/extensions/amp-next-page/0.1/config.js
+++ b/extensions/amp-next-page/0.1/config.js
@@ -56,8 +56,10 @@ export function assertConfig(context, config, documentUrl) {
   assertRecos(context, config.pages, documentUrl);
 
   if ('hideSelectors' in config) {
-    userAssert(isArray(config['hideSelectors']),
-        'amp-next-page hideSelectors should be an array');
+    userAssert(
+      isArray(config['hideSelectors']),
+      'amp-next-page hideSelectors should be an array'
+    );
     assertSelectors(config['hideSelectors']);
   }
 
@@ -73,9 +75,7 @@ function assertRecos(context, recos, documentUrl) {
   recos.forEach(reco => assertReco(context, reco, documentUrl));
 }
 
-const BANNED_SELECTOR_PATTERNS = [
-  /(^|\W)i-amphtml-/,
-];
+const BANNED_SELECTOR_PATTERNS = [/(^|\W)i-amphtml-/];
 
 /**
  * Asserts for valid selectors.
@@ -85,10 +85,15 @@ const BANNED_SELECTOR_PATTERNS = [
 function assertSelectors(selectors) {
   selectors.forEach(selector => {
     BANNED_SELECTOR_PATTERNS.forEach(pattern => {
-      user().assertString(selector,
-          'amp-next-page hideSelector value should be a string');
-      userAssert(!pattern.test(selector),
-          'amp-next-page hideSelector %s not allowed', selector);
+      user().assertString(
+        selector,
+        'amp-next-page hideSelector value should be a string'
+      );
+      userAssert(
+        !pattern.test(selector),
+        'amp-next-page hideSelector %s not allowed',
+        selector
+      );
     });
   });
 }
@@ -111,18 +116,23 @@ function assertReco(context, reco, documentUrl) {
   const sourceOrigin = getSourceOrigin(documentUrl);
 
   userAssert(
-      url.origin === origin || url.origin === sourceOrigin
-      || isValidAdSenseURL(context, url, origin),
-      'pages must be from the same origin as the current document');
+    url.origin === origin ||
+      url.origin === sourceOrigin ||
+      isValidAdSenseURL(context, url, origin),
+    'pages must be from the same origin as the current document'
+  );
   user().assertString(reco.image, 'image must be a string');
   user().assertString(reco.title, 'title must be a string');
 
   // Rewrite canonical URLs to cache URLs, when served from the cache.
   if (sourceOrigin !== origin && url.origin === sourceOrigin) {
-    reco.ampUrl = `${origin}/c/` +
-        (url.protocol === 'https:' ? 's/' : '') +
-        encodeURIComponent(url.host) +
-        url.pathname + (url.search || '') + (url.hash || '');
+    reco.ampUrl =
+      `${origin}/c/` +
+      (url.protocol === 'https:' ? 's/' : '') +
+      encodeURIComponent(url.host) +
+      url.pathname +
+      (url.search || '') +
+      (url.hash || '');
   }
 }
 
diff --git a/extensions/amp-next-page/0.1/next-page-service.js b/extensions/amp-next-page/0.1/next-page-service.js
index 8b729125dde4..f4526fb4d50b 100644
--- a/extensions/amp-next-page/0.1/next-page-service.js
+++ b/extensions/amp-next-page/0.1/next-page-service.js
@@ -16,16 +16,12 @@
 
 import {CSS} from '../../../build/amp-next-page-0.1.css';
 import {MultidocManager} from '../../../src/runtime';
-import {
-  PositionObserverFidelity,
-} from '../../../src/service/position-observer/position-observer-worker';
+import {PositionObserverFidelity} from '../../../src/service/position-observer/position-observer-worker';
 import {Services} from '../../../src/services';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getAmpdoc, getServiceForDoc} from '../../../src/service';
-import {
-  installPositionObserverServiceForDoc,
-} from '../../../src/service/position-observer/position-observer-impl';
+import {installPositionObserverServiceForDoc} from '../../../src/service/position-observer/position-observer-impl';
 import {installStylesForDoc} from '../../../src/style-installer';
 import {layoutRectLtwh} from '../../../src/layout-rect';
 import {removeElement} from '../../../src/dom';
@@ -154,9 +150,12 @@ export class NextPageService {
     this.navigation_ = Services.navigationForDoc(ampDoc);
     this.viewport_ = Services.viewportForDoc(ampDoc);
     this.resources_ = Services.resourcesForDoc(ampDoc);
-    this.multidocManager_ =
-        new MultidocManager(win, Services.ampdocServiceFor(win),
-            Services.extensionsFor(win), Services.timerFor(win));
+    this.multidocManager_ = new MultidocManager(
+      win,
+      Services.ampdocServiceFor(win),
+      Services.extensionsFor(win),
+      Services.timerFor(win)
+    );
     this.urlService_ = Services.urlForDoc(dev().assertElement(this.element_));
     this.origin_ = this.urlService_.parse(ampDoc.getUrl()).origin;
     this.history_ = Services.historyForDoc(ampDoc);
@@ -165,9 +164,11 @@ export class NextPageService {
     this.positionObserver_ = getServiceForDoc(ampDoc, 'position-observer');
 
     const {canonicalUrl} = Services.documentInfoForDoc(ampDoc);
-    const documentRef =
-        createDocumentRef(win.document.location.href, win.document.title,
-            canonicalUrl);
+    const documentRef = createDocumentRef(
+      win.document.location.href,
+      win.document.title,
+      canonicalUrl
+    );
     this.documentRefs_.push(documentRef);
     this.activeDocumentRef_ = this.documentRefs_[0];
 
@@ -211,8 +212,7 @@ export class NextPageService {
       removeElement(item);
     }
 
-    const amp =
-        this.multidocManager_.attachShadowDoc(shadowRoot, doc, '', {});
+    const amp = this.multidocManager_.attachShadowDoc(shadowRoot, doc, '', {});
     installStylesForDoc(amp.ampdoc, CSS, null, false, TAG);
 
     const body = amp.ampdoc.getBody();
@@ -255,11 +255,16 @@ export class NextPageService {
 
       const page = this.nextArticle_;
       this.appendPageHandler_(container).then(() => {
-        this.positionObserver_.observe(separator, PositionObserverFidelity.LOW,
-            position => this.positionUpdate_(page, position));
-        this.positionObserver_.observe(articleLinks,
-            PositionObserverFidelity.LOW,
-            unused => this.articleLinksPositionUpdate_(documentRef));
+        this.positionObserver_.observe(
+          separator,
+          PositionObserverFidelity.LOW,
+          position => this.positionUpdate_(page, position)
+        );
+        this.positionObserver_.observe(
+          articleLinks,
+          PositionObserverFidelity.LOW,
+          unused => this.articleLinksPositionUpdate_(documentRef)
+        );
       });
 
       // Don't fetch the next article if we've rendered the maximum on screen.
@@ -269,53 +274,64 @@ export class NextPageService {
       }
 
       this.nextArticle_++;
-      this.xhr_.fetch(next.ampUrl, {ampCors: false})
-          .then(response => {
-            // Update AMP URL in case we were redirected.
-            documentRef.ampUrl = response.url;
-            const url = this.urlService_.parse(response.url);
-            userAssert(url.origin === this.origin_,
-                'ampUrl resolved to a different origin from the origin of the '
-                + 'current document');
-            return response.text();
-          })
-          .then(html => {
-            const doc =
-                this.win_.document.implementation.createHTMLDocument('');
-            doc.open();
-            doc.write(html);
-            doc.close();
-            return doc;
-          })
-          .then(doc => new Promise((resolve, reject) => {
-            if (documentRef.cancelled) {
-              // User has reached the end of the document already, don't render.
-              resolve();
-              return;
-            }
-
-            if (documentRef.recUnit.isObserving) {
-              this.positionObserver_.unobserve(articleLinks);
-              documentRef.recUnit.isObserving = true;
-            }
-            this.resources_.mutateElement(container, () => {
-              try {
-                const amp = this.attachShadowDoc_(shadowRoot, doc);
-                documentRef.amp = amp;
-
-                toggle(dev().assertElement(documentRef.recUnit.el), false);
-                this.documentQueued_ = false;
+      this.xhr_
+        .fetch(next.ampUrl, {ampCors: false})
+        .then(response => {
+          // Update AMP URL in case we were redirected.
+          documentRef.ampUrl = response.url;
+          const url = this.urlService_.parse(response.url);
+          userAssert(
+            url.origin === this.origin_,
+            'ampUrl resolved to a different origin from the origin of the ' +
+              'current document'
+          );
+          return response.text();
+        })
+        .then(html => {
+          const doc = this.win_.document.implementation.createHTMLDocument('');
+          doc.open();
+          doc.write(html);
+          doc.close();
+          return doc;
+        })
+        .then(
+          doc =>
+            new Promise((resolve, reject) => {
+              if (documentRef.cancelled) {
+                // User has reached the end of the document already, don't render.
                 resolve();
-              } catch (e) {
-                reject(e);
+                return;
               }
-            });
-          }),
-          e => user().error(TAG, 'failed to fetch %s', next.ampUrl, e))
-          .catch(e => dev().error(TAG,
-              'failed to attach shadow document for %s', next.ampUrl, e))
-          // The new page may be short and the next may already need fetching.
-          .then(() => this.scrollHandler_());
+
+              if (documentRef.recUnit.isObserving) {
+                this.positionObserver_.unobserve(articleLinks);
+                documentRef.recUnit.isObserving = true;
+              }
+              this.resources_.mutateElement(container, () => {
+                try {
+                  const amp = this.attachShadowDoc_(shadowRoot, doc);
+                  documentRef.amp = amp;
+
+                  toggle(dev().assertElement(documentRef.recUnit.el), false);
+                  this.documentQueued_ = false;
+                  resolve();
+                } catch (e) {
+                  reject(e);
+                }
+              });
+            }),
+          e => user().error(TAG, 'failed to fetch %s', next.ampUrl, e)
+        )
+        .catch(e =>
+          dev().error(
+            TAG,
+            'failed to attach shadow document for %s',
+            next.ampUrl,
+            e
+          )
+        )
+        // The new page may be short and the next may already need fetching.
+        .then(() => this.scrollHandler_());
     }
   }
 
@@ -338,20 +354,29 @@ export class NextPageService {
     const element = doc.createElement('div');
     element.classList.add('amp-next-page-links');
 
-    while (article < this.config_.pages.length &&
-           article - nextPage < SEPARATOR_RECOS) {
+    while (
+      article < this.config_.pages.length &&
+      article - nextPage < SEPARATOR_RECOS
+    ) {
       const next = this.config_.pages[article];
       article++;
 
       const articleHolder = doc.createElement('a');
       articleHolder.href = next.ampUrl;
       articleHolder.classList.add(
-          'i-amphtml-reco-holder-article', 'amp-next-page-link');
+        'i-amphtml-reco-holder-article',
+        'amp-next-page-link'
+      );
       articleHolder.addEventListener('click', e => {
         this.triggerAnalyticsEvent_(
-            'amp-next-page-click', next.ampUrl, currentAmpUrl);
-        const a2a =
-            this.navigation_.navigateToAmpUrl(next.ampUrl, 'content-discovery');
+          'amp-next-page-click',
+          next.ampUrl,
+          currentAmpUrl
+        );
+        const a2a = this.navigation_.navigateToAmpUrl(
+          next.ampUrl,
+          'content-discovery'
+        );
         if (a2a) {
           // A2A is enabled, don't navigate the browser.
           e.preventDefault();
@@ -360,13 +385,17 @@ export class NextPageService {
 
       const imageElement = doc.createElement('div');
       imageElement.classList.add(
-          'i-amphtml-next-article-image', 'amp-next-page-image');
+        'i-amphtml-next-article-image',
+        'amp-next-page-image'
+      );
       setStyle(imageElement, 'background-image', `url(${next.image})`);
       articleHolder.appendChild(imageElement);
 
       const titleElement = doc.createElement('div');
       titleElement.classList.add(
-          'i-amphtml-next-article-title', 'amp-next-page-text');
+        'i-amphtml-next-article-title',
+        'amp-next-page-text'
+      );
 
       titleElement.textContent = next.title;
       articleHolder.appendChild(titleElement);
@@ -389,21 +418,25 @@ export class NextPageService {
     }
 
     const viewportSize = this.viewport_.getSize();
-    const viewportBox =
-        layoutRectLtwh(0, 0, viewportSize.width, viewportSize.height);
-    this.viewport_.getClientRectAsync(dev().assertElement(this.element_))
-        .then(elementBox => {
-          if (this.documentQueued_) {
-            return;
-          }
-
-          const prerenderHeight =
-              PRERENDER_VIEWPORT_COUNT * viewportSize.height;
-          if (elementBox.bottom - viewportBox.bottom < prerenderHeight) {
-            this.documentQueued_ = true;
-            this.appendNextArticle_();
-          }
-        });
+    const viewportBox = layoutRectLtwh(
+      0,
+      0,
+      viewportSize.width,
+      viewportSize.height
+    );
+    this.viewport_
+      .getClientRectAsync(dev().assertElement(this.element_))
+      .then(elementBox => {
+        if (this.documentQueued_) {
+          return;
+        }
+
+        const prerenderHeight = PRERENDER_VIEWPORT_COUNT * viewportSize.height;
+        if (elementBox.bottom - viewportBox.bottom < prerenderHeight) {
+          this.documentQueued_ = true;
+          this.appendNextArticle_();
+        }
+      });
   }
 
   /**
@@ -432,8 +465,11 @@ export class NextPageService {
     }
 
     if (documentRef && documentRef.amp) {
-      this.triggerAnalyticsEvent_(analyticsEvent,
-          documentRef.ampUrl, this.activeDocumentRef_.ampUrl);
+      this.triggerAnalyticsEvent_(
+        analyticsEvent,
+        documentRef.ampUrl,
+        this.activeDocumentRef_.ampUrl
+      );
       this.setActiveDocument_(documentRef);
     }
   }
@@ -449,7 +485,8 @@ export class NextPageService {
     documentRef.cancelled = true;
     if (documentRef.recUnit.isObserving) {
       this.positionObserver_.unobserve(
-          dev().assertElement(documentRef.recUnit.el));
+        dev().assertElement(documentRef.recUnit.el)
+      );
       documentRef.recUnit.isObserving = false;
     }
   }
@@ -505,7 +542,7 @@ export class NextPageService {
  * @return {!DocumentRef} Ref object initialised with the given URL.
  */
 function createDocumentRef(ampUrl, title, canonicalUrl) {
-  const amp = (title || canonicalUrl) ? {title, canonicalUrl} : null;
+  const amp = title || canonicalUrl ? {title, canonicalUrl} : null;
   return {
     ampUrl,
     amp,
diff --git a/extensions/amp-next-page/0.1/test/test-amp-next-page.js b/extensions/amp-next-page/0.1/test/test-amp-next-page.js
index aa1cf55b6669..25dc6b29f233 100644
--- a/extensions/amp-next-page/0.1/test/test-amp-next-page.js
+++ b/extensions/amp-next-page/0.1/test/test-amp-next-page.js
@@ -27,60 +27,63 @@ const EXAMPLE_PAGE = `
     <div style="height:1000px"></div>
     <footer>Footer</footer>`;
 
-describes.realWin('amp-next-page component', {
-  amp: {
-    extensions: ['amp-next-page'],
+describes.realWin(
+  'amp-next-page component',
+  {
+    amp: {
+      extensions: ['amp-next-page'],
+    },
   },
-},
-env => {
-  let win, doc, ampdoc;
-  let element;
-  let nextPage;
-  let fetchDocumentMock;
-  let viewport;
-  let sizes;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    viewport = Services.viewportForDoc(ampdoc);
-    sizes = viewport.getSize();
-    element = doc.createElement('div');
-
-    toggleExperiment(win, 'amp-next-page', true);
-
-    // Ensure element is off screen when it renders.
-    setStyle(element, 'marginTop', '10000px');
-    element.getAmpDoc = () => ampdoc;
-    element.getFallback = () => null;
-    element.getResources = () => win.services.resources.obj;
-
-    doc.body.appendChild(element);
-    nextPage = new AmpNextPage(element);
-
-    ampdoc.getUrl = () => document.location.href;
-
-    fetchDocumentMock = sandbox.mock(DocFetcher);
-    sandbox.stub(Services.resourcesForDoc(ampdoc), 'mutateElement')
+  env => {
+    let win, doc, ampdoc;
+    let element;
+    let nextPage;
+    let fetchDocumentMock;
+    let viewport;
+    let sizes;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      viewport = Services.viewportForDoc(ampdoc);
+      sizes = viewport.getSize();
+      element = doc.createElement('div');
+
+      toggleExperiment(win, 'amp-next-page', true);
+
+      // Ensure element is off screen when it renders.
+      setStyle(element, 'marginTop', '10000px');
+      element.getAmpDoc = () => ampdoc;
+      element.getFallback = () => null;
+      element.getResources = () => win.services.resources.obj;
+
+      doc.body.appendChild(element);
+      nextPage = new AmpNextPage(element);
+
+      ampdoc.getUrl = () => document.location.href;
+
+      fetchDocumentMock = sandbox.mock(DocFetcher);
+      sandbox
+        .stub(Services.resourcesForDoc(ampdoc), 'mutateElement')
         .callsFake((unused, mutator) => {
           mutator();
           return Promise.resolve();
         });
-    sandbox.stub(nextPage, 'mutateElement').callsFake(mutator => {
-      mutator();
-      return Promise.resolve();
+      sandbox.stub(nextPage, 'mutateElement').callsFake(mutator => {
+        mutator();
+        return Promise.resolve();
+      });
     });
-  });
 
-  afterEach(() => {
-    fetchDocumentMock.verify();
-    toggleExperiment(win, 'amp-next-page', false);
-  });
+    afterEach(() => {
+      fetchDocumentMock.verify();
+      toggleExperiment(win, 'amp-next-page', false);
+    });
 
-  describe('valid inline config', () => {
-    beforeEach(done => {
-      element.innerHTML = `
+    describe('valid inline config', () => {
+      beforeEach(done => {
+        element.innerHTML = `
           <script type="application/json">
             {
               "pages": [
@@ -101,240 +104,278 @@ env => {
               ]
             }
           </script>`;
-      nextPage.buildCallback().then(done);
-    });
-
-    it('does not fetch the next document before 3 viewports away',
-        function* () {
-          const xhrMock = sandbox.mock(Services.xhrFor(win));
-          xhrMock.expects('fetch').never();
-          sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
-            // 4x viewports away
-            return Promise.resolve(
-                layoutRectLtwh(0, 0, sizes.width, sizes.height * 5));
-          });
-
-          win.dispatchEvent(new Event('scroll'));
-          yield macroTask();
+        nextPage.buildCallback().then(done);
+      });
 
-          xhrMock.verify();
+      it('does not fetch the next document before 3 viewports away', function*() {
+        const xhrMock = sandbox.mock(Services.xhrFor(win));
+        xhrMock.expects('fetch').never();
+        sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
+          // 4x viewports away
+          return Promise.resolve(
+            layoutRectLtwh(0, 0, sizes.width, sizes.height * 5)
+          );
         });
 
-    it('fetches the next document within 3 viewports away', function* () {
-      env.fetchMock.get('*', EXAMPLE_PAGE);
-      sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
-        // 1x viewport away
-        return Promise.resolve(
-            layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
-      });
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
 
-      win.dispatchEvent(new Event('scroll'));
-      yield macroTask();
+        xhrMock.verify();
+      });
 
-      expect(env.fetchMock.done(/\/document1/)).to.be.true;
-    });
+      it('fetches the next document within 3 viewports away', function*() {
+        env.fetchMock.get('*', EXAMPLE_PAGE);
+        sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
+          // 1x viewport away
+          return Promise.resolve(
+            layoutRectLtwh(0, 0, sizes.width, sizes.height * 2)
+          );
+        });
 
-    it('only fetches the next document once', function*() {
-      const xhrMock = sandbox.mock(Services.xhrFor(win));
-      // Promise which is never resolved.
-      xhrMock.expects('fetch').returns(new Promise(() => {})).once();
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
 
-      sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
-        // 1x viewport away
-        return Promise.resolve(
-            layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
+        expect(env.fetchMock.done(/\/document1/)).to.be.true;
       });
 
-      win.dispatchEvent(new Event('scroll'));
-      yield macroTask();
-      win.dispatchEvent(new Event('scroll'));
-      yield macroTask();
-      xhrMock.verify();
-    });
-
-    it('adds the hidden class to hideSelector elements', function* () {
-      env.fetchMock.get('*', EXAMPLE_PAGE);
+      it('only fetches the next document once', function*() {
+        const xhrMock = sandbox.mock(Services.xhrFor(win));
+        // Promise which is never resolved.
+        xhrMock
+          .expects('fetch')
+          .returns(new Promise(() => {}))
+          .once();
+
+        sandbox.stub(viewport, 'getClientRectAsync').callsFake(() => {
+          // 1x viewport away
+          return Promise.resolve(
+            layoutRectLtwh(0, 0, sizes.width, sizes.height * 2)
+          );
+        });
 
-      const nextPageService =
-          yield getServicePromiseForDoc(ampdoc, 'next-page');
-      const attachShadowDocSpy =
-          sandbox.spy(nextPageService.multidocManager_, 'attachShadowDoc');
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
+        xhrMock.verify();
+      });
 
-      sandbox.stub(viewport, 'getClientRectAsync')
-          .onFirstCall().callsFake(() => {
+      it('adds the hidden class to hideSelector elements', function*() {
+        env.fetchMock.get('*', EXAMPLE_PAGE);
+
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const attachShadowDocSpy = sandbox.spy(
+          nextPageService.multidocManager_,
+          'attachShadowDoc'
+        );
+
+        sandbox
+          .stub(viewport, 'getClientRectAsync')
+          .onFirstCall()
+          .callsFake(() => {
             // 1x viewport away
             return Promise.resolve(
-                layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
+              layoutRectLtwh(0, 0, sizes.width, sizes.height * 2)
+            );
           });
 
-      win.dispatchEvent(new Event('scroll'));
-      yield macroTask();
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
 
-      const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
-      yield shadowDoc.whenReady();
+        const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
+        yield shadowDoc.whenReady();
 
-      const shadowRoot = shadowDoc.getRootNode();
+        const shadowRoot = shadowDoc.getRootNode();
 
-      expect(shadowRoot.querySelector('header'))
-          .to.have.class('i-amphtml-next-page-hidden');
+        expect(shadowRoot.querySelector('header')).to.have.class(
+          'i-amphtml-next-page-hidden'
+        );
 
-      expect(shadowRoot.querySelector('footer'))
-          .to.have.class('i-amphtml-next-page-hidden');
-    });
+        expect(shadowRoot.querySelector('footer')).to.have.class(
+          'i-amphtml-next-page-hidden'
+        );
+      });
 
-    it('removes amp-analytics tags from child documents', function* () {
-      const examplePage = `${EXAMPLE_PAGE}
+      it('removes amp-analytics tags from child documents', function*() {
+        const examplePage = `${EXAMPLE_PAGE}
           <amp-analytics id="analytics1"></amp-analytics>
           <amp-analytics id="analytics2"></amp-analytics>`;
-      env.fetchMock.get('*', examplePage);
-
-      const nextPageService =
-          yield getServicePromiseForDoc(ampdoc, 'next-page');
-      const attachShadowDocSpy =
-          sandbox.spy(nextPageService.multidocManager_, 'attachShadowDoc');
-      sandbox.stub(viewport, 'getClientRectAsync')
-          .onFirstCall().callsFake(() => {
+        env.fetchMock.get('*', examplePage);
+
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const attachShadowDocSpy = sandbox.spy(
+          nextPageService.multidocManager_,
+          'attachShadowDoc'
+        );
+        sandbox
+          .stub(viewport, 'getClientRectAsync')
+          .onFirstCall()
+          .callsFake(() => {
             // 1x viewport away
             return Promise.resolve(
-                layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
-          });
-      win.dispatchEvent(new Event('scroll'));
-      yield macroTask();
-      const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
-      yield shadowDoc.whenReady();
-      const shadowRoot = shadowDoc.getRootNode();
-      expect(shadowRoot.getElementById('analytics1')).to.be.null;
-      expect(shadowRoot.getElementById('analytics2')).to.be.null;
-    });
-
-    it('blocks documents which resolve to a different origin when fetched',
-        function* () {
-          expectAsyncConsoleError(/ampUrl resolved to a different origin/, 2);
-          env.fetchMock.get(/\/document1/, {
-            redirectUrl: 'https://othersite.com/article',
-            body: EXAMPLE_PAGE,
+              layoutRectLtwh(0, 0, sizes.width, sizes.height * 2)
+            );
           });
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
+        const shadowDoc = attachShadowDocSpy.firstCall.returnValue.ampdoc;
+        yield shadowDoc.whenReady();
+        const shadowRoot = shadowDoc.getRootNode();
+        expect(shadowRoot.getElementById('analytics1')).to.be.null;
+        expect(shadowRoot.getElementById('analytics2')).to.be.null;
+      });
 
-          const nextPageService =
-              yield getServicePromiseForDoc(ampdoc, 'next-page');
-          const attachShadowDocSpy =
-              sandbox.spy(nextPageService.multidocManager_, 'attachShadowDoc');
-          sandbox.stub(viewport, 'getClientRectAsync')
-              .onFirstCall().callsFake(() => {
-                // 1x viewport away
-                return Promise.resolve(
-                    layoutRectLtwh(0, 0, sizes.width, sizes.height * 2));
-              });
-          win.dispatchEvent(new Event('scroll'));
-          yield macroTask();
-
-          expect(env.fetchMock.done()).to.be.true;
-          expect(attachShadowDocSpy.notCalled).to.be.true;
+      it('blocks documents which resolve to a different origin when fetched', function*() {
+        expectAsyncConsoleError(/ampUrl resolved to a different origin/, 2);
+        env.fetchMock.get(/\/document1/, {
+          redirectUrl: 'https://othersite.com/article',
+          body: EXAMPLE_PAGE,
         });
-  });
-
-  describe('remote config', () => {
-    it('errors when no config specified', () => {
-      const error =
-          'amp-next-page should contain a <script> child, a URL specified in '
-          + '[src], or a [type]';
-      expectAsyncConsoleError(error);
-      return nextPage.buildCallback().should.be.rejectedWith(error);
-    });
-
-    it('fetches remote config when specified in src', function* () {
-      const config = {
-        pages: [
-          {
-            image: '/examples/img/hero@1x.jpg',
-            title: 'Remote config',
-            ampUrl: '/document1',
-          },
-        ],
-      };
-      const srcUrl = 'https://example.com/config.json';
-      element.setAttribute('src', srcUrl);
-
-      const fetchJsonStub =
-          sandbox.stub(Services.batchedXhrFor(win), 'fetchJson')
-              .resolves({
-                ok: true,
-                json() {
-                  return Promise.resolve(config);
-                },
-              });
-      const nextPageService =
-          yield getServicePromiseForDoc(ampdoc, 'next-page');
-      const registerSpy = sandbox.spy(nextPageService, 'register');
 
-      yield nextPage.buildCallback();
-      yield macroTask();
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const attachShadowDocSpy = sandbox.spy(
+          nextPageService.multidocManager_,
+          'attachShadowDoc'
+        );
+        sandbox
+          .stub(viewport, 'getClientRectAsync')
+          .onFirstCall()
+          .callsFake(() => {
+            // 1x viewport away
+            return Promise.resolve(
+              layoutRectLtwh(0, 0, sizes.width, sizes.height * 2)
+            );
+          });
+        win.dispatchEvent(new Event('scroll'));
+        yield macroTask();
 
-      expect(fetchJsonStub.calledWithExactly(
-          srcUrl, {requireAmpResponseSourceOrigin: false})).to.be.true;
-      expect(registerSpy.calledWith(element, config)).to.be.true;
-    });
-  });
-
-  describe('AdSense config', () => {
-    it('errors without client', () => {
-      const error = 'amp-next-page AdSense client should be of the format '
-          + '\'ca-pub-123456\'';
-      expectAsyncConsoleError(error);
-      element.setAttribute('type', 'adsense');
-      element.setAttribute('data-slot', '12345');
-      return nextPage.buildCallback().should.be.rejectedWith(error);
+        expect(env.fetchMock.done()).to.be.true;
+        expect(attachShadowDocSpy.notCalled).to.be.true;
+      });
     });
 
-    it('errors without slot', () => {
-      const error = 'amp-next-page AdSense slot should be a number';
-      expectAsyncConsoleError(error);
-      element.setAttribute('type', 'adsense');
-      element.setAttribute('data-client', 'ca-pub-12345');
-      return nextPage.buildCallback().should.be.rejectedWith(error);
-    });
+    describe('remote config', () => {
+      it('errors when no config specified', () => {
+        const error =
+          'amp-next-page should contain a <script> child, a URL specified in ' +
+          '[src], or a [type]';
+        expectAsyncConsoleError(error);
+        return nextPage.buildCallback().should.be.rejectedWith(error);
+      });
 
-    it('errors for invalid client format', () => {
-      const error = 'amp-next-page AdSense client should be of the format '
-          + '\'ca-pub-123456\'';
-      expectAsyncConsoleError(error);
-      element.setAttribute('type', 'adsense');
-      element.setAttribute('data-client', 'doggos');
-      element.setAttribute('data-slot', '12345');
-      return nextPage.buildCallback().should.be.rejectedWith(error);
+      it('fetches remote config when specified in src', function*() {
+        const config = {
+          pages: [
+            {
+              image: '/examples/img/hero@1x.jpg',
+              title: 'Remote config',
+              ampUrl: '/document1',
+            },
+          ],
+        };
+        const srcUrl = 'https://example.com/config.json';
+        element.setAttribute('src', srcUrl);
+
+        const fetchJsonStub = sandbox
+          .stub(Services.batchedXhrFor(win), 'fetchJson')
+          .resolves({
+            ok: true,
+            json() {
+              return Promise.resolve(config);
+            },
+          });
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const registerSpy = sandbox.spy(nextPageService, 'register');
+
+        yield nextPage.buildCallback();
+        yield macroTask();
+
+        expect(
+          fetchJsonStub.calledWithExactly(srcUrl, {
+            requireAmpResponseSourceOrigin: false,
+          })
+        ).to.be.true;
+        expect(registerSpy.calledWith(element, config)).to.be.true;
+      });
     });
 
-    it('errors for invalid slot format', () => {
-      const error = 'amp-next-page AdSense slot should be a number';
-      expectAsyncConsoleError(error);
-      element.setAttribute('type', 'adsense');
-      element.setAttribute('data-client', 'ca-pub-12345');
-      element.setAttribute('data-slot', 'doggos');
-      return nextPage.buildCallback().should.be.rejectedWith(error);
-    });
-  });
+    describe('AdSense config', () => {
+      it('errors without client', () => {
+        const error =
+          'amp-next-page AdSense client should be of the format ' +
+          "'ca-pub-123456'";
+        expectAsyncConsoleError(error);
+        element.setAttribute('type', 'adsense');
+        element.setAttribute('data-slot', '12345');
+        return nextPage.buildCallback().should.be.rejectedWith(error);
+      });
+
+      it('errors without slot', () => {
+        const error = 'amp-next-page AdSense slot should be a number';
+        expectAsyncConsoleError(error);
+        element.setAttribute('type', 'adsense');
+        element.setAttribute('data-client', 'ca-pub-12345');
+        return nextPage.buildCallback().should.be.rejectedWith(error);
+      });
 
-  describe('valid AdSense config', () => {
-    const client = 'ca-pub-12345';
-    const slot = '12345';
-    let url;
+      it('errors for invalid client format', () => {
+        const error =
+          'amp-next-page AdSense client should be of the format ' +
+          "'ca-pub-123456'";
+        expectAsyncConsoleError(error);
+        element.setAttribute('type', 'adsense');
+        element.setAttribute('data-client', 'doggos');
+        element.setAttribute('data-slot', '12345');
+        return nextPage.buildCallback().should.be.rejectedWith(error);
+      });
 
-    beforeEach(() => {
-      ampdoc.getUrl = () => 'https://example.com/parent';
-      element.setAttribute('type', 'adsense');
-      element.setAttribute('data-client', client);
-      element.setAttribute('data-slot', slot);
-
-      url = 'https://googleads.g.doubleclick.net/pagead/ads?'
-      + `client=${client}&slotname=${slot}`
-      + `&url=${encodeURIComponent(ampdoc.getUrl())}`
-      + '&ecr=1&crui=title&is_amp=3&output=xml';
+      it('errors for invalid slot format', () => {
+        const error = 'amp-next-page AdSense slot should be a number';
+        expectAsyncConsoleError(error);
+        element.setAttribute('type', 'adsense');
+        element.setAttribute('data-client', 'ca-pub-12345');
+        element.setAttribute('data-slot', 'doggos');
+        return nextPage.buildCallback().should.be.rejectedWith(error);
+      });
     });
 
-    it('fetches recommendations from AdSense', function* () {
-      fetchDocumentMock.expects('fetchDocument')
+    describe('valid AdSense config', () => {
+      const client = 'ca-pub-12345';
+      const slot = '12345';
+      let url;
+
+      beforeEach(() => {
+        ampdoc.getUrl = () => 'https://example.com/parent';
+        element.setAttribute('type', 'adsense');
+        element.setAttribute('data-client', client);
+        element.setAttribute('data-slot', slot);
+
+        url =
+          'https://googleads.g.doubleclick.net/pagead/ads?' +
+          `client=${client}&slotname=${slot}` +
+          `&url=${encodeURIComponent(ampdoc.getUrl())}` +
+          '&ecr=1&crui=title&is_amp=3&output=xml';
+      });
+
+      it('fetches recommendations from AdSense', function*() {
+        fetchDocumentMock
+          .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'include'})
-          .returns(Promise.resolve(createXmlDoc(`
+          .returns(
+            Promise.resolve(
+              createXmlDoc(`
 <GSP VER="3.2">
   <ADS>
     <AD n="1" type="text/narrow" 
@@ -351,40 +392,49 @@ env => {
     </MEDIA_TEMPLATE_DATA>
     </AD>
   </ADS>
-</GSP>`)));
-
-      const config = {
-        pages: [
-          {
-            ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
-            title: 'Page title',
-            image: 'https://example.com/image.png',
-          },
-        ],
-      };
-
-      const nextPageService =
-          yield getServicePromiseForDoc(ampdoc, 'next-page');
-      const registerSpy = sandbox.spy(nextPageService, 'register');
-
-      yield nextPage.buildCallback();
-      yield macroTask();
-
-      expect(registerSpy.calledWith(element, config)).to.be.true;
-    });
+</GSP>`)
+            )
+          );
+
+        const config = {
+          pages: [
+            {
+              ampUrl:
+                'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
+              title: 'Page title',
+              image: 'https://example.com/image.png',
+            },
+          ],
+        };
+
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const registerSpy = sandbox.spy(nextPageService, 'register');
+
+        yield nextPage.buildCallback();
+        yield macroTask();
+
+        expect(registerSpy.calledWith(element, config)).to.be.true;
+      });
 
-    it('makes an unpersonalized request if missing consent', function* () {
-      fetchDocumentMock.expects('fetchDocument')
+      it('makes an unpersonalized request if missing consent', function*() {
+        fetchDocumentMock
+          .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'omit'})
           .returns(Promise.resolve());
-      element.setAttribute('data-block-on-consent', true);
-      yield nextPage.buildCallback();
-    });
+        element.setAttribute('data-block-on-consent', true);
+        yield nextPage.buildCallback();
+      });
 
-    it('filters pages with visible_urls from different origins', function* () {
-      fetchDocumentMock.expects('fetchDocument')
+      it('filters pages with visible_urls from different origins', function*() {
+        fetchDocumentMock
+          .expects('fetchDocument')
           .withExactArgs(win, url, {credentials: 'include'})
-          .returns(Promise.resolve(createXmlDoc(`
+          .returns(
+            Promise.resolve(
+              createXmlDoc(`
 <GSP VER="3.2">
   <ADS>
     <AD n="1" type="text/narrow" 
@@ -427,56 +477,63 @@ env => {
     </MEDIA_TEMPLATE_DATA>
     </AD>
   </ADS>
-</GSP>`)));
-
-      const config = {
-        pages: [
-          {
-            ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
-            title: 'Example 1',
-            image: 'https://example.com/image2.png',
-          },
-        ],
-      };
-
-      const nextPageService =
-          yield getServicePromiseForDoc(ampdoc, 'next-page');
-      const registerSpy = sandbox.spy(nextPageService, 'register');
-
-      yield nextPage.buildCallback();
-      yield macroTask();
-
-      expect(registerSpy.calledWith(element, config)).to.be.true;
-    });
+</GSP>`)
+            )
+          );
+
+        const config = {
+          pages: [
+            {
+              ampUrl:
+                'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
+              title: 'Example 1',
+              image: 'https://example.com/image2.png',
+            },
+          ],
+        };
+
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const registerSpy = sandbox.spy(nextPageService, 'register');
+
+        yield nextPage.buildCallback();
+        yield macroTask();
+
+        expect(registerSpy.calledWith(element, config)).to.be.true;
+      });
 
-    it('falls back to inline config pages if the AdSense request fails',
-        function* () {
-          const config = {
-            pages: [
-              {
-                ampUrl: 'https://example.com/fallback',
-                title: 'Fallback article',
-                image: 'https://example.com/fallback.png',
-              },
-            ],
-          };
-          env.fetchMock.get('*', 404);
-
-          element.innerHTML = `<script type="application/json">
+      it('falls back to inline config pages if the AdSense request fails', function*() {
+        const config = {
+          pages: [
+            {
+              ampUrl: 'https://example.com/fallback',
+              title: 'Fallback article',
+              image: 'https://example.com/fallback.png',
+            },
+          ],
+        };
+        env.fetchMock.get('*', 404);
+
+        element.innerHTML = `<script type="application/json">
                                  ${JSON.stringify(config)}
                                </script>`;
 
-          const nextPageService =
-              yield getServicePromiseForDoc(ampdoc, 'next-page');
-          const registerSpy = sandbox.spy(nextPageService, 'register');
+        const nextPageService = yield getServicePromiseForDoc(
+          ampdoc,
+          'next-page'
+        );
+        const registerSpy = sandbox.spy(nextPageService, 'register');
 
-          yield nextPage.buildCallback();
-          yield macroTask();
+        yield nextPage.buildCallback();
+        yield macroTask();
 
-          expect(registerSpy.calledWith(element, config)).to.be.true;
-        });
-  });
-});
+        expect(registerSpy.calledWith(element, config)).to.be.true;
+      });
+    });
+  }
+);
 
 /**
  * Creates a new XML document from the specified XML text.
diff --git a/extensions/amp-next-page/0.1/test/test-config.js b/extensions/amp-next-page/0.1/test/test-config.js
index a30cb5b80e1e..20373c432af9 100644
--- a/extensions/amp-next-page/0.1/test/test-config.js
+++ b/extensions/amp-next-page/0.1/test/test-config.js
@@ -18,10 +18,10 @@ import {assertConfig} from '../config';
 import {parseUrlDeprecated} from '../../../../src/url';
 
 describe('amp-next-page config', () => {
-
   describes.sandboxed('assertConfig', {}, env => {
     const documentUrl = 'https://example.com/parent';
-    const documentUrlCdn = 'https://example-com.cdn.ampproject.org/c/s/example.com/parent';
+    const documentUrlCdn =
+      'https://example-com.cdn.ampproject.org/c/s/example.com/parent';
 
     beforeEach(() => {
       env.sandbox.stub(Services, 'urlForDoc').returns({
@@ -31,59 +31,67 @@ describe('amp-next-page config', () => {
 
     it('allows a valid config', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://example.com/article1',
-          image: 'https://example.com/image.png',
-          title: 'Article 1',
-        }],
-        hideSelectors: [
-          '.header',
-          'footer',
+        pages: [
+          {
+            ampUrl: 'https://example.com/article1',
+            image: 'https://example.com/image.png',
+            title: 'Article 1',
+          },
         ],
+        hideSelectors: ['.header', 'footer'],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrl)
+      ).to.not.throw();
     });
 
     it('allows a config with no pages', () => {
       const config = {pages: []};
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrl)
+      ).to.not.throw();
     });
 
     it('rewrites relative URLs to absolute', () => {
       const config = {
-        pages: [{
-          ampUrl: '/article1',
-          image: '/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl: '/article1',
+            image: '/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-          .to.not.throw();
-      expect(config.pages[0].ampUrl).to.equal(
-          'https://example.com/article1');
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrl)
+      ).to.not.throw();
+      expect(config.pages[0].ampUrl).to.equal('https://example.com/article1');
     });
 
     it('rewrites relative URLs when served from the cache', () => {
       const config = {
-        pages: [{
-          ampUrl: '/article1',
-          image: '/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl: '/article1',
+            image: '/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrlCdn))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrlCdn)
+      ).to.not.throw();
       expect(config.pages[0].ampUrl).to.equal(
-          'https://example-com.cdn.ampproject.org/c/s/example.com/article1');
+        'https://example-com.cdn.ampproject.org/c/s/example.com/article1'
+      );
     });
 
     it('rewrites canonical URLs when served from the cache', () => {
       const config = {
         pages: [
           {
-            ampUrl: 'https://example-com.cdn.ampproject.org/c/s/example.com/art1',
+            ampUrl:
+              'https://example-com.cdn.ampproject.org/c/s/example.com/art1',
             image: 'https://example.com/image.png',
             title: 'Article 1',
           },
@@ -94,12 +102,15 @@ describe('amp-next-page config', () => {
           },
         ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrlCdn))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrlCdn)
+      ).to.not.throw();
       expect(config.pages[0].ampUrl).to.equal(
-          'https://example-com.cdn.ampproject.org/c/s/example.com/art1');
+        'https://example-com.cdn.ampproject.org/c/s/example.com/art1'
+      );
       expect(config.pages[1].ampUrl).to.equal(
-          'https://example-com.cdn.ampproject.org/c/s/example.com/art2?x=1');
+        'https://example-com.cdn.ampproject.org/c/s/example.com/art2?x=1'
+      );
     });
 
     it('rewrites non-HTTPS canonical URLs when served from the cache', () => {
@@ -117,10 +128,11 @@ describe('amp-next-page config', () => {
       expect(() => assertConfig(/*ctx*/ null, config, url)).to.not.throw();
 
       expect(config.pages[0].ampUrl).to.equal(
-          'https://example-com.cdn.ampproject.org/c/example.com/art2?x=1');
+        'https://example-com.cdn.ampproject.org/c/example.com/art2?x=1'
+      );
     });
 
-    it('doesn\'t rewrite URLs if sourceOrigin and origin match', () => {
+    it("doesn't rewrite URLs if sourceOrigin and origin match", () => {
       const config = {
         pages: [
           {
@@ -130,85 +142,101 @@ describe('amp-next-page config', () => {
           },
         ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrl)
+      ).to.not.throw();
       expect(config.pages[0].ampUrl).to.equal('https://example.com/article');
     });
 
     it('throws on null config', () => {
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, null, documentUrl))
-            .to.throw('amp-next-page config must be specified');
+        expect(() => assertConfig(/*ctx*/ null, null, documentUrl)).to.throw(
+          'amp-next-page config must be specified'
+        );
       });
     });
 
     it('throws on config with no "pages" key', () => {
       const config = {};
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('pages must be an array');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'pages must be an array'
+        );
       });
     });
 
     it('throws on config with non-array "pages" key', () => {
       const config = {pages: {}};
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('pages must be an array');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'pages must be an array'
+        );
       });
     });
 
     it('throws on config with missing recommendation title', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://example.com/article1',
-          image: 'https://example.com/image.png',
-        }],
+        pages: [
+          {
+            ampUrl: 'https://example.com/article1',
+            image: 'https://example.com/image.png',
+          },
+        ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('title must be a string');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'title must be a string'
+        );
       });
     });
 
     it('throws on config with non-string recommendation title', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://example.com/article1',
-          image: 'https://example.com/image.png',
-          title: {},
-        }],
+        pages: [
+          {
+            ampUrl: 'https://example.com/article1',
+            image: 'https://example.com/image.png',
+            title: {},
+          },
+        ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('title must be a string');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'title must be a string'
+        );
       });
     });
 
     it('throws on config with missing recommendation image', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://example.com/article1',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl: 'https://example.com/article1',
+            title: 'Article 1',
+          },
+        ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('image must be a string');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'image must be a string'
+        );
       });
     });
 
     it('throws on config with non-string recommendation image', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://example.com/article1',
-          image: {},
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl: 'https://example.com/article1',
+            image: {},
+            title: 'Article 1',
+          },
+        ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('image must be a string');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'image must be a string'
+        );
       });
     });
 
@@ -223,9 +251,9 @@ describe('amp-next-page config', () => {
         ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw(
-                'pages must be from the same origin as the current document');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'pages must be from the same origin as the current document'
+        );
       });
     });
 
@@ -240,9 +268,9 @@ describe('amp-next-page config', () => {
         ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw(
-                'pages must be from the same origin as the current document');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'pages must be from the same origin as the current document'
+        );
       });
     });
 
@@ -257,9 +285,9 @@ describe('amp-next-page config', () => {
         ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw(
-                'pages must be from the same origin as the current document');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'pages must be from the same origin as the current document'
+        );
       });
     });
 
@@ -269,8 +297,9 @@ describe('amp-next-page config', () => {
         hideSelectors: {},
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('amp-next-page hideSelectors should be an array');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'amp-next-page hideSelectors should be an array'
+        );
       });
     });
 
@@ -280,8 +309,9 @@ describe('amp-next-page config', () => {
         hideSelectors: ['a', 2],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw('amp-next-page hideSelector value should be a string: 2');
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          'amp-next-page hideSelector value should be a string: 2'
+        );
       });
     });
 
@@ -291,60 +321,76 @@ describe('amp-next-page config', () => {
         hideSelectors: ['   .i-amphtml-something'],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-            .to.throw(/amp-next-page hideSelector .+ not allowed/);
+        expect(() => assertConfig(/*ctx*/ null, config, documentUrl)).to.throw(
+          /amp-next-page hideSelector .+ not allowed/
+        );
       });
     });
 
     it('allows AdSense URLs which target the same origin', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
-          image: 'https://example.com/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl:
+              'https://googleads.g.doubleclick.net/aclk?adurl=https://example.com/article',
+            image: 'https://example.com/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrl))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrl)
+      ).to.not.throw();
     });
 
     it('allows AdSense URLs which target the same CDN origin', () => {
       const config = {
-        pages: [{
-          ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://example-com.cdn.ampproject.org/c/s/example.com/article',
-          image: 'https://example.com/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl:
+              'https://googleads.g.doubleclick.net/aclk?adurl=https://example-com.cdn.ampproject.org/c/s/example.com/article',
+            image: 'https://example.com/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
-      expect(() => assertConfig(/*ctx*/ null, config, documentUrlCdn))
-          .to.not.throw();
+      expect(() =>
+        assertConfig(/*ctx*/ null, config, documentUrlCdn)
+      ).to.not.throw();
     });
 
     it('throws for AdSense URLs which target different origins', () => {
-
       const config1 = {
-        pages: [{
-          ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://other.com/article',
-          image: 'https://example.com/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl:
+              'https://googleads.g.doubleclick.net/aclk?adurl=https://other.com/article',
+            image: 'https://example.com/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
       const config2 = {
-        pages: [{
-          ampUrl: 'https://googleads.g.doubleclick.net/aclk?adurl=https://other-com.cdn.ampproject.org/c/s/example.com/article',
-          image: 'https://example.com/image.png',
-          title: 'Article 1',
-        }],
+        pages: [
+          {
+            ampUrl:
+              'https://googleads.g.doubleclick.net/aclk?adurl=https://other-com.cdn.ampproject.org/c/s/example.com/article',
+            image: 'https://example.com/image.png',
+            title: 'Article 1',
+          },
+        ],
       };
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config1, documentUrl))
-            .to.throw(
-                'pages must be from the same origin as the current document');
+        expect(() => assertConfig(/*ctx*/ null, config1, documentUrl)).to.throw(
+          'pages must be from the same origin as the current document'
+        );
       });
       allowConsoleError(() => {
-        expect(() => assertConfig(/*ctx*/ null, config2, documentUrlCdn))
-            .to.throw(
-                'pages must be from the same origin as the current document');
+        expect(() =>
+          assertConfig(/*ctx*/ null, config2, documentUrlCdn)
+        ).to.throw(
+          'pages must be from the same origin as the current document'
+        );
       });
     });
   });
diff --git a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
index 2c0b7b8d0411..b1319ef95246 100644
--- a/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
+++ b/extensions/amp-nexxtv-player/0.1/amp-nexxtv-player.js
@@ -32,18 +32,14 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {once} from '../../../src/utils/function';
 
-
 const TAG = 'amp-nexxtv-player';
 
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpNexxtvPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -95,19 +91,22 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
     const {element: el} = this;
 
     const mediaId = userAssert(
-        el.getAttribute('data-mediaid'),
-        'The data-mediaid attribute is required for <amp-nexxtv-player> %s',
-        el);
+      el.getAttribute('data-mediaid'),
+      'The data-mediaid attribute is required for <amp-nexxtv-player> %s',
+      el
+    );
 
-    const client = userAssert(el.getAttribute('data-client'),
-        'The data-client attribute is required for <amp-nexxtv-player> %s',
-        el);
+    const client = userAssert(
+      el.getAttribute('data-client'),
+      'The data-client attribute is required for <amp-nexxtv-player> %s',
+      el
+    );
 
     const delay = el.getAttribute('data-seek-to') || '0';
     const mode = el.getAttribute('data-mode') || 'static';
     const streamtype = el.getAttribute('data-streamtype') || 'video';
-    const origin = el.getAttribute('data-origin')
-        || 'https://embed.nexx.cloud/';
+    const origin =
+      el.getAttribute('data-origin') || 'https://embed.nexx.cloud/';
     const disableAds = el.getAttribute('data-disable-ads');
     const streamingFilter = el.getAttribute('data-streaming-filter');
 
@@ -193,9 +192,12 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
   sendCommand_(command) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow./*OK*/postMessage(dict({
-          'cmd': command,
-        }), '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(
+          dict({
+            'cmd': command,
+          }),
+          '*'
+        );
       }
     });
   }
@@ -328,7 +330,6 @@ class AmpNexxtvPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpNexxtvPlayer);
 });
diff --git a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
index 9ed356a85069..e830c7fa61e1 100644
--- a/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
+++ b/extensions/amp-nexxtv-player/0.1/test/test-amp-nexxtv-player.js
@@ -18,73 +18,80 @@ import '../amp-nexxtv-player';
 import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 
-
-describes.realWin('amp-nexxtv-player', {
-  amp: {
-    extensions: ['amp-nexxtv-player'],
+describes.realWin(
+  'amp-nexxtv-player',
+  {
+    amp: {
+      extensions: ['amp-nexxtv-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getNexxtv(mediaid, client) {
-    const nexxtv = doc.createElement('amp-nexxtv-player');
+    function getNexxtv(mediaid, client) {
+      const nexxtv = doc.createElement('amp-nexxtv-player');
 
-    if (mediaid) {
-      nexxtv.setAttribute('data-mediaid', mediaid);
-    }
-    if (client) {
-      nexxtv.setAttribute('data-client', client);
+      if (mediaid) {
+        nexxtv.setAttribute('data-mediaid', mediaid);
+      }
+      if (client) {
+        nexxtv.setAttribute('data-client', client);
+      }
+
+      // see yt test implementation
+      doc.body.appendChild(nexxtv);
+      return nexxtv
+        .build()
+        .then(() => {
+          nexxtv.layoutCallback();
+        })
+        .then(() => {
+          const nexxTimerIframe = nexxtv.querySelector('iframe');
+          nexxtv.implementation_.handleNexxMessage_({
+            origin: 'https://embed.nexx.cloud',
+            source: nexxTimerIframe.contentWindow,
+            data: JSON.stringify({cmd: 'onload'}),
+          });
+          return nexxtv;
+        });
     }
 
-    // see yt test implementation
-    doc.body.appendChild(nexxtv);
-    return nexxtv.build().then(() => {
-      nexxtv.layoutCallback();
-    }).then(() => {
-      const nexxTimerIframe = nexxtv.querySelector('iframe');
-      nexxtv.implementation_.handleNexxMessage_({
-        origin: 'https://embed.nexx.cloud',
-        source: nexxTimerIframe.contentWindow,
-        data: JSON.stringify({cmd: 'onload'}),
+    it('renders nexxtv video player', () => {
+      return getNexxtv('71QQG852413DU7J', '761').then(nexxtv => {
+        const playerIframe = nexxtv.querySelector('iframe');
+
+        expect(playerIframe).to.not.be.null;
+        expect(playerIframe.src).to.equal(
+          'https://embed.nexx.cloud/761/video/' +
+            '71QQG852413DU7J?dataMode=static&platform=amp'
+        );
       });
-      return nexxtv;
     });
-  }
-
-  it('renders nexxtv video player', () => {
-    return getNexxtv('71QQG852413DU7J', '761').then(nexxtv => {
-      const playerIframe = nexxtv.querySelector('iframe');
 
-      expect(playerIframe).to.not.be.null;
-      expect(playerIframe.src).to.equal('https://embed.nexx.cloud/761/video/'
-            + '71QQG852413DU7J?dataMode=static&platform=amp');
+    // NOTE(alanorozco): Test failing on Travis. Trivial to skip since this is
+    // covered by validation rules.
+    it.skip('fails without mediaid', () => {
+      expectAsyncConsoleError(/data-mediaid attribute is required/);
+      return getNexxtv(null, '761').should.eventually.be.rejected;
     });
-  });
 
-  // NOTE(alanorozco): Test failing on Travis. Trivial to skip since this is
-  // covered by validation rules.
-  it.skip('fails without mediaid', () => {
-    expectAsyncConsoleError(/data-mediaid attribute is required/);
-    return getNexxtv(null, '761').should.eventually.be.rejected;
-  });
-
-  // NOTE(alanorozco): Test failing on Travis. Trivial to skip since this is
-  // covered by validation rules.
-  it.skip('fails without client', () => {
-    expectAsyncConsoleError(/data-client attribute is required/);
-    return getNexxtv('71QQG852413DU7J', null).should.eventually.be.rejected;
-  });
+    // NOTE(alanorozco): Test failing on Travis. Trivial to skip since this is
+    // covered by validation rules.
+    it.skip('fails without client', () => {
+      expectAsyncConsoleError(/data-client attribute is required/);
+      return getNexxtv('71QQG852413DU7J', null).should.eventually.be.rejected;
+    });
 
-  it('should forward events from nexxtv-player to the amp element', () => {
-    return getNexxtv('71QQG852413DU7J', '761').then(nexxtv => {
-      const iframe = nexxtv.querySelector('iframe');
+    it('should forward events from nexxtv-player to the amp element', () => {
+      return getNexxtv('71QQG852413DU7J', '761').then(nexxtv => {
+        const iframe = nexxtv.querySelector('iframe');
 
-      return Promise.resolve()
+        return Promise.resolve()
           .then(() => {
             const p = listenOncePromise(nexxtv, VideoEvents.PLAYING);
             sendFakeMessage(nexxtv, iframe, {event: 'play'});
@@ -105,15 +112,15 @@ describes.realWin('amp-nexxtv-player', {
             sendFakeMessage(nexxtv, iframe, {event: 'unmute'});
             return p;
           });
+      });
     });
-  });
 
-
-  function sendFakeMessage(nexxtv, iframe, command) {
-    nexxtv.implementation_.handleNexxMessage_({
-      origin: 'https://embed.nexx.cloud',
-      source: iframe.contentWindow,
-      data: command,
-    });
+    function sendFakeMessage(nexxtv, iframe, command) {
+      nexxtv.implementation_.handleNexxMessage_({
+        origin: 'https://embed.nexx.cloud',
+        source: iframe.contentWindow,
+        data: command,
+      });
+    }
   }
-});
+);
diff --git a/extensions/amp-o2-player/0.1/amp-o2-player.js b/extensions/amp-o2-player/0.1/amp-o2-player.js
index 5a6cf074bcb0..4c287e5d99ec 100644
--- a/extensions/amp-o2-player/0.1/amp-o2-player.js
+++ b/extensions/amp-o2-player/0.1/amp-o2-player.js
@@ -19,7 +19,6 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {userAssert} from '../../../src/log';
 
 class AmpO2Player extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -56,26 +55,32 @@ class AmpO2Player extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.pid_ = userAssert(
-        this.element.getAttribute('data-pid'),
-        'data-pid attribute is required for <amp-o2-player> %s',
-        this.element);
+      this.element.getAttribute('data-pid'),
+      'data-pid attribute is required for <amp-o2-player> %s',
+      this.element
+    );
 
     this.bcid_ = userAssert(
-        this.element.getAttribute('data-bcid'),
-        'data-bcid attribute is required for <amp-o2-player> %s',
-        this.element);
+      this.element.getAttribute('data-bcid'),
+      'data-bcid attribute is required for <amp-o2-player> %s',
+      this.element
+    );
 
     const bid = this.element.getAttribute('data-bid');
     const vid = this.element.getAttribute('data-vid');
     const macros = this.element.getAttribute('data-macros');
     const env = this.element.getAttribute('data-env');
 
-    this.domain_ = 'https://delivery.' +
-        (env != 'stage' ? '' : 'dev.') + 'vidible.tv';
+    this.domain_ =
+      'https://delivery.' + (env != 'stage' ? '' : 'dev.') + 'vidible.tv';
     let src = `${this.domain_}/htmlembed/`;
     const queryParams = [];
-    src += 'pid=' + encodeURIComponent(this.pid_) + '/'
-        + encodeURIComponent(this.bcid_) + '.html';
+    src +=
+      'pid=' +
+      encodeURIComponent(this.pid_) +
+      '/' +
+      encodeURIComponent(this.bcid_) +
+      '.html';
     if (bid) {
       queryParams.push('bid=' + encodeURIComponent(bid));
     }
@@ -94,13 +99,15 @@ class AmpO2Player extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     userAssert(
-        this.pid_,
-        'data-pid attribute is required for <amp-o2-player> %s',
-        this.element);
+      this.pid_,
+      'data-pid attribute is required for <amp-o2-player> %s',
+      this.element
+    );
     userAssert(
-        this.bcid_,
-        'data-bcid attribute is required for <amp-o2-player> %s',
-        this.element);
+      this.bcid_,
+      'data-bcid attribute is required for <amp-o2-player> %s',
+      this.element
+    );
 
     const iframe = this.element.ownerDocument.createElement('iframe');
     iframe.setAttribute('frameborder', '0');
@@ -115,15 +122,19 @@ class AmpO2Player extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage(JSON.stringify(dict({
-        'method': 'pause',
-        'value': this.domain_,
-      })), '*');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify(
+          dict({
+            'method': 'pause',
+            'value': this.domain_,
+          })
+        ),
+        '*'
+      );
     }
   }
 }
 
-
 AMP.extension('amp-o2-player', '0.1', AMP => {
   AMP.registerElement('amp-o2-player', AmpO2Player);
 });
diff --git a/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js b/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
index ed3594fd2750..de7b64b413de 100644
--- a/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
+++ b/extensions/amp-o2-player/0.1/test/test-amp-o2-player.js
@@ -16,120 +16,138 @@
 
 import '../amp-o2-player';
 
-
-describes.realWin('amp-o2-player', {
-  amp: {
-    extensions: ['amp-o2-player'],
+describes.realWin(
+  'amp-o2-player',
+  {
+    amp: {
+      extensions: ['amp-o2-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getO2player(attributes, opt_responsive) {
-    const o2 = doc.createElement('amp-o2-player');
-    for (const key in attributes) {
-      o2.setAttribute(key, attributes[key]);
-    }
-    o2.setAttribute('width', '111');
-    o2.setAttribute('height', '222');
-    if (opt_responsive) {
-      o2.setAttribute('layout', 'responsive');
+    function getO2player(attributes, opt_responsive) {
+      const o2 = doc.createElement('amp-o2-player');
+      for (const key in attributes) {
+        o2.setAttribute(key, attributes[key]);
+      }
+      o2.setAttribute('width', '111');
+      o2.setAttribute('height', '222');
+      if (opt_responsive) {
+        o2.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(o2);
+      return o2
+        .build()
+        .then(() => o2.layoutCallback())
+        .then(() => o2);
     }
-    doc.body.appendChild(o2);
-    return o2.build().then(() => o2.layoutCallback()).then(() => o2);
-  }
 
-  it('renders', () => {
-    return getO2player({
-      'data-pid': '123',
-      'data-bcid': '456',
-    }).then(o2 => {
-      const iframe = o2.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://delivery.vidible.tv/htmlembed/pid=123/456.html');
+    it('renders', () => {
+      return getO2player({
+        'data-pid': '123',
+        'data-bcid': '456',
+      }).then(o2 => {
+        const iframe = o2.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://delivery.vidible.tv/htmlembed/pid=123/456.html'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getO2player({
-      'data-pid': '573acb47e4b0564ec2e10011',
-      'data-bcid': '50d595ec0364e95588c77bd2',
-    }, true).then(o2 => {
-      const iframe = o2.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getO2player(
+        {
+          'data-pid': '573acb47e4b0564ec2e10011',
+          'data-bcid': '50d595ec0364e95588c77bd2',
+        },
+        true
+      ).then(o2 => {
+        const iframe = o2.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-pid', () => {
-    return allowConsoleError(() => { return getO2player({
-      'data-bcid': '50d595ec0364e95588c77bd2',
-    }).should.eventually.be.rejectedWith(
-        /data-pid attribute is required for/);
+    it('requires data-pid', () => {
+      return allowConsoleError(() => {
+        return getO2player({
+          'data-bcid': '50d595ec0364e95588c77bd2',
+        }).should.eventually.be.rejectedWith(
+          /data-pid attribute is required for/
+        );
+      });
     });
-  });
 
-  it('requires data-bcid', () => {
-    return allowConsoleError(() => { return getO2player({
-      'data-pid': '573acb47e4b0564ec2e10011',
-    }).should.eventually.be.rejectedWith(
-        /data-bcid attribute is required for/);
+    it('requires data-bcid', () => {
+      return allowConsoleError(() => {
+        return getO2player({
+          'data-pid': '573acb47e4b0564ec2e10011',
+        }).should.eventually.be.rejectedWith(
+          /data-bcid attribute is required for/
+        );
+      });
     });
-  });
 
-  it('requires data-pid && data-bcid', () => {
-    return allowConsoleError(() => {
-      return getO2player({}).should.eventually.be.rejectedWith(
-          /data-pid attribute is required for/);
+    it('requires data-pid && data-bcid', () => {
+      return allowConsoleError(() => {
+        return getO2player({}).should.eventually.be.rejectedWith(
+          /data-pid attribute is required for/
+        );
+      });
     });
-  });
 
-  it('renders with data-vid passed', () => {
-    return getO2player({
-      'data-pid': '123',
-      'data-bcid': '456',
-      'data-vid': '789',
-      'data-bid': '987',
-    }).then(o2 => {
-      const iframe = o2.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://delivery.vidible.tv/htmlembed/pid=123/456.html?bid=987&vid=789');
+    it('renders with data-vid passed', () => {
+      return getO2player({
+        'data-pid': '123',
+        'data-bcid': '456',
+        'data-vid': '789',
+        'data-bid': '987',
+      }).then(o2 => {
+        const iframe = o2.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://delivery.vidible.tv/htmlembed/pid=123/456.html?bid=987&vid=789'
+        );
+      });
     });
-  });
 
-  it('renders with data-macros passed', () => {
-    return getO2player({
-      'data-pid': '123',
-      'data-bcid': '456',
-      'data-macros': 'm.test=test',
-    }).then(o2 => {
-      const iframe = o2.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://delivery.vidible.tv/htmlembed/pid=123/456.html?m.test=test');
+    it('renders with data-macros passed', () => {
+      return getO2player({
+        'data-pid': '123',
+        'data-bcid': '456',
+        'data-macros': 'm.test=test',
+      }).then(o2 => {
+        const iframe = o2.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://delivery.vidible.tv/htmlembed/pid=123/456.html?m.test=test'
+        );
+      });
     });
-  });
 
-  it('respects data-env parameter', () => {
-    return getO2player({
-      'data-pid': '123',
-      'data-bcid': '456',
-      'data-env': 'stage',
-    }).then(o2 => {
-      const iframe = o2.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://delivery.dev.vidible.tv/htmlembed/pid=123/456.html');
+    it('respects data-env parameter', () => {
+      return getO2player({
+        'data-pid': '123',
+        'data-bcid': '456',
+        'data-env': 'stage',
+      }).then(o2 => {
+        const iframe = o2.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://delivery.dev.vidible.tv/htmlembed/pid=123/456.html'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
index 1783d531d662..7a396e6aa866 100644
--- a/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
+++ b/extensions/amp-ooyala-player/0.1/amp-ooyala-player.js
@@ -30,16 +30,13 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 const TAG = 'amp-ooyala-player';
 
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpOoyalaPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -64,7 +61,6 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
 
     /** @private {?Function} */
     this.unlistenMessage_ = null;
-
   }
 
   /**
@@ -80,16 +76,22 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
     const {element: el} = this;
 
     this.embedCode_ = userAssert(
-        el.getAttribute('data-embedcode'),
-        'The data-embedcode attribute is required for %s', el);
+      el.getAttribute('data-embedcode'),
+      'The data-embedcode attribute is required for %s',
+      el
+    );
 
     this.pCode_ = userAssert(
-        el.getAttribute('data-pcode'),
-        'The data-pcode attribute is required for %s', el);
+      el.getAttribute('data-pcode'),
+      'The data-pcode attribute is required for %s',
+      el
+    );
 
     this.playerId_ = userAssert(
-        el.getAttribute('data-playerid'),
-        'The data-playerid attribute is required for %s', el);
+      el.getAttribute('data-playerid'),
+      'The data-playerid attribute is required for %s',
+      el
+    );
 
     const deferred = new Deferred();
     this.playerReadyPromise_ = deferred.promise;
@@ -106,16 +108,21 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
     let src = 'https://player.ooyala.com/iframe.html?platform=html5-priority';
     const playerVersion = el.getAttribute('data-playerversion') || '';
     if (playerVersion.toLowerCase() == 'v4') {
-      src = 'https://player.ooyala.com/static/v4/sandbox/amp_iframe/' +
-        'skin-plugin/amp_iframe.html?pcode=' + encodeURIComponent(this.pCode_);
+      src =
+        'https://player.ooyala.com/static/v4/sandbox/amp_iframe/' +
+        'skin-plugin/amp_iframe.html?pcode=' +
+        encodeURIComponent(this.pCode_);
       const configUrl = el.getAttribute('data-config');
       if (configUrl) {
         src += '&options[skin.config]=' + encodeURIComponent(configUrl);
       }
     }
 
-    src += '&ec=' + encodeURIComponent(this.embedCode_) +
-      '&pbid=' + encodeURIComponent(this.playerId_);
+    src +=
+      '&ec=' +
+      encodeURIComponent(this.embedCode_) +
+      '&pbid=' +
+      encodeURIComponent(this.playerId_);
 
     const iframe = createFrameFor(this, src);
 
@@ -197,7 +204,7 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
   sendCommand_(command) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow./*OK*/postMessage(command, '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(command, '*');
       }
     });
   }
@@ -235,12 +242,10 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
   }
 
   /** @override */
-  showControls() {
-  }
+  showControls() {}
 
   /** @override */
-  hideControls() {
-  }
+  hideControls() {}
 
   /**
    * @override
@@ -309,7 +314,6 @@ class AmpOoyalaPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpOoyalaPlayer);
 });
diff --git a/extensions/amp-ooyala-player/0.1/test/test-amp-ooyala.js b/extensions/amp-ooyala-player/0.1/test/test-amp-ooyala.js
index c34354379999..ff5e167b2d89 100644
--- a/extensions/amp-ooyala-player/0.1/test/test-amp-ooyala.js
+++ b/extensions/amp-ooyala-player/0.1/test/test-amp-ooyala.js
@@ -16,93 +16,122 @@
 
 import '../amp-ooyala-player';
 
-
-describes.realWin('amp-ooyala-player', {
-  amp: {
-    extensions: ['amp-ooyala-player'],
+describes.realWin(
+  'amp-ooyala-player',
+  {
+    amp: {
+      extensions: ['amp-ooyala-player'],
+    },
   },
-}, function(env) {
-  let win, doc;
+  function(env) {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getOoyalaElement(embedCode, playerId, pCode, opt_version,
-    opt_config, opt_placeholder) {
-    const player = doc.createElement('amp-ooyala-player');
-    if (embedCode) {
-      player.setAttribute('data-embedcode', embedCode);
-    }
-    if (playerId) {
-      player.setAttribute('data-playerid', playerId);
-    }
-    if (pCode) {
-      player.setAttribute('data-pcode', pCode);
-    }
+    function getOoyalaElement(
+      embedCode,
+      playerId,
+      pCode,
+      opt_version,
+      opt_config,
+      opt_placeholder
+    ) {
+      const player = doc.createElement('amp-ooyala-player');
+      if (embedCode) {
+        player.setAttribute('data-embedcode', embedCode);
+      }
+      if (playerId) {
+        player.setAttribute('data-playerid', playerId);
+      }
+      if (pCode) {
+        player.setAttribute('data-pcode', pCode);
+      }
 
-    if (opt_version) {
-      player.setAttribute('data-playerversion', opt_version);
-    }
+      if (opt_version) {
+        player.setAttribute('data-playerversion', opt_version);
+      }
 
-    if (opt_config) {
-      player.setAttribute('data-config', opt_config);
-    }
+      if (opt_config) {
+        player.setAttribute('data-config', opt_config);
+      }
 
-    if (opt_placeholder) {
-      player.setAttribute('data-placeholder', opt_placeholder);
-    }
+      if (opt_placeholder) {
+        player.setAttribute('data-placeholder', opt_placeholder);
+      }
 
-    doc.body.appendChild(player);
-    return player.build()
-        .then(() => { player.layoutCallback(); return player; });
-  }
+      doc.body.appendChild(player);
+      return player.build().then(() => {
+        player.layoutCallback();
+        return player;
+      });
+    }
 
-  it('renders a V3 player', () => {
-    return getOoyalaElement('Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
+    it('renders a V3 player', () => {
+      return getOoyalaElement(
+        'Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
         '6440813504804d76ba35c8c787a4b33c',
-        '5zb2wxOlZcNCe_HVT3a6cawW298X').then(player => {
-      const playerIframe = player.querySelector('iframe');
-      expect(playerIframe).to.not.be.null;
-      expect(playerIframe.src).to.equal('https://player.ooyala.com/iframe.html' +
-        '?platform=html5-priority&ec=Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ' +
-        '&pbid=6440813504804d76ba35c8c787a4b33c');
+        '5zb2wxOlZcNCe_HVT3a6cawW298X'
+      ).then(player => {
+        const playerIframe = player.querySelector('iframe');
+        expect(playerIframe).to.not.be.null;
+        expect(playerIframe.src).to.equal(
+          'https://player.ooyala.com/iframe.html' +
+            '?platform=html5-priority&ec=Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ' +
+            '&pbid=6440813504804d76ba35c8c787a4b33c'
+        );
+      });
     });
-  });
 
-  it('renders a V4 player', () => {
-    return getOoyalaElement('Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
+    it('renders a V4 player', () => {
+      return getOoyalaElement(
+        'Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
         '6440813504804d76ba35c8c787a4b33c',
         '5zb2wxOlZcNCe_HVT3a6cawW298X',
-        'V4').then(player => {
-      const playerIframe = player.querySelector('iframe');
-      expect(playerIframe).to.not.be.null;
-      expect(playerIframe.src).to.equal('https://player.ooyala.com/static/v4/sandbox/' +
-          'amp_iframe/skin-plugin/amp_iframe.html' +
-          '?pcode=5zb2wxOlZcNCe_HVT3a6cawW298X' +
-          '&ec=Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ' +
-          '&pbid=6440813504804d76ba35c8c787a4b33c');
+        'V4'
+      ).then(player => {
+        const playerIframe = player.querySelector('iframe');
+        expect(playerIframe).to.not.be.null;
+        expect(playerIframe.src).to.equal(
+          'https://player.ooyala.com/static/v4/sandbox/' +
+            'amp_iframe/skin-plugin/amp_iframe.html' +
+            '?pcode=5zb2wxOlZcNCe_HVT3a6cawW298X' +
+            '&ec=Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ' +
+            '&pbid=6440813504804d76ba35c8c787a4b33c'
+        );
+      });
     });
-  });
-
-  it('fails without an embed code', () => {
-    return getOoyalaElement(null, '6440813504804d76ba35c8c787a4b33c',
-        '5zb2wxOlZcNCe_HVT3a6cawW298X').should.eventually.be.rejectedWith(
-        /The data-embedcode attribute is required/);
-  });
 
-  it('fails without a player ID', () => {
-    return getOoyalaElement('Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ', null,
-        '5zb2wxOlZcNCe_HVT3a6cawW298X').should.eventually.be.rejectedWith(
-        /The data-playerid attribute is required/);
-  });
+    it('fails without an embed code', () => {
+      return getOoyalaElement(
+        null,
+        '6440813504804d76ba35c8c787a4b33c',
+        '5zb2wxOlZcNCe_HVT3a6cawW298X'
+      ).should.eventually.be.rejectedWith(
+        /The data-embedcode attribute is required/
+      );
+    });
 
-  it('fails without a p-code', () => {
-    return getOoyalaElement('Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
-        '6440813504804d76ba35c8c787a4b33c', null)
-        .should.eventually.be.rejectedWith(
-            /The data-pcode attribute is required/);
-  });
+    it('fails without a player ID', () => {
+      return getOoyalaElement(
+        'Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
+        null,
+        '5zb2wxOlZcNCe_HVT3a6cawW298X'
+      ).should.eventually.be.rejectedWith(
+        /The data-playerid attribute is required/
+      );
+    });
 
-});
+    it('fails without a p-code', () => {
+      return getOoyalaElement(
+        'Vxc2k0MDE6Y_C7J5podo3UDxlFxGaZrQ',
+        '6440813504804d76ba35c8c787a4b33c',
+        null
+      ).should.eventually.be.rejectedWith(
+        /The data-pcode attribute is required/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
index 27e0652fc7de..f21383fc69e0 100644
--- a/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
+++ b/extensions/amp-orientation-observer/0.1/amp-orientation-observer.js
@@ -27,7 +27,6 @@ const DEVICE_REST_ORIENTATION_GAMMA_VALUE = 0;
 const DELTA_CONST = 0.1;
 
 export class AmpOrientationObserver extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -71,16 +70,22 @@ export class AmpOrientationObserver extends AMP.BaseElement {
    * @private
    */
   init_() {
-    userAssert(this.win.DeviceOrientationEvent,
-        'The current browser doesn\'t support the ' +
-      '`window.DeviceOrientationEvent`');
+    userAssert(
+      this.win.DeviceOrientationEvent,
+      "The current browser doesn't support the " +
+        '`window.DeviceOrientationEvent`'
+    );
 
     this.alphaRange_ = this.parseAttributes_('alpha-range', this.alphaRange_);
     this.betaRange_ = this.parseAttributes_('beta-range', this.betaRange_);
     this.gammaRange_ = this.parseAttributes_('gamma-range', this.gammaRange_);
-    this.win.addEventListener('deviceorientation', event => {
-      this.deviceOrientationHandler_(event);
-    }, true);
+    this.win.addEventListener(
+      'deviceorientation',
+      event => {
+        this.deviceOrientationHandler_(event);
+      },
+      true
+    );
   }
 
   /**
@@ -128,14 +133,18 @@ export class AmpOrientationObserver extends AMP.BaseElement {
    * @private
    */
   triggerEvent_(eventName, eventValue, eventRange) {
-    const percentValue = eventRange[0] < 0 ?
-      (eventValue.toFixed() - eventRange[0]) :
-      eventValue.toFixed();
-    const event = createCustomEvent(this.win, `${TAG}.${eventName}`, dict({
-      'angle': eventValue.toFixed(),
-      'percent': percentValue /
-        (eventRange[1] - eventRange[0]),
-    }));
+    const percentValue =
+      eventRange[0] < 0
+        ? eventValue.toFixed() - eventRange[0]
+        : eventValue.toFixed();
+    const event = createCustomEvent(
+      this.win,
+      `${TAG}.${eventName}`,
+      dict({
+        'angle': eventValue.toFixed(),
+        'percent': percentValue / (eventRange[1] - eventRange[0]),
+      })
+    );
     this.action_.trigger(this.element, eventName, event, ActionTrust.LOW);
   }
 }
diff --git a/extensions/amp-orientation-observer/0.1/test/test-amp-orientation-observer.js b/extensions/amp-orientation-observer/0.1/test/test-amp-orientation-observer.js
index 8705c08b6f7f..335994f3b19e 100644
--- a/extensions/amp-orientation-observer/0.1/test/test-amp-orientation-observer.js
+++ b/extensions/amp-orientation-observer/0.1/test/test-amp-orientation-observer.js
@@ -16,126 +16,129 @@
 
 import {AmpOrientationObserver} from '../amp-orientation-observer';
 
-describes.realWin('Creates the relevant fx presets correctly', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-orientation-observer'],
+describes.realWin(
+  'Creates the relevant fx presets correctly',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-orientation-observer'],
+    },
   },
-}, env => {
-  let impl;
-  let triggerEventSpy;
-
-  function init() {
-    const elem = {
-      getAttribute(attr) {
-        if (attr == 'alpha-range') {
-          return '0 360';
-        }
-        if (attr == 'beta-range') {
-          return '-180 180';
-        }
-        if (attr == 'gamma-range') {
-          return '-90 90';
-        }
-      },
-    };
-    elem.ownerDocument = {
-      defaultView: env.win,
-    };
-
-    impl = new AmpOrientationObserver(elem);
-    impl.init_();
-    triggerEventSpy = env.sandbox.stub(impl, 'triggerEvent_');
-  }
-
-  function setOrientation(alpha = 180, beta = 0, gamma = 0) {
-    const event = new DeviceOrientationEvent('deviceorientationevent', {
-      alpha,
-      beta,
-      gamma,
-    });
-    impl.deviceOrientationHandler_(event);
-  }
-
-  describe('no changes in device orientation', () => {
-    it('should not trigger `alpha` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(180);
-      expect(triggerEventSpy).not.to.be.called;
+  env => {
+    let impl;
+    let triggerEventSpy;
+
+    function init() {
+      const elem = {
+        getAttribute(attr) {
+          if (attr == 'alpha-range') {
+            return '0 360';
+          }
+          if (attr == 'beta-range') {
+            return '-180 180';
+          }
+          if (attr == 'gamma-range') {
+            return '-90 90';
+          }
+        },
+      };
+      elem.ownerDocument = {
+        defaultView: env.win,
+      };
+
+      impl = new AmpOrientationObserver(elem);
+      impl.init_();
+      triggerEventSpy = env.sandbox.stub(impl, 'triggerEvent_');
+    }
+
+    function setOrientation(alpha = 180, beta = 0, gamma = 0) {
+      const event = new DeviceOrientationEvent('deviceorientationevent', {
+        alpha,
+        beta,
+        gamma,
+      });
+      impl.deviceOrientationHandler_(event);
+    }
+
+    describe('no changes in device orientation', () => {
+      it('should not trigger `alpha` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(180);
+        expect(triggerEventSpy).not.to.be.called;
+      });
+
+      it('should not trigger `beta` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(180, 0);
+        expect(triggerEventSpy).not.to.be.called;
+      });
+
+      it('should not trigger `gamma` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(180, 0, 0);
+        expect(triggerEventSpy).not.to.be.called;
+      });
     });
 
-    it('should not trigger `beta` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(180, 0);
-      expect(triggerEventSpy).not.to.be.called;
-    });
-
-    it('should not trigger `gamma` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(180, 0, 0);
-      expect(triggerEventSpy).not.to.be.called;
+    describe('changes in device orientation', () => {
+      it('should trigger `alpha` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(170);
+        expect(triggerEventSpy).to.be.called;
+        expect(triggerEventSpy).to.be.calledWith('alpha');
+      });
+
+      it('should trigger `beta` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(180, 10);
+        expect(triggerEventSpy).to.be.called;
+        expect(triggerEventSpy).to.be.calledWith('beta');
+      });
+
+      it('should trigger `gamma` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
+
+        setOrientation(180, 0, 10);
+        expect(triggerEventSpy).to.be.called;
+        expect(triggerEventSpy).to.be.calledWith('gamma');
+      });
     });
-  });
 
-  describe('changes in device orientation', () => {
-    it('should trigger `alpha` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
+    describe('combined changes in device orientation', () => {
+      it('should trigger `alpha` & `beta` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
 
-      setOrientation(170);
-      expect(triggerEventSpy).to.be.called;
-      expect(triggerEventSpy).to.be.calledWith('alpha');
-    });
+        setOrientation(170, 10);
+        expect(triggerEventSpy).to.be.calledTwice;
+      });
 
-    it('should trigger `beta` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
+      it('should trigger `beta` & `gamma` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
 
-      setOrientation(180, 10);
-      expect(triggerEventSpy).to.be.called;
-      expect(triggerEventSpy).to.be.calledWith('beta');
-    });
+        setOrientation(180, 10, 10);
+        expect(triggerEventSpy).to.be.calledTwice;
+      });
 
-    it('should trigger `gamma` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
+      it('should trigger `alpha` & `gamma` event', () => {
+        init();
+        expect(triggerEventSpy).not.to.be.called;
 
-      setOrientation(180, 0, 10);
-      expect(triggerEventSpy).to.be.called;
-      expect(triggerEventSpy).to.be.calledWith('gamma');
+        setOrientation(170, 0, 10);
+        expect(triggerEventSpy).to.be.calledTwice;
+      });
     });
-  });
-
-  describe('combined changes in device orientation', () => {
-    it('should trigger `alpha` & `beta` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(170, 10);
-      expect(triggerEventSpy).to.be.calledTwice;
-    });
-
-    it('should trigger `beta` & `gamma` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(180, 10, 10);
-      expect(triggerEventSpy).to.be.calledTwice;
-    });
-
-    it('should trigger `alpha` & `gamma` event', () => {
-      init();
-      expect(triggerEventSpy).not.to.be.called;
-
-      setOrientation(170, 0, 10);
-      expect(triggerEventSpy).to.be.calledTwice;
-    });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
index f05743803cc0..b1d5c64e84fe 100644
--- a/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
+++ b/extensions/amp-pan-zoom/0.1/amp-pan-zoom.js
@@ -32,10 +32,7 @@ import {continueMotion} from '../../../src/motion';
 import {createCustomEvent, listen} from '../../../src/event-helper';
 import {dev, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
-import {
-  layoutRectFromDomRect,
-  layoutRectLtwh,
-} from '../../../src/layout-rect';
+import {layoutRectFromDomRect, layoutRectLtwh} from '../../../src/layout-rect';
 import {numeric} from '../../../src/transition';
 import {px, scale, setStyles, translate} from '../../../src/style';
 
@@ -60,7 +57,6 @@ export class AmpPanZoom extends AMP.BaseElement {
 
   /** @param {!AmpElement} element */
   constructor(element) {
-
     super(element);
 
     /** @private {?Element} */
@@ -166,15 +162,15 @@ export class AmpPanZoom extends AMP.BaseElement {
     const children = this.getRealChildren();
 
     userAssert(
-        children.length == 1,
-        '%s should have its target element as its one and only child',
-        TAG
+      children.length == 1,
+      '%s should have its target element as its one and only child',
+      TAG
     );
     userAssert(
-        this.elementIsSupported_(children[0]),
-        '%s is not supported by %s',
-        children[0].tagName,
-        TAG
+      this.elementIsSupported_(children[0]),
+      '%s is not supported by %s',
+      children[0].tagName,
+      TAG
     );
     this.element.classList.add('i-amphtml-pan-zoom');
     this.content_ = children[0];
@@ -207,8 +203,9 @@ export class AmpPanZoom extends AMP.BaseElement {
     this.updatePanZoomBounds_(scale);
     const boundX = this.boundX_(x, /*allowExtent*/ false);
     const boundY = this.boundY_(y, /*allowExtent*/ false);
-    return this.set_(scale, boundX, boundY, /*animate*/ true)
-        .then(() => this.onZoomRelease_());
+    return this.set_(scale, boundX, boundY, /*animate*/ true).then(() =>
+      this.onZoomRelease_()
+    );
   }
 
   /** @override */
@@ -246,10 +243,12 @@ export class AmpPanZoom extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.FIXED ||
+    return (
+      layout == Layout.FIXED ||
       layout == Layout.FIXED_HEIGHT ||
       layout == Layout.FILL ||
-      layout == Layout.RESPONSIVE;
+      layout == Layout.RESPONSIVE
+    );
   }
 
   /**
@@ -313,17 +312,20 @@ export class AmpPanZoom extends AMP.BaseElement {
     let height = Math.min(heightToFit, this.elementBox_.height);
     let width = Math.min(widthToFit, this.elementBox_.width);
 
-    if (Math.abs(width - this.sourceWidth_) <= 16
-        && Math.abs(height - this.sourceHeight_) <= 16) {
+    if (
+      Math.abs(width - this.sourceWidth_) <= 16 &&
+      Math.abs(height - this.sourceHeight_) <= 16
+    ) {
       width = this.sourceWidth_;
       height = this.sourceHeight_;
     }
 
     this.contentBox_ = layoutRectLtwh(
-        0,
-        0,
-        Math.round(width),
-        Math.round(height));
+      0,
+      0,
+      Math.round(width),
+      Math.round(height)
+    );
   }
 
   /**
@@ -338,8 +340,8 @@ export class AmpPanZoom extends AMP.BaseElement {
     const {width, height} = this.elementBox_;
     const elementBoxRatio = width / height;
     const maxScale = Math.max(
-        elementBoxRatio / sourceAspectRatio,
-        sourceAspectRatio / elementBoxRatio
+      elementBoxRatio / sourceAspectRatio,
+      sourceAspectRatio / elementBoxRatio
     );
     if (!isNaN(maxScale)) {
       this.maxScale_ = Math.max(this.maxScale_, maxScale);
@@ -353,8 +355,8 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @private
    */
   measure_() {
-    this.sourceWidth_ = this.content_./*OK*/scrollWidth;
-    this.sourceHeight_ = this.content_./*OK*/scrollHeight;
+    this.sourceWidth_ = this.content_./*OK*/ scrollWidth;
+    this.sourceHeight_ = this.content_./*OK*/ scrollHeight;
 
     const sourceAspectRatio = this.sourceWidth_ / this.sourceHeight_;
 
@@ -377,14 +379,18 @@ export class AmpPanZoom extends AMP.BaseElement {
    */
   resetContentDimensions_() {
     return this.mutateElement(() => this.clearDimensions_())
-        .then(() => this.measureMutateElement(
-            () => this.measure_(),
-            () => this.setDimensions_(), dev().assertElement(this.content_))
-        ).then(() => {
-          this.setContentBoxOffsets_();
-          this.updatePanZoomBounds_(this.scale_);
-          return this.updatePanZoom_();
-        });
+      .then(() =>
+        this.measureMutateElement(
+          () => this.measure_(),
+          () => this.setDimensions_(),
+          dev().assertElement(this.content_)
+        )
+      )
+      .then(() => {
+        this.setContentBoxOffsets_();
+        this.updatePanZoomBounds_(this.scale_);
+        return this.updatePanZoom_();
+      });
   }
 
   /**
@@ -392,9 +398,11 @@ export class AmpPanZoom extends AMP.BaseElement {
    * pan-zoom container
    */
   setContentBoxOffsets_() {
-    const contentBox =
-    layoutRectFromDomRect(dev().assertElement(this.content_)
-        ./*OK*/getBoundingClientRect());
+    const contentBox = layoutRectFromDomRect(
+      dev()
+        .assertElement(this.content_)
+        ./*OK*/ getBoundingClientRect()
+    );
     // Set content positions to offset from element box
     this.contentBox_.top = contentBox.top - this.elementBox_.top;
     this.contentBox_.left = contentBox.left - this.elementBox_.left;
@@ -448,8 +456,9 @@ export class AmpPanZoom extends AMP.BaseElement {
    */
   setupEvents_() {
     this.setupGestures_();
-    this.unlistenMouseDown_ =
-      listen(this.element, 'mousedown', e => this.onMouseDown_(e));
+    this.unlistenMouseDown_ = listen(this.element, 'mousedown', e =>
+      this.onMouseDown_(e)
+    );
   }
 
   /**
@@ -494,10 +503,12 @@ export class AmpPanZoom extends AMP.BaseElement {
     this.mouseStartX_ = clientX;
     this.mouseStartY_ = clientY;
 
-    this.unlistenMouseMove_ =
-        listen(this.element, 'mousemove', e => this.onMouseMove_(e));
-    this.unlistenMouseUp_ =
-        listen(this.win, 'mouseup', e => this.onMouseUp_(e));
+    this.unlistenMouseMove_ = listen(this.element, 'mousemove', e =>
+      this.onMouseMove_(e)
+    );
+    this.unlistenMouseUp_ = listen(this.win, 'mouseup', e =>
+      this.onMouseUp_(e)
+    );
   }
 
   /**
@@ -553,8 +564,9 @@ export class AmpPanZoom extends AMP.BaseElement {
     // order to differentiate the two gestures. Some users may choose to disable
     // it to avoid the 200ms tap delay.
     if (!this.disableDoubleTap_) {
-      this.gestures_.onGesture(DoubletapRecognizer,
-          e => this.handleDoubleTap(e.data));
+      this.gestures_.onGesture(DoubletapRecognizer, e =>
+        this.handleDoubleTap(e.data)
+      );
       // Override all taps to enable tap events on content
       this.gestures_.onGesture(TapRecognizer, e => this.handleTap_(e.data));
     }
@@ -567,8 +579,9 @@ export class AmpPanZoom extends AMP.BaseElement {
    */
   handleDoubleTap(data) {
     const {clientX, clientY} = data;
-    return this.onDoubletapZoom_(clientX, clientY)
-        .then(() => this.onZoomRelease_());
+    return this.onDoubletapZoom_(clientX, clientY).then(() =>
+      this.onZoomRelease_()
+    );
   }
 
   /**
@@ -577,16 +590,14 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @visibleForTesting
    */
   handlePinch(data) {
-    const {
+    const {centerClientX, centerClientY, deltaX, deltaY, dir, last} = data;
+    return this.onPinchZoom_(
       centerClientX,
       centerClientY,
       deltaX,
       deltaY,
-      dir,
-      last,
-    } = data;
-    return this.onPinchZoom_(centerClientX, centerClientY,
-        deltaX, deltaY, dir).then(() => {
+      dir
+    ).then(() => {
       if (last) {
         return this.onZoomRelease_();
       }
@@ -599,13 +610,7 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @visibleForTesting
    */
   handleSwipe(data) {
-    const {
-      deltaX,
-      deltaY,
-      last,
-      velocityX,
-      velocityY,
-    } = data;
+    const {deltaX, deltaY, last, velocityX, velocityY} = data;
     return this.onMove_(deltaX, deltaY, /*animate*/ false).then(() => {
       if (last) {
         return this.onMoveRelease_(velocityX, velocityY);
@@ -619,12 +624,7 @@ export class AmpPanZoom extends AMP.BaseElement {
   handleTap_(data) {
     // A custom event is necessary here (as opposed to the click() function)
     // because some targets (e.g. SVGs) may not be HTMLElements.
-    const event = createCustomEvent(
-        this.win,
-        'click',
-        null,
-        {bubbles: true}
-    );
+    const event = createCustomEvent(this.win, 'click', null, {bubbles: true});
     data.target.dispatchEvent(event);
   }
 
@@ -634,9 +634,9 @@ export class AmpPanZoom extends AMP.BaseElement {
    */
   registerPanningGesture_() {
     // Movable.
-    this.unlistenOnSwipePan_ = this.gestures_
-        .onGesture(SwipeXYRecognizer, e => this.handleSwipe(e.data));
-
+    this.unlistenOnSwipePan_ = this.gestures_.onGesture(SwipeXYRecognizer, e =>
+      this.handleSwipe(e.data)
+    );
   }
 
   /**
@@ -741,9 +741,9 @@ export class AmpPanZoom extends AMP.BaseElement {
     } = this.contentBox_;
     const {width: eWidth, height: eHeight} = this.elementBox_;
 
-    this.minX_ = Math.min(0, eWidth - (xOffset + cWidth * (scale + 1) / 2));
+    this.minX_ = Math.min(0, eWidth - (xOffset + (cWidth * (scale + 1)) / 2));
     this.maxX_ = Math.max(0, (cWidth * scale - cWidth) / 2 - xOffset);
-    this.minY_ = Math.min(0, eHeight - (yOffset + cHeight * (scale + 1) / 2));
+    this.minY_ = Math.min(0, eHeight - (yOffset + (cHeight * (scale + 1)) / 2));
     this.maxY_ = Math.max(0, (cHeight * scale - cHeight) / 2 - yOffset);
   }
 
@@ -768,14 +768,21 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @private
    */
   triggerTransformEnd_(scale, x, y) {
-    const transformEndEvent =
-    createCustomEvent(this.win, `${TAG}.transformEnd`, dict({
-      'scale': scale,
-      'x': x,
-      'y': y,
-    }));
-    this.action_.trigger(this.element, 'transformEnd', transformEndEvent,
-        ActionTrust.HIGH);
+    const transformEndEvent = createCustomEvent(
+      this.win,
+      `${TAG}.transformEnd`,
+      dict({
+        'scale': scale,
+        'x': x,
+        'y': y,
+      })
+    );
+    this.action_.trigger(
+      this.element,
+      'transformEnd',
+      transformEndEvent,
+      ActionTrust.HIGH
+    );
     this.element.dispatchCustomEvent('transformEnd');
   }
 
@@ -803,19 +810,26 @@ export class AmpPanZoom extends AMP.BaseElement {
    */
   onMoveRelease_(veloX, veloY) {
     // Continue motion.
-    this.motion_ = continueMotion(dev().assertElement(this.content_),
-        this.posX_, this.posY_, veloX, veloY,
-        (x, y) => {
-          const newPosX = this.boundX_(x, true);
-          const newPosY = this.boundY_(y, true);
-          if (Math.abs(newPosX - this.posX_) < 1 &&
-                Math.abs(newPosY - this.posY_) < 1) {
-            // Hit the wall: stop motion.
-            return false;
-          }
-          this.set_(this.scale_, newPosX, newPosY, false);
-          return true;
-        });
+    this.motion_ = continueMotion(
+      dev().assertElement(this.content_),
+      this.posX_,
+      this.posY_,
+      veloX,
+      veloY,
+      (x, y) => {
+        const newPosX = this.boundX_(x, true);
+        const newPosY = this.boundY_(y, true);
+        if (
+          Math.abs(newPosX - this.posX_) < 1 &&
+          Math.abs(newPosY - this.posY_) < 1
+        ) {
+          // Hit the wall: stop motion.
+          return false;
+        }
+        this.set_(this.scale_, newPosX, newPosY, false);
+        return true;
+      }
+    );
 
     // Snap back.
     return this.motion_.thenAlways(() => {
@@ -829,10 +843,10 @@ export class AmpPanZoom extends AMP.BaseElement {
    * @param {number} clientY
    */
   onDoubletapZoom_(clientX, clientY) {
-    const newScale = this.scale_ == this.minScale_ ?
-      this.maxScale_ : this.minScale_;
-    const dx = (this.elementBox_.width / 2) - this.getOffsetX_(clientX);
-    const dy = (this.elementBox_.height / 2) - this.getOffsetY_(clientY);
+    const newScale =
+      this.scale_ == this.minScale_ ? this.maxScale_ : this.minScale_;
+    const dx = this.elementBox_.width / 2 - this.getOffsetX_(clientX);
+    const dy = this.elementBox_.height / 2 - this.getOffsetY_(clientY);
     return this.onZoom_(newScale, dx, dy, /*animate*/ true);
   }
 
@@ -851,8 +865,8 @@ export class AmpPanZoom extends AMP.BaseElement {
       return Promise.resolve();
     }
     const {width, height} = this.elementBox_;
-    const dist = Math.sqrt((deltaX * deltaX) + (deltaY * deltaY));
-    const newScale = this.startScale_ * (1 + (dir * dist / 100));
+    const dist = Math.sqrt(deltaX * deltaX + deltaY * deltaY);
+    const newScale = this.startScale_ * (1 + (dir * dist) / 100);
     const deltaCenterX = width / 2 - this.getOffsetX_(centerClientX);
     const deltaCenterY = height / 2 - this.getOffsetY_(centerClientY);
     const dx = Math.min(dist / 100, 1) * deltaCenterX;
@@ -875,8 +889,8 @@ export class AmpPanZoom extends AMP.BaseElement {
       return Promise.resolve();
     }
     this.updatePanZoomBounds_(newScale);
-    const newPosX = this.boundX_(this.startX_ + (deltaX * newScale), false);
-    const newPosY = this.boundY_(this.startY_ + (deltaY * newScale), false);
+    const newPosX = this.boundX_(this.startX_ + deltaX * newScale, false);
+    const newPosY = this.boundY_(this.startY_ + deltaY * newScale, false);
     return this.set_(newScale, newPosX, newPosY, animate);
   }
 
@@ -934,24 +948,33 @@ export class AmpPanZoom extends AMP.BaseElement {
     const ds = newScale - this.scale_;
     const dx = newPosX - this.posX_;
     const dy = newPosY - this.posY_;
-    const dist = Math.sqrt((dx * dx) + (dy * dy));
-
-    const dur = animate ?
-      Math.min(1, Math.max(
-          dist * 0.01, // Distance
-          Math.abs(ds) // Change in scale
-      )) * MAX_ANIMATION_DURATION : 0;
+    const dist = Math.sqrt(dx * dx + dy * dy);
+
+    const dur = animate
+      ? Math.min(
+          1,
+          Math.max(
+            dist * 0.01, // Distance
+            Math.abs(ds) // Change in scale
+          )
+        ) * MAX_ANIMATION_DURATION
+      : 0;
 
     if (dur > 16 && animate) {
       const scaleFunc = numeric(this.scale_, newScale);
       const xFunc = numeric(this.posX_, newPosX);
       const yFunc = numeric(this.posY_, newPosY);
-      return Animation.animate(dev().assertElement(this.content_), time => {
-        this.scale_ = scaleFunc(time);
-        this.posX_ = xFunc(time);
-        this.posY_ = yFunc(time);
-        this.updatePanZoom_();
-      }, dur, PAN_ZOOM_CURVE_).thenAlways(() => {
+      return Animation.animate(
+        dev().assertElement(this.content_),
+        time => {
+          this.scale_ = scaleFunc(time);
+          this.posX_ = xFunc(time);
+          this.posY_ = yFunc(time);
+          this.updatePanZoom_();
+        },
+        dur,
+        PAN_ZOOM_CURVE_
+      ).thenAlways(() => {
         this.scale_ = newScale;
         this.posX_ = newPosX;
         this.posY_ = newPosY;
@@ -975,8 +998,8 @@ export class AmpPanZoom extends AMP.BaseElement {
     if (newScale != this.scale_) {
       this.updatePanZoomBounds_(newScale);
     }
-    const newPosX = this.boundX_(this.posX_ / this.scale_ * newScale, false);
-    const newPosY = this.boundY_(this.posY_ / this.scale_ * newScale, false);
+    const newPosX = this.boundX_((this.posX_ / this.scale_) * newScale, false);
+    const newPosY = this.boundY_((this.posY_ / this.scale_) * newScale, false);
     return this.set_(newScale, newPosX, newPosY, true).then(() => {
       this.startScale_ = this.scale_;
       this.startX_ = this.posX_;
diff --git a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
index 108935aa7a79..fa938f9bd4ec 100644
--- a/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
+++ b/extensions/amp-pan-zoom/0.1/test/integration/test-amp-pan-zoom.js
@@ -18,44 +18,49 @@ import {AmpEvents} from '../../../../../src/amp-events';
 import {createFixtureIframe} from '../../../../../testing/iframe';
 import {toggleExperiment} from '../../../../../src/experiments';
 
-describe.configure().ifChrome().run('amp-pan-zoom', function() {
-  this.timeout(100000);
-  let fixture;
-  beforeEach(() => {
-    return createFixtureIframe('test/fixtures/amp-pan-zoom.html', 1000)
-        .then(f => {
+describe
+  .configure()
+  .ifChrome()
+  .run('amp-pan-zoom', function() {
+    this.timeout(100000);
+    let fixture;
+    beforeEach(() => {
+      return createFixtureIframe('test/fixtures/amp-pan-zoom.html', 1000).then(
+        f => {
           fixture = f;
           toggleExperiment(fixture.win, 'amp-pan-zoom', true, true);
-        });
-  });
+        }
+      );
+    });
 
-  it('two amp-pan-zoom should exist', () => {
-    expect(fixture.doc.querySelectorAll('amp-pan-zoom'))
-        .to.have.length.above(0);
-  });
+    it('two amp-pan-zoom should exist', () => {
+      expect(fixture.doc.querySelectorAll('amp-pan-zoom')).to.have.length.above(
+        0
+      );
+    });
 
-  // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
-  it.skip('should resize and center content', () => {
-    return fixture.awaitEvent(AmpEvents.LOAD_END, 2).then(() => {
-      const panZoom = fixture.doc.querySelector('#amp-pan-zoom-1');
-      const content = panZoom.children[0];
-      expect(content.style.width).to.equal('300px');
-      // 481 / 641 * 300 = 225
-      expect(content.style.height).to.equal('225px');
-      // (240 - 225) / 2 = 8
-      expect(content.style.top).to.equal('8px');
-      expect(content.style.left).to.equal('0px');
+    // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
+    it.skip('should resize and center content', () => {
+      return fixture.awaitEvent(AmpEvents.LOAD_END, 2).then(() => {
+        const panZoom = fixture.doc.querySelector('#amp-pan-zoom-1');
+        const content = panZoom.children[0];
+        expect(content.style.width).to.equal('300px');
+        // 481 / 641 * 300 = 225
+        expect(content.style.height).to.equal('225px');
+        // (240 - 225) / 2 = 8
+        expect(content.style.top).to.equal('8px');
+        expect(content.style.left).to.equal('0px');
+      });
     });
-  });
 
-  // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
-  it.skip('should apply initial configurations correctly', () => {
-    return fixture.awaitEvent(AmpEvents.LOAD_END, 4).then(() => {
-      const panZoom = fixture.doc.querySelector('#amp-pan-zoom-2');
-      const content = panZoom.children[0];
-      expect(content.style.transform).to
-          .equal('translate(50px, 100px) scale(2)');
+    // TODO(cathyxz): Flaky on Chrome 67 on Windows 7.
+    it.skip('should apply initial configurations correctly', () => {
+      return fixture.awaitEvent(AmpEvents.LOAD_END, 4).then(() => {
+        const panZoom = fixture.doc.querySelector('#amp-pan-zoom-2');
+        const content = panZoom.children[0];
+        expect(content.style.transform).to.equal(
+          'translate(50px, 100px) scale(2)'
+        );
+      });
     });
   });
-});
-
diff --git a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js
index 05e96e961863..fe485c46a22f 100644
--- a/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js
+++ b/extensions/amp-pan-zoom/0.1/test/test-amp-pan-zoom.js
@@ -20,353 +20,379 @@ import {htmlFor} from '../../../../src/static-template';
 import {listenOncePromise} from '../../../../src/event-helper';
 import {setStyles} from '../../../../src/style';
 
-describes.realWin('amp-pan-zoom', {
-  amp: {
-    extensions: ['amp-pan-zoom'],
+describes.realWin(
+  'amp-pan-zoom',
+  {
+    amp: {
+      extensions: ['amp-pan-zoom'],
+    },
   },
-}, env => {
-  let win;
-  let doc;
-  let sandbox;
-  let el;
-  let impl;
-  let svg;
-
-  const measureMutateElementStub = (measure, mutate) => {
-    return Promise.resolve().then(measure).then(mutate);
-  };
-
-  /**
-   * This function takes an object of attributes and constructs and builds
-   * an amp-pan-zoom element and attaches it to the page. Assumes the contents
-   * to be an SVG of width and height 300x300.
-   * @param {Object} opt_attributes
-   */
-  function getPanZoom(opt_attributes) {
-    el = htmlFor(doc)`
+  env => {
+    let win;
+    let doc;
+    let sandbox;
+    let el;
+    let impl;
+    let svg;
+
+    const measureMutateElementStub = (measure, mutate) => {
+      return Promise.resolve()
+        .then(measure)
+        .then(mutate);
+    };
+
+    /**
+     * This function takes an object of attributes and constructs and builds
+     * an amp-pan-zoom element and attaches it to the page. Assumes the contents
+     * to be an SVG of width and height 300x300.
+     * @param {Object} opt_attributes
+     */
+    function getPanZoom(opt_attributes) {
+      el = htmlFor(doc)`
       <amp-pan-zoom layout="fixed" width ="300" height="400">
       </amp-pan-zoom>
     `;
 
-    for (const key in opt_attributes) {
-      el.setAttribute(key, opt_attributes[key]);
-    }
+      for (const key in opt_attributes) {
+        el.setAttribute(key, opt_attributes[key]);
+      }
 
-    svg = htmlFor(doc)`
+      svg = htmlFor(doc)`
       <svg width="100" height="100">
         <rect width="100" height="100" fill="#95B3D7"></rect>
       </svg>
     `;
 
-    el.appendChild(svg);
-    doc.body.appendChild(el);
-    return el.build().then(() => {
-      impl = el.implementation_;
-      sandbox.stub(impl, 'measureMutateElement')
+      el.appendChild(svg);
+      doc.body.appendChild(el);
+      return el.build().then(() => {
+        impl = el.implementation_;
+        sandbox
+          .stub(impl, 'measureMutateElement')
           .callsFake(measureMutateElementStub);
-      sandbox.stub(impl, 'mutateElement')
+        sandbox
+          .stub(impl, 'mutateElement')
           .callsFake(mutate => measureMutateElementStub(undefined, mutate));
+      });
+    }
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      sandbox = env.sandbox;
+      env.iframe.height = 500;
+      env.iframe.width = 400;
     });
-  }
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    sandbox = env.sandbox;
-    env.iframe.height = 500;
-    env.iframe.width = 400;
-  });
-
-  it('should schedule layout of own children', () => {
-    let scheduleLayoutSpy;
-    return getPanZoom().then(() => {
-      scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      el.layoutCallback();
-    }).then(() => {
-      expect(scheduleLayoutSpy).to.be.calledOnceWith(svg);
+    it('should schedule layout of own children', () => {
+      let scheduleLayoutSpy;
+      return getPanZoom()
+        .then(() => {
+          scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+          el.layoutCallback();
+        })
+        .then(() => {
+          expect(scheduleLayoutSpy).to.be.calledOnceWith(svg);
+        });
     });
-  });
-
-  it('should size contents correctly', () => {
-    return getPanZoom().then(() => el.layoutCallback()).then(() => {
-      expect(svg.clientWidth).to.equal(300);
-      expect(svg.clientHeight).to.equal(300);
-      expect(svg.getAttribute('class')).to.match(/i-amphtml-pan-zoom-child/);
-      expect(el.className).to.match(/i-amphtml-pan-zoom/);
+
+    it('should size contents correctly', () => {
+      return getPanZoom()
+        .then(() => el.layoutCallback())
+        .then(() => {
+          expect(svg.clientWidth).to.equal(300);
+          expect(svg.clientHeight).to.equal(300);
+          expect(svg.getAttribute('class')).to.match(
+            /i-amphtml-pan-zoom-child/
+          );
+          expect(el.className).to.match(/i-amphtml-pan-zoom/);
+        });
     });
-  });
-
-  it('should position and scale correctly based on initial values', () => {
-    return getPanZoom({
-      'initial-scale': '2',
-      'initial-x': '10',
-      'initial-y': '50',
-    }).then(() => el.layoutCallback()).then(() => {
-      expect(impl.startX_).to.equal(10);
-      expect(impl.posX_).to.equal(10);
-      expect(impl.startY_).to.equal(50);
-      expect(impl.posY_).to.equal(50);
-      expect(svg.style.transform).to.equal('translate(10px, 50px) scale(2)');
+
+    it('should position and scale correctly based on initial values', () => {
+      return getPanZoom({
+        'initial-scale': '2',
+        'initial-x': '10',
+        'initial-y': '50',
+      })
+        .then(() => el.layoutCallback())
+        .then(() => {
+          expect(impl.startX_).to.equal(10);
+          expect(impl.posX_).to.equal(10);
+          expect(impl.startY_).to.equal(50);
+          expect(impl.posY_).to.equal(50);
+          expect(svg.style.transform).to.equal(
+            'translate(10px, 50px) scale(2)'
+          );
+        });
     });
-  });
-
-  it('should initialize all measured variables correctly', () => {
-    return getPanZoom().then(() => el.layoutCallback()).then(() => {
-      expect(impl.startScale_).to.equal(1);
-      expect(impl.startX_).to.equal(0);
-      expect(impl.startY_).to.equal(0);
-      expect(impl.sourceWidth_).to.equal(100);
-      expect(impl.sourceHeight_).to.equal(100);
+
+    it('should initialize all measured variables correctly', () => {
+      return getPanZoom()
+        .then(() => el.layoutCallback())
+        .then(() => {
+          expect(impl.startScale_).to.equal(1);
+          expect(impl.startX_).to.equal(0);
+          expect(impl.startY_).to.equal(0);
+          expect(impl.sourceWidth_).to.equal(100);
+          expect(impl.sourceHeight_).to.equal(100);
+        });
     });
-  });
-
-  it('should update pan and zoom bounds correctly', () => {
-    return getPanZoom().then(() => {
-      el.getBoundingClientRect = () => {
-        return {
-          'top': 0,
-          'left': 0,
-          'height': 400,
-          'width': 300,
-        };
-      };
-      return el.layoutCallback();
-    }).then(() => {
-      expect(impl.elementBox_.height).to.equal(400);
-      expect(impl.elementBox_.width).to.equal(300);
-      expect(impl.contentBox_.height).to.equal(300);
-      expect(impl.contentBox_.width).to.equal(300);
-
-      expect(impl.minX_).to.equal(0);
-      expect(impl.maxX_).to.equal(0);
-      expect(impl.minY_).to.equal(0);
-      expect(impl.maxY_).to.equal(0);
-
-      impl.updatePanZoomBounds_(2);
-      // (600 - 300) / 2
-      expect(impl.minX_).to.equal(-150);
-      expect(impl.maxX_).to.equal(150);
-      // (600 - 400) / 2
-      expect(impl.minY_).to.equal(-100);
-      expect(impl.maxY_).to.equal(100);
-
-      impl.updatePanZoomBounds_(3);
-      // (900 - 300) / 2
-      expect(impl.minX_).to.equal(-300);
-      expect(impl.maxX_).to.equal(300);
-      // (900 - 400) / 2
-      expect(impl.minY_).to.equal(-250);
-      expect(impl.maxY_).to.equal(250);
+
+    it('should update pan and zoom bounds correctly', () => {
+      return getPanZoom()
+        .then(() => {
+          el.getBoundingClientRect = () => {
+            return {
+              'top': 0,
+              'left': 0,
+              'height': 400,
+              'width': 300,
+            };
+          };
+          return el.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.elementBox_.height).to.equal(400);
+          expect(impl.elementBox_.width).to.equal(300);
+          expect(impl.contentBox_.height).to.equal(300);
+          expect(impl.contentBox_.width).to.equal(300);
+
+          expect(impl.minX_).to.equal(0);
+          expect(impl.maxX_).to.equal(0);
+          expect(impl.minY_).to.equal(0);
+          expect(impl.maxY_).to.equal(0);
+
+          impl.updatePanZoomBounds_(2);
+          // (600 - 300) / 2
+          expect(impl.minX_).to.equal(-150);
+          expect(impl.maxX_).to.equal(150);
+          // (600 - 400) / 2
+          expect(impl.minY_).to.equal(-100);
+          expect(impl.maxY_).to.equal(100);
+
+          impl.updatePanZoomBounds_(3);
+          // (900 - 300) / 2
+          expect(impl.minX_).to.equal(-300);
+          expect(impl.maxX_).to.equal(300);
+          // (900 - 400) / 2
+          expect(impl.minY_).to.equal(-250);
+          expect(impl.maxY_).to.equal(250);
+        });
     });
-  });
-
-  it('should correctly update bounds with top-aligned content', () => {
-    return getPanZoom({
-      'style': 'display: initial',
-    }).then(() => {
-      el.getBoundingClientRect = () => {
-        return {
-          'top': 0,
-          'left': 0,
-          'height': 400,
-          'width': 300,
-        };
-      };
-      return el.layoutCallback();
-    }).then(() => {
-
-      expect(impl.minY_).to.equal(0);
-      expect(impl.maxY_).to.equal(0);
-
-      impl.updatePanZoomBounds_(2);
-      expect(impl.minY_).to.equal(-50);
-      expect(impl.maxY_).to.equal(150);
-
-      impl.updatePanZoomBounds_(3);
-      expect(impl.minY_).to.equal(-200);
-      expect(impl.maxY_).to.equal(300);
+
+    it('should correctly update bounds with top-aligned content', () => {
+      return getPanZoom({
+        'style': 'display: initial',
+      })
+        .then(() => {
+          el.getBoundingClientRect = () => {
+            return {
+              'top': 0,
+              'left': 0,
+              'height': 400,
+              'width': 300,
+            };
+          };
+          return el.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.minY_).to.equal(0);
+          expect(impl.maxY_).to.equal(0);
+
+          impl.updatePanZoomBounds_(2);
+          expect(impl.minY_).to.equal(-50);
+          expect(impl.maxY_).to.equal(150);
+
+          impl.updatePanZoomBounds_(3);
+          expect(impl.minY_).to.equal(-200);
+          expect(impl.maxY_).to.equal(300);
+        });
     });
-  });
-
-  it('should correctly update bounds with left-aligned content', () => {
-    return getPanZoom({
-      'height': '300',
-      'width': '400',
-      'style': 'justify-content: start',
-    }).then(() => {
-      el.getBoundingClientRect = () => {
-        return {
-          'top': 0,
-          'left': 0,
-          'height': 300,
-          'width': 400,
-        };
-      };
-      return el.layoutCallback();
-    }).then(() => {
-
-      expect(impl.minY_).to.equal(0);
-      expect(impl.maxY_).to.equal(0);
-
-      impl.updatePanZoomBounds_(2);
-      expect(impl.minX_).to.equal(-50);
-      expect(impl.maxX_).to.equal(150);
-
-      impl.updatePanZoomBounds_(3);
-      expect(impl.minX_).to.equal(-200);
-      expect(impl.maxX_).to.equal(300);
+
+    it('should correctly update bounds with left-aligned content', () => {
+      return getPanZoom({
+        'height': '300',
+        'width': '400',
+        'style': 'justify-content: start',
+      })
+        .then(() => {
+          el.getBoundingClientRect = () => {
+            return {
+              'top': 0,
+              'left': 0,
+              'height': 300,
+              'width': 400,
+            };
+          };
+          return el.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.minY_).to.equal(0);
+          expect(impl.maxY_).to.equal(0);
+
+          impl.updatePanZoomBounds_(2);
+          expect(impl.minX_).to.equal(-50);
+          expect(impl.maxX_).to.equal(150);
+
+          impl.updatePanZoomBounds_(3);
+          expect(impl.minX_).to.equal(-200);
+          expect(impl.maxX_).to.equal(300);
+        });
     });
-  });
-
-  it('should correctly update bounds with bottom-aligned content', () => {
-    return getPanZoom({
-      'style': 'justify-content: start; flex-direction: column-reverse',
-    }).then(() => {
-      el.getBoundingClientRect = () => {
-        return {
-          'top': 0,
-          'left': 0,
-          'height': 400,
-          'width': 300,
-        };
-      };
-      return el.layoutCallback();
-    }).then(() => {
-
-      expect(impl.minY_).to.equal(0);
-      expect(impl.maxY_).to.equal(0);
-
-      impl.updatePanZoomBounds_(2);
-
-      expect(impl.minY_).to.equal(-150);
-      expect(impl.maxY_).to.equal(50);
-
-      impl.updatePanZoomBounds_(3);
-      expect(impl.minY_).to.equal(-300);
-      expect(impl.maxY_).to.equal(200);
+
+    it('should correctly update bounds with bottom-aligned content', () => {
+      return getPanZoom({
+        'style': 'justify-content: start; flex-direction: column-reverse',
+      })
+        .then(() => {
+          el.getBoundingClientRect = () => {
+            return {
+              'top': 0,
+              'left': 0,
+              'height': 400,
+              'width': 300,
+            };
+          };
+          return el.layoutCallback();
+        })
+        .then(() => {
+          expect(impl.minY_).to.equal(0);
+          expect(impl.maxY_).to.equal(0);
+
+          impl.updatePanZoomBounds_(2);
+
+          expect(impl.minY_).to.equal(-150);
+          expect(impl.maxY_).to.equal(50);
+
+          impl.updatePanZoomBounds_(3);
+          expect(impl.minY_).to.equal(-300);
+          expect(impl.maxY_).to.equal(200);
+        });
     });
-  });
 
-  it('should correctly update css after calling transform', () => {
-    return getPanZoom()
+    it('should correctly update css after calling transform', () => {
+      return getPanZoom()
         .then(() => el.layoutCallback())
         .then(() => impl.transform(10, 20, 2))
         .then(() => {
           expect(impl.posX_).to.equal(10);
           expect(impl.posY_).to.equal(20);
           expect(impl.scale_).to.equal(2);
-          expect(svg.style.transform)
-              .to.equal('translate(10px, 20px) scale(2)');
+          expect(svg.style.transform).to.equal(
+            'translate(10px, 20px) scale(2)'
+          );
         });
-  });
-
-  describe('reset-on-resize', () => {
-    it('should clear inline width/height before measuring', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      expect(svg.style.width).to.equal('300px');
-      expect(svg.style.height).to.equal('300px');
-      setStyles(svg, {
-        'width': '50px',
-        'height': '400px',
-      });
-      expect(svg.style.width).to.equal('50px');
-      expect(svg.style.height).to.equal('400px');
-      await impl.resetContentDimensions_();
-      expect(svg.style.width).to.equal('300px');
-      expect(svg.style.height).to.equal('300px');
-    });
-  });
-
-  describe('gestures', () => {
-    it('should pan correctly via mouse when zoomed', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      await impl.transform(0, 0, 2);
-      expect(svg.style.transform).to.equal('translate(0px, 0px) scale(2)');
-      const mouseDown = createPointerEvent('mousedown', 10, 10);
-      const mouseMove = createPointerEvent('mousemove', 20, 20);
-      const mouseUp = createPointerEvent('mouseup', 20, 20);
-      const transformEndPromise = listenOncePromise(el, 'transformEnd');
-      el.dispatchEvent(mouseDown);
-      el.dispatchEvent(mouseMove);
-      el.dispatchEvent(mouseUp);
-      await transformEndPromise;
-      expect(svg.style.transform).to.equal('translate(10px, 10px) scale(2)');
-    });
-  });
-
-  describe('transformEnd', () => {
-    it('should trigger only once after double tap zoom', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      const transformEndPromise = listenOncePromise(el, 'transformEnd');
-      const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
-      impl.handleDoubleTap({clientX: 10, clientY: 10});
-      await transformEndPromise;
-      expect(actionTriggerSpy).to.be.calledOnce;
     });
 
-    it('should not trigger while pinch zooming', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
-      await impl.handlePinch({
-        centerClientX: 10,
-        centerClientY: 10,
-        deltaX: 10,
-        deltaY: 10,
-        dir: 1,
-        last: false,
+    describe('reset-on-resize', () => {
+      it('should clear inline width/height before measuring', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        expect(svg.style.width).to.equal('300px');
+        expect(svg.style.height).to.equal('300px');
+        setStyles(svg, {
+          'width': '50px',
+          'height': '400px',
+        });
+        expect(svg.style.width).to.equal('50px');
+        expect(svg.style.height).to.equal('400px');
+        await impl.resetContentDimensions_();
+        expect(svg.style.width).to.equal('300px');
+        expect(svg.style.height).to.equal('300px');
       });
-      expect(actionTriggerSpy).not.to.be.called;
     });
 
-    it('should trigger exactly once after pinch zoom ends', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      const transformEndPromise = listenOncePromise(el, 'transformEnd');
-      const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
-      impl.handlePinch({
-        centerClientX: 10,
-        centerClientY: 10,
-        deltaX: 10,
-        deltaY: 10,
-        dir: 1,
-        last: true, // This indicates zoom ended
+    describe('gestures', () => {
+      it('should pan correctly via mouse when zoomed', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        await impl.transform(0, 0, 2);
+        expect(svg.style.transform).to.equal('translate(0px, 0px) scale(2)');
+        const mouseDown = createPointerEvent('mousedown', 10, 10);
+        const mouseMove = createPointerEvent('mousemove', 20, 20);
+        const mouseUp = createPointerEvent('mouseup', 20, 20);
+        const transformEndPromise = listenOncePromise(el, 'transformEnd');
+        el.dispatchEvent(mouseDown);
+        el.dispatchEvent(mouseMove);
+        el.dispatchEvent(mouseUp);
+        await transformEndPromise;
+        expect(svg.style.transform).to.equal('translate(10px, 10px) scale(2)');
       });
-      await transformEndPromise;
-      expect(actionTriggerSpy).to.be.calledOnce;
     });
 
-    it('should not trigger while panning', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
-      await impl.handleSwipe({
-        deltaX: 10,
-        deltaY: 10,
-        last: false,
-        velocityX: 10,
-        velocityY: 10,
+    describe('transformEnd', () => {
+      it('should trigger only once after double tap zoom', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        const transformEndPromise = listenOncePromise(el, 'transformEnd');
+        const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
+        impl.handleDoubleTap({clientX: 10, clientY: 10});
+        await transformEndPromise;
+        expect(actionTriggerSpy).to.be.calledOnce;
       });
-      expect(actionTriggerSpy).not.to.be.called;
-    });
 
-    it('should trigger exactly once after panning ends', async function() {
-      await getPanZoom();
-      await el.layoutCallback();
-      const transformEndPromise = listenOncePromise(el, 'transformEnd');
-      const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
-      impl.handleSwipe({
-        deltaX: 10,
-        deltaY: 10,
-        last: true, // This indicates panning ended.
-        velocityX: 10,
-        velocityY: 10,
+      it('should not trigger while pinch zooming', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
+        await impl.handlePinch({
+          centerClientX: 10,
+          centerClientY: 10,
+          deltaX: 10,
+          deltaY: 10,
+          dir: 1,
+          last: false,
+        });
+        expect(actionTriggerSpy).not.to.be.called;
+      });
+
+      it('should trigger exactly once after pinch zoom ends', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        const transformEndPromise = listenOncePromise(el, 'transformEnd');
+        const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
+        impl.handlePinch({
+          centerClientX: 10,
+          centerClientY: 10,
+          deltaX: 10,
+          deltaY: 10,
+          dir: 1,
+          last: true, // This indicates zoom ended
+        });
+        await transformEndPromise;
+        expect(actionTriggerSpy).to.be.calledOnce;
+      });
+
+      it('should not trigger while panning', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
+        await impl.handleSwipe({
+          deltaX: 10,
+          deltaY: 10,
+          last: false,
+          velocityX: 10,
+          velocityY: 10,
+        });
+        expect(actionTriggerSpy).not.to.be.called;
+      });
+
+      it('should trigger exactly once after panning ends', async function() {
+        await getPanZoom();
+        await el.layoutCallback();
+        const transformEndPromise = listenOncePromise(el, 'transformEnd');
+        const actionTriggerSpy = sandbox.spy(impl.action_, 'trigger');
+        impl.handleSwipe({
+          deltaX: 10,
+          deltaY: 10,
+          last: true, // This indicates panning ended.
+          velocityX: 10,
+          velocityY: 10,
+        });
+        await transformEndPromise;
+        expect(actionTriggerSpy).to.be.calledOnce;
       });
-      await transformEndPromise;
-      expect(actionTriggerSpy).to.be.calledOnce;
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-pinterest/0.1/amp-pinterest.js b/extensions/amp-pinterest/0.1/amp-pinterest.js
index b68ce51c0ef5..eeb10bded07f 100644
--- a/extensions/amp-pinterest/0.1/amp-pinterest.js
+++ b/extensions/amp-pinterest/0.1/amp-pinterest.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Shows a Pinterest widget.
  * Examples:
@@ -50,7 +49,6 @@ import {user, userAssert} from '../../../src/log';
  *    - buttonFollow: User follow button
  */
 class AmpPinterest extends AMP.BaseElement {
-
   /**
    * @param {boolean=} onLayout
    * @override
@@ -67,9 +65,11 @@ class AmpPinterest extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    const selector = userAssert(this.element.getAttribute('data-do'),
-        'The data-do attribute is required for <amp-pinterest> %s',
-        this.element);
+    const selector = userAssert(
+      this.element.getAttribute('data-do'),
+      'The data-do attribute is required for <amp-pinterest> %s',
+      this.element
+    );
 
     return this.render(selector).then(node => {
       return this.element.appendChild(node);
@@ -93,7 +93,6 @@ class AmpPinterest extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-pinterest', '0.1', AMP => {
   AMP.registerElement('amp-pinterest', AmpPinterest, CSS);
 });
diff --git a/extensions/amp-pinterest/0.1/follow-button.js b/extensions/amp-pinterest/0.1/follow-button.js
index 69466947233f..a60e7327f928 100644
--- a/extensions/amp-pinterest/0.1/follow-button.js
+++ b/extensions/amp-pinterest/0.1/follow-button.js
@@ -32,17 +32,22 @@ const POP_FOLLOW = `status=no,resizable=yes,scrollbars=yes,
  * @attr data-label: the text to display (user's full name)
  */
 export class FollowButton {
-
   /** @param {!Element} rootElement */
   constructor(rootElement) {
-    userAssert(rootElement.getAttribute('data-href'),
-        'The data-href attribute is required for follow buttons');
-    userAssert(rootElement.getAttribute('data-label'),
-        'The data-label attribute is required for follow buttons');
+    userAssert(
+      rootElement.getAttribute('data-href'),
+      'The data-href attribute is required for follow buttons'
+    );
+    userAssert(
+      rootElement.getAttribute('data-label'),
+      'The data-label attribute is required for follow buttons'
+    );
     this.element = rootElement;
     this.label = rootElement.getAttribute('data-label');
-    this.href = assertHttpsUrl(rootElement.getAttribute('data-href'),
-        rootElement);
+    this.href = assertHttpsUrl(
+      rootElement.getAttribute('data-href'),
+      rootElement
+    );
   }
 
   /**
@@ -51,8 +56,7 @@ export class FollowButton {
    */
   handleClick(event) {
     event.preventDefault();
-    openWindowDialog(window, this.href, 'pin' + Date.now(),
-        POP_FOLLOW);
+    openWindowDialog(window, this.href, 'pin' + Date.now(), POP_FOLLOW);
     Util.log(`&type=button_follow&href=${this.href}`);
   }
 
@@ -61,11 +65,13 @@ export class FollowButton {
    * @return {Element}
    */
   renderTemplate() {
-    const followButton = Util.make(this.element.ownerDocument, {'a': {
-      class: '-amp-pinterest-follow-button',
-      href: this.href,
-      textContent: this.label,
-    }});
+    const followButton = Util.make(this.element.ownerDocument, {
+      'a': {
+        class: '-amp-pinterest-follow-button',
+        href: this.href,
+        textContent: this.label,
+      },
+    });
     followButton.appendChild(Util.make(this.element.ownerDocument, {'i': {}}));
     followButton.onclick = this.handleClick.bind(this);
     return followButton;
diff --git a/extensions/amp-pinterest/0.1/pin-widget.js b/extensions/amp-pinterest/0.1/pin-widget.js
index 4e2982682813..3f361b5b55ef 100644
--- a/extensions/amp-pinterest/0.1/pin-widget.js
+++ b/extensions/amp-pinterest/0.1/pin-widget.js
@@ -23,7 +23,8 @@ import {toWin} from '../../../src/types';
 import {user, userAssert} from '../../../src/log';
 
 // Popup options
-const POP = 'status=no,resizable=yes,scrollbars=yes,' +
+const POP =
+  'status=no,resizable=yes,scrollbars=yes,' +
   'personalbar=no,directories=no,location=no,toolbar=no,' +
   'menubar=no,width=900,height=500,left=0,top=0';
 
@@ -32,11 +33,12 @@ const POP = 'status=no,resizable=yes,scrollbars=yes,' +
  * @attr data-url: the source url for the Pin
  */
 export class PinWidget {
-
   /** @param {!Element} rootElement */
   constructor(rootElement) {
-    userAssert(rootElement.getAttribute('data-url'),
-        'The data-url attribute is required for Pin widgets');
+    userAssert(
+      rootElement.getAttribute('data-url'),
+      'The data-url attribute is required for Pin widgets'
+    );
     this.element = rootElement;
     this.xhr = Services.xhrFor(toWin(rootElement.ownerDocument.defaultView));
     this.pinId = '';
@@ -73,13 +75,18 @@ export class PinWidget {
   fetchPin() {
     const baseUrl = 'https://widgets.pinterest.com/v3/pidgets/pins/info/?';
     const query = `pin_ids=${this.pinId}&sub=www&base_scheme=https`;
-    return this.xhr.fetchJson(baseUrl + query, {
-      requireAmpResponseSourceOrigin: false,
-    }).then(res => res.json()).then(json => {
-      try {
-        return /** @type {JsonObject} */(json)['data'][0];
-      } catch (e) { return null; }
-    });
+    return this.xhr
+      .fetchJson(baseUrl + query, {
+        requireAmpResponseSourceOrigin: false,
+      })
+      .then(res => res.json())
+      .then(json => {
+        try {
+          return /** @type {JsonObject} */ (json)['data'][0];
+        } catch (e) {
+          return null;
+        }
+      });
   }
 
   /**
@@ -107,92 +114,129 @@ export class PinWidget {
     const structure = Util.make(this.element.ownerDocument, {'span': {}});
     structure.className = className + ' i-amphtml-fill-content';
 
-    const container = Util.make(this.element.ownerDocument, {'span': {
-      'className': '-amp-pinterest-embed-pin-inner',
-      'data-pin-log': 'embed_pin',
-    }});
+    const container = Util.make(this.element.ownerDocument, {
+      'span': {
+        'className': '-amp-pinterest-embed-pin-inner',
+        'data-pin-log': 'embed_pin',
+      },
+    });
 
     // If no alternate text is set, set it to the title gotten from the pin data
     if (!this.alt && pin['attribution']) {
       this.alt = pin['attribution']['title'];
     }
 
-    const img = Util.make(this.element.ownerDocument, {'img': {
-      'src': imgUrl,
-      'className': '-amp-pinterest-embed-pin-image',
-      'data-pin-no-hover': true,
-      'data-pin-href': 'https://www.pinterest.com/pin/' + pin['id'] + '/',
-      'data-pin-log': 'embed_pin_img',
-      'alt': this.alt,
-    }});
+    const img = Util.make(this.element.ownerDocument, {
+      'img': {
+        'src': imgUrl,
+        'className': '-amp-pinterest-embed-pin-image',
+        'data-pin-no-hover': true,
+        'data-pin-href': 'https://www.pinterest.com/pin/' + pin['id'] + '/',
+        'data-pin-log': 'embed_pin_img',
+        'alt': this.alt,
+      },
+    });
     container.appendChild(img);
 
     // repin button
-    const repin = Util.make(this.element.ownerDocument, {'span': {
-      'className': '-amp-pinterest-rect -amp-pinterest-en-red' +
-        ' -amp-pinterest-embed-pin-repin -amp-pinterest-save-button-tall',
-      'data-pin-log': 'embed_pin_repin',
-      'data-pin-pop': '1',
-      'data-pin-href': 'https://www.pinterest.com/pin/' + pin['id'] +
-        '/repin/x/?amp=1&guid=' + Util.guid,
-      'textContent': 'Save',
-    }});
+    const repin = Util.make(this.element.ownerDocument, {
+      'span': {
+        'className':
+          '-amp-pinterest-rect -amp-pinterest-en-red' +
+          ' -amp-pinterest-embed-pin-repin -amp-pinterest-save-button-tall',
+        'data-pin-log': 'embed_pin_repin',
+        'data-pin-pop': '1',
+        'data-pin-href':
+          'https://www.pinterest.com/pin/' +
+          pin['id'] +
+          '/repin/x/?amp=1&guid=' +
+          Util.guid,
+        'textContent': 'Save',
+      },
+    });
     container.appendChild(repin);
 
     // text container
-    const text = Util.make(this.element.ownerDocument, {'span': {
-      'className': '-amp-pinterest-embed-pin-text',
-    }});
+    const text = Util.make(this.element.ownerDocument, {
+      'span': {
+        'className': '-amp-pinterest-embed-pin-text',
+      },
+    });
 
     // description
     if (pin['description']) {
-      const description = Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-text-block ' +
-          '-amp-pinterest-embed-pin-description',
-        'textContent': Util.filter(pin['description']),
-      }});
+      const description = Util.make(this.element.ownerDocument, {
+        'span': {
+          'className':
+            '-amp-pinterest-embed-pin-text-block ' +
+            '-amp-pinterest-embed-pin-description',
+          'textContent': Util.filter(pin['description']),
+        },
+      });
       text.appendChild(description);
     }
 
     // attribution
     if (pin['attribution']) {
-      const attribution = Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-text-block' +
-          ' -amp-pinterest-embed-pin-attribution',
-      }});
-      attribution.appendChild(Util.make(this.element.ownerDocument, {'img': {
-        'className': '-amp-pinterest-embed-pin-text-icon-attrib',
-        'src': pin['attribution']['provider_icon_url'],
-      }}));
-      attribution.appendChild(Util.make(this.element.ownerDocument, {'span': {
-        'textContent': ' by ',
-      }}));
-      attribution.appendChild(Util.make(this.element.ownerDocument, {'span': {
-        'data-pin-href': pin['attribution']['url'],
-        'textContent': Util.filter(pin['attribution']['author_name']),
-      }}));
+      const attribution = Util.make(this.element.ownerDocument, {
+        'span': {
+          'className':
+            '-amp-pinterest-embed-pin-text-block' +
+            ' -amp-pinterest-embed-pin-attribution',
+        },
+      });
+      attribution.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'img': {
+            'className': '-amp-pinterest-embed-pin-text-icon-attrib',
+            'src': pin['attribution']['provider_icon_url'],
+          },
+        })
+      );
+      attribution.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'span': {
+            'textContent': ' by ',
+          },
+        })
+      );
+      attribution.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'span': {
+            'data-pin-href': pin['attribution']['url'],
+            'textContent': Util.filter(pin['attribution']['author_name']),
+          },
+        })
+      );
       text.appendChild(attribution);
     }
 
     // likes and repins
     if (pin['repin_count'] || pin['like_count']) {
-      const stats = Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-text-block' +
-          ' -amp-pinterest-embed-pin-stats',
-      }});
+      const stats = Util.make(this.element.ownerDocument, {
+        'span': {
+          'className':
+            '-amp-pinterest-embed-pin-text-block' +
+            ' -amp-pinterest-embed-pin-stats',
+        },
+      });
       if (pin['repin_count']) {
-        const repinCount = Util.make(this.element.ownerDocument, {'span': {
-          'className': '-amp-pinterest-embed-pin-stats-repins',
-          'textContent': String(pin['repin_count']),
-        }});
+        const repinCount = Util.make(this.element.ownerDocument, {
+          'span': {
+            'className': '-amp-pinterest-embed-pin-stats-repins',
+            'textContent': String(pin['repin_count']),
+          },
+        });
         stats.appendChild(repinCount);
       }
 
       if (pin['like_count']) {
-        const likeCount = Util.make(this.element.ownerDocument, {'span': {
-          'className': '-amp-pinterest-embed-pin-stats-likes',
-          'textContent': String(pin['like_count']),
-        }});
+        const likeCount = Util.make(this.element.ownerDocument, {
+          'span': {
+            'className': '-amp-pinterest-embed-pin-stats-likes',
+            'textContent': String(pin['like_count']),
+          },
+        });
         stats.appendChild(likeCount);
       }
       text.appendChild(stats);
@@ -200,34 +244,48 @@ export class PinWidget {
 
     // pinner
     if (pin['pinner']) {
-
-      const pinner = Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-text-block' +
-          ' -amp-pinterest-embed-pin-pinner',
-      }});
+      const pinner = Util.make(this.element.ownerDocument, {
+        'span': {
+          'className':
+            '-amp-pinterest-embed-pin-text-block' +
+            ' -amp-pinterest-embed-pin-pinner',
+        },
+      });
 
       // avatar
-      pinner.appendChild(Util.make(this.element.ownerDocument, {'img': {
-        'className': '-amp-pinterest-embed-pin-pinner-avatar',
-        'alt': Util.filter(pin['pinner']['full_name']),
-        'title': Util.filter(pin['pinner']['full_name']),
-        'src': pin['pinner']['image_small_url'],
-        'data-pin-href': pin['pinner']['profile_url'],
-      }}));
+      pinner.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'img': {
+            'className': '-amp-pinterest-embed-pin-pinner-avatar',
+            'alt': Util.filter(pin['pinner']['full_name']),
+            'title': Util.filter(pin['pinner']['full_name']),
+            'src': pin['pinner']['image_small_url'],
+            'data-pin-href': pin['pinner']['profile_url'],
+          },
+        })
+      );
 
       // name
-      pinner.appendChild(Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-pinner-name',
-        'textContent': Util.filter(pin['pinner']['full_name']),
-        'data-pin-href': pin['pinner']['profile_url'],
-      }}));
+      pinner.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'span': {
+            'className': '-amp-pinterest-embed-pin-pinner-name',
+            'textContent': Util.filter(pin['pinner']['full_name']),
+            'data-pin-href': pin['pinner']['profile_url'],
+          },
+        })
+      );
 
       // board
-      pinner.appendChild(Util.make(this.element.ownerDocument, {'span': {
-        'className': '-amp-pinterest-embed-pin-board-name',
-        'textContent': Util.filter(pin['board']['name']),
-        'data-pin-href': 'https://www.pinterest.com/' + pin['board']['url'],
-      }}));
+      pinner.appendChild(
+        Util.make(this.element.ownerDocument, {
+          'span': {
+            'className': '-amp-pinterest-embed-pin-board-name',
+            'textContent': Util.filter(pin['board']['name']),
+            'data-pin-href': 'https://www.pinterest.com/' + pin['board']['url'],
+          },
+        })
+      );
 
       text.appendChild(pinner);
     }
@@ -258,12 +316,10 @@ export class PinWidget {
       this.pinId = this.pinUrl.split('/pin/')[1].split('/')[0];
     } catch (err) {
       return Promise.reject(
-          user().createError('Invalid pinterest url: %s', this.pinUrl)
+        user().createError('Invalid pinterest url: %s', this.pinUrl)
       );
     }
 
-    return this.fetchPin()
-        .then(this.renderPin.bind(this));
+    return this.fetchPin().then(this.renderPin.bind(this));
   }
-
 }
diff --git a/extensions/amp-pinterest/0.1/save-button.js b/extensions/amp-pinterest/0.1/save-button.js
index f4a3c8efc486..a1c252bf95e7 100644
--- a/extensions/amp-pinterest/0.1/save-button.js
+++ b/extensions/amp-pinterest/0.1/save-button.js
@@ -21,7 +21,8 @@ import {openWindowDialog} from '../../../src/dom';
 import {toWin} from '../../../src/types';
 
 // Popup options
-const POP = 'status=no,resizable=yes,scrollbars=yes,' +
+const POP =
+  'status=no,resizable=yes,scrollbars=yes,' +
   'personalbar=no,directories=no,location=no,toolbar=no,' +
   'menubar=no,width=900,height=500,left=0,top=0';
 
@@ -39,25 +40,31 @@ const POP = 'status=no,resizable=yes,scrollbars=yes,' +
  * @attr data-tall:  should the button be tall  (true if set)
  */
 export class SaveButton {
-
   /** @param {!Element} rootElement */
   constructor(rootElement) {
-    userAssert(rootElement.getAttribute('data-url'),
-        'The data-url attribute is required for Save buttons');
-    userAssert(rootElement.getAttribute('data-media'),
-        'The data-media attribute is required for Save buttons');
-    userAssert(rootElement.getAttribute('data-description'),
-        'The data-description attribute is required for Save buttons');
+    userAssert(
+      rootElement.getAttribute('data-url'),
+      'The data-url attribute is required for Save buttons'
+    );
+    userAssert(
+      rootElement.getAttribute('data-media'),
+      'The data-media attribute is required for Save buttons'
+    );
+    userAssert(
+      rootElement.getAttribute('data-description'),
+      'The data-description attribute is required for Save buttons'
+    );
     this.element = rootElement;
     this.xhr = Services.xhrFor(toWin(rootElement.ownerDocument.defaultView));
     this.color = rootElement.getAttribute('data-color');
     this.count = rootElement.getAttribute('data-count');
     this.lang = rootElement.getAttribute('data-lang');
-    const hasOneToOneDimensions = rootElement.hasAttribute('height') &&
+    const hasOneToOneDimensions =
+      rootElement.hasAttribute('height') &&
       rootElement.hasAttribute('width') &&
       rootElement.getAttribute('height') === rootElement.getAttribute('width');
-    this.round = rootElement.getAttribute('data-round') ||
-      hasOneToOneDimensions;
+    this.round =
+      rootElement.getAttribute('data-round') || hasOneToOneDimensions;
     this.tall = rootElement.getAttribute('data-tall');
     this.description = rootElement.getAttribute('data-description');
     /** @type {?string} */
@@ -83,10 +90,14 @@ export class SaveButton {
    * @return {Promise}
    */
   fetchCount() {
-    const url = `https://widgets.pinterest.com/v1/urls/count.json?return_jsonp=false&url=${this.url}`;
-    return this.xhr.fetchJson(url, {
-      requireAmpResponseSourceOrigin: false,
-    }).then(res => res.json());
+    const url = `https://widgets.pinterest.com/v1/urls/count.json?return_jsonp=false&url=${
+      this.url
+    }`;
+    return this.xhr
+      .fetchJson(url, {
+        requireAmpResponseSourceOrigin: false,
+      })
+      .then(res => res.json());
   }
 
   /**
@@ -117,10 +128,12 @@ export class SaveButton {
    */
   renderCount(count, heightClass) {
     Util.log('&type=pidget&button_count=1');
-    return Util.make(this.element.ownerDocument, {'span': {
-      class: `-amp-pinterest-bubble-${this.count}${heightClass}`,
-      textContent: this.formatPinCount(count),
-    }});
+    return Util.make(this.element.ownerDocument, {
+      'span': {
+        class: `-amp-pinterest-bubble-${this.count}${heightClass}`,
+        textContent: this.formatPinCount(count),
+      },
+    });
   }
 
   /**
@@ -151,11 +164,13 @@ export class SaveButton {
       }
     }
 
-    const saveButton = Util.make(this.element.ownerDocument, {'a': {
-      class: clazz.join(' '),
-      href: this.href,
-      textContent: this.round ? '' : (this.lang === 'ja' ? '保存' : 'Save'),
-    }});
+    const saveButton = Util.make(this.element.ownerDocument, {
+      'a': {
+        class: clazz.join(' '),
+        href: this.href,
+        textContent: this.round ? '' : this.lang === 'ja' ? '保存' : 'Save',
+      },
+    });
 
     if (countBubble) {
       saveButton.appendChild(countBubble);
diff --git a/extensions/amp-pinterest/0.1/test/test-amp-pinterest.js b/extensions/amp-pinterest/0.1/test/test-amp-pinterest.js
index 61e12ceb2d2b..8cf8b5f9fbc2 100644
--- a/extensions/amp-pinterest/0.1/test/test-amp-pinterest.js
+++ b/extensions/amp-pinterest/0.1/test/test-amp-pinterest.js
@@ -16,103 +16,431 @@
 
 import '../amp-pinterest';
 
-describes.realWin('amp-pinterest', {
-  amp: {
-    runtimeOn: false,
-    ampdoc: 'single',
-    mockFetch: true,
-    extensions: ['amp-pinterest'],
+describes.realWin(
+  'amp-pinterest',
+  {
+    amp: {
+      runtimeOn: false,
+      ampdoc: 'single',
+      mockFetch: true,
+      extensions: ['amp-pinterest'],
+    },
   },
-}, env => {
-
-  function widgetURL(pinID) {
-    return 'begin:https://widgets.pinterest.com/v3/pidgets/pins/info/?pin_ids='
-        + pinID;
-  }
+  env => {
+    function widgetURL(pinID) {
+      return (
+        'begin:https://widgets.pinterest.com/v3/pidgets/pins/info/?pin_ids=' +
+        pinID
+      );
+    }
 
-  function getPin(pinDo, pinUrl, pinMedia, pinDescription) {
-    const div = document.createElement('div');
-    env.win.document.body.appendChild(div);
+    function getPin(pinDo, pinUrl, pinMedia, pinDescription) {
+      const div = document.createElement('div');
+      env.win.document.body.appendChild(div);
 
-    const pin = env.win.document.createElement('amp-pinterest');
-    pin.setAttribute('data-do', pinDo);
-    pin.setAttribute('data-url', pinUrl);
-    pin.setAttribute('data-media', pinMedia);
-    pin.setAttribute('data-description', pinDescription);
-    div.appendChild(pin);
-    return pin.implementation_.layoutCallback().then(() => {
-      return pin;
-    });
-  }
+      const pin = env.win.document.createElement('amp-pinterest');
+      pin.setAttribute('data-do', pinDo);
+      pin.setAttribute('data-url', pinUrl);
+      pin.setAttribute('data-media', pinMedia);
+      pin.setAttribute('data-description', pinDescription);
+      div.appendChild(pin);
+      return pin.implementation_.layoutCallback().then(() => {
+        return pin;
+      });
+    }
 
-  function getEmbedPin(pinID, pinAlt, mockResponse) {
-    const div = document.createElement('div');
-    env.win.document.body.appendChild(div);
+    function getEmbedPin(pinID, pinAlt, mockResponse) {
+      const div = document.createElement('div');
+      env.win.document.body.appendChild(div);
 
-    env.fetchMock.getOnce(widgetURL(pinID), {'body': mockResponse});
+      env.fetchMock.getOnce(widgetURL(pinID), {'body': mockResponse});
 
-    const pinURL = 'https://www.pinterest.com/pin/';
-    const pin = env.win.document.createElement('amp-pinterest');
-    pin.setAttribute('data-do', 'embedPin');
-    pin.setAttribute('data-url', pinURL + pinID);
-    if (pinAlt) {
-      pin.setAttribute('alt', pinAlt);
+      const pinURL = 'https://www.pinterest.com/pin/';
+      const pin = env.win.document.createElement('amp-pinterest');
+      pin.setAttribute('data-do', 'embedPin');
+      pin.setAttribute('data-url', pinURL + pinID);
+      if (pinAlt) {
+        pin.setAttribute('alt', pinAlt);
+      }
+      div.appendChild(pin);
+      return pin.implementation_.layoutCallback().then(() => {
+        return pin;
+      });
     }
-    div.appendChild(pin);
-    return pin.implementation_.layoutCallback().then(() => {
-      return pin;
-    });
-  }
 
-
-  it('renders', () => {
-    return getPin('buttonPin',
+    it('renders', () => {
+      return getPin(
+        'buttonPin',
         'http://www.flickr.com/photos/kentbrew/6851755809/',
         'http://c2.staticflickr.com/8/7027/6851755809_df5b2051c9_b.jpg',
         'Next stop: Pinterest'
-    ).then(pin => {
-      const a = pin.querySelector('a');
-      const href = a.href.replace(/&guid=\w+/, '');
-      expect(a).to.not.be.null;
-      expect(a.tagName).to.equal('A');
-      expect(href).to.equal('https://www.pinterest.com/pin/create/' +
-        'button/?amp=1&url=http%3A%2F%2Fwww.flickr.com%' +
-        '2Fphotos%2Fkentbrew%2F6851755809%2F&media=http%3A%2F%2Fc2.s' +
-        'taticflickr.com%2F8%2F7027%2F6851755809_df5b2051c9_b.jpg&de' +
-        'scription=Next%20stop%3A%20Pinterest');
+      ).then(pin => {
+        const a = pin.querySelector('a');
+        const href = a.href.replace(/&guid=\w+/, '');
+        expect(a).to.not.be.null;
+        expect(a.tagName).to.equal('A');
+        expect(href).to.equal(
+          'https://www.pinterest.com/pin/create/' +
+            'button/?amp=1&url=http%3A%2F%2Fwww.flickr.com%' +
+            '2Fphotos%2Fkentbrew%2F6851755809%2F&media=http%3A%2F%2Fc2.s' +
+            'taticflickr.com%2F8%2F7027%2F6851755809_df5b2051c9_b.jpg&de' +
+            'scription=Next%20stop%3A%20Pinterest'
+        );
+      });
     });
-  });
 
-  it('sets provided alternate text', () => {
-    return getEmbedPin('99360735500167749',
+    it('sets provided alternate text', () => {
+      return getEmbedPin(
+        '99360735500167749',
         'Hands making heart over Pinterest logo',
-        {'status': 'success', 'message': 'OK', 'code': 0, 'data': [{'domain': 'flickr.com', 'attribution': {'title': 'Next stop: Pinterest!', 'url': 'http://www.flickr.com/photos/kentbrew/6851755809/', 'provider_icon_url': 'https://s.pinimg.com/images/api/attrib/flickr@2x.png', 'author_name': 'kentbrew', 'provider_favicon_url': 'https://s.pinimg.com/images/api/attrib/flickr.png', 'author_url': 'http://www.flickr.com/photos/kentbrew/', 'provider_name': 'flickr'}, 'description': 'Love my Pinterest t-shirt!', 'pinner': {'about': "Widgeteer, Pinterest. If the Pin It button is broken or confusing, it's my fault.", 'location': 'Runnymede Poultry Colony', 'full_name': 'Kent Brewster', 'follower_count': 4292, 'image_small_url': 'https://i.pinimg.com/30x30_RS/dc/24/76/dc2476722ee6e8c12b6a93d8ac5b6a4d.jpg', 'pin_count': 5068, 'id': '99360872937292935', 'profile_url': 'https://www.pinterest.com/kentbrew/'}, 'repin_count': 3444, 'aggregated_pin_data': {'aggregated_stats': {'saves': 109743, 'done': 90}}, 'rich_metadata': {'aggregated_app_link': {'ipad': null, 'android': null, 'ios': {'app_url': 'flickr://flickr.com/photos/kentbrew/6851755809', 'app_name': 'Flickr', 'app_id': '328407587'}, 'iphone': {'app_url': 'flickr://flickr.com/photos/kentbrew/6851755809/', 'app_name': 'Flickr', 'app_id': '328407587'}}, 'has_price_drop': false, 'site_name': 'Flickr', 'description': 'Today was my last day at Lexity. Next up?  A little start-up in Palo Alto.', 'link_status': 0, 'title': 'Next stop: Pinterest!', 'locale': 'en', 'amp_valid': false, 'amp_url': '', 'url': 'http://www.flickr.com/photos/kentbrew/6851755809/', 'tracker': null, 'apple_touch_icon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4', 'favicon_images': {'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433'}, 'article': {'description': 'Today was my last day at Lexity. Next up? A little start-up in Palo Alto.', 'date_published': null, 'authors': [], 'type': 'articlemetadata', 'id': '140248253674512', 'name': 'Next stop: Pinterest!'}, 'type': 'richpindataview', 'id': '811ea1aef1bcaf6342a725365871d79d', 'apple_touch_icon_images': {'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4'}, 'favicon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433'}, 'dominant_color': '#e77b60', 'link': 'http://www.flickr.com/photos/kentbrew/6851755809/', 'board': {'description': "Some of the fun we're having bringing Pinterest to life!", 'url': '/kentbrew/adventures-at-pinterest/', 'follower_count': 1128, 'image_thumbnail_url': 'https://s-media-cache-ak0.pinimg.com/upload/99360804217844427_board_thumbnail_2017-07-07-20-33-41_48158_60.jpg', 'pin_count': 151, 'id': '99360804217844427', 'name': 'Adventures at Pinterest'}, 'videos': null, 'images': {'237x': {'url': 'https://i.pinimg.com/237x/a7/66/56/a76656e966b1958f568d63c3f1c05aec.jpg', 'width': 237, 'height': 177}}, 'embed': null, 'is_video': false, 'id': '99360735500167749'}]}
-    ).then(pin => {
-      const img = pin.querySelector('img');
-      expect(img.getAttribute('alt')).to.equal('Hands making heart over ' +
-        'Pinterest logo');
+        {
+          'status': 'success',
+          'message': 'OK',
+          'code': 0,
+          'data': [
+            {
+              'domain': 'flickr.com',
+              'attribution': {
+                'title': 'Next stop: Pinterest!',
+                'url': 'http://www.flickr.com/photos/kentbrew/6851755809/',
+                'provider_icon_url':
+                  'https://s.pinimg.com/images/api/attrib/flickr@2x.png',
+                'author_name': 'kentbrew',
+                'provider_favicon_url':
+                  'https://s.pinimg.com/images/api/attrib/flickr.png',
+                'author_url': 'http://www.flickr.com/photos/kentbrew/',
+                'provider_name': 'flickr',
+              },
+              'description': 'Love my Pinterest t-shirt!',
+              'pinner': {
+                'about':
+                  "Widgeteer, Pinterest. If the Pin It button is broken or confusing, it's my fault.",
+                'location': 'Runnymede Poultry Colony',
+                'full_name': 'Kent Brewster',
+                'follower_count': 4292,
+                'image_small_url':
+                  'https://i.pinimg.com/30x30_RS/dc/24/76/dc2476722ee6e8c12b6a93d8ac5b6a4d.jpg',
+                'pin_count': 5068,
+                'id': '99360872937292935',
+                'profile_url': 'https://www.pinterest.com/kentbrew/',
+              },
+              'repin_count': 3444,
+              'aggregated_pin_data': {
+                'aggregated_stats': {'saves': 109743, 'done': 90},
+              },
+              'rich_metadata': {
+                'aggregated_app_link': {
+                  'ipad': null,
+                  'android': null,
+                  'ios': {
+                    'app_url': 'flickr://flickr.com/photos/kentbrew/6851755809',
+                    'app_name': 'Flickr',
+                    'app_id': '328407587',
+                  },
+                  'iphone': {
+                    'app_url':
+                      'flickr://flickr.com/photos/kentbrew/6851755809/',
+                    'app_name': 'Flickr',
+                    'app_id': '328407587',
+                  },
+                },
+                'has_price_drop': false,
+                'site_name': 'Flickr',
+                'description':
+                  'Today was my last day at Lexity. Next up?  A little start-up in Palo Alto.',
+                'link_status': 0,
+                'title': 'Next stop: Pinterest!',
+                'locale': 'en',
+                'amp_valid': false,
+                'amp_url': '',
+                'url': 'http://www.flickr.com/photos/kentbrew/6851755809/',
+                'tracker': null,
+                'apple_touch_icon_link':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4',
+                'favicon_images': {
+                  'orig':
+                    'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433',
+                },
+                'article': {
+                  'description':
+                    'Today was my last day at Lexity. Next up? A little start-up in Palo Alto.',
+                  'date_published': null,
+                  'authors': [],
+                  'type': 'articlemetadata',
+                  'id': '140248253674512',
+                  'name': 'Next stop: Pinterest!',
+                },
+                'type': 'richpindataview',
+                'id': '811ea1aef1bcaf6342a725365871d79d',
+                'apple_touch_icon_images': {
+                  'orig':
+                    'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4',
+                },
+                'favicon_link':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433',
+              },
+              'dominant_color': '#e77b60',
+              'link': 'http://www.flickr.com/photos/kentbrew/6851755809/',
+              'board': {
+                'description':
+                  "Some of the fun we're having bringing Pinterest to life!",
+                'url': '/kentbrew/adventures-at-pinterest/',
+                'follower_count': 1128,
+                'image_thumbnail_url':
+                  'https://s-media-cache-ak0.pinimg.com/upload/99360804217844427_board_thumbnail_2017-07-07-20-33-41_48158_60.jpg',
+                'pin_count': 151,
+                'id': '99360804217844427',
+                'name': 'Adventures at Pinterest',
+              },
+              'videos': null,
+              'images': {
+                '237x': {
+                  'url':
+                    'https://i.pinimg.com/237x/a7/66/56/a76656e966b1958f568d63c3f1c05aec.jpg',
+                  'width': 237,
+                  'height': 177,
+                },
+              },
+              'embed': null,
+              'is_video': false,
+              'id': '99360735500167749',
+            },
+          ],
+        }
+      ).then(pin => {
+        const img = pin.querySelector('img');
+        expect(img.getAttribute('alt')).to.equal(
+          'Hands making heart over Pinterest logo'
+        );
+      });
     });
-  });
 
-  it('sets alternate text from pin data provided by Pinterest API', () => {
-    return getEmbedPin('228065168607834583',
-        null,
-        {'status': 'success', 'message': 'OK', 'code': 0, 'data': [{'domain': 'flickr.com', 'attribution': {'author_name': 'P Matthews 86', 'title': 'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california', 'provider_favicon_url': 'https://s.pinimg.com/images/api/attrib/flickr.png', 'provider_icon_url': 'https://s.pinimg.com/images/api/attrib/flickr@2x.png', 'url': 'https://www.flickr.com/photos/p_matthews_86/23103592020/', 'author_url': 'https://www.flickr.com/photos/p_matthews_86/', 'cc_url': 'https://creativecommons.org/licenses/by-sa/2.0/', 'provider_name': 'flickr'}, 'description': 'via Instagram ift.tt/1l0lAnd', 'pinner': {'about': '', 'location': 'London', 'full_name': 'Paul Matthews', 'follower_count': 10, 'image_small_url': 'https://i.pinimg.com/30x30_RS/f0/3e/21/f03e21f499084c44fca771555f547474.jpg', 'pin_count': 196, 'id': '228065306038242568', 'profile_url': 'https://www.pinterest.com/paulmatthews86/'}, 'repin_count': 2, 'aggregated_pin_data': {'aggregated_stats': {'saves': 3, 'done': 0}}, 'rich_metadata': {'aggregated_app_link': {'ipad': null, 'android': null, 'ios': {'app_url': 'flickr://flickr.com/photos/p_matthews_86/23103592020', 'app_name': 'Flickr', 'app_id': '328407587'}, 'iphone': {'app_url': 'flickr://flickr.com/photos/p_matthews_86/23103592020/', 'app_name': 'Flickr', 'app_id': '328407587'}}, 'has_price_drop': false, 'site_name': 'Flickr', 'description': 'via Instagram ift.tt/1l0lAnd', 'link_status': 0, 'title': 'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california', 'locale': 'en', 'amp_valid': false, 'amp_url': '', 'url': 'https://www.flickr.com/photos/p_matthews_86/23103592020/', 'tracker': null, 'apple_touch_icon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4', 'favicon_images': {'50x': 'https://s-media-cache-ak0.pinimg.com/favicons/50x/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.png?d0236f158c380b9595ffa7c7d7d1a433', 'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433'}, 'article': {'description': 'via Instagram ift.tt/1l0lAnd', 'date_published': null, 'authors': [], 'type': 'articlemetadata', 'id': '140701728102800', 'name': 'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california'}, 'type': 'richpindataview', 'id': '1a34d5ec8881989566875143f933e0ef', 'apple_touch_icon_images': {'50x': 'https://s-media-cache-ak0.pinimg.com/favicons/50x/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4', 'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4'}, 'favicon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433'}, 'dominant_color': '#4d4d4d', 'link': 'https://www.flickr.com/photos/p_matthews_86/23103592020/', 'board': {'description': "Photos I've created or love.", 'url': '/paulmatthews86/my-photography/', 'follower_count': 6, 'image_thumbnail_url': 'https://s-media-cache-ak0.pinimg.com/upload/228065237318945897_board_thumbnail_2016-05-18-04-07-13_17500_60.jpg', 'pin_count': 1, 'id': '228065237318945897', 'name': 'My Photography'}, 'videos': null, 'images': {'237x': {'url': 'https://i.pinimg.com/237x/83/50/e6/8350e634feec9c503b3c296677cb9367.jpg', 'width': 237, 'height': 158}}, 'embed': null, 'is_video': false, 'id': '228065168607834583'}]}
-    ).then(pin => {
-      const img = pin.querySelector('img');
-      expect(img.getAttribute('alt')).to.equal('End of the line Riding the ' +
-        'rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline ' +
-        '#tourist #rails #saturdayafternoon #california');
+    it('sets alternate text from pin data provided by Pinterest API', () => {
+      return getEmbedPin('228065168607834583', null, {
+        'status': 'success',
+        'message': 'OK',
+        'code': 0,
+        'data': [
+          {
+            'domain': 'flickr.com',
+            'attribution': {
+              'author_name': 'P Matthews 86',
+              'title':
+                'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california',
+              'provider_favicon_url':
+                'https://s.pinimg.com/images/api/attrib/flickr.png',
+              'provider_icon_url':
+                'https://s.pinimg.com/images/api/attrib/flickr@2x.png',
+              'url': 'https://www.flickr.com/photos/p_matthews_86/23103592020/',
+              'author_url': 'https://www.flickr.com/photos/p_matthews_86/',
+              'cc_url': 'https://creativecommons.org/licenses/by-sa/2.0/',
+              'provider_name': 'flickr',
+            },
+            'description': 'via Instagram ift.tt/1l0lAnd',
+            'pinner': {
+              'about': '',
+              'location': 'London',
+              'full_name': 'Paul Matthews',
+              'follower_count': 10,
+              'image_small_url':
+                'https://i.pinimg.com/30x30_RS/f0/3e/21/f03e21f499084c44fca771555f547474.jpg',
+              'pin_count': 196,
+              'id': '228065306038242568',
+              'profile_url': 'https://www.pinterest.com/paulmatthews86/',
+            },
+            'repin_count': 2,
+            'aggregated_pin_data': {
+              'aggregated_stats': {'saves': 3, 'done': 0},
+            },
+            'rich_metadata': {
+              'aggregated_app_link': {
+                'ipad': null,
+                'android': null,
+                'ios': {
+                  'app_url':
+                    'flickr://flickr.com/photos/p_matthews_86/23103592020',
+                  'app_name': 'Flickr',
+                  'app_id': '328407587',
+                },
+                'iphone': {
+                  'app_url':
+                    'flickr://flickr.com/photos/p_matthews_86/23103592020/',
+                  'app_name': 'Flickr',
+                  'app_id': '328407587',
+                },
+              },
+              'has_price_drop': false,
+              'site_name': 'Flickr',
+              'description': 'via Instagram ift.tt/1l0lAnd',
+              'link_status': 0,
+              'title':
+                'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california',
+              'locale': 'en',
+              'amp_valid': false,
+              'amp_url': '',
+              'url': 'https://www.flickr.com/photos/p_matthews_86/23103592020/',
+              'tracker': null,
+              'apple_touch_icon_link':
+                'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4',
+              'favicon_images': {
+                '50x':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/50x/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.png?d0236f158c380b9595ffa7c7d7d1a433',
+                'orig':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433',
+              },
+              'article': {
+                'description': 'via Instagram ift.tt/1l0lAnd',
+                'date_published': null,
+                'authors': [],
+                'type': 'articlemetadata',
+                'id': '140701728102800',
+                'name':
+                  'End of the line Riding the rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline #tourist #rails #saturdayafternoon #california',
+              },
+              'type': 'richpindataview',
+              'id': '1a34d5ec8881989566875143f933e0ef',
+              'apple_touch_icon_images': {
+                '50x':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/50x/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4',
+                'orig':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/b4ef6053716205a6beab42b56030364fc1e6dce4e62e863b3e4adb0e.png?a4077badc755ea44f96490b95c0278a4',
+              },
+              'favicon_link':
+                'https://s-media-cache-ak0.pinimg.com/favicons/f1def2d953077deabc5605a6c5f00f6f361a2c491b0ec4bd08f77659.ico?d0236f158c380b9595ffa7c7d7d1a433',
+            },
+            'dominant_color': '#4d4d4d',
+            'link': 'https://www.flickr.com/photos/p_matthews_86/23103592020/',
+            'board': {
+              'description': "Photos I've created or love.",
+              'url': '/paulmatthews86/my-photography/',
+              'follower_count': 6,
+              'image_thumbnail_url':
+                'https://s-media-cache-ak0.pinimg.com/upload/228065237318945897_board_thumbnail_2016-05-18-04-07-13_17500_60.jpg',
+              'pin_count': 1,
+              'id': '228065237318945897',
+              'name': 'My Photography',
+            },
+            'videos': null,
+            'images': {
+              '237x': {
+                'url':
+                  'https://i.pinimg.com/237x/83/50/e6/8350e634feec9c503b3c296677cb9367.jpg',
+                'width': 237,
+                'height': 158,
+              },
+            },
+            'embed': null,
+            'is_video': false,
+            'id': '228065168607834583',
+          },
+        ],
+      }).then(pin => {
+        const img = pin.querySelector('img');
+        expect(img.getAttribute('alt')).to.equal(
+          'End of the line Riding the ' +
+            'rails in SF, cable car rails #cablecar #sanfrancisco #endoftheline ' +
+            '#tourist #rails #saturdayafternoon #california'
+        );
+      });
     });
-  });
 
-  it('no alternate text and no title provided by the Pinterest API', () => {
-    return getEmbedPin('445786063109072175',
-        null,
-        {'status': 'success', 'message': 'OK', 'code': 0, 'data': [{'domain': 'imgur.com', 'attribution': null, 'description': 'If I ever have a giant yard and home I am getting a Irish Wolfhound. Beautiful dogs.', 'pinner': {'about': '', 'location': '', 'full_name': 'Anne Boudka', 'follower_count': 14, 'image_small_url': 'https://s.pinimg.com/images/user/default_30.png', 'pin_count': 1560, 'id': '445786200523974985', 'profile_url': 'https://www.pinterest.com/anneboudka/'}, 'repin_count': 1, 'aggregated_pin_data': {'aggregated_stats': {'saves': 678, 'done': 1}}, 'rich_metadata': {'has_price_drop': false, 'site_name': 'Imgur', 'description': 'Post with 656 views. Irish Wolfhound', 'link_status': 0, 'title': 'Irish Wolfhound', 'locale': 'en', 'type': 'richpindataview', 'amp_url': '', 'url': 'http://imgur.com/QGnHw16', 'tracker': null, 'apple_touch_icon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/8d71febee58903bfed9de51eb45c39a7c216fb5ac4b5ecc0f311ae9f.png?9ebf5c7a5a3f79024a5a95daf121f66e', 'favicon_images': {'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/7fc3853e33daef02c3ad177f2c983104ec4807da1b9ca187a492ae9d.ico?c2aa5cd03b44bb2ff874837bc56cd85e'}, 'article': {'description': 'Imgur: The most awesome images on the Internet.', 'date_published': null, 'authors': [{'type': 'personmetadata', 'name': 'Imgur', 'id': '140712605429840'}], 'type': 'articlemetadata', 'id': '140712605432336', 'name': 'Irish Wolfhound'}, 'amp_valid': false, 'id': '530b8a3dcee558b2445cfb7fd7dd78d3', 'apple_touch_icon_images': {'orig': 'https://s-media-cache-ak0.pinimg.com/favicons/8d71febee58903bfed9de51eb45c39a7c216fb5ac4b5ecc0f311ae9f.png?9ebf5c7a5a3f79024a5a95daf121f66e'}, 'favicon_link': 'https://s-media-cache-ak0.pinimg.com/favicons/7fc3853e33daef02c3ad177f2c983104ec4807da1b9ca187a492ae9d.ico?c2aa5cd03b44bb2ff874837bc56cd85e'}, 'dominant_color': '#1a1514', 'link': 'http://imgur.com/QGnHw16', 'board': {'description': '', 'url': '/anneboudka/amour/', 'follower_count': 11, 'image_thumbnail_url': 'https://s-media-cache-ak0.pinimg.com/upload/445786131804942196_board_thumbnail_2018-01-18-17-19-13_4918_60.jpg', 'pin_count': 781, 'id': '445786131804942196', 'name': 'Amour'}, 'videos': null, 'images': {'237x': {'url': 'https://i.pinimg.com/237x/b5/34/c1/b534c180c410553cae7b487536b4f226.jpg', 'width': 237, 'height': 355}}, 'embed': null, 'is_video': false, 'id': '445786063109072175'}]}
-    ).then(pin => {
-      const img = pin.querySelector('img');
-      expect(img.getAttribute('alt')).to.be.null;
+    it('no alternate text and no title provided by the Pinterest API', () => {
+      return getEmbedPin('445786063109072175', null, {
+        'status': 'success',
+        'message': 'OK',
+        'code': 0,
+        'data': [
+          {
+            'domain': 'imgur.com',
+            'attribution': null,
+            'description':
+              'If I ever have a giant yard and home I am getting a Irish Wolfhound. Beautiful dogs.',
+            'pinner': {
+              'about': '',
+              'location': '',
+              'full_name': 'Anne Boudka',
+              'follower_count': 14,
+              'image_small_url':
+                'https://s.pinimg.com/images/user/default_30.png',
+              'pin_count': 1560,
+              'id': '445786200523974985',
+              'profile_url': 'https://www.pinterest.com/anneboudka/',
+            },
+            'repin_count': 1,
+            'aggregated_pin_data': {
+              'aggregated_stats': {'saves': 678, 'done': 1},
+            },
+            'rich_metadata': {
+              'has_price_drop': false,
+              'site_name': 'Imgur',
+              'description': 'Post with 656 views. Irish Wolfhound',
+              'link_status': 0,
+              'title': 'Irish Wolfhound',
+              'locale': 'en',
+              'type': 'richpindataview',
+              'amp_url': '',
+              'url': 'http://imgur.com/QGnHw16',
+              'tracker': null,
+              'apple_touch_icon_link':
+                'https://s-media-cache-ak0.pinimg.com/favicons/8d71febee58903bfed9de51eb45c39a7c216fb5ac4b5ecc0f311ae9f.png?9ebf5c7a5a3f79024a5a95daf121f66e',
+              'favicon_images': {
+                'orig':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/7fc3853e33daef02c3ad177f2c983104ec4807da1b9ca187a492ae9d.ico?c2aa5cd03b44bb2ff874837bc56cd85e',
+              },
+              'article': {
+                'description':
+                  'Imgur: The most awesome images on the Internet.',
+                'date_published': null,
+                'authors': [
+                  {
+                    'type': 'personmetadata',
+                    'name': 'Imgur',
+                    'id': '140712605429840',
+                  },
+                ],
+                'type': 'articlemetadata',
+                'id': '140712605432336',
+                'name': 'Irish Wolfhound',
+              },
+              'amp_valid': false,
+              'id': '530b8a3dcee558b2445cfb7fd7dd78d3',
+              'apple_touch_icon_images': {
+                'orig':
+                  'https://s-media-cache-ak0.pinimg.com/favicons/8d71febee58903bfed9de51eb45c39a7c216fb5ac4b5ecc0f311ae9f.png?9ebf5c7a5a3f79024a5a95daf121f66e',
+              },
+              'favicon_link':
+                'https://s-media-cache-ak0.pinimg.com/favicons/7fc3853e33daef02c3ad177f2c983104ec4807da1b9ca187a492ae9d.ico?c2aa5cd03b44bb2ff874837bc56cd85e',
+            },
+            'dominant_color': '#1a1514',
+            'link': 'http://imgur.com/QGnHw16',
+            'board': {
+              'description': '',
+              'url': '/anneboudka/amour/',
+              'follower_count': 11,
+              'image_thumbnail_url':
+                'https://s-media-cache-ak0.pinimg.com/upload/445786131804942196_board_thumbnail_2018-01-18-17-19-13_4918_60.jpg',
+              'pin_count': 781,
+              'id': '445786131804942196',
+              'name': 'Amour',
+            },
+            'videos': null,
+            'images': {
+              '237x': {
+                'url':
+                  'https://i.pinimg.com/237x/b5/34/c1/b534c180c410553cae7b487536b4f226.jpg',
+                'width': 237,
+                'height': 355,
+              },
+            },
+            'embed': null,
+            'is_video': false,
+            'id': '445786063109072175',
+          },
+        ],
+      }).then(pin => {
+        const img = pin.querySelector('img');
+        expect(img.getAttribute('alt')).to.be.null;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-pinterest/0.1/util.js b/extensions/amp-pinterest/0.1/util.js
index cb1302ae6ebb..48d12ed03614 100644
--- a/extensions/amp-pinterest/0.1/util.js
+++ b/extensions/amp-pinterest/0.1/util.js
@@ -49,7 +49,7 @@ function filter(str) {
   ret = '';
   try {
     decoded = decodeURIComponent(str);
-  } catch (e) { }
+  } catch (e) {}
   ret = decoded.replace(/</g, '&lt;');
   ret = ret.replace(/>/g, '&gt;');
   return ret;
@@ -62,7 +62,9 @@ function filter(str) {
  * @return {Element}
  */
 function make(doc, data) {
-  let el = null, tag, attr;
+  let el = null,
+    tag,
+    attr;
   for (tag in data) {
     el = doc.createElement(tag);
     for (attr in data[tag]) {
diff --git a/extensions/amp-playbuzz/0.1/amp-playbuzz.js b/extensions/amp-playbuzz/0.1/amp-playbuzz.js
index 92a2acc606cf..67f15ac6906b 100644
--- a/extensions/amp-playbuzz/0.1/amp-playbuzz.js
+++ b/extensions/amp-playbuzz/0.1/amp-playbuzz.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Embeds an playbuzz item.
  * The src attribute can be easily copied from a normal playbuzz URL.
@@ -55,7 +54,6 @@ import {logo, showMoreArrow} from './images';
 import {removeElement} from '../../../src/dom';
 
 class AmpPlaybuzz extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -103,16 +101,20 @@ class AmpPlaybuzz extends AMP.BaseElement {
   buildCallback() {
     // EXPERIMENT
     // AMP.toggleExperiment(EXPERIMENT, true); //for dev
-    userAssert(isExperimentOn(this.win, 'amp-playbuzz'),
-        'Enable amp-playbuzz experiment');
+    userAssert(
+      isExperimentOn(this.win, 'amp-playbuzz'),
+      'Enable amp-playbuzz experiment'
+    );
 
     const e = this.element;
     const src = e.getAttribute('src');
     const itemId = e.getAttribute('data-item');
 
-    userAssert(src || itemId,
-        'Either src or data-item attribute is required for <amp-playbuzz> %s',
-        this.element);
+    userAssert(
+      src || itemId,
+      'Either src or data-item attribute is required for <amp-playbuzz> %s',
+      this.element
+    );
 
     if (src) {
       assertAbsoluteHttpOrHttpsUrl(src);
@@ -129,16 +131,17 @@ class AmpPlaybuzz extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.RESPONSIVE ||
-      layout === Layout.FIXED_HEIGHT;
+    return layout === Layout.RESPONSIVE || layout === Layout.FIXED_HEIGHT;
   }
 
   /** @override */
   createPlaceholderCallback() {
     const placeholder = this.win.document.createElement('div');
     if (this.element.hasAttribute('aria-label')) {
-      placeholder.setAttribute('aria-label', 'Loading - '
-          + this.element.getAttribute('aria-label'));
+      placeholder.setAttribute(
+        'aria-label',
+        'Loading - ' + this.element.getAttribute('aria-label')
+      );
     } else {
       placeholder.setAttribute('aria-label', 'Loading interactive element');
     }
@@ -150,7 +153,7 @@ class AmpPlaybuzz extends AMP.BaseElement {
   /** @param {!JsonObject} eventData */
   notifyIframe_(eventData) {
     const data = JSON.stringify(eventData);
-    this.iframe_.contentWindow./*OK*/postMessage(data, '*');
+    this.iframe_.contentWindow./*OK*/ postMessage(data, '*');
   }
   /**
    *
@@ -178,7 +181,6 @@ class AmpPlaybuzz extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-
     const iframe = this.element.ownerDocument.createElement('iframe');
     this.iframe_ = iframe;
     iframe.setAttribute('scrolling', 'no');
@@ -187,23 +189,31 @@ class AmpPlaybuzz extends AMP.BaseElement {
     iframe.setAttribute('allowfullscreen', 'true');
     iframe.src = this.generateEmbedSourceUrl_();
 
-    this.listenToPlaybuzzItemMessage_('resize_height',
-        utils.debounce(this.itemHeightChanged_.bind(this), 100));
+    this.listenToPlaybuzzItemMessage_(
+      'resize_height',
+      utils.debounce(this.itemHeightChanged_.bind(this), 100)
+    );
 
     this.element.appendChild(this.getOverflowElement_());
 
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
 
-    return this.iframePromise_ = this.loadPromise(iframe).then(function() {
-      this.iframeLoaded_ = true;
-      this.attemptChangeHeight(
-          dev().assertNumber(this.itemHeight_)).catch(() => {/* die */ });
-
-      const unlisten = this.getViewport().onChanged(
-          this.sendScrollDataToItem_.bind(this));
-      this.unlisteners_.push(unlisten);
-    }.bind(this));
+    return (this.iframePromise_ = this.loadPromise(iframe).then(
+      function() {
+        this.iframeLoaded_ = true;
+        this.attemptChangeHeight(dev().assertNumber(this.itemHeight_)).catch(
+          () => {
+            /* die */
+          }
+        );
+
+        const unlisten = this.getViewport().onChanged(
+          this.sendScrollDataToItem_.bind(this)
+        );
+        this.unlisteners_.push(unlisten);
+      }.bind(this)
+    ));
   }
 
   /** @return {!Element} @private */
@@ -214,13 +224,19 @@ class AmpPlaybuzz extends AMP.BaseElement {
     const loaderImage = createElement('img', 'pb_feed_anim_mask');
     loaderImage.src = logo;
 
-    const loadingPlaceholder =
-      createElement('div', 'pb_feed_placeholder_container',
-          createElement('div', 'pb_feed_placeholder_inner',
-              createElement('div', 'pb_feed_placeholder_content',
-                  createElement('div', 'pb_feed_placeholder_preloader',
-                      loaderImage)
-              )));
+    const loadingPlaceholder = createElement(
+      'div',
+      'pb_feed_placeholder_container',
+      createElement(
+        'div',
+        'pb_feed_placeholder_inner',
+        createElement(
+          'div',
+          'pb_feed_placeholder_content',
+          createElement('div', 'pb_feed_placeholder_preloader', loaderImage)
+        )
+      )
+    );
 
     return loadingPlaceholder;
   }
@@ -229,7 +245,6 @@ class AmpPlaybuzz extends AMP.BaseElement {
    * @param {number} height
    */
   itemHeightChanged_(height) {
-
     if (isNaN(height) || height === this.itemHeight_) {
       return;
     }
@@ -237,19 +252,20 @@ class AmpPlaybuzz extends AMP.BaseElement {
     this.itemHeight_ = height; //Save new height
 
     if (this.iframeLoaded_) {
-      this.attemptChangeHeight(this.itemHeight_).catch(() => {/* die */ });
+      this.attemptChangeHeight(this.itemHeight_).catch(() => {
+        /* die */
+      });
     }
   }
 
-
   /**
    * @param {string} messageName
    * @param {Function} handler
    */
   listenToPlaybuzzItemMessage_(messageName, handler) {
-    const unlisten = events.listen(this.win, 'message',
-        event => utils.handleMessageByName(this.iframe_,
-            event, messageName, handler));
+    const unlisten = events.listen(this.win, 'message', event =>
+      utils.handleMessageByName(this.iframe_, event, messageName, handler)
+    );
     this.unlisteners_.push(unlisten);
   }
 
@@ -317,7 +333,6 @@ class AmpPlaybuzz extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-playbuzz', '0.1', AMP => {
   AMP.registerElement('amp-playbuzz', AmpPlaybuzz, CSS);
 });
diff --git a/extensions/amp-playbuzz/0.1/test/test-amp-playbuzz.js b/extensions/amp-playbuzz/0.1/test/test-amp-playbuzz.js
index 908cd5c60fcf..a9cea0ca0eaf 100644
--- a/extensions/amp-playbuzz/0.1/test/test-amp-playbuzz.js
+++ b/extensions/amp-playbuzz/0.1/test/test-amp-playbuzz.js
@@ -17,181 +17,203 @@
 import '../amp-playbuzz';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
 function startsWith(string, searchString) {
   return string.substr(0, searchString.length) === searchString;
 }
 
-describes.realWin('amp-playbuzz', {
-  amp: {
-    extensions: ['amp-playbuzz'],
+describes.realWin(
+  'amp-playbuzz',
+  {
+    amp: {
+      extensions: ['amp-playbuzz'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    toggleExperiment(win, 'amp-playbuzz', true);
-  });
-
-  function createOptionalParams(displayInfo, displayShareBar, displayComments) {
-    return {
-      displayItemInfo: displayInfo,
-      displayShareBar,
-      displayComments,
-    };
-  }
+  env => {
+    let win, doc;
 
-  function createItemSrc() {
-    return {
-      withUrl(itemUrl) {
-        this.itemUrl = itemUrl;
-        return this;
-      },
-      withItemId(itemId) {
-        this.itemId = itemId;
-        return this;
-      },
-    };
-  }
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      toggleExperiment(win, 'amp-playbuzz', true);
+    });
 
-  function getIns(itemSrc, params, opt_responsive, opt_beforeLayoutCallback) {
-    const ins = doc.createElement('amp-playbuzz');
-    if (itemSrc.itemUrl) {
-      ins.setAttribute('src', itemSrc.itemUrl);
-    }
-    if (itemSrc.itemId) {
-      ins.setAttribute('data-item', itemSrc.itemId);
-    }
-    ins.setAttribute('width', '111');
-    ins.setAttribute('height', '222');
-    ins.setAttribute('alt', 'Testing');
-    if (opt_responsive) {
-      ins.setAttribute('layout', 'responsive');
-    }
-    if (params && typeof params.displayItemInfo === 'boolean') {
-      ins.setAttribute('data-item-info', params.displayItemInfo);
-    }
-    if (params && typeof params.displayShareBar === 'boolean') {
-      ins.setAttribute('data-share-buttons', params.displayShareBar);
-    }
-    if (params && typeof params.displayComments === 'boolean') {
-      ins.setAttribute('data-comments', params.displayComments);
+    function createOptionalParams(
+      displayInfo,
+      displayShareBar,
+      displayComments
+    ) {
+      return {
+        displayItemInfo: displayInfo,
+        displayShareBar,
+        displayComments,
+      };
     }
-    if (params && params.arialabel) {
-      ins.setAttribute('aria-label', params.arialabel);
+
+    function createItemSrc() {
+      return {
+        withUrl(itemUrl) {
+          this.itemUrl = itemUrl;
+          return this;
+        },
+        withItemId(itemId) {
+          this.itemId = itemId;
+          return this;
+        },
+      };
     }
-    doc.body.appendChild(ins);
-    return ins.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(ins);
+
+    function getIns(itemSrc, params, opt_responsive, opt_beforeLayoutCallback) {
+      const ins = doc.createElement('amp-playbuzz');
+      if (itemSrc.itemUrl) {
+        ins.setAttribute('src', itemSrc.itemUrl);
       }
-      return ins.layoutCallback();
-    }).then(() => ins);
-  }
+      if (itemSrc.itemId) {
+        ins.setAttribute('data-item', itemSrc.itemId);
+      }
+      ins.setAttribute('width', '111');
+      ins.setAttribute('height', '222');
+      ins.setAttribute('alt', 'Testing');
+      if (opt_responsive) {
+        ins.setAttribute('layout', 'responsive');
+      }
+      if (params && typeof params.displayItemInfo === 'boolean') {
+        ins.setAttribute('data-item-info', params.displayItemInfo);
+      }
+      if (params && typeof params.displayShareBar === 'boolean') {
+        ins.setAttribute('data-share-buttons', params.displayShareBar);
+      }
+      if (params && typeof params.displayComments === 'boolean') {
+        ins.setAttribute('data-comments', params.displayComments);
+      }
+      if (params && params.arialabel) {
+        ins.setAttribute('aria-label', params.arialabel);
+      }
+      doc.body.appendChild(ins);
+      return ins
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(ins);
+          }
+          return ins.layoutCallback();
+        })
+        .then(() => ins);
+    }
 
-  function testIframe(iframe, itemSrcUrl) {
-    expect(iframe).to.not.be.null;
-    expect(startsWith(iframe.src, itemSrcUrl)).to.be.true;
-    expect(iframe.className).to.match(/i-amphtml-fill-content/);
-    // This is important to avoid sizing issues.
-    expect(iframe.getAttribute('scrolling')).to.equal('no');
-  }
+    function testIframe(iframe, itemSrcUrl) {
+      expect(iframe).to.not.be.null;
+      expect(startsWith(iframe.src, itemSrcUrl)).to.be.true;
+      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      // This is important to avoid sizing issues.
+      expect(iframe.getAttribute('scrolling')).to.equal('no');
+    }
 
-  it('renders', () => {
-    const src = createItemSrc().withUrl('https://www.playbuzz.com/bob/bobs-life');
-    return getIns(src).then(ins => {
-      const iframe = ins.querySelector('iframe');
-      testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
-      // TODO: test playbuzz placeholder loader
+    it('renders', () => {
+      const src = createItemSrc().withUrl(
+        'https://www.playbuzz.com/bob/bobs-life'
+      );
+      return getIns(src).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
+        // TODO: test playbuzz placeholder loader
+      });
     });
-  });
-
-  it('renders with false for each optional param', () => {
-    const src = createItemSrc().withUrl('https://www.playbuzz.com/bob/bobs-life');
-    return getIns(src).then(ins => {
-      const iframe = ins.querySelector('iframe');
-      testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
-      expect(iframe.src)
+
+    it('renders with false for each optional param', () => {
+      const src = createItemSrc().withUrl(
+        'https://www.playbuzz.com/bob/bobs-life'
+      );
+      return getIns(src).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
+        expect(iframe.src)
           .to.contain('&useComments=false')
           .and.to.contain('&gameInfo=false')
           .and.to.contain('&useShares=false');
+      });
     });
-  });
 
-  it('renders with item id instead of src', () => {
-    const src = createItemSrc().withItemId('some-item-id');
-    return getIns(src).then(ins => {
-      const iframe = ins.querySelector('iframe');
-      testIframe(iframe, '//www.playbuzz.com/item/some-item-id');
+    it('renders with item id instead of src', () => {
+      const src = createItemSrc().withItemId('some-item-id');
+      return getIns(src).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        testIframe(iframe, '//www.playbuzz.com/item/some-item-id');
+      });
     });
-  });
 
-  it('renders with item id when submitted both with item url & item id', () => {
-    const src = createItemSrc()
+    it('renders with item id when submitted both with item url & item id', () => {
+      const src = createItemSrc()
         .withUrl('https://www.playbuzz.com/bob/bobs-life')
         .withItemId('some-item-id');
 
-    return getIns(src).then(ins => {
-      const iframe = ins.querySelector('iframe');
-      testIframe(iframe, '//www.playbuzz.com/item/some-item-id');
+      return getIns(src).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        testIframe(iframe, '//www.playbuzz.com/item/some-item-id');
+      });
     });
-  });
-
-  it('renders with true for each true optional param', () => {
-    const src = createItemSrc().withUrl('https://www.playbuzz.com/bob/bobs-life');
-    return getIns(src, createOptionalParams(true, true, true)).then(ins => {
-      const iframe = ins.querySelector('iframe');
-      testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
-      expect(iframe.src)
+
+    it('renders with true for each true optional param', () => {
+      const src = createItemSrc().withUrl(
+        'https://www.playbuzz.com/bob/bobs-life'
+      );
+      return getIns(src, createOptionalParams(true, true, true)).then(ins => {
+        const iframe = ins.querySelector('iframe');
+        testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
+        expect(iframe.src)
           .to.contain('&useComments=true')
           .and.to.contain('&gameInfo=true')
           .and.to.contain('&useShares=true');
+      });
     });
-  });
-
-  it('builds a placeholder image without inserting iframe', () => {
-    const src = createItemSrc().withUrl('https://www.playbuzz.com/bob/bobs-life');
-    return getIns(src, createOptionalParams(), true, ins => {
-      // console.log(ins);
-      const placeholder = ins.querySelector('[placeholder]');
-      const iframe = ins.querySelector('iframe');
-      expect(iframe).to.be.null;
-      expect(placeholder).to.not.have.display('');
-      expect(placeholder.getAttribute('aria-label'))
-          .to.equal('Loading interactive element');
-    }).then(ins => {
-      const placeholder = ins.querySelector('[placeholder]');
-
-      const iframe = ins.querySelector('iframe');
-      ins.getVsync = () => {
-        return {
-          mutate: fn => fn(),
+
+    it('builds a placeholder image without inserting iframe', () => {
+      const src = createItemSrc().withUrl(
+        'https://www.playbuzz.com/bob/bobs-life'
+      );
+      return getIns(src, createOptionalParams(), true, ins => {
+        // console.log(ins);
+        const placeholder = ins.querySelector('[placeholder]');
+        const iframe = ins.querySelector('iframe');
+        expect(iframe).to.be.null;
+        expect(placeholder).to.not.have.display('');
+        expect(placeholder.getAttribute('aria-label')).to.equal(
+          'Loading interactive element'
+        );
+      }).then(ins => {
+        const placeholder = ins.querySelector('[placeholder]');
+
+        const iframe = ins.querySelector('iframe');
+        ins.getVsync = () => {
+          return {
+            mutate: fn => fn(),
+          };
         };
-      };
-      testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
-      //Should test placeholder too
-      ins.implementation_.iframePromise_.then(() => {
-        expect(placeholder).to.have.display('none');
+        testIframe(iframe, '//www.playbuzz.com/bob/bobs-life');
+        //Should test placeholder too
+        ins.implementation_.iframePromise_.then(() => {
+          expect(placeholder).to.have.display('none');
+        });
       });
     });
-  });
-  it('propagates aria label to placeholder', () => {
-    const src = createItemSrc().withUrl('https://www.playbuzz.com/bob/bobs-life');
-    return getIns(src, {'arialabel': 'captivating quiz'}, true, ins => {
-      // console.log(ins);
-      const placeholder = ins.querySelector('[placeholder]');
-      expect(placeholder.getAttribute('aria-label'))
-          .to.equal('Loading - captivating quiz');
-
+    it('propagates aria label to placeholder', () => {
+      const src = createItemSrc().withUrl(
+        'https://www.playbuzz.com/bob/bobs-life'
+      );
+      return getIns(src, {'arialabel': 'captivating quiz'}, true, ins => {
+        // console.log(ins);
+        const placeholder = ins.querySelector('[placeholder]');
+        expect(placeholder.getAttribute('aria-label')).to.equal(
+          'Loading - captivating quiz'
+        );
+      });
     });
-  });
-  it('requires item attribute', () => {
-    const src = createItemSrc().withUrl('');
-    allowConsoleError(() => {
-      expect(getIns(src)).to.be.rejectedWith(
-          /The item attribute is required for/);
+    it('requires item attribute', () => {
+      const src = createItemSrc().withUrl('');
+      allowConsoleError(() => {
+        expect(getIns(src)).to.be.rejectedWith(
+          /The item attribute is required for/
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-playbuzz/0.1/utils.js b/extensions/amp-playbuzz/0.1/utils.js
index 584e858495de..9bd00aefa5a3 100644
--- a/extensions/amp-playbuzz/0.1/utils.js
+++ b/extensions/amp-playbuzz/0.1/utils.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {dict} from './../../../src/utils/object';
 import {getData} from './../../../src/event-helper';
 import {parseJson} from './../../../src/json';
@@ -37,17 +36,21 @@ import {rethrowAsync} from './../../../src/log';
 export function debounce(func, wait, immediate) {
   let timeout;
   return function() {
-    const context = this, args = arguments;
+    const context = this,
+      args = arguments;
     clearTimeout(timeout);
     timeout = setTimeout(function() {
       timeout = null;
-      if (!immediate) { func.apply(context, args); }
+      if (!immediate) {
+        func.apply(context, args);
+      }
     }, wait);
-    if (immediate && !timeout) { func.apply(context, args); }
+    if (immediate && !timeout) {
+      func.apply(context, args);
+    }
   };
 }
 
-
 /**
  *
  * Gets an element creator using a given document to create elements.
@@ -71,11 +74,10 @@ export function getElementCreator(document) {
  * @param {!Array<!Element>} children
  */
 function appendChildren(element, children) {
-  children = (!children) ? [] : Array.isArray(children) ? children : [children];
+  children = !children ? [] : Array.isArray(children) ? children : [children];
   children.forEach(child => element.appendChild(child));
 }
 
-
 /**
  * Handles a message from element by a given message name
  *
@@ -104,7 +106,6 @@ function handlePlaybuzzItemEvent(event, eventName, handler) {
   }
 }
 
-
 /**
  * Parses Playbuzz Event Data
  *
@@ -120,8 +121,7 @@ function parsePlaybuzzEventData(data) {
     if (typeof data === 'string') {
       return parseJson(/** @type {string} */ (data));
     }
-  }
-  catch (e) {
+  } catch (e) {
     rethrowAsync('amp-playbuzz', err, e);
     return dict({});
   }
@@ -130,27 +130,31 @@ function parsePlaybuzzEventData(data) {
   return dict({});
 }
 
-
 /**
  * @param {Object} options
  * @return {string} playbuzzEmbedUrl
  */
 export function composeEmbedUrl(options) {
-  const embedUrl = options.itemUrl + '?' + serializeQueryString(dict({
-    'feed': true,
-    'implementation': 'amp',
-    'src': options.itemUrl,
-    'embedBy': '00000000-0000-0000-0000-000000000000',
-    'game': options.relativeUrl,
-    'comments': undefined,
-    'useComments': options.displayComments,
-    'gameInfo': options.displayItemInfo,
-    'useShares': options.displayShareBar,
-    'socialReferrer': false, //always false - will use parent url for sharing
-    'height': 'auto', //must pass as is - if not, makes problems in trivia (iframe height scrolling)
-    'parentUrl': options.parentUrl, //used for sharing
-    'parentHost': options.parentHost,
-  }));
+  const embedUrl =
+    options.itemUrl +
+    '?' +
+    serializeQueryString(
+      dict({
+        'feed': true,
+        'implementation': 'amp',
+        'src': options.itemUrl,
+        'embedBy': '00000000-0000-0000-0000-000000000000',
+        'game': options.relativeUrl,
+        'comments': undefined,
+        'useComments': options.displayComments,
+        'gameInfo': options.displayItemInfo,
+        'useShares': options.displayShareBar,
+        'socialReferrer': false, //always false - will use parent url for sharing
+        'height': 'auto', //must pass as is - if not, makes problems in trivia (iframe height scrolling)
+        'parentUrl': options.parentUrl, //used for sharing
+        'parentHost': options.parentHost,
+      })
+    );
   return embedUrl;
 }
 
@@ -161,8 +165,7 @@ export function composeEmbedUrl(options) {
  * @return {string}
  */
 function sanitizeUrl(localtion) {
-  return removeFragment(localtion.href)
-      .replace(localtion.protocol, ''); //remove scheme (cors) & fragment
+  return removeFragment(localtion.href).replace(localtion.protocol, ''); //remove scheme (cors) & fragment
 }
 
 /**
@@ -175,9 +178,9 @@ function sanitizeUrl(localtion) {
 export function composeItemSrcUrl(src, itemId) {
   const DEFAULT_BASE_URL = '//www.playbuzz.com/';
 
-  const iframeSrcUrl = itemId ?
-    DEFAULT_BASE_URL + 'item/' + itemId :
-    sanitizeUrl(parseUrlDeprecated(src));
+  const iframeSrcUrl = itemId
+    ? DEFAULT_BASE_URL + 'item/' + itemId
+    : sanitizeUrl(parseUrlDeprecated(src));
 
   return iframeSrcUrl;
 }
diff --git a/extensions/amp-position-observer/0.1/amp-position-observer.js b/extensions/amp-position-observer/0.1/amp-position-observer.js
index 4a94afc1e74c..a774e068a9ce 100644
--- a/extensions/amp-position-observer/0.1/amp-position-observer.js
+++ b/extensions/amp-position-observer/0.1/amp-position-observer.js
@@ -15,9 +15,7 @@
  */
 
 import {ActionTrust} from '../../../src/action-constants';
-import {
-  PositionObserverFidelity,
-} from '../../../src/service/position-observer/position-observer-worker';
+import {PositionObserverFidelity} from '../../../src/service/position-observer/position-observer-worker';
 import {
   RelativePositions,
   layoutRectLtwh,
@@ -34,9 +32,7 @@ import {createCustomEvent} from '../../../src/event-helper';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getServiceForDoc} from '../../../src/service';
-import {
-  installPositionObserverServiceForDoc,
-} from '../../../src/service/position-observer/position-observer-impl';
+import {installPositionObserverServiceForDoc} from '../../../src/service/position-observer/position-observer-impl';
 
 const TAG = 'amp-position-observer';
 
@@ -56,7 +52,6 @@ const RESIZE_THRESHOLD = 150;
 let PositionInViewportEntryDef;
 
 export class AmpVisibilityObserver extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -132,13 +127,18 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     this.action_ = Services.actionServiceForDoc(this.element);
     this.viewport_ = Services.viewportForDoc(this.element);
     this.maybeInstallPositionObserver_();
-    this.getAmpDoc().whenReady().then(() => {
-      const scene = this.discoverScene_();
-      this.positionObserver_.observe(scene, PositionObserverFidelity.HIGH,
-          /** @type {function(?PositionInViewportEntryDef)} */ (
-            this.positionChanged_.bind(this))
-      );
-    });
+    this.getAmpDoc()
+      .whenReady()
+      .then(() => {
+        const scene = this.discoverScene_();
+        this.positionObserver_.observe(
+          scene,
+          PositionObserverFidelity.HIGH,
+          /** @type {function(?PositionInViewportEntryDef)} */ (this.positionChanged_.bind(
+            this
+          ))
+        );
+      });
   }
 
   /**
@@ -177,11 +177,14 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
       'initial-inview-percent': this.scrollProgress_,
     });
     const name = 'scroll';
-    const event = createCustomEvent(this.win, `${TAG}.${name}`,
-        dict({
-          'percent': this.scrollProgress_,
-          'positionObserverData': positionObserverData}
-        ));
+    const event = createCustomEvent(
+      this.win,
+      `${TAG}.${name}`,
+      dict({
+        'percent': this.scrollProgress_,
+        'positionObserverData': positionObserverData,
+      })
+    );
     this.action_.trigger(this.element, name, event, ActionTrust.LOW);
     // TODO(nainar): We want to remove the position observer if the scroll
     // event is only used by the AnimationWorklet codepath of amp-animation.
@@ -191,7 +194,6 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     // that `enter` and `exit` events are not used.
   }
 
-
   /**
    * Called by position observer.
    * It calculates visibility and progress, and triggers the appropriate events.
@@ -199,7 +201,6 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    * @private
    */
   positionChanged_(entry) {
-
     if (this.runOnce_ && this.firstIterationComplete_) {
       return;
     }
@@ -230,8 +231,6 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
       this.updateVisibility_(positionRect, adjViewportRect, relPos);
     }
 
-
-
     if (wasVisible && !this.isVisible_) {
       // Send final scroll progress state before exiting to handle fast-scroll.
       this.scrollProgress_ = relPos == RelativePositions.BOTTOM ? 0 : 1;
@@ -265,16 +264,16 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
       return;
     }
 
-    const ratioToUse = relativePos == RelativePositions.TOP ?
-      this.topRatio_ : this.bottomRatio_;
+    const ratioToUse =
+      relativePos == RelativePositions.TOP ? this.topRatio_ : this.bottomRatio_;
 
     const offset = positionRect.height * ratioToUse;
     if (relativePos == RelativePositions.BOTTOM) {
       this.isVisible_ =
-        positionRect.top <= (adjustedViewportRect.bottom - offset);
+        positionRect.top <= adjustedViewportRect.bottom - offset;
     } else {
       this.isVisible_ =
-        positionRect.bottom >= (adjustedViewportRect.top + offset);
+        positionRect.bottom >= adjustedViewportRect.top + offset;
     }
   }
 
@@ -295,17 +294,17 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     if (!positionRect) {
       return;
     }
-    const totalProgressOffset = (positionRect.height * this.bottomRatio_) +
-        (positionRect.height * this.topRatio_);
+    const totalProgressOffset =
+      positionRect.height * this.bottomRatio_ +
+      positionRect.height * this.topRatio_;
 
-    const totalProgress = adjustedViewportRect.height +
-        positionRect.height - totalProgressOffset;
+    const totalProgress =
+      adjustedViewportRect.height + positionRect.height - totalProgressOffset;
 
     const topOffset = Math.abs(
-        positionRect.top - this.resolvedTopMargin_ -
-        (adjustedViewportRect.height -
-            (positionRect.height * this.bottomRatio_)
-        )
+      positionRect.top -
+        this.resolvedTopMargin_ -
+        (adjustedViewportRect.height - positionRect.height * this.bottomRatio_)
     );
 
     this.scrollProgress_ = topOffset / totalProgress;
@@ -354,8 +353,9 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     let scene;
     if (this.targetId_) {
       scene = user().assertElement(
-          this.getAmpDoc().getElementById(this.targetId_),
-          'No element found with id:' + this.targetId_);
+        this.getAmpDoc().getElementById(this.targetId_),
+        'No element found with id:' + this.targetId_
+      );
     } else {
       scene = this.element.parentNode;
     }
@@ -380,8 +380,10 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     if (!num) {
       return 0;
     }
-    userAssert(unit == 'px' || unit == 'vh', 'Only pixel or vh are valid ' +
-      'as units for exclusion margins: ' + val);
+    userAssert(
+      unit == 'px' || unit == 'vh',
+      'Only pixel or vh are valid as units for exclusion margins: ' + val
+    );
 
     if (unit == 'vh') {
       num = (num / 100) * this.viewportRect_.height;
@@ -397,8 +399,10 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
    */
   validateAndResolveRatio_(val) {
     const num = parseFloat(val);
-    userAssert(num >= 0 && num <= 1,
-        'Ratios must be a decimal between 0 and 1: ' + val);
+    userAssert(
+      num >= 0 && num <= 1,
+      'Ratios must be a decimal between 0 and 1: ' + val
+    );
     return num;
   }
 
@@ -412,11 +416,13 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     devAssert(this.bottomMarginExpr_);
     devAssert(this.topMarginExpr_);
 
-    this.resolvedTopMargin_ =
-        this.validateAndResolveMargin_(this.topMarginExpr_);
+    this.resolvedTopMargin_ = this.validateAndResolveMargin_(
+      this.topMarginExpr_
+    );
 
-    this.resolvedBottomMargin_ =
-        this.validateAndResolveMargin_(this.bottomMarginExpr_);
+    this.resolvedBottomMargin_ = this.validateAndResolveMargin_(
+      this.bottomMarginExpr_
+    );
   }
 
   /**
@@ -427,10 +433,10 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
   applyMargins_(rect) {
     devAssert(rect);
     rect = layoutRectLtwh(
-        rect.left,
-        (rect.top + this.resolvedTopMargin_),
-        rect.width,
-        (rect.height - this.resolvedBottomMargin_ - this.resolvedTopMargin_)
+      rect.left,
+      rect.top + this.resolvedTopMargin_,
+      rect.width,
+      rect.height - this.resolvedBottomMargin_ - this.resolvedTopMargin_
     );
 
     return rect;
@@ -448,8 +454,8 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     if (!this.initialViewportHeight_) {
       this.initialViewportHeight_ = entry.viewportRect.height;
     }
-    const viewportHeightChangeDelta = (this.initialViewportHeight_ -
-      entry.viewportRect.height);
+    const viewportHeightChangeDelta =
+      this.initialViewportHeight_ - entry.viewportRect.height;
     let resizeOffset = 0;
     if (Math.abs(viewportHeightChangeDelta) < RESIZE_THRESHOLD) {
       resizeOffset = viewportHeightChangeDelta;
@@ -457,10 +463,10 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
       this.initialViewportHeight_ = null;
     }
     entry.viewportRect = layoutRectLtwh(
-        entry.viewportRect.left,
-        entry.viewportRect.top,
-        entry.viewportRect.width,
-        entry.viewportRect.height + resizeOffset
+      entry.viewportRect.left,
+      entry.viewportRect.top,
+      entry.viewportRect.width,
+      entry.viewportRect.height + resizeOffset
     );
   }
 
@@ -471,8 +477,8 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
     if (!this.positionObserver_) {
       installPositionObserverServiceForDoc(this.getAmpDoc());
       this.positionObserver_ = getServiceForDoc(
-          this.getAmpDoc(),
-          'position-observer'
+        this.getAmpDoc(),
+        'position-observer'
       );
     }
   }
@@ -487,7 +493,6 @@ export class AmpVisibilityObserver extends AMP.BaseElement {
       this.positionObserver_ = null;
     }
   }
-
 }
 
 AMP.extension(TAG, '0.1', AMP => {
diff --git a/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js b/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
index ddd2f643bccf..a71e0afb7120 100644
--- a/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
+++ b/extensions/amp-position-observer/0.1/test/test-amp-position-observer.js
@@ -328,53 +328,58 @@ describes.sandboxed('amp-position-observer', {}, () => {
     });
 
     describe('attribute `once` specified', () => {
-      it('should not trigger functions is `once` is specified - ' +
-        'scroll from bottom to top', () => {
-        init('0', '0', true);
-        expect(enterSpy).not.to.be.called;
-        setPosition(INSIDE_VP);
-        expect(enterSpy).to.be.calledOnce;
-        expect(scrollSpy).to.be.calledOnce;
-
-        resetSpies();
-        setPosition(ABOVE_VP);
-        expect(exitSpy).to.be.calledOnce;
-        expect(scrollSpy).to.be.calledOnce;
-
-        resetSpies();
-        setPosition(INSIDE_VP);
-        expect(scrollSpy).not.to.be.called;
-        expect(enterSpy).not.to.be.called;
-        expect(exitSpy).not.to.be.called;
-      });
-
-      it('should not trigger functions is `once` is specified - ' +
-        'scroll from top to bottom', () => {
-        init('0', '0', true);
-        expect(enterSpy).not.to.be.called;
-
-        resetSpies();
-        setPosition(ABOVE_VP);
-        expect(scrollSpy).not.to.be.called;
-        expect(enterSpy).not.to.be.called;
-        expect(exitSpy).not.to.be.called;
-
-        resetSpies();
-        setPosition(INSIDE_VP);
-        expect(scrollSpy).to.be.calledOnce;
-
-        resetSpies();
-        setPosition(BELOW_VP);
-        expect(exitSpy).to.be.calledOnce;
-        expect(scrollSpy).to.be.calledOnce;
-
-        resetSpies();
-        setPosition(INSIDE_VP);
-        expect(scrollSpy).not.to.be.called;
-        expect(enterSpy).not.to.be.called;
-        expect(exitSpy).not.to.be.called;
-      });
-
+      it(
+        'should not trigger functions is `once` is specified - ' +
+          'scroll from bottom to top',
+        () => {
+          init('0', '0', true);
+          expect(enterSpy).not.to.be.called;
+          setPosition(INSIDE_VP);
+          expect(enterSpy).to.be.calledOnce;
+          expect(scrollSpy).to.be.calledOnce;
+
+          resetSpies();
+          setPosition(ABOVE_VP);
+          expect(exitSpy).to.be.calledOnce;
+          expect(scrollSpy).to.be.calledOnce;
+
+          resetSpies();
+          setPosition(INSIDE_VP);
+          expect(scrollSpy).not.to.be.called;
+          expect(enterSpy).not.to.be.called;
+          expect(exitSpy).not.to.be.called;
+        }
+      );
+
+      it(
+        'should not trigger functions is `once` is specified - ' +
+          'scroll from top to bottom',
+        () => {
+          init('0', '0', true);
+          expect(enterSpy).not.to.be.called;
+
+          resetSpies();
+          setPosition(ABOVE_VP);
+          expect(scrollSpy).not.to.be.called;
+          expect(enterSpy).not.to.be.called;
+          expect(exitSpy).not.to.be.called;
+
+          resetSpies();
+          setPosition(INSIDE_VP);
+          expect(scrollSpy).to.be.calledOnce;
+
+          resetSpies();
+          setPosition(BELOW_VP);
+          expect(exitSpy).to.be.calledOnce;
+          expect(scrollSpy).to.be.calledOnce;
+
+          resetSpies();
+          setPosition(INSIDE_VP);
+          expect(scrollSpy).not.to.be.called;
+          expect(enterSpy).not.to.be.called;
+          expect(exitSpy).not.to.be.called;
+        }
+      );
     });
   });
 
@@ -1107,6 +1112,3 @@ describes.sandboxed('amp-position-observer', {}, () => {
     });
   });
 });
-
-
-
diff --git a/extensions/amp-powr-player/0.1/amp-powr-player.js b/extensions/amp-powr-player/0.1/amp-powr-player.js
index 86d7b45d1258..46fbbce16d13 100644
--- a/extensions/amp-powr-player/0.1/amp-powr-player.js
+++ b/extensions/amp-powr-player/0.1/amp-powr-player.js
@@ -35,16 +35,12 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
-
 /** @private @const {string} */
 const TAG = 'amp-powr-player';
 
-
 /** @private @const {!Object.<string,string>} */
 const PLAYER_EVENT_MAP = {
   'ready': VideoEvents.LOAD,
@@ -55,10 +51,8 @@ const PLAYER_EVENT_MAP = {
   'ads-ad-ended': VideoEvents.AD_END,
 };
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpPowrPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -123,13 +117,11 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
     this.iframe_ = iframe;
 
-    this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        e => this.handlePlayerMessage_(e));
+    this.unlistenMessage_ = listen(this.win, 'message', e =>
+      this.handlePlayerMessage_(e)
+    );
 
-    return this.loadPromise(iframe)
-        .then(() => this.playerReadyPromise_);
+    return this.loadPromise(iframe).then(() => this.playerReadyPromise_);
   }
 
   /**
@@ -143,10 +135,15 @@ class AmpPowrPlayer extends AMP.BaseElement {
       // We still need to check this.iframe_ as the component may have
       // been unlaid out by now.
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow. /*OK*/ postMessage(JSON.stringify(dict({
-          'command': command,
-          'args': arg,
-        })), 'https://player.powr.com');
+        this.iframe_.contentWindow./*OK*/ postMessage(
+          JSON.stringify(
+            dict({
+              'command': command,
+              'args': arg,
+            })
+          ),
+          'https://player.powr.com'
+        );
       }
     });
   }
@@ -194,8 +191,7 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
     if (eventType === 'volumechange') {
       const muted = data['muted'];
-      if (muted == null ||
-          this.muted_ == muted) {
+      if (muted == null || this.muted_ == muted) {
         return;
       }
       this.muted_ = muted;
@@ -218,10 +214,13 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
     this.playerReadyResolver_(this.iframe_);
 
-    dev().info(TAG,
-        'Player %s ready. ' +
+    dev().info(
+      TAG,
+      'Player %s ready. ' +
         'Powr Player version: %s IFrame Support version: %s',
-        this.playerId_, data['powrVersion'], data['iframeVersion']
+      this.playerId_,
+      data['powrVersion'],
+      data['iframeVersion']
     );
   }
 
@@ -232,23 +231,26 @@ class AmpPowrPlayer extends AMP.BaseElement {
   getIframeSrc_() {
     const {element: el} = this;
     const account = userAssert(
-        el.getAttribute('data-account'),
-        'The data-account attribute is required for <amp-powr-player> %s',
-        el);
+      el.getAttribute('data-account'),
+      'The data-account attribute is required for <amp-powr-player> %s',
+      el
+    );
 
     this.playerId_ = userAssert(
-        el.getAttribute('data-player'),
-        'The data-player attribute is required for <amp-powr-player> %s',
-        el);
+      el.getAttribute('data-player'),
+      'The data-player attribute is required for <amp-powr-player> %s',
+      el
+    );
 
     const video = el.getAttribute('data-video');
     const terms = el.getAttribute('data-terms');
 
     userAssert(
-        video || terms,
-        'The data-video or data-terms attribute is required for ' +
+      video || terms,
+      'The data-video or data-terms attribute is required for ' +
         '<amp-powr-player> %s',
-        el);
+      el
+    );
 
     const srcPrefix = 'https://player.powr.com/iframe.html';
 
@@ -270,8 +272,8 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
     if (customReferrer) {
       el.setAttribute(
-          'data-param-referrer',
-          this.urlReplacements_.expandUrlSync(customReferrer)
+        'data-param-referrer',
+        this.urlReplacements_.expandUrlSync(customReferrer)
       );
     }
 
@@ -286,8 +288,11 @@ class AmpPowrPlayer extends AMP.BaseElement {
     const account = mutations['data-account'];
     const playerId = mutations['data-player'] || mutations['data-player-id'];
     const video = mutations['data-video'];
-    if (account !== undefined || playerId !== undefined ||
-      video !== undefined) {
+    if (
+      account !== undefined ||
+      playerId !== undefined ||
+      video !== undefined
+    ) {
       if (this.iframe_) {
         this.iframe_.src = this.getIframeSrc_();
       }
@@ -296,8 +301,12 @@ class AmpPowrPlayer extends AMP.BaseElement {
 
   /** @override */
   pauseCallback() {
-    if (this.iframe_ && this.iframe_.contentWindow &&
-      this.frameHasAmpSupport_ && this.playing_) {
+    if (
+      this.iframe_ &&
+      this.iframe_.contentWindow &&
+      this.frameHasAmpSupport_ &&
+      this.playing_
+    ) {
       this.pause();
     }
   }
diff --git a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
index 7a33dc7e747a..c9e58a02375a 100644
--- a/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
+++ b/extensions/amp-powr-player/0.1/test/test-amp-powr-player.js
@@ -19,173 +19,189 @@ import {VideoEvents} from '../../../../src/video-interface';
 import {listenOncePromise} from '../../../../src/event-helper';
 import {parseUrlDeprecated} from '../../../../src/url';
 
-
-describes.realWin('amp-powr-player', {
-  amp: {
-    extensions: ['amp-powr-player'],
+describes.realWin(
+  'amp-powr-player',
+  {
+    amp: {
+      extensions: ['amp-powr-player'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getPowrPlayer(attributes, opt_responsive) {
-    const bc = doc.createElement('amp-powr-player');
-    for (const key in attributes) {
-      bc.setAttribute(key, attributes[key]);
-    }
-    bc.setAttribute('width', '111');
-    bc.setAttribute('height', '222');
-    if (opt_responsive) {
-      bc.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(bc);
-    return bc.build().then(() => {
-      bc.implementation_.playerReadyResolver_(bc.implementation_.iframe_);
-      return bc.layoutCallback();
-    }).then(() => bc);
-  }
+  env => {
+    let win, doc;
 
-  function fakePostMessage(bc, info) {
-    bc.implementation_.handlePlayerMessage_({
-      origin: 'https://player.powr.com',
-      source: bc.querySelector('iframe').contentWindow,
-      data: JSON.stringify(info),
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
     });
-  }
 
-  it('renders', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'amp-test-video',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
+    function getPowrPlayer(attributes, opt_responsive) {
+      const bc = doc.createElement('amp-powr-player');
+      for (const key in attributes) {
+        bc.setAttribute(key, attributes[key]);
+      }
+      bc.setAttribute('width', '111');
+      bc.setAttribute('height', '222');
+      if (opt_responsive) {
+        bc.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(bc);
+      return bc
+        .build()
+        .then(() => {
+          bc.implementation_.playerReadyResolver_(bc.implementation_.iframe_);
+          return bc.layoutCallback();
+        })
+        .then(() => bc);
+    }
+
+    function fakePostMessage(bc, info) {
+      bc.implementation_.handlePlayerMessage_({
+        origin: 'https://player.powr.com',
+        source: bc.querySelector('iframe').contentWindow,
+        data: JSON.stringify(info),
+      });
+    }
+
+    it('renders', () => {
+      return getPowrPlayer({
+        'data-account': '945',
+        'data-player': '1',
+        'data-video': 'amp-test-video',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
           'https://player.powr.com/iframe.html?account=945&player=1&' +
-          'video=amp-test-video&playsinline=true');
+            'video=amp-test-video&playsinline=true'
+        );
+      });
     });
-  });
-
-  it('renders responsively', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'amp-test-video',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+
+    it('renders responsively', () => {
+      return getPowrPlayer(
+        {
+          'data-account': '945',
+          'data-player': '1',
+          'data-video': 'amp-test-video',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
-
-  it('requires data-account', () => {
-    expectAsyncConsoleError(/The data-account attribute is required for/, 1);
-    return getPowrPlayer({}).should.eventually.be.rejectedWith(
-        /The data-account attribute is required for/);
-  });
-
-  it('requires data-player', () => {
-    expectAsyncConsoleError(/The data-player attribute is required for/, 1);
-    return getPowrPlayer({
-      'data-account': '945',
-    }).should.eventually.be.rejectedWith(
-        /The data-player attribute is required for/);
-  });
-
-  it('removes iframe after unlayoutCallback', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'amp-test-video',
-    }, true).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = bc.implementation_;
-      obj.unlayoutCallback();
-      expect(bc.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
+
+    it('requires data-account', () => {
+      expectAsyncConsoleError(/The data-account attribute is required for/, 1);
+      return getPowrPlayer({}).should.eventually.be.rejectedWith(
+        /The data-account attribute is required for/
+      );
     });
-  });
-
-  it('should pass data-param-* attributes to the iframe src', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'amp-test-video',
-      'data-param-foo': 'bar',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      const params = parseUrlDeprecated(iframe.src).search.split('&');
-      expect(params).to.contain('foo=bar');
+
+    it('requires data-player', () => {
+      expectAsyncConsoleError(/The data-player attribute is required for/, 1);
+      return getPowrPlayer({
+        'data-account': '945',
+      }).should.eventually.be.rejectedWith(
+        /The data-player attribute is required for/
+      );
     });
-  });
 
-  it('should propagate mutated attributes', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'ZNImchutXk',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
+    it('removes iframe after unlayoutCallback', () => {
+      return getPowrPlayer(
+        {
+          'data-account': '945',
+          'data-player': '1',
+          'data-video': 'amp-test-video',
+        },
+        true
+      ).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = bc.implementation_;
+        obj.unlayoutCallback();
+        expect(bc.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+      });
+    });
 
-      expect(iframe.src).to.equal(
-          'https://player.powr.com/iframe.html?account=945&player=1&' +
-          'video=ZNImchutXk&playsinline=true');
+    it('should pass data-param-* attributes to the iframe src', () => {
+      return getPowrPlayer({
+        'data-account': '945',
+        'data-player': '1',
+        'data-video': 'amp-test-video',
+        'data-param-foo': 'bar',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        const params = parseUrlDeprecated(iframe.src).search.split('&');
+        expect(params).to.contain('foo=bar');
+      });
+    });
 
-      bc.setAttribute('data-account', '945');
-      bc.setAttribute('data-player', '1');
-      bc.setAttribute('data-video', 'ZNImchutXk');
-      bc.mutatedAttributesCallback({
+    it('should propagate mutated attributes', () => {
+      return getPowrPlayer({
         'data-account': '945',
         'data-player': '1',
         'data-video': 'ZNImchutXk',
-      });
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+
+        expect(iframe.src).to.equal(
+          'https://player.powr.com/iframe.html?account=945&player=1&' +
+            'video=ZNImchutXk&playsinline=true'
+        );
+
+        bc.setAttribute('data-account', '945');
+        bc.setAttribute('data-player', '1');
+        bc.setAttribute('data-video', 'ZNImchutXk');
+        bc.mutatedAttributesCallback({
+          'data-account': '945',
+          'data-player': '1',
+          'data-video': 'ZNImchutXk',
+        });
 
-      expect(iframe.src).to.equal(
+        expect(iframe.src).to.equal(
           'https://player.powr.com/iframe.html?account=945&player=1&' +
-          'video=ZNImchutXk&playsinline=true');
+            'video=ZNImchutXk&playsinline=true'
+        );
+      });
     });
-  });
-
-  it('should pass referrer', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'ZNImchutXk',
-      'data-referrer': 'COUNTER',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-
-      expect(iframe.src).to.contain('referrer=1');
+
+    it('should pass referrer', () => {
+      return getPowrPlayer({
+        'data-account': '945',
+        'data-player': '1',
+        'data-video': 'ZNImchutXk',
+        'data-referrer': 'COUNTER',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+
+        expect(iframe.src).to.contain('referrer=1');
+      });
     });
-  });
-
-  it('should force playsinline', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'ZNImchutXk',
-      'data-param-playsinline': 'false',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-
-      expect(iframe.src).to.contain('playsinline=true');
+
+    it('should force playsinline', () => {
+      return getPowrPlayer({
+        'data-account': '945',
+        'data-player': '1',
+        'data-video': 'ZNImchutXk',
+        'data-param-playsinline': 'false',
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+
+        expect(iframe.src).to.contain('playsinline=true');
+      });
     });
-  });
-
-  it('should forward events', () => {
-    return getPowrPlayer({
-      'data-account': '945',
-      'data-player': '1',
-      'data-video': 'ZNImchutXk',
-    }).then(bc => {
-      return Promise.resolve()
+
+    it('should forward events', () => {
+      return getPowrPlayer({
+        'data-account': '945',
+        'data-player': '1',
+        'data-video': 'ZNImchutXk',
+      }).then(bc => {
+        return Promise.resolve()
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.LOAD);
             fakePostMessage(bc, {event: 'ready', muted: false, playing: false});
@@ -193,32 +209,47 @@ describes.realWin('amp-powr-player', {
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.AD_START);
-            fakePostMessage(bc,
-                {event: 'ads-ad-started', muted: false, playing: false});
+            fakePostMessage(bc, {
+              event: 'ads-ad-started',
+              muted: false,
+              playing: false,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.AD_END);
-            fakePostMessage(bc,
-                {event: 'ads-ad-ended', muted: false, playing: false});
+            fakePostMessage(bc, {
+              event: 'ads-ad-ended',
+              muted: false,
+              playing: false,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.PLAYING);
-            fakePostMessage(bc,
-                {event: 'playing', muted: false, playing: true});
+            fakePostMessage(bc, {
+              event: 'playing',
+              muted: false,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.MUTED);
-            fakePostMessage(bc,
-                {event: 'volumechange', muted: true, playing: true});
+            fakePostMessage(bc, {
+              event: 'volumechange',
+              muted: true,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
             const p = listenOncePromise(bc, VideoEvents.UNMUTED);
-            fakePostMessage(bc,
-                {event: 'volumechange', muted: false, playing: true});
+            fakePostMessage(bc, {
+              event: 'volumechange',
+              muted: false,
+              playing: true,
+            });
             return p;
           })
           .then(() => {
@@ -231,6 +262,7 @@ describes.realWin('amp-powr-player', {
             fakePostMessage(bc, {event: 'ended', muted: false, playing: false});
             return p;
           });
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-reach-player/0.1/amp-reach-player.js b/extensions/amp-reach-player/0.1/amp-reach-player.js
index 3e3db1918c3e..3dfdfd5b2a24 100644
--- a/extensions/amp-reach-player/0.1/amp-reach-player.js
+++ b/extensions/amp-reach-player/0.1/amp-reach-player.js
@@ -17,7 +17,6 @@
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 class AmpReachPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -27,9 +26,9 @@ class AmpReachPlayer extends AMP.BaseElement {
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://player-cdn.beachfrontmedia.com', opt_onLayout);
   }
@@ -41,13 +40,15 @@ class AmpReachPlayer extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    const embedId = (this.element.getAttribute('data-embed-id') || 'default');
+    const embedId = this.element.getAttribute('data-embed-id') || 'default';
     const iframe = this.element.ownerDocument.createElement('iframe');
 
     iframe.setAttribute('frameborder', 'no');
     iframe.setAttribute('scrolling', 'no');
     iframe.setAttribute('allowfullscreen', 'true');
-    iframe.src = 'https://player-cdn.beachfrontmedia.com/playerapi/v1/frame/player/?embed_id=' + encodeURIComponent(embedId);
+    iframe.src =
+      'https://player-cdn.beachfrontmedia.com/playerapi/v1/frame/player/?embed_id=' +
+      encodeURIComponent(embedId);
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
@@ -57,15 +58,14 @@ class AmpReachPlayer extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage(
-          'pause',
-          'https://player-cdn.beachfrontmedia.com'
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        'pause',
+        'https://player-cdn.beachfrontmedia.com'
       );
     }
   }
 }
 
-
 AMP.extension('amp-reach-player', '0.1', AMP => {
   AMP.registerElement('amp-reach-player', AmpReachPlayer);
 });
diff --git a/extensions/amp-reach-player/0.1/test/test-amp-reach-player.js b/extensions/amp-reach-player/0.1/test/test-amp-reach-player.js
index 9f928b94ff08..263897362c4e 100644
--- a/extensions/amp-reach-player/0.1/test/test-amp-reach-player.js
+++ b/extensions/amp-reach-player/0.1/test/test-amp-reach-player.js
@@ -16,52 +16,64 @@
 
 import '../amp-reach-player';
 
-
-describes.realWin('amp-reach-player', {
-  amp: {
-    extensions: ['amp-reach-player'],
+describes.realWin(
+  'amp-reach-player',
+  {
+    amp: {
+      extensions: ['amp-reach-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getReach(attributes, opt_responsive) {
-    const reach = doc.createElement('amp-reach-player');
-    for (const key in attributes) {
-      reach.setAttribute(key, attributes[key]);
-    }
-    reach.setAttribute('width', '560');
-    reach.setAttribute('height', '315');
-    if (opt_responsive) {
-      reach.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(reach);
-    return reach.build().then(() => { reach.layoutCallback(); })
+    function getReach(attributes, opt_responsive) {
+      const reach = doc.createElement('amp-reach-player');
+      for (const key in attributes) {
+        reach.setAttribute(key, attributes[key]);
+      }
+      reach.setAttribute('width', '560');
+      reach.setAttribute('height', '315');
+      if (opt_responsive) {
+        reach.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(reach);
+      return reach
+        .build()
+        .then(() => {
+          reach.layoutCallback();
+        })
         .then(() => reach);
-  }
+    }
 
-  it('renders', () => {
-    return getReach({
-      'data-embed-id': 'default',
-    }).then(reach => {
-      const iframe = reach.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal('https://player-cdn.beachfrontmedia.com/playerapi/v1/frame/player/?embed_id=default');
+    it('renders', () => {
+      return getReach({
+        'data-embed-id': 'default',
+      }).then(reach => {
+        const iframe = reach.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://player-cdn.beachfrontmedia.com/playerapi/v1/frame/player/?embed_id=default'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getReach({
-      'data-embed-id': 'default',
-    }, true).then(reach => {
-      const iframe = reach.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getReach(
+        {
+          'data-embed-id': 'default',
+        },
+        true
+      ).then(reach => {
+        const iframe = reach.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
index 5a26ebea995d..cbc23172c9f5 100644
--- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
+++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-input.js
@@ -36,15 +36,13 @@ import {userAssert} from '../../../src/log';
 /** @const */
 const TAG = 'amp-recaptcha-input';
 
-
 /** @implements {../../../src/async-input.AsyncInput} */
 export class AmpRecaptchaInput extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
 
-    /** @private {?string} **/
+    /** @private {?string} */
     this.sitekey_ = null;
 
     /** @private {?string} */
@@ -59,22 +57,24 @@ export class AmpRecaptchaInput extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-
     this.sitekey_ = userAssert(
-        this.element.getAttribute('data-sitekey'),
-        'The data-sitekey attribute is required for <amp-recaptcha-input> %s',
-        this.element);
+      this.element.getAttribute('data-sitekey'),
+      'The data-sitekey attribute is required for <amp-recaptcha-input> %s',
+      this.element
+    );
 
     this.action_ = userAssert(
-        this.element.getAttribute('data-action'),
-        'The data-action attribute is required for <amp-recaptcha-input> %s',
-        this.element);
+      this.element.getAttribute('data-action'),
+      'The data-action attribute is required for <amp-recaptcha-input> %s',
+      this.element
+    );
 
     userAssert(
-        this.element.getAttribute(AsyncInputAttributes.NAME),
-        'The %s attribute is required for <amp-recaptcha-input> %s',
-        AsyncInputAttributes.NAME,
-        this.element);
+      this.element.getAttribute(AsyncInputAttributes.NAME),
+      'The %s attribute is required for <amp-recaptcha-input> %s',
+      AsyncInputAttributes.NAME,
+      this.element
+    );
 
     this.recaptchaService_ = recaptchaServiceForDoc(this.getAmpDoc());
 
@@ -131,13 +131,16 @@ export class AmpRecaptchaInput extends AMP.BaseElement {
   getValue() {
     if (this.sitekey_ && this.action_) {
       return this.recaptchaService_.execute(
-          this.element.getResourceId(), this.action_
+        this.element.getResourceId(),
+        this.action_
       );
     }
-    return Promise.reject(new Error(
+    return Promise.reject(
+      new Error(
         'amp-recaptcha-input requires both the data-sitekey,' +
-        ' and data-action attribute'
-    ));
+          ' and data-action attribute'
+      )
+    );
   }
 }
 
diff --git a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
index 3dd34c5cd037..d96270137653 100644
--- a/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
+++ b/extensions/amp-recaptcha-input/0.1/amp-recaptcha-service.js
@@ -19,8 +19,7 @@
  * interacting with the 3p recaptcha bootstrap iframe
  */
 
-import ampToolboxCacheUrl from
-  '../../../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
+import ampToolboxCacheUrl from '../../../third_party/amp-toolbox-cache-url/dist/amp-toolbox-cache-url.esm';
 
 import {Deferred, tryResolve} from '../../../src/utils/promise';
 import {Services} from '../../../src/services';
@@ -59,7 +58,6 @@ import {urls} from '../../../src/config';
  */
 
 export class AmpRecaptchaService {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -106,8 +104,10 @@ export class AmpRecaptchaService {
       this.sitekey_ = sitekey;
     } else if (this.sitekey_ !== sitekey) {
       return Promise.reject(
-          new Error('You must supply the same sitekey ' +
-          'to all amp-recaptcha-input elements.')
+        new Error(
+          'You must supply the same sitekey ' +
+            'to all amp-recaptcha-input elements.'
+        )
       );
     }
 
@@ -140,9 +140,11 @@ export class AmpRecaptchaService {
    */
   execute(resourceId, action) {
     if (!this.iframe_) {
-      return Promise.reject(new Error(
+      return Promise.reject(
+        new Error(
           'An iframe is not created. You must register before executing'
-      ));
+        )
+      );
     }
     const executePromise = new Deferred();
     const messageId = resourceId;
@@ -151,7 +153,6 @@ export class AmpRecaptchaService {
       reject: executePromise.reject,
     };
     this.recaptchaApiReady_.promise.then(() => {
-
       const message = dict({
         'id': messageId,
         'action': 'amp_' + action,
@@ -159,8 +160,8 @@ export class AmpRecaptchaService {
 
       // Send the message
       this.postMessageToIframe_(
-          /** @type {string} */ (devAssert(this.recaptchaFrameOrigin_)),
-          message
+        /** @type {string} */ (devAssert(this.recaptchaFrameOrigin_)),
+        message
       );
     });
     return executePromise.promise;
@@ -176,14 +177,16 @@ export class AmpRecaptchaService {
       this.iframe_ = iframe;
 
       this.unlisteners_ = [
-        this.listenIframe_(
-            'amp-recaptcha-ready', () => this.recaptchaApiReady_.resolve()
+        this.listenIframe_('amp-recaptcha-ready', () =>
+          this.recaptchaApiReady_.resolve()
         ),
         this.listenIframe_(
-            'amp-recaptcha-token', this.tokenMessageHandler_.bind(this)
+          'amp-recaptcha-token',
+          this.tokenMessageHandler_.bind(this)
         ),
         this.listenIframe_(
-            'amp-recaptcha-error', this.errorMessageHandler_.bind(this)
+          'amp-recaptcha-error',
+          this.errorMessageHandler_.bind(this)
         ),
       ];
       this.executeMap_ = {};
@@ -216,7 +219,6 @@ export class AmpRecaptchaService {
    * @private
    */
   createRecaptchaFrame_() {
-
     const iframe = this.win_.document.createElement('iframe');
 
     return this.getRecaptchaFrameSrc_().then(recaptchaFrameSrc => {
@@ -224,10 +226,15 @@ export class AmpRecaptchaService {
       iframe.src = recaptchaFrameSrc;
       iframe.setAttribute('scrolling', 'no');
       iframe.setAttribute('data-amp-3p-sentinel', 'amp-recaptcha');
-      iframe.setAttribute('name', JSON.stringify(dict({
-        'sitekey': this.sitekey_,
-        'sentinel': 'amp-recaptcha',
-      })));
+      iframe.setAttribute(
+        'name',
+        JSON.stringify(
+          dict({
+            'sitekey': this.sitekey_,
+            'sentinel': 'amp-recaptcha',
+          })
+        )
+      );
       iframe.classList.add('i-amphtml-recaptcha-iframe');
       setStyle(iframe, 'border', 'none');
       /** @this {!Element} */
@@ -255,7 +262,6 @@ export class AmpRecaptchaService {
    */
   getRecaptchaFrameSrc_() {
     if (getMode().localDev || getMode().test) {
-
       /**
        * Get our window location.
        * In localDev mode, this will be this.win_.location
@@ -271,34 +277,44 @@ export class AmpRecaptchaService {
       }
 
       // TODO: win location href curls domain MAY need to be the same
-      return ampToolboxCacheUrl.createCurlsSubdomain(winLocation.href)
-          .then(curlsSubdomain => {
-            return '//' + curlsSubdomain +
-              '.recaptcha.' + winLocation.host
-              + '/dist.3p/' +
-          (getMode().minified ? `${internalRuntimeVersion()}/recaptcha`
-            : 'current/recaptcha.max') +
-          '.html';
-          });
+      return ampToolboxCacheUrl
+        .createCurlsSubdomain(winLocation.href)
+        .then(curlsSubdomain => {
+          return (
+            '//' +
+            curlsSubdomain +
+            '.recaptcha.' +
+            winLocation.host +
+            '/dist.3p/' +
+            (getMode().minified
+              ? `${internalRuntimeVersion()}/recaptcha`
+              : 'current/recaptcha.max') +
+            '.html'
+          );
+        });
     }
 
     // Need to have the curls subdomain match the original document url.
     // This is verified by the recaptcha frame to
     // verify the origin on its messages
     let curlsSubdomainPromise = undefined;
-    const isProxyOrigin = Services.urlForDoc(this.ampdoc_.getHeadNode())
-        .isProxyOrigin(this.win_.location.href);
+    const isProxyOrigin = Services.urlForDoc(
+      this.ampdoc_.getHeadNode()
+    ).isProxyOrigin(this.win_.location.href);
     if (isProxyOrigin) {
       curlsSubdomainPromise = tryResolve(() => {
         return this.win_.location.hostname.split('.')[0];
       });
     } else {
-      curlsSubdomainPromise =
-        ampToolboxCacheUrl.createCurlsSubdomain(this.win_.location.href);
+      curlsSubdomainPromise = ampToolboxCacheUrl.createCurlsSubdomain(
+        this.win_.location.href
+      );
     }
 
     return curlsSubdomainPromise.then(curlsSubdomain => {
-      const recaptchaFrameSrc = 'https://' + curlsSubdomain +
+      const recaptchaFrameSrc =
+        'https://' +
+        curlsSubdomain +
         `.recaptcha.${urls.thirdPartyFrameHost}/${internalRuntimeVersion()}/` +
         'recaptcha.html';
       return recaptchaFrameSrc;
@@ -313,7 +329,6 @@ export class AmpRecaptchaService {
    * @private
    */
   listenIframe_(evName, cb) {
-
     const checkOriginWrappedCallback = (data, source, origin) => {
       if (this.recaptchaFrameOrigin_ === origin) {
         cb(data, source, origin);
@@ -321,10 +336,11 @@ export class AmpRecaptchaService {
     };
 
     return listenFor(
-        dev().assertElement(this.iframe_),
-        evName,
-        checkOriginWrappedCallback,
-        true);
+      dev().assertElement(this.iframe_),
+      evName,
+      checkOriginWrappedCallback,
+      true
+    );
   }
 
   /**
@@ -335,11 +351,12 @@ export class AmpRecaptchaService {
    */
   postMessageToIframe_(origin, message) {
     postMessage(
-        dev().assertElement(this.iframe_),
-        'amp-recaptcha-action',
-        message,
-        origin,
-        true);
+      dev().assertElement(this.iframe_),
+      'amp-recaptcha-action',
+      message,
+      origin,
+      true
+    );
   }
 
   /**
@@ -351,7 +368,6 @@ export class AmpRecaptchaService {
    * @param {Object} data
    */
   tokenMessageHandler_(data) {
-
     const id = data['id'];
     const token = data['token'];
 
@@ -368,7 +384,6 @@ export class AmpRecaptchaService {
    * @param {Object} data
    */
   errorMessageHandler_(data) {
-
     const id = data['id'];
     const error = data['error'];
 
@@ -381,11 +396,7 @@ export class AmpRecaptchaService {
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  */
 export function installRecaptchaServiceForDoc(ampdoc) {
-  registerServiceBuilderForDoc(
-      ampdoc,
-      'amp-recaptcha',
-      AmpRecaptchaService
-  );
+  registerServiceBuilderForDoc(ampdoc, 'amp-recaptcha', AmpRecaptchaService);
 }
 
 /**
@@ -395,4 +406,3 @@ export function installRecaptchaServiceForDoc(ampdoc) {
 export function recaptchaServiceForDoc(elementOrAmpDoc) {
   return getServiceForDoc(elementOrAmpDoc, 'amp-recaptcha');
 }
-
diff --git a/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-input.js b/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-input.js
index 681f9a5cdde9..5e10bd1a348b 100644
--- a/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-input.js
+++ b/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-input.js
@@ -17,183 +17,185 @@
 import '../amp-recaptcha-input';
 import {createElementWithAttributes} from '../../../../src/dom';
 
-describes.realWin('amp-recaptcha-input', {
-  amp: { /* amp spec */
-    runtimeOn: false,
-    extensions: ['amp-recaptcha-input'],
+describes.realWin(
+  'amp-recaptcha-input',
+  {
+    amp: {
+      /* amp spec */
+      runtimeOn: false,
+      extensions: ['amp-recaptcha-input'],
+    },
   },
-}, env => {
-
-  let win;
-  let doc;
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  const ampRecaptchaInputAttributes = {
-    'layout': 'nodisplay',
-    'name': 'recaptcha-test',
-    'data-sitekey': 'fake-sitekey-fortesting',
-    'data-action': 'unit-test',
-  };
-
+  env => {
+    let win;
+    let doc;
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getRecaptchaInput(config = ampRecaptchaInputAttributes) {
+    const ampRecaptchaInputAttributes = {
+      'layout': 'nodisplay',
+      'name': 'recaptcha-test',
+      'data-sitekey': 'fake-sitekey-fortesting',
+      'data-action': 'unit-test',
+    };
 
-    const ampRecaptchaInput = createElementWithAttributes(
+    function getRecaptchaInput(config = ampRecaptchaInputAttributes) {
+      const ampRecaptchaInput = createElementWithAttributes(
         doc,
         'amp-recaptcha-input',
         config
-    );
-
-    doc.body.appendChild(ampRecaptchaInput);
-
-    return ampRecaptchaInput.build().then(() => {
-      return ampRecaptchaInput.layoutCallback();
-    }).then(() => {
-      return ampRecaptchaInput;
-    });
-  }
-
-  describe('amp-recaptcha-input', () => {
-
-    it('Rejects because data-name is missing', () => {
-
-      const ampRecaptchaInputConfig =
-        Object.assign({}, ampRecaptchaInputAttributes);
-      delete ampRecaptchaInputConfig['name'];
-
-      return allowConsoleError(() => {
-        return getRecaptchaInput(ampRecaptchaInputConfig)
-            .should.eventually.be.rejectedWith(
-                /The name attribute is required for/
-            );
-      });
-    });
-
-    it('Rejects because data-sitekey is missing', () => {
-
-      const ampRecaptchaInputConfig =
-        Object.assign({}, ampRecaptchaInputAttributes);
-      delete ampRecaptchaInputConfig['data-sitekey'];
-
-
-      return allowConsoleError(() => {
-        return getRecaptchaInput(ampRecaptchaInputConfig)
-            .should.eventually.be.rejectedWith(
-                /The data-sitekey attribute is required for/
-            );
+      );
+
+      doc.body.appendChild(ampRecaptchaInput);
+
+      return ampRecaptchaInput
+        .build()
+        .then(() => {
+          return ampRecaptchaInput.layoutCallback();
+        })
+        .then(() => {
+          return ampRecaptchaInput;
+        });
+    }
+
+    describe('amp-recaptcha-input', () => {
+      it('Rejects because data-name is missing', () => {
+        const ampRecaptchaInputConfig = Object.assign(
+          {},
+          ampRecaptchaInputAttributes
+        );
+        delete ampRecaptchaInputConfig['name'];
+
+        return allowConsoleError(() => {
+          return getRecaptchaInput(
+            ampRecaptchaInputConfig
+          ).should.eventually.be.rejectedWith(
+            /The name attribute is required for/
+          );
+        });
       });
-    });
 
-    it('Rejects because data-action is missing', () => {
-
-      const ampRecaptchaInputConfig =
-        Object.assign({}, ampRecaptchaInputAttributes);
-      delete ampRecaptchaInputConfig['data-action'];
-
-      return allowConsoleError(() => {
-        return getRecaptchaInput(ampRecaptchaInputConfig)
-            .should.eventually.be.rejectedWith(
-                /The data-action attribute is required for/
-            );
+      it('Rejects because data-sitekey is missing', () => {
+        const ampRecaptchaInputConfig = Object.assign(
+          {},
+          ampRecaptchaInputAttributes
+        );
+        delete ampRecaptchaInputConfig['data-sitekey'];
+
+        return allowConsoleError(() => {
+          return getRecaptchaInput(
+            ampRecaptchaInputConfig
+          ).should.eventually.be.rejectedWith(
+            /The data-sitekey attribute is required for/
+          );
+        });
       });
-    });
-
 
-    it('Should be visible after built', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(ampRecaptchaInput).to.not.have.display('none');
+      it('Rejects because data-action is missing', () => {
+        const ampRecaptchaInputConfig = Object.assign(
+          {},
+          ampRecaptchaInputAttributes
+        );
+        delete ampRecaptchaInputConfig['data-action'];
+
+        return allowConsoleError(() => {
+          return getRecaptchaInput(
+            ampRecaptchaInputConfig
+          ).should.eventually.be.rejectedWith(
+            /The data-action attribute is required for/
+          );
+        });
       });
-    });
 
-    it('Should apply styles aftyer build', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(win.getComputedStyle(ampRecaptchaInput).position)
-            .to.equal('absolute');
-        expect(win.getComputedStyle(ampRecaptchaInput).visibility)
-            .to.equal('hidden');
+      it('Should be visible after built', () => {
+        return getRecaptchaInput().then(ampRecaptchaInput => {
+          expect(ampRecaptchaInput).to.not.have.display('none');
+        });
       });
-    });
 
-    it('Should register with the recaptcha service after layout', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(
-            ampRecaptchaInput.implementation_
-                .registerPromise_
-        ).to.be.ok;
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(1);
+      it('Should apply styles aftyer build', () => {
+        return getRecaptchaInput().then(ampRecaptchaInput => {
+          expect(win.getComputedStyle(ampRecaptchaInput).position).to.equal(
+            'absolute'
+          );
+          expect(win.getComputedStyle(ampRecaptchaInput).visibility).to.equal(
+            'hidden'
+          );
+        });
       });
-    });
 
-    it('Should unregister with the recaptcha service after unlayout', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(
-            ampRecaptchaInput.implementation_
-                .registerPromise_
-        ).to.be.ok;
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(1);
-
-        ampRecaptchaInput.unlayoutCallback();
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(0);
+      it('Should register with the recaptcha service after layout', () => {
+        return getRecaptchaInput().then(ampRecaptchaInput => {
+          expect(ampRecaptchaInput.implementation_.registerPromise_).to.be.ok;
+          expect(
+            ampRecaptchaInput.implementation_.recaptchaService_
+              .registeredElementCount_
+          ).to.equal(1);
+        });
       });
-    });
 
-    it('Should not register with the recaptcha service' +
-      ' if already registered', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(
-            ampRecaptchaInput.implementation_
-                .registerPromise_
-        ).to.be.ok;
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(1);
-        ampRecaptchaInput.implementation_.layoutCallback();
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(1);
+      it('Should unregister with the recaptcha service after unlayout', () => {
+        return getRecaptchaInput().then(ampRecaptchaInput => {
+          expect(ampRecaptchaInput.implementation_.registerPromise_).to.be.ok;
+          expect(
+            ampRecaptchaInput.implementation_.recaptchaService_
+              .registeredElementCount_
+          ).to.equal(1);
+
+          ampRecaptchaInput.unlayoutCallback();
+          expect(
+            ampRecaptchaInput.implementation_.recaptchaService_
+              .registeredElementCount_
+          ).to.equal(0);
+        });
       });
-    });
 
-    it('Should not unregister with the recaptcha service' +
-      ' if not already registered', () => {
-      return getRecaptchaInput().then(ampRecaptchaInput => {
-        expect(
-            ampRecaptchaInput.implementation_
-                .registerPromise_
-        ).to.be.ok;
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(1);
-        ampRecaptchaInput.unlayoutCallback();
-        expect(
-            ampRecaptchaInput.implementation_
-                .registerPromise_
-        ).to.not.be.ok;
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(0);
-        ampRecaptchaInput.unlayoutCallback();
-        expect(
-            ampRecaptchaInput.implementation_
-                .recaptchaService_.registeredElementCount_
-        ).to.equal(0);
-      });
+      it(
+        'Should not register with the recaptcha service' +
+          ' if already registered',
+        () => {
+          return getRecaptchaInput().then(ampRecaptchaInput => {
+            expect(ampRecaptchaInput.implementation_.registerPromise_).to.be.ok;
+            expect(
+              ampRecaptchaInput.implementation_.recaptchaService_
+                .registeredElementCount_
+            ).to.equal(1);
+            ampRecaptchaInput.implementation_.layoutCallback();
+            expect(
+              ampRecaptchaInput.implementation_.recaptchaService_
+                .registeredElementCount_
+            ).to.equal(1);
+          });
+        }
+      );
+
+      it(
+        'Should not unregister with the recaptcha service' +
+          ' if not already registered',
+        () => {
+          return getRecaptchaInput().then(ampRecaptchaInput => {
+            expect(ampRecaptchaInput.implementation_.registerPromise_).to.be.ok;
+            expect(
+              ampRecaptchaInput.implementation_.recaptchaService_
+                .registeredElementCount_
+            ).to.equal(1);
+            ampRecaptchaInput.unlayoutCallback();
+            expect(ampRecaptchaInput.implementation_.registerPromise_).to.not.be
+              .ok;
+            expect(
+              ampRecaptchaInput.implementation_.recaptchaService_
+                .registeredElementCount_
+            ).to.equal(0);
+            ampRecaptchaInput.unlayoutCallback();
+            expect(
+              ampRecaptchaInput.implementation_.recaptchaService_
+                .registeredElementCount_
+            ).to.equal(0);
+          });
+        }
+      );
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-service.js b/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-service.js
index deed3a28761a..06db1d5ae4d0 100644
--- a/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-service.js
+++ b/extensions/amp-recaptcha-input/0.1/test/test-amp-recaptcha-service.js
@@ -23,56 +23,58 @@ import {AmpRecaptchaService} from '../amp-recaptcha-service';
  * with a "fake iframe" document.
  */
 
-describes.realWin('amp-recaptcha-service', {
-  amp: { /* amp spec */
-    extensions: ['amp-recaptcha-input'],
+describes.realWin(
+  'amp-recaptcha-service',
+  {
+    amp: {
+      /* amp spec */
+      extensions: ['amp-recaptcha-input'],
+    },
   },
-}, env => {
-  let recaptchaService;
-  const fakeSitekey = 'fake-sitekey-fortesting';
-  const anotherFakeSitekey = 'another-fake-sitekey-fortesting';
-
-  beforeEach(() => {
-    recaptchaService = new AmpRecaptchaService(env.ampdoc);
-  });
-
-  it('should create an iframe on register if first element to register', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
-          expect(recaptchaService.registeredElementCount_).to.be.equal(1);
-          expect(recaptchaService.iframe_).to.be.ok;
-        });
-  });
+  env => {
+    let recaptchaService;
+    const fakeSitekey = 'fake-sitekey-fortesting';
+    const anotherFakeSitekey = 'another-fake-sitekey-fortesting';
+
+    beforeEach(() => {
+      recaptchaService = new AmpRecaptchaService(env.ampdoc);
+    });
 
-  it('should only initialize once for X number of elements,' +
-    ' and iframe already exists', () => {
+    it('should create an iframe on register if first element to register', () => {
+      expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+      return recaptchaService.register(fakeSitekey).then(() => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(1);
+        expect(recaptchaService.iframe_).to.be.ok;
+      });
+    });
 
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
+    it(
+      'should only initialize once for X number of elements,' +
+        ' and iframe already exists',
+      () => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+        return recaptchaService.register(fakeSitekey).then(() => {
           expect(recaptchaService.registeredElementCount_).to.be.equal(1);
           expect(recaptchaService.iframe_).to.be.ok;
           const currentIframe = recaptchaService.iframe_;
 
           // Register a second element
-          return recaptchaService
-              .register(fakeSitekey)
-              .then(() => {
-                expect(recaptchaService.registeredElementCount_)
-                    .to.be.equal(2);
-                expect(recaptchaService.iframe_).to.be.ok;
-                expect(recaptchaService.iframe_).to.be.equal(currentIframe);
-              });
+          return recaptchaService.register(fakeSitekey).then(() => {
+            expect(recaptchaService.registeredElementCount_).to.be.equal(2);
+            expect(recaptchaService.iframe_).to.be.ok;
+            expect(recaptchaService.iframe_).to.be.equal(currentIframe);
+          });
         });
-  });
+      }
+    );
 
-  it('should dispose of the iframe,' +
-    ' once all registered elements unregister', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+    it(
+      'should dispose of the iframe,' +
+        ' once all registered elements unregister',
+      () => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(0);
 
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
+        return recaptchaService.register(fakeSitekey).then(() => {
           expect(recaptchaService.registeredElementCount_).to.be.equal(1);
           expect(recaptchaService.iframe_).to.be.ok;
 
@@ -80,13 +82,15 @@ describes.realWin('amp-recaptcha-service', {
           expect(recaptchaService.registeredElementCount_).to.be.equal(0);
           expect(recaptchaService.iframe_).to.be.not.ok;
         });
-  });
+      }
+    );
 
-  it('should unlisten to all listeners,' +
-    ' once all registered elements unregister', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
+    it(
+      'should unlisten to all listeners,' +
+        ' once all registered elements unregister',
+      () => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+        return recaptchaService.register(fakeSitekey).then(() => {
           expect(recaptchaService.unlisteners_.length).to.be.equal(3);
 
           // Stub out the unlisten function
@@ -97,13 +101,15 @@ describes.realWin('amp-recaptcha-service', {
           expect(recaptchaService.unlisteners_.length).to.be.equal(0);
           expect(unlistener).to.be.called;
         });
-  });
+      }
+    );
 
-  it('should not allow elements to register,' +
-    ' if they pass a different sitekey', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
+    it(
+      'should not allow elements to register,' +
+        ' if they pass a different sitekey',
+      () => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+        return recaptchaService.register(fakeSitekey).then(() => {
           expect(recaptchaService.registeredElementCount_).to.be.equal(1);
           expect(recaptchaService.iframe_).to.be.ok;
 
@@ -113,68 +119,68 @@ describes.realWin('amp-recaptcha-service', {
             expect(recaptchaService.iframe_).to.be.ok;
           });
         });
-  });
-
-  it('should return when the iframe is' +
-    ' loaded and ready', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
-          expect(recaptchaService.unlisteners_.length).to.be.equal(3);
-          expect(recaptchaService.iframeLoadPromise_).to.be.ok;
-          expect(recaptchaService.recaptchaApiReady_).to.be.ok;
-
-          return recaptchaService.iframeLoadPromise_.then(() => {
-            expect(true).to.be.ok;
-          });
-        });
-  });
-
-  it('should add the element to the execute map on successful execute', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
-          expect(recaptchaService.unlisteners_.length).to.be.equal(3);
+      }
+    );
 
-          recaptchaService.execute(0, '');
+    it('should return when the iframe is loaded and ready', () => {
+      expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+      return recaptchaService.register(fakeSitekey).then(() => {
+        expect(recaptchaService.unlisteners_.length).to.be.equal(3);
+        expect(recaptchaService.iframeLoadPromise_).to.be.ok;
+        expect(recaptchaService.recaptchaApiReady_).to.be.ok;
 
-          const executeMapKeys = Object.keys(recaptchaService.executeMap_);
-          expect(executeMapKeys.length).to.be.equal(1);
-          expect(executeMapKeys[0]).to.be.equal('0');
+        return recaptchaService.iframeLoadPromise_.then(() => {
+          expect(true).to.be.ok;
         });
-  });
-
-  it('should postmessage to the specified ' +
-    'recaptcha frame origin on execute', () => {
+      });
+    });
 
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+    it('should add the element to the execute map on successful execute', () => {
+      expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+      return recaptchaService.register(fakeSitekey).then(() => {
+        expect(recaptchaService.unlisteners_.length).to.be.equal(3);
 
-    const postMessageStub = sandbox.stub(
-        recaptchaService,
-        'postMessageToIframe_'
-    );
+        recaptchaService.execute(0, '');
 
-    return recaptchaService
-        .register(fakeSitekey).then(() => {
-          recaptchaService.execute(0, '');
+        const executeMapKeys = Object.keys(recaptchaService.executeMap_);
+        expect(executeMapKeys.length).to.be.equal(1);
+        expect(executeMapKeys[0]).to.be.equal('0');
+      });
+    });
 
-          recaptchaService.recaptchaApiReady_.resolve();
-          return recaptchaService.recaptchaApiReady_.promise;
-        }).then(() => {
-          expect(postMessageStub).to.be.calledWith(
+    it(
+      'should postmessage to the specified ' +
+        'recaptcha frame origin on execute',
+      () => {
+        expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+
+        const postMessageStub = sandbox.stub(
+          recaptchaService,
+          'postMessageToIframe_'
+        );
+
+        return recaptchaService
+          .register(fakeSitekey)
+          .then(() => {
+            recaptchaService.execute(0, '');
+
+            recaptchaService.recaptchaApiReady_.resolve();
+            return recaptchaService.recaptchaApiReady_.promise;
+          })
+          .then(() => {
+            expect(postMessageStub).to.be.calledWith(
               recaptchaService.recaptchaFrameOrigin_
-          );
-        });
-  });
-
+            );
+          });
+      }
+    );
 
-  it('should reject if there is no iframe on execute', () => {
-    expect(recaptchaService.registeredElementCount_).to.be.equal(0);
-    expect(recaptchaService.iframe_).to.not.be.ok;
-    return recaptchaService.execute(0, '').catch(err => {
-      expect(err).to.be.ok;
+    it('should reject if there is no iframe on execute', () => {
+      expect(recaptchaService.registeredElementCount_).to.be.equal(0);
+      expect(recaptchaService.iframe_).to.not.be.ok;
+      return recaptchaService.execute(0, '').catch(err => {
+        expect(err).to.be.ok;
+      });
     });
-  });
-});
-
-
+  }
+);
diff --git a/extensions/amp-reddit/0.1/amp-reddit.js b/extensions/amp-reddit/0.1/amp-reddit.js
index 8f904fccc7e2..e6502915ace9 100644
--- a/extensions/amp-reddit/0.1/amp-reddit.js
+++ b/extensions/amp-reddit/0.1/amp-reddit.js
@@ -20,7 +20,6 @@ import {listenFor} from '../../../src/iframe-helper';
 import {userAssert} from '../../../src/log';
 
 class AmpReddit extends AMP.BaseElement {
-
   /**
    * @param {boolean=} onLayout
    * @override
@@ -32,13 +31,19 @@ class AmpReddit extends AMP.BaseElement {
       this.preconnect.url('https://www.redditmedia.com', onLayout);
       // The domain for JS and CSS used in rendering embeds.
       this.preconnect.url('https://www.redditstatic.com', onLayout);
-      this.preconnect.preload('https://www.redditstatic.com/comment-embed.js', 'script');
+      this.preconnect.preload(
+        'https://www.redditstatic.com/comment-embed.js',
+        'script'
+      );
     } else {
       // Posts don't use the static domain.
       this.preconnect.url('https://www.reddit.com', onLayout);
       // Posts defer to the embedly API.
       this.preconnect.url('https://cdn.embedly.com', onLayout);
-      this.preconnect.preload('https://embed.redditmedia.com/widgets/platform.js', 'script');
+      this.preconnect.preload(
+        'https://embed.redditmedia.com/widgets/platform.js',
+        'script'
+      );
     }
 
     preloadBootstrap(this.win, this.preconnect);
@@ -51,25 +56,34 @@ class AmpReddit extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    userAssert(this.element.getAttribute('data-src'),
-        'The data-src attribute is required for <amp-reddit> %s',
-        this.element);
-    userAssert(this.element.getAttribute('data-embedtype'),
-        'The data-embedtype attribute is required for <amp-reddit> %s',
-        this.element);
+    userAssert(
+      this.element.getAttribute('data-src'),
+      'The data-src attribute is required for <amp-reddit> %s',
+      this.element
+    );
+    userAssert(
+      this.element.getAttribute('data-embedtype'),
+      'The data-embedtype attribute is required for <amp-reddit> %s',
+      this.element
+    );
 
-    const iframe = getIframe(this.win, this.element, 'reddit', null,
-        {allowFullscreen: true});
+    const iframe = getIframe(this.win, this.element, 'reddit', null, {
+      allowFullscreen: true,
+    });
     this.applyFillContent(iframe);
-    listenFor(iframe, 'embed-size', data => {
-      this./*OK*/changeHeight(data['height']);
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this./*OK*/ changeHeight(data['height']);
+      },
+      /* opt_is3P */ true
+    );
     this.element.appendChild(iframe);
     return this.loadPromise(iframe);
   }
 }
 
-
 AMP.extension('amp-reddit', '0.1', AMP => {
   AMP.registerElement('amp-reddit', AmpReddit);
 });
diff --git a/extensions/amp-reddit/0.1/test/test-amp-reddit.js b/extensions/amp-reddit/0.1/test/test-amp-reddit.js
index ca475644a2b8..01b8a6884fc2 100644
--- a/extensions/amp-reddit/0.1/test/test-amp-reddit.js
+++ b/extensions/amp-reddit/0.1/test/test-amp-reddit.js
@@ -17,96 +17,110 @@
 import '../amp-reddit';
 import {reddit} from '../../../../3p/reddit';
 
-
-describes.realWin('amp-reddit', {
-  amp: {
-    extensions: ['amp-reddit'],
-    canonicalUrl: 'https://foo.bar/baz',
+describes.realWin(
+  'amp-reddit',
+  {
+    amp: {
+      extensions: ['amp-reddit'],
+      canonicalUrl: 'https://foo.bar/baz',
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+  env => {
+    let win, doc;
 
-  function getReddit(src, type) {
-    const ampReddit = doc.createElement('amp-reddit');
-    ampReddit.setAttribute('height', 400);
-    ampReddit.setAttribute('width', 400);
-    ampReddit.setAttribute('data-src', src);
-    ampReddit.setAttribute('data-embedtype', type);
-    ampReddit.setAttribute('layout', 'responsive');
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-    doc.body.appendChild(ampReddit);
-    return ampReddit.build()
+    function getReddit(src, type) {
+      const ampReddit = doc.createElement('amp-reddit');
+      ampReddit.setAttribute('height', 400);
+      ampReddit.setAttribute('width', 400);
+      ampReddit.setAttribute('data-src', src);
+      ampReddit.setAttribute('data-embedtype', type);
+      ampReddit.setAttribute('layout', 'responsive');
+
+      doc.body.appendChild(ampReddit);
+      return ampReddit
+        .build()
         .then(() => ampReddit.layoutCallback())
         .then(() => ampReddit);
-  }
-
-  it('renders post iframe', () => {
-    return getReddit('https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed', 'post')
-        .then(ampReddit => {
-          const iframe = ampReddit.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.tagName).to.equal('IFRAME');
-          expect(iframe.getAttribute('width')).to.equal('400');
-          expect(iframe.getAttribute('height')).to.equal('400');
-        });
-  });
-
-  it('adds post embed', () => {
-    const div = document.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    reddit(win, {
-      src: 'https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed',
-      embedtype: 'post',
-      width: 400,
-      height: 400,
+    }
+
+    it('renders post iframe', () => {
+      return getReddit(
+        'https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed',
+        'post'
+      ).then(ampReddit => {
+        const iframe = ampReddit.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('width')).to.equal('400');
+        expect(iframe.getAttribute('height')).to.equal('400');
+      });
     });
 
-    const embedlyEmbed = doc.body.querySelector('.embedly-card');
-    expect(embedlyEmbed).not.to.be.undefined;
-  });
-
-  it('renders comment iframe', () => {
-    return getReddit('https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw', 'comment')
-        .then(ampReddit => {
-          const iframe = ampReddit.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.tagName).to.equal('IFRAME');
-          expect(iframe.getAttribute('width')).to.equal('400');
-          expect(iframe.getAttribute('height')).to.equal('400');
-        });
-  });
-
-  it('adds comment embed', () => {
-    const div = document.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+    it('adds post embed', () => {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      reddit(win, {
+        src:
+          'https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed',
+        embedtype: 'post',
+        width: 400,
+        height: 400,
+      });
+
+      const embedlyEmbed = doc.body.querySelector('.embedly-card');
+      expect(embedlyEmbed).not.to.be.undefined;
+    });
 
-    reddit(win, {
-      src: 'https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw',
-      embedtype: 'comment',
-      width: 400,
-      height: 400,
+    it('renders comment iframe', () => {
+      return getReddit(
+        'https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw',
+        'comment'
+      ).then(ampReddit => {
+        const iframe = ampReddit.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('width')).to.equal('400');
+        expect(iframe.getAttribute('height')).to.equal('400');
+      });
     });
 
-    const redditEmbed = doc.body.querySelector('.reddit-embed');
-    expect(redditEmbed).not.to.be.undefined;
-  });
+    it('adds comment embed', () => {
+      const div = document.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      reddit(win, {
+        src:
+          'https://www.reddit.com/r/sports/comments/54loj1/50_cents_awful_1st_pitch_given_a_historical/d8306kw',
+        embedtype: 'comment',
+        width: 400,
+        height: 400,
+      });
+
+      const redditEmbed = doc.body.querySelector('.reddit-embed');
+      expect(redditEmbed).not.to.be.undefined;
+    });
 
-  it('requires data-src', () => {
-    return getReddit('', 'post').should.eventually.be.rejectedWith(
-        /The data-src attribute is required for/);
-  });
+    it('requires data-src', () => {
+      return getReddit('', 'post').should.eventually.be.rejectedWith(
+        /The data-src attribute is required for/
+      );
+    });
 
-  it('requires data-embedtype', () => {
-    return getReddit('https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed', '')
-        .should.eventually.be.rejectedWith(
-            /The data-embedtype attribute is required for/);
-  });
-});
+    it('requires data-embedtype', () => {
+      return getReddit(
+        'https://www.reddit.com/r/me_irl/comments/52rmir/me_irl/?ref=share&amp;ref_source=embed',
+        ''
+      ).should.eventually.be.rejectedWith(
+        /The data-embedtype attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js b/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js
index 88ff6589b378..f04ea6aeb179 100644
--- a/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js
+++ b/extensions/amp-riddle-quiz/0.1/amp-riddle-quiz.js
@@ -20,7 +20,6 @@ import {removeElement} from '../../../src/dom';
 import {userAssert} from '../../../src/log';
 
 export class AmpRiddleQuiz extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -44,9 +43,11 @@ export class AmpRiddleQuiz extends AMP.BaseElement {
    * @param {!Event} event
    */
   handleMessage_(event) {
-    if (!this.iframe_ ||
-        event.origin != 'https://www.riddle.com' ||
-        event.source != this.iframe_.contentWindow) {
+    if (
+      !this.iframe_ ||
+      event.origin != 'https://www.riddle.com' ||
+      event.source != this.iframe_.contentWindow
+    ) {
       return;
     }
 
@@ -56,8 +57,7 @@ export class AmpRiddleQuiz extends AMP.BaseElement {
       return;
     }
 
-    if (data['riddleId'] != undefined
-      && data['riddleId'] == this.riddleId_) {
+    if (data['riddleId'] != undefined && data['riddleId'] == this.riddleId_) {
       this.riddleHeightChanged_(data['riddleHeight']);
     }
   }
@@ -70,14 +70,15 @@ export class AmpRiddleQuiz extends AMP.BaseElement {
   /** @override */
   layoutCallback() {
     this.riddleId_ = userAssert(
-        this.element.getAttribute('data-riddle-id'),
-        'The data-riddle-id attribute is required for <amp-riddle-quiz> %s',
-        this.element);
+      this.element.getAttribute('data-riddle-id'),
+      'The data-riddle-id attribute is required for <amp-riddle-quiz> %s',
+      this.element
+    );
     // listen for resize events coming from riddles
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleMessage_.bind(this)
     );
 
     const iframe = this.element.ownerDocument.createElement('iframe');
@@ -86,7 +87,8 @@ export class AmpRiddleQuiz extends AMP.BaseElement {
     iframe.setAttribute('frameborder', '0');
     iframe.setAttribute('allowtransparency', 'true');
     iframe.setAttribute('allowfullscreen', 'true');
-    iframe.src = 'https://www.riddle.com/a/iframe/' + encodeURIComponent(this.riddleId_);
+    iframe.src =
+      'https://www.riddle.com/a/iframe/' + encodeURIComponent(this.riddleId_);
 
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
@@ -118,7 +120,9 @@ export class AmpRiddleQuiz extends AMP.BaseElement {
 
     this.itemHeight_ = height; //Save new height
 
-    this.attemptChangeHeight(this.itemHeight_).catch(() => { /* die */ });
+    this.attemptChangeHeight(this.itemHeight_).catch(() => {
+      /* die */
+    });
   }
 }
 
diff --git a/extensions/amp-riddle-quiz/0.1/test/test-amp-riddle-quiz.js b/extensions/amp-riddle-quiz/0.1/test/test-amp-riddle-quiz.js
index 37db114bb8b6..d95d98504209 100644
--- a/extensions/amp-riddle-quiz/0.1/test/test-amp-riddle-quiz.js
+++ b/extensions/amp-riddle-quiz/0.1/test/test-amp-riddle-quiz.js
@@ -15,27 +15,28 @@
  */
 import '../amp-riddle-quiz';
 
-
-describes.realWin('amp-riddle-quiz', {
-  amp: {
-    extensions: ['amp-riddle-quiz'],
+describes.realWin(
+  'amp-riddle-quiz',
+  {
+    amp: {
+      extensions: ['amp-riddle-quiz'],
+    },
   },
-}, env => {
-  let win;
-  let element;
-
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-riddle-quiz');
-    win.document.body.appendChild(element);
-  });
+  env => {
+    let win;
+    let element;
 
-  it('should have iframe when built', () => {
-    element.build().then(() => {
-      const iframe = element.querySelector('iframe');
-      expect(iframe).to.not.be.null;
+    beforeEach(() => {
+      win = env.win;
+      element = win.document.createElement('amp-riddle-quiz');
+      win.document.body.appendChild(element);
     });
-  });
 
-
-});
+    it('should have iframe when built', () => {
+      element.build().then(() => {
+        const iframe = element.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+      });
+    });
+  }
+);
diff --git a/extensions/amp-script/0.1/amp-script.js b/extensions/amp-script/0.1/amp-script.js
index ed0150cf9218..8525f2d2936c 100644
--- a/extensions/amp-script/0.1/amp-script.js
+++ b/extensions/amp-script/0.1/amp-script.js
@@ -16,26 +16,26 @@
 
 import {CSS} from '../../../build/amp-script-0.1.css';
 import {
-  DomPurifyDef, createPurifier, getAllowedTags, validateAttributeChange,
+  DomPurifyDef,
+  createPurifier,
+  getAllowedTags,
+  validateAttributeChange,
 } from '../../../src/purifier';
 import {Layout, isLayoutSizeDefined} from '../../../src/layout';
 import {Services} from '../../../src/services';
 import {UserActivationTracker} from './user-activation-tracker';
-import {
-  calculateExtensionScriptUrl,
-} from '../../../src/service/extension-location';
+import {calculateExtensionScriptUrl} from '../../../src/service/extension-location';
 import {dev, user} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getElementServiceForDoc} from '../../../src/element-service';
 import {getMode} from '../../../src/mode';
 import {
-  installOriginExperimentsForDoc, originExperimentsForDoc,
+  installOriginExperimentsForDoc,
+  originExperimentsForDoc,
 } from '../../../src/service/origin-experiments-impl';
 import {isExperimentOn} from '../../../src/experiments';
 import {rewriteAttributeValue} from '../../../src/url-rewrite';
-import {
-  upgrade,
-} from '@ampproject/worker-dom/dist/unminified.index.safe.mjs.patched';
+import {upgrade} from '@ampproject/worker-dom/dist/unminified.index.safe.mjs.patched';
 
 /** @const {string} */
 const TAG = 'amp-script';
@@ -55,7 +55,6 @@ const PHASE_HYDRATING = 1;
 const PHASE_MUTATING = 2;
 
 export class AmpScript extends AMP.BaseElement {
-
   /**
    * @param {!Element} element
    */
@@ -77,8 +76,7 @@ export class AmpScript extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout == Layout.CONTAINER ||
-        isLayoutSizeDefined(layout);
+    return layout == Layout.CONTAINER || isLayoutSizeDefined(layout);
   }
 
   /** @return {!Promise<boolean>} */
@@ -88,8 +86,8 @@ export class AmpScript extends AMP.BaseElement {
     }
     installOriginExperimentsForDoc(this.getAmpDoc());
     return originExperimentsForDoc(this.element)
-        .getExperiments()
-        .then(trials => trials && trials.includes(TAG));
+      .getExperiments()
+      .then(trials => trials && trials.includes(TAG));
   }
 
   /** @override */
@@ -123,8 +121,12 @@ export class AmpScript extends AMP.BaseElement {
       this.service_ = results[2];
 
       if (this.service_.sizeLimitExceeded(authorScript.length)) {
-        user().error(TAG, 'Maximum total script size exceeded ' +
-            `(${MAX_TOTAL_SCRIPT_SIZE}). Disabled:`, this.element);
+        user().error(
+          TAG,
+          'Maximum total script size exceeded ' +
+            `(${MAX_TOTAL_SCRIPT_SIZE}). Disabled:`,
+          this.element
+        );
         this.element.classList.add('i-amphtml-broken');
         return [];
       }
@@ -164,11 +166,17 @@ export class AmpScript extends AMP.BaseElement {
    */
   workerThreadUrl_() {
     // Use `testLocation` for testing with iframes. @see testing/iframe.js.
-    const location = (getMode().test && this.win.testLocation)
-      ? this.win.testLocation : this.win.location;
+    const location =
+      getMode().test && this.win.testLocation
+        ? this.win.testLocation
+        : this.win.location;
     const useLocal = getMode().localDev || getMode().test;
     return calculateExtensionScriptUrl(
-        location, 'amp-script-worker', '0.1', useLocal);
+      location,
+      'amp-script-worker',
+      '0.1',
+      useLocal
+    );
   }
 
   /**
@@ -178,18 +186,18 @@ export class AmpScript extends AMP.BaseElement {
    */
   mutationPump_(flush, phase) {
     if (phase == PHASE_HYDRATING) {
-      this.vsync_.mutate(
-          () => this.element.classList.add('i-amphtml-hydrated'));
+      this.vsync_.mutate(() =>
+        this.element.classList.add('i-amphtml-hydrated')
+      );
     }
-    const allowMutation = (
+    const allowMutation =
       // Hydration is always allowed.
-      phase != PHASE_MUTATING
+      phase != PHASE_MUTATING ||
       // Mutation depends on the gesture state and long tasks.
-      || this.userActivation_.isActive()
+      this.userActivation_.isActive() ||
       // If the element is size-contained and small enough.
-      || (isLayoutSizeDefined(this.getLayout())
-          && this.getLayoutBox().height <= MAX_FREE_MUTATION_HEIGHT)
-    );
+      (isLayoutSizeDefined(this.getLayout()) &&
+        this.getLayoutBox().height <= MAX_FREE_MUTATION_HEIGHT);
 
     if (allowMutation) {
       this.vsync_.mutate(flush);
diff --git a/extensions/amp-script/0.1/test-e2e/test-amp-script.js b/extensions/amp-script/0.1/test-e2e/test-amp-script.js
index fdb1493e031d..1f1030bc5338 100644
--- a/extensions/amp-script/0.1/test-e2e/test-amp-script.js
+++ b/extensions/amp-script/0.1/test-e2e/test-amp-script.js
@@ -14,32 +14,36 @@
  * limitations under the License.
  */
 
+describes.endtoend(
+  'amp-script e2e',
+  {
+    testUrl: 'http://localhost:8000/test/manual/amp-script/test1.amp.html',
+    experiments: ['amp-script'],
+    initialRect: {width: 600, height: 600},
+    environments: ['single'],
+  },
+  async env => {
+    let controller;
 
-describes.endtoend('amp-script e2e', {
-  testUrl: 'http://localhost:8000/test/manual/amp-script/' +
-      'test1.amp.html',
-  experiments: ['amp-script'],
-  initialRect: {width: 600, height: 600},
-  environments: ['single'],
-}, async env => {
-  let controller;
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    it('should render correctly', async () => {
+      const element = await controller.findElement('amp-script');
+      await expect(controller.getElementAttribute(element, 'class')).to.contain(
+        'i-amphtml-hydrated'
+      );
 
-  it('should render correctly', async() => {
-    const element = await controller.findElement('amp-script');
-    await expect(controller.getElementAttribute(element, 'class'))
-        .to.contain('i-amphtml-hydrated');
+      // Click.
+      const button = await controller.findElement('button#simple');
+      controller.click(button);
 
-    // Click.
-    const button = await controller.findElement('button#simple');
-    controller.click(button);
-
-    // Output.
-    const h1 = await controller.findElement('h1');
-    await expect(controller.getElementText(h1, 'class'))
-        .to.equal('Hello World!');
-  });
-});
+      // Output.
+      const h1 = await controller.findElement('h1');
+      await expect(controller.getElementText(h1, 'class')).to.equal(
+        'Hello World!'
+      );
+    });
+  }
+);
diff --git a/extensions/amp-script/0.1/test/integration/test-amp-script.js b/extensions/amp-script/0.1/test/integration/test-amp-script.js
index 63e5241f2c17..f8e0dad7b7d8 100644
--- a/extensions/amp-script/0.1/test/integration/test-amp-script.js
+++ b/extensions/amp-script/0.1/test/integration/test-amp-script.js
@@ -25,213 +25,240 @@ function poll(description, condition, opt_onError) {
 
 // TODO(choumx): If possible / desired, make these tests work on Single-pass,
 // on Windows (Edge, Firefox, and Chrome), and on Safari.
-describe.configure().skipSafari().skipSinglePass().skipWindows().run('amp-' +
-    'script', function() {
-  this.timeout(TIMEOUT);
-
-  let browser, doc, element;
-
-  describes.integration('container ', {
-    /* eslint-disable max-len */
-    body: `
+describe
+  .configure()
+  .skipSafari()
+  .skipSinglePass()
+  .skipWindows()
+  .run('amp-script', function() {
+    this.timeout(TIMEOUT);
+
+    let browser, doc, element;
+
+    describes.integration(
+      'container ',
+      {
+        /* eslint-disable max-len */
+        body: `
       <amp-script layout=container src="/examples/amp-script/hello-world.js">
         <button id="hello">Insert Hello World!</button>
         <button id="long">Long task</button>
       </amp-script>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-script'],
-    experiments: ['amp-script'],
-  }, env => {
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      doc = env.win.document;
-      element = doc.querySelector('amp-script');
-    });
-
-    it('should say "hello world"', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
-      browser.click('button#hello');
-
-      yield poll('mutations applied', () => {
-        const h1 = doc.querySelector('h1');
-        return h1 && h1.textContent == 'Hello World!';
-      });
-    });
-
-    it('should terminate without gesture', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
-      browser.click('button#hello');
-
-      // Give mutations time to apply.
-      yield browser.wait(100);
-      yield poll('terminated', () => {
-        return element.classList.contains('i-amphtml-broken');
-      });
-    });
-
-    it('should start long task', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
-      // TODO(dvoytenko): Find a way to test this with the race condition when
-      // the resource is fetched before the first polling iteration.
-      const stub = sandbox.stub(impl.userActivation_, 'expandLongTask');
-      browser.click('button#long');
-      yield poll('long task started', () => {
-        return stub.callCount > 0;
-      });
-    });
-  });
-
-  describes.integration('sanitizer', {
-    /* eslint-disable max-len */
-    body: `
+        /* eslint-enable max-len */
+        extensions: ['amp-script'],
+        experiments: ['amp-script'],
+      },
+      env => {
+        beforeEach(() => {
+          browser = new BrowserController(env.win);
+          doc = env.win.document;
+          element = doc.querySelector('amp-script');
+        });
+
+        it('should say "hello world"', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
+          browser.click('button#hello');
+
+          yield poll('mutations applied', () => {
+            const h1 = doc.querySelector('h1');
+            return h1 && h1.textContent == 'Hello World!';
+          });
+        });
+
+        it('should terminate without gesture', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
+          browser.click('button#hello');
+
+          // Give mutations time to apply.
+          yield browser.wait(100);
+          yield poll('terminated', () => {
+            return element.classList.contains('i-amphtml-broken');
+          });
+        });
+
+        it('should start long task', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
+          // TODO(dvoytenko): Find a way to test this with the race condition when
+          // the resource is fetched before the first polling iteration.
+          const stub = sandbox.stub(impl.userActivation_, 'expandLongTask');
+          browser.click('button#long');
+          yield poll('long task started', () => {
+            return stub.callCount > 0;
+          });
+        });
+      }
+    );
+
+    describes.integration(
+      'sanitizer',
+      {
+        /* eslint-disable max-len */
+        body: `
       <amp-script layout=container src="/examples/amp-script/hello-world.js">
         <p>Number of mutations: <span id="mutationCount">0</span></p>
         <button id="script">Insert script</button>
         <button id="img">Insert img</button>
       </amp-script>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-script'],
-    experiments: ['amp-script'],
-  }, env => {
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      doc = env.win.document;
-      element = doc.querySelector('amp-script');
-    });
-
-    it('should sanitize <script> injection', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
-      browser.click('button#script');
-
-      yield poll('mutations applied', () => {
-        const mc = doc.querySelector('#mutationCount');
-        return mc && mc.textContent == '1';
-      });
-
-      const scripts = element.querySelectorAll('script');
-      expect(scripts.length).to.equal(0);
-    });
-
-    it('should sanitize <img> injection', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
-      browser.click('button#img');
-
-      yield poll('mutations applied', () => {
-        const mc = doc.querySelector('#mutationCount');
-        return mc && mc.textContent == '1';
-      });
-
-      const scripts = element.querySelectorAll('img');
-      expect(scripts.length).to.equal(0);
-    });
-  });
-
-  describes.integration('fixed small', {
-    /* eslint-disable max-len */
-    body: `
+        /* eslint-enable max-len */
+        extensions: ['amp-script'],
+        experiments: ['amp-script'],
+      },
+      env => {
+        beforeEach(() => {
+          browser = new BrowserController(env.win);
+          doc = env.win.document;
+          element = doc.querySelector('amp-script');
+        });
+
+        it('should sanitize <script> injection', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
+          browser.click('button#script');
+
+          yield poll('mutations applied', () => {
+            const mc = doc.querySelector('#mutationCount');
+            return mc && mc.textContent == '1';
+          });
+
+          const scripts = element.querySelectorAll('script');
+          expect(scripts.length).to.equal(0);
+        });
+
+        it('should sanitize <img> injection', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => true);
+          browser.click('button#img');
+
+          yield poll('mutations applied', () => {
+            const mc = doc.querySelector('#mutationCount');
+            return mc && mc.textContent == '1';
+          });
+
+          const scripts = element.querySelectorAll('img');
+          expect(scripts.length).to.equal(0);
+        });
+      }
+    );
+
+    describes.integration(
+      'fixed small',
+      {
+        /* eslint-disable max-len */
+        body: `
       <amp-script layout=fixed width=300 height=200
           src="/examples/amp-script/hello-world.js">
         <button id="hello">Insert</button>
       </amp-script>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-script'],
-    experiments: ['amp-script'],
-  }, env => {
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      doc = env.win.document;
-      element = doc.querySelector('amp-script');
-    });
-
-    it('should allow without gesture for small size-defined', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
-      browser.click('button#hello');
-      yield poll('mutations applied', () => {
-        const h1 = doc.querySelector('h1');
-        return h1 && h1.textContent == 'Hello World!';
-      });
-    });
-  });
-
-  describes.integration('fixed big', {
-    /* eslint-disable max-len */
-    body: `
+        /* eslint-enable max-len */
+        extensions: ['amp-script'],
+        experiments: ['amp-script'],
+      },
+      env => {
+        beforeEach(() => {
+          browser = new BrowserController(env.win);
+          doc = env.win.document;
+          element = doc.querySelector('amp-script');
+        });
+
+        it('should allow without gesture for small size-defined', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
+          browser.click('button#hello');
+          yield poll('mutations applied', () => {
+            const h1 = doc.querySelector('h1');
+            return h1 && h1.textContent == 'Hello World!';
+          });
+        });
+      }
+    );
+
+    describes.integration(
+      'fixed big',
+      {
+        /* eslint-disable max-len */
+        body: `
       <amp-script layout=fixed width=300 height=301
           src="/examples/amp-script/hello-world.js">
         <button id="hello">Insert</button>
       </amp-script>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-script'],
-    experiments: ['amp-script'],
-  }, env => {
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      doc = env.win.document;
-      element = doc.querySelector('amp-script');
-    });
-
-    it('should terminate without gesture for big size-defined', function*() {
-      yield poll('<amp-script> to be hydrated',
-          () => element.classList.contains('i-amphtml-hydrated'));
-      const impl = yield element.getImpl();
-
-      // Give event listeners in hydration a moment to attach.
-      yield browser.wait(100);
-
-      sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
-      browser.click('button#hello');
-
-      // Give mutations time to apply.
-      yield browser.wait(100);
-      yield poll('terminated', () => {
-        return element.classList.contains('i-amphtml-broken');
-      });
-    });
+        /* eslint-enable max-len */
+        extensions: ['amp-script'],
+        experiments: ['amp-script'],
+      },
+      env => {
+        beforeEach(() => {
+          browser = new BrowserController(env.win);
+          doc = env.win.document;
+          element = doc.querySelector('amp-script');
+        });
+
+        it('should terminate without gesture for big size-defined', function*() {
+          yield poll('<amp-script> to be hydrated', () =>
+            element.classList.contains('i-amphtml-hydrated')
+          );
+          const impl = yield element.getImpl();
+
+          // Give event listeners in hydration a moment to attach.
+          yield browser.wait(100);
+
+          sandbox.stub(impl.userActivation_, 'isActive').callsFake(() => false);
+          browser.click('button#hello');
+
+          // Give mutations time to apply.
+          yield browser.wait(100);
+          yield poll('terminated', () => {
+            return element.classList.contains('i-amphtml-broken');
+          });
+        });
+      }
+    );
   });
-});
diff --git a/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js b/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
index 7b5f8becede7..2cf571024db8 100644
--- a/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
+++ b/extensions/amp-script/0.1/test/unit/test-user-activation-tracker.js
@@ -20,7 +20,6 @@ import {
 } from '../../user-activation-tracker';
 import {htmlFor} from '../../../../../src/static-template';
 
-
 describes.realWin('UserActivationTracker', {}, env => {
   let win;
   let root;
@@ -32,7 +31,9 @@ describes.realWin('UserActivationTracker', {}, env => {
     const doc = win.document;
     const html = htmlFor(doc);
 
-    root = html`<root></root>`;
+    root = html`
+      <root></root>
+    `;
     doc.body.appendChild(root);
 
     tracker = new UserActivationTracker(root);
@@ -97,20 +98,22 @@ describes.realWin('UserActivationTracker', {}, env => {
       clock.tick(ACTIVATION_TIMEOUT + 1);
       expect(tracker.isActive()).to.be.true;
 
-      return promise.then(() => {
-        // Skip microtask.
-        return microTask();
-      }).then(() => {
-        // The gesture window is expanded for an extra window.
-        expect(tracker.isActive()).to.be.true;
-        expect(tracker.isInLongTask()).to.be.false;
-
-        clock.tick(ACTIVATION_TIMEOUT - 1);
-        expect(tracker.isActive()).to.be.true;
-
-        clock.tick(2);
-        expect(tracker.isActive()).to.be.false;
-      });
+      return promise
+        .then(() => {
+          // Skip microtask.
+          return microTask();
+        })
+        .then(() => {
+          // The gesture window is expanded for an extra window.
+          expect(tracker.isActive()).to.be.true;
+          expect(tracker.isInLongTask()).to.be.false;
+
+          clock.tick(ACTIVATION_TIMEOUT - 1);
+          expect(tracker.isActive()).to.be.true;
+
+          clock.tick(2);
+          expect(tracker.isActive()).to.be.false;
+        });
     });
 
     it('should NOT expand when not active', () => {
@@ -128,19 +131,22 @@ describes.realWin('UserActivationTracker', {}, env => {
       clock.tick(ACTIVATION_TIMEOUT + 1);
       expect(tracker.isActive()).to.be.true;
 
-      return promise.catch(() => {}).then(() => {
-        // Skip microtask.
-        return microTask();
-      }).then(() => {
-        // The gesture window is expanded for an extra window.
-        expect(tracker.isActive()).to.be.true;
-
-        clock.tick(ACTIVATION_TIMEOUT - 1);
-        expect(tracker.isActive()).to.be.true;
-
-        clock.tick(2);
-        expect(tracker.isActive()).to.be.false;
-      });
+      return promise
+        .catch(() => {})
+        .then(() => {
+          // Skip microtask.
+          return microTask();
+        })
+        .then(() => {
+          // The gesture window is expanded for an extra window.
+          expect(tracker.isActive()).to.be.true;
+
+          clock.tick(ACTIVATION_TIMEOUT - 1);
+          expect(tracker.isActive()).to.be.true;
+
+          clock.tick(2);
+          expect(tracker.isActive()).to.be.false;
+        });
     });
   });
 });
diff --git a/extensions/amp-script/0.1/user-activation-tracker.js b/extensions/amp-script/0.1/user-activation-tracker.js
index 7634859ed432..92cb7ca6cb3a 100644
--- a/extensions/amp-script/0.1/user-activation-tracker.js
+++ b/extensions/amp-script/0.1/user-activation-tracker.js
@@ -14,18 +14,15 @@
  * limitations under the License.
  */
 
-
 export const ACTIVATION_TIMEOUT = 5000; // 5 seconds.
 
 const ACTIVATION_EVENTS = ['click', 'input', 'dblclick', 'keypress', 'submit'];
 
-
 /**
  * See https://github.com/dtapuska/useractivation for inspiration.
  * @implements {../../../src/service.Disposable}
  */
 export class UserActivationTracker {
-
   /**
    * @param {!Element} root
    */
@@ -41,9 +38,10 @@ export class UserActivationTracker {
 
     ACTIVATION_EVENTS.forEach(type => {
       this.root_.addEventListener(
-          type,
-          this.boundActivated_,
-          /* capture */ true);
+        type,
+        this.boundActivated_,
+        /* capture */ true
+      );
     });
   }
 
@@ -51,9 +49,10 @@ export class UserActivationTracker {
   dispose() {
     ACTIVATION_EVENTS.forEach(type => {
       this.root_.removeEventListener(
-          type,
-          this.boundActivated_,
-          /* capture */ true);
+        type,
+        this.boundActivated_,
+        /* capture */ true
+      );
     });
   }
 
@@ -70,9 +69,11 @@ export class UserActivationTracker {
    * @return {boolean}
    */
   isActive() {
-    return ((this.lastActivationTime_ > 0
-        && Date.now() - this.lastActivationTime_ <= ACTIVATION_TIMEOUT)
-        || this.inLongTask_);
+    return (
+      (this.lastActivationTime_ > 0 &&
+        Date.now() - this.lastActivationTime_ <= ACTIVATION_TIMEOUT) ||
+      this.inLongTask_
+    );
   }
 
   /**
@@ -91,11 +92,13 @@ export class UserActivationTracker {
       return;
     }
     this.inLongTask_ = true;
-    promise.catch(() => {}).then(() => {
-      this.inLongTask_ = false;
-      // Add additional "activity window" after a long task is done.
-      this.lastActivationTime_ = Date.now();
-    });
+    promise
+      .catch(() => {})
+      .then(() => {
+        this.inLongTask_ = false;
+        // Add additional "activity window" after a long task is done.
+        this.lastActivationTime_ = Date.now();
+      });
   }
 
   /**
diff --git a/extensions/amp-selector/0.1/amp-selector.js b/extensions/amp-selector/0.1/amp-selector.js
index 1d457e34a863..0f3c6f5c9a51 100644
--- a/extensions/amp-selector/0.1/amp-selector.js
+++ b/extensions/amp-selector/0.1/amp-selector.js
@@ -20,8 +20,11 @@ import {CSS} from '../../../build/amp-selector-0.1.css';
 import {Keys} from '../../../src/utils/key-codes';
 import {Services} from '../../../src/services';
 import {areEqualOrdered} from '../../../src/utils/array';
-import {closestAncestorElementBySelector, isRTL, tryFocus}
-  from '../../../src/dom';
+import {
+  closestAncestorElementBySelector,
+  isRTL,
+  tryFocus,
+} from '../../../src/dom';
 import {createCustomEvent} from '../../../src/event-helper';
 import {dev, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
@@ -100,9 +103,10 @@ export class AmpSelector extends AMP.BaseElement {
       kbSelectMode = kbSelectMode.toLowerCase();
       user().assertEnumValue(KEYBOARD_SELECT_MODES, kbSelectMode);
       userAssert(
-          !(this.isMultiple_ && kbSelectMode == KEYBOARD_SELECT_MODES.SELECT),
-          '[keyboard-select-mode=select] not supported for multiple ' +
-        'selection amp-selector');
+        !(this.isMultiple_ && kbSelectMode == KEYBOARD_SELECT_MODES.SELECT),
+        '[keyboard-select-mode=select] not supported for multiple ' +
+          'selection amp-selector'
+      );
     } else {
       kbSelectMode = KEYBOARD_SELECT_MODES.NONE;
     }
@@ -115,31 +119,48 @@ export class AmpSelector extends AMP.BaseElement {
     this.element.addEventListener('click', this.clickHandler_.bind(this));
     this.element.addEventListener('keydown', this.keyDownHandler_.bind(this));
 
-    this.registerAction('selectUp', invocation => {
-      const {args} = invocation;
-      const delta = (args && args['delta'] !== undefined) ? -args['delta'] : -1;
-      this.select_(delta);
-    }, ActionTrust.LOW);
-
-    this.registerAction('selectDown', invocation => {
-      const {args} = invocation;
-      const delta = (args && args['delta'] !== undefined) ? args['delta'] : 1;
-      this.select_(delta);
-    }, ActionTrust.LOW);
-
-    this.registerAction('toggle', invocation => {
-      const {args} = invocation;
-      userAssert(args['index'] >= 0, '\'index\' must be greater than 0');
-      userAssert(args['index'] < this.elements_.length, '\'index\' must ' +
-        'be less than the length of options in the <amp-selector>');
-      if (args && args['index'] !== undefined) {
-        this.toggle_(args['index'], args['value']);
-      }
-    }, ActionTrust.LOW);
+    this.registerAction(
+      'selectUp',
+      invocation => {
+        const {args} = invocation;
+        const delta = args && args['delta'] !== undefined ? -args['delta'] : -1;
+        this.select_(delta);
+      },
+      ActionTrust.LOW
+    );
+
+    this.registerAction(
+      'selectDown',
+      invocation => {
+        const {args} = invocation;
+        const delta = args && args['delta'] !== undefined ? args['delta'] : 1;
+        this.select_(delta);
+      },
+      ActionTrust.LOW
+    );
+
+    this.registerAction(
+      'toggle',
+      invocation => {
+        const {args} = invocation;
+        userAssert(args['index'] >= 0, "'index' must be greater than 0");
+        userAssert(
+          args['index'] < this.elements_.length,
+          "'index' must " +
+            'be less than the length of options in the <amp-selector>'
+        );
+        if (args && args['index'] !== undefined) {
+          this.toggle_(args['index'], args['value']);
+        }
+      },
+      ActionTrust.LOW
+    );
 
     // Triggers on DOM children updates
-    this.element.addEventListener(AmpEvents.DOM_UPDATE,
-        this.maybeRefreshOnUpdate_.bind(this));
+    this.element.addEventListener(
+      AmpEvents.DOM_UPDATE,
+      this.maybeRefreshOnUpdate_.bind(this)
+    );
   }
 
   /** @override */
@@ -416,11 +437,14 @@ export class AmpSelector extends AMP.BaseElement {
    */
   fireSelectEvent_(el) {
     const name = 'select';
-    const selectEvent =
-        createCustomEvent(this.win, `amp-selector.${name}`, dict({
-          'targetOption': el.getAttribute('option'),
-          'selectedOptions': this.selectedOptions_(),
-        }));
+    const selectEvent = createCustomEvent(
+      this.win,
+      `amp-selector.${name}`,
+      dict({
+        'targetOption': el.getAttribute('option'),
+        'selectedOptions': this.selectedOptions_(),
+      })
+    );
     this.action_.trigger(this.element, name, selectEvent, ActionTrust.HIGH);
   }
 
diff --git a/extensions/amp-selector/0.1/test/test-amp-selector.js b/extensions/amp-selector/0.1/test/test-amp-selector.js
index 3a1b098eee9d..886efb1a6c4d 100644
--- a/extensions/amp-selector/0.1/test/test-amp-selector.js
+++ b/extensions/amp-selector/0.1/test/test-amp-selector.js
@@ -18,1194 +18,1262 @@ import '../amp-selector';
 import {AmpEvents} from '../../../../src/amp-events';
 import {Keys} from '../../../../src/utils/key-codes';
 
-describes.realWin('amp-selector', {
-  win: { /* window spec */
-    location: '...',
-    historyOff: false,
+describes.realWin(
+  'amp-selector',
+  {
+    win: {
+      /* window spec */
+      location: '...',
+      historyOff: false,
+    },
+    amp: {
+      /* amp spec */
+      runtimeOn: false,
+      extensions: ['amp-selector:0.1'],
+    },
   },
-  amp: { /* amp spec */
-    runtimeOn: false,
-    extensions: ['amp-selector:0.1'],
-  },
-}, env => {
-  let win;
-  describe('test extension', () => {
-
-    function getSelector(options) {
-      win = env.win;
-
-      const attributes = options.attributes || {};
-      const config = options.config || {};
-
-      const ampSelector = win.document.createElement('amp-selector');
-      ampSelector.setAttribute('layout', 'container');
-      Object.keys(attributes).forEach(key => {
-        ampSelector.setAttribute(key, attributes[key]);
-      });
+  env => {
+    let win;
+    describe('test extension', () => {
+      function getSelector(options) {
+        win = env.win;
+
+        const attributes = options.attributes || {};
+        const config = options.config || {};
+
+        const ampSelector = win.document.createElement('amp-selector');
+        ampSelector.setAttribute('layout', 'container');
+        Object.keys(attributes).forEach(key => {
+          ampSelector.setAttribute(key, attributes[key]);
+        });
 
-      const numberOfChildren = config.count || 3;
-      let selectedCount = config.selectedCount || 0;
-      let disabledCount = config.disabledCount || 0;
-
-      for (let i = 0; i < numberOfChildren; i++) {
-        const child = win.document.createElement('div');
-        child.setAttribute('width', '10');
-        child.setAttribute('height', '10');
-        child.setAttribute('option', i);
-
-        if (numberOfChildren > selectedCount + disabledCount) {
-          if (selectedCount > 0) {
-            child.setAttribute('selected', '');
-            selectedCount--;
-          } else if (disabledCount > 0) {
-            child.setAttribute('disabled', '');
-            disabledCount--;
+        const numberOfChildren = config.count || 3;
+        let selectedCount = config.selectedCount || 0;
+        let disabledCount = config.disabledCount || 0;
+
+        for (let i = 0; i < numberOfChildren; i++) {
+          const child = win.document.createElement('div');
+          child.setAttribute('width', '10');
+          child.setAttribute('height', '10');
+          child.setAttribute('option', i);
+
+          if (numberOfChildren > selectedCount + disabledCount) {
+            if (selectedCount > 0) {
+              child.setAttribute('selected', '');
+              selectedCount--;
+            } else if (disabledCount > 0) {
+              child.setAttribute('disabled', '');
+              disabledCount--;
+            }
+          } else {
+            if (selectedCount > 0) {
+              child.setAttribute('selected', '');
+              selectedCount--;
+            }
+            if (disabledCount > 0) {
+              child.setAttribute('disabled', '');
+              disabledCount--;
+            }
           }
-        } else {
-          if (selectedCount > 0) {
-            child.setAttribute('selected', '');
-            selectedCount--;
-          }
-          if (disabledCount > 0) {
-            child.setAttribute('disabled', '');
-            disabledCount--;
-          }
-        }
 
-        const childAttributes = options.optionAttributes || {};
-        Object.keys(childAttributes).forEach(key => {
-          child.setAttribute(key, childAttributes[key]);
-        });
+          const childAttributes = options.optionAttributes || {};
+          Object.keys(childAttributes).forEach(key => {
+            child.setAttribute(key, childAttributes[key]);
+          });
 
-        ampSelector.appendChild(child);
+          ampSelector.appendChild(child);
+        }
+        win.document.body.appendChild(ampSelector);
+        return ampSelector;
       }
-      win.document.body.appendChild(ampSelector);
-      return ampSelector;
-    }
-
-    function keyPress(ampSelector, key, opt_target) {
-      const impl = ampSelector.implementation_;
-      const event = {
-        key,
-        preventDefault: () => {},
-        target: opt_target,
-      };
-      impl.keyDownHandler_(event);
-    }
-
-    it('should build properly', function* () {
-      let ampSelector = getSelector({});
-      let impl = ampSelector.implementation_;
-      let initSpy = sandbox.spy(impl, 'init_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.false;
-      expect(initSpy).to.be.calledOnce;
-
-
-      ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      impl = ampSelector.implementation_;
-      initSpy = sandbox.spy(impl, 'init_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.be.calledOnce;
-
-      ampSelector = getSelector({
-        attributes: {
-          disabled: true,
-          multiple: true,
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      impl = ampSelector.implementation_;
-      initSpy = sandbox.spy(impl, 'init_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.be.calledOnce;
-    });
-
-    it('should retain existing roles', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          role: 'tablist',
-        },
-        optionAttributes: {
-          role: 'tab',
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      const impl = ampSelector.implementation_;
-      yield ampSelector.build();
-      expect(impl.element.getAttribute('role')).to.equal('tablist');
-      const options = impl.getElementsForTesting();
-      expect(options[0].getAttribute('role')).to.equal('tab');
-    });
 
-    it('should init properly for single select', function* () {
-      let ampSelector = getSelector({});
-      let impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      let setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      let initSpy = sandbox.spy(impl, 'init_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.false;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(0);
-      expect(setInputsSpy).to.have.been.calledOnce;
-
-
-      ampSelector = getSelector({
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      impl = ampSelector.implementation_;
-      setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      initSpy = sandbox.spy(impl, 'init_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.false;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(1);
-      const options = impl.getElementsForTesting();
-      expect(options[1].hasAttribute('selected')).to.be.true;
-      expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
-      expect(setInputsSpy).to.have.been.calledThrice; // once to set, twice to clear
-    });
-
-    it('should init properly for multiselect', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      const impl = ampSelector.implementation_;
-      const initSpy = sandbox.spy(impl, 'init_');
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      yield ampSelector.build();
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(2);
-      expect(setInputsSpy).to.have.been.calledOnce;
-    });
-
-    it('should init properly for selector with disabled options', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 10,
-          selectedCount: 2,
-          disabledCount: 5,
-        },
-      });
-      const impl = ampSelector.implementation_;
-      const initSpy = sandbox.spy(impl, 'init_');
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      yield ampSelector.build();
-
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getElementsForTesting().length).to.equal(10);
-      expect(impl.getSelectedElementsForTesting().length).to.equal(2);
-      expect(setInputsSpy).to.have.been.calledOnce;
-    });
-
-
-    it('should setSelection for single select', function* () {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
-      });
-
-      const impl = ampSelector.implementation_;
-      const initSpy = sandbox.spy(impl, 'init_');
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      const clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      yield ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      expect(impl.isMultiple_).to.be.false;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(1);
-      expect(setInputsSpy).to.have.been.calledThrice;
-      expect(options[1].hasAttribute('selected')).to.be.true;
-      expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
-
-      impl.setSelection_(options[3]);
-      expect(impl.getSelectedElementsForTesting().length).to.equal(1);
-      expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
-      expect(options[3].hasAttribute('selected')).to.be.true;
-      expect(options[3].getAttribute('aria-selected')).to.be.equal('true');
-
-    });
-
-    it('should setSelection for multi select', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
-      });
-
-      const impl = ampSelector.implementation_;
-      const initSpy = sandbox.spy(impl, 'init_');
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      yield ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(2);
-      expect(setInputsSpy).to.have.been.calledOnce;
-      expect(options[0].hasAttribute('selected')).to.be.true;
-      expect(options[0].getAttribute('aria-selected')).to.be.equal('true');
-      expect(options[1].hasAttribute('selected')).to.be.true;
-      expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
-
-      impl.setSelection_(options[3]);
-      expect(impl.getSelectedElementsForTesting().length).to.equal(3);
-      expect(options[3].hasAttribute('selected')).to.be.true;
-      expect(options[3].getAttribute('aria-selected')).to.be.equal('true');
-    });
-
-
-    it('should clearSelection', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
-      });
-
-      const impl = ampSelector.implementation_;
-      const initSpy = sandbox.spy(impl, 'init_');
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-      yield ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      expect(impl.isMultiple_).to.be.true;
-      expect(initSpy).to.have.been.calledOnce;
-      expect(impl.getSelectedElementsForTesting().length).to.equal(2);
-      expect(setInputsSpy).to.have.been.calledOnce;
-      expect(options[0].hasAttribute('selected')).to.be.true;
-      expect(options[0].getAttribute('aria-selected')).to.be.equal('true');
-      expect(options[1].hasAttribute('selected')).to.be.true;
-      expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
-
-      impl.clearSelection_(options[1]);
-      expect(impl.getSelectedElementsForTesting().length).to.equal(1);
-      expect(options[1].hasAttribute('selected')).to.be.false;
-      expect(options[1].getAttribute('aria-selected')).to.be.equal('false');
-
-    });
-
-    it('should setInputs properly', function* () {
-      let ampSelector = getSelector({});
-      let impl = ampSelector.implementation_;
-      yield ampSelector.build();
-      expect(impl.inputs_.length).to.equal(0);
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'single_select',
-        },
-      });
+      function keyPress(ampSelector, key, opt_target) {
+        const impl = ampSelector.implementation_;
+        const event = {
+          key,
+          preventDefault: () => {},
+          target: opt_target,
+        };
+        impl.keyDownHandler_(event);
+      }
 
-      impl = ampSelector.implementation_;
-      yield ampSelector.build();
-      expect(impl.inputs_.length).to.equal(0);
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'single_select',
-        },
-        config: {
-          count: 4,
-          selectedCount: 0,
-        },
-      });
-      impl = ampSelector.implementation_;
-      yield ampSelector.build();
-      expect(impl.inputs_.length).to.equal(0);
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'single_select',
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      impl = ampSelector.implementation_;
-      yield ampSelector.build();
-
-      let options = impl.getElementsForTesting();
-      expect(impl.inputs_.length).to.equal(1);
-      expect(impl.getSelectedElementsForTesting())
-          .to.include.members([options[1]]);
-
-      impl.setSelection_(options[3]);
-      impl.setInputs_();
-      expect(impl.inputs_.length).to.equal(1);
-      expect(impl.getSelectedElementsForTesting())
-          .to.include.members([options[3]]);
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      impl = ampSelector.implementation_;
-
-      yield ampSelector.build();
-      options = impl.getElementsForTesting();
-      expect(impl.inputs_.length).to.equal(2);
-      expect(impl.getSelectedElementsForTesting()).to.include.members([
-        options[0],
-        options[1],
-      ]);
-
-      impl.setSelection_(options[2]);
-      impl.setInputs_();
-      expect(impl.inputs_.length).to.equal(3);
-      expect(impl.getSelectedElementsForTesting()).to.include.members([
-        options[0],
-        options[1],
-        options[2],
-      ]);
-    });
+      it('should build properly', function*() {
+        let ampSelector = getSelector({});
+        let impl = ampSelector.implementation_;
+        let initSpy = sandbox.spy(impl, 'init_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.false;
+        expect(initSpy).to.be.calledOnce;
 
-    it('should not create hidden inputs for disabled options', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-          disabledCount: 4,
-        },
-      });
-      const impl = ampSelector.implementation_;
-      yield ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      expect(impl.inputs_.length).to.equal(0);
-      impl.setSelection_(options[3]);
-      impl.setInputs_();
-      expect(impl.inputs_.length).to.equal(0);
-    });
+        ampSelector = getSelector({
+          attributes: {
+            multiple: true,
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        impl = ampSelector.implementation_;
+        initSpy = sandbox.spy(impl, 'init_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.be.calledOnce;
 
-    it('should handle clicks', function* () {
-      let ampSelector = getSelector({
-        attributes: {
-          name: 'single_select',
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      let impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-
-      let options = impl.getElementsForTesting();
-      let clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      let setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-      let e = {
-        target: options[3],
-      };
-      impl.clickHandler_(e);
-
-      expect(options[3].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[3]);
-      expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      e = {
-        target: document.body,
-      };
-
-      impl.clickHandler_(e);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      e = {
-        target: options[3],
-      };
-      impl.clickHandler_(e);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
+        ampSelector = getSelector({
+          attributes: {
+            disabled: true,
+            multiple: true,
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        impl = ampSelector.implementation_;
+        initSpy = sandbox.spy(impl, 'init_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.be.calledOnce;
       });
 
-      impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-
-      options = impl.getElementsForTesting();
-      clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-
-      e = {
-        target: options[4],
-      };
-
-      impl.clickHandler_(e);
-      expect(options[4].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[4]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.not.have.been.called;
-
-      impl.clickHandler_(e);
-      expect(options[4].hasAttribute('selected')).to.be.false;
-      expect(clearSelectionSpy).to.have.been.calledWith(options[4]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      e = {
-        target: options[2],
-      };
-      impl.clickHandler_(e);
-      expect(options[2].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[2]);
-      expect(setSelectionSpy).to.have.been.calledTwice;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          disabledCount: 2,
-        },
+      it('should retain existing roles', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            role: 'tablist',
+          },
+          optionAttributes: {
+            role: 'tab',
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        const impl = ampSelector.implementation_;
+        yield ampSelector.build();
+        expect(impl.element.getAttribute('role')).to.equal('tablist');
+        const options = impl.getElementsForTesting();
+        expect(options[0].getAttribute('role')).to.equal('tab');
       });
 
-      impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-      clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-
-      e = {
-        target: impl.element.children[0],
-      };
-
-      impl.clickHandler_(e);
-      expect(setSelectionSpy).to.not.have.been.called;
-      expect(clearSelectionSpy).to.not.have.been.called;
-    });
+      it('should init properly for single select', function*() {
+        let ampSelector = getSelector({});
+        let impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        let setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        let initSpy = sandbox.spy(impl, 'init_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.false;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(0);
+        expect(setInputsSpy).to.have.been.calledOnce;
 
-    it('should handle keyboard selection', function* () {
-      let ampSelector = getSelector({
-        attributes: {
-          name: 'single_select',
-        },
-        config: {
-          count: 4,
-          selectedCount: 2,
-        },
-      });
-      let impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-
-      let options = impl.getElementsForTesting();
-      let clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      let setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-
-      keyPress(ampSelector, Keys.ENTER, options[3]);
-      expect(options[3].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[3]);
-      expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      keyPress(ampSelector, Keys.ENTER, options[3]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
+        ampSelector = getSelector({
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        impl = ampSelector.implementation_;
+        setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        initSpy = sandbox.spy(impl, 'init_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.false;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(1);
+        const options = impl.getElementsForTesting();
+        expect(options[1].hasAttribute('selected')).to.be.true;
+        expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
+        expect(setInputsSpy).to.have.been.calledThrice; // once to set, twice to clear
       });
 
-      impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-
-      options = impl.getElementsForTesting();
-      clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-
-      keyPress(ampSelector, Keys.SPACE, options[4]);
-      expect(options[4].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[4]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.not.have.been.called;
-
-      keyPress(ampSelector, Keys.SPACE, options[4]);
-      expect(options[4].hasAttribute('selected')).to.be.false;
-      expect(clearSelectionSpy).to.have.been.calledWith(options[4]);
-      expect(setSelectionSpy).to.have.been.calledOnce;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      keyPress(ampSelector, Keys.ENTER, options[2]);
-      expect(options[2].hasAttribute('selected')).to.be.true;
-      expect(setSelectionSpy).to.have.been.calledWith(options[2]);
-      expect(setSelectionSpy).to.have.been.calledTwice;
-      expect(clearSelectionSpy).to.have.been.calledOnce;
-
-      ampSelector = getSelector({
-        attributes: {
-          name: 'muti_select',
-          multiple: true,
-        },
-        config: {
-          count: 5,
-          disabledCount: 2,
-        },
+      it('should init properly for multiselect', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            multiple: true,
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        const impl = ampSelector.implementation_;
+        const initSpy = sandbox.spy(impl, 'init_');
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        yield ampSelector.build();
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(2);
+        expect(setInputsSpy).to.have.been.calledOnce;
       });
 
-      impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      yield ampSelector.build();
-      clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
-      setSelectionSpy = sandbox.spy(impl, 'setSelection_');
-
-      keyPress(ampSelector, Keys.SPACE, impl.element.children[0]);
-      expect(setSelectionSpy).to.not.have.been.called;
-      expect(clearSelectionSpy).to.not.have.been.called;
-    });
+      it('should init properly for selector with disabled options', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            multiple: true,
+          },
+          config: {
+            count: 10,
+            selectedCount: 2,
+            disabledCount: 5,
+          },
+        });
+        const impl = ampSelector.implementation_;
+        const initSpy = sandbox.spy(impl, 'init_');
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        yield ampSelector.build();
 
-    it('should update selection when `selected` attribute is mutated', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 1,
-        },
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getElementsForTesting().length).to.equal(10);
+        expect(impl.getSelectedElementsForTesting().length).to.equal(2);
+        expect(setInputsSpy).to.have.been.calledOnce;
       });
 
-      const impl = ampSelector.implementation_;
-      ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      const setInputsSpy = sandbox.spy(impl, 'setInputs_');
-
-      expect(options[0].hasAttribute('selected')).to.be.true;
-      expect(options[3].hasAttribute('selected')).to.be.false;
-
-      impl.mutatedAttributesCallback({selected: '3'});
-
-      expect(options[0].hasAttribute('selected')).to.be.false;
-      expect(options[3].hasAttribute('selected')).to.be.true;
-
-      // Integers should be converted to strings.
-      impl.mutatedAttributesCallback({selected: 0});
-
-      expect(options[0].hasAttribute('selected')).to.be.true;
-      expect(options[3].hasAttribute('selected')).to.be.false;
+      it('should setSelection for single select', function*() {
+        const ampSelector = getSelector({
+          config: {
+            count: 5,
+            selectedCount: 2,
+          },
+        });
 
-      expect(setInputsSpy).to.have.callCount(4);
-    });
+        const impl = ampSelector.implementation_;
+        const initSpy = sandbox.spy(impl, 'init_');
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        const clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        yield ampSelector.build();
 
-    it('should support `disabled` attribute mutation', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 1,
-        },
+        const options = impl.getElementsForTesting();
+        expect(impl.isMultiple_).to.be.false;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(1);
+        expect(setInputsSpy).to.have.been.calledThrice;
+        expect(options[1].hasAttribute('selected')).to.be.true;
+        expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
+
+        impl.setSelection_(options[3]);
+        expect(impl.getSelectedElementsForTesting().length).to.equal(1);
+        expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
+        expect(options[3].hasAttribute('selected')).to.be.true;
+        expect(options[3].getAttribute('aria-selected')).to.be.equal('true');
       });
 
-      const impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-      ampSelector.build();
-
-      const options = impl.getElementsForTesting();
-      expect(options[0].hasAttribute('selected')).to.be.true;
-      expect(options[3].hasAttribute('selected')).to.be.false;
-
-      impl.clickHandler_({target: options[3]});
-
-      // When not disabled, clicking an option should select it.
-      expect(options[0].hasAttribute('selected')).to.be.false;
-      expect(options[3].hasAttribute('selected')).to.be.true;
-
-      expect(ampSelector.hasAttribute('aria-disabled')).to.be.false;
-
-      ampSelector.setAttribute('disabled', '');
-      impl.mutatedAttributesCallback({disabled: true});
-
-      expect(ampSelector.getAttribute('aria-disabled')).to.equal('true');
-
-      impl.clickHandler_({target: options[0]});
-
-      // When disabled, clicking an option should not select it.
-      expect(options[0].hasAttribute('selected')).to.be.false;
-      expect(options[3].hasAttribute('selected')).to.be.true;
-    });
-
-    it('should trigger `toggle` action even when no `value` argument is' +
-      ' provided to the function', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 1,
-        },
-      });
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-
-      expect(ampSelector.hasAttribute('multiple')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-
-      // Test the case where the element to be `selected` and the currently
-      // selected element are different
-      let args = {'index': 2};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
-
-      // Test the case where the element to be `selected` and the currently
-      // selected element are the same
-      args = {'index': 2};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-    });
+      it('should setSelection for multi select', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            multiple: true,
+          },
+          config: {
+            count: 5,
+            selectedCount: 2,
+          },
+        });
 
-    it('should trigger `toggle` action even with specified `value`' +
-      ' argument', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 1,
-        },
-      });
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-
-      expect(ampSelector.hasAttribute('multiple')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-
-      // Test the case where the element to be `selected` and the currently
-      // selected element are different
-      let args = {'index': 2, 'value': true};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
-
-      // Test the case where the element to be `selected` and the currently
-      // selected element are the same
-      args = {'index': 2, 'value': true};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
-
-      // Test the case where the element to be removed as `selected` and
-      // the currently selected element are the same
-      args = {'index': 2, 'value': false};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-
-      // Test the case where the element to be removed as `selected`
-      // is different from the currently `selected` element
-      ampSelector.children[0].setAttribute('selected', '');
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-
-      args = {'index': 2, 'value': false};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-    });
+        const impl = ampSelector.implementation_;
+        const initSpy = sandbox.spy(impl, 'init_');
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        yield ampSelector.build();
 
-    it('should trigger "select" event when user selects an option', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 2,
-        },
+        const options = impl.getElementsForTesting();
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(2);
+        expect(setInputsSpy).to.have.been.calledOnce;
+        expect(options[0].hasAttribute('selected')).to.be.true;
+        expect(options[0].getAttribute('aria-selected')).to.be.equal('true');
+        expect(options[1].hasAttribute('selected')).to.be.true;
+        expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
+
+        impl.setSelection_(options[3]);
+        expect(impl.getSelectedElementsForTesting().length).to.equal(3);
+        expect(options[3].hasAttribute('selected')).to.be.true;
+        expect(options[3].getAttribute('aria-selected')).to.be.equal('true');
       });
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-
-      const options = impl.getElementsForTesting();
-      const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-      impl.clickHandler_({target: options[3]});
 
-      expect(triggerSpy).to.be.calledOnce;
-      expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
-
-      const event = triggerSpy.firstCall.args[2];
-      expect(event).to.have.property('detail');
-      expect(event.detail).to.have.property('targetOption', '3');
-      expect(event.detail).to.have.deep.property('selectedOptions', ['3']);
-    });
+      it('should clearSelection', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            multiple: true,
+          },
+          config: {
+            count: 5,
+            selectedCount: 2,
+          },
+        });
 
-    it('should trigger "select" event when an item is toggled', () => {
-      const ampSelector = getSelector({
-        config: {
-          count: 5,
-          selectedCount: 1,
-        },
-      });
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-
-      const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-      const args = {'index': 3, 'value': true};
-      impl.executeAction(
-          {method: 'toggle', args, satisfiesTrust: () => true});
-
-      expect(triggerSpy).to.be.calledOnce;
-      expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
-
-      const event = triggerSpy.firstCall.args[2];
-      expect(event).to.have.property('detail');
-      expect(event.detail).to.have.property('targetOption', '3');
-      expect(event.detail).to.have.deep.property('selectedOptions', ['3']);
-    });
+        const impl = ampSelector.implementation_;
+        const initSpy = sandbox.spy(impl, 'init_');
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+        yield ampSelector.build();
 
-    it('should trigger "select" event for multiple selections', function* () {
-      const ampSelector = getSelector({
-        attributes: {
-          multiple: true,
-        },
-        config: {
-          count: 6,
-        },
+        const options = impl.getElementsForTesting();
+        expect(impl.isMultiple_).to.be.true;
+        expect(initSpy).to.have.been.calledOnce;
+        expect(impl.getSelectedElementsForTesting().length).to.equal(2);
+        expect(setInputsSpy).to.have.been.calledOnce;
+        expect(options[0].hasAttribute('selected')).to.be.true;
+        expect(options[0].getAttribute('aria-selected')).to.be.equal('true');
+        expect(options[1].hasAttribute('selected')).to.be.true;
+        expect(options[1].getAttribute('aria-selected')).to.be.equal('true');
+
+        impl.clearSelection_(options[1]);
+        expect(impl.getSelectedElementsForTesting().length).to.equal(1);
+        expect(options[1].hasAttribute('selected')).to.be.false;
+        expect(options[1].getAttribute('aria-selected')).to.be.equal('false');
       });
-      ampSelector.children[0].setAttribute('selected', '');
-      ampSelector.children[1].setAttribute('selected', '');
-
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-      impl.mutateElement = fn => fn();
-
-      const options = impl.getElementsForTesting();
-      const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-      impl.clickHandler_({target: options[2]});
 
-      expect(triggerSpy).to.be.calledOnce;
-      expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
+      it('should setInputs properly', function*() {
+        let ampSelector = getSelector({});
+        let impl = ampSelector.implementation_;
+        yield ampSelector.build();
+        expect(impl.inputs_.length).to.equal(0);
 
-      const event = triggerSpy.firstCall.args[2];
-      expect(event).to.have.property('detail');
-      expect(event.detail).to.have.property('targetOption', '2');
-      expect(event.detail).to.have.deep.property('selectedOptions',
-          ['0', '1', '2']);
-    });
+        ampSelector = getSelector({
+          attributes: {
+            name: 'single_select',
+          },
+        });
 
-    it('should trigger `select` action when user uses ' +
-      '`selectUp`/`selectDown` action with default delta value of 1', () => {
-      const ampSelector = getSelector({
-        attributes: {
-          id: 'ampSelector',
-        },
-        config: {
-          count: 6,
-        },
-      });
-      ampSelector.children[0].setAttribute('selected', '');
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
+        impl = ampSelector.implementation_;
+        yield ampSelector.build();
+        expect(impl.inputs_.length).to.equal(0);
 
-      expect(ampSelector.hasAttribute('multiple')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+        ampSelector = getSelector({
+          attributes: {
+            name: 'single_select',
+          },
+          config: {
+            count: 4,
+            selectedCount: 0,
+          },
+        });
+        impl = ampSelector.implementation_;
+        yield ampSelector.build();
+        expect(impl.inputs_.length).to.equal(0);
 
-      impl.executeAction({method: 'selectDown', satisfiesTrust: () => true});
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
+        ampSelector = getSelector({
+          attributes: {
+            name: 'single_select',
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        impl = ampSelector.implementation_;
+        yield ampSelector.build();
 
-      impl.executeAction({method: 'selectUp', satisfiesTrust: () => true});
+        let options = impl.getElementsForTesting();
+        expect(impl.inputs_.length).to.equal(1);
+        expect(impl.getSelectedElementsForTesting()).to.include.members([
+          options[1],
+        ]);
 
-      expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+        impl.setSelection_(options[3]);
+        impl.setInputs_();
+        expect(impl.inputs_.length).to.equal(1);
+        expect(impl.getSelectedElementsForTesting()).to.include.members([
+          options[3],
+        ]);
 
-    });
+        ampSelector = getSelector({
+          attributes: {
+            name: 'muti_select',
+            multiple: true,
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+          },
+        });
+        impl = ampSelector.implementation_;
 
-    it('should trigger `select` action when user uses ' +
-      '`selectUp`/`selectDown` action with user specified delta value', () => {
-      const ampSelector = getSelector({
-        attributes: {
-          id: 'ampSelector',
-        },
-        config: {
-          count: 6,
-        },
+        yield ampSelector.build();
+        options = impl.getElementsForTesting();
+        expect(impl.inputs_.length).to.equal(2);
+        expect(impl.getSelectedElementsForTesting()).to.include.members([
+          options[0],
+          options[1],
+        ]);
+
+        impl.setSelection_(options[2]);
+        impl.setInputs_();
+        expect(impl.inputs_.length).to.equal(3);
+        expect(impl.getSelectedElementsForTesting()).to.include.members([
+          options[0],
+          options[1],
+          options[2],
+        ]);
       });
-      ampSelector.children[0].setAttribute('selected', '');
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-
-      expect(ampSelector.hasAttribute('multiple')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-
-      let args = {'delta': 2};
-      impl.executeAction(
-          {method: 'selectDown', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
-
-      args = {'delta': 2};
-      impl.executeAction(
-          {method: 'selectUp', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-    });
 
-    it('should trigger `select` action when user uses ' +
-      '`selectUp`/`selectDown` action with user specified delta value ' +
-      '(test large values)', () => {
-      const ampSelector = getSelector({
-        attributes: {
-          id: 'ampSelector',
-        },
-        config: {
-          count: 5,
-        },
-      });
-      ampSelector.children[1].setAttribute('selected', '');
-      ampSelector.build();
-      const impl = ampSelector.implementation_;
-
-      expect(ampSelector.hasAttribute('multiple')).to.be.false;
-      expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
-
-      let args = {'delta': 1001};
-      impl.executeAction(
-          {method: 'selectDown', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
-
-      args = {'delta': 1001};
-      impl.executeAction(
-          {method: 'selectUp', args, satisfiesTrust: () => true});
-      expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-      expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
-    });
+      it('should not create hidden inputs for disabled options', function*() {
+        const ampSelector = getSelector({
+          attributes: {
+            name: 'muti_select',
+            multiple: true,
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
+            disabledCount: 4,
+          },
+        });
+        const impl = ampSelector.implementation_;
+        yield ampSelector.build();
 
-    describe('keyboard-select-mode', () => {
-      it('should have `none` mode by default', () => {
-        const ampSelector = getSelector({});
-        ampSelector.build();
-        expect(ampSelector.implementation_.kbSelectMode_).to.equal('none');
+        const options = impl.getElementsForTesting();
+        expect(impl.inputs_.length).to.equal(0);
+        impl.setSelection_(options[3]);
+        impl.setInputs_();
+        expect(impl.inputs_.length).to.equal(0);
       });
 
-      it('should initially focus selected option ONLY if ' +
-         'it exists for single-select, otherwise first option', () => {
-        const selectorWithNoSelection = getSelector({
+      it('should handle clicks', function*() {
+        let ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'focus',
+            name: 'single_select',
+          },
+          config: {
+            count: 4,
+            selectedCount: 2,
           },
         });
-        selectorWithNoSelection.build();
-        expect(selectorWithNoSelection.children[0].tabIndex).to.equal(0);
-        for (let i = 1; i < selectorWithNoSelection.children.length; i++) {
-          // No other options should be reachable by
-          expect(selectorWithNoSelection.children[i].tabIndex).to.equal(-1);
-        }
+        let impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
 
-        const selectorWithSelection = getSelector({
+        let options = impl.getElementsForTesting();
+        let clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        let setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+        let e = {
+          target: options[3],
+        };
+        impl.clickHandler_(e);
+
+        expect(options[3].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[3]);
+        expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        e = {
+          target: document.body,
+        };
+
+        impl.clickHandler_(e);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        e = {
+          target: options[3],
+        };
+        impl.clickHandler_(e);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'focus',
+            name: 'muti_select',
+            multiple: true,
           },
           config: {
-            count: 3,
+            count: 5,
+            selectedCount: 2,
           },
         });
-        selectorWithSelection.children[1].setAttribute('selected', '');
-        selectorWithSelection.build();
-        expect(selectorWithSelection.children[0].tabIndex).to.equal(-1);
-        expect(selectorWithSelection.children[1].tabIndex).to.equal(0);
-        expect(selectorWithSelection.children[2].tabIndex).to.equal(-1);
-      });
 
-      it('should initially focus first option for multi-select', () => {
-        const ampSelector = getSelector({
+        impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
+
+        options = impl.getElementsForTesting();
+        clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+
+        e = {
+          target: options[4],
+        };
+
+        impl.clickHandler_(e);
+        expect(options[4].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[4]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.not.have.been.called;
+
+        impl.clickHandler_(e);
+        expect(options[4].hasAttribute('selected')).to.be.false;
+        expect(clearSelectionSpy).to.have.been.calledWith(options[4]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        e = {
+          target: options[2],
+        };
+        impl.clickHandler_(e);
+        expect(options[2].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[2]);
+        expect(setSelectionSpy).to.have.been.calledTwice;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        ampSelector = getSelector({
           attributes: {
+            name: 'muti_select',
             multiple: true,
-            'keyboard-select-mode': 'focus',
           },
           config: {
-            count: 3,
+            count: 5,
+            disabledCount: 2,
           },
         });
-        ampSelector.children[1].setAttribute('selected', '');
-        ampSelector.build();
-        expect(ampSelector.children[0].tabIndex).to.equal(0);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
+
+        impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
+        clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+
+        e = {
+          target: impl.element.children[0],
+        };
+
+        impl.clickHandler_(e);
+        expect(setSelectionSpy).to.not.have.been.called;
+        expect(clearSelectionSpy).to.not.have.been.called;
       });
 
-      it('should NOT update focus if keyboard-select-mode is disabled', () => {
-        const ampSelector = getSelector({
+      it('should handle keyboard selection', function*() {
+        let ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'none',
+            name: 'single_select',
           },
           config: {
-            count: 3,
+            count: 4,
+            selectedCount: 2,
           },
         });
-        const spy = sandbox.spy(
-            ampSelector.implementation_,
-            'navigationKeyDownHandler_');
-        ampSelector.build();
-        keyPress(ampSelector, Keys.RIGHT_ARROW);
-        expect(spy).to.not.have.been.called;
-      });
+        let impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
 
-      it('should update focus when the user presses the arrow keys when ' +
-         'keyboard-select-mode is enabled', () => {
-        const ampSelector = getSelector({
+        let options = impl.getElementsForTesting();
+        let clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        let setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+
+        keyPress(ampSelector, Keys.ENTER, options[3]);
+        expect(options[3].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[3]);
+        expect(clearSelectionSpy).to.have.been.calledWith(options[1]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        keyPress(ampSelector, Keys.ENTER, options[3]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'focus',
+            name: 'muti_select',
+            multiple: true,
           },
           config: {
-            count: 3,
+            count: 5,
+            selectedCount: 2,
           },
         });
-        ampSelector.build();
-        expect(ampSelector.children[0].tabIndex).to.equal(0);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-        keyPress(ampSelector, Keys.LEFT_ARROW);
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(0);
-        keyPress(ampSelector, Keys.RIGHT_ARROW);
-        expect(ampSelector.children[0].tabIndex).to.equal(0);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-      });
 
-      it('should update focus for single-select when ' +
-         'selection is changed without user interaction', () => {
-        const ampSelector = getSelector({
+        impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
+
+        options = impl.getElementsForTesting();
+        clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+
+        keyPress(ampSelector, Keys.SPACE, options[4]);
+        expect(options[4].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[4]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.not.have.been.called;
+
+        keyPress(ampSelector, Keys.SPACE, options[4]);
+        expect(options[4].hasAttribute('selected')).to.be.false;
+        expect(clearSelectionSpy).to.have.been.calledWith(options[4]);
+        expect(setSelectionSpy).to.have.been.calledOnce;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        keyPress(ampSelector, Keys.ENTER, options[2]);
+        expect(options[2].hasAttribute('selected')).to.be.true;
+        expect(setSelectionSpy).to.have.been.calledWith(options[2]);
+        expect(setSelectionSpy).to.have.been.calledTwice;
+        expect(clearSelectionSpy).to.have.been.calledOnce;
+
+        ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'focus',
+            name: 'muti_select',
+            multiple: true,
           },
           config: {
-            count: 3,
+            count: 5,
+            disabledCount: 2,
           },
         });
-        ampSelector.children[1].setAttribute('selected', '');
-        ampSelector.build();
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(0);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-
-        ampSelector.implementation_.mutatedAttributesCallback({selected: 2});
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(0);
+
+        impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
+        yield ampSelector.build();
+        clearSelectionSpy = sandbox.spy(impl, 'clearSelection_');
+        setSelectionSpy = sandbox.spy(impl, 'setSelection_');
+
+        keyPress(ampSelector, Keys.SPACE, impl.element.children[0]);
+        expect(setSelectionSpy).to.not.have.been.called;
+        expect(clearSelectionSpy).to.not.have.been.called;
       });
 
-      it('should NOT allow `select` mode for multi-select selectors', () => {
+      it('should update selection when `selected` attribute is mutated', () => {
         const ampSelector = getSelector({
-          attributes: {
-            'keyboard-select-mode': 'select',
-            multiple: true,
+          config: {
+            count: 5,
+            selectedCount: 1,
           },
         });
-        return allowConsoleError(() => {
-          return expect(ampSelector.build()).to.eventually.be.rejectedWith(
-              /not supported for multiple selection amp-selector​​​/);
-        });
+
+        const impl = ampSelector.implementation_;
+        ampSelector.build();
+
+        const options = impl.getElementsForTesting();
+        const setInputsSpy = sandbox.spy(impl, 'setInputs_');
+
+        expect(options[0].hasAttribute('selected')).to.be.true;
+        expect(options[3].hasAttribute('selected')).to.be.false;
+
+        impl.mutatedAttributesCallback({selected: '3'});
+
+        expect(options[0].hasAttribute('selected')).to.be.false;
+        expect(options[3].hasAttribute('selected')).to.be.true;
+
+        // Integers should be converted to strings.
+        impl.mutatedAttributesCallback({selected: 0});
+
+        expect(options[0].hasAttribute('selected')).to.be.true;
+        expect(options[3].hasAttribute('selected')).to.be.false;
+
+        expect(setInputsSpy).to.have.callCount(4);
       });
 
-      it('should ONLY change selection in `select` mode', () => {
+      it('should support `disabled` attribute mutation', () => {
         const ampSelector = getSelector({
-          attributes: {
-            'keyboard-select-mode': 'select',
-          },
           config: {
-            count: 3,
+            count: 5,
+            selectedCount: 1,
           },
         });
-        ampSelector.build();
+
         const impl = ampSelector.implementation_;
         impl.mutateElement = fn => fn();
-        expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-        keyPress(ampSelector, Keys.DOWN_ARROW);
-        expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
-        expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
-        keyPress(ampSelector, Keys.UP_ARROW);
-        expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
-        expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+        ampSelector.build();
+
+        const options = impl.getElementsForTesting();
+        expect(options[0].hasAttribute('selected')).to.be.true;
+        expect(options[3].hasAttribute('selected')).to.be.false;
+
+        impl.clickHandler_({target: options[3]});
+
+        // When not disabled, clicking an option should select it.
+        expect(options[0].hasAttribute('selected')).to.be.false;
+        expect(options[3].hasAttribute('selected')).to.be.true;
+
+        expect(ampSelector.hasAttribute('aria-disabled')).to.be.false;
+
+        ampSelector.setAttribute('disabled', '');
+        impl.mutatedAttributesCallback({disabled: true});
+
+        expect(ampSelector.getAttribute('aria-disabled')).to.equal('true');
+
+        impl.clickHandler_({target: options[0]});
+
+        // When disabled, clicking an option should not select it.
+        expect(options[0].hasAttribute('selected')).to.be.false;
+        expect(options[3].hasAttribute('selected')).to.be.true;
       });
-    });
 
-    describe('clear action',() => {
-      it('should clear selection of a single select', function* () {
+      it(
+        'should trigger `toggle` action even when no `value` argument is' +
+          ' provided to the function',
+        () => {
+          const ampSelector = getSelector({
+            config: {
+              count: 5,
+              selectedCount: 1,
+            },
+          });
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+
+          expect(ampSelector.hasAttribute('multiple')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+
+          // Test the case where the element to be `selected` and the currently
+          // selected element are different
+          let args = {'index': 2};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
+
+          // Test the case where the element to be `selected` and the currently
+          // selected element are the same
+          args = {'index': 2};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+        }
+      );
+
+      it(
+        'should trigger `toggle` action even with specified `value`' +
+          ' argument',
+        () => {
+          const ampSelector = getSelector({
+            config: {
+              count: 5,
+              selectedCount: 1,
+            },
+          });
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+
+          expect(ampSelector.hasAttribute('multiple')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+
+          // Test the case where the element to be `selected` and the currently
+          // selected element are different
+          let args = {'index': 2, 'value': true};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
+
+          // Test the case where the element to be `selected` and the currently
+          // selected element are the same
+          args = {'index': 2, 'value': true};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
+
+          // Test the case where the element to be removed as `selected` and
+          // the currently selected element are the same
+          args = {'index': 2, 'value': false};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+
+          // Test the case where the element to be removed as `selected`
+          // is different from the currently `selected` element
+          ampSelector.children[0].setAttribute('selected', '');
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+
+          args = {'index': 2, 'value': false};
+          impl.executeAction({
+            method: 'toggle',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+        }
+      );
+
+      it('should trigger "select" event when user selects an option', () => {
         const ampSelector = getSelector({
-          attributes: {
-            id: 'ampSelector',
-          },
           config: {
-            count: 3,
-            selectedOptions: 1,
+            count: 5,
+            selectedCount: 2,
           },
         });
-        ampSelector.children[1].setAttribute('selected', '');
-        yield ampSelector.build();
-        yield ampSelector.layoutCallback();
+        ampSelector.build();
+        const impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
 
-        const button = win.document.createElement('button');
-        button.setAttribute('on', 'tap:ampSelector.clear');
-        win.document.body.appendChild(button);
+        const options = impl.getElementsForTesting();
+        const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+        impl.clickHandler_({target: options[3]});
 
-        button.click();
+        expect(triggerSpy).to.be.calledOnce;
+        expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
 
-        expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.querySelectorAll('input[type="hidden"]').length)
-            .to.equal(0);
+        const event = triggerSpy.firstCall.args[2];
+        expect(event).to.have.property('detail');
+        expect(event.detail).to.have.property('targetOption', '3');
+        expect(event.detail).to.have.deep.property('selectedOptions', ['3']);
       });
 
-      it('should clear selection of a multiselect', function* () {
+      it('should trigger "select" event when an item is toggled', () => {
         const ampSelector = getSelector({
-          attributes: {
-            id: 'ampSelector',
-            multiple: true,
-          },
           config: {
-            count: 6,
+            count: 5,
+            selectedCount: 1,
           },
         });
-        ampSelector.children[0].setAttribute('selected', '');
-        ampSelector.children[3].setAttribute('selected', '');
-        yield ampSelector.build();
-        yield ampSelector.layoutCallback();
+        ampSelector.build();
+        const impl = ampSelector.implementation_;
+        impl.mutateElement = fn => fn();
 
-        const button = win.document.createElement('button');
-        button.setAttribute('on', 'tap:ampSelector.clear');
-        win.document.body.appendChild(button);
+        const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+        const args = {'index': 3, 'value': true};
+        impl.executeAction({
+          method: 'toggle',
+          args,
+          satisfiesTrust: () => true,
+        });
 
-        button.click();
+        expect(triggerSpy).to.be.calledOnce;
+        expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
 
-        expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.children[3].hasAttribute('selected')).to.be.false;
-        expect(ampSelector.querySelectorAll('input[type="hidden"]').length)
-            .to.equal(0);
+        const event = triggerSpy.firstCall.args[2];
+        expect(event).to.have.property('detail');
+        expect(event.detail).to.have.property('targetOption', '3');
+        expect(event.detail).to.have.deep.property('selectedOptions', ['3']);
       });
-    });
 
-    describe('on DOM_UPDATE', () => {
-      it('should refresh stored state if child DOM changes', () => {
+      it('should trigger "select" event for multiple selections', function*() {
         const ampSelector = getSelector({
           attributes: {
-            'keyboard-select-mode': 'focus',
+            multiple: true,
           },
           config: {
-            count: 2,
+            count: 6,
           },
         });
+        ampSelector.children[0].setAttribute('selected', '');
+        ampSelector.children[1].setAttribute('selected', '');
+
         ampSelector.build();
         const impl = ampSelector.implementation_;
         impl.mutateElement = fn => fn();
 
-        expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
-
-        // Add a new child after amp-selector initializes.
-        const newChild = env.win.document.createElement('div');
-        newChild.setAttribute('option', '3');
-        newChild.setAttribute('selected', '');
-        ampSelector.appendChild(newChild);
-        expect(ampSelector.children[2]).to.equal(newChild);
-
-        expect(ampSelector.children[0].tabIndex).to.equal(0);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-
-        // Note that the newly added third child is ignored.
-        keyPress(ampSelector, Keys.LEFT_ARROW);
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(0);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-
-        const e = new CustomEvent(AmpEvents.DOM_UPDATE, {bubbles: true});
-        newChild.dispatchEvent(e);
-
-        // `newChild` should be focused since it has the 'selected' attribute.
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(0);
-
-        // Tabbing between children now works for `newChild`.
-        keyPress(ampSelector, Keys.LEFT_ARROW);
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(0);
-        expect(ampSelector.children[2].tabIndex).to.equal(-1);
-
-        keyPress(ampSelector, Keys.RIGHT_ARROW);
-        expect(ampSelector.children[0].tabIndex).to.equal(-1);
-        expect(ampSelector.children[1].tabIndex).to.equal(-1);
-        expect(ampSelector.children[2].tabIndex).to.equal(0);
+        const options = impl.getElementsForTesting();
+        const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+        impl.clickHandler_({target: options[2]});
+
+        expect(triggerSpy).to.be.calledOnce;
+        expect(triggerSpy).to.have.been.calledWith(ampSelector, 'select');
+
+        const event = triggerSpy.firstCall.args[2];
+        expect(event).to.have.property('detail');
+        expect(event.detail).to.have.property('targetOption', '2');
+        expect(event.detail).to.have.deep.property('selectedOptions', [
+          '0',
+          '1',
+          '2',
+        ]);
+      });
+
+      it(
+        'should trigger `select` action when user uses ' +
+          '`selectUp`/`selectDown` action with default delta value of 1',
+        () => {
+          const ampSelector = getSelector({
+            attributes: {
+              id: 'ampSelector',
+            },
+            config: {
+              count: 6,
+            },
+          });
+          ampSelector.children[0].setAttribute('selected', '');
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+
+          expect(ampSelector.hasAttribute('multiple')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+
+          impl.executeAction({
+            method: 'selectDown',
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
+
+          impl.executeAction({method: 'selectUp', satisfiesTrust: () => true});
+
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+        }
+      );
+
+      it(
+        'should trigger `select` action when user uses ' +
+          '`selectUp`/`selectDown` action with user specified delta value',
+        () => {
+          const ampSelector = getSelector({
+            attributes: {
+              id: 'ampSelector',
+            },
+            config: {
+              count: 6,
+            },
+          });
+          ampSelector.children[0].setAttribute('selected', '');
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+
+          expect(ampSelector.hasAttribute('multiple')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+
+          let args = {'delta': 2};
+          impl.executeAction({
+            method: 'selectDown',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
+
+          args = {'delta': 2};
+          impl.executeAction({
+            method: 'selectUp',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+        }
+      );
+
+      it(
+        'should trigger `select` action when user uses ' +
+          '`selectUp`/`selectDown` action with user specified delta value ' +
+          '(test large values)',
+        () => {
+          const ampSelector = getSelector({
+            attributes: {
+              id: 'ampSelector',
+            },
+            config: {
+              count: 5,
+            },
+          });
+          ampSelector.children[1].setAttribute('selected', '');
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+
+          expect(ampSelector.hasAttribute('multiple')).to.be.false;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
+
+          let args = {'delta': 1001};
+          impl.executeAction({
+            method: 'selectDown',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.true;
+
+          args = {'delta': 1001};
+          impl.executeAction({
+            method: 'selectUp',
+            args,
+            satisfiesTrust: () => true,
+          });
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
+        }
+      );
+
+      describe('keyboard-select-mode', () => {
+        it('should have `none` mode by default', () => {
+          const ampSelector = getSelector({});
+          ampSelector.build();
+          expect(ampSelector.implementation_.kbSelectMode_).to.equal('none');
+        });
+
+        it(
+          'should initially focus selected option ONLY if ' +
+            'it exists for single-select, otherwise first option',
+          () => {
+            const selectorWithNoSelection = getSelector({
+              attributes: {
+                'keyboard-select-mode': 'focus',
+              },
+            });
+            selectorWithNoSelection.build();
+            expect(selectorWithNoSelection.children[0].tabIndex).to.equal(0);
+            for (let i = 1; i < selectorWithNoSelection.children.length; i++) {
+              // No other options should be reachable by
+              expect(selectorWithNoSelection.children[i].tabIndex).to.equal(-1);
+            }
+
+            const selectorWithSelection = getSelector({
+              attributes: {
+                'keyboard-select-mode': 'focus',
+              },
+              config: {
+                count: 3,
+              },
+            });
+            selectorWithSelection.children[1].setAttribute('selected', '');
+            selectorWithSelection.build();
+            expect(selectorWithSelection.children[0].tabIndex).to.equal(-1);
+            expect(selectorWithSelection.children[1].tabIndex).to.equal(0);
+            expect(selectorWithSelection.children[2].tabIndex).to.equal(-1);
+          }
+        );
+
+        it('should initially focus first option for multi-select', () => {
+          const ampSelector = getSelector({
+            attributes: {
+              multiple: true,
+              'keyboard-select-mode': 'focus',
+            },
+            config: {
+              count: 3,
+            },
+          });
+          ampSelector.children[1].setAttribute('selected', '');
+          ampSelector.build();
+          expect(ampSelector.children[0].tabIndex).to.equal(0);
+          expect(ampSelector.children[1].tabIndex).to.equal(-1);
+          expect(ampSelector.children[2].tabIndex).to.equal(-1);
+        });
+
+        it('should NOT update focus if keyboard-select-mode is disabled', () => {
+          const ampSelector = getSelector({
+            attributes: {
+              'keyboard-select-mode': 'none',
+            },
+            config: {
+              count: 3,
+            },
+          });
+          const spy = sandbox.spy(
+            ampSelector.implementation_,
+            'navigationKeyDownHandler_'
+          );
+          ampSelector.build();
+          keyPress(ampSelector, Keys.RIGHT_ARROW);
+          expect(spy).to.not.have.been.called;
+        });
+
+        it(
+          'should update focus when the user presses the arrow keys when ' +
+            'keyboard-select-mode is enabled',
+          () => {
+            const ampSelector = getSelector({
+              attributes: {
+                'keyboard-select-mode': 'focus',
+              },
+              config: {
+                count: 3,
+              },
+            });
+            ampSelector.build();
+            expect(ampSelector.children[0].tabIndex).to.equal(0);
+            expect(ampSelector.children[1].tabIndex).to.equal(-1);
+            expect(ampSelector.children[2].tabIndex).to.equal(-1);
+            keyPress(ampSelector, Keys.LEFT_ARROW);
+            expect(ampSelector.children[0].tabIndex).to.equal(-1);
+            expect(ampSelector.children[1].tabIndex).to.equal(-1);
+            expect(ampSelector.children[2].tabIndex).to.equal(0);
+            keyPress(ampSelector, Keys.RIGHT_ARROW);
+            expect(ampSelector.children[0].tabIndex).to.equal(0);
+            expect(ampSelector.children[1].tabIndex).to.equal(-1);
+            expect(ampSelector.children[2].tabIndex).to.equal(-1);
+          }
+        );
+
+        it(
+          'should update focus for single-select when ' +
+            'selection is changed without user interaction',
+          () => {
+            const ampSelector = getSelector({
+              attributes: {
+                'keyboard-select-mode': 'focus',
+              },
+              config: {
+                count: 3,
+              },
+            });
+            ampSelector.children[1].setAttribute('selected', '');
+            ampSelector.build();
+            expect(ampSelector.children[0].tabIndex).to.equal(-1);
+            expect(ampSelector.children[1].tabIndex).to.equal(0);
+            expect(ampSelector.children[2].tabIndex).to.equal(-1);
+
+            ampSelector.implementation_.mutatedAttributesCallback({
+              selected: 2,
+            });
+            expect(ampSelector.children[0].tabIndex).to.equal(-1);
+            expect(ampSelector.children[1].tabIndex).to.equal(-1);
+            expect(ampSelector.children[2].tabIndex).to.equal(0);
+          }
+        );
+
+        it('should NOT allow `select` mode for multi-select selectors', () => {
+          const ampSelector = getSelector({
+            attributes: {
+              'keyboard-select-mode': 'select',
+              multiple: true,
+            },
+          });
+          return allowConsoleError(() => {
+            return expect(ampSelector.build()).to.eventually.be.rejectedWith(
+              /not supported for multiple selection amp-selector​​​/
+            );
+          });
+        });
+
+        it('should ONLY change selection in `select` mode', () => {
+          const ampSelector = getSelector({
+            attributes: {
+              'keyboard-select-mode': 'select',
+            },
+            config: {
+              count: 3,
+            },
+          });
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+          impl.mutateElement = fn => fn();
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+          keyPress(ampSelector, Keys.DOWN_ARROW);
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.true;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+          keyPress(ampSelector, Keys.UP_ARROW);
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.true;
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[2].hasAttribute('selected')).to.be.false;
+        });
+      });
+
+      describe('clear action', () => {
+        it('should clear selection of a single select', function*() {
+          const ampSelector = getSelector({
+            attributes: {
+              id: 'ampSelector',
+            },
+            config: {
+              count: 3,
+              selectedOptions: 1,
+            },
+          });
+          ampSelector.children[1].setAttribute('selected', '');
+          yield ampSelector.build();
+          yield ampSelector.layoutCallback();
+
+          const button = win.document.createElement('button');
+          button.setAttribute('on', 'tap:ampSelector.clear');
+          win.document.body.appendChild(button);
+
+          button.click();
+
+          expect(ampSelector.children[1].hasAttribute('selected')).to.be.false;
+          expect(
+            ampSelector.querySelectorAll('input[type="hidden"]').length
+          ).to.equal(0);
+        });
+
+        it('should clear selection of a multiselect', function*() {
+          const ampSelector = getSelector({
+            attributes: {
+              id: 'ampSelector',
+              multiple: true,
+            },
+            config: {
+              count: 6,
+            },
+          });
+          ampSelector.children[0].setAttribute('selected', '');
+          ampSelector.children[3].setAttribute('selected', '');
+          yield ampSelector.build();
+          yield ampSelector.layoutCallback();
+
+          const button = win.document.createElement('button');
+          button.setAttribute('on', 'tap:ampSelector.clear');
+          win.document.body.appendChild(button);
+
+          button.click();
+
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+          expect(ampSelector.children[3].hasAttribute('selected')).to.be.false;
+          expect(
+            ampSelector.querySelectorAll('input[type="hidden"]').length
+          ).to.equal(0);
+        });
+      });
+
+      describe('on DOM_UPDATE', () => {
+        it('should refresh stored state if child DOM changes', () => {
+          const ampSelector = getSelector({
+            attributes: {
+              'keyboard-select-mode': 'focus',
+            },
+            config: {
+              count: 2,
+            },
+          });
+          ampSelector.build();
+          const impl = ampSelector.implementation_;
+          impl.mutateElement = fn => fn();
+
+          expect(ampSelector.children[0].hasAttribute('selected')).to.be.false;
+
+          // Add a new child after amp-selector initializes.
+          const newChild = env.win.document.createElement('div');
+          newChild.setAttribute('option', '3');
+          newChild.setAttribute('selected', '');
+          ampSelector.appendChild(newChild);
+          expect(ampSelector.children[2]).to.equal(newChild);
+
+          expect(ampSelector.children[0].tabIndex).to.equal(0);
+          expect(ampSelector.children[1].tabIndex).to.equal(-1);
+          expect(ampSelector.children[2].tabIndex).to.equal(-1);
+
+          // Note that the newly added third child is ignored.
+          keyPress(ampSelector, Keys.LEFT_ARROW);
+          expect(ampSelector.children[0].tabIndex).to.equal(-1);
+          expect(ampSelector.children[1].tabIndex).to.equal(0);
+          expect(ampSelector.children[2].tabIndex).to.equal(-1);
+
+          const e = new CustomEvent(AmpEvents.DOM_UPDATE, {bubbles: true});
+          newChild.dispatchEvent(e);
+
+          // `newChild` should be focused since it has the 'selected' attribute.
+          expect(ampSelector.children[0].tabIndex).to.equal(-1);
+          expect(ampSelector.children[1].tabIndex).to.equal(-1);
+          expect(ampSelector.children[2].tabIndex).to.equal(0);
+
+          // Tabbing between children now works for `newChild`.
+          keyPress(ampSelector, Keys.LEFT_ARROW);
+          expect(ampSelector.children[0].tabIndex).to.equal(-1);
+          expect(ampSelector.children[1].tabIndex).to.equal(0);
+          expect(ampSelector.children[2].tabIndex).to.equal(-1);
+
+          keyPress(ampSelector, Keys.RIGHT_ARROW);
+          expect(ampSelector.children[0].tabIndex).to.equal(-1);
+          expect(ampSelector.children[1].tabIndex).to.equal(-1);
+          expect(ampSelector.children[2].tabIndex).to.equal(0);
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-share-tracking/0.1/amp-share-tracking.js b/extensions/amp-share-tracking/0.1/amp-share-tracking.js
index 8a6cbb3a52c3..a252a0cc8bc3 100644
--- a/extensions/amp-share-tracking/0.1/amp-share-tracking.js
+++ b/extensions/amp-share-tracking/0.1/amp-share-tracking.js
@@ -34,7 +34,6 @@ const SHARE_TRACKING_NUMBER_OF_BYTES = 6;
  * @visibleForTesting
  */
 export class AmpShareTracking extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -47,9 +46,9 @@ export class AmpShareTracking extends AMP.BaseElement {
   }
 
   /**
-    * @return {boolean}
-    * @private
-    */
+   * @return {boolean}
+   * @private
+   */
   isExperimentOn_() {
     return isExperimentOn(this.win, 'amp-share-tracking');
   }
@@ -71,16 +70,19 @@ export class AmpShareTracking extends AMP.BaseElement {
     this.vendorHref_ = this.element.getAttribute('data-href');
     dev().fine(TAG, 'vendorHref_: ', this.vendorHref_);
 
-    const shareTrackingFragments = Promise.all(
-        [this.getIncomingFragment_(), this.getOutgoingFragment_()]
-    ).then(results => {
+    const shareTrackingFragments = Promise.all([
+      this.getIncomingFragment_(),
+      this.getOutgoingFragment_(),
+    ]).then(results => {
       const incomingFragment = results[0];
       const outgoingFragment = results[1];
       dev().fine(TAG, 'incomingFragment: ', incomingFragment);
       dev().fine(TAG, 'outgoingFragment: ', outgoingFragment);
       if (outgoingFragment && outgoingFragment != '') {
-        const newFragment = this.getNewViewerFragment_(incomingFragment,
-            outgoingFragment);
+        const newFragment = this.getNewViewerFragment_(
+          incomingFragment,
+          outgoingFragment
+        );
         this.getHistory_().updateFragment(newFragment);
       }
       return {incomingFragment, outgoingFragment};
@@ -110,13 +112,14 @@ export class AmpShareTracking extends AMP.BaseElement {
    * @private
    */
   getOriginalViewerFragment_() {
-    return this.getHistory_().getFragment().then(fragment => {
-      this.originalViewerFragment_ = fragment;
-      return fragment;
-    });
+    return this.getHistory_()
+      .getFragment()
+      .then(fragment => {
+        this.originalViewerFragment_ = fragment;
+        return fragment;
+      });
   }
 
-
   /**
    * Get an outgoing share-tracking fragment
    * @return {!Promise<string>}
@@ -126,8 +129,9 @@ export class AmpShareTracking extends AMP.BaseElement {
     if (this.vendorHref_) {
       return this.getOutgoingFragmentFromVendor_(this.vendorHref_);
     }
-    return tryResolve(() => base64UrlEncodeFromBytes(
-        this.getShareTrackingRandomBytes_()));
+    return tryResolve(() =>
+      base64UrlEncodeFromBytes(this.getShareTrackingRandomBytes_())
+    );
   }
 
   /**
@@ -143,22 +147,32 @@ export class AmpShareTracking extends AMP.BaseElement {
       credentials: 'include',
       body: dict(),
     };
-    return Services.xhrFor(this.win).fetchJson(vendorUrl, postReq)
-        .then(res => res.json())
-        .then(json => {
+    return Services.xhrFor(this.win)
+      .fetchJson(vendorUrl, postReq)
+      .then(res => res.json())
+      .then(
+        json => {
           if (json.fragment) {
             return json.fragment;
           }
           this.user().error(
-              TAG, 'The response from [' + vendorUrl + '] does not ' +
-            'have a fragment value.');
+            TAG,
+            'The response from [' +
+              vendorUrl +
+              '] does not ' +
+              'have a fragment value.'
+          );
           return '';
-        }, err => {
+        },
+        err => {
           this.user().error(
-              TAG, 'The request to share-tracking endpoint failed:',
-              err);
+            TAG,
+            'The request to share-tracking endpoint failed:',
+            err
+          );
           return '';
-        });
+        }
+      );
   }
 
   /**
@@ -170,8 +184,10 @@ export class AmpShareTracking extends AMP.BaseElement {
    */
   getShareTrackingRandomBytes_() {
     // Use win.crypto.getRandomValues to get 48 bits of random value
-    let bytes = getCryptoRandomBytesArray(this.win,
-        SHARE_TRACKING_NUMBER_OF_BYTES); // 48 bit
+    let bytes = getCryptoRandomBytesArray(
+      this.win,
+      SHARE_TRACKING_NUMBER_OF_BYTES
+    ); // 48 bit
 
     // Support for legacy browsers
     if (!bytes) {
@@ -196,9 +212,9 @@ export class AmpShareTracking extends AMP.BaseElement {
    * @private
    */
   getNewViewerFragment_(incomingFragment, outgoingFragment) {
-    const fragmentResidual = incomingFragment ?
-      this.originalViewerFragment_.substr(incomingFragment.length + 1) :
-      this.originalViewerFragment_;
+    const fragmentResidual = incomingFragment
+      ? this.originalViewerFragment_.substr(incomingFragment.length + 1)
+      : this.originalViewerFragment_;
     let result = '.' + outgoingFragment;
     if (fragmentResidual) {
       if (fragmentResidual[0] != '&') {
@@ -213,10 +229,8 @@ export class AmpShareTracking extends AMP.BaseElement {
   getHistory_() {
     return Services.historyForDoc(this.getAmpDoc());
   }
-
 }
 
-
 // Install the extension.
 AMP.extension(TAG, '0.1', function(AMP) {
   AMP.registerElement(TAG, AmpShareTracking);
diff --git a/extensions/amp-share-tracking/0.1/test/test-amp-share-tracking.js b/extensions/amp-share-tracking/0.1/test/test-amp-share-tracking.js
index bfa1ac156424..fa20f7d099cd 100644
--- a/extensions/amp-share-tracking/0.1/test/test-amp-share-tracking.js
+++ b/extensions/amp-share-tracking/0.1/test/test-amp-share-tracking.js
@@ -21,233 +21,300 @@ import {Services} from '../../../../src/services';
 import {Xhr} from '../../../../src/service/xhr-impl';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.fakeWin('amp-share-tracking', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-share-tracking'],
+describes.fakeWin(
+  'amp-share-tracking',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-share-tracking'],
+    },
   },
-}, env => {
-  let win;
-  let ampdoc;
-  let historyGetFragmentStub;
-  let historyUpdateFragmentStub;
-  let xhrStub;
-  let randomBytesStub;
-
-  beforeEach(() => {
-    win = env.win;
-    ampdoc = env.ampdoc;
-    historyGetFragmentStub = sandbox.stub(History.prototype, 'getFragment');
-    historyUpdateFragmentStub = sandbox.stub(History.prototype,
-        'updateFragment');
-    xhrStub = sandbox.stub(Xhr.prototype, 'fetchJson');
-    randomBytesStub = sandbox.stub(bytes, 'getCryptoRandomBytesArray');
-    toggleExperiment(win, 'amp-share-tracking', true);
-  });
-
-  afterEach(() => {
-    toggleExperiment(win, 'amp-share-tracking', false);
-  });
-
-  /**
-   * @param {string=} optVendorUrl
-   */
-  function getAmpShareTracking(optVendorUrl) {
-    const element = win.document.createElement('amp-share-tracking');
-    if (optVendorUrl) {
-      element.setAttribute('data-href', optVendorUrl);
+  env => {
+    let win;
+    let ampdoc;
+    let historyGetFragmentStub;
+    let historyUpdateFragmentStub;
+    let xhrStub;
+    let randomBytesStub;
+
+    beforeEach(() => {
+      win = env.win;
+      ampdoc = env.ampdoc;
+      historyGetFragmentStub = sandbox.stub(History.prototype, 'getFragment');
+      historyUpdateFragmentStub = sandbox.stub(
+        History.prototype,
+        'updateFragment'
+      );
+      xhrStub = sandbox.stub(Xhr.prototype, 'fetchJson');
+      randomBytesStub = sandbox.stub(bytes, 'getCryptoRandomBytesArray');
+      toggleExperiment(win, 'amp-share-tracking', true);
+    });
+
+    afterEach(() => {
+      toggleExperiment(win, 'amp-share-tracking', false);
+    });
+
+    /**
+     * @param {string=} optVendorUrl
+     */
+    function getAmpShareTracking(optVendorUrl) {
+      const element = win.document.createElement('amp-share-tracking');
+      if (optVendorUrl) {
+        element.setAttribute('data-href', optVendorUrl);
+      }
+      element.getAmpDoc = () => ampdoc;
+      const ampShareTracking = new AmpShareTracking(element);
+      ampShareTracking.buildCallback();
+      return ampShareTracking;
     }
-    element.getAmpDoc = () => ampdoc;
-    const ampShareTracking = new AmpShareTracking(element);
-    ampShareTracking.buildCallback();
-    return ampShareTracking;
-  }
 
-  it('should get incoming fragment starting with dot', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve('.12345'));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
+    it('should get incoming fragment starting with dot', () => {
+      historyGetFragmentStub.onFirstCall().returns(Promise.resolve('.12345'));
+      const ampShareTracking = getAmpShareTracking();
+      return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+        fragments => {
           expect(historyGetFragmentStub).to.be.calledOnce;
           expect(fragments.incomingFragment).to.equal('12345');
-        });
-  });
-
-  it('should get incoming fragment starting with dot and ignore ' +
-      'other parameters', () => {
-    historyGetFragmentStub.onFirstCall()
-        .returns(Promise.resolve('.12345&key=value'));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(fragments.incomingFragment).to.equal('12345');
-        });
-  });
+        }
+      );
+    });
 
-  it('should ignore incoming fragment if it is empty', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
+    it(
+      'should get incoming fragment starting with dot and ignore ' +
+        'other parameters',
+      () => {
+        historyGetFragmentStub
+          .onFirstCall()
+          .returns(Promise.resolve('.12345&key=value'));
+        const ampShareTracking = getAmpShareTracking();
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(fragments.incomingFragment).to.equal('12345');
+          }
+        );
+      }
+    );
+
+    it('should ignore incoming fragment if it is empty', () => {
+      historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+      const ampShareTracking = getAmpShareTracking();
+      return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+        fragments => {
           expect(historyGetFragmentStub).to.be.calledOnce;
           expect(fragments.incomingFragment).to.equal('');
-        });
-  });
+        }
+      );
+    });
 
-  it('should ignore incoming fragment if it does not start with dot', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve('12345'));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
+    it('should ignore incoming fragment if it does not start with dot', () => {
+      historyGetFragmentStub.onFirstCall().returns(Promise.resolve('12345'));
+      const ampShareTracking = getAmpShareTracking();
+      return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+        fragments => {
           expect(historyGetFragmentStub).to.be.calledOnce;
           expect(fragments.incomingFragment).to.equal('');
-        });
-  });
-
-  it('should get outgoing fragment randomly if no vendor url is provided ' +
-      'and win.crypto is availble, update the url fragment correctly ' +
-      'when original fragment is empty', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    randomBytesStub.onFirstCall().returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          // the base64url of byte array [1, 2, 3, 4, 5, 6]
-          expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
-          expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG')).to.be
+        }
+      );
+    });
+
+    it(
+      'should get outgoing fragment randomly if no vendor url is provided ' +
+        'and win.crypto is availble, update the url fragment correctly ' +
+        'when original fragment is empty',
+      () => {
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        randomBytesStub
+          .onFirstCall()
+          .returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
+        const ampShareTracking = getAmpShareTracking();
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            // the base64url of byte array [1, 2, 3, 4, 5, 6]
+            expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
+            expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG')).to.be
               .calledOnce;
-        });
-  });
-
-  it('should get outgoing fragment randomly if no vendor url is provided ' +
-      'and win.crypto is availble, update the url fragment correctly ' +
-      'when original fragment only contains share tracking fragment', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve('.12345'));
-    randomBytesStub.onFirstCall().returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          // the base64url of byte array [1, 2, 3, 4, 5, 6]
-          expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
-          expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG')).to.be
+          }
+        );
+      }
+    );
+
+    it(
+      'should get outgoing fragment randomly if no vendor url is provided ' +
+        'and win.crypto is availble, update the url fragment correctly ' +
+        'when original fragment only contains share tracking fragment',
+      () => {
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve('.12345'));
+        randomBytesStub
+          .onFirstCall()
+          .returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
+        const ampShareTracking = getAmpShareTracking();
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            // the base64url of byte array [1, 2, 3, 4, 5, 6]
+            expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
+            expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG')).to.be
               .calledOnce;
-        });
-  });
-
-  it('should get outgoing fragment randomly if no vendor url is provided ' +
-      'and win.crypto is availble, update the url fragment correctly ' +
-      'when original fragment contains share tracking fragment and ' +
-      'other fragments', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(
-        '.12345&key=value'));
-    randomBytesStub.onFirstCall().returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          // the base64url of byte array [1, 2, 3, 4, 5, 6]
-          expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
-          expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG&key=value'))
-              .to.be.calledOnce;
-        });
-  });
-
-  it('should get outgoing fragment randomly if no vendor url ' +
-      'is provided and fallback to Math.random generation', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    sandbox.stub(Math, 'random').returns(0.123456789123456789);
-    randomBytesStub.onFirstCall().returns(null);
-    const ampShareTracking = getAmpShareTracking();
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(fragments.outgoingFragment).to.equal('H5rdN8Eh');
-          expect(historyUpdateFragmentStub.withArgs('.H5rdN8Eh')).to.be
+          }
+        );
+      }
+    );
+
+    it(
+      'should get outgoing fragment randomly if no vendor url is provided ' +
+        'and win.crypto is availble, update the url fragment correctly ' +
+        'when original fragment contains share tracking fragment and ' +
+        'other fragments',
+      () => {
+        historyGetFragmentStub
+          .onFirstCall()
+          .returns(Promise.resolve('.12345&key=value'));
+        randomBytesStub
+          .onFirstCall()
+          .returns(new Uint8Array([1, 2, 3, 4, 5, 6]));
+        const ampShareTracking = getAmpShareTracking();
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            // the base64url of byte array [1, 2, 3, 4, 5, 6]
+            expect(fragments.outgoingFragment).to.equal('AQIDBAUG');
+            expect(historyUpdateFragmentStub.withArgs('.AQIDBAUG&key=value')).to
+              .be.calledOnce;
+          }
+        );
+      }
+    );
+
+    it(
+      'should get outgoing fragment randomly if no vendor url ' +
+        'is provided and fallback to Math.random generation',
+      () => {
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        sandbox.stub(Math, 'random').returns(0.123456789123456789);
+        randomBytesStub.onFirstCall().returns(null);
+        const ampShareTracking = getAmpShareTracking();
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(fragments.outgoingFragment).to.equal('H5rdN8Eh');
+            expect(historyUpdateFragmentStub.withArgs('.H5rdN8Eh')).to.be
               .calledOnce;
+          }
+        );
+      }
+    );
+
+    it(
+      'should get outgoing fragment from vendor if vendor url is provided ' +
+        'and the response format is correct',
+      () => {
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        const mockJsonResponse = {fragment: '54321'};
+        xhrStub.onFirstCall().returns(
+          Promise.resolve({
+            json() {
+              return Promise.resolve(mockJsonResponse);
+            },
+          })
+        );
+        const ampShareTracking = getAmpShareTracking('http://foo.bar');
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(fragments.outgoingFragment).to.equal('54321');
+            expect(historyUpdateFragmentStub.withArgs('.54321')).to.be
+              .calledOnce;
+          }
+        );
+      }
+    );
+
+    it(
+      'should get empty outgoing fragment if vendor url is provided ' +
+        'but the response format is NOT correct',
+      () => {
+        expectAsyncConsoleError(
+          '[amp-share-tracking] The response from ' +
+            '[http://foo.bar] does not have a fragment value.'
+        );
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        xhrStub.onFirstCall().returns(
+          Promise.resolve({
+            json() {
+              return Promise.resolve({foo: 'bar'});
+            },
+          })
+        );
+        const ampShareTracking = getAmpShareTracking('http://foo.bar');
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(historyUpdateFragmentStub).to.not.be.called;
+            expect(fragments.outgoingFragment).to.equal('');
+          }
+        );
+      }
+    );
+
+    it(
+      'should call fetchJson with correct request when getting outgoing ' +
+        'fragment',
+      () => {
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        xhrStub.onFirstCall().returns(
+          Promise.resolve({
+            json() {
+              return Promise.resolve({fragment: '54321'});
+            },
+          })
+        );
+        const ampShareTracking = getAmpShareTracking('http://foo.bar');
+        const xhrCall = xhrStub.getCall(0);
+        expect(xhrCall.args[0]).to.equal('http://foo.bar');
+        expect(xhrCall.args[1]).to.jsonEqual({
+          method: 'POST',
+          credentials: 'include',
+          body: {},
         });
-  });
-
-  it('should get outgoing fragment from vendor if vendor url is provided ' +
-      'and the response format is correct', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    const mockJsonResponse = {fragment: '54321'};
-    xhrStub.onFirstCall().returns(Promise.resolve({
-      json() {
-        return Promise.resolve(mockJsonResponse);
-      },
-    }));
-    const ampShareTracking = getAmpShareTracking('http://foo.bar');
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(fragments.outgoingFragment).to.equal('54321');
-          expect(historyUpdateFragmentStub.withArgs('.54321')).to.be.calledOnce;
-        });
-  });
-
-  it('should get empty outgoing fragment if vendor url is provided ' +
-      'but the response format is NOT correct', () => {
-    expectAsyncConsoleError('[amp-share-tracking] The response from ' +
-      '[http://foo.bar] does not have a fragment value.');
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    xhrStub.onFirstCall().returns(Promise.resolve({
-      json() {
-        return Promise.resolve({foo: 'bar'});
-      },
-    }));
-    const ampShareTracking = getAmpShareTracking('http://foo.bar');
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(historyUpdateFragmentStub).to.not.be.called;
-          expect(fragments.outgoingFragment).to.equal('');
-        });
-  });
-
-  it('should call fetchJson with correct request when getting outgoing ' +
-      'fragment', () => {
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    xhrStub.onFirstCall().returns(Promise.resolve({
-      json() {
-        return Promise.resolve({fragment: '54321'});
-      },
-    }));
-    const ampShareTracking = getAmpShareTracking('http://foo.bar');
-    const xhrCall = xhrStub.getCall(0);
-    expect(xhrCall.args[0]).to.equal('http://foo.bar');
-    expect(xhrCall.args[1]).to.jsonEqual({
-      method: 'POST',
-      credentials: 'include',
-      body: {},
-    });
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(historyUpdateFragmentStub.withArgs('.54321')).to.be.calledOnce;
-          expect(fragments.outgoingFragment).to.equal('54321');
-        });
-  });
-
-  it('should get empty outgoing fragment if vendor url is provided ' +
-      'but the xhr fails', () => {
-    expectAsyncConsoleError('[amp-share-tracking] The request to ' +
-      'share-tracking endpoint failed: [object Object]');
-    historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
-    xhrStub.onFirstCall().returns(Promise.reject({
-      status: 404,
-      json() {
-        return Promise.reject('404 bad json');
-      },
-    }));
-    const ampShareTracking = getAmpShareTracking('http://foo.bar');
-    return Services.shareTrackingForOrNull(ampShareTracking.win)
-        .then(fragments => {
-          expect(historyGetFragmentStub).to.be.calledOnce;
-          expect(historyUpdateFragmentStub).to.not.be.called;
-          expect(fragments.outgoingFragment).to.equal('');
-        });
-  });
-});
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(historyUpdateFragmentStub.withArgs('.54321')).to.be
+              .calledOnce;
+            expect(fragments.outgoingFragment).to.equal('54321');
+          }
+        );
+      }
+    );
+
+    it(
+      'should get empty outgoing fragment if vendor url is provided ' +
+        'but the xhr fails',
+      () => {
+        expectAsyncConsoleError(
+          '[amp-share-tracking] The request to ' +
+            'share-tracking endpoint failed: [object Object]'
+        );
+        historyGetFragmentStub.onFirstCall().returns(Promise.resolve(''));
+        xhrStub.onFirstCall().returns(
+          Promise.reject({
+            status: 404,
+            json() {
+              return Promise.reject('404 bad json');
+            },
+          })
+        );
+        const ampShareTracking = getAmpShareTracking('http://foo.bar');
+        return Services.shareTrackingForOrNull(ampShareTracking.win).then(
+          fragments => {
+            expect(historyGetFragmentStub).to.be.calledOnce;
+            expect(historyUpdateFragmentStub).to.not.be.called;
+            expect(fragments.outgoingFragment).to.equal('');
+          }
+        );
+      }
+    );
+  }
+);
diff --git a/extensions/amp-sidebar/0.1/amp-sidebar.js b/extensions/amp-sidebar/0.1/amp-sidebar.js
index 244cf5926f39..221a6d8eb871 100644
--- a/extensions/amp-sidebar/0.1/amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/amp-sidebar.js
@@ -46,11 +46,11 @@ const Side = {
 };
 
 /**
-  * For browsers with bottom nav bars the content towards the bottom
-  * end of the sidebar is cut off.
-  * Currently Safari is the only browser with a nav bar on the bottom
-  * so we set the width of this block to the width of Safari's nav bar.
-  * Source for value: https://github.com/WebKit/webkit/blob/de9875e914c8fda3f46247cd482ce4f849ddad0a/Source/WebInspectorUI/UserInterface/Views/Variables.css#L119
+ * For browsers with bottom nav bars the content towards the bottom
+ * end of the sidebar is cut off.
+ * Currently Safari is the only browser with a nav bar on the bottom
+ * so we set the width of this block to the width of Safari's nav bar.
+ * Source for value: https://github.com/WebKit/webkit/blob/de9875e914c8fda3f46247cd482ce4f849ddad0a/Source/WebInspectorUI/UserInterface/Views/Variables.css#L119
  */
 /** @private @const {string} */
 const IOS_SAFARI_BOTTOMBAR_HEIGHT = '29px';
@@ -129,7 +129,8 @@ export class AmpSidebar extends AMP.BaseElement {
 
     if (this.side_ != Side.LEFT && this.side_ != Side.RIGHT) {
       this.side_ = this.setSideAttribute_(
-          isRTL(this.document_) ? Side.RIGHT : Side.LEFT);
+        isRTL(this.document_) ? Side.RIGHT : Side.LEFT
+      );
       element.setAttribute('side', this.side_);
     }
 
@@ -170,8 +171,9 @@ export class AmpSidebar extends AMP.BaseElement {
     });
 
     // Replacement label for invisible close button set value in amp sidebar
-    const ariaLabel = element.getAttribute('data-close-button-aria-label')
-    || 'Close the sidebar';
+    const ariaLabel =
+      element.getAttribute('data-close-button-aria-label') ||
+      'Close the sidebar';
 
     // Invisible close button at the end of sidebar for screen-readers.
     const screenReaderCloseButton = this.document_.createElement('button');
@@ -188,37 +190,44 @@ export class AmpSidebar extends AMP.BaseElement {
     this.registerAction('toggle', this.toggle_.bind(this));
     this.registerAction('close', this.close_.bind(this));
 
-    element.addEventListener('click', e => {
-      const target =
-        closestAncestorElementBySelector(dev().assertElement(e.target), 'A');
-      if (target && target.href) {
-        const tgtLoc = Services.urlForDoc(element).parse(target.href);
-        const currentHref = this.getAmpDoc().win.location.href;
-        // Important: Only close sidebar (and hence pop sidebar history entry)
-        // when navigating locally, Chrome might cancel navigation request
-        // due to after-navigation history manipulation inside a timer callback.
-        // See this issue for more details:
-        // https://github.com/ampproject/amphtml/issues/6585
-        if (removeFragment(target.href) != removeFragment(currentHref)) {
-          return;
+    element.addEventListener(
+      'click',
+      e => {
+        const target = closestAncestorElementBySelector(
+          dev().assertElement(e.target),
+          'A'
+        );
+        if (target && target.href) {
+          const tgtLoc = Services.urlForDoc(element).parse(target.href);
+          const currentHref = this.getAmpDoc().win.location.href;
+          // Important: Only close sidebar (and hence pop sidebar history entry)
+          // when navigating locally, Chrome might cancel navigation request
+          // due to after-navigation history manipulation inside a timer callback.
+          // See this issue for more details:
+          // https://github.com/ampproject/amphtml/issues/6585
+          if (removeFragment(target.href) != removeFragment(currentHref)) {
+            return;
+          }
+
+          if (tgtLoc.hash) {
+            this.close_();
+          }
         }
-
-        if (tgtLoc.hash) {
-          this.close_();
-        }
-      }
-    }, true);
-
+      },
+      true
+    );
   }
 
   /** @override */
   onLayoutMeasure() {
-    this.getAmpDoc().whenReady().then(() => {
-      // Check our toolbars for changes
-      this.toolbars_.forEach(toolbar => {
-        toolbar.onLayoutChange();
+    this.getAmpDoc()
+      .whenReady()
+      .then(() => {
+        // Check our toolbars for changes
+        this.toolbars_.forEach(toolbar => {
+          toolbar.onLayoutChange();
+        });
       });
-    });
   }
 
   /**
@@ -273,13 +282,13 @@ export class AmpSidebar extends AMP.BaseElement {
    * display: none.
    */
   updateForPreOpening_() {
-    toggle(this.element, /* display */true);
+    toggle(this.element, /* display */ true);
     this.viewport_.addToFixedLayer(this.element, /* forceTransfer */ true);
 
     if (this.isIos_ && this.isSafari_) {
       this.compensateIosBottombar_();
     }
-    this.element./*OK*/scrollTop = 1;
+    this.element./*OK*/ scrollTop = 1;
     this.setUpdateFn_(() => this.updateForOpening_());
   }
 
@@ -320,7 +329,7 @@ export class AmpSidebar extends AMP.BaseElement {
    * Updates the sidebar for when it has finished closing.
    */
   updateForClosed_() {
-    toggle(this.element, /* display */false);
+    toggle(this.element, /* display */ false);
     this.schedulePause(this.getRealChildren());
     this.triggerEvent_(SidebarEvents.CLOSE);
   }
@@ -336,9 +345,11 @@ export class AmpSidebar extends AMP.BaseElement {
     }
     this.viewport_.enterOverlayMode();
     this.setUpdateFn_(() => this.updateForPreOpening_());
-    this.getHistory_().push(this.close_.bind(this)).then(historyId => {
-      this.historyId_ = historyId;
-    });
+    this.getHistory_()
+      .push(this.close_.bind(this))
+      .then(historyId => {
+        this.historyId_ = historyId;
+      });
     if (opt_invocation) {
       this.openerElement_ = opt_invocation.caller;
       this.initialScrollTop_ = this.viewport_.getScrollTop();
@@ -357,9 +368,8 @@ export class AmpSidebar extends AMP.BaseElement {
     }
     this.viewport_.leaveOverlayMode();
     const scrollDidNotChange =
-      (this.initialScrollTop_ == this.viewport_.getScrollTop());
-    const sidebarIsActive =
-        this.element.contains(this.document_.activeElement);
+      this.initialScrollTop_ == this.viewport_.getScrollTop();
+    const sidebarIsActive = this.element.contains(this.document_.activeElement);
     this.setUpdateFn_(() => this.updateForClosing_());
     if (this.historyId_ != -1) {
       this.getHistory_().pop(this.historyId_);
@@ -417,14 +427,14 @@ export class AmpSidebar extends AMP.BaseElement {
   fixIosElasticScrollLeak_() {
     this.element.addEventListener('scroll', e => {
       if (this.isOpen_()) {
-        if (this.element./*OK*/scrollTop < 1) {
-          this.element./*OK*/scrollTop = 1;
+        if (this.element./*OK*/ scrollTop < 1) {
+          this.element./*OK*/ scrollTop = 1;
           e.preventDefault();
-        } else if (this.element./*OK*/scrollHeight ==
-              this.element./*OK*/scrollTop +
-              this.element./*OK*/offsetHeight) {
-          this.element./*OK*/scrollTop =
-              this.element./*OK*/scrollTop - 1;
+        } else if (
+          this.element./*OK*/ scrollHeight ==
+          this.element./*OK*/ scrollTop + this.element./*OK*/ offsetHeight
+        ) {
+          this.element./*OK*/ scrollTop = this.element./*OK*/ scrollTop - 1;
           e.preventDefault();
         }
       }
diff --git a/extensions/amp-sidebar/0.1/autoscroll.js b/extensions/amp-sidebar/0.1/autoscroll.js
index d1a6fd66b648..d683659f0b1b 100644
--- a/extensions/amp-sidebar/0.1/autoscroll.js
+++ b/extensions/amp-sidebar/0.1/autoscroll.js
@@ -30,7 +30,6 @@ import {user} from '../../../src/log';
  * @param {!Element} container
  */
 export function handleAutoscroll(ampdoc, container) {
-
   // Container could be sidebar or a clone of toolbar,
   // in the sidebar case, we need to exclude toolbar since original toolbar
   // nodes are also inside a sidebar.
@@ -42,9 +41,11 @@ export function handleAutoscroll(ampdoc, container) {
   // Verify parent is overflow auto or scroll.
   const overflow = computedStyle(ampdoc.win, container)['overflow-y'];
   if (overflow != 'scroll' && overflow != 'auto') {
-    user().error('AMP-SIDEBAR',
-        `for 'autoscroll', 'nav [toolbar]' element must be set to overflow
-        'scroll' or 'auto' for 'autoscroll' to work.`);
+    user().error(
+      'AMP-SIDEBAR',
+      `for 'autoscroll', 'nav [toolbar]' element must be set to overflow
+        'scroll' or 'auto' for 'autoscroll' to work.`
+    );
     return;
   }
 
@@ -52,5 +53,3 @@ export function handleAutoscroll(ampdoc, container) {
   const viewport = Services.viewportForDoc(ampdoc);
   viewport.animateScrollWithinParent(elem, container, 'center', duration);
 }
-
-
diff --git a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
index 34d7a3de8990..681c528e3c4d 100644
--- a/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/test/integration/test-amp-sidebar.js
@@ -16,12 +16,16 @@
 
 import {poll} from '../../../../../testing/iframe';
 
-describe.configure().skipSafari().skipEdge().run('amp-sidebar', function() {
-  // Extend timeout slightly for flakes on Windows environments
-  this.timeout(4000);
-  const extensions = ['amp-sidebar'];
+describe
+  .configure()
+  .skipSafari()
+  .skipEdge()
+  .run('amp-sidebar', function() {
+    // Extend timeout slightly for flakes on Windows environments
+    this.timeout(4000);
+    const extensions = ['amp-sidebar'];
 
-  const sidebarBody = `
+    const sidebarBody = `
   <amp-sidebar
     id="sidebar1"
     layout="nodisplay"
@@ -46,57 +50,71 @@ describe.configure().skipSafari().skipEdge().run('amp-sidebar', function() {
 
   <div id="dummy"></div>
   `;
-  describes.integration('sidebar focus', {
-    body: sidebarBody,
-    extensions,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
+    describes.integration(
+      'sidebar focus',
+      {
+        body: sidebarBody,
+        extensions,
+      },
+      env => {
+        let win;
+        beforeEach(() => {
+          win = env.win;
+        });
 
-    // TODO (#16157, #21999): this tests times out on FF and Chrome
-    it.configure()
-        .skipChrome().skipFirefox()
-        .run('should focus on opener on close', () => {
-          const openerButton = win.document.getElementById('sidebarOpener');
-          const openedPromise = waitForSidebarOpen(win.document);
-          openerButton.click();
-          return openedPromise.then(() => {
-            const closerButton = win.document.getElementById('sidebarCloser');
-            const closedPromise = waitForSidebarClose(win.document);
-            closerButton.click();
-            return closedPromise;
-          }).then(() => {
-            expect(win.document.activeElement).to.equal(openerButton);
+        // TODO (#16157, #21999): this tests times out on FF and Chrome
+        it.configure()
+          .skipChrome()
+          .skipFirefox()
+          .run('should focus on opener on close', () => {
+            const openerButton = win.document.getElementById('sidebarOpener');
+            const openedPromise = waitForSidebarOpen(win.document);
+            openerButton.click();
+            return openedPromise
+              .then(() => {
+                const closerButton = win.document.getElementById(
+                  'sidebarCloser'
+                );
+                const closedPromise = waitForSidebarClose(win.document);
+                closerButton.click();
+                return closedPromise;
+              })
+              .then(() => {
+                expect(win.document.activeElement).to.equal(openerButton);
+              });
           });
-        });
 
-    it.configure().skipIfPropertiesObfuscated().skipFirefox().run(
-        'should not change scroll position after close', () => {
-          const openerButton = win.document.getElementById('sidebarOpener');
-          const sidebar = win.document.getElementById('sidebar1');
-          const viewport = sidebar.implementation_.getViewport();
-          const openedPromise = waitForSidebarOpen(win.document);
-          openerButton.click();
-          expect(viewport.getScrollTop()).to.equal(0);
-          return openedPromise.then(() => {
-            viewport.setScrollTop(1000);
-            expect(viewport.getScrollTop()).to.equal(1000);
-            const closerButton = win.document.getElementById('sidebarCloser');
-            const closedPromise = waitForSidebarClose(win.document);
-            closerButton.click();
-            return closedPromise;
-          }).then(() => {
-            // Firefox resets scroll to top on pop history
-            // Safari resets scroll to top somewhere unrelated to focus
-            // expect(viewport.getScrollTop()).to.equal(1000);
-            expect(win.document.activeElement).to.not.equal(openerButton);
+        it.configure()
+          .skipIfPropertiesObfuscated()
+          .skipFirefox()
+          .run('should not change scroll position after close', () => {
+            const openerButton = win.document.getElementById('sidebarOpener');
+            const sidebar = win.document.getElementById('sidebar1');
+            const viewport = sidebar.implementation_.getViewport();
+            const openedPromise = waitForSidebarOpen(win.document);
+            openerButton.click();
+            expect(viewport.getScrollTop()).to.equal(0);
+            return openedPromise
+              .then(() => {
+                viewport.setScrollTop(1000);
+                expect(viewport.getScrollTop()).to.equal(1000);
+                const closerButton = win.document.getElementById(
+                  'sidebarCloser'
+                );
+                const closedPromise = waitForSidebarClose(win.document);
+                closerButton.click();
+                return closedPromise;
+              })
+              .then(() => {
+                // Firefox resets scroll to top on pop history
+                // Safari resets scroll to top somewhere unrelated to focus
+                // expect(viewport.getScrollTop()).to.equal(1000);
+                expect(win.document.activeElement).to.not.equal(openerButton);
+              });
           });
-        });
+      }
+    );
   });
-});
 
 function waitForSidebarOpen(document) {
   return poll('wait for sidebar to open', () => {
diff --git a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
index 543e4c2d870d..d6a06f0621f3 100644
--- a/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
+++ b/extensions/amp-sidebar/0.1/test/test-amp-sidebar.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
  *
@@ -24,226 +23,240 @@ import {assertScreenReaderElement} from '../../../../testing/test-helper';
 // Represents the correct value of KeyboardEvent.which for the Escape key
 const KEYBOARD_EVENT_WHICH_ESCAPE = 27;
 
-describes.realWin('amp-sidebar 0.1 version', {
-  win: { /* window spec */
-    location: '...',
-    historyOff: false,
-  },
-  amp: { /* amp spec */
-    runtimeOn: false,
-    extensions: ['amp-sidebar:0.1'],
+describes.realWin(
+  'amp-sidebar 0.1 version',
+  {
+    win: {
+      /* window spec */
+      location: '...',
+      historyOff: false,
+    },
+    amp: {
+      /* amp spec */
+      runtimeOn: false,
+      extensions: ['amp-sidebar:0.1'],
+    },
   },
-}, env => {
-  let win, doc;
-  let platform;
-  let clock;
-  let timer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-    platform = Services.platformFor(win);
-  });
-
-  function getAmpSidebar(options) {
-    options = options || {};
-    const ampSidebar = doc.createElement('amp-sidebar');
-    const list = doc.createElement('ul');
-    for (let i = 0; i < 10; i++) {
-      const li = doc.createElement('li');
-      li.innerHTML = 'Menu item ' + i;
-      list.appendChild(li);
-    }
-    ampSidebar.appendChild(list);
-    const anchor = doc.createElement('a');
-    anchor.href = '#section1';
-    ampSidebar.appendChild(anchor);
-    if (options.toolbars) {
-      getToolbars(options, ampSidebar);
-    }
-    if (options.side) {
-      ampSidebar.setAttribute('side', options.side);
-    }
-    if (options.open) {
-      ampSidebar.setAttribute('open', '');
-    }
-    if (options.closeText) {
-      ampSidebar.setAttribute('data-close-button-aria-label',
-          options.closeText);
-    }
-    ampSidebar.setAttribute('id', 'sidebar1');
-    ampSidebar.setAttribute('layout', 'nodisplay');
-    doc.body.appendChild(ampSidebar);
-    return ampSidebar.build().then(() => {
-      return ampSidebar.layoutCallback();
-    }).then(() => {
-      const impl = ampSidebar.implementation_;
+  env => {
+    let win, doc;
+    let platform;
+    let clock;
+    let timer;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+      platform = Services.platformFor(win);
+    });
+
+    function getAmpSidebar(options) {
+      options = options || {};
+      const ampSidebar = doc.createElement('amp-sidebar');
+      const list = doc.createElement('ul');
+      for (let i = 0; i < 10; i++) {
+        const li = doc.createElement('li');
+        li.innerHTML = 'Menu item ' + i;
+        list.appendChild(li);
+      }
+      ampSidebar.appendChild(list);
+      const anchor = doc.createElement('a');
+      anchor.href = '#section1';
+      ampSidebar.appendChild(anchor);
       if (options.toolbars) {
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
-        });
+        getToolbars(options, ampSidebar);
       }
-      sandbox.stub(impl, 'mutateElement').callsFake(callback => {
-        callback();
-        return Promise.resolve();
-      });
+      if (options.side) {
+        ampSidebar.setAttribute('side', options.side);
+      }
+      if (options.open) {
+        ampSidebar.setAttribute('open', '');
+      }
+      if (options.closeText) {
+        ampSidebar.setAttribute(
+          'data-close-button-aria-label',
+          options.closeText
+        );
+      }
+      ampSidebar.setAttribute('id', 'sidebar1');
+      ampSidebar.setAttribute('layout', 'nodisplay');
+      doc.body.appendChild(ampSidebar);
+      return ampSidebar
+        .build()
+        .then(() => {
+          return ampSidebar.layoutCallback();
+        })
+        .then(() => {
+          const impl = ampSidebar.implementation_;
+          if (options.toolbars) {
+            sandbox.stub(timer, 'delay').callsFake(function(callback) {
+              callback();
+            });
+          }
+          sandbox.stub(impl, 'mutateElement').callsFake(callback => {
+            callback();
+            return Promise.resolve();
+          });
 
-      if (options.stubHistory) {
-        sandbox.stub(impl, 'getHistory_').returns({
-          push: sandbox.stub().resolves(11),
-          pop: sandbox.stub().resolves(11),
+          if (options.stubHistory) {
+            sandbox.stub(impl, 'getHistory_').returns({
+              push: sandbox.stub().resolves(11),
+              pop: sandbox.stub().resolves(11),
+            });
+          }
+          return ampSidebar;
         });
-      }
-      return ampSidebar;
-    });
-  }
+    }
 
-  function getToolbars(options, ampSidebar) {
-
-    // Create our individual toolbars
-    options.toolbars.forEach(toolbarObj => {
-      const navToolbar = doc.createElement('nav');
-
-      //Create/Set toolbar-target
-      const toolbarTarget = doc.createElement('div');
-      if (toolbarObj.toolbarTarget) {
-        toolbarTarget.setAttribute('id',
-            toolbarObj.toolbarTarget);
-        navToolbar.setAttribute('toolbar-target',
-            toolbarObj.toolbarTarget);
-      } else {
-        toolbarTarget.setAttribute('id', 'toolbar-target');
-        navToolbar.setAttribute('toolbar-target', 'toolbar-target');
-      }
-      doc.body.appendChild(toolbarTarget);
+    function getToolbars(options, ampSidebar) {
+      // Create our individual toolbars
+      options.toolbars.forEach(toolbarObj => {
+        const navToolbar = doc.createElement('nav');
+
+        //Create/Set toolbar-target
+        const toolbarTarget = doc.createElement('div');
+        if (toolbarObj.toolbarTarget) {
+          toolbarTarget.setAttribute('id', toolbarObj.toolbarTarget);
+          navToolbar.setAttribute('toolbar-target', toolbarObj.toolbarTarget);
+        } else {
+          toolbarTarget.setAttribute('id', 'toolbar-target');
+          navToolbar.setAttribute('toolbar-target', 'toolbar-target');
+        }
+        doc.body.appendChild(toolbarTarget);
 
-      // Set the toolbar media
-      if (toolbarObj.media) {
-        navToolbar.setAttribute('toolbar', toolbarObj.media);
-      } else {
-        navToolbar.setAttribute('toolbar', '(min-width: 768px)');
-      }
-      const toolbarList = doc.createElement('ul');
-      for (let i = 0; i < 3; i++) {
-        const li = doc.createElement('li');
-        li.innerHTML = 'Toolbar item ' + i;
-        toolbarList.appendChild(li);
-      }
-      navToolbar.appendChild(toolbarList);
-      ampSidebar.appendChild(navToolbar);
-    });
-  }
+        // Set the toolbar media
+        if (toolbarObj.media) {
+          navToolbar.setAttribute('toolbar', toolbarObj.media);
+        } else {
+          navToolbar.setAttribute('toolbar', '(min-width: 768px)');
+        }
+        const toolbarList = doc.createElement('ul');
+        for (let i = 0; i < 3; i++) {
+          const li = doc.createElement('li');
+          li.innerHTML = 'Toolbar item ' + i;
+          toolbarList.appendChild(li);
+        }
+        navToolbar.appendChild(toolbarList);
+        ampSidebar.appendChild(navToolbar);
+      });
+    }
 
-  describe('amp-sidebar', () => {
-    it('should apply overlay class', () => {
-      return getAmpSidebar().then(sidebarElement => {
-        assert(sidebarElement.classList.contains('i-amphtml-overlay'));
+    describe('amp-sidebar', () => {
+      it('should apply overlay class', () => {
+        return getAmpSidebar().then(sidebarElement => {
+          assert(sidebarElement.classList.contains('i-amphtml-overlay'));
+        });
       });
-    });
 
-    it('should replace text to screen reader ' +
-        'button in data-close-button-aria-label', () => {
-      return getAmpSidebar({'closeText': 'data-close-button-aria-label'})
-          .then(sidebarElement => {
+      it(
+        'should replace text to screen reader ' +
+          'button in data-close-button-aria-label',
+        () => {
+          return getAmpSidebar({
+            'closeText': 'data-close-button-aria-label',
+          }).then(sidebarElement => {
             const closeButton = sidebarElement.lastElementChild;
-            expect(closeButton.textContent)
-                .to.equal('data-close-button-aria-label');
+            expect(closeButton.textContent).to.equal(
+              'data-close-button-aria-label'
+            );
           });
-    });
+        }
+      );
 
-    it('should open from left is side is not specified', () => {
-      return getAmpSidebar().then(sidebarElement => {
-        expect(sidebarElement.getAttribute('side')).to.equal('left');
+      it('should open from left is side is not specified', () => {
+        return getAmpSidebar().then(sidebarElement => {
+          expect(sidebarElement.getAttribute('side')).to.equal('left');
+        });
       });
-    });
 
-    it('should open from right is side right is specified', () => {
-      return getAmpSidebar({'side': 'right'}).then(sidebarElement => {
-        expect(sidebarElement.getAttribute('side')).to.equal('right');
+      it('should open from right is side right is specified', () => {
+        return getAmpSidebar({'side': 'right'}).then(sidebarElement => {
+          expect(sidebarElement.getAttribute('side')).to.equal('right');
+        });
       });
-    });
 
-    it('should create mask element in DOM', () => {
-      return getAmpSidebar({'stubHistory': true})
-          .then(sidebarElement => {
-            const impl = sidebarElement.implementation_;
-            impl.open_();
-            expect(doc.querySelectorAll('.i-amphtml-sidebar-mask').length)
-                .to.equal(1);
-          });
-    });
+      it('should create mask element in DOM', () => {
+        return getAmpSidebar({'stubHistory': true}).then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          impl.open_();
+          expect(
+            doc.querySelectorAll('.i-amphtml-sidebar-mask').length
+          ).to.equal(1);
+        });
+      });
 
-    it('should create an invisible close ' +
-        'button for screen readers only', () => {
-      return getAmpSidebar().then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        impl.close_ = sandbox.spy();
-        const closeButton = sidebarElement.lastElementChild;
-        expect(closeButton).to.exist;
-        expect(closeButton.tagName).to.equal('BUTTON');
-        assertScreenReaderElement(closeButton);
-        expect(closeButton.textContent).to.equal('Close the sidebar');
-        expect(impl.close_).to.have.not.been.called;
-        closeButton.click();
-        expect(impl.close_).to.be.calledOnce;
+      it('should create an invisible close button for screen readers only', () => {
+        return getAmpSidebar().then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          impl.close_ = sandbox.spy();
+          const closeButton = sidebarElement.lastElementChild;
+          expect(closeButton).to.exist;
+          expect(closeButton.tagName).to.equal('BUTTON');
+          assertScreenReaderElement(closeButton);
+          expect(closeButton.textContent).to.equal('Close the sidebar');
+          expect(impl.close_).to.have.not.been.called;
+          closeButton.click();
+          expect(impl.close_).to.be.calledOnce;
+        });
       });
-    });
 
-    it('should open sidebar on button click', () => {
-      return getAmpSidebar().then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        clock = lolex.install(
-            {target: impl.win, toFake: ['Date', 'setTimeout']});
-        const historyPushSpy = sandbox.spy();
-        const historyPopSpy = sandbox.spy();
-        impl.scheduleLayout = sandbox.spy();
-        impl.getHistory_ = function() {
-          return {
-            push() {
-              historyPushSpy();
-              return Promise.resolve(11);
-            },
-            pop() {
-              historyPopSpy();
-              return Promise.resolve(11);
-            },
+      it('should open sidebar on button click', () => {
+        return getAmpSidebar().then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          clock = lolex.install({
+            target: impl.win,
+            toFake: ['Date', 'setTimeout'],
+          });
+          const historyPushSpy = sandbox.spy();
+          const historyPopSpy = sandbox.spy();
+          impl.scheduleLayout = sandbox.spy();
+          impl.getHistory_ = function() {
+            return {
+              push() {
+                historyPushSpy();
+                return Promise.resolve(11);
+              },
+              pop() {
+                historyPopSpy();
+                return Promise.resolve(11);
+              },
+            };
           };
-        };
-
-        impl.openOrCloseTimeOut_ = 10;
-
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        expect(sidebarElement.getAttribute('role')).to.equal('menu');
-
-        expect(historyPushSpy).to.be.calledOnce;
-        expect(historyPopSpy).to.have.not.been.called;
-        expect(impl.historyId_).to.not.equal('-1');
-        expect(impl.scheduleLayout).to.not.be.called;
-
-        clock.tick(600);
-        expect(doc.activeElement).to.equal(sidebarElement);
-        expect(sidebarElement).to.not.have.display('none');
-        expect(impl.scheduleLayout).to.be.calledOnce;
-
-        // second call to open_() should be a no-op and not increase call
-        // counts.
-        impl.open_();
-        expect(impl.scheduleLayout).to.be.calledOnce;
-        expect(historyPushSpy).to.be.calledOnce;
-        expect(historyPopSpy).to.have.not.been.called;
 
+          impl.openOrCloseTimeOut_ = 10;
+
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          expect(sidebarElement.getAttribute('role')).to.equal('menu');
+
+          expect(historyPushSpy).to.be.calledOnce;
+          expect(historyPopSpy).to.have.not.been.called;
+          expect(impl.historyId_).to.not.equal('-1');
+          expect(impl.scheduleLayout).to.not.be.called;
+
+          clock.tick(600);
+          expect(doc.activeElement).to.equal(sidebarElement);
+          expect(sidebarElement).to.not.have.display('none');
+          expect(impl.scheduleLayout).to.be.calledOnce;
+
+          // second call to open_() should be a no-op and not increase call
+          // counts.
+          impl.open_();
+          expect(impl.scheduleLayout).to.be.calledOnce;
+          expect(historyPushSpy).to.be.calledOnce;
+          expect(historyPopSpy).to.have.not.been.called;
+        });
       });
-    });
 
-    it('should close sidebar on button click', () => {
-      return getAmpSidebar({'open': true, 'stubHistory': true})
-          .then(sidebarElement => {
+      it('should close sidebar on button click', () => {
+        return getAmpSidebar({'open': true, 'stubHistory': true}).then(
+          sidebarElement => {
             const impl = sidebarElement.implementation_;
-            clock = lolex.install(
-                {target: impl.win, toFake: ['Date', 'setTimeout']});
+            clock = lolex.install({
+              target: impl.win,
+              toFake: ['Date', 'setTimeout'],
+            });
             impl.schedulePause = sandbox.spy();
             const historyPushSpy = sandbox.spy();
             const historyPopSpy = sandbox.spy();
@@ -277,332 +290,355 @@ describes.realWin('amp-sidebar 0.1 version', {
             impl.close_();
             expect(impl.schedulePause).to.be.calledOnce;
             expect(historyPopSpy).to.be.calledOnce;
-          });
-    });
-
-    it('should toggle sidebar on button click', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        clock = lolex.install(
-            {target: impl.win, toFake: ['Date', 'setTimeout']});
-        impl.scheduleLayout = sandbox.spy();
-        impl.schedulePause = sandbox.spy();
-
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-        expect(sidebarElement.getAttribute('role')).to.equal('menu');
-        expect(doc.activeElement).to.not.equal(sidebarElement);
-        impl.toggle_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        clock.tick(600);
-        expect(doc.activeElement).to.equal(sidebarElement);
-        expect(sidebarElement).to.not.have.display('none');
-        expect(impl.scheduleLayout).to.be.calledOnce;
-        impl.toggle_();
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-        clock.tick(600);
-        expect(sidebarElement).to.have.display('none');
-        expect(impl.schedulePause).to.be.calledOnce;
+          }
+        );
       });
-    });
 
-    it('should close sidebar on escape', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        clock = lolex.install(
-            {target: impl.win, toFake: ['Date', 'setTimeout']});
-        impl.schedulePause = sandbox.spy();
-
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = doc.createEventObject ?
-          doc.createEventObject() : doc.createEvent('Events');
-        if (eventObj.initEvent) {
-          eventObj.initEvent('keydown', true, true);
-        }
-        eventObj.key = Keys.ESCAPE;
-        eventObj.which = KEYBOARD_EVENT_WHICH_ESCAPE;
-        const el = doc.documentElement;
-        el.dispatchEvent ?
-          el.dispatchEvent(eventObj) : el.fireEvent('onkeydown', eventObj);
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-        clock.tick(600);
-        expect(sidebarElement).to.have.display('none');
-        expect(impl.schedulePause).to.be.calledOnce;
+      it('should toggle sidebar on button click', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          clock = lolex.install({
+            target: impl.win,
+            toFake: ['Date', 'setTimeout'],
+          });
+          impl.scheduleLayout = sandbox.spy();
+          impl.schedulePause = sandbox.spy();
+
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+          expect(sidebarElement.getAttribute('role')).to.equal('menu');
+          expect(doc.activeElement).to.not.equal(sidebarElement);
+          impl.toggle_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          clock.tick(600);
+          expect(doc.activeElement).to.equal(sidebarElement);
+          expect(sidebarElement).to.not.have.display('none');
+          expect(impl.scheduleLayout).to.be.calledOnce;
+          impl.toggle_();
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+          clock.tick(600);
+          expect(sidebarElement).to.have.display('none');
+          expect(impl.schedulePause).to.be.calledOnce;
+        });
       });
-    });
 
-    it('should reflect state of the sidebar', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        clock = lolex.install(
-            {target: impl.win, toFake: ['Date', 'setTimeout']});
-        impl.schedulePause = sandbox.spy();
-        impl.scheduleResume = sandbox.spy();
-
-        expect(impl.isOpen_()).to.be.false;
-        clock.tick(600);
-        expect(impl.schedulePause).to.have.not.been.called;
-        expect(impl.scheduleResume).to.have.not.been.called;
-        impl.toggle_();
-        expect(impl.isOpen_()).to.be.true;
-        clock.tick(600);
-        expect(impl.schedulePause).to.have.not.been.called;
-        expect(impl.scheduleResume).to.be.calledOnce;
-        impl.toggle_();
-        expect(impl.isOpen_()).to.be.false;
-        clock.tick(600);
-        expect(impl.schedulePause).to.be.calledOnce;
-        expect(impl.scheduleResume).to.be.calledOnce;
-        impl.toggle_();
-        expect(impl.isOpen_()).to.be.true;
-        clock.tick(600);
-        expect(impl.schedulePause).to.be.calledOnce;
-        expect(impl.scheduleResume).to.have.callCount(2);
-        impl.toggle_();
-        expect(impl.isOpen_()).to.be.false;
-        clock.tick(600);
-        expect(impl.schedulePause).to.have.callCount(2);
-        expect(impl.scheduleResume).to.have.callCount(2);
+      it('should close sidebar on escape', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          clock = lolex.install({
+            target: impl.win,
+            toFake: ['Date', 'setTimeout'],
+          });
+          impl.schedulePause = sandbox.spy();
+
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          const eventObj = doc.createEventObject
+            ? doc.createEventObject()
+            : doc.createEvent('Events');
+          if (eventObj.initEvent) {
+            eventObj.initEvent('keydown', true, true);
+          }
+          eventObj.key = Keys.ESCAPE;
+          eventObj.which = KEYBOARD_EVENT_WHICH_ESCAPE;
+          const el = doc.documentElement;
+          el.dispatchEvent
+            ? el.dispatchEvent(eventObj)
+            : el.fireEvent('onkeydown', eventObj);
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+          clock.tick(600);
+          expect(sidebarElement).to.have.display('none');
+          expect(impl.schedulePause).to.be.calledOnce;
+        });
       });
-    });
 
-    it.skip('should fix scroll leaks on ios safari', () => {
-      sandbox.stub(platform, 'isIos').returns(true);
-      sandbox.stub(platform, 'isSafari').returns(true);
-      return getAmpSidebar().then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
+      it('should reflect state of the sidebar', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          clock = lolex.install({
+            target: impl.win,
+            toFake: ['Date', 'setTimeout'],
+          });
+          impl.schedulePause = sandbox.spy();
+          impl.scheduleResume = sandbox.spy();
+
+          expect(impl.isOpen_()).to.be.false;
+          clock.tick(600);
+          expect(impl.schedulePause).to.have.not.been.called;
+          expect(impl.scheduleResume).to.have.not.been.called;
+          impl.toggle_();
+          expect(impl.isOpen_()).to.be.true;
+          clock.tick(600);
+          expect(impl.schedulePause).to.have.not.been.called;
+          expect(impl.scheduleResume).to.be.calledOnce;
+          impl.toggle_();
+          expect(impl.isOpen_()).to.be.false;
+          clock.tick(600);
+          expect(impl.schedulePause).to.be.calledOnce;
+          expect(impl.scheduleResume).to.be.calledOnce;
+          impl.toggle_();
+          expect(impl.isOpen_()).to.be.true;
+          clock.tick(600);
+          expect(impl.schedulePause).to.be.calledOnce;
+          expect(impl.scheduleResume).to.have.callCount(2);
+          impl.toggle_();
+          expect(impl.isOpen_()).to.be.false;
+          clock.tick(600);
+          expect(impl.schedulePause).to.have.callCount(2);
+          expect(impl.scheduleResume).to.have.callCount(2);
         });
-        const scrollLeakSpy = sandbox.spy(impl, 'fixIosElasticScrollLeak_');
-        impl.buildCallback();
-        expect(scrollLeakSpy).to.be.calledOnce;
       });
-    });
 
-    it.skip('should adjust for IOS safari bottom bar', () => {
-      sandbox.stub(platform, 'isIos').returns(true);
-      sandbox.stub(platform, 'isSafari').returns(true);
-      return getAmpSidebar().then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
+      it.skip('should fix scroll leaks on ios safari', () => {
+        sandbox.stub(platform, 'isIos').returns(true);
+        sandbox.stub(platform, 'isSafari').returns(true);
+        return getAmpSidebar().then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          const scrollLeakSpy = sandbox.spy(impl, 'fixIosElasticScrollLeak_');
+          impl.buildCallback();
+          expect(scrollLeakSpy).to.be.calledOnce;
         });
-        const compensateIosBottombarSpy =
-            sandbox.spy(impl, 'compensateIosBottombar_');
-        const initalChildrenCount = sidebarElement.children.length;
-        impl.open_();
-        expect(compensateIosBottombarSpy).to.be.calledOnce;
-        // 10 lis + one top padding element inserted
-        expect(sidebarElement.children.length)
-            .to.equal(initalChildrenCount + 1);
       });
-    });
 
-    it('should close sidebar if clicked on a non-local anchor', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const anchor = sidebarElement.getElementsByTagName('a')[0];
-        anchor.href = '#newloc';
-        const impl = sidebarElement.implementation_;
-        clock = lolex.install(
-            {target: impl.win, toFake: ['Date', 'setTimeout']});
-        impl.schedulePause = sandbox.spy();
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = doc.createEventObject ?
-          doc.createEventObject() : doc.createEvent('Events');
-        if (eventObj.initEvent) {
-          eventObj.initEvent('click', true, true);
-        }
-        sandbox.stub(sidebarElement, 'getAmpDoc').returns({
-          win: {
-            location: {
-              href: window.location.href,
-            },
-          },
+      it.skip('should adjust for IOS safari bottom bar', () => {
+        sandbox.stub(platform, 'isIos').returns(true);
+        sandbox.stub(platform, 'isSafari').returns(true);
+        return getAmpSidebar().then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          const compensateIosBottombarSpy = sandbox.spy(
+            impl,
+            'compensateIosBottombar_'
+          );
+          const initalChildrenCount = sidebarElement.children.length;
+          impl.open_();
+          expect(compensateIosBottombarSpy).to.be.calledOnce;
+          // 10 lis + one top padding element inserted
+          expect(sidebarElement.children.length).to.equal(
+            initalChildrenCount + 1
+          );
         });
-        anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
-        clock.tick(600);
-        expect(sidebarElement).to.have.display('none');
-        expect(impl.schedulePause).to.be.calledOnce;
       });
-    });
 
-    it('should not close sidebar if clicked on a new origin ' +
-        'navigation', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const anchor = sidebarElement.getElementsByTagName('a')[0];
-        anchor.href = '#newloc';
-        const impl = sidebarElement.implementation_;
-        impl.schedulePause = sandbox.spy();
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
-        });
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal(
-            'false');
-        const eventObj = doc.createEventObject ?
-          doc.createEventObject() : doc.createEvent('Events');
-        if (eventObj.initEvent) {
-          eventObj.initEvent('click', true, true);
-        }
-        sandbox.stub(sidebarElement, 'getAmpDoc').callsFake(() => {
-          return {
+      it('should close sidebar if clicked on a non-local anchor', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const anchor = sidebarElement.getElementsByTagName('a')[0];
+          anchor.href = '#newloc';
+          const impl = sidebarElement.implementation_;
+          clock = lolex.install({
+            target: impl.win,
+            toFake: ['Date', 'setTimeout'],
+          });
+          impl.schedulePause = sandbox.spy();
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          const eventObj = doc.createEventObject
+            ? doc.createEventObject()
+            : doc.createEvent('Events');
+          if (eventObj.initEvent) {
+            eventObj.initEvent('click', true, true);
+          }
+          sandbox.stub(sidebarElement, 'getAmpDoc').returns({
             win: {
               location: {
-                // Mocking navigating from example.com -> localhost:9876
-                href: 'http://example.com',
+                href: window.location.href,
               },
             },
-          };
+          });
+          anchor.dispatchEvent
+            ? anchor.dispatchEvent(eventObj)
+            : anchor.fireEvent('onkeydown', eventObj);
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('true');
+          clock.tick(600);
+          expect(sidebarElement).to.have.display('none');
+          expect(impl.schedulePause).to.be.calledOnce;
         });
-        anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal(
-            'false');
-        expect(sidebarElement).to.not.have.display('');
-        expect(impl.schedulePause).to.have.not.been.called;
       });
-    });
 
-    it('should not close sidebar if clicked on new page navigation', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const anchor = sidebarElement.getElementsByTagName('a')[0];
-        anchor.href = '#newloc';
-        const impl = sidebarElement.implementation_;
-        impl.schedulePause = sandbox.spy();
-
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
-        });
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = doc.createEventObject ?
-          doc.createEventObject() : doc.createEvent('Events');
-        if (eventObj.initEvent) {
-          eventObj.initEvent('click', true, true);
-        }
-        sandbox.stub(sidebarElement, 'getAmpDoc').callsFake(() => {
-          return {
-            win: {
-              location: {
-                // Mocking navigating from
-                // /context.html?old=context -> /context.html
-                href: 'http://localhost:9876/context.html?old=context',
+      it('should not close sidebar if clicked on a new origin navigation', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const anchor = sidebarElement.getElementsByTagName('a')[0];
+          anchor.href = '#newloc';
+          const impl = sidebarElement.implementation_;
+          impl.schedulePause = sandbox.spy();
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          const eventObj = doc.createEventObject
+            ? doc.createEventObject()
+            : doc.createEvent('Events');
+          if (eventObj.initEvent) {
+            eventObj.initEvent('click', true, true);
+          }
+          sandbox.stub(sidebarElement, 'getAmpDoc').callsFake(() => {
+            return {
+              win: {
+                location: {
+                  // Mocking navigating from example.com -> localhost:9876
+                  href: 'http://example.com',
+                },
               },
-            },
-          };
+            };
+          });
+          anchor.dispatchEvent
+            ? anchor.dispatchEvent(eventObj)
+            : anchor.fireEvent('onkeydown', eventObj);
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          expect(sidebarElement).to.not.have.display('');
+          expect(impl.schedulePause).to.have.not.been.called;
         });
-        anchor.dispatchEvent ?
-          anchor.dispatchEvent(eventObj) :
-          anchor.fireEvent('onkeydown', eventObj);
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        expect(sidebarElement).to.not.have.display('');
-        expect(impl.schedulePause).to.have.not.been.called;
       });
-    });
 
-    it('should not close sidebar if clicked on non-anchor', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const li = sidebarElement.getElementsByTagName('li')[0];
-        const impl = sidebarElement.implementation_;
-        impl.schedulePause = sandbox.spy();
+      it('should not close sidebar if clicked on new page navigation', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const anchor = sidebarElement.getElementsByTagName('a')[0];
+          anchor.href = '#newloc';
+          const impl = sidebarElement.implementation_;
+          impl.schedulePause = sandbox.spy();
 
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          const eventObj = doc.createEventObject
+            ? doc.createEventObject()
+            : doc.createEvent('Events');
+          if (eventObj.initEvent) {
+            eventObj.initEvent('click', true, true);
+          }
+          sandbox.stub(sidebarElement, 'getAmpDoc').callsFake(() => {
+            return {
+              win: {
+                location: {
+                  // Mocking navigating from
+                  // /context.html?old=context -> /context.html
+                  href: 'http://localhost:9876/context.html?old=context',
+                },
+              },
+            };
+          });
+          anchor.dispatchEvent
+            ? anchor.dispatchEvent(eventObj)
+            : anchor.fireEvent('onkeydown', eventObj);
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          expect(sidebarElement).to.not.have.display('');
+          expect(impl.schedulePause).to.have.not.been.called;
         });
-        expect(sidebarElement.hasAttribute('open')).to.be.false;
-        impl.open_();
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        const eventObj = doc.createEventObject ?
-          doc.createEventObject() : doc.createEvent('Events');
-        if (eventObj.initEvent) {
-          eventObj.initEvent('click', true, true);
-        }
-        li.dispatchEvent ?
-          li.dispatchEvent(eventObj) :
-          li.fireEvent('onkeydown', eventObj);
-        expect(sidebarElement.hasAttribute('open')).to.be.true;
-        expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
-        expect(sidebarElement).to.not.have.display('');
-        expect(impl.schedulePause).to.have.not.been.called;
       });
-    });
 
-    it('should trigger actions on open and close', () => {
-      return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
-        const impl = sidebarElement.implementation_;
-        const triggerSpy = sandbox.spy(impl.action_, 'trigger');
-        sandbox.stub(timer, 'delay').callsFake(function(callback) {
-          callback();
+      it('should not close sidebar if clicked on non-anchor', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const li = sidebarElement.getElementsByTagName('li')[0];
+          const impl = sidebarElement.implementation_;
+          impl.schedulePause = sandbox.spy();
+
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          expect(sidebarElement.hasAttribute('open')).to.be.false;
+          impl.open_();
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          const eventObj = doc.createEventObject
+            ? doc.createEventObject()
+            : doc.createEvent('Events');
+          if (eventObj.initEvent) {
+            eventObj.initEvent('click', true, true);
+          }
+          li.dispatchEvent
+            ? li.dispatchEvent(eventObj)
+            : li.fireEvent('onkeydown', eventObj);
+          expect(sidebarElement.hasAttribute('open')).to.be.true;
+          expect(sidebarElement.getAttribute('aria-hidden')).to.equal('false');
+          expect(sidebarElement).to.not.have.display('');
+          expect(impl.schedulePause).to.have.not.been.called;
         });
-        impl.scheduleLayout = sandbox.stub();
+      });
 
-        impl.open_();
-        expect(triggerSpy).to.be.calledOnce;
-        expect(triggerSpy).to.be.calledWith(impl.element, 'sidebarOpen');
+      it('should trigger actions on open and close', () => {
+        return getAmpSidebar({stubHistory: true}).then(sidebarElement => {
+          const impl = sidebarElement.implementation_;
+          const triggerSpy = sandbox.spy(impl.action_, 'trigger');
+          sandbox.stub(timer, 'delay').callsFake(function(callback) {
+            callback();
+          });
+          impl.scheduleLayout = sandbox.stub();
 
-        impl.close_();
-        expect(triggerSpy).to.be.calledTwice;
-        expect(triggerSpy).to.be.calledWith(impl.element, 'sidebarClose');
-      });
-    });
-  });
-
-  describe('amp-sidebar - toolbars in amp-sidebar', () => {
-
-    // Tests for amp-sidebar 1.0
-    it('should not create toolbars without <nav toolbar />', () => {
-      return getAmpSidebar().then(sidebarElement => {
-        const headerElements = doc.getElementsByTagName('header');
-        const toolbarElements = doc.querySelectorAll('[toolbar]');
-        expect(headerElements.length).to.be.equal(0);
-        expect(toolbarElements.length).to.be.equal(0);
-        expect(sidebarElement.implementation_.toolbars_.length).to.be.equal(0);
+          impl.open_();
+          expect(triggerSpy).to.be.calledOnce;
+          expect(triggerSpy).to.be.calledWith(impl.element, 'sidebarOpen');
+
+          impl.close_();
+          expect(triggerSpy).to.be.calledTwice;
+          expect(triggerSpy).to.be.calledWith(impl.element, 'sidebarClose');
+        });
       });
     });
 
-    it('should create a toolbar element within the toolbar-target', () => {
-      return getAmpSidebar({
-        toolbars: [{}],
-      }).then(sidebarElement => {
-        expect(sidebarElement.implementation_.toolbars_.length)
-            .to.be.equal(1);
+    describe('amp-sidebar - toolbars in amp-sidebar', () => {
+      // Tests for amp-sidebar 1.0
+      it('should not create toolbars without <nav toolbar />', () => {
+        return getAmpSidebar().then(sidebarElement => {
+          const headerElements = doc.getElementsByTagName('header');
+          const toolbarElements = doc.querySelectorAll('[toolbar]');
+          expect(headerElements.length).to.be.equal(0);
+          expect(toolbarElements.length).to.be.equal(0);
+          expect(sidebarElement.implementation_.toolbars_.length).to.be.equal(
+            0
+          );
+        });
       });
-    });
 
-    it('should create multiple toolbar elements, ' +
-        'within their respective containers', () => {
-      return getAmpSidebar({
-        toolbars: [{},
-          {
-            media: '(min-width: 1024px)',
-          },
-        ],
-      }).then(sidebarElement => {
-        expect(sidebarElement.implementation_.toolbars_.length)
-            .to.be.equal(2);
+      it('should create a toolbar element within the toolbar-target', () => {
+        return getAmpSidebar({
+          toolbars: [{}],
+        }).then(sidebarElement => {
+          expect(sidebarElement.implementation_.toolbars_.length).to.be.equal(
+            1
+          );
+        });
       });
+
+      it(
+        'should create multiple toolbar elements, ' +
+          'within their respective containers',
+        () => {
+          return getAmpSidebar({
+            toolbars: [
+              {},
+              {
+                media: '(min-width: 1024px)',
+              },
+            ],
+          }).then(sidebarElement => {
+            expect(sidebarElement.implementation_.toolbars_.length).to.be.equal(
+              2
+            );
+          });
+        }
+      );
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-sidebar/0.1/test/test-toolbar.js b/extensions/amp-sidebar/0.1/test/test-toolbar.js
index d84d3d64ae0f..6e79b0f6b632 100644
--- a/extensions/amp-sidebar/0.1/test/test-toolbar.js
+++ b/extensions/amp-sidebar/0.1/test/test-toolbar.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2017 The AMP HTML Authors. All Rights Reserved.
  *
@@ -108,14 +107,21 @@ describe('amp-sidebar - toolbar', () => {
 
   it('toolbar header should error if target element \
    could not be found as it is required.', () => {
-    return getToolbars([{
-      targetError: true,
-    }]).then(() => {
-      expect(false).to.be.equal(true, 'Toolbar \
-       should not be created when the target element is not found');
-    }).catch(() => {
-      expect(true).to.be.ok;
-    });
+    return getToolbars([
+      {
+        targetError: true,
+      },
+    ])
+      .then(() => {
+        expect(false).to.be.equal(
+          true,
+          'Toolbar \
+       should not be created when the target element is not found'
+        );
+      })
+      .catch(() => {
+        expect(true).to.be.ok;
+      });
   });
 
   it('toolbar header should be hidden for a \
@@ -126,9 +132,9 @@ describe('amp-sidebar - toolbar', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
         });
-        const toolbarElements =
-                toArray(obj.ampdoc.getRootNode()
-                    .getElementsByClassName('i-amphtml-toolbar'));
+        const toolbarElements = toArray(
+          obj.ampdoc.getRootNode().getElementsByClassName('i-amphtml-toolbar')
+        );
         resizeIframeToWidth(obj.iframe, '1px', () => {
           toolbars.forEach(toolbar => {
             toolbar.onLayoutChange();
@@ -148,9 +154,9 @@ describe('amp-sidebar - toolbar', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
         });
-        const toolbarElements =
-                toArray(obj.ampdoc.getRootNode()
-                    .getElementsByClassName('i-amphtml-toolbar'));
+        const toolbarElements = toArray(
+          obj.ampdoc.getRootNode().getElementsByClassName('i-amphtml-toolbar')
+        );
         expect(toolbarElements.length).to.be.above(0);
         expect(toolbarElements[0].parentElement).to.not.have.display('none');
       });
@@ -160,18 +166,20 @@ describe('amp-sidebar - toolbar', () => {
   it('toolbar should be placed into a target, with the \
    target attrbiute', () => {
     const targetId = 'toolbar-target';
-    return getToolbars([{
-      'toolbar-target': targetId,
-    }]).then(obj => {
+    return getToolbars([
+      {
+        'toolbar-target': targetId,
+      },
+    ]).then(obj => {
       const {toolbars} = obj;
       resizeIframeToWidth(obj.iframe, '1024px', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
         });
         const toolbarQuery = `#${targetId} > nav[toolbar]`;
-        const toolbarTargetElements =
-                toArray(obj.ampdoc.getRootNode()
-                    .querySelectorAll(toolbarQuery));
+        const toolbarTargetElements = toArray(
+          obj.ampdoc.getRootNode().querySelectorAll(toolbarQuery)
+        );
         expect(toolbars.length).to.be.equal(1);
         expect(toolbarTargetElements.length).to.be.equal(1);
       });
@@ -181,13 +189,15 @@ describe('amp-sidebar - toolbar', () => {
   it('toolbar should be placed into a target, and shown for a \
    matching window size for (min-width: 768px)', () => {
     const targetId = 'toolbar-target';
-    return getToolbars([{
-      'toolbar-target': targetId,
-    }]).then(obj => {
+    return getToolbars([
+      {
+        'toolbar-target': targetId,
+      },
+    ]).then(obj => {
       const {toolbars} = obj;
-      const toolbarTargets =
-                toArray(obj.ampdoc.getRootNode()
-                    .querySelectorAll(`#${targetId}`));
+      const toolbarTargets = toArray(
+        obj.ampdoc.getRootNode().querySelectorAll(`#${targetId}`)
+      );
       resizeIframeToWidth(obj.iframe, '4000px', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
@@ -202,13 +212,15 @@ describe('amp-sidebar - toolbar', () => {
   it('toolbar should be placed into a target, and hidden for a \
    non-matching window size for (min-width: 768px)', () => {
     const targetId = 'toolbar-target';
-    return getToolbars([{
-      'toolbar-target': targetId,
-    }]).then(obj => {
+    return getToolbars([
+      {
+        'toolbar-target': targetId,
+      },
+    ]).then(obj => {
       const {toolbars} = obj;
-      const toolbarTargets =
-                toArray(obj.ampdoc.getRootNode()
-                    .querySelectorAll(`#${targetId}`));
+      const toolbarTargets = toArray(
+        obj.ampdoc.getRootNode().querySelectorAll(`#${targetId}`)
+      );
       resizeIframeToWidth(obj.iframe, '200px', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
@@ -222,19 +234,21 @@ describe('amp-sidebar - toolbar', () => {
 
   it('should add the "amp-sidebar-toolbar-target-shown" state class, \
    for matching window size of (min-width: 768px)', () => {
-    return getToolbars([{
-      toolbarOnlyOnNav: true,
-    }]).then(obj => {
+    return getToolbars([
+      {
+        toolbarOnlyOnNav: true,
+      },
+    ]).then(obj => {
       const {toolbars} = obj;
       resizeIframeToWidth(obj.iframe, '4000px', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
         });
-        const toolbarNavElementsWithState =
-                toArray(obj.ampdoc.getRootNode()
-                    .querySelectorAll(
-                        'nav[toolbar].amp-sidebar-toolbar-target-shown'
-                    ));
+        const toolbarNavElementsWithState = toArray(
+          obj.ampdoc
+            .getRootNode()
+            .querySelectorAll('nav[toolbar].amp-sidebar-toolbar-target-shown')
+        );
         expect(toolbarNavElementsWithState.length).to.be.equal(1);
         expect(toolbars.length).to.be.equal(1);
       });
@@ -243,19 +257,21 @@ describe('amp-sidebar - toolbar', () => {
 
   it('should add the "amp-sidebar-toolbar-target-hidden" state class, \
    for non-matching window size of (min-width: 768px)', () => {
-    return getToolbars([{
-      toolbarOnlyOnNav: true,
-    }]).then(obj => {
+    return getToolbars([
+      {
+        toolbarOnlyOnNav: true,
+      },
+    ]).then(obj => {
       const {toolbars} = obj;
       resizeIframeToWidth(obj.iframe, '0px', () => {
         toolbars.forEach(toolbar => {
           toolbar.onLayoutChange();
         });
-        const toolbarNavElementsWithState =
-                toArray(obj.ampdoc.getRootNode()
-                    .querySelectorAll(
-                        'nav[toolbar].amp-sidebar-toolbar-target-hidden'
-                    ));
+        const toolbarNavElementsWithState = toArray(
+          obj.ampdoc
+            .getRootNode()
+            .querySelectorAll('nav[toolbar].amp-sidebar-toolbar-target-hidden')
+        );
         expect(toolbarNavElementsWithState.length).to.be.equal(1);
         expect(toolbars.length).to.be.equal(1);
       });
diff --git a/extensions/amp-sidebar/0.1/toolbar.js b/extensions/amp-sidebar/0.1/toolbar.js
index 886b5787c6fb..8cf1a5f3e966 100644
--- a/extensions/amp-sidebar/0.1/toolbar.js
+++ b/extensions/amp-sidebar/0.1/toolbar.js
@@ -23,11 +23,10 @@ import {toggle} from '../../../src/style';
  */
 export class Toolbar {
   /**
-  * @param {!Element} element
-  * @param {!AMP.BaseElement} contextElement
-  */
+   * @param {!Element} element
+   * @param {!AMP.BaseElement} contextElement
+   */
   constructor(element, contextElement) {
-
     /** @private @const {!AMP.BaseElement} */
     this.context_ = contextElement;
 
@@ -46,12 +45,11 @@ export class Toolbar {
     /** @private {Element|undefined} */
     this.toolbarTarget_ = undefined;
 
-    /** @private {boolean} **/
+    /** @private {boolean} */
     this.toolbarShown_ = false;
 
     // Default to toolbar target being hidden
-    this.toolbarDomElement_.classList
-        .add('amp-sidebar-toolbar-target-hidden');
+    this.toolbarDomElement_.classList.add('amp-sidebar-toolbar-target-hidden');
 
     this.buildCallback_();
   }
@@ -61,8 +59,8 @@ export class Toolbar {
    */
   onLayoutChange() {
     // Get if we match the current toolbar media
-    const matchesMedia = this.ampdoc_.win
-        .matchMedia(this.toolbarMedia_).matches;
+    const matchesMedia = this.ampdoc_.win.matchMedia(this.toolbarMedia_)
+      .matches;
 
     // Remove and add the toolbar dynamically
     if (matchesMedia) {
@@ -78,9 +76,11 @@ export class Toolbar {
    */
   buildCallback_() {
     this.toolbarClone_ = this.toolbarDomElement_.cloneNode(true);
-    const targetId = userAssert(this.toolbarDomElement_
-        .getAttribute('toolbar-target'), '"toolbar-target" is required',
-    this.toolbarDomElement_);
+    const targetId = userAssert(
+      this.toolbarDomElement_.getAttribute('toolbar-target'),
+      '"toolbar-target" is required',
+      this.toolbarDomElement_
+    );
     // Set the target element to the toolbar clone if it exists.
     this.ampdoc_.whenReady().then(() => {
       const targetElement = this.ampdoc_.getElementById(targetId);
@@ -91,8 +91,10 @@ export class Toolbar {
       } else {
         // This error will be later rethrown as a user error and
         // the side bar will continue to function w/o toolbar feature
-        throw new Error('Could not find the ' +
-        `toolbar-target element with an id: ${targetId}`);
+        throw new Error(
+          'Could not find the ' +
+            `toolbar-target element with an id: ${targetId}`
+        );
       }
     });
   }
@@ -124,22 +126,23 @@ export class Toolbar {
         if (!this.toolbarTarget_.contains(this.toolbarClone_)) {
           this.toolbarTarget_.appendChild(this.toolbarClone_);
         }
-        this.toolbarDomElement_.classList
-            .add('amp-sidebar-toolbar-target-shown');
-        this.toolbarDomElement_.classList
-            .remove('amp-sidebar-toolbar-target-hidden');
+        this.toolbarDomElement_.classList.add(
+          'amp-sidebar-toolbar-target-shown'
+        );
+        this.toolbarDomElement_.classList.remove(
+          'amp-sidebar-toolbar-target-hidden'
+        );
         this.toolbarShown_ = true;
 
-        handleAutoscroll(this.ampdoc_,
-            dev().assertElement(this.toolbarClone_));
+        handleAutoscroll(this.ampdoc_, dev().assertElement(this.toolbarClone_));
       }
     });
   }
 
   /**
-  * Function to hide the toolbar,
-  * and show toolbar-only element in the sidebar.
-  * @private
+   * Function to hide the toolbar,
+   * and show toolbar-only element in the sidebar.
+   * @private
    */
   hideToolbar_() {
     if (!this.isToolbarShown_()) {
@@ -150,10 +153,12 @@ export class Toolbar {
       // Hide the elements
       if (this.toolbarTarget_) {
         toggle(this.toolbarTarget_, false);
-        this.toolbarDomElement_.classList
-            .add('amp-sidebar-toolbar-target-hidden');
-        this.toolbarDomElement_.classList
-            .remove('amp-sidebar-toolbar-target-shown');
+        this.toolbarDomElement_.classList.add(
+          'amp-sidebar-toolbar-target-hidden'
+        );
+        this.toolbarDomElement_.classList.remove(
+          'amp-sidebar-toolbar-target-shown'
+        );
         this.toolbarShown_ = false;
       }
     });
diff --git a/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
index 6f5a9437e15b..c66386b0d40c 100644
--- a/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/affiliate-link-resolver.js
@@ -105,8 +105,7 @@ export class AffiliateLinkResolver {
       credentials: 'include',
     };
 
-    return this.xhr_.fetchJson(beaconUrl, fetchOptions)
-        .then(res => res.json());
+    return this.xhr_.fetchJson(beaconUrl, fetchOptions).then(res => res.json());
   }
 
   /**
@@ -128,7 +127,8 @@ export class AffiliateLinkResolver {
    */
   resolveUnknownAnchors(anchorList) {
     const alreadyResolvedResponse = this.associateWithReplacementUrl_(
-        anchorList);
+      anchorList
+    );
     let willBeResolvedPromise = null;
 
     const domainsToAsk = this.getNewDomains_(anchorList);
@@ -138,13 +138,14 @@ export class AffiliateLinkResolver {
       this.markDomainsAsUnknown_(domainsToAsk);
       // Get anchors waiting for the API response to be resolved.
       const unknownAnchors = this.getUnknownAnchors_(anchorList, domainsToAsk);
-      willBeResolvedPromise = this.resolvedUnknownAnchorsAsync_(unknownAnchors,
-          domainsToAsk);
+      willBeResolvedPromise = this.resolvedUnknownAnchorsAsync_(
+        unknownAnchors,
+        domainsToAsk
+      );
     }
 
     // Returns an object containing a sync reponse and an async response.
-    return new TwoStepsResponse(alreadyResolvedResponse,
-        willBeResolvedPromise);
+    return new TwoStepsResponse(alreadyResolvedResponse, willBeResolvedPromise);
   }
 
   /**
@@ -170,11 +171,13 @@ export class AffiliateLinkResolver {
     return anchorList.map(anchor => {
       let replacementUrl = null;
       const status = this.getDomainAffiliateStatus_(
-          this.getAnchorDomain_(anchor));
+        this.getAnchorDomain_(anchor)
+      );
       // Always replace unknown, we will overwrite them after asking
       // the api if needed
-      const shouldReplace = status === AFFILIATE_STATUS.AFFILIATE ||
-                            status === AFFILIATE_STATUS.UNKNOWN;
+      const shouldReplace =
+        status === AFFILIATE_STATUS.AFFILIATE ||
+        status === AFFILIATE_STATUS.UNKNOWN;
       if (shouldReplace) {
         replacementUrl = this.waypoint_.getAffiliateUrl(anchor);
       }
@@ -209,7 +212,7 @@ export class AffiliateLinkResolver {
    * @private
    */
   getNewDomains_(anchorList) {
-    return anchorList.reduce(((acc, anchor) => {
+    return anchorList.reduce((acc, anchor) => {
       const domain = this.getAnchorDomain_(anchor);
       const isResolved = this.domains_[domain];
       const isExcluded = isExcludedDomain(domain, this.skimOptions_);
@@ -220,7 +223,7 @@ export class AffiliateLinkResolver {
       }
 
       return acc;
-    }), []);
+    }, []);
   }
 
   /**
@@ -293,9 +296,9 @@ export class AffiliateLinkResolver {
   updateDomainsStatusMap_(allDomains, affiliateDomains) {
     allDomains.forEach(domain => {
       const isAffiliateDomain = affiliateDomains.indexOf(domain) !== -1;
-      this.domains_[domain] = isAffiliateDomain ?
-        AFFILIATE_STATUS.AFFILIATE :
-        AFFILIATE_STATUS.NON_AFFILIATE;
+      this.domains_[domain] = isAffiliateDomain
+        ? AFFILIATE_STATUS.AFFILIATE
+        : AFFILIATE_STATUS.NON_AFFILIATE;
     });
   }
 
diff --git a/extensions/amp-skimlinks/0.1/amp-skimlinks.js b/extensions/amp-skimlinks/0.1/amp-skimlinks.js
index 386001526b83..56c27345154d 100644
--- a/extensions/amp-skimlinks/0.1/amp-skimlinks.js
+++ b/extensions/amp-skimlinks/0.1/amp-skimlinks.js
@@ -84,12 +84,13 @@ export class AmpSkimlinks extends AMP.BaseElement {
     this.linkRewriterService_ = new LinkRewriterManager(this.ampDoc_);
     this.skimOptions_ = getAmpSkimlinksOptions(this.element, this.docInfo_);
 
-    return this.ampDoc_.whenBodyAvailable()
-        .then(() => this.viewer_.getReferrerUrl())
-        .then(referrer => {
-          this.referrer_ = referrer;
-          this.startSkimcore_();
-        });
+    return this.ampDoc_
+      .whenBodyAvailable()
+      .then(() => this.viewer_.getReferrerUrl())
+      .then(referrer => {
+        this.referrer_ = referrer;
+        this.startSkimcore_();
+      });
   }
 
   /**
@@ -98,17 +99,17 @@ export class AmpSkimlinks extends AMP.BaseElement {
   startSkimcore_() {
     this.trackingService_ = this.initTracking_();
     this.waypoint_ = new Waypoint(
-        /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
-        (this.ampDoc_),
-        this.skimOptions_,
-        this.trackingService_,
-        /** @type {string} */ (this.referrer_)
+      /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
+      (this.ampDoc_),
+      this.skimOptions_,
+      this.trackingService_,
+      /** @type {string} */ (this.referrer_)
     );
     this.affiliateLinkResolver_ = new AffiliateLinkResolver(
-        /** @type {!../../../src/service/xhr-impl.Xhr} */
-        (this.xhr_),
-        this.skimOptions_,
-        this.waypoint_
+      /** @type {!../../../src/service/xhr-impl.Xhr} */
+      (this.xhr_),
+      this.skimOptions_,
+      this.waypoint_
     );
 
     this.skimlinksLinkRewriter_ = this.initSkimlinksLinkRewriter_();
@@ -123,8 +124,8 @@ export class AmpSkimlinks extends AMP.BaseElement {
     // Update tracking service with extra info.
     this.trackingService_.setTrackingInfo({guid: beaconData['guid']});
     const viewer = Services.viewerForDoc(
-        /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
-        (this.ampDoc_)
+      /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
+      (this.ampDoc_)
     );
     /*
       WARNING: Up to here, the code may have been executed during page
@@ -133,7 +134,7 @@ export class AmpSkimlinks extends AMP.BaseElement {
     */
     viewer.whenFirstVisible().then(() => {
       this.trackingService_.sendImpressionTracking(
-          this.skimlinksLinkRewriter_.getAnchorReplacementList()
+        this.skimlinksLinkRewriter_.getAnchorReplacementList()
       );
     });
   }
@@ -148,9 +149,10 @@ export class AmpSkimlinks extends AMP.BaseElement {
   onPageScanned_() {
     // .firstRequest may be null if the page doesn't have any non-excluded
     // links.
-    const beaconApiPromise = this.affiliateLinkResolver_.firstRequest ||
-        // If it's the case, fallback with manual call.
-        this.affiliateLinkResolver_.fetchDomainResolverApi([]);
+    const beaconApiPromise =
+      this.affiliateLinkResolver_.firstRequest ||
+      // If it's the case, fallback with manual call.
+      this.affiliateLinkResolver_.fetchDomainResolverApi([]);
 
     return beaconApiPromise.then(this.sendImpressionTracking_.bind(this));
   }
@@ -166,11 +168,11 @@ export class AmpSkimlinks extends AMP.BaseElement {
     };
 
     const linkRewriter = this.linkRewriterService_.registerLinkRewriter(
-        SKIMLINKS_REWRITER_ID,
-        anchorList => {
-          return this.affiliateLinkResolver_.resolveUnknownAnchors(anchorList);
-        },
-        options
+      SKIMLINKS_REWRITER_ID,
+      anchorList => {
+        return this.affiliateLinkResolver_.resolveUnknownAnchors(anchorList);
+      },
+      options
     );
 
     const eventHandlers = {
@@ -202,9 +204,9 @@ export class AmpSkimlinks extends AMP.BaseElement {
     // We need to call it manually to have CustomEventReporterBuilder working.
     this.signals().signal(CommonSignals.LOAD_START);
     return new Tracking(
-        this.element,
-        this.skimOptions_,
-        /** @type {string} */ (this.referrer_)
+      this.element,
+      this.skimOptions_,
+      /** @type {string} */ (this.referrer_)
     );
   }
 
@@ -215,15 +217,14 @@ export class AmpSkimlinks extends AMP.BaseElement {
    * @private
    */
   onClick_(eventData) {
-    const doClickTracking = (
+    const doClickTracking =
       // Test two scenarios:
       //  - Link hasn't been replaced at all: eventData.linkRewriterId === null.
       //  - Link has been replaced but not by Skimlinks:
       //    E.g: eventData.linkRewriterId === "awin".
       eventData.linkRewriterId !== SKIMLINKS_REWRITER_ID &&
       // Also, context menu click should not send tracking
-      eventData.clickType !== 'contextmenu'
-    );
+      eventData.clickType !== 'contextmenu';
 
     if (doClickTracking) {
       this.trackingService_.sendNaClickTracking(eventData.anchor);
diff --git a/extensions/amp-skimlinks/0.1/constants.js b/extensions/amp-skimlinks/0.1/constants.js
index cc69964025f2..b5bcea09572b 100644
--- a/extensions/amp-skimlinks/0.1/constants.js
+++ b/extensions/amp-skimlinks/0.1/constants.js
@@ -22,12 +22,9 @@ export const SKIMLINKS_REWRITER_ID = 'amp-skimlinks';
 
 const DOMAIN_RESOLVER_API_URL = 'https://r.skimresources.com/api';
 const TRACKING_API_URL = 'https://t.skimresources.com/api';
-const PAGE_IMPRESSION_TRACKING_URL =
-    `${TRACKING_API_URL}/track.php?data=\${data}`;
-const LINKS_IMPRESSIONS_TRACKING_URL =
-    `${TRACKING_API_URL}/link?data=\${data}`;
-const NA_CLICK_TRACKING_URL =
-    `${TRACKING_API_URL}/?call=track&rnd=\${rnd}&data=\${data}`;
+const PAGE_IMPRESSION_TRACKING_URL = `${TRACKING_API_URL}/track.php?data=\${data}`;
+const LINKS_IMPRESSIONS_TRACKING_URL = `${TRACKING_API_URL}/link?data=\${data}`;
+const NA_CLICK_TRACKING_URL = `${TRACKING_API_URL}/?call=track&rnd=\${rnd}&data=\${data}`;
 
 export const DEFAULT_CONFIG = {
   pageTrackingUrl: PAGE_IMPRESSION_TRACKING_URL,
@@ -53,5 +50,3 @@ export const OPTIONS_ERRORS = {
     'and lowercase characters, numbers, underscores and pipes.',
   INVALID_TRACKING_STATUS: '"tracking" possible values are "true" or "false".',
 };
-
-
diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-replacement-cache.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-replacement-cache.js
index 4e4373eea3b9..6a2d1719eb9e 100644
--- a/extensions/amp-skimlinks/0.1/link-rewriter/link-replacement-cache.js
+++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-replacement-cache.js
@@ -24,7 +24,6 @@ export class LinkReplacementCache {
    * Constructor
    */
   constructor() {
-
     /** @private {!Array<!HTMLElement>} */
     this.anchorList_ = [];
 
@@ -44,7 +43,7 @@ export class LinkReplacementCache {
     // Warning: This step needs to be done before updating this.anchorList_
     // since getReplacementUrlForAnchor relies on it.
     this.replacementList_ = newAnchorList.map(
-        this.getReplacementUrlForAnchor.bind(this)
+      this.getReplacementUrlForAnchor.bind(this)
     );
 
     this.anchorList_ = newAnchorList;
diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
index ab0d087d26e9..f58e1fcde27c 100644
--- a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
+++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter-manager.js
@@ -20,7 +20,6 @@ import {LinkRewriter} from './link-rewriter';
 import {Priority} from '../../../../src/service/navigation';
 import {Services} from '../../../../src/services';
 
-
 /**
  * LinkRewriterManager works together with LinkRewriter to allow rewriting
  * links at click time. E.g: Replacing a link by its affiliate version only if
@@ -54,7 +53,6 @@ export class LinkRewriterManager {
    * @param {!../../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
   constructor(ampdoc) {
-
     /**
      * Use getRootNode() to support "shadow AMP" mode where the rootNode is not
      * necessarily the page document.
@@ -81,7 +79,9 @@ export class LinkRewriterManager {
     this.installGlobalEventListener_(this.rootNode_);
     const navigation = Services.navigationForDoc(ampdoc);
     navigation.registerAnchorMutator(
-        this.maybeRewriteLink.bind(this), Priority.LINK_REWRITER_MANAGER);
+      this.maybeRewriteLink.bind(this),
+      Priority.LINK_REWRITER_MANAGER
+    );
   }
 
   /**
@@ -102,13 +102,16 @@ export class LinkRewriterManager {
    */
   registerLinkRewriter(linkRewriterId, resolveUnknownLinks, options) {
     const linkRewriter = new LinkRewriter(
-        this.rootNode_,
-        linkRewriterId,
-        resolveUnknownLinks,
-        options
+      this.rootNode_,
+      linkRewriterId,
+      resolveUnknownLinks,
+      options
+    );
+    this.insertInListBasedOnPriority_(
+      this.linkRewriters_,
+      linkRewriter,
+      this.priorityList_
     );
-    this.insertInListBasedOnPriority_(this.linkRewriters_, linkRewriter,
-        this.priorityList_);
     // Trigger initial scan.
     linkRewriter.onDomUpdated();
 
@@ -135,7 +138,7 @@ export class LinkRewriterManager {
    */
   maybeRewriteLink(anchor, event) {
     const suitableLinkRewriters = this.getSuitableLinkRewritersForLink_(
-        /** @type {!HTMLElement} */(anchor)
+      /** @type {!HTMLElement} */ (anchor)
     );
     if (suitableLinkRewriters.length) {
       let chosenLinkRewriter = null;
@@ -144,7 +147,7 @@ export class LinkRewriterManager {
       // replaces the link.
       for (let i = 0; i < suitableLinkRewriters.length; i++) {
         const hasReplaced = suitableLinkRewriters[i].rewriteAnchorUrl(
-            /** @type {!HTMLElement} */(anchor)
+          /** @type {!HTMLElement} */ (anchor)
         );
         if (hasReplaced) {
           chosenLinkRewriter = suitableLinkRewriters[i];
@@ -193,8 +196,10 @@ export class LinkRewriterManager {
    * @private
    */
   installGlobalEventListener_(rootNode) {
-    rootNode.addEventListener(AmpEvents.DOM_UPDATE,
-        this.onDomChanged_.bind(this));
+    rootNode.addEventListener(
+      AmpEvents.DOM_UPDATE,
+      this.onDomChanged_.bind(this)
+    );
   }
 
   /**
diff --git a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
index 1724eb87452f..ede20048f4df 100644
--- a/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
+++ b/extensions/amp-skimlinks/0.1/link-rewriter/link-rewriter.js
@@ -21,11 +21,9 @@ import {Observable} from '../../../../src/observable';
 import {TwoStepsResponse} from './two-steps-response';
 import {userAssert} from '../../../../src/log';
 
-
 /** @typedef {!Array<{anchor: !HTMLElement, replacementUrl: ?string}>}} */
 export let AnchorReplacementList;
 
-
 /**
  * LinkRewriter works together with LinkRewriterManager to allow rewriting
  * links at click time. E.g: Replacing a link by its affiliate version only if
@@ -151,17 +149,17 @@ export class LinkRewriter {
    */
   onDomUpdated() {
     return new Promise(resolve => {
-      const task = (() => {
+      const task = () => {
         return this.scanLinksOnPage_().then(() => {
           this.events.fire({type: EVENTS.PAGE_SCANNED});
           resolve();
         });
-      });
-      const elementOrShadowRoot = /** @type {!Element|!ShadowRoot} */ (
-        (this.rootNode_.nodeType == Node.DOCUMENT_NODE)
+      };
+      const elementOrShadowRoot =
+        /** @type {!Element|!ShadowRoot} */ (this.rootNode_.nodeType ==
+        Node.DOCUMENT_NODE
           ? this.rootNode_.documentElement
-          : this.rootNode_
-      );
+          : this.rootNode_);
       chunk(elementOrShadowRoot, task, ChunkPriority.LOW);
     });
   }
@@ -193,23 +191,25 @@ export class LinkRewriter {
     // handlers. (Other anchors are assumed to be the ones exluded by
     // linkSelector_)
     this.anchorReplacementCache_.updateReplacementUrls(
-        unknownAnchors.map(anchor => ({anchor, replacementUrl: null}))
+      unknownAnchors.map(anchor => ({anchor, replacementUrl: null}))
     );
     const twoStepsResponse = this.resolveUnknownLinks_(unknownAnchors);
-    userAssert(twoStepsResponse instanceof TwoStepsResponse,
-        'Invalid response from provided "resolveUnknownLinks" function.' +
-        '"resolveUnknownLinks" should return an instance of TwoStepsResponse');
+    userAssert(
+      twoStepsResponse instanceof TwoStepsResponse,
+      'Invalid response from provided "resolveUnknownLinks" function.' +
+        '"resolveUnknownLinks" should return an instance of TwoStepsResponse'
+    );
 
     if (twoStepsResponse.syncResponse) {
       this.anchorReplacementCache_.updateReplacementUrls(
-          twoStepsResponse.syncResponse);
+        twoStepsResponse.syncResponse
+      );
     }
     // Anchors for which the status needs to be resolved asynchronously
     if (twoStepsResponse.asyncResponse) {
-      return twoStepsResponse.asyncResponse
-          .then(data => {
-            this.anchorReplacementCache_.updateReplacementUrls(data);
-          });
+      return twoStepsResponse.asyncResponse.then(data => {
+        this.anchorReplacementCache_.updateReplacementUrls(data);
+      });
     }
 
     return Promise.resolve();
diff --git a/extensions/amp-skimlinks/0.1/skim-options.js b/extensions/amp-skimlinks/0.1/skim-options.js
index 51cedbf87358..795b6633f812 100644
--- a/extensions/amp-skimlinks/0.1/skim-options.js
+++ b/extensions/amp-skimlinks/0.1/skim-options.js
@@ -60,16 +60,16 @@ export function getAmpSkimlinksOptions(element, docInfo) {
  */
 function getExcludedDomains_(element, internalDomains) {
   let excludedDomains = []
-      .concat(internalDomains)
-      .concat(GLOBAL_DOMAIN_BLACKLIST);
+    .concat(internalDomains)
+    .concat(GLOBAL_DOMAIN_BLACKLIST);
 
   const excludedDomainsAttr = element.getAttribute('excluded-domains');
   if (excludedDomainsAttr) {
     excludedDomains = excludedDomains.concat(
-        excludedDomainsAttr
-            .trim()
-            .split(/\s+/)
-            .map(domain => domain.replace(/^www\./, ''))
+      excludedDomainsAttr
+        .trim()
+        .split(/\s+/)
+        .map(domain => domain.replace(/^www\./, ''))
     );
   }
 
@@ -182,14 +182,14 @@ function getConfig_(element) {
     // by google closure compiler on the production build. Therefore, we
     // are converting here the JSON object keys to the internal object keys.
     return {
-      pageTrackingUrl: customConfigJson['pageTrackingUrl'] ||
-        DEFAULT_CONFIG.pageTrackingUrl,
-      linksTrackingUrl: customConfigJson['linksTrackingUrl'] ||
-        DEFAULT_CONFIG.linksTrackingUrl,
-      nonAffiliateTrackingUrl: customConfigJson['nonAffiliateTrackingUrl'] ||
+      pageTrackingUrl:
+        customConfigJson['pageTrackingUrl'] || DEFAULT_CONFIG.pageTrackingUrl,
+      linksTrackingUrl:
+        customConfigJson['linksTrackingUrl'] || DEFAULT_CONFIG.linksTrackingUrl,
+      nonAffiliateTrackingUrl:
+        customConfigJson['nonAffiliateTrackingUrl'] ||
         DEFAULT_CONFIG.nonAffiliateTrackingUrl,
-      beaconUrl: customConfigJson['beaconUrl'] ||
-        DEFAULT_CONFIG.beaconUrl,
+      beaconUrl: customConfigJson['beaconUrl'] || DEFAULT_CONFIG.beaconUrl,
     };
   } catch (err) {
     return DEFAULT_CONFIG;
diff --git a/extensions/amp-skimlinks/0.1/test/helpers.js b/extensions/amp-skimlinks/0.1/test/helpers.js
index b6bb535386e7..f70f2fee1b79 100644
--- a/extensions/amp-skimlinks/0.1/test/helpers.js
+++ b/extensions/amp-skimlinks/0.1/test/helpers.js
@@ -57,10 +57,7 @@ const helpersFactory = env => {
     },
 
     createTrackingWithStubAnalytics(skimOptions) {
-      skimOptions = Object.assign({},
-          DEFAULT_SKIM_OPTIONS,
-          skimOptions
-      );
+      skimOptions = Object.assign({}, DEFAULT_SKIM_OPTIONS, skimOptions);
       this.stubCustomEventReporterBuilder();
 
       return new Tracking(env, skimOptions, 'my-page-referrer');
diff --git a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
index 59cbefbaeb8f..c3a5817f2d89 100644
--- a/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
+++ b/extensions/amp-skimlinks/0.1/test/test-affiliate-link-resolver.js
@@ -27,429 +27,404 @@ import helpersFactory from './helpers';
 const DOMAIN_RESOLVER_API_URL = DEFAULT_CONFIG.beaconUrl;
 
 describes.fakeWin(
-    'AffiliateLinkResolver',
-    {
-      amp: {
-        extensions: ['amp-skimlinks'],
-      },
+  'AffiliateLinkResolver',
+  {
+    amp: {
+      extensions: ['amp-skimlinks'],
     },
-    env => {
-      let win;
-      let xhr;
-      let helpers;
-      let trackingService;
-      let waypoint;
+  },
+  env => {
+    let win;
+    let xhr;
+    let helpers;
+    let trackingService;
+    let waypoint;
+
+    beforeEach(() => {
+      win = env.win;
+      xhr = Services.xhrFor(win);
+      helpers = helpersFactory(env);
+    });
+
+    beforeEach(() => {
+      trackingService = helpers.createTrackingWithStubAnalytics();
+      waypoint = new Waypoint(
+        env.ampdoc,
+        DEFAULT_SKIM_OPTIONS,
+        trackingService,
+        'referrer'
+      );
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('resolveUnknownAnchors', () => {
+      const alreadyResolvedDomains = {
+        'merchant1.com': AFFILIATE_STATUS.AFFILIATE,
+        'non-merchant.com': AFFILIATE_STATUS.NON_AFFILIATE,
+        'merchant2.com': AFFILIATE_STATUS.AFFILIATE,
+      };
+      let resolver;
+      let anchorList;
+      let mock;
 
       beforeEach(() => {
-        win = env.win;
-        xhr = Services.xhrFor(win);
-        helpers = helpersFactory(env);
+        anchorList = [
+          'http://merchant1.com',
+          'http://non-merchant.com',
+          'https://merchant2.com',
+        ].map(helpers.createAnchor);
       });
 
-      beforeEach(() => {
-        trackingService = helpers.createTrackingWithStubAnalytics();
-        waypoint = new Waypoint(
-            env.ampdoc,
-            DEFAULT_SKIM_OPTIONS,
-            trackingService,
-            'referrer'
-        );
-      });
-
-      afterEach(() => {
-        env.sandbox.restore();
-      });
-
-      describe('resolveUnknownAnchors', () => {
-        const alreadyResolvedDomains = {
-          'merchant1.com': AFFILIATE_STATUS.AFFILIATE,
-          'non-merchant.com': AFFILIATE_STATUS.NON_AFFILIATE,
-          'merchant2.com': AFFILIATE_STATUS.AFFILIATE,
-        };
-        let resolver;
-        let anchorList;
-        let mock;
-
+      describe('When calling "fetchDomainResolverApi"', () => {
         beforeEach(() => {
+          resolver = new AffiliateLinkResolver(
+            {},
+            {excludedDomains: ['excluded-merchant.com']},
+            waypoint
+          );
+
           anchorList = [
             'http://merchant1.com',
             'http://non-merchant.com',
             'https://merchant2.com',
           ].map(helpers.createAnchor);
+          mock = env.sandbox.mock(resolver);
         });
 
-        describe('When calling "fetchDomainResolverApi"', () => {
-          beforeEach(() => {
-            resolver = new AffiliateLinkResolver(
-                {},
-                {excludedDomains: ['excluded-merchant.com']},
-                waypoint
-            );
+        afterEach(() => {
+          mock.verify();
+        });
 
-            anchorList = [
-              'http://merchant1.com',
-              'http://non-merchant.com',
-              'https://merchant2.com',
-            ].map(helpers.createAnchor);
-            mock = env.sandbox.mock(resolver);
-          });
+        it('Should ask for all the domains the first time.', () => {
+          mock
+            .expects('fetchDomainResolverApi')
+            .once()
+            .withArgs(['merchant1.com', 'non-merchant.com', 'merchant2.com'])
+            .returns(Promise.resolve({}));
 
-          afterEach(() => {
-            mock.verify();
-          });
-
-          it('Should ask for all the domains the first time.', () => {
-            mock
-                .expects('fetchDomainResolverApi')
-                .once()
-                .withArgs(
-                    ['merchant1.com', 'non-merchant.com', 'merchant2.com']
-                )
-                .returns(Promise.resolve({}));
+          resolver.resolveUnknownAnchors(anchorList);
+        });
 
-            resolver.resolveUnknownAnchors(anchorList);
-          });
+        it('Should make the list of requested domains unique', () => {
+          anchorList = [helpers.createAnchor('https://merchant1.com')].concat(
+            anchorList
+          );
+          mock
+            .expects('fetchDomainResolverApi')
+            .once()
+            .withArgs(['merchant1.com', 'non-merchant.com', 'merchant2.com'])
+            .returns(Promise.resolve({}));
 
-          it('Should make the list of requested domains unique', () => {
-            anchorList = [helpers.createAnchor('https://merchant1.com')].concat(
-                anchorList
-            );
-            mock
-                .expects('fetchDomainResolverApi')
-                .once()
-                .withArgs(
-                    ['merchant1.com', 'non-merchant.com', 'merchant2.com']
-                )
-                .returns(Promise.resolve({}));
-
-            resolver.resolveUnknownAnchors(anchorList);
-          });
+          resolver.resolveUnknownAnchors(anchorList);
+        });
 
-          it('Should only ask for new domains the next times', () => {
+        it('Should only ask for new domains the next times', () => {
           // Set the domains like if we had already done a call to the API.
-            resolver.domains_ = alreadyResolvedDomains;
-
-            mock
-                .expects('fetchDomainResolverApi')
-                .once()
-                .withArgs(['non-merchant-new.com', 'merchant-new'])
-                .returns(Promise.resolve({}));
-
-            resolver.resolveUnknownAnchors(
-                [
-                  helpers.createAnchor('http://non-merchant-new.com'),
-                  helpers.createAnchor('//merchant-new'),
-                ].concat(anchorList)
-            );
-          });
+          resolver.domains_ = alreadyResolvedDomains;
+
+          mock
+            .expects('fetchDomainResolverApi')
+            .once()
+            .withArgs(['non-merchant-new.com', 'merchant-new'])
+            .returns(Promise.resolve({}));
+
+          resolver.resolveUnknownAnchors(
+            [
+              helpers.createAnchor('http://non-merchant-new.com'),
+              helpers.createAnchor('//merchant-new'),
+            ].concat(anchorList)
+          );
+        });
 
-          it('Should not ask for any domains when no new domains', () => {
+        it('Should not ask for any domains when no new domains', () => {
           // Set the domains like if we had already done a call to the API.
-            resolver.domains_ = alreadyResolvedDomains;
-
-            mock.expects('fetchDomainResolverApi').never();
+          resolver.domains_ = alreadyResolvedDomains;
 
-            resolver.resolveUnknownAnchors(anchorList);
-          });
+          mock.expects('fetchDomainResolverApi').never();
 
-          it('Should not ask for domains when no links on the page', () => {
-            mock.expects('fetchDomainResolverApi').never();
+          resolver.resolveUnknownAnchors(anchorList);
+        });
 
-            resolver.resolveUnknownAnchors([]);
-          });
+        it('Should not ask for domains when no links on the page', () => {
+          mock.expects('fetchDomainResolverApi').never();
 
-          it('Should not send excluded domains', () => {
-            mock
-                .expects('fetchDomainResolverApi')
-                .once()
-                .withArgs(
-                    ['merchant1.com', 'non-merchant.com', 'merchant2.com']
-                )
-                .returns(Promise.resolve({}));
-
-            resolver.resolveUnknownAnchors(
-                [helpers.createAnchor('https://www.excluded-merchant.com')].concat(
-                    anchorList
-                )
-            );
-          });
+          resolver.resolveUnknownAnchors([]);
+        });
 
-          it('Should not send already requested domains when pending request',
-              () => {
-                // Simulate pending request with unresolved Promise.
-                // fetch should be called only once!
-                mock
-                    .expects('fetchDomainResolverApi')
-                    .once()
-                    .returns(new Promise(() => {}));
-                const response = resolver.resolveUnknownAnchors(anchorList);
-
-                let requestIsPending = true;
-
-                // First request
-                response.asyncResponse.then(() => {
-                  requestIsPending = false;
-                });
-
-                expect(requestIsPending).to.be.true;
-                // Second request, first request should still be pending.
-                resolver.resolveUnknownAnchors(anchorList);
-                expect(requestIsPending).to.be.true;
-                expect(resolver.domains_).to.deep.equal({
-                  'merchant1.com': AFFILIATE_STATUS.UNKNOWN,
-                  'non-merchant.com': AFFILIATE_STATUS.UNKNOWN,
-                  'merchant2.com': AFFILIATE_STATUS.UNKNOWN,
-                });
-              });
+        it('Should not send excluded domains', () => {
+          mock
+            .expects('fetchDomainResolverApi')
+            .once()
+            .withArgs(['merchant1.com', 'non-merchant.com', 'merchant2.com'])
+            .returns(Promise.resolve({}));
+
+          resolver.resolveUnknownAnchors(
+            [helpers.createAnchor('https://www.excluded-merchant.com')].concat(
+              anchorList
+            )
+          );
         });
 
-        describe('Does correct request to domain resolver API', () => {
-          beforeEach(() => {
-            mock = env.sandbox.mock(xhr);
-            resolver = new AffiliateLinkResolver(
-                xhr,
-                DEFAULT_SKIM_OPTIONS,
-                waypoint
-            );
-          });
+        it('Should not send already requested domains when pending request', () => {
+          // Simulate pending request with unresolved Promise.
+          // fetch should be called only once!
+          mock
+            .expects('fetchDomainResolverApi')
+            .once()
+            .returns(new Promise(() => {}));
+          const response = resolver.resolveUnknownAnchors(anchorList);
+
+          let requestIsPending = true;
 
-          afterEach(() => {
-            mock.verify();
+          // First request
+          response.asyncResponse.then(() => {
+            requestIsPending = false;
           });
 
-          it('Should call the correct url', () => {
-            const domains = ['domain1.com', 'domain2.com'];
-            const expectedData = {
-              pubcode,
-              page: '',
-              domains,
-            };
-
-            const url = `${DOMAIN_RESOLVER_API_URL}?data=${JSON.stringify(
-                expectedData
-            )}`;
-            const response = {
-              json: () => Promise.resolve({}),
-            };
-
-            mock
-                .expects('fetchJson')
-                .once()
-                .withArgs(url)
-                .returns(Promise.resolve(response));
-
-            resolver.fetchDomainResolverApi(domains);
+          expect(requestIsPending).to.be.true;
+          // Second request, first request should still be pending.
+          resolver.resolveUnknownAnchors(anchorList);
+          expect(requestIsPending).to.be.true;
+          expect(resolver.domains_).to.deep.equal({
+            'merchant1.com': AFFILIATE_STATUS.UNKNOWN,
+            'non-merchant.com': AFFILIATE_STATUS.UNKNOWN,
+            'merchant2.com': AFFILIATE_STATUS.UNKNOWN,
           });
+        });
+      });
 
-          it('Should use the corret fetch options', () => {
-            const domains = ['domain1.com', 'domain2.com'];
-            const expectedData = {
-              pubcode,
-              page: '',
-              domains,
-            };
-
-            const url = `${DOMAIN_RESOLVER_API_URL}?data=${JSON.stringify(
-                expectedData
-            )}`;
-            const fetchOptions = {
-              method: 'GET',
-              // Disabled AMP CORS
-              ampCors: false,
-              // Allow beacon API to set cookies
-              credentials: 'include',
-            };
-            const response = {
-              json: () => Promise.resolve({}),
-            };
-
-            mock
-                .expects('fetchJson')
-                .once()
+      describe('Does correct request to domain resolver API', () => {
+        beforeEach(() => {
+          mock = env.sandbox.mock(xhr);
+          resolver = new AffiliateLinkResolver(
+            xhr,
+            DEFAULT_SKIM_OPTIONS,
+            waypoint
+          );
+        });
+
+        afterEach(() => {
+          mock.verify();
+        });
+
+        it('Should call the correct url', () => {
+          const domains = ['domain1.com', 'domain2.com'];
+          const expectedData = {
+            pubcode,
+            page: '',
+            domains,
+          };
+
+          const url = `${DOMAIN_RESOLVER_API_URL}?data=${JSON.stringify(
+            expectedData
+          )}`;
+          const response = {
+            json: () => Promise.resolve({}),
+          };
+
+          mock
+            .expects('fetchJson')
+            .once()
+            .withArgs(url)
+            .returns(Promise.resolve(response));
+
+          resolver.fetchDomainResolverApi(domains);
+        });
+
+        it('Should use the corret fetch options', () => {
+          const domains = ['domain1.com', 'domain2.com'];
+          const expectedData = {
+            pubcode,
+            page: '',
+            domains,
+          };
+
+          const url = `${DOMAIN_RESOLVER_API_URL}?data=${JSON.stringify(
+            expectedData
+          )}`;
+          const fetchOptions = {
+            method: 'GET',
+            // Disabled AMP CORS
+            ampCors: false,
+            // Allow beacon API to set cookies
+            credentials: 'include',
+          };
+          const response = {
+            json: () => Promise.resolve({}),
+          };
+
+          mock
+            .expects('fetchJson')
+            .once()
             // Ideally only focused on fetchOptions but using sinon.match.any
             // as the first arg makes the test fail for some reasons.
-                .withArgs(url, fetchOptions)
-                .returns(Promise.resolve(response));
+            .withArgs(url, fetchOptions)
+            .returns(Promise.resolve(response));
 
-            resolver.fetchDomainResolverApi(domains);
-          });
+          resolver.fetchDomainResolverApi(domains);
         });
+      });
 
-        describe('Returns the correct data', () => {
-          function createAnchorReplacementObject(anchor, replacementUrl) {
-            return {anchor, replacementUrl};
-          }
-
-          beforeEach(() => {
-            const stubXhr = helpers.createStubXhr({
-              'merchant_domains': ['merchant1.com', 'merchant2.com'],
-            });
-            const skimOptions = Object.assign({},
-                DEFAULT_SKIM_OPTIONS,
-                {excludedDomains: ['excluded-merchant.com']}
-            );
+      describe('Returns the correct data', () => {
+        function createAnchorReplacementObject(anchor, replacementUrl) {
+          return {anchor, replacementUrl};
+        }
 
-            resolver = new AffiliateLinkResolver(
-                stubXhr,
-                skimOptions,
-                waypoint
-            );
+        beforeEach(() => {
+          const stubXhr = helpers.createStubXhr({
+            'merchant_domains': ['merchant1.com', 'merchant2.com'],
           });
-
-          it('Should return an object with sync and async response', () => {
-            const twoStepsResponse = resolver.resolveUnknownAnchors([]);
-            expect(twoStepsResponse).to.have.all.keys(
-                'syncResponse',
-                'asyncResponse'
-            );
+          const skimOptions = Object.assign({}, DEFAULT_SKIM_OPTIONS, {
+            excludedDomains: ['excluded-merchant.com'],
           });
 
-          it('Should affiliate unknown links until the API gives an answer',
-              () => {
-                const twoStepsResponse = resolver.resolveUnknownAnchors(
-                    anchorList);
-                // Replace all the unknown in the synchronous reponse,
-                // asynchronous response will then overwrite it later.
-                const expectedSyncData = anchorList.map(a => {
-                  return createAnchorReplacementObject(
-                      a,
-                      waypoint.getAffiliateUrl(a)
-                  );
-                });
-
-                expect(twoStepsResponse.syncResponse).to.deep.equal(
-                    expectedSyncData
-                );
-              }
-          );
-
-          it('Should set "asyncResponse" field when only unknown domains',
-              () => {
-                const response = resolver.resolveUnknownAnchors(anchorList);
-                const expectedAsyncData = [
-                  createAnchorReplacementObject(
-                      anchorList[0],
-                      waypoint.getAffiliateUrl(anchorList[0])
-                  ),
-                  createAnchorReplacementObject(anchorList[1], null),
-                  createAnchorReplacementObject(
-                      anchorList[2],
-                      waypoint.getAffiliateUrl(anchorList[2])
-                  ),
-                ];
-
-                expect(response.asyncResponse).to.be.an.instanceof(Promise);
-                return response.asyncResponse.then(anchorReplacementTuple => {
-                  expect(anchorReplacementTuple).to.deep.equal(
-                      expectedAsyncData);
-                });
-              }
-          );
+          resolver = new AffiliateLinkResolver(stubXhr, skimOptions, waypoint);
+        });
 
-          it('Should only set the "asyncResponse" field when no new domains',
-              () => {
-                resolver.domains_ = alreadyResolvedDomains;
-                const response = resolver.resolveUnknownAnchors(anchorList);
-                const expectedSyncData = [
-                  createAnchorReplacementObject(
-                      anchorList[0],
-                      waypoint.getAffiliateUrl(anchorList[0])
-                  ),
-                  createAnchorReplacementObject(anchorList[1], null),
-                  createAnchorReplacementObject(
-                      anchorList[2],
-                      waypoint.getAffiliateUrl(anchorList[2])
-                  ),
-                ];
-                expect(response.syncResponse).to.deep.equal(expectedSyncData);
-                expect(response.asyncResponse).to.be.null;
-              }
+        it('Should return an object with sync and async response', () => {
+          const twoStepsResponse = resolver.resolveUnknownAnchors([]);
+          expect(twoStepsResponse).to.have.all.keys(
+            'syncResponse',
+            'asyncResponse'
           );
+        });
 
-          it('Should not replace excluded domains', () => {
-            const excludedAnchor = helpers.createAnchor(
-                'https://www.excluded-merchant.com'
+        it('Should affiliate unknown links until the API gives an answer', () => {
+          const twoStepsResponse = resolver.resolveUnknownAnchors(anchorList);
+          // Replace all the unknown in the synchronous reponse,
+          // asynchronous response will then overwrite it later.
+          const expectedSyncData = anchorList.map(a => {
+            return createAnchorReplacementObject(
+              a,
+              waypoint.getAffiliateUrl(a)
             );
-            const response = resolver.resolveUnknownAnchors([excludedAnchor]);
+          });
 
-            const expectedSyncData = [
-              createAnchorReplacementObject(excludedAnchor, null),
-            ];
+          expect(twoStepsResponse.syncResponse).to.deep.equal(expectedSyncData);
+        });
 
-            expect(response.syncResponse).to.deep.equal(expectedSyncData);
-            expect(response.asyncResponse).to.be.null;
+        it('Should set "asyncResponse" field when only unknown domains', () => {
+          const response = resolver.resolveUnknownAnchors(anchorList);
+          const expectedAsyncData = [
+            createAnchorReplacementObject(
+              anchorList[0],
+              waypoint.getAffiliateUrl(anchorList[0])
+            ),
+            createAnchorReplacementObject(anchorList[1], null),
+            createAnchorReplacementObject(
+              anchorList[2],
+              waypoint.getAffiliateUrl(anchorList[2])
+            ),
+          ];
+
+          expect(response.asyncResponse).to.be.an.instanceof(Promise);
+          return response.asyncResponse.then(anchorReplacementTuple => {
+            expect(anchorReplacementTuple).to.deep.equal(expectedAsyncData);
           });
+        });
+
+        it('Should only set the "asyncResponse" field when no new domains', () => {
+          resolver.domains_ = alreadyResolvedDomains;
+          const response = resolver.resolveUnknownAnchors(anchorList);
+          const expectedSyncData = [
+            createAnchorReplacementObject(
+              anchorList[0],
+              waypoint.getAffiliateUrl(anchorList[0])
+            ),
+            createAnchorReplacementObject(anchorList[1], null),
+            createAnchorReplacementObject(
+              anchorList[2],
+              waypoint.getAffiliateUrl(anchorList[2])
+            ),
+          ];
+          expect(response.syncResponse).to.deep.equal(expectedSyncData);
+          expect(response.asyncResponse).to.be.null;
+        });
 
-          it('Should only return the "pending" anchors in the asyncResponse',
-              () => {
-                const initialAnchor = helpers.createAnchor(
-                    'https://initial-merchant.com'
-                );
-                resolver.domains_ = {
-                  'initial-merchant.com': AFFILIATE_STATUS.AFFILIATE,
-                };
-                // Initial anchor should not be in the asyncResponse list
-                const expectedAsyncData = [
-                  createAnchorReplacementObject(
-                      anchorList[0],
-                      waypoint.getAffiliateUrl(anchorList[0])
-                  ),
-                  createAnchorReplacementObject(anchorList[1], null),
-                  createAnchorReplacementObject(
-                      anchorList[2],
-                      waypoint.getAffiliateUrl(anchorList[2])
-                  ),
-                ];
-
-                const response = resolver.resolveUnknownAnchors(
-                    [initialAnchor].concat(anchorList)
-                );
-
-                expect(response.syncResponse.length).to.equal(4);
-                expect(response.syncResponse).to.deep.include(
-                    createAnchorReplacementObject(
-                        initialAnchor,
-                        waypoint.getAffiliateUrl(initialAnchor)
-                    )
-                );
-                expect(response.asyncResponse).to.be.an.instanceof(Promise);
-                return response.asyncResponse.then(anchorReplacementTuple => {
-                  expect(anchorReplacementTuple).to.deep.equal(
-                      expectedAsyncData);
-                });
-              }
+        it('Should not replace excluded domains', () => {
+          const excludedAnchor = helpers.createAnchor(
+            'https://www.excluded-merchant.com'
           );
+          const response = resolver.resolveUnknownAnchors([excludedAnchor]);
+
+          const expectedSyncData = [
+            createAnchorReplacementObject(excludedAnchor, null),
+          ];
+
+          expect(response.syncResponse).to.deep.equal(expectedSyncData);
+          expect(response.asyncResponse).to.be.null;
         });
 
-        describe('getAnchorDomain_', () => {
-          const resolver = new AffiliateLinkResolver(
-              {},
-              DEFAULT_SKIM_OPTIONS,
-              waypoint
+        it('Should only return the "pending" anchors in the asyncResponse', () => {
+          const initialAnchor = helpers.createAnchor(
+            'https://initial-merchant.com'
+          );
+          resolver.domains_ = {
+            'initial-merchant.com': AFFILIATE_STATUS.AFFILIATE,
+          };
+          // Initial anchor should not be in the asyncResponse list
+          const expectedAsyncData = [
+            createAnchorReplacementObject(
+              anchorList[0],
+              waypoint.getAffiliateUrl(anchorList[0])
+            ),
+            createAnchorReplacementObject(anchorList[1], null),
+            createAnchorReplacementObject(
+              anchorList[2],
+              waypoint.getAffiliateUrl(anchorList[2])
+            ),
+          ];
+
+          const response = resolver.resolveUnknownAnchors(
+            [initialAnchor].concat(anchorList)
           );
 
-          it('Removes  http protocol', () => {
-            const anchor = helpers.createAnchor('http://test.com');
-            expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
+          expect(response.syncResponse.length).to.equal(4);
+          expect(response.syncResponse).to.deep.include(
+            createAnchorReplacementObject(
+              initialAnchor,
+              waypoint.getAffiliateUrl(initialAnchor)
+            )
+          );
+          expect(response.asyncResponse).to.be.an.instanceof(Promise);
+          return response.asyncResponse.then(anchorReplacementTuple => {
+            expect(anchorReplacementTuple).to.deep.equal(expectedAsyncData);
           });
+        });
+      });
 
-          it('removes // protocol', () => {
-            const anchor = helpers.createAnchor('//test.com/');
-            expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
-          });
+      describe('getAnchorDomain_', () => {
+        const resolver = new AffiliateLinkResolver(
+          {},
+          DEFAULT_SKIM_OPTIONS,
+          waypoint
+        );
 
-          it('Removes www.', () => {
-            const anchor = helpers.createAnchor('http://www.test.com');
-            expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
-          });
+        it('Removes  http protocol', () => {
+          const anchor = helpers.createAnchor('http://test.com');
+          expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
+        });
 
-          it('Removes the path and query params', () => {
-            const anchor = helpers.createAnchor(
-                'http://www.test.com/hello-word?test=1'
-            );
-            expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
-          });
+        it('removes // protocol', () => {
+          const anchor = helpers.createAnchor('//test.com/');
+          expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
+        });
+
+        it('Removes www.', () => {
+          const anchor = helpers.createAnchor('http://www.test.com');
+          expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
+        });
+
+        it('Removes the path and query params', () => {
+          const anchor = helpers.createAnchor(
+            'http://www.test.com/hello-word?test=1'
+          );
+          expect(resolver.getAnchorDomain_(anchor)).to.equal('test.com');
         });
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js b/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js
index 1cf53b64fc80..550409e3edb3 100644
--- a/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js
+++ b/extensions/amp-skimlinks/0.1/test/test-amp-skimlinks.js
@@ -24,387 +24,369 @@ import {EVENTS as linkRewriterEvents} from '../link-rewriter/constants';
 import helpersFactory from './helpers';
 
 describes.fakeWin(
-    'amp-skimlinks',
-    {
-      amp: {
-        extensions: ['amp-skimlinks'],
-      },
+  'amp-skimlinks',
+  {
+    amp: {
+      extensions: ['amp-skimlinks'],
     },
-    env => {
-      let ampSkimlinks, helpers;
+  },
+  env => {
+    let ampSkimlinks, helpers;
+
+    beforeEach(() => {
+      helpers = helpersFactory(env);
+      ampSkimlinks = helpers.createAmpSkimlinks({
+        'publisher-code': 'pubIdXdomainId',
+      });
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('skimOptions', () => {
+      it('Should raise an error if publisher-code is missing', () => {
+        ampSkimlinks = helpers.createAmpSkimlinks();
+        // Use allowConsoleError to avoid other test failling because this
+        // one throws an error.
+        allowConsoleError(() =>
+          expect(() => {
+            ampSkimlinks.buildCallback();
+          }).to.throw()
+        );
+      });
 
-      beforeEach(() => {
-        helpers = helpersFactory(env);
+      it('Should not raise any error when specifying publisher-code', () => {
         ampSkimlinks = helpers.createAmpSkimlinks({
           'publisher-code': 'pubIdXdomainId',
         });
+        env.sandbox
+          .stub(DocumentReady, 'whenDocumentReady')
+          .returns(Promise.reject());
+        expect(() => {
+          ampSkimlinks.buildCallback();
+        }).to.not.throw();
+      });
+    });
+
+    describe('When loading the amp-skimlinks extension', () => {
+      it('Should start skimcore on buildCallback', () => {
+        env.sandbox
+          .stub(DocumentReady, 'whenDocumentReady')
+          .returns(Promise.resolve());
+        env.sandbox.stub(ampSkimlinks, 'startSkimcore_');
+        return ampSkimlinks.buildCallback().then(() => {
+          expect(ampSkimlinks.startSkimcore_.calledOnce).to.be.true;
+        });
       });
 
-      afterEach(() => {
-        env.sandbox.restore();
+      it('Should parse options', () => {
+        env.sandbox
+          .stub(DocumentReady, 'whenDocumentReady')
+          .returns(Promise.resolve());
+        env.sandbox.spy(SkimOptionsModule, 'getAmpSkimlinksOptions');
+        const options = {
+          'publisher-code': '666X666',
+          'excluded-domains': 'amazon.com  amazon.fr ',
+          tracking: false,
+          'custom-tracking-id': 'campaignX',
+          'link-selector': '.content a',
+        };
+        ampSkimlinks = helpers.createAmpSkimlinks(options);
+        env.sandbox.stub(ampSkimlinks, 'startSkimcore_');
+
+        return ampSkimlinks.buildCallback().then(() => {
+          expect(SkimOptionsModule.getAmpSkimlinksOptions.calledOnce).to.be
+            .true;
+          expect(ampSkimlinks.skimOptions_).to.deep.include({
+            pubcode: options['publisher-code'],
+            tracking: options['tracking'],
+            customTrackingId: options['custom-tracking-id'],
+            linkSelector: options['link-selector'],
+          });
+          expect(ampSkimlinks.skimOptions_.excludedDomains).to.include.members([
+            'amazon.com',
+            'amazon.fr',
+          ]);
+        });
       });
 
-      describe('skimOptions', () => {
-        it('Should raise an error if publisher-code is missing', () => {
-          ampSkimlinks = helpers.createAmpSkimlinks();
-          // Use allowConsoleError to avoid other test failling because this
-          // one throws an error.
-          allowConsoleError(() =>
-            expect(() => {
-              ampSkimlinks.buildCallback();
-            }).to.throw()
+      describe('initSkimlinksLinkRewriter_', () => {
+        let linkRewriter;
+
+        beforeEach(() => {
+          ampSkimlinks.skimOptions_ = {
+            linkSelector: '.article a',
+          };
+          ampSkimlinks.linkRewriterService_ = new LinkRewriterManager(
+            env.ampdoc
+          );
+          env.sandbox.spy(
+            ampSkimlinks.linkRewriterService_,
+            'registerLinkRewriter'
           );
+          ampSkimlinks.trackingService_ = {
+            sendNaClickTracking: env.sandbox.stub(),
+          };
+          env.sandbox.stub(ampSkimlinks, 'onClick_');
+          env.sandbox.stub(ampSkimlinks, 'onPageScanned_');
+          // Chunk executes the provided task when the browser is Idle. We can
+          // execute the task straight away for the purpose of the test.
+          env.sandbox.stub(chunkModule, 'chunk').callsFake((node, task) => {
+            task();
+          });
+          linkRewriter = ampSkimlinks.initSkimlinksLinkRewriter_();
         });
 
-        it('Should not raise any error when specifying publisher-code', () => {
-          ampSkimlinks = helpers.createAmpSkimlinks({
-            'publisher-code': 'pubIdXdomainId',
-          });
-          env.sandbox
-              .stub(DocumentReady, 'whenDocumentReady')
-              .returns(Promise.reject());
-          expect(() => {
-            ampSkimlinks.buildCallback();
-          }).to.not.throw();
+        it('Should register Skimlinks link rewriter', () => {
+          expect(ampSkimlinks.linkRewriterService_.registerLinkRewriter).to.be
+            .calledOnce;
+          const args =
+            ampSkimlinks.linkRewriterService_.registerLinkRewriter.args[0];
+
+          expect(args[0]).to.equal(SKIMLINKS_REWRITER_ID);
+          expect(args[1]).to.be.a('function');
+          expect(args[2].linkSelector).to.equal(
+            ampSkimlinks.skimOptions_.linkSelector
+          );
         });
-      });
 
-      describe('When loading the amp-skimlinks extension', () => {
-        it('Should start skimcore on buildCallback', () => {
-          env.sandbox
-              .stub(DocumentReady, 'whenDocumentReady')
-              .returns(Promise.resolve());
-          env.sandbox.stub(ampSkimlinks, 'startSkimcore_');
-          return ampSkimlinks.buildCallback().then(() => {
-            expect(ampSkimlinks.startSkimcore_.calledOnce).to.be.true;
-          });
+        it('Should setup click callback', () => {
+          const eventData = {};
+          // Send fake click.
+          const event = {
+            type: linkRewriterEvents.CLICK,
+            eventData,
+          };
+          linkRewriter.events.fire(event);
+
+          expect(ampSkimlinks.onClick_.withArgs(eventData).calledOnce).to.be
+            .true;
         });
 
-        it('Should parse options', () => {
-          env.sandbox
-              .stub(DocumentReady, 'whenDocumentReady')
-              .returns(Promise.resolve());
-          env.sandbox.spy(SkimOptionsModule, 'getAmpSkimlinksOptions');
-          const options = {
-            'publisher-code': '666X666',
-            'excluded-domains': 'amazon.com  amazon.fr ',
-            tracking: false,
-            'custom-tracking-id': 'campaignX',
-            'link-selector': '.content a',
+        it("Should call 'onPageScanned_' callback just once", () => {
+          const eventData = {};
+          const event = {
+            type: linkRewriterEvents.PAGE_SCANNED,
+            eventData,
           };
-          ampSkimlinks = helpers.createAmpSkimlinks(options);
-          env.sandbox.stub(ampSkimlinks, 'startSkimcore_');
-
-          return ampSkimlinks.buildCallback().then(() => {
-            expect(SkimOptionsModule.getAmpSkimlinksOptions.calledOnce).to.be
-                .true;
-            expect(ampSkimlinks.skimOptions_).to.deep.include({
-              pubcode: options['publisher-code'],
-              tracking: options['tracking'],
-              customTrackingId: options['custom-tracking-id'],
-              linkSelector: options['link-selector'],
-            });
-            expect(ampSkimlinks.skimOptions_.excludedDomains).to.include
-                .members(['amazon.com', 'amazon.fr']);
-          });
+          linkRewriter.events.fire(event);
+          linkRewriter.events.fire(event);
+          expect(ampSkimlinks.onPageScanned_.calledOnce).to.be.true;
         });
+      });
+    });
 
-        describe('initSkimlinksLinkRewriter_', () => {
-          let linkRewriter;
-
-          beforeEach(() => {
-            ampSkimlinks.skimOptions_ = {
-              linkSelector: '.article a',
-            };
-            ampSkimlinks.linkRewriterService_ = new LinkRewriterManager(
-                env.ampdoc
-            );
-            env.sandbox.spy(
-                ampSkimlinks.linkRewriterService_,
-                'registerLinkRewriter'
-            );
-            ampSkimlinks.trackingService_ = {
-              sendNaClickTracking: env.sandbox.stub(),
-            };
-            env.sandbox.stub(ampSkimlinks, 'onClick_');
-            env.sandbox.stub(ampSkimlinks, 'onPageScanned_');
-            // Chunk executes the provided task when the browser is Idle. We can
-            // execute the task straight away for the purpose of the test.
-            env.sandbox.stub(chunkModule, 'chunk').callsFake((node, task) => {
-              task();
-            });
-            linkRewriter = ampSkimlinks.initSkimlinksLinkRewriter_();
-          });
+    describe('Na click tracking on click callback', () => {
+      let stub;
 
-          it('Should register Skimlinks link rewriter', () => {
-            expect(
-                ampSkimlinks.linkRewriterService_.registerLinkRewriter
-            ).to.be.calledOnce;
-            const args =
-            ampSkimlinks.linkRewriterService_.registerLinkRewriter.args[0];
+      beforeEach(() => {
+        ampSkimlinks.trackingService_ = {
+          sendNaClickTracking: env.sandbox.stub(),
+        };
+        stub = ampSkimlinks.trackingService_.sendNaClickTracking;
+      });
 
-            expect(args[0]).to.equal(SKIMLINKS_REWRITER_ID);
-            expect(args[1]).to.be.a('function');
-            expect(args[2].linkSelector).to.equal(
-                ampSkimlinks.skimOptions_.linkSelector
-            );
-          });
+      it(`Should send NA click if an other
+            linkRewriter has replaced the link`, () => {
+        ampSkimlinks.onClick_({
+          linkRewriterId: 'vendorX',
+        });
 
-          it('Should setup click callback', () => {
-            const eventData = {};
-            // Send fake click.
-            const event = {
-              type: linkRewriterEvents.CLICK,
-              eventData,
-            };
-            linkRewriter.events.fire(event);
-
-            expect(ampSkimlinks.onClick_.withArgs(eventData).calledOnce)
-                .to.be.true;
-          });
+        expect(stub.calledOnce).to.be.true;
+      });
 
-          it("Should call 'onPageScanned_' callback just once", () => {
-            const eventData = {};
-            const event = {
-              type: linkRewriterEvents.PAGE_SCANNED,
-              eventData,
-            };
-            linkRewriter.events.fire(event);
-            linkRewriter.events.fire(event);
-            expect(ampSkimlinks.onPageScanned_.calledOnce).to.be.true;
-          });
+      it('Should send NA click if other vendor has replaced the link', () => {
+        ampSkimlinks.onClick_({
+          linkRewriterId: 'vendorX',
         });
+
+        expect(stub.calledOnce).to.be.true;
       });
 
-      describe('Na click tracking on click callback', () => {
-        let stub;
+      it('Should send NA click if skimlinks has not replaced the link', () => {
+        ampSkimlinks.onClick_({
+          linkRewriterId: 'vendorX',
+        });
 
-        beforeEach(() => {
-          ampSkimlinks.trackingService_ = {
-            sendNaClickTracking: env.sandbox.stub(),
-          };
-          stub = ampSkimlinks.trackingService_.sendNaClickTracking;
+        expect(stub.calledOnce).to.be.true;
+      });
+
+      it('Should send NA click if no one has replaced the link', () => {
+        ampSkimlinks.onClick_({
+          linkRewriterId: null,
         });
 
-        it(`Should send NA click if an other
-            linkRewriter has replaced the link`, () => {
-          ampSkimlinks.onClick_({
-            linkRewriterId: 'vendorX',
-          });
+        expect(stub.calledOnce).to.be.true;
+      });
 
-          expect(stub.calledOnce).to.be.true;
+      it('Should not send NA click if skimlinks has replaced the link', () => {
+        ampSkimlinks.onClick_({
+          linkRewriterId: SKIMLINKS_REWRITER_ID,
         });
 
-        it('Should send NA click if other vendor ' +
-        'has replaced the link', () => {
+        expect(stub.called).to.be.false;
+      });
+
+      describe('Based on clickType', () => {
+        it('Should send the NA click if clickType is "click"', () => {
           ampSkimlinks.onClick_({
-            linkRewriterId: 'vendorX',
+            linkRewriterId: null,
+            clickType: 'click',
           });
 
           expect(stub.calledOnce).to.be.true;
         });
 
-        it('Should send NA click if skimlinks has not replaced the link',
-            () => {
-              ampSkimlinks.onClick_({
-                linkRewriterId: 'vendorX',
-              });
+        it('Should not send the NA click if clickType is "contextmenu"', () => {
+          ampSkimlinks.onClick_({
+            linkRewriterId: null,
+            clickType: 'contextmenu',
+          });
 
-              expect(stub.calledOnce).to.be.true;
-            }
-        );
+          expect(stub.called).to.be.false;
+        });
 
-        it('Should send NA click if no one has replaced the link', () => {
+        it('Should send the NA click if clickType is something else', () => {
           ampSkimlinks.onClick_({
             linkRewriterId: null,
+            clickType: 'mouseup',
           });
 
           expect(stub.calledOnce).to.be.true;
         });
+      });
+    });
 
-        it('Should not send NA click if skimlinks has replaced the link',
-            () => {
-              ampSkimlinks.onClick_({
-                linkRewriterId: SKIMLINKS_REWRITER_ID,
-              });
+    describe('On page scan callback', () => {
+      const guid = 'my-guid';
+      const beaconResponse = Promise.resolve({guid});
+      beforeEach(() => {
+        ampSkimlinks.affiliateLinkResolver_ = {
+          fetchDomainResolverApi: env.sandbox.stub().returns(beaconResponse),
+        };
+        ampSkimlinks.trackingService_ = {
+          setTrackingInfo: env.sandbox.stub(),
+          sendImpressionTracking: env.sandbox.stub(),
+        };
+        ampSkimlinks.skimlinksLinkRewriter_ = {
+          getAnchorReplacementList: env.sandbox.stub(),
+        };
+        ampSkimlinks.ampDoc_ = ampSkimlinks.getAmpDoc();
+      });
 
-              expect(stub.called).to.be.false;
-            }
-        );
+      describe('When beacon call has not been made yet', () => {
+        beforeEach(() => {
+          ampSkimlinks.affiliateLinkResolver_.firstRequest = null;
+        });
 
-        describe('Based on clickType', () => {
-          it('Should send the NA click if clickType is "click"', () => {
-            ampSkimlinks.onClick_({
-              linkRewriterId: null,
-              clickType: 'click',
-            });
+        it('Should make the fallback call', () => {
+          ampSkimlinks.sendImpressionTracking_ = env.sandbox
+            .stub()
+            .returns(Promise.resolve());
 
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub =
+              ampSkimlinks.affiliateLinkResolver_.fetchDomainResolverApi;
             expect(stub.calledOnce).to.be.true;
           });
+        });
 
-          it('Should not send the NA click if clickType is "contextmenu"',
-              () => {
-                ampSkimlinks.onClick_({
-                  linkRewriterId: null,
-                  clickType: 'contextmenu',
-                });
-
-                expect(stub.called).to.be.false;
-              }
-          );
-
-          it('Should send the NA click if clickType is something else', () => {
-            ampSkimlinks.onClick_({
-              linkRewriterId: null,
-              clickType: 'mouseup',
-            });
-
+        it('Should send the impression tracking if visible', () => {
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
             expect(stub.calledOnce).to.be.true;
           });
         });
-      });
 
-      describe('On page scan callback', () => {
-        const guid = 'my-guid';
-        const beaconResponse = Promise.resolve({guid});
-        beforeEach(() => {
-          ampSkimlinks.affiliateLinkResolver_ = {
-            fetchDomainResolverApi: env.sandbox.stub().returns(beaconResponse),
-          };
-          ampSkimlinks.trackingService_ = {
-            setTrackingInfo: env.sandbox.stub(),
-            sendImpressionTracking: env.sandbox.stub(),
-          };
-          ampSkimlinks.skimlinksLinkRewriter_ = {
-            getAnchorReplacementList: env.sandbox.stub(),
+        it('Should wait until visible to send the impression tracking', () => {
+          const isVisibleDefer = new Deferred();
+          const fakeViewer = {
+            whenFirstVisible: env.sandbox
+              .stub()
+              .returns(isVisibleDefer.promise),
           };
-          ampSkimlinks.ampDoc_ = ampSkimlinks.getAmpDoc();
-        });
+          helpers.mockServiceGetter('viewerForDoc', fakeViewer);
 
-        describe('When beacon call has not been made yet', () => {
-          beforeEach(() => {
-            ampSkimlinks.affiliateLinkResolver_.firstRequest = null;
-          });
-
-          it('Should make the fallback call', () => {
-            ampSkimlinks.sendImpressionTracking_ = env.sandbox
-                .stub()
-                .returns(Promise.resolve());
-
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const stub =
-              ampSkimlinks.affiliateLinkResolver_.fetchDomainResolverApi;
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
+            expect(stub.called).to.be.false;
+            isVisibleDefer.resolve();
+            return isVisibleDefer.promise.then(() => {
               expect(stub.calledOnce).to.be.true;
             });
           });
+        });
 
-          it('Should send the impression tracking if visible', () => {
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
-              expect(stub.calledOnce).to.be.true;
-            });
+        it('Should update tracking info with the guid', () => {
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const {
+              setTrackingInfo: setTrackingInfoStub,
+              sendImpressionTracking: sendImpressionTrackingStub,
+            } = ampSkimlinks.trackingService_;
+            expect(setTrackingInfoStub.withArgs({guid}).calledOnce).to.be.true;
+            expect(setTrackingInfoStub.calledBefore(sendImpressionTrackingStub))
+              .to.be.true;
           });
+        });
+      });
 
-
-          it('Should wait until visible to send the impression tracking',
-              () => {
-                const isVisibleDefer = new Deferred();
-                const fakeViewer = {
-                  whenFirstVisible: env.sandbox.stub().returns(
-                      isVisibleDefer.promise
-                  ),
-                };
-                helpers.mockServiceGetter('viewerForDoc', fakeViewer);
-
-                return ampSkimlinks.onPageScanned_().then(() => {
-                  const stub = ampSkimlinks.trackingService_
-                      .sendImpressionTracking;
-                  expect(stub.called).to.be.false;
-                  isVisibleDefer.resolve();
-                  return isVisibleDefer.promise.then(() => {
-                    expect(stub.calledOnce).to.be.true;
-                  });
-                });
-              }
+      describe('When beacon call has already been made', () => {
+        beforeEach(() => {
+          ampSkimlinks.affiliateLinkResolver_.firstRequest = Promise.resolve(
+            beaconResponse
           );
+        });
 
-          it('Should update tracking info with the guid', () => {
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const {
-                setTrackingInfo: setTrackingInfoStub,
-                sendImpressionTracking: sendImpressionTrackingStub,
-              } = ampSkimlinks.trackingService_;
-              expect(
-                  setTrackingInfoStub.withArgs({guid}).calledOnce
-              ).to.be.true;
-              expect(
-                  setTrackingInfoStub.calledBefore(sendImpressionTrackingStub)
-              ).to.be.true;
-            });
+        it('Should not make the fallback call', () => {
+          ampSkimlinks.sendImpressionTracking_ = env.sandbox
+            .stub()
+            .returns(Promise.resolve());
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub =
+              ampSkimlinks.affiliateLinkResolver_.fetchDomainResolverApi;
+            expect(stub.called).to.be.false;
           });
         });
 
-        describe('When beacon call has already been made', () => {
-          beforeEach(() => {
-            ampSkimlinks.affiliateLinkResolver_.firstRequest = Promise.resolve(
-                beaconResponse
-            );
+        it('Should send the impression tracking if visible', () => {
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
+            expect(stub.calledOnce).to.be.true;
           });
+        });
 
-          it('Should not make the fallback call', () => {
-            ampSkimlinks.sendImpressionTracking_ = env.sandbox
-                .stub()
-                .returns(Promise.resolve());
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const stub =
-              ampSkimlinks.affiliateLinkResolver_.fetchDomainResolverApi;
-              expect(stub.called).to.be.false;
-            });
-          });
+        it('Should wait until visible to send the impression tracking', () => {
+          const isVisibleDefer = new Deferred();
+          const fakeViewer = {
+            whenFirstVisible: env.sandbox
+              .stub()
+              .returns(isVisibleDefer.promise),
+          };
+          helpers.mockServiceGetter('viewerForDoc', fakeViewer);
 
-          it('Should send the impression tracking if visible', () => {
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const stub = ampSkimlinks.trackingService_.sendImpressionTracking;
+            expect(stub.called).to.be.false;
+            isVisibleDefer.resolve();
+            return isVisibleDefer.promise.then(() => {
               expect(stub.calledOnce).to.be.true;
             });
           });
+        });
 
-          it('Should wait until visible to send the impression tracking',
-              () => {
-                const isVisibleDefer = new Deferred();
-                const fakeViewer = {
-                  whenFirstVisible: env.sandbox.stub().returns(
-                      isVisibleDefer.promise
-                  ),
-                };
-                helpers.mockServiceGetter('viewerForDoc', fakeViewer);
-
-                return ampSkimlinks.onPageScanned_().then(() => {
-                  const stub = ampSkimlinks.trackingService_
-                      .sendImpressionTracking;
-                  expect(stub.called).to.be.false;
-                  isVisibleDefer.resolve();
-                  return isVisibleDefer.promise.then(() => {
-                    expect(stub.calledOnce).to.be.true;
-                  });
-                });
-              }
-          );
-
-          it('Should update tracking info with the guid', () => {
-            return ampSkimlinks.onPageScanned_().then(() => {
-              const {
-                setTrackingInfo: setTrackingInfoStub,
-                sendImpressionTracking: sendImpressionTrackingStub,
-              } = ampSkimlinks.trackingService_;
-              expect(setTrackingInfoStub.withArgs({guid}).calledOnce).to.be
-                  .true;
-              expect(
-                  setTrackingInfoStub.calledBefore(sendImpressionTrackingStub)
-              ).to.be.true;
-            });
+        it('Should update tracking info with the guid', () => {
+          return ampSkimlinks.onPageScanned_().then(() => {
+            const {
+              setTrackingInfo: setTrackingInfoStub,
+              sendImpressionTracking: sendImpressionTrackingStub,
+            } = ampSkimlinks.trackingService_;
+            expect(setTrackingInfoStub.withArgs({guid}).calledOnce).to.be.true;
+            expect(setTrackingInfoStub.calledBefore(sendImpressionTrackingStub))
+              .to.be.true;
           });
         });
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
index b8e00bffd135..9e63ddd1f31c 100644
--- a/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
+++ b/extensions/amp-skimlinks/0.1/test/test-link-rewriter.js
@@ -28,7 +28,6 @@ import {Services} from '../../../../src/services';
 import {TwoStepsResponse} from '../link-rewriter/two-steps-response';
 import {createCustomEvent} from '../../../../src/event-helper';
 
-
 const CLICK_EVENT = {
   type: 'click',
 };
@@ -53,9 +52,9 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
     // Helper functions
     registerLinkRewriterHelper = vendorName => {
       const linkRewriter = linkRewriterManager.registerLinkRewriter(
-          vendorName,
-          env.sandbox.stub(),
-          {}
+        vendorName,
+        env.sandbox.stub(),
+        {}
       );
       env.sandbox.stub(linkRewriter, 'onDomUpdated');
 
@@ -187,12 +186,12 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
     it('Should call .onDomUpdate() after registering linkRewriter', () => {
       env.sandbox
-          .stub(LinkRewriter.prototype, 'onDomUpdated')
-          .returns(Promise.resolve());
+        .stub(LinkRewriter.prototype, 'onDomUpdated')
+        .returns(Promise.resolve());
       const linkRewriter = linkRewriterManager.registerLinkRewriter(
-          'vendor',
-          env.sandbox.stub(),
-          {}
+        'vendor',
+        env.sandbox.stub(),
+        {}
       );
       expect(linkRewriter.onDomUpdated.calledOnce).to.be.true;
     });
@@ -239,8 +238,8 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
       it('Should only send click event to suitable link rewriters', () => {
         linkRewriterManager.maybeRewriteLink(
-            rootDocument.createElement('a'),
-            CLICK_EVENT
+          rootDocument.createElement('a'),
+          CLICK_EVENT
         );
 
         expect(linkRewriterVendor1.events.fire.calledOnce).to.be.true;
@@ -254,18 +253,18 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
         env.sandbox.stub(linkRewriterVendor3, 'rewriteAnchorUrl').returns(true);
 
         linkRewriterManager.maybeRewriteLink(
-            rootDocument.createElement('a'),
-            CLICK_EVENT
+          rootDocument.createElement('a'),
+          CLICK_EVENT
         );
 
         expect(getEventData(linkRewriterVendor1).linkRewriterId).to.equal(
-            'vendor1'
+          'vendor1'
         );
         expect(getEventData(linkRewriterVendor2).linkRewriterId).to.equal(
-            'vendor1'
+          'vendor1'
         );
         expect(getEventData(linkRewriterVendor3).linkRewriterId).to.equal(
-            'vendor1'
+          'vendor1'
         );
       });
 
@@ -280,16 +279,16 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
       it('Should set linkRewriterId to null when no replacement', () => {
         env.sandbox
-            .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
-            .returns(false);
+          .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
+          .returns(false);
         env.sandbox.stub(linkRewriterVendor2, 'rewriteAnchorUrl').returns(true);
         env.sandbox
-            .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
-            .returns(false);
+          .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
+          .returns(false);
 
         linkRewriterManager.maybeRewriteLink(
-            rootDocument.createElement('a'),
-            CLICK_EVENT
+          rootDocument.createElement('a'),
+          CLICK_EVENT
         );
 
         expect(getEventData(linkRewriterVendor1).linkRewriterId).to.be.null;
@@ -301,17 +300,17 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
       it('Should set the clickType', () => {
         const contextMenuEvent = {type: 'contextmenu'};
         linkRewriterManager.maybeRewriteLink(
-            rootDocument.createElement('a'),
-            contextMenuEvent
+          rootDocument.createElement('a'),
+          contextMenuEvent
         );
         expect(getEventData(linkRewriterVendor1).clickType).to.equal(
-            'contextmenu'
+          'contextmenu'
         );
         expect(getEventData(linkRewriterVendor2).clickType).to.equal(
-            'contextmenu'
+          'contextmenu'
         );
         expect(getEventData(linkRewriterVendor3).clickType).to.equal(
-            'contextmenu'
+          'contextmenu'
         );
       });
     });
@@ -328,8 +327,8 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
           env.sandbox.stub(linkRewriterVendor1, 'isWatchingLink').returns(true);
           env.sandbox.stub(linkRewriterVendor1.events, 'fire');
           env.sandbox
-              .stub(linkRewriterVendor2, 'isWatchingLink')
-              .returns(false);
+            .stub(linkRewriterVendor2, 'isWatchingLink')
+            .returns(false);
           env.sandbox.stub(linkRewriterVendor2.events, 'fire');
           env.sandbox.stub(linkRewriterVendor3, 'isWatchingLink').returns(true);
           env.sandbox.stub(linkRewriterVendor3.events, 'fire');
@@ -337,15 +336,15 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
         it('Should ignore not suitable link rewriter', () => {
           env.sandbox
-              .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
+            .returns(true);
           env.sandbox
-              .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
-              .returns(false);
+            .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
+            .returns(false);
 
           linkRewriterManager.maybeRewriteLink(
-              rootDocument.createElement('a'),
-              CLICK_EVENT
+            rootDocument.createElement('a'),
+            CLICK_EVENT
           );
 
           expect(linkRewriterVendor1.rewriteAnchorUrl.calledOnce).to.be.true;
@@ -354,18 +353,18 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
         it('Should try the next one if no replacement', () => {
           env.sandbox
-              .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
-              .returns(false);
+            .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
+            .returns(false);
           env.sandbox
-              .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
-              .returns(false);
+            .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
+            .returns(false);
           env.sandbox
-              .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
+            .returns(true);
 
           linkRewriterManager.maybeRewriteLink(
-              rootDocument.createElement('a'),
-              CLICK_EVENT
+            rootDocument.createElement('a'),
+            CLICK_EVENT
           );
 
           expect(linkRewriterVendor1.rewriteAnchorUrl.calledOnce).to.be.true;
@@ -389,18 +388,18 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
         it('Should respect page level priorities', () => {
           env.sandbox
-              .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
+            .returns(true);
           env.sandbox
-              .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
+            .returns(true);
           env.sandbox
-              .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
+            .returns(true);
 
           linkRewriterManager.maybeRewriteLink(
-              rootDocument.createElement('a'),
-              CLICK_EVENT
+            rootDocument.createElement('a'),
+            CLICK_EVENT
           );
 
           expect(linkRewriterVendor1.rewriteAnchorUrl.called).to.be.false;
@@ -410,14 +409,14 @@ describes.fakeWin('LinkRewriterManager', {amp: true}, env => {
 
         it('Should respect anchor level priorities', () => {
           env.sandbox
-              .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
-              .returns(false);
+            .stub(linkRewriterVendor1, 'rewriteAnchorUrl')
+            .returns(false);
           env.sandbox
-              .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor2, 'rewriteAnchorUrl')
+            .returns(true);
           env.sandbox
-              .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
-              .returns(true);
+            .stub(linkRewriterVendor3, 'rewriteAnchorUrl')
+            .returns(true);
 
           const anchor = rootDocument.createElement('a');
           // Overwrite global priority
@@ -456,13 +455,13 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
       options = options || {};
       // Prevent scanning the page in the constructor
       env.sandbox
-          .stub(LinkRewriter.prototype, 'scanLinksOnPage_')
-          .returns(Promise.resolve());
+        .stub(LinkRewriter.prototype, 'scanLinksOnPage_')
+        .returns(Promise.resolve());
       const linkRewriter = new LinkRewriter(
-          rootDocument,
-          'test',
-          resolveFunction,
-          options
+        rootDocument,
+        'test',
+        resolveFunction,
+        options
       );
       linkRewriter.scanLinksOnPage_.restore();
       return linkRewriter;
@@ -480,8 +479,8 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
         expect(() => {
           createLinkRewriterHelper(resolveFunction).scanLinksOnPage_();
         }).to.throw(
-            'Invalid response from provided "resolveUnknownLinks" function.' +
-          '"resolveUnknownLinks" should return an instance of TwoStepsResponse'
+          'Invalid response from provided "resolveUnknownLinks" function.' +
+            '"resolveUnknownLinks" should return an instance of TwoStepsResponse'
         )
       );
     });
@@ -597,8 +596,8 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
       it('Should scan the when onDomUpdated() is called', () => {
         const linkRewriter = createLinkRewriterHelper();
         env.sandbox
-            .stub(linkRewriter, 'scanLinksOnPage_')
-            .returns(Promise.resolve());
+          .stub(linkRewriter, 'scanLinksOnPage_')
+          .returns(Promise.resolve());
         linkRewriter.onDomUpdated();
         expect(linkRewriter.scanLinksOnPage_.calledOnce).to.be.true;
       });
@@ -644,7 +643,7 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
         return linkRewriter.onDomUpdated().then(() => {
           expect(linkRewriter.resolveUnknownLinks_.calledOnce).to.be.true;
           expect(
-              linkRewriter.resolveUnknownLinks_.withArgs([anchor2]).calledOnce
+            linkRewriter.resolveUnknownLinks_.withArgs([anchor2]).calledOnce
           ).to.be.true;
         });
       });
@@ -658,8 +657,7 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
         };
 
         return linkRewriter.onDomUpdated().then(() => {
-          expect(stub.withArgs(args).calledOnce).to
-              .be.true;
+          expect(stub.withArgs(args).calledOnce).to.be.true;
         });
       });
     });
@@ -701,7 +699,7 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
         ]);
 
         expect(linkRewriter.getReplacementUrl(anchor1)).to.be.equal(
-            replacementUrl
+          replacementUrl
         );
       });
     });
@@ -722,13 +720,11 @@ describes.fakeWin('Link Rewriter', {amp: true}, env => {
       expect(anchor1.href).to.equal(initialUrl);
     });
 
-    it('Should return false if anchor exist but does not have replacement url',
-        () => {
-          linkRewriter.anchorReplacementCache_.updateLinkList([anchor1]);
-          expect(linkRewriter.rewriteAnchorUrl(anchor1)).to.be.false;
-          expect(anchor1.href).to.equal(initialUrl);
-        }
-    );
+    it('Should return false if anchor exist but does not have replacement url', () => {
+      linkRewriter.anchorReplacementCache_.updateLinkList([anchor1]);
+      expect(linkRewriter.rewriteAnchorUrl(anchor1)).to.be.false;
+      expect(anchor1.href).to.equal(initialUrl);
+    });
 
     it('Should return false if href is the same as replacement url', () => {
       linkRewriter.anchorReplacementCache_.updateLinkList([anchor1]);
diff --git a/extensions/amp-skimlinks/0.1/test/test-skim-options.js b/extensions/amp-skimlinks/0.1/test/test-skim-options.js
index 9b7f0f114e68..b97358cfa09b 100644
--- a/extensions/amp-skimlinks/0.1/test/test-skim-options.js
+++ b/extensions/amp-skimlinks/0.1/test/test-skim-options.js
@@ -19,124 +19,127 @@ import {getAmpSkimlinksOptions} from '../skim-options';
 import helpersFactory from './helpers';
 
 describes.fakeWin(
-    'Skim Options',
-    {
-      amp: {
-        extensions: ['amp-skimlinks'],
-      },
+  'Skim Options',
+  {
+    amp: {
+      extensions: ['amp-skimlinks'],
     },
-    env => {
-      let helpers;
-      let docInfo;
-      beforeEach(() => {
-        helpers = helpersFactory(env);
-      });
-
-      beforeEach(() => {
-        docInfo = {
-          canonicalUrl: 'https://mydomain.com/test',
-          sourceUrl: 'https://www.google.co.uk',
-        };
-      });
+  },
+  env => {
+    let helpers;
+    let docInfo;
+    beforeEach(() => {
+      helpers = helpersFactory(env);
+    });
+
+    beforeEach(() => {
+      docInfo = {
+        canonicalUrl: 'https://mydomain.com/test',
+        sourceUrl: 'https://www.google.co.uk',
+      };
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('excluded-domains', () => {
+      it('Should exclude domains specified in the option', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'excluded-domains': ' www.merchant1.com   merchant2.com  ',
+        });
+        const options = getAmpSkimlinksOptions(element, docInfo);
 
-      afterEach(() => {
-        env.sandbox.restore();
+        expect(options.excludedDomains).to.include.members([
+          'merchant1.com',
+          'merchant2.com',
+        ]);
       });
 
-      describe('excluded-domains', () => {
-        it('Should exclude domains specified in the option', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-            'excluded-domains': ' www.merchant1.com   merchant2.com  ',
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-
-          expect(options.excludedDomains).to.include
-              .members(['merchant1.com', 'merchant2.com']);
+      it('Should exclude internal domains', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
 
-        it('Should exclude internal domains', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.excludedDomains).to.include.members([
+          'mydomain.com',
+          'google.co.uk',
+        ]);
+      });
 
-          expect(options.excludedDomains).to.include.members(
-              ['mydomain.com', 'google.co.uk']
-          );
+      it('Should exclude global domain blacklist', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.excludedDomains).to.include.members([
+          'go.redirectingat.com',
+          'go.skimresources.com',
+        ]);
+      });
 
-        it('Should exclude global domain blacklist', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.excludedDomains).to.include
-              .members(['go.redirectingat.com', 'go.skimresources.com']);
+      it('Should not overwrite internal & global blacklist when using option', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'excluded-domains': 'www.merchant1.com',
         });
-
-        it('Should not overwrite internal & global blacklist when using option',
-            () => {
-              const element = helpers.createAmpSkimlinksElement({
-                'publisher-code': '123X123',
-                'excluded-domains': 'www.merchant1.com',
-              });
-              const options = getAmpSkimlinksOptions(element, docInfo);
-              expect(options.excludedDomains).to.include.members([
-                'merchant1.com', // from skim-option
-                'mydomain.com', // from internal domains
-                'go.redirectingat.com', // from global blacklist
-              ]);
-            }
-        );
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.excludedDomains).to.include.members([
+          'merchant1.com', // from skim-option
+          'mydomain.com', // from internal domains
+          'go.redirectingat.com', // from global blacklist
+        ]);
       });
+    });
 
-      describe('custom-redirect-domain', () => {
-        const cname = 'go.publisher.com';
+    describe('custom-redirect-domain', () => {
+      const cname = 'go.publisher.com';
 
-        it('Should return normal waypoint base url if not defined', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.waypointBaseUrl).to.equal(WAYPOINT_BASE_URL);
+      it('Should return normal waypoint base url if not defined', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.waypointBaseUrl).to.equal(WAYPOINT_BASE_URL);
+      });
 
-        it('Should overwrite waypoint base url if defined', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-            'custom-redirect-domain': cname,
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      it('Should overwrite waypoint base url if defined', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'custom-redirect-domain': cname,
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      });
 
-        it('Should accept redirect domain containing the protocol', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-            'custom-redirect-domain': `http://${cname}`,
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      it('Should accept redirect domain containing the protocol', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'custom-redirect-domain': `http://${cname}`,
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      });
 
-        it('Should force custom redirect base url to use http', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-            'custom-redirect-domain': `https://${cname}`,
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      it('Should force custom redirect base url to use http', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'custom-redirect-domain': `https://${cname}`,
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      });
 
-        it('Should remove trailing slash', () => {
-          const element = helpers.createAmpSkimlinksElement({
-            'publisher-code': '123X123',
-            'custom-redirect-domain': `https://${cname}/`,
-          });
-          const options = getAmpSkimlinksOptions(element, docInfo);
-          expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
+      it('Should remove trailing slash', () => {
+        const element = helpers.createAmpSkimlinksElement({
+          'publisher-code': '123X123',
+          'custom-redirect-domain': `https://${cname}/`,
         });
+        const options = getAmpSkimlinksOptions(element, docInfo);
+        expect(options.waypointBaseUrl).to.equal(`http://${cname}`);
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-skimlinks/0.1/test/test-tracking.js b/extensions/amp-skimlinks/0.1/test/test-tracking.js
index ae700888f2bb..ed7a2243a800 100644
--- a/extensions/amp-skimlinks/0.1/test/test-tracking.js
+++ b/extensions/amp-skimlinks/0.1/test/test-tracking.js
@@ -24,7 +24,6 @@ import {
   XCUST_ATTRIBUTE_NAME,
 } from '../constants';
 
-
 const {
   pageTrackingUrl: PAGE_IMPRESSION_TRACKING_URL,
   linksTrackingUrl: LINKS_IMPRESSIONS_TRACKING_URL,
@@ -32,281 +31,201 @@ const {
 } = DEFAULT_CONFIG;
 
 describes.fakeWin(
-    'test-tracking',
-    {
-      amp: {
-        extensions: ['amp-skimlinks'],
-      },
+  'test-tracking',
+  {
+    amp: {
+      extensions: ['amp-skimlinks'],
     },
-    env => {
-      let helpers;
-      let createAnchorReplacementObj;
-
-      beforeEach(() => {
-        helpers = helpersFactory(env);
-
-        createAnchorReplacementObj = (initialUrl, setNull) => {
-          const anchor = helpers.createAnchor(initialUrl);
-          const replacementUrl = setNull
-            ? null
-            : `https://go.redirectingat.com/?url=${initialUrl}`;
-
-          return {anchor, replacementUrl};
-        };
-
-      });
-
-      function setupTrackingService(skimOptions, trackingInfo) {
-        trackingInfo = Object.assign(
-            {pageImpressionId: 'page-imp-id', guid: 'guid'},
-            trackingInfo
-        );
-        const trackingService = helpers.createTrackingWithStubAnalytics(
-            skimOptions
-        );
-        trackingService.setTrackingInfo(trackingInfo);
-
-        return trackingService;
-      }
-
-      function createFakeAnchorReplacementList() {
-        return [
-          createAnchorReplacementObj('http://merchant1.com/', false),
-          createAnchorReplacementObj('http://merchant2.com/', false),
-          createAnchorReplacementObj('http://merchant1.com/', false),
-        ];
-      }
-
-      afterEach(() => {
-        env.sandbox.restore();
-      });
-
-      describe('sendImpressionTracking', () => {
-        let trackingService;
-
-        describe('amp-analytics setup', () => {
-          it('Should generate a page impression id', () => {
-            const trackingService1 = helpers.createTrackingWithStubAnalytics();
-            const impressionId1 = trackingService1.trackingInfo_
-                .pageImpressionId;
-            // Restore the already stub CustomEventReporterBuilder.prototype
-            // inside `createTrackingWithStubAnalytics` to avoid errors.
-            env.sandbox.restore();
-            const trackingService2 = helpers.createTrackingWithStubAnalytics();
-            const impressionId2 = trackingService2.trackingInfo_
-                .pageImpressionId;
-            expect(impressionId1.length).to.equal(32);
-            expect(impressionId1).to.not.equal(impressionId2);
-          });
+  },
+  env => {
+    let helpers;
+    let createAnchorReplacementObj;
+
+    beforeEach(() => {
+      helpers = helpersFactory(env);
+
+      createAnchorReplacementObj = (initialUrl, setNull) => {
+        const anchor = helpers.createAnchor(initialUrl);
+        const replacementUrl = setNull
+          ? null
+          : `https://go.redirectingat.com/?url=${initialUrl}`;
+
+        return {anchor, replacementUrl};
+      };
+    });
+
+    function setupTrackingService(skimOptions, trackingInfo) {
+      trackingInfo = Object.assign(
+        {pageImpressionId: 'page-imp-id', guid: 'guid'},
+        trackingInfo
+      );
+      const trackingService = helpers.createTrackingWithStubAnalytics(
+        skimOptions
+      );
+      trackingService.setTrackingInfo(trackingInfo);
+
+      return trackingService;
+    }
 
-          it('Should setup the page-impressions analytics correctly', () => {
-            helpers.createTrackingWithStubAnalytics();
-            const trackStub = CustomEventReporterBuilder.prototype.track;
-            expect(
-                trackStub.withArgs(
-                    'page-impressions',
-                    PAGE_IMPRESSION_TRACKING_URL
-                ).calledOnce
-            ).to.be.true;
-          });
+    function createFakeAnchorReplacementList() {
+      return [
+        createAnchorReplacementObj('http://merchant1.com/', false),
+        createAnchorReplacementObj('http://merchant2.com/', false),
+        createAnchorReplacementObj('http://merchant1.com/', false),
+      ];
+    }
 
-          it('Should setup the link-impressions analytics correctly', () => {
-            helpers.createTrackingWithStubAnalytics();
-            const trackStub = CustomEventReporterBuilder.prototype.track;
-            expect(
-                trackStub.withArgs(
-                    'link-impressions',
-                    LINKS_IMPRESSIONS_TRACKING_URL
-                ).calledOnce
-            ).to.be.true;
-          });
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('sendImpressionTracking', () => {
+      let trackingService;
+
+      describe('amp-analytics setup', () => {
+        it('Should generate a page impression id', () => {
+          const trackingService1 = helpers.createTrackingWithStubAnalytics();
+          const impressionId1 = trackingService1.trackingInfo_.pageImpressionId;
+          // Restore the already stub CustomEventReporterBuilder.prototype
+          // inside `createTrackingWithStubAnalytics` to avoid errors.
+          env.sandbox.restore();
+          const trackingService2 = helpers.createTrackingWithStubAnalytics();
+          const impressionId2 = trackingService2.trackingInfo_.pageImpressionId;
+          expect(impressionId1.length).to.equal(32);
+          expect(impressionId1).to.not.equal(impressionId2);
+        });
 
-          it('Should setup the non-affiliate-click analytics correctly', () => {
-            helpers.createTrackingWithStubAnalytics();
-            const trackStub = CustomEventReporterBuilder.prototype.track;
-            expect(
-                trackStub.withArgs('non-affiliate-click', NA_CLICK_TRACKING_URL)
-                    .calledOnce
-            ).to.be.true;
-          });
+        it('Should setup the page-impressions analytics correctly', () => {
+          helpers.createTrackingWithStubAnalytics();
+          const trackStub = CustomEventReporterBuilder.prototype.track;
+          expect(
+            trackStub.withArgs('page-impressions', PAGE_IMPRESSION_TRACKING_URL)
+              .calledOnce
+          ).to.be.true;
         });
 
-        it('Should call both page and link impressions analytics ' +
-        'if AE links', () => {
-          const urls = {
-            'https://merchants.com/product': {'ae': 1, 'count': 1},
-          };
-          trackingService = helpers.createTrackingWithStubAnalytics();
-          env.sandbox
-              .stub(trackingService, 'extractAnchorTrackingInfo_')
-              .returns({numberAffiliateLinks: 1, urls});
+        it('Should setup the link-impressions analytics correctly', () => {
+          helpers.createTrackingWithStubAnalytics();
+          const trackStub = CustomEventReporterBuilder.prototype.track;
+          expect(
+            trackStub.withArgs(
+              'link-impressions',
+              LINKS_IMPRESSIONS_TRACKING_URL
+            ).calledOnce
+          ).to.be.true;
+        });
 
-          trackingService.sendImpressionTracking([]);
-          const stub = trackingService.analytics_.trigger;
-          expect(stub.withArgs('page-impressions').calledOnce).to.be.true;
-          expect(stub.withArgs('link-impressions').calledOnce).to.be.true;
+        it('Should setup the non-affiliate-click analytics correctly', () => {
+          helpers.createTrackingWithStubAnalytics();
+          const trackStub = CustomEventReporterBuilder.prototype.track;
+          expect(
+            trackStub.withArgs('non-affiliate-click', NA_CLICK_TRACKING_URL)
+              .calledOnce
+          ).to.be.true;
         });
+      });
 
-        it('Should only call page impressions analytics ' +
-        'if no AE links', () => {
-          trackingService = helpers.createTrackingWithStubAnalytics();
-          env.sandbox
-              .stub(trackingService, 'extractAnchorTrackingInfo_')
-              .returns({numberAffiliateLinks: 0, urls: []});
+      it('Should call both page and link impressions analytics if AE links', () => {
+        const urls = {
+          'https://merchants.com/product': {'ae': 1, 'count': 1},
+        };
+        trackingService = helpers.createTrackingWithStubAnalytics();
+        env.sandbox
+          .stub(trackingService, 'extractAnchorTrackingInfo_')
+          .returns({numberAffiliateLinks: 1, urls});
+
+        trackingService.sendImpressionTracking([]);
+        const stub = trackingService.analytics_.trigger;
+        expect(stub.withArgs('page-impressions').calledOnce).to.be.true;
+        expect(stub.withArgs('link-impressions').calledOnce).to.be.true;
+      });
 
-          trackingService.sendImpressionTracking([]);
-          const stub = trackingService.analytics_.trigger;
-          expect(stub.withArgs('page-impressions').calledOnce).to.be.true;
-          expect(stub.withArgs('link-impressions').called).to.be.false;
-        });
+      it('Should only call page impressions analytics if no AE links', () => {
+        trackingService = helpers.createTrackingWithStubAnalytics();
+        env.sandbox
+          .stub(trackingService, 'extractAnchorTrackingInfo_')
+          .returns({numberAffiliateLinks: 0, urls: []});
 
-        it('Should not call page nor link impressions if skimOptions ' +
-        '"tracking" is false', () => {
+        trackingService.sendImpressionTracking([]);
+        const stub = trackingService.analytics_.trigger;
+        expect(stub.withArgs('page-impressions').calledOnce).to.be.true;
+        expect(stub.withArgs('link-impressions').called).to.be.false;
+      });
+
+      it(
+        'Should not call page nor link impressions if skimOptions ' +
+          '"tracking" is false',
+        () => {
           trackingService = helpers.createTrackingWithStubAnalytics({
             tracking: false,
           });
           env.sandbox
-              .stub(trackingService, 'extractAnchorTrackingInfo_')
-              .returns({numberAffiliateLinks: 0, urls: []});
+            .stub(trackingService, 'extractAnchorTrackingInfo_')
+            .returns({numberAffiliateLinks: 0, urls: []});
 
           trackingService.sendImpressionTracking([]);
           const stub = trackingService.analytics_.trigger;
           expect(stub.withArgs('page-impressions').called).to.be.false;
           expect(stub.withArgs('link-impressions').called).to.be.false;
-        });
-
-        describe('Page impressions analytics', () => {
-          it('Should call page impression tracking with correct data', () => {
-            const expectedData = {
-              pub: pubcode,
-              pag: 'CANONICAL_URL',
-              pref: 'my-page-referrer',
-              tz: 'TIMEZONE',
-              uuid: 'page-impressions-id',
-              guid: 'user-guid',
-              slc: 0,
-              jsl: 0, // Always 0 for AMP.
-              t: 1,
-              jv: PLATFORM_NAME,
-            };
-            trackingService = setupTrackingService(null, {
-              pageImpressionId: expectedData.uuid,
-              guid: expectedData.guid,
-            });
-            trackingService.sendImpressionTracking([]);
-            const urlVars = helpers.getAnalyticsUrlVars(
-                trackingService,
-                'page-impressions'
-            );
-
-            expect(urlVars.data).to.be.a.string;
-            const trackingData = JSON.parse(urlVars.data);
-            expect(trackingData).to.deep.equal(expectedData);
-          });
+        }
+      );
 
-          it('Should set slc param correctly', () => {
-            const trackingService = helpers.createTrackingWithStubAnalytics({});
-            trackingService.sendImpressionTracking(
-                createFakeAnchorReplacementList()
-            );
-            const urlVars = helpers.getAnalyticsUrlVars(
-                trackingService,
-                'page-impressions'
-            );
-
-            expect(urlVars.data).to.be.a.string;
-            const trackingData = JSON.parse(urlVars.data);
-            expect(trackingData.slc).to.equal(3);
-          });
-
-          it('Should send the xcust to the page impressions request', () => {
-            trackingService = setupTrackingService({
-              customTrackingId: 'xcust-id',
-            });
-            trackingService.sendImpressionTracking([]);
-
-            const urlVars = helpers.getAnalyticsUrlVars(
-                trackingService,
-                'page-impressions'
-            );
-            const trackingData = JSON.parse(urlVars.data);
-            expect(trackingData.uc).to.equal('xcust-id');
-          });
-
-          it('Should not send excludedDomains', () => {
-            const excludedDomain = 'go.redirectingat.com';
-            const trackingService = helpers.createTrackingWithStubAnalytics({
-              excludedDomains: [excludedDomain],
-            });
-
-            trackingService.sendImpressionTracking([
-              {
-                anchor: helpers.createAnchor(`https://${excludedDomain}`),
-                replacementUrl: 'https://go.skimresources.com',
-              },
-            ]);
-
-            const urlVars = helpers.getAnalyticsUrlVars(
-                trackingService,
-                'page-impressions'
-            );
-
-            const trackingData = JSON.parse(urlVars.data);
-            expect(trackingData.slc).to.equal(0);
+      describe('Page impressions analytics', () => {
+        it('Should call page impression tracking with correct data', () => {
+          const expectedData = {
+            pub: pubcode,
+            pag: 'CANONICAL_URL',
+            pref: 'my-page-referrer',
+            tz: 'TIMEZONE',
+            uuid: 'page-impressions-id',
+            guid: 'user-guid',
+            slc: 0,
+            jsl: 0, // Always 0 for AMP.
+            t: 1,
+            jv: PLATFORM_NAME,
+          };
+          trackingService = setupTrackingService(null, {
+            pageImpressionId: expectedData.uuid,
+            guid: expectedData.guid,
           });
-        });
+          trackingService.sendImpressionTracking([]);
+          const urlVars = helpers.getAnalyticsUrlVars(
+            trackingService,
+            'page-impressions'
+          );
 
-        describe('Link impressions analytics', () => {
-          it('Should call link impressions tracking', () => {
-            const expectedData = {
-              pub: pubcode,
-              pag: 'CANONICAL_URL',
-              tz: 'TIMEZONE',
-              uuid: 'page-impressions-id',
-              guid: 'user-guid',
-              dl: {
-                'http://merchant1.com/': {ae: 1, count: 1},
-              },
-              hae: 1,
-              typ: 'l',
-              jv: PLATFORM_NAME,
-            };
-            trackingService = setupTrackingService(null, {
-              pageImpressionId: expectedData.uuid,
-              guid: expectedData.guid,
-            });
-            trackingService.sendImpressionTracking([
-              createAnchorReplacementObj('http://merchant1.com/', false),
-            ]);
-            const urlVars = helpers.getAnalyticsUrlVars(
-                trackingService,
-                'link-impressions'
-            );
-
-            expect(urlVars.data).to.be.a.string;
-            const trackingData = JSON.parse(urlVars.data);
-            expect(trackingData).to.deep.equal(expectedData);
-          });
+          expect(urlVars.data).to.be.a.string;
+          const trackingData = JSON.parse(urlVars.data);
+          expect(trackingData).to.deep.equal(expectedData);
         });
 
-        it('Should set dl and hae', () => {
+        it('Should set slc param correctly', () => {
           const trackingService = helpers.createTrackingWithStubAnalytics({});
           trackingService.sendImpressionTracking(
-              createFakeAnchorReplacementList()
+            createFakeAnchorReplacementList()
           );
           const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'link-impressions'
+            trackingService,
+            'page-impressions'
           );
 
           expect(urlVars.data).to.be.a.string;
           const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.dl).to.deep.equal({
-            'http://merchant1.com/': {count: 2, ae: 1},
-            'http://merchant2.com/': {count: 1, ae: 1},
+          expect(trackingData.slc).to.equal(3);
+        });
+
+        it('Should send the xcust to the page impressions request', () => {
+          trackingService = setupTrackingService({
+            customTrackingId: 'xcust-id',
           });
+          trackingService.sendImpressionTracking([]);
 
-          expect(trackingData.hae).to.equal(1);
+          const urlVars = helpers.getAnalyticsUrlVars(
+            trackingService,
+            'page-impressions'
+          );
+          const trackingData = JSON.parse(urlVars.data);
+          expect(trackingData.uc).to.equal('xcust-id');
         });
 
         it('Should not send excludedDomains', () => {
@@ -315,142 +234,203 @@ describes.fakeWin(
             excludedDomains: [excludedDomain],
           });
 
-          const anchorList = createFakeAnchorReplacementList().concat([
+          trackingService.sendImpressionTracking([
             {
               anchor: helpers.createAnchor(`https://${excludedDomain}`),
-              replacementUrl: null,
+              replacementUrl: 'https://go.skimresources.com',
             },
           ]);
 
-          trackingService.sendImpressionTracking(anchorList);
-
-          const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'link-impressions'
-          );
-
-          const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.dl).to.deep.equal({
-            'http://merchant1.com/': {count: 2, ae: 1},
-            'http://merchant2.com/': {count: 1, ae: 1},
-          });
-        });
-
-        it('Should not send NA links', () => {
-          const trackingService = helpers.createTrackingWithStubAnalytics({});
-          trackingService.sendImpressionTracking(
-              createFakeAnchorReplacementList().concat([
-                createAnchorReplacementObj('http://non-merchant.com/', true),
-              ])
-          );
           const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'link-impressions'
+            trackingService,
+            'page-impressions'
           );
 
-          expect(urlVars.data).to.be.a.string;
           const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.dl).to.deep.equal({
-            'http://merchant1.com/': {count: 2, ae: 1},
-            'http://merchant2.com/': {count: 1, ae: 1},
-          });
-
-          expect(trackingData.hae).to.equal(1);
+          expect(trackingData.slc).to.equal(0);
         });
       });
 
-      describe('sendNaClickTracking', () => {
-        it('Should send non-affiliate click tracking', () => {
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
+      describe('Link impressions analytics', () => {
+        it('Should call link impressions tracking', () => {
           const expectedData = {
-            pubcode,
-            referrer: 'CANONICAL_URL',
-            pref: 'my-page-referrer',
-            url: anchor.href,
-            xtz: 'TIMEZONE',
+            pub: pubcode,
+            pag: 'CANONICAL_URL',
+            tz: 'TIMEZONE',
             uuid: 'page-impressions-id',
-            site: 'false',
-            product: '1',
+            guid: 'user-guid',
+            dl: {
+              'http://merchant1.com/': {ae: 1, count: 1},
+            },
+            hae: 1,
+            typ: 'l',
             jv: PLATFORM_NAME,
           };
-
-          const trackingService = setupTrackingService(null, {
+          trackingService = setupTrackingService(null, {
             pageImpressionId: expectedData.uuid,
             guid: expectedData.guid,
           });
-
-          trackingService.sendNaClickTracking(anchor);
+          trackingService.sendImpressionTracking([
+            createAnchorReplacementObj('http://merchant1.com/', false),
+          ]);
           const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'non-affiliate-click'
+            trackingService,
+            'link-impressions'
           );
+
           expect(urlVars.data).to.be.a.string;
           const trackingData = JSON.parse(urlVars.data);
           expect(trackingData).to.deep.equal(expectedData);
         });
+      });
 
-        it('Should not send tracking if "tracking" skimOption is false', () => {
-          const trackingService = setupTrackingService({tracking: false});
+      it('Should set dl and hae', () => {
+        const trackingService = helpers.createTrackingWithStubAnalytics({});
+        trackingService.sendImpressionTracking(
+          createFakeAnchorReplacementList()
+        );
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'link-impressions'
+        );
 
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        expect(urlVars.data).to.be.a.string;
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData.dl).to.deep.equal({
+          'http://merchant1.com/': {count: 2, ae: 1},
+          'http://merchant2.com/': {count: 1, ae: 1},
+        });
 
-          trackingService.sendNaClickTracking(anchor);
+        expect(trackingData.hae).to.equal(1);
+      });
 
-          const stub = trackingService.analytics_.trigger;
-          expect(stub.withArgs('non-affiliate-click').called).to.be.false;
+      it('Should not send excludedDomains', () => {
+        const excludedDomain = 'go.redirectingat.com';
+        const trackingService = helpers.createTrackingWithStubAnalytics({
+          excludedDomains: [excludedDomain],
         });
 
-        it('Should send the global xcust with the na tracking', () => {
-          const trackingService = setupTrackingService({
-            customTrackingId: 'xcust-id',
-          });
+        const anchorList = createFakeAnchorReplacementList().concat([
+          {
+            anchor: helpers.createAnchor(`https://${excludedDomain}`),
+            replacementUrl: null,
+          },
+        ]);
 
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        trackingService.sendImpressionTracking(anchorList);
 
-          trackingService.sendNaClickTracking(anchor);
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'link-impressions'
+        );
 
-          const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'non-affiliate-click'
-          );
-          const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.custom).to.equal('xcust-id');
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData.dl).to.deep.equal({
+          'http://merchant1.com/': {count: 2, ae: 1},
+          'http://merchant2.com/': {count: 1, ae: 1},
         });
+      });
 
-        it('Should send xcust set on the link with the na tracking', () => {
-          const trackingService = setupTrackingService();
+      it('Should not send NA links', () => {
+        const trackingService = helpers.createTrackingWithStubAnalytics({});
+        trackingService.sendImpressionTracking(
+          createFakeAnchorReplacementList().concat([
+            createAnchorReplacementObj('http://non-merchant.com/', true),
+          ])
+        );
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'link-impressions'
+        );
 
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
-          anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'xcust-id-on-link');
+        expect(urlVars.data).to.be.a.string;
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData.dl).to.deep.equal({
+          'http://merchant1.com/': {count: 2, ae: 1},
+          'http://merchant2.com/': {count: 1, ae: 1},
+        });
 
-          trackingService.sendNaClickTracking(anchor);
-          const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'non-affiliate-click'
-          );
-          const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.custom).to.equal('xcust-id-on-link');
+        expect(trackingData.hae).to.equal(1);
+      });
+    });
+
+    describe('sendNaClickTracking', () => {
+      it('Should send non-affiliate click tracking', () => {
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        const expectedData = {
+          pubcode,
+          referrer: 'CANONICAL_URL',
+          pref: 'my-page-referrer',
+          url: anchor.href,
+          xtz: 'TIMEZONE',
+          uuid: 'page-impressions-id',
+          site: 'false',
+          product: '1',
+          jv: PLATFORM_NAME,
+        };
+
+        const trackingService = setupTrackingService(null, {
+          pageImpressionId: expectedData.uuid,
+          guid: expectedData.guid,
         });
 
-        it('Should prioritise xcust set on the link over global xcust with ' +
-        'the NA tracking', () => {
-          const trackingService = setupTrackingService({
-            customTrackingId: 'xcust-id',
-          });
+        trackingService.sendNaClickTracking(anchor);
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'non-affiliate-click'
+        );
+        expect(urlVars.data).to.be.a.string;
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData).to.deep.equal(expectedData);
+      });
 
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
-          anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'xcust-id-on-link');
+      it('Should not send tracking if "tracking" skimOption is false', () => {
+        const trackingService = setupTrackingService({tracking: false});
 
-          trackingService.sendNaClickTracking(anchor);
-          const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'non-affiliate-click'
-          );
-          const trackingData = JSON.parse(urlVars.data);
-          expect(trackingData.custom).to.equal('xcust-id-on-link');
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+
+        trackingService.sendNaClickTracking(anchor);
+
+        const stub = trackingService.analytics_.trigger;
+        expect(stub.withArgs('non-affiliate-click').called).to.be.false;
+      });
+
+      it('Should send the global xcust with the na tracking', () => {
+        const trackingService = setupTrackingService({
+          customTrackingId: 'xcust-id',
         });
 
-        it('Should add the rnd query parameter', () => {
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+
+        trackingService.sendNaClickTracking(anchor);
+
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'non-affiliate-click'
+        );
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData.custom).to.equal('xcust-id');
+      });
+
+      it('Should send xcust set on the link with the na tracking', () => {
+        const trackingService = setupTrackingService();
+
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'xcust-id-on-link');
+
+        trackingService.sendNaClickTracking(anchor);
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'non-affiliate-click'
+        );
+        const trackingData = JSON.parse(urlVars.data);
+        expect(trackingData.custom).to.equal('xcust-id-on-link');
+      });
+
+      it(
+        'Should prioritise xcust set on the link over global xcust with ' +
+          'the NA tracking',
+        () => {
           const trackingService = setupTrackingService({
             customTrackingId: 'xcust-id',
           });
@@ -460,24 +440,42 @@ describes.fakeWin(
 
           trackingService.sendNaClickTracking(anchor);
           const urlVars = helpers.getAnalyticsUrlVars(
-              trackingService,
-              'non-affiliate-click'
+            trackingService,
+            'non-affiliate-click'
           );
+          const trackingData = JSON.parse(urlVars.data);
+          expect(trackingData.custom).to.equal('xcust-id-on-link');
+        }
+      );
 
-          expect(urlVars.rnd).to.be.equal('RANDOM');
+      it('Should add the rnd query parameter', () => {
+        const trackingService = setupTrackingService({
+          customTrackingId: 'xcust-id',
         });
 
-        it('Should not send excludedDomains', () => {
-          const trackingService = setupTrackingService({
-            excludedDomains: ['non-merchant.com'],
-          });
-          const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+        anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'xcust-id-on-link');
 
-          trackingService.sendNaClickTracking(anchor);
+        trackingService.sendNaClickTracking(anchor);
+        const urlVars = helpers.getAnalyticsUrlVars(
+          trackingService,
+          'non-affiliate-click'
+        );
 
-          const stub = trackingService.analytics_.trigger;
-          expect(stub.withArgs('non-affiliate-click').called).to.be.false;
+        expect(urlVars.rnd).to.be.equal('RANDOM');
+      });
+
+      it('Should not send excludedDomains', () => {
+        const trackingService = setupTrackingService({
+          excludedDomains: ['non-merchant.com'],
         });
+        const anchor = helpers.createAnchor('https://non-merchant.com/test');
+
+        trackingService.sendNaClickTracking(anchor);
+
+        const stub = trackingService.analytics_.trigger;
+        expect(stub.withArgs('non-affiliate-click').called).to.be.false;
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-skimlinks/0.1/test/test-waypoint.js b/extensions/amp-skimlinks/0.1/test/test-waypoint.js
index 8802f18bd02e..36aff460156c 100644
--- a/extensions/amp-skimlinks/0.1/test/test-waypoint.js
+++ b/extensions/amp-skimlinks/0.1/test/test-waypoint.js
@@ -21,136 +21,134 @@ import {parseQueryString, parseUrlDeprecated} from '../../../../src/url';
 import helpersFactory from './helpers';
 
 describes.fakeWin(
-    'Waypoint',
-    {
-      amp: {
-        extensions: ['amp-skimlinks'],
-      },
+  'Waypoint',
+  {
+    amp: {
+      extensions: ['amp-skimlinks'],
     },
-    env => {
-      let helpers;
-      let trackingService;
-      let waypoint;
-      beforeEach(() => {
-        helpers = helpersFactory(env);
-      });
+  },
+  env => {
+    let helpers;
+    let trackingService;
+    let waypoint;
+    beforeEach(() => {
+      helpers = helpersFactory(env);
+    });
+
+    function getFakeTrackingInfo(data) {
+      return Object.assign(
+        {
+          pubcode,
+          // https://github.com/ampproject/amphtml/blob/master/spec/amp-var-substitutions.md
+          pageImpressionId: 'page_impression_id',
+          customTrackingId: null,
+          guid: 'user_guid',
+        },
+        data
+      );
+    }
 
-      function getFakeTrackingInfo(data) {
-        return Object.assign(
-            {
-              pubcode,
-              // https://github.com/ampproject/amphtml/blob/master/spec/amp-var-substitutions.md
-              pageImpressionId: 'page_impression_id',
-              customTrackingId: null,
-              guid: 'user_guid',
-            },
-            data
-        );
+    beforeEach(() => {
+      trackingService = helpers.createTrackingWithStubAnalytics();
+      env.sandbox
+        .stub(trackingService, 'getTrackingInfo')
+        .returns(getFakeTrackingInfo());
+      env.sandbox
+        .stub(env.ampdoc.win.document, 'referrer')
+        .value('referrer_url');
+      helpers.mockServiceGetter('documentInfoForDoc', {
+        canonicalUrl: 'canonical_url',
+      });
+      env.sandbox.stub(Date.prototype, 'getTimezoneOffset').returns('-120');
+      waypoint = new Waypoint(
+        env.ampdoc,
+        DEFAULT_SKIM_OPTIONS,
+        trackingService,
+        'referrer_url'
+      );
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('getAffiliateUrl', () => {
+      let replacementUrl;
+      let queryParams;
+      let anchor;
+      const destinationUrl = 'https://test.com/path/to?isAdmin=true';
+
+      function getQueryParams(url) {
+        return parseQueryString(parseUrlDeprecated(url).search);
       }
 
       beforeEach(() => {
-        trackingService = helpers.createTrackingWithStubAnalytics();
-        env.sandbox
-            .stub(trackingService, 'getTrackingInfo')
-            .returns(getFakeTrackingInfo());
-        env.sandbox
-            .stub(env.ampdoc.win.document, 'referrer')
-            .value('referrer_url');
-        helpers.mockServiceGetter('documentInfoForDoc', {
-          canonicalUrl: 'canonical_url',
-        });
-        env.sandbox.stub(Date.prototype, 'getTimezoneOffset').returns('-120');
-        waypoint = new Waypoint(
-            env.ampdoc,
-            DEFAULT_SKIM_OPTIONS,
-            trackingService,
-            'referrer_url'
-        );
+        anchor = helpers.createAnchor(destinationUrl);
+        replacementUrl = waypoint.getAffiliateUrl(anchor);
+        queryParams = getQueryParams(replacementUrl);
       });
 
-      afterEach(() => {
-        env.sandbox.restore();
+      it('Sends the pubcode', () => {
+        expect(queryParams.id).to.equal(pubcode);
+      });
+      it('Sends the destination url', () => {
+        expect(queryParams.url).to.equal(destinationUrl);
       });
 
-      describe('getAffiliateUrl', () => {
-        let replacementUrl;
-        let queryParams;
-        let anchor;
-        const destinationUrl = 'https://test.com/path/to?isAdmin=true';
+      it('Sends the sref', () => {
+        expect(queryParams.sref).to.equal('canonical_url');
+      });
 
-        function getQueryParams(url) {
-          return parseQueryString(parseUrlDeprecated(url).search);
-        }
+      it('Sends the pref', () => {
+        expect(queryParams.pref).to.equal('referrer_url');
+      });
 
-        beforeEach(() => {
-          anchor = helpers.createAnchor(destinationUrl);
-          replacementUrl = waypoint.getAffiliateUrl(anchor);
-          queryParams = getQueryParams(replacementUrl);
-        });
+      it('Sends the xguid (GUID)', () => {
+        expect(queryParams.xguid).to.equal('user_guid');
+      });
 
-        it('Sends the pubcode', () => {
-          expect(queryParams.id).to.equal(pubcode);
-        });
-        it('Sends the destination url', () => {
-          expect(queryParams.url).to.equal(destinationUrl);
-        });
+      it('Sends the xuuid (impression id)', () => {
+        expect(queryParams.xuuid).to.equal('page_impression_id');
+      });
 
-        it('Sends the sref', () => {
-          expect(queryParams.sref).to.equal('canonical_url');
-        });
+      it('Sends the xtz (timezone)', () => {
+        expect(queryParams.xtz).to.equal('-120');
+      });
 
-        it('Sends the pref', () => {
-          expect(queryParams.pref).to.equal('referrer_url');
-        });
+      it('Sends xs (source app)', () => {
+        expect(queryParams.xs).to.equal('1');
+      });
 
-        it('Sends the xguid (GUID)', () => {
-          expect(queryParams.xguid).to.equal('user_guid');
+      describe('custom-tracking-id (xcust)', () => {
+        const trackingInfo = getFakeTrackingInfo({
+          customTrackingId: 'globalTrackingId',
         });
 
-        it('Sends the xuuid (impression id)', () => {
-          expect(queryParams.xuuid).to.equal('page_impression_id');
+        it('Does not send the xcust if not provided as skimOption', () => {
+          expect(queryParams.xcust).to.be.undefined;
         });
 
-        it('Sends the xtz (timezone)', () => {
-          expect(queryParams.xtz).to.equal('-120');
+        it('Sends the xcust if provided on the link', () => {
+          anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'linkTrackingId');
+          replacementUrl = waypoint.getAffiliateUrl(anchor);
+          queryParams = getQueryParams(replacementUrl);
+          expect(queryParams.xcust).to.be.equal('linkTrackingId');
         });
 
-        it('Sends xs (source app)', () => {
-          expect(queryParams.xs).to.equal('1');
+        it('Sends the xcust if provided as skimOption', () => {
+          trackingService.getTrackingInfo.returns(trackingInfo);
+          replacementUrl = waypoint.getAffiliateUrl(anchor);
+          queryParams = getQueryParams(replacementUrl);
+          expect(queryParams.xcust).to.be.equal('globalTrackingId');
         });
 
-        describe('custom-tracking-id (xcust)', () => {
-          const trackingInfo = getFakeTrackingInfo({
-            customTrackingId: 'globalTrackingId',
-          });
-
-          it('Does not send the xcust if not provided as skimOption', () => {
-            expect(queryParams.xcust).to.be.undefined;
-          });
-
-          it('Sends the xcust if provided on the link', () => {
-            anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'linkTrackingId');
-            replacementUrl = waypoint.getAffiliateUrl(anchor);
-            queryParams = getQueryParams(replacementUrl);
-            expect(queryParams.xcust).to.be.equal('linkTrackingId');
-          });
-
-          it('Sends the xcust if provided as skimOption', () => {
-            trackingService.getTrackingInfo.returns(trackingInfo);
-            replacementUrl = waypoint.getAffiliateUrl(anchor);
-            queryParams = getQueryParams(replacementUrl);
-            expect(queryParams.xcust).to.be.equal('globalTrackingId');
-          });
-
-          it('Sends the xcust if provided on the link and as skimOption',
-              () => {
-                anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'linkTrackingId');
-                replacementUrl = waypoint.getAffiliateUrl(anchor);
-                queryParams = getQueryParams(replacementUrl);
-                expect(queryParams.xcust).to.be.equal('linkTrackingId');
-              }
-          );
+        it('Sends the xcust if provided on the link and as skimOption', () => {
+          anchor.setAttribute(XCUST_ATTRIBUTE_NAME, 'linkTrackingId');
+          replacementUrl = waypoint.getAffiliateUrl(anchor);
+          queryParams = getQueryParams(replacementUrl);
+          expect(queryParams.xcust).to.be.equal('linkTrackingId');
         });
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-skimlinks/0.1/tracking.js b/extensions/amp-skimlinks/0.1/tracking.js
index 3d7fddd23a9f..6ffd5b239b29 100644
--- a/extensions/amp-skimlinks/0.1/tracking.js
+++ b/extensions/amp-skimlinks/0.1/tracking.js
@@ -18,10 +18,7 @@ import {CustomEventReporterBuilder} from '../../../src/extension-analytics.js';
 import {dict} from '../../../src/utils/object';
 import {generatePageImpressionId, isExcludedAnchorUrl} from './utils';
 
-import {
-  PLATFORM_NAME,
-  XCUST_ATTRIBUTE_NAME,
-} from './constants';
+import {PLATFORM_NAME, XCUST_ATTRIBUTE_NAME} from './constants';
 
 const PAGE_IMPRESSIONS = 'page-impressions';
 const LINK_IMPRESSIONS = 'link-impressions';
@@ -115,13 +112,10 @@ export class Tracking {
     });
 
     const {numberAffiliateLinks, urls} = this.extractAnchorTrackingInfo_(
-        anchorReplacementList
+      anchorReplacementList
     );
 
-    this.sendPageImpressionTracking_(
-        commonData,
-        numberAffiliateLinks
-    );
+    this.sendPageImpressionTracking_(commonData, numberAffiliateLinks);
     this.sendLinkImpressionTracking_(commonData, numberAffiliateLinks, urls);
   }
 
@@ -160,10 +154,13 @@ export class Tracking {
     // Sends POST request. Second param is the object used to interpolate
     // placeholder variables defined in NA_CLICK_TRACKING_URL
     // (See constants.js).
-    this.analytics_.trigger(NON_AFFILIATE_CLICK, dict({
-      'data': JSON.stringify(data),
-      'rnd': 'RANDOM',
-    }));
+    this.analytics_.trigger(
+      NON_AFFILIATE_CLICK,
+      dict({
+        'data': JSON.stringify(data),
+        'rnd': 'RANDOM',
+      })
+    );
   }
 
   /**
@@ -177,22 +174,25 @@ export class Tracking {
     const {customTrackingId, referrer} = this.trackingInfo_;
 
     const data = /** @type {!JsonObject} */ (Object.assign(
-        dict({
-          'slc': numberAffiliateLinks,
-          'jsl': 0, // Javascript load time, not relevant in AMP context.
-          'pref': referrer,
-          'uc': customTrackingId,
-          't': 1,
-        }),
-        commonData
+      dict({
+        'slc': numberAffiliateLinks,
+        'jsl': 0, // Javascript load time, not relevant in AMP context.
+        'pref': referrer,
+        'uc': customTrackingId,
+        't': 1,
+      }),
+      commonData
     ));
 
     // Sends POST request. Second param is the object used to interpolate
     // placeholder variables defined in PAGE_IMPRESSION_TRACKING_URL
     // (See constants.js).
-    this.analytics_.trigger(PAGE_IMPRESSIONS, dict({
-      'data': JSON.stringify(data),
-    }));
+    this.analytics_.trigger(
+      PAGE_IMPRESSIONS,
+      dict({
+        'data': JSON.stringify(data),
+      })
+    );
   }
 
   /**
@@ -210,20 +210,23 @@ export class Tracking {
     }
 
     const data = /** @type {!JsonObject} */ (Object.assign(
-        dict({
-          'dl': urls,
-          'hae': numberAffiliateLinks ? 1 : 0, // 1 if has at least one AE link
-          'typ': 'l',
-        }),
-        commonData
+      dict({
+        'dl': urls,
+        'hae': numberAffiliateLinks ? 1 : 0, // 1 if has at least one AE link
+        'typ': 'l',
+      }),
+      commonData
     ));
 
     // Send POST request. Second param is the object used to interpolate
     // placeholder variables defined in LINKS_IMPRESSIONS_TRACKING_URL.
     // (See constants.js).
-    this.analytics_.trigger(LINK_IMPRESSIONS, dict({
-      'data': JSON.stringify(data),
-    }));
+    this.analytics_.trigger(
+      LINK_IMPRESSIONS,
+      dict({
+        'data': JSON.stringify(data),
+      })
+    );
   }
 
   /**
@@ -245,21 +248,20 @@ export class Tracking {
 
     // Configure analytics to send POST request when receiving
     // 'page-impressions' event.
-    analyticsBuilder.track(PAGE_IMPRESSIONS,
-        pageTrackingUrl);
-    analyticsBuilder.track(LINK_IMPRESSIONS,
-        linksTrackingUrl);
-    analyticsBuilder.track(NON_AFFILIATE_CLICK,
-        nonAffiliateTrackingUrl);
+    analyticsBuilder.track(PAGE_IMPRESSIONS, pageTrackingUrl);
+    analyticsBuilder.track(LINK_IMPRESSIONS, linksTrackingUrl);
+    analyticsBuilder.track(NON_AFFILIATE_CLICK, nonAffiliateTrackingUrl);
 
-    analyticsBuilder.setTransportConfig(dict({
-      'beacon': true,
-      'image': true,
-      // Tracking API supports CORS with wildcard in Access-Control-Origin
-      // which is not compatible with the credentials flag set to true when
-      // using xhrpost.
-      'xhrpost': false,
-    }));
+    analyticsBuilder.setTransportConfig(
+      dict({
+        'beacon': true,
+        'image': true,
+        // Tracking API supports CORS with wildcard in Access-Control-Origin
+        // which is not compatible with the credentials flag set to true when
+        // using xhrpost.
+        'xhrpost': false,
+      })
+    );
 
     return analyticsBuilder.build();
   }
@@ -290,10 +292,12 @@ export class Tracking {
         return;
       }
 
-      urls[anchor.href] = urls[anchor.href] || dict({
-        'ae': 1, // 1 means affiliated link.
-        'count': 0,
-      });
+      urls[anchor.href] =
+        urls[anchor.href] ||
+        dict({
+          'ae': 1, // 1 means affiliated link.
+          'count': 0,
+        });
 
       urls[anchor.href]['count'] += 1;
       numberAffiliateLinks += 1;
diff --git a/extensions/amp-skimlinks/0.1/utils.js b/extensions/amp-skimlinks/0.1/utils.js
index 9fe39c29145c..c8decfd71bf0 100644
--- a/extensions/amp-skimlinks/0.1/utils.js
+++ b/extensions/amp-skimlinks/0.1/utils.js
@@ -24,8 +24,8 @@ export function generatePageImpressionId() {
   let str = '';
   for (let i = 0; i < 8; i++) {
     str += Math.floor((1 + Math.random()) * 0x10000)
-        .toString(16)
-        .substring(1);
+      .toString(16)
+      .substring(1);
   }
 
   return str;
diff --git a/extensions/amp-skimlinks/0.1/waypoint.js b/extensions/amp-skimlinks/0.1/waypoint.js
index 12f85426fb51..3aa3c5fbabbd 100644
--- a/extensions/amp-skimlinks/0.1/waypoint.js
+++ b/extensions/amp-skimlinks/0.1/waypoint.js
@@ -14,15 +14,11 @@
  * limitations under the License.
  */
 
-import {
-  PLATFORM_NAME,
-  XCUST_ATTRIBUTE_NAME,
-} from './constants';
+import {PLATFORM_NAME, XCUST_ATTRIBUTE_NAME} from './constants';
 import {Services} from '../../../src/services';
 import {addParamsToUrl} from '../../../src/url';
 import {dict} from '../../../src/utils/object';
 
-
 /**
  * The waypoint class is responsible for building the URL to
  * Skimlinks affiliate API (also called affiliated URL).
@@ -86,6 +82,9 @@ export class Waypoint {
       queryParams['xcust'] = xcust;
     }
     const affiliationUrl = this.skimOptions_.waypointBaseUrl;
-    return addParamsToUrl(affiliationUrl, /** @type {!JsonObject} */ (queryParams));
+    return addParamsToUrl(
+      affiliationUrl,
+      /** @type {!JsonObject} */ (queryParams)
+    );
   }
 }
diff --git a/extensions/amp-slides/0.1/amp-slides.js b/extensions/amp-slides/0.1/amp-slides.js
index 156f6bedafb7..25867ecd7df6 100644
--- a/extensions/amp-slides/0.1/amp-slides.js
+++ b/extensions/amp-slides/0.1/amp-slides.js
@@ -16,23 +16,22 @@
 
 import {user} from '../../../src/log';
 
-
 /** @private @const {string} */
 const TAG = 'amp-slides';
 
-
 /** Deprecated. Please see {@link AmpCarousel} with `type=slides` attribute. */
 class AmpSlides extends AMP.BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
-    user().error(TAG,
-        'No longer available. ' +
-          'Use `amp-carousel` with `type="slides"` for an alternative');
+    user().error(
+      TAG,
+      'No longer available. ' +
+        'Use `amp-carousel` with `type="slides"` for an alternative'
+    );
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpSlides);
 });
diff --git a/extensions/amp-smartlinks/0.1/amp-smartlinks.js b/extensions/amp-smartlinks/0.1/amp-smartlinks.js
index e2accbfbcf45..2473f1bd1a1e 100644
--- a/extensions/amp-smartlinks/0.1/amp-smartlinks.js
+++ b/extensions/amp-smartlinks/0.1/amp-smartlinks.js
@@ -21,14 +21,12 @@ import {dict} from '../../../src/utils/object';
 import {getData} from './../../../src/event-helper';
 
 import {ENDPOINTS} from './constants';
-import {LinkRewriterManager} from
-  '../../amp-skimlinks/0.1/link-rewriter/link-rewriter-manager';
+import {LinkRewriterManager} from '../../amp-skimlinks/0.1/link-rewriter/link-rewriter-manager';
 import {Linkmate} from './linkmate';
 import {getConfigOptions} from './linkmate-options';
 
 const TAG = 'amp-smartlinks';
 
-
 export class AmpSmartlinks extends AMP.BaseElement {
   /**
    * @param {!AmpElement} element
@@ -73,14 +71,15 @@ export class AmpSmartlinks extends AMP.BaseElement {
     this.linkmateOptions_ = getConfigOptions(this.element);
     this.linkRewriterService_ = new LinkRewriterManager(this.ampDoc_);
 
-    return this.ampDoc_.whenBodyAvailable()
-        .then(() => viewer.getReferrerUrl())
-        .then(referrer => {
-          this.referrer_ = referrer;
-          viewer.whenFirstVisible().then(() => {
-            this.runSmartlinks_();
-          });
+    return this.ampDoc_
+      .whenBodyAvailable()
+      .then(() => viewer.getReferrerUrl())
+      .then(referrer => {
+        this.referrer_ = referrer;
+        viewer.whenFirstVisible().then(() => {
+          this.runSmartlinks_();
         });
+      });
   }
 
   /**
@@ -94,19 +93,21 @@ export class AmpSmartlinks extends AMP.BaseElement {
 
       this.postPageImpression_();
       this.linkmate_ = new Linkmate(
-          /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
-          (this.ampDoc_),
-          /** @type {!../../../src/service/xhr-impl.Xhr} */
-          (this.xhr_),
-          /** @type {!Object} */
-          (this.linkmateOptions_)
+        /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */
+        (this.ampDoc_),
+        /** @type {!../../../src/service/xhr-impl.Xhr} */
+        (this.xhr_),
+        /** @type {!Object} */
+        (this.linkmateOptions_)
       );
       this.smartLinkRewriter_ = this.initLinkRewriter_();
 
       // If the config specified linkmate to run and our API is expecting
       // linkmate to run
-      if (this.linkmateOptions_.linkmateEnabled &&
-          this.linkmateOptions_.linkmateExpected) {
+      if (
+        this.linkmateOptions_.linkmateEnabled &&
+        this.linkmateOptions_.linkmateExpected
+      ) {
         this.smartLinkRewriter_.getAnchorReplacementList();
       }
     });
@@ -122,24 +123,25 @@ export class AmpSmartlinks extends AMP.BaseElement {
    */
   getLinkmateOptions_() {
     const fetchUrl = ENDPOINTS.NRTV_CONFIG_ENDPOINT.replace(
-        '.nrtv_slug.', this.linkmateOptions_.nrtvSlug
+      '.nrtv_slug.',
+      this.linkmateOptions_.nrtvSlug
     );
 
     try {
-      return this.xhr_.fetchJson(fetchUrl, {
-        method: 'GET',
-        ampCors: false,
-      })
-          .then(res => res.json())
-          .then(res => {
-            return getData(res)[0]['amp_config'];
-          });
+      return this.xhr_
+        .fetchJson(fetchUrl, {
+          method: 'GET',
+          ampCors: false,
+        })
+        .then(res => res.json())
+        .then(res => {
+          return getData(res)[0]['amp_config'];
+        });
     } catch (err) {
       return null;
     }
   }
 
-
   /**
    * API call to indicate a page load event happened
    * @private
@@ -153,12 +155,14 @@ export class AmpSmartlinks extends AMP.BaseElement {
 
     builder.track('page-impression', ENDPOINTS.PAGE_IMPRESSION_ENDPOINT);
 
-    builder.setTransportConfig(dict({
-      'beacon': true,
-      'image': false,
-      'xhrpost': true,
-      'useBody': true,
-    }));
+    builder.setTransportConfig(
+      dict({
+        'beacon': true,
+        'image': false,
+        'xhrpost': true,
+        'useBody': true,
+      })
+    );
 
     builder.setExtraUrlParams(payload);
     const reporter = builder.build();
@@ -175,11 +179,11 @@ export class AmpSmartlinks extends AMP.BaseElement {
     const options = {linkSelector: this.linkmateOptions_.linkSelector};
 
     return this.linkRewriterService_.registerLinkRewriter(
-        TAG,
-        anchorList => {
-          return this.linkmate_.runLinkmate(anchorList);
-        },
-        options
+      TAG,
+      anchorList => {
+        return this.linkmate_.runLinkmate(anchorList);
+      },
+      options
     );
   }
 
@@ -209,8 +213,10 @@ export class AmpSmartlinks extends AMP.BaseElement {
    */
   generateUUID_() {
     return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c =>
-      (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4)
-          .toString(16)
+      (
+        c ^
+        (crypto.getRandomValues(new Uint8Array(1))[0] & (15 >> (c / 4)))
+      ).toString(16)
     );
   }
 }
diff --git a/extensions/amp-smartlinks/0.1/constants.js b/extensions/amp-smartlinks/0.1/constants.js
index 350524dfd15b..b5a10c851992 100644
--- a/extensions/amp-smartlinks/0.1/constants.js
+++ b/extensions/amp-smartlinks/0.1/constants.js
@@ -17,10 +17,7 @@
 const BASE_API_URL = 'https://api.narrativ.com/api';
 /** @const @enum {string} */
 export const ENDPOINTS = {
-  PAGE_IMPRESSION_ENDPOINT:
-    `${BASE_API_URL}/v1/events/impressions/page_impression/`,
-  NRTV_CONFIG_ENDPOINT:
-    `${BASE_API_URL}/v0/publishers/.nrtv_slug./amp_config/`,
-  LINKMATE_ENDPOINT:
-    `${BASE_API_URL}/v1/publishers/.pub_id./linkmate/smart_links/`,
+  PAGE_IMPRESSION_ENDPOINT: `${BASE_API_URL}/v1/events/impressions/page_impression/`,
+  NRTV_CONFIG_ENDPOINT: `${BASE_API_URL}/v0/publishers/.nrtv_slug./amp_config/`,
+  LINKMATE_ENDPOINT: `${BASE_API_URL}/v1/publishers/.pub_id./linkmate/smart_links/`,
 };
diff --git a/extensions/amp-smartlinks/0.1/linkmate-options.js b/extensions/amp-smartlinks/0.1/linkmate-options.js
index af3cf51d1cab..3958869dbe4c 100644
--- a/extensions/amp-smartlinks/0.1/linkmate-options.js
+++ b/extensions/amp-smartlinks/0.1/linkmate-options.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Get the config values from the tag on the amp page
  * @param {!Element} element
diff --git a/extensions/amp-smartlinks/0.1/linkmate.js b/extensions/amp-smartlinks/0.1/linkmate.js
index b8d354a61837..509055cdfb91 100644
--- a/extensions/amp-smartlinks/0.1/linkmate.js
+++ b/extensions/amp-smartlinks/0.1/linkmate.js
@@ -18,11 +18,9 @@ import {deepEquals} from '../../../src/json';
 import {dict} from '../../../src/utils/object';
 
 import {ENDPOINTS} from './constants';
-import {TwoStepsResponse} from
-  '../../amp-skimlinks/0.1/link-rewriter/two-steps-response';
+import {TwoStepsResponse} from '../../amp-skimlinks/0.1/link-rewriter/two-steps-response';
 import {getData} from '../../../src/event-helper';
 
-
 export class Linkmate {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampDoc
@@ -67,8 +65,8 @@ export class Linkmate {
     // changed since last API call then map any new anchors to existing
     // API response
     let syncMappedLinks = null;
-    const anchorListChanged = this.anchorList_ &&
-      !deepEquals(this.anchorList_, anchorList);
+    const anchorListChanged =
+      this.anchorList_ && !deepEquals(this.anchorList_, anchorList);
 
     if (this.linkmateResponse_ && anchorListChanged) {
       syncMappedLinks = this.mapLinks_();
@@ -77,12 +75,11 @@ export class Linkmate {
     // If we don't have an API response or the anchor list has changed since
     // last API call then build a new payload and post to API
     if (!this.linkmateResponse_ || anchorListChanged) {
-      const asyncMappedLinks = this.postToLinkmate_(anchorList)
-          .then(res => {
-            this.linkmateResponse_ = getData(res)[0]['smart_links'];
-            this.anchorList_ = anchorList;
-            return this.mapLinks_();
-          });
+      const asyncMappedLinks = this.postToLinkmate_(anchorList).then(res => {
+        this.linkmateResponse_ = getData(res)[0]['smart_links'];
+        this.anchorList_ = anchorList;
+        return this.mapLinks_();
+      });
 
       return new TwoStepsResponse(syncMappedLinks, asyncMappedLinks);
     } else {
@@ -108,7 +105,8 @@ export class Linkmate {
     });
 
     const fetchUrl = ENDPOINTS.LINKMATE_ENDPOINT.replace(
-        '.pub_id.', this.publisherID_.toString()
+      '.pub_id.',
+      this.publisherID_.toString()
     );
     const postOptions = {
       method: 'POST',
@@ -117,8 +115,7 @@ export class Linkmate {
       body: payload,
     };
 
-    return this.xhr_.fetchJson(fetchUrl, postOptions)
-        .then(res => res.json());
+    return this.xhr_.fetchJson(fetchUrl, postOptions).then(res => res.json());
   }
 
   /**
@@ -138,14 +135,16 @@ export class Linkmate {
       if (/shop-links.co/.test(link)) {
         // Check if amp flag is there. Add if necessary. Don't add to payload.
         if (!/\?amp=true$/.test(link)) {
-          anchor[this.linkAttribute_] =
-              `${anchor[this.linkAttribute_]}?amp=true`;
+          anchor[this.linkAttribute_] = `${
+            anchor[this.linkAttribute_]
+          }?amp=true`;
         }
         return;
       }
 
       if (!/#donotlink$/.test(link)) {
-        const exclusive = this.requestExclusiveLinks_ || /#locklink$/.test(link);
+        const exclusive =
+          this.requestExclusiveLinks_ || /#locklink$/.test(link);
         const linkObj = {
           'raw_url': link,
           'exclusive_match_requested': exclusive,
@@ -180,10 +179,16 @@ export class Linkmate {
     const mappings = [];
     this.anchorList_.forEach(anchor => {
       this.linkmateResponse_.forEach(smartLink => {
-        if (anchor.getAttribute(this.linkAttribute_) === smartLink['url']
-            && smartLink['auction_id']) {
-          mappings.push({anchor, replacementUrl:
-              `https://shop-links.co/${smartLink['auction_id']}/?amp=true`});
+        if (
+          anchor.getAttribute(this.linkAttribute_) === smartLink['url'] &&
+          smartLink['auction_id']
+        ) {
+          mappings.push({
+            anchor,
+            replacementUrl: `https://shop-links.co/${
+              smartLink['auction_id']
+            }/?amp=true`,
+          });
         }
       });
     });
diff --git a/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js b/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js
index 1ef15100c64f..1996a8c3c70e 100644
--- a/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js
+++ b/extensions/amp-smartlinks/0.1/test/test-amp-smartlinks.js
@@ -17,8 +17,7 @@
 import * as DocumentReady from '../../../../src/document-ready';
 import * as LinkmateOptions from '../linkmate-options';
 import {AmpSmartlinks} from '../amp-smartlinks';
-import {LinkRewriterManager} from
-  '../../../amp-skimlinks/0.1/link-rewriter/link-rewriter-manager';
+import {LinkRewriterManager} from '../../../amp-skimlinks/0.1/link-rewriter/link-rewriter-manager';
 import {Services} from '../../../../src/services';
 
 const helpersFactory = env => {
@@ -35,212 +34,215 @@ const helpersFactory = env => {
   };
 };
 
-describes.fakeWin('amp-smartlinks',
-    {amp: {extensions: ['amp-smartlinks']}},
-    env => {
-      let ampSmartlinks, helpers, xhr;
-
-      beforeEach(() => {
-        xhr = Services.xhrFor(env.win);
-        helpers = helpersFactory(env);
-        env.sandbox
-            .stub(DocumentReady, 'whenDocumentReady')
-            .returns(Promise.reject());
-      });
-
-      afterEach(() => {
-        env.sandbox.restore();
-      });
-
-      describe('getConfigOptions', () => {
-        it('Should parse options', () => {
-          env.sandbox.spy(LinkmateOptions, 'getConfigOptions');
-
-          const smartlinkOptions = {
-            'nrtv-account-name': 'thisisnotapublisher',
-            'linkmate': '',
-            'exclusive-links': '',
-            'link-attribute': 'href',
-            'link-selector': 'a',
-          };
-          ampSmartlinks = helpers.createAmpSmartlinks(smartlinkOptions);
-          env.sandbox.stub(ampSmartlinks, 'runSmartlinks_');
-
-          return ampSmartlinks.buildCallback().then(() => {
-            expect(LinkmateOptions.getConfigOptions.calledOnce).to.be
-                .true;
-            expect(ampSmartlinks.linkmateOptions_).to.deep.equal({
-              nrtvSlug: smartlinkOptions['nrtv-account-name'],
-              linkmateEnabled: true,
-              exclusiveLinks: true,
-              linkAttribute: smartlinkOptions['link-attribute'],
-              linkSelector: smartlinkOptions['link-selector'],
-            });
+describes.fakeWin(
+  'amp-smartlinks',
+  {amp: {extensions: ['amp-smartlinks']}},
+  env => {
+    let ampSmartlinks, helpers, xhr;
+
+    beforeEach(() => {
+      xhr = Services.xhrFor(env.win);
+      helpers = helpersFactory(env);
+      env.sandbox
+        .stub(DocumentReady, 'whenDocumentReady')
+        .returns(Promise.reject());
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('getConfigOptions', () => {
+      it('Should parse options', () => {
+        env.sandbox.spy(LinkmateOptions, 'getConfigOptions');
+
+        const smartlinkOptions = {
+          'nrtv-account-name': 'thisisnotapublisher',
+          'linkmate': '',
+          'exclusive-links': '',
+          'link-attribute': 'href',
+          'link-selector': 'a',
+        };
+        ampSmartlinks = helpers.createAmpSmartlinks(smartlinkOptions);
+        env.sandbox.stub(ampSmartlinks, 'runSmartlinks_');
+
+        return ampSmartlinks.buildCallback().then(() => {
+          expect(LinkmateOptions.getConfigOptions.calledOnce).to.be.true;
+          expect(ampSmartlinks.linkmateOptions_).to.deep.equal({
+            nrtvSlug: smartlinkOptions['nrtv-account-name'],
+            linkmateEnabled: true,
+            exclusiveLinks: true,
+            linkAttribute: smartlinkOptions['link-attribute'],
+            linkSelector: smartlinkOptions['link-selector'],
           });
         });
+      });
 
-        it('Should return handle bad options', () => {
-          env.sandbox.spy(LinkmateOptions, 'getConfigOptions');
-
-          const smartlinkOptions = {
-            'nrtv-account-name': 'alwaysastring',
-            'linkmate': 1234,
-            'exclusive-links': 'monkeysatatypewriter',
-          };
-          ampSmartlinks = helpers.createAmpSmartlinks(smartlinkOptions);
-          env.sandbox.stub(ampSmartlinks, 'runSmartlinks_');
-
-          return ampSmartlinks.buildCallback().then(() => {
-            expect(LinkmateOptions.getConfigOptions.calledOnce).to.be.true;
-            expect(ampSmartlinks.linkmateOptions_).to.deep.equal({
-              nrtvSlug: 'alwaysastring',
-              linkmateEnabled: true,
-              exclusiveLinks: true,
-              linkAttribute: 'href',
-              linkSelector: 'a',
-            });
+      it('Should return handle bad options', () => {
+        env.sandbox.spy(LinkmateOptions, 'getConfigOptions');
+
+        const smartlinkOptions = {
+          'nrtv-account-name': 'alwaysastring',
+          'linkmate': 1234,
+          'exclusive-links': 'monkeysatatypewriter',
+        };
+        ampSmartlinks = helpers.createAmpSmartlinks(smartlinkOptions);
+        env.sandbox.stub(ampSmartlinks, 'runSmartlinks_');
+
+        return ampSmartlinks.buildCallback().then(() => {
+          expect(LinkmateOptions.getConfigOptions.calledOnce).to.be.true;
+          expect(ampSmartlinks.linkmateOptions_).to.deep.equal({
+            nrtvSlug: 'alwaysastring',
+            linkmateEnabled: true,
+            exclusiveLinks: true,
+            linkAttribute: 'href',
+            linkSelector: 'a',
           });
         });
       });
-
-      describe('getLinkmateOptions_', () => {
-        it('Should fetch Linkmate Options from API', () => {
-          const options = {
-            'nrtv-account-name': 'testingconfigpub',
-            'linkmate': '',
-            'exclusive-links': '',
-          };
-          ampSmartlinks = helpers.createAmpSmartlinks(options);
-
-          env.sandbox.spy(ampSmartlinks, 'getLinkmateOptions_');
-          env.sandbox.stub(xhr, 'fetchJson');
-
-          return ampSmartlinks.buildCallback().then(() => {
-            expect(ampSmartlinks.getLinkmateOptions_.calledOnce).to.be.true;
-          });
+    });
+
+    describe('getLinkmateOptions_', () => {
+      it('Should fetch Linkmate Options from API', () => {
+        const options = {
+          'nrtv-account-name': 'testingconfigpub',
+          'linkmate': '',
+          'exclusive-links': '',
+        };
+        ampSmartlinks = helpers.createAmpSmartlinks(options);
+
+        env.sandbox.spy(ampSmartlinks, 'getLinkmateOptions_');
+        env.sandbox.stub(xhr, 'fetchJson');
+
+        return ampSmartlinks.buildCallback().then(() => {
+          expect(ampSmartlinks.getLinkmateOptions_.calledOnce).to.be.true;
         });
       });
+    });
 
-      describe('runSmartlinks_', () => {
-        let fakeViewer;
+    describe('runSmartlinks_', () => {
+      let fakeViewer;
 
-        beforeEach(() => {
-          const options = {
-            'nrtv-account-name': 'thisisnotapublisher',
-            'linkmate': '',
-            'exclusive-links': '',
-          };
+      beforeEach(() => {
+        const options = {
+          'nrtv-account-name': 'thisisnotapublisher',
+          'linkmate': '',
+          'exclusive-links': '',
+        };
 
-          ampSmartlinks = helpers.createAmpSmartlinks(options);
-          fakeViewer = Services.viewerForDoc(env.ampdoc);
+        ampSmartlinks = helpers.createAmpSmartlinks(options);
+        fakeViewer = Services.viewerForDoc(env.ampdoc);
 
-          env.sandbox
-              .stub(ampSmartlinks, 'getLinkmateOptions_')
-              .returns(Promise.resolve({'publisher_id': 999}));
-          env.sandbox.stub(xhr, 'fetchJson');
-        });
+        env.sandbox
+          .stub(ampSmartlinks, 'getLinkmateOptions_')
+          .returns(Promise.resolve({'publisher_id': 999}));
+        env.sandbox.stub(xhr, 'fetchJson');
+      });
 
-        it('Should call postPageImpression_', () => {
-          env.sandbox.spy(ampSmartlinks, 'postPageImpression_');
+      it('Should call postPageImpression_', () => {
+        env.sandbox.spy(ampSmartlinks, 'postPageImpression_');
 
-          return ampSmartlinks.buildCallback().then(() => {
-            fakeViewer.whenFirstVisible().then(() => {
-              expect(ampSmartlinks.postPageImpression_.calledOnce).to.be.true;
-            });
+        return ampSmartlinks.buildCallback().then(() => {
+          fakeViewer.whenFirstVisible().then(() => {
+            expect(ampSmartlinks.postPageImpression_.calledOnce).to.be.true;
           });
         });
+      });
 
-        it('Should call initLinkRewriter_', () => {
-          env.sandbox.spy(ampSmartlinks, 'initLinkRewriter_');
+      it('Should call initLinkRewriter_', () => {
+        env.sandbox.spy(ampSmartlinks, 'initLinkRewriter_');
 
-          return ampSmartlinks.buildCallback().then(() => {
-            fakeViewer.whenFirstVisible().then(() => {
-              expect(ampSmartlinks.initLinkRewriter_.calledOnce).to.be.true;
-            });
+        return ampSmartlinks.buildCallback().then(() => {
+          fakeViewer.whenFirstVisible().then(() => {
+            expect(ampSmartlinks.initLinkRewriter_.calledOnce).to.be.true;
           });
         });
       });
+    });
 
-      describe('buildPageImpressionPayload_', () => {
-        beforeEach(() => {
-          const options = {
-            'nrtv-account-name': 'thisisnotapublisher',
-            'linkmate': '',
-            'exclusive-links': '',
-          };
+    describe('buildPageImpressionPayload_', () => {
+      beforeEach(() => {
+        const options = {
+          'nrtv-account-name': 'thisisnotapublisher',
+          'linkmate': '',
+          'exclusive-links': '',
+        };
 
-          ampSmartlinks = helpers.createAmpSmartlinks(options);
-        });
+        ampSmartlinks = helpers.createAmpSmartlinks(options);
+      });
 
-        it('Should build body correctly', () => {
-          env.sandbox.spy(ampSmartlinks, 'buildPageImpressionPayload_');
-          env.sandbox.stub(ampSmartlinks, 'postPageImpression_');
-          env.sandbox
-              .stub(ampSmartlinks, 'generateUUID_')
-              .returns('acbacc4b-e171-4869-b32a-921f48659624');
-          env.sandbox
-              .stub(env.ampdoc, 'getUrl')
-              .returns('http://fakewebsite.example/');
-
-          const mockPub = 999;
-          const mockUA = 'thisisnotauseragent';
-          const expectedPayload = {
-            'events': [{'is_amp': true}],
-            'organization_id': mockPub,
-            'organization_type': 'publisher',
-            'user': {
-              'page_session_uuid': 'acbacc4b-e171-4869-b32a-921f48659624',
-              'source_url': 'http://fakewebsite.example/',
-              'previous_url': '',
-              'user_agent': mockUA,
-            },
-          };
-
-          return ampSmartlinks.buildCallback().then(() => {
-            ampSmartlinks.linkmateOptions_.publisherID = mockPub;
-            ampSmartlinks.ampDoc_.win.navigator.userAgent = mockUA;
-
-            const payload = ampSmartlinks.buildPageImpressionPayload_();
-            expect(payload).to.deep.equals(expectedPayload);
-          });
+      it('Should build body correctly', () => {
+        env.sandbox.spy(ampSmartlinks, 'buildPageImpressionPayload_');
+        env.sandbox.stub(ampSmartlinks, 'postPageImpression_');
+        env.sandbox
+          .stub(ampSmartlinks, 'generateUUID_')
+          .returns('acbacc4b-e171-4869-b32a-921f48659624');
+        env.sandbox
+          .stub(env.ampdoc, 'getUrl')
+          .returns('http://fakewebsite.example/');
+
+        const mockPub = 999;
+        const mockUA = 'thisisnotauseragent';
+        const expectedPayload = {
+          'events': [{'is_amp': true}],
+          'organization_id': mockPub,
+          'organization_type': 'publisher',
+          'user': {
+            'page_session_uuid': 'acbacc4b-e171-4869-b32a-921f48659624',
+            'source_url': 'http://fakewebsite.example/',
+            'previous_url': '',
+            'user_agent': mockUA,
+          },
+        };
+
+        return ampSmartlinks.buildCallback().then(() => {
+          ampSmartlinks.linkmateOptions_.publisherID = mockPub;
+          ampSmartlinks.ampDoc_.win.navigator.userAgent = mockUA;
+
+          const payload = ampSmartlinks.buildPageImpressionPayload_();
+          expect(payload).to.deep.equals(expectedPayload);
         });
       });
+    });
 
-      describe('initSmartlinkRewriter_', () => {
-        beforeEach(() => {
-          const options = {
-            'nrtv-account-name': 'thisisnotapublisher',
-            'linkmate': '',
-            'exclusive-links': '',
-          };
-
-          ampSmartlinks = helpers.createAmpSmartlinks(options);
-          env.sandbox
-              .stub(ampSmartlinks, 'getLinkmateOptions_')
-              .returns(Promise.resolve({'publisher_id': 999}));
-        });
+    describe('initSmartlinkRewriter_', () => {
+      beforeEach(() => {
+        const options = {
+          'nrtv-account-name': 'thisisnotapublisher',
+          'linkmate': '',
+          'exclusive-links': '',
+        };
 
-        it('Should register link rewriter', () => {
-          ampSmartlinks.linkRewriterService_ = new LinkRewriterManager(
-              env.ampdoc
-          );
-          ampSmartlinks.linkmateOptions_ = {
-            linkSelector: 'a',
-          };
-          env.sandbox.spy(ampSmartlinks.linkRewriterService_,
-              'registerLinkRewriter');
-
-          ampSmartlinks.initLinkRewriter_();
-          const args = ampSmartlinks.linkRewriterService_.registerLinkRewriter
-              .args[0];
-
-          expect(ampSmartlinks.linkRewriterService_.registerLinkRewriter
-              .calledOnce).to.be.true;
-          // This is a constant value in amp-smartlinks.js
-          expect(args[0]).to.equal('amp-smartlinks');
-          expect(args[1]).to.be.a('function');
-          expect(args[2].linkSelector).to.equal('a');
-        });
+        ampSmartlinks = helpers.createAmpSmartlinks(options);
+        env.sandbox
+          .stub(ampSmartlinks, 'getLinkmateOptions_')
+          .returns(Promise.resolve({'publisher_id': 999}));
+      });
+
+      it('Should register link rewriter', () => {
+        ampSmartlinks.linkRewriterService_ = new LinkRewriterManager(
+          env.ampdoc
+        );
+        ampSmartlinks.linkmateOptions_ = {
+          linkSelector: 'a',
+        };
+        env.sandbox.spy(
+          ampSmartlinks.linkRewriterService_,
+          'registerLinkRewriter'
+        );
+
+        ampSmartlinks.initLinkRewriter_();
+        const args =
+          ampSmartlinks.linkRewriterService_.registerLinkRewriter.args[0];
+
+        expect(
+          ampSmartlinks.linkRewriterService_.registerLinkRewriter.calledOnce
+        ).to.be.true;
+        // This is a constant value in amp-smartlinks.js
+        expect(args[0]).to.equal('amp-smartlinks');
+        expect(args[1]).to.be.a('function');
+        expect(args[2].linkSelector).to.equal('a');
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-smartlinks/0.1/test/test-linkmate.js b/extensions/amp-smartlinks/0.1/test/test-linkmate.js
index a565b786f87d..f1dac259683c 100644
--- a/extensions/amp-smartlinks/0.1/test/test-linkmate.js
+++ b/extensions/amp-smartlinks/0.1/test/test-linkmate.js
@@ -18,8 +18,7 @@ import * as DocumentReady from '../../../../src/document-ready';
 import {AmpSmartlinks} from '../amp-smartlinks';
 import {Linkmate} from '../linkmate';
 import {Services} from '../../../../src/services';
-import {TwoStepsResponse} from
-  '../../../amp-skimlinks/0.1/link-rewriter/two-steps-response';
+import {TwoStepsResponse} from '../../../amp-skimlinks/0.1/link-rewriter/two-steps-response';
 
 const helpersFactory = env => {
   const {win} = env;
@@ -44,469 +43,518 @@ const helpersFactory = env => {
   };
 };
 
-describes.fakeWin('amp-smartlinks',
-    {amp: {extensions: ['amp-smartlinks']}},
-    env => {
-      let helpers, xhr, linkmate;
+describes.fakeWin(
+  'amp-smartlinks',
+  {amp: {extensions: ['amp-smartlinks']}},
+  env => {
+    let helpers, xhr, linkmate;
+
+    beforeEach(() => {
+      xhr = Services.xhrFor(env.win);
+      helpers = helpersFactory(env);
+    });
+
+    beforeEach(() => {
+      env.sandbox
+        .stub(DocumentReady, 'whenDocumentReady')
+        .returns(Promise.reject());
+    });
+
+    afterEach(() => {
+      env.sandbox.restore();
+    });
+
+    describe('runLinkmate', () => {
+      let anchorList, mockFetch, response;
 
       beforeEach(() => {
-        xhr = Services.xhrFor(env.win);
-        helpers = helpersFactory(env);
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'href',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+        anchorList = [
+          {attributeName: 'href', link: 'http://fakelink.example'},
+          {attributeName: 'href', link: 'http://fakelink2.example'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
       });
 
       beforeEach(() => {
-        env.sandbox
-            .stub(DocumentReady, 'whenDocumentReady')
-            .returns(Promise.reject());
+        mockFetch = env.sandbox.mock(xhr);
+
+        response = {
+          json: () => Promise.resolve({}),
+        };
       });
 
       afterEach(() => {
-        env.sandbox.restore();
+        mockFetch.verify();
+      });
+
+      it('Should fire an API call if none exists', () => {
+        env.sandbox.spy(linkmate, 'postToLinkmate_');
+        env.sandbox.stub(linkmate, 'mapLinks_');
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+
+        const linkmateResponse = linkmate.runLinkmate(anchorList);
+
+        expect(linkmate.postToLinkmate_.calledOnce).to.be.true;
+        expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
+      });
+
+      it('Should fire an API call if anchorList changed', () => {
+        env.sandbox.spy(linkmate, 'postToLinkmate_');
+        env.sandbox.stub(linkmate, 'mapLinks_');
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        const linkmateResponse = linkmate.runLinkmate(anchorList);
+
+        linkmate.anchorList_ = anchorList;
+        const newAnchorList = [
+          {attributeName: 'href', link: 'http://totallynewlink.example'},
+          {attributeName: 'href', link: 'http://fakelink2.example'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        const linkmateResponse2 = linkmate.runLinkmate(newAnchorList);
+
+        expect(linkmate.postToLinkmate_.calledTwice).to.be.true;
+        expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
+        expect(linkmateResponse2).to.be.instanceof(TwoStepsResponse);
       });
 
-      describe('runLinkmate', () => {
-        let anchorList, mockFetch, response;
-
-        beforeEach(() => {
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'href',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-          anchorList = [
-            {attributeName: 'href', link: 'http://fakelink.example'},
-            {attributeName: 'href', link: 'http://fakelink2.example'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-        });
-
-        beforeEach(() => {
-          mockFetch = env.sandbox.mock(xhr);
-
-          response = {
-            json: () => Promise.resolve({}),
-          };
-        });
-
-        afterEach(() => {
-          mockFetch.verify();
-        });
-
-        it('Should fire an API call if none exists', () => {
-          env.sandbox.spy(linkmate, 'postToLinkmate_');
-          env.sandbox.stub(linkmate, 'mapLinks_');
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-
-          const linkmateResponse = linkmate.runLinkmate(anchorList);
-
-          expect(linkmate.postToLinkmate_.calledOnce).to.be.true;
-          expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
-        });
-
-        it('Should fire an API call if anchorList changed', () => {
-          env.sandbox.spy(linkmate, 'postToLinkmate_');
-          env.sandbox.stub(linkmate, 'mapLinks_');
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          const linkmateResponse = linkmate.runLinkmate(anchorList);
-
-          linkmate.anchorList_ = anchorList;
-          const newAnchorList = [
-            {attributeName: 'href', link: 'http://totallynewlink.example'},
-            {attributeName: 'href', link: 'http://fakelink2.example'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          const linkmateResponse2 = linkmate.runLinkmate(newAnchorList);
-
-          expect(linkmate.postToLinkmate_.calledTwice).to.be.true;
-          expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
-          expect(linkmateResponse2).to.be.instanceof(TwoStepsResponse);
-        });
-
-        it('Should map new anchors', () => {
-          env.sandbox.spy(linkmate, 'postToLinkmate_');
-          env.sandbox.spy(linkmate, 'mapLinks_');
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          const linkmateResponse = linkmate.runLinkmate(anchorList);
-
-          linkmate.anchorList_ = anchorList;
-          linkmate.linkmateResponse_ = [{a: 'b'}];
-          const newAnchorList = [
-            {attributeName: 'href', link: 'http://totallynewlink.example'},
-            {attributeName: 'href', link: 'http://fakelink2.example'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          const linkmateResponse2 = linkmate.runLinkmate(newAnchorList);
-
-          expect(linkmate.postToLinkmate_.calledTwice).to.be.true;
-          expect(linkmate.mapLinks_.calledOnce).to.be.true;
-          expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
-          expect(linkmateResponse2).to.be.instanceof(TwoStepsResponse);
-        });
-
-        it('Should do nothing if no new anchors', () => {
-          env.sandbox.spy(linkmate, 'postToLinkmate_');
-          env.sandbox.stub(linkmate, 'mapLinks_');
-
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          const linkmateResponse = linkmate.runLinkmate(anchorList);
-
-          linkmate.anchorList_ = anchorList;
-          linkmate.linkmateResponse_ = [{a: 'b'}];
-          const syncResponse = linkmate.runLinkmate(anchorList);
-
-          expect(linkmate.postToLinkmate_.calledOnce).to.be.true;
-          expect(linkmate.postToLinkmate_.calledTwice).to.be.false;
-          expect(syncResponse).to.not.be.null;
-          expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
-        });
+      it('Should map new anchors', () => {
+        env.sandbox.spy(linkmate, 'postToLinkmate_');
+        env.sandbox.spy(linkmate, 'mapLinks_');
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        const linkmateResponse = linkmate.runLinkmate(anchorList);
+
+        linkmate.anchorList_ = anchorList;
+        linkmate.linkmateResponse_ = [{a: 'b'}];
+        const newAnchorList = [
+          {attributeName: 'href', link: 'http://totallynewlink.example'},
+          {attributeName: 'href', link: 'http://fakelink2.example'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        const linkmateResponse2 = linkmate.runLinkmate(newAnchorList);
+
+        expect(linkmate.postToLinkmate_.calledTwice).to.be.true;
+        expect(linkmate.mapLinks_.calledOnce).to.be.true;
+        expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
+        expect(linkmateResponse2).to.be.instanceof(TwoStepsResponse);
+      });
+
+      it('Should do nothing if no new anchors', () => {
+        env.sandbox.spy(linkmate, 'postToLinkmate_');
+        env.sandbox.stub(linkmate, 'mapLinks_');
+
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        const linkmateResponse = linkmate.runLinkmate(anchorList);
+
+        linkmate.anchorList_ = anchorList;
+        linkmate.linkmateResponse_ = [{a: 'b'}];
+        const syncResponse = linkmate.runLinkmate(anchorList);
+
+        expect(linkmate.postToLinkmate_.calledOnce).to.be.true;
+        expect(linkmate.postToLinkmate_.calledTwice).to.be.false;
+        expect(syncResponse).to.not.be.null;
+        expect(linkmateResponse).to.be.instanceof(TwoStepsResponse);
+      });
+    });
+
+    describe('postToLinkmate_', () => {
+      let mockFetch;
+
+      beforeEach(() => {
+        mockFetch = env.sandbox.mock(xhr);
+      });
+
+      afterEach(() => {
+        mockFetch.verify();
       });
 
-      describe('postToLinkmate_', () => {
-        let mockFetch;
-
-        beforeEach(() => {
-          mockFetch = env.sandbox.mock(xhr);
-        });
-
-        afterEach(() => {
-          mockFetch.verify();
-        });
-
-        it('Should build payload', () => {
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'href',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-          const response = {
-            json: () => Promise.resolve({}),
-          };
-
-          env.sandbox.spy(linkmate, 'postToLinkmate_');
-          env.sandbox
-              .stub(linkmate, 'buildLinksPayload_')
-              .returns({});
-          env.sandbox
-              .stub(linkmate, 'getEditInfo_')
-              .returns({});
-          mockFetch
-              .expects('fetchJson')
-              .once()
-              .returns(Promise.resolve(response));
-          linkmate.postToLinkmate_();
-
-          expect(linkmate.buildLinksPayload_.calledOnce).to.be.true;
-          expect(linkmate.getEditInfo_.calledOnce).to.be.true;
-        });
+      it('Should build payload', () => {
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'href',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+        const response = {
+          json: () => Promise.resolve({}),
+        };
+
+        env.sandbox.spy(linkmate, 'postToLinkmate_');
+        env.sandbox.stub(linkmate, 'buildLinksPayload_').returns({});
+        env.sandbox.stub(linkmate, 'getEditInfo_').returns({});
+        mockFetch
+          .expects('fetchJson')
+          .once()
+          .returns(Promise.resolve(response));
+        linkmate.postToLinkmate_();
+
+        expect(linkmate.buildLinksPayload_.calledOnce).to.be.true;
+        expect(linkmate.getEditInfo_.calledOnce).to.be.true;
       });
+    });
 
-      describe('buildLinksPayload_', () => {
-        let anchorList;
-
-        beforeEach(() => {
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'href',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-
-          anchorList = [
-            {attributeName: 'href', link: 'http://fakelink.example/'},
-            {attributeName: 'href', link: 'http://fakelink2.example/'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-        });
-
-        it('Should build payload from anchorList', () => {
-          env.sandbox.spy(linkmate, 'buildLinksPayload_');
-
-          const expectedPayload = [{
+    describe('buildLinksPayload_', () => {
+      let anchorList;
+
+      beforeEach(() => {
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'href',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+
+        anchorList = [
+          {attributeName: 'href', link: 'http://fakelink.example/'},
+          {attributeName: 'href', link: 'http://fakelink2.example/'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
+      });
+
+      it('Should build payload from anchorList', () => {
+        env.sandbox.spy(linkmate, 'buildLinksPayload_');
+
+        const expectedPayload = [
+          {
             'raw_url': 'http://fakelink.example/',
             'exclusive_match_requested': false,
-          }, {
+          },
+          {
             'raw_url': 'http://fakelink2.example/',
             'exclusive_match_requested': false,
-          }, {
+          },
+          {
             'raw_url': 'https://examplelocklink.example/#locklink',
             'exclusive_match_requested': true,
-          }];
+          },
+        ];
 
-          const linkPayload = linkmate.buildLinksPayload_(anchorList);
+        const linkPayload = linkmate.buildLinksPayload_(anchorList);
 
-          expect(linkPayload).to.deep.equal(expectedPayload);
-        });
+        expect(linkPayload).to.deep.equal(expectedPayload);
+      });
 
-        it('Should build all exclusive links if requested', () => {
-          env.sandbox.spy(linkmate, 'buildLinksPayload_');
+      it('Should build all exclusive links if requested', () => {
+        env.sandbox.spy(linkmate, 'buildLinksPayload_');
 
-          linkmate.requestExclusiveLinks_ = true;
-          const expectedPayload = [{
+        linkmate.requestExclusiveLinks_ = true;
+        const expectedPayload = [
+          {
             'raw_url': 'http://fakelink.example/',
             'exclusive_match_requested': true,
-          }, {
+          },
+          {
             'raw_url': 'http://fakelink2.example/',
             'exclusive_match_requested': true,
-          }, {
+          },
+          {
             'raw_url': 'https://examplelocklink.example/#locklink',
             'exclusive_match_requested': true,
-          }];
+          },
+        ];
 
-          const linkPayload = linkmate.buildLinksPayload_(anchorList);
+        const linkPayload = linkmate.buildLinksPayload_(anchorList);
 
-          expect(linkPayload).to.deep.equal(expectedPayload);
-        });
+        expect(linkPayload).to.deep.equal(expectedPayload);
+      });
 
-        it('Should skip existing shop-links', () => {
-          env.sandbox.spy(linkmate, 'buildLinksPayload_');
+      it('Should skip existing shop-links', () => {
+        env.sandbox.spy(linkmate, 'buildLinksPayload_');
 
-          anchorList = [
-            {attributeName: 'href', link: 'http://fakelink.example/'},
-            {attributeName: 'href', link: 'http://shop-links.co/999'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
+        anchorList = [
+          {attributeName: 'href', link: 'http://fakelink.example/'},
+          {attributeName: 'href', link: 'http://shop-links.co/999'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
 
-          const expectedPayload = [{
+        const expectedPayload = [
+          {
             'raw_url': 'http://fakelink.example/',
             'exclusive_match_requested': false,
-          }, {
+          },
+          {
             'raw_url': 'https://examplelocklink.example/#locklink',
             'exclusive_match_requested': true,
-          }];
-
-          const linkPayload = linkmate.buildLinksPayload_(anchorList);
-
-          expect(linkPayload).to.deep.equal(expectedPayload);
-        });
+          },
+        ];
 
-        it('Should add amp flag to existing shop-links', () => {
-          env.sandbox.spy(linkmate, 'buildLinksPayload_');
+        const linkPayload = linkmate.buildLinksPayload_(anchorList);
 
-          anchorList = [
-            {attributeName: 'href', link: 'http://shop-links.co/999'},
-          ].map(helpers.createAnchor);
-
-          const expectedAnchor = 'http://shop-links.co/999?amp=true';
+        expect(linkPayload).to.deep.equal(expectedPayload);
+      });
 
-          const linkPayload = linkmate.buildLinksPayload_(anchorList);
+      it('Should add amp flag to existing shop-links', () => {
+        env.sandbox.spy(linkmate, 'buildLinksPayload_');
 
-          expect(linkPayload).to.deep.equal([]);
-          expect(anchorList[0].href).to.equal(expectedAnchor);
-        });
+        anchorList = [
+          {attributeName: 'href', link: 'http://shop-links.co/999'},
+        ].map(helpers.createAnchor);
 
-        it('Should build payload from anchorList with custom selector', () => {
-          env.sandbox.spy(linkmate, 'buildLinksPayload_');
+        const expectedAnchor = 'http://shop-links.co/999?amp=true';
 
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkSelector: 'a[data-outbound-vars]',
-            linkAttribute: 'data-outbound-vars',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
+        const linkPayload = linkmate.buildLinksPayload_(anchorList);
 
-          anchorList = [
-            {attributeName: 'data-outbound-vars', link: 'http://fakelink.example/'},
-            {attributeName: 'data-outbound-vars', link: 'http://fakelink2.example/'},
-            {attributeName: 'data-outbound-vars', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
+        expect(linkPayload).to.deep.equal([]);
+        expect(anchorList[0].href).to.equal(expectedAnchor);
+      });
 
-          const expectedPayload = [{
+      it('Should build payload from anchorList with custom selector', () => {
+        env.sandbox.spy(linkmate, 'buildLinksPayload_');
+
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkSelector: 'a[data-outbound-vars]',
+          linkAttribute: 'data-outbound-vars',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+
+        anchorList = [
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'http://fakelink.example/',
+          },
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'http://fakelink2.example/',
+          },
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
+
+        const expectedPayload = [
+          {
             'raw_url': 'http://fakelink.example/',
             'exclusive_match_requested': false,
-          }, {
+          },
+          {
             'raw_url': 'http://fakelink2.example/',
             'exclusive_match_requested': false,
-          }, {
+          },
+          {
             'raw_url': 'https://examplelocklink.example/#locklink',
             'exclusive_match_requested': true,
-          }];
+          },
+        ];
 
-          const linkPayload = linkmate.buildLinksPayload_(anchorList);
+        const linkPayload = linkmate.buildLinksPayload_(anchorList);
 
-          expect(linkPayload).to.deep.equal(expectedPayload);
-        });
+        expect(linkPayload).to.deep.equal(expectedPayload);
       });
+    });
+
+    describe('getEditInfo_', () => {
+      it('Should build edit info payload', () => {
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'href',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+        const envRoot = env.ampdoc.getRootNode();
+        envRoot.title = 'Fake Website Title';
 
-      describe('getEditInfo_', () => {
-        it('Should build edit info payload', () => {
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'href',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-          const envRoot = env.ampdoc.getRootNode();
-          envRoot.title = 'Fake Website Title';
-
-          env.sandbox
-              .stub(env.ampdoc, 'getUrl')
-              .returns('http://fakewebsite.example/');
-          env.sandbox.spy(linkmate, 'getEditInfo_');
-
-          const expectedPayload = {
-            'name': 'Fake Website Title',
-            'url': 'http://fakewebsite.example/',
-          };
-
-          const editPayload = linkmate.getEditInfo_();
-
-          expect(editPayload).to.deep.equal(expectedPayload);
-        });
+        env.sandbox
+          .stub(env.ampdoc, 'getUrl')
+          .returns('http://fakewebsite.example/');
+        env.sandbox.spy(linkmate, 'getEditInfo_');
+
+        const expectedPayload = {
+          'name': 'Fake Website Title',
+          'url': 'http://fakewebsite.example/',
+        };
+
+        const editPayload = linkmate.getEditInfo_();
+
+        expect(editPayload).to.deep.equal(expectedPayload);
+      });
+    });
+
+    describe('mapLinks_', () => {
+      let anchorList;
+
+      beforeEach(() => {
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'href',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+
+        anchorList = [
+          {attributeName: 'href', link: 'http://fakelink.example/'},
+          {attributeName: 'href', link: 'http://fakelink2.example/'},
+          {attributeName: 'href', link: 'http://fakelink2.example/'},
+          {
+            attributeName: 'href',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
       });
 
-      describe('mapLinks_', () => {
-        let anchorList;
-
-        beforeEach(() => {
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'href',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-
-          anchorList = [
-            {attributeName: 'href', link: 'http://fakelink.example/'},
-            {attributeName: 'href', link: 'http://fakelink2.example/'},
-            {attributeName: 'href', link: 'http://fakelink2.example/'},
-            {attributeName: 'href', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-        });
-
-        it('Should map API response to anchorList', () => {
-          env.sandbox.spy(linkmate, 'mapLinks_');
-          const linkmateResponse = [{
+      it('Should map API response to anchorList', () => {
+        env.sandbox.spy(linkmate, 'mapLinks_');
+        const linkmateResponse = [
+          {
             'auction_id': '1661245605416735203',
             'exclusive_match_requested': false,
             'pub_id': 999,
             'url': 'http://fakelink.example/',
-          }, {
+          },
+          {
             'auction_id': '1667546956215651271',
             'exclusive_match_requested': false,
             'pub_id': 999,
             'url': 'http://fakelink2.example/',
-          }];
-          linkmate.anchorList_ = anchorList;
-          linkmate.linkmateResponse_ = linkmateResponse;
+          },
+        ];
+        linkmate.anchorList_ = anchorList;
+        linkmate.linkmateResponse_ = linkmateResponse;
 
-          const expectedMapping = [{
+        const expectedMapping = [
+          {
             anchor: anchorList[0],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[0]['auction_id']}/?amp=true`,
-          }, {
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[0]['auction_id']
+            }/?amp=true`,
+          },
+          {
             anchor: anchorList[1],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[1]['auction_id']}/?amp=true`,
-          }, {
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[1]['auction_id']
+            }/?amp=true`,
+          },
+          {
             anchor: anchorList[2],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[1]['auction_id']}/?amp=true`,
-          }];
-
-          const actualMapping = linkmate.mapLinks_();
-
-          expect(actualMapping).to.deep.equal(expectedMapping);
-        });
-
-        it('Should map API response to anchorList with attribute', () => {
-          env.sandbox.spy(linkmate, 'mapLinks_');
-
-          const linkmateOptions = {
-            exclusiveLinks: false,
-            publisherID: 999,
-            linkAttribute: 'data-outbound-vars',
-          };
-          linkmate = new Linkmate(
-              env.ampdoc,
-              xhr,
-              linkmateOptions,
-          );
-
-          anchorList = [
-            {attributeName: 'data-outbound-vars', link: 'http://fakelink.example/'},
-            {attributeName: 'data-outbound-vars', link: 'http://fakelink2.example/'},
-            {attributeName: 'data-outbound-vars', link: 'http://fakelink2.example/'},
-            {attributeName: 'data-outbound-vars', link: 'https://examplelocklink.example/#locklink'},
-          ].map(helpers.createAnchor);
-
-          const linkmateResponse = [{
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[1]['auction_id']
+            }/?amp=true`,
+          },
+        ];
+
+        const actualMapping = linkmate.mapLinks_();
+
+        expect(actualMapping).to.deep.equal(expectedMapping);
+      });
+
+      it('Should map API response to anchorList with attribute', () => {
+        env.sandbox.spy(linkmate, 'mapLinks_');
+
+        const linkmateOptions = {
+          exclusiveLinks: false,
+          publisherID: 999,
+          linkAttribute: 'data-outbound-vars',
+        };
+        linkmate = new Linkmate(env.ampdoc, xhr, linkmateOptions);
+
+        anchorList = [
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'http://fakelink.example/',
+          },
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'http://fakelink2.example/',
+          },
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'http://fakelink2.example/',
+          },
+          {
+            attributeName: 'data-outbound-vars',
+            link: 'https://examplelocklink.example/#locklink',
+          },
+        ].map(helpers.createAnchor);
+
+        const linkmateResponse = [
+          {
             'auction_id': '1661245605416735203',
             'exclusive_match_requested': false,
             'pub_id': 999,
             'url': 'http://fakelink.example/',
-          }, {
+          },
+          {
             'auction_id': '1667546956215651271',
             'exclusive_match_requested': false,
             'pub_id': 999,
             'url': 'http://fakelink2.example/',
-          }];
-          linkmate.anchorList_ = anchorList;
-          linkmate.linkmateResponse_ = linkmateResponse;
+          },
+        ];
+        linkmate.anchorList_ = anchorList;
+        linkmate.linkmateResponse_ = linkmateResponse;
 
-          const expectedMapping = [{
+        const expectedMapping = [
+          {
             anchor: anchorList[0],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[0]['auction_id']}/?amp=true`,
-          }, {
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[0]['auction_id']
+            }/?amp=true`,
+          },
+          {
             anchor: anchorList[1],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[1]['auction_id']}/?amp=true`,
-          }, {
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[1]['auction_id']
+            }/?amp=true`,
+          },
+          {
             anchor: anchorList[2],
-            replacementUrl: `https://shop-links.co/${linkmateResponse[1]['auction_id']}/?amp=true`,
-          }];
+            replacementUrl: `https://shop-links.co/${
+              linkmateResponse[1]['auction_id']
+            }/?amp=true`,
+          },
+        ];
 
-          const actualMapping = linkmate.mapLinks_();
+        const actualMapping = linkmate.mapLinks_();
 
-          expect(actualMapping).to.deep.equal(expectedMapping);
-        });
+        expect(actualMapping).to.deep.equal(expectedMapping);
       });
-    }
+    });
+  }
 );
diff --git a/extensions/amp-social-share/0.1/amp-social-share.js b/extensions/amp-social-share/0.1/amp-social-share.js
index 5c1e476589ff..58c138aba8b8 100644
--- a/extensions/amp-social-share/0.1/amp-social-share.js
+++ b/extensions/amp-social-share/0.1/amp-social-share.js
@@ -24,9 +24,7 @@ import {getDataParamsFromAttributes, openWindowDialog} from '../../../src/dom';
 import {getSocialConfig} from './amp-social-share-config';
 import {toggle} from '../../../src/style';
 
-
 class AmpSocialShare extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -57,11 +55,16 @@ class AmpSocialShare extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     const {element} = this;
-    const typeAttr = userAssert(element.getAttribute('type'),
-        'The type attribute is required. %s', element);
-    userAssert(!/\s/.test(typeAttr),
-        'Space characters are not allowed in type attribute value. %s',
-        element);
+    const typeAttr = userAssert(
+      element.getAttribute('type'),
+      'The type attribute is required. %s',
+      element
+    );
+    userAssert(
+      !/\s/.test(typeAttr),
+      'Space characters are not allowed in type attribute value. %s',
+      element
+    );
 
     this.platform_ = Services.platformFor(this.win);
     this.viewer_ = Services.viewerForDoc(element);
@@ -74,9 +77,11 @@ class AmpSocialShare extends AMP.BaseElement {
       }
     } else {
       // Hide/ignore non-system component if system share wants to be unique
-      const systemOnly = this.systemShareSupported_() &&
+      const systemOnly =
+        this.systemShareSupported_() &&
         !!this.win.document.querySelectorAll(
-            'amp-social-share[type=system][data-mode=replace]').length;
+          'amp-social-share[type=system][data-mode=replace]'
+        ).length;
       if (systemOnly) {
         toggle(element, false);
         return;
@@ -84,14 +89,21 @@ class AmpSocialShare extends AMP.BaseElement {
     }
     const typeConfig = getSocialConfig(typeAttr) || dict();
     this.shareEndpoint_ = userAssert(
-        element.getAttribute('data-share-endpoint') ||
+      element.getAttribute('data-share-endpoint') ||
         typeConfig['shareEndpoint'],
-        'The data-share-endpoint attribute is required. %s', element);
-    Object.assign(this.params_, typeConfig['defaultParams'],
-        getDataParamsFromAttributes(element));
+      'The data-share-endpoint attribute is required. %s',
+      element
+    );
+    Object.assign(
+      this.params_,
+      typeConfig['defaultParams'],
+      getDataParamsFromAttributes(element)
+    );
 
     const hrefWithVars = addParamsToUrl(
-        dev().assertString(this.shareEndpoint_), this.params_);
+      dev().assertString(this.shareEndpoint_),
+      this.params_
+    );
     const urlReplacements = Services.urlReplacementsForDoc(this.element);
     const bindingVars = typeConfig['bindings'];
     const bindings = {};
@@ -109,9 +121,12 @@ class AmpSocialShare extends AMP.BaseElement {
       const isMailTo = protocol === 'mailto:';
       const isSms = protocol === 'sms:';
       const isIosSafari = this.platform_.isIos() && this.platform_.isSafari();
-      this.target_ = (isIosSafari && (isMailTo || isSms))
-        ? '_top' : (this.element.hasAttribute('data-target') ?
-          this.element.getAttribute('data-target') : '_blank');
+      this.target_ =
+        isIosSafari && (isMailTo || isSms)
+          ? '_top'
+          : this.element.hasAttribute('data-target')
+          ? this.element.getAttribute('data-target')
+          : '_blank';
       if (isSms) {
         // http://stackoverflow.com/a/19126326
         // This code path seems to be stable for both iOS and Android.
@@ -155,8 +170,7 @@ class AmpSocialShare extends AMP.BaseElement {
     const href = dev().assertString(this.href_);
     const target = dev().assertString(this.target_);
     if (this.shareEndpoint_ === 'navigator-share:') {
-      devAssert(navigator.share !== undefined,
-          'navigator.share disappeared.');
+      devAssert(navigator.share !== undefined, 'navigator.share disappeared.');
       // navigator.share() fails 'gulp check-types' validation on Travis
       navigator['share'](parseQueryString(href.substr(href.indexOf('?'))));
     } else {
@@ -169,10 +183,10 @@ class AmpSocialShare extends AMP.BaseElement {
   systemShareSupported_() {
     // Chrome exports navigator.share in WebView but does not implement it.
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=765923
-    const isChromeWebview = this.viewer_.isWebviewEmbedded() &&
-        this.platform_.isChrome();
+    const isChromeWebview =
+      this.viewer_.isWebviewEmbedded() && this.platform_.isChrome();
 
-    return ('share' in navigator) && !isChromeWebview;
+    return 'share' in navigator && !isChromeWebview;
   }
 }
 
diff --git a/extensions/amp-social-share/0.1/test/test-amp-social-share.js b/extensions/amp-social-share/0.1/test/test-amp-social-share.js
index 4d542566df23..835c3709bac2 100644
--- a/extensions/amp-social-share/0.1/test/test-amp-social-share.js
+++ b/extensions/amp-social-share/0.1/test/test-amp-social-share.js
@@ -22,268 +22,297 @@ const STRINGS = {
   'text': 'Hello world',
   'url': 'https://example.com/',
   'attribution': 'AMPhtml',
-  'text-too-long': 'Hello world, Hello world, Hello world, Hello world, Hello' +
+  'text-too-long':
+    'Hello world, Hello world, Hello world, Hello world, Hello' +
     'world, Hello world, Hello world, Hello world, Hello world, Hello world, ' +
     'Hello world',
 };
 
-
-describes.realWin('amp-social-share', {
-  amp: {
-    extensions: ['amp-social-share'],
-    canonicalUrl: 'https://canonicalexample.com/',
+describes.realWin(
+  'amp-social-share',
+  {
+    amp: {
+      extensions: ['amp-social-share'],
+      canonicalUrl: 'https://canonicalexample.com/',
+    },
   },
-}, env => {
-  let win, doc;
-  let platform;
-  let isIos = false;
-  let isSafari = false;
+  env => {
+    let win, doc;
+    let platform;
+    let isIos = false;
+    let isSafari = false;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    doc.title = 'doc title';
-    isIos = false;
-    isSafari = false;
-    platform = Services.platformFor(win);
-    sandbox.stub(platform, 'isIos').callsFake(() => isIos);
-    sandbox.stub(platform, 'isSafari').callsFake(() => isSafari);
-    sandbox./*OK*/stub(win, 'open').returns(true);
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      doc.title = 'doc title';
+      isIos = false;
+      isSafari = false;
+      platform = Services.platformFor(win);
+      sandbox.stub(platform, 'isIos').callsFake(() => isIos);
+      sandbox.stub(platform, 'isSafari').callsFake(() => isSafari);
+      sandbox./*OK*/ stub(win, 'open').returns(true);
+    });
 
-  function getShare(type, opt_endpoint, opt_params, opt_target) {
-    const share = doc.createElement('amp-social-share');
-    share.addEventListener = sandbox.spy();
-    if (opt_endpoint) {
-      share.setAttribute('data-share-endpoint', opt_endpoint);
-    }
+    function getShare(type, opt_endpoint, opt_params, opt_target) {
+      const share = doc.createElement('amp-social-share');
+      share.addEventListener = sandbox.spy();
+      if (opt_endpoint) {
+        share.setAttribute('data-share-endpoint', opt_endpoint);
+      }
 
-    for (const key in opt_params) {
-      share.setAttribute('data-param-' + key, opt_params[key]);
-    }
+      for (const key in opt_params) {
+        share.setAttribute('data-param-' + key, opt_params[key]);
+      }
 
-    if (opt_target) {
-      share.setAttribute('data-target', opt_target);
-    }
+      if (opt_target) {
+        share.setAttribute('data-target', opt_target);
+      }
 
-    share.setAttribute('type', type);
-    share.setAttribute('width', 60);
-    share.setAttribute('height', 44);
-    doc.body.appendChild(share);
-    return loaded(share);
-  }
+      share.setAttribute('type', type);
+      share.setAttribute('width', 60);
+      share.setAttribute('height', 44);
+      doc.body.appendChild(share);
+      return loaded(share);
+    }
 
-  function loaded(element) {
-    return element.build()
+    function loaded(element) {
+      return element
+        .build()
         .then(() => element.layoutCallback())
         .then(() => element);
-  }
+    }
 
-  it('errors if share endpoint is missing', () => {
-    const share = doc.createElement('amp-social-share');
-    share.setAttribute('type', 'unknown-provider');
-    doc.body.appendChild(share);
-    return allowConsoleError(() => {
-      return expect(loaded(share)).to.eventually.be.rejectedWith(
-          /data-share-endpoint attribute is required/);
+    it('errors if share endpoint is missing', () => {
+      const share = doc.createElement('amp-social-share');
+      share.setAttribute('type', 'unknown-provider');
+      doc.body.appendChild(share);
+      return allowConsoleError(() => {
+        return expect(loaded(share)).to.eventually.be.rejectedWith(
+          /data-share-endpoint attribute is required/
+        );
+      });
     });
-  });
 
-  it('errors if type is missing', () => {
-    const share = doc.createElement('amp-social-share');
-    doc.body.appendChild(share);
-    return allowConsoleError(() => {
-      return expect(loaded(share)).to.eventually.be.rejectedWith(
-          /type attribute is required/);
+    it('errors if type is missing', () => {
+      const share = doc.createElement('amp-social-share');
+      doc.body.appendChild(share);
+      return allowConsoleError(() => {
+        return expect(loaded(share)).to.eventually.be.rejectedWith(
+          /type attribute is required/
+        );
+      });
     });
-  });
 
-  it('errors if type has space characters', () => {
-    const share = doc.createElement('amp-social-share');
-    share.setAttribute('type', 'hello world');
-    doc.body.appendChild(share);
-    return allowConsoleError(() => {
-      return expect(loaded(share)).to.eventually.be.rejectedWith(
-          /Space characters are not allowed in type attribute value/);
+    it('errors if type has space characters', () => {
+      const share = doc.createElement('amp-social-share');
+      share.setAttribute('type', 'hello world');
+      doc.body.appendChild(share);
+      return allowConsoleError(() => {
+        return expect(loaded(share)).to.eventually.be.rejectedWith(
+          /Space characters are not allowed in type attribute value/
+        );
+      });
     });
-  });
 
-  it('renders unconfigured providers if share endpoint provided', () => {
-    const share = doc.createElement('amp-social-share');
+    it('renders unconfigured providers if share endpoint provided', () => {
+      const share = doc.createElement('amp-social-share');
 
-    share.setAttribute('type', 'unknown-provider');
-    share.setAttribute('data-share-endpoint',
-        'https://exampleprovider.com/share/');
-    share.setAttribute('data-param-text', 'check out: CANONICAL_URL');
-    doc.body.appendChild(share);
-    return loaded(share).then(el => {
-      expect(el.implementation_.params_.text).to.be.equal(
-          'check out: CANONICAL_URL');
-      expect(el.implementation_.href_).to.not.contain(
-          encodeURIComponent('CANONICAL_URL'));
-      expect(el.implementation_.href_).to.contain(
-          encodeURIComponent('https://canonicalexample.com/'));
-      expect(el.implementation_.shareEndpoint_).to.be.equal(
-          'https://exampleprovider.com/share/');
+      share.setAttribute('type', 'unknown-provider');
+      share.setAttribute(
+        'data-share-endpoint',
+        'https://exampleprovider.com/share/'
+      );
+      share.setAttribute('data-param-text', 'check out: CANONICAL_URL');
+      doc.body.appendChild(share);
+      return loaded(share).then(el => {
+        expect(el.implementation_.params_.text).to.be.equal(
+          'check out: CANONICAL_URL'
+        );
+        expect(el.implementation_.href_).to.not.contain(
+          encodeURIComponent('CANONICAL_URL')
+        );
+        expect(el.implementation_.href_).to.contain(
+          encodeURIComponent('https://canonicalexample.com/')
+        );
+        expect(el.implementation_.shareEndpoint_).to.be.equal(
+          'https://exampleprovider.com/share/'
+        );
+      });
     });
-  });
 
-  it('renders twitter', () => {
-    const params = {
-      'url': STRINGS['url'],
-      'via': STRINGS['attribution'],
-    };
-    return getShare('twitter', /* endpoint */ undefined, params).then(el => {
-      expect(el.implementation_.params_.text).to.be.equal('TITLE');
-      expect(el.implementation_.params_.url).to.be.equal('https://example.com/');
-      expect(el.implementation_.params_.via).to.be.equal('AMPhtml');
-      expect(el.implementation_.shareEndpoint_).to.be.equal(
-          'https://twitter.com/intent/tweet');
+    it('renders twitter', () => {
+      const params = {
+        'url': STRINGS['url'],
+        'via': STRINGS['attribution'],
+      };
+      return getShare('twitter', /* endpoint */ undefined, params).then(el => {
+        expect(el.implementation_.params_.text).to.be.equal('TITLE');
+        expect(el.implementation_.params_.url).to.be.equal(
+          'https://example.com/'
+        );
+        expect(el.implementation_.params_.via).to.be.equal('AMPhtml');
+        expect(el.implementation_.shareEndpoint_).to.be.equal(
+          'https://twitter.com/intent/tweet'
+        );
 
-      expect(el.implementation_.href_).to.not.contain('TITLE');
-      expect(el.addEventListener).to.be.calledTwice;
-      expect(el.addEventListener).to.be.calledWith('click');
-      expect(el.addEventListener).to.be.calledWith('keydown');
+        expect(el.implementation_.href_).to.not.contain('TITLE');
+        expect(el.addEventListener).to.be.calledTwice;
+        expect(el.addEventListener).to.be.calledWith('click');
+        expect(el.addEventListener).to.be.calledWith('keydown');
+      });
     });
-  });
 
-  it('adds a default value for url', () => {
-    const share = doc.createElement('amp-social-share');
+    it('adds a default value for url', () => {
+      const share = doc.createElement('amp-social-share');
 
-    share.setAttribute('type', 'twitter');
-    share.setAttribute('width', 60);
-    share.setAttribute('height', 44);
+      share.setAttribute('type', 'twitter');
+      share.setAttribute('width', 60);
+      share.setAttribute('height', 44);
 
-    doc.body.appendChild(share);
-    return loaded(share).then(el => {
-      expect(el.implementation_.params_.url).to.be.equal('CANONICAL_URL');
-      expect(el.implementation_.href_).to.not.contain(
-          encodeURIComponent('CANONICAL_URL'));
-      expect(el.implementation_.href_).to.contain(
-          encodeURIComponent('https://canonicalexample.com/'));
-      expect(el.implementation_.shareEndpoint_).to.be.equal(
-          'https://twitter.com/intent/tweet');
+      doc.body.appendChild(share);
+      return loaded(share).then(el => {
+        expect(el.implementation_.params_.url).to.be.equal('CANONICAL_URL');
+        expect(el.implementation_.href_).to.not.contain(
+          encodeURIComponent('CANONICAL_URL')
+        );
+        expect(el.implementation_.href_).to.contain(
+          encodeURIComponent('https://canonicalexample.com/')
+        );
+        expect(el.implementation_.shareEndpoint_).to.be.equal(
+          'https://twitter.com/intent/tweet'
+        );
+      });
     });
-  });
 
-  it('opens share window in _blank', () => {
-    return getShare('twitter').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('opens share window in _blank', () => {
+      return getShare('twitter').then(el => {
+        el.implementation_.handleClick_();
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'https://twitter.com/intent/tweet?text=doc%20title&' +
-          'url=https%3A%2F%2Fcanonicalexample.com%2F',
-          '_blank', 'resizable,scrollbars,width=640,height=480'
-      );
-    });
-  });
-
-  it('opens mailto: window in _self', () => {
-    const params = {
-      'recipient': 'sample@xyz.com',
-    };
-    return getShare('email', undefined, params, '_self').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
-          'mailto:sample%40xyz.com?subject=doc%20title&' +
-            'body=https%3A%2F%2Fcanonicalexample.com%2F' +
-            '&recipient=sample%40xyz.com',
-          '_self', 'resizable,scrollbars,width=640,height=480'
-      );
+            'url=https%3A%2F%2Fcanonicalexample.com%2F',
+          '_blank',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
-  it('opens mailto: window in _top on iOS Safari with recipient', () => {
-    const params = {
-      'recipient': 'sample@xyz.com',
-    };
-    isIos = true;
-    isSafari = true;
-    return getShare('email', undefined, params, '_top').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('opens mailto: window in _self', () => {
+      const params = {
+        'recipient': 'sample@xyz.com',
+      };
+      return getShare('email', undefined, params, '_self').then(el => {
+        el.implementation_.handleClick_();
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'mailto:sample%40xyz.com?subject=doc%20title&' +
             'body=https%3A%2F%2Fcanonicalexample.com%2F' +
             '&recipient=sample%40xyz.com',
-          '_top', 'resizable,scrollbars,width=640,height=480'
-      );
+          '_self',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
-  it('opens mailto: window in _top on iOS Safari with recipient even if user ' +
-    'attempts to override with `data-target`', () => {
-    const params = {
-      'recipient': 'sample@xyz.com',
-    };
-    isIos = true;
-    isSafari = true;
-    return getShare('email', undefined, params, '_self').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('opens mailto: window in _top on iOS Safari with recipient', () => {
+      const params = {
+        'recipient': 'sample@xyz.com',
+      };
+      isIos = true;
+      isSafari = true;
+      return getShare('email', undefined, params, '_top').then(el => {
+        el.implementation_.handleClick_();
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'mailto:sample%40xyz.com?subject=doc%20title&' +
             'body=https%3A%2F%2Fcanonicalexample.com%2F' +
             '&recipient=sample%40xyz.com',
-          '_top', 'resizable,scrollbars,width=640,height=480'
-      );
+          '_top',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
+    it(
+      'opens mailto: window in _top on iOS Safari with recipient even if user ' +
+        'attempts to override with `data-target`',
+      () => {
+        const params = {
+          'recipient': 'sample@xyz.com',
+        };
+        isIos = true;
+        isSafari = true;
+        return getShare('email', undefined, params, '_self').then(el => {
+          el.implementation_.handleClick_();
+          expect(el.implementation_.win.open).to.be.calledOnce;
+          expect(el.implementation_.win.open).to.be.calledWith(
+            'mailto:sample%40xyz.com?subject=doc%20title&' +
+              'body=https%3A%2F%2Fcanonicalexample.com%2F' +
+              '&recipient=sample%40xyz.com',
+            '_top',
+            'resizable,scrollbars,width=640,height=480'
+          );
+        });
+      }
+    );
 
-  it('opens mailto: window in _top on iOS Safari without recipient', () => {
-    isIos = true;
-    isSafari = true;
-    return getShare('email').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('opens mailto: window in _top on iOS Safari without recipient', () => {
+      isIos = true;
+      isSafari = true;
+      return getShare('email').then(el => {
+        el.implementation_.handleClick_();
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'mailto:?subject=doc%20title&' +
             'body=https%3A%2F%2Fcanonicalexample.com%2F&recipient=',
-          '_top', 'resizable,scrollbars,width=640,height=480'
-      );
+          '_top',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
-  it('opens sms: window in _top on iOS Safari', () => {
-    isIos = true;
-    isSafari = true;
-    return getShare('sms').then(el => {
-      el.implementation_.handleClick_();
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('opens sms: window in _top on iOS Safari', () => {
+      isIos = true;
+      isSafari = true;
+      return getShare('sms').then(el => {
+        el.implementation_.handleClick_();
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'sms:?&body=doc%20title%20-%20https%3A%2F%2Fcanonicalexample.com%2F',
-          '_top', 'resizable,scrollbars,width=640,height=480'
-      );
+          '_top',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
-  it('should handle key presses', () => {
-    return getShare('twitter').then(el => {
-      const nonActivationEvent = {
-        preventDefault: () => {},
-        key: Keys.RIGHT_ARROW,
-      };
-      const activationEvent = {
-        preventDefault: () => {},
-        key: Keys.SPACE,
-      };
-      el.implementation_.handleKeyPress_(nonActivationEvent);
-      expect(el.implementation_.win.open).to.not.have.been.called;
-      el.implementation_.handleKeyPress_(activationEvent);
-      expect(el.implementation_.win.open).to.be.calledOnce;
-      expect(el.implementation_.win.open).to.be.calledWith(
+    it('should handle key presses', () => {
+      return getShare('twitter').then(el => {
+        const nonActivationEvent = {
+          preventDefault: () => {},
+          key: Keys.RIGHT_ARROW,
+        };
+        const activationEvent = {
+          preventDefault: () => {},
+          key: Keys.SPACE,
+        };
+        el.implementation_.handleKeyPress_(nonActivationEvent);
+        expect(el.implementation_.win.open).to.not.have.been.called;
+        el.implementation_.handleKeyPress_(activationEvent);
+        expect(el.implementation_.win.open).to.be.calledOnce;
+        expect(el.implementation_.win.open).to.be.calledWith(
           'https://twitter.com/intent/tweet?text=doc%20title&' +
-          'url=https%3A%2F%2Fcanonicalexample.com%2F',
-          '_blank', 'resizable,scrollbars,width=640,height=480'
-      );
+            'url=https%3A%2F%2Fcanonicalexample.com%2F',
+          '_blank',
+          'resizable,scrollbars,width=640,height=480'
+        );
+      });
     });
-  });
 
-  it('has tabindex set to 0 by default', () => {
-    return getShare('twitter').then(el => {
-      expect(el.getAttribute('tabindex')).to.equal('0');
+    it('has tabindex set to 0 by default', () => {
+      return getShare('twitter').then(el => {
+        expect(el.getAttribute('tabindex')).to.equal('0');
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-soundcloud/0.1/amp-soundcloud.js b/extensions/amp-soundcloud/0.1/amp-soundcloud.js
index 4c503abeb0b6..6c1a191b7cba 100644
--- a/extensions/amp-soundcloud/0.1/amp-soundcloud.js
+++ b/extensions/amp-soundcloud/0.1/amp-soundcloud.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @fileoverview Embeds a Soundcloud clip
  *
@@ -32,9 +31,7 @@ import {Layout} from '../../../src/layout';
 import {dict} from '../../../src/utils/object';
 import {userAssert} from '../../../src/log';
 
-
 class AmpSoundcloud extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -44,9 +41,9 @@ class AmpSoundcloud extends AMP.BaseElement {
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://api.soundcloud.com/', opt_onLayout);
   }
@@ -61,14 +58,16 @@ class AmpSoundcloud extends AMP.BaseElement {
     const height = this.element.getAttribute('height');
     const color = this.element.getAttribute('data-color');
     const visual = this.element.getAttribute('data-visual');
-    const url = 'https://api.soundcloud.com/' + (
-      this.element.hasAttribute('data-trackid') ? 'tracks' : 'playlists'
-    ) + '/';
+    const url =
+      'https://api.soundcloud.com/' +
+      (this.element.hasAttribute('data-trackid') ? 'tracks' : 'playlists') +
+      '/';
     const mediaid = userAssert(
-        (this.element.getAttribute('data-trackid')
-         || this.element.getAttribute('data-playlistid')),
-        'data-trackid or data-playlistid is required for <amp-soundcloud> %s',
-        this.element);
+      this.element.getAttribute('data-trackid') ||
+        this.element.getAttribute('data-playlistid'),
+      'data-trackid or data-playlistid is required for <amp-soundcloud> %s',
+      this.element
+    );
     const secret = this.element.getAttribute('data-secret-token');
 
     const iframe = this.element.ownerDocument.createElement('iframe');
@@ -76,8 +75,10 @@ class AmpSoundcloud extends AMP.BaseElement {
     iframe.setAttribute('frameborder', 'no');
     iframe.setAttribute('scrolling', 'no');
 
-    let src = 'https://w.soundcloud.com/player/?' +
-      'url=' + encodeURIComponent(url + mediaid);
+    let src =
+      'https://w.soundcloud.com/player/?' +
+      'url=' +
+      encodeURIComponent(url + mediaid);
     if (secret) {
       // It's very important the entire thing is encoded, since it's part of
       // the `url` query param added above.
@@ -103,14 +104,14 @@ class AmpSoundcloud extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage(
-          JSON.stringify(dict({'method': 'pause'})),
-          'https://w.soundcloud.com');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify(dict({'method': 'pause'})),
+        'https://w.soundcloud.com'
+      );
     }
   }
 }
 
-
 AMP.extension('amp-soundcloud', '0.1', AMP => {
   AMP.registerElement('amp-soundcloud', AmpSoundcloud);
 });
diff --git a/extensions/amp-soundcloud/0.1/test/test-amp-soundcloud.js b/extensions/amp-soundcloud/0.1/test/test-amp-soundcloud.js
index e07952ffbec7..319aa71d1648 100644
--- a/extensions/amp-soundcloud/0.1/test/test-amp-soundcloud.js
+++ b/extensions/amp-soundcloud/0.1/test/test-amp-soundcloud.js
@@ -16,96 +16,105 @@
 
 import '../amp-soundcloud';
 
-
-describes.realWin('amp-soundcloud', {
-  amp: {
-    extensions: ['amp-soundcloud'],
+describes.realWin(
+  'amp-soundcloud',
+  {
+    amp: {
+      extensions: ['amp-soundcloud'],
+    },
   },
-}, env => {
-  const trackEmbedUrl = 'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F243169232';
-  const playlistEmbedUrl = 'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Fplaylists%2F173211206';
+  env => {
+    const trackEmbedUrl =
+      'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Ftracks%2F243169232';
+    const playlistEmbedUrl =
+      'https://w.soundcloud.com/player/?url=https%3A%2F%2Fapi.soundcloud.com%2Fplaylists%2F173211206';
 
-  let win, doc;
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getIns(mediaid, playlist, opt_attrs) {
-    const ins = doc.createElement('amp-soundcloud');
-    if (playlist) {
-      ins.setAttribute('data-playlistid', mediaid);
-    } else {
-      ins.setAttribute('data-trackid', mediaid);
-    }
-    ins.setAttribute('height', '237');
+    function getIns(mediaid, playlist, opt_attrs) {
+      const ins = doc.createElement('amp-soundcloud');
+      if (playlist) {
+        ins.setAttribute('data-playlistid', mediaid);
+      } else {
+        ins.setAttribute('data-trackid', mediaid);
+      }
+      ins.setAttribute('height', '237');
 
-    if (opt_attrs) {
-      for (const attr in opt_attrs) {
-        ins.setAttribute(attr, opt_attrs[attr]);
+      if (opt_attrs) {
+        for (const attr in opt_attrs) {
+          ins.setAttribute(attr, opt_attrs[attr]);
+        }
       }
-    }
 
-    doc.body.appendChild(ins);
-    return ins.build().then(() => ins.layoutCallback()).then(() => ins);
-  }
+      doc.body.appendChild(ins);
+      return ins
+        .build()
+        .then(() => ins.layoutCallback())
+        .then(() => ins);
+    }
 
-  it('renders track', () => {
-    return getIns('243169232').then(ins => {
-      const iframe = ins.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(trackEmbedUrl);
+    it('renders track', () => {
+      return getIns('243169232').then(ins => {
+        const iframe = ins.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(trackEmbedUrl);
+      });
     });
-  });
 
-  it('renders playlist', () => {
-    return getIns('173211206', true).then(ins => {
-      const iframe = ins.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(playlistEmbedUrl);
+    it('renders playlist', () => {
+      return getIns('173211206', true).then(ins => {
+        const iframe = ins.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(playlistEmbedUrl);
+      });
     });
-  });
 
-  it('renders secret token', () => {
-    return getIns('243169232', false, {
-      'data-visual': true,
-      'data-secret-token': 'c-af',
-    }).then(ins => {
-      const iframe = ins.firstChild;
-      expect(iframe.src).to.include(encodeURIComponent('?secret_token=c-af'));
+    it('renders secret token', () => {
+      return getIns('243169232', false, {
+        'data-visual': true,
+        'data-secret-token': 'c-af',
+      }).then(ins => {
+        const iframe = ins.firstChild;
+        expect(iframe.src).to.include(encodeURIComponent('?secret_token=c-af'));
+      });
     });
-  });
 
-  it('renders fixed-height', () => {
-    return getIns('243169232', false, {layout: 'fixed-height'}).then(ins => {
-      expect(ins.className).to.match(/i-amphtml-layout-fixed-height/);
+    it('renders fixed-height', () => {
+      return getIns('243169232', false, {layout: 'fixed-height'}).then(ins => {
+        expect(ins.className).to.match(/i-amphtml-layout-fixed-height/);
+      });
     });
-  });
 
-  it('ignores color in visual mode', () => {
-    return getIns('243169232', false, {
-      'data-visual': true,
-      'data-color': '00FF00',
-    }).then(ins => {
-      const iframe = ins.firstChild;
-      expect(iframe.src).to.include('visual=true');
-      expect(iframe.src).not.to.include('color=00FF00');
+    it('ignores color in visual mode', () => {
+      return getIns('243169232', false, {
+        'data-visual': true,
+        'data-color': '00FF00',
+      }).then(ins => {
+        const iframe = ins.firstChild;
+        expect(iframe.src).to.include('visual=true');
+        expect(iframe.src).not.to.include('color=00FF00');
+      });
     });
-  });
 
-  it('renders without optional params', () => {
-    return getIns('243169232').then(ins => {
-      const iframe = ins.firstChild;
-      expect(iframe.src).not.to.include('&visual=true');
-      expect(iframe.src).not.to.include('&color=FF0000');
+    it('renders without optional params', () => {
+      return getIns('243169232').then(ins => {
+        const iframe = ins.firstChild;
+        expect(iframe.src).not.to.include('&visual=true');
+        expect(iframe.src).not.to.include('&color=FF0000');
+      });
     });
-  });
 
-  it('renders data-trackid', () => {
-    expect(getIns('')).to.be.rejectedWith(
-        /The data-trackid attribute is required for/);
-  });
-});
+    it('renders data-trackid', () => {
+      expect(getIns('')).to.be.rejectedWith(
+        /The data-trackid attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-springboard-player/0.1/amp-springboard-player.js b/extensions/amp-springboard-player/0.1/amp-springboard-player.js
index 27a3df7ad95c..c9ee346e226c 100644
--- a/extensions/amp-springboard-player/0.1/amp-springboard-player.js
+++ b/extensions/amp-springboard-player/0.1/amp-springboard-player.js
@@ -18,7 +18,6 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {userAssert} from '../../../src/log';
 
 class AmpSpringboardPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -43,9 +42,9 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
   }
 
   /**
-  * @param {boolean=} opt_onLayout
-  * @override
-  */
+   * @param {boolean=} opt_onLayout
+   * @override
+   */
   preconnectCallback(opt_onLayout) {
     this.preconnect.url('https://cms.springboardplatform.com', opt_onLayout);
     this.preconnect.url('https://www.springboardplatform.com', opt_onLayout);
@@ -59,28 +58,33 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
   /** @override */
   buildCallback() {
     this.mode_ = userAssert(
-        this.element.getAttribute('data-mode'),
-        'The data-mode attribute is required for <amp-springboard-player> %s',
-        this.element);
+      this.element.getAttribute('data-mode'),
+      'The data-mode attribute is required for <amp-springboard-player> %s',
+      this.element
+    );
     this.contentId_ = userAssert(
-        this.element.getAttribute('data-content-id'),
-        'The data-content-id attribute is required for' +
+      this.element.getAttribute('data-content-id'),
+      'The data-content-id attribute is required for' +
         '<amp-springboard-player> %s',
-        this.element);
+      this.element
+    );
     this.domain_ = userAssert(
-        this.element.getAttribute('data-domain'),
-        'The data-domain attribute is required for <amp-springboard-player> %s',
-        this.element);
+      this.element.getAttribute('data-domain'),
+      'The data-domain attribute is required for <amp-springboard-player> %s',
+      this.element
+    );
     this.siteId_ = userAssert(
-        this.element.getAttribute('data-site-id'),
-        'The data-site-id attribute is required for' +
+      this.element.getAttribute('data-site-id'),
+      'The data-site-id attribute is required for' +
         '<amp-springboard-player> %s',
-        this.element);
+      this.element
+    );
     this.playerId_ = userAssert(
-        this.element.getAttribute('data-player-id'),
-        'The data-player-id attribute is required for' +
+      this.element.getAttribute('data-player-id'),
+      'The data-player-id attribute is required for' +
         '<amp-springboard-player> %s',
-        this.element);
+      this.element
+    );
   }
 
   /** @override */
@@ -91,13 +95,19 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
     iframe.setAttribute('frameborder', '0');
     iframe.setAttribute('allowfullscreen', 'true');
     iframe.id = this.playerId_ + '_' + this.contentId_;
-    iframe.src = 'https://cms.springboardplatform.com/embed_iframe/' +
-        encodeURIComponent(this.siteId_) + '/' +
-        encodeURIComponent(this.mode_) +
-        '/' + encodeURIComponent(this.contentId_) + '/' +
-        encodeURIComponent(this.playerId_) + '/' +
-        encodeURIComponent(this.domain_) +
-        '/' + encodeURIComponent(items);
+    iframe.src =
+      'https://cms.springboardplatform.com/embed_iframe/' +
+      encodeURIComponent(this.siteId_) +
+      '/' +
+      encodeURIComponent(this.mode_) +
+      '/' +
+      encodeURIComponent(this.contentId_) +
+      '/' +
+      encodeURIComponent(this.playerId_) +
+      '/' +
+      encodeURIComponent(this.domain_) +
+      '/' +
+      encodeURIComponent(items);
     this.applyFillContent(iframe);
     this.iframe_ = /** @type {HTMLIFrameElement} */ (iframe);
     this.element.appendChild(iframe);
@@ -107,7 +117,7 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage('ampPause', '*');
+      this.iframe_.contentWindow./*OK*/ postMessage('ampPause', '*');
     }
   }
 
@@ -115,22 +125,29 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
   createPlaceholderCallback() {
     const placeholder = this.win.document.createElement('amp-img');
     this.propagateAttributes(['aria-label'], placeholder);
-    placeholder.setAttribute('src',
-        'https://www.springboardplatform.com/storage/' +
-        encodeURIComponent(this.domain_) + '/snapshots/' +
-        encodeURIComponent(this.contentId_) + '.jpg');
+    placeholder.setAttribute(
+      'src',
+      'https://www.springboardplatform.com/storage/' +
+        encodeURIComponent(this.domain_) +
+        '/snapshots/' +
+        encodeURIComponent(this.contentId_) +
+        '.jpg'
+    );
     /** Show default image for playlist */
     if (this.mode_ == 'playlist') {
-      placeholder.setAttribute('src',
-          'https://www.springboardplatform.com/storage/default/' +
-        'snapshots/default_snapshot.png');
+      placeholder.setAttribute(
+        'src',
+        'https://www.springboardplatform.com/storage/default/' +
+          'snapshots/default_snapshot.png'
+      );
     }
     placeholder.setAttribute('placeholder', '');
     placeholder.setAttribute('referrerpolicy', 'origin');
     placeholder.setAttribute('layout', 'fill');
     if (placeholder.hasAttribute('aria-label')) {
-      placeholder.setAttribute('alt',
-          'Loading video - ' + placeholder.getAttribute('aria-label')
+      placeholder.setAttribute(
+        'alt',
+        'Loading video - ' + placeholder.getAttribute('aria-label')
       );
     } else {
       placeholder.setAttribute('alt', 'Loading video');
@@ -139,7 +156,6 @@ class AmpSpringboardPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-springboard-player', '0.1', AMP => {
   AMP.registerElement('amp-springboard-player', AmpSpringboardPlayer);
 });
diff --git a/extensions/amp-springboard-player/0.1/test/test-amp-springboard-player.js b/extensions/amp-springboard-player/0.1/test/test-amp-springboard-player.js
index 4a9a5f4b40c8..628d4c320542 100644
--- a/extensions/amp-springboard-player/0.1/test/test-amp-springboard-player.js
+++ b/extensions/amp-springboard-player/0.1/test/test-amp-springboard-player.js
@@ -16,120 +16,39 @@
 
 import '../amp-springboard-player';
 
-
-describes.realWin('amp-springboard-player', {
-  amp: {
-    extensions: ['amp-springboard-player'],
+describes.realWin(
+  'amp-springboard-player',
+  {
+    amp: {
+      extensions: ['amp-springboard-player'],
+    },
   },
-}, env => {
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getSpringboardPlayer(attributes) {
-    const sp = doc.createElement('amp-springboard-player');
-    for (const key in attributes) {
-      sp.setAttribute(key, attributes[key]);
-    }
-    sp.setAttribute('width', '480');
-    sp.setAttribute('height', '270');
-    sp.setAttribute('layout', 'responsive');
-    doc.body.appendChild(sp);
-    return sp.build().then(() => { sp.layoutCallback(); }).then(() => sp);
-  }
-
-  it('renders', () => {
-    return getSpringboardPlayer({
-      'data-site-id': '261',
-      'data-mode': 'video',
-      'data-content-id': '1578473',
-      'data-player-id': 'test401',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal('https://cms.springboardplatform.com/' +
-          'embed_iframe/261/video/1578473/test401/test.com/10');
-    });
-  });
+  env => {
+    let win, doc;
 
-  it('renders responsively', () => {
-    return getSpringboardPlayer({
-      'data-site-id': '261',
-      'data-mode': 'video',
-      'data-content-id': '1578473',
-      'data-player-id': 'test401',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).then(bc => {
-      const iframe = bc.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
     });
-  });
 
-  it('requires data-site-id', () => {
-    return getSpringboardPlayer({
-      'data-mode': 'video',
-      'data-content-id': '1578473',
-      'data-player-id': 'test401',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).should.eventually.be
-        .rejectedWith(/The data-site-id attribute is required for/);
-  });
-
-  it('requires data-mode', () => {
-    return getSpringboardPlayer({
-      'data-site-id': '261',
-      'data-content-id': '1578473',
-      'data-player-id': 'test401',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).should.eventually.be
-        .rejectedWith(/The data-mode attribute is required for/);
-  });
-
-  it('requires data-content-id', () => {
-    return getSpringboardPlayer({
-      'data-mode': 'video',
-      'data-site-id': '261',
-      'data-player-id': 'test401',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).should.eventually.be
-        .rejectedWith(/The data-content-id attribute is required for/);
-  });
-
-  it('requires data-player-id', () => {
-    return getSpringboardPlayer({
-      'data-mode': 'video',
-      'data-site-id': '261',
-      'data-content-id': '1578473',
-      'data-domain': 'test.com',
-      'data-items': '10',
-    }).should.eventually.be
-        .rejectedWith(/The data-player-id attribute is required for/);
-  });
-
-  it('requires data-domain', () => {
-    return getSpringboardPlayer({
-      'data-mode': 'video',
-      'data-site-id': '261',
-      'data-content-id': '1578473',
-      'data-player-id': 'test401',
-      'data-items': '10',
-    }).should.eventually.be
-        .rejectedWith(/The data-domain attribute is required for/);
-  });
+    function getSpringboardPlayer(attributes) {
+      const sp = doc.createElement('amp-springboard-player');
+      for (const key in attributes) {
+        sp.setAttribute(key, attributes[key]);
+      }
+      sp.setAttribute('width', '480');
+      sp.setAttribute('height', '270');
+      sp.setAttribute('layout', 'responsive');
+      doc.body.appendChild(sp);
+      return sp
+        .build()
+        .then(() => {
+          sp.layoutCallback();
+        })
+        .then(() => sp);
+    }
 
-  describe('createPlaceholderCallback', () => {
-    it('should create a placeholder image', () => {
+    it('renders', () => {
       return getSpringboardPlayer({
         'data-site-id': '261',
         'data-mode': 'video',
@@ -137,19 +56,18 @@ describes.realWin('amp-springboard-player', {
         'data-player-id': 'test401',
         'data-domain': 'test.com',
         'data-items': '10',
-      }).then(kp => {
-        const img = kp.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
-            'https://www.springboardplatform.com/storage/test.com' +
-            '/snapshots/1578473.jpg');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
-        expect(img.getAttribute('alt')).to.equal('Loading video');
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://cms.springboardplatform.com/' +
+            'embed_iframe/261/video/1578473/test401/test.com/10'
+        );
       });
     });
-    it('should propagate aria-label for placeholder image', () => {
+
+    it('renders responsively', () => {
       return getSpringboardPlayer({
         'data-site-id': '261',
         'data-mode': 'video',
@@ -157,40 +75,141 @@ describes.realWin('amp-springboard-player', {
         'data-player-id': 'test401',
         'data-domain': 'test.com',
         'data-items': '10',
-        'aria-label': 'sporty video',
-      }).then(kp => {
-        const img = kp.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
-            'https://www.springboardplatform.com/storage/test.com' +
-            '/snapshots/1578473.jpg');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
-        expect(img.getAttribute('aria-label')).to.equal('sporty video');
-        expect(img.getAttribute('alt'))
-            .to.equal('Loading video - sporty video');
+      }).then(bc => {
+        const iframe = bc.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
       });
     });
 
-    it('should use default snapshot for playlist image', () => {
+    it('requires data-site-id', () => {
+      return getSpringboardPlayer({
+        'data-mode': 'video',
+        'data-content-id': '1578473',
+        'data-player-id': 'test401',
+        'data-domain': 'test.com',
+        'data-items': '10',
+      }).should.eventually.be.rejectedWith(
+        /The data-site-id attribute is required for/
+      );
+    });
+
+    it('requires data-mode', () => {
       return getSpringboardPlayer({
         'data-site-id': '261',
-        'data-mode': 'playlist',
         'data-content-id': '1578473',
         'data-player-id': 'test401',
         'data-domain': 'test.com',
         'data-items': '10',
-      }).then(kp => {
-        const img = kp.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
+      }).should.eventually.be.rejectedWith(
+        /The data-mode attribute is required for/
+      );
+    });
+
+    it('requires data-content-id', () => {
+      return getSpringboardPlayer({
+        'data-mode': 'video',
+        'data-site-id': '261',
+        'data-player-id': 'test401',
+        'data-domain': 'test.com',
+        'data-items': '10',
+      }).should.eventually.be.rejectedWith(
+        /The data-content-id attribute is required for/
+      );
+    });
+
+    it('requires data-player-id', () => {
+      return getSpringboardPlayer({
+        'data-mode': 'video',
+        'data-site-id': '261',
+        'data-content-id': '1578473',
+        'data-domain': 'test.com',
+        'data-items': '10',
+      }).should.eventually.be.rejectedWith(
+        /The data-player-id attribute is required for/
+      );
+    });
+
+    it('requires data-domain', () => {
+      return getSpringboardPlayer({
+        'data-mode': 'video',
+        'data-site-id': '261',
+        'data-content-id': '1578473',
+        'data-player-id': 'test401',
+        'data-items': '10',
+      }).should.eventually.be.rejectedWith(
+        /The data-domain attribute is required for/
+      );
+    });
+
+    describe('createPlaceholderCallback', () => {
+      it('should create a placeholder image', () => {
+        return getSpringboardPlayer({
+          'data-site-id': '261',
+          'data-mode': 'video',
+          'data-content-id': '1578473',
+          'data-player-id': 'test401',
+          'data-domain': 'test.com',
+          'data-items': '10',
+        }).then(kp => {
+          const img = kp.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
+            'https://www.springboardplatform.com/storage/test.com' +
+              '/snapshots/1578473.jpg'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+          expect(img.getAttribute('alt')).to.equal('Loading video');
+        });
+      });
+      it('should propagate aria-label for placeholder image', () => {
+        return getSpringboardPlayer({
+          'data-site-id': '261',
+          'data-mode': 'video',
+          'data-content-id': '1578473',
+          'data-player-id': 'test401',
+          'data-domain': 'test.com',
+          'data-items': '10',
+          'aria-label': 'sporty video',
+        }).then(kp => {
+          const img = kp.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
+            'https://www.springboardplatform.com/storage/test.com' +
+              '/snapshots/1578473.jpg'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+          expect(img.getAttribute('aria-label')).to.equal('sporty video');
+          expect(img.getAttribute('alt')).to.equal(
+            'Loading video - sporty video'
+          );
+        });
+      });
+
+      it('should use default snapshot for playlist image', () => {
+        return getSpringboardPlayer({
+          'data-site-id': '261',
+          'data-mode': 'playlist',
+          'data-content-id': '1578473',
+          'data-player-id': 'test401',
+          'data-domain': 'test.com',
+          'data-items': '10',
+        }).then(kp => {
+          const img = kp.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
             'https://www.springboardplatform.com/storage/default/' +
-            'snapshots/default_snapshot.png');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+              'snapshots/default_snapshot.png'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
index 5c1b70b73196..60432f926ca3 100644
--- a/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
+++ b/extensions/amp-sticky-ad/1.0/amp-sticky-ad.js
@@ -22,7 +22,7 @@ import {
   setStyle,
   toggle,
 } from '../../../src/style';
-import {dev,user, userAssert} from '../../../src/log';
+import {dev, user, userAssert} from '../../../src/log';
 import {removeElement, whenUpgradedToCustomElement} from '../../../src/dom';
 
 class AmpStickyAd extends AMP.BaseElement {
@@ -57,30 +57,35 @@ class AmpStickyAd extends AMP.BaseElement {
     this.viewport_ = this.getViewport();
     this.element.classList.add('i-amphtml-sticky-ad-layout');
     const children = this.getRealChildren();
-    userAssert((children.length == 1 && children[0].tagName == 'AMP-AD'),
-        'amp-sticky-ad must have a single amp-ad child');
+    userAssert(
+      children.length == 1 && children[0].tagName == 'AMP-AD',
+      'amp-sticky-ad must have a single amp-ad child'
+    );
 
     this.ad_ = children[0];
     this.setAsOwner(this.ad_);
 
-    this.adReadyPromise_ =
-        whenUpgradedToCustomElement(dev().assertElement(this.ad_)).then(ad => {
-          return ad.whenBuilt();
-        }).then(() => {
-          return this.mutateElement(() => {
-            toggle(this.element, true);
-          });
+    this.adReadyPromise_ = whenUpgradedToCustomElement(
+      dev().assertElement(this.ad_)
+    )
+      .then(ad => {
+        return ad.whenBuilt();
+      })
+      .then(() => {
+        return this.mutateElement(() => {
+          toggle(this.element, true);
         });
+      });
 
     const paddingBar = this.win.document.createElement(
-        'amp-sticky-ad-top-padding');
+      'amp-sticky-ad-top-padding'
+    );
     paddingBar.classList.add('amp-sticky-ad-top-padding');
     this.element.insertBefore(paddingBar, this.ad_);
 
     // On viewport scroll, check requirements for amp-stick-ad to display.
     this.win.setTimeout(() => {
-      this.scrollUnlisten_ =
-        this.viewport_.onScroll(() => this.onScroll_());
+      this.scrollUnlisten_ = this.viewport_.onScroll(() => this.onScroll_());
     });
   }
 
@@ -89,7 +94,7 @@ class AmpStickyAd extends AMP.BaseElement {
     // Reschedule layout for ad if layout sticky-ad again.
     if (this.visible_) {
       toggle(this.element, true);
-      const borderBottom = this.element./*OK*/offsetHeight;
+      const borderBottom = this.element./*OK*/ offsetHeight;
       this.viewport_.updatePaddingBottom(borderBottom);
       this.updateInViewport(dev().assertElement(this.ad_), true);
       this.scheduleLayout(dev().assertElement(this.ad_));
@@ -162,9 +167,9 @@ class AmpStickyAd extends AMP.BaseElement {
         }
         this.visible_ = true;
         this.addCloseButton_();
-        this.viewport_.addToFixedLayer(
-            this.element, /* forceTransfer */ true)
-            .then(() => this.scheduleLayoutForAd_());
+        this.viewport_
+          .addToFixedLayer(this.element, /* forceTransfer */ true)
+          .then(() => this.scheduleLayoutForAd_());
       });
     });
   }
@@ -199,15 +204,16 @@ class AmpStickyAd extends AMP.BaseElement {
     ]).then(() => {
       let backgroundColor;
       return this.measureElement(() => {
-        backgroundColor =
-            computedStyle(this.win, this.element)['backgroundColor'];
+        backgroundColor = computedStyle(this.win, this.element)[
+          'backgroundColor'
+        ];
       }).then(() => {
         return this.vsync_.mutatePromise(() => {
           // Set sticky-ad to visible and change container style
           this.element.setAttribute('visible', '');
           // Add border-bottom to the body to compensate space that was taken
           // by sticky ad, so no content would be blocked by sticky ad unit.
-          const borderBottom = this.element./*OK*/offsetHeight;
+          const borderBottom = this.element./*OK*/ offsetHeight;
           this.viewport_.updatePaddingBottom(borderBottom);
           this.forceOpacity_(backgroundColor);
         });
@@ -222,9 +228,11 @@ class AmpStickyAd extends AMP.BaseElement {
   addCloseButton_() {
     const closeButton = this.win.document.createElement('button');
     closeButton.classList.add('amp-sticky-ad-close-button');
-    closeButton.setAttribute('aria-label',
-        this.element.getAttribute('data-close-button-aria-label')
-            || 'Close this ad');
+    closeButton.setAttribute(
+      'aria-label',
+      this.element.getAttribute('data-close-button-aria-label') ||
+        'Close this ad'
+    );
     const boundOnCloseButtonClick = this.onCloseButtonClick_.bind(this);
     closeButton.addEventListener('click', boundOnCloseButtonClick);
     this.element.appendChild(closeButton);
@@ -237,7 +245,7 @@ class AmpStickyAd extends AMP.BaseElement {
   onCloseButtonClick_() {
     this.vsync_.mutate(() => {
       this.visible_ = false;
-      this./*OK*/scheduleUnlayout(dev().assertElement(this.ad_));
+      this./*OK*/ scheduleUnlayout(dev().assertElement(this.ad_));
       this.viewport_.removeFromFixedLayer(this.element);
       removeElement(this.element);
       this.viewport_.updatePaddingBottom(0);
@@ -255,8 +263,10 @@ class AmpStickyAd extends AMP.BaseElement {
     if (backgroundColor == newBackgroundColor) {
       return;
     }
-    user().warn('AMP-STICKY-AD',
-        'Do not allow container to be semitransparent');
+    user().warn(
+      'AMP-STICKY-AD',
+      'Do not allow container to be semitransparent'
+    );
     setStyle(this.element, 'background-color', newBackgroundColor);
   }
 }
diff --git a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
index a0d1cec5989d..2d506139388d 100644
--- a/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
+++ b/extensions/amp-sticky-ad/1.0/test/test-amp-sticky-ad.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
  *
@@ -21,399 +20,446 @@ import {createElementWithAttributes} from '../../../../src/dom';
 import {macroTask} from '../../../../testing/yield';
 import {poll} from '../../../../testing/iframe';
 
-describes.realWin('amp-sticky-ad 1.0 version', {
-  win: { /* window spec */
-    location: '...',
-    historyOff: false,
-  },
-  amp: { /* amp spec */
-    runtimeOn: false,
-    extensions: ['amp-sticky-ad:1.0', 'amp-ad'],
+describes.realWin(
+  'amp-sticky-ad 1.0 version',
+  {
+    win: {
+      /* window spec */
+      location: '...',
+      historyOff: false,
+    },
+    amp: {
+      /* amp spec */
+      runtimeOn: false,
+      extensions: ['amp-sticky-ad:1.0', 'amp-ad'],
+    },
   },
-}, env => {
-  let win;
-  let ampStickyAd;
-  let ampAd;
-  let impl;
-  let addToFixedLayerStub, addToFixedLayerPromise;
-  const adUpgradedToCustomElementPromise = Promise.resolve();
-  describe('with valid child 1.0', () => {
-    beforeEach(() => {
-      win = env.win;
-      ampStickyAd = win.document.createElement('amp-sticky-ad');
-      ampStickyAd.setAttribute('layout', 'nodisplay');
-      ampAd = createElementWithAttributes(win.document, 'amp-ad', {
-        'type': '_ping_',
-        'height': 50,
-        'width': 300,
+  env => {
+    let win;
+    let ampStickyAd;
+    let ampAd;
+    let impl;
+    let addToFixedLayerStub, addToFixedLayerPromise;
+    const adUpgradedToCustomElementPromise = Promise.resolve();
+    describe('with valid child 1.0', () => {
+      beforeEach(() => {
+        win = env.win;
+        ampStickyAd = win.document.createElement('amp-sticky-ad');
+        ampStickyAd.setAttribute('layout', 'nodisplay');
+        ampAd = createElementWithAttributes(win.document, 'amp-ad', {
+          'type': '_ping_',
+          'height': 50,
+          'width': 300,
+        });
+        ampStickyAd.appendChild(ampAd);
+        win.document.body.appendChild(ampStickyAd);
+        ampStickyAd.build();
+        impl = ampStickyAd.implementation_;
+        addToFixedLayerPromise = Promise.resolve();
+        addToFixedLayerStub = sandbox
+          .stub(impl.viewport_, 'addToFixedLayer')
+          .callsFake(() => addToFixedLayerPromise);
       });
-      ampStickyAd.appendChild(ampAd);
-      win.document.body.appendChild(ampStickyAd);
-      ampStickyAd.build();
-      impl = ampStickyAd.implementation_;
-      addToFixedLayerPromise = Promise.resolve();
-      addToFixedLayerStub =
-          sandbox.stub(impl.viewport_, 'addToFixedLayer').callsFake(
-              () => addToFixedLayerPromise);
-    });
 
-    // TODO(#16916): Make this test work with synchronous throws.
-    it.skip('should listen to scroll event', function * () {
-      const spy = sandbox.spy(impl, 'removeOnScrollListener_');
-      expect(impl.scrollUnlisten_).to.be.null;
-      yield macroTask();
-      // Hack to handle possible unexpected page scroll
-      if (impl.scrollUnlisten_) {
-        expect(impl.scrollUnlisten_).to.be.a('function');
-      } else {
-        expect(spy).to.be.calledOnce;
-      }
-    });
+      // TODO(#16916): Make this test work with synchronous throws.
+      it.skip('should listen to scroll event', function*() {
+        const spy = sandbox.spy(impl, 'removeOnScrollListener_');
+        expect(impl.scrollUnlisten_).to.be.null;
+        yield macroTask();
+        // Hack to handle possible unexpected page scroll
+        if (impl.scrollUnlisten_) {
+          expect(impl.scrollUnlisten_).to.be.a('function');
+        } else {
+          expect(spy).to.be.calledOnce;
+        }
+      });
 
-    it('should not build when scrollTop not greater than 1', () => {
-      const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
-      const removeOnScrollListenerSpy =
-          sandbox.spy(impl, 'removeOnScrollListener_');
-      const getScrollTopSpy = sandbox.spy();
-      const getScrollHeightSpy = sandbox.spy();
+      it('should not build when scrollTop not greater than 1', () => {
+        const scheduleLayoutSpy = sandbox.spy(impl, 'scheduleLayout');
+        const removeOnScrollListenerSpy = sandbox.spy(
+          impl,
+          'removeOnScrollListener_'
+        );
+        const getScrollTopSpy = sandbox.spy();
+        const getScrollHeightSpy = sandbox.spy();
 
-      impl.viewport_.getScrollTop = function() {
-        getScrollTopSpy();
-        return 1;
-      };
-      impl.viewport_.getScrollHeight = function() {
-        getScrollHeightSpy();
-        return 300;
-      };
-      impl.onScroll_();
-      return new Promise(resolve => {
-        setTimeout(resolve, 0);
-      }).then(() => {
-        expect(getScrollTopSpy).to.have.been.called;
-        expect(scheduleLayoutSpy).to.not.have.been.called;
-        expect(removeOnScrollListenerSpy).to.not.have.been.called;
+        impl.viewport_.getScrollTop = function() {
+          getScrollTopSpy();
+          return 1;
+        };
+        impl.viewport_.getScrollHeight = function() {
+          getScrollHeightSpy();
+          return 300;
+        };
+        impl.onScroll_();
+        return new Promise(resolve => {
+          setTimeout(resolve, 0);
+        }).then(() => {
+          expect(getScrollTopSpy).to.have.been.called;
+          expect(scheduleLayoutSpy).to.not.have.been.called;
+          expect(removeOnScrollListenerSpy).to.not.have.been.called;
+        });
       });
-    });
 
-    it('should display once user scroll', () => {
-      const scheduleLayoutSpy =
-          sandbox.stub(impl, 'scheduleLayoutForAd_').callsFake(
-              () => {});
-      const removeOnScrollListenerSpy =
-          sandbox.spy(impl, 'removeOnScrollListener_');
+      it('should display once user scroll', () => {
+        const scheduleLayoutSpy = sandbox
+          .stub(impl, 'scheduleLayoutForAd_')
+          .callsFake(() => {});
+        const removeOnScrollListenerSpy = sandbox.spy(
+          impl,
+          'removeOnScrollListener_'
+        );
 
-      const getScrollTopStub = sandbox.stub(impl.viewport_, 'getScrollTop');
-      getScrollTopStub.returns(2);
-      const getSizeStub = sandbox.stub(impl.viewport_, 'getSize');
-      getSizeStub.returns({
-        height: 50,
-      });
-      const getScrollHeightStub =
-          sandbox.stub(impl.viewport_, 'getScrollHeight');
-      getScrollHeightStub.returns(300);
+        const getScrollTopStub = sandbox.stub(impl.viewport_, 'getScrollTop');
+        getScrollTopStub.returns(2);
+        const getSizeStub = sandbox.stub(impl.viewport_, 'getSize');
+        getSizeStub.returns({
+          height: 50,
+        });
+        const getScrollHeightStub = sandbox.stub(
+          impl.viewport_,
+          'getScrollHeight'
+        );
+        getScrollHeightStub.returns(300);
 
-      impl.mutateElement = function(callback) {
-        callback();
-      };
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
-      impl.adReadyPromise_ = Promise.resolve();
+        impl.mutateElement = function(callback) {
+          callback();
+        };
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
+        impl.adReadyPromise_ = Promise.resolve();
 
-      impl.onScroll_();
-      expect(removeOnScrollListenerSpy).to.have.been.called;
-      // Layout on ad is called only after fixed layer is done.
-      expect(scheduleLayoutSpy).to.not.have.been.called;
-      return impl.adReadyPromise_.then(() => {
-        expect(addToFixedLayerStub).to.have.been.calledOnce;
-        return addToFixedLayerPromise.then(() => {
-          expect(scheduleLayoutSpy).to.have.been.calledOnce;
+        impl.onScroll_();
+        expect(removeOnScrollListenerSpy).to.have.been.called;
+        // Layout on ad is called only after fixed layer is done.
+        expect(scheduleLayoutSpy).to.not.have.been.called;
+        return impl.adReadyPromise_.then(() => {
+          expect(addToFixedLayerStub).to.have.been.calledOnce;
+          return addToFixedLayerPromise.then(() => {
+            expect(scheduleLayoutSpy).to.have.been.calledOnce;
+          });
         });
       });
-    });
 
-    it('should set body borderBottom correctly', () => {
-      let borderWidth = win.getComputedStyle(win.document.body, null)
+      it('should set body borderBottom correctly', () => {
+        let borderWidth = win
+          .getComputedStyle(win.document.body, null)
           .getPropertyValue('border-bottom-width');
-      let borderStyle = win.getComputedStyle(win.document.body, null)
+        let borderStyle = win
+          .getComputedStyle(win.document.body, null)
           .getPropertyValue('border-bottom-style');
-      expect(borderWidth).to.equal('0px');
-      expect(borderStyle).to.equal('none');
+        expect(borderWidth).to.equal('0px');
+        expect(borderStyle).to.equal('none');
 
-      impl.viewport_.updatePaddingBottom(50);
-      return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
-        borderWidth = win.getComputedStyle(win.document.body, null)
+        impl.viewport_.updatePaddingBottom(50);
+        return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
+          borderWidth = win
+            .getComputedStyle(win.document.body, null)
             .getPropertyValue('border-bottom-width');
-        borderStyle = win.getComputedStyle(win.document.body, null)
+          borderStyle = win
+            .getComputedStyle(win.document.body, null)
             .getPropertyValue('border-bottom-style');
-        expect(borderWidth).to.equal('50px');
-        expect(borderStyle).to.equal('solid');
+          expect(borderWidth).to.equal('50px');
+          expect(borderStyle).to.equal('solid');
+        });
       });
-    });
 
-    it('should create a close button', () => {
-      const addCloseButtonSpy = sandbox.spy(impl, 'addCloseButton_');
-      sandbox.stub(impl, 'scheduleLayoutForAd_').callsFake(() => {});
+      it('should create a close button', () => {
+        const addCloseButtonSpy = sandbox.spy(impl, 'addCloseButton_');
+        sandbox.stub(impl, 'scheduleLayoutForAd_').callsFake(() => {});
 
-      impl.viewport_.getScrollTop = function() {
-        return 100;
-      };
-      impl.viewport_.getSize = function() {
-        return {height: 50};
-      };
-      impl.viewport_.getScrollHeight = function() {
-        return 300;
-      };
-      impl.mutateElement = function(callback) {
-        callback();
-      };
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
+        impl.viewport_.getScrollTop = function() {
+          return 100;
+        };
+        impl.viewport_.getSize = function() {
+          return {height: 50};
+        };
+        impl.viewport_.getScrollHeight = function() {
+          return 300;
+        };
+        impl.mutateElement = function(callback) {
+          callback();
+        };
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
 
-      impl.adReadyPromise_ = Promise.resolve();
-      impl.display_();
-      return impl.adReadyPromise_.then(() => {
-        expect(addCloseButtonSpy).to.be.called;
-        expect(impl.element.children[0]).to.be.not.null;
-        expect(impl.element.children[0].classList.contains(
-            'amp-sticky-ad-top-padding')).to.be.true;
-        expect(impl.element.children[0].tagName).to.equal(
-            'AMP-STICKY-AD-TOP-PADDING');
-        expect(impl.element.children[2]).to.be.not.null;
-        expect(impl.element.children[2].tagName).to.equal('BUTTON');
+        impl.adReadyPromise_ = Promise.resolve();
+        impl.display_();
+        return impl.adReadyPromise_.then(() => {
+          expect(addCloseButtonSpy).to.be.called;
+          expect(impl.element.children[0]).to.be.not.null;
+          expect(
+            impl.element.children[0].classList.contains(
+              'amp-sticky-ad-top-padding'
+            )
+          ).to.be.true;
+          expect(impl.element.children[0].tagName).to.equal(
+            'AMP-STICKY-AD-TOP-PADDING'
+          );
+          expect(impl.element.children[2]).to.be.not.null;
+          expect(impl.element.children[2].tagName).to.equal('BUTTON');
+        });
       });
-    });
 
-    it('should wait for built and load-end signals', () => {
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
-      const layoutAdSpy = sandbox.spy(impl, 'layoutAd_');
-      impl.scheduleLayoutForAd_();
-      expect(layoutAdSpy).to.not.been.called;
-      impl.ad_.signals().signal('built');
-      return adUpgradedToCustomElementPromise.then(() => {
-        return impl.ad_.signals().whenSignal('built').then(() => {
-          expect(layoutAdSpy).to.be.called;
-          expect(ampStickyAd).to.not.have.attribute('visible');
-          impl.ad_.signals().signal('load-end');
-          return poll('visible attribute must be set', () => {
-            return ampStickyAd.hasAttribute('visible');
-          });
+      it('should wait for built and load-end signals', () => {
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
+        const layoutAdSpy = sandbox.spy(impl, 'layoutAd_');
+        impl.scheduleLayoutForAd_();
+        expect(layoutAdSpy).to.not.been.called;
+        impl.ad_.signals().signal('built');
+        return adUpgradedToCustomElementPromise.then(() => {
+          return impl.ad_
+            .signals()
+            .whenSignal('built')
+            .then(() => {
+              expect(layoutAdSpy).to.be.called;
+              expect(ampStickyAd).to.not.have.attribute('visible');
+              impl.ad_.signals().signal('load-end');
+              return poll('visible attribute must be set', () => {
+                return ampStickyAd.hasAttribute('visible');
+              });
+            });
         });
       });
-    });
 
-    it('should wait for built and render-start signals', () => {
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
-      const layoutAdSpy = sandbox.spy(impl, 'layoutAd_');
-      impl.scheduleLayoutForAd_();
-      expect(layoutAdSpy).to.not.been.called;
-      impl.ad_.signals().signal('built');
-      return adUpgradedToCustomElementPromise.then(() => {
-        return impl.ad_.signals().whenSignal('built').then(() => {
-          expect(layoutAdSpy).to.be.called;
-          expect(ampStickyAd).to.not.have.attribute('visible');
-          impl.ad_.signals().signal('render-start');
-          return poll('visible attribute must be set', () => {
-            return ampStickyAd.hasAttribute('visible');
-          });
+      it('should wait for built and render-start signals', () => {
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
+        const layoutAdSpy = sandbox.spy(impl, 'layoutAd_');
+        impl.scheduleLayoutForAd_();
+        expect(layoutAdSpy).to.not.been.called;
+        impl.ad_.signals().signal('built');
+        return adUpgradedToCustomElementPromise.then(() => {
+          return impl.ad_
+            .signals()
+            .whenSignal('built')
+            .then(() => {
+              expect(layoutAdSpy).to.be.called;
+              expect(ampStickyAd).to.not.have.attribute('visible');
+              impl.ad_.signals().signal('render-start');
+              return poll('visible attribute must be set', () => {
+                return ampStickyAd.hasAttribute('visible');
+              });
+            });
         });
       });
-    });
 
-    it('should not allow container to be set semi-transparent', () => {
-      ampStickyAd.setAttribute('style',
-          'background-color: rgba(55, 55, 55, 0.55) !important');
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
-      const layoutPromise = impl.layoutAd_();
-      impl.ad_.signals().signal('render-start');
-      return layoutPromise.then(() => {
-        const bg = window.getComputedStyle(ampStickyAd)
+      it('should not allow container to be set semi-transparent', () => {
+        ampStickyAd.setAttribute(
+          'style',
+          'background-color: rgba(55, 55, 55, 0.55) !important'
+        );
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
+        const layoutPromise = impl.layoutAd_();
+        impl.ad_.signals().signal('render-start');
+        return layoutPromise.then(() => {
+          const bg = window
+            .getComputedStyle(ampStickyAd)
             .getPropertyValue('background-color');
-        return bg == 'rgb(55, 55, 55)';
+          return bg == 'rgb(55, 55, 55)';
+        });
       });
-    });
 
-    it('should not allow container to be set to transparent', () => {
-      ampStickyAd.setAttribute('style',
-          'background-color: transparent !important');
-      impl.vsync_.mutate = function(callback) {
-        callback();
-      };
-      const layoutPromise = impl.layoutAd_();
-      impl.ad_.signals().signal('render-start');
-      return layoutPromise.then(() => {
-        const bg = window.getComputedStyle(ampStickyAd)
+      it('should not allow container to be set to transparent', () => {
+        ampStickyAd.setAttribute(
+          'style',
+          'background-color: transparent !important'
+        );
+        impl.vsync_.mutate = function(callback) {
+          callback();
+        };
+        const layoutPromise = impl.layoutAd_();
+        impl.ad_.signals().signal('render-start');
+        return layoutPromise.then(() => {
+          const bg = window
+            .getComputedStyle(ampStickyAd)
             .getPropertyValue('background-color');
-        return bg == 'rgb(0, 0, 0)';
+          return bg == 'rgb(0, 0, 0)';
+        });
       });
     });
-  });
-
 
-  describe('with unvalid child 1.0', () => {
-    let ampImg;
-    let ampAd1;
-    let ampAd2;
-    beforeEach(() => {
-      win = env.win;
-      ampStickyAd = win.document.createElement('amp-sticky-ad');
-      ampStickyAd.setAttribute('layout', 'nodisplay');
-      ampImg = win.document.createElement('amp-img');
-      ampAd1 = createElementWithAttributes(win.document, 'amp-ad', {
-        'type': '_ping_',
-        'height': 50,
-        'width': 300,
-      });
-      ampAd2 = createElementWithAttributes(win.document, 'amp-ad', {
-        'type': '_ping_',
-        'height': 50,
-        'width': 300,
+    describe('with unvalid child 1.0', () => {
+      let ampImg;
+      let ampAd1;
+      let ampAd2;
+      beforeEach(() => {
+        win = env.win;
+        ampStickyAd = win.document.createElement('amp-sticky-ad');
+        ampStickyAd.setAttribute('layout', 'nodisplay');
+        ampImg = win.document.createElement('amp-img');
+        ampAd1 = createElementWithAttributes(win.document, 'amp-ad', {
+          'type': '_ping_',
+          'height': 50,
+          'width': 300,
+        });
+        ampAd2 = createElementWithAttributes(win.document, 'amp-ad', {
+          'type': '_ping_',
+          'height': 50,
+          'width': 300,
+        });
+        win.document.body.appendChild(ampStickyAd);
       });
-      win.document.body.appendChild(ampStickyAd);
-    });
 
-    it('should not build when child is not ad', () => {
-      ampStickyAd.appendChild(ampImg);
-      const impl = ampStickyAd.implementation_;
-      allowConsoleError(() => {
-        expect(() => impl.buildCallback()).to.throw(
+      it('should not build when child is not ad', () => {
+        ampStickyAd.appendChild(ampImg);
+        const impl = ampStickyAd.implementation_;
+        allowConsoleError(() => {
+          expect(() => impl.buildCallback()).to.throw(
             /amp-sticky-ad must have a single amp-ad child/
-        );
+          );
+        });
       });
-    });
 
-    it('should not build when has more than 1 children', () => {
-      ampStickyAd.appendChild(ampAd1);
-      ampStickyAd.appendChild(ampAd2);
-      const impl = ampStickyAd.implementation_;
+      it('should not build when has more than 1 children', () => {
+        ampStickyAd.appendChild(ampAd1);
+        ampStickyAd.appendChild(ampAd2);
+        const impl = ampStickyAd.implementation_;
 
-      allowConsoleError(() => {
-        expect(() => impl.buildCallback()).to.throw(
+        allowConsoleError(() => {
+          expect(() => impl.buildCallback()).to.throw(
             /amp-sticky-ad must have a single amp-ad child/
-        );
+          );
+        });
       });
     });
-  });
-});
+  }
+);
 
-
-describes.realWin('amp-sticky-ad 1.0 with real ad child', {
-  win: { /* window spec */
-    location: '...',
-    historyOff: false,
-  },
-  amp: { /* amp spec */
-    runtimeOn: false,
-    extensions: ['amp-sticky-ad:1.0', 'amp-ad'],
+describes.realWin(
+  'amp-sticky-ad 1.0 with real ad child',
+  {
+    win: {
+      /* window spec */
+      location: '...',
+      historyOff: false,
+    },
+    amp: {
+      /* amp spec */
+      runtimeOn: false,
+      extensions: ['amp-sticky-ad:1.0', 'amp-ad'],
+    },
   },
-}, env => {
-  let win;
-  let ampStickyAd;
-  let impl;
-  let addToFixedLayerPromise;
-  beforeEach(() => {
-    win = env.win;
-    ampStickyAd = win.document.createElement('amp-sticky-ad');
-    ampStickyAd.setAttribute('layout', 'nodisplay');
-    const ampAd = createElementWithAttributes(win.document, 'amp-ad', {
-      'type': '_ping_',
-      'height': 50,
-      'width': 200,
+  env => {
+    let win;
+    let ampStickyAd;
+    let impl;
+    let addToFixedLayerPromise;
+    beforeEach(() => {
+      win = env.win;
+      ampStickyAd = win.document.createElement('amp-sticky-ad');
+      ampStickyAd.setAttribute('layout', 'nodisplay');
+      const ampAd = createElementWithAttributes(win.document, 'amp-ad', {
+        'type': '_ping_',
+        'height': 50,
+        'width': 200,
+      });
+      ampStickyAd.appendChild(ampAd);
+      win.document.body.appendChild(ampStickyAd);
+      ampStickyAd.build();
+      impl = ampStickyAd.implementation_;
+      addToFixedLayerPromise = Promise.resolve();
+      sandbox
+        .stub(impl.viewport_, 'addToFixedLayer')
+        .callsFake(() => addToFixedLayerPromise);
+      return ampAd.implementation_.upgradeCallback();
     });
-    ampStickyAd.appendChild(ampAd);
-    win.document.body.appendChild(ampStickyAd);
-    ampStickyAd.build();
-    impl = ampStickyAd.implementation_;
-    addToFixedLayerPromise = Promise.resolve();
-    sandbox.stub(impl.viewport_, 'addToFixedLayer').callsFake(
-        () => addToFixedLayerPromise);
-    return ampAd.implementation_.upgradeCallback();
-  });
 
-  // TODO(zhouyx, #18574): Fix failing borderWidth check and re-enable.
-  it.skip('close button should close ad and reset body borderBottom', () => {
-    impl.viewport_.getScrollTop = function() {
-      return 100;
-    };
-    impl.viewport_.getSize = function() {
-      return {height: 50};
-    };
-    impl.viewport_.getScrollHeight = function() {
-      return 300;
-    };
-    impl.mutateElement = function(callback) {
-      callback();
-    };
-    impl.vsync_.mutate = function(callback) {
-      callback();
-    };
-    Object.defineProperty(
-        impl.element, 'offsetHeight', {value: 20});
+    // TODO(zhouyx, #18574): Fix failing borderWidth check and re-enable.
+    it.skip('close button should close ad and reset body borderBottom', () => {
+      impl.viewport_.getScrollTop = function() {
+        return 100;
+      };
+      impl.viewport_.getSize = function() {
+        return {height: 50};
+      };
+      impl.viewport_.getScrollHeight = function() {
+        return 300;
+      };
+      impl.mutateElement = function(callback) {
+        callback();
+      };
+      impl.vsync_.mutate = function(callback) {
+        callback();
+      };
+      Object.defineProperty(impl.element, 'offsetHeight', {value: 20});
 
-    impl.display_();
-    impl.ad_.signals().signal('built');
-    impl.ad_.signals().signal('load-end');
-    const layoutPromise = impl.layoutAd_();
-    const bodyPromise = impl.viewport_.ampdoc.whenBodyAvailable();
-    const p = Promise.all([addToFixedLayerPromise, layoutPromise, bodyPromise]);
-    return p.then(() => {
-      let borderWidth = win.getComputedStyle(win.document.body, null)
+      impl.display_();
+      impl.ad_.signals().signal('built');
+      impl.ad_.signals().signal('load-end');
+      const layoutPromise = impl.layoutAd_();
+      const bodyPromise = impl.viewport_.ampdoc.whenBodyAvailable();
+      const p = Promise.all([
+        addToFixedLayerPromise,
+        layoutPromise,
+        bodyPromise,
+      ]);
+      return p.then(() => {
+        let borderWidth = win
+          .getComputedStyle(win.document.body, null)
           .getPropertyValue('border-bottom-width');
-      expect(borderWidth).to.equal('54px');
-      expect(impl.element.children[2]).to.be.not.null;
-      impl.element.children[2].dispatchEvent(new Event('click'));
-      return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
-        borderWidth = win.getComputedStyle(win.document.body, null)
+        expect(borderWidth).to.equal('54px');
+        expect(impl.element.children[2]).to.be.not.null;
+        impl.element.children[2].dispatchEvent(new Event('click'));
+        return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
+          borderWidth = win
+            .getComputedStyle(win.document.body, null)
             .getPropertyValue('border-bottom-width');
-        expect(borderWidth).to.equal('0px');
+          expect(borderWidth).to.equal('0px');
+        });
       });
     });
-  });
 
-  // TODO(zhouyx, #18574): Fix failing borderWidth check and re-enable.
-  it.skip('should collapse and reset borderBottom when its child do', () => {
-    impl.viewport_.getScrollTop = function() {
-      return 100;
-    };
-    impl.viewport_.getSize = function() {
-      return {height: 50};
-    };
-    impl.viewport_.getScrollHeight = function() {
-      return 300;
-    };
-    impl.mutateElement = function(callback) {
-      callback();
-    };
-    impl.vsync_.mutate = function(callback) {
-      callback();
-    };
-    Object.defineProperty(
-        impl.element, 'offsetHeight', {value: 20});
+    // TODO(zhouyx, #18574): Fix failing borderWidth check and re-enable.
+    it.skip('should collapse and reset borderBottom when its child do', () => {
+      impl.viewport_.getScrollTop = function() {
+        return 100;
+      };
+      impl.viewport_.getSize = function() {
+        return {height: 50};
+      };
+      impl.viewport_.getScrollHeight = function() {
+        return 300;
+      };
+      impl.mutateElement = function(callback) {
+        callback();
+      };
+      impl.vsync_.mutate = function(callback) {
+        callback();
+      };
+      Object.defineProperty(impl.element, 'offsetHeight', {value: 20});
 
-    impl.display_();
-    impl.ad_.signals().signal('built');
-    impl.ad_.signals().signal('load-end');
-    const layoutPromise = impl.layoutAd_();
-    const bodyPromise = impl.viewport_.ampdoc.whenBodyAvailable();
-    const p = Promise.all([addToFixedLayerPromise, layoutPromise, bodyPromise]);
-    return p.then(() => {
-      let borderWidth = win.getComputedStyle(win.document.body, null)
+      impl.display_();
+      impl.ad_.signals().signal('built');
+      impl.ad_.signals().signal('load-end');
+      const layoutPromise = impl.layoutAd_();
+      const bodyPromise = impl.viewport_.ampdoc.whenBodyAvailable();
+      const p = Promise.all([
+        addToFixedLayerPromise,
+        layoutPromise,
+        bodyPromise,
+      ]);
+      return p.then(() => {
+        let borderWidth = win
+          .getComputedStyle(win.document.body, null)
           .getPropertyValue('border-bottom-width');
-      expect(borderWidth).to.equal('54px');
-      impl.collapsedCallback();
-      return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
-        borderWidth = win.getComputedStyle(win.document.body, null)
+        expect(borderWidth).to.equal('54px');
+        impl.collapsedCallback();
+        return impl.viewport_.ampdoc.whenBodyAvailable().then(() => {
+          borderWidth = win
+            .getComputedStyle(win.document.body, null)
             .getPropertyValue('border-bottom-width');
-        expect(borderWidth).to.equal('0px');
-        expect(ampStickyAd).to.have.display('none');
+          expect(borderWidth).to.equal('0px');
+          expect(ampStickyAd).to.have.display('none');
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-story-auto-ads/0.1/_locales/ca.js b/extensions/amp-story-auto-ads/0.1/_locales/ca.js
index 7018a220cb1e..4ed3084c3e83 100644
--- a/extensions/amp-story-auto-ads/0.1/_locales/ca.js
+++ b/extensions/amp-story-auto-ads/0.1/_locales/ca.js
@@ -54,7 +54,7 @@ const strings = {
     string: 'Més',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_OPEN_APP]: {
-    string: 'Obre l\'aplicació',
+    string: "Obre l'aplicació",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_ORDER_NOW]: {
     string: 'Fes una comanda',
@@ -75,13 +75,13 @@ const strings = {
     string: 'Horaris',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SIGN_UP]: {
-    string: 'Registra\'t',
+    string: "Registra't",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SUBSCRIBE]: {
-    string: 'Subscriu-t\'hi ara',
+    string: "Subscriu-t'hi ara",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP]: {
-    string: 'Utilitza l\'aplicació',
+    string: "Utilitza l'aplicació",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW]: {
     string: 'Mostra',
@@ -90,7 +90,7 @@ const strings = {
     string: 'Mira',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE]: {
-    string: 'Mira l\'episodi',
+    string: "Mira l'episodi",
   },
 };
 
diff --git a/extensions/amp-story-auto-ads/0.1/_locales/en.js b/extensions/amp-story-auto-ads/0.1/_locales/en.js
index e3ee83ce27d8..96e8a2b85f7c 100644
--- a/extensions/amp-story-auto-ads/0.1/_locales/en.js
+++ b/extensions/amp-story-auto-ads/0.1/_locales/en.js
@@ -18,7 +18,6 @@ import {
   LocalizedStringId,
 } from '../../../../src/localized-strings';
 
-
 /**
  * Localized string bundle used for English strings.
  * @const {!LocalizedStringBundleDef}
@@ -26,118 +25,141 @@ import {
 const strings = {
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_APPLY_NOW]: {
     string: 'Apply Now',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to apply for something.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to apply for something.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BOOK_NOW]: {
     string: 'Book',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to book transaction.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to book transaction.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_BUY_TICKETS]: {
     string: 'Buy Tickets',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to purchase tickets.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to purchase tickets.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_DOWNLOAD]: {
     string: 'Download',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to download content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to download content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_EXPLORE]: {
     string: 'Explore',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to explore content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to explore content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_GET_NOW]: {
     string: 'Get Now',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to obtain content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to obtain content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_INSTALL]: {
     string: 'Install Now',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to install content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to install content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LEARN_MORE]: {
     string: 'Learn More',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to learn more about some content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to learn more about some content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_LISTEN]: {
     string: 'Listen',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to listen to content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to listen to content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_MORE]: {
     string: 'More',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to see more content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to see more content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_OPEN_APP]: {
     string: 'Open App',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to open an application.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to open an application.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_ORDER_NOW]: {
     string: 'Order Now',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to place an order.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to place an order.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_PLAY]: {
     string: 'Play',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to play content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to play content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_READ]: {
     string: 'Read',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to read content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to read content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOP]: {
     string: 'Shop',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to shop for something.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to shop for something.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOW]: {
     string: 'Show',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to show content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to show content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SHOWTIMES]: {
     string: 'Showtimes',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to see showtimes.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to see showtimes.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SIGN_UP]: {
     string: 'Sign Up',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to sign up for something.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to sign up for something.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SUBSCRIBE]: {
     string: 'Subscribe Now',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to subscribe to something.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to subscribe to something.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP]: {
     string: 'Use App',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to use an application.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to use an application.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW]: {
     string: 'View',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to view content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to view content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH]: {
     string: 'Watch',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to watch content.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to watch content.',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE]: {
     string: 'Watch Episode',
-    description: 'Button label for an ad call to action button that asks ' +
-        'users to watch an episode of something.',
+    description:
+      'Button label for an ad call to action button that asks ' +
+      'users to watch an episode of something.',
   },
 };
 
diff --git a/extensions/amp-story-auto-ads/0.1/_locales/fr.js b/extensions/amp-story-auto-ads/0.1/_locales/fr.js
index e3ebeb7ad183..61b6b633f77e 100644
--- a/extensions/amp-story-auto-ads/0.1/_locales/fr.js
+++ b/extensions/amp-story-auto-ads/0.1/_locales/fr.js
@@ -54,7 +54,7 @@ const strings = {
     string: 'Plus',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_OPEN_APP]: {
-    string: 'Ouvrir l\'application',
+    string: "Ouvrir l'application",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_ORDER_NOW]: {
     string: 'Commander',
@@ -75,13 +75,13 @@ const strings = {
     string: 'Horaires des séances',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SIGN_UP]: {
-    string: 'S\'inscrire',
+    string: "S'inscrire",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_SUBSCRIBE]: {
-    string: 'S\'abonner',
+    string: "S'abonner",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP]: {
-    string: 'Utiliser l\'application',
+    string: "Utiliser l'application",
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW]: {
     string: 'Afficher',
@@ -90,7 +90,7 @@ const strings = {
     string: 'Regarder',
   },
   [LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE]: {
-    string: 'Regarder l\'épisode',
+    string: "Regarder l'épisode",
   },
 };
 
diff --git a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
index 0b43807fb7b9..46714157113c 100644
--- a/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
+++ b/extensions/amp-story-auto-ads/0.1/amp-story-auto-ads.js
@@ -27,8 +27,7 @@ import {
   StateChangeType,
 } from '../../amp-story/1.0/navigation-state';
 import {StateProperty} from '../../amp-story/1.0/amp-story-store-service';
-import {CSS as attributionCSS}
-  from '../../../build/amp-story-auto-ads-attribution-0.1.css';
+import {CSS as attributionCSS} from '../../../build/amp-story-auto-ads-attribution-0.1.css';
 import {createElementWithAttributes, isJsonScriptTag} from '../../../src/dom';
 import {createShadowRootWithStyle} from '../../amp-story/1.0/utils';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
@@ -121,8 +120,8 @@ const CTA_TYPES = {
   USE_APP: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_USE_APP,
   VIEW: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_VIEW,
   WATCH: LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH,
-  WATCH_EPISODE: LocalizedStringId
-      .AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE,
+  WATCH_EPISODE:
+    LocalizedStringId.AMP_STORY_AUTO_ADS_BUTTON_LABEL_WATCH_EPISODE,
 };
 
 /** @const */
@@ -185,7 +184,6 @@ const Vars = {
 };
 
 export class AmpStoryAutoAds extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -251,33 +249,37 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     /** @private @const {!LocalizationService} */
     this.localizationService_ = new LocalizationService(this.win);
     this.localizationService_
-        .registerLocalizedStringBundle('default', LocalizedStringsEn)
-        .registerLocalizedStringBundle('ar', LocalizedStringsAr)
-        .registerLocalizedStringBundle('de', LocalizedStringsDe)
-        .registerLocalizedStringBundle('en', LocalizedStringsEn)
-        .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
-        .registerLocalizedStringBundle('es', LocalizedStringsEs)
-        .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
-        .registerLocalizedStringBundle('fr', LocalizedStringsFr)
-        .registerLocalizedStringBundle('hi', LocalizedStringsHi)
-        .registerLocalizedStringBundle('id', LocalizedStringsId)
-        .registerLocalizedStringBundle('it', LocalizedStringsIt)
-        .registerLocalizedStringBundle('ja', LocalizedStringsJa)
-        .registerLocalizedStringBundle('ko', LocalizedStringsKo)
-        .registerLocalizedStringBundle('nl', LocalizedStringsNl)
-        .registerLocalizedStringBundle('no', LocalizedStringsNo)
-        .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
-        .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
-        .registerLocalizedStringBundle('ru', LocalizedStringsRu)
-        .registerLocalizedStringBundle('tr', LocalizedStringsTr)
-        .registerLocalizedStringBundle('vi', LocalizedStringsVi)
-        .registerLocalizedStringBundle('zh-CN', LocalizedStringsZhCn)
-        .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw);
-
-    const enXaPseudoLocaleBundle =
-        createPseudoLocale(LocalizedStringsEn, s => `[${s} one two]`);
-    this.localizationService_
-        .registerLocalizedStringBundle('en-xa', enXaPseudoLocaleBundle);
+      .registerLocalizedStringBundle('default', LocalizedStringsEn)
+      .registerLocalizedStringBundle('ar', LocalizedStringsAr)
+      .registerLocalizedStringBundle('de', LocalizedStringsDe)
+      .registerLocalizedStringBundle('en', LocalizedStringsEn)
+      .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
+      .registerLocalizedStringBundle('es', LocalizedStringsEs)
+      .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
+      .registerLocalizedStringBundle('fr', LocalizedStringsFr)
+      .registerLocalizedStringBundle('hi', LocalizedStringsHi)
+      .registerLocalizedStringBundle('id', LocalizedStringsId)
+      .registerLocalizedStringBundle('it', LocalizedStringsIt)
+      .registerLocalizedStringBundle('ja', LocalizedStringsJa)
+      .registerLocalizedStringBundle('ko', LocalizedStringsKo)
+      .registerLocalizedStringBundle('nl', LocalizedStringsNl)
+      .registerLocalizedStringBundle('no', LocalizedStringsNo)
+      .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
+      .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
+      .registerLocalizedStringBundle('ru', LocalizedStringsRu)
+      .registerLocalizedStringBundle('tr', LocalizedStringsTr)
+      .registerLocalizedStringBundle('vi', LocalizedStringsVi)
+      .registerLocalizedStringBundle('zh-CN', LocalizedStringsZhCn)
+      .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw);
+
+    const enXaPseudoLocaleBundle = createPseudoLocale(
+      LocalizedStringsEn,
+      s => `[${s} one two]`
+    );
+    this.localizationService_.registerLocalizedStringBundle(
+      'en-xa',
+      enXaPseudoLocaleBundle
+    );
   }
 
   /** @override */
@@ -291,15 +293,15 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
       }
 
       const ampStoryElement = this.element.parentElement;
-      userAssert(ampStoryElement.tagName === 'AMP-STORY',
-          `<${TAG}> should be child of <amp-story>`);
+      userAssert(
+        ampStoryElement.tagName === 'AMP-STORY',
+        `<${TAG}> should be child of <amp-story>`
+      );
 
       const ampdoc = this.getAmpDoc();
       const extensionService = Services.extensionsFor(this.win);
-      extensionService./*OK*/installExtensionForDoc(
-          ampdoc, AD_TAG);
-      extensionService./*OK*/installExtensionForDoc(
-          ampdoc, MUSTACHE_TAG);
+      extensionService./*OK*/ installExtensionForDoc(ampdoc, AD_TAG);
+      extensionService./*OK*/ installExtensionForDoc(ampdoc, MUSTACHE_TAG);
 
       return ampStoryElement.getImpl().then(impl => {
         this.ampStory_ = impl;
@@ -307,13 +309,11 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     });
   }
 
-
   /** @override */
   isLayoutSupported() {
     return true;
   }
 
-
   /** @override */
   layoutCallback() {
     if (!this.isAutomaticAdInsertionAllowed_()) {
@@ -323,15 +323,16 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.navigationState_ = this.ampStory_.getNavigationState();
     this.navigationState_.observe(this.handleStateChange_.bind(this));
 
-    return this.ampStory_.signals().whenSignal(CommonSignals.INI_LOAD)
-        .then(() => {
-          this.createAdOverlay_();
-          this.readConfig_();
-          this.schedulePage_();
-        });
+    return this.ampStory_
+      .signals()
+      .whenSignal(CommonSignals.INI_LOAD)
+      .then(() => {
+        this.createAdOverlay_();
+        this.readConfig_();
+        this.schedulePage_();
+      });
   }
 
-
   /**
    * Determines whether or not ad insertion is allowed based on how the story
    * is served.
@@ -342,7 +343,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     return !!this.storeService_.get(StateProperty.CAN_INSERT_AUTOMATIC_AD);
   }
 
-
   /**
    * load in config from child <script> element
    * @private
@@ -350,15 +350,15 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
   readConfig_() {
     const child = this.element.children[0];
     userAssert(
-        isJsonScriptTag(child),
-        `The <${TAG}> config should ` +
-        'be inside a <script> tag with type="application/json"');
+      isJsonScriptTag(child),
+      `The <${TAG}> config should ` +
+        'be inside a <script> tag with type="application/json"'
+    );
 
     this.config_ = parseJson(child.textContent);
     this.validateConfig_();
   }
 
-
   /**
    * Create a hidden UI that will be shown when ad is displayed
    * @private
@@ -375,22 +375,25 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.ampStory_.element.appendChild(container);
   }
 
-
   /**
    * make sure given JSON config is shaped correctly
    * @private
    */
   validateConfig_() {
     const adAttributes = this.config_['ad-attributes'];
-    userAssert(adAttributes, `<${TAG}>: Error reading config.` +
-      'Top level JSON should have an "ad-attributes" key');
+    userAssert(
+      adAttributes,
+      `<${TAG}>: Error reading config.` +
+        'Top level JSON should have an "ad-attributes" key'
+    );
 
     const {type} = adAttributes;
-    userAssert(type, `<${TAG}>: Error reading config.` +
-      'Missing ["ad-attribues"]["type"] key');
+    userAssert(
+      type,
+      `<${TAG}>: Error reading config.Missing ["ad-attribues"]["type"] key`
+    );
   }
 
-
   /**
    * build page and start preloading
    * @private
@@ -400,8 +403,9 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.adPageEls_.push(page);
 
     this.ampStory_.element.appendChild(page);
-    this.analyticsEventWithCurrentAd_(Events.AD_REQUESTED,
-        {[Vars.AD_REQUESTED]: Date.now()});
+    this.analyticsEventWithCurrentAd_(Events.AD_REQUESTED, {
+      [Vars.AD_REQUESTED]: Date.now(),
+    });
 
     page.getImpl().then(impl => {
       this.ampStory_.addPage(impl);
@@ -409,7 +413,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     });
   }
 
-
   /**
    * create an `amp-story-page` containing an `amp-ad`
    * @private
@@ -435,29 +438,32 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.isCurrentAdLoaded_ = false;
 
     // set up listener for ad-loaded event
-    ampAd.getImpl().then(impl => {
-      const signals = impl.signals();
-      return signals.whenSignal(CommonSignals.INI_LOAD);
-    }).then(() => {
-      // Ensures the video-manager does not follow the autoplay attribute on
-      // amp-video tags, which would play the ad in the background before it is
-      // displayed.
-      ampStoryAdPage.getImpl().then(impl => impl.delegateVideoAutoplay());
-
-      // remove loading attribute once loaded so that desktop CSS will position
-      // offscren with all other pages
-      const currentPageEl = this.adPageEls_[this.adPageEls_.length - 1];
-      currentPageEl.removeAttribute(LOADING_ATTR);
-
-      this.analyticsEventWithCurrentAd_(Events.AD_LOADED,
-          {[Vars.AD_LOADED]: Date.now()});
-      this.isCurrentAdLoaded_ = true;
-    });
+    ampAd
+      .getImpl()
+      .then(impl => {
+        const signals = impl.signals();
+        return signals.whenSignal(CommonSignals.INI_LOAD);
+      })
+      .then(() => {
+        // Ensures the video-manager does not follow the autoplay attribute on
+        // amp-video tags, which would play the ad in the background before it is
+        // displayed.
+        ampStoryAdPage.getImpl().then(impl => impl.delegateVideoAutoplay());
+
+        // remove loading attribute once loaded so that desktop CSS will position
+        // offscren with all other pages
+        const currentPageEl = this.adPageEls_[this.adPageEls_.length - 1];
+        currentPageEl.removeAttribute(LOADING_ATTR);
+
+        this.analyticsEventWithCurrentAd_(Events.AD_LOADED, {
+          [Vars.AD_LOADED]: Date.now(),
+        });
+        this.isCurrentAdLoaded_ = true;
+      });
 
     return ampStoryAdPage;
   }
 
-
   /**
    * @return {!Element}
    * @private
@@ -484,10 +490,12 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     });
 
     return createElementWithAttributes(
-        this.win.document, 'amp-story-page', attributes);
+      this.win.document,
+      'amp-story-page',
+      attributes
+    );
   }
 
-
   /**
    * @return {!Element}
    * @private
@@ -513,24 +521,29 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     }
 
     const {type} = configAttrs;
-    userAssert(!!ALLOWED_AD_TYPES[type], `${TAG}: ` +
-      `"${type}" ad type is not supported`);
+    userAssert(
+      !!ALLOWED_AD_TYPES[type],
+      `${TAG}: "${type}" ad type is not supported`
+    );
 
     if (type === 'fake') {
       const id = this.element.getAttribute('id');
-      userAssert(id && startsWith(id, 'i-amphtml-demo-'),
-          `${TAG} id must start with i-amphtml-demo- to use fake ads`);
+      userAssert(
+        id && startsWith(id, 'i-amphtml-demo-'),
+        `${TAG} id must start with i-amphtml-demo- to use fake ads`
+      );
       configAttrs['id'] = `i-amphtml-demo-${this.adPagesCreated_}`;
     }
 
-    const attributes = /** @type {!JsonObject} */ (Object.assign({},
-        configAttrs, requiredAttrs));
+    const attributes = /** @type {!JsonObject} */ (Object.assign(
+      {},
+      configAttrs,
+      requiredAttrs
+    ));
 
-    return createElementWithAttributes(
-        this.win.document, 'amp-ad', attributes);
+    return createElementWithAttributes(this.win.document, 'amp-ad', attributes);
   }
 
-
   /**
    * Validate ad-server response has requirements to build outlink
    * @param {!Element} adPageElement
@@ -541,8 +554,10 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     const ctaType = this.lastCreatedAdElement_.getAttribute(DATA_ATTR.CTA_TYPE);
 
     if (!ctaUrl || !ctaType) {
-      user().error(TAG, 'Both CTA Type & CTA Url ' +
-          'are required in ad-server response."');
+      user().error(
+        TAG,
+        'Both CTA Type & CTA Url are required in ad-server response."'
+      );
       return false;
     }
 
@@ -550,8 +565,9 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.analyticsData_[this.adPagesCreated_][Vars.CTA_TYPE] = ctaType;
 
     const ctaLocalizedStringId = CTA_TYPES[ctaType];
-    const ctaText =
-        this.localizationService_.getLocalizedString(ctaLocalizedStringId);
+    const ctaText = this.localizationService_.getLocalizedString(
+      ctaLocalizedStringId
+    );
     if (!ctaType) {
       user().error(TAG, 'invalid "CTA Type" in ad response');
       return false;
@@ -560,7 +576,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     return this.createCtaLayer_(adPageElement, ctaText, ctaUrl);
   }
 
-
   /**
    * Create layer to contain outlink button
    * @param {!Element} adPageElement
@@ -602,7 +617,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     return true;
   }
 
-
   /**
    * @param {!StateChangeEventDef} stateChangeEvent
    * @private
@@ -612,13 +626,13 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
       case StateChangeType.ACTIVE_PAGE:
         const {pageIndex, pageId} = stateChangeEvent.value;
         this.handleActivePageChange_(
-            dev().assertNumber(pageIndex),
-            dev().assertString(pageId));
+          dev().assertNumber(pageIndex),
+          dev().assertString(pageId)
+        );
         break;
     }
   }
 
-
   /**
    * @param {number} pageIndex
    * @param {string} pageId
@@ -676,16 +690,18 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
       const adState = this.tryToPlaceAdAfterPage_(pageId);
 
       if (adState === AD_STATE.INSERTED) {
-        this.analyticsEventWithCurrentAd_(Events.AD_INSERTED,
-            {[Vars.AD_INSERTED]: Date.now()});
+        this.analyticsEventWithCurrentAd_(Events.AD_INSERTED, {
+          [Vars.AD_INSERTED]: Date.now(),
+        });
         this.adsPlaced_++;
         // We have an ad inserted that has yet to be viewed.
         this.pendingAdView_ = true;
       }
 
       if (adState === AD_STATE.FAILED) {
-        this.analyticsEventWithCurrentAd_(Events.AD_DISCARDED,
-            {[Vars.AD_DISCARDED]: Date.now()});
+        this.analyticsEventWithCurrentAd_(Events.AD_DISCARDED, {
+          [Vars.AD_DISCARDED]: Date.now(),
+        });
         this.startNextAdPage_(/* failure */ true);
       }
     }
@@ -698,8 +714,8 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
    */
   setVisibleAttribute_(adElement) {
     const friendlyIframeEmbed = adElement.querySelector('iframe');
-    const frameDoc = friendlyIframeEmbed.contentDocument ||
-      friendlyIframeEmbed.win.document;
+    const frameDoc =
+      friendlyIframeEmbed.contentDocument || friendlyIframeEmbed.win.document;
     const {body} = frameDoc;
     this.mutateElement(() => {
       body.setAttribute(IFRAME_BODY_VISIBLE_ATTR, '');
@@ -730,7 +746,8 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     // In desktop we have to insert ads two pages away, because the next page is
     // already visible. This adjustment ensures the ads show in the same place
     // on mobile and desktop.
-    const adjustedInterval = this.isDesktopView_ ? MIN_INTERVAL - 1
+    const adjustedInterval = this.isDesktopView_
+      ? MIN_INTERVAL - 1
       : MIN_INTERVAL;
     const adjustedFirst = this.isDesktopView_ ? FIRST_AD_MIN - 1 : FIRST_AD_MIN;
 
@@ -763,7 +780,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.schedulePage_();
   }
 
-
   /**
    * Place ad based on user config
    * @param {string} pageBeforeAdId
@@ -797,16 +813,20 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
 
     // There are three checks here that we check before inserting an ad. If
     // any of these fail we will try again on next page navigation.
-    if (!this.isCurrentAdLoaded_ // 1. Ad must be loaded.
-        // 2. Pubs can opt out of ad placement using 'next-page-no-ad' attribute
-        || this.nextPageNoAd_(pageBeforeAd)
-        // 3. We will not show two ads in a row.
-        || pageBeforeAd.isAd() || pageAfterAd.isAd()) {
+    if (
+      !this.isCurrentAdLoaded_ || // 1. Ad must be loaded.
+      // 2. Pubs can opt out of ad placement using 'next-page-no-ad' attribute
+      this.nextPageNoAd_(pageBeforeAd) ||
+      // 3. We will not show two ads in a row.
+      pageBeforeAd.isAd() ||
+      pageAfterAd.isAd()
+    ) {
       return AD_STATE.PENDING;
     }
 
     const ctaCreated = this.maybeCreateCtaLayer_(
-        dev().assertElement(nextAdPageEl));
+      dev().assertElement(nextAdPageEl)
+    );
     if (!ctaCreated) {
       // failed on ad-server response format
       return AD_STATE.FAILED;
@@ -823,7 +843,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     return AD_STATE.INSERTED;
   }
 
-
   /**
    * @private
    * @return {boolean}
@@ -832,13 +851,12 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     return !!this.storeService_.get(StateProperty.DESKTOP_STATE);
   }
 
-
   /**
    * @private
    * @return {boolean}
    */
   adTimedOut_() {
-    return (Date.now() - this.timeCurrentPageCreated_) > TIMEOUT_LIMIT;
+    return Date.now() - this.timeCurrentPageCreated_ > TIMEOUT_LIMIT;
   }
 
   /**
@@ -863,7 +881,6 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
     this.analyticsEvent_(eventType, vars);
   }
 
-
   /**
    * Construct an analytics event and trigger it.
    * @param {string} eventType
@@ -873,11 +890,15 @@ export class AmpStoryAutoAds extends AMP.BaseElement {
   analyticsEvent_(eventType, vars) {
     const adIndex = vars['adIndex'];
     this.analyticsData_[adIndex] = Object.assign(
-        /** @type {!JsonObject} */ (this.analyticsData_[adIndex]),
-        vars);
-
-    triggerAnalyticsEvent(this.element, eventType,
-        /** @type {!JsonObject} */ (this.analyticsData_[adIndex]));
+      /** @type {!JsonObject} */ (this.analyticsData_[adIndex]),
+      vars
+    );
+
+    triggerAnalyticsEvent(
+      this.element,
+      eventType,
+      /** @type {!JsonObject} */ (this.analyticsData_[adIndex])
+    );
   }
 }
 
diff --git a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
index cbf4e34cc5a6..ac84d9e98d76 100644
--- a/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
+++ b/extensions/amp-story-auto-ads/0.1/test/test-amp-story-auto-ads.js
@@ -19,258 +19,280 @@ import {macroTask} from '../../../../testing/yield';
 
 const NOOP = () => {};
 
-describes.realWin('amp-story-auto-ads', {
-  amp: {
-    extensions: [
-      'amp-story:1.0',
-      'amp-story-auto-ads',
-    ],
+describes.realWin(
+  'amp-story-auto-ads',
+  {
+    amp: {
+      extensions: ['amp-story:1.0', 'amp-story-auto-ads'],
+    },
   },
-}, env => {
-
-  let win;
-  let adElement;
-  let storyElement;
-  let autoAds;
-
-  beforeEach(() => {
-    win = env.win;
-    adElement = win.document.createElement('amp-story-auto-ads');
-    storyElement = win.document.createElement('amp-story');
-    win.document.body.appendChild(storyElement);
-    storyElement.appendChild(adElement);
-    autoAds = new AmpStoryAutoAds(adElement);
-    autoAds.config_ = {
-      'ad-attributes': {
-        type: 'doubleclick',
-        'data-slot': '/30497360/samfrank_native_v2_a4a',
-      },
-    };
-  });
-
-  describe('glass pane', () => {
-    let page;
-    let pane;
+  env => {
+    let win;
+    let adElement;
+    let storyElement;
+    let autoAds;
 
     beforeEach(() => {
-      page = autoAds.createAdPage_();
-      pane = page.querySelector('.i-amphtml-glass-pane');
+      win = env.win;
+      adElement = win.document.createElement('amp-story-auto-ads');
+      storyElement = win.document.createElement('amp-story');
+      win.document.body.appendChild(storyElement);
+      storyElement.appendChild(adElement);
+      autoAds = new AmpStoryAutoAds(adElement);
+      autoAds.config_ = {
+        'ad-attributes': {
+          type: 'doubleclick',
+          'data-slot': '/30497360/samfrank_native_v2_a4a',
+        },
+      };
     });
 
-    it('should create glassPane', () => {
-      expect(pane).to.exist;
-    });
+    describe('glass pane', () => {
+      let page;
+      let pane;
 
-    it('glass pane should have full viewport grid parent', () => {
-      const parent = pane.parentElement;
-      expect(parent.tagName).to.equal('AMP-STORY-GRID-LAYER');
-      expect(parent.getAttribute('template')).to.equal('fill');
-    });
-  });
+      beforeEach(() => {
+        page = autoAds.createAdPage_();
+        pane = page.querySelector('.i-amphtml-glass-pane');
+      });
 
-  describe('visible attribute', () => {
-    beforeEach(() => {
-      sandbox.stub(autoAds, 'analyticsEvent_').returns(NOOP);
-      autoAds.adPagesCreated_ = 1;
-      autoAds.adPageIds_ = {'ad-page-1': 1};
-    });
+      it('should create glassPane', () => {
+        expect(pane).to.exist;
+      });
 
-    it('sets the visible attribute when showing', () => {
-      const setVisibleStub = sandbox.stub(autoAds, 'setVisibleAttribute_');
-      sandbox.stub(autoAds, 'startNextAdPage_').returns(NOOP);
-      // Switching to ad page.
-      autoAds.handleActivePageChange_(/* pageIndex */ 1,
-          /* pageId */ 'ad-page-1');
-      expect(setVisibleStub.calledOnce).to.be.true;
+      it('glass pane should have full viewport grid parent', () => {
+        const parent = pane.parentElement;
+        expect(parent.tagName).to.equal('AMP-STORY-GRID-LAYER');
+        expect(parent.getAttribute('template')).to.equal('fill');
+      });
     });
 
-    it('removes the visible attribute when showing', () => {
-      const removeVisibleStub = sandbox.stub(autoAds,
-          'removeVisibleAttribute_');
-      autoAds.idOfAdShowing_ = 'ad-page-1';
-      autoAds.handleActivePageChange_(/* pageIndex */ 2,
-          /* pageId */ 'non-ad-page');
-      expect(removeVisibleStub.calledOnce).to.be.true;
-    });
-  });
-
-  describe('analytics triggers', () => {
-    it('should fire "story-ad-insert" upon insertion', () => {
-      autoAds.uniquePagesCount_ = 10;
-      autoAds.adPagesCreated_ = 1;
-      sandbox.stub(autoAds, 'startNextAdPage_');
-      sandbox.stub(autoAds, 'tryToPlaceAdAfterPage_').returns(/* placed */ 1);
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.handleActivePageChange_(3, 'fakePage');
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-insert',
-          {'insertTime': sinon.match.number});
-    });
+    describe('visible attribute', () => {
+      beforeEach(() => {
+        sandbox.stub(autoAds, 'analyticsEvent_').returns(NOOP);
+        autoAds.adPagesCreated_ = 1;
+        autoAds.adPageIds_ = {'ad-page-1': 1};
+      });
 
-    it('should fire "story-ad-discard" upon discarded ad', () => {
-      autoAds.uniquePagesCount_ = 10;
-      autoAds.adPagesCreated_ = 1;
-      sandbox.stub(autoAds, 'startNextAdPage_');
-      sandbox.stub(autoAds, 'tryToPlaceAdAfterPage_').returns(/* discard */ 2);
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.handleActivePageChange_(3, 'fakePage');
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-discard',
-          {'discardTime': sinon.match.number});
-    });
+      it('sets the visible attribute when showing', () => {
+        const setVisibleStub = sandbox.stub(autoAds, 'setVisibleAttribute_');
+        sandbox.stub(autoAds, 'startNextAdPage_').returns(NOOP);
+        // Switching to ad page.
+        autoAds.handleActivePageChange_(
+          /* pageIndex */ 1,
+          /* pageId */ 'ad-page-1'
+        );
+        expect(setVisibleStub.calledOnce).to.be.true;
+      });
 
-    it('should fire "story-ad-load" upon ad load', function* () {
-      const signals = {whenSignal: () => Promise.resolve()};
-      const fakeImpl = {signals: () => signals};
-      const ad = win.document.createElement('amp-ad');
-      ad.getImpl = () => Promise.resolve(fakeImpl);
-      sandbox.stub(autoAds, 'createAdElement_').returns(ad);
-      autoAds.adPageEls_ = [ad];
-
-      const page = win.document.createElement('amp-story-page');
-      sandbox.stub(autoAds, 'createPageElement_').returns(page);
-      page.getImpl = () => Promise.resolve({delegateVideoAutoplay: () => {}});
-
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.createAdPage_();
-      yield macroTask();
-
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-load',
-          {'loadTime': sinon.match.number});
+      it('removes the visible attribute when showing', () => {
+        const removeVisibleStub = sandbox.stub(
+          autoAds,
+          'removeVisibleAttribute_'
+        );
+        autoAds.idOfAdShowing_ = 'ad-page-1';
+        autoAds.handleActivePageChange_(
+          /* pageIndex */ 2,
+          /* pageId */ 'non-ad-page'
+        );
+        expect(removeVisibleStub.calledOnce).to.be.true;
+      });
     });
 
-    it('should fire "story-ad-request" upon ad request', () => {
-      autoAds.ampStory_ = {
-        element: storyElement,
-        addPage: NOOP,
-      };
-      const page = win.document.createElement('amp-story-page');
-      sandbox.stub(autoAds, 'createAdPage_').returns(page);
-      page.getImpl = () => Promise.resolve();
-
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.schedulePage_();
+    describe('analytics triggers', () => {
+      it('should fire "story-ad-insert" upon insertion', () => {
+        autoAds.uniquePagesCount_ = 10;
+        autoAds.adPagesCreated_ = 1;
+        sandbox.stub(autoAds, 'startNextAdPage_');
+        sandbox.stub(autoAds, 'tryToPlaceAdAfterPage_').returns(/* placed */ 1);
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.handleActivePageChange_(3, 'fakePage');
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-insert', {
+          'insertTime': sinon.match.number,
+        });
+      });
 
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-request',
-          {'requestTime': sinon.match.number});
-    });
+      it('should fire "story-ad-discard" upon discarded ad', () => {
+        autoAds.uniquePagesCount_ = 10;
+        autoAds.adPagesCreated_ = 1;
+        sandbox.stub(autoAds, 'startNextAdPage_');
+        sandbox
+          .stub(autoAds, 'tryToPlaceAdAfterPage_')
+          .returns(/* discard */ 2);
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.handleActivePageChange_(3, 'fakePage');
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-discard', {
+          'discardTime': sinon.match.number,
+        });
+      });
 
-    it('should fire "story-ad-view" upon ad visible', () => {
-      autoAds.ampStory_ = {
-        element: storyElement,
-        addPage: NOOP,
-      };
-      autoAds.setVisibleAttribute_ = NOOP;
-      autoAds.adPagesCreated_ = 1;
-      const page = win.document.createElement('amp-story-page');
-      sandbox.stub(autoAds, 'createAdPage_').returns(page);
-      page.getImpl = () => Promise.resolve();
-
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.adPageIds_ = {'ad-page-1': 1};
-      autoAds.handleActivePageChange_(1, 'ad-page-1');
-
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-view',
-          {'viewTime': sinon.match.number});
-    });
+      it('should fire "story-ad-load" upon ad load', function*() {
+        const signals = {whenSignal: () => Promise.resolve()};
+        const fakeImpl = {signals: () => signals};
+        const ad = win.document.createElement('amp-ad');
+        ad.getImpl = () => Promise.resolve(fakeImpl);
+        sandbox.stub(autoAds, 'createAdElement_').returns(ad);
+        autoAds.adPageEls_ = [ad];
+
+        const page = win.document.createElement('amp-story-page');
+        sandbox.stub(autoAds, 'createPageElement_').returns(page);
+        page.getImpl = () => Promise.resolve({delegateVideoAutoplay: () => {}});
+
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.createAdPage_();
+        yield macroTask();
+
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-load', {
+          'loadTime': sinon.match.number,
+        });
+      });
 
-    it('should fire "story-ad-exit" upon ad exit', () => {
-      autoAds.ampStory_ = {
-        element: storyElement,
-        addPage: NOOP,
-      };
-      autoAds.adPagesCreated_ = 1;
-      const page = win.document.createElement('amp-story-page');
-      sandbox.stub(autoAds, 'createAdPage_').returns(page);
-      page.getImpl = () => Promise.resolve();
-
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.idOfAdShowing_ = 'ad-page-1';
-      autoAds.handleActivePageChange_(1, 'page-3');
-
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('story-ad-exit',
-          {'exitTime': sinon.match.number});
-    });
-  });
+      it('should fire "story-ad-request" upon ad request', () => {
+        autoAds.ampStory_ = {
+          element: storyElement,
+          addPage: NOOP,
+        };
+        const page = win.document.createElement('amp-story-page');
+        sandbox.stub(autoAds, 'createAdPage_').returns(page);
+        page.getImpl = () => Promise.resolve();
+
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.schedulePage_();
+
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-request', {
+          'requestTime': sinon.match.number,
+        });
+      });
 
-  describe('analyticsEvent_', () => {
-    let triggerStub;
+      it('should fire "story-ad-view" upon ad visible', () => {
+        autoAds.ampStory_ = {
+          element: storyElement,
+          addPage: NOOP,
+        };
+        autoAds.setVisibleAttribute_ = NOOP;
+        autoAds.adPagesCreated_ = 1;
+        const page = win.document.createElement('amp-story-page');
+        sandbox.stub(autoAds, 'createAdPage_').returns(page);
+        page.getImpl = () => Promise.resolve();
+
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.adPageIds_ = {'ad-page-1': 1};
+        autoAds.handleActivePageChange_(1, 'ad-page-1');
+
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-view', {
+          'viewTime': sinon.match.number,
+        });
+      });
 
-    beforeEach(() => {
-      triggerStub = sandbox.stub(analytics, 'triggerAnalyticsEvent');
-      autoAds.analyticsData_ = {1: {}};
+      it('should fire "story-ad-exit" upon ad exit', () => {
+        autoAds.ampStory_ = {
+          element: storyElement,
+          addPage: NOOP,
+        };
+        autoAds.adPagesCreated_ = 1;
+        const page = win.document.createElement('amp-story-page');
+        sandbox.stub(autoAds, 'createAdPage_').returns(page);
+        page.getImpl = () => Promise.resolve();
+
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.idOfAdShowing_ = 'ad-page-1';
+        autoAds.handleActivePageChange_(1, 'page-3');
+
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('story-ad-exit', {
+          'exitTime': sinon.match.number,
+        });
+      });
     });
 
-    it('should trigger the appropriate event', () => {
-      const vars = {
-        adIndex: 1,
-        foo: 1,
-      };
+    describe('analyticsEvent_', () => {
+      let triggerStub;
 
-      autoAds.analyticsEvent_('my-event', vars);
-      expect(triggerStub).calledWith(sinon.match.any, 'my-event',
-          sinon.match(vars));
-    });
+      beforeEach(() => {
+        triggerStub = sandbox.stub(analytics, 'triggerAnalyticsEvent');
+        autoAds.analyticsData_ = {1: {}};
+      });
 
-    it('should aggregate data from previous events', () => {
-      autoAds.analyticsEvent_('event-1', {adIndex: 1, foo: 1});
-      autoAds.analyticsEvent_('event-2', {adIndex: 1, bar: 2});
-      autoAds.analyticsEvent_('event-3', {adIndex: 1, baz: 3});
-      expect(triggerStub).calledThrice;
-      expect(triggerStub).calledWith(sinon.match.any, 'event-3',
+      it('should trigger the appropriate event', () => {
+        const vars = {
+          adIndex: 1,
+          foo: 1,
+        };
+
+        autoAds.analyticsEvent_('my-event', vars);
+        expect(triggerStub).calledWith(
+          sinon.match.any,
+          'my-event',
+          sinon.match(vars)
+        );
+      });
+
+      it('should aggregate data from previous events', () => {
+        autoAds.analyticsEvent_('event-1', {adIndex: 1, foo: 1});
+        autoAds.analyticsEvent_('event-2', {adIndex: 1, bar: 2});
+        autoAds.analyticsEvent_('event-3', {adIndex: 1, baz: 3});
+        expect(triggerStub).calledThrice;
+        expect(triggerStub).calledWith(
+          sinon.match.any,
+          'event-3',
           sinon.match({
             adIndex: 1,
             foo: 1,
             bar: 2,
             baz: 3,
-          }));
-    });
-  });
-
-  describe('analyticsEventWithCurrentAd_', () => {
-    it('should add the current ad index and call #analyticsEvent_', () => {
-      const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
-      autoAds.analyticsEventWithCurrentAd_('cool-event', {foo: 1});
-      expect(analyticsStub).to.be.called;
-      expect(analyticsStub).to.have.been.calledWithMatch('cool-event',
-          {foo: 1});
-    });
-  });
-
-  describe('creation of attributes', () => {
-    it('should not allow blacklisted attributes', () => {
-      Object.assign(autoAds.config_['ad-attributes'], {
-        height: 100,
-        width: 100,
-        layout: 'responsive',
+          })
+        );
       });
+    });
 
-      const adElement = autoAds.createAdElement_();
-      expect(adElement.hasAttribute('type')).to.be.true;
-      expect(adElement.hasAttribute('data-slot')).to.be.true;
-      expect(adElement.hasAttribute('width')).to.be.false;
-      expect(adElement.hasAttribute('height')).to.be.false;
-      expect(adElement.getAttribute('layout')).to.equal('fill');
+    describe('analyticsEventWithCurrentAd_', () => {
+      it('should add the current ad index and call #analyticsEvent_', () => {
+        const analyticsStub = sandbox.stub(autoAds, 'analyticsEvent_');
+        autoAds.analyticsEventWithCurrentAd_('cool-event', {foo: 1});
+        expect(analyticsStub).to.be.called;
+        expect(analyticsStub).to.have.been.calledWithMatch('cool-event', {
+          foo: 1,
+        });
+      });
     });
 
-    it('should stringify attributes given as objects', () => {
-      Object.assign(autoAds.config_['ad-attributes'], {
-        'rtc-config': {
-          vendors: {
-            vendor1: {'SLOT_ID': 1},
-            vendor2: {'PAGE_ID': 'abc'},
-          },
-        },
+    describe('creation of attributes', () => {
+      it('should not allow blacklisted attributes', () => {
+        Object.assign(autoAds.config_['ad-attributes'], {
+          height: 100,
+          width: 100,
+          layout: 'responsive',
+        });
+
+        const adElement = autoAds.createAdElement_();
+        expect(adElement.hasAttribute('type')).to.be.true;
+        expect(adElement.hasAttribute('data-slot')).to.be.true;
+        expect(adElement.hasAttribute('width')).to.be.false;
+        expect(adElement.hasAttribute('height')).to.be.false;
+        expect(adElement.getAttribute('layout')).to.equal('fill');
       });
 
-      const adElement = autoAds.createAdElement_();
-      expect(adElement.getAttribute('rtc-config'))
-          .to.equal('{"vendors":{"vendor1":{"SLOT_ID":1},' +
-          '"vendor2":{"PAGE_ID":"abc"}}}');
+      it('should stringify attributes given as objects', () => {
+        Object.assign(autoAds.config_['ad-attributes'], {
+          'rtc-config': {
+            vendors: {
+              vendor1: {'SLOT_ID': 1},
+              vendor2: {'PAGE_ID': 'abc'},
+            },
+          },
+        });
+
+        const adElement = autoAds.createAdElement_();
+        expect(adElement.getAttribute('rtc-config')).to.equal(
+          '{"vendors":{"vendor1":{"SLOT_ID":1},' +
+            '"vendor2":{"PAGE_ID":"abc"}}}'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-story-auto-ads/0.1/utils.js b/extensions/amp-story-auto-ads/0.1/utils.js
index 2f993a67e843..2ec5b7ad1365 100644
--- a/extensions/amp-story-auto-ads/0.1/utils.js
+++ b/extensions/amp-story-auto-ads/0.1/utils.js
@@ -16,7 +16,6 @@
 
 import {getCryptoRandomBytesArray} from '../../../src/utils/bytes';
 
-
 /**
  * Returns an string with a total of 128 of random values based on the
  * `win.crypto.getRandomValues` API. If that is not available concatenates
@@ -33,6 +32,11 @@ export function getUniqueId(win) {
   }
 
   // Support for legacy browsers.
-  return String(win.location.href + Date.now() +
-      win.Math.random() + win.screen.width + win.screen.height);
+  return String(
+    win.location.href +
+      Date.now() +
+      win.Math.random() +
+      win.screen.width +
+      win.screen.height
+  );
 }
diff --git a/extensions/amp-story/0.1/_locales/default.js b/extensions/amp-story/0.1/_locales/default.js
index 68909354f9fc..9d3504ac608b 100644
--- a/extensions/amp-story/0.1/_locales/default.js
+++ b/extensions/amp-story/0.1/_locales/default.js
@@ -18,7 +18,6 @@ import {
   LocalizedStringId,
 } from '../../../../src/localized-strings';
 
-
 /**
  * Localized string bundle used for English strings.
  * @const {!LocalizedStringBundleDef}
@@ -58,8 +57,9 @@ const strings = {
     string: 'The page is best viewed in portrait mode',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'We\'re sorry, it looks like your browser doesn\'t support ' +
-        'this experience',
+    string:
+      "We're sorry, it looks like your browser doesn't support " +
+      'this experience',
   },
 };
 
diff --git a/extensions/amp-story/0.1/_locales/en.js b/extensions/amp-story/0.1/_locales/en.js
index d80b996086ec..19e0903a3a38 100644
--- a/extensions/amp-story/0.1/_locales/en.js
+++ b/extensions/amp-story/0.1/_locales/en.js
@@ -18,7 +18,6 @@ import {
   LocalizedStringId,
 } from '../../../../src/localized-strings';
 
-
 /**
  * Localized string bundle used for English strings.
  * @const {!LocalizedStringBundleDef}
@@ -26,33 +25,38 @@ import {
 const strings = {
   [LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE]: {
     string: 'Privacy settings',
-    description: 'Title for a section that allows the user to configure ' +
-        'their privacy settings',
+    description:
+      'Title for a section that allows the user to configure ' +
+      'their privacy settings',
   },
   [LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL]: {
     string: 'Change data privacy settings',
-    description: 'Label for a button that allows the user to change their ' +
-        'choice to consent to providing their cookie access.',
+    description:
+      'Label for a button that allows the user to change their ' +
+      'choice to consent to providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL]: {
     string: 'Accept',
-    description: 'Label for a button that allows the user to consent to ' +
-        'providing their cookie access.',
+    description:
+      'Label for a button that allows the user to consent to ' +
+      'providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL]: {
     string: 'Decline',
-    description: 'Label for a button that allows the user to disconsent to ' +
-        'providing their cookie access.',
+    description:
+      'Label for a button that allows the user to disconsent to ' +
+      'providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL]: {
     string: 'View on original domain:',
-    description: 'Label for a heading of a dialog that shows the user the ' +
-        'domain from which the story is served.',
+    description:
+      'Label for a heading of a dialog that shows the user the ' +
+      'domain from which the story is served.',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK]: {
     string: 'More about AMP results',
-    description: 'Label for a link to documentation on how AMP links are ' +
-        'handled.',
+    description:
+      'Label for a link to documentation on how AMP links are handled.',
   },
   [LocalizedStringId.DEPRECATED_AMP_STORY_EXPERIMENT_ENABLE_BUTTON_LABEL]: {
     string: 'Enable',
@@ -60,109 +64,122 @@ const strings = {
   },
   [LocalizedStringId.DEPRECATED_AMP_STORY_EXPERIMENT_ENABLED_TEXT]: {
     string: 'Experiment enabled.  Please reload.',
-    description: 'Text that is shown once the amp-story experiment has ' +
-        'been successfully enabled.',
+    description:
+      'Text that is shown once the amp-story experiment has ' +
+      'been successfully enabled.',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
     string: 'Tap Next',
-    description: 'Label indicating that users can navigate to the next ' +
-        'page, in the amp-story hint UI.',
+    description:
+      'Label indicating that users can navigate to the next ' +
+      'page, in the amp-story hint UI.',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
     string: 'Tap Back',
-    description: 'Label indicating that users can navigate to the previous ' +
-        'page, in the amp-story hint UI.',
+    description:
+      'Label indicating that users can navigate to the previous ' +
+      'page, in the amp-story hint UI.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT]: {
     string: 'Could not copy link to clipboard :(',
-    description: 'String shown in a failure message to inform the user that ' +
-        'a link could not be successfully copied to their clipboard.',
+    description:
+      'String shown in a failure message to inform the user that ' +
+      'a link could not be successfully copied to their clipboard.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT]: {
     string: 'Link copied!',
-    description: 'String shown in a confirmation message to inform the user ' +
-        'that a link was successfully copied to their clipboard.',
+    description:
+      'String shown in a confirmation message to inform the user ' +
+      'that a link was successfully copied to their clipboard.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL]: {
     string: 'Email',
-    description: 'Button label for the share target that shares a link via ' +
-        'email.',
+    description:
+      'Button label for the share target that shares a link via email.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK]: {
     string: 'Facebook',
-    description: 'Button label for the share target that shares a link via ' +
-        'Facebook.',
+    description:
+      'Button label for the share target that shares a link via Facebook.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_GOOGLE_PLUS]: {
     string: 'Google+',
-    description: 'Button label for the share target that shares a link via ' +
-        'Google+.',
+    description:
+      'Button label for the share target that shares a link via Google+.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK]: {
     string: 'Get Link',
-    description: 'Button label for the share target that shares a link via ' +
-        'by copying it to the user\'s clipboard.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      "by copying it to the user's clipboard.",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN]: {
     string: 'LinkedIn',
-    description: 'Button label for the share target that shares a link via ' +
-        'LinkedIn.',
+    description:
+      'Button label for the share target that shares a link via LinkedIn.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_PINTEREST]: {
     string: 'Pinterest',
-    description: 'Button label for the share target that shares a link via ' +
-        'Pinterest.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      'Pinterest.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SMS]: {
     string: 'SMS',
-    description: 'Button label for the share target that shares a link via ' +
-        'SMS.',
+    description:
+      'Button label for the share target that shares a link via SMS.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM]: {
     string: 'More',
-    description: 'Button label for the share target that shares a link via ' +
-        'deferral to the operating system\'s native sharing handler.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      "deferral to the operating system's native sharing handler.",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TUMBLR]: {
     string: 'Tumblr',
-    description: 'Button label for the share target that shares a link via ' +
-        'Tumblr.',
+    description:
+      'Button label for the share target that shares a link via Tumblr.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TWITTER]: {
     string: 'Twitter',
-    description: 'Button label for the share target that shares a link via ' +
-        'Twitter.',
+    description:
+      'Button label for the share target that shares a link via Twitter.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_WHATSAPP]: {
     string: 'Whatsapp',
-    description: 'Button label for the share target that shares a link via ' +
-        'Whatsapp.',
+    description:
+      'Button label for the share target that shares a link via Whatsapp.',
   },
   [LocalizedStringId.DEPRECATED_AMP_STORY_SYSTEM_LAYER_SHARE_WIDGET_LABEL]: {
     string: 'Share',
-    description: 'Label for the expandable share widget shown in the ' +
-        'desktop UI.',
+    description:
+      'Label for the expandable share widget shown in the desktop UI.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
     string: 'Expand your window to view this experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in larger browser windows.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in larger browser windows.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
     string: 'You must enable the amp-story experiment to view this content.',
-    description: 'Text for a warning screen that informs the user that ' +
-        'they must enable an experiment to use stories.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'they must enable an experiment to use stories.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'The page is best viewed in portrait mode',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in portrait orientation.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in portrait orientation.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'We\'re sorry, it looks like your browser doesn\'t support ' +
-        'this experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'their browser does not support stories.',
+    string:
+      "We're sorry, it looks like your browser doesn't support " +
+      'this experience',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'their browser does not support stories.',
   },
 };
 
diff --git a/extensions/amp-story/0.1/amp-story-bookend.js b/extensions/amp-story/0.1/amp-story-bookend.js
index 194ff17a90f3..d1012d477192 100644
--- a/extensions/amp-story/0.1/amp-story-bookend.js
+++ b/extensions/amp-story/0.1/amp-story-bookend.js
@@ -61,28 +61,26 @@ const DEPRECATED_BOOKEND_VERSION_KEY = 'bookend-version';
  */
 export let BookendConfigDef;
 
-
 /**
  * Scroll amount required for full-bleed in px.
  * @private @const {number}
  */
 const FULLBLEED_THRESHOLD = 88;
 
-
 /** @private @const {string} */
 const FULLBLEED_CLASSNAME = 'i-amphtml-story-bookend-fullbleed';
 
-
 /** @private @const {string} */
 const HIDDEN_CLASSNAME = 'i-amphtml-hidden';
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const ROOT_TEMPLATE = {
   tag: 'section',
   attrs: dict({
-    'class': 'i-amphtml-story-bookend i-amphtml-story-system-reset ' +
-        HIDDEN_CLASSNAME}),
+    'class':
+      'i-amphtml-story-bookend i-amphtml-story-system-reset ' +
+      HIDDEN_CLASSNAME,
+  }),
   children: [
     // Overflow container that gets pushed to the bottom when content height is
     // smaller than viewport.
@@ -100,18 +98,15 @@ const ROOT_TEMPLATE = {
   ],
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const REPLAY_ICON_TEMPLATE = {
   tag: 'div',
   attrs: dict({'class': 'i-amphtml-story-bookend-replay-icon'}),
 };
 
-
 /** @type {string} */
 const TAG = 'amp-story';
 
-
 /**
  * @param {?string} consentId
  * @return {!./simple-template.ElementDef}
@@ -125,7 +120,7 @@ const buildPromptConsentTemplate = consentId => {
         tag: 'h3',
         attrs: dict({'class': 'i-amphtml-story-bookend-heading'}),
         localizedStringId:
-            LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE,
+          LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE,
       },
       {
         tag: 'h2',
@@ -136,13 +131,12 @@ const buildPromptConsentTemplate = consentId => {
           'aria-label': 'Change data privacy settings',
         }),
         localizedStringId:
-            LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL,
+          LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL,
       },
     ],
   });
 };
 
-
 /**
  * @param {!./related-articles.RelatedArticleDef} articleData
  * @return {!./simple-template.ElementDef}
@@ -170,21 +164,22 @@ function buildArticleTemplate(articleData) {
   });
 
   if (articleData.image) {
-    template.children.unshift(/** @type {!./simple-template.ElementDef} */ ({
-      tag: 'amp-img',
-      attrs: dict({
-        'class': 'i-amphtml-story-bookend-article-image',
-        'src': articleData.image,
-        'width': 100,
-        'height': 100,
-      }),
-    }));
+    template.children.unshift(
+      /** @type {!./simple-template.ElementDef} */ ({
+        tag: 'amp-img',
+        attrs: dict({
+          'class': 'i-amphtml-story-bookend-article-image',
+          'src': articleData.image,
+          'width': 100,
+          'height': 100,
+        }),
+      })
+    );
   }
 
   return template;
 }
 
-
 /**
  * @param {!Array<!./related-articles.RelatedArticleSetDef>} articleSets
  * @return {!Array<!./simple-template.ElementDef>}
@@ -204,14 +199,14 @@ function buildArticlesContainerTemplate(articleSets) {
       tag: 'div',
       attrs: dict({'class': 'i-amphtml-story-bookend-article-set'}),
       children: articleSet.articles.map(article =>
-        buildArticleTemplate(article)),
+        buildArticleTemplate(article)
+      ),
     });
   });
 
   return template;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} title
@@ -224,14 +219,16 @@ function buildReplayButtonTemplate(doc, title, domainName, opt_imageUrl) {
     tag: 'div',
     attrs: dict({'class': 'i-amphtml-story-bookend-replay'}),
     children: [
-      !opt_imageUrl ? REPLAY_ICON_TEMPLATE : {
-        tag: 'div',
-        attrs: dict({
-          'class': 'i-amphtml-story-bookend-replay-image',
-          'style': `background-image: url(${opt_imageUrl}) !important`,
-        }),
-        children: [REPLAY_ICON_TEMPLATE],
-      },
+      !opt_imageUrl
+        ? REPLAY_ICON_TEMPLATE
+        : {
+            tag: 'div',
+            attrs: dict({
+              'class': 'i-amphtml-story-bookend-replay-image',
+              'style': `background-image: url(${opt_imageUrl}) !important`,
+            }),
+            children: [REPLAY_ICON_TEMPLATE],
+          },
       {
         tag: 'h2',
         attrs: dict({'class': 'i-amphtml-story-bookend-article-heading'}),
@@ -246,7 +243,6 @@ function buildReplayButtonTemplate(doc, title, domainName, opt_imageUrl) {
   });
 }
 
-
 /**
  * Bookend component for <amp-story>.
  * This component has to be built and preloaded before it can be displayed,
@@ -328,10 +324,10 @@ export class Bookend {
     const consentId = this.storeService_.get(StateProperty.CONSENT_ID);
 
     if (consentId) {
-      const promptConsentEl =
-          renderAsElement(
-              this.win_.document,
-              buildPromptConsentTemplate(String(consentId)));
+      const promptConsentEl = renderAsElement(
+        this.win_.document,
+        buildPromptConsentTemplate(String(consentId))
+      );
       innerContainer.appendChild(promptConsentEl);
     }
 
@@ -346,15 +342,19 @@ export class Bookend {
    * @private
    */
   initializeListeners_() {
-    this.getShadowRoot()
-        .addEventListener('click', event => this.onClick_(event));
-    this.replayButton_.addEventListener(
-        'click', event => this.onReplayButtonClick_(event));
-
-    this.getOverflowContainer_().addEventListener('scroll',
-        // minInterval is high since this is a step function that does not
-        // require smoothness
-        throttle(this.win_, () => this.onScroll_(), 100));
+    this.getShadowRoot().addEventListener('click', event =>
+      this.onClick_(event)
+    );
+    this.replayButton_.addEventListener('click', event =>
+      this.onReplayButtonClick_(event)
+    );
+
+    this.getOverflowContainer_().addEventListener(
+      'scroll',
+      // minInterval is high since this is a step function that does not
+      // require smoothness
+      throttle(this.win_, () => this.onScroll_(), 100)
+    );
 
     this.win_.addEventListener('keyup', event => {
       if (!this.isActive_()) {
@@ -370,13 +370,21 @@ export class Bookend {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.CAN_SHOW_SHARING_UIS, show => {
-      this.onCanShowSharingUisUpdate_(show);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.CAN_SHOW_SHARING_UIS,
+      show => {
+        this.onCanShowSharingUisUpdate_(show);
+      },
+      true /** callToInitialize */
+    );
 
-    this.storeService_.subscribe(StateProperty.DESKTOP_STATE, isDesktop => {
-      this.onDesktopStateUpdate_(isDesktop);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.DESKTOP_STATE,
+      isDesktop => {
+        this.onDesktopStateUpdate_(isDesktop);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -414,8 +422,10 @@ export class Bookend {
    */
   onCanShowSharingUisUpdate_(canShowSharingUis) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-no-sharing', !canShowSharingUis);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-no-sharing',
+        !canShowSharingUis
+      );
     });
   }
 
@@ -436,13 +446,19 @@ export class Bookend {
    */
   readBookendVersion_(config) {
     if (config[DEPRECATED_BOOKEND_VERSION_KEY]) {
-      user().warn('AMP-STORY-BOOKEND', '`bookend-version` and ' +
-      '`share-providers` keys in the bookend config are deprecated, please ' +
-      '`bookendVersion` and `shareProviders` keys');
+      user().warn(
+        'AMP-STORY-BOOKEND',
+        '`bookend-version` and ' +
+          '`share-providers` keys in the bookend config are deprecated, please ' +
+          '`bookendVersion` and `shareProviders` keys'
+      );
     }
 
-    return config[DEPRECATED_BOOKEND_VERSION_KEY] ||
-      config[BOOKEND_VERSION_KEY] || null;
+    return (
+      config[DEPRECATED_BOOKEND_VERSION_KEY] ||
+      config[BOOKEND_VERSION_KEY] ||
+      null
+    );
   }
 
   /**
@@ -460,40 +476,41 @@ export class Bookend {
       return Promise.resolve(this.config_);
     }
 
-    return this.requestService_.loadBookendConfig()
-        .then(response => {
-          if (!response) {
-            return null;
-          }
-          if (this.readBookendVersion_(response) === BOOKEND_VERSION_1) {
-            this.config_ = {
-              shareProviders:
-                this.shareWidget_.parseProvidersToClassicApi(
-                    response[SHARE_PROVIDERS_KEY] ||
-                    response[DEPRECATED_SHARE_PROVIDERS_KEY]),
-              relatedArticles:
-                parseArticlesToClassicApi(response['components']),
-            };
-          } else {
-            this.config_ = {
-              shareProviders: response['share-providers'],
-              relatedArticles:
-                  relatedArticlesFromJson(response['related-articles']),
-            };
-          }
-
-          // Allows the config to be fetched before the component is built, for
-          // cases like getting the share providers on desktop.
-          if (applyConfig) {
-            this.setConfig_(this.config_);
-          }
-
-          return this.config_;
-        })
-        .catch(e => {
-          user().error(TAG, 'Error fetching bookend configuration', e.message);
+    return this.requestService_
+      .loadBookendConfig()
+      .then(response => {
+        if (!response) {
           return null;
-        });
+        }
+        if (this.readBookendVersion_(response) === BOOKEND_VERSION_1) {
+          this.config_ = {
+            shareProviders: this.shareWidget_.parseProvidersToClassicApi(
+              response[SHARE_PROVIDERS_KEY] ||
+                response[DEPRECATED_SHARE_PROVIDERS_KEY]
+            ),
+            relatedArticles: parseArticlesToClassicApi(response['components']),
+          };
+        } else {
+          this.config_ = {
+            shareProviders: response['share-providers'],
+            relatedArticles: relatedArticlesFromJson(
+              response['related-articles']
+            ),
+          };
+        }
+
+        // Allows the config to be fetched before the component is built, for
+        // cases like getting the share providers on desktop.
+        if (applyConfig) {
+          this.setConfig_(this.config_);
+        }
+
+        return this.config_;
+      })
+      .catch(e => {
+        user().error(TAG, 'Error fetching bookend configuration', e.message);
+        return null;
+      });
   }
 
   /**
@@ -541,16 +558,22 @@ export class Bookend {
     if (!this.isActive_()) {
       return;
     }
-    this.vsync_.run({
-      measure: state => {
-        state.shouldBeFullBleed =
-            this.getOverflowContainer_()./*OK*/scrollTop >= FULLBLEED_THRESHOLD;
-      },
-      mutate: state => {
-        this.getShadowRoot().classList.toggle(
-            FULLBLEED_CLASSNAME, state.shouldBeFullBleed);
+    this.vsync_.run(
+      {
+        measure: state => {
+          state.shouldBeFullBleed =
+            this.getOverflowContainer_()./*OK*/ scrollTop >=
+            FULLBLEED_THRESHOLD;
+        },
+        mutate: state => {
+          this.getShadowRoot().classList.toggle(
+            FULLBLEED_CLASSNAME,
+            state.shouldBeFullBleed
+          );
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -570,9 +593,9 @@ export class Bookend {
    */
   toggleDesktopAttribute_(isDesktop) {
     this.vsync_.mutate(() => {
-      isDesktop ?
-        this.getShadowRoot().setAttribute('desktop', '') :
-        this.getShadowRoot().removeAttribute('desktop');
+      isDesktop
+        ? this.getShadowRoot().setAttribute('desktop', '')
+        : this.getShadowRoot().removeAttribute('desktop');
     });
   }
 
@@ -610,8 +633,11 @@ export class Bookend {
   setRelatedArticles_(articleSets) {
     this.vsync_.mutate(() => {
       this.getInnerContainer_().appendChild(
-          renderSimpleTemplate(this.win_.document,
-              buildArticlesContainerTemplate(articleSets)));
+        renderSimpleTemplate(
+          this.win_.document,
+          buildArticlesContainerTemplate(articleSets)
+        )
+      );
     });
   }
 
@@ -658,19 +684,24 @@ export class Bookend {
     const jsonLd = getJsonLd(ampdoc.getRootNode());
 
     const metadata = {
-      title: jsonLd && jsonLd['headline'] ?
-        jsonLd['headline'] :
-        user().assertElement(
-            this.win_.document.head.querySelector('title'),
-            'Please set <title> or structured data (JSON-LD).').textContent,
+      title:
+        jsonLd && jsonLd['headline']
+          ? jsonLd['headline']
+          : user().assertElement(
+              this.win_.document.head.querySelector('title'),
+              'Please set <title> or structured data (JSON-LD).'
+            ).textContent,
 
       domainName: parseUrlDeprecated(
-          Services.documentInfoForDoc(ampdoc).canonicalUrl).hostname,
+        Services.documentInfoForDoc(ampdoc).canonicalUrl
+      ).hostname,
     };
 
     if (jsonLd && isArray(jsonLd['image']) && jsonLd['image'].length) {
-      userAssert(isProtocolValid(jsonLd['image']),
-          `Unsupported protocol for story image URL ${jsonLd['image']}`);
+      userAssert(
+        isProtocolValid(jsonLd['image']),
+        `Unsupported protocol for story image URL ${jsonLd['image']}`
+      );
       metadata.imageUrl = jsonLd['image'][0];
     }
 
@@ -683,10 +714,14 @@ export class Bookend {
    */
   buildReplayButton_() {
     const metadata = this.getStoryMetadata_();
-    return renderAsElement(this.win_.document, buildReplayButtonTemplate(
+    return renderAsElement(
+      this.win_.document,
+      buildReplayButtonTemplate(
         this.win_.document,
         metadata.title,
         metadata.domainName,
-        metadata.imageUrl));
+        metadata.imageUrl
+      )
+    );
   }
 }
diff --git a/extensions/amp-story/0.1/amp-story-consent.js b/extensions/amp-story/0.1/amp-story-consent.js
index 4d33ae59bacf..51fbcddb6e98 100644
--- a/extensions/amp-story/0.1/amp-story-consent.js
+++ b/extensions/amp-story/0.1/amp-story-consent.js
@@ -39,7 +39,6 @@ import {parseJson} from '../../../src/json';
 import {renderAsElement} from './simple-template';
 import {throttle} from '../../../src/utils/rate-limit';
 
-
 /** @const {string} */
 const TAG = 'amp-story-consent';
 
@@ -64,7 +63,8 @@ const DEFAULT_OPTIONAL_PARAMETERS = {
 const getTemplate = (config, consentId, logoSrc) => ({
   tag: 'div',
   attrs: dict({
-    'class': 'i-amphtml-story-consent i-amphtml-story-system-reset'}),
+    'class': 'i-amphtml-story-consent i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -82,8 +82,9 @@ const getTemplate = (config, consentId, logoSrc) => ({
                   tag: 'div',
                   attrs: dict({
                     'class': 'i-amphtml-story-consent-logo',
-                    'style': logoSrc ?
-                      `background-image: url('${logoSrc}') !important;` : '',
+                    'style': logoSrc
+                      ? `background-image: url('${logoSrc}') !important;`
+                      : '',
                   }),
                   children: [],
                 },
@@ -108,22 +109,23 @@ const getTemplate = (config, consentId, logoSrc) => ({
                 {
                   tag: 'ul',
                   attrs: dict({'class': 'i-amphtml-story-consent-vendors'}),
-                  children: config.vendors && config.vendors.map(vendor => (
-                    {
+                  children:
+                    config.vendors &&
+                    config.vendors.map(vendor => ({
                       tag: 'li',
                       attrs: dict({'class': 'i-amphtml-story-consent-vendor'}),
                       children: [],
                       unlocalizedString: vendor,
-                    })
-                  ),
+                    })),
                 },
                 {
                   tag: 'a',
                   attrs: dict({
-                    'class': 'i-amphtml-story-consent-external-link ' +
-                        (!(config.externalLink.title &&
-                            config.externalLink.href) ?
-                          'i-amphtml-hidden' : ''),
+                    'class':
+                      'i-amphtml-story-consent-external-link ' +
+                      (!(config.externalLink.title && config.externalLink.href)
+                        ? 'i-amphtml-hidden'
+                        : ''),
                     'href': config.externalLink.href,
                     'target': '_top',
                     'title': config.externalLink.title,
@@ -142,25 +144,27 @@ const getTemplate = (config, consentId, logoSrc) => ({
             {
               tag: 'button',
               attrs: dict({
-                'class': 'i-amphtml-story-consent-action ' +
-                    'i-amphtml-story-consent-action-reject' +
-                    (config.onlyAccept === true ? ' i-amphtml-hidden' : ''),
+                'class':
+                  'i-amphtml-story-consent-action ' +
+                  'i-amphtml-story-consent-action-reject' +
+                  (config.onlyAccept === true ? ' i-amphtml-hidden' : ''),
                 'on': `tap:${consentId}.reject`,
               }),
               children: [],
               localizedStringId:
-                  LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL,
+                LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL,
             },
             {
               tag: 'button',
               attrs: dict({
-                'class': 'i-amphtml-story-consent-action ' +
-                    'i-amphtml-story-consent-action-accept',
+                'class':
+                  'i-amphtml-story-consent-action ' +
+                  'i-amphtml-story-consent-action-accept',
                 'on': `tap:${consentId}.accept`,
               }),
               children: [],
               localizedStringId:
-                  LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL,
+                LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL,
             },
           ],
         },
@@ -198,8 +202,10 @@ export class AmpStoryConsent extends AMP.BaseElement {
     this.assertAndParseConfig_();
 
     const storyEl = closestAncestorElementBySelector(this.element, 'AMP-STORY');
-    const consentEl = closestAncestorElementBySelector(this.element,
-        'AMP-CONSENT');
+    const consentEl = closestAncestorElementBySelector(
+      this.element,
+      'AMP-CONSENT'
+    );
     const consentId = consentEl.id;
     this.storeService_.dispatch(Action.SET_CONSENT_ID, consentId);
 
@@ -207,14 +213,17 @@ export class AmpStoryConsent extends AMP.BaseElement {
 
     if (!logoSrc) {
       user().warn(
-          TAG, 'Expected "publisher-logo-src" attribute on <amp-story>');
+        TAG,
+        'Expected "publisher-logo-src" attribute on <amp-story>'
+      );
     }
 
     // Story consent config is set by the `assertAndParseConfig_` method.
     if (this.storyConsentConfig_) {
       this.storyConsentEl_ = renderAsElement(
-          this.win.document,
-          getTemplate(this.storyConsentConfig_, consentId, logoSrc));
+        this.win.document,
+        getTemplate(this.storyConsentConfig_, consentId, logoSrc)
+      );
       createShadowRootWithStyle(this.element, this.storyConsentEl_, CSS);
 
       // Allow <amp-consent> actions in STAMP (defaults to no actions allowed).
@@ -238,12 +247,18 @@ export class AmpStoryConsent extends AMP.BaseElement {
    */
   initializeListeners_() {
     this.storyConsentEl_.addEventListener(
-        'click', event => this.onClick_(event), true /** useCapture */);
-
-    this.scrollableEl_ =
-        this.storyConsentEl_.querySelector('.i-amphtml-story-consent-overflow');
+      'click',
+      event => this.onClick_(event),
+      true /** useCapture */
+    );
+
+    this.scrollableEl_ = this.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-overflow'
+    );
     this.scrollableEl_.addEventListener(
-        'scroll', throttle(this.win, () => this.onScroll_(), 100));
+      'scroll',
+      throttle(this.win, () => this.onScroll_(), 100)
+    );
   }
 
   /**
@@ -268,15 +283,18 @@ export class AmpStoryConsent extends AMP.BaseElement {
   onScroll_() {
     let isFullBleed;
 
-    const measurer =
-        () => isFullBleed = this.scrollableEl_./*OK*/scrollTop > 88;
+    const measurer = () =>
+      (isFullBleed = this.scrollableEl_./*OK*/ scrollTop > 88);
     const mutator = () => {
-      this.storyConsentEl_
-          .classList.toggle('i-amphtml-story-consent-fullbleed', isFullBleed);
+      this.storyConsentEl_.classList.toggle(
+        'i-amphtml-story-consent-fullbleed',
+        isFullBleed
+      );
     };
 
-    this.element.getResources()
-        .measureMutateElement(this.storyConsentEl_, measurer, mutator);
+    this.element
+      .getResources()
+      .measureMutateElement(this.storyConsentEl_, measurer, mutator);
   }
 
   /**
@@ -288,38 +306,49 @@ export class AmpStoryConsent extends AMP.BaseElement {
     const storyConsentScript = childElementByTag(this.element, 'script');
 
     userAssert(
-        storyConsentScript && isJsonScriptTag(storyConsentScript),
-        `${TAG} config should be put in a <script> tag with ` +
-        'type="application/json"');
+      storyConsentScript && isJsonScriptTag(storyConsentScript),
+      `${TAG} config should be put in a <script> tag with ` +
+        'type="application/json"'
+    );
 
-    this.storyConsentConfig_ =
-        Object.assign(
-            {},
-            DEFAULT_OPTIONAL_PARAMETERS,
-            /** @type {Object} */ (parseJson(storyConsentScript.textContent)));
+    this.storyConsentConfig_ = Object.assign(
+      {},
+      DEFAULT_OPTIONAL_PARAMETERS,
+      /** @type {Object} */ (parseJson(storyConsentScript.textContent))
+    );
 
     user().assertString(
-        this.storyConsentConfig_.title, `${TAG}: config requires a title`);
+      this.storyConsentConfig_.title,
+      `${TAG}: config requires a title`
+    );
     user().assertString(
-        this.storyConsentConfig_.message, `${TAG}: config requires a message`);
+      this.storyConsentConfig_.message,
+      `${TAG}: config requires a message`
+    );
     userAssert(
-        this.storyConsentConfig_.vendors &&
-            isArray(this.storyConsentConfig_.vendors),
-        `${TAG}: config requires an array of vendors`);
+      this.storyConsentConfig_.vendors &&
+        isArray(this.storyConsentConfig_.vendors),
+      `${TAG}: config requires an array of vendors`
+    );
     user().assertBoolean(
-        this.storyConsentConfig_.onlyAccept,
-        `${TAG}: config requires "onlyAccept" to be a boolean`);
+      this.storyConsentConfig_.onlyAccept,
+      `${TAG}: config requires "onlyAccept" to be a boolean`
+    );
 
     // Runs the validation if any of the title or link are provided, since
     // both have to be provided for the external link to be displayed.
-    if (this.storyConsentConfig_.externalLink.href ||
-        this.storyConsentConfig_.externalLink.title) {
+    if (
+      this.storyConsentConfig_.externalLink.href ||
+      this.storyConsentConfig_.externalLink.title
+    ) {
       user().assertString(
-          this.storyConsentConfig_.externalLink.title,
-          `${TAG}: config requires "externalLink.title" to be a string`);
+        this.storyConsentConfig_.externalLink.title,
+        `${TAG}: config requires "externalLink.title" to be a string`
+      );
       user().assertString(
-          this.storyConsentConfig_.externalLink.href,
-          `${TAG}: config requires "externalLink.href" to be an absolute URL`);
+        this.storyConsentConfig_.externalLink.href,
+        `${TAG}: config requires "externalLink.href" to be an absolute URL`
+      );
       assertAbsoluteHttpOrHttpsUrl(this.storyConsentConfig_.externalLink.href);
     }
   }
@@ -331,9 +360,11 @@ export class AmpStoryConsent extends AMP.BaseElement {
    * @private
    */
   setAcceptButtonFontColor_() {
-    const buttonEl =
-        dev().assertElement(this.storyConsentEl_
-            .querySelector('.i-amphtml-story-consent-action-accept'));
+    const buttonEl = dev().assertElement(
+      this.storyConsentEl_.querySelector(
+        '.i-amphtml-story-consent-action-accept'
+      )
+    );
     const styles = computedStyle(this.win, buttonEl);
 
     const rgb = getRGBFromCssColorValue(styles['background-color']);
diff --git a/extensions/amp-story/0.1/amp-story-cta-layer.js b/extensions/amp-story/0.1/amp-story-cta-layer.js
index 692b54a25580..dee778f14316 100644
--- a/extensions/amp-story/0.1/amp-story-cta-layer.js
+++ b/extensions/amp-story/0.1/amp-story-cta-layer.js
@@ -40,7 +40,6 @@ import {AmpStoryBaseLayer} from './amp-story-base-layer';
  * while the user is looking.
  */
 export class AmpStoryCtaLayer extends AmpStoryBaseLayer {
-
   /** @override */
   buildCallback() {
     super.buildCallback();
diff --git a/extensions/amp-story/0.1/amp-story-grid-layer.js b/extensions/amp-story/0.1/amp-story-grid-layer.js
index f2571901aeb4..3802d1be1825 100644
--- a/extensions/amp-story/0.1/amp-story-grid-layer.js
+++ b/extensions/amp-story/0.1/amp-story-grid-layer.js
@@ -51,10 +51,11 @@ const SUPPORTED_CSS_GRID_ATTRIBUTES = {
  * (e.g. [align-content], [align-items], ...)
  * @private @const {string}
  */
-const SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR =
-    Object.keys(SUPPORTED_CSS_GRID_ATTRIBUTES)
-        .map(key => `[${key}]`)
-        .join(',');
+const SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR = Object.keys(
+  SUPPORTED_CSS_GRID_ATTRIBUTES
+)
+  .map(key => `[${key}]`)
+  .join(',');
 
 /**
  * The attribute name for grid layer templates.
@@ -85,15 +86,15 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
     this.prerenderAllowed_ = false;
   }
 
-
   /** @override */
   firstAttachedCallback() {
     // Only prerender if child of the first page.
-    this.prerenderAllowed_ = matches(this.element,
-        'amp-story-page:first-of-type amp-story-grid-layer');
+    this.prerenderAllowed_ = matches(
+      this.element,
+      'amp-story-page:first-of-type amp-story-grid-layer'
+    );
   }
 
-
   /** @override */
   buildCallback() {
     super.buildCallback();
@@ -102,13 +103,11 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
     this.setDescendentCssGridStyles_();
   }
 
-
   /** @override */
   prerenderAllowed() {
     return this.prerenderAllowed_;
   }
 
-
   /**
    * Applies internal CSS class names for the template attribute, so that styles
    * can use the class name instead of compound
@@ -124,15 +123,16 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
     }
   }
 
-
   /**
    * Copies the whitelisted CSS grid styles for descendants of the
    * <amp-story-grid-layer> element.
    * @private
    */
   setDescendentCssGridStyles_() {
-    const elementsToUpgradeStyles = scopedQuerySelectorAll(this.element,
-        SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR);
+    const elementsToUpgradeStyles = scopedQuerySelectorAll(
+      this.element,
+      SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR
+    );
 
     Array.prototype.forEach.call(elementsToUpgradeStyles, element => {
       this.setCssGridStyles_(element);
@@ -148,7 +148,6 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
     this.setCssGridStyles_(this.element);
   }
 
-
   /**
    * Copies the values of an element's attributes to its styles, if the
    * attributes/properties are in the whitelist.
diff --git a/extensions/amp-story/0.1/amp-story-hint.js b/extensions/amp-story/0.1/amp-story-hint.js
index 8bffc412ccbf..0b5bf07b5f54 100644
--- a/extensions/amp-story/0.1/amp-story-hint.js
+++ b/extensions/amp-story/0.1/amp-story-hint.js
@@ -22,13 +22,14 @@ import {createShadowRootWithStyle} from './utils';
 import {dict} from '../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const TEMPLATE = {
   tag: 'aside',
   attrs: dict({
-    'class': 'i-amphtml-story-hint-container ' +
-        'i-amphtml-story-system-reset i-amphtml-hidden'}),
+    'class':
+      'i-amphtml-story-hint-container ' +
+      'i-amphtml-story-system-reset i-amphtml-hidden',
+  }),
   children: [
     {
       tag: 'div',
@@ -36,8 +37,9 @@ const TEMPLATE = {
       children: [
         {
           tag: 'div',
-          attrs: dict({'class': 'i-amphtml-story-navigation-help-section'
-              + ' prev-page'}),
+          attrs: dict({
+            'class': 'i-amphtml-story-navigation-help-section prev-page',
+          }),
           children: [
             {
               tag: 'div',
@@ -49,17 +51,19 @@ const TEMPLATE = {
                   children: [
                     {
                       tag: 'div',
-                      attrs: dict({'class':
-                          'i-amphtml-story-hint-tap-button-icon'}),
+                      attrs: dict({
+                        'class': 'i-amphtml-story-hint-tap-button-icon',
+                      }),
                     },
                   ],
                 },
                 {
                   tag: 'div',
-                  attrs: dict({'class':
-                      'i-amphtml-story-hint-tap-button-text'}),
+                  attrs: dict({
+                    'class': 'i-amphtml-story-hint-tap-button-text',
+                  }),
                   localizedStringId:
-                      LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL,
+                    LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL,
                 },
               ],
             },
@@ -67,8 +71,9 @@ const TEMPLATE = {
         },
         {
           tag: 'div',
-          attrs: dict({'class': 'i-amphtml-story-navigation-help-section'
-              + ' next-page'}),
+          attrs: dict({
+            'class': 'i-amphtml-story-navigation-help-section next-page',
+          }),
           children: [
             {
               tag: 'div',
@@ -80,17 +85,19 @@ const TEMPLATE = {
                   children: [
                     {
                       tag: 'div',
-                      attrs: dict({'class':
-                          'i-amphtml-story-hint-tap-button-icon'}),
+                      attrs: dict({
+                        'class': 'i-amphtml-story-hint-tap-button-icon',
+                      }),
                     },
                   ],
                 },
                 {
                   tag: 'div',
-                  attrs: dict({'class':
-                      'i-amphtml-story-hint-tap-button-text'}),
+                  attrs: dict({
+                    'class': 'i-amphtml-story-hint-tap-button-text',
+                  }),
                   localizedStringId:
-                      LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL,
+                    LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL,
                 },
               ],
             },
@@ -190,17 +197,22 @@ export class AmpStoryHint {
     this.build();
 
     this.vsync_.mutate(() => {
-      this.hintContainer_.classList.toggle(NAVIGATION_OVERLAY_CLASS,
-          hintClass == NAVIGATION_OVERLAY_CLASS);
-      this.hintContainer_.classList.toggle(FIRST_PAGE_OVERLAY_CLASS,
-          hintClass == FIRST_PAGE_OVERLAY_CLASS);
+      this.hintContainer_.classList.toggle(
+        NAVIGATION_OVERLAY_CLASS,
+        hintClass == NAVIGATION_OVERLAY_CLASS
+      );
+      this.hintContainer_.classList.toggle(
+        FIRST_PAGE_OVERLAY_CLASS,
+        hintClass == FIRST_PAGE_OVERLAY_CLASS
+      );
       this.hintContainer_.classList.remove('i-amphtml-hidden');
 
-      const hideTimeout = hintClass == NAVIGATION_OVERLAY_CLASS
-        ? NAVIGATION_OVERLAY_TIMEOUT : FIRST_PAGE_NAVIGATION_OVERLAY_TIMEOUT;
+      const hideTimeout =
+        hintClass == NAVIGATION_OVERLAY_CLASS
+          ? NAVIGATION_OVERLAY_TIMEOUT
+          : FIRST_PAGE_NAVIGATION_OVERLAY_TIMEOUT;
       this.hideAfterTimeout(hideTimeout);
     });
-
   }
 
   /**
@@ -227,8 +239,7 @@ export class AmpStoryHint {
    * @param {number} timeout
    */
   hideAfterTimeout(timeout) {
-    this.hintTimeout_ = this.timer_.delay(
-        () => this.hideInternal_(), timeout);
+    this.hintTimeout_ = this.timer_.delay(() => this.hideInternal_(), timeout);
   }
 
   /**
@@ -254,4 +265,3 @@ export class AmpStoryHint {
     });
   }
 }
-
diff --git a/extensions/amp-story/0.1/amp-story-info-dialog.js b/extensions/amp-story/0.1/amp-story-info-dialog.js
index 9c558ae6601e..168a0294e8b0 100644
--- a/extensions/amp-story/0.1/amp-story-info-dialog.js
+++ b/extensions/amp-story/0.1/amp-story-info-dialog.js
@@ -87,33 +87,36 @@ export class InfoDialog {
     const root = this.win_.document.createElement('div');
     const html = htmlFor(this.parentEl_);
     this.element_ = html`
-        <div class="i-amphtml-story-info-dialog i-amphtml-story-system-reset">
-          <div class="i-amphtml-story-info-dialog-container">
-            <h1 class="i-amphtml-story-info-heading"></h1>
-            <a class="i-amphtml-story-info-link"></a>
-            <a class="i-amphtml-story-info-moreinfo"></a>
-          </div>
-        </div>`;
+      <div class="i-amphtml-story-info-dialog i-amphtml-story-system-reset">
+        <div class="i-amphtml-story-info-dialog-container">
+          <h1 class="i-amphtml-story-info-heading"></h1>
+          <a class="i-amphtml-story-info-link"></a>
+          <a class="i-amphtml-story-info-moreinfo"></a>
+        </div>
+      </div>
+    `;
 
     createShadowRootWithStyle(root, this.element_, CSS);
     this.initializeListeners_();
 
-    this.innerContainerEl_ = this.element_
-        .querySelector('.i-amphtml-story-info-dialog-container');
+    this.innerContainerEl_ = this.element_.querySelector(
+      '.i-amphtml-story-info-dialog-container'
+    );
 
     const appendPromise = this.resources_.mutateElement(this.parentEl_, () => {
       this.parentEl_.appendChild(root);
     });
 
-    const pageUrl = Services.documentInfoForDoc(
-        getAmpdoc(this.parentEl_)).canonicalUrl;
+    const pageUrl = Services.documentInfoForDoc(getAmpdoc(this.parentEl_))
+      .canonicalUrl;
 
     return Promise.all([
       appendPromise,
       this.setHeading_(),
       this.setPageLink_(pageUrl),
-      this.requestMoreInfoLink_()
-          .then(moreInfoUrl => this.setMoreInfoLinkUrl_(moreInfoUrl)),
+      this.requestMoreInfoLink_().then(moreInfoUrl =>
+        this.setMoreInfoLinkUrl_(moreInfoUrl)
+      ),
     ]);
   }
 
@@ -133,8 +136,9 @@ export class InfoDialog {
       this.onInfoDialogStateUpdated_(isOpen);
     });
 
-    this.element_.addEventListener(
-        'click', event => this.onInfoDialogClick_(event));
+    this.element_.addEventListener('click', event =>
+      this.onInfoDialogClick_(event)
+    );
   }
 
   /**
@@ -178,14 +182,14 @@ export class InfoDialog {
     if (!this.viewer_.isEmbedded()) {
       return Promise.resolve();
     }
-    return this.viewer_./*OK*/sendMessageAwaitResponse(
-        'moreInfoLinkUrl', /* data */ undefined)
-        .then(moreInfoUrl => {
-          if (!moreInfoUrl) {
-            return null;
-          }
-          return assertAbsoluteHttpOrHttpsUrl(dev().assertString(moreInfoUrl));
-        });
+    return this.viewer_
+      ./*OK*/ sendMessageAwaitResponse('moreInfoLinkUrl', /* data */ undefined)
+      .then(moreInfoUrl => {
+        if (!moreInfoUrl) {
+          return null;
+        }
+        return assertAbsoluteHttpOrHttpsUrl(dev().assertString(moreInfoUrl));
+      });
   }
 
   /**
@@ -193,9 +197,11 @@ export class InfoDialog {
    */
   setHeading_() {
     const label = this.localizationService_.getLocalizedString(
-        LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL);
+      LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL
+    );
     const headingEl = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-heading'));
+      this.element_.querySelector('.i-amphtml-story-info-heading')
+    );
 
     return this.resources_.mutateElement(headingEl, () => {
       headingEl.textContent = label;
@@ -208,7 +214,8 @@ export class InfoDialog {
    */
   setPageLink_(pageUrl) {
     const linkEl = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-link'));
+      this.element_.querySelector('.i-amphtml-story-info-link')
+    );
 
     return this.resources_.mutateElement(linkEl, () => {
       linkEl.setAttribute('href', pageUrl);
@@ -229,14 +236,18 @@ export class InfoDialog {
     }
 
     this.moreInfoLinkEl_ = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-moreinfo'));
+      this.element_.querySelector('.i-amphtml-story-info-moreinfo')
+    );
 
     return this.resources_.mutateElement(this.moreInfoLinkEl_, () => {
       const label = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK);
+        LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK
+      );
       this.moreInfoLinkEl_.classList.add(MOREINFO_VISIBLE_CLASS);
-      this.moreInfoLinkEl_.setAttribute('href',
-          dev().assertString(moreInfoUrl));
+      this.moreInfoLinkEl_.setAttribute(
+        'href',
+        dev().assertString(moreInfoUrl)
+      );
       this.moreInfoLinkEl_.setAttribute('target', '_blank');
       this.moreInfoLinkEl_.textContent = label;
     });
diff --git a/extensions/amp-story/0.1/amp-story-page.js b/extensions/amp-story/0.1/amp-story-page.js
index a3dd950151ca..b446ad9a0160 100644
--- a/extensions/amp-story/0.1/amp-story-page.js
+++ b/extensions/amp-story/0.1/amp-story-page.js
@@ -24,10 +24,7 @@
  * </code>
  */
 import {AdvancementConfig} from './page-advancement';
-import {
-  AnimationManager,
-  hasAnimations,
-} from './animation';
+import {AnimationManager, hasAnimations} from './animation';
 import {Deferred} from '../../../src/utils/promise';
 import {EventType, dispatch, dispatchCustom} from './events';
 import {Layout} from '../../../src/layout';
@@ -55,21 +52,18 @@ import {upgradeBackgroundAudio} from './audio';
  */
 const PAGE_LOADED_CLASS_NAME = 'i-amphtml-story-page-loaded';
 
-
 /**
  * Selector for which media to wait for on page layout.
  * @const {string}
  */
 const PAGE_MEDIA_SELECTOR = 'amp-audio, amp-video, amp-img, amp-anim';
 
-
 /** @private @const {string} */
 const TAG = 'amp-story-page';
 
 /** @private @const {string} */
 const ADVERTISEMENT_ATTR_NAME = 'ad';
 
-
 /**
  * The <amp-story-page> custom element, which represents a single page of
  * an <amp-story>.
@@ -112,7 +106,10 @@ export class AmpStoryPage extends AMP.BaseElement {
 
     /** @const @private {!function(boolean)} */
     this.debounceToggleLoadingSpinner_ = debounce(
-        this.win, isActive => this.toggleLoadingSpinner_(!!isActive), 100);
+      this.win,
+      isActive => this.toggleLoadingSpinner_(!!isActive),
+      100
+    );
 
     /** @private {!Array<function()>} */
     this.unlisteners_ = [];
@@ -126,7 +123,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.isBotUserAgent_ = Services.platformFor(this.win).isBot();
   }
 
-
   /**
    * @private
    */
@@ -137,19 +133,22 @@ export class AmpStoryPage extends AMP.BaseElement {
       }
 
       this.animationManager_ = AnimationManager.create(
-          this.element, this.getAmpDoc(), this.getAmpDoc().getUrl());
+        this.element,
+        this.getAmpDoc(),
+        this.getAmpDoc().getUrl()
+      );
     }
   }
 
-
   /** @override */
   firstAttachedCallback() {
     // Only prerender the first story page.
-    this.prerenderAllowed_ = matches(this.element,
-        'amp-story-page:first-of-type');
+    this.prerenderAllowed_ = matches(
+      this.element,
+      'amp-story-page:first-of-type'
+    );
   }
 
-
   /** @override */
   buildCallback() {
     upgradeBackgroundAudio(this.element);
@@ -158,15 +157,17 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.initializeMediaPool_();
     this.maybeCreateAnimationManager_();
     this.advancement_.addPreviousListener(() => this.previous());
-    this.advancement_
-        .addAdvanceListener(() => this.next(/* opt_isAutomaticAdvance */ true));
-    this.advancement_.addOnTapNavigationListener(
-        navigationDirection => this.navigateOnTap(navigationDirection));
-    this.advancement_
-        .addProgressListener(progress => this.emitProgress_(progress));
+    this.advancement_.addAdvanceListener(() =>
+      this.next(/* opt_isAutomaticAdvance */ true)
+    );
+    this.advancement_.addOnTapNavigationListener(navigationDirection =>
+      this.navigateOnTap(navigationDirection)
+    );
+    this.advancement_.addProgressListener(progress =>
+      this.emitProgress_(progress)
+    );
   }
 
-
   /**
    * Delegates video autoplay so the video manager does not follow the
    * autoplay attribute that may have been set by a publisher, which could
@@ -176,20 +177,21 @@ export class AmpStoryPage extends AMP.BaseElement {
     iterateCursor(this.element.querySelectorAll('amp-video'), delegateAutoplay);
   }
 
-
   /** @private */
   initializeMediaPool_() {
     const storyEl = dev().assertElement(
-        closestAncestorElementBySelector(this.element, 'amp-story'),
-        'amp-story-page must be a descendant of amp-story.');
+      closestAncestorElementBySelector(this.element, 'amp-story'),
+      'amp-story-page must be a descendant of amp-story.'
+    );
 
-    storyEl.getImpl()
-        .then(storyImpl => {
-          this.mediaPoolResolveFn_(MediaPool.for(storyImpl));
-        }, reason => this.mediaPoolRejectFn_(reason));
+    storyEl.getImpl().then(
+      storyImpl => {
+        this.mediaPoolResolveFn_(MediaPool.for(storyImpl));
+      },
+      reason => this.mediaPoolRejectFn_(reason)
+    );
   }
 
-
   /**
    * Marks any AMP elements that represent media elements with preload="auto".
    * @private
@@ -201,13 +203,11 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.CONTAINER;
   }
 
-
   /** @override */
   pauseCallback() {
     this.advancement_.stop();
@@ -220,7 +220,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
   }
 
-
   /** @override */
   resumeCallback() {
     this.registerAllMedia_();
@@ -229,14 +228,13 @@ export class AmpStoryPage extends AMP.BaseElement {
       this.advancement_.start();
       this.maybeStartAnimations();
       this.preloadAllMedia_()
-          .then(() => this.startListeningToVideoEvents_())
-          .then(() => this.playAllMedia_());
+        .then(() => this.startListeningToVideoEvents_())
+        .then(() => this.playAllMedia_());
     }
 
     this.reportDevModeErrors_();
   }
 
-
   /** @override */
   layoutCallback() {
     this.muteAllMedia();
@@ -248,13 +246,11 @@ export class AmpStoryPage extends AMP.BaseElement {
     ]);
   }
 
-
   /** @return {!Promise} */
   beforeVisible() {
     return this.maybeApplyFirstAnimationFrame();
   }
 
-
   /**
    * @return {!Promise}
    * @private
@@ -293,13 +289,11 @@ export class AmpStoryPage extends AMP.BaseElement {
     return Promise.all(mediaPromises);
   }
 
-
   /** @return {!Promise} */
   whenLoaded() {
     return this.pageLoadPromise_;
   }
 
-
   /** @private */
   markPageAsLoaded_() {
     dispatch(this.element, EventType.PAGE_LOADED, true);
@@ -308,13 +302,11 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /** @override */
   prerenderAllowed() {
     return this.prerenderAllowed_;
   }
 
-
   /**
    * Gets all media elements on this page.
    * @return {!NodeList<!Element>}
@@ -324,7 +316,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return this.element.querySelectorAll('audio, video');
   }
 
-
   /**
    * Gets all video elements on this page.
    * @return {!NodeList<!Element>}
@@ -334,7 +325,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return this.element.querySelectorAll('video');
   }
 
-
   /**
    * Applies the specified callback to each media element on the page, after the
    * media element is loaded.
@@ -353,7 +343,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Pauses all media on this page.
    * @param {boolean=} rewindToBeginning Whether to rewind the currentTime
@@ -367,12 +356,13 @@ export class AmpStoryPage extends AMP.BaseElement {
         mediaEl.pause();
       } else {
         return mediaPool.pause(
-            /** @type {!HTMLMediaElement} */ (mediaEl), rewindToBeginning);
+          /** @type {!HTMLMediaElement} */ (mediaEl),
+          rewindToBeginning
+        );
       }
     });
   }
 
-
   /**
    * Plays all media on this page.
    * @return {!Promise} Promise that resolves after the callbacks are called.
@@ -388,7 +378,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Preloads all media on this page.
    * @return {!Promise} Promise that resolves after the callbacks are called.
@@ -404,7 +393,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Mutes all media on this page.
    * @return {!Promise} Promise that resolves after the callbacks are called.
@@ -420,7 +408,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Unmutes all media on this page.
    * @return {!Promise} Promise that resolves after the callbacks are called.
@@ -436,7 +423,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Registers all media on this page
    * @return {!Promise} Promise that resolves after the callbacks are called.
@@ -452,7 +438,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Starts playing animations, if the animation manager is available.
    */
@@ -463,7 +448,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.animationManager_.animateIn();
   }
 
-
   /**
    * @return {!Promise}
    */
@@ -488,7 +472,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
   }
 
-
   /**
    * @return {number} The distance from the current page to the active page.
    */
@@ -496,7 +479,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return parseInt(this.element.getAttribute('distance'), 10);
   }
 
-
   /**
    * @param {number} distance The distance from the current page to the active
    *     page.
@@ -514,7 +496,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
   }
 
-
   /**
    * @return {boolean} Whether this page is currently active.
    */
@@ -533,11 +514,15 @@ export class AmpStoryPage extends AMP.BaseElement {
       'progress': progress,
     });
     const eventInit = {bubbles: true};
-    dispatchCustom(this.win, this.element, EventType.PAGE_PROGRESS, payload,
-        eventInit);
+    dispatchCustom(
+      this.win,
+      this.element,
+      EventType.PAGE_PROGRESS,
+      payload,
+      eventInit
+    );
   }
 
-
   /**
    * Returns all of the pages that are one hop from this page.
    * @return {!Array<string>}
@@ -545,10 +530,12 @@ export class AmpStoryPage extends AMP.BaseElement {
   getAdjacentPageIds() {
     const adjacentPageIds = [];
 
-    const autoAdvanceNext =
-        this.getNextPageId(true /* opt_isAutomaticAdvance */);
-    const manualAdvanceNext =
-        this.getNextPageId(false /* opt_isAutomaticAdvance */);
+    const autoAdvanceNext = this.getNextPageId(
+      true /* opt_isAutomaticAdvance */
+    );
+    const manualAdvanceNext = this.getNextPageId(
+      false /* opt_isAutomaticAdvance */
+    );
     const previous = this.getPreviousPageId_();
 
     if (autoAdvanceNext) {
@@ -566,7 +553,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return adjacentPageIds;
   }
 
-
   /**
    * Gets the ID of the previous page in the story (before the current page).
    * @return {?string} Returns the ID of the next page in the story, or null if
@@ -586,7 +572,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return null;
   }
 
-
   /**
    * Gets the ID of the next page in the story (after the current page).
    * @param {boolean=} opt_isAutomaticAdvance Whether this navigation was caused
@@ -595,8 +580,10 @@ export class AmpStoryPage extends AMP.BaseElement {
    *     there isn't one.
    */
   getNextPageId(opt_isAutomaticAdvance) {
-    if (opt_isAutomaticAdvance &&
-        this.element.hasAttribute('auto-advance-to')) {
+    if (
+      opt_isAutomaticAdvance &&
+      this.element.hasAttribute('auto-advance-to')
+    ) {
       return this.element.getAttribute('auto-advance-to');
     }
 
@@ -612,7 +599,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     return null;
   }
 
-
   /**
    * Navigates to the previous page in the story.
    */
@@ -627,7 +613,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.switchTo_(targetPageId);
   }
 
-
   /**
    * Navigates to the next page in the story.
    * @param {boolean=} opt_isAutomaticAdvance Whether this navigation was caused
@@ -650,11 +635,15 @@ export class AmpStoryPage extends AMP.BaseElement {
   navigateOnTap(direction) {
     const payload = dict({'direction': direction});
     const eventInit = {bubbles: true};
-    dispatchCustom(this.win, this.element, EventType.TAP_NAVIGATION, payload,
-        eventInit);
+    dispatchCustom(
+      this.win,
+      this.element,
+      EventType.TAP_NAVIGATION,
+      payload,
+      eventInit
+    );
   }
 
-
   /**
    * @param {string} targetPageId
    * @private
@@ -662,11 +651,15 @@ export class AmpStoryPage extends AMP.BaseElement {
   switchTo_(targetPageId) {
     const payload = dict({'targetPageId': targetPageId});
     const eventInit = {bubbles: true};
-    dispatchCustom(this.win, this.element, EventType.SWITCH_PAGE, payload,
-        eventInit);
+    dispatchCustom(
+      this.win,
+      this.element,
+      EventType.SWITCH_PAGE,
+      payload,
+      eventInit
+    );
   }
 
-
   /**
    * @private
    */
@@ -676,14 +669,17 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
 
     getLogEntries(this.element).then(logEntries => {
-      dispatchCustom(this.win, this.element,
-          EventType.DEV_LOG_ENTRIES_AVAILABLE,
-          // ? is OK because all consumers are internal.
-          /** @type {?} */ (logEntries), {bubbles: true});
+      dispatchCustom(
+        this.win,
+        this.element,
+        EventType.DEV_LOG_ENTRIES_AVAILABLE,
+        // ? is OK because all consumers are internal.
+        /** @type {?} */ (logEntries),
+        {bubbles: true}
+      );
     });
   }
 
-
   /**
    * Displays a loading spinner whenever the video is buffering.
    * Has to be called after the mediaPool preload method, that swaps the video
@@ -699,14 +695,19 @@ export class AmpStoryPage extends AMP.BaseElement {
 
     this.debounceToggleLoadingSpinner_(true);
     Array.prototype.forEach.call(videos, videoEl => {
-      this.unlisteners_.push(listen(
-          videoEl, 'playing', () => this.debounceToggleLoadingSpinner_(false)));
-      this.unlisteners_.push(listen(
-          videoEl, 'waiting', () => this.debounceToggleLoadingSpinner_(true)));
+      this.unlisteners_.push(
+        listen(videoEl, 'playing', () =>
+          this.debounceToggleLoadingSpinner_(false)
+        )
+      );
+      this.unlisteners_.push(
+        listen(videoEl, 'waiting', () =>
+          this.debounceToggleLoadingSpinner_(true)
+        )
+      );
     });
   }
 
-
   /**
    * @private
    */
@@ -716,7 +717,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.unlisteners_ = [];
   }
 
-
   /**
    * @private
    */
@@ -725,7 +725,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.element.appendChild(this.loadingSpinner_.build());
   }
 
-
   /**
    * Has to be called through the `debounceToggleLoadingSpinner_` method, to
    * avoid the spinner flashing on the screen when the video loops, or during
@@ -744,7 +743,6 @@ export class AmpStoryPage extends AMP.BaseElement {
     });
   }
 
-
   /**
    * check to see if this page is a wrapper for an ad
    * @return {boolean}
diff --git a/extensions/amp-story/0.1/amp-story-request-service.js b/extensions/amp-story/0.1/amp-story-request-service.js
index f67ac5d36c22..037028342b9e 100644
--- a/extensions/amp-story/0.1/amp-story-request-service.js
+++ b/extensions/amp-story/0.1/amp-story-request-service.js
@@ -21,7 +21,6 @@ import {user, userAssert} from '../../../src/log';
 /** @private @const {string} */
 export const BOOKEND_CONFIG_ATTRIBUTE_NAME = 'bookend-config-src';
 
-
 /**
  * Service to send XHRs.
  */
@@ -67,11 +66,11 @@ export class AmpStoryRequestService {
     opts.requireAmpResponseSourceOrigin = false;
 
     return Services.urlReplacementsForDoc(this.storyElement_)
-        .expandUrlAsync(user().assertString(rawUrl))
-        .then(url => this.xhr_.fetchJson(url, opts))
-        .then(response => {
-          userAssert(response.ok, 'Invalid HTTP response');
-          return response.json();
-        });
+      .expandUrlAsync(user().assertString(rawUrl))
+      .then(url => this.xhr_.fetchJson(url, opts))
+      .then(response => {
+        userAssert(response.ok, 'Invalid HTTP response');
+        return response.json();
+      });
   }
 }
diff --git a/extensions/amp-story/0.1/amp-story-share-menu.js b/extensions/amp-story/0.1/amp-story-share-menu.js
index 47f716bc253d..456fdaa42e41 100644
--- a/extensions/amp-story/0.1/amp-story-share-menu.js
+++ b/extensions/amp-story/0.1/amp-story-share-menu.js
@@ -26,7 +26,6 @@ import {getAmpdoc} from '../../../src/service';
 import {renderAsElement} from './simple-template';
 import {toggle} from '../../../src/style';
 
-
 /** @const {string} Class to toggle the share menu. */
 export const VISIBLE_CLASS = 'i-amphtml-story-share-menu-visible';
 
@@ -40,7 +39,8 @@ const SHARE_WIDGET_CONTAINER_CLASS = 'i-amphtml-story-share-menu-container';
 const TEMPLATE = {
   tag: 'div',
   attrs: dict({
-    'class': 'i-amphtml-story-share-menu i-amphtml-story-system-reset'}),
+    'class': 'i-amphtml-story-share-menu i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -59,7 +59,6 @@ const AMP_SOCIAL_SYSTEM_SHARE_TEMPLATE = {
   attrs: /** @type {!JsonObject} */ (dict({'type': 'system'})),
 };
 
-
 /**
  * Share menu UI.
  */
@@ -109,12 +108,13 @@ export class ShareMenu {
 
     this.isBuilt_ = true;
 
-    this.isSystemShareSupported_ =
-        this.shareWidget_.isSystemShareSupported(getAmpdoc(this.parentEl_));
+    this.isSystemShareSupported_ = this.shareWidget_.isSystemShareSupported(
+      getAmpdoc(this.parentEl_)
+    );
 
-    this.isSystemShareSupported_ ?
-      this.buildForSystemSharing_() :
-      this.buildForFallbackSharing_();
+    this.isSystemShareSupported_
+      ? this.buildForSystemSharing_()
+      : this.buildForFallbackSharing_();
   }
 
   /**
@@ -132,8 +132,10 @@ export class ShareMenu {
    */
   buildForSystemSharing_() {
     this.shareWidget_.loadRequiredExtensions(getAmpdoc(this.parentEl_));
-    this.element_ =
-        renderAsElement(this.win_.document, AMP_SOCIAL_SYSTEM_SHARE_TEMPLATE);
+    this.element_ = renderAsElement(
+      this.win_.document,
+      AMP_SOCIAL_SYSTEM_SHARE_TEMPLATE
+    );
 
     this.initializeListeners_();
 
@@ -157,9 +159,9 @@ export class ShareMenu {
 
     this.vsync_.run({
       measure: () => {
-        this.innerContainerEl_ =
-            this.element_
-                ./*OK*/querySelector(`.${SHARE_WIDGET_CONTAINER_CLASS}`);
+        this.innerContainerEl_ = this.element_./*OK*/ querySelector(
+          `.${SHARE_WIDGET_CONTAINER_CLASS}`
+        );
       },
       mutate: () => {
         this.parentEl_.appendChild(root);
@@ -181,8 +183,9 @@ export class ShareMenu {
     // Don't listen to click events if the system share is supported, since the
     // native layer handles all the UI interactions.
     if (!this.isSystemShareSupported_) {
-      this.element_.addEventListener(
-          'click', event => this.onShareMenuClick_(event));
+      this.element_.addEventListener('click', event =>
+        this.onShareMenuClick_(event)
+      );
     }
   }
 
diff --git a/extensions/amp-story/0.1/amp-story-share.js b/extensions/amp-story/0.1/amp-story-share.js
index 014d0f2011b0..cfec13d1ab8a 100644
--- a/extensions/amp-story/0.1/amp-story-share.js
+++ b/extensions/amp-story/0.1/amp-story-share.js
@@ -28,7 +28,6 @@ import {px, setImportantStyles} from '../../../src/style';
 import {renderAsElement, renderSimpleTemplate} from './simple-template';
 import {throttle} from '../../../src/utils/rate-limit';
 
-
 /**
  * Maps share provider type to visible name.
  * If the name only needs to be capitalized (e.g. `facebook` to `Facebook`) it
@@ -48,7 +47,6 @@ const SHARE_PROVIDER_LOCALIZED_STRING_ID = map({
   'sms': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SMS,
 });
 
-
 /**
  * Default left/right padding for share buttons.
  * @private @const {number}
@@ -77,41 +75,38 @@ export const DEPRECATED_SHARE_PROVIDERS_KEY = 'share-providers';
 const TEMPLATE = {
   tag: 'div',
   attrs: dict({'class': 'i-amphtml-story-share-widget'}),
-  children: [{
-    tag: 'ul',
-    attrs: dict({'class': 'i-amphtml-story-share-list'}),
-    children: [
-      {
-        tag: 'li',
-        attrs: dict({'class': 'i-amphtml-story-share-system'}),
-      },
-    ],
-  }],
+  children: [
+    {
+      tag: 'ul',
+      attrs: dict({'class': 'i-amphtml-story-share-list'}),
+      children: [
+        {
+          tag: 'li',
+          attrs: dict({'class': 'i-amphtml-story-share-system'}),
+        },
+      ],
+    },
+  ],
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const SHARE_ITEM_TEMPLATE = {
   tag: 'li',
   attrs: dict({'class': 'i-amphtml-story-share-item'}),
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const LINK_SHARE_ITEM_TEMPLATE = {
   tag: 'div',
   attrs: dict({
-    'class':
-        'i-amphtml-story-share-icon i-amphtml-story-share-icon-link',
+    'class': 'i-amphtml-story-share-icon i-amphtml-story-share-icon-link',
   }),
   localizedStringId: LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK,
 };
 
-
 /** @private @const {string} */
 const SCROLLABLE_CLASSNAME = 'i-amphtml-story-share-widget-scrollable';
 
-
 /**
  * @param {!JsonObject=} opt_params
  * @return {!JsonObject}
@@ -128,7 +123,6 @@ function buildProviderParams(opt_params) {
   return attrs;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} shareType
@@ -137,52 +131,57 @@ function buildProviderParams(opt_params) {
  */
 function buildProvider(doc, shareType, opt_params) {
   const shareProviderLocalizedStringId = devAssert(
-      SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType],
-      `No localized string to display name for share type ${shareType}.`);
+    SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType],
+    `No localized string to display name for share type ${shareType}.`
+  );
 
-  return renderSimpleTemplate(doc,
-      /** @type {!Array<!./simple-template.ElementDef>} */ ([
-        {
-          tag: 'amp-social-share',
-          attrs: /** @type {!JsonObject} */ (Object.assign(
-              dict({
-                'width': 48,
-                'height': 66,
-                'class': 'i-amphtml-story-share-icon',
-                'type': shareType,
-              }),
-              buildProviderParams(opt_params))),
-          localizedStringId: shareProviderLocalizedStringId,
-        },
-      ]));
+  return renderSimpleTemplate(
+    doc,
+    /** @type {!Array<!./simple-template.ElementDef>} */ ([
+      {
+        tag: 'amp-social-share',
+        attrs: /** @type {!JsonObject} */ (Object.assign(
+          dict({
+            'width': 48,
+            'height': 66,
+            'class': 'i-amphtml-story-share-icon',
+            'type': shareType,
+          }),
+          buildProviderParams(opt_params)
+        )),
+        localizedStringId: shareProviderLocalizedStringId,
+      },
+    ])
+  );
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} url
  * @return {!Element}
  */
 function buildCopySuccessfulToast(doc, url) {
-  return renderAsElement(doc, /** @type {!./simple-template.ElementDef} */ ({
-    tag: 'div',
-    attrs: dict({'class': 'i-amphtml-story-copy-successful'}),
-    children: [
-      {
-        tag: 'div',
-        localizedStringId:
+  return renderAsElement(
+    doc,
+    /** @type {!./simple-template.ElementDef} */ ({
+      tag: 'div',
+      attrs: dict({'class': 'i-amphtml-story-copy-successful'}),
+      children: [
+        {
+          tag: 'div',
+          localizedStringId:
             LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT,
-      },
-      {
-        tag: 'div',
-        attrs: dict({'class': 'i-amphtml-story-copy-url'}),
-        unlocalizedString: url,
-      },
-    ],
-  }));
+        },
+        {
+          tag: 'div',
+          attrs: dict({'class': 'i-amphtml-story-copy-url'}),
+          unlocalizedString: url,
+        },
+      ],
+    })
+  );
 }
 
-
 /**
  * Social share widget for story bookend.
  */
@@ -218,8 +217,9 @@ export class ShareWidget {
     devAssert(!this.root, 'Already built.');
 
     this.ampdoc_ = ampdoc;
-    this.localizationServicePromise_ =
-        Services.localizationServiceForOrNullV01(this.win);
+    this.localizationServicePromise_ = Services.localizationServiceForOrNullV01(
+      this.win
+    );
 
     this.root = renderAsElement(this.win.document, TEMPLATE);
 
@@ -235,8 +235,9 @@ export class ShareWidget {
    * @private
    */
   getAmpDoc_() {
-    return /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */ (
-      devAssert(this.ampdoc_));
+    return /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */ (devAssert(
+      this.ampdoc_
+    ));
   }
 
   /** @private */
@@ -245,8 +246,10 @@ export class ShareWidget {
       return;
     }
 
-    const linkShareButton =
-        renderAsElement(this.win.document, LINK_SHARE_ITEM_TEMPLATE);
+    const linkShareButton = renderAsElement(
+      this.win.document,
+      LINK_SHARE_ITEM_TEMPLATE
+    );
 
     this.add_(linkShareButton);
 
@@ -263,10 +266,13 @@ export class ShareWidget {
 
     if (!copyTextToClipboard(this.win, url)) {
       this.localizationServicePromise_.then(localizationService => {
-        devAssert(localizationService,
-            'Could not retrieve LocalizationService.');
+        devAssert(
+          localizationService,
+          'Could not retrieve LocalizationService.'
+        );
         const failureString = localizationService.getLocalizedString(
-            LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT);
+          LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT
+        );
         Toast.show(this.win, failureString);
       });
       return;
@@ -283,8 +289,9 @@ export class ShareWidget {
       return;
     }
 
-    const container = dev().assertElement(this.root).querySelector(
-        '.i-amphtml-story-share-system');
+    const container = dev()
+      .assertElement(this.root)
+      .querySelector('.i-amphtml-story-share-system');
 
     this.loadRequiredExtensions();
 
@@ -306,7 +313,7 @@ export class ShareWidget {
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=765923
     const isChromeWebview = viewer.isWebviewEmbedded() && platform.isChrome();
 
-    return ('share' in navigator) && !isChromeWebview;
+    return 'share' in navigator && !isChromeWebview;
   }
 
   /**
@@ -317,8 +324,9 @@ export class ShareWidget {
     this.loadRequiredExtensions();
 
     this.requestService_.loadBookendConfig().then(config => {
-      const providers = config && (config[SHARE_PROVIDERS_KEY] ||
-        config[DEPRECATED_SHARE_PROVIDERS_KEY]);
+      const providers =
+        config &&
+        (config[SHARE_PROVIDERS_KEY] || config[DEPRECATED_SHARE_PROVIDERS_KEY]);
       if (!providers) {
         return;
       }
@@ -334,9 +342,11 @@ export class ShareWidget {
     const providersMap = {};
 
     providers.forEach(currentProvider => {
-      if (isObject(currentProvider) &&
-          currentProvider['provider'] == 'facebook') {
-        providersMap['facebook'] = ({'app_id': currentProvider['app_id']});
+      if (
+        isObject(currentProvider) &&
+        currentProvider['provider'] == 'facebook'
+      ) {
+        providersMap['facebook'] = {'app_id': currentProvider['app_id']};
       } else if (isObject(currentProvider)) {
         providersMap[currentProvider['provider']] = true;
       } else {
@@ -359,16 +369,23 @@ export class ShareWidget {
 
     Object.keys(providers).forEach(type => {
       if (type == 'system') {
-        user().warn('AMP-STORY',
-            '`system` is not a valid share provider type. Native sharing is ' +
+        user().warn(
+          'AMP-STORY',
+          '`system` is not a valid share provider type. Native sharing is ' +
             'enabled by default and cannot be turned off.',
-            type);
+          type
+        );
         return;
       }
 
       if (isObject(providers[type])) {
-        this.add_(buildProvider(this.win.document, type,
-            /** @type {!JsonObject} */ (providers[type])));
+        this.add_(
+          buildProvider(
+            this.win.document,
+            type,
+            /** @type {!JsonObject} */ (providers[type])
+          )
+        );
         return;
       }
 
@@ -378,9 +395,11 @@ export class ShareWidget {
         return;
       }
 
-      user().warn('AMP-STORY',
-          `Invalid share providers configuration for "${type}" in bookend. ` +
-          'Value must be `true` or a params object.');
+      user().warn(
+        'AMP-STORY',
+        `Invalid share providers configuration for "${type}" in bookend. ` +
+          'Value must be `true` or a params object.'
+      );
     });
   }
 
@@ -388,8 +407,10 @@ export class ShareWidget {
    * @param {!../../../src/service/ampdoc-impl.AmpDoc=} ampdoc
    */
   loadRequiredExtensions(ampdoc = this.getAmpDoc_()) {
-    Services.extensionsFor(this.win)
-        .installExtensionForDoc(ampdoc, 'amp-social-share');
+    Services.extensionsFor(this.win).installExtensionForDoc(
+      ampdoc,
+      'amp-social-share'
+    );
   }
 
   /**
@@ -408,7 +429,6 @@ export class ShareWidget {
   }
 }
 
-
 /**
  * Social share widget for story bookend with a scrollable layout.
  * This class is coupled to the DOM structure for ShareWidget, but that's ok.
@@ -444,8 +464,9 @@ export class ScrollableShareWidget extends ShareWidget {
     this.root.classList.add(SCROLLABLE_CLASSNAME);
 
     Services.viewportForDoc(ampdoc).onResize(
-        // we don't require a lot of smoothness here, so we throttle
-        throttle(this.win, () => this.applyButtonPadding_(), 100));
+      // we don't require a lot of smoothness here, so we throttle
+      throttle(this.win, () => this.applyButtonPadding_(), 100)
+    );
 
     return this.root;
   }
@@ -462,61 +483,68 @@ export class ScrollableShareWidget extends ShareWidget {
       return;
     }
 
-    this.vsync_.run({
-      measure: state => {
-        const containerWidth = this.root./*OK*/clientWidth;
-
-        if (containerWidth == this.containerWidth_) {
-          // Don't recalculate if width has not changed (i.e. onscreen keyboard)
-          state.noop = true;
-          return;
-        }
-
-        const icon = devAssert(items[0].firstElementChild);
-
-        const leftMargin = icon./*OK*/offsetLeft - this.root./*OK*/offsetLeft;
-        const iconWidth = icon./*OK*/offsetWidth;
-
-        // Total width that the buttons will occupy with minimum padding.
-        const totalItemWidth =
-            (iconWidth * items.length) + ((2 * MIN_BUTTON_PADDING) *
-                (items.length - 1));
-
-        // If buttons don't fit within the available area, calculate padding so
-        // that there will be an element cut-off.
-        if (totalItemWidth > (containerWidth - (leftMargin * 2))) {
-          const availableWidth = containerWidth - leftMargin - (iconWidth / 2);
-          const amountVisible =
-              Math.floor(
-                  availableWidth / (iconWidth + (MIN_BUTTON_PADDING * 2)));
-
-          state.padding = 0.5 * ((availableWidth / amountVisible) - iconWidth);
-        } else {
-          // Otherwise, calculate padding in from MIN_PADDING to DEFAULT_PADDING
-          // so that all elements fit and take as much area as possible.
-          const totalPadding =
-              ((containerWidth - (leftMargin * 2)) -
-              (iconWidth * items.length)) / (items.length - 1);
-
-          state.padding = Math.min(DEFAULT_BUTTON_PADDING, 0.5 * totalPadding);
-        }
-
-        this.containerWidth_ = containerWidth;
-      },
-      mutate: state => {
-        if (state.noop) {
-          return;
-        }
-        items.forEach((el, i) => {
-          if (i != 0) {
-            setImportantStyles(el, {'padding-left': px(state.padding)});
+    this.vsync_.run(
+      {
+        measure: state => {
+          const containerWidth = this.root./*OK*/ clientWidth;
+
+          if (containerWidth == this.containerWidth_) {
+            // Don't recalculate if width has not changed (i.e. onscreen keyboard)
+            state.noop = true;
+            return;
+          }
+
+          const icon = devAssert(items[0].firstElementChild);
+
+          const leftMargin =
+            icon./*OK*/ offsetLeft - this.root./*OK*/ offsetLeft;
+          const iconWidth = icon./*OK*/ offsetWidth;
+
+          // Total width that the buttons will occupy with minimum padding.
+          const totalItemWidth =
+            iconWidth * items.length +
+            2 * MIN_BUTTON_PADDING * (items.length - 1);
+
+          // If buttons don't fit within the available area, calculate padding so
+          // that there will be an element cut-off.
+          if (totalItemWidth > containerWidth - leftMargin * 2) {
+            const availableWidth = containerWidth - leftMargin - iconWidth / 2;
+            const amountVisible = Math.floor(
+              availableWidth / (iconWidth + MIN_BUTTON_PADDING * 2)
+            );
+
+            state.padding = 0.5 * (availableWidth / amountVisible - iconWidth);
+          } else {
+            // Otherwise, calculate padding in from MIN_PADDING to DEFAULT_PADDING
+            // so that all elements fit and take as much area as possible.
+            const totalPadding =
+              (containerWidth - leftMargin * 2 - iconWidth * items.length) /
+              (items.length - 1);
+
+            state.padding = Math.min(
+              DEFAULT_BUTTON_PADDING,
+              0.5 * totalPadding
+            );
           }
-          if (i != items.length - 1) {
-            setImportantStyles(el, {'padding-right': px(state.padding)});
+
+          this.containerWidth_ = containerWidth;
+        },
+        mutate: state => {
+          if (state.noop) {
+            return;
           }
-        });
+          items.forEach((el, i) => {
+            if (i != 0) {
+              setImportantStyles(el, {'padding-left': px(state.padding)});
+            }
+            if (i != items.length - 1) {
+              setImportantStyles(el, {'padding-right': px(state.padding)});
+            }
+          });
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -525,8 +553,11 @@ export class ScrollableShareWidget extends ShareWidget {
    */
   getVisibleItems_() {
     return Array.prototype.filter.call(
-        dev().assertElement(this.root).querySelectorAll('li'),
-        el => !!el.firstElementChild);
+      dev()
+        .assertElement(this.root)
+        .querySelectorAll('li'),
+      el => !!el.firstElementChild
+    );
   }
 
   /**
diff --git a/extensions/amp-story/0.1/amp-story-store-service.js b/extensions/amp-story/0.1/amp-story-store-service.js
index 450345abcf29..ee0850668b37 100644
--- a/extensions/amp-story/0.1/amp-story-store-service.js
+++ b/extensions/amp-story/0.1/amp-story-store-service.js
@@ -19,11 +19,9 @@ import {Observable} from '../../../src/observable';
 import {dev} from '../../../src/log';
 import {hasOwn} from '../../../src/utils/object';
 
-
 /** @type {string} */
 const TAG = 'amp-story';
 
-
 /**
  * @typedef {{
  *    caninsertautomaticad: boolean,
@@ -47,7 +45,6 @@ const TAG = 'amp-story';
  */
 export let State;
 
-
 /** @private @const @enum {string} */
 export const StateProperty = {
   // Embed options.
@@ -75,7 +72,6 @@ export const StateProperty = {
   CURRENT_PAGE_INDEX: 'currentpageindex',
 };
 
-
 /** @private @const @enum {string} */
 export const Action = {
   CHANGE_PAGE: 'changepage',
@@ -91,7 +87,6 @@ export const Action = {
   TOGGLE_SUPPORTED_BROWSER: 'togglesupportedbrowser',
 };
 
-
 /**
  * Returns the new sate.
  * @param  {!State} state Immutable state
@@ -103,70 +98,76 @@ const actions = (state, action, data) => {
   switch (action) {
     // Triggers the ad UI.
     case Action.TOGGLE_AD:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.AD_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.AD_STATE]: !!data,
+      }));
     // Shows or hides the bookend.
     case Action.TOGGLE_BOOKEND:
       if (!state[StateProperty.CAN_SHOW_BOOKEND]) {
         return state;
       }
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.BOOKEND_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.BOOKEND_STATE]: !!data,
+      }));
     // Triggers the desktop UI.
     case Action.TOGGLE_DESKTOP:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.DESKTOP_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.DESKTOP_STATE]: !!data,
+      }));
     // Shows or hides the info dialog.
     case Action.TOGGLE_INFO_DIALOG:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.INFO_DIALOG_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.INFO_DIALOG_STATE]: !!data,
+      }));
     // Shows or hides the audio controls.
     case Action.TOGGLE_HAS_AUDIO:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.HAS_AUDIO_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.HAS_AUDIO_STATE]: !!data,
+      }));
     case Action.TOGGLE_LANDSCAPE:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.LANDSCAPE_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.LANDSCAPE_STATE]: !!data,
+      }));
     // Mutes or unmutes the story media.
     case Action.TOGGLE_MUTED:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.MUTED_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.MUTED_STATE]: !!data,
+      }));
     case Action.TOGGLE_SUPPORTED_BROWSER:
       if (data) {
         dev().error(TAG, 'Cannot exit unsupported browser state.');
       }
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.CAN_INSERT_AUTOMATIC_AD]: false,
-            [StateProperty.CAN_SHOW_BOOKEND]: false,
-            [StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT]: false,
-            [StateProperty.CAN_SHOW_PREVIOUS_PAGE_HELP]: false,
-            [StateProperty.CAN_SHOW_SYSTEM_LAYER_BUTTONS]: false,
-            [StateProperty.BOOKEND_STATE]: false,
-            [StateProperty.DESKTOP_STATE]: false,
-            [StateProperty.HAS_AUDIO_STATE]: false,
-            [StateProperty.MUTED_STATE]: true,
-            [StateProperty.SUPPORTED_BROWSER_STATE]: false,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.CAN_INSERT_AUTOMATIC_AD]: false,
+        [StateProperty.CAN_SHOW_BOOKEND]: false,
+        [StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT]: false,
+        [StateProperty.CAN_SHOW_PREVIOUS_PAGE_HELP]: false,
+        [StateProperty.CAN_SHOW_SYSTEM_LAYER_BUTTONS]: false,
+        [StateProperty.BOOKEND_STATE]: false,
+        [StateProperty.DESKTOP_STATE]: false,
+        [StateProperty.HAS_AUDIO_STATE]: false,
+        [StateProperty.MUTED_STATE]: true,
+        [StateProperty.SUPPORTED_BROWSER_STATE]: false,
+      }));
     case Action.TOGGLE_SHARE_MENU:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.SHARE_MENU_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.SHARE_MENU_STATE]: !!data,
+      }));
     case Action.SET_CONSENT_ID:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.CONSENT_ID]: data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.CONSENT_ID]: data,
+      }));
     case Action.CHANGE_PAGE:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.CURRENT_PAGE_ID]: data.id,
-            [StateProperty.CURRENT_PAGE_INDEX]: data.index,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.CURRENT_PAGE_ID]: data.id,
+        [StateProperty.CURRENT_PAGE_INDEX]: data.index,
+      }));
     default:
       dev().error(TAG, `Unknown action ${action}.`);
       return state;
   }
 };
 
-
 /**
  * Store service.
  */
@@ -183,7 +184,10 @@ export class AmpStoryStoreService {
 
     /** @private {!State} */
     this.state_ = /** @type {!State} */ (Object.assign(
-        {}, this.getDefaultState_(), this.getEmbedOverrides_()));
+      {},
+      this.getDefaultState_(),
+      this.getEmbedOverrides_()
+    ));
   }
 
   /**
diff --git a/extensions/amp-story/0.1/amp-story-system-layer.js b/extensions/amp-story/0.1/amp-story-system-layer.js
index 70f2b962ef1e..0a83655bd09c 100644
--- a/extensions/amp-story/0.1/amp-story-system-layer.js
+++ b/extensions/amp-story/0.1/amp-story-system-layer.js
@@ -28,8 +28,6 @@ import {getMode} from '../../../src/mode';
 import {matches} from '../../../src/dom';
 import {renderAsElement} from './simple-template';
 
-
-
 /** @private @const {string} */
 const AUDIO_MUTED_ATTRIBUTE = 'muted';
 
@@ -48,8 +46,9 @@ const INFO_CLASS = 'i-amphtml-story-info-control';
 /** @private @const {!./simple-template.ElementDef} */
 const TEMPLATE = {
   tag: 'aside',
-  attrs: dict(
-      {'class': 'i-amphtml-story-system-layer i-amphtml-story-system-reset'}),
+  attrs: dict({
+    'class': 'i-amphtml-story-system-layer i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -88,7 +87,6 @@ const TEMPLATE = {
   ],
 };
 
-
 /**
  * System Layer (i.e. UI Chrome) for <amp-story>.
  * Chrome contains:
@@ -155,11 +153,13 @@ export class SystemLayer {
     createShadowRootWithStyle(this.root_, this.systemLayerEl_, CSS);
 
     this.systemLayerEl_.insertBefore(
-        this.progressBar_.build(pageIds), this.systemLayerEl_.lastChild);
+      this.progressBar_.build(pageIds),
+      this.systemLayerEl_.lastChild
+    );
 
-    this.buttonsContainer_ =
-        this.systemLayerEl_.querySelector(
-            '.i-amphtml-story-system-layer-buttons');
+    this.buttonsContainer_ = this.systemLayerEl_.querySelector(
+      '.i-amphtml-story-system-layer-buttons'
+    );
 
     this.buildForDevelopmentMode_();
 
@@ -174,8 +174,9 @@ export class SystemLayer {
       this.systemLayerEl_.setAttribute('ios', '');
     }
 
-    if (Services.viewerForDoc(this.win_.document.documentElement)
-        .isEmbedded()) {
+    if (
+      Services.viewerForDoc(this.win_.document.documentElement).isEmbedded()
+    ) {
       this.systemLayerEl_.classList.add('i-amphtml-embedded');
     }
 
@@ -190,8 +191,11 @@ export class SystemLayer {
       return;
     }
 
-    this.buttonsContainer_.appendChild(this.developerButtons_.build(
-        this.developerLog_.toggle.bind(this.developerLog_)));
+    this.buttonsContainer_.appendChild(
+      this.developerButtons_.build(
+        this.developerLog_.toggle.bind(this.developerLog_)
+      )
+    );
     this.getShadowRoot().appendChild(this.developerLog_.build());
   }
 
@@ -218,25 +222,45 @@ export class SystemLayer {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.CAN_SHOW_SHARING_UIS, show => {
-      this.onCanShowSharingUisUpdate_(show);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.DESKTOP_STATE, isDesktop => {
-      this.onDesktopStateUpdate_(isDesktop);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.HAS_AUDIO_STATE, hasAudio => {
-      this.onHasAudioStateUpdate_(hasAudio);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      this.onMutedStateUpdate_(isMuted);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.CURRENT_PAGE_INDEX, index => {
-      this.onPageIndexUpdate_(index);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.CAN_SHOW_SHARING_UIS,
+      show => {
+        this.onCanShowSharingUisUpdate_(show);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.DESKTOP_STATE,
+      isDesktop => {
+        this.onDesktopStateUpdate_(isDesktop);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.HAS_AUDIO_STATE,
+      hasAudio => {
+        this.onHasAudioStateUpdate_(hasAudio);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        this.onMutedStateUpdate_(isMuted);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.CURRENT_PAGE_INDEX,
+      index => {
+        this.onPageIndexUpdate_(index);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -259,8 +283,10 @@ export class SystemLayer {
    * @private
    */
   onBookendStateUpdate_(isActive) {
-    this.getShadowRoot()
-        .classList.toggle('i-amphtml-story-bookend-active', isActive);
+    this.getShadowRoot().classList.toggle(
+      'i-amphtml-story-bookend-active',
+      isActive
+    );
   }
 
   /**
@@ -271,8 +297,10 @@ export class SystemLayer {
    */
   onCanShowSharingUisUpdate_(canShowSharingUis) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-no-sharing', !canShowSharingUis);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-no-sharing',
+        !canShowSharingUis
+      );
     });
   }
 
@@ -283,9 +311,9 @@ export class SystemLayer {
    */
   onDesktopStateUpdate_(isDesktop) {
     this.vsync_.mutate(() => {
-      isDesktop ?
-        this.getShadowRoot().setAttribute('desktop', '') :
-        this.getShadowRoot().removeAttribute('desktop');
+      isDesktop
+        ? this.getShadowRoot().setAttribute('desktop', '')
+        : this.getShadowRoot().removeAttribute('desktop');
     });
   }
 
@@ -307,9 +335,9 @@ export class SystemLayer {
    */
   onMutedStateUpdate_(isMuted) {
     this.vsync_.mutate(() => {
-      isMuted ?
-        this.getShadowRoot().setAttribute(AUDIO_MUTED_ATTRIBUTE, '') :
-        this.getShadowRoot().removeAttribute(AUDIO_MUTED_ATTRIBUTE);
+      isMuted
+        ? this.getShadowRoot().setAttribute(AUDIO_MUTED_ATTRIBUTE, '')
+        : this.getShadowRoot().removeAttribute(AUDIO_MUTED_ATTRIBUTE);
     });
   }
 
diff --git a/extensions/amp-story/0.1/amp-story-unsupported-browser-layer.js b/extensions/amp-story/0.1/amp-story-unsupported-browser-layer.js
index a7a14408d89a..2d6a60b65389 100644
--- a/extensions/amp-story/0.1/amp-story-unsupported-browser-layer.js
+++ b/extensions/amp-story/0.1/amp-story-unsupported-browser-layer.js
@@ -20,7 +20,6 @@ import {createShadowRootWithStyle} from './utils';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /**
  * Full viewport black layer indicating browser is not supported.
  * @private @const {!./simple-template.ElementDef}
@@ -41,14 +40,13 @@ const UNSUPPORTED_BROWSER_LAYER_TEMPLATE = {
           tag: 'div',
           attrs: dict({'class': 'i-amphtml-story-overlay-text'}),
           localizedStringId:
-              LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT,
+            LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT,
         },
       ],
     },
   ],
 };
 
-
 /**
  * Unsupported browser layer UI.
  */
@@ -73,8 +71,10 @@ export class UnsupportedBrowserLayer {
     }
 
     this.root_ = this.win_.document.createElement('div');
-    const overlayEl =
-        renderAsElement(this.win_.document, UNSUPPORTED_BROWSER_LAYER_TEMPLATE);
+    const overlayEl = renderAsElement(
+      this.win_.document,
+      UNSUPPORTED_BROWSER_LAYER_TEMPLATE
+    );
 
     createShadowRootWithStyle(this.root_, overlayEl, CSS);
 
diff --git a/extensions/amp-story/0.1/amp-story-viewport-warning-layer.js b/extensions/amp-story/0.1/amp-story-viewport-warning-layer.js
index a3ef022c5ca3..8e93d3eb93c9 100644
--- a/extensions/amp-story/0.1/amp-story-viewport-warning-layer.js
+++ b/extensions/amp-story/0.1/amp-story-viewport-warning-layer.js
@@ -22,14 +22,12 @@ import {createShadowRootWithStyle} from './utils';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /**
  * CSS class indicating the format is landscape.
  * @const {string}
  */
 const LANDSCAPE_OVERLAY_CLASS = 'i-amphtml-story-landscape';
 
-
 /**
  * Full viewport layer advising the user to rotate his device. Mobile only.
  * @private @const {!./simple-template.ElementDef}
@@ -37,8 +35,8 @@ const LANDSCAPE_OVERLAY_CLASS = 'i-amphtml-story-landscape';
 const LANDSCAPE_ORIENTATION_WARNING_TEMPLATE = {
   tag: 'div',
   attrs: dict({
-    'class': 'i-amphtml-story-no-rotation-overlay ' +
-        'i-amphtml-story-system-reset'}),
+    'class': 'i-amphtml-story-no-rotation-overlay i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -52,14 +50,13 @@ const LANDSCAPE_ORIENTATION_WARNING_TEMPLATE = {
           tag: 'div',
           attrs: dict({'class': 'i-amphtml-story-overlay-text'}),
           localizedStringId:
-              LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT,
+            LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT,
         },
       ],
     },
   ],
 };
 
-
 /**
  * Full viewport layer advising the user to expand his window. Only displayed
  * for small desktop viewports.
@@ -68,8 +65,8 @@ const LANDSCAPE_ORIENTATION_WARNING_TEMPLATE = {
 const DESKTOP_SIZE_WARNING_TEMPLATE = {
   tag: 'div',
   attrs: dict({
-    'class': 'i-amphtml-story-no-rotation-overlay ' +
-        'i-amphtml-story-system-reset'}),
+    'class': 'i-amphtml-story-no-rotation-overlay i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -83,15 +80,13 @@ const DESKTOP_SIZE_WARNING_TEMPLATE = {
           tag: 'div',
           attrs: dict({'class': 'i-amphtml-story-overlay-text'}),
           localizedStringId:
-              LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT,
+            LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT,
         },
       ],
     },
   ],
 };
 
-
-
 /**
  * Viewport warning layer UI.
  */
@@ -136,15 +131,17 @@ export class ViewportWarningLayer {
     this.isBuilt_ = true;
 
     const root = this.win_.document.createElement('div');
-    this.overlayEl_ =
-        renderAsElement(
-            this.win_.document, this.getViewportWarningOverlayTemplate_());
+    this.overlayEl_ = renderAsElement(
+      this.win_.document,
+      this.getViewportWarningOverlayTemplate_()
+    );
 
     createShadowRootWithStyle(root, this.overlayEl_, CSS);
 
     // Initializes the desktop state now that the component is built.
     this.onDesktopStateUpdate_(
-        !!this.storeService_.get(StateProperty.DESKTOP_STATE));
+      !!this.storeService_.get(StateProperty.DESKTOP_STATE)
+    );
 
     this.vsync_.mutate(() => {
       this.storyElement_.insertBefore(root, this.storyElement_.firstChild);
@@ -163,13 +160,21 @@ export class ViewportWarningLayer {
    * @private
    */
   initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.DESKTOP_STATE, isDesktop => {
-      this.onDesktopStateUpdate_(isDesktop);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.LANDSCAPE_STATE, isLandscape => {
-      this.onLandscapeStateUpdate_(isLandscape);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.DESKTOP_STATE,
+      isDesktop => {
+        this.onDesktopStateUpdate_(isDesktop);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.LANDSCAPE_STATE,
+      isLandscape => {
+        this.onLandscapeStateUpdate_(isLandscape);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -191,8 +196,10 @@ export class ViewportWarningLayer {
     this.build();
 
     this.vsync_.mutate(() => {
-      this.overlayEl_
-          .classList.toggle(LANDSCAPE_OVERLAY_CLASS, !isDesktop && isLandscape);
+      this.overlayEl_.classList.toggle(
+        LANDSCAPE_OVERLAY_CLASS,
+        !isDesktop && isLandscape
+      );
     });
   }
 
@@ -207,9 +214,9 @@ export class ViewportWarningLayer {
     }
 
     this.vsync_.mutate(() => {
-      isDesktop ?
-        this.overlayEl_.setAttribute('desktop', '') :
-        this.overlayEl_.removeAttribute('desktop');
+      isDesktop
+        ? this.overlayEl_.setAttribute('desktop', '')
+        : this.overlayEl_.removeAttribute('desktop');
     });
   }
 
@@ -219,8 +226,8 @@ export class ViewportWarningLayer {
    * @private
    */
   getViewportWarningOverlayTemplate_() {
-    return (this.platform_.isIos() || this.platform_.isAndroid()) ?
-      LANDSCAPE_ORIENTATION_WARNING_TEMPLATE :
-      DESKTOP_SIZE_WARNING_TEMPLATE;
+    return this.platform_.isIos() || this.platform_.isAndroid()
+      ? LANDSCAPE_ORIENTATION_WARNING_TEMPLATE
+      : DESKTOP_SIZE_WARNING_TEMPLATE;
   }
 }
diff --git a/extensions/amp-story/0.1/amp-story.js b/extensions/amp-story/0.1/amp-story.js
index 3b9f4000a108..a1a2d6bbc46c 100644
--- a/extensions/amp-story/0.1/amp-story.js
+++ b/extensions/amp-story/0.1/amp-story.js
@@ -136,7 +136,6 @@ const AD_SHOWING_ATTR = 'ad-showing';
  */
 const PAGE_LOAD_TIMEOUT_MS = 5000;
 
-
 /**
  * CSS class for an amp-story that indicates the initial load for the story has
  * completed.
@@ -153,7 +152,6 @@ const MAX_MEDIA_ELEMENT_COUNTS = {
 /** @type {string} */
 const TAG = 'amp-story';
 
-
 /**
  * Container for "pill-style" share widget, rendered on desktop.
  * @private @const {!./simple-template.ElementDef}
@@ -165,21 +163,19 @@ const SHARE_WIDGET_PILL_CONTAINER = {
     {
       tag: 'span',
       attrs: dict({'class': 'i-amphtml-story-share-pill-label'}),
-      localizedStringId: LocalizedStringId
-          .DEPRECATED_AMP_STORY_SYSTEM_LAYER_SHARE_WIDGET_LABEL,
+      localizedStringId:
+        LocalizedStringId.DEPRECATED_AMP_STORY_SYSTEM_LAYER_SHARE_WIDGET_LABEL,
     },
   ],
 };
 
-
 /**
  * Selector for elements that should be hidden when the bookend is open on
  * desktop view.
  * @private @const {string}
  */
 const HIDE_ON_BOOKEND_SELECTOR =
-    'amp-story-page, .i-amphtml-story-system-layer';
-
+  'amp-story-page, .i-amphtml-story-system-layer';
 
 /**
  * @implements {./media-pool.MediaPoolRoot}
@@ -191,17 +187,20 @@ export class AmpStory extends AMP.BaseElement {
 
     /** @private @const {!AmpStoryStoreService} */
     this.storeService_ = new AmpStoryStoreService(this.win);
-    registerServiceBuilder(
-        this.win, 'story-store', () => this.storeService_);
+    registerServiceBuilder(this.win, 'story-store', () => this.storeService_);
 
     /** @private @const {!AmpStoryRequestService} */
     this.requestService_ = new AmpStoryRequestService(this.win, this.element);
     registerServiceBuilder(
-        this.win, 'story-request-v01', () => this.requestService_);
+      this.win,
+      'story-request-v01',
+      () => this.requestService_
+    );
 
     /** @private {!NavigationState} */
-    this.navigationState_ =
-        new NavigationState(this.win, () => this.hasBookend_());
+    this.navigationState_ = new NavigationState(this.win, () =>
+      this.hasBookend_()
+    );
 
     /** @private {!AmpStoryAnalytics} */
     this.analytics_ = new AmpStoryAnalytics(this.win, this.element);
@@ -212,16 +211,23 @@ export class AmpStory extends AMP.BaseElement {
     /** @private @const {!LocalizationService} */
     this.localizationService_ = new LocalizationService(this.win);
     this.localizationService_
-        .registerLocalizedStringBundle('default', LocalizedStringsDefault)
-        .registerLocalizedStringBundle('en', LocalizedStringsEn);
-
-    const enXaPseudoLocaleBundle =
-        createPseudoLocale(LocalizedStringsEn, s => `[${s} one two]`);
-    this.localizationService_
-        .registerLocalizedStringBundle('en-xa', enXaPseudoLocaleBundle);
+      .registerLocalizedStringBundle('default', LocalizedStringsDefault)
+      .registerLocalizedStringBundle('en', LocalizedStringsEn);
+
+    const enXaPseudoLocaleBundle = createPseudoLocale(
+      LocalizedStringsEn,
+      s => `[${s} one two]`
+    );
+    this.localizationService_.registerLocalizedStringBundle(
+      'en-xa',
+      enXaPseudoLocaleBundle
+    );
 
     registerServiceBuilder(
-        this.win, 'localization-v01', () => this.localizationService_);
+      this.win,
+      'localization-v01',
+      () => this.localizationService_
+    );
 
     /** @private @const {!Bookend} */
     this.bookend_ = new Bookend(this.win, this.element);
@@ -246,21 +252,24 @@ export class AmpStory extends AMP.BaseElement {
 
     /** @const @private {!AmpStoryVariableService} */
     this.variableService_ = new AmpStoryVariableService();
-    registerServiceBuilder(
-        this.win, 'story-variable', () => this.variableService_.get());
+    registerServiceBuilder(this.win, 'story-variable', () =>
+      this.variableService_.get()
+    );
 
     /** @private {?./amp-story-page.AmpStoryPage} */
     this.activePage_ = null;
 
     /** @private @const */
     this.desktopMedia_ = this.win.matchMedia(
-        `(min-width: ${DESKTOP_WIDTH_THRESHOLD}px) and ` +
-        `(min-height: ${DESKTOP_HEIGHT_THRESHOLD}px)`);
+      `(min-width: ${DESKTOP_WIDTH_THRESHOLD}px) and ` +
+        `(min-height: ${DESKTOP_HEIGHT_THRESHOLD}px)`
+    );
 
     /** @private @const */
     this.canRotateToDesktopMedia_ = this.win.matchMedia(
-        `(min-width: ${DESKTOP_HEIGHT_THRESHOLD}px) and ` +
-        `(min-height: ${DESKTOP_WIDTH_THRESHOLD}px)`);
+      `(min-width: ${DESKTOP_HEIGHT_THRESHOLD}px) and ` +
+        `(min-height: ${DESKTOP_WIDTH_THRESHOLD}px)`
+    );
 
     /** @private {?AmpStoryBackground} */
     this.background_ = null;
@@ -293,7 +302,6 @@ export class AmpStory extends AMP.BaseElement {
     this.platform_ = Services.platformFor(this.win);
   }
 
-
   /** @override */
   buildCallback() {
     this.assertAmpStoryExperiment_();
@@ -324,7 +332,6 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /** @private */
   initializeStandaloneStory_() {
     const html = this.win.document.documentElement;
@@ -335,7 +342,6 @@ export class AmpStory extends AMP.BaseElement {
     this.onResize();
   }
 
-
   /**
    * Builds the system layer DOM.  This is dependent on the pages_ array having
    * been initialized, so it cannot happen at build time.
@@ -357,21 +363,31 @@ export class AmpStory extends AMP.BaseElement {
       this.previous_();
     });
 
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      this.onMutedStateUpdate_(isMuted);
-      this.variableService_.onMutedStateChange(isMuted);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        this.onMutedStateUpdate_(isMuted);
+        this.variableService_.onMutedStateChange(isMuted);
+      },
+      true /** callToInitialize */
+    );
 
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      // We do not want to trigger an analytics event for the initialization of
-      // the muted state.
-      this.analytics_.onMutedStateChange(isMuted);
-    }, false /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        // We do not want to trigger an analytics event for the initialization of
+        // the muted state.
+        this.analytics_.onMutedStateChange(isMuted);
+      },
+      false /** callToInitialize */
+    );
 
     this.storeService_.subscribe(
-        StateProperty.SUPPORTED_BROWSER_STATE, isBrowserSupported => {
-          this.onSupportedBrowserStateUpdate_(isBrowserSupported);
-        });
+      StateProperty.SUPPORTED_BROWSER_STATE,
+      isBrowserSupported => {
+        this.onSupportedBrowserStateUpdate_(isBrowserSupported);
+      }
+    );
 
     this.element.addEventListener(EventType.SWITCH_PAGE, e => {
       if (this.storeService_.get(StateProperty.BOOKEND_STATE)) {
@@ -417,13 +433,21 @@ export class AmpStory extends AMP.BaseElement {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.DESKTOP_STATE, isDesktop => {
-      this.onDesktopStateUpdate_(isDesktop);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.DESKTOP_STATE,
+      isDesktop => {
+        this.onDesktopStateUpdate_(isDesktop);
+      },
+      true /** callToInitialize */
+    );
 
-    this.win.document.addEventListener('keydown', e => {
-      this.onKeyDown_(e);
-    }, true);
+    this.win.document.addEventListener(
+      'keydown',
+      e => {
+        this.onKeyDown_(e);
+      },
+      true
+    );
 
     this.storeService_.subscribe(StateProperty.CURRENT_PAGE_ID, pageId => {
       this.onCurrentPageIdUpdate_(pageId);
@@ -453,8 +477,9 @@ export class AmpStory extends AMP.BaseElement {
       if (!this.isSwipeLargeEnoughForHint_(deltaX, deltaY)) {
         return;
       }
-      if (!this.storeService_
-          .get(StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT)) {
+      if (
+        !this.storeService_.get(StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT)
+      ) {
         return;
       }
 
@@ -470,7 +495,7 @@ export class AmpStory extends AMP.BaseElement {
    */
   isSwipeLargeEnoughForHint_(deltaX, deltaY) {
     const sideSwipe = Math.abs(deltaX) >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
-    const upSwipe = (-1 * deltaY) >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
+    const upSwipe = -1 * deltaY >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
     return sideSwipe || upSwipe;
   }
 
@@ -500,7 +525,6 @@ export class AmpStory extends AMP.BaseElement {
     this.maybeLockScreenOrientation_();
   }
 
-
   /** @private */
   maybeLockScreenOrientation_() {
     const {screen} = this.win;
@@ -508,9 +532,11 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    const lockOrientation = screen.lockOrientation ||
-        screen.mozLockOrientation || screen.msLockOrientation ||
-        (unusedOrientation => {});
+    const lockOrientation =
+      screen.lockOrientation ||
+      screen.mozLockOrientation ||
+      screen.msLockOrientation ||
+      (unusedOrientation => {});
 
     try {
       lockOrientation('portrait');
@@ -526,7 +552,8 @@ export class AmpStory extends AMP.BaseElement {
     this.paginationButtons_.attach(this.element);
 
     this.navigationState_.observe(e =>
-      this.paginationButtons_.onNavigationStateChange(e));
+      this.paginationButtons_.onNavigationStateChange(e)
+    );
   }
 
   /** @visibleForTesting */
@@ -540,7 +567,9 @@ export class AmpStory extends AMP.BaseElement {
 
     this.topBar_ = doc.createElement('div');
     this.topBar_.classList.add(
-        'i-amphtml-story-top', 'i-amphtml-story-system-reset');
+      'i-amphtml-story-top',
+      'i-amphtml-story-system-reset'
+    );
     this.topBar_.appendChild(this.buildTopBarShare_());
 
     this.element.insertBefore(this.topBar_, this.element.firstChild);
@@ -551,18 +580,22 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   buildTopBarShare_() {
-    const container =
-        renderSimpleTemplate(this.win.document, SHARE_WIDGET_PILL_CONTAINER);
+    const container = renderSimpleTemplate(
+      this.win.document,
+      SHARE_WIDGET_PILL_CONTAINER
+    );
 
     this.shareWidget_ = new ShareWidget(this.win);
 
     const shareLabelEl = dev().assertElement(
-        container.querySelector('.i-amphtml-story-share-pill-label'),
-        'Expected share pill label to be present.');
+      container.querySelector('.i-amphtml-story-share-pill-label'),
+      'Expected share pill label to be present.'
+    );
 
     container.insertBefore(
-        this.shareWidget_.build(this.getAmpDoc()),
-        shareLabelEl);
+      this.shareWidget_.build(this.getAmpDoc()),
+      shareLabelEl
+    );
 
     return container;
   }
@@ -575,8 +608,9 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     const firstPageEl = user().assertElement(
-        this.element.querySelector('amp-story-page'),
-        'Story must have at least one page.');
+      this.element.querySelector('amp-story-page'),
+      'Story must have at least one page.'
+    );
 
     const initialPageId = this.getHistoryStatePageId_() || firstPageEl.id;
 
@@ -585,39 +619,40 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     const storyLayoutPromise = this.initializePages_()
-        .then(() => this.buildSystemLayer_())
-        .then(() => {
-          this.pages_.forEach(page => {
-            page.setActive(false);
-          });
-        })
-        .then(() => this.switchTo_(initialPageId))
-        .then(() => this.preloadPagesByDistance_())
-        .then(() => {
-          // Preloads and prerenders the share menu if mobile, where the share
-          // button is visible.
-          if (!this.storeService_.get(StateProperty.DESKTOP_STATE)) {
-            this.shareMenu_.build();
-          }
-
-          const infoDialog = Services.viewerForDoc(this.element).isEmbedded() ?
-            new InfoDialog(this.win, this.element) : null;
-          if (infoDialog) {
-            infoDialog.build();
-          }
+      .then(() => this.buildSystemLayer_())
+      .then(() => {
+        this.pages_.forEach(page => {
+          page.setActive(false);
         });
+      })
+      .then(() => this.switchTo_(initialPageId))
+      .then(() => this.preloadPagesByDistance_())
+      .then(() => {
+        // Preloads and prerenders the share menu if mobile, where the share
+        // button is visible.
+        if (!this.storeService_.get(StateProperty.DESKTOP_STATE)) {
+          this.shareMenu_.build();
+        }
+
+        const infoDialog = Services.viewerForDoc(this.element).isEmbedded()
+          ? new InfoDialog(this.win, this.element)
+          : null;
+        if (infoDialog) {
+          infoDialog.build();
+        }
+      });
 
     // Do not block the layout callback on the completion of these promises, as
     // that prevents descendents from being laid out (and therefore loaded).
-    storyLayoutPromise.then(() => this.whenPagesLoaded_(PAGE_LOAD_TIMEOUT_MS))
-        .then(() => this.markStoryAsLoaded_());
+    storyLayoutPromise
+      .then(() => this.whenPagesLoaded_(PAGE_LOAD_TIMEOUT_MS))
+      .then(() => this.markStoryAsLoaded_());
 
     this.validateConsent_();
 
     return storyLayoutPromise;
   }
 
-
   /**
    * @param {number} timeoutMs The maximum amount of time to wait, in
    *     milliseconds.
@@ -626,18 +661,19 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   whenPagesLoaded_(timeoutMs = 0) {
-    const pagesToWaitFor = this.isDesktop_() ?
-      [this.pages_[0], this.pages_[1]] :
-      [this.pages_[0]];
+    const pagesToWaitFor = this.isDesktop_()
+      ? [this.pages_[0], this.pages_[1]]
+      : [this.pages_[0]];
 
     const storyLoadPromise = Promise.all(
-        pagesToWaitFor.filter(page => !!page).map(page => page.whenLoaded()));
+      pagesToWaitFor.filter(page => !!page).map(page => page.whenLoaded())
+    );
 
-    return this.timer_.timeoutPromise(timeoutMs, storyLoadPromise)
-        .catch(() => {});
+    return this.timer_
+      .timeoutPromise(timeoutMs, storyLoadPromise)
+      .catch(() => {});
   }
 
-
   /** @private */
   markStoryAsLoaded_() {
     dispatch(this.element, EventType.STORY_LOADED, true);
@@ -647,7 +683,6 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Ensures publishers using amp-consent use amp-story-consent.
    * @private
@@ -664,7 +699,9 @@ export class AmpStory extends AMP.BaseElement {
 
     const allowedTags = ['SCRIPT', 'AMP-STORY-CONSENT'];
     const toRemoveChildren = childElements(
-        consentEl, el => allowedTags.indexOf(el.tagName) === -1);
+      consentEl,
+      el => allowedTags.indexOf(el.tagName) === -1
+    );
 
     if (toRemoveChildren.length === 0) {
       return;
@@ -673,7 +710,6 @@ export class AmpStory extends AMP.BaseElement {
     toRemoveChildren.forEach(el => consentEl.removeChild(el));
   }
 
-
   /** @override */
   isLayoutSupported(layout) {
     return layout == Layout.CONTAINER;
@@ -684,11 +720,13 @@ export class AmpStory extends AMP.BaseElement {
     return true;
   }
 
-
   /** @private */
   isAmpStoryEnabled_() {
-    if (isExperimentOn(this.win, 'amp-story') || getMode().test ||
-        this.win.location.protocol === 'file:') {
+    if (
+      isExperimentOn(this.win, 'amp-story') ||
+      getMode().test ||
+      this.win.location.protocol === 'file:'
+    ) {
       return true;
     }
 
@@ -696,7 +734,6 @@ export class AmpStory extends AMP.BaseElement {
     return this.isOriginWhitelisted_(origin);
   }
 
-
   /**
    * @param {string} domain The domain part of the origin, to be hashed.
    * @return {string} The hashed origin.
@@ -706,7 +743,6 @@ export class AmpStory extends AMP.BaseElement {
     return stringHash32(domain.toLowerCase());
   }
 
-
   /**
    * @param {string} origin The origin to check.
    * @return {boolean} Whether the specified origin is whitelisted to use the
@@ -738,7 +774,6 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /** @private */
   assertAmpStoryExperiment_() {
     if (this.isAmpStoryEnabled_()) {
@@ -751,18 +786,20 @@ export class AmpStory extends AMP.BaseElement {
 
     const errorMsgEl = this.win.document.createElement('span');
     errorMsgEl.textContent = this.localizationService_.getLocalizedString(
-        LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT);
+      LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT
+    );
 
     const experimentsLinkEl = this.win.document.createElement('button');
-    experimentsLinkEl.textContent = this.localizationService_
-        .getLocalizedString(LocalizedStringId
-            .DEPRECATED_AMP_STORY_EXPERIMENT_ENABLE_BUTTON_LABEL);
+    experimentsLinkEl.textContent = this.localizationService_.getLocalizedString(
+      LocalizedStringId.DEPRECATED_AMP_STORY_EXPERIMENT_ENABLE_BUTTON_LABEL
+    );
     experimentsLinkEl.addEventListener('click', () => {
       toggleExperiment(this.win, 'amp-story', true);
       errorIconEl.classList.remove('i-amphtml-story-experiment-icon-error');
       errorIconEl.classList.add('i-amphtml-story-experiment-icon-done');
       errorMsgEl.textContent = this.localizationService_.getLocalizedString(
-          LocalizedStringId.DEPRECATED_AMP_STORY_EXPERIMENT_ENABLED_TEXT);
+        LocalizedStringId.DEPRECATED_AMP_STORY_EXPERIMENT_ENABLED_TEXT
+      );
       removeElement(experimentsLinkEl);
     });
 
@@ -776,21 +813,20 @@ export class AmpStory extends AMP.BaseElement {
     user().error(TAG, 'enable amp-story experiment');
   }
 
-
   /** @private */
   initializePages_() {
     const pageImplPromises = Array.prototype.map.call(
-        this.element.querySelectorAll('amp-story-page'),
-        (pageEl, index) => {
-          return pageEl.getImpl().then(pageImpl => {
-            this.pages_[index] = pageImpl;
-          });
+      this.element.querySelectorAll('amp-story-page'),
+      (pageEl, index) => {
+        return pageEl.getImpl().then(pageImpl => {
+          this.pages_[index] = pageImpl;
         });
+      }
+    );
 
     return Promise.all(pageImplPromises);
   }
 
-
   /**
    * Advance to the next screen in the story, if there is one.
    * @param {boolean=} opt_isAutomaticAdvance Whether this navigation was caused
@@ -798,12 +834,16 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   next_(opt_isAutomaticAdvance) {
-    const activePage = devAssert(this.activePage_,
-        'No active page set when navigating to next page.');
+    const activePage = devAssert(
+      this.activePage_,
+      'No active page set when navigating to next page.'
+    );
 
     const lastPage = this.pages_[this.getPageCount() - 1];
-    if (activePage.element.hasAttribute(ADVANCE_TO_ATTR) ||
-        activePage !== lastPage) {
+    if (
+      activePage.element.hasAttribute(ADVANCE_TO_ATTR) ||
+      activePage !== lastPage
+    ) {
       activePage.next(opt_isAutomaticAdvance);
     } else {
       this.hasBookend_().then(hasBookend => {
@@ -814,18 +854,18 @@ export class AmpStory extends AMP.BaseElement {
     }
   }
 
-
   /**
    * Go back to the previous screen in the story, if there is one.
    * @private
    */
   previous_() {
-    const activePage = devAssert(this.activePage_,
-        'No active page set when navigating to next page.');
+    const activePage = devAssert(
+      this.activePage_,
+      'No active page set when navigating to next page.'
+    );
     activePage.previous();
   }
 
-
   /**
    * @param {!TapNavigationDirection} direction The direction to navigate.
    * @private
@@ -843,7 +883,6 @@ export class AmpStory extends AMP.BaseElement {
     }
   }
 
-
   /**
    * Switches to a particular page.
    * @param {string} targetPageId
@@ -874,22 +913,23 @@ export class AmpStory extends AMP.BaseElement {
 
     // TODO(alanorozco): check if autoplay
     this.navigationState_.updateActivePage(
-        pageIndex,
-        this.getPageCount(),
-        targetPage.element.id);
+      pageIndex,
+      this.getPageCount(),
+      targetPage.element.id
+    );
 
     const oldPage = this.activePage_;
 
     // TODO(cvializ): Move this to the page class?
     const activePriorSibling = targetPage.element.previousElementSibling;
     const previousActivePriorSibling = this.element.querySelector(
-        `[${escapeCssSelectorIdent(PRE_ACTIVE_PAGE_ATTRIBUTE_NAME)}]`);
+      `[${escapeCssSelectorIdent(PRE_ACTIVE_PAGE_ATTRIBUTE_NAME)}]`
+    );
 
     this.activePage_ = targetPage;
 
     this.systemLayer_.resetDeveloperLogs();
-    this.systemLayer_.setDeveloperLogContextString(
-        this.activePage_.element.id);
+    this.systemLayer_.setDeveloperLogContextString(this.activePage_.element.id);
 
     return targetPage.beforeVisible().then(() => {
       this.triggerActiveEventForPage_();
@@ -900,13 +940,13 @@ export class AmpStory extends AMP.BaseElement {
 
       targetPage.setActive(true);
 
-      if (activePriorSibling &&
-          matches(activePriorSibling, 'amp-story-page')) {
+      if (activePriorSibling && matches(activePriorSibling, 'amp-story-page')) {
         activePriorSibling.setAttribute(PRE_ACTIVE_PAGE_ATTRIBUTE_NAME, '');
       }
       if (previousActivePriorSibling) {
         previousActivePriorSibling.removeAttribute(
-            PRE_ACTIVE_PAGE_ATTRIBUTE_NAME);
+          PRE_ACTIVE_PAGE_ATTRIBUTE_NAME
+        );
       }
 
       // If first navigation.
@@ -921,17 +961,18 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /** @private */
   triggerActiveEventForPage_() {
     // TODO(alanorozco): pass event priority once amphtml-story repo is merged
     // with upstream.
-    Services.actionServiceForDoc(this.element)
-        .trigger(this.activePage_.element, 'active', /* event */ null,
-            ActionTrust.HIGH);
+    Services.actionServiceForDoc(this.element).trigger(
+      this.activePage_.element,
+      'active',
+      /* event */ null,
+      ActionTrust.HIGH
+    );
   }
 
-
   /**
    * For some reason, Safari has an issue where sometimes when pages become
    * visible, some descendants are not painted.  This is a hack where we detect
@@ -956,14 +997,13 @@ export class AmpStory extends AMP.BaseElement {
       // only to workaround the fact that the closure compiler would otherwise
       // think that only reading the height has no effect.  Since the height is
       // always >= 0, this conditional will always be executed.
-      const height = this.element./*OK*/offsetHeight;
+      const height = this.element./*OK*/ offsetHeight;
       if (height >= 0) {
         toggle(this.element, true);
       }
     });
   }
 
-
   /**
    * Handles all key presses within the story.
    * @param {!Event} e The keydown event.
@@ -985,7 +1025,6 @@ export class AmpStory extends AMP.BaseElement {
     }
   }
 
-
   /**
    * @param {string} pageId new current page id
    * @private
@@ -994,7 +1033,6 @@ export class AmpStory extends AMP.BaseElement {
     this.setHistoryStatePageId_(pageId);
   }
 
-
   /**
    * Save page id using history API.
    * @param {string} pageId page id to be saved
@@ -1009,13 +1047,15 @@ export class AmpStory extends AMP.BaseElement {
 
     const {history} = this.win;
     if (history.replaceState && this.getHistoryStatePageId_() !== pageId) {
-      history.replaceState({
-        ampStoryPageId: pageId,
-      }, '');
+      history.replaceState(
+        {
+          ampStoryPageId: pageId,
+        },
+        ''
+      );
     }
   }
 
-
   /**
    * @private
    * @return {?string}
@@ -1025,7 +1065,6 @@ export class AmpStory extends AMP.BaseElement {
     return state ? state.ampStoryPageId : null;
   }
 
-
   /**
    * Handle resize events and set the story's desktop state.
    * @visibleForTesting
@@ -1040,15 +1079,21 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     // On mobile, maybe display the landscape overlay warning.
-    this.vsync_.run({
-      measure: state => {
-        const {offsetWidth, offsetHeight} = this.element;
-        state.isLandscape = offsetWidth > offsetHeight;
-      },
-      mutate: state => {
-        this.storeService_.dispatch(Action.TOGGLE_LANDSCAPE, state.isLandscape);
+    this.vsync_.run(
+      {
+        measure: state => {
+          const {offsetWidth, offsetHeight} = this.element;
+          state.isLandscape = offsetWidth > offsetHeight;
+        },
+        mutate: state => {
+          this.storeService_.dispatch(
+            Action.TOGGLE_LANDSCAPE,
+            state.isLandscape
+          );
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -1086,8 +1131,11 @@ export class AmpStory extends AMP.BaseElement {
    * @return {boolean} True if the screen size matches the desktop media query.
    */
   isDesktop_() {
-    return this.desktopMedia_.matches && !this.platform_.isBot() &&
-        !isExperimentOn(this.win, 'disable-amp-story-desktop');
+    return (
+      this.desktopMedia_.matches &&
+      !this.platform_.isBot() &&
+      !isExperimentOn(this.win, 'disable-amp-story-desktop')
+    );
   }
 
   /**
@@ -1123,7 +1171,8 @@ export class AmpStory extends AMP.BaseElement {
    */
   getBackgroundUrl_(pageElement) {
     let fillElement = pageElement.querySelector(
-        '[template="fill"]:not(.i-amphtml-hidden-by-media-query)');
+      '[template="fill"]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
     if (!fillElement) {
       return null;
@@ -1132,19 +1181,21 @@ export class AmpStory extends AMP.BaseElement {
     fillElement = dev().assertElement(fillElement);
 
     const fillPosterElement = fillElement.querySelector(
-        '[poster]:not(.i-amphtml-hidden-by-media-query)');
+      '[poster]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
     const srcElement = fillElement.querySelector(
-        '[src]:not(.i-amphtml-hidden-by-media-query)');
+      '[src]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
-    const fillPoster = fillPosterElement ?
-      fillPosterElement.getAttribute('poster') : '';
+    const fillPoster = fillPosterElement
+      ? fillPosterElement.getAttribute('poster')
+      : '';
     const src = srcElement ? srcElement.getAttribute('src') : '';
 
     return fillPoster || src;
   }
 
-
   /**
    * Update the background to the specified page's background.
    * @param {!Element} pageElement
@@ -1155,19 +1206,22 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    this.getVsync().run({
-      measure: state => {
-        state.url = this.getBackgroundUrl_(pageElement);
-        state.color = computedStyle(this.win, pageElement)
-            .getPropertyValue('background-color');
+    this.getVsync().run(
+      {
+        measure: state => {
+          state.url = this.getBackgroundUrl_(pageElement);
+          state.color = computedStyle(this.win, pageElement).getPropertyValue(
+            'background-color'
+          );
+        },
+        mutate: state => {
+          this.background_.setBackground(state.color, state.url, initial);
+        },
       },
-      mutate: state => {
-        this.background_.setBackground(state.color, state.url, initial);
-      },
-    }, {});
+      {}
+    );
   }
 
-
   /**
    * Shows the bookend overlay.
    * @private
@@ -1178,7 +1232,6 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Hides the bookend overlay.
    * @private
@@ -1187,7 +1240,6 @@ export class AmpStory extends AMP.BaseElement {
     this.storeService_.dispatch(Action.TOGGLE_BOOKEND, false);
   }
 
-
   /**
    * @param {boolean} isActive
    * @private
@@ -1206,7 +1258,6 @@ export class AmpStory extends AMP.BaseElement {
     }
   }
 
-
   /**
    * Toggle content when bookend is opened/closed.
    * TODO(gmajoulet): these elements should get hidden by listening to bookend
@@ -1219,8 +1270,10 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    const elements = scopedQuerySelectorAll(this.element,
-        HIDE_ON_BOOKEND_SELECTOR);
+    const elements = scopedQuerySelectorAll(
+      this.element,
+      HIDE_ON_BOOKEND_SELECTOR
+    );
 
     Array.prototype.forEach.call(elements, el => {
       if (isActive) {
@@ -1242,7 +1295,10 @@ export class AmpStory extends AMP.BaseElement {
    */
   getPagesByDistance_() {
     const distanceMap = this.getPageDistanceMapHelper_(
-        /* distance */ 0, /* map */ {}, this.activePage_.element.id);
+      /* distance */ 0,
+      /* map */ {},
+      this.activePage_.element.id
+    );
 
     // Transpose the map into a 2D array.
     const pagesByDistance = [];
@@ -1278,8 +1334,10 @@ export class AmpStory extends AMP.BaseElement {
     map[pageId] = distance;
     const page = this.getPageById(pageId);
     page.getAdjacentPageIds().forEach(adjacentPageId => {
-      if (map[adjacentPageId] !== undefined
-          && map[adjacentPageId] <= distance) {
+      if (
+        map[adjacentPageId] !== undefined &&
+        map[adjacentPageId] <= distance
+      ) {
         return;
       }
 
@@ -1291,7 +1349,6 @@ export class AmpStory extends AMP.BaseElement {
     return map;
   }
 
-
   /** @private */
   preloadPagesByDistance_() {
     if (this.platform_.isBot()) {
@@ -1313,7 +1370,6 @@ export class AmpStory extends AMP.BaseElement {
     });
   }
 
-
   /**
    * Handles a background-audio attribute set on an <amp-story> tag.
    * @private
@@ -1328,21 +1384,23 @@ export class AmpStory extends AMP.BaseElement {
     // Once the media pool is ready, registers and preloads the background
     // audio, and then gets the swapped element from the DOM to mute/unmute/play
     // it programmatically later.
-    this.activePage_.whenLoaded()
-        .then(() => {
-          backgroundAudioEl =
-            /** @type {!HTMLMediaElement} */ (backgroundAudioEl);
-          this.mediaPool_.register(backgroundAudioEl);
-          return this.mediaPool_.preload(backgroundAudioEl);
-        }).then(() => {
-          this.backgroundAudioEl_ = /** @type {!HTMLMediaElement} */
-              (childElement(this.element, el => {
-                return el.tagName.toLowerCase() === 'audio';
-              }));
-        });
+    this.activePage_
+      .whenLoaded()
+      .then(() => {
+        backgroundAudioEl = /** @type {!HTMLMediaElement} */ (backgroundAudioEl);
+        this.mediaPool_.register(backgroundAudioEl);
+        return this.mediaPool_.preload(backgroundAudioEl);
+      })
+      .then(() => {
+        this.backgroundAudioEl_ = /** @type {!HTMLMediaElement} */ (childElement(
+          this.element,
+          el => {
+            return el.tagName.toLowerCase() === 'audio';
+          }
+        ));
+      });
   }
 
-
   /**
    * Preloads the bookend config if on the last page.
    * @private
@@ -1359,7 +1417,6 @@ export class AmpStory extends AMP.BaseElement {
     }
   }
 
-
   /**
    * Builds, fetches and sets the bookend publisher configuration.
    * @return {!Promise<?./amp-story-bookend.BookendConfigDef>}
@@ -1370,7 +1427,6 @@ export class AmpStory extends AMP.BaseElement {
     return this.bookend_.loadConfig();
   }
 
-
   /**
    * @return {!Promise<boolean>}
    * @private
@@ -1386,11 +1442,14 @@ export class AmpStory extends AMP.BaseElement {
     if (!this.isDesktop_()) {
       return Promise.resolve(true);
     }
-    return this.bookend_.loadConfig(false /** applyConfig */).then(config =>
-      !!(config && config.relatedArticles && config.relatedArticles.length));
+    return this.bookend_
+      .loadConfig(false /** applyConfig */)
+      .then(
+        config =>
+          !!(config && config.relatedArticles && config.relatedArticles.length)
+      );
   }
 
-
   /**
    * @param {string} id The ID of the page whose index should be retrieved.
    * @return {number} The index of the page.
@@ -1400,14 +1459,15 @@ export class AmpStory extends AMP.BaseElement {
     const pageIndex = findIndex(this.pages_, page => page.element.id === id);
 
     if (pageIndex < 0) {
-      user().error(TAG,
-          `Story refers to page "${id}", but no such page exists.`);
+      user().error(
+        TAG,
+        `Story refers to page "${id}", but no such page exists.`
+      );
     }
 
     return pageIndex;
   }
 
-
   /**
    * @param {string} id The ID of the page to be retrieved.
    * @return {!./amp-story-page.AmpStoryPage} Retrieves the page with the
@@ -1415,11 +1475,12 @@ export class AmpStory extends AMP.BaseElement {
    */
   getPageById(id) {
     const pageIndex = this.getPageIndexById_(id);
-    return devAssert(this.pages_[pageIndex],
-        `Page at index ${pageIndex} exists, but is missing from the array.`);
+    return devAssert(
+      this.pages_[pageIndex],
+      `Page at index ${pageIndex} exists, but is missing from the array.`
+    );
   }
 
-
   /**
    * @return {number}
    */
@@ -1435,7 +1496,6 @@ export class AmpStory extends AMP.BaseElement {
     return findIndex(this.pages_, page => page === desiredPage);
   }
 
-
   /**
    * Retrieves the page containing the element, or null. A background audio
    * set on the <amp-story> tag would not be contained in a page.
@@ -1456,7 +1516,6 @@ export class AmpStory extends AMP.BaseElement {
     return this.pages_[pageIndex] || null;
   }
 
-
   /** @override */
   getElementDistance(element) {
     const page = this.getPageContainingElement_(element);
@@ -1471,13 +1530,13 @@ export class AmpStory extends AMP.BaseElement {
     return page.getDistance();
   }
 
-
   /** @override */
   getMaxMediaElementCounts() {
-    let audioMediaElementsCount =
-        this.element.querySelectorAll('amp-audio, [background-audio]').length;
-    const videoMediaElementsCount =
-        this.element.querySelectorAll('amp-video').length;
+    let audioMediaElementsCount = this.element.querySelectorAll(
+      'amp-audio, [background-audio]'
+    ).length;
+    const videoMediaElementsCount = this.element.querySelectorAll('amp-video')
+      .length;
 
     // The root element (amp-story) might have a background-audio as well.
     if (this.element.hasAttribute('background-audio')) {
@@ -1486,13 +1545,16 @@ export class AmpStory extends AMP.BaseElement {
 
     return {
       [MediaType.AUDIO]: Math.min(
-          audioMediaElementsCount, MAX_MEDIA_ELEMENT_COUNTS[MediaType.AUDIO]),
+        audioMediaElementsCount,
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType.AUDIO]
+      ),
       [MediaType.VIDEO]: Math.min(
-          videoMediaElementsCount, MAX_MEDIA_ELEMENT_COUNTS[MediaType.VIDEO]),
+        videoMediaElementsCount,
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType.VIDEO]
+      ),
     };
   }
 
-
   /** @override */
   getElement() {
     return this.element;
@@ -1535,8 +1597,7 @@ export class AmpStory extends AMP.BaseElement {
       }
     };
 
-    this.mediaPool_.blessAll()
-        .then(unmuteAllMedia, unmuteAllMedia);
+    this.mediaPool_.blessAll().then(unmuteAllMedia, unmuteAllMedia);
   }
 
   /**
@@ -1558,11 +1619,14 @@ export class AmpStory extends AMP.BaseElement {
    */
   updateAudioIcon_() {
     const containsMediaElementWithAudio = !!this.element.querySelector(
-        'amp-audio, amp-video:not([noaudio]), [background-audio]');
+      'amp-audio, amp-video:not([noaudio]), [background-audio]'
+    );
     const hasStoryAudio = this.element.hasAttribute('background-audio');
 
-    this.storeService_.dispatch(Action.TOGGLE_HAS_AUDIO,
-        containsMediaElementWithAudio || hasStoryAudio);
+    this.storeService_.dispatch(
+      Action.TOGGLE_HAS_AUDIO,
+      containsMediaElementWithAudio || hasStoryAudio
+    );
   }
 
   /** @private */
@@ -1578,7 +1642,6 @@ export class AmpStory extends AMP.BaseElement {
     return this.navigationState_;
   }
 
-
   /**
    * Add page to back of pages_ array
    * @param {!./amp-story-page.AmpStoryPage} page
@@ -1604,8 +1667,10 @@ export class AmpStory extends AMP.BaseElement {
     const pageToBeInserted = this.getPageById(pageToBeInsertedId);
     const pageToBeInsertedEl = pageToBeInserted.element;
 
-    if (pageToBeInserted.isAd() &&
-        !this.storeService_.get(StateProperty.CAN_INSERT_AUTOMATIC_AD)) {
+    if (
+      pageToBeInserted.isAd() &&
+      !this.storeService_.get(StateProperty.CAN_INSERT_AUTOMATIC_AD)
+    ) {
       dev().expectedError(TAG, 'Inserting ads automatically is disallowed.');
       return false;
     }
@@ -1632,7 +1697,6 @@ export class AmpStory extends AMP.BaseElement {
     return true;
   }
 
-
   /**
    * Get next page object
    * @param {!./amp-story-page.AmpStoryPage} page
@@ -1646,19 +1710,18 @@ export class AmpStory extends AMP.BaseElement {
     return this.getPageById(nextPageId);
   }
 
-
   /**
    * @param {!Window} win
    * @return {boolean} true if the user's browser supports the features needed
    *     for amp-story.
    */
   static isBrowserSupported(win) {
-    return Boolean(win.CSS && win.CSS.supports &&
-        win.CSS.supports('display', 'grid'));
+    return Boolean(
+      win.CSS && win.CSS.supports && win.CSS.supports('display', 'grid')
+    );
   }
 }
 
-
 AMP.extension('amp-story', '0.1', AMP => {
   AMP.registerElement('amp-story', AmpStory, CSS);
   AMP.registerElement('amp-story-page', AmpStoryPage);
diff --git a/extensions/amp-story/0.1/analytics.js b/extensions/amp-story/0.1/analytics.js
index d5063700f553..dd5daf7bde0f 100644
--- a/extensions/amp-story/0.1/analytics.js
+++ b/extensions/amp-story/0.1/analytics.js
@@ -18,7 +18,6 @@ import {StateChangeType} from './navigation-state';
 import {dev} from '../../../src/log';
 import {triggerAnalyticsEvent} from '../../../src/analytics';
 
-
 /** @enum {string} */
 const Events = {
   PAGE_VISIBLE: 'story-page-visible',
@@ -28,7 +27,6 @@ const Events = {
   STORY_UNMUTED: 'story-audio-unmuted',
 };
 
-
 /**
  * Intermediate handler for amp-story specific analytics.
  */
@@ -77,12 +75,16 @@ export class AmpStoryAnalytics {
   triggerEvent_(eventType) {
     const variablesPromise = Services.storyVariableServiceForOrNull(this.win_);
     variablesPromise.then(
-        variables => {
-          triggerAnalyticsEvent(this.element_, eventType,
-              /** @type {!JsonObject} */ (variables));
-        },
-        reason => {
-          dev().error('AMP-STORY', 'Could not get analytics variables', reason);
-        });
+      variables => {
+        triggerAnalyticsEvent(
+          this.element_,
+          eventType,
+          /** @type {!JsonObject} */ (variables)
+        );
+      },
+      reason => {
+        dev().error('AMP-STORY', 'Could not get analytics variables', reason);
+      }
+    );
   }
 }
diff --git a/extensions/amp-story/0.1/animation-presets-utils.js b/extensions/amp-story/0.1/animation-presets-utils.js
index fe533b205f04..332f39d1f492 100644
--- a/extensions/amp-story/0.1/animation-presets-utils.js
+++ b/extensions/amp-story/0.1/animation-presets-utils.js
@@ -19,15 +19,8 @@
  * presets.
  */
 
-import {
-  KeyframesDef,
-  StoryAnimationDimsDef,
-} from './animation-types';
-import {
-  rotate,
-  scale,
-  translate,
-} from '../../../src/style';
+import {KeyframesDef, StoryAnimationDimsDef} from './animation-types';
+import {rotate, scale, translate} from '../../../src/style';
 
 /**
  * Translates the element on the 2d plane according to the given points.
@@ -89,8 +82,10 @@ export function whooshIn(startX, startY, endX, endY) {
  * @visibleForTesting
  */
 export function targetFitsWithinPage(dimensions) {
-  return dimensions.targetWidth <= dimensions.pageWidth ||
-         dimensions.targetHeight <= dimensions.pageHeight;
+  return (
+    dimensions.targetWidth <= dimensions.pageWidth ||
+    dimensions.targetHeight <= dimensions.pageHeight
+  );
 }
 
 /**
@@ -102,10 +97,14 @@ export function targetFitsWithinPage(dimensions) {
 export function calculateTargetScalingFactor(dimensions) {
   if (targetFitsWithinPage(dimensions)) {
     const scalingFactor = 1.25;
-    const widthFactor = dimensions.pageWidth > dimensions.targetWidth ?
-      dimensions.pageWidth / dimensions.targetWidth : 1;
-    const heightFactor = dimensions.pageHeight > dimensions.targetHeight ?
-      dimensions.pageHeight / dimensions.targetHeight : 1;
+    const widthFactor =
+      dimensions.pageWidth > dimensions.targetWidth
+        ? dimensions.pageWidth / dimensions.targetWidth
+        : 1;
+    const heightFactor =
+      dimensions.pageHeight > dimensions.targetHeight
+        ? dimensions.pageHeight / dimensions.targetHeight
+        : 1;
     return Math.max(widthFactor, heightFactor) * scalingFactor;
   }
   return 1;
@@ -139,5 +138,7 @@ export function scaleAndTranslate(startX, startY, endX, endY, scalingFactor) {
     return translate2d(startX, startY, endX, endY);
   }
   return enlargeKeyFrames(
-      translate2d(startX, startY, endX, endY), scalingFactor);
+    translate2d(startX, startY, endX, endY),
+    scalingFactor
+  );
 }
diff --git a/extensions/amp-story/0.1/animation-presets.js b/extensions/amp-story/0.1/animation-presets.js
index 0db9b27e63fb..e910e67498d3 100644
--- a/extensions/amp-story/0.1/animation-presets.js
+++ b/extensions/amp-story/0.1/animation-presets.js
@@ -47,7 +47,7 @@ const FULL_BLEED_ANIMATION_NAMES = [
  */
 const ANIMATION_CSS_CLASS_NAMES = {
   [FULL_BLEED_CATEGORY]:
-      'i-amphtml-story-grid-template-with-full-bleed-animation',
+    'i-amphtml-story-grid-template-with-full-bleed-animation',
 };
 
 /**
@@ -59,10 +59,14 @@ export function setStyleForPreset(el, presetName) {
   // For full bleed animations.
   if (FULL_BLEED_ANIMATION_NAMES.indexOf(presetName) >= 0) {
     const parent = el.parentElement;
-    if (parent.classList.contains(
-        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT])) {
-      parent.classList
-          .remove(GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]);
+    if (
+      parent.classList.contains(
+        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]
+      )
+    ) {
+      parent.classList.remove(
+        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]
+      );
     }
     parent.classList.add(ANIMATION_CSS_CLASS_NAMES[FULL_BLEED_CATEGORY]);
   }
@@ -157,8 +161,10 @@ export const PRESETS = {
   'drop': {
     duration: 1600,
     keyframes(dimensions) {
-      const maxBounceHeight =
-          Math.max(160, dimensions.targetY + dimensions.targetHeight);
+      const maxBounceHeight = Math.max(
+        160,
+        dimensions.targetY + dimensions.targetHeight
+      );
 
       return [
         {
@@ -283,17 +289,11 @@ export const PRESETS = {
   'zoom-in': {
     duration: 1000,
     easing: 'linear',
-    keyframes: [
-      {transform: 'scale(1,1)'},
-      {transform: 'scale(3,3)'},
-    ],
+    keyframes: [{transform: 'scale(1,1)'}, {transform: 'scale(3,3)'}],
   },
   'zoom-out': {
     duration: 1000,
     easing: 'linear',
-    keyframes: [
-      {transform: 'scale(3,3)'},
-      {transform: 'scale(1,1)'},
-    ],
+    keyframes: [{transform: 'scale(3,3)'}, {transform: 'scale(1,1)'}],
   },
 };
diff --git a/extensions/amp-story/0.1/animation-types.js b/extensions/amp-story/0.1/animation-types.js
index 10fa6f51219b..1fde42d6c979 100644
--- a/extensions/amp-story/0.1/animation-types.js
+++ b/extensions/amp-story/0.1/animation-types.js
@@ -17,11 +17,9 @@
 /** @typedef {!Array<!Object<string, *>>} */
 export let KeyframesDef;
 
-
 /** @typedef {(function(StoryAnimationDimsDef):!KeyframesDef)|!KeyframesDef} */
 export let KeyframesOrFilterFnDef;
 
-
 /**
  * @typedef {{
  *   pageWidth: number,
@@ -34,7 +32,6 @@ export let KeyframesOrFilterFnDef;
  */
 export let StoryAnimationDimsDef;
 
-
 /**
  * @typedef {{
  *   duration: number,
@@ -44,7 +41,6 @@ export let StoryAnimationDimsDef;
  */
 export let StoryAnimationPresetDef;
 
-
 /**
  * @typedef {{
  *  target: !Element,
diff --git a/extensions/amp-story/0.1/animation.js b/extensions/amp-story/0.1/animation.js
index 9abe81a05979..75e4cf94728e 100644
--- a/extensions/amp-story/0.1/animation.js
+++ b/extensions/amp-story/0.1/animation.js
@@ -24,17 +24,12 @@ import {
 } from './animation-types';
 import {PRESETS, setStyleForPreset} from './animation-presets';
 import {Services} from '../../../src/services';
-import {
-  WebAnimationPlayState,
-} from '../../amp-animation/0.1/web-animation-types';
+import {WebAnimationPlayState} from '../../amp-animation/0.1/web-animation-types';
 import {assertDoesNotContainDisplay, setStyles} from '../../../src/style';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {escapeCssSelectorIdent} from '../../../src/css';
 import {map, omit} from '../../../src/utils/object';
-import {
-  scopedQuerySelector,
-  scopedQuerySelectorAll,
-} from '../../../src/dom';
+import {scopedQuerySelector, scopedQuerySelectorAll} from '../../../src/dom';
 import {timeStrToMillis, unscaledClientRect} from './utils';
 
 /** const {string} */
@@ -48,7 +43,6 @@ const ANIMATE_IN_AFTER_ATTRIBUTE_NAME = 'animate-in-after';
 /** const {string} */
 const ANIMATABLE_ELEMENTS_SELECTOR = `[${ANIMATE_IN_ATTRIBUTE_NAME}]`;
 
-
 /**
  * @param {!Element} element
  * @return {boolean}
@@ -58,14 +52,12 @@ export function hasAnimations(element) {
   return !!scopedQuerySelector(element, ANIMATABLE_ELEMENTS_SELECTOR);
 }
 
-
 /** @enum {number} */
 const PlaybackActivity = {
   START: 0,
   FINISH: 1,
 };
 
-
 /** Wraps WebAnimationRunner for story page elements. */
 class AnimationRunner {
   /**
@@ -79,7 +71,13 @@ class AnimationRunner {
    * @param {!AnimationSequence} sequence
    */
   constructor(
-    page, animationDef, webAnimationBuilderPromise, vsync, timer, sequence) {
+    page,
+    animationDef,
+    webAnimationBuilderPromise,
+    vsync,
+    timer,
+    sequence
+  ) {
     /** @private @const */
     this.page_ = page;
 
@@ -116,11 +114,14 @@ class AnimationRunner {
      */
     this.runnerPromise_ = this.getWebAnimationDef_().then(webAnimDef =>
       webAnimationBuilderPromise.then(builder =>
-        builder.createRunner(webAnimDef)));
+        builder.createRunner(webAnimDef)
+      )
+    );
 
     /** @private @const {!Promise<!Object<string, *>>} */
-    this.firstFrameProps_ =
-        this.keyframes_.then(keyframes => omit(keyframes[0], ['offset']));
+    this.firstFrameProps_ = this.keyframes_.then(keyframes =>
+      omit(keyframes[0], ['offset'])
+    );
 
     /** @private {?../../amp-animation/0.1/runners/animation-runner.AnimationRunner} */
     this.runner_ = null;
@@ -131,13 +132,17 @@ class AnimationRunner {
     /** @private {?Promise} */
     this.scheduledWait_ = null;
 
-    this.keyframes_.then(keyframes => devAssert(
+    this.keyframes_.then(keyframes =>
+      devAssert(
         !keyframes[0].offset,
-        'First keyframe offset for animation preset should be 0 or undefined'));
+        'First keyframe offset for animation preset should be 0 or undefined'
+      )
+    );
 
     userAssert(
-        this.delay_ >= 0,
-        'Negative delays are not allowed in amp-story entrance animations.');
+      this.delay_ >= 0,
+      'Negative delays are not allowed in amp-story entrance animations.'
+    );
 
     this.runnerPromise_.then(runner => this.onRunnerReady_(runner));
   }
@@ -202,7 +207,8 @@ class AnimationRunner {
     return this.firstFrameProps_.then(firstFrameProps =>
       this.vsync_.mutatePromise(() => {
         setStyles(this.target_, assertDoesNotContainDisplay(firstFrameProps));
-      }));
+      })
+    );
   }
 
   /** Starts or resumes the animation. */
@@ -222,8 +228,8 @@ class AnimationRunner {
     let promise = Promise.resolve();
 
     if (this.animationDef_.startAfterId) {
-      const startAfterId = /** @type {string} */(
-        this.animationDef_.startAfterId);
+      const startAfterId = /** @type {string} */ (this.animationDef_
+        .startAfterId);
       promise = promise.then(() => this.sequence_.waitFor(startAfterId));
     }
 
@@ -244,9 +250,11 @@ class AnimationRunner {
 
   /** @return {boolean} */
   hasStarted() {
-    return this.isActivityScheduled_(PlaybackActivity.START) ||
-        (!!this.runner_ && devAssert(this.runner_)
-            .getPlayState() == WebAnimationPlayState.RUNNING);
+    return (
+      this.isActivityScheduled_(PlaybackActivity.START) ||
+      (!!this.runner_ &&
+        devAssert(this.runner_).getPlayState() == WebAnimationPlayState.RUNNING)
+    );
   }
 
   /** Force-finishes all animations. */
@@ -301,12 +309,13 @@ class AnimationRunner {
    */
   playbackWhenReady_(activity, wait) {
     const runner =
-        /**
-         * @type {!../../amp-animation/0.1/runners/animation-runner.AnimationRunner}
-         */
-        (devAssert(
-            this.runner_,
-            'Tried to execute playbackWhenReady_ before runner was resolved.'));
+      /**
+       * @type {!../../amp-animation/0.1/runners/animation-runner.AnimationRunner}
+       */
+      (devAssert(
+        this.runner_,
+        'Tried to execute playbackWhenReady_ before runner was resolved.'
+      ));
 
     (wait || Promise.resolve()).then(() => {
       if (!this.isActivityScheduled_(activity)) {
@@ -317,8 +326,10 @@ class AnimationRunner {
       this.scheduledWait_ = null;
 
       switch (activity) {
-        case PlaybackActivity.START: return this.startWhenReady_(runner);
-        case PlaybackActivity.FINISH: return this.finishWhenReady_(runner);
+        case PlaybackActivity.START:
+          return this.startWhenReady_(runner);
+        case PlaybackActivity.FINISH:
+          return this.finishWhenReady_(runner);
       }
     });
   }
@@ -342,8 +353,9 @@ class AnimationRunner {
     }
 
     this.playbackWhenReady_(
-        /** @type {!PlaybackActivity} */ (this.scheduledActivity_),
-        this.scheduledWait_);
+      /** @type {!PlaybackActivity} */ (this.scheduledActivity_),
+      this.scheduledWait_
+    );
   }
 
   /**
@@ -366,7 +378,6 @@ class AnimationRunner {
   }
 }
 
-
 // TODO(alanorozco): Looping animations
 /** Manager for animations in story pages. */
 export class AnimationManager {
@@ -416,7 +427,8 @@ export class AnimationManager {
    */
   applyFirstFrame() {
     return Promise.all(
-        this.getOrCreateRunners_().map(runner => runner.applyFirstFrame()));
+      this.getOrCreateRunners_().map(runner => runner.applyFirstFrame())
+    );
   }
 
   /** Starts all entrance animations for the page. */
@@ -455,8 +467,9 @@ export class AnimationManager {
   getOrCreateRunners_() {
     if (!this.runners_) {
       this.runners_ = Array.prototype.map.call(
-          scopedQuerySelectorAll(this.root_, ANIMATABLE_ELEMENTS_SELECTOR),
-          el => this.createRunner_(el));
+        scopedQuerySelectorAll(this.root_, ANIMATABLE_ELEMENTS_SELECTOR),
+        el => this.createRunner_(el)
+      );
     }
     return devAssert(this.runners_);
   }
@@ -470,12 +483,13 @@ export class AnimationManager {
     const animationDef = this.createAnimationDef(el, preset);
 
     return new AnimationRunner(
-        this.root_,
-        animationDef,
-        devAssert(this.builderPromise_),
-        this.vsync_,
-        this.timer_,
-        this.sequence_);
+      this.root_,
+      animationDef,
+      devAssert(this.builderPromise_),
+      this.vsync_,
+      this.timer_,
+      this.sequence_
+    );
   }
 
   /**
@@ -487,27 +501,31 @@ export class AnimationManager {
     const animationDef = {target: el, preset};
 
     if (el.hasAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME)) {
-      animationDef.duration =
-          timeStrToMillis(el.getAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME));
+      animationDef.duration = timeStrToMillis(
+        el.getAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME)
+      );
     }
 
     if (el.hasAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME)) {
-      animationDef.delay =
-          timeStrToMillis(el.getAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME));
+      animationDef.delay = timeStrToMillis(
+        el.getAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME)
+      );
     }
 
     if (el.hasAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME)) {
       const dependencyId = el.getAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME);
 
       user().assertElement(
-          this.root_.querySelector(`#${escapeCssSelectorIdent(dependencyId)}`),
-          `The attribute '${ANIMATE_IN_AFTER_ATTRIBUTE_NAME}' in tag ` +
-              `'${el.tagName}' is set to the invalid value ` +
-              `'${dependencyId}'. No children of parenting 'amp-story-page' ` +
-              `exist with id ${dependencyId}.`);
-
-      animationDef.startAfterId =
-          el.getAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME);
+        this.root_.querySelector(`#${escapeCssSelectorIdent(dependencyId)}`),
+        `The attribute '${ANIMATE_IN_AFTER_ATTRIBUTE_NAME}' in tag ` +
+          `'${el.tagName}' is set to the invalid value ` +
+          `'${dependencyId}'. No children of parenting 'amp-story-page' ` +
+          `exist with id ${dependencyId}.`
+      );
+
+      animationDef.startAfterId = el.getAttribute(
+        ANIMATE_IN_AFTER_ATTRIBUTE_NAME
+      );
     }
 
     return animationDef;
@@ -519,9 +537,9 @@ export class AnimationManager {
    */
   createAnimationBuilderPromise_() {
     return Services.extensionsFor(this.ampdoc_.win)
-        .installExtensionForDoc(this.ampdoc_, 'amp-animation')
-        .then(() => Services.webAnimationServiceFor(this.root_))
-        .then(webAnimationService => webAnimationService.createBuilder());
+      .installExtensionForDoc(this.ampdoc_, 'amp-animation')
+      .then(() => Services.webAnimationServiceFor(this.root_))
+      .then(webAnimationService => webAnimationService.createBuilder());
   }
 
   /**
@@ -533,15 +551,15 @@ export class AnimationManager {
     setStyleForPreset(el, name);
 
     return userAssert(
-        PRESETS[name],
-        'Invalid %s preset "%s" for element %s',
-        ANIMATE_IN_ATTRIBUTE_NAME,
-        name,
-        el);
+      PRESETS[name],
+      'Invalid %s preset "%s" for element %s',
+      ANIMATE_IN_ATTRIBUTE_NAME,
+      name,
+      el
+    );
   }
 }
 
-
 /** Bus for animation sequencing. */
 class AnimationSequence {
   /**
diff --git a/extensions/amp-story/0.1/audio.js b/extensions/amp-story/0.1/audio.js
index 84302c99a06f..ffb60d8bb38e 100644
--- a/extensions/amp-story/0.1/audio.js
+++ b/extensions/amp-story/0.1/audio.js
@@ -21,7 +21,6 @@ import {assertHttpsUrl} from '../../../src/url';
  */
 const BACKGROUND_AUDIO_ELEMENT_CLASS_NAME = 'i-amphtml-story-background-audio';
 
-
 /**
  * Adds support for the background-audio property on the specified element.
  * @param {!Element} element The element to upgrade with support for background
@@ -34,8 +33,10 @@ export function upgradeBackgroundAudio(element) {
   }
 
   const audioEl = element.ownerDocument.createElement('audio');
-  const audioSrc =
-      assertHttpsUrl(element.getAttribute('background-audio'), element);
+  const audioSrc = assertHttpsUrl(
+    element.getAttribute('background-audio'),
+    element
+  );
   audioEl.setAttribute('src', audioSrc);
   audioEl.setAttribute('preload', 'auto');
   audioEl.setAttribute('loop', '');
diff --git a/extensions/amp-story/0.1/background.js b/extensions/amp-story/0.1/background.js
index d33b135ec679..66ca93a3e13b 100644
--- a/extensions/amp-story/0.1/background.js
+++ b/extensions/amp-story/0.1/background.js
@@ -18,19 +18,15 @@ import {Services} from '../../../src/services';
 import {listenOncePromise} from '../../../src/event-helper';
 import {setStyle} from '../../../src/style';
 
-
 /** @const {number} */
 const SWAP_TIMEOUT_MS = 500;
 
-
 const BACKGROUND_CLASS = 'i-amphtml-story-background';
 
 const BACKGROUND_CONTAINER_CLASS = 'i-amphtml-story-background-container';
 
 const BACKGROUND_OVERLAY_CLASS = 'i-amphtml-story-background-overlay';
 
-
-
 /**
  * @param {?string} url
  * @return {!Promise}
@@ -39,12 +35,11 @@ function maybeLoadImage(url) {
   if (!url) {
     return Promise.resolve();
   }
-  const img = new Image;
+  const img = new Image();
   img.src = url;
   return listenOncePromise(img, 'load');
 }
 
-
 /**
  * TODO(cvializ): Investigate pre-rendering blurred backgrounds to canvas to
  * possibly improve performance?
@@ -109,15 +104,17 @@ export class AmpStoryBackground {
   setBackground(color, url, initial = false) {
     const countAtAdd = ++this.count_;
 
-    const whenFresh = (promise, callback) => promise.then(() => {
-      if (this.count_ == countAtAdd) {
-        callback();
-      }
-    });
+    const whenFresh = (promise, callback) =>
+      promise.then(() => {
+        if (this.count_ == countAtAdd) {
+          callback();
+        }
+      });
 
     const imgLoad = maybeLoadImage(url);
-    const timeout =
-        Services.timerFor(this.win_).promise(initial ? 0 : SWAP_TIMEOUT_MS);
+    const timeout = Services.timerFor(this.win_).promise(
+      initial ? 0 : SWAP_TIMEOUT_MS
+    );
 
     const hidden = this.hidden_;
 
diff --git a/extensions/amp-story/0.1/default-media.js b/extensions/amp-story/0.1/default-media.js
index 70d76a897a21..9058594add94 100644
--- a/extensions/amp-story/0.1/default-media.js
+++ b/extensions/amp-story/0.1/default-media.js
@@ -14,77 +14,79 @@
  * limitations under the License.
  */
 
-export const BLANK_AUDIO_SRC = 'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBA' +
-    'AAAABAAEAIlYAAESsAAACABAAZGF0YRAAAAAAAAAAAAAAAAAAAAAAAA==';
+export const BLANK_AUDIO_SRC =
+  'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBA' +
+  'AAAABAAEAIlYAAESsAAACABAAZGF0YRAAAAAAAAAAAAAAAAAAAAAAAA==';
 
-export const BLANK_VIDEO_SRC = 'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAG' +
-    'lzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARw' +
-    'AAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIE' +
-    'guMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3' +
-    'd3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYm' +
-    'xvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3' +
-    'JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbG' +
-    'lzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV' +
-    '9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3Rocm' +
-    'VhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb2' +
-    '5zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbn' +
-    'RfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcm' +
-    'M9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcH' +
-    'N0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYW' +
-    'xfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8m' +
-    'KAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' +
-    'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4G' +
-    'SAIQBJkAIZACOAAAAAB0GaVAX4GSAhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpgL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGagC/AySEASZACGQAjgAAAAAZBmqAvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZrAL8DJIQBJkAIZACOAAAAABkGa4C/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBmwAvwMkhAEmQAhkAI4AAAAAGQZsgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGbQC' +
-    '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm2AvwMkhAEmQAhkAI4AAAAAGQZuAL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGboC/AySEASZACGQAjgAAAAAZBm8AvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZvgL8DJIQBJkAIZACOAAAAABkGaAC/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBmiAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpAL8DJIQBJkAIZACOAAAAABkGaYC' +
-    '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmoAvwMkhAEmQAhkAI4AAAAAGQZqgL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGawC/AySEASZACGQAjgAAAAAZBmuAvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZsAL8DJIQBJkAIZACOAAAAABkGbIC/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBm0AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZtgL8DJIQBJkAIZACOAAAAABkGbgC' +
-    'vAySEASZACGQAjgCEASZACGQAjgAAAAAZBm6AnwMkhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAh' +
-    'kAI4AhAEmQAhkAI4AAAAhubW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAABDcAAQAAAQ' +
-    'AAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA' +
-    'AAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAzB0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAABAA' +
-    'AAAAAAA+kAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA' +
-    'BAAAAAALAAAACQAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAPpAAAAAAABAAAAAAKobW' +
-    'RpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAB1MAAAdU5VxAAAAAAALWhkbHIAAAAAAAAAAHZpZG' +
-    'UAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAACU21pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAA' +
-    'AAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAhNzdGJsAAAAr3N0c2QAAA' +
-    'AAAAAAAQAAAJ9hdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAALAAkABIAAAASAAAAAAAAA' +
-    'ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAALWF2Y0MBQsAN/+EAFW' +
-    'dCwA3ZAsTsBEAAAPpAADqYA8UKkgEABWjLg8sgAAAAHHV1aWRraEDyXyRPxbo5pRvPAyPzAA' +
-    'AAAAAAABhzdHRzAAAAAAAAAAEAAAAeAAAD6QAAABRzdHNzAAAAAAAAAAEAAAABAAAAHHN0c2' +
-    'MAAAAAAAAAAQAAAAEAAAABAAAAAQAAAIxzdHN6AAAAAAAAAAAAAAAeAAADDwAAAAsAAAALAA' +
-    'AACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAA' +
-    'oAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAA' +
-    'AAiHN0Y28AAAAAAAAAHgAAAEYAAANnAAADewAAA5gAAAO0AAADxwAAA+MAAAP2AAAEEgAABC' +
-    'UAAARBAAAEXQAABHAAAASMAAAEnwAABLsAAATOAAAE6gAABQYAAAUZAAAFNQAABUgAAAVkAA' +
-    'AFdwAABZMAAAWmAAAFwgAABd4AAAXxAAAGDQAABGh0cmFrAAAAXHRraGQAAAADAAAAAAAAAA' +
-    'AAAAACAAAAAAAABDcAAAAAAAAAAAAAAAEBAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA' +
-    'AAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAA' +
-    'AAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAA' +
-    'AAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAA' +
-    'AAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZA' +
-    'AAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAA' +
-    'AAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAA' +
-    'AAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAA' +
-    'IAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAA' +
-    'AACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAA' +
-    'EAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAA' +
-    'AAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAA' +
-    'IAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAA' +
-    'AAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAAD' +
-    'MAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
-    'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAA' +
-    'kAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
-    'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAA' +
-    'AAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAA' +
-    'AEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ' +
-    '0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAA' +
-    'AAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYX' +
-    'ZmNTUuMzMuMTAw';
+export const BLANK_VIDEO_SRC =
+  'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAG' +
+  'lzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARw' +
+  'AAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIE' +
+  'guMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3' +
+  'd3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYm' +
+  'xvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3' +
+  'JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbG' +
+  'lzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV' +
+  '9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3Rocm' +
+  'VhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb2' +
+  '5zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbn' +
+  'RfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcm' +
+  'M9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcH' +
+  'N0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYW' +
+  'xfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8m' +
+  'KAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' +
+  'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4G' +
+  'SAIQBJkAIZACOAAAAAB0GaVAX4GSAhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpgL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGagC/AySEASZACGQAjgAAAAAZBmqAvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZrAL8DJIQBJkAIZACOAAAAABkGa4C/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBmwAvwMkhAEmQAhkAI4AAAAAGQZsgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGbQC' +
+  '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm2AvwMkhAEmQAhkAI4AAAAAGQZuAL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGboC/AySEASZACGQAjgAAAAAZBm8AvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZvgL8DJIQBJkAIZACOAAAAABkGaAC/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBmiAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpAL8DJIQBJkAIZACOAAAAABkGaYC' +
+  '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmoAvwMkhAEmQAhkAI4AAAAAGQZqgL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGawC/AySEASZACGQAjgAAAAAZBmuAvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZsAL8DJIQBJkAIZACOAAAAABkGbIC/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBm0AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZtgL8DJIQBJkAIZACOAAAAABkGbgC' +
+  'vAySEASZACGQAjgCEASZACGQAjgAAAAAZBm6AnwMkhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAh' +
+  'kAI4AhAEmQAhkAI4AAAAhubW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAABDcAAQAAAQ' +
+  'AAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA' +
+  'AAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAzB0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAABAA' +
+  'AAAAAAA+kAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA' +
+  'BAAAAAALAAAACQAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAPpAAAAAAABAAAAAAKobW' +
+  'RpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAB1MAAAdU5VxAAAAAAALWhkbHIAAAAAAAAAAHZpZG' +
+  'UAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAACU21pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAA' +
+  'AAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAhNzdGJsAAAAr3N0c2QAAA' +
+  'AAAAAAAQAAAJ9hdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAALAAkABIAAAASAAAAAAAAA' +
+  'ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAALWF2Y0MBQsAN/+EAFW' +
+  'dCwA3ZAsTsBEAAAPpAADqYA8UKkgEABWjLg8sgAAAAHHV1aWRraEDyXyRPxbo5pRvPAyPzAA' +
+  'AAAAAAABhzdHRzAAAAAAAAAAEAAAAeAAAD6QAAABRzdHNzAAAAAAAAAAEAAAABAAAAHHN0c2' +
+  'MAAAAAAAAAAQAAAAEAAAABAAAAAQAAAIxzdHN6AAAAAAAAAAAAAAAeAAADDwAAAAsAAAALAA' +
+  'AACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAA' +
+  'oAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAA' +
+  'AAiHN0Y28AAAAAAAAAHgAAAEYAAANnAAADewAAA5gAAAO0AAADxwAAA+MAAAP2AAAEEgAABC' +
+  'UAAARBAAAEXQAABHAAAASMAAAEnwAABLsAAATOAAAE6gAABQYAAAUZAAAFNQAABUgAAAVkAA' +
+  'AFdwAABZMAAAWmAAAFwgAABd4AAAXxAAAGDQAABGh0cmFrAAAAXHRraGQAAAADAAAAAAAAAA' +
+  'AAAAACAAAAAAAABDcAAAAAAAAAAAAAAAEBAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA' +
+  'AAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAA' +
+  'AAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAA' +
+  'AAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAA' +
+  'AAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZA' +
+  'AAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAA' +
+  'AAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAA' +
+  'AAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAA' +
+  'IAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAA' +
+  'AACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAA' +
+  'EAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAA' +
+  'AAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAA' +
+  'IAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAA' +
+  'AAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAAD' +
+  'MAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
+  'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAA' +
+  'kAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
+  'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAA' +
+  'AAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAA' +
+  'AEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ' +
+  '0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAA' +
+  'AAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYX' +
+  'ZmNTUuMzMuMTAw';
diff --git a/extensions/amp-story/0.1/development-ui.js b/extensions/amp-story/0.1/development-ui.js
index 61bc87c549e4..19f616bf1786 100644
--- a/extensions/amp-story/0.1/development-ui.js
+++ b/extensions/amp-story/0.1/development-ui.js
@@ -19,7 +19,6 @@ import {isArray} from '../../../src/types';
 import {removeChildren} from '../../../src/dom';
 import {toggle} from '../../../src/style';
 
-
 /**
  * @param {!../../../src/service/vsync-impl.Vsync} vsync
  * @param {!Element} el
@@ -31,7 +30,6 @@ function toggleHiddenAttribute(vsync, el, isHidden) {
   });
 }
 
-
 /**
  * @param {!Window} win
  * @param {string|!Array<string>} classNameOrList
@@ -52,7 +50,6 @@ function createButton(win, classNameOrList, handler) {
   return button;
 }
 
-
 /**
  * Development mode logs buttons.
  */
@@ -77,7 +74,6 @@ export class DevelopmentModeLogButtonSet {
     this.successButton_ = null;
   }
 
-
   /**
    * @param {!Window} win
    */
@@ -85,7 +81,6 @@ export class DevelopmentModeLogButtonSet {
     return new DevelopmentModeLogButtonSet(win);
   }
 
-
   /**
    * Builds the developer log button set element.
    * @param {function()} logButtonActionFn A callback function to be invoked when
@@ -93,18 +88,23 @@ export class DevelopmentModeLogButtonSet {
    * @return {?Element}
    */
   build(logButtonActionFn) {
-    this.errorButton_ = createButton(this.win_,
-        ['i-amphtml-story-error-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
-    this.warningButton_ = createButton(this.win_,
-        ['i-amphtml-story-warning-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
-    this.successButton_ = createButton(this.win_,
-        ['i-amphtml-story-success-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
+    this.errorButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-error-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
+
+    this.warningButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-warning-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
+
+    this.successButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-success-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
 
     this.root_ = this.win_.document.createElement('div');
     this.root_.appendChild(this.errorButton_);
@@ -114,7 +114,6 @@ export class DevelopmentModeLogButtonSet {
     return this.root_;
   }
 
-
   /**
    * Gets the button associated to a given log entry.
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The log entry for which
@@ -138,7 +137,6 @@ export class DevelopmentModeLogButtonSet {
     }
   }
 
-
   /**
    * Logs an individual entry into the developer log.
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to log.
@@ -153,7 +151,6 @@ export class DevelopmentModeLogButtonSet {
     button.setAttribute('data-count', oldCount + 1);
   }
 
-
   /**
    * Clears any error state held by the buttons.
    */
@@ -164,7 +161,6 @@ export class DevelopmentModeLogButtonSet {
   }
 }
 
-
 /**
  * Development mode log for <amp-story>.
  */
@@ -186,7 +182,6 @@ export class DevelopmentModeLog {
     this.contextStringEl_ = null;
   }
 
-
   /**
    * @param {!Window} win
    */
@@ -194,22 +189,24 @@ export class DevelopmentModeLog {
     return new DevelopmentModeLog(win);
   }
 
-
   /**
    * Builds the developer log element.
    * @return {?Element}
    */
   build() {
     this.contextStringEl_ = this.win_.document.createElement('span');
-    this.contextStringEl_.classList
-        .add('i-amphtml-story-developer-log-context');
+    this.contextStringEl_.classList.add(
+      'i-amphtml-story-developer-log-context'
+    );
     const titleEl = this.win_.document.createElement('div');
     titleEl.textContent = 'Developer logs for page ';
     titleEl.appendChild(this.contextStringEl_);
 
-    const closeDeveloperLogEl = createButton(this.win_,
-        'i-amphtml-story-developer-log-close',
-        () => this.hide());
+    const closeDeveloperLogEl = createButton(
+      this.win_,
+      'i-amphtml-story-developer-log-close',
+      () => this.hide()
+    );
 
     const headerEl = this.win_.document.createElement('div');
     headerEl.classList.add('i-amphtml-story-developer-log-header');
@@ -217,8 +214,7 @@ export class DevelopmentModeLog {
     headerEl.appendChild(closeDeveloperLogEl);
 
     this.entriesEl_ = this.win_.document.createElement('ul');
-    this.entriesEl_.classList
-        .add('i-amphtml-story-developer-log-entries');
+    this.entriesEl_.classList.add('i-amphtml-story-developer-log-entries');
 
     this.root_ = this.win_.document.createElement('div');
     this.root_.classList.add('i-amphtml-story-developer-log');
@@ -230,7 +226,6 @@ export class DevelopmentModeLog {
     return this.root_;
   }
 
-
   /**
    * @param {!LogLevel} logLevel
    * @return {?string} The CSS class to be applied to the log entry, given the
@@ -248,7 +243,6 @@ export class DevelopmentModeLog {
     }
   }
 
-
   /**
    * @param {boolean} conforms Whether the log entry is for an element that
    *     conforms to a best practice.
@@ -265,7 +259,6 @@ export class DevelopmentModeLog {
     return null;
   }
 
-
   /**
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to be logged.
    */
@@ -288,7 +281,6 @@ export class DevelopmentModeLog {
     this.entriesEl_.appendChild(logEntryUi);
   }
 
-
   /**
    * Clears all entries from the developer logs.
    */
@@ -298,7 +290,6 @@ export class DevelopmentModeLog {
     });
   }
 
-
   /**
    * Sets the string providing context for the developer logs window.  This is
    * often the name or ID of the element that all logs are for (e.g. the page).
@@ -308,24 +299,26 @@ export class DevelopmentModeLog {
     this.contextStringEl_.textContent = contextString;
   }
 
-
   /**
    * Toggles the visibility of the developer log.
    */
   toggle() {
     const newHiddenState = !this.root_.hasAttribute('hidden');
     toggleHiddenAttribute(
-        Services.vsyncFor(this.win_), dev().assertElement(this.root_),
-        newHiddenState);
+      Services.vsyncFor(this.win_),
+      dev().assertElement(this.root_),
+      newHiddenState
+    );
   }
 
-
   /**
    * Hides the developer log in the UI.
    */
   hide() {
     toggleHiddenAttribute(
-        Services.vsyncFor(this.win_), dev().assertElement(this.root_),
-        /* isHidden */ true);
+      Services.vsyncFor(this.win_),
+      dev().assertElement(this.root_),
+      /* isHidden */ true
+    );
   }
 }
diff --git a/extensions/amp-story/0.1/embed-mode.js b/extensions/amp-story/0.1/embed-mode.js
index 284c0a504689..c857b843ca00 100644
--- a/extensions/amp-story/0.1/embed-mode.js
+++ b/extensions/amp-story/0.1/embed-mode.js
@@ -16,7 +16,6 @@
 import {isEnumValue} from '../../../src/types';
 import {parseQueryString} from '../../../src/url';
 
-
 /**
  * Embed mode for AMP story.  See ../embed-modes.md for details.
  * @enum {number}
@@ -53,14 +52,12 @@ export const EmbedMode = {
   NO_SHARING: 2,
 };
 
-
 /**
  * Parameter to retrieve the embed mode from the location hash.
  * @type {string}
  */
 export const EmbedModeParam = 'embedMode';
 
-
 /**
  * @param {string} str
  * @return {!EmbedMode}
diff --git a/extensions/amp-story/0.1/events.js b/extensions/amp-story/0.1/events.js
index f521ca8fabad..1dcfd9a0a35f 100644
--- a/extensions/amp-story/0.1/events.js
+++ b/extensions/amp-story/0.1/events.js
@@ -16,7 +16,6 @@
 
 import {createCustomEvent} from '../../../src/event-helper';
 
-
 /** @const {!Object<string, string>} */
 export const EventType = {
   // Triggered when the user mutes the story
@@ -57,7 +56,6 @@ export const EventType = {
   PAGE_LOADED: 'ampstory:pageload',
 };
 
-
 /**
  * @param {!EventTarget} source
  * @param {string} eventName
@@ -66,13 +64,15 @@ export const EventType = {
 export function dispatch(source, eventName, opt_bubbles) {
   const event = new Event(eventName, {bubbles: !!opt_bubbles});
   if (event.initEvent) {
-    event.initEvent(eventName, /* bubbles */ !!opt_bubbles,
-        /* cancelable */ false);
+    event.initEvent(
+      eventName,
+      /* bubbles */ !!opt_bubbles,
+      /* cancelable */ false
+    );
   }
   source.dispatchEvent(event);
 }
 
-
 /**
  * @param {!Window} win
  * @param {!EventTarget} source
diff --git a/extensions/amp-story/0.1/jsonld.js b/extensions/amp-story/0.1/jsonld.js
index 97845a1ee62e..8242a7b05ca8 100644
--- a/extensions/amp-story/0.1/jsonld.js
+++ b/extensions/amp-story/0.1/jsonld.js
@@ -31,7 +31,9 @@ export function getJsonLd(root) {
     return null;
   }
 
-  return tryParseJson(scriptTag.textContent, e => {
-    user().error(TAG, 'Failed to parse ld+json. Is it valid JSON?', e);
-  }) || null;
+  return (
+    tryParseJson(scriptTag.textContent, e => {
+      user().error(TAG, 'Failed to parse ld+json. Is it valid JSON?', e);
+    }) || null
+  );
 }
diff --git a/extensions/amp-story/0.1/loading-spinner.js b/extensions/amp-story/0.1/loading-spinner.js
index dc535790eeea..0736e1944960 100644
--- a/extensions/amp-story/0.1/loading-spinner.js
+++ b/extensions/amp-story/0.1/loading-spinner.js
@@ -17,11 +17,9 @@ import {dev} from '../../../src/log';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @const {string} */
 const SPINNER_ACTIVE_ATTRIBUTE = 'active';
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const SPINNER = {
   tag: 'div',
diff --git a/extensions/amp-story/0.1/logging.js b/extensions/amp-story/0.1/logging.js
index 1c21ba6ef3cf..7ef7ebb58437 100644
--- a/extensions/amp-story/0.1/logging.js
+++ b/extensions/amp-story/0.1/logging.js
@@ -18,7 +18,6 @@ import {dict} from '../../../src/utils/object';
 import {scopedQuerySelectorAll} from '../../../src/dom';
 import {tryResolve} from '../../../src/utils/promise';
 
-
 /** @typedef {function(!Element): (boolean|!Promise<boolean>)} */
 let ElementPredicateDef;
 
@@ -55,7 +54,6 @@ let ElementPredicateDef;
  */
 let AmpStoryLogTypeDef;
 
-
 /**
  * A log entry is a more concrete version of a rule or best practice; it refers
  * to whether a specific element on a specific page of a specific story conforms
@@ -72,11 +70,9 @@ let AmpStoryLogTypeDef;
  */
 export let AmpStoryLogEntryDef;
 
-
 /** @private @const {string} */
 const AMPPROJECT_DOCS = 'https://www.ampproject.org/docs';
 
-
 /**
  * @param  {!HTMLMediaElement} el
  * @return {!Promise<Image>}
@@ -102,8 +98,9 @@ const LogType = {
 
   /** Warnings */
   IMAGES_MAX_720P_OR_SRCSET: {
-    message: 'Images should not be larger than 720p.  If you wish to use' +
-        ' images that are larger than 720p, you should specify a srcset.',
+    message:
+      'Images should not be larger than 720p.  If you wish to use' +
+      ' images that are larger than 720p, you should specify a srcset.',
     moreInfo: AMPPROJECT_DOCS + '/guides/responsive/art_direction#srcset',
     selector: 'img:not([srcset])',
     predicate: el => el.naturalWidth <= 720 && el.naturalHeight <= 1280,
@@ -134,25 +131,27 @@ const LogType = {
   VIDEO_POSTER_MAX_720P: {
     message: 'Video poster images should not be larger than 720p.',
     selector: 'video[poster]',
-    predicate: el => getPosterFromVideo(el)
-        .then(poster => {
-          return poster.naturalWidth <= 720 && poster.naturalHeight <= 1280;
-        }),
+    predicate: el =>
+      getPosterFromVideo(el).then(poster => {
+        return poster.naturalWidth <= 720 && poster.naturalHeight <= 1280;
+      }),
     level: LogLevel.WARN,
   },
 
   VIDEO_POSTER_POTRAIT: {
-    message: 'Poster images for full-bleed videos should be in portrait ' +
-        'orientation.',
-    selector: 'amp-story-grid-layer[template="fill"] > amp-video > ' +
-        'video[poster]',
-    predicate: el => getPosterFromVideo(el)
-        .then(poster => poster.naturalWidth < poster.naturalHeight),
+    message:
+      'Poster images for full-bleed videos should be in portrait ' +
+      'orientation.',
+    selector:
+      'amp-story-grid-layer[template="fill"] > amp-video > video[poster]',
+    predicate: el =>
+      getPosterFromVideo(el).then(
+        poster => poster.naturalWidth < poster.naturalHeight
+      ),
     level: LogLevel.WARN,
   },
 };
 
-
 /**
  * Gets the log type associated with the specified key.
  * @param {string} logTypeKey
@@ -161,15 +160,18 @@ const LogType = {
 function getLogType(logTypeKey) {
   const logType = LogType[logTypeKey];
   devAssert(logType, `There is no log type "${logTypeKey}".`);
-  devAssert(logType.message,
-      `Log type "${logTypeKey}" has no associated message.`);
-  devAssert(logType.level,
-      `Log type "${logTypeKey}" has no associated log level.`);
+  devAssert(
+    logType.message,
+    `Log type "${logTypeKey}" has no associated message.`
+  );
+  devAssert(
+    logType.level,
+    `Log type "${logTypeKey}" has no associated log level.`
+  );
 
   return logType;
 }
 
-
 /**
  * @param {!Element} rootElement
  * @param {!AmpStoryLogTypeDef} logType
@@ -179,22 +181,22 @@ function getLogType(logTypeKey) {
 function getLogEntry(rootElement, logType, element) {
   const predicate = logType.predicate || (unusedEl => false);
 
-  return tryResolve(() => predicate(element))
-      .then(conforms => {
-        return new Promise(resolve => {
-          resolve(dict({
-            'rootElement': rootElement,
-            'element': element,
-            'conforms': conforms,
-            'level': logType.level,
-            'message': logType.message,
-            'moreInfo': logType.moreInfo,
-          }));
-        });
-      });
+  return tryResolve(() => predicate(element)).then(conforms => {
+    return new Promise(resolve => {
+      resolve(
+        dict({
+          'rootElement': rootElement,
+          'element': element,
+          'conforms': conforms,
+          'level': logType.level,
+          'message': logType.message,
+          'moreInfo': logType.moreInfo,
+        })
+      );
+    });
+  });
 }
 
-
 /**
  * @param {!Element} rootElement
  * @param {!AmpStoryLogTypeDef} logType
@@ -203,13 +205,13 @@ function getLogEntry(rootElement, logType, element) {
 function getLogEntriesForType(rootElement, logType) {
   const precondition = logType.precondition || (unusedEl => true);
 
-  const elements = logType.selector ?
-    [].slice.call(scopedQuerySelectorAll(rootElement, logType.selector)) :
-    [rootElement];
+  const elements = logType.selector
+    ? [].slice.call(scopedQuerySelectorAll(rootElement, logType.selector))
+    : [rootElement];
 
   return elements
-      .filter(precondition)
-      .map(getLogEntry.bind(/** thisArg */ null, rootElement, logType));
+    .filter(precondition)
+    .map(getLogEntry.bind(/** thisArg */ null, rootElement, logType));
 }
 
 /**
@@ -228,7 +230,6 @@ function logEntryCompareFn(logEntryA, logEntryB) {
   }
 }
 
-
 /**
  * Gets a promise which yields a list of log entries for the specified element.
  * @param {!Element} rootElement
@@ -241,8 +242,7 @@ export function getLogEntries(rootElement) {
     return entries.concat(newEntries);
   }, []);
 
-  return Promise.all(logEntryPromises)
-      .then(logEntries => {
-        return logEntries.sort(logEntryCompareFn);
-      });
+  return Promise.all(logEntryPromises).then(logEntries => {
+    return logEntries.sort(logEntryCompareFn);
+  });
 }
diff --git a/extensions/amp-story/0.1/media-pool.js b/extensions/amp-story/0.1/media-pool.js
index 07f9c8f87c31..a2396f3ab0f1 100644
--- a/extensions/amp-story/0.1/media-pool.js
+++ b/extensions/amp-story/0.1/media-pool.js
@@ -36,7 +36,6 @@ import {findIndex} from '../../../src/utils/array';
 import {isConnectedNode} from '../../../src/dom';
 import {toWin} from '../../../src/types';
 
-
 /** @const @enum {string} */
 export const MediaType = {
   UNSUPPORTED: 'unsupported',
@@ -44,39 +43,33 @@ export const MediaType = {
   VIDEO: 'video',
 };
 
-
 /**
  * Represents the distance of an element from the current place in the document.
  * @typedef {function(!HTMLMediaElement): number}
  */
 export let ElementDistanceFnDef;
 
-
 /**
  * Represents a task to be executed on a media element.
  * @typedef {function(!HTMLMediaElement, *): !Promise}
  */
 let ElementTaskDef;
 
-
 /**
  * @const {string}
  */
 const DOM_MEDIA_ELEMENT_ID_PREFIX = 'i-amphtml-media-';
 
-
 /**
  * @const {string}
  */
 const POOL_MEDIA_ELEMENT_PROPERTY_NAME = '__AMP_MEDIA_POOL_ID__';
 
-
 /**
  * @const {string}
  */
 const ELEMENT_TASK_QUEUE_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_TASKS__';
 
-
 /**
  * The name for a string attribute that represents the ID of a media element
  * that the element containing this attribute replaced.
@@ -84,22 +77,18 @@ const ELEMENT_TASK_QUEUE_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_TASKS__';
  */
 export const REPLACED_MEDIA_PROPERTY_NAME = 'replaced-media';
 
-
 /**
  * @type {!Object<string, !MediaPool>}
  */
 const instances = {};
 
-
 /**
  * @type {number}
  */
 let nextInstanceId = 0;
 
-
 let elId = 0;
 
-
 /**
  * Media pool class, providing an optimized and cross browser interface to
  * handle HTMLMediaElements.
@@ -192,7 +181,6 @@ export class MediaPool {
     this.initializeMediaPool_(maxCounts);
   }
 
-
   /**
    * Fills the media pool by creating the maximum number of media elements for
    * each of the types of media elements.  We need to create these eagerly so
@@ -211,8 +199,10 @@ export class MediaPool {
         return;
       }
 
-      const ctor = devAssert(this.mediaFactory_[type],
-          `Factory for media type \`${type}\` unset.`);
+      const ctor = devAssert(
+        this.mediaFactory_[type],
+        `Factory for media type \`${type}\` unset.`
+      );
 
       // Cloning nodes is faster than building them.
       // Construct a seed media element as a small optimization.
@@ -225,13 +215,14 @@ export class MediaPool {
       // this optimization automatically. However, it skips it due to a
       // comparison with the itervar below, so we have to roll it by hand.
       for (let i = count; i > 0; i--) {
-        const mediaEl = /** @type {!HTMLMediaElement} */
-            // Use seed element at end of set to prevent wasting it.
-            (i == 1 ? mediaElSeed : mediaElSeed.cloneNode(/* deep */ true));
+        // Use seed element at end of set to prevent wasting it.
+        const mediaEl =
+          /** @type {!HTMLMediaElement} */ (i == 1
+            ? mediaElSeed
+            : mediaElSeed.cloneNode(/* deep */ true));
         const sources = this.getDefaultSource_(type);
         mediaEl.setAttribute('pool-element', elId++);
-        this.enqueueMediaElementTask_(mediaEl,
-            new UpdateSourcesTask(sources));
+        this.enqueueMediaElementTask_(mediaEl, new UpdateSourcesTask(sources));
         // TODO(newmuis): Check the 'error' field to see if MEDIA_ERR_DECODE
         // is returned.  If so, we should adjust the pool size/distribution
         // between media types.
@@ -240,7 +231,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * @param {!MediaType} mediaType The media type whose source should be
    *     retrieved.
@@ -258,7 +248,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * Comparison function that compares the distance of each element from the
    * current position in the document.
@@ -272,7 +261,6 @@ export class MediaPool {
     return distanceA < distanceB ? -1 : 1;
   }
 
-
   /**
    * @return {string} A unique ID.
    * @private
@@ -300,7 +288,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * Reserves an element of the specified type by removing it from the set of
    * unallocated elements and returning it.
@@ -312,7 +299,6 @@ export class MediaPool {
     return this.unallocated[mediaType].pop();
   }
 
-
   /**
    * Retrieves the media element from the pool that matches the specified
    * element, if one exists.
@@ -335,7 +321,6 @@ export class MediaPool {
     return allocatedEls[index];
   }
 
-
   /**
    * Allocates the specified media element of the specified type.
    * @param {!MediaType} mediaType The type of media element to allocate.
@@ -353,7 +338,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * Deallocates and returns the media element of the specified type furthest
    * from the current position in the document.
@@ -375,8 +359,10 @@ export class MediaPool {
     // played is further than the farthest allocated element.
     if (opt_elToAllocate) {
       const furthestEl = allocatedEls[allocatedEls.length - 1];
-      if (!furthestEl ||
-          this.distanceFn_(furthestEl) < this.distanceFn_(opt_elToAllocate)) {
+      if (
+        !furthestEl ||
+        this.distanceFn_(furthestEl) < this.distanceFn_(opt_elToAllocate)
+      ) {
         return null;
       }
     }
@@ -387,7 +373,6 @@ export class MediaPool {
     return poolMediaEl;
   }
 
-
   /**
    * Forcibly deallocates a specific media element, regardless of its distance
    * from the current position in the document.
@@ -398,8 +383,9 @@ export class MediaPool {
   forceDeallocateMediaElement_(poolMediaEl) {
     const mediaType = this.getMediaType_(poolMediaEl);
     const allocatedEls = this.allocated[mediaType];
-    const removeFromDom = isConnectedNode(poolMediaEl) ?
-      this.swapPoolMediaElementOutOfDom_(poolMediaEl) : Promise.resolve();
+    const removeFromDom = isConnectedNode(poolMediaEl)
+      ? this.swapPoolMediaElementOutOfDom_(poolMediaEl)
+      : Promise.resolve();
 
     return removeFromDom.then(() => {
       const index = allocatedEls.indexOf(poolMediaEl);
@@ -409,7 +395,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * Evicts an element of the specified type, replaces it in the DOM with the
    * original media element, and returns it.
@@ -420,8 +405,10 @@ export class MediaPool {
    * @private
    */
   evictMediaElement_(mediaType, opt_elToAllocate) {
-    const poolMediaEl =
-        this.deallocateMediaElement_(mediaType, opt_elToAllocate);
+    const poolMediaEl = this.deallocateMediaElement_(
+      mediaType,
+      opt_elToAllocate
+    );
     if (!poolMediaEl) {
       return null;
     }
@@ -430,7 +417,6 @@ export class MediaPool {
     return poolMediaEl;
   }
 
-
   /**
    * @param {!MediaType} mediaType The media type to check.
    * @param {!HTMLMediaElement} el The element to check.
@@ -442,7 +428,6 @@ export class MediaPool {
     return this.allocated[mediaType].indexOf(el) >= 0;
   }
 
-
   /**
    * Replaces a media element that was originally in the DOM with a media
    * element from the pool.
@@ -460,20 +445,25 @@ export class MediaPool {
     const ampMediaForDomEl = ampMediaElementFor(domMediaEl);
     poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME] = domMediaEl.id;
 
-    return this.enqueueMediaElementTask_(poolMediaEl,
-        new SwapIntoDomTask(domMediaEl))
-        .then(() => {
-          this.maybeResetAmpMedia_(ampMediaForPoolEl);
-          this.maybeResetAmpMedia_(ampMediaForDomEl);
-          this.enqueueMediaElementTask_(poolMediaEl,
-              new UpdateSourcesTask(sources));
-          this.enqueueMediaElementTask_(poolMediaEl, new LoadTask());
-        }, () => {
-          this.forceDeallocateMediaElement_(poolMediaEl);
-        });
+    return this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new SwapIntoDomTask(domMediaEl)
+    ).then(
+      () => {
+        this.maybeResetAmpMedia_(ampMediaForPoolEl);
+        this.maybeResetAmpMedia_(ampMediaForDomEl);
+        this.enqueueMediaElementTask_(
+          poolMediaEl,
+          new UpdateSourcesTask(sources)
+        );
+        this.enqueueMediaElementTask_(poolMediaEl, new LoadTask());
+      },
+      () => {
+        this.forceDeallocateMediaElement_(poolMediaEl);
+      }
+    );
   }
 
-
   /**
    * @param {?Element} componentEl
    * @private
@@ -495,7 +485,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * @param {!HTMLMediaElement} poolMediaEl The element whose source should be
    *     reset.
@@ -506,11 +495,12 @@ export class MediaPool {
     const mediaType = this.getMediaType_(poolMediaEl);
     const defaultSources = this.getDefaultSource_(mediaType);
 
-    return this.enqueueMediaElementTask_(poolMediaEl,
-        new UpdateSourcesTask(defaultSources));
+    return this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new UpdateSourcesTask(defaultSources)
+    );
   }
 
-
   /**
    * Removes a pool media element from the DOM and replaces it with the video
    * that it originally replaced.
@@ -523,14 +513,16 @@ export class MediaPool {
   swapPoolMediaElementOutOfDom_(poolMediaEl) {
     const oldDomMediaElId = poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME];
     const oldDomMediaEl = /** @type {!HTMLMediaElement} */ (dev().assertElement(
-        this.domMediaEls_[oldDomMediaElId],
-        'No media element to put back into DOM after eviction.'));
-
-    const swapOutOfDom = this.enqueueMediaElementTask_(poolMediaEl,
-        new SwapOutOfDomTask(oldDomMediaEl))
-        .then(() => {
-          poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME] = null;
-        });
+      this.domMediaEls_[oldDomMediaElId],
+      'No media element to put back into DOM after eviction.'
+    ));
+
+    const swapOutOfDom = this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new SwapOutOfDomTask(oldDomMediaEl)
+    ).then(() => {
+      poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME] = null;
+    });
 
     this.resetPoolMediaElementSource_(poolMediaEl);
     return swapOutOfDom;
@@ -563,7 +555,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * Preloads the content of the specified media element in the DOM and returns
    * a media element that can be used in its stead for playback.
@@ -579,19 +570,21 @@ export class MediaPool {
     }
 
     const mediaType = this.getMediaType_(domMediaEl);
-    const existingPoolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const existingPoolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
     if (existingPoolMediaEl) {
       // The element being loaded already has an allocated media element.
       return Promise.resolve(existingPoolMediaEl);
     }
 
     const sources = this.sources_[domMediaEl.id];
-    devAssert(sources instanceof Sources,
-        'Cannot play unregistered element.');
+    devAssert(sources instanceof Sources, 'Cannot play unregistered element.');
 
-    const poolMediaEl = this.reserveUnallocatedMediaElement_(mediaType) ||
-        this.evictMediaElement_(mediaType, domMediaEl);
+    const poolMediaEl =
+      this.reserveUnallocatedMediaElement_(mediaType) ||
+      this.evictMediaElement_(mediaType, domMediaEl);
 
     if (!poolMediaEl) {
       // If there is no space in the pool to allocate a new element, and no
@@ -601,11 +594,13 @@ export class MediaPool {
 
     this.allocateMediaElement_(mediaType, poolMediaEl);
 
-    return this.swapPoolMediaElementIntoDom_(domMediaEl, poolMediaEl, sources)
-        .then(() => poolMediaEl);
+    return this.swapPoolMediaElementIntoDom_(
+      domMediaEl,
+      poolMediaEl,
+      sources
+    ).then(() => poolMediaEl);
   }
 
-
   /**
    * "Blesses" the specified media element for future playback without a user
    * gesture.  In order for this to bless the media element, this function must
@@ -622,7 +617,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new BlessTask());
   }
 
-
   /**
    * Registers the specified element to be usable by the media pool.  Elements
    * should be registered as early as possible, in order to prevent them from
@@ -659,7 +653,6 @@ export class MediaPool {
     return Promise.resolve();
   }
 
-
   /**
    * Preloads the content of the specified media element in the DOM.
    * @param {!HTMLMediaElement} domMediaEl The media element, found in the DOM,
@@ -674,7 +667,6 @@ export class MediaPool {
     return this.loadInternal_(domMediaEl).then();
   }
 
-
   /**
    * Plays the specified media element in the DOM by replacing it with a media
    * element from the pool and playing that.
@@ -683,17 +675,15 @@ export class MediaPool {
    *     element has been successfully played.
    */
   play(domMediaEl) {
-    return this.loadInternal_(domMediaEl)
-        .then(poolMediaEl => {
-          if (!poolMediaEl) {
-            return Promise.resolve();
-          }
+    return this.loadInternal_(domMediaEl).then(poolMediaEl => {
+      if (!poolMediaEl) {
+        return Promise.resolve();
+      }
 
-          return this.enqueueMediaElementTask_(poolMediaEl, new PlayTask());
-        });
+      return this.enqueueMediaElementTask_(poolMediaEl, new PlayTask());
+    });
   }
 
-
   /**
    * Pauses the specified media element in the DOM.
    * @param {!HTMLMediaElement} domMediaEl The media element to be paused.
@@ -704,24 +694,27 @@ export class MediaPool {
    */
   pause(domMediaEl, rewindToBeginning = false) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
     }
 
-    return this.enqueueMediaElementTask_(poolMediaEl, new PauseTask())
-        .then(() => {
-          if (rewindToBeginning) {
-            this.enqueueMediaElementTask_(
-                /** @type {!HTMLMediaElement} */ (poolMediaEl),
-                new RewindTask());
-          }
-        });
+    return this.enqueueMediaElementTask_(poolMediaEl, new PauseTask()).then(
+      () => {
+        if (rewindToBeginning) {
+          this.enqueueMediaElementTask_(
+            /** @type {!HTMLMediaElement} */ (poolMediaEl),
+            new RewindTask()
+          );
+        }
+      }
+    );
   }
 
-
   /**
    * Rewinds a specified media element in the DOM to 0.
    * @param {!HTMLMediaElement} domMediaEl The media element to be rewound.
@@ -730,8 +723,10 @@ export class MediaPool {
    */
   rewindToBeginning(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
@@ -740,7 +735,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new RewindTask());
   }
 
-
   /**
    * Mutes the specified media element in the DOM.
    * @param {!HTMLMediaElement} domMediaEl The media element to be muted.
@@ -749,8 +743,10 @@ export class MediaPool {
    */
   mute(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
@@ -759,7 +755,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new MuteTask());
   }
 
-
   /**
    * Unmutes the specified media element in the DOM.
    * @param {!HTMLMediaElement} domMediaEl The media element to be unmuted.
@@ -768,8 +763,10 @@ export class MediaPool {
    */
   unmute(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
@@ -778,7 +775,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new UnmuteTask());
   }
 
-
   /**
    * "Blesses" all media elements in the media pool for future playback without
    * a user gesture.  In order for this to bless the media elements, this
@@ -797,15 +793,14 @@ export class MediaPool {
     });
 
     return Promise.all(blessPromises)
-        .then(() => {
-          this.blessed_ = true;
-        }).catch(reason => {
-          dev().expectedError('AMP-STORY', 'Blessing all media failed: ',
-              reason);
-        });
+      .then(() => {
+        this.blessed_ = true;
+      })
+      .catch(reason => {
+        dev().expectedError('AMP-STORY', 'Blessing all media failed: ', reason);
+      });
   }
 
-
   /**
    * @param {!HTMLMediaElement} mediaEl The element whose task queue should be
    *     executed.
@@ -820,13 +815,14 @@ export class MediaPool {
     const task = queue[0];
 
     const executionFn = () => {
-      task.execute(mediaEl)
-          .catch(reason => dev().error('AMP-STORY', reason))
-          .then(() => {
-            // Run regardless of success or failure of task execution.
-            queue.shift();
-            this.executeNextMediaElementTask_(mediaEl);
-          });
+      task
+        .execute(mediaEl)
+        .catch(reason => dev().error('AMP-STORY', reason))
+        .then(() => {
+          // Run regardless of success or failure of task execution.
+          queue.shift();
+          this.executeNextMediaElementTask_(mediaEl);
+        });
     };
 
     if (task.requiresSynchronousExecution()) {
@@ -836,7 +832,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * @param {!HTMLMediaElement} mediaEl The element for which the specified task
    *     should be executed.
@@ -862,7 +857,6 @@ export class MediaPool {
     return task.whenComplete();
   }
 
-
   /**
    * @param {!MediaPoolRoot} root
    * @return {!MediaPool}
@@ -879,15 +873,15 @@ export class MediaPool {
     const newId = String(nextInstanceId++);
     element[POOL_MEDIA_ELEMENT_PROPERTY_NAME] = newId;
     instances[newId] = new MediaPool(
-        toWin(root.getElement().ownerDocument.defaultView),
-        root.getMaxMediaElementCounts(),
-        element => root.getElementDistance(element));
+      toWin(root.getElement().ownerDocument.defaultView),
+      root.getMaxMediaElementCounts(),
+      element => root.getElementDistance(element)
+    );
 
     return instances[newId];
   }
 }
 
-
 /**
  * Defines a common interface for elements that contain a MediaPool.
  *
@@ -911,7 +905,6 @@ export class MediaPoolRoot {
    */
   getElementDistance(unusedElement) {}
 
-
   /**
    * @return {!Object<!MediaType, number>} The maximum amount of each media
    *     type to allow within this element.
diff --git a/extensions/amp-story/0.1/media-tasks.js b/extensions/amp-story/0.1/media-tasks.js
index 46bec507b14e..f105256aadf7 100644
--- a/extensions/amp-story/0.1/media-tasks.js
+++ b/extensions/amp-story/0.1/media-tasks.js
@@ -18,8 +18,6 @@ import {Deferred, tryResolve} from '../../../src/utils/promise';
 import {Sources} from './sources';
 import {isConnectedNode} from '../../../src/dom';
 
-
-
 /**
  * The name for a boolean property on an element indicating whether that element
  * has already been "blessed".
@@ -27,7 +25,6 @@ import {isConnectedNode} from '../../../src/dom';
  */
 export const ELEMENT_BLESSED_PROPERTY_NAME = '__AMP_MEDIA_IS_BLESSED__';
 
-
 /**
  * CSS class names that should not be removed from an element when swapping it
  * into/out of the DOM.
@@ -39,20 +36,12 @@ const PROTECTED_CSS_CLASS_NAMES = [
   'i-amphtml-pool-video',
 ];
 
-
 /**
  * Attribute names that should not be removed from an element when swapping it
  * into/out of the DOM.
  * @const {!Array<string>}
  */
-const PROTECTED_ATTRIBUTES = [
-  'id',
-  'src',
-  'class',
-  'autoplay',
-];
-
-
+const PROTECTED_ATTRIBUTES = ['id', 'src', 'class', 'autoplay'];
 
 /**
  * Determines whether a CSS class name is allowed to be removed or copied from
@@ -66,7 +55,6 @@ function isProtectedCssClassName(cssClassName) {
   return PROTECTED_CSS_CLASS_NAMES.indexOf(cssClassName) >= 0;
 }
 
-
 /**
  * Determines whether an attribute is allowed to be removed or copied from
  * media elements.
@@ -79,7 +67,6 @@ function isProtectedAttributeName(attributeName) {
   return PROTECTED_ATTRIBUTES.indexOf(attributeName) >= 0;
 }
 
-
 /**
  * Copies all unprotected CSS classes from fromEl to toEl.
  * @param {!HTMLMediaElement} fromEl The element from which CSS classes should
@@ -106,7 +93,6 @@ function copyCssClasses(fromEl, toEl) {
   }
 }
 
-
 /**
  * Copies all unprotected attributes from fromEl to toEl.
  * @param {!HTMLMediaElement} fromEl The element from which attributes should
@@ -129,15 +115,13 @@ function copyAttributes(fromEl, toEl) {
 
   // Copy all of the unprotected attributes from the fromEl to the toEl.
   for (let i = 0; i < fromAttributes.length; i++) {
-    const {name: attributeName, value: attributeValue} = fromAttributes[i] ;
+    const {name: attributeName, value: attributeValue} = fromAttributes[i];
     if (!isProtectedAttributeName(attributeName)) {
       toEl.setAttribute(attributeName, attributeValue);
     }
   }
 }
 
-
-
 /**
  * Base class for tasks executed in order on HTMLMediaElements.
  */
@@ -183,8 +167,7 @@ export class MediaTask {
    *     execution.
    */
   execute(mediaEl) {
-    return this.executeInternal(mediaEl)
-        .then(this.resolve_, this.reject_);
+    return this.executeInternal(mediaEl).then(this.resolve_, this.reject_);
   }
 
   /**
@@ -213,7 +196,6 @@ export class MediaTask {
   }
 }
 
-
 /**
  * Plays the specified media element.
  */
@@ -240,7 +222,6 @@ export class PlayTask extends MediaTask {
   }
 }
 
-
 /**
  * Pauses the specified media element.
  */
@@ -259,7 +240,6 @@ export class PauseTask extends MediaTask {
   }
 }
 
-
 /**
  * Unmutes the specified media element.
  */
@@ -279,7 +259,6 @@ export class UnmuteTask extends MediaTask {
   }
 }
 
-
 /**
  * Mutes the specified media element.
  */
@@ -299,7 +278,6 @@ export class MuteTask extends MediaTask {
   }
 }
 
-
 /**
  * Seeks the specified media element to the beginning.
  */
@@ -318,7 +296,6 @@ export class RewindTask extends MediaTask {
   }
 }
 
-
 /**
  * Loads the specified media element.
  */
@@ -337,7 +314,6 @@ export class LoadTask extends MediaTask {
   }
 }
 
-
 /**
  * "Blesses" the specified media element for future playback without a user
  * gesture.  In order for this to bless the media element, this function must
@@ -367,7 +343,6 @@ export class BlessTask extends MediaTask {
   }
 }
 
-
 /**
  * Updates the sources of the specified media element.
  */
@@ -391,7 +366,6 @@ export class UpdateSourcesTask extends MediaTask {
   }
 }
 
-
 /**
  * Swaps a media element into the DOM, in the place of another media element.
  */
@@ -416,13 +390,14 @@ export class SwapIntoDomTask extends MediaTask {
 
     copyCssClasses(this.replacedMediaEl_, mediaEl);
     copyAttributes(this.replacedMediaEl_, mediaEl);
-    this.replacedMediaEl_.parentElement
-        .replaceChild(mediaEl, this.replacedMediaEl_);
+    this.replacedMediaEl_.parentElement.replaceChild(
+      mediaEl,
+      this.replacedMediaEl_
+    );
     return Promise.resolve();
   }
 }
 
-
 /**
  * Swaps a media element out the DOM, in the place of a placeholder media
  * element.
diff --git a/extensions/amp-story/0.1/navigation-state.js b/extensions/amp-story/0.1/navigation-state.js
index ff8349fa2838..8fae40e8f344 100644
--- a/extensions/amp-story/0.1/navigation-state.js
+++ b/extensions/amp-story/0.1/navigation-state.js
@@ -17,7 +17,6 @@ import {Observable} from '../../../src/observable';
 import {Services} from '../../../src/services';
 import {StateProperty} from './amp-story-store-service';
 
-
 /**
  * Types of state changes that can be consumed.
  * @enum {number}
@@ -29,11 +28,9 @@ export const StateChangeType = {
   END: 3,
 };
 
-
 /** @typedef {{type: !StateChangeType, value: *}} */
 export let StateChangeEventDef;
 
-
 /**
  * State store to decouple navigation changes from consumers.
  */
diff --git a/extensions/amp-story/0.1/page-advancement.js b/extensions/amp-story/0.1/page-advancement.js
index bf0c70234799..811058b20127 100644
--- a/extensions/amp-story/0.1/page-advancement.js
+++ b/extensions/amp-story/0.1/page-advancement.js
@@ -22,7 +22,6 @@ import {hasTapAction, timeStrToMillis} from './utils';
 import {listenOnce} from '../../../src/event-helper';
 import {map} from '../../../src/utils/object';
 
-
 /** @private @const {number} */
 const NEXT_SCREEN_AREA_RATIO = 0.75;
 
@@ -191,7 +190,6 @@ export class AdvancementConfig {
   }
 }
 
-
 /**
  * An AdvancementConfig implementation that composes multiple other
  * AdvancementConfig implementations by simply delegating all of its calls to
@@ -254,7 +252,6 @@ class MultipleAdvancementConfig extends AdvancementConfig {
   }
 }
 
-
 /**
  * Always provides a progress of 1.0.  Advances when the user taps the rightmost
  * 75% of the screen; triggers the previous listener when the user taps the
@@ -301,9 +298,13 @@ class ManualAdvancement extends AdvancementConfig {
    * @private
    */
   isNavigationalClick_(e) {
-    return !closest(dev().assertElement(e.target), el => {
-      return hasTapAction(el);
-    }, /* opt_stopAt */ this.element_);
+    return !closest(
+      dev().assertElement(e.target),
+      el => {
+        return hasTapAction(el);
+      },
+      /* opt_stopAt */ this.element_
+    );
   }
 
   /**
@@ -313,12 +314,15 @@ class ManualAdvancement extends AdvancementConfig {
    * @return {boolean}
    */
   isProtectedTarget_(event) {
-    return !!closest(dev().assertElement(event.target), el => {
-      return PROTECTED_ELEMENTS[el.tagName];
-    }, /* opt_stopAt */ this.element_);
+    return !!closest(
+      dev().assertElement(event.target),
+      el => {
+        return PROTECTED_ELEMENTS[el.tagName];
+      },
+      /* opt_stopAt */ this.element_
+    );
   }
 
-
   /**
    * Performs a system navigation if it is determined that the specified event
    * was a click intended for navigation.
@@ -335,15 +339,15 @@ class ManualAdvancement extends AdvancementConfig {
     event.stopPropagation();
 
     // TODO(newmuis): This will need to be flipped for RTL.
-    const elRect = this.element_./*OK*/getBoundingClientRect();
+    const elRect = this.element_./*OK*/ getBoundingClientRect();
 
     // Using `left` as a fallback since Safari returns a ClientRect in some
     // cases.
-    const offsetLeft = ('x' in elRect) ? elRect.x : elRect.left;
+    const offsetLeft = 'x' in elRect ? elRect.x : elRect.left;
     const offsetWidth = elRect.width;
 
-    const nextScreenAreaMin = offsetLeft +
-        ((1 - NEXT_SCREEN_AREA_RATIO) * offsetWidth);
+    const nextScreenAreaMin =
+      offsetLeft + (1 - NEXT_SCREEN_AREA_RATIO) * offsetWidth;
     const nextScreenAreaMax = offsetLeft + offsetWidth;
 
     if (event.pageX >= nextScreenAreaMin && event.pageX < nextScreenAreaMax) {
@@ -354,7 +358,6 @@ class ManualAdvancement extends AdvancementConfig {
   }
 }
 
-
 /**
  * Provides progress and advancement based on a fixed duration of time,
  * specified in either seconds or milliseconds.
@@ -417,7 +420,7 @@ class TimeBasedAdvancement extends AdvancementConfig {
     }
 
     const progress =
-        (this.getCurrentTimestampMs_() - this.startTimeMs_) / this.delayMs_;
+      (this.getCurrentTimestampMs_() - this.startTimeMs_) / this.delayMs_;
 
     return Math.min(Math.max(progress, 0), 1);
   }
@@ -446,7 +449,6 @@ class TimeBasedAdvancement extends AdvancementConfig {
   }
 }
 
-
 /**
  * Provides progress and advances pages based on the completion percentage of
  * playback of an HTMLMediaElement or a video that implements the AMP
@@ -500,8 +502,10 @@ class MediaBasedAdvancement extends AdvancementConfig {
 
     if (this.element_ instanceof HTMLMediaElement) {
       return this.element_;
-    } else if (this.element_.hasAttribute('background-audio') &&
-        (tagName === 'amp-story' || tagName === 'amp-story-page')) {
+    } else if (
+      this.element_.hasAttribute('background-audio') &&
+      (tagName === 'amp-story' || tagName === 'amp-story-page')
+    ) {
       return this.element_.querySelector('.i-amphtml-story-background-audio');
     } else if (tagName === 'amp-audio') {
       return this.element_.querySelector('audio');
@@ -515,8 +519,10 @@ class MediaBasedAdvancement extends AdvancementConfig {
     super.start();
 
     // Prevents race condition when checking for video interface classname.
-    (this.element_.whenBuilt ? this.element_.whenBuilt() : Promise.resolve())
-        .then(() => this.startWhenBuilt_());
+    (this.element_.whenBuilt
+      ? this.element_.whenBuilt()
+      : Promise.resolve()
+    ).then(() => this.startWhenBuilt_());
   }
 
   /** @private */
@@ -535,15 +541,19 @@ class MediaBasedAdvancement extends AdvancementConfig {
       return;
     }
 
-    user().error('AMP-STORY-PAGE',
-        `Element with ID ${this.element_.id} is not a media element ` +
-        'supported for automatic advancement.');
+    user().error(
+      'AMP-STORY-PAGE',
+      `Element with ID ${this.element_.id} is not a media element ` +
+        'supported for automatic advancement.'
+    );
   }
 
   /** @private */
   startHtmlMediaElement_() {
-    const mediaElement = dev().assertElement(this.mediaElement_,
-        'Media element was unspecified.');
+    const mediaElement = dev().assertElement(
+      this.mediaElement_,
+      'Media element was unspecified.'
+    );
     listenOnce(mediaElement, 'ended', () => this.onAdvance());
     listenOnce(mediaElement, 'timeupdate', () => this.onProgressUpdate());
   }
@@ -554,8 +564,9 @@ class MediaBasedAdvancement extends AdvancementConfig {
       this.video_ = video;
     });
 
-    listenOnce(this.element_, VideoEvents.ENDED, () => this.onAdvance(),
-        {capture: true});
+    listenOnce(this.element_, VideoEvents.ENDED, () => this.onAdvance(), {
+      capture: true,
+    });
 
     this.timer_.poll(POLL_INTERVAL_MS, () => {
       this.onProgressUpdate();
@@ -601,9 +612,9 @@ class MediaBasedAdvancement extends AdvancementConfig {
    */
   static fromAutoAdvanceString(autoAdvanceStr, win, rootEl) {
     try {
-      const element = rootEl.querySelector(`#${
-        escapeCssSelectorIdent(autoAdvanceStr)
-      }`);
+      const element = rootEl.querySelector(
+        `#${escapeCssSelectorIdent(autoAdvanceStr)}`
+      );
 
       if (!element) {
         return null;
diff --git a/extensions/amp-story/0.1/page-element.js b/extensions/amp-story/0.1/page-element.js
index a1a810e1a759..95f08b55da23 100644
--- a/extensions/amp-story/0.1/page-element.js
+++ b/extensions/amp-story/0.1/page-element.js
@@ -26,22 +26,19 @@ import {scopedQuerySelectorAll} from '../../../src/dom';
  *     !function(!Element, !./amp-story-page.AmpStoryPage): !PageElement>}
  */
 const PAGE_ELEMENT_FACTORIES = {
-  'amp-audio, amp-video, .i-amphtml-story-background-audio':
-      (element, page) => new MediaElement(element, page),
-  'amp-img, amp-anim':
-      (element, page) => new ImageElement(element, page),
-  '.i-amphtml-video-interface':
-      (element, page) => new VideoInterfaceElement(element, page),
+  'amp-audio, amp-video, .i-amphtml-story-background-audio': (element, page) =>
+    new MediaElement(element, page),
+  'amp-img, amp-anim': (element, page) => new ImageElement(element, page),
+  '.i-amphtml-video-interface': (element, page) =>
+    new VideoInterfaceElement(element, page),
 };
 
-
 /**
  * CSS class for an element on an amp-story-page.
  * @const {string}
  */
 const ELEMENT_CLASS_NAME = 'i-amphtml-story-page-element';
 
-
 /**
  * CSS class for an element on an amp-story-page that indicates the element is
  * loaded.
@@ -49,7 +46,6 @@ const ELEMENT_CLASS_NAME = 'i-amphtml-story-page-element';
  */
 const ELEMENT_LOADED_CLASS_NAME = 'i-amphtml-story-page-element-loaded';
 
-
 /**
  * CSS class for an element on an amp-story-page that indicates the element can
  * be shown in the UI.
@@ -57,7 +53,6 @@ const ELEMENT_LOADED_CLASS_NAME = 'i-amphtml-story-page-element-loaded';
  */
 const ELEMENT_SHOW_CLASS_NAME = 'i-amphtml-story-page-element-shown';
 
-
 /**
  * CSS class for an element on an amp-story-page that indicates the element has
  * failed to load.
@@ -65,7 +60,6 @@ const ELEMENT_SHOW_CLASS_NAME = 'i-amphtml-story-page-element-shown';
  */
 const ELEMENT_FAILED_CLASS_NAME = 'i-amphtml-story-page-element-failed';
 
-
 /**
  * CSS class for an element on an amp-story-page that indicates the element was
  * hidden by a media query rule.
@@ -73,7 +67,6 @@ const ELEMENT_FAILED_CLASS_NAME = 'i-amphtml-story-page-element-failed';
  */
 const HIDDEN_BY_MEDIA_QUERY_CLASS_NAME = 'i-amphtml-hidden-by-media-query';
 
-
 /**
  * The minimum amount of a media item (by percentage) that must be loaded in
  * order for that element to be considered "loaded".  Note that if the total
@@ -81,15 +74,12 @@ const HIDDEN_BY_MEDIA_QUERY_CLASS_NAME = 'i-amphtml-hidden-by-media-query';
  */
 const MINIMUM_MEDIA_BUFFER_PERCENTAGE_FROM_BEGINNING = 0.25;
 
-
 /**
  * The minimum amount of a media item (in seconds) that must be loaded in order
  * for that element to be considered "loaded".
  */
 const MINIMUM_MEDIA_BUFFER_SECONDS_FROM_BEGINNING = 3;
 
-
-
 /**
  * Represents a single element on an <amp-story-page> that can affect the system
  * layer (e.g. by blocking loading or requiring an audio indicator).
@@ -147,20 +137,26 @@ export class PageElement {
   updateState() {
     if (!this.isLoaded && !this.hasFailed) {
       this.isLoaded = this.isLoaded_();
-      this.element.classList
-          .toggle(ELEMENT_LOADED_CLASS_NAME, /* force */ this.isLoaded);
+      this.element.classList.toggle(
+        ELEMENT_LOADED_CLASS_NAME,
+        /* force */ this.isLoaded
+      );
     }
 
     if (!this.hasFailed && !this.isLoaded) {
       this.hasFailed = this.hasFailed_();
-      this.element.classList
-          .toggle(ELEMENT_FAILED_CLASS_NAME, /* force */ this.hasFailed);
+      this.element.classList.toggle(
+        ELEMENT_FAILED_CLASS_NAME,
+        /* force */ this.hasFailed
+      );
     }
 
     if (!this.canBeShown) {
       this.canBeShown = this.canBeShown_() || this.isLoaded;
-      this.element.classList
-          .toggle(ELEMENT_SHOW_CLASS_NAME, /* force */ this.canBeShown);
+      this.element.classList.toggle(
+        ELEMENT_SHOW_CLASS_NAME,
+        /* force */ this.canBeShown
+      );
     }
   }
 
@@ -260,8 +256,10 @@ class MediaElement extends PageElement {
   /** @private */
   maybeManuallyForceLoading_() {
     const mediaElement = this.getMediaElement_();
-    if (!mediaElement ||
-        (mediaElement.buffered && mediaElement.buffered.length > 0)) {
+    if (
+      !mediaElement ||
+      (mediaElement.buffered && mediaElement.buffered.length > 0)
+    ) {
       return;
     }
 
@@ -285,14 +283,18 @@ class MediaElement extends PageElement {
       return false;
     }
 
-    const firstTimeRange = dev().assertNumber(firstTimeRangeOrNull,
-        'No first time range was found, despite media element existing.');
+    const firstTimeRange = dev().assertNumber(
+      firstTimeRangeOrNull,
+      'No first time range was found, despite media element existing.'
+    );
     const bufferedSeconds = mediaElement.buffered.end(firstTimeRange);
     const bufferedPercentage =
-        (mediaElement.buffered.end(firstTimeRange) / mediaElement.duration);
+      mediaElement.buffered.end(firstTimeRange) / mediaElement.duration;
 
-    return bufferedSeconds >= MINIMUM_MEDIA_BUFFER_SECONDS_FROM_BEGINNING ||
-        bufferedPercentage >= MINIMUM_MEDIA_BUFFER_PERCENTAGE_FROM_BEGINNING;
+    return (
+      bufferedSeconds >= MINIMUM_MEDIA_BUFFER_SECONDS_FROM_BEGINNING ||
+      bufferedPercentage >= MINIMUM_MEDIA_BUFFER_PERCENTAGE_FROM_BEGINNING
+    );
   }
 
   /** @override */
@@ -360,15 +362,22 @@ class ImageElement extends PageElement {
   /** @override */
   isLoaded_() {
     const imageElement = this.getImageElement_();
-    return Boolean(imageElement && imageElement.complete &&
-        imageElement.naturalWidth && imageElement.naturalHeight);
+    return Boolean(
+      imageElement &&
+        imageElement.complete &&
+        imageElement.naturalWidth &&
+        imageElement.naturalHeight
+    );
   }
 
   /** @override */
   hasFailed_() {
     const imageElement = this.getImageElement_();
-    return Boolean(imageElement && imageElement.complete &&
-        (imageElement.naturalWidth === 0 || imageElement.naturalHeight === 0));
+    return Boolean(
+      imageElement &&
+        imageElement.complete &&
+        (imageElement.naturalWidth === 0 || imageElement.naturalHeight === 0)
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-story/0.1/pagination-buttons.js b/extensions/amp-story/0.1/pagination-buttons.js
index 15f6ac90b109..6373e6fc3d94 100644
--- a/extensions/amp-story/0.1/pagination-buttons.js
+++ b/extensions/amp-story/0.1/pagination-buttons.js
@@ -21,11 +21,9 @@ import {devAssert} from '../../../src/log';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @struct @typedef {{className: string, triggers: (string|undefined)}} */
 let ButtonStateDef;
 
-
 /** @const {!Object<string, !ButtonStateDef>} */
 const BackButtonStates = {
   CLOSE_BOOKEND: {
@@ -40,7 +38,6 @@ const BackButtonStates = {
   },
 };
 
-
 /** @const {!Object<string, !ButtonStateDef>} */
 const ForwardButtonStates = {
   NEXT_PAGE: {
@@ -58,7 +55,6 @@ const ForwardButtonStates = {
   },
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const BUTTON = {
   tag: 'div',
@@ -75,7 +71,6 @@ const BUTTON = {
   ],
 };
 
-
 /**
  * @param {!Element} hoverEl
  * @param {!Element} targetEl
@@ -90,7 +85,6 @@ function setClassOnHover(hoverEl, targetEl, className) {
   });
 }
 
-
 /**
  * Desktop navigation buttons.
  */
@@ -132,8 +126,11 @@ class PaginationButton {
   onClick_(e) {
     e.preventDefault();
     if (this.state_.triggers) {
-      dispatch(this.element, devAssert(this.state_.triggers),
-          /* opt_bubbles */ true);
+      dispatch(
+        this.element,
+        devAssert(this.state_.triggers),
+        /* opt_bubbles */ true
+      );
       return;
     }
     if (this.state_.action) {
@@ -143,7 +140,6 @@ class PaginationButton {
   }
 }
 
-
 /** Pagination buttons layer. */
 export class PaginationButtons {
   /** @param {!Window} win */
@@ -152,12 +148,18 @@ export class PaginationButtons {
     const storeService = Services.storyStoreServiceV01(win);
 
     /** @private @const {!PaginationButton} */
-    this.forwardButton_ =
-        new PaginationButton(doc, ForwardButtonStates.NEXT_PAGE, storeService);
+    this.forwardButton_ = new PaginationButton(
+      doc,
+      ForwardButtonStates.NEXT_PAGE,
+      storeService
+    );
 
     /** @private @const {!PaginationButton} */
-    this.backButton_ =
-        new PaginationButton(doc, BackButtonStates.HIDDEN, storeService);
+    this.backButton_ = new PaginationButton(
+      doc,
+      BackButtonStates.HIDDEN,
+      storeService
+    );
 
     this.forwardButton_.element.classList.add('next-container');
     this.backButton_.element.classList.add('prev-container');
@@ -174,10 +176,16 @@ export class PaginationButtons {
   /** @param {!Element} element */
   attach(element) {
     setClassOnHover(
-        this.forwardButton_.element, element, 'i-amphtml-story-next-hover');
+      this.forwardButton_.element,
+      element,
+      'i-amphtml-story-next-hover'
+    );
 
     setClassOnHover(
-        this.backButton_.element, element, 'i-amphtml-story-prev-hover');
+      this.backButton_.element,
+      element,
+      'i-amphtml-story-prev-hover'
+    );
 
     element.appendChild(this.forwardButton_.element);
     element.appendChild(this.backButton_.element);
@@ -190,14 +198,16 @@ export class PaginationButtons {
         const {pageIndex, totalPages} = event.value;
 
         this.backButton_.updateState(
-            pageIndex === 0 ?
-              BackButtonStates.HIDDEN :
-              BackButtonStates.PREVIOUS_PAGE);
+          pageIndex === 0
+            ? BackButtonStates.HIDDEN
+            : BackButtonStates.PREVIOUS_PAGE
+        );
 
         this.forwardButton_.updateState(
-            pageIndex === totalPages - 1 ?
-              ForwardButtonStates.SHOW_BOOKEND :
-              ForwardButtonStates.NEXT_PAGE);
+          pageIndex === totalPages - 1
+            ? ForwardButtonStates.SHOW_BOOKEND
+            : ForwardButtonStates.NEXT_PAGE
+        );
         break;
 
       case StateChangeType.BOOKEND_ENTER:
diff --git a/extensions/amp-story/0.1/progress-bar.js b/extensions/amp-story/0.1/progress-bar.js
index 1aeb885cde9a..04a888f1d06d 100644
--- a/extensions/amp-story/0.1/progress-bar.js
+++ b/extensions/amp-story/0.1/progress-bar.js
@@ -21,7 +21,6 @@ import {hasOwn, map} from '../../../src/utils/object';
 import {scale, setImportantStyles} from '../../../src/style';
 import {scopedQuerySelector} from '../../../src/dom';
 
-
 /**
  * Transition used to show the progress of a media. Has to be linear so the
  * animation is smooth and constant.
@@ -35,7 +34,6 @@ const TRANSITION_LINEAR = `transform ${POLL_INTERVAL_MS}ms linear`;
  */
 const TRANSITION_EASE = 'transform 200ms ease';
 
-
 /**
  * Progress bar for <amp-story>.
  */
@@ -88,7 +86,7 @@ export class ProgressBar {
     this.isBuilt_ = true;
     this.segmentCount_ = segmentCount;
 
-    segmentIds.forEach((id, i) => this.segmentIdMap_[id] = i);
+    segmentIds.forEach((id, i) => (this.segmentIdMap_[id] = i));
 
     this.root_ = this.win_.document.createElement('ol');
     this.root_.classList.add('i-amphtml-story-progress-bar');
@@ -105,7 +103,6 @@ export class ProgressBar {
     return this.getRoot();
   }
 
-
   /**
    * @return {!Element}
    */
@@ -113,7 +110,6 @@ export class ProgressBar {
     return dev().assertElement(this.root_);
   }
 
-
   /**
    * @param {string} segmentId The index of the new active segment.
    * @public
@@ -124,13 +120,20 @@ export class ProgressBar {
 
     for (let i = 0; i < this.segmentCount_; i++) {
       if (i < segmentIndex) {
-        this.updateProgressByIndex_(i, 1.0,
-            /* withTransition */ i == segmentIndex - 1);
+        this.updateProgressByIndex_(
+          i,
+          1.0,
+          /* withTransition */ i == segmentIndex - 1
+        );
       } else {
         // The active segment manages its own progress by firing PAGE_PROGRESS
         // events to amp-story.
-        this.updateProgressByIndex_(i, 0.0, /* withTransition */ (
-          segmentIndex != 0 && this.activeSegmentIndex_ != 1));
+        this.updateProgressByIndex_(
+          i,
+          0.0,
+          /* withTransition */ segmentIndex != 0 &&
+            this.activeSegmentIndex_ != 1
+        );
       }
     }
   }
@@ -140,8 +143,10 @@ export class ProgressBar {
    * @private
    */
   assertVaildSegmentId_(segmentId) {
-    devAssert(hasOwn(this.segmentIdMap_, segmentId),
-        'Invalid segment-id passed to progress-bar');
+    devAssert(
+      hasOwn(this.segmentIdMap_, segmentId),
+      'Invalid segment-id passed to progress-bar'
+    );
   }
 
   /**
@@ -156,7 +161,6 @@ export class ProgressBar {
     this.updateProgressByIndex_(segmentIndex, progress);
   }
 
-
   /**
    * @param {number} segmentIndex The index of the progress bar segment whose progress should be
    *     changed.
@@ -171,17 +175,20 @@ export class ProgressBar {
     // Offset the index by 1, since nth-child indices start at 1 while
     // JavaScript indices start at 0.
     const nthChildIndex = segmentIndex + 1;
-    const progressEl = scopedQuerySelector(this.getRoot(),
-        `.i-amphtml-story-page-progress-bar:nth-child(${
-          escapeCssSelectorNth(nthChildIndex)
-        }) .i-amphtml-story-page-progress-value`);
+    const progressEl = scopedQuerySelector(
+      this.getRoot(),
+      `.i-amphtml-story-page-progress-bar:nth-child(${escapeCssSelectorNth(
+        nthChildIndex
+      )}) .i-amphtml-story-page-progress-value`
+    );
     this.vsync_.mutate(() => {
       let transition = 'none';
       if (withTransition) {
         // Using an eased transition only if filling the bar to 0 or 1.
         transition =
-            (progress === 1 || progress === 0) ?
-              TRANSITION_EASE : TRANSITION_LINEAR;
+          progress === 1 || progress === 0
+            ? TRANSITION_EASE
+            : TRANSITION_LINEAR;
       }
       setImportantStyles(dev().assertElement(progressEl), {
         'transform': scale(`${progress},1`),
diff --git a/extensions/amp-story/0.1/related-articles.js b/extensions/amp-story/0.1/related-articles.js
index 0b8e8125b606..50f5a20fe159 100644
--- a/extensions/amp-story/0.1/related-articles.js
+++ b/extensions/amp-story/0.1/related-articles.js
@@ -20,10 +20,8 @@ import {
   parseUrlDeprecated,
 } from '../../../src/url';
 
-
 const TAG = 'amp-story';
 
-
 /**
  * @typedef {{
  *   title: string,
@@ -34,7 +32,6 @@ const TAG = 'amp-story';
  */
 export let RelatedArticleDef;
 
-
 /**
  * @typedef {{
  *   heading: (string|undefined),
@@ -44,8 +41,13 @@ export let RelatedArticleDef;
 export let RelatedArticleSetDef;
 
 /** New bookend components only supported in amp-story 1.0. */
-const NEW_COMPONENTS =
-['landscape', 'portrait', 'cta-link', 'heading', 'textbox'];
+const NEW_COMPONENTS = [
+  'landscape',
+  'portrait',
+  'cta-link',
+  'heading',
+  'textbox',
+];
 
 /**
  * @param {!JsonObject} articleJson
@@ -53,14 +55,18 @@ const NEW_COMPONENTS =
  */
 function buildArticleFromJson_(articleJson) {
   if (!articleJson['title'] || !articleJson['url']) {
-    user().error(TAG,
-        'Articles must contain `title` and `url` fields, skipping invalid.');
+    user().error(
+      TAG,
+      'Articles must contain `title` and `url` fields, skipping invalid.'
+    );
     return null;
   }
 
   const articleUrl = devAssert(articleJson['url']);
-  userAssert(isProtocolValid(articleUrl),
-      `Unsupported protocol for article URL ${articleUrl}`);
+  userAssert(
+    isProtocolValid(articleUrl),
+    `Unsupported protocol for article URL ${articleUrl}`
+  );
 
   let domain;
   try {
@@ -77,35 +83,36 @@ function buildArticleFromJson_(articleJson) {
   };
 
   if (articleJson['image']) {
-    userAssert(isProtocolValid(articleJson['image']),
-        `Unsupported protocol for article image URL ${articleJson['image']}`);
+    userAssert(
+      isProtocolValid(articleJson['image']),
+      `Unsupported protocol for article image URL ${articleJson['image']}`
+    );
     article.image = devAssert(articleJson['image']);
   }
 
   return /** @type {!RelatedArticleDef} */ (article);
 }
 
-
 /**
  * @param {!JsonObject=} opt_articleSetsResponse
  * @return {!Array<!RelatedArticleSetDef>}
  */
 export function relatedArticlesFromJson(opt_articleSetsResponse) {
-  return /** @type {!Array<!RelatedArticleSetDef>} */ (
-    Object.keys(opt_articleSetsResponse || {}).map(headingKey => {
-      const articleSet = {
-        articles:
-              opt_articleSetsResponse[headingKey]
-                  .map(buildArticleFromJson_)
-                  .filter(valid => !!valid),
-      };
-
-      if (headingKey.trim().length) {
-        articleSet.heading = headingKey;
-      }
-
-      return /** @type {!RelatedArticleSetDef} */ (articleSet);
-    }));
+  return /** @type {!Array<!RelatedArticleSetDef>} */ (Object.keys(
+    opt_articleSetsResponse || {}
+  ).map(headingKey => {
+    const articleSet = {
+      articles: opt_articleSetsResponse[headingKey]
+        .map(buildArticleFromJson_)
+        .filter(valid => !!valid),
+    };
+
+    if (headingKey.trim().length) {
+      articleSet.heading = headingKey;
+    }
+
+    return /** @type {!RelatedArticleSetDef} */ (articleSet);
+  }));
 }
 
 /**
@@ -120,11 +127,14 @@ export function parseArticlesToClassicApi(bookendComponents) {
     if (component['type'] == 'small') {
       articleSet.articles.push(buildArticleFromJson_(component));
     } else if (NEW_COMPONENTS.includes(component['type'])) {
-      user().warn(TAG, component['type'] + ' is not supported in ' +
-      'amp-story-0.1, upgrade to v1.0 to use this feature.');
+      user().warn(
+        TAG,
+        component['type'] +
+          ' is not supported in ' +
+          'amp-story-0.1, upgrade to v1.0 to use this feature.'
+      );
     } else {
-      user().warn(TAG, component['type'] + ' is not valid, ' +
-      'skipping invalid.');
+      user().warn(TAG, component['type'] + ' is not valid, skipping invalid.');
     }
   });
 
diff --git a/extensions/amp-story/0.1/simple-template.js b/extensions/amp-story/0.1/simple-template.js
index 3946a77927d7..23414e1417ed 100644
--- a/extensions/amp-story/0.1/simple-template.js
+++ b/extensions/amp-story/0.1/simple-template.js
@@ -19,7 +19,6 @@ import {createElementWithAttributes} from '../../../src/dom';
 import {devAssert} from '../../../src/log';
 import {isArray, toWin} from '../../../src/types';
 
-
 /**
  * @typedef {{
  *   tag: string,
@@ -31,7 +30,6 @@ import {isArray, toWin} from '../../../src/types';
  */
 export let ElementDef;
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef|!Array<!ElementDef>} elementsDef
@@ -44,7 +42,6 @@ export function renderSimpleTemplate(doc, elementsDef) {
   return renderSingle(doc, /** @type {!ElementDef} */ (elementsDef));
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef} elementDef
@@ -54,7 +51,6 @@ export function renderAsElement(doc, elementDef) {
   return renderSingle(doc, elementDef);
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!Array<!ElementDef>} elementsDef
@@ -63,29 +59,28 @@ export function renderAsElement(doc, elementDef) {
 function renderMulti(doc, elementsDef) {
   const fragment = doc.createDocumentFragment();
   elementsDef.forEach(elementDef =>
-    fragment.appendChild(renderSingle(doc, elementDef)));
+    fragment.appendChild(renderSingle(doc, elementDef))
+  );
   return fragment;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef} elementDef
  * @return {!Element}
  */
 function renderSingle(doc, elementDef) {
-  const el = elementDef.attrs ?
-    createElementWithAttributes(doc, elementDef.tag, elementDef.attrs) :
-    doc.createElement(elementDef.tag);
+  const el = elementDef.attrs
+    ? createElementWithAttributes(doc, elementDef.tag, elementDef.attrs)
+    : doc.createElement(elementDef.tag);
 
   if (elementDef.localizedStringId) {
     const win = toWin(doc.defaultView);
     Services.localizationServiceForOrNullV01(win).then(localizationService => {
-      devAssert(localizationService,
-          'Could not retrieve LocalizationService.');
-      el.textContent = localizationService
-          .getLocalizedString(/** @type {!LocalizedStringId} */ (
-            elementDef.localizedStringId));
+      devAssert(localizationService, 'Could not retrieve LocalizationService.');
+      el.textContent = localizationService.getLocalizedString(
+        /** @type {!LocalizedStringId} */ (elementDef.localizedStringId)
+      );
     });
   }
 
diff --git a/extensions/amp-story/0.1/sources.js b/extensions/amp-story/0.1/sources.js
index cfc14443ccd0..0a990f836e10 100644
--- a/extensions/amp-story/0.1/sources.js
+++ b/extensions/amp-story/0.1/sources.js
@@ -17,8 +17,6 @@
 import {ampMediaElementFor} from './utils';
 import {removeElement} from '../../../src/dom';
 
-
-
 /**
  * Class handling HTMLMediaElements sources.
  */
@@ -41,7 +39,6 @@ export class Sources {
     this.trackEls_ = opt_trackEls || [];
   }
 
-
   /**
    * Applies track tags to a specified element. This is done in a separate
    * method from the source tags, because we must wait for "loadedmetadata"
@@ -67,7 +64,6 @@ export class Sources {
     });
   }
 
-
   /**
    * Applies the src attribute and source tags to a specified element.
    * @param {!HTMLMediaElement} element The element to adopt the sources
@@ -82,8 +78,9 @@ export class Sources {
       element.setAttribute('src', this.srcAttr_);
     }
 
-    Array.prototype.forEach.call(this.srcEls_,
-        srcEl => element.appendChild(srcEl));
+    Array.prototype.forEach.call(this.srcEls_, srcEl =>
+      element.appendChild(srcEl)
+    );
 
     if (this.trackEls_.length > 0) {
       // Wait for "loadedmetadata" before adding tracks.
@@ -102,7 +99,6 @@ export class Sources {
     }
   }
 
-
   /**
    * Removes and returns the sources from a specified element.
    * @param {!Element} element The element whose sources should be removed and
diff --git a/extensions/amp-story/0.1/test/test-amp-story-consent.js b/extensions/amp-story/0.1/test/test-amp-story-consent.js
index cc183a3ab5ae..fff109168b19 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-consent.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-consent.js
@@ -46,8 +46,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     };
 
     const styles = {'background-color': 'rgb(0, 0, 0)'};
-    getComputedStyleStub =
-        sandbox.stub(win, 'getComputedStyle').returns(styles);
+    getComputedStyleStub = sandbox
+      .stub(win, 'getComputedStyle')
+      .returns(styles);
 
     const localizationService = new LocalizationService(win);
     registerServiceBuilder(win, 'localization-v01', () => localizationService);
@@ -76,8 +77,7 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
   it('should parse the config', () => {
     storyConsent.buildCallback();
-    expect(storyConsent.storyConsentConfig_)
-        .to.deep.equal(defaultConfig);
+    expect(storyConsent.storyConsentConfig_).to.deep.equal(defaultConfig);
   });
 
   it('should require a story-consent title', () => {
@@ -141,8 +141,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-reject');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-reject'
+    );
 
     // For some reason the win object provided by the test environment does not
     // return all the styles.
@@ -155,8 +156,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-reject');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-reject'
+    );
 
     // For some reason the win object provided by the test environment does not
     // return all the styles.
@@ -166,8 +168,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
   it('should hide the external link by default', () => {
     storyConsent.buildCallback();
 
-    const linkEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-external-link');
+    const linkEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-external-link'
+    );
 
     expect(linkEl).to.have.display('none');
   });
@@ -213,15 +216,18 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const linkEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-external-link');
+    const linkEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-external-link'
+    );
 
     expect(linkEl).not.to.have.display('none');
   });
 
   it('should whitelist the <amp-consent> actions', () => {
-    const addToWhitelistStub =
-        sandbox.stub(storyConsent.actions_, 'addToWhitelist');
+    const addToWhitelistStub = sandbox.stub(
+      storyConsent.actions_,
+      'addToWhitelist'
+    );
 
     storyConsent.buildCallback();
 
@@ -251,17 +257,18 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
   it('should render an accept button with the proper amp action', () => {
     storyConsent.buildCallback();
 
-    const buttonEl =
-        storyConsent.storyConsentEl_
-            .querySelector(`button[on="tap:${CONSENT_ID}.accept"]`);
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      `button[on="tap:${CONSENT_ID}.accept"]`
+    );
     expect(buttonEl).to.exist;
   });
 
   it('should set the consent ID in the store', () => {
     storyConsent.buildCallback();
 
-    expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID))
-        .to.equal(CONSENT_ID);
+    expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.equal(
+      CONSENT_ID
+    );
   });
 
   it('should set the font color to black if background is white', () => {
@@ -269,10 +276,12 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     getComputedStyleStub.returns(styles);
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-accept');
-    expect(buttonEl.getAttribute('style'))
-        .to.equal('color: rgb(0, 0, 0) !important;');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-accept'
+    );
+    expect(buttonEl.getAttribute('style')).to.equal(
+      'color: rgb(0, 0, 0) !important;'
+    );
   });
 
   it('should set the font color to white if background is black', () => {
@@ -280,9 +289,11 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     getComputedStyleStub.returns(styles);
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-accept');
-    expect(buttonEl.getAttribute('style'))
-        .to.equal('color: rgb(255, 255, 255) !important;');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-accept'
+    );
+    expect(buttonEl.getAttribute('style')).to.equal(
+      'color: rgb(255, 255, 255) !important;'
+    );
   });
 });
diff --git a/extensions/amp-story/0.1/test/test-amp-story-cta-layer.js b/extensions/amp-story/0.1/test/test-amp-story-cta-layer.js
index 42c4f9a283c5..c23b99131697 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-cta-layer.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-cta-layer.js
@@ -16,51 +16,55 @@
 
 import {AmpStoryCtaLayer} from '../amp-story-cta-layer';
 
-describes.realWin('amp-story-cta-layer', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story'],
+describes.realWin(
+  'amp-story-cta-layer',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story'],
+    },
   },
-}, env => {
-  let win;
-  let ampStoryCtaLayer;
+  env => {
+    let win;
+    let ampStoryCtaLayer;
 
-  beforeEach(() => {
-    win = env.win;
-    const ampStoryCtaLayerEl =
-      win.document.createElement('amp-story-cta-layer');
-    win.document.body.appendChild(ampStoryCtaLayerEl);
-    ampStoryCtaLayer = new AmpStoryCtaLayer(ampStoryCtaLayerEl);
-  });
+    beforeEach(() => {
+      win = env.win;
+      const ampStoryCtaLayerEl = win.document.createElement(
+        'amp-story-cta-layer'
+      );
+      win.document.body.appendChild(ampStoryCtaLayerEl);
+      ampStoryCtaLayer = new AmpStoryCtaLayer(ampStoryCtaLayerEl);
+    });
 
-  it('should build the cta layer', () => {
-    ampStoryCtaLayer.buildCallback();
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ampStoryCtaLayer.element).to.have.class('i-amphtml-story-layer');
+    it('should build the cta layer', () => {
+      ampStoryCtaLayer.buildCallback();
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ampStoryCtaLayer.element).to.have.class('i-amphtml-story-layer');
+      });
     });
-  });
 
-  it('should add or overwrite target attribute to links', () => {
-    const ctaLink = win.document.createElement('a');
-    expect(ctaLink).to.not.have.attribute('target');
+    it('should add or overwrite target attribute to links', () => {
+      const ctaLink = win.document.createElement('a');
+      expect(ctaLink).to.not.have.attribute('target');
 
-    ampStoryCtaLayer.element.appendChild(ctaLink);
-    ampStoryCtaLayer.buildCallback();
+      ampStoryCtaLayer.element.appendChild(ctaLink);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ctaLink).to.have.attribute('target');
-      expect(ctaLink.getAttribute('target')).to.equal('_blank');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ctaLink).to.have.attribute('target');
+        expect(ctaLink.getAttribute('target')).to.equal('_blank');
+      });
     });
-  });
 
-  it('should not add target attribute to other elements', () => {
-    const elem = win.document.createElement('span');
-    ampStoryCtaLayer.element.appendChild(elem);
-    ampStoryCtaLayer.buildCallback();
+    it('should not add target attribute to other elements', () => {
+      const elem = win.document.createElement('span');
+      ampStoryCtaLayer.element.appendChild(elem);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(elem).to.not.have.attribute('target');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(elem).to.not.have.attribute('target');
+      });
     });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-story/0.1/test/test-amp-story-hint.js b/extensions/amp-story/0.1/test/test-amp-story-hint.js
index 0db0d1815b05..a6f30169db80 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-hint.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-hint.js
@@ -32,10 +32,12 @@ describes.fakeWin('amp-story hint layer', {}, env => {
     const storeService = new AmpStoryStoreService(win);
     registerServiceBuilder(win, 'story-store', () => storeService);
 
-    sandbox.stub(Services, 'vsyncFor').callsFake(
-        () => ({mutate: task => task()}));
-    sandbox.stub(Services, 'timerFor').callsFake(
-        () => ({delay: NOOP, cancel: NOOP}));
+    sandbox
+      .stub(Services, 'vsyncFor')
+      .callsFake(() => ({mutate: task => task()}));
+    sandbox
+      .stub(Services, 'timerFor')
+      .callsFake(() => ({delay: NOOP, cancel: NOOP}));
 
     host = win.document.createElement('div');
     ampStoryHint = new AmpStoryHint(win, host);
@@ -47,8 +49,9 @@ describes.fakeWin('amp-story hint layer', {}, env => {
 
   // TODO(@gmajoulet, #21618): Fails in AmpStoryHint.showHint_.
   it.skip('should be able to show navigation help overlay', () => {
-    const hideAfterTimeoutStub =
-        sandbox.stub(ampStoryHint, 'hideAfterTimeout').callsFake(NOOP);
+    const hideAfterTimeoutStub = sandbox
+      .stub(ampStoryHint, 'hideAfterTimeout')
+      .callsFake(NOOP);
 
     ampStoryHint.showNavigationOverlay();
 
@@ -62,8 +65,9 @@ describes.fakeWin('amp-story hint layer', {}, env => {
 
   // TODO(@gmajoulet, #21618): Fails in AmpStoryHint.showHint_.
   it.skip('should be able to show no previous page help overlay', () => {
-    const hideAfterTimeoutStub =
-        sandbox.stub(ampStoryHint, 'hideAfterTimeout').callsFake(NOOP);
+    const hideAfterTimeoutStub = sandbox
+      .stub(ampStoryHint, 'hideAfterTimeout')
+      .callsFake(NOOP);
 
     ampStoryHint.showFirstPageHintOverlay();
 
@@ -97,5 +101,6 @@ function getHintContainerFromHost(host) {
   }
 
   return host.lastElementChild.shadowRoot.querySelector(
-      '.i-amphtml-story-hint-container');
+    '.i-amphtml-story-hint-container'
+  );
 }
diff --git a/extensions/amp-story/0.1/test/test-amp-story-info-dialog.js b/extensions/amp-story/0.1/test/test-amp-story-info-dialog.js
index 3dda2f70e96b..151835c576de 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-info-dialog.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-info-dialog.js
@@ -27,7 +27,6 @@ import {
 import {Services} from '../../../../src/services';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.realWin('amp-story-share-menu', {amp: true}, env => {
   let moreInfoLinkUrl;
   let embedded;
@@ -82,8 +81,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
   it('should hide more info link when there is no viewer messaging', () => {
     embedded = false;
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .not.to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(
+        infoDialog.element_.querySelector(MOREINFO_CLASS)
+      ).not.to.have.class(MOREINFO_VISIBLE_CLASS);
     });
   });
 
@@ -91,8 +91,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
     moreInfoLinkUrl = null;
 
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .not.to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(
+        infoDialog.element_.querySelector(MOREINFO_CLASS)
+      ).not.to.have.class(MOREINFO_VISIBLE_CLASS);
     });
   });
 
@@ -100,8 +101,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
     moreInfoLinkUrl = 'https://example.com/more-info.html';
 
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(infoDialog.element_.querySelector(MOREINFO_CLASS)).to.have.class(
+        MOREINFO_VISIBLE_CLASS
+      );
     });
   });
 
diff --git a/extensions/amp-story/0.1/test/test-amp-story-request-service.js b/extensions/amp-story/0.1/test/test-amp-story-request-service.js
index 7fdadb135c67..92cd6463d4df 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-request-service.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-request-service.js
@@ -19,7 +19,6 @@ import {
   BOOKEND_CONFIG_ATTRIBUTE_NAME,
 } from '../amp-story-request-service';
 
-
 describes.fakeWin('amp-story-store-service', {amp: true}, env => {
   let requestService;
   let storyElement;
@@ -45,18 +44,16 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const bookendUrl = 'https://publisher.com/bookend';
 
     storyElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .withExactArgs(
-            bookendUrl,
-            {requireAmpResponseSourceOrigin: false},
-        )
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve();
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .withExactArgs(bookendUrl, {requireAmpResponseSourceOrigin: false})
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
 
     return requestService.loadBookendConfig().then(() => {
       xhrMock.verify();
@@ -68,14 +65,15 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const fetchedConfig = 'amazingConfig';
 
     storyElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve(fetchedConfig);
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(fetchedConfig);
+        },
+      })
+      .once();
 
     return requestService.loadBookendConfig().then(config => {
       expect(config).to.equal(fetchedConfig);
@@ -87,19 +85,21 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const bookendUrl = 'https://publisher.com/bookend';
 
     storyElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve();
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
 
-    return requestService.loadBookendConfig()
-        .then(() => requestService.loadBookendConfig())
-        .then(() => {
-          xhrMock.verify();
-        });
+    return requestService
+      .loadBookendConfig()
+      .then(() => requestService.loadBookendConfig())
+      .then(() => {
+        xhrMock.verify();
+      });
   });
 });
diff --git a/extensions/amp-story/0.1/test/test-amp-story-share-menu.js b/extensions/amp-story/0.1/test/test-amp-story-share-menu.js
index 47898a166559..b569161ec582 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-share-menu.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-share-menu.js
@@ -25,7 +25,6 @@ import {ShareMenu, VISIBLE_CLASS} from '../amp-story-share-menu';
 import {ShareWidget} from '../amp-story-share';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.realWin('amp-story-share-menu', {amp: true}, env => {
   let isSystemShareSupported;
   let parentEl;
@@ -81,9 +80,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
 
   it('should build the share widget when building the component', () => {
     shareWidgetMock
-        .expects('build')
-        .once()
-        .returns(win.document.createElement('div'));
+      .expects('build')
+      .once()
+      .returns(win.document.createElement('div'));
 
     shareMenu.build();
 
diff --git a/extensions/amp-story/0.1/test/test-amp-story-store-service.js b/extensions/amp-story/0.1/test/test-amp-story-store-service.js
index 79e4aac0d9cd..c8ea4cac741e 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-store-service.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-store-service.js
@@ -21,7 +21,6 @@ import {
 } from '../amp-story-store-service';
 import {EmbedMode, EmbedModeParam} from '../embed-mode';
 
-
 describes.fakeWin('amp-story-store-service', {}, env => {
   let storeService;
 
diff --git a/extensions/amp-story/0.1/test/test-amp-story-system-layer.js b/extensions/amp-story/0.1/test/test-amp-story-system-layer.js
index 14863694c4ce..045bd0018c50 100644
--- a/extensions/amp-story/0.1/test/test-amp-story-system-layer.js
+++ b/extensions/amp-story/0.1/test/test-amp-story-system-layer.js
@@ -18,10 +18,8 @@ import {Services} from '../../../../src/services';
 import {SystemLayer} from '../amp-story-system-layer';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 const NOOP = () => {};
 
-
 describes.fakeWin('amp-story system layer', {amp: true}, env => {
   let win;
   let systemLayer;
@@ -54,8 +52,9 @@ describes.fakeWin('amp-story system layer', {amp: true}, env => {
   });
 
   it.skip('should build UI', () => {
-    const initializeListeners =
-        sandbox.stub(systemLayer, 'initializeListeners_').callsFake(NOOP);
+    const initializeListeners = sandbox
+      .stub(systemLayer, 'initializeListeners_')
+      .callsFake(NOOP);
 
     const root = systemLayer.build();
 
diff --git a/extensions/amp-story/0.1/test/test-amp-story.js b/extensions/amp-story/0.1/test/test-amp-story.js
index e8465625ef47..a8d871478340 100644
--- a/extensions/amp-story/0.1/test/test-amp-story.js
+++ b/extensions/amp-story/0.1/test/test-amp-story.js
@@ -22,106 +22,115 @@ import {LocalizationService} from '../../../../src/service/localization';
 import {PaginationButtons} from '../pagination-buttons';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 const NOOP = () => {};
 const IDENTITY_FN = x => x;
 // Represents the correct value of KeyboardEvent.which for the Right Arrow
 const KEYBOARD_EVENT_WHICH_RIGHT_ARROW = 39;
 
-describes.realWin('amp-story', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story'],
+describes.realWin(
+  'amp-story',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story'],
+    },
   },
-}, env => {
-
-  let win;
-  let element;
-  let story;
-
-  /**
-   * @param {!Element} container
-   * @param {boolean=} opt_active
-   * @return {!Element}
-   */
-  function appendEmptyPage(container, opt_active) {
-    const page = document.createElement('amp-story-page');
-    page.id = '-empty-page';
-    if (opt_active) {
-      page.setAttribute('active', true);
-    }
-    container.appendChild(page);
-    return page;
-  }
-
-  /**
-   * @param {!Element} container
-   * @param {number} count
-   * @param {Array<string>=} opt_ids
-   * @return {!Array<!Element>}
-   */
-  function createPages(container, count, opt_ids) {
-    return Array(count).fill(undefined).map((unused, i) => {
-      const page = win.document.createElement('amp-story-page');
-      page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
-      page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
+  env => {
+    let win;
+    let element;
+    let story;
+
+    /**
+     * @param {!Element} container
+     * @param {boolean=} opt_active
+     * @return {!Element}
+     */
+    function appendEmptyPage(container, opt_active) {
+      const page = document.createElement('amp-story-page');
+      page.id = '-empty-page';
+      if (opt_active) {
+        page.setAttribute('active', true);
+      }
       container.appendChild(page);
       return page;
-    });
-  }
-
-  /**
-   * @param {string} eventType
-   * @return {!Event}
-   */
-  function createEvent(eventType) {
-    const eventObj = document.createEventObject ?
-      document.createEventObject() : document.createEvent('Events');
-    if (eventObj.initEvent) {
-      eventObj.initEvent(eventType, true, true);
     }
-    return eventObj;
-  }
 
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-story');
-    win.document.body.appendChild(element);
+    /**
+     * @param {!Element} container
+     * @param {number} count
+     * @param {Array<string>=} opt_ids
+     * @return {!Array<!Element>}
+     */
+    function createPages(container, count, opt_ids) {
+      return Array(count)
+        .fill(undefined)
+        .map((unused, i) => {
+          const page = win.document.createElement('amp-story-page');
+          page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
+          page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
+          container.appendChild(page);
+          return page;
+        });
+    }
 
-    const localizationService = new LocalizationService(win);
-    registerServiceBuilder(win, 'localization-v01', () => localizationService);
+    /**
+     * @param {string} eventType
+     * @return {!Event}
+     */
+    function createEvent(eventType) {
+      const eventObj = document.createEventObject
+        ? document.createEventObject()
+        : document.createEvent('Events');
+      if (eventObj.initEvent) {
+        eventObj.initEvent(eventType, true, true);
+      }
+      return eventObj;
+    }
 
-    AmpStory.isBrowserSupported = () => true;
-    story = new AmpStory(element);
-    // TODO(alanorozco): Test active page event triggers once the stubbable
-    // `Services` module is part of the amphtml-story repo.
-    // sandbox.stub(element.implementation_,
-    // 'triggerActiveEventForPage_').callsFake(NOOP);
-  });
+    beforeEach(() => {
+      win = env.win;
+      element = win.document.createElement('amp-story');
+      win.document.body.appendChild(element);
+
+      const localizationService = new LocalizationService(win);
+      registerServiceBuilder(
+        win,
+        'localization-v01',
+        () => localizationService
+      );
+
+      AmpStory.isBrowserSupported = () => true;
+      story = new AmpStory(element);
+      // TODO(alanorozco): Test active page event triggers once the stubbable
+      // `Services` module is part of the amphtml-story repo.
+      // sandbox.stub(element.implementation_,
+      // 'triggerActiveEventForPage_').callsFake(NOOP);
+    });
 
-  afterEach(() => {
-    sandbox.restore();
-    element.remove();
-  });
+    afterEach(() => {
+      sandbox.restore();
+      element.remove();
+    });
 
-  it('should build with the expected number of pages', () => {
-    const pagesCount = 2;
-    createPages(story.element, pagesCount, ['cover', 'page-1']);
+    it('should build with the expected number of pages', () => {
+      const pagesCount = 2;
+      createPages(story.element, pagesCount, ['cover', 'page-1']);
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.getPageCount()).to.equal(pagesCount);
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(story.getPageCount()).to.equal(pagesCount);
+      });
+    });
 
-  it('should activate the first page when built', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('should activate the first page when built', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    return story.layoutCallback()
+      return story
+        .layoutCallback()
         .then(() => {
           // Getting all the AmpStoryPage objets.
-          const pageElements =
-              story.element.getElementsByTagName('amp-story-page');
+          const pageElements = story.element.getElementsByTagName(
+            'amp-story-page'
+          );
           const pages = Array.from(pageElements).map(el => el.getImpl());
 
           return Promise.all(pages);
@@ -129,323 +138,339 @@ describes.realWin('amp-story', {
         .then(pages => {
           // Only the first page should be active.
           for (let i = 0; i < pages.length; i++) {
-            i === 0 ?
-              expect(pages[i].isActive()).to.be.true :
-              expect(pages[i].isActive()).to.be.false;
+            i === 0
+              ? expect(pages[i].isActive()).to.be.true
+              : expect(pages[i].isActive()).to.be.false;
           }
         });
-  });
-
-  it('should update the navigation state when built', () => {
-    const firstPageId = 'cover';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
-    const updateActivePageStub =
-        sandbox.stub(story.navigationState_, 'updateActivePage');
+    });
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(updateActivePageStub)
-              .to.have.been.calledWith(0, pageCount, firstPageId);
-        });
-  });
+    it('should update the navigation state when built', () => {
+      const firstPageId = 'cover';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
+      const updateActivePageStub = sandbox.stub(
+        story.navigationState_,
+        'updateActivePage'
+      );
+
+      return story.layoutCallback().then(() => {
+        expect(updateActivePageStub).to.have.been.calledWith(
+          0,
+          pageCount,
+          firstPageId
+        );
+      });
+    });
 
-  it('should preload the bookend if navigating to the last page', () => {
-    createPages(story.element, 1, ['cover']);
+    it('should preload the bookend if navigating to the last page', () => {
+      createPages(story.element, 1, ['cover']);
 
-    const buildBookendStub = sandbox.stub(story.bookend_, 'build');
-    const loadBookendStub =
-        sandbox.stub(story.bookend_, 'loadConfig').resolves({});
+      const buildBookendStub = sandbox.stub(story.bookend_, 'build');
+      const loadBookendStub = sandbox
+        .stub(story.bookend_, 'loadConfig')
+        .resolves({});
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildBookendStub).to.have.been.calledOnce;
-          expect(loadBookendStub).to.have.been.calledOnce;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(buildBookendStub).to.have.been.calledOnce;
+        expect(loadBookendStub).to.have.been.calledOnce;
+      });
+    });
 
-  it('should not preload the bookend if not on the last page', () => {
-    createPages(story.element, 2, ['cover']);
+    it('should not preload the bookend if not on the last page', () => {
+      createPages(story.element, 2, ['cover']);
 
-    const buildBookendStub = sandbox.stub(story.bookend_, 'build');
-    const loadBookendStub =
-        sandbox.stub(story.bookend_, 'loadConfig').resolves({});
+      const buildBookendStub = sandbox.stub(story.bookend_, 'build');
+      const loadBookendStub = sandbox
+        .stub(story.bookend_, 'loadConfig')
+        .resolves({});
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildBookendStub).to.not.have.been.called;
-          expect(loadBookendStub).to.not.have.been.called;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(buildBookendStub).to.not.have.been.called;
+        expect(loadBookendStub).to.not.have.been.called;
+      });
+    });
 
-  it('should prerender/load the share menu', () => {
-    createPages(story.element, 1, ['cover']);
+    it('should prerender/load the share menu', () => {
+      createPages(story.element, 1, ['cover']);
 
-    sandbox.stub(story.bookend_, 'build');
-    const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
+      sandbox.stub(story.bookend_, 'build');
+      const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildShareMenuStub).to.have.been.calledOnce;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(buildShareMenuStub).to.have.been.calledOnce;
+      });
+    });
 
-  it('should not prerender/load the share menu on desktop', () => {
-    createPages(story.element, 1, ['cover']);
+    it('should not prerender/load the share menu on desktop', () => {
+      createPages(story.element, 1, ['cover']);
 
-    story.storeService_.dispatch(Action.TOGGLE_DESKTOP, true);
+      story.storeService_.dispatch(Action.TOGGLE_DESKTOP, true);
 
-    sandbox.stub(story.bookend_, 'build');
-    const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
+      sandbox.stub(story.bookend_, 'build');
+      const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildShareMenuStub).to.not.have.been.called;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(buildShareMenuStub).to.not.have.been.called;
+      });
+    });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should hide bookend when CLOSE_BOOKEND is triggered', () => {
-    const hideBookendStub = sandbox.stub(
-        element.implementation_, 'hideBookend_', NOOP);
+    // TODO(#11639): Re-enable this test.
+    it.skip('should hide bookend when CLOSE_BOOKEND is triggered', () => {
+      const hideBookendStub = sandbox.stub(
+        element.implementation_,
+        'hideBookend_',
+        NOOP
+      );
 
-    appendEmptyPage(element);
+      appendEmptyPage(element);
 
-    element.build();
+      element.build();
 
-    element.dispatchEvent(new Event(EventType.CLOSE_BOOKEND));
+      element.dispatchEvent(new Event(EventType.CLOSE_BOOKEND));
 
-    expect(hideBookendStub).to.have.been.calledOnce;
-  });
+      expect(hideBookendStub).to.have.been.calledOnce;
+    });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should return a valid page index', () => {
-    const count = 5;
+    // TODO(#11639): Re-enable this test.
+    it.skip('should return a valid page index', () => {
+      const count = 5;
 
-    const pages = createPages(element, count);
+      const pages = createPages(element, count);
 
-    pages.forEach((page, i) => {
-      expect(element.implementation_.getPageIndex(page)).to.equal(i);
+      pages.forEach((page, i) => {
+        expect(element.implementation_.getPageIndex(page)).to.equal(i);
+      });
     });
-  });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should update progress bar when switching pages', () => {
-    const impl = element.implementation_;
-    const count = 10;
-    const index = 2;
+    // TODO(#11639): Re-enable this test.
+    it.skip('should update progress bar when switching pages', () => {
+      const impl = element.implementation_;
+      const count = 10;
+      const index = 2;
 
-    const page = win.document.createElement('div');
+      const page = win.document.createElement('div');
 
-    const updateProgressBarStub =
-        sandbox.stub(impl.systemLayer_, 'updateProgressBar').callsFake(NOOP);
+      const updateProgressBarStub = sandbox
+        .stub(impl.systemLayer_, 'updateProgressBar')
+        .callsFake(NOOP);
 
-    appendEmptyPage(element, /* opt_active */ true);
+      appendEmptyPage(element, /* opt_active */ true);
 
-    sandbox.stub(impl, 'getPageCount').returns(count);
-    sandbox.stub(impl, 'getPageIndex').withArgs(page).returns(index);
+      sandbox.stub(impl, 'getPageCount').returns(count);
+      sandbox
+        .stub(impl, 'getPageIndex')
+        .withArgs(page)
+        .returns(index);
 
-    impl.switchTo_(page);
+      impl.switchTo_(page);
 
-    // first page is not counted as part of the progress
-    expect(updateProgressBarStub).to.have.been.calledWith(index, count - 1);
-  });
+      // first page is not counted as part of the progress
+      expect(updateProgressBarStub).to.have.been.calledWith(index, count - 1);
+    });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should pause/resume pages when switching pages', () => {
-    const impl = element.implementation_;
-    const pages = createPages(element, 5);
-    impl.schedulePause = sandbox.spy();
-    impl.scheduleResume = sandbox.spy();
+    // TODO(#11639): Re-enable this test.
+    it.skip('should pause/resume pages when switching pages', () => {
+      const impl = element.implementation_;
+      const pages = createPages(element, 5);
+      impl.schedulePause = sandbox.spy();
+      impl.scheduleResume = sandbox.spy();
 
-    const oldPage = pages[0];
-    const newPage = pages[1];
+      const oldPage = pages[0];
+      const newPage = pages[1];
 
-    element.build();
+      element.build();
 
-    return impl.switchTo_(newPage).then(() => {
-      expect(impl.schedulePause).to.have.been.calledWith(oldPage);
-      expect(impl.scheduleResume).to.have.been.calledWith(newPage);
+      return impl.switchTo_(newPage).then(() => {
+        expect(impl.schedulePause).to.have.been.calledWith(oldPage);
+        expect(impl.scheduleResume).to.have.been.calledWith(newPage);
+      });
     });
-  });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should go to next page on right arrow keydown', () => {
-    const pages = createPages(element, 5);
+    // TODO(#11639): Re-enable this test.
+    it.skip('should go to next page on right arrow keydown', () => {
+      const pages = createPages(element, 5);
 
-    element.build();
+      element.build();
 
-    expect(pages[0].hasAttribute('active')).to.be.true;
-    expect(pages[1].hasAttribute('active')).to.be.false;
+      expect(pages[0].hasAttribute('active')).to.be.true;
+      expect(pages[1].hasAttribute('active')).to.be.false;
 
-    // Stubbing because we need to assert synchronously
-    sandbox.stub(element.implementation_, 'mutateElement').callsFake(
-        mutator => {
+      // Stubbing because we need to assert synchronously
+      sandbox
+        .stub(element.implementation_, 'mutateElement')
+        .callsFake(mutator => {
           mutator();
           return Promise.resolve();
         });
 
-    const eventObj = createEvent('keydown');
-    eventObj.key = Keys.RIGHT_ARROW;
-    eventObj.which = KEYBOARD_EVENT_WHICH_RIGHT_ARROW;
-    const docEl = win.document.documentElement;
-    docEl.dispatchEvent ?
-      docEl.dispatchEvent(eventObj) :
-      docEl.fireEvent('onkeydown', eventObj);
-
-    expect(pages[0].hasAttribute('active')).to.be.false;
-    expect(pages[1].hasAttribute('active')).to.be.true;
-  });
-
-  it('lock body when amp-story is initialized', () => {
-    story.lockBody_();
-    expect(win.document.body.style.getPropertyValue('overflow'))
-        .to.be.equal('hidden');
-    expect(win.document.documentElement.style.getPropertyValue('overflow'))
-        .to.be.equal('hidden');
-  });
-
-  it('builds and attaches pagination buttons ', () => {
-    const paginationButtonsStub = {
-      attach: sandbox.spy(),
-      onNavigationStateChange: sandbox.spy(),
-    };
-    sandbox.stub(PaginationButtons, 'create').returns(paginationButtonsStub);
-    story.buildPaginationButtonsForTesting();
-    expect(paginationButtonsStub.attach).to.have.been.calledWith(story.element);
-  });
-
-  it.skip('toggles `i-amphtml-story-landscape` based on height and width',
-      () => {
-        story.element.style.width = '11px';
-        story.element.style.height = '10px';
-        const isDesktopStub = sandbox.stub(story, 'isDesktop_').returns(false);
-        story.vsync_ = {
-          run: (task, state) => {
-            if (task.measure) {
-              task.measure(state);
-            }
-            if (task.mutate) {
-              task.mutate(state);
-            }
-          },
-        };
-        story.onResize();
-        expect(isDesktopStub).to.be.calledOnce;
-        expect(story.element.classList.contains('i-amphtml-story-landscape'))
-            .to.be.true;
-        story.element.style.width = '10px';
-        story.element.style.height = '11px';
-        story.onResize();
-        expect(isDesktopStub).to.be.calledTwice;
-        expect(story.element.classList.contains('i-amphtml-story-landscape'))
-            .to.be.false;
-      });
+      const eventObj = createEvent('keydown');
+      eventObj.key = Keys.RIGHT_ARROW;
+      eventObj.which = KEYBOARD_EVENT_WHICH_RIGHT_ARROW;
+      const docEl = win.document.documentElement;
+      docEl.dispatchEvent
+        ? docEl.dispatchEvent(eventObj)
+        : docEl.fireEvent('onkeydown', eventObj);
 
-  it('should update page id in store', () => {
-    const firstPageId = 'page-one';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
-    const dispatchStub =
-        sandbox.stub(story.storeService_, 'dispatch');
+      expect(pages[0].hasAttribute('active')).to.be.false;
+      expect(pages[1].hasAttribute('active')).to.be.true;
+    });
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(dispatchStub).to.have.been.calledWith(Action.CHANGE_PAGE, {
-            id: firstPageId,
-            index: 0,
-          });
-        });
-  });
-
-  it('should update page id in browser history', () => {
-    // Have to stub this because tests run in iframe and you can't write
-    // history from another domain (about:srcdoc)
-    const replaceStub = sandbox.stub(win.history, 'replaceState');
-    const firstPageId = 'page-zero';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
-
-    story.buildCallback();
-    return story.layoutCallback()
-        .then(() => {
-          return expect(replaceStub).to.have.been.calledWith(
-              {ampStoryPageId: firstPageId},
-              '',
-          );
-        });
-  });
-
-  it('should NOT update page id in browser history if ad', () => {
-    // Have to stub this because tests run in iframe and you can't write
-    // history from another domain (about:srcdoc)
-    const replaceStub = sandbox.stub(win.history, 'replaceState');
-    const firstPageId = 'i-amphtml-ad-page-1';
-    const pageCount = 2;
-    const pages = createPages(story.element, pageCount,
-        [firstPageId, 'page-1']);
-    const firstPage = pages[0];
-    firstPage.setAttribute('ad', '');
-
-    story.buildCallback();
-    return story.layoutCallback()
-        .then(() => {
-          return expect(replaceStub).to.not.have.been.called;
+    it('lock body when amp-story is initialized', () => {
+      story.lockBody_();
+      expect(win.document.body.style.getPropertyValue('overflow')).to.be.equal(
+        'hidden'
+      );
+      expect(
+        win.document.documentElement.style.getPropertyValue('overflow')
+      ).to.be.equal('hidden');
+    });
+
+    it('builds and attaches pagination buttons ', () => {
+      const paginationButtonsStub = {
+        attach: sandbox.spy(),
+        onNavigationStateChange: sandbox.spy(),
+      };
+      sandbox.stub(PaginationButtons, 'create').returns(paginationButtonsStub);
+      story.buildPaginationButtonsForTesting();
+      expect(paginationButtonsStub.attach).to.have.been.calledWith(
+        story.element
+      );
+    });
+
+    it.skip('toggles `i-amphtml-story-landscape` based on height and width', () => {
+      story.element.style.width = '11px';
+      story.element.style.height = '10px';
+      const isDesktopStub = sandbox.stub(story, 'isDesktop_').returns(false);
+      story.vsync_ = {
+        run: (task, state) => {
+          if (task.measure) {
+            task.measure(state);
+          }
+          if (task.mutate) {
+            task.mutate(state);
+          }
+        },
+      };
+      story.onResize();
+      expect(isDesktopStub).to.be.calledOnce;
+      expect(story.element.classList.contains('i-amphtml-story-landscape')).to
+        .be.true;
+      story.element.style.width = '10px';
+      story.element.style.height = '11px';
+      story.onResize();
+      expect(isDesktopStub).to.be.calledTwice;
+      expect(story.element.classList.contains('i-amphtml-story-landscape')).to
+        .be.false;
+    });
+
+    it('should update page id in store', () => {
+      const firstPageId = 'page-one';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
+      const dispatchStub = sandbox.stub(story.storeService_, 'dispatch');
+
+      return story.layoutCallback().then(() => {
+        expect(dispatchStub).to.have.been.calledWith(Action.CHANGE_PAGE, {
+          id: firstPageId,
+          index: 0,
         });
-  });
-});
+      });
+    });
 
+    it('should update page id in browser history', () => {
+      // Have to stub this because tests run in iframe and you can't write
+      // history from another domain (about:srcdoc)
+      const replaceStub = sandbox.stub(win.history, 'replaceState');
+      const firstPageId = 'page-zero';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
+
+      story.buildCallback();
+      return story.layoutCallback().then(() => {
+        return expect(replaceStub).to.have.been.calledWith(
+          {ampStoryPageId: firstPageId},
+          ''
+        );
+      });
+    });
 
-describes.realWin('amp-story origin whitelist', {
-  amp: {
-    extensions: ['amp-story'],
+    it('should NOT update page id in browser history if ad', () => {
+      // Have to stub this because tests run in iframe and you can't write
+      // history from another domain (about:srcdoc)
+      const replaceStub = sandbox.stub(win.history, 'replaceState');
+      const firstPageId = 'i-amphtml-ad-page-1';
+      const pageCount = 2;
+      const pages = createPages(story.element, pageCount, [
+        firstPageId,
+        'page-1',
+      ]);
+      const firstPage = pages[0];
+      firstPage.setAttribute('ad', '');
+
+      story.buildCallback();
+      return story.layoutCallback().then(() => {
+        return expect(replaceStub).to.not.have.been.called;
+      });
+    });
+  }
+);
+
+describes.realWin(
+  'amp-story origin whitelist',
+  {
+    amp: {
+      extensions: ['amp-story'],
+    },
   },
-}, env => {
-  let win;
-  let element;
-  let story;
-
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-story');
-    win.document.body.appendChild(element);
-
-    story = new AmpStory(element);
-    story.hashOrigin_ = IDENTITY_FN;
-  });
-
-  it('should allow exact whitelisted origin with https scheme', () => {
-    story.originWhitelist_ = ['example.com'];
-    expect(story.isOriginWhitelisted_('https://example.com')).to.be.true;
-  });
-
-  it('should allow exact whitelisted origin with http scheme', () => {
-    story.originWhitelist_ = ['example.com'];
-    expect(story.isOriginWhitelisted_('http://example.com')).to.be.true;
-  });
-
-  it('should allow www subdomain of origin', () => {
-    story.originWhitelist_ = ['example.com'];
-    expect(story.isOriginWhitelisted_('https://www.example.com')).to.be.true;
-  });
-
-  it('should allow subdomain of origin', () => {
-    story.originWhitelist_ = ['example.com'];
-    expect(story.isOriginWhitelisted_('https://foobar.example.com')).to.be.true;
-  });
-
-  it('should not allow exact whitelisted domain under different tld', () => {
-    story.originWhitelist_ = ['example.com'];
-    expect(story.isOriginWhitelisted_('https://example.co.uk')).to.be.false;
-  });
-
-  it('should not allow exact whitelisted domain infixed in another tld', () => {
-    story.originWhitelist_ = ['example.co.uk'];
-    expect(story.isOriginWhitelisted_('https://example.co')).to.be.false;
-  });
-
-  it('should not allow domain that contains whitelisted domain', () => {
-    story.originWhitelist_ = ['example.co'];
-    expect(story.isOriginWhitelisted_('https://example.co.uk')).to.be.false;
-  });
-});
+  env => {
+    let win;
+    let element;
+    let story;
+
+    beforeEach(() => {
+      win = env.win;
+      element = win.document.createElement('amp-story');
+      win.document.body.appendChild(element);
+
+      story = new AmpStory(element);
+      story.hashOrigin_ = IDENTITY_FN;
+    });
+
+    it('should allow exact whitelisted origin with https scheme', () => {
+      story.originWhitelist_ = ['example.com'];
+      expect(story.isOriginWhitelisted_('https://example.com')).to.be.true;
+    });
+
+    it('should allow exact whitelisted origin with http scheme', () => {
+      story.originWhitelist_ = ['example.com'];
+      expect(story.isOriginWhitelisted_('http://example.com')).to.be.true;
+    });
+
+    it('should allow www subdomain of origin', () => {
+      story.originWhitelist_ = ['example.com'];
+      expect(story.isOriginWhitelisted_('https://www.example.com')).to.be.true;
+    });
+
+    it('should allow subdomain of origin', () => {
+      story.originWhitelist_ = ['example.com'];
+      expect(story.isOriginWhitelisted_('https://foobar.example.com')).to.be
+        .true;
+    });
+
+    it('should not allow exact whitelisted domain under different tld', () => {
+      story.originWhitelist_ = ['example.com'];
+      expect(story.isOriginWhitelisted_('https://example.co.uk')).to.be.false;
+    });
+
+    it('should not allow exact whitelisted domain infixed in another tld', () => {
+      story.originWhitelist_ = ['example.co.uk'];
+      expect(story.isOriginWhitelisted_('https://example.co')).to.be.false;
+    });
+
+    it('should not allow domain that contains whitelisted domain', () => {
+      story.originWhitelist_ = ['example.co'];
+      expect(story.isOriginWhitelisted_('https://example.co.uk')).to.be.false;
+    });
+  }
+);
diff --git a/extensions/amp-story/0.1/test/test-analytics.js b/extensions/amp-story/0.1/test/test-analytics.js
index 22100a83b0a6..eecc430256fe 100644
--- a/extensions/amp-story/0.1/test/test-analytics.js
+++ b/extensions/amp-story/0.1/test/test-analytics.js
@@ -16,7 +16,6 @@
 import {AmpStoryAnalytics} from '../analytics';
 import {StateChangeType} from '../navigation-state';
 
-
 describes.fakeWin('amp-story analytics', {}, env => {
   let analytics;
   let rootEl;
diff --git a/extensions/amp-story/0.1/test/test-full-bleed-animations.js b/extensions/amp-story/0.1/test/test-full-bleed-animations.js
index dc898eb39202..f0e165d232ba 100644
--- a/extensions/amp-story/0.1/test/test-full-bleed-animations.js
+++ b/extensions/amp-story/0.1/test/test-full-bleed-animations.js
@@ -26,202 +26,232 @@ import {
   targetFitsWithinPage,
 } from '../animation-presets-utils';
 
-describes.realWin('amp-story-full-bleed-animations', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story'],
+describes.realWin(
+  'amp-story-full-bleed-animations',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story'],
+    },
   },
-}, env => {
-  let win;
-  let storyElem;
-  let ampStory;
-
-  beforeEach(() => {
-    win = env.win;
-    storyElem = win.document.createElement('amp-story');
-    win.document.body.appendChild(storyElem);
-    AmpStory.isBrowserSupported = () => true;
-    ampStory = new AmpStory(storyElem);
-  });
-
-  afterEach(() => {
-    storyElem.remove();
-  });
-
-  /**
-   * @param {!Element} container
-   * @param {number} count
-   * @param {Array<string>=} opt_ids
-   * @return {!Array<!Element>}
-   */
-  function createPages(container, count, opt_ids) {
-    return Array(count).fill(undefined).map((unused, i) => {
-      const page = win.document.createElement('amp-story-page');
-      page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
-      page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
-      container.appendChild(page);
-      return page;
+  env => {
+    let win;
+    let storyElem;
+    let ampStory;
+
+    beforeEach(() => {
+      win = env.win;
+      storyElem = win.document.createElement('amp-story');
+      win.document.body.appendChild(storyElem);
+      AmpStory.isBrowserSupported = () => true;
+      ampStory = new AmpStory(storyElem);
     });
-  }
 
-  /**
-   * @param {!Element} container
-   * @param {string} animationName
-   * @param {string=} opt_gridLayerTempalate
-   */
-  function addAnimationToImage(container, animationName,
-    opt_gridLayerTempalate) {
-    const img = win.document.createElement('amp-img');
-    img.setAttribute('animate-in', animationName);
-
-    const gridLayer = win.document.createElement('amp-story-grid-layer');
-    opt_gridLayerTempalate = opt_gridLayerTempalate.length ?
-      opt_gridLayerTempalate : 'fill';
-    gridLayer.setAttribute('template', opt_gridLayerTempalate);
-
-    gridLayer.appendChild(img);
-    container.appendChild(gridLayer);
-  }
+    afterEach(() => {
+      storyElem.remove();
+    });
 
-  it('Should add corresponding CSS class when a full bleed animation target is'
-  + ' attached as a child of a grid layer with fill template.', () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-            ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a full-bleed animation inside a grid-
-          // layer with a `fill` template of the first page.
-          addAnimationToImage(pages[1].element, 'pan-down', 'fill');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
-          });
+    /**
+     * @param {!Element} container
+     * @param {number} count
+     * @param {Array<string>=} opt_ids
+     * @return {!Array<!Element>}
+     */
+    function createPages(container, count, opt_ids) {
+      return Array(count)
+        .fill(undefined)
+        .map((unused, i) => {
+          const page = win.document.createElement('amp-story-page');
+          page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
+          page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
+          container.appendChild(page);
+          return page;
         });
-  });
+    }
 
-  it('Should not add additional CSS class to the target when a full-bleed ' +
-     'animation is used BUT the target is a child of a grid layer with a ' +
-     'template other than `fill`.',
-  () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-                ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a full-bleed animation inside a grid-
-          // layer with a template other than fill.
-          addAnimationToImage(pages[1].element, 'fade-in', 'vertical');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.not.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
+    /**
+     * @param {!Element} container
+     * @param {string} animationName
+     * @param {string=} opt_gridLayerTempalate
+     */
+    function addAnimationToImage(
+      container,
+      animationName,
+      opt_gridLayerTempalate
+    ) {
+      const img = win.document.createElement('amp-img');
+      img.setAttribute('animate-in', animationName);
+
+      const gridLayer = win.document.createElement('amp-story-grid-layer');
+      opt_gridLayerTempalate = opt_gridLayerTempalate.length
+        ? opt_gridLayerTempalate
+        : 'fill';
+      gridLayer.setAttribute('template', opt_gridLayerTempalate);
+
+      gridLayer.appendChild(img);
+      container.appendChild(gridLayer);
+    }
+
+    it(
+      'Should add corresponding CSS class when a full bleed animation target is' +
+        ' attached as a child of a grid layer with fill template.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a full-bleed animation inside a grid-
+            // layer with a `fill` template of the first page.
+            addAnimationToImage(pages[1].element, 'pan-down', 'fill');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
           });
-        });
-  });
-
-  it('Should not add additional CSS class to the target when a non-full-bleed' +
-     'animation is used.', () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-            ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a non-full-bleed animation.
-          addAnimationToImage(pages[1].element, 'fade-in', 'fill');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.not.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
+      }
+    );
+
+    it(
+      'Should not add additional CSS class to the target when a full-bleed ' +
+        'animation is used BUT the target is a child of a grid layer with a ' +
+        'template other than `fill`.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a full-bleed animation inside a grid-
+            // layer with a template other than fill.
+            addAnimationToImage(pages[1].element, 'fade-in', 'vertical');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.not.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
           });
-        });
-  });
-});
+      }
+    );
+
+    it(
+      'Should not add additional CSS class to the target when a non-full-bleed' +
+        'animation is used.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a non-full-bleed animation.
+            addAnimationToImage(pages[1].element, 'fade-in', 'fill');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.not.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
+          });
+      }
+    );
+  }
+);
 
-describes.realWin('amp-story-animations-utils', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story'],
+describes.realWin(
+  'amp-story-animations-utils',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story'],
+    },
   },
-}, () => {
-  /**
-   * @param {number} pageW
-   * @param {number} pageH
-   * @param {number} targetW
-   * @param {number} targetH
-   * @return {!StoryAnimationDimsDef}
-   */
-  function setDimensions(pageW, pageH, targetW, targetH) {
-    return /** @type {!StoryAnimationDimsDef} */ ({
-      pageWidth: pageW,
-      pageHeight: pageH,
-      targetWidth: targetW,
-      targetHeight: targetH,
-      targetX: 0,
-      targetY: 0,
+  () => {
+    /**
+     * @param {number} pageW
+     * @param {number} pageH
+     * @param {number} targetW
+     * @param {number} targetH
+     * @return {!StoryAnimationDimsDef}
+     */
+    function setDimensions(pageW, pageH, targetW, targetH) {
+      return /** @type {!StoryAnimationDimsDef} */ ({
+        pageWidth: pageW,
+        pageHeight: pageH,
+        targetWidth: targetW,
+        targetHeight: targetH,
+        targetX: 0,
+        targetY: 0,
+      });
+    }
+
+    it('Should fit target same size as the screen.', () => {
+      const dimensions = setDimensions(380, 580, 360, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
     });
-  }
 
-  it('Should fit target same size as the screen.', () => {
-    const dimensions = setDimensions(380 , 580, 360, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-  });
-
-  it('Should fit target with bigger width but same height as screen.', () => {
-    const dimensions = setDimensions(380, 580, 400, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-  });
-
-  it('Should not fit target with larger width and height than screen.', () => {
-    const dimensions = setDimensions(380, 580, 400, 600);
-    expect(targetFitsWithinPage(dimensions)).to.be.false;
-  });
-
-  it('Should scale the target accordingly.', () => {
-    const dimensions = setDimensions(380, 580, 360, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-
-    const factorThatWillMakeTargetFitPage = 380 / 360;
-    const factor = factorThatWillMakeTargetFitPage * 1.25;
-    expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
-
-    const calculatedKeyframes = PRESETS['pan-up'];
-    calculatedKeyframes.keyframes = calculatedKeyframes.keyframes(dimensions);
-
-    const offsetX = -dimensions.targetWidth / 2;
-    const offsetY = dimensions.pageHeight - dimensions.targetHeight;
-
-    const expectedKeyframes = [
-      {
-        'transform': `translate(${offsetX}px, ${offsetY}px) scale(${factor})`,
-        'transform-origin': 'left top',
-      },
-      {
-        'transform': `translate(${offsetX}px, 0px) scale(${factor})`,
-        'transform-origin': 'left top',
-      },
-    ];
-
-    expect(calculatedKeyframes.keyframes).to.deep.equal(expectedKeyframes);
-  });
-
-});
+    it('Should fit target with bigger width but same height as screen.', () => {
+      const dimensions = setDimensions(380, 580, 400, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
+    });
+
+    it('Should not fit target with larger width and height than screen.', () => {
+      const dimensions = setDimensions(380, 580, 400, 600);
+      expect(targetFitsWithinPage(dimensions)).to.be.false;
+    });
+
+    it('Should scale the target accordingly.', () => {
+      const dimensions = setDimensions(380, 580, 360, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
+
+      const factorThatWillMakeTargetFitPage = 380 / 360;
+      const factor = factorThatWillMakeTargetFitPage * 1.25;
+      expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
+
+      const calculatedKeyframes = PRESETS['pan-up'];
+      calculatedKeyframes.keyframes = calculatedKeyframes.keyframes(dimensions);
+
+      const offsetX = -dimensions.targetWidth / 2;
+      const offsetY = dimensions.pageHeight - dimensions.targetHeight;
+
+      const expectedKeyframes = [
+        {
+          'transform': `translate(${offsetX}px, ${offsetY}px) scale(${factor})`,
+          'transform-origin': 'left top',
+        },
+        {
+          'transform': `translate(${offsetX}px, 0px) scale(${factor})`,
+          'transform-origin': 'left top',
+        },
+      ];
+
+      expect(calculatedKeyframes.keyframes).to.deep.equal(expectedKeyframes);
+    });
+  }
+);
diff --git a/extensions/amp-story/0.1/test/test-media-pool.js b/extensions/amp-story/0.1/test/test-media-pool.js
index 1c66c385ee0a..2e8313e43cbe 100644
--- a/extensions/amp-story/0.1/test/test-media-pool.js
+++ b/extensions/amp-story/0.1/test/test-media-pool.js
@@ -30,10 +30,10 @@ describes.realWin('media-pool', {}, env => {
 
   beforeEach(() => {
     win = env.win;
-    sandbox.stub(Services, 'vsyncFor')
-        .callsFake(() => ({mutate: task => task()}));
-    sandbox.stub(Services, 'timerFor')
-        .callsFake(() => ({delay: NOOP}));
+    sandbox
+      .stub(Services, 'vsyncFor')
+      .callsFake(() => ({mutate: task => task()}));
+    sandbox.stub(Services, 'timerFor').callsFake(() => ({delay: NOOP}));
 
     mediaPool = new MediaPool(win, COUNTS, element => {
       return distanceFnStub(element);
@@ -136,11 +136,11 @@ describes.realWin('media-pool', {}, env => {
     elements.forEach(element => mediaPool.play(element));
 
     expect(mediaPool.allocated['video'].length).to.equal(2);
-    expect(isElementInPool(mediaPool.allocated['video'], elements[0]))
-        .to.be.true;
-    expect(isElementInPool(mediaPool.allocated['video'], elements[1]))
-        .to.be.true;
-    expect(isElementInPool(mediaPool.allocated['video'], elements[2]))
-        .to.be.false;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[0])).to.be
+      .true;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[1])).to.be
+      .true;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[2])).to.be
+      .false;
   });
 });
diff --git a/extensions/amp-story/0.1/test/test-media-tasks.js b/extensions/amp-story/0.1/test/test-media-tasks.js
index c205a6f6520c..14c4b0aac554 100644
--- a/extensions/amp-story/0.1/test/test-media-tasks.js
+++ b/extensions/amp-story/0.1/test/test-media-tasks.js
@@ -40,8 +40,9 @@ describes.realWin('media-tasks', {}, () => {
     vsyncApi = {
       mutatePromise: () => {},
     };
-    sandbox.stub(vsyncApi, 'mutatePromise').resolves(callback => {callback();});
-
+    sandbox.stub(vsyncApi, 'mutatePromise').resolves(callback => {
+      callback();
+    });
   });
 
   describe('PauseTask', () => {
diff --git a/extensions/amp-story/0.1/test/test-navigation-state.js b/extensions/amp-story/0.1/test/test-navigation-state.js
index 36eff331c9c9..1d3062ebe089 100644
--- a/extensions/amp-story/0.1/test/test-navigation-state.js
+++ b/extensions/amp-story/0.1/test/test-navigation-state.js
@@ -17,7 +17,6 @@ import {Action, AmpStoryStoreService} from '../amp-story-store-service';
 import {NavigationState, StateChangeType} from '../navigation-state';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
   let navigationState;
   let hasBookend = false;
@@ -27,47 +26,67 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
     storeService = new AmpStoryStoreService(env.win);
     registerServiceBuilder(env.win, 'story-store', () => storeService);
     hasBookend = false;
-    navigationState = new NavigationState(env.win,
-        // Not using `Promise.resolve` since we need synchronicity.
-        () => ({then(fn) { fn(hasBookend); }}));
+    navigationState = new NavigationState(
+      env.win,
+      // Not using `Promise.resolve` since we need synchronicity.
+      () => ({
+        then(fn) {
+          fn(hasBookend);
+        },
+      })
+    );
   });
 
   it('should dispatch active page changes to all observers', () => {
-    const observers = Array(5).fill(undefined).map(() => sandbox.spy());
+    const observers = Array(5)
+      .fill(undefined)
+      .map(() => sandbox.spy());
 
     observers.forEach(observer => navigationState.observe(observer));
 
     navigationState.updateActivePage(0, 10, 'my-page-id-1');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 0
-              && e.value.totalPages === 10
-              && e.value.pageId == 'my-page-id-1'
-              && e.value.storyProgress === 0));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 0 &&
+            e.value.totalPages === 10 &&
+            e.value.pageId == 'my-page-id-1' &&
+            e.value.storyProgress === 0
+        )
+      );
     });
 
     navigationState.updateActivePage(5, 15, 'foo');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 5
-              && e.value.totalPages === 15
-              && e.value.pageId === 'foo'
-              && e.value.storyProgress === (1 / 3)));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 5 &&
+            e.value.totalPages === 15 &&
+            e.value.pageId === 'foo' &&
+            e.value.storyProgress === 1 / 3
+        )
+      );
     });
 
     navigationState.updateActivePage(2, 5, 'one-two-three');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 2
-              && e.value.totalPages === 5
-              && e.value.pageId == 'one-two-three'
-              && e.value.storyProgress === 0.4));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 2 &&
+            e.value.totalPages === 5 &&
+            e.value.pageId == 'one-two-three' &&
+            e.value.storyProgress === 0.4
+        )
+      );
     });
   });
 
@@ -80,13 +99,18 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
 
     navigationState.updateActivePage(1, 2);
 
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.ACTIVE_PAGE
-          && e.value.pageIndex === 1
-          && e.value.totalPages === 2));
-
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.END));
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(
+        e =>
+          e.type == StateChangeType.ACTIVE_PAGE &&
+          e.value.pageIndex === 1 &&
+          e.value.totalPages === 2
+      )
+    );
+
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(e => e.type == StateChangeType.END)
+    );
   });
 
   it('should NOT dispatch END on last page if story has bookend', () => {
@@ -98,13 +122,18 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
 
     navigationState.updateActivePage(1, 2);
 
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.ACTIVE_PAGE
-          && e.value.pageIndex === 1
-          && e.value.totalPages === 2));
-
-    expect(observer).to.not.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.END));
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(
+        e =>
+          e.type == StateChangeType.ACTIVE_PAGE &&
+          e.value.pageIndex === 1 &&
+          e.value.totalPages === 2
+      )
+    );
+
+    expect(observer).to.not.have.been.calledWith(
+      sandbox.match(e => e.type == StateChangeType.END)
+    );
   });
 
   it('should dispatch BOOKEND_ENTER/END and BOOKEND_EXIT', () => {
diff --git a/extensions/amp-story/0.1/test/test-origin-whitelist.js b/extensions/amp-story/0.1/test/test-origin-whitelist.js
index 156c00b092f1..131eb3c01fc6 100644
--- a/extensions/amp-story/0.1/test/test-origin-whitelist.js
+++ b/extensions/amp-story/0.1/test/test-origin-whitelist.js
@@ -28,9 +28,10 @@ describes.fakeWin('amp-story origin whitelist', {}, () => {
       return origins;
     }, []);
 
-    expect(hasDuplicates,
-        'Origin list should be:' +
-        `\n\n[\n  '${originList.join('\',\n  \'')}',\n];\n`)
-        .to.be.false;
+    expect(
+      hasDuplicates,
+      'Origin list should be:' +
+        `\n\n[\n  '${originList.join("',\n  '")}',\n];\n`
+    ).to.be.false;
   });
 });
diff --git a/extensions/amp-story/0.1/test/test-utils.js b/extensions/amp-story/0.1/test/test-utils.js
index 39c6f6466ff5..7b8fdd905f34 100644
--- a/extensions/amp-story/0.1/test/test-utils.js
+++ b/extensions/amp-story/0.1/test/test-utils.js
@@ -54,13 +54,19 @@ describes.fakeWin('amp-story utils', {}, () => {
 
   describe('getRGBFromCssColorValue', () => {
     it('should accept rgb parameters', () => {
-      expect(getRGBFromCssColorValue('rgb(0, 10, 100)'))
-          .to.deep.equal({r: 0, g: 10, b: 100});
+      expect(getRGBFromCssColorValue('rgb(0, 10, 100)')).to.deep.equal({
+        r: 0,
+        g: 10,
+        b: 100,
+      });
     });
 
     it('should accept rgba parameters', () => {
-      expect(getRGBFromCssColorValue('rgba(0, 10, 100, 0.1)'))
-          .to.deep.equal({r: 0, g: 10, b: 100});
+      expect(getRGBFromCssColorValue('rgba(0, 10, 100, 0.1)')).to.deep.equal({
+        r: 0,
+        g: 10,
+        b: 100,
+      });
     });
 
     it('should throw an error if wrong parameters', () => {
@@ -71,8 +77,11 @@ describes.fakeWin('amp-story utils', {}, () => {
 
     it('should return a default value if wrong parameters', () => {
       allowConsoleError(() => {
-        expect(getRGBFromCssColorValue('who dis'))
-            .to.deep.equal({r: 0, g: 0, b: 0});
+        expect(getRGBFromCssColorValue('who dis')).to.deep.equal({
+          r: 0,
+          g: 0,
+          b: 0,
+        });
       });
     });
   });
@@ -87,4 +96,3 @@ describes.fakeWin('amp-story utils', {}, () => {
     });
   });
 });
-
diff --git a/extensions/amp-story/0.1/test/test-variable-service.js b/extensions/amp-story/0.1/test/test-variable-service.js
index 632476dcc5c6..721a8fc388ba 100644
--- a/extensions/amp-story/0.1/test/test-variable-service.js
+++ b/extensions/amp-story/0.1/test/test-variable-service.js
@@ -16,7 +16,6 @@
 import {AmpStoryVariableService} from '../variable-service';
 import {StateChangeType} from '../navigation-state';
 
-
 describes.fakeWin('amp-story variable service', {}, () => {
   let variableService;
 
diff --git a/extensions/amp-story/0.1/toast.js b/extensions/amp-story/0.1/toast.js
index 51b09badc249..3330851e8feb 100644
--- a/extensions/amp-story/0.1/toast.js
+++ b/extensions/amp-story/0.1/toast.js
@@ -16,18 +16,15 @@
 import {Services} from '../../../src/services';
 import {createElementWithAttributes, removeElement} from '../../../src/dom';
 
-
 /** @private @const {string} */
 const TOAST_CLASSNAME = 'i-amphtml-story-toast';
 
-
 /**
  * Should be higher than total animation time.
  * @private @const {number}
  */
 const TOAST_VISIBLE_TIME_MS = 2600;
 
-
 /**
  * UI notifications service, displaying a message to the user for a limited
  * amount of time.
@@ -38,8 +35,11 @@ export class Toast {
    * @param {!Node|string} childNodeOrText
    */
   static show(win, childNodeOrText) {
-    const toast = createElementWithAttributes(win.document, 'div',
-        /** @type {!JsonObject} */ ({'class': TOAST_CLASSNAME}));
+    const toast = createElementWithAttributes(
+      win.document,
+      'div',
+      /** @type {!JsonObject} */ ({'class': TOAST_CLASSNAME})
+    );
 
     if (typeof childNodeOrText == 'string') {
       toast.textContent = childNodeOrText;
@@ -49,7 +49,9 @@ export class Toast {
 
     win.document.body.appendChild(toast);
 
-    Services.timerFor(win)
-        .delay(() => removeElement(toast), TOAST_VISIBLE_TIME_MS);
+    Services.timerFor(win).delay(
+      () => removeElement(toast),
+      TOAST_VISIBLE_TIME_MS
+    );
   }
 }
diff --git a/extensions/amp-story/0.1/utils.js b/extensions/amp-story/0.1/utils.js
index ea41f473001f..d7ddefae5b5a 100644
--- a/extensions/amp-story/0.1/utils.js
+++ b/extensions/amp-story/0.1/utils.js
@@ -33,15 +33,14 @@ export function timeStrToMillis(time) {
   const units = match[2];
 
   userAssert(
-      match &&
-          match.length == 3 &&
-          (units == 's' || units == 'ms'),
-      'Invalid time string %s', time);
+    match && match.length == 3 && (units == 's' || units == 'ms'),
+    'Invalid time string %s',
+    time
+  );
 
   return units == 's' ? parseFloat(num) * 1000 : parseInt(num, 10);
 }
 
-
 /**
  * Determines whether the specified element has an action for its on="tap:..."
  * handler.
@@ -51,11 +50,11 @@ export function timeStrToMillis(time) {
 export function hasTapAction(el) {
   // There are better ways to determine this, but they're all bound to action
   // service race conditions. This is good enough for our use case.
-  return el.hasAttribute('on') &&
-      !!el.getAttribute('on').match(/(^|;)\s*tap\s*:/);
+  return (
+    el.hasAttribute('on') && !!el.getAttribute('on').match(/(^|;)\s*tap\s*:/)
+  );
 }
 
-
 /**
  * Calculates a client rect without applying scaling transformations.
  * Note: must be run in a vsync measure context.
@@ -63,10 +62,10 @@ export function hasTapAction(el) {
  * @return {!ClientRect}
  */
 export function unscaledClientRect(el) {
-  const {width, height, left, top} = el./*OK*/getBoundingClientRect();
+  const {width, height, left, top} = el./*OK*/ getBoundingClientRect();
 
-  const scaleFactorX = width == 0 ? 1 : width / el./*OK*/offsetWidth;
-  const scaleFactorY = height == 0 ? 1 : height / el./*OK*/offsetHeight;
+  const scaleFactorX = width == 0 ? 1 : width / el./*OK*/ offsetWidth;
+  const scaleFactorY = height == 0 ? 1 : height / el./*OK*/ offsetHeight;
 
   return /** @type {!ClientRect} */ ({
     left: left / scaleFactorX,
@@ -76,7 +75,6 @@ export function unscaledClientRect(el) {
   });
 }
 
-
 /**
  * Finds an amp-video/amp-audio ancestor.
  * @param {!Element} el
@@ -86,7 +84,6 @@ export function ampMediaElementFor(el) {
   return closestAncestorElementBySelector(el, 'amp-video, amp-audio');
 }
 
-
 /**
  * Creates a shadow root for the provided container, and appends the element
  * along with its CSS.
@@ -99,7 +96,7 @@ export function createShadowRootWithStyle(container, element, css) {
   const shadowRoot = createShadowRoot(container);
 
   const style = self.document.createElement('style');
-  style./*OK*/textContent = css;
+  style./*OK*/ textContent = css;
 
   shadowRoot.appendChild(style);
   shadowRoot.appendChild(element);
@@ -107,7 +104,6 @@ export function createShadowRootWithStyle(container, element, css) {
   return shadowRoot;
 }
 
-
 /**
  * Parses the resolved CSS color property, that is always in the form of
  * `rgba(0, 0, 0, 1)` or `rgb(0, 0, 0)`, that can be retrieved using
@@ -120,8 +116,11 @@ export function getRGBFromCssColorValue(cssValue) {
   const regexPattern = /rgba?\((\d{1,3}), (\d{1,3}), (\d{1,3})/;
 
   if (!cssValue.match(regexPattern)) {
-    user().error('UTILS', 'getRGBFromCssColorValue expects a parameter in ' +
-        `the form of 'rgba(0, 0, 0, 1)' or 'rgb(0, 0, 0)' but got ${cssValue}`);
+    user().error(
+      'UTILS',
+      'getRGBFromCssColorValue expects a parameter in ' +
+        `the form of 'rgba(0, 0, 0, 1)' or 'rgb(0, 0, 0)' but got ${cssValue}`
+    );
     // Returns a fallback value, to fail 'gracefully' in case a browser we don't
     // know about gave an unexpected value.
     return {r: 0, g: 0, b: 0};
@@ -136,7 +135,6 @@ export function getRGBFromCssColorValue(cssValue) {
   };
 }
 
-
 /**
  * Returns the color, either black or white, that has the best contrast ratio
  * against the provided RGB 8bit values.
@@ -158,7 +156,7 @@ export function getTextColorForRGB({r, g, b}) {
   const linearG = getLinearRGBValue(g);
   const linearB = getLinearRGBValue(b);
 
-  const L = (0.2126 * linearR) + (0.7152 * linearG) + (0.0722 * linearB);
+  const L = 0.2126 * linearR + 0.7152 * linearG + 0.0722 * linearB;
 
   // Determines which one of the white and black text have a better contrast
   // ratio against the used background color.
diff --git a/extensions/amp-story/0.1/variable-service.js b/extensions/amp-story/0.1/variable-service.js
index f9cfcc5eea25..647883aa4a47 100644
--- a/extensions/amp-story/0.1/variable-service.js
+++ b/extensions/amp-story/0.1/variable-service.js
@@ -21,7 +21,6 @@ import {dict} from '../../../src/utils/object';
  */
 export let StoryVariableDef;
 
-
 /** @enum {string} */
 const Variable = {
   STORY_PAGE_ID: 'storyPageId',
@@ -31,7 +30,6 @@ const Variable = {
   STORY_PROGRESS: 'storyProgress',
 };
 
-
 /**
  * Variable service for amp-story.
  * Used for URL replacement service. See usage in src/url-replacements-impl.
@@ -57,8 +55,12 @@ export class AmpStoryVariableService {
   onNavigationStateChange(stateChangeEvent) {
     switch (stateChangeEvent.type) {
       case StateChangeType.ACTIVE_PAGE:
-        const {pageIndex, pageId, storyProgress, totalPages} =
-            stateChangeEvent.value;
+        const {
+          pageIndex,
+          pageId,
+          storyProgress,
+          totalPages,
+        } = stateChangeEvent.value;
         this.variables_[Variable.STORY_PAGE_INDEX] = pageIndex;
         this.variables_[Variable.STORY_PAGE_ID] = pageId;
         this.variables_[Variable.STORY_PROGRESS] = storyProgress;
diff --git a/extensions/amp-story/1.0/_locales/af.js b/extensions/amp-story/1.0/_locales/af.js
index 19a553d4665e..39e8912504cb 100644
--- a/extensions/amp-story/1.0/_locales/af.js
+++ b/extensions/amp-story/1.0/_locales/af.js
@@ -111,22 +111,25 @@ const strings = {
     string: 'Maak jou venster se hoogte groter om hierdie ervaring te bekyk',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Maak sowel die hoogte as breedte van jou venster groter om ' +
-        'hierdie ervaring te bekyk',
+    string:
+      'Maak sowel die hoogte as breedte van jou venster groter om ' +
+      'hierdie ervaring te bekyk',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Maak jou venster se breedte groter om hierdie ervaring te bekyk',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Jy moet die AMP-storie-eksperiment aktiveer om hierdie inhoud ' +
-        'te bekyk.',
+    string:
+      'Jy moet die AMP-storie-eksperiment aktiveer om hierdie inhoud ' +
+      'te bekyk.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Die bladsy kan die beste in portretmodus bekyk word',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Ons is jammer, maar dit lyk of jou blaaier nie hierdie ervaring ' +
-        'steun nie',
+    string:
+      'Ons is jammer, maar dit lyk of jou blaaier nie hierdie ervaring ' +
+      'steun nie',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/bg.js b/extensions/amp-story/1.0/_locales/bg.js
index 3a615cec1df9..21035381a0ab 100644
--- a/extensions/amp-story/1.0/_locales/bg.js
+++ b/extensions/amp-story/1.0/_locales/bg.js
@@ -111,23 +111,25 @@ const strings = {
     string: 'Разгънете височината на прозореца, за да прегледате материалите',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Разгънете височината и ширината на прозореца, за да прегледате ' +
-        'материалите',
+    string:
+      'Разгънете височината и ширината на прозореца, за да прегледате ' +
+      'материалите',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Разгънете ширината на прозореца, за да прегледате материалите',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'За да прегледате това съдържание, трябва да активирате ' +
-        'експеримента за AMP материали.',
+    string:
+      'За да прегледате това съдържание, трябва да активирате ' +
+      'експеримента за AMP материали.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'Най-добрият начин за преглед на страницата е във вертикален ' +
-        'режим',
+    string: 'Най-добрият начин за преглед на страницата е във вертикален режим',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'За съжаление, изглежда, че браузърът ви не поддържа преглед на ' +
-        'материали.',
+    string:
+      'За съжаление, изглежда, че браузърът ви не поддържа преглед на ' +
+      'материали.',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/bn.js b/extensions/amp-story/1.0/_locales/bn.js
index e76d7fe7ea3c..276673640e20 100644
--- a/extensions/amp-story/1.0/_locales/bn.js
+++ b/extensions/amp-story/1.0/_locales/bn.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'এমপি ফলফল সম্পর্কে আরও অনেক কিছু জানুন',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'পরবর্তী\' বোতামে ট্যাপ করুন',
+    string: "'পরবর্তী' বোতামে ট্যাপ করুন",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'ফিরে যান\' বোতামে ট্যাপ করুন',
+    string: "'ফিরে যান' বোতামে ট্যাপ করুন",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'উপরের দিকে সোয়াইপ করুন',
@@ -117,8 +117,9 @@ const strings = {
     string: 'এই পরীক্ষা দেখতে আপনার উইন্ডোর সাইজ বড় করুন',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'এই কন্টেন্ট দেখতে আপনাকে এএমপি স্টোরি এক্সপেরিমেন্ট ফিচারটি ' +
-        'চালু করতে হবে।',
+    string:
+      'এই কন্টেন্ট দেখতে আপনাকে এএমপি স্টোরি এক্সপেরিমেন্ট ফিচারটি ' +
+      'চালু করতে হবে।',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'পোর্ট্রেট মোডে পেজটি ভালভাবে দেখা যাবে',
diff --git a/extensions/amp-story/1.0/_locales/bs.js b/extensions/amp-story/1.0/_locales/bs.js
index e63a5b6212cb..f64caba25069 100644
--- a/extensions/amp-story/1.0/_locales/bs.js
+++ b/extensions/amp-story/1.0/_locales/bs.js
@@ -123,8 +123,8 @@ const strings = {
     string: 'Ovu stranicu je najbolje pregledati u uspravnom načinu',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Žao nam je, ali izgleda da vaš preglednik ne podržava ovo ' +
-        'iskustvo',
+    string:
+      'Žao nam je, ali izgleda da vaš preglednik ne podržava ovo iskustvo',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/ca.js b/extensions/amp-story/1.0/_locales/ca.js
index 749e18a9deae..ec3330d0f0e7 100644
--- a/extensions/amp-story/1.0/_locales/ca.js
+++ b/extensions/amp-story/1.0/_locales/ca.js
@@ -69,10 +69,10 @@ const strings = {
     string: 'Reprodueix el vídeo',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT]: {
-    string: 'No s\'ha pogut copiar l\'enllaç al porta-retalls :(',
+    string: "No s'ha pogut copiar l'enllaç al porta-retalls :(",
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT]: {
-    string: 'S\'ha copiat l\'enllaç',
+    string: "S'ha copiat l'enllaç",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL]: {
     string: 'Correu electrònic',
@@ -84,7 +84,7 @@ const strings = {
     string: 'Google+',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK]: {
-    string: 'Obtén l\'enllaç',
+    string: "Obtén l'enllaç",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN]: {
     string: 'LinkedIn',
@@ -108,18 +108,20 @@ const strings = {
     string: 'Desplega el tuit',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Amplia l\'alçada de la finestra per veure aquesta experiència',
+    string: "Amplia l'alçada de la finestra per veure aquesta experiència",
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Amplia l\'alçada i l\'amplada de la finestra per veure aquesta ' +
-        'experiència',
+    string:
+      "Amplia l'alçada i l'amplada de la finestra per veure aquesta " +
+      'experiència',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Amplia l\'amplada de la finestra per veure aquesta experiència',
+    string: "Amplia l'amplada de la finestra per veure aquesta experiència",
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Has d\'activar l\'experiment d\'història AMP per veure aquest ' +
-        'contingut.',
+    string:
+      "Has d'activar l'experiment d'història AMP per veure aquest " +
+      'contingut.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'La pàgina es veu millor en mode vertical',
diff --git a/extensions/amp-story/1.0/_locales/cs.js b/extensions/amp-story/1.0/_locales/cs.js
index 9ed959fbac3e..e6ad644c1f7e 100644
--- a/extensions/amp-story/1.0/_locales/cs.js
+++ b/extensions/amp-story/1.0/_locales/cs.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Chcete-li tento prvek zobrazit, zvětšete šířku okna',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Chcete-li tento obsah zobrazit, musíte povolit experiment s ' +
-        'příběhem AMP',
+    string:
+      'Chcete-li tento obsah zobrazit, musíte povolit experiment s ' +
+      'příběhem AMP',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Stránku je nejlepší zobrazit na výšku',
diff --git a/extensions/amp-story/1.0/_locales/da.js b/extensions/amp-story/1.0/_locales/da.js
index 0b146bb0235d..f3c10055e3fc 100644
--- a/extensions/amp-story/1.0/_locales/da.js
+++ b/extensions/amp-story/1.0/_locales/da.js
@@ -117,15 +117,17 @@ const strings = {
     string: 'Gør vinduet bredere for at se denne oplevelse',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Du skal aktivere AMP-historieeksperimentet for at se dette ' +
-        'indhold.',
+    string:
+      'Du skal aktivere AMP-historieeksperimentet for at se dette ' +
+      'indhold.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Denne side fungerer bedst i stående format',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Det ser desværre ud til, at din browser ikke understøtter denne ' +
-        'oplevelse',
+    string:
+      'Det ser desværre ud til, at din browser ikke understøtter denne ' +
+      'oplevelse',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/de.js b/extensions/amp-story/1.0/_locales/de.js
index dcc84b1cc4c1..5d6b4bc1c993 100644
--- a/extensions/amp-story/1.0/_locales/de.js
+++ b/extensions/amp-story/1.0/_locales/de.js
@@ -108,20 +108,24 @@ const strings = {
     string: 'Tweet maximieren',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Maximiere die Höhe deines Fensters, um diese Funktion nutzen zu ' +
-        'können',
+    string:
+      'Maximiere die Höhe deines Fensters, um diese Funktion nutzen zu ' +
+      'können',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Maximiere die Höhe und Breite deines Fensters, um diese ' +
-        'Funktion nutzen zu können',
+    string:
+      'Maximiere die Höhe und Breite deines Fensters, um diese ' +
+      'Funktion nutzen zu können',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Maximiere die Breite deines Fensters, um diese Funktion nutzen ' +
-        'zu können',
+    string:
+      'Maximiere die Breite deines Fensters, um diese Funktion nutzen ' +
+      'zu können',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Wenn du diesen Inhalt aufrufen möchtest, musst du den ' +
-        'amp-story-Test aktivieren.',
+    string:
+      'Wenn du diesen Inhalt aufrufen möchtest, musst du den ' +
+      'amp-story-Test aktivieren.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Diese Seite lässt sich am besten im Hochformat ansehen',
diff --git a/extensions/amp-story/1.0/_locales/default.js b/extensions/amp-story/1.0/_locales/default.js
index c5f1482a7c62..76c6d2236ba6 100644
--- a/extensions/amp-story/1.0/_locales/default.js
+++ b/extensions/amp-story/1.0/_locales/default.js
@@ -18,7 +18,6 @@ import {
   LocalizedStringId,
 } from '../../../../src/localized-strings';
 
-
 /**
  * Localized string bundle used for English strings.
  * @const {!LocalizedStringBundleDef}
@@ -64,8 +63,9 @@ const strings = {
     string: 'Expand the height of your window to view this experience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Expand both the height and width of your window to view this ' +
-        'experience',
+    string:
+      'Expand both the height and width of your window to view this ' +
+      'experience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Expand the width of your window to view this experience',
@@ -77,8 +77,9 @@ const strings = {
     string: 'The page is best viewed in portrait mode',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'We\'re sorry, it looks like your browser doesn\'t support ' +
-        'this experience',
+    string:
+      "We're sorry, it looks like your browser doesn't support " +
+      'this experience',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/el.js b/extensions/amp-story/1.0/_locales/el.js
index 362e9ce14cd3..f6b0d363a8a4 100644
--- a/extensions/amp-story/1.0/_locales/el.js
+++ b/extensions/amp-story/1.0/_locales/el.js
@@ -108,28 +108,34 @@ const strings = {
     string: 'Ανάπτυξη tweet',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Αναπτύξτε το ύψος του παραθύρου για την προβολή αυτής της ' +
-        'εμπειρίας',
+    string:
+      'Αναπτύξτε το ύψος του παραθύρου για την προβολή αυτής της ' +
+      'εμπειρίας',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Αναπτύξτε τόσο το ύψος όσο και το πλάτος του παραθύρου σας για ' +
-        'την προβολή αυτής της εμπειρίας',
+    string:
+      'Αναπτύξτε τόσο το ύψος όσο και το πλάτος του παραθύρου σας για ' +
+      'την προβολή αυτής της εμπειρίας',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Αναπτύξτε το πλάτος του παραθύρου σας για την προβολή αυτής της ' +
-        'εμπειρίας',
+    string:
+      'Αναπτύξτε το πλάτος του παραθύρου σας για την προβολή αυτής της ' +
+      'εμπειρίας',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Πρέπει να ενεργοποιήσετε το πείραμα ιστορίας AMP για να ' +
-        'προβάλετε αυτό το περιεχόμενο.',
+    string:
+      'Πρέπει να ενεργοποιήσετε το πείραμα ιστορίας AMP για να ' +
+      'προβάλετε αυτό το περιεχόμενο.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'Για βέλτιστη προβολή της σελίδας, επιλέξτε κατακόρυφο ' +
-        'προσανατολισμό',
+    string:
+      'Για βέλτιστη προβολή της σελίδας, επιλέξτε κατακόρυφο ' +
+      'προσανατολισμό',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Δυστυχώς, απ\' ό,τι φαίνεται, το πρόγραμμα περιήγησής σας δεν ' +
-        'υποστηρίζει αυτήν την εμπειρία',
+    string:
+      "Δυστυχώς, απ' ό,τι φαίνεται, το πρόγραμμα περιήγησής σας δεν " +
+      'υποστηρίζει αυτήν την εμπειρία',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/en-GB.js b/extensions/amp-story/1.0/_locales/en-GB.js
index d7536e785e85..08ec5fec82bf 100644
--- a/extensions/amp-story/1.0/_locales/en-GB.js
+++ b/extensions/amp-story/1.0/_locales/en-GB.js
@@ -111,8 +111,9 @@ const strings = {
     string: 'Expand the height of your window to view this experience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Expand both the height and width of your window to view this ' +
-        'experience',
+    string:
+      'Expand both the height and width of your window to view this ' +
+      'experience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Expand the width of your window to view this experience',
@@ -124,8 +125,9 @@ const strings = {
     string: 'The page is best viewed in portrait mode',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'We\'re sorry, it looks like your browser doesn\'t support this ' +
-        'experience',
+    string:
+      "We're sorry, it looks like your browser doesn't support this " +
+      'experience',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/en.js b/extensions/amp-story/1.0/_locales/en.js
index cb72a8bfc2ef..6d7b73ef4b39 100644
--- a/extensions/amp-story/1.0/_locales/en.js
+++ b/extensions/amp-story/1.0/_locales/en.js
@@ -18,7 +18,6 @@ import {
   LocalizedStringId,
 } from '../../../../src/localized-strings';
 
-
 /**
  * Localized string bundle used for English strings.
  * @const {!LocalizedStringBundleDef}
@@ -26,63 +25,74 @@ import {
 const strings = {
   [LocalizedStringId.AMP_STORY_AUDIO_MUTE_BUTTON_TEXT]: {
     string: 'Sound off',
-    description: 'Text that informs users that the sound is off after they ' +
-          'click the mute button',
+    description:
+      'Text that informs users that the sound is off after they ' +
+      'click the mute button',
   },
   [LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT]: {
     string: 'Sound on',
-    description: 'Text that informs users that the sound is on after they ' +
-          'click the unmute button on a page with sound',
+    description:
+      'Text that informs users that the sound is on after they ' +
+      'click the unmute button on a page with sound',
   },
   [LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT]: {
     string: 'This page has no sound',
-    description: 'Text that informs users that the sound is on after they ' +
-          'click the unmute button on a page without sound',
+    description:
+      'Text that informs users that the sound is on after they ' +
+      'click the unmute button on a page without sound',
   },
   [LocalizedStringId.AMP_STORY_BOOKEND_MORE_TO_READ_LABEL]: {
     string: 'More to read',
-    description: 'Label to be placed as a title on top of related articles ' +
-        'at the end of a story.',
+    description:
+      'Label to be placed as a title on top of related articles ' +
+      'at the end of a story.',
   },
   [LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE]: {
     string: 'Privacy settings',
-    description: 'Title for a section that allows the user to configure ' +
-        'their privacy settings',
+    description:
+      'Title for a section that allows the user to configure ' +
+      'their privacy settings',
   },
   [LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL]: {
     string: 'Change data privacy settings',
-    description: 'Label for a button that allows the user to change their ' +
-        'choice to consent to providing their cookie access.',
+    description:
+      'Label for a button that allows the user to change their ' +
+      'choice to consent to providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL]: {
     string: 'Accept',
-    description: 'Label for a button that allows the user to consent to ' +
-        'providing their cookie access.',
+    description:
+      'Label for a button that allows the user to consent to ' +
+      'providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL]: {
     string: 'Decline',
-    description: 'Label for a button that allows the user to disconsent to ' +
-        'providing their cookie access.',
+    description:
+      'Label for a button that allows the user to disconsent to ' +
+      'providing their cookie access.',
   },
   [LocalizedStringId.AMP_STORY_CONTINUE_ANYWAY_BUTTON_LABEL]: {
     string: 'Continue Anyway',
-    description: 'Button label to allow the user to continue even if they ' +
-        'are not using a supportive browser.',
+    description:
+      'Button label to allow the user to continue even if they ' +
+      'are not using a supportive browser.',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL]: {
     string: 'View on original domain:',
-    description: 'Label for a heading of a dialog that shows the user the ' +
-        'domain from which the story is served.',
+    description:
+      'Label for a heading of a dialog that shows the user the ' +
+      'domain from which the story is served.',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK]: {
     string: 'More about AMP results',
-    description: 'Label for a link to documentation on how AMP links are ' +
-        'handled.',
+    description:
+      'Label for a link to documentation on how AMP links are handled.',
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'Swipe up',
-    description: 'Label for a button to open a drawer containing additional ' +
-        'content via a "swipe up" user gesture.',
+    description:
+      'Label for a button to open a drawer containing additional ' +
+      'content via a "swipe up" user gesture.',
   },
   [LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO]: {
     string: 'Play video',
@@ -90,121 +100,137 @@ const strings = {
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
     string: 'Tap Next',
-    description: 'Label indicating that users can navigate to the next ' +
-        'page, in the amp-story hint UI.',
+    description:
+      'Label indicating that users can navigate to the next ' +
+      'page, in the amp-story hint UI.',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
     string: 'Tap Back',
-    description: 'Label indicating that users can navigate to the previous ' +
-        'page, in the amp-story hint UI.',
+    description:
+      'Label indicating that users can navigate to the previous ' +
+      'page, in the amp-story hint UI.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PAGE_LABEL]: {
     string: 'Share starting from this page',
-    description: 'Checkbox label when the branching experiment is turned on ' +
-        ' and the story is in landscape mode; checking the checkbox lets the ' +
-        'user share the story from the current page.',
+    description:
+      'Checkbox label when the branching experiment is turned on ' +
+      ' and the story is in landscape mode; checking the checkbox lets the ' +
+      'user share the story from the current page.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT]: {
     string: 'Could not copy link to clipboard :(',
-    description: 'String shown in a failure message to inform the user that ' +
-        'a link could not be successfully copied to their clipboard.',
+    description:
+      'String shown in a failure message to inform the user that ' +
+      'a link could not be successfully copied to their clipboard.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT]: {
     string: 'Link copied!',
-    description: 'String shown in a confirmation message to inform the user ' +
-        'that a link was successfully copied to their clipboard.',
+    description:
+      'String shown in a confirmation message to inform the user ' +
+      'that a link was successfully copied to their clipboard.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_EMAIL]: {
     string: 'Email',
-    description: 'Button label for the share target that shares a link via ' +
-        'email.',
+    description:
+      'Button label for the share target that shares a link via email.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_FACEBOOK]: {
     string: 'Facebook',
-    description: 'Button label for the share target that shares a link via ' +
-        'Facebook.',
+    description:
+      'Button label for the share target that shares a link via Facebook.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_GOOGLE_PLUS]: {
     string: 'Google+',
-    description: 'Button label for the share target that shares a link via ' +
-        'Google+.',
+    description:
+      'Button label for the share target that shares a link via Google+.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINK]: {
     string: 'Get Link',
-    description: 'Button label for the share target that shares a link via ' +
-        'by copying it to the user\'s clipboard.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      "by copying it to the user's clipboard.",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_LINKEDIN]: {
     string: 'LinkedIn',
-    description: 'Button label for the share target that shares a link via ' +
-        'LinkedIn.',
+    description:
+      'Button label for the share target that shares a link via LinkedIn.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_PINTEREST]: {
     string: 'Pinterest',
-    description: 'Button label for the share target that shares a link via ' +
-        'Pinterest.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      'Pinterest.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SMS]: {
     string: 'SMS',
-    description: 'Button label for the share target that shares a link via ' +
-        'SMS.',
+    description:
+      'Button label for the share target that shares a link via SMS.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SYSTEM]: {
     string: 'More',
-    description: 'Button label for the share target that shares a link via ' +
-        'deferral to the operating system\'s native sharing handler.',
+    description:
+      'Button label for the share target that shares a link via ' +
+      "deferral to the operating system's native sharing handler.",
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TUMBLR]: {
     string: 'Tumblr',
-    description: 'Button label for the share target that shares a link via ' +
-        'Tumblr.',
+    description:
+      'Button label for the share target that shares a link via Tumblr.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_TWITTER]: {
     string: 'Twitter',
-    description: 'Button label for the share target that shares a link via ' +
-        'Twitter.',
+    description:
+      'Button label for the share target that shares a link via Twitter.',
   },
   [LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_WHATSAPP]: {
     string: 'WhatsApp',
-    description: 'Button label for the share target that shares a link via ' +
-        'WhatsApp.',
+    description:
+      'Button label for the share target that shares a link via WhatsApp.',
   },
   [LocalizedStringId.AMP_STORY_TOOLTIP_EXPAND_TWEET]: {
     string: 'Expand Tweet',
-    description: 'Label in the tooltip text for when a Twitter embed is ' +
-        'expandable.',
+    description:
+      'Label in the tooltip text for when a Twitter embed is expandable.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
     string: 'Expand the height of your window to view this experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in taller browser windows.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in taller browser windows.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Expand both the height and width of your window to view this ' +
-        'experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in larger browser windows.',
+    string:
+      'Expand both the height and width of your window to view this ' +
+      'experience',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in larger browser windows.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Expand the width of your window to view this experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in wider browser windows.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in wider browser windows.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
     string: 'You must enable the amp-story experiment to view this content.',
-    description: 'Text for a warning screen that informs the user that ' +
-        'they must enable an experiment to use stories.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'they must enable an experiment to use stories.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'The page is best viewed in portrait mode',
-    description: 'Text for a warning screen that informs the user that ' +
-        'stories are only supported in portrait orientation.',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'stories are only supported in portrait orientation.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'We\'re sorry, it looks like your browser doesn\'t support ' +
-        'this experience',
-    description: 'Text for a warning screen that informs the user that ' +
-        'their browser does not support stories.',
+    string:
+      "We're sorry, it looks like your browser doesn't support " +
+      'this experience',
+    description:
+      'Text for a warning screen that informs the user that ' +
+      'their browser does not support stories.',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/es-419.js b/extensions/amp-story/1.0/_locales/es-419.js
index 0c9cbc52bd7e..0a02f778fad4 100644
--- a/extensions/amp-story/1.0/_locales/es-419.js
+++ b/extensions/amp-story/1.0/_locales/es-419.js
@@ -111,15 +111,17 @@ const strings = {
     string: 'Expande la altura de la ventana para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Expande el ancho y la altura de la ventana para ver esta ' +
-        'experiencia',
+    string:
+      'Expande el ancho y la altura de la ventana para ver esta ' +
+      'experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Expande el ancho de la ventana para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Debes habilitar el experimento de historia en formato AMP para ' +
-        'ver este contenido.',
+    string:
+      'Debes habilitar el experimento de historia en formato AMP para ' +
+      'ver este contenido.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'La página está optimizada para verse en orientación vertical.',
diff --git a/extensions/amp-story/1.0/_locales/es.js b/extensions/amp-story/1.0/_locales/es.js
index 7bb06bdb14ba..6f4cccb4790f 100644
--- a/extensions/amp-story/1.0/_locales/es.js
+++ b/extensions/amp-story/1.0/_locales/es.js
@@ -111,15 +111,15 @@ const strings = {
     string: 'Amplía el alto de la ventana para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Amplía el alto y el ancho de la ventana para ver esta ' +
-        'experiencia',
+    string: 'Amplía el alto y el ancho de la ventana para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Amplía el ancho de la ventana para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Para ver este contenido, debes habilitar el experimento de ' +
-        'historia AMP.',
+    string:
+      'Para ver este contenido, debes habilitar el experimento de ' +
+      'historia AMP.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'La página se visualiza mejor en modo vertical',
diff --git a/extensions/amp-story/1.0/_locales/fi.js b/extensions/amp-story/1.0/_locales/fi.js
index 5ba03f7c13fc..31a3bc4b7a42 100644
--- a/extensions/amp-story/1.0/_locales/fi.js
+++ b/extensions/amp-story/1.0/_locales/fi.js
@@ -117,8 +117,8 @@ const strings = {
     string: 'Lisää ikkunan leveyttä, jos haluat katsella tätä',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'AMP-tarinakokeilu on otettava käyttöön tämän sisällön ' +
-        'näkemiseksi.',
+    string:
+      'AMP-tarinakokeilu on otettava käyttöön tämän sisällön näkemiseksi.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Sivu toimii parhaiten muotokuvatilassa',
diff --git a/extensions/amp-story/1.0/_locales/fil.js b/extensions/amp-story/1.0/_locales/fil.js
index d452a4d56add..054b5810ff21 100644
--- a/extensions/amp-story/1.0/_locales/fil.js
+++ b/extensions/amp-story/1.0/_locales/fil.js
@@ -108,27 +108,29 @@ const strings = {
     string: 'I-expand ang Tweet',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Palawakin ang taas ng iyong window para makita ang karanasang ' +
-        'ito',
+    string: 'Palawakin ang taas ng iyong window para makita ang karanasang ito',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Palawakin ang parehong taas at lapad ng iyong window para ' +
-        'tingnan ang karanasang ito',
+    string:
+      'Palawakin ang parehong taas at lapad ng iyong window para ' +
+      'tingnan ang karanasang ito',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Palawakin ang lapad ng iyong window para makita ang karanasang ' +
-        'ito',
+    string:
+      'Palawakin ang lapad ng iyong window para makita ang karanasang ito',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Kailangan mong i-enable ang amp-story experiment para makita ' +
-        'ang content na ito.',
+    string:
+      'Kailangan mong i-enable ang amp-story experiment para makita ' +
+      'ang content na ito.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Pinakamahusay na tingnan ang page na ito sa portrait mode',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Ikinalulungkot namin, mukhang hindi sinusuportahan ng iyong ' +
-        'browser ang karanasang ito',
+    string:
+      'Ikinalulungkot namin, mukhang hindi sinusuportahan ng iyong ' +
+      'browser ang karanasang ito',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/fr.js b/extensions/amp-story/1.0/_locales/fr.js
index b663ae31f749..50e1b767a1ad 100644
--- a/extensions/amp-story/1.0/_locales/fr.js
+++ b/extensions/amp-story/1.0/_locales/fr.js
@@ -27,7 +27,7 @@ const strings = {
     string: 'Son désactivé',
   },
   [LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT]: {
-    string: 'Cette page n\'a pas de son',
+    string: "Cette page n'a pas de son",
   },
   [LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT]: {
     string: 'Son activé',
@@ -51,7 +51,7 @@ const strings = {
     string: 'Continuer quand même',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL]: {
-    string: 'Afficher sur le domaine d\'origine :',
+    string: "Afficher sur le domaine d'origine :",
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK]: {
     string: 'En savoir plus sur les résultats AMP',
@@ -63,7 +63,7 @@ const strings = {
     string: 'Appuyer sur Retour',
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
-    string: 'Balayer l\'écran vers le haut',
+    string: "Balayer l'écran vers le haut",
   },
   [LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO]: {
     string: 'Regarder la vidéo',
@@ -111,21 +111,23 @@ const strings = {
     string: 'Augmentez la hauteur de votre fenêtre pour voir cette expérience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Modifiez la hauteur et la largeur de la fenêtre pour voir cette ' +
-        'expérience',
+    string:
+      'Modifiez la hauteur et la largeur de la fenêtre pour voir cette ' +
+      'expérience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Élargissez la fenêtre pour voir cette expérience',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Vous devez activer l\'expérience story AMP pour voir ce contenu.',
+    string: "Vous devez activer l'expérience story AMP pour voir ce contenu.",
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'La page s\'affiche mieux en mode Portrait',
+    string: "La page s'affiche mieux en mode Portrait",
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Nous sommes désolés, mais votre navigateur n\'est pas ' +
-        'compatible avec cette expérience',
+    string:
+      "Nous sommes désolés, mais votre navigateur n'est pas " +
+      'compatible avec cette expérience',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/gl.js b/extensions/amp-story/1.0/_locales/gl.js
index 2e84df3b6cb5..63dd0f724610 100644
--- a/extensions/amp-story/1.0/_locales/gl.js
+++ b/extensions/amp-story/1.0/_locales/gl.js
@@ -117,8 +117,8 @@ const strings = {
     string: 'Amplía a largura da ventá para ver esta experiencia',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Debes activar o experimento da historia AMP para ver este ' +
-        'contido.',
+    string:
+      'Debes activar o experimento da historia AMP para ver este contido.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'A páxina vese mellor no modo retrato',
diff --git a/extensions/amp-story/1.0/_locales/gu.js b/extensions/amp-story/1.0/_locales/gu.js
index 5c46d8a55f86..3b9c869db3c3 100644
--- a/extensions/amp-story/1.0/_locales/gu.js
+++ b/extensions/amp-story/1.0/_locales/gu.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'આ અનુભવ જોવા માટે તમારી વિંડોની પહોળાઈ વધારો',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'જો તમારે આ કન્ટેન્ટ જોવું હોય, તો તમારે AMP સ્ટોરીનો અનુભવ ચાલુ ' +
-        'કરવો પડશે.',
+    string:
+      'જો તમારે આ કન્ટેન્ટ જોવું હોય, તો તમારે AMP સ્ટોરીનો અનુભવ ચાલુ ' +
+      'કરવો પડશે.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'આ પેજને પોર્ટ્રેટ મોડમાં જોવાથી શ્રેષ્ઠ દેખાય છે',
diff --git a/extensions/amp-story/1.0/_locales/hi.js b/extensions/amp-story/1.0/_locales/hi.js
index 4ab935899777..5fe3db78559b 100644
--- a/extensions/amp-story/1.0/_locales/hi.js
+++ b/extensions/amp-story/1.0/_locales/hi.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'एएमपी नतीजों के बारे में ज़्यादा जानें',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'अगला\' पर टैप करें',
+    string: "'अगला' पर टैप करें",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'वापस जाएं\' पर टैप करें',
+    string: "'वापस जाएं' पर टैप करें",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'ऊपर की ओर स्वाइप करें',
@@ -111,15 +111,17 @@ const strings = {
     string: 'इस वर्शन को देखने के लिए अपनी विंडो की लंबाई बढ़ाएं',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'यह वर्शन देखने के लिए अपनी विंडो की लंबाई और चौड़ाई, दोनों को ' +
-        'बढ़ाएं',
+    string:
+      'यह वर्शन देखने के लिए अपनी विंडो की लंबाई और चौड़ाई, दोनों को ' +
+      'बढ़ाएं',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'यह वर्शन देखने के लिए अपनी विंडो की चौड़ाई बढ़ाएं',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'यह सामग्री देखने के लिए आपको एएमपी-कहानी की परफ़ॉर्मेंस जाँच ' +
-        'चालू करनी होगी.',
+    string:
+      'यह सामग्री देखने के लिए आपको एएमपी-कहानी की परफ़ॉर्मेंस जाँच ' +
+      'चालू करनी होगी.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'यह पेज पोर्ट्रेट मोड में सबसे अच्छा दिखाई देता है',
diff --git a/extensions/amp-story/1.0/_locales/hr.js b/extensions/amp-story/1.0/_locales/hr.js
index 4817d9362e3d..e96ffd6bb117 100644
--- a/extensions/amp-story/1.0/_locales/hr.js
+++ b/extensions/amp-story/1.0/_locales/hr.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Povećajte prozor u širinu da biste vidjeli taj sadržaj',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Morate omogućiti eksperiment AMP priča da biste mogli vidjeti ' +
-        'taj sadržaj.',
+    string:
+      'Morate omogućiti eksperiment AMP priča da biste mogli vidjeti ' +
+      'taj sadržaj.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Najbolje je pregledavati stranicu u portretnom načinu',
diff --git a/extensions/amp-story/1.0/_locales/hu.js b/extensions/amp-story/1.0/_locales/hu.js
index 1492918c7b67..a88e4cabb2cc 100644
--- a/extensions/amp-story/1.0/_locales/hu.js
+++ b/extensions/amp-story/1.0/_locales/hu.js
@@ -111,19 +111,20 @@ const strings = {
     string: 'A sztori megtekintéséhez növelje az ablak magasságát',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'A sztori megtekintéséhez növelje az ablak magasságát és ' +
-        'szélességét is',
+    string:
+      'A sztori megtekintéséhez növelje az ablak magasságát és ' +
+      'szélességét is',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'A sztori megtekintéséhez növelje az ablak szélességét',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'A tartalom megtekintéséhez engedélyeznie kell az AMP-sztori ' +
-        'kísérletet.',
+    string:
+      'A tartalom megtekintéséhez engedélyeznie kell az AMP-sztori ' +
+      'kísérletet.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'A legjobb élmény érdekében álló tájolással tekintse meg az ' +
-        'oldalt',
+    string: 'A legjobb élmény érdekében álló tájolással tekintse meg az oldalt',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
     string: 'Sajnos úgy tűnik, a böngészője nem támogatja ezt a funkciót',
diff --git a/extensions/amp-story/1.0/_locales/id.js b/extensions/amp-story/1.0/_locales/id.js
index 71d113dc7b70..6a37bf99e64f 100644
--- a/extensions/amp-story/1.0/_locales/id.js
+++ b/extensions/amp-story/1.0/_locales/id.js
@@ -111,15 +111,15 @@ const strings = {
     string: 'Luaskan tinggi jendela untuk menampilkan pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Luaskan tinggi dan lebar jendela untuk menampilkan pengalaman ' +
-        'ini',
+    string: 'Luaskan tinggi dan lebar jendela untuk menampilkan pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Luaskan lebar jendela untuk menampilkan pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Anda harus mengaktifkan eksperimen cerita AMP untuk melihat ' +
-        'konten ini.',
+    string:
+      'Anda harus mengaktifkan eksperimen cerita AMP untuk melihat ' +
+      'konten ini.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Halaman ini ditampilkan paling baik dalam mode potret',
diff --git a/extensions/amp-story/1.0/_locales/it.js b/extensions/amp-story/1.0/_locales/it.js
index 23965114abc4..b090e72d9592 100644
--- a/extensions/amp-story/1.0/_locales/it.js
+++ b/extensions/amp-story/1.0/_locales/it.js
@@ -63,7 +63,7 @@ const strings = {
     string: 'Tocca Indietro',
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
-    string: 'Scorri verso l\'alto',
+    string: "Scorri verso l'alto",
   },
   [LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO]: {
     string: 'Riproduci video',
@@ -108,28 +108,34 @@ const strings = {
     string: 'Espandi tweet',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Espandi l\'altezza della finestra per visualizzare questa ' +
-        'esperienza',
+    string:
+      "Espandi l'altezza della finestra per visualizzare questa " +
+      'esperienza',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Espandi sia l\'altezza che la larghezza della finestra per ' +
-        'visualizzare questa esperienza',
+    string:
+      "Espandi sia l'altezza che la larghezza della finestra per " +
+      'visualizzare questa esperienza',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Espandi la larghezza della finestra per visualizzare questa ' +
-        'esperienza',
+    string:
+      'Espandi la larghezza della finestra per visualizzare questa ' +
+      'esperienza',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Devi attivare l\'esperimento di storia AMP per visualizzare ' +
-        'questi contenuti.',
+    string:
+      "Devi attivare l'esperimento di storia AMP per visualizzare " +
+      'questi contenuti.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'La pagina viene visualizzata in modo ottimale in orientamento ' +
-        'verticale',
+    string:
+      'La pagina viene visualizzata in modo ottimale in orientamento ' +
+      'verticale',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Spiacenti, sembra che il tuo browser non supporti questa ' +
-        'esperienza',
+    string:
+      'Spiacenti, sembra che il tuo browser non supporti questa ' +
+      'esperienza',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/iw.js b/extensions/amp-story/1.0/_locales/iw.js
index 1b5beabd8982..8e28c3c1f4c9 100644
--- a/extensions/amp-story/1.0/_locales/iw.js
+++ b/extensions/amp-story/1.0/_locales/iw.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'מידע נוסף על תוצאות AMP',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: 'יש להקיש על \'הבא\'',
+    string: "יש להקיש על 'הבא'",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: 'יש להקיש על \'הקודם\'',
+    string: "יש להקיש על 'הקודם'",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'החלקה למעלה',
@@ -120,7 +120,7 @@ const strings = {
     string: 'יש להפעיל את הניסוי של סטורי ב-AMP כדי להציג תוכן זה.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'לחוויית הצפייה הטובה ביותר בדף, יש להשתמש במצב \'הדגשת דיוקן\'',
+    string: "לחוויית הצפייה הטובה ביותר בדף, יש להשתמש במצב 'הדגשת דיוקן'",
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
     string: 'לצערנו, נראה שהדפדפן שלך לא תומך בחוויה הזו',
diff --git a/extensions/amp-story/1.0/_locales/ja.js b/extensions/amp-story/1.0/_locales/ja.js
index a6ae9c30b518..8a417c15920f 100644
--- a/extensions/amp-story/1.0/_locales/ja.js
+++ b/extensions/amp-story/1.0/_locales/ja.js
@@ -111,13 +111,15 @@ const strings = {
     string: 'この記事を表示するには、ウィンドウの高さを拡大してください',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'この記事を表示するには、ウィンドウの高さと幅の両方を拡大してください',
+    string:
+      'この記事を表示するには、ウィンドウの高さと幅の両方を拡大してください',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'この記事を表示するには、ウィンドウの幅を拡大してください',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'このコンテンツを表示するには amp-story テストを有効にする必要があります。',
+    string:
+      'このコンテンツを表示するには amp-story テストを有効にする必要があります。',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'このページはポートレート モードで最適に表示されます',
diff --git a/extensions/amp-story/1.0/_locales/ka.js b/extensions/amp-story/1.0/_locales/ka.js
index cfc1dbaaa6f1..630befd4565a 100644
--- a/extensions/amp-story/1.0/_locales/ka.js
+++ b/extensions/amp-story/1.0/_locales/ka.js
@@ -111,22 +111,23 @@ const strings = {
     string: 'ამ გამოცდილების სანახავად, გაზარდეთ თქვენი ფანჯრის სიმაღლე',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'ამ გამოცდილების სანახავად, გაზარდეთ თქვენი ფანჯრის სიმაღლეც და ' +
-        'სიგანეც',
+    string:
+      'ამ გამოცდილების სანახავად, გაზარდეთ თქვენი ფანჯრის სიმაღლეც და ' +
+      'სიგანეც',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'ამ გამოცდილების სანახავად, გაზარდეთ თქვენი ფანჯრის სიგანე',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'ამ კონტენტის სანახავად, თქვენ უნდა ჩართოთ AMP ამბის ' +
-        'ექსპერიმენტი.',
+    string: 'ამ კონტენტის სანახავად, თქვენ უნდა ჩართოთ AMP ამბის ექსპერიმენტი.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'გვერდის სანახავად საუკეთესოა პორტრეტის რეჟიმი',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'ვწუხვართ, როგორც ჩანს, თქვენს ბრაუზერს არ აქვს ამ გამოცდილების ' +
-        'მხარდაჭერა',
+    string:
+      'ვწუხვართ, როგორც ჩანს, თქვენს ბრაუზერს არ აქვს ამ გამოცდილების ' +
+      'მხარდაჭერა',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/km.js b/extensions/amp-story/1.0/_locales/km.js
index 542dd8eae5cc..033f33d61970 100644
--- a/extensions/amp-story/1.0/_locales/km.js
+++ b/extensions/amp-story/1.0/_locales/km.js
@@ -123,9 +123,10 @@ const strings = {
     string: 'អាចមើលឃើញ​ទំព័រ​ល្អបំផុត​នៅក្នុង​មុខងារបញ្ឈរ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'សូម​អភ័យទោស ' +
-        // eslint-disable-next-line max-len
-        'កម្មវិធីរុករកតាមអ៊ីនធឺណិត​របស់អ្នក​ហាក់ដូចជា​មិនស្គាល់​បទពិសោធន៍​នេះ​ទេ',
+    string:
+      'សូម​អភ័យទោស ' +
+      // eslint-disable-next-line max-len
+      'កម្មវិធីរុករកតាមអ៊ីនធឺណិត​របស់អ្នក​ហាក់ដូចជា​មិនស្គាល់​បទពិសោធន៍​នេះ​ទេ',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/kn.js b/extensions/amp-story/1.0/_locales/kn.js
index a03216da0ceb..661a70daadeb 100644
--- a/extensions/amp-story/1.0/_locales/kn.js
+++ b/extensions/amp-story/1.0/_locales/kn.js
@@ -111,22 +111,24 @@ const strings = {
     string: 'ಈ ಅನುಭವವನ್ನು ವೀಕ್ಷಿಸಲು ನಿಮ್ಮ ವಿಂಡೋದ ಎತ್ತರವನ್ನು ವಿಸ್ತರಿಸಿ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'ನಿಮ್ಮ ವಿಂಡೋದಲ್ಲಿ ಈ ಅನುಭವವನ್ನು ವೀಕ್ಷಿಸಲು, ಎತ್ತರ ಮತ್ತು ಅಗಲ ' +
-        'ಎರಡನ್ನೂ ವಿಸ್ತರಿಸಿ',
+    string:
+      'ನಿಮ್ಮ ವಿಂಡೋದಲ್ಲಿ ಈ ಅನುಭವವನ್ನು ವೀಕ್ಷಿಸಲು, ಎತ್ತರ ಮತ್ತು ಅಗಲ ' +
+      'ಎರಡನ್ನೂ ವಿಸ್ತರಿಸಿ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'ಈ ಅನುಭವವನ್ನು ವೀಕ್ಷಿಸಲು ನಿಮ್ಮ ವಿಂಡೋದ ಅಗಲವನ್ನು ವಿಸ್ತರಿಸಿ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'ಈ ವಿಷಯವನ್ನು ವೀಕ್ಷಿಸಲು ನೀವು AMP ಸ್ಟೋರಿ ಪ್ರಯೋಗವನ್ನು ' +
-        'ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು.',
+    string:
+      'ಈ ವಿಷಯವನ್ನು ವೀಕ್ಷಿಸಲು ನೀವು AMP ಸ್ಟೋರಿ ಪ್ರಯೋಗವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಬೇಕು.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'ಪೋರ್ಟೇಟ್ ಮೋಡ್‌ನಲ್ಲಿ ಈ ಪುಟವನ್ನು ಅತ್ಯತ್ತಮವಾಗಿ ವೀಕ್ಷಿಸಬಹುದಾಗಿದೆ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'ನಮ್ಮನ್ನು ಕ್ಷಮಿಸಿ, ಈ ಅನುಭವವನ್ನು ನಿಮ್ಮ ಬ್ರೌಸರ್ ಬೆಂಬಲಿಸುವಂತೆ ' +
-        'ಕಾಣುತ್ತಿಲ್ಲ',
+    string:
+      'ನಮ್ಮನ್ನು ಕ್ಷಮಿಸಿ, ಈ ಅನುಭವವನ್ನು ನಿಮ್ಮ ಬ್ರೌಸರ್ ಬೆಂಬಲಿಸುವಂತೆ ' +
+      'ಕಾಣುತ್ತಿಲ್ಲ',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/lt.js b/extensions/amp-story/1.0/_locales/lt.js
index 1ab8e9a4c7df..1a23dd22a3c3 100644
--- a/extensions/amp-story/1.0/_locales/lt.js
+++ b/extensions/amp-story/1.0/_locales/lt.js
@@ -111,22 +111,25 @@ const strings = {
     string: 'Padidinkite lango aukštį, kad galėtumėte peržiūrėti šią funkciją',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Padidinkite lango aukštį ir plotį, kad galėtumėte peržiūrėti ' +
-        'šią funkciją',
+    string:
+      'Padidinkite lango aukštį ir plotį, kad galėtumėte peržiūrėti ' +
+      'šią funkciją',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Padidinkite lango plotį, kad galėtumėte peržiūrėti šią funkciją',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Turite įgalinti AMP istorijos eksperimentą, kad galėtumėte ' +
-        'peržiūrėti šį turinį.',
+    string:
+      'Turite įgalinti AMP istorijos eksperimentą, kad galėtumėte ' +
+      'peržiūrėti šį turinį.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Puslapį geriausia žiūrėti portreto režimu',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Apgailestaujame, bet panašu, kad jūsų naršyklėje ši funkcija ' +
-        'nepalaikoma',
+    string:
+      'Apgailestaujame, bet panašu, kad jūsų naršyklėje ši funkcija ' +
+      'nepalaikoma',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/mk.js b/extensions/amp-story/1.0/_locales/mk.js
index 5915af55a333..bf366ff183b4 100644
--- a/extensions/amp-story/1.0/_locales/mk.js
+++ b/extensions/amp-story/1.0/_locales/mk.js
@@ -108,27 +108,30 @@ const strings = {
     string: 'Прошири го твитот',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Проширете ја висината на прозорецот за прикажување на ова ' +
-        'искуство',
+    string:
+      'Проширете ја висината на прозорецот за прикажување на ова искуство',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Проширете ги висината и ширината на прозорецот за прикажување ' +
-        'на ова искуство',
+    string:
+      'Проширете ги висината и ширината на прозорецот за прикажување ' +
+      'на ова искуство',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'Проширете ја ширината на прозорецот за прикажување на ова ' +
-        'искуство',
+    string:
+      'Проширете ја ширината на прозорецот за прикажување на ова искуство',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Мора да го овозможите експериментот со AMP-приказната за ' +
-        'прикажување на овие содржини.',
+    string:
+      'Мора да го овозможите експериментот со AMP-приказната за ' +
+      'прикажување на овие содржини.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Страницата најдобро се прикажува во режим на портрет',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'За жал, се чини дека вашиот прелистувач не го поддржува ова ' +
-        'искуство',
+    string:
+      'За жал, се чини дека вашиот прелистувач не го поддржува ова ' +
+      'искуство',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/ml.js b/extensions/amp-story/1.0/_locales/ml.js
index c7e4d6f51cac..b1e0f914a394 100644
--- a/extensions/amp-story/1.0/_locales/ml.js
+++ b/extensions/amp-story/1.0/_locales/ml.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'AMP ഫലങ്ങളെക്കുറിച്ച് കൂടുതൽ',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'അടുത്തത്\' ടാപ്പ് ചെയ്യുക',
+    string: "'അടുത്തത്' ടാപ്പ് ചെയ്യുക",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'മടങ്ങുക\' ടാപ്പ് ചെയ്യുക',
+    string: "'മടങ്ങുക' ടാപ്പ് ചെയ്യുക",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'മുകളിലോട്ട് സ്വൈപ്പ് ചെയ്യുക',
@@ -117,15 +117,17 @@ const strings = {
     string: 'ഈ അനുഭവം കാണാൻ നിങ്ങളുടെ വിൻഡോയുടെ വീതി കൂട്ടുക',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'ഈ ഉള്ളടക്കം കാണാൻ AMP സ്‌റ്റോറി പരീക്ഷണം നിങ്ങൾ ' +
-        'പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്.',
+    string:
+      'ഈ ഉള്ളടക്കം കാണാൻ AMP സ്‌റ്റോറി പരീക്ഷണം നിങ്ങൾ ' +
+      'പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'പോർട്രെയ്‌റ്റ് മോഡിൽ ഈ പേജ് ഏറ്റവും മികച്ചതായി കാണാനാകും',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'ക്ഷമിക്കണം, നിങ്ങളുടെ ബ്രൗസർ ഈ അനുഭവത്തെ ' +
-        'പിന്തുണയ്ക്കുന്നില്ലെന്ന് തോന്നുന്നു',
+    string:
+      'ക്ഷമിക്കണം, നിങ്ങളുടെ ബ്രൗസർ ഈ അനുഭവത്തെ ' +
+      'പിന്തുണയ്ക്കുന്നില്ലെന്ന് തോന്നുന്നു',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/mn.js b/extensions/amp-story/1.0/_locales/mn.js
index 0e27edd13687..d6cd651d093c 100644
--- a/extensions/amp-story/1.0/_locales/mn.js
+++ b/extensions/amp-story/1.0/_locales/mn.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Энэ хэрэглээг харахын тулд цонхоо өргөнөөр нь дэлгэнэ үү',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Та энэ контентыг харахын тулд amp түүхийн туршилтыг идэвхжүүлэх ' +
-        'ёстой.',
+    string:
+      'Та энэ контентыг харахын тулд amp түүхийн туршилтыг идэвхжүүлэх ' +
+      'ёстой.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Хуудсыг босоо горимд хамгийн их харсан',
diff --git a/extensions/amp-story/1.0/_locales/mr.js b/extensions/amp-story/1.0/_locales/mr.js
index 90802c7a6cc2..1c5f2ac063f2 100644
--- a/extensions/amp-story/1.0/_locales/mr.js
+++ b/extensions/amp-story/1.0/_locales/mr.js
@@ -111,22 +111,24 @@ const strings = {
     string: 'हा प्रयोग पाहाण्यासाठी तुमच्या विंडोच्या उंचीचा विस्तार करा',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'हा प्रयोग पाहाण्यासाठी तुमच्या विंडोची उंची आणि रूंदी दोन्हींचा ' +
-        'विस्तार करा',
+    string:
+      'हा प्रयोग पाहाण्यासाठी तुमच्या विंडोची उंची आणि रूंदी दोन्हींचा ' +
+      'विस्तार करा',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'हा प्रयोग पाहाण्यासाठी तुमच्या विंडोची रूंदीचा विस्तार करा',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'तुम्ही हा आशय पाहाण्यासाठी AMP स्टोरी प्रयोग सुरू करणे आवश्यक ' +
-        'आहे.',
+    string:
+      'तुम्ही हा आशय पाहाण्यासाठी AMP स्टोरी प्रयोग सुरू करणे आवश्यक आहे.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'पेज पोर्ट्रेट मोडमध्ये उत्तम पाहिले जाते',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'आम्ही क्षमस्व आहोत, तुमचा ब्राउझर या प्रयोगाला सपोर्ट करत ' +
-        'नसल्याचे दिसते',
+    string:
+      'आम्ही क्षमस्व आहोत, तुमचा ब्राउझर या प्रयोगाला सपोर्ट करत ' +
+      'नसल्याचे दिसते',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/ms.js b/extensions/amp-story/1.0/_locales/ms.js
index 4c98d4313bc7..5cd10f36cd7a 100644
--- a/extensions/amp-story/1.0/_locales/ms.js
+++ b/extensions/amp-story/1.0/_locales/ms.js
@@ -108,26 +108,27 @@ const strings = {
     string: 'Kembangkan Twit',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Kembangkan ketinggian tetingkap anda untuk melihat pengalaman ' +
-        'ini',
+    string: 'Kembangkan ketinggian tetingkap anda untuk melihat pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Kembangkan kedua-dua ketinggian dan lebar tetingkap anda untuk ' +
-        'melihat pengalaman ini',
+    string:
+      'Kembangkan kedua-dua ketinggian dan lebar tetingkap anda untuk ' +
+      'melihat pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Kembangkan lebar tetingkap anda untuk melihat pengalaman ini',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Anda mesti mendayakan eksperimen cerita amp untuk melihat ' +
-        'kandungan ini.',
+    string:
+      'Anda mesti mendayakan eksperimen cerita amp untuk melihat ' +
+      'kandungan ini.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Halaman ini terbaik dilihat dalam mod potret',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Maaf, nampaknya penyemak imbas anda tidak menyokong pengalaman ' +
-        'ini',
+    string:
+      'Maaf, nampaknya penyemak imbas anda tidak menyokong pengalaman ini',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/my.js b/extensions/amp-story/1.0/_locales/my.js
index 440e86129903..da7f19059657 100644
--- a/extensions/amp-story/1.0/_locales/my.js
+++ b/extensions/amp-story/1.0/_locales/my.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'AMP ရလဒ်များအကြောင်း နောက်ထပ် အချက်အလက်',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'ရှေ့သို့\' ကိုတို့ရန်',
+    string: "'ရှေ့သို့' ကိုတို့ရန်",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'နောက်သို့\' ကိုတို့ရန်',
+    string: "'နောက်သို့' ကိုတို့ရန်",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'အပေါ်သို့ ပွတ်ဆွဲရန်',
@@ -111,19 +111,20 @@ const strings = {
     string: 'ဤဇာတ်လမ်းများကိုကြည့်ရန် သင့်ဝင်းဒိုး၏ အမြင့်ကို ချဲ့ပါ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'ဤဇာတ်လမ်းများကိုကြည့်ရန် သင့်ဝင်းဒိုး၏ အမြင့်နှင့်အကျယ် ' +
-        'နှစ်ခုစလုံးကို ချဲ့ပါ',
+    string:
+      'ဤဇာတ်လမ်းများကိုကြည့်ရန် သင့်ဝင်းဒိုး၏ အမြင့်နှင့်အကျယ် ' +
+      'နှစ်ခုစလုံးကို ချဲ့ပါ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'ဤဇာတ်လမ်းများကိုကြည့်ရန် သင့်ဝင်းဒိုး၏ အကျယ်ကို ချဲ့ပါ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'ဤအကြောင်းအရာကို ကြည့်ရန် amp ဇာတ်လမ်း စမ်းသပ်မှုကို ' +
-        'ဖွင့်ထားရမည်။',
+    string: 'ဤအကြောင်းအရာကို ကြည့်ရန် amp ဇာတ်လမ်း စမ်းသပ်မှုကို ဖွင့်ထားရမည်။',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
-    string: 'ဤစာမျက်နှာကို ထောင်လိုက်အနေအထားတွင် ကြည့်လျှင် ' +
-        'အကောင်းဆုံးဖြစ်ပါသည်',
+    string:
+      'ဤစာမျက်နှာကို ထောင်လိုက်အနေအထားတွင် ကြည့်လျှင် ' +
+      'အကောင်းဆုံးဖြစ်ပါသည်',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
     string: 'သင့်ဘရောင်ဇာသည် ဤဇာတ်လမ်းများကို ပံ့ပိုးပုံမရပါ',
diff --git a/extensions/amp-story/1.0/_locales/ne.js b/extensions/amp-story/1.0/_locales/ne.js
index eb5636941f80..42a0249ea5bf 100644
--- a/extensions/amp-story/1.0/_locales/ne.js
+++ b/extensions/amp-story/1.0/_locales/ne.js
@@ -117,15 +117,17 @@ const strings = {
     string: 'यो अनुभव हेर्न आफ्नो विन्डोको चौडाइ बढाउनुहोस्',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'यो सामग्री हेर्न तपाईंले अनिवार्य रूपमा amp स्टोरीको परीक्षण ' +
-        'सक्षम पार्नु पर्छ।',
+    string:
+      'यो सामग्री हेर्न तपाईंले अनिवार्य रूपमा amp स्टोरीको परीक्षण ' +
+      'सक्षम पार्नु पर्छ।',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'यो पृष्ठ पोर्ट्रेट मोडमा हेर्दा राम्रो देखिन्छ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'माफ गर्नुहोला, तपाईंको ब्राउजरले यो अनुभवको समर्थन गर्दैन जस्तो ' +
-        'देखिन्छ',
+    string:
+      'माफ गर्नुहोला, तपाईंको ब्राउजरले यो अनुभवको समर्थन गर्दैन जस्तो ' +
+      'देखिन्छ',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/nl.js b/extensions/amp-story/1.0/_locales/nl.js
index 3070453d154b..5de56e03727e 100644
--- a/extensions/amp-story/1.0/_locales/nl.js
+++ b/extensions/amp-story/1.0/_locales/nl.js
@@ -111,15 +111,17 @@ const strings = {
     string: 'Maak je venster hoger om deze functionaliteit te bekijken',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Maak je venster hoger en breder om deze functionaliteit te ' +
-        'bekijken',
+    string:
+      'Maak je venster hoger en breder om deze functionaliteit te ' +
+      'bekijken',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Maak je venster breder om deze functionaliteit te bekijken',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Je moet het amp-story-experiment inschakelen om deze content te ' +
-        'bekijken.',
+    string:
+      'Je moet het amp-story-experiment inschakelen om deze content te ' +
+      'bekijken.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'De pagina kan het beste worden bekeken in de staande modus',
diff --git a/extensions/amp-story/1.0/_locales/no.js b/extensions/amp-story/1.0/_locales/no.js
index 6cabf3a65fa2..03e7be135d46 100644
--- a/extensions/amp-story/1.0/_locales/no.js
+++ b/extensions/amp-story/1.0/_locales/no.js
@@ -117,15 +117,17 @@ const strings = {
     string: 'Gjør vinduet ditt bredere for å se denne opplevelsen',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Du må aktivere eksperimentet med AMP-snuttsamlinger for å se ' +
-        'dette innholdet.',
+    string:
+      'Du må aktivere eksperimentet med AMP-snuttsamlinger for å se ' +
+      'dette innholdet.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Den beste visningen av siden er i stående retning',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Beklager, men det ser ut til at nettleseren din ikke støtter ' +
-        'denne opplevelsen',
+    string:
+      'Beklager, men det ser ut til at nettleseren din ikke støtter ' +
+      'denne opplevelsen',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/pa.js b/extensions/amp-story/1.0/_locales/pa.js
index 35001fbc76e3..796a54606565 100644
--- a/extensions/amp-story/1.0/_locales/pa.js
+++ b/extensions/amp-story/1.0/_locales/pa.js
@@ -51,16 +51,16 @@ const strings = {
     string: 'ਫਿਰ ਵੀ ਜਾਰੀ ਰੱਖੋ',
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL]: {
-    string: 'ਮੂਲ ਡੋਮੇਨ \'ਤੇ ਦੇਖੋ:',
+    string: "ਮੂਲ ਡੋਮੇਨ 'ਤੇ ਦੇਖੋ:",
   },
   [LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK]: {
     string: 'AMP ਨਤੀਜਿਆਂ ਬਾਰੇ ਹੋਰ ਜਾਣਕਾਰੀ',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'ਅੱਗੇ\' \'ਤੇ ਟੈਪ ਕਰੋ',
+    string: "'ਅੱਗੇ' 'ਤੇ ਟੈਪ ਕਰੋ",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'ਪਿੱਛੇ ਜਾਓ\' \'ਤੇ ਟੈਪ ਕਰੋ',
+    string: "'ਪਿੱਛੇ ਜਾਓ' 'ਤੇ ਟੈਪ ਕਰੋ",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'ਉੱਪਰ ਵੱਲ ਸਵਾਈਪ ਕਰੋ',
@@ -69,7 +69,7 @@ const strings = {
     string: 'ਵੀਡੀਓ ਚਲਾਓ',
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT]: {
-    string: 'ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ \'ਤੇ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ :(',
+    string: "ਲਿੰਕ ਨੂੰ ਕਲਿੱਪਬੋਰਡ 'ਤੇ ਕਾਪੀ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ :(",
   },
   [LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT]: {
     string: 'ਲਿੰਕ ਕਾਪੀ ਕੀਤਾ ਗਿਆ!',
@@ -117,15 +117,17 @@ const strings = {
     string: 'ਇਸ ਅਨੁਭਵ ਨੂੰ ਦੇਖਣ ਲਈ ਆਪਣੀ ਵਿੰਡੋ ਦੀ ਚੌੜਾਈ ਦਾ ਵਿਸਤਾਰ ਕਰੋ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'ਇਸ ਸਮੱਗਰੀ ਨੂੰ ਦੇਖਣ ਲਈ ਤੁਹਾਨੂੰ AMP ਕਹਾਣੀ ਪ੍ਰਯੋਗ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ' +
-        'ਲਾਜ਼ਮੀ ਹੈ।',
+    string:
+      'ਇਸ ਸਮੱਗਰੀ ਨੂੰ ਦੇਖਣ ਲਈ ਤੁਹਾਨੂੰ AMP ਕਹਾਣੀ ਪ੍ਰਯੋਗ ਨੂੰ ਚਾਲੂ ਕਰਨਾ ' +
+      'ਲਾਜ਼ਮੀ ਹੈ।',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'ਪੰਨਾ ਪੋਰਟ੍ਰੇਟ ਮੋਡ ਵਿੱਚ ਚੰਗੀ ਤਰ੍ਹਾਂ ਦਿਸਦਾ ਹੈ',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'ਮਾਫ਼ ਕਰਨਾ, ਇੰਝ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਇਸ ਅਨੁਭਵ ਦੀ ' +
-        'ਸੁਵਿਧਾ ਨਹੀਂ ਹੈ',
+    string:
+      'ਮਾਫ਼ ਕਰਨਾ, ਇੰਝ ਲੱਗਦਾ ਹੈ ਕਿ ਤੁਹਾਡੇ ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਇਸ ਅਨੁਭਵ ਦੀ ' +
+      'ਸੁਵਿਧਾ ਨਹੀਂ ਹੈ',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/pl.js b/extensions/amp-story/1.0/_locales/pl.js
index 4d57802e044c..fbdcca63779d 100644
--- a/extensions/amp-story/1.0/_locales/pl.js
+++ b/extensions/amp-story/1.0/_locales/pl.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Poszerz okno, by użyć tej funkcji',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Musisz włączyć eksperyment z relacją w technologii AMP, by ' +
-        'wyświetlić te treści.',
+    string:
+      'Musisz włączyć eksperyment z relacją w technologii AMP, by ' +
+      'wyświetlić te treści.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Tę stronę najlepiej oglądać w pionie',
diff --git a/extensions/amp-story/1.0/_locales/pt-BR.js b/extensions/amp-story/1.0/_locales/pt-BR.js
index d48ea3b46023..f40d5c40caf0 100644
--- a/extensions/amp-story/1.0/_locales/pt-BR.js
+++ b/extensions/amp-story/1.0/_locales/pt-BR.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Aumente a largura da janela para ver esta experiência',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Você precisa ativar o experimento amp-story para ver este ' +
-        'conteúdo.',
+    string:
+      'Você precisa ativar o experimento amp-story para ver este ' +
+      'conteúdo.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Melhor visualização da página no modo retrato',
diff --git a/extensions/amp-story/1.0/_locales/pt-PT.js b/extensions/amp-story/1.0/_locales/pt-PT.js
index 7b7543361ca3..237dcda3aa89 100644
--- a/extensions/amp-story/1.0/_locales/pt-PT.js
+++ b/extensions/amp-story/1.0/_locales/pt-PT.js
@@ -111,22 +111,25 @@ const strings = {
     string: 'Expanda a altura da janela para ver esta experiência.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Expanda a altura e a largura da sua janela para ver esta ' +
-        'experiência.',
+    string:
+      'Expanda a altura e a largura da sua janela para ver esta ' +
+      'experiência.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Expanda a largura da janela para ver esta experiência.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Tem de ativar a experiência da história AMP para ver este ' +
-        'conteúdo.',
+    string:
+      'Tem de ativar a experiência da história AMP para ver este ' +
+      'conteúdo.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Conseguirá visualizar melhor esta página no modo retrato.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Lamentamos, mas parece que o seu navegador não suporta esta ' +
-        'experiência.',
+    string:
+      'Lamentamos, mas parece que o seu navegador não suporta esta ' +
+      'experiência.',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/ro.js b/extensions/amp-story/1.0/_locales/ro.js
index fdebbcff6f79..2e0247dfc467 100644
--- a/extensions/amp-story/1.0/_locales/ro.js
+++ b/extensions/amp-story/1.0/_locales/ro.js
@@ -108,19 +108,20 @@ const strings = {
     string: 'Extindeți tweetul',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'Extindeți înălțimea ferestrei pentru a viziona această ' +
-        'experiență',
+    string: 'Extindeți înălțimea ferestrei pentru a viziona această experiență',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Extindeți înălțimea și lățimea ferestrei pentru a viziona ' +
-        'această experiență',
+    string:
+      'Extindeți înălțimea și lățimea ferestrei pentru a viziona ' +
+      'această experiență',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Extindeți lățimea ferestrei pentru a viziona această experiență',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Trebuie să activați experimentul pentru subiectul AMP ca să ' +
-        'vizionați acest conținut.',
+    string:
+      'Trebuie să activați experimentul pentru subiectul AMP ca să ' +
+      'vizionați acest conținut.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Pagina poate fi vizionată cel mai bine în modul portret',
diff --git a/extensions/amp-story/1.0/_locales/ru.js b/extensions/amp-story/1.0/_locales/ru.js
index ff15ccb60da9..578b98bfb018 100644
--- a/extensions/amp-story/1.0/_locales/ru.js
+++ b/extensions/amp-story/1.0/_locales/ru.js
@@ -111,15 +111,16 @@ const strings = {
     string: 'Увеличьте высоту окна браузера, чтобы посмотреть контент.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Увеличьте высоту и ширину окна браузера, чтобы посмотреть ' +
-        'контент.',
+    string:
+      'Увеличьте высоту и ширину окна браузера, чтобы посмотреть контент.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Увеличьте ширину окна браузера, чтобы посмотреть контент.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Для доступа к этому контенту нужно включить эксперимент с ' +
-        'AMP-историями.',
+    string:
+      'Для доступа к этому контенту нужно включить эксперимент с ' +
+      'AMP-историями.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Страница доступна только в вертикальной ориентации.',
diff --git a/extensions/amp-story/1.0/_locales/si.js b/extensions/amp-story/1.0/_locales/si.js
index 38ec1c6fc685..a0900262848a 100644
--- a/extensions/amp-story/1.0/_locales/si.js
+++ b/extensions/amp-story/1.0/_locales/si.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'AMP ප්‍රතිඵල ගැන තවත්',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'මීළඟ\' තට්ටු කරන්න',
+    string: "'මීළඟ' තට්ටු කරන්න",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'ආපසු\' තට්ටු කරන්න',
+    string: "'ආපසු' තට්ටු කරන්න",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'ඉහළට ස්වයිප් කරන්න',
diff --git a/extensions/amp-story/1.0/_locales/sk.js b/extensions/amp-story/1.0/_locales/sk.js
index f24842cf0ce4..77f0aa71d3c2 100644
--- a/extensions/amp-story/1.0/_locales/sk.js
+++ b/extensions/amp-story/1.0/_locales/sk.js
@@ -111,15 +111,17 @@ const strings = {
     string: 'Ak si chcete zobraziť toto prostredie, zväčšite výšku okna.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Ak si chcete zobraziť toto prostredie, zväčšite výšku aj šírku ' +
-        'okna.',
+    string:
+      'Ak si chcete zobraziť toto prostredie, zväčšite výšku aj šírku ' +
+      'okna.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Ak si chcete zobraziť toto prostredie, zväčšite šírku okna.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Ak si chcete zobraziť tento obsah, musíte povoliť experiment ' +
-        's príbehom AMP.',
+    string:
+      'Ak si chcete zobraziť tento obsah, musíte povoliť experiment ' +
+      's príbehom AMP.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Stránka sa najlepšie zobrazí v režime portrétu',
diff --git a/extensions/amp-story/1.0/_locales/sl.js b/extensions/amp-story/1.0/_locales/sl.js
index 713e434ae304..243ec5667a07 100644
--- a/extensions/amp-story/1.0/_locales/sl.js
+++ b/extensions/amp-story/1.0/_locales/sl.js
@@ -111,15 +111,16 @@ const strings = {
     string: 'Če si želite ogledati to izkušnjo, povečajte višino okna',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Če si želite ogledati to izkušnjo, povečajte višino in širino ' +
-        'okna',
+    string:
+      'Če si želite ogledati to izkušnjo, povečajte višino in širino okna',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Če si želite ogledati to izkušnjo, povečajte širino okna',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Če si želite ogledati to vsebino, morate omogočiti preizkus ' +
-        'zgodb amp.',
+    string:
+      'Če si želite ogledati to vsebino, morate omogočiti preizkus ' +
+      'zgodb amp.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Stran si je najbolje ogledati v pokončnem načinu',
diff --git a/extensions/amp-story/1.0/_locales/sq.js b/extensions/amp-story/1.0/_locales/sq.js
index 578f95d3c6bb..377707ec23b0 100644
--- a/extensions/amp-story/1.0/_locales/sq.js
+++ b/extensions/amp-story/1.0/_locales/sq.js
@@ -111,22 +111,25 @@ const strings = {
     string: 'Zgjero lartësinë e dritares për të shikuar këtë eksperiencë',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Zgjero lartësinë dhe gjerësinë e dritares sate për të shikuar ' +
-        'këtë eksperiencë',
+    string:
+      'Zgjero lartësinë dhe gjerësinë e dritares sate për të shikuar ' +
+      'këtë eksperiencë',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Zgjero gjeresinë e dritares për të shikuar këtë eksperiencë',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Duhet të aktivizosh eksperimentin e historisë së AMP për të ' +
-        'shikuar këtë përmbajtje.',
+    string:
+      'Duhet të aktivizosh eksperimentin e historisë së AMP për të ' +
+      'shikuar këtë përmbajtje.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Faqja shikohet më mirë në modalitetin e portretit',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Na vjen keq, por duket se shfletuesi yt nuk e mbështet këtë ' +
-        'eksperiencë',
+    string:
+      'Na vjen keq, por duket se shfletuesi yt nuk e mbështet këtë ' +
+      'eksperiencë',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/sr.js b/extensions/amp-story/1.0/_locales/sr.js
index d7640f0ac324..406fda247825 100644
--- a/extensions/amp-story/1.0/_locales/sr.js
+++ b/extensions/amp-story/1.0/_locales/sr.js
@@ -111,15 +111,17 @@ const strings = {
     string: 'Повећајте висину прозора да бисте прегледали овај доживљај',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Повећајте висину и ширину прозора да бисте прегледали овај ' +
-        'доживљај',
+    string:
+      'Повећајте висину и ширину прозора да бисте прегледали овај ' +
+      'доживљај',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Повећајте ширину прозора да бисте прегледали овај доживљај',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Морате да омогућите експеримент AMP вести да бисте прегледали ' +
-        'овај садржај.',
+    string:
+      'Морате да омогућите експеримент AMP вести да бисте прегледали ' +
+      'овај садржај.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Страница се најбоље прегледа у усправном режиму',
diff --git a/extensions/amp-story/1.0/_locales/sv.js b/extensions/amp-story/1.0/_locales/sv.js
index 474785c7852f..36498ae37b59 100644
--- a/extensions/amp-story/1.0/_locales/sv.js
+++ b/extensions/amp-story/1.0/_locales/sv.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Gör fönstret bredare om du vill kunna läsa bildinlägg',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Du måste aktivera experimentet med amp-story om du vill kunna ' +
-        'läsa bildinlägg.',
+    string:
+      'Du måste aktivera experimentet med amp-story om du vill kunna ' +
+      'läsa bildinlägg.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Sidan visas bäst i stående format',
diff --git a/extensions/amp-story/1.0/_locales/sw.js b/extensions/amp-story/1.0/_locales/sw.js
index af3eae80028c..4e1fca4ea9de 100644
--- a/extensions/amp-story/1.0/_locales/sw.js
+++ b/extensions/amp-story/1.0/_locales/sw.js
@@ -117,8 +117,7 @@ const strings = {
     string: 'Panua upana wa kidirisha chako ili uone hali hii',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Lazima uwashe jaribio la habari kwenye amp ili uone maudhui ' +
-        'haya.',
+    string: 'Lazima uwashe jaribio la habari kwenye amp ili uone maudhui haya.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Ukurasa hutazamwa vyema zaidi katika mkao wima',
diff --git a/extensions/amp-story/1.0/_locales/ta.js b/extensions/amp-story/1.0/_locales/ta.js
index 719f002b8f4e..d6932e85d1e0 100644
--- a/extensions/amp-story/1.0/_locales/ta.js
+++ b/extensions/amp-story/1.0/_locales/ta.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'AMP முடிவுகள் குறித்த கூடுதல் தகவல்',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: '\'அடுத்தது\' என்பதைத் தட்டவும்',
+    string: "'அடுத்தது' என்பதைத் தட்டவும்",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: '\'முந்தையது\' என்பதைத் தட்டவும்',
+    string: "'முந்தையது' என்பதைத் தட்டவும்",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'மேல்நோக்கி ஸ்வைப் செய்யவும்',
@@ -108,16 +108,19 @@ const strings = {
     string: 'ட்வீட்டை விரிவாக்கும்',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
-    string: 'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் உயரத்தை ' +
-        'விரிவுபடுத்தவும்',
+    string:
+      'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் உயரத்தை ' +
+      'விரிவுபடுத்தவும்',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் உயரத்தையும் ' +
-        'அகலத்தையும் விரிவுபடுத்தவும்',
+    string:
+      'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் உயரத்தையும் ' +
+      'அகலத்தையும் விரிவுபடுத்தவும்',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
-    string: 'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் அகலத்தை ' +
-        'விரிவுபடுத்தவும்',
+    string:
+      'இந்த அனுபவத்தைப் பார்க்க உங்கள் சாளரத்தின் அகலத்தை ' +
+      'விரிவுபடுத்தவும்',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
     string: 'இந்தக் கதைகளைப் பார்க்க AMP ஸ்டோரி சோதனையை இயக்க வேண்டும்.',
diff --git a/extensions/amp-story/1.0/_locales/te.js b/extensions/amp-story/1.0/_locales/te.js
index a6f4e72253f3..e7321aacf2c5 100644
--- a/extensions/amp-story/1.0/_locales/te.js
+++ b/extensions/amp-story/1.0/_locales/te.js
@@ -111,8 +111,7 @@ const strings = {
     string: 'ఈ కథనాన్ని చూడడానికి మీ విండో యొక్క ఎత్తును పెంచండి',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'ఈ కథనాన్ని చూడడానికి మీ విండో యొక్క ఎత్తు మరియు వెడల్పును ' +
-        'పెంచండి',
+    string: 'ఈ కథనాన్ని చూడడానికి మీ విండో యొక్క ఎత్తు మరియు వెడల్పును పెంచండి',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'ఈ కథనాన్ని చూడడానికి మీ విండో యొక్క వెడల్పును పెంచండి',
diff --git a/extensions/amp-story/1.0/_locales/tr.js b/extensions/amp-story/1.0/_locales/tr.js
index 2feef4dbcf0e..6f0249f0fac0 100644
--- a/extensions/amp-story/1.0/_locales/tr.js
+++ b/extensions/amp-story/1.0/_locales/tr.js
@@ -57,10 +57,10 @@ const strings = {
     string: 'AMP sonuçları hakkında daha fazla bilgi',
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL]: {
-    string: 'Sonraki\'ye dokunun',
+    string: "Sonraki'ye dokunun",
   },
   [LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL]: {
-    string: 'Geri\'ye dokunun',
+    string: "Geri'ye dokunun",
   },
   [LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL]: {
     string: 'Yukarı kaydır',
@@ -105,21 +105,23 @@ const strings = {
     string: 'WhatsApp',
   },
   [LocalizedStringId.AMP_STORY_TOOLTIP_EXPAND_TWEET]: {
-    string: 'Tweet\'i genişlet',
+    string: "Tweet'i genişlet",
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT]: {
     string: 'Bu deneyimi görebilmek için pencerenizin yüksekliğini artırın',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Bu deneyimi görebilmek için pencerenizin hem yüksekliğini hem ' +
-        'de genişliğini artırın',
+    string:
+      'Bu deneyimi görebilmek için pencerenizin hem yüksekliğini hem ' +
+      'de genişliğini artırın',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Bu deneyimi görebilmek için pencerenizin genişliğini artırın',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Bu içeriği görebilmek için amp hikayesi deneyimini ' +
-        'etkinleştirmeniz gerekir.',
+    string:
+      'Bu içeriği görebilmek için amp hikayesi deneyimini ' +
+      'etkinleştirmeniz gerekir.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Sayfa en iyi dikey modda görüntülenir',
diff --git a/extensions/amp-story/1.0/_locales/uk.js b/extensions/amp-story/1.0/_locales/uk.js
index d9759c69cfed..7997eafe62fd 100644
--- a/extensions/amp-story/1.0/_locales/uk.js
+++ b/extensions/amp-story/1.0/_locales/uk.js
@@ -117,8 +117,9 @@ const strings = {
     string: 'Щоб переглядати цей вміст, збільште ширину вікна',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Щоб переглядати цей вміст, потрібно ввімкнути експеримент з ' +
-        'AMP-історіями.',
+    string:
+      'Щоб переглядати цей вміст, потрібно ввімкнути експеримент з ' +
+      'AMP-історіями.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Цю сторінку найкраще переглядати в книжковій орієнтації',
diff --git a/extensions/amp-story/1.0/_locales/ur.js b/extensions/amp-story/1.0/_locales/ur.js
index 73aff851c7d7..87648b5e4c9e 100644
--- a/extensions/amp-story/1.0/_locales/ur.js
+++ b/extensions/amp-story/1.0/_locales/ur.js
@@ -111,22 +111,25 @@ const strings = {
     string: 'اس تجربے کو دیکھنے کے لیے اپنی ونڈو کی لمبائی کو پھیلائیں',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'اس تجربے کو دیکھنے کے لیے اپنی ونڈو کی لمبائی اور چوڑائی دونوں ' +
-        'کو پھیلائیں',
+    string:
+      'اس تجربے کو دیکھنے کے لیے اپنی ونڈو کی لمبائی اور چوڑائی دونوں ' +
+      'کو پھیلائیں',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'اس تجربے کو دیکھنے کے لیے اپنی ونڈو کی چوڑائی کو پھیلائیں',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'اس مواد کو دیکھنے کے لیے آپ کو amp کہانی کے تجربے کو فعال کرنا ' +
-        'ہوگا۔',
+    string:
+      'اس مواد کو دیکھنے کے لیے آپ کو amp کہانی کے تجربے کو فعال کرنا ' +
+      'ہوگا۔',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'پورٹریٹ وضع میں صفحہ بہت اچھی طرح نظر آتا ہے',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'ہمیں افسوس ہے، لگتا ہے کہ آپ کا براؤزر اس تجربے کو سپورٹ نہیں ' +
-        'کرتا ہے',
+    string:
+      'ہمیں افسوس ہے، لگتا ہے کہ آپ کا براؤزر اس تجربے کو سپورٹ نہیں ' +
+      'کرتا ہے',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/vi.js b/extensions/amp-story/1.0/_locales/vi.js
index 6c52d373ec83..67ad4f8f17f6 100644
--- a/extensions/amp-story/1.0/_locales/vi.js
+++ b/extensions/amp-story/1.0/_locales/vi.js
@@ -123,8 +123,9 @@ const strings = {
     string: 'Trang này được xem tốt nhất ở chế độ chân dung',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Rất tiếc, có vẻ như trình duyệt của bạn không hỗ trợ trải ' +
-        'nghiệm này',
+    string:
+      'Rất tiếc, có vẻ như trình duyệt của bạn không hỗ trợ trải ' +
+      'nghiệm này',
   },
 };
 
diff --git a/extensions/amp-story/1.0/_locales/zu.js b/extensions/amp-story/1.0/_locales/zu.js
index e2d39162c062..7fcacbb9ef0d 100644
--- a/extensions/amp-story/1.0/_locales/zu.js
+++ b/extensions/amp-story/1.0/_locales/zu.js
@@ -111,22 +111,23 @@ const strings = {
     string: 'Nweba ubude bewindi lakho ukuze ubuke lo muzwa',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT]: {
-    string: 'Nweba kokubili ubude nobubanzi bewindi lakho ukuze ubuke lo ' +
-        'muzwa',
+    string: 'Nweba kokubili ubude nobubanzi bewindi lakho ukuze ubuke lo muzwa',
   },
   [LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT]: {
     string: 'Nweba ububanzi bewindi lakho ukuze ubuke lo muzwa',
   },
   [LocalizedStringId.AMP_STORY_WARNING_EXPERIMENT_DISABLED_TEXT]: {
-    string: 'Kuzomele unike amandla umuzwa wendaba ye-amp ukuze ubuke lokhu ' +
-        'okuqukethwe.',
+    string:
+      'Kuzomele unike amandla umuzwa wendaba ye-amp ukuze ubuke lokhu ' +
+      'okuqukethwe.',
   },
   [LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT]: {
     string: 'Ikhasi libukwa kahle kakhulu kumodi yokuma ngobude',
   },
   [LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT]: {
-    string: 'Siyaxolisa, kubonakala sengathi isiphequluli sakho asisekeli lo ' +
-        'muzwa',
+    string:
+      'Siyaxolisa, kubonakala sengathi isiphequluli sakho asisekeli lo ' +
+      'muzwa',
   },
 };
 
diff --git a/extensions/amp-story/1.0/amp-story-access.js b/extensions/amp-story/1.0/amp-story-access.js
index 829125b4430f..dbc6f4a2b390 100644
--- a/extensions/amp-story/1.0/amp-story-access.js
+++ b/extensions/amp-story/1.0/amp-story-access.js
@@ -33,7 +33,6 @@ import {isArray, isObject} from '../../../src/types';
 import {parseJson} from '../../../src/json';
 import {setImportantStyles} from '../../../src/style';
 
-
 /** @const {string} */
 const TAG = 'amp-story-access';
 
@@ -105,9 +104,11 @@ export class AmpStoryAccess extends AMP.BaseElement {
     const drawerEl = this.renderDrawerEl_();
 
     this.containerEl_ = dev().assertElement(
-        drawerEl.querySelector('.i-amphtml-story-access-container'));
+      drawerEl.querySelector('.i-amphtml-story-access-container')
+    );
     const contentEl = dev().assertElement(
-        drawerEl.querySelector('.i-amphtml-story-access-content'));
+      drawerEl.querySelector('.i-amphtml-story-access-content')
+    );
 
     copyChildren(this.element, contentEl);
     removeChildren(this.element);
@@ -132,10 +133,13 @@ export class AmpStoryAccess extends AMP.BaseElement {
       this.onAccessStateChange_(isAccess);
     });
 
-    this.storeService_
-        .subscribe(StateProperty.CURRENT_PAGE_INDEX, currentPageIndex => {
-          this.onCurrentPageIndexChange_(currentPageIndex);
-        }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.CURRENT_PAGE_INDEX,
+      currentPageIndex => {
+        this.onCurrentPageIndexChange_(currentPageIndex);
+      },
+      true /** callToInitialize */
+    );
 
     this.element.addEventListener('click', event => this.onClick_(event));
   }
@@ -218,9 +222,9 @@ export class AmpStoryAccess extends AMP.BaseElement {
         const logoSrc = this.getLogoSrc_();
 
         if (logoSrc) {
-          const logoEl =
-              dev().assertElement(
-                  drawerEl.querySelector('.i-amphtml-story-access-logo'));
+          const logoEl = dev().assertElement(
+            drawerEl.querySelector('.i-amphtml-story-access-logo')
+          );
           setImportantStyles(logoEl, {'background-image': `url(${logoSrc})`});
         }
 
@@ -230,8 +234,11 @@ export class AmpStoryAccess extends AMP.BaseElement {
         return getNotificationTemplate(this.element);
         break;
       default:
-        user().error(TAG, 'Unknown "type" attribute, expected one of: ' +
-            'blocking, notification.');
+        user().error(
+          TAG,
+          'Unknown "type" attribute, expected one of: ' +
+            'blocking, notification.'
+        );
     }
   }
 
@@ -243,13 +250,16 @@ export class AmpStoryAccess extends AMP.BaseElement {
    */
   getLogoSrc_() {
     const storyEl = dev().assertElement(
-        closestAncestorElementBySelector(this.element, 'AMP-STORY'));
+      closestAncestorElementBySelector(this.element, 'AMP-STORY')
+    );
     const logoSrc = storyEl && storyEl.getAttribute('publisher-logo-src');
 
-    logoSrc ?
-      assertHttpsUrl(logoSrc, storyEl, 'publisher-logo-src') :
-      user().warn(
-          TAG, 'Expected "publisher-logo-src" attribute on <amp-story>');
+    logoSrc
+      ? assertHttpsUrl(logoSrc, storyEl, 'publisher-logo-src')
+      : user().warn(
+          TAG,
+          'Expected "publisher-logo-src" attribute on <amp-story>'
+        );
 
     return logoSrc;
   }
@@ -268,14 +278,15 @@ export class AmpStoryAccess extends AMP.BaseElement {
    * @private
    */
   whitelistActions_() {
-    const accessEl =
-        dev().assertElement(
-            this.win.document.getElementById('amp-access'),
-            'Cannot find the amp-access configuration');
+    const accessEl = dev().assertElement(
+      this.win.document.getElementById('amp-access'),
+      'Cannot find the amp-access configuration'
+    );
 
     // Configuration validation is handled by the amp-access extension.
-    let accessConfig =
-    /** @type {!Array|!Object} */ (parseJson(accessEl.textContent));
+    let accessConfig = /** @type {!Array|!Object} */ (parseJson(
+      accessEl.textContent
+    ));
 
     if (!isArray(accessConfig)) {
       accessConfig = [accessConfig];
@@ -284,7 +295,8 @@ export class AmpStoryAccess extends AMP.BaseElement {
       // namespace, we want to allow actions with or without namespace.
       if (accessConfig[0].namespace) {
         accessConfig.push(
-            Object.assign({}, accessConfig[0], {namespace: undefined}));
+          Object.assign({}, accessConfig[0], {namespace: undefined})
+        );
       }
     }
 
@@ -295,8 +307,9 @@ export class AmpStoryAccess extends AMP.BaseElement {
 
       if (isObject(login)) {
         const types = Object.keys(login);
-        types.forEach(
-            type => actions.push(this.getActionObject_(namespace, type)));
+        types.forEach(type =>
+          actions.push(this.getActionObject_(namespace, type))
+        );
       } else {
         actions.push(this.getActionObject_(namespace));
       }
diff --git a/extensions/amp-story/1.0/amp-story-consent.js b/extensions/amp-story/1.0/amp-story-consent.js
index f8909b699336..d92537c5b13e 100644
--- a/extensions/amp-story/1.0/amp-story-consent.js
+++ b/extensions/amp-story/1.0/amp-story-consent.js
@@ -42,7 +42,6 @@ import {isArray} from '../../../src/types';
 import {parseJson} from '../../../src/json';
 import {renderAsElement} from './simple-template';
 
-
 /** @const {string} */
 const TAG = 'amp-story-consent';
 
@@ -67,7 +66,8 @@ const DEFAULT_OPTIONAL_PARAMETERS = {
 const getTemplate = (config, consentId, logoSrc) => ({
   tag: 'div',
   attrs: dict({
-    'class': 'i-amphtml-story-consent i-amphtml-story-system-reset'}),
+    'class': 'i-amphtml-story-consent i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -85,8 +85,9 @@ const getTemplate = (config, consentId, logoSrc) => ({
                   tag: 'div',
                   attrs: dict({
                     'class': 'i-amphtml-story-consent-logo',
-                    'style': logoSrc ?
-                      `background-image: url('${logoSrc}') !important;` : '',
+                    'style': logoSrc
+                      ? `background-image: url('${logoSrc}') !important;`
+                      : '',
                   }),
                   children: [],
                 },
@@ -111,22 +112,23 @@ const getTemplate = (config, consentId, logoSrc) => ({
                 {
                   tag: 'ul',
                   attrs: dict({'class': 'i-amphtml-story-consent-vendors'}),
-                  children: config.vendors && config.vendors.map(vendor => (
-                    {
+                  children:
+                    config.vendors &&
+                    config.vendors.map(vendor => ({
                       tag: 'li',
                       attrs: dict({'class': 'i-amphtml-story-consent-vendor'}),
                       children: [],
                       unlocalizedString: vendor,
-                    })
-                  ),
+                    })),
                 },
                 {
                   tag: 'a',
                   attrs: dict({
-                    'class': 'i-amphtml-story-consent-external-link ' +
-                        (!(config.externalLink.title &&
-                            config.externalLink.href) ?
-                          'i-amphtml-hidden' : ''),
+                    'class':
+                      'i-amphtml-story-consent-external-link ' +
+                      (!(config.externalLink.title && config.externalLink.href)
+                        ? 'i-amphtml-hidden'
+                        : ''),
                     'href': config.externalLink.href,
                     'target': '_top',
                     'title': config.externalLink.title,
@@ -145,25 +147,27 @@ const getTemplate = (config, consentId, logoSrc) => ({
             {
               tag: 'button',
               attrs: dict({
-                'class': 'i-amphtml-story-consent-action ' +
-                    'i-amphtml-story-consent-action-reject' +
-                    (config.onlyAccept === true ? ' i-amphtml-hidden' : ''),
+                'class':
+                  'i-amphtml-story-consent-action ' +
+                  'i-amphtml-story-consent-action-reject' +
+                  (config.onlyAccept === true ? ' i-amphtml-hidden' : ''),
                 'on': `tap:${consentId}.reject`,
               }),
               children: [],
               localizedStringId:
-                  LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL,
+                LocalizedStringId.AMP_STORY_CONSENT_DECLINE_BUTTON_LABEL,
             },
             {
               tag: 'button',
               attrs: dict({
-                'class': 'i-amphtml-story-consent-action ' +
-                    'i-amphtml-story-consent-action-accept',
+                'class':
+                  'i-amphtml-story-consent-action ' +
+                  'i-amphtml-story-consent-action-accept',
                 'on': `tap:${consentId}.accept`,
               }),
               children: [],
               localizedStringId:
-                  LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL,
+                LocalizedStringId.AMP_STORY_CONSENT_ACCEPT_BUTTON_LABEL,
             },
           ],
         },
@@ -201,25 +205,31 @@ export class AmpStoryConsent extends AMP.BaseElement {
     this.assertAndParseConfig_();
 
     const storyEl = dev().assertElement(
-        closestAncestorElementBySelector(this.element, 'AMP-STORY'));
-    const consentEl = closestAncestorElementBySelector(this.element,
-        'AMP-CONSENT');
+      closestAncestorElementBySelector(this.element, 'AMP-STORY')
+    );
+    const consentEl = closestAncestorElementBySelector(
+      this.element,
+      'AMP-CONSENT'
+    );
     const consentId = consentEl.id;
 
     this.storeConsentId_(consentId);
 
     const logoSrc = storyEl && storyEl.getAttribute('publisher-logo-src');
 
-    logoSrc ?
-      assertHttpsUrl(logoSrc, storyEl, 'publisher-logo-src') :
-      user().warn(
-          TAG, 'Expected "publisher-logo-src" attribute on <amp-story>');
+    logoSrc
+      ? assertHttpsUrl(logoSrc, storyEl, 'publisher-logo-src')
+      : user().warn(
+          TAG,
+          'Expected "publisher-logo-src" attribute on <amp-story>'
+        );
 
     // Story consent config is set by the `assertAndParseConfig_` method.
     if (this.storyConsentConfig_) {
       this.storyConsentEl_ = renderAsElement(
-          this.win.document,
-          getTemplate(this.storyConsentConfig_, consentId, logoSrc));
+        this.win.document,
+        getTemplate(this.storyConsentConfig_, consentId, logoSrc)
+      );
       createShadowRootWithStyle(this.element, this.storyConsentEl_, CSS);
 
       // Allow <amp-consent> actions in STAMP (defaults to no actions allowed).
@@ -246,11 +256,18 @@ export class AmpStoryConsent extends AMP.BaseElement {
    */
   initializeListeners_() {
     this.storyConsentEl_.addEventListener(
-        'click', event => this.onClick_(event), true /** useCapture */);
-
-    this.storeService_.subscribe(StateProperty.RTL_STATE, rtlState => {
-      this.onRtlStateUpdate_(rtlState);
-    }, true /** callToInitialize */);
+      'click',
+      event => this.onClick_(event),
+      true /** useCapture */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.RTL_STATE,
+      rtlState => {
+        this.onRtlStateUpdate_(rtlState);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -275,9 +292,9 @@ export class AmpStoryConsent extends AMP.BaseElement {
    */
   onRtlStateUpdate_(rtlState) {
     const mutator = () => {
-      rtlState ?
-        this.storyConsentEl_.setAttribute('dir', 'rtl') :
-        this.storyConsentEl_.removeAttribute('dir');
+      rtlState
+        ? this.storyConsentEl_.setAttribute('dir', 'rtl')
+        : this.storyConsentEl_.removeAttribute('dir');
     };
 
     this.mutateElement(mutator, this.storyConsentEl_);
@@ -304,38 +321,49 @@ export class AmpStoryConsent extends AMP.BaseElement {
     const storyConsentScript = childElementByTag(this.element, 'script');
 
     userAssert(
-        storyConsentScript && isJsonScriptTag(storyConsentScript),
-        `${TAG} config should be put in a <script> tag with ` +
-        'type="application/json"');
+      storyConsentScript && isJsonScriptTag(storyConsentScript),
+      `${TAG} config should be put in a <script> tag with ` +
+        'type="application/json"'
+    );
 
-    this.storyConsentConfig_ =
-        Object.assign(
-            {},
-            DEFAULT_OPTIONAL_PARAMETERS,
-            /** @type {Object} */ (parseJson(storyConsentScript.textContent)));
+    this.storyConsentConfig_ = Object.assign(
+      {},
+      DEFAULT_OPTIONAL_PARAMETERS,
+      /** @type {Object} */ (parseJson(storyConsentScript.textContent))
+    );
 
     user().assertString(
-        this.storyConsentConfig_.title, `${TAG}: config requires a title`);
+      this.storyConsentConfig_.title,
+      `${TAG}: config requires a title`
+    );
     user().assertString(
-        this.storyConsentConfig_.message, `${TAG}: config requires a message`);
+      this.storyConsentConfig_.message,
+      `${TAG}: config requires a message`
+    );
     userAssert(
-        this.storyConsentConfig_.vendors &&
-            isArray(this.storyConsentConfig_.vendors),
-        `${TAG}: config requires an array of vendors`);
+      this.storyConsentConfig_.vendors &&
+        isArray(this.storyConsentConfig_.vendors),
+      `${TAG}: config requires an array of vendors`
+    );
     user().assertBoolean(
-        this.storyConsentConfig_.onlyAccept,
-        `${TAG}: config requires "onlyAccept" to be a boolean`);
+      this.storyConsentConfig_.onlyAccept,
+      `${TAG}: config requires "onlyAccept" to be a boolean`
+    );
 
     // Runs the validation if any of the title or link are provided, since
     // both have to be provided for the external link to be displayed.
-    if (this.storyConsentConfig_.externalLink.href ||
-        this.storyConsentConfig_.externalLink.title) {
+    if (
+      this.storyConsentConfig_.externalLink.href ||
+      this.storyConsentConfig_.externalLink.title
+    ) {
       user().assertString(
-          this.storyConsentConfig_.externalLink.title,
-          `${TAG}: config requires "externalLink.title" to be a string`);
+        this.storyConsentConfig_.externalLink.title,
+        `${TAG}: config requires "externalLink.title" to be a string`
+      );
       user().assertString(
-          this.storyConsentConfig_.externalLink.href,
-          `${TAG}: config requires "externalLink.href" to be an absolute URL`);
+        this.storyConsentConfig_.externalLink.href,
+        `${TAG}: config requires "externalLink.href" to be an absolute URL`
+      );
       assertAbsoluteHttpOrHttpsUrl(this.storyConsentConfig_.externalLink.href);
     }
   }
@@ -376,9 +404,11 @@ export class AmpStoryConsent extends AMP.BaseElement {
    * @private
    */
   setAcceptButtonFontColor_() {
-    const buttonEl =
-        dev().assertElement(this.storyConsentEl_
-            .querySelector('.i-amphtml-story-consent-action-accept'));
+    const buttonEl = dev().assertElement(
+      this.storyConsentEl_.querySelector(
+        '.i-amphtml-story-consent-action-accept'
+      )
+    );
     const styles = computedStyle(this.win, buttonEl);
 
     const rgb = getRGBFromCssColorValue(styles['background-color']);
diff --git a/extensions/amp-story/1.0/amp-story-cta-layer.js b/extensions/amp-story/1.0/amp-story-cta-layer.js
index cdbed9237157..3ff6bdb648f6 100644
--- a/extensions/amp-story/1.0/amp-story-cta-layer.js
+++ b/extensions/amp-story/1.0/amp-story-cta-layer.js
@@ -49,7 +49,6 @@ const TAG = 'amp-story-cta-layer';
  * while the user is looking.
  */
 export class AmpStoryCtaLayer extends AmpStoryBaseLayer {
-
   /** @override */
   buildCallback() {
     super.buildCallback();
@@ -85,11 +84,18 @@ export class AmpStoryCtaLayer extends AmpStoryBaseLayer {
    * @private
    */
   checkAndRemoveLayerIfOnFirstPage_() {
-    if (matches(this.element,
-        'amp-story-page:first-of-type > amp-story-cta-layer')) {
+    if (
+      matches(
+        this.element,
+        'amp-story-page:first-of-type > amp-story-cta-layer'
+      )
+    ) {
       removeElement(this.element);
-      user().error(TAG, 'amp-story-cta-layer is not allowed on the first page' +
-          ' of an amp-story.');
+      user().error(
+        TAG,
+        'amp-story-cta-layer is not allowed on the first page' +
+          ' of an amp-story.'
+      );
     }
   }
 }
diff --git a/extensions/amp-story/1.0/amp-story-embedded-component.js b/extensions/amp-story/1.0/amp-story-embedded-component.js
index 5f5e3cdd2752..61bc7ca6b40c 100644
--- a/extensions/amp-story/1.0/amp-story-embedded-component.js
+++ b/extensions/amp-story/1.0/amp-story-embedded-component.js
@@ -34,12 +34,7 @@ import {dict} from '../../../src/utils/object';
 import {getAmpdoc} from '../../../src/service';
 import {htmlFor, htmlRefs} from '../../../src/static-template';
 import {isProtocolValid, parseUrlDeprecated} from '../../../src/url';
-import {
-  px,
-  resetStyles,
-  setImportantStyles,
-  toggle,
-} from '../../../src/style';
+import {px, resetStyles, setImportantStyles, toggle} from '../../../src/style';
 
 /**
  * Action icons to be placed in tooltip.
@@ -85,8 +80,11 @@ const LAUNCHABLE_COMPONENTS = {
  * @private
  * @const {!Object}
  */
-const INTERACTIVE_COMPONENTS = Object.assign({}, EXPANDABLE_COMPONENTS,
-    LAUNCHABLE_COMPONENTS);
+const INTERACTIVE_COMPONENTS = Object.assign(
+  {},
+  EXPANDABLE_COMPONENTS,
+  LAUNCHABLE_COMPONENTS
+);
 
 /**
  * Gets the list of components with their respective selectors.
@@ -98,9 +96,9 @@ function getComponentSelectors(components, opt_predicate) {
   const componentSelectors = {};
 
   Object.keys(components).forEach(componentName => {
-    componentSelectors[componentName] = opt_predicate ?
-      components[componentName].selector + opt_predicate :
-      components[componentName].selector;
+    componentSelectors[componentName] = opt_predicate
+      ? components[componentName].selector + opt_predicate
+      : components[componentName].selector;
   });
 
   return componentSelectors;
@@ -115,20 +113,26 @@ const INTERACTIVE_EMBED_SELECTOR = '[interactive]';
  */
 export function expandableElementsSelectors() {
   // Using indirect invocation to prevent no-export-side-effect issue.
-  return getComponentSelectors(EXPANDABLE_COMPONENTS,
-      INTERACTIVE_EMBED_SELECTOR);
+  return getComponentSelectors(
+    EXPANDABLE_COMPONENTS,
+    INTERACTIVE_EMBED_SELECTOR
+  );
 }
 
 /**
  * Contains all interactive component CSS selectors.
  * @type {!Object}
  */
-const interactiveSelectors = Object.assign({},
-    getComponentSelectors(LAUNCHABLE_COMPONENTS),
-    getComponentSelectors(EXPANDABLE_COMPONENTS, INTERACTIVE_EMBED_SELECTOR),
-    {EXPANDED_VIEW_OVERLAY: '.i-amphtml-story-expanded-view-overflow, ' +
-    '.i-amphtml-expanded-view-close-button',
-    });
+const interactiveSelectors = Object.assign(
+  {},
+  getComponentSelectors(LAUNCHABLE_COMPONENTS),
+  getComponentSelectors(EXPANDABLE_COMPONENTS, INTERACTIVE_EMBED_SELECTOR),
+  {
+    EXPANDED_VIEW_OVERLAY:
+      '.i-amphtml-story-expanded-view-overflow, ' +
+      '.i-amphtml-expanded-view-close-button',
+  }
+);
 
 /**
  * All selectors that should delegate to the AmpStoryEmbeddedComponent class.
@@ -307,10 +311,12 @@ export class AmpStoryEmbeddedComponent {
     /** @private */
     this.embedsToBePaused_ = [];
 
-    this.storeService_.subscribe(StateProperty.INTERACTIVE_COMPONENT_STATE,
-        /** @param {!InteractiveComponentDef} component */ component => {
-          this.onComponentStateUpdate_(component);
-        });
+    this.storeService_.subscribe(
+      StateProperty.INTERACTIVE_COMPONENT_STATE,
+      /** @param {!InteractiveComponentDef} component */ component => {
+        this.onComponentStateUpdate_(component);
+      }
+    );
 
     /** @private {EmbeddedComponentState} */
     this.state_ = EmbeddedComponentState.HIDDEN;
@@ -334,9 +340,11 @@ export class AmpStoryEmbeddedComponent {
         break;
       case EmbeddedComponentState.FOCUSED:
         if (this.state_ !== EmbeddedComponentState.HIDDEN) {
-          dev().warn(TAG,
-              `Invalid component update. Not possible to go from ${this.state_}
-              to ${component.state}`);
+          dev().warn(
+            TAG,
+            `Invalid component update. Not possible to go from ${this.state_}
+              to ${component.state}`
+          );
         }
         this.setState_(EmbeddedComponentState.FOCUSED, component);
         break;
@@ -346,9 +354,11 @@ export class AmpStoryEmbeddedComponent {
         } else if (this.state_ === EmbeddedComponentState.EXPANDED) {
           this.maybeCloseExpandedView_(component.element);
         } else {
-          dev().warn(TAG,
-              `Invalid component update. Not possible to go from ${this.state_}
-               to ${component.state}`);
+          dev().warn(
+            TAG,
+            `Invalid component update. Not possible to go from ${this.state_}
+               to ${component.state}`
+          );
         }
         break;
     }
@@ -407,7 +417,9 @@ export class AmpStoryEmbeddedComponent {
       this.expandedViewOverlay_ &&
         this.resources_.mutateElement(this.expandedViewOverlay_, () => {
           this.componentPage_.classList.toggle(
-              'i-amphtml-expanded-mode', false);
+            'i-amphtml-expanded-mode',
+            false
+          );
           toggle(dev().assertElement(this.expandedViewOverlay_), false);
           this.closeExpandedEl_();
         });
@@ -416,16 +428,19 @@ export class AmpStoryEmbeddedComponent {
 
     this.animateExpanded_(devAssert(targetToExpand));
 
-    this.expandedViewOverlay_ = this.componentPage_
-        .querySelector('.i-amphtml-story-expanded-view-overflow');
+    this.expandedViewOverlay_ = this.componentPage_.querySelector(
+      '.i-amphtml-story-expanded-view-overflow'
+    );
     if (!this.expandedViewOverlay_) {
       this.buildAndAppendExpandedViewOverlay_();
     }
     this.resources_.mutateElement(
-        dev().assertElement(this.expandedViewOverlay_), () => {
-          toggle(dev().assertElement(this.expandedViewOverlay_), true);
-          this.componentPage_.classList.toggle('i-amphtml-expanded-mode', true);
-        });
+      dev().assertElement(this.expandedViewOverlay_),
+      () => {
+        toggle(dev().assertElement(this.expandedViewOverlay_), true);
+        this.componentPage_.classList.toggle('i-amphtml-expanded-mode', true);
+      }
+    );
   }
 
   /**
@@ -434,8 +449,10 @@ export class AmpStoryEmbeddedComponent {
    */
   buildAndAppendExpandedViewOverlay_() {
     this.expandedViewOverlay_ = buildExpandedViewOverlay(this.storyEl_);
-    this.resources_.mutateElement(dev().assertElement(this.componentPage_),
-        () => this.componentPage_.appendChild(this.expandedViewOverlay_));
+    this.resources_.mutateElement(
+      dev().assertElement(this.componentPage_),
+      () => this.componentPage_.appendChild(this.expandedViewOverlay_)
+    );
   }
 
   /**
@@ -445,13 +462,18 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   maybeCloseExpandedView_(target, forceClose = false) {
-    if ((target && matches(target, '.i-amphtml-expanded-view-close-button')) ||
-      forceClose) {
+    if (
+      (target && matches(target, '.i-amphtml-expanded-view-close-button')) ||
+      forceClose
+    ) {
       // Target is expanded and going into hidden mode.
       this.close_();
       this.toggleExpandedView_(null);
-      this.tooltip_.removeEventListener('click', this.expandComponentHandler_,
-          true /** capture */);
+      this.tooltip_.removeEventListener(
+        'click',
+        this.expandComponentHandler_,
+        true /** capture */
+      );
     }
   }
 
@@ -462,12 +484,14 @@ export class AmpStoryEmbeddedComponent {
   buildFocusedState_() {
     this.shadowRoot_ = this.win_.document.createElement('div');
 
-    this.focusedStateOverlay_ =
-      devAssert(this.buildFocusedStateTemplate_(this.win_.document));
+    this.focusedStateOverlay_ = devAssert(
+      this.buildFocusedStateTemplate_(this.win_.document)
+    );
     createShadowRootWithStyle(this.shadowRoot_, this.focusedStateOverlay_, CSS);
 
-    this.focusedStateOverlay_
-        .addEventListener('click', event => this.onOutsideTooltipClick_(event));
+    this.focusedStateOverlay_.addEventListener('click', event =>
+      this.onOutsideTooltipClick_(event)
+    );
 
     return this.shadowRoot_;
   }
@@ -483,8 +507,9 @@ export class AmpStoryEmbeddedComponent {
       this.clearTooltip_();
     }, TOOLTIP_CLOSE_ANIMATION_MS);
 
-    this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT,
-        {state: EmbeddedComponentState.HIDDEN});
+    this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
+      state: EmbeddedComponentState.HIDDEN,
+    });
   }
 
   /**
@@ -496,11 +521,11 @@ export class AmpStoryEmbeddedComponent {
   onFocusedStateUpdate_(component) {
     if (!component) {
       this.resources_.mutateElement(
-          dev().assertElement(this.focusedStateOverlay_),
-          () => {
-            this.focusedStateOverlay_
-                .classList.toggle('i-amphtml-hidden', true);
-          });
+        dev().assertElement(this.focusedStateOverlay_),
+        () => {
+          this.focusedStateOverlay_.classList.toggle('i-amphtml-hidden', true);
+        }
+      );
       return;
     }
 
@@ -527,15 +552,16 @@ export class AmpStoryEmbeddedComponent {
   buildTooltip_(component) {
     this.updateTooltipBehavior_(component.element);
     this.updateTooltipEl_(component);
-    this.componentPage_ = devAssert(this.storyEl_.querySelector(
-        'amp-story-page[active]'));
+    this.componentPage_ = devAssert(
+      this.storyEl_.querySelector('amp-story-page[active]')
+    );
 
     this.resources_.mutateElement(
-        dev().assertElement(this.focusedStateOverlay_),
-        () => {
-          this.focusedStateOverlay_
-              .classList.toggle('i-amphtml-hidden', false);
-        });
+      dev().assertElement(this.focusedStateOverlay_),
+      () => {
+        this.focusedStateOverlay_.classList.toggle('i-amphtml-hidden', false);
+      }
+    );
   }
 
   /**
@@ -543,9 +569,13 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(StateProperty.CURRENT_PAGE_ID, () => {
       // Hide active tooltip when page switch is triggered by keyboard or
@@ -557,8 +587,10 @@ export class AmpStoryEmbeddedComponent {
       // Hide expanded view when page switch is triggered by keyboard or desktop
       // buttons.
       if (this.state_ === EmbeddedComponentState.EXPANDED) {
-        this.maybeCloseExpandedView_(null /** target */,
-            true /** forceClose */);
+        this.maybeCloseExpandedView_(
+          null /** target */,
+          true /** forceClose */
+        );
       }
 
       // Pauses content inside embeds when a page change occurs.
@@ -577,12 +609,13 @@ export class AmpStoryEmbeddedComponent {
    */
   onUIStateUpdate_(uiState) {
     this.resources_.mutateElement(
-        dev().assertElement(this.focusedStateOverlay_),
-        () => {
-          [UIType.DESKTOP_FULLBLEED, UIType.DESKTOP_PANELS].includes(uiState) ?
-            this.focusedStateOverlay_.setAttribute('desktop', '') :
-            this.focusedStateOverlay_.removeAttribute('desktop');
-        });
+      dev().assertElement(this.focusedStateOverlay_),
+      () => {
+        [UIType.DESKTOP_FULLBLEED, UIType.DESKTOP_PANELS].includes(uiState)
+          ? this.focusedStateOverlay_.setAttribute('desktop', '')
+          : this.focusedStateOverlay_.removeAttribute('desktop');
+      }
+    );
   }
 
   /**
@@ -591,9 +624,11 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   updateTooltipEl_(component) {
-    const embedConfig = /** @type {!Object} */ (
-      userAssert(this.getEmbedConfigFor_(component.element),
-          'Invalid embed config for target', component.element));
+    const embedConfig = /** @type {!Object} */ (userAssert(
+      this.getEmbedConfigFor_(component.element),
+      'Invalid embed config for target',
+      component.element
+    ));
 
     this.updateTooltipText_(component.element, embedConfig);
     this.updateTooltipComponentIcon_(component.element, embedConfig);
@@ -608,14 +643,19 @@ export class AmpStoryEmbeddedComponent {
    */
   updateTooltipBehavior_(target) {
     if (matches(target, LAUNCHABLE_COMPONENTS['a'].selector)) {
-      addAttributesToElement(dev().assertElement(this.tooltip_),
-          dict({'href': this.getElementHref_(target)}));
+      addAttributesToElement(
+        dev().assertElement(this.tooltip_),
+        dict({'href': this.getElementHref_(target)})
+      );
       return;
     }
 
     if (EXPANDABLE_COMPONENTS[target.tagName.toLowerCase()]) {
-      this.tooltip_.addEventListener('click', this.expandComponentHandler_,
-          true);
+      this.tooltip_.addEventListener(
+        'click',
+        this.expandComponentHandler_,
+        true
+      );
     }
   }
 
@@ -629,7 +669,9 @@ export class AmpStoryEmbeddedComponent {
     event.stopPropagation();
 
     this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
-      state: EmbeddedComponentState.EXPANDED, element: this.triggeringTarget_});
+      state: EmbeddedComponentState.EXPANDED,
+      element: this.triggeringTarget_,
+    });
   }
 
   /**
@@ -668,15 +710,21 @@ export class AmpStoryEmbeddedComponent {
    */
   closeExpandedEl_() {
     this.triggeringTarget_.classList.toggle(
-        'i-amphtml-expanded-component', false);
-    const embedId =
-      this.triggeringTarget_.getAttribute(EMBED_ID_ATTRIBUTE_NAME);
-
-    const embedStyleEl = dev().assertElement(embedStyleEls[embedId],
-        `Failed to look up embed style element with ID ${embedId}`);
-
-    embedStyleEl[AMP_EMBED_DATA].transform =
-      `scale(${embedStyleEl[AMP_EMBED_DATA].scaleFactor})`;
+      'i-amphtml-expanded-component',
+      false
+    );
+    const embedId = this.triggeringTarget_.getAttribute(
+      EMBED_ID_ATTRIBUTE_NAME
+    );
+
+    const embedStyleEl = dev().assertElement(
+      embedStyleEls[embedId],
+      `Failed to look up embed style element with ID ${embedId}`
+    );
+
+    embedStyleEl[AMP_EMBED_DATA].transform = `scale(${
+      embedStyleEl[AMP_EMBED_DATA].scaleFactor
+    })`;
     updateEmbedStyleEl(embedStyleEl, embedStyleEl[AMP_EMBED_DATA]);
   }
 
@@ -690,44 +738,48 @@ export class AmpStoryEmbeddedComponent {
   animateExpanded_(target) {
     const embedId = target.getAttribute(EMBED_ID_ATTRIBUTE_NAME);
     const state = {};
-    const embedStyleEl = dev().assertElement(embedStyleEls[embedId],
-        `Failed to look up embed style element with ID ${embedId}`);
+    const embedStyleEl = dev().assertElement(
+      embedStyleEls[embedId],
+      `Failed to look up embed style element with ID ${embedId}`
+    );
     const embedData = embedStyleEl[AMP_EMBED_DATA];
-    this.resources_.measureMutateElement(target,
-        /** measure */
-        () => {
-          const targetRect = target./*OK*/getBoundingClientRect();
-          // TODO(#20832): Store DOMRect for the page in the store to avoid
-          // having to call getBoundingClientRect().
-          const pageRect = this.componentPage_./*OK*/getBoundingClientRect();
-
-          // Gap on the left of the element between full-screen size and
-          // current size.
-          const leftGap = (embedData.width - targetRect.width) / 2;
-          // Distance from left of page to what will be the left of the
-          // element in full-screen.
-          const fullScreenLeft = targetRect.left - leftGap - pageRect.left;
-          const centeredLeft = pageRect.width / 2 - embedData.width / 2;
-          state.translateX = centeredLeft - fullScreenLeft;
-
-          // Gap on the top of the element between full-screen size and
-          // current size.
-          const topGap = (embedData.height - targetRect.height) / 2;
-          // Distance from top of page to what will be the top of the element in
-          // full-screen.
-          const fullScreenTop = targetRect.top - topGap - pageRect.top;
-          const centeredTop = pageRect.height / 2 - embedData.height / 2;
-          state.translateY = centeredTop - fullScreenTop;
-        },
-        /** mutate */
-        () => {
-          target.classList.toggle('i-amphtml-expanded-component', true);
-
-          embedData.transform = `translate3d(${state.translateX}px,
+    this.resources_.measureMutateElement(
+      target,
+      /** measure */
+      () => {
+        const targetRect = target./*OK*/ getBoundingClientRect();
+        // TODO(#20832): Store DOMRect for the page in the store to avoid
+        // having to call getBoundingClientRect().
+        const pageRect = this.componentPage_./*OK*/ getBoundingClientRect();
+
+        // Gap on the left of the element between full-screen size and
+        // current size.
+        const leftGap = (embedData.width - targetRect.width) / 2;
+        // Distance from left of page to what will be the left of the
+        // element in full-screen.
+        const fullScreenLeft = targetRect.left - leftGap - pageRect.left;
+        const centeredLeft = pageRect.width / 2 - embedData.width / 2;
+        state.translateX = centeredLeft - fullScreenLeft;
+
+        // Gap on the top of the element between full-screen size and
+        // current size.
+        const topGap = (embedData.height - targetRect.height) / 2;
+        // Distance from top of page to what will be the top of the element in
+        // full-screen.
+        const fullScreenTop = targetRect.top - topGap - pageRect.top;
+        const centeredTop = pageRect.height / 2 - embedData.height / 2;
+        state.translateY = centeredTop - fullScreenTop;
+      },
+      /** mutate */
+      () => {
+        target.classList.toggle('i-amphtml-expanded-component', true);
+
+        embedData.transform = `translate3d(${state.translateX}px,
             ${state.translateY}px, 0) scale(1)`;
 
-          updateEmbedStyleEl(embedStyleEl, embedData);
-        });
+        updateEmbedStyleEl(embedStyleEl, embedData);
+      }
+    );
   }
 
   /**
@@ -746,49 +798,57 @@ export class AmpStoryEmbeddedComponent {
     // animation again.
     if (element.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
       elId = element.getAttribute(EMBED_ID_ATTRIBUTE_NAME);
-      const embedStyleEl = dev().assertElement(embedStyleEls[elId],
-          `Failed to look up embed style element with ID ${elId}`);
+      const embedStyleEl = dev().assertElement(
+        embedStyleEls[elId],
+        `Failed to look up embed style element with ID ${elId}`
+      );
       embedStyleEl.textContent = '';
       embedStyleEl[AMP_EMBED_DATA] = {};
     }
 
     const state = {};
-    resources.measureMutateElement(element,
-        /** measure */
-        () => {
-          const pageRect = pageEl./*OK*/getBoundingClientRect();
-          const elRect = element./*OK*/getBoundingClientRect();
-
-          if (elRect.width >= elRect.height) {
-            state.newWidth = pageRect.width;
-            state.scaleFactor = elRect.width / state.newWidth;
-            state.newHeight = elRect.height / elRect.width * state.newWidth;
-          } else {
-            const maxHeight = pageRect.height - VERTICAL_PADDING;
-            state.newWidth = Math.min(
-                elRect.width / elRect.height * maxHeight, pageRect.width);
-            state.newHeight = elRect.height / elRect.width * state.newWidth;
-            state.scaleFactor = elRect.height / state.newHeight;
-          }
+    resources.measureMutateElement(
+      element,
+      /** measure */
+      () => {
+        const pageRect = pageEl./*OK*/ getBoundingClientRect();
+        const elRect = element./*OK*/ getBoundingClientRect();
+
+        if (elRect.width >= elRect.height) {
+          state.newWidth = pageRect.width;
+          state.scaleFactor = elRect.width / state.newWidth;
+          state.newHeight = (elRect.height / elRect.width) * state.newWidth;
+        } else {
+          const maxHeight = pageRect.height - VERTICAL_PADDING;
+          state.newWidth = Math.min(
+            (elRect.width / elRect.height) * maxHeight,
+            pageRect.width
+          );
+          state.newHeight = (elRect.height / elRect.width) * state.newWidth;
+          state.scaleFactor = elRect.height / state.newHeight;
+        }
 
-          state.verticalMargin =
-            (-1 * ((state.newHeight - elRect.height) / 2));
-          state.horizontalMargin =
-            (-1 * ((state.newWidth - elRect.width) / 2));
-        },
-        /** mutate */
-        () => {
-          elId = elId ? elId : ++embedIds;
-          if (!element.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) { // First time creating <style> element for embed.
-            const html = htmlFor(pageEl);
-            const embedStyleEl = html`<style></style>`;
-
-            element.setAttribute(EMBED_ID_ATTRIBUTE_NAME, elId);
-            pageEl.insertBefore(embedStyleEl, pageEl.firstChild);
-            embedStyleEls[elId] = embedStyleEl;
-          }
+        state.verticalMargin = -1 * ((state.newHeight - elRect.height) / 2);
+        state.horizontalMargin = -1 * ((state.newWidth - elRect.width) / 2);
+      },
+      /** mutate */
+      () => {
+        elId = elId ? elId : ++embedIds;
+        if (!element.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
+          // First time creating <style> element for embed.
+          const html = htmlFor(pageEl);
+          const embedStyleEl = html`
+            <style></style>
+          `;
+
+          element.setAttribute(EMBED_ID_ATTRIBUTE_NAME, elId);
+          pageEl.insertBefore(embedStyleEl, pageEl.firstChild);
+          embedStyleEls[elId] = embedStyleEl;
+        }
 
-          embedStyleEls[elId][AMP_EMBED_DATA] = Object.assign({}, {
+        embedStyleEls[elId][AMP_EMBED_DATA] = Object.assign(
+          {},
+          {
             id: elId,
             width: state.newWidth,
             height: state.newHeight,
@@ -796,12 +856,16 @@ export class AmpStoryEmbeddedComponent {
             transform: `scale(${state.scaleFactor})`,
             verticalMargin: state.verticalMargin,
             horizontalMargin: state.horizontalMargin,
-          });
+          }
+        );
 
-          const embedStyleEl = dev().assertElement(embedStyleEls[elId],
-              `Failed to look up embed style element with ID ${elId}`);
-          updateEmbedStyleEl(embedStyleEl, embedStyleEl[AMP_EMBED_DATA]);
-        });
+        const embedStyleEl = dev().assertElement(
+          embedStyleEls[elId],
+          `Failed to look up embed style element with ID ${elId}`
+        );
+        updateEmbedStyleEl(embedStyleEl, embedStyleEl[AMP_EMBED_DATA]);
+      }
+    );
   }
 
   /**
@@ -811,12 +875,15 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   updateTooltipText_(target, embedConfig) {
-    const tooltipText = target.getAttribute('data-tooltip-text') ||
+    const tooltipText =
+      target.getAttribute('data-tooltip-text') ||
       Services.localizationService(this.win_).getLocalizedString(
-          embedConfig.localizedStringId) ||
+        embedConfig.localizedStringId
+      ) ||
       getSourceOriginForElement(target, this.getElementHref_(target));
-    const existingTooltipText =
-      this.tooltip_.querySelector('.i-amphtml-tooltip-text');
+    const existingTooltipText = this.tooltip_.querySelector(
+      '.i-amphtml-tooltip-text'
+    );
 
     existingTooltipText.textContent = tooltipText;
   }
@@ -827,8 +894,9 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   updateTooltipActionIcon_(embedConfig) {
-    const actionIcon =
-      this.tooltip_.querySelector('.i-amphtml-tooltip-action-icon');
+    const actionIcon = this.tooltip_.querySelector(
+      '.i-amphtml-tooltip-action-icon'
+    );
 
     this.resources_.mutateElement(dev().assertElement(actionIcon), () => {
       actionIcon.classList.toggle(embedConfig.actionIcon, true);
@@ -849,8 +917,9 @@ export class AmpStoryEmbeddedComponent {
       return;
     }
 
-    const tooltipCustomIcon =
-      this.tooltip_.querySelector('.i-amphtml-story-tooltip-custom-icon');
+    const tooltipCustomIcon = this.tooltip_.querySelector(
+      '.i-amphtml-story-tooltip-custom-icon'
+    );
 
     // No icon src specified by publisher and no default icon in config.
     if (!iconUrl && !embedConfig.customIconClassName) {
@@ -861,19 +930,23 @@ export class AmpStoryEmbeddedComponent {
     // Publisher specified a valid icon url.
     if (iconUrl) {
       this.resources_.mutateElement(
-          dev().assertElement(tooltipCustomIcon), () => {
-            setImportantStyles(dev().assertElement(tooltipCustomIcon),
-                {'background-image':
-                      `url(${parseUrlDeprecated(iconUrl).href})`});
+        dev().assertElement(tooltipCustomIcon),
+        () => {
+          setImportantStyles(dev().assertElement(tooltipCustomIcon), {
+            'background-image': `url(${parseUrlDeprecated(iconUrl).href})`,
           });
+        }
+      );
       return;
     }
 
     // No icon src specified by publisher. Use default icon found in the config.
     this.resources_.mutateElement(
-        dev().assertElement(tooltipCustomIcon), () => {
-          tooltipCustomIcon.classList.add(embedConfig.customIconClassName);
-        });
+      dev().assertElement(tooltipCustomIcon),
+      () => {
+        tooltipCustomIcon.classList.add(embedConfig.customIconClassName);
+      }
+    );
   }
 
   /**
@@ -885,25 +958,32 @@ export class AmpStoryEmbeddedComponent {
   positionTooltip_(component) {
     const state = {arrowOnTop: false};
 
-    this.resources_.measureMutateElement(this.storyEl_,
-        /** measure */
-        () => {
-          const pageRect = this.componentPage_./*OK*/getBoundingClientRect();
-
-          this.horizontalPositioning_(component, pageRect, state);
-          this.verticalPositioning_(component, pageRect, state);
-        },
-        /** mutate */
-        () => {
-          // Arrow on top or bottom of tooltip.
-          this.tooltip_.classList.toggle('i-amphtml-tooltip-arrow-on-top',
-              state.arrowOnTop);
-
-          setImportantStyles(dev().assertElement(this.tooltipArrow_),
-              {left: `${state.arrowLeftOffset}px`});
-          setImportantStyles(devAssert(this.tooltip_),
-              {top: `${state.tooltipTop}px`, left: `${state.tooltipLeft}px`});
+    this.resources_.measureMutateElement(
+      this.storyEl_,
+      /** measure */
+      () => {
+        const pageRect = this.componentPage_./*OK*/ getBoundingClientRect();
+
+        this.horizontalPositioning_(component, pageRect, state);
+        this.verticalPositioning_(component, pageRect, state);
+      },
+      /** mutate */
+      () => {
+        // Arrow on top or bottom of tooltip.
+        this.tooltip_.classList.toggle(
+          'i-amphtml-tooltip-arrow-on-top',
+          state.arrowOnTop
+        );
+
+        setImportantStyles(dev().assertElement(this.tooltipArrow_), {
+          left: `${state.arrowLeftOffset}px`,
         });
+        setImportantStyles(devAssert(this.tooltip_), {
+          top: `${state.tooltipTop}px`,
+          left: `${state.tooltipLeft}px`,
+        });
+      }
+    );
   }
 
   /**
@@ -914,8 +994,8 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   verticalPositioning_(component, pageRect, state) {
-    const tooltipHeight = this.tooltip_./*OK*/offsetHeight;
-    const verticalOffset = VERTICAL_EDGE_PADDING ;
+    const tooltipHeight = this.tooltip_./*OK*/ offsetHeight;
+    const verticalOffset = VERTICAL_EDGE_PADDING;
 
     state.tooltipTop = component.clientY - tooltipHeight - verticalOffset;
     if (state.tooltipTop < pageRect.top + MIN_VERTICAL_SPACE) {
@@ -934,8 +1014,8 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   horizontalPositioning_(component, pageRect, state) {
-    const tooltipWidth = this.tooltip_./*OK*/offsetWidth;
-    state.tooltipLeft = component.clientX - (tooltipWidth / 2);
+    const tooltipWidth = this.tooltip_./*OK*/ offsetWidth;
+    state.tooltipLeft = component.clientX - tooltipWidth / 2;
     const maxLeft =
       pageRect.left + pageRect.width - HORIZONTAL_EDGE_PADDING - tooltipWidth;
     const minLeft = pageRect.left + HORIZONTAL_EDGE_PADDING;
@@ -944,12 +1024,17 @@ export class AmpStoryEmbeddedComponent {
     state.tooltipLeft = Math.min(state.tooltipLeft, maxLeft);
     state.tooltipLeft = Math.max(state.tooltipLeft, minLeft);
 
-    state.arrowLeftOffset = Math.abs(component.clientX - state.tooltipLeft -
-        this.tooltipArrow_./*OK*/offsetWidth / 2);
+    state.arrowLeftOffset = Math.abs(
+      component.clientX -
+        state.tooltipLeft -
+        this.tooltipArrow_./*OK*/ offsetWidth / 2
+    );
 
     // Make sure tooltip arrow is inside bounds of the tooltip.
-    state.arrowLeftOffset = Math.min(state.arrowLeftOffset,
-        tooltipWidth - TOOLTIP_ARROW_RIGHT_PADDING);
+    state.arrowLeftOffset = Math.min(
+      state.arrowLeftOffset,
+      tooltipWidth - TOOLTIP_ARROW_RIGHT_PADDING
+    );
     state.arrowLeftOffset = Math.max(state.arrowLeftOffset, 0);
   }
 
@@ -959,8 +1044,9 @@ export class AmpStoryEmbeddedComponent {
    * @private
    */
   onOutsideTooltipClick_(event) {
-    if (!closest(dev().assertElement(event.target),
-        el => el == this.tooltip_)) {
+    if (
+      !closest(dev().assertElement(event.target), el => el == this.tooltip_)
+    ) {
       event.stopPropagation();
       this.close_();
     }
@@ -973,17 +1059,22 @@ export class AmpStoryEmbeddedComponent {
    */
   clearTooltip_() {
     this.resources_.mutateElement(dev().assertElement(this.tooltip_), () => {
-      const actionIcon =
-        this.tooltip_.querySelector('.i-amphtml-tooltip-action-icon');
+      const actionIcon = this.tooltip_.querySelector(
+        '.i-amphtml-tooltip-action-icon'
+      );
       actionIcon.className = 'i-amphtml-tooltip-action-icon';
 
-      const customIcon =
-        this.tooltip_.querySelector('.i-amphtml-story-tooltip-custom-icon');
+      const customIcon = this.tooltip_.querySelector(
+        '.i-amphtml-story-tooltip-custom-icon'
+      );
       customIcon.className = 'i-amphtml-story-tooltip-custom-icon';
       resetStyles(customIcon, ['background-image']);
 
-      this.tooltip_.removeEventListener('click', this.expandComponentHandler_,
-          true);
+      this.tooltip_.removeEventListener(
+        'click',
+        this.expandComponentHandler_,
+        true
+      );
       this.tooltip_.removeAttribute('href');
     });
   }
@@ -996,47 +1087,66 @@ export class AmpStoryEmbeddedComponent {
    */
   buildFocusedStateTemplate_(doc) {
     const html = htmlFor(doc);
-    const tooltipOverlay =
-        html`
-        <section class="i-amphtml-story-focused-state-layer
-            i-amphtml-story-system-reset i-amphtml-hidden">
-          <div class="i-amphtml-story-focused-state-layer-nav-button-container
-              i-amphtml-story-tooltip-nav-button-left">
-            <button role="button" ref="buttonLeft"
-                class="i-amphtml-story-focused-state-layer-nav-button
-                i-amphtml-story-tooltip-nav-button-left">
-            </button>
-          </div>
-          <div class="i-amphtml-story-focused-state-layer-nav-button-container
-              i-amphtml-story-tooltip-nav-button-right">
-            <button role="button" ref="buttonRight"
-                class="i-amphtml-story-focused-state-layer-nav-button
-                    i-amphtml-story-tooltip-nav-button-right">
-            </button>
-          </div>
-          <a class="i-amphtml-story-tooltip" target="_blank" ref="tooltip">
-            <div class="i-amphtml-story-tooltip-custom-icon"></div>
-            <p class="i-amphtml-tooltip-text" ref="text"></p>
-            <div class="i-amphtml-tooltip-action-icon"></div>
-            <div class="i-amphtml-story-tooltip-arrow" ref="arrow"></div>
-          </a>
-        </section>`;
+    const tooltipOverlay = html`
+      <section
+        class="i-amphtml-story-focused-state-layer
+            i-amphtml-story-system-reset i-amphtml-hidden"
+      >
+        <div
+          class="i-amphtml-story-focused-state-layer-nav-button-container
+              i-amphtml-story-tooltip-nav-button-left"
+        >
+          <button
+            role="button"
+            ref="buttonLeft"
+            class="i-amphtml-story-focused-state-layer-nav-button
+                i-amphtml-story-tooltip-nav-button-left"
+          ></button>
+        </div>
+        <div
+          class="i-amphtml-story-focused-state-layer-nav-button-container
+              i-amphtml-story-tooltip-nav-button-right"
+        >
+          <button
+            role="button"
+            ref="buttonRight"
+            class="i-amphtml-story-focused-state-layer-nav-button
+                    i-amphtml-story-tooltip-nav-button-right"
+          ></button>
+        </div>
+        <a class="i-amphtml-story-tooltip" target="_blank" ref="tooltip">
+          <div class="i-amphtml-story-tooltip-custom-icon"></div>
+          <p class="i-amphtml-tooltip-text" ref="text"></p>
+          <div class="i-amphtml-tooltip-action-icon"></div>
+          <div class="i-amphtml-story-tooltip-arrow" ref="arrow"></div>
+        </a>
+      </section>
+    `;
     const overlayEls = htmlRefs(tooltipOverlay);
-    const {tooltip, buttonLeft, buttonRight, arrow} =
-      /** @type {!tooltipElementsDef} */ (overlayEls);
+    const {
+      tooltip,
+      buttonLeft,
+      buttonRight,
+      arrow,
+    } = /** @type {!tooltipElementsDef} */ (overlayEls);
 
     this.tooltip_ = tooltip;
     this.tooltipArrow_ = arrow;
     const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
 
     buttonLeft.addEventListener('click', e =>
-      this.onNavigationalClick_(e, rtlState ?
-        EventType.NEXT_PAGE : EventType.PREVIOUS_PAGE));
-
+      this.onNavigationalClick_(
+        e,
+        rtlState ? EventType.NEXT_PAGE : EventType.PREVIOUS_PAGE
+      )
+    );
 
     buttonRight.addEventListener('click', e =>
-      this.onNavigationalClick_(e, rtlState ?
-        EventType.PREVIOUS_PAGE : EventType.NEXT_PAGE));
+      this.onNavigationalClick_(
+        e,
+        rtlState ? EventType.PREVIOUS_PAGE : EventType.NEXT_PAGE
+      )
+    );
 
     return tooltipOverlay;
   }
@@ -1050,12 +1160,15 @@ export class AmpStoryEmbeddedComponent {
   onNavigationalClick_(event, direction) {
     event.preventDefault();
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.MANUAL_ADVANCE);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.MANUAL_ADVANCE
+    );
     dispatch(
-        this.win_,
-        dev().assertElement(this.shadowRoot_),
-        direction,
-        undefined,
-        {bubbles: true});
+      this.win_,
+      dev().assertElement(this.shadowRoot_),
+      direction,
+      undefined,
+      {bubbles: true}
+    );
   }
 }
diff --git a/extensions/amp-story/1.0/amp-story-grid-layer.js b/extensions/amp-story/1.0/amp-story-grid-layer.js
index 668e037b8ddb..3802d1be1825 100644
--- a/extensions/amp-story/1.0/amp-story-grid-layer.js
+++ b/extensions/amp-story/1.0/amp-story-grid-layer.js
@@ -51,10 +51,11 @@ const SUPPORTED_CSS_GRID_ATTRIBUTES = {
  * (e.g. [align-content], [align-items], ...)
  * @private @const {string}
  */
-const SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR =
-    Object.keys(SUPPORTED_CSS_GRID_ATTRIBUTES)
-        .map(key => `[${key}]`)
-        .join(',');
+const SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR = Object.keys(
+  SUPPORTED_CSS_GRID_ATTRIBUTES
+)
+  .map(key => `[${key}]`)
+  .join(',');
 
 /**
  * The attribute name for grid layer templates.
@@ -88,8 +89,10 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
   /** @override */
   firstAttachedCallback() {
     // Only prerender if child of the first page.
-    this.prerenderAllowed_ = matches(this.element,
-        'amp-story-page:first-of-type amp-story-grid-layer');
+    this.prerenderAllowed_ = matches(
+      this.element,
+      'amp-story-page:first-of-type amp-story-grid-layer'
+    );
   }
 
   /** @override */
@@ -126,8 +129,10 @@ export class AmpStoryGridLayer extends AmpStoryBaseLayer {
    * @private
    */
   setDescendentCssGridStyles_() {
-    const elementsToUpgradeStyles = scopedQuerySelectorAll(this.element,
-        SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR);
+    const elementsToUpgradeStyles = scopedQuerySelectorAll(
+      this.element,
+      SUPPORTED_CSS_GRID_ATTRIBUTES_SELECTOR
+    );
 
     Array.prototype.forEach.call(elementsToUpgradeStyles, element => {
       this.setCssGridStyles_(element);
diff --git a/extensions/amp-story/1.0/amp-story-hint.js b/extensions/amp-story/1.0/amp-story-hint.js
index 21785979b20e..6942ffc9215b 100644
--- a/extensions/amp-story/1.0/amp-story-hint.js
+++ b/extensions/amp-story/1.0/amp-story-hint.js
@@ -27,13 +27,14 @@ import {createShadowRootWithStyle} from './utils';
 import {dict} from '../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const TEMPLATE = {
   tag: 'aside',
   attrs: dict({
-    'class': 'i-amphtml-story-hint-container ' +
-        'i-amphtml-story-system-reset i-amphtml-hidden'}),
+    'class':
+      'i-amphtml-story-hint-container ' +
+      'i-amphtml-story-system-reset i-amphtml-hidden',
+  }),
   children: [
     {
       tag: 'div',
@@ -41,8 +42,9 @@ const TEMPLATE = {
       children: [
         {
           tag: 'div',
-          attrs: dict({'class': 'i-amphtml-story-navigation-help-section'
-              + ' prev-page'}),
+          attrs: dict({
+            'class': 'i-amphtml-story-navigation-help-section prev-page',
+          }),
           children: [
             {
               tag: 'div',
@@ -54,17 +56,19 @@ const TEMPLATE = {
                   children: [
                     {
                       tag: 'div',
-                      attrs: dict({'class':
-                          'i-amphtml-story-hint-tap-button-icon'}),
+                      attrs: dict({
+                        'class': 'i-amphtml-story-hint-tap-button-icon',
+                      }),
                     },
                   ],
                 },
                 {
                   tag: 'div',
-                  attrs: dict({'class':
-                      'i-amphtml-story-hint-tap-button-text'}),
+                  attrs: dict({
+                    'class': 'i-amphtml-story-hint-tap-button-text',
+                  }),
                   localizedStringId:
-                      LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL,
+                    LocalizedStringId.AMP_STORY_HINT_UI_PREVIOUS_LABEL,
                 },
               ],
             },
@@ -72,8 +76,9 @@ const TEMPLATE = {
         },
         {
           tag: 'div',
-          attrs: dict({'class': 'i-amphtml-story-navigation-help-section'
-              + ' next-page'}),
+          attrs: dict({
+            'class': 'i-amphtml-story-navigation-help-section next-page',
+          }),
           children: [
             {
               tag: 'div',
@@ -85,17 +90,19 @@ const TEMPLATE = {
                   children: [
                     {
                       tag: 'div',
-                      attrs: dict({'class':
-                          'i-amphtml-story-hint-tap-button-icon'}),
+                      attrs: dict({
+                        'class': 'i-amphtml-story-hint-tap-button-icon',
+                      }),
                     },
                   ],
                 },
                 {
                   tag: 'div',
-                  attrs: dict({'class':
-                      'i-amphtml-story-hint-tap-button-text'}),
+                  attrs: dict({
+                    'class': 'i-amphtml-story-hint-tap-button-text',
+                  }),
                   localizedStringId:
-                      LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL,
+                    LocalizedStringId.AMP_STORY_HINT_UI_NEXT_LABEL,
                 },
               ],
             },
@@ -169,24 +176,33 @@ export class AmpStoryHint {
     this.hintContainer_ = renderAsElement(this.document_, TEMPLATE);
     createShadowRootWithStyle(root, this.hintContainer_, CSS);
 
-    this.storeService_.subscribe(StateProperty.RTL_STATE, rtlState => {
-      this.onRtlStateUpdate_(rtlState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.RTL_STATE,
+      rtlState => {
+        this.onRtlStateUpdate_(rtlState);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(
-        StateProperty.SYSTEM_UI_IS_VISIBLE_STATE, isVisible => {
-          this.onSystemUiIsVisibleStateUpdate_(isVisible);
-        });
+      StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
+      isVisible => {
+        this.onSystemUiIsVisibleStateUpdate_(isVisible);
+      }
+    );
 
     this.storeService_.subscribe(StateProperty.BOOKEND_STATE, isOpen => {
       this.onBookendStateUpdate_(isOpen);
     });
 
-    this.storeService_.subscribe(StateProperty.INTERACTIVE_COMPONENT_STATE,
-        /** @param {./amp-story-store-service.InteractiveComponentDef} component */ component => {
-          this.hideOnFocusedState_(
-              component.state === EmbeddedComponentState.FOCUSED);
-        });
+    this.storeService_.subscribe(
+      StateProperty.INTERACTIVE_COMPONENT_STATE,
+      /** @param {./amp-story-store-service.InteractiveComponentDef} component */ component => {
+        this.hideOnFocusedState_(
+          component.state === EmbeddedComponentState.FOCUSED
+        );
+      }
+    );
 
     this.vsync_.mutate(() => {
       this.parentEl_.appendChild(root);
@@ -214,17 +230,22 @@ export class AmpStoryHint {
     this.build();
 
     this.vsync_.mutate(() => {
-      this.hintContainer_.classList.toggle(NAVIGATION_OVERLAY_CLASS,
-          hintClass == NAVIGATION_OVERLAY_CLASS);
-      this.hintContainer_.classList.toggle(FIRST_PAGE_OVERLAY_CLASS,
-          hintClass == FIRST_PAGE_OVERLAY_CLASS);
+      this.hintContainer_.classList.toggle(
+        NAVIGATION_OVERLAY_CLASS,
+        hintClass == NAVIGATION_OVERLAY_CLASS
+      );
+      this.hintContainer_.classList.toggle(
+        FIRST_PAGE_OVERLAY_CLASS,
+        hintClass == FIRST_PAGE_OVERLAY_CLASS
+      );
       this.hintContainer_.classList.remove('i-amphtml-hidden');
 
-      const hideTimeout = hintClass == NAVIGATION_OVERLAY_CLASS
-        ? NAVIGATION_OVERLAY_TIMEOUT : FIRST_PAGE_NAVIGATION_OVERLAY_TIMEOUT;
+      const hideTimeout =
+        hintClass == NAVIGATION_OVERLAY_CLASS
+          ? NAVIGATION_OVERLAY_TIMEOUT
+          : FIRST_PAGE_NAVIGATION_OVERLAY_TIMEOUT;
       this.hideAfterTimeout(hideTimeout);
     });
-
   }
 
   /**
@@ -251,8 +272,7 @@ export class AmpStoryHint {
    * @param {number} timeout
    */
   hideAfterTimeout(timeout) {
-    this.hintTimeout_ = this.timer_.delay(
-        () => this.hideInternal_(), timeout);
+    this.hintTimeout_ = this.timer_.delay(() => this.hideInternal_(), timeout);
   }
 
   /**
@@ -285,9 +305,9 @@ export class AmpStoryHint {
    */
   onRtlStateUpdate_(rtlState) {
     this.vsync_.mutate(() => {
-      rtlState ?
-        this.hintContainer_.setAttribute('dir', 'rtl') :
-        this.hintContainer_.removeAttribute('dir');
+      rtlState
+        ? this.hintContainer_.setAttribute('dir', 'rtl')
+        : this.hintContainer_.removeAttribute('dir');
     });
   }
 
@@ -324,4 +344,3 @@ export class AmpStoryHint {
     }
   }
 }
-
diff --git a/extensions/amp-story/1.0/amp-story-info-dialog.js b/extensions/amp-story/1.0/amp-story-info-dialog.js
index ba31ca8ed148..5904f59e7079 100644
--- a/extensions/amp-story/1.0/amp-story-info-dialog.js
+++ b/extensions/amp-story/1.0/amp-story-info-dialog.js
@@ -91,33 +91,36 @@ export class InfoDialog {
     const root = this.win_.document.createElement('div');
     const html = htmlFor(this.parentEl_);
     this.element_ = html`
-        <div class="i-amphtml-story-info-dialog i-amphtml-story-system-reset">
-          <div class="i-amphtml-story-info-dialog-container">
-            <h1 class="i-amphtml-story-info-heading"></h1>
-            <a class="i-amphtml-story-info-link"></a>
-            <a class="i-amphtml-story-info-moreinfo"></a>
-          </div>
-        </div>`;
+      <div class="i-amphtml-story-info-dialog i-amphtml-story-system-reset">
+        <div class="i-amphtml-story-info-dialog-container">
+          <h1 class="i-amphtml-story-info-heading"></h1>
+          <a class="i-amphtml-story-info-link"></a>
+          <a class="i-amphtml-story-info-moreinfo"></a>
+        </div>
+      </div>
+    `;
 
     createShadowRootWithStyle(root, this.element_, CSS);
     this.initializeListeners_();
 
-    this.innerContainerEl_ = this.element_
-        .querySelector('.i-amphtml-story-info-dialog-container');
+    this.innerContainerEl_ = this.element_.querySelector(
+      '.i-amphtml-story-info-dialog-container'
+    );
 
     const appendPromise = this.resources_.mutateElement(this.parentEl_, () => {
       this.parentEl_.appendChild(root);
     });
 
-    const pageUrl = Services.documentInfoForDoc(
-        getAmpdoc(this.parentEl_)).canonicalUrl;
+    const pageUrl = Services.documentInfoForDoc(getAmpdoc(this.parentEl_))
+      .canonicalUrl;
 
     return Promise.all([
       appendPromise,
       this.setHeading_(),
       this.setPageLink_(pageUrl),
-      this.requestMoreInfoLink_()
-          .then(moreInfoUrl => this.setMoreInfoLinkUrl_(moreInfoUrl)),
+      this.requestMoreInfoLink_().then(moreInfoUrl =>
+        this.setMoreInfoLinkUrl_(moreInfoUrl)
+      ),
     ]);
   }
 
@@ -137,8 +140,9 @@ export class InfoDialog {
       this.onInfoDialogStateUpdated_(isOpen);
     });
 
-    this.element_.addEventListener(
-        'click', event => this.onInfoDialogClick_(event));
+    this.element_.addEventListener('click', event =>
+      this.onInfoDialogClick_(event)
+    );
   }
 
   /**
@@ -182,14 +186,14 @@ export class InfoDialog {
     if (!this.viewer_.isEmbedded()) {
       return Promise.resolve();
     }
-    return this.viewer_./*OK*/sendMessageAwaitResponse(
-        'moreInfoLinkUrl', /* data */ undefined)
-        .then(moreInfoUrl => {
-          if (!moreInfoUrl) {
-            return null;
-          }
-          return assertAbsoluteHttpOrHttpsUrl(dev().assertString(moreInfoUrl));
-        });
+    return this.viewer_
+      ./*OK*/ sendMessageAwaitResponse('moreInfoLinkUrl', /* data */ undefined)
+      .then(moreInfoUrl => {
+        if (!moreInfoUrl) {
+          return null;
+        }
+        return assertAbsoluteHttpOrHttpsUrl(dev().assertString(moreInfoUrl));
+      });
   }
 
   /**
@@ -197,9 +201,11 @@ export class InfoDialog {
    */
   setHeading_() {
     const label = this.localizationService_.getLocalizedString(
-        LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL);
+      LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LABEL
+    );
     const headingEl = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-heading'));
+      this.element_.querySelector('.i-amphtml-story-info-heading')
+    );
 
     return this.resources_.mutateElement(headingEl, () => {
       headingEl.textContent = label;
@@ -212,7 +218,8 @@ export class InfoDialog {
    */
   setPageLink_(pageUrl) {
     const linkEl = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-link'));
+      this.element_.querySelector('.i-amphtml-story-info-link')
+    );
 
     return this.resources_.mutateElement(linkEl, () => {
       linkEl.setAttribute('href', pageUrl);
@@ -233,14 +240,18 @@ export class InfoDialog {
     }
 
     this.moreInfoLinkEl_ = dev().assertElement(
-        this.element_.querySelector('.i-amphtml-story-info-moreinfo'));
+      this.element_.querySelector('.i-amphtml-story-info-moreinfo')
+    );
 
     return this.resources_.mutateElement(this.moreInfoLinkEl_, () => {
       const label = this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK);
+        LocalizedStringId.AMP_STORY_DOMAIN_DIALOG_HEADING_LINK
+      );
       this.moreInfoLinkEl_.classList.add(MOREINFO_VISIBLE_CLASS);
-      this.moreInfoLinkEl_.setAttribute('href',
-          dev().assertString(moreInfoUrl));
+      this.moreInfoLinkEl_.setAttribute(
+        'href',
+        dev().assertString(moreInfoUrl)
+      );
       this.moreInfoLinkEl_.setAttribute('target', '_blank');
       this.moreInfoLinkEl_.textContent = label;
     });
diff --git a/extensions/amp-story/1.0/amp-story-media-query-service.js b/extensions/amp-story/1.0/amp-story-media-query-service.js
index 30636e58ef4b..876a276906e1 100644
--- a/extensions/amp-story/1.0/amp-story-media-query-service.js
+++ b/extensions/amp-story/1.0/amp-story-media-query-service.js
@@ -18,7 +18,6 @@ import {Services} from '../../../src/services';
 import {dev} from '../../../src/log';
 import {registerServiceBuilder} from '../../../src/service';
 
-
 /**
  * Util function to retrieve the media query service. Ensures we can retrieve
  * the service synchronously from the amp-story codebase without running into
@@ -56,7 +55,8 @@ export class AmpStoryMediaQueryService {
 
     /** @private @const {!Element} */
     this.storyEl_ = dev().assertElement(
-        this.win_.document.querySelector('amp-story'));
+      this.win_.document.querySelector('amp-story')
+    );
   }
 
   /**
diff --git a/extensions/amp-story/1.0/amp-story-page-attachment.js b/extensions/amp-story/1.0/amp-story-page-attachment.js
index b8f86830d51f..4248e9b0e7d1 100644
--- a/extensions/amp-story/1.0/amp-story-page-attachment.js
+++ b/extensions/amp-story/1.0/amp-story-page-attachment.js
@@ -136,18 +136,22 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
     this.headerEl_ = getHeaderEl(this.element);
 
     if (this.element.hasAttribute('data-title')) {
-      this.headerEl_
-          .querySelector('.i-amphtml-story-page-attachment-title')
-          .textContent = this.element.getAttribute('data-title');
+      this.headerEl_.querySelector(
+        '.i-amphtml-story-page-attachment-title'
+      ).textContent = this.element.getAttribute('data-title');
     }
 
     createShadowRootWithStyle(headerShadowRootEl, this.headerEl_, CSS);
     templateEl.insertBefore(headerShadowRootEl, templateEl.firstChild);
 
     this.containerEl_ = dev().assertElement(
-        templateEl.querySelector('.i-amphtml-story-page-attachment-container'));
-    this.contentEl_ = dev().assertElement(this.containerEl_
-        .querySelector('.i-amphtml-story-page-attachment-content'));
+      templateEl.querySelector('.i-amphtml-story-page-attachment-container')
+    );
+    this.contentEl_ = dev().assertElement(
+      this.containerEl_.querySelector(
+        '.i-amphtml-story-page-attachment-content'
+      )
+    );
 
     while (this.element.firstChild) {
       this.contentEl_.appendChild(this.element.firstChild);
@@ -168,27 +172,41 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
    */
   initializeListeners_() {
     this.headerEl_
-        .querySelector('.i-amphtml-story-page-attachment-close-button')
-        .addEventListener('click', () => this.close_(), true /** useCapture */);
+      .querySelector('.i-amphtml-story-page-attachment-close-button')
+      .addEventListener('click', () => this.close_(), true /** useCapture */);
 
     // Always open links in a new tab.
-    this.contentEl_.addEventListener('click', event => {
-      const {target} = event;
-      if (target.tagName.toLowerCase() === 'a') {
-        target.setAttribute('target', '_blank');
-      }
-    }, true /** useCapture */);
+    this.contentEl_.addEventListener(
+      'click',
+      event => {
+        const {target} = event;
+        if (target.tagName.toLowerCase() === 'a') {
+          target.setAttribute('target', '_blank');
+        }
+      },
+      true /** useCapture */
+    );
 
     // Closes the attachment on opacity background clicks.
-    this.element.addEventListener('click', event => {
-      if (event.target.tagName.toLowerCase() === 'amp-story-page-attachment') {
-        this.close_();
-      }
-    }, true /** useCapture */);
+    this.element.addEventListener(
+      'click',
+      event => {
+        if (
+          event.target.tagName.toLowerCase() === 'amp-story-page-attachment'
+        ) {
+          this.close_();
+        }
+      },
+      true /** useCapture */
+    );
 
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -197,9 +215,9 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
    * @private
    */
   onUIStateUpdate_(uiState) {
-    uiState === UIType.MOBILE ?
-      this.startListeningForTouchEvents_() :
-      this.stopListeningForTouchEvents_();
+    uiState === UIType.MOBILE
+      ? this.startListeningForTouchEvents_()
+      : this.stopListeningForTouchEvents_();
   }
 
   /**
@@ -210,14 +228,20 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
     const storyPageEl = dev().assertElement(this.element.parentElement);
 
     this.touchEventUnlisteners_.push(
-        listen(storyPageEl, 'touchstart', this.onTouchStart_.bind(this),
-            {capture: true}));
+      listen(storyPageEl, 'touchstart', this.onTouchStart_.bind(this), {
+        capture: true,
+      })
+    );
     this.touchEventUnlisteners_.push(
-        listen(storyPageEl, 'touchmove', this.onTouchMove_.bind(this),
-            {capture: true}));
+      listen(storyPageEl, 'touchmove', this.onTouchMove_.bind(this), {
+        capture: true,
+      })
+    );
     this.touchEventUnlisteners_.push(
-        listen(storyPageEl, 'touchend', this.onTouchEnd_.bind(this),
-            {capture: true}));
+      listen(storyPageEl, 'touchend', this.onTouchEnd_.bind(this), {
+        capture: true,
+      })
+    );
   }
 
   /**
@@ -280,8 +304,8 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
 
     if (this.touchEventState_.isSwipeY === null) {
       this.touchEventState_.isSwipeY =
-          Math.abs(this.touchEventState_.startY - y) >
-              Math.abs(this.touchEventState_.startX - x);
+        Math.abs(this.touchEventState_.startY - y) >
+        Math.abs(this.touchEventState_.startX - x);
       if (!this.touchEventState_.isSwipeY) {
         return;
       }
@@ -343,7 +367,8 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
     // content, or actually close the attachment.
     if (this.state_ === AttachmentState.OPEN) {
       const isContentSwipe = this.isAttachmentContentDescendant_(
-          dev().assertElement(gesture.event.target));
+        dev().assertElement(gesture.event.target)
+      );
 
       // If user is swiping up, exit so the event bubbles up and maybe scrolls
       // the attachment content.
@@ -351,9 +376,10 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
       // user scroll the content.
       // If user is swiping down and scrollTop is zero, don't exit and start
       // dragging/closing the attachment.
-      if ((isContentSwipe && deltaY < 0) ||
-          (isContentSwipe && deltaY > 0 &&
-              this.containerEl_./*OK*/scrollTop > 0)) {
+      if (
+        (isContentSwipe && deltaY < 0) ||
+        (isContentSwipe && deltaY > 0 && this.containerEl_./*OK*/ scrollTop > 0)
+      ) {
         this.ignoreCurrentSwipeYGesture_ = true;
         return;
       }
@@ -363,15 +389,15 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
 
     if (data.last === true) {
       if (this.state_ === AttachmentState.DRAGGING_TO_CLOSE) {
-        (!swipingUp && deltaY > TOGGLE_THRESHOLD_PX) ?
-          this.close_() :
-          this.open();
+        !swipingUp && deltaY > TOGGLE_THRESHOLD_PX
+          ? this.close_()
+          : this.open();
       }
 
       if (this.state_ === AttachmentState.DRAGGING_TO_OPEN) {
-        (swipingUp && -deltaY > TOGGLE_THRESHOLD_PX) ?
-          this.open() :
-          this.close_();
+        swipingUp && -deltaY > TOGGLE_THRESHOLD_PX
+          ? this.open()
+          : this.close_();
       }
       return;
     }
@@ -386,9 +412,13 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
    * @private
    */
   isAttachmentContentDescendant_(element) {
-    return !!closest(element, el => {
-      return el.classList.contains('i-amphtml-story-page-attachment-content');
-    }, /* opt_stopAt */ this.element);
+    return !!closest(
+      element,
+      el => {
+        return el.classList.contains('i-amphtml-story-page-attachment-content');
+      },
+      /* opt_stopAt */ this.element
+    );
   }
 
   /**
@@ -419,8 +449,10 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
     }
 
     this.mutateElement(() => {
-      setImportantStyles(
-          this.element, {transform: translate, transition: 'none'});
+      setImportantStyles(this.element, {
+        transform: translate,
+        transition: 'none',
+      });
     });
   }
 
@@ -452,11 +484,13 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
       toggle(dev().assertElement(this.containerEl_), true);
     });
 
-    const currentHistoryState = /** @type {!Object} */
-        (getState(this.win.history));
+    const currentHistoryState = /** @type {!Object} */ (getState(
+      this.win.history
+    ));
     const historyState = Object.assign({}, currentHistoryState, {
-      [HistoryState.ATTACHMENT_PAGE_ID]:
-          this.storeService_.get(StateProperty.CURRENT_PAGE_ID),
+      [HistoryState.ATTACHMENT_PAGE_ID]: this.storeService_.get(
+        StateProperty.CURRENT_PAGE_ID
+      ),
     });
 
     this.historyService_.push(() => this.closeInternal_(), historyState);
@@ -503,7 +537,9 @@ export class AmpStoryPageAttachment extends AMP.BaseElement {
       // Note: if you change the duration here, you'll also have to change the
       // animation duration in the CSS.
       setTimeout(
-          () => toggle(dev().assertElement(this.containerEl_), false), 250);
+        () => toggle(dev().assertElement(this.containerEl_), false),
+        250
+      );
     });
 
     setHistoryState(this.win, HistoryState.ATTACHMENT_PAGE_ID, null);
diff --git a/extensions/amp-story/1.0/amp-story-page.js b/extensions/amp-story/1.0/amp-story-page.js
index 0e17714efb3b..ffad422def5f 100644
--- a/extensions/amp-story/1.0/amp-story-page.js
+++ b/extensions/amp-story/1.0/amp-story-page.js
@@ -37,10 +37,7 @@ import {
   EXPANDABLE_COMPONENTS,
   expandableElementsSelectors,
 } from './amp-story-embedded-component';
-import {
-  AnimationManager,
-  hasAnimations,
-} from './animation';
+import {AnimationManager, hasAnimations} from './animation';
 import {CommonSignals} from '../../../src/common-signals';
 import {Deferred} from '../../../src/utils/promise';
 import {EventType, dispatch} from './events';
@@ -63,9 +60,7 @@ import {dev} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {getAmpdoc} from '../../../src/service';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  getFriendlyIframeEmbedOptional,
-} from '../../../src/friendly-iframe-embed';
+import {getFriendlyIframeEmbedOptional} from '../../../src/friendly-iframe-embed';
 import {getLogEntries} from './logging';
 import {getMode} from '../../../src/mode';
 import {htmlFor} from '../../../src/static-template';
@@ -89,27 +84,29 @@ const PAGE_LOADED_CLASS_NAME = 'i-amphtml-story-page-loaded';
  */
 const Selectors = {
   // which media to wait for on page layout.
-  ALL_AMP_MEDIA: 'amp-story-grid-layer amp-audio, ' +
-      'amp-story-grid-layer amp-video, amp-story-grid-layer amp-img, ' +
-      'amp-story-grid-layer amp-anim',
+  ALL_AMP_MEDIA:
+    'amp-story-grid-layer amp-audio, ' +
+    'amp-story-grid-layer amp-video, amp-story-grid-layer amp-img, ' +
+    'amp-story-grid-layer amp-anim',
   ALL_AMP_VIDEO: 'amp-story-grid-layer amp-video',
   ALL_IFRAMED_MEDIA: 'audio, video',
   // TODO(gmajoulet): Refactor the way these selectors are used. They will be
   // passed to scopedQuerySelectorAll which expects only one selector and not
   // multiple separated by commas. `> audio` has to be kept first of the list to
   // work with this current implementation.
-  ALL_MEDIA: '> audio, amp-story-grid-layer audio, ' +
-      'amp-story-grid-layer video',
+  ALL_MEDIA: '> audio, amp-story-grid-layer audio, amp-story-grid-layer video',
   ALL_VIDEO: 'amp-story-grid-layer video',
 };
 
 /** @private @const {string} */
-const EMBEDDED_COMPONENTS_SELECTORS =
-  Object.keys(EXPANDABLE_COMPONENTS).join(', ');
+const EMBEDDED_COMPONENTS_SELECTORS = Object.keys(EXPANDABLE_COMPONENTS).join(
+  ', '
+);
 
 /** @private @const {string} */
 const INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS = Object.values(
-    expandableElementsSelectors()).join(',');
+  expandableElementsSelectors()
+).join(',');
 
 /** @private @const {number} */
 const RESIZE_TIMEOUT_MS = 350;
@@ -178,13 +175,20 @@ export const NavigationDirection = {
  * @return {function(!Element, ?UnlistenDef)}
  */
 function debounceEmbedResize(win, page, resources) {
-  return debounce(win, (el, unlisten) => {
-    AmpStoryEmbeddedComponent
-        .prepareForAnimation(page, dev().assertElement(el), resources);
-    if (unlisten) {
-      unlisten();
-    }
-  }, RESIZE_TIMEOUT_MS);
+  return debounce(
+    win,
+    (el, unlisten) => {
+      AmpStoryEmbeddedComponent.prepareForAnimation(
+        page,
+        dev().assertElement(el),
+        resources
+      );
+      if (unlisten) {
+        unlisten();
+      }
+    },
+    RESIZE_TIMEOUT_MS
+  );
 }
 
 /**
@@ -204,7 +208,10 @@ export class AmpStoryPage extends AMP.BaseElement {
 
     /** @const @private {!function(boolean)} */
     this.debounceToggleLoadingSpinner_ = debounce(
-        this.win, isActive => this.toggleLoadingSpinner_(!!isActive), 100);
+      this.win,
+      isActive => this.toggleLoadingSpinner_(!!isActive),
+      100
+    );
 
     /** @private {?LoadingSpinner} */
     this.loadingSpinner_ = null;
@@ -274,15 +281,20 @@ export class AmpStoryPage extends AMP.BaseElement {
       }
 
       this.animationManager_ = AnimationManager.create(
-          this.element, this.getAmpDoc(), this.getAmpDoc().getUrl());
+        this.element,
+        this.getAmpDoc(),
+        this.getAmpDoc().getUrl()
+      );
     }
   }
 
   /** @override */
   firstAttachedCallback() {
     // Only prerender the first story page.
-    this.prerenderAllowed_ = matches(this.element,
-        'amp-story-page:first-of-type');
+    this.prerenderAllowed_ = matches(
+      this.element,
+      'amp-story-page:first-of-type'
+    );
   }
 
   /** @override */
@@ -292,10 +304,12 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.initializeMediaPool_();
     this.maybeCreateAnimationManager_();
     this.advancement_.addPreviousListener(() => this.previous());
-    this.advancement_
-        .addAdvanceListener(() => this.next(/* opt_isAutomaticAdvance */ true));
-    this.advancement_
-        .addProgressListener(progress => this.emitProgress_(progress));
+    this.advancement_.addAdvanceListener(() =>
+      this.next(/* opt_isAutomaticAdvance */ true)
+    );
+    this.advancement_.addProgressListener(progress =>
+      this.emitProgress_(progress)
+    );
   }
 
   /**
@@ -310,13 +324,16 @@ export class AmpStoryPage extends AMP.BaseElement {
   /** @private */
   initializeMediaPool_() {
     const storyEl = dev().assertElement(
-        closestAncestorElementBySelector(this.element, 'amp-story'),
-        'amp-story-page must be a descendant of amp-story.');
+      closestAncestorElementBySelector(this.element, 'amp-story'),
+      'amp-story-page must be a descendant of amp-story.'
+    );
 
-    storyEl.getImpl()
-        .then(storyImpl => {
-          this.mediaPoolResolveFn_(MediaPool.for(storyImpl));
-        }, reason => this.mediaPoolRejectFn_(reason));
+    storyEl.getImpl().then(
+      storyImpl => {
+        this.mediaPoolResolveFn_(MediaPool.for(storyImpl));
+      },
+      reason => this.mediaPoolRejectFn_(reason)
+    );
   }
 
   /**
@@ -384,8 +401,9 @@ export class AmpStoryPage extends AMP.BaseElement {
     this.togglePlayMessage_(false);
     this.playAudioElementFromTimestamp_ = null;
 
-    if (this.storeService_.get(StateProperty.UI_STATE) ===
-        UIType.DESKTOP_PANELS) {
+    if (
+      this.storeService_.get(StateProperty.UI_STATE) === UIType.DESKTOP_PANELS
+    ) {
       // The rewinding is delayed on desktop so that it happens at a lower
       // opacity instead of immediately jumping to the first frame. See #17985.
       this.pauseAllMedia_(false /** rewindToBeginning */);
@@ -412,8 +430,8 @@ export class AmpStoryPage extends AMP.BaseElement {
       this.renderOpenAttachmentUI_();
       this.findAndPrepareEmbeddedComponents_();
       this.preloadAllMedia_()
-          .then(() => this.startListeningToVideoEvents_())
-          .then(() => this.playAllMedia_());
+        .then(() => this.startListeningToVideoEvents_())
+        .then(() => this.playAllMedia_());
     }
 
     this.reportDevModeErrors_();
@@ -424,7 +442,8 @@ export class AmpStoryPage extends AMP.BaseElement {
     upgradeBackgroundAudio(this.element);
     this.muteAllMedia();
     this.getViewport().onResize(
-        debounce(this.win, () => this.onResize_(), RESIZE_TIMEOUT_MS));
+      debounce(this.win, () => this.onResize_(), RESIZE_TIMEOUT_MS)
+    );
     return Promise.all([
       this.beforeVisible(),
       this.mediaLayoutPromise_,
@@ -456,8 +475,10 @@ export class AmpStoryPage extends AMP.BaseElement {
         switch (mediaEl.tagName.toLowerCase()) {
           case 'amp-img':
           case 'amp-anim':
-            mediaEl.signals().whenSignal(CommonSignals.LOAD_END)
-                .then(resolve, resolve);
+            mediaEl
+              .signals()
+              .whenSignal(CommonSignals.LOAD_END)
+              .then(resolve, resolve);
             break;
           case 'amp-audio':
           case 'amp-video':
@@ -500,8 +521,10 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   addClickShieldToEmbeddedComponents_() {
-    const componentEls = scopedQuerySelectorAll(this.element,
-        EMBEDDED_COMPONENTS_SELECTORS);
+    const componentEls = scopedQuerySelectorAll(
+      this.element,
+      EMBEDDED_COMPONENTS_SELECTORS
+    );
 
     if (componentEls.length <= 0) {
       return;
@@ -520,22 +543,27 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   resizeInteractiveEmbeddedComponents_(forceResize) {
-    scopedQuerySelectorAll(this.element,
-        INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS)
-        .forEach(el => {
-          const debouncePrepareForAnimation =
-            debounceEmbedResize(this.win, this.element, this.resources_);
-
-          if (forceResize) {
-            debouncePrepareForAnimation(el, null /* unlisten */);
-          } else if (!el.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) { // Element has not been prepared for its animation yet.
-            const unlisten = listen(el, AmpEvents.SIZE_CHANGED, () => {
-              debouncePrepareForAnimation(el, unlisten);
-            });
-            // Run in case target never changes size.
-            debouncePrepareForAnimation(el, null /* unlisten */);
-          }
+    scopedQuerySelectorAll(
+      this.element,
+      INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS
+    ).forEach(el => {
+      const debouncePrepareForAnimation = debounceEmbedResize(
+        this.win,
+        this.element,
+        this.resources_
+      );
+
+      if (forceResize) {
+        debouncePrepareForAnimation(el, null /* unlisten */);
+      } else if (!el.hasAttribute(EMBED_ID_ATTRIBUTE_NAME)) {
+        // Element has not been prepared for its animation yet.
+        const unlisten = listen(el, AmpEvents.SIZE_CHANGED, () => {
+          debouncePrepareForAnimation(el, unlisten);
         });
+        // Run in case target never changes size.
+        debouncePrepareForAnimation(el, null /* unlisten */);
+      }
+    });
   }
 
   /** @return {!Promise} */
@@ -545,8 +573,13 @@ export class AmpStoryPage extends AMP.BaseElement {
 
   /** @private */
   markPageAsLoaded_() {
-    dispatch(this.win, this.element, EventType.PAGE_LOADED,
-        /* payload */ undefined, {bubbles: true});
+    dispatch(
+      this.win,
+      this.element,
+      EventType.PAGE_LOADED,
+      /* payload */ undefined,
+      {bubbles: true}
+    );
     this.mutateElement(() => {
       this.element.classList.add(PAGE_LOADED_CLASS_NAME);
     });
@@ -586,20 +619,30 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   getMediaBySelector_(selector, includeHiddenMedia = false) {
     const iframe = this.element.querySelector('iframe');
-    const fie = iframe &&
-        getFriendlyIframeEmbedOptional(/** @type {!HTMLIFrameElement} */ (iframe));
+    const fie =
+      iframe &&
+      getFriendlyIframeEmbedOptional(
+        /** @type {!HTMLIFrameElement} */ (iframe)
+      );
     const mediaSet = [];
 
-    iterateCursor(scopedQuerySelectorAll(this.element, selector),
-        el => mediaSet.push(el));
+    iterateCursor(scopedQuerySelectorAll(this.element, selector), el =>
+      mediaSet.push(el)
+    );
 
     if (fie) {
-      iterateCursor(scopedQuerySelectorAll(fie.win.document.body,
-          Selectors.ALL_IFRAMED_MEDIA), el => mediaSet.push(el));
+      iterateCursor(
+        scopedQuerySelectorAll(
+          fie.win.document.body,
+          Selectors.ALL_IFRAMED_MEDIA
+        ),
+        el => mediaSet.push(el)
+      );
     }
 
-    return includeHiddenMedia ?
-      mediaSet : mediaSet.filter(mediaEl => this.isMediaDisplayed_(mediaEl));
+    return includeHiddenMedia
+      ? mediaSet
+      : mediaSet.filter(mediaEl => this.isMediaDisplayed_(mediaEl));
   }
 
   /**
@@ -611,7 +654,8 @@ export class AmpStoryPage extends AMP.BaseElement {
    */
   isMediaDisplayed_(mediaEl) {
     const ampEl = dev().assertElement(
-        isAmpElement(mediaEl) ? mediaEl : mediaEl.parentElement);
+      isAmpElement(mediaEl) ? mediaEl : mediaEl.parentElement
+    );
     const resource = this.resources_.getResourceForElement(ampEl);
     return isMediaDisplayed(ampEl, resource);
   }
@@ -645,7 +689,10 @@ export class AmpStoryPage extends AMP.BaseElement {
   pauseAllMedia_(rewindToBeginning = false) {
     return this.whenAllMediaElements_((mediaPool, mediaEl) => {
       return this.pauseMedia_(
-          mediaPool, mediaEl, /** @type {boolean} */ (rewindToBeginning));
+        mediaPool,
+        mediaEl,
+        /** @type {boolean} */ (rewindToBeginning)
+      );
     });
   }
 
@@ -664,8 +711,9 @@ export class AmpStoryPage extends AMP.BaseElement {
       return Promise.resolve();
     } else {
       return mediaPool.pause(
-          /** @type {!./media-pool.DomElementDef} */ (mediaEl),
-          rewindToBeginning);
+        /** @type {!./media-pool.DomElementDef} */ (mediaEl),
+        rewindToBeginning
+      );
     }
   }
 
@@ -692,24 +740,25 @@ export class AmpStoryPage extends AMP.BaseElement {
       mediaEl.play();
       return Promise.resolve();
     } else {
-      return mediaPool.play(
-          /** @type {!./media-pool.DomElementDef} */ (mediaEl)).catch(unusedError => {
-        if (!this.isMediaDisplayed_(mediaEl)) {
-          return;
-        }
+      return mediaPool
+        .play(/** @type {!./media-pool.DomElementDef} */ (mediaEl))
+        .catch(unusedError => {
+          if (!this.isMediaDisplayed_(mediaEl)) {
+            return;
+          }
 
-        // Auto playing the media failed, which could be caused by a data
-        // saver, or a battery saving mode. Display a message so we can
-        // get a user gesture to bless the media elements, and play them.
-        if (mediaEl.tagName === 'VIDEO') {
-          this.debounceToggleLoadingSpinner_(false);
-          this.togglePlayMessage_(true);
-        }
+          // Auto playing the media failed, which could be caused by a data
+          // saver, or a battery saving mode. Display a message so we can
+          // get a user gesture to bless the media elements, and play them.
+          if (mediaEl.tagName === 'VIDEO') {
+            this.debounceToggleLoadingSpinner_(false);
+            this.togglePlayMessage_(true);
+          }
 
-        if (mediaEl.tagName === 'AUDIO') {
-          this.playAudioElementFromTimestamp_ = Date.now();
-        }
-      });
+          if (mediaEl.tagName === 'AUDIO') {
+            this.playAudioElementFromTimestamp_ = Date.now();
+          }
+        });
     }
   }
 
@@ -725,7 +774,8 @@ export class AmpStoryPage extends AMP.BaseElement {
         return Promise.resolve();
       } else {
         return mediaPool.preload(
-            /** @type {!./media-pool.DomElementDef} */ (mediaEl));
+          /** @type {!./media-pool.DomElementDef} */ (mediaEl)
+        );
       }
     });
   }
@@ -754,7 +804,8 @@ export class AmpStoryPage extends AMP.BaseElement {
       return Promise.resolve();
     } else {
       return mediaPool.mute(
-          /** @type {!./media-pool.DomElementDef} */ (mediaEl));
+        /** @type {!./media-pool.DomElementDef} */ (mediaEl)
+      );
     }
   }
 
@@ -793,11 +844,11 @@ export class AmpStoryPage extends AMP.BaseElement {
       // currentTime.
       if (mediaEl.tagName === 'AUDIO' && mediaEl.paused) {
         const currentTime =
-            (Date.now() - this.playAudioElementFromTimestamp_) / 1000;
+          (Date.now() - this.playAudioElementFromTimestamp_) / 1000;
         if (mediaEl.hasAttribute('loop') || currentTime < mediaEl.duration) {
           promises.push(
-              mediaPool.setCurrentTime(
-                  mediaEl, currentTime % mediaEl.duration));
+            mediaPool.setCurrentTime(mediaEl, currentTime % mediaEl.duration)
+          );
           promises.push(mediaPool.play(mediaEl));
         }
 
@@ -832,7 +883,8 @@ export class AmpStoryPage extends AMP.BaseElement {
       return Promise.resolve();
     } else {
       return mediaPool.register(
-          /** @type {!./media-pool.DomElementDef} */ (mediaEl));
+        /** @type {!./media-pool.DomElementDef} */ (mediaEl)
+      );
     }
   }
 
@@ -848,7 +900,8 @@ export class AmpStoryPage extends AMP.BaseElement {
         return Promise.resolve();
       } else {
         return mediaPool.rewindToBeginning(
-            /** @type {!./media-pool.DomElementDef} */ (mediaEl));
+          /** @type {!./media-pool.DomElementDef} */ (mediaEl)
+        );
       }
     });
   }
@@ -921,8 +974,13 @@ export class AmpStoryPage extends AMP.BaseElement {
       'progress': progress,
     });
     const eventInit = {bubbles: true};
-    dispatch(this.win, this.element, EventType.PAGE_PROGRESS, payload,
-        eventInit);
+    dispatch(
+      this.win,
+      this.element,
+      EventType.PAGE_PROGRESS,
+      payload,
+      eventInit
+    );
   }
 
   /**
@@ -930,15 +988,16 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @return {!Array<string>}
    */
   getAdjacentPageIds() {
-    const adjacentPageIds =
-      isExperimentOn(this.win, 'amp-story-branching') ?
-        this.actions_() :
-        [];
-
-    const autoAdvanceNext =
-        this.getNextPageId(true /* opt_isAutomaticAdvance */);
-    const manualAdvanceNext =
-        this.getNextPageId(false /* opt_isAutomaticAdvance */);
+    const adjacentPageIds = isExperimentOn(this.win, 'amp-story-branching')
+      ? this.actions_()
+      : [];
+
+    const autoAdvanceNext = this.getNextPageId(
+      true /* opt_isAutomaticAdvance */
+    );
+    const manualAdvanceNext = this.getNextPageId(
+      false /* opt_isAutomaticAdvance */
+    );
     const previous = this.getPreviousPageId();
 
     if (autoAdvanceNext) {
@@ -982,14 +1041,13 @@ export class AmpStoryPage extends AMP.BaseElement {
    *     there isn't one.
    */
   getNextPageId(isAutomaticAdvance = false) {
-    if (isAutomaticAdvance &&
-        this.element.hasAttribute('auto-advance-to')) {
+    if (isAutomaticAdvance && this.element.hasAttribute('auto-advance-to')) {
       return this.element.getAttribute('auto-advance-to');
     }
 
-    const advanceAttr =
-      isExperimentOn(this.win, 'amp-story-branching') ?
-        'advance-to' : 'i-amphtml-advance-to';
+    const advanceAttr = isExperimentOn(this.win, 'amp-story-branching')
+      ? 'advance-to'
+      : 'i-amphtml-advance-to';
 
     if (this.element.hasAttribute(advanceAttr)) {
       return this.element.getAttribute(advanceAttr);
@@ -1009,9 +1067,9 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   actions_() {
-    const actionElements =
-      Array.prototype.slice.call(
-          this.element.querySelectorAll('[on*=goToPage]'));
+    const actionElements = Array.prototype.slice.call(
+      this.element.querySelectorAll('[on*=goToPage]')
+    );
 
     const actionAttrs = actionElements.map(action => action.getAttribute('on'));
 
@@ -1021,7 +1079,7 @@ export class AmpStoryPage extends AMP.BaseElement {
       actionList.forEach(action => {
         if (action.indexOf('goToPage') >= 0) {
           // The pageId is in between the equals sign & closing parenthesis.
-          res.push(action.slice(action.search('\=(.*)') + 1,-1));
+          res.push(action.slice(action.search('=(.*)') + 1, -1));
         }
       });
       return res;
@@ -1035,8 +1093,13 @@ export class AmpStoryPage extends AMP.BaseElement {
     const targetPageId = this.getPreviousPageId();
 
     if (targetPageId === null) {
-      dispatch(this.win, this.element, EventType.SHOW_NO_PREVIOUS_PAGE_HELP,
-          /* payload */ undefined, {bubbles: true});
+      dispatch(
+        this.win,
+        this.element,
+        EventType.SHOW_NO_PREVIOUS_PAGE_HELP,
+        /* payload */ undefined,
+        {bubbles: true}
+      );
       return;
     }
 
@@ -1066,16 +1129,16 @@ export class AmpStoryPage extends AMP.BaseElement {
   switchTo_(targetPageId, direction) {
     const payload = dict({
       'targetPageId': targetPageId,
-      'direction': direction});
+      'direction': direction,
+    });
     const eventInit = {bubbles: true};
-    dispatch(this.win, this.element, EventType.SWITCH_PAGE, payload,
-        eventInit);
+    dispatch(this.win, this.element, EventType.SWITCH_PAGE, payload, eventInit);
   }
 
   /**
-  * Checks if the page has any audio.
-  * @private
-  */
+   * Checks if the page has any audio.
+   * @private
+   */
   checkPageHasAudio_() {
     const pageHasAudio =
       this.element.hasAttribute('background-audio') ||
@@ -1086,14 +1149,16 @@ export class AmpStoryPage extends AMP.BaseElement {
   }
 
   /**
-  * Checks if the page has any videos with audio.
-  * @return {boolean}
-  * @private
-  */
+   * Checks if the page has any videos with audio.
+   * @return {boolean}
+   * @private
+   */
   hasVideoWithAudio_() {
     const ampVideoEls = this.element.querySelectorAll('amp-video');
     return Array.prototype.some.call(
-        ampVideoEls, video => !video.hasAttribute('noaudio'));
+      ampVideoEls,
+      video => !video.hasAttribute('noaudio')
+    );
   }
 
   /**
@@ -1105,10 +1170,14 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
 
     getLogEntries(this.element).then(logEntries => {
-      dispatch(this.win, this.element,
-          EventType.DEV_LOG_ENTRIES_AVAILABLE,
-          // ? is OK because all consumers are internal.
-          /** @type {?} */ (logEntries), {bubbles: true});
+      dispatch(
+        this.win,
+        this.element,
+        EventType.DEV_LOG_ENTRIES_AVAILABLE,
+        // ? is OK because all consumers are internal.
+        /** @type {?} */ (logEntries),
+        {bubbles: true}
+      );
     });
   }
 
@@ -1126,17 +1195,28 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
 
     Array.prototype.forEach.call(videoEls, videoEl => {
-      this.unlisteners_.push(listen(
-          videoEl, 'playing', () => this.debounceToggleLoadingSpinner_(false)));
-      this.unlisteners_.push(listen(
-          videoEl, 'waiting', () => this.debounceToggleLoadingSpinner_(true)));
+      this.unlisteners_.push(
+        listen(videoEl, 'playing', () =>
+          this.debounceToggleLoadingSpinner_(false)
+        )
+      );
+      this.unlisteners_.push(
+        listen(videoEl, 'waiting', () =>
+          this.debounceToggleLoadingSpinner_(true)
+        )
+      );
     });
 
     const ampVideoEls = this.getMediaBySelector_(
-        Selectors.ALL_AMP_VIDEO, true /* includeHiddenMedia */);
+      Selectors.ALL_AMP_VIDEO,
+      true /* includeHiddenMedia */
+    );
     Array.prototype.forEach.call(ampVideoEls, ampVideoEl => {
-      this.unlisteners_.push(listen(ampVideoEl, VideoEvents.VISIBILITY,
-          event => this.onVideoVisibilityUpdate_(event)));
+      this.unlisteners_.push(
+        listen(ampVideoEl, VideoEvents.VISIBILITY, event =>
+          this.onVideoVisibilityUpdate_(event)
+        )
+      );
     });
   }
 
@@ -1157,18 +1237,18 @@ export class AmpStoryPage extends AMP.BaseElement {
   onVideoVisibilityUpdate_(event) {
     const ampVideoEl = dev().assertElement(event.target);
     const videoEl = dev().assertElement(
-        childElement(ampVideoEl, el => el.tagName === 'VIDEO'));
+      childElement(ampVideoEl, el => el.tagName === 'VIDEO')
+    );
     const visible = getData(event)['visible'];
 
     this.mediaPoolPromise_.then(mediaPool => {
       if (visible) {
-        this.registerMedia_(mediaPool, videoEl)
-            .then(() => {
-              this.playMedia_(mediaPool, videoEl);
-              if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
-                this.unmuteAllMedia();
-              }
-            });
+        this.registerMedia_(mediaPool, videoEl).then(() => {
+          this.playMedia_(mediaPool, videoEl);
+          if (!this.storeService_.get(StateProperty.MUTED_STATE)) {
+            this.unmuteAllMedia();
+          }
+        });
       } else {
         this.pauseMedia_(mediaPool, videoEl, true /** rewindToBeginning */);
         this.muteMedia_(mediaPool, videoEl);
@@ -1212,16 +1292,18 @@ export class AmpStoryPage extends AMP.BaseElement {
     const localizationService = Services.localizationService(this.win);
 
     this.playMessageEl_ = buildPlayMessageElement(this.element);
-    const labelEl =
-        this.playMessageEl_.querySelector('.i-amphtml-story-page-play-label');
+    const labelEl = this.playMessageEl_.querySelector(
+      '.i-amphtml-story-page-play-label'
+    );
     labelEl.textContent = localizationService.getLocalizedString(
-        LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO);
+      LocalizedStringId.AMP_STORY_PAGE_PLAY_VIDEO
+    );
 
     this.playMessageEl_.addEventListener('click', () => {
       this.togglePlayMessage_(false);
       this.mediaPoolPromise_
-          .then(mediaPool => mediaPool.blessAll())
-          .then(() => this.playAllMedia_());
+        .then(mediaPool => mediaPool.blessAll())
+        .then(() => this.playAllMedia_());
     });
 
     this.mutateElement(() => this.element.appendChild(this.playMessageEl_));
@@ -1235,8 +1317,9 @@ export class AmpStoryPage extends AMP.BaseElement {
   togglePlayMessage_(isActive) {
     if (!isActive) {
       this.playMessageEl_ &&
-          this.mutateElement(() =>
-            toggle(dev().assertElement(this.playMessageEl_), false));
+        this.mutateElement(() =>
+          toggle(dev().assertElement(this.playMessageEl_), false)
+        );
       return;
     }
 
@@ -1245,7 +1328,8 @@ export class AmpStoryPage extends AMP.BaseElement {
     }
 
     this.mutateElement(() =>
-      toggle(dev().assertElement(this.playMessageEl_), true));
+      toggle(dev().assertElement(this.playMessageEl_), true)
+    );
   }
 
   /**
@@ -1253,24 +1337,28 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @private
    */
   renderOpenAttachmentUI_() {
-    const attachmentEl =
-        this.element.querySelector('amp-story-page-attachment');
+    const attachmentEl = this.element.querySelector(
+      'amp-story-page-attachment'
+    );
     if (!attachmentEl) {
       return;
     }
 
     if (!this.openAttachmentEl_) {
       this.openAttachmentEl_ = buildOpenAttachmentElement(this.element);
-      this.openAttachmentEl_
-          .addEventListener('click', () => this.openAttachment());
-
-      const textEl = this.openAttachmentEl_
-          .querySelector('.i-amphtml-story-page-open-attachment-label');
+      this.openAttachmentEl_.addEventListener('click', () =>
+        this.openAttachment()
+      );
 
+      const textEl = this.openAttachmentEl_.querySelector(
+        '.i-amphtml-story-page-open-attachment-label'
+      );
 
-      const openAttachmentLabel = attachmentEl.getAttribute('data-cta-text') ||
-          Services.localizationService(this.win).getLocalizedString(
-              LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL);
+      const openAttachmentLabel =
+        attachmentEl.getAttribute('data-cta-text') ||
+        Services.localizationService(this.win).getLocalizedString(
+          LocalizedStringId.AMP_STORY_PAGE_ATTACHMENT_OPEN_LABEL
+        );
 
       this.mutateElement(() => {
         textEl.textContent = openAttachmentLabel;
@@ -1284,8 +1372,9 @@ export class AmpStoryPage extends AMP.BaseElement {
    * @param {boolean=} shouldAnimate
    */
   openAttachment(shouldAnimate = true) {
-    const attachmentEl =
-        this.element.querySelector('amp-story-page-attachment');
+    const attachmentEl = this.element.querySelector(
+      'amp-story-page-attachment'
+    );
 
     if (!attachmentEl) {
       return;
diff --git a/extensions/amp-story/1.0/amp-story-request-service.js b/extensions/amp-story/1.0/amp-story-request-service.js
index e9b61eda447d..18abc725d3b1 100644
--- a/extensions/amp-story/1.0/amp-story-request-service.js
+++ b/extensions/amp-story/1.0/amp-story-request-service.js
@@ -58,16 +58,19 @@ export class AmpStoryRequestService {
    * @private
    */
   loadBookendConfigImpl_() {
-    const bookendEl = childElementByTag(this.storyElement_,
-        'amp-story-bookend');
+    const bookendEl = childElementByTag(
+      this.storyElement_,
+      'amp-story-bookend'
+    );
     if (!bookendEl) {
       return Promise.resolve(null);
     }
 
     if (bookendEl.hasAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME)) {
       const rawUrl = bookendEl.getAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME);
-      const credentials =
-        bookendEl.getAttribute(BOOKEND_CREDENTIALS_ATTRIBUTE_NAME);
+      const credentials = bookendEl.getAttribute(
+        BOOKEND_CREDENTIALS_ATTRIBUTE_NAME
+      );
       return this.loadJsonFromAttribute_(rawUrl, credentials);
     }
 
@@ -100,12 +103,12 @@ export class AmpStoryRequestService {
     }
 
     return Services.urlReplacementsForDoc(this.storyElement_)
-        .expandUrlAsync(user().assertString(rawUrl))
-        .then(url => this.xhr_.fetchJson(url, opts))
-        .then(response => {
-          userAssert(response.ok, 'Invalid HTTP response');
-          return response.json();
-        });
+      .expandUrlAsync(user().assertString(rawUrl))
+      .then(url => this.xhr_.fetchJson(url, opts))
+      .then(response => {
+        userAssert(response.ok, 'Invalid HTTP response');
+        return response.json();
+      });
   }
 }
 
diff --git a/extensions/amp-story/1.0/amp-story-share-menu.js b/extensions/amp-story/1.0/amp-story-share-menu.js
index e2b4958958be..49998ebbbb1f 100644
--- a/extensions/amp-story/1.0/amp-story-share-menu.js
+++ b/extensions/amp-story/1.0/amp-story-share-menu.js
@@ -30,7 +30,6 @@ import {getAmpdoc} from '../../../src/service';
 import {htmlFor} from '../../../src/static-template';
 import {toggle} from '../../../src/style';
 
-
 /** @const {string} Class to toggle the share menu. */
 export const VISIBLE_CLASS = 'i-amphtml-story-share-menu-visible';
 
@@ -108,12 +107,13 @@ export class ShareMenu {
 
     this.isBuilt_ = true;
 
-    this.isSystemShareSupported_ =
-        this.shareWidget_.isSystemShareSupported(getAmpdoc(this.parentEl_));
+    this.isSystemShareSupported_ = this.shareWidget_.isSystemShareSupported(
+      getAmpdoc(this.parentEl_)
+    );
 
-    this.isSystemShareSupported_ ?
-      this.buildForSystemSharing_() :
-      this.buildForFallbackSharing_();
+    this.isSystemShareSupported_
+      ? this.buildForSystemSharing_()
+      : this.buildForFallbackSharing_();
   }
 
   /**
@@ -155,9 +155,9 @@ export class ShareMenu {
 
     this.vsync_.run({
       measure: () => {
-        this.innerContainerEl_ =
-            this.element_
-                ./*OK*/querySelector('.i-amphtml-story-share-menu-container');
+        this.innerContainerEl_ = this.element_./*OK*/ querySelector(
+          '.i-amphtml-story-share-menu-container'
+        );
       },
       mutate: () => {
         this.parentEl_.appendChild(root);
@@ -172,9 +172,13 @@ export class ShareMenu {
    * @private
    */
   initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(StateProperty.SHARE_MENU_STATE, isOpen => {
       this.onShareMenuStateUpdate_(isOpen);
@@ -183,8 +187,9 @@ export class ShareMenu {
     // Don't listen to click events if the system share is supported, since the
     // native layer handles all the UI interactions.
     if (!this.isSystemShareSupported_) {
-      this.element_.addEventListener(
-          'click', event => this.onShareMenuClick_(event));
+      this.element_.addEventListener('click', event =>
+        this.onShareMenuClick_(event)
+      );
     }
   }
 
@@ -237,9 +242,9 @@ export class ShareMenu {
    */
   onUIStateUpdate_(uiState) {
     this.vsync_.mutate(() => {
-      uiState !== UIType.MOBILE ?
-        this.element_.setAttribute('desktop', '') :
-        this.element_.removeAttribute('desktop');
+      uiState !== UIType.MOBILE
+        ? this.element_.setAttribute('desktop', '')
+        : this.element_.removeAttribute('desktop');
     });
   }
 
diff --git a/extensions/amp-story/1.0/amp-story-share.js b/extensions/amp-story/1.0/amp-story-share.js
index b56e7f5ad0b6..a6baa0118df6 100644
--- a/extensions/amp-story/1.0/amp-story-share.js
+++ b/extensions/amp-story/1.0/amp-story-share.js
@@ -15,10 +15,7 @@
  */
 import {LocalizedStringId} from '../../../src/localized-strings';
 import {Services} from '../../../src/services';
-import {
-  StateProperty,
-  getStoreService,
-} from './amp-story-store-service';
+import {StateProperty, getStoreService} from './amp-story-store-service';
 import {Toast} from './toast';
 import {
   copyTextToClipboard,
@@ -34,7 +31,6 @@ import {px, setImportantStyles} from '../../../src/style';
 import {renderAsElement, renderSimpleTemplate} from './simple-template';
 import {throttle} from '../../../src/utils/rate-limit';
 
-
 /**
  * Maps share provider type to visible name.
  * If the name only needs to be capitalized (e.g. `facebook` to `Facebook`) it
@@ -54,7 +50,6 @@ const SHARE_PROVIDER_LOCALIZED_STRING_ID = map({
   'sms': LocalizedStringId.AMP_STORY_SHARING_PROVIDER_NAME_SMS,
 });
 
-
 /**
  * Default left/right padding for share buttons.
  * @private @const {number}
@@ -83,16 +78,18 @@ export const DEPRECATED_SHARE_PROVIDERS_KEY = 'share-providers';
 const TEMPLATE = {
   tag: 'div',
   attrs: dict({'class': 'i-amphtml-story-share-widget'}),
-  children: [{
-    tag: 'ul',
-    attrs: dict({'class': 'i-amphtml-story-share-list'}),
-    children: [
-      {
-        tag: 'li',
-        attrs: dict({'class': 'i-amphtml-story-share-system'}),
-      },
-    ],
-  }],
+  children: [
+    {
+      tag: 'ul',
+      attrs: dict({'class': 'i-amphtml-story-share-list'}),
+      children: [
+        {
+          tag: 'li',
+          attrs: dict({'class': 'i-amphtml-story-share-system'}),
+        },
+      ],
+    },
+  ],
 };
 
 /** @private @const {!./simple-template.ElementDef} */
@@ -127,13 +124,11 @@ const SHARE_ITEM_TEMPLATE = {
   attrs: dict({'class': 'i-amphtml-story-share-item'}),
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const LINK_SHARE_ITEM_TEMPLATE = {
   tag: 'div',
   attrs: dict({
-    'class':
-        'i-amphtml-story-share-icon i-amphtml-story-share-icon-link',
+    'class': 'i-amphtml-story-share-icon i-amphtml-story-share-icon-link',
   }),
   children: [
     {
@@ -144,11 +139,9 @@ const LINK_SHARE_ITEM_TEMPLATE = {
   ],
 };
 
-
 /** @private @const {string} */
 const SCROLLABLE_CLASSNAME = 'i-amphtml-story-share-widget-scrollable';
 
-
 /**
  * @param {!JsonObject=} opt_params
  * @return {!JsonObject}
@@ -158,7 +151,9 @@ function buildProviderParams(opt_params) {
 
   if (opt_params) {
     Object.keys(opt_params).forEach(field => {
-      if (field === 'provider') { return; }
+      if (field === 'provider') {
+        return;
+      }
       attrs[`data-param-${field}`] = opt_params[field];
     });
   }
@@ -166,7 +161,6 @@ function buildProviderParams(opt_params) {
   return attrs;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} shareType
@@ -175,58 +169,63 @@ function buildProviderParams(opt_params) {
  */
 function buildProvider(doc, shareType, opt_params) {
   const shareProviderLocalizedStringId = devAssert(
-      SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType],
-      `No localized string to display name for share type ${shareType}.`);
+    SHARE_PROVIDER_LOCALIZED_STRING_ID[shareType],
+    `No localized string to display name for share type ${shareType}.`
+  );
 
-  return renderSimpleTemplate(doc,
-      /** @type {!Array<!./simple-template.ElementDef>} */ ([
-        {
-          tag: 'amp-social-share',
-          attrs: /** @type {!JsonObject} */ (Object.assign(
-              dict({
-                'width': 48,
-                'height': 48,
-                'class': 'i-amphtml-story-share-icon',
-                'type': shareType,
-              }),
-              buildProviderParams(opt_params))),
-          children: [
-            {
-              tag: 'span',
-              attrs: dict({'class': 'i-amphtml-story-share-label'}),
-              localizedStringId: shareProviderLocalizedStringId,
-            },
-          ],
-        },
-      ]));
+  return renderSimpleTemplate(
+    doc,
+    /** @type {!Array<!./simple-template.ElementDef>} */ ([
+      {
+        tag: 'amp-social-share',
+        attrs: /** @type {!JsonObject} */ (Object.assign(
+          dict({
+            'width': 48,
+            'height': 48,
+            'class': 'i-amphtml-story-share-icon',
+            'type': shareType,
+          }),
+          buildProviderParams(opt_params)
+        )),
+        children: [
+          {
+            tag: 'span',
+            attrs: dict({'class': 'i-amphtml-story-share-label'}),
+            localizedStringId: shareProviderLocalizedStringId,
+          },
+        ],
+      },
+    ])
+  );
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} url
  * @return {!Element}
  */
 function buildCopySuccessfulToast(doc, url) {
-  return renderAsElement(doc, /** @type {!./simple-template.ElementDef} */ ({
-    tag: 'div',
-    attrs: dict({'class': 'i-amphtml-story-copy-successful'}),
-    children: [
-      {
-        tag: 'div',
-        localizedStringId:
+  return renderAsElement(
+    doc,
+    /** @type {!./simple-template.ElementDef} */ ({
+      tag: 'div',
+      attrs: dict({'class': 'i-amphtml-story-copy-successful'}),
+      children: [
+        {
+          tag: 'div',
+          localizedStringId:
             LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_SUCCESS_TEXT,
-      },
-      {
-        tag: 'div',
-        attrs: dict({'class': 'i-amphtml-story-copy-url'}),
-        unlocalizedString: url,
-      },
-    ],
-  }));
+        },
+        {
+          tag: 'div',
+          attrs: dict({'class': 'i-amphtml-story-copy-url'}),
+          unlocalizedString: url,
+        },
+      ],
+    })
+  );
 }
 
-
 /**
  * Social share widget for story bookend.
  */
@@ -275,8 +274,9 @@ export class ShareWidget {
     devAssert(!this.root, 'Already built.');
 
     this.ampdoc_ = ampdoc;
-    this.localizationServicePromise_ =
-        Services.localizationServiceForOrNull(this.win);
+    this.localizationServicePromise_ = Services.localizationServiceForOrNull(
+      this.win
+    );
 
     this.root = renderAsElement(this.win.document, TEMPLATE);
 
@@ -293,8 +293,9 @@ export class ShareWidget {
    * @private
    */
   getAmpDoc_() {
-    return /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */ (
-      devAssert(this.ampdoc_));
+    return /** @type {!../../../src/service/ampdoc-impl.AmpDoc} */ (devAssert(
+      this.ampdoc_
+    ));
   }
 
   /** @private */
@@ -303,8 +304,10 @@ export class ShareWidget {
       return;
     }
 
-    const linkShareButton =
-        renderAsElement(this.win.document, LINK_SHARE_ITEM_TEMPLATE);
+    const linkShareButton = renderAsElement(
+      this.win.document,
+      LINK_SHARE_ITEM_TEMPLATE
+    );
 
     this.add_(linkShareButton);
 
@@ -322,12 +325,14 @@ export class ShareWidget {
    * On desktop mode, with branching, users should be able to share a story
    * starting from a specific page.
    * @private
-  */
+   */
   maybeAddPageShareButton_() {
     if (isExperimentOn(this.win, 'amp-story-branching')) {
       const list = devAssert(this.root).firstChild;
-      const sharePageCheck =
-          renderAsElement(this.win.document, SHARE_PAGE_TEMPLATE);
+      const sharePageCheck = renderAsElement(
+        this.win.document,
+        SHARE_PAGE_TEMPLATE
+      );
       this.root.insertBefore(sharePageCheck, list);
     }
   }
@@ -339,17 +344,21 @@ export class ShareWidget {
   copyUrlToClipboard_(shareFromCurrentPage) {
     const currentPageId = this.storeService_.get(StateProperty.CURRENT_PAGE_ID);
     const shouldAddFragment =
-      (isExperimentOn(this.win, 'amp-story-branching') && shareFromCurrentPage);
+      isExperimentOn(this.win, 'amp-story-branching') && shareFromCurrentPage;
 
-    const url = Services.documentInfoForDoc(this.getAmpDoc_()).canonicalUrl +
-    (shouldAddFragment ? '#page=' + currentPageId : '');
+    const url =
+      Services.documentInfoForDoc(this.getAmpDoc_()).canonicalUrl +
+      (shouldAddFragment ? '#page=' + currentPageId : '');
 
     if (!copyTextToClipboard(this.win, url)) {
       this.localizationServicePromise_.then(localizationService => {
-        devAssert(localizationService,
-            'Could not retrieve LocalizationService.');
+        devAssert(
+          localizationService,
+          'Could not retrieve LocalizationService.'
+        );
         const failureString = localizationService.getLocalizedString(
-            LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT);
+          LocalizedStringId.AMP_STORY_SHARING_CLIPBOARD_FAILURE_TEXT
+        );
         Toast.show(this.storyEl, failureString);
       });
       return;
@@ -366,8 +375,9 @@ export class ShareWidget {
       return;
     }
 
-    const container = dev().assertElement(this.root).querySelector(
-        '.i-amphtml-story-share-system');
+    const container = dev()
+      .assertElement(this.root)
+      .querySelector('.i-amphtml-story-share-system');
 
     this.loadRequiredExtensions();
 
@@ -389,7 +399,7 @@ export class ShareWidget {
     // See https://bugs.chromium.org/p/chromium/issues/detail?id=765923
     const isChromeWebview = viewer.isWebviewEmbedded() && platform.isChrome();
 
-    return ('share' in navigator) && !isChromeWebview;
+    return 'share' in navigator && !isChromeWebview;
   }
 
   /**
@@ -400,8 +410,9 @@ export class ShareWidget {
     this.loadRequiredExtensions();
 
     this.requestService_.loadBookendConfig().then(config => {
-      const providers = config && (config[SHARE_PROVIDERS_KEY] ||
-        config[DEPRECATED_SHARE_PROVIDERS_KEY]);
+      const providers =
+        config &&
+        (config[SHARE_PROVIDERS_KEY] || config[DEPRECATED_SHARE_PROVIDERS_KEY]);
       if (!providers) {
         return;
       }
@@ -417,21 +428,28 @@ export class ShareWidget {
   setProviders_(providers) {
     providers.forEach(provider => {
       if (isObject(provider)) {
-        this.add_(buildProvider(this.win.document,
+        this.add_(
+          buildProvider(
+            this.win.document,
             provider['provider'],
-            /** @type {!JsonObject} */ (provider)));
+            /** @type {!JsonObject} */ (provider)
+          )
+        );
         return;
       }
 
       if (provider == 'system') {
-        user().warn('AMP-STORY',
-            '`system` is not a valid share provider type. Native sharing is ' +
+        user().warn(
+          'AMP-STORY',
+          '`system` is not a valid share provider type. Native sharing is ' +
             'enabled by default and cannot be turned off.',
-            provider);
+          provider
+        );
         return;
       }
-      this.add_(buildProvider(this.win.document,
-          /** @type {string} */ (provider)));
+      this.add_(
+        buildProvider(this.win.document, /** @type {string} */ (provider))
+      );
     });
   }
 
@@ -439,8 +457,10 @@ export class ShareWidget {
    * @param {!../../../src/service/ampdoc-impl.AmpDoc=} ampdoc
    */
   loadRequiredExtensions(ampdoc = this.getAmpDoc_()) {
-    Services.extensionsFor(this.win)
-        .installExtensionForDoc(ampdoc, 'amp-social-share');
+    Services.extensionsFor(this.win).installExtensionForDoc(
+      ampdoc,
+      'amp-social-share'
+    );
   }
 
   /**
@@ -459,7 +479,6 @@ export class ShareWidget {
   }
 }
 
-
 /**
  * Social share widget for story bookend with a scrollable layout.
  * This class is coupled to the DOM structure for ShareWidget, but that's ok.
@@ -502,18 +521,28 @@ export class ScrollableShareWidget extends ShareWidget {
     this.root.classList.add(SCROLLABLE_CLASSNAME);
 
     Services.viewportForDoc(ampdoc).onResize(
-        throttle(this.win, () => this.applyButtonPadding_(), 100));
+      throttle(this.win, () => this.applyButtonPadding_(), 100)
+    );
 
     this.vsync_.measure(() => {
       // If the element is actually scrollable, don't propagate the touch events
       // so it is not interpreted as a swipe to the next story.
-      if (this.root./*OK*/offsetWidth < this.root./*OK*/scrollWidth) {
+      if (this.root./*OK*/ offsetWidth < this.root./*OK*/ scrollWidth) {
         this.root.addEventListener(
-            'touchstart', event => event.stopPropagation(), {capture: true});
+          'touchstart',
+          event => event.stopPropagation(),
+          {capture: true}
+        );
         this.root.addEventListener(
-            'touchmove', event => event.stopPropagation(), {capture: true});
+          'touchmove',
+          event => event.stopPropagation(),
+          {capture: true}
+        );
         this.root.addEventListener(
-            'touchend', event => event.stopPropagation(), {capture: true});
+          'touchend',
+          event => event.stopPropagation(),
+          {capture: true}
+        );
       }
     });
 
@@ -532,61 +561,68 @@ export class ScrollableShareWidget extends ShareWidget {
       return;
     }
 
-    this.vsync_.run({
-      measure: state => {
-        const containerWidth = this.root./*OK*/clientWidth;
-
-        if (containerWidth == this.containerWidth_) {
-          // Don't recalculate if width has not changed (i.e. onscreen keyboard)
-          state.noop = true;
-          return;
-        }
-
-        const icon = devAssert(items[0].firstElementChild);
-
-        const leftMargin = icon./*OK*/offsetLeft - this.root./*OK*/offsetLeft;
-        const iconWidth = icon./*OK*/offsetWidth;
-
-        // Total width that the buttons will occupy with minimum padding.
-        const totalItemWidth =
-            (iconWidth * items.length) + ((2 * MIN_BUTTON_PADDING) *
-                (items.length - 1));
-
-        // If buttons don't fit within the available area, calculate padding so
-        // that there will be an element cut-off.
-        if (totalItemWidth > (containerWidth - (leftMargin * 2))) {
-          const availableWidth = containerWidth - leftMargin - (iconWidth / 2);
-          const amountVisible =
-              Math.floor(
-                  availableWidth / (iconWidth + (MIN_BUTTON_PADDING * 2)));
-
-          state.padding = 0.5 * ((availableWidth / amountVisible) - iconWidth);
-        } else {
-          // Otherwise, calculate padding in from MIN_PADDING to DEFAULT_PADDING
-          // so that all elements fit and take as much area as possible.
-          const totalPadding =
-              ((containerWidth - (leftMargin * 2)) -
-              (iconWidth * items.length)) / (items.length - 1);
-
-          state.padding = Math.min(DEFAULT_BUTTON_PADDING, 0.5 * totalPadding);
-        }
-
-        this.containerWidth_ = containerWidth;
-      },
-      mutate: state => {
-        if (state.noop) {
-          return;
-        }
-        items.forEach((el, i) => {
-          if (i != 0) {
-            setImportantStyles(el, {'padding-left': px(state.padding)});
+    this.vsync_.run(
+      {
+        measure: state => {
+          const containerWidth = this.root./*OK*/ clientWidth;
+
+          if (containerWidth == this.containerWidth_) {
+            // Don't recalculate if width has not changed (i.e. onscreen keyboard)
+            state.noop = true;
+            return;
           }
-          if (i != items.length - 1) {
-            setImportantStyles(el, {'padding-right': px(state.padding)});
+
+          const icon = devAssert(items[0].firstElementChild);
+
+          const leftMargin =
+            icon./*OK*/ offsetLeft - this.root./*OK*/ offsetLeft;
+          const iconWidth = icon./*OK*/ offsetWidth;
+
+          // Total width that the buttons will occupy with minimum padding.
+          const totalItemWidth =
+            iconWidth * items.length +
+            2 * MIN_BUTTON_PADDING * (items.length - 1);
+
+          // If buttons don't fit within the available area, calculate padding so
+          // that there will be an element cut-off.
+          if (totalItemWidth > containerWidth - leftMargin * 2) {
+            const availableWidth = containerWidth - leftMargin - iconWidth / 2;
+            const amountVisible = Math.floor(
+              availableWidth / (iconWidth + MIN_BUTTON_PADDING * 2)
+            );
+
+            state.padding = 0.5 * (availableWidth / amountVisible - iconWidth);
+          } else {
+            // Otherwise, calculate padding in from MIN_PADDING to DEFAULT_PADDING
+            // so that all elements fit and take as much area as possible.
+            const totalPadding =
+              (containerWidth - leftMargin * 2 - iconWidth * items.length) /
+              (items.length - 1);
+
+            state.padding = Math.min(
+              DEFAULT_BUTTON_PADDING,
+              0.5 * totalPadding
+            );
           }
-        });
+
+          this.containerWidth_ = containerWidth;
+        },
+        mutate: state => {
+          if (state.noop) {
+            return;
+          }
+          items.forEach((el, i) => {
+            if (i != 0) {
+              setImportantStyles(el, {'padding-left': px(state.padding)});
+            }
+            if (i != items.length - 1) {
+              setImportantStyles(el, {'padding-right': px(state.padding)});
+            }
+          });
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -595,8 +631,11 @@ export class ScrollableShareWidget extends ShareWidget {
    */
   getVisibleItems_() {
     return Array.prototype.filter.call(
-        dev().assertElement(this.root).querySelectorAll('li'),
-        el => !!el.firstElementChild);
+      dev()
+        .assertElement(this.root)
+        .querySelectorAll('li'),
+      el => !!el.firstElementChild
+    );
   }
 
   /**
diff --git a/extensions/amp-story/1.0/amp-story-store-service.js b/extensions/amp-story/1.0/amp-story-store-service.js
index aa6bf464bee2..c772a492d8f8 100644
--- a/extensions/amp-story/1.0/amp-story-store-service.js
+++ b/extensions/amp-story/1.0/amp-story-store-service.js
@@ -21,11 +21,9 @@ import {dev} from '../../../src/log';
 import {hasOwn} from '../../../src/utils/object';
 import {registerServiceBuilder} from '../../../src/service';
 
-
 /** @type {string} */
 const TAG = 'amp-story';
 
-
 /**
  * Util function to retrieve the store service. Ensures we can retrieve the
  * service synchronously from the amp-story codebase without running into race
@@ -44,7 +42,6 @@ export const getStoreService = win => {
   return service;
 };
 
-
 /**
  * Different UI experiences to display the story.
  * @const @enum {number}
@@ -111,7 +108,6 @@ export let InteractiveComponentDef;
  */
 export let State;
 
-
 /** @private @const @enum {string} */
 export const StateProperty = {
   // Embed options.
@@ -154,7 +150,6 @@ export const StateProperty = {
   ADVANCEMENT_MODE: 'advancementMode',
 };
 
-
 /** @private @const @enum {string} */
 export const Action = {
   ADD_TO_ACTIONS_WHITELIST: 'addToActionsWhitelist',
@@ -182,7 +177,6 @@ export const Action = {
   TOGGLE_VIEWPORT_WARNING: 'toggleViewportWarning',
 };
 
-
 /**
  * Functions to compare a data structure from the previous to the new state and
  * detect a mutation, when a simple equality test would not work.
@@ -191,14 +185,13 @@ export const Action = {
 const stateComparisonFunctions = {
   [StateProperty.ACTIONS_WHITELIST]: (old, curr) => old.length !== curr.length,
   [StateProperty.INTERACTIVE_COMPONENT_STATE]:
-      /**
-       * @param {InteractiveComponentDef} old
-       * @param {InteractiveComponentDef} curr
-       */
-      (old, curr) => old.element !== curr.element || old.state !== curr.state,
+    /**
+     * @param {InteractiveComponentDef} old
+     * @param {InteractiveComponentDef} curr
+     */
+    (old, curr) => old.element !== curr.element || old.state !== curr.state,
 };
 
-
 /**
  * Returns the new sate.
  * @param  {!State} state Immutable state
@@ -209,10 +202,13 @@ const stateComparisonFunctions = {
 const actions = (state, action, data) => {
   switch (action) {
     case Action.ADD_TO_ACTIONS_WHITELIST:
-      const newActionsWhitelist =
-          [].concat(state[StateProperty.ACTIONS_WHITELIST], data);
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.ACTIONS_WHITELIST]: newActionsWhitelist}));
+      const newActionsWhitelist = [].concat(
+        state[StateProperty.ACTIONS_WHITELIST],
+        data
+      );
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.ACTIONS_WHITELIST]: newActionsWhitelist,
+      }));
     // Triggers the amp-acess paywall.
     case Action.TOGGLE_ACCESS:
       // Don't change the PAUSED_STATE if ACCESS_STATE is not changed.
@@ -220,121 +216,126 @@ const actions = (state, action, data) => {
         return state;
       }
 
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.ACCESS_STATE]: !!data,
-            [StateProperty.PAUSED_STATE]: !!data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.ACCESS_STATE]: !!data,
+        [StateProperty.PAUSED_STATE]: !!data,
+      }));
     // Triggers the ad UI.
     case Action.TOGGLE_AD:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.AD_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.AD_STATE]: !!data,
+      }));
     // Shows or hides the bookend.
     case Action.TOGGLE_BOOKEND:
       if (!state[StateProperty.CAN_SHOW_BOOKEND]) {
         return state;
       }
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.BOOKEND_STATE]: !!data,
-            [StateProperty.PAUSED_STATE]: !!data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.BOOKEND_STATE]: !!data,
+        [StateProperty.PAUSED_STATE]: !!data,
+      }));
     case Action.TOGGLE_INTERACTIVE_COMPONENT:
       data = /** @type {InteractiveComponentDef} */ (data);
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.PAUSED_STATE]:
-              data.state === EmbeddedComponentState.EXPANDED ||
-              data.state === EmbeddedComponentState.FOCUSED,
-            [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]:
-              data.state !== EmbeddedComponentState.EXPANDED ||
-              state.uiState === UIType.DESKTOP_PANELS,
-            [StateProperty.INTERACTIVE_COMPONENT_STATE]: data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAUSED_STATE]:
+          data.state === EmbeddedComponentState.EXPANDED ||
+          data.state === EmbeddedComponentState.FOCUSED,
+        [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]:
+          data.state !== EmbeddedComponentState.EXPANDED ||
+          state.uiState === UIType.DESKTOP_PANELS,
+        [StateProperty.INTERACTIVE_COMPONENT_STATE]: data,
+      }));
     // Shows or hides the info dialog.
     case Action.TOGGLE_INFO_DIALOG:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.INFO_DIALOG_STATE]: !!data,
-            [StateProperty.PAUSED_STATE]: !!data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.INFO_DIALOG_STATE]: !!data,
+        [StateProperty.PAUSED_STATE]: !!data,
+      }));
     // Shows or hides the audio controls.
     case Action.TOGGLE_STORY_HAS_AUDIO:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.STORY_HAS_AUDIO_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.STORY_HAS_AUDIO_STATE]: !!data,
+      }));
     case Action.TOGGLE_STORY_HAS_BACKGROUND_AUDIO:
-      return /** @type {!State} */ (Object.assign({}, state,
-          {[StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE]: !!data,
+      }));
     // Mutes or unmutes the story media.
     case Action.TOGGLE_MUTED:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.MUTED_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.MUTED_STATE]: !!data,
+      }));
     case Action.TOGGLE_PAGE_HAS_AUDIO:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.PAGE_HAS_AUDIO_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAGE_HAS_AUDIO_STATE]: !!data,
+      }));
     case Action.TOGGLE_PAUSED:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.PAUSED_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAUSED_STATE]: !!data,
+      }));
     case Action.TOGGLE_RTL:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.RTL_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.RTL_STATE]: !!data,
+      }));
     case Action.TOGGLE_SIDEBAR:
       // Don't change the PAUSED_STATE if SIDEBAR_STATE is not changed.
       if (state[StateProperty.SIDEBAR_STATE] === data) {
         return state;
       }
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.PAUSED_STATE]: !!data,
-            [StateProperty.SIDEBAR_STATE]: !!data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAUSED_STATE]: !!data,
+        [StateProperty.SIDEBAR_STATE]: !!data,
+      }));
     case Action.TOGGLE_HAS_SIDEBAR:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.HAS_SIDEBAR_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.HAS_SIDEBAR_STATE]: !!data,
+      }));
     case Action.TOGGLE_SUPPORTED_BROWSER:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.SUPPORTED_BROWSER_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.SUPPORTED_BROWSER_STATE]: !!data,
+      }));
     case Action.TOGGLE_SHARE_MENU:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.PAUSED_STATE]: !!data,
-            [StateProperty.SHARE_MENU_STATE]: !!data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAUSED_STATE]: !!data,
+        [StateProperty.SHARE_MENU_STATE]: !!data,
+      }));
     case Action.TOGGLE_SYSTEM_UI_IS_VISIBLE:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.SYSTEM_UI_IS_VISIBLE_STATE]: !!data,
+      }));
     case Action.TOGGLE_UI:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            // Keep DESKTOP_STATE for compatiblity with v0.1.
-            [StateProperty.DESKTOP_STATE]: data === UIType.DESKTOP_PANELS,
-            [StateProperty.UI_STATE]: data,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        // Keep DESKTOP_STATE for compatiblity with v0.1.
+        [StateProperty.DESKTOP_STATE]: data === UIType.DESKTOP_PANELS,
+        [StateProperty.UI_STATE]: data,
+      }));
     case Action.TOGGLE_VIEWPORT_WARNING:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.VIEWPORT_WARNING_STATE]: !!data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.VIEWPORT_WARNING_STATE]: !!data,
+      }));
     case Action.SET_CONSENT_ID:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.CONSENT_ID]: data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.CONSENT_ID]: data,
+      }));
     case Action.CHANGE_PAGE:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {
-            [StateProperty.CURRENT_PAGE_ID]: data.id,
-            [StateProperty.CURRENT_PAGE_INDEX]: data.index,
-          }));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.CURRENT_PAGE_ID]: data.id,
+        [StateProperty.CURRENT_PAGE_INDEX]: data.index,
+      }));
     case Action.SET_PAGES_COUNT:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.PAGES_COUNT]: data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.PAGES_COUNT]: data,
+      }));
     case Action.SET_ADVANCEMENT_MODE:
-      return /** @type {!State} */ (Object.assign(
-          {}, state, {[StateProperty.ADVANCEMENT_MODE]: data}));
+      return /** @type {!State} */ (Object.assign({}, state, {
+        [StateProperty.ADVANCEMENT_MODE]: data,
+      }));
     default:
       dev().error(TAG, 'Unknown action %s.', action);
       return state;
   }
 };
 
-
 /**
  * Store service.
  */
@@ -351,7 +352,10 @@ export class AmpStoryStoreService {
 
     /** @private {!State} */
     this.state_ = /** @type {!State} */ (Object.assign(
-        {}, this.getDefaultState_(), this.getEmbedOverrides_()));
+      {},
+      this.getDefaultState_(),
+      this.getEmbedOverrides_()
+    ));
   }
 
   /**
@@ -376,7 +380,7 @@ export class AmpStoryStoreService {
    */
   subscribe(key, listener, callToInitialize = false) {
     if (!hasOwn(this.state_, key)) {
-      dev().error(TAG, 'Can\'t subscribe to unknown state %s.', key);
+      dev().error(TAG, "Can't subscribe to unknown state %s.", key);
       return;
     }
     if (!this.listeners_[key]) {
@@ -402,9 +406,11 @@ export class AmpStoryStoreService {
     let comparisonFn;
     Object.keys(this.listeners_).forEach(key => {
       comparisonFn = stateComparisonFunctions[key];
-      if (comparisonFn ?
-        comparisonFn(oldState[key], this.state_[key]) :
-        oldState[key] !== this.state_[key]) {
+      if (
+        comparisonFn
+          ? comparisonFn(oldState[key], this.state_[key])
+          : oldState[key] !== this.state_[key]
+      ) {
         this.listeners_[key].fire(this.state_[key]);
       }
     });
diff --git a/extensions/amp-story/1.0/amp-story-system-layer.js b/extensions/amp-story/1.0/amp-story-system-layer.js
index 3420b379d59e..9dee28390bd2 100644
--- a/extensions/amp-story/1.0/amp-story-system-layer.js
+++ b/extensions/amp-story/1.0/amp-story-system-layer.js
@@ -34,7 +34,6 @@ import {getMode} from '../../../src/mode';
 import {matches} from '../../../src/dom';
 import {renderAsElement} from './simple-template';
 
-
 /** @private @const {string} */
 const AD_SHOWING_ATTRIBUTE = 'ad-showing';
 
@@ -74,8 +73,9 @@ const HIDE_AUDIO_MESSAGE_TIMEOUT_MS = 1500;
 /** @private @const {!./simple-template.ElementDef} */
 const TEMPLATE = {
   tag: 'aside',
-  attrs: dict(
-      {'class': 'i-amphtml-story-system-layer i-amphtml-story-system-reset'}),
+  attrs: dict({
+    'class': 'i-amphtml-story-system-layer i-amphtml-story-system-reset',
+  }),
   children: [
     {
       tag: 'div',
@@ -103,10 +103,10 @@ const TEMPLATE = {
                 {
                   tag: 'div',
                   attrs: dict({
-                    'class': 'i-amphtml-story-mute-text' ,
+                    'class': 'i-amphtml-story-mute-text',
                   }),
                   localizedStringId:
-                        LocalizedStringId.AMP_STORY_AUDIO_MUTE_BUTTON_TEXT,
+                    LocalizedStringId.AMP_STORY_AUDIO_MUTE_BUTTON_TEXT,
                 },
                 {
                   tag: 'div',
@@ -114,15 +114,15 @@ const TEMPLATE = {
                     'class': 'i-amphtml-story-unmute-sound-text',
                   }),
                   localizedStringId:
-                        LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT,
+                    LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_SOUND_TEXT,
                 },
                 {
                   tag: 'div',
                   attrs: dict({
-                    'class': 'i-amphtml-story-unmute-no-sound-text' ,
+                    'class': 'i-amphtml-story-unmute-no-sound-text',
                   }),
                   localizedStringId:
-                        LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT,
+                    LocalizedStringId.AMP_STORY_AUDIO_UNMUTE_NO_SOUND_TEXT,
                 },
               ],
             },
@@ -161,7 +161,6 @@ const TEMPLATE = {
   ],
 };
 
-
 /**
  * System Layer (i.e. UI Chrome) for <amp-story>.
  * Chrome contains:
@@ -238,28 +237,36 @@ export class SystemLayer {
     createShadowRootWithStyle(this.root_, this.systemLayerEl_, CSS);
 
     this.systemLayerEl_.insertBefore(
-        this.progressBar_.build(pageIds), this.systemLayerEl_.firstChild);
+      this.progressBar_.build(pageIds),
+      this.systemLayerEl_.firstChild
+    );
 
-    this.buttonsContainer_ =
-        this.systemLayerEl_.querySelector(
-            '.i-amphtml-story-system-layer-buttons');
+    this.buttonsContainer_ = this.systemLayerEl_.querySelector(
+      '.i-amphtml-story-system-layer-buttons'
+    );
 
     this.buildForDevelopmentMode_();
 
     this.initializeListeners_();
 
-    this.storeService_.subscribe(StateProperty.CAN_SHOW_SYSTEM_LAYER_BUTTONS,
-        canShowButtons => {
-          this.systemLayerEl_.classList
-              .toggle('i-amphtml-story-ui-no-buttons', !canShowButtons);
-        }, true /* callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.CAN_SHOW_SYSTEM_LAYER_BUTTONS,
+      canShowButtons => {
+        this.systemLayerEl_.classList.toggle(
+          'i-amphtml-story-ui-no-buttons',
+          !canShowButtons
+        );
+      },
+      true /* callToInitialize */
+    );
 
     if (Services.platformFor(this.win_).isIos()) {
       this.systemLayerEl_.setAttribute('ios', '');
     }
 
-    if (Services.viewerForDoc(this.win_.document.documentElement)
-        .isEmbedded()) {
+    if (
+      Services.viewerForDoc(this.win_.document.documentElement).isEmbedded()
+    ) {
       this.systemLayerEl_.classList.add('i-amphtml-embedded');
       this.getShadowRoot().setAttribute(HAS_INFO_BUTTON_ATTRIBUTE, '');
     } else {
@@ -278,8 +285,11 @@ export class SystemLayer {
       return;
     }
 
-    this.buttonsContainer_.appendChild(this.developerButtons_.build(
-        this.developerLog_.toggle.bind(this.developerLog_)));
+    this.buttonsContainer_.appendChild(
+      this.developerButtons_.build(
+        this.developerLog_.toggle.bind(this.developerLog_)
+      )
+    );
     this.getShadowRoot().appendChild(this.developerLog_.build());
   }
 
@@ -312,44 +322,76 @@ export class SystemLayer {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.CAN_SHOW_SHARING_UIS, show => {
-      this.onCanShowSharingUisUpdate_(show);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.STORY_HAS_AUDIO_STATE,
-        hasAudio => {
-          this.onStoryHasAudioStateUpdate_(hasAudio);
-        }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      this.onMutedStateUpdate_(isMuted);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.CURRENT_PAGE_INDEX, index => {
-      this.onPageIndexUpdate_(index);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.RTL_STATE, rtlState => {
-      this.onRtlStateUpdate_(rtlState);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.PAGE_HAS_AUDIO_STATE, audio => {
-      this.onPageHasAudioStateUpdate_(audio);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.HAS_SIDEBAR_STATE,
-        hasSidebar => {
-          this.onHasSidebarStateUpdate_(hasSidebar);
-        }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
-        isVisible => {
-          this.onSystemUiIsVisibleStateUpdate_(isVisible);
-        });
+    this.storeService_.subscribe(
+      StateProperty.CAN_SHOW_SHARING_UIS,
+      show => {
+        this.onCanShowSharingUisUpdate_(show);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.STORY_HAS_AUDIO_STATE,
+      hasAudio => {
+        this.onStoryHasAudioStateUpdate_(hasAudio);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        this.onMutedStateUpdate_(isMuted);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.CURRENT_PAGE_INDEX,
+      index => {
+        this.onPageIndexUpdate_(index);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.RTL_STATE,
+      rtlState => {
+        this.onRtlStateUpdate_(rtlState);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.PAGE_HAS_AUDIO_STATE,
+      audio => {
+        this.onPageHasAudioStateUpdate_(audio);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.HAS_SIDEBAR_STATE,
+      hasSidebar => {
+        this.onHasSidebarStateUpdate_(hasSidebar);
+      },
+      true /** callToInitialize */
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
+      isVisible => {
+        this.onSystemUiIsVisibleStateUpdate_(isVisible);
+      }
+    );
   }
 
   /**
@@ -373,9 +415,9 @@ export class SystemLayer {
    */
   onAdStateUpdate_(isAd) {
     this.vsync_.mutate(() => {
-      isAd ?
-        this.getShadowRoot().setAttribute(AD_SHOWING_ATTRIBUTE, '') :
-        this.getShadowRoot().removeAttribute(AD_SHOWING_ATTRIBUTE);
+      isAd
+        ? this.getShadowRoot().setAttribute(AD_SHOWING_ATTRIBUTE, '')
+        : this.getShadowRoot().removeAttribute(AD_SHOWING_ATTRIBUTE);
     });
   }
 
@@ -385,8 +427,10 @@ export class SystemLayer {
    * @private
    */
   onBookendStateUpdate_(isActive) {
-    this.getShadowRoot()
-        .classList.toggle('i-amphtml-story-bookend-active', isActive);
+    this.getShadowRoot().classList.toggle(
+      'i-amphtml-story-bookend-active',
+      isActive
+    );
   }
 
   /**
@@ -411,8 +455,10 @@ export class SystemLayer {
    */
   onCanShowSharingUisUpdate_(canShowSharingUis) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-no-sharing', !canShowSharingUis);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-no-sharing',
+        !canShowSharingUis
+      );
     });
   }
 
@@ -424,8 +470,10 @@ export class SystemLayer {
    */
   onStoryHasAudioStateUpdate_(hasAudio) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-has-audio', hasAudio);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-has-audio',
+        hasAudio
+      );
     });
   }
 
@@ -437,13 +485,17 @@ export class SystemLayer {
    */
   onPageHasAudioStateUpdate_(pageHasAudio) {
     pageHasAudio =
-        pageHasAudio || !!this.storeService_.get(
-            StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE);
+      pageHasAudio ||
+      !!this.storeService_.get(StateProperty.STORY_HAS_BACKGROUND_AUDIO_STATE);
     this.vsync_.mutate(() => {
-      pageHasAudio ?
-        this.getShadowRoot()
-            .setAttribute(CURRENT_PAGE_HAS_AUDIO_ATTRIBUTE, '') :
-        this.getShadowRoot().removeAttribute(CURRENT_PAGE_HAS_AUDIO_ATTRIBUTE);
+      pageHasAudio
+        ? this.getShadowRoot().setAttribute(
+            CURRENT_PAGE_HAS_AUDIO_ATTRIBUTE,
+            ''
+          )
+        : this.getShadowRoot().removeAttribute(
+            CURRENT_PAGE_HAS_AUDIO_ATTRIBUTE
+          );
     });
   }
   /**
@@ -453,9 +505,9 @@ export class SystemLayer {
    */
   onMutedStateUpdate_(isMuted) {
     this.vsync_.mutate(() => {
-      isMuted ?
-        this.getShadowRoot().setAttribute(AUDIO_MUTED_ATTRIBUTE, '') :
-        this.getShadowRoot().removeAttribute(AUDIO_MUTED_ATTRIBUTE);
+      isMuted
+        ? this.getShadowRoot().setAttribute(AUDIO_MUTED_ATTRIBUTE, '')
+        : this.getShadowRoot().removeAttribute(AUDIO_MUTED_ATTRIBUTE);
     });
   }
 
@@ -467,10 +519,10 @@ export class SystemLayer {
     if (this.timeoutId_) {
       this.timer_.cancel(this.timeoutId_);
     }
-    this.timeoutId_ =
-        this.timer_.delay(
-            () => this.hideAudioMessageInternal_(),
-            HIDE_AUDIO_MESSAGE_TIMEOUT_MS);
+    this.timeoutId_ = this.timer_.delay(
+      () => this.hideAudioMessageInternal_(),
+      HIDE_AUDIO_MESSAGE_TIMEOUT_MS
+    );
   }
 
   /**
@@ -516,8 +568,10 @@ export class SystemLayer {
    */
   onSystemUiIsVisibleStateUpdate_(isVisible) {
     this.vsync_.mutate(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-hidden', !isVisible);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-hidden',
+        !isVisible
+      );
     });
   }
 
@@ -538,9 +592,9 @@ export class SystemLayer {
    */
   onRtlStateUpdate_(rtlState) {
     this.vsync_.mutate(() => {
-      rtlState ?
-        this.getShadowRoot().setAttribute('dir', 'rtl') :
-        this.getShadowRoot().removeAttribute('dir');
+      rtlState
+        ? this.getShadowRoot().setAttribute('dir', 'rtl')
+        : this.getShadowRoot().removeAttribute('dir');
     });
   }
 
diff --git a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
index 90d136469e87..92ab40a1b085 100644
--- a/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
+++ b/extensions/amp-story/1.0/amp-story-unsupported-browser-layer.js
@@ -44,7 +44,7 @@ const UNSUPPORTED_BROWSER_LAYER_TEMPLATE = {
           tag: 'div',
           attrs: dict({'class': 'i-amphtml-story-overlay-text'}),
           localizedStringId:
-              LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT,
+            LocalizedStringId.AMP_STORY_WARNING_UNSUPPORTED_BROWSER_TEXT,
         },
         // The continue button functionality will only be present in the default
         // layer. Publisher provided fallbacks will not provide users with the
@@ -53,14 +53,13 @@ const UNSUPPORTED_BROWSER_LAYER_TEMPLATE = {
           tag: 'button',
           attrs: dict({'class': 'i-amphtml-continue-button'}),
           localizedStringId:
-              LocalizedStringId.AMP_STORY_CONTINUE_ANYWAY_BUTTON_LABEL,
+            LocalizedStringId.AMP_STORY_CONTINUE_ANYWAY_BUTTON_LABEL,
         },
       ],
     },
   ],
 };
 
-
 /**
  * Unsupported browser layer UI.
  */
@@ -93,11 +92,14 @@ export class UnsupportedBrowserLayer {
       return this.root_;
     }
     this.root_ = this.win_.document.createElement('div');
-    this.element_ =
-        renderAsElement(this.win_.document, UNSUPPORTED_BROWSER_LAYER_TEMPLATE);
+    this.element_ = renderAsElement(
+      this.win_.document,
+      UNSUPPORTED_BROWSER_LAYER_TEMPLATE
+    );
     createShadowRootWithStyle(this.root_, this.element_, CSS);
-    this.continueButton_ =
-      this.element_./*OK*/querySelector(`.${CONTINUE_ANYWAY_BUTTON_CLASS}`);
+    this.continueButton_ = this.element_./*OK*/ querySelector(
+      `.${CONTINUE_ANYWAY_BUTTON_CLASS}`
+    );
     this.continueButton_.addEventListener('click', () => {
       this.storeService_.dispatch(Action.TOGGLE_SUPPORTED_BROWSER, true);
     });
diff --git a/extensions/amp-story/1.0/amp-story-viewport-warning-layer.js b/extensions/amp-story/1.0/amp-story-viewport-warning-layer.js
index 3a8b5ac51535..0279dffde343 100644
--- a/extensions/amp-story/1.0/amp-story-viewport-warning-layer.js
+++ b/extensions/amp-story/1.0/amp-story-viewport-warning-layer.js
@@ -28,7 +28,6 @@ import {isExperimentOn} from '../../../src/experiments';
 import {listen} from '../../../src/event-helper';
 import {throttle} from '../../../src/utils/rate-limit';
 
-
 /**
  * CSS class indicating the format is landscape.
  * @const {string}
@@ -38,7 +37,6 @@ const LANDSCAPE_OVERLAY_CLASS = 'i-amphtml-story-landscape';
 /** @const {number} */
 const RESIZE_THROTTLE_MS = 300;
 
-
 /**
  * Viewport warning layer template.
  * @param {!Element} element
@@ -56,7 +54,6 @@ const getTemplate = element => {
   `;
 };
 
-
 /**
  * Viewport warning layer UI.
  */
@@ -67,8 +64,12 @@ export class ViewportWarningLayer {
    * @param {number} desktopWidthThreshold Threshold in px.
    * @param {number} desktopHeightThreshold Threshold in px.
    */
-  constructor(win, storyElement, desktopWidthThreshold,
-    desktopHeightThreshold) {
+  constructor(
+    win,
+    storyElement,
+    desktopWidthThreshold,
+    desktopHeightThreshold
+  ) {
     /** @private @const {!Window} */
     this.win_ = win;
 
@@ -130,8 +131,10 @@ export class ViewportWarningLayer {
     createShadowRootWithStyle(root, this.overlayEl_, CSS);
 
     // Initializes the UI state now that the component is built.
-    this.onUIStateUpdate_(/** @type {!UIType} */
-        (this.storeService_.get(StateProperty.UI_STATE)));
+    this.onUIStateUpdate_(
+      /** @type {!UIType} */
+      (this.storeService_.get(StateProperty.UI_STATE))
+    );
 
     this.vsync_.mutate(() => {
       this.storyElement_.insertBefore(root, this.storyElement_.firstChild);
@@ -150,14 +153,21 @@ export class ViewportWarningLayer {
    * @private
    */
   initializeListeners_() {
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(
-        StateProperty.VIEWPORT_WARNING_STATE, viewportWarningState => {
-          this.onViewportWarningStateUpdate_(viewportWarningState);
-        }, true /** callToInitialize */);
+      StateProperty.VIEWPORT_WARNING_STATE,
+      viewportWarningState => {
+        this.onViewportWarningStateUpdate_(viewportWarningState);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -167,7 +177,7 @@ export class ViewportWarningLayer {
    */
   onViewportWarningStateUpdate_(viewportWarningState) {
     const isMobile =
-        this.storeService_.get(StateProperty.UI_STATE) === UIType.MOBILE;
+      this.storeService_.get(StateProperty.UI_STATE) === UIType.MOBILE;
 
     // Adds the landscape class if we are mobile landscape.
     const shouldShowLandscapeOverlay = isMobile && viewportWarningState;
@@ -181,8 +191,11 @@ export class ViewportWarningLayer {
 
     // Listen to resize events to update the UI message.
     if (viewportWarningState) {
-      const resizeThrottle =
-          throttle(this.win_, () => this.onResize_(), RESIZE_THROTTLE_MS);
+      const resizeThrottle = throttle(
+        this.win_,
+        () => this.onResize_(),
+        RESIZE_THROTTLE_MS
+      );
       this.unlistenResizeEvents_ = listen(this.win_, 'resize', resizeThrottle);
     } else if (this.unlistenResizeEvents_) {
       this.unlistenResizeEvents_();
@@ -193,7 +206,9 @@ export class ViewportWarningLayer {
 
     this.vsync_.mutate(() => {
       this.overlayEl_.classList.toggle(
-          LANDSCAPE_OVERLAY_CLASS, shouldShowLandscapeOverlay);
+        LANDSCAPE_OVERLAY_CLASS,
+        shouldShowLandscapeOverlay
+      );
     });
   }
 
@@ -208,9 +223,9 @@ export class ViewportWarningLayer {
     }
 
     this.vsync_.mutate(() => {
-      uiState === UIType.DESKTOP_PANELS ?
-        this.overlayEl_.setAttribute('desktop', '') :
-        this.overlayEl_.removeAttribute('desktop');
+      uiState === UIType.DESKTOP_PANELS
+        ? this.overlayEl_.setAttribute('desktop', '')
+        : this.overlayEl_.removeAttribute('desktop');
     });
   }
 
@@ -248,8 +263,9 @@ export class ViewportWarningLayer {
    * @private
    */
   updateTextContent_() {
-    const textEl =
-        this.overlayEl_.querySelector('.i-amphtml-story-overlay-text');
+    const textEl = this.overlayEl_.querySelector(
+      '.i-amphtml-story-overlay-text'
+    );
     let textContent;
 
     this.vsync_.run({
@@ -275,26 +291,32 @@ export class ViewportWarningLayer {
   getTextContent_() {
     if (this.platform_.isIos() || this.platform_.isAndroid()) {
       return this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT);
+        LocalizedStringId.AMP_STORY_WARNING_LANDSCAPE_ORIENTATION_TEXT
+      );
     }
 
-    const viewportHeight = this.win_./*OK*/innerHeight;
-    const viewportWidth = this.win_./*OK*/innerWidth;
+    const viewportHeight = this.win_./*OK*/ innerHeight;
+    const viewportWidth = this.win_./*OK*/ innerWidth;
 
-    if (viewportHeight < this.desktopHeightThreshold_ &&
-        viewportWidth < this.desktopWidthThreshold_) {
+    if (
+      viewportHeight < this.desktopHeightThreshold_ &&
+      viewportWidth < this.desktopWidthThreshold_
+    ) {
       return this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT);
+        LocalizedStringId.AMP_STORY_WARNING_DESKTOP_SIZE_TEXT
+      );
     }
 
     if (viewportWidth < this.desktopWidthThreshold_) {
       return this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT);
+        LocalizedStringId.AMP_STORY_WARNING_DESKTOP_WIDTH_SIZE_TEXT
+      );
     }
 
     if (viewportHeight < this.desktopHeightThreshold_) {
       return this.localizationService_.getLocalizedString(
-          LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT);
+        LocalizedStringId.AMP_STORY_WARNING_DESKTOP_HEIGHT_SIZE_TEXT
+      );
     }
 
     return null;
diff --git a/extensions/amp-story/1.0/amp-story.js b/extensions/amp-story/1.0/amp-story.js
index df9028b2a2a8..80df756f275c 100644
--- a/extensions/amp-story/1.0/amp-story.js
+++ b/extensions/amp-story/1.0/amp-story.js
@@ -205,7 +205,7 @@ const TAG = 'amp-story';
  * @private @const {string}
  */
 const HIDE_ON_BOOKEND_SELECTOR =
-    'amp-story-page, .i-amphtml-story-system-layer';
+  'amp-story-page, .i-amphtml-story-system-layer';
 
 /**
  * The default dark gray for chrome supported theme color.
@@ -239,8 +239,9 @@ export class AmpStory extends AMP.BaseElement {
 
     // TODO(#19768): Avoid passing a private function here.
     /** @private {!NavigationState} */
-    this.navigationState_ =
-        new NavigationState(this.win, () => this.hasBookend_());
+    this.navigationState_ = new NavigationState(this.win, () =>
+      this.hasBookend_()
+    );
 
     /** @private {!./story-analytics.StoryAnalyticsService} */
     this.analyticsService_ = getAnalyticsService(this.win, this.element);
@@ -268,8 +269,12 @@ export class AmpStory extends AMP.BaseElement {
     this.unsupportedBrowserLayer_ = new UnsupportedBrowserLayer(this.win);
 
     /** Instantiates the viewport warning layer. */
-    new ViewportWarningLayer(this.win, this.element, DESKTOP_WIDTH_THRESHOLD,
-        DESKTOP_HEIGHT_THRESHOLD);
+    new ViewportWarningLayer(
+      this.win,
+      this.element,
+      DESKTOP_WIDTH_THRESHOLD,
+      DESKTOP_HEIGHT_THRESHOLD
+    );
 
     /** @private {!Array<!./amp-story-page.AmpStoryPage>} */
     this.pages_ = [];
@@ -282,25 +287,29 @@ export class AmpStory extends AMP.BaseElement {
 
     /** @const @private {!AmpStoryVariableService} */
     this.variableService_ = new AmpStoryVariableService();
-    registerServiceBuilder(
-        this.win, 'story-variable', () => this.variableService_.get());
+    registerServiceBuilder(this.win, 'story-variable', () =>
+      this.variableService_.get()
+    );
 
     /** @private {?./amp-story-page.AmpStoryPage} */
     this.activePage_ = null;
 
     /** @private @const */
     this.desktopMedia_ = this.win.matchMedia(
-        `(min-width: ${DESKTOP_WIDTH_THRESHOLD}px) and ` +
-        `(min-height: ${DESKTOP_HEIGHT_THRESHOLD}px)`);
+      `(min-width: ${DESKTOP_WIDTH_THRESHOLD}px) and ` +
+        `(min-height: ${DESKTOP_HEIGHT_THRESHOLD}px)`
+    );
 
     /** @private @const */
     this.canRotateToDesktopMedia_ = this.win.matchMedia(
-        `(min-width: ${DESKTOP_HEIGHT_THRESHOLD}px) and ` +
-        `(min-height: ${DESKTOP_WIDTH_THRESHOLD}px)`);
+      `(min-width: ${DESKTOP_HEIGHT_THRESHOLD}px) and ` +
+        `(min-height: ${DESKTOP_WIDTH_THRESHOLD}px)`
+    );
 
     /** @private @const */
-    this.landscapeOrientationMedia_ =
-        this.win.matchMedia('(orientation: landscape)');
+    this.landscapeOrientationMedia_ = this.win.matchMedia(
+      '(orientation: landscape)'
+    );
 
     /** @private {?AmpStoryBackground} */
     this.background_ = null;
@@ -351,36 +360,43 @@ export class AmpStory extends AMP.BaseElement {
     /** @private @const {!LocalizationService} */
     this.localizationService_ = new LocalizationService(this.win);
     this.localizationService_
-        .registerLocalizedStringBundle('default', LocalizedStringsDefault)
-        .registerLocalizedStringBundle('ar', LocalizedStringsAr)
-        .registerLocalizedStringBundle('de', LocalizedStringsDe)
-        .registerLocalizedStringBundle('en', LocalizedStringsEn)
-        .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
-        .registerLocalizedStringBundle('es', LocalizedStringsEs)
-        .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
-        .registerLocalizedStringBundle('fr', LocalizedStringsFr)
-        .registerLocalizedStringBundle('hi', LocalizedStringsHi)
-        .registerLocalizedStringBundle('id', LocalizedStringsId)
-        .registerLocalizedStringBundle('it', LocalizedStringsIt)
-        .registerLocalizedStringBundle('ja', LocalizedStringsJa)
-        .registerLocalizedStringBundle('ko', LocalizedStringsKo)
-        .registerLocalizedStringBundle('nl', LocalizedStringsNl)
-        .registerLocalizedStringBundle('no', LocalizedStringsNo)
-        .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
-        .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
-        .registerLocalizedStringBundle('ru', LocalizedStringsRu)
-        .registerLocalizedStringBundle('tr', LocalizedStringsTr)
-        .registerLocalizedStringBundle('vi', LocalizedStringsVi)
-        .registerLocalizedStringBundle('zh-CN', LocalizedStringsZhCn)
-        .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw);
-
-    const enXaPseudoLocaleBundle =
-        createPseudoLocale(LocalizedStringsEn, s => `[${s} one two]`);
-    this.localizationService_
-        .registerLocalizedStringBundle('en-xa', enXaPseudoLocaleBundle);
+      .registerLocalizedStringBundle('default', LocalizedStringsDefault)
+      .registerLocalizedStringBundle('ar', LocalizedStringsAr)
+      .registerLocalizedStringBundle('de', LocalizedStringsDe)
+      .registerLocalizedStringBundle('en', LocalizedStringsEn)
+      .registerLocalizedStringBundle('en-GB', LocalizedStringsEnGb)
+      .registerLocalizedStringBundle('es', LocalizedStringsEs)
+      .registerLocalizedStringBundle('es-419', LocalizedStringsEs419)
+      .registerLocalizedStringBundle('fr', LocalizedStringsFr)
+      .registerLocalizedStringBundle('hi', LocalizedStringsHi)
+      .registerLocalizedStringBundle('id', LocalizedStringsId)
+      .registerLocalizedStringBundle('it', LocalizedStringsIt)
+      .registerLocalizedStringBundle('ja', LocalizedStringsJa)
+      .registerLocalizedStringBundle('ko', LocalizedStringsKo)
+      .registerLocalizedStringBundle('nl', LocalizedStringsNl)
+      .registerLocalizedStringBundle('no', LocalizedStringsNo)
+      .registerLocalizedStringBundle('pt-PT', LocalizedStringsPtPt)
+      .registerLocalizedStringBundle('pt-BR', LocalizedStringsPtBr)
+      .registerLocalizedStringBundle('ru', LocalizedStringsRu)
+      .registerLocalizedStringBundle('tr', LocalizedStringsTr)
+      .registerLocalizedStringBundle('vi', LocalizedStringsVi)
+      .registerLocalizedStringBundle('zh-CN', LocalizedStringsZhCn)
+      .registerLocalizedStringBundle('zh-TW', LocalizedStringsZhTw);
+
+    const enXaPseudoLocaleBundle = createPseudoLocale(
+      LocalizedStringsEn,
+      s => `[${s} one two]`
+    );
+    this.localizationService_.registerLocalizedStringBundle(
+      'en-xa',
+      enXaPseudoLocaleBundle
+    );
 
-    registerServiceBuilder(this.win, 'localization',
-        () => this.localizationService_);
+    registerServiceBuilder(
+      this.win,
+      'localization',
+      () => this.localizationService_
+    );
   }
 
   /** @override */
@@ -419,7 +435,9 @@ export class AmpStory extends AMP.BaseElement {
         const {args} = invocation;
         if (args) {
           this.storeService_.dispatch(
-              Action.SET_ADVANCEMENT_MODE, AdvancementMode.GO_TO_PAGE);
+            Action.SET_ADVANCEMENT_MODE,
+            AdvancementMode.GO_TO_PAGE
+          );
           this.switchTo_(args['id'], NavigationDirection.NEXT);
         }
       });
@@ -428,15 +446,18 @@ export class AmpStory extends AMP.BaseElement {
 
   /** @override */
   pauseCallback() {
-    this.pausedStateToRestore_ = !!this.storeService_
-        .get(StateProperty.PAUSED_STATE);
+    this.pausedStateToRestore_ = !!this.storeService_.get(
+      StateProperty.PAUSED_STATE
+    );
     this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
   }
 
   /** @override */
   resumeCallback() {
-    this.storeService_
-        .dispatch(Action.TOGGLE_PAUSED, this.pausedStateToRestore_);
+    this.storeService_.dispatch(
+      Action.TOGGLE_PAUSED,
+      this.pausedStateToRestore_
+    );
   }
 
   /**
@@ -454,8 +475,7 @@ export class AmpStory extends AMP.BaseElement {
 
   /** @private */
   initializeStyles_() {
-    const mediaQueryEls =
-        this.element.querySelectorAll('media-query');
+    const mediaQueryEls = this.element.querySelectorAll('media-query');
 
     if (mediaQueryEls.length) {
       this.initializeMediaQueries_(mediaQueryEls);
@@ -487,8 +507,9 @@ export class AmpStory extends AMP.BaseElement {
       const media = el.getAttribute('media');
 
       if (className && media) {
-        service.onMediaQueryMatch(
-            media, matches => onMediaQueryMatch(matches, className));
+        service.onMediaQueryMatch(media, matches =>
+          onMediaQueryMatch(matches, className)
+        );
       }
     });
   }
@@ -506,16 +527,16 @@ export class AmpStory extends AMP.BaseElement {
     // ../../../extensions/amp-animation/0.1/web-animations.js
     this.mutateElement(() => {
       styleEl.textContent = styleEl.textContent
-          .replace(/([\d.]+)vh/gmi, 'calc($1 * var(--i-amphtml-story-vh))')
-          .replace(/([\d.]+)vw/gmi, 'calc($1 * var(--i-amphtml-story-vw))')
-          .replace(/([\d.]+)vmin/gmi, 'calc($1 * var(--i-amphtml-story-vmin))')
-          .replace(/([\d.]+)vmax/gmi, 'calc($1 * var(--i-amphtml-story-vmax))');
+        .replace(/([\d.]+)vh/gim, 'calc($1 * var(--i-amphtml-story-vh))')
+        .replace(/([\d.]+)vw/gim, 'calc($1 * var(--i-amphtml-story-vw))')
+        .replace(/([\d.]+)vmin/gim, 'calc($1 * var(--i-amphtml-story-vmin))')
+        .replace(/([\d.]+)vmax/gim, 'calc($1 * var(--i-amphtml-story-vmax))');
     });
   }
 
   /**
-  * @private
-  */
+   * @private
+   */
   setThemeColor_() {
     // Don't override the publisher's tag.
     if (this.win.document.querySelector('meta[name=theme-color]')) {
@@ -527,10 +548,13 @@ export class AmpStory extends AMP.BaseElement {
     const ampStoryPageEl = this.element.querySelector('amp-story-page');
     meta.name = 'theme-color';
     meta.content =
+      computedStyle(this.win, this.element).getPropertyValue(
+        '--primary-color'
+      ) ||
       computedStyle(
-          this.win, this.element).getPropertyValue('--primary-color') ||
-      computedStyle(this.win, dev().assertElement(ampStoryPageEl))
-          .getPropertyValue('background-color') ||
+        this.win,
+        dev().assertElement(ampStoryPageEl)
+      ).getPropertyValue('background-color') ||
       DEFAULT_THEME_COLOR;
     this.win.document.head.appendChild(meta);
   }
@@ -543,21 +567,26 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    return this.vsync_.runPromise({
-      measure: state => {
-        state.vh = this.activePage_.element./*OK*/clientHeight / 100;
-        state.vw = this.activePage_.element./*OK*/clientWidth / 100;
-        state.vmin = Math.min(state.vh, state.vw);
-        state.vmax = Math.max(state.vh, state.vw);
-      },
-      mutate: state => {
-        this.win.document.documentElement.setAttribute('style',
+    return this.vsync_.runPromise(
+      {
+        measure: state => {
+          state.vh = this.activePage_.element./*OK*/ clientHeight / 100;
+          state.vw = this.activePage_.element./*OK*/ clientWidth / 100;
+          state.vmin = Math.min(state.vh, state.vw);
+          state.vmax = Math.max(state.vh, state.vw);
+        },
+        mutate: state => {
+          this.win.document.documentElement.setAttribute(
+            'style',
             `--i-amphtml-story-vh: ${px(state.vh)};` +
-            `--i-amphtml-story-vw: ${px(state.vw)};` +
-            `--i-amphtml-story-vmin: ${px(state.vmin)};` +
-            `--i-amphtml-story-vmax: ${px(state.vmax)};`);
+              `--i-amphtml-story-vw: ${px(state.vw)};` +
+              `--i-amphtml-story-vmin: ${px(state.vmin)};` +
+              `--i-amphtml-story-vmax: ${px(state.vmax)};`
+          );
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -581,26 +610,35 @@ export class AmpStory extends AMP.BaseElement {
       this.previous_();
     });
 
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      this.onMutedStateUpdate_(isMuted);
-      this.variableService_.onMutedStateChange(isMuted);
-    }, true /** callToInitialize */);
-
-    this.storeService_.subscribe(StateProperty.MUTED_STATE, isMuted => {
-      // We do not want to trigger an analytics event for the initialization of
-      // the muted state.
-      this.analyticsService_.onMutedStateChange(isMuted);
-    }, false /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        this.onMutedStateUpdate_(isMuted);
+        this.variableService_.onMutedStateChange(isMuted);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(
-        StateProperty.SUPPORTED_BROWSER_STATE, isBrowserSupported => {
-          this.onSupportedBrowserStateUpdate_(isBrowserSupported);
-        });
+      StateProperty.MUTED_STATE,
+      isMuted => {
+        // We do not want to trigger an analytics event for the initialization of
+        // the muted state.
+        this.analyticsService_.onMutedStateChange(isMuted);
+      },
+      false /** callToInitialize */
+    );
 
     this.storeService_.subscribe(
-        StateProperty.ADVANCEMENT_MODE, mode => {
-          this.variableService_.onAdvancementModeStateChange(mode);
-        });
+      StateProperty.SUPPORTED_BROWSER_STATE,
+      isBrowserSupported => {
+        this.onSupportedBrowserStateUpdate_(isBrowserSupported);
+      }
+    );
+
+    this.storeService_.subscribe(StateProperty.ADVANCEMENT_MODE, mode => {
+      this.variableService_.onAdvancementModeStateChange(mode);
+    });
 
     this.element.addEventListener(EventType.SWITCH_PAGE, e => {
       if (this.storeService_.get(StateProperty.BOOKEND_STATE)) {
@@ -637,10 +675,9 @@ export class AmpStory extends AMP.BaseElement {
       }
     });
 
-    this.advancement_.addOnTapNavigationListener(
-        direction => {
-          this.performTapNavigation_(direction);
-        });
+    this.advancement_.addOnTapNavigationListener(direction => {
+      this.performTapNavigation_(direction);
+    });
 
     this.element.addEventListener(EventType.DISPATCH_ACTION, e => {
       if (!getMode().test) {
@@ -655,10 +692,13 @@ export class AmpStory extends AMP.BaseElement {
     // Actions whitelist could be initialized empty, or with some actions some
     // other components registered.
     this.storeService_.subscribe(
-        StateProperty.ACTIONS_WHITELIST, actionsWhitelist => {
-          const actions = Services.actionServiceForDoc(this.element);
-          actions.setWhitelist(actionsWhitelist);
-        }, true /** callToInitialize */);
+      StateProperty.ACTIONS_WHITELIST,
+      actionsWhitelist => {
+        const actions = Services.actionServiceForDoc(this.element);
+        actions.setWhitelist(actionsWhitelist);
+      },
+      true /** callToInitialize */
+    );
 
     this.storeService_.subscribe(StateProperty.AD_STATE, isAd => {
       this.onAdStateUpdate_(isAd);
@@ -680,13 +720,21 @@ export class AmpStory extends AMP.BaseElement {
       this.onSidebarStateUpdate_(sidebarState);
     });
 
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
 
-    this.win.document.addEventListener('keydown', e => {
-      this.onKeyDown_(e);
-    }, true);
+    this.win.document.addEventListener(
+      'keydown',
+      e => {
+        this.onKeyDown_(e);
+      },
+      true
+    );
 
     this.win.document.addEventListener('contextmenu', e => {
       const uiState = this.storeService_.get(StateProperty.UI_STATE);
@@ -714,22 +762,25 @@ export class AmpStory extends AMP.BaseElement {
     // swipe to the next story feature.
     const viewerService = Services.viewerForDoc(this.element);
     const swipeRecognizer =
-        (viewerService && viewerService.hasCapability('swipe')) ?
-          SwipeYRecognizer : SwipeXYRecognizer;
+      viewerService && viewerService.hasCapability('swipe')
+        ? SwipeYRecognizer
+        : SwipeXYRecognizer;
 
     // Shows "tap to navigate" hint when swiping.
     gestures.onGesture(swipeRecognizer, gesture => {
       const {deltaX, deltaY} = gesture.data;
-      const embedComponent = /** @type {InteractiveComponentDef} */
-        (this.storeService_.get(StateProperty.INTERACTIVE_COMPONENT_STATE));
+      const embedComponent = /** @type {InteractiveComponentDef} */ (this.storeService_.get(
+        StateProperty.INTERACTIVE_COMPONENT_STATE
+      ));
       // TODO(enriqe): Move to a separate file if this keeps growing.
-      if (this.storeService_.get(StateProperty.BOOKEND_STATE) ||
-          embedComponent.state !== EmbeddedComponentState.HIDDEN ||
-          this.storeService_.get(StateProperty.ACCESS_STATE) ||
-          this.storeService_.get(StateProperty.SIDEBAR_STATE) ||
-          !this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) ||
-          !this.storeService_
-              .get(StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT)) {
+      if (
+        this.storeService_.get(StateProperty.BOOKEND_STATE) ||
+        embedComponent.state !== EmbeddedComponentState.HIDDEN ||
+        this.storeService_.get(StateProperty.ACCESS_STATE) ||
+        this.storeService_.get(StateProperty.SIDEBAR_STATE) ||
+        !this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) ||
+        !this.storeService_.get(StateProperty.CAN_SHOW_NAVIGATION_OVERLAY_HINT)
+      ) {
         // Cancels the event for this gesture entirely, ensuring the hint won't
         // show even if the user keeps swiping without releasing the touch.
         if (gesture.event && gesture.event.cancelable !== false) {
@@ -737,8 +788,10 @@ export class AmpStory extends AMP.BaseElement {
         }
         return;
       }
-      if ((gesture.event && gesture.event.defaultPrevented) ||
-          !this.isSwipeLargeEnoughForHint_(deltaX, deltaY)) {
+      if (
+        (gesture.event && gesture.event.defaultPrevented) ||
+        !this.isSwipeLargeEnoughForHint_(deltaX, deltaY)
+      ) {
         return;
       }
 
@@ -754,7 +807,7 @@ export class AmpStory extends AMP.BaseElement {
    */
   isSwipeLargeEnoughForHint_(deltaX, deltaY) {
     const sideSwipe = Math.abs(deltaX) >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
-    const upSwipe = (-1 * deltaY) >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
+    const upSwipe = -1 * deltaY >= MIN_SWIPE_FOR_HINT_OVERLAY_PX;
     return sideSwipe || upSwipe;
   }
 
@@ -791,9 +844,11 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    const lockOrientation = screen.lockOrientation ||
-        screen.mozLockOrientation || screen.msLockOrientation ||
-        (unusedOrientation => {});
+    const lockOrientation =
+      screen.lockOrientation ||
+      screen.mozLockOrientation ||
+      screen.msLockOrientation ||
+      (unusedOrientation => {});
 
     try {
       lockOrientation('portrait');
@@ -809,8 +864,9 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     // TODO(#19768): Avoid passing a private function here.
-    this.paginationButtons_ =
-        PaginationButtons.create(this.win, () => this.hasBookend_());
+    this.paginationButtons_ = PaginationButtons.create(this.win, () =>
+      this.hasBookend_()
+    );
 
     this.paginationButtons_.attach(this.element);
   }
@@ -837,65 +893,75 @@ export class AmpStory extends AMP.BaseElement {
    */
   layoutStory_() {
     const firstPageEl = user().assertElement(
-        this.element.querySelector('amp-story-page'),
-        'Story must have at least one page.');
+      this.element.querySelector('amp-story-page'),
+      'Story must have at least one page.'
+    );
 
     this.initializeSidebar_();
     this.setThemeColor_();
 
     const storyLayoutPromise = this.initializePages_()
-        .then(() => {
-          this.buildSystemLayer_();
+      .then(() => {
+        this.buildSystemLayer_();
 
-          this.handleConsentExtension_();
-          this.initializeStoryAccess_();
+        this.handleConsentExtension_();
+        this.initializeStoryAccess_();
 
-          this.pages_.forEach((page, index) => {
-            page.setState(PageState.NOT_ACTIVE);
-            this.upgradeCtaAnchorTagsForTracking_(page, index);
+        this.pages_.forEach((page, index) => {
+          page.setState(PageState.NOT_ACTIVE);
+          this.upgradeCtaAnchorTagsForTracking_(page, index);
+        });
+        if (isExperimentOn(this.win, 'amp-story-branching')) {
+          this.initializeStoryNavigationPath_();
+        }
+      })
+      .then(() => this.initializeBookend_())
+      .then(() => {
+        const bookendInHistory = !!getHistoryState(
+          this.win,
+          HistoryState.BOOKEND_ACTIVE
+        );
+        if (bookendInHistory) {
+          return this.hasBookend_().then(hasBookend => {
+            if (hasBookend) {
+              this.storeService_.dispatch(Action.TOGGLE_BOOKEND, true);
+            }
           });
-          if (isExperimentOn(this.win, 'amp-story-branching')) {
-            this.initializeStoryNavigationPath_();
-          }
-        })
-        .then(() => this.initializeBookend_())
-        .then(() => {
-          const bookendInHistory =
-              !!getHistoryState(this.win, HistoryState.BOOKEND_ACTIVE);
-          if (bookendInHistory) {
-            return this.hasBookend_().then(hasBookend => {
-              if (hasBookend) {
-                this.storeService_.dispatch(Action.TOGGLE_BOOKEND, true);
-              }
-            });
-          }
-        })
-        .then(() =>
-          this.switchTo_(
-              this.getInitialPageId_(firstPageEl), NavigationDirection.NEXT))
-        .then(() => this.updateViewportSizeStyles_())
-        .then(() => {
-          const shouldReOpenAttachmentForPageId =
-              getHistoryState(this.win, HistoryState.ATTACHMENT_PAGE_ID);
-
-          if (shouldReOpenAttachmentForPageId === this.activePage_.element.id) {
-            this.activePage_.openAttachment(false /** shouldAnimate */);
-          }
+        }
+      })
+      .then(() =>
+        this.switchTo_(
+          this.getInitialPageId_(firstPageEl),
+          NavigationDirection.NEXT
+        )
+      )
+      .then(() => this.updateViewportSizeStyles_())
+      .then(() => {
+        const shouldReOpenAttachmentForPageId = getHistoryState(
+          this.win,
+          HistoryState.ATTACHMENT_PAGE_ID
+        );
+
+        if (shouldReOpenAttachmentForPageId === this.activePage_.element.id) {
+          this.activePage_.openAttachment(false /** shouldAnimate */);
+        }
 
-          // Preloads and prerenders the share menu.
-          this.shareMenu_.build();
+        // Preloads and prerenders the share menu.
+        this.shareMenu_.build();
 
-          const infoDialog = Services.viewerForDoc(this.element).isEmbedded() ?
-            new InfoDialog(this.win, this.element) : null;
-          if (infoDialog) {
-            infoDialog.build();
-          }
-        });
+        const infoDialog = Services.viewerForDoc(this.element).isEmbedded()
+          ? new InfoDialog(this.win, this.element)
+          : null;
+        if (infoDialog) {
+          infoDialog.build();
+        }
+      });
 
     // Do not block the layout callback on the completion of these promises, as
     // that prevents descendents from being laid out (and therefore loaded).
-    storyLayoutPromise.then(() => this.whenPagesLoaded_(PAGE_LOAD_TIMEOUT_MS))
-        .then(() => this.markStoryAsLoaded_());
+    storyLayoutPromise
+      .then(() => this.whenPagesLoaded_(PAGE_LOAD_TIMEOUT_MS))
+      .then(() => this.markStoryAsLoaded_());
 
     return storyLayoutPromise;
   }
@@ -909,11 +975,12 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   getInitialPageId_(firstPageEl) {
-    const isActualPage =
-      pageId =>
-        findIndex(this.pages_, page => page.element.id === pageId) >= 0;
-    const historyPage =
-    /** @type {string} */ (getHistoryState(this.win, HistoryState.PAGE_ID));
+    const isActualPage = pageId =>
+      findIndex(this.pages_, page => page.element.id === pageId) >= 0;
+    const historyPage = /** @type {string} */ (getHistoryState(
+      this.win,
+      HistoryState.PAGE_ID
+    ));
 
     if (isExperimentOn(this.win, 'amp-story-branching')) {
       const maybePageId = parseQueryString(this.win.location.hash)['page'];
@@ -938,22 +1005,28 @@ export class AmpStory extends AMP.BaseElement {
    */
   whenPagesLoaded_(timeoutMs = 0) {
     const pagesToWaitFor =
-        this.storeService_.get(StateProperty.UI_STATE) ===
-            UIType.DESKTOP_PANELS ?
-          [this.pages_[0], this.pages_[1]] :
-          [this.pages_[0]];
+      this.storeService_.get(StateProperty.UI_STATE) === UIType.DESKTOP_PANELS
+        ? [this.pages_[0], this.pages_[1]]
+        : [this.pages_[0]];
 
     const storyLoadPromise = Promise.all(
-        pagesToWaitFor.filter(page => !!page).map(page => page.whenLoaded()));
+      pagesToWaitFor.filter(page => !!page).map(page => page.whenLoaded())
+    );
 
-    return this.timer_.timeoutPromise(timeoutMs, storyLoadPromise)
-        .catch(() => {});
+    return this.timer_
+      .timeoutPromise(timeoutMs, storyLoadPromise)
+      .catch(() => {});
   }
 
   /** @private */
   markStoryAsLoaded_() {
-    dispatch(this.win, this.element, EventType.STORY_LOADED,
-        /* payload */ undefined, {bubbles: true});
+    dispatch(
+      this.win,
+      this.element,
+      EventType.STORY_LOADED,
+      /* payload */ undefined,
+      {bubbles: true}
+    );
     this.signals().signal(CommonSignals.INI_LOAD);
     this.mutateElement(() => {
       this.element.classList.add(STORY_LOADED_CLASS_NAME);
@@ -1005,7 +1078,9 @@ export class AmpStory extends AMP.BaseElement {
 
     const allowedTags = ['SCRIPT', 'AMP-STORY-CONSENT'];
     const toRemoveChildren = childElements(
-        consentEl, el => allowedTags.indexOf(el.tagName) === -1);
+      consentEl,
+      el => allowedTags.indexOf(el.tagName) === -1
+    );
 
     if (toRemoveChildren.length === 0) {
       return;
@@ -1023,21 +1098,26 @@ export class AmpStory extends AMP.BaseElement {
         return;
       }
 
-      this.areAccessAuthorizationsCompleted_ =
-          accessService.areFirstAuthorizationsCompleted();
-      accessService.onApplyAuthorizations(
-          () => this.onAccessApplyAuthorizations_());
+      this.areAccessAuthorizationsCompleted_ = accessService.areFirstAuthorizationsCompleted();
+      accessService.onApplyAuthorizations(() =>
+        this.onAccessApplyAuthorizations_()
+      );
 
       const firstPage = this.pages_[0].element;
 
       // First amp-story-page can't be paywall protected.
       // Removes the access attributes, and throws an error during development.
-      if (firstPage.hasAttribute('amp-access') ||
-          firstPage.hasAttribute('amp-access-hide')) {
+      if (
+        firstPage.hasAttribute('amp-access') ||
+        firstPage.hasAttribute('amp-access-hide')
+      ) {
         firstPage.removeAttribute('amp-access');
         firstPage.removeAttribute('amp-access-hide');
-        user().error(TAG, 'First amp-story-page cannot have amp-access ' +
-            'or amp-access-hide attributes');
+        user().error(
+          TAG,
+          'First amp-story-page cannot have amp-access ' +
+            'or amp-access-hide attributes'
+        );
       }
     });
   }
@@ -1078,15 +1158,17 @@ export class AmpStory extends AMP.BaseElement {
   /** @private */
   initializePages_() {
     const pageImplPromises = Array.prototype.map.call(
-        this.element.querySelectorAll('amp-story-page'),
-        pageEl => pageEl.getImpl());
+      this.element.querySelectorAll('amp-story-page'),
+      pageEl => pageEl.getImpl()
+    );
 
     return Promise.all(pageImplPromises).then(pages => {
       this.storeService_.dispatch(Action.SET_PAGES_COUNT, pages.length);
       this.pages_ = pages;
       if (isExperimentOn(this.win, 'amp-story-branching')) {
-        this.storeService_.dispatch(Action.ADD_TO_ACTIONS_WHITELIST,
-            [{tagOrTarget: 'AMP-STORY', method: 'goToPage'}]);
+        this.storeService_.dispatch(Action.ADD_TO_ACTIONS_WHITELIST, [
+          {tagOrTarget: 'AMP-STORY', method: 'goToPage'},
+        ]);
       }
     });
   }
@@ -1098,13 +1180,17 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   next_(opt_isAutomaticAdvance) {
-    const activePage = devAssert(this.activePage_,
-        'No active page set when navigating to next page.');
+    const activePage = devAssert(
+      this.activePage_,
+      'No active page set when navigating to next page.'
+    );
 
     const lastPage = this.pages_[this.getPageCount() - 1];
-    if (activePage.element.hasAttribute(Attributes.ADVANCE_TO) ||
-        activePage.element.hasAttribute(Attributes.PUBLIC_ADVANCE_TO) ||
-        activePage !== lastPage) {
+    if (
+      activePage.element.hasAttribute(Attributes.ADVANCE_TO) ||
+      activePage.element.hasAttribute(Attributes.PUBLIC_ADVANCE_TO) ||
+      activePage !== lastPage
+    ) {
       activePage.next(opt_isAutomaticAdvance);
     } else {
       this.hasBookend_().then(hasBookend => {
@@ -1120,8 +1206,10 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   previous_() {
-    const activePage = devAssert(this.activePage_,
-        'No active page set when navigating to previous page.');
+    const activePage = devAssert(
+      this.activePage_,
+      'No active page set when navigating to previous page.'
+    );
     activePage.previous();
   }
 
@@ -1130,14 +1218,17 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   performTapNavigation_(direction) {
-    if (this.storeService_.get(StateProperty.UI_STATE) ===
-        UIType.DESKTOP_PANELS) {
+    if (
+      this.storeService_.get(StateProperty.UI_STATE) === UIType.DESKTOP_PANELS
+    ) {
       this.next_();
       return;
     }
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.MANUAL_ADVANCE);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.MANUAL_ADVANCE
+    );
 
     if (direction === TapNavigationDirection.NEXT) {
       this.next_();
@@ -1154,23 +1245,24 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   switchTo_(targetPageId, direction) {
-    const targetPage =
-        (isExperimentOn(this.win, 'amp-story-branching')) ?
-          this.updateStoryNavigationPath_(targetPageId, direction) :
-          this.getPageById(targetPageId);
+    const targetPage = isExperimentOn(this.win, 'amp-story-branching')
+      ? this.updateStoryNavigationPath_(targetPageId, direction)
+      : this.getPageById(targetPageId);
 
     const pageIndex = this.getPageIndex(targetPage);
 
     // Step out if trying to navigate to the currently active page.
-    if (this.activePage_ && (this.activePage_.element.id === targetPageId)) {
+    if (this.activePage_ && this.activePage_.element.id === targetPageId) {
       return Promise.resolve();
     }
 
     // If the next page might be paywall protected, and the access
     // authorizations did not resolve yet, wait before navigating.
     // TODO(gmajoulet): implement a loading state.
-    if (targetPage.element.hasAttribute('amp-access') &&
-        !this.areAccessAuthorizationsCompleted_) {
+    if (
+      targetPage.element.hasAttribute('amp-access') &&
+      !this.areAccessAuthorizationsCompleted_
+    ) {
       this.navigateToPageAfterAccess_ = targetPage;
       return Promise.resolve();
     }
@@ -1194,8 +1286,10 @@ export class AmpStory extends AMP.BaseElement {
       () => {
         oldPage && oldPage.element.removeAttribute('active');
 
-        if (this.storeService_.get(StateProperty.UI_STATE) ===
-            UIType.DESKTOP_PANELS) {
+        if (
+          this.storeService_.get(StateProperty.UI_STATE) ===
+          UIType.DESKTOP_PANELS
+        ) {
           this.setDesktopPositionAttributes_(targetPage);
         }
 
@@ -1220,14 +1314,15 @@ export class AmpStory extends AMP.BaseElement {
 
           // Indication to know where to display the page on the desktop
           // ribbon-like animation.
-          this.getPageIndex(oldPage) < pageIndex ?
-            setAttributeInMutate(oldPage, Attributes.VISITED) :
-            removeAttributeInMutate(oldPage, Attributes.VISITED);
+          this.getPageIndex(oldPage) < pageIndex
+            ? setAttributeInMutate(oldPage, Attributes.VISITED)
+            : removeAttributeInMutate(oldPage, Attributes.VISITED);
 
           if (oldPage.isAd()) {
             this.storeService_.dispatch(
-                Action.SET_ADVANCEMENT_MODE,
-                AdvancementMode.ADVANCE_TO_ADS);
+              Action.SET_ADVANCEMENT_MODE,
+              AdvancementMode.ADVANCE_TO_ADS
+            );
           }
         }
 
@@ -1245,22 +1340,25 @@ export class AmpStory extends AMP.BaseElement {
 
           // Start progress bar update for pages that are not ads or auto-
           // advance.
-          const isAutoAdvance =
-            targetPage.element.hasAttribute(Attributes.AUTO_ADVANCE_AFTER);
+          const isAutoAdvance = targetPage.element.hasAttribute(
+            Attributes.AUTO_ADVANCE_AFTER
+          );
           if (!isAutoAdvance) {
-            this.systemLayer_.updateProgress(targetPageId,
-                this.advancement_.getProgress());
+            this.systemLayer_.updateProgress(
+              targetPageId,
+              this.advancement_.getProgress()
+            );
           }
         }
 
         const oldPageId = oldPage ? oldPage.element.id : null;
         // TODO(alanorozco): check if autoplay
         this.navigationState_.updateActivePage(
-            pageIndex,
-            this.getPageCount(),
-            targetPage.element.id,
-            oldPageId,
-            targetPage.getNextPageId() === null /* isFinalPage */
+          pageIndex,
+          this.getPageCount(),
+          targetPage.element.id,
+          oldPageId,
+          targetPage.getNextPageId() === null /* isFinalPage */
         );
 
         // If first navigation.
@@ -1285,8 +1383,9 @@ export class AmpStory extends AMP.BaseElement {
         this.triggerActiveEventForPage_();
 
         this.systemLayer_.resetDeveloperLogs();
-        this.systemLayer_
-            .setDeveloperLogContextString(this.activePage_.element.id);
+        this.systemLayer_.setDeveloperLogContextString(
+          this.activePage_.element.id
+        );
       },
     ];
 
@@ -1318,15 +1417,17 @@ export class AmpStory extends AMP.BaseElement {
     if (direction === NavigationDirection.PREVIOUS) {
       this.storyNavigationPath_.pop();
       if (this.storyNavigationPath_.length > 0) {
-        const pathPrevious =
-            this.storyNavigationPath_[this.storyNavigationPath_.length - 1];
+        const pathPrevious = this.storyNavigationPath_[
+          this.storyNavigationPath_.length - 1
+        ];
         if (pathPrevious !== targetPageId) {
           return this.getPageById(pathPrevious);
         }
       }
     } else if (direction === NavigationDirection.NEXT) {
-      const topOfStack =
-          this.storyNavigationPath_[this.storyNavigationPath_.length - 1];
+      const topOfStack = this.storyNavigationPath_[
+        this.storyNavigationPath_.length - 1
+      ];
       // If the user navigates the away from the page, the top of storyStack
       // will be the same as ampStoryPageId in the history state.
       if (targetPageId !== topOfStack) {
@@ -1334,9 +1435,10 @@ export class AmpStory extends AMP.BaseElement {
       }
     }
     setHistoryState(
-        this.win,
-        HistoryState.NAVIGATION_PATH,
-        this.storyNavigationPath_);
+      this.win,
+      HistoryState.NAVIGATION_PATH,
+      this.storyNavigationPath_
+    );
     return this.getPageById(targetPageId);
   }
 
@@ -1378,33 +1480,37 @@ export class AmpStory extends AMP.BaseElement {
     let desktopPositionsToReset;
 
     this.measureMutateElement(
-        /** measurer */
-        () => {
-          desktopPositionsToReset =
-              scopedQuerySelectorAll(
-                  this.element,
-                  `amp-story-page[
-                      ${escapeCssSelectorIdent(Attributes.DESKTOP_POSITION)}]`);
-        },
-        /** mutator */
-        () => {
-          Array.prototype.forEach.call(desktopPositionsToReset, el => {
-            el.removeAttribute(Attributes.DESKTOP_POSITION);
-          });
+      /** measurer */
+      () => {
+        desktopPositionsToReset = scopedQuerySelectorAll(
+          this.element,
+          `amp-story-page[
+                      ${escapeCssSelectorIdent(Attributes.DESKTOP_POSITION)}]`
+        );
+      },
+      /** mutator */
+      () => {
+        Array.prototype.forEach.call(desktopPositionsToReset, el => {
+          el.removeAttribute(Attributes.DESKTOP_POSITION);
+        });
 
-          list.forEach(({page, position}) => {
-            page.element.setAttribute(Attributes.DESKTOP_POSITION, position);
-          });
+        list.forEach(({page, position}) => {
+          page.element.setAttribute(Attributes.DESKTOP_POSITION, position);
         });
+      }
+    );
   }
 
   /** @private */
   triggerActiveEventForPage_() {
     // TODO(alanorozco): pass event priority once amphtml-story repo is merged
     // with upstream.
-    Services.actionServiceForDoc(this.element)
-        .trigger(this.activePage_.element, 'active', /* event */ null,
-            ActionTrust.HIGH);
+    Services.actionServiceForDoc(this.element).trigger(
+      this.activePage_.element,
+      'active',
+      /* event */ null,
+      ActionTrust.HIGH
+    );
   }
 
   /**
@@ -1418,8 +1524,9 @@ export class AmpStory extends AMP.BaseElement {
     if (!this.platform_.isSafari() && !this.platform_.isIos()) {
       return;
     }
-    if (this.storeService_.get(StateProperty.UI_STATE) ===
-        UIType.DESKTOP_PANELS) {
+    if (
+      this.storeService_.get(StateProperty.UI_STATE) === UIType.DESKTOP_PANELS
+    ) {
       // Force repaint is only needed when transitioning from invisible to
       // visible
       return;
@@ -1432,7 +1539,7 @@ export class AmpStory extends AMP.BaseElement {
       // only to workaround the fact that the closure compiler would otherwise
       // think that only reading the height has no effect.  Since the height is
       // always >= 0, this conditional will always be executed.
-      const height = this.element./*OK*/offsetHeight;
+      const height = this.element./*OK*/ offsetHeight;
       if (height >= 0) {
         toggle(this.element, true);
       }
@@ -1450,7 +1557,9 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.MANUAL_ADVANCE);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.MANUAL_ADVANCE
+    );
 
     const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
 
@@ -1517,8 +1626,9 @@ export class AmpStory extends AMP.BaseElement {
     // is stored as a store state.
     this.mutateElement(() => {
       this.element.setAttribute(
-          Attributes.ORIENTATION,
-          isLandscapeSupported && isLandscape ? 'landscape' : 'portrait');
+        Attributes.ORIENTATION,
+        isLandscapeSupported && isLandscape ? 'landscape' : 'portrait'
+      );
     });
   }
 
@@ -1528,20 +1638,25 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   maybeTriggerViewportWarning_(isLandscape) {
-    if (isLandscape ===
-        this.storeService_.get(StateProperty.VIEWPORT_WARNING_STATE)) {
+    if (
+      isLandscape ===
+      this.storeService_.get(StateProperty.VIEWPORT_WARNING_STATE)
+    ) {
       return;
     }
 
     this.mutateElement(() => {
       if (isLandscape) {
-        this.pausedStateToRestore_ =
-            !!this.storeService_.get(StateProperty.PAUSED_STATE);
+        this.pausedStateToRestore_ = !!this.storeService_.get(
+          StateProperty.PAUSED_STATE
+        );
         this.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
         this.storeService_.dispatch(Action.TOGGLE_VIEWPORT_WARNING, true);
       } else {
-        this.storeService_
-            .dispatch(Action.TOGGLE_PAUSED, this.pausedStateToRestore_);
+        this.storeService_.dispatch(
+          Action.TOGGLE_PAUSED,
+          this.pausedStateToRestore_
+        );
         this.storeService_.dispatch(Action.TOGGLE_VIEWPORT_WARNING, false);
       }
     });
@@ -1552,9 +1667,9 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   onVisibilityChanged_() {
-    this.documentState_.isHidden() ?
-      this.pauseCallback() :
-      this.resumeCallback();
+    this.documentState_.isHidden()
+      ? this.pauseCallback()
+      : this.resumeCallback();
   }
 
   /**
@@ -1593,8 +1708,10 @@ export class AmpStory extends AMP.BaseElement {
           this.element.classList.add('i-amphtml-story-desktop-panels');
           this.element.classList.remove('i-amphtml-story-desktop-fullbleed');
         });
-        if (!this.background_ &&
-            isExperimentOn(this.win, 'amp-story-desktop-background')) {
+        if (
+          !this.background_ &&
+          isExperimentOn(this.win, 'amp-story-desktop-background')
+        ) {
           this.background_ = new AmpStoryBackground(this.win, this.element);
           this.background_.attach();
         }
@@ -1619,8 +1736,10 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   getUIType_() {
-    if (!this.isDesktop_() ||
-        isExperimentOn(this.win, 'disable-amp-story-desktop')) {
+    if (
+      !this.isDesktop_() ||
+      isExperimentOn(this.win, 'disable-amp-story-desktop')
+    ) {
       return UIType.MOBILE;
     }
 
@@ -1694,25 +1813,39 @@ export class AmpStory extends AMP.BaseElement {
     if (this.win.MutationObserver) {
       if (!this.sidebarObserver_) {
         this.sidebarObserver_ = new this.win.MutationObserver(() => {
-          this.storeService_.dispatch(Action.TOGGLE_SIDEBAR,
-              this.sidebar_.hasAttribute('open'));
+          this.storeService_.dispatch(
+            Action.TOGGLE_SIDEBAR,
+            this.sidebar_.hasAttribute('open')
+          );
         });
       }
       if (this.sidebar_ && sidebarState) {
         this.sidebarObserver_.observe(this.sidebar_, SIDEBAR_OBSERVER_OPTIONS);
         this.openOpacityMask_();
-        actions.execute(this.sidebar_, 'open', /* args */ null,
-            /* source */ null, /* caller */ null, /* event */ null,
-            ActionTrust.HIGH);
+        actions.execute(
+          this.sidebar_,
+          'open',
+          /* args */ null,
+          /* source */ null,
+          /* caller */ null,
+          /* event */ null,
+          ActionTrust.HIGH
+        );
       } else {
         this.closeOpacityMask_();
         this.sidebarObserver_.disconnect();
       }
     } else if (this.sidebar_ && sidebarState) {
       this.openOpacityMask_();
-      actions.execute(this.sidebar_, 'open', /* args */ null,
-          /* source */ null, /* caller */ null, /* event */ null,
-          ActionTrust.HIGH);
+      actions.execute(
+        this.sidebar_,
+        'open',
+        /* args */ null,
+        /* source */ null,
+        /* caller */ null,
+        /* event */ null,
+        ActionTrust.HIGH
+      );
       this.storeService_.dispatch(Action.TOGGLE_SIDEBAR, false);
     }
   }
@@ -1728,15 +1861,21 @@ export class AmpStory extends AMP.BaseElement {
         const actions = Services.actionServiceForDoc(this.element);
         if (this.sidebar_) {
           this.closeOpacityMask_();
-          actions.execute(this.sidebar_, 'close', /* args */ null,
-              /* source */ null, /* caller */ null, /* event */ null,
-              ActionTrust.HIGH);
+          actions.execute(
+            this.sidebar_,
+            'close',
+            /* args */ null,
+            /* source */ null,
+            /* caller */ null,
+            /* event */ null,
+            ActionTrust.HIGH
+          );
         }
       });
       this.maskElement_ = maskEl;
       this.mutateElement(() => {
         this.element.appendChild(this.maskElement_);
-        toggle(dev().assertElement(this.maskElement_), /* display */false);
+        toggle(dev().assertElement(this.maskElement_), /* display */ false);
       });
     }
   }
@@ -1746,7 +1885,7 @@ export class AmpStory extends AMP.BaseElement {
    */
   openOpacityMask_() {
     this.mutateElement(() => {
-      toggle(dev().assertElement(this.maskElement_), /* display */true);
+      toggle(dev().assertElement(this.maskElement_), /* display */ true);
     });
   }
 
@@ -1756,7 +1895,7 @@ export class AmpStory extends AMP.BaseElement {
   closeOpacityMask_() {
     if (this.maskElement_) {
       this.mutateElement(() => {
-        toggle(dev().assertElement(this.maskElement_), /* display */false);
+        toggle(dev().assertElement(this.maskElement_), /* display */ false);
       });
     }
   }
@@ -1773,14 +1912,18 @@ export class AmpStory extends AMP.BaseElement {
       // Removes the default unsupported browser layer or throws an error
       // if the publisher has provided their own fallback
       if (fallbackEl) {
-        dev().error(TAG, 'No handler to exit unsupported browser state on ' +
-        'publisher provided fallback.');
+        dev().error(
+          TAG,
+          'No handler to exit unsupported browser state on ' +
+            'publisher provided fallback.'
+        );
       } else {
-        this.layoutStory_().then(() => this.mutateElement(() => {
-          this.unsupportedBrowserLayer_.removeLayer();
-          this.element.classList.remove('i-amphtml-story-fallback');
-        }));
-
+        this.layoutStory_().then(() =>
+          this.mutateElement(() => {
+            this.unsupportedBrowserLayer_.removeLayer();
+            this.element.classList.remove('i-amphtml-story-fallback');
+          })
+        );
       }
     } else {
       this.mutateElement(() => {
@@ -1806,7 +1949,8 @@ export class AmpStory extends AMP.BaseElement {
    */
   getBackgroundUrl_(pageElement) {
     let fillElement = pageElement.querySelector(
-        '[template="fill"]:not(.i-amphtml-hidden-by-media-query)');
+      '[template="fill"]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
     if (!fillElement) {
       return null;
@@ -1815,13 +1959,16 @@ export class AmpStory extends AMP.BaseElement {
     fillElement = dev().assertElement(fillElement);
 
     const fillPosterElement = fillElement.querySelector(
-        '[poster]:not(.i-amphtml-hidden-by-media-query)');
+      '[poster]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
     const srcElement = fillElement.querySelector(
-        '[src]:not(.i-amphtml-hidden-by-media-query)');
+      '[src]:not(.i-amphtml-hidden-by-media-query)'
+    );
 
-    const fillPoster = fillPosterElement ?
-      fillPosterElement.getAttribute('poster') : '';
+    const fillPoster = fillPosterElement
+      ? fillPosterElement.getAttribute('poster')
+      : '';
     const src = srcElement ? srcElement.getAttribute('src') : '';
 
     return fillPoster || src;
@@ -1837,16 +1984,20 @@ export class AmpStory extends AMP.BaseElement {
       return;
     }
 
-    this.getVsync().run({
-      measure: state => {
-        state.url = this.getBackgroundUrl_(pageElement);
-        state.color = computedStyle(this.win, pageElement)
-            .getPropertyValue('background-color');
-      },
-      mutate: state => {
-        this.background_.setBackground(state.color, state.url, initial);
+    this.getVsync().run(
+      {
+        measure: state => {
+          state.url = this.getBackgroundUrl_(pageElement);
+          state.color = computedStyle(this.win, pageElement).getPropertyValue(
+            'background-color'
+          );
+        },
+        mutate: state => {
+          this.background_.setBackground(state.color, state.url, initial);
+        },
       },
-    }, {});
+      {}
+    );
   }
 
   /**
@@ -1883,13 +2034,16 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   toggleElementsOnBookend_(isActive) {
-    if (this.storeService_.get(StateProperty.UI_STATE) !==
-        UIType.DESKTOP_PANELS) {
+    if (
+      this.storeService_.get(StateProperty.UI_STATE) !== UIType.DESKTOP_PANELS
+    ) {
       return;
     }
 
-    const elements = scopedQuerySelectorAll(this.element,
-        HIDE_ON_BOOKEND_SELECTOR);
+    const elements = scopedQuerySelectorAll(
+      this.element,
+      HIDE_ON_BOOKEND_SELECTOR
+    );
 
     Array.prototype.forEach.call(elements, el => {
       if (isActive) {
@@ -1911,20 +2065,23 @@ export class AmpStory extends AMP.BaseElement {
    */
   getPagesByDistance_() {
     const distanceMap = this.getPageDistanceMapHelper_(
-        /* distance */ 0, /* map */ {}, this.activePage_.element.id);
+      /* distance */ 0,
+      /* map */ {},
+      this.activePage_.element.id
+    );
 
     // Transpose the map into a 2D array.
     const pagesByDistance = [];
     Object.keys(distanceMap).forEach(pageId => {
-
       const distance = distanceMap[pageId];
       if (!pagesByDistance[distance]) {
         pagesByDistance[distance] = [];
       }
       // There may be other 1 skip away pages due to branching.
       if (isExperimentOn(this.win, 'amp-story-branching')) {
-        const indexInStack =
-          this.storyNavigationPath_.indexOf(this.activePage_.element.id);
+        const indexInStack = this.storyNavigationPath_.indexOf(
+          this.activePage_.element.id
+        );
         const maybePrev = this.storyNavigationPath_[indexInStack - 1];
         if (indexInStack > 0 && pageId === this.activePage_.element.id) {
           if (!pagesByDistance[1]) {
@@ -1965,8 +2122,10 @@ export class AmpStory extends AMP.BaseElement {
     map[pageId] = distance;
     const page = this.getPageById(pageId);
     page.getAdjacentPageIds().forEach(adjacentPageId => {
-      if (map[adjacentPageId] !== undefined
-          && map[adjacentPageId] <= distance) {
+      if (
+        map[adjacentPageId] !== undefined &&
+        map[adjacentPageId] <= distance
+      ) {
         return;
       }
 
@@ -2013,18 +2172,21 @@ export class AmpStory extends AMP.BaseElement {
     // Once the media pool is ready, registers and preloads the background
     // audio, and then gets the swapped element from the DOM to mute/unmute/play
     // it programmatically later.
-    this.activePage_.whenLoaded()
-        .then(() => {
-          backgroundAudioEl =
-            /** @type {!HTMLMediaElement} */ (backgroundAudioEl);
-          this.mediaPool_.register(backgroundAudioEl);
-          return this.mediaPool_.preload(backgroundAudioEl);
-        }).then(() => {
-          this.backgroundAudioEl_ = /** @type {!HTMLMediaElement} */
-              (childElement(this.element, el => {
-                return el.tagName.toLowerCase() === 'audio';
-              }));
-        });
+    this.activePage_
+      .whenLoaded()
+      .then(() => {
+        backgroundAudioEl = /** @type {!HTMLMediaElement} */ (backgroundAudioEl);
+        this.mediaPool_.register(backgroundAudioEl);
+        return this.mediaPool_.preload(backgroundAudioEl);
+      })
+      .then(() => {
+        this.backgroundAudioEl_ = /** @type {!HTMLMediaElement} */ (childElement(
+          this.element,
+          el => {
+            return el.tagName.toLowerCase() === 'audio';
+          }
+        ));
+      });
   }
 
   /**
@@ -2035,15 +2197,17 @@ export class AmpStory extends AMP.BaseElement {
   initializeBookend_() {
     let bookendEl = this.element.querySelector('amp-story-bookend');
     if (!bookendEl) {
-      bookendEl = createElementWithAttributes(this.win.document,
-          'amp-story-bookend', dict({'layout': 'nodisplay'}));
+      bookendEl = createElementWithAttributes(
+        this.win.document,
+        'amp-story-bookend',
+        dict({'layout': 'nodisplay'})
+      );
       this.element.appendChild(bookendEl);
     }
 
-    return bookendEl.getImpl().then(
-        bookendImpl => {
-          this.bookend_ = bookendImpl;
-        });
+    return bookendEl.getImpl().then(bookendImpl => {
+      this.bookend_ = bookendImpl;
+    });
   }
 
   /**
@@ -2068,8 +2232,9 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   buildAndPreloadBookend_() {
-    this.bookend_
-        .build(!!getHistoryState(this.win, HistoryState.BOOKEND_ACTIVE));
+    this.bookend_.build(
+      !!getHistoryState(this.win, HistoryState.BOOKEND_ACTIVE)
+    );
     return this.bookend_.loadConfigAndMaybeRenderBookend();
   }
 
@@ -2090,9 +2255,11 @@ export class AmpStory extends AMP.BaseElement {
     }
 
     return this.bookend_
-        .loadConfigAndMaybeRenderBookend(false /** renderBookend */).then(
-            config => !!(config && config.components &&
-              config.components.length > 0));
+      .loadConfigAndMaybeRenderBookend(false /** renderBookend */)
+      .then(
+        config =>
+          !!(config && config.components && config.components.length > 0)
+      );
   }
 
   /**
@@ -2102,8 +2269,11 @@ export class AmpStory extends AMP.BaseElement {
   getPageIndexById(id) {
     const pageIndex = findIndex(this.pages_, page => page.element.id === id);
     if (pageIndex < 0) {
-      user().error(TAG,
-          'Story refers to page "%s", but no such page exists.', id);
+      user().error(
+        TAG,
+        'Story refers to page "%s", but no such page exists.',
+        id
+      );
     }
 
     return pageIndex;
@@ -2116,8 +2286,11 @@ export class AmpStory extends AMP.BaseElement {
    */
   getPageById(id) {
     const pageIndex = this.getPageIndexById(id);
-    return devAssert(this.pages_[pageIndex],
-        'Page at index %s exists, but is missing from the array.', pageIndex);
+    return devAssert(
+      this.pages_[pageIndex],
+      'Page at index %s exists, but is missing from the array.',
+      pageIndex
+    );
   }
 
   /**
@@ -2171,10 +2344,11 @@ export class AmpStory extends AMP.BaseElement {
 
   /** @override */
   getMaxMediaElementCounts() {
-    let audioMediaElementsCount =
-        this.element.querySelectorAll('amp-audio, [background-audio]').length;
-    const videoMediaElementsCount =
-        this.element.querySelectorAll('amp-video').length;
+    let audioMediaElementsCount = this.element.querySelectorAll(
+      'amp-audio, [background-audio]'
+    ).length;
+    const videoMediaElementsCount = this.element.querySelectorAll('amp-video')
+      .length;
 
     // The root element (amp-story) might have a background-audio as well.
     if (this.element.hasAttribute('background-audio')) {
@@ -2183,11 +2357,13 @@ export class AmpStory extends AMP.BaseElement {
 
     return {
       [MediaType.AUDIO]: Math.min(
-          audioMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
-          MAX_MEDIA_ELEMENT_COUNTS[MediaType.AUDIO]),
+        audioMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType.AUDIO]
+      ),
       [MediaType.VIDEO]: Math.min(
-          videoMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
-          MAX_MEDIA_ELEMENT_COUNTS[MediaType.VIDEO]),
+        videoMediaElementsCount + MINIMUM_AD_MEDIA_ELEMENTS,
+        MAX_MEDIA_ELEMENT_COUNTS[MediaType.VIDEO]
+      ),
     };
   }
 
@@ -2239,8 +2415,7 @@ export class AmpStory extends AMP.BaseElement {
       }
     };
 
-    this.mediaPool_.blessAll()
-        .then(unmuteAllMedia, unmuteAllMedia);
+    this.mediaPool_.blessAll().then(unmuteAllMedia, unmuteAllMedia);
   }
 
   /**
@@ -2262,14 +2437,20 @@ export class AmpStory extends AMP.BaseElement {
    */
   updateAudioIcon_() {
     const containsMediaElementWithAudio = !!this.element.querySelector(
-        'amp-audio, amp-video:not([noaudio]), [background-audio]');
-    const storyHasBackgroundAudio =
-        this.element.hasAttribute('background-audio');
+      'amp-audio, amp-video:not([noaudio]), [background-audio]'
+    );
+    const storyHasBackgroundAudio = this.element.hasAttribute(
+      'background-audio'
+    );
 
-    this.storeService_.dispatch(Action.TOGGLE_STORY_HAS_AUDIO,
-        containsMediaElementWithAudio || storyHasBackgroundAudio);
     this.storeService_.dispatch(
-        Action.TOGGLE_STORY_HAS_BACKGROUND_AUDIO, storyHasBackgroundAudio);
+      Action.TOGGLE_STORY_HAS_AUDIO,
+      containsMediaElementWithAudio || storyHasBackgroundAudio
+    );
+    this.storeService_.dispatch(
+      Action.TOGGLE_STORY_HAS_BACKGROUND_AUDIO,
+      storyHasBackgroundAudio
+    );
   }
 
   /**
@@ -2288,8 +2469,7 @@ export class AmpStory extends AMP.BaseElement {
     });
 
     this.initializeOpacityMask_();
-    this.storeService_.dispatch(Action.TOGGLE_HAS_SIDEBAR,
-        !!this.sidebar_);
+    this.storeService_.dispatch(Action.TOGGLE_HAS_SIDEBAR, !!this.sidebar_);
 
     const actions = [
       {tagOrTarget: 'AMP-SIDEBAR', method: 'open'},
@@ -2304,11 +2484,12 @@ export class AmpStory extends AMP.BaseElement {
    * @private
    */
   initializeStoryNavigationPath_() {
-    const historyNavigationPath =
-      getHistoryState(this.win, HistoryState.NAVIGATION_PATH);
+    const historyNavigationPath = getHistoryState(
+      this.win,
+      HistoryState.NAVIGATION_PATH
+    );
     if (historyNavigationPath) {
-      this.storyNavigationPath_ =
-        /** @type {!Array<string>} */ (historyNavigationPath);
+      this.storyNavigationPath_ = /** @type {!Array<string>} */ (historyNavigationPath);
     }
   }
 
@@ -2319,15 +2500,17 @@ export class AmpStory extends AMP.BaseElement {
     }
     this.storyNavigationPath_.length = 0;
     const switchPromise = this.switchTo_(
-        dev().assertElement(
-            this.pages_[0].element).id, NavigationDirection.NEXT);
+      dev().assertElement(this.pages_[0].element).id,
+      NavigationDirection.NEXT
+    );
 
     // Reset all pages so that they are offscreen to right instead of left in
     // desktop view.
-    switchPromise.then((() => {
+    switchPromise.then(() => {
       this.pages_.forEach(page =>
-        removeAttributeInMutate(page, Attributes.VISITED));
-    }));
+        removeAttributeInMutate(page, Attributes.VISITED)
+      );
+    });
   }
 
   /**
@@ -2339,8 +2522,10 @@ export class AmpStory extends AMP.BaseElement {
   upgradeCtaAnchorTagsForTracking_(page, pageIndex) {
     this.mutateElement(() => {
       const pageId = page.element.id;
-      const ctaAnchorEls =
-          scopedQuerySelectorAll(page.element, 'amp-story-cta-layer a');
+      const ctaAnchorEls = scopedQuerySelectorAll(
+        page.element,
+        'amp-story-cta-layer a'
+      );
 
       Array.prototype.forEach.call(ctaAnchorEls, ctaAnchorEl => {
         ctaAnchorEl.setAttribute('data-vars-story-page-id', pageId);
@@ -2379,8 +2564,10 @@ export class AmpStory extends AMP.BaseElement {
     const pageToBeInserted = this.getPageById(pageToBeInsertedId);
     const pageToBeInsertedEl = pageToBeInserted.element;
 
-    if (pageToBeInserted.isAd() &&
-        !this.storeService_.get(StateProperty.CAN_INSERT_AUTOMATIC_AD)) {
+    if (
+      pageToBeInserted.isAd() &&
+      !this.storeService_.get(StateProperty.CAN_INSERT_AUTOMATIC_AD)
+    ) {
       dev().expectedError(TAG, 'Inserting ads automatically is disallowed.');
       return false;
     }
@@ -2394,8 +2581,9 @@ export class AmpStory extends AMP.BaseElement {
       return false;
     }
 
-    const advanceAttr = isExperimentOn(this.win, 'amp-story-branching') ?
-      Attributes.PUBLIC_ADVANCE_TO : Attributes.ADVANCE_TO;
+    const advanceAttr = isExperimentOn(this.win, 'amp-story-branching')
+      ? Attributes.PUBLIC_ADVANCE_TO
+      : Attributes.ADVANCE_TO;
 
     pageBeforeEl.setAttribute(advanceAttr, pageToBeInsertedId);
     pageBeforeEl.setAttribute(Attributes.AUTO_ADVANCE_TO, pageToBeInsertedId);
@@ -2429,8 +2617,9 @@ export class AmpStory extends AMP.BaseElement {
    *     for amp-story.
    */
   static isBrowserSupported(win) {
-    return Boolean(win.CSS && win.CSS.supports &&
-    win.CSS.supports('display', 'grid'));
+    return Boolean(
+      win.CSS && win.CSS.supports && win.CSS.supports('display', 'grid')
+    );
   }
 }
 
diff --git a/extensions/amp-story/1.0/animation-presets-utils.js b/extensions/amp-story/1.0/animation-presets-utils.js
index fe533b205f04..332f39d1f492 100644
--- a/extensions/amp-story/1.0/animation-presets-utils.js
+++ b/extensions/amp-story/1.0/animation-presets-utils.js
@@ -19,15 +19,8 @@
  * presets.
  */
 
-import {
-  KeyframesDef,
-  StoryAnimationDimsDef,
-} from './animation-types';
-import {
-  rotate,
-  scale,
-  translate,
-} from '../../../src/style';
+import {KeyframesDef, StoryAnimationDimsDef} from './animation-types';
+import {rotate, scale, translate} from '../../../src/style';
 
 /**
  * Translates the element on the 2d plane according to the given points.
@@ -89,8 +82,10 @@ export function whooshIn(startX, startY, endX, endY) {
  * @visibleForTesting
  */
 export function targetFitsWithinPage(dimensions) {
-  return dimensions.targetWidth <= dimensions.pageWidth ||
-         dimensions.targetHeight <= dimensions.pageHeight;
+  return (
+    dimensions.targetWidth <= dimensions.pageWidth ||
+    dimensions.targetHeight <= dimensions.pageHeight
+  );
 }
 
 /**
@@ -102,10 +97,14 @@ export function targetFitsWithinPage(dimensions) {
 export function calculateTargetScalingFactor(dimensions) {
   if (targetFitsWithinPage(dimensions)) {
     const scalingFactor = 1.25;
-    const widthFactor = dimensions.pageWidth > dimensions.targetWidth ?
-      dimensions.pageWidth / dimensions.targetWidth : 1;
-    const heightFactor = dimensions.pageHeight > dimensions.targetHeight ?
-      dimensions.pageHeight / dimensions.targetHeight : 1;
+    const widthFactor =
+      dimensions.pageWidth > dimensions.targetWidth
+        ? dimensions.pageWidth / dimensions.targetWidth
+        : 1;
+    const heightFactor =
+      dimensions.pageHeight > dimensions.targetHeight
+        ? dimensions.pageHeight / dimensions.targetHeight
+        : 1;
     return Math.max(widthFactor, heightFactor) * scalingFactor;
   }
   return 1;
@@ -139,5 +138,7 @@ export function scaleAndTranslate(startX, startY, endX, endY, scalingFactor) {
     return translate2d(startX, startY, endX, endY);
   }
   return enlargeKeyFrames(
-      translate2d(startX, startY, endX, endY), scalingFactor);
+    translate2d(startX, startY, endX, endY),
+    scalingFactor
+  );
 }
diff --git a/extensions/amp-story/1.0/animation-presets.js b/extensions/amp-story/1.0/animation-presets.js
index 1f0af1adf23d..8e409c275229 100644
--- a/extensions/amp-story/1.0/animation-presets.js
+++ b/extensions/amp-story/1.0/animation-presets.js
@@ -54,7 +54,7 @@ const FULL_BLEED_ANIMATION_NAMES = [
  */
 const ANIMATION_CSS_CLASS_NAMES = {
   [FULL_BLEED_CATEGORY]:
-      'i-amphtml-story-grid-template-with-full-bleed-animation',
+    'i-amphtml-story-grid-template-with-full-bleed-animation',
 };
 
 /**
@@ -66,10 +66,14 @@ export function setStyleForPreset(el, presetName) {
   // For full bleed animations.
   if (FULL_BLEED_ANIMATION_NAMES.indexOf(presetName) >= 0) {
     const parent = el.parentElement;
-    if (parent.classList.contains(
-        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT])) {
-      parent.classList
-          .remove(GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]);
+    if (
+      parent.classList.contains(
+        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]
+      )
+    ) {
+      parent.classList.remove(
+        GRID_LAYER_TEMPLATE_CLASS_NAMES[FILL_TEMPLATE_LAYOUT]
+      );
     }
     parent.classList.add(ANIMATION_CSS_CLASS_NAMES[FULL_BLEED_CATEGORY]);
   }
@@ -178,8 +182,10 @@ export const getPresetDef = (name, options) => {
       return {
         duration: 1600,
         keyframes(dimensions) {
-          const maxBounceHeight =
-            Math.max(160, dimensions.targetY + dimensions.targetHeight);
+          const maxBounceHeight = Math.max(
+            160,
+            dimensions.targetY + dimensions.targetHeight
+          );
 
           return [
             {
@@ -262,8 +268,13 @@ export const getPresetDef = (name, options) => {
           const offsetX = dimensions.pageWidth - dimensions.targetWidth;
           const offsetY = (dimensions.pageHeight - dimensions.targetHeight) / 2;
 
-          return scaleAndTranslate(offsetX, offsetY, translateX ?
-            offsetX + translateX : 0, offsetY, scalingFactor);
+          return scaleAndTranslate(
+            offsetX,
+            offsetY,
+            translateX ? offsetX + translateX : 0,
+            offsetY,
+            scalingFactor
+          );
         },
       };
     case 'pan-right':
@@ -280,8 +291,13 @@ export const getPresetDef = (name, options) => {
           const offsetX = dimensions.pageWidth - dimensions.targetWidth;
           const offsetY = (dimensions.pageHeight - dimensions.targetHeight) / 2;
 
-          return scaleAndTranslate(0, offsetY, -translateX || offsetX, offsetY,
-              scalingFactor);
+          return scaleAndTranslate(
+            0,
+            offsetY,
+            -translateX || offsetX,
+            offsetY,
+            scalingFactor
+          );
         },
       };
     case 'pan-down':
@@ -298,8 +314,13 @@ export const getPresetDef = (name, options) => {
           const offsetX = -dimensions.targetWidth / 2;
           const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
-          return scaleAndTranslate(offsetX, 0, offsetX, -translateY || offsetY,
-              scalingFactor);
+          return scaleAndTranslate(
+            offsetX,
+            0,
+            offsetX,
+            -translateY || offsetY,
+            scalingFactor
+          );
         },
       };
     case 'pan-up':
@@ -316,16 +337,24 @@ export const getPresetDef = (name, options) => {
           const offsetX = -dimensions.targetWidth / 2;
           const offsetY = dimensions.pageHeight - dimensions.targetHeight;
 
-          return scaleAndTranslate(offsetX, offsetY, offsetX, translateY ?
-            offsetY + translateY : 0, scalingFactor);
+          return scaleAndTranslate(
+            offsetX,
+            offsetY,
+            offsetX,
+            translateY ? offsetY + translateY : 0,
+            scalingFactor
+          );
         },
       };
     case 'zoom-in':
       let {scaleStart, scaleEnd} = options;
 
       if (scaleStart) {
-        userAssert(scaleEnd > scaleStart, '"scale-end" value must be greater ' +
-        'than "scale-start" value when using "zoom-in" animation.');
+        userAssert(
+          scaleEnd > scaleStart,
+          '"scale-end" value must be greater ' +
+            'than "scale-start" value when using "zoom-in" animation.'
+        );
       }
 
       return {
@@ -341,8 +370,11 @@ export const getPresetDef = (name, options) => {
       scaleEnd = options.scaleEnd;
 
       if (scaleStart) {
-        userAssert(scaleStart > scaleEnd, '"scale-start" value must be ' +
-        'higher than "scale-end" value when using "zoom-out" animation.');
+        userAssert(
+          scaleStart > scaleEnd,
+          '"scale-start" value must be ' +
+            'higher than "scale-end" value when using "zoom-out" animation.'
+        );
       }
 
       return {
diff --git a/extensions/amp-story/1.0/animation-types.js b/extensions/amp-story/1.0/animation-types.js
index 10fa6f51219b..1fde42d6c979 100644
--- a/extensions/amp-story/1.0/animation-types.js
+++ b/extensions/amp-story/1.0/animation-types.js
@@ -17,11 +17,9 @@
 /** @typedef {!Array<!Object<string, *>>} */
 export let KeyframesDef;
 
-
 /** @typedef {(function(StoryAnimationDimsDef):!KeyframesDef)|!KeyframesDef} */
 export let KeyframesOrFilterFnDef;
 
-
 /**
  * @typedef {{
  *   pageWidth: number,
@@ -34,7 +32,6 @@ export let KeyframesOrFilterFnDef;
  */
 export let StoryAnimationDimsDef;
 
-
 /**
  * @typedef {{
  *   duration: number,
@@ -44,7 +41,6 @@ export let StoryAnimationDimsDef;
  */
 export let StoryAnimationPresetDef;
 
-
 /**
  * @typedef {{
  *  target: !Element,
diff --git a/extensions/amp-story/1.0/animation.js b/extensions/amp-story/1.0/animation.js
index fd2e49f41838..42cda99204b4 100644
--- a/extensions/amp-story/1.0/animation.js
+++ b/extensions/amp-story/1.0/animation.js
@@ -23,18 +23,13 @@ import {
   StoryAnimationPresetDef,
 } from './animation-types';
 import {Services} from '../../../src/services';
-import {
-  WebAnimationPlayState,
-} from '../../amp-animation/0.1/web-animation-types';
+import {WebAnimationPlayState} from '../../amp-animation/0.1/web-animation-types';
 import {assertDoesNotContainDisplay, setStyles} from '../../../src/style';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {escapeCssSelectorIdent} from '../../../src/css';
 import {getPresetDef, setStyleForPreset} from './animation-presets';
 import {map, omit} from '../../../src/utils/object';
-import {
-  scopedQuerySelector,
-  scopedQuerySelectorAll,
-} from '../../../src/dom';
+import {scopedQuerySelector, scopedQuerySelectorAll} from '../../../src/dom';
 import {timeStrToMillis, unscaledClientRect} from './utils';
 
 /** const {string} */
@@ -69,14 +64,12 @@ export function hasAnimations(element) {
   return !!scopedQuerySelector(element, ANIMATABLE_ELEMENTS_SELECTOR);
 }
 
-
 /** @enum {number} */
 const PlaybackActivity = {
   START: 0,
   FINISH: 1,
 };
 
-
 /** Wraps WebAnimationRunner for story page elements. */
 class AnimationRunner {
   /**
@@ -90,7 +83,13 @@ class AnimationRunner {
    * @param {!AnimationSequence} sequence
    */
   constructor(
-    page, animationDef, webAnimationBuilderPromise, vsync, timer, sequence) {
+    page,
+    animationDef,
+    webAnimationBuilderPromise,
+    vsync,
+    timer,
+    sequence
+  ) {
     /** @private @const */
     this.page_ = page;
 
@@ -122,8 +121,8 @@ class AnimationRunner {
     this.duration_ = animationDef.duration || this.presetDef_.duration || 0;
 
     /** @private @const */
-    this.easing_ = animationDef.easing || this.presetDef_.easing ||
-        DEFAULT_EASING;
+    this.easing_ =
+      animationDef.easing || this.presetDef_.easing || DEFAULT_EASING;
 
     /**
      * @private @const {!Promise<
@@ -131,11 +130,14 @@ class AnimationRunner {
      */
     this.runnerPromise_ = this.getWebAnimationDef_().then(webAnimDef =>
       webAnimationBuilderPromise.then(builder =>
-        builder.createRunner(webAnimDef)));
+        builder.createRunner(webAnimDef)
+      )
+    );
 
     /** @private @const {!Promise<!Object<string, *>>} */
-    this.firstFrameProps_ =
-        this.keyframes_.then(keyframes => omit(keyframes[0], ['offset']));
+    this.firstFrameProps_ = this.keyframes_.then(keyframes =>
+      omit(keyframes[0], ['offset'])
+    );
 
     /** @private {?../../amp-animation/0.1/runners/animation-runner.AnimationRunner} */
     this.runner_ = null;
@@ -146,13 +148,17 @@ class AnimationRunner {
     /** @private {?Promise} */
     this.scheduledWait_ = null;
 
-    this.keyframes_.then(keyframes => devAssert(
+    this.keyframes_.then(keyframes =>
+      devAssert(
         !keyframes[0].offset,
-        'First keyframe offset for animation preset should be 0 or undefined'));
+        'First keyframe offset for animation preset should be 0 or undefined'
+      )
+    );
 
     userAssert(
-        this.delay_ >= 0,
-        'Negative delays are not allowed in amp-story entrance animations.');
+      this.delay_ >= 0,
+      'Negative delays are not allowed in amp-story entrance animations.'
+    );
 
     this.runnerPromise_.then(runner => this.onRunnerReady_(runner));
   }
@@ -217,7 +223,8 @@ class AnimationRunner {
     return this.firstFrameProps_.then(firstFrameProps =>
       this.vsync_.mutatePromise(() => {
         setStyles(this.target_, assertDoesNotContainDisplay(firstFrameProps));
-      }));
+      })
+    );
   }
 
   /** Starts or resumes the animation. */
@@ -237,8 +244,8 @@ class AnimationRunner {
     let promise = Promise.resolve();
 
     if (this.animationDef_.startAfterId) {
-      const startAfterId = /** @type {string} */(
-        this.animationDef_.startAfterId);
+      const startAfterId = /** @type {string} */ (this.animationDef_
+        .startAfterId);
       promise = promise.then(() => this.sequence_.waitFor(startAfterId));
     }
 
@@ -259,9 +266,11 @@ class AnimationRunner {
 
   /** @return {boolean} */
   hasStarted() {
-    return this.isActivityScheduled_(PlaybackActivity.START) ||
-        (!!this.runner_ && devAssert(this.runner_)
-            .getPlayState() == WebAnimationPlayState.RUNNING);
+    return (
+      this.isActivityScheduled_(PlaybackActivity.START) ||
+      (!!this.runner_ &&
+        devAssert(this.runner_).getPlayState() == WebAnimationPlayState.RUNNING)
+    );
   }
 
   /** Force-finishes all animations. */
@@ -330,12 +339,13 @@ class AnimationRunner {
    */
   playbackWhenReady_(activity, wait) {
     const runner =
-        /**
-         * @type {!../../amp-animation/0.1/runners/animation-runner.AnimationRunner}
-         */
-        (devAssert(
-            this.runner_,
-            'Tried to execute playbackWhenReady_ before runner was resolved.'));
+      /**
+       * @type {!../../amp-animation/0.1/runners/animation-runner.AnimationRunner}
+       */
+      (devAssert(
+        this.runner_,
+        'Tried to execute playbackWhenReady_ before runner was resolved.'
+      ));
 
     (wait || Promise.resolve()).then(() => {
       if (!this.isActivityScheduled_(activity)) {
@@ -346,8 +356,10 @@ class AnimationRunner {
       this.scheduledWait_ = null;
 
       switch (activity) {
-        case PlaybackActivity.START: return this.startWhenReady_(runner);
-        case PlaybackActivity.FINISH: return this.finishWhenReady_(runner);
+        case PlaybackActivity.START:
+          return this.startWhenReady_(runner);
+        case PlaybackActivity.FINISH:
+          return this.finishWhenReady_(runner);
       }
     });
   }
@@ -371,8 +383,9 @@ class AnimationRunner {
     }
 
     this.playbackWhenReady_(
-        /** @type {!PlaybackActivity} */ (this.scheduledActivity_),
-        this.scheduledWait_);
+      /** @type {!PlaybackActivity} */ (this.scheduledActivity_),
+      this.scheduledWait_
+    );
   }
 
   /**
@@ -395,7 +408,6 @@ class AnimationRunner {
   }
 }
 
-
 // TODO(alanorozco): Looping animations
 /** Manager for animations in story pages. */
 export class AnimationManager {
@@ -445,7 +457,8 @@ export class AnimationManager {
    */
   applyFirstFrame() {
     return Promise.all(
-        this.getOrCreateRunners_().map(runner => runner.applyFirstFrame()));
+      this.getOrCreateRunners_().map(runner => runner.applyFirstFrame())
+    );
   }
 
   /** Starts all entrance animations for the page. */
@@ -500,8 +513,9 @@ export class AnimationManager {
   getOrCreateRunners_() {
     if (!this.runners_) {
       this.runners_ = Array.prototype.map.call(
-          scopedQuerySelectorAll(this.root_, ANIMATABLE_ELEMENTS_SELECTOR),
-          el => this.createRunner_(el));
+        scopedQuerySelectorAll(this.root_, ANIMATABLE_ELEMENTS_SELECTOR),
+        el => this.createRunner_(el)
+      );
     }
     return devAssert(this.runners_);
   }
@@ -515,12 +529,13 @@ export class AnimationManager {
     const animationDef = this.createAnimationDef(el, preset);
 
     return new AnimationRunner(
-        this.root_,
-        animationDef,
-        devAssert(this.builderPromise_),
-        this.vsync_,
-        this.timer_,
-        this.sequence_);
+      this.root_,
+      animationDef,
+      devAssert(this.builderPromise_),
+      this.vsync_,
+      this.timer_,
+      this.sequence_
+    );
   }
 
   /**
@@ -532,32 +547,37 @@ export class AnimationManager {
     const animationDef = {target: el, preset};
 
     if (el.hasAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME)) {
-      animationDef.duration =
-          timeStrToMillis(el.getAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME));
+      animationDef.duration = timeStrToMillis(
+        el.getAttribute(ANIMATE_IN_DURATION_ATTRIBUTE_NAME)
+      );
     }
 
     if (el.hasAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME)) {
-      animationDef.delay =
-          timeStrToMillis(el.getAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME));
+      animationDef.delay = timeStrToMillis(
+        el.getAttribute(ANIMATE_IN_DELAY_ATTRIBUTE_NAME)
+      );
     }
 
     if (el.hasAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME)) {
       const dependencyId = el.getAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME);
 
       user().assertElement(
-          this.root_.querySelector(`#${escapeCssSelectorIdent(dependencyId)}`),
-          `The attribute '${ANIMATE_IN_AFTER_ATTRIBUTE_NAME}' in tag ` +
-              `'${el.tagName}' is set to the invalid value ` +
-              `'${dependencyId}'. No children of parenting 'amp-story-page' ` +
-              `exist with id ${dependencyId}.`);
-
-      animationDef.startAfterId =
-          el.getAttribute(ANIMATE_IN_AFTER_ATTRIBUTE_NAME);
+        this.root_.querySelector(`#${escapeCssSelectorIdent(dependencyId)}`),
+        `The attribute '${ANIMATE_IN_AFTER_ATTRIBUTE_NAME}' in tag ` +
+          `'${el.tagName}' is set to the invalid value ` +
+          `'${dependencyId}'. No children of parenting 'amp-story-page' ` +
+          `exist with id ${dependencyId}.`
+      );
+
+      animationDef.startAfterId = el.getAttribute(
+        ANIMATE_IN_AFTER_ATTRIBUTE_NAME
+      );
     }
 
     if (el.hasAttribute(ANIMATE_IN_TIMING_FUNCTION_ATTRIBUTE_NAME)) {
-      animationDef.easing =
-          el.getAttribute(ANIMATE_IN_TIMING_FUNCTION_ATTRIBUTE_NAME);
+      animationDef.easing = el.getAttribute(
+        ANIMATE_IN_TIMING_FUNCTION_ATTRIBUTE_NAME
+      );
     }
 
     return animationDef;
@@ -569,9 +589,9 @@ export class AnimationManager {
    */
   createAnimationBuilderPromise_() {
     return Services.extensionsFor(this.ampdoc_.win)
-        .installExtensionForDoc(this.ampdoc_, 'amp-animation')
-        .then(() => Services.webAnimationServiceFor(this.root_))
-        .then(webAnimationService => webAnimationService.createBuilder());
+      .installExtensionForDoc(this.ampdoc_, 'amp-animation')
+      .then(() => Services.webAnimationServiceFor(this.root_))
+      .then(webAnimationService => webAnimationService.createBuilder());
   }
 
   /**
@@ -584,55 +604,69 @@ export class AnimationManager {
     setStyleForPreset(el, name);
 
     if (el.hasAttribute(SCALE_START_ATTRIBUTE_NAME)) {
-      options.scaleStart =
-        parseFloat(el.getAttribute(SCALE_START_ATTRIBUTE_NAME));
-
-      userAssert(options.scaleStart > 0, '"%s" attribute must be a ' +
-        'positive number. Found negative or zero in element %s',
-      SCALE_START_ATTRIBUTE_NAME,
-      el);
+      options.scaleStart = parseFloat(
+        el.getAttribute(SCALE_START_ATTRIBUTE_NAME)
+      );
+
+      userAssert(
+        options.scaleStart > 0,
+        '"%s" attribute must be a ' +
+          'positive number. Found negative or zero in element %s',
+        SCALE_START_ATTRIBUTE_NAME,
+        el
+      );
     }
 
     if (el.hasAttribute(SCALE_END_ATTRIBUTE_NAME)) {
-      options.scaleEnd =
-        parseFloat(el.getAttribute(SCALE_END_ATTRIBUTE_NAME));
-
-      userAssert(options.scaleEnd > 0, '"%s" attribute must be a ' +
-        'positive number. Found negative or zero in element %s',
-      SCALE_END_ATTRIBUTE_NAME,
-      el);
+      options.scaleEnd = parseFloat(el.getAttribute(SCALE_END_ATTRIBUTE_NAME));
+
+      userAssert(
+        options.scaleEnd > 0,
+        '"%s" attribute must be a ' +
+          'positive number. Found negative or zero in element %s',
+        SCALE_END_ATTRIBUTE_NAME,
+        el
+      );
     }
 
     if (el.hasAttribute(TRANSLATE_X_ATTRIBUTE_NAME)) {
-      options.translateX =
-        parseFloat(el.getAttribute(TRANSLATE_X_ATTRIBUTE_NAME));
-
-      userAssert(options.translateX > 0, '"%s" attribute must be a ' +
-        'positive number. Found negative or zero in element %s',
-      TRANSLATE_X_ATTRIBUTE_NAME,
-      el);
+      options.translateX = parseFloat(
+        el.getAttribute(TRANSLATE_X_ATTRIBUTE_NAME)
+      );
+
+      userAssert(
+        options.translateX > 0,
+        '"%s" attribute must be a ' +
+          'positive number. Found negative or zero in element %s',
+        TRANSLATE_X_ATTRIBUTE_NAME,
+        el
+      );
     }
 
     if (el.hasAttribute(TRANSLATE_Y_ATTRIBUTE_NAME)) {
-      options.translateY =
-        parseFloat(el.getAttribute(TRANSLATE_Y_ATTRIBUTE_NAME));
-
-      userAssert(options.translateY > 0, '"%s" attribute must be a ' +
-        'positive number. Found negative or zero in element %s',
-      TRANSLATE_Y_ATTRIBUTE_NAME,
-      el);
+      options.translateY = parseFloat(
+        el.getAttribute(TRANSLATE_Y_ATTRIBUTE_NAME)
+      );
+
+      userAssert(
+        options.translateY > 0,
+        '"%s" attribute must be a ' +
+          'positive number. Found negative or zero in element %s',
+        TRANSLATE_Y_ATTRIBUTE_NAME,
+        el
+      );
     }
 
     return /** @type {StoryAnimationPresetDef} */ (userAssert(
-        getPresetDef(name, options),
-        'Invalid %s preset "%s" for element %s',
-        ANIMATE_IN_ATTRIBUTE_NAME,
-        name,
-        el));
+      getPresetDef(name, options),
+      'Invalid %s preset "%s" for element %s',
+      ANIMATE_IN_ATTRIBUTE_NAME,
+      name,
+      el
+    ));
   }
 }
 
-
 /** Bus for animation sequencing. */
 class AnimationSequence {
   /**
diff --git a/extensions/amp-story/1.0/audio.js b/extensions/amp-story/1.0/audio.js
index 3fc37edfb4cb..2e773d6bc00f 100644
--- a/extensions/amp-story/1.0/audio.js
+++ b/extensions/amp-story/1.0/audio.js
@@ -21,7 +21,6 @@ import {Services} from '../../../src/services';
  */
 const BACKGROUND_AUDIO_ELEMENT_CLASS_NAME = 'i-amphtml-story-background-audio';
 
-
 /**
  * Adds support for the background-audio property on the specified element.
  * @param {!Element} element The element to upgrade with support for background
@@ -33,9 +32,10 @@ export function upgradeBackgroundAudio(element) {
     return null;
   }
   const audioEl = element.ownerDocument.createElement('audio');
-  const audioSrc =
-      Services.urlForDoc(element).assertHttpsUrl(
-          element.getAttribute('background-audio'), element);
+  const audioSrc = Services.urlForDoc(element).assertHttpsUrl(
+    element.getAttribute('background-audio'),
+    element
+  );
   audioEl.setAttribute('src', audioSrc);
   audioEl.setAttribute('preload', 'auto');
   audioEl.setAttribute('loop', '');
diff --git a/extensions/amp-story/1.0/background.js b/extensions/amp-story/1.0/background.js
index d33b135ec679..66ca93a3e13b 100644
--- a/extensions/amp-story/1.0/background.js
+++ b/extensions/amp-story/1.0/background.js
@@ -18,19 +18,15 @@ import {Services} from '../../../src/services';
 import {listenOncePromise} from '../../../src/event-helper';
 import {setStyle} from '../../../src/style';
 
-
 /** @const {number} */
 const SWAP_TIMEOUT_MS = 500;
 
-
 const BACKGROUND_CLASS = 'i-amphtml-story-background';
 
 const BACKGROUND_CONTAINER_CLASS = 'i-amphtml-story-background-container';
 
 const BACKGROUND_OVERLAY_CLASS = 'i-amphtml-story-background-overlay';
 
-
-
 /**
  * @param {?string} url
  * @return {!Promise}
@@ -39,12 +35,11 @@ function maybeLoadImage(url) {
   if (!url) {
     return Promise.resolve();
   }
-  const img = new Image;
+  const img = new Image();
   img.src = url;
   return listenOncePromise(img, 'load');
 }
 
-
 /**
  * TODO(cvializ): Investigate pre-rendering blurred backgrounds to canvas to
  * possibly improve performance?
@@ -109,15 +104,17 @@ export class AmpStoryBackground {
   setBackground(color, url, initial = false) {
     const countAtAdd = ++this.count_;
 
-    const whenFresh = (promise, callback) => promise.then(() => {
-      if (this.count_ == countAtAdd) {
-        callback();
-      }
-    });
+    const whenFresh = (promise, callback) =>
+      promise.then(() => {
+        if (this.count_ == countAtAdd) {
+          callback();
+        }
+      });
 
     const imgLoad = maybeLoadImage(url);
-    const timeout =
-        Services.timerFor(this.win_).promise(initial ? 0 : SWAP_TIMEOUT_MS);
+    const timeout = Services.timerFor(this.win_).promise(
+      initial ? 0 : SWAP_TIMEOUT_MS
+    );
 
     const hidden = this.hidden_;
 
diff --git a/extensions/amp-story/1.0/bookend/amp-story-bookend.js b/extensions/amp-story/1.0/bookend/amp-story-bookend.js
index a46673e6f686..58230a3f102d 100644
--- a/extensions/amp-story/1.0/bookend/amp-story-bookend.js
+++ b/extensions/amp-story/1.0/bookend/amp-story-bookend.js
@@ -43,7 +43,6 @@ import {isArray} from '../../../../src/types';
 import {renderAsElement} from '../simple-template';
 import {toggle} from '../../../../src/style';
 
-
 /** @private @const {string} */
 const HIDDEN_CLASSNAME = 'i-amphtml-hidden';
 
@@ -71,8 +70,8 @@ const buildRootTemplate = hidden => {
   return /** @type {!../simple-template.ElementDef} */ ({
     tag: 'section',
     attrs: dict({
-      'class': 'i-amphtml-story-bookend i-amphtml-story-system-reset ' +
-          hidden}),
+      'class': 'i-amphtml-story-bookend i-amphtml-story-system-reset ' + hidden,
+    }),
     children: [
       // Overflow container that gets pushed to the bottom when content height
       // is smaller than viewport.
@@ -109,8 +108,10 @@ const TAG = 'amp-story-bookend';
 const buildReplayButtonTemplate = (title, domainName, imageUrl = undefined) => {
   return /** @type {!../simple-template.ElementDef} */ ({
     tag: 'div',
-    attrs: dict({'class': 'i-amphtml-story-bookend-replay ' +
-      'i-amphtml-story-bookend-top-level'}),
+    attrs: dict({
+      'class':
+        'i-amphtml-story-bookend-replay i-amphtml-story-bookend-top-level',
+    }),
     children: [
       {
         tag: 'div',
@@ -128,14 +129,16 @@ const buildReplayButtonTemplate = (title, domainName, imageUrl = undefined) => {
           },
         ],
       },
-      !imageUrl ? REPLAY_ICON_TEMPLATE : {
-        tag: 'div',
-        attrs: dict({
-          'class': 'i-amphtml-story-bookend-replay-image',
-          'style': `background-image: url(${imageUrl}) !important`,
-        }),
-        children: [REPLAY_ICON_TEMPLATE],
-      },
+      !imageUrl
+        ? REPLAY_ICON_TEMPLATE
+        : {
+            tag: 'div',
+            attrs: dict({
+              'class': 'i-amphtml-story-bookend-replay-image',
+              'style': `background-image: url(${imageUrl}) !important`,
+            }),
+            children: [REPLAY_ICON_TEMPLATE],
+          },
     ],
   });
 };
@@ -147,33 +150,39 @@ const buildReplayButtonTemplate = (title, domainName, imageUrl = undefined) => {
 const buildPromptConsentTemplate = consentId => {
   return /** @type {!../simple-template.ElementDef} */ ({
     tag: 'div',
-    attrs: dict({'class': 'i-amphtml-story-bookend-consent ' +
-        'i-amphtml-story-bookend-top-level'}),
+    attrs: dict({
+      'class':
+        'i-amphtml-story-bookend-consent ' +
+        'i-amphtml-story-bookend-top-level',
+    }),
     children: [
       {
         tag: 'h3',
-        attrs: dict({'class': 'i-amphtml-story-bookend-heading ' +
-          ' i-amphtml-story-bookend-component'}),
+        attrs: dict({
+          'class':
+            'i-amphtml-story-bookend-heading ' +
+            ' i-amphtml-story-bookend-component',
+        }),
         localizedStringId:
-            LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE,
+          LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_TITLE,
       },
       {
         tag: 'h2',
         attrs: dict({
-          'class': 'i-amphtml-story-bookend-consent-button ' +
+          'class':
+            'i-amphtml-story-bookend-consent-button ' +
             'i-amphtml-story-bookend-component',
           'on': `tap:${consentId}.prompt`,
           'role': 'button',
           'aria-label': 'Change data privacy settings',
         }),
         localizedStringId:
-            LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL,
+          LocalizedStringId.AMP_STORY_BOOKEND_PRIVACY_SETTINGS_BUTTON_LABEL,
       },
     ],
   });
 };
 
-
 /**
  * Bookend component for <amp-story>.
  * This component has to be built and preloaded before it can be displayed,
@@ -225,29 +234,33 @@ export class AmpStoryBookend extends AMP.BaseElement {
 
     this.isBuilt_ = true;
 
-    this.bookendEl_ =
-        renderAsElement(this.win.document, buildRootTemplate(skipAnimation ?
-          '' : HIDDEN_CLASSNAME));
+    this.bookendEl_ = renderAsElement(
+      this.win.document,
+      buildRootTemplate(skipAnimation ? '' : HIDDEN_CLASSNAME)
+    );
 
     createShadowRootWithStyle(this.element, this.bookendEl_, CSS);
 
     this.replayButton_ = this.buildReplayButton_();
 
-    this.shareWidget_ =
-        ScrollableShareWidget.create(
-            this.win, dev().assertElement(this.element.parentElement));
+    this.shareWidget_ = ScrollableShareWidget.create(
+      this.win,
+      dev().assertElement(this.element.parentElement)
+    );
 
     const innerContainer = this.getInnerContainer_();
     innerContainer.appendChild(this.replayButton_);
     innerContainer.appendChild(
-        this.shareWidget_.build(getAmpdoc(this.win.document)));
+      this.shareWidget_.build(getAmpdoc(this.win.document))
+    );
 
     const consentId = this.storeService_.get(StateProperty.CONSENT_ID);
 
     if (consentId) {
-      const promptConsentEl =
-          renderAsElement(
-              this.win.document, buildPromptConsentTemplate(String(consentId)));
+      const promptConsentEl = renderAsElement(
+        this.win.document,
+        buildPromptConsentTemplate(String(consentId))
+      );
       innerContainer.appendChild(promptConsentEl);
     }
 
@@ -262,10 +275,12 @@ export class AmpStoryBookend extends AMP.BaseElement {
    * @private
    */
   initializeListeners_() {
-    this.getShadowRoot()
-        .addEventListener('click', event => this.onClick_(event));
-    this.replayButton_
-        .addEventListener('click', event => this.onReplayButtonClick_(event));
+    this.getShadowRoot().addEventListener('click', event =>
+      this.onClick_(event)
+    );
+    this.replayButton_.addEventListener('click', event =>
+      this.onReplayButtonClick_(event)
+    );
 
     this.win.addEventListener('keyup', event => {
       if (!this.isActive_()) {
@@ -281,17 +296,29 @@ export class AmpStoryBookend extends AMP.BaseElement {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.CAN_SHOW_SHARING_UIS, show => {
-      this.onCanShowSharingUisUpdate_(show);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.CAN_SHOW_SHARING_UIS,
+      show => {
+        this.onCanShowSharingUisUpdate_(show);
+      },
+      true /** callToInitialize */
+    );
 
-    this.storeService_.subscribe(StateProperty.UI_STATE, uiState => {
-      this.onUIStateUpdate_(uiState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.UI_STATE,
+      uiState => {
+        this.onUIStateUpdate_(uiState);
+      },
+      true /** callToInitialize */
+    );
 
-    this.storeService_.subscribe(StateProperty.RTL_STATE, rtlState => {
-      this.onRtlStateUpdate_(rtlState);
-    }, true /** callToInitialize */);
+    this.storeService_.subscribe(
+      StateProperty.RTL_STATE,
+      rtlState => {
+        this.onRtlStateUpdate_(rtlState);
+      },
+      true /** callToInitialize */
+    );
   }
 
   /**
@@ -309,8 +336,13 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   onReplayButtonClick_(event) {
     event.stopPropagation();
-    dispatch(this.win, this.element, EventType.REPLAY,
-    /* payload */ undefined, {bubbles: true});
+    dispatch(
+      this.win,
+      this.element,
+      EventType.REPLAY,
+      /* payload */ undefined,
+      {bubbles: true}
+    );
   }
 
   /**
@@ -330,8 +362,10 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   onCanShowSharingUisUpdate_(canShowSharingUis) {
     this.mutateElement(() => {
-      this.getShadowRoot()
-          .classList.toggle('i-amphtml-story-no-sharing', !canShowSharingUis);
+      this.getShadowRoot().classList.toggle(
+        'i-amphtml-story-no-sharing',
+        !canShowSharingUis
+      );
     });
   }
 
@@ -342,9 +376,9 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   onUIStateUpdate_(uiState) {
     this.mutateElement(() => {
-      [UIType.DESKTOP_FULLBLEED, UIType.DESKTOP_PANELS].includes(uiState) ?
-        this.getShadowRoot().setAttribute('desktop', '') :
-        this.getShadowRoot().removeAttribute('desktop');
+      [UIType.DESKTOP_FULLBLEED, UIType.DESKTOP_PANELS].includes(uiState)
+        ? this.getShadowRoot().setAttribute('desktop', '')
+        : this.getShadowRoot().removeAttribute('desktop');
     });
   }
 
@@ -355,9 +389,9 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   onRtlStateUpdate_(rtlState) {
     this.mutateElement(() => {
-      rtlState ?
-        this.getShadowRoot().setAttribute('dir', 'rtl') :
-        this.getShadowRoot().removeAttribute('dir');
+      rtlState
+        ? this.getShadowRoot().setAttribute('dir', 'rtl')
+        : this.getShadowRoot().removeAttribute('dir');
     });
   }
 
@@ -369,13 +403,19 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   readBookendVersion_(config) {
     if (config[DEPRECATED_BOOKEND_VERSION_KEY]) {
-      user().warn('AMP-STORY-BOOKEND', '`bookend-version` and ' +
-      '`share-providers` keys in the bookend config are deprecated, please ' +
-      '`bookendVersion` and `shareProviders` keys');
+      user().warn(
+        'AMP-STORY-BOOKEND',
+        '`bookend-version` and ' +
+          '`share-providers` keys in the bookend config are deprecated, please ' +
+          '`bookendVersion` and `shareProviders` keys'
+      );
     }
 
-    return config[DEPRECATED_BOOKEND_VERSION_KEY] ||
-      config[BOOKEND_VERSION_KEY] || null;
+    return (
+      config[DEPRECATED_BOOKEND_VERSION_KEY] ||
+      config[BOOKEND_VERSION_KEY] ||
+      null
+    );
   }
 
   /**
@@ -387,33 +427,43 @@ export class AmpStoryBookend extends AMP.BaseElement {
       return Promise.resolve(this.config_);
     }
 
-    const requestService =
-        getRequestService(
-            this.win, dev().assertElement(this.element.parentElement));
+    const requestService = getRequestService(
+      this.win,
+      dev().assertElement(this.element.parentElement)
+    );
 
-    return requestService.loadBookendConfig().then(response => {
-      if (!response) {
+    return requestService
+      .loadBookendConfig()
+      .then(response => {
+        if (!response) {
+          return null;
+        }
+        if (this.readBookendVersion_(response) === BOOKEND_VERSION_1) {
+          const components = BookendComponent.buildFromJson(
+            response['components'],
+            this.element
+          );
+
+          this.config_ = /** @type {./bookend-component.BookendDataDef} */ ({
+            [BOOKEND_VERSION_KEY]: BOOKEND_VERSION_1,
+            'components': components,
+            'shareProviders':
+              response[SHARE_PROVIDERS_KEY] ||
+              response[DEPRECATED_SHARE_PROVIDERS_KEY],
+          });
+        } else {
+          dev().warn(
+            TAG,
+            `Version ${BOOKEND_VERSION_0} of the amp-story` +
+              `-bookend is deprecated. Use ${BOOKEND_VERSION_1} instead.`
+          );
+        }
+        return this.config_;
+      })
+      .catch(e => {
+        user().error(TAG, 'Error fetching bookend configuration', e.message);
         return null;
-      }
-      if (this.readBookendVersion_(response) === BOOKEND_VERSION_1) {
-        const components = BookendComponent.buildFromJson(
-            response['components'], this.element);
-
-        this.config_ = /** @type {./bookend-component.BookendDataDef} */ ({
-          [BOOKEND_VERSION_KEY]: BOOKEND_VERSION_1,
-          'components': components,
-          'shareProviders': response[SHARE_PROVIDERS_KEY] ||
-            response[DEPRECATED_SHARE_PROVIDERS_KEY],
-        });
-      } else {
-        dev().warn(TAG, `Version ${BOOKEND_VERSION_0} of the amp-story` +
-        `-bookend is deprecated. Use ${BOOKEND_VERSION_1} instead.`);
-      }
-      return this.config_;
-    }).catch(e => {
-      user().error(TAG, 'Error fetching bookend configuration', e.message);
-      return null;
-    });
+      });
   }
 
   /**
@@ -519,19 +569,25 @@ export class AmpStoryBookend extends AMP.BaseElement {
   renderComponents_(components) {
     dev().assertElement(this.bookendEl_, 'Error rendering amp-story-bookend.');
 
-    return Services
-        .localizationServiceForOrNull(this.win).then(localizationService => {
-          const bookendEls = BookendComponent
-              .buildElements(
-                  components, this.win.document, localizationService);
-          const container = dev().assertElement(
-              BookendComponent.buildContainer(this.getInnerContainer_(),
-                  this.win.document));
-          this.mutateElement(() => container.appendChild(bookendEls));
-        }).catch(e => {
-          user().error(TAG, 'Unable to fetch localization service.', e.message);
-          return null;
-        });
+    return Services.localizationServiceForOrNull(this.win)
+      .then(localizationService => {
+        const bookendEls = BookendComponent.buildElements(
+          components,
+          this.win.document,
+          localizationService
+        );
+        const container = dev().assertElement(
+          BookendComponent.buildContainer(
+            this.getInnerContainer_(),
+            this.win.document
+          )
+        );
+        this.mutateElement(() => container.appendChild(bookendEls));
+      })
+      .catch(e => {
+        user().error(TAG, 'Unable to fetch localization service.', e.message);
+        return null;
+      });
   }
 
   /** @return {!Element} */
@@ -574,18 +630,21 @@ export class AmpStoryBookend extends AMP.BaseElement {
     const {hostname: domainName} = urlService.parse(canonicalUrl);
 
     const title =
-      jsonLd && jsonLd['headline'] ?
-        jsonLd['headline'] :
-        user().assertElement(
+      jsonLd && jsonLd['headline']
+        ? jsonLd['headline']
+        : user().assertElement(
             this.win.document.head.querySelector('title'),
-            'Please set <title> or structured data (JSON-LD).').textContent;
+            'Please set <title> or structured data (JSON-LD).'
+          ).textContent;
 
     const metadata = {domainName, title};
     const image = jsonLd && isArray(jsonLd['image']) ? jsonLd['image'] : null;
 
     if (image != null && image.length >= 0) {
-      userAssert(urlService.isProtocolValid(image[0]),
-          `Unsupported protocol for story image URL ${image[0]}`);
+      userAssert(
+        urlService.isProtocolValid(image[0]),
+        `Unsupported protocol for story image URL ${image[0]}`
+      );
       metadata.imageUrl = image[0];
     }
 
@@ -598,9 +657,13 @@ export class AmpStoryBookend extends AMP.BaseElement {
    */
   buildReplayButton_() {
     const metadata = this.getStoryMetadata_();
-    return renderAsElement(this.win.document, buildReplayButtonTemplate(
+    return renderAsElement(
+      this.win.document,
+      buildReplayButtonTemplate(
         metadata.title,
         metadata.domainName,
-        metadata.imageUrl));
+        metadata.imageUrl
+      )
+    );
   }
 }
diff --git a/extensions/amp-story/1.0/bookend/bookend-component.js b/extensions/amp-story/1.0/bookend/bookend-component.js
index bda4a49267bc..3a598c5488d8 100644
--- a/extensions/amp-story/1.0/bookend/bookend-component.js
+++ b/extensions/amp-story/1.0/bookend/bookend-component.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {ArticleComponent} from './components/article';
 import {CtaLinkComponent} from './components/cta-link';
 import {HeadingComponent} from './components/heading';
@@ -49,7 +48,6 @@ export let BookendDataDef;
  */
 export let BookendComponentDef;
 
-
 /**
  * @typedef {
  *   (!ArticleComponent|
@@ -62,11 +60,9 @@ export let BookendComponentDef;
  */
 export let BookendComponentClass;
 
-
 /** @private @const {!Object<string, !BookendComponentClass>} */
 const builderInstances = {};
 
-
 /**
  * @param {string} type
  * @param {function(new:BookendComponentClass)} ctor
@@ -77,7 +73,6 @@ function setBuilderInstance(type, ctor) {
   return (builderInstances[type] = builderInstances[type] || new ctor());
 }
 
-
 /**
  * Dispatches the components to their specific builder classes.
  * @param {string} type
@@ -115,9 +110,9 @@ function prependTitle(components, localizationService) {
     return components;
   }
 
-  const title = localizationService
-      .getLocalizedString(
-          LocalizedStringId.AMP_STORY_BOOKEND_MORE_TO_READ_LABEL);
+  const title = localizationService.getLocalizedString(
+    LocalizedStringId.AMP_STORY_BOOKEND_MORE_TO_READ_LABEL
+  );
   components.unshift({'type': 'heading', 'text': title});
   return components;
 }
@@ -138,8 +133,12 @@ export class BookendComponent {
     return components.reduce((builtComponents, component) => {
       const componentBuilder = componentBuilderInstanceFor(component.type);
       if (!componentBuilder) {
-        dev().error(TAG, 'Component type `' + component.type +
-        '` is not supported. Skipping invalid.');
+        dev().error(
+          TAG,
+          'Component type `' +
+            component.type +
+            '` is not supported. Skipping invalid.'
+        );
         return builtComponents;
       }
       componentBuilder.assertValidity(component, el);
@@ -164,8 +163,9 @@ export class BookendComponent {
     components.forEach(component => {
       const {type} = component;
       if (type && componentBuilderInstanceFor(type)) {
-        fragment.appendChild(componentBuilderInstanceFor(type)
-            .buildElement(component, doc));
+        fragment.appendChild(
+          componentBuilderInstanceFor(type).buildElement(component, doc)
+        );
       }
     });
     return fragment;
@@ -179,9 +179,12 @@ export class BookendComponent {
    */
   static buildContainer(element, doc) {
     const html = htmlFor(doc);
-    const containerTemplate =
-      html`<div class="i-amphtml-story-bookend-component-set
-          i-amphtml-story-bookend-top-level"></div>`;
+    const containerTemplate = html`
+      <div
+        class="i-amphtml-story-bookend-component-set
+          i-amphtml-story-bookend-top-level"
+      ></div>
+    `;
     element.appendChild(containerTemplate);
     return element.lastElementChild;
   }
diff --git a/extensions/amp-story/1.0/bookend/components/article.js b/extensions/amp-story/1.0/bookend/components/article.js
index 50e6a7ee1efc..cd64416e3259 100644
--- a/extensions/amp-story/1.0/bookend/components/article.js
+++ b/extensions/amp-story/1.0/bookend/components/article.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  BookendComponentInterface,
-} from './bookend-component-interface';
+import {BookendComponentInterface} from './bookend-component-interface';
 import {addAttributesToElement} from '../../../../../src/dom';
 import {dict} from '../../../../../src/utils/object';
 import {getSourceOriginForElement, userAssertValidProtocol} from '../../utils';
@@ -39,18 +37,18 @@ export let ArticleComponentDef;
  * @implements {BookendComponentInterface}
  */
 export class ArticleComponent {
-
   /** @override */
   assertValidity(articleJson, element) {
-
     const requiredFields = ['title', 'url'];
-    const hasAllRequiredFields =
-        !requiredFields.some(field => !(field in articleJson));
+    const hasAllRequiredFields = !requiredFields.some(
+      field => !(field in articleJson)
+    );
     userAssert(
-        hasAllRequiredFields,
-        'Small article component must contain ' +
-            requiredFields.map(field => '`' + field + '`').join(', ') +
-            ' fields, skipping invalid.');
+      hasAllRequiredFields,
+      'Small article component must contain ' +
+        requiredFields.map(field => '`' + field + '`').join(', ') +
+        ' fields, skipping invalid.'
+    );
 
     userAssertValidProtocol(element, articleJson['url']);
 
@@ -87,20 +85,21 @@ export class ArticleComponent {
   buildElement(articleData, doc) {
     const html = htmlFor(doc);
     //TODO(#14657, #14658): Binaries resulting from htmlFor are bloated.
-    const el =
-        html`
-        <a class="i-amphtml-story-bookend-article
+    const el = html`
+      <a
+        class="i-amphtml-story-bookend-article
           i-amphtml-story-bookend-component"
-          target="_top">
-          <div class="i-amphtml-story-bookend-article-text-content">
-            <h2
-              class="i-amphtml-story-bookend-article-heading" ref="heading">
-            </h2>
-            <div
-              class="i-amphtml-story-bookend-component-meta" ref="meta">
-            </div>
-          </div>
-        </a>`;
+        target="_top"
+      >
+        <div class="i-amphtml-story-bookend-article-text-content">
+          <h2
+            class="i-amphtml-story-bookend-article-heading"
+            ref="heading"
+          ></h2>
+          <div class="i-amphtml-story-bookend-component-meta" ref="meta"></div>
+        </div>
+      </a>
+    `;
     addAttributesToElement(el, dict({'href': articleData.url}));
 
     if (articleData['amphtml'] === true) {
@@ -108,8 +107,7 @@ export class ArticleComponent {
     }
 
     if (articleData.image) {
-      const imgEl =
-          html`
+      const imgEl = html`
           <div class="i-amphtml-story-bookend-article-image">
             <img ref="image">
             </img>
diff --git a/extensions/amp-story/1.0/bookend/components/bookend-component-interface.js b/extensions/amp-story/1.0/bookend/components/bookend-component-interface.js
index 517b6ae5c58e..9f9bd998a3ed 100644
--- a/extensions/amp-story/1.0/bookend/components/bookend-component-interface.js
+++ b/extensions/amp-story/1.0/bookend/components/bookend-component-interface.js
@@ -19,7 +19,6 @@
  * @interface
  */
 export class BookendComponentInterface {
-
   /**
    * Asserts whether the comopnent is valid.
    * @param {../bookend-component.BookendComponentDef} unusedComponentJson
diff --git a/extensions/amp-story/1.0/bookend/components/cta-link.js b/extensions/amp-story/1.0/bookend/components/cta-link.js
index 39774abd96d7..7817b5718b6f 100644
--- a/extensions/amp-story/1.0/bookend/components/cta-link.js
+++ b/extensions/amp-story/1.0/bookend/components/cta-link.js
@@ -49,13 +49,17 @@ export class CtaLinkComponent {
    * */
   assertValidity(ctaLinksJson, element) {
     const links = ctaLinksJson['links'];
-    userAssert(links && isArray(links) && links.length > 0,
-        'CTA link component must be an array and contain at least one link ' +
-        'inside it.');
+    userAssert(
+      links && isArray(links) && links.length > 0,
+      'CTA link component must be an array and contain at least one link ' +
+        'inside it.'
+    );
 
     links.forEach(ctaLink => {
-      userAssert('text' in ctaLink && 'url' in ctaLink,
-          'Links in CTA link component must contain `text` field and a `url`.');
+      userAssert(
+        'text' in ctaLink && 'url' in ctaLink,
+        'Links in CTA link component must contain `text` field and a `url`.'
+      );
 
       userAssertValidProtocol(element, ctaLink['url']);
     });
@@ -79,16 +83,18 @@ export class CtaLinkComponent {
   /** @override */
   buildElement(ctaLinksData, doc) {
     const html = htmlFor(doc);
-    const container =
-        html`<div class="i-amphtml-story-bookend-cta-link-wrapper
-          i-amphtml-story-bookend-component">
-        </div>`;
+    const container = html`
+      <div
+        class="i-amphtml-story-bookend-cta-link-wrapper
+          i-amphtml-story-bookend-component"
+      ></div>
+    `;
 
-    let linkSeed =
-        html`<a class="i-amphtml-story-bookend-cta-link" target="_top">
-          <div class="i-amphtml-story-bookend-cta-link-text" ref="linkText">
-          </div>
-        </a>`;
+    let linkSeed = html`
+      <a class="i-amphtml-story-bookend-cta-link" target="_top">
+        <div class="i-amphtml-story-bookend-cta-link-text" ref="linkText"></div>
+      </a>
+    `;
     ctaLinksData['links'].forEach(currentLink => {
       const el = linkSeed.cloneNode(/* deep */ true);
       addAttributesToElement(el, dict({'href': currentLink['url']}));
diff --git a/extensions/amp-story/1.0/bookend/components/heading.js b/extensions/amp-story/1.0/bookend/components/heading.js
index db2bd41e4472..59cc89894dd0 100644
--- a/extensions/amp-story/1.0/bookend/components/heading.js
+++ b/extensions/amp-story/1.0/bookend/components/heading.js
@@ -37,8 +37,10 @@ export class HeadingComponent {
    * @override
    * */
   assertValidity(headingJson) {
-    userAssert('text' in headingJson, 'Heading component must contain ' +
-      '`text` field, skipping invalid.');
+    userAssert(
+      'text' in headingJson,
+      'Heading component must contain `text` field, skipping invalid.'
+    );
   }
 
   /**
@@ -61,9 +63,12 @@ export class HeadingComponent {
    * */
   buildElement(headingData, doc) {
     const html = htmlFor(doc);
-    const template =
-      html`<h3 class="i-amphtml-story-bookend-component
-        i-amphtml-story-bookend-heading"></h3>`;
+    const template = html`
+      <h3
+        class="i-amphtml-story-bookend-component
+        i-amphtml-story-bookend-heading"
+      ></h3>
+    `;
 
     template.textContent = headingData.text;
 
diff --git a/extensions/amp-story/1.0/bookend/components/landscape.js b/extensions/amp-story/1.0/bookend/components/landscape.js
index 2508b8e444d4..4b0ab945071c 100644
--- a/extensions/amp-story/1.0/bookend/components/landscape.js
+++ b/extensions/amp-story/1.0/bookend/components/landscape.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  BookendComponentInterface,
-} from './bookend-component-interface';
+import {BookendComponentInterface} from './bookend-component-interface';
 import {addAttributesToElement} from '../../../../../src/dom';
 import {dict} from '../../../../../src/utils/object';
 import {getSourceOriginForElement, userAssertValidProtocol} from '../../utils';
@@ -51,18 +49,18 @@ let landscapeElementsDef;
  * @implements {BookendComponentInterface}
  */
 export class LandscapeComponent {
-
   /** @override */
   assertValidity(landscapeJson, element) {
-
     const requiredFields = ['title', 'image', 'url'];
-    const hasAllRequiredFields =
-        !requiredFields.some(field => !(field in landscapeJson));
+    const hasAllRequiredFields = !requiredFields.some(
+      field => !(field in landscapeJson)
+    );
     userAssert(
-        hasAllRequiredFields,
-        'Landscape component must contain ' +
+      hasAllRequiredFields,
+      'Landscape component must contain ' +
         requiredFields.map(field => '`' + field + '`').join(', ') +
-        ' fields, skipping invalid.');
+        ' fields, skipping invalid.'
+    );
 
     userAssertValidProtocol(element, landscapeJson['url']);
     userAssertValidProtocol(element, landscapeJson['image']);
@@ -93,8 +91,7 @@ export class LandscapeComponent {
   buildElement(landscapeData, doc) {
     landscapeData = /** @type {LandscapeComponentDef} */ (landscapeData);
     const html = htmlFor(doc);
-    const el =
-        html`
+    const el = html`
         <a class="i-amphtml-story-bookend-landscape
           i-amphtml-story-bookend-component"
           target="_top">
diff --git a/extensions/amp-story/1.0/bookend/components/portrait.js b/extensions/amp-story/1.0/bookend/components/portrait.js
index 35893d1ab581..0e35c2d522ec 100644
--- a/extensions/amp-story/1.0/bookend/components/portrait.js
+++ b/extensions/amp-story/1.0/bookend/components/portrait.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  BookendComponentInterface,
-} from './bookend-component-interface';
+import {BookendComponentInterface} from './bookend-component-interface';
 import {addAttributesToElement} from '../../../../../src/dom';
 import {dict} from '../../../../../src/utils/object';
 import {getSourceOriginForElement, userAssertValidProtocol} from '../../utils';
@@ -51,18 +49,18 @@ let portraitElementsDef;
  * @implements {BookendComponentInterface}
  */
 export class PortraitComponent {
-
   /** @override */
   assertValidity(portraitJson, element) {
-
     const requiredFields = ['title', 'image', 'url'];
-    const hasAllRequiredFields =
-        !requiredFields.some(field => !(field in portraitJson));
+    const hasAllRequiredFields = !requiredFields.some(
+      field => !(field in portraitJson)
+    );
     userAssert(
-        hasAllRequiredFields,
-        'Portrait component must contain ' +
+      hasAllRequiredFields,
+      'Portrait component must contain ' +
         requiredFields.map(field => '`' + field + '`').join(', ') +
-        ' fields, skipping invalid.');
+        ' fields, skipping invalid.'
+    );
 
     userAssertValidProtocol(element, portraitJson['url']);
     userAssertValidProtocol(element, portraitJson['image']);
@@ -93,8 +91,7 @@ export class PortraitComponent {
   buildElement(portraitData, doc) {
     portraitData = /** @type {PortraitComponentDef} */ (portraitData);
     const html = htmlFor(doc);
-    const el =
-        html`
+    const el = html`
         <a class="i-amphtml-story-bookend-portrait
           i-amphtml-story-bookend-component"
           target="_top">
@@ -114,8 +111,12 @@ export class PortraitComponent {
       addAttributesToElement(el, dict({'rel': 'amphtml'}));
     }
 
-    const {category, title, image, meta} =
-      /** @type {!portraitElementsDef} */ (htmlRefs(el));
+    const {
+      category,
+      title,
+      image,
+      meta,
+    } = /** @type {!portraitElementsDef} */ (htmlRefs(el));
 
     category.textContent = portraitData.category;
     title.textContent = portraitData.title;
diff --git a/extensions/amp-story/1.0/bookend/components/text-box.js b/extensions/amp-story/1.0/bookend/components/text-box.js
index f718544c0852..4d8e6f320797 100644
--- a/extensions/amp-story/1.0/bookend/components/text-box.js
+++ b/extensions/amp-story/1.0/bookend/components/text-box.js
@@ -37,10 +37,14 @@ export class TextBoxComponent {
    * @override
    * */
   assertValidity(textboxJson) {
-    userAssert('text' in textboxJson && isArray(textboxJson['text']) &&
-      textboxJson['text'].length > 0, 'Textbox component must contain ' +
-      '`text` array and at least one element inside it, ' +
-      'skipping invalid.');
+    userAssert(
+      'text' in textboxJson &&
+        isArray(textboxJson['text']) &&
+        textboxJson['text'].length > 0,
+      'Textbox component must contain ' +
+        '`text` array and at least one element inside it, ' +
+        'skipping invalid.'
+    );
   }
 
   /**
@@ -55,12 +59,16 @@ export class TextBoxComponent {
   /** @override */
   buildElement(textboxData, doc) {
     const html = htmlFor(doc);
-    const container =
-        html`
-        <div class="i-amphtml-story-bookend-textbox
-          i-amphtml-story-bookend-component"></div>`;
+    const container = html`
+      <div
+        class="i-amphtml-story-bookend-textbox
+          i-amphtml-story-bookend-component"
+      ></div>
+    `;
 
-    let textSeed = html`<h3 class="i-amphtml-story-bookend-text"></h3>`;
+    let textSeed = html`
+      <h3 class="i-amphtml-story-bookend-text"></h3>
+    `;
     textboxData['text'].forEach(currentLine => {
       const el = textSeed.cloneNode(/* deep */ true);
       el.textContent = currentLine;
diff --git a/extensions/amp-story/1.0/default-media.js b/extensions/amp-story/1.0/default-media.js
index 70d76a897a21..9058594add94 100644
--- a/extensions/amp-story/1.0/default-media.js
+++ b/extensions/amp-story/1.0/default-media.js
@@ -14,77 +14,79 @@
  * limitations under the License.
  */
 
-export const BLANK_AUDIO_SRC = 'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBA' +
-    'AAAABAAEAIlYAAESsAAACABAAZGF0YRAAAAAAAAAAAAAAAAAAAAAAAA==';
+export const BLANK_AUDIO_SRC =
+  'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBA' +
+  'AAAABAAEAIlYAAESsAAACABAAZGF0YRAAAAAAAAAAAAAAAAAAAAAAAA==';
 
-export const BLANK_VIDEO_SRC = 'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAG' +
-    'lzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARw' +
-    'AAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIE' +
-    'guMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3' +
-    'd3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYm' +
-    'xvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3' +
-    'JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbG' +
-    'lzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV' +
-    '9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3Rocm' +
-    'VhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb2' +
-    '5zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbn' +
-    'RfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcm' +
-    'M9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcH' +
-    'N0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYW' +
-    'xfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8m' +
-    'KAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' +
-    'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4G' +
-    'SAIQBJkAIZACOAAAAAB0GaVAX4GSAhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpgL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGagC/AySEASZACGQAjgAAAAAZBmqAvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZrAL8DJIQBJkAIZACOAAAAABkGa4C/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBmwAvwMkhAEmQAhkAI4AAAAAGQZsgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGbQC' +
-    '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm2AvwMkhAEmQAhkAI4AAAAAGQZuAL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGboC/AySEASZACGQAjgAAAAAZBm8AvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZvgL8DJIQBJkAIZACOAAAAABkGaAC/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBmiAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpAL8DJIQBJkAIZACOAAAAABkGaYC' +
-    '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmoAvwMkhAEmQAhkAI4AAAAAGQZqgL8DJIQBJkA' +
-    'IZACOAIQBJkAIZACOAAAAABkGawC/AySEASZACGQAjgAAAAAZBmuAvwMkhAEmQAhkAI4AhAE' +
-    'mQAhkAI4AAAAAGQZsAL8DJIQBJkAIZACOAAAAABkGbIC/AySEASZACGQAjgCEASZACGQAjgA' +
-    'AAAAZBm0AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZtgL8DJIQBJkAIZACOAAAAABkGbgC' +
-    'vAySEASZACGQAjgCEASZACGQAjgAAAAAZBm6AnwMkhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAh' +
-    'kAI4AhAEmQAhkAI4AAAAhubW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAABDcAAQAAAQ' +
-    'AAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA' +
-    'AAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAzB0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAABAA' +
-    'AAAAAAA+kAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA' +
-    'BAAAAAALAAAACQAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAPpAAAAAAABAAAAAAKobW' +
-    'RpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAB1MAAAdU5VxAAAAAAALWhkbHIAAAAAAAAAAHZpZG' +
-    'UAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAACU21pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAA' +
-    'AAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAhNzdGJsAAAAr3N0c2QAAA' +
-    'AAAAAAAQAAAJ9hdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAALAAkABIAAAASAAAAAAAAA' +
-    'ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAALWF2Y0MBQsAN/+EAFW' +
-    'dCwA3ZAsTsBEAAAPpAADqYA8UKkgEABWjLg8sgAAAAHHV1aWRraEDyXyRPxbo5pRvPAyPzAA' +
-    'AAAAAAABhzdHRzAAAAAAAAAAEAAAAeAAAD6QAAABRzdHNzAAAAAAAAAAEAAAABAAAAHHN0c2' +
-    'MAAAAAAAAAAQAAAAEAAAABAAAAAQAAAIxzdHN6AAAAAAAAAAAAAAAeAAADDwAAAAsAAAALAA' +
-    'AACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAA' +
-    'oAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAA' +
-    'AAiHN0Y28AAAAAAAAAHgAAAEYAAANnAAADewAAA5gAAAO0AAADxwAAA+MAAAP2AAAEEgAABC' +
-    'UAAARBAAAEXQAABHAAAASMAAAEnwAABLsAAATOAAAE6gAABQYAAAUZAAAFNQAABUgAAAVkAA' +
-    'AFdwAABZMAAAWmAAAFwgAABd4AAAXxAAAGDQAABGh0cmFrAAAAXHRraGQAAAADAAAAAAAAAA' +
-    'AAAAACAAAAAAAABDcAAAAAAAAAAAAAAAEBAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA' +
-    'AAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAA' +
-    'AAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAA' +
-    'AAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAA' +
-    'AAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZA' +
-    'AAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAA' +
-    'AAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAA' +
-    'AAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAA' +
-    'IAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAA' +
-    'AACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAA' +
-    'EAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAA' +
-    'AAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAA' +
-    'IAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAA' +
-    'AAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAAD' +
-    'MAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
-    'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAA' +
-    'kAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
-    'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAA' +
-    'AAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAA' +
-    'AEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ' +
-    '0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAA' +
-    'AAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYX' +
-    'ZmNTUuMzMuMTAw';
+export const BLANK_VIDEO_SRC =
+  'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAG' +
+  'lzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARw' +
+  'AAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIE' +
+  'guMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3' +
+  'd3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYm' +
+  'xvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3' +
+  'JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbG' +
+  'lzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV' +
+  '9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3Rocm' +
+  'VhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb2' +
+  '5zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbn' +
+  'RfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcm' +
+  'M9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcH' +
+  'N0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYW' +
+  'xfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8m' +
+  'KAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' +
+  'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4G' +
+  'SAIQBJkAIZACOAAAAAB0GaVAX4GSAhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpgL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGagC/AySEASZACGQAjgAAAAAZBmqAvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZrAL8DJIQBJkAIZACOAAAAABkGa4C/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBmwAvwMkhAEmQAhkAI4AAAAAGQZsgL8DJIQBJkAIZACOAIQBJkAIZACOAAAAABkGbQC' +
+  '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBm2AvwMkhAEmQAhkAI4AAAAAGQZuAL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGboC/AySEASZACGQAjgAAAAAZBm8AvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZvgL8DJIQBJkAIZACOAAAAABkGaAC/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBmiAvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZpAL8DJIQBJkAIZACOAAAAABkGaYC' +
+  '/AySEASZACGQAjgCEASZACGQAjgAAAAAZBmoAvwMkhAEmQAhkAI4AAAAAGQZqgL8DJIQBJkA' +
+  'IZACOAIQBJkAIZACOAAAAABkGawC/AySEASZACGQAjgAAAAAZBmuAvwMkhAEmQAhkAI4AhAE' +
+  'mQAhkAI4AAAAAGQZsAL8DJIQBJkAIZACOAAAAABkGbIC/AySEASZACGQAjgCEASZACGQAjgA' +
+  'AAAAZBm0AvwMkhAEmQAhkAI4AhAEmQAhkAI4AAAAAGQZtgL8DJIQBJkAIZACOAAAAABkGbgC' +
+  'vAySEASZACGQAjgCEASZACGQAjgAAAAAZBm6AnwMkhAEmQAhkAI4AhAEmQAhkAI4AhAEmQAh' +
+  'kAI4AhAEmQAhkAI4AAAAhubW9vdgAAAGxtdmhkAAAAAAAAAAAAAAAAAAAD6AAABDcAAQAAAQ' +
+  'AAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAA' +
+  'AAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAzB0cmFrAAAAXHRraGQAAAADAAAAAAAAAAAAAAABAA' +
+  'AAAAAAA+kAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAA' +
+  'BAAAAAALAAAACQAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAPpAAAAAAABAAAAAAKobW' +
+  'RpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAB1MAAAdU5VxAAAAAAALWhkbHIAAAAAAAAAAHZpZG' +
+  'UAAAAAAAAAAAAAAABWaWRlb0hhbmRsZXIAAAACU21pbmYAAAAUdm1oZAAAAAEAAAAAAAAAAA' +
+  'AAACRkaW5mAAAAHGRyZWYAAAAAAAAAAQAAAAx1cmwgAAAAAQAAAhNzdGJsAAAAr3N0c2QAAA' +
+  'AAAAAAAQAAAJ9hdmMxAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAALAAkABIAAAASAAAAAAAAA' +
+  'ABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGP//AAAALWF2Y0MBQsAN/+EAFW' +
+  'dCwA3ZAsTsBEAAAPpAADqYA8UKkgEABWjLg8sgAAAAHHV1aWRraEDyXyRPxbo5pRvPAyPzAA' +
+  'AAAAAAABhzdHRzAAAAAAAAAAEAAAAeAAAD6QAAABRzdHNzAAAAAAAAAAEAAAABAAAAHHN0c2' +
+  'MAAAAAAAAAAQAAAAEAAAABAAAAAQAAAIxzdHN6AAAAAAAAAAAAAAAeAAADDwAAAAsAAAALAA' +
+  'AACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAA' +
+  'oAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAAAACgAAAAoAAAAKAA' +
+  'AAiHN0Y28AAAAAAAAAHgAAAEYAAANnAAADewAAA5gAAAO0AAADxwAAA+MAAAP2AAAEEgAABC' +
+  'UAAARBAAAEXQAABHAAAASMAAAEnwAABLsAAATOAAAE6gAABQYAAAUZAAAFNQAABUgAAAVkAA' +
+  'AFdwAABZMAAAWmAAAFwgAABd4AAAXxAAAGDQAABGh0cmFrAAAAXHRraGQAAAADAAAAAAAAAA' +
+  'AAAAACAAAAAAAABDcAAAAAAAAAAAAAAAEBAAAAAAEAAAAAAAAAAAAAAAAAAAABAAAAAAAAAA' +
+  'AAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAA' +
+  'AAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAA' +
+  'AAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAA' +
+  'AAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZA' +
+  'AAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAA' +
+  'AAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAA' +
+  'AAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAA' +
+  'IAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAA' +
+  'AACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAA' +
+  'EAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAA' +
+  'AAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAA' +
+  'IAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAA' +
+  'AAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAAD' +
+  'MAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
+  'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAA' +
+  'kAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' +
+  'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAA' +
+  'AAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAA' +
+  'AEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ' +
+  '0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAA' +
+  'AAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYX' +
+  'ZmNTUuMzMuMTAw';
diff --git a/extensions/amp-story/1.0/development-ui.js b/extensions/amp-story/1.0/development-ui.js
index 61bc87c549e4..19f616bf1786 100644
--- a/extensions/amp-story/1.0/development-ui.js
+++ b/extensions/amp-story/1.0/development-ui.js
@@ -19,7 +19,6 @@ import {isArray} from '../../../src/types';
 import {removeChildren} from '../../../src/dom';
 import {toggle} from '../../../src/style';
 
-
 /**
  * @param {!../../../src/service/vsync-impl.Vsync} vsync
  * @param {!Element} el
@@ -31,7 +30,6 @@ function toggleHiddenAttribute(vsync, el, isHidden) {
   });
 }
 
-
 /**
  * @param {!Window} win
  * @param {string|!Array<string>} classNameOrList
@@ -52,7 +50,6 @@ function createButton(win, classNameOrList, handler) {
   return button;
 }
 
-
 /**
  * Development mode logs buttons.
  */
@@ -77,7 +74,6 @@ export class DevelopmentModeLogButtonSet {
     this.successButton_ = null;
   }
 
-
   /**
    * @param {!Window} win
    */
@@ -85,7 +81,6 @@ export class DevelopmentModeLogButtonSet {
     return new DevelopmentModeLogButtonSet(win);
   }
 
-
   /**
    * Builds the developer log button set element.
    * @param {function()} logButtonActionFn A callback function to be invoked when
@@ -93,18 +88,23 @@ export class DevelopmentModeLogButtonSet {
    * @return {?Element}
    */
   build(logButtonActionFn) {
-    this.errorButton_ = createButton(this.win_,
-        ['i-amphtml-story-error-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
-    this.warningButton_ = createButton(this.win_,
-        ['i-amphtml-story-warning-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
-    this.successButton_ = createButton(this.win_,
-        ['i-amphtml-story-success-button', 'i-amphtml-story-dev-logs-button'],
-        () => logButtonActionFn());
-
+    this.errorButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-error-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
+
+    this.warningButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-warning-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
+
+    this.successButton_ = createButton(
+      this.win_,
+      ['i-amphtml-story-success-button', 'i-amphtml-story-dev-logs-button'],
+      () => logButtonActionFn()
+    );
 
     this.root_ = this.win_.document.createElement('div');
     this.root_.appendChild(this.errorButton_);
@@ -114,7 +114,6 @@ export class DevelopmentModeLogButtonSet {
     return this.root_;
   }
 
-
   /**
    * Gets the button associated to a given log entry.
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The log entry for which
@@ -138,7 +137,6 @@ export class DevelopmentModeLogButtonSet {
     }
   }
 
-
   /**
    * Logs an individual entry into the developer log.
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to log.
@@ -153,7 +151,6 @@ export class DevelopmentModeLogButtonSet {
     button.setAttribute('data-count', oldCount + 1);
   }
 
-
   /**
    * Clears any error state held by the buttons.
    */
@@ -164,7 +161,6 @@ export class DevelopmentModeLogButtonSet {
   }
 }
 
-
 /**
  * Development mode log for <amp-story>.
  */
@@ -186,7 +182,6 @@ export class DevelopmentModeLog {
     this.contextStringEl_ = null;
   }
 
-
   /**
    * @param {!Window} win
    */
@@ -194,22 +189,24 @@ export class DevelopmentModeLog {
     return new DevelopmentModeLog(win);
   }
 
-
   /**
    * Builds the developer log element.
    * @return {?Element}
    */
   build() {
     this.contextStringEl_ = this.win_.document.createElement('span');
-    this.contextStringEl_.classList
-        .add('i-amphtml-story-developer-log-context');
+    this.contextStringEl_.classList.add(
+      'i-amphtml-story-developer-log-context'
+    );
     const titleEl = this.win_.document.createElement('div');
     titleEl.textContent = 'Developer logs for page ';
     titleEl.appendChild(this.contextStringEl_);
 
-    const closeDeveloperLogEl = createButton(this.win_,
-        'i-amphtml-story-developer-log-close',
-        () => this.hide());
+    const closeDeveloperLogEl = createButton(
+      this.win_,
+      'i-amphtml-story-developer-log-close',
+      () => this.hide()
+    );
 
     const headerEl = this.win_.document.createElement('div');
     headerEl.classList.add('i-amphtml-story-developer-log-header');
@@ -217,8 +214,7 @@ export class DevelopmentModeLog {
     headerEl.appendChild(closeDeveloperLogEl);
 
     this.entriesEl_ = this.win_.document.createElement('ul');
-    this.entriesEl_.classList
-        .add('i-amphtml-story-developer-log-entries');
+    this.entriesEl_.classList.add('i-amphtml-story-developer-log-entries');
 
     this.root_ = this.win_.document.createElement('div');
     this.root_.classList.add('i-amphtml-story-developer-log');
@@ -230,7 +226,6 @@ export class DevelopmentModeLog {
     return this.root_;
   }
 
-
   /**
    * @param {!LogLevel} logLevel
    * @return {?string} The CSS class to be applied to the log entry, given the
@@ -248,7 +243,6 @@ export class DevelopmentModeLog {
     }
   }
 
-
   /**
    * @param {boolean} conforms Whether the log entry is for an element that
    *     conforms to a best practice.
@@ -265,7 +259,6 @@ export class DevelopmentModeLog {
     return null;
   }
 
-
   /**
    * @param {!./logging.AmpStoryLogEntryDef} logEntry The entry to be logged.
    */
@@ -288,7 +281,6 @@ export class DevelopmentModeLog {
     this.entriesEl_.appendChild(logEntryUi);
   }
 
-
   /**
    * Clears all entries from the developer logs.
    */
@@ -298,7 +290,6 @@ export class DevelopmentModeLog {
     });
   }
 
-
   /**
    * Sets the string providing context for the developer logs window.  This is
    * often the name or ID of the element that all logs are for (e.g. the page).
@@ -308,24 +299,26 @@ export class DevelopmentModeLog {
     this.contextStringEl_.textContent = contextString;
   }
 
-
   /**
    * Toggles the visibility of the developer log.
    */
   toggle() {
     const newHiddenState = !this.root_.hasAttribute('hidden');
     toggleHiddenAttribute(
-        Services.vsyncFor(this.win_), dev().assertElement(this.root_),
-        newHiddenState);
+      Services.vsyncFor(this.win_),
+      dev().assertElement(this.root_),
+      newHiddenState
+    );
   }
 
-
   /**
    * Hides the developer log in the UI.
    */
   hide() {
     toggleHiddenAttribute(
-        Services.vsyncFor(this.win_), dev().assertElement(this.root_),
-        /* isHidden */ true);
+      Services.vsyncFor(this.win_),
+      dev().assertElement(this.root_),
+      /* isHidden */ true
+    );
   }
 }
diff --git a/extensions/amp-story/1.0/embed-mode.js b/extensions/amp-story/1.0/embed-mode.js
index 284c0a504689..c857b843ca00 100644
--- a/extensions/amp-story/1.0/embed-mode.js
+++ b/extensions/amp-story/1.0/embed-mode.js
@@ -16,7 +16,6 @@
 import {isEnumValue} from '../../../src/types';
 import {parseQueryString} from '../../../src/url';
 
-
 /**
  * Embed mode for AMP story.  See ../embed-modes.md for details.
  * @enum {number}
@@ -53,14 +52,12 @@ export const EmbedMode = {
   NO_SHARING: 2,
 };
 
-
 /**
  * Parameter to retrieve the embed mode from the location hash.
  * @type {string}
  */
 export const EmbedModeParam = 'embedMode';
 
-
 /**
  * @param {string} str
  * @return {!EmbedMode}
diff --git a/extensions/amp-story/1.0/events.js b/extensions/amp-story/1.0/events.js
index e5f76a29656a..cec38b9d333b 100644
--- a/extensions/amp-story/1.0/events.js
+++ b/extensions/amp-story/1.0/events.js
@@ -16,7 +16,6 @@
 
 import {createCustomEvent} from '../../../src/event-helper';
 
-
 /** @const {!Object<string, string>} */
 export const EventType = {
   // Triggered when the user mutes the story
@@ -64,8 +63,13 @@ export const EventType = {
  * @param {!JsonObject=} payload
  * @param {!CustomEventInit=} eventInit
  */
-export function dispatch(win, source, eventName, payload = undefined,
-  eventInit = undefined) {
+export function dispatch(
+  win,
+  source,
+  eventName,
+  payload = undefined,
+  eventInit = undefined
+) {
   const event = createCustomEvent(win, eventName, payload, eventInit);
   source.dispatchEvent(event);
 }
diff --git a/extensions/amp-story/1.0/jsonld.js b/extensions/amp-story/1.0/jsonld.js
index 97845a1ee62e..8242a7b05ca8 100644
--- a/extensions/amp-story/1.0/jsonld.js
+++ b/extensions/amp-story/1.0/jsonld.js
@@ -31,7 +31,9 @@ export function getJsonLd(root) {
     return null;
   }
 
-  return tryParseJson(scriptTag.textContent, e => {
-    user().error(TAG, 'Failed to parse ld+json. Is it valid JSON?', e);
-  }) || null;
+  return (
+    tryParseJson(scriptTag.textContent, e => {
+      user().error(TAG, 'Failed to parse ld+json. Is it valid JSON?', e);
+    }) || null
+  );
 }
diff --git a/extensions/amp-story/1.0/loading-spinner.js b/extensions/amp-story/1.0/loading-spinner.js
index dc535790eeea..0736e1944960 100644
--- a/extensions/amp-story/1.0/loading-spinner.js
+++ b/extensions/amp-story/1.0/loading-spinner.js
@@ -17,11 +17,9 @@ import {dev} from '../../../src/log';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @const {string} */
 const SPINNER_ACTIVE_ATTRIBUTE = 'active';
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const SPINNER = {
   tag: 'div',
diff --git a/extensions/amp-story/1.0/logging.js b/extensions/amp-story/1.0/logging.js
index 5ee765ab0685..2bac4d4dceb1 100644
--- a/extensions/amp-story/1.0/logging.js
+++ b/extensions/amp-story/1.0/logging.js
@@ -17,7 +17,6 @@ import {LogLevel, devAssert} from '../../../src/log';
 import {scopedQuerySelectorAll} from '../../../src/dom';
 import {tryResolve} from '../../../src/utils/promise';
 
-
 /** @typedef {function(!Element): (boolean|!Promise<boolean>)} */
 let ElementPredicateDef;
 
@@ -54,7 +53,6 @@ let ElementPredicateDef;
  */
 let AmpStoryLogTypeDef;
 
-
 /**
  * A log entry is a more concrete version of a rule or best practice; it refers
  * to whether a specific element on a specific page of a specific story conforms
@@ -71,11 +69,9 @@ let AmpStoryLogTypeDef;
  */
 export let AmpStoryLogEntryDef;
 
-
 /** @private @const {string} */
 const AMPPROJECT_DOCS = 'https://www.ampproject.org/docs';
 
-
 /**
  * @param {!HTMLMediaElement} el
  * @return {!Promise<Image>}
@@ -101,8 +97,9 @@ const LogType = {
 
   /** Warnings */
   IMAGES_MAX_720P_OR_SRCSET: {
-    message: 'Images should not be larger than 720p.  If you wish to use' +
-        ' images that are larger than 720p, you should specify a srcset.',
+    message:
+      'Images should not be larger than 720p.  If you wish to use' +
+      ' images that are larger than 720p, you should specify a srcset.',
     moreInfo: AMPPROJECT_DOCS + '/guides/responsive/art_direction#srcset',
     selector: 'img:not([srcset])',
     predicate: el => el.naturalWidth <= 720 && el.naturalHeight <= 1280,
@@ -133,25 +130,27 @@ const LogType = {
   VIDEO_POSTER_MAX_720P: {
     message: 'Video poster images should not be larger than 720p.',
     selector: 'video[poster]',
-    predicate: el => getPosterFromVideo(el)
-        .then(poster => {
-          return poster.naturalWidth <= 720 && poster.naturalHeight <= 1280;
-        }),
+    predicate: el =>
+      getPosterFromVideo(el).then(poster => {
+        return poster.naturalWidth <= 720 && poster.naturalHeight <= 1280;
+      }),
     level: LogLevel.WARN,
   },
 
   VIDEO_POSTER_POTRAIT: {
-    message: 'Poster images for full-bleed videos should be in portrait ' +
-        'orientation.',
-    selector: 'amp-story-grid-layer[template="fill"] > amp-video > ' +
-        'video[poster]',
-    predicate: el => getPosterFromVideo(el)
-        .then(poster => poster.naturalWidth < poster.naturalHeight),
+    message:
+      'Poster images for full-bleed videos should be in portrait ' +
+      'orientation.',
+    selector:
+      'amp-story-grid-layer[template="fill"] > amp-video > video[poster]',
+    predicate: el =>
+      getPosterFromVideo(el).then(
+        poster => poster.naturalWidth < poster.naturalHeight
+      ),
     level: LogLevel.WARN,
   },
 };
 
-
 /**
  * Gets the log type associated with the specified key.
  * @param {string} logTypeKey
@@ -160,15 +159,18 @@ const LogType = {
 function getLogType(logTypeKey) {
   const logType = LogType[logTypeKey];
   devAssert(logType, `There is no log type "${logTypeKey}".`);
-  devAssert(logType.message,
-      `Log type "${logTypeKey}" has no associated message.`);
-  devAssert(logType.level,
-      `Log type "${logTypeKey}" has no associated log level.`);
+  devAssert(
+    logType.message,
+    `Log type "${logTypeKey}" has no associated message.`
+  );
+  devAssert(
+    logType.level,
+    `Log type "${logTypeKey}" has no associated log level.`
+  );
 
   return logType;
 }
 
-
 /**
  * @param {!Element} rootElement
  * @param {!AmpStoryLogTypeDef} logType
@@ -178,22 +180,20 @@ function getLogType(logTypeKey) {
 function getLogEntry(rootElement, logType, element) {
   const predicate = logType.predicate || (unusedEl => false);
 
-  return tryResolve(() => predicate(element))
-      .then(conforms => {
-        return new Promise(resolve => {
-          resolve({
-            rootElement,
-            element,
-            conforms,
-            level: logType.level,
-            message: logType.message,
-            moreInfo: logType.moreInfo,
-          });
-        });
+  return tryResolve(() => predicate(element)).then(conforms => {
+    return new Promise(resolve => {
+      resolve({
+        rootElement,
+        element,
+        conforms,
+        level: logType.level,
+        message: logType.message,
+        moreInfo: logType.moreInfo,
       });
+    });
+  });
 }
 
-
 /**
  * @param {!Element} rootElement
  * @param {!AmpStoryLogTypeDef} logType
@@ -202,13 +202,13 @@ function getLogEntry(rootElement, logType, element) {
 function getLogEntriesForType(rootElement, logType) {
   const precondition = logType.precondition || (unusedEl => true);
 
-  const elements = logType.selector ?
-    [].slice.call(scopedQuerySelectorAll(rootElement, logType.selector)) :
-    [rootElement];
+  const elements = logType.selector
+    ? [].slice.call(scopedQuerySelectorAll(rootElement, logType.selector))
+    : [rootElement];
 
   return elements
-      .filter(precondition)
-      .map(getLogEntry.bind(/** thisArg */ null, rootElement, logType));
+    .filter(precondition)
+    .map(getLogEntry.bind(/** thisArg */ null, rootElement, logType));
 }
 
 /**
@@ -227,7 +227,6 @@ function logEntryCompareFn(logEntryA, logEntryB) {
   }
 }
 
-
 /**
  * Gets a promise which yields a list of log entries for the specified element.
  * @param {!Element} rootElement
@@ -240,8 +239,7 @@ export function getLogEntries(rootElement) {
     return entries.concat(newEntries);
   }, []);
 
-  return Promise.all(logEntryPromises)
-      .then(logEntries => {
-        return logEntries.sort(logEntryCompareFn);
-      });
+  return Promise.all(logEntryPromises).then(logEntries => {
+    return logEntries.sort(logEntryCompareFn);
+  });
 }
diff --git a/extensions/amp-story/1.0/media-pool.js b/extensions/amp-story/1.0/media-pool.js
index 56b8ce59df2e..0c9f0e439cae 100644
--- a/extensions/amp-story/1.0/media-pool.js
+++ b/extensions/amp-story/1.0/media-pool.js
@@ -38,7 +38,6 @@ import {isExperimentOn} from '../../../src/experiments';
 import {toWin} from '../../../src/types';
 import {userInteractedWith} from '../../../src/video-interface';
 
-
 /** @const @enum {string} */
 export const MediaType = {
   UNSUPPORTED: 'unsupported',
@@ -89,31 +88,26 @@ let ElementTaskDef;
  */
 const PLACEHOLDER_ELEMENT_ID_PREFIX = 'i-amphtml-placeholder-media-';
 
-
 /**
  * @const {string}
  */
 const POOL_ELEMENT_ID_PREFIX = 'i-amphtml-pool-media-';
 
-
 /**
  * @const {string}
  */
 const POOL_MEDIA_ELEMENT_PROPERTY_NAME = '__AMP_MEDIA_POOL_ID__';
 
-
 /**
  * @const {string}
  */
 const ELEMENT_TASK_QUEUE_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_TASKS__';
 
-
 /**
  * @const {string}
  */
 const MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_ORIGIN__';
 
-
 /**
  * The name for a string attribute that represents the ID of a media element
  * that the element containing this attribute replaced.
@@ -121,19 +115,16 @@ const MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME = '__AMP_MEDIA_ELEMENT_ORIGIN__';
  */
 export const REPLACED_MEDIA_PROPERTY_NAME = 'replaced-media';
 
-
 /**
  * @type {!Object<string, !MediaPool>}
  */
 const instances = {};
 
-
 /**
  * @type {number}
  */
 let nextInstanceId = 0;
 
-
 /**
  * 🍹 MediaPool
  * Keeps a pool of N media elements to be shared across components.
@@ -207,12 +198,12 @@ export class MediaPool {
      * @private @const {!Object<!MediaType, string>}
      */
     this.defaultSources_ = {
-      [MediaType.AUDIO]:
-          isExperimentOn(win, 'disable-amp-story-default-media') ? '' :
-            BLANK_AUDIO_SRC,
-      [MediaType.VIDEO]:
-          isExperimentOn(win, 'disable-amp-story-default-media') ? '' :
-            BLANK_VIDEO_SRC,
+      [MediaType.AUDIO]: isExperimentOn(win, 'disable-amp-story-default-media')
+        ? ''
+        : BLANK_AUDIO_SRC,
+      [MediaType.VIDEO]: isExperimentOn(win, 'disable-amp-story-default-media')
+        ? ''
+        : BLANK_VIDEO_SRC,
     };
 
     /** @private {?Array<!AmpElement>} */
@@ -242,7 +233,6 @@ export class MediaPool {
     this.initializeMediaPool_(maxCounts);
   }
 
-
   /**
    * Fills the media pool by creating the maximum number of media elements for
    * each of the types of media elements.  We need to create these eagerly so
@@ -263,8 +253,10 @@ export class MediaPool {
         return;
       }
 
-      const ctor = devAssert(this.mediaFactory_[type],
-          `Factory for media type \`${type}\` unset.`);
+      const ctor = devAssert(
+        this.mediaFactory_[type],
+        `Factory for media type \`${type}\` unset.`
+      );
 
       // Cloning nodes is faster than building them.
       // Construct a seed media element as a small optimization.
@@ -277,14 +269,15 @@ export class MediaPool {
       // this optimization automatically. However, it skips it due to a
       // comparison with the itervar below, so we have to roll it by hand.
       for (let i = count; i > 0; i--) {
-        const mediaEl = /** @type {!PoolBoundElementDef} */
-            // Use seed element at end of set to prevent wasting it.
-            (i == 1 ? mediaElSeed : mediaElSeed.cloneNode(/* deep */ true));
+        // Use seed element at end of set to prevent wasting it.
+        const mediaEl =
+          /** @type {!PoolBoundElementDef} */ (i == 1
+            ? mediaElSeed
+            : mediaElSeed.cloneNode(/* deep */ true));
         const sources = this.getDefaultSource_(type);
         mediaEl.id = POOL_ELEMENT_ID_PREFIX + poolIdCounter++;
         mediaEl[MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME] = MediaElementOrigin.POOL;
-        this.enqueueMediaElementTask_(mediaEl,
-            new UpdateSourcesTask(sources));
+        this.enqueueMediaElementTask_(mediaEl, new UpdateSourcesTask(sources));
         // TODO(newmuis): Check the 'error' field to see if MEDIA_ERR_DECODE
         // is returned.  If so, we should adjust the pool size/distribution
         // between media types.
@@ -293,7 +286,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * @param {!MediaType} mediaType The media type whose source should be
    *     retrieved.
@@ -309,7 +301,6 @@ export class MediaPool {
     return new Sources(sourceStr);
   }
 
-
   /**
    * Comparison function that compares the distance of each element from the
    * current position in the document.
@@ -323,7 +314,6 @@ export class MediaPool {
     return distanceA < distanceB ? -1 : 1;
   }
 
-
   /**
    * @return {string} A unique ID.
    * @private
@@ -332,15 +322,16 @@ export class MediaPool {
     return PLACEHOLDER_ELEMENT_ID_PREFIX + this.placeholderIdCounter_++;
   }
 
-
   /**
    * @param {!DomElementDef} mediaElement
    * @return {boolean}
    * @private
    */
   isPoolMediaElement_(mediaElement) {
-    return mediaElement[MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME] ===
-        MediaElementOrigin.POOL;
+    return (
+      mediaElement[MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME] ===
+      MediaElementOrigin.POOL
+    );
   }
 
   /**
@@ -362,7 +353,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * Reserves an element of the specified type by removing it from the set of
    * unallocated elements and returning it.
@@ -374,7 +364,6 @@ export class MediaPool {
     return this.unallocated[mediaType].pop();
   }
 
-
   /**
    * Retrieves the media element from the pool that matches the specified
    * element, if one exists.
@@ -398,7 +387,6 @@ export class MediaPool {
     return allocatedEls[index];
   }
 
-
   /**
    * Allocates the specified media element of the specified type.
    * @param {!MediaType} mediaType The type of media element to allocate.
@@ -416,7 +404,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * Deallocates and returns the media element of the specified type furthest
    * from the current position in the document.
@@ -439,8 +426,10 @@ export class MediaPool {
     // played is further than the farthest allocated element.
     if (opt_elToAllocate) {
       const furthestEl = allocatedEls[allocatedEls.length - 1];
-      if (!furthestEl ||
-          this.distanceFn_(furthestEl) < this.distanceFn_(opt_elToAllocate)) {
+      if (
+        !furthestEl ||
+        this.distanceFn_(furthestEl) < this.distanceFn_(opt_elToAllocate)
+      ) {
         return null;
       }
     }
@@ -451,7 +440,6 @@ export class MediaPool {
     return poolMediaEl;
   }
 
-
   /**
    * Forcibly deallocates a specific media element, regardless of its distance
    * from the current position in the document.
@@ -462,8 +450,9 @@ export class MediaPool {
   forceDeallocateMediaElement_(poolMediaEl) {
     const mediaType = this.getMediaType_(poolMediaEl);
     const allocatedEls = this.allocated[mediaType];
-    const removeFromDom = isConnectedNode(poolMediaEl) ?
-      this.swapPoolMediaElementOutOfDom_(poolMediaEl) : Promise.resolve();
+    const removeFromDom = isConnectedNode(poolMediaEl)
+      ? this.swapPoolMediaElementOutOfDom_(poolMediaEl)
+      : Promise.resolve();
 
     return removeFromDom.then(() => {
       const index = allocatedEls.indexOf(poolMediaEl);
@@ -473,7 +462,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * Evicts an element of the specified type, replaces it in the DOM with the
    * original media element, and returns it.
@@ -485,8 +473,10 @@ export class MediaPool {
    * @private
    */
   evictMediaElement_(mediaType, opt_elToAllocate) {
-    const poolMediaEl =
-        this.deallocateMediaElement_(mediaType, opt_elToAllocate);
+    const poolMediaEl = this.deallocateMediaElement_(
+      mediaType,
+      opt_elToAllocate
+    );
     if (!poolMediaEl) {
       return null;
     }
@@ -495,7 +485,6 @@ export class MediaPool {
     return poolMediaEl;
   }
 
-
   /**
    * @param {!MediaType} mediaType The media type to check.
    * @param {!DomElementDef} domMediaEl The element to check.
@@ -511,7 +500,6 @@ export class MediaPool {
     return this.allocated[mediaType].indexOf(poolMediaEl) >= 0;
   }
 
-
   /**
    * Replaces a media element that was originally in the DOM with a media
    * element from the pool.
@@ -529,20 +517,25 @@ export class MediaPool {
     const ampMediaForDomEl = ampMediaElementFor(placeholderEl);
     poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME] = placeholderEl.id;
 
-    return this.enqueueMediaElementTask_(poolMediaEl,
-        new SwapIntoDomTask(placeholderEl))
-        .then(() => {
-          this.maybeResetAmpMedia_(ampMediaForPoolEl);
-          this.maybeResetAmpMedia_(ampMediaForDomEl);
-          this.enqueueMediaElementTask_(poolMediaEl,
-              new UpdateSourcesTask(sources));
-          this.enqueueMediaElementTask_(poolMediaEl, new LoadTask());
-        }, () => {
-          this.forceDeallocateMediaElement_(poolMediaEl);
-        });
+    return this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new SwapIntoDomTask(placeholderEl)
+    ).then(
+      () => {
+        this.maybeResetAmpMedia_(ampMediaForPoolEl);
+        this.maybeResetAmpMedia_(ampMediaForDomEl);
+        this.enqueueMediaElementTask_(
+          poolMediaEl,
+          new UpdateSourcesTask(sources)
+        );
+        this.enqueueMediaElementTask_(poolMediaEl, new LoadTask());
+      },
+      () => {
+        this.forceDeallocateMediaElement_(poolMediaEl);
+      }
+    );
   }
 
-
   /**
    * @param {?Element} componentEl
    * @private
@@ -564,7 +557,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * @param {!PoolBoundElementDef} poolMediaEl The element whose source should
    *     be reset.
@@ -575,11 +567,12 @@ export class MediaPool {
     const mediaType = this.getMediaType_(poolMediaEl);
     const defaultSources = this.getDefaultSource_(mediaType);
 
-    return this.enqueueMediaElementTask_(poolMediaEl,
-        new UpdateSourcesTask(defaultSources));
+    return this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new UpdateSourcesTask(defaultSources)
+    );
   }
 
-
   /**
    * Removes a pool media element from the DOM and replaces it with the video
    * that it originally replaced.
@@ -591,14 +584,17 @@ export class MediaPool {
    */
   swapPoolMediaElementOutOfDom_(poolMediaEl) {
     const placeholderElId = poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME];
-    const placeholderEl = /** @type {!PlaceholderElementDef} */ (
-      dev().assertElement(this.placeholderEls_[placeholderElId],
-          `No media element ${placeholderElId} to put back into DOM after` +
-          'eviction.'));
+    const placeholderEl = /** @type {!PlaceholderElementDef} */ (dev().assertElement(
+      this.placeholderEls_[placeholderElId],
+      `No media element ${placeholderElId} to put back into DOM after` +
+        'eviction.'
+    ));
     poolMediaEl[REPLACED_MEDIA_PROPERTY_NAME] = null;
 
-    const swapOutOfDom = this.enqueueMediaElementTask_(poolMediaEl,
-        new SwapOutOfDomTask(placeholderEl));
+    const swapOutOfDom = this.enqueueMediaElementTask_(
+      poolMediaEl,
+      new SwapOutOfDomTask(placeholderEl)
+    );
 
     this.resetPoolMediaElementSource_(poolMediaEl);
     return swapOutOfDom;
@@ -631,7 +627,6 @@ export class MediaPool {
     });
   }
 
-
   /**
    * Preloads the content of the specified media element in the DOM and returns
    * a media element that can be used in its stead for playback.
@@ -647,12 +642,15 @@ export class MediaPool {
     }
 
     const mediaType = this.getMediaType_(domMediaEl);
-    const existingPoolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const existingPoolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
     if (existingPoolMediaEl) {
       // The element being loaded already has an allocated media element.
       return Promise.resolve(
-          /** @type {!PoolBoundElementDef} */ (existingPoolMediaEl));
+        /** @type {!PoolBoundElementDef} */ (existingPoolMediaEl)
+      );
     }
 
     // Since this is not an existing pool media element, we can be certain that
@@ -660,11 +658,11 @@ export class MediaPool {
     const placeholderEl = /** @type {!PlaceholderElementDef} */ (domMediaEl);
 
     const sources = this.sources_[placeholderEl.id];
-    devAssert(sources instanceof Sources,
-        'Cannot play unregistered element.');
+    devAssert(sources instanceof Sources, 'Cannot play unregistered element.');
 
-    const poolMediaEl = this.reserveUnallocatedMediaElement_(mediaType) ||
-        this.evictMediaElement_(mediaType, placeholderEl);
+    const poolMediaEl =
+      this.reserveUnallocatedMediaElement_(mediaType) ||
+      this.evictMediaElement_(mediaType, placeholderEl);
 
     if (!poolMediaEl) {
       // If there is no space in the pool to allocate a new element, and no
@@ -674,12 +672,13 @@ export class MediaPool {
 
     this.allocateMediaElement_(mediaType, poolMediaEl);
 
-    return this
-        .swapPoolMediaElementIntoDom_(placeholderEl, poolMediaEl, sources)
-        .then(() => poolMediaEl);
+    return this.swapPoolMediaElementIntoDom_(
+      placeholderEl,
+      poolMediaEl,
+      sources
+    ).then(() => poolMediaEl);
   }
 
-
   /**
    * "Blesses" the specified media element for future playback without a user
    * gesture.  In order for this to bless the media element, this function must
@@ -696,7 +695,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new BlessTask());
   }
 
-
   /**
    * Registers the specified element to be usable by the media pool.  Elements
    * should be registered as early as possible, in order to prevent them from
@@ -723,7 +721,7 @@ export class MediaPool {
     // it is a placeholder element.
     const placeholderEl = /** @type {!PlaceholderElementDef} */ (domMediaEl);
     placeholderEl[MEDIA_ELEMENT_ORIGIN_PROPERTY_NAME] =
-        MediaElementOrigin.PLACEHOLDER;
+      MediaElementOrigin.PLACEHOLDER;
 
     const id = placeholderEl.id || this.createPlaceholderElementId_();
     if (this.sources_[id] && this.placeholderEls_[id]) {
@@ -755,7 +753,6 @@ export class MediaPool {
     this.ampElementsToBless_.push(element);
   }
 
-
   /**
    * Preloads the content of the specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element, found in the
@@ -770,7 +767,6 @@ export class MediaPool {
     return this.loadInternal_(domMediaEl).then();
   }
 
-
   /**
    * Plays the specified media element in the DOM by replacing it with a media
    * element from the pool and playing that.
@@ -779,17 +775,15 @@ export class MediaPool {
    *     element has been successfully played.
    */
   play(domMediaEl) {
-    return this.loadInternal_(domMediaEl)
-        .then(poolMediaEl => {
-          if (!poolMediaEl) {
-            return Promise.resolve();
-          }
+    return this.loadInternal_(domMediaEl).then(poolMediaEl => {
+      if (!poolMediaEl) {
+        return Promise.resolve();
+      }
 
-          return this.enqueueMediaElementTask_(poolMediaEl, new PlayTask());
-        });
+      return this.enqueueMediaElementTask_(poolMediaEl, new PlayTask());
+    });
   }
 
-
   /**
    * Pauses the specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element to be paused.
@@ -800,24 +794,27 @@ export class MediaPool {
    */
   pause(domMediaEl, rewindToBeginning = false) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
     }
 
-    return this.enqueueMediaElementTask_(poolMediaEl, new PauseTask())
-        .then(() => {
-          if (rewindToBeginning) {
-            this.enqueueMediaElementTask_(
-                /** @type {!PoolBoundElementDef} */ (poolMediaEl),
-                new SetCurrentTimeTask({currentTime: 0}));
-          }
-        });
+    return this.enqueueMediaElementTask_(poolMediaEl, new PauseTask()).then(
+      () => {
+        if (rewindToBeginning) {
+          this.enqueueMediaElementTask_(
+            /** @type {!PoolBoundElementDef} */ (poolMediaEl),
+            new SetCurrentTimeTask({currentTime: 0})
+          );
+        }
+      }
+    );
   }
 
-
   /**
    * Rewinds a specified media element in the DOM to 0.
    * @param {!DomElementDef} domMediaEl The media element to be rewound.
@@ -828,7 +825,6 @@ export class MediaPool {
     return this.setCurrentTime(domMediaEl, 0 /** currentTime */);
   }
 
-
   /**
    * Sets currentTime for a specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element.
@@ -838,18 +834,21 @@ export class MediaPool {
    */
   setCurrentTime(domMediaEl, currentTime) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
     }
 
     return this.enqueueMediaElementTask_(
-        poolMediaEl, new SetCurrentTimeTask({currentTime}));
+      poolMediaEl,
+      new SetCurrentTimeTask({currentTime})
+    );
   }
 
-
   /**
    * Mutes the specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element to be muted.
@@ -858,8 +857,10 @@ export class MediaPool {
    */
   mute(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
@@ -868,7 +869,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new MuteTask());
   }
 
-
   /**
    * Unmutes the specified media element in the DOM.
    * @param {!DomElementDef} domMediaEl The media element to be unmuted.
@@ -877,8 +877,10 @@ export class MediaPool {
    */
   unmute(domMediaEl) {
     const mediaType = this.getMediaType_(domMediaEl);
-    const poolMediaEl =
-        this.getMatchingMediaElementFromPool_(mediaType, domMediaEl);
+    const poolMediaEl = this.getMatchingMediaElementFromPool_(
+      mediaType,
+      domMediaEl
+    );
 
     if (!poolMediaEl) {
       return Promise.resolve();
@@ -887,7 +889,6 @@ export class MediaPool {
     return this.enqueueMediaElementTask_(poolMediaEl, new UnmuteTask());
   }
 
-
   /**
    * "Blesses" all media elements in the media pool for future playback without
    * a user gesture.  In order for this to bless the media elements, this
@@ -910,14 +911,16 @@ export class MediaPool {
       blessPromises.push(this.bless_(mediaEl));
     });
 
-    return Promise.all(blessPromises).then(() => {
-      this.blessed_ = true;
-    }, reason => {
-      dev().expectedError('AMP-STORY', 'Blessing all media failed: ', reason);
-    });
+    return Promise.all(blessPromises).then(
+      () => {
+        this.blessed_ = true;
+      },
+      reason => {
+        dev().expectedError('AMP-STORY', 'Blessing all media failed: ', reason);
+      }
+    );
   }
 
-
   /**
    * @param {!PoolBoundElementDef} mediaEl The element whose task queue should
    *     be executed.
@@ -932,13 +935,14 @@ export class MediaPool {
     const task = queue[0];
 
     const executionFn = () => {
-      task.execute(mediaEl)
-          .catch(reason => dev().error('AMP-STORY', reason))
-          .then(() => {
-            // Run regardless of success or failure of task execution.
-            queue.shift();
-            this.executeNextMediaElementTask_(mediaEl);
-          });
+      task
+        .execute(mediaEl)
+        .catch(reason => dev().error('AMP-STORY', reason))
+        .then(() => {
+          // Run regardless of success or failure of task execution.
+          queue.shift();
+          this.executeNextMediaElementTask_(mediaEl);
+        });
     };
 
     if (task.requiresSynchronousExecution()) {
@@ -948,7 +952,6 @@ export class MediaPool {
     }
   }
 
-
   /**
    * @param {!PoolBoundElementDef} mediaEl The element for which the specified
    *     task should be executed.
@@ -974,7 +977,6 @@ export class MediaPool {
     return task.whenComplete();
   }
 
-
   /**
    * @param {!MediaPoolRoot} root
    * @return {!MediaPool}
@@ -991,15 +993,15 @@ export class MediaPool {
     const newId = String(nextInstanceId++);
     element[POOL_MEDIA_ELEMENT_PROPERTY_NAME] = newId;
     instances[newId] = new MediaPool(
-        toWin(root.getElement().ownerDocument.defaultView),
-        root.getMaxMediaElementCounts(),
-        element => root.getElementDistance(element));
+      toWin(root.getElement().ownerDocument.defaultView),
+      root.getMaxMediaElementCounts(),
+      element => root.getElementDistance(element)
+    );
 
     return instances[newId];
   }
 }
 
-
 /**
  * Defines a common interface for elements that contain a MediaPool.
  *
@@ -1023,7 +1025,6 @@ export class MediaPoolRoot {
    */
   getElementDistance(unusedElement) {}
 
-
   /**
    * @return {!Object<!MediaType, number>} The maximum amount of each media
    *     type to allow within this element.
diff --git a/extensions/amp-story/1.0/media-tasks.js b/extensions/amp-story/1.0/media-tasks.js
index ef703becf38c..89fc78814707 100644
--- a/extensions/amp-story/1.0/media-tasks.js
+++ b/extensions/amp-story/1.0/media-tasks.js
@@ -18,8 +18,6 @@ import {Deferred, tryResolve} from '../../../src/utils/promise';
 import {Sources} from './sources';
 import {isConnectedNode} from '../../../src/dom';
 
-
-
 /**
  * The name for a boolean property on an element indicating whether that element
  * has already been "blessed".
@@ -27,7 +25,6 @@ import {isConnectedNode} from '../../../src/dom';
  */
 export const ELEMENT_BLESSED_PROPERTY_NAME = '__AMP_MEDIA_IS_BLESSED__';
 
-
 /**
  * CSS class names that should not be removed from an element when swapping it
  * into/out of the DOM.
@@ -39,20 +36,12 @@ const PROTECTED_CSS_CLASS_NAMES = [
   'i-amphtml-pool-video',
 ];
 
-
 /**
  * Attribute names that should not be removed from an element when swapping it
  * into/out of the DOM.
  * @const {!Array<string>}
  */
-const PROTECTED_ATTRIBUTES = [
-  'id',
-  'src',
-  'class',
-  'autoplay',
-];
-
-
+const PROTECTED_ATTRIBUTES = ['id', 'src', 'class', 'autoplay'];
 
 /**
  * Determines whether a CSS class name is allowed to be removed or copied from
@@ -66,7 +55,6 @@ function isProtectedCssClassName(cssClassName) {
   return PROTECTED_CSS_CLASS_NAMES.indexOf(cssClassName) >= 0;
 }
 
-
 /**
  * Determines whether an attribute is allowed to be removed or copied from
  * media elements.
@@ -79,7 +67,6 @@ function isProtectedAttributeName(attributeName) {
   return PROTECTED_ATTRIBUTES.indexOf(attributeName) >= 0;
 }
 
-
 /**
  * Copies all unprotected CSS classes from fromEl to toEl.
  * @param {!Element} fromEl The element from which CSS classes should
@@ -106,7 +93,6 @@ function copyCssClasses(fromEl, toEl) {
   }
 }
 
-
 /**
  * Copies all unprotected attributes from fromEl to toEl.
  * @param {!Element} fromEl The element from which attributes should
@@ -129,14 +115,13 @@ function copyAttributes(fromEl, toEl) {
 
   // Copy all of the unprotected attributes from the fromEl to the toEl.
   for (let i = 0; i < fromAttributes.length; i++) {
-    const {name: attributeName, value: attributeValue} = fromAttributes[i] ;
+    const {name: attributeName, value: attributeValue} = fromAttributes[i];
     if (!isProtectedAttributeName(attributeName)) {
       toEl.setAttribute(attributeName, attributeValue);
     }
   }
 }
 
-
 /**
  * Base class for tasks executed in order on HTMLMediaElements.
  */
@@ -186,8 +171,7 @@ export class MediaTask {
    *     execution.
    */
   execute(mediaEl) {
-    return this.executeInternal(mediaEl)
-        .then(this.resolve_, this.reject_);
+    return this.executeInternal(mediaEl).then(this.resolve_, this.reject_);
   }
 
   /**
@@ -216,7 +200,6 @@ export class MediaTask {
   }
 }
 
-
 /**
  * Plays the specified media element.
  */
@@ -243,7 +226,6 @@ export class PlayTask extends MediaTask {
   }
 }
 
-
 /**
  * Pauses the specified media element.
  */
@@ -262,7 +244,6 @@ export class PauseTask extends MediaTask {
   }
 }
 
-
 /**
  * Unmutes the specified media element.
  */
@@ -282,7 +263,6 @@ export class UnmuteTask extends MediaTask {
   }
 }
 
-
 /**
  * Mutes the specified media element.
  */
@@ -302,7 +282,6 @@ export class MuteTask extends MediaTask {
   }
 }
 
-
 /**
  * Seeks the specified media element to the provided time, in seconds.
  */
@@ -321,7 +300,6 @@ export class SetCurrentTimeTask extends MediaTask {
   }
 }
 
-
 /**
  * Loads the specified media element.
  */
@@ -340,7 +318,6 @@ export class LoadTask extends MediaTask {
   }
 }
 
-
 /**
  * "Blesses" the specified media element for future playback without a user
  * gesture.  In order for this to bless the media element, this function must
@@ -370,7 +347,6 @@ export class BlessTask extends MediaTask {
   }
 }
 
-
 /**
  * Updates the sources of the specified media element.
  */
@@ -394,7 +370,6 @@ export class UpdateSourcesTask extends MediaTask {
   }
 }
 
-
 /**
  * Swaps a media element into the DOM, in the place of a placeholder element.
  */
@@ -419,13 +394,14 @@ export class SwapIntoDomTask extends MediaTask {
 
     copyCssClasses(this.placeholderEl_, mediaEl);
     copyAttributes(this.placeholderEl_, mediaEl);
-    this.placeholderEl_.parentElement
-        .replaceChild(mediaEl, this.placeholderEl_);
+    this.placeholderEl_.parentElement.replaceChild(
+      mediaEl,
+      this.placeholderEl_
+    );
     return Promise.resolve();
   }
 }
 
-
 /**
  * Swaps a media element out the DOM, replacing it with a placeholder element.
  */
diff --git a/extensions/amp-story/1.0/navigation-state.js b/extensions/amp-story/1.0/navigation-state.js
index dbb87b7a4684..09f458f1c698 100644
--- a/extensions/amp-story/1.0/navigation-state.js
+++ b/extensions/amp-story/1.0/navigation-state.js
@@ -16,7 +16,6 @@
 import {Observable} from '../../../src/observable';
 import {StateProperty, getStoreService} from './amp-story-store-service';
 
-
 /**
  * Types of state changes that can be consumed.
  * @enum {number}
@@ -28,11 +27,9 @@ export const StateChangeType = {
   END: 3,
 };
 
-
 /** @typedef {{type: !StateChangeType, value: *}} */
 export let StateChangeEventDef;
 
-
 /**
  * State store to decouple navigation changes from consumers.
  */
@@ -88,8 +85,7 @@ export class NavigationState {
    * @param {boolean} isFinalPage
    * TODO(alanorozco): pass whether change was automatic or on user action.
    */
-  updateActivePage(
-    pageIndex, totalPages, pageId, previousPageId, isFinalPage) {
+  updateActivePage(pageIndex, totalPages, pageId, previousPageId, isFinalPage) {
     const changeValue = {
       pageIndex,
       pageId,
diff --git a/extensions/amp-story/1.0/page-advancement.js b/extensions/amp-story/1.0/page-advancement.js
index e5edfcdcb890..dbbf643ad82c 100644
--- a/extensions/amp-story/1.0/page-advancement.js
+++ b/extensions/amp-story/1.0/page-advancement.js
@@ -29,9 +29,7 @@ import {dev, user} from '../../../src/log';
 import {escapeCssSelectorIdent} from '../../../src/css';
 import {getAmpdoc} from '../../../src/service';
 import {hasTapAction, isMediaDisplayed, timeStrToMillis} from './utils';
-import {
-  interactiveElementsSelectors,
-} from './amp-story-embedded-component';
+import {interactiveElementsSelectors} from './amp-story-embedded-component';
 import {listen, listenOnce} from '../../../src/event-helper';
 import {toArray} from '../../../src/types';
 
@@ -45,7 +43,8 @@ const NEXT_SCREEN_AREA_RATIO = 0.75;
 const PREVIOUS_SCREEN_AREA_RATIO = 0.25;
 
 const INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS = Object.values(
-    interactiveElementsSelectors()).join(',');
+  interactiveElementsSelectors()
+).join(',');
 
 /** @const {number} */
 export const POLL_INTERVAL_MS = 300;
@@ -205,7 +204,6 @@ export class AdvancementConfig {
   }
 }
 
-
 /**
  * An AdvancementConfig implementation that composes multiple other
  * AdvancementConfig implementations by simply delegating all of its calls to
@@ -268,7 +266,6 @@ class MultipleAdvancementConfig extends AdvancementConfig {
   }
 }
 
-
 /**
  * Always provides a progress of 1.0.  Advances when the user taps the
  * corresponding section, depending on language settings.
@@ -298,8 +295,7 @@ class ManualAdvancement extends AdvancementConfig {
 
     if (element.ownerDocument.defaultView) {
       /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-      this.storeService_ =
-        getStoreService(element.ownerDocument.defaultView);
+      this.storeService_ = getStoreService(element.ownerDocument.defaultView);
     }
 
     const rtlState = this.storeService_.get(StateProperty.RTL_STATE);
@@ -307,16 +303,20 @@ class ManualAdvancement extends AdvancementConfig {
       // Width and navigation direction of each section depend on whether the
       // document is RTL or LTR.
       left: {
-        widthRatio: rtlState ?
-          NEXT_SCREEN_AREA_RATIO : PREVIOUS_SCREEN_AREA_RATIO,
-        direction: rtlState ?
-          TapNavigationDirection.NEXT : TapNavigationDirection.PREVIOUS,
+        widthRatio: rtlState
+          ? NEXT_SCREEN_AREA_RATIO
+          : PREVIOUS_SCREEN_AREA_RATIO,
+        direction: rtlState
+          ? TapNavigationDirection.NEXT
+          : TapNavigationDirection.PREVIOUS,
       },
       right: {
-        widthRatio: rtlState ?
-          PREVIOUS_SCREEN_AREA_RATIO : NEXT_SCREEN_AREA_RATIO,
-        direction: rtlState ?
-          TapNavigationDirection.PREVIOUS : TapNavigationDirection.NEXT,
+        widthRatio: rtlState
+          ? PREVIOUS_SCREEN_AREA_RATIO
+          : NEXT_SCREEN_AREA_RATIO,
+        direction: rtlState
+          ? TapNavigationDirection.PREVIOUS
+          : TapNavigationDirection.NEXT,
       },
     };
   }
@@ -331,13 +331,21 @@ class ManualAdvancement extends AdvancementConfig {
    * @private
    */
   startListening_() {
-    this.element_
-        .addEventListener('touchstart', this.onTouchstart_.bind(this), true);
-    this.element_
-        .addEventListener('touchend', this.onTouchend_.bind(this), true);
-    this.element_
-        .addEventListener(
-            'click', this.maybePerformNavigation_.bind(this), true);
+    this.element_.addEventListener(
+      'touchstart',
+      this.onTouchstart_.bind(this),
+      true
+    );
+    this.element_.addEventListener(
+      'touchend',
+      this.onTouchend_.bind(this),
+      true
+    );
+    this.element_.addEventListener(
+      'click',
+      this.maybePerformNavigation_.bind(this),
+      true
+    );
   }
 
   /**
@@ -376,17 +384,19 @@ class ManualAdvancement extends AdvancementConfig {
     // Cancels the navigation if user paused the story for over 500ms. Calling
     // preventDefault on the touchend event ensures the click/tap event won't
     // fire.
-    if ((Date.now() - this.touchstartTimestamp_) > HOLD_TOUCH_THRESHOLD_MS) {
+    if (Date.now() - this.touchstartTimestamp_ > HOLD_TOUCH_THRESHOLD_MS) {
       event.preventDefault();
     }
 
     this.storeService_.dispatch(Action.TOGGLE_PAUSED, false);
     this.touchstartTimestamp_ = null;
     this.timer_.cancel(this.timeoutId_);
-    if (!this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) &&
-    /** @type {InteractiveComponentDef} */ (this.storeService_.get(
-        StateProperty.INTERACTIVE_COMPONENT_STATE)).state !==
-        EmbeddedComponentState.EXPANDED) {
+    if (
+      !this.storeService_.get(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE) &&
+      /** @type {InteractiveComponentDef} */ (this.storeService_.get(
+        StateProperty.INTERACTIVE_COMPONENT_STATE
+      )).state !== EmbeddedComponentState.EXPANDED
+    ) {
       this.storeService_.dispatch(Action.TOGGLE_SYSTEM_UI_IS_VISIBLE, true);
     }
   }
@@ -400,9 +410,13 @@ class ManualAdvancement extends AdvancementConfig {
    * @private
    */
   isNavigationalClick_(event) {
-    return !closest(dev().assertElement(event.target), el => {
-      return hasTapAction(el);
-    }, /* opt_stopAt */ this.element_);
+    return !closest(
+      dev().assertElement(event.target),
+      el => {
+        return hasTapAction(el);
+      },
+      /* opt_stopAt */ this.element_
+    );
   }
 
   /**
@@ -413,14 +427,18 @@ class ManualAdvancement extends AdvancementConfig {
    * @private
    */
   isProtectedTarget_(event) {
-    return !!closest(dev().assertElement(event.target), el => {
-      const elementRole = el.getAttribute('role');
-
-      if (elementRole) {
-        return !!TAPPABLE_ARIA_ROLES[elementRole.toLowerCase()];
-      }
-      return false;
-    }, /* opt_stopAt */ this.element_);
+    return !!closest(
+      dev().assertElement(event.target),
+      el => {
+        const elementRole = el.getAttribute('role');
+
+        if (elementRole) {
+          return !!TAPPABLE_ARIA_ROLES[elementRole.toLowerCase()];
+        }
+        return false;
+      },
+      /* opt_stopAt */ this.element_
+    );
   }
 
   /**
@@ -434,20 +452,24 @@ class ManualAdvancement extends AdvancementConfig {
     let shouldHandleEvent = false;
     let tagName;
 
-    closest(dev().assertElement(event.target), el => {
-      tagName = el.tagName.toLowerCase();
-      if (tagName === 'amp-story-page-attachment') {
-        shouldHandleEvent = false;
-        return true;
-      }
+    closest(
+      dev().assertElement(event.target),
+      el => {
+        tagName = el.tagName.toLowerCase();
+        if (tagName === 'amp-story-page-attachment') {
+          shouldHandleEvent = false;
+          return true;
+        }
 
-      if (tagName === 'amp-story-page') {
-        shouldHandleEvent = true;
-        return true;
-      }
+        if (tagName === 'amp-story-page') {
+          shouldHandleEvent = true;
+          return true;
+        }
 
-      return false;
-    }, /* opt_stopAt */ this.element_);
+        return false;
+      },
+      /* opt_stopAt */ this.element_
+    );
 
     return shouldHandleEvent;
   }
@@ -463,17 +485,23 @@ class ManualAdvancement extends AdvancementConfig {
     let valid = true;
     let tagName;
 
-    return !!closest(dev().assertElement(event.target), el => {
-      tagName = el.tagName.toLowerCase();
+    return !!closest(
+      dev().assertElement(event.target),
+      el => {
+        tagName = el.tagName.toLowerCase();
 
-      if (tagName === 'amp-story-cta-layer' ||
-          tagName === 'amp-story-page-attachment') {
-        valid = false;
-        return false;
-      }
+        if (
+          tagName === 'amp-story-cta-layer' ||
+          tagName === 'amp-story-page-attachment'
+        ) {
+          valid = false;
+          return false;
+        }
 
-      return tagName === 'amp-story-page' && valid;
-    }, /* opt_stopAt */ this.element_);
+        return tagName === 'amp-story-page' && valid;
+      },
+      /* opt_stopAt */ this.element_
+    );
   }
 
   /**
@@ -485,13 +513,16 @@ class ManualAdvancement extends AdvancementConfig {
   maybePerformNavigation_(event) {
     const target = dev().assertElement(event.target);
 
-    if (this.canShowTooltip_(event) &&
-      matches(target, INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS)) {
+    if (
+      this.canShowTooltip_(event) &&
+      matches(target, INTERACTIVE_EMBEDDED_COMPONENTS_SELECTORS)
+    ) {
       // Clicked element triggers a tooltip, so we dispatch the corresponding
       // event and skip navigation.
       event.preventDefault();
-      const embedComponent = /** @type {InteractiveComponentDef} */
-        (this.storeService_.get(StateProperty.INTERACTIVE_COMPONENT_STATE));
+      const embedComponent = /** @type {InteractiveComponentDef} */ (this.storeService_.get(
+        StateProperty.INTERACTIVE_COMPONENT_STATE
+      ));
       this.storeService_.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, {
         element: target,
         state: embedComponent.state || EmbeddedComponentState.FOCUSED,
@@ -501,10 +532,12 @@ class ManualAdvancement extends AdvancementConfig {
       return;
     }
 
-    if (!this.isRunning() ||
+    if (
+      !this.isRunning() ||
       !this.isNavigationalClick_(event) ||
       this.isProtectedTarget_(event) ||
-      !this.shouldHandleEvent_(event)) {
+      !this.shouldHandleEvent_(event)
+    ) {
       // If the system doesn't need to handle this click, then we can simply
       // return and let the event propagate as it would have otherwise.
       return;
@@ -513,13 +546,15 @@ class ManualAdvancement extends AdvancementConfig {
     event.stopPropagation();
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.MANUAL_ADVANCE);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.MANUAL_ADVANCE
+    );
 
-    const pageRect = this.element_./*OK*/getBoundingClientRect();
+    const pageRect = this.element_./*OK*/ getBoundingClientRect();
 
     // Using `left` as a fallback since Safari returns a ClientRect in some
     // cases.
-    const offsetLeft = ('x' in pageRect) ? pageRect.x : pageRect.left;
+    const offsetLeft = 'x' in pageRect ? pageRect.x : pageRect.left;
 
     const page = {
       // Offset starting left of the page.
@@ -542,7 +577,7 @@ class ManualAdvancement extends AdvancementConfig {
   getTapDirection_(page) {
     const {left, right} = this.sections_;
 
-    if (page.clickEventX <= page.offset + (left.widthRatio * page.width)) {
+    if (page.clickEventX <= page.offset + left.widthRatio * page.width) {
       return left.direction;
     }
 
@@ -594,8 +629,7 @@ class TimeBasedAdvancement extends AdvancementConfig {
 
     if (element.ownerDocument.defaultView) {
       /** @private @const {!./amp-story-store-service.AmpStoryStoreService} */
-      this.storeService_ =
-        getStoreService(element.ownerDocument.defaultView);
+      this.storeService_ = getStoreService(element.ownerDocument.defaultView);
     }
   }
 
@@ -612,18 +646,22 @@ class TimeBasedAdvancement extends AdvancementConfig {
     super.start();
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.AUTO_ADVANCE_TIME);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.AUTO_ADVANCE_TIME
+    );
 
     if (this.remainingDelayMs_) {
       this.startTimeMs_ =
-          this.getCurrentTimestampMs_() -
-              (this.delayMs_ - this.remainingDelayMs_);
+        this.getCurrentTimestampMs_() -
+        (this.delayMs_ - this.remainingDelayMs_);
     } else {
       this.startTimeMs_ = this.getCurrentTimestampMs_();
     }
 
     this.timeoutId_ = this.timer_.delay(
-        () => this.onAdvance(), this.remainingDelayMs_ || this.delayMs_);
+      () => this.onAdvance(),
+      this.remainingDelayMs_ || this.delayMs_
+    );
 
     this.onProgressUpdate();
 
@@ -643,9 +681,9 @@ class TimeBasedAdvancement extends AdvancementConfig {
 
     // Store the remaining time if the advancement can be resume, ie: if it is
     // paused.
-    this.remainingDelayMs_ = canResume ?
-      this.startTimeMs_ + this.delayMs_ - this.getCurrentTimestampMs_() :
-      null;
+    this.remainingDelayMs_ = canResume
+      ? this.startTimeMs_ + this.delayMs_ - this.getCurrentTimestampMs_()
+      : null;
   }
 
   /** @override */
@@ -655,7 +693,7 @@ class TimeBasedAdvancement extends AdvancementConfig {
     }
 
     const progress =
-        (this.getCurrentTimestampMs_() - this.startTimeMs_) / this.delayMs_;
+      (this.getCurrentTimestampMs_() - this.startTimeMs_) / this.delayMs_;
 
     return Math.min(Math.max(progress, 0), 1);
   }
@@ -685,7 +723,6 @@ class TimeBasedAdvancement extends AdvancementConfig {
   }
 }
 
-
 /**
  * Provides progress and advances pages based on the completion percentage of
  * playback of an HTMLMediaElement or a video that implements the AMP
@@ -805,8 +842,10 @@ class MediaBasedAdvancement extends AdvancementConfig {
 
     if (this.element_ instanceof HTMLMediaElement) {
       return this.element_;
-    } else if (this.element_.hasAttribute('background-audio') &&
-        (tagName === 'amp-story' || tagName === 'amp-story-page')) {
+    } else if (
+      this.element_.hasAttribute('background-audio') &&
+      (tagName === 'amp-story' || tagName === 'amp-story-page')
+    ) {
       return this.element_.querySelector('.i-amphtml-story-background-audio');
     } else if (tagName === 'amp-audio') {
       return this.element_.querySelector('audio');
@@ -827,11 +866,15 @@ class MediaBasedAdvancement extends AdvancementConfig {
     }
 
     // Prevents race condition when checking for video interface classname.
-    (this.element_.whenBuilt ? this.element_.whenBuilt() : Promise.resolve())
-        .then(() => this.startWhenBuilt_());
+    (this.element_.whenBuilt
+      ? this.element_.whenBuilt()
+      : Promise.resolve()
+    ).then(() => this.startWhenBuilt_());
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.AUTO_ADVANCE_MEDIA);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.AUTO_ADVANCE_MEDIA
+    );
   }
 
   /** @private */
@@ -850,19 +893,25 @@ class MediaBasedAdvancement extends AdvancementConfig {
       return;
     }
 
-    user().error('AMP-STORY-PAGE',
-        `Element with ID ${this.element_.id} is not a media element ` +
-        'supported for automatic advancement.');
+    user().error(
+      'AMP-STORY-PAGE',
+      `Element with ID ${this.element_.id} is not a media element ` +
+        'supported for automatic advancement.'
+    );
   }
 
   /** @private */
   startHtmlMediaElement_() {
-    const mediaElement = dev().assertElement(this.mediaElement_,
-        'Media element was unspecified.');
+    const mediaElement = dev().assertElement(
+      this.mediaElement_,
+      'Media element was unspecified.'
+    );
     this.unlistenFns_.push(
-        listenOnce(mediaElement, 'ended', () => this.onAdvance()));
+      listenOnce(mediaElement, 'ended', () => this.onAdvance())
+    );
     this.unlistenFns_.push(
-        listenOnce(mediaElement, 'timeupdate', () => this.onProgressUpdate()));
+      listenOnce(mediaElement, 'timeupdate', () => this.onProgressUpdate())
+    );
   }
 
   /** @private */
@@ -872,8 +921,10 @@ class MediaBasedAdvancement extends AdvancementConfig {
     });
 
     this.unlistenFns_.push(
-        listenOnce(this.element_, VideoEvents.ENDED, () => this.onAdvance(),
-            {capture: true}));
+      listenOnce(this.element_, VideoEvents.ENDED, () => this.onAdvance(), {
+        capture: true,
+      })
+    );
 
     this.onProgressUpdate();
 
@@ -920,8 +971,9 @@ class MediaBasedAdvancement extends AdvancementConfig {
   static fromAutoAdvanceString(autoAdvanceStr, win, rootEl) {
     try {
       const elements = rootEl.querySelectorAll(
-          `[data-id=${escapeCssSelectorIdent(autoAdvanceStr)}],
-          #${escapeCssSelectorIdent(autoAdvanceStr)}`);
+        `[data-id=${escapeCssSelectorIdent(autoAdvanceStr)}],
+          #${escapeCssSelectorIdent(autoAdvanceStr)}`
+      );
       if (!elements.length) {
         return null;
       }
diff --git a/extensions/amp-story/1.0/pagination-buttons.js b/extensions/amp-story/1.0/pagination-buttons.js
index 159611ab7bc7..7d0754d42348 100644
--- a/extensions/amp-story/1.0/pagination-buttons.js
+++ b/extensions/amp-story/1.0/pagination-buttons.js
@@ -24,11 +24,9 @@ import {devAssert} from '../../../src/log';
 import {dict} from './../../../src/utils/object';
 import {renderAsElement} from './simple-template';
 
-
 /** @struct @typedef {{className: string, triggers: (string|undefined)}} */
 let ButtonStateDef;
 
-
 /** @const {!Object<string, !ButtonStateDef>} */
 const BackButtonStates = {
   CLOSE_BOOKEND: {
@@ -43,7 +41,6 @@ const BackButtonStates = {
   },
 };
 
-
 /** @const {!Object<string, !ButtonStateDef>} */
 const ForwardButtonStates = {
   HIDDEN: {className: 'i-amphtml-story-button-hidden'},
@@ -62,7 +59,6 @@ const ForwardButtonStates = {
   },
 };
 
-
 /** @private @const {!./simple-template.ElementDef} */
 const BUTTON = {
   tag: 'div',
@@ -79,7 +75,6 @@ const BUTTON = {
   ],
 };
 
-
 /**
  * @param {!Element} hoverEl
  * @param {!Element} targetEl
@@ -94,7 +89,6 @@ function setClassOnHover(hoverEl, targetEl, className) {
   });
 }
 
-
 /**
  * Desktop navigation buttons.
  */
@@ -148,11 +142,18 @@ class PaginationButton {
     e.preventDefault();
 
     this.storeService_.dispatch(
-        Action.SET_ADVANCEMENT_MODE, AdvancementMode.MANUAL_ADVANCE);
+      Action.SET_ADVANCEMENT_MODE,
+      AdvancementMode.MANUAL_ADVANCE
+    );
 
     if (this.state_.triggers) {
-      dispatch(this.win_, this.element, devAssert(this.state_.triggers),
-          /* payload */ undefined, {bubbles: true});
+      dispatch(
+        this.win_,
+        this.element,
+        devAssert(this.state_.triggers),
+        /* payload */ undefined,
+        {bubbles: true}
+      );
       return;
     }
     if (this.state_.action) {
@@ -162,7 +163,6 @@ class PaginationButton {
   }
 }
 
-
 /** Pagination buttons layer. */
 export class PaginationButtons {
   /**
@@ -174,14 +174,20 @@ export class PaginationButtons {
     this.storeService_ = getStoreService(win);
 
     /** @private @const {!PaginationButton} */
-    this.forwardButton_ =
-        new PaginationButton(doc, ForwardButtonStates.NEXT_PAGE,
-            this.storeService_, win);
+    this.forwardButton_ = new PaginationButton(
+      doc,
+      ForwardButtonStates.NEXT_PAGE,
+      this.storeService_,
+      win
+    );
 
     /** @private @const {!PaginationButton} */
-    this.backButton_ =
-        new PaginationButton(doc, BackButtonStates.HIDDEN,
-            this.storeService_, win);
+    this.backButton_ = new PaginationButton(
+      doc,
+      BackButtonStates.HIDDEN,
+      this.storeService_,
+      win
+    );
 
     this.forwardButton_.element.classList.add('next-container');
     this.backButton_.element.classList.add('prev-container');
@@ -210,10 +216,16 @@ export class PaginationButtons {
   /** @param {!Element} element */
   attach(element) {
     setClassOnHover(
-        this.forwardButton_.element, element, 'i-amphtml-story-next-hover');
+      this.forwardButton_.element,
+      element,
+      'i-amphtml-story-next-hover'
+    );
 
     setClassOnHover(
-        this.backButton_.element, element, 'i-amphtml-story-prev-hover');
+      this.backButton_.element,
+      element,
+      'i-amphtml-story-prev-hover'
+    );
 
     element.appendChild(this.forwardButton_.element);
     element.appendChild(this.backButton_.element);
@@ -227,15 +239,19 @@ export class PaginationButtons {
       this.onBookendStateUpdate_(isActive);
     });
 
-    this.storeService_.subscribe(StateProperty.CURRENT_PAGE_INDEX,
-        pageIndex => {
-          this.onCurrentPageIndexUpdate_(pageIndex);
-        });
-
-    this.storeService_.subscribe(StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
-        isVisible => {
-          this.onSystemUiIsVisibleStateUpdate_(isVisible);
-        });
+    this.storeService_.subscribe(
+      StateProperty.CURRENT_PAGE_INDEX,
+      pageIndex => {
+        this.onCurrentPageIndexUpdate_(pageIndex);
+      }
+    );
+
+    this.storeService_.subscribe(
+      StateProperty.SYSTEM_UI_IS_VISIBLE_STATE,
+      isVisible => {
+        this.onSystemUiIsVisibleStateUpdate_(isVisible);
+      }
+    );
   }
 
   /**
@@ -257,8 +273,9 @@ export class PaginationButtons {
    * @private
    */
   onCurrentPageIndexUpdate_(pageIndex) {
-    const totalPages =
-      /**@type {number}*/ (this.storeService_.get(StateProperty.PAGES_COUNT));
+    const totalPages = /**@type {number}*/ (this.storeService_.get(
+      StateProperty.PAGES_COUNT
+    ));
     const bookendActive = this.storeService_.get(StateProperty.BOOKEND_STATE);
 
     if (pageIndex === 0) {
@@ -293,10 +310,16 @@ export class PaginationButtons {
    */
   onSystemUiIsVisibleStateUpdate_(isVisible) {
     if (isVisible) {
-      this.backButton_.updateState(/** @type {!ButtonStateDef} */ (
-        devAssert(this.backButtonStateToRestore_)));
-      this.forwardButton_.updateState(/** @type {!ButtonStateDef} */ (
-        devAssert(this.forwardButtonStateToRestore_)));
+      this.backButton_.updateState(
+        /** @type {!ButtonStateDef} */ (devAssert(
+          this.backButtonStateToRestore_
+        ))
+      );
+      this.forwardButton_.updateState(
+        /** @type {!ButtonStateDef} */ (devAssert(
+          this.forwardButtonStateToRestore_
+        ))
+      );
     } else {
       this.backButtonStateToRestore_ = this.backButton_.getState();
       this.backButton_.updateState(BackButtonStates.HIDDEN);
diff --git a/extensions/amp-story/1.0/progress-bar.js b/extensions/amp-story/1.0/progress-bar.js
index e47fe734ac7e..f1889781db59 100644
--- a/extensions/amp-story/1.0/progress-bar.js
+++ b/extensions/amp-story/1.0/progress-bar.js
@@ -21,7 +21,6 @@ import {hasOwn, map} from '../../../src/utils/object';
 import {scale, setImportantStyles} from '../../../src/style';
 import {scopedQuerySelector} from '../../../src/dom';
 
-
 /**
  * Transition used to show the progress of a media. Has to be linear so the
  * animation is smooth and constant.
@@ -35,7 +34,6 @@ const TRANSITION_LINEAR = `transform ${POLL_INTERVAL_MS}ms linear`;
  */
 const TRANSITION_EASE = 'transform 200ms ease';
 
-
 /**
  * Progress bar for <amp-story>.
  */
@@ -91,7 +89,7 @@ export class ProgressBar {
     this.isBuilt_ = true;
     this.segmentCount_ = segmentCount;
 
-    segmentIds.forEach((id, i) => this.segmentIdMap_[id] = i);
+    segmentIds.forEach((id, i) => (this.segmentIdMap_[id] = i));
 
     this.root_ = this.win_.document.createElement('ol');
     this.root_.classList.add('i-amphtml-story-progress-bar');
@@ -120,8 +118,10 @@ export class ProgressBar {
    * @private
    */
   assertVaildSegmentId_(segmentId) {
-    devAssert(hasOwn(this.segmentIdMap_, segmentId),
-        'Invalid segment-id passed to progress-bar');
+    devAssert(
+      hasOwn(this.segmentIdMap_, segmentId),
+      'Invalid segment-id passed to progress-bar'
+    );
   }
 
   /**
@@ -140,10 +140,11 @@ export class ProgressBar {
     // bar segments.
     if (this.activeSegmentIndex_ !== segmentIndex) {
       this.updateSegments_(
-          segmentIndex,
-          progress,
-          this.activeSegmentIndex_,
-          this.activeSegmentProgress_);
+        segmentIndex,
+        progress,
+        this.activeSegmentIndex_,
+        this.activeSegmentProgress_
+      );
     }
 
     this.activeSegmentProgress_ = progress;
@@ -163,7 +164,8 @@ export class ProgressBar {
     activeSegmentIndex,
     activeSegmentProgress,
     prevSegmentIndex,
-    prevSegmentProgress) {
+    prevSegmentProgress
+  ) {
     let shouldAnimatePreviousSegment = false;
 
     // Animating the transition from one full segment to another, which is the
@@ -194,8 +196,9 @@ export class ProgressBar {
       const progress = i < activeSegmentIndex ? 1 : 0;
 
       // Only animate the segment corresponding to the previous page, if needed.
-      const withTransition =
-          shouldAnimatePreviousSegment ? (i === prevSegmentIndex) : false;
+      const withTransition = shouldAnimatePreviousSegment
+        ? i === prevSegmentIndex
+        : false;
 
       this.updateProgressByIndex_(i, progress, withTransition);
     }
@@ -213,17 +216,20 @@ export class ProgressBar {
     // Offset the index by 1, since nth-child indices start at 1 while
     // JavaScript indices start at 0.
     const nthChildIndex = segmentIndex + 1;
-    const progressEl = scopedQuerySelector(this.getRoot(),
-        `.i-amphtml-story-page-progress-bar:nth-child(${
-          escapeCssSelectorNth(nthChildIndex)
-        }) .i-amphtml-story-page-progress-value`);
+    const progressEl = scopedQuerySelector(
+      this.getRoot(),
+      `.i-amphtml-story-page-progress-bar:nth-child(${escapeCssSelectorNth(
+        nthChildIndex
+      )}) .i-amphtml-story-page-progress-value`
+    );
     this.vsync_.mutate(() => {
       let transition = 'none';
       if (withTransition) {
         // Using an eased transition only if filling the bar to 0 or 1.
         transition =
-            (progress === 1 || progress === 0) ?
-              TRANSITION_EASE : TRANSITION_LINEAR;
+          progress === 1 || progress === 0
+            ? TRANSITION_EASE
+            : TRANSITION_LINEAR;
       }
       setImportantStyles(dev().assertElement(progressEl), {
         'transform': scale(`${progress},1`),
diff --git a/extensions/amp-story/1.0/simple-template.js b/extensions/amp-story/1.0/simple-template.js
index a97bda1c7d86..7250dce7584f 100644
--- a/extensions/amp-story/1.0/simple-template.js
+++ b/extensions/amp-story/1.0/simple-template.js
@@ -20,7 +20,6 @@ import {devAssert} from '../../../src/log';
 import {hasOwn} from '../../../src/utils/object';
 import {isArray, toWin} from '../../../src/types';
 
-
 /**
  * @typedef {{
  *   tag: string,
@@ -32,7 +31,6 @@ import {isArray, toWin} from '../../../src/types';
  */
 export let ElementDef;
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef|!Array<!ElementDef>} elementsDef
@@ -45,7 +43,6 @@ export function renderSimpleTemplate(doc, elementsDef) {
   return renderSingle(doc, /** @type {!ElementDef} */ (elementsDef));
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef} elementDef
@@ -55,7 +52,6 @@ export function renderAsElement(doc, elementDef) {
   return renderSingle(doc, elementDef);
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!Array<!ElementDef>} elementsDef
@@ -64,30 +60,32 @@ export function renderAsElement(doc, elementDef) {
 function renderMulti(doc, elementsDef) {
   const fragment = doc.createDocumentFragment();
   elementsDef.forEach(elementDef =>
-    fragment.appendChild(renderSingle(doc, elementDef)));
+    fragment.appendChild(renderSingle(doc, elementDef))
+  );
   return fragment;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {!ElementDef} elementDef
  * @return {!Element}
  */
 function renderSingle(doc, elementDef) {
-  const el = hasOwn(elementDef, 'attrs') ?
-    createElementWithAttributes(doc, elementDef.tag,
-        /** @type {!JsonObject} */ (elementDef.attrs)) :
-    doc.createElement(elementDef.tag);
+  const el = hasOwn(elementDef, 'attrs')
+    ? createElementWithAttributes(
+        doc,
+        elementDef.tag,
+        /** @type {!JsonObject} */ (elementDef.attrs)
+      )
+    : doc.createElement(elementDef.tag);
 
   if (hasOwn(elementDef, 'localizedStringId')) {
     const win = toWin(doc.defaultView);
     Services.localizationServiceForOrNull(win).then(localizationService => {
-      devAssert(localizationService,
-          'Could not retrieve LocalizationService.');
-      el.textContent = localizationService
-          .getLocalizedString(/** @type {!LocalizedStringId} */ (
-            elementDef.localizedStringId));
+      devAssert(localizationService, 'Could not retrieve LocalizationService.');
+      el.textContent = localizationService.getLocalizedString(
+        /** @type {!LocalizedStringId} */ (elementDef.localizedStringId)
+      );
     });
   }
 
@@ -96,8 +94,9 @@ function renderSingle(doc, elementDef) {
   }
 
   if (hasOwn(elementDef, 'children')) {
-    el.appendChild(renderMulti(doc,
-        /** @type {!Array<!ElementDef>} */ (elementDef.children)));
+    el.appendChild(
+      renderMulti(doc, /** @type {!Array<!ElementDef>} */ (elementDef.children))
+    );
   }
 
   return el;
diff --git a/extensions/amp-story/1.0/sources.js b/extensions/amp-story/1.0/sources.js
index 02dda8f62a0b..c6b131f33c6f 100644
--- a/extensions/amp-story/1.0/sources.js
+++ b/extensions/amp-story/1.0/sources.js
@@ -17,8 +17,6 @@
 import {ampMediaElementFor} from './utils';
 import {removeElement} from '../../../src/dom';
 
-
-
 /**
  * Class handling HTMLMediaElements sources.
  */
@@ -41,7 +39,6 @@ export class Sources {
     this.trackEls_ = opt_trackEls || [];
   }
 
-
   /**
    * Applies track tags to a specified element. This is done in a separate
    * method from the source tags, because we must wait for "loadedmetadata"
@@ -67,7 +64,6 @@ export class Sources {
     });
   }
 
-
   /**
    * Applies the src attribute and source tags to a specified element.
    * @param {!HTMLMediaElement} element The element to adopt the sources
@@ -82,8 +78,9 @@ export class Sources {
       element.setAttribute('src', this.srcAttr_);
     }
 
-    Array.prototype.forEach.call(this.srcEls_,
-        srcEl => element.appendChild(srcEl));
+    Array.prototype.forEach.call(this.srcEls_, srcEl =>
+      element.appendChild(srcEl)
+    );
 
     if (this.trackEls_.length > 0) {
       // Wait for "loadedmetadata" before adding tracks.
@@ -102,7 +99,6 @@ export class Sources {
     }
   }
 
-
   /**
    * Removes and returns the sources from a specified element.
    * @param {!Element} element The element whose sources should be removed and
diff --git a/extensions/amp-story/1.0/story-analytics.js b/extensions/amp-story/1.0/story-analytics.js
index 22b0abf767e5..bee452e1cf1a 100644
--- a/extensions/amp-story/1.0/story-analytics.js
+++ b/extensions/amp-story/1.0/story-analytics.js
@@ -19,7 +19,6 @@ import {dev} from '../../../src/log';
 import {registerServiceBuilder} from '../../../src/service';
 import {triggerAnalyticsEvent} from '../../../src/analytics';
 
-
 /** @enum {string} */
 export const StoryEventType = {
   PAGE_VISIBLE: 'story-page-visible',
@@ -94,8 +93,9 @@ export class StoryAnalyticsService {
    * @param {boolean} isMuted
    */
   onMutedStateChange(isMuted) {
-    const event = isMuted ? StoryEventType.STORY_MUTED :
-      StoryEventType.STORY_UNMUTED;
+    const event = isMuted
+      ? StoryEventType.STORY_MUTED
+      : StoryEventType.STORY_UNMUTED;
     this.triggerEvent_(event);
   }
 
@@ -106,11 +106,16 @@ export class StoryAnalyticsService {
   triggerEvent_(eventType) {
     const variablesPromise = Services.storyVariableServiceForOrNull(this.win_);
     variablesPromise.then(
-        variables => {
-          triggerAnalyticsEvent(this.element_, eventType,
-              /** @type {!JsonObject} */ (variables)); },
-        reason => {
-          dev().error('AMP-STORY', 'Could not get analytics variables', reason);
-        });
+      variables => {
+        triggerAnalyticsEvent(
+          this.element_,
+          eventType,
+          /** @type {!JsonObject} */ (variables)
+        );
+      },
+      reason => {
+        dev().error('AMP-STORY', 'Could not get analytics variables', reason);
+      }
+    );
   }
 }
diff --git a/extensions/amp-story/1.0/test/test-amp-story-access.js b/extensions/amp-story/1.0/test/test-amp-story-access.js
index e441e8b5c309..030c6791324a 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-access.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-access.js
@@ -67,12 +67,13 @@ describes.realWin('amp-story-access', {amp: true}, env => {
 
     // Publisher provided button is no longer a child of <amp-story-access>.
     expect(
-        storyAccess.element
-            .querySelector('amp-story-access > .subscribe-button')).to.be.null;
+      storyAccess.element.querySelector('amp-story-access > .subscribe-button')
+    ).to.be.null;
 
     // But has been copied in the drawer.
-    const buttonInDrawerEl = storyAccess.element
-        .querySelector('.i-amphtml-story-access-content > .subscribe-button');
+    const buttonInDrawerEl = storyAccess.element.querySelector(
+      '.i-amphtml-story-access-content > .subscribe-button'
+    );
     expect(buttonInDrawerEl).to.exist;
   });
 
@@ -82,8 +83,9 @@ describes.realWin('amp-story-access', {amp: true}, env => {
     storeService.dispatch(Action.TOGGLE_ACCESS, true);
 
     win.requestAnimationFrame(() => {
-      expect(storyAccess.element)
-          .to.have.class('i-amphtml-story-access-visible');
+      expect(storyAccess.element).to.have.class(
+        'i-amphtml-story-access-visible'
+      );
       done();
     });
   });
@@ -98,8 +100,9 @@ describes.realWin('amp-story-access', {amp: true}, env => {
     });
 
     win.requestAnimationFrame(() => {
-      expect(storyAccess.element)
-          .to.have.class('i-amphtml-story-access-visible');
+      expect(storyAccess.element).to.have.class(
+        'i-amphtml-story-access-visible'
+      );
       done();
     });
   });
@@ -107,8 +110,9 @@ describes.realWin('amp-story-access', {amp: true}, env => {
   it('should whitelist the default <amp-access> actions', () => {
     storyAccess.buildCallback();
 
-    const actions =
-        storyAccess.storeService_.get(StateProperty.ACTIONS_WHITELIST);
+    const actions = storyAccess.storeService_.get(
+      StateProperty.ACTIONS_WHITELIST
+    );
     expect(actions).to.deep.contain({tagOrTarget: 'SCRIPT', method: 'login'});
   });
 
@@ -121,12 +125,17 @@ describes.realWin('amp-story-access', {amp: true}, env => {
 
     storyAccess.buildCallback();
 
-    const actions =
-        storyAccess.storeService_.get(StateProperty.ACTIONS_WHITELIST);
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-typefoo'});
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-typebar'});
+    const actions = storyAccess.storeService_.get(
+      StateProperty.ACTIONS_WHITELIST
+    );
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-typefoo',
+    });
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-typebar',
+    });
   });
 
   it('should whitelist the namespaced and default <amp-access> actions', () => {
@@ -136,36 +145,49 @@ describes.realWin('amp-story-access', {amp: true}, env => {
     storyAccess.buildCallback();
 
     // Both namespaced and default actions are allowed.
-    const actions =
-        storyAccess.storeService_.get(StateProperty.ACTIONS_WHITELIST);
+    const actions = storyAccess.storeService_.get(
+      StateProperty.ACTIONS_WHITELIST
+    );
     expect(actions).to.deep.contain({tagOrTarget: 'SCRIPT', method: 'login'});
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-foo'});
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-foo',
+    });
   });
 
   it('should whitelist namespaced and typed <amp-access> actions', () => {
-    const config = [{
-      namespace: 'namespace1',
-      login: {
-        type1: 'https://example.com',
-        type2: 'https://example.com',
+    const config = [
+      {
+        namespace: 'namespace1',
+        login: {
+          type1: 'https://example.com',
+          type2: 'https://example.com',
+        },
+      },
+      {
+        namespace: 'namespace2',
+        login: 'https://example.com',
       },
-    }, {
-      namespace: 'namespace2',
-      login: 'https://example.com',
-    }];
+    ];
     setConfig(config);
 
     storyAccess.buildCallback();
 
-    const actions =
-        storyAccess.storeService_.get(StateProperty.ACTIONS_WHITELIST);
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-namespace1-type1'});
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-namespace1-type2'});
-    expect(actions).to.deep.contain(
-        {tagOrTarget: 'SCRIPT', method: 'login-namespace2'});
+    const actions = storyAccess.storeService_.get(
+      StateProperty.ACTIONS_WHITELIST
+    );
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-namespace1-type1',
+    });
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-namespace1-type2',
+    });
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'SCRIPT',
+      method: 'login-namespace2',
+    });
   });
 
   it('should require publisher-logo-src to be a URL', () => {
@@ -174,8 +196,9 @@ describes.realWin('amp-story-access', {amp: true}, env => {
     allowConsoleError(() => {
       expect(() => {
         storyAccess.buildCallback();
-      }).to.throw('amp-story publisher-logo-src must start with ' +
-          '"https://" or "//"');
+      }).to.throw(
+        'amp-story publisher-logo-src must start with "https://" or "//"'
+      );
     });
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-bookend.js b/extensions/amp-story/1.0/test/test-amp-story-bookend.js
index 3ce4845695d4..795473bf9a48 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-bookend.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-bookend.js
@@ -122,8 +122,11 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     storyElem = win.document.createElement('amp-story');
     storyElem.appendChild(win.document.createElement('amp-story-page'));
     win.document.body.appendChild(storyElem);
-    bookendElem = createElementWithAttributes(win.document,
-        'amp-story-bookend', {'layout': 'nodisplay'});
+    bookendElem = createElementWithAttributes(
+      win.document,
+      'amp-story-bookend',
+      {'layout': 'nodisplay'}
+    );
     storyElem.appendChild(bookendElem);
 
     requestService = new AmpStoryRequestService(win, storyElem);
@@ -206,8 +209,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     bookend.build();
     return bookend.loadConfigAndMaybeRenderBookend().then(config => {
       config.components.forEach((currentComponent, index) => {
-        return expect(currentComponent).to.deep
-            .equal(expectedComponents[index]);
+        return expect(currentComponent).to.deep.equal(
+          expectedComponents[index]
+        );
       });
     });
   });
@@ -280,306 +284,340 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     bookend.build();
     return bookend.loadConfigAndMaybeRenderBookend().then(config => {
       config.components.forEach((currentComponent, index) => {
-        return expect(currentComponent).to.deep
-            .equal(expectedComponents[index]);
+        return expect(currentComponent).to.deep.equal(
+          expectedComponents[index]
+        );
       });
     });
   });
 
-  it('should add amp-to-amp linking to individual cta links when ' +
-      'specified in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'cta-link',
-          'links': [
-            {
-              'text': 'buttonA',
-              'url': 'google.com',
-              'amphtml': true,
-            },
-          ],
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const ctaLinks =
-          bookend.bookendEl_
-              .querySelector('.i-amphtml-story-bookend-cta-link-wrapper');
-      expect(ctaLinks.children[0]).to.have.attribute('rel');
-      expect(ctaLinks.children[0].getAttribute('rel')).to.equal('amphtml');
-    });
-  });
-
-  it('should not add amp-to-amp linking to cta links when not ' +
-      'specified in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'cta-link',
-          'links': [
-            {
-              'text': 'buttonB',
-              'url': 'google.com',
-              'amphtml': '',
-            },
-            {
-              'text': 'longtext longtext longtext longtext longtext',
-              'url': 'google.com',
-              'amphtml': false,
-            },
-          ],
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const ctaLinks =
-          bookend.bookendEl_
-              .querySelector('.i-amphtml-story-bookend-cta-link-wrapper');
-      expect(ctaLinks.children[0]).to.not.have.attribute('rel');
-      expect(ctaLinks.children[1]).to.not.have.attribute('rel');
-    });
-  });
-
-  it('should add amp-to-amp linking to small articles when specified ' +
-      'in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'small',
-          'title': 'This is an example article!',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': true,
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles =
-          bookend.bookendEl_
-              .querySelectorAll('.i-amphtml-story-bookend-article');
-      expect(articles[0]).to.have.attribute('rel');
-      expect(articles[0].getAttribute('rel')).to.equal('amphtml');
-    });
-  });
-
-  it('should not add amp-to-amp linking to small articles when not ' +
-      'specified in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'small',
-          'title': 'This is an example article!',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-        },
-        {
-          'type': 'small',
-          'title': 'This is an example article!',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': 'true',
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles = bookend.bookendEl_
-          .querySelectorAll('.i-amphtml-story-bookend-article');
-      expect(articles[0]).to.not.have.attribute('rel');
-      expect(articles[1]).to.not.have.attribute('rel');
-    });
-  });
-
-  it('should add amp-to-amp linking to portrait articles when specified ' +
-      'in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'portrait',
-          'title': 'example title',
-          'category': 'example category',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': true,
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles = bookend.bookendEl_
-          .querySelectorAll('.i-amphtml-story-bookend-portrait');
-      expect(articles[0]).to.have.attribute('rel');
-      expect(articles[0].getAttribute('rel')).to.equal('amphtml');
-    });
-  });
-
-  it('should not add amp-to-amp linking to portrait articles when not ' +
-      'specified in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'portrait',
-          'title': 'example title',
-          'category': 'example category',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-        },
-        {
-          'type': 'portrait',
-          'title': 'example title',
-          'category': 'example category',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': 'true',
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles = bookend.bookendEl_
-          .querySelectorAll('.i-amphtml-story-bookend-portrait');
-      expect(articles[0]).to.not.have.attribute('rel');
-      expect(articles[1]).to.not.have.attribute('rel');
-    });
-  });
-
-  it('should add amp-to-amp linking to landscape articles when ' +
-      'specified in the JSON config', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'landscape',
-          'category': 'example category',
-          'title': 'example title',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': true,
-        },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles = bookend.bookendEl_
-          .querySelectorAll('.i-amphtml-story-bookend-landscape');
-      expect(articles[0]).to.have.attribute('rel');
-      expect(articles[0].getAttribute('rel')).to.equal('amphtml');
-    });
-  });
+  it(
+    'should add amp-to-amp linking to individual cta links when ' +
+      'specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'cta-link',
+            'links': [
+              {
+                'text': 'buttonA',
+                'url': 'google.com',
+                'amphtml': true,
+              },
+            ],
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const ctaLinks = bookend.bookendEl_.querySelector(
+          '.i-amphtml-story-bookend-cta-link-wrapper'
+        );
+        expect(ctaLinks.children[0]).to.have.attribute('rel');
+        expect(ctaLinks.children[0].getAttribute('rel')).to.equal('amphtml');
+      });
+    }
+  );
+
+  it(
+    'should not add amp-to-amp linking to cta links when not ' +
+      'specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'cta-link',
+            'links': [
+              {
+                'text': 'buttonB',
+                'url': 'google.com',
+                'amphtml': '',
+              },
+              {
+                'text': 'longtext longtext longtext longtext longtext',
+                'url': 'google.com',
+                'amphtml': false,
+              },
+            ],
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const ctaLinks = bookend.bookendEl_.querySelector(
+          '.i-amphtml-story-bookend-cta-link-wrapper'
+        );
+        expect(ctaLinks.children[0]).to.not.have.attribute('rel');
+        expect(ctaLinks.children[1]).to.not.have.attribute('rel');
+      });
+    }
+  );
+
+  it(
+    'should add amp-to-amp linking to small articles when specified ' +
+      'in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'small',
+            'title': 'This is an example article!',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': true,
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-article'
+        );
+        expect(articles[0]).to.have.attribute('rel');
+        expect(articles[0].getAttribute('rel')).to.equal('amphtml');
+      });
+    }
+  );
+
+  it(
+    'should not add amp-to-amp linking to small articles when not ' +
+      'specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'small',
+            'title': 'This is an example article!',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+          },
+          {
+            'type': 'small',
+            'title': 'This is an example article!',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': 'true',
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-article'
+        );
+        expect(articles[0]).to.not.have.attribute('rel');
+        expect(articles[1]).to.not.have.attribute('rel');
+      });
+    }
+  );
+
+  it(
+    'should add amp-to-amp linking to portrait articles when specified ' +
+      'in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'portrait',
+            'title': 'example title',
+            'category': 'example category',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': true,
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-portrait'
+        );
+        expect(articles[0]).to.have.attribute('rel');
+        expect(articles[0].getAttribute('rel')).to.equal('amphtml');
+      });
+    }
+  );
+
+  it(
+    'should not add amp-to-amp linking to portrait articles when not ' +
+      'specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'portrait',
+            'title': 'example title',
+            'category': 'example category',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+          },
+          {
+            'type': 'portrait',
+            'title': 'example title',
+            'category': 'example category',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': 'true',
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-portrait'
+        );
+        expect(articles[0]).to.not.have.attribute('rel');
+        expect(articles[1]).to.not.have.attribute('rel');
+      });
+    }
+  );
+
+  it(
+    'should add amp-to-amp linking to landscape articles when ' +
+      'specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'landscape',
+            'category': 'example category',
+            'title': 'example title',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': true,
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-landscape'
+        );
+        expect(articles[0]).to.have.attribute('rel');
+        expect(articles[0].getAttribute('rel')).to.equal('amphtml');
+      });
+    }
+  );
+
+  it(
+    'should not add amp-to-amp linking to landscape articles when not' +
+      ' specified in the JSON config',
+    () => {
+      const userJson = {
+        'bookendVersion': 'v1.0',
+        'shareProviders': [
+          'email',
+          {'provider': 'facebook', 'app_id': '254325784911610'},
+          'whatsapp',
+        ],
+        'components': [
+          {
+            'type': 'landscape',
+            'category': 'example category',
+            'title': 'example title',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+          },
+          {
+            'type': 'landscape',
+            'category': 'example category',
+            'title': 'example title',
+            'url': 'http://example.com/article.html',
+            'image': 'http://placehold.it/256x128',
+            'amphtml': 'true',
+          },
+        ],
+      };
+
+      sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
+
+      bookend.build();
+      return bookend.loadConfigAndMaybeRenderBookend().then(() => {
+        const articles = bookend.bookendEl_.querySelectorAll(
+          '.i-amphtml-story-bookend-landscape'
+        );
+        expect(articles[0]).to.not.have.attribute('rel');
+        expect(articles[1]).to.not.have.attribute('rel');
+      });
+    }
+  );
 
-  it('should not add amp-to-amp linking to landscape articles when not' +
-      ' specified in the JSON config', () => {
+  it('should build the users share providers', () => {
     const userJson = {
       'bookendVersion': 'v1.0',
       'shareProviders': [
         'email',
         {'provider': 'facebook', 'app_id': '254325784911610'},
-        'whatsapp',
-      ],
-      'components': [
-        {
-          'type': 'landscape',
-          'category': 'example category',
-          'title': 'example title',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-        },
         {
-          'type': 'landscape',
-          'category': 'example category',
-          'title': 'example title',
-          'url': 'http://example.com/article.html',
-          'image': 'http://placehold.it/256x128',
-          'amphtml': 'true',
+          'provider': 'twitter',
+          'text':
+            'This is custom share text that I' +
+            ' would like for the Twitter platform',
         },
-      ],
-    };
-
-    sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
-
-    bookend.build();
-    return bookend.loadConfigAndMaybeRenderBookend().then(() => {
-      const articles = bookend.bookendEl_
-          .querySelectorAll('.i-amphtml-story-bookend-landscape');
-      expect(articles[0]).to.not.have.attribute('rel');
-      expect(articles[1]).to.not.have.attribute('rel');
-    });
-  });
-
-  it('should build the users share providers', () => {
-    const userJson = {
-      'bookendVersion': 'v1.0',
-      'shareProviders': [
-        'email',
-        {'provider': 'facebook', 'app_id': '254325784911610'},
-        {'provider': 'twitter', 'text': 'This is custom share text that I' +
-            ' would like for the Twitter platform'},
         'whatsapp',
       ],
       'components': [
@@ -599,8 +637,12 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     const expectedShareProviders = [
       'email',
       {'provider': 'facebook', 'app_id': '254325784911610'},
-      {'provider': 'twitter', 'text': 'This is custom share text that I ' +
-          'would like for the Twitter platform'},
+      {
+        'provider': 'twitter',
+        'text':
+          'This is custom share text that I ' +
+          'would like for the Twitter platform',
+      },
       'whatsapp',
     ];
 
@@ -609,8 +651,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     bookend.build();
     return bookend.loadConfigAndMaybeRenderBookend().then(config => {
       config['shareProviders'].forEach((currProvider, index) => {
-        return expect(currProvider).to.deep
-            .equal(expectedShareProviders[index]);
+        return expect(currProvider).to.deep.equal(
+          expectedShareProviders[index]
+        );
       });
     });
   });
@@ -666,9 +709,11 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     bookend.build();
     return bookend.loadConfigAndMaybeRenderBookend().then(() => {
       expect(userWarnStub).to.be.calledOnce;
-      expect(userWarnStub.args[0][1]).to.be.equal('`system` is not a valid ' +
-      'share provider type. Native sharing is ' +
-      'enabled by default and cannot be turned off.');
+      expect(userWarnStub.args[0][1]).to.be.equal(
+        '`system` is not a valid ' +
+          'share provider type. Native sharing is ' +
+          'enabled by default and cannot be turned off.'
+      );
     });
   });
 
@@ -696,8 +741,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     allowConsoleError(() => {
       expect(() => articleComponent.assertValidity(userJson)).to.throw(
-          'Small article component must contain `title`, `url` fields, ' +
-          'skipping invalid.​​​');
+        'Small article component must contain `title`, `url` fields, ' +
+          'skipping invalid.​​​'
+      );
     });
   });
 
@@ -722,8 +768,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     allowConsoleError(() => {
       expect(() => portraitComponant.assertValidity(userJson)).to.throw(
-          'Portrait component must contain `title`, `image`, ' +
-          '`url` fields, skipping invalid.');
+        'Portrait component must contain `title`, `image`, ' +
+          '`url` fields, skipping invalid.'
+      );
     });
   });
 
@@ -755,8 +802,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     allowConsoleError(() => {
       expect(() => ctaLinkComponent.assertValidity(userJson)).to.throw(
-          'CTA link component must be an array ' +
-          'and contain at least one link inside it.');
+        'CTA link component must be an array ' +
+          'and contain at least one link inside it.'
+      );
     });
   });
 
@@ -790,8 +838,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     allowConsoleError(() => {
       expect(() => landscapeComponent.assertValidity(userJson)).to.throw(
-          'Landscape component must contain `title`, `image`, ' +
-          '`url` fields, skipping invalid.');
+        'Landscape component must contain `title`, `image`, ' +
+          '`url` fields, skipping invalid.'
+      );
     });
   });
 
@@ -823,9 +872,10 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     allowConsoleError(() => {
       expect(() => textBoxComponent.assertValidity(userJson)).to.throw(
-          'Textbox component must contain ' +
+        'Textbox component must contain ' +
           '`text` array and at least one element inside it, ' +
-          'skipping invalid.');
+          'skipping invalid.'
+      );
     });
   });
 
@@ -835,8 +885,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
 
     bookend.build();
 
-    const promptButtonEl =
-        bookend.getShadowRoot().querySelector(`[on="tap:${consentId}.prompt"]`);
+    const promptButtonEl = bookend
+      .getShadowRoot()
+      .querySelector(`[on="tap:${consentId}.prompt"]`);
 
     expect(promptButtonEl).to.exist;
   });
@@ -845,8 +896,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     bookend.build();
 
     // No element with an "on" attribute ending with ".prompt".
-    const promptButtonEl =
-        bookend.getShadowRoot().querySelector('[on$=".prompt"]');
+    const promptButtonEl = bookend
+      .getShadowRoot()
+      .querySelector('[on$=".prompt"]');
 
     expect(promptButtonEl).to.be.null;
   });
@@ -877,7 +929,9 @@ describes.realWin('amp-story-bookend', {amp: true}, env => {
     sandbox.stub(requestService, 'loadBookendConfig').resolves(userJson);
 
     bookend.build();
-    expectAsyncConsoleError(/[Component `invalid-type` is not supported. Skipping invalid]/);
+    expectAsyncConsoleError(
+      /[Component `invalid-type` is not supported. Skipping invalid]/
+    );
 
     return bookend.loadConfigAndMaybeRenderBookend().then(config => {
       // Still builds rest of valid components.
diff --git a/extensions/amp-story/1.0/test/test-amp-story-consent.js b/extensions/amp-story/1.0/test/test-amp-story-consent.js
index 4d49223d7854..7b4e857d7855 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-consent.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-consent.js
@@ -53,8 +53,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     };
 
     const styles = {'background-color': 'rgb(0, 0, 0)'};
-    getComputedStyleStub =
-        sandbox.stub(win, 'getComputedStyle').returns(styles);
+    getComputedStyleStub = sandbox
+      .stub(win, 'getComputedStyle')
+      .returns(styles);
 
     const localizationService = new LocalizationService(win);
     registerServiceBuilder(win, 'localization', () => localizationService);
@@ -95,8 +96,7 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
   it('should parse the config', () => {
     storyConsent.buildCallback();
-    expect(storyConsent.storyConsentConfig_)
-        .to.deep.equal(defaultConfig);
+    expect(storyConsent.storyConsentConfig_).to.deep.equal(defaultConfig);
   });
 
   it('should require a story-consent title', () => {
@@ -160,8 +160,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-reject');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-reject'
+    );
 
     // For some reason the win object provided by the test environment does not
     // return all the styles.
@@ -174,8 +175,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-reject');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-reject'
+    );
 
     // For some reason the win object provided by the test environment does not
     // return all the styles.
@@ -185,8 +187,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
   it('should hide the external link by default', () => {
     storyConsent.buildCallback();
 
-    const linkEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-external-link');
+    const linkEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-external-link'
+    );
 
     expect(linkEl).to.have.display('none');
   });
@@ -232,8 +235,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
 
     storyConsent.buildCallback();
 
-    const linkEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-external-link');
+    const linkEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-external-link'
+    );
 
     expect(linkEl).not.to.have.display('none');
   });
@@ -241,14 +245,21 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
   it('should whitelist the <amp-consent> actions', () => {
     storyConsent.buildCallback();
 
-    const actions =
-        storyConsent.storeService_.get(StateProperty.ACTIONS_WHITELIST);
-    expect(actions)
-        .to.deep.contain({tagOrTarget: 'AMP-CONSENT', method: 'accept'});
-    expect(actions)
-        .to.deep.contain({tagOrTarget: 'AMP-CONSENT', method: 'prompt'});
-    expect(actions)
-        .to.deep.contain({tagOrTarget: 'AMP-CONSENT', method: 'reject'});
+    const actions = storyConsent.storeService_.get(
+      StateProperty.ACTIONS_WHITELIST
+    );
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'AMP-CONSENT',
+      method: 'accept',
+    });
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'AMP-CONSENT',
+      method: 'prompt',
+    });
+    expect(actions).to.deep.contain({
+      tagOrTarget: 'AMP-CONSENT',
+      method: 'reject',
+    });
   });
 
   it('should broadcast the amp actions', () => {
@@ -271,31 +282,34 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
   it('should render an accept button with the proper amp action', () => {
     storyConsent.buildCallback();
 
-    const buttonEl =
-        storyConsent.storyConsentEl_
-            .querySelector(`button[on="tap:${CONSENT_ID}.accept"]`);
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      `button[on="tap:${CONSENT_ID}.accept"]`
+    );
     expect(buttonEl).to.exist;
   });
 
   it('should set the consent ID in the store', () => {
     storyConsent.buildCallback();
 
-    expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID))
-        .to.equal(CONSENT_ID);
+    expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.equal(
+      CONSENT_ID
+    );
   });
 
   it('should set the consent ID in the store if right amp-geo group', () => {
     const config = {consents: {ABC: {promptIfUnknownForGeoGroup: 'eea'}}};
     consentConfigEl.textContent = JSON.stringify(config);
 
-    sandbox.stub(Services, 'geoForDocOrNull')
-        .resolves({matchedISOCountryGroups: ['eea']});
+    sandbox
+      .stub(Services, 'geoForDocOrNull')
+      .resolves({matchedISOCountryGroups: ['eea']});
 
     storyConsent.buildCallback();
 
     return Promise.resolve().then(() => {
-      expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID))
-          .to.equal(CONSENT_ID);
+      expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.equal(
+        CONSENT_ID
+      );
     });
   });
 
@@ -303,14 +317,15 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     const config = {consents: {ABC: {promptIfUnknownForGeoGroup: 'eea'}}};
     consentConfigEl.textContent = JSON.stringify(config);
 
-    sandbox.stub(Services, 'geoForDocOrNull')
-        .resolves({matchedISOCountryGroups: ['othergroup']});
+    sandbox
+      .stub(Services, 'geoForDocOrNull')
+      .resolves({matchedISOCountryGroups: ['othergroup']});
 
     storyConsent.buildCallback();
 
     return Promise.resolve().then(() => {
-      expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID))
-          .to.be.null;
+      expect(storyConsent.storeService_.get(StateProperty.CONSENT_ID)).to.be
+        .null;
     });
   });
 
@@ -319,10 +334,12 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     getComputedStyleStub.returns(styles);
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-accept');
-    expect(buttonEl.getAttribute('style'))
-        .to.equal('color: rgb(0, 0, 0) !important;');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-accept'
+    );
+    expect(buttonEl.getAttribute('style')).to.equal(
+      'color: rgb(0, 0, 0) !important;'
+    );
   });
 
   it('should set the font color to white if background is black', () => {
@@ -330,10 +347,12 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     getComputedStyleStub.returns(styles);
     storyConsent.buildCallback();
 
-    const buttonEl = storyConsent.storyConsentEl_
-        .querySelector('.i-amphtml-story-consent-action-accept');
-    expect(buttonEl.getAttribute('style'))
-        .to.equal('color: rgb(255, 255, 255) !important;');
+    const buttonEl = storyConsent.storyConsentEl_.querySelector(
+      '.i-amphtml-story-consent-action-accept'
+    );
+    expect(buttonEl.getAttribute('style')).to.equal(
+      'color: rgb(255, 255, 255) !important;'
+    );
   });
 
   it('should require publisher-logo-src to be a URL', () => {
@@ -341,8 +360,9 @@ describes.realWin('amp-story-consent', {amp: true}, env => {
     allowConsoleError(() => {
       expect(() => {
         storyConsent.buildCallback();
-      }).to.throw('amp-story publisher-logo-src must start with ' +
-          '"https://" or "//"');
+      }).to.throw(
+        'amp-story publisher-logo-src must start with "https://" or "//"'
+      );
     });
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js b/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js
index 66aba77fe215..6f33b97f8880 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-cta-layer.js
@@ -16,119 +16,131 @@
 
 import {AmpStoryCtaLayer} from '../amp-story-cta-layer';
 
-describes.realWin('amp-story-cta-layer', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story:1.0'],
+describes.realWin(
+  'amp-story-cta-layer',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story:1.0'],
+    },
   },
-}, env => {
-  let win;
-  let ampStoryCtaLayer;
-
-  beforeEach(() => {
-    win = env.win;
-    const ampStoryCtaLayerEl =
-      win.document.createElement('amp-story-cta-layer');
-    win.document.body.appendChild(ampStoryCtaLayerEl);
-    ampStoryCtaLayer = new AmpStoryCtaLayer(ampStoryCtaLayerEl);
-  });
-
-  it('should build the cta layer', () => {
-    ampStoryCtaLayer.buildCallback();
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ampStoryCtaLayer.element).to.have.class('i-amphtml-story-layer');
+  env => {
+    let win;
+    let ampStoryCtaLayer;
+
+    beforeEach(() => {
+      win = env.win;
+      const ampStoryCtaLayerEl = win.document.createElement(
+        'amp-story-cta-layer'
+      );
+      win.document.body.appendChild(ampStoryCtaLayerEl);
+      ampStoryCtaLayer = new AmpStoryCtaLayer(ampStoryCtaLayerEl);
     });
-  });
 
-  it('should add or overwrite target attribute to links', () => {
-    const ctaLink = win.document.createElement('a');
-    expect(ctaLink).to.not.have.attribute('target');
+    it('should build the cta layer', () => {
+      ampStoryCtaLayer.buildCallback();
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ampStoryCtaLayer.element).to.have.class('i-amphtml-story-layer');
+      });
+    });
+
+    it('should add or overwrite target attribute to links', () => {
+      const ctaLink = win.document.createElement('a');
+      expect(ctaLink).to.not.have.attribute('target');
 
-    ampStoryCtaLayer.element.appendChild(ctaLink);
-    ampStoryCtaLayer.buildCallback();
+      ampStoryCtaLayer.element.appendChild(ctaLink);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ctaLink).to.have.attribute('target');
-      expect(ctaLink.getAttribute('target')).to.equal('_blank');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ctaLink).to.have.attribute('target');
+        expect(ctaLink.getAttribute('target')).to.equal('_blank');
+      });
     });
-  });
 
-  it('should not add target attribute to other elements', () => {
-    const elem = win.document.createElement('span');
-    ampStoryCtaLayer.element.appendChild(elem);
-    ampStoryCtaLayer.buildCallback();
+    it('should not add target attribute to other elements', () => {
+      const elem = win.document.createElement('span');
+      ampStoryCtaLayer.element.appendChild(elem);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(elem).to.not.have.attribute('target');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(elem).to.not.have.attribute('target');
+      });
     });
-  });
 
-  it('should not allow a cta layer on the first page', () => {
-    win.document.body.appendChild(win.document.createElement('amp-story-page'));
-    win.document.body.appendChild(win.document.createElement('amp-story-page'));
+    it('should not allow a cta layer on the first page', () => {
+      win.document.body.appendChild(
+        win.document.createElement('amp-story-page')
+      );
+      win.document.body.appendChild(
+        win.document.createElement('amp-story-page')
+      );
 
-    const pageElements =
-    win.document.getElementsByTagName('amp-story-page');
+      const pageElements = win.document.getElementsByTagName('amp-story-page');
 
-    pageElements[0].appendChild(ampStoryCtaLayer.element);
+      pageElements[0].appendChild(ampStoryCtaLayer.element);
 
-    ampStoryCtaLayer.layoutCallback().then(layer => {
-      return allowConsoleError(() => {
-        return expect(layer).to.throw();
+      ampStoryCtaLayer.layoutCallback().then(layer => {
+        return allowConsoleError(() => {
+          return expect(layer).to.throw();
+        });
       });
     });
-  });
 
-  it('should allow a cta layer on the second or third page', () => {
-    win.document.body.appendChild(win.document.createElement('amp-story-page'));
-    win.document.body.appendChild(win.document.createElement('amp-story-page'));
-    win.document.body.appendChild(win.document.createElement('amp-story-page'));
+    it('should allow a cta layer on the second or third page', () => {
+      win.document.body.appendChild(
+        win.document.createElement('amp-story-page')
+      );
+      win.document.body.appendChild(
+        win.document.createElement('amp-story-page')
+      );
+      win.document.body.appendChild(
+        win.document.createElement('amp-story-page')
+      );
 
-    const pageElements =
-    win.document.getElementsByTagName('amp-story-page');
+      const pageElements = win.document.getElementsByTagName('amp-story-page');
 
-    pageElements[1].appendChild(ampStoryCtaLayer.element);
-    pageElements[2].appendChild(ampStoryCtaLayer.element);
+      pageElements[1].appendChild(ampStoryCtaLayer.element);
+      pageElements[2].appendChild(ampStoryCtaLayer.element);
 
-    ampStoryCtaLayer.layoutCallback().then(layer => {
-      return expect(layer).to.not.throw();
+      ampStoryCtaLayer.layoutCallback().then(layer => {
+        return expect(layer).to.not.throw();
+      });
     });
-  });
 
-  it('should add or overwrite role attribute to links', () => {
-    const ctaLink = win.document.createElement('a');
-    expect(ctaLink).to.not.have.attribute('role');
+    it('should add or overwrite role attribute to links', () => {
+      const ctaLink = win.document.createElement('a');
+      expect(ctaLink).to.not.have.attribute('role');
 
-    ampStoryCtaLayer.element.appendChild(ctaLink);
-    ampStoryCtaLayer.buildCallback();
+      ampStoryCtaLayer.element.appendChild(ctaLink);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ctaLink).to.have.attribute('role');
-      expect(ctaLink.getAttribute('role')).to.equal('link');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ctaLink).to.have.attribute('role');
+        expect(ctaLink.getAttribute('role')).to.equal('link');
+      });
     });
-  });
 
-  it('should add or overwrite role attribute to buttons', () => {
-    const ctaButton = win.document.createElement('button');
-    expect(ctaButton).to.not.have.attribute('role');
+    it('should add or overwrite role attribute to buttons', () => {
+      const ctaButton = win.document.createElement('button');
+      expect(ctaButton).to.not.have.attribute('role');
 
-    ampStoryCtaLayer.element.appendChild(ctaButton);
-    ampStoryCtaLayer.buildCallback();
+      ampStoryCtaLayer.element.appendChild(ctaButton);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(ctaButton).to.have.attribute('role');
-      expect(ctaButton.getAttribute('role')).to.equal('button');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(ctaButton).to.have.attribute('role');
+        expect(ctaButton.getAttribute('role')).to.equal('button');
+      });
     });
-  });
 
-  it('should not add role attribute to other elements', () => {
-    const elem = win.document.createElement('span');
-    ampStoryCtaLayer.element.appendChild(elem);
-    ampStoryCtaLayer.buildCallback();
+    it('should not add role attribute to other elements', () => {
+      const elem = win.document.createElement('span');
+      ampStoryCtaLayer.element.appendChild(elem);
+      ampStoryCtaLayer.buildCallback();
 
-    return ampStoryCtaLayer.layoutCallback().then(() => {
-      expect(elem).to.not.have.attribute('role');
+      return ampStoryCtaLayer.layoutCallback().then(() => {
+        expect(elem).to.not.have.attribute('role');
+      });
     });
-  });
-
-});
+  }
+);
diff --git a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
index e9e4d3028fd2..24f1c2967ad7 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-embedded-component.js
@@ -19,9 +19,7 @@ import {
   AmpStoryStoreService,
   EmbeddedComponentState,
 } from '../amp-story-store-service';
-import {
-  AmpStoryEmbeddedComponent,
-} from '../amp-story-embedded-component';
+import {AmpStoryEmbeddedComponent} from '../amp-story-embedded-component';
 import {EventType} from '../events';
 import {LocalizationService} from '../../../../src/service/localization';
 import {Services} from '../../../../src/services';
@@ -52,7 +50,9 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
         return Promise.resolve();
       },
       measureMutateElement: (measure, mutate) => {
-        return Promise.resolve().then(measure).then(mutate);
+        return Promise.resolve()
+          .then(measure)
+          .then(mutate);
       },
     });
 
@@ -83,16 +83,18 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
     expect(component.focusedStateOverlay_).to.exist;
   });
 
-  it('should append the tooltip to the parentEl when clicking a clickable ' +
-    'element', () => {
-    fakePage.appendChild(clickableEl);
+  it(
+    'should append the tooltip to the parentEl when clicking a clickable ' +
+      'element',
+    () => {
+      fakePage.appendChild(clickableEl);
 
-    storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT,
-        fakeComponent);
+      storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
-    // Children in parentEl: fakeCover, fakePage, and tooltip overlay.
-    expect(parentEl.childElementCount).to.equal(3);
-  });
+      // Children in parentEl: fakeCover, fakePage, and tooltip overlay.
+      expect(parentEl.childElementCount).to.equal(3);
+    }
+  );
 
   it('should show the tooltip on store property update', () => {
     fakePage.appendChild(clickableEl);
@@ -101,8 +103,9 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before showing tooltip.
     return timeout(150).then(() => {
-      expect(component.focusedStateOverlay_).to.not.have
-          .class('i-amphtml-hidden');
+      expect(component.focusedStateOverlay_).to.not.have.class(
+        'i-amphtml-hidden'
+      );
     });
   });
 
@@ -131,32 +134,37 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
     const nextPageSpy = sandbox.spy();
     parentEl.addEventListener(EventType.NEXT_PAGE, nextPageSpy);
 
-    const rightButton = component.focusedStateOverlay_
-        .querySelector('.i-amphtml-story-focused-state-layer-nav-button' +
-          '.i-amphtml-story-tooltip-nav-button-right');
+    const rightButton = component.focusedStateOverlay_.querySelector(
+      '.i-amphtml-story-focused-state-layer-nav-button' +
+        '.i-amphtml-story-tooltip-nav-button-right'
+    );
 
     rightButton.dispatchEvent(new Event('click'));
 
     expect(nextPageSpy).to.have.been.calledOnce;
   });
 
-  it('should navigate to previous page when clicked on right arrow and ' +
-    'story is RTL', () => {
-    fakePage.appendChild(clickableEl);
-    storeService.dispatch(Action.TOGGLE_RTL, true);
-    storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
+  it(
+    'should navigate to previous page when clicked on right arrow and ' +
+      'story is RTL',
+    () => {
+      fakePage.appendChild(clickableEl);
+      storeService.dispatch(Action.TOGGLE_RTL, true);
+      storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
-    const previousPageSpy = sandbox.spy();
-    parentEl.addEventListener(EventType.PREVIOUS_PAGE, previousPageSpy);
+      const previousPageSpy = sandbox.spy();
+      parentEl.addEventListener(EventType.PREVIOUS_PAGE, previousPageSpy);
 
-    const rightButton = component.focusedStateOverlay_
-        .querySelector('.i-amphtml-story-focused-state-layer-nav-button' +
-          '.i-amphtml-story-tooltip-nav-button-right');
+      const rightButton = component.focusedStateOverlay_.querySelector(
+        '.i-amphtml-story-focused-state-layer-nav-button' +
+          '.i-amphtml-story-tooltip-nav-button-right'
+      );
 
-    rightButton.dispatchEvent(new Event('click'));
+      rightButton.dispatchEvent(new Event('click'));
 
-    expect(previousPageSpy).to.have.been.calledOnce;
-  });
+      expect(previousPageSpy).to.have.been.calledOnce;
+    }
+  );
 
   it('should append icon when icon attribute is present', () => {
     addAttributesToElement(clickableEl, {'data-tooltip-icon': '/my-icon'});
@@ -164,26 +172,31 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
     const tooltipIconEl = component.focusedStateOverlay_.querySelector(
-        '.i-amphtml-story-tooltip-custom-icon');
+      '.i-amphtml-story-tooltip-custom-icon'
+    );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
     return timeout(150).then(() => {
-      expect(tooltipIconEl.style['background-image'])
-          .to.equal('url("http://localhost:9876/my-icon")');
+      expect(tooltipIconEl.style['background-image']).to.equal(
+        'url("http://localhost:9876/my-icon")'
+      );
     });
   });
 
   it('should find invalid urls', () => {
-    addAttributesToElement(clickableEl,
-        {'data-tooltip-icon':
-        /*eslint no-script-url: 0*/ 'javascript:alert("evil!")'});
+    addAttributesToElement(clickableEl, {
+      'data-tooltip-icon':
+        /*eslint no-script-url: 0*/ 'javascript:alert("evil!")',
+    });
     fakePage.appendChild(clickableEl);
     expectAsyncConsoleError(
-        '[amp-story-embedded-component] The tooltip icon url is invalid');
+      '[amp-story-embedded-component] The tooltip icon url is invalid'
+    );
 
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
     const tooltipIconEl = component.focusedStateOverlay_.querySelector(
-        '.i-amphtml-story-tooltip-custom-icon');
+      '.i-amphtml-story-tooltip-custom-icon'
+    );
 
     expect(tooltipIconEl.style['background-image']).to.equal('');
   });
@@ -193,8 +206,9 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
     fakePage.appendChild(clickableEl);
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
-    const tooltipTextEl = component.focusedStateOverlay_
-        .querySelector('.i-amphtml-tooltip-text');
+    const tooltipTextEl = component.focusedStateOverlay_.querySelector(
+      '.i-amphtml-tooltip-text'
+    );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
     return timeout(150).then(() => {
@@ -206,8 +220,9 @@ describes.realWin('amp-story-embedded-component', {amp: true}, env => {
     fakePage.appendChild(clickableEl);
     storeService.dispatch(Action.TOGGLE_INTERACTIVE_COMPONENT, fakeComponent);
 
-    const tooltipTextEl = component.focusedStateOverlay_
-        .querySelector('.i-amphtml-tooltip-text');
+    const tooltipTextEl = component.focusedStateOverlay_.querySelector(
+      '.i-amphtml-tooltip-text'
+    );
 
     // Wait for TOOLTIP_CLOSE_ANIMATION_MS is finished before building tooltip.
     return timeout(150).then(() => {
diff --git a/extensions/amp-story/1.0/test/test-amp-story-hint.js b/extensions/amp-story/1.0/test/test-amp-story-hint.js
index a73f6eb8f86a..6196be838440 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-hint.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-hint.js
@@ -36,10 +36,12 @@ describes.fakeWin('amp-story hint layer', {}, env => {
     const storeService = new AmpStoryStoreService(win);
     registerServiceBuilder(win, 'story-store', () => storeService);
 
-    sandbox.stub(Services, 'vsyncFor').callsFake(
-        () => ({mutate: task => task()}));
-    sandbox.stub(Services, 'timerFor').callsFake(
-        () => ({delay: NOOP, cancel: NOOP}));
+    sandbox
+      .stub(Services, 'vsyncFor')
+      .callsFake(() => ({mutate: task => task()}));
+    sandbox
+      .stub(Services, 'timerFor')
+      .callsFake(() => ({delay: NOOP, cancel: NOOP}));
 
     host = win.document.createElement('div');
     ampStoryHint = new AmpStoryHint(win, host);
@@ -50,8 +52,9 @@ describes.fakeWin('amp-story hint layer', {}, env => {
   });
 
   it('should be able to show navigation help overlay', () => {
-    const hideAfterTimeoutStub =
-        sandbox.stub(ampStoryHint, 'hideAfterTimeout').callsFake(NOOP);
+    const hideAfterTimeoutStub = sandbox
+      .stub(ampStoryHint, 'hideAfterTimeout')
+      .callsFake(NOOP);
 
     ampStoryHint.showNavigationOverlay();
 
@@ -64,8 +67,9 @@ describes.fakeWin('amp-story hint layer', {}, env => {
   });
 
   it('should be able to show no previous page help overlay', () => {
-    const hideAfterTimeoutStub =
-        sandbox.stub(ampStoryHint, 'hideAfterTimeout').callsFake(NOOP);
+    const hideAfterTimeoutStub = sandbox
+      .stub(ampStoryHint, 'hideAfterTimeout')
+      .callsFake(NOOP);
 
     ampStoryHint.showFirstPageHintOverlay();
 
diff --git a/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js b/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
index b0bf73bc3a46..fe8190f0467f 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-info-dialog.js
@@ -27,7 +27,6 @@ import {
 import {Services} from '../../../../src/services';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.realWin('amp-story-share-menu', {amp: true}, env => {
   let moreInfoLinkUrl;
   let embedded;
@@ -83,8 +82,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
     embedded = false;
 
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .not.to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(
+        infoDialog.element_.querySelector(MOREINFO_CLASS)
+      ).not.to.have.class(MOREINFO_VISIBLE_CLASS);
     });
   });
 
@@ -92,8 +92,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
     moreInfoLinkUrl = null;
 
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .not.to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(
+        infoDialog.element_.querySelector(MOREINFO_CLASS)
+      ).not.to.have.class(MOREINFO_VISIBLE_CLASS);
     });
   });
 
@@ -101,8 +102,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
     moreInfoLinkUrl = 'https://example.com/more-info.html';
 
     return infoDialog.build().then(() => {
-      expect(infoDialog.element_.querySelector(MOREINFO_CLASS))
-          .to.have.class(MOREINFO_VISIBLE_CLASS);
+      expect(infoDialog.element_.querySelector(MOREINFO_CLASS)).to.have.class(
+        MOREINFO_VISIBLE_CLASS
+      );
     });
   });
 
diff --git a/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js b/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js
index e1ae0b379295..cecd3cea89cb 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-media-query-service.js
@@ -34,9 +34,14 @@ describes.realWin('amp-story-media-query-service', {amp: true}, env => {
   }
 
   function waitForClassName(element, className) {
-    return poll(`className ${className} on ${element.tagName}`, () => {
-      return element.classList.contains(className);
-    }, undefined /** opt_onError */, 300 /** opt_timeout */);
+    return poll(
+      `className ${className} on ${element.tagName}`,
+      () => {
+        return element.classList.contains(className);
+      },
+      undefined /** opt_onError */,
+      300 /** opt_timeout */
+    );
   }
 
   beforeEach(() => {
@@ -66,43 +71,43 @@ describes.realWin('amp-story-media-query-service', {amp: true}, env => {
   it('should add the attribute if the media query matches', () => {
     const spy = sandbox.spy();
     return mediaQueryService
-        .onMediaQueryMatch('(orientation: landscape)', spy)
-        .then(() => {
-          expect(spy).to.have.been.calledOnceWith(true);
-        });
+      .onMediaQueryMatch('(orientation: landscape)', spy)
+      .then(() => {
+        expect(spy).to.have.been.calledOnceWith(true);
+      });
   });
 
   it('should not add the attribute if the media query does not match', () => {
     const spy = sandbox.spy();
     return mediaQueryService
-        .onMediaQueryMatch('(orientation: portrait)', spy)
-        .then(() => {
-          expect(spy).to.have.been.calledOnceWith(false);
-        });
+      .onMediaQueryMatch('(orientation: portrait)', spy)
+      .then(() => {
+        expect(spy).to.have.been.calledOnceWith(false);
+      });
   });
 
   it('should handle multiple media queries', () => {
     const spy1 = sandbox.spy();
-    const p1 = mediaQueryService
-        .onMediaQueryMatch('(orientation: landscape)', spy1);
+    const p1 = mediaQueryService.onMediaQueryMatch(
+      '(orientation: landscape)',
+      spy1
+    );
     const spy2 = sandbox.spy();
-    const p2 = mediaQueryService
-        .onMediaQueryMatch('(min-width: 600px)', spy2);
-    return Promise.all([p1, p2])
-        .then(() => {
-          expect(spy1).to.have.been.calledOnceWith(true);
-          expect(spy2).to.have.been.calledOnceWith(false);
-        });
+    const p2 = mediaQueryService.onMediaQueryMatch('(min-width: 600px)', spy2);
+    return Promise.all([p1, p2]).then(() => {
+      expect(spy1).to.have.been.calledOnceWith(true);
+      expect(spy2).to.have.been.calledOnceWith(false);
+    });
   });
 
   it('should add the className if the media query matches on resize', () => {
     return mediaQueryService
-        .onMediaQueryMatch('(orientation: portrait)', matches => {
-          storyEl.classList.toggle('portrait', matches);
-        })
-        .then(() => {
-          setMatcherSize(100, 300);
-          return waitForClassName(storyEl, 'portrait');
-        });
+      .onMediaQueryMatch('(orientation: portrait)', matches => {
+        storyEl.classList.toggle('portrait', matches);
+      })
+      .then(() => {
+        setMatcherSize(100, 300);
+        return waitForClassName(storyEl, 'portrait');
+      });
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-page.js b/extensions/amp-story/1.0/test/test-amp-story-page.js
index cfed0ffdebb3..549074da81d0 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-page.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-page.js
@@ -20,11 +20,9 @@ import {AmpStoryStoreService} from '../amp-story-store-service';
 import {LocalizationService} from '../../../../src/service/localization';
 import {MediaType} from '../media-pool';
 import {createElementWithAttributes} from '../../../../src/dom';
-import {installFriendlyIframeEmbed}
-  from '../../../../src/friendly-iframe-embed';
+import {installFriendlyIframeEmbed} from '../../../../src/friendly-iframe-embed';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.realWin('amp-story-page', {amp: true}, env => {
   let win;
   let element;
@@ -126,8 +124,9 @@ describes.realWin('amp-story-page', {amp: true}, env => {
   });
 
   it('should perform media operations when state becomes active', done => {
-    sandbox.stub(page.resources_, 'getResourceForElement')
-        .returns({isDisplayed: () => true});
+    sandbox
+      .stub(page.resources_, 'getResourceForElement')
+      .returns({isDisplayed: () => true});
 
     const videoEl = win.document.createElement('video');
     videoEl.setAttribute('src', 'https://example.com/video.mp3');
@@ -136,36 +135,37 @@ describes.realWin('amp-story-page', {amp: true}, env => {
     let mediaPoolMock;
 
     page.buildCallback();
-    page.layoutCallback()
-        .then(() => page.mediaPoolPromise_)
-        .then(mediaPool => {
-          mediaPoolMock = sandbox.mock(mediaPool);
-          mediaPoolMock
-              .expects('register')
-              .withExactArgs(videoEl)
-              .once();
-
-          mediaPoolMock
-              .expects('preload')
-              .withExactArgs(videoEl)
-              .returns(Promise.resolve())
-              .once();
-
-          mediaPoolMock
-              .expects('play')
-              .withExactArgs(videoEl)
-              .once();
-
-          page.setState(PageState.PLAYING);
-
-          // `setState` runs code that creates subtasks (Promise callbacks).
-          // Waits for the next frame to make sure all the subtasks are
-          // already executed when we run the assertions.
-          win.requestAnimationFrame(() => {
-            mediaPoolMock.verify();
-            done();
-          });
+    page
+      .layoutCallback()
+      .then(() => page.mediaPoolPromise_)
+      .then(mediaPool => {
+        mediaPoolMock = sandbox.mock(mediaPool);
+        mediaPoolMock
+          .expects('register')
+          .withExactArgs(videoEl)
+          .once();
+
+        mediaPoolMock
+          .expects('preload')
+          .withExactArgs(videoEl)
+          .returns(Promise.resolve())
+          .once();
+
+        mediaPoolMock
+          .expects('play')
+          .withExactArgs(videoEl)
+          .once();
+
+        page.setState(PageState.PLAYING);
+
+        // `setState` runs code that creates subtasks (Promise callbacks).
+        // Waits for the next frame to make sure all the subtasks are
+        // already executed when we run the assertions.
+        win.requestAnimationFrame(() => {
+          mediaPoolMock.verify();
+          done();
         });
+      });
   });
 
   it('should perform media operations on fie video when active', done => {
@@ -181,40 +181,42 @@ describes.realWin('amp-story-page', {amp: true}, env => {
 
       let mediaPoolMock;
 
-      sandbox.stub(page.resources_, 'getResourceForElement')
-          .returns({isDisplayed: () => true});
+      sandbox
+        .stub(page.resources_, 'getResourceForElement')
+        .returns({isDisplayed: () => true});
 
       page.buildCallback();
-      page.layoutCallback()
-          .then(() => page.mediaPoolPromise_)
-          .then(mediaPool => {
-            mediaPoolMock = sandbox.mock(mediaPool);
-            mediaPoolMock
-                .expects('register')
-                .withExactArgs(videoEl)
-                .once();
-
-            mediaPoolMock
-                .expects('preload')
-                .withExactArgs(videoEl)
-                .returns(Promise.resolve())
-                .once();
-
-            mediaPoolMock
-                .expects('play')
-                .withExactArgs(videoEl)
-                .once();
-
-            page.setState(PageState.PLAYING);
-
-            // `setState` runs code that creates subtasks (Promise callbacks).
-            // Waits for the next frame to make sure all the subtasks are
-            // already executed when we run the assertions.
-            win.requestAnimationFrame(() => {
-              mediaPoolMock.verify();
-              done();
-            });
+      page
+        .layoutCallback()
+        .then(() => page.mediaPoolPromise_)
+        .then(mediaPool => {
+          mediaPoolMock = sandbox.mock(mediaPool);
+          mediaPoolMock
+            .expects('register')
+            .withExactArgs(videoEl)
+            .once();
+
+          mediaPoolMock
+            .expects('preload')
+            .withExactArgs(videoEl)
+            .returns(Promise.resolve())
+            .once();
+
+          mediaPoolMock
+            .expects('play')
+            .withExactArgs(videoEl)
+            .once();
+
+          page.setState(PageState.PLAYING);
+
+          // `setState` runs code that creates subtasks (Promise callbacks).
+          // Waits for the next frame to make sure all the subtasks are
+          // already executed when we run the assertions.
+          win.requestAnimationFrame(() => {
+            mediaPoolMock.verify();
+            done();
           });
+        });
     });
   });
 
@@ -246,8 +248,9 @@ describes.realWin('amp-story-page', {amp: true}, env => {
   });
 
   it('should pause/rewind media when state becomes not active', done => {
-    sandbox.stub(page.resources_, 'getResourceForElement')
-        .returns({isDisplayed: () => true});
+    sandbox
+      .stub(page.resources_, 'getResourceForElement')
+      .returns({isDisplayed: () => true});
 
     const videoEl = win.document.createElement('video');
     videoEl.setAttribute('src', 'https://example.com/video.mp3');
@@ -256,25 +259,26 @@ describes.realWin('amp-story-page', {amp: true}, env => {
     let mediaPoolMock;
 
     page.buildCallback();
-    page.layoutCallback()
-        .then(() => page.mediaPoolPromise_)
-        .then(mediaPool => {
-          mediaPoolMock = sandbox.mock(mediaPool);
-          mediaPoolMock
-              .expects('pause')
-              .withExactArgs(videoEl, true /** rewindToBeginning */)
-              .once();
-
-          page.setState(PageState.NOT_ACTIVE);
-
-          // `setState` runs code that creates subtasks (Promise callbacks).
-          // Waits for the next frame to make sure all the subtasks are
-          // already executed when we run the assertions.
-          win.requestAnimationFrame(() => {
-            mediaPoolMock.verify();
-            done();
-          });
+    page
+      .layoutCallback()
+      .then(() => page.mediaPoolPromise_)
+      .then(mediaPool => {
+        mediaPoolMock = sandbox.mock(mediaPool);
+        mediaPoolMock
+          .expects('pause')
+          .withExactArgs(videoEl, true /** rewindToBeginning */)
+          .once();
+
+        page.setState(PageState.NOT_ACTIVE);
+
+        // `setState` runs code that creates subtasks (Promise callbacks).
+        // Waits for the next frame to make sure all the subtasks are
+        // already executed when we run the assertions.
+        win.requestAnimationFrame(() => {
+          mediaPoolMock.verify();
+          done();
         });
+      });
   });
 
   it('should stop the advancement when state becomes paused', () => {
@@ -289,8 +293,9 @@ describes.realWin('amp-story-page', {amp: true}, env => {
   });
 
   it('should pause media when state becomes paused', done => {
-    sandbox.stub(page.resources_, 'getResourceForElement')
-        .returns({isDisplayed: () => true});
+    sandbox
+      .stub(page.resources_, 'getResourceForElement')
+      .returns({isDisplayed: () => true});
     const videoEl = win.document.createElement('video');
     videoEl.setAttribute('src', 'https://example.com/video.mp3');
     gridLayerEl.appendChild(videoEl);
@@ -298,80 +303,82 @@ describes.realWin('amp-story-page', {amp: true}, env => {
     let mediaPoolMock;
 
     page.buildCallback();
-    page.layoutCallback()
-        .then(() => page.mediaPoolPromise_)
-        .then(mediaPool => {
-          mediaPoolMock = sandbox.mock(mediaPool);
-          mediaPoolMock
-              .expects('pause')
-              .withExactArgs(videoEl, false /** rewindToBeginning */)
-              .once();
-
-          page.setState(PageState.PAUSED);
-
-          // `setState` runs code that creates subtasks (Promise callbacks).
-          // Waits for the next frame to make sure all the subtasks are
-          // already executed when we run the assertions.
-          win.requestAnimationFrame(() => {
-            mediaPoolMock.verify();
-            done();
-          });
+    page
+      .layoutCallback()
+      .then(() => page.mediaPoolPromise_)
+      .then(mediaPool => {
+        mediaPoolMock = sandbox.mock(mediaPool);
+        mediaPoolMock
+          .expects('pause')
+          .withExactArgs(videoEl, false /** rewindToBeginning */)
+          .once();
+
+        page.setState(PageState.PAUSED);
+
+        // `setState` runs code that creates subtasks (Promise callbacks).
+        // Waits for the next frame to make sure all the subtasks are
+        // already executed when we run the assertions.
+        win.requestAnimationFrame(() => {
+          mediaPoolMock.verify();
+          done();
         });
+      });
   });
 
   it('should find pageIds in a goToPage action', () => {
-    const actionButton = createElementWithAttributes(
-        win.document,
-        'button',
-        {'id': 'actionButton',
-          'on': 'tap:story.goToPage(id=pageId)'});
+    const actionButton = createElementWithAttributes(win.document, 'button', {
+      'id': 'actionButton',
+      'on': 'tap:story.goToPage(id=pageId)',
+    });
     element.appendChild(actionButton);
     page.buildCallback();
 
-    return page.layoutCallback()
-        .then(() => {
-          const actions = page.actions_();
+    return page.layoutCallback().then(() => {
+      const actions = page.actions_();
 
-          expect(actions.length).to.be.equal(1);
-          expect(actions[0]).to.be.equal('pageId');
-        });
+      expect(actions.length).to.be.equal(1);
+      expect(actions[0]).to.be.equal('pageId');
+    });
   });
 
   it('should find pageIds in a goToPage action with multiple actions', () => {
     const multipleActionButton = createElementWithAttributes(
-        win.document,
-        'button',
-        {'id': 'actionButton',
-          'on': 'tap:story.goToPage(id=pageId),foo.bar(baz=quux)'});
+      win.document,
+      'button',
+      {
+        'id': 'actionButton',
+        'on': 'tap:story.goToPage(id=pageId),foo.bar(baz=quux)',
+      }
+    );
     element.appendChild(multipleActionButton);
     page.buildCallback();
 
-    return page.layoutCallback()
-        .then(() => {
-          const actions = page.actions_();
+    return page.layoutCallback().then(() => {
+      const actions = page.actions_();
 
-          expect(actions.length).to.be.equal(1);
-          expect(actions[0]).to.be.equal('pageId');
-        });
+      expect(actions.length).to.be.equal(1);
+      expect(actions[0]).to.be.equal('pageId');
+    });
   });
 
   it('should find pageIds in a goToPage action with multiple events', () => {
     const multipleEventsButton = createElementWithAttributes(
-        win.document,
-        'button',
-        {'id': 'actionButton',
-          'on':
-            'tap:story.goToPage(id=pageId);action:foo.bar(baz=quux'});
+      win.document,
+      'button',
+      {
+        'id': 'actionButton',
+        'on': 'tap:story.goToPage(id=pageId);action:foo.bar(baz=quux',
+      }
+    );
     element.appendChild(multipleEventsButton);
     page.buildCallback();
 
-    return page.layoutCallback()
-        .then(() => {
-          const actions = page.actions_();
+    return page.layoutCallback().then(() => {
+      const actions = page.actions_();
 
-          expect(actions.length).to.be.equal(1);
-          expect(actions[0]).to.be.equal('pageId');
-        });
+      expect(actions.length).to.be.equal(1);
+      expect(actions[0]).to.be.equal('pageId');
+    });
   });
 
   it('should not build the open attachment UI if no attachment', () => {
@@ -379,30 +386,34 @@ describes.realWin('amp-story-page', {amp: true}, env => {
     return page.layoutCallback().then(() => {
       page.setState(PageState.PLAYING);
 
-      const openAttachmentEl =
-          element.querySelector('.i-amphtml-story-page-open-attachment');
+      const openAttachmentEl = element.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
       expect(openAttachmentEl).to.not.exist;
     });
   });
 
   it('should build the open attachment UI if attachment', () => {
-    const attachmentEl =
-        win.document.createElement('amp-story-page-attachment');
+    const attachmentEl = win.document.createElement(
+      'amp-story-page-attachment'
+    );
     element.appendChild(attachmentEl);
 
     page.buildCallback();
     return page.layoutCallback().then(() => {
       page.setState(PageState.PLAYING);
 
-      const openAttachmentEl =
-          element.querySelector('.i-amphtml-story-page-open-attachment');
+      const openAttachmentEl = element.querySelector(
+        '.i-amphtml-story-page-open-attachment'
+      );
       expect(openAttachmentEl).to.exist;
     });
   });
 
   it('should build the open attachment UI with custom CTA label', () => {
-    const attachmentEl =
-        win.document.createElement('amp-story-page-attachment');
+    const attachmentEl = win.document.createElement(
+      'amp-story-page-attachment'
+    );
     attachmentEl.setAttribute('data-cta-text', 'Custom label');
     element.appendChild(attachmentEl);
 
@@ -410,8 +421,9 @@ describes.realWin('amp-story-page', {amp: true}, env => {
     return page.layoutCallback().then(() => {
       page.setState(PageState.PLAYING);
 
-      const openAttachmentLabelEl =
-          element.querySelector('.i-amphtml-story-page-open-attachment-label');
+      const openAttachmentLabelEl = element.querySelector(
+        '.i-amphtml-story-page-open-attachment-label'
+      );
       expect(openAttachmentLabelEl.textContent).to.equal('Custom label');
     });
   });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-request-service.js b/extensions/amp-story/1.0/test/test-amp-story-request-service.js
index e5317ce76f10..f220dc8b7cc4 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-request-service.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-request-service.js
@@ -20,7 +20,6 @@ import {
   BOOKEND_CREDENTIALS_ATTRIBUTE_NAME,
 } from '../amp-story-request-service';
 
-
 describes.fakeWin('amp-story-store-service', {amp: true}, env => {
   let requestService;
   let storyElement;
@@ -49,18 +48,16 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const bookendUrl = 'https://publisher.com/bookend';
 
     bookendElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .withExactArgs(
-            bookendUrl,
-            {requireAmpResponseSourceOrigin: false},
-        )
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve();
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .withExactArgs(bookendUrl, {requireAmpResponseSourceOrigin: false})
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
 
     return requestService.loadBookendConfig().then(() => {
       xhrMock.verify();
@@ -72,14 +69,15 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const fetchedConfig = 'amazingConfig';
 
     bookendElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve(fetchedConfig);
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve(fetchedConfig);
+        },
+      })
+      .once();
 
     return requestService.loadBookendConfig().then(config => {
       expect(config).to.equal(fetchedConfig);
@@ -91,20 +89,22 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
     const bookendUrl = 'https://publisher.com/bookend';
 
     bookendElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
-    xhrMock.expects('fetchJson')
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve();
-          },
-        })
-        .once();
-
-    return requestService.loadBookendConfig()
-        .then(() => requestService.loadBookendConfig())
-        .then(() => {
-          xhrMock.verify();
-        });
+    xhrMock
+      .expects('fetchJson')
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
+
+    return requestService
+      .loadBookendConfig()
+      .then(() => requestService.loadBookendConfig())
+      .then(() => {
+        xhrMock.verify();
+      });
   });
 
   it('should fetch the bookend config with credentials', () => {
@@ -112,21 +112,19 @@ describes.fakeWin('amp-story-store-service', {amp: true}, env => {
 
     bookendElement.setAttribute(BOOKEND_CONFIG_ATTRIBUTE_NAME, bookendUrl);
     bookendElement.setAttribute(BOOKEND_CREDENTIALS_ATTRIBUTE_NAME, 'include');
-    xhrMock.expects('fetchJson')
-        .withExactArgs(
-            bookendUrl,
-            {
-              requireAmpResponseSourceOrigin: false,
-              credentials: 'include',
-            },
-        )
-        .resolves({
-          ok: true,
-          json() {
-            return Promise.resolve();
-          },
-        })
-        .once();
+    xhrMock
+      .expects('fetchJson')
+      .withExactArgs(bookendUrl, {
+        requireAmpResponseSourceOrigin: false,
+        credentials: 'include',
+      })
+      .resolves({
+        ok: true,
+        json() {
+          return Promise.resolve();
+        },
+      })
+      .once();
 
     return requestService.loadBookendConfig().then(() => {
       xhrMock.verify();
diff --git a/extensions/amp-story/1.0/test/test-amp-story-share-menu.js b/extensions/amp-story/1.0/test/test-amp-story-share-menu.js
index a4b2a59baef8..47adbb90822b 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-share-menu.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-share-menu.js
@@ -25,7 +25,6 @@ import {ShareMenu, VISIBLE_CLASS} from '../amp-story-share-menu';
 import {ShareWidget} from '../amp-story-share';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.realWin('amp-story-share-menu', {amp: true}, env => {
   let isSystemShareSupported;
   let parentEl;
@@ -81,9 +80,9 @@ describes.realWin('amp-story-share-menu', {amp: true}, env => {
 
   it('should build the share widget when building the component', () => {
     shareWidgetMock
-        .expects('build')
-        .once()
-        .returns(win.document.createElement('div'));
+      .expects('build')
+      .once()
+      .returns(win.document.createElement('div'));
 
     shareMenu.build();
 
diff --git a/extensions/amp-story/1.0/test/test-amp-story-store-service.js b/extensions/amp-story/1.0/test/test-amp-story-store-service.js
index cc5253289c97..4fc79752f66e 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-store-service.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-store-service.js
@@ -22,7 +22,6 @@ import {
 } from '../amp-story-store-service';
 import {EmbedMode, EmbedModeParam} from '../embed-mode';
 
-
 describes.fakeWin('amp-story-store-service', {}, env => {
   let storeService;
 
@@ -244,8 +243,10 @@ describes.fakeWin('amp-story-store-service actions', {}, env => {
 
     storeService.dispatch(Action.ADD_TO_ACTIONS_WHITELIST, action2);
 
-    expect(actionsListenerSpy)
-        .to.have.been.calledOnceWithExactly([action1, action2]);
+    expect(actionsListenerSpy).to.have.been.calledOnceWithExactly([
+      action1,
+      action2,
+    ]);
   });
 
   it('should add an array of actions to the whitelist', () => {
@@ -260,7 +261,10 @@ describes.fakeWin('amp-story-store-service actions', {}, env => {
 
     storeService.dispatch(Action.ADD_TO_ACTIONS_WHITELIST, [action2, action3]);
 
-    expect(actionsListenerSpy)
-        .to.have.been.calledOnceWithExactly([action1, action2, action3]);
+    expect(actionsListenerSpy).to.have.been.calledOnceWithExactly([
+      action1,
+      action2,
+      action3,
+    ]);
   });
 });
diff --git a/extensions/amp-story/1.0/test/test-amp-story-system-layer.js b/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
index b5aa976fd406..832437122522 100644
--- a/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
+++ b/extensions/amp-story/1.0/test/test-amp-story-system-layer.js
@@ -20,10 +20,8 @@ import {Services} from '../../../../src/services';
 import {SystemLayer} from '../amp-story-system-layer';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 const NOOP = () => {};
 
-
 describes.fakeWin('amp-story system layer', {amp: true}, env => {
   let win;
   let storeService;
@@ -58,8 +56,9 @@ describes.fakeWin('amp-story system layer', {amp: true}, env => {
   });
 
   it('should build UI', () => {
-    const initializeListeners =
-        sandbox.stub(systemLayer, 'initializeListeners_').callsFake(NOOP);
+    const initializeListeners = sandbox
+      .stub(systemLayer, 'initializeListeners_')
+      .callsFake(NOOP);
 
     const root = systemLayer.build();
 
@@ -100,7 +99,8 @@ describes.fakeWin('amp-story system layer', {amp: true}, env => {
     storeService.dispatch(Action.TOGGLE_MUTED, false);
     expect(systemLayer.getShadowRoot()).to.not.have.attribute('muted');
     expect(systemLayer.getShadowRoot()).to.not.have.attribute(
-        'i-amphtml-current-page-has-audio');
+      'i-amphtml-current-page-has-audio'
+    );
   });
 
   it('should show that the sound is on when unmuted', () => {
@@ -109,14 +109,16 @@ describes.fakeWin('amp-story system layer', {amp: true}, env => {
     storeService.dispatch(Action.TOGGLE_MUTED, false);
     expect(systemLayer.getShadowRoot()).to.not.have.attribute('muted');
     expect(systemLayer.getShadowRoot()).to.have.attribute(
-        'i-amphtml-current-page-has-audio');
+      'i-amphtml-current-page-has-audio'
+    );
   });
 
   it('should show the sidebar control only if a sidebar exists', () => {
     storeService.dispatch(Action.TOGGLE_HAS_SIDEBAR, true);
     systemLayer.build();
     expect(systemLayer.getShadowRoot()).to.have.attribute(
-        'i-amphtml-story-has-sidebar');
+      'i-amphtml-story-has-sidebar'
+    );
   });
 
   it('should hide system layer on SYSTEM_UI_IS_VISIBLE_STATE change', () => {
diff --git a/extensions/amp-story/1.0/test/test-amp-story.js b/extensions/amp-story/1.0/test/test-amp-story.js
index e08ed8ea4106..5774b3075b9d 100644
--- a/extensions/amp-story/1.0/test/test-amp-story.js
+++ b/extensions/amp-story/1.0/test/test-amp-story.js
@@ -36,98 +36,106 @@ import {createElementWithAttributes} from '../../../../src/dom';
 import {registerServiceBuilder} from '../../../../src/service';
 import {toggleExperiment} from '../../../../src/experiments';
 
-
 // Represents the correct value of KeyboardEvent.which for the Right Arrow
 const KEYBOARD_EVENT_WHICH_RIGHT_ARROW = 39;
 
-describes.realWin('amp-story', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story:1.0'],
+describes.realWin(
+  'amp-story',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story:1.0'],
+    },
   },
-}, env => {
-
-  let win;
-  let element;
-  let hasSwipeCapability = false;
-  let story;
-  let replaceStateStub;
-
-  /**
-   * @param {!Element} container
-   * @param {number} count
-   * @param {Array<string>=} opt_ids
-   * @return {!Array<!Element>}
-   */
-  function createPages(container, count, opt_ids) {
-    return Array(count).fill(undefined).map((unused, i) => {
-      const page = win.document.createElement('amp-story-page');
-      page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
-      container.appendChild(page);
-      return page;
-    });
-  }
+  env => {
+    let win;
+    let element;
+    let hasSwipeCapability = false;
+    let story;
+    let replaceStateStub;
+
+    /**
+     * @param {!Element} container
+     * @param {number} count
+     * @param {Array<string>=} opt_ids
+     * @return {!Array<!Element>}
+     */
+    function createPages(container, count, opt_ids) {
+      return Array(count)
+        .fill(undefined)
+        .map((unused, i) => {
+          const page = win.document.createElement('amp-story-page');
+          page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
+          container.appendChild(page);
+          return page;
+        });
+    }
 
-  /**
-   * @param {string} eventType
-   * @return {!Event}
-   */
-  function createEvent(eventType) {
-    const eventObj = document.createEventObject ?
-      document.createEventObject() : document.createEvent('Events');
-    if (eventObj.initEvent) {
-      eventObj.initEvent(eventType, true, true);
+    /**
+     * @param {string} eventType
+     * @return {!Event}
+     */
+    function createEvent(eventType) {
+      const eventObj = document.createEventObject
+        ? document.createEventObject()
+        : document.createEvent('Events');
+      if (eventObj.initEvent) {
+        eventObj.initEvent(eventType, true, true);
+      }
+      return eventObj;
     }
-    return eventObj;
-  }
 
-  beforeEach(() => {
-    win = env.win;
+    beforeEach(() => {
+      win = env.win;
 
-    replaceStateStub = sandbox.stub(win.history, 'replaceState');
+      replaceStateStub = sandbox.stub(win.history, 'replaceState');
 
-    const viewer = Services.viewerForDoc(env.ampdoc);
-    sandbox.stub(viewer, 'hasCapability')
-        .withArgs('swipe').returns(hasSwipeCapability);
+      const viewer = Services.viewerForDoc(env.ampdoc);
+      sandbox
+        .stub(viewer, 'hasCapability')
+        .withArgs('swipe')
+        .returns(hasSwipeCapability);
 
-    sandbox.stub(Services, 'storyStoreService')
+      sandbox
+        .stub(Services, 'storyStoreService')
         .callsFake(() => new AmpStoryStoreService(win));
 
-    element = win.document.createElement('amp-story');
-    win.document.body.appendChild(element);
+      element = win.document.createElement('amp-story');
+      win.document.body.appendChild(element);
 
-    const localizationService = new LocalizationService(win);
-    registerServiceBuilder(win, 'localization', () => localizationService);
+      const localizationService = new LocalizationService(win);
+      registerServiceBuilder(win, 'localization', () => localizationService);
 
-    AmpStory.isBrowserSupported = () => true;
+      AmpStory.isBrowserSupported = () => true;
 
-    return element.getImpl().then(impl => {
-      story = impl;
+      return element.getImpl().then(impl => {
+        story = impl;
+      });
     });
-  });
 
-  afterEach(() => {
-    element.remove();
-  });
+    afterEach(() => {
+      element.remove();
+    });
 
-  it('should build with the expected number of pages', () => {
-    const pagesCount = 2;
-    createPages(story.element, pagesCount, ['cover', 'page-1']);
+    it('should build with the expected number of pages', () => {
+      const pagesCount = 2;
+      createPages(story.element, pagesCount, ['cover', 'page-1']);
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.getPageCount()).to.equal(pagesCount);
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(story.getPageCount()).to.equal(pagesCount);
+      });
+    });
 
-  it('should activate the first page when built', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('should activate the first page when built', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    return story.layoutCallback()
+      return story
+        .layoutCallback()
         .then(() => {
           // Getting all the AmpStoryPage objets.
-          const pageElements =
-              story.element.getElementsByTagName('amp-story-page');
+          const pageElements = story.element.getElementsByTagName(
+            'amp-story-page'
+          );
           const pages = Array.from(pageElements).map(el => el.getImpl());
 
           return Promise.all(pages);
@@ -135,65 +143,68 @@ describes.realWin('amp-story', {
         .then(pages => {
           // Only the first page should be active.
           for (let i = 0; i < pages.length; i++) {
-            i === 0 ?
-              expect(pages[i].isActive()).to.be.true :
-              expect(pages[i].isActive()).to.be.false;
+            i === 0
+              ? expect(pages[i].isActive()).to.be.true
+              : expect(pages[i].isActive()).to.be.false;
           }
         });
-  });
-
-  it('should update the navigation state when built', () => {
-    const firstPageId = 'cover';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
-    const updateActivePageStub =
-        sandbox.stub(story.navigationState_, 'updateActivePage');
+    });
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(updateActivePageStub)
-              .to.have.been.calledWith(0, pageCount, firstPageId);
-        });
-  });
+    it('should update the navigation state when built', () => {
+      const firstPageId = 'cover';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
+      const updateActivePageStub = sandbox.stub(
+        story.navigationState_,
+        'updateActivePage'
+      );
+
+      return story.layoutCallback().then(() => {
+        expect(updateActivePageStub).to.have.been.calledWith(
+          0,
+          pageCount,
+          firstPageId
+        );
+      });
+    });
 
-  it('should preload the bookend if navigating to the last page', () => {
-    createPages(story.element, 1, ['cover']);
+    it('should preload the bookend if navigating to the last page', () => {
+      createPages(story.element, 1, ['cover']);
 
-    const buildBookendStub = sandbox.stub(story, 'buildAndPreloadBookend_');
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildBookendStub).to.have.been.calledOnce;
-        });
-  });
+      const buildBookendStub = sandbox.stub(story, 'buildAndPreloadBookend_');
+      return story.layoutCallback().then(() => {
+        expect(buildBookendStub).to.have.been.calledOnce;
+      });
+    });
 
-  it('should not preload the bookend if not on the last page', () => {
-    createPages(story.element, 2, ['cover']);
+    it('should not preload the bookend if not on the last page', () => {
+      createPages(story.element, 2, ['cover']);
 
-    const buildBookendStub = sandbox.stub(story, 'buildAndPreloadBookend_');
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildBookendStub).to.not.have.been.called;
-        });
-  });
+      const buildBookendStub = sandbox.stub(story, 'buildAndPreloadBookend_');
+      return story.layoutCallback().then(() => {
+        expect(buildBookendStub).to.not.have.been.called;
+      });
+    });
 
-  it('should prerender/load the share menu', () => {
-    createPages(story.element, 2);
+    it('should prerender/load the share menu', () => {
+      createPages(story.element, 2);
 
-    const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
+      const buildShareMenuStub = sandbox.stub(story.shareMenu_, 'build');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(buildShareMenuStub).to.have.been.calledOnce;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(buildShareMenuStub).to.have.been.calledOnce;
+      });
+    });
 
-  it('should return a valid page index', () => {
-    createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
-    return story.layoutCallback()
+    it('should return a valid page index', () => {
+      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      return story
+        .layoutCallback()
         .then(() => {
           // Getting all the AmpStoryPage objets.
-          const pageElements =
-            story.element.getElementsByTagName('amp-story-page');
+          const pageElements = story.element.getElementsByTagName(
+            'amp-story-page'
+          );
           const pages = Array.from(pageElements).map(el => el.getImpl());
 
           return Promise.all(pages);
@@ -204,19 +215,21 @@ describes.realWin('amp-story', {
             expect(story.getPageIndex(pages[i])).to.equal(i);
           }
         });
-  });
+    });
 
-  it('should pause/resume pages when switching pages', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
-    sandbox.stub(story, 'maybePreloadBookend_').returns();
-    let pauseOldPageStub;
-    let resumeNewPageStub;
+    it('should pause/resume pages when switching pages', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
+      sandbox.stub(story, 'maybePreloadBookend_').returns();
+      let pauseOldPageStub;
+      let resumeNewPageStub;
 
-    return story.layoutCallback()
+      return story
+        .layoutCallback()
         .then(() => {
           // Getting all the AmpStoryPage objects.
-          const pageElements =
-            story.element.getElementsByTagName('amp-story-page');
+          const pageElements = story.element.getElementsByTagName(
+            'amp-story-page'
+          );
           const pages = Array.from(pageElements).map(el => el.getImpl());
 
           return Promise.all(pages);
@@ -233,337 +246,334 @@ describes.realWin('amp-story', {
           expect(pauseOldPageStub).to.have.been.calledOnce;
           expect(resumeNewPageStub).to.have.been.calledOnce;
         });
-  });
+    });
 
-  // TODO(#11639): Re-enable this test.
-  it.skip('should go to next page on right arrow keydown', () => {
-    const pages = createPages(element, 5);
+    // TODO(#11639): Re-enable this test.
+    it.skip('should go to next page on right arrow keydown', () => {
+      const pages = createPages(element, 5);
 
-    element.build();
+      element.build();
 
-    expect(pages[0].hasAttribute('active')).to.be.true;
-    expect(pages[1].hasAttribute('active')).to.be.false;
+      expect(pages[0].hasAttribute('active')).to.be.true;
+      expect(pages[1].hasAttribute('active')).to.be.false;
 
-    // Stubbing because we need to assert synchronously
-    sandbox.stub(element.implementation_, 'mutateElement').callsFake(
-        mutator => {
+      // Stubbing because we need to assert synchronously
+      sandbox
+        .stub(element.implementation_, 'mutateElement')
+        .callsFake(mutator => {
           mutator();
           return Promise.resolve();
         });
 
-    const eventObj = createEvent('keydown');
-    eventObj.key = Keys.RIGHT_ARROW;
-    eventObj.which = KEYBOARD_EVENT_WHICH_RIGHT_ARROW;
-    const docEl = win.document.documentElement;
-    docEl.dispatchEvent ?
-      docEl.dispatchEvent(eventObj) :
-      docEl.fireEvent('onkeydown', eventObj);
+      const eventObj = createEvent('keydown');
+      eventObj.key = Keys.RIGHT_ARROW;
+      eventObj.which = KEYBOARD_EVENT_WHICH_RIGHT_ARROW;
+      const docEl = win.document.documentElement;
+      docEl.dispatchEvent
+        ? docEl.dispatchEvent(eventObj)
+        : docEl.fireEvent('onkeydown', eventObj);
 
-    expect(pages[0].hasAttribute('active')).to.be.false;
-    expect(pages[1].hasAttribute('active')).to.be.true;
-  });
+      expect(pages[0].hasAttribute('active')).to.be.false;
+      expect(pages[1].hasAttribute('active')).to.be.true;
+    });
 
-  it('lock body when amp-story is initialized', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('lock body when amp-story is initialized', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    return story.layoutCallback()
-        .then(() => {
-          story.lockBody_();
-          expect(win.document.body.style.getPropertyValue('overflow'))
-              .to.be.equal('hidden');
-          expect(
-              win.document.documentElement.style.getPropertyValue('overflow'))
-              .to.be.equal('hidden');
-        });
-  });
+      return story.layoutCallback().then(() => {
+        story.lockBody_();
+        expect(
+          win.document.body.style.getPropertyValue('overflow')
+        ).to.be.equal('hidden');
+        expect(
+          win.document.documentElement.style.getPropertyValue('overflow')
+        ).to.be.equal('hidden');
+      });
+    });
 
-  it('builds and attaches pagination buttons ', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('builds and attaches pagination buttons ', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    return story.layoutCallback()
-        .then(() => {
-          const paginationButtonsStub = {
-            attach: sandbox.spy(),
-            onNavigationStateChange: sandbox.spy(),
-          };
-          sandbox.stub(PaginationButtons, 'create')
-              .returns(paginationButtonsStub);
-          story.buildPaginationButtonsForTesting();
-          expect(paginationButtonsStub.attach)
-              .to.have.been.calledWith(story.element);
-        });
-  });
-
-  it.skip('toggles `i-amphtml-story-landscape` based on height and width',
-      () => {
-        story.element.style.width = '11px';
-        story.element.style.height = '10px';
-        const isDesktopStub = sandbox.stub(story, 'isDesktop_').returns(false);
-        story.vsync_ = {
-          run: (task, state) => {
-            if (task.measure) {
-              task.measure(state);
-            }
-            if (task.mutate) {
-              task.mutate(state);
-            }
-          },
+      return story.layoutCallback().then(() => {
+        const paginationButtonsStub = {
+          attach: sandbox.spy(),
+          onNavigationStateChange: sandbox.spy(),
         };
-        story.onResize();
-        expect(isDesktopStub).to.be.calledOnce;
-        expect(story.element.classList.contains('i-amphtml-story-landscape'))
-            .to.be.true;
-        story.element.style.width = '10px';
-        story.element.style.height = '11px';
-        story.onResize();
-        expect(isDesktopStub).to.be.calledTwice;
-        expect(story.element.classList.contains('i-amphtml-story-landscape'))
-            .to.be.false;
-      });
-
-  it('should update page id in store', () => {
-    const firstPageId = 'page-one';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
-    const dispatchStub =
-        sandbox.stub(story.storeService_, 'dispatch');
-
-    return story.layoutCallback()
-        .then(() => {
-          expect(dispatchStub).to.have.been.calledWith(Action.CHANGE_PAGE, {
-            id: firstPageId,
-            index: 0,
-          });
-        });
-  });
+        sandbox
+          .stub(PaginationButtons, 'create')
+          .returns(paginationButtonsStub);
+        story.buildPaginationButtonsForTesting();
+        expect(paginationButtonsStub.attach).to.have.been.calledWith(
+          story.element
+        );
+      });
+    });
 
-  it('should update page id in browser history', () => {
-    const firstPageId = 'page-zero';
-    const pageCount = 2;
-    createPages(story.element, pageCount, [firstPageId, 'page-1']);
+    it.skip('toggles `i-amphtml-story-landscape` based on height and width', () => {
+      story.element.style.width = '11px';
+      story.element.style.height = '10px';
+      const isDesktopStub = sandbox.stub(story, 'isDesktop_').returns(false);
+      story.vsync_ = {
+        run: (task, state) => {
+          if (task.measure) {
+            task.measure(state);
+          }
+          if (task.mutate) {
+            task.mutate(state);
+          }
+        },
+      };
+      story.onResize();
+      expect(isDesktopStub).to.be.calledOnce;
+      expect(story.element.classList.contains('i-amphtml-story-landscape')).to
+        .be.true;
+      story.element.style.width = '10px';
+      story.element.style.height = '11px';
+      story.onResize();
+      expect(isDesktopStub).to.be.calledTwice;
+      expect(story.element.classList.contains('i-amphtml-story-landscape')).to
+        .be.false;
+    });
 
-    return story.layoutCallback()
-        .then(() => {
-          return expect(replaceStateStub).to.have.been.calledWith(
-              {ampStoryPageId: firstPageId},
-              '',
-          );
+    it('should update page id in store', () => {
+      const firstPageId = 'page-one';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
+      const dispatchStub = sandbox.stub(story.storeService_, 'dispatch');
+
+      return story.layoutCallback().then(() => {
+        expect(dispatchStub).to.have.been.calledWith(Action.CHANGE_PAGE, {
+          id: firstPageId,
+          index: 0,
         });
-  });
+      });
+    });
 
-  it('should update bookend status in browser history', () => {
-    const pageCount = 1;
-    createPages(story.element, pageCount, ['last-page']);
+    it('should update page id in browser history', () => {
+      const firstPageId = 'page-zero';
+      const pageCount = 2;
+      createPages(story.element, pageCount, [firstPageId, 'page-1']);
 
-    sandbox.stub(AmpStoryBookend.prototype, 'build');
+      return story.layoutCallback().then(() => {
+        return expect(replaceStateStub).to.have.been.calledWith(
+          {ampStoryPageId: firstPageId},
+          ''
+        );
+      });
+    });
 
-    story.buildCallback();
+    it('should update bookend status in browser history', () => {
+      const pageCount = 1;
+      createPages(story.element, pageCount, ['last-page']);
 
-    return story.layoutCallback()
-        .then(() => {
-          story.storeService_.dispatch(Action.TOGGLE_BOOKEND, true);
+      sandbox.stub(AmpStoryBookend.prototype, 'build');
 
-          return expect(replaceStateStub).to.have.been.calledWith(
-              {ampStoryBookendActive: true}, '',
-          );
-        });
-  });
+      story.buildCallback();
 
+      return story.layoutCallback().then(() => {
+        story.storeService_.dispatch(Action.TOGGLE_BOOKEND, true);
 
-  it('should not block layoutCallback when bookend xhr fails', () => {
-    createPages(story.element, 1, ['page-1']);
-    sandbox.stub(AmpStoryBookend.prototype, 'build');
+        return expect(replaceStateStub).to.have.been.calledWith(
+          {ampStoryBookendActive: true},
+          ''
+        );
+      });
+    });
+
+    it('should not block layoutCallback when bookend xhr fails', () => {
+      createPages(story.element, 1, ['page-1']);
+      sandbox.stub(AmpStoryBookend.prototype, 'build');
 
-    const bookendXhr = sandbox
+      const bookendXhr = sandbox
         .stub(AmpStoryBookend.prototype, 'loadConfigAndMaybeRenderBookend')
         .returns(Promise.reject());
 
-    story.buildCallback();
-
-    return story.layoutCallback().then(() => {
-      expect(bookendXhr).to.have.been.calledOnce;
-    }).catch(error => {
-      expect(error).to.be.undefined;
-    });
-  });
-
-  it('should NOT update page id in browser history if ad', () => {
-    const firstPageId = 'i-amphtml-ad-page-1';
-    const pageCount = 2;
-    const pages = createPages(story.element, pageCount,
-        [firstPageId, 'page-1']);
-    const firstPage = pages[0];
-    firstPage.setAttribute('ad', '');
+      story.buildCallback();
 
-    return story.layoutCallback()
+      return story
+        .layoutCallback()
         .then(() => {
-          return expect(replaceStateStub).to.not.have.been.called;
+          expect(bookendXhr).to.have.been.calledOnce;
+        })
+        .catch(error => {
+          expect(error).to.be.undefined;
         });
-  });
+    });
 
-  it('should not set first page to active when rendering paused story', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('should NOT update page id in browser history if ad', () => {
+      const firstPageId = 'i-amphtml-ad-page-1';
+      const pageCount = 2;
+      const pages = createPages(story.element, pageCount, [
+        firstPageId,
+        'page-1',
+      ]);
+      const firstPage = pages[0];
+      firstPage.setAttribute('ad', '');
+
+      return story.layoutCallback().then(() => {
+        return expect(replaceStateStub).to.not.have.been.called;
+      });
+    });
 
-    story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+    it('should not set first page to active when rendering paused story', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.getPageById('cover').state_)
-              .to.equal(PageState.NOT_ACTIVE);
-        });
-  });
+      story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
-  it('should default to the three panels UI desktop experience', () => {
-    createPages(story.element, 4, ['cover', '1', '2', '3']);
+      return story.layoutCallback().then(() => {
+        expect(story.getPageById('cover').state_).to.equal(
+          PageState.NOT_ACTIVE
+        );
+      });
+    });
 
-    // Don't do this at home. :(
-    story.desktopMedia_ = {matches: true};
+    it('should default to the three panels UI desktop experience', () => {
+      createPages(story.element, 4, ['cover', '1', '2', '3']);
 
-    story.buildCallback();
+      // Don't do this at home. :(
+      story.desktopMedia_ = {matches: true};
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.storeService_.get(StateProperty.UI_STATE))
-              .to.equals(UIType.DESKTOP_PANELS);
-        });
-  });
+      story.buildCallback();
 
-  it('should detect landscape opt in', () => {
-    createPages(story.element, 4, ['cover', '1', '2', '3']);
-    story.element.setAttribute('supports-landscape', '');
+      return story.layoutCallback().then(() => {
+        expect(story.storeService_.get(StateProperty.UI_STATE)).to.equals(
+          UIType.DESKTOP_PANELS
+        );
+      });
+    });
 
-    // Don't do this at home. :(
-    story.desktopMedia_ = {matches: true};
+    it('should detect landscape opt in', () => {
+      createPages(story.element, 4, ['cover', '1', '2', '3']);
+      story.element.setAttribute('supports-landscape', '');
 
-    story.buildCallback();
+      // Don't do this at home. :(
+      story.desktopMedia_ = {matches: true};
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.storeService_.get(StateProperty.UI_STATE))
-              .to.equals(UIType.DESKTOP_FULLBLEED);
-        });
-  });
+      story.buildCallback();
 
-  it('should add a desktop attribute', () => {
-    createPages(story.element, 2, ['cover', '1']);
+      return story.layoutCallback().then(() => {
+        expect(story.storeService_.get(StateProperty.UI_STATE)).to.equals(
+          UIType.DESKTOP_FULLBLEED
+        );
+      });
+    });
 
-    story.desktopMedia_ = {matches: true};
+    it('should add a desktop attribute', () => {
+      createPages(story.element, 2, ['cover', '1']);
 
-    story.buildCallback();
+      story.desktopMedia_ = {matches: true};
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.element).to.have.attribute('desktop');
-        });
-  });
+      story.buildCallback();
 
-  it('should have a meta tag that sets the theme color', () => {
-    createPages(story.element, 2);
-    story.buildCallback();
-    return story.layoutCallback()
-        .then(() => {
-          const metaTag = win.document.querySelector('meta[name=theme-color]');
-          expect(metaTag).to.not.be.null;
-        });
-  });
+      return story.layoutCallback().then(() => {
+        expect(story.element).to.have.attribute('desktop');
+      });
+    });
 
-  it('should set the orientation portrait attribute on render', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('should have a meta tag that sets the theme color', () => {
+      createPages(story.element, 2);
+      story.buildCallback();
+      return story.layoutCallback().then(() => {
+        const metaTag = win.document.querySelector('meta[name=theme-color]');
+        expect(metaTag).to.not.be.null;
+      });
+    });
 
-    story.landscapeOrientationMedia_ = {matches: false};
-    story.element.setAttribute('standalone', '');
-    story.element.setAttribute('supports-landscape', '');
+    it('should set the orientation portrait attribute on render', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    story.buildCallback();
+      story.landscapeOrientationMedia_ = {matches: false};
+      story.element.setAttribute('standalone', '');
+      story.element.setAttribute('supports-landscape', '');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.element).to.have.attribute('orientation');
-          expect(story.element.getAttribute('orientation'))
-              .to.equal('portrait');
-        });
-  });
+      story.buildCallback();
 
-  it('should set the orientation landscape attribute on render', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+      return story.layoutCallback().then(() => {
+        expect(story.element).to.have.attribute('orientation');
+        expect(story.element.getAttribute('orientation')).to.equal('portrait');
+      });
+    });
 
-    story.landscapeOrientationMedia_ = {matches: true};
-    story.element.setAttribute('standalone', '');
-    story.element.setAttribute('supports-landscape', '');
+    it('should set the orientation landscape attribute on render', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    story.buildCallback();
+      story.landscapeOrientationMedia_ = {matches: true};
+      story.element.setAttribute('standalone', '');
+      story.element.setAttribute('supports-landscape', '');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.element).to.have.attribute('orientation');
-          expect(story.element.getAttribute('orientation'))
-              .to.equal('landscape');
-        });
-  });
+      story.buildCallback();
 
-  it('should not set orientation landscape if no supports-landscape', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+      return story.layoutCallback().then(() => {
+        expect(story.element).to.have.attribute('orientation');
+        expect(story.element.getAttribute('orientation')).to.equal('landscape');
+      });
+    });
 
-    story.landscapeOrientationMedia_ = {matches: true};
-    story.element.setAttribute('standalone', '');
+    it('should not set orientation landscape if no supports-landscape', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    story.buildCallback();
+      story.landscapeOrientationMedia_ = {matches: true};
+      story.element.setAttribute('standalone', '');
 
-    return story.layoutCallback()
-        .then(() => {
-          expect(story.element).to.have.attribute('orientation');
-          expect(story.element.getAttribute('orientation'))
-              .to.equal('portrait');
-        });
-  });
+      story.buildCallback();
+
+      return story.layoutCallback().then(() => {
+        expect(story.element).to.have.attribute('orientation');
+        expect(story.element.getAttribute('orientation')).to.equal('portrait');
+      });
+    });
 
-  it('should update the orientation landscape attribute', () => {
-    createPages(story.element, 2, ['cover', 'page-1']);
+    it('should update the orientation landscape attribute', () => {
+      createPages(story.element, 2, ['cover', 'page-1']);
 
-    story.landscapeOrientationMedia_ = {matches: true};
-    story.element.setAttribute('standalone', '');
-    story.element.setAttribute('supports-landscape', '');
-    sandbox.stub(story, 'mutateElement').callsFake(fn => fn());
+      story.landscapeOrientationMedia_ = {matches: true};
+      story.element.setAttribute('standalone', '');
+      story.element.setAttribute('supports-landscape', '');
+      sandbox.stub(story, 'mutateElement').callsFake(fn => fn());
 
-    story.buildCallback();
+      story.buildCallback();
 
-    return story.layoutCallback()
+      return story
+        .layoutCallback()
         .then(() => {
           story.landscapeOrientationMedia_ = {matches: false};
           story.onResize();
         })
         .then(() => {
           expect(story.element).to.have.attribute('orientation');
-          expect(story.element.getAttribute('orientation'))
-              .to.equal('portrait');
+          expect(story.element.getAttribute('orientation')).to.equal(
+            'portrait'
+          );
         });
-  });
+    });
 
-  describe('amp-story consent', () => {
-    it('should pause the story if there is a consent', () => {
-      sandbox.stub(Services, 'actionServiceForDoc')
+    describe('amp-story consent', () => {
+      it('should pause the story if there is a consent', () => {
+        sandbox
+          .stub(Services, 'actionServiceForDoc')
           .returns({setWhitelist: () => {}, trigger: () => {}});
 
-      // Prevents amp-story-consent element from running code that is irrelevant
-      // to this test.
-      sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
+        // Prevents amp-story-consent element from running code that is irrelevant
+        // to this test.
+        sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
 
-      const consentEl = win.document.createElement('amp-consent');
-      const storyConsentEl = win.document.createElement('amp-story-consent');
-      consentEl.appendChild(storyConsentEl);
-      element.appendChild(consentEl);
+        const consentEl = win.document.createElement('amp-consent');
+        const storyConsentEl = win.document.createElement('amp-story-consent');
+        consentEl.appendChild(storyConsentEl);
+        element.appendChild(consentEl);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      // Never resolving consent promise, emulating a user looking at the
-      // consent prompt.
-      const promise = new Promise(() => {});
-      sandbox.stub(consent, 'getConsentPolicyState').returns(promise);
+        // Never resolving consent promise, emulating a user looking at the
+        // consent prompt.
+        const promise = new Promise(() => {});
+        sandbox.stub(consent, 'getConsentPolicyState').returns(promise);
 
-      const coverEl = element.querySelector('amp-story-page');
-      let setStateStub;
+        const coverEl = element.querySelector('amp-story-page');
+        let setStateStub;
 
-      return coverEl.getImpl()
+        return coverEl
+          .getImpl()
           .then(cover => {
             setStateStub = sandbox.stub(cover, 'setState');
             return story.layoutCallback();
@@ -573,39 +583,42 @@ describes.realWin('amp-story', {
             // avoid a situation where we set the page to active, then paused,
             // which would spam the media pool with expensive operations.
             expect(setStateStub).to.have.been.calledOnce;
-            expect(setStateStub.getCall(0))
-                .to.have.been.calledWithExactly(PageState.NOT_ACTIVE);
+            expect(setStateStub.getCall(0)).to.have.been.calledWithExactly(
+              PageState.NOT_ACTIVE
+            );
           });
-    });
+      });
 
-    it('should play the story after the consent is resolved', () => {
-      sandbox.stub(Services, 'actionServiceForDoc')
+      it('should play the story after the consent is resolved', () => {
+        sandbox
+          .stub(Services, 'actionServiceForDoc')
           .returns({setWhitelist: () => {}, trigger: () => {}});
 
-      // Prevents amp-story-consent element from running code that is irrelevant
-      // to this test.
-      sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
+        // Prevents amp-story-consent element from running code that is irrelevant
+        // to this test.
+        sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
 
-      const consentEl = win.document.createElement('amp-consent');
-      const storyConsentEl = win.document.createElement('amp-story-consent');
-      consentEl.appendChild(storyConsentEl);
-      element.appendChild(consentEl);
+        const consentEl = win.document.createElement('amp-consent');
+        const storyConsentEl = win.document.createElement('amp-story-consent');
+        consentEl.appendChild(storyConsentEl);
+        element.appendChild(consentEl);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      // In a real scenario, promise is resolved when the user accepted or
-      // rejected the consent.
-      let resolver;
-      const promise = new Promise(resolve => {
-        resolver = resolve;
-      });
+        // In a real scenario, promise is resolved when the user accepted or
+        // rejected the consent.
+        let resolver;
+        const promise = new Promise(resolve => {
+          resolver = resolve;
+        });
 
-      sandbox.stub(consent, 'getConsentPolicyState').returns(promise);
+        sandbox.stub(consent, 'getConsentPolicyState').returns(promise);
 
-      const coverEl = element.querySelector('amp-story-page');
-      let setStateStub;
+        const coverEl = element.querySelector('amp-story-page');
+        let setStateStub;
 
-      return coverEl.getImpl()
+        return coverEl
+          .getImpl()
           .then(cover => {
             setStateStub = sandbox.stub(cover, 'setState');
             return story.layoutCallback();
@@ -617,36 +630,40 @@ describes.realWin('amp-story', {
             // then back to active, which would spam the media pool with
             // expensive operations.
             expect(setStateStub).to.have.been.calledTwice;
-            expect(setStateStub.getCall(0))
-                .to.have.been.calledWithExactly(PageState.NOT_ACTIVE);
-            expect(setStateStub.getCall(1))
-                .to.have.been.calledWithExactly(PageState.PLAYING);
+            expect(setStateStub.getCall(0)).to.have.been.calledWithExactly(
+              PageState.NOT_ACTIVE
+            );
+            expect(setStateStub.getCall(1)).to.have.been.calledWithExactly(
+              PageState.PLAYING
+            );
           });
-    });
+      });
 
-    it('should play the story if the consent was already resolved', () => {
-      sandbox.stub(Services, 'actionServiceForDoc')
+      it('should play the story if the consent was already resolved', () => {
+        sandbox
+          .stub(Services, 'actionServiceForDoc')
           .returns({setWhitelist: () => {}, trigger: () => {}});
 
-      // Prevents amp-story-consent element from running code that is irrelevant
-      // to this test.
-      sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
+        // Prevents amp-story-consent element from running code that is irrelevant
+        // to this test.
+        sandbox.stub(AmpStoryConsent.prototype, 'buildCallback');
 
-      const consentEl = win.document.createElement('amp-consent');
-      const storyConsentEl = win.document.createElement('amp-story-consent');
-      consentEl.appendChild(storyConsentEl);
-      element.appendChild(consentEl);
+        const consentEl = win.document.createElement('amp-consent');
+        const storyConsentEl = win.document.createElement('amp-story-consent');
+        consentEl.appendChild(storyConsentEl);
+        element.appendChild(consentEl);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      // Returns an already resolved promised: the user already accepted or
-      // rejected the consent in a previous session.
-      sandbox.stub(consent, 'getConsentPolicyState').resolves();
+        // Returns an already resolved promised: the user already accepted or
+        // rejected the consent in a previous session.
+        sandbox.stub(consent, 'getConsentPolicyState').resolves();
 
-      const coverEl = element.querySelector('amp-story-page');
-      let setStateStub;
+        const coverEl = element.querySelector('amp-story-page');
+        let setStateStub;
 
-      return coverEl.getImpl()
+        return coverEl
+          .getImpl()
           .then(cover => {
             setStateStub = sandbox.stub(cover, 'setState');
             return story.layoutCallback();
@@ -657,218 +674,236 @@ describes.realWin('amp-story', {
             // then back to active, which would spam the media pool with
             // expensive operations.
             expect(setStateStub).to.have.been.calledTwice;
-            expect(setStateStub.getCall(0))
-                .to.have.been.calledWithExactly(PageState.NOT_ACTIVE);
-            expect(setStateStub.getCall(1))
-                .to.have.been.calledWithExactly(PageState.PLAYING);
+            expect(setStateStub.getCall(0)).to.have.been.calledWithExactly(
+              PageState.NOT_ACTIVE
+            );
+            expect(setStateStub.getCall(1)).to.have.been.calledWithExactly(
+              PageState.PLAYING
+            );
           });
+      });
     });
-  });
 
-  describe('amp-story pause/resume callbacks', () => {
-    it('should pause the story when tab becomes inactive', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+    describe('amp-story pause/resume callbacks', () => {
+      it('should pause the story when tab becomes inactive', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      sandbox.stub(story.documentState_, 'isHidden').returns(true);
-      const onVisibilityChangedStub =
-          sandbox.stub(story.documentState_, 'onVisibilityChanged');
+        sandbox.stub(story.documentState_, 'isHidden').returns(true);
+        const onVisibilityChangedStub = sandbox.stub(
+          story.documentState_,
+          'onVisibilityChanged'
+        );
 
-      story.buildCallback();
+        story.buildCallback();
 
-      return story.layoutCallback()
-          .then(() => {
-            // Execute the callback passed to onVisibilityChanged.
-            expect(onVisibilityChangedStub).to.have.been.calledOnce;
-            onVisibilityChangedStub.getCall(0).args[0]();
+        return story.layoutCallback().then(() => {
+          // Execute the callback passed to onVisibilityChanged.
+          expect(onVisibilityChangedStub).to.have.been.calledOnce;
+          onVisibilityChangedStub.getCall(0).args[0]();
 
-            // Paused state has been changed to true.
-            expect(story.storeService_.get(StateProperty.PAUSED_STATE))
-                .to.be.true;
-          });
-    });
+          // Paused state has been changed to true.
+          expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be
+            .true;
+        });
+      });
 
-    it('should play the story when tab becomes active', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should play the story when tab becomes active', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      sandbox.stub(story.documentState_, 'isHidden').returns(false);
-      const onVisibilityChangedStub =
-          sandbox.stub(story.documentState_, 'onVisibilityChanged');
+        sandbox.stub(story.documentState_, 'isHidden').returns(false);
+        const onVisibilityChangedStub = sandbox.stub(
+          story.documentState_,
+          'onVisibilityChanged'
+        );
 
-      story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+        story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
-      story.buildCallback();
+        story.buildCallback();
 
-      return story.layoutCallback()
-          .then(() => {
-            // Execute the callback passed to onVisibilityChanged.
-            expect(onVisibilityChangedStub).to.have.been.calledOnce;
-            onVisibilityChangedStub.getCall(0).args[0]();
+        return story.layoutCallback().then(() => {
+          // Execute the callback passed to onVisibilityChanged.
+          expect(onVisibilityChangedStub).to.have.been.calledOnce;
+          onVisibilityChangedStub.getCall(0).args[0]();
 
-            // Paused state has been changed to false.
-            expect(story.storeService_.get(StateProperty.PAUSED_STATE))
-                .to.be.false;
-          });
-    });
+          // Paused state has been changed to false.
+          expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be
+            .false;
+        });
+      });
 
-    it('should pause the story when viewer becomes inactive', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should pause the story when viewer becomes inactive', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      return story.layoutCallback()
-          .then(() => {
-            story.pauseCallback();
-            expect(story.storeService_.get(StateProperty.PAUSED_STATE))
-                .to.be.true;
-          });
-    });
+        return story.layoutCallback().then(() => {
+          story.pauseCallback();
+          expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be
+            .true;
+        });
+      });
 
-    it('should play the story when viewer becomes active', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should play the story when viewer becomes active', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+        story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
-      return story.layoutCallback()
-          .then(() => {
-            story.resumeCallback();
-            expect(story.storeService_.get(StateProperty.PAUSED_STATE))
-                .to.be.false;
-          });
-    });
+        return story.layoutCallback().then(() => {
+          story.resumeCallback();
+          expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be
+            .false;
+        });
+      });
 
-    it('should keep the story paused on resume when previously paused', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should keep the story paused on resume when previously paused', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
+        story.storeService_.dispatch(Action.TOGGLE_PAUSED, true);
 
-      return story.layoutCallback()
-          .then(() => {
-            story.pauseCallback();
-            story.resumeCallback();
-            expect(story.storeService_.get(StateProperty.PAUSED_STATE))
-                .to.be.true;
-          });
+        return story.layoutCallback().then(() => {
+          story.pauseCallback();
+          story.resumeCallback();
+          expect(story.storeService_.get(StateProperty.PAUSED_STATE)).to.be
+            .true;
+        });
+      });
     });
-  });
 
-  describe('amp-story continue anyway', () => {
-    it('should not display layout', () => {
-      AmpStory.isBrowserSupported = () => false;
-      story = new AmpStory(element);
-      const dispatchStub = sandbox.stub(story.storeService_, 'dispatch');
-      createPages(story.element, 2, ['cover', 'page-4']);
-      return story.layoutCallback()
-          .then(() => {
-            expect(dispatchStub).to.have.been.calledWith(
-                Action.TOGGLE_SUPPORTED_BROWSER, false
-            );
-          });
-    });
+    describe('amp-story continue anyway', () => {
+      it('should not display layout', () => {
+        AmpStory.isBrowserSupported = () => false;
+        story = new AmpStory(element);
+        const dispatchStub = sandbox.stub(story.storeService_, 'dispatch');
+        createPages(story.element, 2, ['cover', 'page-4']);
+        return story.layoutCallback().then(() => {
+          expect(dispatchStub).to.have.been.calledWith(
+            Action.TOGGLE_SUPPORTED_BROWSER,
+            false
+          );
+        });
+      });
 
-    it('should display the story after clicking "continue" button', () => {
-      AmpStory.isBrowserSupported = () => false;
-      story = new AmpStory(element);
-      const dispatchStub = sandbox.stub(
-          story.unsupportedBrowserLayer_.storeService_, 'dispatch');
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should display the story after clicking "continue" button', () => {
+        AmpStory.isBrowserSupported = () => false;
+        story = new AmpStory(element);
+        const dispatchStub = sandbox.stub(
+          story.unsupportedBrowserLayer_.storeService_,
+          'dispatch'
+        );
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      story.buildCallback();
+        story.buildCallback();
 
-      return story.layoutCallback()
+        return story
+          .layoutCallback()
           .then(() => {
             story.unsupportedBrowserLayer_.continueButton_.click();
           })
           .then(() => {
             expect(dispatchStub).to.have.been.calledWith(
-                Action.TOGGLE_SUPPORTED_BROWSER, true
+              Action.TOGGLE_SUPPORTED_BROWSER,
+              true
             );
           });
+      });
     });
-  });
 
-  describe('amp-story custom sidebar', () => {
-    it('should show the sidebar control if a sidebar exists', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+    describe('amp-story custom sidebar', () => {
+      it('should show the sidebar control if a sidebar exists', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      const sidebar = win.document.createElement('amp-sidebar');
-      story.element.appendChild(sidebar);
+        const sidebar = win.document.createElement('amp-sidebar');
+        story.element.appendChild(sidebar);
 
-      return story.layoutCallback()
-          .then(() => {
-            expect(story.storeService_
-                .get(StateProperty.HAS_SIDEBAR_STATE)).to.be.true;
-          });
-    });
+        return story.layoutCallback().then(() => {
+          expect(story.storeService_.get(StateProperty.HAS_SIDEBAR_STATE)).to.be
+            .true;
+        });
+      });
 
-    it('should open the sidebar on button click', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should open the sidebar on button click', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      const sidebar = win.document.createElement('amp-sidebar');
-      story.element.appendChild(sidebar);
+        const sidebar = win.document.createElement('amp-sidebar');
+        story.element.appendChild(sidebar);
 
-      const executeSpy = sandbox.spy();
-      sandbox.stub(Services, 'actionServiceForDoc')
-          .returns({setWhitelist: () => {}, trigger: () => {},
-            execute: executeSpy,
-          });
+        const executeSpy = sandbox.spy();
+        sandbox.stub(Services, 'actionServiceForDoc').returns({
+          setWhitelist: () => {},
+          trigger: () => {},
+          execute: executeSpy,
+        });
 
-      story.buildCallback();
-      return story.layoutCallback()
-          .then(() => {
-            story.storeService_.dispatch(Action.TOGGLE_SIDEBAR, true);
-            expect(executeSpy).to.have.been.calledWith(story.sidebar_, 'open',
-                null, null, null, null, ActionTrust.HIGH);
-          });
-    });
+        story.buildCallback();
+        return story.layoutCallback().then(() => {
+          story.storeService_.dispatch(Action.TOGGLE_SIDEBAR, true);
+          expect(executeSpy).to.have.been.calledWith(
+            story.sidebar_,
+            'open',
+            null,
+            null,
+            null,
+            null,
+            ActionTrust.HIGH
+          );
+        });
+      });
 
-    it('should unpause the story when the sidebar is closed', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should unpause the story when the sidebar is closed', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      const sidebar = win.document.createElement('amp-sidebar');
-      story.element.appendChild(sidebar);
+        const sidebar = win.document.createElement('amp-sidebar');
+        story.element.appendChild(sidebar);
 
-      sandbox.stub(Services, 'actionServiceForDoc')
-          .returns({setWhitelist: () => {}, trigger: () => {},
-            execute: () => {sidebar.setAttribute('open', '');}});
+        sandbox.stub(Services, 'actionServiceForDoc').returns({
+          setWhitelist: () => {},
+          trigger: () => {},
+          execute: () => {
+            sidebar.setAttribute('open', '');
+          },
+        });
 
-      story.buildCallback();
-      return story.layoutCallback()
+        story.buildCallback();
+        return story
+          .layoutCallback()
           .then(() => {
             story.storeService_.dispatch(Action.TOGGLE_SIDEBAR, true);
-          }).then(() => {
+          })
+          .then(() => {
             story.sidebar_.removeAttribute('open');
-          }).then(() => {
-            expect(story.storeService_.get(StateProperty.SIDEBAR_STATE))
-                .to.be.false;
+          })
+          .then(() => {
+            expect(story.storeService_.get(StateProperty.SIDEBAR_STATE)).to.be
+              .false;
           });
+      });
     });
-  });
 
-  describe('desktop attributes', () => {
-    it('should add desktop-position attributes', () => {
-      const desktopAttribute = 'i-amphtml-desktop-position';
-      const pages = createPages(story.element, 4, ['cover', '1', '2', '3']);
+    describe('desktop attributes', () => {
+      it('should add desktop-position attributes', () => {
+        const desktopAttribute = 'i-amphtml-desktop-position';
+        const pages = createPages(story.element, 4, ['cover', '1', '2', '3']);
 
-      story.buildCallback();
+        story.buildCallback();
 
-      story.storeService_.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_PANELS);
+        story.storeService_.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_PANELS);
 
-      return story.layoutCallback()
-          .then(() => {
-            expect(pages[0].getAttribute(desktopAttribute)).to.equal('0');
-            expect(pages[1].getAttribute(desktopAttribute)).to.equal('1');
-            expect(pages[2].getAttribute(desktopAttribute)).to.equal('2');
-            expect(pages[3].hasAttribute(desktopAttribute)).to.be.false;
-          });
-    });
+        return story.layoutCallback().then(() => {
+          expect(pages[0].getAttribute(desktopAttribute)).to.equal('0');
+          expect(pages[1].getAttribute(desktopAttribute)).to.equal('1');
+          expect(pages[2].getAttribute(desktopAttribute)).to.equal('2');
+          expect(pages[3].hasAttribute(desktopAttribute)).to.be.false;
+        });
+      });
 
-    it('should update desktop-position attributes upon navigation', () => {
-      const desktopAttribute = 'i-amphtml-desktop-position';
-      const pages = createPages(story.element, 4, ['cover', '1', '2', '3']);
+      it('should update desktop-position attributes upon navigation', () => {
+        const desktopAttribute = 'i-amphtml-desktop-position';
+        const pages = createPages(story.element, 4, ['cover', '1', '2', '3']);
 
-      story.buildCallback();
+        story.buildCallback();
 
-      story.storeService_.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_PANELS);
+        story.storeService_.dispatch(Action.TOGGLE_UI, UIType.DESKTOP_PANELS);
 
-      return story.layoutCallback()
+        return story
+          .layoutCallback()
           .then(() => story.switchTo_('2'))
           .then(() => {
             expect(pages[0].getAttribute(desktopAttribute)).to.equal('-2');
@@ -876,362 +911,379 @@ describes.realWin('amp-story', {
             expect(pages[2].getAttribute(desktopAttribute)).to.equal('0');
             expect(pages[3].getAttribute(desktopAttribute)).to.equal('1');
           });
-    });
+      });
 
-    it('should add previous visited attribute', () => {
-      sandbox.stub(story, 'maybePreloadBookend_').returns();
-      sandbox.stub(utils, 'setAttributeInMutate').callsFake(
-          (el, attr) => el.element.setAttribute(attr, ''));
+      it('should add previous visited attribute', () => {
+        sandbox.stub(story, 'maybePreloadBookend_').returns();
+        sandbox
+          .stub(utils, 'setAttributeInMutate')
+          .callsFake((el, attr) => el.element.setAttribute(attr, ''));
 
-      const pages = createPages(story.element, 2, ['page-0', 'page-1']);
-      const page0 = pages[0];
-      return story.layoutCallback()
+        const pages = createPages(story.element, 2, ['page-0', 'page-1']);
+        const page0 = pages[0];
+        return story
+          .layoutCallback()
           .then(() => story.switchTo_('page-1'))
           .then(() => {
             expect(page0.hasAttribute('i-amphtml-visited')).to.be.true;
           });
+      });
     });
-  });
-
-  describe('amp-story audio', () => {
-    it('should register and preload the background audio', () => {
-      const src = 'https://example.com/foo.mp3';
-      story.element.setAttribute('background-audio', src);
-      const registerStub = sandbox.stub(story.mediaPool_, 'register');
-      const preloadStub = sandbox.stub(story.mediaPool_, 'preload').resolves();
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+    describe('amp-story audio', () => {
+      it('should register and preload the background audio', () => {
+        const src = 'https://example.com/foo.mp3';
+        story.element.setAttribute('background-audio', src);
+        const registerStub = sandbox.stub(story.mediaPool_, 'register');
+        const preloadStub = sandbox
+          .stub(story.mediaPool_, 'preload')
+          .resolves();
+
+        createPages(story.element, 2, ['cover', 'page-1']);
+
+        return story.layoutCallback().then(() => {
+          expect(story.backgroundAudioEl_).to.exist;
+          expect(story.backgroundAudioEl_.src).to.equal(src);
+          expect(registerStub).to.have.been.calledOnce;
+          expect(preloadStub).to.have.been.calledOnce;
+        });
+      });
 
-      return story.layoutCallback()
-          .then(() => {
-            expect(story.backgroundAudioEl_).to.exist;
-            expect(story.backgroundAudioEl_.src).to.equal(src);
-            expect(registerStub).to.have.been.calledOnce;
-            expect(preloadStub).to.have.been.calledOnce;
-          });
-    });
+      it('should bless the media on unmute', () => {
+        const blessAllStub = sandbox
+          .stub(story.mediaPool_, 'blessAll')
+          .resolves();
 
-    it('should bless the media on unmute', () => {
-      const blessAllStub =
-          sandbox.stub(story.mediaPool_, 'blessAll').resolves();
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        return story.layoutCallback().then(() => {
+          story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
+          expect(blessAllStub).to.have.been.calledOnce;
+        });
+      });
 
-      return story.layoutCallback()
-          .then(() => {
-            story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
-            expect(blessAllStub).to.have.been.calledOnce;
-          });
-    });
+      it('should pause the background audio on ad state if not muted', () => {
+        const backgroundAudioEl = win.document.createElement('audio');
+        backgroundAudioEl.setAttribute('id', 'foo');
+        story.backgroundAudioEl_ = backgroundAudioEl;
 
-    it('should pause the background audio on ad state if not muted', () => {
-      const backgroundAudioEl = win.document.createElement('audio');
-      backgroundAudioEl.setAttribute('id', 'foo');
-      story.backgroundAudioEl_ = backgroundAudioEl;
+        createPages(story.element, 2, ['cover', 'page-1']);
+        return story.layoutCallback().then(() => {
+          const pauseStub = sandbox.stub(story.mediaPool_, 'pause');
 
-      createPages(story.element, 2, ['cover', 'page-1']);
-      return story.layoutCallback()
-          .then(() => {
-            const pauseStub = sandbox.stub(story.mediaPool_, 'pause');
+          story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
+          story.storeService_.dispatch(Action.TOGGLE_AD, true);
 
-            story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
-            story.storeService_.dispatch(Action.TOGGLE_AD, true);
+          expect(pauseStub).to.have.been.calledOnce;
+          expect(pauseStub).to.have.been.calledWith(backgroundAudioEl);
+        });
+      });
 
-            expect(pauseStub).to.have.been.calledOnce;
-            expect(pauseStub).to.have.been.calledWith(backgroundAudioEl);
-          });
-    });
+      it('should play the background audio when hiding ad if not muted', () => {
+        const backgroundAudioEl = win.document.createElement('audio');
+        backgroundAudioEl.setAttribute('id', 'foo');
+        story.backgroundAudioEl_ = backgroundAudioEl;
 
-    it('should play the background audio when hiding ad if not muted', () => {
-      const backgroundAudioEl = win.document.createElement('audio');
-      backgroundAudioEl.setAttribute('id', 'foo');
-      story.backgroundAudioEl_ = backgroundAudioEl;
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        return story.layoutCallback().then(() => {
+          // Displaying an ad and not muted.
+          story.storeService_.dispatch(Action.TOGGLE_AD, true);
+          story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
 
-      return story.layoutCallback()
-          .then(() => {
-            // Displaying an ad and not muted.
-            story.storeService_.dispatch(Action.TOGGLE_AD, true);
-            story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
+          const unmuteStub = sandbox.stub(story.mediaPool_, 'unmute');
+          const playStub = sandbox.stub(story.mediaPool_, 'play');
 
-            const unmuteStub = sandbox.stub(story.mediaPool_, 'unmute');
-            const playStub = sandbox.stub(story.mediaPool_, 'play');
+          story.storeService_.dispatch(Action.TOGGLE_AD, false);
 
-            story.storeService_.dispatch(Action.TOGGLE_AD, false);
+          expect(unmuteStub).to.have.been.calledOnce;
+          expect(unmuteStub).to.have.been.calledWith(backgroundAudioEl);
+          expect(playStub).to.have.been.calledOnce;
+          expect(playStub).to.have.been.calledWith(backgroundAudioEl);
+        });
+      });
 
-            expect(unmuteStub).to.have.been.calledOnce;
-            expect(unmuteStub).to.have.been.calledWith(backgroundAudioEl);
-            expect(playStub).to.have.been.calledOnce;
-            expect(playStub).to.have.been.calledWith(backgroundAudioEl);
-          });
-    });
+      it('should not play the background audio when hiding ad if muted', () => {
+        const backgroundAudioEl = win.document.createElement('audio');
+        backgroundAudioEl.setAttribute('id', 'foo');
+        story.backgroundAudioEl_ = backgroundAudioEl;
 
-    it('should not play the background audio when hiding ad if muted', () => {
-      const backgroundAudioEl = win.document.createElement('audio');
-      backgroundAudioEl.setAttribute('id', 'foo');
-      story.backgroundAudioEl_ = backgroundAudioEl;
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      createPages(story.element, 2, ['cover', 'page-1']);
+        return story.layoutCallback().then(() => {
+          story.storeService_.dispatch(Action.TOGGLE_AD, true);
 
-      return story.layoutCallback()
-          .then(() => {
-            story.storeService_.dispatch(Action.TOGGLE_AD, true);
+          const unmuteStub = sandbox.stub(story.mediaPool_, 'unmute');
+          const playStub = sandbox.stub(story.mediaPool_, 'play');
 
-            const unmuteStub = sandbox.stub(story.mediaPool_, 'unmute');
-            const playStub = sandbox.stub(story.mediaPool_, 'play');
+          story.storeService_.dispatch(Action.TOGGLE_AD, false);
 
-            story.storeService_.dispatch(Action.TOGGLE_AD, false);
+          expect(unmuteStub).not.to.have.been.called;
+          expect(playStub).not.to.have.been.called;
+        });
+      });
 
-            expect(unmuteStub).not.to.have.been.called;
-            expect(playStub).not.to.have.been.called;
-          });
-    });
+      it('should mute the page and unmute the next page upon navigation', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-    it('should mute the page and unmute the next page upon navigation', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+        story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
 
-      story.storeService_.dispatch(Action.TOGGLE_MUTED, false);
+        let coverMuteStub;
+        let firstPageUnmuteStub;
 
-      let coverMuteStub;
-      let firstPageUnmuteStub;
-
-      return story.layoutCallback()
+        return story
+          .layoutCallback()
           .then(() => {
-            coverMuteStub =
-                sandbox.stub(story.getPageById('cover'), 'muteAllMedia');
-            firstPageUnmuteStub =
-                sandbox.stub(story.getPageById('page-1'), 'unmuteAllMedia');
+            coverMuteStub = sandbox.stub(
+              story.getPageById('cover'),
+              'muteAllMedia'
+            );
+            firstPageUnmuteStub = sandbox.stub(
+              story.getPageById('page-1'),
+              'unmuteAllMedia'
+            );
             return story.switchTo_('page-1');
           })
           .then(() => {
             expect(coverMuteStub).to.have.been.calledOnce;
             expect(firstPageUnmuteStub).to.have.been.calledOnce;
           });
+      });
     });
-  });
 
-  describe('#getMaxMediaElementCounts', () => {
-    it('should create 2 audio & video elements when no elements found', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+    describe('#getMaxMediaElementCounts', () => {
+      it('should create 2 audio & video elements when no elements found', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      return story.layoutCallback()
-          .then(() => {
-            const expected = {
-              [MediaType.AUDIO]: 2,
-              [MediaType.VIDEO]: 2,
-            };
-            expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
-          });
-    });
+        return story.layoutCallback().then(() => {
+          const expected = {
+            [MediaType.AUDIO]: 2,
+            [MediaType.VIDEO]: 2,
+          };
+          expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
+        });
+      });
 
-    it('should create 2 extra audio & video elements for ads', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+      it('should create 2 extra audio & video elements for ads', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
 
-      return story.layoutCallback()
-          .then(() => {
-            const ampVideoEl = win.document.createElement('amp-video');
-            const ampAudoEl = createElementWithAttributes(win.document,
-                'amp-audio', {'background-audio': ''});
-            story.element.appendChild(ampVideoEl);
-            story.element.appendChild(ampAudoEl);
-
-            const expected = {
-              [MediaType.AUDIO]: 3,
-              [MediaType.VIDEO]: 3,
-            };
-            expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
-          });
-    });
+        return story.layoutCallback().then(() => {
+          const ampVideoEl = win.document.createElement('amp-video');
+          const ampAudoEl = createElementWithAttributes(
+            win.document,
+            'amp-audio',
+            {'background-audio': ''}
+          );
+          story.element.appendChild(ampVideoEl);
+          story.element.appendChild(ampAudoEl);
 
-    it('never have more than the defined maximums', () => {
-      createPages(story.element, 2, ['cover', 'page-1']);
+          const expected = {
+            [MediaType.AUDIO]: 3,
+            [MediaType.VIDEO]: 3,
+          };
+          expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
+        });
+      });
 
-      return story.layoutCallback()
-          .then(() => {
-            for (let i = 0; i < 7; i++) {
-              const el = createElementWithAttributes(win.document,
-                  'amp-audio', {'background-audio': ''});
-              story.element.appendChild(el);
-            }
-
-            for (let i = 0; i < 8; i++) {
-              const el = win.document.createElement('amp-video');
-              story.element.appendChild(el);
-            }
-
-            const expected = {
-              [MediaType.AUDIO]: 4,
-              [MediaType.VIDEO]: 8,
-            };
-            expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
-          });
+      it('never have more than the defined maximums', () => {
+        createPages(story.element, 2, ['cover', 'page-1']);
+
+        return story.layoutCallback().then(() => {
+          for (let i = 0; i < 7; i++) {
+            const el = createElementWithAttributes(win.document, 'amp-audio', {
+              'background-audio': '',
+            });
+            story.element.appendChild(el);
+          }
+
+          for (let i = 0; i < 8; i++) {
+            const el = win.document.createElement('amp-video');
+            story.element.appendChild(el);
+          }
+
+          const expected = {
+            [MediaType.AUDIO]: 4,
+            [MediaType.VIDEO]: 8,
+          };
+          expect(story.getMaxMediaElementCounts()).to.deep.equal(expected);
+        });
+      });
     });
-  });
 
-  describe('amp-story navigation', () => {
-    it('should navigate when performing a navigational click', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+    describe('amp-story navigation', () => {
+      it('should navigate when performing a navigational click', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            // Click on right side of the screen to trigger page advancement.
-            const clickEvent = new MouseEvent('click', {clientX: 200});
+        return story.layoutCallback().then(() => {
+          // Click on right side of the screen to trigger page advancement.
+          const clickEvent = new MouseEvent('click', {clientX: 200});
 
-            story.activePage_.element.dispatchEvent(clickEvent);
+          story.activePage_.element.dispatchEvent(clickEvent);
 
-            expect(story.activePage_.element.id).to.equal('page-1');
-          });
-    });
+          expect(story.activePage_.element.id).to.equal('page-1');
+        });
+      });
 
-    it('should NOT navigate when clicking on a tappable element', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should NOT navigate when clicking on a tappable element', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            const tappableEl = win.document.createElement('target');
-            tappableEl.setAttribute('on', 'tap:cover.hide');
-            story.activePage_.element.appendChild(tappableEl);
+        return story.layoutCallback().then(() => {
+          const tappableEl = win.document.createElement('target');
+          tappableEl.setAttribute('on', 'tap:cover.hide');
+          story.activePage_.element.appendChild(tappableEl);
 
-            const clickEvent = new MouseEvent('click', {clientX: 200});
-            tappableEl.dispatchEvent(clickEvent);
-            expect(story.activePage_.element.id).to.equal('cover');
-          });
-    });
+          const clickEvent = new MouseEvent('click', {clientX: 200});
+          tappableEl.dispatchEvent(clickEvent);
+          expect(story.activePage_.element.id).to.equal('cover');
+        });
+      });
 
-    it('should NOT navigate when clicking on a shadow DOM element', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should NOT navigate when clicking on a shadow DOM element', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            const clickEvent = new MouseEvent('click', {clientX: 200});
-            story.shareMenu_.element_.dispatchEvent(clickEvent);
+        return story.layoutCallback().then(() => {
+          const clickEvent = new MouseEvent('click', {clientX: 200});
+          story.shareMenu_.element_.dispatchEvent(clickEvent);
 
-            expect(story.activePage_.element.id).to.equal('cover');
-          });
-    });
+          expect(story.activePage_.element.id).to.equal('cover');
+        });
+      });
 
-    it('should NOT navigate when clicking on a CTA link', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should NOT navigate when clicking on a CTA link', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            const ctaLink = win.document.createElement('a');
-            ctaLink.setAttribute('role', 'link');
-            story.activePage_.element.appendChild(ctaLink);
+        return story.layoutCallback().then(() => {
+          const ctaLink = win.document.createElement('a');
+          ctaLink.setAttribute('role', 'link');
+          story.activePage_.element.appendChild(ctaLink);
 
-            const clickEvent = new MouseEvent('click', {clientX: 200});
-            ctaLink.dispatchEvent(clickEvent);
-            expect(story.activePage_.element.id).to.equal('cover');
-          });
+          const clickEvent = new MouseEvent('click', {clientX: 200});
+          ctaLink.dispatchEvent(clickEvent);
+          expect(story.activePage_.element.id).to.equal('cover');
+        });
+      });
     });
-  });
 
-  describe('amp-access navigation', () => {
-    it('should set the access state to true if next page blocked', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+    describe('amp-access navigation', () => {
+      it('should set the access state to true if next page blocked', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
-            expect(
-                story.storeService_.get(StateProperty.ACCESS_STATE)).to.be.true;
+            expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
+              .true;
           });
-    });
+      });
 
-    it('should not navigate if next page is blocked by paywall', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should not navigate if next page is blocked by paywall', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
             expect(story.activePage_.element.id).to.equal('cover');
           });
-    });
+      });
 
-    it('should navigate once the doc is reauthorized', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should navigate once the doc is reauthorized', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      let authorizedCallback;
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => true,
-        onApplyAuthorizations: fn => authorizedCallback = fn,
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        let authorizedCallback;
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => true,
+          onApplyAuthorizations: fn => (authorizedCallback = fn),
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigates to a paywall protected page, and waits until the document
-      // is successfuly reauthorized to navigate.
-      return story.layoutCallback()
+        // Navigates to a paywall protected page, and waits until the document
+        // is successfuly reauthorized to navigate.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
-            story.getPageById('page-1')
-                .element.removeAttribute('amp-access-hide');
+            story
+              .getPageById('page-1')
+              .element.removeAttribute('amp-access-hide');
             authorizedCallback();
 
             expect(story.activePage_.element.id).to.equal('page-1');
           });
-    });
+      });
 
-    it('should hide the paywall once the doc is reauthorized', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should hide the paywall once the doc is reauthorized', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      let authorizedCallback;
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => true,
-        onApplyAuthorizations: fn => authorizedCallback = fn,
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        let authorizedCallback;
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => true,
+          onApplyAuthorizations: fn => (authorizedCallback = fn),
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigates to a paywall protected page, and waits until the document
-      // is successfuly reauthorized to hide the access UI.
-      return story.layoutCallback()
+        // Navigates to a paywall protected page, and waits until the document
+        // is successfuly reauthorized to hide the access UI.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
             expect(story.activePage_.element.id).to.equal('cover');
-            story.getPageById('page-1')
-                .element.removeAttribute('amp-access-hide');
+            story
+              .getPageById('page-1')
+              .element.removeAttribute('amp-access-hide');
             authorizedCallback();
 
-            expect(story.storeService_.get(StateProperty.ACCESS_STATE))
-                .to.be.false;
+            expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
+              .false;
           });
-    });
+      });
 
-    it('should not navigate on doc reauthorized if page still blocked', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should not navigate on doc reauthorized if page still blocked', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      let authorizedCallback;
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => true,
-        onApplyAuthorizations: fn => authorizedCallback = fn,
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        let authorizedCallback;
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => true,
+          onApplyAuthorizations: fn => (authorizedCallback = fn),
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigates to a paywall protected page, and does not navigate to that
-      // page if the document has been reauthorized with insuficient rights.
-      return story.layoutCallback()
+        // Navigates to a paywall protected page, and does not navigate to that
+        // page if the document has been reauthorized with insuficient rights.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
@@ -1239,336 +1291,343 @@ describes.realWin('amp-story', {
 
             expect(story.activePage_.element.id).to.equal('cover');
           });
-    });
+      });
 
-    it('should show paywall on doc reauthorized if page still blocked', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should show paywall on doc reauthorized if page still blocked', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      let authorizedCallback;
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => true,
-        onApplyAuthorizations: fn => authorizedCallback = fn,
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        let authorizedCallback;
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => true,
+          onApplyAuthorizations: fn => (authorizedCallback = fn),
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigates to a paywall protected page, and does not hide the access UI
-      // if the document has been reauthorized with insuficient rights.
-      return story.layoutCallback()
+        // Navigates to a paywall protected page, and does not hide the access UI
+        // if the document has been reauthorized with insuficient rights.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access-hide', '');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access-hide', '');
             return story.switchTo_('page-1');
           })
           .then(() => {
             authorizedCallback();
 
-            expect(story.storeService_.get(StateProperty.ACCESS_STATE))
-                .to.be.true;
+            expect(story.storeService_.get(StateProperty.ACCESS_STATE)).to.be
+              .true;
           });
-    });
+      });
 
-    it('should block navigation if doc authorizations are pending', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should block navigation if doc authorizations are pending', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => false,
-        onApplyAuthorizations: () => {},
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => false,
+          onApplyAuthorizations: () => {},
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigates to a maybe protected page (has amp-access="" rule), but the
-      // document authorizations are still pending. Asserts that it blocks the
-      // navigation.
-      return story.layoutCallback()
+        // Navigates to a maybe protected page (has amp-access="" rule), but the
+        // document authorizations are still pending. Asserts that it blocks the
+        // navigation.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access', 'random condition');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access', 'random condition');
             return story.switchTo_('page-1');
           })
           .then(() => {
             expect(story.activePage_.element.id).to.equal('cover');
           });
-    });
+      });
 
-    it('should navigate only after the doc is first authorized', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should navigate only after the doc is first authorized', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      let authorizedCallback;
-      const fakeAccessService = {
-        areFirstAuthorizationsCompleted: () => false,
-        onApplyAuthorizations: fn => authorizedCallback = fn,
-      };
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
+        let authorizedCallback;
+        const fakeAccessService = {
+          areFirstAuthorizationsCompleted: () => false,
+          onApplyAuthorizations: fn => (authorizedCallback = fn),
+        };
+        sandbox
+          .stub(Services, 'accessServiceForDocOrNull')
           .resolves(fakeAccessService);
 
-      // Navigation to a maybe protected page (has amp-access="" rule) is
-      // blocked until the authorizations are completed.
-      return story.layoutCallback()
+        // Navigation to a maybe protected page (has amp-access="" rule) is
+        // blocked until the authorizations are completed.
+        return story
+          .layoutCallback()
           .then(() => {
-            story.getPageById('page-1')
-                .element.setAttribute('amp-access', 'random condition');
+            story
+              .getPageById('page-1')
+              .element.setAttribute('amp-access', 'random condition');
             return story.switchTo_('page-1');
           })
           .then(() => {
             authorizedCallback();
             expect(story.activePage_.element.id).to.equal('page-1');
           });
-    });
-  });
-
-  describe('touch events handlers', () => {
-    const getTouchOptions = (x, y) => {
-      const touch = new Touch({
-        target: story.element,
-        identifier: Date.now(),
-        clientX: x,
-        clientY: y,
-      });
-
-      return {touches: [touch], bubbles: true};
-    };
-
-    const dispatchSwipeEvent = (deltaX, deltaY) => {
-      story.element.dispatchEvent(
-          new TouchEvent('touchstart', getTouchOptions(-10, -10)));
-      story.element.dispatchEvent(
-          new TouchEvent('touchmove', getTouchOptions(0, 0)));
-      story.element.dispatchEvent(
-          new TouchEvent('touchmove', getTouchOptions(deltaX, deltaY)));
-      story.element.dispatchEvent(
-          new TouchEvent('touchend', getTouchOptions(deltaX, deltaY)));
-    };
-
-    describe('without #cap=swipe', () => {
-      it('should handle touch events at the story level', () => {
-        const touchmoveSpy = sandbox.spy();
-        story.win.document.addEventListener('touchmove', touchmoveSpy);
-        dispatchSwipeEvent(100, 0);
-        expect(touchmoveSpy).to.not.have.been.called;
-      });
-
-      it('should trigger the navigation overlay', () => {
-        dispatchSwipeEvent(100, 0);
-        return story.mutateElement(() => {
-          const hintEl =
-              story.element.querySelector('.i-amphtml-story-hint-container');
-          expect(hintEl).to.not.have.class('i-amphtml-hidden');
-        });
       });
     });
 
-    describe('with #cap=swipe', () => {
-      before(() => hasSwipeCapability = true);
-      after(() => hasSwipeCapability = false);
+    describe('touch events handlers', () => {
+      const getTouchOptions = (x, y) => {
+        const touch = new Touch({
+          target: story.element,
+          identifier: Date.now(),
+          clientX: x,
+          clientY: y,
+        });
+
+        return {touches: [touch], bubbles: true};
+      };
+
+      const dispatchSwipeEvent = (deltaX, deltaY) => {
+        story.element.dispatchEvent(
+          new TouchEvent('touchstart', getTouchOptions(-10, -10))
+        );
+        story.element.dispatchEvent(
+          new TouchEvent('touchmove', getTouchOptions(0, 0))
+        );
+        story.element.dispatchEvent(
+          new TouchEvent('touchmove', getTouchOptions(deltaX, deltaY))
+        );
+        story.element.dispatchEvent(
+          new TouchEvent('touchend', getTouchOptions(deltaX, deltaY))
+        );
+      };
+
+      describe('without #cap=swipe', () => {
+        it('should handle touch events at the story level', () => {
+          const touchmoveSpy = sandbox.spy();
+          story.win.document.addEventListener('touchmove', touchmoveSpy);
+          dispatchSwipeEvent(100, 0);
+          expect(touchmoveSpy).to.not.have.been.called;
+        });
 
-      it('should let touch events bubble up to be forwarded', () => {
-        const touchmoveSpy = sandbox.spy();
-        story.win.document.addEventListener('touchmove', touchmoveSpy);
-        dispatchSwipeEvent(100, 0);
-        expect(touchmoveSpy).to.have.been.called;
+        it('should trigger the navigation overlay', () => {
+          dispatchSwipeEvent(100, 0);
+          return story.mutateElement(() => {
+            const hintEl = story.element.querySelector(
+              '.i-amphtml-story-hint-container'
+            );
+            expect(hintEl).to.not.have.class('i-amphtml-hidden');
+          });
+        });
       });
 
-      it('should not trigger the navigation education overlay', () => {
-        dispatchSwipeEvent(100, 0);
-        return story.mutateElement(() => {
-          const hintEl =
-              story.element.querySelector('.i-amphtml-story-hint-container');
-          expect(hintEl).to.not.exist;
+      describe('with #cap=swipe', () => {
+        before(() => (hasSwipeCapability = true));
+        after(() => (hasSwipeCapability = false));
+
+        it('should let touch events bubble up to be forwarded', () => {
+          const touchmoveSpy = sandbox.spy();
+          story.win.document.addEventListener('touchmove', touchmoveSpy);
+          dispatchSwipeEvent(100, 0);
+          expect(touchmoveSpy).to.have.been.called;
+        });
+
+        it('should not trigger the navigation education overlay', () => {
+          dispatchSwipeEvent(100, 0);
+          return story.mutateElement(() => {
+            const hintEl = story.element.querySelector(
+              '.i-amphtml-story-hint-container'
+            );
+            expect(hintEl).to.not.exist;
+          });
         });
       });
     });
-  });
 
-  describe('amp-story branching', () => {
-    beforeEach(() => {toggleExperiment(win, 'amp-story-branching', true);});
-    afterEach(() => {toggleExperiment(win, 'amp-story-branching', false);});
+    describe('amp-story branching', () => {
+      beforeEach(() => {
+        toggleExperiment(win, 'amp-story-branching', true);
+      });
+      afterEach(() => {
+        toggleExperiment(win, 'amp-story-branching', false);
+      });
 
-    it('should advance to specified page with advanced-to attribute', () => {
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should advance to specified page with advanced-to attribute', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            expect(story.activePage_.element.id).to.equal('cover');
+        return story.layoutCallback().then(() => {
+          expect(story.activePage_.element.id).to.equal('cover');
 
-            story.getPageById('cover')
-                .element.setAttribute('advance-to', 'page-3');
+          story
+            .getPageById('cover')
+            .element.setAttribute('advance-to', 'page-3');
 
-            story.activePage_.element.dispatchEvent(
-                new MouseEvent('click', {clientX: 200}));
-            expect(story.activePage_.element.id).to.equal('page-3');
-          });
-    });
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 200})
+          );
+          expect(story.activePage_.element.id).to.equal('page-3');
+        });
+      });
+
+      it('should navigate to the target page when a goToPage action is executed', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+        story.buildCallback();
 
-    it('should navigate to the target page when a goToPage action is executed',
-        () => {
-          createPages(story.element, 4,
-              ['cover', 'page-1', 'page-2', 'page-3']);
-          story.buildCallback();
-
-          return story.layoutCallback()
-              .then(() => {
-                story.element.setAttribute('id', 'story');
-                const actionButton = createElementWithAttributes(
-                    win.document,
-                    'button',
-                    {'id': 'actionButton',
-                      'on': 'tap:story.goToPage(id=page-2)'});
-                element.querySelector('#cover').appendChild(actionButton);
-                // Click on the actionButton to trigger the goToPage action.
-                actionButton.click();
-                expect(story.activePage_.element.id).to.equal('page-2');
-              });
+        return story.layoutCallback().then(() => {
+          story.element.setAttribute('id', 'story');
+          const actionButton = createElementWithAttributes(
+            win.document,
+            'button',
+            {'id': 'actionButton', 'on': 'tap:story.goToPage(id=page-2)'}
+          );
+          element.querySelector('#cover').appendChild(actionButton);
+          // Click on the actionButton to trigger the goToPage action.
+          actionButton.click();
+          expect(story.activePage_.element.id).to.equal('page-2');
         });
+      });
+
+      it('should navigate back to the correct previous page after goToPage', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+        story.buildCallback();
 
-    it('should navigate back to the correct previous page after goToPage',
-        () => {
-          createPages(story.element, 4,
-              ['cover', 'page-1', 'page-2', 'page-3']);
-          story.buildCallback();
-
-          return story.layoutCallback()
-              .then(() => {
-                story.element.setAttribute('id', 'story');
-
-                const actionButton = createElementWithAttributes(
-                    win.document,
-                    'button',
-                    {'id': 'actionButton',
-                      'on': 'tap:story.goToPage(id=page-2)'});
-                element.querySelector('#cover').appendChild(actionButton);
-                // Click on the actionButton to trigger the goToPage action.
-                actionButton.click();
-
-                // Moves backwards.
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 0}));
-                expect(story.activePage_.element.id).to.equal('cover');
-              });
+        return story.layoutCallback().then(() => {
+          story.element.setAttribute('id', 'story');
+
+          const actionButton = createElementWithAttributes(
+            win.document,
+            'button',
+            {'id': 'actionButton', 'on': 'tap:story.goToPage(id=page-2)'}
+          );
+          element.querySelector('#cover').appendChild(actionButton);
+          // Click on the actionButton to trigger the goToPage action.
+          actionButton.click();
+
+          // Moves backwards.
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 0})
+          );
+          expect(story.activePage_.element.id).to.equal('cover');
         });
+      });
 
-    it.skip(
-        'should navigate back to the correct previous page after advance-to',
-        () => {
-          createPages(
-              story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it.skip('should navigate back to the correct previous page after advance-to', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-          return story.layoutCallback()
-              .then(() => {
-                story.getPageById('cover')
-                    .element.setAttribute('advance-to', 'page-3');
+        return story.layoutCallback().then(() => {
+          story
+            .getPageById('cover')
+            .element.setAttribute('advance-to', 'page-3');
 
-                expect(story.activePage_.element.id).to.equal('cover');
+          expect(story.activePage_.element.id).to.equal('cover');
 
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 200}));
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 200})
+          );
 
-                // Move backwards.
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 0}));
-                expect(story.activePage_.element.id).to.equal('cover');
-              });
+          // Move backwards.
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 0})
+          );
+          expect(story.activePage_.element.id).to.equal('cover');
         });
+      });
 
-    it('should begin at the specified page fragment parameter value', () => {
-      win.location.hash = 'page=page-1';
-      createPages(story.element, 4, ['cover', 'page-1', 'page-2','page-3']);
+      it('should begin at the specified page fragment parameter value', () => {
+        win.location.hash = 'page=page-1';
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-      return story.layoutCallback()
-          .then(() => {
-            expect(story.activePage_.element.id).to.equal('page-1');
-          });
-    });
+        return story.layoutCallback().then(() => {
+          expect(story.activePage_.element.id).to.equal('page-1');
+        });
+      });
 
-    it('should begin at initial page when fragment parameter value is wrong',
-        () => {
-          win.location.hash = 'page=BADVALUE';
-          createPages(
-              story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should begin at initial page when fragment parameter value is wrong', () => {
+        win.location.hash = 'page=BADVALUE';
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-          return story.layoutCallback()
-              .then(() => {
-                expect(story.activePage_.element.id).to.equal('cover');
-              });
+        return story.layoutCallback().then(() => {
+          expect(story.activePage_.element.id).to.equal('cover');
         });
+      });
 
-    it('should update browser history with the story navigation path', () => {
-      const pageCount = 2;
-      createPages(story.element, pageCount, ['cover', 'page-1']);
+      it('should update browser history with the story navigation path', () => {
+        const pageCount = 2;
+        createPages(story.element, pageCount, ['cover', 'page-1']);
 
-      return story.layoutCallback()
-          .then(() => {
-            story.activePage_.element.dispatchEvent(
-                new MouseEvent('click', {clientX: 200}));
-            return expect(replaceStateStub).to.have.been.calledWith(
-                {ampStoryNavigationPath: ['cover', 'page-1']});
+        return story.layoutCallback().then(() => {
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 200})
+          );
+          return expect(replaceStateStub).to.have.been.calledWith({
+            ampStoryNavigationPath: ['cover', 'page-1'],
           });
-    });
+        });
+      });
 
-    it('should navigate to the correct previous page after navigating away',
-        () => {
-          createPages(
-              story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+      it('should navigate to the correct previous page after navigating away', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-          return story.layoutCallback()
-              .then(() => {
-                const currentLocation = win.location;
-                story.getPageById('cover')
-                    .element.setAttribute('advance-to', 'page-3');
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 200}));
+        return story.layoutCallback().then(() => {
+          const currentLocation = win.location;
+          story
+            .getPageById('cover')
+            .element.setAttribute('advance-to', 'page-3');
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 200})
+          );
 
-                win.location = 'https://example.com/';
-                win.location = currentLocation;
+          win.location = 'https://example.com/';
+          win.location = currentLocation;
 
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 0}));
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 0})
+          );
 
-                expect(story.activePage_.element.id).to.equal('cover');
-              });
+          expect(story.activePage_.element.id).to.equal('cover');
         });
+      });
 
-    it('should correctly mark goToPage pages are distance 1', () => {
-      createPages(
-          story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
-      story.buildCallback();
-
-      return story.layoutCallback()
-          .then(() => {
-            story.element.setAttribute('id', 'story');
+      it('should correctly mark goToPage pages are distance 1', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+        story.buildCallback();
 
-            const actionButton = createElementWithAttributes(
-                win.document,
-                'button',
-                {'id': 'actionButton',
-                  'on': 'tap:story.goToPage(id=page-2)'});
+        return story.layoutCallback().then(() => {
+          story.element.setAttribute('id', 'story');
 
-            story.element.querySelector('#cover').appendChild(actionButton);
+          const actionButton = createElementWithAttributes(
+            win.document,
+            'button',
+            {'id': 'actionButton', 'on': 'tap:story.goToPage(id=page-2)'}
+          );
 
-            const distanceGraph = story.getPagesByDistance_();
-            expect(distanceGraph[1].includes('page-2')).to.be.true;
-          });
-    });
+          story.element.querySelector('#cover').appendChild(actionButton);
 
-    it('should correctly mark previous pages in the stack as distance 1',
-        () => {
-          createPages(
-              story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
+          const distanceGraph = story.getPagesByDistance_();
+          expect(distanceGraph[1].includes('page-2')).to.be.true;
+        });
+      });
 
-          return story.layoutCallback()
-              .then(() => {
-                story.getPageById('cover')
-                    .element.setAttribute('advance-to', 'page-3');
+      it('should correctly mark previous pages in the stack as distance 1', () => {
+        createPages(story.element, 4, ['cover', 'page-1', 'page-2', 'page-3']);
 
-                story.activePage_.element.dispatchEvent(
-                    new MouseEvent('click', {clientX: 200}));
+        return story.layoutCallback().then(() => {
+          story
+            .getPageById('cover')
+            .element.setAttribute('advance-to', 'page-3');
 
-                const distanceGraph = story.getPagesByDistance_();
-                expect(distanceGraph[1].includes('cover')).to.be.true;
+          story.activePage_.element.dispatchEvent(
+            new MouseEvent('click', {clientX: 200})
+          );
 
-              });
+          const distanceGraph = story.getPagesByDistance_();
+          expect(distanceGraph[1].includes('cover')).to.be.true;
         });
-  });
-});
-
+      });
+    });
+  }
+);
diff --git a/extensions/amp-story/1.0/test/test-analytics.js b/extensions/amp-story/1.0/test/test-analytics.js
index 2813f5529ab6..8e3fbde2400c 100644
--- a/extensions/amp-story/1.0/test/test-analytics.js
+++ b/extensions/amp-story/1.0/test/test-analytics.js
@@ -16,7 +16,6 @@
 import {StateChangeType} from '../navigation-state';
 import {getAnalyticsService} from '../story-analytics';
 
-
 describes.fakeWin('amp-story analytics', {}, env => {
   let analytics;
   let rootEl;
diff --git a/extensions/amp-story/1.0/test/test-full-bleed-animations.js b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
index b6ba47dee153..88f910e22320 100644
--- a/extensions/amp-story/1.0/test/test-full-bleed-animations.js
+++ b/extensions/amp-story/1.0/test/test-full-bleed-animations.js
@@ -30,210 +30,241 @@ import {
 import {getPresetDef} from '../animation-presets';
 import {registerServiceBuilder} from '../../../../src/service';
 
-describes.realWin('amp-story-full-bleed-animations', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story:1.0'],
+describes.realWin(
+  'amp-story-full-bleed-animations',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story:1.0'],
+    },
   },
-}, env => {
-  let win;
-  let storyElem;
-  let ampStory;
+  env => {
+    let win;
+    let storyElem;
+    let ampStory;
 
-  beforeEach(() => {
-    win = env.win;
+    beforeEach(() => {
+      win = env.win;
 
-    sandbox.stub(Services, 'storyStoreService')
+      sandbox
+        .stub(Services, 'storyStoreService')
         .callsFake(() => new AmpStoryStoreService(win));
 
-    storyElem = win.document.createElement('amp-story');
-    win.document.body.appendChild(storyElem);
-
-    const localizationService = new LocalizationService(win);
-    registerServiceBuilder(win, 'localization', () => localizationService);
-
-    AmpStory.isBrowserSupported = () => true;
-    ampStory = new AmpStory(storyElem);
-  });
-
-  afterEach(() => {
-    storyElem.remove();
-  });
-
-  /**
-   * @param {!Element} container
-   * @param {number} count
-   * @param {Array<string>=} opt_ids
-   * @return {!Array<!Element>}
-   */
-  function createPages(container, count, opt_ids) {
-    return Array(count).fill(undefined).map((unused, i) => {
-      const page = win.document.createElement('amp-story-page');
-      page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
-      page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
-      container.appendChild(page);
-      return page;
+      storyElem = win.document.createElement('amp-story');
+      win.document.body.appendChild(storyElem);
+
+      const localizationService = new LocalizationService(win);
+      registerServiceBuilder(win, 'localization', () => localizationService);
+
+      AmpStory.isBrowserSupported = () => true;
+      ampStory = new AmpStory(storyElem);
     });
-  }
 
-  /**
-   * @param {!Element} container
-   * @param {string} animationName
-   * @param {string=} opt_gridLayerTempalate
-   */
-  function addAnimationToImage(container, animationName,
-    opt_gridLayerTempalate) {
-    const img = win.document.createElement('amp-img');
-    img.setAttribute('animate-in', animationName);
-
-    const gridLayer = win.document.createElement('amp-story-grid-layer');
-    opt_gridLayerTempalate = opt_gridLayerTempalate.length ?
-      opt_gridLayerTempalate : 'fill';
-    gridLayer.setAttribute('template', opt_gridLayerTempalate);
-
-    gridLayer.appendChild(img);
-    container.appendChild(gridLayer);
-  }
+    afterEach(() => {
+      storyElem.remove();
+    });
 
-  it('Should add corresponding CSS class when a full bleed animation target is'
-  + ' attached as a child of a grid layer with fill template.', () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-            ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a full-bleed animation inside a grid-
-          // layer with a `fill` template of the first page.
-          addAnimationToImage(pages[1].element, 'pan-down', 'fill');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
-          });
+    /**
+     * @param {!Element} container
+     * @param {number} count
+     * @param {Array<string>=} opt_ids
+     * @return {!Array<!Element>}
+     */
+    function createPages(container, count, opt_ids) {
+      return Array(count)
+        .fill(undefined)
+        .map((unused, i) => {
+          const page = win.document.createElement('amp-story-page');
+          page.id = opt_ids && opt_ids[i] ? opt_ids[i] : `-page-${i}`;
+          page.getImpl = () => Promise.resolve(new AmpStoryPage(page));
+          container.appendChild(page);
+          return page;
         });
-  });
+    }
 
-  it('Should not add additional CSS class to the target when a full-bleed ' +
-     'animation is used BUT the target is a child of a grid layer with a ' +
-     'template other than `fill`.',
-  () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-                ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a full-bleed animation inside a grid-
-          // layer with a template other than fill.
-          addAnimationToImage(pages[1].element, 'fade-in', 'vertical');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.not.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
+    /**
+     * @param {!Element} container
+     * @param {string} animationName
+     * @param {string=} opt_gridLayerTempalate
+     */
+    function addAnimationToImage(
+      container,
+      animationName,
+      opt_gridLayerTempalate
+    ) {
+      const img = win.document.createElement('amp-img');
+      img.setAttribute('animate-in', animationName);
+
+      const gridLayer = win.document.createElement('amp-story-grid-layer');
+      opt_gridLayerTempalate = opt_gridLayerTempalate.length
+        ? opt_gridLayerTempalate
+        : 'fill';
+      gridLayer.setAttribute('template', opt_gridLayerTempalate);
+
+      gridLayer.appendChild(img);
+      container.appendChild(gridLayer);
+    }
+
+    it(
+      'Should add corresponding CSS class when a full bleed animation target is' +
+        ' attached as a child of a grid layer with fill template.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a full-bleed animation inside a grid-
+            // layer with a `fill` template of the first page.
+            addAnimationToImage(pages[1].element, 'pan-down', 'fill');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
           });
-        });
-  });
-
-  it('Should not add additional CSS class to the target when a non-full-bleed' +
-     'animation is used.', () => {
-    createPages(ampStory.element, 2, ['cover', 'page-1']);
-    return ampStory.layoutCallback()
-        .then(() => {
-          // Get pages.
-          const pageElements =
-            ampStory.element.getElementsByTagName('amp-story-page');
-          const pages = Array.from(pageElements).map(el => el.getImpl());
-          return Promise.all(pages);
-        })
-        .then(pages => {
-          // Append an image animated with a non-full-bleed animation.
-          addAnimationToImage(pages[1].element, 'fade-in', 'fill');
-
-          pages[1].layoutCallback().then(() => {
-            const imgEls = pages[1].element.getElementsByTagName('amp-img');
-            expect(imgEls[0]).to.not.have.class(
-                'i-amphtml-story-grid-template-with-full-bleed-animation');
+      }
+    );
+
+    it(
+      'Should not add additional CSS class to the target when a full-bleed ' +
+        'animation is used BUT the target is a child of a grid layer with a ' +
+        'template other than `fill`.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a full-bleed animation inside a grid-
+            // layer with a template other than fill.
+            addAnimationToImage(pages[1].element, 'fade-in', 'vertical');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.not.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
           });
-        });
-  });
-});
+      }
+    );
 
-describes.realWin('amp-story-animations-utils', {
-  amp: {
-    runtimeOn: true,
-    extensions: ['amp-story'],
+    it(
+      'Should not add additional CSS class to the target when a non-full-bleed' +
+        'animation is used.',
+      () => {
+        createPages(ampStory.element, 2, ['cover', 'page-1']);
+        return ampStory
+          .layoutCallback()
+          .then(() => {
+            // Get pages.
+            const pageElements = ampStory.element.getElementsByTagName(
+              'amp-story-page'
+            );
+            const pages = Array.from(pageElements).map(el => el.getImpl());
+            return Promise.all(pages);
+          })
+          .then(pages => {
+            // Append an image animated with a non-full-bleed animation.
+            addAnimationToImage(pages[1].element, 'fade-in', 'fill');
+
+            pages[1].layoutCallback().then(() => {
+              const imgEls = pages[1].element.getElementsByTagName('amp-img');
+              expect(imgEls[0]).to.not.have.class(
+                'i-amphtml-story-grid-template-with-full-bleed-animation'
+              );
+            });
+          });
+      }
+    );
+  }
+);
+
+describes.realWin(
+  'amp-story-animations-utils',
+  {
+    amp: {
+      runtimeOn: true,
+      extensions: ['amp-story'],
+    },
   },
-}, () => {
-  /**
-   * @param {number} pageW
-   * @param {number} pageH
-   * @param {number} targetW
-   * @param {number} targetH
-   * @return {!StoryAnimationDimsDef}
-   */
-  function setDimensions(pageW, pageH, targetW, targetH) {
-    return /** @type {!StoryAnimationDimsDef} */ ({
-      pageWidth: pageW,
-      pageHeight: pageH,
-      targetWidth: targetW,
-      targetHeight: targetH,
-      targetX: 0,
-      targetY: 0,
+  () => {
+    /**
+     * @param {number} pageW
+     * @param {number} pageH
+     * @param {number} targetW
+     * @param {number} targetH
+     * @return {!StoryAnimationDimsDef}
+     */
+    function setDimensions(pageW, pageH, targetW, targetH) {
+      return /** @type {!StoryAnimationDimsDef} */ ({
+        pageWidth: pageW,
+        pageHeight: pageH,
+        targetWidth: targetW,
+        targetHeight: targetH,
+        targetX: 0,
+        targetY: 0,
+      });
+    }
+
+    it('Should fit target same size as the screen.', () => {
+      const dimensions = setDimensions(380, 580, 360, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
     });
-  }
 
-  it('Should fit target same size as the screen.', () => {
-    const dimensions = setDimensions(380 , 580, 360, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-  });
-
-  it('Should fit target with bigger width but same height as screen.', () => {
-    const dimensions = setDimensions(380, 580, 400, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-  });
-
-  it('Should not fit target with larger width and height than screen.', () => {
-    const dimensions = setDimensions(380, 580, 400, 600);
-    expect(targetFitsWithinPage(dimensions)).to.be.false;
-  });
-
-  it('Should scale the target accordingly.', () => {
-    const dimensions = setDimensions(380, 580, 360, 580);
-    expect(targetFitsWithinPage(dimensions)).to.be.true;
-
-    const factorThatWillMakeTargetFitPage = 380 / 360;
-    const factor = factorThatWillMakeTargetFitPage * 1.25;
-    expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
-
-    const calculatedKeyframes = getPresetDef('pan-up', {});
-    calculatedKeyframes.keyframes = calculatedKeyframes.keyframes(dimensions);
-
-    const offsetX = -dimensions.targetWidth / 2;
-    const offsetY = dimensions.pageHeight - dimensions.targetHeight;
-
-    const expectedKeyframes = [
-      {
-        'transform': `translate(${offsetX}px, ${offsetY}px) scale(${factor})`,
-        'transform-origin': 'left top',
-      },
-      {
-        'transform': `translate(${offsetX}px, 0px) scale(${factor})`,
-        'transform-origin': 'left top',
-      },
-    ];
-
-    expect(calculatedKeyframes.keyframes).to.deep.equal(expectedKeyframes);
-  });
-
-});
+    it('Should fit target with bigger width but same height as screen.', () => {
+      const dimensions = setDimensions(380, 580, 400, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
+    });
+
+    it('Should not fit target with larger width and height than screen.', () => {
+      const dimensions = setDimensions(380, 580, 400, 600);
+      expect(targetFitsWithinPage(dimensions)).to.be.false;
+    });
+
+    it('Should scale the target accordingly.', () => {
+      const dimensions = setDimensions(380, 580, 360, 580);
+      expect(targetFitsWithinPage(dimensions)).to.be.true;
+
+      const factorThatWillMakeTargetFitPage = 380 / 360;
+      const factor = factorThatWillMakeTargetFitPage * 1.25;
+      expect(calculateTargetScalingFactor(dimensions)).to.equal(factor);
+
+      const calculatedKeyframes = getPresetDef('pan-up', {});
+      calculatedKeyframes.keyframes = calculatedKeyframes.keyframes(dimensions);
+
+      const offsetX = -dimensions.targetWidth / 2;
+      const offsetY = dimensions.pageHeight - dimensions.targetHeight;
+
+      const expectedKeyframes = [
+        {
+          'transform': `translate(${offsetX}px, ${offsetY}px) scale(${factor})`,
+          'transform-origin': 'left top',
+        },
+        {
+          'transform': `translate(${offsetX}px, 0px) scale(${factor})`,
+          'transform-origin': 'left top',
+        },
+      ];
+
+      expect(calculatedKeyframes.keyframes).to.deep.equal(expectedKeyframes);
+    });
+  }
+);
diff --git a/extensions/amp-story/1.0/test/test-media-pool.js b/extensions/amp-story/1.0/test/test-media-pool.js
index ba0e5e6f5b3c..dafdfdedf0df 100644
--- a/extensions/amp-story/1.0/test/test-media-pool.js
+++ b/extensions/amp-story/1.0/test/test-media-pool.js
@@ -30,10 +30,10 @@ describes.realWin('media-pool', {}, env => {
 
   beforeEach(() => {
     win = env.win;
-    sandbox.stub(Services, 'vsyncFor')
-        .callsFake(() => ({mutate: task => task()}));
-    sandbox.stub(Services, 'timerFor')
-        .callsFake(() => ({delay: NOOP}));
+    sandbox
+      .stub(Services, 'vsyncFor')
+      .callsFake(() => ({mutate: task => task()}));
+    sandbox.stub(Services, 'timerFor').callsFake(() => ({delay: NOOP}));
 
     mediaPool = new MediaPool(win, COUNTS, element => {
       return distanceFnStub(element);
@@ -138,26 +138,32 @@ describes.realWin('media-pool', {}, env => {
 
   it.skip('should evict the element with the highest distance first', () => {
     const elements = createMediaElements('video', 3);
-    mediaPool = new MediaPool(win, {'video': 2},
-        arrayOrderDistanceFn(elements));
+    mediaPool = new MediaPool(
+      win,
+      {'video': 2},
+      arrayOrderDistanceFn(elements)
+    );
 
     elements.forEach(element => mediaPool.register(element));
     elements.forEach(element => mediaPool.play(element));
 
     expect(mediaPool.allocated['video'].length).to.equal(2);
-    expect(isElementInPool(mediaPool.allocated['video'], elements[0]))
-        .to.be.true;
-    expect(isElementInPool(mediaPool.allocated['video'], elements[1]))
-        .to.be.true;
-    expect(isElementInPool(mediaPool.allocated['video'], elements[2]))
-        .to.be.false;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[0])).to.be
+      .true;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[1])).to.be
+      .true;
+    expect(isElementInPool(mediaPool.allocated['video'], elements[2])).to.be
+      .false;
   });
 
   it('should be able to play alot of videos', () => {
     const alot = 100;
     const elements = createMediaElements('video', alot);
-    mediaPool = new MediaPool(win, {'video': 2},
-        arrayOrderDistanceFn(elements));
+    mediaPool = new MediaPool(
+      win,
+      {'video': 2},
+      arrayOrderDistanceFn(elements)
+    );
 
     elements.forEach(element => mediaPool.register(element));
 
diff --git a/extensions/amp-story/1.0/test/test-media-tasks.js b/extensions/amp-story/1.0/test/test-media-tasks.js
index 859000f3f6f6..129f2282c767 100644
--- a/extensions/amp-story/1.0/test/test-media-tasks.js
+++ b/extensions/amp-story/1.0/test/test-media-tasks.js
@@ -40,8 +40,9 @@ describes.realWin('media-tasks', {}, () => {
     vsyncApi = {
       mutatePromise: () => {},
     };
-    sandbox.stub(vsyncApi, 'mutatePromise').resolves(callback => {callback();});
-
+    sandbox.stub(vsyncApi, 'mutatePromise').resolves(callback => {
+      callback();
+    });
   });
 
   describe('PauseTask', () => {
diff --git a/extensions/amp-story/1.0/test/test-navigation-state.js b/extensions/amp-story/1.0/test/test-navigation-state.js
index 08eb118e926d..cf7a1147f129 100644
--- a/extensions/amp-story/1.0/test/test-navigation-state.js
+++ b/extensions/amp-story/1.0/test/test-navigation-state.js
@@ -17,7 +17,6 @@ import {Action, AmpStoryStoreService} from '../amp-story-store-service';
 import {NavigationState, StateChangeType} from '../navigation-state';
 import {registerServiceBuilder} from '../../../../src/service';
 
-
 describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
   let navigationState;
   let hasBookend = false;
@@ -27,47 +26,67 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
     storeService = new AmpStoryStoreService(env.win);
     registerServiceBuilder(env.win, 'story-store', () => storeService);
     hasBookend = false;
-    navigationState = new NavigationState(env.win,
-        // Not using `Promise.resolve` since we need synchronicity.
-        () => ({then(fn) { fn(hasBookend); }}));
+    navigationState = new NavigationState(
+      env.win,
+      // Not using `Promise.resolve` since we need synchronicity.
+      () => ({
+        then(fn) {
+          fn(hasBookend);
+        },
+      })
+    );
   });
 
   it('should dispatch active page changes to all observers', () => {
-    const observers = Array(5).fill(undefined).map(() => sandbox.spy());
+    const observers = Array(5)
+      .fill(undefined)
+      .map(() => sandbox.spy());
 
     observers.forEach(observer => navigationState.observe(observer));
 
     navigationState.updateActivePage(0, 10, 'my-page-id-1');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 0
-              && e.value.totalPages === 10
-              && e.value.pageId == 'my-page-id-1'
-              && e.value.storyProgress === 0));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 0 &&
+            e.value.totalPages === 10 &&
+            e.value.pageId == 'my-page-id-1' &&
+            e.value.storyProgress === 0
+        )
+      );
     });
 
     navigationState.updateActivePage(5, 15, 'foo');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 5
-              && e.value.totalPages === 15
-              && e.value.pageId === 'foo'
-              && e.value.storyProgress === (1 / 3)));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 5 &&
+            e.value.totalPages === 15 &&
+            e.value.pageId === 'foo' &&
+            e.value.storyProgress === 1 / 3
+        )
+      );
     });
 
     navigationState.updateActivePage(2, 5, 'one-two-three');
 
     observers.forEach(observer => {
-      expect(observer).to.have.been.calledWith(sandbox.match(e =>
-        e.type == StateChangeType.ACTIVE_PAGE
-              && e.value.pageIndex === 2
-              && e.value.totalPages === 5
-              && e.value.pageId == 'one-two-three'
-              && e.value.storyProgress === 0.4));
+      expect(observer).to.have.been.calledWith(
+        sandbox.match(
+          e =>
+            e.type == StateChangeType.ACTIVE_PAGE &&
+            e.value.pageIndex === 2 &&
+            e.value.totalPages === 5 &&
+            e.value.pageId == 'one-two-three' &&
+            e.value.storyProgress === 0.4
+        )
+      );
     });
   });
 
@@ -80,13 +99,18 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
 
     navigationState.updateActivePage(1, 2, 'fake-id', 'old-fake-id', false);
 
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.ACTIVE_PAGE
-          && e.value.pageIndex === 1
-          && e.value.totalPages === 2));
-
-    expect(observer).to.not.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.END));
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(
+        e =>
+          e.type == StateChangeType.ACTIVE_PAGE &&
+          e.value.pageIndex === 1 &&
+          e.value.totalPages === 2
+      )
+    );
+
+    expect(observer).to.not.have.been.calledWith(
+      sandbox.match(e => e.type == StateChangeType.END)
+    );
   });
 
   it('should dispatch END on last page if story does NOT have bookend', () => {
@@ -98,13 +122,18 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
 
     navigationState.updateActivePage(1, 2, 'fake-id', 'old-fake-id', true);
 
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.ACTIVE_PAGE
-          && e.value.pageIndex === 1
-          && e.value.totalPages === 2));
-
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.END));
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(
+        e =>
+          e.type == StateChangeType.ACTIVE_PAGE &&
+          e.value.pageIndex === 1 &&
+          e.value.totalPages === 2
+      )
+    );
+
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(e => e.type == StateChangeType.END)
+    );
   });
 
   it('should NOT dispatch END on last page if story has bookend', () => {
@@ -116,13 +145,18 @@ describes.fakeWin('amp-story navigation state', {ampdoc: 'none'}, env => {
 
     navigationState.updateActivePage(1, 2, 'fake-id', 'old-fake-id', true);
 
-    expect(observer).to.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.ACTIVE_PAGE
-          && e.value.pageIndex === 1
-          && e.value.totalPages === 2));
-
-    expect(observer).to.not.have.been.calledWith(sandbox.match(e =>
-      e.type == StateChangeType.END));
+    expect(observer).to.have.been.calledWith(
+      sandbox.match(
+        e =>
+          e.type == StateChangeType.ACTIVE_PAGE &&
+          e.value.pageIndex === 1 &&
+          e.value.totalPages === 2
+      )
+    );
+
+    expect(observer).to.not.have.been.calledWith(
+      sandbox.match(e => e.type == StateChangeType.END)
+    );
   });
 
   it('should dispatch BOOKEND_ENTER/END and BOOKEND_EXIT', () => {
diff --git a/extensions/amp-story/1.0/test/test-utils.js b/extensions/amp-story/1.0/test/test-utils.js
index 39c6f6466ff5..7b8fdd905f34 100644
--- a/extensions/amp-story/1.0/test/test-utils.js
+++ b/extensions/amp-story/1.0/test/test-utils.js
@@ -54,13 +54,19 @@ describes.fakeWin('amp-story utils', {}, () => {
 
   describe('getRGBFromCssColorValue', () => {
     it('should accept rgb parameters', () => {
-      expect(getRGBFromCssColorValue('rgb(0, 10, 100)'))
-          .to.deep.equal({r: 0, g: 10, b: 100});
+      expect(getRGBFromCssColorValue('rgb(0, 10, 100)')).to.deep.equal({
+        r: 0,
+        g: 10,
+        b: 100,
+      });
     });
 
     it('should accept rgba parameters', () => {
-      expect(getRGBFromCssColorValue('rgba(0, 10, 100, 0.1)'))
-          .to.deep.equal({r: 0, g: 10, b: 100});
+      expect(getRGBFromCssColorValue('rgba(0, 10, 100, 0.1)')).to.deep.equal({
+        r: 0,
+        g: 10,
+        b: 100,
+      });
     });
 
     it('should throw an error if wrong parameters', () => {
@@ -71,8 +77,11 @@ describes.fakeWin('amp-story utils', {}, () => {
 
     it('should return a default value if wrong parameters', () => {
       allowConsoleError(() => {
-        expect(getRGBFromCssColorValue('who dis'))
-            .to.deep.equal({r: 0, g: 0, b: 0});
+        expect(getRGBFromCssColorValue('who dis')).to.deep.equal({
+          r: 0,
+          g: 0,
+          b: 0,
+        });
       });
     });
   });
@@ -87,4 +96,3 @@ describes.fakeWin('amp-story utils', {}, () => {
     });
   });
 });
-
diff --git a/extensions/amp-story/1.0/test/test-variable-service.js b/extensions/amp-story/1.0/test/test-variable-service.js
index 6a56a7714f1a..7c4e93b05c8f 100644
--- a/extensions/amp-story/1.0/test/test-variable-service.js
+++ b/extensions/amp-story/1.0/test/test-variable-service.js
@@ -17,7 +17,6 @@ import {AdvancementMode} from '../story-analytics';
 import {AmpStoryVariableService} from '../variable-service';
 import {StateChangeType} from '../navigation-state';
 
-
 describes.fakeWin('amp-story variable service', {}, () => {
   let variableService;
 
@@ -40,8 +39,9 @@ describes.fakeWin('amp-story variable service', {}, () => {
   });
 
   it('should update storyAdvancementMode on change', () => {
-    variableService
-        .onAdvancementModeStateChange(AdvancementMode.MANUAL_ADVANCE);
+    variableService.onAdvancementModeStateChange(
+      AdvancementMode.MANUAL_ADVANCE
+    );
 
     const variables = variableService.get();
     expect(variables['storyAdvancementMode']).to.equal('manualAdvance');
diff --git a/extensions/amp-story/1.0/toast.js b/extensions/amp-story/1.0/toast.js
index ebf46bab0099..fcdd95c50d57 100644
--- a/extensions/amp-story/1.0/toast.js
+++ b/extensions/amp-story/1.0/toast.js
@@ -17,18 +17,15 @@ import {Services} from '../../../src/services';
 import {createElementWithAttributes, removeElement} from '../../../src/dom';
 import {toWin} from '../../../src/types';
 
-
 /** @private @const {string} */
 const TOAST_CLASSNAME = 'i-amphtml-story-toast';
 
-
 /**
  * Should be higher than total animation time.
  * @private @const {number}
  */
 const TOAST_VISIBLE_TIME_MS = 2600;
 
-
 /**
  * UI notifications service, displaying a message to the user for a limited
  * amount of time.
@@ -41,8 +38,11 @@ export class Toast {
   static show(storyEl, childNodeOrText) {
     const win = toWin(storyEl.ownerDocument.defaultView);
 
-    const toast = createElementWithAttributes(win.document, 'div',
-        /** @type {!JsonObject} */ ({'class': TOAST_CLASSNAME}));
+    const toast = createElementWithAttributes(
+      win.document,
+      'div',
+      /** @type {!JsonObject} */ ({'class': TOAST_CLASSNAME})
+    );
 
     if (typeof childNodeOrText == 'string') {
       toast.textContent = childNodeOrText;
@@ -52,7 +52,9 @@ export class Toast {
 
     storyEl.appendChild(toast);
 
-    Services.timerFor(win)
-        .delay(() => removeElement(toast), TOAST_VISIBLE_TIME_MS);
+    Services.timerFor(win).delay(
+      () => removeElement(toast),
+      TOAST_VISIBLE_TIME_MS
+    );
   }
 }
diff --git a/extensions/amp-story/1.0/utils.js b/extensions/amp-story/1.0/utils.js
index d0760e3cc160..7a3644813657 100644
--- a/extensions/amp-story/1.0/utils.js
+++ b/extensions/amp-story/1.0/utils.js
@@ -37,15 +37,14 @@ export function timeStrToMillis(time) {
   const units = match[2];
 
   userAssert(
-      match &&
-          match.length == 3 &&
-          (units == 's' || units == 'ms'),
-      'Invalid time string %s', time);
+    match && match.length == 3 && (units == 's' || units == 'ms'),
+    'Invalid time string %s',
+    time
+  );
 
   return units == 's' ? parseFloat(num) * 1000 : parseInt(num, 10);
 }
 
-
 /**
  * Determines whether the specified element has an action for its on="tap:..."
  * handler.
@@ -55,11 +54,11 @@ export function timeStrToMillis(time) {
 export function hasTapAction(el) {
   // There are better ways to determine this, but they're all bound to action
   // service race conditions. This is good enough for our use case.
-  return el.hasAttribute('on') &&
-      !!el.getAttribute('on').match(/(^|;)\s*tap\s*:/);
+  return (
+    el.hasAttribute('on') && !!el.getAttribute('on').match(/(^|;)\s*tap\s*:/)
+  );
 }
 
-
 /**
  * Calculates a client rect without applying scaling transformations.
  * Note: must be run in a vsync measure context.
@@ -67,10 +66,10 @@ export function hasTapAction(el) {
  * @return {!ClientRect}
  */
 export function unscaledClientRect(el) {
-  const {width, height, left, top} = el./*OK*/getBoundingClientRect();
+  const {width, height, left, top} = el./*OK*/ getBoundingClientRect();
 
-  const scaleFactorX = width == 0 ? 1 : width / el./*OK*/offsetWidth;
-  const scaleFactorY = height == 0 ? 1 : height / el./*OK*/offsetHeight;
+  const scaleFactorX = width == 0 ? 1 : width / el./*OK*/ offsetWidth;
+  const scaleFactorY = height == 0 ? 1 : height / el./*OK*/ offsetHeight;
 
   return /** @type {!ClientRect} */ ({
     left: left / scaleFactorX,
@@ -80,7 +79,6 @@ export function unscaledClientRect(el) {
   });
 }
 
-
 /**
  * Finds an amp-video/amp-audio ancestor.
  * @param {!Element} el
@@ -90,7 +88,6 @@ export function ampMediaElementFor(el) {
   return closestAncestorElementBySelector(el, 'amp-video, amp-audio');
 }
 
-
 /**
  * Creates a shadow root for the provided container, and appends the element
  * along with its CSS.
@@ -100,16 +97,16 @@ export function ampMediaElementFor(el) {
  */
 export function createShadowRootWithStyle(container, element, css) {
   const style = self.document.createElement('style');
-  style./*OK*/textContent = css;
+  style./*OK*/ textContent = css;
 
-  const containerToUse = getMode().test ?
-    container : createShadowRoot(container);
+  const containerToUse = getMode().test
+    ? container
+    : createShadowRoot(container);
 
   containerToUse.appendChild(style);
   containerToUse.appendChild(element);
 }
 
-
 /**
  * Parses the resolved CSS color property, that is always in the form of
  * `rgba(0, 0, 0, 1)` or `rgb(0, 0, 0)`, that can be retrieved using
@@ -122,8 +119,11 @@ export function getRGBFromCssColorValue(cssValue) {
   const regexPattern = /rgba?\((\d{1,3}), (\d{1,3}), (\d{1,3})/;
 
   if (!cssValue.match(regexPattern)) {
-    user().error('UTILS', 'getRGBFromCssColorValue expects a parameter in ' +
-        `the form of 'rgba(0, 0, 0, 1)' or 'rgb(0, 0, 0)' but got ${cssValue}`);
+    user().error(
+      'UTILS',
+      'getRGBFromCssColorValue expects a parameter in ' +
+        `the form of 'rgba(0, 0, 0, 1)' or 'rgb(0, 0, 0)' but got ${cssValue}`
+    );
     // Returns a fallback value, to fail 'gracefully' in case a browser we don't
     // know about gave an unexpected value.
     return {r: 0, g: 0, b: 0};
@@ -159,7 +159,7 @@ export function getTextColorForRGB({r, g, b}) {
   const linearG = getLinearRGBValue(g);
   const linearB = getLinearRGBValue(b);
 
-  const L = (0.2126 * linearR) + (0.7152 * linearG) + (0.0722 * linearB);
+  const L = 0.2126 * linearR + 0.7152 * linearG + 0.0722 * linearB;
 
   // Determines which one of the white and black text have a better contrast
   // ratio against the used background color.
@@ -170,7 +170,6 @@ export function getTextColorForRGB({r, g, b}) {
   return L > 0.179 ? '#000' : '#FFF';
 }
 
-
 /**
  * Sets given attribute to the given element in next `mutate` phase.
  * @param {!AMP.BaseElement} elementImpl
@@ -184,7 +183,6 @@ export function setAttributeInMutate(elementImpl, name, opt_value) {
   });
 }
 
-
 /**
  * Removes given attribute from the given element in next `mutate` phase.
  * @param {!AMP.BaseElement} elementImpl
@@ -201,8 +199,11 @@ export function removeAttributeInMutate(elementImpl, name) {
  * @param {string|!Location} url
  */
 export function userAssertValidProtocol(element, url) {
-  userAssert(Services.urlForDoc(element).isProtocolValid(url),
-      'Unsupported protocol for URL %s', url);
+  userAssert(
+    Services.urlForDoc(element).isProtocolValid(url),
+    'Unsupported protocol for URL %s',
+    url
+  );
 }
 
 /**
@@ -243,8 +244,9 @@ export const HistoryState = {
 export function setHistoryState(win, stateName, value) {
   const {history} = win;
   const state = getState(history) || {};
-  const newHistory = Object.assign({}, /** @type {!Object} */ (state),
-      {[stateName]: value});
+  const newHistory = Object.assign({}, /** @type {!Object} */ (state), {
+    [stateName]: value,
+  });
 
   history.replaceState(newHistory, '');
 }
@@ -273,7 +275,9 @@ export function getHistoryState(win, stateName) {
 export function isMediaDisplayed(ampMediaEl, resource) {
   // Considers amp-audio elements with a layout=nodisplay attribute as
   // displayed, since they are expected to play when the page is active.
-  return resource.isDisplayed() ||
-      (ampMediaEl.tagName === 'AMP-AUDIO' &&
-          ampMediaEl.getLayout() === Layout.NODISPLAY);
+  return (
+    resource.isDisplayed() ||
+    (ampMediaEl.tagName === 'AMP-AUDIO' &&
+      ampMediaEl.getLayout() === Layout.NODISPLAY)
+  );
 }
diff --git a/extensions/amp-story/1.0/variable-service.js b/extensions/amp-story/1.0/variable-service.js
index 2f0e7b5f346f..01da0d1a25f8 100644
--- a/extensions/amp-story/1.0/variable-service.js
+++ b/extensions/amp-story/1.0/variable-service.js
@@ -21,7 +21,6 @@ import {dict} from '../../../src/utils/object';
  */
 export let StoryVariableDef;
 
-
 /** @enum {string} */
 const Variable = {
   STORY_PAGE_ID: 'storyPageId',
@@ -33,7 +32,6 @@ const Variable = {
   STORY_ADVANCEMENT_MODE: 'storyAdvancementMode',
 };
 
-
 /**
  * Variable service for amp-story.
  * Used for URL replacement service. See usage in src/url-replacements-impl.
@@ -61,8 +59,13 @@ export class AmpStoryVariableService {
   onNavigationStateChange(stateChangeEvent) {
     switch (stateChangeEvent.type) {
       case StateChangeType.ACTIVE_PAGE:
-        const {pageIndex, pageId, storyProgress, totalPages, previousPageId} =
-            stateChangeEvent.value;
+        const {
+          pageIndex,
+          pageId,
+          storyProgress,
+          totalPages,
+          previousPageId,
+        } = stateChangeEvent.value;
         this.variables_[Variable.STORY_PAGE_INDEX] = pageIndex;
         this.variables_[Variable.STORY_PAGE_ID] = pageId;
         this.variables_[Variable.STORY_PROGRESS] = storyProgress;
diff --git a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
index f588a7409e00..535f424b5c21 100644
--- a/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
+++ b/extensions/amp-subscriptions-google/0.1/amp-subscriptions-google.js
@@ -27,11 +27,8 @@ import {
 } from '../../amp-subscriptions/0.1/entitlement';
 import {PageConfig} from '../../../third_party/subscriptions-project/config';
 import {Services} from '../../../src/services';
-import {
-  SubscriptionAnalyticsEvents,
-} from '../../amp-subscriptions/0.1/analytics';
-import {SubscriptionsScoreFactor}
-  from '../../amp-subscriptions/0.1/score-factors.js';
+import {SubscriptionAnalyticsEvents} from '../../amp-subscriptions/0.1/analytics';
+import {SubscriptionsScoreFactor} from '../../amp-subscriptions/0.1/score-factors.js';
 import {installStylesForDoc} from '../../../src/style-installer';
 import {parseUrlDeprecated} from '../../../src/url';
 
@@ -39,7 +36,6 @@ const TAG = 'amp-subscriptions-google';
 const PLATFORM_ID = 'subscribe.google.com';
 const GOOGLE_DOMAIN_RE = /(^|\.)google\.(com?|[a-z]{2}|com?\.[a-z]{2}|cat)$/;
 
-
 /**
  */
 export class GoogleSubscriptionsPlatformService {
@@ -57,17 +53,18 @@ export class GoogleSubscriptionsPlatformService {
    * @return {!GoogleSubscriptionsPlatform}
    */
   createPlatform(platformConfig, serviceAdapter) {
-    return new GoogleSubscriptionsPlatform(this.ampdoc_,
-        platformConfig, serviceAdapter);
+    return new GoogleSubscriptionsPlatform(
+      this.ampdoc_,
+      platformConfig,
+      serviceAdapter
+    );
   }
 }
 
-
 /**
  * @implements {../../amp-subscriptions/0.1/subscription-platform.SubscriptionPlatform}
  */
 export class GoogleSubscriptionsPlatform {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} platformConfig
@@ -88,11 +85,11 @@ export class GoogleSubscriptionsPlatform {
 
     /** @private @const {!ConfiguredRuntime} */
     this.runtime_ = new ConfiguredRuntime(
-        new DocImpl(ampdoc),
-        serviceAdapter.getPageConfig(),
-        {
-          fetcher: new AmpFetcher(ampdoc.win),
-        }
+      new DocImpl(ampdoc),
+      serviceAdapter.getPageConfig(),
+      {
+        fetcher: new AmpFetcher(ampdoc.win),
+      }
     );
     this.runtime_.setOnLoginRequest(request => {
       this.onLoginRequest_(request && request.linkRequested);
@@ -100,13 +97,15 @@ export class GoogleSubscriptionsPlatform {
     this.runtime_.setOnLinkComplete(() => {
       this.onLinkComplete_();
       this.subscriptionAnalytics_.actionEvent(
-          this.getServiceId(),
-          'link',
-          'success');
+        this.getServiceId(),
+        'link',
+        'success'
+      );
       // TODO(dvoytenko): deprecate separate "link" events.
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.LINK_COMPLETE,
-          this.getServiceId());
+        SubscriptionAnalyticsEvents.LINK_COMPLETE,
+        this.getServiceId()
+      );
     });
     this.runtime_.setOnFlowStarted(e => {
       if (
@@ -116,22 +115,25 @@ export class GoogleSubscriptionsPlatform {
         e.flow == 'showOffers'
       ) {
         this.subscriptionAnalytics_.actionEvent(
-            this.getServiceId(),
-            e.flow,
-            'started');
+          this.getServiceId(),
+          e.flow,
+          'started'
+        );
       }
     });
     this.runtime_.setOnFlowCanceled(e => {
       if (e.flow == 'linkAccount') {
         this.onLinkComplete_();
         this.subscriptionAnalytics_.actionEvent(
-            this.getServiceId(),
-            'link',
-            'rejected');
+          this.getServiceId(),
+          'link',
+          'rejected'
+        );
         // TODO(dvoytenko): deprecate separate "link" events.
         this.subscriptionAnalytics_.serviceEvent(
-            SubscriptionAnalyticsEvents.LINK_CANCELED,
-            this.getServiceId());
+          SubscriptionAnalyticsEvents.LINK_CANCELED,
+          this.getServiceId()
+        );
       } else if (
         e.flow == 'subscribe' ||
         e.flow == 'contribute' ||
@@ -139,9 +141,10 @@ export class GoogleSubscriptionsPlatform {
         e.flow == 'showOffers'
       ) {
         this.subscriptionAnalytics_.actionEvent(
-            this.getServiceId(),
-            e.flow,
-            'rejected');
+          this.getServiceId(),
+          e.flow,
+          'rejected'
+        );
       }
     });
     this.runtime_.setOnNativeSubscribeRequest(() => {
@@ -180,16 +183,17 @@ export class GoogleSubscriptionsPlatform {
     if (linkRequested && this.isGoogleViewer_) {
       this.runtime_.linkAccount();
       this.subscriptionAnalytics_.actionEvent(
-          this.getServiceId(),
-          'link',
-          'started');
+        this.getServiceId(),
+        'link',
+        'started'
+      );
       // TODO(dvoytenko): deprecate separate "link" events.
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.LINK_REQUESTED,
-          this.getServiceId());
+        SubscriptionAnalyticsEvents.LINK_REQUESTED,
+        this.getServiceId()
+      );
     } else {
-      this.maybeComplete_(this.serviceAdapter_.delegateActionToLocal(
-          'login'));
+      this.maybeComplete_(this.serviceAdapter_.delegateActionToLocal('login'));
     }
   }
 
@@ -201,8 +205,9 @@ export class GoogleSubscriptionsPlatform {
   /* TODO(jpettitt): should local suppoort 'contribute' action? */
   /** @private */
   onNativeSubscribeRequest_() {
-    this.maybeComplete_(this.serviceAdapter_.delegateActionToLocal(
-        'subscribe'));
+    this.maybeComplete_(
+      this.serviceAdapter_.delegateActionToLocal('subscribe')
+    );
   }
 
   /**
@@ -227,9 +232,10 @@ export class GoogleSubscriptionsPlatform {
       this.serviceAdapter_.resetPlatforms();
     });
     this.subscriptionAnalytics_.actionEvent(
-        this.getServiceId(),
-        eventType,
-        'success');
+      this.getServiceId(),
+      eventType,
+      'success'
+    );
   }
 
   /** @override */
@@ -246,32 +252,34 @@ export class GoogleSubscriptionsPlatform {
 
   /** @override */
   getEntitlements() {
-    const encryptedDocumentKey =
-        this.serviceAdapter_.getEncryptedDocumentKey('google.com');
-    return this.runtime_.getEntitlements(
-        encryptedDocumentKey).then(swgEntitlements => {
-      // Get and store the isReadyToPay signal which is independent of
-      // any entitlments existing.
-      if (swgEntitlements.isReadyToPay) {
-        this.isReadyToPay_ = true;
-      }
+    const encryptedDocumentKey = this.serviceAdapter_.getEncryptedDocumentKey(
+      'google.com'
+    );
+    return this.runtime_
+      .getEntitlements(encryptedDocumentKey)
+      .then(swgEntitlements => {
+        // Get and store the isReadyToPay signal which is independent of
+        // any entitlments existing.
+        if (swgEntitlements.isReadyToPay) {
+          this.isReadyToPay_ = true;
+        }
 
-      // Get the specifc entitlement we're looking for
-      const swgEntitlement = swgEntitlements.getEntitlementForThis();
-      if (!swgEntitlement) {
-        return null;
-      }
-      swgEntitlements.ack();
-      return new Entitlement({
-        source: swgEntitlement.source,
-        raw: swgEntitlements.raw,
-        service: PLATFORM_ID,
-        granted: true, //swgEntitlements.getEntitlementForThis makes sure this is true.
-        grantReason: GrantReason.SUBSCRIBER, // there is no other case of subscription for SWG as of now.
-        dataObject: swgEntitlement.json(),
-        decryptedDocumentKey: swgEntitlements.decryptedDocumentKey,
+        // Get the specifc entitlement we're looking for
+        const swgEntitlement = swgEntitlements.getEntitlementForThis();
+        if (!swgEntitlement) {
+          return null;
+        }
+        swgEntitlements.ack();
+        return new Entitlement({
+          source: swgEntitlement.source,
+          raw: swgEntitlements.raw,
+          service: PLATFORM_ID,
+          granted: true, //swgEntitlements.getEntitlementForThis makes sure this is true.
+          grantReason: GrantReason.SUBSCRIBER, // there is no other case of subscription for SWG as of now.
+          dataObject: swgEntitlement.json(),
+          decryptedDocumentKey: swgEntitlements.decryptedDocumentKey,
+        });
       });
-    });
   }
 
   /** @override */
@@ -331,7 +339,8 @@ export class GoogleSubscriptionsPlatform {
     const viewerUrl = viewer.getParam('viewerUrl');
     if (viewerUrl) {
       this.isGoogleViewer_ = GOOGLE_DOMAIN_RE.test(
-          parseUrlDeprecated(viewerUrl).hostname);
+        parseUrlDeprecated(viewerUrl).hostname
+      );
     } else {
       // This can only be resolved asynchronously in this case. However, the
       // action execution must be done synchronously. Thus we have to allow
@@ -339,7 +348,8 @@ export class GoogleSubscriptionsPlatform {
       viewer.getViewerOrigin().then(origin => {
         if (origin) {
           this.isGoogleViewer_ = GOOGLE_DOMAIN_RE.test(
-              parseUrlDeprecated(origin).hostname);
+            parseUrlDeprecated(origin).hostname
+          );
         }
       });
     }
@@ -366,13 +376,15 @@ export class GoogleSubscriptionsPlatform {
     if (action == 'subscribe') {
       this.runtime_.showOffers({
         list: 'amp',
-        isClosable: true});
+        isClosable: true,
+      });
       return Promise.resolve(true);
     }
     if (action == 'contribute') {
       this.runtime_.showContributionOptions({
         list: 'amp',
-        isClosable: true});
+        isClosable: true,
+      });
       return Promise.resolve(true);
     }
     if (action == 'login') {
@@ -395,13 +407,11 @@ export class GoogleSubscriptionsPlatform {
   }
 }
 
-
 /**
  * Adopts fetcher protocol required for SwG to AMP fetching rules.
  * @implements {Fetcher}
  */
 class AmpFetcher {
-
   /**
    * @param {!Window} win
    */
@@ -412,33 +422,38 @@ class AmpFetcher {
 
   /** @override */
   fetchCredentialedJson(url) {
-    return this.xhr_.fetchJson(url, {
-      credentials: 'include',
-    }).then(response => response.json());
+    return this.xhr_
+      .fetchJson(url, {
+        credentials: 'include',
+      })
+      .then(response => response.json());
   }
 }
 
-
 // Register the extension services.
 AMP.extension(TAG, '0.1', function(AMP) {
-  AMP.registerServiceForDoc('subscriptions-google',
-      /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
-      ampdoc => {
-        const platformService = new GoogleSubscriptionsPlatformService(ampdoc);
-        const element = ampdoc.getHeadNode();
-        Services.subscriptionsServiceForDoc(element).then(service => {
-          service.registerPlatform(PLATFORM_ID,
-              (platformConfig, serviceAdapter) => {
-                return platformService.createPlatform(platformConfig,
-                    serviceAdapter);
-              }
-          );
-        });
-        return platformService;
+  AMP.registerServiceForDoc(
+    'subscriptions-google',
+    /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
+    ampdoc => {
+      const platformService = new GoogleSubscriptionsPlatformService(ampdoc);
+      const element = ampdoc.getHeadNode();
+      Services.subscriptionsServiceForDoc(element).then(service => {
+        service.registerPlatform(
+          PLATFORM_ID,
+          (platformConfig, serviceAdapter) => {
+            return platformService.createPlatform(
+              platformConfig,
+              serviceAdapter
+            );
+          }
+        );
       });
+      return platformService;
+    }
+  );
 });
 
-
 /**
  * TODO(dvoytenko): remove once compiler type checking is fixed for third_party.
  * @package @visibleForTesting
diff --git a/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js b/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
index 1109893827f2..ee3f4bfeca54 100644
--- a/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
+++ b/extensions/amp-subscriptions-google/0.1/test/test-amp-subscriptions-google.js
@@ -24,19 +24,14 @@ import {
   GrantReason,
 } from '../../../amp-subscriptions/0.1/entitlement';
 import {GoogleSubscriptionsPlatform} from '../amp-subscriptions-google';
-import {
-  PageConfig,
-} from '../../../../third_party/subscriptions-project/config';
+import {PageConfig} from '../../../../third_party/subscriptions-project/config';
 import {ServiceAdapter} from '../../../amp-subscriptions/0.1/service-adapter';
 import {Services} from '../../../../src/services';
-import {SubscriptionAnalytics}
-  from '../../../amp-subscriptions/0.1/analytics';
-import {SubscriptionsScoreFactor}
-  from '../../../amp-subscriptions/0.1/score-factors';
+import {SubscriptionAnalytics} from '../../../amp-subscriptions/0.1/analytics';
+import {SubscriptionsScoreFactor} from '../../../amp-subscriptions/0.1/score-factors';
 
 const PLATFORM_ID = 'subscribe.google.com';
 
-
 describes.realWin('amp-subscriptions-google', {amp: true}, env => {
   let ampdoc;
   let pageConfig;
@@ -68,37 +63,53 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
     const analytics = new SubscriptionAnalytics(ampdoc.getRootNode());
     sandbox.stub(serviceAdapter, 'getAnalytics').callsFake(() => analytics);
     analyticsMock = sandbox.mock(analytics);
-    getEncryptedDocumentKeyStub = sandbox.stub(
-        serviceAdapter, 'getEncryptedDocumentKey')
-        .callsFake(() => {return null;});
+    getEncryptedDocumentKeyStub = sandbox
+      .stub(serviceAdapter, 'getEncryptedDocumentKey')
+      .callsFake(() => {
+        return null;
+      });
     entitlementResponse = {
       source: 'google',
       products: ['example.org:basic'],
       subscriptionToken: 'tok1',
     };
     callbacks = {
-      loginRequest:
-          sandbox.stub(ConfiguredRuntime.prototype, 'setOnLoginRequest'),
-      linkComplete:
-          sandbox.stub(ConfiguredRuntime.prototype, 'setOnLinkComplete'),
-      flowStarted:
-          sandbox.stub(ConfiguredRuntime.prototype, 'setOnFlowStarted'),
-      flowCanceled:
-          sandbox.stub(ConfiguredRuntime.prototype, 'setOnFlowCanceled'),
-      subscribeRequest:
-          sandbox.stub(ConfiguredRuntime.prototype,
-              'setOnNativeSubscribeRequest'),
-      subscribeResponse:
-          sandbox.stub(ConfiguredRuntime.prototype, 'setOnSubscribeResponse'),
+      loginRequest: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnLoginRequest'
+      ),
+      linkComplete: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnLinkComplete'
+      ),
+      flowStarted: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnFlowStarted'
+      ),
+      flowCanceled: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnFlowCanceled'
+      ),
+      subscribeRequest: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnNativeSubscribeRequest'
+      ),
+      subscribeResponse: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'setOnSubscribeResponse'
+      ),
     };
     methods = {
       reset: sandbox.stub(ConfiguredRuntime.prototype, 'reset'),
-      showContributionOptions:
-          sandbox.stub(ConfiguredRuntime.prototype,
-              'showContributionOptions'),
+      showContributionOptions: sandbox.stub(
+        ConfiguredRuntime.prototype,
+        'showContributionOptions'
+      ),
       showOffers: sandbox.stub(ConfiguredRuntime.prototype, 'showOffers'),
       showAbbrvOffer: sandbox.stub(
-          ConfiguredRuntime.prototype, 'showAbbrvOffer'),
+        ConfiguredRuntime.prototype,
+        'showAbbrvOffer'
+      ),
       linkAccount: sandbox.stub(ConfiguredRuntime.prototype, 'linkAccount'),
     };
     ackStub = sandbox.stub(Entitlements.prototype, 'ack');
@@ -192,43 +203,58 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
   });
 
   it('should ignore activate when granted', () => {
-    platform.activate(new Entitlement({service: PLATFORM_ID,
-      granted: true, grantReason: GrantReason.SUBSCRIBER}));
+    platform.activate(
+      new Entitlement({
+        service: PLATFORM_ID,
+        granted: true,
+        grantReason: GrantReason.SUBSCRIBER,
+      })
+    );
     expect(methods.showOffers).to.not.be.called;
     expect(methods.showAbbrvOffer).to.not.be.called;
   });
 
   it('should show offers on activate when not granted', () => {
-    platform.activate(new Entitlement({service: PLATFORM_ID,
-      granted: false}));
-    expect(methods.showOffers).to.be.calledOnce
-        .calledWithExactly({list: 'amp'});
+    platform.activate(new Entitlement({service: PLATFORM_ID, granted: false}));
+    expect(methods.showOffers).to.be.calledOnce.calledWithExactly({
+      list: 'amp',
+    });
     expect(methods.showAbbrvOffer).to.not.be.called;
   });
 
   it('should show abbrv offer on activate when granted non-subscriber', () => {
-    platform.activate(new Entitlement({service: PLATFORM_ID,
-      granted: true, grantReason: GrantReason.METERING}));
-    expect(methods.showAbbrvOffer).to.be.calledOnce
-        .calledWithExactly({list: 'amp'});
+    platform.activate(
+      new Entitlement({
+        service: PLATFORM_ID,
+        granted: true,
+        grantReason: GrantReason.METERING,
+      })
+    );
+    expect(methods.showAbbrvOffer).to.be.calledOnce.calledWithExactly({
+      list: 'amp',
+    });
     expect(methods.showOffers).to.not.be.called;
   });
 
   it('should override show offers with the grant for subscriber', () => {
-    const entitlement = new Entitlement({service: PLATFORM_ID,
-      granted: false});
-    const grantEntitlement = new Entitlement({service: 'local',
-      granted: true, grantReason: GrantReason.SUBSCRIBER});
+    const entitlement = new Entitlement({service: PLATFORM_ID, granted: false});
+    const grantEntitlement = new Entitlement({
+      service: 'local',
+      granted: true,
+      grantReason: GrantReason.SUBSCRIBER,
+    });
     platform.activate(entitlement, grantEntitlement);
     expect(methods.showOffers).to.not.be.called;
     expect(methods.showAbbrvOffer).to.not.be.called;
   });
 
   it('should override show offers with the grant non-subscriber', () => {
-    const entitlement = new Entitlement({service: PLATFORM_ID,
-      granted: false});
-    const grantEntitlement = new Entitlement({service: 'local',
-      granted: true, grantReason: GrantReason.METERING});
+    const entitlement = new Entitlement({service: PLATFORM_ID, granted: false});
+    const grantEntitlement = new Entitlement({
+      service: 'local',
+      granted: true,
+      grantReason: GrantReason.METERING,
+    });
     platform.activate(entitlement, grantEntitlement);
     expect(methods.showOffers).to.not.be.called;
     expect(methods.showAbbrvOffer).to.be.calledOnce;
@@ -241,20 +267,22 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
   });
 
   it('should delegate login when linking not requested', () => {
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('login')
-        .returns(Promise.resolve(false))
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('login')
+      .returns(Promise.resolve(false))
+      .once();
     callback(callbacks.loginRequest)({linkRequested: false});
     expect(methods.linkAccount).to.not.be.called;
   });
 
   it('should delegate login for a non-google viewer', () => {
     platform.isGoogleViewer_ = false;
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('login')
-        .returns(Promise.resolve(false))
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('login')
+      .returns(Promise.resolve(false))
+      .once();
     callback(callbacks.loginRequest)({linkRequested: true});
     expect(methods.linkAccount).to.not.be.called;
   });
@@ -265,44 +293,53 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
   });
 
   it('should reauthorize on complete linking', () => {
-    analyticsMock.expects('actionEvent')
-        .withExactArgs(PLATFORM_ID, 'link', 'success')
-        .once();
-    serviceAdapterMock.expects('resetPlatforms')
-        .once();
+    analyticsMock
+      .expects('actionEvent')
+      .withExactArgs(PLATFORM_ID, 'link', 'success')
+      .once();
+    serviceAdapterMock.expects('resetPlatforms').once();
     callback(callbacks.linkComplete)();
   });
 
   it('should reauthorize on canceled linking', () => {
-    analyticsMock.expects('actionEvent')
-        .withExactArgs(PLATFORM_ID, 'link', 'rejected')
-        .once();
-    serviceAdapterMock.expects('resetPlatforms')
-        .once();
+    analyticsMock
+      .expects('actionEvent')
+      .withExactArgs(PLATFORM_ID, 'link', 'rejected')
+      .once();
+    serviceAdapterMock.expects('resetPlatforms').once();
     callback(callbacks.flowCanceled)({flow: 'linkAccount'});
   });
 
   it('should log subscribe start', () => {
-    analyticsMock.expects('actionEvent')
-        .withExactArgs(PLATFORM_ID, 'subscribe', 'started')
-        .once();
+    analyticsMock
+      .expects('actionEvent')
+      .withExactArgs(PLATFORM_ID, 'subscribe', 'started')
+      .once();
     callback(callbacks.flowStarted)({flow: 'subscribe'});
   });
 
   it('should log subscribe cancel', () => {
-    analyticsMock.expects('actionEvent')
-        .withExactArgs(PLATFORM_ID, 'subscribe', 'rejected')
-        .once();
+    analyticsMock
+      .expects('actionEvent')
+      .withExactArgs(PLATFORM_ID, 'subscribe', 'rejected')
+      .once();
     callback(callbacks.flowCanceled)({flow: 'subscribe'});
   });
 
   it('should reauthorize on complete subscribe', () => {
-    analyticsMock.expects('actionEvent')
-        .withExactArgs(PLATFORM_ID, 'subscribe', 'success')
-        .once();
+    analyticsMock
+      .expects('actionEvent')
+      .withExactArgs(PLATFORM_ID, 'subscribe', 'success')
+      .once();
     const promise = Promise.resolve();
-    const response = new SubscribeResponse(null, null, null, null, null,
-        () => promise);
+    const response = new SubscribeResponse(
+      null,
+      null,
+      null,
+      null,
+      null,
+      () => promise
+    );
     const resetPlatformsPromise = new Promise(resolve => {
       sandbox.stub(serviceAdapter, 'resetPlatforms').callsFake(() => {
         resolve();
@@ -314,19 +351,21 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
   });
 
   it('should delegate native subscribe request', () => {
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('subscribe')
-        .returns(Promise.resolve(false))
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('subscribe')
+      .returns(Promise.resolve(false))
+      .once();
     callback(callbacks.subscribeRequest)();
   });
 
   it('should reset on successful login', () => {
     const loginResult = Promise.resolve(true);
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('login')
-        .returns(loginResult)
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('login')
+      .returns(loginResult)
+      .once();
     callback(callbacks.loginRequest)({linkRequested: false});
     return loginResult.then(() => {
       expect(methods.reset).to.be.calledOnce.calledWithExactly();
@@ -335,10 +374,11 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
 
   it('should NOT reset on failed login', () => {
     const loginResult = Promise.resolve(false);
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('login')
-        .returns(loginResult)
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('login')
+      .returns(loginResult)
+      .once();
     callback(callbacks.loginRequest)({linkRequested: false});
     return loginResult.then(() => {
       expect(methods.reset).to.not.be.called;
@@ -347,10 +387,11 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
 
   it('should reset on successful subscribe', () => {
     const loginResult = Promise.resolve(true);
-    serviceAdapterMock.expects('delegateActionToLocal')
-        .withExactArgs('subscribe')
-        .returns(loginResult)
-        .once();
+    serviceAdapterMock
+      .expects('delegateActionToLocal')
+      .withExactArgs('subscribe')
+      .returns(loginResult)
+      .once();
     callback(callbacks.subscribeRequest)();
     return loginResult.then(() => {
       expect(methods.reset).to.be.calledOnce.calledWithExactly();
@@ -372,27 +413,31 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
     let viewerOrigin = null;
     sandbox.stub(viewer, 'getViewerOrigin').callsFake(() => viewerOrigin);
 
-    return Promise.resolve().then(() => {
-      viewerOrigin = Promise.resolve('');
-      platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
-      return viewerOrigin;
-    }).then(() => {
-      expect(platform.isGoogleViewer_).to.be.false;
-
-      // Other origin.
-      viewerOrigin = Promise.resolve('https://other.com');
-      platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
-      return viewerOrigin;
-    }).then(() => {
-      expect(platform.isGoogleViewer_).to.be.false;
-
-      // Google origin.
-      viewerOrigin = Promise.resolve('https://google.com');
-      platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
-      return viewerOrigin;
-    }).then(() => {
-      expect(platform.isGoogleViewer_).to.be.true;
-    });
+    return Promise.resolve()
+      .then(() => {
+        viewerOrigin = Promise.resolve('');
+        platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
+        return viewerOrigin;
+      })
+      .then(() => {
+        expect(platform.isGoogleViewer_).to.be.false;
+
+        // Other origin.
+        viewerOrigin = Promise.resolve('https://other.com');
+        platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
+        return viewerOrigin;
+      })
+      .then(() => {
+        expect(platform.isGoogleViewer_).to.be.false;
+
+        // Google origin.
+        viewerOrigin = Promise.resolve('https://google.com');
+        platform = new GoogleSubscriptionsPlatform(ampdoc, {}, serviceAdapter);
+        return viewerOrigin;
+      })
+      .then(() => {
+        expect(platform.isGoogleViewer_).to.be.true;
+      });
   });
 
   it('should allow prerender if in a google viewer', () => {
@@ -403,8 +448,7 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
 
   it('should attach button given to decorateUI', () => {
     const elem = env.win.document.createElement('div');
-    const decorateStub = sandbox.stub(platform.runtime_.buttonApi_,
-        'attach');
+    const decorateStub = sandbox.stub(platform.runtime_.buttonApi_, 'attach');
     elem.textContent = 'some html';
     platform.decorateUI(elem, 'subscribe');
     expect(elem.textContent).to.be.equal('');
@@ -491,9 +535,11 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
         });
       });
       return platform.getEntitlements().then(() => {
-        expect(platform
-            .getSupportedScoreFactor(SubscriptionsScoreFactor.IS_READY_TO_PAY))
-            .to.equal(0);
+        expect(
+          platform.getSupportedScoreFactor(
+            SubscriptionsScoreFactor.IS_READY_TO_PAY
+          )
+        ).to.equal(0);
       });
     });
 
@@ -509,13 +555,16 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
         });
       });
       //#TODO(jpettitt) remove stub when swj.js isRadyToPay is available
-      sandbox.stub(platform.runtime_, 'getEntitlements')
-          .resolves(fakeEntitlements(true));
+      sandbox
+        .stub(platform.runtime_, 'getEntitlements')
+        .resolves(fakeEntitlements(true));
 
       return platform.getEntitlements().then(() => {
-        expect(platform
-            .getSupportedScoreFactor(SubscriptionsScoreFactor.IS_READY_TO_PAY))
-            .to.equal(1);
+        expect(
+          platform.getSupportedScoreFactor(
+            SubscriptionsScoreFactor.IS_READY_TO_PAY
+          )
+        ).to.equal(1);
       });
     });
 
@@ -531,13 +580,16 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
         });
       });
       //#TODO(jpettitt) remove stub when swj.js isRadyToPay is available
-      sandbox.stub(platform.runtime_, 'getEntitlements')
-          .resolves(fakeEntitlements(false));
+      sandbox
+        .stub(platform.runtime_, 'getEntitlements')
+        .resolves(fakeEntitlements(false));
 
       return platform.getEntitlements().then(() => {
-        expect(platform
-            .getSupportedScoreFactor(SubscriptionsScoreFactor.IS_READY_TO_PAY))
-            .to.equal(0);
+        expect(
+          platform.getSupportedScoreFactor(
+            SubscriptionsScoreFactor.IS_READY_TO_PAY
+          )
+        ).to.equal(0);
       });
     });
 
@@ -563,7 +615,9 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
         });
       });
       return platform.getEntitlements().then(() => {
-        return expect(fetchStub).to.be.calledWith('https://news.google.com/swg/_/api/v1/publication/example.org/entitlements');
+        return expect(fetchStub).to.be.calledWith(
+          'https://news.google.com/swg/_/api/v1/publication/example.org/entitlements'
+        );
       });
     });
 
@@ -577,9 +631,12 @@ describes.realWin('amp-subscriptions-google', {amp: true}, env => {
       });
 
       getEncryptedDocumentKeyStub.callsFake(() => {
-        return 'encryptedDocumentKey';});
+        return 'encryptedDocumentKey';
+      });
       return platform.getEntitlements().then(() => {
-        return expect(fetchStub).to.be.calledWith('https://news.google.com/swg/_/api/v1/publication/example.org/entitlements?crypt=encryptedDocumentKey');
+        return expect(fetchStub).to.be.calledWith(
+          'https://news.google.com/swg/_/api/v1/publication/example.org/entitlements?crypt=encryptedDocumentKey'
+        );
       });
     });
   });
diff --git a/extensions/amp-subscriptions/0.1/actions.js b/extensions/amp-subscriptions/0.1/actions.js
index d13fbfd85758..e9c9fe5b8be7 100644
--- a/extensions/amp-subscriptions/0.1/actions.js
+++ b/extensions/amp-subscriptions/0.1/actions.js
@@ -22,11 +22,9 @@ import {openLoginDialog} from '../../amp-access/0.1/login-dialog';
 const TAG = 'amp-subscriptions';
 const LOCAL = 'local';
 
-
 /**
  */
 export class Actions {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!./url-builder.UrlBuilder} urlBuilder
@@ -67,11 +65,13 @@ export class Actions {
     }
     const promises = [];
     for (const k in this.actionsConfig_) {
-      promises.push(this.urlBuilder_.buildUrl(
-          this.actionsConfig_[k], /* useAuthData */ true)
+      promises.push(
+        this.urlBuilder_
+          .buildUrl(this.actionsConfig_[k], /* useAuthData */ true)
           .then(url => {
             this.builtActionUrlMap_[k] = url;
-          }));
+          })
+      );
     }
     return Promise.all(promises).then(() => {
       return this.builtActionUrlMap_;
@@ -83,11 +83,17 @@ export class Actions {
    * @return {!Promise<string>}
    */
   execute(action) {
-    userAssert(this.actionsConfig_[action],
-        'Action URL is not configured: %s', action);
+    userAssert(
+      this.actionsConfig_[action],
+      'Action URL is not configured: %s',
+      action
+    );
     // URL should always be available at this time.
-    const url = userAssert(this.builtActionUrlMap_[action],
-        'Action URL is not ready: %s', action);
+    const url = userAssert(
+      this.builtActionUrlMap_[action],
+      'Action URL is not ready: %s',
+      action
+    );
     return this.execute_(url, action);
   }
 
@@ -104,7 +110,7 @@ export class Actions {
     // 1 second, however, the new action request will be allowed to proceed,
     // given that we cannot always determine fully if the previous attempt is
     // "stuck".
-    if (this.actionPromise_ && (now - this.actionStartTime_ < 1000)) {
+    if (this.actionPromise_ && now - this.actionStartTime_ < 1000) {
       return this.actionPromise_;
     }
 
@@ -112,26 +118,28 @@ export class Actions {
 
     this.analytics_.actionEvent(LOCAL, action, 'started');
     const dialogPromise = this.openPopup_(url);
-    const actionPromise = dialogPromise.then(result => {
-      dev().fine(TAG, 'Action completed: ', action, result);
-      this.actionPromise_ = null;
-      const query = parseQueryString(result);
-      const s = query['success'];
-      const success = (s == 'true' || s == 'yes' || s == '1');
-      if (success) {
-        this.analytics_.actionEvent(LOCAL, action, 'success');
-      } else {
-        this.analytics_.actionEvent(LOCAL, action, 'rejected');
-      }
-      return (success || !s);
-    }).catch(reason => {
-      dev().fine(TAG, 'Action failed: ', action, reason);
-      this.analytics_.actionEvent(LOCAL, action, 'failed');
-      if (this.actionPromise_ == actionPromise) {
+    const actionPromise = dialogPromise
+      .then(result => {
+        dev().fine(TAG, 'Action completed: ', action, result);
         this.actionPromise_ = null;
-      }
-      throw reason;
-    });
+        const query = parseQueryString(result);
+        const s = query['success'];
+        const success = s == 'true' || s == 'yes' || s == '1';
+        if (success) {
+          this.analytics_.actionEvent(LOCAL, action, 'success');
+        } else {
+          this.analytics_.actionEvent(LOCAL, action, 'rejected');
+        }
+        return success || !s;
+      })
+      .catch(reason => {
+        dev().fine(TAG, 'Action failed: ', action, reason);
+        this.analytics_.actionEvent(LOCAL, action, 'failed');
+        if (this.actionPromise_ == actionPromise) {
+          this.actionPromise_ = null;
+        }
+        throw reason;
+      });
     this.actionPromise_ = actionPromise;
     this.actionStartTime_ = now;
     return this.actionPromise_;
diff --git a/extensions/amp-subscriptions/0.1/amp-subscriptions.js b/extensions/amp-subscriptions/0.1/amp-subscriptions.js
index b2ef25034279..4cbb9c18a6d5 100644
--- a/extensions/amp-subscriptions/0.1/amp-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/amp-subscriptions.js
@@ -46,7 +46,6 @@ const TAG = 'amp-subscriptions';
 /** @const */
 const SERVICE_TIMEOUT = 3000;
 
-
 /**
  * @implements {../../amp-access/0.1/access-vars.AccessVars}
  */
@@ -82,8 +81,9 @@ export class SubscriptionService {
     this.configElement_ = user().assertElement(configElement);
 
     /** @private {!SubscriptionAnalytics} */
-    this.subscriptionAnalytics_ =
-        new SubscriptionAnalytics(this.configElement_);
+    this.subscriptionAnalytics_ = new SubscriptionAnalytics(
+      this.configElement_
+    );
 
     /** @private {!ServiceAdapter} */
     this.serviceAdapter_ = new ServiceAdapter(this);
@@ -143,11 +143,13 @@ export class SubscriptionService {
    */
   initializeLocalPlatforms_(serviceConfig) {
     if ((serviceConfig['serviceId'] || 'local') == 'local') {
-      this.platformStore_.resolvePlatform('local',
-          localSubscriptionPlatformFactory(
-              this.ampdoc_,
-              serviceConfig,
-              this.serviceAdapter_)
+      this.platformStore_.resolvePlatform(
+        'local',
+        localSubscriptionPlatformFactory(
+          this.ampdoc_,
+          serviceConfig,
+          this.serviceAdapter_
+        )
       );
     }
   }
@@ -186,25 +188,31 @@ export class SubscriptionService {
         return; // External platforms should not register if viewer provides auth
       }
       const matchedServices = this.platformConfig_['services'].filter(
-          service => (service.serviceId || 'local') === serviceId);
+        service => (service.serviceId || 'local') === serviceId
+      );
 
-      const matchedServiceConfig = userAssert(matchedServices[0],
-          'No matching services for the ID found');
+      const matchedServiceConfig = userAssert(
+        matchedServices[0],
+        'No matching services for the ID found'
+      );
 
       const subscriptionPlatform = subscriptionPlatformFactory(
-          matchedServiceConfig,
-          this.serviceAdapter_);
+        matchedServiceConfig,
+        this.serviceAdapter_
+      );
 
-      this.platformStore_.resolvePlatform(subscriptionPlatform.getServiceId(),
-          subscriptionPlatform);
+      this.platformStore_.resolvePlatform(
+        subscriptionPlatform.getServiceId(),
+        subscriptionPlatform
+      );
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.PLATFORM_REGISTERED,
-          subscriptionPlatform.getServiceId()
+        SubscriptionAnalyticsEvents.PLATFORM_REGISTERED,
+        subscriptionPlatform.getServiceId()
       );
       // Deprecated event fired for backward compatibility
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.PLATFORM_REGISTERED_DEPRECATED,
-          subscriptionPlatform.getServiceId()
+        SubscriptionAnalyticsEvents.PLATFORM_REGISTERED_DEPRECATED,
+        subscriptionPlatform.getServiceId()
       );
       this.fetchEntitlements_(subscriptionPlatform);
     });
@@ -233,11 +241,12 @@ export class SubscriptionService {
     this.platformStore_.resolveEntitlement(serviceId, entitlement);
     if (entitlement.decryptedDocumentKey) {
       this.cryptoHandler_.tryToDecryptDocument(
-          entitlement.decryptedDocumentKey);
+        entitlement.decryptedDocumentKey
+      );
     }
     this.subscriptionAnalytics_.serviceEvent(
-        SubscriptionAnalyticsEvents.ENTITLEMENT_RESOLVED,
-        serviceId
+      SubscriptionAnalyticsEvents.ENTITLEMENT_RESOLVED,
+      serviceId
     );
   }
 
@@ -252,25 +261,30 @@ export class SubscriptionService {
     }
     // Prerender safe platforms don't have to wait for the
     // page to become visible, all others wait for whenFirstVisible()
-    const visiblePromise = subscriptionPlatform.isPrerenderSafe() ?
-      Promise.resolve() : this.viewer_.whenFirstVisible();
+    const visiblePromise = subscriptionPlatform.isPrerenderSafe()
+      ? Promise.resolve()
+      : this.viewer_.whenFirstVisible();
     return visiblePromise.then(() => {
-      return this.timer_.timeoutPromise(
-          timeout,
-          subscriptionPlatform.getEntitlements()
-      ).then(entitlement => {
-        entitlement = entitlement || Entitlement.empty(
-            subscriptionPlatform.getServiceId());
-        this.resolveEntitlementsToStore_(subscriptionPlatform.getServiceId(),
-            entitlement);
-        return entitlement;
-      }).catch(reason => {
-        const serviceId = subscriptionPlatform.getServiceId();
-        this.platformStore_.reportPlatformFailureAndFallback(serviceId);
-        throw user().createError(
-            `fetch entitlements failed for ${serviceId}`, reason
-        );
-      });
+      return this.timer_
+        .timeoutPromise(timeout, subscriptionPlatform.getEntitlements())
+        .then(entitlement => {
+          entitlement =
+            entitlement ||
+            Entitlement.empty(subscriptionPlatform.getServiceId());
+          this.resolveEntitlementsToStore_(
+            subscriptionPlatform.getServiceId(),
+            entitlement
+          );
+          return entitlement;
+        })
+        .catch(reason => {
+          const serviceId = subscriptionPlatform.getServiceId();
+          this.platformStore_.reportPlatformFailureAndFallback(serviceId);
+          throw user().createError(
+            `fetch entitlements failed for ${serviceId}`,
+            reason
+          );
+        });
     });
   }
 
@@ -296,11 +310,14 @@ export class SubscriptionService {
         return;
       }
 
-      userAssert(this.platformConfig_['services'],
-          'Services not configured in service config');
+      userAssert(
+        this.platformConfig_['services'],
+        'Services not configured in service config'
+      );
 
-      const serviceIds = this.platformConfig_['services'].map(service =>
-        service['serviceId'] || 'local');
+      const serviceIds = this.platformConfig_['services'].map(
+        service => service['serviceId'] || 'local'
+      );
 
       this.initializePlatformStore_(serviceIds);
 
@@ -308,11 +325,11 @@ export class SubscriptionService {
         this.initializeLocalPlatforms_(service);
       });
 
-      this.platformStore_.getAvailablePlatforms().forEach(
-          subscriptionPlatform => {
-            this.fetchEntitlements_(subscriptionPlatform);
-          }
-      );
+      this.platformStore_
+        .getAvailablePlatforms()
+        .forEach(subscriptionPlatform => {
+          this.fetchEntitlements_(subscriptionPlatform);
+        });
 
       isStoryDocument(this.ampdoc_).then(isStory => {
         // Delegates the platform selection and activation call if is story.
@@ -327,12 +344,14 @@ export class SubscriptionService {
    * @param {!Array<string>} serviceIds
    */
   initializePlatformStore_(serviceIds) {
-    const fallbackEntitlement = this.platformConfig_['fallbackEntitlement'] ?
-      Entitlement.parseFromJson(this.platformConfig_['fallbackEntitlement']) :
-      Entitlement.empty('local');
-    this.platformStore_ = new PlatformStore(serviceIds,
-        this.platformConfig_['score'],
-        fallbackEntitlement);
+    const fallbackEntitlement = this.platformConfig_['fallbackEntitlement']
+      ? Entitlement.parseFromJson(this.platformConfig_['fallbackEntitlement'])
+      : Entitlement.empty('local');
+    this.platformStore_ = new PlatformStore(
+      serviceIds,
+      this.platformConfig_['score'],
+      fallbackEntitlement
+    );
   }
 
   /**
@@ -346,20 +365,26 @@ export class SubscriptionService {
     this.platformConfig_['services'].forEach(service => {
       if ((service['serviceId'] || 'local') == 'local') {
         const viewerPlatform = new ViewerSubscriptionPlatform(
-            this.ampdoc_,
-            service,
-            this.serviceAdapter_,
-            origin);
+          this.ampdoc_,
+          service,
+          this.serviceAdapter_,
+          origin
+        );
         this.platformStore_.resolvePlatform('local', viewerPlatform);
-        viewerPlatform.getEntitlements().then(entitlement => {
-          devAssert(entitlement, 'Entitlement is null');
-          // Viewer authorization is redirected to use local platform instead.
-          this.resolveEntitlementsToStore_('local',
-              /** @type {!./entitlement.Entitlement}*/ (entitlement));
-        }).catch(reason => {
-          this.platformStore_.reportPlatformFailureAndFallback('local');
-          dev().error(TAG, 'Viewer auth failed:', reason);
-        });
+        viewerPlatform
+          .getEntitlements()
+          .then(entitlement => {
+            devAssert(entitlement, 'Entitlement is null');
+            // Viewer authorization is redirected to use local platform instead.
+            this.resolveEntitlementsToStore_(
+              'local',
+              /** @type {!./entitlement.Entitlement}*/ (entitlement)
+            );
+          })
+          .catch(reason => {
+            this.platformStore_.reportPlatformFailureAndFallback('local');
+            dev().error(TAG, 'Viewer auth failed:', reason);
+          });
       }
     });
   }
@@ -375,11 +400,9 @@ export class SubscriptionService {
       // Scope is kept "amp-access" by default to avoid unnecessary CID
       // rotation.
       const scope =
-          'amp-access' + (serviceId == 'local' ? '' : '-' + serviceId);
+        'amp-access' + (serviceId == 'local' ? '' : '-' + serviceId);
       readerId = this.cid_.then(cid => {
-        return cid.get(
-            {scope, createCookieIfNotPresent: true},
-            consent);
+        return cid.get({scope, createCookieIfNotPresent: true}, consent);
       });
       this.readerIdPromiseMap_[serviceId] = readerId;
     }
@@ -446,29 +469,35 @@ export class SubscriptionService {
       const selectedPlatform = resolvedValues[1];
       const grantEntitlement = resolvedValues[2];
       const selectedEntitlement = this.platformStore_.getResolvedEntitlementFor(
-          selectedPlatform.getServiceId());
+        selectedPlatform.getServiceId()
+      );
       const bestEntitlement = grantEntitlement || selectedEntitlement;
 
       selectedPlatform.activate(selectedEntitlement, grantEntitlement);
 
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
-          selectedPlatform.getServiceId());
+        SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+        selectedPlatform.getServiceId()
+      );
       // Deprecated events are fire for backwards compatibility
       this.subscriptionAnalytics_.serviceEvent(
-          SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED_DEPRECATED,
-          selectedPlatform.getServiceId());
+        SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED_DEPRECATED,
+        selectedPlatform.getServiceId()
+      );
       if (bestEntitlement.granted) {
         this.subscriptionAnalytics_.serviceEvent(
-            SubscriptionAnalyticsEvents.ACCESS_GRANTED,
-            bestEntitlement.service);
+          SubscriptionAnalyticsEvents.ACCESS_GRANTED,
+          bestEntitlement.service
+        );
       } else {
         this.subscriptionAnalytics_.serviceEvent(
-            SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED,
-            selectedPlatform.getServiceId());
+          SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED,
+          selectedPlatform.getServiceId()
+        );
         this.subscriptionAnalytics_.serviceEvent(
-            SubscriptionAnalyticsEvents.ACCESS_DENIED,
-            selectedPlatform.getServiceId());
+          SubscriptionAnalyticsEvents.ACCESS_DENIED,
+          selectedPlatform.getServiceId()
+        );
       }
     });
   }
@@ -480,15 +509,18 @@ export class SubscriptionService {
    */
   performPingback_() {
     if (this.viewTrackerPromise_) {
-      return this.viewTrackerPromise_.then(() => {
-        return this.platformStore_.getGrantEntitlement();
-      }).then(grantStateEntitlement => {
-        const localPlatform = this.platformStore_.getLocalPlatform();
-        if (localPlatform.isPingbackEnabled()) {
-          localPlatform.pingback(grantStateEntitlement
-              || Entitlement.empty('local'));
-        }
-      });
+      return this.viewTrackerPromise_
+        .then(() => {
+          return this.platformStore_.getGrantEntitlement();
+        })
+        .then(grantStateEntitlement => {
+          const localPlatform = this.platformStore_.getLocalPlatform();
+          if (localPlatform.isPingbackEnabled()) {
+            localPlatform.pingback(
+              grantStateEntitlement || Entitlement.empty('local')
+            );
+          }
+        });
     }
     return null;
   }
@@ -498,9 +530,11 @@ export class SubscriptionService {
    * @return {!PageConfig}
    */
   getPageConfig() {
-    const pageConfig = devAssert(this.pageConfig_,
-        'Page config is not yet fetched');
-    return /** @type {!PageConfig} */(pageConfig);
+    const pageConfig = devAssert(
+      this.pageConfig_,
+      'Page config is not yet fetched'
+    );
+    return /** @type {!PageConfig} */ (pageConfig);
   }
 
   /**
@@ -511,19 +545,19 @@ export class SubscriptionService {
     this.platformStore_ = this.platformStore_.resetPlatformStore();
     this.renderer_.toggleLoading(true);
 
-    this.platformStore_.getAvailablePlatforms().forEach(
-        subscriptionPlatform => {
-          this.fetchEntitlements_(subscriptionPlatform);
-        }
-    );
+    this.platformStore_
+      .getAvailablePlatforms()
+      .forEach(subscriptionPlatform => {
+        this.fetchEntitlements_(subscriptionPlatform);
+      });
     this.subscriptionAnalytics_.serviceEvent(
-        SubscriptionAnalyticsEvents.PLATFORM_REAUTHORIZED,
-        ''
+      SubscriptionAnalyticsEvents.PLATFORM_REAUTHORIZED,
+      ''
     );
     // deprecated event fired for backward compatibility
     this.subscriptionAnalytics_.serviceEvent(
-        SubscriptionAnalyticsEvents.PLATFORM_REAUTHORIZED_DEPRECATED,
-        ''
+      SubscriptionAnalyticsEvents.PLATFORM_REAUTHORIZED_DEPRECATED,
+      ''
     );
     this.startAuthorizationFlow_();
   }
@@ -548,11 +582,11 @@ export class SubscriptionService {
       this.platformStore_.onPlatformResolves(serviceId, platform => {
         devAssert(platform, 'Platform is not registered');
         this.subscriptionAnalytics_.event(
-            SubscriptionAnalyticsEvents.ACTION_DELEGATED,
-            dict({
-              'action': action,
-              'serviceId': serviceId,
-            })
+          SubscriptionAnalyticsEvents.ACTION_DELEGATED,
+          dict({
+            'action': action,
+            'serviceId': serviceId,
+          })
         );
         resolve(platform.executeAction(action));
       });
@@ -588,15 +622,16 @@ export class SubscriptionService {
 
   /** @override from AccessVars */
   getAuthdataField(field) {
-    return this.initialize_().then(() => {
-      return this.platformStore_.getEntitlementPromiseFor('local');
-    }).then(entitlement => {
-      return getValueForExpr(entitlement.json(), field);
-    });
+    return this.initialize_()
+      .then(() => {
+        return this.platformStore_.getEntitlementPromiseFor('local');
+      })
+      .then(entitlement => {
+        return getValueForExpr(entitlement.json(), field);
+      });
   }
 }
 
-
 /** @package @VisibleForTesting */
 export function getPlatformClassForTesting() {
   return SubscriptionPlatform;
@@ -610,7 +645,6 @@ export function getPageConfigClassForTesting() {
   return PageConfig;
 }
 
-
 // Register the extension services.
 AMP.extension(TAG, '0.1', function(AMP) {
   AMP.registerServiceForDoc('subscriptions', function(ampdoc) {
diff --git a/extensions/amp-subscriptions/0.1/analytics.js b/extensions/amp-subscriptions/0.1/analytics.js
index e044307d4803..6337b18839b7 100644
--- a/extensions/amp-subscriptions/0.1/analytics.js
+++ b/extensions/amp-subscriptions/0.1/analytics.js
@@ -44,9 +44,7 @@ export const SubscriptionAnalyticsEvents = {
   LINK_CANCELED: 'subscriptions-link-canceled',
 };
 
-
 export class SubscriptionAnalytics {
-
   /**
    * Creates an instance of SubscriptionAnalytics.
    * @param {!Element} element
@@ -61,9 +59,15 @@ export class SubscriptionAnalytics {
    * @param {!JsonObject=} opt_vars
    */
   serviceEvent(eventType, serviceId, opt_vars) {
-    this.event(eventType, /** @type {!JsonObject} */ (Object.assign(dict({
-      'serviceId': serviceId,
-    }), opt_vars)));
+    this.event(
+      eventType,
+      /** @type {!JsonObject} */ (Object.assign(
+        dict({
+          'serviceId': serviceId,
+        }),
+        opt_vars
+      ))
+    );
   }
 
   /**
@@ -83,6 +87,9 @@ export class SubscriptionAnalytics {
    */
   actionEvent(serviceId, action, status, opt_vars) {
     this.serviceEvent(
-        `subscriptions-action-${action}-${status}`, serviceId, opt_vars);
+      `subscriptions-action-${action}-${status}`,
+      serviceId,
+      opt_vars
+    );
   }
 }
diff --git a/extensions/amp-subscriptions/0.1/crypto-handler.js b/extensions/amp-subscriptions/0.1/crypto-handler.js
index a89f17013a8c..d7de26ac29c2 100644
--- a/extensions/amp-subscriptions/0.1/crypto-handler.js
+++ b/extensions/amp-subscriptions/0.1/crypto-handler.js
@@ -14,13 +14,10 @@
  * limitations under the License.
  */
 
-
 import {iterateCursor} from '../../../src/dom';
 import {tryParseJson} from '../../../src/json';
 
-
 export class CryptoHandler {
-
   /**
    * Creates an instance of CryptoHandler.
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -32,11 +29,13 @@ export class CryptoHandler {
     /** @private {?Promise} */
     this.decryptionPromise_ = null;
 
-    const parsedEncryptedKeys =
-        this.ampdoc_.getRootNode().querySelector('script[cryptokeys]');
+    const parsedEncryptedKeys = this.ampdoc_
+      .getRootNode()
+      .querySelector('script[cryptokeys]');
     /** @type {?JsonObject} */
-    this.encryptedKeys_ = (parsedEncryptedKeys &&
-      tryParseJson(parsedEncryptedKeys.textContent)) || null;
+    this.encryptedKeys_ =
+      (parsedEncryptedKeys && tryParseJson(parsedEncryptedKeys.textContent)) ||
+      null;
   }
 
   /**
@@ -70,15 +69,19 @@ export class CryptoHandler {
       return this.decryptionPromise_;
     }
     this.decryptionPromise_ = this.ampdoc_.whenReady().then(() => {
-      const encryptedSections =
-          this.ampdoc_.getRootNode().querySelectorAll('script[encrypted]');
+      const encryptedSections = this.ampdoc_
+        .getRootNode()
+        .querySelectorAll('script[encrypted]');
       const promises = [];
       iterateCursor(encryptedSections, encryptedSection => {
         promises.push(
-            this.decryptDocumentContent_(encryptedSection.textContent,
-                decryptedDocumentKey).then(decryptedContent => {
-              encryptedSection./*OK*/outerHTML = decryptedContent;
-            }));
+          this.decryptDocumentContent_(
+            encryptedSection.textContent,
+            decryptedDocumentKey
+          ).then(decryptedContent => {
+            encryptedSection./*OK*/ outerHTML = decryptedContent;
+          })
+        );
       });
       return Promise.all(promises);
     });
@@ -93,7 +96,10 @@ export class CryptoHandler {
    */
   decryptDocumentContent_(
     // eslint-disable-next-line no-unused-vars
-    encryptedContent, documentKey) {
+    encryptedContent,
+    // eslint-disable-next-line no-unused-vars
+    documentKey
+  ) {
     // Don't really return this. Placeholder for the real thing.
     // const placeholder = encryptedContent.trim() + documentKey;
     const placeholder = '<h2><i> abc </i></h2>';
diff --git a/extensions/amp-subscriptions/0.1/dialog.js b/extensions/amp-subscriptions/0.1/dialog.js
index 3589cc36010c..14852434afed 100644
--- a/extensions/amp-subscriptions/0.1/dialog.js
+++ b/extensions/amp-subscriptions/0.1/dialog.js
@@ -18,7 +18,6 @@ import {Services} from '../../../src/services';
 import {createElementWithAttributes} from '../../../src/dom';
 import {setImportantStyles, toggle} from '../../../src/style';
 
-
 export class Dialog {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
@@ -51,18 +50,22 @@ export class Dialog {
 
     /** @private @const {!Element} */
     this.wrapper_ = createElementWithAttributes(
-        doc,
-        'amp-subscriptions-dialog', /** @type {!JsonObject} */ ({
-          'role': 'dialog',
-        }));
+      doc,
+      'amp-subscriptions-dialog',
+      /** @type {!JsonObject} */ ({
+        'role': 'dialog',
+      })
+    );
     toggle(this.wrapper_, false);
 
     /** @private @const {!Element} */
     this.closeButton_ = createElementWithAttributes(
-        doc,
-        'button', /** @type {!JsonObject} */ ({
-          'class': 'i-amphtml-subs-dialog-close-button',
-        }));
+      doc,
+      'button',
+      /** @type {!JsonObject} */ ({
+        'class': 'i-amphtml-subs-dialog-close-button',
+      })
+    );
     this.showCloseAction(false);
     this.wrapper_.appendChild(this.closeButton_);
     this.closeButton_.addEventListener('click', () => {
@@ -114,7 +117,7 @@ export class Dialog {
    * @private
    */
   action_(action) {
-    return this.lastAction_ = this.lastAction_.then(action);
+    return (this.lastAction_ = this.lastAction_.then(action));
   }
 
   /**
@@ -135,31 +138,36 @@ export class Dialog {
       return Promise.resolve();
     }
     this.visible_ = true;
-    return this.vsync_.mutatePromise(() => {
-      toggle(this.wrapper_, true);
-      this.showCloseAction(/** @type {boolean} */ (showCloseAction));
-    }).then(() => {
-      // Animate to display.
-      return this.vsync_.mutatePromise(() => {
-        setImportantStyles(this.wrapper_, {
-          transform: 'translateY(0)',
+    return this.vsync_
+      .mutatePromise(() => {
+        toggle(this.wrapper_, true);
+        this.showCloseAction(/** @type {boolean} */ (showCloseAction));
+      })
+      .then(() => {
+        // Animate to display.
+        return this.vsync_
+          .mutatePromise(() => {
+            setImportantStyles(this.wrapper_, {
+              transform: 'translateY(0)',
+            });
+          })
+          .then(() => this.timer_.promise(300));
+      })
+      .then(() => {
+        // Update page layout.
+        let offsetHeight;
+        return this.vsync_.runPromise({
+          measure: () => {
+            offsetHeight = this.wrapper_./*OK*/ offsetHeight;
+          },
+          mutate: () => {
+            this.viewport_.updatePaddingBottom(offsetHeight);
+            // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
+            // conflict is resolved.
+            // this.viewport_.addToFixedLayer(this.wrapper_, true);
+          },
         });
-      }).then(() => this.timer_.promise(300));
-    }).then(() => {
-      // Update page layout.
-      let offsetHeight;
-      return this.vsync_.runPromise({
-        measure: () => {
-          offsetHeight = this.wrapper_./*OK*/offsetHeight;
-        },
-        mutate: () => {
-          this.viewport_.updatePaddingBottom(offsetHeight);
-          // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
-          // conflict is resolved.
-          // this.viewport_.addToFixedLayer(this.wrapper_, true);
-        },
       });
-    });
   }
 
   /**
@@ -171,19 +179,22 @@ export class Dialog {
     if (!this.visible_) {
       return Promise.resolve();
     }
-    return this.vsync_.mutatePromise(() => {
-      setImportantStyles(this.wrapper_, {
-        transform: 'translateY(100%)',
-      });
-    }).then(() => {
-      return this.timer_.promise(300);
-    }).then(() => {
-      return this.vsync_.mutatePromise(() => {
-        toggle(this.wrapper_, false);
-        this.viewport_.updatePaddingBottom(0);
-        this.visible_ = false;
+    return this.vsync_
+      .mutatePromise(() => {
+        setImportantStyles(this.wrapper_, {
+          transform: 'translateY(100%)',
+        });
+      })
+      .then(() => {
+        return this.timer_.promise(300);
+      })
+      .then(() => {
+        return this.vsync_.mutatePromise(() => {
+          toggle(this.wrapper_, false);
+          this.viewport_.updatePaddingBottom(0);
+          this.visible_ = false;
+        });
       });
-    });
   }
 
   /**
diff --git a/extensions/amp-subscriptions/0.1/doc-impl.js b/extensions/amp-subscriptions/0.1/doc-impl.js
index 9e71edee0d5e..1ea4bc1ce565 100644
--- a/extensions/amp-subscriptions/0.1/doc-impl.js
+++ b/extensions/amp-subscriptions/0.1/doc-impl.js
@@ -17,13 +17,11 @@
 import {Doc} from '../../../third_party/subscriptions-project/config';
 import {dev} from '../../../src/log';
 
-
 /**
  * Adopts config document to ampdoc.
  * @implements {Doc}
  */
 export class DocImpl {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -69,7 +67,6 @@ export class DocImpl {
   }
 }
 
-
 /** @package Visible for testing only. */
 export function getDocClassForTesting() {
   return Doc;
diff --git a/extensions/amp-subscriptions/0.1/entitlement.js b/extensions/amp-subscriptions/0.1/entitlement.js
index 6031e449e91e..80822185f862 100644
--- a/extensions/amp-subscriptions/0.1/entitlement.js
+++ b/extensions/amp-subscriptions/0.1/entitlement.js
@@ -25,7 +25,6 @@ export const GrantReason = {
  * The single entitlement object.
  */
 export class Entitlement {
-
   /**
    * @param {string} service
    * @return {!Entitlement}
@@ -49,8 +48,15 @@ export class Entitlement {
    * @param {?JsonObject} [input.dataObject]
    * @param {?string} [input.decryptedDocumentKey]
    */
-  constructor({source, raw = '', service, granted = false,
-    grantReason = '', dataObject, decryptedDocumentKey}) {
+  constructor({
+    source,
+    raw = '',
+    service,
+    granted = false,
+    grantReason = '',
+    dataObject,
+    decryptedDocumentKey,
+  }) {
     /** @const {string} */
     this.raw = raw;
     /** @const {string} */
@@ -79,7 +85,7 @@ export class Entitlement {
       'grantReason': this.grantReason,
       'data': this.data,
     });
-    return (entitlementJson);
+    return entitlementJson;
   }
 
   /**
@@ -88,9 +94,11 @@ export class Entitlement {
    * @return {!JsonObject}
    */
   jsonForPingback() {
-    return /** @type {!JsonObject} */ (Object.assign({},
-        {'raw': this.raw},
-        this.json()));
+    return /** @type {!JsonObject} */ (Object.assign(
+      {},
+      {'raw': this.raw},
+      this.json()
+    ));
   }
 
   /**
@@ -108,8 +116,15 @@ export class Entitlement {
     const grantReason = json['grantReason'];
     const dataObject = json['data'] || null;
     const decryptedDocumentKey = json['decryptedDocumentKey'] || null;
-    return new Entitlement({source, raw, service: '',
-      granted, grantReason, dataObject, decryptedDocumentKey});
+    return new Entitlement({
+      source,
+      raw,
+      service: '',
+      granted,
+      grantReason,
+      dataObject,
+      decryptedDocumentKey,
+    });
   }
 
   /**
diff --git a/extensions/amp-subscriptions/0.1/expr.js b/extensions/amp-subscriptions/0.1/expr.js
index 673239a4ef99..7766d967c662 100644
--- a/extensions/amp-subscriptions/0.1/expr.js
+++ b/extensions/amp-subscriptions/0.1/expr.js
@@ -16,7 +16,6 @@
 
 import {evaluateAccessExpr} from '../../amp-access/0.1/access-expr';
 
-
 /**
  * @param {string} expr
  * @param {!JsonObject} data
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
index ac61c96d5419..0c4581078540 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-base.js
@@ -15,21 +15,17 @@
  */
 
 import {Actions} from './actions';
-import {
-  LocalSubscriptionPlatformRenderer,
-} from './local-subscription-platform-renderer';
+import {LocalSubscriptionPlatformRenderer} from './local-subscription-platform-renderer';
 import {UrlBuilder} from './url-builder';
 import {closestAncestorElementBySelector} from '../../../src/dom';
 import {dev, userAssert} from '../../../src/log';
 
-
 /**
  * This implements the methods to interact with various subscription platforms.
  *
  * @implements {./subscription-platform.SubscriptionPlatform}
  */
 export class LocalSubscriptionBasePlatform {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} platformConfig
@@ -50,25 +46,32 @@ export class LocalSubscriptionBasePlatform {
 
     /** @protected @const {!UrlBuilder} */
     this.urlBuilder_ = new UrlBuilder(
-        this.ampdoc_,
-        this.serviceAdapter_.getReaderId('local'));
+      this.ampdoc_,
+      this.serviceAdapter_.getReaderId('local')
+    );
 
     /** @protected @const {!./analytics.SubscriptionAnalytics} */
     this.subscriptionAnalytics_ = serviceAdapter.getAnalytics();
 
-    userAssert(this.serviceConfig_['actions'],
-        'Actions have not been defined in the service config');
+    userAssert(
+      this.serviceConfig_['actions'],
+      'Actions have not been defined in the service config'
+    );
 
     /** @private @const {!Actions} */
     this.actions_ = new Actions(
-        this.ampdoc_, this.urlBuilder_,
-        this.subscriptionAnalytics_,
-        this.validateActionMap(this.serviceConfig_['actions'])
+      this.ampdoc_,
+      this.urlBuilder_,
+      this.subscriptionAnalytics_,
+      this.validateActionMap(this.serviceConfig_['actions'])
     );
 
     /** @private @const {!LocalSubscriptionPlatformRenderer}*/
-    this.renderer_ = new LocalSubscriptionPlatformRenderer(this.ampdoc_,
-        serviceAdapter.getDialog(), this.serviceAdapter_);
+    this.renderer_ = new LocalSubscriptionPlatformRenderer(
+      this.ampdoc_,
+      serviceAdapter.getDialog(),
+      this.serviceAdapter_
+    );
   }
 
   /**
@@ -84,10 +87,14 @@ export class LocalSubscriptionBasePlatform {
    * @return {!JsonObject<string, string>}
    */
   validateActionMap(actionMap) {
-    userAssert(actionMap['login'],
-        'Action "login" is not present in action map');
-    userAssert(actionMap['subscribe'],
-        'Action "subscribe" is not present in action map');
+    userAssert(
+      actionMap['login'],
+      'Action "login" is not present in action map'
+    );
+    userAssert(
+      actionMap['subscribe'],
+      'Action "subscribe" is not present in action map'
+    );
     return actionMap;
   }
 
@@ -97,9 +104,10 @@ export class LocalSubscriptionBasePlatform {
    */
   initializeListeners_() {
     this.rootNode_.addEventListener('click', e => {
-      const element =
-        closestAncestorElementBySelector(dev().assertElement(e.target),
-            '[subscriptions-action]');
+      const element = closestAncestorElementBySelector(
+        dev().assertElement(e.target),
+        '[subscriptions-action]'
+      );
       this.handleClick_(element);
     });
   }
@@ -121,7 +129,9 @@ export class LocalSubscriptionBasePlatform {
           // enhance this action, e.g. to provide save/link feature.
           const platform = this.serviceAdapter_.selectPlatformForLogin();
           this.serviceAdapter_.delegateActionToService(
-              action, platform.getServiceId());
+            action,
+            platform.getServiceId()
+          );
         } else {
           this.executeAction(action);
         }
@@ -175,7 +185,7 @@ export class LocalSubscriptionBasePlatform {
   /**
    * @abstract @override
    * @return {!Promise<?./entitlement.Entitlement>}
-  */
+   */
   getEntitlements() {}
 
   /**
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
index dd1a031176d5..e439f039db84 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-iframe.js
@@ -16,8 +16,7 @@
 
 import {Deferred} from '../../../src/utils/promise';
 import {Entitlement} from './entitlement';
-import {LocalSubscriptionBasePlatform}
-  from './local-subscription-platform-base';
+import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base';
 import {Messenger} from '../../amp-access/0.1/iframe-api/messenger';
 import {assertHttpsUrl, parseUrlDeprecated} from '../../../src/url';
 import {devAssert, userAssert} from '../../../src/log';
@@ -25,16 +24,13 @@ import {isArray} from '../../../src/types';
 import {parseJson} from '../../../src/json';
 import {toggle} from '../../../src/style';
 
-
 /**
  * Implments the iframe local subscriptions platform which provides
  * authorization and pingback via an iframe
  *
  * @implements {./subscription-platform.SubscriptionPlatform}
  */
-export class LocalSubscriptionIframePlatform
-  extends LocalSubscriptionBasePlatform {
-
+export class LocalSubscriptionIframePlatform extends LocalSubscriptionBasePlatform {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} platformConfig
@@ -43,20 +39,22 @@ export class LocalSubscriptionIframePlatform
   constructor(ampdoc, platformConfig, serviceAdapter) {
     super(ampdoc, platformConfig, serviceAdapter);
 
-    devAssert(this.serviceConfig_['type'] == 'iframe',
-        'iframe initialized called without iframe config type');
+    devAssert(
+      this.serviceConfig_['type'] == 'iframe',
+      'iframe initialized called without iframe config type'
+    );
 
     /** @const @private {string} */
-    this.iframeSrc_ = userAssert(this.serviceConfig_['iframeSrc'],
-        '"iframeSrc" URL must be specified');
+    this.iframeSrc_ = userAssert(
+      this.serviceConfig_['iframeSrc'],
+      '"iframeSrc" URL must be specified'
+    );
     assertHttpsUrl(this.iframeSrc_, 'iframe Url');
 
-
     /** @const @private {?Array} */
     this.iframeVars_ = this.serviceConfig_['iframeVars'] || null;
     if (this.iframeVars_) {
-      userAssert(isArray(this.iframeVars_),
-          '"iframeVars" must be an array');
+      userAssert(isArray(this.iframeVars_), '"iframeVars" must be an array');
     }
 
     /** @private @const {string} */
@@ -75,9 +73,10 @@ export class LocalSubscriptionIframePlatform
 
     /** @private @const {!Messenger} */
     this.messenger_ = new Messenger(
-        this.ampdoc_.win,
-        () => this.iframe_.contentWindow,
-        this.targetOrigin_);
+      this.ampdoc_.win,
+      () => this.iframe_.contentWindow,
+      this.targetOrigin_
+    );
 
     /** @private {?Promise<!JsonObject>} */
     this.configPromise_ = null;
@@ -88,12 +87,13 @@ export class LocalSubscriptionIframePlatform
   /** @override */
   getEntitlements() {
     return this.connect().then(() => {
-      return this.messenger_.sendCommandRsvp('authorize', {})
-          .then(res => {
-            res.source = 'local-iframe';
-            return res;
-          })
-          .then(resJson => Entitlement.parseFromJson(resJson));
+      return this.messenger_
+        .sendCommandRsvp('authorize', {})
+        .then(res => {
+          res.source = 'local-iframe';
+          return res;
+        })
+        .then(resJson => Entitlement.parseFromJson(resJson));
     });
   }
 
@@ -105,8 +105,9 @@ export class LocalSubscriptionIframePlatform
   /** @override */
   pingback(selectedEntitlement) {
     return this.connect().then(() => {
-      return this.messenger_.sendCommandRsvp(
-          'pingback', {entitlement: selectedEntitlement});
+      return this.messenger_.sendCommandRsvp('pingback', {
+        entitlement: selectedEntitlement,
+      });
     });
   }
 
@@ -142,17 +143,16 @@ export class LocalSubscriptionIframePlatform
         publicationId: pageConfig.getPublicationId(),
         productId: pageConfig.getProductId(),
         encryptedDocumentKey:
-            this.serviceAdapter_.getEncryptedDocumentKey('local') || null,
+          this.serviceAdapter_.getEncryptedDocumentKey('local') || null,
       };
       if (this.iframeVars_) {
         const varsString = this.iframeVars_.join('&');
-        this.urlBuilder_.collectUrlVars(
-            varsString,
-            /* useAuthData */ false)
-            .then(vars => {
-              configJson['iframeVars'] = vars;
-              resolve(configJson);
-            });
+        this.urlBuilder_
+          .collectUrlVars(varsString, /* useAuthData */ false)
+          .then(vars => {
+            configJson['iframeVars'] = vars;
+            resolve(configJson);
+          });
       } else {
         resolve(configJson);
       }
@@ -169,16 +169,18 @@ export class LocalSubscriptionIframePlatform
     if (cmd == 'connect') {
       // First ever message. Indicates that the receiver is listening.
       this.configPromise_.then(configJson => {
-        this.messenger_.sendCommandRsvp('start', {
-          'protocol': 'amp-subscriptions',
-          'config': configJson,
-        }).then(() => {
-          // Confirmation that connection has been successful.
-          if (this.connectedResolver_) {
-            this.connectedResolver_();
-            this.connectedResolver_ = null;
-          }
-        });
+        this.messenger_
+          .sendCommandRsvp('start', {
+            'protocol': 'amp-subscriptions',
+            'config': configJson,
+          })
+          .then(() => {
+            // Confirmation that connection has been successful.
+            if (this.connectedResolver_) {
+              this.connectedResolver_();
+              this.connectedResolver_ = null;
+            }
+          });
       });
       return;
     }
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
index e9d804769c08..ec0173e44a7d 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-remote.js
@@ -15,8 +15,7 @@
  */
 
 import {Entitlement} from './entitlement';
-import {LocalSubscriptionBasePlatform}
-  from './local-subscription-platform-base';
+import {LocalSubscriptionBasePlatform} from './local-subscription-platform-base';
 import {Services} from '../../../src/services';
 import {addParamToUrl, assertHttpsUrl} from '../../../src/url';
 import {devAssert, userAssert} from '../../../src/log';
@@ -28,9 +27,7 @@ import {dict} from '../../../src/utils/object';
  *
  * @implements {./subscription-platform.SubscriptionPlatform}
  */
-export class LocalSubscriptionRemotePlatform
-  extends LocalSubscriptionBasePlatform {
-
+export class LocalSubscriptionRemotePlatform extends LocalSubscriptionBasePlatform {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} platformConfig
@@ -41,11 +38,11 @@ export class LocalSubscriptionRemotePlatform
 
     /** @private @const {string} */
     this.authorizationUrl_ = assertHttpsUrl(
-        userAssert(
-            this.serviceConfig_['authorizationUrl'],
-            'Service config does not have authorization Url'
-        ),
-        'Authorization Url'
+      userAssert(
+        this.serviceConfig_['authorizationUrl'],
+        'Service config does not have authorization Url'
+      ),
+      'Authorization Url'
     );
 
     /** @const @private {!../../../src/service/xhr-impl.Xhr} */
@@ -59,21 +56,23 @@ export class LocalSubscriptionRemotePlatform
 
   /** @override */
   getEntitlements() {
-    return this.urlBuilder_.buildUrl(this.authorizationUrl_,
-        /* useAuthData */ false)
-        .then(fetchUrl => {
-          const encryptedDocumentKey =
-              this.serviceAdapter_.getEncryptedDocumentKey('local');
-          if (encryptedDocumentKey) {
-            //TODO(chenshay): if crypt, switch to 'post'
-            fetchUrl = addParamToUrl(fetchUrl, 'crypt', encryptedDocumentKey);
-          }
-          return this.xhr_.fetchJson(fetchUrl, {credentials: 'include'})
-              .then(res => res.json())
-              .then(resJson => {
-                return Entitlement.parseFromJson(resJson);
-              });
-        });
+    return this.urlBuilder_
+      .buildUrl(this.authorizationUrl_, /* useAuthData */ false)
+      .then(fetchUrl => {
+        const encryptedDocumentKey = this.serviceAdapter_.getEncryptedDocumentKey(
+          'local'
+        );
+        if (encryptedDocumentKey) {
+          //TODO(chenshay): if crypt, switch to 'post'
+          fetchUrl = addParamToUrl(fetchUrl, 'crypt', encryptedDocumentKey);
+        }
+        return this.xhr_
+          .fetchJson(fetchUrl, {credentials: 'include'})
+          .then(res => res.json())
+          .then(resJson => {
+            return Entitlement.parseFromJson(resJson);
+          });
+      });
   }
 
   /** @override */
@@ -86,11 +85,15 @@ export class LocalSubscriptionRemotePlatform
     if (!this.isPingbackEnabled) {
       return;
     }
-    const pingbackUrl = /** @type {string} */ (devAssert(this.pingbackUrl_,
-        'pingbackUrl is null'));
+    const pingbackUrl = /** @type {string} */ (devAssert(
+      this.pingbackUrl_,
+      'pingbackUrl is null'
+    ));
 
-    const promise = this.urlBuilder_.buildUrl(pingbackUrl,
-        /* useAuthData */ true);
+    const promise = this.urlBuilder_.buildUrl(
+      pingbackUrl,
+      /* useAuthData */ true
+    );
     return promise.then(url => {
       // Content should be 'text/plain' to avoid CORS preflight.
       return this.xhr_.sendSignal(url, {
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js b/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
index b2dbd28e0f85..b1066eb4fa78 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform-renderer.js
@@ -24,7 +24,6 @@ import {evaluateExpr} from './expr';
  *
  */
 export class LocalSubscriptionPlatformRenderer {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!./dialog.Dialog} dialog
@@ -54,7 +53,7 @@ export class LocalSubscriptionPlatformRenderer {
   render(renderState) {
     return Promise.all([
       this.renderActions_(renderState),
-      this.renderDialog_(/** @type {!JsonObject} */(renderState)),
+      this.renderDialog_(/** @type {!JsonObject} */ (renderState)),
     ]);
   }
 
@@ -82,42 +81,48 @@ export class LocalSubscriptionPlatformRenderer {
    */
   renderDialog_(authResponse) {
     // Make sure the document is fully parsed.
-    return this.ampdoc_.whenReady().then(() => {
-      // Find the first matching dialog.
-      const candidates = this.ampdoc_.getRootNode()
+    return this.ampdoc_
+      .whenReady()
+      .then(() => {
+        // Find the first matching dialog.
+        const candidates = this.ampdoc_
+          .getRootNode()
           .querySelectorAll('[subscriptions-dialog][subscriptions-display]');
-      for (let i = 0; i < candidates.length; i++) {
-        const candidate = candidates[i];
-        const expr = candidate.getAttribute('subscriptions-display');
-        if (expr && evaluateExpr(expr, authResponse)) {
-          return candidate;
+        for (let i = 0; i < candidates.length; i++) {
+          const candidate = candidates[i];
+          const expr = candidate.getAttribute('subscriptions-display');
+          if (expr && evaluateExpr(expr, authResponse)) {
+            return candidate;
+          }
         }
-      }
-    }).then(candidate => {
-      if (!candidate) {
-        return;
-      }
-      if (candidate.tagName == 'TEMPLATE') {
-        return this.templates_.renderTemplate(candidate, authResponse)
+      })
+      .then(candidate => {
+        if (!candidate) {
+          return;
+        }
+        if (candidate.tagName == 'TEMPLATE') {
+          return this.templates_
+            .renderTemplate(candidate, authResponse)
             .then(element => {
-              const renderState =
-                /** @type {!JsonObject} */(authResponse);
+              const renderState = /** @type {!JsonObject} */ (authResponse);
               return this.renderActionsInNode_(
-                  renderState,
-                  element,
-                  evaluateExpr);
+                renderState,
+                element,
+                evaluateExpr
+              );
             });
-      }
-      const clone = candidate.cloneNode(true);
-      clone.removeAttribute('subscriptions-dialog');
-      clone.removeAttribute('subscriptions-display');
-      return clone;
-    }).then(element => {
-      if (!element) {
-        return;
-      }
-      return this.dialog_.open(element, /* showCloseButton */ true);
-    });
+        }
+        const clone = candidate.cloneNode(true);
+        clone.removeAttribute('subscriptions-dialog');
+        clone.removeAttribute('subscriptions-display');
+        return clone;
+      })
+      .then(element => {
+        if (!element) {
+          return;
+        }
+        return this.dialog_.open(element, /* showCloseButton */ true);
+      });
   }
 
   /**
@@ -133,24 +138,28 @@ export class LocalSubscriptionPlatformRenderer {
       // Find the matching actions and sections and make them visible if
       // evalutes to true.
       const querySelectors =
-          '[subscriptions-action], [subscriptions-section="actions"],'
-              + ' [subscriptions-actions]';
+        '[subscriptions-action], [subscriptions-section="actions"],' +
+        ' [subscriptions-actions]';
       const actionCandidates = rootNode.querySelectorAll(querySelectors);
       for (let i = 0; i < actionCandidates.length; i++) {
         const candidate = actionCandidates[i];
         const expr = candidate.getAttribute('subscriptions-display');
-        if (expr && evaluateExpr(expr,
-            /** @type {!JsonObject} */(renderState))) {
+        if (
+          expr &&
+          evaluateExpr(expr, /** @type {!JsonObject} */ (renderState))
+        ) {
           candidate.classList.add('i-amphtml-subs-display');
-          if (candidate.getAttribute('subscriptions-service')
-            && candidate.getAttribute('subscriptions-action')
-            && candidate.getAttribute('subscriptions-decorate') !== 'false'
-            && !candidate.hasAttribute('i-amphtml-subs-decorated')) {
+          if (
+            candidate.getAttribute('subscriptions-service') &&
+            candidate.getAttribute('subscriptions-action') &&
+            candidate.getAttribute('subscriptions-decorate') !== 'false' &&
+            !candidate.hasAttribute('i-amphtml-subs-decorated')
+          ) {
             this.serviceAdapter_.decorateServiceAction(
-                candidate,
-                candidate.getAttribute('subscriptions-service'),
-                candidate.getAttribute('subscriptions-action'),
-                null
+              candidate,
+              candidate.getAttribute('subscriptions-service'),
+              candidate.getAttribute('subscriptions-action'),
+              null
             );
             candidate.setAttribute('i-amphtml-subs-decorated', true);
           }
diff --git a/extensions/amp-subscriptions/0.1/local-subscription-platform.js b/extensions/amp-subscriptions/0.1/local-subscription-platform.js
index 32d3a82d1997..98d9a0e58fcf 100644
--- a/extensions/amp-subscriptions/0.1/local-subscription-platform.js
+++ b/extensions/amp-subscriptions/0.1/local-subscription-platform.js
@@ -14,12 +14,8 @@
  * limitations under the License.
  */
 
-import {
-  LocalSubscriptionIframePlatform,
-} from './local-subscription-platform-iframe';
-import {
-  LocalSubscriptionRemotePlatform,
-} from './local-subscription-platform-remote';
+import {LocalSubscriptionIframePlatform} from './local-subscription-platform-iframe';
+import {LocalSubscriptionRemotePlatform} from './local-subscription-platform-remote';
 import {PageConfig} from '../../../third_party/subscriptions-project/config';
 
 /**
@@ -30,14 +26,23 @@ import {PageConfig} from '../../../third_party/subscriptions-project/config';
  * @return {!./subscription-platform.SubscriptionPlatform}
  */
 export function localSubscriptionPlatformFactory(
-  ampdoc, platformConfig, serviceAdapter) {
+  ampdoc,
+  platformConfig,
+  serviceAdapter
+) {
   /* Return the correxct platform based on the config */
   if (platformConfig['type'] === 'iframe') {
     return new LocalSubscriptionIframePlatform(
-        ampdoc, platformConfig, serviceAdapter);
+      ampdoc,
+      platformConfig,
+      serviceAdapter
+    );
   }
   return new LocalSubscriptionRemotePlatform(
-      ampdoc, platformConfig, serviceAdapter);
+    ampdoc,
+    platformConfig,
+    serviceAdapter
+  );
 }
 
 /**
diff --git a/extensions/amp-subscriptions/0.1/platform-store.js b/extensions/amp-subscriptions/0.1/platform-store.js
index b94d5959efe9..5d0e4d9359e5 100644
--- a/extensions/amp-subscriptions/0.1/platform-store.js
+++ b/extensions/amp-subscriptions/0.1/platform-store.js
@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-import {DEFAULT_SCORE_CONFIG, SubscriptionsScoreFactor}
-  from './score-factors.js';
+import {
+  DEFAULT_SCORE_CONFIG,
+  SubscriptionsScoreFactor,
+} from './score-factors.js';
 import {Deferred} from '../../../src/utils/promise';
 import {Entitlement} from './entitlement';
 import {Observable} from '../../../src/observable';
 import {devAssert, user} from '../../../src/log';
 import {dict, hasOwn} from '../../../src/utils/object';
 
-
 /** @typedef {{serviceId: string, entitlement: (!./entitlement.Entitlement|undefined)}} */
 export let EntitlementChangeEventDef;
 
@@ -37,7 +38,6 @@ const TAG = 'amp-subscriptions';
  */
 let PlatformWeightDef;
 
-
 export class PlatformStore {
   /**
    * @param {!Array<string>} expectedServiceIds
@@ -45,9 +45,12 @@ export class PlatformStore {
    * @param {!./entitlement.Entitlement} fallbackEntitlement
    * @param {Object<string, !./subscription-platform.SubscriptionPlatform>=} opt_Platforms
    */
-  constructor(expectedServiceIds, scoreConfig,
-    fallbackEntitlement, opt_Platforms) {
-
+  constructor(
+    expectedServiceIds,
+    scoreConfig,
+    fallbackEntitlement,
+    opt_Platforms
+  ) {
     /** @private @const {!Object<string, !./subscription-platform.SubscriptionPlatform>} */
     this.subscriptionPlatforms_ = opt_Platforms || dict();
 
@@ -118,10 +121,10 @@ export class PlatformStore {
     }
     // Then create new platform store withe the newply reset platforms in it.
     return new PlatformStore(
-        this.serviceIds_,
-        this.scoreConfig_,
-        this.fallbackEntitlement_,
-        this.subscriptionPlatforms_
+      this.serviceIds_,
+      this.scoreConfig_,
+      this.fallbackEntitlement_,
+      this.subscriptionPlatforms_
     );
   }
 
@@ -160,8 +163,8 @@ export class PlatformStore {
    */
   getLocalPlatform() {
     const localPlatform =
-        /** @type{!./subscription-platform.SubscriptionPlatform} */
-        (this.getPlatform('local'));
+      /** @type {!./subscription-platform.SubscriptionPlatform} */
+      (this.getPlatform('local'));
     return localPlatform;
   }
 
@@ -173,8 +176,7 @@ export class PlatformStore {
   getAvailablePlatforms() {
     const platforms = [];
     for (const platformKey in this.subscriptionPlatforms_) {
-      const subscriptionPlatform =
-        this.subscriptionPlatforms_[platformKey];
+      const subscriptionPlatform = this.subscriptionPlatforms_[platformKey];
       platforms.push(subscriptionPlatform);
     }
     return platforms;
@@ -220,8 +222,10 @@ export class PlatformStore {
    * @return {!./entitlement.Entitlement} entitlement
    */
   getResolvedEntitlementFor(serviceId) {
-    devAssert(this.entitlements_[serviceId],
-        `Platform ${serviceId} has not yet resolved with entitlements`);
+    devAssert(
+      this.entitlements_[serviceId],
+      `Platform ${serviceId} has not yet resolved with entitlements`
+    );
     return this.entitlements_[serviceId];
   }
 
@@ -231,8 +235,10 @@ export class PlatformStore {
    * @return {!Promise<!./entitlement.Entitlement>} entitlement
    */
   getEntitlementPromiseFor(serviceId) {
-    devAssert(this.entitlementDeferredMap_[serviceId],
-        `Platform ${serviceId} is not declared`);
+    devAssert(
+      this.entitlementDeferredMap_[serviceId],
+      `Platform ${serviceId} is not declared`
+    );
     return this.entitlementDeferredMap_[serviceId].promise;
   }
 
@@ -248,7 +254,7 @@ export class PlatformStore {
 
     // Check if current entitlements unblock the reader
     for (const key in this.entitlements_) {
-      const entitlement = (this.entitlements_[key]);
+      const entitlement = this.entitlements_[key];
       if (entitlement.granted) {
         this.saveGrantEntitlement_(entitlement);
         this.grantStatusPromise_.resolve(true);
@@ -280,10 +286,12 @@ export class PlatformStore {
   saveGrantEntitlement_(entitlement) {
     // The entitlement will be stored if either it is the first one to grant
     // or the new one has full subscription but the last one didn't.
-    if ((!this.grantStatusEntitlement_ && entitlement.granted)
-        || (this.grantStatusEntitlement_
-          && !this.grantStatusEntitlement_.isSubscriber()
-          && entitlement.isSubscriber())) {
+    if (
+      (!this.grantStatusEntitlement_ && entitlement.granted) ||
+      (this.grantStatusEntitlement_ &&
+        !this.grantStatusEntitlement_.isSubscriber() &&
+        entitlement.isSubscriber())
+    ) {
       this.grantStatusEntitlement_ = entitlement;
     }
   }
@@ -294,21 +302,26 @@ export class PlatformStore {
    */
   getGrantEntitlement() {
     if (this.grantStatusEntitlementPromise_) {
-      return (this.grantStatusEntitlementPromise_.promise);
+      return this.grantStatusEntitlementPromise_.promise;
     }
     this.grantStatusEntitlementPromise_ = new Deferred();
-    if ((this.grantStatusEntitlement_
-        && this.grantStatusEntitlement_.isSubscriber())
-          || this.areAllPlatformsResolved_()) {
+    if (
+      (this.grantStatusEntitlement_ &&
+        this.grantStatusEntitlement_.isSubscriber()) ||
+      this.areAllPlatformsResolved_()
+    ) {
       this.grantStatusEntitlementPromise_.resolve(this.grantStatusEntitlement_);
     } else {
       this.onEntitlementResolvedCallbacks_.add(() => {
         // Grant entitlement only if subscriber
-        if ((this.grantStatusEntitlement_
-             && this.grantStatusEntitlement_.isSubscriber())
-            || this.areAllPlatformsResolved_()) {
+        if (
+          (this.grantStatusEntitlement_ &&
+            this.grantStatusEntitlement_.isSubscriber()) ||
+          this.areAllPlatformsResolved_()
+        ) {
           this.grantStatusEntitlementPromise_.resolve(
-              this.grantStatusEntitlement_);
+            this.grantStatusEntitlement_
+          );
         }
       });
     }
@@ -335,13 +348,15 @@ export class PlatformStore {
     if (this.areAllPlatformsResolved_()) {
       // Resolve with null if none of the entitlements unblock the reader
       this.allResolvedPromise_.resolve(
-          this.getAvailablePlatformsEntitlements_());
+        this.getAvailablePlatformsEntitlements_()
+      );
     } else {
       // Listen if any upcoming entitlements unblock the reader
       this.onChange(() => {
         if (this.areAllPlatformsResolved_()) {
           this.allResolvedPromise_.resolve(
-              this.getAvailablePlatformsEntitlements_());
+            this.getAvailablePlatformsEntitlements_()
+          );
         }
       });
     }
@@ -368,7 +383,6 @@ export class PlatformStore {
    * @return {!Promise<!./subscription-platform.SubscriptionPlatform>}
    */
   selectPlatform() {
-
     return this.getAllPlatformsEntitlements_().then(() => {
       // TODO(@prateekbh): explain why sometimes a quick resolve is possible vs
       // waiting for all entitlement.
@@ -398,8 +412,9 @@ export class PlatformStore {
     if (typeof factorValue !== 'number') {
       return 0;
     }
-    return this.scoreConfig_[factorName] *
-      Math.min(1, Math.max(-1, factorValue));
+    return (
+      this.scoreConfig_[factorName] * Math.min(1, Math.max(-1, factorValue))
+    );
   }
 
   /**
@@ -415,15 +430,18 @@ export class PlatformStore {
    * @private
    */
   selectApplicablePlatform_() {
-    devAssert(this.areAllPlatformsResolved_(),
-        'All platforms are not resolved yet');
+    devAssert(
+      this.areAllPlatformsResolved_(),
+      'All platforms are not resolved yet'
+    );
 
     // Subscriber wins immediately.
     const availablePlatforms = this.getAvailablePlatforms();
     while (availablePlatforms.length) {
       const platform = availablePlatforms.pop();
-      const entitlement =
-          this.getResolvedEntitlementFor(platform.getServiceId());
+      const entitlement = this.getResolvedEntitlementFor(
+        platform.getServiceId()
+      );
       if (entitlement.isSubscriber()) {
         return platform;
       }
@@ -466,7 +484,12 @@ export class PlatformStore {
       }
     }
 
-    return weight + factorWeights.reduce((a, b) => { return a + b; });
+    return (
+      weight +
+      factorWeights.reduce((a, b) => {
+        return a + b;
+      })
+    );
   }
 
   /**
@@ -478,8 +501,10 @@ export class PlatformStore {
     const localPlatform = this.getLocalPlatform();
     platformWeights.sort((platform1, platform2) => {
       // Force local platform to win ties
-      if (platform2.weight == platform1.weight &&
-        platform1.platform == localPlatform) {
+      if (
+        platform2.weight == platform1.weight &&
+        platform1.platform == localPlatform
+      ) {
         return -1;
       }
       return platform2.weight - platform1.weight;
@@ -514,12 +539,19 @@ export class PlatformStore {
    * @param {string} serviceId
    */
   reportPlatformFailureAndFallback(serviceId) {
-    if (serviceId === this.getLocalPlatform().getServiceId()
-      && this.fallbackEntitlement_) {
-      this.resolveEntitlement(this.getLocalPlatform().getServiceId(),
-          this.fallbackEntitlement_);
-      user().warn(TAG, 'Local platform has failed to resolve,  '
-        + 'using fallback entitlement.');
+    if (
+      serviceId === this.getLocalPlatform().getServiceId() &&
+      this.fallbackEntitlement_
+    ) {
+      this.resolveEntitlement(
+        this.getLocalPlatform().getServiceId(),
+        this.fallbackEntitlement_
+      );
+      user().warn(
+        TAG,
+        'Local platform has failed to resolve,  ' +
+          'using fallback entitlement.'
+      );
     } else if (this.failedPlatforms_.indexOf(serviceId) == -1) {
       const entitlement = Entitlement.empty(serviceId);
       this.resolveEntitlement(serviceId, entitlement);
@@ -533,6 +565,7 @@ export class PlatformStore {
    */
   selectPlatformForLogin() {
     return this.selectApplicablePlatformForFactor_(
-        SubscriptionsScoreFactor.SUPPORTS_VIEWER);
+      SubscriptionsScoreFactor.SUPPORTS_VIEWER
+    );
   }
 }
diff --git a/extensions/amp-subscriptions/0.1/renderer.js b/extensions/amp-subscriptions/0.1/renderer.js
index 94ed4182f60c..a592b14ab917 100644
--- a/extensions/amp-subscriptions/0.1/renderer.js
+++ b/extensions/amp-subscriptions/0.1/renderer.js
@@ -15,17 +15,12 @@
  */
 
 import {Services} from '../../../src/services';
-import {
-  childElementByTag,
-  createElementWithAttributes,
-} from '../../../src/dom';
+import {childElementByTag, createElementWithAttributes} from '../../../src/dom';
 import {dict} from '../../../src/utils/object';
 
 const CSS_PREFIX = 'i-amphtml-subs';
 
-
 export class Renderer {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -58,16 +53,19 @@ export class Renderer {
    * @private
    */
   setState_(type, state) {
-    this.resources_.mutateElement(this.ampdoc_.getBody() , () => {
+    this.resources_.mutateElement(this.ampdoc_.getBody(), () => {
       this.getBodyElement_().classList.toggle(
-          `${CSS_PREFIX}-${type}-unk`,
-          state === null);
+        `${CSS_PREFIX}-${type}-unk`,
+        state === null
+      );
       this.getBodyElement_().classList.toggle(
-          `${CSS_PREFIX}-${type}-yes`,
-          state === true);
+        `${CSS_PREFIX}-${type}-yes`,
+        state === true
+      );
       this.getBodyElement_().classList.toggle(
-          `${CSS_PREFIX}-${type}-no`,
-          state === false);
+        `${CSS_PREFIX}-${type}-no`,
+        state === false
+      );
     });
   }
 
@@ -80,12 +78,13 @@ export class Renderer {
     return this.ampdoc_.whenReady().then(() => {
       const body = this.ampdoc_.getBody();
       if (!body.querySelector('[subscriptions-section=loading]')) {
-        const element = createElementWithAttributes(this.ampdoc_.win.document,
-            'div' ,
-            dict({
-              'class': 'i-amphtml-subs-progress',
-              'subscriptions-section': 'loading',
-            })
+        const element = createElementWithAttributes(
+          this.ampdoc_.win.document,
+          'div',
+          dict({
+            'class': 'i-amphtml-subs-progress',
+            'subscriptions-section': 'loading',
+          })
         );
         // The loading indicator will be either inserted right before the
         // `<footer>` node or appended as the last child.
diff --git a/extensions/amp-subscriptions/0.1/score-factors.js b/extensions/amp-subscriptions/0.1/score-factors.js
index 5b9924c3d560..7638804b413e 100644
--- a/extensions/amp-subscriptions/0.1/score-factors.js
+++ b/extensions/amp-subscriptions/0.1/score-factors.js
@@ -29,5 +29,4 @@ export const SubscriptionsScoreFactor = {
  * All other score factors are ignored if not specifed in the publisher
  * config so adding a default here would be meaningless.
  */
-export const DEFAULT_SCORE_CONFIG = {
-};
+export const DEFAULT_SCORE_CONFIG = {};
diff --git a/extensions/amp-subscriptions/0.1/service-adapter.js b/extensions/amp-subscriptions/0.1/service-adapter.js
index 023742787360..e1b4dff8d20d 100644
--- a/extensions/amp-subscriptions/0.1/service-adapter.js
+++ b/extensions/amp-subscriptions/0.1/service-adapter.js
@@ -17,7 +17,6 @@
 import {PageConfig} from '../../../third_party/subscriptions-project/config';
 
 export class ServiceAdapter {
-
   /**
    * @param {./amp-subscriptions.SubscriptionService} subscriptionService
    */
@@ -86,8 +85,12 @@ export class ServiceAdapter {
    * @param {?JsonObject} options
    */
   decorateServiceAction(element, serviceId, action, options) {
-    this.subscriptionService_.decorateServiceAction(element, serviceId,
-        action, options);
+    this.subscriptionService_.decorateServiceAction(
+      element,
+      serviceId,
+      action,
+      options
+    );
   }
 
   /**
@@ -119,4 +122,3 @@ export class ServiceAdapter {
 export function getPageConfigForTesting() {
   return PageConfig;
 }
-
diff --git a/extensions/amp-subscriptions/0.1/subscription-platform.js b/extensions/amp-subscriptions/0.1/subscription-platform.js
index 0ece0cff85db..d50e4479f2c0 100644
--- a/extensions/amp-subscriptions/0.1/subscription-platform.js
+++ b/extensions/amp-subscriptions/0.1/subscription-platform.js
@@ -23,7 +23,6 @@ import {PageConfig} from '../../../third_party/subscriptions-project/config';
  * @interface
  */
 export class SubscriptionPlatform {
-
   /**
    * Returns the service Id.
    * @return {string}
diff --git a/extensions/amp-subscriptions/0.1/test/test-actions.js b/extensions/amp-subscriptions/0.1/test/test-actions.js
index b1644a131112..184a579fd870 100644
--- a/extensions/amp-subscriptions/0.1/test/test-actions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-actions.js
@@ -22,7 +22,6 @@ import {WebLoginDialog} from '../../../amp-access/0.1/login-dialog';
 const LOCAL = 'local';
 const LOCAL_OPTS = {serviceId: LOCAL};
 
-
 describes.realWin('Actions', {amp: true}, env => {
   let ampdoc;
   let clock;
@@ -69,78 +68,99 @@ describes.realWin('Actions', {amp: true}, env => {
     return actions.build().then(() => {
       const builtActions = actions.builtActionUrlMap_;
       expect(Object.keys(builtActions)).to.have.length(2);
-      expect(builtActions['login'])
-          .to.equal('https://example.org/login?rid=RD');
-      expect(builtActions['subscribe'])
-          .to.equal('https://example.org/subscribe?rid=RD&a=A');
+      expect(builtActions['login']).to.equal(
+        'https://example.org/login?rid=RD'
+      );
+      expect(builtActions['subscribe']).to.equal(
+        'https://example.org/subscribe?rid=RD&a=A'
+      );
     });
   });
 
   it('should open the action popup window synchronously', () => {
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
-        .once();
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-success', LOCAL_OPTS)
-        .once();
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver('#success=yes');
-      return promise;
-    }).then(result => {
-      expect(result).to.be.true;
-    });
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
+      .once();
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-success', LOCAL_OPTS)
+      .once();
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver('#success=yes');
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.be.true;
+      });
   });
 
   it('should accept success=true', () => {
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver('#success=true');
-      return promise;
-    }).then(result => {
-      expect(result).to.be.true;
-    });
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver('#success=true');
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.be.true;
+      });
   });
 
   it('should accept success=1', () => {
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver('#success=1');
-      return promise;
-    }).then(result => {
-      expect(result).to.be.true;
-    });
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver('#success=1');
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.be.true;
+      });
   });
 
   it('should accept success=no', () => {
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
-        .once();
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-rejected', LOCAL_OPTS)
-        .once();
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver('#success=no');
-      return promise;
-    }).then(result => {
-      expect(result).to.be.false;
-    });
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
+      .once();
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-rejected', LOCAL_OPTS)
+      .once();
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver('#success=no');
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.be.false;
+      });
   });
 
   it('should accept no response', () => {
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver('');
-      return promise;
-    }).then(result => {
-      expect(result).to.be.true;
-    });
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver('');
+        return promise;
+      })
+      .then(result => {
+        expect(result).to.be.true;
+      });
   });
 
   it('should block re-execution of actions for some time', () => {
@@ -156,36 +176,48 @@ describes.realWin('Actions', {amp: true}, env => {
   });
 
   it('should handle failures', () => {
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
-        .once();
-    analyticsMock.expects('event')
-        .withExactArgs('subscriptions-action-login-failed', LOCAL_OPTS)
-        .once();
-    return actions.build().then(() => {
-      const promise = actions.execute('login');
-      expect(openStub).to.be.calledOnce;
-      openResolver(Promise.reject(new Error('broken')));
-      return promise;
-    }).then(() => {
-      throw new Error('must have failed');
-    }, reason => {
-      expect(() => {
-        throw reason;
-      }).to.throw(/broken/);
-      expect(actions.actionPromise_).to.be.null;
-    });
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-started', LOCAL_OPTS)
+      .once();
+    analyticsMock
+      .expects('event')
+      .withExactArgs('subscriptions-action-login-failed', LOCAL_OPTS)
+      .once();
+    return actions
+      .build()
+      .then(() => {
+        const promise = actions.execute('login');
+        expect(openStub).to.be.calledOnce;
+        openResolver(Promise.reject(new Error('broken')));
+        return promise;
+      })
+      .then(
+        () => {
+          throw new Error('must have failed');
+        },
+        reason => {
+          expect(() => {
+            throw reason;
+          }).to.throw(/broken/);
+          expect(actions.actionPromise_).to.be.null;
+        }
+      );
   });
 
   it('should disallow unknown action', () => {
-    allowConsoleError(() => { expect(() => {
-      actions.execute('unknown');
-    }).to.throw(/Action URL is not configured/); });
+    allowConsoleError(() => {
+      expect(() => {
+        actions.execute('unknown');
+      }).to.throw(/Action URL is not configured/);
+    });
   });
 
   it('should fail before build is complete', () => {
-    allowConsoleError(() => { expect(() => {
-      actions.execute('login');
-    }).to.throw(/Action URL is not ready/); });
+    allowConsoleError(() => {
+      expect(() => {
+        actions.execute('login');
+      }).to.throw(/Action URL is not ready/);
+    });
   });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
index 55747429b28f..45d7ea348a6a 100644
--- a/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-amp-subscriptions.js
@@ -16,12 +16,8 @@
 
 import * as utilsStory from '../../../../src/utils/story';
 import {Entitlement, GrantReason} from '../entitlement';
-import {
-  LocalSubscriptionIframePlatform,
-} from '../local-subscription-platform-iframe';
-import {
-  LocalSubscriptionRemotePlatform,
-} from '../local-subscription-platform-remote';
+import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe';
+import {LocalSubscriptionRemotePlatform} from '../local-subscription-platform-remote';
 import {
   PageConfig,
   PageConfigResolver,
@@ -33,12 +29,9 @@ import {SubscriptionAnalyticsEvents} from '../analytics';
 import {SubscriptionPlatform} from '../subscription-platform';
 import {SubscriptionService} from '../amp-subscriptions';
 import {ViewerSubscriptionPlatform} from '../viewer-subscription-platform';
-import {
-  localSubscriptionPlatformFactory,
-} from '../local-subscription-platform';
+import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
 import {setTimeout} from 'timers';
 
-
 describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
   let win;
   let ampdoc;
@@ -49,8 +42,10 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
   let analyticsEventStub;
   let isStory;
 
-  const products = ['scenic-2017.appspot.com:news',
-    'scenic-2017.appspot.com:product2'];
+  const products = [
+    'scenic-2017.appspot.com:news',
+    'scenic-2017.appspot.com:product2',
+  ];
 
   const serviceConfig = {
     services: [
@@ -104,33 +99,39 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     win.document.body.appendChild(element);
     subscriptionService = new SubscriptionService(ampdoc);
     pageConfig = new PageConfig('scenic-2017.appspot.com:news', true);
-    sandbox.stub(PageConfigResolver.prototype, 'resolveConfig')
-        .callsFake(function() {
-          configResolver = this;
-          return Promise.resolve(pageConfig);
-        });
-    sandbox.stub(subscriptionService, 'getPlatformConfig_')
-        .callsFake(() => Promise.resolve(serviceConfig));
+    sandbox
+      .stub(PageConfigResolver.prototype, 'resolveConfig')
+      .callsFake(function() {
+        configResolver = this;
+        return Promise.resolve(pageConfig);
+      });
+    sandbox
+      .stub(subscriptionService, 'getPlatformConfig_')
+      .callsFake(() => Promise.resolve(serviceConfig));
     analyticsEventStub = sandbox.stub(
-        subscriptionService.subscriptionAnalytics_,
-        'event'
+      subscriptionService.subscriptionAnalytics_,
+      'event'
     );
     // isStoryDocument needs to resolve synchronously because of how some of the
     // tests are built.
     isStory = false;
-    sandbox.stub(utilsStory, 'isStoryDocument')
-        .returns({then: fn => fn(isStory)});
+    sandbox
+      .stub(utilsStory, 'isStoryDocument')
+      .returns({then: fn => fn(isStory)});
   });
 
   it('should call `initialize_` on start', () => {
-    const localPlatformStub =
-      sandbox.stub(subscriptionService, 'initializeLocalPlatforms_');
+    const localPlatformStub = sandbox.stub(
+      subscriptionService,
+      'initializeLocalPlatforms_'
+    );
     const initializeStub = sandbox.spy(subscriptionService, 'initialize_');
     subscriptionService.start();
     expect(initializeStub).to.be.calledOnce;
     return subscriptionService.initialize_().then(() => {
       expect(analyticsEventStub).to.be.calledWith(
-          SubscriptionAnalyticsEvents.STARTED);
+        SubscriptionAnalyticsEvents.STARTED
+      );
       expect(localPlatformStub).to.be.called;
     });
   });
@@ -138,24 +139,31 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
   describe('start', () => {
     it('should setup store and page on start', () => {
       sandbox.stub(subscriptionService, 'initializeLocalPlatforms_');
-      const renderLoadingStub =
-          sandbox.spy(subscriptionService.renderer_, 'toggleLoading');
+      const renderLoadingStub = sandbox.spy(
+        subscriptionService.renderer_,
+        'toggleLoading'
+      );
 
       subscriptionService.start();
       return subscriptionService.initialize_().then(() => {
         // Should show loading on the page
         expect(renderLoadingStub).to.be.calledWith(true);
         // Should setup platform store
-        expect(subscriptionService.platformStore_).to.be
-            .instanceOf(PlatformStore);
+        expect(subscriptionService.platformStore_).to.be.instanceOf(
+          PlatformStore
+        );
       });
     });
 
     it('should start auth flow for short circuiting', () => {
-      const authFlowStub = sandbox.stub(subscriptionService,
-          'startAuthorizationFlow_');
-      const delegateStub = sandbox.stub(subscriptionService,
-          'delegateAuthToViewer_');
+      const authFlowStub = sandbox.stub(
+        subscriptionService,
+        'startAuthorizationFlow_'
+      );
+      const delegateStub = sandbox.stub(
+        subscriptionService,
+        'delegateAuthToViewer_'
+      );
       sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
         subscriptionService.platformConfig_ = serviceConfig;
         subscriptionService.pageConfig_ = pageConfig;
@@ -170,8 +178,10 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     });
 
     it('should skip everything and unlock document for alwaysGrant', () => {
-      const processStateStub = sandbox.stub(subscriptionService,
-          'processGrantState_');
+      const processStateStub = sandbox.stub(
+        subscriptionService,
+        'processGrantState_'
+      );
       sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
         subscriptionService.platformConfig_ = {
           alwaysGrant: true,
@@ -185,43 +195,58 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       });
     });
 
-    it('should not skip everything and unlock document for alwaysGrant '
-        + 'if viewer provides authorization', () => {
-      const processStateStub = sandbox.stub(subscriptionService,
-          'processGrantState_');
-      const authFlowStub = sandbox.stub(subscriptionService,
-          'startAuthorizationFlow_');
-      const delegateStub = sandbox.stub(subscriptionService,
-          'delegateAuthToViewer_');
-      sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
-        subscriptionService.platformConfig_ = {
-          alwaysGrant: true,
-        };
-        subscriptionService.pageConfig_ = pageConfig;
-        subscriptionService.doesViewerProvideAuth_ = true;
-        return Promise.resolve();
-      });
-      subscriptionService.start();
-      return subscriptionService.initialize_().then(() => {
-        expect(authFlowStub.withArgs(false)).to.be.calledOnce;
-        expect(delegateStub).to.be.calledOnce;
-        expect(processStateStub).to.not.be.called;
-      });
-    });
+    it(
+      'should not skip everything and unlock document for alwaysGrant ' +
+        'if viewer provides authorization',
+      () => {
+        const processStateStub = sandbox.stub(
+          subscriptionService,
+          'processGrantState_'
+        );
+        const authFlowStub = sandbox.stub(
+          subscriptionService,
+          'startAuthorizationFlow_'
+        );
+        const delegateStub = sandbox.stub(
+          subscriptionService,
+          'delegateAuthToViewer_'
+        );
+        sandbox.stub(subscriptionService, 'initialize_').callsFake(() => {
+          subscriptionService.platformConfig_ = {
+            alwaysGrant: true,
+          };
+          subscriptionService.pageConfig_ = pageConfig;
+          subscriptionService.doesViewerProvideAuth_ = true;
+          return Promise.resolve();
+        });
+        subscriptionService.start();
+        return subscriptionService.initialize_().then(() => {
+          expect(authFlowStub.withArgs(false)).to.be.calledOnce;
+          expect(delegateStub).to.be.calledOnce;
+          expect(processStateStub).to.not.be.called;
+        });
+      }
+    );
 
     it('should delay the platform selection and activation if story', () => {
       isStory = true;
 
-      const processStateStub = sandbox.stub(subscriptionService,
-          'processGrantState_');
-      const authFlowStub = sandbox.stub(subscriptionService,
-          'startAuthorizationFlow_');
-      const delegateStub = sandbox.stub(subscriptionService,
-          'delegateAuthToViewer_');
+      const processStateStub = sandbox.stub(
+        subscriptionService,
+        'processGrantState_'
+      );
+      const authFlowStub = sandbox.stub(
+        subscriptionService,
+        'startAuthorizationFlow_'
+      );
+      const delegateStub = sandbox.stub(
+        subscriptionService,
+        'delegateAuthToViewer_'
+      );
       subscriptionService.start();
       return subscriptionService.initialize_().then(() => {
-        expect(authFlowStub.withArgs(false /** doPlatformActivation*/))
-            .to.be.calledOnce;
+        expect(authFlowStub.withArgs(false /** doPlatformActivation*/)).to.be
+          .calledOnce;
         expect(delegateStub).to.not.be.called;
         expect(processStateStub).to.not.be.called;
       });
@@ -233,8 +258,9 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
 
     beforeEach(() => {
       return Services.cidForDoc(ampdoc).then(cid => {
-        cidGet = sandbox.stub(cid, 'get').callsFake(
-            () => Promise.resolve('cid1'));
+        cidGet = sandbox
+          .stub(cid, 'get')
+          .callsFake(() => Promise.resolve('cid1'));
       });
     });
 
@@ -284,16 +310,21 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
   it('should add subscription platform while registering it', () => {
     const serviceData = serviceConfig['services'][1];
     const platform = new SubscriptionPlatform();
-    const entitlementData = {source: 'local', granted: true,
-      grantReason: GrantReason.SUBSCRIBER};
+    const entitlementData = {
+      source: 'local',
+      granted: true,
+      grantReason: GrantReason.SUBSCRIBER,
+    };
     const entitlement = Entitlement.parseFromJson(entitlementData);
     const factoryStub = sandbox.stub().callsFake(() => platform);
 
-    subscriptionService.platformStore_ = new PlatformStore(
-        [serviceData.serviceId]);
+    subscriptionService.platformStore_ = new PlatformStore([
+      serviceData.serviceId,
+    ]);
 
-    platform.getEntitlements = sandbox.stub()
-        .callsFake(() => Promise.resolve(entitlement));
+    platform.getEntitlements = sandbox
+      .stub()
+      .callsFake(() => Promise.resolve(entitlement));
     platform.getServiceId = sandbox.stub().callsFake(() => 'local');
 
     subscriptionService.platformConfig_ = serviceConfig;
@@ -303,18 +334,19 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       expect(factoryStub).to.be.calledOnce;
       expect(factoryStub.getCall(0).args[0]).to.be.equal(serviceData);
       expect(factoryStub.getCall(0).args[1]).to.be.equal(
-          subscriptionService.serviceAdapter_);
+        subscriptionService.serviceAdapter_
+      );
       expect(analyticsEventStub).to.be.calledWith(
-          SubscriptionAnalyticsEvents.PLATFORM_REGISTERED,
-          {
-            serviceId: 'local',
-          }
+        SubscriptionAnalyticsEvents.PLATFORM_REGISTERED,
+        {
+          serviceId: 'local',
+        }
       );
       expect(analyticsEventStub).to.be.calledWith(
-          SubscriptionAnalyticsEvents.PLATFORM_REGISTERED_DEPRECATED,
-          {
-            serviceId: 'local',
-          }
+        SubscriptionAnalyticsEvents.PLATFORM_REGISTERED_DEPRECATED,
+        {
+          serviceId: 'local',
+        }
       );
     });
   });
@@ -324,68 +356,86 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       subscriptionService.getPlatformConfig_.restore();
       subscriptionService.getPlatformConfig_().then(config => {
         expect(JSON.stringify(config)).to.be.equal(
-            JSON.stringify(serviceConfig));
+          JSON.stringify(serviceConfig)
+        );
         done();
       });
     });
   });
 
   describe('initializeLocalPlatforms_', () => {
-    it('should put `LocalSubscriptionRemotePlatform` for every service config'
-        + ' with authorization Url', () => {
-      const service = serviceConfig.services[0];
-      subscriptionService.serviceAdapter_ =
-        new ServiceAdapter(subscriptionService);
-      subscriptionService.pageConfig_ = pageConfig;
-      subscriptionService.platformStore_ = new PlatformStore(['local']);
-      subscriptionService.initializeLocalPlatforms_(service);
-      expect(subscriptionService.platformStore_.subscriptionPlatforms_['local'])
-          .to.be.not.null;
-      expect(subscriptionService.platformStore_.subscriptionPlatforms_['local'])
-          .to.be.instanceOf(LocalSubscriptionRemotePlatform);
-    });
-    it('should put `LocalSubscriptionRemotePlatform` for every service config'
-        + ' with iframe Url', () => {
-      const service = serviceConfigIframe.services[0];
-      subscriptionService.serviceAdapter_ =
-        new ServiceAdapter(subscriptionService);
-      subscriptionService.pageConfig_ = pageConfig;
-      subscriptionService.platformStore_ = new PlatformStore(['local']);
-      subscriptionService.initializeLocalPlatforms_(service);
-      expect(subscriptionService.platformStore_.subscriptionPlatforms_['local'])
-          .to.be.not.null;
-      expect(subscriptionService.platformStore_.subscriptionPlatforms_['local'])
-          .to.be.instanceOf(LocalSubscriptionIframePlatform);
-    });
+    it(
+      'should put `LocalSubscriptionRemotePlatform` for every service config' +
+        ' with authorization Url',
+      () => {
+        const service = serviceConfig.services[0];
+        subscriptionService.serviceAdapter_ = new ServiceAdapter(
+          subscriptionService
+        );
+        subscriptionService.pageConfig_ = pageConfig;
+        subscriptionService.platformStore_ = new PlatformStore(['local']);
+        subscriptionService.initializeLocalPlatforms_(service);
+        expect(
+          subscriptionService.platformStore_.subscriptionPlatforms_['local']
+        ).to.be.not.null;
+        expect(
+          subscriptionService.platformStore_.subscriptionPlatforms_['local']
+        ).to.be.instanceOf(LocalSubscriptionRemotePlatform);
+      }
+    );
+    it(
+      'should put `LocalSubscriptionRemotePlatform` for every service config' +
+        ' with iframe Url',
+      () => {
+        const service = serviceConfigIframe.services[0];
+        subscriptionService.serviceAdapter_ = new ServiceAdapter(
+          subscriptionService
+        );
+        subscriptionService.pageConfig_ = pageConfig;
+        subscriptionService.platformStore_ = new PlatformStore(['local']);
+        subscriptionService.initializeLocalPlatforms_(service);
+        expect(
+          subscriptionService.platformStore_.subscriptionPlatforms_['local']
+        ).to.be.not.null;
+        expect(
+          subscriptionService.platformStore_.subscriptionPlatforms_['local']
+        ).to.be.instanceOf(LocalSubscriptionIframePlatform);
+      }
+    );
   });
 
   describe('selectAndActivatePlatform_', () => {
     function resolveRequiredPromises(entitlementSpec, grantEntitlementSpec) {
-      entitlementSpec = Object.assign({
-        service: 'local',
-        source: 'local',
-        raw: 'raw',
-      }, entitlementSpec);
+      entitlementSpec = Object.assign(
+        {
+          service: 'local',
+          source: 'local',
+          raw: 'raw',
+        },
+        entitlementSpec
+      );
       if (!grantEntitlementSpec && entitlementSpec.granted) {
         grantEntitlementSpec = entitlementSpec;
       }
       const entitlement = new Entitlement(entitlementSpec);
-      const grantEntitlement = grantEntitlementSpec ?
-        new Entitlement(grantEntitlementSpec) : null;
+      const grantEntitlement = grantEntitlementSpec
+        ? new Entitlement(grantEntitlementSpec)
+        : null;
       const granted = !!grantEntitlementSpec;
-      const localPlatform =
-          subscriptionService.platformStore_.getLocalPlatform();
-      sandbox.stub(subscriptionService.platformStore_, 'getGrantStatus')
-          .callsFake(() => Promise.resolve(granted));
-      sandbox.stub(subscriptionService.platformStore_, 'getGrantEntitlement')
-          .callsFake(() => Promise.resolve(grantEntitlement));
+      const localPlatform = subscriptionService.platformStore_.getLocalPlatform();
+      sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantStatus')
+        .callsFake(() => Promise.resolve(granted));
+      sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantEntitlement')
+        .callsFake(() => Promise.resolve(grantEntitlement));
       subscriptionService.platformStore_.resolveEntitlement(
-          entitlementSpec.source,
-          entitlement);
-      sandbox.stub(
-          subscriptionService.platformStore_,
-          'selectPlatform'
-      ).callsFake(() => Promise.resolve(localPlatform));
+        entitlementSpec.source,
+        entitlement
+      );
+      sandbox
+        .stub(subscriptionService.platformStore_, 'selectPlatform')
+        .callsFake(() => Promise.resolve(localPlatform));
     }
 
     it('should wait for grantStatus/ent and selectPlatform promise', () => {
@@ -397,10 +447,9 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
           granted: true,
           grantReason: GrantReason.SUBSCRIBER,
         });
-        const localPlatform =
-            subscriptionService.platformStore_.getLocalPlatform();
+        const localPlatform = subscriptionService.platformStore_.getLocalPlatform();
         const selectPlatformStub =
-            subscriptionService.platformStore_.selectPlatform;
+          subscriptionService.platformStore_.selectPlatform;
         const activateStub = sandbox.stub(localPlatform, 'activate');
         expect(localPlatform).to.be.not.null;
         return subscriptionService.selectAndActivatePlatform_().then(() => {
@@ -409,19 +458,20 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
           expect(activateStub.firstCall.args[1].source).to.equal('local');
           expect(selectPlatformStub).to.be.called;
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
-              {
-                'serviceId': 'local',
-              }
+            SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+            {
+              'serviceId': 'local',
+            }
           );
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.ACCESS_GRANTED,
-              {
-                'serviceId': 'local',
-              }
+            SubscriptionAnalyticsEvents.ACCESS_GRANTED,
+            {
+              'serviceId': 'local',
+            }
           );
           expect(analyticsEventStub).to.not.be.calledWith(
-              SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED);
+            SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED
+          );
         });
       });
     });
@@ -431,18 +481,20 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       subscriptionService.start();
       subscriptionService.viewTrackerPromise_ = Promise.resolve();
       return subscriptionService.initialize_().then(() => {
-        resolveRequiredPromises({
-          granted: false,
-        }, {
-          service: 'other',
-          source: 'other',
-          granted: true,
-          grantReason: GrantReason.SUBSCRIBER,
-        });
-        const localPlatform =
-            subscriptionService.platformStore_.getLocalPlatform();
+        resolveRequiredPromises(
+          {
+            granted: false,
+          },
+          {
+            service: 'other',
+            source: 'other',
+            granted: true,
+            grantReason: GrantReason.SUBSCRIBER,
+          }
+        );
+        const localPlatform = subscriptionService.platformStore_.getLocalPlatform();
         const selectPlatformStub =
-            subscriptionService.platformStore_.selectPlatform;
+          subscriptionService.platformStore_.selectPlatform;
         const activateStub = sandbox.stub(localPlatform, 'activate');
         expect(localPlatform).to.be.not.null;
         return subscriptionService.selectAndActivatePlatform_().then(() => {
@@ -451,19 +503,20 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
           expect(activateStub.firstCall.args[1].source).to.equal('other');
           expect(selectPlatformStub).to.be.called;
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
-              {
-                'serviceId': 'local',
-              }
+            SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+            {
+              'serviceId': 'local',
+            }
           );
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.ACCESS_GRANTED,
-              {
-                'serviceId': 'other',
-              }
+            SubscriptionAnalyticsEvents.ACCESS_GRANTED,
+            {
+              'serviceId': 'other',
+            }
           );
           expect(analyticsEventStub).to.not.be.calledWith(
-              SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED);
+            SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED
+          );
         });
       });
     });
@@ -492,26 +545,27 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       subscriptionService.viewTrackerPromise_ = Promise.resolve();
       return subscriptionService.initialize_().then(() => {
         resolveRequiredPromises({granted: false});
-        const localPlatform =
-            subscriptionService.platformStore_.getLocalPlatform();
+        const localPlatform = subscriptionService.platformStore_.getLocalPlatform();
         sandbox.stub(localPlatform, 'activate');
         return subscriptionService.selectAndActivatePlatform_().then(() => {
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
-              {
-                'serviceId': 'local',
-              }
+            SubscriptionAnalyticsEvents.PLATFORM_ACTIVATED,
+            {
+              'serviceId': 'local',
+            }
           );
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED,
-              {
-                'serviceId': 'local',
-              });
+            SubscriptionAnalyticsEvents.PAYWALL_ACTIVATED,
+            {
+              'serviceId': 'local',
+            }
+          );
           expect(analyticsEventStub).to.be.calledWith(
-              SubscriptionAnalyticsEvents.ACCESS_DENIED,
-              {
-                'serviceId': 'local',
-              });
+            SubscriptionAnalyticsEvents.ACCESS_DENIED,
+            {
+              'serviceId': 'local',
+            }
+          );
         });
       });
     });
@@ -520,13 +574,17 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
   describe('startAuthorizationFlow_', () => {
     it('should start grantStatus and platform selection', () => {
       subscriptionService.platformStore_ = new PlatformStore(products);
-      const getGrantStatusStub =
-          sandbox.stub(subscriptionService.platformStore_, 'getGrantStatus')
-              .callsFake(() => Promise.resolve());
-      const selectAndActivateStub =
-          sandbox.stub(subscriptionService, 'selectAndActivatePlatform_');
-      const performPingbackStub =
-          sandbox.stub(subscriptionService, 'performPingback_');
+      const getGrantStatusStub = sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantStatus')
+        .callsFake(() => Promise.resolve());
+      const selectAndActivateStub = sandbox.stub(
+        subscriptionService,
+        'selectAndActivatePlatform_'
+      );
+      const performPingbackStub = sandbox.stub(
+        subscriptionService,
+        'performPingback_'
+      );
       subscriptionService.startAuthorizationFlow_();
       expect(getGrantStatusStub).to.be.calledOnce;
       expect(selectAndActivateStub).to.be.calledOnce;
@@ -537,11 +595,13 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
 
     it('should not call selectAndActivatePlatform based on param', () => {
       subscriptionService.platformStore_ = new PlatformStore(products);
-      const getGrantStatusStub =
-          sandbox.stub(subscriptionService.platformStore_, 'getGrantStatus')
-              .callsFake(() => Promise.resolve());
-      const selectAndActivateStub =
-          sandbox.stub(subscriptionService, 'selectAndActivatePlatform_');
+      const getGrantStatusStub = sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantStatus')
+        .callsFake(() => Promise.resolve());
+      const selectAndActivateStub = sandbox.stub(
+        subscriptionService,
+        'selectAndActivatePlatform_'
+      );
       subscriptionService.startAuthorizationFlow_(false);
       expect(getGrantStatusStub).to.be.calledOnce;
       expect(selectAndActivateStub).to.not.be.called;
@@ -554,78 +614,98 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     let firstVisibleStub;
     beforeEach(() => {
       serviceAdapter = new ServiceAdapter(subscriptionService);
-      firstVisibleStub = sandbox.stub(subscriptionService.viewer_,
-          'whenFirstVisible').callsFake(() => Promise.resolve());
+      firstVisibleStub = sandbox
+        .stub(subscriptionService.viewer_, 'whenFirstVisible')
+        .callsFake(() => Promise.resolve());
       subscriptionService.pageConfig_ = pageConfig;
-      platform = localSubscriptionPlatformFactory(ampdoc,
-          serviceConfig.services[0],
-          serviceAdapter);
+      platform = localSubscriptionPlatformFactory(
+        ampdoc,
+        serviceConfig.services[0],
+        serviceAdapter
+      );
       subscriptionService.platformStore_ = new PlatformStore(['local']);
     });
     afterEach(() => {
       expect(firstVisibleStub).to.be.called;
     });
     it('should report failure if platform timeouts', done => {
-      sandbox.stub(platform, 'getEntitlements')
-          .callsFake(() => new Promise(resolve => setTimeout(resolve, 8000)));
-      const failureStub = sandbox.stub(subscriptionService.platformStore_,
-          'reportPlatformFailureAndFallback');
-      subscriptionService.fetchEntitlements_(platform)
-          .catch(() => {
-            expect(failureStub).to.be.calledOnce;
-            done();
-          });
+      sandbox
+        .stub(platform, 'getEntitlements')
+        .callsFake(() => new Promise(resolve => setTimeout(resolve, 8000)));
+      const failureStub = sandbox.stub(
+        subscriptionService.platformStore_,
+        'reportPlatformFailureAndFallback'
+      );
+      subscriptionService.fetchEntitlements_(platform).catch(() => {
+        expect(failureStub).to.be.calledOnce;
+        done();
+      });
     }).timeout(7000);
 
     it('should report failure if platform reject promise', done => {
-      sandbox.stub(platform, 'getEntitlements')
-          .callsFake(() => Promise.reject());
-      const failureStub = sandbox.stub(subscriptionService.platformStore_,
-          'reportPlatformFailureAndFallback');
-      const promise = subscriptionService.fetchEntitlements_(platform)
-          .catch(() => {
-            expect(failureStub).to.be.calledOnce;
-            done();
-          });
+      sandbox
+        .stub(platform, 'getEntitlements')
+        .callsFake(() => Promise.reject());
+      const failureStub = sandbox.stub(
+        subscriptionService.platformStore_,
+        'reportPlatformFailureAndFallback'
+      );
+      const promise = subscriptionService
+        .fetchEntitlements_(platform)
+        .catch(() => {
+          expect(failureStub).to.be.calledOnce;
+          done();
+        });
       expect(promise).to.throw;
     });
 
     it('should resolve entitlement if platform resolves', () => {
-      const entitlement = new Entitlement({source: 'local', raw: 'raw',
-        granted: true, grantReason: GrantReason.SUBSCRIBER});
-      sandbox.stub(platform, 'getEntitlements')
-          .callsFake(() => Promise.resolve(entitlement));
-      const resolveStub = sandbox.stub(subscriptionService.platformStore_,
-          'resolveEntitlement');
+      const entitlement = new Entitlement({
+        source: 'local',
+        raw: 'raw',
+        granted: true,
+        grantReason: GrantReason.SUBSCRIBER,
+      });
+      sandbox
+        .stub(platform, 'getEntitlements')
+        .callsFake(() => Promise.resolve(entitlement));
+      const resolveStub = sandbox.stub(
+        subscriptionService.platformStore_,
+        'resolveEntitlement'
+      );
       return subscriptionService.fetchEntitlements_(platform).then(() => {
         expect(resolveStub).to.be.calledOnce;
         expect(resolveStub.getCall(0).args[1]).to.deep.equal(entitlement);
         expect(analyticsEventStub).to.be.calledWith(
-            SubscriptionAnalyticsEvents.ENTITLEMENT_RESOLVED,
-            {
-              'serviceId': 'local',
-            }
+          SubscriptionAnalyticsEvents.ENTITLEMENT_RESOLVED,
+          {
+            'serviceId': 'local',
+          }
         );
       });
     });
 
     it('should reset platform on re-authorization', () => {
       const service = serviceConfig.services[0];
-      subscriptionService.serviceAdapter_ =
-        new ServiceAdapter(subscriptionService);
+      subscriptionService.serviceAdapter_ = new ServiceAdapter(
+        subscriptionService
+      );
       subscriptionService.platformConfig_ = serviceConfig;
       subscriptionService.pageConfig_ = pageConfig;
       subscriptionService.platformStore_ = new PlatformStore(['local']);
       subscriptionService.initializeLocalPlatforms_(service);
       subscriptionService.platformStore_.resolvePlatform('local', platform);
       const resetSubscriptionPlatformSpy = sandbox.spy(
-          subscriptionService.platformStore_, 'resetPlatformStore');
+        subscriptionService.platformStore_,
+        'resetPlatformStore'
+      );
       sandbox.stub(subscriptionService, 'startAuthorizationFlow_');
       const origPlatforms = subscriptionService.platformStore_.serviceIds_;
       subscriptionService.resetPlatforms();
       expect(resetSubscriptionPlatformSpy).to.be.calledOnce;
-      expect(subscriptionService.platformStore_.serviceIds_)
-          .to.equal(origPlatforms);
+      expect(subscriptionService.platformStore_.serviceIds_).to.equal(
+        origPlatforms
+      );
     });
   });
 
@@ -637,54 +717,72 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       subscriptionService.pageConfig_ = pageConfig;
       subscriptionService.platformConfig_ = serviceConfig;
       subscriptionService.doesViewerProvideAuth_ = true;
-      sandbox.stub(subscriptionService, 'initialize_')
-          .callsFake(() => Promise.resolve());
+      sandbox
+        .stub(subscriptionService, 'initialize_')
+        .callsFake(() => Promise.resolve());
       sendMessageAwaitResponsePromise = Promise.resolve();
-      sandbox.stub(subscriptionService.viewer_, 'sendMessageAwaitResponse')
-          .callsFake(() => sendMessageAwaitResponsePromise);
-      fetchEntitlementsStub = sandbox.stub(subscriptionService,
-          'fetchEntitlements_');
+      sandbox
+        .stub(subscriptionService.viewer_, 'sendMessageAwaitResponse')
+        .callsFake(() => sendMessageAwaitResponsePromise);
+      fetchEntitlementsStub = sandbox.stub(
+        subscriptionService,
+        'fetchEntitlements_'
+      );
     });
 
-    it('should put LocalSubscriptionRemotePlatform in platformstore, '
-        + 'if viewer does not have auth capability', () => {
-      subscriptionService.doesViewerProvideAuth_ = false;
-      subscriptionService.start();
-      return subscriptionService.initialize_().then(() => {
-        expect(subscriptionService.platformStore_.getLocalPlatform()).to.be
-            .instanceOf(LocalSubscriptionRemotePlatform);
-      });
-    });
+    it(
+      'should put LocalSubscriptionRemotePlatform in platformstore, ' +
+        'if viewer does not have auth capability',
+      () => {
+        subscriptionService.doesViewerProvideAuth_ = false;
+        subscriptionService.start();
+        return subscriptionService.initialize_().then(() => {
+          expect(
+            subscriptionService.platformStore_.getLocalPlatform()
+          ).to.be.instanceOf(LocalSubscriptionRemotePlatform);
+        });
+      }
+    );
 
-    it('should put ViewerSubscriptionPlatform in platformstore, '
-        + 'if viewer does have auth capability', () => {
-      subscriptionService.start();
-      return subscriptionService.initialize_().then(() => {
-        expect(subscriptionService.platformStore_.getLocalPlatform()).to.be
-            .instanceOf(ViewerSubscriptionPlatform);
-      });
-    });
+    it(
+      'should put ViewerSubscriptionPlatform in platformstore, ' +
+        'if viewer does have auth capability',
+      () => {
+        subscriptionService.start();
+        return subscriptionService.initialize_().then(() => {
+          expect(
+            subscriptionService.platformStore_.getLocalPlatform()
+          ).to.be.instanceOf(ViewerSubscriptionPlatform);
+        });
+      }
+    );
 
-    it('should not fetch entitlements for any platform other than '
-        + 'local', () => {
+    it('should not fetch entitlements for any platform other than local', () => {
       subscriptionService.start();
       return subscriptionService.initialize_().then(() => {
-        subscriptionService.registerPlatform('google.subscription',
-            new SubscriptionPlatform());
+        subscriptionService.registerPlatform(
+          'google.subscription',
+          new SubscriptionPlatform()
+        );
         expect(fetchEntitlementsStub).to.not.be.called;
       });
     });
 
-    it('should fetch entitlements for other platforms if viewer does '
-        + 'not provide auth', () => {
-      subscriptionService.doesViewerProvideAuth_ = false;
-      subscriptionService.start();
-      subscriptionService.registerPlatform('google.subscription',
-          () => new SubscriptionPlatform());
-      return subscriptionService.initialize_().then(() => {
-        expect(fetchEntitlementsStub).to.be.called;
-      });
-    });
+    it(
+      'should fetch entitlements for other platforms if viewer does ' +
+        'not provide auth',
+      () => {
+        subscriptionService.doesViewerProvideAuth_ = false;
+        subscriptionService.start();
+        subscriptionService.registerPlatform(
+          'google.subscription',
+          () => new SubscriptionPlatform()
+        );
+        return subscriptionService.initialize_().then(() => {
+          expect(fetchEntitlementsStub).to.be.called;
+        });
+      }
+    );
 
     it('should fallback if viewer provides auth but fails', function*() {
       // Make sendMessageAwaitResponse() return a pending promise so we have
@@ -702,39 +800,49 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       // Wait for sendMessageAwaitResponse() to be rejected.
       yield sendMessageAwaitResponsePromise;
       // reportPlatformFailureAndFallback() triggers the fallback entitlement.
-      expect(platformStore.reportPlatformFailureAndFallback)
-          .calledWith('local');
+      expect(platformStore.reportPlatformFailureAndFallback).calledWith(
+        'local'
+      );
     });
   });
 
   describe('performPingback_', () => {
     it('should wait for viewer tracker', () => {
-      const entitlementData = {source: 'local', granted: true,
-        grantReason: GrantReason.SUBSCRIBER};
+      const entitlementData = {
+        source: 'local',
+        granted: true,
+        grantReason: GrantReason.SUBSCRIBER,
+      };
       const entitlement = Entitlement.parseFromJson(entitlementData);
       subscriptionService.viewTrackerPromise_ = Promise.resolve();
       subscriptionService.platformStore_ = new PlatformStore(['local']);
-      subscriptionService.platformStore_.resolvePlatform('local',
-          new SubscriptionPlatform());
-      const entitlementStub = sandbox.stub(subscriptionService.platformStore_,
-          'getGrantEntitlement').callsFake(() => Promise.resolve(entitlement));
+      subscriptionService.platformStore_.resolvePlatform(
+        'local',
+        new SubscriptionPlatform()
+      );
+      const entitlementStub = sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantEntitlement')
+        .callsFake(() => Promise.resolve(entitlement));
       return subscriptionService.performPingback_().then(() => {
         expect(entitlementStub).to.be.called;
       });
     });
 
     it('should send pingback with resolved entitlement', () => {
-      const entitlementData = {source: 'local',
-        granted: true, grantReason: GrantReason.SUBSCRIBER};
+      const entitlementData = {
+        source: 'local',
+        granted: true,
+        grantReason: GrantReason.SUBSCRIBER,
+      };
       const entitlement = Entitlement.parseFromJson(entitlementData);
       subscriptionService.viewTrackerPromise_ = Promise.resolve();
       subscriptionService.platformStore_ = new PlatformStore(['local']);
       const platform = new SubscriptionPlatform();
       platform.isPingbackEnabled = () => true;
-      subscriptionService.platformStore_.resolvePlatform('local',
-          platform);
-      sandbox.stub(subscriptionService.platformStore_,
-          'getGrantEntitlement').callsFake(() => Promise.resolve(entitlement));
+      subscriptionService.platformStore_.resolvePlatform('local', platform);
+      sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantEntitlement')
+        .callsFake(() => Promise.resolve(entitlement));
       const pingbackStub = sandbox.stub(platform, 'pingback');
       return subscriptionService.performPingback_().then(() => {
         expect(pingbackStub).to.be.calledWith(entitlement);
@@ -746,10 +854,10 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       subscriptionService.platformStore_ = new PlatformStore(['local']);
       const platform = new SubscriptionPlatform();
       platform.isPingbackEnabled = () => true;
-      subscriptionService.platformStore_.resolvePlatform('local',
-          platform);
-      sandbox.stub(subscriptionService.platformStore_,
-          'getGrantEntitlement').callsFake(() => Promise.resolve(null));
+      subscriptionService.platformStore_.resolvePlatform('local', platform);
+      sandbox
+        .stub(subscriptionService.platformStore_, 'getGrantEntitlement')
+        .callsFake(() => Promise.resolve(null));
       const pingbackStub = sandbox.stub(platform, 'pingback');
       return subscriptionService.performPingback_().then(() => {
         expect(pingbackStub).to.be.calledWith(Entitlement.empty('local'));
@@ -761,38 +869,47 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     it('should initialize platform store with the given ids', () => {
       subscriptionService.platformConfig_ = serviceConfig;
       const entitlement = Entitlement.parseFromJson(
-          serviceConfig.fallbackEntitlement);
+        serviceConfig.fallbackEntitlement
+      );
       subscriptionService.initializePlatformStore_(['local']);
-      expect(subscriptionService.platformStore_.serviceIds_)
-          .to.be.deep.equal(['local']);
-      expect(subscriptionService.platformStore_.fallbackEntitlement_.json())
-          .to.be.deep.equal(entitlement.json());
+      expect(subscriptionService.platformStore_.serviceIds_).to.be.deep.equal([
+        'local',
+      ]);
+      expect(
+        subscriptionService.platformStore_.fallbackEntitlement_.json()
+      ).to.be.deep.equal(entitlement.json());
     });
   });
 
   describe('action delegation', () => {
     it('should call delegateActionToService with serviceId local', () => {
-      const delegateStub = sandbox.stub(subscriptionService,
-          'delegateActionToService');
+      const delegateStub = sandbox.stub(
+        subscriptionService,
+        'delegateActionToService'
+      );
       const action = 'action';
       subscriptionService.delegateActionToLocal(action);
       expect(delegateStub).to.be.calledWith(action, 'local');
     });
 
     it('should delegate action to the specified platform', () => {
-      subscriptionService.platformStore_ =
-        new PlatformStore(['local'], null, null);
+      subscriptionService.platformStore_ = new PlatformStore(
+        ['local'],
+        null,
+        null
+      );
       const platform = new SubscriptionPlatform();
       const executeActionStub = sandbox.stub(platform, 'executeAction');
-      const getPlatformStub = sandbox.stub(
-          subscriptionService.platformStore_, 'onPlatformResolves')
-          .callsFake((serviceId, callback) => callback(platform));
+      const getPlatformStub = sandbox
+        .stub(subscriptionService.platformStore_, 'onPlatformResolves')
+        .callsFake((serviceId, callback) => callback(platform));
       const action = action;
-      return subscriptionService.delegateActionToService(action,
-          'local').then(() => {
-        expect(getPlatformStub).to.be.calledWith('local');
-        expect(executeActionStub).to.be.calledWith(action);
-      });
+      return subscriptionService
+        .delegateActionToService(action, 'local')
+        .then(() => {
+          expect(getPlatformStub).to.be.calledWith('local');
+          expect(executeActionStub).to.be.calledWith(action);
+        });
     });
   });
 
@@ -802,13 +919,14 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
       element.setAttribute('subscriptions-service', 'swg-google');
       const platform = new SubscriptionPlatform();
       platform.getServiceId = () => 'swg-google';
-      subscriptionService.platformStore_ = new PlatformStore(
-          ['local', 'swg-google']);
-      const whenResolveStub = sandbox.stub(subscriptionService.platformStore_,
-          'onPlatformResolves').callsFake(
-          (serviceId, callback) => callback(platform));
-      const decorateUIStub = sandbox.stub(platform,
-          'decorateUI');
+      subscriptionService.platformStore_ = new PlatformStore([
+        'local',
+        'swg-google',
+      ]);
+      const whenResolveStub = sandbox
+        .stub(subscriptionService.platformStore_, 'onPlatformResolves')
+        .callsFake((serviceId, callback) => callback(platform));
+      const decorateUIStub = sandbox.stub(platform, 'decorateUI');
       subscriptionService.decorateServiceAction(element, 'swg-google', 'login');
       expect(whenResolveStub).to.be.calledWith(platform.getServiceId());
       expect(decorateUIStub).to.be.calledWith(element);
@@ -817,10 +935,14 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
 
   describe('selectPlatformForLogin', () => {
     it('should return the platform which ever supports viewer', () => {
-      subscriptionService.platformStore_ = new PlatformStore(
-          ['local', 'swg-google']);
+      subscriptionService.platformStore_ = new PlatformStore([
+        'local',
+        'swg-google',
+      ]);
       const loginStub = sandbox.stub(
-          subscriptionService.platformStore_, 'selectPlatformForLogin');
+        subscriptionService.platformStore_,
+        'selectPlatformForLogin'
+      );
       subscriptionService.selectPlatformForLogin();
       expect(loginStub).to.be.called;
     });
@@ -848,8 +970,10 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     });
 
     it('should try to decrypt document', () => {
-      const stub = sandbox.stub(subscriptionService.cryptoHandler_,
-          'tryToDecryptDocument');
+      const stub = sandbox.stub(
+        subscriptionService.cryptoHandler_,
+        'tryToDecryptDocument'
+      );
       subscriptionService.resolveEntitlementsToStore_('serviceId', entitlement);
       expect(stub).to.be.calledWith(decryptedDocumentKey);
     });
@@ -864,8 +988,10 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
           test: 'a1',
         },
       });
-      const stub = sandbox.stub(subscriptionService.cryptoHandler_,
-          'tryToDecryptDocument');
+      const stub = sandbox.stub(
+        subscriptionService.cryptoHandler_,
+        'tryToDecryptDocument'
+      );
       subscriptionService.resolveEntitlementsToStore_('serviceId', entitlement);
       expect(stub).to.not.be.called;
     });
@@ -890,8 +1016,9 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
     });
 
     it('should return local reader ID', () => {
-      const stub = sandbox.stub(subscriptionService, 'getReaderId').callsFake(
-          () => Promise.resolve('reader1'));
+      const stub = sandbox
+        .stub(subscriptionService, 'getReaderId')
+        .callsFake(() => Promise.resolve('reader1'));
       return subscriptionService.getAccessReaderId().then(readerId => {
         expect(readerId).to.equal('reader1');
         expect(stub).to.be.calledOnce.calledWith('local');
@@ -900,20 +1027,22 @@ describes.fakeWin('AmpSubscriptions', {amp: true}, env => {
 
     it('should resolve authdata from local service', () => {
       platformStore.resolveEntitlement('local', entitlement);
-      return expect(subscriptionService.getAuthdataField('data.test'))
-          .to.eventually.equal('a1');
+      return expect(
+        subscriptionService.getAuthdataField('data.test')
+      ).to.eventually.equal('a1');
     });
 
     it('should resolve authdata for a standard field', () => {
       platformStore.resolveEntitlement('local', entitlement);
-      return expect(subscriptionService.getAuthdataField('grantReason'))
-          .to.eventually.equal('SUBSCRIBER');
+      return expect(
+        subscriptionService.getAuthdataField('grantReason')
+      ).to.eventually.equal('SUBSCRIBER');
     });
 
     it('should resolve authdata for an unknown value', () => {
       platformStore.resolveEntitlement('local', entitlement);
-      return expect(subscriptionService.getAuthdataField('data.other'))
-          .to.eventually.be.undefined;
+      return expect(subscriptionService.getAuthdataField('data.other')).to
+        .eventually.be.undefined;
     });
   });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-analytics.js b/extensions/amp-subscriptions/0.1/test/test-analytics.js
index 0c6dd4decf0f..34bfbb9ee906 100644
--- a/extensions/amp-subscriptions/0.1/test/test-analytics.js
+++ b/extensions/amp-subscriptions/0.1/test/test-analytics.js
@@ -16,7 +16,6 @@
 
 import {SubscriptionAnalytics} from '../analytics';
 
-
 describes.realWin('SubscriptionAnalytics', {amp: true}, env => {
   let analytics;
   let ampdoc;
@@ -42,7 +41,8 @@ describes.realWin('SubscriptionAnalytics', {amp: true}, env => {
     const stub = sandbox.stub(analytics, 'event');
     analytics.actionEvent('service1', 'action1', 'success');
     expect(stub).to.be.calledOnce.calledWith(
-        'subscriptions-action-action1-success',
-        {'serviceId': 'service1'});
+      'subscriptions-action-action1-success',
+      {'serviceId': 'service1'}
+    );
   });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js b/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
index 20e0104ca005..12f55a7b6262 100644
--- a/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
+++ b/extensions/amp-subscriptions/0.1/test/test-crypto-handler.js
@@ -14,101 +14,107 @@
  * limitations under the License.
  */
 
-
 import {CryptoHandler} from '../crypto-handler';
 
-describes.realWin('crypto handler', {
-  amp: true,
-},
-env => {
-  let win;
-  let ampdoc;
-  let cryptDiv1;
-  let cryptDiv2;
-  let cryptoHandler;
-  const serviceConfig = {
-    services: [
-      {
-        authorizationUrl: 'https://lipsum.com/authorize',
-        actions: {
-          subscribe: 'https://lipsum.com/subscribe',
-          login: 'https://lipsum.com/login',
+describes.realWin(
+  'crypto handler',
+  {
+    amp: true,
+  },
+  env => {
+    let win;
+    let ampdoc;
+    let cryptDiv1;
+    let cryptDiv2;
+    let cryptoHandler;
+    const serviceConfig = {
+      services: [
+        {
+          authorizationUrl: 'https://lipsum.com/authorize',
+          actions: {
+            subscribe: 'https://lipsum.com/subscribe',
+            login: 'https://lipsum.com/login',
+          },
         },
-      },
-    ],
-  };
-  // eslint-disable-next-line max-len
-  const encryptedLocalKey = 'ENCRYPT({"accessRequirements": ["googleAccessRequirements:123"], "key":"googlePublickey"})';
-  // eslint-disable-next-line max-len
-  const encryptedGoogleKey = 'ENCRYPT({\"accessRequirements\": [\"googleAccessRequirements:123\"], \"key\":\"googlePublickey\"})';
-  const encryptedKeys = {
-    'local': encryptedLocalKey,
-    'google.com': encryptedGoogleKey,
-  };
-
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    win = env.win;
-    ampdoc = env.ampdoc;
+      ],
+    };
+    // eslint-disable-next-line max-len
+    const encryptedLocalKey =
+      'ENCRYPT({"accessRequirements": ["googleAccessRequirements:123"], "key":"googlePublickey"})';
+    // eslint-disable-next-line max-len
+    const encryptedGoogleKey =
+      'ENCRYPT({"accessRequirements": ["googleAccessRequirements:123"], "key":"googlePublickey"})';
+    const encryptedKeys = {
+      'local': encryptedLocalKey,
+      'google.com': encryptedGoogleKey,
+    };
 
-    const element = win.document.createElement('script');
-    element.id = 'amp-subscriptions';
-    element.setAttribute('type', 'application/json');
-    element.textContent = JSON.stringify(serviceConfig);
-    win.document.head.appendChild(element);
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      win = env.win;
+      ampdoc = env.ampdoc;
 
-    // Putting encrypted keys script into the doc head.
-    const keyScript = win.document.createElement('script');
-    keyScript.setAttribute('cryptokeys', '');
-    keyScript.setAttribute('type', 'application/json');
-    keyScript.textContent = JSON.stringify(encryptedKeys);
-    win.document.head.appendChild(keyScript);
+      const element = win.document.createElement('script');
+      element.id = 'amp-subscriptions';
+      element.setAttribute('type', 'application/json');
+      element.textContent = JSON.stringify(serviceConfig);
+      win.document.head.appendChild(element);
 
-    // Create encrypted content in the document body.
-    const crypt1 = win.document.createElement('script');
-    crypt1.setAttribute('encrypted', '');
-    crypt1.setAttribute('type', 'application/octet-stream');
-    crypt1.textContent = JSON.stringify('ENCRYPT(\"Premium content 1\")');
-    cryptDiv1 = win.document.createElement('div');
-    cryptDiv1.appendChild(crypt1);
-    win.document.body.appendChild(cryptDiv1);
+      // Putting encrypted keys script into the doc head.
+      const keyScript = win.document.createElement('script');
+      keyScript.setAttribute('cryptokeys', '');
+      keyScript.setAttribute('type', 'application/json');
+      keyScript.textContent = JSON.stringify(encryptedKeys);
+      win.document.head.appendChild(keyScript);
 
-    // Create encrypted content in the document body.
-    const crypt2 = win.document.createElement('script');
-    crypt2.setAttribute('encrypted', '');
-    crypt2.setAttribute('type', 'application/octet-stream');
-    crypt2.textContent = JSON.stringify('ENCRYPT(\"Premium content 2\")');
-    cryptDiv2 = win.document.createElement('div');
-    cryptDiv2.appendChild(crypt2);
-    win.document.body.appendChild(cryptDiv2);
+      // Create encrypted content in the document body.
+      const crypt1 = win.document.createElement('script');
+      crypt1.setAttribute('encrypted', '');
+      crypt1.setAttribute('type', 'application/octet-stream');
+      crypt1.textContent = JSON.stringify('ENCRYPT("Premium content 1")');
+      cryptDiv1 = win.document.createElement('div');
+      cryptDiv1.appendChild(crypt1);
+      win.document.body.appendChild(cryptDiv1);
 
-    cryptoHandler = new CryptoHandler(ampdoc);
-  });
+      // Create encrypted content in the document body.
+      const crypt2 = win.document.createElement('script');
+      crypt2.setAttribute('encrypted', '');
+      crypt2.setAttribute('type', 'application/octet-stream');
+      crypt2.textContent = JSON.stringify('ENCRYPT("Premium content 2")');
+      cryptDiv2 = win.document.createElement('div');
+      cryptDiv2.appendChild(crypt2);
+      win.document.body.appendChild(cryptDiv2);
 
-  describe('getEncryptedDocumentKey', () => {
-    it('should return null when there are no keys', () => {
-      return expect(cryptoHandler.getEncryptedDocumentKey()).to.be.null;
+      cryptoHandler = new CryptoHandler(ampdoc);
     });
 
-    it('should return null when call doesnt match keys', () => {
-      return expect(cryptoHandler.getEncryptedDocumentKey(
-          'doesntExist')).to.be.null;
-    });
+    describe('getEncryptedDocumentKey', () => {
+      it('should return null when there are no keys', () => {
+        return expect(cryptoHandler.getEncryptedDocumentKey()).to.be.null;
+      });
+
+      it('should return null when call doesnt match keys', () => {
+        return expect(cryptoHandler.getEncryptedDocumentKey('doesntExist')).to
+          .be.null;
+      });
 
-    it('should return expected value to a matching key', () => {
-      return expect(cryptoHandler.getEncryptedDocumentKey(
-          'local')).to.equal(encryptedLocalKey);
+      it('should return expected value to a matching key', () => {
+        return expect(cryptoHandler.getEncryptedDocumentKey('local')).to.equal(
+          encryptedLocalKey
+        );
+      });
     });
-  });
 
-  describe('tryToDecryptDocument', () => {
-    // eslint-disable-next-line max-len
-    it('should replace the encrypted content with decrypted content in multiple sections', () => {
-      return cryptoHandler.tryToDecryptDocument(
-          'decryptedDocumentKey').then(() => {
-        expect(cryptDiv1.textContent).to.equal(' abc ');
-        expect(cryptDiv2.textContent).to.equal(' abc ');
+    describe('tryToDecryptDocument', () => {
+      // eslint-disable-next-line max-len
+      it('should replace the encrypted content with decrypted content in multiple sections', () => {
+        return cryptoHandler
+          .tryToDecryptDocument('decryptedDocumentKey')
+          .then(() => {
+            expect(cryptDiv1.textContent).to.equal(' abc ');
+            expect(cryptDiv2.textContent).to.equal(' abc ');
+          });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-subscriptions/0.1/test/test-dialog.js b/extensions/amp-subscriptions/0.1/test/test-dialog.js
index 48f5d74f7035..afe31b08ae5b 100644
--- a/extensions/amp-subscriptions/0.1/test/test-dialog.js
+++ b/extensions/amp-subscriptions/0.1/test/test-dialog.js
@@ -20,7 +20,6 @@ import {Services} from '../../../../src/services';
 import {createElementWithAttributes} from '../../../../src/dom';
 import {installStylesForDoc} from '../../../../src/style-installer';
 
-
 describes.realWin('AmpSubscriptions Dialog', {amp: true}, env => {
   let win, doc, ampdoc;
   let dialog;
@@ -45,10 +44,10 @@ describes.realWin('AmpSubscriptions Dialog', {amp: true}, env => {
   });
 
   it('should construct correctly', () => {
-    expect(dialog.getRoot().tagName.toLowerCase())
-        .to.equal('amp-subscriptions-dialog');
-    expect(dialog.getRoot().getAttribute('role'))
-        .to.equal('dialog');
+    expect(dialog.getRoot().tagName.toLowerCase()).to.equal(
+      'amp-subscriptions-dialog'
+    );
+    expect(dialog.getRoot().getAttribute('role')).to.equal('dialog');
     expect(dialog.getRoot().parentNode).to.equal(doc.body);
     expect(dialog.closeButton_).to.have.display('none');
 
@@ -60,27 +59,31 @@ describes.realWin('AmpSubscriptions Dialog', {amp: true}, env => {
   it('should open content when invisible', () => {
     const promise = dialog.open(content, false);
     expect(dialog.getRoot()).to.have.display('none');
-    return vsync.mutatePromise(() => {}).then(() => {
-      // First vsync displays the dialog.
-      expect(content.parentNode).to.equal(dialog.getRoot());
-      expect(dialog.isVisible()).to.be.true;
-      expect(dialog.getRoot()).to.have.display('block');
-      const styles = getComputedStyle(dialog.getRoot());
-      expect(styles.transform).to.contain('17');
-      return promise;
-    }).then(() => vsync.mutatePromise(() => {})).then(() => {
-      expect(dialog.getRoot()).to.have.display('block');
-      const styles = getComputedStyle(dialog.getRoot());
-      expect(styles.transform).to.not.contain('17');
-      expect(dialog.closeButton_).to.have.display('none');
-      expect(updatePaddingSpy).to.be.calledOnce.calledWith(17);
-      // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
-      // conflict is resolved.
-      // expect(addToFixedLayerSpy).to.be.calledOnce
-      //     .calledWith(dialog.getRoot());
-      expect(addToFixedLayerSpy).to.not.be.called;
-      expect(dialog.isVisible()).to.be.true;
-    });
+    return vsync
+      .mutatePromise(() => {})
+      .then(() => {
+        // First vsync displays the dialog.
+        expect(content.parentNode).to.equal(dialog.getRoot());
+        expect(dialog.isVisible()).to.be.true;
+        expect(dialog.getRoot()).to.have.display('block');
+        const styles = getComputedStyle(dialog.getRoot());
+        expect(styles.transform).to.contain('17');
+        return promise;
+      })
+      .then(() => vsync.mutatePromise(() => {}))
+      .then(() => {
+        expect(dialog.getRoot()).to.have.display('block');
+        const styles = getComputedStyle(dialog.getRoot());
+        expect(styles.transform).to.not.contain('17');
+        expect(dialog.closeButton_).to.have.display('none');
+        expect(updatePaddingSpy).to.be.calledOnce.calledWith(17);
+        // TODO(dvoytenko, #20608): add to fixed layer, once the SwG/FL
+        // conflict is resolved.
+        // expect(addToFixedLayerSpy).to.be.calledOnce
+        //     .calledWith(dialog.getRoot());
+        expect(addToFixedLayerSpy).to.not.be.called;
+        expect(dialog.isVisible()).to.be.true;
+      });
   });
 
   it('should re-open content when visible', () => {
@@ -88,41 +91,51 @@ describes.realWin('AmpSubscriptions Dialog', {amp: true}, env => {
       style: 'height:21px',
     });
     const promise = dialog.open(content2, false);
-    return vsync.mutatePromise(() => {}).then(() => {
-      expect(content2.parentNode).to.equal(dialog.getRoot());
-      return promise;
-    }).then(() => {
-      expect(content2.parentNode).to.equal(dialog.getRoot());
-      expect(content.parentNode).to.be.null;
-      expect(dialog.getRoot()).to.have.display('block');
-      const styles = getComputedStyle(dialog.getRoot());
-      expect(styles.transform).to.not.contain('21');
-    });
+    return vsync
+      .mutatePromise(() => {})
+      .then(() => {
+        expect(content2.parentNode).to.equal(dialog.getRoot());
+        return promise;
+      })
+      .then(() => {
+        expect(content2.parentNode).to.equal(dialog.getRoot());
+        expect(content.parentNode).to.be.null;
+        expect(dialog.getRoot()).to.have.display('block');
+        const styles = getComputedStyle(dialog.getRoot());
+        expect(styles.transform).to.not.contain('21');
+      });
   });
 
   it('should close', () => {
-    return dialog.open(content, false).then(() => {
-      expect(content.parentNode).to.equal(dialog.getRoot());
-      expect(dialog.getRoot()).to.have.display('block');
-      return dialog.close();
-    }).then(() => {
-      expect(dialog.getRoot()).to.have.display('none');
-      expect(dialog.isVisible()).to.be.false;
-      expect(content.parentNode).to.equal(dialog.getRoot());
-      expect(dialog.getRoot().parentNode).to.equal(doc.body);
-    });
+    return dialog
+      .open(content, false)
+      .then(() => {
+        expect(content.parentNode).to.equal(dialog.getRoot());
+        expect(dialog.getRoot()).to.have.display('block');
+        return dialog.close();
+      })
+      .then(() => {
+        expect(dialog.getRoot()).to.have.display('none');
+        expect(dialog.isVisible()).to.be.false;
+        expect(content.parentNode).to.equal(dialog.getRoot());
+        expect(dialog.getRoot().parentNode).to.equal(doc.body);
+      });
   });
 
   it('should re-open after close', () => {
-    return dialog.open(content, false).then(() => {
-      expect(dialog.isVisible()).to.be.true;
-      return dialog.close();
-    }).then(() => {
-      expect(dialog.isVisible()).to.be.false;
-      return dialog.open(content, false);
-    }).then(() => {
-      expect(dialog.isVisible()).to.be.true;
-    });
+    return dialog
+      .open(content, false)
+      .then(() => {
+        expect(dialog.isVisible()).to.be.true;
+        return dialog.close();
+      })
+      .then(() => {
+        expect(dialog.isVisible()).to.be.false;
+        return dialog.open(content, false);
+      })
+      .then(() => {
+        expect(dialog.isVisible()).to.be.true;
+      });
   });
 
   it('should show close button', () => {
diff --git a/extensions/amp-subscriptions/0.1/test/test-doc-impl.js b/extensions/amp-subscriptions/0.1/test/test-doc-impl.js
index 6164c630e3ca..b4d73773df65 100644
--- a/extensions/amp-subscriptions/0.1/test/test-doc-impl.js
+++ b/extensions/amp-subscriptions/0.1/test/test-doc-impl.js
@@ -16,7 +16,6 @@
 
 import {DocImpl} from '../doc-impl';
 
-
 describes.realWin('DocImpl', {amp: true}, env => {
   let ampdoc;
   let configDoc;
@@ -29,8 +28,9 @@ describes.realWin('DocImpl', {amp: true}, env => {
   it('should proxy inteface to ampdoc', () => {
     expect(configDoc.getWin()).to.equal(ampdoc.win);
     expect(configDoc.getRootNode()).to.equal(ampdoc.getRootNode());
-    expect(configDoc.getRootElement())
-        .to.equal(ampdoc.getRootNode().documentElement);
+    expect(configDoc.getRootElement()).to.equal(
+      ampdoc.getRootNode().documentElement
+    );
     expect(configDoc.getHead()).to.equal(ampdoc.getHeadNode());
   });
 
diff --git a/extensions/amp-subscriptions/0.1/test/test-entitlement.js b/extensions/amp-subscriptions/0.1/test/test-entitlement.js
index 9b30cdfdf42e..c52f444ce7eb 100644
--- a/extensions/amp-subscriptions/0.1/test/test-entitlement.js
+++ b/extensions/amp-subscriptions/0.1/test/test-entitlement.js
@@ -16,7 +16,6 @@
 
 import {Entitlement, GrantReason} from '../entitlement';
 
-
 describes.realWin('EntitlementClass', {}, () => {
   const service = 'sample-service';
   const source = 'sample-source';
@@ -34,8 +33,14 @@ describes.realWin('EntitlementClass', {}, () => {
 
   it('should give json representation of the object', () => {
     const raw = 'raw';
-    const entitlement = new Entitlement({source, raw, service, granted,
-      grantReason, dataObject});
+    const entitlement = new Entitlement({
+      source,
+      raw,
+      service,
+      granted,
+      grantReason,
+      dataObject,
+    });
     expect(entitlement.json()).to.deep.equal({
       service,
       source,
@@ -48,8 +53,15 @@ describes.realWin('EntitlementClass', {}, () => {
   it('should not return the decrypted key in the json', () => {
     const raw = 'raw';
     const decryptedDocumentKey = 'decryptedDocumentKey';
-    const entitlement = new Entitlement({source, raw, service, granted,
-      grantReason, dataObject, decryptedDocumentKey});
+    const entitlement = new Entitlement({
+      source,
+      raw,
+      service,
+      granted,
+      grantReason,
+      dataObject,
+      decryptedDocumentKey,
+    });
     expect(entitlement.json().decryptedDocumentKey).to.be.undefined;
     expect(entitlement.decryptedDocumentKey).to.equal(decryptedDocumentKey);
   });
@@ -89,10 +101,17 @@ describes.realWin('EntitlementClass', {}, () => {
 
   it('should return raw, granStatus and source for pingback', () => {
     const raw = 'raw';
-    const entitlement = new Entitlement({source, raw, service, granted,
-      grantReason, dataObject});
+    const entitlement = new Entitlement({
+      source,
+      raw,
+      service,
+      granted,
+      grantReason,
+      dataObject,
+    });
     const pingbackData = entitlement.jsonForPingback();
     expect(pingbackData).to.deep.equal(
-        Object.assign({raw}, entitlement.json()));
+      Object.assign({raw}, entitlement.json())
+    );
   });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js b/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
index a75f0f16aa0b..1afc221bb389 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscription-rendering.js
@@ -15,9 +15,7 @@
  */
 import {Dialog} from '../dialog';
 import {Entitlement} from '../entitlement';
-import {
-  LocalSubscriptionPlatformRenderer,
-} from '../local-subscription-platform-renderer';
+import {LocalSubscriptionPlatformRenderer} from '../local-subscription-platform-renderer';
 import {ServiceAdapter} from '../service-adapter';
 import {Services} from '../../../../src/services';
 import {createElementWithAttributes} from '../../../../src/dom';
@@ -35,7 +33,10 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
     dialog = new Dialog(ampdoc);
     serviceAdapter = new ServiceAdapter(null);
     renderer = new LocalSubscriptionPlatformRenderer(
-        ampdoc, dialog, serviceAdapter);
+      ampdoc,
+      dialog,
+      serviceAdapter
+    );
     const serviceIds = ['service1', 'service2'];
     entitlementsForService1 = new Entitlement({
       service: serviceIds[0],
@@ -45,14 +46,17 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
   });
 
   describe('render method', () => {
-    it('should call renderActions_ and renderDialog with '
-        + 'the entitlements provided', () => {
-      const actionRenderStub = sandbox.stub(renderer, 'renderActions_');
-      const dialogRenderStub = sandbox.stub(renderer, 'renderDialog_');
-      renderer.render(entitlementsForService1);
-      expect(actionRenderStub).to.be.calledWith(entitlementsForService1);
-      expect(dialogRenderStub).to.be.calledWith(entitlementsForService1);
-    });
+    it(
+      'should call renderActions_ and renderDialog with ' +
+        'the entitlements provided',
+      () => {
+        const actionRenderStub = sandbox.stub(renderer, 'renderActions_');
+        const dialogRenderStub = sandbox.stub(renderer, 'renderDialog_');
+        renderer.render(entitlementsForService1);
+        expect(actionRenderStub).to.be.calledWith(entitlementsForService1);
+        expect(dialogRenderStub).to.be.calledWith(entitlementsForService1);
+      }
+    );
   });
 
   describe('action rendering', () => {
@@ -73,9 +77,7 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
         'subscriptions-service': 'service',
         'subscriptions-decorate': '',
       });
-      elements = [
-        actions1, actions2,
-      ];
+      elements = [actions1, actions2];
       elements.forEach(element => {
         doc.body.appendChild(element);
       });
@@ -93,9 +95,12 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
       elements.forEach(element => {
         const shouldBeDisplayed = array.includes(element);
         expect(isDisplayed(element)).to.equal(
-            shouldBeDisplayed,
-            'Expected ' + element.id + ' to be ' +
-            (shouldBeDisplayed ? 'displayed' : 'not displayed'));
+          shouldBeDisplayed,
+          'Expected ' +
+            element.id +
+            ' to be ' +
+            (shouldBeDisplayed ? 'displayed' : 'not displayed')
+        );
       });
     }
 
@@ -113,12 +118,15 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
     });
 
     it('should hide sections on reset', () => {
-      return renderer.render({subscribed: true}).then(() => {
-        displayed([actions2]);
-        return renderer.reset();
-      }).then(() => {
-        displayed([]);
-      });
+      return renderer
+        .render({subscribed: true})
+        .then(() => {
+          displayed([actions2]);
+          return renderer.reset();
+        })
+        .then(() => {
+          displayed([]);
+        });
     });
   });
 
@@ -165,12 +173,16 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
     it('should render an element', () => {
       templatesMock.expects('renderTemplate').never();
       let content;
-      dialogMock.expects('open')
-          .withExactArgs(sinon.match(arg => {
+      dialogMock
+        .expects('open')
+        .withExactArgs(
+          sinon.match(arg => {
             content = arg;
             return true;
-          }), true)
-          .once();
+          }),
+          true
+        )
+        .once();
       return renderer.renderDialog_({value: 'A'}).then(() => {
         expect(content.id).to.equal('dialog1');
         expect(content.textContent).to.equal('dialog1');
@@ -183,17 +195,22 @@ describes.realWin('local-subscriptions-rendering', {amp: true}, env => {
     it('should render a template', () => {
       const rendered = createElementWithAttributes(doc, 'div', {});
       const data = {value: 'B'};
-      templatesMock.expects('renderTemplate')
-          .withExactArgs(dialog2, data)
-          .returns(Promise.resolve(rendered))
-          .once();
+      templatesMock
+        .expects('renderTemplate')
+        .withExactArgs(dialog2, data)
+        .returns(Promise.resolve(rendered))
+        .once();
       let content;
-      dialogMock.expects('open')
-          .withExactArgs(sinon.match(arg => {
+      dialogMock
+        .expects('open')
+        .withExactArgs(
+          sinon.match(arg => {
             content = arg;
             return true;
-          }), true)
-          .once();
+          }),
+          true
+        )
+        .once();
       return renderer.renderDialog_(data).then(() => {
         expect(content).to.equal(rendered);
       });
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
index 96c0cdd75968..7f5bed73dae8 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions-iframe-platform.js
@@ -16,17 +16,13 @@
 
 import {Dialog} from '../dialog';
 import {Entitlement} from '../entitlement';
-import {
-  LocalSubscriptionIframePlatform,
-} from '../local-subscription-platform-iframe';
+import {LocalSubscriptionIframePlatform} from '../local-subscription-platform-iframe';
 import {Messenger} from '../../../amp-access/0.1/iframe-api/messenger';
 import {PageConfig} from '../../../../third_party/subscriptions-project/config';
 import {ServiceAdapter} from '../service-adapter';
 import {SubscriptionAnalytics} from '../analytics';
 import {UrlBuilder} from '../url-builder';
-import {
-  localSubscriptionPlatformFactory,
-} from '../local-subscription-platform';
+import {localSubscriptionPlatformFactory} from '../local-subscription-platform';
 
 describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
   let ampdoc;
@@ -48,14 +44,18 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
     serviceAdapter = new ServiceAdapter(null);
     const analytics = new SubscriptionAnalytics(ampdoc.getRootNode());
     sandbox.stub(serviceAdapter, 'getAnalytics').callsFake(() => analytics);
-    sandbox.stub(serviceAdapter, 'getPageConfig')
-        .callsFake(() => new PageConfig('example.org:basic', true));
-    sandbox.stub(serviceAdapter, 'getDialog')
-        .callsFake(() => new Dialog(ampdoc));
-    sandbox.stub(serviceAdapter, 'getReaderId')
-        .callsFake(() => Promise.resolve('reader1'));
-    sandbox.stub(serviceAdapter, 'getEncryptedDocumentKey')
-        .callsFake(() => null);
+    sandbox
+      .stub(serviceAdapter, 'getPageConfig')
+      .callsFake(() => new PageConfig('example.org:basic', true));
+    sandbox
+      .stub(serviceAdapter, 'getDialog')
+      .callsFake(() => new Dialog(ampdoc));
+    sandbox
+      .stub(serviceAdapter, 'getReaderId')
+      .callsFake(() => Promise.resolve('reader1'));
+    sandbox
+      .stub(serviceAdapter, 'getEncryptedDocumentKey')
+      .callsFake(() => null);
     serviceConfig.services = [
       {
         'type': 'iframe',
@@ -92,70 +92,98 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
   });
 
   it('initializeListeners_ should listen to clicks on rootNode', () => {
-    localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-        serviceConfig.services[0], serviceAdapter);
-    const domStub = sandbox.stub(localSubscriptionPlatform.rootNode_,
-        'addEventListener');
+    localSubscriptionPlatform = localSubscriptionPlatformFactory(
+      ampdoc,
+      serviceConfig.services[0],
+      serviceAdapter
+    );
+    const domStub = sandbox.stub(
+      localSubscriptionPlatform.rootNode_,
+      'addEventListener'
+    );
 
     localSubscriptionPlatform.initializeListeners_();
     expect(domStub).calledOnce;
-    expect(domStub.getCall(0).args[0])
-        .to.be.equals('click');
+    expect(domStub.getCall(0).args[0]).to.be.equals('click');
   });
 
   it('should return baseScore', () => {
-    localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-        serviceConfig.services[0], serviceAdapter);
+    localSubscriptionPlatform = localSubscriptionPlatformFactory(
+      ampdoc,
+      serviceConfig.services[0],
+      serviceAdapter
+    );
     expect(localSubscriptionPlatform.getBaseScore()).to.be.equal(99);
   });
 
   it('Should not allow prerender', () => {
-    localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-        serviceConfig.services[0], serviceAdapter);
+    localSubscriptionPlatform = localSubscriptionPlatformFactory(
+      ampdoc,
+      serviceConfig.services[0],
+      serviceAdapter
+    );
     expect(localSubscriptionPlatform.isPrerenderSafe()).to.be.false;
   });
 
   describe('config', () => {
     it('only trigger if "iframeSrc" is present', () => {
       expect(
-          localSubscriptionPlatformFactory(ampdoc,
-              serviceConfig.services[0], serviceAdapter)
+        localSubscriptionPlatformFactory(
+          ampdoc,
+          serviceConfig.services[0],
+          serviceAdapter
+        )
       ).to.be.instanceOf(LocalSubscriptionIframePlatform);
     });
 
-    it('error if type is iframe and "iframeSrc" is missing',
-        () => {
-          delete serviceConfig.services[0]['iframeSrc'];
-          allowConsoleError(() => { expect(() => {
-            localSubscriptionPlatformFactory(ampdoc,
-                serviceConfig.services[0], serviceAdapter);
-          }).to.throw(/"iframeSrc" URL must be specified​​​/);
-          });
-        });
+    it('error if type is iframe and "iframeSrc" is missing', () => {
+      delete serviceConfig.services[0]['iframeSrc'];
+      allowConsoleError(() => {
+        expect(() => {
+          localSubscriptionPlatformFactory(
+            ampdoc,
+            serviceConfig.services[0],
+            serviceAdapter
+          );
+        }).to.throw(/"iframeSrc" URL must be specified​​​/);
+      });
+    });
 
     it('should require "iframeSrc" to be secure', () => {
       serviceConfig.services[0]['iframeSrc'] = 'http://acme.com/iframe';
-      allowConsoleError(() => { expect(() => {
-        localSubscriptionPlatformFactory(ampdoc,
-            serviceConfig.services[0], serviceAdapter);
-      }).to.throw(/https/); });
+      allowConsoleError(() => {
+        expect(() => {
+          localSubscriptionPlatformFactory(
+            ampdoc,
+            serviceConfig.services[0],
+            serviceAdapter
+          );
+        }).to.throw(/https/);
+      });
     });
 
     it('should disallow non-array vars', () => {
       serviceConfig.services[0]['iframeVars'] = 'foo';
-      allowConsoleError(() => { expect(() => {
-        localSubscriptionPlatformFactory(ampdoc,
-            serviceConfig.services[0], serviceAdapter);
-      }).to.throw(/array/); });
+      allowConsoleError(() => {
+        expect(() => {
+          localSubscriptionPlatformFactory(
+            ampdoc,
+            serviceConfig.services[0],
+            serviceAdapter
+          );
+        }).to.throw(/array/);
+      });
     });
   });
 
-
   describe('runtime connect', () => {
     it('should NOT connect until necessary', () => {
       const connectStub = sandbox.stub(Messenger.prototype, 'connect');
-      localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-          serviceConfig.services[0], serviceAdapter);
+      localSubscriptionPlatform = localSubscriptionPlatformFactory(
+        ampdoc,
+        serviceConfig.services[0],
+        serviceAdapter
+      );
       expect(localSubscriptionPlatform.connectedPromise_).to.be.null;
       expect(localSubscriptionPlatform.iframe_.parentNode).to.be.null;
       expect(connectStub).to.not.be.called;
@@ -163,8 +191,11 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
 
     it('should connect on first and only first authorize', () => {
       const connectStub = sandbox.stub(Messenger.prototype, 'connect');
-      localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-          serviceConfig.services[0], serviceAdapter);
+      localSubscriptionPlatform = localSubscriptionPlatformFactory(
+        ampdoc,
+        serviceConfig.services[0],
+        serviceAdapter
+      );
       localSubscriptionPlatform.getEntitlements();
       expect(localSubscriptionPlatform.connectedPromise_).to.not.be.null;
       expect(localSubscriptionPlatform.iframe_.parentNode).to.not.be.null;
@@ -172,41 +203,51 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
     });
 
     it('should resolve vars', () => {
-      builderMock.expects('collectUrlVars')
-          .withExactArgs('VAR1&VAR2', false)
-          .returns(Promise.resolve({
+      builderMock
+        .expects('collectUrlVars')
+        .withExactArgs('VAR1&VAR2', false)
+        .returns(
+          Promise.resolve({
             'VAR1': 'A',
             'VAR2': 'B',
-          }))
-          .once();
+          })
+        )
+        .once();
       const expectedConfigWithVars = Object.assign({}, expectedConfig);
       expectedConfigWithVars.config.iframeVars = {VAR1: 'A', VAR2: 'B'};
       serviceConfig.services[0]['iframeVars'] = ['VAR1', 'VAR2'];
-      const localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-          serviceConfig.services[0], serviceAdapter);
-      const sendStub = sandbox.stub(
-          localSubscriptionPlatform.messenger_, 'sendCommandRsvp')
-          .returns(Promise.resolve({}));
+      const localSubscriptionPlatform = localSubscriptionPlatformFactory(
+        ampdoc,
+        serviceConfig.services[0],
+        serviceAdapter
+      );
+      const sendStub = sandbox
+        .stub(localSubscriptionPlatform.messenger_, 'sendCommandRsvp')
+        .returns(Promise.resolve({}));
       const promise = localSubscriptionPlatform.connect();
       localSubscriptionPlatform.handleCommand_('connect');
 
       return promise.then(() => {
         expect(sendStub).to.be.calledOnce;
-        expect(sendStub).to.be
-            .calledWithExactly('start', expectedConfigWithVars);
+        expect(sendStub).to.be.calledWithExactly(
+          'start',
+          expectedConfigWithVars
+        );
       });
     });
   });
 
-
   describe('runtime', () => {
     let messengerMock;
     let localSubscriptionPlatform;
 
     beforeEach(() => {
       messengerMock = sandbox.mock(Messenger.prototype);
-      localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-          serviceConfig.services[0], serviceAdapter);
+      localSubscriptionPlatform = localSubscriptionPlatformFactory(
+        ampdoc,
+        serviceConfig.services[0],
+        serviceAdapter
+      );
     });
 
     afterEach(() => {
@@ -219,22 +260,26 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
 
     describe('getEntitlements', () => {
       beforeEach(() => {
-        messengerMock.expects('sendCommandRsvp')
-            .withExactArgs('start', expectedConfig)
-            .returns(Promise.resolve())
-            .once();
+        messengerMock
+          .expects('sendCommandRsvp')
+          .withExactArgs('start', expectedConfig)
+          .returns(Promise.resolve())
+          .once();
         localSubscriptionPlatform.connect();
         localSubscriptionPlatform.handleCommand_('connect');
       });
 
       it('should return entitlement', () => {
-        messengerMock.expects('sendCommandRsvp')
-            .withExactArgs('authorize', {})
-            .returns(Promise.resolve({
+        messengerMock
+          .expects('sendCommandRsvp')
+          .withExactArgs('authorize', {})
+          .returns(
+            Promise.resolve({
               granted: true,
               grantReason: 'SUBSCRIBER',
-            }))
-            .once();
+            })
+          )
+          .once();
         return localSubscriptionPlatform.getEntitlements().then(result => {
           expect(result).to.be.instanceof(Entitlement);
           expect(result.granted).to.be.true;
@@ -246,19 +291,21 @@ describes.fakeWin('LocalSubscriptionsIframePlatform', {amp: true}, env => {
 
     describe('pingback', () => {
       beforeEach(() => {
-        messengerMock.expects('sendCommandRsvp')
-            .withExactArgs('start', expectedConfig)
-            .returns(Promise.resolve())
-            .once();
+        messengerMock
+          .expects('sendCommandRsvp')
+          .withExactArgs('start', expectedConfig)
+          .returns(Promise.resolve())
+          .once();
         localSubscriptionPlatform.connect();
         localSubscriptionPlatform.handleCommand_('connect');
       });
 
       it('should send pingback', () => {
-        messengerMock.expects('sendCommandRsvp')
-            .withExactArgs('pingback', {entitlement: {}})
-            .returns(Promise.resolve())
-            .once();
+        messengerMock
+          .expects('sendCommandRsvp')
+          .withExactArgs('pingback', {entitlement: {}})
+          .returns(Promise.resolve())
+          .once();
         return localSubscriptionPlatform.pingback({});
       });
     });
diff --git a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
index 5df89950697e..a262d90b6eb0 100644
--- a/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
+++ b/extensions/amp-subscriptions/0.1/test/test-local-subscriptions.js
@@ -62,27 +62,36 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
     serviceAdapter = new ServiceAdapter(null);
     const analytics = new SubscriptionAnalytics(ampdoc.getRootNode());
     sandbox.stub(serviceAdapter, 'getAnalytics').callsFake(() => analytics);
-    sandbox.stub(serviceAdapter, 'getPageConfig')
-        .callsFake(() => new PageConfig('example.org:basic', true));
-    sandbox.stub(serviceAdapter, 'getDialog')
-        .callsFake(() => new Dialog(ampdoc));
-    sandbox.stub(serviceAdapter, 'getReaderId')
-        .callsFake(() => Promise.resolve('reader1'));
-    getEncryptedDocumentKeyStub = sandbox.stub(
-        serviceAdapter, 'getEncryptedDocumentKey')
-        .callsFake(() => {return null;});
-    localSubscriptionPlatform = localSubscriptionPlatformFactory(ampdoc,
-        serviceConfig.services[0], serviceAdapter);
+    sandbox
+      .stub(serviceAdapter, 'getPageConfig')
+      .callsFake(() => new PageConfig('example.org:basic', true));
+    sandbox
+      .stub(serviceAdapter, 'getDialog')
+      .callsFake(() => new Dialog(ampdoc));
+    sandbox
+      .stub(serviceAdapter, 'getReaderId')
+      .callsFake(() => Promise.resolve('reader1'));
+    getEncryptedDocumentKeyStub = sandbox
+      .stub(serviceAdapter, 'getEncryptedDocumentKey')
+      .callsFake(() => {
+        return null;
+      });
+    localSubscriptionPlatform = localSubscriptionPlatformFactory(
+      ampdoc,
+      serviceConfig.services[0],
+      serviceAdapter
+    );
   });
 
   it('initializeListeners_ should listen to clicks on rootNode', () => {
-    const domStub = sandbox.stub(localSubscriptionPlatform.rootNode_,
-        'addEventListener');
+    const domStub = sandbox.stub(
+      localSubscriptionPlatform.rootNode_,
+      'addEventListener'
+    );
 
     localSubscriptionPlatform.initializeListeners_();
     expect(domStub).calledOnce;
-    expect(domStub.getCall(0).args[0])
-        .to.be.equals('click');
+    expect(domStub.getCall(0).args[0]).to.be.equals('click');
   });
 
   it('should return baseScore', () => {
@@ -94,23 +103,25 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
   });
 
   it('should fetch the entitlements on getEntitlements', () => {
-    const fetchStub = sandbox.stub(localSubscriptionPlatform.xhr_, 'fetchJson')
-        .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
+    const fetchStub = sandbox
+      .stub(localSubscriptionPlatform.xhr_, 'fetchJson')
+      .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
     return localSubscriptionPlatform.getEntitlements().then(ent => {
       expect(fetchStub).to.be.calledOnce;
       expect(fetchStub.getCall(0).args[0]).to.be.equals(authUrl);
-      expect(fetchStub.getCall(0).args[1].credentials)
-          .to.be.equals('include');
+      expect(fetchStub.getCall(0).args[1].credentials).to.be.equals('include');
       expect(ent).to.be.instanceof(Entitlement);
     });
   });
 
   it('should buildUrl before fetchingAuth', () => {
     const builtUrl = 'builtUrl';
-    const urlBuildingStub = sandbox.stub(localSubscriptionPlatform.urlBuilder_,
-        'buildUrl').callsFake(() => Promise.resolve(builtUrl));
-    const fetchStub = sandbox.stub(localSubscriptionPlatform.xhr_,'fetchJson')
-        .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
+    const urlBuildingStub = sandbox
+      .stub(localSubscriptionPlatform.urlBuilder_, 'buildUrl')
+      .callsFake(() => Promise.resolve(builtUrl));
+    const fetchStub = sandbox
+      .stub(localSubscriptionPlatform.xhr_, 'fetchJson')
+      .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
     return localSubscriptionPlatform.getEntitlements().then(() => {
       expect(urlBuildingStub).to.be.calledWith(configAuthUrl, false);
       expect(fetchStub).to.be.calledWith(builtUrl, {credentials: 'include'});
@@ -118,28 +129,36 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
   });
 
   it('should call getEncryptedDocumentKey with local', () => {
-    sandbox.stub(localSubscriptionPlatform.xhr_, 'fetchJson')
-        .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
+    sandbox
+      .stub(localSubscriptionPlatform.xhr_, 'fetchJson')
+      .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
     return localSubscriptionPlatform.getEntitlements().then(() => {
       expect(getEncryptedDocumentKeyStub).to.be.calledWith('local');
     });
   });
 
   it('should add encryptedDocumentKey parameter to url', () => {
-    const fetchStub = sandbox.stub(localSubscriptionPlatform.xhr_, 'fetchJson')
-        .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
+    const fetchStub = sandbox
+      .stub(localSubscriptionPlatform.xhr_, 'fetchJson')
+      .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
     getEncryptedDocumentKeyStub.callsFake(() => {
-      return 'encryptedDocumentKey';});
+      return 'encryptedDocumentKey';
+    });
     return localSubscriptionPlatform.getEntitlements().then(() => {
-      return expect(fetchStub).to.be.calledWith('https://lipsum.com/login/authorize?rid=reader1&crypt=encryptedDocumentKey');
+      return expect(fetchStub).to.be.calledWith(
+        'https://lipsum.com/login/authorize?rid=reader1&crypt=encryptedDocumentKey'
+      );
     });
   });
 
   it('should not add encryptedDocumentKey parameter to url', () => {
-    const fetchStub = sandbox.stub(localSubscriptionPlatform.xhr_, 'fetchJson')
-        .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
+    const fetchStub = sandbox
+      .stub(localSubscriptionPlatform.xhr_, 'fetchJson')
+      .callsFake(() => Promise.resolve({json: () => Promise.resolve(json)}));
     return localSubscriptionPlatform.getEntitlements().then(() => {
-      return expect(fetchStub).to.be.calledWith('https://lipsum.com/login/authorize?rid=reader1');
+      return expect(fetchStub).to.be.calledWith(
+        'https://lipsum.com/login/authorize?rid=reader1'
+      );
     });
   });
 
@@ -154,22 +173,27 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
     });
 
     it('should check that login action is present', () => {
-      delete (actionMap['login']);
+      delete actionMap['login'];
       expect(localSubscriptionPlatform.validateActionMap, actionMap).to.throw;
     });
 
     it('should check that subscribe action is present', () => {
-      delete (actionMap['subscribe']);
+      delete actionMap['subscribe'];
       expect(localSubscriptionPlatform.validateActionMap, actionMap).to.throw;
     });
 
-    it('should return actionMap as is if login and subscribe actions'
-        + ' are present', () => {
-      const returnedMap =
-          localSubscriptionPlatform.validateActionMap(actionMap);
-      expect(JSON.stringify(returnedMap)).to.be
-          .equal(JSON.stringify((actionMap)));
-    });
+    it(
+      'should return actionMap as is if login and subscribe actions' +
+        ' are present',
+      () => {
+        const returnedMap = localSubscriptionPlatform.validateActionMap(
+          actionMap
+        );
+        expect(JSON.stringify(returnedMap)).to.be.equal(
+          JSON.stringify(actionMap)
+        );
+      }
+    );
   });
 
   describe('handleClick_', () => {
@@ -182,94 +206,112 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
 
     // This must be a sync call to avoid Safari popup blocker issues.
     it('should call executeAction synchronosly when service is "auto"', () => {
-      const executeStub = sandbox.stub(localSubscriptionPlatform,
-          'executeAction');
+      const executeStub = sandbox.stub(
+        localSubscriptionPlatform,
+        'executeAction'
+      );
       element.setAttribute('subscriptions-service', 'auto');
       localSubscriptionPlatform.handleClick_(element);
       expect(executeStub).to.be.calledWith(
-          element.getAttribute('subscriptions-action'));
+        element.getAttribute('subscriptions-action')
+      );
     });
 
     it('should call executeAction with subscriptions-action value', () => {
-      const executeStub = sandbox.stub(localSubscriptionPlatform,
-          'executeAction');
+      const executeStub = sandbox.stub(
+        localSubscriptionPlatform,
+        'executeAction'
+      );
       localSubscriptionPlatform.handleClick_(element);
       expect(executeStub).to.be.calledWith(
-          element.getAttribute('subscriptions-action'));
+        element.getAttribute('subscriptions-action')
+      );
     });
 
-
-    it('should delegate action to service specified in '
-        + 'subscriptions-service', () => {
-      const executeStub = sandbox.stub(localSubscriptionPlatform,
-          'executeAction');
-      const delegateStub = sandbox.stub(
+    it(
+      'should delegate action to service specified in ' +
+        'subscriptions-service',
+      () => {
+        const executeStub = sandbox.stub(
+          localSubscriptionPlatform,
+          'executeAction'
+        );
+        const delegateStub = sandbox.stub(
           localSubscriptionPlatform.serviceAdapter_,
           'delegateActionToService'
-      );
-      element.setAttribute('subscriptions-service', 'swg.google.com');
-      localSubscriptionPlatform.handleClick_(element);
-      expect(executeStub).to.not.be.called;
-      expect(delegateStub).to.be.called;
-    });
+        );
+        element.setAttribute('subscriptions-service', 'swg.google.com');
+        localSubscriptionPlatform.handleClick_(element);
+        expect(executeStub).to.not.be.called;
+        expect(delegateStub).to.be.called;
+      }
+    );
 
-    it('should delegate service selection to scoreBasedLogin if no service '
-        + 'name is specified for login', () => {
-      element.setAttribute('subscriptions-action', 'login');
-      element.removeAttribute('subscriptions-service');
-      const platform = {};
-      const serviceId = 'serviceId';
-      platform.getServiceId = sandbox.stub().callsFake(() => serviceId);
-      const loginStub = sandbox.stub(
-          localSubscriptionPlatform.serviceAdapter_,
-          'selectPlatformForLogin'
-      ).callsFake(() => platform);
-      const delegateStub = sandbox.stub(
+    it(
+      'should delegate service selection to scoreBasedLogin if no service ' +
+        'name is specified for login',
+      () => {
+        element.setAttribute('subscriptions-action', 'login');
+        element.removeAttribute('subscriptions-service');
+        const platform = {};
+        const serviceId = 'serviceId';
+        platform.getServiceId = sandbox.stub().callsFake(() => serviceId);
+        const loginStub = sandbox
+          .stub(
+            localSubscriptionPlatform.serviceAdapter_,
+            'selectPlatformForLogin'
+          )
+          .callsFake(() => platform);
+        const delegateStub = sandbox.stub(
           localSubscriptionPlatform.serviceAdapter_,
           'delegateActionToService'
-      );
-      localSubscriptionPlatform.handleClick_(element);
-      expect(loginStub).to.be.called;
-      expect(delegateStub).to.be.calledWith(
-          'login',
-          serviceId,
-      );
-    });
+        );
+        localSubscriptionPlatform.handleClick_(element);
+        expect(loginStub).to.be.called;
+        expect(delegateStub).to.be.calledWith('login', serviceId);
+      }
+    );
 
-    it('should delegate service selection to scoreBasedLogin '
-      + 'service specified is auto for login', () => {
-      element.setAttribute('subscriptions-action', 'login');
-      element.setAttribute('subscriptions-service', 'auto');
-      const loginStub = sandbox.stub(
-          localSubscriptionPlatform.serviceAdapter_,
-          'selectPlatformForLogin'
-      ).callsFake(() => platform);
-      const delegateStub = sandbox.stub(
+    it(
+      'should delegate service selection to scoreBasedLogin ' +
+        'service specified is auto for login',
+      () => {
+        element.setAttribute('subscriptions-action', 'login');
+        element.setAttribute('subscriptions-service', 'auto');
+        const loginStub = sandbox
+          .stub(
+            localSubscriptionPlatform.serviceAdapter_,
+            'selectPlatformForLogin'
+          )
+          .callsFake(() => platform);
+        const delegateStub = sandbox.stub(
           localSubscriptionPlatform.serviceAdapter_,
           'delegateActionToService'
-      );
-      const platform = {};
-      const serviceId = 'serviceId';
-      platform.getServiceId = sandbox.stub().callsFake(() => serviceId);
-      localSubscriptionPlatform.handleClick_(element);
-      expect(loginStub).to.be.called;
-      expect(delegateStub).to.be.calledWith(
-          'login',
-          serviceId,
-      );
-    });
+        );
+        const platform = {};
+        const serviceId = 'serviceId';
+        platform.getServiceId = sandbox.stub().callsFake(() => serviceId);
+        localSubscriptionPlatform.handleClick_(element);
+        expect(loginStub).to.be.called;
+        expect(delegateStub).to.be.calledWith('login', serviceId);
+      }
+    );
 
     it('should NOT delegate for scoreBasedLogin for non-login action', () => {
       element.setAttribute('subscriptions-action', 'subscribe');
       element.setAttribute('subscriptions-service', 'auto');
       const loginStub = sandbox.stub(
-          localSubscriptionPlatform.serviceAdapter_,
-          'selectPlatformForLogin');
-      const executeStub = sandbox.stub(localSubscriptionPlatform,
-          'executeAction');
+        localSubscriptionPlatform.serviceAdapter_,
+        'selectPlatformForLogin'
+      );
+      const executeStub = sandbox.stub(
+        localSubscriptionPlatform,
+        'executeAction'
+      );
       const delegateStub = sandbox.stub(
-          localSubscriptionPlatform.serviceAdapter_,
-          'delegateActionToService');
+        localSubscriptionPlatform.serviceAdapter_,
+        'delegateActionToService'
+      );
       const platform = {};
       const serviceId = 'serviceId';
       platform.getServiceId = sandbox.stub().callsFake(() => serviceId);
@@ -283,11 +325,10 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
   describe('executeAction', () => {
     it('should call executeAction on actions_', () => {
       const actionString = 'action';
-      const executeStub =
-        sandbox.stub(localSubscriptionPlatform.actions_, 'execute')
-            .callsFake(() => Promise.resolve(true));
-      const resetStub = sandbox.stub(
-          serviceAdapter, 'resetPlatforms');
+      const executeStub = sandbox
+        .stub(localSubscriptionPlatform.actions_, 'execute')
+        .callsFake(() => Promise.resolve(true));
+      const resetStub = sandbox.stub(serviceAdapter, 'resetPlatforms');
       localSubscriptionPlatform.executeAction(actionString);
       expect(executeStub).to.be.calledWith(actionString);
       return executeStub().then(() => {
@@ -297,18 +338,22 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
   });
 
   describe('render', () => {
-    it('should call renderer\'s render method', () => {
-      const renderStub =
-        sandbox.stub(localSubscriptionPlatform.renderer_, 'render');
+    it("should call renderer's render method", () => {
+      const renderStub = sandbox.stub(
+        localSubscriptionPlatform.renderer_,
+        'render'
+      );
       localSubscriptionPlatform.activate(entitlement);
       return localSubscriptionPlatform.actions_.build().then(() => {
         expect(renderStub).to.be.calledOnce;
       });
     });
 
-    it('should reset renderer\'s on reset', () => {
-      const resetStub =
-        sandbox.stub(localSubscriptionPlatform.renderer_, 'reset');
+    it("should reset renderer's on reset", () => {
+      const resetStub = sandbox.stub(
+        localSubscriptionPlatform.renderer_,
+        'reset'
+      );
       localSubscriptionPlatform.reset();
       expect(resetStub).to.be.calledOnce;
     });
@@ -316,14 +361,16 @@ describes.fakeWin('LocalSubscriptionsPlatform', {amp: true}, env => {
 
   describe('pingback', () => {
     it('should call `sendSignal` to the pingback signal', () => {
-      const sendSignalStub =
-          sandbox.stub(localSubscriptionPlatform.xhr_, 'sendSignal');
+      const sendSignalStub = sandbox.stub(
+        localSubscriptionPlatform.xhr_,
+        'sendSignal'
+      );
       return localSubscriptionPlatform.pingback(entitlement).then(() => {
         expect(sendSignalStub).to.be.calledOnce;
-        expect(sendSignalStub.getCall(0).args[0]).to.be.equal(
-            pingbackUrl);
+        expect(sendSignalStub.getCall(0).args[0]).to.be.equal(pingbackUrl);
         expect(sendSignalStub.getCall(0).args[1].body).to.equal(
-            JSON.stringify(entitlement.jsonForPingback()));
+          JSON.stringify(entitlement.jsonForPingback())
+        );
       });
     });
   });
diff --git a/extensions/amp-subscriptions/0.1/test/test-platform-store.js b/extensions/amp-subscriptions/0.1/test/test-platform-store.js
index 326a673af4cb..4f34b39813cc 100644
--- a/extensions/amp-subscriptions/0.1/test/test-platform-store.js
+++ b/extensions/amp-subscriptions/0.1/test/test-platform-store.js
@@ -23,10 +23,18 @@ import {user} from '../../../../src/log';
 describes.realWin('Platform store', {}, () => {
   let platformStore;
   const serviceIds = ['service1', 'service2'];
-  const entitlementsForService1 = new Entitlement({source: serviceIds[0],
-    raw: '', service: serviceIds[0], granted: true});
-  const entitlementsForService2 = new Entitlement({source: serviceIds[1],
-    raw: '', service: serviceIds[1], granted: false});
+  const entitlementsForService1 = new Entitlement({
+    source: serviceIds[0],
+    raw: '',
+    service: serviceIds[0],
+    granted: true,
+  });
+  const entitlementsForService2 = new Entitlement({
+    source: serviceIds[1],
+    raw: '',
+    service: serviceIds[1],
+    granted: false,
+  });
   const fallbackEntitlement = new Entitlement({
     source: 'local',
     raw: 'raw',
@@ -46,11 +54,15 @@ describes.realWin('Platform store', {}, () => {
   }
 
   beforeEach(() => {
-    platformStore = new PlatformStore(serviceIds, {
-      supportsViewer: 9,
-      testFactor1: 10,
-      testFactor2: 10,
-    }, fallbackEntitlement);
+    platformStore = new PlatformStore(
+      serviceIds,
+      {
+        supportsViewer: 9,
+        testFactor1: 10,
+        testFactor2: 10,
+      },
+      fallbackEntitlement
+    );
   });
 
   it('should instantiate with the service ids', () => {
@@ -71,114 +83,113 @@ describes.realWin('Platform store', {}, () => {
     expect(platformStore.getEntitlementPromiseFor('service2')).to.equal(p);
 
     // Additional resolution doesn't change anything without reset.
-    platformStore.resolveEntitlement('service2', new Entitlement({
-      service: 'service2',
-      granted: true,
-    }));
+    platformStore.resolveEntitlement(
+      'service2',
+      new Entitlement({
+        service: 'service2',
+        granted: true,
+      })
+    );
     expect(platformStore.getEntitlementPromiseFor('service2')).to.equal(p);
     return expect(p).to.eventually.equal(ent);
   });
 
   it('should call onChange callbacks on every resolve', () => {
-    const cb = sandbox.stub(platformStore.onEntitlementResolvedCallbacks_,
-        'fire');
+    const cb = sandbox.stub(
+      platformStore.onEntitlementResolvedCallbacks_,
+      'fire'
+    );
     platformStore.onChange(cb);
-    platformStore.resolveEntitlement('service2',
-        new Entitlement({
-          service: 'service2',
-          granted: false,
-        })
+    platformStore.resolveEntitlement(
+      'service2',
+      new Entitlement({
+        service: 'service2',
+        granted: false,
+      })
     );
     expect(cb).to.be.calledOnce;
   });
 
   describe('getGrantStatus', () => {
     it('should resolve true on recieving a positive entitlement', done => {
-      platformStore.getGrantStatus()
-          .then(entitlements => {
-            if (entitlements === true) {
-              done();
-            } else {
-              throw new Error('Incorrect entitlement resolved');
-            }
-          });
-      platformStore.resolveEntitlement(serviceIds[1],
-          entitlementsForService2);
-      platformStore.resolveEntitlement(serviceIds[0],
-          entitlementsForService1);
+      platformStore.getGrantStatus().then(entitlements => {
+        if (entitlements === true) {
+          done();
+        } else {
+          throw new Error('Incorrect entitlement resolved');
+        }
+      });
+      platformStore.resolveEntitlement(serviceIds[1], entitlementsForService2);
+      platformStore.resolveEntitlement(serviceIds[0], entitlementsForService1);
     });
 
     it('should resolve true for existing positive entitlement', done => {
       platformStore.entitlements_[serviceIds[0]] = entitlementsForService1;
       platformStore.entitlements_[serviceIds[1]] = entitlementsForService2;
-      platformStore.getGrantStatus()
-          .then(entitlements => {
-            if (entitlements === true) {
-              done();
-            } else {
-              throw new Error('Incorrect entitlement resolved');
-            }
-          });
+      platformStore.getGrantStatus().then(entitlements => {
+        if (entitlements === true) {
+          done();
+        } else {
+          throw new Error('Incorrect entitlement resolved');
+        }
+      });
     });
 
     it('should resolve false for negative entitlement', done => {
-      const negativeEntitlements = new Entitlement({source: serviceIds[0],
+      const negativeEntitlements = new Entitlement({
+        source: serviceIds[0],
         raw: '',
         service: serviceIds[0],
       });
       platformStore.entitlements_[serviceIds[0]] = negativeEntitlements;
       platformStore.entitlements_[serviceIds[1]] = entitlementsForService2;
-      platformStore.getGrantStatus()
-          .then(entitlements => {
-            if (entitlements === false) {
-              done();
-            } else {
-              throw new Error('Incorrect entitlement resolved');
-            }
-          });
-    });
-
-    it('should resolve false if all future entitlement '
-        + 'are also negative ', done => {
-      const negativeEntitlements = new Entitlement({source: serviceIds[0],
+      platformStore.getGrantStatus().then(entitlements => {
+        if (entitlements === false) {
+          done();
+        } else {
+          throw new Error('Incorrect entitlement resolved');
+        }
+      });
+    });
+
+    it('should resolve false if all future entitlement are also negative ', done => {
+      const negativeEntitlements = new Entitlement({
+        source: serviceIds[0],
         raw: '',
         service: serviceIds[0],
       });
       platformStore.entitlements_[serviceIds[0]] = negativeEntitlements;
-      platformStore.getGrantStatus()
-          .then(entitlements => {
-            if (entitlements === false) {
-              done();
-            } else {
-              throw new Error('Incorrect entitlement resolved');
-            }
-          });
-      platformStore.resolveEntitlement(serviceIds[1],
-          entitlementsForService2);
+      platformStore.getGrantStatus().then(entitlements => {
+        if (entitlements === false) {
+          done();
+        } else {
+          throw new Error('Incorrect entitlement resolved');
+        }
+      });
+      platformStore.resolveEntitlement(serviceIds[1], entitlementsForService2);
     });
   });
 
   describe('areAllPlatformsResolved_', () => {
     it('should return true if all entitlements are present', () => {
-      platformStore.resolveEntitlement(serviceIds[1],
-          entitlementsForService2);
+      platformStore.resolveEntitlement(serviceIds[1], entitlementsForService2);
       expect(platformStore.areAllPlatformsResolved_()).to.be.equal(false);
-      platformStore.resolveEntitlement(serviceIds[0],
-          entitlementsForService1);
+      platformStore.resolveEntitlement(serviceIds[0], entitlementsForService1);
       expect(platformStore.areAllPlatformsResolved_()).to.be.equal(true);
     });
   });
 
   describe('getAvailablePlatformsEntitlements_', () => {
     it('should return all available entitlements', () => {
-      platformStore.resolveEntitlement(serviceIds[1],
-          entitlementsForService2);
-      expect(platformStore.getAvailablePlatformsEntitlements_())
-          .to.deep.equal([entitlementsForService2]);
-      platformStore.resolveEntitlement(serviceIds[0],
-          entitlementsForService1);
-      expect(platformStore.getAvailablePlatformsEntitlements_())
-          .to.deep.equal([entitlementsForService2, entitlementsForService1]);
+      platformStore.resolveEntitlement(serviceIds[1], entitlementsForService2);
+      expect(platformStore.getAvailablePlatformsEntitlements_()).to.deep.equal([
+        entitlementsForService2,
+      ]);
+      platformStore.resolveEntitlement(serviceIds[0], entitlementsForService1);
+      expect(platformStore.getAvailablePlatformsEntitlements_()).to.deep.equal([
+        entitlementsForService2,
+        entitlementsForService1,
+      ]);
     });
   });
 
@@ -190,46 +201,66 @@ describes.realWin('Platform store', {}, () => {
     beforeEach(() => {
       localPlatform = new SubscriptionPlatform();
       sandbox.stub(localPlatform, 'getServiceId').callsFake(() => 'local');
-      sandbox.stub(localPlatform, 'getBaseScore')
-          .callsFake(() => localPlatformBaseScore);
+      sandbox
+        .stub(localPlatform, 'getBaseScore')
+        .callsFake(() => localPlatformBaseScore);
       anotherPlatform = new SubscriptionPlatform();
       sandbox.stub(anotherPlatform, 'getServiceId').callsFake(() => 'another');
-      sandbox.stub(anotherPlatform, 'getBaseScore')
-          .callsFake(() => anotherPlatformBaseScore);
+      sandbox
+        .stub(anotherPlatform, 'getBaseScore')
+        .callsFake(() => anotherPlatformBaseScore);
       platformStore.resolvePlatform('another', localPlatform);
       platformStore.resolvePlatform('local', anotherPlatform);
     });
     it('should return sorted array of platforms and weights', () => {
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.getAllPlatformWeights_())
-          .to.deep.equal(
-              [{platform: localPlatform, weight: 0},
-                {platform: anotherPlatform, weight: 0}]);
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.getAllPlatformWeights_()).to.deep.equal([
+        {platform: localPlatform, weight: 0},
+        {platform: anotherPlatform, weight: 0},
+      ]);
     });
   });
 
   describe('selectPlatform', () => {
-    it('should call selectApplicablePlatform_ if areAllPlatformsResolved_ '
-        + 'is true', () => {
-      const fakeResult = [entitlementsForService1, entitlementsForService2];
-      const getAllPlatformsStub = sandbox.stub(platformStore,
-          'getAllPlatformsEntitlements_').callsFake(
-          () => Promise.resolve(fakeResult));
-      const selectApplicablePlatformStub = sandbox.stub(platformStore,
-          'selectApplicablePlatform_').callsFake(() => Promise.resolve());
-      return platformStore.selectPlatform(true).then(() => {
-        expect(getAllPlatformsStub).to.be.calledOnce;
-        expect(selectApplicablePlatformStub).to.be.calledOnce;
-      });
-    });
+    it(
+      'should call selectApplicablePlatform_ if areAllPlatformsResolved_ ' +
+        'is true',
+      () => {
+        const fakeResult = [entitlementsForService1, entitlementsForService2];
+        const getAllPlatformsStub = sandbox
+          .stub(platformStore, 'getAllPlatformsEntitlements_')
+          .callsFake(() => Promise.resolve(fakeResult));
+        const selectApplicablePlatformStub = sandbox
+          .stub(platformStore, 'selectApplicablePlatform_')
+          .callsFake(() => Promise.resolve());
+        return platformStore.selectPlatform(true).then(() => {
+          expect(getAllPlatformsStub).to.be.calledOnce;
+          expect(selectApplicablePlatformStub).to.be.calledOnce;
+        });
+      }
+    );
   });
 
   describe('selectApplicablePlatform_', () => {
@@ -240,145 +271,257 @@ describes.realWin('Platform store', {}, () => {
     beforeEach(() => {
       localPlatform = new SubscriptionPlatform();
       sandbox.stub(localPlatform, 'getServiceId').callsFake(() => 'local');
-      sandbox.stub(localPlatform, 'getBaseScore')
-          .callsFake(() => localPlatformBaseScore);
+      sandbox
+        .stub(localPlatform, 'getBaseScore')
+        .callsFake(() => localPlatformBaseScore);
       anotherPlatform = new SubscriptionPlatform();
       sandbox.stub(anotherPlatform, 'getServiceId').callsFake(() => 'another');
-      sandbox.stub(anotherPlatform, 'getBaseScore')
-          .callsFake(() => anotherPlatformBaseScore);
+      sandbox
+        .stub(anotherPlatform, 'getBaseScore')
+        .callsFake(() => anotherPlatformBaseScore);
       platformStore.resolvePlatform('local', localPlatform);
       platformStore.resolvePlatform('another', anotherPlatform);
     });
 
     it('should choose a platform based on subscription', () => {
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local',
-        raw: '',
-        service: 'local',
-        granted: true,
-        grantReason: GrantReason.SUBSCRIBER,
-      }));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another',
-        raw: '',
-        service: 'another',
-      }));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(localPlatform.getServiceId());
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local',
-        raw: '',
-        service: 'local',
-      }));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another',
-        raw: '',
-        service: 'another',
-        granted: true,
-        grantReason: GrantReason.SUBSCRIBER,
-      }));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(anotherPlatform.getServiceId());
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+          granted: true,
+          grantReason: GrantReason.SUBSCRIBER,
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        localPlatform.getServiceId()
+      );
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+          granted: true,
+          grantReason: GrantReason.SUBSCRIBER,
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        anotherPlatform.getServiceId()
+      );
     });
 
     it('should choose local platform if all other conditions are same', () => {
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(localPlatform.getServiceId());
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        localPlatform.getServiceId()
+      );
     });
 
     it('should chose platform based on score weight', () => {
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
       // +9
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'supportsViewer': 1}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(anotherPlatform.getServiceId());
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'supportsViewer': 1})
+        );
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        anotherPlatform.getServiceId()
+      );
     });
 
     it('should chose platform based on multiple factors', () => {
       // +10
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'testFactor1': 1}));
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'testFactor1': 1})
+        );
       // +9
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'supportsViewer': 1}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(localPlatform.getServiceId());
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'supportsViewer': 1})
+        );
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        localPlatform.getServiceId()
+      );
     });
 
     it('should chose platform specified factors', () => {
       // +10
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'testFactor1': 1}));
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'testFactor1': 1})
+        );
       // +9
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'supportsViewer': 1}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_('supporsViewer')
-          .getServiceId())
-          .to.equal(localPlatform.getServiceId());
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'supportsViewer': 1})
+        );
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(
+        platformStore.selectApplicablePlatform_('supporsViewer').getServiceId()
+      ).to.equal(localPlatform.getServiceId());
     });
 
     it('should chose platform handle negative factor values', () => {
       // +10, -10
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {testFactor1: 1, testFactor2: -1}));
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {testFactor1: 1, testFactor2: -1})
+        );
       // +9
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor,
-              {'supportsViewer': 1}));
-
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_().getServiceId())
-          .to.equal(anotherPlatform.getServiceId());
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor =>
+          fakeGetSupportedScoreFactor(factor, {'supportsViewer': 1})
+        );
+
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        anotherPlatform.getServiceId()
+      );
     });
 
     it('should use baseScore', () => {
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => fakeGetSupportedScoreFactor(factor, {}));
       localPlatformBaseScore = 1;
       anotherPlatformBaseScore = 10;
-      platformStore.resolveEntitlement('local', new Entitlement({
-        source: 'local', raw: '', service: 'local'}));
-      platformStore.resolveEntitlement('another', new Entitlement({
-        source: 'another', raw: '', service: 'another'}));
-      expect(platformStore.selectApplicablePlatform_()
-          .getServiceId()).to.equal(anotherPlatform.getServiceId());
+      platformStore.resolveEntitlement(
+        'local',
+        new Entitlement({
+          source: 'local',
+          raw: '',
+          service: 'local',
+        })
+      );
+      platformStore.resolveEntitlement(
+        'another',
+        new Entitlement({
+          source: 'another',
+          raw: '',
+          service: 'another',
+        })
+      );
+      expect(platformStore.selectApplicablePlatform_().getServiceId()).to.equal(
+        anotherPlatform.getServiceId()
+      );
     });
   });
 
@@ -391,45 +534,41 @@ describes.realWin('Platform store', {}, () => {
       localPlatform = new SubscriptionPlatform();
       sandbox.stub(localPlatform, 'getServiceId').callsFake(() => 'local');
       // Base score does not matter.
-      sandbox.stub(localPlatform, 'getBaseScore')
-          .callsFake(() => 10000);
-      sandbox.stub(localPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => localFactors[factor]);
+      sandbox.stub(localPlatform, 'getBaseScore').callsFake(() => 10000);
+      sandbox
+        .stub(localPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => localFactors[factor]);
       anotherFactors = {};
       anotherPlatform = new SubscriptionPlatform();
       sandbox.stub(anotherPlatform, 'getServiceId').callsFake(() => 'another');
-      sandbox.stub(anotherPlatform, 'getBaseScore')
-          .callsFake(() => 0);
-      sandbox.stub(anotherPlatform, 'getSupportedScoreFactor')
-          .callsFake(factor => anotherFactors[factor]);
+      sandbox.stub(anotherPlatform, 'getBaseScore').callsFake(() => 0);
+      sandbox
+        .stub(anotherPlatform, 'getSupportedScoreFactor')
+        .callsFake(factor => anotherFactors[factor]);
       // Local is ordered last in this case intentionally.
       platformStore.resolvePlatform('another', anotherPlatform);
       platformStore.resolvePlatform('local', localPlatform);
     });
 
     it('should chose local platform by default', () => {
-      expect(platformStore.selectPlatformForLogin())
-          .to.equal(localPlatform);
+      expect(platformStore.selectPlatformForLogin()).to.equal(localPlatform);
     });
 
     it('should chose platform based on the viewer factor', () => {
       anotherFactors['supportsViewer'] = 1;
-      expect(platformStore.selectPlatformForLogin())
-          .to.equal(anotherPlatform);
+      expect(platformStore.selectPlatformForLogin()).to.equal(anotherPlatform);
     });
 
     it('should tie-break to local', () => {
       localFactors['supportsViewer'] = 1;
       anotherFactors['supportsViewer'] = 1;
-      expect(platformStore.selectPlatformForLogin())
-          .to.equal(localPlatform);
+      expect(platformStore.selectPlatformForLogin()).to.equal(localPlatform);
     });
 
     it('should rank factors as numbers', () => {
       localFactors['supportsViewer'] = 0.99999;
       anotherFactors['supportsViewer'] = 1;
-      expect(platformStore.selectPlatformForLogin())
-          .to.equal(anotherPlatform);
+      expect(platformStore.selectPlatformForLogin()).to.equal(anotherPlatform);
     });
   });
 
@@ -438,63 +577,87 @@ describes.realWin('Platform store', {}, () => {
     beforeEach(() => {
       errorSpy = sandbox.spy(user(), 'warn');
     });
-    it('should report warning if all platforms fail and resolve '
-        + 'local with fallbackEntitlement', () => {
-      const platform = new SubscriptionPlatform();
-      sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
-      sandbox.stub(platformStore, 'getLocalPlatform').callsFake(() => platform);
-      platformStore.reportPlatformFailureAndFallback('service1');
-      expect(errorSpy).to.not.be.called;
-      platformStore.reportPlatformFailureAndFallback('local');
-      expect(errorSpy).to.be.calledOnce;
-      expect(platformStore.entitlements_['local'].json())
-          .to.deep.equal(fallbackEntitlement.json());
-    });
-
-    it('should not interfere with selectPlatform flow if using fallback, '
-      + 'when reason is SUBSCRIBER', () => {
-      const platform = new SubscriptionPlatform();
-      const anotherPlatform = new SubscriptionPlatform();
-      sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
-      sandbox.stub(platformStore, 'getLocalPlatform').callsFake(() => platform);
-      sandbox.stub(anotherPlatform, 'getServiceId').callsFake(
-          () => serviceIds[0]);
-      sandbox.stub(anotherPlatform, 'getBaseScore')
-          .callsFake(() => 10);
-      platformStore.resolvePlatform(serviceIds[0], anotherPlatform);
-      platformStore.resolvePlatform('local', platform);
-      platformStore.reportPlatformFailureAndFallback('local');
-      platformStore.resolveEntitlement(serviceIds[0], entitlementsForService1);
-      return platformStore.selectPlatform().then(platform => {
-        expect(platformStore.entitlements_['local']).deep.equals(
-            fallbackEntitlement);
-        // falbackEntitlement has Reason as SUBSCRIBER so it should win
-        expect(platform.getServiceId()).to.equal('local');
-      });
-    });
+    it(
+      'should report warning if all platforms fail and resolve ' +
+        'local with fallbackEntitlement',
+      () => {
+        const platform = new SubscriptionPlatform();
+        sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
+        sandbox
+          .stub(platformStore, 'getLocalPlatform')
+          .callsFake(() => platform);
+        platformStore.reportPlatformFailureAndFallback('service1');
+        expect(errorSpy).to.not.be.called;
+        platformStore.reportPlatformFailureAndFallback('local');
+        expect(errorSpy).to.be.calledOnce;
+        expect(platformStore.entitlements_['local'].json()).to.deep.equal(
+          fallbackEntitlement.json()
+        );
+      }
+    );
 
-    it('should not interfere with selectPlatform flow if using fallback, '
-      + 'when reason is not SUBSCRIBER', () => {
-      const platform = new SubscriptionPlatform();
-      const anotherPlatform = new SubscriptionPlatform();
-      sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
-      sandbox.stub(platformStore, 'getLocalPlatform').callsFake(() => platform);
-      sandbox.stub(anotherPlatform, 'getServiceId').callsFake(
-          () => serviceIds[0]);
-      sandbox.stub(anotherPlatform, 'getBaseScore')
-          .callsFake(() => 10);
-      platformStore.resolvePlatform(serviceIds[0], anotherPlatform);
-      platformStore.resolvePlatform('local', platform);
-      fallbackEntitlement.grantReason = GrantReason.METERING;
-      platformStore.reportPlatformFailureAndFallback('local');
-      platformStore.resolveEntitlement(serviceIds[0], entitlementsForService1);
-      return platformStore.selectPlatform().then(platform => {
-        expect(platformStore.entitlements_['local']).deep.equals(
-            fallbackEntitlement);
-        // falbackEntitlement has Reason as SUBSCRIBER so it should win
-        expect(platform.getServiceId()).to.equal(serviceIds[0]);
-      });
-    });
+    it(
+      'should not interfere with selectPlatform flow if using fallback, ' +
+        'when reason is SUBSCRIBER',
+      () => {
+        const platform = new SubscriptionPlatform();
+        const anotherPlatform = new SubscriptionPlatform();
+        sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
+        sandbox
+          .stub(platformStore, 'getLocalPlatform')
+          .callsFake(() => platform);
+        sandbox
+          .stub(anotherPlatform, 'getServiceId')
+          .callsFake(() => serviceIds[0]);
+        sandbox.stub(anotherPlatform, 'getBaseScore').callsFake(() => 10);
+        platformStore.resolvePlatform(serviceIds[0], anotherPlatform);
+        platformStore.resolvePlatform('local', platform);
+        platformStore.reportPlatformFailureAndFallback('local');
+        platformStore.resolveEntitlement(
+          serviceIds[0],
+          entitlementsForService1
+        );
+        return platformStore.selectPlatform().then(platform => {
+          expect(platformStore.entitlements_['local']).deep.equals(
+            fallbackEntitlement
+          );
+          // falbackEntitlement has Reason as SUBSCRIBER so it should win
+          expect(platform.getServiceId()).to.equal('local');
+        });
+      }
+    );
+
+    it(
+      'should not interfere with selectPlatform flow if using fallback, ' +
+        'when reason is not SUBSCRIBER',
+      () => {
+        const platform = new SubscriptionPlatform();
+        const anotherPlatform = new SubscriptionPlatform();
+        sandbox.stub(platform, 'getServiceId').callsFake(() => 'local');
+        sandbox
+          .stub(platformStore, 'getLocalPlatform')
+          .callsFake(() => platform);
+        sandbox
+          .stub(anotherPlatform, 'getServiceId')
+          .callsFake(() => serviceIds[0]);
+        sandbox.stub(anotherPlatform, 'getBaseScore').callsFake(() => 10);
+        platformStore.resolvePlatform(serviceIds[0], anotherPlatform);
+        platformStore.resolvePlatform('local', platform);
+        fallbackEntitlement.grantReason = GrantReason.METERING;
+        platformStore.reportPlatformFailureAndFallback('local');
+        platformStore.resolveEntitlement(
+          serviceIds[0],
+          entitlementsForService1
+        );
+        return platformStore.selectPlatform().then(platform => {
+          expect(platformStore.entitlements_['local']).deep.equals(
+            fallbackEntitlement
+          );
+          // falbackEntitlement has Reason as SUBSCRIBER so it should win
+          expect(platform.getServiceId()).to.equal(serviceIds[0]);
+        });
+      }
+    );
   });
 
   describe('getPlatform', () => {
@@ -502,8 +665,9 @@ describes.realWin('Platform store', {}, () => {
       const platform = new SubscriptionPlatform();
       platform.getServiceId = () => 'test';
       platformStore.subscriptionPlatforms_['test'] = platform;
-      expect(platformStore.getPlatform('test').getServiceId())
-          .to.be.equal('test');
+      expect(platformStore.getPlatform('test').getServiceId()).to.be.equal(
+        'test'
+      );
     });
   });
 
@@ -540,14 +704,17 @@ describes.realWin('Platform store', {}, () => {
       });
     });
 
-    it('should resolve with metered entitlement when no '
-        + 'platform is subscribed', () => {
-      platformStore.resolveEntitlement('service1', noEntitlement);
-      platformStore.resolveEntitlement('service2', meteringEntitlement);
-      return platformStore.getGrantEntitlement().then(entitlement => {
-        expect(entitlement).to.equal(meteringEntitlement);
-      });
-    });
+    it(
+      'should resolve with metered entitlement when no ' +
+        'platform is subscribed',
+      () => {
+        platformStore.resolveEntitlement('service1', noEntitlement);
+        platformStore.resolveEntitlement('service2', meteringEntitlement);
+        return platformStore.getGrantEntitlement().then(entitlement => {
+          expect(entitlement).to.equal(meteringEntitlement);
+        });
+      }
+    );
 
     it('should override metering with subscription', () => {
       platformStore.resolveEntitlement('service1', meteringEntitlement);
@@ -578,40 +745,48 @@ describes.realWin('Platform store', {}, () => {
       platformStore.saveGrantEntitlement_(entitlement);
       expect(platformStore.grantStatusEntitlement_).to.be.equal(null);
       const anotherEntitlement = new Entitlement(
-          Object.assign({}, entitlementData, {granted: true}));
+        Object.assign({}, entitlementData, {granted: true})
+      );
       platformStore.saveGrantEntitlement_(anotherEntitlement);
-      expect(platformStore.grantStatusEntitlement_.json())
-          .to.deep.equal(anotherEntitlement.json());
+      expect(platformStore.grantStatusEntitlement_.json()).to.deep.equal(
+        anotherEntitlement.json()
+      );
     });
 
-    it('should save further entitlement if new one has subscription '
-        + 'and last one had metering', () => {
-      const entitlementData = {
-        source: 'local',
-        service: 'local',
-        granted: true,
-      };
-      const entitlement = new Entitlement(entitlementData);
-      const nextMeteredEntitlement = new Entitlement(
+    it(
+      'should save further entitlement if new one has subscription ' +
+        'and last one had metering',
+      () => {
+        const entitlementData = {
+          source: 'local',
+          service: 'local',
+          granted: true,
+        };
+        const entitlement = new Entitlement(entitlementData);
+        const nextMeteredEntitlement = new Entitlement(
           Object.assign({}, entitlementData, {
             grantReason: GrantReason.METERING,
           })
-      );
-      const subscribedMeteredEntitlement = new Entitlement(
+        );
+        const subscribedMeteredEntitlement = new Entitlement(
           Object.assign({}, entitlementData, {
             grantReason: GrantReason.SUBSCRIBER,
           })
-      );
-      platformStore.saveGrantEntitlement_(entitlement);
-      expect(platformStore.grantStatusEntitlement_.json())
-          .to.deep.equal(entitlement.json());
-      platformStore.saveGrantEntitlement_(nextMeteredEntitlement);
-      expect(platformStore.grantStatusEntitlement_.json())
-          .to.deep.equal(entitlement.json());
-      platformStore.saveGrantEntitlement_(subscribedMeteredEntitlement);
-      expect(platformStore.grantStatusEntitlement_.json())
-          .to.deep.equal(subscribedMeteredEntitlement.json());
-    });
+        );
+        platformStore.saveGrantEntitlement_(entitlement);
+        expect(platformStore.grantStatusEntitlement_.json()).to.deep.equal(
+          entitlement.json()
+        );
+        platformStore.saveGrantEntitlement_(nextMeteredEntitlement);
+        expect(platformStore.grantStatusEntitlement_.json()).to.deep.equal(
+          entitlement.json()
+        );
+        platformStore.saveGrantEntitlement_(subscribedMeteredEntitlement);
+        expect(platformStore.grantStatusEntitlement_.json()).to.deep.equal(
+          subscribedMeteredEntitlement.json()
+        );
+      }
+    );
   });
 
   describe('onPlatformResolves', () => {
@@ -622,22 +797,27 @@ describes.realWin('Platform store', {}, () => {
       sandbox.stub(localPlatform, 'getServiceId').callsFake(() => 'local');
     });
 
-    it('should return a promise resolving the requested platform '
-      + 'if it is already registered', () => {
-      platformStore.resolvePlatform('local', localPlatform);
-      platformStore.onPlatformResolves('local', platform => {
-        expect(platform.getServiceId()).to.be.equal('local');
-      });
-    });
+    it(
+      'should return a promise resolving the requested platform ' +
+        'if it is already registered',
+      () => {
+        platformStore.resolvePlatform('local', localPlatform);
+        platformStore.onPlatformResolves('local', platform => {
+          expect(platform.getServiceId()).to.be.equal('local');
+        });
+      }
+    );
 
-    it('should return a promise resolving when the requested platform '
-      + 'gets registered', done => {
-      platformStore.onPlatformResolves('local', platform => {
-        expect(platform.getServiceId()).to.be.equal('local');
-        done();
-      });
-      platformStore.resolvePlatform('local', localPlatform);
-    });
+    it(
+      'should return a promise resolving when the requested platform ' +
+        'gets registered',
+      done => {
+        platformStore.onPlatformResolves('local', platform => {
+          expect(platform.getServiceId()).to.be.equal('local');
+          done();
+        });
+        platformStore.resolvePlatform('local', localPlatform);
+      }
+    );
   });
 });
-
diff --git a/extensions/amp-subscriptions/0.1/test/test-renderer.js b/extensions/amp-subscriptions/0.1/test/test-renderer.js
index 9b0fe0851bd2..62e3110275e2 100644
--- a/extensions/amp-subscriptions/0.1/test/test-renderer.js
+++ b/extensions/amp-subscriptions/0.1/test/test-renderer.js
@@ -20,226 +20,243 @@ import {Services} from '../../../../src/services';
 import {createElementWithAttributes} from '../../../../src/dom';
 import {installStylesForDoc} from '../../../../src/style-installer';
 
-
 function isDisplayed(el) {
   const win = el.ownerDocument.defaultView;
   const styles = win.getComputedStyle(el);
   return styles.display != 'none';
 }
 
+describes.realWin(
+  'amp-subscriptions renderer before initialized',
+  {
+    amp: {},
+  },
+  env => {
+    let win, doc;
+    let unrelated;
+    let section, action, dialog;
 
-describes.realWin('amp-subscriptions renderer before initialized', {
-  amp: {},
-}, env => {
-  let win, doc;
-  let unrelated;
-  let section, action, dialog;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    doc.body.parentNode.setAttribute('amp-version', '1');
-    unrelated = createElementWithAttributes(doc, 'div', {});
-    section = createElementWithAttributes(doc, 'div', {
-      'subscriptions-section': '',
-    });
-    action = createElementWithAttributes(doc, 'div', {
-      'subscriptions-action': '',
-    });
-    dialog = createElementWithAttributes(doc, 'div', {
-      'subscriptions-dialog': '',
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      doc.body.parentNode.setAttribute('amp-version', '1');
+      unrelated = createElementWithAttributes(doc, 'div', {});
+      section = createElementWithAttributes(doc, 'div', {
+        'subscriptions-section': '',
+      });
+      action = createElementWithAttributes(doc, 'div', {
+        'subscriptions-action': '',
+      });
+      dialog = createElementWithAttributes(doc, 'div', {
+        'subscriptions-dialog': '',
+      });
+      doc.body.appendChild(unrelated);
+      doc.body.appendChild(section);
+      doc.body.appendChild(action);
+      doc.body.appendChild(dialog);
     });
-    doc.body.appendChild(unrelated);
-    doc.body.appendChild(section);
-    doc.body.appendChild(action);
-    doc.body.appendChild(dialog);
-  });
-
-  it('should initial elements correctly before the extension is loaded', () => {
-    expect(isDisplayed(unrelated)).to.be.true;
-    expect(isDisplayed(section)).to.be.false;
-    expect(isDisplayed(action)).to.be.false;
-    expect(isDisplayed(dialog)).to.be.false;
-  });
-});
-
-
-describes.realWin('amp-subscriptions renderer', {
-  amp: {},
-}, env => {
-  let win, doc;
-  let ampdoc;
-  let renderer;
-  let unrelated;
-  let loading1, loading2;
-  let content1, content2;
-  let contentNotGranted1, contentNotGranted2;
-  let actions1, actions2;
-  let actionLogin, actionLogout, actionSubscribe;
-  let dialog1, dialog2;
-  let elements;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    ampdoc = env.ampdoc;
-    doc.body.parentNode.setAttribute('amp-version', '1');
-
-    installStylesForDoc(ampdoc, CSS, () => {}, false, 'amp-subscriptions');
-
-    const resources = Services.resourcesForDoc(ampdoc);
-    sandbox.stub(resources, 'mutateElement').callsFake((element, mutator) => {
-      mutator();
+
+    it('should initial elements correctly before the extension is loaded', () => {
+      expect(isDisplayed(unrelated)).to.be.true;
+      expect(isDisplayed(section)).to.be.false;
+      expect(isDisplayed(action)).to.be.false;
+      expect(isDisplayed(dialog)).to.be.false;
     });
+  }
+);
 
-    unrelated = createElementWithAttributes(doc, 'div', {});
+describes.realWin(
+  'amp-subscriptions renderer',
+  {
+    amp: {},
+  },
+  env => {
+    let win, doc;
+    let ampdoc;
+    let renderer;
+    let unrelated;
+    let loading1, loading2;
+    let content1, content2;
+    let contentNotGranted1, contentNotGranted2;
+    let actions1, actions2;
+    let actionLogin, actionLogout, actionSubscribe;
+    let dialog1, dialog2;
+    let elements;
 
-    loading1 = createElementWithAttributes(doc, 'div', {
-      id: 'loading1',
-      'subscriptions-section': 'loading',
-    });
-    loading2 = createElementWithAttributes(doc, 'div', {
-      id: 'loading2',
-      'subscriptions-section': 'loading',
-    });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      ampdoc = env.ampdoc;
+      doc.body.parentNode.setAttribute('amp-version', '1');
 
-    content1 = createElementWithAttributes(doc, 'div', {
-      id: 'content1',
-      'subscriptions-section': 'content',
-    });
-    content2 = createElementWithAttributes(doc, 'div', {
-      id: 'content2',
-      'subscriptions-section': 'content',
-    });
+      installStylesForDoc(ampdoc, CSS, () => {}, false, 'amp-subscriptions');
 
-    contentNotGranted1 = createElementWithAttributes(doc, 'div', {
-      id: 'contentNotGranted1',
-      'subscriptions-section': 'content-not-granted',
-    });
-    contentNotGranted2 = createElementWithAttributes(doc, 'div', {
-      id: 'contentNotGranted2',
-      'subscriptions-section': 'content-not-granted',
-    });
+      const resources = Services.resourcesForDoc(ampdoc);
+      sandbox.stub(resources, 'mutateElement').callsFake((element, mutator) => {
+        mutator();
+      });
 
-    dialog1 = createElementWithAttributes(doc, 'div', {
-      id: 'dialog1',
-      'subscriptions-dialog': 'dialog1',
-    });
-    dialog2 = createElementWithAttributes(doc, 'div', {
-      id: 'dialog2',
-      'subscriptions-dialog': 'dialog2',
-    });
+      unrelated = createElementWithAttributes(doc, 'div', {});
 
-    actions1 = createElementWithAttributes(doc, 'div', {
-      id: 'actions1',
-      'subscriptions-section': 'actions',
-    });
-    actions2 = createElementWithAttributes(doc, 'div', {
-      id: 'actions2',
-      'subscriptions-section': 'actions',
-    });
+      loading1 = createElementWithAttributes(doc, 'div', {
+        id: 'loading1',
+        'subscriptions-section': 'loading',
+      });
+      loading2 = createElementWithAttributes(doc, 'div', {
+        id: 'loading2',
+        'subscriptions-section': 'loading',
+      });
 
-    actionLogin = createElementWithAttributes(doc, 'div', {
-      id: 'actionLogin',
-      'subscriptions-action': 'login',
-    });
-    actionLogout = createElementWithAttributes(doc, 'div', {
-      id: 'actionLogout',
-      'subscriptions-action': 'logout',
-    });
-    actionSubscribe = createElementWithAttributes(doc, 'div', {
-      id: 'actionSubscribe',
-      'subscriptions-action': 'subscribe',
-    });
+      content1 = createElementWithAttributes(doc, 'div', {
+        id: 'content1',
+        'subscriptions-section': 'content',
+      });
+      content2 = createElementWithAttributes(doc, 'div', {
+        id: 'content2',
+        'subscriptions-section': 'content',
+      });
 
-    doc.body.appendChild(unrelated);
-
-    elements = [
-      loading1, loading2,
-      content1, content2,
-      contentNotGranted1, contentNotGranted2,
-      actions1, actions2,
-      actionLogin, actionLogout, actionSubscribe,
-      dialog1, dialog2,
-    ];
-    elements.forEach(element => {
-      doc.body.appendChild(element);
+      contentNotGranted1 = createElementWithAttributes(doc, 'div', {
+        id: 'contentNotGranted1',
+        'subscriptions-section': 'content-not-granted',
+      });
+      contentNotGranted2 = createElementWithAttributes(doc, 'div', {
+        id: 'contentNotGranted2',
+        'subscriptions-section': 'content-not-granted',
+      });
+
+      dialog1 = createElementWithAttributes(doc, 'div', {
+        id: 'dialog1',
+        'subscriptions-dialog': 'dialog1',
+      });
+      dialog2 = createElementWithAttributes(doc, 'div', {
+        id: 'dialog2',
+        'subscriptions-dialog': 'dialog2',
+      });
+
+      actions1 = createElementWithAttributes(doc, 'div', {
+        id: 'actions1',
+        'subscriptions-section': 'actions',
+      });
+      actions2 = createElementWithAttributes(doc, 'div', {
+        id: 'actions2',
+        'subscriptions-section': 'actions',
+      });
+
+      actionLogin = createElementWithAttributes(doc, 'div', {
+        id: 'actionLogin',
+        'subscriptions-action': 'login',
+      });
+      actionLogout = createElementWithAttributes(doc, 'div', {
+        id: 'actionLogout',
+        'subscriptions-action': 'logout',
+      });
+      actionSubscribe = createElementWithAttributes(doc, 'div', {
+        id: 'actionSubscribe',
+        'subscriptions-action': 'subscribe',
+      });
+
+      doc.body.appendChild(unrelated);
+
+      elements = [
+        loading1,
+        loading2,
+        content1,
+        content2,
+        contentNotGranted1,
+        contentNotGranted2,
+        actions1,
+        actions2,
+        actionLogin,
+        actionLogout,
+        actionSubscribe,
+        dialog1,
+        dialog2,
+      ];
+      elements.forEach(element => {
+        doc.body.appendChild(element);
+      });
+      renderer = new Renderer(ampdoc);
     });
-    renderer = new Renderer(ampdoc);
-  });
-
-  function displayed(array) {
-    expect(isDisplayed(unrelated)).to.be.true;
-    elements.forEach(element => {
-      const shouldBeDisplayed = array.includes(element);
-      expect(isDisplayed(element)).to.equal(
+
+    function displayed(array) {
+      expect(isDisplayed(unrelated)).to.be.true;
+      elements.forEach(element => {
+        const shouldBeDisplayed = array.includes(element);
+        expect(isDisplayed(element)).to.equal(
           shouldBeDisplayed,
-          'Expected ' + element.id + ' to be ' +
-          (shouldBeDisplayed ? 'displayed' : 'not displayed'));
-    });
-  }
+          'Expected ' +
+            element.id +
+            ' to be ' +
+            (shouldBeDisplayed ? 'displayed' : 'not displayed')
+        );
+      });
+    }
 
-  it('should hide elements in the unknown state', () => {
-    displayed([]);
-  });
+    it('should hide elements in the unknown state', () => {
+      displayed([]);
+    });
 
-  it('should show loading', () => {
-    renderer.toggleLoading(true);
-    displayed([loading1, loading2]);
-  });
+    it('should show loading', () => {
+      renderer.toggleLoading(true);
+      displayed([loading1, loading2]);
+    });
 
-  it('should show appropriate elements when granted', () => {
-    renderer.setGrantState(true);
-    displayed([content1, content2]);
-  });
+    it('should show appropriate elements when granted', () => {
+      renderer.setGrantState(true);
+      displayed([content1, content2]);
+    });
 
-  it('should show appropriate elements when denied', () => {
-    renderer.setGrantState(false);
-    displayed([contentNotGranted1, contentNotGranted2]);
-  });
+    it('should show appropriate elements when denied', () => {
+      renderer.setGrantState(false);
+      displayed([contentNotGranted1, contentNotGranted2]);
+    });
 
-  describe('addLoadingBar', () => {
-    let insertBeforeStub;
+    describe('addLoadingBar', () => {
+      let insertBeforeStub;
 
-    beforeEach(() => {
-      insertBeforeStub = sandbox.stub(renderer.ampdoc_.getBody(),
-          'insertBefore');
-    });
+      beforeEach(() => {
+        insertBeforeStub = sandbox.stub(
+          renderer.ampdoc_.getBody(),
+          'insertBefore'
+        );
+      });
 
-    it('shouldn\'t add a progress bar if loading section is found', () => {
-      return renderer.addLoadingBar().then(() => {
-        expect(insertBeforeStub).to.not.be.called;
+      it("shouldn't add a progress bar if loading section is found", () => {
+        return renderer.addLoadingBar().then(() => {
+          expect(insertBeforeStub).to.not.be.called;
+        });
       });
-    });
 
-    it('should add a progress bar if no loading section is found', () => {
-      loading1.remove();
-      loading2.remove();
-      return renderer.addLoadingBar().then(() => {
-        expect(insertBeforeStub).to.be.called;
-        const element = insertBeforeStub.getCall(0).args[0];
-        expect(element.tagName).to.be.equal('DIV');
-        expect(element.className).to.be.equal('i-amphtml-subs-progress');
-        expect(insertBeforeStub.getCall(0).args[1]).to.be.null;
+      it('should add a progress bar if no loading section is found', () => {
+        loading1.remove();
+        loading2.remove();
+        return renderer.addLoadingBar().then(() => {
+          expect(insertBeforeStub).to.be.called;
+          const element = insertBeforeStub.getCall(0).args[0];
+          expect(element.tagName).to.be.equal('DIV');
+          expect(element.className).to.be.equal('i-amphtml-subs-progress');
+          expect(insertBeforeStub.getCall(0).args[1]).to.be.null;
+        });
       });
-    });
 
-    it('should add a progress bar before footer', () => {
-      loading1.remove();
-      loading2.remove();
-      const fakeFooter = createElementWithAttributes(doc, 'footer', {});
-      const fakeFooterContainer = createElementWithAttributes(doc, 'div', {});
-      fakeFooterContainer.appendChild(fakeFooter);
-      renderer.ampdoc_.getBody().appendChild(fakeFooterContainer);
-      const footer = createElementWithAttributes(doc, 'footer', {});
-      renderer.ampdoc_.getBody().appendChild(footer);
-      return renderer.addLoadingBar().then(() => {
-        expect(insertBeforeStub).to.be.called;
-        const element = insertBeforeStub.getCall(0).args[0];
-        expect(element.tagName).to.be.equal('DIV');
-        expect(element.className).to.be.equal('i-amphtml-subs-progress');
-        expect(insertBeforeStub.getCall(0).args[1]).to.equal(footer);
+      it('should add a progress bar before footer', () => {
+        loading1.remove();
+        loading2.remove();
+        const fakeFooter = createElementWithAttributes(doc, 'footer', {});
+        const fakeFooterContainer = createElementWithAttributes(doc, 'div', {});
+        fakeFooterContainer.appendChild(fakeFooter);
+        renderer.ampdoc_.getBody().appendChild(fakeFooterContainer);
+        const footer = createElementWithAttributes(doc, 'footer', {});
+        renderer.ampdoc_.getBody().appendChild(footer);
+        return renderer.addLoadingBar().then(() => {
+          expect(insertBeforeStub).to.be.called;
+          const element = insertBeforeStub.getCall(0).args[0];
+          expect(element.tagName).to.be.equal('DIV');
+          expect(element.className).to.be.equal('i-amphtml-subs-progress');
+          expect(insertBeforeStub.getCall(0).args[1]).to.equal(footer);
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-subscriptions/0.1/test/test-service-adapter.js b/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
index 77b2c807a743..84d2b7e33d03 100644
--- a/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
+++ b/extensions/amp-subscriptions/0.1/test/test-service-adapter.js
@@ -18,117 +18,124 @@ import {PageConfig} from '../../../../third_party/subscriptions-project/config';
 import {ServiceAdapter} from '../service-adapter';
 import {SubscriptionService} from '../amp-subscriptions';
 
-describes.realWin('service adapter', {
-  amp: true,
-},
-env => {
-  let win;
-  let ampdoc;
-  let subscriptionService;
-  let serviceAdapter;
-  let pageConfig;
-  const serviceConfig = {
-    services: [
-      {
-        authorizationUrl: 'https://lipsum.com/authorize',
-        actions: {
-          subscribe: 'https://lipsum.com/subscribe',
-          login: 'https://lipsum.com/login',
+describes.realWin(
+  'service adapter',
+  {
+    amp: true,
+  },
+  env => {
+    let win;
+    let ampdoc;
+    let subscriptionService;
+    let serviceAdapter;
+    let pageConfig;
+    const serviceConfig = {
+      services: [
+        {
+          authorizationUrl: 'https://lipsum.com/authorize',
+          actions: {
+            subscribe: 'https://lipsum.com/subscribe',
+            login: 'https://lipsum.com/login',
+          },
         },
-      },
-    ],
-  };
-  beforeEach(() => {
-    pageConfig = new PageConfig('example.org:basic', true);
-    ampdoc = env.ampdoc;
-    win = env.win;
-    ampdoc = env.ampdoc;
-    const element = win.document.createElement('script');
-    element.id = 'amp-subscriptions';
-    element.setAttribute('type', 'json');
-    element.innerHTML = JSON.stringify(serviceConfig);
-    win.document.body.appendChild(element);
-    subscriptionService = new SubscriptionService(ampdoc);
-    serviceAdapter = new ServiceAdapter(subscriptionService);
-  });
+      ],
+    };
+    beforeEach(() => {
+      pageConfig = new PageConfig('example.org:basic', true);
+      ampdoc = env.ampdoc;
+      win = env.win;
+      ampdoc = env.ampdoc;
+      const element = win.document.createElement('script');
+      element.id = 'amp-subscriptions';
+      element.setAttribute('type', 'json');
+      element.innerHTML = JSON.stringify(serviceConfig);
+      win.document.body.appendChild(element);
+      subscriptionService = new SubscriptionService(ampdoc);
+      serviceAdapter = new ServiceAdapter(subscriptionService);
+    });
 
-  describe('getEncryptedDocumentKey', () => {
-    it('should call getEncryptedDocumentKey of subscription service', () => {
-      const stub = sandbox.stub(subscriptionService, 'getEncryptedDocumentKey');
-      serviceAdapter.getEncryptedDocumentKey('serviceId');
-      expect(stub).to.be.calledOnce;
-      expect(stub).to.be.calledWith('serviceId');
+    describe('getEncryptedDocumentKey', () => {
+      it('should call getEncryptedDocumentKey of subscription service', () => {
+        const stub = sandbox.stub(
+          subscriptionService,
+          'getEncryptedDocumentKey'
+        );
+        serviceAdapter.getEncryptedDocumentKey('serviceId');
+        expect(stub).to.be.calledOnce;
+        expect(stub).to.be.calledWith('serviceId');
+      });
     });
-  });
 
-  describe('getPageConfig', () => {
-    it('should call getPageConfig of subscription service', () => {
-      const stub = sandbox.stub(subscriptionService, 'getPageConfig')
+    describe('getPageConfig', () => {
+      it('should call getPageConfig of subscription service', () => {
+        const stub = sandbox
+          .stub(subscriptionService, 'getPageConfig')
           .callsFake(() => pageConfig);
-      serviceAdapter.getPageConfig();
-      expect(stub).to.be.calledOnce;
+        serviceAdapter.getPageConfig();
+        expect(stub).to.be.calledOnce;
+      });
     });
-  });
 
-  describe('delegateAction', () => {
-    it('should call delegateActionToLocal of subscription service', () => {
-      const p = Promise.resolve();
-      const stub = sandbox.stub(serviceAdapter, 'delegateActionToService')
+    describe('delegateAction', () => {
+      it('should call delegateActionToLocal of subscription service', () => {
+        const p = Promise.resolve();
+        const stub = sandbox
+          .stub(serviceAdapter, 'delegateActionToService')
           .callsFake(() => p);
-      const action = 'action';
-      const result = serviceAdapter.delegateActionToLocal(action);
-      expect(stub).to.be.calledWith(action, 'local');
-      expect(result).to.equal(p);
-    });
+        const action = 'action';
+        const result = serviceAdapter.delegateActionToLocal(action);
+        expect(stub).to.be.calledWith(action, 'local');
+        expect(result).to.equal(p);
+      });
 
-    it('should call delegateActionToService of subscription service', () => {
-      const p = Promise.resolve();
-      const stub = sandbox.stub(subscriptionService, 'delegateActionToService')
+      it('should call delegateActionToService of subscription service', () => {
+        const p = Promise.resolve();
+        const stub = sandbox
+          .stub(subscriptionService, 'delegateActionToService')
           .callsFake(() => p);
-      const action = 'action';
-      const result = serviceAdapter.delegateActionToLocal(action);
-      expect(stub).to.be.calledWith(action);
-      expect(result).to.equal(p);
+        const action = 'action';
+        const result = serviceAdapter.delegateActionToLocal(action);
+        expect(stub).to.be.calledWith(action);
+        expect(result).to.equal(p);
+      });
     });
-  });
 
-  describe('resetPlatforms', () => {
-    it('should call initializePlatformStore_', () => {
-      const stub = sandbox.stub(
-          subscriptionService, 'resetPlatforms');
-      serviceAdapter.resetPlatforms();
-      expect(stub).to.be.calledOnce;
+    describe('resetPlatforms', () => {
+      it('should call initializePlatformStore_', () => {
+        const stub = sandbox.stub(subscriptionService, 'resetPlatforms');
+        serviceAdapter.resetPlatforms();
+        expect(stub).to.be.calledOnce;
+      });
     });
-  });
 
-  describe('getDialog', () => {
-    it('should call getDialog of subscription service', () => {
-      const stub = sandbox.stub(subscriptionService, 'getDialog');
-      serviceAdapter.getDialog();
-      expect(stub).to.be.calledOnce;
+    describe('getDialog', () => {
+      it('should call getDialog of subscription service', () => {
+        const stub = sandbox.stub(subscriptionService, 'getDialog');
+        serviceAdapter.getDialog();
+        expect(stub).to.be.calledOnce;
+      });
     });
-  });
 
-  describe('decorateServiceAction', () => {
-    it('should call decorateServiceAction of '
-      + 'subscription service', () => {
-      const element = win.document.createElement('div');
-      const serviceId = 'local';
-      const stub = sandbox.stub(subscriptionService,
-          'decorateServiceAction');
-      serviceAdapter.decorateServiceAction(element, serviceId, 'action');
-      expect(stub).to.be.calledWith(element, serviceId, 'action');
+    describe('decorateServiceAction', () => {
+      it('should call decorateServiceAction of subscription service', () => {
+        const element = win.document.createElement('div');
+        const serviceId = 'local';
+        const stub = sandbox.stub(subscriptionService, 'decorateServiceAction');
+        serviceAdapter.decorateServiceAction(element, serviceId, 'action');
+        expect(stub).to.be.calledWith(element, serviceId, 'action');
+      });
     });
-  });
 
-  describe('getReaderId', () => {
-    it('should delegate call to getReaderId', () => {
-      const readerIdPromise = Promise.resolve();
-      const stub = sandbox.stub(subscriptionService, 'getReaderId')
+    describe('getReaderId', () => {
+      it('should delegate call to getReaderId', () => {
+        const readerIdPromise = Promise.resolve();
+        const stub = sandbox
+          .stub(subscriptionService, 'getReaderId')
           .returns(readerIdPromise);
-      const promise = serviceAdapter.getReaderId('service1');
-      expect(stub).to.be.calledOnce.calledWith('service1');
-      expect(promise).to.equal(readerIdPromise);
+        const promise = serviceAdapter.getReaderId('service1');
+        expect(stub).to.be.calledOnce.calledWith('service1');
+        expect(promise).to.equal(readerIdPromise);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-subscriptions/0.1/test/test-url-builder.js b/extensions/amp-subscriptions/0.1/test/test-url-builder.js
index 2b86d0cb5cd0..c4a0d9df70ae 100644
--- a/extensions/amp-subscriptions/0.1/test/test-url-builder.js
+++ b/extensions/amp-subscriptions/0.1/test/test-url-builder.js
@@ -28,12 +28,15 @@ describes.fakeWin('UrlBuilder', {amp: true}, env => {
   });
 
   it('should resolve URL without auth response and no authdata vars', () => {
-    expectAsyncConsoleError(
-        /Access or subsciptions service is not installed/);
-    return urlBuilder.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ false).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
-    });
+    expectAsyncConsoleError(/Access or subsciptions service is not installed/);
+    return urlBuilder
+      .buildUrl(
+        '?rid=READER_ID&type=AUTHDATA(child.type)',
+        /* useAuthData */ false
+      )
+      .then(url => {
+        expect(url).to.equal('?rid=reader1&type=');
+      });
   });
 
   it('should accept reader_id synonyms', () => {
@@ -43,46 +46,65 @@ describes.fakeWin('UrlBuilder', {amp: true}, env => {
   });
 
   it('should resolve URL without auth response and with authdata vars', () => {
-    return urlBuilder.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
-    });
+    return urlBuilder
+      .buildUrl(
+        '?rid=READER_ID&type=AUTHDATA(child.type)',
+        /* useAuthData */ true
+      )
+      .then(url => {
+        expect(url).to.equal('?rid=reader1&type=');
+      });
   });
 
   it('should resolve URL with auth response and no authdata vars', () => {
-    expectAsyncConsoleError(
-        /Access or subsciptions service is not installed/);
+    expectAsyncConsoleError(/Access or subsciptions service is not installed/);
     urlBuilder.setAuthResponse({child: {type: 'premium'}});
-    return urlBuilder.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ false).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
-    });
+    return urlBuilder
+      .buildUrl(
+        '?rid=READER_ID&type=AUTHDATA(child.type)',
+        /* useAuthData */ false
+      )
+      .then(url => {
+        expect(url).to.equal('?rid=reader1&type=');
+      });
   });
 
   it('should resolve URL with auth response and with authdata vars', () => {
     urlBuilder.setAuthResponse({child: {type: 'premium'}});
-    return urlBuilder.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=premium');
-    });
+    return urlBuilder
+      .buildUrl(
+        '?rid=READER_ID&type=AUTHDATA(child.type)',
+        /* useAuthData */ true
+      )
+      .then(url => {
+        expect(url).to.equal('?rid=reader1&type=premium');
+      });
   });
 
   it('should resolve URL with unknown authdata var', () => {
     urlBuilder.setAuthResponse({child: {type: 'premium'}});
-    return urlBuilder.buildUrl('?rid=READER_ID&type=AUTHDATA(child.type2)',
-        /* useAuthData */ true).then(url => {
-      expect(url).to.equal('?rid=reader1&type=');
-    });
+    return urlBuilder
+      .buildUrl(
+        '?rid=READER_ID&type=AUTHDATA(child.type2)',
+        /* useAuthData */ true
+      )
+      .then(url => {
+        expect(url).to.equal('?rid=reader1&type=');
+      });
   });
 
   it('should colect URL vars with auth response and with authdata vars', () => {
     urlBuilder.setAuthResponse({child: {type: 'premium'}});
-    return urlBuilder.collectUrlVars('?rid=READER_ID&type=AUTHDATA(child.type)',
-        /* useAuthData */ true).then(vars => {
-      expect(vars).to.deep.equal({
-        'READER_ID': 'reader1',
-        'AUTHDATA(child.type)': 'premium',
+    return urlBuilder
+      .collectUrlVars(
+        '?rid=READER_ID&type=AUTHDATA(child.type)',
+        /* useAuthData */ true
+      )
+      .then(vars => {
+        expect(vars).to.deep.equal({
+          'READER_ID': 'reader1',
+          'AUTHDATA(child.type)': 'premium',
+        });
       });
-    });
   });
 });
diff --git a/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js b/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
index e5ab387ca673..1a6c81bbae7f 100644
--- a/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
+++ b/extensions/amp-subscriptions/0.1/test/test-viewer-platform.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {Dialog} from '../dialog';
 import {Entitlement, GrantReason} from '../entitlement';
 import {PageConfig} from '../../../../third_party/subscriptions-project/config';
@@ -31,8 +30,13 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, env => {
   let resetPlatformsStub, messageCallback;
   const currentProductId = 'example.org:basic';
   const origin = 'origin';
-  const entitlementData = {source: 'local', raw: 'raw',
-    service: 'local', products: [currentProductId], subscriptionToken: 'token'};
+  const entitlementData = {
+    source: 'local',
+    raw: 'raw',
+    service: 'local',
+    products: [currentProductId],
+    subscriptionToken: 'token',
+  };
   const fakeAuthToken = {
     'authorization': 'faketoken',
     'decryptedDocumentKey': 'decryptedDocumentKey',
@@ -55,46 +59,59 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, env => {
     win = env.win;
     serviceAdapter = new ServiceAdapter(null);
     const analytics = new SubscriptionAnalytics(ampdoc.getRootNode());
-    sandbox.stub(serviceAdapter, 'getAnalytics')
-        .callsFake(() => analytics);
-    sandbox.stub(serviceAdapter, 'getPageConfig')
-        .callsFake(() => new PageConfig(currentProductId, true));
-    sandbox.stub(serviceAdapter, 'getDialog')
-        .callsFake(() => new Dialog(ampdoc));
-    sandbox.stub(serviceAdapter, 'getReaderId')
-        .callsFake(() => Promise.resolve('reader1'));
-    sandbox.stub(serviceAdapter, 'getEncryptedDocumentKey')
-        .callsFake(() => Promise.resolve(null));
+    sandbox.stub(serviceAdapter, 'getAnalytics').callsFake(() => analytics);
+    sandbox
+      .stub(serviceAdapter, 'getPageConfig')
+      .callsFake(() => new PageConfig(currentProductId, true));
+    sandbox
+      .stub(serviceAdapter, 'getDialog')
+      .callsFake(() => new Dialog(ampdoc));
+    sandbox
+      .stub(serviceAdapter, 'getReaderId')
+      .callsFake(() => Promise.resolve('reader1'));
+    sandbox
+      .stub(serviceAdapter, 'getEncryptedDocumentKey')
+      .callsFake(() => Promise.resolve(null));
     resetPlatformsStub = sandbox.stub(serviceAdapter, 'resetPlatforms');
-    sandbox.stub(Services.viewerForDoc(ampdoc),'onMessage')
-        .callsFake((message, cb) => { messageCallback = cb; });
+    sandbox
+      .stub(Services.viewerForDoc(ampdoc), 'onMessage')
+      .callsFake((message, cb) => {
+        messageCallback = cb;
+      });
     viewerPlatform = new ViewerSubscriptionPlatform(
-        ampdoc, serviceConfig, serviceAdapter, origin);
-    sandbox.stub(viewerPlatform.viewer_,
-        'sendMessageAwaitResponse').callsFake(() =>
-      Promise.resolve(fakeAuthToken));
-    sendAuthTokenStub = sandbox.stub(viewerPlatform,
-        'sendAuthTokenErrorToViewer_');
+      ampdoc,
+      serviceConfig,
+      serviceAdapter,
+      origin
+    );
+    sandbox
+      .stub(viewerPlatform.viewer_, 'sendMessageAwaitResponse')
+      .callsFake(() => Promise.resolve(fakeAuthToken));
+    sendAuthTokenStub = sandbox.stub(
+      viewerPlatform,
+      'sendAuthTokenErrorToViewer_'
+    );
   });
 
   describe('getEntitlements', () => {
     it('should call verify() with authorization and decryptedDocKey', () => {
       const entitlement = {};
-      const verifyAuthTokenStub =
-        sandbox.stub(viewerPlatform, 'verifyAuthToken_').callsFake(
-            () => Promise.resolve(entitlement));
+      const verifyAuthTokenStub = sandbox
+        .stub(viewerPlatform, 'verifyAuthToken_')
+        .callsFake(() => Promise.resolve(entitlement));
       return viewerPlatform.getEntitlements().then(() => {
         expect(verifyAuthTokenStub).to.be.calledWith(
-            fakeAuthToken['authorization'],
-            fakeAuthToken['decryptedDocumentKey'],
+          fakeAuthToken['authorization'],
+          fakeAuthToken['decryptedDocumentKey']
         );
       });
     });
 
     it('should send auth rejection message for rejected verification', () => {
       const reason = 'Payload is expired';
-      sandbox.stub(viewerPlatform, 'verifyAuthToken_').callsFake(
-          () => Promise.reject(new Error(reason)));
+      sandbox
+        .stub(viewerPlatform, 'verifyAuthToken_')
+        .callsFake(() => Promise.reject(new Error(reason)));
       return viewerPlatform.getEntitlements().catch(() => {
         expect(sendAuthTokenStub).to.be.calledWith(reason);
       });
@@ -103,7 +120,7 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, env => {
 
   describe('subscriptionchange message', () => {
     it('should call resetPlatforms() on a subscriptionchange message', () => {
-      (messageCallback)();
+      messageCallback();
       expect(resetPlatformsStub).to.be.called;
     });
   });
@@ -117,119 +134,133 @@ describes.fakeWin('ViewerSubscriptionPlatform', {amp: true}, env => {
     entitlement.service = 'local';
 
     it('should reject promise for expired payload', () => {
-      sandbox.stub(viewerPlatform.jwtHelper_, 'decode')
-          .callsFake(() => {return {
-            'aud': getWinOrigin(win),
-            'exp': (Date.now() / 1000) - 10,
-            'entitlements': [entitlementData],
-          };});
+      sandbox.stub(viewerPlatform.jwtHelper_, 'decode').callsFake(() => {
+        return {
+          'aud': getWinOrigin(win),
+          'exp': Date.now() / 1000 - 10,
+          'entitlements': [entitlementData],
+        };
+      });
       return viewerPlatform.verifyAuthToken_('faketoken').catch(reason => {
         expect(reason.message).to.be.equal('Payload is expired​​​');
       });
     });
 
     it('should reject promise for audience mismatch', () => {
-      sandbox.stub(viewerPlatform.jwtHelper_, 'decode')
-          .callsFake(() => {return {
-            'aud': 'random origin',
-            'exp': Math.floor(Date.now() / 1000) + 5 * 60,
-            'entitlements': [entitlementData],
-          };});
+      sandbox.stub(viewerPlatform.jwtHelper_, 'decode').callsFake(() => {
+        return {
+          'aud': 'random origin',
+          'exp': Math.floor(Date.now() / 1000) + 5 * 60,
+          'entitlements': [entitlementData],
+        };
+      });
       return viewerPlatform.verifyAuthToken_('faketoken').catch(reason => {
         expect(reason.message).to.be.equals(
-            'The mismatching "aud" field: random origin​​​');
+          'The mismatching "aud" field: random origin​​​'
+        );
       });
     });
 
     it('should resolve promise with entitlement', () => {
-      sandbox.stub(viewerPlatform.jwtHelper_, 'decode')
-          .callsFake(() => {return {
-            'aud': getWinOrigin(win),
-            'exp': Math.floor(Date.now() / 1000) + 5 * 60,
-            'entitlements': [entitlementData],
-          };});
-      return viewerPlatform.verifyAuthToken_('faketoken').then(
-          resolvedEntitlement => {
-            expect(resolvedEntitlement).to.be.not.undefined;
-            expect(resolvedEntitlement.service).to.equal(
-                entitlementData.service);
-            expect(resolvedEntitlement.source).to.equal('viewer');
-            expect(resolvedEntitlement.granted).to.be
-                .equal(entitlementData.products.indexOf(currentProductId)
-                  !== -1);
-            expect(resolvedEntitlement.grantReason).to.be
-                .equal(GrantReason.SUBSCRIBER);
-            // raw should be the data which was resolved via
-            // sendMessageAwaitResponse.
-            expect(resolvedEntitlement.raw).to
-                .equal('faketoken');
-            expect(resolvedEntitlement.decryptedDocumentKey).to.be.undefined;
-          });
+      sandbox.stub(viewerPlatform.jwtHelper_, 'decode').callsFake(() => {
+        return {
+          'aud': getWinOrigin(win),
+          'exp': Math.floor(Date.now() / 1000) + 5 * 60,
+          'entitlements': [entitlementData],
+        };
+      });
+      return viewerPlatform
+        .verifyAuthToken_('faketoken')
+        .then(resolvedEntitlement => {
+          expect(resolvedEntitlement).to.be.not.undefined;
+          expect(resolvedEntitlement.service).to.equal(entitlementData.service);
+          expect(resolvedEntitlement.source).to.equal('viewer');
+          expect(resolvedEntitlement.granted).to.be.equal(
+            entitlementData.products.indexOf(currentProductId) !== -1
+          );
+          expect(resolvedEntitlement.grantReason).to.be.equal(
+            GrantReason.SUBSCRIBER
+          );
+          // raw should be the data which was resolved via
+          // sendMessageAwaitResponse.
+          expect(resolvedEntitlement.raw).to.equal('faketoken');
+          expect(resolvedEntitlement.decryptedDocumentKey).to.be.undefined;
+        });
     });
 
     it('should resolve promise with entitlement and decryptedDocKey', () => {
-      sandbox.stub(viewerPlatform.jwtHelper_, 'decode')
-          .callsFake(() => {return {
-            'aud': getWinOrigin(win),
-            'exp': Math.floor(Date.now() / 1000) + 5 * 60,
-            'entitlements': [entitlementData],
-          };});
-      return viewerPlatform.verifyAuthToken_(
-          'faketoken', 'decryptedDocumentKey').then(
-          resolvedEntitlement => {
-            expect(resolvedEntitlement.decryptedDocumentKey).to
-                .equal('decryptedDocumentKey');
-          });
+      sandbox.stub(viewerPlatform.jwtHelper_, 'decode').callsFake(() => {
+        return {
+          'aud': getWinOrigin(win),
+          'exp': Math.floor(Date.now() / 1000) + 5 * 60,
+          'entitlements': [entitlementData],
+        };
+      });
+      return viewerPlatform
+        .verifyAuthToken_('faketoken', 'decryptedDocumentKey')
+        .then(resolvedEntitlement => {
+          expect(resolvedEntitlement.decryptedDocumentKey).to.equal(
+            'decryptedDocumentKey'
+          );
+        });
     });
 
-    it('should resolve granted entitlement, with metering in data if '
-        + 'viewer only sends metering', () => {
-      sandbox.stub(viewerPlatform.jwtHelper_, 'decode')
-          .callsFake(() => {return {
+    it(
+      'should resolve granted entitlement, with metering in data if ' +
+        'viewer only sends metering',
+      () => {
+        sandbox.stub(viewerPlatform.jwtHelper_, 'decode').callsFake(() => {
+          return {
             'aud': getWinOrigin(win),
             'exp': Math.floor(Date.now() / 1000) + 5 * 60,
             'metering': {
               left: 3,
             },
-          };});
-      return viewerPlatform.verifyAuthToken_('faketoken').then(
-          resolvedEntitlement => {
+          };
+        });
+        return viewerPlatform
+          .verifyAuthToken_('faketoken')
+          .then(resolvedEntitlement => {
             expect(resolvedEntitlement).to.be.not.undefined;
             expect(resolvedEntitlement.service).to.equal('local');
             expect(resolvedEntitlement.granted).to.be.equal(true);
-            expect(resolvedEntitlement.grantReason).to.be
-                .equal(GrantReason.METERING);
+            expect(resolvedEntitlement.grantReason).to.be.equal(
+              GrantReason.METERING
+            );
             // raw should be the data which was resolved via
             // sendMessageAwaitResponse.
             expect(resolvedEntitlement.data).to.deep.equal({
               left: 3,
             });
           });
-    });
+      }
+    );
   });
 
   describe('proxy methods', () => {
     it('should delegate getServiceId', () => {
-      const proxyStub =
-        sandbox.stub(viewerPlatform.platform_, 'getServiceId');
+      const proxyStub = sandbox.stub(viewerPlatform.platform_, 'getServiceId');
       viewerPlatform.getServiceId();
       expect(proxyStub).to.be.called;
     });
     it('should delegate isPingbackEnabled', () => {
-      const proxyStub =
-        sandbox.stub(viewerPlatform.platform_, 'isPingbackEnabled');
+      const proxyStub = sandbox.stub(
+        viewerPlatform.platform_,
+        'isPingbackEnabled'
+      );
       viewerPlatform.isPingbackEnabled();
       expect(proxyStub).to.be.called;
     });
     it('should delegate pingback', () => {
-      const proxyStub =
-        sandbox.stub(viewerPlatform.platform_, 'pingback');
+      const proxyStub = sandbox.stub(viewerPlatform.platform_, 'pingback');
       viewerPlatform.pingback();
       expect(proxyStub).to.be.called;
     });
     it('should delegate getSupportedScoreFactor', () => {
-      const proxyStub =
-        sandbox.stub(viewerPlatform.platform_, 'getSupportedScoreFactor');
+      const proxyStub = sandbox.stub(
+        viewerPlatform.platform_,
+        'getSupportedScoreFactor'
+      );
       viewerPlatform.getSupportedScoreFactor('currentViewer');
       expect(proxyStub).to.be.called;
     });
diff --git a/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js b/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
index 381dc5eb97b7..b108f0f18635 100644
--- a/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
+++ b/extensions/amp-subscriptions/0.1/test/test-viewer-tracker.js
@@ -29,7 +29,7 @@ describes.realWin('ViewerTracker', {amp: true}, env => {
   });
 
   describe('scheduleView', () => {
-    it('should call `reportWhenViewed_`, if viewer is visible' ,() => {
+    it('should call `reportWhenViewed_`, if viewer is visible', () => {
       const whenViewedStub = sandbox.stub(viewTracker, 'reportWhenViewed_');
       sandbox.stub(viewTracker.viewer_, 'isVisible').callsFake(() => true);
       return viewTracker.scheduleView(2000).then(() => {
@@ -37,13 +37,16 @@ describes.realWin('ViewerTracker', {amp: true}, env => {
       });
     });
 
-    it('should call `reportWhenViewed_`, when viewer gets visible' , () => {
+    it('should call `reportWhenViewed_`, when viewer gets visible', () => {
       let visibleState = false;
       const whenViewedStub = sandbox.stub(viewTracker, 'reportWhenViewed_');
-      const visibilityChangedStub =
-          sandbox.stub(viewTracker.viewer_, 'onVisibilityChanged');
-      const visibilitySandbox = sandbox.stub(viewTracker.viewer_, 'isVisible')
-          .callsFake(() => visibleState);
+      const visibilityChangedStub = sandbox.stub(
+        viewTracker.viewer_,
+        'onVisibilityChanged'
+      );
+      const visibilitySandbox = sandbox
+        .stub(viewTracker.viewer_, 'isVisible')
+        .callsFake(() => visibleState);
 
       const viewPromise = viewTracker.scheduleView(2000);
 
@@ -64,8 +67,9 @@ describes.realWin('ViewerTracker', {amp: true}, env => {
 
   describe('reportWhenViewed_', () => {
     it('should call whenViewed_', () => {
-      const whenViewedStub = sandbox.stub(viewTracker, 'whenViewed_')
-          .callsFake(() => Promise.resolve());
+      const whenViewedStub = sandbox
+        .stub(viewTracker, 'whenViewed_')
+        .callsFake(() => Promise.resolve());
       viewTracker.reportWhenViewed_(2000);
       expect(whenViewedStub).to.be.calledOnce;
     });
diff --git a/extensions/amp-subscriptions/0.1/url-builder.js b/extensions/amp-subscriptions/0.1/url-builder.js
index 3e8a3ed14528..12d91661209e 100644
--- a/extensions/amp-subscriptions/0.1/url-builder.js
+++ b/extensions/amp-subscriptions/0.1/url-builder.js
@@ -17,7 +17,6 @@
 import {Services} from '../../../src/services';
 import {getValueForExpr} from '../../../src/json';
 
-
 export class UrlBuilder {
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
diff --git a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
index 1fba53f8e0dc..a2ec377b085c 100644
--- a/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
+++ b/extensions/amp-subscriptions/0.1/viewer-subscription-platform.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {Entitlement, GrantReason} from './entitlement';
 import {JwtHelper} from '../../amp-access/0.1/jwt';
 import {PageConfig} from '../../../third_party/subscriptions-project/config';
@@ -24,13 +23,11 @@ import {dict} from '../../../src/utils/object';
 import {getSourceOrigin, getWinOrigin} from '../../../src/url';
 import {localSubscriptionPlatformFactory} from './local-subscription-platform';
 
-
 /**
  * This implements the methods to interact with viewer subscription platform.
  * @implements {./subscription-platform.SubscriptionPlatform}
  */
 export class ViewerSubscriptionPlatform {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!JsonObject} platformConfig
@@ -49,12 +46,17 @@ export class ViewerSubscriptionPlatform {
 
     /** @private @const {!./subscription-platform.SubscriptionPlatform} */
     this.platform_ = localSubscriptionPlatformFactory(
-        ampdoc, platformConfig, serviceAdapter);
+      ampdoc,
+      platformConfig,
+      serviceAdapter
+    );
 
     /** @const @private {!../../../src/service/viewer-impl.Viewer} */
     this.viewer_ = Services.viewerForDoc(this.ampdoc_);
-    this.viewer_.onMessage('subscriptionchange',
-        this.subscriptionChange_.bind(this));
+    this.viewer_.onMessage(
+      'subscriptionchange',
+      this.subscriptionChange_.bind(this)
+    );
 
     /** @private @const {!JwtHelper} */
     this.jwtHelper_ = new JwtHelper(ampdoc.win);
@@ -86,25 +88,29 @@ export class ViewerSubscriptionPlatform {
     // TODO(chenshay): Viewer Matching: We don't know which viewer it actually
     // is. Need to check the viewerUrl to know, or more specificlly iterate via
     // configured platforms and check whether any of these support the viewer.
-    const encryptedDocumentKey =
-        this.serviceAdapter_.getEncryptedDocumentKey('google.com');
+    const encryptedDocumentKey = this.serviceAdapter_.getEncryptedDocumentKey(
+      'google.com'
+    );
     if (encryptedDocumentKey) {
       messageData['encryptedDocumentKey'] = encryptedDocumentKey;
     }
-    const entitlementPromise = this.viewer_.sendMessageAwaitResponse(
-        'auth', messageData).then(entitlementData => {
-      const authData = (entitlementData || {})['authorization'];
-      const decryptedDocumentKey =
-          (entitlementData || {})['decryptedDocumentKey'];
-      if (!authData) {
-        return Entitlement.empty('local');
-      }
-      return this.verifyAuthToken_(authData, decryptedDocumentKey);
-    }).catch(reason => {
-      this.sendAuthTokenErrorToViewer_(reason.message);
-      throw reason;
-    });
-    return /** @type{!Promise<Entitlement>} */ (entitlementPromise);
+    const entitlementPromise = this.viewer_
+      .sendMessageAwaitResponse('auth', messageData)
+      .then(entitlementData => {
+        const authData = (entitlementData || {})['authorization'];
+        const decryptedDocumentKey = (entitlementData || {})[
+          'decryptedDocumentKey'
+        ];
+        if (!authData) {
+          return Entitlement.empty('local');
+        }
+        return this.verifyAuthToken_(authData, decryptedDocumentKey);
+      })
+      .catch(reason => {
+        this.sendAuthTokenErrorToViewer_(reason.message);
+        throw reason;
+      });
+    return /** @type {!Promise<Entitlement>} */ (entitlementPromise);
   }
 
   /**
@@ -120,12 +126,13 @@ export class ViewerSubscriptionPlatform {
       const sourceOrigin = getSourceOrigin(this.ampdoc_.win.location);
       const decodedData = this.jwtHelper_.decode(token);
       const currentProductId = /** @type {string} */ (userAssert(
-          this.pageConfig_.getProductId(),
-          'Product id is null'
+        this.pageConfig_.getProductId(),
+        'Product id is null'
       ));
       if (decodedData['aud'] != origin && decodedData['aud'] != sourceOrigin) {
         throw user().createError(
-            `The mismatching "aud" field: ${decodedData['aud']}`);
+          `The mismatching "aud" field: ${decodedData['aud']}`
+        );
       }
       if (decodedData['exp'] < Math.floor(Date.now() / 1000)) {
         throw user().createError('Payload is expired');
@@ -134,15 +141,17 @@ export class ViewerSubscriptionPlatform {
       let entitlement = Entitlement.empty('local');
       if (Array.isArray(entitlements)) {
         for (let index = 0; index < entitlements.length; index++) {
-          if (entitlements[index]['products'].indexOf(currentProductId)
-              !== -1) {
+          if (
+            entitlements[index]['products'].indexOf(currentProductId) !== -1
+          ) {
             const entitlementObject = entitlements[index];
             entitlement = new Entitlement({
               source: 'viewer',
               raw: token,
               granted: true,
-              grantReason: entitlementObject.subscriptionToken ?
-                GrantReason.SUBSCRIBER : '',
+              grantReason: entitlementObject.subscriptionToken
+                ? GrantReason.SUBSCRIBER
+                : '',
               dataObject: entitlementObject,
               decryptedDocumentKey,
             });
@@ -159,13 +168,15 @@ export class ViewerSubscriptionPlatform {
           dataObject: decodedData['metering'],
           decryptedDocumentKey,
         });
-      } else if (entitlements) { // Not null
+      } else if (entitlements) {
+        // Not null
         entitlement = new Entitlement({
           source: 'viewer',
           raw: token,
           granted: entitlements.granted,
-          grantReason: entitlements.subscriptionToken ?
-            GrantReason.SUBSCRIBER : '',
+          grantReason: entitlements.subscriptionToken
+            ? GrantReason.SUBSCRIBER
+            : '',
           dataObject: entitlements,
           decryptedDocumentKey,
         });
@@ -181,9 +192,12 @@ export class ViewerSubscriptionPlatform {
    * @private
    */
   sendAuthTokenErrorToViewer_(errorString) {
-    this.viewer_.sendMessage('auth-rejected', dict({
-      'reason': errorString,
-    }));
+    this.viewer_.sendMessage(
+      'auth-rejected',
+      dict({
+        'reason': errorString,
+      })
+    );
   }
 
   /** @override */
@@ -192,12 +206,10 @@ export class ViewerSubscriptionPlatform {
   }
 
   /** @override */
-  activate() {
-  }
+  activate() {}
 
   /** @override */
-  reset() {
-  }
+  reset() {}
 
   /** @override */
   isPingbackEnabled() {
@@ -209,7 +221,6 @@ export class ViewerSubscriptionPlatform {
     this.platform_.pingback(selectedPlatform);
   }
 
-
   /** @override */
   getSupportedScoreFactor(factorName) {
     return this.platform_.getSupportedScoreFactor(factorName);
diff --git a/extensions/amp-subscriptions/0.1/viewer-tracker.js b/extensions/amp-subscriptions/0.1/viewer-tracker.js
index 641b03b34a1e..91c3b4812d48 100644
--- a/extensions/amp-subscriptions/0.1/viewer-tracker.js
+++ b/extensions/amp-subscriptions/0.1/viewer-tracker.js
@@ -72,13 +72,12 @@ export class ViewerTracker {
       return this.reportViewPromise_;
     }
     dev().fine(TAG, 'start view monitoring');
-    this.reportViewPromise_ = this.whenViewed_(timeToView)
-        .catch(reason => {
-          // Ignore - view has been canceled.
-          dev().fine(TAG, 'view cancelled:', reason);
-          this.reportViewPromise_ = null;
-          throw reason;
-        });
+    this.reportViewPromise_ = this.whenViewed_(timeToView).catch(reason => {
+      // Ignore - view has been canceled.
+      dev().fine(TAG, 'view cancelled:', reason);
+      this.reportViewPromise_ = null;
+      throw reason;
+    });
 
     return this.reportViewPromise_;
   }
@@ -102,11 +101,13 @@ export class ViewerTracker {
     const unlistenSet = [];
     return new Promise((resolve, reject) => {
       // 1. Document becomes invisible again: cancel.
-      unlistenSet.push(this.viewer_.onVisibilityChanged(() => {
-        if (!this.viewer_.isVisible()) {
-          reject(cancellation());
-        }
-      }));
+      unlistenSet.push(
+        this.viewer_.onVisibilityChanged(() => {
+          if (!this.viewer_.isVisible()) {
+            reject(cancellation());
+          }
+        })
+      );
 
       // 2. After a few seconds: register a view.
       const timeoutId = this.timer_.delay(resolve, timeToView);
@@ -116,13 +117,17 @@ export class ViewerTracker {
       unlistenSet.push(this.viewport_.onScroll(resolve));
 
       // 4. Tap: register a view.
-      unlistenSet.push(listenOnce(this.ampdoc_.getRootNode(),
-          'click', resolve));
-    }).then(() => {
-      unlistenSet.forEach(unlisten => unlisten());
-    }, reason => {
-      unlistenSet.forEach(unlisten => unlisten());
-      throw reason;
-    });
+      unlistenSet.push(
+        listenOnce(this.ampdoc_.getRootNode(), 'click', resolve)
+      );
+    }).then(
+      () => {
+        unlistenSet.forEach(unlisten => unlisten());
+      },
+      reason => {
+        unlistenSet.forEach(unlisten => unlisten());
+        throw reason;
+      }
+    );
   }
 }
diff --git a/extensions/amp-timeago/0.1/amp-timeago.js b/extensions/amp-timeago/0.1/amp-timeago.js
index 74489318e05d..fefdacee7d75 100644
--- a/extensions/amp-timeago/0.1/amp-timeago.js
+++ b/extensions/amp-timeago/0.1/amp-timeago.js
@@ -19,7 +19,6 @@ import {timeago} from '../../../third_party/timeagojs/timeago';
 import {userAssert} from '../../../src/log';
 
 export class AmpTimeAgo extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -42,11 +41,15 @@ export class AmpTimeAgo extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(this.element.textContent.length > 0,
-        'Content cannot be empty. Found in: %s', this.element);
+    userAssert(
+      this.element.textContent.length > 0,
+      'Content cannot be empty. Found in: %s',
+      this.element
+    );
 
     this.datetime_ = this.element.getAttribute('datetime');
-    this.locale_ = this.element.getAttribute('locale') ||
+    this.locale_ =
+      this.element.getAttribute('locale') ||
       this.win.document.documentElement.lang;
     this.title_ = this.element.textContent.trim();
 
diff --git a/extensions/amp-timeago/0.1/test/test-amp-timeago.js b/extensions/amp-timeago/0.1/test/test-amp-timeago.js
index bcd875abecd3..06a27423f03d 100644
--- a/extensions/amp-timeago/0.1/test/test-amp-timeago.js
+++ b/extensions/amp-timeago/0.1/test/test-amp-timeago.js
@@ -15,71 +15,73 @@
  */
 import '../amp-timeago';
 
-describes.realWin('amp-timeago', {
-  amp: {
-    extensions: ['amp-timeago'],
+describes.realWin(
+  'amp-timeago',
+  {
+    amp: {
+      extensions: ['amp-timeago'],
+    },
   },
-}, env => {
+  env => {
+    let win;
+    let element;
 
-  let win;
-  let element;
+    const timeout = ms => new Promise(res => setTimeout(res, ms));
 
-  const timeout = ms => new Promise(res => setTimeout(res, ms));
-
-  beforeEach(() => {
-    win = env.win;
-    element = win.document.createElement('amp-timeago');
-    element.setAttribute('layout', 'fixed');
-    element.setAttribute('width', '160px');
-    element.setAttribute('height', '20px');
-    win.document.body.appendChild(element);
-  });
-
-  it('should display 2 days ago when built', () => {
-    const date = new Date();
-    date.setDate(date.getDate() - 2);
-    element.setAttribute('datetime', date.toISOString());
-    element.textContent = date.toString();
-    element.build();
-    const timeElement = element.querySelector('time');
-    expect(timeElement.textContent).to.equal('2 days ago');
-  });
+    beforeEach(() => {
+      win = env.win;
+      element = win.document.createElement('amp-timeago');
+      element.setAttribute('layout', 'fixed');
+      element.setAttribute('width', '160px');
+      element.setAttribute('height', '20px');
+      win.document.body.appendChild(element);
+    });
 
-  it('should display original date when older than cutoff', () => {
-    const date = new Date('2017-01-01');
-    element.setAttribute('datetime', date.toISOString());
-    element.textContent = 'Sunday 1 January 2017';
-    element.setAttribute('cutoff', '8640000');
-    element.build();
-    const timeElement = element.querySelector('time');
-    expect(timeElement.textContent).to.equal('Sunday 1 January 2017');
-  });
+    it('should display 2 days ago when built', () => {
+      const date = new Date();
+      date.setDate(date.getDate() - 2);
+      element.setAttribute('datetime', date.toISOString());
+      element.textContent = date.toString();
+      element.build();
+      const timeElement = element.querySelector('time');
+      expect(timeElement.textContent).to.equal('2 days ago');
+    });
 
-  it('should update fuzzy timestamp on viewportCallback', async function() {
-    const date = new Date();
-    date.setSeconds(date.getSeconds() - 10);
-    element.setAttribute('datetime', date.toISOString());
-    element.textContent = date.toString();
-    element.build();
-    await timeout(1000);
-    element.viewportCallback(true);
-    const timeElement = element.querySelector('time');
-    expect(timeElement.textContent).to.equal('11 seconds ago');
-  });
+    it('should display original date when older than cutoff', () => {
+      const date = new Date('2017-01-01');
+      element.setAttribute('datetime', date.toISOString());
+      element.textContent = 'Sunday 1 January 2017';
+      element.setAttribute('cutoff', '8640000');
+      element.build();
+      const timeElement = element.querySelector('time');
+      expect(timeElement.textContent).to.equal('Sunday 1 January 2017');
+    });
 
-  it('should update after mutation of datetime attribute', () => {
-    const date = new Date();
-    date.setDate(date.getDate() - 2);
-    element.setAttribute('datetime', date.toISOString());
-    element.textContent = date.toString();
-    element.build();
-    date.setDate(date.getDate() + 1);
-    element.setAttribute('datetime', date.toString());
-    element.mutatedAttributesCallback({
-      'datetime': date.toString(),
+    it('should update fuzzy timestamp on viewportCallback', async function() {
+      const date = new Date();
+      date.setSeconds(date.getSeconds() - 10);
+      element.setAttribute('datetime', date.toISOString());
+      element.textContent = date.toString();
+      element.build();
+      await timeout(1000);
+      element.viewportCallback(true);
+      const timeElement = element.querySelector('time');
+      expect(timeElement.textContent).to.equal('11 seconds ago');
     });
-    const timeElement = element.querySelector('time');
-    expect(timeElement.textContent).to.equal('1 day ago');
-  });
 
-});
+    it('should update after mutation of datetime attribute', () => {
+      const date = new Date();
+      date.setDate(date.getDate() - 2);
+      element.setAttribute('datetime', date.toISOString());
+      element.textContent = date.toString();
+      element.build();
+      date.setDate(date.getDate() + 1);
+      element.setAttribute('datetime', date.toString());
+      element.mutatedAttributesCallback({
+        'datetime': date.toString(),
+      });
+      const timeElement = element.querySelector('time');
+      expect(timeElement.textContent).to.equal('1 day ago');
+    });
+  }
+);
diff --git a/extensions/amp-twitter/0.1/amp-twitter.js b/extensions/amp-twitter/0.1/amp-twitter.js
index 5dcff3a1d535..edba3c7d3aff 100644
--- a/extensions/amp-twitter/0.1/amp-twitter.js
+++ b/extensions/amp-twitter/0.1/amp-twitter.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {CSS} from '../../../build/amp-twitter-0.1.css';
 import {MessageType} from '../../../src/3p-frame-messaging';
 import {getIframe, preloadBootstrap} from '../../../src/3p-frame';
@@ -61,7 +60,6 @@ function enableDefaultPlaceholder(win) {
 }
 
 class AmpTwitter extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -105,7 +103,9 @@ class AmpTwitter extends AMP.BaseElement {
     preloadBootstrap(this.win, this.preconnect);
     // Hosts the script that renders tweets.
     this.preconnect.preload(
-        'https://platform.twitter.com/widgets.js', 'script');
+      'https://platform.twitter.com/widgets.js',
+      'script'
+    );
     // This domain serves the actual tweets as JSONP.
     this.preconnect.url('https://syndication.twitter.com', opt_onLayout);
     // All images
@@ -125,8 +125,9 @@ class AmpTwitter extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    const iframe = getIframe(this.win, this.element, 'twitter', null,
-        {allowFullscreen: true});
+    const iframe = getIframe(this.win, this.element, 'twitter', null, {
+      allowFullscreen: true,
+    });
     this.applyFillContent(iframe);
     iframe.classList.add('i-amphtml-twitter-iframe');
     if (isPulsingPlaceholder(this.win)) {
@@ -139,12 +140,22 @@ class AmpTwitter extends AMP.BaseElement {
       this.element.classList.add('i-amphtml-twitter-burst');
     }
     this.updateForLoadingState_();
-    listenFor(iframe, MessageType.EMBED_SIZE, data => {
-      this.updateForSuccessState_(data['height']);
-    }, /* opt_is3P */true);
-    listenFor(iframe, MessageType.NO_CONTENT, () => {
-      this.updateForFailureState_();
-    }, /* opt_is3P */true);
+    listenFor(
+      iframe,
+      MessageType.EMBED_SIZE,
+      data => {
+        this.updateForSuccessState_(data['height']);
+      },
+      /* opt_is3P */ true
+    );
+    listenFor(
+      iframe,
+      MessageType.NO_CONTENT,
+      () => {
+        this.updateForFailureState_();
+      },
+      /* opt_is3P */ true
+    );
     this.element.appendChild(iframe);
     this.iframe_ = iframe;
     return this.loadPromise(iframe);
@@ -156,13 +167,16 @@ class AmpTwitter extends AMP.BaseElement {
    */
   updateForLoadingState_() {
     let height;
-    this.measureMutateElement(() => {
-      height = this.element./*OK*/getBoundingClientRect().height;
-    }, () => {
-      this.element.setAttribute('i-amphtml-loading', 'start');
-      // Set an explicit height so we can animate it.
-      this./*OK*/changeHeight(height);
-    });
+    this.measureMutateElement(
+      () => {
+        height = this.element./*OK*/ getBoundingClientRect().height;
+      },
+      () => {
+        this.element.setAttribute('i-amphtml-loading', 'start');
+        // Set an explicit height so we can animate it.
+        this./*OK*/ changeHeight(height);
+      }
+    );
   }
 
   /**
@@ -172,22 +186,26 @@ class AmpTwitter extends AMP.BaseElement {
    */
   updateForSuccessState_(height) {
     let placeholderHeight;
-    this.measureMutateElement(() => {
-      if (!this.userPlaceholder_ && isFadingPlaceholder(this.win)) {
-        // Use an explicit height so that the placeholder does not move when\
-        // the container resizes.
-        placeholderHeight = this.element./*OK*/getBoundingClientRect().height;
+    this.measureMutateElement(
+      () => {
+        if (!this.userPlaceholder_ && isFadingPlaceholder(this.win)) {
+          // Use an explicit height so that the placeholder does not move when\
+          // the container resizes.
+          placeholderHeight = this.element./*OK*/ getBoundingClientRect()
+            .height;
+        }
+      },
+      () => {
+        if (this.userPlaceholder_) {
+          this.togglePlaceholder(false);
+        }
+        this.element.setAttribute('i-amphtml-loading', 'done');
+        this./*OK*/ changeHeight(height);
+        if (placeholderHeight) {
+          setStyle(this.getPlaceholder(), 'height', placeholderHeight, 'px');
+        }
       }
-    }, () => {
-      if (this.userPlaceholder_) {
-        this.togglePlaceholder(false);
-      }
-      this.element.setAttribute('i-amphtml-loading', 'done');
-      this./*OK*/changeHeight(height);
-      if (placeholderHeight) {
-        setStyle(this.getPlaceholder(), 'height', placeholderHeight, 'px');
-      }
-    });
+    );
   }
 
   /**
@@ -206,7 +224,7 @@ class AmpTwitter extends AMP.BaseElement {
       }
 
       if (content) {
-        this./*OK*/changeHeight(content./*OK*/offsetHeight);
+        this./*OK*/ changeHeight(content./*OK*/ offsetHeight);
       }
     });
   }
@@ -226,7 +244,6 @@ class AmpTwitter extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension('amp-twitter', '0.1', AMP => {
   const styles = enableDefaultPlaceholder(AMP.win) ? CSS : undefined;
   AMP.registerElement('amp-twitter', AmpTwitter, styles);
diff --git a/extensions/amp-twitter/0.1/test/test-amp-twitter.js b/extensions/amp-twitter/0.1/test/test-amp-twitter.js
index 05d99b639db1..455bc8198053 100644
--- a/extensions/amp-twitter/0.1/test/test-amp-twitter.js
+++ b/extensions/amp-twitter/0.1/test/test-amp-twitter.js
@@ -17,170 +17,178 @@
 import '../amp-twitter';
 import {cleanupTweetId_, twitter} from '../../../../3p/twitter';
 
-describes.realWin('amp-twitter', {
-  amp: {
-    extensions: ['amp-twitter'],
-    canonicalUrl: 'https://foo.bar/baz',
+describes.realWin(
+  'amp-twitter',
+  {
+    amp: {
+      extensions: ['amp-twitter'],
+      canonicalUrl: 'https://foo.bar/baz',
+    },
   },
-}, env => {
-  const tweetId = '585110598171631616';
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  function getAmpTwitter(tweetid) {
-    const ampTwitter = doc.createElement('amp-twitter');
-    ampTwitter.setAttribute('data-tweetid', tweetid);
-    ampTwitter.setAttribute('width', '111');
-    ampTwitter.setAttribute('height', '222');
-    doc.body.appendChild(ampTwitter);
-    return ampTwitter.build()
-        .then(() => ampTwitter.layoutCallback())
-        .then(() => ampTwitter);
-  }
-
-  it('renders iframe in amp-twitter', () => {
-    return getAmpTwitter(tweetId).then(ampTwitter => {
-      const iframe = ampTwitter.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.getAttribute('width')).to.equal('111');
-      expect(iframe.getAttribute('height')).to.equal('222');
-      expect(iframe.getAttribute('allowfullscreen')).to.equal('true');
-    });
-  });
+  env => {
+    const tweetId = '585110598171631616';
+    let win, doc;
 
-  it('adds tweet element correctly for a tweet', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    twitter(win, {
-      tweetid: tweetId,
-      width: 111,
-      height: 222,
-    });
-    const tweet = doc.body.querySelector('#tweet');
-    expect(tweet).not.to.be.undefined;
-  });
-
-  it('adds tweet element correctly for a moment', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    twitter(win, {
-      momentid: tweetId,
-      limit: 5,
-      width: 111,
-      height: 222,
-    });
-    const tweet = doc.body.querySelector('#tweet');
-    expect(tweet).not.to.be.undefined;
-  });
-
-  it('adds tweet element correctly for a profile timeline', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    twitter(win, {
-      timelineSourceType: 'profile',
-      timelineScreenName: 'amphtml',
-      width: 111,
-      height: 222,
-    });
-    const tweet = doc.body.querySelector('#tweet');
-    expect(tweet).not.to.be.undefined;
-  });
-
-  it('adds tweet element correctly for a likes timeline', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
-
-    twitter(win, {
-      timelineSourceType: 'likes',
-      timelineScreenName: 'amphtml',
-      width: 111,
-      height: 222,
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
     });
-    const tweet = doc.body.querySelector('#tweet');
-    expect(tweet).not.to.be.undefined;
-  });
-
-  it('removes iframe after unlayoutCallback', () => {
-    return getAmpTwitter(tweetId).then(ampTwitter => {
-      const iframe = ampTwitter.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = ampTwitter.implementation_;
-      obj.unlayoutCallback();
-      expect(ampTwitter.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(obj.unlayoutOnPause()).to.be.true;
-    });
-  });
-
-  describe('cleanupTweetId_', () => {
-    it('does not affect valid tweet ids', () => {
-      const good = '585110598171631616';
 
-      expect(cleanupTweetId_(good)).to.equal(tweetId);
+    function getAmpTwitter(tweetid) {
+      const ampTwitter = doc.createElement('amp-twitter');
+      ampTwitter.setAttribute('data-tweetid', tweetid);
+      ampTwitter.setAttribute('width', '111');
+      ampTwitter.setAttribute('height', '222');
+      doc.body.appendChild(ampTwitter);
+      return ampTwitter
+        .build()
+        .then(() => ampTwitter.layoutCallback())
+        .then(() => ampTwitter);
+    }
+
+    it('renders iframe in amp-twitter', () => {
+      return getAmpTwitter(tweetId).then(ampTwitter => {
+        const iframe = ampTwitter.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('width')).to.equal('111');
+        expect(iframe.getAttribute('height')).to.equal('222');
+        expect(iframe.getAttribute('allowfullscreen')).to.equal('true');
+      });
     });
 
-    it('does not affect valid tweet ids', () => {
-      const good = '20';
-
-      expect(cleanupTweetId_(good)).to.equal('20');
+    it('adds tweet element correctly for a tweet', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      twitter(win, {
+        tweetid: tweetId,
+        width: 111,
+        height: 222,
+      });
+      const tweet = doc.body.querySelector('#tweet');
+      expect(tweet).not.to.be.undefined;
     });
 
-    it('does not pick up random numbers', () => {
-      const bad1 = '<div>123</div>';
-      const bad2 = '123123junk123123';
-      const bad3 = 'https://twitter.com/1cram2force/status?ref=';
-      const bad4 = '<div>nonumber</div>';
-      const bad5 = 'aa585110598171631616?ref=twsrc%5etfw';
-      const bad6 = '';
-      const bad7 = '  ';
-
-      expect(cleanupTweetId_(bad1)).to.equal(bad1);
-      expect(cleanupTweetId_(bad2)).to.equal(bad2);
-      expect(cleanupTweetId_(bad3)).to.equal(bad3);
-      expect(cleanupTweetId_(bad4)).to.equal(bad4);
-      expect(cleanupTweetId_(bad5)).to.equal(bad5);
-      expect(cleanupTweetId_(bad6)).to.equal(bad6);
-      expect(cleanupTweetId_(bad7)).to.equal(bad7);
+    it('adds tweet element correctly for a moment', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      twitter(win, {
+        momentid: tweetId,
+        limit: 5,
+        width: 111,
+        height: 222,
+      });
+      const tweet = doc.body.querySelector('#tweet');
+      expect(tweet).not.to.be.undefined;
     });
 
-    it('cleans up bad tweet id with ref query string at end', () => {
-      const bad1 = '585110598171631616?ref=twsrc%5Etfw';
-      const bad2 = '585110598171631616?ref_src=twsrc%5Etfw';
-      expect(cleanupTweetId_(bad1)).to.equal(tweetId);
-      expect(cleanupTweetId_(bad2)).to.equal(tweetId);
+    it('adds tweet element correctly for a profile timeline', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      twitter(win, {
+        timelineSourceType: 'profile',
+        timelineScreenName: 'amphtml',
+        width: 111,
+        height: 222,
+      });
+      const tweet = doc.body.querySelector('#tweet');
+      expect(tweet).not.to.be.undefined;
     });
 
-    it('cleans up bad tweet full Url', () => {
-      const bad = 'https://twitter.com/cramforce/status/585110598171631616' +
-            '?ref=twsrc%5Etfw&ref_url=https%3A%2F%2Fd-371701311371384053.amp' +
-            'project.net%2F1507685388117%2Fframe.html';
-
-      expect(cleanupTweetId_(bad)).to.equal(tweetId);
+    it('adds tweet element correctly for a likes timeline', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      twitter(win, {
+        timelineSourceType: 'likes',
+        timelineScreenName: 'amphtml',
+        width: 111,
+        height: 222,
+      });
+      const tweet = doc.body.querySelector('#tweet');
+      expect(tweet).not.to.be.undefined;
     });
 
-    it('cleans up bad tweet Url with number in handle', () => {
-      const bad = 'https://twitter.com/cr123amforce/status/585110598171631616';
-
-      expect(cleanupTweetId_(bad)).to.equal(tweetId);
+    it('removes iframe after unlayoutCallback', () => {
+      return getAmpTwitter(tweetId).then(ampTwitter => {
+        const iframe = ampTwitter.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = ampTwitter.implementation_;
+        obj.unlayoutCallback();
+        expect(ampTwitter.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(obj.unlayoutOnPause()).to.be.true;
+      });
     });
 
-    it('cleans up bad tweet Url with numer query string and Case', () => {
-      const bad = 'htTps://tWitter.com/cE123amforce/stAtus/585110598171631616' +
-        '?ref=twsrc%5Etfw';
-
-      expect(cleanupTweetId_(bad)).to.equal(tweetId);
+    describe('cleanupTweetId_', () => {
+      it('does not affect valid tweet ids', () => {
+        const good = '585110598171631616';
+
+        expect(cleanupTweetId_(good)).to.equal(tweetId);
+      });
+
+      it('does not affect valid tweet ids', () => {
+        const good = '20';
+
+        expect(cleanupTweetId_(good)).to.equal('20');
+      });
+
+      it('does not pick up random numbers', () => {
+        const bad1 = '<div>123</div>';
+        const bad2 = '123123junk123123';
+        const bad3 = 'https://twitter.com/1cram2force/status?ref=';
+        const bad4 = '<div>nonumber</div>';
+        const bad5 = 'aa585110598171631616?ref=twsrc%5etfw';
+        const bad6 = '';
+        const bad7 = '  ';
+
+        expect(cleanupTweetId_(bad1)).to.equal(bad1);
+        expect(cleanupTweetId_(bad2)).to.equal(bad2);
+        expect(cleanupTweetId_(bad3)).to.equal(bad3);
+        expect(cleanupTweetId_(bad4)).to.equal(bad4);
+        expect(cleanupTweetId_(bad5)).to.equal(bad5);
+        expect(cleanupTweetId_(bad6)).to.equal(bad6);
+        expect(cleanupTweetId_(bad7)).to.equal(bad7);
+      });
+
+      it('cleans up bad tweet id with ref query string at end', () => {
+        const bad1 = '585110598171631616?ref=twsrc%5Etfw';
+        const bad2 = '585110598171631616?ref_src=twsrc%5Etfw';
+        expect(cleanupTweetId_(bad1)).to.equal(tweetId);
+        expect(cleanupTweetId_(bad2)).to.equal(tweetId);
+      });
+
+      it('cleans up bad tweet full Url', () => {
+        const bad =
+          'https://twitter.com/cramforce/status/585110598171631616' +
+          '?ref=twsrc%5Etfw&ref_url=https%3A%2F%2Fd-371701311371384053.amp' +
+          'project.net%2F1507685388117%2Fframe.html';
+
+        expect(cleanupTweetId_(bad)).to.equal(tweetId);
+      });
+
+      it('cleans up bad tweet Url with number in handle', () => {
+        const bad =
+          'https://twitter.com/cr123amforce/status/585110598171631616';
+
+        expect(cleanupTweetId_(bad)).to.equal(tweetId);
+      });
+
+      it('cleans up bad tweet Url with numer query string and Case', () => {
+        const bad =
+          'htTps://tWitter.com/cE123amforce/stAtus/585110598171631616' +
+          '?ref=twsrc%5Etfw';
+
+        expect(cleanupTweetId_(bad)).to.equal(tweetId);
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-user-notification/0.1/amp-user-notification.js b/extensions/amp-user-notification/0.1/amp-user-notification.js
index 530fa527e94b..9f09546a1594 100644
--- a/extensions/amp-user-notification/0.1/amp-user-notification.js
+++ b/extensions/amp-user-notification/0.1/amp-user-notification.js
@@ -50,13 +50,11 @@ let GetResponseMetadataDef;
  */
 let UserNotificationDeferDef;
 
-
 /**
  * Defines underlying API for Notification components.
  * @interface
  */
 class NotificationInterface {
-
   /**
    * Promise that is resolved with a boolean on whether this Notification
    * should be shown or not.
@@ -84,7 +82,6 @@ class NotificationInterface {
  * @implements {NotificationInterface}
  */
 export class AmpUserNotification extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -142,8 +139,10 @@ export class AmpUserNotification extends AMP.BaseElement {
     this.urlReplacements_ = Services.urlReplacementsForDoc(this.element);
     this.storagePromise_ = Services.storageForDoc(this.element);
 
-    this.elementId_ = userAssert(this.element.id,
-        'amp-user-notification should have an id.');
+    this.elementId_ = userAssert(
+      this.element.id,
+      'amp-user-notification should have an id.'
+    );
 
     this.storageKey_ = 'amp-user-notification:' + this.elementId_;
 
@@ -159,20 +158,19 @@ export class AmpUserNotification extends AMP.BaseElement {
     // number using when we add them so we can see easily test
     // how many flags were set.  We want 0 or 1.
     userAssert(
-        !!this.showIfHref_ +
-        !!this.showIfGeo_ +
-        !!this.showIfNotGeo_ <= 1,
-        'Only one "data-show-if-*" attribute allowed'
+      !!this.showIfHref_ + !!this.showIfGeo_ + !!this.showIfNotGeo_ <= 1,
+      'Only one "data-show-if-*" attribute allowed'
     );
 
     if (this.showIfGeo_) {
-      this.geoPromise_ =
-        this.isNotificationRequiredGeo_(this.showIfGeo_, true);
+      this.geoPromise_ = this.isNotificationRequiredGeo_(this.showIfGeo_, true);
     }
 
     if (this.showIfNotGeo_) {
-      this.geoPromise_ =
-        this.isNotificationRequiredGeo_(this.showIfNotGeo_, false);
+      this.geoPromise_ = this.isNotificationRequiredGeo_(
+        this.showIfNotGeo_,
+        false
+      );
     }
 
     this.dismissHref_ = this.element.getAttribute('data-dismiss-href');
@@ -187,22 +185,26 @@ export class AmpUserNotification extends AMP.BaseElement {
     }
 
     const persistDismissal = this.element.getAttribute(
-        'data-persist-dismissal');
+      'data-persist-dismissal'
+    );
 
-    this.persistDismissal_ = (
-      persistDismissal != 'false' && persistDismissal != 'no');
+    this.persistDismissal_ =
+      persistDismissal != 'false' && persistDismissal != 'no';
 
     this.registerDefaultAction(
-        () => this.dismiss(/*forceNoPersist*/ false),
-        'dismiss');
+      () => this.dismiss(/*forceNoPersist*/ false),
+      'dismiss'
+    );
     this.registerAction('optoutOfCid', () => this.optoutOfCid_());
 
     const userNotificationManagerPromise =
-        /** @type {!Promise<!UserNotificationManager>} */
-        (getServicePromiseForDoc(ampdoc, SERVICE_ID));
+      /** @type {!Promise<!UserNotificationManager>} */
+      (getServicePromiseForDoc(ampdoc, SERVICE_ID));
     userNotificationManagerPromise.then(manager => {
       manager.registerUserNotification(
-          dev().assertString(this.elementId_), this);
+        dev().assertString(this.elementId_),
+        this
+      );
     });
   }
 
@@ -214,8 +216,7 @@ export class AmpUserNotification extends AMP.BaseElement {
    */
   isNotificationRequiredGeo_(geoGroup, includeGeos) {
     return Services.geoForDocOrNull(this.element).then(geo => {
-      userAssert(geo,
-          'requires <amp-geo> to use promptIfUnknownForGeoGroup');
+      userAssert(geo, 'requires <amp-geo> to use promptIfUnknownForGeoGroup');
 
       const matchedGeos = geoGroup.split(/,\s*/).filter(group => {
         return geo.isInCountryGroup(group) == GEO_IN_GROUP.IN;
@@ -236,7 +237,7 @@ export class AmpUserNotification extends AMP.BaseElement {
   buildGetHref_(ampUserId) {
     const showIfHref = dev().assertString(this.showIfHref_);
     return this.urlReplacements_.expandUrlAsync(showIfHref).then(href => {
-      const data = /** @type {!JsonObject} */({
+      const data = /** @type {!JsonObject} */ ({
         'elementId': this.elementId_,
         'ampUserId': ampUserId,
       });
@@ -259,7 +260,8 @@ export class AmpUserNotification extends AMP.BaseElement {
         requireAmpResponseSourceOrigin: false,
       };
       return Services.xhrFor(this.win)
-          .fetchJson(href, getReq).then(res => res.json());
+        .fetchJson(href, getReq)
+        .then(res => res.json());
     });
   }
 
@@ -269,12 +271,12 @@ export class AmpUserNotification extends AMP.BaseElement {
    * @return {!Promise}
    */
   postDismissEnpoint_() {
-    const enctype = this.element.getAttribute('enctype') ||
-      'application/json;charset=utf-8';
+    const enctype =
+      this.element.getAttribute('enctype') || 'application/json;charset=utf-8';
     return Services.xhrFor(this.win).fetchJson(
-        dev().assertString(this.dismissHref_),
-        this.buildPostDismissRequest_(enctype, this.elementId_,
-            this.ampUserId_));
+      dev().assertString(this.dismissHref_),
+      this.buildPostDismissRequest_(enctype, this.elementId_, this.ampUserId_)
+    );
   }
 
   /**
@@ -308,10 +310,13 @@ export class AmpUserNotification extends AMP.BaseElement {
    * @private
    */
   onGetShowEndpointSuccess_(data) {
-    userAssert(typeof data['showNotification'] == 'boolean',
-        '`showNotification` ' +
+    userAssert(
+      typeof data['showNotification'] == 'boolean',
+      '`showNotification` ' +
         'should be a boolean. Got "%s" which is of type %s.',
-        data['showNotification'], typeof data['showNotification']);
+      data['showNotification'],
+      typeof data['showNotification']
+    );
 
     if (!data['showNotification']) {
       // If no notification needs to be shown, resolve the `dialogPromise_`
@@ -327,13 +332,15 @@ export class AmpUserNotification extends AMP.BaseElement {
    */
   optoutOfCid_() {
     return this.getCidService_()
-        .then(cid => cid.optOut())
-        .then(() => this.dismiss(/*forceNoPersist*/false), reason => {
-          dev().error(TAG,
-              'Failed to opt out of Cid', reason);
+      .then(cid => cid.optOut())
+      .then(
+        () => this.dismiss(/*forceNoPersist*/ false),
+        reason => {
+          dev().error(TAG, 'Failed to opt out of Cid', reason);
           // If optout fails, dismiss notification without persisting.
-          this.dismiss(/*forceNoPersist*/true);
-        });
+          this.dismiss(/*forceNoPersist*/ true);
+        }
+      );
   }
 
   /**
@@ -352,8 +359,10 @@ export class AmpUserNotification extends AMP.BaseElement {
       // the notification or have the nagging notification sitting there
       // (to never resolve).
       return cid.get(
-          {scope: TAG, createCookieIfNotPresent: true},
-          Promise.resolve(), this.dialogPromise_);
+        {scope: TAG, createCookieIfNotPresent: true},
+        Promise.resolve(),
+        this.dialogPromise_
+      );
     });
   }
 
@@ -393,8 +402,8 @@ export class AmpUserNotification extends AMP.BaseElement {
    */
   shouldShowViaXhr_() {
     return this.getAsyncCid_()
-        .then(this.getShowEndpoint_.bind(this))
-        .then(this.onGetShowEndpointSuccess_.bind(this));
+      .then(this.getShowEndpoint_.bind(this))
+      .then(this.onGetShowEndpointSuccess_.bind(this));
   }
 
   /** @override */
@@ -411,11 +420,14 @@ export class AmpUserNotification extends AMP.BaseElement {
       return Promise.resolve(false);
     }
     return this.storagePromise_
-        .then(storage => storage.get(this.storageKey_))
-        .then(persistedValue => !!persistedValue, reason => {
+      .then(storage => storage.get(this.storageKey_))
+      .then(
+        persistedValue => !!persistedValue,
+        reason => {
           dev().error(TAG, 'Failed to read storage', reason);
           return false;
-        });
+        }
+      );
   }
 
   /**
@@ -443,14 +455,12 @@ export class AmpUserNotification extends AMP.BaseElement {
   }
 }
 
-
 /**
  * UserNotificationManager handles `amp-user-notification`
  * queuing and registration, as well as exposing the components
  * dismiss promise.
  */
 export class UserNotificationManager {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -476,8 +486,10 @@ export class UserNotificationManager {
       this.documentReadyPromise_,
     ]);
 
-    this.notificationUiManagerPromise_ =
-        getServicePromiseForDoc(this.ampdoc, NOTIFICATION_UI_MANAGER);
+    this.notificationUiManagerPromise_ = getServicePromiseForDoc(
+      this.ampdoc,
+      NOTIFICATION_UI_MANAGER
+    );
   }
 
   /**
@@ -518,18 +530,24 @@ export class UserNotificationManager {
     // Compose the registered notifications into a promise queue
     // that blocks until one notification is dismissed.
     return this.managerReadyPromise_
-        .then(() => userNotification.shouldShow())
-        .then(shouldShow => {
-          if (shouldShow) {
-            return this.notificationUiManagerPromise_.then(manager => {
-              return manager.registerUI(
-                  userNotification.show.bind(userNotification));
-            });
-          }
-        })
-        .then(deferred.resolve.bind(this, userNotification))
-        .catch(rethrowAsync.bind(null,
-            'Notification service failed amp-user-notification', id));
+      .then(() => userNotification.shouldShow())
+      .then(shouldShow => {
+        if (shouldShow) {
+          return this.notificationUiManagerPromise_.then(manager => {
+            return manager.registerUI(
+              userNotification.show.bind(userNotification)
+            );
+          });
+        }
+      })
+      .then(deferred.resolve.bind(this, userNotification))
+      .catch(
+        rethrowAsync.bind(
+          null,
+          'Notification service failed amp-user-notification',
+          id
+        )
+      );
   }
 
   /**
@@ -547,11 +565,10 @@ export class UserNotificationManager {
     const deferred = new Deferred();
     const {promise, resolve} = deferred;
 
-    return this.deferRegistry_[id] = {promise, resolve};
+    return (this.deferRegistry_[id] = {promise, resolve});
   }
 }
 
-
 /**
  * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
  * @visibleForTesting
@@ -560,7 +577,6 @@ export function installUserNotificationManagerForTesting(ampdoc) {
   registerServiceBuilderForDoc(ampdoc, SERVICE_ID, UserNotificationManager);
 }
 
-
 // Register the extension services.
 AMP.extension(TAG, '0.1', function(AMP) {
   AMP.registerServiceForDoc(SERVICE_ID, UserNotificationManager);
diff --git a/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js b/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js
index 099ae0251fc2..e1cbd8c12f57 100644
--- a/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js
+++ b/extensions/amp-user-notification/0.1/test/test-amp-user-notification.js
@@ -27,805 +27,857 @@ import {
 } from '../../../../src/service';
 import {macroTask} from '../../../../testing/yield';
 
-
-describes.realWin('amp-user-notification', {
-  amp: {
-    ampdoc: 'single',
-    extensions: ['amp-user-notification'],
+describes.realWin(
+  'amp-user-notification',
+  {
+    amp: {
+      ampdoc: 'single',
+      extensions: ['amp-user-notification'],
+    },
   },
-}, env => {
-  let ampdoc;
-  let win;
-  let dftAttrs;
-  let storageMock;
-  let ISOCountryGroups;
-
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    win = env.win;
-    dftAttrs = {
-      id: 'n1',
-      'data-show-if-href': 'https://www.ampproject.org/get/here',
-      'data-dismiss-href': 'https://www.ampproject.org/post/here',
-      'layout': 'nodisplay',
-    };
-    const storage = getServiceForDoc(ampdoc, 'storage');
-    storageMock = sandbox.mock(storage);
-
-    resetServiceForTesting(win, 'geo');
-    registerServiceBuilder(win, 'geo', function() {
-      return Promise.resolve({
-        isInCountryGroup: group =>
-          ISOCountryGroups.indexOf(group) >= 0 ?
-            GEO_IN_GROUP.IN : GEO_IN_GROUP.NOT_IN,
-      });
-    });
-
-    return getServicePromiseForDoc(ampdoc, 'userNotificationManager')
-        .then(manager => {
-          sandbox.stub(manager, 'registerUserNotification');
+  env => {
+    let ampdoc;
+    let win;
+    let dftAttrs;
+    let storageMock;
+    let ISOCountryGroups;
+
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      win = env.win;
+      dftAttrs = {
+        id: 'n1',
+        'data-show-if-href': 'https://www.ampproject.org/get/here',
+        'data-dismiss-href': 'https://www.ampproject.org/post/here',
+        'layout': 'nodisplay',
+      };
+      const storage = getServiceForDoc(ampdoc, 'storage');
+      storageMock = sandbox.mock(storage);
+
+      resetServiceForTesting(win, 'geo');
+      registerServiceBuilder(win, 'geo', function() {
+        return Promise.resolve({
+          isInCountryGroup: group =>
+            ISOCountryGroups.indexOf(group) >= 0
+              ? GEO_IN_GROUP.IN
+              : GEO_IN_GROUP.NOT_IN,
         });
-  });
+      });
 
-  function getUserNotification(attrs = {}) {
-    const doc = win.document;
-    const elem = doc.createElement('amp-user-notification');
-    elem.getAmpDoc = () => ampdoc;
+      return getServicePromiseForDoc(ampdoc, 'userNotificationManager').then(
+        manager => {
+          sandbox.stub(manager, 'registerUserNotification');
+        }
+      );
+    });
 
-    for (const attr in attrs) {
-      elem.setAttribute(attr, attrs[attr]);
+    function getUserNotification(attrs = {}) {
+      const doc = win.document;
+      const elem = doc.createElement('amp-user-notification');
+      elem.getAmpDoc = () => ampdoc;
+
+      for (const attr in attrs) {
+        elem.setAttribute(attr, attrs[attr]);
+      }
+      const button = doc.createElement('button');
+      button.setAttribute('on', 'tap:' + elem.getAttribute('id') + 'dismiss');
+      elem.appendChild(button);
+
+      doc.body.appendChild(elem);
+      return elem;
     }
-    const button = doc.createElement('button');
-    button.setAttribute('on', 'tap:' + elem.getAttribute('id') + 'dismiss');
-    elem.appendChild(button);
 
-    doc.body.appendChild(elem);
-    return elem;
-  }
+    it('should have storage key', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
+      expect(impl.storageKey_).to.equal('amp-user-notification:n1');
+    });
 
-  it('should have storage key', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
-    expect(impl.storageKey_).to.equal('amp-user-notification:n1');
-  });
-
-  it('should require an id', () => {
-    const el = getUserNotification({
-      'data-show-if-href': 'https://www.ampproject.org/get/here',
-      'data-dismiss-href': 'https://www.ampproject.org/post/here',
-      'layout': 'nodisplay',
-    });
-    const impl = el.implementation_;
-    allowConsoleError(() => {
-      expect(impl.buildCallback.bind(impl)).to.throw(/should have an id/);
-    });
-  });
-
-  it('should NOT require `data-show-if-href`', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-geo': 'nafta',
-    });
-    const impl = el.implementation_;
-    expect(impl.buildCallback.bind(impl)).to.not.throw;
-  });
-
-  it('should NOT require `data-show-if-geo`', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-href': 'https://www.ampproject.org/get',
-    });
-    const impl = el.implementation_;
-    expect(impl.buildCallback.bind(impl)).to.not.throw;
-  });
-
-  it('should throw if more than one data-how-if-* attrib is defined',
-      () => {
-        const el = getUserNotification({
-          'data-show-if-href': 'https://www.ampproject.org/get/here',
-          'data-show-if-geo': 'foo',
-          'id': 'n1',
-          'layout': 'nodisplay',
-        });
-        const impl = el.implementation_;
-        allowConsoleError(() =>
-          expect(impl.buildCallback.bind(impl)).to.throw(
-              /Only one "data-show-if-\*" attribute allowed​​​/)
-        );
+    it('should require an id', () => {
+      const el = getUserNotification({
+        'data-show-if-href': 'https://www.ampproject.org/get/here',
+        'data-dismiss-href': 'https://www.ampproject.org/post/here',
+        'layout': 'nodisplay',
+      });
+      const impl = el.implementation_;
+      allowConsoleError(() => {
+        expect(impl.buildCallback.bind(impl)).to.throw(/should have an id/);
+      });
+    });
+
+    it('should NOT require `data-show-if-href`', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'nafta',
+      });
+      const impl = el.implementation_;
+      expect(impl.buildCallback.bind(impl)).to.not.throw;
+    });
+
+    it('should NOT require `data-show-if-geo`', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-href': 'https://www.ampproject.org/get',
+      });
+      const impl = el.implementation_;
+      expect(impl.buildCallback.bind(impl)).to.not.throw;
+    });
+
+    it('should throw if more than one data-how-if-* attrib is defined', () => {
+      const el = getUserNotification({
+        'data-show-if-href': 'https://www.ampproject.org/get/here',
+        'data-show-if-geo': 'foo',
+        'id': 'n1',
+        'layout': 'nodisplay',
       });
+      const impl = el.implementation_;
+      allowConsoleError(() =>
+        expect(impl.buildCallback.bind(impl)).to.throw(
+          /Only one "data-show-if-\*" attribute allowed​​​/
+        )
+      );
+    });
 
-  it('should NOT require `data-dismiss-href`', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-href': 'https://www.ampproject.org/get',
+    it('should NOT require `data-dismiss-href`', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-href': 'https://www.ampproject.org/get',
+      });
+      const impl = el.implementation_;
+      expect(impl.buildCallback.bind(impl)).to.not.throw;
     });
-    const impl = el.implementation_;
-    expect(impl.buildCallback.bind(impl)).to.not.throw;
-  });
 
-  it('isDismissed should return true if dismissal has been recorded', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('isDismissed should return true if dismissal has been recorded', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(true))
         .once();
-    impl.isDismissed().then(dismissed => {
-      expect(dismissed).to.be.true;
-      storageMock.verify();
+      impl.isDismissed().then(dismissed => {
+        expect(dismissed).to.be.true;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('isDismissed should return false if dismissal has not been recorded',
-      () => {
-        const el = getUserNotification(dftAttrs);
-        const impl = el.implementation_;
-        impl.buildCallback();
+    it('isDismissed should return false if dismissal has not been recorded', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-        storageMock.expects('get')
-            .withExactArgs('amp-user-notification:n1')
-            .returns(Promise.resolve(null))
-            .once();
-        impl.isDismissed().then(dismissed => {
-          expect(dismissed).to.be.false;
-          storageMock.verify();
-        });
+      storageMock
+        .expects('get')
+        .withExactArgs('amp-user-notification:n1')
+        .returns(Promise.resolve(null))
+        .once();
+      impl.isDismissed().then(dismissed => {
+        expect(dismissed).to.be.false;
+        storageMock.verify();
       });
+    });
 
-  it('isDismissed should return false if data-persist-dismissal=false', () => {
-    dftAttrs['data-persist-dismissal'] = false;
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('isDismissed should return false if data-persist-dismissal=false', () => {
+      dftAttrs['data-persist-dismissal'] = false;
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get').never();
-    impl.isDismissed().then(dismissed => {
-      expect(dismissed).to.be.false;
-      storageMock.verify();
+      storageMock.expects('get').never();
+      impl.isDismissed().then(dismissed => {
+        expect(dismissed).to.be.false;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('isDismissed should return false if storage throws error', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('isDismissed should return false if storage throws error', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.reject('intentional'))
         .once();
-    impl.isDismissed().then(dismissed => {
-      expect(dismissed).to.be.false;
-      storageMock.verify();
+      impl.isDismissed().then(dismissed => {
+        expect(dismissed).to.be.false;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should return false if storage has been recorded', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should return false if storage has been recorded', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    sandbox.stub(impl, 'getAsyncCid_').throws();
-    storageMock.expects('get')
+      sandbox.stub(impl, 'getAsyncCid_').throws();
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(true))
         .once();
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(false);
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(false);
+        storageMock.verify();
+      });
     });
-  });
 
-  it('should skip storage if data-persist-dismissal=false', () => {
-    dftAttrs['data-persist-dismissal'] = false;
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('should skip storage if data-persist-dismissal=false', () => {
+      dftAttrs['data-persist-dismissal'] = false;
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(true))
         .never();
 
-    const cidStub = sandbox.stub(impl, 'getAsyncCid_')
+      const cidStub = sandbox
+        .stub(impl, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    const showEndpointStub = sandbox.stub(impl, 'getShowEndpoint_')
+      const showEndpointStub = sandbox
+        .stub(impl, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: true}));
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
-      expect(cidStub).to.be.calledOnce;
-      expect(showEndpointStub).to.be.calledOnce;
-      storageMock.verify();
-    });
-  });
-
-  it('should set persistDismissal to false', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      layout: 'nodisplay',
-      'data-persist-dismissal': false,
-    });
-    const impl = el.implementation_;
-    impl.buildCallback();
-    expect(impl.persistDismissal_).to.be.false;
-  });
-
-  it('should set persistDismissal to true for any other value', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      layout: 'nodisplay',
-      'data-persist-dismissal': 'anything',
-    });
-    const impl = el.implementation_;
-    impl.buildCallback();
-    expect(impl.persistDismissal_).to.be.true;
-  });
-
-  it('shouldShow should fallback to xhr and return true', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
-
-    storageMock.expects('get')
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+        expect(cidStub).to.be.calledOnce;
+        expect(showEndpointStub).to.be.calledOnce;
+        storageMock.verify();
+      });
+    });
+
+    it('should set persistDismissal to false', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        layout: 'nodisplay',
+        'data-persist-dismissal': false,
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
+      expect(impl.persistDismissal_).to.be.false;
+    });
+
+    it('should set persistDismissal to true for any other value', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        layout: 'nodisplay',
+        'data-persist-dismissal': 'anything',
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
+      expect(impl.persistDismissal_).to.be.true;
+    });
+
+    it('shouldShow should fallback to xhr and return true', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
+
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(false))
         .once();
 
-    const cidStub = sandbox.stub(impl, 'getAsyncCid_')
+      const cidStub = sandbox
+        .stub(impl, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    const showEndpointStub = sandbox.stub(impl, 'getShowEndpoint_')
+      const showEndpointStub = sandbox
+        .stub(impl, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: true}));
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
-      expect(cidStub).to.be.calledOnce;
-      expect(showEndpointStub).to.be.calledOnce;
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+        expect(cidStub).to.be.calledOnce;
+        expect(showEndpointStub).to.be.calledOnce;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should fallback to xhr and return false', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should fallback to xhr and return false', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(false))
         .once();
 
-    const cidStub = sandbox.stub(impl, 'getAsyncCid_')
+      const cidStub = sandbox
+        .stub(impl, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    const showEndpointStub = sandbox.stub(impl, 'getShowEndpoint_')
+      const showEndpointStub = sandbox
+        .stub(impl, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: false}));
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(false);
-      expect(cidStub).to.be.calledOnce;
-      expect(showEndpointStub).to.be.calledOnce;
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(false);
+        expect(cidStub).to.be.calledOnce;
+        expect(showEndpointStub).to.be.calledOnce;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should return true if not stored and no xhr', () => {
-    const el = getUserNotification({id: 'n1'});
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should return true if not stored and no xhr', () => {
+      const el = getUserNotification({id: 'n1'});
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    sandbox.stub(impl, 'getAsyncCid_').throws();
-    storageMock.expects('get')
+      sandbox.stub(impl, 'getAsyncCid_').throws();
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(undefined))
         .once();
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should recover from error to xhr', () => {
-    expectAsyncConsoleError(
-        '[amp-user-notification] Failed to read storage intentional');
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should recover from error to xhr', () => {
+      expectAsyncConsoleError(
+        '[amp-user-notification] Failed to read storage intentional'
+      );
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.reject('intentional'))
         .once();
 
-    const cidStub = sandbox.stub(impl, 'getAsyncCid_')
+      const cidStub = sandbox
+        .stub(impl, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    const showEndpointStub = sandbox.stub(impl, 'getShowEndpoint_')
+      const showEndpointStub = sandbox
+        .stub(impl, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: true}));
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
-      expect(cidStub).to.be.calledOnce;
-      expect(showEndpointStub).to.be.calledOnce;
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+        expect(cidStub).to.be.calledOnce;
+        expect(showEndpointStub).to.be.calledOnce;
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should recover from error and return true with no xhr', () => {
-    expectAsyncConsoleError(
-        '[amp-user-notification] Failed to read storage intentional');
-    const el = getUserNotification({id: 'n1'});
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should recover from error and return true with no xhr', () => {
+      expectAsyncConsoleError(
+        '[amp-user-notification] Failed to read storage intentional'
+      );
+      const el = getUserNotification({id: 'n1'});
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    sandbox.stub(impl, 'getAsyncCid_').throws();
-    storageMock.expects('get')
+      sandbox.stub(impl, 'getAsyncCid_').throws();
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.reject('intentional'))
         .once();
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
-      storageMock.verify();
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+        storageMock.verify();
+      });
     });
-  });
 
-  it('should store value on dismiss and run post', () => {
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('should store value on dismiss and run post', () => {
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('set')
+      storageMock
+        .expects('set')
         .withExactArgs('amp-user-notification:n1', true)
         .returns(Promise.resolve())
         .once();
-    const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
+      const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
 
-    impl.dismiss();
-    expect(postDismissStub).to.be.calledOnce;
-    return impl.storagePromise_.then(() => {
-      storageMock.verify();
+      impl.dismiss();
+      expect(postDismissStub).to.be.calledOnce;
+      return impl.storagePromise_.then(() => {
+        storageMock.verify();
+      });
     });
-  });
 
-  it('should ignore post on dismiss if not configured', () => {
-    const el = getUserNotification({id: 'n1'});
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('should ignore post on dismiss if not configured', () => {
+      const el = getUserNotification({id: 'n1'});
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('set')
+      storageMock
+        .expects('set')
         .withExactArgs('amp-user-notification:n1', true)
         .returns(Promise.resolve())
         .once();
-    const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
+      const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
 
-    impl.dismiss();
-    expect(postDismissStub).to.have.not.been.called;
-    return impl.storagePromise_.then(() => {
-      storageMock.verify();
+      impl.dismiss();
+      expect(postDismissStub).to.have.not.been.called;
+      return impl.storagePromise_.then(() => {
+        storageMock.verify();
+      });
     });
-  });
 
-  it('should not store value on dismiss if persist-dismissal=false', () => {
-    dftAttrs['data-persist-dismissal'] = false;
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('should not store value on dismiss if persist-dismissal=false', () => {
+      dftAttrs['data-persist-dismissal'] = false;
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('set')
+      storageMock
+        .expects('set')
         .withExactArgs('amp-user-notification:n1', true)
         .returns(Promise.resolve())
         .never();
-    const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
+      const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
 
-    impl.dismiss();
-    expect(postDismissStub).to.be.calledOnce;
-    return impl.storagePromise_.then(() => {
-      storageMock.verify();
+      impl.dismiss();
+      expect(postDismissStub).to.be.calledOnce;
+      return impl.storagePromise_.then(() => {
+        storageMock.verify();
+      });
     });
-  });
 
-  it('shouldShow should return true if no datashow-if-* is specified', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'layout': 'nodisplay',
-    });
-    ISOCountryGroups = [];
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should return true if no datashow-if-* is specified', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'layout': 'nodisplay',
+      });
+      ISOCountryGroups = [];
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(false))
         .once();
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+      });
     });
-  });
 
-  it('shouldShow should return true if geo matches', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-geo': 'nafta',
-      'layout': 'nodisplay',
-    });
-    ISOCountryGroups = ['nafta'];
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should return true if geo matches', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'nafta',
+        'layout': 'nodisplay',
+      });
+      ISOCountryGroups = ['nafta'];
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(false))
         .once();
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+      });
     });
-  });
 
-  it('shouldShow should hande comma separated country groups', () => {
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-geo': 'eea, nafta, anz',
-      'layout': 'nodisplay',
-    });
-    ISOCountryGroups = ['nafta'];
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should hande comma separated country groups', () => {
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'eea, nafta, anz',
+        'layout': 'nodisplay',
+      });
+      ISOCountryGroups = ['nafta'];
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('get')
+      storageMock
+        .expects('get')
         .withExactArgs('amp-user-notification:n1')
         .returns(Promise.resolve(false))
         .once();
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(true);
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
+      });
     });
-  });
 
-  it('shouldShow should return false if geo does not match', () => {
-    ISOCountryGroups = ['nafta'];
-    const el = getUserNotification({
-      id: 'n1',
-      'data-show-if-geo': 'eea',
-      'layout': 'nodisplay',
-    });
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('shouldShow should return false if geo does not match', () => {
+      ISOCountryGroups = ['nafta'];
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'eea',
+        'layout': 'nodisplay',
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    return impl.shouldShow().then(shouldShow => {
-      expect(shouldShow).to.equal(false);
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(false);
+      });
     });
-  });
 
-  it('shouldShow should return false no match and comma separated groups',
-      () => {
-        ISOCountryGroups = ['nafta'];
-        const el = getUserNotification({
-          id: 'n1',
-          'data-show-if-geo': 'eea',
-          'layout': 'nodisplay',
-        });
-        const impl = el.implementation_;
-        impl.buildCallback();
+    it('shouldShow should return false no match and comma separated groups', () => {
+      ISOCountryGroups = ['nafta'];
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'eea',
+        'layout': 'nodisplay',
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-        return impl.shouldShow().then(shouldShow => {
-          expect(shouldShow).to.equal(false);
-        });
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(false);
       });
+    });
 
-  it('shouldShow should return true when not geo is used',
-      () => {
-        ISOCountryGroups = [];
-        const el = getUserNotification({
-          id: 'n1',
-          'data-show-if-not-geo': 'anz',
-          'layout': 'nodisplay',
-        });
-        const impl = el.implementation_;
-        impl.buildCallback();
+    it('shouldShow should return true when not geo is used', () => {
+      ISOCountryGroups = [];
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-not-geo': 'anz',
+        'layout': 'nodisplay',
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-        return impl.shouldShow().then(shouldShow => {
-          expect(shouldShow).to.equal(true);
-        });
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(true);
       });
+    });
 
-  it('shouldShow should return false when any match not geo is used',
-      () => {
-        ISOCountryGroups = ['waldo'];
-        const el = getUserNotification({
-          id: 'n1',
-          'data-show-if-geo': 'eea, nafta, anz',
-          'layout': 'nodisplay',
-        });
-        const impl = el.implementation_;
-        impl.buildCallback();
+    it('shouldShow should return false when any match not geo is used', () => {
+      ISOCountryGroups = ['waldo'];
+      const el = getUserNotification({
+        id: 'n1',
+        'data-show-if-geo': 'eea, nafta, anz',
+        'layout': 'nodisplay',
+      });
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-        return impl.shouldShow().then(shouldShow => {
-          expect(shouldShow).to.equal(false);
-        });
+      return impl.shouldShow().then(shouldShow => {
+        expect(shouldShow).to.equal(false);
       });
+    });
 
-  it('should not store value on dismiss if persist-dismissal=no', () => {
-    dftAttrs['data-persist-dismissal'] = 'no';
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
+    it('should not store value on dismiss if persist-dismissal=no', () => {
+      dftAttrs['data-persist-dismissal'] = 'no';
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
 
-    storageMock.expects('set')
+      storageMock
+        .expects('set')
         .withExactArgs('amp-user-notification:n1', true)
         .returns(Promise.resolve())
         .never();
-    const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
+      const postDismissStub = sandbox.stub(impl, 'postDismissEnpoint_');
 
-    impl.dismiss();
-    expect(postDismissStub).to.be.calledOnce;
-    return impl.storagePromise_.then(() => {
-      storageMock.verify();
+      impl.dismiss();
+      expect(postDismissStub).to.be.calledOnce;
+      return impl.storagePromise_.then(() => {
+        storageMock.verify();
+      });
     });
-  });
 
-  it('should have class `amp-active`', () => {
-    sandbox.stub(AmpUserNotification.prototype, 'getAsyncCid_')
+    it('should have class `amp-active`', () => {
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    sandbox.stub(AmpUserNotification.prototype, 'getShowEndpoint_')
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: true}));
 
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
-    impl.dialogPromise_ = Promise.resolve();
-    const addToFixedLayerStub = sandbox.stub(
-        impl.getViewport(), 'addToFixedLayer');
-
-    expect(el).to.not.have.class('amp-active');
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
+      impl.dialogPromise_ = Promise.resolve();
+      const addToFixedLayerStub = sandbox.stub(
+        impl.getViewport(),
+        'addToFixedLayer'
+      );
 
-    return impl.shouldShow().then(() => {
       expect(el).to.not.have.class('amp-active');
-      return impl.show().then(() => {
-        expect(el).to.have.class('amp-active');
-        expect(addToFixedLayerStub).to.be.calledOnce;
-        expect(addToFixedLayerStub.getCall(0).args[0]).to.equal(el);
+
+      return impl.shouldShow().then(() => {
+        expect(el).to.not.have.class('amp-active');
+        return impl.show().then(() => {
+          expect(el).to.have.class('amp-active');
+          expect(addToFixedLayerStub).to.be.calledOnce;
+          expect(addToFixedLayerStub.getCall(0).args[0]).to.equal(el);
+        });
       });
     });
-  });
 
-  it('should not have `amp-active`', () => {
-    sandbox.stub(AmpUserNotification.prototype, 'getAsyncCid_')
+    it('should not have `amp-active`', () => {
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    sandbox.stub(AmpUserNotification.prototype, 'getShowEndpoint_')
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getShowEndpoint_')
         .returns(Promise.resolve({showNotification: false}));
 
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
-    impl.dialogPromise_ = Promise.resolve();
-    impl.dialogResolve_ = function() {};
+      const el = getUserNotification(dftAttrs);
+      const impl = el.implementation_;
+      impl.buildCallback();
+      impl.dialogPromise_ = Promise.resolve();
+      impl.dialogResolve_ = function() {};
 
-    expect(el).to.not.have.class('amp-active');
+      expect(el).to.not.have.class('amp-active');
 
-    return impl.shouldShow().then(shouldShow => {
-      if (shouldShow) {
-        impl.show();
-      }
+      return impl.shouldShow().then(shouldShow => {
+        if (shouldShow) {
+          impl.show();
+        }
 
-      expect(el).to.not.have.class('amp-active');
+        expect(el).to.not.have.class('amp-active');
+      });
     });
-  });
 
-  it('should have `amp-hidden` and no `amp-active`', () => {
-    sandbox.stub(AmpUserNotification.prototype, 'getAsyncCid_')
+    it('should have `amp-hidden` and no `amp-active`', () => {
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getAsyncCid_')
         .returns(Promise.resolve('12345'));
-    sandbox.stub(AmpUserNotification.prototype,
-        'getShowEndpoint_').returns(Promise.resolve({showNotification: true}));
-    const stub2 = sandbox.stub(AmpUserNotification.prototype,
-        'postDismissEnpoint_').returns(Promise.resolve());
-
-    const el = getUserNotification(dftAttrs);
-    const impl = el.implementation_;
-    impl.buildCallback();
-    impl.dialogPromise_ = Promise.resolve();
-    impl.dialogResolve_ = function() {};
-    const removeFromFixedLayerStub = sandbox.stub(
-        impl.getViewport(), 'removeFromFixedLayer');
-
-    expect(el).to.not.have.class('amp-active');
-
-    return impl.shouldShow().then(shouldShow => {
-      if (shouldShow) {
-        impl.show();
-      }
-      expect(el).to.have.class('amp-active');
-      expect(stub2.calledOnce).to.be.false;
-      impl.executeAction({method: 'dismiss', satisfiesTrust: () => true});
-      expect(el).to.not.have.class('amp-active');
-      expect(el).to.have.class('amp-hidden');
-      expect(stub2.calledOnce).to.be.true;
-      expect(removeFromFixedLayerStub).to.be.calledOnce;
-      expect(removeFromFixedLayerStub.getCall(0).args[0]).to.equal(el);
-    });
-  });
-
-  it('should have a default `role` if unspecified', () => {
-    const el = getUserNotification({id: 'n1'});
-    const impl = el.implementation_;
-    impl.buildCallback();
-    expect(el.getAttribute('role')).to.equal('alert');
-  });
-
-  it('should not override `role` if specified', () => {
-    const el = getUserNotification({id: 'n1', role: 'status'});
-    const impl = el.implementation_;
-    impl.buildCallback();
-    expect(el.getAttribute('role')).to.equal('status');
-  });
-
-  describe('buildPostDismissRequest_', () => {
-    it('should return JSON request body', () => {
-      const el = getUserNotification(dftAttrs);
-      const impl = el.implementation_;
-      const elementId = 'elementId';
-      const ampUserId = '1';
-      const request = impl.buildPostDismissRequest_('application/json',
-          elementId, ampUserId);
-      expect(request.method).to.equal('POST');
-      expect(request.body.elementId).to.equal(elementId);
-      expect(request.body.ampUserId).to.equal(ampUserId);
-    });
-  });
-
-  describe('buildGetHref_', () => {
+      sandbox
+        .stub(AmpUserNotification.prototype, 'getShowEndpoint_')
+        .returns(Promise.resolve({showNotification: true}));
+      const stub2 = sandbox
+        .stub(AmpUserNotification.prototype, 'postDismissEnpoint_')
+        .returns(Promise.resolve());
 
-    it('should do url replacement', () => {
-      dftAttrs['data-show-if-href'] = 'https://www.ampproject.org/path/?ord=RANDOM';
       const el = getUserNotification(dftAttrs);
       const impl = el.implementation_;
       impl.buildCallback();
-      return impl.buildGetHref_('12345').then(href => {
-        const value = href.match(/\?ord=(.*)$/)[1];
-        expect(href).to.not.contain('RANDOM');
-        expect(parseInt(value, 10)).to.be.a('number');
+      impl.dialogPromise_ = Promise.resolve();
+      impl.dialogResolve_ = function() {};
+      const removeFromFixedLayerStub = sandbox.stub(
+        impl.getViewport(),
+        'removeFromFixedLayer'
+      );
+
+      expect(el).to.not.have.class('amp-active');
+
+      return impl.shouldShow().then(shouldShow => {
+        if (shouldShow) {
+          impl.show();
+        }
+        expect(el).to.have.class('amp-active');
+        expect(stub2.calledOnce).to.be.false;
+        impl.executeAction({method: 'dismiss', satisfiesTrust: () => true});
+        expect(el).to.not.have.class('amp-active');
+        expect(el).to.have.class('amp-hidden');
+        expect(stub2.calledOnce).to.be.true;
+        expect(removeFromFixedLayerStub).to.be.calledOnce;
+        expect(removeFromFixedLayerStub.getCall(0).args[0]).to.equal(el);
       });
     });
 
-    it('should build a valid url', () => {
-      const el = getUserNotification(dftAttrs);
+    it('should have a default `role` if unspecified', () => {
+      const el = getUserNotification({id: 'n1'});
       const impl = el.implementation_;
       impl.buildCallback();
-      return impl.buildGetHref_('12345').then(href => {
-        expect(href).to
-            .equal('https://www.ampproject.org/get/here?elementId=n1&ampUserId=12345');
-      });
+      expect(el.getAttribute('role')).to.equal('alert');
     });
-  });
 
-  describe('userNotificationManager', () => {
-    let service;
-    let tag;
-
-    beforeEach(() => {
-      service = new UserNotificationManager(ampdoc);
-      service.managerReadyPromise_ = Promise.resolve();
-      service.nextInQueue_ = service.managerReadyPromise_;
-      tag = {
-        shouldShow: () => Promise.resolve(true),
-        show: () => Promise.resolve(),
-      };
+    it('should not override `role` if specified', () => {
+      const el = getUserNotification({id: 'n1', role: 'status'});
+      const impl = el.implementation_;
+      impl.buildCallback();
+      expect(el.getAttribute('role')).to.equal('status');
     });
 
-    it('getNotificaiton should return notification object after ' +
-        'registration', () => {
-      const element = getUserNotification();
-      const notification = new AmpUserNotification(element);
-      service.registerUserNotification('n1', notification);
-      return Promise.all([
-        expect(service.getNotification('n1'))
-            .to.eventually.equal(notification),
-        expect(service.getNotification('n2'))
-            .to.eventually.equal(undefined),
-      ]);
+    describe('buildPostDismissRequest_', () => {
+      it('should return JSON request body', () => {
+        const el = getUserNotification(dftAttrs);
+        const impl = el.implementation_;
+        const elementId = 'elementId';
+        const ampUserId = '1';
+        const request = impl.buildPostDismissRequest_(
+          'application/json',
+          elementId,
+          ampUserId
+        );
+        expect(request.method).to.equal('POST');
+        expect(request.body.elementId).to.equal(elementId);
+        expect(request.body.ampUserId).to.equal(ampUserId);
+      });
     });
 
-    it('should be able to get AmpUserNotification object by ID', () => {
-      const element = getUserNotification();
-      const userNotification = new AmpUserNotification(element);
-      userNotification.dialogResolve_();
-      service.registerUserNotification('n1', userNotification);
-      return expect(service.get('n1')).to.eventually.equal(userNotification);
+    describe('buildGetHref_', () => {
+      it('should do url replacement', () => {
+        dftAttrs['data-show-if-href'] =
+          'https://www.ampproject.org/path/?ord=RANDOM';
+        const el = getUserNotification(dftAttrs);
+        const impl = el.implementation_;
+        impl.buildCallback();
+        return impl.buildGetHref_('12345').then(href => {
+          const value = href.match(/\?ord=(.*)$/)[1];
+          expect(href).to.not.contain('RANDOM');
+          expect(parseInt(value, 10)).to.be.a('number');
+        });
+      });
+
+      it('should build a valid url', () => {
+        const el = getUserNotification(dftAttrs);
+        const impl = el.implementation_;
+        impl.buildCallback();
+        return impl.buildGetHref_('12345').then(href => {
+          expect(href).to.equal(
+            'https://www.ampproject.org/get/here?elementId=n1&ampUserId=12345'
+          );
+        });
+      });
     });
 
-    it('should queue up multiple amp-user-notification elements', function* () {
-      const tag1 = Object.assign({}, tag);
-      const tag2 = Object.assign({}, tag);
-      let resolve1;
-      let resolve2;
+    describe('userNotificationManager', () => {
+      let service;
+      let tag;
 
-      const s1 = new Promise(resolve => {
-        resolve1 = resolve;
-      });
-      const s2 = new Promise(resolve => {
-        resolve2 = resolve;
+      beforeEach(() => {
+        service = new UserNotificationManager(ampdoc);
+        service.managerReadyPromise_ = Promise.resolve();
+        service.nextInQueue_ = service.managerReadyPromise_;
+        tag = {
+          shouldShow: () => Promise.resolve(true),
+          show: () => Promise.resolve(),
+        };
       });
 
-      const show1 = sandbox.stub(tag, 'show').callsFake(() => {
-        return s1;
+      it(
+        'getNotificaiton should return notification object after ' +
+          'registration',
+        () => {
+          const element = getUserNotification();
+          const notification = new AmpUserNotification(element);
+          service.registerUserNotification('n1', notification);
+          return Promise.all([
+            expect(service.getNotification('n1')).to.eventually.equal(
+              notification
+            ),
+            expect(service.getNotification('n2')).to.eventually.equal(
+              undefined
+            ),
+          ]);
+        }
+      );
+
+      it('should be able to get AmpUserNotification object by ID', () => {
+        const element = getUserNotification();
+        const userNotification = new AmpUserNotification(element);
+        userNotification.dialogResolve_();
+        service.registerUserNotification('n1', userNotification);
+        return expect(service.get('n1')).to.eventually.equal(userNotification);
       });
-      const show2 = sandbox.stub(tag1, 'show').callsFake(() => {
-        return s2;
-      });
-      const show3 = sandbox.spy(tag2, 'show');
 
-      service.registerUserNotification('n1', tag);
-      service.registerUserNotification('n2', tag1);
-      service.registerUserNotification('n3', tag2);
-      yield macroTask();
+      it('should queue up multiple amp-user-notification elements', function*() {
+        const tag1 = Object.assign({}, tag);
+        const tag2 = Object.assign({}, tag);
+        let resolve1;
+        let resolve2;
+
+        const s1 = new Promise(resolve => {
+          resolve1 = resolve;
+        });
+        const s2 = new Promise(resolve => {
+          resolve2 = resolve;
+        });
 
-      expect(show1).to.be.calledOnce;
-      expect(show2).to.not.be.called;
-      expect(show3).to.not.be.called;
+        const show1 = sandbox.stub(tag, 'show').callsFake(() => {
+          return s1;
+        });
+        const show2 = sandbox.stub(tag1, 'show').callsFake(() => {
+          return s2;
+        });
+        const show3 = sandbox.spy(tag2, 'show');
 
-      resolve1();
-      yield macroTask();
-      expect(show2).to.be.calledOnce;
-      expect(show3).to.not.be.called;
+        service.registerUserNotification('n1', tag);
+        service.registerUserNotification('n2', tag1);
+        service.registerUserNotification('n3', tag2);
+        yield macroTask();
 
-      resolve2();
-      yield macroTask();
-      expect(show3).to.be.calledOnce;
-    });
+        expect(show1).to.be.calledOnce;
+        expect(show2).to.not.be.called;
+        expect(show3).to.not.be.called;
 
-    it('should be able to get before a registration of an element', () => {
-      const get = service.get.bind(service, 'n4');
-      expect(get).to.not.throw();
-      expect(get().then).to.be.a('function');
-    });
-  });
+        resolve1();
+        yield macroTask();
+        expect(show2).to.be.calledOnce;
+        expect(show3).to.not.be.called;
 
-  describe('optOutOfCid', () => {
-    const cidMock = {
-      optOut() {
-        return optoutPromise;
-      },
-    };
-    let dismissSpy;
-    let optoutPromise;
-    let optOutOfCidStub;
+        resolve2();
+        yield macroTask();
+        expect(show3).to.be.calledOnce;
+      });
 
-    beforeEach(() => {
-      optOutOfCidStub = sandbox.spy(cidMock, 'optOut');
+      it('should be able to get before a registration of an element', () => {
+        const get = service.get.bind(service, 'n4');
+        expect(get).to.not.throw();
+        expect(get().then).to.be.a('function');
+      });
     });
 
-    it('should call cid.optOut() and dismiss', () => {
-      const element = getUserNotification({id: 'n1'});
-      const impl = element.implementation_;
-      impl.buildCallback();
-      optoutPromise = Promise.resolve();
-      impl.getCidService_ = () => { return Promise.resolve(cidMock); };
-      dismissSpy = sandbox.spy(impl, 'dismiss');
+    describe('optOutOfCid', () => {
+      const cidMock = {
+        optOut() {
+          return optoutPromise;
+        },
+      };
+      let dismissSpy;
+      let optoutPromise;
+      let optOutOfCidStub;
 
-      return impl.optoutOfCid_().then(() => {
-        expect(dismissSpy).to.be.calledWithExactly(false);
-        expect(optOutOfCidStub).to.be.calledOnce;
+      beforeEach(() => {
+        optOutOfCidStub = sandbox.spy(cidMock, 'optOut');
       });
-    });
 
-    it('should dismiss without persistence if cid.optOut() fails', () => {
-      expectAsyncConsoleError(
-          '[amp-user-notification] Failed to opt out of Cid failed');
+      it('should call cid.optOut() and dismiss', () => {
+        const element = getUserNotification({id: 'n1'});
+        const impl = element.implementation_;
+        impl.buildCallback();
+        optoutPromise = Promise.resolve();
+        impl.getCidService_ = () => {
+          return Promise.resolve(cidMock);
+        };
+        dismissSpy = sandbox.spy(impl, 'dismiss');
+
+        return impl.optoutOfCid_().then(() => {
+          expect(dismissSpy).to.be.calledWithExactly(false);
+          expect(optOutOfCidStub).to.be.calledOnce;
+        });
+      });
 
-      const element = getUserNotification({id: 'n1'});
-      const impl = element.implementation_;
-      impl.buildCallback();
-      optoutPromise = Promise.reject('failed');
-      impl.getCidService_ = () => { return Promise.resolve(cidMock); };
-      dismissSpy = sandbox.spy(impl, 'dismiss');
+      it('should dismiss without persistence if cid.optOut() fails', () => {
+        expectAsyncConsoleError(
+          '[amp-user-notification] Failed to opt out of Cid failed'
+        );
 
-      return impl.optoutOfCid_().then(() => {
-        expect(dismissSpy).to.be.calledWithExactly(true);
-        expect(optOutOfCidStub).to.be.calledOnce;
+        const element = getUserNotification({id: 'n1'});
+        const impl = element.implementation_;
+        impl.buildCallback();
+        optoutPromise = Promise.reject('failed');
+        impl.getCidService_ = () => {
+          return Promise.resolve(cidMock);
+        };
+        dismissSpy = sandbox.spy(impl, 'dismiss');
+
+        return impl.optoutOfCid_().then(() => {
+          expect(dismissSpy).to.be.calledWithExactly(true);
+          expect(optOutOfCidStub).to.be.calledOnce;
+        });
       });
     });
-
-  });
-});
+  }
+);
diff --git a/extensions/amp-video-docking/0.1/amp-video-docking.js b/extensions/amp-video-docking/0.1/amp-video-docking.js
index b24171ef0dd1..1e64849e8bac 100644
--- a/extensions/amp-video-docking/0.1/amp-video-docking.js
+++ b/extensions/amp-video-docking/0.1/amp-video-docking.js
@@ -27,18 +27,12 @@ import {
   PositionObserver, // eslint-disable-line no-unused-vars
   installPositionObserverServiceForDoc,
 } from '../../../src/service/position-observer/position-observer-impl';
-import {
-  PositionObserverFidelity,
-} from '../../../src/service/position-observer/position-observer-worker';
+import {PositionObserverFidelity} from '../../../src/service/position-observer/position-observer-worker';
 import {Services} from '../../../src/services';
 import {VideoDockingEvents, pointerCoords} from './events';
 import {applyBreakpointClassname} from './breakpoints';
 import {calculateLeftJustifiedX, calculateRightJustifiedX} from './math';
-import {
-  createCustomEvent,
-  listen,
-  listenOnce,
-} from '../../../src/event-helper';
+import {createCustomEvent, listen, listenOnce} from '../../../src/event-helper';
 import {dev, devAssert, user, userAssert} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
 import {escapeCssSelectorIdent} from '../../../src/css';
@@ -47,11 +41,7 @@ import {getServiceForDoc} from '../../../src/service';
 import {htmlFor, htmlRefs} from '../../../src/static-template';
 import {installStylesForDoc} from '../../../src/style-installer';
 import {isFiniteNumber} from '../../../src/types';
-import {
-  isRTL,
-  removeElement,
-  scopedQuerySelector,
-} from '../../../src/dom';
+import {isRTL, removeElement, scopedQuerySelector} from '../../../src/dom';
 import {layoutRectLtwh, moveLayoutRect} from '../../../src/layout-rect';
 import {mapRange} from '../../../src/utils/math';
 import {once} from '../../../src/utils/function';
@@ -63,10 +53,8 @@ import {
   toggle,
 } from '../../../src/style';
 
-
 const TAG = 'amp-video-docking';
 
-
 /** @visibleForTesting @const {number} */
 export const MARGIN_MAX = 30;
 
@@ -112,11 +100,9 @@ export const DOCKED_TO_CORNER_SIZING_RATIO = 0.3;
  */
 let DockedDef;
 
-
 /** @typedef {{posX: !RelativeX, posY: !RelativeY}|!Element} */
 let DockTargetDef;
 
-
 /**
  * @param {number} x
  * @param {number} y
@@ -125,7 +111,6 @@ let DockTargetDef;
  */
 const transform = (x, y, scale) => `translate(${x}px, ${y}px) scale(${scale})`;
 
-
 /**
  * @param {!Window} win
  * @param {function(...*)} fn
@@ -145,7 +130,6 @@ function throttleByAnimationFrame(win, fn) {
   };
 }
 
-
 /**
  * Maps an interpolation step in [0..1] to its position in a range.
  * @param {number} step
@@ -157,7 +141,6 @@ function mapStep(step, min, max) {
   return mapRange(step, 0, 1, min, max);
 }
 
-
 /**
  * @param {!Element} element
  * @restricted
@@ -165,9 +148,11 @@ function mapStep(step, min, max) {
 function complainAboutPortrait(element) {
   // Constant named `TAG` per lint rules.
   const TAG = element.tagName.toUpperCase();
-  user().error(TAG,
-      'Minimize-to-corner (`dock`) does not support portrait video.',
-      element);
+  user().error(
+    TAG,
+    'Minimize-to-corner (`dock`) does not support portrait video.',
+    element
+  );
 }
 
 // Function should ideally be in `dom.js`, but moving it causes a bunch of ads
@@ -181,15 +166,15 @@ export function isElement(obj) {
   return obj.nodeType == /* ELEMENT */ 1;
 }
 
-
 /**
  * @param {!HtmlLiteralTagDef} html
  * @return {!Element}
  * @private
  */
 const ShadowLayer = html =>
-  html`<div class="amp-video-docked-shadow" hidden></div>`;
-
+  html`
+    <div class="amp-video-docked-shadow" hidden></div>
+  `;
 
 /**
  * @param {!HtmlLiteralTagDef} html
@@ -197,15 +182,15 @@ const ShadowLayer = html =>
  * @private
  */
 const PlaceholderBackground = html =>
-  html`<div class="amp-video-docked-placeholder-background">
-    <div class="amp-video-docked-placeholder-background-poster"
-      ref="poster">
+  html`
+    <div class="amp-video-docked-placeholder-background">
+      <div
+        class="amp-video-docked-placeholder-background-poster"
+        ref="poster"
+      ></div>
+      <div class="amp-video-docked-placeholder-icon" ref="icon"></div>
     </div>
-    <div class="amp-video-docked-placeholder-icon"
-      ref="icon">
-    </div>
-  </div>`;
-
+  `;
 
 /** @visibleForTesting @const {!Array<!./breakpoints.SyntheticBreakpointDef>} */
 export const PLACEHOLDER_ICON_BREAKPOINTS = [
@@ -219,7 +204,6 @@ export const PLACEHOLDER_ICON_BREAKPOINTS = [
   },
 ];
 
-
 /** @visibleForTesting */
 export const PLACEHOLDER_ICON_LARGE_WIDTH = 48;
 /** @visibleForTesting */
@@ -230,17 +214,15 @@ export const PLACEHOLDER_ICON_SMALL_WIDTH = 32;
 /** @visibleForTesting */
 export const PLACEHOLDER_ICON_SMALL_MARGIN = 20;
 
-
 /**
  * @param {!Element} element
  * @return {!../../../src/layout-rect.LayoutRectDef}
  */
 function getIntersectionRect(element) {
-  return /** @type {!../../../src/layout-rect.LayoutRectDef} */ (
-    element.getIntersectionChangeEntry().intersectionRect);
+  return /** @type {!../../../src/layout-rect.LayoutRectDef} */ (element.getIntersectionChangeEntry()
+    .intersectionRect);
 }
 
-
 /**
  * @param {!../../../src/layout-rect.LayoutRectDef} rect
  * @return {boolean}
@@ -249,7 +231,6 @@ function isSizedLayoutRect({width, height}) {
   return width > 0 && height > 0;
 }
 
-
 /**
  * @param {!DockTargetDef} a
  * @param {!DockTargetDef} b
@@ -262,20 +243,17 @@ function targetsEqual(a, b) {
   return a.posX == b.posX;
 }
 
-
 /**
  * Manages docking (a.k.a. minimize to corner) for videos that satisfy the
  * {@see ../../../src/video-interface.VideoInterface}.
  * @visibleForTesting
  */
 export class VideoDocking {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    * @param {!PositionObserver=} opt_injectedPositionObserver
    */
   constructor(ampdoc, opt_injectedPositionObserver) {
-
     /** @private @const {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -296,8 +274,9 @@ export class VideoDocking {
      * Y-corner is determined based on scroll direction.
      * @private {!RelativeX}
      */
-    this.preferredCornerX_ =
-        isRTL(this.getDoc_()) ? RelativeX.LEFT : RelativeX.RIGHT;
+    this.preferredCornerX_ = isRTL(this.getDoc_())
+      ? RelativeX.LEFT
+      : RelativeX.RIGHT;
 
     const html = htmlFor(this.getDoc_());
 
@@ -316,12 +295,14 @@ export class VideoDocking {
     this.getControls_ = once(() => this.installControls_());
 
     /** @private @const {function():!Element} */
-    this.getPlaceholderBackground_ =
-          once(() => this.append_(PlaceholderBackground(html)));
+    this.getPlaceholderBackground_ = once(() =>
+      this.append_(PlaceholderBackground(html))
+    );
 
     /** @private @const {function():!Object<string, !Element>} */
-    this.getPlaceholderRefs_ =
-          once(() => htmlRefs(this.getPlaceholderBackground_()));
+    this.getPlaceholderRefs_ = once(() =>
+      htmlRefs(this.getPlaceholderBackground_())
+    );
 
     /** @private {?../../../src/video-interface.VideoOrBaseElementDef} */
     this.lastDismissed_ = null;
@@ -364,12 +345,18 @@ export class VideoDocking {
       const ampdoc = this.ampdoc_;
 
       this.viewport_.onScroll(
-          throttleByAnimationFrame(ampdoc.win, () => this.updateScroll_()));
+        throttleByAnimationFrame(ampdoc.win, () => this.updateScroll_())
+      );
 
       this.viewport_.onResize(() => this.updateAllOnResize_());
 
-      installStylesForDoc(ampdoc, CSS, /* callback */ null,
-          /* isRuntimeCss */ false, TAG);
+      installStylesForDoc(
+        ampdoc,
+        CSS,
+        /* callback */ null,
+        /* isRuntimeCss */ false,
+        TAG
+      );
     });
 
     /** @private @const {function():?Element} */
@@ -392,16 +379,17 @@ export class VideoDocking {
 
     const ampdoc = this.ampdoc_;
 
-    const dockableSelector =
-        `[${escapeCssSelectorIdent(VideoAttributes.DOCK)}]`;
+    const dockableSelector = `[${escapeCssSelectorIdent(
+      VideoAttributes.DOCK
+    )}]`;
 
-    const dockableElements =
-        ampdoc.getRootNode().querySelectorAll(dockableSelector);
+    const dockableElements = ampdoc
+      .getRootNode()
+      .querySelectorAll(dockableSelector);
 
     for (let i = 0; i < dockableElements.length; i++) {
       const element = dockableElements[i];
-      if (element.signals &&
-          element.signals().get(VideoEvents.REGISTERED)) {
+      if (element.signals && element.signals().get(VideoEvents.REGISTERED)) {
         this.registerElement(element);
       }
     }
@@ -420,8 +408,10 @@ export class VideoDocking {
    */
   isEnabled_() {
     // iOS is impossible in the viewer. See https://bit.ly/2BJcNjV
-    if (Services.platformFor(this.ampdoc_.win).isIos() &&
-        Services.viewerForDoc(this.ampdoc_).isEmbedded()) {
+    if (
+      Services.platformFor(this.ampdoc_.win).isIos() &&
+      Services.viewerForDoc(this.ampdoc_).isEmbedded()
+    ) {
       return false;
     }
     return true;
@@ -439,8 +429,10 @@ export class VideoDocking {
 
     dev().assertElement(video);
 
-    userAssert(video.signals().get(VideoEvents.REGISTERED),
-        '`dock` attribute can only be set on video components.');
+    userAssert(
+      video.signals().get(VideoEvents.REGISTERED),
+      '`dock` attribute can only be set on video components.'
+    );
 
     const slotSelector = video.getAttribute('dock').trim();
 
@@ -451,8 +443,10 @@ export class VideoDocking {
     const el = root.querySelector(slotSelector);
 
     if (el) {
-      userAssert(el.tagName.toLowerCase() == 'amp-layout',
-          'Dock slot must be an <amp-layout> element.');
+      userAssert(
+        el.tagName.toLowerCase() == 'amp-layout',
+        'Dock slot must be an <amp-layout> element.'
+      );
     }
 
     return el;
@@ -469,8 +463,9 @@ export class VideoDocking {
 
     const {element} = video;
     const fidelity = PositionObserverFidelity.HIGH;
-    this.getPositionObserver_().observe(element, fidelity,
-        () => this.updateOnPositionChange_(video));
+    this.getPositionObserver_().observe(element, fidelity, () =>
+      this.updateOnPositionChange_(video)
+    );
     this.observed_.push(video);
   }
 
@@ -491,9 +486,8 @@ export class VideoDocking {
       return;
     }
 
-    const scrollDirection = scrollTop > this.lastScrollTop_ ?
-      Direction.UP :
-      Direction.DOWN;
+    const scrollDirection =
+      scrollTop > this.lastScrollTop_ ? Direction.UP : Direction.DOWN;
 
     this.scrollDirection_ = scrollDirection;
     this.lastScrollTop_ = scrollTop;
@@ -523,7 +517,7 @@ export class VideoDocking {
    * @private
    */
   addDragListeners_(element) {
-    const handler = e => this.drag_(/** @type {!TouchEvent} */(e));
+    const handler = e => this.drag_(/** @type {!TouchEvent} */ (e));
 
     listen(element, 'touchstart', handler);
     listen(element, 'mousedown', handler);
@@ -579,8 +573,10 @@ export class VideoDocking {
     installPositionObserverServiceForDoc(this.ampdoc_);
 
     // No getter in services.js.
-    return /** @type {!PositionObserver} */ (
-      getServiceForDoc(this.ampdoc_, 'position-observer'));
+    return /** @type {!PositionObserver} */ (getServiceForDoc(
+      this.ampdoc_,
+      'position-observer'
+    ));
   }
 
   /**
@@ -591,10 +587,12 @@ export class VideoDocking {
    * @private
    */
   getTargetFor_(video) {
-    if (this.isDragging_ ||
-        !this.isValidSize_(video) ||
-        this.ignoreBecauseAnotherDocked_(video) ||
-        this.ignoreDueToNotPlayingManually_(video)) {
+    if (
+      this.isDragging_ ||
+      !this.isValidSize_(video) ||
+      this.ignoreBecauseAnotherDocked_(video) ||
+      this.ignoreDueToNotPlayingManually_(video)
+    ) {
       return null;
     }
     if (this.canUpdateFromSlot_(video)) {
@@ -736,12 +734,14 @@ export class VideoDocking {
    */
   isValidSize_(video) {
     const {width, height} = video.getLayoutBox();
-    if ((width / height) < (1 - FLOAT_TOLERANCE)) {
+    if (width / height < 1 - FLOAT_TOLERANCE) {
       complainAboutPortrait(video.element);
       return false;
     }
-    return this.getAreaWidth_() >= MIN_VIEWPORT_WIDTH &&
-        this.getAreaHeight_() >= (height * REVERT_TO_INLINE_RATIO);
+    return (
+      this.getAreaWidth_() >= MIN_VIEWPORT_WIDTH &&
+      this.getAreaHeight_() >= height * REVERT_TO_INLINE_RATIO
+    );
   }
 
   /**
@@ -794,8 +794,10 @@ export class VideoDocking {
       return null;
     }
 
-    if (this.isCurrentlyDocked_(video) &&
-        !isElement(this.currentlyDocked_.target)) {
+    if (
+      this.isCurrentlyDocked_(video) &&
+      !isElement(this.currentlyDocked_.target)
+    ) {
       const {posY} = devAssert(this.currentlyDocked_).target;
       return /** @type {!RelativeY} */ (dev().assertNumber(posY));
     }
@@ -803,8 +805,10 @@ export class VideoDocking {
     const {element} = video;
     const intersectionRect = getIntersectionRect(element);
 
-    if (!isSizedLayoutRect(intersectionRect) ||
-        intersectionRect.top > this.getTopEdge_()) {
+    if (
+      !isSizedLayoutRect(intersectionRect) ||
+      intersectionRect.top > this.getTopEdge_()
+    ) {
       return null;
     }
 
@@ -842,10 +846,12 @@ export class VideoDocking {
    * @private
    */
   isPlaying_(optVideo = null) {
-    const video = /** @type {!../../../src/video-interface.VideoInterface} */ (
-      optVideo || this.getDockedVideo_());
-    return this.manager_().getPlayingState(video) ==
-        PlayingStates.PLAYING_MANUAL;
+    const video =
+      /** @type {!../../../src/video-interface.VideoInterface} */ (optVideo ||
+      this.getDockedVideo_());
+    return (
+      this.manager_().getPlayingState(video) == PlayingStates.PLAYING_MANUAL
+    );
   }
 
   /**
@@ -868,7 +874,8 @@ export class VideoDocking {
     const direction = this.scrollDirection_;
     return (
       (posY == RelativeY.TOP && direction == Direction.UP) ||
-      (posY == RelativeY.BOTTOM && direction == Direction.DOWN));
+      (posY == RelativeY.BOTTOM && direction == Direction.DOWN)
+    );
   }
 
   /**
@@ -887,9 +894,11 @@ export class VideoDocking {
 
     const currentlyDocked = this.currentlyDocked_;
 
-    if (currentlyDocked &&
+    if (
+      currentlyDocked &&
       targetsEqual(target, currentlyDocked.target) &&
-      currentlyDocked.step >= 0) {
+      currentlyDocked.step >= 0
+    ) {
       return;
     }
 
@@ -912,13 +921,16 @@ export class VideoDocking {
       return this.dock_(video, target, /* step */ 1);
     }
     const isTransferLayerStep = true;
-    return this.dock_(video, target, step, isTransferLayerStep).then(() =>
-      new Promise(resolve => {
-        this.raf_(() => {
-          this.dockInTransferLayerStep_(video, target, step + 0.1)
-              .then(resolve);
-        });
-      }));
+    return this.dock_(video, target, step, isTransferLayerStep).then(
+      () =>
+        new Promise(resolve => {
+          this.raf_(() => {
+            this.dockInTransferLayerStep_(video, target, step + 0.1).then(
+              resolve
+            );
+          });
+        })
+    );
   }
 
   /**
@@ -948,15 +960,21 @@ export class VideoDocking {
     this.setCurrentlyDocked_(video, target, step);
 
     return this.placeAt_(
-        video, x, y, scale, step, transitionDurationMs, relativeX)
-        .then(() => {
-          if (opt_isTransferLayerStep) {
-            // Do not enable controls during transfer layer steps, which would
-            // make them appear on hover during transition.
-            return;
-          }
-          this.getControls_().enable();
-        });
+      video,
+      x,
+      y,
+      scale,
+      step,
+      transitionDurationMs,
+      relativeX
+    ).then(() => {
+      if (opt_isTransferLayerStep) {
+        // Do not enable controls during transfer layer steps, which would
+        // make them appear on hover during transition.
+        return;
+      }
+      this.getControls_().enable();
+    });
   }
 
   /**
@@ -965,14 +983,15 @@ export class VideoDocking {
    */
   trigger_(action) {
     const element = dev().assertElement(
-        this.isDockedToSlot_()
-          ? this.getSlot_()
-          : this.getDockedVideo_().element
+      this.isDockedToSlot_() ? this.getSlot_() : this.getDockedVideo_().element
     );
 
     const trust = ActionTrust.LOW;
-    const event = createCustomEvent(this.ampdoc_.win,
-        /** @type {string} */ (action), /* detail */ dict({}));
+    const event = createCustomEvent(
+      this.ampdoc_.win,
+      /** @type {string} */ (action),
+      /* detail */ dict({})
+    );
     const actions = Services.actionServiceForDoc(element);
     actions.trigger(element, action, event, trust);
   }
@@ -986,8 +1005,10 @@ export class VideoDocking {
     if (this.lastDismissed_ != video) {
       return false;
     }
-    if (this.lastDismissedPosY_ !== null &&
-        !this.positionMatchesScroll_(this.lastDismissedPosY_)) {
+    if (
+      this.lastDismissedPosY_ !== null &&
+      !this.positionMatchesScroll_(this.lastDismissedPosY_)
+    ) {
       return false;
     }
     if (this.isVisible_(video.element, FLOAT_TOLERANCE)) {
@@ -1050,10 +1071,12 @@ export class VideoDocking {
    * @return {boolean}
    */
   alreadyPlacedAt_(x, y, scale) {
-    return !!this.placedAt_ &&
-        this.placedAt_.x == x &&
-        this.placedAt_.y == y &&
-        this.placedAt_.scale == scale;
+    return (
+      !!this.placedAt_ &&
+      this.placedAt_.x == x &&
+      this.placedAt_.y == y &&
+      this.placedAt_.scale == scale
+    );
   }
 
   /**
@@ -1090,8 +1113,11 @@ export class VideoDocking {
     const isPlacementRtl = opt_relativeX == RelativeX.LEFT;
 
     if (hasRelativePlacement) {
-      applyBreakpointClassname(placeholderIcon, width,
-          PLACEHOLDER_ICON_BREAKPOINTS);
+      applyBreakpointClassname(
+        placeholderIcon,
+        width,
+        PLACEHOLDER_ICON_BREAKPOINTS
+      );
 
       placeholderIcon.classList.toggle('amp-rtl', isPlacementRtl);
     }
@@ -1114,25 +1140,28 @@ export class VideoDocking {
       });
     };
 
-    const setOpacity = element => setImportantStyles(element, {
-      'opacity': step,
-    });
+    const setOpacity = element =>
+      setImportantStyles(element, {
+        'opacity': step,
+      });
 
-    const setTransitionTiming = element => setImportantStyles(element, {
-      'transition-duration': `${transitionDurationMs}ms`,
-      'transition-timing-function': transitionTiming,
-    });
+    const setTransitionTiming = element =>
+      setImportantStyles(element, {
+        'transition-duration': `${transitionDurationMs}ms`,
+        'transition-timing-function': transitionTiming,
+      });
 
-    const isSmallPlaceholderIcon =
-        placeholderIcon.classList.contains('amp-small');
+    const isSmallPlaceholderIcon = placeholderIcon.classList.contains(
+      'amp-small'
+    );
 
-    const placeholderIconWidth = isSmallPlaceholderIcon ?
-      PLACEHOLDER_ICON_SMALL_WIDTH :
-      PLACEHOLDER_ICON_LARGE_WIDTH;
+    const placeholderIconWidth = isSmallPlaceholderIcon
+      ? PLACEHOLDER_ICON_SMALL_WIDTH
+      : PLACEHOLDER_ICON_LARGE_WIDTH;
 
-    const placeholderIconMargin = isSmallPlaceholderIcon ?
-      PLACEHOLDER_ICON_SMALL_MARGIN :
-      PLACEHOLDER_ICON_LARGE_MARGIN;
+    const placeholderIconMargin = isSmallPlaceholderIcon
+      ? PLACEHOLDER_ICON_SMALL_MARGIN
+      : PLACEHOLDER_ICON_LARGE_MARGIN;
 
     /**
      * @param {number} containerWidth
@@ -1141,12 +1170,16 @@ export class VideoDocking {
      * @param {number} step
      * @return {number}
      */
-    const iconPlacementFn = isPlacementRtl ?
-      calculateLeftJustifiedX :
-      calculateRightJustifiedX;
+    const iconPlacementFn = isPlacementRtl
+      ? calculateLeftJustifiedX
+      : calculateRightJustifiedX;
 
     const placeholderIconX = iconPlacementFn(
-        width, placeholderIconWidth, placeholderIconMargin, step);
+      width,
+      placeholderIconWidth,
+      placeholderIconMargin,
+      step
+    );
 
     video.mutateElement(() => {
       internalElement.classList.add(BASE_CLASS_NAME);
@@ -1192,9 +1225,11 @@ export class VideoDocking {
       this.getControls_().positionOnVsync(scale, x, y, width, height);
     });
 
-    return this.getTimer_().promise(transitionDurationMs).then(() => {
-      this.isTransitioning_ = false;
-    });
+    return this.getTimer_()
+      .promise(transitionDurationMs)
+      .then(() => {
+        this.isTransitioning_ = false;
+      });
   }
 
   /**
@@ -1226,11 +1261,18 @@ export class VideoDocking {
     const tentativeTransitionDurationMs = Math.abs(y - fixedScrollTop) / 2;
 
     const transitionDurationMs = Math.min(
-        maxTransitionDurationMs,
-        tentativeTransitionDurationMs);
+      maxTransitionDurationMs,
+      tentativeTransitionDurationMs
+    );
 
     return this.placeAt_(
-        video, x, fixedScrollTop, scale, /* step */ 0, transitionDurationMs);
+      video,
+      x,
+      fixedScrollTop,
+      scale,
+      /* step */ 0,
+      transitionDurationMs
+    );
   }
 
   /**
@@ -1278,8 +1320,10 @@ export class VideoDocking {
         return element.getAttribute(attr);
       }
     }
-    const imgEl = scopedQuerySelector(element,
-        'amp-img[placeholder],img[placeholder],[placeholder] amp-img');
+    const imgEl = scopedQuerySelector(
+      element,
+      'amp-img[placeholder],img[placeholder],[placeholder] amp-img'
+    );
     if (imgEl) {
       return imgEl.getAttribute('src');
     }
@@ -1293,9 +1337,9 @@ export class VideoDocking {
    */
   boxNeedsSizing_(width, height) {
     const needsSizing =
-        !this.sizedAt_ ||
-        this.sizedAt_.width != width ||
-        this.sizedAt_.height != height;
+      !this.sizedAt_ ||
+      this.sizedAt_.width != width ||
+      this.sizedAt_.height != height;
     if (needsSizing) {
       this.sizedAt_ = {width, height};
     }
@@ -1318,9 +1362,11 @@ export class VideoDocking {
   setCurrentlyDocked_(video, target, step) {
     const previouslyDocked = this.currentlyDocked_;
     this.currentlyDocked_ = {video, target, step};
-    if (previouslyDocked &&
-        targetsEqual(target, previouslyDocked.target) &&
-        previouslyDocked.video == video) {
+    if (
+      previouslyDocked &&
+      targetsEqual(target, previouslyDocked.target) &&
+      previouslyDocked.video == video
+    ) {
       return;
     }
     this.getControls_().setVideo(video, this.getTargetArea_(video, target));
@@ -1346,8 +1392,15 @@ export class VideoDocking {
     this.dragVelocityX_ = offsetX - this.previousDragOffsetX_;
     this.previousDragOffsetX_ = offsetX;
 
-    this.placeAt_(video, x + offsetX, y + offsetY, scale, step,
-        transitionDurationMs, offsetRelativeX);
+    this.placeAt_(
+      video,
+      x + offsetX,
+      y + offsetY,
+      scale,
+      step,
+      transitionDurationMs,
+      offsetRelativeX
+    );
   }
 
   /**
@@ -1358,7 +1411,7 @@ export class VideoDocking {
   isVisible_(element, minRatio = 1) {
     const target = this.slotHasDimensions_() ? this.getSlot_() : null;
     const intersectionRatio = this.calculateIntersectionRatio_(element, target);
-    return intersectionRatio > (minRatio - FLOAT_TOLERANCE);
+    return intersectionRatio > minRatio - FLOAT_TOLERANCE;
   }
 
   /**
@@ -1386,10 +1439,16 @@ export class VideoDocking {
     const offset = {x: 0, y: 0};
     const {posX: currentPosX, posY: currentPosY} = this.currentlyDocked_.target;
 
-    const onDragMove = throttleByAnimationFrame(this.ampdoc_.win,
-        e => this.onDragMove_(
-            /** @type {!TouchEvent|!MouseEvent} */ (e),
-            currentPosX, currentPosY, initialX, initialY, offset));
+    const onDragMove = throttleByAnimationFrame(this.ampdoc_.win, e =>
+      this.onDragMove_(
+        /** @type {!TouchEvent|!MouseEvent} */ (e),
+        currentPosX,
+        currentPosY,
+        initialX,
+        initialY,
+        offset
+      )
+    );
 
     const onDragEnd = () => this.onDragEnd_(unlisteners, offset);
 
@@ -1478,7 +1537,9 @@ export class VideoDocking {
   workaroundWebkitDragAndScrollIssue_() {
     const {win} = this.ampdoc_;
     if (!Services.platformFor(win).isIos()) {
-      return () => { /* NOOP */ };
+      return () => {
+        /* NOOP */
+      };
     }
     const handler = e => e.preventDefault();
     win.addEventListener('touchmove', handler, {passive: false});
@@ -1500,8 +1561,10 @@ export class VideoDocking {
     if (Math.abs(this.dragVelocityX_) < 40) {
       this.snap_(offset.x, offset.y);
     } else {
-      this.flickToDismiss_(this.previousDragOffsetX_,
-          Math.sign(this.dragVelocityX_));
+      this.flickToDismiss_(
+        this.previousDragOffsetX_,
+        Math.sign(this.dragVelocityX_)
+      );
     }
 
     this.dragVelocityX_ = 0;
@@ -1532,22 +1595,28 @@ export class VideoDocking {
     const {scale} = this.getDims_(video, target, step);
 
     const currentX = x + offsetX;
-    const nextX = direction == 1 ?
-      this.getRightEdge_() :
-      this.getLeftEdge_() - width;
+    const nextX =
+      direction == 1 ? this.getRightEdge_() : this.getLeftEdge_() - width;
 
-    const transitionDurationMs =
-        this.calculateDismissalTransitionDurationMs_(nextX - currentX);
+    const transitionDurationMs = this.calculateDismissalTransitionDurationMs_(
+      nextX - currentX
+    );
 
     this.reconcileUndocked_();
 
     // Show immediately due to Chrome freeze bug when out-of-view.
     video.showControls();
 
-    this.placeAt_(video, nextX, y, scale, /* step */ 0, transitionDurationMs)
-        .then(() => {
-          this.resetOnUndock_(video);
-        });
+    this.placeAt_(
+      video,
+      nextX,
+      y,
+      scale,
+      /* step */ 0,
+      transitionDurationMs
+    ).then(() => {
+      this.resetOnUndock_(video);
+    });
   }
 
   /**
@@ -1568,20 +1637,28 @@ export class VideoDocking {
     const areaWidth = this.getAreaWidth_();
 
     const currentX = x + offsetX;
-    const nextX = direction == 1 ?
-      calculateRightJustifiedX(areaWidth, width, /* margin */ 0, step) :
-      calculateLeftJustifiedX(areaWidth, width, /* margin */ 0, step);
+    const nextX =
+      direction == 1
+        ? calculateRightJustifiedX(areaWidth, width, /* margin */ 0, step)
+        : calculateLeftJustifiedX(areaWidth, width, /* margin */ 0, step);
 
-    const transitionDurationMs =
-      this.calculateDismissalTransitionDurationMs_(nextX - currentX);
+    const transitionDurationMs = this.calculateDismissalTransitionDurationMs_(
+      nextX - currentX
+    );
 
     this.reconcileUndocked_();
 
-    this.placeAt_(video, nextX, y, scale, /* step */ 0, transitionDurationMs)
-        .then(() => {
-          this.undock_(video, /* reconciled */ true);
-          video.showControls();
-        });
+    this.placeAt_(
+      video,
+      nextX,
+      y,
+      scale,
+      /* step */ 0,
+      transitionDurationMs
+    ).then(() => {
+      this.undock_(video, /* reconciled */ true);
+      video.showControls();
+    });
   }
 
   /**
@@ -1606,8 +1683,8 @@ export class VideoDocking {
     const {width, height} = video.getLayoutBox();
     const {x, y, scale} = this.getDims_(video, target, step);
 
-    const centerX = x + offsetX + (width * scale / 2);
-    const centerY = y + offsetY + (height * scale / 2);
+    const centerX = x + offsetX + (width * scale) / 2;
+    const centerY = y + offsetY + (height * scale) / 2;
 
     return {centerX, centerY};
   }
@@ -1636,8 +1713,15 @@ export class VideoDocking {
 
     const {x, y, scale} = this.getDims_(video, target, step);
 
-    this.placeAt_(video, x, y, scale, step, /* transitionDurationMs */ 200,
-        offsetRelativeX);
+    this.placeAt_(
+      video,
+      x,
+      y,
+      scale,
+      step,
+      /* transitionDurationMs */ 200,
+      offsetRelativeX
+    );
   }
 
   /**
@@ -1646,9 +1730,9 @@ export class VideoDocking {
    * @private
    */
   calculateRelativeX_(centerX) {
-    return centerX >= this.getAreaWidth_() / 2 ?
-      RelativeX.RIGHT :
-      RelativeX.LEFT;
+    return centerX >= this.getAreaWidth_() / 2
+      ? RelativeX.RIGHT
+      : RelativeX.LEFT;
   }
 
   /**
@@ -1658,9 +1742,9 @@ export class VideoDocking {
    * @private
    */
   getTargetArea_(video, target) {
-    return isElement(target) ?
-      this.getTargetAreaFromSlot_(video, dev().assertElement(target)) :
-      this.getTargetAreaFromPos_(video, target.posX, target.posY);
+    return isElement(target)
+      ? this.getTargetAreaFromSlot_(video, dev().assertElement(target))
+      : this.getTargetAreaFromPos_(video, target.posX, target.posY);
   }
 
   /**
@@ -1674,21 +1758,23 @@ export class VideoDocking {
     const {width, height} = video.getLayoutBox();
     const margin = this.getMargin_();
     const aspectRatio = width / height;
-    const targetWidth = Math.max(MIN_WIDTH,
-        this.getAreaWidth_() * DOCKED_TO_CORNER_SIZING_RATIO);
+    const targetWidth = Math.max(
+      MIN_WIDTH,
+      this.getAreaWidth_() * DOCKED_TO_CORNER_SIZING_RATIO
+    );
     const targetHeight = targetWidth / aspectRatio;
 
     const x =
-      (posX == RelativeX.RIGHT ?
-        this.getRightEdge_() - margin - targetWidth :
-        this.getLeftEdge_() + margin);
+      posX == RelativeX.RIGHT
+        ? this.getRightEdge_() - margin - targetWidth
+        : this.getLeftEdge_() + margin;
 
     // TODO(alanorozco): Reconsider if y-axis logic for both sides is needed
     // at all.
     const y =
-      (posY == RelativeY.TOP ?
-        this.getTopEdge_() + margin :
-        this.getBottomEdge_() - margin - targetHeight);
+      posY == RelativeY.TOP
+        ? this.getTopEdge_() + margin
+        : this.getBottomEdge_() - margin - targetHeight;
 
     return layoutRectLtwh(x, y, targetWidth, targetHeight);
   }
@@ -1700,10 +1786,7 @@ export class VideoDocking {
    * @private
    */
   getTargetAreaFromSlot_(video, slot) {
-    const {
-      width: naturalWidth,
-      height: naturalHeight,
-    } = video.getLayoutBox();
+    const {width: naturalWidth, height: naturalHeight} = video.getLayoutBox();
 
     const {
       width: slotWidth,
@@ -1719,11 +1802,11 @@ export class VideoDocking {
 
     if (naturalAspect > slotAspect) {
       scale = slotWidth / naturalWidth;
-      y = top + (slotHeight / 2) - (naturalHeight * scale / 2);
+      y = top + slotHeight / 2 - (naturalHeight * scale) / 2;
       x = left;
     } else {
       scale = slotHeight / naturalHeight;
-      x = left + (slotWidth / 2) - (naturalWidth * scale / 2);
+      x = left + slotWidth / 2 - (naturalWidth * scale) / 2;
       y = top;
     }
 
@@ -1789,16 +1872,24 @@ export class VideoDocking {
     // when pausing an out-of-view video, so we need to show controls and
     // transition after. If we animate the transition, we would see native
     // controls during, which looks a bit funky.
-    const transitionDurationMs = isMostlyInView ?
-      this.calculateTransitionDuration_(step) : 0;
+    const transitionDurationMs = isMostlyInView
+      ? this.calculateTransitionDuration_(step)
+      : 0;
 
     return this.placeAt_(
-        video, x, y, scale, step, transitionDurationMs, relativeX)
-        .then(() => this.maybeUpdateStaleYAfterScroll_(video))
-        .then(() => {
-          video.showControls();
-          this.resetOnUndock_(video);
-        });
+      video,
+      x,
+      y,
+      scale,
+      step,
+      transitionDurationMs,
+      relativeX
+    )
+      .then(() => this.maybeUpdateStaleYAfterScroll_(video))
+      .then(() => {
+        video.showControls();
+        this.resetOnUndock_(video);
+      });
   }
 
   /** @private */
@@ -1811,7 +1902,6 @@ export class VideoDocking {
     this.trigger_(Actions.UNDOCK);
   }
 
-
   /**
    * @param {!../../../src/video-interface.VideoOrBaseElementDef} video
    * @return {!Promise}
diff --git a/extensions/amp-video-docking/0.1/breakpoints.js b/extensions/amp-video-docking/0.1/breakpoints.js
index fe257002efcf..10c79cc7571e 100644
--- a/extensions/amp-video-docking/0.1/breakpoints.js
+++ b/extensions/amp-video-docking/0.1/breakpoints.js
@@ -17,7 +17,6 @@
 /** @typedef {{className: string, minWidth: number}} */
 export let SyntheticBreakpointDef;
 
-
 /**
  * @param {!Element} element
  * @param {number} width
@@ -29,8 +28,7 @@ export function applyBreakpointClassname(element, width, breakpoints) {
 
   let maxBreakpoint = -1;
   breakpoints.forEach(({className, minWidth}) => {
-    if (minWidth <= width &&
-        minWidth > maxBreakpoint) {
+    if (minWidth <= width && minWidth > maxBreakpoint) {
       element.classList.add(className);
       maxBreakpoint = minWidth;
     } else {
diff --git a/extensions/amp-video-docking/0.1/controls.js b/extensions/amp-video-docking/0.1/controls.js
index 2b9ab0e3cef5..39619317ee41 100644
--- a/extensions/amp-video-docking/0.1/controls.js
+++ b/extensions/amp-video-docking/0.1/controls.js
@@ -15,10 +15,7 @@
  */
 
 import {HtmlLiteralTagDef} from './html';
-import {
-  PlayingStates,
-  VideoEvents,
-} from '../../../src/video-interface';
+import {PlayingStates, VideoEvents} from '../../../src/video-interface';
 import {Services} from '../../../src/services';
 import {Timeout} from './timeout';
 import {VideoDockingEvents, pointerCoords} from './events';
@@ -35,10 +32,8 @@ import {
   translate,
 } from '../../../src/style';
 
-
 const TAG = 'amp-video-docking-controls';
 
-
 /** @private @const {!Array<!./breakpoints.SyntheticBreakpointDef>} */
 const BREAKPOINTS = [
   {
@@ -51,11 +46,9 @@ const BREAKPOINTS = [
   },
 ];
 
-
 const TIMEOUT = 1200;
 const TIMEOUT_AFTER_INTERACTION = 800;
 
-
 /**
  * @param {!Element} a
  * @param {!Element} b
@@ -66,15 +59,15 @@ function swap(a, b) {
   toggle(b, true);
 }
 
-
 /**
  * @param {!HtmlLiteralTagDef} html
  * @return {!Element}
  * @private
  */
 const renderDockedOverlay = html =>
-  html`<div class="i-amphtml-video-docked-overlay" hidden></div>`;
-
+  html`
+    <div class="i-amphtml-video-docked-overlay" hidden></div>
+  `;
 
 /**
  * @param {!HtmlLiteralTagDef} html
@@ -82,50 +75,54 @@ const renderDockedOverlay = html =>
  * @private
  */
 const renderControls = html =>
-  html`<div class="amp-video-docked-controls" hidden>
-  <div class="amp-video-docked-main-button-group">
-    <div class="amp-video-docked-button-group">
-      <div role="button"
-          ref="playButton"
-          class="amp-video-docked-play">
-      </div>
-      <div role="button"
-          ref="pauseButton"
-          class="amp-video-docked-pause">
-      </div>
-    </div>
-    <div class="amp-video-docked-button-group">
-      <div role="button"
-          ref="muteButton"
-          class="amp-video-docked-mute">
+  html`
+    <div class="amp-video-docked-controls" hidden>
+      <div class="amp-video-docked-main-button-group">
+        <div class="amp-video-docked-button-group">
+          <div
+            role="button"
+            ref="playButton"
+            class="amp-video-docked-play"
+          ></div>
+          <div
+            role="button"
+            ref="pauseButton"
+            class="amp-video-docked-pause"
+          ></div>
+        </div>
+        <div class="amp-video-docked-button-group">
+          <div
+            role="button"
+            ref="muteButton"
+            class="amp-video-docked-mute"
+          ></div>
+          <div
+            role="button"
+            ref="unmuteButton"
+            class="amp-video-docked-unmute"
+          ></div>
+        </div>
+        <div class="amp-video-docked-button-group">
+          <div
+            role="button"
+            ref="fullscreenButton"
+            class="amp-video-docked-fullscreen"
+          ></div>
+        </div>
       </div>
-      <div role="button"
-          ref="unmuteButton"
-          class="amp-video-docked-unmute">
+      <div class="amp-video-docked-button-dismiss-group" ref="dismissContainer">
+        <div
+          role="button"
+          ref="dismissButton"
+          class="amp-video-docked-dismiss"
+        ></div>
       </div>
     </div>
-    <div class="amp-video-docked-button-group">
-      <div role="button"
-          ref="fullscreenButton"
-          class="amp-video-docked-fullscreen">
-      </div>
-    </div>
-  </div>
-  <div class="amp-video-docked-button-dismiss-group"
-      ref="dismissContainer">
-    <div role="button"
-        ref="dismissButton"
-        class="amp-video-docked-dismiss">
-    </div>
-  </div>
-</div>`;
-
+  `;
 
 export class Controls {
-
   /** @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc */
   constructor(ampdoc) {
-
     /** @private {!../../../src/service/ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -172,9 +169,12 @@ export class Controls {
     this.isSticky_ = false;
 
     /** @private {function():!Timeout} */
-    this.getHideTimeout_ = once(() => new Timeout(this.ampdoc_.win, () => {
-      this.hide(/* respectSticky */ true);
-    }));
+    this.getHideTimeout_ = once(
+      () =>
+        new Timeout(this.ampdoc_.win, () => {
+          this.hide(/* respectSticky */ true);
+        })
+    );
 
     /** @private @const {!Array<!UnlistenDef>} */
     this.videoUnlisteners_ = [];
@@ -232,39 +232,45 @@ export class Controls {
     const {element} = video;
 
     this.videoUnlisteners_.push(
-        this.listenWhenEnabled_(this.dismissButton_, click, () => {
-          this.container.dispatchEvent(
-              createCustomEvent(this.ampdoc_.win,
-                  VideoDockingEvents.DISMISS_ON_TAP, /* detail */ undefined));
-        }),
-
-        this.listenWhenEnabled_(this.playButton_, click, () => {
-          video.play(/* auto */ false);
-        }),
-
-        this.listenWhenEnabled_(this.pauseButton_, click, () => {
-          video.pause();
-        }),
-
-        this.listenWhenEnabled_(this.muteButton_, click, () => {
-          video.mute();
-        }),
-
-        this.listenWhenEnabled_(this.unmuteButton_, click, () => {
-          video.unmute();
-        }),
-
-        this.listenWhenEnabled_(this.fullscreenButton_, click, () => {
-          video.fullscreenEnter();
-        }),
-
-        listen(this.container, 'mouseup', () =>
-          this.hideOnTimeout(TIMEOUT_AFTER_INTERACTION)),
-
-        listen(element, VideoEvents.PLAYING, () => this.onPlay_()),
-        listen(element, VideoEvents.PAUSE, () => this.onPause_()),
-        listen(element, VideoEvents.MUTED, () => this.onMute_()),
-        listen(element, VideoEvents.UNMUTED, () => this.onUnmute_()));
+      this.listenWhenEnabled_(this.dismissButton_, click, () => {
+        this.container.dispatchEvent(
+          createCustomEvent(
+            this.ampdoc_.win,
+            VideoDockingEvents.DISMISS_ON_TAP,
+            /* detail */ undefined
+          )
+        );
+      }),
+
+      this.listenWhenEnabled_(this.playButton_, click, () => {
+        video.play(/* auto */ false);
+      }),
+
+      this.listenWhenEnabled_(this.pauseButton_, click, () => {
+        video.pause();
+      }),
+
+      this.listenWhenEnabled_(this.muteButton_, click, () => {
+        video.mute();
+      }),
+
+      this.listenWhenEnabled_(this.unmuteButton_, click, () => {
+        video.unmute();
+      }),
+
+      this.listenWhenEnabled_(this.fullscreenButton_, click, () => {
+        video.fullscreenEnter();
+      }),
+
+      listen(this.container, 'mouseup', () =>
+        this.hideOnTimeout(TIMEOUT_AFTER_INTERACTION)
+      ),
+
+      listen(element, VideoEvents.PLAYING, () => this.onPlay_()),
+      listen(element, VideoEvents.PAUSE, () => this.onPause_()),
+      listen(element, VideoEvents.MUTED, () => this.onMute_()),
+      listen(element, VideoEvents.UNMUTED, () => this.onUnmute_())
+    );
   }
 
   /**
@@ -389,13 +395,10 @@ export class Controls {
    * @param {number} height
    */
   positionOnVsync(scale, x, y, width, height) {
-    const {
-      container,
-      dismissContainer_: dismissContainer,
-    } = this;
+    const {container, dismissContainer_: dismissContainer} = this;
     const halfScale = scale / 2;
-    const centerX = x + (width * halfScale);
-    const centerY = y + (height * halfScale);
+    const centerX = x + width * halfScale;
+    const centerY = y + height * halfScale;
 
     applyBreakpointClassname(container, scale * width, BREAKPOINTS);
 
@@ -428,8 +431,10 @@ export class Controls {
    * @private
    */
   isControlsTarget_(target) {
-    return target == this.overlay ||
-      !!closestAncestorElementBySelector(target, '.amp-video-docked-controls');
+    return (
+      target == this.overlay ||
+      !!closestAncestorElementBySelector(target, '.amp-video-docked-controls')
+    );
   }
 
   /**
@@ -504,12 +509,7 @@ export class Controls {
 
     for (let i = 0; i < els.length; i++) {
       const el = els[i];
-      resetStyles(el, [
-        'transform',
-        'transition',
-        'width',
-        'height',
-      ]);
+      resetStyles(el, ['transform', 'transition', 'width', 'height']);
     }
   }
 }
diff --git a/extensions/amp-video-docking/0.1/events.js b/extensions/amp-video-docking/0.1/events.js
index 6bfdf86e3b87..8d508fe61487 100644
--- a/extensions/amp-video-docking/0.1/events.js
+++ b/extensions/amp-video-docking/0.1/events.js
@@ -16,22 +16,20 @@
 
 import {dev} from '../../../src/log';
 
-
 /** @enum {string} */
 export const VideoDockingEvents = {
   DISMISS_ON_TAP: 'dock-dismiss-on-tap',
 };
 
-
 /**
  * @param {!MouseEvent|!TouchEvent} e
  * @return {{x: number, y: number}}
  * @private
  */
 export function pointerCoords(e) {
-  const coords = (e.touches) ? e.touches[0] : e;
+  const coords = e.touches ? e.touches[0] : e;
   return {
-    x: dev().assertNumber(('x' in coords) ? coords.x : coords.clientX),
-    y: dev().assertNumber(('y' in coords) ? coords.y : coords.clientY),
+    x: dev().assertNumber('x' in coords ? coords.x : coords.clientX),
+    y: dev().assertNumber('y' in coords ? coords.y : coords.clientY),
   };
 }
diff --git a/extensions/amp-video-docking/0.1/math.js b/extensions/amp-video-docking/0.1/math.js
index 20a101e609cc..17718353c143 100644
--- a/extensions/amp-video-docking/0.1/math.js
+++ b/extensions/amp-video-docking/0.1/math.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @param {number} containerWidth
  * @param {number} itemWidth
@@ -26,12 +25,11 @@ function calculateJustified(
   containerWidth,
   itemWidth,
   itemMargin,
-  directedStep) {
-
+  directedStep
+) {
   return directedStep * (containerWidth - itemWidth - itemMargin * 2);
 }
 
-
 /**
  * @param {number} containerWidth
  * @param {number} itemWidth
@@ -43,12 +41,11 @@ export function calculateRightJustifiedX(
   containerWidth,
   itemWidth,
   itemMargin,
-  step) {
-
+  step
+) {
   return calculateJustified(containerWidth, itemWidth, itemMargin, step);
 }
 
-
 /**
  * @param {number} containerWidth
  * @param {number} itemWidth
@@ -60,7 +57,7 @@ export function calculateLeftJustifiedX(
   containerWidth,
   itemWidth,
   itemMargin,
-  step) {
-
+  step
+) {
   return calculateJustified(containerWidth, itemWidth, itemMargin, -step);
 }
diff --git a/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js b/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
index 742f7259c242..3f5871f83fe6 100644
--- a/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
+++ b/extensions/amp-video-docking/0.1/test/test-amp-video-docking.js
@@ -37,13 +37,11 @@ import {Services} from '../../../../src/services';
 import {htmlFor} from '../../../../src/static-template';
 import {layoutRectLtwh} from '../../../../src/layout-rect';
 
-
 const noop = () => {};
 
 const slotId = 'my-slot-element';
 
 describes.realWin('↗ 🔲', {amp: true}, env => {
-
   let ampdoc;
   let manager;
   let viewport;
@@ -77,9 +75,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     video.element.setAttribute('dock', slotAttr);
 
     // VideoDocking.querySlot_() expects this guy:
-    querySelectorStub
-        .withArgs('[dock]')
-        .returns(video.element);
+    querySelectorStub.withArgs('[dock]').returns(video.element);
 
     // VideoDocking.querySlot_() expects the VideoEvents.REGISTERED signal.
     // This is normally set by virtue of the Video service, which is not
@@ -155,7 +151,9 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       disable: sandbox.spy(),
       hide: sandbox.spy(),
       setVideo: sandbox.spy(),
-      overlay: html`<div></div>`,
+      overlay: html`
+        <div></div>
+      `,
     };
 
     sandbox.stub(docking, 'getControls_').returns(controls);
@@ -166,9 +164,8 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
   // This may output differently depending on browser
   // TODO(alanorozco): Compare against the output of a statically defined
   // transform on a dummy element.
-  const transformMatrix = (x, y, scale) => `matrix(${[
-    scale, 0, 0, scale, x, y,
-  ].join(', ')})`;
+  const transformMatrix = (x, y, scale) =>
+    `matrix(${[scale, 0, 0, scale, x, y].join(', ')})`;
 
   beforeEach(() => {
     ampdoc = env.ampdoc;
@@ -176,8 +173,12 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     querySelectorStub = sandbox.stub(ampdoc.getRootNode(), 'querySelector');
 
     manager = {
-      getPlayingState() { return PlayingStates.PLAYING_MANUAL; },
-      isMuted() { return false; },
+      getPlayingState() {
+        return PlayingStates.PLAYING_MANUAL;
+      },
+      isMuted() {
+        return false;
+      },
     };
 
     viewport = {
@@ -203,7 +204,6 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
   });
 
   describe('placeAt_', () => {
-
     let video;
     let html;
     let internalElement;
@@ -221,7 +221,9 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     beforeEach(() => {
       html = htmlFor(env.win.document);
       video = createVideo();
-      internalElement = html`<video></video>`;
+      internalElement = html`
+        <video></video>
+      `;
 
       video.element.appendChild(internalElement);
 
@@ -233,7 +235,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       videoLayerElement = s => elementExists(video.element, s);
     });
 
-    it('delegates controls positioning', function* () {
+    it('delegates controls positioning', function*() {
       const {positionOnVsync} = stubControls();
 
       const x = 0;
@@ -247,7 +249,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(positionOnVsync).to.have.been.calledOnce;
     });
 
-    it('reparents placeholder', function* () {
+    it('reparents placeholder', function*() {
       stubControls();
 
       const x = 30;
@@ -258,11 +260,11 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       yield docking.placeAt_(video, x, y, scale, step, transitionDurationMs);
 
-      expect(videoLayerElement(
-          '.amp-video-docked-placeholder-background')).to.be.ok;
+      expect(videoLayerElement('.amp-video-docked-placeholder-background')).to
+        .be.ok;
     });
 
-    it('fills component area with placeholder elemenets', function* () {
+    it('fills component area with placeholder elemenets', function*() {
       stubControls();
 
       const x = 30;
@@ -273,16 +275,20 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       yield docking.placeAt_(video, x, y, scale, step, transitionDurationMs);
 
-      expect(video.applyFillContent.withArgs(videoLayerElement(
-          '.amp-video-docked-placeholder-background')))
-          .to.have.been.calledOnce;
-
-      expect(video.applyFillContent.withArgs(videoLayerElement(
-          '.amp-video-docked-placeholder-background-poster')))
-          .to.have.been.calledOnce;
+      expect(
+        video.applyFillContent.withArgs(
+          videoLayerElement('.amp-video-docked-placeholder-background')
+        )
+      ).to.have.been.calledOnce;
+
+      expect(
+        video.applyFillContent.withArgs(
+          videoLayerElement('.amp-video-docked-placeholder-background-poster')
+        )
+      ).to.have.been.calledOnce;
     });
 
-    it('styles and transforms elements into docked area', function* () {
+    it('styles and transforms elements into docked area', function*() {
       const {overlay} = stubControls();
 
       enableComputedStyle(video.element);
@@ -305,11 +311,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       const expectedTransform = transformMatrix(x, y, scale);
 
-      [
-        internalElement,
-        overlay,
-        shadow,
-      ].forEach(el => {
+      [internalElement, overlay, shadow].forEach(el => {
         const computedStyle = getComputedStyle(el);
         expect(computedStyle['transform']).to.equal(expectedTransform);
         expect(computedStyle['width']).to.equal(width + 'px');
@@ -319,7 +321,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       });
     });
 
-    it('sets poster image', function* () {
+    it('sets poster image', function*() {
       const posterSrc = 'https://whatever.com/image.png';
 
       stubControls();
@@ -336,15 +338,16 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       yield docking.placeAt_(video, x, y, scale, step, transitionDurationMs);
 
       const poster = videoLayerElement(
-          '.amp-video-docked-placeholder-background-poster');
+        '.amp-video-docked-placeholder-background-poster'
+      );
 
-      expect(getComputedStyle(poster)['backgroundImage'])
-          .to.equal(`url("${posterSrc}")`);
+      expect(getComputedStyle(poster)['backgroundImage']).to.equal(
+        `url("${posterSrc}")`
+      );
     });
 
     for (let step = 0; step <= 1; step = Number((step + 0.1).toFixed(1))) {
-
-      it(`sets opacity = step @ step = ${step}`, function* () {
+      it(`sets opacity = step @ step = ${step}`, function*() {
         stubControls();
         enableComputedStyle(video.element);
 
@@ -357,14 +360,15 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
         const shadow = bodyLayerElement('.amp-video-docked-shadow');
         const placeholder = videoLayerElement(
-            '.amp-video-docked-placeholder-background');
+          '.amp-video-docked-placeholder-background'
+        );
 
         expect(Number(getComputedStyle(shadow)['opacity'])).to.equal(step);
         expect(Number(getComputedStyle(placeholder)['opacity'])).to.equal(step);
       });
     }
 
-    it('overrides overflow to render outside of component area', function* () {
+    it('overrides overflow to render outside of component area', function*() {
       stubControls();
       enableComputedStyle(video.element);
 
@@ -379,7 +383,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(getComputedStyle(video.element)['overflow']).to.equal('visible');
     });
 
-    it('applies classname on internal element', function* () {
+    it('applies classname on internal element', function*() {
       stubControls();
 
       const x = 30;
@@ -393,56 +397,55 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(internalElement).to.have.class(BASE_CLASS_NAME);
     });
 
-    [
-      {step: 0, fn: 'ease-in'},
-      {step: 1, fn: 'ease-out'},
-    ].forEach(({step, fn}) => {
-
-      it(`sets transition timing on elements for step = ${step}`, function* () {
-        const {overlay} = stubControls();
+    [{step: 0, fn: 'ease-in'}, {step: 1, fn: 'ease-out'}].forEach(
+      ({step, fn}) => {
+        it(`sets transition timing on elements for step = ${step}`, function*() {
+          const {overlay} = stubControls();
 
-        enableComputedStyle(video.element);
-        enableComputedStyle(overlay);
+          enableComputedStyle(video.element);
+          enableComputedStyle(overlay);
 
-        const x = 30;
-        const y = 60;
-        const scale = 0.5;
+          const x = 30;
+          const y = 60;
+          const scale = 0.5;
 
-        const durationMs = 260;
-        const durationSecondsStr = '0.26s';
+          const durationMs = 260;
+          const durationSecondsStr = '0.26s';
 
-        yield docking.placeAt_(video, x, y, scale, step, durationMs);
+          yield docking.placeAt_(video, x, y, scale, step, durationMs);
 
-        [
-          internalElement,
-          overlay,
-          videoLayerElement('.amp-video-docked-placeholder-background'),
-          videoLayerElement('.amp-video-docked-placeholder-icon'),
-          bodyLayerElement('.amp-video-docked-shadow'),
-        ].forEach(el => {
-          const style = getComputedStyle(el);
+          [
+            internalElement,
+            overlay,
+            videoLayerElement('.amp-video-docked-placeholder-background'),
+            videoLayerElement('.amp-video-docked-placeholder-icon'),
+            bodyLayerElement('.amp-video-docked-shadow'),
+          ].forEach(el => {
+            const style = getComputedStyle(el);
 
-          expect(style['transitionDuration']).to.equal(durationSecondsStr);
-          expect(style['transitionTimingFunction']).to.equal(fn);
+            expect(style['transitionDuration']).to.equal(durationSecondsStr);
+            expect(style['transitionTimingFunction']).to.equal(fn);
+          });
         });
-      });
-
-    });
+      }
+    );
 
     PLACEHOLDER_ICON_BREAKPOINTS.forEach(({minWidth, className}) => {
       const width = Math.max(200, minWidth);
 
-      const iconMargin = className == 'amp-small' ?
-        PLACEHOLDER_ICON_SMALL_MARGIN :
-        PLACEHOLDER_ICON_LARGE_MARGIN;
+      const iconMargin =
+        className == 'amp-small'
+          ? PLACEHOLDER_ICON_SMALL_MARGIN
+          : PLACEHOLDER_ICON_LARGE_MARGIN;
 
-      const iconWidth = className == 'amp-small' ?
-        PLACEHOLDER_ICON_SMALL_WIDTH :
-        PLACEHOLDER_ICON_LARGE_WIDTH;
+      const iconWidth =
+        className == 'amp-small'
+          ? PLACEHOLDER_ICON_SMALL_WIDTH
+          : PLACEHOLDER_ICON_LARGE_WIDTH;
 
       const step = 1;
 
-      it(`sets ${className} on icon @ ${width}px wide`, function* () {
+      it(`sets ${className} on icon @ ${width}px wide`, function*() {
         stubControls();
 
         const x = 30;
@@ -452,33 +455,44 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
         placeElementLtwh(video, 0, 0, width, 200);
 
-        yield docking.placeAt_(video, x, y, scale, step, transitionDurationMs,
-            // Expecting relative placement to apply icon styling but direction
-            // is irrelevant in this case.
-            RelativeX.RIGHT);
+        yield docking.placeAt_(
+          video,
+          x,
+          y,
+          scale,
+          step,
+          transitionDurationMs,
+          // Expecting relative placement to apply icon styling but direction
+          // is irrelevant in this case.
+          RelativeX.RIGHT
+        );
 
-        expect(videoLayerElement('.amp-video-docked-placeholder-icon'))
-            .to.have.class(className);
+        expect(
+          videoLayerElement('.amp-video-docked-placeholder-icon')
+        ).to.have.class(className);
       });
 
-      [{
-        relativeX: RelativeX.RIGHT,
-        relativeXTextual: 'right',
-        expectedIconX: width - iconWidth - iconMargin * 2,
-      }, {
-        relativeX: RelativeX.LEFT,
-        relativeXTextual: 'left',
-        expectedIconX: -width + iconWidth + iconMargin * 2,
-      }].forEach(({relativeX, relativeXTextual, expectedIconX}) => {
-
-        it(`translates placeholder icon horizontally for posX=${
-          relativeXTextual} in threshold for .${className}`, function* () {
-
+      [
+        {
+          relativeX: RelativeX.RIGHT,
+          relativeXTextual: 'right',
+          expectedIconX: width - iconWidth - iconMargin * 2,
+        },
+        {
+          relativeX: RelativeX.LEFT,
+          relativeXTextual: 'left',
+          expectedIconX: -width + iconWidth + iconMargin * 2,
+        },
+      ].forEach(({relativeX, relativeXTextual, expectedIconX}) => {
+        it(`translates placeholder icon horizontally for posX=${relativeXTextual} in threshold for .${className}`, function*() {
           stubControls();
           enableComputedStyle(video.element);
 
           const expectedTransformMatrix = transformMatrix(
-              expectedIconX, /* y */ 0, /* scale */ 1);
+            expectedIconX,
+            /* y */ 0,
+            /* scale */ 1
+          );
 
           const x = 30;
           const y = 60;
@@ -487,37 +501,40 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
           placeElementLtwh(video, 0, 0, width, 200);
 
-          yield docking.placeAt_(video, x, y, scale, step, transitionDurationMs,
-              relativeX);
+          yield docking.placeAt_(
+            video,
+            x,
+            y,
+            scale,
+            step,
+            transitionDurationMs,
+            relativeX
+          );
 
           const computedStyle = getComputedStyle(
-              videoLayerElement('.amp-video-docked-placeholder-icon'));
+            videoLayerElement('.amp-video-docked-placeholder-icon')
+          );
 
           expect(computedStyle['transform']).to.equal(expectedTransformMatrix);
         });
       });
-
     });
 
-    [{
-      relativeX: RelativeX.RIGHT,
-      relativeXTextual: 'right',
-      placeholderIconHasAmpRtl: false,
-    },
-    {
-      relativeX: RelativeX.LEFT,
-      relativeXTextual: 'left',
-      placeholderIconHasAmpRtl: true,
-    }].forEach(({
-      relativeX,
-      relativeXTextual,
-      placeholderIconHasAmpRtl,
-    }) => {
+    [
+      {
+        relativeX: RelativeX.RIGHT,
+        relativeXTextual: 'right',
+        placeholderIconHasAmpRtl: false,
+      },
+      {
+        relativeX: RelativeX.LEFT,
+        relativeXTextual: 'left',
+        placeholderIconHasAmpRtl: true,
+      },
+    ].forEach(({relativeX, relativeXTextual, placeholderIconHasAmpRtl}) => {
       const setsOrUnsets = placeholderIconHasAmpRtl ? 'sets' : 'unsets';
 
-      it(`${setsOrUnsets} RTL classname on icon transitioning to ${
-        relativeXTextual
-      }`, function* () {
+      it(`${setsOrUnsets} RTL classname on icon transitioning to ${relativeXTextual}`, function*() {
         stubControls();
         enableComputedStyle(video.element);
 
@@ -528,68 +545,81 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
         const transitionDurationMs = 0;
 
         yield docking.placeAt_(
-            video, x, y, scale, step, transitionDurationMs, relativeX);
+          video,
+          x,
+          y,
+          scale,
+          step,
+          transitionDurationMs,
+          relativeX
+        );
 
         expect(
-            videoLayerElement('.amp-video-docked-placeholder-icon')
-                .classList.contains('amp-rtl'))
-            .to.equal(placeholderIconHasAmpRtl);
+          videoLayerElement(
+            '.amp-video-docked-placeholder-icon'
+          ).classList.contains('amp-rtl')
+        ).to.equal(placeholderIconHasAmpRtl);
       });
-
     });
-
   });
 
   describe('getPosterImageSrc_', () => {
-
     let html;
     beforeEach(() => {
       html = htmlFor(env.win.document);
     });
 
     it('uses `poster` attr', () => {
-      const el = html`<amp-video poster=foo.png></amp-video>`;
+      const el = html`
+        <amp-video poster="foo.png"></amp-video>
+      `;
       expect(docking.getPosterImageSrc_(el)).to.equal('foo.png');
     });
 
     it('uses `data-poster` attr', () => {
-      const el = html`<amp-video data-poster=foo.png></amp-video>`;
+      const el = html`
+        <amp-video data-poster="foo.png"></amp-video>
+      `;
       expect(docking.getPosterImageSrc_(el)).to.equal('foo.png');
     });
 
     it('uses `placeholder` amp-img', () => {
-      const el = html`<amp-video>
-          <amp-img src=foo.png placeholder></amp-img>
-        </amp-video>`;
+      const el = html`
+        <amp-video>
+          <amp-img src="foo.png" placeholder></amp-img>
+        </amp-video>
+      `;
 
       expect(docking.getPosterImageSrc_(el)).to.equal('foo.png');
     });
 
     it('uses amp-img in a `placeholder`', () => {
-      const el = html`<amp-video>
+      const el = html`
+        <amp-video>
           <div placeholder>
-            <amp-img src=foo.png></amp-img>
+            <amp-img src="foo.png"></amp-img>
           </div>
-        </amp-video>`;
+        </amp-video>
+      `;
 
       expect(docking.getPosterImageSrc_(el)).to.equal('foo.png');
     });
 
     it('uses `placeholder` img', () => {
-      const el = html`<amp-video>
-          <img src=foo.png placeholder>
-        </amp-video>`;
+      const el = html`
+        <amp-video>
+          <img src="foo.png" placeholder />
+        </amp-video>
+      `;
 
       expect(docking.getPosterImageSrc_(el)).to.equal('foo.png');
     });
-
   });
 
   describe('dockInTransferLayerStep_', () => {
-
     // Something weird causing this to flake in certain leftover states.
     // TODO(alanorozco): Unskip.
-    it.skip('should not overflow', function* () {
+    it.skip('should not overflow', function*() {
       const video = {};
       const target = {};
 
@@ -599,17 +629,17 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       expect(dock).to.have.been.called;
     });
-
   });
 
   describe('getTargetArea_', () => {
-
     it('delegates for slot', () => {
-      const fromPos = sandbox.stub(docking, 'getTargetAreaFromPos_')
-          .returns('foo');
+      const fromPos = sandbox
+        .stub(docking, 'getTargetAreaFromPos_')
+        .returns('foo');
 
-      const fromSlot = sandbox.stub(docking, 'getTargetAreaFromSlot_')
-          .returns('bar');
+      const fromSlot = sandbox
+        .stub(docking, 'getTargetAreaFromSlot_')
+        .returns('bar');
 
       const video = {};
       const target = {nodeType: /* ELEMENT */ 1};
@@ -621,11 +651,13 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     });
 
     it('delegates for corner', () => {
-      const fromPos = sandbox.stub(docking, 'getTargetAreaFromPos_')
-          .returns('foo');
+      const fromPos = sandbox
+        .stub(docking, 'getTargetAreaFromPos_')
+        .returns('foo');
 
-      const fromSlot = sandbox.stub(docking, 'getTargetAreaFromSlot_')
-          .returns('bar');
+      const fromSlot = sandbox
+        .stub(docking, 'getTargetAreaFromSlot_')
+        .returns('bar');
 
       const posX = RelativeX.LEFT;
       const posY = RelativeY.BOTTOM;
@@ -638,21 +670,21 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(fromPos.withArgs(video, posX, posY)).to.have.been.calledOnce;
       expect(fromSlot).to.not.have.been.called;
     });
-
   });
 
   describe('getTargetAreaFromPos_', () => {
-
-    [{
-      posX: RelativeX.RIGHT,
-      posXTextual: 'right',
-      expectedXFn: (vw, margin, width) => vw - margin - width,
-    }, {
-      posX: RelativeX.LEFT,
-      posXTextual: 'left',
-      expectedXFn: (unusedVw, margin, unusedWidth) => margin,
-    }].forEach(({posX, posXTextual, expectedXFn}) => {
-
+    [
+      {
+        posX: RelativeX.RIGHT,
+        posXTextual: 'right',
+        expectedXFn: (vw, margin, width) => vw - margin - width,
+      },
+      {
+        posX: RelativeX.LEFT,
+        posXTextual: 'left',
+        expectedXFn: (unusedVw, margin, unusedWidth) => margin,
+      },
+    ].forEach(({posX, posXTextual, expectedXFn}) => {
       const videoWidth = 600;
       const videoHeight = 400;
 
@@ -667,15 +699,19 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       it('sizes the dock area relative to viewport area', () => {
         const vw = mockAreaWidth(
-            Math.max(MIN_WIDTH / DOCKED_TO_CORNER_SIZING_RATIO));
+          Math.max(MIN_WIDTH / DOCKED_TO_CORNER_SIZING_RATIO)
+        );
 
         const expectedWidth = vw * DOCKED_TO_CORNER_SIZING_RATIO;
         const expectedHeight = expectedWidth / aspectRatio;
 
         mockAreaHeight(200);
 
-        const {width, height} =
-            docking.getTargetAreaFromPos_(video, posX, RelativeY.TOP);
+        const {width, height} = docking.getTargetAreaFromPos_(
+          video,
+          posX,
+          RelativeY.TOP
+        );
 
         expect(width, 'width').to.equal(expectedWidth);
         expect(height, 'height').to.equal(expectedHeight);
@@ -683,7 +719,8 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       it(`sets relative margin for posX = ${posXTextual}`, () => {
         const vw = mockAreaWidth(
-            Math.max(MIN_WIDTH / DOCKED_TO_CORNER_SIZING_RATIO));
+          Math.max(MIN_WIDTH / DOCKED_TO_CORNER_SIZING_RATIO)
+        );
 
         mockAreaHeight(200);
 
@@ -721,13 +758,10 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
         expect(pos.x, 'x').to.equal(expectedX);
         expect(pos.y, 'y').to.equal(expectedY);
       });
-
     });
-
   });
 
   describe('getTargetAreaFromSlot_', () => {
-
     it('returns valid dimensions for same aspect ratio as component', () => {
       const video = createVideo();
       const slot = createAmpElementMock('amp-layout');
@@ -754,8 +788,10 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       sandbox.stub(docking.viewport_, 'getScrollTop').returns(scrollTop);
 
-      const {x, y, width, height} =
-          docking.getTargetAreaFromSlot_(video, slot.element);
+      const {x, y, width, height} = docking.getTargetAreaFromSlot_(
+        video,
+        slot.element
+      );
 
       expect(x, 'x').to.equal(expectedX);
       expect(y, 'y').to.equal(expectedY);
@@ -785,18 +821,20 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       const expectedScale = slotHeight / videoHeight;
 
       const expectedX =
-          // Center
-          slotX + (slotWidth / 2) +
-
-          // Offset center by width delta
-          -(videoWidth * expectedScale / 2);
+        // Center
+        slotX +
+        slotWidth / 2 +
+        // Offset center by width delta
+        -((videoWidth * expectedScale) / 2);
 
       const expectedY = slotY - scrollTop;
 
       sandbox.stub(docking.viewport_, 'getScrollTop').returns(scrollTop);
 
-      const {x, y, width, height} =
-          docking.getTargetAreaFromSlot_(video, slot.element);
+      const {x, y, width, height} = docking.getTargetAreaFromSlot_(
+        video,
+        slot.element
+      );
 
       expect(x, 'x').to.equal(expectedX);
       expect(y, 'y').to.equal(expectedY);
@@ -826,18 +864,21 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       const expectedScale = slotWidth / videoWidth;
 
       const expectedY =
-          // Center
-          (slotY - scrollTop) + (slotHeight / 2) +
-
-          // Offset center by height delta
-          -(videoHeight * expectedScale / 2);
+        // Center
+        slotY -
+        scrollTop +
+        slotHeight / 2 +
+        // Offset center by height delta
+        -((videoHeight * expectedScale) / 2);
 
       const expectedX = slotX;
 
       sandbox.stub(docking.viewport_, 'getScrollTop').returns(scrollTop);
 
-      const {x, y, width, height} =
-          docking.getTargetAreaFromSlot_(video, slot.element);
+      const {x, y, width, height} = docking.getTargetAreaFromSlot_(
+        video,
+        slot.element
+      );
 
       expect(x, 'x').to.equal(expectedX);
       expect(y, 'y').to.equal(expectedY);
@@ -847,7 +888,6 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
   });
 
   describe('getDims_', () => {
-
     let video;
 
     const scrollTop = 5;
@@ -873,8 +913,9 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       targetAreaStub = sandbox.stub(docking, 'getTargetArea_');
 
-      targetAreaStub
-          .returns(layoutRectLtwh(targetX, targetY, targetWidth, targetHeight));
+      targetAreaStub.returns(
+        layoutRectLtwh(targetX, targetY, targetWidth, targetHeight)
+      );
 
       sandbox.stub(docking.viewport_, 'getScrollTop').returns(scrollTop);
     });
@@ -897,38 +938,37 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(scale, 'scale').to.equal(targetWidth / videoWidth);
     });
 
-    [{
-      expectedRelativeX: RelativeX.RIGHT,
-      placementTextual: 'right',
-      videoX: 0,
-      targetX: 10,
-    }, {
-      expectedRelativeX: RelativeX.LEFT,
-      placementTextual: 'left',
-      videoX: 10,
-      targetX: 0,
-    }].forEach(({expectedRelativeX, placementTextual, videoX, targetX}) => {
-
-      it(`returns relativeX=${placementTextual.toUpperCase()
-      } when target placed ${placementTextual} of component`, () => {
-
+    [
+      {
+        expectedRelativeX: RelativeX.RIGHT,
+        placementTextual: 'right',
+        videoX: 0,
+        targetX: 10,
+      },
+      {
+        expectedRelativeX: RelativeX.LEFT,
+        placementTextual: 'left',
+        videoX: 10,
+        targetX: 0,
+      },
+    ].forEach(({expectedRelativeX, placementTextual, videoX, targetX}) => {
+      it(`returns relativeX=${placementTextual.toUpperCase()} when target placed ${placementTextual} of component`, () => {
         const step = 1;
 
         placeElementLtwh(video, videoX, videoY, videoWidth, videoHeight);
 
-        targetAreaStub
-            .returns(layoutRectLtwh(
-                targetX, targetY, targetWidth, targetHeight));
+        targetAreaStub.returns(
+          layoutRectLtwh(targetX, targetY, targetWidth, targetHeight)
+        );
 
-        expect(docking.getDims_(video, target, step).relativeX)
-            .to.equal(expectedRelativeX);
+        expect(docking.getDims_(video, target, step).relativeX).to.equal(
+          expectedRelativeX
+        );
       });
     });
-
   });
 
   describe('dock_', () => {
-
     let video;
     let placeAt;
     let setCurrentlyDocked;
@@ -948,34 +988,42 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       sandbox.stub(docking, 'getDims_').returns(targetDims);
     });
 
-    it('sets currently docked', function* () {
+    it('sets currently docked', function*() {
       stubControls();
 
       yield docking.dock_(video, target, step);
 
-      expect(setCurrentlyDocked.withArgs(video, target, step))
-          .to.have.been.calledOnce;
+      expect(setCurrentlyDocked.withArgs(video, target, step)).to.have.been
+        .calledOnce;
     });
 
-    it('places element at the result of getDims_', function* () {
+    it('places element at the result of getDims_', function*() {
       stubControls();
 
       yield docking.dock_(video, target, step);
 
       const {x, y, scale, relativeX} = targetDims;
 
-      expect(placeAt.withArgs(
-          video, x, y, scale, step, /* durationMs */ any, relativeX))
-          .to.have.been.calledOnce;
+      expect(
+        placeAt.withArgs(
+          video,
+          x,
+          y,
+          scale,
+          step,
+          /* durationMs */ any,
+          relativeX
+        )
+      ).to.have.been.calledOnce;
     });
 
-    it('hides component controls', function* () {
+    it('hides component controls', function*() {
       yield docking.dock_(video, target, step);
 
       expect(video.hideControls).to.have.been.calledOnce;
     });
 
-    it('enables docked controls', function* () {
+    it('enables docked controls', function*() {
       const {enable} = stubControls();
 
       yield docking.dock_(video, target, step);
@@ -983,7 +1031,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(enable).to.have.been.calledOnce;
     });
 
-    it('does not enable docked controls if transferring layer', function* () {
+    it('does not enable docked controls if transferring layer', function*() {
       const {enable} = stubControls();
 
       yield docking.dock_(video, target, step, /* isTransferLayerStep */ true);
@@ -993,7 +1041,6 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
   });
 
   describe('setCurrentlyDocked_', () => {
-
     const video = {foo: 'bar'};
     const target = {tacos: 'sí'};
 
@@ -1006,9 +1053,10 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     beforeEach(() => {
       trigger = sandbox.stub(docking, 'trigger_');
 
-      sandbox.stub(docking, 'getTargetArea_')
-          .withArgs(video, target)
-          .returns(targetArea);
+      sandbox
+        .stub(docking, 'getTargetArea_')
+        .withArgs(video, target)
+        .returns(targetArea);
     });
 
     it('triggers action', () => {
@@ -1051,18 +1099,16 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(trigger.withArgs(Actions.DOCK).callCount).to.equal(4);
     });
 
-    it('updates controls\' video reference', () => {
+    it("updates controls' video reference", () => {
       const {setVideo} = stubControls();
 
       docking.setCurrentlyDocked_(video, target, step);
 
       expect(setVideo.withArgs(video, targetArea)).to.have.been.calledOnce;
     });
-
   });
 
   describe('undock_', () => {
-
     let video;
     let trigger;
     let resetOnUndock;
@@ -1078,19 +1124,21 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
 
       trigger = sandbox.stub(docking, 'trigger_');
       resetOnUndock = sandbox.stub(docking, 'resetOnUndock_');
-      maybeUpdateStaleYAfterScroll = sandbox.stub(docking,
-          'maybeUpdateStaleYAfterScroll_').returns(Promise.resolve());
+      maybeUpdateStaleYAfterScroll = sandbox
+        .stub(docking, 'maybeUpdateStaleYAfterScroll_')
+        .returns(Promise.resolve());
 
       placeAt = sandbox.stub(docking, 'placeAt_').returns(Promise.resolve());
 
       docking.currentlyDocked_ = {target: 'foo'};
 
-      sandbox.stub(docking, 'getDims_')
-          .withArgs(video, docking.currentlyDocked_.target, /* step */ 0)
-          .returns(targetDims);
+      sandbox
+        .stub(docking, 'getDims_')
+        .withArgs(video, docking.currentlyDocked_.target, /* step */ 0)
+        .returns(targetDims);
     });
 
-    it('triggers action', function* () {
+    it('triggers action', function*() {
       stubControls();
 
       yield docking.undock_(video);
@@ -1098,43 +1146,41 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(trigger.withArgs(Actions.UNDOCK)).to.have.been.calledOnce;
     });
 
-    it('updates stale Y after undock', function* () {
+    it('updates stale Y after undock', function*() {
       const {promise, resolve} = new Deferred();
 
       placeAt.returns(promise);
 
       const done = docking.undock_(video);
 
-      expect(maybeUpdateStaleYAfterScroll.withArgs(video))
-          .to.not.have.been.called;
+      expect(maybeUpdateStaleYAfterScroll.withArgs(video)).to.not.have.been
+        .called;
 
       resolve();
 
       yield done;
 
-      expect(maybeUpdateStaleYAfterScroll.withArgs(video))
-          .to.have.been.calledOnce;
+      expect(maybeUpdateStaleYAfterScroll.withArgs(video)).to.have.been
+        .calledOnce;
     });
 
-    it('resets after undock', function* () {
+    it('resets after undock', function*() {
       const {promise, resolve} = new Deferred();
 
       placeAt.returns(promise);
 
       const done = docking.undock_(video);
 
-      expect(resetOnUndock.withArgs(video))
-          .to.not.have.been.called;
+      expect(resetOnUndock.withArgs(video)).to.not.have.been.called;
 
       resolve();
 
       yield done;
 
-      expect(resetOnUndock.withArgs(video))
-          .to.have.been.calledOnce;
+      expect(resetOnUndock.withArgs(video)).to.have.been.calledOnce;
     });
 
-    it('hides and disables docked controls', function* () {
+    it('hides and disables docked controls', function*() {
       const {hide, disable} = stubControls();
 
       yield docking.undock_(video);
@@ -1143,21 +1189,29 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(disable).to.have.been.calledOnce;
     });
 
-    it('places element at the result of getDims_', function* () {
+    it('places element at the result of getDims_', function*() {
       stubControls();
 
       yield docking.undock_(video);
 
       const {x, y, scale, relativeX} = targetDims;
 
-      expect(placeAt.withArgs(
-          video, x, y, scale, /* step */ 0, /* durationMs */ any, relativeX))
-          .to.have.been.calledOnce;
+      expect(
+        placeAt.withArgs(
+          video,
+          x,
+          y,
+          scale,
+          /* step */ 0,
+          /* durationMs */ any,
+          relativeX
+        )
+      ).to.have.been.calledOnce;
     });
 
     const inlinePercVis = `${REVERT_TO_INLINE_RATIO * 100}% visible`;
 
-    it(`pauses video when < ${inlinePercVis}`, function* () {
+    it(`pauses video when < ${inlinePercVis}`, function*() {
       placeElementLtwh(video, 0, 0, 400, 400, REVERT_TO_INLINE_RATIO - 0.1);
 
       yield docking.undock_(video);
@@ -1165,7 +1219,7 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
       expect(video.pause).to.have.been.calledOnce;
     });
 
-    it(`doesn't pause video when >= ${inlinePercVis}`, function* () {
+    it(`doesn't pause video when >= ${inlinePercVis}`, function*() {
       placeElementLtwh(video, 0, 0, 400, 400, REVERT_TO_INLINE_RATIO);
 
       yield docking.undock_(video);
@@ -1174,7 +1228,6 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
     });
 
     describe('Chrome freeze when out-of-view workaround', () => {
-
       it(`shows component controls early when < ${inlinePercVis}`, () => {
         const {promise, resolve} = new Deferred();
 
@@ -1209,257 +1262,276 @@ describes.realWin('↗ 🔲', {amp: true}, env => {
         });
       });
 
-      it(`does not animate transition when < ${inlinePercVis}`, function* () {
+      it(`does not animate transition when < ${inlinePercVis}`, function*() {
         const expectedTransitionDurationMs = 0;
 
         placeElementLtwh(video, 0, 0, 400, 400, REVERT_TO_INLINE_RATIO - 0.1);
 
         yield docking.undock_(video);
 
-        expect(placeAt.withArgs(video, /* x */ any, /* y */ any,
-            /* scale */ any, /* step */ any, expectedTransitionDurationMs))
-            .to.have.been.calledOnce;
+        expect(
+          placeAt.withArgs(
+            video,
+            /* x */ any,
+            /* y */ any,
+            /* scale */ any,
+            /* step */ any,
+            expectedTransitionDurationMs
+          )
+        ).to.have.been.calledOnce;
       });
 
-      it(`animates transition when >= ${inlinePercVis}`, function* () {
+      it(`animates transition when >= ${inlinePercVis}`, function*() {
         const expectedTransitionDurationMs = 555;
 
-        sandbox.stub(docking, 'calculateTransitionDuration_')
-            .returns(expectedTransitionDurationMs);
+        sandbox
+          .stub(docking, 'calculateTransitionDuration_')
+          .returns(expectedTransitionDurationMs);
 
         placeElementLtwh(video, 0, 0, 400, 400, REVERT_TO_INLINE_RATIO);
 
         yield docking.undock_(video);
 
-        expect(placeAt.withArgs(video, /* x */ any, /* y */ any,
-            /* scale */ any, /* step */ any, expectedTransitionDurationMs))
-            .to.have.been.calledOnce;
+        expect(
+          placeAt.withArgs(
+            video,
+            /* x */ any,
+            /* y */ any,
+            /* scale */ any,
+            /* step */ any,
+            expectedTransitionDurationMs
+          )
+        ).to.have.been.calledOnce;
       });
     });
-
   });
 
-  describes.repeated('', {
-    'Minimize to corner': {
-      useSlot: false,
-      topBoundary: 0,
-    },
-    'Minimize to slot element': {
-      useSlot: true,
-      topBoundary: 20,
+  describes.repeated(
+    '',
+    {
+      'Minimize to corner': {
+        useSlot: false,
+        topBoundary: 0,
+      },
+      'Minimize to slot element': {
+        useSlot: true,
+        topBoundary: 20,
+      },
     },
-  }, (name, {useSlot, topBoundary}) => {
+    (name, {useSlot, topBoundary}) => {
+      const targetType = useSlot ? 'slot element' : 'corner';
 
-    const targetType = useSlot ? 'slot element' : 'corner';
-
-    function maybeCreateSlotElementLtwh(left, top, width, height, ratio = 0) {
-      if (!useSlot) {
-        return;
-      }
-      const impl = createAmpElementMock('amp-layout');
-      impl.element.id = slotId;
-      impl.element.setAttribute('layout', 'fill');
-      stubLayoutBox(impl, layoutRectLtwh(left, top, width, height), ratio);
-      env.win.document.body.appendChild(impl.element);
-
-      querySelectorStub
-          .withArgs('#' + slotId)
-          .returns(impl.element);
+      function maybeCreateSlotElementLtwh(left, top, width, height, ratio = 0) {
+        if (!useSlot) {
+          return;
+        }
+        const impl = createAmpElementMock('amp-layout');
+        impl.element.id = slotId;
+        impl.element.setAttribute('layout', 'fill');
+        stubLayoutBox(impl, layoutRectLtwh(left, top, width, height), ratio);
+        env.win.document.body.appendChild(impl.element);
 
-      return impl.element;
-    }
+        querySelectorStub.withArgs('#' + slotId).returns(impl.element);
 
-    beforeEach(() => {
-      if (useSlot) {
-        slotAttr = `#${slotId}`;
+        return impl.element;
       }
-    });
 
-    describe('getTargetFor_', () => {
+      beforeEach(() => {
+        if (useSlot) {
+          slotAttr = `#${slotId}`;
+        }
+      });
 
-      it(`should use a ${targetType} as target`, () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+      describe('getTargetFor_', () => {
+        it(`should use a ${targetType} as target`, () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        const video = createVideo();
+          const video = createVideo();
 
-        const videoWidth = 400;
-        const videoHeight = 300;
+          const videoWidth = 400;
+          const videoHeight = 300;
 
-        placeElementLtwh(video, 0, -200, videoWidth, videoHeight);
+          placeElementLtwh(video, 0, -200, videoWidth, videoHeight);
 
-        setScrollDirection(Direction.UP);
+          setScrollDirection(Direction.UP);
 
-        setValidAreaWidth();
-        setValidAreaHeight(videoHeight);
+          setValidAreaWidth();
+          setValidAreaHeight(videoHeight);
 
-        const target = docking.getTargetFor_(video);
+          const target = docking.getTargetFor_(video);
 
-        expect(target).to.not.be.null;
+          expect(target).to.not.be.null;
 
-        if (useSlot) {
-          expect(target.nodeType).to.equal(/* ELEMENT */ 1);
-          expect(target.posX).to.be.undefined;
-          expect(target.posY).to.be.undefined;
-        } else {
-          expect(target.nodeType).to.be.undefined;
-          expect(target.posX).to.not.be.undefined;
-          expect(target.posY).to.not.be.undefined;
-        }
+          if (useSlot) {
+            expect(target.nodeType).to.equal(/* ELEMENT */ 1);
+            expect(target.posX).to.be.undefined;
+            expect(target.posY).to.be.undefined;
+          } else {
+            expect(target.nodeType).to.be.undefined;
+            expect(target.posX).to.not.be.undefined;
+            expect(target.posY).to.not.be.undefined;
+          }
+        });
       });
 
-    });
+      describe('updateOnPositionChange_', () => {
+        it('should not dock if the viewport is too small', () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-    describe('updateOnPositionChange_', () => {
+          const video = createVideo();
+          const dock = stubDockInTransferLayerStep();
 
-      it('should not dock if the viewport is too small', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+          const videoWidth = 400;
+          const videoHeight = 300;
 
-        const video = createVideo();
-        const dock = stubDockInTransferLayerStep();
+          placeElementLtwh(video, 0, -200, videoWidth, videoHeight);
 
-        const videoWidth = 400;
-        const videoHeight = 300;
+          setScrollDirection(Direction.UP);
 
-        placeElementLtwh(video, 0, -200, videoWidth, videoHeight);
+          mockInvalidAreaWidth();
+          setValidAreaHeight(videoHeight);
 
-        setScrollDirection(Direction.UP);
+          docking.updateOnPositionChange_(video);
 
-        mockInvalidAreaWidth();
-        setValidAreaHeight(videoHeight);
+          expect(dock).to.not.have.been.called;
+        });
 
-        docking.updateOnPositionChange_(video);
+        it('should not dock if the video is portrait', () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        expect(dock).to.not.have.been.called;
-      });
+          const dock = stubDockInTransferLayerStep();
+          const video = createVideo();
 
-      it('should not dock if the video is portrait', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+          const videoWidth = 300;
+          const videoHeight = 400;
 
-        const dock = stubDockInTransferLayerStep();
-        const video = createVideo();
-
-        const videoWidth = 300;
-        const videoHeight = 400;
+          setScrollDirection(Direction.UP);
 
-        setScrollDirection(Direction.UP);
+          setValidAreaWidth();
+          setValidAreaHeight(videoHeight);
 
-        setValidAreaWidth();
-        setValidAreaHeight(videoHeight);
+          placeElementLtwh(video, 0, -400, videoWidth, videoHeight);
 
-        placeElementLtwh(video, 0, -400, videoWidth, videoHeight);
+          allowConsoleError(() => {
+            // user().error() expected.
+            docking.updateOnPositionChange_(video);
+          });
 
-        allowConsoleError(() => {
-          // user().error() expected.
-          docking.updateOnPositionChange_(video);
+          expect(dock).to.not.have.been.called;
         });
 
-        expect(dock).to.not.have.been.called;
-      });
-
-      it('doesn\'t dock when video\'s layout box is not sized', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+        it("doesn't dock when video's layout box is not sized", () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        const video = createVideo();
-        const dock = stubDockInTransferLayerStep();
+          const video = createVideo();
+          const dock = stubDockInTransferLayerStep();
 
-        placeElementLtwh(video, 0, -100, 0, 0);
+          placeElementLtwh(video, 0, -100, 0, 0);
 
-        setScrollDirection(Direction.UP);
+          setScrollDirection(Direction.UP);
 
-        setValidAreaWidth();
-        setValidAreaHeight();
+          setValidAreaWidth();
+          setValidAreaHeight();
 
-        docking.updateOnPositionChange_(video);
+          docking.updateOnPositionChange_(video);
 
-        expect(dock).to.not.have.been.called;
-      });
+          expect(dock).to.not.have.been.called;
+        });
 
-      it('should not dock if another video is docked', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+        it('should not dock if another video is docked', () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        const dock = stubDockInTransferLayerStep();
-        const video = createVideo();
+          const dock = stubDockInTransferLayerStep();
+          const video = createVideo();
 
-        setValidAreaWidth();
+          setValidAreaWidth();
 
-        placeElementLtwh(video, 0, 0, 0, 0);
+          placeElementLtwh(video, 0, 0, 0, 0);
 
-        docking.currentlyDocked_ = {video: createVideo()};
+          docking.currentlyDocked_ = {video: createVideo()};
 
-        setScrollDirection(Direction.UP);
+          setScrollDirection(Direction.UP);
 
-        docking.updateOnPositionChange_(video);
+          docking.updateOnPositionChange_(video);
 
-        expect(dock).to.not.have.been.called;
-      });
+          expect(dock).to.not.have.been.called;
+        });
 
-      it('should dock if video is over top boundary', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+        it('should dock if video is over top boundary', () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        const dock = stubDockInTransferLayerStep();
-        const video = createVideo();
+          const dock = stubDockInTransferLayerStep();
+          const video = createVideo();
 
-        setScrollDirection(Direction.UP);
+          setScrollDirection(Direction.UP);
 
-        const videoWidth = 400;
-        const videoHeight = 300;
+          const videoWidth = 400;
+          const videoHeight = 300;
 
-        setValidAreaWidth();
-        setValidAreaHeight(videoHeight * 2);
+          setValidAreaWidth();
+          setValidAreaHeight(videoHeight * 2);
 
-        placeElementLtwh(
-            video, 0, -250, videoWidth, videoHeight, /* ratio */ 1 / 3);
+          placeElementLtwh(
+            video,
+            0,
+            -250,
+            videoWidth,
+            videoHeight,
+            /* ratio */ 1 / 3
+          );
 
-        sandbox.stub(docking, 'getTopEdge_').returns(topBoundary);
+          sandbox.stub(docking, 'getTopEdge_').returns(topBoundary);
 
-        docking.updateOnPositionChange_(video);
+          docking.updateOnPositionChange_(video);
 
-        expect(dock).to.have.been.calledOnce;
-      });
+          expect(dock).to.have.been.calledOnce;
+        });
 
-      it('should not dock if video does not touch boundaries', () => {
-        maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
+        it('should not dock if video does not touch boundaries', () => {
+          maybeCreateSlotElementLtwh(190, topBoundary, 200, 100);
 
-        const dock = stubDockInTransferLayerStep();
-        const video = createVideo();
+          const dock = stubDockInTransferLayerStep();
+          const video = createVideo();
 
-        const videoWidth = 400;
-        const videoHeight = 300;
+          const videoWidth = 400;
+          const videoHeight = 300;
 
-        setValidAreaWidth();
-        setValidAreaHeight(videoHeight);
-        setScrollDirection(Direction.UP);
-        placeElementLtwh(video, 0, topBoundary + 1, videoWidth, videoHeight);
+          setValidAreaWidth();
+          setValidAreaHeight(videoHeight);
+          setScrollDirection(Direction.UP);
+          placeElementLtwh(video, 0, topBoundary + 1, videoWidth, videoHeight);
 
-        docking.updateOnPositionChange_(video);
+          docking.updateOnPositionChange_(video);
 
-        expect(dock).to.not.have.been.called;
+          expect(dock).to.not.have.been.called;
+        });
       });
 
-    });
-
-    describe('trigger_', () => {
-      const targetElementTextual = useSlot ? 'video' : 'slot';
-
-      it(`triggers action from ${targetElementTextual} element`, () => {
-        const actions = {trigger: sandbox.spy()};
-        sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
-
-        const slot = maybeCreateSlotElementLtwh(0, 0, 0, 0);
-        const video = createVideo();
-        const action = '🌮';
-
-        docking.currentlyDocked_ = {video, target: slot || {}};
-        docking.trigger_(action);
-
-        expect(actions.trigger.withArgs(
-            slot || video.element,
-            action,
-            /* event */ any,
-            /* trust */ any))
-            .to.have.been.called;
-        expect(actions.trigger).to.have.been.calledOnce;
+      describe('trigger_', () => {
+        const targetElementTextual = useSlot ? 'video' : 'slot';
+
+        it(`triggers action from ${targetElementTextual} element`, () => {
+          const actions = {trigger: sandbox.spy()};
+          sandbox.stub(Services, 'actionServiceForDoc').returns(actions);
+
+          const slot = maybeCreateSlotElementLtwh(0, 0, 0, 0);
+          const video = createVideo();
+          const action = '🌮';
+
+          docking.currentlyDocked_ = {video, target: slot || {}};
+          docking.trigger_(action);
+
+          expect(
+            actions.trigger.withArgs(
+              slot || video.element,
+              action,
+              /* event */ any,
+              /* trust */ any
+            )
+          ).to.have.been.called;
+          expect(actions.trigger).to.have.been.calledOnce;
+        });
       });
-    });
-  });
+    }
+  );
 });
diff --git a/extensions/amp-video-docking/0.1/test/test-breakpoints.js b/extensions/amp-video-docking/0.1/test/test-breakpoints.js
index eab3bf66b36e..276697e68e9b 100644
--- a/extensions/amp-video-docking/0.1/test/test-breakpoints.js
+++ b/extensions/amp-video-docking/0.1/test/test-breakpoints.js
@@ -40,32 +40,38 @@ describes.realWin('Synthetic Breakpoints', {amp: false}, env => {
       {width: 200000, expected: huge},
     ].forEach(({width, expected}) => {
       const unexpected = Object.values(breakpoints)
-          .filter(({className}) => className != expected)
-          .map(({className}) => className);
+        .filter(({className}) => className != expected)
+        .map(({className}) => className);
 
-      it(`applies classname (${expected}) for width = ${width} with ` +
-          'multiple breakpoints', () => {
-        const element = env.win.document.createElement('div');
+      it(
+        `applies classname (${expected}) for width = ${width} with ` +
+          'multiple breakpoints',
+        () => {
+          const element = env.win.document.createElement('div');
 
-        applyBreakpointClassname(element, width, breakpoints);
+          applyBreakpointClassname(element, width, breakpoints);
 
-        expect(element.classList.contains(expected)).to.be.true;
-      });
+          expect(element.classList.contains(expected)).to.be.true;
+        }
+      );
 
-      it(`removes classnames that do not apply (${unexpected.join(', ')}) ` +
-          `for width = ${width} with multiple breakpoints`, () => {
-        const element = env.win.document.createElement('div');
+      it(
+        `removes classnames that do not apply (${unexpected.join(', ')}) ` +
+          `for width = ${width} with multiple breakpoints`,
+        () => {
+          const element = env.win.document.createElement('div');
 
-        unexpected.forEach(className => {
-          element.classList.add(className);
-        });
+          unexpected.forEach(className => {
+            element.classList.add(className);
+          });
 
-        applyBreakpointClassname(element, width, breakpoints);
+          applyBreakpointClassname(element, width, breakpoints);
 
-        unexpected.forEach(className => {
-          expect(element.classList.contains(className)).to.be.false;
-        });
-      });
+          unexpected.forEach(className => {
+            expect(element.classList.contains(className)).to.be.false;
+          });
+        }
+      );
     });
 
     Object.values(breakpoints).forEach(({className}) => {
@@ -73,14 +79,17 @@ describes.realWin('Synthetic Breakpoints', {amp: false}, env => {
         [0, 1, 50, 1000, 1400, 100000].forEach(minWidth => {
           const applies = minWidth <= width;
           const verb = applies ? 'applies' : 'does not apply';
-          it(`${verb} classname (${className}) with single breakpoint ` +
-            `(${minWidth})`, () => {
-            const element = env.win.document.createElement('div');
+          it(
+            `${verb} classname (${className}) with single breakpoint ` +
+              `(${minWidth})`,
+            () => {
+              const element = env.win.document.createElement('div');
 
-            applyBreakpointClassname(element, width, [{minWidth, className}]);
+              applyBreakpointClassname(element, width, [{minWidth, className}]);
 
-            expect(element.classList.contains(className)).to.equal(applies);
-          });
+              expect(element.classList.contains(className)).to.equal(applies);
+            }
+          );
         });
       });
     });
diff --git a/extensions/amp-video-docking/0.1/timeout.js b/extensions/amp-video-docking/0.1/timeout.js
index f6e260de245f..11626e917b21 100644
--- a/extensions/amp-video-docking/0.1/timeout.js
+++ b/extensions/amp-video-docking/0.1/timeout.js
@@ -16,7 +16,6 @@
 
 import {Services} from '../../../src/services';
 
-
 /** Timeout that can be postponed, repeated or cancelled. */
 export class Timeout {
   /**
diff --git a/extensions/amp-video-iframe/0.1/amp-video-iframe.js b/extensions/amp-video-iframe/0.1/amp-video-iframe.js
index 95d5e15294cc..b4bcaa2ae9ef 100644
--- a/extensions/amp-video-iframe/0.1/amp-video-iframe.js
+++ b/extensions/amp-video-iframe/0.1/amp-video-iframe.js
@@ -35,14 +35,11 @@ import {
 } from '../../../src/iframe-helper';
 import {getData, listen} from '../../../src/event-helper';
 import {htmlFor} from '../../../src/static-template';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isFullscreenElement, removeElement} from '../../../src/dom';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {once} from '../../../src/utils/function';
 
-
 /** @private @const */
 const TAG = 'amp-video-iframe';
 
@@ -72,14 +69,13 @@ const ALLOWED_EVENTS = [
   VideoEvents.AD_END,
 ];
 
-
 /**
  * @return {!RegExp}
  * @private
  */
-const getAnalyticsEventTypePrefixRegex = once(() =>
-  new RegExp(`^${ANALYTICS_EVENT_TYPE_PREFIX}`));
-
+const getAnalyticsEventTypePrefixRegex = once(
+  () => new RegExp(`^${ANALYTICS_EVENT_TYPE_PREFIX}`)
+);
 
 /**
  * @param {string} src
@@ -92,10 +88,8 @@ function maybeAddAmpFragment(src) {
   return `${src}#amp=1`;
 }
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpVideoIframe extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -131,12 +125,15 @@ class AmpVideoIframe extends AMP.BaseElement {
     // TODO(alanorozco): On integration tests, `getLayoutBox` will return a
     // cached default value, which makes this assertion fail. Move to
     // `describes.integration` to see if that fixes it.
-    const isIntegrationTest =
-        element.hasAttribute('i-amphtml-integration-test');
+    const isIntegrationTest = element.hasAttribute(
+      'i-amphtml-integration-test'
+    );
 
-    this.user().assert(isIntegrationTest || !looksLikeTrackingIframe(element),
-        '<amp-video-iframe> does not allow tracking iframes. ' +
-        'Please use amp-analytics instead.');
+    this.user().assert(
+      isIntegrationTest || !looksLikeTrackingIframe(element),
+      '<amp-video-iframe> does not allow tracking iframes. ' +
+        'Please use amp-analytics instead.'
+    );
 
     installVideoManagerForDoc(element);
   }
@@ -145,9 +142,9 @@ class AmpVideoIframe extends AMP.BaseElement {
   layoutCallback() {
     const name = JSON.stringify(this.getMetadata_());
 
-    this.iframe_ =
-        disableScrollingOnIframe(
-            createFrameFor(this, this.getSrc_(), name, SANDBOX));
+    this.iframe_ = disableScrollingOnIframe(
+      createFrameFor(this, this.getSrc_(), name, SANDBOX)
+    );
 
     this.unlistenFrame_ = listen(this.win, 'message', this.boundOnMessage_);
     return this.createReadyPromise_().then(() => this.onReady_());
@@ -195,10 +192,14 @@ class AmpVideoIframe extends AMP.BaseElement {
   createPlaceholderCallback() {
     const {element} = this;
     const html = htmlFor(element);
-    const poster = html`<amp-img layout=fill placeholder></amp-img>`;
+    const poster = html`
+      <amp-img layout="fill" placeholder></amp-img>
+    `;
 
-    poster.setAttribute('src',
-        this.user().assertString(element.getAttribute('poster')));
+    poster.setAttribute(
+      'src',
+      this.user().assertString(element.getAttribute('poster'))
+    );
 
     return poster;
   }
@@ -231,12 +232,14 @@ class AmpVideoIframe extends AMP.BaseElement {
     const src = urlService.assertHttpsUrl(element.getAttribute('src'), element);
 
     if (urlService.getSourceOrigin(src) === urlService.getWinOrigin(this.win)) {
-      this.user().warn(TAG,
-          'Origins of document inside amp-video-iframe and the host are the ' +
+      this.user().warn(
+        TAG,
+        'Origins of document inside amp-video-iframe and the host are the ' +
           'same, which allows for same-origin behavior. However in AMP ' +
-          'cache, origins won\'t match. Please ensure you do not rely on any ' +
+          "cache, origins won't match. Please ensure you do not rely on any " +
           'same-origin privileges.',
-          element);
+        element
+      );
     }
 
     return maybeAddAmpFragment(src);
@@ -327,13 +330,15 @@ class AmpVideoIframe extends AMP.BaseElement {
     user().assertString(eventType, '`eventType` missing in analytics event');
 
     userAssert(
-        getAnalyticsEventTypePrefixRegex().test(eventType),
-        'Invalid analytics `eventType`. Value must start with `%s`.',
-        ANALYTICS_EVENT_TYPE_PREFIX);
-
-    this.element.dispatchCustomEvent(
-        VideoAnalyticsEvents.CUSTOM,
-        {eventType, vars});
+      getAnalyticsEventTypePrefixRegex().test(eventType),
+      'Invalid analytics `eventType`. Value must start with `%s`.',
+      ANALYTICS_EVENT_TYPE_PREFIX
+    );
+
+    this.element.dispatchCustomEvent(VideoAnalyticsEvents.CUSTOM, {
+      eventType,
+      vars,
+    });
   }
 
   /**
@@ -346,16 +351,19 @@ class AmpVideoIframe extends AMP.BaseElement {
     // Only post ratio > 0 when in autoplay range to prevent internal autoplay
     // implementations that differ from ours.
     const postedRatio =
-        intersectionRatio < MIN_VISIBILITY_RATIO_FOR_AUTOPLAY ?
-          0 : intersectionRatio;
+      intersectionRatio < MIN_VISIBILITY_RATIO_FOR_AUTOPLAY
+        ? 0
+        : intersectionRatio;
 
-    this.postMessage_(dict({
-      'id': messageId,
-      'args': {
-        'intersectionRatio': postedRatio,
-        'time': time,
-      },
-    }));
+    this.postMessage_(
+      dict({
+        'id': messageId,
+        'args': {
+          'intersectionRatio': postedRatio,
+          'time': time,
+        },
+      })
+    );
   }
 
   /**
@@ -363,10 +371,12 @@ class AmpVideoIframe extends AMP.BaseElement {
    * @private
    */
   method_(method) {
-    this.postMessage_(dict({
-      'event': 'method',
-      'method': method,
-    }));
+    this.postMessage_(
+      dict({
+        'event': 'method',
+        'method': method,
+      })
+    );
   }
 
   /**
@@ -382,8 +392,10 @@ class AmpVideoIframe extends AMP.BaseElement {
       return;
     }
     promise.then(() => {
-      this.iframe_.contentWindow./*OK*/postMessage(
-          JSON.stringify(message), '*');
+      this.iframe_.contentWindow./*OK*/ postMessage(
+        JSON.stringify(message),
+        '*'
+      );
     });
   }
 
diff --git a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
index 99c8865998f5..7e153ddf2487 100644
--- a/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
+++ b/extensions/amp-video-iframe/0.1/test/test-amp-video-iframe.js
@@ -32,381 +32,400 @@ function getIntersectionMessage(id) {
   return {data: {id, method: 'getIntersection'}};
 }
 
-describes.realWin('amp-video-iframe', {
-  amp: {
-    extensions: ['amp-video-iframe'],
+describes.realWin(
+  'amp-video-iframe',
+  {
+    amp: {
+      extensions: ['amp-video-iframe'],
+    },
   },
-}, env => {
-  const {any} = sinon.match;
-  const defaultFixture = 'video-iframe.html';
-
-  let win;
-  let doc;
-  let videoManagerStub;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-
-    videoManagerStub = {
-      register: env.sandbox.spy(),
-    };
-
-    env.sandbox.stub(Services, 'videoManagerForDoc').returns(videoManagerStub);
-  });
-
-  function getIframeSrc(fixture = null) {
-    const {port} = location;
-    return (
-      `http://iframe.localhost:${port}/test/fixtures/served/${
-        fixture || defaultFixture}`);
-  }
+  env => {
+    const {any} = sinon.match;
+    const defaultFixture = 'video-iframe.html';
 
-  const layoutConfigAttrs = size => !size ? {layout: 'fill'} : {
-    layout: 'fixed',
-    width: size[0],
-    height: size[1],
-  };
-
-  function createVideoIframe({size, src} = {}) {
-    const html = htmlFor(doc);
-    const el = html`<amp-video-iframe poster=foo.png></amp-video-iframe>`;
-    el.setAttribute('src', src || getIframeSrc());
-    addAttributesToElement(el, layoutConfigAttrs(size));
-    doc.body.appendChild(el);
-    return el;
-  }
+    let win;
+    let doc;
+    let videoManagerStub;
 
-  function spyDispatch(el) {
-    return env.sandbox.spy(el, 'dispatchCustomEvent');
-  }
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
 
-  function acceptMockedMessages(videoIframe) {
-    env.sandbox./*OK*/stub(videoIframe.implementation_, 'originMatches_')
-        .returns(true);
-  }
+      videoManagerStub = {
+        register: env.sandbox.spy(),
+      };
 
-  function layoutAndLoad(videoIframe) {
-    return whenUpgradedToCustomElement(videoIframe).then(() => {
-      videoIframe.implementation_.layoutCallback();
-      return listenOncePromise(videoIframe, VideoEvents.LOAD);
+      env.sandbox
+        .stub(Services, 'videoManagerForDoc')
+        .returns(videoManagerStub);
     });
-  }
 
-  function stubPostMessage(videoIframe) {
-    return env.sandbox./*OK*/stub(videoIframe.implementation_, 'postMessage_');
-  }
+    function getIframeSrc(fixture = null) {
+      const {port} = location;
+      return `http://iframe.localhost:${port}/test/fixtures/served/${fixture ||
+        defaultFixture}`;
+    }
+
+    const layoutConfigAttrs = size =>
+      !size
+        ? {layout: 'fill'}
+        : {
+            layout: 'fixed',
+            width: size[0],
+            height: size[1],
+          };
+
+    function createVideoIframe({size, src} = {}) {
+      const html = htmlFor(doc);
+      const el = html`
+        <amp-video-iframe poster="foo.png"></amp-video-iframe>
+      `;
+      el.setAttribute('src', src || getIframeSrc());
+      addAttributesToElement(el, layoutConfigAttrs(size));
+      doc.body.appendChild(el);
+      return el;
+    }
+
+    function spyDispatch(el) {
+      return env.sandbox.spy(el, 'dispatchCustomEvent');
+    }
+
+    function acceptMockedMessages(videoIframe) {
+      env.sandbox
+        ./*OK*/ stub(videoIframe.implementation_, 'originMatches_')
+        .returns(true);
+    }
 
-  function stubIntersectionEntry(element, time, intersectionRatio) {
-    const entry = {time, intersectionRatio};
-    env.sandbox./*OK*/stub(element, 'getIntersectionChangeEntry')
+    function layoutAndLoad(videoIframe) {
+      return whenUpgradedToCustomElement(videoIframe).then(() => {
+        videoIframe.implementation_.layoutCallback();
+        return listenOncePromise(videoIframe, VideoEvents.LOAD);
+      });
+    }
+
+    function stubPostMessage(videoIframe) {
+      return env.sandbox./*OK*/ stub(
+        videoIframe.implementation_,
+        'postMessage_'
+      );
+    }
+
+    function stubIntersectionEntry(element, time, intersectionRatio) {
+      const entry = {time, intersectionRatio};
+      env.sandbox
+        ./*OK*/ stub(element, 'getIntersectionChangeEntry')
         .returns(entry);
-    return entry;
-  }
-
-  describe('#layoutCallback', () => {
-    it('sets metadata in iframe name', async() => {
-      const metadata = {
-        canonicalUrl: 'foo.html',
-        sourceUrl: 'bar.html',
-      };
-
-      env.sandbox.stub(Services, 'documentInfoForDoc').returns(metadata);
-
-      const videoIframe = createVideoIframe();
-
-      await layoutAndLoad(videoIframe);
+      return entry;
+    }
+
+    describe('#layoutCallback', () => {
+      it('sets metadata in iframe name', async () => {
+        const metadata = {
+          canonicalUrl: 'foo.html',
+          sourceUrl: 'bar.html',
+        };
 
-      const {name} = videoIframe.implementation_.iframe_;
+        env.sandbox.stub(Services, 'documentInfoForDoc').returns(metadata);
 
-      expect(tryParseJson(name)).to.deep.equal(metadata);
-    });
+        const videoIframe = createVideoIframe();
 
-    it('sets amp=1 fragment in src', async() => {
-      const rawSrc = getIframeSrc();
-      const videoIframe = createVideoIframe({src: rawSrc});
+        await layoutAndLoad(videoIframe);
 
-      await layoutAndLoad(videoIframe);
+        const {name} = videoIframe.implementation_.iframe_;
 
-      const {src} = videoIframe.implementation_.iframe_;
-      expect(src).to.equal(`${rawSrc}#amp=1`);
-    });
+        expect(tryParseJson(name)).to.deep.equal(metadata);
+      });
 
-    it('does not set amp=1 fragment in src when fragment present', async() => {
-      const rawSrc = `${getIframeSrc()}#my-fragment`;
-      const videoIframe = createVideoIframe({src: rawSrc});
+      it('sets amp=1 fragment in src', async () => {
+        const rawSrc = getIframeSrc();
+        const videoIframe = createVideoIframe({src: rawSrc});
 
-      await layoutAndLoad(videoIframe);
+        await layoutAndLoad(videoIframe);
 
-      const {src} = videoIframe.implementation_.iframe_;
-      expect(src).to.equal(rawSrc);
-    });
-  });
-
-  describe('#buildCallback', () => {
-    it('rejects tracking iframes', () => {
-      const trackingSizes = [
-        [10, 10],
-        [9, 9],
-        [8, 8],
-        [7, 7],
-        [6, 6],
-        [5, 5],
-        [4, 4],
-        [3, 3],
-        [2, 2],
-        [1, 1],
-      ];
-
-      trackingSizes.forEach(size => {
-        const {implementation_} = createVideoIframe({size});
-        allowConsoleError(() => {
-          expect(() => implementation_.buildCallback()).to.throw();
-        });
+        const {src} = videoIframe.implementation_.iframe_;
+        expect(src).to.equal(`${rawSrc}#amp=1`);
       });
-    });
-  });
 
-  describe('#createPlaceholderCallback', () => {
-    it('creates an amp-img with the poster as src', () => {
-      const videoIframe = createVideoIframe();
+      it('does not set amp=1 fragment in src when fragment present', async () => {
+        const rawSrc = `${getIframeSrc()}#my-fragment`;
+        const videoIframe = createVideoIframe({src: rawSrc});
 
-      const placeholder =
-          videoIframe.implementation_.createPlaceholderCallback();
+        await layoutAndLoad(videoIframe);
 
-      expect(placeholder).to.have.attribute('placeholder');
-      expect(placeholder.tagName.toLowerCase()).to.equal('amp-img');
-      expect(placeholder.getAttribute('layout')).to.equal('fill');
-      expect(placeholder.getAttribute('src')).to.equal(
-          videoIframe.getAttribute('poster'));
+        const {src} = videoIframe.implementation_.iframe_;
+        expect(src).to.equal(rawSrc);
+      });
     });
-  });
-
-  describe('#onMessage_', () => {
-
-    it('should load and register on canplay', async() => {
-      // Fixture inside frame triggers `canplay`.
-      const videoIframe = createVideoIframe();
-      await layoutAndLoad(videoIframe);
 
-      const register =
-        videoManagerStub.register.withArgs(videoIframe.implementation_);
-
-      expect(register).to.have.been.calledOnce;
+    describe('#buildCallback', () => {
+      it('rejects tracking iframes', () => {
+        const trackingSizes = [
+          [10, 10],
+          [9, 9],
+          [8, 8],
+          [7, 7],
+          [6, 6],
+          [5, 5],
+          [4, 4],
+          [3, 3],
+          [2, 2],
+          [1, 1],
+        ];
+
+        trackingSizes.forEach(size => {
+          const {implementation_} = createVideoIframe({size});
+          allowConsoleError(() => {
+            expect(() => implementation_.buildCallback()).to.throw();
+          });
+        });
+      });
     });
 
-    it('should not dispatch invalid events', async() => {
-      const videoIframe = createVideoIframe();
-
-      await layoutAndLoad(videoIframe);
-
-      const dispatch = spyDispatch(videoIframe);
+    describe('#createPlaceholderCallback', () => {
+      it('creates an amp-img with the poster as src', () => {
+        const videoIframe = createVideoIframe();
 
-      const invalidEvents = 'tacos al pastor'.split(' ');
+        const placeholder = videoIframe.implementation_.createPlaceholderCallback();
 
-      invalidEvents.forEach(event => {
-        videoIframe.implementation_.onMessage_({data: {event}});
-        expect(dispatch.withArgs(event)).to.not.have.been.called;
+        expect(placeholder).to.have.attribute('placeholder');
+        expect(placeholder.tagName.toLowerCase()).to.equal('amp-img');
+        expect(placeholder.getAttribute('layout')).to.equal('fill');
+        expect(placeholder.getAttribute('src')).to.equal(
+          videoIframe.getAttribute('poster')
+        );
       });
     });
 
-    it('should dispatch valid events', async() => {
-      const videoIframe = createVideoIframe();
-
-      await layoutAndLoad(videoIframe);
-
-      const dispatch = spyDispatch(videoIframe);
+    describe('#onMessage_', () => {
+      it('should load and register on canplay', async () => {
+        // Fixture inside frame triggers `canplay`.
+        const videoIframe = createVideoIframe();
+        await layoutAndLoad(videoIframe);
 
-      acceptMockedMessages(videoIframe);
+        const register = videoManagerStub.register.withArgs(
+          videoIframe.implementation_
+        );
 
-      const validEvents = [
-        VideoEvents.PLAYING,
-        VideoEvents.PAUSE,
-        VideoEvents.ENDED,
-        VideoEvents.MUTED,
-        VideoEvents.UNMUTED,
-        VideoEvents.AD_START,
-        VideoEvents.AD_END,
-      ];
+        expect(register).to.have.been.calledOnce;
+      });
 
-      for (let i = 0; i < validEvents.length; i++) {
-        const event = validEvents[i];
-        videoIframe.implementation_.onMessage_({data: {event}});
-        expect(dispatch.withArgs(event)).to.have.been.calledOnce;
-      }
-    });
+      it('should not dispatch invalid events', async () => {
+        const videoIframe = createVideoIframe();
 
-    it('should return intersection ratio if in autoplay range', async() => {
-      const id = 1234;
-      const time = 1.234;
-      const intersectionRatio = 2 / 3;
+        await layoutAndLoad(videoIframe);
 
-      const videoIframe = createVideoIframe();
+        const dispatch = spyDispatch(videoIframe);
 
-      await layoutAndLoad(videoIframe);
+        const invalidEvents = 'tacos al pastor'.split(' ');
 
-      const postMessage = stubPostMessage(videoIframe);
+        invalidEvents.forEach(event => {
+          videoIframe.implementation_.onMessage_({data: {event}});
+          expect(dispatch.withArgs(event)).to.not.have.been.called;
+        });
+      });
 
-      acceptMockedMessages(videoIframe);
+      it('should dispatch valid events', async () => {
+        const videoIframe = createVideoIframe();
 
-      const message = getIntersectionMessage(id);
+        await layoutAndLoad(videoIframe);
 
-      const expectedResponseMessage = {
-        id,
-        args: stubIntersectionEntry(videoIframe, time, intersectionRatio),
-      };
+        const dispatch = spyDispatch(videoIframe);
 
-      videoIframe.implementation_.onMessage_(message);
+        acceptMockedMessages(videoIframe);
 
-      expect(postMessage.withArgs(sinon.match(expectedResponseMessage)))
-          .to.have.been.calledOnce;
-    });
+        const validEvents = [
+          VideoEvents.PLAYING,
+          VideoEvents.PAUSE,
+          VideoEvents.ENDED,
+          VideoEvents.MUTED,
+          VideoEvents.UNMUTED,
+          VideoEvents.AD_START,
+          VideoEvents.AD_END,
+        ];
+
+        for (let i = 0; i < validEvents.length; i++) {
+          const event = validEvents[i];
+          videoIframe.implementation_.onMessage_({data: {event}});
+          expect(dispatch.withArgs(event)).to.have.been.calledOnce;
+        }
+      });
 
-    it('should return 0 if not in autoplay range', async() => {
-      const id = 1234;
-      const time = 1.234;
-      const intersectionRatio = 1 / 3;
-      const reportedRatioShouldBe = 0;
+      it('should return intersection ratio if in autoplay range', async () => {
+        const id = 1234;
+        const time = 1.234;
+        const intersectionRatio = 2 / 3;
 
-      const videoIframe = createVideoIframe();
+        const videoIframe = createVideoIframe();
 
-      await layoutAndLoad(videoIframe);
+        await layoutAndLoad(videoIframe);
 
-      const postMessage = stubPostMessage(videoIframe);
+        const postMessage = stubPostMessage(videoIframe);
 
-      stubIntersectionEntry(videoIframe, time, intersectionRatio);
+        acceptMockedMessages(videoIframe);
 
-      acceptMockedMessages(videoIframe);
+        const message = getIntersectionMessage(id);
 
-      const message = getIntersectionMessage(id);
+        const expectedResponseMessage = {
+          id,
+          args: stubIntersectionEntry(videoIframe, time, intersectionRatio),
+        };
 
-      const expectedResponseMessage = {
-        id,
-        args: {
-          time,
-          intersectionRatio: reportedRatioShouldBe,
-        },
-      };
+        videoIframe.implementation_.onMessage_(message);
 
-      videoIframe.implementation_.onMessage_(message);
+        expect(postMessage.withArgs(sinon.match(expectedResponseMessage))).to
+          .have.been.calledOnce;
+      });
 
-      expect(postMessage.withArgs(sinon.match(expectedResponseMessage)))
-          .to.have.been.calledOnce;
-    });
+      it('should return 0 if not in autoplay range', async () => {
+        const id = 1234;
+        const time = 1.234;
+        const intersectionRatio = 1 / 3;
+        const reportedRatioShouldBe = 0;
 
-    [
-      {
-        accept: true,
-        sufix: 'without data',
-        eventType: 'video-custom-foo',
-      },
-      {
-        accept: true,
-        sufix: 'with data',
-        eventType: 'video-custom-foo',
-        vars: {
-          myVar: 'bar',
-        },
-      },
-      {
-        accept: false,
-        eventType: 'tacos al pastor',
-        sufix: 'with invalid event name',
-      },
-    ].forEach(({sufix, eventType, vars, accept}) => {
-      const verb = accept ? 'dispatch' : 'reject';
-
-      it(`should ${verb} custom analytics event ${sufix}`, async() => {
         const videoIframe = createVideoIframe();
-        const dispatch = spyDispatch(videoIframe);
 
         await layoutAndLoad(videoIframe);
 
+        const postMessage = stubPostMessage(videoIframe);
+
+        stubIntersectionEntry(videoIframe, time, intersectionRatio);
+
         acceptMockedMessages(videoIframe);
 
-        const data = {
-          event: 'analytics',
-          analytics: {
-            'eventType': eventType,
+        const message = getIntersectionMessage(id);
+
+        const expectedResponseMessage = {
+          id,
+          args: {
+            time,
+            intersectionRatio: reportedRatioShouldBe,
           },
         };
 
-        if (vars) {
-          Object.assign(data.analytics, {vars});
-        }
+        videoIframe.implementation_.onMessage_(message);
 
-        const {implementation_} = videoIframe;
+        expect(postMessage.withArgs(sinon.match(expectedResponseMessage))).to
+          .have.been.calledOnce;
+      });
 
-        if (accept) {
-          const expectedEventVars = {eventType, vars: vars || {}};
-          const expectedDispatch =
-              dispatch.withArgs(VideoAnalyticsEvents.CUSTOM, expectedEventVars);
-          implementation_.onMessage_({data});
-          expect(expectedDispatch).to.have.been.calledOnce;
-        } else {
-          allowConsoleError(() => {
-            expect(() => implementation_.onMessage_({data})).to.throw();
-          });
-          expect(dispatch.withArgs(VideoAnalyticsEvents.CUSTOM, any))
-              .to.not.have.been.called;
-        }
+      [
+        {
+          accept: true,
+          sufix: 'without data',
+          eventType: 'video-custom-foo',
+        },
+        {
+          accept: true,
+          sufix: 'with data',
+          eventType: 'video-custom-foo',
+          vars: {
+            myVar: 'bar',
+          },
+        },
+        {
+          accept: false,
+          eventType: 'tacos al pastor',
+          sufix: 'with invalid event name',
+        },
+      ].forEach(({sufix, eventType, vars, accept}) => {
+        const verb = accept ? 'dispatch' : 'reject';
+
+        it(`should ${verb} custom analytics event ${sufix}`, async () => {
+          const videoIframe = createVideoIframe();
+          const dispatch = spyDispatch(videoIframe);
+
+          await layoutAndLoad(videoIframe);
+
+          acceptMockedMessages(videoIframe);
+
+          const data = {
+            event: 'analytics',
+            analytics: {
+              'eventType': eventType,
+            },
+          };
+
+          if (vars) {
+            Object.assign(data.analytics, {vars});
+          }
+
+          const {implementation_} = videoIframe;
+
+          if (accept) {
+            const expectedEventVars = {eventType, vars: vars || {}};
+            const expectedDispatch = dispatch.withArgs(
+              VideoAnalyticsEvents.CUSTOM,
+              expectedEventVars
+            );
+            implementation_.onMessage_({data});
+            expect(expectedDispatch).to.have.been.calledOnce;
+          } else {
+            allowConsoleError(() => {
+              expect(() => implementation_.onMessage_({data})).to.throw();
+            });
+            expect(dispatch.withArgs(VideoAnalyticsEvents.CUSTOM, any)).to.not
+              .have.been.called;
+          }
+        });
       });
     });
-  });
 
-  describe('#mutatedAttributesCallback', () => {
-    it('updates src', async() => {
-      const defaultSrc = getIframeSrc(defaultFixture);
-      const videoIframe = createVideoIframe({src: defaultSrc});
-      const {implementation_} = videoIframe;
+    describe('#mutatedAttributesCallback', () => {
+      it('updates src', async () => {
+        const defaultSrc = getIframeSrc(defaultFixture);
+        const videoIframe = createVideoIframe({src: defaultSrc});
+        const {implementation_} = videoIframe;
 
-      await layoutAndLoad(videoIframe);
+        await layoutAndLoad(videoIframe);
 
-      const {iframe_} = implementation_;
+        const {iframe_} = implementation_;
 
-      expect(iframe_.src).to.match(new RegExp(`^${defaultSrc}#`));
+        expect(iframe_.src).to.match(new RegExp(`^${defaultSrc}#`));
 
-      const newSrc = getIframeSrc('video-iframe-2.html');
+        const newSrc = getIframeSrc('video-iframe-2.html');
 
-      videoIframe.setAttribute('src', newSrc);
+        videoIframe.setAttribute('src', newSrc);
 
-      implementation_.mutatedAttributesCallback({'src': true});
+        implementation_.mutatedAttributesCallback({'src': true});
 
-      expect(iframe_.src).to.match(new RegExp(`^${newSrc}#`));
+        expect(iframe_.src).to.match(new RegExp(`^${newSrc}#`));
+      });
     });
-  });
-
-  const implementedVideoInterfaceMethods = [
-    'play',
-    'pause',
-    'mute',
-    'unmute',
-    'hideControls',
-    'showControls',
-    'fullscreenEnter',
-    'fullscreenExit',
-  ];
-
-  implementedVideoInterfaceMethods.forEach(method => {
-    describe(`#${method}`, () => {
-      const lowercaseMethod = method.toLowerCase();
-
-      it(`should post '${lowercaseMethod}'`, async() => {
-        const videoIframe = createVideoIframe();
-
-        await layoutAndLoad(videoIframe);
-
-        const postMessage = stubPostMessage(videoIframe);
-
-        videoIframe.implementation_[method]();
 
-        expect(postMessage.withArgs(sinon.match({
-          event: 'method',
-          method: lowercaseMethod,
-        }))).to.have.been.calledOnce;
+    const implementedVideoInterfaceMethods = [
+      'play',
+      'pause',
+      'mute',
+      'unmute',
+      'hideControls',
+      'showControls',
+      'fullscreenEnter',
+      'fullscreenExit',
+    ];
+
+    implementedVideoInterfaceMethods.forEach(method => {
+      describe(`#${method}`, () => {
+        const lowercaseMethod = method.toLowerCase();
+
+        it(`should post '${lowercaseMethod}'`, async () => {
+          const videoIframe = createVideoIframe();
+
+          await layoutAndLoad(videoIframe);
+
+          const postMessage = stubPostMessage(videoIframe);
+
+          videoIframe.implementation_[method]();
+
+          expect(
+            postMessage.withArgs(
+              sinon.match({
+                event: 'method',
+                method: lowercaseMethod,
+              })
+            )
+          ).to.have.been.calledOnce;
+        });
       });
     });
-  });
-
-
-});
+  }
+);
diff --git a/extensions/amp-video/0.1/amp-video.js b/extensions/amp-video/0.1/amp-video.js
index 0e760218a36e..942ff77eda0a 100644
--- a/extensions/amp-video/0.1/amp-video.js
+++ b/extensions/amp-video/0.1/amp-video.js
@@ -1,18 +1,18 @@
 /**
-  * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS-IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
+ * Copyright 2016 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import {EMPTY_METADATA} from '../../../src/mediasession-helper';
 import {Services} from '../../../src/services';
@@ -32,9 +32,7 @@ import {descendsFromStory} from '../../../src/utils/story';
 import {dev, devAssert} from '../../../src/log';
 import {getMode} from '../../../src/mode';
 import {htmlFor} from '../../../src/static-template';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isExperimentOn} from '../../../src/experiments';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {listen} from '../../../src/event-helper';
@@ -69,15 +67,14 @@ const ATTRS_TO_PROPAGATE_ON_BUILD = [
 const ATTRS_TO_PROPAGATE_ON_LAYOUT = ['loop', 'preload'];
 
 /** @private {!Array<string>} */
-const ATTRS_TO_PROPAGATE =
-    ATTRS_TO_PROPAGATE_ON_BUILD.concat(ATTRS_TO_PROPAGATE_ON_LAYOUT);
-
+const ATTRS_TO_PROPAGATE = ATTRS_TO_PROPAGATE_ON_BUILD.concat(
+  ATTRS_TO_PROPAGATE_ON_LAYOUT
+);
 
 /**
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpVideo extends AMP.BaseElement {
-
   /**
    * @param {!AmpElement} element
    */
@@ -194,8 +191,8 @@ class AmpVideo extends AMP.BaseElement {
 
     const poster = element.getAttribute('poster');
     if (!poster && getMode().development) {
-      console/*OK*/.error(
-          'No "poster" attribute has been provided for amp-video.');
+      console /*OK*/
+        .error('No "poster" attribute has been provided for amp-video.');
     }
 
     // Enable inline play for iOS.
@@ -203,8 +200,11 @@ class AmpVideo extends AMP.BaseElement {
     this.video_.setAttribute('webkit-playsinline', '');
     // Disable video preload in prerender mode.
     this.video_.setAttribute('preload', 'none');
-    this.propagateAttributes(ATTRS_TO_PROPAGATE_ON_BUILD, this.video_,
-        /* opt_removeMissingAttrs */ true);
+    this.propagateAttributes(
+      ATTRS_TO_PROPAGATE_ON_BUILD,
+      this.video_,
+      /* opt_removeMissingAttrs */ true
+    );
     this.installEventHandlers_();
     this.applyFillContent(this.video_, true);
     propagateObjectFitStyles(this.element, this.video_);
@@ -223,9 +223,7 @@ class AmpVideo extends AMP.BaseElement {
       'title': title || '',
       'artist': artist || '',
       'album': album || '',
-      'artwork': [
-        {'src': artwork || poster || ''},
-      ],
+      'artwork': [{'src': artwork || poster || ''}],
     };
 
     installVideoManagerForDoc(element);
@@ -239,12 +237,11 @@ class AmpVideo extends AMP.BaseElement {
     if (!descendsFromStory(element)) {
       return;
     }
-    [
-      'i-amphtml-disable-mediasession',
-      'i-amphtml-poolbound',
-    ].forEach(className => {
-      element.classList.add(className);
-    });
+    ['i-amphtml-disable-mediasession', 'i-amphtml-poolbound'].forEach(
+      className => {
+        element.classList.add(className);
+      }
+    );
   }
 
   /** @override */
@@ -259,20 +256,20 @@ class AmpVideo extends AMP.BaseElement {
       this.propagateAttributes(['src'], dev().assertElement(this.video_));
     }
     const attrs = ATTRS_TO_PROPAGATE.filter(
-        value => mutations[value] !== undefined);
+      value => mutations[value] !== undefined
+    );
     this.propagateAttributes(
-        attrs,
-        dev().assertElement(this.video_),
-        /* opt_removeMissingAttrs */ true);
+      attrs,
+      dev().assertElement(this.video_),
+      /* opt_removeMissingAttrs */ true
+    );
     if (mutations['src']) {
       element.dispatchCustomEvent(VideoEvents.RELOAD);
     }
     if (mutations['artwork'] || mutations['poster']) {
       const artwork = element.getAttribute('artwork');
       const poster = element.getAttribute('poster');
-      this.metadata_['artwork'] = [
-        {'src': artwork || poster || ''},
-      ];
+      this.metadata_['artwork'] = [{'src': artwork || poster || ''}];
     }
     if (mutations['album']) {
       const album = element.getAttribute('album');
@@ -305,9 +302,11 @@ class AmpVideo extends AMP.BaseElement {
       return Promise.resolve();
     }
 
-    this.propagateAttributes(ATTRS_TO_PROPAGATE_ON_LAYOUT,
-        dev().assertElement(this.video_),
-        /* opt_removeMissingAttrs */ true);
+    this.propagateAttributes(
+      ATTRS_TO_PROPAGATE_ON_LAYOUT,
+      dev().assertElement(this.video_),
+      /* opt_removeMissingAttrs */ true
+    );
 
     this.propagateCachedSources_();
 
@@ -384,8 +383,7 @@ class AmpVideo extends AMP.BaseElement {
     const urlService = this.getUrlService_();
 
     // If the `src` of `amp-video` itself is NOT cached, set it on video
-    if (element.hasAttribute('src') &&
-        !this.isCachedByCDN_(element)) {
+    if (element.hasAttribute('src') && !this.isCachedByCDN_(element)) {
       urlService.assertHttpsUrl(element.getAttribute('src'), element);
       this.propagateAttributes(['src'], dev().assertElement(this.video_));
     }
@@ -404,8 +402,11 @@ class AmpVideo extends AMP.BaseElement {
       const origSrc = cachedSource.getAttribute('amp-orig-src');
       const origType = cachedSource.getAttribute('type');
       const origSource = this.createSourceElement_(origSrc, origType);
-      insertAfterOrAtStart(dev().assertElement(this.video_),
-          origSource, cachedSource);
+      insertAfterOrAtStart(
+        dev().assertElement(this.video_),
+        origSource,
+        cachedSource
+      );
     });
 
     const tracks = toArray(childElementsByTag(element, 'track'));
@@ -464,12 +465,15 @@ class AmpVideo extends AMP.BaseElement {
   installEventHandlers_() {
     const video = dev().assertElement(this.video_);
 
-    const forwardEventsUnlisten = this.forwardEvents([
-      VideoEvents.ENDED,
-      VideoEvents.LOADEDMETADATA,
-      VideoEvents.PAUSE,
-      VideoEvents.PLAYING,
-    ], video);
+    const forwardEventsUnlisten = this.forwardEvents(
+      [
+        VideoEvents.ENDED,
+        VideoEvents.LOADEDMETADATA,
+        VideoEvents.PAUSE,
+        VideoEvents.PLAYING,
+      ],
+      video
+    );
 
     const mutedOrUnmutedEventUnlisten = listen(video, 'volumechange', () => {
       const {muted} = this.video_;
@@ -480,9 +484,7 @@ class AmpVideo extends AMP.BaseElement {
       this.element.dispatchCustomEvent(mutedOrUnmutedEvent(this.muted_));
     });
 
-    this.unlisteners_.push(
-        forwardEventsUnlisten,
-        mutedOrUnmutedEventUnlisten);
+    this.unlisteners_.push(forwardEventsUnlisten, mutedOrUnmutedEventUnlisten);
   }
 
   /** @private */
@@ -499,8 +501,9 @@ class AmpVideo extends AMP.BaseElement {
    */
   resetOnDomChange() {
     this.video_ = dev().assertElement(
-        childElementByTag(this.element, 'video'),
-        'Tried to reset amp-video without an underlying <video>.');
+      childElementByTag(this.element, 'video'),
+      'Tried to reset amp-video without an underlying <video>.'
+    );
 
     this.uninstallEventHandlers_();
     this.installEventHandlers_();
@@ -722,8 +725,10 @@ class AmpVideo extends AMP.BaseElement {
     const placeholder = this.getPlaceholder();
     // checks for the existence of a visible blurry placeholder
     if (placeholder) {
-      if (placeholder.classList.contains('i-amphtml-blurry-placeholder') &&
-        isExperimentOn(this.win, 'blurry-placeholder')) {
+      if (
+        placeholder.classList.contains('i-amphtml-blurry-placeholder') &&
+        isExperimentOn(this.win, 'blurry-placeholder')
+      ) {
         setImportantStyles(placeholder, {'opacity': 0.0});
         return true;
       }
@@ -755,7 +760,6 @@ class AmpVideo extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpVideo);
 });
diff --git a/extensions/amp-video/0.1/test/test-amp-video.js b/extensions/amp-video/0.1/test/test-amp-video.js
index 0195c23e0f3c..971427fde142 100644
--- a/extensions/amp-video/0.1/test/test-amp-video.js
+++ b/extensions/amp-video/0.1/test/test-amp-video.js
@@ -22,477 +22,531 @@ import {listenOncePromise} from '../../../../src/event-helper';
 import {mockServiceForDoc} from '../../../../testing/test-helper';
 import {toggleExperiment} from '../../../../src/experiments';
 
-describes.realWin('amp-video', {
-  amp: {
-    extensions: ['amp-video'],
+describes.realWin(
+  'amp-video',
+  {
+    amp: {
+      extensions: ['amp-video'],
+    },
   },
-}, env => {
-  let win, doc;
-  let timer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-  });
-
-  function getFooVideoSrc(filetype) {
-    return '//someHost/foo.' + filetype.slice(filetype.indexOf('/') + 1); // assumes no optional params
-  }
+  env => {
+    let win, doc;
+    let timer;
 
-  function getVideo(attributes, children, opt_beforeLayoutCallback) {
-    const v = doc.createElement('amp-video');
-    for (const key in attributes) {
-      v.setAttribute(key, attributes[key]);
-    }
-    if (children != null) {
-      for (const key in children) {
-        v.appendChild(children[key]);
-      }
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+    });
+
+    function getFooVideoSrc(filetype) {
+      return '//someHost/foo.' + filetype.slice(filetype.indexOf('/') + 1); // assumes no optional params
     }
-    doc.body.appendChild(v);
-    return v.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(v);
+
+    function getVideo(attributes, children, opt_beforeLayoutCallback) {
+      const v = doc.createElement('amp-video');
+      for (const key in attributes) {
+        v.setAttribute(key, attributes[key]);
       }
-      return v.layoutCallback().then(() => v);
-    }).catch(e => {
-      // Ignore failed to load errors since sources are fake.
-      if (e.toString().indexOf('Failed to load') > -1) {
-        return v;
-      } else {
-        throw e;
+      if (children != null) {
+        for (const key in children) {
+          v.appendChild(children[key]);
+        }
       }
-    });
-  }
+      doc.body.appendChild(v);
+      return v
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(v);
+          }
+          return v.layoutCallback().then(() => v);
+        })
+        .catch(e => {
+          // Ignore failed to load errors since sources are fake.
+          if (e.toString().indexOf('Failed to load') > -1) {
+            return v;
+          } else {
+            throw e;
+          }
+        });
+    }
 
-  it('should load a video', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-    }).then(v => {
-      const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
-      v.implementation_.preconnectCallback();
-      preloadSpy.should.have.been.calledWithExactly('video.mp4',
-          undefined);
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.getAttribute('src')).to.equal('video.mp4');
-      expect(video.hasAttribute('controls')).to.be.false;
+    it('should load a video', () => {
+      return getVideo({
+        src: 'video.mp4',
+        width: 160,
+        height: 90,
+      }).then(v => {
+        const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
+        v.implementation_.preconnectCallback();
+        preloadSpy.should.have.been.calledWithExactly('video.mp4', undefined);
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.getAttribute('src')).to.equal('video.mp4');
+        expect(video.hasAttribute('controls')).to.be.false;
+      });
     });
-  });
-
-  it('should load a video', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'muted': '',
-      'loop': '',
-      'crossorigin': '',
-      'disableremoteplayback': '',
-    }).then(v => {
-      const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
-      v.implementation_.preconnectCallback();
-      preloadSpy.should.have.been.calledWithExactly('video.mp4',
-          undefined);
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.hasAttribute('controls')).to.be.true;
-      expect(video.hasAttribute('loop')).to.be.true;
-      expect(video.hasAttribute('crossorigin')).to.be.true;
-      expect(video.hasAttribute('disableremoteplayback')).to.be.true;
-      // autoplay is never propagated to the video element
-      expect(video.hasAttribute('autoplay')).to.be.false;
-      // muted is a deprecated attribute
-      expect(video.hasAttribute('muted')).to.be.false;
+
+    it('should load a video', () => {
+      return getVideo({
+        src: 'video.mp4',
+        width: 160,
+        height: 90,
+        'controls': '',
+        'muted': '',
+        'loop': '',
+        'crossorigin': '',
+        'disableremoteplayback': '',
+      }).then(v => {
+        const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
+        v.implementation_.preconnectCallback();
+        preloadSpy.should.have.been.calledWithExactly('video.mp4', undefined);
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.hasAttribute('controls')).to.be.true;
+        expect(video.hasAttribute('loop')).to.be.true;
+        expect(video.hasAttribute('crossorigin')).to.be.true;
+        expect(video.hasAttribute('disableremoteplayback')).to.be.true;
+        // autoplay is never propagated to the video element
+        expect(video.hasAttribute('autoplay')).to.be.false;
+        // muted is a deprecated attribute
+        expect(video.hasAttribute('muted')).to.be.false;
+      });
     });
-  });
-
-  it('should load a video with source children', () => {
-    const sources = [];
-    const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
-    for (let i = 0; i < mediatypes.length; i++) {
-      const mediatype = mediatypes[i];
-      const source = doc.createElement('source');
-      source.setAttribute('src', getFooVideoSrc(mediatype));
-      source.setAttribute('type', mediatype);
-      sources.push(source);
-    }
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'autoplay': '',
-      'muted': '',
-      'loop': '',
-    }, sources).then(v => {
-      const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
-      v.implementation_.preconnectCallback();
-      preloadSpy.should.have.been.calledWithExactly('video.mp4',
-          undefined);
-      const video = v.querySelector('video');
-      // check that the source tags were propogated
-      expect(video.children.length).to.equal(mediatypes.length);
+
+    it('should load a video with source children', () => {
+      const sources = [];
+      const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
       for (let i = 0; i < mediatypes.length; i++) {
         const mediatype = mediatypes[i];
-        expect(video.children.item(i).tagName).to.equal('SOURCE');
-        expect(video.children.item(i).hasAttribute('src')).to.be.true;
-        expect(video.children.item(i).getAttribute('src'))
-            .to.equal(getFooVideoSrc(mediatype));
-        expect(video.children.item(i).getAttribute('type')).to.equal(mediatype);
+        const source = doc.createElement('source');
+        source.setAttribute('src', getFooVideoSrc(mediatype));
+        source.setAttribute('type', mediatype);
+        sources.push(source);
       }
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'controls': '',
+          'autoplay': '',
+          'muted': '',
+          'loop': '',
+        },
+        sources
+      ).then(v => {
+        const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
+        v.implementation_.preconnectCallback();
+        preloadSpy.should.have.been.calledWithExactly('video.mp4', undefined);
+        const video = v.querySelector('video');
+        // check that the source tags were propogated
+        expect(video.children.length).to.equal(mediatypes.length);
+        for (let i = 0; i < mediatypes.length; i++) {
+          const mediatype = mediatypes[i];
+          expect(video.children.item(i).tagName).to.equal('SOURCE');
+          expect(video.children.item(i).hasAttribute('src')).to.be.true;
+          expect(video.children.item(i).getAttribute('src')).to.equal(
+            getFooVideoSrc(mediatype)
+          );
+          expect(video.children.item(i).getAttribute('type')).to.equal(
+            mediatype
+          );
+        }
+      });
     });
-  });
-
-  it('should load a video with track children', () => {
-    const tracks = [];
-    const tracktypes = ['captions', 'subtitles', 'descriptions', 'chapters'];
-    for (let i = 0; i < tracktypes.length; i++) {
-      const tracktype = tracktypes[i];
-      const track = doc.createElement('track');
-      track.setAttribute('src', getFooVideoSrc(tracktype));
-      track.setAttribute('type', tracktype);
-      track.setAttribute('srclang', 'en');
-      tracks.push(track);
-    }
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'autoplay': '',
-      'muted': '',
-      'loop': '',
-    }, tracks).then(v => {
-      const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
-      v.implementation_.preconnectCallback();
-      preloadSpy.should.have.been.calledWithExactly('video.mp4',
-          undefined);
-      const video = v.querySelector('video');
-      // check that the source tags were propogated
-      expect(video.children.length).to.equal(tracktypes.length);
+
+    it('should load a video with track children', () => {
+      const tracks = [];
+      const tracktypes = ['captions', 'subtitles', 'descriptions', 'chapters'];
       for (let i = 0; i < tracktypes.length; i++) {
         const tracktype = tracktypes[i];
-        expect(video.children.item(i).tagName).to.equal('TRACK');
-        expect(video.children.item(i).hasAttribute('src')).to.be.true;
-        expect(video.children.item(i).getAttribute('src'))
-            .to.equal(getFooVideoSrc(tracktype));
-        expect(video.children.item(i).getAttribute('type')).to.equal(tracktype);
-        expect(video.children.item(i).getAttribute('srclang')).to.equal('en');
+        const track = doc.createElement('track');
+        track.setAttribute('src', getFooVideoSrc(tracktype));
+        track.setAttribute('type', tracktype);
+        track.setAttribute('srclang', 'en');
+        tracks.push(track);
       }
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'controls': '',
+          'autoplay': '',
+          'muted': '',
+          'loop': '',
+        },
+        tracks
+      ).then(v => {
+        const preloadSpy = sandbox.spy(v.implementation_.preconnect, 'url');
+        v.implementation_.preconnectCallback();
+        preloadSpy.should.have.been.calledWithExactly('video.mp4', undefined);
+        const video = v.querySelector('video');
+        // check that the source tags were propogated
+        expect(video.children.length).to.equal(tracktypes.length);
+        for (let i = 0; i < tracktypes.length; i++) {
+          const tracktype = tracktypes[i];
+          expect(video.children.item(i).tagName).to.equal('TRACK');
+          expect(video.children.item(i).hasAttribute('src')).to.be.true;
+          expect(video.children.item(i).getAttribute('src')).to.equal(
+            getFooVideoSrc(tracktype)
+          );
+          expect(video.children.item(i).getAttribute('type')).to.equal(
+            tracktype
+          );
+          expect(video.children.item(i).getAttribute('srclang')).to.equal('en');
+        }
+      });
     });
-  });
-
-  it('should not load a video with http src', () => {
-    // Both "preconnectCallback" and "propagateLayoutChildren_" will trigger
-    // this error message.
-    expectAsyncConsoleError(/start with/, 2);
-    return expect(getVideo({
-      src: 'http://example.com/video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'autoplay': '',
-      'muted': '',
-      'loop': '',
-    }).catch(e => {
-      const v = doc.querySelector('amp-video');
-      // preconnectCallback could get called again after this test is done, and
-      // trigger an other "start with https://" error that would crash mocha.
-      sandbox.stub(v.implementation_, 'preconnectCallback');
-      throw e;
-    })).to.be.rejectedWith(/start with/);
-  });
-
-  it('should not load a video with http source children', () => {
-    expectAsyncConsoleError(/start with/);
-    const sources = [];
-    const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
-    for (let i = 0; i < mediatypes.length; i++) {
-      const mediatype = mediatypes[i];
-      const source = doc.createElement('source');
-      source.setAttribute('src', 'http:' + getFooVideoSrc(mediatype));
-      source.setAttribute('type', mediatype);
-      sources.push(source);
-    }
-    return expect(getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'autoplay': '',
-      'muted': '',
-      'loop': '',
-    }, sources)).to.be.rejectedWith(/start with/);
-  });
-
-  it('should set poster, controls, controlsList in prerender mode', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'poster': 'img.png',
-      'controls': '',
-      'controlsList': 'nofullscreen nodownload noremoteplayback',
-    }, null, function(element) {
-      // Should set appropriate attributes in buildCallback
-      const video = element.querySelector('video');
-      expect(video.getAttribute('poster')).to.equal('img.png');
-      expect(video.getAttribute('controls')).to.exist;
-      expect(video.getAttribute('playsinline')).to.exist;
-      expect(video.getAttribute('webkit-playsinline')).to.exist;
-    }).then(v => {
-      // Same attributes should still be present in layoutCallback.
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.getAttribute('poster')).to.equal('img.png');
-      expect(video.getAttribute('controls')).to.exist;
-      expect(video.getAttribute('controlsList')).to.equal(
-          'nofullscreen nodownload noremoteplayback');
+
+    it('should not load a video with http src', () => {
+      // Both "preconnectCallback" and "propagateLayoutChildren_" will trigger
+      // this error message.
+      expectAsyncConsoleError(/start with/, 2);
+      return expect(
+        getVideo({
+          src: 'http://example.com/video.mp4',
+          width: 160,
+          height: 90,
+          'controls': '',
+          'autoplay': '',
+          'muted': '',
+          'loop': '',
+        }).catch(e => {
+          const v = doc.querySelector('amp-video');
+          // preconnectCallback could get called again after this test is done, and
+          // trigger an other "start with https://" error that would crash mocha.
+          sandbox.stub(v.implementation_, 'preconnectCallback');
+          throw e;
+        })
+      ).to.be.rejectedWith(/start with/);
     });
-  });
-
-  it('should not set src or preload in build', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'preload': 'auto',
-      'poster': 'img.png',
-    }, null, function(element) {
-      const video = element.querySelector('video');
-      expect(video.getAttribute('preload')).to.equal('none');
-      expect(video.hasAttribute('src')).to.be.false;
-    }).then(v => {
-      // Should set appropriate attributes in layoutCallback.
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.getAttribute('preload')).to.equal('auto');
+
+    it('should not load a video with http source children', () => {
+      expectAsyncConsoleError(/start with/);
+      const sources = [];
+      const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
+      for (let i = 0; i < mediatypes.length; i++) {
+        const mediatype = mediatypes[i];
+        const source = doc.createElement('source');
+        source.setAttribute('src', 'http:' + getFooVideoSrc(mediatype));
+        source.setAttribute('type', mediatype);
+        sources.push(source);
+      }
+      return expect(
+        getVideo(
+          {
+            src: 'video.mp4',
+            width: 160,
+            height: 90,
+            'controls': '',
+            'autoplay': '',
+            'muted': '',
+            'loop': '',
+          },
+          sources
+        )
+      ).to.be.rejectedWith(/start with/);
     });
-  });
-
-  it('should remove preload attribute when not provided', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'poster': 'img.png',
-    }, null, function(element) {
-      const video = element.querySelector('video');
-      expect(video.getAttribute('preload')).to.equal('none');
-      expect(video.getAttribute('poster')).to.equal('img.png');
-      expect(video.hasAttribute('src')).to.be.false;
-    }).then(v => {
-      // Should set appropriate attributes in layoutCallback.
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.hasAttribute('preload')).to.be.false;
-      expect(video.getAttribute('poster')).to.equal('img.png');
+
+    it('should set poster, controls, controlsList in prerender mode', () => {
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'poster': 'img.png',
+          'controls': '',
+          'controlsList': 'nofullscreen nodownload noremoteplayback',
+        },
+        null,
+        function(element) {
+          // Should set appropriate attributes in buildCallback
+          const video = element.querySelector('video');
+          expect(video.getAttribute('poster')).to.equal('img.png');
+          expect(video.getAttribute('controls')).to.exist;
+          expect(video.getAttribute('playsinline')).to.exist;
+          expect(video.getAttribute('webkit-playsinline')).to.exist;
+        }
+      ).then(v => {
+        // Same attributes should still be present in layoutCallback.
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.getAttribute('poster')).to.equal('img.png');
+        expect(video.getAttribute('controls')).to.exist;
+        expect(video.getAttribute('controlsList')).to.equal(
+          'nofullscreen nodownload noremoteplayback'
+        );
+      });
     });
-  });
-
-  it('should not load a video with source children in prerender mode', () => {
-    const sources = [];
-    const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
-    for (let i = 0; i < mediatypes.length; i++) {
-      const mediatype = mediatypes[i];
-      const source = doc.createElement('source');
-      source.setAttribute('src', getFooVideoSrc(mediatype));
-      source.setAttribute('type', mediatype);
-      sources.push(source);
-    }
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'controls': '',
-      'autoplay': '',
-      'muted': '',
-      'loop': '',
-    }, sources, function(element) {
-      const video = element.querySelector('video');
-      expect(video.children.length).to.equal(0);
-    }).then(v => {
-      // Should add attributes and source children in layoutCallback.
-      const video = v.querySelector('video');
-      // check that the source tags were propogated
-      expect(video.children.length).to.equal(mediatypes.length);
+
+    it('should not set src or preload in build', () => {
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'preload': 'auto',
+          'poster': 'img.png',
+        },
+        null,
+        function(element) {
+          const video = element.querySelector('video');
+          expect(video.getAttribute('preload')).to.equal('none');
+          expect(video.hasAttribute('src')).to.be.false;
+        }
+      ).then(v => {
+        // Should set appropriate attributes in layoutCallback.
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.getAttribute('preload')).to.equal('auto');
+      });
+    });
+
+    it('should remove preload attribute when not provided', () => {
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'poster': 'img.png',
+        },
+        null,
+        function(element) {
+          const video = element.querySelector('video');
+          expect(video.getAttribute('preload')).to.equal('none');
+          expect(video.getAttribute('poster')).to.equal('img.png');
+          expect(video.hasAttribute('src')).to.be.false;
+        }
+      ).then(v => {
+        // Should set appropriate attributes in layoutCallback.
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.hasAttribute('preload')).to.be.false;
+        expect(video.getAttribute('poster')).to.equal('img.png');
+      });
+    });
+
+    it('should not load a video with source children in prerender mode', () => {
+      const sources = [];
+      const mediatypes = ['video/ogg', 'video/mp4', 'video/webm'];
       for (let i = 0; i < mediatypes.length; i++) {
         const mediatype = mediatypes[i];
-        expect(video.children.item(i).tagName).to.equal('SOURCE');
-        expect(video.children.item(i).hasAttribute('src')).to.be.true;
-        expect(video.children.item(i).getAttribute('src'))
-            .to.equal(getFooVideoSrc(mediatype));
-        expect(video.children.item(i).getAttribute('type')).to.equal(mediatype);
+        const source = doc.createElement('source');
+        source.setAttribute('src', getFooVideoSrc(mediatype));
+        source.setAttribute('type', mediatype);
+        sources.push(source);
       }
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'controls': '',
+          'autoplay': '',
+          'muted': '',
+          'loop': '',
+        },
+        sources,
+        function(element) {
+          const video = element.querySelector('video');
+          expect(video.children.length).to.equal(0);
+        }
+      ).then(v => {
+        // Should add attributes and source children in layoutCallback.
+        const video = v.querySelector('video');
+        // check that the source tags were propogated
+        expect(video.children.length).to.equal(mediatypes.length);
+        for (let i = 0; i < mediatypes.length; i++) {
+          const mediatype = mediatypes[i];
+          expect(video.children.item(i).tagName).to.equal('SOURCE');
+          expect(video.children.item(i).hasAttribute('src')).to.be.true;
+          expect(video.children.item(i).getAttribute('src')).to.equal(
+            getFooVideoSrc(mediatype)
+          );
+          expect(video.children.item(i).getAttribute('type')).to.equal(
+            mediatype
+          );
+        }
+      });
     });
-  });
-
-  it('should set src and preload in non-prerender mode', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'preload': 'auto',
-      'poster': 'img.png',
-    }, null, function(element) {
-      const video = element.querySelector('video');
-      expect(video.getAttribute('preload')).to.equal('none');
-      expect(video.getAttribute('poster')).to.equal('img.png');
-      expect(video.hasAttribute('src')).to.be.false;
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.tagName).to.equal('VIDEO');
-      expect(video.getAttribute('preload')).to.equal('auto');
-      expect(video.getAttribute('poster')).to.equal('img.png');
+
+    it('should set src and preload in non-prerender mode', () => {
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+          'preload': 'auto',
+          'poster': 'img.png',
+        },
+        null,
+        function(element) {
+          const video = element.querySelector('video');
+          expect(video.getAttribute('preload')).to.equal('none');
+          expect(video.getAttribute('poster')).to.equal('img.png');
+          expect(video.hasAttribute('src')).to.be.false;
+        }
+      ).then(v => {
+        const video = v.querySelector('video');
+        expect(video.tagName).to.equal('VIDEO');
+        expect(video.getAttribute('preload')).to.equal('auto');
+        expect(video.getAttribute('poster')).to.equal('img.png');
+      });
     });
-  });
-
-  it('should pause the video when document inactive', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-    }).then(v => {
-      const impl = v.implementation_;
-      const video = v.querySelector('video');
-      sandbox.spy(video, 'pause');
-      impl.pauseCallback();
-      expect(video.pause.called).to.be.true;
+
+    it('should pause the video when document inactive', () => {
+      return getVideo({
+        src: 'video.mp4',
+        width: 160,
+        height: 90,
+      }).then(v => {
+        const impl = v.implementation_;
+        const video = v.querySelector('video');
+        sandbox.spy(video, 'pause');
+        impl.pauseCallback();
+        expect(video.pause.called).to.be.true;
+      });
     });
-  });
-
-  it('should fallback if video element is not supported', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-    }, null, function(element) {
-      const impl = element.implementation_;
-      sandbox.stub(impl, 'isVideoSupported_').returns(false);
-      sandbox.spy(impl, 'toggleFallback');
-    }).then(v => {
-      const impl = v.implementation_;
-      expect(impl.toggleFallback.called).to.be.true;
-      expect(impl.toggleFallback).to.have.been.calledWith(true);
+
+    it('should fallback if video element is not supported', () => {
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+        },
+        null,
+        function(element) {
+          const impl = element.implementation_;
+          sandbox.stub(impl, 'isVideoSupported_').returns(false);
+          sandbox.spy(impl, 'toggleFallback');
+        }
+      ).then(v => {
+        const impl = v.implementation_;
+        expect(impl.toggleFallback.called).to.be.true;
+        expect(impl.toggleFallback).to.have.been.calledWith(true);
+      });
     });
-  });
-
-  it('play() should not log promise rejections', () => {
-    const playPromise = Promise.reject('The play() request was interrupted');
-    const catchSpy = sandbox.spy(playPromise, 'catch');
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-    }, null, function(element) {
-      const impl = element.implementation_;
-      sandbox.stub(impl.video_, 'play').returns(playPromise);
-      impl.play();
-    }).then(() => {
-      expect(catchSpy.called).to.be.true;
+
+    it('play() should not log promise rejections', () => {
+      const playPromise = Promise.reject('The play() request was interrupted');
+      const catchSpy = sandbox.spy(playPromise, 'catch');
+      return getVideo(
+        {
+          src: 'video.mp4',
+          width: 160,
+          height: 90,
+        },
+        null,
+        function(element) {
+          const impl = element.implementation_;
+          sandbox.stub(impl.video_, 'play').returns(playPromise);
+          impl.play();
+        }
+      ).then(() => {
+        expect(catchSpy.called).to.be.true;
+      });
     });
-  });
-
-  it('should propagate ARIA attributes', () => {
-    return getVideo({
-      src: 'video.mp4',
-      width: 160,
-      height: 90,
-      'aria-label': 'Hello',
-      'aria-labelledby': 'id2',
-      'aria-describedby': 'id3',
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.getAttribute('aria-label')).to.equal('Hello');
-      expect(video.getAttribute('aria-labelledby')).to.equal('id2');
-      expect(video.getAttribute('aria-describedby')).to.equal('id3');
+
+    it('should propagate ARIA attributes', () => {
+      return getVideo({
+        src: 'video.mp4',
+        width: 160,
+        height: 90,
+        'aria-label': 'Hello',
+        'aria-labelledby': 'id2',
+        'aria-describedby': 'id3',
+      }).then(v => {
+        const video = v.querySelector('video');
+        expect(video.getAttribute('aria-label')).to.equal('Hello');
+        expect(video.getAttribute('aria-labelledby')).to.equal('id2');
+        expect(video.getAttribute('aria-describedby')).to.equal('id3');
+      });
     });
-  });
-
-  it('should propagate attribute mutations', () => {
-    return getVideo({
-      src: 'foo.mp4',
-      width: 160,
-      height: 90,
-      controls: '',
-      controlsList: '',
-    }).then(v => {
-      const mutations = {
-        src: 'bar.mp4',
-        controls: null,
-        controlsList: 'nodownload nofullscreen',
-      };
-      Object.keys(mutations).forEach(property => {
-        const value = mutations[property];
-        if (value === null) {
-          v.removeAttribute(property);
-        } else {
-          v.setAttribute(property, value);
-        }
+
+    it('should propagate attribute mutations', () => {
+      return getVideo({
+        src: 'foo.mp4',
+        width: 160,
+        height: 90,
+        controls: '',
+        controlsList: '',
+      }).then(v => {
+        const mutations = {
+          src: 'bar.mp4',
+          controls: null,
+          controlsList: 'nodownload nofullscreen',
+        };
+        Object.keys(mutations).forEach(property => {
+          const value = mutations[property];
+          if (value === null) {
+            v.removeAttribute(property);
+          } else {
+            v.setAttribute(property, value);
+          }
+        });
+        v.mutatedAttributesCallback(mutations);
+        const video = v.querySelector('video');
+        expect(video.getAttribute('src')).to.equal('bar.mp4');
+        expect(video.controls).to.be.false;
+        expect(video.getAttribute('controlsList')).to.equal(
+          'nodownload nofullscreen'
+        );
       });
-      v.mutatedAttributesCallback(mutations);
-      const video = v.querySelector('video');
-      expect(video.getAttribute('src')).to.equal('bar.mp4');
-      expect(video.controls).to.be.false;
-      expect(video.getAttribute('controlsList')).to.equal(
-          'nodownload nofullscreen');
     });
-  });
-
-  it('should propagate the object-fit attribute', () => {
-    return getVideo({
-      src: 'video.mp4',
-      'object-fit': 'cover',
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.style.objectFit).to.equal('cover');
+
+    it('should propagate the object-fit attribute', () => {
+      return getVideo({
+        src: 'video.mp4',
+        'object-fit': 'cover',
+      }).then(v => {
+        const video = v.querySelector('video');
+        expect(video.style.objectFit).to.equal('cover');
+      });
     });
-  });
-
-  it('should not propagate the object-fit attribute if invalid', () => {
-    return getVideo({
-      src: 'video.mp4',
-      'object-fit': 'foo 80%',
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.style.objectFit).to.be.empty;
+
+    it('should not propagate the object-fit attribute if invalid', () => {
+      return getVideo({
+        src: 'video.mp4',
+        'object-fit': 'foo 80%',
+      }).then(v => {
+        const video = v.querySelector('video');
+        expect(video.style.objectFit).to.be.empty;
+      });
     });
-  });
-
-  it('should propagate the object-position attribute', () => {
-    return getVideo({
-      src: 'video.mp4',
-      'object-position': '20% 80%',
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.style.objectPosition).to.equal('20% 80%');
+
+    it('should propagate the object-position attribute', () => {
+      return getVideo({
+        src: 'video.mp4',
+        'object-position': '20% 80%',
+      }).then(v => {
+        const video = v.querySelector('video');
+        expect(video.style.objectPosition).to.equal('20% 80%');
+      });
     });
-  });
-
-  it('should not propagate the object-position attribute if invalid', () => {
-    return getVideo({
-      src: 'video.mp4',
-      'object-position': 'url("example.com")',
-    }).then(v => {
-      const video = v.querySelector('video');
-      expect(video.style.objectPosition).to.be.empty;
+
+    it('should not propagate the object-position attribute if invalid', () => {
+      return getVideo({
+        src: 'video.mp4',
+        'object-position': 'url("example.com")',
+      }).then(v => {
+        const video = v.querySelector('video');
+        expect(video.style.objectPosition).to.be.empty;
+      });
     });
-  });
-
-  // TODO: unskip the tests in this file #19664
-  it.skip('should forward certain events from video to the amp element', () => {
-    return getVideo({
-      src: '/examples/av/ForBiggerJoyrides.mp4',
-      width: 160,
-      height: 90,
-    }).then(v => {
-      const impl = v.implementation_;
-      return Promise.resolve()
+
+    // TODO: unskip the tests in this file #19664
+    it.skip('should forward certain events from video to the amp element', () => {
+      return getVideo({
+        src: '/examples/av/ForBiggerJoyrides.mp4',
+        width: 160,
+        height: 90,
+      }).then(v => {
+        const impl = v.implementation_;
+        return Promise.resolve()
           .then(() => {
             impl.mute();
             return listenOncePromise(v, VideoEvents.MUTED);
@@ -517,7 +571,8 @@ describes.realWin('amp-video', {
             v.querySelector('video').dispatchEvent(new Event('volumechange'));
             const successTimeout = timer.promise(10);
             return Promise.race([p, successTimeout]);
-          }).then(() => {
+          })
+          .then(() => {
             const video = v.querySelector('video');
             video.currentTime = video.duration - 0.1;
             impl.play();
@@ -526,407 +581,501 @@ describes.realWin('amp-video', {
             const pPause = listenOncePromise(v, VideoEvents.PAUSE);
             return Promise.all([pEnded, pPause]);
           });
+      });
     });
-  });
 
-  describe('blurred image placeholder', () => {
-    beforeEach(() => {
-      toggleExperiment(win, 'blurry-placeholder', true, true);
-    });
+    describe('blurred image placeholder', () => {
+      beforeEach(() => {
+        toggleExperiment(win, 'blurry-placeholder', true, true);
+      });
 
-    /**
-     * Creates an amp-video with an image child that could potentially be a
-     * blurry placeholder.
-     * @param {boolean} addPlaceholder Whether the child should have a
-     *     placeholder attribute.
-     * @param {boolean} addBlurClass Whether the child should have the
-     *     class that allows it to be a blurred placeholder.
-     * @return {AmpImg} An amp-video potentially with a blurry placeholder
-     */
-    function getVideoWithBlur(addPlaceholder, addBlurClass) {
-      const v = doc.createElement('amp-video');
-      v.setAttribute('layout', 'fixed');
-      v.setAttribute('width', '300px');
-      v.setAttribute('height', '250px');
-      const img = doc.createElement('img');
-      if (addPlaceholder) {
-        img.setAttribute('placeholder', '');
-        v.getPlaceholder = () => img;
-      } else {
-        v.getPlaceholder = sandbox.stub();
-      }
-      if (addBlurClass) {
-        img.classList.add('i-amphtml-blurry-placeholder');
+      /**
+       * Creates an amp-video with an image child that could potentially be a
+       * blurry placeholder.
+       * @param {boolean} addPlaceholder Whether the child should have a
+       *     placeholder attribute.
+       * @param {boolean} addBlurClass Whether the child should have the
+       *     class that allows it to be a blurred placeholder.
+       * @return {AmpImg} An amp-video potentially with a blurry placeholder
+       */
+      function getVideoWithBlur(addPlaceholder, addBlurClass) {
+        const v = doc.createElement('amp-video');
+        v.setAttribute('layout', 'fixed');
+        v.setAttribute('width', '300px');
+        v.setAttribute('height', '250px');
+        const img = doc.createElement('img');
+        if (addPlaceholder) {
+          img.setAttribute('placeholder', '');
+          v.getPlaceholder = () => img;
+        } else {
+          v.getPlaceholder = sandbox.stub();
+        }
+        if (addBlurClass) {
+          img.classList.add('i-amphtml-blurry-placeholder');
+        }
+        v.setAttribute('poster', 'img.png');
+        doc.body.appendChild(v);
+        v.appendChild(img);
+        v.build();
+        const impl = v.implementation_;
+        impl.togglePlaceholder = sandbox.stub();
+        return impl;
       }
-      v.setAttribute('poster', 'img.png');
-      doc.body.appendChild(v);
-      v.appendChild(img);
-      v.build();
-      const impl = v.implementation_;
-      impl.togglePlaceholder = sandbox.stub();
-      return impl;
-    }
-
-    it('should only fade out blurry image placeholders', () => {
-      let impl = getVideoWithBlur(true, true);
-      impl.buildCallback();
-      impl.layoutCallback();
-      impl.firstLayoutCompleted();
-      let el = impl.element;
-      let img = el.firstChild;
-      expect(img.style.opacity).to.equal('0');
-      expect(impl.togglePlaceholder).to.not.be.called;
-
-      impl = getVideoWithBlur(true, false);
-      impl.buildCallback();
-      impl.layoutCallback();
-      impl.firstLayoutCompleted();
-      el = impl.element;
-      img = el.firstChild;
-      expect(img.style.opacity).to.be.equal('');
-      expect(impl.togglePlaceholder).to.have.been.calledWith(false);
-
-      impl = getVideoWithBlur(false, true);
-      impl.buildCallback();
-      impl.layoutCallback();
-      impl.firstLayoutCompleted();
-      el = impl.element;
-      img = el.firstChild;
-      expect(img.style.opacity).to.be.equal('');
-      expect(impl.togglePlaceholder).to.have.been.calledWith(false);
-
-      impl = getVideoWithBlur(false, false);
-      impl.buildCallback();
-      impl.layoutCallback();
-      impl.firstLayoutCompleted();
-      el = impl.element;
-      img = el.firstChild;
-      expect(impl.togglePlaceholder).to.have.been.calledWith(false);
-    });
 
-    it('should fade out the blurry image placeholder on video load', () => {
-      const impl = getVideoWithBlur(true, true);
-      impl.buildCallback();
-      impl.layoutCallback();
-      impl.firstLayoutCompleted();
-      const el = impl.element;
-      const img = el.firstChild;
-      expect(img.style.opacity).to.equal('0');
-      expect(impl.togglePlaceholder).to.not.be.called;
-    });
-
-    it('should fade out the blurry image placeholder on poster load', () => {
-      const impl = getVideoWithBlur(true, true);
-      impl.buildCallback();
-      impl.layoutCallback();
-      const el = impl.element;
-      const img = el.firstChild;
-      impl.posterDummyImageForTesting_.onload();
-      expect(img.style.opacity).to.equal('0');
-      expect(impl.togglePlaceholder).to.not.be.called;
-    });
-  });
+      it('should only fade out blurry image placeholders', () => {
+        let impl = getVideoWithBlur(true, true);
+        impl.buildCallback();
+        impl.layoutCallback();
+        impl.firstLayoutCompleted();
+        let el = impl.element;
+        let img = el.firstChild;
+        expect(img.style.opacity).to.equal('0');
+        expect(impl.togglePlaceholder).to.not.be.called;
+
+        impl = getVideoWithBlur(true, false);
+        impl.buildCallback();
+        impl.layoutCallback();
+        impl.firstLayoutCompleted();
+        el = impl.element;
+        img = el.firstChild;
+        expect(img.style.opacity).to.be.equal('');
+        expect(impl.togglePlaceholder).to.have.been.calledWith(false);
+
+        impl = getVideoWithBlur(false, true);
+        impl.buildCallback();
+        impl.layoutCallback();
+        impl.firstLayoutCompleted();
+        el = impl.element;
+        img = el.firstChild;
+        expect(img.style.opacity).to.be.equal('');
+        expect(impl.togglePlaceholder).to.have.been.calledWith(false);
+
+        impl = getVideoWithBlur(false, false);
+        impl.buildCallback();
+        impl.layoutCallback();
+        impl.firstLayoutCompleted();
+        el = impl.element;
+        img = el.firstChild;
+        expect(impl.togglePlaceholder).to.have.been.calledWith(false);
+      });
 
-  describe('in prerender mode', () => {
-    let makeVisible;
-    let visiblePromise;
-    let video;
-    let viewerMock;
+      it('should fade out the blurry image placeholder on video load', () => {
+        const impl = getVideoWithBlur(true, true);
+        impl.buildCallback();
+        impl.layoutCallback();
+        impl.firstLayoutCompleted();
+        const el = impl.element;
+        const img = el.firstChild;
+        expect(img.style.opacity).to.equal('0');
+        expect(impl.togglePlaceholder).to.not.be.called;
+      });
 
-    beforeEach(() => {
-      viewerMock = mockServiceForDoc(sandbox, env.ampdoc, 'viewer', [
-        'getVisibilityState',
-        'whenFirstVisible',
-      ]);
-      viewerMock.getVisibilityState.returns(VisibilityState.PRERENDER);
-      visiblePromise = new Promise(resolve => {
-        makeVisible = resolve;
+      it('should fade out the blurry image placeholder on poster load', () => {
+        const impl = getVideoWithBlur(true, true);
+        impl.buildCallback();
+        impl.layoutCallback();
+        const el = impl.element;
+        const img = el.firstChild;
+        impl.posterDummyImageForTesting_.onload();
+        expect(img.style.opacity).to.equal('0');
+        expect(impl.togglePlaceholder).to.not.be.called;
       });
-      viewerMock.whenFirstVisible.returns(visiblePromise);
     });
 
-    describe('should not prerender if no cached sources', () => {
-      it('with just src', () => {
-        return new Promise(resolve => {
-          getVideo({
-            src: 'video.mp4',
-            width: 160,
-            height: 90,
-          }, null, element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.false;
-            resolve();
-          });
+    describe('in prerender mode', () => {
+      let makeVisible;
+      let visiblePromise;
+      let video;
+      let viewerMock;
+
+      beforeEach(() => {
+        viewerMock = mockServiceForDoc(sandbox, env.ampdoc, 'viewer', [
+          'getVisibilityState',
+          'whenFirstVisible',
+        ]);
+        viewerMock.getVisibilityState.returns(VisibilityState.PRERENDER);
+        visiblePromise = new Promise(resolve => {
+          makeVisible = resolve;
         });
+        viewerMock.whenFirstVisible.returns(visiblePromise);
       });
 
-      it('with just source', () => {
-        return new Promise(resolve => {
-          const source = doc.createElement('source');
-          source.setAttribute('src', 'video.mp4');
-          getVideo({
-            width: 160,
-            height: 90,
-          }, null, element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.false;
-            resolve();
+      describe('should not prerender if no cached sources', () => {
+        it('with just src', () => {
+          return new Promise(resolve => {
+            getVideo(
+              {
+                src: 'video.mp4',
+                width: 160,
+                height: 90,
+              },
+              null,
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.false;
+                resolve();
+              }
+            );
           });
         });
-      });
 
-      it('with both src and source', () => {
-        return new Promise(resolve => {
-          const source = doc.createElement('source');
-          source.setAttribute('src', 'video.mp4');
-          getVideo({
-            src: 'video.mp4',
-            width: 160,
-            height: 90,
-          }, [source], element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.false;
-            resolve();
+        it('with just source', () => {
+          return new Promise(resolve => {
+            const source = doc.createElement('source');
+            source.setAttribute('src', 'video.mp4');
+            getVideo(
+              {
+                width: 160,
+                height: 90,
+              },
+              null,
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.false;
+                resolve();
+              }
+            );
           });
         });
-      });
-    });
 
-    describe('should prerender cached sources', () => {
-      it('with just cached src', () => {
-        return new Promise(resolve => {
-          getVideo({
-            'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-            'amp-orig-src': 'https://example.com/video.mp4',
-            width: 160,
-            height: 90,
-          }, null, element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.true;
-            resolve();
+        it('with both src and source', () => {
+          return new Promise(resolve => {
+            const source = doc.createElement('source');
+            source.setAttribute('src', 'video.mp4');
+            getVideo(
+              {
+                src: 'video.mp4',
+                width: 160,
+                height: 90,
+              },
+              [source],
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.false;
+                resolve();
+              }
+            );
           });
         });
       });
 
-      it('with just cached source', () => {
-        return new Promise(resolve => {
-          const source = doc.createElement('source');
-          source.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video.mp4');
-          source.setAttribute('amp-orig-src', 'https://example.com/video.mp4');
-          getVideo({
-            width: 160,
-            height: 90,
-          }, [source], element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.true;
-            resolve();
+      describe('should prerender cached sources', () => {
+        it('with just cached src', () => {
+          return new Promise(resolve => {
+            getVideo(
+              {
+                'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+                'amp-orig-src': 'https://example.com/video.mp4',
+                width: 160,
+                height: 90,
+              },
+              null,
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.true;
+                resolve();
+              }
+            );
           });
         });
-      });
-
-      it('with a mix or cached and non-cached', () => {
-        return new Promise(resolve => {
-          const source = doc.createElement('source');
-          source.setAttribute('src', 'video.mp4');
-
-          const cachedSource = doc.createElement('source');
-          cachedSource.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video.mp4');
-          cachedSource.setAttribute('amp-orig-src', 'https://example.com/video.mp4');
 
-          getVideo({
-            src: 'video.mp4',
-            width: 160,
-            height: 90,
-          }, [source, cachedSource], element => {
-            expect(element.implementation_.prerenderAllowed()).to.be.true;
-            resolve();
+        it('with just cached source', () => {
+          return new Promise(resolve => {
+            const source = doc.createElement('source');
+            source.setAttribute(
+              'src',
+              'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+            );
+            source.setAttribute(
+              'amp-orig-src',
+              'https://example.com/video.mp4'
+            );
+            getVideo(
+              {
+                width: 160,
+                height: 90,
+              },
+              [source],
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.true;
+                resolve();
+              }
+            );
           });
         });
-      });
-    });
 
-    describe.skip('before visible', () => {
-      it('should move cached src to source during prerender', () => {
-        return getVideo({
-          'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-          'type': 'video/mp4',
-          'amp-orig-src': 'https://example.com/video.mp4',
-        }).then(v => {
-          video = v.querySelector('video');
-          expect(video.hasAttribute('src')).to.be.false;
-          // also make sure removed from amp-video since Stories media-pool
-          // may copy it back from amp-video.
-          expect(v.hasAttribute('src')).to.be.false;
-          expect(v.hasAttribute('type')).to.be.false;
-          const sources = video.querySelectorAll('source');
-          expect(sources.length).to.equal(1);
-          const cachedSource = sources[0];
-          expect(cachedSource.getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video.mp4');
-          expect(cachedSource.getAttribute('type')).to.equal('video/mp4');
+        it('with a mix or cached and non-cached', () => {
+          return new Promise(resolve => {
+            const source = doc.createElement('source');
+            source.setAttribute('src', 'video.mp4');
+
+            const cachedSource = doc.createElement('source');
+            cachedSource.setAttribute(
+              'src',
+              'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+            );
+            cachedSource.setAttribute(
+              'amp-orig-src',
+              'https://example.com/video.mp4'
+            );
+
+            getVideo(
+              {
+                src: 'video.mp4',
+                width: 160,
+                height: 90,
+              },
+              [source, cachedSource],
+              element => {
+                expect(element.implementation_.prerenderAllowed()).to.be.true;
+                resolve();
+              }
+            );
+          });
         });
       });
 
-      it('should add cached sources to video', () => {
-        const s1 = doc.createElement('source');
-        s1.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video1.mp4');
-        s1.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
-        s1.setAttribute('type', 'video/mp4');
-
-        const s2 = doc.createElement('source');
-        s2.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video2.mp4');
-        s2.setAttribute('amp-orig-src', 'https://example.com/video2.mp4');
-
-        return getVideo({
-        },[s1, s2]).then(v => {
-          video = v.querySelector('video');
-          expect(video.hasAttribute('src')).to.be.false;
-          const sources = video.querySelectorAll('source');
-          expect(sources.length).to.equal(2);
-          expect(sources[0].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video1.mp4');
-          expect(sources[0].getAttribute('type')).to.equal('video/mp4');
-          expect(sources[1].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video2.mp4');
-          expect(sources[1].getAttribute('type')).to.be.null;
-          expect(sources[0]).to.equal(s1);
-          expect(sources[1]).to.equal(s2);
+      describe.skip('before visible', () => {
+        it('should move cached src to source during prerender', () => {
+          return getVideo({
+            'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+            'type': 'video/mp4',
+            'amp-orig-src': 'https://example.com/video.mp4',
+          }).then(v => {
+            video = v.querySelector('video');
+            expect(video.hasAttribute('src')).to.be.false;
+            // also make sure removed from amp-video since Stories media-pool
+            // may copy it back from amp-video.
+            expect(v.hasAttribute('src')).to.be.false;
+            expect(v.hasAttribute('type')).to.be.false;
+            const sources = video.querySelectorAll('source');
+            expect(sources.length).to.equal(1);
+            const cachedSource = sources[0];
+            expect(cachedSource.getAttribute('src')).to.equal(
+              'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+            );
+            expect(cachedSource.getAttribute('type')).to.equal('video/mp4');
+          });
         });
-      });
 
-      it('should NOT add non-cached sources to video', () => {
-        const cached = doc.createElement('source');
-        cached.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video.mp4');
-        cached.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
-
-        const noncached = doc.createElement('source');
-        noncached.setAttribute('src', 'video.mp4');
+        it('should add cached sources to video', () => {
+          const s1 = doc.createElement('source');
+          s1.setAttribute(
+            'src',
+            'https://example-com.cdn.ampproject.org/m/s/video1.mp4'
+          );
+          s1.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
+          s1.setAttribute('type', 'video/mp4');
+
+          const s2 = doc.createElement('source');
+          s2.setAttribute(
+            'src',
+            'https://example-com.cdn.ampproject.org/m/s/video2.mp4'
+          );
+          s2.setAttribute('amp-orig-src', 'https://example.com/video2.mp4');
+
+          return getVideo({}, [s1, s2]).then(v => {
+            video = v.querySelector('video');
+            expect(video.hasAttribute('src')).to.be.false;
+            const sources = video.querySelectorAll('source');
+            expect(sources.length).to.equal(2);
+            expect(sources[0].getAttribute('src')).to.equal(
+              'https://example-com.cdn.ampproject.org/m/s/video1.mp4'
+            );
+            expect(sources[0].getAttribute('type')).to.equal('video/mp4');
+            expect(sources[1].getAttribute('src')).to.equal(
+              'https://example-com.cdn.ampproject.org/m/s/video2.mp4'
+            );
+            expect(sources[1].getAttribute('type')).to.be.null;
+            expect(sources[0]).to.equal(s1);
+            expect(sources[1]).to.equal(s2);
+          });
+        });
 
-        return getVideo({
-        },[cached, noncached]).then(v => {
-          video = v.querySelector('video');
-          expect(video.hasAttribute('src')).to.be.false;
-          const sources = video.querySelectorAll('source');
-          expect(sources.length).to.equal(1);
-          expect(sources[0].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video.mp4');
-          expect(sources[0]).to.equal(cached);
+        it('should NOT add non-cached sources to video', () => {
+          const cached = doc.createElement('source');
+          cached.setAttribute(
+            'src',
+            'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+          );
+          cached.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
+
+          const noncached = doc.createElement('source');
+          noncached.setAttribute('src', 'video.mp4');
+
+          return getVideo({}, [cached, noncached]).then(v => {
+            video = v.querySelector('video');
+            expect(video.hasAttribute('src')).to.be.false;
+            const sources = video.querySelectorAll('source');
+            expect(sources.length).to.equal(1);
+            expect(sources[0].getAttribute('src')).to.equal(
+              'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+            );
+            expect(sources[0]).to.equal(cached);
+          });
         });
-      });
 
-      it('preload should be set to auto if not specified', () => {
-        return getVideo({
-          'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-          'amp-orig-src': 'https://example.com/video.mp4',
-        },null).then(v => {
-          video = v.querySelector('video');
-          expect(video.getAttribute('preload')).to.equal('auto');
+        it('preload should be set to auto if not specified', () => {
+          return getVideo(
+            {
+              'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+              'amp-orig-src': 'https://example.com/video.mp4',
+            },
+            null
+          ).then(v => {
+            video = v.querySelector('video');
+            expect(video.getAttribute('preload')).to.equal('auto');
+          });
         });
-      });
 
-      it('preload should not be overwritten if specified', () => {
-        return getVideo({
-          'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-          'amp-orig-src': 'https://example.com/video.mp4',
-          'preload': 'none',
-        },null).then(v => {
-          video = v.querySelector('video');
-          expect(video.getAttribute('preload')).to.equal('none');
+        it('preload should not be overwritten if specified', () => {
+          return getVideo(
+            {
+              'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+              'amp-orig-src': 'https://example.com/video.mp4',
+              'preload': 'none',
+            },
+            null
+          ).then(v => {
+            video = v.querySelector('video');
+            expect(video.getAttribute('preload')).to.equal('none');
+          });
         });
       });
-    });
 
-    describe.skip('after visible', () => {
-      it('should add original source after cache one - single src', () => {
-        let ampVideoElement;
-        return getVideo({
-          'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-          'amp-orig-src': 'https://example.com/video.mp4',
-        }).then(v => {
-          ampVideoElement = v;
-          video = v.querySelector('video');
-          makeVisible();
-          return visiblePromise;
-        }).then(() => {
-          expect(video.hasAttribute('src')).to.be.false;
-          // also make sure removed from amp-video since Stories media-pool
-          // may copy it back from amp-video.
-          expect(ampVideoElement.hasAttribute('src')).to.be.false;
-          expect(ampVideoElement.hasAttribute('type')).to.be.false;
-          const sources = video.querySelectorAll('source');
-          expect(sources.length).to.equal(2);
-          expect(sources[0].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video.mp4');
-          expect(sources[1].getAttribute('src')).to.equal('https://example.com/video.mp4');
+      describe.skip('after visible', () => {
+        it('should add original source after cache one - single src', () => {
+          let ampVideoElement;
+          return getVideo({
+            'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+            'amp-orig-src': 'https://example.com/video.mp4',
+          })
+            .then(v => {
+              ampVideoElement = v;
+              video = v.querySelector('video');
+              makeVisible();
+              return visiblePromise;
+            })
+            .then(() => {
+              expect(video.hasAttribute('src')).to.be.false;
+              // also make sure removed from amp-video since Stories media-pool
+              // may copy it back from amp-video.
+              expect(ampVideoElement.hasAttribute('src')).to.be.false;
+              expect(ampVideoElement.hasAttribute('type')).to.be.false;
+              const sources = video.querySelectorAll('source');
+              expect(sources.length).to.equal(2);
+              expect(sources[0].getAttribute('src')).to.equal(
+                'https://example-com.cdn.ampproject.org/m/s/video.mp4'
+              );
+              expect(sources[1].getAttribute('src')).to.equal(
+                'https://example.com/video.mp4'
+              );
+            });
         });
-      });
 
-      it('should add original source after cache one - multiple source', () => {
-        const s1 = doc.createElement('source');
-        s1.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video1.mp4');
-        s1.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
-
-        const s2 = doc.createElement('source');
-        s2.setAttribute('src', 'https://example-com.cdn.ampproject.org/m/s/video2.mp4');
-        s2.setAttribute('amp-orig-src', 'https://example.com/video2.mp4');
-
-        return getVideo({
-        }, [s1, s2]).then(v => {
-          video = v.querySelector('video');
-          makeVisible();
-          return visiblePromise;
-        }).then(() => {
-          expect(video.hasAttribute('src')).to.be.false;
-          const sources = video.querySelectorAll('source');
-          expect(sources.length).to.equal(4);
-          expect(sources[0].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video1.mp4');
-          expect(sources[1].getAttribute('src')).to.equal('https://example.com/video1.mp4');
-          expect(sources[2].getAttribute('src')).to.equal('https://example-com.cdn.ampproject.org/m/s/video2.mp4');
-          expect(sources[3].getAttribute('src')).to.equal('https://example.com/video2.mp4');
+        it('should add original source after cache one - multiple source', () => {
+          const s1 = doc.createElement('source');
+          s1.setAttribute(
+            'src',
+            'https://example-com.cdn.ampproject.org/m/s/video1.mp4'
+          );
+          s1.setAttribute('amp-orig-src', 'https://example.com/video1.mp4');
+
+          const s2 = doc.createElement('source');
+          s2.setAttribute(
+            'src',
+            'https://example-com.cdn.ampproject.org/m/s/video2.mp4'
+          );
+          s2.setAttribute('amp-orig-src', 'https://example.com/video2.mp4');
+
+          return getVideo({}, [s1, s2])
+            .then(v => {
+              video = v.querySelector('video');
+              makeVisible();
+              return visiblePromise;
+            })
+            .then(() => {
+              expect(video.hasAttribute('src')).to.be.false;
+              const sources = video.querySelectorAll('source');
+              expect(sources.length).to.equal(4);
+              expect(sources[0].getAttribute('src')).to.equal(
+                'https://example-com.cdn.ampproject.org/m/s/video1.mp4'
+              );
+              expect(sources[1].getAttribute('src')).to.equal(
+                'https://example.com/video1.mp4'
+              );
+              expect(sources[2].getAttribute('src')).to.equal(
+                'https://example-com.cdn.ampproject.org/m/s/video2.mp4'
+              );
+              expect(sources[3].getAttribute('src')).to.equal(
+                'https://example.com/video2.mp4'
+              );
+            });
         });
       });
-    });
 
-    describe('isCachedByCDN', () => {
-      it('must have amp-orig-src attribute', () => {
-        return new Promise(resolve => {
-          getVideo({
-            'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
-            width: 160,
-            height: 90,
-          }, null, element => {
-            expect(element.implementation_.isCachedByCDN_(element)).to.be.false;
-            resolve();
+      describe('isCachedByCDN', () => {
+        it('must have amp-orig-src attribute', () => {
+          return new Promise(resolve => {
+            getVideo(
+              {
+                'src': 'https://example-com.cdn.ampproject.org/m/s/video.mp4',
+                width: 160,
+                height: 90,
+              },
+              null,
+              element => {
+                expect(element.implementation_.isCachedByCDN_(element)).to.be
+                  .false;
+                resolve();
+              }
+            );
           });
         });
-      });
 
-      it('must be CDN url', () => {
-        return new Promise(resolve => {
-          getVideo({
-            'src': 'https://example-com.cdn.FAKEampproject.org/m/s/video.mp4',
-            'amp-orig-src': 'https://example.com/video.mp4',
-            width: 160,
-            height: 90,
-          }, null, element => {
-            expect(element.implementation_.isCachedByCDN_(element)).to.be.false;
-            resolve();
+        it('must be CDN url', () => {
+          return new Promise(resolve => {
+            getVideo(
+              {
+                'src':
+                  'https://example-com.cdn.FAKEampproject.org/m/s/video.mp4',
+                'amp-orig-src': 'https://example.com/video.mp4',
+                width: 160,
+                height: 90,
+              },
+              null,
+              element => {
+                expect(element.implementation_.isCachedByCDN_(element)).to.be
+                  .false;
+                resolve();
+              }
+            );
           });
         });
       });
     });
-  });
-
-  describe('seekTo', () => {
-    it('changes `currentTime`', () => new Promise(resolve => {
-      getVideo({
-        'src': 'https://example-com.cdn.FAKEampproject.org/m/s/video.mp4',
-        width: 160,
-        height: 90,
-      }, /* children */ null, element => {
-        const {implementation_} = element;
-        const {video_} = implementation_;
-
-        expect(video_.currentTime).to.equal(0);
 
-        [20, 100, 0, 50, 22].forEach(timeSeconds => {
-          implementation_.seekTo(timeSeconds);
-          expect(video_.currentTime).to.equal(timeSeconds);
-        });
-
-        resolve();
-      });
-    }));
-  });
-
-});
+    describe('seekTo', () => {
+      it('changes `currentTime`', () =>
+        new Promise(resolve => {
+          getVideo(
+            {
+              'src': 'https://example-com.cdn.FAKEampproject.org/m/s/video.mp4',
+              width: 160,
+              height: 90,
+            },
+            /* children */ null,
+            element => {
+              const {implementation_} = element;
+              const {video_} = implementation_;
+
+              expect(video_.currentTime).to.equal(0);
+
+              [20, 100, 0, 50, 22].forEach(timeSeconds => {
+                implementation_.seekTo(timeSeconds);
+                expect(video_.currentTime).to.equal(timeSeconds);
+              });
+
+              resolve();
+            }
+          );
+        }));
+    });
+  }
+);
diff --git a/extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.js b/extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.js
index 34148d2094f4..f2ae71710e0e 100644
--- a/extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.js
+++ b/extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.js
@@ -21,7 +21,6 @@ import {dict} from '../../../src/utils/object';
 import {isExperimentOn} from '../../../src/experiments';
 import {tryParseJson} from '../../../src/json';
 
-
 /** @const {string} */
 const TAG = 'amp-viewer-assistance';
 
@@ -57,7 +56,8 @@ export class AmpViewerAssistance {
     /** @const @private {JsonObject|null|undefined} */
     this.configJson_ = tryParseJson(this.assistanceElement_.textContent, e => {
       throw user().createError(
-          'Failed to parse "amp-viewer-assistance" JSON: ' + e);
+        'Failed to parse "amp-viewer-assistance" JSON: ' + e
+      );
     });
 
     /** @private @const {!../../../src/service/viewer-impl.Viewer} */
@@ -80,12 +80,13 @@ export class AmpViewerAssistance {
     if (method == 'updateActionState') {
       // "updateActionState" requires a low-trust event.
       if (invocation.satisfiesTrust(ActionTrust.LOW)) {
-        this.validateAndTransformUpdateArgs_(args).then(args => {
-          return this.viewer_./*OK*/sendMessageAwaitResponse(
-              method, args);
-        }).catch(err => {
-          user().error(TAG, err.toString());
-        });
+        this.validateAndTransformUpdateArgs_(args)
+          .then(args => {
+            return this.viewer_./*OK*/ sendMessageAwaitResponse(method, args);
+          })
+          .catch(err => {
+            user().error(TAG, err.toString());
+          });
       }
     } else if (method == 'signIn') {
       // "signIn" requires a high-trust event.
@@ -107,22 +108,31 @@ export class AmpViewerAssistance {
       return this;
     }
     return this.viewer_.isTrustedViewer().then(isTrustedViewer => {
-      if (!isTrustedViewer &&
-         !isExperimentOn(this.ampdoc_.win, 'amp-viewer-assistance-untrusted')) {
+      if (
+        !isTrustedViewer &&
+        !isExperimentOn(this.ampdoc_.win, 'amp-viewer-assistance-untrusted')
+      ) {
         this.enabled_ = false;
-        user().error(TAG,
-            'amp-viewer-assistance is currently only supported on trusted'
-            + ' viewers.');
+        user().error(
+          TAG,
+          'amp-viewer-assistance is currently only supported on trusted' +
+            ' viewers.'
+        );
         return this;
       }
       this.action_.installActionHandler(
-          this.assistanceElement_, this.actionHandler_.bind(this));
+        this.assistanceElement_,
+        this.actionHandler_.bind(this)
+      );
 
       this.getIdTokenPromise();
 
-      this.viewer_./*OK*/sendMessage('viewerAssistanceConfig',dict({
-        'config': this.configJson_,
-      }));
+      this.viewer_./*OK*/ sendMessage(
+        'viewerAssistanceConfig',
+        dict({
+          'config': this.configJson_,
+        })
+      );
       return this;
     });
   }
@@ -131,35 +141,48 @@ export class AmpViewerAssistance {
    * @return {!Promise<undefined>}
    */
   getIdTokenPromise() {
-    return this.viewer_./*OK*/sendMessageAwaitResponse('getAccessTokenPassive',
+    return this.viewer_
+      ./*OK*/ sendMessageAwaitResponse(
+        'getAccessTokenPassive',
         dict({
           // For now there's only 1 provider option, so we just hard code it
           'providers': [GSI_TOKEN_PROVIDER],
-        }))
-        .then(token => {
-          this.setIdTokenStatus_(Boolean(!!token));
-          return token;
-        }).catch(() => {
-          this.setIdTokenStatus_(/*available=*/false);
-        });
+        })
+      )
+      .then(token => {
+        this.setIdTokenStatus_(Boolean(!!token));
+        return token;
+      })
+      .catch(() => {
+        this.setIdTokenStatus_(/*available=*/ false);
+      });
   }
 
   /**
    * @private
    */
   requestSignIn_() {
-    this.viewer_./*OK*/sendMessageAwaitResponse('requestSignIn', dict({
-      'providers': [GSI_TOKEN_PROVIDER],
-    })).then(token => {
-      user().info(TAG, 'Token: ' + token);
-      if (token) {
-        this.setIdTokenStatus_(/*available=*/true);
-        this.action_.trigger(
-            this.assistanceElement_, 'signedIn', null, ActionTrust.HIGH);
-      } else {
-        this.setIdTokenStatus_(/*available=*/false);
-      }
-    });
+    this.viewer_
+      ./*OK*/ sendMessageAwaitResponse(
+        'requestSignIn',
+        dict({
+          'providers': [GSI_TOKEN_PROVIDER],
+        })
+      )
+      .then(token => {
+        user().info(TAG, 'Token: ' + token);
+        if (token) {
+          this.setIdTokenStatus_(/*available=*/ true);
+          this.action_.trigger(
+            this.assistanceElement_,
+            'signedIn',
+            null,
+            ActionTrust.HIGH
+          );
+        } else {
+          this.setIdTokenStatus_(/*available=*/ false);
+        }
+      });
   }
 
   /**
@@ -171,15 +194,18 @@ export class AmpViewerAssistance {
    */
   validateAndTransformUpdateArgs_(args) {
     if (!args) {
-      return Promise.reject('"updateActionState" was called with no' +
-          ' arguments!"');
+      return Promise.reject(
+        '"updateActionState" was called with no arguments!"'
+      );
     }
 
     const update = args['update'];
     const error = args['error'];
     if (error && update) {
-      return Promise.reject('"updateActionState" must have only one of' +
-        ' the parameters "error" and "update".');
+      return Promise.reject(
+        '"updateActionState" must have only one of' +
+          ' the parameters "error" and "update".'
+      );
     } else if (error) {
       // Must transform 'error' Response object
       if (error && typeof error.text === 'function') {
@@ -195,19 +221,25 @@ export class AmpViewerAssistance {
           });
         });
       } else {
-        return Promise.reject('"updateActionState" action "error" parameter' +
-        ' must contain a valid "response" object.');
+        return Promise.reject(
+          '"updateActionState" action "error" parameter' +
+            ' must contain a valid "response" object.'
+        );
       }
     } else if (update) {
       const actionStatus = update && update['actionStatus'];
       if (!actionStatus || !ACTION_STATUS_WHITELIST.includes(actionStatus)) {
-        return Promise.reject('"updateActionState" action "update" parameter' +
-        ' must contain a valid "actionStatus" field.');
+        return Promise.reject(
+          '"updateActionState" action "update" parameter' +
+            ' must contain a valid "actionStatus" field.'
+        );
       }
       return Promise.resolve(args);
     } else {
-      return Promise.reject('"updateActionState" action must have an' +
-      ' "update" or "error" parameter.');
+      return Promise.reject(
+        '"updateActionState" action must have an' +
+          ' "update" or "error" parameter.'
+      );
     }
   }
 
@@ -217,8 +249,7 @@ export class AmpViewerAssistance {
    * @param {boolean} available
    */
   setIdTokenStatus_(available) {
-    this.toggleTopClass_(
-        'amp-viewer-assistance-identity-available', available);
+    this.toggleTopClass_('amp-viewer-assistance-identity-available', available);
   }
 
   /**
diff --git a/extensions/amp-viewer-assistance/0.1/test/test-amp-viewer-assistance.js b/extensions/amp-viewer-assistance/0.1/test/test-amp-viewer-assistance.js
index b381d807538d..b14e7855cbca 100644
--- a/extensions/amp-viewer-assistance/0.1/test/test-amp-viewer-assistance.js
+++ b/extensions/amp-viewer-assistance/0.1/test/test-amp-viewer-assistance.js
@@ -19,294 +19,333 @@ import {ActionTrust} from '../../../../src/action-constants';
 import {AmpViewerAssistance} from '../amp-viewer-assistance';
 import {mockServiceForDoc} from '../../../../testing/test-helper';
 
-describes.fakeWin('AmpViewerAssistance', {
-  amp: true,
-  location: 'https://pub.com/doc1',
-}, env => {
-  let document;
-  let ampdoc;
-  let element;
-  let viewerMock;
+describes.fakeWin(
+  'AmpViewerAssistance',
+  {
+    amp: true,
+    location: 'https://pub.com/doc1',
+  },
+  env => {
+    let document;
+    let ampdoc;
+    let element;
+    let viewerMock;
 
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    document = env.win.document;
-    viewerMock = mockServiceForDoc(env.sandbox, env.ampdoc, 'viewer', [
-      'isTrustedViewer',
-      'sendMessage',
-      'sendMessageAwaitResponse',
-    ]);
-    viewerMock.isTrustedViewer.returns(Promise.resolve(true));
-    viewerMock.sendMessageAwaitResponse.returns(Promise.resolve('idToken'));
-
-    element = document.createElement('script');
-    element.setAttribute('id', 'amp-viewer-assistance');
-    element.setAttribute('type', 'application/json');
-    document.body.appendChild(element);
-  });
-
-  it('should disable service when no config', () => {
-    document.body.removeChild(element);
-    const service = new AmpViewerAssistance(ampdoc);
-    expect(service.enabled_).to.be.false;
-    expect(service.assistanceElement_).to.be.undefined;
-  });
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      document = env.win.document;
+      viewerMock = mockServiceForDoc(env.sandbox, env.ampdoc, 'viewer', [
+        'isTrustedViewer',
+        'sendMessage',
+        'sendMessageAwaitResponse',
+      ]);
+      viewerMock.isTrustedViewer.returns(Promise.resolve(true));
+      viewerMock.sendMessageAwaitResponse.returns(Promise.resolve('idToken'));
 
-  it('should disable service when the viewer is not trusted', () => {
-    expectAsyncConsoleError('[amp-viewer-assistance] amp-viewer-assistance is'
-        + ' currently only supported on trusted viewers.');
-    viewerMock.isTrustedViewer.returns(Promise.resolve(false));
-    const config = {
-      'providerId': 'foo-bar',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AmpViewerAssistance(ampdoc);
-    return service.start_().then(() => {
-      expect(service.enabled_).to.be.false;
+      element = document.createElement('script');
+      element.setAttribute('id', 'amp-viewer-assistance');
+      element.setAttribute('type', 'application/json');
+      document.body.appendChild(element);
     });
-  });
-
-  it('should fail if config is malformed', () => {
-    expect(() => {
-      new AmpViewerAssistance(ampdoc);
-    }).to.throw(Error);
-  });
 
-  it('should send the config to the viewer', () => {
-    const config = {
-      'providerId': 'foo-bar',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AmpViewerAssistance(ampdoc);
-    expect(service.enabled_).to.be.true;
-    expect(service.assistanceElement_).to.equal(element);
-    const sendMessageStub = service.viewer_.sendMessage;
-    return service.start_().then(() => {
-      expect(sendMessageStub).to.be.calledOnce;
-      expect(sendMessageStub.firstCall.args[0]).to
-          .equal('viewerAssistanceConfig');
-      expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
-        'config': config,
-      });
+    it('should disable service when no config', () => {
+      document.body.removeChild(element);
+      const service = new AmpViewerAssistance(ampdoc);
+      expect(service.enabled_).to.be.false;
+      expect(service.assistanceElement_).to.be.undefined;
     });
-  });
-
-  describe('updateActionState', () => {
-    let service;
-    let sendMessageStub;
 
-    beforeEach(() => {
+    it('should disable service when the viewer is not trusted', () => {
+      expectAsyncConsoleError(
+        '[amp-viewer-assistance] amp-viewer-assistance is' +
+          ' currently only supported on trusted viewers.'
+      );
+      viewerMock.isTrustedViewer.returns(Promise.resolve(false));
       const config = {
         'providerId': 'foo-bar',
       };
       element.textContent = JSON.stringify(config);
+      const service = new AmpViewerAssistance(ampdoc);
+      return service.start_().then(() => {
+        expect(service.enabled_).to.be.false;
+      });
+    });
 
-      service = new AmpViewerAssistance(ampdoc);
-      sendMessageStub = service.viewer_.sendMessageAwaitResponse;
+    it('should fail if config is malformed', () => {
+      expect(() => {
+        new AmpViewerAssistance(ampdoc);
+      }).to.throw(Error);
     });
 
-    it('should send if "update" params are well-formed', () => {
-      const args = {
-        'update': {'actionStatus': 'COMPLETED_ACTION_STATUS'},
+    it('should send the config to the viewer', () => {
+      const config = {
+        'providerId': 'foo-bar',
       };
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
-
+      element.textContent = JSON.stringify(config);
+      const service = new AmpViewerAssistance(ampdoc);
+      expect(service.enabled_).to.be.true;
+      expect(service.assistanceElement_).to.equal(element);
+      const sendMessageStub = service.viewer_.sendMessage;
       return service.start_().then(() => {
-        sendMessageStub.resetHistory();
-        return service.actionHandler_(invoke);
-      }).then(() => {
         expect(sendMessageStub).to.be.calledOnce;
-        expect(sendMessageStub.firstCall.args[0]).to.equal('updateActionState');
-        expect(sendMessageStub.firstCall.args[1]).to.deep.equal(args);
+        expect(sendMessageStub.firstCall.args[0]).to.equal(
+          'viewerAssistanceConfig'
+        );
+        expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
+          'config': config,
+        });
       });
     });
 
-    it('should not send if both "update" and "error" params are ' +
-        'missing', () => {
-      const invoke = new ActionInvocation(element, 'updateActionState', {});
-      invoke.trust = ActionTrust.LOW;
-      let actionHandlerPromise;
-      expectAsyncConsoleError('[amp-viewer-assistance] "updateActionState"' +
-          ' action must have an "update" or "error" parameter.', 1);
-      return service.start_().then(() => {
-        sendMessageStub.resetHistory();
-        actionHandlerPromise = service.actionHandler_(invoke);
-        expect(actionHandlerPromise).to.be.null;
-        return actionHandlerPromise;
-      }).then(() => {
-        expect(sendMessageStub).to.not.be.called;
+    describe('updateActionState', () => {
+      let service;
+      let sendMessageStub;
+
+      beforeEach(() => {
+        const config = {
+          'providerId': 'foo-bar',
+        };
+        element.textContent = JSON.stringify(config);
+
+        service = new AmpViewerAssistance(ampdoc);
+        sendMessageStub = service.viewer_.sendMessageAwaitResponse;
       });
-    });
 
-    it('should not send if "update.actionStatus" param is missing', () => {
-      const args = {'update': {}};
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
-      let actionHandlerPromise;
-      expectAsyncConsoleError('[amp-viewer-assistance] "updateActionState"' +
-          ' action "update" parameter must contain a valid "actionStatus"' +
-          ' field.', 1);
-      return service.start_().then(() => {
-        sendMessageStub.resetHistory();
-        actionHandlerPromise = service.actionHandler_(invoke);
-        expect(actionHandlerPromise).to.be.null;
-        return actionHandlerPromise;
-      }).then(() => {
-        expect(sendMessageStub).to.not.be.called;
+      it('should send if "update" params are well-formed', () => {
+        const args = {
+          'update': {'actionStatus': 'COMPLETED_ACTION_STATUS'},
+        };
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+
+        return service
+          .start_()
+          .then(() => {
+            sendMessageStub.resetHistory();
+            return service.actionHandler_(invoke);
+          })
+          .then(() => {
+            expect(sendMessageStub).to.be.calledOnce;
+            expect(sendMessageStub.firstCall.args[0]).to.equal(
+              'updateActionState'
+            );
+            expect(sendMessageStub.firstCall.args[1]).to.deep.equal(args);
+          });
       });
-    });
 
-    it('should not send if "update.actionStatus" param is invalid', () => {
-      const args = {
-        'update': {'actionStatus': 'INVALID_ACTION_STATUS'},
-      };
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
-      expectAsyncConsoleError('[amp-viewer-assistance] "updateActionState"' +
-          ' action "update" parameter must contain a valid "actionStatus"' +
-          ' field.', 1);
+      it('should not send if both "update" and "error" params are missing', () => {
+        const invoke = new ActionInvocation(element, 'updateActionState', {});
+        invoke.trust = ActionTrust.LOW;
+        let actionHandlerPromise;
+        expectAsyncConsoleError(
+          '[amp-viewer-assistance] "updateActionState"' +
+            ' action must have an "update" or "error" parameter.',
+          1
+        );
+        return service
+          .start_()
+          .then(() => {
+            sendMessageStub.resetHistory();
+            actionHandlerPromise = service.actionHandler_(invoke);
+            expect(actionHandlerPromise).to.be.null;
+            return actionHandlerPromise;
+          })
+          .then(() => {
+            expect(sendMessageStub).to.not.be.called;
+          });
+      });
 
-      return service.start_().then(() => {
-        sendMessageStub.reset();
-        expect(service.actionHandler_(invoke)).to.be.null;
-        expect(sendMessageStub).to.not.be.called;
+      it('should not send if "update.actionStatus" param is missing', () => {
+        const args = {'update': {}};
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+        let actionHandlerPromise;
+        expectAsyncConsoleError(
+          '[amp-viewer-assistance] "updateActionState"' +
+            ' action "update" parameter must contain a valid "actionStatus"' +
+            ' field.',
+          1
+        );
+        return service
+          .start_()
+          .then(() => {
+            sendMessageStub.resetHistory();
+            actionHandlerPromise = service.actionHandler_(invoke);
+            expect(actionHandlerPromise).to.be.null;
+            return actionHandlerPromise;
+          })
+          .then(() => {
+            expect(sendMessageStub).to.not.be.called;
+          });
       });
-    });
 
-    it('should send if "error" param is well-formed', () => {
-      const error = {
-        text: () => {
-          return Promise.resolve('error message');
-        },
-        status: 500,
-      };
-      const args = {
-        'error': error,
-      };
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
+      it('should not send if "update.actionStatus" param is invalid', () => {
+        const args = {
+          'update': {'actionStatus': 'INVALID_ACTION_STATUS'},
+        };
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+        expectAsyncConsoleError(
+          '[amp-viewer-assistance] "updateActionState"' +
+            ' action "update" parameter must contain a valid "actionStatus"' +
+            ' field.',
+          1
+        );
 
-      return service.start_().then(() => {
-        sendMessageStub.resetHistory();
-        service.actionHandler_(invoke);
-        return error.text();
-      }).then(() => {
-        expect(sendMessageStub).to.be.calledOnce;
-        expect(sendMessageStub.firstCall.args[0]).to.equal('updateActionState');
-        expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
-          update: {
-            actionStatus: 'FAILED_ACTION_STATUS',
-            result: {
-              code: 500,
-              message: 'error message',
-            },
+        return service.start_().then(() => {
+          sendMessageStub.reset();
+          expect(service.actionHandler_(invoke)).to.be.null;
+          expect(sendMessageStub).to.not.be.called;
+        });
+      });
+
+      it('should send if "error" param is well-formed', () => {
+        const error = {
+          text: () => {
+            return Promise.resolve('error message');
           },
+          status: 500,
+        };
+        const args = {
+          'error': error,
+        };
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+
+        return service
+          .start_()
+          .then(() => {
+            sendMessageStub.resetHistory();
+            service.actionHandler_(invoke);
+            return error.text();
+          })
+          .then(() => {
+            expect(sendMessageStub).to.be.calledOnce;
+            expect(sendMessageStub.firstCall.args[0]).to.equal(
+              'updateActionState'
+            );
+            expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
+              update: {
+                actionStatus: 'FAILED_ACTION_STATUS',
+                result: {
+                  code: 500,
+                  message: 'error message',
+                },
+              },
+            });
+          });
+      });
+
+      it('should not send if "error" param is invalid', () => {
+        const error = {
+          status: 500,
+        };
+        const args = {
+          'error': error,
+        };
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+        expectAsyncConsoleError(
+          '[amp-viewer-assistance] "updateActionState"' +
+            ' action "error" parameter must contain a valid "response"' +
+            ' object.',
+          1
+        );
+
+        return service.start_().then(() => {
+          sendMessageStub.resetHistory();
+          expect(service.actionHandler_(invoke)).to.be.null;
+          expect(sendMessageStub).to.not.be.called;
         });
       });
-    });
 
-    it('should not send if "error" param is invalid', () => {
-      const error = {
-        status: 500,
-      };
-      const args = {
-        'error': error,
-      };
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
-      expectAsyncConsoleError('[amp-viewer-assistance] "updateActionState"' +
-          ' action "error" parameter must contain a valid "response"' +
-          ' object.', 1);
+      it('should not send if both "update" and "error" params are present', () => {
+        const args = {
+          'error': {},
+          'update': {},
+        };
+        const invoke = new ActionInvocation(element, 'updateActionState', args);
+        invoke.trust = ActionTrust.LOW;
+        expectAsyncConsoleError(
+          '[amp-viewer-assistance] "updateActionState"' +
+            ' must have only one of the parameters "error" and "update".',
+          1
+        );
 
-      return service.start_().then(() => {
-        sendMessageStub.resetHistory();
-        expect(service.actionHandler_(invoke)).to.be.null;
-        expect(sendMessageStub).to.not.be.called;
+        return service.start_().then(() => {
+          sendMessageStub.resetHistory();
+          expect(service.actionHandler_(invoke)).to.be.null;
+          expect(sendMessageStub).to.not.be.called;
+        });
       });
     });
 
-    it('should not send if both "update" and "error" params are' +
-        ' present', () => {
-      const args = {
-        'error': {},
-        'update': {},
+    it('should send handle the signIn action', () => {
+      const config = {
+        'providerId': 'foo-bar',
       };
-      const invoke = new ActionInvocation(element, 'updateActionState', args);
-      invoke.trust = ActionTrust.LOW;
-      expectAsyncConsoleError('[amp-viewer-assistance] "updateActionState"' +
-          ' must have only one of the parameters "error" and "update".', 1);
-
+      element.textContent = JSON.stringify(config);
+      const service = new AmpViewerAssistance(ampdoc);
+      const sendMessageStub = service.viewer_.sendMessageAwaitResponse;
       return service.start_().then(() => {
         sendMessageStub.resetHistory();
-        expect(service.actionHandler_(invoke)).to.be.null;
-        expect(sendMessageStub).to.not.be.called;
-      });
-    });
-  });
+        sendMessageStub.returns(Promise.reject());
 
-  it('should send handle the signIn action', () => {
-    const config = {
-      'providerId': 'foo-bar',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AmpViewerAssistance(ampdoc);
-    const sendMessageStub = service.viewer_.sendMessageAwaitResponse;
-    return service.start_().then(() => {
-      sendMessageStub.resetHistory();
-      sendMessageStub.returns(Promise.reject());
+        const invocation = new ActionInvocation(element, 'signIn');
+        invocation.trust = ActionTrust.LOW;
+        allowConsoleError(() => {
+          service.actionHandler_(invocation);
+        });
+        expect(sendMessageStub).to.not.be.called;
 
-      const invocation = new ActionInvocation(element, 'signIn');
-      invocation.trust = ActionTrust.LOW;
-      allowConsoleError(() => {
+        // signIn requires high-trust.
+        invocation.trust = ActionTrust.HIGH;
         service.actionHandler_(invocation);
-      });
-      expect(sendMessageStub).to.not.be.called;
-
-      // signIn requires high-trust.
-      invocation.trust = ActionTrust.HIGH;
-      service.actionHandler_(invocation);
-      expect(sendMessageStub).to.be.calledOnce;
-      expect(sendMessageStub.firstCall.args[0]).to.equal('requestSignIn');
-      expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
-        providers: ['actions-on-google-gsi'],
+        expect(sendMessageStub).to.be.calledOnce;
+        expect(sendMessageStub.firstCall.args[0]).to.equal('requestSignIn');
+        expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
+          providers: ['actions-on-google-gsi'],
+        });
       });
     });
-  });
 
-  it('should make IDENTITY_TOKEN available through a promise', () => {
-    const config = {
-      'providerId': 'foo-bar',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AmpViewerAssistance(ampdoc);
-    return service.start_()
+    it('should make IDENTITY_TOKEN available through a promise', () => {
+      const config = {
+        'providerId': 'foo-bar',
+      };
+      element.textContent = JSON.stringify(config);
+      const service = new AmpViewerAssistance(ampdoc);
+      return service
+        .start_()
         .then(() => service.getIdTokenPromise())
         .then(token => expect(token).to.equal('idToken'));
-  });
+    });
 
-  it('should set a css class if IDENTITY_TOKEN is available', () => {
-    const config = {
-      'providerId': 'foo-bar',
-    };
-    element.textContent = JSON.stringify(config);
-    const service = new AmpViewerAssistance(ampdoc);
-    service.vsync_ = {
-      mutate: callback => {
-        callback();
-      },
-    };
-    const sendMessageStub = service.viewer_.sendMessageAwaitResponse;
-    sendMessageStub.returns(Promise.resolve('idToken'));
-    return service.getIdTokenPromise().then(() => {
-      expect(sendMessageStub).to.be.calledOnce;
-      expect(sendMessageStub.firstCall.args[0]).to.equal(
-          'getAccessTokenPassive');
-      expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
-        providers: ['actions-on-google-gsi'],
+    it('should set a css class if IDENTITY_TOKEN is available', () => {
+      const config = {
+        'providerId': 'foo-bar',
+      };
+      element.textContent = JSON.stringify(config);
+      const service = new AmpViewerAssistance(ampdoc);
+      service.vsync_ = {
+        mutate: callback => {
+          callback();
+        },
+      };
+      const sendMessageStub = service.viewer_.sendMessageAwaitResponse;
+      sendMessageStub.returns(Promise.resolve('idToken'));
+      return service.getIdTokenPromise().then(() => {
+        expect(sendMessageStub).to.be.calledOnce;
+        expect(sendMessageStub.firstCall.args[0]).to.equal(
+          'getAccessTokenPassive'
+        );
+        expect(sendMessageStub.firstCall.args[1]).to.deep.equal({
+          providers: ['actions-on-google-gsi'],
+        });
+        expect(document.documentElement).to.have.class(
+          'amp-viewer-assistance-identity-available'
+        );
       });
-      expect(document.documentElement).to.have.class(
-          'amp-viewer-assistance-identity-available');
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
index 4d4867f2440d..1c9ed06469a3 100644
--- a/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
+++ b/extensions/amp-viewer-integration/0.1/amp-viewer-integration.js
@@ -31,10 +31,7 @@ import {Services} from '../../../src/services';
 import {TouchHandler} from './touch-handler';
 import {dev} from '../../../src/log';
 import {dict} from '../../../src/utils/object';
-import {
-  getAmpdoc,
-  registerServiceBuilder,
-} from '../../../src/service';
+import {getAmpdoc, registerServiceBuilder} from '../../../src/service';
 import {getData, listen, listenOnce} from '../../../src/event-helper';
 import {getSourceUrl} from '../../../src/url';
 import {isIframed} from '../../../src/dom';
@@ -55,7 +52,6 @@ const RequestNames = {
  * This should be included in an AMP html file to communicate with the viewer.
  */
 export class AmpViewerIntegration {
-
   /**
    * @param {!Window} win
    */
@@ -76,9 +72,11 @@ export class AmpViewerIntegration {
 
     /** @const @private {!AmpViewerIntegrationVariableService} */
     this.variableService_ = new AmpViewerIntegrationVariableService(
-        getAmpdoc(this.win.document));
-    registerServiceBuilder(this.win, 'viewer-integration-variable',
-        () => this.variableService_.get());
+      getAmpdoc(this.win.document)
+    );
+    registerServiceBuilder(this.win, 'viewer-integration-variable', () =>
+      this.variableService_.get()
+    );
   }
 
   /**
@@ -102,12 +100,21 @@ export class AmpViewerIntegration {
 
     if (this.isWebView_ || this.isHandShakePoll_) {
       const source = isIframed(this.win) ? this.win.parent : null;
-      return this.webviewPreHandshakePromise_(source, origin)
-          .then(receivedPort => {
-            return this.openChannelAndStart_(viewer, ampdoc, origin,
-                new Messaging(
-                    this.win, receivedPort, this.isWebView_, messagingToken));
-          });
+      return this.webviewPreHandshakePromise_(source, origin).then(
+        receivedPort => {
+          return this.openChannelAndStart_(
+            viewer,
+            ampdoc,
+            origin,
+            new Messaging(
+              this.win,
+              receivedPort,
+              this.isWebView_,
+              messagingToken
+            )
+          );
+        }
+      );
     }
     /** @type {?HighlightInfoDef} */
     const highlightInfo = getHighlightParam(ampdoc);
@@ -116,10 +123,16 @@ export class AmpViewerIntegration {
     }
 
     const port = new WindowPortEmulator(
-        this.win, origin, this.win.parent/* target */);
+      this.win,
+      origin,
+      this.win.parent /* target */
+    );
     return this.openChannelAndStart_(
-        viewer, ampdoc, origin,
-        new Messaging(this.win, port, this.isWebView_, messagingToken));
+      viewer,
+      ampdoc,
+      origin,
+      new Messaging(this.win, port, this.isWebView_, messagingToken)
+    );
   }
 
   /**
@@ -131,8 +144,12 @@ export class AmpViewerIntegration {
   webviewPreHandshakePromise_(source, origin) {
     return new Promise(resolve => {
       const unlisten = listen(this.win, 'message', e => {
-        dev().fine(TAG, 'AMPDOC got a pre-handshake message:', e.type,
-            getData(e));
+        dev().fine(
+          TAG,
+          'AMPDOC got a pre-handshake message:',
+          e.type,
+          getData(e)
+        );
         const data = parseMessage(getData(e));
         if (!data) {
           return;
@@ -140,15 +157,19 @@ export class AmpViewerIntegration {
         // Viewer says: "I'm ready for you"
         if (
           e.origin === origin &&
-            e.source === source &&
-            data.app == APP &&
-            data.name == 'handshake-poll') {
+          e.source === source &&
+          data.app == APP &&
+          data.name == 'handshake-poll'
+        ) {
           if (this.isWebView_ && (!e.ports || !e.ports.length)) {
             throw new Error(
-                'Did not receive communication port from the Viewer!');
+              'Did not receive communication port from the Viewer!'
+            );
           }
-          const port = e.ports && e.ports.length > 0 ? e.ports[0] :
-            new WindowPortEmulator(this.win, origin, this.win.parent);
+          const port =
+            e.ports && e.ports.length > 0
+              ? e.ports[0]
+              : new WindowPortEmulator(this.win, origin, this.win.parent);
           resolve(port);
           unlisten();
         }
@@ -168,15 +189,19 @@ export class AmpViewerIntegration {
     dev().fine(TAG, 'Send a handshake request');
     const ampdocUrl = ampdoc.getUrl();
     const srcUrl = getSourceUrl(ampdocUrl);
-    return messaging.sendRequest(RequestNames.CHANNEL_OPEN, dict({
-      'url': ampdocUrl,
-      'sourceUrl': srcUrl,
-    }),
-    true /* awaitResponse */)
-        .then(() => {
-          dev().fine(TAG, 'Channel has been opened!');
-          this.setup_(messaging, viewer, origin);
-        });
+    return messaging
+      .sendRequest(
+        RequestNames.CHANNEL_OPEN,
+        dict({
+          'url': ampdocUrl,
+          'sourceUrl': srcUrl,
+        }),
+        true /* awaitResponse */
+      )
+      .then(() => {
+        dev().fine(TAG, 'Channel has been opened!');
+        this.setup_(messaging, viewer, origin);
+      });
   }
 
   /**
@@ -189,13 +214,15 @@ export class AmpViewerIntegration {
   setup_(messaging, viewer, origin) {
     messaging.setDefaultHandler((type, payload, awaitResponse) => {
       return viewer.receiveMessage(
-          type, /** @type {!JsonObject} */ (payload), awaitResponse);
+        type,
+        /** @type {!JsonObject} */ (payload),
+        awaitResponse
+      );
     });
 
     viewer.setMessageDeliverer(messaging.sendRequest.bind(messaging), origin);
 
-    listenOnce(
-        this.win, 'unload', this.handleUnload_.bind(this, messaging));
+    listenOnce(this.win, 'unload', this.handleUnload_.bind(this, messaging));
 
     if (viewer.hasCapability('swipe')) {
       this.initTouchHandler_(messaging);
diff --git a/extensions/amp-viewer-integration/0.1/findtext.js b/extensions/amp-viewer-integration/0.1/findtext.js
index 56e824e09728..9c08a5b8cfb6 100644
--- a/extensions/amp-viewer-integration/0.1/findtext.js
+++ b/extensions/amp-viewer-integration/0.1/findtext.js
@@ -83,7 +83,7 @@ const skipCharRe = /[,.\s\u2022()]/;
  */
 function canonicalizeChar(c) {
   if (c == '\u2019' || c == '\u2018') {
-    return '\'';
+    return "'";
   }
   if (c == '\u201c' || c == '\u201d') {
     return '"';
@@ -202,8 +202,11 @@ function concatContinuousRanges(ranges) {
   let prev = null;
   for (let i = 0; i < ranges.length; i++) {
     const r = ranges[i];
-    if (prev && prev.end.node == r.start.node &&
-        prev.end.offset == r.start.offset) {
+    if (
+      prev &&
+      prev.end.node == r.start.node &&
+      prev.end.offset == r.start.offset
+    ) {
       prev.end = r.end;
       continue;
     }
@@ -249,7 +252,12 @@ function markTextRange(win, start, end, ranges, idx, marked) {
   while (true) {
     if (start.node == end.node) {
       const newText = markSingleTextNode(
-          win, start.node, start.offset, end.offset, marked);
+        win,
+        start.node,
+        start.offset,
+        end.offset,
+        marked
+      );
       if (newText) {
         fixTextRangesWithRemovedText(end, newText, idx + 1, ranges);
       }
@@ -257,7 +265,12 @@ function markTextRange(win, start, end, ranges, idx, marked) {
     }
     const next = nextTextNode(win, start.node);
     markSingleTextNode(
-        win, start.node, start.offset, start.node.wholeText.length, marked);
+      win,
+      start.node,
+      start.offset,
+      start.node.wholeText.length,
+      marked
+    );
     if (!next) {
       break;
     }
@@ -393,8 +406,8 @@ export class TextScanner {
         return pos;
       }
       const sibling = this.child_.node_.nextSibling;
-      this.child_ = sibling != null ?
-        new TextScanner(this.win_, sibling) : null;
+      this.child_ =
+        sibling != null ? new TextScanner(this.win_, sibling) : null;
     }
     return null;
   }
@@ -407,7 +420,7 @@ export class TextScanner {
     while (this.textIdx_ < text.length) {
       const idx = this.textIdx_;
       this.textIdx_++;
-      return {node: /**@type{!Text}*/(this.node_), offset: idx};
+      return {node: /**@type {!Text}*/ (this.node_), offset: idx};
     }
     return null;
   }
diff --git a/extensions/amp-viewer-integration/0.1/focus-handler.js b/extensions/amp-viewer-integration/0.1/focus-handler.js
index 450f5e387ed3..14352dbfdd3c 100644
--- a/extensions/amp-viewer-integration/0.1/focus-handler.js
+++ b/extensions/amp-viewer-integration/0.1/focus-handler.js
@@ -22,7 +22,6 @@ import {listen} from '../../../src/event-helper';
  * viewer.
  */
 export class FocusHandler {
-
   /**
    * @param {!Window} win
    * @param {!./messaging/messaging.Messaging} messaging
@@ -41,8 +40,9 @@ export class FocusHandler {
    */
   listenForFocusEvents_() {
     const doc = this.win.document;
-    listen(doc, 'focusin', this.forwardEventToViewer_.bind(this),
-        {capture: false});
+    listen(doc, 'focusin', this.forwardEventToViewer_.bind(this), {
+      capture: false,
+    });
   }
 
   /**
@@ -54,9 +54,9 @@ export class FocusHandler {
       return;
     }
     this.messaging_.sendRequest(
-        e.type,
-        dict({'focusTargetRect': e.target./*OK*/getBoundingClientRect()}),
-        /* awaitResponse */ false
+      e.type,
+      dict({'focusTargetRect': e.target./*OK*/ getBoundingClientRect()}),
+      /* awaitResponse */ false
     );
   }
 }
diff --git a/extensions/amp-viewer-integration/0.1/highlight-handler.js b/extensions/amp-viewer-integration/0.1/highlight-handler.js
index 6e2ccad402d1..65f9cd3abd22 100644
--- a/extensions/amp-viewer-integration/0.1/highlight-handler.js
+++ b/extensions/amp-viewer-integration/0.1/highlight-handler.js
@@ -169,7 +169,10 @@ export class HighlightHandler {
   findHighlightedNodes_(highlightInfo) {
     const {win} = this.ampdoc_;
     const sens = findSentences(
-        win, this.ampdoc_.getBody(), highlightInfo.sentences);
+      win,
+      this.ampdoc_.getBody(),
+      highlightInfo.sentences
+    );
     if (!sens) {
       return;
     }
@@ -232,8 +235,11 @@ export class HighlightHandler {
         called = true;
       });
     }
-    listenOnce(this.ampdoc_.getBody(), 'click',
-        this.dismissHighlight_.bind(this));
+    listenOnce(
+      this.ampdoc_.getBody(),
+      'click',
+      this.dismissHighlight_.bind(this)
+    );
   }
 
   /**
@@ -253,8 +259,11 @@ export class HighlightHandler {
       // top and bottom returned by getLayoutRect includes the header padding
       // size. We need to cancel the padding to calculate the positions in
       // document.body like Viewport.animateScrollIntoView does.
-      const {top, bottom} = moveLayoutRect(viewport.getLayoutRect(nodes[i]),
-          0, -paddingTop);
+      const {top, bottom} = moveLayoutRect(
+        viewport.getLayoutRect(nodes[i]),
+        0,
+        -paddingTop
+      );
       minTop = Math.min(minTop, top);
       maxBottom = Math.max(maxBottom, bottom);
     }
@@ -344,7 +353,9 @@ export class HighlightHandler {
    */
   setupMessaging(messaging) {
     messaging.registerHandler(
-        HIGHLIGHT_DISMISS, this.dismissHighlight_.bind(this));
+      HIGHLIGHT_DISMISS,
+      this.dismissHighlight_.bind(this)
+    );
   }
 
   /**
diff --git a/extensions/amp-viewer-integration/0.1/keyboard-handler.js b/extensions/amp-viewer-integration/0.1/keyboard-handler.js
index 689da8ec90d5..f02320618a3d 100644
--- a/extensions/amp-viewer-integration/0.1/keyboard-handler.js
+++ b/extensions/amp-viewer-integration/0.1/keyboard-handler.js
@@ -99,7 +99,10 @@ export class KeyboardHandler {
    */
   forwardEventToViewer_(e) {
     this.messaging_.sendRequest(
-        e.type, getKeyboardEventInit(e), /* awaitResponse */ false);
+      e.type,
+      getKeyboardEventInit(e),
+      /* awaitResponse */ false
+    );
   }
 }
 
@@ -133,8 +136,7 @@ function isHandledByEventTarget(e) {
 
   // Top-level event targets like `window` and `document` are not instance
   // of `Element` and do not have a `hasAttribute` function.
-  return e.target.hasAttribute &&
-      e.target.hasAttribute('contenteditable');
+  return e.target.hasAttribute && e.target.hasAttribute('contenteditable');
 }
 
 /**
diff --git a/extensions/amp-viewer-integration/0.1/messaging/messaging.js b/extensions/amp-viewer-integration/0.1/messaging/messaging.js
index 1ce17cf98b70..3e747bcad588 100644
--- a/extensions/amp-viewer-integration/0.1/messaging/messaging.js
+++ b/extensions/amp-viewer-integration/0.1/messaging/messaging.js
@@ -39,26 +39,26 @@ export let Message;
 export let RequestHandler;
 
 /**
-  * @param {*} message
-  * @return {?Message}
-  */
+ * @param {*} message
+ * @return {?Message}
+ */
 export function parseMessage(message) {
   if (typeof message != 'string') {
-    return /** @type {Message} */(message);
+    return /** @type {Message} */ (message);
   }
   if (message.charAt(0) != '{') {
     return null;
   }
 
   try {
-    return /** @type {?Message} */ (
-    /** @type {?} */ (parseJson(/** @type {string} */ (message))));
+    return /** @type {?Message} */ /** @type {?} */ (parseJson(
+      /** @type {string} */ (message)
+    ));
   } catch (e) {
     return null;
   }
 }
 
-
 /**
  * @fileoverview This class is a de-facto implementation of MessagePort
  * from Channel Messaging API:
@@ -85,8 +85,11 @@ export class WindowPortEmulator {
    */
   addEventListener(eventType, handler) {
     this.win.addEventListener('message', e => {
-      if (e.origin == this.origin_ &&
-          e.source == this.target_ && getData(e)['app'] == APP) {
+      if (
+        e.origin == this.origin_ &&
+        e.source == this.target_ &&
+        getData(e)['app'] == APP
+      ) {
         handler(e);
       }
     });
@@ -96,14 +99,13 @@ export class WindowPortEmulator {
    * @param {JsonObject} data
    */
   postMessage(data) {
-    this.target_./*OK*/postMessage(data, this.origin_);
+    this.target_./*OK*/ postMessage(data, this.origin_);
   }
 
   /**
    * Starts the sending of messages queued on the port.
    */
-  start() {
-  }
+  start() {}
 }
 
 /**
@@ -114,7 +116,6 @@ export class WindowPortEmulator {
  * ampdoc and Bob is the viewer.
  */
 export class Messaging {
-
   /**
    * Conversation (messaging protocol) between me and Bob.
    * @param {!Window} win
@@ -234,14 +235,16 @@ export class Messaging {
         this.waitingForResponse_[requestId] = {resolve, reject};
       });
     }
-    this.sendMessage_(/** @type {!AmpViewerMessage} */ ({
-      app: APP,
-      requestid: requestId,
-      type: MessageType.REQUEST,
-      name: messageName,
-      data: messageData,
-      rsvp: awaitResponse,
-    }));
+    this.sendMessage_(
+      /** @type {!AmpViewerMessage} */ ({
+        app: APP,
+        requestid: requestId,
+        type: MessageType.REQUEST,
+        name: messageName,
+        data: messageData,
+        rsvp: awaitResponse,
+      })
+    );
     return promise;
   }
 
@@ -253,13 +256,15 @@ export class Messaging {
    * @private
    */
   sendResponse_(requestId, messageName, messageData) {
-    this.sendMessage_(/** @type {!AmpViewerMessage} */ ({
-      app: APP,
-      requestid: requestId,
-      type: MessageType.RESPONSE,
-      name: messageName,
-      data: messageData,
-    }));
+    this.sendMessage_(
+      /** @type {!AmpViewerMessage} */ ({
+        app: APP,
+        requestid: requestId,
+        type: MessageType.RESPONSE,
+        name: messageName,
+        data: messageData,
+      })
+    );
   }
 
   /**
@@ -271,15 +276,19 @@ export class Messaging {
   sendResponseError_(requestId, messageName, reason) {
     const errString = this.errorToString_(reason);
     this.logError_(
-        TAG + ': sendResponseError_, Message name: ' + messageName, errString);
-    this.sendMessage_(/** @type {!AmpViewerMessage} */ ({
-      app: APP,
-      requestid: requestId,
-      type: MessageType.RESPONSE,
-      name: messageName,
-      data: null,
-      error: errString,
-    }));
+      TAG + ': sendResponseError_, Message name: ' + messageName,
+      errString
+    );
+    this.sendMessage_(
+      /** @type {!AmpViewerMessage} */ ({
+        app: APP,
+        requestid: requestId,
+        type: MessageType.RESPONSE,
+        name: messageName,
+        data: null,
+        error: errString,
+      })
+    );
   }
 
   /**
@@ -291,10 +300,11 @@ export class Messaging {
     if (this.token_) {
       finalMessage['messagingToken'] = this.token_;
     }
-    this.port_./*OK*/postMessage(
-        this.isWebview_
-          ? JSON.stringify(/** @type {!JsonObject} */ (finalMessage))
-          : finalMessage);
+    this.port_./*OK*/ postMessage(
+      this.isWebview_
+        ? JSON.stringify(/** @type {!JsonObject} */ (finalMessage))
+        : finalMessage
+    );
   }
 
   /**
@@ -311,7 +321,8 @@ export class Messaging {
     }
     if (!handler) {
       const error = new Error(
-          'Cannot handle request because handshake is not yet confirmed!');
+        'Cannot handle request because handshake is not yet confirmed!'
+      );
       error.args = message.name;
       throw error;
     }
@@ -321,14 +332,20 @@ export class Messaging {
       const requestId = message.requestid;
       if (!promise) {
         this.sendResponseError_(
-            requestId, message.name, new Error('no response'));
+          requestId,
+          message.name,
+          new Error('no response')
+        );
         throw new Error('expected response but none given: ' + message.name);
       }
-      promise.then(data => {
-        this.sendResponse_(requestId, message.name, data);
-      }, reason => {
-        this.sendResponseError_(requestId, message.name, reason);
-      });
+      promise.then(
+        data => {
+          this.sendResponse_(requestId, message.name, data);
+        },
+        reason => {
+          this.sendResponseError_(requestId, message.name, reason);
+        }
+      );
     }
   }
 
@@ -346,7 +363,8 @@ export class Messaging {
       if (message.error) {
         this.logError_(TAG + ': handleResponse_ error: ', message.error);
         pending.reject(
-            new Error(`Request ${message.name} failed: ${message.error}`));
+          new Error(`Request ${message.name} failed: ${message.error}`)
+        );
       } else {
         pending.resolve(message.data);
       }
@@ -371,8 +389,6 @@ export class Messaging {
    * @private
    */
   errorToString_(err) {
-    return err ?
-      (err.message ? err.message : String(err)) :
-      'unknown error';
+    return err ? (err.message ? err.message : String(err)) : 'unknown error';
   }
 }
diff --git a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
index 2c9f25fa9b9c..b8f136164b88 100644
--- a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
+++ b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-viewer-integration.js
@@ -23,7 +23,6 @@ import {
 import {ViewerForTesting} from '../../viewer-for-testing';
 import {getSourceUrl} from '../../../../../src/url';
 
-
 describes.sandboxed('AmpViewerIntegration', {}, () => {
   const ampDocSrc = '/test/fixtures/served/ampdoc-with-messaging.html';
   // TODO(aghassemi): Investigate failure in beforeEach. #10974.
@@ -34,8 +33,9 @@ describes.sandboxed('AmpViewerIntegration', {}, () => {
 
     beforeEach(() => {
       const loc = window.location;
-      ampDocUrl =
-        `${loc.protocol}//iframe.${loc.hostname}:${loc.port}${ampDocSrc}`;
+      ampDocUrl = `${loc.protocol}//iframe.${loc.hostname}:${
+        loc.port
+      }${ampDocSrc}`;
 
       viewerEl = document.createElement('div');
       document.body.appendChild(viewerEl);
@@ -48,7 +48,8 @@ describes.sandboxed('AmpViewerIntegration', {}, () => {
     });
 
     it('should confirm the handshake', () => {
-      console/*OK*/.log('sending handshake response');
+      console /*OK*/
+        .log('sending handshake response');
       viewer.confirmHandshake();
       return viewer.waitForDocumentLoaded();
     });
@@ -62,365 +63,417 @@ describes.sandboxed('AmpViewerIntegration', {}, () => {
       });
     });
 
-
-    describes.realWin('amp-viewer-integration', {
-      amp: {
-        location: 'https://cdn.ampproject.org/c/s/www.example.com/path',
-        params: {
-          origin: 'https://example.com',
+    describes.realWin(
+      'amp-viewer-integration',
+      {
+        amp: {
+          location: 'https://cdn.ampproject.org/c/s/www.example.com/path',
+          params: {
+            origin: 'https://example.com',
+          },
         },
       },
-    }, env => {
-      describe.configure().run('Open Channel', () => {
-        class Messaging {
-          constructor() {}
-          sendRequest() {}
-          setup_() {}
-          setDefaultHandler() {}
-          registerHandler() {}
-        }
-
-        let win;
-        let messaging;
-        let ampViewerIntegration;
-        let origin;
-
-        beforeEach(() => {
-          win = document.createElement('div');
-          win.document = document.createElement('div');
-          ampViewerIntegration = new AmpViewerIntegration(win);
-          messaging = new Messaging();
-          origin = 'http://localhost:9876';
-        });
+      env => {
+        describe.configure().run('Open Channel', () => {
+          class Messaging {
+            constructor() {}
+            sendRequest() {}
+            setup_() {}
+            setDefaultHandler() {}
+            registerHandler() {}
+          }
+
+          let win;
+          let messaging;
+          let ampViewerIntegration;
+          let origin;
+
+          beforeEach(() => {
+            win = document.createElement('div');
+            win.document = document.createElement('div');
+            ampViewerIntegration = new AmpViewerIntegration(win);
+            messaging = new Messaging();
+            origin = 'http://localhost:9876';
+          });
 
-        it('should start with the correct message', () => {
-          const sendRequestSpy =
-              sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+          it('should start with the correct message', () => {
+            const sendRequestSpy = sandbox
+              .stub(messaging, 'sendRequest')
+              .callsFake(() => {
                 return Promise.resolve();
               });
 
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging);
-
-          const ampdocUrl = env.ampdoc.getUrl();
-          const srcUrl = getSourceUrl(ampdocUrl);
-
-          expect(sendRequestSpy).to.have.been.calledOnce;
-          expect(sendRequestSpy.lastCall.args[0]).to.equal('channelOpen');
-          expect(sendRequestSpy.lastCall.args[1].sourceUrl).to.equal(srcUrl);
-          expect(sendRequestSpy.lastCall.args[1].url).to.equal(ampdocUrl);
-          expect(sendRequestSpy.lastCall.args[2]).to.equal(true);
-        });
-
-        it('should not initiate touch handler without capability', () => {
-          sandbox.stub(messaging, 'sendRequest').callsFake(() => {
-            return Promise.resolve();
+            ampViewerIntegration.openChannelAndStart_(
+              viewer,
+              env.ampdoc,
+              origin,
+              messaging
+            );
+
+            const ampdocUrl = env.ampdoc.getUrl();
+            const srcUrl = getSourceUrl(ampdocUrl);
+
+            expect(sendRequestSpy).to.have.been.calledOnce;
+            expect(sendRequestSpy.lastCall.args[0]).to.equal('channelOpen');
+            expect(sendRequestSpy.lastCall.args[1].sourceUrl).to.equal(srcUrl);
+            expect(sendRequestSpy.lastCall.args[1].url).to.equal(ampdocUrl);
+            expect(sendRequestSpy.lastCall.args[2]).to.equal(true);
           });
-          const initTouchHandlerStub =
-            sandbox.stub(ampViewerIntegration, 'initTouchHandler_');
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging);
-
-          expect(initTouchHandlerStub).to.not.be.called;
-        });
 
-        it('should initiate touch handler with capability', () => {
-          sandbox.stub(messaging, 'sendRequest').callsFake(() => {
-            return Promise.resolve();
-          });
-          sandbox.stub(viewer, 'hasCapability').withArgs('swipe').returns(true);
-          const initTouchHandlerStub =
-            sandbox.stub(ampViewerIntegration, 'initTouchHandler_');
-          ampViewerIntegration.unconfirmedViewerOrigin_ = '';
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging).then(() => {
-            expect(initTouchHandlerStub).to.be.called;
+          it('should not initiate touch handler without capability', () => {
+            sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+              return Promise.resolve();
+            });
+            const initTouchHandlerStub = sandbox.stub(
+              ampViewerIntegration,
+              'initTouchHandler_'
+            );
+            ampViewerIntegration.openChannelAndStart_(
+              viewer,
+              env.ampdoc,
+              origin,
+              messaging
+            );
+
+            expect(initTouchHandlerStub).to.not.be.called;
           });
-        });
 
-        it('should not initiate keyboard handler without capability', () => {
-          sandbox.stub(messaging, 'sendRequest').callsFake(() => {
-            return Promise.resolve();
+          it('should initiate touch handler with capability', () => {
+            sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+              return Promise.resolve();
+            });
+            sandbox
+              .stub(viewer, 'hasCapability')
+              .withArgs('swipe')
+              .returns(true);
+            const initTouchHandlerStub = sandbox.stub(
+              ampViewerIntegration,
+              'initTouchHandler_'
+            );
+            ampViewerIntegration.unconfirmedViewerOrigin_ = '';
+            ampViewerIntegration
+              .openChannelAndStart_(viewer, env.ampdoc, origin, messaging)
+              .then(() => {
+                expect(initTouchHandlerStub).to.be.called;
+              });
           });
-          const initKeyboardHandlerStub =
-            sandbox.stub(ampViewerIntegration, 'initKeyboardHandler_');
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging);
 
-          expect(initKeyboardHandlerStub).to.not.be.called;
-        });
-
-        it('should initiate keyboard handler with capability', () => {
-          sandbox.stub(messaging, 'sendRequest').callsFake(() => {
-            return Promise.resolve();
+          it('should not initiate keyboard handler without capability', () => {
+            sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+              return Promise.resolve();
+            });
+            const initKeyboardHandlerStub = sandbox.stub(
+              ampViewerIntegration,
+              'initKeyboardHandler_'
+            );
+            ampViewerIntegration.openChannelAndStart_(
+              viewer,
+              env.ampdoc,
+              origin,
+              messaging
+            );
+
+            expect(initKeyboardHandlerStub).to.not.be.called;
           });
-          sandbox.stub(viewer, 'hasCapability').withArgs('keyboard')
+
+          it('should initiate keyboard handler with capability', () => {
+            sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+              return Promise.resolve();
+            });
+            sandbox
+              .stub(viewer, 'hasCapability')
+              .withArgs('keyboard')
               .returns(true);
-          const initKeyboardHandlerStub =
-            sandbox.stub(ampViewerIntegration, 'initKeyboardHandler_');
-          ampViewerIntegration.unconfirmedViewerOrigin_ = '';
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging).then(() => {
-            expect(initKeyboardHandlerStub).to.be.called;
+            const initKeyboardHandlerStub = sandbox.stub(
+              ampViewerIntegration,
+              'initKeyboardHandler_'
+            );
+            ampViewerIntegration.unconfirmedViewerOrigin_ = '';
+            ampViewerIntegration
+              .openChannelAndStart_(viewer, env.ampdoc, origin, messaging)
+              .then(() => {
+                expect(initKeyboardHandlerStub).to.be.called;
+              });
           });
-        });
 
-        it('should initiate focus handler with capability', () => {
-          sandbox.stub(messaging, 'sendRequest').callsFake(() => {
-            return Promise.resolve();
-          });
-          sandbox.stub(viewer, 'hasCapability').withArgs('focus-rect')
+          it('should initiate focus handler with capability', () => {
+            sandbox.stub(messaging, 'sendRequest').callsFake(() => {
+              return Promise.resolve();
+            });
+            sandbox
+              .stub(viewer, 'hasCapability')
+              .withArgs('focus-rect')
               .returns(true);
-          const initFocusHandlerStub =
-            sandbox.stub(ampViewerIntegration, 'initFocusHandler_');
-          ampViewerIntegration.unconfirmedViewerOrigin_ = '';
-          ampViewerIntegration.openChannelAndStart_(
-              viewer, env.ampdoc, origin, messaging).then(() => {
-            expect(initFocusHandlerStub).to.be.called;
+            const initFocusHandlerStub = sandbox.stub(
+              ampViewerIntegration,
+              'initFocusHandler_'
+            );
+            ampViewerIntegration.unconfirmedViewerOrigin_ = '';
+            ampViewerIntegration
+              .openChannelAndStart_(viewer, env.ampdoc, origin, messaging)
+              .then(() => {
+                expect(initFocusHandlerStub).to.be.called;
+              });
           });
         });
-      });
-    });
+      }
+    );
   });
 
-  describe.configure().ifChrome().run('Unit Tests for messaging.js', () => {
-    const viewerOrigin = 'http://localhost:9876';
-    const messagingToken = '32q4pAwei09W845V3j24o8OJIO3fE9l3q49p';
-    const requestProcessor = function() {
-      return Promise.resolve({});
-    };
-    let messaging;
-    let postMessagePromise;
-    let postMessageSpy;
+  describe
+    .configure()
+    .ifChrome()
+    .run('Unit Tests for messaging.js', () => {
+      const viewerOrigin = 'http://localhost:9876';
+      const messagingToken = '32q4pAwei09W845V3j24o8OJIO3fE9l3q49p';
+      const requestProcessor = function() {
+        return Promise.resolve({});
+      };
+      let messaging;
+      let postMessagePromise;
+      let postMessageSpy;
+
+      beforeEach(() => {
+        let postMessageResolve;
+        postMessagePromise = new Promise(resolve => {
+          postMessageResolve = resolve;
+        });
 
-    beforeEach(() => {
-      let postMessageResolve;
-      postMessagePromise = new Promise(resolve => {
-        postMessageResolve = resolve;
-      });
+        const port = new WindowPortEmulator(window, viewerOrigin);
+        port.addEventListener = function() {};
+        port.postMessage = function() {};
 
-      const port = new WindowPortEmulator(
-          window, viewerOrigin);
-      port.addEventListener = function() {};
-      port.postMessage = function() {};
+        postMessageSpy = sandbox.stub(port, 'postMessage').callsFake(() => {
+          postMessageResolve();
+        });
 
-      postMessageSpy = sandbox.stub(port, 'postMessage').callsFake(() => {
-        postMessageResolve();
+        messaging = new Messaging(
+          window,
+          port,
+          /* opt_isWebview= */ false,
+          messagingToken
+        );
+        messaging.setDefaultHandler(requestProcessor);
       });
 
-      messaging = new Messaging(
-          window, port, /* opt_isWebview= */ false, messagingToken);
-      messaging.setDefaultHandler(requestProcessor);
-    });
-
-    it('handleMessage_ should call postMessage correctly', () => {
-      const event = {
-        source: window,
-        origin: viewerOrigin,
-        data: {
-          app: '__AMPHTML__',
-          name: 'message',
-          type: 'q',
-          requestid: 1,
-          rsvp: true,
-        },
-      };
-
-      messaging.handleMessage_(event);
-
-      return postMessagePromise.then(function() {
-        expect(postMessageSpy).to.have.been.calledOnce;
-        expect(postMessageSpy).to.have.been.calledWith({
-          app: '__AMPHTML__',
-          data: {},
-          messagingToken,
-          name: 'message',
-          requestid: 1,
-          type: 's',
+      it('handleMessage_ should call postMessage correctly', () => {
+        const event = {
+          source: window,
+          origin: viewerOrigin,
+          data: {
+            app: '__AMPHTML__',
+            name: 'message',
+            type: 'q',
+            requestid: 1,
+            rsvp: true,
+          },
+        };
+
+        messaging.handleMessage_(event);
+
+        return postMessagePromise.then(function() {
+          expect(postMessageSpy).to.have.been.calledOnce;
+          expect(postMessageSpy).to.have.been.calledWith({
+            app: '__AMPHTML__',
+            data: {},
+            messagingToken,
+            name: 'message',
+            requestid: 1,
+            type: 's',
+          });
         });
       });
-    });
 
-    // TODO(chenshay, #12476): Make this test work with sinon 4.0.
-    it.skip('handleMessage_ should resolve', () => {
-      const data = {
-        time: 12345678,
-        id: 'abcdefg',
-      };
-
-      const event = {
-        source: window,
-        origin: viewerOrigin,
-        data: {
-          app: '__AMPHTML__',
-          data: JSON.stringify(data),
-          name: 'messageName',
-          requestid: 1,
-          rsvp: true,
-          type: 's',
-        },
-      };
-
-      const resolveSpy = sandbox.stub();
-      const rejectSpy = sandbox.stub();
-      const waitingForResponse = {'1': {
-        resolve: resolveSpy,
-        reject: rejectSpy,
-      }};
-
-      sandbox.stub(messaging, 'waitingForResponse_').callsFake(
-          waitingForResponse);
-      messaging.handleMessage_(event);
-
-      expect(resolveSpy).to.have.been.calledOnce;
-      expect(resolveSpy).to.have.been.calledWith(JSON.stringify(data));
-    });
-
-    // TODO(chenshay, #12476): Make this test work with sinon 4.0.
-    it.skip('handleMessage_ should resolve with correct data', () => {
-      const data = 12345;
-
-      const event = {
-        source: window,
-        origin: viewerOrigin,
-        data: {
-          app: '__AMPHTML__',
-          data,
-          name: 'messageName',
-          requestid: 1,
-          rsvp: true,
-          type: 's',
-        },
-      };
-
-      const resolveSpy = sandbox.stub();
-      const rejectSpy = sandbox.stub();
-      const waitingForResponse = {'1': {
-        resolve: resolveSpy,
-        reject: rejectSpy,
-      }};
-
-      sandbox.stub(messaging, 'waitingForResponse_').callsFake(
-          waitingForResponse);
-      messaging.handleMessage_(event);
-
-      expect(resolveSpy).to.have.been.calledWith(data);
-    });
-
-    // TODO(chenshay, #12476): Make this test work with sinon 4.0.
-    it.skip('handleMessage_ should reject', () => {
-      const event = {
-        source: window,
-        origin: viewerOrigin,
-        data: {
-          app: '__AMPHTML__',
-          data: {},
-          error: 'reason',
-          name: null,
-          requestid: 1,
-          rsvp: true,
-          type: 's',
-        },
-      };
-
-      const resolveSpy = sandbox.stub();
-      const rejectSpy = sandbox.stub();
-      const waitingForResponse = {'1': {
-        resolve: resolveSpy,
-        reject: rejectSpy,
-      }};
+      // TODO(chenshay, #12476): Make this test work with sinon 4.0.
+      it.skip('handleMessage_ should resolve', () => {
+        const data = {
+          time: 12345678,
+          id: 'abcdefg',
+        };
+
+        const event = {
+          source: window,
+          origin: viewerOrigin,
+          data: {
+            app: '__AMPHTML__',
+            data: JSON.stringify(data),
+            name: 'messageName',
+            requestid: 1,
+            rsvp: true,
+            type: 's',
+          },
+        };
+
+        const resolveSpy = sandbox.stub();
+        const rejectSpy = sandbox.stub();
+        const waitingForResponse = {
+          '1': {
+            resolve: resolveSpy,
+            reject: rejectSpy,
+          },
+        };
+
+        sandbox
+          .stub(messaging, 'waitingForResponse_')
+          .callsFake(waitingForResponse);
+        messaging.handleMessage_(event);
+
+        expect(resolveSpy).to.have.been.calledOnce;
+        expect(resolveSpy).to.have.been.calledWith(JSON.stringify(data));
+      });
 
-      const logErrorSpy = sandbox.stub(messaging, 'logError_');
-      sandbox.stub(messaging, 'waitingForResponse_').callsFake(
-          waitingForResponse);
-      messaging.handleMessage_(event);
+      // TODO(chenshay, #12476): Make this test work with sinon 4.0.
+      it.skip('handleMessage_ should resolve with correct data', () => {
+        const data = 12345;
+
+        const event = {
+          source: window,
+          origin: viewerOrigin,
+          data: {
+            app: '__AMPHTML__',
+            data,
+            name: 'messageName',
+            requestid: 1,
+            rsvp: true,
+            type: 's',
+          },
+        };
+
+        const resolveSpy = sandbox.stub();
+        const rejectSpy = sandbox.stub();
+        const waitingForResponse = {
+          '1': {
+            resolve: resolveSpy,
+            reject: rejectSpy,
+          },
+        };
+
+        sandbox
+          .stub(messaging, 'waitingForResponse_')
+          .callsFake(waitingForResponse);
+        messaging.handleMessage_(event);
+
+        expect(resolveSpy).to.have.been.calledWith(data);
+      });
 
-      expect(rejectSpy).to.have.been.calledOnce;
+      // TODO(chenshay, #12476): Make this test work with sinon 4.0.
+      it.skip('handleMessage_ should reject', () => {
+        const event = {
+          source: window,
+          origin: viewerOrigin,
+          data: {
+            app: '__AMPHTML__',
+            data: {},
+            error: 'reason',
+            name: null,
+            requestid: 1,
+            rsvp: true,
+            type: 's',
+          },
+        };
+
+        const resolveSpy = sandbox.stub();
+        const rejectSpy = sandbox.stub();
+        const waitingForResponse = {
+          '1': {
+            resolve: resolveSpy,
+            reject: rejectSpy,
+          },
+        };
+
+        const logErrorSpy = sandbox.stub(messaging, 'logError_');
+        sandbox
+          .stub(messaging, 'waitingForResponse_')
+          .callsFake(waitingForResponse);
+        messaging.handleMessage_(event);
+
+        expect(rejectSpy).to.have.been.calledOnce;
 
-      expect(logErrorSpy).to.have.been.calledOnce;
+        expect(logErrorSpy).to.have.been.calledOnce;
 
-      expect(logErrorSpy).to.have.been.calledWith(
+        expect(logErrorSpy).to.have.been.calledWith(
           'amp-viewer-messaging: handleResponse_ error: ',
-          'reason');
-    });
+          'reason'
+        );
+      });
 
-    it('sendRequest should call postMessage correctly', () => {
-      const message = 'message';
-      const awaitResponse = false;
-      const payload = {};
-      messaging.sendRequest(message, payload, awaitResponse);
-
-      return postMessagePromise.then(function() {
-        expect(postMessageSpy).to.have.been.calledOnce;
-        expect(postMessageSpy).to.have.been.calledWith({
-          app: '__AMPHTML__',
-          data: {},
-          messagingToken,
-          name: message,
-          requestid: 1,
-          rsvp: awaitResponse,
-          type: 'q',
+      it('sendRequest should call postMessage correctly', () => {
+        const message = 'message';
+        const awaitResponse = false;
+        const payload = {};
+        messaging.sendRequest(message, payload, awaitResponse);
+
+        return postMessagePromise.then(function() {
+          expect(postMessageSpy).to.have.been.calledOnce;
+          expect(postMessageSpy).to.have.been.calledWith({
+            app: '__AMPHTML__',
+            data: {},
+            messagingToken,
+            name: message,
+            requestid: 1,
+            rsvp: awaitResponse,
+            type: 'q',
+          });
         });
       });
-    });
 
-    it('sendResponse_ should call postMessage correctly', () => {
-      const mName = 'name';
-      const payload = {};
-      const requestId = 1;
-      messaging.sendResponse_(requestId, mName, payload);
-
-      return postMessagePromise.then(function() {
-        expect(postMessageSpy).to.have.been.calledOnce;
-        expect(postMessageSpy).to.have.been.calledWith({
-          app: '__AMPHTML__',
-          data: {},
-          messagingToken,
-          name: mName,
-          requestid: 1,
-          type: 's',
+      it('sendResponse_ should call postMessage correctly', () => {
+        const mName = 'name';
+        const payload = {};
+        const requestId = 1;
+        messaging.sendResponse_(requestId, mName, payload);
+
+        return postMessagePromise.then(function() {
+          expect(postMessageSpy).to.have.been.calledOnce;
+          expect(postMessageSpy).to.have.been.calledWith({
+            app: '__AMPHTML__',
+            data: {},
+            messagingToken,
+            name: mName,
+            requestid: 1,
+            type: 's',
+          });
         });
       });
-    });
 
-    it('sendResponseError_ should call postMessage correctly', () => {
-      const mName = 'name';
-      const err = new Error('reason');
-      const errString = messaging.errorToString_(err);
-      const requestId = 1;
-      const logErrorSpy = sandbox.stub(messaging, 'logError_');
-      messaging.sendResponseError_(requestId, mName, err);
-
-      return postMessagePromise.then(function() {
-        expect(postMessageSpy).to.have.been.calledOnce;
-        expect(postMessageSpy).to.have.been.calledWith({
-          app: '__AMPHTML__',
-          data: null,
-          error: errString,
-          messagingToken,
-          name: mName,
-          requestid: 1,
-          type: 's',
-        });
+      it('sendResponseError_ should call postMessage correctly', () => {
+        const mName = 'name';
+        const err = new Error('reason');
+        const errString = messaging.errorToString_(err);
+        const requestId = 1;
+        const logErrorSpy = sandbox.stub(messaging, 'logError_');
+        messaging.sendResponseError_(requestId, mName, err);
+
+        return postMessagePromise.then(function() {
+          expect(postMessageSpy).to.have.been.calledOnce;
+          expect(postMessageSpy).to.have.been.calledWith({
+            app: '__AMPHTML__',
+            data: null,
+            error: errString,
+            messagingToken,
+            name: mName,
+            requestid: 1,
+            type: 's',
+          });
 
-        expect(logErrorSpy).to.have.been.calledOnce;
-        const state = 'amp-viewer-messaging: sendResponseError_, ' +
-          'Message name: name';
-        expect(logErrorSpy).to.have.been.calledWith(state, errString);
+          expect(logErrorSpy).to.have.been.calledOnce;
+          const state =
+            'amp-viewer-messaging: sendResponseError_, Message name: name';
+          expect(logErrorSpy).to.have.been.calledWith(state, errString);
+        });
       });
-    });
 
-    it('should parseMessage correctly', () => {
-      const obj = {bla: 'la'};
-      const json = JSON.stringify(obj);
-      const badJson = '{a:b';
-      let parsedCorrectly;
-      parsedCorrectly = parseMessage(json);
-      expect(parsedCorrectly.bla).to.equal('la');
-      parsedCorrectly = parseMessage(obj);
-      expect(parsedCorrectly.bla).to.equal('la');
-      expect(parseMessage('should return null')).to.be.null;
-      expect(parseMessage(badJson)).to.be.null;
+      it('should parseMessage correctly', () => {
+        const obj = {bla: 'la'};
+        const json = JSON.stringify(obj);
+        const badJson = '{a:b';
+        let parsedCorrectly;
+        parsedCorrectly = parseMessage(json);
+        expect(parsedCorrectly.bla).to.equal('la');
+        parsedCorrectly = parseMessage(obj);
+        expect(parsedCorrectly.bla).to.equal('la');
+        expect(parseMessage('should return null')).to.be.null;
+        expect(parseMessage(badJson)).to.be.null;
+      });
     });
-  });
 });
diff --git a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-webview-viewer-integration.js b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-webview-viewer-integration.js
index 0f359af4b5bf..e46dde8f7022 100644
--- a/extensions/amp-viewer-integration/0.1/test/integration/test-amp-webview-viewer-integration.js
+++ b/extensions/amp-viewer-integration/0.1/test/integration/test-amp-webview-viewer-integration.js
@@ -17,7 +17,6 @@
 import {AmpViewerIntegration} from '../../amp-viewer-integration';
 import {WebviewViewerForTesting} from '../../webview-viewer-for-testing.js';
 
-
 describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
   const ampDocSrc = '/test/fixtures/served/ampdoc-with-messaging.html';
   // TODO(aghassemi): Investigate failure in beforeEach. #10974.
@@ -27,8 +26,9 @@ describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
 
     beforeEach(() => {
       const loc = window.location;
-      const ampDocUrl =
-        `${loc.protocol}//iframe.${loc.hostname}:${loc.port}${ampDocSrc}`;
+      const ampDocUrl = `${loc.protocol}//iframe.${loc.hostname}:${
+        loc.port
+      }${ampDocSrc}`;
 
       viewerEl = document.createElement('div');
       document.body.appendChild(viewerEl);
@@ -41,7 +41,8 @@ describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
     });
 
     it('should confirm the handshake', () => {
-      console/*OK*/.log('sending handshake response');
+      console /*OK*/
+        .log('sending handshake response');
       return viewer.waitForDocumentLoaded();
     });
 
@@ -54,26 +55,30 @@ describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
     });
   });
 
-  describes.fakeWin('webview window init', {
-    amp: {
-      params: {
-        webview: '1',
-        origin: null,
+  describes.fakeWin(
+    'webview window init',
+    {
+      amp: {
+        params: {
+          webview: '1',
+          origin: null,
+        },
       },
     },
-  }, env => {
-    let integr;
+    env => {
+      let integr;
 
-    beforeEach(() => {
-      integr = new AmpViewerIntegration(env.win);
-    });
+      beforeEach(() => {
+        integr = new AmpViewerIntegration(env.win);
+      });
 
-    it('should set source and origin for webview', () => {
-      const stub =
-          sandbox.stub(integr, 'webviewPreHandshakePromise_').callsFake(
-              () => new Promise(() => {}));
-      integr.init();
-      expect(stub).to.be.calledWith(/* source */ null, /* origin */ '');
-    });
-  });
+      it('should set source and origin for webview', () => {
+        const stub = sandbox
+          .stub(integr, 'webviewPreHandshakePromise_')
+          .callsFake(() => new Promise(() => {}));
+        integr.init();
+        expect(stub).to.be.calledWith(/* source */ null, /* origin */ '');
+      });
+    }
+  );
 });
diff --git a/extensions/amp-viewer-integration/0.1/test/integration/test-viewer-initiated-handshake.js b/extensions/amp-viewer-integration/0.1/test/integration/test-viewer-initiated-handshake.js
index e5fcbeb6af81..74bde03353cd 100644
--- a/extensions/amp-viewer-integration/0.1/test/integration/test-viewer-initiated-handshake.js
+++ b/extensions/amp-viewer-integration/0.1/test/integration/test-viewer-initiated-handshake.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  WebviewViewerForTesting,
-} from '../../viewer-initiated-handshake-viewer-for-testing';
-
+import {WebviewViewerForTesting} from '../../viewer-initiated-handshake-viewer-for-testing';
 
 describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
   const ampDocSrc = '/test/fixtures/served/ampdoc-with-messaging.html';
@@ -28,8 +25,9 @@ describes.sandboxed('AmpWebviewViewerIntegration', {}, () => {
 
     beforeEach(() => {
       const loc = window.location;
-      const ampDocUrl =
-        `${loc.protocol}//iframe.${loc.hostname}:${loc.port}${ampDocSrc}`;
+      const ampDocUrl = `${loc.protocol}//iframe.${loc.hostname}:${
+        loc.port
+      }${ampDocSrc}`;
 
       viewerEl = document.createElement('div');
       document.body.appendChild(viewerEl);
diff --git a/extensions/amp-viewer-integration/0.1/test/test-findtext.js b/extensions/amp-viewer-integration/0.1/test/test-findtext.js
index 887c13b28dc4..fde520357163 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-findtext.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-findtext.js
@@ -41,8 +41,8 @@ describe('canonicalizeString', () => {
   it('test examples', () => {
     expect(canonicalizeString('a b  c')).to.equal('abc');
     expect(canonicalizeString('abc.d')).to.equal('abcd');
-    expect(canonicalizeString('a\u2019b')).to.equal('a\'b');
-    expect(canonicalizeString('\u201chello\u201d')).to.equal('\"hello\"');
+    expect(canonicalizeString('a\u2019b')).to.equal("a'b");
+    expect(canonicalizeString('\u201chello\u201d')).to.equal('"hello"');
     expect(canonicalizeString('\u2022 hello')).to.equal('hello');
     expect(canonicalizeString('a,b.c')).to.equal('abc');
   });
@@ -74,9 +74,11 @@ describes.realWin('findSentences', {}, env => {
   it('multiple nodes', () => {
     const root = document.createElement('div');
     root.innerHTML =
-        '<h4>header with <b>bold text</b></h4>\n<p>and additional text</p>';
-    const ranges = findSentences(
-        win, root, ['header with bold text', 'additional text']);
+      '<h4>header with <b>bold text</b></h4>\n<p>and additional text</p>';
+    const ranges = findSentences(win, root, [
+      'header with bold text',
+      'additional text',
+    ]);
     expect(ranges).to.not.be.null;
     const texts = [];
     for (let i = 0; i < ranges.length; i++) {
@@ -92,9 +94,10 @@ describes.realWin('findSentences', {}, env => {
   it('block node', () => {
     const root = document.createElement('div');
     root.innerHTML =
-        '<p>Here’s an instruction:</p><ul><li>Do something.</li></ul>';
-    const ranges = findSentences(
-        win, root, ['Here\'s an instruction: Do something.']);
+      '<p>Here’s an instruction:</p><ul><li>Do something.</li></ul>';
+    const ranges = findSentences(win, root, [
+      "Here's an instruction: Do something.",
+    ]);
     expect(ranges).to.not.be.null;
     const texts = [];
     for (let i = 0; i < ranges.length; i++) {
@@ -110,8 +113,9 @@ describes.realWin('findSentences', {}, env => {
   it('special chars', () => {
     const root = document.createElement('div');
     root.innerHTML = '<p>“double ‘single quoted’ quoted text,<p>';
-    const ranges = findSentences(
-        win, root, ['"double \'single quoted\' quoted']);
+    const ranges = findSentences(win, root, [
+      "\"double 'single quoted' quoted",
+    ]);
     expect(ranges).to.not.be.null;
     const texts = [];
     for (let i = 0; i < ranges.length; i++) {
@@ -156,8 +160,9 @@ describes.realWin('TextScanner', {}, env => {
   });
 
   it('elements', () => {
-    root.innerHTML = '<b>bold</b><i>italic</i><div>block</div>' +
-        '<ul><li>nest0</li><li>nest1</li></ul>';
+    root.innerHTML =
+      '<b>bold</b><i>italic</i><div>block</div>' +
+      '<ul><li>nest0</li><li>nest1</li></ul>';
 
     const chars = [];
     const scanner = new TextScanner(win, root);
@@ -213,14 +218,17 @@ describes.realWin('markTextRangeList', {}, env => {
     root.innerHTML = '<b>abc</b><div>def</div><i>ghi</i>';
     const b = root.querySelector('b');
     const i = root.querySelector('i');
-    markTextRangeList(win, [{
-      start: {node: b.firstChild, offset: 1},
-      end: {node: i.firstChild, offset: 1},
-    }]);
-    '<b>a<span>bc</span></b><div>def</div><i>ghi</i>';
+    markTextRangeList(win, [
+      {
+        start: {node: b.firstChild, offset: 1},
+        end: {node: i.firstChild, offset: 1},
+      },
+    ]);
+    ('<b>a<span>bc</span></b><div>def</div><i>ghi</i>');
     expect(root.innerHTML).to.equal(
-        '<b>a<span>bc</span></b><div><span>def</span></div>' +
-          '<i><span>g</span>hi</i>');
+      '<b>a<span>bc</span></b><div><span>def</span></div>' +
+        '<i><span>g</span>hi</i>'
+    );
   });
 
   it('concat ranges', () => {
diff --git a/extensions/amp-viewer-integration/0.1/test/test-focus-handler.js b/extensions/amp-viewer-integration/0.1/test/test-focus-handler.js
index eef0d4451622..18d4daa4f97a 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-focus-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-focus-handler.js
@@ -40,7 +40,6 @@ function fakeFocusEvent(type) {
 
 describes.fakeWin('FocusHandler', {}, env => {
   describe('FocusHandler Unit Tests', function() {
-
     class WindowPortEmulator {
       constructor(win, origin) {
         /** @const {!Window} */
@@ -77,8 +76,10 @@ describes.fakeWin('FocusHandler', {}, env => {
           options,
         });
       };
-      const port =
-        new WindowPortEmulator(this.messageHandlers_, 'origin doesnt matter');
+      const port = new WindowPortEmulator(
+        this.messageHandlers_,
+        'origin doesnt matter'
+      );
       messaging = new Messaging(win, port);
       focusHandler = new FocusHandler(win, messaging);
     });
@@ -100,6 +101,5 @@ describes.fakeWin('FocusHandler', {}, env => {
       focusHandler.forwardEventToViewer_(event);
       expect(messages).to.have.length(0);
     });
-
   });
 });
diff --git a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
index e598f39bb491..06dc9de36a5a 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-highlight-handler.js
@@ -21,298 +21,345 @@ import {Services} from '../../../../src/services';
 import {VisibilityState} from '../../../../src/visibility-state';
 import {layoutRectLtwh} from '../../../../src/layout-rect';
 
-describes.fakeWin('getHighlightParam', {
-  amp: {
-    ampdoc: 'single',
+describes.fakeWin(
+  'getHighlightParam',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  it('get a param', () => {
-    // URL encoded '{"s":["amp","highlight"]}'.
-    env.win.location = 'page.html#highlight=' +
+  env => {
+    it('get a param', () => {
+      // URL encoded '{"s":["amp","highlight"]}'.
+      env.win.location =
+        'page.html#highlight=' +
         '%7B%22s%22%3A%5B%22amp%22%2C%22highlight%22%5D%7D';
-    expect(getHighlightParam(env.ampdoc)).to.deep.equal({
-      sentences: ['amp', 'highlight'],
-      skipRendering: false,
+      expect(getHighlightParam(env.ampdoc)).to.deep.equal({
+        sentences: ['amp', 'highlight'],
+        skipRendering: false,
+      });
     });
-  });
-
-  it('do nothing flag', () => {
-    // URL encoded '{"s":["amp","highlight"], "n": 1}'
-    env.win.location = 'page.html#highlight=' +
-      '%7B%22s%22%3A%5B%22amp%22%2C%22highlight%22%5D%2C%20%22n%22%3A%201%7D';
-    expect(getHighlightParam(env.ampdoc)).to.deep.equal({
-      sentences: ['amp', 'highlight'],
-      skipRendering: true,
+
+    it('do nothing flag', () => {
+      // URL encoded '{"s":["amp","highlight"], "n": 1}'
+      env.win.location =
+        'page.html#highlight=' +
+        '%7B%22s%22%3A%5B%22amp%22%2C%22highlight%22%5D%2C%20%22n%22%3A%201%7D';
+      expect(getHighlightParam(env.ampdoc)).to.deep.equal({
+        sentences: ['amp', 'highlight'],
+        skipRendering: true,
+      });
+    });
+
+    it('no param', () => {
+      env.win.location = 'page.html';
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('too large json', () => {
+      const rep = 100 << 10;
+      env.win.location = 'page.html#highlight=['.repeat(rep) + ']'.repeat(rep);
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('too many sentences', () => {
+      const sens = [];
+      for (let i = 0; i < 20; i++) {
+        sens.push('a');
+      }
+      env.win.location = 'page.html#highlight=' + JSON.stringify({'s': sens});
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('too many chars', () => {
+      const sens = [];
+      for (let i = 0; i < 5; i++) {
+        sens.push('a'.repeat(400));
+      }
+      env.win.location = 'page.html#highlight=' + JSON.stringify({'s': sens});
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('if s is not array', () => {
+      env.win.location =
+        'page.html#highlight=' + JSON.stringify({'s': 'invalid'});
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('empty in an array', () => {
+      env.win.location =
+        'page.html#highlight=' + JSON.stringify({'s': ['a', '', 'b']});
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
+    });
+
+    it('number array', () => {
+      env.win.location = 'page.html#highlight=' + JSON.stringify({'s': [1, 2]});
+      expect(getHighlightParam(env.ampdoc)).to.be.a('null');
     });
-  });
-
-  it('no param', () => {
-    env.win.location = 'page.html';
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('too large json', () => {
-    const rep = 100 << 10;
-    env.win.location = 'page.html#highlight=' +
-        '['.repeat(rep) + ']'.repeat(rep);
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('too many sentences', () => {
-    const sens = [];
-    for (let i = 0; i < 20; i++) {
-      sens.push('a');
-    }
-    env.win.location = 'page.html#highlight=' + JSON.stringify({'s': sens});
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('too many chars', () => {
-    const sens = [];
-    for (let i = 0; i < 5; i++) {
-      sens.push('a'.repeat(400));
-    }
-    env.win.location = 'page.html#highlight=' + JSON.stringify({'s': sens});
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('if s is not array', () => {
-    env.win.location = 'page.html#highlight=' +
-        JSON.stringify({'s': 'invalid'});
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('empty in an array', () => {
-    env.win.location = 'page.html#highlight=' +
-        JSON.stringify({'s': ['a', '', 'b']});
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-
-  it('number array', () => {
-    env.win.location = 'page.html#highlight=' + JSON.stringify({'s': [1, 2]});
-    expect(getHighlightParam(env.ampdoc)).to.be.a('null');
-  });
-});
-
-describes.realWin('HighlightHandler', {
-  // We can not overwrite win.location with realWin.
-  amp: {
-    ampdoc: 'single',
+  }
+);
+
+describes.realWin(
+  'HighlightHandler',
+  {
+    // We can not overwrite win.location with realWin.
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let root = null;
-  let docreadyCb = null;
-  beforeEach(() => {
-    const {document} = env.win;
-    root = document.createElement('div');
-    document.body.appendChild(root);
-    const div0 = document.createElement('div');
-    div0.textContent = 'text in amp doc';
-    root.appendChild(div0);
-    const div1 = document.createElement('div');
-    div1.textContent = 'highlighted text';
-    root.appendChild(div1);
-
-    sandbox.stub(docready, 'whenDocumentReady').returns({
-      then: cb => {
-        docreadyCb = cb;
-      },
+  env => {
+    let root = null;
+    let docreadyCb = null;
+    beforeEach(() => {
+      const {document} = env.win;
+      root = document.createElement('div');
+      document.body.appendChild(root);
+      const div0 = document.createElement('div');
+      div0.textContent = 'text in amp doc';
+      root.appendChild(div0);
+      const div1 = document.createElement('div');
+      div1.textContent = 'highlighted text';
+      root.appendChild(div1);
+
+      sandbox.stub(docready, 'whenDocumentReady').returns({
+        then: cb => {
+          docreadyCb = cb;
+        },
+      });
     });
-  });
-
-  it('initialize with visibility=visible', () => {
-    const {ampdoc} = env;
-    const scrollStub = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'animateScrollIntoView');
-    scrollStub.returns(Promise.reject());
-    const sendMsgStub = sandbox.stub(
-        Services.viewerForDoc(ampdoc), 'sendMessage');
-    const setScrollTop = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'setScrollTop');
-
-    const handler = new HighlightHandler(
-        ampdoc,{sentences: ['amp', 'highlight']});
-
-    // initHighlight_ is not called before document become ready.
-    expect(handler.highlightedNodes_).to.be.null;
-    docreadyCb();
-    // initHighlight_ was called in docreadyCb() and highlightedNodes_ is set.
-    expect(handler.highlightedNodes_).not.to.be.null;
-
-    expect(setScrollTop).to.be.calledOnce;
-    expect(setScrollTop.firstCall.args.length).to.equal(1);
-
-    expect(scrollStub).to.be.calledOnce;
-    expect(scrollStub.firstCall.args.length).to.equal(1);
-    expect(scrollStub.firstCall.args[0].style.pointerEvents).to.equal('none');
-    expect(scrollStub.firstCall.args[0].style.display).to.equal('block');
-
-    // For some reason, expect(args).to.deep.equal does not work.
-    expect(sendMsgStub.callCount).to.equal(2);
-    expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
-    expect(sendMsgStub.firstCall.args[1]).to.deep.equal(
-        {state: 'found', scroll: 0});
-    expect(sendMsgStub.secondCall.args[1]).to.deep.equal(
-        {state: 'auto_scroll'});
-
-    expect(root.innerHTML).to.equal(
+
+    it('initialize with visibility=visible', () => {
+      const {ampdoc} = env;
+      const scrollStub = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'animateScrollIntoView'
+      );
+      scrollStub.returns(Promise.reject());
+      const sendMsgStub = sandbox.stub(
+        Services.viewerForDoc(ampdoc),
+        'sendMessage'
+      );
+      const setScrollTop = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'setScrollTop'
+      );
+
+      const handler = new HighlightHandler(ampdoc, {
+        sentences: ['amp', 'highlight'],
+      });
+
+      // initHighlight_ is not called before document become ready.
+      expect(handler.highlightedNodes_).to.be.null;
+      docreadyCb();
+      // initHighlight_ was called in docreadyCb() and highlightedNodes_ is set.
+      expect(handler.highlightedNodes_).not.to.be.null;
+
+      expect(setScrollTop).to.be.calledOnce;
+      expect(setScrollTop.firstCall.args.length).to.equal(1);
+
+      expect(scrollStub).to.be.calledOnce;
+      expect(scrollStub.firstCall.args.length).to.equal(1);
+      expect(scrollStub.firstCall.args[0].style.pointerEvents).to.equal('none');
+      expect(scrollStub.firstCall.args[0].style.display).to.equal('block');
+
+      // For some reason, expect(args).to.deep.equal does not work.
+      expect(sendMsgStub.callCount).to.equal(2);
+      expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
+      expect(sendMsgStub.firstCall.args[1]).to.deep.equal({
+        state: 'found',
+        scroll: 0,
+      });
+      expect(sendMsgStub.secondCall.args[1]).to.deep.equal({
+        state: 'auto_scroll',
+      });
+
+      expect(root.innerHTML).to.equal(
         '<div>text in <span style="background-color: rgb(255, 150, 50); ' +
           'color: rgb(0, 0, 0);">amp</span> doc</div><div>' +
           '<span style="background-color: rgb(255, 150, 50); color: ' +
-          'rgb(0, 0, 0);">highlight</span>ed text</div>');
-
-    const viewerOrigin = 'http://localhost:9876';
-    const port = new WindowPortEmulator(
-        window, viewerOrigin);
-    port.addEventListener = function() {};
-    port.postMessage = function() {};
-    const messaging = new Messaging(env.win, port);
-
-    handler.setupMessaging(messaging);
-    messaging.handleRequest_({
-      name: 'highlightDismiss',
-    });
-    expect(root.innerHTML).to.equal(
+          'rgb(0, 0, 0);">highlight</span>ed text</div>'
+      );
+
+      const viewerOrigin = 'http://localhost:9876';
+      const port = new WindowPortEmulator(window, viewerOrigin);
+      port.addEventListener = function() {};
+      port.postMessage = function() {};
+      const messaging = new Messaging(env.win, port);
+
+      handler.setupMessaging(messaging);
+      messaging.handleRequest_({
+        name: 'highlightDismiss',
+      });
+      expect(root.innerHTML).to.equal(
         '<div>text in <span style="">amp</span> doc</div><div>' +
-          '<span style="">highlight</span>ed text</div>');
-  });
-
-  it('initialize with skipRendering', () => {
-    const {ampdoc} = env;
-    const scrollStub = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'animateScrollIntoView');
-    scrollStub.returns(Promise.reject());
-    const sendMsgStub = sandbox.stub(
-        Services.viewerForDoc(ampdoc), 'sendMessage');
-
-    new HighlightHandler(ampdoc,
-        {sentences: ['amp', 'highlight'], skipRendering: true});
-    docreadyCb();
-
-    expect(scrollStub).not.to.be.called;
-
-    // For some reason, expect(args).to.deep.equal does not work.
-    expect(sendMsgStub.callCount).to.equal(1);
-    expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
-    expect(sendMsgStub.firstCall.args[1]).to.deep.equal(
-        {state: 'found', scroll: 0});
-
-    expect(root.innerHTML).to.equal(
+          '<span style="">highlight</span>ed text</div>'
+      );
+    });
+
+    it('initialize with skipRendering', () => {
+      const {ampdoc} = env;
+      const scrollStub = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'animateScrollIntoView'
+      );
+      scrollStub.returns(Promise.reject());
+      const sendMsgStub = sandbox.stub(
+        Services.viewerForDoc(ampdoc),
+        'sendMessage'
+      );
+
+      new HighlightHandler(ampdoc, {
+        sentences: ['amp', 'highlight'],
+        skipRendering: true,
+      });
+      docreadyCb();
+
+      expect(scrollStub).not.to.be.called;
+
+      // For some reason, expect(args).to.deep.equal does not work.
+      expect(sendMsgStub.callCount).to.equal(1);
+      expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
+      expect(sendMsgStub.firstCall.args[1]).to.deep.equal({
+        state: 'found',
+        scroll: 0,
+      });
+
+      expect(root.innerHTML).to.equal(
         '<div>text in <span>amp</span> doc</div><div><span>highlight</span>' +
-        'ed text</div>');
-  });
-
-  it('initialize with amp-access', () => {
-    // Inject <script id="amp-access"> to emulate pages with <amp-access>.
-    const {document} = env.win;
-    const script = document.createElement('script');
-    script.id = 'amp-access';
-    document.body.appendChild(script);
-
-    const {ampdoc} = env;
-    const scrollStub = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'animateScrollIntoView');
-    scrollStub.returns(Promise.reject());
-    const sendMsgStub = sandbox.stub(
-        Services.viewerForDoc(ampdoc), 'sendMessage');
-
-    new HighlightHandler(ampdoc, {sentences: ['amp', 'highlight']});
-    docreadyCb();
-
-    expect(scrollStub).not.to.be.called;
-
-    // For some reason, expect(args).to.deep.equal does not work.
-    expect(sendMsgStub.callCount).to.equal(1);
-    expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
-    expect(sendMsgStub.firstCall.args[1]).to.deep.equal(
-        {state: 'has_amp_access'});
-
-    expect(root.innerHTML).to.equal(
-        '<div>text in amp doc</div><div>highlighted text</div>');
-  });
-
-  it('initialize with visibility=prerender', () => {
-    // If visibility != visible, highlight texts and scroll to the start
-    // position of the animation. But do not trigger the animation.
-    const {ampdoc} = env;
-    const scrollStub = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'animateScrollIntoView');
-    scrollStub.returns(Promise.reject());
-    const sendMsgStub = sandbox.stub(
-        Services.viewerForDoc(ampdoc), 'sendMessage');
-    const setScrollTop = sandbox.stub(
-        Services.viewportForDoc(ampdoc), 'setScrollTop');
-    sandbox.stub(Services.viewerForDoc(ampdoc), 'getVisibilityState')
+          'ed text</div>'
+      );
+    });
+
+    it('initialize with amp-access', () => {
+      // Inject <script id="amp-access"> to emulate pages with <amp-access>.
+      const {document} = env.win;
+      const script = document.createElement('script');
+      script.id = 'amp-access';
+      document.body.appendChild(script);
+
+      const {ampdoc} = env;
+      const scrollStub = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'animateScrollIntoView'
+      );
+      scrollStub.returns(Promise.reject());
+      const sendMsgStub = sandbox.stub(
+        Services.viewerForDoc(ampdoc),
+        'sendMessage'
+      );
+
+      new HighlightHandler(ampdoc, {sentences: ['amp', 'highlight']});
+      docreadyCb();
+
+      expect(scrollStub).not.to.be.called;
+
+      // For some reason, expect(args).to.deep.equal does not work.
+      expect(sendMsgStub.callCount).to.equal(1);
+      expect(sendMsgStub.firstCall.args[0]).to.equal('highlightState');
+      expect(sendMsgStub.firstCall.args[1]).to.deep.equal({
+        state: 'has_amp_access',
+      });
+
+      expect(root.innerHTML).to.equal(
+        '<div>text in amp doc</div><div>highlighted text</div>'
+      );
+    });
+
+    it('initialize with visibility=prerender', () => {
+      // If visibility != visible, highlight texts and scroll to the start
+      // position of the animation. But do not trigger the animation.
+      const {ampdoc} = env;
+      const scrollStub = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'animateScrollIntoView'
+      );
+      scrollStub.returns(Promise.reject());
+      const sendMsgStub = sandbox.stub(
+        Services.viewerForDoc(ampdoc),
+        'sendMessage'
+      );
+      const setScrollTop = sandbox.stub(
+        Services.viewportForDoc(ampdoc),
+        'setScrollTop'
+      );
+      sandbox
+        .stub(Services.viewerForDoc(ampdoc), 'getVisibilityState')
         .returns(VisibilityState.PRERENDER);
 
-    new HighlightHandler(ampdoc,{sentences: ['amp', 'highlight']});
-    docreadyCb();
-
-    expect(setScrollTop).to.be.calledOnce;
-    expect(setScrollTop.firstCall.args.length).to.equal(1);
-    expect(scrollStub).not.to.be.called;
-    // For some reason, expect(args).to.deep.equal does not work.
-    expect(sendMsgStub.callCount).to.equal(1);
-    expect(sendMsgStub.firstCall.args[1]).to.deep.equal(
-        {state: 'found', scroll: 0});
-
-    expect(root.innerHTML).to.have.string('highlight</span>ed');
-  });
-
-  it('calcTopToCenterHighlightedNodes_ center elements', () => {
-    const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
-    docreadyCb();
-    expect(handler.highlightedNodes_).not.to.be.null;
-
-    const viewport = Services.viewportForDoc(env.ampdoc);
-    sandbox.stub(viewport, 'getLayoutRect').returns(
-        layoutRectLtwh(0, 500, 100, 50));
-    sandbox.stub(viewport, 'getHeight').returns(300);
-    sandbox.stub(viewport, 'getPaddingTop').returns(50);
-
-    // 525px (The center of the element) - 0.5 * 250px (window height)
-    // - 50px (padding top) = 350px.
-    expect(handler.calcTopToCenterHighlightedNodes_()).to.equal(350);
-  });
-
-  it('calcTopToCenterHighlightedNodes_ too tall element', () => {
-    const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
-    docreadyCb();
-    expect(handler.highlightedNodes_).not.to.be.null;
-
-    const viewport = Services.viewportForDoc(env.ampdoc);
-    sandbox.stub(viewport, 'getLayoutRect').returns(
-        layoutRectLtwh(0, 500, 100, 500));
-    sandbox.stub(viewport, 'getHeight').returns(300);
-    sandbox.stub(viewport, 'getPaddingTop').returns(50);
-
-    // Scroll to the top of the element with PAGE_TOP_MARGIN margin
-    // because it's too tall.
-    // 500px (The top of the element) - 50px (padding top)
-    // - 80px (PAGE_TOP_MARGIN) = 370px.
-    expect(handler.calcTopToCenterHighlightedNodes_()).to.equal(370);
-  });
-
-  it('mayAdjustTop_', () => {
-    const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
-    docreadyCb();
-    expect(handler.highlightedNodes_).not.to.be.null;
-
-    // Set up an environment where calcTopToCenterHighlightedNodes_
-    // returns 350.
-    const viewport = Services.viewportForDoc(env.ampdoc);
-    sandbox.stub(viewport, 'getLayoutRect').returns(
-        layoutRectLtwh(0, 500, 100, 50));
-    sandbox.stub(viewport, 'getHeight').returns(300);
-    sandbox.stub(viewport, 'getPaddingTop').returns(50);
-    // The current top is 500.
-    sandbox.stub(viewport, 'getScrollTop').returns(500);
-
-    const setScrollTopStub = sandbox.stub(viewport, 'setScrollTop');
-
-    const param = handler.mayAdjustTop_(400);
-    expect(param).to.deep.equal({'nd': 150, 'od': 100});
-    expect(setScrollTopStub).to.be.calledOnce;
-    expect(setScrollTopStub.firstCall.args[0]).to.equal(350);
-  });
-});
+      new HighlightHandler(ampdoc, {sentences: ['amp', 'highlight']});
+      docreadyCb();
+
+      expect(setScrollTop).to.be.calledOnce;
+      expect(setScrollTop.firstCall.args.length).to.equal(1);
+      expect(scrollStub).not.to.be.called;
+      // For some reason, expect(args).to.deep.equal does not work.
+      expect(sendMsgStub.callCount).to.equal(1);
+      expect(sendMsgStub.firstCall.args[1]).to.deep.equal({
+        state: 'found',
+        scroll: 0,
+      });
+
+      expect(root.innerHTML).to.have.string('highlight</span>ed');
+    });
+
+    it('calcTopToCenterHighlightedNodes_ center elements', () => {
+      const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
+      docreadyCb();
+      expect(handler.highlightedNodes_).not.to.be.null;
+
+      const viewport = Services.viewportForDoc(env.ampdoc);
+      sandbox
+        .stub(viewport, 'getLayoutRect')
+        .returns(layoutRectLtwh(0, 500, 100, 50));
+      sandbox.stub(viewport, 'getHeight').returns(300);
+      sandbox.stub(viewport, 'getPaddingTop').returns(50);
+
+      // 525px (The center of the element) - 0.5 * 250px (window height)
+      // - 50px (padding top) = 350px.
+      expect(handler.calcTopToCenterHighlightedNodes_()).to.equal(350);
+    });
+
+    it('calcTopToCenterHighlightedNodes_ too tall element', () => {
+      const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
+      docreadyCb();
+      expect(handler.highlightedNodes_).not.to.be.null;
+
+      const viewport = Services.viewportForDoc(env.ampdoc);
+      sandbox
+        .stub(viewport, 'getLayoutRect')
+        .returns(layoutRectLtwh(0, 500, 100, 500));
+      sandbox.stub(viewport, 'getHeight').returns(300);
+      sandbox.stub(viewport, 'getPaddingTop').returns(50);
+
+      // Scroll to the top of the element with PAGE_TOP_MARGIN margin
+      // because it's too tall.
+      // 500px (The top of the element) - 50px (padding top)
+      // - 80px (PAGE_TOP_MARGIN) = 370px.
+      expect(handler.calcTopToCenterHighlightedNodes_()).to.equal(370);
+    });
+
+    it('mayAdjustTop_', () => {
+      const handler = new HighlightHandler(env.ampdoc, {sentences: ['amp']});
+      docreadyCb();
+      expect(handler.highlightedNodes_).not.to.be.null;
+
+      // Set up an environment where calcTopToCenterHighlightedNodes_
+      // returns 350.
+      const viewport = Services.viewportForDoc(env.ampdoc);
+      sandbox
+        .stub(viewport, 'getLayoutRect')
+        .returns(layoutRectLtwh(0, 500, 100, 50));
+      sandbox.stub(viewport, 'getHeight').returns(300);
+      sandbox.stub(viewport, 'getPaddingTop').returns(50);
+      // The current top is 500.
+      sandbox.stub(viewport, 'getScrollTop').returns(500);
+
+      const setScrollTopStub = sandbox.stub(viewport, 'setScrollTop');
+
+      const param = handler.mayAdjustTop_(400);
+      expect(param).to.deep.equal({'nd': 150, 'od': 100});
+      expect(setScrollTopStub).to.be.calledOnce;
+      expect(setScrollTopStub.firstCall.args[0]).to.equal(350);
+    });
+  }
+);
diff --git a/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js b/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
index 98b768c2730c..de5f0f36d590 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-keyboard-handler.js
@@ -44,38 +44,55 @@ describes.realWin('KeyboardHandler', {}, env => {
   beforeEach(() => {
     messages = [];
     new KeyboardHandler(
+      env.win,
+      new Messaging(
         env.win,
-        new Messaging(
-            env.win, new WindowPortEmulator(env.win, 'origin doesnt matter')));
+        new WindowPortEmulator(env.win, 'origin doesnt matter')
+      )
+    );
   });
 
   ['keydown', 'keypress', 'keydown'].forEach(eventType => {
     describe(`for ${eventType} events`, () => {
       describe('when event targeted on window', () => {
         it('forwards ESC events', () => {
-          env.win.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          env.win.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('forwards non-ESC events', () => {
-          env.win.dispatchEvent(new KeyboardEvent(eventType, {
-            bubbles: true,
-            key: Keys.LEFT_ARROW,
-            keyCode: KeyCodes.LEFT_ARROW,
-          }));
+          env.win.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.LEFT_ARROW,
+              keyCode: KeyCodes.LEFT_ARROW,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.LEFT_ARROW,
+                KeyCodes.LEFT_ARROW
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -95,29 +112,43 @@ describes.realWin('KeyboardHandler', {}, env => {
 
       describe('when event targeted on document', () => {
         it('forwards ESC events', () => {
-          env.win.document.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          env.win.document.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('forwards non-ESC events', () => {
-          env.win.document.dispatchEvent(new KeyboardEvent(eventType, {
-            bubbles: true,
-            key: Keys.LEFT_ARROW,
-            keyCode: KeyCodes.LEFT_ARROW,
-          }));
+          env.win.document.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.LEFT_ARROW,
+              keyCode: KeyCodes.LEFT_ARROW,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.LEFT_ARROW,
+                KeyCodes.LEFT_ARROW
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -137,30 +168,43 @@ describes.realWin('KeyboardHandler', {}, env => {
 
       describe('when event targeted on <html>', () => {
         it('forwards ESC events', () => {
-          env.win.document.documentElement.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          env.win.document.documentElement.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('forwards non-ESC events', () => {
           env.win.document.documentElement.dispatchEvent(
-              new KeyboardEvent(eventType, {
-                bubbles: true,
-                key: Keys.LEFT_ARROW,
-                keyCode: KeyCodes.LEFT_ARROW,
-              }));
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.LEFT_ARROW,
+              keyCode: KeyCodes.LEFT_ARROW,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.LEFT_ARROW,
+                KeyCodes.LEFT_ARROW
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -180,29 +224,43 @@ describes.realWin('KeyboardHandler', {}, env => {
 
       describe('when event targeted on <body>', () => {
         it('forwards ESC events', () => {
-          env.win.document.body.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          env.win.document.body.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('forwards non-ESC events', () => {
-          env.win.document.body.dispatchEvent(new KeyboardEvent(eventType, {
-            bubbles: true,
-            key: Keys.LEFT_ARROW,
-            keyCode: KeyCodes.LEFT_ARROW,
-          }));
+          env.win.document.body.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.LEFT_ARROW,
+              keyCode: KeyCodes.LEFT_ARROW,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.LEFT_ARROW,
+                KeyCodes.LEFT_ARROW
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -230,29 +288,43 @@ describes.realWin('KeyboardHandler', {}, env => {
         });
 
         it('forwards ESC events', () => {
-          checkbox.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          checkbox.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('forwards non-ESC non-space events', () => {
-          checkbox.dispatchEvent(new KeyboardEvent(eventType, {
-            bubbles: true,
-            key: Keys.LEFT_ARROW,
-            keyCode: KeyCodes.LEFT_ARROW,
-          }));
+          checkbox.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.LEFT_ARROW,
+              keyCode: KeyCodes.LEFT_ARROW,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.LEFT_ARROW,
+                KeyCodes.LEFT_ARROW
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -270,9 +342,13 @@ describes.realWin('KeyboardHandler', {}, env => {
         });
 
         it('does not forward space events', () => {
-          checkbox.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.SPACE, keyCode: KeyCodes.SPACE}));
+          checkbox.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.SPACE,
+              keyCode: KeyCodes.SPACE,
+            })
+          );
 
           expect(messages).to.be.empty;
         });
@@ -288,15 +364,23 @@ describes.realWin('KeyboardHandler', {}, env => {
           });
 
           it('forwards ESC events', () => {
-            node.dispatchEvent(new KeyboardEvent(
-                eventType,
-                {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
-
-            expect(messages).to.have.deep.members([{
-              name: eventType,
-              data: createKeyboardEventInitWithKeyCode(
-                  Keys.ESCAPE, KeyCodes.ESCAPE),
-            }]);
+            node.dispatchEvent(
+              new KeyboardEvent(eventType, {
+                bubbles: true,
+                key: Keys.ESCAPE,
+                keyCode: KeyCodes.ESCAPE,
+              })
+            );
+
+            expect(messages).to.have.deep.members([
+              {
+                name: eventType,
+                data: createKeyboardEventInitWithKeyCode(
+                  Keys.ESCAPE,
+                  KeyCodes.ESCAPE
+                ),
+              },
+            ]);
           });
 
           it('does not forward events with default prevented', () => {
@@ -314,9 +398,13 @@ describes.realWin('KeyboardHandler', {}, env => {
           });
 
           it('does not forward non-ESC events', () => {
-            node.dispatchEvent(new KeyboardEvent(
-                eventType,
-                {bubbles: true, key: Keys.SPACE, keyCode: KeyCodes.SPACE}));
+            node.dispatchEvent(
+              new KeyboardEvent(eventType, {
+                bubbles: true,
+                key: Keys.SPACE,
+                keyCode: KeyCodes.SPACE,
+              })
+            );
 
             expect(messages).to.be.empty;
           });
@@ -333,15 +421,23 @@ describes.realWin('KeyboardHandler', {}, env => {
         });
 
         it('forwards ESC events', () => {
-          element.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.ESCAPE, keyCode: KeyCodes.ESCAPE}));
+          element.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.ESCAPE,
+              keyCode: KeyCodes.ESCAPE,
+            })
+          );
 
-          expect(messages).to.have.deep.members([{
-            name: eventType,
-            data: createKeyboardEventInitWithKeyCode(
-                Keys.ESCAPE, KeyCodes.ESCAPE),
-          }]);
+          expect(messages).to.have.deep.members([
+            {
+              name: eventType,
+              data: createKeyboardEventInitWithKeyCode(
+                Keys.ESCAPE,
+                KeyCodes.ESCAPE
+              ),
+            },
+          ]);
         });
 
         it('does not forward events with default prevented', () => {
@@ -359,70 +455,64 @@ describes.realWin('KeyboardHandler', {}, env => {
         });
 
         it('does not forward non-ESC events', () => {
-          element.dispatchEvent(new KeyboardEvent(
-              eventType,
-              {bubbles: true, key: Keys.SPACE, keyCode: KeyCodes.SPACE}));
+          element.dispatchEvent(
+            new KeyboardEvent(eventType, {
+              bubbles: true,
+              key: Keys.SPACE,
+              keyCode: KeyCodes.SPACE,
+            })
+          );
 
           expect(messages).to.be.empty;
         });
       });
 
-
       it('forwards multiple events', () => {
         env.win.document.documentElement.dispatchEvent(
-            new KeyboardEvent(eventType, {
-              bubbles: true,
-              key: Keys.LEFT_ARROW,
-              keyCode: KeyCodes.LEFT_ARROW,
-            }));
-        env.win.document.body.dispatchEvent(new KeyboardEvent(eventType, {
-          bubbles: true,
-          key: Keys.RIGHT_ARROW,
-          keyCode: KeyCodes.RIGHT_ARROW,
-        }));
+          new KeyboardEvent(eventType, {
+            bubbles: true,
+            key: Keys.LEFT_ARROW,
+            keyCode: KeyCodes.LEFT_ARROW,
+          })
+        );
+        env.win.document.body.dispatchEvent(
+          new KeyboardEvent(eventType, {
+            bubbles: true,
+            key: Keys.RIGHT_ARROW,
+            keyCode: KeyCodes.RIGHT_ARROW,
+          })
+        );
 
         expect(messages).to.have.deep.members([
           {
             name: eventType,
             data: createKeyboardEventInitWithKeyCode(
-                Keys.LEFT_ARROW, KeyCodes.LEFT_ARROW),
+              Keys.LEFT_ARROW,
+              KeyCodes.LEFT_ARROW
+            ),
           },
           {
             name: eventType,
             data: createKeyboardEventInitWithKeyCode(
-                Keys.RIGHT_ARROW, KeyCodes.RIGHT_ARROW),
+              Keys.RIGHT_ARROW,
+              KeyCodes.RIGHT_ARROW
+            ),
           },
         ]);
       });
 
       it('filters event properties', () => {
-        env.win.document.body.dispatchEvent(new KeyboardEvent(eventType, {
-          altKey: true,
-          bubbles: true,
-          cancelBubble: false,
-          cancelable: false,
-          charCode: 1,
-          code: 'KeyE',
-          isComposing: true,
-          ctrlKey: true,
-          detail: 1,
-          key: 'e',
-          keyCode: 69,
-          location: 3,
-          metaKey: true,
-          repeat: true,
-          shiftKey: true,
-          which: 69,
-        }));
-
-        expect(messages).to.have.deep.members([{
-          name: eventType,
-          data: {
+        env.win.document.body.dispatchEvent(
+          new KeyboardEvent(eventType, {
             altKey: true,
+            bubbles: true,
+            cancelBubble: false,
+            cancelable: false,
             charCode: 1,
             code: 'KeyE',
             isComposing: true,
             ctrlKey: true,
+            detail: 1,
             key: 'e',
             keyCode: 69,
             location: 3,
@@ -430,8 +520,28 @@ describes.realWin('KeyboardHandler', {}, env => {
             repeat: true,
             shiftKey: true,
             which: 69,
+          })
+        );
+
+        expect(messages).to.have.deep.members([
+          {
+            name: eventType,
+            data: {
+              altKey: true,
+              charCode: 1,
+              code: 'KeyE',
+              isComposing: true,
+              ctrlKey: true,
+              key: 'e',
+              keyCode: 69,
+              location: 3,
+              metaKey: true,
+              repeat: true,
+              shiftKey: true,
+              which: 69,
+            },
           },
-        }]);
+        ]);
       });
     });
   });
@@ -458,19 +568,20 @@ function createKeyboardEventInitWithKeyCode(key, keyCode) {
  */
 function createKeyboardEventInit(overrideKeyboardEventInit) {
   return Object.assign(
-      {
-        key: '',
-        code: '',
-        location: 0,
-        ctrlKey: false,
-        shiftKey: false,
-        altKey: false,
-        metaKey: false,
-        repeat: false,
-        isComposing: false,
-        charCode: 0,
-        keyCode: 0,
-        which: 0,
-      },
-      overrideKeyboardEventInit);
+    {
+      key: '',
+      code: '',
+      location: 0,
+      ctrlKey: false,
+      shiftKey: false,
+      altKey: false,
+      metaKey: false,
+      repeat: false,
+      isComposing: false,
+      charCode: 0,
+      keyCode: 0,
+      which: 0,
+    },
+    overrideKeyboardEventInit
+  );
 }
diff --git a/extensions/amp-viewer-integration/0.1/test/test-touch-handler.js b/extensions/amp-viewer-integration/0.1/test/test-touch-handler.js
index 66c476586f7a..5bef2c6d52ac 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-touch-handler.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-touch-handler.js
@@ -23,18 +23,24 @@ function fakeTouchEvent(type) {
     'pageX': 10,
     'pageY': 20,
     'thisshouldnotgetcopied': 'bla',
-    touches:
-    [{'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20,
-      'dontcopythis': 234}],
-    changedTouches:
-        [{'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20}],
+    touches: [
+      {
+        'clientX': 20,
+        'clientY': 30,
+        'screenX': 10,
+        'screenY': 20,
+        'dontcopythis': 234,
+      },
+    ],
+    changedTouches: [
+      {'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20},
+    ],
     preventDefault() {},
   };
 }
 
 describes.fakeWin('TouchHandler', {}, env => {
   describe('TouchHandler Unit Tests', function() {
-
     class WindowPortEmulator {
       constructor(win, origin) {
         /** @const {!Window} */
@@ -81,8 +87,10 @@ describes.fakeWin('TouchHandler', {}, env => {
         unlistenCount++;
       };
       sandbox = sinon.sandbox;
-      const port =
-        new WindowPortEmulator(this.messageHandlers_, 'origin doesnt matter');
+      const port = new WindowPortEmulator(
+        this.messageHandlers_,
+        'origin doesnt matter'
+      );
       messaging = new Messaging(win, port);
       touchHandler = new TouchHandler(win, messaging);
     });
@@ -117,7 +125,7 @@ describes.fakeWin('TouchHandler', {}, env => {
       expect(messages).to.have.length(1);
       expect(preventDefaultStub).to.not.have.been.called;
 
-      touchHandler.scrollLockHandler_('some type', /*lock*/true, false);
+      touchHandler.scrollLockHandler_('some type', /*lock*/ true, false);
       expect(unlistenCount).to.equal(3);
       expect(listeners).to.have.length(6);
       expect(listeners[4].options.passive).to.be.false;
@@ -126,7 +134,7 @@ describes.fakeWin('TouchHandler', {}, env => {
       expect(messages).to.have.length(2);
       expect(preventDefaultStub).to.have.been.called;
 
-      touchHandler.scrollLockHandler_('some type', /*lock*/false, false);
+      touchHandler.scrollLockHandler_('some type', /*lock*/ false, false);
       expect(unlistenCount).to.equal(6);
       expect(listeners).to.have.length(9);
       expect(listeners[7].options.passive).to.be.true;
@@ -140,10 +148,10 @@ describes.fakeWin('TouchHandler', {}, env => {
         'pageX': 10,
         'pageY': 20,
         'type': eventType,
-        touches:
-            [{'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20}],
-        changedTouches:
-            [{'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20}],
+        touches: [{'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20}],
+        changedTouches: [
+          {'clientX': 20, 'clientY': 30, 'screenX': 10, 'screenY': 20},
+        ],
       });
     });
   });
diff --git a/extensions/amp-viewer-integration/0.1/test/test-variable-service.js b/extensions/amp-viewer-integration/0.1/test/test-variable-service.js
index fa0a54404fb4..bfc3bd5dfc52 100644
--- a/extensions/amp-viewer-integration/0.1/test/test-variable-service.js
+++ b/extensions/amp-viewer-integration/0.1/test/test-variable-service.js
@@ -15,7 +15,6 @@
  */
 import {AmpViewerIntegrationVariableService} from '../variable-service';
 
-
 describes.fakeWin('amp-viewer-integration variable service', {}, () => {
   let variableService;
 
@@ -33,7 +32,8 @@ describes.fakeWin('amp-viewer-integration variable service', {}, () => {
 
   it('should return the first ancestorOrigin', () => {
     expect(variableService.get()['ancestorOrigin']()).to.equal(
-        'http://margarine-paradise.com');
+      'http://margarine-paradise.com'
+    );
   });
 
   it('should return the fragment param', () => {
diff --git a/extensions/amp-viewer-integration/0.1/touch-handler.js b/extensions/amp-viewer-integration/0.1/touch-handler.js
index 70b17853d8c4..217eac6f54bd 100644
--- a/extensions/amp-viewer-integration/0.1/touch-handler.js
+++ b/extensions/amp-viewer-integration/0.1/touch-handler.js
@@ -14,19 +14,30 @@
  * limitations under the License.
  */
 
-
 import {dict} from '../../../src/utils/object';
 import {listen} from '../../../src/event-helper';
 
-
 /**
  * The list of touch event properites to copy.
  * @const {!Array<string>}
  */
 const EVENT_PROPERTIES = [
-  'altKey', 'charCode', 'ctrlKey', 'detail', 'eventPhase', 'key',
-  'layerX', 'layerY', 'metaKey', 'pageX', 'pageY', 'returnValue',
-  'shiftKey', 'timeStamp', 'type', 'which',
+  'altKey',
+  'charCode',
+  'ctrlKey',
+  'detail',
+  'eventPhase',
+  'key',
+  'layerX',
+  'layerY',
+  'metaKey',
+  'pageX',
+  'pageY',
+  'returnValue',
+  'shiftKey',
+  'timeStamp',
+  'type',
+  'which',
 ];
 
 /**
@@ -34,8 +45,16 @@ const EVENT_PROPERTIES = [
  * @const {!Array<string>}
  */
 const TOUCH_PROPERTIES = [
-  'clientX', 'clientY', 'force', 'identifier', 'pageX', 'pageY', 'radiusX',
-  'radiusY', 'screenX', 'screenY',
+  'clientX',
+  'clientY',
+  'force',
+  'identifier',
+  'pageX',
+  'pageY',
+  'radiusX',
+  'radiusY',
+  'screenX',
+  'screenY',
 ];
 
 /**
@@ -47,7 +66,6 @@ const SCROLL_LOCK = 'scrollLock';
  * Forward touch events from the AMP doc to the viewer.
  */
 export class TouchHandler {
-
   /**
    * @param {!Window} win
    * @param {!./messaging/messaging.Messaging} messaging
@@ -85,9 +103,10 @@ export class TouchHandler {
       passive: !this.scrollLocked_,
     };
     this.unlistenHandlers_.push(
-        listen(doc, 'touchstart', handleEvent, options),
-        listen(doc, 'touchend', handleEvent, options),
-        listen(doc, 'touchmove', handleEvent, options));
+      listen(doc, 'touchstart', handleEvent, options),
+      listen(doc, 'touchend', handleEvent, options),
+      listen(doc, 'touchmove', handleEvent, options)
+    );
   }
 
   /**
@@ -128,7 +147,6 @@ export class TouchHandler {
     }
   }
 
-
   /**
    * Makes a partial copy of the event.
    * @param {!Event} e The event object to be copied.
@@ -136,8 +154,7 @@ export class TouchHandler {
    * @private
    */
   copyTouchEvent_(e) {
-    const copiedEvent =
-        this.copyProperties_(e, EVENT_PROPERTIES);
+    const copiedEvent = this.copyProperties_(e, EVENT_PROPERTIES);
     if (e.touches) {
       copiedEvent['touches'] = this.copyTouches_(e.touches);
     }
@@ -147,7 +164,6 @@ export class TouchHandler {
     return copiedEvent;
   }
 
-
   /**
    * Copies an array of touches.
    * @param {!Array<!Object>} touchList
diff --git a/extensions/amp-viewer-integration/0.1/variable-service.js b/extensions/amp-viewer-integration/0.1/variable-service.js
index ac34b28705d4..84cd88400ce4 100644
--- a/extensions/amp-viewer-integration/0.1/variable-service.js
+++ b/extensions/amp-viewer-integration/0.1/variable-service.js
@@ -27,7 +27,6 @@ export let ViewerIntegrationVariableDef;
  * Used for URL replacement service. See usage in src/url-replacements-impl.
  */
 export class AmpViewerIntegrationVariableService {
-
   /**
    * @param {!../../../src/service/ampdoc-impl.AmpDoc} ampdoc
    */
@@ -38,15 +37,14 @@ export class AmpViewerIntegrationVariableService {
     /** @private @const {!ViewerIntegrationVariableDef} */
     this.variables_ = {
       ancestorOrigin: (unusedParam, unusedDefaultValue) => {
-	      return this.getAncestorOrigin_();
+        return this.getAncestorOrigin_();
       },
       fragmentParam: (param, defaultValue) => {
-	      return this.getFragmentParamData_(param, defaultValue);
+        return this.getFragmentParamData_(param, defaultValue);
       },
     };
   }
 
-
   /**
    * Return the FRAGMENT_PARAM from the original location href
    * @param {*} param
@@ -55,13 +53,15 @@ export class AmpViewerIntegrationVariableService {
    * @private
    */
   getFragmentParamData_(param, defaultValue) {
-    userAssert(param,
-        'The first argument to FRAGMENT_PARAM, the fragment string ' +
-        'param is required');
+    userAssert(
+      param,
+      'The first argument to FRAGMENT_PARAM, the fragment string ' +
+        'param is required'
+    );
     userAssert(typeof param == 'string', 'param should be a string');
     const hash = this.ampdoc_.win.location.originalHash;
     const params = parseQueryString(hash);
-    return (params[param] === undefined) ? defaultValue : params[param];
+    return params[param] === undefined ? defaultValue : params[param];
   }
 
   /**
diff --git a/extensions/amp-viewer-integration/0.1/viewer-for-testing.js b/extensions/amp-viewer-integration/0.1/viewer-for-testing.js
index 00076aeca2f2..b29fbcfbb113 100644
--- a/extensions/amp-viewer-integration/0.1/viewer-for-testing.js
+++ b/extensions/amp-viewer-integration/0.1/viewer-for-testing.js
@@ -78,8 +78,8 @@ export class ViewerForTesting {
     const params = {
       history: 1,
       viewportType: this.viewportType_,
-      width: this.containerEl./*OK*/offsetWidth,
-      height: this.containerEl./*OK*/offsetHeight,
+      width: this.containerEl./*OK*/ offsetWidth,
+      height: this.containerEl./*OK*/ offsetHeight,
       visibilityState: this.visibilityState_,
       prerenderSize: 1,
       origin: parseUrlDeprecated(window.location.href).origin,
@@ -100,38 +100,43 @@ export class ViewerForTesting {
 
     // Listening for messages, hoping that I get a request for a handshake and
     // a notification that a document was loaded.
-    window.addEventListener('message', e => {
-      this.log('message received', e, e.data);
-      const target = this.iframe.contentWindow;
-      const targetOrigin = this.frameOrigin_;
-      // IMPORTANT: There could be many windows with the same origin!
-      // IMPORTANT: Event.source might not be available in all browsers!?
-      if (e.origin != targetOrigin ||
+    window.addEventListener(
+      'message',
+      e => {
+        this.log('message received', e, e.data);
+        const target = this.iframe.contentWindow;
+        const targetOrigin = this.frameOrigin_;
+        // IMPORTANT: There could be many windows with the same origin!
+        // IMPORTANT: Event.source might not be available in all browsers!?
+        if (
+          e.origin != targetOrigin ||
           e.source != target ||
-          e.data.app != APP) {
-        this.log('This message is not for us: ', e);
-        return;
-      }
-      if (e.data.name == 'channelOpen' &&
-          this.handshakeReceivedResolve_) {
-        // Send handshake confirmation.
-        const message = {
-          app: APP,
-          requestid: e.data.requestid,
-          data: {},
-          type: 's',
-        };
-        target./*OK*/postMessage(message, targetOrigin);
-
-        this.log('handshake request received!');
-        this.handshakeReceivedResolve_();
-        this.handshakeReceivedResolve_ = null;
-      }
-      if (e.data.name == 'documentLoaded') {
-        this.log('documentLoaded!');
-        this.documentLoadedResolve_();
-      }
-    }, false);
+          e.data.app != APP
+        ) {
+          this.log('This message is not for us: ', e);
+          return;
+        }
+        if (e.data.name == 'channelOpen' && this.handshakeReceivedResolve_) {
+          // Send handshake confirmation.
+          const message = {
+            app: APP,
+            requestid: e.data.requestid,
+            data: {},
+            type: 's',
+          };
+          target./*OK*/ postMessage(message, targetOrigin);
+
+          this.log('handshake request received!');
+          this.handshakeReceivedResolve_();
+          this.handshakeReceivedResolve_ = null;
+        }
+        if (e.data.name == 'documentLoaded') {
+          this.log('documentLoaded!');
+          this.documentLoadedResolve_();
+        }
+      },
+      false
+    );
 
     this.containerEl.appendChild(this.iframe);
 
@@ -143,8 +148,10 @@ export class ViewerForTesting {
    * well.
    */
   confirmHandshake() {
-    this.iframe.contentWindow./*OK*/postMessage(
-        'amp-handshake-response', this.frameOrigin_);
+    this.iframe.contentWindow./*OK*/ postMessage(
+      'amp-handshake-response',
+      this.frameOrigin_
+    );
   }
 
   /**
@@ -165,8 +172,7 @@ export class ViewerForTesting {
   /**
    * This is only used for a unit test.
    */
-  setMessageDeliverer() {
-  }
+  setMessageDeliverer() {}
 
   /**
    * Fake docs for testing
@@ -174,6 +180,7 @@ export class ViewerForTesting {
   log() {
     const var_args = Array.prototype.slice.call(arguments, 0);
     var_args.unshift('[VIEWER]');
-    console/*OK*/.log.apply(console, var_args);
+    console /*OK*/.log
+      .apply(console, var_args);
   }
 }
diff --git a/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js b/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
index 2fd8f4bd90c4..9ca7edc36cfa 100644
--- a/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
+++ b/extensions/amp-viewer-integration/0.1/viewer-initiated-handshake-viewer-for-testing.js
@@ -82,8 +82,8 @@ export class WebviewViewerForTesting {
     const params = {
       history: 1,
       viewportType: this.viewportType_,
-      width: this.containerEl./*OK*/offsetWidth,
-      height: this.containerEl./*OK*/offsetHeight,
+      width: this.containerEl./*OK*/ offsetWidth,
+      height: this.containerEl./*OK*/ offsetHeight,
       visibilityState: this.visibilityState_,
       prerenderSize: 1,
       origin: parseUrlDeprecated(window.location.href).origin,
@@ -101,8 +101,10 @@ export class WebviewViewerForTesting {
     this.iframe.setAttribute('src', url);
     this.frameOrigin_ = parsedUrl.origin;
 
-    this.pollingIntervalIds_[this.intervalCtr] =
-        setInterval(this.pollAMPDoc_.bind(this, this.intervalCtr) , 1000);
+    this.pollingIntervalIds_[this.intervalCtr] = setInterval(
+      this.pollAMPDoc_.bind(this, this.intervalCtr),
+      1000
+    );
 
     this.intervalCtr++;
 
@@ -134,7 +136,7 @@ export class WebviewViewerForTesting {
       app: APP,
       name: 'handshake-poll',
     };
-    this.iframe.contentWindow./*OK*/postMessage(message, this.frameOrigin_);
+    this.iframe.contentWindow./*OK*/ postMessage(message, this.frameOrigin_);
   }
 
   /**
@@ -142,8 +144,9 @@ export class WebviewViewerForTesting {
    * @param {*} e
    */
   isChannelOpen_(e) {
-    return e.type == 'message' && e.data.app == APP &&
-      e.data.name == 'channelOpen';
+    return (
+      e.type == 'message' && e.data.app == APP && e.data.name == 'channelOpen'
+    );
   }
 
   /**
@@ -160,7 +163,7 @@ export class WebviewViewerForTesting {
 
     this.log('############## viewer posting1 Message', message);
 
-    this.iframe.contentWindow./*OK*/postMessage(message, this.frameOrigin_);
+    this.iframe.contentWindow./*OK*/ postMessage(message, this.frameOrigin_);
 
     this.sendRequest_('visibilitychange', {
       state: this.visibilityState_,
@@ -185,7 +188,7 @@ export class WebviewViewerForTesting {
       data: payload,
       type: MessageType.REQUEST,
     };
-    this.iframe.contentWindow./*OK*/postMessage(message, this.frameOrigin_);
+    this.iframe.contentWindow./*OK*/ postMessage(message, this.frameOrigin_);
   }
 
   /**
@@ -222,6 +225,7 @@ export class WebviewViewerForTesting {
    */
   log() {
     const var_args = Array.prototype.slice.call(arguments, 0);
-    console/*OK*/.log.apply(console, var_args);
+    console /*OK*/.log
+      .apply(console, var_args);
   }
 }
diff --git a/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js b/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
index 41e97bbcc7c5..7debcc5e27d6 100644
--- a/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
+++ b/extensions/amp-viewer-integration/0.1/webview-viewer-for-testing.js
@@ -91,8 +91,8 @@ export class WebviewViewerForTesting {
     const params = {
       history: 1,
       viewportType: this.viewportType_,
-      width: this.containerEl./*OK*/offsetWidth,
-      height: this.containerEl./*OK*/offsetHeight,
+      width: this.containerEl./*OK*/ offsetWidth,
+      height: this.containerEl./*OK*/ offsetHeight,
       visibilityState: this.visibilityState_,
       prerenderSize: 1,
       origin: parseUrlDeprecated(window.location.href).origin,
@@ -110,8 +110,10 @@ export class WebviewViewerForTesting {
     const url = parsedUrl.href;
     this.iframe.setAttribute('src', url);
 
-    this.pollingIntervalIds_[this.intervalCtr] =
-        setInterval(this.pollAMPDoc_.bind(this, this.intervalCtr) , 1000);
+    this.pollingIntervalIds_[this.intervalCtr] = setInterval(
+      this.pollAMPDoc_.bind(this, this.intervalCtr),
+      1000
+    );
     this.intervalCtr++;
 
     this.containerEl.appendChild(this.iframe);
@@ -128,8 +130,11 @@ export class WebviewViewerForTesting {
         app: APP,
         name: 'handshake-poll',
       };
-      this.iframe.contentWindow./*OK*/postMessage(
-          JSON.stringify(message), '*', [channel.port2]);
+      this.iframe.contentWindow./*OK*/ postMessage(
+        JSON.stringify(message),
+        '*',
+        [channel.port2]
+      );
       channel.port1.onmessage = function(e) {
         if (this.isChannelOpen_(e)) {
           window.clearInterval(this.pollingIntervalIds_[intervalCtr]);
@@ -147,8 +152,7 @@ export class WebviewViewerForTesting {
    */
   isChannelOpen_(e) {
     const data = JSON.parse(e.data);
-    return e.type == 'message' && data.app == APP &&
-      data.name == 'channelOpen';
+    return e.type == 'message' && data.app == APP && data.name == 'channelOpen';
   }
 
   /**
@@ -164,7 +168,7 @@ export class WebviewViewerForTesting {
       type: MessageType.RESPONSE,
     };
     this.log('############## viewer posting1 Message', message);
-    channel.port1./*OK*/postMessage(JSON.stringify(message));
+    channel.port1./*OK*/ postMessage(JSON.stringify(message));
 
     class WindowPortEmulator {
       /**
@@ -193,26 +197,32 @@ export class WebviewViewerForTesting {
        */
       postMessage(data) {
         this.log_('############## viewer posting2 Message', data);
-        channel.port1./*OK*/postMessage(JSON.stringify(data));
+        channel.port1./*OK*/ postMessage(JSON.stringify(data));
       }
       /**
        * Fake docs for testing
        */
       start() {}
     }
-    this.messaging_ = new Messaging(this.win,
-        new WindowPortEmulator(this.messageHandlers_, this.id, this.log));
+    this.messaging_ = new Messaging(
+      this.win,
+      new WindowPortEmulator(this.messageHandlers_, this.id, this.log)
+    );
 
     this.messaging_.setDefaultHandler((type, payload, awaitResponse) => {
-      console/*OK*/.log(
-          'viewer receiving message: ', type, payload, awaitResponse);
+      console /*OK*/
+        .log('viewer receiving message: ', type, payload, awaitResponse);
       return Promise.resolve();
     });
 
-    this.sendRequest_('visibilitychange', {
-      state: this.visibilityState_,
-      prerenderSize: this.prerenderSize,
-    }, true);
+    this.sendRequest_(
+      'visibilitychange',
+      {
+        state: this.visibilityState_,
+        prerenderSize: this.prerenderSize,
+      },
+      true
+    );
 
     this.handshakeResponseResolve_();
   }
@@ -286,6 +296,7 @@ export class WebviewViewerForTesting {
    */
   log() {
     const var_args = Array.prototype.slice.call(arguments, 0);
-    console/*OK*/.log.apply(console, var_args);
+    console /*OK*/.log
+      .apply(console, var_args);
   }
 }
diff --git a/extensions/amp-vimeo/0.1/amp-vimeo.js b/extensions/amp-vimeo/0.1/amp-vimeo.js
index c044f1c4b4cf..1c25fd6f2cc6 100644
--- a/extensions/amp-vimeo/0.1/amp-vimeo.js
+++ b/extensions/amp-vimeo/0.1/amp-vimeo.js
@@ -28,18 +28,14 @@ import {
 import {dict} from '../../../src/utils/object';
 import {getData, listen} from '../../../src/event-helper';
 import {getMode} from '../../../src/mode';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {once} from '../../../src/utils/function';
 import {removeElement} from '../../../src/dom';
 import {userAssert} from '../../../src/log';
 
-
 const TAG = 'amp-vimeo';
 
-
 /**
  * Get the name of the method for a given getter or setter.
  * See https://developer.vimeo.com/player/js-api
@@ -51,11 +47,11 @@ function getMethodName(prop, optType = null) {
   if (!optType) {
     return prop;
   }
-  return optType.toLowerCase() + prop.substr(0, 1).toUpperCase() +
-    prop.substr(1);
+  return (
+    optType.toLowerCase() + prop.substr(0, 1).toUpperCase() + prop.substr(1)
+  );
 }
 
-
 /**
  * Maps events coming from the Vimeo frame to events to be dispatched from the
  * component element.
@@ -72,10 +68,8 @@ const VIMEO_EVENTS = {
   'volumechange': null,
 };
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpVimeo extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -124,8 +118,7 @@ class AmpVimeo extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    return this.isAutoplay_().then(isAutoplay =>
-      this.buildIframe_(isAutoplay));
+    return this.isAutoplay_().then(isAutoplay => this.buildIframe_(isAutoplay));
   }
 
   /**
@@ -136,9 +129,10 @@ class AmpVimeo extends AMP.BaseElement {
   buildIframe_(isAutoplay) {
     const {element} = this;
     const vidId = userAssert(
-        element.getAttribute('data-videoid'),
-        'The data-videoid attribute is required for <amp-vimeo> %s',
-        element);
+      element.getAttribute('data-videoid'),
+      'The data-videoid attribute is required for <amp-vimeo> %s',
+      element
+    );
 
     // See
     // https://developer.vimeo.com/player/embedding
@@ -209,8 +203,13 @@ class AmpVimeo extends AMP.BaseElement {
    * @private
    */
   onMessage_(event) {
-    if (!originMatches(event, this.iframe_,
-        /^(https?:)?\/\/((player|www).)?vimeo.com(?=$|\/)/)) {
+    if (
+      !originMatches(
+        event,
+        this.iframe_,
+        /^(https?:)?\/\/((player|www).)?vimeo.com(?=$|\/)/
+      )
+    ) {
       return;
     }
 
@@ -362,10 +361,15 @@ class AmpVimeo extends AMP.BaseElement {
     if (!contentWindow) {
       return;
     }
-    contentWindow./*OK*/postMessage(JSON.stringify(dict({
-      'method': method,
-      'value': optParams || '',
-    })), '*');
+    contentWindow./*OK*/ postMessage(
+      JSON.stringify(
+        dict({
+          'method': method,
+          'value': optParams || '',
+        })
+      ),
+      '*'
+    );
   }
 
   /** @override */
@@ -374,7 +378,6 @@ class AmpVimeo extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpVimeo);
 });
diff --git a/extensions/amp-vimeo/0.1/test/test-amp-vimeo.js b/extensions/amp-vimeo/0.1/test/test-amp-vimeo.js
index 22e2a86eb784..3bd89fbf7179 100644
--- a/extensions/amp-vimeo/0.1/test/test-amp-vimeo.js
+++ b/extensions/amp-vimeo/0.1/test/test-amp-vimeo.js
@@ -16,53 +16,57 @@
 
 import '../amp-vimeo';
 
-
-describes.realWin('amp-vimeo', {
-  amp: {
-    extensions: ['amp-vimeo'],
+describes.realWin(
+  'amp-vimeo',
+  {
+    amp: {
+      extensions: ['amp-vimeo'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getVimeo(videoId, opt_responsive) {
-    const vimeo = doc.createElement('amp-vimeo');
-    vimeo.setAttribute('data-videoid', videoId);
-    vimeo.setAttribute('width', '111');
-    vimeo.setAttribute('height', '222');
-    if (opt_responsive) {
-      vimeo.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(vimeo);
-    return vimeo.build()
+    function getVimeo(videoId, opt_responsive) {
+      const vimeo = doc.createElement('amp-vimeo');
+      vimeo.setAttribute('data-videoid', videoId);
+      vimeo.setAttribute('width', '111');
+      vimeo.setAttribute('height', '222');
+      if (opt_responsive) {
+        vimeo.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(vimeo);
+      return vimeo
+        .build()
         .then(() => vimeo.layoutCallback())
         .then(() => vimeo);
-  }
+    }
 
-  it('renders', () => {
-    return getVimeo('123').then(vimeo => {
-      const iframe = vimeo.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(
-          'https://player.vimeo.com/video/123');
+    it('renders', () => {
+      return getVimeo('123').then(vimeo => {
+        const iframe = vimeo.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal('https://player.vimeo.com/video/123');
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getVimeo('234', true).then(vimeo => {
-      const iframe = vimeo.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getVimeo('234', true).then(vimeo => {
+        const iframe = vimeo.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-videoid', () => {
-    return getVimeo('').should.eventually.be.rejectedWith(
-        /The data-videoid attribute is required for/);
-  });
-});
+    it('requires data-videoid', () => {
+      return getVimeo('').should.eventually.be.rejectedWith(
+        /The data-videoid attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-vine/0.1/amp-vine.js b/extensions/amp-vine/0.1/amp-vine.js
index bd903036270b..ea8c374d0eca 100644
--- a/extensions/amp-vine/0.1/amp-vine.js
+++ b/extensions/amp-vine/0.1/amp-vine.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2015 The AMP HTML Authors. All Rights Reserved.
  *
@@ -19,7 +18,6 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {userAssert} from '../../../src/log';
 
 class AmpVine extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -45,14 +43,16 @@ class AmpVine extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-    const vineid = userAssert(this.element.getAttribute('data-vineid'),
-        'The data-vineid attribute is required for <amp-vine> %s',
-        this.element);
+    const vineid = userAssert(
+      this.element.getAttribute('data-vineid'),
+      'The data-vineid attribute is required for <amp-vine> %s',
+      this.element
+    );
 
     const iframe = this.element.ownerDocument.createElement('iframe');
     iframe.setAttribute('frameborder', '0');
-    iframe.src = 'https://vine.co/v/' +
-      encodeURIComponent(vineid) + '/embed/simple';
+    iframe.src =
+      'https://vine.co/v/' + encodeURIComponent(vineid) + '/embed/simple';
 
     this.applyFillContent(iframe);
     this.element.appendChild(iframe);
@@ -65,12 +65,11 @@ class AmpVine extends AMP.BaseElement {
   /** @override */
   pauseCallback() {
     if (this.iframe_ && this.iframe_.contentWindow) {
-      this.iframe_.contentWindow./*OK*/postMessage('pause', '*');
+      this.iframe_.contentWindow./*OK*/ postMessage('pause', '*');
     }
   }
 }
 
-
 AMP.extension('amp-vine', '0.1', AMP => {
   AMP.registerElement('amp-vine', AmpVine);
 });
diff --git a/extensions/amp-vine/0.1/test/test-amp-vine.js b/extensions/amp-vine/0.1/test/test-amp-vine.js
index a26a9e4327a5..87a95ba2ac82 100644
--- a/extensions/amp-vine/0.1/test/test-amp-vine.js
+++ b/extensions/amp-vine/0.1/test/test-amp-vine.js
@@ -16,50 +16,59 @@
 
 import '../amp-vine';
 
-
-describes.realWin('amp-vine', {
-  amp: {
-    extensions: ['amp-vine'],
+describes.realWin(
+  'amp-vine',
+  {
+    amp: {
+      extensions: ['amp-vine'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getVine(vineId, opt_responsive) {
-    const vine = doc.createElement('amp-vine');
-    vine.setAttribute('data-vineid', vineId);
-    vine.setAttribute('width', 400);
-    vine.setAttribute('height', 400);
-    if (opt_responsive) {
-      vine.setAttribute('layout', 'responsive');
+    function getVine(vineId, opt_responsive) {
+      const vine = doc.createElement('amp-vine');
+      vine.setAttribute('data-vineid', vineId);
+      vine.setAttribute('width', 400);
+      vine.setAttribute('height', 400);
+      if (opt_responsive) {
+        vine.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(vine);
+      return vine
+        .build()
+        .then(() => vine.layoutCallback())
+        .then(() => vine);
     }
-    doc.body.appendChild(vine);
-    return vine.build().then(() => vine.layoutCallback()).then(() => vine);
-  }
 
-  it('renders', () => {
-    return getVine('MdKjXez002d').then(vine => {
-      const iframe = vine.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal('https://vine.co/v/MdKjXez002d/embed/simple');
+    it('renders', () => {
+      return getVine('MdKjXez002d').then(vine => {
+        const iframe = vine.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://vine.co/v/MdKjXez002d/embed/simple'
+        );
+      });
     });
-  });
 
-  it('renders responsively', () => {
-    return getVine('MdKjXez002d', true).then(vine => {
-      const iframe = vine.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('renders responsively', () => {
+      return getVine('MdKjXez002d', true).then(vine => {
+        const iframe = vine.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('requires data-vineid', () => {
-    return getVine('').should.eventually.be.rejectedWith(
-        /The data-vineid attribute is required for/);
-  });
-});
+    it('requires data-vineid', () => {
+      return getVine('').should.eventually.be.rejectedWith(
+        /The data-vineid attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
index d08daf7b7852..da7d429b6e29 100644
--- a/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
+++ b/extensions/amp-viqeo-player/0.1/amp-viqeo-player.js
@@ -29,9 +29,7 @@ import {
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
 import {getIframe} from '../../../src/3p-frame';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 
 const TAG = 'amp-viqeo-player';
 
@@ -39,7 +37,6 @@ const TAG = 'amp-viqeo-player';
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpViqeoPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -89,16 +86,17 @@ class AmpViqeoPlayer extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-
     this.videoId_ = userAssert(
-        this.element.getAttribute('data-videoid'),
-        'The data-videoid attribute is required for <amp-viqeo-player> %s',
-        this.element);
+      this.element.getAttribute('data-videoid'),
+      'The data-videoid attribute is required for <amp-viqeo-player> %s',
+      this.element
+    );
 
     userAssert(
-        this.element.getAttribute('data-profileid'),
-        'The data-profileid attribute is required for <amp-viqeo-player> %s',
-        this.element);
+      this.element.getAttribute('data-profileid'),
+      'The data-profileid attribute is required for <amp-viqeo-player> %s',
+      this.element
+    );
 
     this.hasAutoplay_ = this.element.hasAttribute(VideoAttributes.AUTOPLAY);
 
@@ -112,25 +110,25 @@ class AmpViqeoPlayer extends AMP.BaseElement {
 
   /** @override */
   layoutCallback() {
-
     const iframe = getIframe(
-        this.win,
-        this.element,
-        'viqeoplayer',
-        {
-          'autoplay': this.hasAutoplay_,
-        },
-        {
-          allowFullscreen: true,
-        });
+      this.win,
+      this.element,
+      'viqeoplayer',
+      {
+        'autoplay': this.hasAutoplay_,
+      },
+      {
+        allowFullscreen: true,
+      }
+    );
 
     // required to display the user gesture in the iframe
     iframe.setAttribute('allow', 'autoplay');
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleViqeoMessages_.bind(this)
+      this.win,
+      'message',
+      this.handleViqeoMessages_.bind(this)
     );
 
     return this.mutateElement(() => {
@@ -149,9 +147,11 @@ class AmpViqeoPlayer extends AMP.BaseElement {
    * */
   handleViqeoMessages_(event) {
     const eventData = getData(event);
-    if (!eventData ||
-        event.source !== (this.iframe_ && this.iframe_.contentWindow) ||
-        eventData['source'] !== 'ViqeoPlayer') {
+    if (
+      !eventData ||
+      event.source !== (this.iframe_ && this.iframe_.contentWindow) ||
+      eventData['source'] !== 'ViqeoPlayer'
+    ) {
       return;
     }
 
@@ -198,14 +198,17 @@ class AmpViqeoPlayer extends AMP.BaseElement {
     const placeholder = this.element.ownerDocument.createElement('amp-img');
     this.propagateAttributes(['aria-label'], placeholder);
     if (placeholder.hasAttribute('aria-label')) {
-      placeholder.setAttribute('alt',
-          'Loading video - ' + placeholder.getAttribute('aria-label')
+      placeholder.setAttribute(
+        'alt',
+        'Loading video - ' + placeholder.getAttribute('aria-label')
       );
     } else {
       placeholder.setAttribute('alt', 'Loading video');
     }
-    placeholder.setAttribute('src',
-        `https://cdn.viqeo.tv/preview/${encodeURIComponent(this.videoId_)}.jpg`);
+    placeholder.setAttribute(
+      'src',
+      `https://cdn.viqeo.tv/preview/${encodeURIComponent(this.videoId_)}.jpg`
+    );
     placeholder.setAttribute('layout', 'fill');
     placeholder.setAttribute('placeholder', '');
     placeholder.setAttribute('referrerpolicy', 'origin');
@@ -337,7 +340,7 @@ class AmpViqeoPlayer extends AMP.BaseElement {
         action: command,
       });
     }
-    contentWindow./*OK*/postMessage(command, '*');
+    contentWindow./*OK*/ postMessage(command, '*');
   }
 
   /** @override */
diff --git a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
index 7f61bf1230b5..f368800350fb 100644
--- a/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
+++ b/extensions/amp-viqeo-player/0.1/test/test-amp-viqeo-player.js
@@ -18,135 +18,160 @@ import {PlayingStates} from '../../../../src/video-interface';
 import {Services} from '../../../../src/services';
 import AmpViqeoPlayer from '../amp-viqeo-player';
 
-describes.realWin('amp-viqeo-player', {
-  amp: {
-    extensions: ['amp-viqeo-player'],
+describes.realWin(
+  'amp-viqeo-player',
+  {
+    amp: {
+      extensions: ['amp-viqeo-player'],
+    },
+    allowExternalResources: true,
   },
-  allowExternalResources: true,
-}, function(env) {
-  this.timeout(4000);
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
-
-  it.skip('test-get-data', () => {
-    return getViqeo().then(p => {
-      const {viqeoElement, entry, viqeo} = p;
-      expect(entry.video.element).to.equal(viqeoElement);
-      expect(entry.video instanceof AmpViqeoPlayer).to.equal(true);
-      expect(entry.video).to.equal(viqeo);
-      expect(viqeo instanceof AmpViqeoPlayer).to.equal(true);
-    });
-  });
-
-  describe('test-requires-attributes', () => {
-    it('requires data-videoid', () => {
-      const error = /The data-videoid attribute is required for/;
-      expectAsyncConsoleError(error);
-      return getViqeo({viqeoId: null}).should.eventually.be.rejectedWith(error);
-    });
+  function(env) {
+    this.timeout(4000);
+    let win, doc;
 
-    it('requires data-profileid', () => {
-      const error = /The data-profileid attribute is required for/;
-      expectAsyncConsoleError(error);
-      return getViqeo({viqeoProfileId: null}).should.eventually.be
-          .rejectedWith(error);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
     });
-  });
 
-  describe.skip('test-playing-actions', () => {
-    it('renders responsively', () => {
+    it.skip('test-get-data', () => {
       return getViqeo().then(p => {
-        const iframe = p.viqeoElement.querySelector('iframe');
-        expect(iframe).to.not.be.null;
-        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+        const {viqeoElement, entry, viqeo} = p;
+        expect(entry.video.element).to.equal(viqeoElement);
+        expect(entry.video instanceof AmpViqeoPlayer).to.equal(true);
+        expect(entry.video).to.equal(viqeo);
+        expect(viqeo instanceof AmpViqeoPlayer).to.equal(true);
       });
     });
 
-    it('should propagate autoplay to ad iframe', () => {
-      return getViqeo({opt_params: {autoplay: ''}}).then(p => {
-        const iframe = p.viqeoElement.querySelector('iframe');
-        const data = JSON.parse(iframe.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        expect(data._context.autoplay).to.equal(true);
+    describe('test-requires-attributes', () => {
+      it('requires data-videoid', () => {
+        const error = /The data-videoid attribute is required for/;
+        expectAsyncConsoleError(error);
+        return getViqeo({viqeoId: null}).should.eventually.be.rejectedWith(
+          error
+        );
       });
-    });
 
-    it('should propagate autoplay=false ' +
-      'if element has not autoplay attribute to ad iframe', () => {
-      return getViqeo().then(p => {
-        const iframe = p.viqeoElement.querySelector('iframe');
-        const data = JSON.parse(iframe.name).attributes;
-        expect(data).to.be.ok;
-        expect(data._context).to.be.ok;
-        return expect(data._context.autoplay).to.equal(false);
+      it('requires data-profileid', () => {
+        const error = /The data-profileid attribute is required for/;
+        expectAsyncConsoleError(error);
+        return getViqeo({
+          viqeoProfileId: null,
+        }).should.eventually.be.rejectedWith(error);
       });
     });
 
-    it('should paused without autoplay', () => {
-      return getViqeo().then(p => {
-        const curState = p.videoManager.getPlayingState(p.viqeo);
-        return expect(curState).to.equal(PlayingStates.PAUSED);
+    describe.skip('test-playing-actions', () => {
+      it('renders responsively', () => {
+        return getViqeo().then(p => {
+          const iframe = p.viqeoElement.querySelector('iframe');
+          expect(iframe).to.not.be.null;
+          expect(iframe.className).to.match(/i-amphtml-fill-content/);
+        });
       });
-    });
 
-  });
+      it('should propagate autoplay to ad iframe', () => {
+        return getViqeo({opt_params: {autoplay: ''}}).then(p => {
+          const iframe = p.viqeoElement.querySelector('iframe');
+          const data = JSON.parse(iframe.name).attributes;
+          expect(data).to.be.ok;
+          expect(data._context).to.be.ok;
+          expect(data._context.autoplay).to.equal(true);
+        });
+      });
 
-  describe('createPlaceholderCallback', () => {
-    it('should create a placeholder image', () => {
-      return getViqeo().then(p => {
-        const img = p.viqeoElement.querySelector('amp-img');
-        expect(img).to.not.be.null;
-        expect(img.getAttribute('src')).to.equal(
-            'https://cdn.viqeo.tv/preview/922d04f30b66f1a32eb2.jpg');
-        expect(img.getAttribute('layout')).to.equal('fill');
-        expect(img.hasAttribute('placeholder')).to.be.true;
-        expect(img.getAttribute('referrerpolicy')).to.equal('origin');
-        expect(img.getAttribute('alt')).to.equal('Loading video');
+      it(
+        'should propagate autoplay=false ' +
+          'if element has not autoplay attribute to ad iframe',
+        () => {
+          return getViqeo().then(p => {
+            const iframe = p.viqeoElement.querySelector('iframe');
+            const data = JSON.parse(iframe.name).attributes;
+            expect(data).to.be.ok;
+            expect(data._context).to.be.ok;
+            return expect(data._context.autoplay).to.equal(false);
+          });
+        }
+      );
+
+      it('should paused without autoplay', () => {
+        return getViqeo().then(p => {
+          const curState = p.videoManager.getPlayingState(p.viqeo);
+          return expect(curState).to.equal(PlayingStates.PAUSED);
+        });
       });
     });
-  });
 
-  function getViqeo(params) {
-    const {id, viqeoProfileId, viqeoId, width, height, opt_params} =
-      Object.assign({
-        id: 'myVideo',
-        viqeoProfileId: 184,
-        viqeoId: '922d04f30b66f1a32eb2',
-        width: 320,
-        height: 180,
-        opt_params: {},
-      }, params);
-
-    const viqeoElement = doc.createElement('amp-viqeo-player');
-
-    id && viqeoElement.setAttribute('id', id);
-    viqeoProfileId
-      && viqeoElement.setAttribute('data-profileid', viqeoProfileId);
-
-    viqeoId && viqeoElement.setAttribute('data-videoid', viqeoId);
-
-    width && viqeoElement.setAttribute('width', width);
-    height && viqeoElement.setAttribute('height', height);
-
-    opt_params && Object.keys(opt_params).forEach(key => {
-      viqeoElement.setAttribute(key, opt_params[key]);
+    describe('createPlaceholderCallback', () => {
+      it('should create a placeholder image', () => {
+        return getViqeo().then(p => {
+          const img = p.viqeoElement.querySelector('amp-img');
+          expect(img).to.not.be.null;
+          expect(img.getAttribute('src')).to.equal(
+            'https://cdn.viqeo.tv/preview/922d04f30b66f1a32eb2.jpg'
+          );
+          expect(img.getAttribute('layout')).to.equal('fill');
+          expect(img.hasAttribute('placeholder')).to.be.true;
+          expect(img.getAttribute('referrerpolicy')).to.equal('origin');
+          expect(img.getAttribute('alt')).to.equal('Loading video');
+        });
+      });
     });
 
-    doc.body.appendChild(viqeoElement);
-    return viqeoElement.build()
-        .then(() => { viqeoElement.layoutCallback.bind(viqeoElement); })
+    function getViqeo(params) {
+      const {
+        id,
+        viqeoProfileId,
+        viqeoId,
+        width,
+        height,
+        opt_params,
+      } = Object.assign(
+        {
+          id: 'myVideo',
+          viqeoProfileId: 184,
+          viqeoId: '922d04f30b66f1a32eb2',
+          width: 320,
+          height: 180,
+          opt_params: {},
+        },
+        params
+      );
+
+      const viqeoElement = doc.createElement('amp-viqeo-player');
+
+      id && viqeoElement.setAttribute('id', id);
+      viqeoProfileId &&
+        viqeoElement.setAttribute('data-profileid', viqeoProfileId);
+
+      viqeoId && viqeoElement.setAttribute('data-videoid', viqeoId);
+
+      width && viqeoElement.setAttribute('width', width);
+      height && viqeoElement.setAttribute('height', height);
+
+      opt_params &&
+        Object.keys(opt_params).forEach(key => {
+          viqeoElement.setAttribute(key, opt_params[key]);
+        });
+
+      doc.body.appendChild(viqeoElement);
+      return viqeoElement
+        .build()
+        .then(() => {
+          viqeoElement.layoutCallback.bind(viqeoElement);
+        })
         .then(() => {
-          const videoManager =
-            Services.videoManagerForDoc(doc);
+          const videoManager = Services.videoManagerForDoc(doc);
           const entry = videoManager.getEntryForElement_(viqeoElement);
-          return Promise.resolve(
-              {viqeoElement, videoManager, entry, viqeo: entry.video}
-          );
+          return Promise.resolve({
+            viqeoElement,
+            videoManager,
+            entry,
+            viqeo: entry.video,
+          });
         });
+    }
   }
-});
+);
diff --git a/extensions/amp-viz-vega/0.1/amp-viz-vega.js b/extensions/amp-viz-vega/0.1/amp-viz-vega.js
index b9ba804fd4f9..a26bfea06ae7 100644
--- a/extensions/amp-viz-vega/0.1/amp-viz-vega.js
+++ b/extensions/amp-viz-vega/0.1/amp-viz-vega.js
@@ -26,7 +26,6 @@ import {isLayoutSizeDefined} from '../../../src/layout';
 import {tryParseJson} from '../../../src/json';
 
 export class AmpVizVega extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -72,8 +71,10 @@ export class AmpVizVega extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(isExperimentOn(this.win, 'amp-viz-vega'),
-        'Experiment amp-viz-vega disabled');
+    userAssert(
+      isExperimentOn(this.win, 'amp-viz-vega'),
+      'Experiment amp-viz-vega disabled'
+    );
 
     /**
      * Global vg (and implicitly d3) are required and they are created by
@@ -85,16 +86,20 @@ export class AmpVizVega extends AMP.BaseElement {
     this.useDataWidth_ = this.element.hasAttribute('use-data-width');
     this.useDataHeight_ = this.element.hasAttribute('use-data-height');
 
-    userAssert(this.inlineData_ || this.src_,
-        '%s: neither `src` attribute nor a ' +
+    userAssert(
+      this.inlineData_ || this.src_,
+      '%s: neither `src` attribute nor a ' +
         'valid <script type="application/json"> child was found for Vega data.',
-        this.getName_());
+      this.getName_()
+    );
 
-    userAssert(!(this.inlineData_ && this.src_),
-        '%s: both `src` attribute and a valid ' +
+    userAssert(
+      !(this.inlineData_ && this.src_),
+      '%s: both `src` attribute and a valid ' +
         '<script type="application/json"> child were found for Vega data. ' +
         'Only one way of specifying the data is allowed.',
-        this.getName_());
+      this.getName_()
+    );
 
     if (this.src_) {
       assertHttpsUrl(this.src_, this.element, this.getName_());
@@ -110,8 +115,10 @@ export class AmpVizVega extends AMP.BaseElement {
   /** @override */
   onLayoutMeasure() {
     const box = this.getLayoutBox();
-    if (this.measuredWidth_ == box.width &&
-        this.measuredHeight_ == box.height) {
+    if (
+      this.measuredWidth_ == box.width &&
+      this.measuredHeight_ == box.height
+    ) {
       return;
     }
     this.measuredWidth_ = box.width;
@@ -142,11 +149,16 @@ export class AmpVizVega extends AMP.BaseElement {
     devAssert(!this.src_ != !this.inlineData_);
 
     if (this.inlineData_) {
-      this.data_ = /** @type {JsonObject} */ (
-        tryParseJson(this.inlineData_, err => {
-          userAssert(!err, 'data could not be ' +
-            'parsed. Is it in a valid JSON format?: %s', err);
-        }));
+      this.data_ = /** @type {JsonObject} */ (tryParseJson(
+        this.inlineData_,
+        err => {
+          userAssert(
+            !err,
+            'data could not be parsed. Is it in a valid JSON format?: %s',
+            err
+          );
+        }
+      ));
       return Promise.resolve();
     } else {
       // TODO(aghassemi): We may need to expose credentials and set
@@ -156,13 +168,14 @@ export class AmpVizVega extends AMP.BaseElement {
       // calls. We may want to intercept all "urls" in spec and do the loading
       // and parsing ourselves.
 
-      return Services.xhrFor(this.win).fetchJson(
-          dev().assertString(this.src_),
-          {
-            requireAmpResponseSourceOrigin: false,
-          }).then(res => res.json()).then(data => {
-        this.data_ = data;
-      });
+      return Services.xhrFor(this.win)
+        .fetchJson(dev().assertString(this.src_), {
+          requireAmpResponseSourceOrigin: false,
+        })
+        .then(res => res.json())
+        .then(data => {
+          this.data_ = data;
+        });
     }
   }
 
@@ -176,12 +189,18 @@ export class AmpVizVega extends AMP.BaseElement {
       return;
     }
 
-    userAssert(scripts.length == 1, '%s: more than one ' +
-        '<script> tags found. Only one allowed.', this.getName_());
+    userAssert(
+      scripts.length == 1,
+      '%s: more than one <script> tags found. Only one allowed.',
+      this.getName_()
+    );
 
     const child = scripts[0];
-    userAssert(dom.isJsonScriptTag(child), '%s: data should ' +
-        'be put in a <script type="application/json"> tag.', this.getName_());
+    userAssert(
+      dom.isJsonScriptTag(child),
+      '%s: data should be put in a <script type="application/json"> tag.',
+      this.getName_()
+    );
 
     return child.textContent;
   }
@@ -193,33 +212,36 @@ export class AmpVizVega extends AMP.BaseElement {
   renderGraph_() {
     const parsePromise = new Promise((resolve, reject) => {
       this.vega_.parse.spec(
-          /** @type {!JsonObject} */ (this.data_),
-          (error, chartFactory) => {
-            if (error) {
-              reject(error);
-            }
-            resolve(/** @type {!VegaChartFactory} */ (chartFactory));
-          });
+        /** @type {!JsonObject} */ (this.data_),
+        (error, chartFactory) => {
+          if (error) {
+            reject(error);
+          }
+          resolve(/** @type {!VegaChartFactory} */ (chartFactory));
+        }
+      );
     });
 
-    return parsePromise.then(/** @param {!VegaChartFactory} chartFactory */
-        chartFactory => {
-          return Services.vsyncFor(this.win).mutatePromise(() => {
-            dom.removeChildren(dev().assertElement(this.container_));
-            this.chart_ = chartFactory(dict({'el': this.container_}));
-            if (!this.useDataWidth_) {
-              const w = this.measuredWidth_ - this.getDataPadding_('width');
-              this.chart_.width(w);
-            }
-            if (!this.useDataHeight_) {
-              const h = this.measuredHeight_ - this.getDataPadding_('height');
-              this.chart_.height(h);
-            }
-
-            this.chart_.viewport([this.measuredWidth_, this.measuredHeight_]);
-            this.chart_.update();
-          });
+    return parsePromise.then(
+      /** @param {!VegaChartFactory} chartFactory */
+      chartFactory => {
+        return Services.vsyncFor(this.win).mutatePromise(() => {
+          dom.removeChildren(dev().assertElement(this.container_));
+          this.chart_ = chartFactory(dict({'el': this.container_}));
+          if (!this.useDataWidth_) {
+            const w = this.measuredWidth_ - this.getDataPadding_('width');
+            this.chart_.width(w);
+          }
+          if (!this.useDataHeight_) {
+            const h = this.measuredHeight_ - this.getDataPadding_('height');
+            this.chart_.height(h);
+          }
+
+          this.chart_.viewport([this.measuredWidth_, this.measuredHeight_]);
+          this.chart_.update();
         });
+      }
+    );
   }
 
   /**
@@ -252,12 +274,12 @@ export class AmpVizVega extends AMP.BaseElement {
    * @private
    */
   getName_() {
-    return 'amp-viz-vega ' +
-      (this.element.getAttribute('id') || '<unknown id>');
+    return (
+      'amp-viz-vega ' + (this.element.getAttribute('id') || '<unknown id>')
+    );
   }
 }
 
-
 AMP.extension('amp-viz-vega', '0.1', AMP => {
   AMP.registerElement('amp-viz-vega', AmpVizVega, CSS);
 });
diff --git a/extensions/amp-vk/0.1/amp-vk.js b/extensions/amp-vk/0.1/amp-vk.js
index 43947617480d..3d48e8eb54db 100644
--- a/extensions/amp-vk/0.1/amp-vk.js
+++ b/extensions/amp-vk/0.1/amp-vk.js
@@ -22,7 +22,6 @@ const EmbedType = {
   POLL: 'poll',
 };
 
-
 import {Layout} from '../../../src/layout';
 import {Services} from '../../../src/services';
 import {addParamsToUrl, appendEncodedParamStringToUrl} from '../../../src/url';
@@ -32,7 +31,6 @@ import {removeElement} from '../../../src/dom';
 import {user, userAssert} from '../../../src/log';
 
 export class AmpVk extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -98,26 +96,28 @@ export class AmpVk extends AMP.BaseElement {
    * @private
    */
   getVkPostIFrameSrc_() {
-    return Services.viewerForDoc(this.element).getReferrerUrl().then(ref => {
-      const startWidth = this.element./*OK*/offsetWidth;
-      const pageUrl = this.getAmpDoc().getUrl();
-      const iframeUrl = 'https://vk.com/widget_post.php';
-      const queryParams = dict({
-        'app': '0',
-        'width': '100%',
-        '_ver': '1',
-        'owner_id': this.ownerId_,
-        'post_id': this.postId_,
-        'hash': this.hash_,
-        'amp': '1',
-        'startWidth': startWidth,
-        'url': pageUrl,
-        'referrer': ref,
-        'title': 'AMP Post',
+    return Services.viewerForDoc(this.element)
+      .getReferrerUrl()
+      .then(ref => {
+        const startWidth = this.element./*OK*/ offsetWidth;
+        const pageUrl = this.getAmpDoc().getUrl();
+        const iframeUrl = 'https://vk.com/widget_post.php';
+        const queryParams = dict({
+          'app': '0',
+          'width': '100%',
+          '_ver': '1',
+          'owner_id': this.ownerId_,
+          'post_id': this.postId_,
+          'hash': this.hash_,
+          'amp': '1',
+          'startWidth': startWidth,
+          'url': pageUrl,
+          'referrer': ref,
+          'title': 'AMP Post',
+        });
+
+        return addParamsToUrl(iframeUrl, queryParams);
       });
-
-      return addParamsToUrl(iframeUrl, queryParams);
-    });
   }
 
   /**
@@ -125,30 +125,34 @@ export class AmpVk extends AMP.BaseElement {
    * @private
    */
   getVkPollIFrameSrc_() {
-    return Services.viewerForDoc(this.element).getReferrerUrl().then(ref => {
-      const pageUrl = this.getAmpDoc().getUrl();
-      const iframeUrl = 'https://vk.com/al_widget_poll.php';
-      const queryParams = dict({
-        'app': this.apiId_,
-        'width': '100%',
-        '_ver': '1',
-        'poll_id': this.pollId_,
-        'amp': '1',
-        'url': pageUrl,
-        'title': 'AMP Poll',
-        'description': '',
-        'referrer': ref,
+    return Services.viewerForDoc(this.element)
+      .getReferrerUrl()
+      .then(ref => {
+        const pageUrl = this.getAmpDoc().getUrl();
+        const iframeUrl = 'https://vk.com/al_widget_poll.php';
+        const queryParams = dict({
+          'app': this.apiId_,
+          'width': '100%',
+          '_ver': '1',
+          'poll_id': this.pollId_,
+          'amp': '1',
+          'url': pageUrl,
+          'title': 'AMP Poll',
+          'description': '',
+          'referrer': ref,
+        });
+
+        return addParamsToUrl(iframeUrl, queryParams);
       });
-
-      return addParamsToUrl(iframeUrl, queryParams);
-    });
   }
 
   /** @override */
   buildCallback() {
-    this.embedType_ = userAssert(this.element.getAttribute('data-embedtype'),
-        'The data-embedtype attribute is required for <amp-vk> %s',
-        this.element);
+    this.embedType_ = userAssert(
+      this.element.getAttribute('data-embedtype'),
+      'The data-embedtype attribute is required for <amp-vk> %s',
+      this.element
+    );
 
     user().assertEnumValue(EmbedType, this.embedType_, 'data-embedtype');
 
@@ -161,28 +165,38 @@ export class AmpVk extends AMP.BaseElement {
 
   /** @private */
   postBuildCallback_() {
-    this.ownerId_ = userAssert(this.element.getAttribute('data-owner-id'),
-        'The data-owner-id attribute is required for <amp-vk> Post %s',
-        this.element);
+    this.ownerId_ = userAssert(
+      this.element.getAttribute('data-owner-id'),
+      'The data-owner-id attribute is required for <amp-vk> Post %s',
+      this.element
+    );
 
-    this.postId_ = userAssert(this.element.getAttribute('data-post-id'),
-        'The data-post-id attribute is required for <amp-vk> Post %s',
-        this.element);
+    this.postId_ = userAssert(
+      this.element.getAttribute('data-post-id'),
+      'The data-post-id attribute is required for <amp-vk> Post %s',
+      this.element
+    );
 
-    this.hash_ = userAssert(this.element.getAttribute('data-hash'),
-        'The data-hash attribute is required for <amp-vk> Post %s',
-        this.element);
+    this.hash_ = userAssert(
+      this.element.getAttribute('data-hash'),
+      'The data-hash attribute is required for <amp-vk> Post %s',
+      this.element
+    );
   }
 
   /** @private */
   pollBuildCallback_() {
-    this.apiId_ = userAssert(this.element.getAttribute('data-api-id'),
-        'The data-api-id attribute is required for <amp-vk> Poll %s',
-        this.element);
+    this.apiId_ = userAssert(
+      this.element.getAttribute('data-api-id'),
+      'The data-api-id attribute is required for <amp-vk> Poll %s',
+      this.element
+    );
 
-    this.pollId_ = userAssert(this.element.getAttribute('data-poll-id'),
-        'The data-poll-id attribute is required for <amp-vk> Poll %s',
-        this.element);
+    this.pollId_ = userAssert(
+      this.element.getAttribute('data-poll-id'),
+      'The data-poll-id attribute is required for <amp-vk> Poll %s',
+      this.element
+    );
   }
 
   /** @override */
@@ -191,9 +205,9 @@ export class AmpVk extends AMP.BaseElement {
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleVkIframeMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleVkIframeMessage_.bind(this)
     );
 
     return this.getIFrameSrc_().then(src => {
@@ -215,8 +229,10 @@ export class AmpVk extends AMP.BaseElement {
    * @private
    */
   handleVkIframeMessage_(e) {
-    if (e.origin !== 'https://vk.com' ||
-        e.source !== this.iframe_.contentWindow) {
+    if (
+      e.origin !== 'https://vk.com' ||
+      e.source !== this.iframe_.contentWindow
+    ) {
       return;
     }
     const eventData = getData(e);
@@ -227,7 +243,7 @@ export class AmpVk extends AMP.BaseElement {
         const newHeight = parseInt(matches[1], 10);
         if (this.widgetHeight_ !== newHeight) {
           this.widgetHeight_ = newHeight;
-          this./*OK*/changeHeight(newHeight);
+          this./*OK*/ changeHeight(newHeight);
         }
       }
     }
@@ -235,9 +251,11 @@ export class AmpVk extends AMP.BaseElement {
 
   /** @override */
   isLayoutSupported(layout) {
-    return layout === Layout.RESPONSIVE ||
-        layout === Layout.FLEX_ITEM ||
-        layout === Layout.FIXED;
+    return (
+      layout === Layout.RESPONSIVE ||
+      layout === Layout.FLEX_ITEM ||
+      layout === Layout.FIXED
+    );
   }
 
   /** @override */
diff --git a/extensions/amp-vk/0.1/test/test-amp-vk.js b/extensions/amp-vk/0.1/test/test-amp-vk.js
index a22625729a68..487e84593f9f 100644
--- a/extensions/amp-vk/0.1/test/test-amp-vk.js
+++ b/extensions/amp-vk/0.1/test/test-amp-vk.js
@@ -31,204 +31,213 @@ import '../amp-vk';
 import {Layout} from '../../../../src/layout';
 import {Resource} from '../../../../src/service/resource';
 
-describes.realWin('amp-vk', {
-  amp: {
-    extensions: ['amp-vk'],
+describes.realWin(
+  'amp-vk',
+  {
+    amp: {
+      extensions: ['amp-vk'],
+    },
   },
-}, env => {
+  env => {
+    let win, doc;
 
-  let win, doc;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function createAmpVkElement(dataParams, layout) {
-    const element = doc.createElement('amp-vk');
+    function createAmpVkElement(dataParams, layout) {
+      const element = doc.createElement('amp-vk');
 
-    for (const param in dataParams) {
-      element.setAttribute(`data-${param}`, dataParams[param]);
-    }
+      for (const param in dataParams) {
+        element.setAttribute(`data-${param}`, dataParams[param]);
+      }
 
-    element.setAttribute('width', 500);
-    element.setAttribute('height', 300);
+      element.setAttribute('width', 500);
+      element.setAttribute('height', 300);
 
-    if (layout) {
-      element.setAttribute('layout', layout);
-    }
+      if (layout) {
+        element.setAttribute('layout', layout);
+      }
 
-    doc.body.appendChild(element);
+      doc.body.appendChild(element);
 
-    return element.build().then(() => {
-      const resource = Resource.forElement(element);
-      resource.measure();
-      return element.layoutCallback();
-    }).then(() => element);
-  }
+      return element
+        .build()
+        .then(() => {
+          const resource = Resource.forElement(element);
+          resource.measure();
+          return element.layoutCallback();
+        })
+        .then(() => element);
+    }
 
-  it('requires data-embedtype', () => {
-    const params = Object.assign({}, POST_PARAMS);
-    delete params['embedtype'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-embedtype attribute is required for/);
+    it('requires data-embedtype', () => {
+      const params = Object.assign({}, POST_PARAMS);
+      delete params['embedtype'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-embedtype attribute is required for/
+        );
+      });
     });
-  });
-
-  it('removes iframe after unlayoutCallback', () => {
-    return createAmpVkElement(POST_PARAMS).then(vkPost => {
-      const iframe = vkPost.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      const obj = vkPost.implementation_;
-      obj.unlayoutCallback();
-      expect(vkPost.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(obj.unlayoutOnPause()).to.be.true;
+
+    it('removes iframe after unlayoutCallback', () => {
+      return createAmpVkElement(POST_PARAMS).then(vkPost => {
+        const iframe = vkPost.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        const obj = vkPost.implementation_;
+        obj.unlayoutCallback();
+        expect(vkPost.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(obj.unlayoutOnPause()).to.be.true;
+      });
     });
-  });
 
-  // Post tests
+    // Post tests
 
-  it('post::requires data-hash', () => {
-    const params = Object.assign({}, POST_PARAMS);
-    delete params['hash'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-hash attribute is required for/);
+    it('post::requires data-hash', () => {
+      const params = Object.assign({}, POST_PARAMS);
+      delete params['hash'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-hash attribute is required for/
+        );
+      });
     });
-  });
-
-  it('post::requires data-owner-id', () => {
-    const params = Object.assign({}, POST_PARAMS);
-    delete params['owner-id'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-owner-id attribute is required for/);
+
+    it('post::requires data-owner-id', () => {
+      const params = Object.assign({}, POST_PARAMS);
+      delete params['owner-id'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-owner-id attribute is required for/
+        );
+      });
     });
-  });
-
-  it('post::requires data-post-id', () => {
-    const params = Object.assign({}, POST_PARAMS);
-    delete params['post-id'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-post-id attribute is required for/);
+
+    it('post::requires data-post-id', () => {
+      const params = Object.assign({}, POST_PARAMS);
+      delete params['post-id'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-post-id attribute is required for/
+        );
+      });
     });
-  });
 
-  it('post::renders iframe in amp-vk', () => {
-    return createAmpVkElement(POST_PARAMS).then(vkPost => {
-      const iframe = vkPost.querySelector('iframe');
-      expect(iframe).to.not.be.null;
+    it('post::renders iframe in amp-vk', () => {
+      return createAmpVkElement(POST_PARAMS).then(vkPost => {
+        const iframe = vkPost.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+      });
     });
-  });
 
-  it('post::renders responsively', () => {
-    return createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE).then(vkPost => {
-      const iframe = vkPost.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('post::renders responsively', () => {
+      return createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE).then(vkPost => {
+        const iframe = vkPost.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
-
-  it('post::sets correct src url to the vk iFrame', () => {
-    return createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE).then(vkPost => {
-      const impl = vkPost.implementation_;
-      const iframe = vkPost.querySelector('iframe');
-      const referrer = encodeURIComponent(vkPost.ownerDocument.referrer);
-      const url = encodeURIComponent(
+
+    it('post::sets correct src url to the vk iFrame', () => {
+      return createAmpVkElement(POST_PARAMS, Layout.RESPONSIVE).then(vkPost => {
+        const impl = vkPost.implementation_;
+        const iframe = vkPost.querySelector('iframe');
+        const referrer = encodeURIComponent(vkPost.ownerDocument.referrer);
+        const url = encodeURIComponent(
           vkPost.ownerDocument.location.href.replace(/#.*$/, '')
-      );
-      impl.onLayoutMeasure();
-      const startWidth = impl.getLayoutWidth();
-      const correctIFrameSrc = `https://vk.com/widget_post.php?app=0&width=100%25\
+        );
+        impl.onLayoutMeasure();
+        const startWidth = impl.getLayoutWidth();
+        const correctIFrameSrc = `https://vk.com/widget_post.php?app=0&width=100%25\
 &_ver=1&owner_id=1&post_id=45616&hash=Yc8_Z9pnpg8aKMZbVcD-jK45eAk&amp=1\
 &startWidth=${startWidth}&url=${url}&referrer=${referrer}&title=AMP%20Post`;
-      expect(iframe).to.not.be.null;
-      const timeArgPosition = iframe.src.lastIndexOf('&');
-      const iframeSrcWithoutTime = iframe.src.substr(0, timeArgPosition);
-      expect(iframeSrcWithoutTime).to.equal(correctIFrameSrc);
+        expect(iframe).to.not.be.null;
+        const timeArgPosition = iframe.src.lastIndexOf('&');
+        const iframeSrcWithoutTime = iframe.src.substr(0, timeArgPosition);
+        expect(iframeSrcWithoutTime).to.equal(correctIFrameSrc);
+      });
     });
-  });
 
-  // Poll tests
+    // Poll tests
 
-  it('poll::requires data-api-id', () => {
-    const params = Object.assign({}, POLL_PARAMS);
-    delete params['api-id'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-api-id attribute is required for/);
+    it('poll::requires data-api-id', () => {
+      const params = Object.assign({}, POLL_PARAMS);
+      delete params['api-id'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-api-id attribute is required for/
+        );
+      });
     });
-  });
-
-  it('poll::requires data-poll-id', () => {
-    const params = Object.assign({}, POLL_PARAMS);
-    delete params['poll-id'];
-    return allowConsoleError(() => {
-      return createAmpVkElement(params).should.eventually.be.rejectedWith(
-          /The data-poll-id attribute is required for/);
+
+    it('poll::requires data-poll-id', () => {
+      const params = Object.assign({}, POLL_PARAMS);
+      delete params['poll-id'];
+      return allowConsoleError(() => {
+        return createAmpVkElement(params).should.eventually.be.rejectedWith(
+          /The data-poll-id attribute is required for/
+        );
+      });
     });
-  });
 
-  it('poll::renders iframe in amp-vk', () => {
-    return createAmpVkElement(POLL_PARAMS).then(vkPoll => {
-      const iframe = vkPoll.querySelector('iframe');
-      expect(iframe).to.not.be.null;
+    it('poll::renders iframe in amp-vk', () => {
+      return createAmpVkElement(POLL_PARAMS).then(vkPoll => {
+        const iframe = vkPoll.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+      });
     });
-  });
 
-  it('poll::renders responsively', () => {
-    return createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE).then(vkPoll => {
-      const iframe = vkPoll.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.className).to.match(/i-amphtml-fill-content/);
+    it('poll::renders responsively', () => {
+      return createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE).then(vkPoll => {
+        const iframe = vkPoll.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.className).to.match(/i-amphtml-fill-content/);
+      });
     });
-  });
 
-  it('poll::sets correct src url to the vk iFrame', () => {
-    return createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE).then(vkPoll => {
-      const iframe = vkPoll.querySelector('iframe');
-      const referrer = encodeURIComponent(vkPoll.ownerDocument.referrer);
-      const url = encodeURIComponent(
+    it('poll::sets correct src url to the vk iFrame', () => {
+      return createAmpVkElement(POLL_PARAMS, Layout.RESPONSIVE).then(vkPoll => {
+        const iframe = vkPoll.querySelector('iframe');
+        const referrer = encodeURIComponent(vkPoll.ownerDocument.referrer);
+        const url = encodeURIComponent(
           vkPoll.ownerDocument.location.href.replace(/#.*$/, '')
-      );
-      const correctIFrameSrc = `https://vk.com/al_widget_poll.php?\
+        );
+        const correctIFrameSrc = `https://vk.com/al_widget_poll.php?\
 app=6183531&width=100%25&_ver=1&poll_id=274086843_1a2a465f60fff4699f&amp=1\
 &url=${url}&title=AMP%20Poll&description=&referrer=${referrer}`;
 
-      expect(iframe).to.not.be.null;
-      const timeArgPosition = iframe.src.lastIndexOf('&');
-      const iframeSrcWithoutTime = iframe.src.substr(0, timeArgPosition);
-      expect(iframeSrcWithoutTime).to.equal(correctIFrameSrc);
+        expect(iframe).to.not.be.null;
+        const timeArgPosition = iframe.src.lastIndexOf('&');
+        const iframeSrcWithoutTime = iframe.src.substr(0, timeArgPosition);
+        expect(iframeSrcWithoutTime).to.equal(correctIFrameSrc);
+      });
     });
-  });
 
-  it('both::resizes amp-vk element in response to postmessages', () => {
-    return createAmpVkElement(POLL_PARAMS).then(vkPoll => {
-      const impl = vkPoll.implementation_;
-      const iframe = vkPoll.querySelector('iframe');
-      const changeHeight = sandbox.spy(impl, 'changeHeight');
-      const fakeHeight = 555;
+    it('both::resizes amp-vk element in response to postmessages', () => {
+      return createAmpVkElement(POLL_PARAMS).then(vkPoll => {
+        const impl = vkPoll.implementation_;
+        const iframe = vkPoll.querySelector('iframe');
+        const changeHeight = sandbox.spy(impl, 'changeHeight');
+        const fakeHeight = 555;
 
-      expect(iframe).to.not.be.null;
+        expect(iframe).to.not.be.null;
 
-      generatePostMessage(vkPoll, iframe, fakeHeight);
+        generatePostMessage(vkPoll, iframe, fakeHeight);
 
-      expect(changeHeight).to.be.calledOnce;
-      expect(changeHeight.firstCall.args[0]).to.equal(fakeHeight);
-    });
-  });
-
-  function generatePostMessage(ins, iframe, height) {
-    ins.implementation_.handleVkIframeMessage_({
-      origin: 'https://vk.com',
-      source: iframe.contentWindow,
-      data: JSON.stringify([
-        'resize',
-        [height],
-      ]),
+        expect(changeHeight).to.be.calledOnce;
+        expect(changeHeight.firstCall.args[0]).to.equal(fakeHeight);
+      });
     });
+
+    function generatePostMessage(ins, iframe, height) {
+      ins.implementation_.handleVkIframeMessage_({
+        origin: 'https://vk.com',
+        source: iframe.contentWindow,
+        data: JSON.stringify(['resize', [height]]),
+      });
+    }
   }
-});
+);
diff --git a/extensions/amp-web-push/0.1/amp-web-push-config.js b/extensions/amp-web-push/0.1/amp-web-push-config.js
index 392361cd550b..a8dacbeaa46d 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-config.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-config.js
@@ -78,8 +78,8 @@ export class WebPushConfig extends AMP.BaseElement {
     for (const attribute in WebPushConfigAttributes) {
       const value = WebPushConfigAttributes[attribute];
       userAssert(
-          this.element.getAttribute(value) || value === 'service-worker-scope',
-          `The ${value} attribute is required for <${CONFIG_TAG}>`
+        this.element.getAttribute(value) || value === 'service-worker-scope',
+        `The ${value} attribute is required for <${CONFIG_TAG}>`
       );
       config[value] = this.element.getAttribute(value);
     }
@@ -88,7 +88,7 @@ export class WebPushConfig extends AMP.BaseElement {
       !this.isValidHelperOrPermissionDialogUrl_(config['helper-iframe-url'])
     ) {
       throw user().createError(
-          `<${CONFIG_TAG}> must have a valid ` +
+        `<${CONFIG_TAG}> must have a valid ` +
           'helper-iframe-url attribute. It should begin with ' +
           'the https:// protocol and point to the provided lightweight ' +
           'template page provided for AMP messaging.'
@@ -99,24 +99,24 @@ export class WebPushConfig extends AMP.BaseElement {
       !this.isValidHelperOrPermissionDialogUrl_(config['permission-dialog-url'])
     ) {
       throw user().createError(
-          `<${CONFIG_TAG}> must have a valid ` +
+        `<${CONFIG_TAG}> must have a valid ` +
           'permission-dialog-url attribute. It should begin with ' +
           'the https:// protocol and point to the provided template page ' +
           'for showing the permission prompt.'
       );
     }
 
-    if (parseUrlDeprecated(config['service-worker-url']).protocol
-      !== 'https:') {
+    if (
+      parseUrlDeprecated(config['service-worker-url']).protocol !== 'https:'
+    ) {
       throw user().createError(
-          `<${CONFIG_TAG}> must have a valid ` +
+        `<${CONFIG_TAG}> must have a valid ` +
           'service-worker-url attribute. It should begin with the ' +
           'https:// protocol and point to the service worker JavaScript file ' +
           'to be installed.'
       );
     }
 
-
     if (
       parseUrlDeprecated(config['service-worker-url']).origin !==
         parseUrlDeprecated(config['permission-dialog-url']).origin ||
@@ -124,7 +124,7 @@ export class WebPushConfig extends AMP.BaseElement {
         parseUrlDeprecated(config['helper-iframe-url']).origin
     ) {
       throw user().createError(
-          `<${CONFIG_TAG}> URL attributes ` +
+        `<${CONFIG_TAG}> URL attributes ` +
           'service-worker-url, permission-dialog-url, and ' +
           'helper-iframe-url must all share the same origin.'
       );
@@ -132,9 +132,9 @@ export class WebPushConfig extends AMP.BaseElement {
   }
 
   /**
-  * Parses the JSON configuration and returns a JavaScript object.
-  * @return {AmpWebPushConfig}
-  */
+   * Parses the JSON configuration and returns a JavaScript object.
+   * @return {AmpWebPushConfig}
+   */
   parseConfig() {
     const config = {};
 
@@ -154,12 +154,12 @@ export class WebPushConfig extends AMP.BaseElement {
     webPushService.start(config).catch(() => {});
 
     this.registerAction(
-        WebPushWidgetActions.SUBSCRIBE,
-        this.onSubscribe_.bind(this)
+      WebPushWidgetActions.SUBSCRIBE,
+      this.onSubscribe_.bind(this)
     );
     this.registerAction(
-        WebPushWidgetActions.UNSUBSCRIBE,
-        this.onUnsubscribe_.bind(this)
+      WebPushWidgetActions.UNSUBSCRIBE,
+      this.onUnsubscribe_.bind(this)
     );
   }
 
@@ -170,7 +170,7 @@ export class WebPushConfig extends AMP.BaseElement {
   ensureSpecificElementId_() {
     if (this.element.getAttribute('id') !== TAG) {
       throw user().createError(
-          `<${CONFIG_TAG}> must have an id ` +
+        `<${CONFIG_TAG}> must have an id ` +
           "attribute with value '" +
           TAG +
           "'."
@@ -184,11 +184,11 @@ export class WebPushConfig extends AMP.BaseElement {
    */
   ensureUniqueElement_() {
     const webPushConfigElements = this.getAmpDoc()
-        .getRootNode()
-        .querySelectorAll(`#${escapeCssSelectorIdent(CONFIG_TAG)}`);
+      .getRootNode()
+      .querySelectorAll(`#${escapeCssSelectorIdent(CONFIG_TAG)}`);
     if (webPushConfigElements.length > 1) {
       throw user().createError(
-          `Only one <${CONFIG_TAG}> element may exist on a page.`
+        `Only one <${CONFIG_TAG}> element may exist on a page.`
       );
     }
   }
@@ -206,14 +206,14 @@ export class WebPushConfig extends AMP.BaseElement {
     this.setWidgetDisabled_(widget, true);
     const webPushService = getServiceForDoc(this.getAmpDoc(), SERVICE_TAG);
     webPushService
-        .subscribe(() => {
+      .subscribe(() => {
         // On popup closed
-          this.setWidgetDisabled_(widget, false);
-        })
-        .then(() => {
+        this.setWidgetDisabled_(widget, false);
+      })
+      .then(() => {
         // On browser notification permission granted, denied, or dismissed
-          this.setWidgetDisabled_(widget, false);
-        });
+        this.setWidgetDisabled_(widget, false);
+      });
   }
 
   /**
@@ -244,7 +244,7 @@ export class WebPushConfig extends AMP.BaseElement {
    * @private
    * @param {string} url
    * @return {boolean}
-  */
+   */
   isValidHelperOrPermissionDialogUrl_(url) {
     try {
       const parsedUrl = parseUrlDeprecated(url);
diff --git a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
index 27a536f60e2f..8f7a60c7e6d1 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-helper-frame.js
@@ -59,13 +59,13 @@ export let NotificationPermissionStateMessage;
 export let StorageGetMessage;
 
 /**
-  * @fileoverview
-  * Loaded as an invisible iframe on the AMP page, and serving a page on the
-  * canonical origin, this iframe enables same-origin access to push
-  * subscription, notification permission, and IndexedDb data stored on the
-  * canonical origin to query the user's permission state, register service
-  * workers, and enable communication with the registered service worker.
-  */
+ * @fileoverview
+ * Loaded as an invisible iframe on the AMP page, and serving a page on the
+ * canonical origin, this iframe enables same-origin access to push
+ * subscription, notification permission, and IndexedDb data stored on the
+ * canonical origin to query the user's permission state, register service
+ * workers, and enable communication with the registered service worker.
+ */
 export class AmpWebPushHelperFrame {
   /** @param {!HelperFrameOptions} options */
   constructor(options) {
@@ -151,10 +151,10 @@ export class AmpWebPushHelperFrame {
     } else {
       // Reply with our standard notification permission state response
       this.replyToFrameWithPayload_(
-          replyToFrame,
-          true,
-          null,
-          Notification.permission
+        replyToFrame,
+        true,
+        null,
+        Notification.permission
       );
     }
   }
@@ -225,30 +225,30 @@ export class AmpWebPushHelperFrame {
   onAmpPageMessageReceivedServiceWorkerRegistration_(message, replyToFrame) {
     if (!message || !message.workerUrl || !message.registrationOptions) {
       throw new Error(
-          'Expected arguments workerUrl and registrationOptions ' +
+        'Expected arguments workerUrl and registrationOptions ' +
           'in message, got:',
-          message
+        message
       );
     }
 
     this.window_.navigator.serviceWorker
-        .register(message.workerUrl, message.registrationOptions)
-        .then(() => {
-          this.replyToFrameWithPayload_(replyToFrame, true, null, null);
-        })
-        .catch(error => {
-          this.replyToFrameWithPayload_(
-              replyToFrame,
-              true,
-              null,
-              error ? error.message || error.toString() : null
-          );
-        });
+      .register(message.workerUrl, message.registrationOptions)
+      .then(() => {
+        this.replyToFrameWithPayload_(replyToFrame, true, null, null);
+      })
+      .catch(error => {
+        this.replyToFrameWithPayload_(
+          replyToFrame,
+          true,
+          null,
+          error ? error.message || error.toString() : null
+        );
+      });
   }
 
   /**
    * @param {ServiceWorkerMessage} message
-  */
+   */
   messageServiceWorker(message) {
     this.window_.navigator.serviceWorker.controller./*OK*/ postMessage({
       command: message.topic,
@@ -278,10 +278,10 @@ export class AmpWebPushHelperFrame {
 
       // The service worker's reply is forwarded back to the AMP page
       return this.replyToFrameWithPayload_(
-          replyToFrame,
-          true,
-          null,
-          workerReplyPayload
+        replyToFrame,
+        true,
+        null,
+        workerReplyPayload
       );
     });
   }
@@ -314,21 +314,21 @@ export class AmpWebPushHelperFrame {
   }
 
   /**
-    * Service worker postMessage() communication relies on the property
-    * navigator.serviceWorker.controller to be non-null. The controller property
-    * references the active service worker controlling the page. Without this
-    * property, there is no service worker to message.
-    *
-    * The controller property is set when a service worker has successfully
-    * registered, installed, and activated a worker, and when a page isn't
-    * loaded in a hard refresh mode bypassing the cache.
-    *
-    * It's possible for a service worker to take a second page load to be fully
-    * activated.
-    *
-    * @return {boolean}
-    * @private
-    */
+   * Service worker postMessage() communication relies on the property
+   * navigator.serviceWorker.controller to be non-null. The controller property
+   * references the active service worker controlling the page. Without this
+   * property, there is no service worker to message.
+   *
+   * The controller property is set when a service worker has successfully
+   * registered, installed, and activated a worker, and when a page isn't
+   * loaded in a hard refresh mode bypassing the cache.
+   *
+   * It's possible for a service worker to take a second page load to be fully
+   * activated.
+   *
+   * @return {boolean}
+   * @private
+   */
   isWorkerControllingPage_() {
     return (
       this.window_.navigator.serviceWorker &&
@@ -349,24 +349,23 @@ export class AmpWebPushHelperFrame {
         resolve();
       } else {
         this.window_.navigator.serviceWorker.addEventListener(
-            'controllerchange',
-            () => {
+          'controllerchange',
+          () => {
             // Service worker has been claimed
-              if (this.isWorkerControllingPage_()) {
-                resolve();
-              } else {
-                this.window_.navigator.serviceWorker
-                    .controller.addEventListener(
-                        'statechange',
-                        () => {
-                          if (this.isWorkerControllingPage_()) {
-                            // Service worker has been activated
-                            resolve();
-                          }
-                        }
-                    );
-              }
+            if (this.isWorkerControllingPage_()) {
+              resolve();
+            } else {
+              this.window_.navigator.serviceWorker.controller.addEventListener(
+                'statechange',
+                () => {
+                  if (this.isWorkerControllingPage_()) {
+                    // Service worker has been activated
+                    resolve();
+                  }
+                }
+              );
             }
+          }
         );
       }
     });
@@ -381,30 +380,30 @@ export class AmpWebPushHelperFrame {
    */
   run(allowedOrigin) {
     this.ampMessenger_.on(
-        WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
-        this.onAmpPageMessageReceivedNotificationPermissionState_.bind(this)
+      WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
+      this.onAmpPageMessageReceivedNotificationPermissionState_.bind(this)
     );
     this.ampMessenger_.on(
-        WindowMessenger.Topics.SERVICE_WORKER_STATE,
-        this.onAmpPageMessageReceivedServiceWorkerState_.bind(this)
+      WindowMessenger.Topics.SERVICE_WORKER_STATE,
+      this.onAmpPageMessageReceivedServiceWorkerState_.bind(this)
     );
     this.ampMessenger_.on(
-        WindowMessenger.Topics.SERVICE_WORKER_REGISTRATION,
-        this.onAmpPageMessageReceivedServiceWorkerRegistration_.bind(this)
+      WindowMessenger.Topics.SERVICE_WORKER_REGISTRATION,
+      this.onAmpPageMessageReceivedServiceWorkerRegistration_.bind(this)
     );
     this.ampMessenger_.on(
-        WindowMessenger.Topics.SERVICE_WORKER_QUERY,
-        this.onAmpPageMessageReceivedServiceWorkerQuery_.bind(this)
+      WindowMessenger.Topics.SERVICE_WORKER_QUERY,
+      this.onAmpPageMessageReceivedServiceWorkerQuery_.bind(this)
     );
     this.ampMessenger_.on(
-        WindowMessenger.Topics.STORAGE_GET,
-        this.onAmpPageMessageReceivedStorageGet_.bind(this)
+      WindowMessenger.Topics.STORAGE_GET,
+      this.onAmpPageMessageReceivedStorageGet_.bind(this)
     );
 
     this.waitUntilWorkerControlsPage().then(() => {
       this.window_.navigator.serviceWorker.addEventListener(
-          'message',
-          this.onPageMessageReceivedFromServiceWorker_.bind(this)
+        'message',
+        this.onPageMessageReceivedFromServiceWorker_.bind(this)
       );
     });
     this.ampMessenger_.listen([allowedOrigin || this.getParentOrigin_()]);
diff --git a/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js b/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js
index d5f50bfef02b..5551b8d29af9 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-permission-dialog.js
@@ -68,8 +68,7 @@ export class AmpWebPushPermissionDialog {
    * @return {boolean}
    */
   isCurrentDialogPopup() {
-    return !!this.window_.opener &&
-      this.window_.opener !== this.window_;
+    return !!this.window_.opener && this.window_.opener !== this.window_;
   }
 
   /**
@@ -119,7 +118,9 @@ export class AmpWebPushPermissionDialog {
     const closeIcon = this.window_.document.querySelector('#close');
 
     if (closeIcon) {
-      closeIcon.addEventListener('click', () => { this.closeDialog(); });
+      closeIcon.addEventListener('click', () => {
+        this.closeDialog();
+      });
     }
   }
 
@@ -144,18 +145,19 @@ export class AmpWebPushPermissionDialog {
 
   /** @private */
   onPermissionDenied_() {
-    navigator.permissions.query({name: 'notifications'})
-        .then(permissionStatus => {
-          permissionStatus.onchange = () => {
-            this.storeNotificationPermission_();
-            switch (this.window_.Notification.permission) {
-              case NotificationPermission.DEFAULT:
-              case NotificationPermission.GRANTED:
-                this.onPermissionDefaultOrGranted_();
-                break;
-            }
-          };
-        });
+    navigator.permissions
+      .query({name: 'notifications'})
+      .then(permissionStatus => {
+        permissionStatus.onchange = () => {
+          this.storeNotificationPermission_();
+          switch (this.window_.Notification.permission) {
+            case NotificationPermission.DEFAULT:
+            case NotificationPermission.GRANTED:
+              this.onPermissionDefaultOrGranted_();
+              break;
+          }
+        };
+      });
   }
 
   /**
@@ -165,8 +167,8 @@ export class AmpWebPushPermissionDialog {
    */
   storeNotificationPermission_() {
     this.window_.localStorage.setItem(
-        StorageKeys.NOTIFICATION_PERMISSION,
-        this.window_.Notification.permission
+      StorageKeys.NOTIFICATION_PERMISSION,
+      this.window_.Notification.permission
     );
   }
 
@@ -181,9 +183,9 @@ export class AmpWebPushPermissionDialog {
 
     // Show the section that matches the current permission
     const section = this.window_.document.querySelector(
-        `[permission=${escapeCssSelectorIdent(
-            this.window_.Notification.permission
-        )}]`
+      `[permission=${escapeCssSelectorIdent(
+        this.window_.Notification.permission
+      )}]`
     );
 
     if (section) {
@@ -233,16 +235,17 @@ export class AmpWebPushPermissionDialog {
       if (this.isCurrentDialogPopup()) {
         this.ampMessenger_.connect(opener, '*');
 
-        return this.ampMessenger_.send(
+        return this.ampMessenger_
+          .send(
             WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
             permission
-        )
-            .then(result => {
-              const message = result[0];
-              if (message && message.closeFrame) {
-                this.closeDialog();
-              }
-            });
+          )
+          .then(result => {
+            const message = result[0];
+            if (message && message.closeFrame) {
+              this.closeDialog();
+            }
+          });
       } else {
         this.closeDialog();
       }
@@ -258,11 +261,9 @@ export class AmpWebPushPermissionDialog {
    */
   redirectToUrl(url) {
     const parsedUrl = parseUrlDeprecated(url);
-    if (parsedUrl &&
-      (
-        parsedUrl.protocol === 'http:' ||
-        parsedUrl.protocol === 'https:'
-      )
+    if (
+      parsedUrl &&
+      (parsedUrl.protocol === 'http:' || parsedUrl.protocol === 'https:')
     ) {
       this.window_.location.href = url;
     }
diff --git a/extensions/amp-web-push/0.1/amp-web-push-widget.js b/extensions/amp-web-push/0.1/amp-web-push-widget.js
index d8707093001c..47c5e64a1e48 100644
--- a/extensions/amp-web-push/0.1/amp-web-push-widget.js
+++ b/extensions/amp-web-push/0.1/amp-web-push-widget.js
@@ -24,7 +24,6 @@ import {Layout} from '../../../src/layout';
  * All widgets are initially invisible while their visibility is computed.
  */
 export class WebPushWidget extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
diff --git a/extensions/amp-web-push/0.1/amp-web-push.js b/extensions/amp-web-push/0.1/amp-web-push.js
index d654a750e762..22beacfb8fa6 100644
--- a/extensions/amp-web-push/0.1/amp-web-push.js
+++ b/extensions/amp-web-push/0.1/amp-web-push.js
@@ -30,7 +30,6 @@ import {WebPushConfig} from './amp-web-push-config';
 import {WebPushService} from './web-push-service';
 import {WebPushWidget} from './amp-web-push-widget';
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerServiceForDoc(SERVICE_TAG, WebPushService);
   AMP.registerElement(CONFIG_TAG, WebPushConfig);
diff --git a/extensions/amp-web-push/0.1/amp-web-push.service-worker.js b/extensions/amp-web-push/0.1/amp-web-push.service-worker.js
index e6c560046429..a29cc5b3a062 100644
--- a/extensions/amp-web-push/0.1/amp-web-push.service-worker.js
+++ b/extensions/amp-web-push/0.1/amp-web-push.service-worker.js
@@ -87,26 +87,30 @@ self.addEventListener('message', event => {
  */
 function onMessageReceivedSubscriptionState() {
   let retrievedPushSubscription = null;
-  self.registration.pushManager.getSubscription()
-      .then(pushSubscription => {
-        retrievedPushSubscription = pushSubscription;
-        if (!pushSubscription) {
-          return null;
-        } else {
-          return self.registration.pushManager.permissionState(
-              pushSubscription.options
-          );
-        }
-      }).then(permissionStateOrNull => {
-        if (permissionStateOrNull == null) {
-          broadcastReply(WorkerMessengerCommand.AMP_SUBSCRIPTION_STATE, false);
-        } else {
-          const isSubscribed = !!retrievedPushSubscription &&
-            permissionStateOrNull === 'granted';
-          broadcastReply(WorkerMessengerCommand.AMP_SUBSCRIPTION_STATE,
-              isSubscribed);
-        }
-      });
+  self.registration.pushManager
+    .getSubscription()
+    .then(pushSubscription => {
+      retrievedPushSubscription = pushSubscription;
+      if (!pushSubscription) {
+        return null;
+      } else {
+        return self.registration.pushManager.permissionState(
+          pushSubscription.options
+        );
+      }
+    })
+    .then(permissionStateOrNull => {
+      if (permissionStateOrNull == null) {
+        broadcastReply(WorkerMessengerCommand.AMP_SUBSCRIPTION_STATE, false);
+      } else {
+        const isSubscribed =
+          !!retrievedPushSubscription && permissionStateOrNull === 'granted';
+        broadcastReply(
+          WorkerMessengerCommand.AMP_SUBSCRIPTION_STATE,
+          isSubscribed
+        );
+      }
+    });
 }
 
 /**
@@ -127,28 +131,30 @@ function onMessageReceivedSubscribe() {
         https://github.com/web-push-libs/web-push, convert the VAPID key to a
         UInt8 array and supply it to applicationServerKey
    */
-  self.registration.pushManager.subscribe({
-    userVisibleOnly: true,
-    applicationServerKey: 'fake-demo-key',
-  }).then(() => {
-    // IMPLEMENT: Forward the push subscription to your server here
-    broadcastReply(WorkerMessengerCommand.AMP_SUBSCRIBE, null);
-  });
+  self.registration.pushManager
+    .subscribe({
+      userVisibleOnly: true,
+      applicationServerKey: 'fake-demo-key',
+    })
+    .then(() => {
+      // IMPLEMENT: Forward the push subscription to your server here
+      broadcastReply(WorkerMessengerCommand.AMP_SUBSCRIBE, null);
+    });
 }
 
-
 /**
   Unsubscribes the subscriber from push.
 
   The broadcast value is null (not used in the AMP page).
  */
 function onMessageReceivedUnsubscribe() {
-  self.registration.pushManager.getSubscription()
-      .then(subscription => subscription.unsubscribe())
-      .then(() => {
-        // OPTIONALLY IMPLEMENT: Forward the unsubscription to your server here
-        broadcastReply(WorkerMessengerCommand.AMP_UNSUBSCRIBE, null);
-      });
+  self.registration.pushManager
+    .getSubscription()
+    .then(subscription => subscription.unsubscribe())
+    .then(() => {
+      // OPTIONALLY IMPLEMENT: Forward the unsubscription to your server here
+      broadcastReply(WorkerMessengerCommand.AMP_UNSUBSCRIBE, null);
+    });
 }
 
 /**
@@ -157,14 +163,13 @@ function onMessageReceivedUnsubscribe() {
  * @param {!JsonObject} payload
  */
 function broadcastReply(command, payload) {
-  self.clients.matchAll()
-      .then(clients => {
-        for (let i = 0; i < clients.length; i++) {
-          const client = clients[i];
-          client./*OK*/postMessage({
-            command,
-            payload,
-          });
-        }
+  self.clients.matchAll().then(clients => {
+    for (let i = 0; i < clients.length; i++) {
+      const client = clients[i];
+      client./*OK*/ postMessage({
+        command,
+        payload,
       });
+    }
+  });
 }
diff --git a/extensions/amp-web-push/0.1/test/test-web-push-config.js b/extensions/amp-web-push/0.1/test/test-web-push-config.js
index b6f08b08a093..5de2835ac436 100644
--- a/extensions/amp-web-push/0.1/test/test-web-push-config.js
+++ b/extensions/amp-web-push/0.1/test/test-web-push-config.js
@@ -18,160 +18,171 @@ import '../amp-web-push';
 import {CONFIG_TAG, TAG} from '../vars';
 import {WebPushConfigAttributes} from '../amp-web-push-config';
 
-
-describes.realWin('web-push-config', {
-  amp: {
-    extensions: ['amp-web-push'],
+describes.realWin(
+  'web-push-config',
+  {
+    amp: {
+      extensions: ['amp-web-push'],
+    },
   },
-}, env => {
-  let win;
-  let webPushConfig = {};
+  env => {
+    let win;
+    let webPushConfig = {};
 
-  function setDefaultWebPushConfig() {
-    const webPushConfig = {};
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      'https://a.com/webpush/amp/helper?https=1';
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      'https://a.com/webpush/amp/subscribe?https=1';
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      'https://a.com/service-worker.js?param=value';
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] =
-      '/';
-    return webPushConfig;
-  }
+    function setDefaultWebPushConfig() {
+      const webPushConfig = {};
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
+        'https://a.com/webpush/amp/helper?https=1';
+      webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
+        'https://a.com/webpush/amp/subscribe?https=1';
+      webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
+        'https://a.com/service-worker.js?param=value';
+      webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] = '/';
+      return webPushConfig;
+    }
 
-  beforeEach(() => {
-    win = env.win;
-    webPushConfig = setDefaultWebPushConfig();
-  });
+    beforeEach(() => {
+      win = env.win;
+      webPushConfig = setDefaultWebPushConfig();
+    });
 
-  function createConfigElementWithAttributes(attributes) {
-    const element = env.win.document.createElement(CONFIG_TAG);
-    element.setAttribute(WebPushConfigAttributes.HELPER_FRAME_URL,
-        attributes[WebPushConfigAttributes.HELPER_FRAME_URL]);
-    element.setAttribute(WebPushConfigAttributes.PERMISSION_DIALOG_URL,
-        attributes[WebPushConfigAttributes.PERMISSION_DIALOG_URL]);
-    element.setAttribute(WebPushConfigAttributes.SERVICE_WORKER_URL,
-        attributes[WebPushConfigAttributes.SERVICE_WORKER_URL]);
-    element.setAttribute(WebPushConfigAttributes.SERVICE_WORKER_SCOPE,
-        attributes[WebPushConfigAttributes.SERVICE_WORKER_SCOPE]);
-    element.setAttribute('id', TAG);
-    win.document.body.appendChild(element);
-    return element;
-  }
+    function createConfigElementWithAttributes(attributes) {
+      const element = env.win.document.createElement(CONFIG_TAG);
+      element.setAttribute(
+        WebPushConfigAttributes.HELPER_FRAME_URL,
+        attributes[WebPushConfigAttributes.HELPER_FRAME_URL]
+      );
+      element.setAttribute(
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL,
+        attributes[WebPushConfigAttributes.PERMISSION_DIALOG_URL]
+      );
+      element.setAttribute(
+        WebPushConfigAttributes.SERVICE_WORKER_URL,
+        attributes[WebPushConfigAttributes.SERVICE_WORKER_URL]
+      );
+      element.setAttribute(
+        WebPushConfigAttributes.SERVICE_WORKER_SCOPE,
+        attributes[WebPushConfigAttributes.SERVICE_WORKER_SCOPE]
+      );
+      element.setAttribute('id', TAG);
+      win.document.body.appendChild(element);
+      return element;
+    }
 
-  function removeAllWebPushConfigElements() {
-    const elements = win.document.querySelectorAll(CONFIG_TAG);
-    elements.forEach(element => element.remove());
-  }
+    function removeAllWebPushConfigElements() {
+      const elements = win.document.querySelectorAll(CONFIG_TAG);
+      elements.forEach(element => element.remove());
+    }
 
-  it('should fail if element does not have correct ID', () => {
-    return env.ampdoc.whenReady().then(() => {
-      const element = createConfigElementWithAttributes(webPushConfig);
-      element.removeAttribute('id');
-      expect(() => {
-        element.implementation_.validate();
-      }).to.throw(/must have an id attribute with value/);
+    it('should fail if element does not have correct ID', () => {
+      return env.ampdoc.whenReady().then(() => {
+        const element = createConfigElementWithAttributes(webPushConfig);
+        element.removeAttribute('id');
+        expect(() => {
+          element.implementation_.validate();
+        }).to.throw(/must have an id attribute with value/);
+      });
     });
-  });
 
-  it('should fail if page contains duplicate element id', () => {
-    return env.ampdoc.whenReady().then(() => {
-      createConfigElementWithAttributes(webPushConfig);
-      const element = createConfigElementWithAttributes(webPushConfig);
-      expect(() => {
-        element.implementation_.validate();
-      }).to.throw(/only one .* element may exist on a page/i);
+    it('should fail if page contains duplicate element id', () => {
+      return env.ampdoc.whenReady().then(() => {
+        createConfigElementWithAttributes(webPushConfig);
+        const element = createConfigElementWithAttributes(webPushConfig);
+        expect(() => {
+          element.implementation_.validate();
+        }).to.throw(/only one .* element may exist on a page/i);
+      });
     });
-  });
 
-  it('should fail if any mandatory attribute is missing', () => {
-    const promises = [];
-    for (const attribute in WebPushConfigAttributes) {
-      const configName = WebPushConfigAttributes[attribute];
-      if (configName !== WebPushConfigAttributes.SERVICE_WORKER_SCOPE) {
+    it('should fail if any mandatory attribute is missing', () => {
+      const promises = [];
+      for (const attribute in WebPushConfigAttributes) {
+        const configName = WebPushConfigAttributes[attribute];
+        if (configName !== WebPushConfigAttributes.SERVICE_WORKER_SCOPE) {
+          const promise = env.ampdoc.whenReady().then(() => {
+            removeAllWebPushConfigElements();
+            webPushConfig = setDefaultWebPushConfig();
+            delete webPushConfig[configName];
+            const element = createConfigElementWithAttributes(webPushConfig);
+            expect(() => {
+              element.implementation_.validate();
+            }).to.throw(
+              new RegExp('must have a valid ' + configName + ' attribute')
+            );
+          });
+          promises.push(promise);
+        }
+      }
+      return Promise.all(promises);
+    });
+
+    it('should fail if any attribute is HTTP', () => {
+      const promises = [];
+      for (const attribute in WebPushConfigAttributes) {
+        const configName = WebPushConfigAttributes[attribute];
         const promise = env.ampdoc.whenReady().then(() => {
           removeAllWebPushConfigElements();
-          webPushConfig = setDefaultWebPushConfig();
-          delete webPushConfig[configName];
+          webPushConfig[configName] = 'http://example.com/test';
           const element = createConfigElementWithAttributes(webPushConfig);
           expect(() => {
             element.implementation_.validate();
-          }).to.throw(
-              new RegExp('must have a valid ' + configName + ' attribute'));
+          }).to.throw(/should begin with the https:\/\/ protocol/);
         });
         promises.push(promise);
       }
-    }
-    return Promise.all(promises);
-  });
+      return Promise.all(promises);
+    });
 
-  it('should fail if any attribute is HTTP', () => {
-    const promises = [];
-    for (const attribute in WebPushConfigAttributes) {
-      const configName = WebPushConfigAttributes[attribute];
-      const promise = env.ampdoc.whenReady().then(() => {
-        removeAllWebPushConfigElements();
-        webPushConfig[configName] = 'http://example.com/test';
-        const element = createConfigElementWithAttributes(webPushConfig);
-        expect(() => {
-          element.implementation_.validate();
-        }).to.throw(/should begin with the https:\/\/ protocol/);
-      });
-      promises.push(promise);
-    }
-    return Promise.all(promises);
-  });
+    it('should fail if any attribute is site root page', () => {
+      const promises = [];
+      for (const attribute in WebPushConfigAttributes) {
+        const configName = WebPushConfigAttributes[attribute];
+        const promise = env.ampdoc.whenReady().then(() => {
+          removeAllWebPushConfigElements();
+          webPushConfig[configName] = 'http://example.com/';
+          const element = createConfigElementWithAttributes(webPushConfig);
+          expect(() => {
+            element.implementation_.validate();
+          }).to.throw(/and point to the/);
+        });
+        promises.push(promise);
+      }
+      return Promise.all(promises);
+    });
 
-  it('should fail if any attribute is site root page', () => {
-    const promises = [];
-    for (const attribute in WebPushConfigAttributes) {
-      const configName = WebPushConfigAttributes[attribute];
-      const promise = env.ampdoc.whenReady().then(() => {
-        removeAllWebPushConfigElements();
-        webPushConfig[configName] = 'http://example.com/';
-        const element = createConfigElementWithAttributes(webPushConfig);
-        expect(() => {
-          element.implementation_.validate();
-        }).to.throw(/and point to the/);
-      });
-      promises.push(promise);
-    }
-    return Promise.all(promises);
-  });
+    it("should fail if any attribute value's protocol is missing", () => {
+      const promises = [];
+      for (const attribute in WebPushConfigAttributes) {
+        const configName = WebPushConfigAttributes[attribute];
+        const promise = env.ampdoc.whenReady().then(() => {
+          removeAllWebPushConfigElements();
+          webPushConfig[configName] = 'www.example.com/test';
+          const element = createConfigElementWithAttributes(webPushConfig);
+          expect(() => {
+            element.implementation_.validate();
+          }).to.throw(/should begin with the https:\/\/ protocol/);
+        });
+        promises.push(promise);
+      }
+      return Promise.all(promises);
+    });
 
-  it('should fail if any attribute value\'s protocol is missing', () => {
-    const promises = [];
-    for (const attribute in WebPushConfigAttributes) {
-      const configName = WebPushConfigAttributes[attribute];
-      const promise = env.ampdoc.whenReady().then(() => {
-        removeAllWebPushConfigElements();
-        webPushConfig[configName] = 'www.example.com/test';
+    it('should fail if attribute origins differ', () => {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
+        'https://another-origin.com/test';
+      return env.ampdoc.whenReady().then(() => {
         const element = createConfigElementWithAttributes(webPushConfig);
         expect(() => {
           element.implementation_.validate();
-        }).to.throw(/should begin with the https:\/\/ protocol/);
+        }).to.throw(/must all share the same origin/);
       });
-      promises.push(promise);
-    }
-    return Promise.all(promises);
-  });
-
-  it('should fail if attribute origins differ', () => {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      'https://another-origin.com/test';
-    return env.ampdoc.whenReady().then(() => {
-      const element = createConfigElementWithAttributes(webPushConfig);
-      expect(() => {
-        element.implementation_.validate();
-      }).to.throw(/must all share the same origin/);
     });
-  });
 
-  it('should succeed for valid config', () => {
-    return env.ampdoc.whenReady().then(() => {
-      const element = createConfigElementWithAttributes(webPushConfig);
-      element.implementation_.validate();
+    it('should succeed for valid config', () => {
+      return env.ampdoc.whenReady().then(() => {
+        const element = createConfigElementWithAttributes(webPushConfig);
+        element.implementation_.validate();
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-web-push/0.1/test/test-web-push-permission-dialog.js b/extensions/amp-web-push/0.1/test/test-web-push-permission-dialog.js
index d26abc6a3eeb..15bfd1160af5 100644
--- a/extensions/amp-web-push/0.1/test/test-web-push-permission-dialog.js
+++ b/extensions/amp-web-push/0.1/test/test-web-push-permission-dialog.js
@@ -23,221 +23,234 @@ import {parseUrlDeprecated} from '../../../../src/url';
 const FAKE_IFRAME_URL =
   '//ads.localhost:9876/test/fixtures/served/iframe-stub.html#';
 
+describes.realWin(
+  'web-push-permission-dialog',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+    const webPushConfig = {};
+    let iframeWindow = null;
 
-describes.realWin('web-push-permission-dialog', {
-  amp: true,
-}, env => {
-  let webPush;
-  const webPushConfig = {};
-  let iframeWindow = null;
-
-  function setDefaultConfigParams_() {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      FAKE_IFRAME_URL;
-  }
+    function setDefaultConfigParams_() {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_URL
+      ] = FAKE_IFRAME_URL;
+    }
 
-  /**
-   * Returns the iframe in this testing AMP iframe that partially matches the
-   * URL set in the test config. Partial matches are possible only since query
-   * parameters are appended to the iframe URL.
-   */
-  function getHelperIframe() {
-    return env.win.document.querySelector('iframe');
-  }
+    /**
+     * Returns the iframe in this testing AMP iframe that partially matches the
+     * URL set in the test config. Partial matches are possible only since query
+     * parameters are appended to the iframe URL.
+     */
+    function getHelperIframe() {
+      return env.win.document.querySelector('iframe');
+    }
 
-  function setupPermissionDialogFrame() {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      const helperIframe = getHelperIframe();
-      iframeWindow = helperIframe.contentWindow;
-      iframeWindow.WindowMessenger = WindowMessenger;
-      iframeWindow.AmpWebPushPermissionDialog = AmpWebPushPermissionDialog;
-      iframeWindow._ampWebPushPermissionDialog =
-        new iframeWindow.AmpWebPushPermissionDialog({
-          debug: true,
-          windowContext: iframeWindow,
-        });
+    function setupPermissionDialogFrame() {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        const helperIframe = getHelperIframe();
+        iframeWindow = helperIframe.contentWindow;
+        iframeWindow.WindowMessenger = WindowMessenger;
+        iframeWindow.AmpWebPushPermissionDialog = AmpWebPushPermissionDialog;
+        iframeWindow._ampWebPushPermissionDialog = new iframeWindow.AmpWebPushPermissionDialog(
+          {
+            debug: true,
+            windowContext: iframeWindow,
+          }
+        );
+      });
+    }
+
+    beforeEach(() => {
+      setDefaultConfigParams_();
+      webPush = new WebPushService(env.ampdoc);
     });
-  }
 
-  beforeEach(() => {
-    setDefaultConfigParams_();
-    webPush = new WebPushService(env.ampdoc);
-  });
-
-  // TODO(dvoytenko, #12476): Make this test work with sinon 4.0.
-  it.skip('should detect opened as popup', () => {
-    return setupPermissionDialogFrame().then(() => {
-      sandbox./*OK*/stub(iframeWindow, 'opener').callsFake(true);
-      const isCurrentDialogPopup =
-        iframeWindow._ampWebPushPermissionDialog.isCurrentDialogPopup();
-      expect(isCurrentDialogPopup).to.eq(true);
+    // TODO(dvoytenko, #12476): Make this test work with sinon 4.0.
+    it.skip('should detect opened as popup', () => {
+      return setupPermissionDialogFrame().then(() => {
+        sandbox./*OK*/ stub(iframeWindow, 'opener').callsFake(true);
+        const isCurrentDialogPopup = iframeWindow._ampWebPushPermissionDialog.isCurrentDialogPopup();
+        expect(isCurrentDialogPopup).to.eq(true);
+      });
     });
-  });
-
-  it('should detect opened from redirect', () => {
-    return setupPermissionDialogFrame().then(() => {
-      sandbox./*OK*/stub(iframeWindow, 'opener').callsFake(false);
-      iframeWindow.fakeLocation = parseUrlDeprecated('https://test.com/?return=' +
-        encodeURIComponent('https://another-site.com'));
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushPermissionDialog,
-          'requestNotificationPermission').callsFake(
-          () => Promise.resolve()
-      );
-      const spy = sandbox./*OK*/spy(
+
+    it('should detect opened from redirect', () => {
+      return setupPermissionDialogFrame().then(() => {
+        sandbox./*OK*/ stub(iframeWindow, 'opener').callsFake(false);
+        iframeWindow.fakeLocation = parseUrlDeprecated(
+          'https://test.com/?return=' +
+            encodeURIComponent('https://another-site.com')
+        );
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushPermissionDialog,
+            'requestNotificationPermission'
+          )
+          .callsFake(() => Promise.resolve());
+        const spy = sandbox./*OK*/ spy(
           iframeWindow._ampWebPushPermissionDialog,
           'isCurrentDialogPopup'
-      );
-      iframeWindow._ampWebPushPermissionDialog.run();
-      expect(spy.returned(true)).to.eq(false);
+        );
+        iframeWindow._ampWebPushPermissionDialog.run();
+        expect(spy.returned(true)).to.eq(false);
+      });
     });
-  });
 
-  // TODO(jasonpang): This fails on master under headless Chrome.
-  it.skip('should request notification permissions, when opened as popup',
-      () => {
-        return setupPermissionDialogFrame().then(() => {
-          sandbox./*OK*/stub(
+    // TODO(jasonpang): This fails on master under headless Chrome.
+    it.skip('should request notification permissions, when opened as popup', () => {
+      return setupPermissionDialogFrame().then(() => {
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushPermissionDialog,
+            'isCurrentDialogPopup'
+          )
+          .callsFake(() => true);
+        const permissionStub = sandbox
+          ./*OK*/ stub(iframeWindow.Notification, 'requestPermission')
+          .callsFake(() => Promise.resolve('default'));
+        iframeWindow._ampWebPushPermissionDialog.run();
+        expect(permissionStub).to.have.been.calledOnce;
+      });
+    });
+
+    // TODO(jasonpang): This fails on master under headless Chrome.
+    it.skip('should request notification permissions when redirected', () => {
+      return setupPermissionDialogFrame().then(() => {
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushPermissionDialog,
+            'isCurrentDialogPopup'
+          )
+          .callsFake(() => false);
+        iframeWindow.fakeLocation = parseUrlDeprecated(
+          'https://test.com/?return=' +
+            encodeURIComponent('https://another-site.com')
+        );
+        const permissionStub = sandbox
+          ./*OK*/ stub(iframeWindow.Notification, 'requestPermission')
+          .callsFake(() => Promise.resolve('default'));
+        iframeWindow._ampWebPushPermissionDialog.run();
+        expect(permissionStub).to.have.been.calledOnce;
+      });
+    });
+
+    // TODO(jasonpang): This fails on master under headless Chrome.
+    it.skip('should redirect back to original site, when redirected', () => {
+      let spy = null;
+      return setupPermissionDialogFrame()
+        .then(() => {
+          sandbox
+            ./*OK*/ stub(
               iframeWindow._ampWebPushPermissionDialog,
-              'isCurrentDialogPopup').callsFake(
-              () => true
+              'isCurrentDialogPopup'
+            )
+            .callsFake(() => false);
+          iframeWindow.fakeLocation = parseUrlDeprecated(
+            'https://test.com/?return=' +
+              encodeURIComponent('https://another-site.com')
           );
-          const permissionStub = sandbox./*OK*/stub(
-              iframeWindow.Notification,
-              'requestPermission').callsFake(
-              () => Promise.resolve('default')
+          sandbox
+            ./*OK*/ stub(
+              iframeWindow._ampWebPushPermissionDialog,
+              'requestNotificationPermission'
+            )
+            .callsFake(() => Promise.resolve());
+          sandbox
+            ./*OK*/ stub(iframeWindow.Notification, 'requestPermission')
+            .callsFake(() => Promise.resolve('default'));
+          spy = sandbox./*OK*/ spy(
+            iframeWindow._ampWebPushPermissionDialog,
+            'redirectToUrl'
           );
-          iframeWindow._ampWebPushPermissionDialog.run();
-          expect(permissionStub).to.have.been.calledOnce;
+          return iframeWindow._ampWebPushPermissionDialog.run();
+        })
+        .then(() => {
+          expect(spy.withArgs('https://another-site.com')).to.have.been
+            .calledOnce;
         });
-      });
-
-  // TODO(jasonpang): This fails on master under headless Chrome.
-  it.skip('should request notification permissions when redirected', () => {
-    return setupPermissionDialogFrame().then(() => {
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushPermissionDialog,
-          'isCurrentDialogPopup').callsFake(
-          () => false
-      );
-      iframeWindow.fakeLocation = parseUrlDeprecated('https://test.com/?return=' +
-        encodeURIComponent('https://another-site.com'));
-      const permissionStub = sandbox./*OK*/stub(
-          iframeWindow.Notification,
-          'requestPermission').callsFake(
-          () => Promise.resolve('default')
-      );
-      iframeWindow._ampWebPushPermissionDialog.run();
-      expect(permissionStub).to.have.been.calledOnce;
     });
-  });
 
-  // TODO(jasonpang): This fails on master under headless Chrome.
-  it.skip('should redirect back to original site, when redirected', () => {
-    let spy = null;
-    return setupPermissionDialogFrame().then(() => {
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushPermissionDialog,
-          'isCurrentDialogPopup').callsFake(
-          () => false
-      );
-      iframeWindow.fakeLocation = parseUrlDeprecated('https://test.com/?return=' +
-        encodeURIComponent('https://another-site.com'));
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushPermissionDialog,
-          'requestNotificationPermission').callsFake(
-          () => Promise.resolve()
-      );
-      sandbox./*OK*/stub(
-          iframeWindow.Notification,
-          'requestPermission').callsFake(
-          () => Promise.resolve('default')
-      );
-      spy = sandbox./*OK*/spy(
-          iframeWindow._ampWebPushPermissionDialog,
-          'redirectToUrl'
-      );
-      return iframeWindow._ampWebPushPermissionDialog.run();
-    }).then(() => {
-      expect(spy.withArgs('https://another-site.com')).to.have.been.calledOnce;
-    });
-  });
-
-  it('should hide preload section and show postload section', () => {
-    return setupPermissionDialogFrame().then(() => {
-      const preTestString = '<div id="preload"/><div id="postload"/>';
-      iframeWindow.document.body.innerHTML = preTestString;
-      iframeWindow._ampWebPushPermissionDialog.showPostloadSection_();
-      const {document} = iframeWindow;
-      const preloadDom = document.querySelector('#preload');
-      const postloadDom = document.querySelector('#postload');
-      expect(preloadDom.classList.contains('invisible')).to.eq(true);
-      expect(postloadDom.classList.contains('invisible')).to.eq(false);
-    });
-  });
-
-  it('should show target permission section', () => {
-    return setupPermissionDialogFrame().then(() => {
-      Object.defineProperty(iframeWindow.Notification, 'permission', {
-        enumerable: false,
-        configurable: false,
-        writable: false,
-        value: 'granted',
+    it('should hide preload section and show postload section', () => {
+      return setupPermissionDialogFrame().then(() => {
+        const preTestString = '<div id="preload"/><div id="postload"/>';
+        iframeWindow.document.body.innerHTML = preTestString;
+        iframeWindow._ampWebPushPermissionDialog.showPostloadSection_();
+        const {document} = iframeWindow;
+        const preloadDom = document.querySelector('#preload');
+        const postloadDom = document.querySelector('#postload');
+        expect(preloadDom.classList.contains('invisible')).to.eq(true);
+        expect(postloadDom.classList.contains('invisible')).to.eq(false);
       });
-      const preTestString =
-        '<div permission="default"/>' +
-        '<div permission="granted"/>' +
-        '<div permission="denied"/>';
-      iframeWindow.document.body.innerHTML = preTestString;
-      iframeWindow._ampWebPushPermissionDialog.showTargetPermissionSection_();
-      const {document} = iframeWindow;
-      const defaultElement = document.querySelector('[permission=default]');
-      const grantedElement = document.querySelector('[permission=granted]');
-      const deniedElement = document.querySelector('[permission=denied]');
-      expect(defaultElement.classList.contains('invisible')).to.eq(true);
-      expect(grantedElement.classList.contains('invisible')).to.eq(false);
-      expect(deniedElement.classList.contains('invisible')).to.eq(true);
     });
-  });
-
-  it('should store notification permission', () => {
-    return setupPermissionDialogFrame().then(() => {
-      expect(localStorage.getItem('amp-web-push-notification-permission'))
-          .to.eq(null);
-
-      Object.defineProperty(iframeWindow.Notification, 'permission', {
-        enumerable: false,
-        configurable: false,
-        writable: false,
-        value: 'granted',
+
+    it('should show target permission section', () => {
+      return setupPermissionDialogFrame().then(() => {
+        Object.defineProperty(iframeWindow.Notification, 'permission', {
+          enumerable: false,
+          configurable: false,
+          writable: false,
+          value: 'granted',
+        });
+        const preTestString =
+          '<div permission="default"/>' +
+          '<div permission="granted"/>' +
+          '<div permission="denied"/>';
+        iframeWindow.document.body.innerHTML = preTestString;
+        iframeWindow._ampWebPushPermissionDialog.showTargetPermissionSection_();
+        const {document} = iframeWindow;
+        const defaultElement = document.querySelector('[permission=default]');
+        const grantedElement = document.querySelector('[permission=granted]');
+        const deniedElement = document.querySelector('[permission=denied]');
+        expect(defaultElement.classList.contains('invisible')).to.eq(true);
+        expect(grantedElement.classList.contains('invisible')).to.eq(false);
+        expect(deniedElement.classList.contains('invisible')).to.eq(true);
       });
+    });
+
+    it('should store notification permission', () => {
+      return setupPermissionDialogFrame().then(() => {
+        expect(
+          localStorage.getItem('amp-web-push-notification-permission')
+        ).to.eq(null);
+
+        Object.defineProperty(iframeWindow.Notification, 'permission', {
+          enumerable: false,
+          configurable: false,
+          writable: false,
+          value: 'granted',
+        });
 
-      iframeWindow._ampWebPushPermissionDialog.storeNotificationPermission_();
-      expect(localStorage.getItem('amp-web-push-notification-permission'))
-          .to.eq('granted');
+        iframeWindow._ampWebPushPermissionDialog.storeNotificationPermission_();
+        expect(
+          localStorage.getItem('amp-web-push-notification-permission')
+        ).to.eq('granted');
+      });
     });
-  });
-
-  // (#19990) filed issue for failing test
-  it.skip('clicking close icon should attempt to close dialog', () => {
-    let spy = null;
-    return setupPermissionDialogFrame().then(() => {
-      const preTestString = '<div id="close"/>';
-      iframeWindow.document.body.innerHTML = preTestString;
-      iframeWindow._ampWebPushPermissionDialog.onCloseIconClick_();
-      const {document} = iframeWindow;
-      const closeElement = document.querySelector('#close');
-      spy = sandbox./*OK*/spy(
+
+    // (#19990) filed issue for failing test
+    it.skip('clicking close icon should attempt to close dialog', () => {
+      let spy = null;
+      return setupPermissionDialogFrame().then(() => {
+        const preTestString = '<div id="close"/>';
+        iframeWindow.document.body.innerHTML = preTestString;
+        iframeWindow._ampWebPushPermissionDialog.onCloseIconClick_();
+        const {document} = iframeWindow;
+        const closeElement = document.querySelector('#close');
+        spy = sandbox./*OK*/ spy(
           iframeWindow._ampWebPushPermissionDialog,
           'closeDialog'
-      );
-      closeElement.click();
-      expect(spy).to.have.been.calledOnce;
+        );
+        closeElement.click();
+        expect(spy).to.have.been.calledOnce;
+      });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-web-push/0.1/test/test-web-push-service.js b/extensions/amp-web-push/0.1/test/test-web-push-service.js
index fd35680ed19d..7980b593e18d 100644
--- a/extensions/amp-web-push/0.1/test/test-web-push-service.js
+++ b/extensions/amp-web-push/0.1/test/test-web-push-service.js
@@ -25,746 +25,799 @@ import {WindowMessenger} from '../window-messenger';
 const FAKE_IFRAME_URL =
   '//ads.localhost:9876/test/fixtures/served/iframe-stub.html#';
 
+describes.realWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+
+    beforeEach(() => {
+      webPush = new WebPushService(env.ampdoc);
+    });
 
-describes.realWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  let webPush;
-
-  beforeEach(() => {
-    webPush = new WebPushService(env.ampdoc);
-  });
-
-  it('should report supported environment', () => {
-    expect(webPush.environmentSupportsWebPush()).to.eq(true);
-  });
-
-  it('should not support environment missing Notification API', () => {
-    Object.defineProperty(env.win, 'Notification', {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: undefined,
+    it('should report supported environment', () => {
+      expect(webPush.environmentSupportsWebPush()).to.eq(true);
     });
-    expect(webPush.environmentSupportsWebPush()).to.eq(false);
-  });
-
-  it('should not support environment missing Service Worker API', () => {
-    Object.defineProperty(env.win.navigator, 'serviceWorker', {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: undefined,
+
+    it('should not support environment missing Notification API', () => {
+      Object.defineProperty(env.win, 'Notification', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: undefined,
+      });
+      expect(webPush.environmentSupportsWebPush()).to.eq(false);
     });
-    expect(webPush.environmentSupportsWebPush()).to.eq(false);
-  });
-
-  it('should not support environment missing PushManager API', () => {
-    Object.defineProperty(env.win, 'PushManager', {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: undefined,
+
+    it('should not support environment missing Service Worker API', () => {
+      Object.defineProperty(env.win.navigator, 'serviceWorker', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: undefined,
+      });
+      expect(webPush.environmentSupportsWebPush()).to.eq(false);
     });
-    expect(webPush.environmentSupportsWebPush()).to.eq(false);
-  });
-
-  it('an unsupported environment should prevent initializing', () => {
-    // Cause push to not be supported on this environment
-    Object.defineProperty(env.win, 'PushManager', {
-      enumerable: false,
-      configurable: false,
-      writable: false,
-      value: undefined,
+
+    it('should not support environment missing PushManager API', () => {
+      Object.defineProperty(env.win, 'PushManager', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: undefined,
+      });
+      expect(webPush.environmentSupportsWebPush()).to.eq(false);
     });
-    // Should not error out
-    return webPush.start().should.eventually.be
-        .rejectedWith(/Web push is not supported/);
-  });
-});
-
-describes.fakeWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  it('should not support HTTP location', () => {
-    env.ampdoc.win.location.resetHref('http://site.com/');
-    sandbox.stub(mode, 'getMode').callsFake(() => {
-      return {development: false, test: false};
+
+    it('an unsupported environment should prevent initializing', () => {
+      // Cause push to not be supported on this environment
+      Object.defineProperty(env.win, 'PushManager', {
+        enumerable: false,
+        configurable: false,
+        writable: false,
+        value: undefined,
+      });
+      // Should not error out
+      return webPush
+        .start()
+        .should.eventually.be.rejectedWith(/Web push is not supported/);
     });
-    expect(env.ampdoc.win.location.href).to.be.equal(
-        'http://site.com/');
-    const webPush = new WebPushService(env.ampdoc);
-    sandbox./*OK*/stub(
-        webPush,
-        'arePushRelatedApisSupported_').callsFake(
-        () => true
-    );
-    expect(webPush.environmentSupportsWebPush()).to.eq(false);
-  });
-});
-
-describes.fakeWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  it('should support localhost HTTP location', () => {
-    env.ampdoc.win.location.resetHref('http://localhost/');
-    expect(env.ampdoc.win.location.href).to.be.equal(
-        'http://localhost/');
-    const webPush = new WebPushService(env.ampdoc);
-    sandbox./*OK*/stub(
-        webPush,
-        'arePushRelatedApisSupported_').callsFake(
-        () => true
-    );
-    expect(webPush.environmentSupportsWebPush()).to.eq(true);
-  });
-});
-
-describes.fakeWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  it('should support localhost HTTP location with port', () => {
-    env.ampdoc.win.location.resetHref('http://localhost:8000/');
-    const webPush = new WebPushService(env.ampdoc);
-    sandbox./*OK*/stub(
-        webPush,
-        'arePushRelatedApisSupported_').callsFake(
-        () => true
-    );
-    expect(env.ampdoc.win.location.href).to.be.equal(
-        'http://localhost:8000/');
-    expect(webPush.environmentSupportsWebPush()).to.eq(true);
-  });
-});
-
-describes.fakeWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  it('should support 127.0.0.1 HTTP location', () => {
-    env.ampdoc.win.location.resetHref('http://127.0.0.1/');
-    const webPush = new WebPushService(env.ampdoc);
-    sandbox./*OK*/stub(
-        webPush,
-        'arePushRelatedApisSupported_').callsFake(
-        () => true
-    );
-    expect(env.ampdoc.win.location.href).to.be.equal(
-        'http://127.0.0.1/');
-    expect(webPush.environmentSupportsWebPush()).to.eq(true);
-  });
-});
-
-describes.fakeWin('web-push-service environment support', {
-  amp: true,
-}, env => {
-  it('should support 127.0.0.1 HTTP location with port', () => {
-    env.ampdoc.win.location.resetHref('http://localhost:9000/');
-    const webPush = new WebPushService(env.ampdoc);
-    sandbox./*OK*/stub(
-        webPush,
-        'arePushRelatedApisSupported_').callsFake(
-        () => true
-    );
-    expect(env.ampdoc.win.location.href).to.be.equal(
-        'http://localhost:9000/');
-    expect(webPush.environmentSupportsWebPush()).to.eq(true);
-  });
-});
-
-describes.realWin('web-push-service helper frame messaging', {
-  amp: true,
-}, env => {
-  let webPush;
-  const webPushConfig = {};
-  let iframeWindow = null;
-
-  function setDefaultConfigParams_() {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] =
-      FAKE_IFRAME_URL;
   }
-
-  function setupHelperIframe() {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      const helperIframe = getHelperIframe();
-      iframeWindow = helperIframe.contentWindow;
-      iframeWindow.WindowMessenger = WindowMessenger;
-      iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
-      iframeWindow._ampWebPushHelperFrame =
-        new iframeWindow.AmpWebPushHelperFrame({
-          debug: true,
-          windowContext: iframeWindow,
-        });
-      iframeWindow._ampWebPushHelperFrame
-          .run(env.win.location.ancestorOrigins[0]);
-      return webPush.frameMessenger_.connect(
-          iframeWindow,
-          '*'
+);
+
+describes.fakeWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    it('should not support HTTP location', () => {
+      env.ampdoc.win.location.resetHref('http://site.com/');
+      sandbox.stub(mode, 'getMode').callsFake(() => {
+        return {development: false, test: false};
+      });
+      expect(env.ampdoc.win.location.href).to.be.equal('http://site.com/');
+      const webPush = new WebPushService(env.ampdoc);
+      sandbox
+        ./*OK*/ stub(webPush, 'arePushRelatedApisSupported_')
+        .callsFake(() => true);
+      expect(webPush.environmentSupportsWebPush()).to.eq(false);
+    });
+  }
+);
+
+describes.fakeWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    it('should support localhost HTTP location', () => {
+      env.ampdoc.win.location.resetHref('http://localhost/');
+      expect(env.ampdoc.win.location.href).to.be.equal('http://localhost/');
+      const webPush = new WebPushService(env.ampdoc);
+      sandbox
+        ./*OK*/ stub(webPush, 'arePushRelatedApisSupported_')
+        .callsFake(() => true);
+      expect(webPush.environmentSupportsWebPush()).to.eq(true);
+    });
+  }
+);
+
+describes.fakeWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    it('should support localhost HTTP location with port', () => {
+      env.ampdoc.win.location.resetHref('http://localhost:8000/');
+      const webPush = new WebPushService(env.ampdoc);
+      sandbox
+        ./*OK*/ stub(webPush, 'arePushRelatedApisSupported_')
+        .callsFake(() => true);
+      expect(env.ampdoc.win.location.href).to.be.equal(
+        'http://localhost:8000/'
       );
+      expect(webPush.environmentSupportsWebPush()).to.eq(true);
     });
   }
-
-  /**
-   * Returns the iframe in this testing AMP iframe that partially matches the
-   * URL set in the test config. Partial matches are possible only since query
-   * parameters are appended to the iframe URL.
-   */
-  function getHelperIframe() {
-    return env.win.document.querySelector('iframe');
+);
+
+describes.fakeWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    it('should support 127.0.0.1 HTTP location', () => {
+      env.ampdoc.win.location.resetHref('http://127.0.0.1/');
+      const webPush = new WebPushService(env.ampdoc);
+      sandbox
+        ./*OK*/ stub(webPush, 'arePushRelatedApisSupported_')
+        .callsFake(() => true);
+      expect(env.ampdoc.win.location.href).to.be.equal('http://127.0.0.1/');
+      expect(webPush.environmentSupportsWebPush()).to.eq(true);
+    });
   }
+);
+
+describes.fakeWin(
+  'web-push-service environment support',
+  {
+    amp: true,
+  },
+  env => {
+    it('should support 127.0.0.1 HTTP location with port', () => {
+      env.ampdoc.win.location.resetHref('http://localhost:9000/');
+      const webPush = new WebPushService(env.ampdoc);
+      sandbox
+        ./*OK*/ stub(webPush, 'arePushRelatedApisSupported_')
+        .callsFake(() => true);
+      expect(env.ampdoc.win.location.href).to.be.equal(
+        'http://localhost:9000/'
+      );
+      expect(webPush.environmentSupportsWebPush()).to.eq(true);
+    });
+  }
+);
+
+describes.realWin(
+  'web-push-service helper frame messaging',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+    const webPushConfig = {};
+    let iframeWindow = null;
+
+    function setDefaultConfigParams_() {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_SCOPE
+      ] = FAKE_IFRAME_URL;
+    }
+
+    function setupHelperIframe() {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        const helperIframe = getHelperIframe();
+        iframeWindow = helperIframe.contentWindow;
+        iframeWindow.WindowMessenger = WindowMessenger;
+        iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
+        iframeWindow._ampWebPushHelperFrame = new iframeWindow.AmpWebPushHelperFrame(
+          {
+            debug: true,
+            windowContext: iframeWindow,
+          }
+        );
+        iframeWindow._ampWebPushHelperFrame.run(
+          env.win.location.ancestorOrigins[0]
+        );
+        return webPush.frameMessenger_.connect(iframeWindow, '*');
+      });
+    }
+
+    /**
+     * Returns the iframe in this testing AMP iframe that partially matches the
+     * URL set in the test config. Partial matches are possible only since query
+     * parameters are appended to the iframe URL.
+     */
+    function getHelperIframe() {
+      return env.win.document.querySelector('iframe');
+    }
+
+    beforeEach(() => {
+      setDefaultConfigParams_();
+      webPush = new WebPushService(env.ampdoc);
+    });
 
-  beforeEach(() => {
-    setDefaultConfigParams_();
-    webPush = new WebPushService(env.ampdoc);
-  });
-
-  it('should create helper iframe on document', () => {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      expect(getHelperIframe()).to.not.be.null;
+    it('should create helper iframe on document', () => {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        expect(getHelperIframe()).to.not.be.null;
+      });
     });
-  });
 
-  // TODO(jasonpang): This fails on master under headless Chrome.
-  it.skip('should receive reply from helper iframe for permission query',
-      () => {
-        return setupHelperIframe().then(() => {
+    // TODO(jasonpang): This fails on master under headless Chrome.
+    it.skip('should receive reply from helper iframe for permission query', () => {
+      return setupHelperIframe()
+        .then(() => {
           return webPush.queryNotificationPermission();
-        }).then(permission => {
+        })
+        .then(permission => {
           expect(permission).to.eq(NotificationPermission.DEFAULT);
         });
-      });
-});
-
-
-describes.realWin('web-push-service widget visibilities', {
-  amp: true,
-}, env => {
-  let webPush;
-  const webPushConfig = {};
-  let iframeWindow = null;
-
-  function setDefaultConfigParams_() {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] =
-      FAKE_IFRAME_URL;
-  }
-
-  function setupHelperIframe() {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      const helperIframe = getHelperIframe();
-      iframeWindow = helperIframe.contentWindow;
-      iframeWindow.WindowMessenger = WindowMessenger;
-      iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
-      iframeWindow._ampWebPushHelperFrame =
-        new iframeWindow.AmpWebPushHelperFrame({
-          debug: true,
-          windowContext: iframeWindow,
-        });
-      iframeWindow._ampWebPushHelperFrame
-          .run(env.win.location.ancestorOrigins[0]);
-      return webPush.frameMessenger_.connect(
-          iframeWindow,
-          '*'
-      );
     });
   }
+);
+
+describes.realWin(
+  'web-push-service widget visibilities',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+    const webPushConfig = {};
+    let iframeWindow = null;
+
+    function setDefaultConfigParams_() {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_SCOPE
+      ] = FAKE_IFRAME_URL;
+    }
+
+    function setupHelperIframe() {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        const helperIframe = getHelperIframe();
+        iframeWindow = helperIframe.contentWindow;
+        iframeWindow.WindowMessenger = WindowMessenger;
+        iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
+        iframeWindow._ampWebPushHelperFrame = new iframeWindow.AmpWebPushHelperFrame(
+          {
+            debug: true,
+            windowContext: iframeWindow,
+          }
+        );
+        iframeWindow._ampWebPushHelperFrame.run(
+          env.win.location.ancestorOrigins[0]
+        );
+        return webPush.frameMessenger_.connect(iframeWindow, '*');
+      });
+    }
+
+    /**
+     * Returns the iframe in this testing AMP iframe that partially matches the
+     * URL set in the test config. Partial matches are possible only since query
+     * parameters are appended to the iframe URL.
+     */
+    function getHelperIframe() {
+      return env.win.document.querySelector('iframe');
+    }
+
+    beforeEach(() => {
+      setDefaultConfigParams_();
+      webPush = new WebPushService(env.ampdoc);
+    });
 
-  /**
-   * Returns the iframe in this testing AMP iframe that partially matches the
-   * URL set in the test config. Partial matches are possible only since query
-   * parameters are appended to the iframe URL.
-   */
-  function getHelperIframe() {
-    return env.win.document.querySelector('iframe');
-  }
-
-  beforeEach(() => {
-    setDefaultConfigParams_();
-    webPush = new WebPushService(env.ampdoc);
-  });
+    it('should show blocked widget if permission query returns blocked', () => {
+      let spy = null;
+      return setupHelperIframe()
+        .then(() => {
+          spy = sandbox./*OK*/ spy(webPush, 'setWidgetVisibilities');
 
-  it('should show blocked widget if permission query returns blocked', () => {
-    let spy = null;
-    return setupHelperIframe().then(() => {
-      spy = sandbox./*OK*/spy(webPush, 'setWidgetVisibilities');
+          sandbox
+            ./*OK*/ stub(webPush, 'isQuerySupported_')
+            .callsFake(() => Promise.resolve(true));
 
-      sandbox./*OK*/stub(
-          webPush,
-          'isQuerySupported_').callsFake(
-          () => Promise.resolve(true)
-      );
+          sandbox
+            ./*OK*/ stub(webPush, 'getCanonicalFrameStorageValue_')
+            .callsFake(() => Promise.resolve(NotificationPermission.DENIED));
 
-      sandbox./*OK*/stub(
-          webPush,
-          'getCanonicalFrameStorageValue_').callsFake(
-          () => Promise.resolve(NotificationPermission.DENIED)
-      );
-
-      sandbox./*OK*/stub(
-          webPush,
-          'doesWidgetCategoryMarkupExist_').callsFake(
-          () => true
-      );
-      // We've mocked default notification permissions
-      return webPush.updateWidgetVisibilities();
-    }).then(() => {
-      expect(spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, false)
-          .calledOnce).to.eq(true);
-      expect(spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false)
-          .calledOnce).to.eq(true);
-      expect(spy.withArgs(WebPushWidgetVisibilities.BLOCKED, true)
-          .calledOnce).to.eq(true);
+          sandbox
+            ./*OK*/ stub(webPush, 'doesWidgetCategoryMarkupExist_')
+            .callsFake(() => true);
+          // We've mocked default notification permissions
+          return webPush.updateWidgetVisibilities();
+        })
+        .then(() => {
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, false)
+              .calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false).calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.BLOCKED, true).calledOnce
+          ).to.eq(true);
+        });
     });
-  });
 
-  it('should show unsubscription widget if reachable SW returns subscribed',
-      () => {
-        let spy = null;
+    it('should show unsubscription widget if reachable SW returns subscribed', () => {
+      let spy = null;
 
-        return setupHelperIframe().then(() => {
-          spy = sandbox./*OK*/spy(webPush, 'setWidgetVisibilities');
+      return setupHelperIframe()
+        .then(() => {
+          spy = sandbox./*OK*/ spy(webPush, 'setWidgetVisibilities');
 
-          sandbox./*OK*/stub(
-              webPush, 'querySubscriptionStateRemotely').callsFake(
-              () => Promise.resolve(true)
-          );
-          sandbox./*OK*/stub(
-              webPush, 'isServiceWorkerActivated').callsFake(
-              () => Promise.resolve(true)
-          );
-          sandbox./*OK*/stub(
-              webPush, 'queryNotificationPermission').callsFake(
-              () => Promise.resolve(NotificationPermission.DEFAULT)
-          );
+          sandbox
+            ./*OK*/ stub(webPush, 'querySubscriptionStateRemotely')
+            .callsFake(() => Promise.resolve(true));
+          sandbox
+            ./*OK*/ stub(webPush, 'isServiceWorkerActivated')
+            .callsFake(() => Promise.resolve(true));
+          sandbox
+            ./*OK*/ stub(webPush, 'queryNotificationPermission')
+            .callsFake(() => Promise.resolve(NotificationPermission.DEFAULT));
 
           // We've mocked default notification permissions
           return webPush.updateWidgetVisibilities();
-        }).then(() => {
-          expect(spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, false)
-              .calledOnce).to.eq(true);
-          expect(spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, true)
-              .calledOnce).to.eq(true);
-          expect(spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false)
-              .calledOnce).to.eq(true);
+        })
+        .then(() => {
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, false)
+              .calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, true).calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false).calledOnce
+          ).to.eq(true);
         });
-      });
+    });
 
-  it('should show subscription widget if permission query returns default',
-      () => {
-        let spy = null;
+    it('should show subscription widget if permission query returns default', () => {
+      let spy = null;
 
-        return setupHelperIframe().then(() => {
-          spy = sandbox./*OK*/spy(webPush, 'setWidgetVisibilities');
+      return setupHelperIframe()
+        .then(() => {
+          spy = sandbox./*OK*/ spy(webPush, 'setWidgetVisibilities');
 
-          sandbox./*OK*/stub(
-              webPush,
-              'isServiceWorkerActivated').callsFake(
-              () => Promise.resolve(false)
-          );
-          sandbox./*OK*/stub(
-              webPush,
-              'queryNotificationPermission').callsFake(
-              () => Promise.resolve(NotificationPermission.DEFAULT)
-          );
+          sandbox
+            ./*OK*/ stub(webPush, 'isServiceWorkerActivated')
+            .callsFake(() => Promise.resolve(false));
+          sandbox
+            ./*OK*/ stub(webPush, 'queryNotificationPermission')
+            .callsFake(() => Promise.resolve(NotificationPermission.DEFAULT));
 
           // We've mocked default notification permissions
           return webPush.updateWidgetVisibilities();
-        }).then(() => {
-          expect(spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, true)
-              .calledOnce).to.eq(true);
-          expect(spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false)
-              .calledOnce).to.eq(true);
-          expect(spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false)
-              .calledOnce).to.eq(true);
+        })
+        .then(() => {
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, true)
+              .calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false).calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false).calledOnce
+          ).to.eq(true);
         });
-      });
+    });
 
-  it('should show subscription widget if SW returns unsubscribed', () => {
-    let spy = null;
+    it('should show subscription widget if SW returns unsubscribed', () => {
+      let spy = null;
 
-    return setupHelperIframe().then(() => {
-      spy = sandbox./*OK*/spy(webPush, 'setWidgetVisibilities');
+      return setupHelperIframe()
+        .then(() => {
+          spy = sandbox./*OK*/ spy(webPush, 'setWidgetVisibilities');
 
-      sandbox./*OK*/stub(
-          webPush,
-          'querySubscriptionStateRemotely').callsFake(
-          () => Promise.resolve(false)
-      );
-      sandbox./*OK*/stub(
-          webPush,
-          'isServiceWorkerActivated').callsFake(
-          () => Promise.resolve(true)
-      );
-      sandbox./*OK*/stub(
-          webPush,
-          'queryNotificationPermission').callsFake(
-          () => Promise.resolve(NotificationPermission.DEFAULT)
-      );
+          sandbox
+            ./*OK*/ stub(webPush, 'querySubscriptionStateRemotely')
+            .callsFake(() => Promise.resolve(false));
+          sandbox
+            ./*OK*/ stub(webPush, 'isServiceWorkerActivated')
+            .callsFake(() => Promise.resolve(true));
+          sandbox
+            ./*OK*/ stub(webPush, 'queryNotificationPermission')
+            .callsFake(() => Promise.resolve(NotificationPermission.DEFAULT));
 
-      // We've mocked default notification permissions
-      return webPush.updateWidgetVisibilities();
-    }).then(() => {
-      expect(spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, true)
-          .calledOnce).to.eq(true);
-      expect(spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false)
-          .calledOnce).to.eq(true);
-      expect(spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false)
-          .calledOnce).to.eq(true);
+          // We've mocked default notification permissions
+          return webPush.updateWidgetVisibilities();
+        })
+        .then(() => {
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.UNSUBSCRIBED, true)
+              .calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.SUBSCRIBED, false).calledOnce
+          ).to.eq(true);
+          expect(
+            spy.withArgs(WebPushWidgetVisibilities.BLOCKED, false).calledOnce
+          ).to.eq(true);
+        });
     });
-  });
 
-  it('service worker URLs should match except for query params', () => {
-    // Identical URLs
-    expect(
+    it('service worker URLs should match except for query params', () => {
+      // Identical URLs
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site.com/worker-a.js?a=1&b=2'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site.com/worker-a.js?a=1&b=2'
         )
-    ).to.eq(true);
+      ).to.eq(true);
 
-    // Identical URLs except URL to test is allowed to have more than the
-    // first's query params
-    expect(
+      // Identical URLs except URL to test is allowed to have more than the
+      // first's query params
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site.com/worker-a.js?a=1&b=2&c=3&d=4'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site.com/worker-a.js?a=1&b=2&c=3&d=4'
         )
-    ).to.eq(true);
+      ).to.eq(true);
 
-    // URL to test is missing one of the first URL's query params
-    expect(
+      // URL to test is missing one of the first URL's query params
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site.com/worker-a.js?a=1&c=3&d=4'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site.com/worker-a.js?a=1&c=3&d=4'
         )
-    ).to.eq(false);
+      ).to.eq(false);
 
-    // URL to test is missing all query params
-    expect(
+      // URL to test is missing all query params
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site.com/worker-a.js'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site.com/worker-a.js'
         )
-    ).to.eq(false);
+      ).to.eq(false);
 
-    // URL to test has the wrong scheme
-    expect(
+      // URL to test has the wrong scheme
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'http://site.com/worker-a.js?a=1&b=2'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'http://site.com/worker-a.js?a=1&b=2'
         )
-    ).to.eq(false);
+      ).to.eq(false);
 
-    // URL to test has the wrong hostname
-    expect(
+      // URL to test has the wrong hostname
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://another-site.com/worker-a.js?a=1&b=2'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://another-site.com/worker-a.js?a=1&b=2'
         )
-    ).to.eq(false);
+      ).to.eq(false);
 
-    // URL to test has the wrong port
-    expect(
+      // URL to test has the wrong port
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site:8000.com/worker-a.js?a=1&b=2'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site:8000.com/worker-a.js?a=1&b=2'
         )
-    ).to.eq(false);
+      ).to.eq(false);
 
-    // URL to test has the wrong pathname
-    expect(
+      // URL to test has the wrong pathname
+      expect(
         webPush.isUrlSimilarForQueryParams(
-            'https://site.com/worker-a.js?a=1&b=2',
-            'https://site.com/another-worker-b.js?a=1&b=2'
+          'https://site.com/worker-a.js?a=1&b=2',
+          'https://site.com/another-worker-b.js?a=1&b=2'
         )
-    ).to.eq(false);
-  });
-
-  // TODO(dvoytenko, #12476): Make this test work with sinon 4.0.
-  it.skip('should forward amp-web-push-subscription-state ' +
-      'message to SW', done => {
-    let iframeWindowControllerMock = null;
-
-    return setupHelperIframe().then(() => {
-      sandbox./*OK*/stub(
-          webPush,
-          'isServiceWorkerActivated').callsFake(
-          () => Promise.resolve(true)
-      );
-      sandbox./*OK*/stub(
-          webPush,
-          'queryNotificationPermission',
-          () => Promise.resolve(NotificationPermission.GRANTED)
-      );
+      ).to.eq(false);
+    });
 
-      iframeWindowControllerMock =
-        sandbox./*OK*/mock(iframeWindow._ampWebPushHelperFrame);
-      iframeWindowControllerMock.expects('waitUntilWorkerControlsPage')
+    // TODO(dvoytenko, #12476): Make this test work with sinon 4.0.
+    it.skip('should forward amp-web-push-subscription-state message to SW', done => {
+      let iframeWindowControllerMock = null;
+
+      return setupHelperIframe().then(() => {
+        sandbox
+          ./*OK*/ stub(webPush, 'isServiceWorkerActivated')
+          .callsFake(() => Promise.resolve(true));
+        sandbox./*OK*/ stub(webPush, 'queryNotificationPermission', () =>
+          Promise.resolve(NotificationPermission.GRANTED)
+        );
+
+        iframeWindowControllerMock = sandbox./*OK*/ mock(
+          iframeWindow._ampWebPushHelperFrame
+        );
+        iframeWindowControllerMock
+          .expects('waitUntilWorkerControlsPage')
           .returns(Promise.resolve(true));
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushHelperFrame,
-          'messageServiceWorker').callsFake(
-          message => {
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushHelperFrame,
+            'messageServiceWorker'
+          )
+          .callsFake(message => {
             if (message.topic === 'amp-web-push-subscription-state') {
               done();
             }
           });
-      return webPush.updateWidgetVisibilities();
+        return webPush.updateWidgetVisibilities();
+      });
     });
-  });
-});
-
-describes.realWin('web-push-service subscribing', {
-  amp: true,
-}, env => {
-  let webPush;
-  const webPushConfig = {};
-  let iframeWindow = null;
-
-  function setDefaultConfigParams_() {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] =
-      FAKE_IFRAME_URL;
   }
-
-  function setupHelperIframe() {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      const helperIframe = getHelperIframe();
-      iframeWindow = helperIframe.contentWindow;
-      iframeWindow.WindowMessenger = WindowMessenger;
-      iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
-      iframeWindow._ampWebPushHelperFrame =
-        new iframeWindow.AmpWebPushHelperFrame({
-          debug: true,
-          windowContext: iframeWindow,
-        });
-      iframeWindow._ampWebPushHelperFrame
-          .run(env.win.location.ancestorOrigins[0]);
-      return webPush.frameMessenger_.connect(
-          iframeWindow,
-          '*'
-      );
+);
+
+describes.realWin(
+  'web-push-service subscribing',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+    const webPushConfig = {};
+    let iframeWindow = null;
+
+    function setDefaultConfigParams_() {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_SCOPE
+      ] = FAKE_IFRAME_URL;
+    }
+
+    function setupHelperIframe() {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        const helperIframe = getHelperIframe();
+        iframeWindow = helperIframe.contentWindow;
+        iframeWindow.WindowMessenger = WindowMessenger;
+        iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
+        iframeWindow._ampWebPushHelperFrame = new iframeWindow.AmpWebPushHelperFrame(
+          {
+            debug: true,
+            windowContext: iframeWindow,
+          }
+        );
+        iframeWindow._ampWebPushHelperFrame.run(
+          env.win.location.ancestorOrigins[0]
+        );
+        return webPush.frameMessenger_.connect(iframeWindow, '*');
+      });
+    }
+
+    /**
+     * Returns the iframe in this testing AMP iframe that partially matches the
+     * URL set in the test config. Partial matches are possible only since query
+     * parameters are appended to the iframe URL.
+     */
+    function getHelperIframe() {
+      return env.win.document.querySelector('iframe');
+    }
+
+    beforeEach(() => {
+      setDefaultConfigParams_();
+      webPush = new WebPushService(env.ampdoc);
     });
-  }
-
-  /**
-   * Returns the iframe in this testing AMP iframe that partially matches the
-   * URL set in the test config. Partial matches are possible only since query
-   * parameters are appended to the iframe URL.
-   */
-  function getHelperIframe() {
-    return env.win.document.querySelector('iframe');
-  }
 
-  beforeEach(() => {
-    setDefaultConfigParams_();
-    webPush = new WebPushService(env.ampdoc);
-  });
+    it('should register service worker', () => {
+      let helperFrameSwMessageMock = null;
+      const swUrl = webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL];
+      const swScope =
+        webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE];
 
-  it('should register service worker', () => {
-    let helperFrameSwMessageMock = null;
-    const swUrl = webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL];
-    const swScope = webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE];
-
-    return setupHelperIframe().then(() => {
-      helperFrameSwMessageMock = sandbox./*OK*/mock(
-          iframeWindow.navigator.serviceWorker
-      );
-      helperFrameSwMessageMock.expects('register')
-          .once()
-          .withArgs(swUrl, {scope: swScope})
-          .returns(Promise.resolve(true));
-      return webPush.registerServiceWorker();
-    }).then(() => {
-      helperFrameSwMessageMock.verify();
+      return setupHelperIframe()
+        .then(() => {
+          helperFrameSwMessageMock = sandbox./*OK*/ mock(
+            iframeWindow.navigator.serviceWorker
+          );
+          helperFrameSwMessageMock
+            .expects('register')
+            .once()
+            .withArgs(swUrl, {scope: swScope})
+            .returns(Promise.resolve(true));
+          return webPush.registerServiceWorker();
+        })
+        .then(() => {
+          helperFrameSwMessageMock.verify();
+        });
     });
-  });
 
-  it('should forward amp-web-push-subscribe message to SW', () => {
-    let iframeWindowControllerMock = null;
+    it('should forward amp-web-push-subscribe message to SW', () => {
+      let iframeWindowControllerMock = null;
 
-    return setupHelperIframe().then(() => {
-      iframeWindowControllerMock =
-        sandbox./*OK*/mock(iframeWindow._ampWebPushHelperFrame);
-      iframeWindowControllerMock.expects('waitUntilWorkerControlsPage')
+      return setupHelperIframe().then(() => {
+        iframeWindowControllerMock = sandbox./*OK*/ mock(
+          iframeWindow._ampWebPushHelperFrame
+        );
+        iframeWindowControllerMock
+          .expects('waitUntilWorkerControlsPage')
           .returns(Promise.resolve(true));
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushHelperFrame,
-          'messageServiceWorker').callsFake(
-          message => {
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushHelperFrame,
+            'messageServiceWorker'
+          )
+          .callsFake(message => {
             if (message.topic === 'amp-web-push-subscribe') {
               return Promise.resolve();
             }
           });
-      webPush.subscribeForPushRemotely();
+        webPush.subscribeForPushRemotely();
+      });
     });
-  });
-
-  it('should try opening popup as a window and then as a redirect', () => {
-    let openWindowMock = null;
-
-    return setupHelperIframe().then(() => {
-      openWindowMock = sandbox./*OK*/mock(env.win);
-      const returningPopupUrl =
-        env.win.location.href +
-        '?' +
-        WebPushService.PERMISSION_POPUP_URL_FRAGMENT;
-      openWindowMock.expects('open')
+
+    it('should try opening popup as a window and then as a redirect', () => {
+      let openWindowMock = null;
+
+      return setupHelperIframe().then(() => {
+        openWindowMock = sandbox./*OK*/ mock(env.win);
+        const returningPopupUrl =
+          env.win.location.href +
+          '?' +
+          WebPushService.PERMISSION_POPUP_URL_FRAGMENT;
+        openWindowMock
+          .expects('open')
           .withArgs(
-              webPushConfig['permission-dialog-url'] +
-          `?return=${encodeURIComponent(returningPopupUrl)}`, '_blank')
+            webPushConfig['permission-dialog-url'] +
+              `?return=${encodeURIComponent(returningPopupUrl)}`,
+            '_blank'
+          )
           .onFirstCall()
           .returns();
-      openWindowMock.expects('open')
+        openWindowMock
+          .expects('open')
           .withArgs(
-              webPushConfig['permission-dialog-url'] +
-          `?return=${encodeURIComponent(returningPopupUrl)}`, '_top')
+            webPushConfig['permission-dialog-url'] +
+              `?return=${encodeURIComponent(returningPopupUrl)}`,
+            '_top'
+          )
           .onSecondCall()
           .returns();
 
-      webPush.openPopupOrRedirect();
-      openWindowMock.verify();
+        webPush.openPopupOrRedirect();
+        openWindowMock.verify();
+      });
     });
-  });
 
-  it('should detect continuing subscription from permission dialog redirect',
-      () => {
-        env.ampdoc.win.testLocation.href =
+    it('should detect continuing subscription from permission dialog redirect', () => {
+      env.ampdoc.win.testLocation.href =
         'https://a.com/?' + WebPushService.PERMISSION_POPUP_URL_FRAGMENT;
-        expect(webPush.isContinuingSubscriptionFromRedirect()).to.eq(true);
-      });
+      expect(webPush.isContinuingSubscriptionFromRedirect()).to.eq(true);
+    });
 
-  it('should remove url fragment if continuing subscription', () => {
-    webPush.initializeConfig(webPushConfig);
-
-    const urlWithSingleParam =
-      'https://a.com/?' + WebPushService.PERMISSION_POPUP_URL_FRAGMENT;
-    const newUrlWithSingleParam =
-      webPush.removePermissionPopupUrlFragmentFromUrl(urlWithSingleParam);
-    expect(newUrlWithSingleParam).to.eq('https://a.com/');
-
-    const urlWithMultipleParams =
-      'https://a.com/?a=1&' + WebPushService.PERMISSION_POPUP_URL_FRAGMENT +
-      '&b=2';
-    const newUrlWithMultipleParams =
-      webPush.removePermissionPopupUrlFragmentFromUrl(urlWithMultipleParams);
-    expect(newUrlWithMultipleParams).to.eq('https://a.com/?a=1&b=2');
-  });
-});
-
-describes.realWin('web-push-service unsubscribing', {
-  amp: true,
-}, env => {
-  let webPush;
-  const webPushConfig = {};
-  let iframeWindow = null;
-
-  function setDefaultConfigParams_() {
-    webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.PERMISSION_DIALOG_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_URL] =
-      FAKE_IFRAME_URL;
-    webPushConfig[WebPushConfigAttributes.SERVICE_WORKER_SCOPE] =
-      FAKE_IFRAME_URL;
-  }
+    it('should remove url fragment if continuing subscription', () => {
+      webPush.initializeConfig(webPushConfig);
 
-  function setupHelperIframe() {
-    webPush.initializeConfig(webPushConfig);
-    return webPush.installHelperFrame(webPushConfig).then(() => {
-      const helperIframe = getHelperIframe();
-      iframeWindow = helperIframe.contentWindow;
-      iframeWindow.WindowMessenger = WindowMessenger;
-      iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
-      iframeWindow._ampWebPushHelperFrame =
-        new iframeWindow.AmpWebPushHelperFrame({
-          debug: true,
-          windowContext: iframeWindow,
-        });
-      iframeWindow._ampWebPushHelperFrame
-          .run(env.win.location.ancestorOrigins[0]);
-      return webPush.frameMessenger_.connect(
-          iframeWindow,
-          '*'
+      const urlWithSingleParam =
+        'https://a.com/?' + WebPushService.PERMISSION_POPUP_URL_FRAGMENT;
+      const newUrlWithSingleParam = webPush.removePermissionPopupUrlFragmentFromUrl(
+        urlWithSingleParam
+      );
+      expect(newUrlWithSingleParam).to.eq('https://a.com/');
+
+      const urlWithMultipleParams =
+        'https://a.com/?a=1&' +
+        WebPushService.PERMISSION_POPUP_URL_FRAGMENT +
+        '&b=2';
+      const newUrlWithMultipleParams = webPush.removePermissionPopupUrlFragmentFromUrl(
+        urlWithMultipleParams
       );
+      expect(newUrlWithMultipleParams).to.eq('https://a.com/?a=1&b=2');
     });
   }
+);
+
+describes.realWin(
+  'web-push-service unsubscribing',
+  {
+    amp: true,
+  },
+  env => {
+    let webPush;
+    const webPushConfig = {};
+    let iframeWindow = null;
+
+    function setDefaultConfigParams_() {
+      webPushConfig[WebPushConfigAttributes.HELPER_FRAME_URL] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.PERMISSION_DIALOG_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_URL
+      ] = FAKE_IFRAME_URL;
+      webPushConfig[
+        WebPushConfigAttributes.SERVICE_WORKER_SCOPE
+      ] = FAKE_IFRAME_URL;
+    }
+
+    function setupHelperIframe() {
+      webPush.initializeConfig(webPushConfig);
+      return webPush.installHelperFrame(webPushConfig).then(() => {
+        const helperIframe = getHelperIframe();
+        iframeWindow = helperIframe.contentWindow;
+        iframeWindow.WindowMessenger = WindowMessenger;
+        iframeWindow.AmpWebPushHelperFrame = AmpWebPushHelperFrame;
+        iframeWindow._ampWebPushHelperFrame = new iframeWindow.AmpWebPushHelperFrame(
+          {
+            debug: true,
+            windowContext: iframeWindow,
+          }
+        );
+        iframeWindow._ampWebPushHelperFrame.run(
+          env.win.location.ancestorOrigins[0]
+        );
+        return webPush.frameMessenger_.connect(iframeWindow, '*');
+      });
+    }
+
+    /**
+     * Returns the iframe in this testing AMP iframe that partially matches the
+     * URL set in the test config. Partial matches are possible only since query
+     * parameters are appended to the iframe URL.
+     */
+    function getHelperIframe() {
+      return env.win.document.querySelector('iframe');
+    }
+
+    beforeEach(() => {
+      setDefaultConfigParams_();
+      webPush = new WebPushService(env.ampdoc);
+    });
 
-  /**
-   * Returns the iframe in this testing AMP iframe that partially matches the
-   * URL set in the test config. Partial matches are possible only since query
-   * parameters are appended to the iframe URL.
-   */
-  function getHelperIframe() {
-    return env.win.document.querySelector('iframe');
-  }
-
-  beforeEach(() => {
-    setDefaultConfigParams_();
-    webPush = new WebPushService(env.ampdoc);
-  });
-
-  it('should forward amp-web-push-unsubscribe message to SW', () => {
-    let iframeWindowControllerMock = null;
+    it('should forward amp-web-push-unsubscribe message to SW', () => {
+      let iframeWindowControllerMock = null;
 
-    return setupHelperIframe().then(() => {
-      iframeWindowControllerMock =
-        sandbox./*OK*/mock(iframeWindow._ampWebPushHelperFrame);
-      iframeWindowControllerMock.expects('waitUntilWorkerControlsPage')
+      return setupHelperIframe().then(() => {
+        iframeWindowControllerMock = sandbox./*OK*/ mock(
+          iframeWindow._ampWebPushHelperFrame
+        );
+        iframeWindowControllerMock
+          .expects('waitUntilWorkerControlsPage')
           .returns(Promise.resolve(true));
-      sandbox./*OK*/stub(
-          iframeWindow._ampWebPushHelperFrame,
-          'messageServiceWorker').callsFake(
-          message => {
+        sandbox
+          ./*OK*/ stub(
+            iframeWindow._ampWebPushHelperFrame,
+            'messageServiceWorker'
+          )
+          .callsFake(message => {
             if (message.topic === 'amp-web-push-unsubscribe') {
               return Promise.resolve();
             }
           });
-      webPush.unsubscribeFromPushRemotely();
+        webPush.unsubscribeFromPushRemotely();
+      });
     });
-  });
 
-  it('should update widget visibilities after unsubscribing', () => {
-    let unsubscribeStub = null;
-    let updateWidgetStub = null;
+    it('should update widget visibilities after unsubscribing', () => {
+      let unsubscribeStub = null;
+      let updateWidgetStub = null;
 
-    return setupHelperIframe().then(() => {
-      unsubscribeStub = sandbox./*OK*/stub(
-          webPush,
-          'unsubscribeFromPushRemotely').callsFake(
-          () => Promise.resolve()
-      );
-      updateWidgetStub = sandbox./*OK*/stub(
-          webPush,
-          'updateWidgetVisibilities').callsFake(
-          () => Promise.resolve()
-      );
+      return setupHelperIframe()
+        .then(() => {
+          unsubscribeStub = sandbox
+            ./*OK*/ stub(webPush, 'unsubscribeFromPushRemotely')
+            .callsFake(() => Promise.resolve());
+          updateWidgetStub = sandbox
+            ./*OK*/ stub(webPush, 'updateWidgetVisibilities')
+            .callsFake(() => Promise.resolve());
 
-      // We've mocked default notification permissions
-      return webPush.unsubscribe();
-    }).then(() => {
-      expect(unsubscribeStub.calledOnce).to.eq(true);
-      expect(updateWidgetStub.calledOnce).to.eq(true);
+          // We've mocked default notification permissions
+          return webPush.unsubscribe();
+        })
+        .then(() => {
+          expect(unsubscribeStub.calledOnce).to.eq(true);
+          expect(updateWidgetStub.calledOnce).to.eq(true);
+        });
     });
-  });
-});
+  }
+);
diff --git a/extensions/amp-web-push/0.1/web-push-service.js b/extensions/amp-web-push/0.1/web-push-service.js
index 352fcdbd0982..0fe0eaccbab8 100644
--- a/extensions/amp-web-push/0.1/web-push-service.js
+++ b/extensions/amp-web-push/0.1/web-push-service.js
@@ -62,19 +62,19 @@ export let AmpWebPushConfig;
  */
 export class WebPushService {
   /**
-    * Describes the URL query parameter appended to the URL when the permission
-    * dialog redirects back to the AMP page to continue subscribing.
-    *
-    * In environments where pop ups aren't supported, the AMP page is redirected
-    * to a lightweight "permission dialog" page on the canonical origin. After
-    * permissions are granted, the page is redirected back to the AMP page.
-    *
-    * This describes the URL query parameter to add to the redirect back to the
-    * AMP page, so we know to resume the subscription process.
-    *
-    * We use the History API after to remove this fragment from the URL without
-    * affecting the page state.
-    * @return {string}
+   * Describes the URL query parameter appended to the URL when the permission
+   * dialog redirects back to the AMP page to continue subscribing.
+   *
+   * In environments where pop ups aren't supported, the AMP page is redirected
+   * to a lightweight "permission dialog" page on the canonical origin. After
+   * permissions are granted, the page is redirected back to the AMP page.
+   *
+   * This describes the URL query parameter to add to the redirect back to the
+   * AMP page, so we know to resume the subscription process.
+   *
+   * We use the History API after to remove this fragment from the URL without
+   * affecting the page state.
+   * @return {string}
    */
   static get PERMISSION_POPUP_URL_FRAGMENT() {
     return 'amp-web-push-subscribing=yes';
@@ -158,24 +158,24 @@ export class WebPushService {
     const iframeLoadPromise = this.installHelperFrame();
 
     iframeLoadPromise
-        .then(() => {
-          dev().fine(
-              TAG,
-              `Helper frame ${this.config_['helper-iframe-url']} ` +
+      .then(() => {
+        dev().fine(
+          TAG,
+          `Helper frame ${this.config_['helper-iframe-url']} ` +
             'DOM loaded. Connecting to the frame via postMessage()...'
-          );
-          return this.frameMessenger_.connect(
-              this.iframe_.getDomElement().contentWindow,
-              parseUrlDeprecated(this.config_['helper-iframe-url']).origin
-          );
-        })
-        .then(() => {
-          if (this.isContinuingSubscriptionFromRedirect()) {
-            this.resumeSubscribingForPushNotifications_();
-          } else {
-            return this.updateWidgetVisibilities();
-          }
-        });
+        );
+        return this.frameMessenger_.connect(
+          this.iframe_.getDomElement().contentWindow,
+          parseUrlDeprecated(this.config_['helper-iframe-url']).origin
+        );
+      })
+      .then(() => {
+        if (this.isContinuingSubscriptionFromRedirect()) {
+          this.resumeSubscribingForPushNotifications_();
+        } else {
+          return this.updateWidgetVisibilities();
+        }
+      });
 
     return iframeLoadPromise;
   }
@@ -238,12 +238,12 @@ export class WebPushService {
    */
   removePermissionPopupUrlFragmentFromUrl(url) {
     let urlWithoutFragment = url.replace(
-        `?${WebPushService.PERMISSION_POPUP_URL_FRAGMENT}`,
-        ''
+      `?${WebPushService.PERMISSION_POPUP_URL_FRAGMENT}`,
+      ''
     );
     urlWithoutFragment = urlWithoutFragment.replace(
-        `&${WebPushService.PERMISSION_POPUP_URL_FRAGMENT}`,
-        ''
+      `&${WebPushService.PERMISSION_POPUP_URL_FRAGMENT}`,
+      ''
     );
     return urlWithoutFragment;
   }
@@ -262,21 +262,21 @@ export class WebPushService {
    */
   queryHelperFrame_(messageTopic, message) {
     return this.iframe_
-        .whenReady()
-        .then(() => {
-          return this.frameMessenger_.send(messageTopic, message);
-        })
-        .then(result => {
-          const replyPayload = result[0];
-          if (replyPayload.success) {
-            return replyPayload.result;
-          } else {
-            throw new Error(
-                `AMP page helper iframe query topic ${messageTopic} ` +
+      .whenReady()
+      .then(() => {
+        return this.frameMessenger_.send(messageTopic, message);
+      })
+      .then(result => {
+        const replyPayload = result[0];
+        if (replyPayload.success) {
+          return replyPayload.result;
+        } else {
+          throw new Error(
+            `AMP page helper iframe query topic ${messageTopic} ` +
               `and message ${message} failed with: ${replyPayload.error}`
-            );
-          }
-        });
+          );
+        }
+      });
   }
 
   /**
@@ -306,8 +306,8 @@ export class WebPushService {
    */
   queryNotificationPermission() {
     return this.queryHelperFrame_(
-        WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
-        null
+      WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
+      null
     );
   }
 
@@ -317,8 +317,8 @@ export class WebPushService {
    */
   queryServiceWorkerState_() {
     return this.queryHelperFrame_(
-        WindowMessenger.Topics.SERVICE_WORKER_STATE,
-        null
+      WindowMessenger.Topics.SERVICE_WORKER_STATE,
+      null
     );
   }
 
@@ -333,11 +333,11 @@ export class WebPushService {
     const swScope = this.config_['service-worker-scope'];
 
     return this.queryHelperFrame_(
-        WindowMessenger.Topics.SERVICE_WORKER_REGISTRATION,
-        {
-          workerUrl: swUrl,
-          registrationOptions: (swScope ? {scope: swScope} : {}),
-        }
+      WindowMessenger.Topics.SERVICE_WORKER_REGISTRATION,
+      {
+        workerUrl: swUrl,
+        registrationOptions: swScope ? {scope: swScope} : {},
+      }
     );
   }
 
@@ -376,8 +376,8 @@ export class WebPushService {
     return this.queryServiceWorkerState_().then(serviceWorkerState => {
       const isControllingFrame = serviceWorkerState.isControllingFrame === true;
       const serviceWorkerHasCorrectUrl = this.isUrlSimilarForQueryParams(
-          serviceWorkerState.url,
-          self.config_['service-worker-url']
+        serviceWorkerState.url,
+        self.config_['service-worker-url']
       );
       const serviceWorkerActivated = serviceWorkerState.state === 'activated';
 
@@ -437,10 +437,12 @@ export class WebPushService {
    */
   setWidgetVisibilities(widgetCategoryName, isVisible) {
     const widgetDomElements = this.ampdoc
-        .getRootNode()
-        .querySelectorAll(`${escapeCssSelectorIdent(WIDGET_TAG)}[visibility=${
-          escapeCssSelectorIdent(widgetCategoryName)
-        }]`);
+      .getRootNode()
+      .querySelectorAll(
+        `${escapeCssSelectorIdent(
+          WIDGET_TAG
+        )}[visibility=${escapeCssSelectorIdent(widgetCategoryName)}]`
+      );
     const invisibilityCssClassName = 'amp-invisible';
 
     for (let i = 0; i < widgetDomElements.length; i++) {
@@ -463,10 +465,12 @@ export class WebPushService {
    */
   doesWidgetCategoryMarkupExist_(widgetCategoryName) {
     const widgetDomElements = this.ampdoc
-        .getRootNode()
-        .querySelectorAll(`${escapeCssSelectorIdent(WIDGET_TAG)}[visibility=${
-          escapeCssSelectorIdent(widgetCategoryName)
-        }]`);
+      .getRootNode()
+      .querySelectorAll(
+        `${escapeCssSelectorIdent(
+          WIDGET_TAG
+        )}[visibility=${escapeCssSelectorIdent(widgetCategoryName)}]`
+      );
 
     return widgetDomElements.length > 0;
   }
@@ -526,8 +530,8 @@ export class WebPushService {
       unexpected messenger query from delaying indefinitely.
      */
     return this.storeLastKnownPermission_()
-        .then(() => this.isQuerySupported_(WindowMessenger.Topics.STORAGE_GET))
-        .then(response => {
+      .then(() => this.isQuerySupported_(WindowMessenger.Topics.STORAGE_GET))
+      .then(response => {
         /*
           Response could be "denied", "granted", or "default". This is a
           response to the notification permission state query, and we're
@@ -537,26 +541,26 @@ export class WebPushService {
           We want to make sure response is a boolean true value, and not a
           permission string.
         */
-          const isSupported = response === true;
-          if (isSupported) {
+        const isSupported = response === true;
+        if (isSupported) {
           /*
             The site has v2+ of AMP web push's helper frame and supports
             retrieving the remote storage value.
           */
-            return this.getCanonicalFrameStorageValue_(
-                StorageKeys.NOTIFICATION_PERMISSION
-            );
-          } else {
+          return this.getCanonicalFrameStorageValue_(
+            StorageKeys.NOTIFICATION_PERMISSION
+          );
+        } else {
           /*
             The site is running our initial AMP web push release and the helper
             frame does not support retrieving the remote storage value. Assume
             the permission is default to provide the best user experience.
           */
-            return Promise.resolve(NotificationPermission.DEFAULT);
-          }
-        })
-        .then(canonicalNotificationPermission => {
-          /*
+          return Promise.resolve(NotificationPermission.DEFAULT);
+        }
+      })
+      .then(canonicalNotificationPermission => {
+        /*
             If the canonical notification permission is:
               - Blocked
                 - If the publisher has defined a blocked widget section, show
@@ -564,72 +568,71 @@ export class WebPushService {
               - Default or Granted
                 - Resume flow
           */
-          if (canonicalNotificationPermission ===
-              NotificationPermission.DENIED) {
-            if (
-              this.doesWidgetCategoryMarkupExist_(
-                  WebPushWidgetVisibilities.BLOCKED
-              )
-            ) {
-              this.updateWidgetVisibilitiesBlocked_();
-            } else {
-              this.updateWidgetVisibilitiesUnsubscribed_();
-            }
+        if (canonicalNotificationPermission === NotificationPermission.DENIED) {
+          if (
+            this.doesWidgetCategoryMarkupExist_(
+              WebPushWidgetVisibilities.BLOCKED
+            )
+          ) {
+            this.updateWidgetVisibilitiesBlocked_();
           } else {
-            return this.isServiceWorkerActivated().then(
-                isServiceWorkerActivated => {
-                  if (isServiceWorkerActivated) {
-                    this.updateWidgetVisibilitiesServiceWorkerActivated_();
-                  } else {
-                    this.updateWidgetVisibilitiesUnsubscribed_();
-                  }
-                }
-            );
+            this.updateWidgetVisibilitiesUnsubscribed_();
           }
-        });
+        } else {
+          return this.isServiceWorkerActivated().then(
+            isServiceWorkerActivated => {
+              if (isServiceWorkerActivated) {
+                this.updateWidgetVisibilitiesServiceWorkerActivated_();
+              } else {
+                this.updateWidgetVisibilitiesUnsubscribed_();
+              }
+            }
+          );
+        }
+      });
   }
 
   /** @private */
   updateWidgetVisibilitiesServiceWorkerActivated_() {
     return Services.timerFor(this.ampdoc.win).timeoutPromise(
-        5000,
-        this.querySubscriptionStateRemotely().then(reply => {
+      5000,
+      this.querySubscriptionStateRemotely().then(reply => {
         /*
           This Promise will never resolve if the service worker does not support
           amp-web-push, and widgets will stay hidden.
          */
-          switch (this.getSubscriptionStateReplyVersion_(reply)) {
-            case WebPushService.AMP_VERSION_INITIAL:
-              const isSubscribed = reply;
-              if (isSubscribed) {
-                this.setWidgetVisibilities(
-                    WebPushWidgetVisibilities.UNSUBSCRIBED,
-                    false
-                );
-                this.setWidgetVisibilities(
-                    WebPushWidgetVisibilities.SUBSCRIBED,
-                    true
-                );
-                this.setWidgetVisibilities(
-                    WebPushWidgetVisibilities.BLOCKED,
-                    false
-                );
-              } else {
-                this.updateWidgetVisibilitiesUnsubscribed_();
-              }
-              break;
-            default:
+        switch (this.getSubscriptionStateReplyVersion_(reply)) {
+          case WebPushService.AMP_VERSION_INITIAL:
+            const isSubscribed = reply;
+            if (isSubscribed) {
+              this.setWidgetVisibilities(
+                WebPushWidgetVisibilities.UNSUBSCRIBED,
+                false
+              );
+              this.setWidgetVisibilities(
+                WebPushWidgetVisibilities.SUBSCRIBED,
+                true
+              );
+              this.setWidgetVisibilities(
+                WebPushWidgetVisibilities.BLOCKED,
+                false
+              );
+            } else {
+              this.updateWidgetVisibilitiesUnsubscribed_();
+            }
+            break;
+          default:
             /*
               Service worker returned incorrect amp-web-push reply (amp-web-push
               not supported); widgets will stay hidden.
              */
-              throw user().createError(
-                  'The controlling service worker replied to amp-web-push ' +
+            throw user().createError(
+              'The controlling service worker replied to amp-web-push ' +
                 'with an unexpected value.'
-              );
-          }
-        }),
-        'The controlling service worker does not support amp-web-push.'
+            );
+        }
+      }),
+      'The controlling service worker does not support amp-web-push.'
     );
   }
 
@@ -661,51 +664,53 @@ export class WebPushService {
     // Register the service worker in the background in parallel for a headstart
     promises.push(this.registerServiceWorker());
     promises.push(
-        new Promise(resolve => {
-          /*
+      new Promise(resolve => {
+        /*
             In most environments, the canonical notification permission returned
             is accurate. On Chrome 62+, the permission is non-ambiguous only if
             it is granted. If the permission is anything other than granted, we
             can't trust it.
           */
-          switch (this.lastKnownPermission_) {
-            /*
+        switch (this.lastKnownPermission_) {
+          /*
               Because notification permissions are already granted, we do not
               need to open a popup to ask for permissions. Subscribe in the
               background using the helper frame.
             */
-            case NotificationPermission.GRANTED:
-              return this.onPermissionGrantedSubscribe_().then(() => {
-                resolve();
-              });
-            default:
-              /*
+          case NotificationPermission.GRANTED:
+            return this.onPermissionGrantedSubscribe_().then(() => {
+              resolve();
+            });
+          default:
+            /*
                 Because notification permissions are not granted, we need to
                 open a popup asking the user to grant permissions.
 
                 The last known permission can be unknown, in which case we open
                 a popup anyways.
               */
-              const permissionDialogWindow = this.openPopupOrRedirect();
-              this.checkPermissionDialogClosedInterval_(
-                  permissionDialogWindow,
-                  onPopupClosed
-              );
+            const permissionDialogWindow = this.openPopupOrRedirect();
+            this.checkPermissionDialogClosedInterval_(
+              permissionDialogWindow,
+              onPopupClosed
+            );
 
-              this.popupMessenger_ = new WindowMessenger({
-                debug: this.debug_,
-              });
-              this.popupMessenger_.listen([
-                this.config_['permission-dialog-url'],
-              ]);
+            this.popupMessenger_ = new WindowMessenger({
+              debug: this.debug_,
+            });
+            this.popupMessenger_.listen([
+              this.config_['permission-dialog-url'],
+            ]);
 
-              this.onPermissionDialogInteracted().then(result => {
+            this.onPermissionDialogInteracted()
+              .then(result => {
                 return this.handlePermissionDialogInteraction(result);
-              }).then(() => {
+              })
+              .then(() => {
                 resolve();
               });
-          }
-        })
+        }
+      })
     );
 
     return Promise.all(promises);
@@ -799,10 +804,10 @@ export class WebPushService {
    */
   isQuerySupported_(queryType) {
     return this.queryHelperFrame_(
-        WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
-        {
-          isQueryTopicSupported: queryType,
-        }
+      WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
+      {
+        isQueryTopicSupported: queryType,
+      }
     );
   }
 
@@ -830,10 +835,10 @@ export class WebPushService {
   onPermissionDialogInteracted() {
     return new Promise(resolve => {
       this.popupMessenger_.on(
-          WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
-          (message, replyToFrame) => {
-            resolve([message, replyToFrame]);
-          }
+        WindowMessenger.Topics.NOTIFICATION_PERMISSION_STATE,
+        (message, replyToFrame) => {
+          resolve([message, replyToFrame]);
+        }
       );
     });
   }
@@ -879,10 +884,9 @@ export class WebPushService {
 
     const permissionDialogUrlHasQueryParams =
       this.config_['permission-dialog-url'].indexOf('?') !== -1;
-    const permissionDialogUrlQueryParamPrefix =
-      permissionDialogUrlHasQueryParams
-        ? '&'
-        : '?';
+    const permissionDialogUrlQueryParamPrefix = permissionDialogUrlHasQueryParams
+      ? '&'
+      : '?';
     // The permission dialog URL, containing the return URL above embedded in a
     // query parameter
     const openingPopupUrl =
@@ -895,10 +899,10 @@ export class WebPushService {
     const options = `${sizing},resizable=yes,scrollbars=yes`;
 
     return openWindowDialog(
-        this.ampdoc.win,
-        openingPopupUrl,
-        '_blank',
-        options
+      this.ampdoc.win,
+      openingPopupUrl,
+      '_blank',
+      options
     );
   }
 
@@ -913,11 +917,11 @@ export class WebPushService {
     // Remove the ?amp-web-push-subscribing=true from the URL without affecting
     // the page contents using the History API
     this.ampdoc.win.history.replaceState(
-        null,
-        '',
-        this.removePermissionPopupUrlFragmentFromUrl(
-            this.ampdoc.win.location.href
-        )
+      null,
+      '',
+      this.removePermissionPopupUrlFragmentFromUrl(
+        this.ampdoc.win.location.href
+      )
     );
 
     this.queryNotificationPermission().then(permission => {
diff --git a/extensions/amp-web-push/0.1/window-messenger.js b/extensions/amp-web-push/0.1/window-messenger.js
index c50709c59c93..33198673fae3 100644
--- a/extensions/amp-web-push/0.1/window-messenger.js
+++ b/extensions/amp-web-push/0.1/window-messenger.js
@@ -47,7 +47,6 @@ export let MessengerOptions;
  * must be transpiled to ES5 and "duplicated" outside of the AMP SDK bundle.
  */
 export class WindowMessenger {
-
   /**
    * Set debug to true to get console logs anytime a message is received,
    * sent, or discarded.
@@ -111,20 +110,26 @@ export class WindowMessenger {
         return;
       }
       if (!Array.isArray(allowedOrigins)) {
-        reject(new Error('allowedOrigins should be a string array of ' +
-          'allowed origins to accept messages from. Got:', allowedOrigins));
+        reject(
+          new Error(
+            'allowedOrigins should be a string array of ' +
+              'allowed origins to accept messages from. Got:',
+            allowedOrigins
+          )
+        );
         return;
       }
-      this.onListenConnectionMessageReceivedProc_ =
-        this.onListenConnectionMessageReceived_.bind(
-            this,
-            allowedOrigins,
-            resolve,
-            reject
-        );
-      this.window_.addEventListener('message',
-          /** @type {(function (Event): (boolean|undefined)|null)} */
-          (this.onListenConnectionMessageReceivedProc_));
+      this.onListenConnectionMessageReceivedProc_ = this.onListenConnectionMessageReceived_.bind(
+        this,
+        allowedOrigins,
+        resolve,
+        reject
+      );
+      this.window_.addEventListener(
+        'message',
+        /** @type {(function (Event): (boolean|undefined)|null)} */
+        (this.onListenConnectionMessageReceivedProc_)
+      );
       if (this.debug_) {
         dev().fine(TAG, 'Listening for a connection message...');
       }
@@ -181,35 +186,54 @@ export class WindowMessenger {
     const message = getData(messageChannelEvent);
     const {origin, ports: messagePorts} = messageChannelEvent;
     if (this.debug_) {
-      dev().fine(TAG, 'Window message for listen() connection ' +
-        'received:', message);
+      dev().fine(
+        TAG,
+        'Window message for listen() connection received:',
+        message
+      );
     }
     if (!this.isAllowedOrigin_(origin, allowedOrigins)) {
-      dev().fine(TAG, `Discarding connection message from ${origin} ` +
-        'because it isn\'t an allowed origin:', message, ' (allowed ' +
-        ' origins are)', allowedOrigins);
+      dev().fine(
+        TAG,
+        `Discarding connection message from ${origin} ` +
+          "because it isn't an allowed origin:",
+        message,
+        ' (allowed  origins are)',
+        allowedOrigins
+      );
       return;
     }
-    if (!message ||
-         message['topic'] !== WindowMessenger.Topics.CONNECT_HANDSHAKE) {
-      dev().fine(TAG, 'Discarding connection message because it did ' +
-        'not contain our expected handshake:', message);
+    if (
+      !message ||
+      message['topic'] !== WindowMessenger.Topics.CONNECT_HANDSHAKE
+    ) {
+      dev().fine(
+        TAG,
+        'Discarding connection message because it did ' +
+          'not contain our expected handshake:',
+        message
+      );
       return;
     }
 
-    dev().fine(TAG, 'Received expected connection handshake ' +
-      'message:', message);
+    dev().fine(TAG, 'Received expected connection handshake message:', message);
     // This was our expected handshake message Remove our message handler so we
     // don't get spammed with cross-domain messages
-    this.window_.removeEventListener('message',
-        /** @type {(function (Event): (boolean|undefined)|null)} */
-        (this.onListenConnectionMessageReceivedProc_));
+    this.window_.removeEventListener(
+      'message',
+      /** @type {(function (Event): (boolean|undefined)|null)} */
+      (this.onListenConnectionMessageReceivedProc_)
+    );
     // Get the message port
     this.messagePort_ = messagePorts[0];
-    this.onChannelMessageReceivedProc_ =
-      this.onChannelMessageReceived_.bind(this);
-    this.messagePort_.addEventListener('message',
-        this.onChannelMessageReceivedProc_, false);
+    this.onChannelMessageReceivedProc_ = this.onChannelMessageReceived_.bind(
+      this
+    );
+    this.messagePort_.addEventListener(
+      'message',
+      this.onChannelMessageReceivedProc_,
+      false
+    );
     this.messagePort_.start();
     resolvePromise();
   }
@@ -231,8 +255,12 @@ export class WindowMessenger {
         reject(new Error('Provide a valid Window context to connect to.'));
       }
       if (!expectedRemoteOrigin) {
-        reject(new Error('Provide an expected origin for the remote Window ' +
-        'or provide the wildcard *.'));
+        reject(
+          new Error(
+            'Provide an expected origin for the remote Window ' +
+              'or provide the wildcard *.'
+          )
+        );
       }
       if (this.connected_) {
         reject(new Error('Already connected.'));
@@ -244,23 +272,26 @@ export class WindowMessenger {
       }
       this.channel_ = new MessageChannel();
       this.messagePort_ = this.channel_.port1;
-      this.onConnectConnectionMessageReceivedProc_ =
-        this.onConnectConnectionMessageReceived_.bind(
-            this,
-            this.messagePort_,
-            expectedRemoteOrigin,
-            resolve)
-      ;
-      this.messagePort_.addEventListener('message',
-          this.onConnectConnectionMessageReceivedProc_);
+      this.onConnectConnectionMessageReceivedProc_ = this.onConnectConnectionMessageReceived_.bind(
+        this,
+        this.messagePort_,
+        expectedRemoteOrigin,
+        resolve
+      );
+      this.messagePort_.addEventListener(
+        'message',
+        this.onConnectConnectionMessageReceivedProc_
+      );
       this.messagePort_.start();
-      remoteWindowContext./*OK*/postMessage(
-          /** @type {JsonObject} */ ({
-            topic: WindowMessenger.Topics.CONNECT_HANDSHAKE,
-          }), expectedRemoteOrigin === '*' ?
-            '*' :
-            parseUrlDeprecated(expectedRemoteOrigin).origin,
-          [this.channel_.port2]);
+      remoteWindowContext./*OK*/ postMessage(
+        /** @type {JsonObject} */ ({
+          topic: WindowMessenger.Topics.CONNECT_HANDSHAKE,
+        }),
+        expectedRemoteOrigin === '*'
+          ? '*'
+          : parseUrlDeprecated(expectedRemoteOrigin).origin,
+        [this.channel_.port2]
+      );
       dev().fine(TAG, `Opening channel to ${expectedRemoteOrigin}...`);
     });
   }
@@ -276,21 +307,30 @@ export class WindowMessenger {
   onConnectConnectionMessageReceived_(
     messagePort,
     expectedRemoteOrigin,
-    resolvePromise) {
+    resolvePromise
+  ) {
     // This is the remote frame's reply to our initial handshake topic message
     this.connected_ = true;
     if (this.debug_) {
-      dev().fine(TAG, `Messenger channel to ${expectedRemoteOrigin} ` +
-        'established.');
+      dev().fine(
+        TAG,
+        `Messenger channel to ${expectedRemoteOrigin} established.`
+      );
     }
     // Remove our message handler
-    messagePort.removeEventListener('message',
-        this.onConnectConnectionMessageReceivedProc_);
+    messagePort.removeEventListener(
+      'message',
+      this.onConnectConnectionMessageReceivedProc_
+    );
     // Install a new message handler for receiving normal messages
-    this.onChannelMessageReceivedProc_ =
-      this.onChannelMessageReceived_.bind(this);
-    messagePort.addEventListener('message',
-        this.onChannelMessageReceivedProc_, false);
+    this.onChannelMessageReceivedProc_ = this.onChannelMessageReceived_.bind(
+      this
+    );
+    messagePort.addEventListener(
+      'message',
+      this.onChannelMessageReceivedProc_,
+      false
+    );
     resolvePromise();
   }
 
@@ -325,8 +365,12 @@ export class WindowMessenger {
       // Set new incoming message data on existing message
       existingMessage.message = message['data'];
       if (this.debug_) {
-        dev().fine(TAG, 'Received reply for topic \'%s\': %s',
-            message['topic'], message['data']);
+        dev().fine(
+          TAG,
+          "Received reply for topic '%s': %s",
+          message['topic'],
+          message['data']
+        );
       }
       promiseResolver([
         message['data'],
@@ -338,13 +382,18 @@ export class WindowMessenger {
         return;
       }
       if (this.debug_) {
-        dev().fine(TAG, 'Received new message for ' +
-          `topic '${message['topic']}': ${message['data']}`);
+        dev().fine(
+          TAG,
+          'Received new message for ' +
+            `topic '${message['topic']}': ${message['data']}`
+        );
       }
       for (let i = 0; i < listeners.length; i++) {
         const listener = listeners[i];
-        listener(message['data'],
-            this.sendReply_.bind(this, message['id'], message['topic']));
+        listener(
+          message['data'],
+          this.sendReply_.bind(this, message['id'], message['topic'])
+        );
       }
     }
   }
@@ -406,7 +455,7 @@ export class WindowMessenger {
      origin, otherwise the message is not sent. Since we just got a message, we
      already know the receipient's origin.
      */
-    this.messagePort_./*OK*/postMessage(payload);
+    this.messagePort_./*OK*/ postMessage(payload);
 
     return new Promise(resolve => {
       this.messages_[payload.id] = {
@@ -435,7 +484,7 @@ export class WindowMessenger {
     if (this.debug_) {
       dev().fine(TAG, 'Sending %s: %s', topic, data);
     }
-    this.messagePort_./*OK*/postMessage(payload);
+    this.messagePort_./*OK*/ postMessage(payload);
 
     return new Promise(resolve => {
       this.messages_[payload.id] = {
diff --git a/extensions/amp-wistia-player/0.1/amp-wistia-player.js b/extensions/amp-wistia-player/0.1/amp-wistia-player.js
index 7f89199d6b10..2f0335aa0751 100644
--- a/extensions/amp-wistia-player/0.1/amp-wistia-player.js
+++ b/extensions/amp-wistia-player/0.1/amp-wistia-player.js
@@ -33,9 +33,7 @@ import {
   removeElement,
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 
 const TAG = 'amp-wistia-player';
@@ -44,7 +42,6 @@ const TAG = 'amp-wistia-player';
  * @implements {../../../src/video-interface.VideoInterface}
  */
 class AmpWistiaPlayer extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -89,25 +86,30 @@ class AmpWistiaPlayer extends AMP.BaseElement {
   layoutCallback() {
     const {element} = this;
     const mediaId = userAssert(
-        element.getAttribute('data-media-hashed-id'),
-        'The data-media-hashed-id attribute is required ' +
-            'for <amp-wistia-player> %s',
-        element);
+      element.getAttribute('data-media-hashed-id'),
+      'The data-media-hashed-id attribute is required ' +
+        'for <amp-wistia-player> %s',
+      element
+    );
 
-    const iframe = createFrameFor(this,
-        `https://fast.wistia.net/embed/iframe/${encodeURIComponent(mediaId)}`);
+    const iframe = createFrameFor(
+      this,
+      `https://fast.wistia.net/embed/iframe/${encodeURIComponent(mediaId)}`
+    );
 
-    iframe.setAttribute('title',
-        element.getAttribute('title') || 'Wistia Video Player');
+    iframe.setAttribute(
+      'title',
+      element.getAttribute('title') || 'Wistia Video Player'
+    );
     iframe.setAttribute('scrolling', 'no');
     iframe.setAttribute('allowtransparency', '');
 
     this.iframe_ = iframe;
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleWistiaMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleWistiaMessage_.bind(this)
     );
 
     const loaded = this.loadPromise(this.iframe_).then(() => {
@@ -174,10 +176,10 @@ class AmpWistiaPlayer extends AMP.BaseElement {
       return;
     }
 
-    const playerEvent = (data['args'] ? data['args'][0] : undefined);
+    const playerEvent = data['args'] ? data['args'][0] : undefined;
 
     if (playerEvent === 'statechange') {
-      const state = (data['args'] ? data['args'][1] : undefined);
+      const state = data['args'] ? data['args'][1] : undefined;
       redispatch(element, state, {
         'playing': VideoEvents.PLAYING,
         'paused': VideoEvents.PAUSE,
@@ -187,16 +189,16 @@ class AmpWistiaPlayer extends AMP.BaseElement {
     }
 
     if (playerEvent == 'mutechange') {
-      const isMuted = (data['args'] ? data['args'][1] : undefined);
+      const isMuted = data['args'] ? data['args'][1] : undefined;
       element.dispatchCustomEvent(mutedOrUnmutedEvent(isMuted));
       return;
     }
   }
 
   /**
-  * Sends 'listening' message to the Wistia iframe to listen for events.
-  * @private
-  */
+   * Sends 'listening' message to the Wistia iframe to listen for events.
+   * @private
+   */
   listenToFrame_() {
     this.sendCommand_('amp-listening');
   }
@@ -209,7 +211,7 @@ class AmpWistiaPlayer extends AMP.BaseElement {
   sendCommand_(command) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        this.iframe_.contentWindow./*OK*/postMessage(command, '*');
+        this.iframe_.contentWindow./*OK*/ postMessage(command, '*');
       }
     });
   }
@@ -325,7 +327,6 @@ class AmpWistiaPlayer extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpWistiaPlayer);
 });
diff --git a/extensions/amp-wistia-player/0.1/test/test-amp-wistia-player.js b/extensions/amp-wistia-player/0.1/test/test-amp-wistia-player.js
index c5e353c34485..e9a16aadcc35 100644
--- a/extensions/amp-wistia-player/0.1/test/test-amp-wistia-player.js
+++ b/extensions/amp-wistia-player/0.1/test/test-amp-wistia-player.js
@@ -16,40 +16,48 @@
 
 import '../amp-wistia-player';
 
-describes.realWin('amp-wistia-player', {
-  amp: {
-    extensions: ['amp-wistia-player'],
+describes.realWin(
+  'amp-wistia-player',
+  {
+    amp: {
+      extensions: ['amp-wistia-player'],
+    },
   },
-}, env => {
-  let win, doc;
+  env => {
+    let win, doc;
 
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getWistiaEmbed(mediaId) {
-    const wistiaEmbed = doc.createElement('amp-wistia-player');
-    wistiaEmbed.setAttribute('data-media-hashed-id', mediaId);
-    wistiaEmbed.setAttribute('width', '512');
-    wistiaEmbed.setAttribute('height', '360');
-    doc.body.appendChild(wistiaEmbed);
-    return wistiaEmbed.build()
+    function getWistiaEmbed(mediaId) {
+      const wistiaEmbed = doc.createElement('amp-wistia-player');
+      wistiaEmbed.setAttribute('data-media-hashed-id', mediaId);
+      wistiaEmbed.setAttribute('width', '512');
+      wistiaEmbed.setAttribute('height', '360');
+      doc.body.appendChild(wistiaEmbed);
+      return wistiaEmbed
+        .build()
         .then(() => wistiaEmbed.layoutCallback())
         .then(() => wistiaEmbed);
-  }
+    }
 
-  it('renders', () => {
-    return getWistiaEmbed('u8p9wq6mq8').then(wistiaEmbed => {
-      const iframe = wistiaEmbed.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal('https://fast.wistia.net/embed/iframe/u8p9wq6mq8');
+    it('renders', () => {
+      return getWistiaEmbed('u8p9wq6mq8').then(wistiaEmbed => {
+        const iframe = wistiaEmbed.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(
+          'https://fast.wistia.net/embed/iframe/u8p9wq6mq8'
+        );
+      });
     });
-  });
 
-  it('requires data-media-hashed-id', () => {
-    return getWistiaEmbed('').should.eventually.be.rejectedWith(
-        /The data-media-hashed-id attribute is required for/);
-  });
-});
+    it('requires data-media-hashed-id', () => {
+      return getWistiaEmbed('').should.eventually.be.rejectedWith(
+        /The data-media-hashed-id attribute is required for/
+      );
+    });
+  }
+);
diff --git a/extensions/amp-yotpo/0.1/amp-yotpo.js b/extensions/amp-yotpo/0.1/amp-yotpo.js
index a1976f61c32b..507b43b22189 100644
--- a/extensions/amp-yotpo/0.1/amp-yotpo.js
+++ b/extensions/amp-yotpo/0.1/amp-yotpo.js
@@ -21,7 +21,6 @@ import {removeElement} from '../../../src/dom';
 import {userAssert} from '../../../src/log';
 
 export class AmpYotpo extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -43,18 +42,29 @@ export class AmpYotpo extends AMP.BaseElement {
 
   /** @override */
   buildCallback() {
-    userAssert(this.element.getAttribute('data-app-key'),
-        'The data-app-key attribute is required for <amp-yotpo> %s',
-        this.element);
-    userAssert(this.element.getAttribute('data-widget-type'),
-        'The data-widget-type attribute is required for <amp-yotpo> %s',
-        this.element);
+    userAssert(
+      this.element.getAttribute('data-app-key'),
+      'The data-app-key attribute is required for <amp-yotpo> %s',
+      this.element
+    );
+    userAssert(
+      this.element.getAttribute('data-widget-type'),
+      'The data-widget-type attribute is required for <amp-yotpo> %s',
+      this.element
+    );
     const iframe = getIframe(this.win, this.element, 'yotpo');
     this.applyFillContent(iframe);
 
-    const unlisten = listenFor(iframe, 'embed-size', data => {
-      this.attemptChangeHeight(data['height']).catch(() => {/* do nothing */ });
-    }, /* opt_is3P */true);
+    const unlisten = listenFor(
+      iframe,
+      'embed-size',
+      data => {
+        this.attemptChangeHeight(data['height']).catch(() => {
+          /* do nothing */
+        });
+      },
+      /* opt_is3P */ true
+    );
     this.unlisteners_.push(unlisten);
 
     this.element.appendChild(iframe);
diff --git a/extensions/amp-yotpo/0.1/test/test-amp-yotpo.js b/extensions/amp-yotpo/0.1/test/test-amp-yotpo.js
index eabf47becc07..afa138d745b2 100644
--- a/extensions/amp-yotpo/0.1/test/test-amp-yotpo.js
+++ b/extensions/amp-yotpo/0.1/test/test-amp-yotpo.js
@@ -17,72 +17,76 @@
 import '../amp-yotpo';
 import {yotpo} from '../../../../3p/yotpo';
 
-describes.realWin('amp-yotpo', {
-  amp: {
-    extensions: ['amp-yotpo'],
+describes.realWin(
+  'amp-yotpo',
+  {
+    amp: {
+      extensions: ['amp-yotpo'],
+    },
   },
-}, env => {
+  env => {
+    let win, doc;
 
-  let win, doc;
+    const widgets = [
+      {name: 'MainWidget', selector: '.yotpo.yotpo-main-widget'},
+      {name: 'BottomLine', selector: '.yotpo.bottomLine'},
+      {name: 'PicturesGallery', selector: '.yotpo.yotpo-pictures-gallery'},
+      {name: 'ReviewsCarousel', selector: '.yotpo.yotpo-reviews-carousel'},
+      {name: 'badge', selector: '.yotpo.badge,.yotpo.yotpo-badge'},
+      {name: 'questions-bottomline', selector: '.yotpo.QABottomLine'},
+      {name: 'slider', selector: '.yotpo.yotpo-slider'},
+      {name: 'visual-carousel', selector: '.yotpo.yotpo-visual-carousel'},
+      {name: 'pictures-widget', selector: '.yotpo.yotpo-pictures-widget'},
+      {name: 'shoppable-gallery', selector: '.yotpo.yotpo-shoppable-gallery'},
+    ];
 
-  const widgets = [
-    {name: 'MainWidget', selector: '.yotpo.yotpo-main-widget'},
-    {name: 'BottomLine', selector: '.yotpo.bottomLine'},
-    {name: 'PicturesGallery', selector: '.yotpo.yotpo-pictures-gallery'},
-    {name: 'ReviewsCarousel', selector: '.yotpo.yotpo-reviews-carousel'},
-    {name: 'badge', selector: '.yotpo.badge,.yotpo.yotpo-badge'},
-    {name: 'questions-bottomline', selector: '.yotpo.QABottomLine'},
-    {name: 'slider', selector: '.yotpo.yotpo-slider'},
-    {name: 'visual-carousel', selector: '.yotpo.yotpo-visual-carousel'},
-    {name: 'pictures-widget', selector: '.yotpo.yotpo-pictures-widget'},
-    {name: 'shoppable-gallery', selector: '.yotpo.yotpo-shoppable-gallery'}];
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-  });
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+    });
 
-  function getYotpo(opts) {
-    const ampYotpo = doc.createElement('amp-yotpo');
-    ampYotpo.setAttribute('data-app-key', opts.appKey);
-    ampYotpo.setAttribute('width', opts.width);
-    ampYotpo.setAttribute('height', opts.height);
-    ampYotpo.setAttribute('data-widget-type', opts.widgetType);
-    doc.body.appendChild(ampYotpo);
-    return ampYotpo.build()
+    function getYotpo(opts) {
+      const ampYotpo = doc.createElement('amp-yotpo');
+      ampYotpo.setAttribute('data-app-key', opts.appKey);
+      ampYotpo.setAttribute('width', opts.width);
+      ampYotpo.setAttribute('height', opts.height);
+      ampYotpo.setAttribute('data-widget-type', opts.widgetType);
+      doc.body.appendChild(ampYotpo);
+      return ampYotpo
+        .build()
         .then(() => ampYotpo.layoutCallback())
         .then(() => ampYotpo);
-  }
-
-  it('renders iframe in amp-yotpo', () => {
-    const opts = {
-      appKey: 1234,
-      width: 100,
-      height: 200,
-      widgetType: 'BottomLine',
-    };
-    return getYotpo(opts).then(ampYotpo => {
-      const iframe = ampYotpo.firstChild;
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.getAttribute('width')).to.equal('100');
-      expect(iframe.getAttribute('height')).to.equal('200');
-    });
-  });
-
-  it('builds yotpo widgets element correctly', () => {
-    const div = doc.createElement('div');
-    div.setAttribute('id', 'c');
-    doc.body.appendChild(div);
+    }
 
-    for (let i = 0; i < widgets.length; i++) {
-      yotpo(win, {
+    it('renders iframe in amp-yotpo', () => {
+      const opts = {
         appKey: 1234,
-        widgetType: widgets[i].name,
+        width: 100,
+        height: 200,
+        widgetType: 'BottomLine',
+      };
+      return getYotpo(opts).then(ampYotpo => {
+        const iframe = ampYotpo.firstChild;
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.getAttribute('width')).to.equal('100');
+        expect(iframe.getAttribute('height')).to.equal('200');
       });
-      const ampYotpo = doc.body.getElementsByClassName(widgets[i].selector);
-      expect(ampYotpo).not.to.be.undefined;
-    }
-  });
+    });
 
-});
+    it('builds yotpo widgets element correctly', () => {
+      const div = doc.createElement('div');
+      div.setAttribute('id', 'c');
+      doc.body.appendChild(div);
+
+      for (let i = 0; i < widgets.length; i++) {
+        yotpo(win, {
+          appKey: 1234,
+          widgetType: widgets[i].name,
+        });
+        const ampYotpo = doc.body.getElementsByClassName(widgets[i].selector);
+        expect(ampYotpo).not.to.be.undefined;
+      }
+    });
+  }
+);
diff --git a/extensions/amp-youtube/0.1/amp-youtube.js b/extensions/amp-youtube/0.1/amp-youtube.js
index 7ea9149e57db..e0a45df5cb9d 100644
--- a/extensions/amp-youtube/0.1/amp-youtube.js
+++ b/extensions/amp-youtube/0.1/amp-youtube.js
@@ -38,16 +38,12 @@ import {
 } from '../../../src/dom';
 import {getData, listen} from '../../../src/event-helper';
 import {htmlFor} from '../../../src/static-template';
-import {
-  installVideoManagerForDoc,
-} from '../../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../../src/layout';
 import {setStyles} from '../../../src/style';
 
-
 const TAG = 'amp-youtube';
 
-
 // Correct PlayerStates taken from
 // https://developers.google.com/youtube/iframe_api_reference#Playback_status
 /**
@@ -70,10 +66,8 @@ const PlayerFlags = {
   HIDE_ANNOTATION: 3,
 };
 
-
 /** @implements {../../../src/video-interface.VideoInterface} */
 class AmpYoutube extends AMP.BaseElement {
-
   /** @param {!AmpElement} element */
   constructor(element) {
     super(element);
@@ -178,8 +172,9 @@ class AmpYoutube extends AMP.BaseElement {
     if (this.videoid_) {
       descriptor = `${encodeURIComponent(this.videoid_ || '')}?`;
     } else {
-      descriptor = 'live_stream?channel='
-        + `${encodeURIComponent(this.liveChannelid_ || '')}&`;
+      descriptor =
+        'live_stream?channel=' +
+        `${encodeURIComponent(this.liveChannelid_ || '')}&`;
     }
     return `${baseUrl}${descriptor}enablejsapi=1&amp=1`;
   }
@@ -201,8 +196,9 @@ class AmpYoutube extends AMP.BaseElement {
       // Autoplay is managed by video manager, do not pass it to YouTube.
       delete params['autoplay'];
       this.user().error(
-          'AMP-YOUTUBE', 'Use autoplay attribute instead of ' +
-          'data-param-autoplay');
+        'AMP-YOUTUBE',
+        'Use autoplay attribute instead of data-param-autoplay'
+      );
     }
 
     // Unless inline play policy is set explicitly, enable inline play for iOS
@@ -228,7 +224,7 @@ class AmpYoutube extends AMP.BaseElement {
     }
 
     src = addParamsToUrl(src, params);
-    return this.videoIframeSrc_ = src;
+    return (this.videoIframeSrc_ = src);
   }
 
   /** @override */
@@ -247,25 +243,25 @@ class AmpYoutube extends AMP.BaseElement {
     Services.videoManagerForDoc(this.element).register(this);
 
     this.unlistenMessage_ = listen(
-        this.win,
-        'message',
-        this.handleYoutubeMessage_.bind(this)
+      this.win,
+      'message',
+      this.handleYoutubeMessage_.bind(this)
     );
 
     const loaded = this.loadPromise(this.iframe_)
-        // Make sure the YT player is ready for this. For some reason YT player
-        // would send couple of messages but then stop. Waiting for a bit before
-        // sending the 'listening' event seems to fix that and allow YT Player
-        // to send messages continuously.
-        //
-        // This was removed in #6915 but due to #17979 it has been taken back
-        // for a workaround.
-        .then(() => Services.timerFor(this.win).promise(300))
-        .then(() => {
-          // Tell YT that we want to receive messages
-          this.listenToFrame_();
-          this.element.dispatchCustomEvent(VideoEvents.LOAD);
-        });
+      // Make sure the YT player is ready for this. For some reason YT player
+      // would send couple of messages but then stop. Waiting for a bit before
+      // sending the 'listening' event seems to fix that and allow YT Player
+      // to send messages continuously.
+      //
+      // This was removed in #6915 but due to #17979 it has been taken back
+      // for a workaround.
+      .then(() => Services.timerFor(this.win).promise(300))
+      .then(() => {
+        // Tell YT that we want to receive messages
+        this.listenToFrame_();
+        this.element.dispatchCustomEvent(VideoEvents.LOAD);
+      });
     this.playerReadyResolver_(loaded);
     return loaded;
   }
@@ -333,12 +329,14 @@ class AmpYoutube extends AMP.BaseElement {
    * @private
    */
   assertDatasourceExists_() {
-    const datasourceExists = !(this.videoid_ && this.liveChannelid_)
-      && (this.videoid_ || this.liveChannelid_);
+    const datasourceExists =
+      !(this.videoid_ && this.liveChannelid_) &&
+      (this.videoid_ || this.liveChannelid_);
     userAssert(
-        datasourceExists, 'Exactly one of data-videoid or '
-      + 'data-live-channelid should be present for <amp-youtube> %s',
-        this.element
+      datasourceExists,
+      'Exactly one of data-videoid or ' +
+        'data-live-channelid should be present for <amp-youtube> %s',
+      this.element
     );
   }
 
@@ -351,12 +349,14 @@ class AmpYoutube extends AMP.BaseElement {
   sendCommand_(command, opt_args) {
     this.playerReadyPromise_.then(() => {
       if (this.iframe_ && this.iframe_.contentWindow) {
-        const message = JSON.stringify(dict({
-          'event': 'command',
-          'func': command,
-          'args': opt_args || '',
-        }));
-        this.iframe_.contentWindow./*OK*/postMessage(message, '*');
+        const message = JSON.stringify(
+          dict({
+            'event': 'command',
+            'func': command,
+            'args': opt_args || '',
+          })
+        );
+        this.iframe_.contentWindow./*OK*/ postMessage(message, '*');
       }
     });
   }
@@ -425,9 +425,14 @@ class AmpYoutube extends AMP.BaseElement {
     if (!this.iframe_) {
       return;
     }
-    this.iframe_.contentWindow./*OK*/postMessage(JSON.stringify(dict({
-      'event': 'listening',
-    })), '*');
+    this.iframe_.contentWindow./*OK*/ postMessage(
+      JSON.stringify(
+        dict({
+          'event': 'listening',
+        })
+      ),
+      '*'
+    );
   }
 
   /** @private */
@@ -447,12 +452,15 @@ class AmpYoutube extends AMP.BaseElement {
     // TODO(mkhatib): Maybe add srcset to allow the browser to
     // load the needed size or even better match YTPlayer logic for loading
     // player thumbnails for different screen sizes for a cache win!
-    imgPlaceholder.src = 'https://i.ytimg.com/vi/' +
-        encodeURIComponent(videoid) + '/sddefault.jpg#404_is_fine';
+    imgPlaceholder.src =
+      'https://i.ytimg.com/vi/' +
+      encodeURIComponent(videoid) +
+      '/sddefault.jpg#404_is_fine';
 
     if (imgPlaceholder.hasAttribute('aria-label')) {
-      imgPlaceholder.setAttribute('alt',
-          'Loading video - ' + imgPlaceholder.getAttribute('aria-label')
+      imgPlaceholder.setAttribute(
+        'alt',
+        'Loading video - ' + imgPlaceholder.getAttribute('aria-label')
       );
     } else {
       imgPlaceholder.setAttribute('alt', 'Loading video');
@@ -462,26 +470,33 @@ class AmpYoutube extends AMP.BaseElement {
 
     // Because sddefault.jpg isn't available for all videos, we try to load
     // it and fallback to hqdefault.jpg.
-    this.loadPromise(imgPlaceholder).then(() => {
-      // A pretty ugly hack since onerror won't fire on YouTube image 404.
-      // This might be due to the fact that YouTube returns data to the request
-      // even when the status is 404. YouTube returns a placeholder image that
-      // is 120x90.
-      if (imgPlaceholder.naturalWidth == 120 &&
-          imgPlaceholder.naturalHeight == 90) {
-        throw new Error('sddefault.jpg is not found');
-      }
-    }).catch(() => {
-      imgPlaceholder.src = 'https://i.ytimg.com/vi/' +
-          encodeURIComponent(videoid) + '/hqdefault.jpg';
-      return this.loadPromise(imgPlaceholder);
-    }).then(() => {
-      this.getVsync().mutate(() => {
-        setStyles(imgPlaceholder, {
-          'visibility': '',
+    this.loadPromise(imgPlaceholder)
+      .then(() => {
+        // A pretty ugly hack since onerror won't fire on YouTube image 404.
+        // This might be due to the fact that YouTube returns data to the request
+        // even when the status is 404. YouTube returns a placeholder image that
+        // is 120x90.
+        if (
+          imgPlaceholder.naturalWidth == 120 &&
+          imgPlaceholder.naturalHeight == 90
+        ) {
+          throw new Error('sddefault.jpg is not found');
+        }
+      })
+      .catch(() => {
+        imgPlaceholder.src =
+          'https://i.ytimg.com/vi/' +
+          encodeURIComponent(videoid) +
+          '/hqdefault.jpg';
+        return this.loadPromise(imgPlaceholder);
+      })
+      .then(() => {
+        this.getVsync().mutate(() => {
+          setStyles(imgPlaceholder, {
+            'visibility': '',
+          });
         });
       });
-    });
   }
 
   // VideoInterface Implementation. See ../src/video-interface.VideoInterface
@@ -599,7 +614,6 @@ class AmpYoutube extends AMP.BaseElement {
   }
 }
 
-
 AMP.extension(TAG, '0.1', AMP => {
   AMP.registerElement(TAG, AmpYoutube);
 });
diff --git a/extensions/amp-youtube/0.1/test/test-amp-youtube.js b/extensions/amp-youtube/0.1/test/test-amp-youtube.js
index 506362b7fb08..ac7037e3702c 100644
--- a/extensions/amp-youtube/0.1/test/test-amp-youtube.js
+++ b/extensions/amp-youtube/0.1/test/test-amp-youtube.js
@@ -25,133 +25,140 @@ const EXAMPLE_VIDEOID_URL = `https://www.youtube.com/embed/${EXAMPLE_VIDEOID}?en
 const EXAMPLE_LIVE_CHANNELID_URL = `https://www.youtube.com/embed/live_stream?channel=${EXAMPLE_LIVE_CHANNELID}&enablejsapi=1&amp=1&playsinline=1`;
 const EXAMPLE_NO_COOKIE_VIDEOID_URL = `https://www.youtube-nocookie.com/embed/${EXAMPLE_VIDEOID}?enablejsapi=1&amp=1&playsinline=1`;
 
-describes.realWin('amp-youtube', {
-  amp: {
-    extensions: ['amp-youtube'],
+describes.realWin(
+  'amp-youtube',
+  {
+    amp: {
+      extensions: ['amp-youtube'],
+    },
   },
-}, function(env) {
-  this.timeout(5000);
-  let win, doc;
-  let timer;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    timer = Services.timerFor(win);
-  });
-
-  function getYt(attributes, opt_responsive, opt_beforeLayoutCallback) {
-    const yt = doc.createElement('amp-youtube');
-    for (const key in attributes) {
-      yt.setAttribute(key, attributes[key]);
-    }
-    yt.setAttribute('width', '111');
-    yt.setAttribute('height', '222');
-    if (opt_responsive) {
-      yt.setAttribute('layout', 'responsive');
-    }
-    doc.body.appendChild(yt);
-    return yt.build().then(() => {
-      if (opt_beforeLayoutCallback) {
-        opt_beforeLayoutCallback(yt);
+  function(env) {
+    this.timeout(5000);
+    let win, doc;
+    let timer;
+
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      timer = Services.timerFor(win);
+    });
+
+    function getYt(attributes, opt_responsive, opt_beforeLayoutCallback) {
+      const yt = doc.createElement('amp-youtube');
+      for (const key in attributes) {
+        yt.setAttribute(key, attributes[key]);
       }
-      return yt.layoutCallback();
-    }).then(() => {
-      const ytIframe = yt.querySelector('iframe');
-      yt.implementation_.handleYoutubeMessage_({
-        origin: 'https://www.youtube.com',
-        source: ytIframe.contentWindow,
-        data: JSON.stringify({event: 'onReady'}),
-      });
-    }).then(() => yt);
-  }
+      yt.setAttribute('width', '111');
+      yt.setAttribute('height', '222');
+      if (opt_responsive) {
+        yt.setAttribute('layout', 'responsive');
+      }
+      doc.body.appendChild(yt);
+      return yt
+        .build()
+        .then(() => {
+          if (opt_beforeLayoutCallback) {
+            opt_beforeLayoutCallback(yt);
+          }
+          return yt.layoutCallback();
+        })
+        .then(() => {
+          const ytIframe = yt.querySelector('iframe');
+          yt.implementation_.handleYoutubeMessage_({
+            origin: 'https://www.youtube.com',
+            source: ytIframe.contentWindow,
+            data: JSON.stringify({event: 'onReady'}),
+          });
+        })
+        .then(() => yt);
+    }
 
-  describe('with data-videoid', function() {
-    runTestsForDatasource(EXAMPLE_VIDEOID);
-  });
-
-  describe('with data-live-channelid', function() {
-    runTestsForDatasource(EXAMPLE_LIVE_CHANNELID);
-  });
-
-  /**
-   * This function runs generic tests for components based on
-   * data-videoid or data-live-channelid.
-   * @param {string} datasource
-   */
-  function runTestsForDatasource(datasource) {
-    it('renders responsively', () => {
-      return getYt({'data-videoid': datasource}, true).then(yt => {
-        const iframe = yt.querySelector('iframe');
-        expect(iframe).to.not.be.null;
-        expect(iframe.className).to.match(/i-amphtml-fill-content/);
-      });
+    describe('with data-videoid', function() {
+      runTestsForDatasource(EXAMPLE_VIDEOID);
     });
 
-    it('should pause if the video is playing', () => {
-      return getYt({'data-videoid': datasource}).then(yt => {
-        sandbox.spy(yt.implementation_, 'pause');
-        yt.implementation_.pauseCallback();
-        expect(yt.implementation_.pause.called).to.be.true;
-      });
+    describe('with data-live-channelid', function() {
+      runTestsForDatasource(EXAMPLE_LIVE_CHANNELID);
     });
 
-    it('should pass data-param-* attributes to the iframe src', () => {
-      return getYt({
-        'data-videoid': datasource,
-        'autoplay': '1',
-        'data-param-my-param': 'hello world',
-      }).then(yt => {
-        const iframe = yt.querySelector('iframe');
-        expect(iframe.src).to.contain('myParam=hello%20world');
-        // data-param-autoplay is black listed in favor of just autoplay
-        expect(iframe.src).to.not.contain('autoplay=1');
-        // playsinline should default to 1 if not provided.
-        expect(iframe.src).to.contain('playsinline=1');
+    /**
+     * This function runs generic tests for components based on
+     * data-videoid or data-live-channelid.
+     * @param {string} datasource
+     */
+    function runTestsForDatasource(datasource) {
+      it('renders responsively', () => {
+        return getYt({'data-videoid': datasource}, true).then(yt => {
+          const iframe = yt.querySelector('iframe');
+          expect(iframe).to.not.be.null;
+          expect(iframe.className).to.match(/i-amphtml-fill-content/);
+        });
       });
-    });
 
-    it('should add amp=1 to the iframe src', () => {
-      return getYt({
-        'data-videoid': datasource,
-      }).then(yt => {
-        const iframe = yt.querySelector('iframe');
-        expect(iframe.src).to.contain('amp=1');
+      it('should pause if the video is playing', () => {
+        return getYt({'data-videoid': datasource}).then(yt => {
+          sandbox.spy(yt.implementation_, 'pause');
+          yt.implementation_.pauseCallback();
+          expect(yt.implementation_.pause.called).to.be.true;
+        });
       });
-    });
 
-    it('should change defaults for some data-param-* when autoplaying', () => {
-      return getYt({
-        'autoplay': '',
-        'data-videoid': datasource,
-        'data-param-playsinline': '0',
-      }).then(yt => {
-        const iframe = yt.querySelector('iframe');
-        // playsinline must be set 1 even if specified as 0
-        expect(iframe.src).to.contain('playsinline=1');
-        // annotation policy should default to 3 if not specified.
-        expect(iframe.src).to.contain('iv_load_policy=3');
+      it('should pass data-param-* attributes to the iframe src', () => {
+        return getYt({
+          'data-videoid': datasource,
+          'autoplay': '1',
+          'data-param-my-param': 'hello world',
+        }).then(yt => {
+          const iframe = yt.querySelector('iframe');
+          expect(iframe.src).to.contain('myParam=hello%20world');
+          // data-param-autoplay is black listed in favor of just autoplay
+          expect(iframe.src).to.not.contain('autoplay=1');
+          // playsinline should default to 1 if not provided.
+          expect(iframe.src).to.contain('playsinline=1');
+        });
       });
-    });
 
-    it('should preload the final url', () => {
-      return getYt({
-        'autoplay': '',
-        'data-videoid': datasource,
-        'data-param-playsinline': '0',
-      }).then(yt => {
-        const {src} = yt.querySelector('iframe');
-        const preloadSpy = sandbox.spy(yt.implementation_.preconnect, 'url');
-        yt.implementation_.preconnectCallback();
-        preloadSpy.should.have.been.calledWithExactly(src);
+      it('should add amp=1 to the iframe src', () => {
+        return getYt({
+          'data-videoid': datasource,
+        }).then(yt => {
+          const iframe = yt.querySelector('iframe');
+          expect(iframe.src).to.contain('amp=1');
+        });
       });
-    });
 
-    it('should forward certain events from youtube to the amp element', () => {
-      return getYt({'data-videoid': datasource}).then(yt => {
-        const iframe = yt.querySelector('iframe');
+      it('should change defaults for some data-param-* when autoplaying', () => {
+        return getYt({
+          'autoplay': '',
+          'data-videoid': datasource,
+          'data-param-playsinline': '0',
+        }).then(yt => {
+          const iframe = yt.querySelector('iframe');
+          // playsinline must be set 1 even if specified as 0
+          expect(iframe.src).to.contain('playsinline=1');
+          // annotation policy should default to 3 if not specified.
+          expect(iframe.src).to.contain('iv_load_policy=3');
+        });
+      });
+
+      it('should preload the final url', () => {
+        return getYt({
+          'autoplay': '',
+          'data-videoid': datasource,
+          'data-param-playsinline': '0',
+        }).then(yt => {
+          const {src} = yt.querySelector('iframe');
+          const preloadSpy = sandbox.spy(yt.implementation_.preconnect, 'url');
+          yt.implementation_.preconnectCallback();
+          preloadSpy.should.have.been.calledWithExactly(src);
+        });
+      });
+
+      it('should forward certain events from youtube to the amp element', () => {
+        return getYt({'data-videoid': datasource}).then(yt => {
+          const iframe = yt.querySelector('iframe');
 
-        return Promise.resolve()
+          return Promise.resolve()
             .then(() => {
               const p = listenOncePromise(yt, VideoEvents.MUTED);
               sendFakeInfoDeliveryMessage(yt, iframe, {muted: true});
@@ -171,7 +178,8 @@ describes.realWin('amp-youtube', {
               const p = listenOncePromise(yt, VideoEvents.UNMUTED);
               sendFakeInfoDeliveryMessage(yt, iframe, {muted: false});
               return p;
-            }).then(() => {
+            })
+            .then(() => {
               // Should not send the unmute event twice if already sent once.
               const p = listenOncePromise(yt, VideoEvents.UNMUTED).then(() => {
                 assert.fail('Should not have dispatch unmute message twice');
@@ -179,174 +187,196 @@ describes.realWin('amp-youtube', {
               sendFakeInfoDeliveryMessage(yt, iframe, {muted: false});
               const successTimeout = timer.promise(10);
               return Promise.race([p, successTimeout]);
-            }).then(() => {
+            })
+            .then(() => {
               // Make sure pause and end are triggered when video ends.
               const pEnded = listenOncePromise(yt, VideoEvents.ENDED);
               const pPause = listenOncePromise(yt, VideoEvents.PAUSE);
               sendFakeInfoDeliveryMessage(yt, iframe, {playerState: 0});
               return Promise.all([pEnded, pPause]);
             });
+        });
       });
-    });
-  }
+    }
 
-  it('renders for video ids', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-      expect(iframe.tagName).to.equal('IFRAME');
-      expect(iframe.src).to.equal(EXAMPLE_VIDEOID_URL);
+    it('renders for video ids', () => {
+      return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(EXAMPLE_VIDEOID_URL);
+      });
     });
-  });
 
-  it('renders for live channel ids', () => {
-    return getYt({'data-live-channelid': EXAMPLE_LIVE_CHANNELID})
-        .then(yt => {
-          const iframe = yt.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.tagName).to.equal('IFRAME');
-          expect(iframe.src).to.equal(EXAMPLE_LIVE_CHANNELID_URL);
-        });
-  });
-
-  it('uses privacy-enhanced mode', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID, 'credentials': 'omit'})
-        .then(yt => {
-          const iframe = yt.querySelector('iframe');
-          expect(iframe).to.not.be.null;
-          expect(iframe.tagName).to.equal('IFRAME');
-          expect(iframe.src).to.equal(EXAMPLE_NO_COOKIE_VIDEOID_URL);
-        });
-  });
+    it('renders for live channel ids', () => {
+      return getYt({'data-live-channelid': EXAMPLE_LIVE_CHANNELID}).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(EXAMPLE_LIVE_CHANNELID_URL);
+      });
+    });
 
-  it('requires data-videoid or data-live-channelid', () => {
-    return allowConsoleError(() => {
-      return getYt({}).should.eventually.be.rejectedWith(
-          /Exactly one of data-videoid or data-live-channelid should/);
+    it('uses privacy-enhanced mode', () => {
+      return getYt({
+        'data-videoid': EXAMPLE_VIDEOID,
+        'credentials': 'omit',
+      }).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+        expect(iframe.tagName).to.equal('IFRAME');
+        expect(iframe.src).to.equal(EXAMPLE_NO_COOKIE_VIDEOID_URL);
+      });
     });
-  });
-
-  it('adds an img placeholder in prerender mode if source is videoid', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID}, true, function(yt) {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.be.null;
-
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder).to.not.be.null;
-      expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
-      expect(imgPlaceholder.src).to.be.equal(
-          `https://i.ytimg.com/vi/${EXAMPLE_VIDEOID}/sddefault.jpg#404_is_fine`);
-      expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal('origin');
-      expect(imgPlaceholder.getAttribute('alt')).to.equal('Loading video');
-    }).then(yt => {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder.className).to.match(/amp-hidden/);
+
+    it('requires data-videoid or data-live-channelid', () => {
+      return allowConsoleError(() => {
+        return getYt({}).should.eventually.be.rejectedWith(
+          /Exactly one of data-videoid or data-live-channelid should/
+        );
+      });
     });
-  });
-
-  it('propagates aria-label to img placeholder', () => {
-    return getYt({
-      'data-videoid': EXAMPLE_VIDEOID,
-      'aria-label': 'kind video',
-    }, true, function(yt) {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.be.null;
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder).to.not.be.null;
-      expect(imgPlaceholder.getAttribute('aria-label')).to.equal('kind video');
-      expect(imgPlaceholder.getAttribute('alt'))
-          .to.equal('Loading video - kind video');
+
+    it('adds an img placeholder in prerender mode if source is videoid', () => {
+      return getYt({'data-videoid': EXAMPLE_VIDEOID}, true, function(yt) {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.be.null;
+
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder).to.not.be.null;
+        expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
+        expect(imgPlaceholder.src).to.be.equal(
+          `https://i.ytimg.com/vi/${EXAMPLE_VIDEOID}/sddefault.jpg#404_is_fine`
+        );
+        expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal(
+          'origin'
+        );
+        expect(imgPlaceholder.getAttribute('alt')).to.equal('Loading video');
+      }).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder.className).to.match(/amp-hidden/);
+      });
     });
-  });
-
-  it('loads only sddefault when it exists if source is videoid', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID}, true, function(yt) {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.be.null;
-
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder).to.not.be.null;
-      expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
-      expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal('origin');
-    }).then(yt => {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.not.be.null;
-
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder.className).to.match(/amp-hidden/);
-      expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal('origin');
-
-      expect(imgPlaceholder.src).to.equal(
-          'https://i.ytimg.com/vi/mGENRKrdoGY/sddefault.jpg#404_is_fine');
+
+    it('propagates aria-label to img placeholder', () => {
+      return getYt(
+        {
+          'data-videoid': EXAMPLE_VIDEOID,
+          'aria-label': 'kind video',
+        },
+        true,
+        function(yt) {
+          const iframe = yt.querySelector('iframe');
+          expect(iframe).to.be.null;
+          const imgPlaceholder = yt.querySelector('img[placeholder]');
+          expect(imgPlaceholder).to.not.be.null;
+          expect(imgPlaceholder.getAttribute('aria-label')).to.equal(
+            'kind video'
+          );
+          expect(imgPlaceholder.getAttribute('alt')).to.equal(
+            'Loading video - kind video'
+          );
+        }
+      );
     });
-  });
 
-  it('loads hqdefault thumbnail source when sddefault fails', () => {
-    return getYt({'data-videoid': 'FAKE'}, true, function(yt) {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.be.null;
+    it('loads only sddefault when it exists if source is videoid', () => {
+      return getYt({'data-videoid': EXAMPLE_VIDEOID}, true, function(yt) {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.be.null;
+
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder).to.not.be.null;
+        expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
+        expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal(
+          'origin'
+        );
+      }).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
 
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder).to.not.be.null;
-      expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder.className).to.match(/amp-hidden/);
+        expect(imgPlaceholder.getAttribute('referrerpolicy')).to.equal(
+          'origin'
+        );
 
-      // Fake out the 404 image response dimensions of YT.
-      Object.defineProperty(imgPlaceholder, 'naturalWidth', {
-        get() {
-          return 120;
-        },
-      });
-      Object.defineProperty(imgPlaceholder, 'naturalHeight', {
-        get() {
-          return 90;
-        },
+        expect(imgPlaceholder.src).to.equal(
+          'https://i.ytimg.com/vi/mGENRKrdoGY/sddefault.jpg#404_is_fine'
+        );
       });
-    }).then(yt => {
-      const iframe = yt.querySelector('iframe');
-      expect(iframe).to.not.be.null;
+    });
+
+    it('loads hqdefault thumbnail source when sddefault fails', () => {
+      return getYt({'data-videoid': 'FAKE'}, true, function(yt) {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.be.null;
 
-      const imgPlaceholder = yt.querySelector('img[placeholder]');
-      expect(imgPlaceholder.className).to.match(/amp-hidden/);
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder).to.not.be.null;
+        expect(imgPlaceholder.className).to.not.match(/amp-hidden/);
 
-      expect(imgPlaceholder.src).to.equal(
-          'https://i.ytimg.com/vi/FAKE/hqdefault.jpg');
-    });
-  });
-
-  it('should propagate attribute mutations for videoid', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
-      const spy = sandbox.spy(yt.implementation_, 'sendCommand_');
-      yt.setAttribute('data-videoid', 'lBTCB7yLs8Y');
-      yt.mutatedAttributesCallback({'data-videoid': 'lBTCB7yLs8Y'});
-      expect(spy).to.be.calledWith('loadVideoById',
-          sinon.match(['lBTCB7yLs8Y']));
+        // Fake out the 404 image response dimensions of YT.
+        Object.defineProperty(imgPlaceholder, 'naturalWidth', {
+          get() {
+            return 120;
+          },
+        });
+        Object.defineProperty(imgPlaceholder, 'naturalHeight', {
+          get() {
+            return 90;
+          },
+        });
+      }).then(yt => {
+        const iframe = yt.querySelector('iframe');
+        expect(iframe).to.not.be.null;
+
+        const imgPlaceholder = yt.querySelector('img[placeholder]');
+        expect(imgPlaceholder.className).to.match(/amp-hidden/);
+
+        expect(imgPlaceholder.src).to.equal(
+          'https://i.ytimg.com/vi/FAKE/hqdefault.jpg'
+        );
+      });
     });
-  });
-
-  it('should remove iframe after unlayoutCallback', () => {
-    return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
-      const placeholder = yt.querySelector('[placeholder]');
-      const obj = yt.implementation_;
-      const unlistenSpy = sandbox.spy(obj, 'unlistenMessage_');
-      obj.unlayoutCallback();
-      expect(unlistenSpy).to.have.been.called;
-      expect(yt.querySelector('iframe')).to.be.null;
-      expect(obj.iframe_).to.be.null;
-      expect(placeholder).to.not.have.display('');
+
+    it('should propagate attribute mutations for videoid', () => {
+      return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
+        const spy = sandbox.spy(yt.implementation_, 'sendCommand_');
+        yt.setAttribute('data-videoid', 'lBTCB7yLs8Y');
+        yt.mutatedAttributesCallback({'data-videoid': 'lBTCB7yLs8Y'});
+        expect(spy).to.be.calledWith(
+          'loadVideoById',
+          sinon.match(['lBTCB7yLs8Y'])
+        );
+      });
     });
-  });
-
-  function sendFakeInfoDeliveryMessage(yt, iframe, info) {
-    yt.implementation_.handleYoutubeMessage_({
-      origin: 'https://www.youtube.com',
-      source: iframe.contentWindow,
-      data: JSON.stringify({
-        event: 'infoDelivery',
-        info,
-      }),
+
+    it('should remove iframe after unlayoutCallback', () => {
+      return getYt({'data-videoid': EXAMPLE_VIDEOID}).then(yt => {
+        const placeholder = yt.querySelector('[placeholder]');
+        const obj = yt.implementation_;
+        const unlistenSpy = sandbox.spy(obj, 'unlistenMessage_');
+        obj.unlayoutCallback();
+        expect(unlistenSpy).to.have.been.called;
+        expect(yt.querySelector('iframe')).to.be.null;
+        expect(obj.iframe_).to.be.null;
+        expect(placeholder).to.not.have.display('');
+      });
     });
+
+    function sendFakeInfoDeliveryMessage(yt, iframe, info) {
+      yt.implementation_.handleYoutubeMessage_({
+        origin: 'https://www.youtube.com',
+        source: iframe.contentWindow,
+        data: JSON.stringify({
+          event: 'infoDelivery',
+          info,
+        }),
+      });
+    }
   }
-});
+);
diff --git a/gulpfile.js b/gulpfile.js
index b048716624d9..7ced1e51e653 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -17,16 +17,30 @@
 /* global require */
 
 const gulp = require('gulp-help')(require('gulp'));
+const {
+  buildExperiments,
+  buildLoginDone,
+  dist,
+} = require('./build-system/tasks/dist');
+const {
+  compileAccessExpr,
+  compileBindExpr,
+  compileCssExpr,
+} = require('./build-system/tasks/compile-expr');
+const {
+  process3pGithubPr,
+} = require('./build-system/tasks/process-3p-github-pr');
+const {
+  processGithubIssues,
+} = require('./build-system/tasks/process-github-issues');
 const {ava} = require('./build-system/tasks/ava');
 const {build, defaultTask, watch} = require('./build-system/tasks/build');
-const {buildExperiments, buildLoginDone, dist} = require('./build-system/tasks/dist');
 const {bundleSize} = require('./build-system/tasks/bundle-size');
 const {cachesJson, jsonSyntax} = require('./build-system/tasks/json-check');
 const {changelog, changelogUpdate} = require('./build-system/tasks/changelog');
 const {checkLinks} = require('./build-system/tasks/check-links');
 const {checkTypes} = require('./build-system/tasks/check-types');
 const {clean} = require('./build-system/tasks/clean');
-const {compileAccessExpr, compileBindExpr, compileCssExpr} = require('./build-system/tasks/compile-expr');
 const {createGoldenCss} = require('./build-system/tasks/create-golden-css');
 const {css} = require('./build-system/tasks/css');
 const {csvifySize} = require('./build-system/tasks/csvify-size');
@@ -41,8 +55,6 @@ const {nailgunStart, nailgunStop} = require('./build-system/tasks/nailgun');
 const {prCheck} = require('./build-system/tasks/pr-check');
 const {prependGlobal} = require('./build-system/tasks/prepend-global');
 const {presubmit} = require('./build-system/tasks/presubmit-checks');
-const {process3pGithubPr} = require('./build-system/tasks/process-3p-github-pr');
-const {processGithubIssues} = require('./build-system/tasks/process-github-issues');
 const {releaseTag} = require('./build-system/tasks/release-tagging');
 const {serve} = require('./build-system/tasks/serve.js');
 const {size} = require('./build-system/tasks/size');
@@ -52,7 +64,6 @@ const {updatePackages} = require('./build-system/tasks/update-packages');
 const {validator, validatorWebui} = require('./build-system/tasks/validator');
 const {visualDiff} = require('./build-system/tasks/visual-diff');
 
-
 // Keep this list alphabetized.
 gulp.task('ava', ava);
 gulp.task('build', build);
diff --git a/package.json b/package.json
index 61a526f520a5..bccf671b7a34 100644
--- a/package.json
+++ b/package.json
@@ -76,6 +76,7 @@
     "envify": "4.1.0",
     "escodegen": "1.11.1",
     "eslint": "5.16.0",
+    "eslint-config-prettier": "4.1.0",
     "eslint-plugin-amphtml-internal": "file:build-system/eslint-rules",
     "eslint-plugin-chai-expect": "2.0.1",
     "eslint-plugin-eslint-plugin": "2.0.1",
@@ -83,6 +84,7 @@
     "eslint-plugin-jasmine": "2.10.1",
     "eslint-plugin-jsdoc": "4.8.3",
     "eslint-plugin-notice": "0.7.8",
+    "eslint-plugin-prettier": "3.0.1",
     "eslint-plugin-sort-imports-es6-autofix": "0.4.0",
     "eslint-plugin-sort-requires": "2.1.0",
     "event-stream": "4.0.1",
@@ -150,6 +152,7 @@
     "plugin-error": "1.0.1",
     "postcss": "7.0.16",
     "postcss-import": "12.0.1",
+    "prettier": "1.17.1",
     "pretty-bytes": "5.2.0",
     "pumpify": "1.5.1",
     "react": "16.8.3",
diff --git a/src/3p-frame-messaging.js b/src/3p-frame-messaging.js
index ffebe980cf11..bb46beb1ff11 100644
--- a/src/3p-frame-messaging.js
+++ b/src/3p-frame-messaging.js
@@ -19,7 +19,6 @@ import {dict} from './utils/object';
 import {internalListenImplementation} from './event-helper-listen';
 import {parseJson} from './json';
 
-
 /** @const */
 const AMP_MESSAGE_PREFIX = 'amp-';
 export const CONSTANTS = {
@@ -74,10 +73,13 @@ export const MessageType = {
  */
 export function listen(element, eventType, listener, opt_evtListenerOpts) {
   return internalListenImplementation(
-      element, eventType, listener, opt_evtListenerOpts);
+    element,
+    eventType,
+    listener,
+    opt_evtListenerOpts
+  );
 }
 
-
 /**
  * Serialize an AMP post message. Output looks like:
  * 'amp-011481323099490{"type":"position","sentinel":"12345","foo":"bar"}'
@@ -87,8 +89,12 @@ export function listen(element, eventType, listener, opt_evtListenerOpts) {
  * @param {?string=} rtvVersion
  * @return {string}
  */
-export function serializeMessage(type, sentinel, data = dict(),
-  rtvVersion = null) {
+export function serializeMessage(
+  type,
+  sentinel,
+  data = dict(),
+  rtvVersion = null
+) {
   // TODO: consider wrap the data in a "data" field. { type, sentinal, data }
   const message = data;
   message['type'] = type;
@@ -96,7 +102,6 @@ export function serializeMessage(type, sentinel, data = dict(),
   return AMP_MESSAGE_PREFIX + (rtvVersion || '') + JSON.stringify(message);
 }
 
-
 /**
  * Deserialize an AMP post message.
  * Returns null if it's not valid AMP message format.
@@ -118,16 +123,17 @@ export function deserializeMessage(message) {
   }
 }
 
-
 /**
  *  Returns true if message looks like it is an AMP postMessage
  *  @param {*} message
  *  @return {boolean}
  */
 export function isAmpMessage(message) {
-  return (typeof message == 'string' &&
-      message.indexOf(AMP_MESSAGE_PREFIX) == 0 &&
-      message.indexOf('{') != -1);
+  return (
+    typeof message == 'string' &&
+    message.indexOf(AMP_MESSAGE_PREFIX) == 0 &&
+    message.indexOf('{') != -1
+  );
 }
 
 /** @typedef {{creativeId: string, message: string}} */
diff --git a/src/3p-frame.js b/src/3p-frame.js
index 285680d06057..10a1fe4a155f 100644
--- a/src/3p-frame.js
+++ b/src/3p-frame.js
@@ -54,8 +54,7 @@ function getFrameAttributes(parentWindow, element, opt_type, opt_context) {
   let attributes = dict();
   // Do these first, as the other attributes have precedence.
   addDataAndJsonAttributes_(element, attributes);
-  attributes = getContextMetadata(parentWindow, element, sentinel,
-      attributes);
+  attributes = getContextMetadata(parentWindow, element, sentinel, attributes);
   attributes['type'] = type;
   Object.assign(attributes['_context'], opt_context);
   return attributes;
@@ -75,38 +74,49 @@ function getFrameAttributes(parentWindow, element, opt_type, opt_context) {
  * @return {!HTMLIFrameElement} The iframe.
  */
 export function getIframe(
-  parentWindow, parentElement, opt_type, opt_context,
-  {disallowCustom, allowFullscreen} = {}) {
+  parentWindow,
+  parentElement,
+  opt_type,
+  opt_context,
+  {disallowCustom, allowFullscreen} = {}
+) {
   // Check that the parentElement is already in DOM. This code uses a new and
   // fast `isConnected` API and thus only used when it's available.
   devAssert(
-      parentElement['isConnected'] === undefined ||
+    parentElement['isConnected'] === undefined ||
       parentElement['isConnected'] === true,
-      'Parent element must be in DOM');
-  const attributes =
-      getFrameAttributes(parentWindow, parentElement, opt_type, opt_context);
-  const iframe = /** @type {!HTMLIFrameElement} */ (
-    parentWindow.document.createElement('iframe'));
+    'Parent element must be in DOM'
+  );
+  const attributes = getFrameAttributes(
+    parentWindow,
+    parentElement,
+    opt_type,
+    opt_context
+  );
+  const iframe = /** @type {!HTMLIFrameElement} */ (parentWindow.document.createElement(
+    'iframe'
+  ));
 
   if (!count[attributes['type']]) {
     count[attributes['type']] = 0;
   }
   count[attributes['type']] += 1;
 
-  const baseUrl = getBootstrapBaseUrl(
-      parentWindow, undefined, disallowCustom);
+  const baseUrl = getBootstrapBaseUrl(parentWindow, undefined, disallowCustom);
   const host = parseUrlDeprecated(baseUrl).hostname;
   // This name attribute may be overwritten if this frame is chosen to
   // be the master frame. That is ok, as we will read the name off
   // for our uses before that would occur.
   // @see https://github.com/ampproject/amphtml/blob/master/3p/integration.js
-  const name = JSON.stringify(dict({
-    'host': host,
-    'type': attributes['type'],
-    // https://github.com/ampproject/amphtml/pull/2955
-    'count': count[attributes['type']],
-    'attributes': attributes,
-  }));
+  const name = JSON.stringify(
+    dict({
+      'host': host,
+      'type': attributes['type'],
+      // https://github.com/ampproject/amphtml/pull/2955
+      'count': count[attributes['type']],
+      'attributes': attributes,
+    })
+  );
 
   iframe.src = baseUrl;
   iframe.ampLocation = parseUrlDeprecated(baseUrl);
@@ -135,15 +145,19 @@ export function getIframe(
     // Block synchronous XHR in ad. These are very rare, but super bad for UX
     // as they block the UI thread for the arbitrary amount of time until the
     // request completes.
-    iframe.setAttribute('allow', 'sync-xhr \'none\';');
+    iframe.setAttribute('allow', "sync-xhr 'none';");
   }
   const excludeFromSandbox = ['facebook'];
-  if (isExperimentOn(parentWindow, 'sandbox-ads')
-      && !excludeFromSandbox.includes(opt_type)) {
+  if (
+    isExperimentOn(parentWindow, 'sandbox-ads') &&
+    !excludeFromSandbox.includes(opt_type)
+  ) {
     applySandbox(iframe);
   }
-  iframe.setAttribute('data-amp-3p-sentinel',
-      attributes['_context']['sentinel']);
+  iframe.setAttribute(
+    'data-amp-3p-sentinel',
+    attributes['_context']['sentinel']
+  );
   return iframe;
 }
 
@@ -170,8 +184,9 @@ export function addDataAndJsonAttributes_(element, attributes) {
     const obj = tryParseJson(json);
     if (obj === undefined) {
       throw user().createError(
-          'Error parsing JSON in json attribute in element %s',
-          element);
+        'Error parsing JSON in json attribute in element %s',
+        element
+      );
     }
     for (const key in obj) {
       attributes[key] = obj[key];
@@ -206,7 +221,10 @@ export function preloadBootstrap(win, preconnect, opt_disallowCustom) {
  * @visibleForTesting
  */
 export function getBootstrapBaseUrl(
-  parentWindow, opt_strictForUnitTest, opt_disallowCustom) {
+  parentWindow,
+  opt_strictForUnitTest,
+  opt_disallowCustom
+) {
   const customBootstrapBaseUrl = opt_disallowCustom
     ? null
     : getCustomBootstrapBaseUrl(parentWindow, opt_strictForUnitTest);
@@ -240,10 +258,13 @@ export function getDefaultBootstrapBaseUrl(parentWindow, opt_srcFileBasename) {
   }
   // Ensure same sub-domain is used despite potentially different file.
   parentWindow.defaultBootstrapSubDomain =
-      parentWindow.defaultBootstrapSubDomain || getSubDomain(parentWindow);
-  return 'https://' + parentWindow.defaultBootstrapSubDomain +
-      `.${urls.thirdPartyFrameHost}/${internalRuntimeVersion()}/` +
-      `${srcFileBasename}.html`;
+    parentWindow.defaultBootstrapSubDomain || getSubDomain(parentWindow);
+  return (
+    'https://' +
+    parentWindow.defaultBootstrapSubDomain +
+    `.${urls.thirdPartyFrameHost}/${internalRuntimeVersion()}/` +
+    `${srcFileBasename}.html`
+  );
 }
 
 /**
@@ -253,11 +274,15 @@ export function getDefaultBootstrapBaseUrl(parentWindow, opt_srcFileBasename) {
  * @return {string}
  */
 export function getDevelopmentBootstrapBaseUrl(parentWindow, srcFileBasename) {
-  return overrideBootstrapBaseUrl || getAdsLocalhost(parentWindow)
-    + '/dist.3p/'
-    + (getMode().minified ? `${internalRuntimeVersion()}/${srcFileBasename}`
-      : `current/${srcFileBasename}.max`)
-    + '.html';
+  return (
+    overrideBootstrapBaseUrl ||
+    getAdsLocalhost(parentWindow) +
+      '/dist.3p/' +
+      (getMode().minified
+        ? `${internalRuntimeVersion()}/${srcFileBasename}`
+        : `current/${srcFileBasename}.max`) +
+      '.html'
+  );
 }
 
 /**
@@ -311,25 +336,33 @@ export function getRandom(win) {
  * @return {?string}
  */
 function getCustomBootstrapBaseUrl(parentWindow, opt_strictForUnitTest) {
-  const meta = parentWindow.document
-      .querySelector('meta[name="amp-3p-iframe-src"]');
+  const meta = parentWindow.document.querySelector(
+    'meta[name="amp-3p-iframe-src"]'
+  );
   if (!meta) {
     return null;
   }
   const url = assertHttpsUrl(meta.getAttribute('content'), meta);
-  userAssert(url.indexOf('?') == -1,
-      '3p iframe url must not include query string %s in element %s.',
-      url, meta);
+  userAssert(
+    url.indexOf('?') == -1,
+    '3p iframe url must not include query string %s in element %s.',
+    url,
+    meta
+  );
   // This is not a security primitive, we just don't want this to happen in
   // practice. People could still redirect to the same origin, but they cannot
   // redirect to the proxy origin which is the important one.
   const parsed = parseUrlDeprecated(url);
-  userAssert((parsed.hostname == 'localhost' && !opt_strictForUnitTest) ||
+  userAssert(
+    (parsed.hostname == 'localhost' && !opt_strictForUnitTest) ||
       parsed.origin != parseUrlDeprecated(parentWindow.location.href).origin,
-  '3p iframe url must not be on the same origin as the current document ' +
+    '3p iframe url must not be on the same origin as the current document ' +
       '%s (%s) in element %s. See https://github.com/ampproject/amphtml' +
-      '/blob/master/spec/amp-iframe-origin-policy.md for details.', url,
-  parsed.origin, meta);
+      '/blob/master/spec/amp-iframe-origin-policy.md for details.',
+    url,
+    parsed.origin,
+    meta
+  );
   return `${url}?${internalRuntimeVersion()}`;
 }
 
@@ -376,7 +409,7 @@ export function applySandbox(iframe) {
   for (let i = 0; i < requiredFlags.length; i++) {
     const flag = requiredFlags[i];
     if (!iframe.sandbox.supports(flag)) {
-      dev().info(TAG, 'Iframe doesn\'t support %s', flag);
+      dev().info(TAG, "Iframe doesn't support %s", flag);
       return;
     }
   }
diff --git a/src/ad-cid.js b/src/ad-cid.js
index d506363c5eb1..7fa11f270092 100644
--- a/src/ad-cid.js
+++ b/src/ad-cid.js
@@ -29,8 +29,11 @@ export function getAdCid(adElement) {
   if (!config || !config.clientIdScope) {
     return Promise.resolve();
   }
-  return getOrCreateAdCid(adElement.getAmpDoc(), config.clientIdScope,
-      config.clientIdCookieName);
+  return getOrCreateAdCid(
+    adElement.getAmpDoc(),
+    config.clientIdScope,
+    config.clientIdCookieName
+  );
 }
 
 /**
@@ -41,29 +44,39 @@ export function getAdCid(adElement) {
  * @return {!Promise<string|undefined>} A promise for a CID or undefined.
  */
 export function getOrCreateAdCid(
-  ampDoc, clientIdScope, opt_clientIdCookieName, opt_timeout) {
-  const timeout = isNaN(opt_timeout) || opt_timeout == null ?
-    1000 : opt_timeout;
+  ampDoc,
+  clientIdScope,
+  opt_clientIdCookieName,
+  opt_timeout
+) {
+  const timeout =
+    isNaN(opt_timeout) || opt_timeout == null ? 1000 : opt_timeout;
   const cidPromise = Services.cidForDoc(ampDoc).then(cidService => {
     if (!cidService) {
       return;
     }
-    return cidService.get({
-      scope: dev().assertString(clientIdScope),
-      createCookieIfNotPresent: true,
-      cookieName: opt_clientIdCookieName,
-    }, Promise.resolve(undefined)).catch(error => {
-      // Not getting a CID is not fatal.
-      dev().error('AD-CID', error);
-      return undefined;
-    });
+    return cidService
+      .get(
+        {
+          scope: dev().assertString(clientIdScope),
+          createCookieIfNotPresent: true,
+          cookieName: opt_clientIdCookieName,
+        },
+        Promise.resolve(undefined)
+      )
+      .catch(error => {
+        // Not getting a CID is not fatal.
+        dev().error('AD-CID', error);
+        return undefined;
+      });
   });
   // The CID should never be crucial for an ad. If it does not come within
   // 1 second, assume it will never arrive.
   return Services.timerFor(ampDoc.win)
-      .timeoutPromise(timeout, cidPromise, 'cid timeout').catch(error => {
-        // Timeout is not fatal.
-        dev().warn('AD-CID', error);
-        return undefined;
-      });
+    .timeoutPromise(timeout, cidPromise, 'cid timeout')
+    .catch(error => {
+      // Timeout is not fatal.
+      dev().warn('AD-CID', error);
+      return undefined;
+    });
 }
diff --git a/src/ad-helper.js b/src/ad-helper.js
index 030a4b327948..b6b62143286e 100644
--- a/src/ad-helper.js
+++ b/src/ad-helper.js
@@ -85,7 +85,7 @@ export function getAdContainer(element) {
     let el = element.parentElement;
     while (el && el.tagName != 'BODY') {
       if (CONTAINERS[el.tagName]) {
-        return element[AD_CONTAINER_PROP] = el.tagName;
+        return (element[AD_CONTAINER_PROP] = el.tagName);
       }
       el = el.parentElement;
     }
@@ -108,12 +108,10 @@ export function getAmpAdResourceId(node, topWin) {
     if (frameParent.nodeName == 'AMP-AD') {
       return String(frameParent.getResourceId());
     }
-  } catch (e) {
-  }
+  } catch (e) {}
   // Whether we entered the catch above (e.g. due to attempt to access
   // across xdomain boundary), or failed to enter the if further above, the
   // node is not within a friendly amp-ad tag. So, there is no amp-ad
   // resource ID. How to handle that is up to the caller, but see TODO above.
   return null;
 }
-
diff --git a/src/amp-shadow.js b/src/amp-shadow.js
index 02d6cd157243..48c5d054bb27 100644
--- a/src/amp-shadow.js
+++ b/src/amp-shadow.js
@@ -62,21 +62,27 @@ if (isExperimentOn(self, 'ampdoc-shell')) {
   installPerformanceService(self);
   const ampdocService = Services.ampdocServiceFor(self);
   const ampdocShell = ampdocService.installShellShadowDoc();
-  installStylesForDoc(ampdocShell, cssText, () => {
-    installAmpdocServices(ampdocShell);
+  installStylesForDoc(
+    ampdocShell,
+    cssText,
+    () => {
+      installAmpdocServices(ampdocShell);
 
-    // Builtins.
-    installBuiltins(self);
+      // Builtins.
+      installBuiltins(self);
 
-    // Final configuration and stubbing.
-    adoptShadowMode(self);
+      // Final configuration and stubbing.
+      adoptShadowMode(self);
 
-    // Pre-stub already known elements.
-    stubElementsForDoc(ampdocShell);
+      // Pre-stub already known elements.
+      stubElementsForDoc(ampdocShell);
 
-    makeBodyVisible(self.document);
-    Services.resourcesForDoc(ampdocShell).ampInitComplete();
-  }, /* opt_isRuntimeCss */ true, /* opt_ext */ 'amp-runtime');
+      makeBodyVisible(self.document);
+      Services.resourcesForDoc(ampdocShell).ampInitComplete();
+    },
+    /* opt_isRuntimeCss */ true,
+    /* opt_ext */ 'amp-runtime'
+  );
 } else {
   // PWA shell manages its own visibility and shadow ampdocs their own.
   bodyAlwaysVisible(self);
@@ -92,8 +98,12 @@ if (isExperimentOn(self, 'ampdoc-shell')) {
 // tag to give some information that can be used in error reports.
 // (At least by sophisticated users).
 if (self.console) {
-  (console.info || console.log).call(console,
-      `Powered by AMP ⚡ HTML shadows – Version ${internalRuntimeVersion()}`);
+  (console.info || console.log).call(
+    console,
+    `Powered by AMP ⚡ HTML shadows – Version ${internalRuntimeVersion()}`
+  );
 }
-self.document.documentElement.setAttribute('amp-version',
-    internalRuntimeVersion());
+self.document.documentElement.setAttribute(
+  'amp-version',
+  internalRuntimeVersion()
+);
diff --git a/src/amp.js b/src/amp.js
index 448be8a7ce7e..a5bb7fc3981f 100644
--- a/src/amp.js
+++ b/src/amp.js
@@ -91,58 +91,69 @@ if (shouldMainBootstrapRun) {
     installPerformanceService(self);
     /** @const {!./service/performance-impl.Performance} */
     const perf = Services.performanceFor(self);
-    if (self.document.documentElement
-        .hasAttribute('i-amphtml-no-boilerplate')) {
+    if (
+      self.document.documentElement.hasAttribute('i-amphtml-no-boilerplate')
+    ) {
       perf.addEnabledExperiment('no-boilerplate');
     }
     installPlatformService(self);
     fontStylesheetTimeout(self);
     perf.tick('is');
-    installStylesForDoc(ampdoc, cssText, () => {
-      startupChunk(self.document, function services() {
-        // Core services.
-        installRuntimeServices(self);
-        installAmpdocServices(ampdoc);
-        // We need the core services (viewer/resources) to start instrumenting
-        perf.coreServicesAvailable();
-        maybeTrackImpression(self);
-      });
-      startupChunk(self.document, function adoptWindow() {
-        adopt(self);
-      });
-      startupChunk(self.document, function builtins() {
-        // Builtins.
-        installBuiltins(self);
-      });
-      startupChunk(self.document, function stub() {
-        // Pre-stub already known elements.
-        stubElementsForDoc(ampdoc);
-      });
-      startupChunk(self.document, function final() {
-        installPullToRefreshBlocker(self);
-        installAutoLightboxExtension(ampdoc);
+    installStylesForDoc(
+      ampdoc,
+      cssText,
+      () => {
+        startupChunk(self.document, function services() {
+          // Core services.
+          installRuntimeServices(self);
+          installAmpdocServices(ampdoc);
+          // We need the core services (viewer/resources) to start instrumenting
+          perf.coreServicesAvailable();
+          maybeTrackImpression(self);
+        });
+        startupChunk(self.document, function adoptWindow() {
+          adopt(self);
+        });
+        startupChunk(self.document, function builtins() {
+          // Builtins.
+          installBuiltins(self);
+        });
+        startupChunk(self.document, function stub() {
+          // Pre-stub already known elements.
+          stubElementsForDoc(ampdoc);
+        });
+        startupChunk(self.document, function final() {
+          installPullToRefreshBlocker(self);
+          installAutoLightboxExtension(ampdoc);
 
-        maybeValidate(self);
-        makeBodyVisible(self.document);
-      });
-      startupChunk(self.document, function finalTick() {
-        perf.tick('e_is');
-        Services.resourcesForDoc(ampdoc).ampInitComplete();
-        // TODO(erwinm): move invocation of the `flush` method when we have the
-        // new ticks in place to batch the ticks properly.
-        perf.flush();
-      });
-    }, /* opt_isRuntimeCss */ true, /* opt_ext */ 'amp-runtime');
+          maybeValidate(self);
+          makeBodyVisible(self.document);
+        });
+        startupChunk(self.document, function finalTick() {
+          perf.tick('e_is');
+          Services.resourcesForDoc(ampdoc).ampInitComplete();
+          // TODO(erwinm): move invocation of the `flush` method when we have the
+          // new ticks in place to batch the ticks properly.
+          perf.flush();
+        });
+      },
+      /* opt_isRuntimeCss */ true,
+      /* opt_ext */ 'amp-runtime'
+    );
   });
 
   // Output a message to the console and add an attribute to the <html>
   // tag to give some information that can be used in error reports.
   // (At least by sophisticated users).
   if (self.console) {
-    (console.info || console.log).call(console,
-        `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
-        self.location.href);
+    (console.info || console.log).call(
+      console,
+      `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
+      self.location.href
+    );
   }
-  self.document.documentElement.setAttribute('amp-version',
-      internalRuntimeVersion());
+  self.document.documentElement.setAttribute(
+    'amp-version',
+    internalRuntimeVersion()
+  );
 }
diff --git a/src/animation.js b/src/animation.js
index 219a4634b8f5..727e84fa31c1 100644
--- a/src/animation.js
+++ b/src/animation.js
@@ -31,7 +31,6 @@ const NOOP_CALLBACK = function() {};
  * achieve the desired effect.
  */
 export class Animation {
-
   /**
    * Creates and starts animation with a single segment. Returns AnimationPlayer
    * object that can be used to monitor or control animation.
@@ -45,9 +44,9 @@ export class Animation {
    */
   static animate(contextNode, transition, duration, opt_curve) {
     return new Animation(contextNode)
-        .setCurve(opt_curve)
-        .add(0, transition, 1)
-        .start(duration);
+      .setCurve(opt_curve)
+      .add(0, transition, 1)
+      .start(duration);
   }
 
   /**
@@ -116,13 +115,17 @@ export class Animation {
    * @return {!AnimationPlayer}
    */
   start(duration) {
-    const player = new AnimationPlayer(this.vsync_, this.contextNode_,
-        this.segments_, this.curve_, duration);
+    const player = new AnimationPlayer(
+      this.vsync_,
+      this.contextNode_,
+      this.segments_,
+      this.curve_,
+      duration
+    );
     return player;
   }
 }
 
-
 /**
  * AnimationPlayer allows tracking and monitoring of the running animation.
  * Most importantly it exposes methods "then" and "thenAlways" that have the
@@ -133,7 +136,6 @@ export class Animation {
  * implements {IThenable}
  */
 class AnimationPlayer {
-
   /**
    * @param {!./service/vsync-impl.Vsync} vsync
    * @param {!Node} contextNode
@@ -142,7 +144,6 @@ class AnimationPlayer {
    * @param {./time.timeDef} duration
    */
   constructor(vsync, contextNode, segments, defaultCurve, duration) {
-
     /** @private @const {!./service/vsync-impl.Vsync} */
     this.vsync_ = vsync;
 
@@ -257,7 +258,7 @@ class AnimationPlayer {
       // Sort in the completion order.
       if (this.segments_.length > 1) {
         this.segments_.sort((s1, s2) => {
-          return (s1.delay + s1.duration) - (s2.delay + s2.duration);
+          return s1.delay + s1.duration - (s2.delay + s2.duration);
         });
       }
       try {
@@ -293,8 +294,10 @@ class AnimationPlayer {
       return;
     }
     const currentTime = Date.now();
-    const normLinearTime = Math.min((currentTime - this.startTime_) /
-        this.duration_, 1);
+    const normLinearTime = Math.min(
+      (currentTime - this.startTime_) / this.duration_,
+      1
+    );
 
     // Start segments due to be started
     for (let i = 0; i < this.segments_.length; i++) {
@@ -334,8 +337,10 @@ class AnimationPlayer {
     let normLinearTime;
     let normTime;
     if (segment.duration > 0) {
-      normLinearTime = Math.min((totalLinearTime - segment.delay) /
-          segment.duration, 1);
+      normLinearTime = Math.min(
+        (totalLinearTime - segment.delay) / segment.duration,
+        1
+      );
       normTime = normLinearTime;
       if (segment.curve && normTime != 1) {
         try {
@@ -363,7 +368,6 @@ class AnimationPlayer {
   }
 }
 
-
 /**
  * @typedef {{
  *   delay: ./time.normtimeDef,
@@ -374,7 +378,6 @@ class AnimationPlayer {
  */
 let SegmentDef;
 
-
 /**
  * @typedef {{
  *   delay: ./time.normtimeDef,
diff --git a/src/async-input.js b/src/async-input.js
index dff8364a67e6..68e5074c7761 100644
--- a/src/async-input.js
+++ b/src/async-input.js
@@ -30,7 +30,6 @@
  * @interface
  */
 export class AsyncInput {
-
   /**
    * Called to get the asynchronous value of an
    * AsyncInput field.
@@ -55,11 +54,10 @@ export const AsyncInputAttributes = {
    * Required attribute that must be asserted by every async-input
    * Element. This is used by AMP form to add the key
    * for the form submission request
-  */
+   */
   NAME: 'name',
 };
 
-
 /**
  * Classes
  *
@@ -80,4 +78,3 @@ export const AsyncInputClasses = {
    */
   'ASYNC_INPUT': 'i-amphtml-async-input',
 };
-
diff --git a/src/auto-lightbox.js b/src/auto-lightbox.js
index 673b33c4b4c2..38552b2b3e0e 100644
--- a/src/auto-lightbox.js
+++ b/src/auto-lightbox.js
@@ -19,7 +19,6 @@ import {Services} from './services';
 import {dev} from './log';
 import {isExperimentOn} from './experiments';
 
-
 /** @const @enum {string} */
 export const AutoLightboxEvents = {
   // Triggered when the lightbox attribute is newly set on an item in order to
@@ -27,7 +26,6 @@ export const AutoLightboxEvents = {
   NEWLY_SET: 'amp-auto-lightbox:newly-set',
 };
 
-
 /**
  * @param {!./service/ampdoc-impl.AmpDoc} ampdoc
  */
@@ -36,13 +34,18 @@ export function installAutoLightboxExtension(ampdoc) {
   if (!isExperimentOn(win, 'amp-auto-lightbox')) {
     return;
   }
-  chunk(ampdoc, () => {
-    Services.extensionsFor(win)
-        .installExtensionForDoc(ampdoc, 'amp-auto-lightbox');
-  }, ChunkPriority.LOW);
+  chunk(
+    ampdoc,
+    () => {
+      Services.extensionsFor(win).installExtensionForDoc(
+        ampdoc,
+        'amp-auto-lightbox'
+      );
+    },
+    ChunkPriority.LOW
+  );
 }
 
-
 /**
  * @param {!Element} element
  * @return {boolean}
@@ -55,16 +58,22 @@ export function isActionableByTap(element) {
     return true;
   }
   const action = Services.actionServiceForDoc(element);
-  const hasTapAction = action.hasResolvableAction(element, 'tap',
-      dev().assertElement(element.parentElement));
+  const hasTapAction = action.hasResolvableAction(
+    element,
+    'tap',
+    dev().assertElement(element.parentElement)
+  );
   if (hasTapAction) {
     return true;
   }
   const actionables = element.querySelectorAll('[on]');
   for (let i = 0; i < actionables.length; i++) {
     const actionable = actionables[i];
-    const hasTapAction = action.hasResolvableAction(actionable, 'tap',
-        dev().assertElement(actionable.parentElement));
+    const hasTapAction = action.hasResolvableAction(
+      actionable,
+      'tap',
+      dev().assertElement(actionable.parentElement)
+    );
     if (hasTapAction) {
       return true;
     }
diff --git a/src/base-element.js b/src/base-element.js
index 3ff0f45eec6e..3d35443899f8 100644
--- a/src/base-element.js
+++ b/src/base-element.js
@@ -192,15 +192,15 @@ export class BaseElement {
   }
 
   /**
-  * This is the priority of loading elements (layoutCallback). Used only to
-  * determine layout timing and preloading priority. Does not affect build time,
-  * etc.
-  *
-  * The lower the number, the higher the priority.
-  *
-  * The default priority for base elements is LayoutPriority.CONTENT.
-  * @return {number}
-  */
+   * This is the priority of loading elements (layoutCallback). Used only to
+   * determine layout timing and preloading priority. Does not affect build time,
+   * etc.
+   *
+   * The lower the number, the higher the priority.
+   *
+   * The default priority for base elements is LayoutPriority.CONTENT.
+   * @return {number}
+   */
   getLayoutPriority() {
     return LayoutPriority.CONTENT;
   }
@@ -217,8 +217,9 @@ export class BaseElement {
    * @restricted
    */
   updateLayoutPriority(newLayoutPriority) {
-    this.element.getResources().updateLayoutPriority(
-        this.element, newLayoutPriority);
+    this.element
+      .getResources()
+      .updateLayoutPriority(this.element, newLayoutPriority);
   }
 
   /** @return {!Layout} */
@@ -289,7 +290,7 @@ export class BaseElement {
     let policyId = null;
     if (this.element.hasAttribute('data-block-on-consent')) {
       policyId =
-          this.element.getAttribute('data-block-on-consent') || 'default';
+        this.element.getAttribute('data-block-on-consent') || 'default';
     }
     return policyId;
   }
@@ -498,24 +499,21 @@ export class BaseElement {
    * viewport. Intended to be implemented by actual components.
    * @param {boolean} unusedInViewport
    */
-  viewportCallback(unusedInViewport) {
-  }
+  viewportCallback(unusedInViewport) {}
 
   /**
    * Requests the element to stop its activity when the document goes into
    * inactive state. The scope is up to the actual component. Among other
    * things the active playback of video or audio content must be stopped.
    */
-  pauseCallback() {
-  }
+  pauseCallback() {}
 
   /**
    * Requests the element to resume its activity when the document returns from
    * an inactive state. The scope is up to the actual component. Among other
    * things the active playback of video or audio content may be resumed.
    */
-  resumeCallback() {
-  }
+  resumeCallback() {}
 
   /**
    * Requests the element to unload any expensive resources when the element
@@ -561,8 +559,7 @@ export class BaseElement {
    * user event. Intended to be implemented by actual components.
    * @param {!./service/action-impl.ActionInvocation} unusedInvocation
    */
-  activate(unusedInvocation) {
-  }
+  activate(unusedInvocation) {}
 
   /**
    * Minimum event trust required for activate().
@@ -615,9 +612,15 @@ export class BaseElement {
    * @public
    */
   registerDefaultAction(
-    handler, alias = DEFAULT_ACTION, minTrust = ActionTrust.HIGH) {
-    devAssert(!this.defaultActionAlias_,
-        'Default action "%s" already registered.', this.defaultActionAlias_);
+    handler,
+    alias = DEFAULT_ACTION,
+    minTrust = ActionTrust.HIGH
+  ) {
+    devAssert(
+      !this.defaultActionAlias_,
+      'Default action "%s" already registered.',
+      this.defaultActionAlias_
+    );
     this.registerAction(alias, handler, minTrust);
     this.defaultActionAlias_ = alias;
   }
@@ -698,7 +701,8 @@ export class BaseElement {
     const unlisteners = (isArray(events) ? events : [events]).map(eventType =>
       listen(element, eventType, event => {
         this.element.dispatchCustomEvent(eventType, getData(event) || {});
-      }));
+      })
+    );
 
     return () => unlisteners.forEach(unlisten => unlisten());
   }
@@ -878,7 +882,7 @@ export class BaseElement {
    * @public
    */
   scheduleUnlayout(elements) {
-    this.element.getResources()./*OK*/scheduleUnlayout(this.element, elements);
+    this.element.getResources()./*OK*/ scheduleUnlayout(this.element, elements);
   }
 
   /**
@@ -890,8 +894,9 @@ export class BaseElement {
    * @public
    */
   updateInViewport(elements, inLocalViewport) {
-    this.element.getResources().updateInViewport(
-        this.element, elements, inLocalViewport);
+    this.element
+      .getResources()
+      .updateInViewport(this.element, elements, inLocalViewport);
   }
 
   /**
@@ -902,8 +907,9 @@ export class BaseElement {
    * @public
    */
   changeHeight(newHeight) {
-    this.element.getResources()./*OK*/changeSize(
-        this.element, newHeight, /* newWidth */ undefined);
+    this.element
+      .getResources()
+      ./*OK*/ changeSize(this.element, newHeight, /* newWidth */ undefined);
   }
 
   /**
@@ -923,7 +929,6 @@ export class BaseElement {
     return this.element.getResources().attemptCollapse(this.element);
   }
 
-
   /**
    * Return a promise that requests the runtime to update
    * the height of this element to the specified value.
@@ -939,28 +944,30 @@ export class BaseElement {
    * @public
    */
   attemptChangeHeight(newHeight) {
-    return this.element.getResources().attemptChangeSize(
-        this.element, newHeight, /* newWidth */ undefined);
-  }
-
-  /**
-  * Return a promise that requests the runtime to update
-  * the size of this element to the specified value.
-  * The runtime will schedule this request and attempt to process it
-  * as soon as possible. However, unlike in {@link changeSize}, the runtime
-  * may refuse to make a change in which case it will show the element's
-  * overflow element if provided, which is supposed to provide the reader with
-  * the necessary user action. (The overflow element is shown only if the
-  * requested height is greater than 0.)
-  * The promise is resolved if the height is successfully updated.
-  * @param {number|undefined} newHeight
-  * @param {number|undefined} newWidth
-  * @return {!Promise}
-  * @public
-  */
+    return this.element
+      .getResources()
+      .attemptChangeSize(this.element, newHeight, /* newWidth */ undefined);
+  }
+
+  /**
+   * Return a promise that requests the runtime to update
+   * the size of this element to the specified value.
+   * The runtime will schedule this request and attempt to process it
+   * as soon as possible. However, unlike in {@link changeSize}, the runtime
+   * may refuse to make a change in which case it will show the element's
+   * overflow element if provided, which is supposed to provide the reader with
+   * the necessary user action. (The overflow element is shown only if the
+   * requested height is greater than 0.)
+   * The promise is resolved if the height is successfully updated.
+   * @param {number|undefined} newHeight
+   * @param {number|undefined} newWidth
+   * @return {!Promise}
+   * @public
+   */
   attemptChangeSize(newHeight, newWidth) {
-    return this.element.getResources().attemptChangeSize(
-        this.element, newHeight, newWidth);
+    return this.element
+      .getResources()
+      .attemptChangeSize(this.element, newHeight, newWidth);
   }
 
   /**
@@ -1009,8 +1016,9 @@ export class BaseElement {
    * @return {!Promise}
    */
   measureMutateElement(measurer, mutator, opt_element) {
-    return this.element.getResources().measureMutateElement(
-        opt_element || this.element, measurer, mutator);
+    return this.element
+      .getResources()
+      .measureMutateElement(opt_element || this.element, measurer, mutator);
   }
 
   /**
@@ -1082,12 +1090,13 @@ export class BaseElement {
    * @param {!Element=} opt_element
    */
   declareLayer(opt_element) {
-    devAssert(isExperimentOn(this.win, 'layers'), 'Layers must be enabled' +
-        ' to declare layer.');
+    devAssert(
+      isExperimentOn(this.win, 'layers'),
+      'Layers must be enabled to declare layer.'
+    );
     if (opt_element) {
       devAssert(this.element.contains(opt_element));
     }
     return this.element.getLayers().declareLayer(opt_element || this.element);
   }
-
 }
diff --git a/src/batched-json.js b/src/batched-json.js
index e94d1400887d..354cb8aba753 100644
--- a/src/batched-json.js
+++ b/src/batched-json.js
@@ -50,30 +50,30 @@ export function batchFetchJsonFor(
   opt_expr = '.',
   opt_urlReplacement = UrlReplacementPolicy.NONE,
   opt_refresh = false,
-  opt_token = undefined)
-{
+  opt_token = undefined
+) {
   assertHttpsUrl(element.getAttribute('src'), element);
   const xhr = Services.batchedXhrFor(ampdoc.win);
   return requestForBatchFetch(element, opt_urlReplacement, opt_refresh)
-      .then(data => {
-        if (opt_token !== undefined) {
-          data.fetchOpt['method'] = 'POST';
-          data.fetchOpt['headers'] = {
-            'Content-Type': 'application/x-www-form-urlencoded',
-          };
-          data.fetchOpt['body'] = {
-            'ampViewerAuthToken': opt_token,
-          };
-        }
-        return xhr.fetchJson(data.xhrUrl, data.fetchOpt);
-      })
-      .then(res => res.json())
-      .then(data => {
-        if (data == null) {
-          throw new Error('Response is undefined.');
-        }
-        return getValueForExpr(data, opt_expr || '.');
-      });
+    .then(data => {
+      if (opt_token !== undefined) {
+        data.fetchOpt['method'] = 'POST';
+        data.fetchOpt['headers'] = {
+          'Content-Type': 'application/x-www-form-urlencoded',
+        };
+        data.fetchOpt['body'] = {
+          'ampViewerAuthToken': opt_token,
+        };
+      }
+      return xhr.fetchJson(data.xhrUrl, data.fetchOpt);
+    })
+    .then(res => res.json())
+    .then(data => {
+      if (data == null) {
+        throw new Error('Response is undefined.');
+      }
+      return getValueForExpr(data, opt_expr || '.');
+    });
 }
 
 /**
@@ -90,9 +90,10 @@ export function requestForBatchFetch(element, replacement, refresh) {
 
   // Replace vars in URL if desired.
   const urlReplacements = Services.urlReplacementsForDoc(element);
-  const promise = (replacement >= UrlReplacementPolicy.OPT_IN)
-    ? urlReplacements.expandUrlAsync(url)
-    : Promise.resolve(url);
+  const promise =
+    replacement >= UrlReplacementPolicy.OPT_IN
+      ? urlReplacements.expandUrlAsync(url)
+      : Promise.resolve(url);
 
   return promise.then(xhrUrl => {
     // Throw user error if this element is performing URL substitutions
@@ -100,10 +101,12 @@ export function requestForBatchFetch(element, replacement, refresh) {
     if (replacement == UrlReplacementPolicy.OPT_IN) {
       const invalid = urlReplacements.collectUnwhitelistedVarsSync(element);
       if (invalid.length > 0) {
-        throw user().createError('URL variable substitutions in CORS ' +
+        throw user().createError(
+          'URL variable substitutions in CORS ' +
             'fetches from dynamic URLs (e.g. via amp-bind) require opt-in. ' +
             `Please add data-amp-replace="${invalid.join(' ')}" to the ` +
-           `<${element.tagName}> element. See https://bit.ly/amp-var-subs.`);
+            `<${element.tagName}> element. See https://bit.ly/amp-var-subs.`
+        );
       }
     }
     const fetchOpt = {};
diff --git a/src/chunk.js b/src/chunk.js
index fac45c6528cb..234dd0b85835 100644
--- a/src/chunk.js
+++ b/src/chunk.js
@@ -17,10 +17,7 @@
 import {Services} from './services';
 import {dev} from './log';
 import {getData} from './event-helper';
-import {
-  getServiceForDoc,
-  registerServiceBuilderForDoc,
-} from './service';
+import {getServiceForDoc, registerServiceBuilderForDoc} from './service';
 import {makeBodyVisibleRecovery} from './style-installer';
 import PriorityQueue from './utils/priority-queue';
 
@@ -298,8 +295,7 @@ class StartupTask extends Task {
       return false;
     }
     // Viewers send a URL param if we are not visible.
-    return !(/visibilityState=(hidden|prerender)/.test(
-        this.win_.location.hash));
+    return !/visibilityState=(hidden|prerender)/.test(this.win_.location.hash);
   }
 }
 
@@ -429,20 +425,22 @@ class Chunks {
     // If requestIdleCallback exists, schedule a task with it, but
     // do not wait longer than two seconds.
     if (nextTask.useRequestIdleCallback_() && this.win_.requestIdleCallback) {
-      onIdle(this.win_,
-          // Wait until we have a budget of at least 15ms.
-          // 15ms is a magic number. Budgets are higher when the user
-          // is completely idle (around 40), but that occurs too
-          // rarely to be usable. 15ms budgets can happen during scrolling
-          // but only if the device is doing super, super well, and no
-          // real processing is done between frames.
-          15 /* minimumTimeRemaining */,
-          2000 /* timeout */,
-          this.boundExecute_);
+      onIdle(
+        this.win_,
+        // Wait until we have a budget of at least 15ms.
+        // 15ms is a magic number. Budgets are higher when the user
+        // is completely idle (around 40), but that occurs too
+        // rarely to be usable. 15ms budgets can happen during scrolling
+        // but only if the device is doing super, super well, and no
+        // real processing is done between frames.
+        15 /* minimumTimeRemaining */,
+        2000 /* timeout */,
+        this.boundExecute_
+      );
       return;
     }
     // The message doesn't actually matter.
-    this.win_.postMessage/*OK*/('amp-macro-task', '*');
+    this.win_./*OK*/ postMessage('amp-macro-task', '*');
   }
 }
 
@@ -468,8 +466,12 @@ export function onIdle(win, minimumTimeRemaining, timeout, fn) {
         dev().fine(TAG, 'Timed out', timeout, info.didTimeout);
         fn(info);
       } else {
-        dev().fine(TAG, 'Rescheduling with', remainingTimeout,
-            info.timeRemaining());
+        dev().fine(
+          TAG,
+          'Rescheduling with',
+          remainingTimeout,
+          info.timeRemaining()
+        );
         win.requestIdleCallback(rIC, {timeout: remainingTimeout});
       }
     } else {
diff --git a/src/clipboard.js b/src/clipboard.js
index 50db4a8d17e2..ae42ac759805 100644
--- a/src/clipboard.js
+++ b/src/clipboard.js
@@ -16,7 +16,6 @@
 import {removeElement} from './dom';
 import {setStyles} from './style';
 
-
 /**
  * @param {!Window} win
  * @param {string} text
@@ -62,7 +61,6 @@ export function copyTextToClipboard(win, text) {
   return copySuccessful;
 }
 
-
 /**
  * @param {!Document} doc
  * @return {boolean}
diff --git a/src/common-signals.js b/src/common-signals.js
index 730ccebb24b3..94b0643d1d8d 100644
--- a/src/common-signals.js
+++ b/src/common-signals.js
@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-
 /**
  * Commonly used signals across different elements and documents.
  * @enum {string}
  */
 export const CommonSignals = {
-
   /**
    * The element has been built.
    */
diff --git a/src/config.js b/src/config.js
index 1a9101785bf7..94c63d055076 100644
--- a/src/config.js
+++ b/src/config.js
@@ -23,11 +23,15 @@
  */
 const env = self.AMP_CONFIG || {};
 
-const thirdPartyFrameRegex = typeof env['thirdPartyFrameRegex'] == 'string' ?
-  new RegExp(env['thirdPartyFrameRegex']) : env['thirdPartyFrameRegex'];
+const thirdPartyFrameRegex =
+  typeof env['thirdPartyFrameRegex'] == 'string'
+    ? new RegExp(env['thirdPartyFrameRegex'])
+    : env['thirdPartyFrameRegex'];
 
-const cdnProxyRegex = typeof env['cdnProxyRegex'] == 'string' ?
-  new RegExp(env['cdnProxyRegex']) : env['cdnProxyRegex'];
+const cdnProxyRegex =
+  typeof env['cdnProxyRegex'] == 'string'
+    ? new RegExp(env['cdnProxyRegex'])
+    : env['cdnProxyRegex'];
 
 /** @type {!Object<string, string|boolean|RegExp>} */
 export const urls = {
@@ -38,11 +42,11 @@ export const urls = {
   /* Note that cdnProxyRegex is only ever checked against origins
    * (proto://host[:port]) so does not need to consider path
    */
-  cdnProxyRegex: cdnProxyRegex ||
-      /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/,
+  cdnProxyRegex:
+    cdnProxyRegex || /^https:\/\/([a-zA-Z0-9_-]+\.)?cdn\.ampproject\.org$/,
   localhostRegex: /^https?:\/\/localhost(:\d+)?$/,
-  errorReporting: env['errorReportingUrl'] ||
-      'https://amp-error-reporting.appspot.com/r',
+  errorReporting:
+    env['errorReportingUrl'] || 'https://amp-error-reporting.appspot.com/r',
   localDev: env['localDev'] || false,
 };
 
diff --git a/src/consent.js b/src/consent.js
index 8118c5991719..9e8ec68b2e40 100644
--- a/src/consent.js
+++ b/src/consent.js
@@ -28,14 +28,14 @@ import {user} from './log';
  * @return {!Promise<?CONSENT_POLICY_STATE>}
  */
 export function getConsentPolicyState(element, policyId = 'default') {
-  return Services.consentPolicyServiceForDocOrNull(element)
-      .then(consentPolicy => {
-        if (!consentPolicy) {
-          return null;
-        }
-        return consentPolicy.whenPolicyResolved(
-            /** @type {string} */ (policyId));
-      });
+  return Services.consentPolicyServiceForDocOrNull(element).then(
+    consentPolicy => {
+      if (!consentPolicy) {
+        return null;
+      }
+      return consentPolicy.whenPolicyResolved(/** @type {string} */ (policyId));
+    }
+  );
 }
 
 /**
@@ -46,14 +46,16 @@ export function getConsentPolicyState(element, policyId = 'default') {
  * @return {!Promise<?Object>}
  */
 export function getConsentPolicySharedData(element, policyId) {
-  return Services.consentPolicyServiceForDocOrNull(element)
-      .then(consentPolicy => {
-        if (!consentPolicy) {
-          return null;
-        }
-        return consentPolicy.getMergedSharedData(
-            /** @type {string} */ (policyId));
-      });
+  return Services.consentPolicyServiceForDocOrNull(element).then(
+    consentPolicy => {
+      if (!consentPolicy) {
+        return null;
+      }
+      return consentPolicy.getMergedSharedData(
+        /** @type {string} */ (policyId)
+      );
+    }
+  );
 }
 
 /**
@@ -65,14 +67,16 @@ export function getConsentPolicySharedData(element, policyId) {
  */
 export function getConsentPolicyInfo(element, policyId) {
   // Return the stored consent string.
-  return Services.consentPolicyServiceForDocOrNull(element)
-      .then(consentPolicy => {
-        if (!consentPolicy) {
-          return null;
-        }
-        return consentPolicy.getConsentStringInfo(
-            /** @type {string} */ (policyId));
-      });
+  return Services.consentPolicyServiceForDocOrNull(element).then(
+    consentPolicy => {
+      if (!consentPolicy) {
+        return null;
+      }
+      return consentPolicy.getConsentStringInfo(
+        /** @type {string} */ (policyId)
+      );
+    }
+  );
 }
 
 /**
@@ -82,8 +86,9 @@ export function getConsentPolicyInfo(element, policyId) {
  */
 export function shouldBlockOnConsentByMeta(element) {
   const ampdoc = element.getAmpDoc();
-  let content =
-      Services.documentInfoForDoc(ampdoc).metaTags['amp-consent-blocking'];
+  let content = Services.documentInfoForDoc(ampdoc).metaTags[
+    'amp-consent-blocking'
+  ];
 
   if (!content) {
     return false;
@@ -92,13 +97,18 @@ export function shouldBlockOnConsentByMeta(element) {
   // validator enforce uniqueness of <meta name='amp-consent-blocking'>
   // content will not be an array.
   if (typeof content !== 'string') {
-    user().error('CONSENT',
-        'Invalid amp-consent-blocking value, ignore meta tag');
+    user().error(
+      'CONSENT',
+      'Invalid amp-consent-blocking value, ignore meta tag'
+    );
     return false;
   }
 
   // Handles whitespace
-  content = content.toUpperCase().replace(/\s/g, '').split(',');
+  content = content
+    .toUpperCase()
+    .replace(/\s/g, '')
+    .split(',');
 
   if (content.includes(element.tagName)) {
     return true;
diff --git a/src/cookies.js b/src/cookies.js
index 33fdc62cff87..634bbb0fc59a 100644
--- a/src/cookies.js
+++ b/src/cookies.js
@@ -15,14 +15,9 @@
  */
 
 import {endsWith} from './string';
-import {
-  isProxyOrigin,
-  parseUrlDeprecated,
-  tryDecodeUriComponent,
-} from './url';
+import {isProxyOrigin, parseUrlDeprecated, tryDecodeUriComponent} from './url';
 import {urls} from './config';
 
-
 /**
  * Returns the value of the cookie. The cookie access is restricted and must
  * go through the privacy review. Before using this method please file a
@@ -128,11 +123,14 @@ function trySetCookie(win, name, value, expirationTime, domain) {
     value = 'delete';
     expirationTime = 0;
   }
-  const cookie = encodeURIComponent(name) + '=' +
-      encodeURIComponent(value) +
-      '; path=/' +
-      (domain ? '; domain=' + domain : '') +
-      '; expires=' + new Date(expirationTime).toUTCString();
+  const cookie =
+    encodeURIComponent(name) +
+    '=' +
+    encodeURIComponent(value) +
+    '; path=/' +
+    (domain ? '; domain=' + domain : '') +
+    '; expires=' +
+    new Date(expirationTime).toUTCString();
   try {
     win.document.cookie = cookie;
   } catch (ignore) {
@@ -155,14 +153,18 @@ function checkOriginForSettingCookie(win, options, name) {
     return;
   }
   if (isProxyOrigin(win.location.href)) {
-    throw new Error('Should never attempt to set cookie on proxy origin: '
-        + name);
+    throw new Error(
+      'Should never attempt to set cookie on proxy origin: ' + name
+    );
   }
 
   const current = parseUrlDeprecated(win.location.href).hostname.toLowerCase();
   const proxy = parseUrlDeprecated(urls.cdn).hostname.toLowerCase();
   if (current == proxy || endsWith(current, '.' + proxy)) {
-    throw new Error('Should never attempt to set cookie on proxy origin.'
-        + ' (in depth check): ' + name);
+    throw new Error(
+      'Should never attempt to set cookie on proxy origin.' +
+        ' (in depth check): ' +
+        name
+    );
   }
 }
diff --git a/src/css.js b/src/css.js
index 7a781da6a0c7..8c6a334f2592 100644
--- a/src/css.js
+++ b/src/css.js
@@ -27,7 +27,6 @@ export function assertIsName(name) {
   devAssert(/^[\w-]+$/.test(name));
 }
 
-
 /**
  * @type {boolean|undefined}
  */
@@ -67,7 +66,7 @@ function testScopeSelector(el) {
     testElement.appendChild(testChild);
     // NOTE(cvializ, #12383): Firefox's implementation is incomplete,
     // therefore we test actual functionality of`:scope` as well.
-    return testElement./*OK*/querySelector(':scope div') === testChild;
+    return testElement./*OK*/ querySelector(':scope div') === testChild;
   } catch (e) {
     return false;
   }
@@ -121,4 +120,3 @@ export function escapeCssSelectorNth(ident) {
   devAssert(escaped.indexOf(')') === -1);
   return escaped;
 }
-
diff --git a/src/curve.js b/src/curve.js
index 35efaa36c314..95b86ecd6421 100644
--- a/src/curve.js
+++ b/src/curve.js
@@ -18,7 +18,6 @@
 // the type system during compile time.
 import './time';
 
-
 /**
  * A CurveDef is a function that returns a normtime value (0 to 1) for another
  * normtime value.
@@ -26,7 +25,6 @@ import './time';
  */
 export let CurveDef;
 
-
 /**
  * Returns a cubic bezier curve.
  * @param {number} x1 X coordinate of the first control point.
@@ -40,13 +38,11 @@ export function bezierCurve(x1, y1, x2, y2) {
   return bezier.solveYValueFromXValue.bind(bezier);
 }
 
-
 /**
  * Thanks to
  * https://closure-library.googlecode.com/git-history/docs/local_closure_goog_math_bezier.js.source.html
  */
 class Bezier {
-
   /**
    * @param {number} x0 X coordinate of the start point.
    * @param {number} y0 Y coordinate of the start point.
@@ -239,7 +235,6 @@ class Bezier {
   }
 }
 
-
 /**
  * A collection of common curves.
  * See https://developer.mozilla.org/en-US/docs/Web/CSS/timing-function
@@ -251,7 +246,9 @@ export const Curves = {
    * @param {number} n
    * @return {number}
    */
-  LINEAR(n) {return n;},
+  LINEAR(n) {
+    return n;
+  },
 
   /**
    * ease
@@ -274,7 +271,6 @@ export const Curves = {
   EASE_IN_OUT: bezierCurve(0.42, 0.0, 0.58, 1.0),
 };
 
-
 /**
  * @const {!Object<string, !CurveDef>}
  */
@@ -286,7 +282,6 @@ const NAME_MAP = {
   'ease-in-out': Curves.EASE_IN_OUT,
 };
 
-
 /**
  * If the argument is a string, this methods matches an existing curve by name.
  * @param {?CurveDef|string|undefined} curve
diff --git a/src/custom-element.js b/src/custom-element.js
index 637ba567d137..544ecbdeea91 100644
--- a/src/custom-element.js
+++ b/src/custom-element.js
@@ -32,9 +32,7 @@ import {Signals} from './utils/signals';
 import {blockedByConsentError, isBlockedByConsent, reportError} from './error';
 import {createLoaderElement} from '../src/loader';
 import {dev, devAssert, rethrowAsync, user} from './log';
-import {
-  getIntersectionChangeEntry,
-} from '../src/intersection-observer-polyfill';
+import {getIntersectionChangeEntry} from '../src/intersection-observer-polyfill';
 import {getMode} from './mode';
 import {htmlFor} from './static-template';
 import {isExperimentOn} from './experiments';
@@ -55,7 +53,6 @@ const TAG = 'CustomElement';
  */
 const MIN_WIDTH_FOR_LOADING = 100;
 
-
 /**
  * The elements positioned ahead of this threshold may have their loading
  * indicator initialized faster. This is benefitial to avoid relayout during
@@ -64,7 +61,6 @@ const MIN_WIDTH_FOR_LOADING = 100;
  */
 const PREPARE_LOADING_THRESHOLD = 1000;
 
-
 /**
  * @enum {number}
  */
@@ -75,7 +71,6 @@ const UpgradeState = {
   UPGRADE_IN_PROGRESS: 4,
 };
 
-
 /**
  * Caches whether the template tag is supported to avoid memory allocations.
  * @type {boolean|undefined}
@@ -94,7 +89,6 @@ function isTemplateTagSupported() {
   return templateTagSupported;
 }
 
-
 /**
  * Creates a named custom element class.
  *
@@ -103,8 +97,9 @@ function isTemplateTagSupported() {
  * @return {!Function} The custom element class.
  */
 export function createCustomElementClass(win, name) {
-  const baseCustomElement = /** @type {Function} */ (
-    createBaseCustomElementClass(win));
+  const baseCustomElement = /** @type {Function} */ (createBaseCustomElementClass(
+    win
+  ));
   /**
    * @extends {HTMLElement}
    * @suppress {checkTypes}
@@ -129,7 +124,6 @@ export function createCustomElementClass(win, name) {
   return CustomAmpElement;
 }
 
-
 /**
  * Creates a base custom element class.
  *
@@ -257,8 +251,8 @@ function createBaseCustomElementClass(win) {
       this.overflowElement_ = undefined;
 
       // `opt_implementationClass` is only used for tests.
-      let Ctor = win.ampExtendedElements &&
-          win.ampExtendedElements[this.elementName()];
+      let Ctor =
+        win.ampExtendedElements && win.ampExtendedElements[this.elementName()];
       if (getMode().test && this.implementationClassForTesting) {
         Ctor = this.implementationClassForTesting;
       }
@@ -319,8 +313,7 @@ function createBaseCustomElementClass(win) {
      * @abstract
      * @return {string}
      */
-    elementName() {
-    }
+    elementName() {}
 
     /** @return {!Signals} */
     signals() {
@@ -336,8 +329,7 @@ function createBaseCustomElementClass(win) {
      */
     getAmpDoc() {
       devAssert(this.ampdoc_, 'no ampdoc yet, since element is not attached');
-      return /** @typedef {!./service/ampdoc-impl.AmpDoc} */ (
-        this.ampdoc_);
+      return /** @typedef {!./service/ampdoc-impl.AmpDoc} */ this.ampdoc_;
     }
 
     /**
@@ -349,9 +341,11 @@ function createBaseCustomElementClass(win) {
      */
     getResources() {
       devAssert(
-          this.resources_, 'no resources yet, since element is not attached');
-      return /** @typedef {!./service/resources-impl.Resources} */ (
-        this.resources_);
+        this.resources_,
+        'no resources yet, since element is not attached'
+      );
+      return /** @typedef {!./service/resources-impl.Resources} */ this
+        .resources_;
     }
 
     /**
@@ -363,8 +357,7 @@ function createBaseCustomElementClass(win) {
      */
     getLayers() {
       devAssert(this.layers_, 'no layers yet, since element is not attached');
-      return /** @typedef {!./service/layers-impl.LayoutLayers} */ (
-        this.layers_);
+      return /** @typedef {!./service/layers-impl.LayoutLayers} */ this.layers_;
     }
 
     /**
@@ -436,14 +429,17 @@ function createBaseCustomElementClass(win) {
 
     /** @private */
     assertLayout_() {
-      if (this.layout_ != Layout.NODISPLAY &&
-          !this.implementation_.isLayoutSupported(this.layout_)) {
+      if (
+        this.layout_ != Layout.NODISPLAY &&
+        !this.implementation_.isLayoutSupported(this.layout_)
+      ) {
         let error = 'Layout not supported: ' + this.layout_;
         if (!this.getAttribute('layout')) {
-          error += '. The element did not specify a layout attribute. ' +
-              'Check https://www.ampproject.org/docs/guides/' +
-              'responsive/control_layout and the respective element ' +
-              'documentation for details.';
+          error +=
+            '. The element did not specify a layout attribute. ' +
+            'Check https://www.ampproject.org/docs/guides/' +
+            'responsive/control_layout and the respective element ' +
+            'documentation for details.';
         }
         throw user().createError(error);
       }
@@ -473,8 +469,7 @@ function createBaseCustomElementClass(win) {
      * @return {number} @this {!Element}
      */
     getLayoutPriority() {
-      devAssert(
-          this.isUpgraded(), 'Cannot get priority of unupgraded element');
+      devAssert(this.isUpgraded(), 'Cannot get priority of unupgraded element');
       return this.implementation_.getLayoutPriority();
     }
 
@@ -484,10 +479,10 @@ function createBaseCustomElementClass(win) {
      */
     getDefaultActionAlias() {
       devAssert(
-          this.isUpgraded(),
-          'Cannot get default action alias of unupgraded element');
+        this.isUpgraded(),
+        'Cannot get default action alias of unupgraded element'
+      );
       return this.implementation_.getDefaultActionAlias();
-
     }
 
     /**
@@ -505,53 +500,62 @@ function createBaseCustomElementClass(win) {
       if (this.buildingPromise_) {
         return this.buildingPromise_;
       }
-      return this.buildingPromise_ = new Promise((resolve, reject) => {
+      return (this.buildingPromise_ = new Promise((resolve, reject) => {
         const policyId = this.getConsentPolicy_();
         if (!policyId) {
           resolve(this.implementation_.buildCallback());
         } else {
-          Services.consentPolicyServiceForDocOrNull(this).then(policy => {
-            if (!policy) {
-              return true;
-            }
-            return policy.whenPolicyUnblock(/** @type {string} */ (policyId));
-          }).then(shouldUnblock => {
-            if (shouldUnblock) {
-              resolve(this.implementation_.buildCallback());
-            } else {
-              reject(blockedByConsentError());
-            }
-          });
-        }
-      }).then(() => {
-        this.preconnect(/* onLayout */false);
-        this.built_ = true;
-        this.classList.remove('i-amphtml-notbuilt');
-        this.classList.remove('amp-notbuilt');
-        this.signals_.signal(CommonSignals.BUILT);
-        if (this.isInViewport_) {
-          this.updateInViewport_(true);
-        }
-        if (this.actionQueue_) {
-          // Only schedule when the queue is not empty, which should be
-          // the case 99% of the time.
-          Services.timerFor(toWin(this.ownerDocument.defaultView))
-              .delay(this.dequeueActions_.bind(this), 1);
+          Services.consentPolicyServiceForDocOrNull(this)
+            .then(policy => {
+              if (!policy) {
+                return true;
+              }
+              return policy.whenPolicyUnblock(/** @type {string} */ (policyId));
+            })
+            .then(shouldUnblock => {
+              if (shouldUnblock) {
+                resolve(this.implementation_.buildCallback());
+              } else {
+                reject(blockedByConsentError());
+              }
+            });
         }
-        if (!this.getPlaceholder()) {
-          const placeholder = this.createPlaceholder();
-          if (placeholder) {
-            this.appendChild(placeholder);
+      }).then(
+        () => {
+          this.preconnect(/* onLayout */ false);
+          this.built_ = true;
+          this.classList.remove('i-amphtml-notbuilt');
+          this.classList.remove('amp-notbuilt');
+          this.signals_.signal(CommonSignals.BUILT);
+          if (this.isInViewport_) {
+            this.updateInViewport_(true);
           }
+          if (this.actionQueue_) {
+            // Only schedule when the queue is not empty, which should be
+            // the case 99% of the time.
+            Services.timerFor(toWin(this.ownerDocument.defaultView)).delay(
+              this.dequeueActions_.bind(this),
+              1
+            );
+          }
+          if (!this.getPlaceholder()) {
+            const placeholder = this.createPlaceholder();
+            if (placeholder) {
+              this.appendChild(placeholder);
+            }
+          }
+        },
+        reason => {
+          this.signals_.rejectSignal(
+            CommonSignals.BUILT,
+            /** @type {!Error} */ (reason)
+          );
+          if (!isBlockedByConsent(reason)) {
+            reportError(reason, this);
+          }
+          throw reason;
         }
-      }, reason => {
-        this.signals_.rejectSignal(CommonSignals.BUILT,
-            /** @type {!Error} */ (reason));
-        if (!isBlockedByConsent(reason)) {
-          reportError(reason, this);
-        }
-        throw reason;
-      });
+      ));
     }
 
     /**
@@ -617,8 +621,10 @@ function createBaseCustomElementClass(win) {
         if (this.isInViewport_) {
           // Already in viewport - start showing loading.
           this.toggleLoading(true);
-        } else if (layoutBox.top < PREPARE_LOADING_THRESHOLD &&
-          layoutBox.top >= 0) {
+        } else if (
+          layoutBox.top < PREPARE_LOADING_THRESHOLD &&
+          layoutBox.top >= 0
+        ) {
           // Few top elements will also be pre-initialized with a loading
           // element.
           this.mutateOrInvoke_(() => this.prepareLoading_());
@@ -631,8 +637,10 @@ function createBaseCustomElementClass(win) {
      * @private
      */
     getSizer_() {
-      if (this.sizerElement === undefined &&
-          this.layout_ === Layout.RESPONSIVE) {
+      if (
+        this.sizerElement === undefined &&
+        this.layout_ === Layout.RESPONSIVE
+      ) {
         // Expect sizer to exist, just not yet discovered.
         this.sizerElement = this.querySelector('i-amphtml-sizer');
       }
@@ -661,8 +669,10 @@ function createBaseCustomElementClass(win) {
       }
       if (this.mediaQuery_) {
         const {defaultView} = this.ownerDocument;
-        this.classList.toggle('i-amphtml-hidden-by-media-query',
-            !defaultView.matchMedia(this.mediaQuery_).matches);
+        this.classList.toggle(
+          'i-amphtml-hidden-by-media-query',
+          !defaultView.matchMedia(this.mediaQuery_).matches
+        );
       }
 
       // Sizes.
@@ -671,21 +681,30 @@ function createBaseCustomElementClass(win) {
         this.sizeList_ = sizesAttr ? parseSizeList(sizesAttr) : null;
       }
       if (this.sizeList_) {
-        setStyle(this, 'width', this.sizeList_.select(
-            toWin(this.ownerDocument.defaultView)));
+        setStyle(
+          this,
+          'width',
+          this.sizeList_.select(toWin(this.ownerDocument.defaultView))
+        );
       }
       // Heights.
-      if (this.heightsList_ === undefined &&
-          this.layout_ === Layout.RESPONSIVE) {
+      if (
+        this.heightsList_ === undefined &&
+        this.layout_ === Layout.RESPONSIVE
+      ) {
         const heightsAttr = this.getAttribute('heights');
-        this.heightsList_ = heightsAttr ?
-          parseSizeList(heightsAttr, /* allowPercent */ true) : null;
+        this.heightsList_ = heightsAttr
+          ? parseSizeList(heightsAttr, /* allowPercent */ true)
+          : null;
       }
       if (this.heightsList_) {
         const sizer = this.getSizer_();
         if (sizer) {
-          setStyle(sizer, 'paddingTop',
-              this.heightsList_.select(toWin(this.ownerDocument.defaultView)));
+          setStyle(
+            sizer,
+            'paddingTop',
+            this.heightsList_.select(toWin(this.ownerDocument.defaultView))
+          );
         }
       }
     }
@@ -755,8 +774,10 @@ function createBaseCustomElementClass(win) {
      */
     connectedCallback() {
       if (!isTemplateTagSupported() && this.isInTemplate_ === undefined) {
-        this.isInTemplate_ =
-          !!dom.closestAncestorElementBySelector(this, 'template');
+        this.isInTemplate_ = !!dom.closestAncestorElementBySelector(
+          this,
+          'template'
+        );
       }
       if (this.isInTemplate_) {
         return;
@@ -781,10 +802,14 @@ function createBaseCustomElementClass(win) {
         this.ampdoc_ = ampdoc;
         // Load the pre-stubbed extension if needed.
         const extensionId = this.tagName.toLowerCase();
-        if (isStub(this.implementation_) &&
-            !ampdoc.declaresExtension(extensionId)) {
+        if (
+          isStub(this.implementation_) &&
+          !ampdoc.declaresExtension(extensionId)
+        ) {
           Services.extensionsFor(win).installExtensionForDoc(
-              ampdoc, extensionId);
+            ampdoc,
+            extensionId
+          );
         }
       }
       if (!this.resources_) {
@@ -875,16 +900,20 @@ function createBaseCustomElementClass(win) {
         this.completeUpgrade_(impl, startTime);
       } else if (typeof res.then == 'function') {
         // It's a promise: wait until it's done.
-        res.then(upgrade => {
-          this.completeUpgrade_(upgrade || impl, startTime);
-        }).catch(reason => {
-          this.upgradeState_ = UpgradeState.UPGRADE_FAILED;
-          rethrowAsync(reason);
-        });
+        res
+          .then(upgrade => {
+            this.completeUpgrade_(upgrade || impl, startTime);
+          })
+          .catch(reason => {
+            this.upgradeState_ = UpgradeState.UPGRADE_FAILED;
+            rethrowAsync(reason);
+          });
       } else {
         // It's an actual instance: upgrade immediately.
         this.completeUpgrade_(
-            /** @type {!./base-element.BaseElement} */(res), startTime);
+          /** @type {!./base-element.BaseElement} */ (res),
+          startTime
+        );
       }
     }
 
@@ -1014,7 +1043,9 @@ function createBaseCustomElementClass(win) {
      * @final @this {!Element}
      */
     getLayoutBox() {
-      return this.getResources().getResourceForElement(this).getLayoutBox();
+      return this.getResources()
+        .getResourceForElement(this)
+        .getLayoutBox();
     }
 
     /**
@@ -1024,7 +1055,9 @@ function createBaseCustomElementClass(win) {
      * @final @this {!Element}
      */
     getPageLayoutBox() {
-      return this.getResources().getResourceForElement(this).getPageLayoutBox();
+      return this.getResources()
+        .getResourceForElement(this)
+        .getPageLayoutBox();
     }
 
     /**
@@ -1032,7 +1065,9 @@ function createBaseCustomElementClass(win) {
      * @final @this {!Element}
      */
     getOwner() {
-      return this.getResources().getResourceForElement(this).getOwner();
+      return this.getResources()
+        .getResourceForElement(this)
+        .getOwner();
     }
 
     /**
@@ -1043,7 +1078,9 @@ function createBaseCustomElementClass(win) {
      */
     getIntersectionChangeEntry() {
       const box = this.implementation_.getIntersectionElementLayoutBox();
-      const owner = this.getResources().getResourceForElement(this).getOwner();
+      const owner = this.getResources()
+        .getResourceForElement(this)
+        .getOwner();
       const viewportBox = this.implementation_.getViewport().getRect();
       // TODO(jridgewell, #4826): We may need to make this recursive.
       const ownerBox = owner && owner.getLayoutBox();
@@ -1055,7 +1092,9 @@ function createBaseCustomElementClass(win) {
      * @return {number}
      */
     getResourceId() {
-      return this.getResources().getResourceForElement(this).getId();
+      return this.getResources()
+        .getResourceForElement(this)
+        .getId();
     }
 
     /**
@@ -1063,7 +1102,9 @@ function createBaseCustomElementClass(win) {
      * @return {!ResourceState}
      */
     getResourceState_() {
-      return this.getResources().getResourceForElement(this).getState();
+      return this.getResources()
+        .getResourceForElement(this)
+        .getState();
     }
 
     /**
@@ -1108,10 +1149,9 @@ function createBaseCustomElementClass(win) {
      */
     layoutCallback() {
       assertNotTemplate(this);
-      devAssert(this.isBuilt(),
-          'Must be built to receive viewport events');
+      devAssert(this.isBuilt(), 'Must be built to receive viewport events');
       this.dispatchCustomEventForTesting(AmpEvents.LOAD_START);
-      const isLoadEvent = (this.layoutCount_ == 0); // First layout is "load".
+      const isLoadEvent = this.layoutCount_ == 0; // First layout is "load".
       this.signals_.reset(CommonSignals.UNLOAD);
       if (isLoadEvent) {
         this.signals_.signal(CommonSignals.LOAD_START);
@@ -1121,33 +1161,38 @@ function createBaseCustomElementClass(win) {
       }
 
       const promise = tryResolve(() => this.implementation_.layoutCallback());
-      this.preconnect(/* onLayout */true);
+      this.preconnect(/* onLayout */ true);
       this.classList.add('i-amphtml-layout');
 
-      return promise.then(() => {
-        if (isLoadEvent) {
-          this.signals_.signal(CommonSignals.LOAD_END);
-        }
-        this.readyState = 'complete';
-        this.layoutCount_++;
-        this.toggleLoading(false, {cleanup: true});
-        // Check if this is the first success layout that needs
-        // to call firstLayoutCompleted.
-        if (!this.isFirstLayoutCompleted_) {
-          this.implementation_.firstLayoutCompleted();
-          this.isFirstLayoutCompleted_ = true;
-          this.dispatchCustomEventForTesting(AmpEvents.LOAD_END);
-        }
-      }, reason => {
-        // add layoutCount_ by 1 despite load fails or not
-        if (isLoadEvent) {
-          this.signals_.rejectSignal(
-              CommonSignals.LOAD_END, /** @type {!Error} */ (reason));
+      return promise.then(
+        () => {
+          if (isLoadEvent) {
+            this.signals_.signal(CommonSignals.LOAD_END);
+          }
+          this.readyState = 'complete';
+          this.layoutCount_++;
+          this.toggleLoading(false, {cleanup: true});
+          // Check if this is the first success layout that needs
+          // to call firstLayoutCompleted.
+          if (!this.isFirstLayoutCompleted_) {
+            this.implementation_.firstLayoutCompleted();
+            this.isFirstLayoutCompleted_ = true;
+            this.dispatchCustomEventForTesting(AmpEvents.LOAD_END);
+          }
+        },
+        reason => {
+          // add layoutCount_ by 1 despite load fails or not
+          if (isLoadEvent) {
+            this.signals_.rejectSignal(
+              CommonSignals.LOAD_END,
+              /** @type {!Error} */ (reason)
+            );
+          }
+          this.layoutCount_++;
+          this.toggleLoading(false, {cleanup: true});
+          throw reason;
         }
-        this.layoutCount_++;
-        this.toggleLoading(false, {cleanup: true});
-        throw reason;
-      });
+      );
     }
 
     /**
@@ -1175,8 +1220,7 @@ function createBaseCustomElementClass(win) {
       }
       // TODO(dvoytenko, #9177): investigate/cleanup viewport signals for
       // elements in dead iframes.
-      if (!this.ownerDocument ||
-          !this.ownerDocument.defaultView) {
+      if (!this.ownerDocument || !this.ownerDocument.defaultView) {
         return;
       }
       this.isInViewport_ = inViewport;
@@ -1190,9 +1234,11 @@ function createBaseCustomElementClass(win) {
             // TODO(dvoytenko, #9177): cleanup `this.ownerDocument.defaultView`
             // once investigation is complete. It appears that we get a lot of
             // errors here once the iframe is destroyed due to timer.
-            if (this.isInViewport_ &&
-                this.ownerDocument &&
-                this.ownerDocument.defaultView) {
+            if (
+              this.isInViewport_ &&
+              this.ownerDocument &&
+              this.ownerDocument.defaultView
+            ) {
               this.toggleLoading(true);
             }
           }, 100);
@@ -1323,7 +1369,7 @@ function createBaseCustomElementClass(win) {
      * element is no longer present.
      */
     collapse() {
-      this.implementation_./*OK*/collapse();
+      this.implementation_./*OK*/ collapse();
     }
 
     /**
@@ -1339,7 +1385,7 @@ function createBaseCustomElementClass(win) {
      * element is now present.
      */
     expand() {
-      this.implementation_./*OK*/expand();
+      this.implementation_./*OK*/ expand();
     }
 
     /**
@@ -1411,8 +1457,12 @@ function createBaseCustomElementClass(win) {
       try {
         this.implementation_.executeAction(invocation, deferred);
       } catch (e) {
-        rethrowAsync('Action execution failed:', e,
-            invocation.node.tagName, invocation.method);
+        rethrowAsync(
+          'Action execution failed:',
+          e,
+          invocation.node.tagName,
+          invocation.method
+        );
       }
     }
 
@@ -1458,8 +1508,10 @@ function createBaseCustomElementClass(win) {
      * @package @final @this {!Element}
      */
     getRealChildren() {
-      return dom.childElements(this, element =>
-        !isInternalOrServiceNode(element));
+      return dom.childElements(
+        this,
+        element => !isInternalOrServiceNode(element)
+      );
     }
 
     /**
@@ -1469,11 +1521,13 @@ function createBaseCustomElementClass(win) {
      */
     getPlaceholder() {
       return dom.lastChildElement(this, el => {
-        return el.hasAttribute('placeholder') &&
+        return (
+          el.hasAttribute('placeholder') &&
           // Blacklist elements that has a native placeholder property
           // like input and textarea. These are not allowed to be AMP
           // placeholders.
-          !isInputPlaceholder(el);
+          !isInputPlaceholder(el)
+        );
       });
     }
 
@@ -1487,7 +1541,9 @@ function createBaseCustomElementClass(win) {
       if (show) {
         const placeholder = this.getPlaceholder();
         if (placeholder) {
-          dev().assertElement(placeholder).classList.remove('amp-hidden');
+          dev()
+            .assertElement(placeholder)
+            .classList.remove('amp-hidden');
         }
       } else {
         const placeholders = dom.childElementsByAttr(this, 'placeholder');
@@ -1521,9 +1577,12 @@ function createBaseCustomElementClass(win) {
       assertNotTemplate(this);
       const resourceState = this.getResourceState_();
       // Do not show fallback before layout
-      if (show && (resourceState == ResourceState.NOT_BUILT ||
+      if (
+        show &&
+        (resourceState == ResourceState.NOT_BUILT ||
           resourceState == ResourceState.NOT_LAID_OUT ||
-          resourceState == ResourceState.READY_FOR_LAYOUT)) {
+          resourceState == ResourceState.READY_FOR_LAYOUT)
+      ) {
         return;
       }
       // This implementation is notably less efficient then placeholder
@@ -1572,10 +1631,14 @@ function createBaseCustomElementClass(win) {
       if (this.loadingDisabled_ === undefined) {
         this.loadingDisabled_ = this.hasAttribute('noloading');
       }
-      if (this.loadingDisabled_ || !isLoadingAllowed(this) ||
+      if (
+        this.loadingDisabled_ ||
+        !isLoadingAllowed(this) ||
         this.layoutWidth_ < MIN_WIDTH_FOR_LOADING ||
         this.layoutCount_ > 0 ||
-        isInternalOrServiceNode(this) || !isLayoutSizeDefined(this.layout_)) {
+        isInternalOrServiceNode(this) ||
+        !isLayoutSizeDefined(this.layout_)
+      ) {
         return false;
       }
       return true;
@@ -1587,11 +1650,11 @@ function createBaseCustomElementClass(win) {
      */
     isInA4A_() {
       return (
-      // in FIE
+        // in FIE
         (this.ampdoc_ && this.ampdoc_.win != this.ownerDocument.defaultView) ||
-
-          // in inabox
-          getMode().runtime == 'inabox');
+        // in inabox
+        getMode().runtime == 'inabox'
+      );
     }
 
     /**
@@ -1613,7 +1676,9 @@ function createBaseCustomElementClass(win) {
               amp-hidden"></div>`;
 
         const element = createLoaderElement(
-            /** @type {!Document} */ (doc), this.elementName());
+          /** @type {!Document} */ (doc),
+          this.elementName()
+        );
         container.appendChild(element);
 
         this.appendChild(container);
@@ -1632,9 +1697,11 @@ function createBaseCustomElementClass(win) {
       const cleanup = opt_options && opt_options.cleanup;
       const force = opt_options && opt_options.force;
       assertNotTemplate(this);
-      if (state && !this.implementation_.isLoadingReused() &&
-          (this.layoutCount_ > 0 ||
-              this.signals_.get(CommonSignals.RENDER_START))) {
+      if (
+        state &&
+        !this.implementation_.isLoadingReused() &&
+        (this.layoutCount_ > 0 || this.signals_.get(CommonSignals.RENDER_START))
+      ) {
         // Loading has already been canceled. Ignore.
         return;
       }
@@ -1666,8 +1733,7 @@ function createBaseCustomElementClass(win) {
         this.loadingContainer_.classList.toggle('amp-hidden', !state);
         this.loadingElement_.classList.toggle('amp-active', state);
 
-        if (!state && cleanup &&
-            !this.implementation_.isLoadingReused()) {
+        if (!state && cleanup && !this.implementation_.isLoadingReused()) {
           const loadingContainer = this.loadingContainer_;
           this.loadingContainer_ = null;
           this.loadingElement_ = null;
@@ -1685,7 +1751,9 @@ function createBaseCustomElementClass(win) {
     getLayoutDelayMeter_() {
       if (!this.layoutDelayMeter_) {
         this.layoutDelayMeter_ = new LayoutDelayMeter(
-            toWin(this.ownerDocument.defaultView), this.getLayoutPriority());
+          toWin(this.ownerDocument.defaultView),
+          this.getLayoutPriority()
+        );
       }
       return this.layoutDelayMeter_;
     }
@@ -1722,8 +1790,11 @@ function createBaseCustomElementClass(win) {
       this.getOverflowElement();
       if (!this.overflowElement_) {
         if (overflown && this.warnOnMissingOverflow) {
-          user().warn(TAG,
-              'Cannot resize element and overflow is not available', this);
+          user().warn(
+            TAG,
+            'Cannot resize element and overflow is not available',
+            this
+          );
         }
       } else {
         this.overflowElement_.classList.toggle('amp-visible', overflown);
@@ -1731,10 +1802,13 @@ function createBaseCustomElementClass(win) {
         if (overflown) {
           this.overflowElement_.onclick = () => {
             const resources = this.getResources();
-            resources./*OK*/changeSize(this, requestedHeight, requestedWidth);
+            resources./*OK*/ changeSize(this, requestedHeight, requestedWidth);
             resources.mutateElement(this, () => {
               this.overflowCallback(
-                  /* overflown */ false, requestedHeight, requestedWidth);
+                /* overflown */ false,
+                requestedHeight,
+                requestedWidth
+              );
             });
           };
         } else {
@@ -1766,23 +1840,20 @@ function isInputPlaceholder(element) {
   return 'placeholder' in element;
 }
 
-
 /** @param {!Element} element */
 function assertNotTemplate(element) {
   devAssert(!element.isInTemplate_, 'Must never be called in template');
 }
 
-
 /**
  * Whether the implementation is a stub.
  * @param {?./base-element.BaseElement} impl
  * @return {boolean}
  */
 function isStub(impl) {
-  return (impl instanceof ElementStub);
+  return impl instanceof ElementStub;
 }
 
-
 /**
  * Returns "true" for internal AMP nodes or for placeholder elements.
  * @param {!Node} node
@@ -1792,15 +1863,17 @@ function isInternalOrServiceNode(node) {
   if (isInternalElement(node)) {
     return true;
   }
-  if (node.tagName && (node.hasAttribute('placeholder') ||
+  if (
+    node.tagName &&
+    (node.hasAttribute('placeholder') ||
       node.hasAttribute('fallback') ||
-      node.hasAttribute('overflow'))) {
+      node.hasAttribute('overflow'))
+  ) {
     return true;
   }
   return false;
 }
 
-
 /**
  * Creates a new custom element class prototype.
  *
@@ -1809,8 +1882,7 @@ function isInternalOrServiceNode(node) {
  * @param {function(new:./base-element.BaseElement, !Element)=} opt_implementationClass For testing only.
  * @return {!Object} Prototype of element.
  */
-export function createAmpElementForTesting(
-  win, name, opt_implementationClass) {
+export function createAmpElementForTesting(win, name, opt_implementationClass) {
   const Element = createCustomElementClass(win, name);
   if (getMode().test && opt_implementationClass) {
     Element.prototype.implementationClassForTesting = opt_implementationClass;
diff --git a/src/document-fetcher.js b/src/document-fetcher.js
index c409d35853ec..8fd0f7f76a2a 100644
--- a/src/document-fetcher.js
+++ b/src/document-fetcher.js
@@ -39,21 +39,23 @@ export function fetchDocument(win, input, opt_init) {
   init = setupAMPCors(win, input, init);
   input = setupInput(win, input, init);
   const ampdocService = Services.ampdocServiceFor(win);
-  const ampdocSingle =
-  ampdocService.isSingleDoc() ? ampdocService.getAmpDoc() : null;
+  const ampdocSingle = ampdocService.isSingleDoc()
+    ? ampdocService.getAmpDoc()
+    : null;
   init.responseType = 'document';
-  return getViewerInterceptResponse(win, ampdocSingle, input, init)
-      .then(interceptorResponse => {
-        if (interceptorResponse) {
-          return interceptorResponse.text().then(body =>
-            new DOMParser().parseFromString(body, 'text/html')
-          );
-        }
-        return xhrRequest(input, init).then(({xhr, response}) => {
-          verifyAmpCORSHeaders(win, response, init);
-          return xhr.responseXML;
-        });
+  return getViewerInterceptResponse(win, ampdocSingle, input, init).then(
+    interceptorResponse => {
+      if (interceptorResponse) {
+        return interceptorResponse
+          .text()
+          .then(body => new DOMParser().parseFromString(body, 'text/html'));
+      }
+      return xhrRequest(input, init).then(({xhr, response}) => {
+        verifyAmpCORSHeaders(win, response, init);
+        return xhr.responseXML;
       });
+    }
+  );
 }
 
 /**
@@ -67,7 +69,7 @@ function xhrRequest(input, init) {
   return new Promise((resolve, reject) => {
     const xhr = new XMLHttpRequest();
     xhr.open(init.method || 'GET', input, true);
-    xhr.withCredentials = (init.credentials == 'include');
+    xhr.withCredentials = init.credentials == 'include';
     xhr.responseType = 'document';
     // Incoming headers are in fetch format,
     // so we need to convert them into xhr.
@@ -81,8 +83,7 @@ function xhrRequest(input, init) {
       }
       if (xhr.status < 100 || xhr.status > 599) {
         xhr.onreadystatechange = null;
-        reject(user().createExpectedError(
-            `Unknown HTTP status ${xhr.status}`));
+        reject(user().createExpectedError(`Unknown HTTP status ${xhr.status}`));
         return;
       }
       // TODO(dvoytenko): This is currently simplified: we will wait for the
@@ -94,9 +95,14 @@ function xhrRequest(input, init) {
           statusText: xhr.statusText,
           headers: parseHeaders(xhr.getAllResponseHeaders()),
         };
-        const response = new Response('', /** @type {!ResponseInit} */ (options));
-        const promise = assertSuccess(response)
-            .then(response => ({response, xhr}));
+        const response = new Response(
+          '',
+          /** @type {!ResponseInit} */ (options)
+        );
+        const promise = assertSuccess(response).then(response => ({
+          response,
+          xhr,
+        }));
         resolve(promise);
       }
     };
diff --git a/src/document-ready.js b/src/document-ready.js
index 3e2f0da04967..c2ef972059f8 100644
--- a/src/document-ready.js
+++ b/src/document-ready.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Whether the document is ready.
  * @param {!Document} doc
diff --git a/src/document-submit.js b/src/document-submit.js
index 58ff3d065d41..6a4a06453b75 100644
--- a/src/document-submit.js
+++ b/src/document-submit.js
@@ -32,16 +32,15 @@ import {isExtensionScriptInNode} from './element-service';
 export function installGlobalSubmitListenerForDoc(ampdoc) {
   // Register global submit event listener only if the amp-form
   // extension is used. Allowing the usage of native forms, otherwise.
-  return isExtensionScriptInNode(ampdoc, 'amp-form')
-      .then(ampFormInstalled => {
-        if (ampFormInstalled) {
-          ampdoc.getRootNode().addEventListener(
-              'submit', onDocumentFormSubmit_, true);
-        }
-      });
+  return isExtensionScriptInNode(ampdoc, 'amp-form').then(ampFormInstalled => {
+    if (ampFormInstalled) {
+      ampdoc
+        .getRootNode()
+        .addEventListener('submit', onDocumentFormSubmit_, true);
+    }
+  });
 }
 
-
 /**
  * Intercept any submit on the current document and prevent invalid submits from
  * going through.
@@ -77,9 +76,12 @@ export function onDocumentFormSubmit_(e) {
 
   const inputs = form.elements;
   for (let i = 0; i < inputs.length; i++) {
-    userAssert(!inputs[i].name ||
-        inputs[i].name != SOURCE_ORIGIN_PARAM,
-    'Illegal input name, %s found: %s', SOURCE_ORIGIN_PARAM, inputs[i]);
+    userAssert(
+      !inputs[i].name || inputs[i].name != SOURCE_ORIGIN_PARAM,
+      'Illegal input name, %s found: %s',
+      SOURCE_ORIGIN_PARAM,
+      inputs[i]
+    );
   }
 
   const action = form.getAttribute('action');
@@ -88,42 +90,58 @@ export function onDocumentFormSubmit_(e) {
 
   if (actionXhr) {
     assertHttpsUrl(actionXhr, form, 'action-xhr');
-    userAssert(!isProxyOrigin(actionXhr),
-        'form action-xhr should not be on AMP CDN: %s', form);
+    userAssert(
+      !isProxyOrigin(actionXhr),
+      'form action-xhr should not be on AMP CDN: %s',
+      form
+    );
     checkCorsUrl(actionXhr);
   }
   if (action) {
     assertHttpsUrl(action, form, 'action');
-    userAssert(!isProxyOrigin(action),
-        'form action should not be on AMP CDN: %s', form);
+    userAssert(
+      !isProxyOrigin(action),
+      'form action should not be on AMP CDN: %s',
+      form
+    );
     checkCorsUrl(action);
   }
 
   if (method == 'GET') {
-    userAssert(actionXhr || action,
-        'form action-xhr or action attribute is required for method=GET: %s',
-        form);
+    userAssert(
+      actionXhr || action,
+      'form action-xhr or action attribute is required for method=GET: %s',
+      form
+    );
   } else if (method == 'POST') {
     if (action) {
       const TAG = 'form';
-      user().error(TAG,
-          'action attribute is invalid for method=POST: %s', form);
+      user().error(
+        TAG,
+        'action attribute is invalid for method=POST: %s',
+        form
+      );
     }
 
     if (!actionXhr) {
       e.preventDefault();
-      userAssert(false,
-          'Only XHR based (via action-xhr attribute) submissions are support ' +
+      userAssert(
+        false,
+        'Only XHR based (via action-xhr attribute) submissions are support ' +
           'for POST requests. %s',
-          form);
+        form
+      );
     }
   }
 
   const target = form.getAttribute('target');
   if (target) {
-    userAssert(target == '_blank' || target == '_top',
-        'form target=%s is invalid can only be _blank or _top: %s',
-        target, form);
+    userAssert(
+      target == '_blank' || target == '_top',
+      'form target=%s is invalid can only be _blank or _top: %s',
+      target,
+      form
+    );
   } else {
     form.setAttribute('target', '_top');
   }
@@ -142,7 +160,13 @@ export function onDocumentFormSubmit_(e) {
 
     const actions = Services.actionServiceForDoc(form);
     actions.execute(
-        form, 'submit', /*args*/ null, /*source*/ form, /*caller*/ form, e,
-        ActionTrust.HIGH);
+      form,
+      'submit',
+      /*args*/ null,
+      /*source*/ form,
+      /*caller*/ form,
+      e,
+      ActionTrust.HIGH
+    );
   }
 }
diff --git a/src/dom.js b/src/dom.js
index b5f22aa3cbe1..6ac6cdaf8e05 100644
--- a/src/dom.js
+++ b/src/dom.js
@@ -37,12 +37,10 @@ const HTML_ESCAPE_CHARS = {
 const HTML_ESCAPE_REGEX = /(&|<|>|"|'|`)/g;
 
 /** @const {string} */
-export const UPGRADE_TO_CUSTOMELEMENT_PROMISE =
-    '__AMP_UPG_PRM';
+export const UPGRADE_TO_CUSTOMELEMENT_PROMISE = '__AMP_UPG_PRM';
 
 /** @const {string} */
-export const UPGRADE_TO_CUSTOMELEMENT_RESOLVER =
-    '__AMP_UPG_RES';
+export const UPGRADE_TO_CUSTOMELEMENT_RESOLVER = '__AMP_UPG_RES';
 
 /**
  * Waits until the child element is constructed. Once the child is found, the
@@ -120,7 +118,6 @@ export function waitForBody(doc, callback) {
   onDocumentReady(doc, () => waitForHead(doc, callback));
 }
 
-
 /**
  * Waits for document's body to be available.
  * @param {!Document} doc
@@ -130,7 +127,6 @@ export function waitForBodyPromise(doc) {
   return new Promise(resolve => waitForBody(doc, resolve));
 }
 
-
 /**
  * Removes the element.
  * @param {!Element} element
@@ -141,7 +137,6 @@ export function removeElement(element) {
   }
 }
 
-
 /**
  * Removes all child nodes of the specified element.
  * @param {!Element} parent
@@ -152,7 +147,6 @@ export function removeChildren(parent) {
   }
 }
 
-
 /**
  * Copies all children nodes of element "from" to element "to". Child nodes
  * are deeply cloned. Notice, that this method should be used with care and
@@ -262,7 +256,6 @@ export function closest(element, callback, opt_stopAt) {
   return null;
 }
 
-
 /**
  * Finds the closest node that satisfies the callback from this node
  * up the DOM subtree.
@@ -279,7 +272,6 @@ export function closestNode(node, callback) {
   return null;
 }
 
-
 /**
  * Finds the closest ancestor element with the specified selector from this
  * element.
@@ -305,8 +297,11 @@ export function closestAncestorElementBySelector(element, selector) {
  */
 export function ancestorElements(child, predicate) {
   const ancestors = [];
-  for (let ancestor = child.parentElement; ancestor;
-    ancestor = ancestor.parentElement) {
+  for (
+    let ancestor = child.parentElement;
+    ancestor;
+    ancestor = ancestor.parentElement
+  ) {
     if (predicate(ancestor)) {
       ancestors.push(ancestor);
     }
@@ -314,7 +309,6 @@ export function ancestorElements(child, predicate) {
   return ancestors;
 }
 
-
 /**
  * Finds all ancestor elements that has the specified tag name.
  * @param {!Element} child
@@ -336,8 +330,11 @@ export function ancestorElementsByTag(child, tagName) {
  * @return {?Element}
  */
 export function childElement(parent, callback) {
-  for (let child = parent.firstElementChild; child;
-    child = child.nextElementSibling) {
+  for (
+    let child = parent.firstElementChild;
+    child;
+    child = child.nextElementSibling
+  ) {
     if (callback(child)) {
       return child;
     }
@@ -345,7 +342,6 @@ export function childElement(parent, callback) {
   return null;
 }
 
-
 /**
  * Finds all child elements that satisfy the callback.
  * @param {!Element} parent
@@ -354,8 +350,11 @@ export function childElement(parent, callback) {
  */
 export function childElements(parent, callback) {
   const children = [];
-  for (let child = parent.firstElementChild; child;
-    child = child.nextElementSibling) {
+  for (
+    let child = parent.firstElementChild;
+    child;
+    child = child.nextElementSibling
+  ) {
     if (callback(child)) {
       children.push(child);
     }
@@ -363,7 +362,6 @@ export function childElements(parent, callback) {
   return children;
 }
 
-
 /**
  * Finds the last child element that satisfies the callback.
  * @param {!Element} parent
@@ -371,8 +369,11 @@ export function childElements(parent, callback) {
  * @return {?Element}
  */
 export function lastChildElement(parent, callback) {
-  for (let child = parent.lastElementChild; child;
-    child = child.previousElementSibling) {
+  for (
+    let child = parent.lastElementChild;
+    child;
+    child = child.previousElementSibling
+  ) {
     if (callback(child)) {
       return child;
     }
@@ -389,8 +390,7 @@ export function lastChildElement(parent, callback) {
  */
 export function childNodes(parent, callback) {
   const nodes = [];
-  for (let child = parent.firstChild; child;
-    child = child.nextSibling) {
+  for (let child = parent.firstChild; child; child = child.nextSibling) {
     if (callback(child)) {
       nodes.push(child);
     }
@@ -406,10 +406,9 @@ export function childNodes(parent, callback) {
  */
 export function childElementByAttr(parent, attr) {
   assertIsName(attr);
-  return scopedQuerySelector/*OK*/(parent, `> [${attr}]`);
+  return /*OK*/ scopedQuerySelector(parent, `> [${attr}]`);
 }
 
-
 /**
  * Finds the last child element that has the specified attribute.
  * @param {!Element} parent
@@ -423,7 +422,6 @@ export function lastChildElementByAttr(parent, attr) {
   });
 }
 
-
 /**
  * Finds all child elements that has the specified attribute.
  * @param {!Element} parent
@@ -432,10 +430,9 @@ export function lastChildElementByAttr(parent, attr) {
  */
 export function childElementsByAttr(parent, attr) {
   assertIsName(attr);
-  return scopedQuerySelectorAll/*OK*/(parent, `> [${attr}]`);
+  return /*OK*/ scopedQuerySelectorAll(parent, `> [${attr}]`);
 }
 
-
 /**
  * Finds the first child element that has the specified tag name.
  * @param {!Element} parent
@@ -444,10 +441,9 @@ export function childElementsByAttr(parent, attr) {
  */
 export function childElementByTag(parent, tagName) {
   assertIsName(tagName);
-  return scopedQuerySelector/*OK*/(parent, `> ${tagName}`);
+  return /*OK*/ scopedQuerySelector(parent, `> ${tagName}`);
 }
 
-
 /**
  * Finds all child elements with the specified tag name.
  * @param {!Element} parent
@@ -456,7 +452,7 @@ export function childElementByTag(parent, tagName) {
  */
 export function childElementsByTag(parent, tagName) {
   assertIsName(tagName);
-  return scopedQuerySelectorAll/*OK*/(parent, `> ${tagName}`);
+  return /*OK*/ scopedQuerySelectorAll(parent, `> ${tagName}`);
 }
 
 /**
@@ -466,11 +462,12 @@ export function childElementsByTag(parent, tagName) {
  * @return {boolean} True if the element matched the selector. False otherwise.
  */
 export function matches(el, selector) {
-  const matcher = el.matches ||
-      el.webkitMatchesSelector ||
-      el.mozMatchesSelector ||
-      el.msMatchesSelector ||
-      el.oMatchesSelector;
+  const matcher =
+    el.matches ||
+    el.webkitMatchesSelector ||
+    el.mozMatchesSelector ||
+    el.msMatchesSelector ||
+    el.oMatchesSelector;
   if (matcher) {
     return matcher.call(el, selector);
   }
@@ -485,7 +482,7 @@ export function matches(el, selector) {
  */
 export function elementByTag(element, tagName) {
   assertIsName(tagName);
-  return element./*OK*/querySelector(tagName);
+  return element./*OK*/ querySelector(tagName);
 }
 
 /**
@@ -502,7 +499,7 @@ function scopedQuerySelectionFallback(root, selector) {
   const unique = 'i-amphtml-scoped';
   root.classList.add(unique);
   const scopedSelector = prependSelectorsWith(selector, `.${unique}`);
-  const elements = root./*OK*/querySelectorAll(scopedSelector);
+  const elements = root./*OK*/ querySelectorAll(scopedSelector);
   root.classList.remove(unique);
   return elements;
 }
@@ -516,7 +513,7 @@ function scopedQuerySelectionFallback(root, selector) {
  */
 export function scopedQuerySelector(root, selector) {
   if (isScopeSelectorSupported(root)) {
-    return root./*OK*/querySelector(prependSelectorsWith(selector, ':scope'));
+    return root./*OK*/ querySelector(prependSelectorsWith(selector, ':scope'));
   }
 
   // Only IE.
@@ -533,15 +530,15 @@ export function scopedQuerySelector(root, selector) {
  */
 export function scopedQuerySelectorAll(root, selector) {
   if (isScopeSelectorSupported(root)) {
-    return root./*OK*/querySelectorAll(
-        prependSelectorsWith(selector, ':scope'));
+    return root./*OK*/ querySelectorAll(
+      prependSelectorsWith(selector, ':scope')
+    );
   }
 
   // Only IE.
   return scopedQuerySelectionFallback(root, selector);
 }
 
-
 /**
  * Returns element data-param- attributes as url parameters key-value pairs.
  * e.g. data-param-some-attr=value -> {someAttr: value}.
@@ -551,8 +548,11 @@ export function scopedQuerySelectorAll(root, selector) {
  * @param {!RegExp=} opt_paramPattern Regex pattern to match data attributes.
  * @return {!JsonObject}
  */
-export function getDataParamsFromAttributes(element, opt_computeParamNameFunc,
-  opt_paramPattern) {
+export function getDataParamsFromAttributes(
+  element,
+  opt_computeParamNameFunc,
+  opt_paramPattern
+) {
   const computeParamNameFunc = opt_computeParamNameFunc || (key => key);
   const {dataset} = element;
   const params = dict();
@@ -582,8 +582,10 @@ export function hasNextNodeInDocumentOrder(element, opt_stopNode) {
     if (currentElement.nextSibling) {
       return true;
     }
-  } while ((currentElement = currentElement.parentNode) &&
-            currentElement != opt_stopNode);
+  } while (
+    (currentElement = currentElement.parentNode) &&
+    currentElement != opt_stopNode
+  );
   return false;
 }
 
@@ -657,9 +659,11 @@ export function openWindowDialog(win, url, target, opt_features) {
  * @return {boolean}
  */
 export function isJsonScriptTag(element) {
-  return element.tagName == 'SCRIPT' &&
-            element.hasAttribute('type') &&
-            element.getAttribute('type').toUpperCase() == 'APPLICATION/JSON';
+  return (
+    element.tagName == 'SCRIPT' &&
+    element.hasAttribute('type') &&
+    element.getAttribute('type').toUpperCase() == 'APPLICATION/JSON'
+  );
 }
 
 /**
@@ -668,8 +672,10 @@ export function isJsonScriptTag(element) {
  * @return {boolean}
  */
 export function isJsonLdScriptTag(element) {
-  return element.tagName == 'SCRIPT' &&
-      element.getAttribute('type').toUpperCase() == 'APPLICATION/LD+JSON';
+  return (
+    element.tagName == 'SCRIPT' &&
+    element.getAttribute('type').toUpperCase() == 'APPLICATION/LD+JSON'
+  );
 }
 
 /**
@@ -678,9 +684,10 @@ export function isJsonLdScriptTag(element) {
  * @return {boolean}
  */
 export function isRTL(doc) {
-  const dir = doc.body.getAttribute('dir')
-                 || doc.documentElement.getAttribute('dir')
-                 || 'ltr';
+  const dir =
+    doc.body.getAttribute('dir') ||
+    doc.documentElement.getAttribute('dir') ||
+    'ltr';
   return dir == 'rtl';
 }
 
@@ -711,7 +718,7 @@ function escapeHtmlChar(c) {
  */
 export function tryFocus(element) {
   try {
-    element./*OK*/focus();
+    element./*OK*/ focus();
   } catch (e) {
     // IE <= 7 may throw exceptions when focusing on hidden items.
   }
@@ -735,9 +742,11 @@ export function isAmpElement(element) {
   const tag = element.tagName;
   // Use prefix to recognize AMP element. This is necessary because stub
   // may not be attached yet.
-  return startsWith(tag, 'AMP-') &&
-      // Some "amp-*" elements are not really AMP elements. :smh:
-      !(tag == 'AMP-STICKY-AD-TOP-PADDING' || tag == 'AMP-BODY');
+  return (
+    startsWith(tag, 'AMP-') &&
+    // Some "amp-*" elements are not really AMP elements. :smh:
+    !(tag == 'AMP-STICKY-AD-TOP-PADDING' || tag == 'AMP-BODY')
+  );
 }
 
 /**
@@ -758,7 +767,6 @@ export function whenUpgradedToCustomElement(element) {
     const deferred = new Deferred();
     element[UPGRADE_TO_CUSTOMELEMENT_PROMISE] = deferred.promise;
     element[UPGRADE_TO_CUSTOMELEMENT_RESOLVER] = deferred.resolve;
-
   }
 
   return element[UPGRADE_TO_CUSTOMELEMENT_PROMISE];
@@ -770,12 +778,13 @@ export function whenUpgradedToCustomElement(element) {
  * @param {!Element} element
  */
 export function fullscreenEnter(element) {
-  const requestFs = element.requestFullscreen
-    || element.requestFullScreen
-    || element.webkitRequestFullscreen
-    || element.webkitEnterFullscreen
-    || element.msRequestFullscreen
-    || element.mozRequestFullScreen;
+  const requestFs =
+    element.requestFullscreen ||
+    element.requestFullScreen ||
+    element.webkitRequestFullscreen ||
+    element.webkitEnterFullscreen ||
+    element.msRequestFullscreen ||
+    element.mozRequestFullScreen;
   if (requestFs) {
     requestFs.call(element);
   }
@@ -788,12 +797,12 @@ export function fullscreenEnter(element) {
  */
 export function fullscreenExit(element) {
   const elementBoundExit =
-      element.cancelFullScreen
-      || element.exitFullscreen
-      || element.webkitExitFullscreen
-      || element.webkitCancelFullScreen
-      || element.mozCancelFullScreen
-      || element.msExitFullscreen;
+    element.cancelFullScreen ||
+    element.exitFullscreen ||
+    element.webkitExitFullscreen ||
+    element.webkitCancelFullScreen ||
+    element.mozCancelFullScreen ||
+    element.msExitFullscreen;
   if (elementBoundExit) {
     elementBoundExit.call(element);
     return;
@@ -803,18 +812,17 @@ export function fullscreenExit(element) {
     return;
   }
   const docBoundExit =
-      ownerDocument.cancelFullScreen
-      || ownerDocument.exitFullscreencancelFullScreen
-      || ownerDocument.webkitExitFullscreencancelFullScreen
-      || ownerDocument.webkitCancelFullScreencancelFullScreen
-      || ownerDocument.mozCancelFullScreencancelFullScreen
-      || ownerDocument.msExitFullscreen;
+    ownerDocument.cancelFullScreen ||
+    ownerDocument.exitFullscreencancelFullScreen ||
+    ownerDocument.webkitExitFullscreencancelFullScreen ||
+    ownerDocument.webkitCancelFullScreencancelFullScreen ||
+    ownerDocument.mozCancelFullScreencancelFullScreen ||
+    ownerDocument.msExitFullscreen;
   if (docBoundExit) {
     docBoundExit.call(ownerDocument);
   }
 }
 
-
 /**
  * Replacement for `Document.fullscreenElement`.
  * https://developer.mozilla.org/en-US/docs/Web/API/Document/fullscreenElement
@@ -831,10 +839,10 @@ export function isFullscreenElement(element) {
     return false;
   }
   const fullscreenElement =
-      ownerDocument.fullscreenElement
-      || ownerDocument.webkitFullscreenElement
-      || ownerDocument.mozFullScreenElement
-      || ownerDocument.webkitCurrentFullScreenElement;
+    ownerDocument.fullscreenElement ||
+    ownerDocument.webkitFullscreenElement ||
+    ownerDocument.mozFullScreenElement ||
+    ownerDocument.webkitCurrentFullScreenElement;
   return fullscreenElement == element;
 }
 
@@ -878,7 +886,6 @@ export function domOrderComparator(element1, element2) {
   return -1;
 }
 
-
 /**
  * Like `Element.prototype.toggleAttribute`. This either toggles an attribute
  * on by adding an attribute with an empty value, or toggles it off by removing
diff --git a/src/element-service.js b/src/element-service.js
index b25c47eeefa0..687595837e9c 100644
--- a/src/element-service.js
+++ b/src/element-service.js
@@ -44,7 +44,8 @@ import {userAssert} from './log';
  */
 export function getElementService(win, id, extension, opt_element) {
   return getElementServiceIfAvailable(win, id, extension, opt_element).then(
-      service => assertService(service, id, extension));
+    service => assertService(service, id, extension)
+  );
 }
 
 /**
@@ -79,7 +80,6 @@ function isElementScheduled(win, elementName) {
   return !!win.ampExtendedElements[elementName];
 }
 
-
 /**
  * Returns a promise for a service for the given id and window. Also expects an
  * element that has the actual implementation. The promise resolves when the
@@ -94,11 +94,13 @@ function isElementScheduled(win, elementName) {
  *     not the extension.
  * @return {!Promise<*>}
  */
-export function getElementServiceForDoc(element, id, extension,
-  opt_element) {
+export function getElementServiceForDoc(element, id, extension, opt_element) {
   return getElementServiceIfAvailableForDoc(
-      element, id, extension, opt_element)
-      .then(service => assertService(service, id, extension));
+    element,
+    id,
+    extension,
+    opt_element
+  ).then(service => assertService(service, id, extension));
 }
 
 /**
@@ -113,26 +115,31 @@ export function getElementServiceForDoc(element, id, extension,
  * @return {!Promise<?Object>}
  */
 export function getElementServiceIfAvailableForDoc(
-  element, id, extension, opt_element
+  element,
+  id,
+  extension,
+  opt_element
 ) {
   const s = getServicePromiseOrNullForDoc(element, id);
   if (s) {
     return /** @type {!Promise<?Object>} */ (s);
   }
   const ampdoc = getAmpdoc(element);
-  return ampdoc.whenBodyAvailable()
-      .then(() => waitForExtensionIfPresent(
-          ampdoc.win, extension, ampdoc.win.document.head))
-      .then(() => {
-        // If this service is provided by an element, then we can't depend on
-        // the service (they may not use the element).
-        if (opt_element) {
-          return getServicePromiseOrNullForDoc(element, id);
-        } else if (isElementScheduled(ampdoc.win, extension)) {
-          return getServicePromiseForDoc(element, id);
-        }
-        return null;
-      });
+  return ampdoc
+    .whenBodyAvailable()
+    .then(() =>
+      waitForExtensionIfPresent(ampdoc.win, extension, ampdoc.win.document.head)
+    )
+    .then(() => {
+      // If this service is provided by an element, then we can't depend on
+      // the service (they may not use the element).
+      if (opt_element) {
+        return getServicePromiseOrNullForDoc(element, id);
+      } else if (isElementScheduled(ampdoc.win, extension)) {
+        return getServicePromiseForDoc(element, id);
+      }
+      return null;
+    });
 }
 
 /**
@@ -147,7 +154,9 @@ export function getElementServiceIfAvailableForDoc(
  * @return {!Promise<?Object>}
  */
 export function getElementServiceIfAvailableForDocInEmbedScope(
-  element, id, extension
+  element,
+  id,
+  extension
 ) {
   const s = getExistingServiceForDocInEmbedScope(element, id);
   if (s) {
@@ -173,11 +182,16 @@ export function getElementServiceIfAvailableForDocInEmbedScope(
  * @private
  */
 function assertService(service, id, extension) {
-  return /** @type {!Object} */ (userAssert(service,
-      'Service %s was requested to be provided through %s, ' +
+  return /** @type {!Object} */ (userAssert(
+    service,
+    'Service %s was requested to be provided through %s, ' +
       'but %s is not loaded in the current page. To fix this ' +
       'problem load the JavaScript file for %s in this page.',
-      id, extension, extension, extension));
+    id,
+    extension,
+    extension,
+    extension
+  ));
 }
 
 /**
@@ -206,11 +220,9 @@ export function extensionScriptsInNode(head) {
  * @return {!Promise<boolean>}
  */
 export function isExtensionScriptInNode(ampdoc, extensionId) {
-  return ampdoc.whenBodyAvailable()
-      .then(() => {
-        return extensionScriptInNode(
-            ampdoc.getHeadNode(), extensionId);
-      });
+  return ampdoc.whenBodyAvailable().then(() => {
+    return extensionScriptInNode(ampdoc.getHeadNode(), extensionId);
+  });
 }
 
 /**
@@ -248,8 +260,10 @@ function waitForExtensionIfPresent(win, extension, head) {
   }
 
   const extensions = getService(win, 'extensions');
-  return /** @type {!Promise<?Object>} */ (
-    extensions.waitForExtension(win, extension));
+  return /** @type {!Promise<?Object>} */ (extensions.waitForExtension(
+    win,
+    extension
+  ));
 }
 
 /**
@@ -263,16 +277,17 @@ function waitForExtensionIfPresent(win, extension, head) {
  * @private
  */
 function getElementServicePromiseOrNull(win, id, extension, opt_element) {
-  return dom.waitForBodyPromise(win.document)
-      .then(() => waitForExtensionIfPresent(win, extension, win.document.head))
-      .then(() => {
-        // If this service is provided by an element, then we can't depend on
-        // the service (they may not use the element).
-        if (opt_element) {
-          return getServicePromiseOrNull(win, id);
-        } else if (isElementScheduled(win, extension)) {
-          return getServicePromise(win, id);
-        }
-        return null;
-      });
+  return dom
+    .waitForBodyPromise(win.document)
+    .then(() => waitForExtensionIfPresent(win, extension, win.document.head))
+    .then(() => {
+      // If this service is provided by an element, then we can't depend on
+      // the service (they may not use the element).
+      if (opt_element) {
+        return getServicePromiseOrNull(win, id);
+      } else if (isElementScheduled(win, extension)) {
+        return getServicePromise(win, id);
+      }
+      return null;
+    });
 }
diff --git a/src/element-stub.js b/src/element-stub.js
index 8aaa87ff21f9..47fe9516db41 100644
--- a/src/element-stub.js
+++ b/src/element-stub.js
@@ -20,7 +20,6 @@ import {devAssert} from './log';
 /** @type {!Array} */
 export const stubbedElements = [];
 
-
 export class ElementStub extends BaseElement {
   /** @param {!AmpElement} element */
   constructor(element) {
diff --git a/src/error.js b/src/error.js
index c50b4afb714a..ff784d56bd68 100644
--- a/src/error.js
+++ b/src/error.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {AmpEvents} from './amp-events';
 import {Services} from './services';
 import {
@@ -25,16 +24,10 @@ import {
   isUserErrorMessage,
 } from './log';
 import {dict} from './utils/object';
-import {
-  experimentTogglesOrNull,
-  getBinaryType,
-  isCanary,
-} from './experiments';
+import {experimentTogglesOrNull, getBinaryType, isCanary} from './experiments';
 import {exponentialBackoff} from './exponential-backoff';
 import {getMode} from './mode';
-import {
-  isLoadErrorMessage,
-} from './event-helper';
+import {isLoadErrorMessage} from './event-helper';
 import {isProxyOrigin} from './url';
 import {makeBodyVisibleRecovery} from './style-installer';
 import {startsWith} from './string';
@@ -70,7 +63,6 @@ const NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD = 0.001;
  */
 const USER_ERROR_THROTTLE_THRESHOLD = 0.1;
 
-
 /**
  * Collects error messages, so they can be included in subsequent reports.
  * That allows identifying errors that might be caused by previous errors.
@@ -134,9 +126,13 @@ let detectedJsEngine;
  */
 export function reportErrorForWin(win, error, opt_associatedElement) {
   reportError(error, opt_associatedElement);
-  if (error && !!win && isUserErrorMessage(error.message)
-      && !isUserErrorEmbed(error.message)) {
-    reportErrorToAnalytics(/** @type {!Error} */(error), win);
+  if (
+    error &&
+    !!win &&
+    isUserErrorMessage(error.message) &&
+    !isUserErrorEmbed(error.message)
+  ) {
+    reportErrorToAnalytics(/** @type {!Error} */ (error), win);
   }
 }
 
@@ -157,7 +153,7 @@ export function reportError(error, opt_associatedElement) {
     let isValidError;
     if (error) {
       if (error.message !== undefined) {
-        error = duplicateErrorIfNecessary(/** @type {!Error} */(error));
+        error = duplicateErrorIfNecessary(/** @type {!Error} */ (error));
         isValidError = true;
       } else {
         const origError = error;
@@ -171,7 +167,8 @@ export function reportError(error, opt_associatedElement) {
     if (!isValidError && getMode().localDev && !getMode().test) {
       setTimeout(function() {
         const rethrow = new Error(
-            '_reported_ Error reported incorrectly: ' + error);
+          '_reported_ Error reported incorrectly: ' + error
+        );
         throw rethrow;
       });
     }
@@ -193,7 +190,7 @@ export function reportError(error, opt_associatedElement) {
 
     // Report to console.
     if (self.console) {
-      const output = (console.error || console.log);
+      const output = console.error || console.log;
       if (error.messageArray) {
         output.apply(console, error.messageArray);
       } else {
@@ -212,8 +209,14 @@ export function reportError(error, opt_associatedElement) {
 
     // 'call' to make linter happy. And .call to make compiler happy
     // that expects some @this.
-    onError['call'](undefined, undefined, undefined, undefined,
-        undefined, error);
+    onError['call'](
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      error
+    );
   } catch (errorReportingError) {
     setTimeout(function() {
       throw errorReportingError;
@@ -272,7 +275,6 @@ export function isBlockedByConsent(errorOrMessage) {
   return false;
 }
 
-
 /**
  * Install handling of global unhandled exceptions.
  * @param {!Window} win
@@ -280,11 +282,12 @@ export function isBlockedByConsent(errorOrMessage) {
 export function installErrorReporting(win) {
   win.onerror = /** @type {!Function} */ (onError);
   win.addEventListener('unhandledrejection', event => {
-    if (event.reason &&
+    if (
+      event.reason &&
       (event.reason.message === CANCELLED ||
-      event.reason.message === BLOCK_BY_CONSENT ||
-      event.reason.message === ABORTED
-      )) {
+        event.reason.message === BLOCK_BY_CONSENT ||
+        event.reason.message === ABORTED)
+    ) {
       event.preventDefault();
       return;
     }
@@ -321,11 +324,18 @@ function onError(message, filename, line, col, error) {
     // due to buggy browser extensions may be helpful to notify authors.
     return;
   }
-  const data = getErrorReportData(message, filename, line, col, error,
-      hasNonAmpJs);
+  const data = getErrorReportData(
+    message,
+    filename,
+    line,
+    col,
+    error,
+    hasNonAmpJs
+  );
   if (data) {
     reportingBackoff(() =>
-      reportErrorToServerOrViewer(this, /** @type {!JsonObject} */ (data)));
+      reportErrorToServerOrViewer(this, /** @type {!JsonObject} */ (data))
+    );
   }
 }
 
@@ -439,8 +449,14 @@ function buildErrorMessage_(message, error) {
  * @return {!JsonObject|undefined} The data to post
  * visibleForTesting
  */
-export function getErrorReportData(message, filename, line, col, error,
-  hasNonAmpJs) {
+export function getErrorReportData(
+  message,
+  filename,
+  line,
+  col,
+  error,
+  hasNonAmpJs
+) {
   message = buildErrorMessage_(message, error);
   // An "expected" error is still an error, i.e. some features are disabled
   // or not functioning fully because of it. However, it's an expected
@@ -461,13 +477,15 @@ export function getErrorReportData(message, filename, line, col, error,
 
   // We throttle load errors and generic "Script error." errors
   // that have no information and thus cannot be acted upon.
-  if (isLoadErrorMessage(message) ||
+  if (
+    isLoadErrorMessage(message) ||
     // See https://github.com/ampproject/amphtml/issues/7353
     // for context.
     message == 'Script error.' ||
     // Window has become detached, really anything can happen
     // at this point.
-    detachedWindow) {
+    detachedWindow
+  ) {
     expected = true;
 
     if (throttleBase > NON_ACTIONABLE_ERROR_THROTTLE_THRESHOLD) {
@@ -689,6 +707,8 @@ export function reportErrorToAnalytics(error, win) {
  * @private
  */
 function getRootElement_(win) {
-  const root = Services.ampdocServiceFor(win).getAmpDoc().getRootNode();
+  const root = Services.ampdocServiceFor(win)
+    .getAmpDoc()
+    .getRootNode();
   return dev().assertElement(root.documentElement || root.body || root);
 }
diff --git a/src/event-helper-listen.js b/src/event-helper-listen.js
index 0b570238b13d..288e3424a131 100644
--- a/src/event-helper-listen.js
+++ b/src/event-helper-listen.js
@@ -15,10 +15,10 @@
  */
 
 /**
-  * Whether addEventListener supports options or only takes capture as a boolean
-  * @type {boolean|undefined}
-  * @visibleForTesting
-  */
+ * Whether addEventListener supports options or only takes capture as a boolean
+ * @type {boolean|undefined}
+ * @visibleForTesting
+ */
 let optsSupported;
 
 /**
@@ -34,8 +34,12 @@ let optsSupported;
  * @param {Object=} opt_evtListenerOpts
  * @return {!UnlistenDef}
  */
-export function internalListenImplementation(element, eventType, listener,
-  opt_evtListenerOpts) {
+export function internalListenImplementation(
+  element,
+  eventType,
+  listener,
+  opt_evtListenerOpts
+) {
   let localElement = element;
   let localListener = listener;
   /**
@@ -58,16 +62,16 @@ export function internalListenImplementation(element, eventType, listener,
     capture = opt_evtListenerOpts.capture;
   }
   localElement.addEventListener(
-      eventType,
-      wrapped,
-      optsSupported ? opt_evtListenerOpts : capture
+    eventType,
+    wrapped,
+    optsSupported ? opt_evtListenerOpts : capture
   );
   return () => {
     if (localElement) {
       localElement.removeEventListener(
-          eventType,
-          wrapped,
-          optsSupported ? opt_evtListenerOpts : capture
+        eventType,
+        wrapped,
+        optsSupported ? opt_evtListenerOpts : capture
       );
     }
     // Ensure these are GC'd
@@ -106,8 +110,8 @@ export function detectEvtListenerOptsSupport() {
 }
 
 /**
-  * Resets the test for whether addEventListener supports options or not.
-  */
+ * Resets the test for whether addEventListener supports options or not.
+ */
 export function resetEvtListenerOptsSupportForTesting() {
   optsSupported = undefined;
 }
diff --git a/src/event-helper.js b/src/event-helper.js
index ec7943621a07..a36e3cb67bc1 100644
--- a/src/event-helper.js
+++ b/src/event-helper.js
@@ -40,7 +40,11 @@ export function createCustomEvent(win, type, detail, opt_eventInit) {
     // Deprecated fallback for IE.
     const e = win.document.createEvent('CustomEvent');
     e.initCustomEvent(
-        type, !!eventInit.bubbles, !!eventInit.cancelable, detail);
+      type,
+      !!eventInit.bubbles,
+      !!eventInit.cancelable,
+      detail
+    );
     return e;
   }
 }
@@ -55,7 +59,11 @@ export function createCustomEvent(win, type, detail, opt_eventInit) {
  */
 export function listen(element, eventType, listener, opt_evtListenerOpts) {
   return internalListenImplementation(
-      element, eventType, listener, opt_evtListenerOpts);
+    element,
+    eventType,
+    listener,
+    opt_evtListenerOpts
+  );
 }
 
 /**
@@ -87,19 +95,23 @@ export function getDetail(event) {
  */
 export function listenOnce(element, eventType, listener, opt_evtListenerOpts) {
   let localListener = listener;
-  const unlisten = internalListenImplementation(element, eventType, event => {
-    try {
-      localListener(event);
-    } finally {
-      // Ensure listener is GC'd
-      localListener = null;
-      unlisten();
-    }
-  }, opt_evtListenerOpts);
+  const unlisten = internalListenImplementation(
+    element,
+    eventType,
+    event => {
+      try {
+        localListener(event);
+      } finally {
+        // Ensure listener is GC'd
+        localListener = null;
+        unlisten();
+      }
+    },
+    opt_evtListenerOpts
+  );
   return unlisten;
 }
 
-
 /**
  * Returns  a promise that will resolve as soon as the specified event has
  * fired on the element.
@@ -111,8 +123,12 @@ export function listenOnce(element, eventType, listener, opt_evtListenerOpts) {
  *     access to the unlistener, so it may be called manually when necessary.
  * @return {!Promise<!Event>}
  */
-export function listenOncePromise(element, eventType, opt_evtListenerOpts,
-  opt_cancel) {
+export function listenOncePromise(
+  element,
+  eventType,
+  opt_evtListenerOpts,
+  opt_cancel
+) {
   let unlisten;
   const eventPromise = new Promise(resolve => {
     unlisten = listenOnce(element, eventType, resolve, opt_evtListenerOpts);
@@ -124,19 +140,20 @@ export function listenOncePromise(element, eventType, opt_evtListenerOpts,
   return eventPromise;
 }
 
-
 /**
  * Whether the specified element/window has been loaded already.
  * @param {!Element|!Window} eleOrWindow
  * @return {boolean}
  */
 export function isLoaded(eleOrWindow) {
-  return !!(eleOrWindow.complete || eleOrWindow.readyState == 'complete'
-      || (isHTMLMediaElement(eleOrWindow) && eleOrWindow.readyState > 0)
-      // If the passed in thing is a Window, infer loaded state from
-      //
-      || (eleOrWindow.document
-          && eleOrWindow.document.readyState == 'complete'));
+  return !!(
+    eleOrWindow.complete ||
+    eleOrWindow.readyState == 'complete' ||
+    (isHTMLMediaElement(eleOrWindow) && eleOrWindow.readyState > 0) ||
+    // If the passed in thing is a Window, infer loaded state from
+    //
+    (eleOrWindow.document && eleOrWindow.document.readyState == 'complete')
+  );
 }
 
 /**
@@ -160,8 +177,9 @@ export function loadPromise(eleOrWindow) {
     if (isMediaElement) {
       // The following event can be triggered by the media or one of its
       // sources. Using capture is required as the media events do not bubble.
-      unlistenLoad =
-          listenOnce(eleOrWindow, 'loadedmetadata', resolve, {capture: true});
+      unlistenLoad = listenOnce(eleOrWindow, 'loadedmetadata', resolve, {
+        capture: true,
+      });
     } else {
       unlistenLoad = listenOnce(eleOrWindow, 'load', resolve);
     }
@@ -174,8 +192,10 @@ export function loadPromise(eleOrWindow) {
     // document order. If the last source errors, then the media element
     // loading errored.
     if (isMediaElement && !eleOrWindow.hasAttribute('src')) {
-      errorTarget =
-          lastChildElement(eleOrWindow, child => child.tagName === 'SOURCE');
+      errorTarget = lastChildElement(
+        eleOrWindow,
+        child => child.tagName === 'SOURCE'
+      );
       if (!errorTarget) {
         return reject(new Error('Media has no source.'));
       }
@@ -183,17 +203,20 @@ export function loadPromise(eleOrWindow) {
     unlistenError = listenOnce(errorTarget, 'error', reject);
   });
 
-  return loadingPromise.then(() => {
-    if (unlistenError) {
-      unlistenError();
-    }
-    return eleOrWindow;
-  }, () => {
-    if (unlistenLoad) {
-      unlistenLoad();
+  return loadingPromise.then(
+    () => {
+      if (unlistenError) {
+        unlistenError();
+      }
+      return eleOrWindow;
+    },
+    () => {
+      if (unlistenLoad) {
+        unlistenLoad();
+      }
+      failedToLoad(eleOrWindow);
     }
-    failedToLoad(eleOrWindow);
-  });
+  );
 }
 
 /**
diff --git a/src/examiner/examiner.js b/src/examiner/examiner.js
index b0c71d8080d7..3191b72dac0f 100644
--- a/src/examiner/examiner.js
+++ b/src/examiner/examiner.js
@@ -25,8 +25,10 @@ function detectLongTasks(win) {
   const observer = new win.PerformanceObserver(function(entryList) {
     const entries = entryList.getEntries();
     for (let i = 0; i < entries.length; i++) {
-      if (entries[i].entryType != 'longtask'
-          || entries[i].name != 'cross-origin-descendant') {
+      if (
+        entries[i].entryType != 'longtask' ||
+        entries[i].name != 'cross-origin-descendant'
+      ) {
         continue;
       }
       const attr = entries[i].attribution[0];
@@ -42,10 +44,10 @@ function detectLongTasks(win) {
           culprit = `<amp-ad type="${match[1]}">`;
         }
       }
-      console./*OK*/log(
-          `%c LONG TASK %c ${duration}ms from ${culprit}`,
-          'background: red; color: white',
-          'background: #fff; color: #000'
+      console./*OK*/ log(
+        `%c LONG TASK %c ${duration}ms from ${culprit}`,
+        'background: red; color: white',
+        'background: #fff; color: #000'
       );
     }
   });
@@ -57,7 +59,9 @@ function detectLongTasks(win) {
  * @return {boolean}
  */
 function isLongTaskApiSupported(win) {
-  return !!win.PerformanceObserver
-      && !!win.TaskAttributionTiming
-      && ('containerName' in win.TaskAttributionTiming.prototype);
+  return (
+    !!win.PerformanceObserver &&
+    !!win.TaskAttributionTiming &&
+    'containerName' in win.TaskAttributionTiming.prototype
+  );
 }
diff --git a/src/experiments.js b/src/experiments.js
index 4c56c1637903..81fb8aabfbbf 100644
--- a/src/experiments.js
+++ b/src/experiments.js
@@ -60,8 +60,9 @@ export function isCanary(win) {
  * @return {string}
  */
 export function getBinaryType(win) {
-  return win.AMP_CONFIG && win.AMP_CONFIG.type ?
-    win.AMP_CONFIG.type : 'unknown';
+  return win.AMP_CONFIG && win.AMP_CONFIG.type
+    ? win.AMP_CONFIG.type
+    : 'unknown';
 }
 
 /**
@@ -87,9 +88,13 @@ export function isExperimentOn(win, experimentId) {
  *     Default: false (save durably).
  * @return {boolean} New state for experimentId.
  */
-export function toggleExperiment(win, experimentId, opt_on,
-  opt_transientExperiment) {
-  const currentlyOn = isExperimentOn(win, /*OK*/experimentId);
+export function toggleExperiment(
+  win,
+  experimentId,
+  opt_on,
+  opt_transientExperiment
+) {
+  const currentlyOn = isExperimentOn(win, /*OK*/ experimentId);
   const on = !!(opt_on !== undefined ? opt_on : !currentlyOn);
   if (on != currentlyOn) {
     const toggles = experimentToggles(win);
@@ -127,12 +132,15 @@ export function experimentToggles(win) {
     }
   }
   // Read document level override from meta tag.
-  if (win.AMP_CONFIG
-      && Array.isArray(win.AMP_CONFIG['allow-doc-opt-in'])
-      && win.AMP_CONFIG['allow-doc-opt-in'].length > 0) {
+  if (
+    win.AMP_CONFIG &&
+    Array.isArray(win.AMP_CONFIG['allow-doc-opt-in']) &&
+    win.AMP_CONFIG['allow-doc-opt-in'].length > 0
+  ) {
     const allowed = win.AMP_CONFIG['allow-doc-opt-in'];
-    const meta =
-        win.document.head.querySelector('meta[name="amp-experiments-opt-in"]');
+    const meta = win.document.head.querySelector(
+      'meta[name="amp-experiments-opt-in"]'
+    );
     if (meta) {
       const optedInExperiments = meta.getAttribute('content').split(',');
       for (let i = 0; i < optedInExperiments.length; i++) {
@@ -145,9 +153,11 @@ export function experimentToggles(win) {
 
   Object.assign(toggles, getExperimentTogglesFromCookie(win));
 
-  if (win.AMP_CONFIG
-      && Array.isArray(win.AMP_CONFIG['allow-url-opt-in'])
-      && win.AMP_CONFIG['allow-url-opt-in'].length > 0) {
+  if (
+    win.AMP_CONFIG &&
+    Array.isArray(win.AMP_CONFIG['allow-url-opt-in']) &&
+    win.AMP_CONFIG['allow-url-opt-in'].length > 0
+  ) {
     const allowed = win.AMP_CONFIG['allow-url-opt-in'];
     const hash = win.location.originalHash || win.location.hash;
     const params = parseQueryString(hash);
@@ -209,12 +219,17 @@ function saveExperimentTogglesToCookie(win, toggles) {
     experimentIds.push((toggles[experiment] === false ? '-' : '') + experiment);
   }
 
-  setCookie(win, COOKIE_NAME, experimentIds.join(','),
-      Date.now() + COOKIE_EXPIRATION_INTERVAL, {
-        // Set explicit domain, so the cookie gets send to sub domains.
-        domain: win.location.hostname,
-        allowOnProxyOrigin: true,
-      });
+  setCookie(
+    win,
+    COOKIE_NAME,
+    experimentIds.join(','),
+    Date.now() + COOKIE_EXPIRATION_INTERVAL,
+    {
+      // Set explicit domain, so the cookie gets send to sub domains.
+      domain: win.location.hostname,
+      allowOnProxyOrigin: true,
+    }
+  );
 }
 
 /**
@@ -303,12 +318,14 @@ export function randomlySelectUnsetExperiments(win, experiments) {
     }
     if (hasOwn(win.experimentBranches, experimentName)) {
       selectedExperiments[experimentName] =
-          win.experimentBranches[experimentName];
+        win.experimentBranches[experimentName];
       continue;
     }
 
-    if (!experiments[experimentName].isTrafficEligible ||
-        !experiments[experimentName].isTrafficEligible(win)) {
+    if (
+      !experiments[experimentName].isTrafficEligible ||
+      !experiments[experimentName].isTrafficEligible(win)
+    ) {
       win.experimentBranches[experimentName] = null;
       continue;
     }
@@ -316,12 +333,14 @@ export function randomlySelectUnsetExperiments(win, experiments) {
     // If we're in the experiment, but we haven't already forced a specific
     // experiment branch (e.g., via a test setup), then randomize the branch
     // choice.
-    if (!win.experimentBranches[experimentName] &&
-      isExperimentOn(win, /*OK*/experimentName)) {
+    if (
+      !win.experimentBranches[experimentName] &&
+      isExperimentOn(win, /*OK*/ experimentName)
+    ) {
       const {branches} = experiments[experimentName];
       win.experimentBranches[experimentName] = selectRandomItem(branches);
       selectedExperiments[experimentName] =
-          win.experimentBranches[experimentName];
+        win.experimentBranches[experimentName];
     }
   }
   return selectedExperiments;
diff --git a/src/exponential-backoff.js b/src/exponential-backoff.js
index 4ac84e5dbed4..d9e8d4440d61 100644
--- a/src/exponential-backoff.js
+++ b/src/exponential-backoff.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * @param {number=} opt_base Exponential base. Defaults to 2.
  * @return {function(function()): number} Function that when invoked will
@@ -54,9 +53,9 @@ export function exponentialBackoffClock(opt_base) {
  * @return {number}
  */
 export function getJitter(wait, opt_perc) {
-  opt_perc = opt_perc || .3;
+  opt_perc = opt_perc || 0.3;
   let jitter = wait * opt_perc * Math.random();
-  if (Math.random() > .5) {
+  if (Math.random() > 0.5) {
     jitter *= -1;
   }
   return jitter;
diff --git a/src/extension-analytics.js b/src/extension-analytics.js
index c2b29c23daeb..e2bec7d61dd3 100644
--- a/src/extension-analytics.js
+++ b/src/extension-analytics.js
@@ -16,10 +16,7 @@
 
 import {CommonSignals} from './common-signals';
 import {Services} from './services';
-import {
-  createElementWithAttributes,
-  removeElement,
-} from './dom';
+import {createElementWithAttributes, removeElement} from './dom';
 import {devAssert} from './log';
 import {dict} from './utils/object';
 import {isArray, toWin} from './types';
@@ -35,19 +32,27 @@ import {triggerAnalyticsEvent} from './analytics';
  * @return {!Element} created analytics element
  */
 export function insertAnalyticsElement(
-  parentElement, config, loadAnalytics = false, disableImmediate = false) {
+  parentElement,
+  config,
+  loadAnalytics = false,
+  disableImmediate = false
+) {
   const doc = /** @type {!Document} */ (parentElement.ownerDocument);
   const analyticsElem = createElementWithAttributes(
-      doc,
-      'amp-analytics', dict({
-        'sandbox': 'true',
-        'trigger': disableImmediate ? '' : 'immediate',
-      }));
+    doc,
+    'amp-analytics',
+    dict({
+      'sandbox': 'true',
+      'trigger': disableImmediate ? '' : 'immediate',
+    })
+  );
   const scriptElem = createElementWithAttributes(
-      doc,
-      'script', dict({
-        'type': 'application/json',
-      }));
+    doc,
+    'script',
+    dict({
+      'type': 'application/json',
+    })
+  );
   scriptElem.textContent = JSON.stringify(config);
   analyticsElem.appendChild(scriptElem);
   analyticsElem.CONFIG = config;
@@ -55,10 +60,11 @@ export function insertAnalyticsElement(
   // Force load analytics extension if script not included in page.
   if (loadAnalytics) {
     // Get Extensions service and force load analytics extension.
-    const extensions =
-        Services.extensionsFor(toWin(parentElement.ownerDocument.defaultView));
+    const extensions = Services.extensionsFor(
+      toWin(parentElement.ownerDocument.defaultView)
+    );
     const ampdoc = Services.ampdoc(parentElement);
-    extensions./*OK*/installExtensionForDoc(ampdoc, 'amp-analytics');
+    extensions./*OK*/ installExtensionForDoc(ampdoc, 'amp-analytics');
   } else {
     Services.analyticsForDocOrNull(parentElement).then(analytics => {
       devAssert(analytics);
@@ -92,15 +98,20 @@ class CustomEventReporter {
 
     for (const event in config['triggers']) {
       const eventType = config['triggers'][event]['on'];
-      devAssert(eventType,
-          'CustomEventReporter config must specify trigger eventType');
+      devAssert(
+        eventType,
+        'CustomEventReporter config must specify trigger eventType'
+      );
       const newEventType = this.getEventTypeInSandbox_(eventType);
       config['triggers'][event]['on'] = newEventType;
     }
 
-    this.parent_.signals().whenSignal(CommonSignals.LOAD_START).then(() => {
-      insertAnalyticsElement(this.parent_, config, true);
-    });
+    this.parent_
+      .signals()
+      .whenSignal(CommonSignals.LOAD_START)
+      .then(() => {
+        insertAnalyticsElement(this.parent_, config, true);
+      });
   }
 
   /**
@@ -108,10 +119,15 @@ class CustomEventReporter {
    * @param {!JsonObject=} opt_vars A map of vars and their values.
    */
   trigger(eventType, opt_vars) {
-    devAssert(this.config_['triggers'][eventType],
-        'Cannot trigger non initiated eventType');
-    triggerAnalyticsEvent(this.parent_,
-        this.getEventTypeInSandbox_(eventType), opt_vars);
+    devAssert(
+      this.config_['triggers'][eventType],
+      'Cannot trigger non initiated eventType'
+    );
+    triggerAnalyticsEvent(
+      this.parent_,
+      this.getEventTypeInSandbox_(eventType),
+      opt_vars
+    );
   }
   /**
    * @param {string} eventType
@@ -122,7 +138,6 @@ class CustomEventReporter {
   }
 }
 
-
 /**
  * A builder class that enable extension elements to easily build and get a
  * CustomEventReporter instance. Its constructor requires the parent AMP
@@ -132,7 +147,6 @@ class CustomEventReporter {
 export class CustomEventReporterBuilder {
   /** @param {!AmpElement} parent */
   constructor(parent) {
-
     /** @private {!AmpElement} */
     this.parent_ = parent;
 
@@ -167,8 +181,10 @@ export class CustomEventReporterBuilder {
    */
   track(eventType, request) {
     request = isArray(request) ? request : [request];
-    devAssert(!this.config_['triggers'][eventType],
-        'customEventReporterBuilder should not track same eventType twice');
+    devAssert(
+      !this.config_['triggers'][eventType],
+      'customEventReporterBuilder should not track same eventType twice'
+    );
     const requestList = [];
     for (let i = 0; i < request.length; i++) {
       const requestName = `${eventType}-request-${i}`;
@@ -190,13 +206,14 @@ export class CustomEventReporterBuilder {
   build() {
     devAssert(this.config_, 'CustomEventReporter already built');
     const report = new CustomEventReporter(
-        this.parent_, /** @type {!JsonObject} */ (this.config_));
+      this.parent_,
+      /** @type {!JsonObject} */ (this.config_)
+    );
     this.config_ = null;
     return report;
   }
 }
 
-
 /**
  * A helper method that should be used by all extension elements to add their
  * sandbox analytics tracking. This method takes care of insert and remove the
@@ -208,26 +225,32 @@ export function useAnalyticsInSandbox(element, promise) {
   let analyticsElement = null;
   let configPromise = promise;
   // Listener to LOAD_START signal. Insert analytics element on LOAD_START
-  element.signals().whenSignal(CommonSignals.LOAD_START).then(() => {
-    if (analyticsElement || !configPromise) {
-      return;
-    }
-    configPromise.then(config => {
-      if (!configPromise) {
-        // If config promise resolve after unload, do nothing.
+  element
+    .signals()
+    .whenSignal(CommonSignals.LOAD_START)
+    .then(() => {
+      if (analyticsElement || !configPromise) {
         return;
       }
-      configPromise = null;
-      analyticsElement = insertAnalyticsElement(element, config, false);
+      configPromise.then(config => {
+        if (!configPromise) {
+          // If config promise resolve after unload, do nothing.
+          return;
+        }
+        configPromise = null;
+        analyticsElement = insertAnalyticsElement(element, config, false);
+      });
     });
-  });
 
   // Listener to UNLOAD signal. Destroy remove element on UNLOAD
-  element.signals().whenSignal(CommonSignals.UNLOAD).then(() => {
-    configPromise = null;
-    if (analyticsElement) {
-      removeElement(analyticsElement);
-      analyticsElement = null;
-    }
-  });
+  element
+    .signals()
+    .whenSignal(CommonSignals.UNLOAD)
+    .then(() => {
+      configPromise = null;
+      if (analyticsElement) {
+        removeElement(analyticsElement);
+        analyticsElement = null;
+      }
+    });
 }
diff --git a/src/finite-state-machine.js b/src/finite-state-machine.js
index 02c5eec85397..c79ac03e66c7 100644
--- a/src/finite-state-machine.js
+++ b/src/finite-state-machine.js
@@ -20,7 +20,6 @@ import {devAssert} from './log';
  * @template STATE
  */
 export class FiniteStateMachine {
-
   /**
    * Constructs a FSM using the bits defined in initialState as changeable
    * states.
@@ -51,8 +50,8 @@ export class FiniteStateMachine {
   addTransition(oldState, newState, callback) {
     const transition = this.statesToTransition_(oldState, newState);
     devAssert(
-        !this.transitions_[transition],
-        'cannot define a duplicate transition callback'
+      !this.transitions_[transition],
+      'cannot define a duplicate transition callback'
     );
     this.transitions_[transition] = callback;
   }
diff --git a/src/focus-history.js b/src/focus-history.js
index c9c79b431207..d3ad57ae8b0b 100644
--- a/src/focus-history.js
+++ b/src/focus-history.js
@@ -18,7 +18,6 @@ import {Observable} from './observable';
 import {Services} from './services';
 import {dev} from './log';
 
-
 /**
  * FocusHistory keeps track of recent focused elements. This history can be
  * purged using `purgeBefore` method.
@@ -89,8 +88,10 @@ export class FocusHistory {
    */
   pushFocus_(element) {
     const now = Date.now();
-    if (this.history_.length == 0 ||
-            this.history_[this.history_.length - 1].el != element) {
+    if (
+      this.history_.length == 0 ||
+      this.history_[this.history_.length - 1].el != element
+    ) {
       this.history_.push({el: element, time: now});
     } else {
       this.history_[this.history_.length - 1].time = now;
diff --git a/src/font-stylesheet-timeout.js b/src/font-stylesheet-timeout.js
index 214cc86b64fa..0e0b812f592c 100644
--- a/src/font-stylesheet-timeout.js
+++ b/src/font-stylesheet-timeout.js
@@ -63,9 +63,10 @@ function maybeTimeoutFonts(win) {
     // Find all stylesheets that aren't loaded from the AMP CDN (those are
     // critical if they are present).
     const styleLinkElements = win.document.querySelectorAll(
-        `link[rel~="stylesheet"]:not([href^="${
-          escapeCssSelectorIdent(urls.cdn)
-        }"])`);
+      `link[rel~="stylesheet"]:not([href^="${escapeCssSelectorIdent(
+        urls.cdn
+      )}"])`
+    );
     // Compare external sheets against elements of document.styleSheets.
     // They do not appear in this list until they have been loaded.
     const timedoutStyleSheets = [];
diff --git a/src/form-data-wrapper.js b/src/form-data-wrapper.js
index 459df80be3d1..499ce36c9e34 100644
--- a/src/form-data-wrapper.js
+++ b/src/form-data-wrapper.js
@@ -15,10 +15,7 @@
  */
 
 import {Services} from './services';
-import {
-  getFormAsObject,
-  getSubmitButtonUsed,
-} from './form';
+import {getFormAsObject, getSubmitButtonUsed} from './form';
 import {iterateCursor} from './dom';
 import {map} from './utils/object';
 
@@ -106,9 +103,9 @@ export class PolyfillFormDataWrapper {
     let nextIndex = 0;
     return /** @type {!Iterator<!Array<string>>} */ ({
       next() {
-        return nextIndex < fieldEntries.length ?
-          {value: fieldEntries[nextIndex++], done: false} :
-          {value: undefined, done: true};
+        return nextIndex < fieldEntries.length
+          ? {value: fieldEntries[nextIndex++], done: false}
+          : {value: undefined, done: true};
       },
     });
   }
diff --git a/src/form.js b/src/form.js
index 1fed28731d60..5a352529ed5d 100644
--- a/src/form.js
+++ b/src/form.js
@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  ancestorElementsByTag,
-  iterateCursor,
-} from './dom';
+import {ancestorElementsByTag, iterateCursor} from './dom';
 
 /** @const {string} */
 const FORM_PROP_ = '__AMP_FORM';
@@ -55,19 +52,14 @@ export function getFormAsObject(form) {
 
   for (let i = 0; i < elements.length; i++) {
     const input = elements[i];
-    const {
-      checked,
-      name,
-      multiple,
-      options,
-      tagName,
-      type,
-      value,
-    } = input;
-    if (!name || isDisabled(input) ||
-        !submittableTagsRegex.test(tagName) ||
-        unsubmittableTypesRegex.test(type) ||
-        (checkableType.test(type) && !checked)) {
+    const {checked, name, multiple, options, tagName, type, value} = input;
+    if (
+      !name ||
+      isDisabled(input) ||
+      !submittableTagsRegex.test(tagName) ||
+      unsubmittableTypesRegex.test(type) ||
+      (checkableType.test(type) && !checked)
+    ) {
       continue;
     }
 
@@ -149,10 +141,7 @@ export function getSubmitButtonUsed(form) {
  * @return {boolean}
  */
 function isSubmitButton(element) {
-  const {
-    tagName,
-    type,
-  } = element;
+  const {tagName, type} = element;
   return tagName == 'BUTTON' || type == 'submit';
 }
 
diff --git a/src/friendly-iframe-embed.js b/src/friendly-iframe-embed.js
index ec9b88e9bcac..7e2719e5d521 100644
--- a/src/friendly-iframe-embed.js
+++ b/src/friendly-iframe-embed.js
@@ -33,14 +33,16 @@ import {
 } from './style';
 import {toWin} from './types';
 
-
 /** @const {string} */
 const EMBED_PROP = '__AMP_EMBED__';
 
 /** @const {!Array<string>} */
-const EXCLUDE_INI_LOAD =
-    ['AMP-AD', 'AMP-ANALYTICS', 'AMP-PIXEL', 'AMP-AD-EXIT'];
-
+const EXCLUDE_INI_LOAD = [
+  'AMP-AD',
+  'AMP-ANALYTICS',
+  'AMP-PIXEL',
+  'AMP-AD-EXIT',
+];
 
 /**
  * Parameters used to create the new "friendly iframe" embed.
@@ -61,7 +63,6 @@ const EXCLUDE_INI_LOAD =
  */
 export let FriendlyIframeSpec;
 
-
 /**
  * @type {boolean|undefined}
  * @visibleForTesting
@@ -87,7 +88,6 @@ function isSrcdocSupported() {
   return srcdocSupported;
 }
 
-
 /**
  * Sets whether the embed is currently visible. The interpretation of visibility
  * is up to the embed parent. However, most of typical cases would rely on
@@ -100,7 +100,6 @@ export function setFriendlyIframeEmbedVisible(embed, visible) {
   embed.setVisible_(visible);
 }
 
-
 /**
  * Returns the embed created using `installFriendlyIframeEmbed` or `null`.
  * Caution: This will only return the FIE after the iframe has 'loaded'. If you
@@ -113,7 +112,6 @@ export function getFriendlyIframeEmbedOptional(iframe) {
   return /** @type {?FriendlyIframeEmbed} */ (iframe[EMBED_PROP]);
 }
 
-
 /**
  * Creates the requested "friendly iframe" embed. Returns the promise that
  * will be resolved as soon as the embed is available. The actual
@@ -125,8 +123,12 @@ export function getFriendlyIframeEmbedOptional(iframe) {
  * @param {function(!Window)=} opt_preinstallCallback
  * @return {!Promise<!FriendlyIframeEmbed>}
  */
-export function installFriendlyIframeEmbed(iframe, container, spec,
-  opt_preinstallCallback) {
+export function installFriendlyIframeEmbed(
+  iframe,
+  container,
+  spec,
+  opt_preinstallCallback
+) {
   /** @const {!Window} */
   const win = getTopWindow(toWin(iframe.ownerDocument.defaultView));
   /** @const {!./service/extensions-impl.Extensions} */
@@ -137,8 +139,9 @@ export function installFriendlyIframeEmbed(iframe, container, spec,
 
   // Pre-load extensions.
   if (spec.extensionIds) {
-    spec.extensionIds.forEach(
-        extensionId => extensions.preloadExtension(extensionId));
+    spec.extensionIds.forEach(extensionId =>
+      extensions.preloadExtension(extensionId)
+    );
   }
 
   const html = mergeHtml(spec);
@@ -149,10 +152,12 @@ export function installFriendlyIframeEmbed(iframe, container, spec,
     iframe.readyState = 'complete';
   };
   const registerViolationListener = () => {
-    iframe.contentWindow.addEventListener('securitypolicyviolation',
-        violationEvent => {
-          dev().warn('FIE', 'security policy violation', violationEvent);
-        });
+    iframe.contentWindow.addEventListener(
+      'securitypolicyviolation',
+      violationEvent => {
+        dev().warn('FIE', 'security policy violation', violationEvent);
+      }
+    );
   };
   let loadedPromise;
   if (isSrcdocSupported()) {
@@ -194,12 +199,14 @@ export function installFriendlyIframeEmbed(iframe, container, spec,
 
       // For safety, make sure we definitely stop polling when child doc is
       // loaded.
-      loadedPromise.catch(error => {
-        rethrowAsync(error);
-      }).then(() => {
-        resolve();
-        win.clearInterval(interval);
-      });
+      loadedPromise
+        .catch(error => {
+          rethrowAsync(error);
+        })
+        .then(() => {
+          resolve();
+          win.clearInterval(interval);
+        });
     });
   }
 
@@ -210,14 +217,16 @@ export function installFriendlyIframeEmbed(iframe, container, spec,
     const childWin = /** @type {!Window} */ (iframe.contentWindow);
     // Add extensions.
     extensions.installExtensionsInChildWindow(
-        childWin, spec.extensionIds || [], opt_preinstallCallback);
+      childWin,
+      spec.extensionIds || [],
+      opt_preinstallCallback
+    );
     // Ready to be shown.
     embed.startRender_();
     return embed;
   });
 }
 
-
 /**
  * Returns `true` when iframe is ready.
  * @param {!HTMLIFrameElement} iframe
@@ -230,13 +239,14 @@ function isIframeReady(iframe) {
   // no other reliable signal for `readyState` in a child window and thus
   // the best way to check is to see the contents of the body.
   const childDoc = iframe.contentWindow && iframe.contentWindow.document;
-  return !!(childDoc &&
-      isDocumentReady(childDoc) &&
-      childDoc.body &&
-      childDoc.body.firstChild);
+  return !!(
+    childDoc &&
+    isDocumentReady(childDoc) &&
+    childDoc.body &&
+    childDoc.body.firstChild
+  );
 }
 
-
 /**
  * Merges base and fonts into html document.
  * @param {!FriendlyIframeSpec} spec
@@ -274,13 +284,16 @@ function mergeHtml(spec) {
   if (spec.fonts) {
     spec.fonts.forEach(font => {
       result.push(
-          `<link href="${escapeHtml(font)}" rel="stylesheet" type="text/css">`);
+        `<link href="${escapeHtml(font)}" rel="stylesheet" type="text/css">`
+      );
     });
   }
 
   // Load CSP
-  result.push('<meta http-equiv=Content-Security-Policy ' +
-      'content="script-src \'none\';object-src \'none\';child-src \'none\'">');
+  result.push(
+    '<meta http-equiv=Content-Security-Policy ' +
+      "content=\"script-src 'none';object-src 'none';child-src 'none'\">"
+  );
 
   // Postambule.
   if (ip > 0) {
@@ -292,7 +305,6 @@ function mergeHtml(spec) {
   return result.join('');
 }
 
-
 /**
  * Exposes `mergeHtml` for testing purposes.
  * @param {!FriendlyIframeSpec} spec
@@ -302,7 +314,6 @@ export function mergeHtmlForTesting(spec) {
   return mergeHtml(spec);
 }
 
-
 /**
  * A "friendly iframe" embed. This is the iframe that's fully accessible to
  * the AMP runtime. It's similar to Shadow DOM in many respects, but it also
@@ -314,7 +325,6 @@ export function mergeHtmlForTesting(spec) {
  * resources.
  */
 export class FriendlyIframeEmbed {
-
   /**
    * @param {!HTMLIFrameElement} iframe
    * @param {!FriendlyIframeSpec} spec
@@ -325,7 +335,7 @@ export class FriendlyIframeEmbed {
     this.iframe = iframe;
 
     /** @const {!Window} */
-    this.win = /** @type{!Window} */(iframe.contentWindow);
+    this.win = /** @type {!Window} */ (iframe.contentWindow);
 
     /** @const {!FriendlyIframeSpec} */
     this.spec = spec;
@@ -435,9 +445,11 @@ export class FriendlyIframeEmbed {
       rect = this.host.getLayoutBox();
     } else {
       rect = layoutRectLtwh(
-          0, 0,
-          this.win./*OK*/innerWidth,
-          this.win./*OK*/innerHeight);
+        0,
+        0,
+        this.win./*OK*/ innerWidth,
+        this.win./*OK*/ innerHeight
+      );
     }
     Promise.all([
       this.whenReady(),
@@ -484,9 +496,9 @@ export class FriendlyIframeEmbed {
    * @visibleForTesting
    */
   getBodyElement() {
-    return /** @type {!HTMLBodyElement} */ (
-      (this.iframe.contentDocument || this.iframe.contentWindow.document)
-          .body);
+    return /** @type {!HTMLBodyElement} */ ((
+      this.iframe.contentDocument || this.iframe.contentWindow.document
+    ).body);
   }
 
   /**
@@ -505,8 +517,11 @@ export class FriendlyIframeEmbed {
    * @private
    */
   measureMutate_(task) {
-    return this.getResources_().measureMutateElement(this.iframe,
-        task.measure || null, task.mutate);
+    return this.getResources_().measureMutateElement(
+      this.iframe,
+      task.measure || null,
+      task.mutate
+    );
   }
 
   /**
@@ -516,16 +531,18 @@ export class FriendlyIframeEmbed {
     const ampAdParent = dev().assertElement(this.iframe.parentNode);
 
     // Security assertion. Otherwise any 3p frame could request lighbox mode.
-    userAssert(ampAdParent.tagName.toLowerCase() == 'amp-ad',
-        'Only <amp-ad> is allowed to enter lightbox mode.');
+    userAssert(
+      ampAdParent.tagName.toLowerCase() == 'amp-ad',
+      'Only <amp-ad> is allowed to enter lightbox mode.'
+    );
 
     let bodyStyle;
 
     return this.measureMutate_({
       measure: () => {
-        const rect = this.host ?
-          this.host.getLayoutBox() :
-          this.iframe./*OK*/getBoundingClientRect();
+        const rect = this.host
+          ? this.host.getLayoutBox()
+          : this.iframe./*OK*/ getBoundingClientRect();
 
         // Offset by scroll top as iframe will be position: fixed.
         const dy = -Services.viewportForDoc(this.iframe).getScrollTop();
@@ -610,16 +627,16 @@ export class FriendlyIframeEmbed {
  */
 export function whenContentIniLoad(elementOrAmpDoc, hostWin, rect) {
   return Services.resourcesForDoc(elementOrAmpDoc)
-      .getResourcesInRect(hostWin, rect)
-      .then(resources => {
-        const promises = [];
-        resources.forEach(r => {
-          if (!EXCLUDE_INI_LOAD.includes(r.element.tagName)) {
-            promises.push(r.loadedOnce());
-          }
-        });
-        return Promise.all(promises);
+    .getResourcesInRect(hostWin, rect)
+    .then(resources => {
+      const promises = [];
+      resources.forEach(r => {
+        if (!EXCLUDE_INI_LOAD.includes(r.element.tagName)) {
+          promises.push(r.loadedOnce());
+        }
       });
+      return Promise.all(promises);
+    });
 }
 
 /**
@@ -627,6 +644,8 @@ export function whenContentIniLoad(elementOrAmpDoc, hostWin, rect) {
  * @return {boolean}
  */
 export function isInFie(element) {
-  return element.classList.contains('i-amphtml-fie') ||
-    !!closestAncestorElementBySelector(element, '.i-amphtml-fie');
+  return (
+    element.classList.contains('i-amphtml-fie') ||
+    !!closestAncestorElementBySelector(element, '.i-amphtml-fie')
+  );
 }
diff --git a/src/full-overlay-frame-helper.js b/src/full-overlay-frame-helper.js
index 42c1c68bfe44..46bcb908f252 100644
--- a/src/full-overlay-frame-helper.js
+++ b/src/full-overlay-frame-helper.js
@@ -15,7 +15,6 @@
  */
 import {px, resetStyles, setStyles, translate} from './style';
 
-
 /**
  * Centers a frame with a translate transition.
  * This function does direct DOM manipulation, so it needs to run under vsync
@@ -26,16 +25,21 @@ import {px, resetStyles, setStyles, translate} from './style';
  * @param {number} transitionTimeMs
  */
 export function centerFrameUnderVsyncMutate(
-  iframe, iframeRect, viewportSize, transitionTimeMs) {
-
+  iframe,
+  iframeRect,
+  viewportSize,
+  transitionTimeMs
+) {
   // TODO(alanorozco): Place a sentinel sibling on inabox to account for
   // gap necessary for position: fixed.
 
   const translateX = px(
-      (viewportSize.width / 2) - (iframeRect.width / 2) - iframeRect.left);
+    viewportSize.width / 2 - iframeRect.width / 2 - iframeRect.left
+  );
 
   const translateY = px(
-      (viewportSize.height / 2) - (iframeRect.height / 2) - iframeRect.top);
+    viewportSize.height / 2 - iframeRect.height / 2 - iframeRect.top
+  );
 
   setStyles(iframe, {
     'position': 'fixed',
@@ -51,7 +55,6 @@ export function centerFrameUnderVsyncMutate(
   });
 }
 
-
 /**
  * Expands frame to fill the entire viewport.
  * This function does direct DOM manipulation, so it needs to run under vsync
@@ -75,7 +78,6 @@ export function expandFrameUnderVsyncMutate(iframe) {
   });
 }
 
-
 /**
  * Resets frame that was previously expanded to fill the entire viewport.
  * This function does direct DOM manipulation, so it needs to run under vsync
diff --git a/src/gesture-recognizers.js b/src/gesture-recognizers.js
index c2b4c181b9b3..f24a84d9afd0 100644
--- a/src/gesture-recognizers.js
+++ b/src/gesture-recognizers.js
@@ -28,7 +28,6 @@ const DOUBLETAP_DELAY = 200;
  */
 export let TapDef;
 
-
 /**
  * Recognizes "tap" gestures.
  * @extends {GestureRecognizer<TapDef>}
@@ -91,17 +90,18 @@ export class TapRecognizer extends GestureRecognizer {
 
   /** @override */
   acceptStart() {
-    this.signalEmit({
-      clientX: this.lastX_,
-      clientY: this.lastY_,
-      target: this.target_,
-    }, null);
+    this.signalEmit(
+      {
+        clientX: this.lastX_,
+        clientY: this.lastY_,
+        target: this.target_,
+      },
+      null
+    );
     this.signalEnd();
   }
 }
 
-
-
 /**
  * A "doubletap" gesture.
  * @typedef {{
@@ -111,7 +111,6 @@ export class TapRecognizer extends GestureRecognizer {
  */
 export let DoubletapDef;
 
-
 /**
  * Recognizes a "doubletap" gesture. This gesture will block a single "tap"
  * for about 200ms while it's expecting the second "tap".
@@ -202,8 +201,6 @@ export class DoubletapRecognizer extends GestureRecognizer {
   }
 }
 
-
-
 /**
  * A "swipe-xy", "swipe-x" or "swipe-y" gesture. A number of these gestures
  * may be emitted for a single touch series.
@@ -218,7 +215,6 @@ export class DoubletapRecognizer extends GestureRecognizer {
  */
 export let SwipeDef;
 
-
 /**
  * Recognizes swipe gestures. This gesture will yield about 10ms to other
  * gestures.
@@ -298,7 +294,7 @@ class SwipeRecognizer extends GestureRecognizer {
   onTouchMove(e) {
     const {touches} = e;
     if (touches && touches.length >= 1) {
-      const {clientX: x, clientY: y} = touches[0] ;
+      const {clientX: x, clientY: y} = touches[0];
       this.lastX_ = x;
       this.lastY_ = y;
       if (this.eventing_) {
@@ -376,10 +372,16 @@ class SwipeRecognizer extends GestureRecognizer {
     // It's often that `touchend` arrives on the next frame. These should
     // be ignored to avoid a significant velocity downgrade.
     if ((!last && deltaTime > 4) || (last && deltaTime > 16)) {
-      const velocityX = calcVelocity(this.lastX_ - this.prevX_, deltaTime,
-          this.velocityX_);
-      const velocityY = calcVelocity(this.lastY_ - this.prevY_, deltaTime,
-          this.velocityY_);
+      const velocityX = calcVelocity(
+        this.lastX_ - this.prevX_,
+        deltaTime,
+        this.velocityX_
+      );
+      const velocityY = calcVelocity(
+        this.lastY_ - this.prevY_,
+        deltaTime,
+        this.velocityY_
+      );
 
       // On iOS, the touchend will always have the same x/y position as the
       // last touchmove, so we want to make sure we do not remove the velocity.
@@ -395,19 +397,22 @@ class SwipeRecognizer extends GestureRecognizer {
       this.prevTime_ = this.lastTime_;
     }
 
-    this.signalEmit({
-      first,
-      last,
-      time: this.lastTime_,
-      deltaX: this.lastX_ - this.startX_,
-      deltaY: this.lastY_ - this.startY_,
-      startX: this.startX_,
-      startY: this.startY_,
-      lastX: this.lastX_,
-      lastY: this.lastY_,
-      velocityX: this.velocityX_,
-      velocityY: this.velocityY_,
-    }, event);
+    this.signalEmit(
+      {
+        first,
+        last,
+        time: this.lastTime_,
+        deltaX: this.lastX_ - this.startX_,
+        deltaY: this.lastY_ - this.startY_,
+        startX: this.startX_,
+        startY: this.startY_,
+        lastX: this.lastX_,
+        lastY: this.lastY_,
+        velocityX: this.velocityX_,
+        velocityY: this.velocityY_,
+      },
+      event
+    );
   }
 
   /**
@@ -423,7 +428,6 @@ class SwipeRecognizer extends GestureRecognizer {
   }
 }
 
-
 /**
  * Recognizes "swipe-xy" gesture. Yields about 10ms to other gestures.
  */
@@ -436,7 +440,6 @@ export class SwipeXYRecognizer extends SwipeRecognizer {
   }
 }
 
-
 /**
  * Recognizes "swipe-x" gesture. Yields about 10ms to other gestures.
  */
@@ -449,7 +452,6 @@ export class SwipeXRecognizer extends SwipeRecognizer {
   }
 }
 
-
 /**
  * Recognizes "swipe-y" gesture. Yields about 10ms to other gestures.
  */
@@ -462,8 +464,6 @@ export class SwipeYRecognizer extends SwipeRecognizer {
   }
 }
 
-
-
 /**
  * A "tapzoom" gesture. It has a center, delta off the center center and
  * the velocity of moving away from the center.
@@ -480,7 +480,6 @@ export class SwipeYRecognizer extends SwipeRecognizer {
  */
 let TapzoomDef;
 
-
 /**
  * Recognizes a "tapzoom" gesture. This gesture will block other gestures
  * for about 400ms after first "tap" while it's expecting swipe.
@@ -611,25 +610,34 @@ export class TapzoomRecognizer extends GestureRecognizer {
     if (first) {
       this.velocityX_ = this.velocityY_ = 0;
     } else if (this.lastTime_ - this.prevTime_ > 2) {
-      this.velocityX_ = calcVelocity(this.lastX_ - this.prevX_,
-          this.lastTime_ - this.prevTime_, this.velocityX_);
-      this.velocityY_ = calcVelocity(this.lastY_ - this.prevY_,
-          this.lastTime_ - this.prevTime_, this.velocityY_);
+      this.velocityX_ = calcVelocity(
+        this.lastX_ - this.prevX_,
+        this.lastTime_ - this.prevTime_,
+        this.velocityX_
+      );
+      this.velocityY_ = calcVelocity(
+        this.lastY_ - this.prevY_,
+        this.lastTime_ - this.prevTime_,
+        this.velocityY_
+      );
     }
     this.prevX_ = this.lastX_;
     this.prevY_ = this.lastY_;
     this.prevTime_ = this.lastTime_;
 
-    this.signalEmit({
-      first,
-      last,
-      centerClientX: this.startX_,
-      centerClientY: this.startY_,
-      deltaX: this.lastX_ - this.startX_,
-      deltaY: this.lastY_ - this.startY_,
-      velocityX: this.velocityX_,
-      velocityY: this.velocityY_,
-    }, event);
+    this.signalEmit(
+      {
+        first,
+        last,
+        centerClientX: this.startX_,
+        centerClientY: this.startY_,
+        deltaX: this.lastX_ - this.startX_,
+        deltaY: this.lastY_ - this.startY_,
+        velocityX: this.velocityX_,
+        velocityY: this.velocityY_,
+      },
+      event
+    );
   }
 
   /**
@@ -645,8 +653,6 @@ export class TapzoomRecognizer extends GestureRecognizer {
   }
 }
 
-
-
 /**
  * A "pinch" gesture. It has a center, delta off the center center and
  * the velocity of moving away from the center. "dir" component of `1`
@@ -868,10 +874,16 @@ export class PinchRecognizer extends GestureRecognizer {
     // It's often that `touchend` arrives on the next frame. These should
     // be ignored to avoid a significant velocity downgrade.
     if ((!last && deltaTime > 4) || (last && deltaTime > 16)) {
-      this.velocityX_ = calcVelocity(deltaX - this.prevDeltaX_, deltaTime,
-          this.velocityX_);
-      this.velocityY_ = calcVelocity(deltaY - this.prevDeltaY_, deltaTime,
-          this.velocityY_);
+      this.velocityX_ = calcVelocity(
+        deltaX - this.prevDeltaX_,
+        deltaTime,
+        this.velocityX_
+      );
+      this.velocityY_ = calcVelocity(
+        deltaY - this.prevDeltaY_,
+        deltaTime,
+        this.velocityY_
+      );
       this.velocityX_ = Math.abs(this.velocityX_) > 1e-4 ? this.velocityX_ : 0;
       this.velocityY_ = Math.abs(this.velocityY_) > 1e-4 ? this.velocityY_ : 0;
       this.prevDeltaX_ = deltaX;
@@ -879,22 +891,33 @@ export class PinchRecognizer extends GestureRecognizer {
       this.prevTime_ = this.lastTime_;
     }
 
-    const startSq = this.sqDist_(this.startX1_, this.startX2_,
-        this.startY1_, this.startY2_);
-    const lastSq = this.sqDist_(this.lastX1_, this.lastX2_,
-        this.lastY1_, this.lastY2_);
-    this.signalEmit({
-      first,
-      last,
-      time: this.lastTime_,
-      centerClientX: this.centerClientX_,
-      centerClientY: this.centerClientY_,
-      dir: Math.sign(lastSq - startSq),
-      deltaX: deltaX * 0.5,
-      deltaY: deltaY * 0.5,
-      velocityX: this.velocityX_ * 0.5,
-      velocityY: this.velocityY_ * 0.5,
-    }, event);
+    const startSq = this.sqDist_(
+      this.startX1_,
+      this.startX2_,
+      this.startY1_,
+      this.startY2_
+    );
+    const lastSq = this.sqDist_(
+      this.lastX1_,
+      this.lastX2_,
+      this.lastY1_,
+      this.lastY2_
+    );
+    this.signalEmit(
+      {
+        first,
+        last,
+        time: this.lastTime_,
+        centerClientX: this.centerClientX_,
+        centerClientY: this.centerClientY_,
+        dir: Math.sign(lastSq - startSq),
+        deltaX: deltaX * 0.5,
+        deltaY: deltaY * 0.5,
+        velocityX: this.velocityX_ * 0.5,
+        velocityY: this.velocityY_ * 0.5,
+      },
+      event
+    );
   }
 
   /**
@@ -926,8 +949,9 @@ export class PinchRecognizer extends GestureRecognizer {
    * @private
    */
   deltaX_() {
-    return Math.abs((this.lastX1_ - this.startX1_) -
-        (this.lastX2_ - this.startX2_));
+    return Math.abs(
+      this.lastX1_ - this.startX1_ - (this.lastX2_ - this.startX2_)
+    );
   }
 
   /**
@@ -935,7 +959,8 @@ export class PinchRecognizer extends GestureRecognizer {
    * @private
    */
   deltaY_() {
-    return Math.abs((this.lastY1_ - this.startY1_) -
-        (this.lastY2_ - this.startY2_));
+    return Math.abs(
+      this.lastY1_ - this.startY1_ - (this.lastY2_ - this.startY2_)
+    );
   }
 }
diff --git a/src/gesture.js b/src/gesture.js
index 49fa4d3e77de..b3fb020f3360 100644
--- a/src/gesture.js
+++ b/src/gesture.js
@@ -20,10 +20,8 @@ import {devAssert} from './log';
 import {findIndex} from './utils/array';
 import {toWin} from './types';
 
-
 const PROP_ = '__AMP_Gestures';
 
-
 /**
  * A gesture object contains the type and data of the gesture such as
  * a tap or a double-tap or a swipe. See {@link GestureRecognizer} for
@@ -52,7 +50,6 @@ export class Gesture {
   }
 }
 
-
 /**
  * Gestures object manages all gestures on a particular element. It listens
  * to all pointer events and delegates them to individual gesture recognizers.
@@ -61,7 +58,6 @@ export class Gesture {
  * between competing recognizers to decide which gesture should go forward.
  */
 export class Gestures {
-
   /**
    * Creates if not yet created and returns the shared Gestures instance for
    * the specified element.
@@ -112,8 +108,10 @@ export class Gestures {
     this.wasEventing_ = false;
 
     /** @private {!Pass} */
-    this.pass_ = new Pass(toWin(element.ownerDocument.defaultView),
-        this.doPass_.bind(this));
+    this.pass_ = new Pass(
+      toWin(element.ownerDocument.defaultView),
+      this.doPass_.bind(this)
+    );
 
     /** @private {!Observable} */
     this.pointerDownObservable_ = new Observable();
@@ -405,12 +403,16 @@ export class Gestures {
    * @visibleForTesting
    */
   signalEmit_(recognizer, data, event) {
-    devAssert(this.eventing_ == recognizer,
-        'Recognizer is not currently allowed: %s', recognizer.getType());
+    devAssert(
+      this.eventing_ == recognizer,
+      'Recognizer is not currently allowed: %s',
+      recognizer.getType()
+    );
     const overserver = this.overservers_[recognizer.getType()];
     if (overserver) {
-      overserver.fire(new Gesture(recognizer.getType(), data, Date.now(),
-          event));
+      overserver.fire(
+        new Gesture(recognizer.getType(), data, Date.now(), event)
+      );
     }
   }
 
@@ -424,8 +426,7 @@ export class Gestures {
     if (!cancelEvent) {
       const now = Date.now();
       for (let i = 0; i < this.recognizers_.length; i++) {
-        if (this.ready_[i] ||
-                (this.pending_[i] && this.pending_[i] >= now)) {
+        if (this.ready_[i] || (this.pending_[i] && this.pending_[i] >= now)) {
           cancelEvent = true;
           break;
         }
@@ -540,7 +541,6 @@ export class Gestures {
   }
 }
 
-
 /**
  * The gesture recognizer receives the pointer events from Gestures instance.
  * Based on these events, it can "recognize" the gesture it's responsible for,
@@ -569,7 +569,6 @@ export class Gestures {
  * @template DATA
  */
 export class GestureRecognizer {
-
   /**
    * @param {string} type
    * @param {!Gestures} manager
@@ -642,15 +641,13 @@ export class GestureRecognizer {
    * state. It will be in this state until it calls {@link signalEnd} or
    * the {@link acceptCancel} is called by the Gestures instance.
    */
-  acceptStart() {
-  }
+  acceptStart() {}
 
   /**
    * The Gestures instance calls this method to reset the recognizer. At this
    * point the recognizer is in the initial waiting state.
    */
-  acceptCancel() {
-  }
+  acceptCancel() {}
 
   /**
    * The Gestures instance calls this method for each "touchstart" event. If
@@ -681,6 +678,5 @@ export class GestureRecognizer {
    * next touch series.
    * @param {!Event} unusedEvent
    */
-  onTouchEnd(unusedEvent) {
-  }
+  onTouchEnd(unusedEvent) {}
 }
diff --git a/src/get-bounding-client-rect.js b/src/get-bounding-client-rect.js
index 577f0fdefea6..c8d86c755850 100644
--- a/src/get-bounding-client-rect.js
+++ b/src/get-bounding-client-rect.js
@@ -21,10 +21,7 @@
  * @see https://developer.microsoft.com/en-us/microsoft-edge/platform/issues/106812/
  */
 
-import {
-  LayoutRectDef,
-  layoutRectLtwh,
-} from './layout-rect';
+import {LayoutRectDef, layoutRectLtwh} from './layout-rect';
 import {isConnectedNode} from './dom';
 
 /**
@@ -59,7 +56,7 @@ function shouldInstall(win) {
 
   try {
     const div = win.document.createElement('div');
-    const rect = div./*OK*/getBoundingClientRect();
+    const rect = div./*OK*/ getBoundingClientRect();
     return rect.top !== 0;
   } catch (e) {
     // IE 10 or less
diff --git a/src/get-html.js b/src/get-html.js
index 3b08af682d09..3f7a73c9ff54 100644
--- a/src/get-html.js
+++ b/src/get-html.js
@@ -20,13 +20,35 @@ import {startsWith} from './string';
 const excludedTags = ['script', 'style'];
 
 /** @type {!Array<string>} */
-const allowedAmpTags = ['amp-accordion', 'amp-app-banner', 'amp-carousel',
-  'amp-fit-text', 'amp-form', 'amp-selector', 'amp-sidebar'];
+const allowedAmpTags = [
+  'amp-accordion',
+  'amp-app-banner',
+  'amp-carousel',
+  'amp-fit-text',
+  'amp-form',
+  'amp-selector',
+  'amp-sidebar',
+];
 
 /** @type {!Array<string>} */
-const allowedAttributes = ['action', 'alt', 'class', 'disabled', 'height',
-  'href', 'id', 'name', 'placeholder', 'readonly', 'src', 'tabindex',
-  'title', 'type', 'value', 'width'];
+const allowedAttributes = [
+  'action',
+  'alt',
+  'class',
+  'disabled',
+  'height',
+  'href',
+  'id',
+  'name',
+  'placeholder',
+  'readonly',
+  'src',
+  'tabindex',
+  'title',
+  'type',
+  'value',
+  'width',
+];
 
 /**
  * Returns content of HTML node
@@ -76,7 +98,6 @@ function appendToResult(node, attrs, result) {
   }
 }
 
-
 /**
  *
  * @param {!Element} node
@@ -92,7 +113,6 @@ function isApplicableNode(node) {
   }
 }
 
-
 /**
  *
  * @param {!Element} node
diff --git a/src/iframe-attributes.js b/src/iframe-attributes.js
index 8b64f0af2bc2..efc299d34c28 100644
--- a/src/iframe-attributes.js
+++ b/src/iframe-attributes.js
@@ -31,7 +31,11 @@ import {urls} from './config';
  * @return {!JsonObject}
  */
 export function getContextMetadata(
-  parentWindow, element, sentinel, attributes) {
+  parentWindow,
+  element,
+  sentinel,
+  attributes
+) {
   const startTime = Date.now();
   const width = element.getAttribute('width');
   const height = element.getAttribute('height');
@@ -67,8 +71,9 @@ export function getContextMetadata(
   // name to the extern list.
   attributes['_context'] = dict({
     'ampcontextVersion': internalRuntimeVersion(),
-    'ampcontextFilepath':
-        `${urls.thirdParty}/${internalRuntimeVersion()}/ampcontext-v0.js`,
+    'ampcontextFilepath': `${
+      urls.thirdParty
+    }/${internalRuntimeVersion()}/ampcontext-v0.js`,
     'sourceUrl': docInfo.sourceUrl,
     'referrer': referrer,
     'canonicalUrl': docInfo.canonicalUrl,
@@ -81,12 +86,14 @@ export function getContextMetadata(
     'mode': getModeObject(),
     'canary': isCanary(parentWindow),
     'hidden': !viewer.isVisible(),
-    'initialLayoutRect': layoutRect ? {
-      'left': layoutRect.left,
-      'top': layoutRect.top,
-      'width': layoutRect.width,
-      'height': layoutRect.height,
-    } : null,
+    'initialLayoutRect': layoutRect
+      ? {
+          'left': layoutRect.left,
+          'top': layoutRect.top,
+          'width': layoutRect.width,
+          'height': layoutRect.height,
+        }
+      : null,
     'initialIntersection': element.getIntersectionChangeEntry(),
     'domFingerprint': DomFingerprint.generate(element),
     'experimentToggles': experimentToggles(parentWindow),
diff --git a/src/iframe-helper.js b/src/iframe-helper.js
index 01cda232856f..bea1abf18007 100644
--- a/src/iframe-helper.js
+++ b/src/iframe-helper.js
@@ -131,8 +131,10 @@ function getListenForEvents(parentWin, sentinel, origin, triggerWin) {
     const {contentWindow} = we.frame;
     if (!contentWindow) {
       setTimeout(dropListenSentinel, 0, listenSentinel);
-    } else if (triggerWin == contentWindow ||
-        isDescendantWindow(contentWindow, triggerWin)) {
+    } else if (
+      triggerWin == contentWindow ||
+      isDescendantWindow(contentWindow, triggerWin)
+    ) {
       // 3p code path, we may accept messages from nested frames.
       windowEvents = we;
       break;
@@ -202,10 +204,10 @@ function registerGlobalListenerIfNeeded(parentWin) {
     }
 
     const listenForEvents = getListenForEvents(
-        parentWin,
-        data['sentinel'],
-        event.origin,
-        event.source
+      parentWin,
+      data['sentinel'],
+      event.origin,
+      event.source
     );
     if (!listenForEvents) {
       return;
@@ -250,25 +252,28 @@ export function listenFor(
   callback,
   opt_is3P,
   opt_includingNestedWindows,
-  opt_allowOpaqueOrigin) {
-
+  opt_allowOpaqueOrigin
+) {
   devAssert(iframe.src, 'only iframes with src supported');
-  devAssert(!iframe.parentNode, 'cannot register events on an attached ' +
-      'iframe. It will cause hair-pulling bugs like #2942');
+  devAssert(
+    !iframe.parentNode,
+    'cannot register events on an attached ' +
+      'iframe. It will cause hair-pulling bugs like #2942'
+  );
   devAssert(callback);
   const parentWin = iframe.ownerDocument.defaultView;
 
   registerGlobalListenerIfNeeded(parentWin);
 
   const listenForEvents = getOrCreateListenForEvents(
-      parentWin,
-      iframe,
-      opt_is3P
+    parentWin,
+    iframe,
+    opt_is3P
   );
 
   const iframeOrigin = parseUrlDeprecated(iframe.src).origin;
-  let events = listenForEvents[typeOfMessage] ||
-    (listenForEvents[typeOfMessage] = []);
+  let events =
+    listenForEvents[typeOfMessage] || (listenForEvents[typeOfMessage] = []);
 
   let unlisten;
   let listener = function(data, source, origin) {
@@ -304,7 +309,7 @@ export function listenFor(
 
   events.push(listener);
 
-  return unlisten = function() {
+  return (unlisten = function() {
     if (listener) {
       const index = events.indexOf(listener);
       if (index > -1) {
@@ -316,7 +321,7 @@ export function listenFor(
       events = null;
       callback = null;
     }
-  };
+  });
 }
 
 /**
@@ -335,12 +340,17 @@ export function listenForOncePromise(iframe, typeOfMessages, opt_is3P) {
   return new Promise(resolve => {
     for (let i = 0; i < typeOfMessages.length; i++) {
       const message = typeOfMessages[i];
-      const unlisten = listenFor(iframe, message, (data, source, origin) => {
-        for (let i = 0; i < unlistenList.length; i++) {
-          unlistenList[i]();
-        }
-        resolve({data, source, origin});
-      }, opt_is3P);
+      const unlisten = listenFor(
+        iframe,
+        message,
+        (data, source, origin) => {
+          for (let i = 0; i < unlistenList.length; i++) {
+            unlistenList[i]();
+          }
+          resolve({data, source, origin});
+        },
+        opt_is3P
+      );
       unlistenList.push(unlisten);
     }
   });
@@ -355,9 +365,13 @@ export function listenForOncePromise(iframe, typeOfMessages, opt_is3P) {
  * @param {boolean=} opt_is3P set to true if the iframe is 3p.
  */
 export function postMessage(iframe, type, object, targetOrigin, opt_is3P) {
-  postMessageToWindows(iframe,
-      [{win: iframe.contentWindow, origin: targetOrigin}], type, object,
-      opt_is3P);
+  postMessageToWindows(
+    iframe,
+    [{win: iframe.contentWindow, origin: targetOrigin}],
+    type,
+    object,
+    opt_is3P
+  );
 }
 
 /**
@@ -384,7 +398,7 @@ export function postMessageToWindows(iframe, targets, type, object, opt_is3P) {
   }
   for (let i = 0; i < targets.length; i++) {
     const target = targets[i];
-    target.win./*OK*/postMessage(payload, target.origin);
+    target.win./*OK*/ postMessage(payload, target.origin);
   }
 }
 
@@ -409,11 +423,15 @@ function getSentinel_(iframe, opt_is3P) {
 export function parseIfNeeded(data) {
   if (typeof data == 'string') {
     if (data.charAt(0) == '{') {
-      data = tryParseJson(data, e => {
-        dev().warn('IFRAME-HELPER',
+      data =
+        tryParseJson(data, e => {
+          dev().warn(
+            'IFRAME-HELPER',
             'Postmessage could not be parsed. ' +
-            'Is it in a valid JSON format?', e);
-      }) || null;
+              'Is it in a valid JSON format?',
+            e
+          );
+        }) || null;
     } else if (isAmpMessage(data)) {
       data = deserializeMessage(data);
     } else {
@@ -423,8 +441,6 @@ export function parseIfNeeded(data) {
   return /** @type {?JsonObject} */ (data);
 }
 
-
-
 /**
  * Manages a postMessage API for an iframe with a subscription message and
  * a way to broadcast messages to all subscribed windows, which
@@ -447,16 +463,21 @@ export class SubscriptionApi {
     this.clientWindows_ = [];
 
     /** @private @const {!UnlistenDef} */
-    this.unlisten_ = listenFor(this.iframe_, type, (data, source, origin) => {
-      // This message might be from any window within the iframe, we need
-      // to keep track of which windows want to be sent updates.
-      if (!this.clientWindows_.some(entry => entry.win == source)) {
-        this.clientWindows_.push({win: source, origin});
-      }
-      requestCallback(data, source, origin);
-    }, this.is3p_,
-    // For 3P frames we also allow nested frames within them to subscribe..
-    this.is3p_ /* opt_includingNestedWindows */);
+    this.unlisten_ = listenFor(
+      this.iframe_,
+      type,
+      (data, source, origin) => {
+        // This message might be from any window within the iframe, we need
+        // to keep track of which windows want to be sent updates.
+        if (!this.clientWindows_.some(entry => entry.win == source)) {
+          this.clientWindows_.push({win: source, origin});
+        }
+        requestCallback(data, source, origin);
+      },
+      this.is3p_,
+      // For 3P frames we also allow nested frames within them to subscribe..
+      this.is3p_ /* opt_includingNestedWindows */
+    );
   }
 
   /**
@@ -468,11 +489,12 @@ export class SubscriptionApi {
     // Remove clients that have been removed from the DOM.
     remove(this.clientWindows_, client => !client.win.parent);
     postMessageToWindows(
-        this.iframe_,
-        this.clientWindows_,
-        type,
-        data,
-        this.is3p_);
+      this.iframe_,
+      this.clientWindows_,
+      type,
+      data,
+      this.is3p_
+    );
   }
 
   /**
@@ -500,12 +522,7 @@ export function looksLikeTrackingIframe(element) {
 
 // Most common ad sizes
 // Array of [width, height] pairs.
-const adSizes = [
-  [300, 250],
-  [320, 50],
-  [300, 50],
-  [320, 100],
-];
+const adSizes = [[300, 250], [320, 50], [300, 50], [320, 100]];
 
 /**
  * Guess whether this element might be an ad.
@@ -564,7 +581,8 @@ export function canInspectWindow(win) {
     // win['test'] could be truthy but not true the compiler shouldn't be able
     // to optimize this check away.
     return !!win.location.href && (win['test'] || true);
-  } catch (unusedErr) { // eslint-disable-line no-unused-vars
+  } catch (unusedErr) {
+    // eslint-disable-line no-unused-vars
     return false;
   }
 }
diff --git a/src/iframe-video.js b/src/iframe-video.js
index 6f8c0a37d582..a0191580ec66 100644
--- a/src/iframe-video.js
+++ b/src/iframe-video.js
@@ -21,7 +21,6 @@ import {isArray, isObject} from './types';
 import {startsWith} from './string';
 import {tryParseJson} from './json';
 
-
 /** @enum {string} */
 export const SandboxOptions = {
   ALLOW_SCRIPTS: 'allow-scripts',
@@ -32,7 +31,6 @@ export const SandboxOptions = {
     'allow-top-navigation-by-user-activation',
 };
 
-
 /**
  * @param {!Event} event
  * @param {?Element} iframe
@@ -49,7 +47,6 @@ export function originMatches(event, iframe, host) {
   return host.test(event.origin);
 }
 
-
 /**
  * Re-dispatches an event received from postMessage as an event in the host
  * document.
@@ -70,7 +67,6 @@ export function redispatch(element, event, events) {
   return true;
 }
 
-
 /**
  * @param {!./base-element.BaseElement} video
  * @param {string} src
@@ -80,8 +76,9 @@ export function redispatch(element, event, events) {
  */
 export function createFrameFor(video, src, opt_name, opt_sandbox) {
   const {element} = video;
-  const frame =
-      htmlFor(element)`<iframe frameborder=0 allowfullscreen></iframe>`;
+  const frame = htmlFor(
+    element
+  )`<iframe frameborder=0 allowfullscreen></iframe>`;
 
   if (opt_name) {
     frame.setAttribute('name', opt_name);
@@ -103,7 +100,6 @@ export function createFrameFor(video, src, opt_name, opt_sandbox) {
   return frame;
 }
 
-
 /**
  * @param {?} anything
  * @return {boolean}
@@ -112,11 +108,11 @@ export function isJsonOrObj(anything) {
   if (!anything) {
     return false;
   }
-  return isObject(anything) ||
-    startsWith(/** @type {string} */ (anything), '{');
+  return (
+    isObject(anything) || startsWith(/** @type {string} */ (anything), '{')
+  );
 }
 
-
 /**
  * @param {?JsonObject|string|undefined} objOrStr
  * @return {?JsonObject|undefined}
@@ -128,7 +124,6 @@ export function objOrParseJson(objOrStr) {
   return tryParseJson(objOrStr);
 }
 
-
 /**
  * @param {boolean} isMuted
  * @return {string}
@@ -137,7 +132,6 @@ export function mutedOrUnmutedEvent(isMuted) {
   return isMuted ? VideoEvents.MUTED : VideoEvents.UNMUTED;
 }
 
-
 /**
  * TEMPORARY workaround for M72-M74 user-activation breakage.
  * If this method is still here in May 2019, please ping @aghassemi
diff --git a/src/impression.js b/src/impression.js
index 0f7dca48a78a..3a6946f16f6c 100644
--- a/src/impression.js
+++ b/src/impression.js
@@ -30,10 +30,7 @@ const TIMEOUT_VALUE = 8000;
 
 let trackImpressionPromise = null;
 
-const DEFAULT_APPEND_URL_PARAM = [
-  'gclid',
-  'gclsrc',
-];
+const DEFAULT_APPEND_URL_PARAM = ['gclid', 'gclsrc'];
 
 /**
  * These domains are trusted with more sensitive viewer operations such as
@@ -57,8 +54,7 @@ const TRUSTED_REFERRER_HOSTS = [
  * @return {!Promise}
  */
 export function getTrackImpressionPromise() {
-  return userAssert(trackImpressionPromise,
-      'E#19457 trackImpressionPromise');
+  return userAssert(trackImpressionPromise, 'E#19457 trackImpressionPromise');
 }
 
 /**
@@ -78,36 +74,44 @@ export function maybeTrackImpression(win) {
   const deferred = new Deferred();
   const {promise, resolve: resolveImpression} = deferred;
 
-  trackImpressionPromise = Services.timerFor(win).timeoutPromise(TIMEOUT_VALUE,
-      promise, 'TrackImpressionPromise timeout').catch(error => {
-    dev().warn('IMPRESSION', error);
-  });
+  trackImpressionPromise = Services.timerFor(win)
+    .timeoutPromise(TIMEOUT_VALUE, promise, 'TrackImpressionPromise timeout')
+    .catch(error => {
+      dev().warn('IMPRESSION', error);
+    });
 
   const viewer = Services.viewerForDoc(win.document.documentElement);
   const isTrustedViewerPromise = viewer.isTrustedViewer();
-  const isTrustedReferrerPromise = viewer.getReferrerUrl().then(
-      referrer => isTrustedReferrer(referrer));
-  Promise.all([
-    isTrustedViewerPromise,
-    isTrustedReferrerPromise,
-  ]).then(results => {
-    const isTrustedViewer = results[0];
-    const isTrustedReferrer = results[1];
-    // Enable the feature in the case of trusted viewer,
-    // or trusted referrer
-    // or with experiment turned on
-    if (!isTrustedViewer && !isTrustedReferrer && !isExperimentOn(win, 'alp')) {
-      resolveImpression();
-      return;
+  const isTrustedReferrerPromise = viewer
+    .getReferrerUrl()
+    .then(referrer => isTrustedReferrer(referrer));
+  Promise.all([isTrustedViewerPromise, isTrustedReferrerPromise]).then(
+    results => {
+      const isTrustedViewer = results[0];
+      const isTrustedReferrer = results[1];
+      // Enable the feature in the case of trusted viewer,
+      // or trusted referrer
+      // or with experiment turned on
+      if (
+        !isTrustedViewer &&
+        !isTrustedReferrer &&
+        !isExperimentOn(win, 'alp')
+      ) {
+        resolveImpression();
+        return;
+      }
+
+      const replaceUrlPromise = handleReplaceUrl(win);
+      const clickUrlPromise = handleClickUrl(win);
+
+      Promise.all([replaceUrlPromise, clickUrlPromise]).then(
+        () => {
+          resolveImpression();
+        },
+        () => {}
+      );
     }
-
-    const replaceUrlPromise = handleReplaceUrl(win);
-    const clickUrlPromise = handleClickUrl(win);
-
-    Promise.all([replaceUrlPromise, clickUrlPromise]).then(() => {
-      resolveImpression();
-    }, () => {});
-  });
+  );
 }
 
 /**
@@ -146,16 +150,20 @@ function handleReplaceUrl(win) {
   }
 
   // request async replaceUrl is viewer support getReplaceUrl.
-  return viewer.sendMessageAwaitResponse('getReplaceUrl', /* data */ undefined)
-      .then(response => {
+  return viewer
+    .sendMessageAwaitResponse('getReplaceUrl', /* data */ undefined)
+    .then(
+      response => {
         if (!response || typeof response != 'object') {
           dev().warn('IMPRESSION', 'get invalid replaceUrl response');
           return;
         }
         viewer.replaceUrl(response['replaceUrl'] || null);
-      }, err => {
+      },
+      err => {
         dev().warn('IMPRESSION', 'Error request replaceUrl from viewer', err);
-      });
+      }
+    );
 }
 
 /**
@@ -186,9 +194,11 @@ function handleClickUrl(win) {
   }
 
   if (clickUrl.indexOf('https://') != 0) {
-    user().warn('IMPRESSION',
-        'click fragment param should start with https://. Found ',
-        clickUrl);
+    user().warn(
+      'IMPRESSION',
+      'click fragment param should start with https://. Found ',
+      clickUrl
+    );
     return Promise.resolve();
   }
 
@@ -200,13 +210,17 @@ function handleClickUrl(win) {
   }
 
   // TODO(@zhouyx) need test with a real response.
-  return viewer.whenFirstVisible().then(() => {
-    return invoke(win, dev().assertString(clickUrl));
-  }).then(response => {
-    applyResponse(win, response);
-  }).catch(err => {
-    user().warn('IMPRESSION', 'Error on request clickUrl: ', err);
-  });
+  return viewer
+    .whenFirstVisible()
+    .then(() => {
+      return invoke(win, dev().assertString(clickUrl));
+    })
+    .then(response => {
+      applyResponse(win, response);
+    })
+    .catch(err => {
+      user().warn('IMPRESSION', 'Error on request clickUrl: ', err);
+    });
 }
 
 /**
@@ -219,17 +233,19 @@ function invoke(win, clickUrl) {
   if (getMode().localDev && !getMode().test) {
     clickUrl = 'http://localhost:8000/impression-proxy?url=' + clickUrl;
   }
-  return Services.xhrFor(win).fetchJson(clickUrl, {
-    credentials: 'include',
-    // All origins are allows to send these requests.
-    requireAmpResponseSourceOrigin: false,
-  }).then(res => {
-    // Treat 204 no content response specially
-    if (res.status == 204) {
-      return null;
-    }
-    return res.json();
-  });
+  return Services.xhrFor(win)
+    .fetchJson(clickUrl, {
+      credentials: 'include',
+      // All origins are allows to send these requests.
+      requireAmpResponseSourceOrigin: false,
+    })
+    .then(res => {
+      // Treat 204 no content response specially
+      if (res.status == 204) {
+        return null;
+      }
+      return res.json();
+    });
 }
 
 /**
@@ -280,8 +296,9 @@ function applyResponse(win, response) {
  */
 export function shouldAppendExtraParams(ampdoc) {
   return ampdoc.whenReady().then(() => {
-    return !!ampdoc.getBody().querySelector(
-        'amp-analytics[type=googleanalytics]');
+    return !!ampdoc
+      .getBody()
+      .querySelector('amp-analytics[type=googleanalytics]');
   });
 }
 
@@ -329,9 +346,10 @@ function getQueryParamUrl(params) {
   let url = '';
   for (let i = 0; i < params.length; i++) {
     const param = params[i];
-    url += (i == 0) ?
-      `${param}=QUERY_PARAM(${param})` :
-      `&${param}=QUERY_PARAM(${param})`;
+    url +=
+      i == 0
+        ? `${param}=QUERY_PARAM(${param})`
+        : `&${param}=QUERY_PARAM(${param})`;
   }
   return url;
 }
diff --git a/src/inabox/amp-inabox-lite.js b/src/inabox/amp-inabox-lite.js
index 4313834136fd..aa95b1fce09c 100644
--- a/src/inabox/amp-inabox-lite.js
+++ b/src/inabox/amp-inabox-lite.js
@@ -24,11 +24,7 @@ import {
   installGlobalNavigationHandlerForDoc,
 } from '../service/navigation';
 import {Services} from '../services';
-import {
-  adopt,
-  installBuiltins,
-  installRuntimeServices,
-} from '../runtime';
+import {adopt, installBuiltins, installRuntimeServices} from '../runtime';
 import {cssText} from '../../build/css';
 import {fontStylesheetTimeout} from '../font-stylesheet-timeout';
 import {getMode} from '../mode';
@@ -57,9 +53,7 @@ import {installResourcesServiceForDoc} from '../service/resources-impl';
 import {installStandardActionsForDoc} from '../service/standard-actions-impl';
 import {installStorageServiceForDoc} from '../service/storage-impl';
 import {installUrlForDoc} from '../service/url-impl';
-import {
-  installUrlReplacementsServiceForDoc,
-} from '../service/url-replacements-impl';
+import {installUrlReplacementsServiceForDoc} from '../service/url-replacements-impl';
 
 getMode(self).runtime = 'inabox';
 
@@ -87,40 +81,50 @@ const ampdoc = ampdocService.getAmpDoc(self.document);
 installPerformanceService(self); // TODO: to be removed
 
 self.document.documentElement.classList.add('i-amphtml-inabox');
-const fullCss = cssText
-    + 'html.i-amphtml-inabox{width:100%!important;height:100%!important}';
-installStylesForDoc(ampdoc, fullCss, () => {
-  // Core services.
-  installRuntimeServices(self);
-  fontStylesheetTimeout(self);
-  installIframeMessagingClient(self); // TODO: to be removed
-  installAmpdocServices(ampdoc);
-  // We need the core services (viewer/resources) to start instrumenting
-  registerIniLoadListener(ampdoc);
+const fullCss =
+  cssText + 'html.i-amphtml-inabox{width:100%!important;height:100%!important}';
+installStylesForDoc(
+  ampdoc,
+  fullCss,
+  () => {
+    // Core services.
+    installRuntimeServices(self);
+    fontStylesheetTimeout(self);
+    installIframeMessagingClient(self); // TODO: to be removed
+    installAmpdocServices(ampdoc);
+    // We need the core services (viewer/resources) to start instrumenting
+    registerIniLoadListener(ampdoc);
 
-  // Builtins.
-  installBuiltins(self);
-  adopt(self);
+    // Builtins.
+    installBuiltins(self);
+    adopt(self);
 
-  // Pre-stub already known elements.
-  stubElementsForDoc(ampdoc);
+    // Pre-stub already known elements.
+    stubElementsForDoc(ampdoc);
 
-  Navigation.installAnchorClickInterceptor(ampdoc, self);
-  makeBodyVisible(self.document); // TODO: to be simplified
+    Navigation.installAnchorClickInterceptor(ampdoc, self);
+    makeBodyVisible(self.document); // TODO: to be simplified
 
-  Services.resourcesForDoc(ampdoc).ampInitComplete();
-}, /* opt_isRuntimeCss */ true, /* opt_ext */ 'amp-runtime');
+    Services.resourcesForDoc(ampdoc).ampInitComplete();
+  },
+  /* opt_isRuntimeCss */ true,
+  /* opt_ext */ 'amp-runtime'
+);
 
 // Output a message to the console and add an attribute to the <html>
 // tag to give some information that can be used in error reports.
 // (At least by sophisticated users).
 if (self.console) {
-  (console.info || console.log).call(console,
-      `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
-      self.location.href);
+  (console.info || console.log).call(
+    console,
+    `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
+    self.location.href
+  );
 }
-self.document.documentElement.setAttribute('amp-version',
-    internalRuntimeVersion());
+self.document.documentElement.setAttribute(
+  'amp-version',
+  internalRuntimeVersion()
+);
 
 /**
  * Install ampdoc-level services.
diff --git a/src/inabox/amp-inabox.js b/src/inabox/amp-inabox.js
index 9308dcfaec89..e3216043d19d 100644
--- a/src/inabox/amp-inabox.js
+++ b/src/inabox/amp-inabox.js
@@ -80,57 +80,68 @@ startupChunk(self.document, function initial() {
   perf.tick('is');
 
   self.document.documentElement.classList.add('i-amphtml-inabox');
-  const fullCss = cssText
-      + 'html.i-amphtml-inabox{width:100%!important;height:100%!important}';
-  installStylesForDoc(ampdoc, fullCss, () => {
-    startupChunk(self.document, function services() {
-      // Core services.
-      installRuntimeServices(self);
-      fontStylesheetTimeout(self);
-      installIframeMessagingClient(self);
-      // Install inabox specific Viewport service before
-      // runtime tries to install the normal one.
-      installViewerServiceForDoc(ampdoc);
-      installInaboxViewportService(ampdoc);
-      installAmpdocServices(ampdoc);
-      // We need the core services (viewer/resources) to start instrumenting
-      perf.coreServicesAvailable();
-      maybeTrackImpression(self);
-      registerIniLoadListener(ampdoc);
-    });
-    startupChunk(self.document, function builtins() {
-      // Builtins.
-      installBuiltins(self);
-    });
-    startupChunk(self.document, function adoptWindow() {
-      adopt(self);
-    });
-    startupChunk(self.document, function stub() {
-      // Pre-stub already known elements.
-      stubElementsForDoc(ampdoc);
-    });
-    startupChunk(self.document, function final() {
-      Navigation.installAnchorClickInterceptor(ampdoc, self);
-      maybeValidate(self);
-      makeBodyVisible(self.document);
-    });
-    startupChunk(self.document, function finalTick() {
-      perf.tick('e_is');
-      Services.resourcesForDoc(ampdoc).ampInitComplete();
-      // TODO(erwinm): move invocation of the `flush` method when we have the
-      // new ticks in place to batch the ticks properly.
-      perf.flush();
-    });
-  }, /* opt_isRuntimeCss */ true, /* opt_ext */ 'amp-runtime');
+  const fullCss =
+    cssText +
+    'html.i-amphtml-inabox{width:100%!important;height:100%!important}';
+  installStylesForDoc(
+    ampdoc,
+    fullCss,
+    () => {
+      startupChunk(self.document, function services() {
+        // Core services.
+        installRuntimeServices(self);
+        fontStylesheetTimeout(self);
+        installIframeMessagingClient(self);
+        // Install inabox specific Viewport service before
+        // runtime tries to install the normal one.
+        installViewerServiceForDoc(ampdoc);
+        installInaboxViewportService(ampdoc);
+        installAmpdocServices(ampdoc);
+        // We need the core services (viewer/resources) to start instrumenting
+        perf.coreServicesAvailable();
+        maybeTrackImpression(self);
+        registerIniLoadListener(ampdoc);
+      });
+      startupChunk(self.document, function builtins() {
+        // Builtins.
+        installBuiltins(self);
+      });
+      startupChunk(self.document, function adoptWindow() {
+        adopt(self);
+      });
+      startupChunk(self.document, function stub() {
+        // Pre-stub already known elements.
+        stubElementsForDoc(ampdoc);
+      });
+      startupChunk(self.document, function final() {
+        Navigation.installAnchorClickInterceptor(ampdoc, self);
+        maybeValidate(self);
+        makeBodyVisible(self.document);
+      });
+      startupChunk(self.document, function finalTick() {
+        perf.tick('e_is');
+        Services.resourcesForDoc(ampdoc).ampInitComplete();
+        // TODO(erwinm): move invocation of the `flush` method when we have the
+        // new ticks in place to batch the ticks properly.
+        perf.flush();
+      });
+    },
+    /* opt_isRuntimeCss */ true,
+    /* opt_ext */ 'amp-runtime'
+  );
 });
 
 // Output a message to the console and add an attribute to the <html>
 // tag to give some information that can be used in error reports.
 // (At least by sophisticated users).
 if (self.console) {
-  (console.info || console.log).call(console,
-      `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
-      self.location.href);
+  (console.info || console.log).call(
+    console,
+    `Powered by AMP ⚡ HTML – Version ${internalRuntimeVersion()}`,
+    self.location.href
+  );
 }
-self.document.documentElement.setAttribute('amp-version',
-    internalRuntimeVersion());
+self.document.documentElement.setAttribute(
+  'amp-version',
+  internalRuntimeVersion()
+);
diff --git a/src/inabox/host-services.js b/src/inabox/host-services.js
index 69e9a538f404..e733f4825e79 100644
--- a/src/inabox/host-services.js
+++ b/src/inabox/host-services.js
@@ -55,7 +55,6 @@ export let HostServiceError;
  * rejectXXXServiceForDoc() when there is a failure.
  */
 export class HostServices {
-
   /**
    * @param {!Element|!../service/ampdoc-impl.AmpDoc} elementOrAmpDoc
    * @return {boolean}
@@ -70,8 +69,10 @@ export class HostServices {
    * @return {!Promise<!VisibilityInterface>}
    */
   static visibilityForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!VisibilityInterface>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, ServiceNames.VISIBILITY));
+    return /** @type {!Promise<!VisibilityInterface>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      ServiceNames.VISIBILITY
+    ));
   }
 
   /**
@@ -79,8 +80,12 @@ export class HostServices {
    * @param {function(new:Object, !../service/ampdoc-impl.AmpDoc)} impl
    */
   static installVisibilityServiceForDoc(elementOrAmpDoc, impl) {
-    registerServiceBuilderForDoc(elementOrAmpDoc,
-        ServiceNames.VISIBILITY, impl, /* opt_instantiate */ true);
+    registerServiceBuilderForDoc(
+      elementOrAmpDoc,
+      ServiceNames.VISIBILITY,
+      impl,
+      /* opt_instantiate */ true
+    );
   }
 
   /**
@@ -96,8 +101,10 @@ export class HostServices {
    * @return {!Promise<!FullscreenInterface>}
    */
   static fullscreenForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!FullscreenInterface>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, ServiceNames.FULLSCREEN));
+    return /** @type {!Promise<!FullscreenInterface>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      ServiceNames.FULLSCREEN
+    ));
   }
 
   /**
@@ -105,8 +112,12 @@ export class HostServices {
    * @param {function(new:Object, !../service/ampdoc-impl.AmpDoc)} impl
    */
   static installFullscreenServiceForDoc(elementOrAmpDoc, impl) {
-    registerServiceBuilderForDoc(elementOrAmpDoc,
-        ServiceNames.FULLSCREEN, impl, /* opt_instantiate */ true);
+    registerServiceBuilderForDoc(
+      elementOrAmpDoc,
+      ServiceNames.FULLSCREEN,
+      impl,
+      /* opt_instantiate */ true
+    );
   }
 
   /**
@@ -122,8 +133,10 @@ export class HostServices {
    * @return {!Promise<!ExitInterface>}
    */
   static exitForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!ExitInterface>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, ServiceNames.EXIT));
+    return /** @type {!Promise<!ExitInterface>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      ServiceNames.EXIT
+    ));
   }
 
   /**
@@ -131,8 +144,12 @@ export class HostServices {
    * @param {function(new:Object, !../service/ampdoc-impl.AmpDoc)} impl
    */
   static installExitServiceForDoc(elementOrAmpDoc, impl) {
-    registerServiceBuilderForDoc(elementOrAmpDoc,
-        ServiceNames.EXIT, impl, /* opt_instantiate */ true);
+    registerServiceBuilderForDoc(
+      elementOrAmpDoc,
+      ServiceNames.EXIT,
+      impl,
+      /* opt_instantiate */ true
+    );
   }
 
   /**
@@ -151,14 +168,12 @@ export class HostServices {
  * @interface
  */
 export class VisibilityInterface {
-
   /**
    * Register a callback for visibility change events.
    *
    * @param {function(!VisibilityDataDef)} unusedCallback
    */
-  onVisibilityChange(unusedCallback) {
-  }
+  onVisibilityChange(unusedCallback) {}
 }
 
 /**
@@ -172,7 +187,6 @@ export class VisibilityInterface {
  */
 export let VisibilityDataDef;
 
-
 /**
  * FullscreenInterface defines interface provided by host to enable/disable
  * fullscreen mode.
@@ -180,7 +194,6 @@ export let VisibilityDataDef;
  * @interface
  */
 export class FullscreenInterface {
-
   /**
    * Request to expand the given element to fullscreen overlay.
    *
@@ -188,8 +201,7 @@ export class FullscreenInterface {
    * @return {!Promise<boolean>} promise resolves to a boolean
    *     indicating if the request was fulfilled
    */
-  enterFullscreenOverlay(unusedTargetElement) {
-  }
+  enterFullscreenOverlay(unusedTargetElement) {}
 
   /**
    * Request to exit from fullscreen overlay.
@@ -198,8 +210,7 @@ export class FullscreenInterface {
    * @return {!Promise<boolean>} promise resolves to a boolean
    *     indicating if the request was fulfilled
    */
-  exitFullscreenOverlay(unusedTargetElement) {
-  }
+  exitFullscreenOverlay(unusedTargetElement) {}
 }
 
 /**
@@ -208,7 +219,6 @@ export class FullscreenInterface {
  * @interface
  */
 export class ExitInterface {
-
   /**
    * Request to navigate to URL.
    *
@@ -216,6 +226,5 @@ export class ExitInterface {
    * @return {!Promise<boolean>} promise resolves to a boolean
    *     indicating if the request was fulfilled
    */
-  openUrl(unusedUrl) {
-  }
+  openUrl(unusedUrl) {}
 }
diff --git a/src/inabox/inabox-iframe-messaging-client.js b/src/inabox/inabox-iframe-messaging-client.js
index 8c5b89fbd7ee..4b363f941e3a 100644
--- a/src/inabox/inabox-iframe-messaging-client.js
+++ b/src/inabox/inabox-iframe-messaging-client.js
@@ -23,18 +23,22 @@ import {tryParseJson} from '../json';
  * @return {!../../3p/iframe-messaging-client.IframeMessagingClient}
  */
 export function iframeMessagingClientFor(win) {
-  return /** @type {!../../3p/iframe-messaging-client.IframeMessagingClient} */(
-    getService(win, 'iframeMessagingClient'));
+  return /** @type {!../../3p/iframe-messaging-client.IframeMessagingClient} */ (getService(
+    win,
+    'iframeMessagingClient'
+  ));
 }
 
 /**
  * @param {!Window} win
  */
 export function installIframeMessagingClient(win) {
-  registerServiceBuilder(win,
-      'iframeMessagingClient',
-      createIframeMessagingClient.bind(null, win),
-      /* opt_instantiate */ true);
+  registerServiceBuilder(
+    win,
+    'iframeMessagingClient',
+    createIframeMessagingClient.bind(null, win),
+    /* opt_instantiate */ true
+  );
 }
 
 /**
diff --git a/src/inabox/inabox-viewport.js b/src/inabox/inabox-viewport.js
index e0661530661f..420591a2e9ca 100644
--- a/src/inabox/inabox-viewport.js
+++ b/src/inabox/inabox-viewport.js
@@ -24,10 +24,7 @@ import {canInspectWindow} from '../iframe-helper';
 import {dev, devAssert} from '../log';
 import {iframeMessagingClientFor} from './inabox-iframe-messaging-client';
 import {isExperimentOn} from '../experiments';
-import {
-  layoutRectLtwh,
-  moveLayoutRect,
-} from '../layout-rect';
+import {layoutRectLtwh, moveLayoutRect} from '../layout-rect';
 import {px, resetStyles, setImportantStyles} from '../style';
 import {registerServiceBuilderForDoc} from '../service';
 import {throttle} from '../utils/rate-limit';
@@ -44,30 +41,32 @@ const MIN_EVENT_INTERVAL = 100;
  * @visibleForTesting
  */
 export function prepareBodyForOverlay(win, bodyElement) {
-  return Services.vsyncFor(win).runPromise({
-    measure: state => {
-      state.width = win./*OK*/innerWidth;
-      state.height = win./*OK*/innerHeight;
-    },
-    mutate: state => {
-      // We need to override runtime-level !important rules
-      setImportantStyles(bodyElement, {
-        'background': 'transparent',
-        'left': '50%',
-        'top': '50%',
-        'right': 'auto',
-        'bottom': 'auto',
-        'position': 'absolute',
-        'height': px(state.height),
-        'width': px(state.width),
-        'margin-top': px(-state.height / 2),
-        'margin-left': px(-state.width / 2),
-      });
+  return Services.vsyncFor(win).runPromise(
+    {
+      measure: state => {
+        state.width = win./*OK*/ innerWidth;
+        state.height = win./*OK*/ innerHeight;
+      },
+      mutate: state => {
+        // We need to override runtime-level !important rules
+        setImportantStyles(bodyElement, {
+          'background': 'transparent',
+          'left': '50%',
+          'top': '50%',
+          'right': 'auto',
+          'bottom': 'auto',
+          'position': 'absolute',
+          'height': px(state.height),
+          'width': px(state.width),
+          'margin-top': px(-state.height / 2),
+          'margin-left': px(-state.width / 2),
+        });
+      },
     },
-  }, {});
+    {}
+  );
 }
 
-
 /**
  * @param {!Window} win
  * @param {!Element} bodyElement
@@ -91,7 +90,6 @@ export function resetBodyForOverlay(win, bodyElement) {
   });
 }
 
-
 /**
  * Implementation of ViewportBindingDef that works inside an non-scrollable
  * iframe box by listening to host doc for position and resize updates.
@@ -100,7 +98,6 @@ export function resetBodyForOverlay(win, bodyElement) {
  * @implements {ViewportBindingDef}
  */
 export class ViewportBindingInabox {
-
   /**
    * @param {!Window} win
    */
@@ -114,8 +111,8 @@ export class ViewportBindingInabox {
     /** @private @const {!Observable} */
     this.resizeObservable_ = new Observable();
 
-    const boxWidth = win./*OK*/innerWidth;
-    const boxHeight = win./*OK*/innerHeight;
+    const boxWidth = win./*OK*/ innerWidth;
+    const boxHeight = win./*OK*/ innerHeight;
 
     /**
      * The current viewport rect.
@@ -144,9 +141,13 @@ export class ViewportBindingInabox {
     this.requestPositionPromise_ = null;
 
     /** @private {function()} */
-    this.fireScrollThrottle_ = throttle(this.win, () => {
-      this.scrollObservable_.fire();
-    }, MIN_EVENT_INTERVAL);
+    this.fireScrollThrottle_ = throttle(
+      this.win,
+      () => {
+        this.scrollObservable_.fire();
+      },
+      MIN_EVENT_INTERVAL
+    );
 
     /** @private @const {boolean} */
     this.useLayers_ = isExperimentOn(this.win, 'layers');
@@ -162,8 +163,10 @@ export class ViewportBindingInabox {
 
   /** @override */
   connect() {
-    if (isExperimentOn(this.win, 'inabox-viewport-friendly') &&
-        canInspectWindow(this.win.top)) {
+    if (
+      isExperimentOn(this.win, 'inabox-viewport-friendly') &&
+      canInspectWindow(this.win.top)
+    ) {
       return this.listenForPositionSameDomain_();
     } else {
       return this.listenForPosition_();
@@ -173,11 +176,13 @@ export class ViewportBindingInabox {
   /** @private */
   listenForPosition_() {
     this.iframeClient_.makeRequest(
-        MessageType.SEND_POSITIONS, MessageType.POSITION,
-        data => {
-          dev().fine(TAG, 'Position changed: ', data);
-          this.updateLayoutRects_(data['viewportRect'], data['targetRect']);
-        });
+      MessageType.SEND_POSITIONS,
+      MessageType.POSITION,
+      data => {
+        dev().fine(TAG, 'Position changed: ', data);
+        this.updateLayoutRects_(data['viewportRect'], data['targetRect']);
+      }
+    );
     return Promise.resolve();
   }
 
@@ -190,18 +195,18 @@ export class ViewportBindingInabox {
     if (this.unobserveFunction_) {
       return Promise.resolve();
     }
-    return Services.resourcesPromiseForDoc(this.win.document.documentElement)
-        .then(() => {
-          this.topWindowPositionObserver_ = this.topWindowPositionObserver_ ||
-              new PositionObserver(this.win.top);
-          this.unobserveFunction_ = this.topWindowPositionObserver_.observe(
-              /** @type {!HTMLIFrameElement} */(this.win.frameElement),
-              data => {
-                this.updateLayoutRects_(
-                    data['viewportRect'],
-                    data['targetRect']);
-              });
-        });
+    return Services.resourcesPromiseForDoc(
+      this.win.document.documentElement
+    ).then(() => {
+      this.topWindowPositionObserver_ =
+        this.topWindowPositionObserver_ || new PositionObserver(this.win.top);
+      this.unobserveFunction_ = this.topWindowPositionObserver_.observe(
+        /** @type {!HTMLIFrameElement} */ (this.win.frameElement),
+        data => {
+          this.updateLayoutRects_(data['viewportRect'], data['targetRect']);
+        }
+      );
+    });
   }
 
   /**
@@ -223,17 +228,18 @@ export class ViewportBindingInabox {
 
   /** @override */
   getLayoutRect(el) {
-    const b = el./*OK*/getBoundingClientRect();
+    const b = el./*OK*/ getBoundingClientRect();
     let {left, top} = b;
     if (this.useLayers_) {
       left -= this.viewportRect_.left;
       top -= this.viewportRect_.top;
     }
     return layoutRectLtwh(
-        Math.round(left + this.boxRect_.left),
-        Math.round(top + this.boxRect_.top),
-        Math.round(b.width),
-        Math.round(b.height));
+      Math.round(left + this.boxRect_.left),
+      Math.round(top + this.boxRect_.top),
+      Math.round(b.width),
+      Math.round(b.height)
+    );
   }
 
   /** @override */
@@ -288,8 +294,11 @@ export class ViewportBindingInabox {
       return;
     }
 
-    const boxRect = moveLayoutRect(positionRect, this.viewportRect_.left,
-        this.viewportRect_.top);
+    const boxRect = moveLayoutRect(
+      positionRect,
+      this.viewportRect_.left,
+      this.viewportRect_.top
+    );
 
     if (isChanged(boxRect, this.boxRect_)) {
       dev().fine(TAG, 'Updating viewport box rect: ', boxRect);
@@ -326,36 +335,41 @@ export class ViewportBindingInabox {
 
   /** @override */
   getRootClientRectAsync() {
-    if (isExperimentOn(this.win, 'inabox-viewport-friendly') &&
-        canInspectWindow(this.win.top)) {
+    if (
+      isExperimentOn(this.win, 'inabox-viewport-friendly') &&
+      canInspectWindow(this.win.top)
+    ) {
       // Set up the listener if we haven't already.
       return this.listenForPositionSameDomain_().then(() =>
         this.topWindowPositionObserver_.getTargetRect(
-            /** @type {!HTMLIFrameElement} */(this.win.frameElement)));
+          /** @type {!HTMLIFrameElement} */ (this.win.frameElement)
+        )
+      );
     }
     if (!this.requestPositionPromise_) {
       this.requestPositionPromise_ = new Promise(resolve => {
         this.iframeClient_.requestOnce(
-            MessageType.SEND_POSITIONS, MessageType.POSITION,
-            data => {
-              this.requestPositionPromise_ = null;
-              devAssert(data.targetRect, 'Host should send targetRect');
-              resolve(data.targetRect);
-            }
+          MessageType.SEND_POSITIONS,
+          MessageType.POSITION,
+          data => {
+            this.requestPositionPromise_ = null;
+            devAssert(data.targetRect, 'Host should send targetRect');
+            resolve(data.targetRect);
+          }
         );
       });
     }
     return this.requestPositionPromise_;
   }
 
-
   /**
    * @return {!Promise}
    * @private
    */
   tryToEnterOverlayMode_() {
-    return this.prepareBodyForOverlay_()
-        .then(() => this.requestFullOverlayFrame_());
+    return this.prepareBodyForOverlay_().then(() =>
+      this.requestFullOverlayFrame_()
+    );
   }
 
   /**
@@ -363,8 +377,9 @@ export class ViewportBindingInabox {
    * @private
    */
   leaveOverlayMode_() {
-    return this.requestCancelFullOverlayFrame_()
-        .then(() => this.resetBodyForOverlay_());
+    return this.requestCancelFullOverlayFrame_().then(() =>
+      this.resetBodyForOverlay_()
+    );
   }
 
   /**
@@ -392,17 +407,18 @@ export class ViewportBindingInabox {
   requestFullOverlayFrame_() {
     return new Promise((resolve, reject) => {
       const unlisten = this.iframeClient_.makeRequest(
-          MessageType.FULL_OVERLAY_FRAME,
-          MessageType.FULL_OVERLAY_FRAME_RESPONSE,
-          response => {
-            unlisten();
-            if (response['success']) {
-              this.updateBoxRect_(response['boxRect']);
-              resolve();
-            } else {
-              reject('Request to open lightbox rejected by host document');
-            }
-          });
+        MessageType.FULL_OVERLAY_FRAME,
+        MessageType.FULL_OVERLAY_FRAME_RESPONSE,
+        response => {
+          unlisten();
+          if (response['success']) {
+            this.updateBoxRect_(response['boxRect']);
+            resolve();
+          } else {
+            reject('Request to open lightbox rejected by host document');
+          }
+        }
+      );
     });
   }
 
@@ -413,13 +429,14 @@ export class ViewportBindingInabox {
   requestCancelFullOverlayFrame_() {
     return new Promise(resolve => {
       const unlisten = this.iframeClient_.makeRequest(
-          MessageType.CANCEL_FULL_OVERLAY_FRAME,
-          MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
-          response => {
-            unlisten();
-            this.updateBoxRect_(response['boxRect']);
-            resolve();
-          });
+        MessageType.CANCEL_FULL_OVERLAY_FRAME,
+        MessageType.CANCEL_FULL_OVERLAY_FRAME_RESPONSE,
+        response => {
+          unlisten();
+          this.updateBoxRect_(response['boxRect']);
+          resolve();
+        }
+      );
     });
   }
 
@@ -439,13 +456,13 @@ export class ViewportBindingInabox {
   /** @override */
   getScrollWidth() {
     // Get actual width of document body, regardless of iframe size.
-    return this.getScrollingElement()./*OK*/offsetWidth;
+    return this.getScrollingElement()./*OK*/ offsetWidth;
   }
 
   /** @override */
   getScrollHeight() {
     // Get actual height of document body, regardless of iframe size.
-    return this.getScrollingElement()./*OK*/offsetHeight;
+    return this.getScrollingElement()./*OK*/ offsetHeight;
   }
 
   /** @override */
@@ -453,17 +470,37 @@ export class ViewportBindingInabox {
     return this.getScrollHeight();
   }
 
-  /** @override */ updatePaddingTop() {/* no-op */}
-  /** @override */ hideViewerHeader() {/* no-op */}
-  /** @override */ showViewerHeader() {/* no-op */}
-  /** @override */ disableScroll() {/* no-op */}
-  /** @override */ resetScroll() {/* no-op */}
-  /** @override */ ensureReadyForElements() {/* no-op */}
-  /** @override */ setScrollTop() {/* no-op */}
+  /** @override */ updatePaddingTop() {
+    /* no-op */
+  }
+  /** @override */ hideViewerHeader() {
+    /* no-op */
+  }
+  /** @override */ showViewerHeader() {
+    /* no-op */
+  }
+  /** @override */ disableScroll() {
+    /* no-op */
+  }
+  /** @override */ resetScroll() {
+    /* no-op */
+  }
+  /** @override */ ensureReadyForElements() {
+    /* no-op */
+  }
+  /** @override */ setScrollTop() {
+    /* no-op */
+  }
   /** @override */ contentHeightChanged() {}
-  /** @override */ getBorderTop() {return 0;}
-  /** @override */ requiresFixedLayerTransfer() {return false;}
-  /** @override */ overrideGlobalScrollTo() {return false;}
+  /** @override */ getBorderTop() {
+    return 0;
+  }
+  /** @override */ requiresFixedLayerTransfer() {
+    return false;
+  }
+  /** @override */ overrideGlobalScrollTo() {
+    return false;
+  }
 }
 
 /**
@@ -472,12 +509,14 @@ export class ViewportBindingInabox {
 export function installInaboxViewportService(ampdoc) {
   const binding = new ViewportBindingInabox(ampdoc.win);
   const viewer = Services.viewerForDoc(ampdoc);
-  registerServiceBuilderForDoc(ampdoc,
-      'viewport',
-      function() {
-        return new Viewport(ampdoc, binding, viewer);
-      },
-      /* opt_instantiate */ true);
+  registerServiceBuilderForDoc(
+    ampdoc,
+    'viewport',
+    function() {
+      return new Viewport(ampdoc, binding, viewer);
+    },
+    /* opt_instantiate */ true
+  );
 }
 
 /**
diff --git a/src/inabox/utils.js b/src/inabox/utils.js
index 5236c68fb0fc..e5d64d47bda3 100644
--- a/src/inabox/utils.js
+++ b/src/inabox/utils.js
@@ -27,16 +27,20 @@ import {whenContentIniLoad} from '../friendly-iframe-embed';
 export function registerIniLoadListener(ampdoc) {
   const {win} = ampdoc;
   const root = ampdoc.getRootNode();
-  whenContentIniLoad(ampdoc, win,
-      Services.viewportForDoc(ampdoc).getLayoutRect(
-          root.documentElement || root.body || root))
-      .then(() => {
-        win.dispatchEvent(createCustomEvent(
-            win, 'amp-ini-load', /* detail */ null, {bubbles: true}));
-        if (win.parent) {
-          win.parent./*OK*/postMessage('amp-ini-load', '*');
-        }
-      });
+  whenContentIniLoad(
+    ampdoc,
+    win,
+    Services.viewportForDoc(ampdoc).getLayoutRect(
+      root.documentElement || root.body || root
+    )
+  ).then(() => {
+    win.dispatchEvent(
+      createCustomEvent(win, 'amp-ini-load', /* detail */ null, {bubbles: true})
+    );
+    if (win.parent) {
+      win.parent./*OK*/ postMessage('amp-ini-load', '*');
+    }
+  });
 }
 
 /**
@@ -45,9 +49,9 @@ export function registerIniLoadListener(ampdoc) {
  * @return {?string}
  */
 export function getA4AId(win) {
-
-  const a4aIdMetaTag = win.document.head
-      .querySelector('meta[name="amp4ads-id"]');
+  const a4aIdMetaTag = win.document.head.querySelector(
+    'meta[name="amp4ads-id"]'
+  );
 
   if (a4aIdMetaTag) {
     return a4aIdMetaTag.getAttribute('content');
diff --git a/src/input.js b/src/input.js
index 0c23b5c6040d..bf365f6dc052 100644
--- a/src/input.js
+++ b/src/input.js
@@ -20,13 +20,11 @@ import {dev} from './log';
 import {listenOnce, listenOncePromise} from './event-helper';
 import {registerServiceBuilder} from './service';
 
-
 const TAG_ = 'Input';
 
 const MAX_MOUSE_CONFIRM_ATTEMPS_ = 3;
 const CLICK_TIMEOUT_ = 300;
 
-
 /**
  * Detects and maintains different types of input such as touch, mouse or
  * keyboard.
@@ -55,10 +53,11 @@ export class Input {
     this.boundMouseConfirmed_ = null;
 
     /** @private {boolean} */
-    this.hasTouch_ = ('ontouchstart' in win ||
-        (win.navigator['maxTouchPoints'] !== undefined &&
-            win.navigator['maxTouchPoints'] > 0) ||
-        win['DocumentTouch'] !== undefined);
+    this.hasTouch_ =
+      'ontouchstart' in win ||
+      (win.navigator['maxTouchPoints'] !== undefined &&
+        win.navigator['maxTouchPoints'] > 0) ||
+      win['DocumentTouch'] !== undefined;
     dev().fine(TAG_, 'touch detected:', this.hasTouch_);
 
     /** @private {boolean} */
@@ -85,8 +84,9 @@ export class Input {
     // mouse events.
     if (this.hasTouch_) {
       this.hasMouse_ = !this.hasTouch_;
-      this.boundOnMouseMove_ =
-        /** @private {function(!Event)} */ (this.onMouseMove_.bind(this));
+      this.boundOnMouseMove_ = /** @type {function(!Event)} */ (this.onMouseMove_.bind(
+        this
+      ));
       listenOnce(win.document, 'mousemove', this.boundOnMouseMove_);
     }
   }
@@ -169,11 +169,14 @@ export class Input {
 
     // Ignore inputs.
     const {target} = e;
-    if (target && (target.tagName == 'INPUT' ||
-          target.tagName == 'TEXTAREA' ||
-          target.tagName == 'SELECT' ||
-          target.tagName == 'OPTION' ||
-          target.hasAttribute('contenteditable'))) {
+    if (
+      target &&
+      (target.tagName == 'INPUT' ||
+        target.tagName == 'TEXTAREA' ||
+        target.tagName == 'SELECT' ||
+        target.tagName == 'OPTION' ||
+        target.hasAttribute('contenteditable'))
+    ) {
       return;
     }
 
@@ -211,18 +214,22 @@ export class Input {
     // touch/mouse emulation. Otherwise, if timeout exceeded, this looks
     // like a legitimate mouse event.
     let unlisten;
-    const listenPromise = listenOncePromise(this.win.document, 'click',
-        /* capture */ undefined, unlistener => {
-          unlisten = unlistener;
-        });
+    const listenPromise = listenOncePromise(
+      this.win.document,
+      'click',
+      /* capture */ undefined,
+      unlistener => {
+        unlisten = unlistener;
+      }
+    );
     return Services.timerFor(this.win)
-        .timeoutPromise(CLICK_TIMEOUT_, listenPromise)
-        .then(this.boundMouseCanceled_, () => {
-          if (unlisten) {
-            unlisten();
-          }
-          this.boundMouseConfirmed_();
-        });
+      .timeoutPromise(CLICK_TIMEOUT_, listenPromise)
+      .then(this.boundMouseCanceled_, () => {
+        if (unlisten) {
+          unlisten();
+        }
+        this.boundMouseConfirmed_();
+      });
   }
 
   /** @private */
@@ -237,8 +244,11 @@ export class Input {
     // Repeat, if attempts allow.
     this.mouseConfirmAttemptCount_++;
     if (this.mouseConfirmAttemptCount_ <= MAX_MOUSE_CONFIRM_ATTEMPS_) {
-      listenOnce(this.win.document, 'mousemove',
-          /** @type {function(!Event)} */ (this.boundOnMouseMove_));
+      listenOnce(
+        this.win.document,
+        'mousemove',
+        /** @type {function(!Event)} */ (this.boundOnMouseMove_)
+      );
     } else {
       dev().fine(TAG_, 'mouse detection failed');
     }
diff --git a/src/intersection-observer-polyfill.js b/src/intersection-observer-polyfill.js
index bf619dcecdc0..81007706ad0e 100644
--- a/src/intersection-observer-polyfill.js
+++ b/src/intersection-observer-polyfill.js
@@ -38,9 +38,29 @@ import {layoutRectLtwh, moveLayoutRect, rectIntersection} from './layout-rect';
  */
 export let DOMRect;
 
-export const DEFAULT_THRESHOLD =
-    [0, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4,
-      0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95, 1];
+export const DEFAULT_THRESHOLD = [
+  0,
+  0.05,
+  0.1,
+  0.15,
+  0.2,
+  0.25,
+  0.3,
+  0.35,
+  0.4,
+  0.45,
+  0.5,
+  0.55,
+  0.6,
+  0.65,
+  0.7,
+  0.75,
+  0.8,
+  0.85,
+  0.9,
+  0.95,
+  1,
+];
 
 /** @typedef {{
  *    element: !Element,
@@ -65,13 +85,12 @@ const INIT_TIME = Date.now();
  * @param {!./layout-rect.LayoutRectDef} hostViewport hostViewport's rect
  * @return {!IntersectionObserverEntry} A change entry.
  */
-export function getIntersectionChangeEntry(
-  element, owner, hostViewport) {
-  const intersection = rectIntersection(element, owner, hostViewport) ||
-      layoutRectLtwh(0, 0, 0, 0);
+export function getIntersectionChangeEntry(element, owner, hostViewport) {
+  const intersection =
+    rectIntersection(element, owner, hostViewport) ||
+    layoutRectLtwh(0, 0, 0, 0);
   const ratio = intersectionRatio(intersection, element);
-  return calculateChangeEntry(
-      element, hostViewport, intersection, ratio);
+  return calculateChangeEntry(element, hostViewport, intersection, ratio);
 }
 
 /**
@@ -79,9 +98,11 @@ export function getIntersectionChangeEntry(
  * @return {boolean}
  */
 export function nativeIntersectionObserverSupported(win) {
-  return 'IntersectionObserver' in win &&
-      'IntersectionObserverEntry' in win &&
-      'intersectionRatio' in win.IntersectionObserverEntry.prototype;
+  return (
+    'IntersectionObserver' in win &&
+    'IntersectionObserverEntry' in win &&
+    'intersectionRatio' in win.IntersectionObserverEntry.prototype
+  );
 }
 
 /**
@@ -115,17 +136,24 @@ export class IntersectionObserverApi {
 
     /** @private {?SubscriptionApi} */
     this.subscriptionApi_ = new SubscriptionApi(
-        iframe, 'send-intersections', opt_is3p || false, () => {
-          this.startSendingIntersection_();
-        });
-
-    this.intersectionObserver_ = new IntersectionObserverPolyfill(entries => {
-      // Remove target info from cross origin iframe.
-      for (let i = 0; i < entries.length; i++) {
-        delete entries[i]['target'];
+      iframe,
+      'send-intersections',
+      opt_is3p || false,
+      () => {
+        this.startSendingIntersection_();
       }
-      this.subscriptionApi_.send('intersection', dict({'changes': entries}));
-    }, {threshold: DEFAULT_THRESHOLD});
+    );
+
+    this.intersectionObserver_ = new IntersectionObserverPolyfill(
+      entries => {
+        // Remove target info from cross origin iframe.
+        for (let i = 0; i < entries.length; i++) {
+          delete entries[i]['target'];
+        }
+        this.subscriptionApi_.send('intersection', dict({'changes': entries}));
+      },
+      {threshold: DEFAULT_THRESHOLD}
+    );
     this.intersectionObserver_.tick(this.viewport_.getRect());
 
     /** @const {function()} */
@@ -181,7 +209,6 @@ export class IntersectionObserverApi {
   }
 }
 
-
 /**
  * The IntersectionObserverPolyfill class lets any element receive its
  * intersection data with the viewport. It acts like native browser supported
@@ -204,15 +231,16 @@ export class IntersectionObserverPolyfill {
     // The input threshold can be a number or an array of numbers.
     let threshold = opt_option && opt_option.threshold;
     if (threshold) {
-      threshold = isArray(threshold) ?
-        threshold : [threshold];
+      threshold = isArray(threshold) ? threshold : [threshold];
     } else {
       threshold = [0];
     }
 
     for (let i = 0; i < threshold.length; i++) {
-      devAssert(isFiniteNumber(threshold[i]), 'Threshold should be a ' +
-          'finite number or an array of finite numbers');
+      devAssert(
+        isFiniteNumber(threshold[i]),
+        'Threshold should be a finite number or an array of finite numbers'
+      );
     }
 
     /**
@@ -220,9 +248,11 @@ export class IntersectionObserverPolyfill {
      * @private @const {!Array}
      */
     this.threshold_ = threshold.sort();
-    devAssert(this.threshold_[0] >= 0 &&
+    devAssert(
+      this.threshold_[0] >= 0 &&
         this.threshold_[this.threshold_.length - 1] <= 1,
-    'Threshold should be in the range from "[0, 1]"');
+      'Threshold should be in the range from "[0, 1]"'
+    );
 
     /** @private {?./layout-rect.LayoutRectDef} */
     this.lastViewportRect_ = null;
@@ -282,25 +312,27 @@ export class IntersectionObserverPolyfill {
     // Get the new observed element's first changeEntry based on last viewport
     if (this.lastViewportRect_) {
       const change = this.getValidIntersectionChangeEntry_(
-          newState, this.lastViewportRect_, this.lastIframeRect_);
+        newState,
+        this.lastViewportRect_,
+        this.lastIframeRect_
+      );
       if (change) {
         this.callback_([change]);
       }
     }
 
-
     // Add a mutation observer to tick ourself
     // TODO (@torch2424): Allow this to observe elements,
     // from multiple documents.
     const ampdoc = Services.ampdoc(element);
     if (ampdoc.win.MutationObserver && !this.hiddenObserverUnlistener_) {
       this.mutationPass_ = new Pass(
-          ampdoc.win,
-          this.handleMutationObserverPass_.bind(this, element)
+        ampdoc.win,
+        this.handleMutationObserverPass_.bind(this, element)
       );
       const hiddenObserver = Services.hiddenObserverForDoc(element);
       this.hiddenObserverUnlistener_ = hiddenObserver.add(
-          this.handleMutationObserverNotification_.bind(this)
+        this.handleMutationObserverNotification_.bind(this)
       );
     }
 
@@ -337,10 +369,16 @@ export class IntersectionObserverPolyfill {
   tick(hostViewport, opt_iframe) {
     if (opt_iframe) {
       // If element inside an iframe. Adjust origin to the iframe.left/top.
-      hostViewport =
-          moveLayoutRect(hostViewport, -opt_iframe.left, -opt_iframe.top);
-      opt_iframe =
-          moveLayoutRect(opt_iframe, -opt_iframe.left, -opt_iframe.top);
+      hostViewport = moveLayoutRect(
+        hostViewport,
+        -opt_iframe.left,
+        -opt_iframe.top
+      );
+      opt_iframe = moveLayoutRect(
+        opt_iframe,
+        -opt_iframe.left,
+        -opt_iframe.top
+      );
     }
 
     this.lastViewportRect_ = hostViewport;
@@ -350,9 +388,9 @@ export class IntersectionObserverPolyfill {
 
     for (let i = 0; i < this.observeEntries_.length; i++) {
       const change = this.getValidIntersectionChangeEntry_(
-          this.observeEntries_[i],
-          hostViewport,
-          opt_iframe
+        this.observeEntries_[i],
+        hostViewport,
+        opt_iframe
       );
       if (change) {
         changes.push(change);
@@ -389,8 +427,8 @@ export class IntersectionObserverPolyfill {
     // calculate intersectionRect. that the element intersects with hostViewport
     // and intersects with owner element and container iframe if exists.
     const intersectionRect =
-        rectIntersection(elementRect, ownerRect, hostViewport, opt_iframe) ||
-        layoutRectLtwh(0, 0, 0, 0);
+      rectIntersection(elementRect, ownerRect, hostViewport, opt_iframe) ||
+      layoutRectLtwh(0, 0, 0, 0);
     // calculate ratio, call callback based on new ratio value.
     const ratio = intersectionRatio(intersectionRect, elementRect);
     const newThresholdSlot = getThresholdSlot(this.threshold_, ratio);
@@ -402,8 +440,12 @@ export class IntersectionObserverPolyfill {
 
     // To get same behavior as native IntersectionObserver set hostViewport null
     // if inside an iframe
-    const changeEntry = calculateChangeEntry(elementRect,
-        (opt_iframe ? null : hostViewport), intersectionRect, ratio);
+    const changeEntry = calculateChangeEntry(
+      elementRect,
+      opt_iframe ? null : hostViewport,
+      intersectionRect,
+      ratio
+    );
     changeEntry.target = element;
     return changeEntry;
   }
@@ -503,8 +545,7 @@ export function getThresholdSlot(sortedThreshold, ratio) {
  * @param {number} ratio
  * @return {!IntersectionObserverEntry}}
  */
-function calculateChangeEntry(
-  element, hostViewport, intersection, ratio) {
+function calculateChangeEntry(element, hostViewport, intersection, ratio) {
   // If element not in an iframe.
   // adjust all LayoutRect to hostViewport Origin.
   let boundingClientRect = element;
@@ -519,20 +560,31 @@ function calculateChangeEntry(
     // If element not in an iframe.
     // adjust all LayoutRect to hostViewport Origin.
     rootBounds = /** @type {!./layout-rect.LayoutRectDef} */ (rootBounds);
-    intersection = moveLayoutRect(intersection, -hostViewport.left,
-        -hostViewport.top);
+    intersection = moveLayoutRect(
+      intersection,
+      -hostViewport.left,
+      -hostViewport.top
+    );
     // The element is relative to (0, 0), while the viewport moves. So, we must
     // adjust.
-    boundingClientRect = moveLayoutRect(boundingClientRect,
-        -hostViewport.left, -hostViewport.top);
+    boundingClientRect = moveLayoutRect(
+      boundingClientRect,
+      -hostViewport.left,
+      -hostViewport.top
+    );
     // Now, move the viewport to (0, 0)
-    rootBounds = moveLayoutRect(rootBounds,
-        -hostViewport.left, -hostViewport.top);
+    rootBounds = moveLayoutRect(
+      rootBounds,
+      -hostViewport.left,
+      -hostViewport.top
+    );
   }
 
   return /** @type {!IntersectionObserverEntry} */ ({
-    time: (typeof performance !== 'undefined' && performance.now) ?
-      performance.now() : Date.now() - INIT_TIME,
+    time:
+      typeof performance !== 'undefined' && performance.now
+        ? performance.now()
+        : Date.now() - INIT_TIME,
     rootBounds,
     boundingClientRect,
     intersectionRect: intersection,
diff --git a/src/intersection-observer.js b/src/intersection-observer.js
index ed6c930c566b..465b260edd0e 100644
--- a/src/intersection-observer.js
+++ b/src/intersection-observer.js
@@ -60,26 +60,36 @@ function intersectionRatio(smaller, larger) {
  * @private
  */
 export function getIntersectionChangeEntry(element, owner, viewport) {
-  devAssert(element.width >= 0 && element.height >= 0,
-      'Negative dimensions in element.');
+  devAssert(
+    element.width >= 0 && element.height >= 0,
+    'Negative dimensions in element.'
+  );
   // Building an IntersectionObserverEntry.
 
   let intersectionRect = element;
   if (owner) {
-    intersectionRect = rectIntersection(owner, element) ||
-        // No intersection.
-        layoutRectLtwh(0, 0, 0, 0);
-  }
-  intersectionRect = rectIntersection(viewport, intersectionRect) ||
+    intersectionRect =
+      rectIntersection(owner, element) ||
       // No intersection.
       layoutRectLtwh(0, 0, 0, 0);
+  }
+  intersectionRect =
+    rectIntersection(viewport, intersectionRect) ||
+    // No intersection.
+    layoutRectLtwh(0, 0, 0, 0);
 
   // The element is relative to (0, 0), while the viewport moves. So, we must
   // adjust.
-  const boundingClientRect = moveLayoutRect(element, -viewport.left,
-      -viewport.top);
-  intersectionRect = moveLayoutRect(intersectionRect, -viewport.left,
-      -viewport.top);
+  const boundingClientRect = moveLayoutRect(
+    element,
+    -viewport.left,
+    -viewport.top
+  );
+  intersectionRect = moveLayoutRect(
+    intersectionRect,
+    -viewport.left,
+    -viewport.top
+  );
   // Now, move the viewport to (0, 0)
   const rootBounds = moveLayoutRect(viewport, -viewport.left, -viewport.top);
 
@@ -144,10 +154,13 @@ export class IntersectionObserver {
      * @private {!SubscriptionApi}
      */
     this.postMessageApi_ = new SubscriptionApi(
-        iframe, 'send-intersections', opt_is3p || false,
-        // Each time someone subscribes we make sure that they
-        // get an update.
-        () => this.startSendingIntersectionChanges_());
+      iframe,
+      'send-intersections',
+      opt_is3p || false,
+      // Each time someone subscribes we make sure that they
+      // get an update.
+      () => this.startSendingIntersectionChanges_()
+    );
 
     /** @private {?Function} */
     this.unlistenViewportChanges_ = null;
@@ -230,9 +243,10 @@ export class IntersectionObserver {
       return;
     }
     const change = this.baseElement_.element.getIntersectionChangeEntry();
-    if (this.pendingChanges_.length > 0 &&
-        this.pendingChanges_[this.pendingChanges_.length - 1].time
-        == change.time) {
+    if (
+      this.pendingChanges_.length > 0 &&
+      this.pendingChanges_[this.pendingChanges_.length - 1].time == change.time
+    ) {
       return;
     }
     this.pendingChanges_.push(change);
@@ -254,9 +268,12 @@ export class IntersectionObserver {
       return;
     }
     // Note that SubscribeApi multicasts the update to all interested windows.
-    this.postMessageApi_.send('intersection', dict({
-      'changes': this.pendingChanges_,
-    }));
+    this.postMessageApi_.send(
+      'intersection',
+      dict({
+        'changes': this.pendingChanges_,
+      })
+    );
     this.pendingChanges_.length = 0;
   }
 
diff --git a/src/json.js b/src/json.js
index c9c0a60b7f19..beda34676f10 100644
--- a/src/json.js
+++ b/src/json.js
@@ -31,21 +31,18 @@ import {isObject} from './types';
  */
 let JSONScalarDef;
 
-
 /**
  * JSON object. It's a map with string keys and JSON values.
  * @typedef {*} should be !Object<string, ?JSONValueDef>
  */
 let JSONObjectDef;
 
-
 /**
  * JSON array. It's an array with JSON values.
  * @typedef {*} should be !Array<?JSONValueDef>
  */
 let JSONArrayDef;
 
-
 /**
  * JSON value. It's either a scalar, an object or an array.
  * @typedef {*} should be !JSONScalarDef|!JSONObjectDef|!JSONArrayDef
@@ -89,10 +86,11 @@ export function getValueForExpr(obj, expr) {
   let value = obj;
   for (let i = 0; i < parts.length; i++) {
     const part = parts[i];
-    if (part &&
-        value &&
-        value[part] !== undefined &&
-        hasOwnProperty(value, part)
+    if (
+      part &&
+      value &&
+      value[part] !== undefined &&
+      hasOwnProperty(value, part)
     ) {
       value = value[part];
       continue;
@@ -111,7 +109,7 @@ export function getValueForExpr(obj, expr) {
  * @return {?JsonObject} May be extend to parse arrays.
  */
 export function parseJson(json) {
-  return /** @type {?JsonObject} */(JSON.parse(/** @type {string} */ (json)));
+  return /** @type {?JsonObject} */ (JSON.parse(/** @type {string} */ (json)));
 }
 
 /**
@@ -211,7 +209,6 @@ export function deepEquals(a, b, depth = 5) {
   return true;
 }
 
-
 /**
  * @param {*} obj
  * @param {string} key
@@ -222,5 +219,7 @@ function hasOwnProperty(obj, key) {
     return false;
   }
   return Object.prototype.hasOwnProperty.call(
-      /** @type {!Object} */ (obj), key);
+    /** @type {!Object} */ (obj),
+    key
+  );
 }
diff --git a/src/layout-delay-meter.js b/src/layout-delay-meter.js
index 37289a92001b..e68a37a8ce60 100644
--- a/src/layout-delay-meter.js
+++ b/src/layout-delay-meter.js
@@ -27,7 +27,6 @@ const LABEL_MAP = {
  * "start to layout" of an element.
  */
 export class LayoutDelayMeter {
-
   /**
    * @param {!Window} win
    * @param {number} priority
@@ -85,7 +84,9 @@ export class LayoutDelayMeter {
       return;
     }
     const delay = this.win_.Math.max(
-        this.firstLayoutTime_ - this.firstInViewportTime_, 0);
+      this.firstLayoutTime_ - this.firstInViewportTime_,
+      0
+    );
     this.performance_.tickDelta(dev().assertString(this.label_), delay);
     this.performance_.throttledFlush();
     this.done_ = true;
diff --git a/src/layout-rect.js b/src/layout-rect.js
index ac355d8a84af..3ba75010901f 100644
--- a/src/layout-rect.js
+++ b/src/layout-rect.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * The structure that combines position and size for an element. The exact
  * interpretation of position and size depends on the use case.
@@ -32,7 +31,6 @@
  */
 export let LayoutRectDef;
 
-
 /**
  * The structure that represents the margins of an Element.
  *
@@ -45,7 +43,6 @@ export let LayoutRectDef;
  */
 export let LayoutMarginsDef;
 
-
 /**
  * The structure that represents a requested change to the margins of an
  * Element. Any new values specified will replace existing ones (rather than
@@ -61,12 +58,12 @@ export let LayoutMarginsDef;
 export let LayoutMarginsChangeDef;
 
 /**
-* RelativePositions
-*
-* Describes the relative position of an element to another (whether the
-* first is inside the second, on top of the second or on the bottom
-* @enum {string}
-*/
+ * RelativePositions
+ *
+ * Describes the relative position of an element to another (whether the
+ * first is inside the second, on top of the second or on the bottom
+ * @enum {string}
+ */
 export const RelativePositions = {
   INSIDE: 'inside',
   TOP: 'top',
@@ -95,7 +92,6 @@ export function layoutRectLtwh(left, top, width, height) {
   };
 }
 
-
 /**
  * Creates a layout rect based on the DOMRect, e.g. obtained from calling
  * getBoundingClientRect.
@@ -103,8 +99,12 @@ export function layoutRectLtwh(left, top, width, height) {
  * @return {!LayoutRectDef}
  */
 export function layoutRectFromDomRect(rect) {
-  return layoutRectLtwh(Number(rect.left), Number(rect.top),
-      Number(rect.width), Number(rect.height));
+  return layoutRectLtwh(
+    Number(rect.left),
+    Number(rect.top),
+    Number(rect.width),
+    Number(rect.height)
+  );
 }
 
 /**
@@ -114,11 +114,14 @@ export function layoutRectFromDomRect(rect) {
  * @return {boolean}
  */
 export function layoutRectsOverlap(r1, r2) {
-  return (r1.top <= r2.bottom && r2.top <= r1.bottom &&
-      r1.left <= r2.right && r2.left <= r1.right);
+  return (
+    r1.top <= r2.bottom &&
+    r2.top <= r1.bottom &&
+    r1.left <= r2.right &&
+    r2.left <= r1.right
+  );
 }
 
-
 /**
  * Returns the intersection between a, b or null if there is none.
  * @param {...?LayoutRectDef|undefined} var_args
@@ -173,14 +176,18 @@ export function layoutRectsRelativePos(r1, r2) {
  * @return {RelativePositions}
  */
 export function layoutPositionRelativeToScrolledViewport(
-  layoutBox, viewport, scrollPos) {
-  const scrollLayoutBox =
-    layoutRectFromDomRect(/** @type {!ClientRect} */ ({
+  layoutBox,
+  viewport,
+  scrollPos
+) {
+  const scrollLayoutBox = layoutRectFromDomRect(
+    /** @type {!ClientRect} */ ({
       top: scrollPos,
       bottom: scrollPos + viewport.getHeight(),
       left: 0,
       right: viewport.getWidth(),
-    }));
+    })
+  );
   if (layoutRectsOverlap(layoutBox, scrollLayoutBox)) {
     return RelativePositions.INSIDE;
   } else {
@@ -196,10 +203,12 @@ export function layoutPositionRelativeToScrolledViewport(
  * @return {!LayoutRectDef}
  */
 export function expandLayoutRect(rect, dw, dh) {
-  return layoutRectLtwh(rect.left - rect.width * dw,
-      rect.top - rect.height * dh,
-      rect.width * (1 + dw * 2),
-      rect.height * (1 + dh * 2));
+  return layoutRectLtwh(
+    rect.left - rect.width * dw,
+    rect.top - rect.height * dh,
+    rect.width * (1 + dw * 2),
+    rect.height * (1 + dh * 2)
+  );
 }
 
 /**
@@ -210,25 +219,24 @@ export function expandLayoutRect(rect, dw, dh) {
  * @return {!LayoutRectDef}
  */
 export function moveLayoutRect(rect, dx, dy) {
-  if ((dx == 0 && dy == 0) ||
-      (rect.width == 0 && rect.height == 0)) {
+  if ((dx == 0 && dy == 0) || (rect.width == 0 && rect.height == 0)) {
     return rect;
   }
-  return layoutRectLtwh(rect.left + dx, rect.top + dy,
-      rect.width, rect.height);
+  return layoutRectLtwh(rect.left + dx, rect.top + dy, rect.width, rect.height);
 }
 
-
 /**
  * @param {!LayoutMarginsDef} margins
  * @param {!LayoutMarginsChangeDef} change
  * @return {boolean}
  */
 export function areMarginsChanged(margins, change) {
-  return (change.top !== undefined && change.top != margins.top) ||
-      (change.right !== undefined && change.right != margins.right) ||
-      (change.bottom !== undefined && change.bottom != margins.bottom) ||
-      (change.left !== undefined && change.left != margins.left);
+  return (
+    (change.top !== undefined && change.top != margins.top) ||
+    (change.right !== undefined && change.right != margins.right) ||
+    (change.bottom !== undefined && change.bottom != margins.bottom) ||
+    (change.left !== undefined && change.left != margins.left)
+  );
 }
 
 /**
@@ -237,8 +245,7 @@ export function areMarginsChanged(margins, change) {
  * @return {boolean}
  */
 export function layoutRectSizeEquals(from, to) {
-  return from.width == to.width &&
-      from.height === to.height;
+  return from.width == to.width && from.height === to.height;
 }
 
 /**
@@ -250,8 +257,12 @@ export function layoutRectEquals(r1, r2) {
   if (!r1 || !r2) {
     return false;
   }
-  return r1.left == r2.left && r1.top == r2.top &&
-      r1.width == r2.width && r1.height == r2.height;
+  return (
+    r1.left == r2.left &&
+    r1.top == r2.top &&
+    r1.width == r2.width &&
+    r1.height == r2.height
+  );
 }
 
 /**
diff --git a/src/layout.js b/src/layout.js
index 0a0babbe59a7..a3e8112864ce 100644
--- a/src/layout.js
+++ b/src/layout.js
@@ -40,7 +40,6 @@ export const Layout = {
   INTRINSIC: 'intrinsic',
 };
 
-
 /**
  * Layout priorities to use with BaseElement#getLayoutPriority() and
  * BaseElement#updateLayoutPriority().
@@ -53,14 +52,12 @@ export const LayoutPriority = {
   BACKGROUND: 3,
 };
 
-
 /**
  * CSS Length type. E.g. "1px" or "20vh".
  * @typedef {string}
  */
 export let LengthDef;
 
-
 /**
  * @typedef {{
  *   width: string,
@@ -69,7 +66,6 @@ export let LengthDef;
  */
 let DimensionsDef;
 
-
 /**
  * The set of elements with natural dimensions, that is, elements
  * which have a known dimension either based on their value specified here,
@@ -88,7 +84,6 @@ export const naturalDimensions_ = {
   'AMP-SOCIAL-SHARE': {width: '60px', height: '44px'},
 };
 
-
 /**
  * Elements that the progess can be shown for. This set has to be externalized
  * since the element's implementation may not be downloaded yet.
@@ -116,7 +111,6 @@ export const LOADING_ELEMENTS_ = {
   'AMP-VIMEO': true,
 };
 
-
 /**
  * All video player components must either have a) "video" or b) "player" in
  * their name. A few components don't follow this convention for historical
@@ -125,7 +119,6 @@ export const LOADING_ELEMENTS_ = {
  */
 const videoPlayerTagNameRe = /^amp\-(video|.+player)/i;
 
-
 /**
  * @param {string} s
  * @return {Layout|undefined} Returns undefined in case of failure to parse
@@ -140,7 +133,6 @@ export function parseLayout(s) {
   return undefined;
 }
 
-
 /**
  * @param {!Layout} layout
  * @return {string}
@@ -149,34 +141,33 @@ export function getLayoutClass(layout) {
   return 'i-amphtml-layout-' + layout;
 }
 
-
 /**
  * Whether an element with this layout inherently defines the size.
  * @param {!Layout} layout
  * @return {boolean}
  */
 export function isLayoutSizeDefined(layout) {
-  return (layout == Layout.FIXED ||
-      layout == Layout.FIXED_HEIGHT ||
-      layout == Layout.RESPONSIVE ||
-      layout == Layout.FILL ||
-      layout == Layout.FLEX_ITEM ||
-      layout == Layout.FLUID ||
-      layout == Layout.INTRINSIC);
+  return (
+    layout == Layout.FIXED ||
+    layout == Layout.FIXED_HEIGHT ||
+    layout == Layout.RESPONSIVE ||
+    layout == Layout.FILL ||
+    layout == Layout.FLEX_ITEM ||
+    layout == Layout.FLUID ||
+    layout == Layout.INTRINSIC
+  );
 }
 
-
 /**
  * Whether the tag is an internal (service) AMP tag.
  * @param {!Node|string} tag
  * @return {boolean}
  */
 export function isInternalElement(tag) {
-  const tagName = (typeof tag == 'string') ? tag : tag.tagName;
+  const tagName = typeof tag == 'string' ? tag : tag.tagName;
   return tagName && startsWith(tagName.toLowerCase(), 'i-');
 }
 
-
 /**
  * Parses the CSS length value. If no units specified, the assumed value is
  * "px". Returns undefined in case of parsing error.
@@ -199,8 +190,6 @@ export function parseLength(s) {
   return s;
 }
 
-
-
 /**
  * Asserts that the supplied value is a non-percent CSS Length value.
  * @param {!LengthDef|string|null|undefined} length
@@ -208,14 +197,13 @@ export function parseLength(s) {
  */
 export function assertLength(length) {
   userAssert(
-      /^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|cm|mm|q|in|pc|pt)$/.test(length),
-      'Invalid length value: %s', length);
+    /^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|cm|mm|q|in|pc|pt)$/.test(length),
+    'Invalid length value: %s',
+    length
+  );
   return /** @type {!LengthDef} */ (length);
 }
 
-
-
-
 /**
  * Asserts that the supplied value is a CSS Length value
  * (including percent unit).
@@ -223,12 +211,14 @@ export function assertLength(length) {
  * @return {!LengthDef}
  */
 export function assertLengthOrPercent(length) {
-  userAssert(/^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|%)$/.test(length),
-      'Invalid length or percent value: %s', length);
+  userAssert(
+    /^\d+(\.\d+)?(px|em|rem|vh|vw|vmin|vmax|%)$/.test(length),
+    'Invalid length or percent value: %s',
+    length
+  );
   return length;
 }
 
-
 /**
  * Returns units from the CSS length value.
  * @param {!LengthDef|string|null|undefined} length
@@ -237,12 +227,14 @@ export function assertLengthOrPercent(length) {
 export function getLengthUnits(length) {
   assertLength(length);
   dev().assertString(length);
-  const m = userAssert(length.match(/[a-z]+/i),
-      'Failed to read units from %s', length);
+  const m = userAssert(
+    length.match(/[a-z]+/i),
+    'Failed to read units from %s',
+    length
+  );
   return m[0];
 }
 
-
 /**
  * Returns the numeric value of a CSS length value.
  * @param {!LengthDef|string|null|undefined} length
@@ -253,7 +245,6 @@ export function getLengthNumeral(length) {
   return isFiniteNumber(res) ? res : undefined;
 }
 
-
 /**
  * Determines whether the tagName is a known element that has natural dimensions
  * in our runtime or the browser.
@@ -265,7 +256,6 @@ export function hasNaturalDimensions(tagName) {
   return naturalDimensions_[tagName] !== undefined;
 }
 
-
 /**
  * Determines the default dimensions for an element which could vary across
  * different browser implementations, like <audio> for instance.
@@ -289,15 +279,14 @@ export function getNaturalDimensions(element) {
     });
     doc.body.appendChild(temp);
     naturalDimensions_[tagName] = {
-      width: (temp./*OK*/offsetWidth || 1) + 'px',
-      height: (temp./*OK*/offsetHeight || 1) + 'px',
+      width: (temp./*OK*/ offsetWidth || 1) + 'px',
+      height: (temp./*OK*/ offsetHeight || 1) + 'px',
     };
     doc.body.removeChild(temp);
   }
   return /** @type {DimensionsDef} */ (naturalDimensions_[tagName]);
 }
 
-
 /**
  * Whether the loading can be shown for the specified elemeent. This set has
  * to be externalized since the element's implementation may not be
@@ -310,7 +299,6 @@ export function isLoadingAllowed(element) {
   return LOADING_ELEMENTS_[tagName] || isVideoPlayerComponent(tagName);
 }
 
-
 /**
  * All video player components must either have a) "video" or b) "player" in
  * their name. A few components don't follow this convention for historical
@@ -322,7 +310,6 @@ function isVideoPlayerComponent(tagName) {
   return videoPlayerTagNameRe.test(tagName);
 }
 
-
 /**
  * Applies layout to the element. Visible for testing only.
  *
@@ -347,12 +334,15 @@ export function applyStaticLayout(element) {
   const completedLayoutAttr = element.getAttribute('i-amphtml-layout');
   if (completedLayoutAttr) {
     const layout = /** @type {!Layout} */ (devAssert(
-        parseLayout(completedLayoutAttr)));
-    if ((layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC)
-      && element.firstElementChild) {
+      parseLayout(completedLayoutAttr)
+    ));
+    if (
+      (layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC) &&
+      element.firstElementChild
+    ) {
       // Find sizer, but assume that it might not have been parsed yet.
       element.sizerElement =
-          element.querySelector('i-amphtml-sizer') || undefined;
+        element.querySelector('i-amphtml-sizer') || undefined;
     } else if (layout == Layout.NODISPLAY) {
       toggle(element, false);
       // TODO(jridgewell): Temporary hack while SSR still adds an inline
@@ -377,14 +367,13 @@ export function applyStaticLayout(element) {
   const inputLayout = layoutAttr ? parseLayout(layoutAttr) : null;
   userAssert(inputLayout !== undefined, 'Unknown layout: %s', layoutAttr);
   /** @const {string|null|undefined} */
-  const inputWidth = (widthAttr && widthAttr != 'auto') ?
-    parseLength(widthAttr) : widthAttr;
+  const inputWidth =
+    widthAttr && widthAttr != 'auto' ? parseLength(widthAttr) : widthAttr;
   userAssert(inputWidth !== undefined, 'Invalid width value: %s', widthAttr);
   /** @const {string|null|undefined} */
-  const inputHeight = (heightAttr && heightAttr != 'fluid') ?
-    parseLength(heightAttr) : heightAttr;
-  userAssert(inputHeight !== undefined, 'Invalid height value: %s',
-      heightAttr);
+  const inputHeight =
+    heightAttr && heightAttr != 'fluid' ? parseLength(heightAttr) : heightAttr;
+  userAssert(inputHeight !== undefined, 'Invalid height value: %s', heightAttr);
 
   // Effective layout attributes. These are effectively constants.
   let width;
@@ -392,14 +381,20 @@ export function applyStaticLayout(element) {
   let layout;
 
   // Calculate effective width and height.
-  if ((!inputLayout || inputLayout == Layout.FIXED ||
+  if (
+    (!inputLayout ||
+      inputLayout == Layout.FIXED ||
       inputLayout == Layout.FIXED_HEIGHT) &&
-      (!inputWidth || !inputHeight) && hasNaturalDimensions(element.tagName)) {
+    (!inputWidth || !inputHeight) &&
+    hasNaturalDimensions(element.tagName)
+  ) {
     // Default width and height: handle elements that do not specify a
     // width/height and are defined to have natural browser dimensions.
     const dimensions = getNaturalDimensions(element);
-    width = (inputWidth || inputLayout == Layout.FIXED_HEIGHT) ? inputWidth :
-      dimensions.width;
+    width =
+      inputWidth || inputLayout == Layout.FIXED_HEIGHT
+        ? inputWidth
+        : dimensions.width;
     height = inputHeight || dimensions.height;
   } else {
     width = inputWidth;
@@ -422,29 +417,46 @@ export function applyStaticLayout(element) {
   }
 
   // Verify layout attributes.
-  if (layout == Layout.FIXED || layout == Layout.FIXED_HEIGHT ||
-      layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC) {
+  if (
+    layout == Layout.FIXED ||
+    layout == Layout.FIXED_HEIGHT ||
+    layout == Layout.RESPONSIVE ||
+    layout == Layout.INTRINSIC
+  ) {
     userAssert(height, 'Expected height to be available: %s', heightAttr);
   }
   if (layout == Layout.FIXED_HEIGHT) {
-    userAssert(!width || width == 'auto',
-        'Expected width to be either absent or equal "auto" ' +
-        'for fixed-height layout: %s', widthAttr);
+    userAssert(
+      !width || width == 'auto',
+      'Expected width to be either absent or equal "auto" ' +
+        'for fixed-height layout: %s',
+      widthAttr
+    );
   }
-  if (layout == Layout.FIXED || layout == Layout.RESPONSIVE ||
-      layout == Layout.INTRINSIC) {
-    userAssert(width && width != 'auto',
-        'Expected width to be available and not equal to "auto": %s',
-        widthAttr);
+  if (
+    layout == Layout.FIXED ||
+    layout == Layout.RESPONSIVE ||
+    layout == Layout.INTRINSIC
+  ) {
+    userAssert(
+      width && width != 'auto',
+      'Expected width to be available and not equal to "auto": %s',
+      widthAttr
+    );
   }
 
   if (layout == Layout.RESPONSIVE || layout == Layout.INTRINSIC) {
-    userAssert(getLengthUnits(width) == getLengthUnits(height),
-        'Length units should be the same for width and height: %s, %s',
-        widthAttr, heightAttr);
+    userAssert(
+      getLengthUnits(width) == getLengthUnits(height),
+      'Length units should be the same for width and height: %s, %s',
+      widthAttr,
+      heightAttr
+    );
   } else {
-    userAssert(heightsAttr === null,
-        'Unexpected "heights" attribute for none-responsive layout');
+    userAssert(
+      heightsAttr === null,
+      'Unexpected "heights" attribute for none-responsive layout'
+    );
   }
 
   // Apply UI.
@@ -470,7 +482,7 @@ export function applyStaticLayout(element) {
     const sizer = element.ownerDocument.createElement('i-amphtml-sizer');
     setStyles(sizer, {
       paddingTop:
-        ((getLengthNumeral(height) / getLengthNumeral(width)) * 100) + '%',
+        (getLengthNumeral(height) / getLengthNumeral(width)) * 100 + '%',
     });
     element.insertBefore(sizer, element.firstChild);
     element.sizerElement = sizer;
@@ -484,8 +496,10 @@ export function applyStaticLayout(element) {
              class="i-amphtml-intrinsic-sizer" />
       </i-amphtml-sizer>`;
     const intrinsicSizer = sizer.firstElementChild;
-    intrinsicSizer.setAttribute('src',
-        `data:image/svg+xml;charset=utf-8,<svg height="${height}" width="${width}" xmlns="http://www.w3.org/2000/svg" version="1.1"/>`);
+    intrinsicSizer.setAttribute(
+      'src',
+      `data:image/svg+xml;charset=utf-8,<svg height="${height}" width="${width}" xmlns="http://www.w3.org/2000/svg" version="1.1"/>`
+    );
     element.insertBefore(sizer, element.firstChild);
     element.sizerElement = sizer;
   } else if (layout == Layout.FILL) {
diff --git a/src/localized-strings.js b/src/localized-strings.js
index cb95a8ae409f..01a06189cff2 100644
--- a/src/localized-strings.js
+++ b/src/localized-strings.js
@@ -100,7 +100,6 @@ export const LocalizedStringId = {
   DEPRECATED_AMP_STORY_SYSTEM_LAYER_SHARE_WIDGET_LABEL: '17',
 };
 
-
 /**
  * @typedef {{
  *   string: string,
@@ -109,13 +108,11 @@ export const LocalizedStringId = {
  */
 export let LocalizedStringDef;
 
-
 /**
  * @typedef {!Object<!LocalizedStringId, !LocalizedStringDef>}
  */
 export let LocalizedStringBundleDef;
 
-
 /**
  * Creates a deep copy of the specified LocalizedStringBundle.
  * @param {!LocalizedStringBundleDef} localizedStringBundle
@@ -123,10 +120,10 @@ export let LocalizedStringBundleDef;
  */
 function cloneLocalizedStringBundle(localizedStringBundle) {
   return /** @type {!LocalizedStringBundleDef} */ (parseJson(
-      JSON.stringify(/** @type {!JsonObject} */ (localizedStringBundle))));
+    JSON.stringify(/** @type {!JsonObject} */ (localizedStringBundle))
+  ));
 }
 
-
 /**
  * Creates a pseudo locale by applying string transformations (specified by the
  * localizationFn) to an existing string bundle, without modifying the original.
@@ -138,16 +135,18 @@ function cloneLocalizedStringBundle(localizedStringBundle) {
  */
 export function createPseudoLocale(localizedStringBundle, localizationFn) {
   /** @type {!LocalizedStringBundleDef} */
-  const pseudoLocaleStringBundle =
-      cloneLocalizedStringBundle(localizedStringBundle);
+  const pseudoLocaleStringBundle = cloneLocalizedStringBundle(
+    localizedStringBundle
+  );
 
   Object.keys(pseudoLocaleStringBundle).forEach(localizedStringIdAsStr => {
-    const localizedStringId =
-    /** @type {!LocalizedStringId} */ (localizedStringIdAsStr);
-    pseudoLocaleStringBundle[localizedStringId].string =
-        localizationFn(localizedStringBundle[localizedStringId].string);
-    pseudoLocaleStringBundle[localizedStringId].fallback =
-        localizationFn(localizedStringBundle[localizedStringId].fallback);
+    const localizedStringId = /** @type {!LocalizedStringId} */ (localizedStringIdAsStr);
+    pseudoLocaleStringBundle[localizedStringId].string = localizationFn(
+      localizedStringBundle[localizedStringId].string
+    );
+    pseudoLocaleStringBundle[localizedStringId].fallback = localizationFn(
+      localizedStringBundle[localizedStringId].fallback
+    );
   });
 
   return pseudoLocaleStringBundle;
diff --git a/src/log.js b/src/log.js
index 3491d3609756..544d8902b67e 100644
--- a/src/log.js
+++ b/src/log.js
@@ -29,7 +29,6 @@ import {isEnumValue} from './types';
  */
 export const USER_ERROR_SENTINEL = '\u200B\u200B\u200B';
 
-
 /**
  * Four zero width space.
  *
@@ -37,7 +36,6 @@ export const USER_ERROR_SENTINEL = '\u200B\u200B\u200B';
  */
 export const USER_ERROR_EMBED_SENTINEL = '\u200B\u200B\u200B\u200B';
 
-
 /**
  * @param {string} message
  * @return {boolean} Whether this message was a user error.
@@ -54,7 +52,6 @@ export function isUserErrorEmbed(message) {
   return message.indexOf(USER_ERROR_EMBED_SENTINEL) >= 0;
 }
 
-
 /**
  * @enum {number}
  * @private Visible for testing only.
@@ -117,7 +114,7 @@ export class Log {
      * the tests runs because only the former is relayed to the console.
      * @const {!Window}
      */
-    this.win = (getMode().test && win.AMP_TEST_IFRAME) ? win.parent : win;
+    this.win = getMode().test && win.AMP_TEST_IFRAME ? win.parent : win;
 
     /** @private @const {function(!./mode.ModeDef):!LogLevel} */
     this.levelFunc_ = levelFunc;
@@ -134,7 +131,7 @@ export class Log {
    * @private
    */
   getLevel_() {
-    return (levelOverride_ !== undefined) ? levelOverride_ : this.level_;
+    return levelOverride_ !== undefined ? levelOverride_ : this.level_;
   }
 
   /**
@@ -241,8 +238,10 @@ export class Log {
     if (this.getLevel_() >= LogLevel.ERROR) {
       this.msg_(tag, 'ERROR', Array.prototype.slice.call(arguments, 1));
     } else {
-      const error = createErrorVargs.apply(null,
-          Array.prototype.slice.call(arguments, 1));
+      const error = createErrorVargs.apply(
+        null,
+        Array.prototype.slice.call(arguments, 1)
+      );
       this.prepareError_(error);
       return error;
     }
@@ -365,8 +364,11 @@ export class Log {
    */
   assertElement(shouldBeElement, opt_message) {
     const shouldBeTrueish = shouldBeElement && shouldBeElement.nodeType == 1;
-    this.assert(shouldBeTrueish, (opt_message || 'Element expected') + ': %s',
-        shouldBeElement);
+    this.assert(
+      shouldBeTrueish,
+      (opt_message || 'Element expected') + ': %s',
+      shouldBeElement
+    );
     return /** @type {!Element} */ (shouldBeElement);
   }
 
@@ -382,8 +384,11 @@ export class Log {
    * eslint "google-camelcase/google-camelcase": 2
    */
   assertString(shouldBeString, opt_message) {
-    this.assert(typeof shouldBeString == 'string',
-        (opt_message || 'String expected') + ': %s', shouldBeString);
+    this.assert(
+      typeof shouldBeString == 'string',
+      (opt_message || 'String expected') + ': %s',
+      shouldBeString
+    );
     return /** @type {string} */ (shouldBeString);
   }
 
@@ -399,8 +404,11 @@ export class Log {
    *   and `NaN`.
    */
   assertNumber(shouldBeNumber, opt_message) {
-    this.assert(typeof shouldBeNumber == 'number',
-        (opt_message || 'Number expected') + ': %s', shouldBeNumber);
+    this.assert(
+      typeof shouldBeNumber == 'number',
+      (opt_message || 'Number expected') + ': %s',
+      shouldBeNumber
+    );
     return /** @type {number} */ (shouldBeNumber);
   }
 
@@ -413,8 +421,11 @@ export class Log {
    * @return {!Array} The array value
    */
   assertArray(shouldBeArray, opt_message) {
-    this.assert(Array.isArray(shouldBeArray),
-        (opt_message || 'Array expected') + ': %s', shouldBeArray);
+    this.assert(
+      Array.isArray(shouldBeArray),
+      (opt_message || 'Array expected') + ': %s',
+      shouldBeArray
+    );
     return /** @type {!Array} */ (shouldBeArray);
   }
 
@@ -428,8 +439,11 @@ export class Log {
    * @return {boolean} The boolean value.
    */
   assertBoolean(shouldBeBoolean, opt_message) {
-    this.assert(!!shouldBeBoolean === shouldBeBoolean,
-        (opt_message || 'Boolean expected') + ': %s', shouldBeBoolean);
+    this.assert(
+      !!shouldBeBoolean === shouldBeBoolean,
+      (opt_message || 'Boolean expected') + ': %s',
+      shouldBeBoolean
+    );
     return /** @type {boolean} */ (shouldBeBoolean);
   }
 
@@ -448,9 +462,7 @@ export class Log {
     if (isEnumValue(enumObj, s)) {
       return s;
     }
-    this.assert(false,
-        'Unknown %s value: "%s"',
-        opt_enumName || 'enum', s);
+    this.assert(false, 'Unknown %s value: "%s"', opt_enumName || 'enum', s);
   }
 
   /**
@@ -483,7 +495,6 @@ function toString(val) {
   return /** @type {string} */ (val);
 }
 
-
 /**
  * @param {!Array} array
  * @param {*} val
@@ -544,7 +555,6 @@ export function createErrorVargs(var_args) {
   return error;
 }
 
-
 /**
  * Rethrows the error without terminating the current context. This preserves
  * whether the original error designation is a user error or a dev error.
@@ -559,17 +569,16 @@ export function rethrowAsync(var_args) {
   });
 }
 
-
 /**
  * Cache for logs. We do not use a Service since the service module depends
  * on Log and closure literally can't even.
  * @type {{user: ?Log, dev: ?Log, userForEmbed: ?Log}}
  */
-self.log = (self.log || {
+self.log = self.log || {
   user: null,
   dev: null,
   userForEmbed: null,
-});
+};
 
 const logs = self.log;
 
@@ -627,7 +636,7 @@ export function user(opt_element) {
     if (logs.userForEmbed) {
       return logs.userForEmbed;
     }
-    return logs.userForEmbed = getUserLogger(USER_ERROR_EMBED_SENTINEL);
+    return (logs.userForEmbed = getUserLogger(USER_ERROR_EMBED_SENTINEL));
   }
 }
 
@@ -640,13 +649,17 @@ function getUserLogger(suffix) {
   if (!logConstructor) {
     throw new Error('failed to call initLogConstructor');
   }
-  return new logConstructor(self, mode => {
-    const logNum = parseInt(mode.log, 10);
-    if (mode.development || logNum >= 1) {
-      return LogLevel.FINE;
-    }
-    return LogLevel.WARN;
-  }, suffix);
+  return new logConstructor(
+    self,
+    mode => {
+      const logNum = parseInt(mode.log, 10);
+      if (mode.development || logNum >= 1) {
+        return LogLevel.FINE;
+      }
+      return LogLevel.WARN;
+    },
+    suffix
+  );
 }
 
 /**
@@ -668,7 +681,7 @@ export function dev() {
   if (!logConstructor) {
     throw new Error('failed to call initLogConstructor');
   }
-  return logs.dev = new logConstructor(self, mode => {
+  return (logs.dev = new logConstructor(self, mode => {
     const logNum = parseInt(mode.log, 10);
     if (logNum >= 3) {
       return LogLevel.FINE;
@@ -677,7 +690,7 @@ export function dev() {
       return LogLevel.INFO;
     }
     return LogLevel.OFF;
-  });
+  }));
 }
 
 /**
@@ -720,13 +733,35 @@ export function isFromEmbed(win, opt_element) {
  * @template T
  * eslint "google-camelcase/google-camelcase": 0
  */
-export function devAssert(shouldBeTrueish, opt_message, opt_1, opt_2,
-  opt_3, opt_4, opt_5, opt_6, opt_7, opt_8, opt_9) {
+export function devAssert(
+  shouldBeTrueish,
+  opt_message,
+  opt_1,
+  opt_2,
+  opt_3,
+  opt_4,
+  opt_5,
+  opt_6,
+  opt_7,
+  opt_8,
+  opt_9
+) {
   if (getMode().minified) {
     return shouldBeTrueish;
   }
-  return dev()./*Orig call*/assert(shouldBeTrueish, opt_message, opt_1, opt_2,
-      opt_3, opt_4, opt_5, opt_6, opt_7, opt_8, opt_9);
+  return dev()./*Orig call*/ assert(
+    shouldBeTrueish,
+    opt_message,
+    opt_1,
+    opt_2,
+    opt_3,
+    opt_4,
+    opt_5,
+    opt_6,
+    opt_7,
+    opt_8,
+    opt_9
+  );
 }
 
 /**
@@ -757,8 +792,30 @@ export function devAssert(shouldBeTrueish, opt_message, opt_1, opt_2,
  * @template T
  * eslint "google-camelcase/google-camelcase": 0
  */
-export function userAssert(shouldBeTrueish, opt_message, opt_1, opt_2,
-  opt_3, opt_4, opt_5, opt_6, opt_7, opt_8, opt_9) {
-  return user()./*Orig call*/assert(shouldBeTrueish, opt_message, opt_1, opt_2,
-      opt_3, opt_4, opt_5, opt_6, opt_7, opt_8, opt_9);
+export function userAssert(
+  shouldBeTrueish,
+  opt_message,
+  opt_1,
+  opt_2,
+  opt_3,
+  opt_4,
+  opt_5,
+  opt_6,
+  opt_7,
+  opt_8,
+  opt_9
+) {
+  return user()./*Orig call*/ assert(
+    shouldBeTrueish,
+    opt_message,
+    opt_1,
+    opt_2,
+    opt_3,
+    opt_4,
+    opt_5,
+    opt_6,
+    opt_7,
+    opt_8,
+    opt_9
+  );
 }
diff --git a/src/mediasession-helper.js b/src/mediasession-helper.js
index 4fc103774112..5ddc8e8f6bec 100644
--- a/src/mediasession-helper.js
+++ b/src/mediasession-helper.js
@@ -33,9 +33,7 @@ export const EMPTY_METADATA = {
   'title': '',
   'artist': '',
   'album': '',
-  'artwork': [
-    {'src': ''},
-  ],
+  'artwork': [{'src': ''}],
 };
 
 /**
@@ -47,7 +45,11 @@ export const EMPTY_METADATA = {
  * @param {function()=} pauseHandler
  */
 export function setMediaSession(
-  element, win, metadata, playHandler, pauseHandler
+  element,
+  win,
+  metadata,
+  playHandler,
+  pauseHandler
 ) {
   const {navigator} = win;
   if ('mediaSession' in navigator && win.MediaMetadata) {
@@ -66,7 +68,6 @@ export function setMediaSession(
   }
 }
 
-
 /**
  * Parses the schema.org json-ld formatted meta-data, looks for the page's
  * featured image and returns it
@@ -89,8 +90,10 @@ export function parseSchemaImage(doc) {
   if (typeof schemaJson['image'] === 'string') {
     // 1. "image": "http://..",
     return schemaJson['image'];
-  } else if (schemaJson['image']['@list']
-      && typeof schemaJson['image']['@list'][0] === 'string') {
+  } else if (
+    schemaJson['image']['@list'] &&
+    typeof schemaJson['image']['@list'][0] === 'string'
+  ) {
     // 2. "image": {.., "@list": ["http://.."], ..}
     return schemaJson['image']['@list'][0];
   } else if (typeof schemaJson['image']['url'] === 'string') {
@@ -124,8 +127,9 @@ export function parseOgImage(doc) {
  * @return {string|undefined}
  */
 export function parseFavicon(doc) {
-  const linkTag = doc.querySelector('link[rel="shortcut icon"]')
-                  || doc.querySelector('link[rel="icon"]');
+  const linkTag =
+    doc.querySelector('link[rel="shortcut icon"]') ||
+    doc.querySelector('link[rel="icon"]');
   if (linkTag) {
     return linkTag.getAttribute('href');
   } else {
diff --git a/src/mode.js b/src/mode.js
index 205943780cff..4645e3dbee5d 100644
--- a/src/mode.js
+++ b/src/mode.js
@@ -52,7 +52,7 @@ export function getMode(opt_win) {
   if (win.AMP_MODE) {
     return win.AMP_MODE;
   }
-  return win.AMP_MODE = getMode_(win);
+  return (win.AMP_MODE = getMode_(win));
 }
 
 /**
@@ -72,14 +72,15 @@ function getMode_(win) {
   const IS_MINIFIED = false;
 
   const localDevEnabled = !!AMP_CONFIG.localDev;
-  const runningTests = (!!AMP_CONFIG.test) || (
-    IS_DEV && !!(win.AMP_TEST || win.__karma__));
+  const runningTests =
+    !!AMP_CONFIG.test || (IS_DEV && !!(win.AMP_TEST || win.__karma__));
   const runningTestsOnIe = win.__karma__ && win.__karma__.config.amp.testOnIe;
   const isLocalDev = IS_DEV && (localDevEnabled || runningTests);
   const hashQuery = parseQueryString_(
-      // location.originalHash is set by the viewer when it removes the fragment
-      // from the URL.
-      win.location.originalHash || win.location.hash);
+    // location.originalHash is set by the viewer when it removes the fragment
+    // from the URL.
+    win.location.originalHash || win.location.hash
+  );
   const singlePassType = AMP_CONFIG.spt;
 
   const searchQuery = parseQueryString_(win.location.search);
@@ -144,7 +145,6 @@ function getRtvVersion(win, isLocalDev) {
   return `01${internalRuntimeVersion()}`;
 }
 
-
 /**
  * @param {!Window} win
  * @param {boolean} isLocalDev
@@ -155,7 +155,6 @@ export function getRtvVersionForTesting(win, isLocalDev) {
   return getRtvVersion(win, isLocalDev);
 }
 
-
 /** @visibleForTesting */
 export function resetRtvVersionForTesting() {
   rtvVersion = '';
diff --git a/src/module.js b/src/module.js
index 02c1c86ecca6..c78e47f4634f 100644
--- a/src/module.js
+++ b/src/module.js
@@ -23,12 +23,17 @@ const TAG = 'AMP.require';
  * @return {?}
  */
 export function requireExternal(module) {
-  const required = (AMP.dependencies && AMP.dependencies[module]) ||
-      (AMP.require && AMP.require(module));
+  const required =
+    (AMP.dependencies && AMP.dependencies[module]) ||
+    (AMP.require && AMP.require(module));
   if (required) {
     return required;
   } else {
-    dev().error(TAG, 'Could not require external module %s.' +
-        ' Did you import the bundle in the extension?', module);
+    dev().error(
+      TAG,
+      'Could not require external module %s.' +
+        ' Did you import the bundle in the extension?',
+      module
+    );
   }
 }
diff --git a/src/motion.js b/src/motion.js
index fe2d48d37a85..15fa6541483c 100644
--- a/src/motion.js
+++ b/src/motion.js
@@ -36,7 +36,6 @@ const EXP_FRAME_CONST_ = Math.round(-FRAME_CONST_ / Math.log(0.95));
  */
 const VELOCITY_DEPR_FACTOR_ = FRAME_CONST_ * 2;
 
-
 /**
  * Calculates velocity for an object traveling the distance deltaV in the
  * time deltaTime given the previous velocity prevVelocity. The calculation
@@ -64,7 +63,6 @@ export function calcVelocity(deltaV, deltaTime, prevVelocity) {
   return speed * depr + prevVelocity * (1 - depr);
 }
 
-
 /**
  * Returns a motion process that will yield when the velocity has run down to
  * zerp. For each iteration, the velocity is depreciated and the coordinates
@@ -80,13 +78,26 @@ export function calcVelocity(deltaV, deltaTime, prevVelocity) {
  * @param {!./service/vsync-impl.Vsync=} opt_vsync Mostly for testing only.
  * @return {!Motion}
  */
-export function continueMotion(contextNode, startX, startY, veloX, veloY,
-  callback, opt_vsync) {
-  return new Motion(contextNode, startX, startY, veloX, veloY,
-      callback, opt_vsync).start();
+export function continueMotion(
+  contextNode,
+  startX,
+  startY,
+  veloX,
+  veloY,
+  callback,
+  opt_vsync
+) {
+  return new Motion(
+    contextNode,
+    startX,
+    startY,
+    veloX,
+    veloY,
+    callback,
+    opt_vsync
+  ).start();
 }
 
-
 /**
  * Motion process that allows tracking and monitoring of the running motion.
  * Most importantly it exposes methods "then" and "thenAlways" that have the
@@ -152,8 +163,10 @@ export class Motion {
   /** */
   start() {
     this.continuing_ = true;
-    if (Math.abs(this.maxVelocityX_) <= MIN_VELOCITY_ &&
-            Math.abs(this.maxVelocityY_) <= MIN_VELOCITY_) {
+    if (
+      Math.abs(this.maxVelocityX_) <= MIN_VELOCITY_ &&
+      Math.abs(this.maxVelocityY_) <= MIN_VELOCITY_
+    ) {
       this.fireMove_();
       this.completeContinue_(true);
     } else {
@@ -203,8 +216,9 @@ export class Motion {
     this.velocityY_ = this.maxVelocityY_;
     const boundStep = this.stepContinue_.bind(this);
     const boundComplete = this.completeContinue_.bind(this, true);
-    return this.vsync_.runAnimMutateSeries(this.contextNode_, boundStep, 5000)
-        .then(boundComplete, boundComplete);
+    return this.vsync_
+      .runAnimMutateSeries(this.contextNode_, boundStep, 5000)
+      .then(boundComplete, boundComplete);
   }
 
   /**
@@ -228,8 +242,10 @@ export class Motion {
     const decel = Math.exp(-timeSinceStart / EXP_FRAME_CONST_);
     this.velocityX_ = this.maxVelocityX_ * decel;
     this.velocityY_ = this.maxVelocityY_ * decel;
-    return (Math.abs(this.velocityX_) > MIN_VELOCITY_ ||
-        Math.abs(this.velocityY_) > MIN_VELOCITY_);
+    return (
+      Math.abs(this.velocityX_) > MIN_VELOCITY_ ||
+      Math.abs(this.velocityY_) > MIN_VELOCITY_
+    );
   }
 
   /**
diff --git a/src/observable.js b/src/observable.js
index b7a1306ad422..8f8b16bf5a98 100644
--- a/src/observable.js
+++ b/src/observable.js
@@ -14,15 +14,12 @@
  * limitations under the License.
  */
 
-
-
 /**
  * This class helps to manage observers. Observers can be added, removed or
  * fired through and instance of this class.
  * @template TYPE
  */
 export class Observable {
-
   /**
    * Creates an instance of Observable.
    */
diff --git a/src/pass.js b/src/pass.js
index 46de89afb7e0..c47360550b32 100644
--- a/src/pass.js
+++ b/src/pass.js
@@ -16,14 +16,12 @@
 
 import {Services} from './services';
 
-
 /**
  * Pass class helps to manage single-pass process. A pass is scheduled using
  * delay method. Only one pass can be pending at a time. If no pass is pending
  * the process is considered to be "idle".
  */
 export class Pass {
-
   /**
    * Creates a new Pass instance.
    * @param {!Window} win
diff --git a/src/pixel.js b/src/pixel.js
index 0c8637a99782..69039b80ebd5 100644
--- a/src/pixel.js
+++ b/src/pixel.js
@@ -50,10 +50,13 @@ function createNoReferrerPixel(win, src) {
     // if "referrerPolicy" is not supported, use iframe wrapper
     // to scrub the referrer.
     const iframe = createElementWithAttributes(
-        /** @type {!Document} */ (win.document), 'iframe', dict({
-          'src': 'about:blank',
-          'style': 'display:none',
-        }));
+      /** @type {!Document} */ (win.document),
+      'iframe',
+      dict({
+        'src': 'about:blank',
+        'style': 'display:none',
+      })
+    );
     win.document.body.appendChild(iframe);
     createImagePixel(iframe.contentWindow, src);
     return iframe;
diff --git a/src/polyfills.js b/src/polyfills.js
index d88e21ec8355..209cfa67861e 100644
--- a/src/polyfills.js
+++ b/src/polyfills.js
@@ -19,20 +19,15 @@
 import {getMode} from './mode';
 import {install as installArrayIncludes} from './polyfills/array-includes';
 import {install as installCustomElements} from './polyfills/custom-elements';
-import {
-  install as installDOMTokenListToggle,
-} from './polyfills/domtokenlist-toggle';
+import {install as installDOMTokenListToggle} from './polyfills/domtokenlist-toggle';
 import {install as installDocContains} from './polyfills/document-contains';
 import {install as installFetch} from './polyfills/fetch';
-import {
-  install as installGetBoundingClientRect,
-} from './get-bounding-client-rect';
+import {install as installGetBoundingClientRect} from './get-bounding-client-rect';
 import {install as installMathSign} from './polyfills/math-sign';
 import {install as installObjectAssign} from './polyfills/object-assign';
 import {install as installObjectValues} from './polyfills/object-values';
 import {install as installPromise} from './polyfills/promise';
-import {installCustomElements as installRegisterElement} from
-  'document-register-element/build/document-register-element.patched';
+import {installCustomElements as installRegisterElement} from 'document-register-element/build/document-register-element.patched';
 import {isExperimentOn} from './experiments';
 
 installFetch(self);
@@ -53,8 +48,10 @@ if (self.document) {
   // is DCE'd from production builds. Note: When the hack is removed, remove the
   // @suppress {suspiciousCode} annotation at the top of this file.
   // TODO(jridgewell, estherkim): Find out why CE isn't being polyfilled for IE.
-  if ((false && isExperimentOn(self, 'custom-elements-v1')) ||
-      (getMode().test && !getMode().testIe)) {
+  if (
+    (false && isExperimentOn(self, 'custom-elements-v1')) ||
+    (getMode().test && !getMode().testIe)
+  ) {
     installCustomElements(self);
   } else {
     installRegisterElement(self, 'auto');
diff --git a/src/polyfills/array-includes.js b/src/polyfills/array-includes.js
index c1a16aef5024..508b2e4982cc 100644
--- a/src/polyfills/array-includes.js
+++ b/src/polyfills/array-includes.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Returns true if the element is in the array and false otherwise.
  *
@@ -39,9 +38,9 @@ function includes(value, opt_fromIndex) {
 }
 
 /**
-* Sets the Array.contains polyfill if it does not exist.
-* @param {!Window} win
-*/
+ * Sets the Array.contains polyfill if it does not exist.
+ * @param {!Window} win
+ */
 export function install(win) {
   if (!win.Array.prototype.includes) {
     win.Object.defineProperty(Array.prototype, 'includes', {
diff --git a/src/polyfills/custom-elements.js b/src/polyfills/custom-elements.js
index 567f342fc51f..c057de34d0bd 100644
--- a/src/polyfills/custom-elements.js
+++ b/src/polyfills/custom-elements.js
@@ -85,7 +85,8 @@ function hasCustomElements(win) {
     customElements &&
     customElements.define &&
     customElements.get &&
-    customElements.whenDefined);
+    customElements.whenDefined
+  );
 }
 
 /**
@@ -105,7 +106,7 @@ function isPatched(win) {
  * @param {!Error} error
  */
 function rethrowAsync(error) {
-  new /*OK*/Promise(() => {
+  new /*OK*/ Promise(() => {
     throw error;
   });
 }
@@ -192,7 +193,7 @@ class CustomElementRegistry {
     }
 
     let resolve;
-    const promise = new /*OK*/Promise(res => resolve = res);
+    const promise = new /*OK*/ Promise(res => (resolve = res));
     pending[name] = {
       promise,
       resolve,
@@ -332,8 +333,7 @@ class Registry {
 
     assertValidName(SyntaxError, name);
 
-    if (this.getByName(name) ||
-        this.getByConstructor(ctor)) {
+    if (this.getByName(name) || this.getByConstructor(ctor)) {
       throw new Error(`duplicate definition "${name}"`);
     }
 
@@ -388,7 +388,7 @@ class Registry {
       return;
     }
 
-    this.upgradeSelf_(/** @type {!Element} */(node), def);
+    this.upgradeSelf_(/** @type {!Element} */ (node), def);
   }
 
   /**
@@ -428,7 +428,8 @@ class Registry {
 
       if (el !== node) {
         throw new this.win_.Error(
-            'Constructor illegally returned a different instance.');
+          'Constructor illegally returned a different instance.'
+        );
       }
     } catch (e) {
       rethrowAsync(e);
@@ -447,7 +448,7 @@ class Registry {
     if (!def) {
       return;
     }
-    this.upgradeSelf_(/** @type {!Element} */(node), def);
+    this.upgradeSelf_(/** @type {!Element} */ (node), def);
     // TODO(jridgewell): It may be appropriate to adoptCallback, if the node
     // used to be in another doc.
     // TODO(jridgewell): I should be calling the definitions connectedCallback
@@ -694,9 +695,9 @@ function polyfill(win) {
   const {attachShadow, createShadowRoot} = elProto;
   if (attachShadow) {
     /**
-    * @param {!{mode: string}} unused
-    * @return {!ShadowRoot}
-    */
+     * @param {!{mode: string}} unused
+     * @return {!ShadowRoot}
+     */
     elProto.attachShadow = function(unused) {
       const shadow = attachShadow.apply(this, arguments);
       registry.observe(shadow);
@@ -709,8 +710,8 @@ function polyfill(win) {
   }
   if (createShadowRoot) {
     /**
-    * @return {!ShadowRoot}
-    */
+     * @return {!ShadowRoot}
+     */
     elProto.createShadowRoot = function() {
       const shadow = createShadowRoot.apply(this, arguments);
       registry.observe(shadow);
@@ -722,7 +723,6 @@ function polyfill(win) {
     };
   }
 
-
   /**
    * You can't use the real HTMLElement constructor, because you can't subclass
    * it without using native classes. So, mock its approximation using
@@ -858,7 +858,6 @@ export function install(win, opt_ctor) {
       // Let's find out if we can wrap HTMLElement and avoid a full patch.
       installWrapper = !!(Reflect && Reflect.construct);
     } catch (e) {
-
       // The ctor threw when we constructed is via ES5, so it's a real class.
       // We're ok to not install the polyfill.
       install = false;
diff --git a/src/polyfills/document-contains.js b/src/polyfills/document-contains.js
index 37e4b157607b..b6efb6e2ca68 100644
--- a/src/polyfills/document-contains.js
+++ b/src/polyfills/document-contains.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Polyfill for `document.contains()` method. Notice that according to spec
  * `document.contains` is inclusionary.
@@ -30,7 +29,6 @@ function documentContainsPolyfill(node) {
   return node == this || this.documentElement.contains(node);
 }
 
-
 /**
  * Polyfills `HTMLDocument.contains` API.
  * @param {!Window} win
diff --git a/src/polyfills/domtokenlist-toggle.js b/src/polyfills/domtokenlist-toggle.js
index d0fda0d78aef..f5b1cf6f3b87 100644
--- a/src/polyfills/domtokenlist-toggle.js
+++ b/src/polyfills/domtokenlist-toggle.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Polyfill for `DOMTokenList.prototype.toggle(token, opt_force)` method. This
  * is specially important because IE does not support `opt_force` attribute. See
@@ -35,7 +34,6 @@ function domTokenListTogglePolyfill(token, opt_force) {
   }
 }
 
-
 /**
  * Polyfills `DOMTokenList.prototype.toggle` API in IE.
  * @param {!Window} win
@@ -51,7 +49,6 @@ export function install(win) {
   }
 }
 
-
 /**
  * Whether the current browser is a IE browser.
  * @param {!Window} win
diff --git a/src/polyfills/fetch.js b/src/polyfills/fetch.js
index 23bdce19169d..d369f1a8c018 100644
--- a/src/polyfills/fetch.js
+++ b/src/polyfills/fetch.js
@@ -41,7 +41,6 @@ const allowedMethods = ['GET', 'POST'];
  */
 let XMLHttpRequestDef;
 
-
 /**
  * A minimal polyfill of Fetch API. It only polyfills what we currently use.
  *
@@ -186,8 +185,9 @@ class FetchResponse {
    * @return {!Promise<!JsonObject>}
    */
   json() {
-    return /** @type {!Promise<!JsonObject>} */ (
-      this.drainText_().then(parseJson));
+    return /** @type {!Promise<!JsonObject>} */ (this.drainText_().then(
+      parseJson
+    ));
   }
 
   /**
@@ -196,8 +196,9 @@ class FetchResponse {
    * @return {!Promise<!ArrayBuffer>}
    */
   arrayBuffer() {
-    return /** @type {!Promise<!ArrayBuffer>} */ (
-      this.drainText_().then(utf8Encode));
+    return /** @type {!Promise<!ArrayBuffer>} */ (this.drainText_().then(
+      utf8Encode
+    ));
   }
 }
 
@@ -213,15 +214,14 @@ function normalizeMethod(method) {
   }
   method = method.toUpperCase();
   devAssert(
-      allowedMethods.includes(method),
-      'Only one of %s is currently allowed. Got %s',
-      allowedMethods.join(', '),
-      method
+    allowedMethods.includes(method),
+    'Only one of %s is currently allowed. Got %s',
+    allowedMethods.join(', '),
+    method
   );
   return method;
 }
 
-
 /**
  * Provides access to the response headers as defined in the Fetch API.
  * @private Visible for testing.
@@ -260,35 +260,40 @@ export class Response extends FetchResponse {
    */
   constructor(body, init = {}) {
     const lowercasedHeaders = map();
-    const data = Object.assign({
-      status: 200,
-      statusText: 'OK',
-      responseText: (body ? String(body) : ''),
-      /**
-       * @param {string} name
-       * @return {string}
-       */
-      getResponseHeader(name) {
-        const headerName = String(name).toLowerCase();
-        return hasOwn(lowercasedHeaders, headerName) ?
-          lowercasedHeaders[headerName] : null;
+    const data = Object.assign(
+      {
+        status: 200,
+        statusText: 'OK',
+        responseText: body ? String(body) : '',
+        /**
+         * @param {string} name
+         * @return {string}
+         */
+        getResponseHeader(name) {
+          const headerName = String(name).toLowerCase();
+          return hasOwn(lowercasedHeaders, headerName)
+            ? lowercasedHeaders[headerName]
+            : null;
+        },
       },
-    }, init);
+      init
+    );
 
-    data.status = (init.status === undefined) ? 200 :
-      parseInt(init.status, 10);
+    data.status = init.status === undefined ? 200 : parseInt(init.status, 10);
 
     if (isArray(init.headers)) {
       init.headers.forEach(entry => {
         const headerName = entry[0];
         const headerValue = entry[1];
-        lowercasedHeaders[String(headerName).toLowerCase()] =
-            String(headerValue);
+        lowercasedHeaders[String(headerName).toLowerCase()] = String(
+          headerValue
+        );
       });
     } else if (isObject(init.headers)) {
       for (const key in init.headers) {
-        lowercasedHeaders[String(key).toLowerCase()] =
-            String(init.headers[key]);
+        lowercasedHeaders[String(key).toLowerCase()] = String(
+          init.headers[key]
+        );
       }
     }
 
@@ -296,7 +301,7 @@ export class Response extends FetchResponse {
       data.statusText = String(init.statusText);
     }
 
-    super(/** @type {XMLHttpRequestDef} */(data));
+    super(/** @type {XMLHttpRequestDef} */ (data));
   }
 }
 
diff --git a/src/polyfills/math-sign.js b/src/polyfills/math-sign.js
index 4f2fba6eedb2..7c544a1f3612 100644
--- a/src/polyfills/math-sign.js
+++ b/src/polyfills/math-sign.js
@@ -33,7 +33,6 @@ export function sign(x) {
   return x > 0 ? 1 : -1;
 }
 
-
 /**
  * Sets the Math.sign polyfill if it does not exist.
  * @param {!Window} win
diff --git a/src/polyfills/object-assign.js b/src/polyfills/object-assign.js
index 2da74b144d57..684fedefb349 100644
--- a/src/polyfills/object-assign.js
+++ b/src/polyfills/object-assign.js
@@ -43,7 +43,6 @@ export function assign(target, var_args) {
   return output;
 }
 
-
 /**
  * Sets the Object.assign polyfill if it does not exist.
  * @param {!Window} win
diff --git a/src/polyfills/object-values.js b/src/polyfills/object-values.js
index 5b7b421be32f..e06ceef28ede 100644
--- a/src/polyfills/object-values.js
+++ b/src/polyfills/object-values.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Implements `Object.values` API.
  * See https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_objects/Object/values.
@@ -26,7 +25,6 @@ export function values(target) {
   return Object.keys(target).map(k => target[k]);
 }
 
-
 /**
  * Sets the Object.values polyfill if it does not exist.
  * @param {!Window} win
diff --git a/src/preconnect.js b/src/preconnect.js
index 046f4a40bcc1..0b5f1978a16b 100644
--- a/src/preconnect.js
+++ b/src/preconnect.js
@@ -19,7 +19,6 @@
  * connection before the real request can be made.
  */
 
-
 import {Services} from './services';
 import {dev} from './log';
 import {getService, registerServiceBuilder} from './service';
@@ -31,7 +30,6 @@ import {toWin} from './types';
 const ACTIVE_CONNECTION_TIMEOUT_MS = 180 * 1000;
 const PRECONNECT_TIMEOUT_MS = 10 * 1000;
 
-
 /**
  * @typedef {{
  *   preload: (boolean|undefined),
@@ -66,7 +64,6 @@ function getPreconnectFeatures(win) {
   return preconnectFeatures;
 }
 
-
 /**
  * @param {?PreconnectFeaturesDef} features
  */
@@ -74,9 +71,7 @@ export function setPreconnectFeaturesForTesting(features) {
   preconnectFeatures = features;
 }
 
-
 class PreconnectService {
-
   /**
    * @param {!Window} win
    */
@@ -288,8 +283,10 @@ class PreconnectService {
     // Unfortunately there is no reliable way to feature detect whether
     // preconnect is supported, so we do this only in Safari, which is
     // the most important browser without support for it.
-    if (this.features_.preconnect ||
-        !(this.platform_.isSafari() || this.platform_.isIos())) {
+    if (
+      this.features_.preconnect ||
+      !(this.platform_.isSafari() || this.platform_.isIos())
+    ) {
       return;
     }
 
@@ -307,8 +304,10 @@ class PreconnectService {
     // entropy as seen by servers and thus allows reverse proxies
     // (read CDNs) to respond more efficiently.
     const cacheBust = now - (now % ACTIVE_CONNECTION_TIMEOUT_MS);
-    const url = origin +
-        '/robots.txt?_AMP_safari_preconnect_polyfill_cachebust=' + cacheBust;
+    const url =
+      origin +
+      '/robots.txt?_AMP_safari_preconnect_polyfill_cachebust=' +
+      cacheBust;
     const xhr = new XMLHttpRequest();
     xhr.open('HEAD', url, true);
     // We only support credentialed preconnect for now.
@@ -318,7 +317,6 @@ class PreconnectService {
   }
 }
 
-
 export class Preconnect {
   /**
    * @param {!PreconnectService} preconnectService
diff --git a/src/pull-to-refresh.js b/src/pull-to-refresh.js
index 9ab74221c2fb..9ccb0128b6ff 100644
--- a/src/pull-to-refresh.js
+++ b/src/pull-to-refresh.js
@@ -16,7 +16,6 @@
 
 import {Services} from './services';
 
-
 /**
  * Installs "pull-to-refresh" (P2R) blocker if viewer has requested. P2R can
  * be very disruptive for different viewer scenarios. This is currently only
@@ -27,14 +26,17 @@ export function installPullToRefreshBlocker(win) {
   // Only do when requested and don't even try it on Safari!
   // This mode is only executed in the single-doc mode.
   const {documentElement} = win.document;
-  if (Services.viewerForDoc(documentElement).getParam('p2r') == '0' &&
-      Services.platformFor(win).isChrome()) {
+  if (
+    Services.viewerForDoc(documentElement).getParam('p2r') == '0' &&
+    Services.platformFor(win).isChrome()
+  ) {
     new PullToRefreshBlocker(
-        win.document, Services.viewportForDoc(documentElement));
+      win.document,
+      Services.viewportForDoc(documentElement)
+    );
   }
 }
 
-
 /**
  * Visible for testing only.
  * @private
@@ -82,9 +84,11 @@ export class PullToRefreshBlocker {
   onTouchStart_(event) {
     // P2R won't trigger when document is scrolled. Also can ignore when we are
     // already tracking this touch and for non-single-touch events.
-    if (this.tracking_ ||
-          !(event.touches && event.touches.length == 1) ||
-          this.viewport_.getScrollTop() > 0) {
+    if (
+      this.tracking_ ||
+      !(event.touches && event.touches.length == 1) ||
+      this.viewport_.getScrollTop() > 0
+    ) {
       return;
     }
 
diff --git a/src/purifier.js b/src/purifier.js
index 2e8741b60513..5c48ec38344f 100644
--- a/src/purifier.js
+++ b/src/purifier.js
@@ -48,10 +48,7 @@ const TAG = 'purifier';
 const WHITELISTED_TAGS_BY_ATTRS = {
   'script': {
     'attribute': 'type',
-    'values': [
-      'application/json',
-      'application/ld+json',
-    ],
+    'values': ['application/json', 'application/ld+json'],
   },
 };
 
@@ -111,17 +108,21 @@ export function createPurifier(doc, opt_config) {
  * @return {!DomPurifyConfig}
  */
 function standardPurifyConfig() {
-  const config = Object.assign({}, PURIFY_PROFILES, /** @type {!DomPurifyConfig} */ ({
-    ADD_ATTR: WHITELISTED_ATTRS,
-    FORBID_TAGS: Object.keys(BLACKLISTED_TAGS),
-    // Avoid reparenting of some elements to document head e.g. <script>.
-    FORCE_BODY: true,
-    // Avoid need for serializing to/from string by returning Node directly.
-    RETURN_DOM: true,
-    // Allows native app deeplinks. DOMPurify's remaining checks are sufficient
-    // to prevent code execution.
-    ALLOW_UNKNOWN_PROTOCOLS: true,
-  }));
+  const config = Object.assign(
+    {},
+    PURIFY_PROFILES,
+    /** @type {!DomPurifyConfig} */ ({
+      ADD_ATTR: WHITELISTED_ATTRS,
+      FORBID_TAGS: Object.keys(BLACKLISTED_TAGS),
+      // Avoid reparenting of some elements to document head e.g. <script>.
+      FORCE_BODY: true,
+      // Avoid need for serializing to/from string by returning Node directly.
+      RETURN_DOM: true,
+      // Allows native app deeplinks. DOMPurify's remaining checks are sufficient
+      // to prevent code execution.
+      ALLOW_UNKNOWN_PROTOCOLS: true,
+    })
+  );
   return /** @type {!DomPurifyConfig} */ (config);
 }
 
@@ -194,8 +195,10 @@ function addPurifyHooks(purifier, diffing, doc) {
     const whitelist = WHITELISTED_TAGS_BY_ATTRS[tagName];
     if (whitelist) {
       const {attribute, values} = whitelist;
-      if (node.hasAttribute(attribute)
-          && values.includes(node.getAttribute(attribute))) {
+      if (
+        node.hasAttribute(attribute) &&
+        values.includes(node.getAttribute(attribute))
+      ) {
         allowedTags[tagName] = true;
         allowedTagsChanges.push(tagName);
       }
@@ -285,14 +288,24 @@ function addPurifyHooks(purifier, diffing, doc) {
       disableDiffingFor(node);
     }
 
-    if (isValidAttr(tagName, attrName, attrValue,
-        /* doc */ doc, /* opt_purify */ true)) {
+    if (
+      isValidAttr(
+        tagName,
+        attrName,
+        attrValue,
+        /* doc */ doc,
+        /* opt_purify */ true
+      )
+    ) {
       if (attrValue && !startsWith(attrName, 'data-amp-bind-')) {
         attrValue = rewriteAttributeValue(tagName, attrName, attrValue);
       }
     } else {
-      user().error(TAG, `Removing "${attrName}" attribute with invalid `
-          + `value in <${tagName} ${attrName}="${attrValue}">.`);
+      user().error(
+        TAG,
+        `Removing "${attrName}" attribute with invalid ` +
+          `value in <${tagName} ${attrName}="${attrValue}">.`
+      );
       data.keepAttr = false;
     }
 
@@ -411,7 +424,8 @@ export function validateAttributeChange(purifier, node, attr, value) {
     }
   }
   const doc = node.ownerDocument
-    ? node.ownerDocument : /** @type {!Document} */ (node);
+    ? node.ownerDocument
+    : /** @type {!Document} */ (node);
   // Perform AMP-specific attribute validation e.g. __amp_source_origin.
   if (value && !isValidAttr(tag, attr, value, doc, /* opt_purify */ true)) {
     return false;
@@ -460,5 +474,5 @@ export function purifyTagsForTripleMustache(html, doc = self.document) {
   // namespaces for all elements and attributes.
   const div = doc.createElement('div');
   div.appendChild(fragment);
-  return div./*OK*/innerHTML;
+  return div./*OK*/ innerHTML;
 }
diff --git a/src/render-delaying-services.js b/src/render-delaying-services.js
index 1133bf0d3143..f61ee0c06814 100644
--- a/src/render-delaying-services.js
+++ b/src/render-delaying-services.js
@@ -50,7 +50,6 @@ const SERVICES = {
  * @interface
  */
 export class RenderDelayingService {
-
   /**
    * Function to return a promise for when
    * it is finished delaying render, and is ready.
@@ -68,7 +67,6 @@ export class RenderDelayingService {
  */
 const LOAD_TIMEOUT = 3000;
 
-
 /**
  * Detects any render delaying services that are required on the page, and
  * returns a promise with a timeout.
@@ -78,24 +76,21 @@ const LOAD_TIMEOUT = 3000;
  */
 export function waitForServices(win) {
   const promises = includedServices(win).map(serviceId => {
-
-    const serviceReadyPromise = getServicePromise(
-        win,
-        serviceId
-    ).then(service => {
-      if (service && isRenderDelayingService(service)) {
-        return service.whenReady().then(() => {
-          return service;
-        });
+    const serviceReadyPromise = getServicePromise(win, serviceId).then(
+      service => {
+        if (service && isRenderDelayingService(service)) {
+          return service.whenReady().then(() => {
+            return service;
+          });
+        }
+        return service;
       }
-      return service;
-    });
+    );
 
     return Services.timerFor(win).timeoutPromise(
-        LOAD_TIMEOUT,
-        serviceReadyPromise,
-        `Render timeout waiting for service ${serviceId} ` +
-        'to be ready.'
+      LOAD_TIMEOUT,
+      serviceReadyPromise,
+      `Render timeout waiting for service ${serviceId} to be ready.`
     );
   });
   return Promise.all(promises);
@@ -117,8 +112,7 @@ export function hasRenderDelayingServices(win) {
  * @return {boolean}
  */
 export function isRenderDelayingService(service) {
-  const maybeRenderDelayingService =
-    /** @type {!RenderDelayingService}*/ (service);
+  const maybeRenderDelayingService = /** @type {!RenderDelayingService}*/ (service);
   return typeof maybeRenderDelayingService.whenReady == 'function';
 }
 
diff --git a/src/runtime.js b/src/runtime.js
index 4fb758208314..a32bf20cbc72 100644
--- a/src/runtime.js
+++ b/src/runtime.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {BaseElement} from './base-element';
 import {
   BaseTemplate,
@@ -24,7 +23,8 @@ import {
 import {CommonSignals} from './common-signals';
 import {
   LogLevel, // eslint-disable-line no-unused-vars
-  dev, devAssert,
+  dev,
+  devAssert,
   initLogConstructor,
   overrideLogLevel,
   setReportError,
@@ -40,13 +40,9 @@ import {
   importShadowBody,
 } from './shadow-embed';
 import {cssText} from '../build/css';
-import {
-  disposeServicesForDoc,
-} from './service';
+import {disposeServicesForDoc} from './service';
 import {getMode} from './mode';
-import {
-  hasRenderDelayingServices,
-} from './render-delaying-services';
+import {hasRenderDelayingServices} from './render-delaying-services';
 import {installActionServiceForDoc} from './service/action-impl';
 import {installBatchedXhrService} from './service/batched-xhr-impl';
 import {
@@ -70,18 +66,16 @@ import {installStorageServiceForDoc} from './service/storage-impl';
 import {installStylesForDoc} from './style-installer';
 import {installTimerService} from './service/timer-impl';
 import {installUrlForDoc} from './service/url-impl';
-import {installUrlReplacementsServiceForDoc} from
-  './service/url-replacements-impl';
-import {installViewerServiceForDoc, setViewerVisibilityState} from
-  './service/viewer-impl';
+import {installUrlReplacementsServiceForDoc} from './service/url-replacements-impl';
+import {
+  installViewerServiceForDoc,
+  setViewerVisibilityState,
+} from './service/viewer-impl';
 import {installViewportServiceForDoc} from './service/viewport/viewport-impl';
 import {installVsyncService} from './service/vsync-impl';
 import {installXhrService} from './service/xhr-impl';
 import {internalRuntimeVersion} from './internal-version';
-import {
-  isExperimentOn,
-  toggleExperiment,
-} from './experiments';
+import {isExperimentOn, toggleExperiment} from './experiments';
 import {parseUrlDeprecated} from './url';
 import {reportErrorForWin} from './error';
 import {setStyle} from './style';
@@ -94,7 +88,6 @@ setReportError(reportErrorForWin.bind(null, self));
 /** @const @private {string} */
 const TAG = 'runtime';
 
-
 /**
  * Install runtime-level services.
  * @param {!Window} global Global scope to adopt.
@@ -111,7 +104,6 @@ export function installRuntimeServices(global) {
   installInputService(global);
 }
 
-
 /**
  * Install ampdoc-level services.
  * @param {!./service/ampdoc-impl.AmpDoc} ampdoc
@@ -134,7 +126,6 @@ export function installAmpdocServices(ampdoc, opt_initParams) {
   installGlobalSubmitListenerForDoc(ampdoc);
 }
 
-
 /**
  * Install builtins.
  * @param {!Window} global Global scope to adopt.
@@ -143,7 +134,6 @@ export function installBuiltins(global) {
   installBuiltinElements(global);
 }
 
-
 /**
  * Applies the runtime to a given global scope for a single-doc mode. Multi
  * frame support is currently incomplete.
@@ -152,7 +142,6 @@ export function installBuiltins(global) {
  * @return {!Promise}
  */
 function adoptShared(global, callback) {
-
   // Tests can adopt the same window twice. sigh.
   if (global.AMP_TAG) {
     return Promise.resolve();
@@ -285,8 +274,7 @@ function adoptShared(global, callback) {
     const fnOrStruct = preregisteredExtensions[i];
     if (maybeLoadCorrectVersion(global, fnOrStruct)) {
       preregisteredExtensions.splice(i--, 1);
-    }
-    else if (typeof fnOrStruct == 'function' || fnOrStruct.p == 'high') {
+    } else if (typeof fnOrStruct == 'function' || fnOrStruct.p == 'high') {
       try {
         installExtension(fnOrStruct);
       } catch (e) {
@@ -332,9 +320,9 @@ function adoptShared(global, callback) {
   // If the closure passed to maybePumpEarlyFrame didn't execute
   // immediately we need to keep pushing onto preregisteredExtensions
   if (!global.AMP.push) {
-    global.AMP.push =
-      /** @type {function((ExtensionPayload|function(!Object, !Object): ?))} */ (
-        preregisteredExtensions.push.bind(preregisteredExtensions));
+    global.AMP.push = /** @type {function((ExtensionPayload|function(!Object, !Object): ?))} */ (preregisteredExtensions.push.bind(
+      preregisteredExtensions
+    ));
   }
 
   // For iOS we need to set `cursor:pointer` to ensure that click events are
@@ -363,12 +351,14 @@ function preloadDeps(extensions, fnOrStruct) {
   } else if (typeof fnOrStruct.i == 'string') {
     return extensions.preloadExtension(fnOrStruct.i);
   }
-  dev().error('RUNTIME',
-      'dependency is neither an array or a string', fnOrStruct.i);
+  dev().error(
+    'RUNTIME',
+    'dependency is neither an array or a string',
+    fnOrStruct.i
+  );
   return Promise.resolve();
 }
 
-
 /**
  * @param {!Window} global Global scope to adopt.
  * @param {function(!Object, !Object)|!ExtensionPayload} fnOrStruct
@@ -392,7 +382,6 @@ function startRegisterOrChunk(global, fnOrStruct, register) {
   }
 }
 
-
 /**
  * Applies the runtime to a given global scope for a single-doc mode.
  * Multi frame support is currently incomplete.
@@ -428,7 +417,6 @@ export function adopt(global) {
   });
 }
 
-
 /**
  * Applies the runtime to a given global scope for shadow mode.
  * @param {!Window} global Global scope to adopt.
@@ -436,12 +424,12 @@ export function adopt(global) {
  */
 export function adoptShadowMode(global) {
   return adoptShared(global, (global, extensions) => {
-
     const manager = new MultidocManager(
-        global,
-        Services.ampdocServiceFor(global),
-        extensions,
-        Services.timerFor(global));
+      global,
+      Services.ampdocServiceFor(global),
+      extensions,
+      Services.timerFor(global)
+    );
 
     /**
      * Registers a shadow root document via a fully fetched document.
@@ -460,8 +448,9 @@ export function adoptShadowMode(global) {
      * @param {!Object<string, string>=} opt_initParams
      * @return {!Object}
      */
-    global.AMP.attachShadowDocAsStream =
-        manager.attachShadowDocAsStream.bind(manager);
+    global.AMP.attachShadowDocAsStream = manager.attachShadowDocAsStream.bind(
+      manager
+    );
 
     return waitForBodyPromise(global.document);
   });
@@ -471,7 +460,6 @@ export function adoptShadowMode(global) {
  * A manager for documents in the multi-doc environment.
  */
 export class MultidocManager {
-
   /**
    * @param {!Window} win
    * @param {!./service/ampdoc-impl.AmpDocService} ampdocService
@@ -509,7 +497,7 @@ export class MultidocManager {
     const shadowRoot = createShadowRoot(hostElement);
 
     if (shadowRoot.AMP) {
-      user().warn(TAG, 'Shadow doc wasn\'t previously closed');
+      user().warn(TAG, "Shadow doc wasn't previously closed");
       this.closeShadowRoot_(shadowRoot);
     }
 
@@ -524,8 +512,12 @@ export class MultidocManager {
     dev().fine(TAG, 'Attach to shadow root:', shadowRoot, ampdoc);
 
     // Install runtime CSS.
-    installStylesForDoc(ampdoc, cssText, /* callback */ null,
-        /* opt_isRuntimeCss */ true);
+    installStylesForDoc(
+      ampdoc,
+      cssText,
+      /* callback */ null,
+      /* opt_isRuntimeCss */ true
+    );
     // Instal doc services.
     installAmpdocServices(ampdoc, initParams || Object.create(null));
 
@@ -603,7 +595,6 @@ export class MultidocManager {
     return amp;
   }
 
-
   /**
    * Implementation for `attachShadowDoc` function. Attaches the shadow doc and
    * configures ampdoc for it.
@@ -618,31 +609,33 @@ export class MultidocManager {
     // TODO(dvoytenko, #9490): once stable, port full document case to emulated
     // stream.
     return this.attachShadowDoc_(
-        hostElement, url, opt_initParams,
-        (amp, shadowRoot, ampdoc) => {
-          // Install extensions.
-          const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
-          this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
-
-          // Append body.
-          if (doc.body) {
-            const body = importShadowBody(
-                shadowRoot, doc.body, /* deep */ true);
-            body.classList.add('amp-shadow');
-            ampdoc.setBody(body);
-          }
+      hostElement,
+      url,
+      opt_initParams,
+      (amp, shadowRoot, ampdoc) => {
+        // Install extensions.
+        const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
+        this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
+
+        // Append body.
+        if (doc.body) {
+          const body = importShadowBody(shadowRoot, doc.body, /* deep */ true);
+          body.classList.add('amp-shadow');
+          ampdoc.setBody(body);
+        }
 
-          // TODO(dvoytenko): find a better and more stable way to make content
-          // visible. E.g. integrate with dynamic classes. In shadow case
-          // specifically, we have to wait for stubbing to complete, which may
-          // take awhile due to importNode.
-          setTimeout(() => {
-            ampdoc.signals().signal(CommonSignals.RENDER_START);
-            setStyle(hostElement, 'visibility', 'visible');
-          }, 50);
+        // TODO(dvoytenko): find a better and more stable way to make content
+        // visible. E.g. integrate with dynamic classes. In shadow case
+        // specifically, we have to wait for stubbing to complete, which may
+        // take awhile due to importNode.
+        setTimeout(() => {
+          ampdoc.signals().signal(CommonSignals.RENDER_START);
+          setStyle(hostElement, 'visibility', 'visible');
+        }, 50);
 
-          return Promise.resolve();
-        });
+        return Promise.resolve();
+      }
+    );
   }
 
   /**
@@ -656,47 +649,51 @@ export class MultidocManager {
   attachShadowDocAsStream(hostElement, url, opt_initParams) {
     dev().fine(TAG, 'Attach shadow doc as stream');
     return this.attachShadowDoc_(
-        hostElement, url, opt_initParams,
-        (amp, shadowRoot, ampdoc) => {
-          // Start streaming.
-          let renderStarted = false;
-          const writer = createShadowDomWriter(this.win);
-          amp['writer'] = writer;
-          writer.onBody(doc => {
-            // Install extensions.
-            const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
-            // Apply all doc extensions.
-            this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
-
-            // Append shallow body.
-            const body = importShadowBody(
-                shadowRoot,
-                dev().assertElement(doc.body),
-                /* deep */ false);
-            body.classList.add('amp-shadow');
-            ampdoc.setBody(body);
-            return body;
-          });
-          writer.onBodyChunk(() => {
-            // TODO(dvoytenko): find a better and more stable way to make
-            // content visible. E.g. integrate with dynamic classes. In shadow
-            // case specifically, we have to wait for stubbing to complete,
-            // which may take awhile due to node importing.
-            if (!renderStarted) {
-              renderStarted = true;
-              setTimeout(() => {
-                ampdoc.signals().signal(CommonSignals.RENDER_START);
-                setStyle(hostElement, 'visibility', 'visible');
-              }, 50);
-            }
-          });
-          return new Promise(resolve => {
-            writer.onEnd(() => {
-              resolve();
-              amp.writer = null;
-            });
+      hostElement,
+      url,
+      opt_initParams,
+      (amp, shadowRoot, ampdoc) => {
+        // Start streaming.
+        let renderStarted = false;
+        const writer = createShadowDomWriter(this.win);
+        amp['writer'] = writer;
+        writer.onBody(doc => {
+          // Install extensions.
+          const extensionIds = this.mergeShadowHead_(ampdoc, shadowRoot, doc);
+          // Apply all doc extensions.
+          this.extensions_.installExtensionsInDoc(ampdoc, extensionIds);
+
+          // Append shallow body.
+          const body = importShadowBody(
+            shadowRoot,
+            dev().assertElement(doc.body),
+            /* deep */ false
+          );
+          body.classList.add('amp-shadow');
+          ampdoc.setBody(body);
+          return body;
+        });
+        writer.onBodyChunk(() => {
+          // TODO(dvoytenko): find a better and more stable way to make
+          // content visible. E.g. integrate with dynamic classes. In shadow
+          // case specifically, we have to wait for stubbing to complete,
+          // which may take awhile due to node importing.
+          if (!renderStarted) {
+            renderStarted = true;
+            setTimeout(() => {
+              ampdoc.signals().signal(CommonSignals.RENDER_START);
+              setStyle(hostElement, 'visibility', 'visible');
+            }, 50);
+          }
+        });
+        return new Promise(resolve => {
+          writer.onEnd(() => {
+            resolve();
+            amp.writer = null;
           });
         });
+      }
+    );
   }
 
   /**
@@ -712,7 +709,9 @@ export class MultidocManager {
     if (doc.head) {
       const parentLinks = {};
       const links = childElementsByTag(
-          dev().assertElement(this.win.document.head), 'link');
+        dev().assertElement(this.win.document.head),
+        'link'
+      );
       for (let i = 0; i < links.length; i++) {
         const href = links[i].getAttribute('href');
         if (href) {
@@ -767,14 +766,22 @@ export class MultidocManager {
               // Ignore.
               dev().fine(TAG, '- ignore boilerplate style: ', n);
             } else if (n.hasAttribute('amp-custom')) {
-              installStylesForDoc(ampdoc, n.textContent,
-                  /* callback */ null,
-                  /* isRuntimeCss */ false, 'amp-custom');
+              installStylesForDoc(
+                ampdoc,
+                n.textContent,
+                /* callback */ null,
+                /* isRuntimeCss */ false,
+                'amp-custom'
+              );
               dev().fine(TAG, '- import style: ', n);
             } else if (n.hasAttribute('amp-keyframes')) {
-              installStylesForDoc(ampdoc, n.textContent,
-                  /* callback */ null,
-                  /* isRuntimeCss */ false, 'amp-keyframes');
+              installStylesForDoc(
+                ampdoc,
+                n.textContent,
+                /* callback */ null,
+                /* isRuntimeCss */ false,
+                'amp-keyframes'
+              );
               dev().fine(TAG, '- import style: ', n);
             }
             break;
@@ -782,8 +789,8 @@ export class MultidocManager {
             if (n.hasAttribute('src')) {
               dev().fine(TAG, '- src script: ', n);
               const src = n.getAttribute('src');
-              const isRuntime = src.indexOf('/amp.js') != -1 ||
-                  src.indexOf('/v0.js') != -1;
+              const isRuntime =
+                src.indexOf('/amp.js') != -1 || src.indexOf('/v0.js') != -1;
               const customElement = n.getAttribute('custom-element');
               const customTemplate = n.getAttribute('custom-template');
               const versionRe = /-(\d+.\d+)(.max)?\.js$/;
@@ -794,12 +801,17 @@ export class MultidocManager {
               } else if (customElement || customTemplate) {
                 // This is an extension.
                 this.extensions_.installExtensionForDoc(
-                    ampdoc, customElement || customTemplate, version);
+                  ampdoc,
+                  customElement || customTemplate,
+                  version
+                );
                 dev().fine(
-                    TAG, '- load extension: ',
-                    customElement || customTemplate,
-                    ' ',
-                    version);
+                  TAG,
+                  '- load extension: ',
+                  customElement || customTemplate,
+                  ' ',
+                  version
+                );
                 if (customElement) {
                   extensionIds.push(customElement);
                 }
@@ -823,7 +835,6 @@ export class MultidocManager {
           default:
             user().error(TAG, '- UNKNOWN head element:', n);
             break;
-
         }
       }
     }
@@ -845,9 +856,11 @@ export class MultidocManager {
       // Broadcast message asynchronously.
       const viewer = Services.viewerForDoc(shadowRoot.AMP.ampdoc);
       this.timer_.delay(() => {
-        viewer.receiveMessage('broadcast',
-            /** @type {!JsonObject} */ (data),
-            /* awaitResponse */ false);
+        viewer.receiveMessage(
+          'broadcast',
+          /** @type {!JsonObject} */ (data),
+          /* awaitResponse */ false
+        );
       }, 0);
     });
   }
@@ -862,7 +875,9 @@ export class MultidocManager {
     delete shadowRoot.AMP;
     const {ampdoc} = amp;
     setViewerVisibilityState(
-        Services.viewerForDoc(ampdoc), VisibilityState.INACTIVE);
+      Services.viewerForDoc(ampdoc),
+      VisibilityState.INACTIVE
+    );
     disposeServicesForDoc(ampdoc);
   }
 
@@ -892,7 +907,7 @@ export class MultidocManager {
     this.shadowRoots_.forEach(shadowRoot => {
       // The shadow root has been disconnected. Force it closed.
       if (!shadowRoot.host || !isConnectedNode(shadowRoot.host)) {
-        user().warn(TAG, 'Shadow doc wasn\'t previously closed');
+        user().warn(TAG, "Shadow doc wasn't previously closed");
         this.removeShadowRoot_(shadowRoot);
         this.closeShadowRootAsync_(shadowRoot);
       }
@@ -900,7 +915,6 @@ export class MultidocManager {
   }
 }
 
-
 /**
  * For a given extension, checks that its version is the same
  * as the version of the main AMP binary.
@@ -932,10 +946,14 @@ function maybeLoadCorrectVersion(win, fnOrStruct) {
   }
   // The :not is an extra prevention of recursion because it will be
   // added to script tags that go into the code path below.
-  const scriptInHead = win.document.head./*OK*/querySelector(
-      `[custom-element="${fnOrStruct.n}"]:not([i-amphtml-inserted])`);
-  devAssert(scriptInHead, 'Expected to find script for extension: %s',
-      fnOrStruct.n);
+  const scriptInHead = win.document.head./*OK*/ querySelector(
+    `[custom-element="${fnOrStruct.n}"]:not([i-amphtml-inserted])`
+  );
+  devAssert(
+    scriptInHead,
+    'Expected to find script for extension: %s',
+    fnOrStruct.n
+  );
   if (!scriptInHead) {
     return false;
   }
diff --git a/src/sanitation.js b/src/sanitation.js
index 26dd317b75d1..993d112ee402 100644
--- a/src/sanitation.js
+++ b/src/sanitation.js
@@ -125,28 +125,12 @@ export const WHITELISTED_ATTRS = [
  * @const {!Object<string, !Array<string>>}
  */
 export const WHITELISTED_ATTRS_BY_TAGS = {
-  'a': [
-    'rel',
-    'target',
-  ],
-  'div': [
-    'template',
-  ],
-  'form': [
-    'action-xhr',
-    'verify-xhr',
-    'custom-validation-reporting',
-    'target',
-  ],
-  'input': [
-    'mask-output',
-  ],
-  'template': [
-    'type',
-  ],
-  'textarea': [
-    'autoexpand',
-  ],
+  'a': ['rel', 'target'],
+  'div': ['template'],
+  'form': ['action-xhr', 'verify-xhr', 'custom-validation-reporting', 'target'],
+  'input': ['mask-output'],
+  'template': ['type'],
+  'textarea': ['autoexpand'],
 };
 
 /** @const {!Array<string>} */
@@ -211,8 +195,7 @@ const BLACKLISTED_AMP4EMAIL_TAG_SPECIFIC_ATTRS = dict({
  *
  * @const {!RegExp}
  */
-const INVALID_INLINE_STYLE_REGEX =
-    /!important|position\s*:\s*fixed|position\s*:\s*sticky/i;
+const INVALID_INLINE_STYLE_REGEX = /!important|position\s*:\s*fixed|position\s*:\s*sticky/i;
 
 /**
  * Whether the attribute/value is valid.
@@ -225,7 +208,12 @@ const INVALID_INLINE_STYLE_REGEX =
  * @return {boolean}
  */
 export function isValidAttr(
-  tagName, attrName, attrValue, doc, opt_purify = false) {
+  tagName,
+  attrName,
+  attrValue,
+  doc,
+  opt_purify = false
+) {
   if (!opt_purify) {
     // "on*" attributes are not allowed.
     if (startsWith(attrName, 'on') && attrName != 'on') {
@@ -261,8 +249,7 @@ export function isValidAttr(
   // Remove blacklisted attributes from specific tags e.g. input[formaction].
   let attrBlacklist = BLACKLISTED_TAG_SPECIFIC_ATTRS[tagName] || [];
   if (isAmp4Email(doc)) {
-    attrBlacklist =
-        BLACKLISTED_AMP4EMAIL_TAG_SPECIFIC_ATTRS[tagName] || [];
+    attrBlacklist = BLACKLISTED_AMP4EMAIL_TAG_SPECIFIC_ATTRS[tagName] || [];
   }
   if (attrBlacklist.indexOf(attrName) != -1) {
     return false;
@@ -270,16 +257,16 @@ export function isValidAttr(
 
   // Remove blacklisted values for specific attributes for specific tags
   // e.g. input[type=image].
-  let attrValueBlacklist =
-      BLACKLISTED_TAG_SPECIFIC_ATTR_VALUES[tagName];
+  let attrValueBlacklist = BLACKLISTED_TAG_SPECIFIC_ATTR_VALUES[tagName];
   if (isAmp4Email(doc)) {
-    attrValueBlacklist =
-        EMAIL_BLACKLISTED_TAG_SPECIFIC_ATTR_VALUES[tagName];
+    attrValueBlacklist = EMAIL_BLACKLISTED_TAG_SPECIFIC_ATTR_VALUES[tagName];
   }
   if (attrValueBlacklist) {
     const blacklistedValuesRegex = attrValueBlacklist[attrName];
-    if (blacklistedValuesRegex &&
-        attrValue.search(blacklistedValuesRegex) != -1) {
+    if (
+      blacklistedValuesRegex &&
+      attrValue.search(blacklistedValuesRegex) != -1
+    ) {
       return false;
     }
   }
@@ -295,8 +282,7 @@ export function isValidAttr(
  */
 function isAmpFormatType(formats, doc) {
   const html = doc.documentElement;
-  const isFormatType =
-      formats.some(format => html.hasAttribute(format));
+  const isFormatType = formats.some(format => html.hasAttribute(format));
   return isFormatType;
 }
 
@@ -307,4 +293,3 @@ function isAmpFormatType(formats, doc) {
 export function isAmp4Email(doc) {
   return isAmpFormatType(['⚡4email', 'amp4email'], doc);
 }
-
diff --git a/src/sanitizer.js b/src/sanitizer.js
index 653af93f2557..04cf0795faee 100644
--- a/src/sanitizer.js
+++ b/src/sanitizer.js
@@ -84,7 +84,8 @@ let KEY_COUNTER = 0;
  */
 export function sanitizeHtml(html, doc, diffing) {
   const tagPolicy = htmlSanitizer.makeTagPolicy(parsed =>
-    parsed.getScheme() === 'https' ? parsed : null);
+    parsed.getScheme() === 'https' ? parsed : null
+  );
   const output = [];
   let ignore = 0;
 
@@ -96,7 +97,9 @@ export function sanitizeHtml(html, doc, diffing) {
 
   // No Caja support for <script> or <svg>.
   const cajaBlacklistedTags = Object.assign(
-      {'script': true, 'svg': true}, BLACKLISTED_TAGS);
+    {'script': true, 'svg': true},
+    BLACKLISTED_TAGS
+  );
 
   const parser = htmlSanitizer.makeSaxParser({
     'startTag': function(tagName, attribs) {
@@ -131,8 +134,10 @@ export function sanitizeHtml(html, doc, diffing) {
         // Ask Caja to validate the element as well.
         // Use the resulting properties.
         const savedAttribs = attribs.slice(0);
-        const scrubbed = /** @type {!JsonObject} */ (
-          tagPolicy(tagName, attribs));
+        const scrubbed = /** @type {!JsonObject} */ (tagPolicy(
+          tagName,
+          attribs
+        ));
         if (!scrubbed) {
           ignore++;
         } else {
@@ -145,8 +150,10 @@ export function sanitizeHtml(html, doc, diffing) {
               attribs[i + 1] = savedAttribs[i + 1];
             } else if (attrName.search(WHITELISTED_ATTR_PREFIX_REGEX) == 0) {
               attribs[i + 1] = savedAttribs[i + 1];
-            } else if (WHITELISTED_ATTRS_BY_TAGS[tagName] &&
-                       WHITELISTED_ATTRS_BY_TAGS[tagName].includes(attrName)) {
+            } else if (
+              WHITELISTED_ATTRS_BY_TAGS[tagName] &&
+              WHITELISTED_ATTRS_BY_TAGS[tagName].includes(attrName)
+            ) {
               attribs[i + 1] = savedAttribs[i + 1];
             }
           }
@@ -208,8 +215,11 @@ export function sanitizeHtml(html, doc, diffing) {
         const attrName = attribs[i];
         const attrValue = attribs[i + 1];
         if (!isValidAttr(tagName, attrName, attrValue, doc, false)) {
-          user().error(TAG, `Removing "${attrName}" attribute with invalid `
-              + `value in <${tagName} ${attrName}="${attrValue}">.`);
+          user().error(
+            TAG,
+            `Removing "${attrName}" attribute with invalid ` +
+              `value in <${tagName} ${attrName}="${attrValue}">.`
+          );
           continue;
         }
         emit(' ');
@@ -222,7 +232,7 @@ export function sanitizeHtml(html, doc, diffing) {
         if (attrValue) {
           // Rewrite attribute values unless this attribute is a binding.
           // Bindings contain expressions and shouldn't be rewritten.
-          const rewrite = (bindingAttribs.includes(i))
+          const rewrite = bindingAttribs.includes(i)
             ? attrValue
             : rewriteAttributeValue(tagName, attrName, attrValue);
           emit(htmlSanitizer.escapeAttrib(rewrite));
diff --git a/src/service.js b/src/service.js
index 6894f64abf2d..ee93b0489ebf 100644
--- a/src/service.js
+++ b/src/service.js
@@ -27,7 +27,6 @@ import {Deferred} from './utils/promise';
 import {dev, devAssert} from './log';
 import {toWin} from './types';
 
-
 /**
  * Holds info about a service.
  * - obj: Actual service implementation when available.
@@ -47,14 +46,12 @@ import {toWin} from './types';
  */
 let ServiceHolderDef;
 
-
 /**
  * This interface provides a `dispose` method that will be called by
  * runtime when a service needs to be disposed of.
  * @interface
  */
 export class Disposable {
-
   /**
    * Instructs the service to release any resources it might be holding. Can
    * be called only once in the lifecycle of a service.
@@ -62,13 +59,11 @@ export class Disposable {
   dispose() {}
 }
 
-
 /**
  * Services must implement this interface to be embeddable in FIEs.
  * @interface
  */
 export class EmbeddableService {
-
   /**
    * Installs a new instance of the service in the given FIE window.
    * @param {!Window} unusedEmbedWin
@@ -77,7 +72,6 @@ export class EmbeddableService {
   static installInEmbedWindow(unusedEmbedWin, unusedAmpDoc) {}
 }
 
-
 /**
  * Returns a service with the given id. Assumes that it has been constructed
  * already.
@@ -88,8 +82,10 @@ export class EmbeddableService {
  * @return {?Object}
  */
 export function getExistingServiceForDocInEmbedScope(
-  element, id, opt_fallbackToTopWin)
-{
+  element,
+  id,
+  opt_fallbackToTopWin
+) {
   const document = element.ownerDocument;
   const win = toWin(document.defaultView);
   // First, try to resolve via local embed window (if applicable).
@@ -110,7 +106,6 @@ export function getExistingServiceForDocInEmbedScope(
   return getServiceForDocOrNullInternal(element, id);
 }
 
-
 /**
  * Installs a service override on amp-doc level.
  * @param {!Window} embedWin
@@ -119,15 +114,20 @@ export function getExistingServiceForDocInEmbedScope(
  */
 export function installServiceInEmbedScope(embedWin, id, service) {
   const topWin = getTopWindow(embedWin);
-  devAssert(embedWin != topWin,
-      'Service override can only be installed in embed window: %s', id);
-  devAssert(!isServiceRegistered(embedWin, id),
-      'Service override has already been installed: %s', id);
+  devAssert(
+    embedWin != topWin,
+    'Service override can only be installed in embed window: %s',
+    id
+  );
+  devAssert(
+    !isServiceRegistered(embedWin, id),
+    'Service override has already been installed: %s',
+    id
+  );
   registerServiceInternal(embedWin, embedWin, id, () => service);
   getServiceInternal(embedWin, id); // Force service to build.
 }
 
-
 /**
  * Registers a service given a class to be used as implementation.
  * @param {!Window} win
@@ -135,10 +135,7 @@ export function installServiceInEmbedScope(embedWin, id, service) {
  * @param {function(new:Object, !Window)} constructor
  * @param {boolean=} opt_instantiate Whether to immediately create the service
  */
-export function registerServiceBuilder(win,
-  id,
-  constructor,
-  opt_instantiate) {
+export function registerServiceBuilder(win, id, constructor, opt_instantiate) {
   win = getTopWindow(win);
   registerServiceInternal(win, win, id, constructor);
   if (opt_instantiate) {
@@ -146,7 +143,6 @@ export function registerServiceBuilder(win,
   }
 }
 
-
 /**
  * Returns a service and registers it given a class to be used as
  * implementation.
@@ -155,10 +151,12 @@ export function registerServiceBuilder(win,
  * @param {function(new:Object, !./service/ampdoc-impl.AmpDoc)} constructor
  * @param {boolean=} opt_instantiate Whether to immediately create the service
  */
-export function registerServiceBuilderForDoc(nodeOrDoc,
+export function registerServiceBuilderForDoc(
+  nodeOrDoc,
   id,
   constructor,
-  opt_instantiate) {
+  opt_instantiate
+) {
   const ampdoc = getAmpdoc(nodeOrDoc);
   const holder = getAmpdocServiceHolder(ampdoc);
   registerServiceInternal(holder, ampdoc, id, constructor);
@@ -194,7 +192,6 @@ export function getService(win, id) {
   return getServiceInternal(win, id);
 }
 
-
 /**
  * Returns a promise for a service for the given id and window. Also expects an
  * element that has the actual implementation. The promise resolves when the
@@ -209,7 +206,6 @@ export function getServicePromise(win, id) {
   return getServicePromiseInternal(win, id);
 }
 
-
 /**
  * Returns a service or null with the given id.
  * @param {!Window} win
@@ -225,7 +221,6 @@ export function getExistingServiceOrNull(win, id) {
   }
 }
 
-
 /**
  * Like getServicePromise but returns null if the service was never registered.
  * @param {!Window} win
@@ -236,7 +231,6 @@ export function getServicePromiseOrNull(win, id) {
   return getServicePromiseOrNullInternal(win, id);
 }
 
-
 /**
  * Returns a service for the given id and ampdoc (a per-ampdoc singleton).
  * Expects service `id` to be registered.
@@ -251,7 +245,6 @@ export function getServiceForDoc(elementOrAmpDoc, id) {
   return getServiceInternal(holder, id);
 }
 
-
 /**
  * Returns a service for the given id and ampdoc (a per-ampdoc singleton).
  * If service `id` is not registered, returns null.
@@ -268,7 +261,6 @@ function getServiceForDocOrNullInternal(element, id) {
   }
 }
 
-
 /**
  * Returns a promise for a service for the given id and ampdoc. Also expects
  * a service that has the actual implementation. The promise resolves when
@@ -278,11 +270,9 @@ function getServiceForDocOrNullInternal(element, id) {
  * @return {!Promise<!Object>}
  */
 export function getServicePromiseForDoc(elementOrAmpDoc, id) {
-  return getServicePromiseInternal(
-      getAmpdocServiceHolder(elementOrAmpDoc), id);
+  return getServicePromiseInternal(getAmpdocServiceHolder(elementOrAmpDoc), id);
 }
 
-
 /**
  * Like getServicePromiseForDoc but returns null if the service was never
  * registered for this ampdoc.
@@ -292,7 +282,9 @@ export function getServicePromiseForDoc(elementOrAmpDoc, id) {
  */
 export function getServicePromiseOrNullForDoc(elementOrAmpDoc, id) {
   return getServicePromiseOrNullInternal(
-      getAmpdocServiceHolder(elementOrAmpDoc), id);
+    getAmpdocServiceHolder(elementOrAmpDoc),
+    id
+  );
 }
 
 /**
@@ -305,7 +297,6 @@ export function setParentWindow(win, parentWin) {
   win.__AMP_TOP = getTopWindow(parentWin);
 }
 
-
 /**
  * Returns the parent window for a child window (friendly iframe).
  * @param {!Window} win
@@ -315,7 +306,6 @@ export function getParentWindow(win) {
   return win.__AMP_PARENT || win;
 }
 
-
 /**
  * Returns the top window where AMP Runtime is installed for a child window
  * (friendly iframe).
@@ -326,7 +316,6 @@ export function getTopWindow(win) {
   return win.__AMP_TOP || win;
 }
 
-
 /**
  * Returns the parent "friendly" iframe if the node belongs to a child window.
  * @param {!Node} node
@@ -345,21 +334,21 @@ export function getParentWindowFrameElement(node, topWin) {
   return null;
 }
 
-
 /**
  * @param {!Node|!./service/ampdoc-impl.AmpDoc} nodeOrDoc
  * @return {!./service/ampdoc-impl.AmpDoc}
  */
 export function getAmpdoc(nodeOrDoc) {
   if (nodeOrDoc.nodeType) {
-    const win = toWin(/** @type {!Document} */ (
-      nodeOrDoc.ownerDocument || nodeOrDoc).defaultView);
+    const win = toWin(
+      /** @type {!Document} */ (nodeOrDoc.ownerDocument || nodeOrDoc)
+        .defaultView
+    );
     return getAmpdocService(win).getAmpDoc(/** @type {!Node} */ (nodeOrDoc));
   }
   return /** @type {!./service/ampdoc-impl.AmpDoc} */ (nodeOrDoc);
 }
 
-
 /**
  * @param {!Node|!./service/ampdoc-impl.AmpDoc} nodeOrDoc
  * @return {!./service/ampdoc-impl.AmpDoc|!Window}
@@ -369,7 +358,6 @@ function getAmpdocServiceHolder(nodeOrDoc) {
   return ampdoc.isSingleDoc() ? ampdoc.win : ampdoc;
 }
 
-
 /**
  * This is essentially a duplicate of `ampdoc.js`, but necessary to avoid
  * circular dependencies.
@@ -377,11 +365,12 @@ function getAmpdocServiceHolder(nodeOrDoc) {
  * @return {!./service/ampdoc-impl.AmpDocService}
  */
 function getAmpdocService(win) {
-  return /** @type {!./service/ampdoc-impl.AmpDocService} */ (
-    getService(win, 'ampdoc'));
+  return /** @type {!./service/ampdoc-impl.AmpDocService} */ (getService(
+    win,
+    'ampdoc'
+  ));
 }
 
-
 /**
  * Get service `id` from `holder`. Assumes the service
  * has already been registered.
@@ -391,8 +380,10 @@ function getAmpdocService(win) {
  * @template T
  */
 function getServiceInternal(holder, id) {
-  devAssert(isServiceRegistered(holder, id),
-      `Expected service ${id} to be registered`);
+  devAssert(
+    isServiceRegistered(holder, id),
+    `Expected service ${id} to be registered`
+  );
   const services = getServices(holder);
   const s = services[id];
   if (!s.obj) {
@@ -502,13 +493,12 @@ function getServicePromiseOrNullInternal(holder, id) {
     } else {
       // Instantiate service if not already instantiated.
       getServiceInternal(holder, id);
-      return s.promise = Promise.resolve(/** @type {!Object} */ (s.obj));
+      return (s.promise = Promise.resolve(/** @type {!Object} */ (s.obj)));
     }
   }
   return null;
 }
 
-
 /**
  * Returns the object that holds the services registered in a holder.
  * @param {!Object} holder
@@ -522,7 +512,6 @@ function getServices(holder) {
   return services;
 }
 
-
 /**
  * Whether the specified service implements `Disposable` interface.
  * @param {!Object} service
@@ -532,7 +521,6 @@ export function isDisposable(service) {
   return typeof service.dispose == 'function';
 }
 
-
 /**
  * Asserts that the specified service implements `Disposable` interface and
  * typecasts the instance to `Disposable`.
@@ -544,7 +532,6 @@ export function assertDisposable(service) {
   return /** @type {!Disposable} */ (service);
 }
 
-
 /**
  * Disposes all disposable (implements `Disposable` interface) services in
  * ampdoc scope.
@@ -554,7 +541,6 @@ export function disposeServicesForDoc(ampdoc) {
   disposeServicesInternal(ampdoc);
 }
 
-
 /**
  * Disposes all disposable (implements `Disposable` interface) services in
  * embed scope.
@@ -564,7 +550,6 @@ export function disposeServicesForEmbed(embedWin) {
   disposeServicesInternal(embedWin);
 }
 
-
 /**
  * @param {!Object} holder Object holding the service instances.
  */
@@ -580,13 +565,13 @@ function disposeServicesInternal(holder) {
     if (serviceHolder.obj) {
       disposeServiceInternal(id, serviceHolder.obj);
     } else if (serviceHolder.promise) {
-      serviceHolder.promise.then(
-          instance => disposeServiceInternal(id, instance));
+      serviceHolder.promise.then(instance =>
+        disposeServiceInternal(id, instance)
+      );
     }
   }
 }
 
-
 /**
  * @param {string} id
  * @param {!Object} service
@@ -604,7 +589,6 @@ function disposeServiceInternal(id, service) {
   }
 }
 
-
 /**
  * Adopts an embeddable (implements `EmbeddableService` interface) service
  * in embed scope.
@@ -615,18 +599,19 @@ function disposeServiceInternal(id, service) {
  */
 export function installServiceInEmbedIfEmbeddable(embedWin, serviceClass) {
   const isEmbeddableService =
-      typeof serviceClass.installInEmbedWindow === 'function';
+    typeof serviceClass.installInEmbedWindow === 'function';
   if (!isEmbeddableService) {
     return false;
   }
-  const frameElement = dev().assertElement(embedWin.frameElement,
-      'frameElement not found for embed');
+  const frameElement = dev().assertElement(
+    embedWin.frameElement,
+    'frameElement not found for embed'
+  );
   const ampdoc = getAmpdoc(frameElement);
   serviceClass.installInEmbedWindow(embedWin, ampdoc);
   return true;
 }
 
-
 /**
  * Resets a single service, so it gets recreated on next getService invocation.
  * @param {!Object} holder
diff --git a/src/service/action-impl.js b/src/service/action-impl.js
index 3038a00ca54e..3e6359352588 100644
--- a/src/service/action-impl.js
+++ b/src/service/action-impl.js
@@ -166,8 +166,18 @@ export class ActionInvocation {
    * @param {number} sequenceId An identifier for this action's sequence (all
    *   actions triggered by one event e.g. "tap:form1.submit, form2.submit").
    */
-  constructor(node, method, args, source, caller, event, trust,
-    actionEventType = '?', tagOrTarget = null, sequenceId = Math.random()) {
+  constructor(
+    node,
+    method,
+    args,
+    source,
+    caller,
+    event,
+    trust,
+    actionEventType = '?',
+    tagOrTarget = null,
+    sequenceId = Math.random()
+  ) {
     /** @type {!Node} */
     this.node = node;
     /** @const {string} */
@@ -203,8 +213,11 @@ export class ActionInvocation {
       return false;
     }
     if (this.trust < minimumTrust) {
-      user().error(TAG_, `"${this.actionEventType}" is not allowed to invoke ` +
-          `"${this.tagOrTarget}.${this.method}".`);
+      user().error(
+        TAG_,
+        `"${this.actionEventType}" is not allowed to invoke ` +
+          `"${this.tagOrTarget}.${this.method}".`
+      );
       return false;
     }
     return true;
@@ -267,8 +280,11 @@ export class ActionService {
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(embedWin, 'action',
-        new ActionService(ampdoc, embedWin.document));
+    installServiceInEmbedScope(
+      embedWin,
+      'action',
+      new ActionService(ampdoc, embedWin.document)
+    );
   }
 
   /**
@@ -292,10 +308,14 @@ export class ActionService {
         if (key == Keys.ENTER || key == Keys.SPACE) {
           const role = element.getAttribute('role');
           const isTapEventRole =
-              (role && hasOwn(TAPPABLE_ARIA_ROLES, role.toLowerCase()));
+            role && hasOwn(TAPPABLE_ARIA_ROLES, role.toLowerCase());
           if (!event.defaultPrevented && isTapEventRole) {
-            const hasAction =
-                this.trigger(element, name, event, ActionTrust.HIGH);
+            const hasAction = this.trigger(
+              element,
+              name,
+              event,
+              ActionTrust.HIGH
+            );
             // Only if the element has an action do we prevent the default.
             // In the absence of an action, e.g. on="[event].method", we do not
             // want to stop default behavior.
@@ -319,11 +339,19 @@ export class ActionService {
         this.trigger(element, name, event, ActionTrust.HIGH);
       });
     } else if (name == 'input-debounced') {
-      const debouncedInput = debounce(this.ampdoc.win, event => {
-        const target = dev().assertElement(event.target);
-        this.trigger(target, name, /** @type {!ActionEventDef} */ (event),
-            ActionTrust.HIGH);
-      }, DEFAULT_DEBOUNCE_WAIT);
+      const debouncedInput = debounce(
+        this.ampdoc.win,
+        event => {
+          const target = dev().assertElement(event.target);
+          this.trigger(
+            target,
+            name,
+            /** @type {!ActionEventDef} */ (event),
+            ActionTrust.HIGH
+          );
+        },
+        DEFAULT_DEBOUNCE_WAIT
+      );
 
       this.root_.addEventListener('input', event => {
         // Create a DeferredEvent to avoid races where the browser cleans up
@@ -333,11 +361,19 @@ export class ActionService {
         debouncedInput(deferredEvent);
       });
     } else if (name == 'input-throttled') {
-      const throttledInput = throttle(this.ampdoc.win, event => {
-        const target = dev().assertElement(event.target);
-        this.trigger(target, name, /** @type {!ActionEventDef} */ (event),
-            ActionTrust.HIGH);
-      }, DEFAULT_THROTTLE_INTERVAL);
+      const throttledInput = throttle(
+        this.ampdoc.win,
+        event => {
+          const target = dev().assertElement(event.target);
+          this.trigger(
+            target,
+            name,
+            /** @type {!ActionEventDef} */ (event),
+            ActionTrust.HIGH
+          );
+        },
+        DEFAULT_THROTTLE_INTERVAL
+      );
 
       this.root_.addEventListener('input', event => {
         const deferredEvent = new DeferredEvent(event);
@@ -396,7 +432,14 @@ export class ActionService {
    */
   execute(target, method, args, source, caller, event, trust) {
     const invocation = new ActionInvocation(
-        target, method, args, source, caller, event, trust);
+      target,
+      method,
+      args,
+      source,
+      caller,
+      event,
+      trust
+    );
     this.invoke_(invocation);
   }
 
@@ -413,9 +456,12 @@ export class ActionService {
     // TODO(dvoytenko, #7063): switch back to `target.id` with form proxy.
     const targetId = target.getAttribute('id') || '';
 
-    devAssert(isAmpTagName(targetId) ||
+    devAssert(
+      isAmpTagName(targetId) ||
         target.tagName.toLowerCase() in NON_AMP_ELEMENTS_ACTIONS_,
-    'AMP or special element expected: %s', target.tagName + '#' + targetId);
+      'AMP or special element expected: %s',
+      target.tagName + '#' + targetId
+    );
 
     if (target[ACTION_HANDLER_]) {
       dev().error(TAG_, `Action handler already installed for ${target}`);
@@ -476,9 +522,9 @@ export class ActionService {
    * @private
    */
   getActionNode_(target) {
-    return this.globalTargets_[target] ?
-      this.root_ :
-      this.root_.getElementById(target);
+    return this.globalTargets_[target]
+      ? this.root_
+      : this.root_.getElementById(target);
   }
 
   /**
@@ -512,8 +558,7 @@ export class ActionService {
    * @private
    */
   action_(source, actionEventType, event, trust, opt_args) {
-    const action =
-        this.findAction_(source, actionEventType);
+    const action = this.findAction_(source, actionEventType);
     if (!action) {
       return false;
     }
@@ -532,13 +577,22 @@ export class ActionService {
           this.error_(`Target "${target}" not found for action [${str}].`);
           return;
         }
-        const invocation = new ActionInvocation(node, method,
-            dereferencedArgs, source, action.node, event, trust,
-            actionEventType, node.tagName || target, sequenceId);
+        const invocation = new ActionInvocation(
+          node,
+          method,
+          dereferencedArgs,
+          source,
+          action.node,
+          event,
+          trust,
+          actionEventType,
+          node.tagName || target,
+          sequenceId
+        );
         return this.invoke_(invocation);
       };
       // Wait for the previous action, if any.
-      currentPromise = (currentPromise)
+      currentPromise = currentPromise
         ? currentPromise.then(invokeAction)
         : invokeAction();
     });
@@ -573,8 +627,11 @@ export class ActionService {
     // Check that this action is whitelisted (if a whitelist is set).
     if (this.whitelist_) {
       if (!isActionWhitelisted(invocation, this.whitelist_)) {
-        this.error_(`"${tagOrTarget}.${method}" is not whitelisted ${
-          JSON.stringify(this.whitelist_)}.`);
+        this.error_(
+          `"${tagOrTarget}.${method}" is not whitelisted ${JSON.stringify(
+            this.whitelist_
+          )}.`
+        );
         return null;
       }
     }
@@ -609,8 +666,10 @@ export class ActionService {
     const nonAmpActions = NON_AMP_ELEMENTS_ACTIONS_[lowerTagName];
     // TODO(dvoytenko, #7063): switch back to `target.id` with form proxy.
     const targetId = node.getAttribute('id') || '';
-    if (isAmpTagName(targetId) ||
-        (nonAmpActions && nonAmpActions.indexOf(method) > -1)) {
+    if (
+      isAmpTagName(targetId) ||
+      (nonAmpActions && nonAmpActions.indexOf(method) > -1)
+    ) {
       const handler = node[ACTION_HANDLER_];
       if (handler) {
         handler(invocation);
@@ -622,8 +681,10 @@ export class ActionService {
     }
 
     // Unsupported method.
-    this.error_(`Target (${tagOrTarget}) doesn't support "${method}" action.`,
-        invocation.caller);
+    this.error_(
+      `Target (${tagOrTarget}) doesn't support "${method}" action.`,
+      invocation.caller
+    );
 
     return null;
   }
@@ -719,7 +780,10 @@ export class ActionService {
     if (!meta) {
       return null;
     }
-    return meta.getAttribute('content').split(',')
+    return (
+      meta
+        .getAttribute('content')
+        .split(',')
         // Turn an empty string whitelist into an empty array, otherwise the
         // parse error in the mapper below would trigger.
         .filter(action => action)
@@ -734,7 +798,8 @@ export class ActionService {
           return {tagOrTarget, method};
         })
         // Filter out undefined elements because of the parse error above.
-        .filter(action => action);
+        .filter(action => action)
+    );
   }
 
   /**
@@ -794,15 +859,19 @@ function isActionWhitelisted(invocation, whitelist) {
   let {method} = invocation;
   const {node, tagOrTarget} = invocation;
   // Use alias if default action is invoked.
-  if (method === DEFAULT_ACTION
-      && (typeof node.getDefaultActionAlias == 'function')) {
+  if (
+    method === DEFAULT_ACTION &&
+    typeof node.getDefaultActionAlias == 'function'
+  ) {
     method = node.getDefaultActionAlias();
   }
   const lcMethod = method.toLowerCase();
   const lcTagOrTarget = tagOrTarget.toLowerCase();
   return whitelist.some(w => {
-    if (w.tagOrTarget.toLowerCase() === lcTagOrTarget
-        || (w.tagOrTarget === '*')) {
+    if (
+      w.tagOrTarget.toLowerCase() === lcTagOrTarget ||
+      w.tagOrTarget === '*'
+    ) {
       if (w.method.toLowerCase() === lcMethod) {
         return true;
       }
@@ -831,7 +900,6 @@ export class DeferredEvent {
   }
 }
 
-
 /**
  * Clones an object and replaces its function properties with throws.
  * @param {!T} original
@@ -853,13 +921,11 @@ function cloneWithoutFunctions(original, opt_dest) {
   return clone;
 }
 
-
 /** @private */
 function notImplemented() {
   devAssert(null, 'Deferred events cannot access native event functions.');
 }
 
-
 /**
  * @param {string} action
  * @param {!Element} context
@@ -877,11 +943,12 @@ export function parseActionMap(action, context) {
   let peek;
   do {
     tok = toks.next();
-    if (tok.type == TokenType.EOF ||
-            (tok.type == TokenType.SEPARATOR && tok.value == ';')) {
+    if (
+      tok.type == TokenType.EOF ||
+      (tok.type == TokenType.SEPARATOR && tok.value == ';')
+    ) {
       // Expected, ignore.
     } else if (tok.type == TokenType.LITERAL || tok.type == TokenType.ID) {
-
       // Format: event:target.method
 
       // Event: "event:"
@@ -894,8 +961,10 @@ export function parseActionMap(action, context) {
 
       // Handlers for event.
       do {
-        const target = assertToken(
-            toks.next(), [TokenType.LITERAL, TokenType.ID]).value;
+        const target = assertToken(toks.next(), [
+          TokenType.LITERAL,
+          TokenType.ID,
+        ]).value;
 
         // Method: ".method". Method is optional.
         let method = DEFAULT_ACTION;
@@ -904,8 +973,9 @@ export function parseActionMap(action, context) {
         peek = toks.peek();
         if (peek.type == TokenType.SEPARATOR && peek.value == '.') {
           toks.next(); // Skip '.'
-          method = assertToken(
-              toks.next(), [TokenType.LITERAL, TokenType.ID]).value || method;
+          method =
+            assertToken(toks.next(), [TokenType.LITERAL, TokenType.ID]).value ||
+            method;
 
           // Optionally, there may be arguments: "(key = value, key = value)".
           peek = toks.peek();
@@ -919,15 +989,19 @@ export function parseActionMap(action, context) {
           event,
           target,
           method,
-          args: (args && getMode().test && Object.freeze) ?
-            Object.freeze(args) : args,
+          args:
+            args && getMode().test && Object.freeze
+              ? Object.freeze(args)
+              : args,
           str: action,
         });
 
         peek = toks.peek();
-
-      } while (peek.type == TokenType.SEPARATOR && peek.value == ','
-          && toks.next()); // skip "," when found
+      } while (
+        peek.type == TokenType.SEPARATOR &&
+        peek.value == ',' &&
+        toks.next()
+      ); // skip "," when found
 
       if (!actionMap) {
         actionMap = map();
@@ -938,7 +1012,6 @@ export function parseActionMap(action, context) {
       // Unexpected token.
       assertAction(false, `; unexpected token [${tok.value || ''}]`);
     }
-
   } while (tok.type != TokenType.EOF);
 
   return actionMap;
@@ -975,14 +1048,18 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) {
         // Key: "key = "
         assertToken(toks.next(), [TokenType.SEPARATOR], '=');
         // Value is either a literal or an expression: "foo.bar.baz"
-        tok = assertToken(toks.next(/* convertValue */ true),
-            [TokenType.LITERAL, TokenType.ID]);
+        tok = assertToken(toks.next(/* convertValue */ true), [
+          TokenType.LITERAL,
+          TokenType.ID,
+        ]);
         const argValueTokens = [tok];
         // Expressions have one or more dereferences: ".identifier"
         if (tok.type == TokenType.ID) {
-          for (peek = toks.peek();
+          for (
+            peek = toks.peek();
             peek.type == TokenType.SEPARATOR && peek.value == '.';
-            peek = toks.peek()) {
+            peek = toks.peek()
+          ) {
             toks.next(); // Skip '.'.
             tok = assertToken(toks.next(false), [TokenType.ID]);
             argValueTokens.push(tok);
@@ -995,9 +1072,10 @@ function tokenizeMethodArguments(toks, assertToken, assertAction) {
         args[value] = argValue;
         peek = toks.peek();
         assertAction(
-            peek.type == TokenType.SEPARATOR &&
+          peek.type == TokenType.SEPARATOR &&
             (peek.value == ',' || peek.value == ')'),
-            'Expected either [,] or [)]');
+          'Expected either [,] or [)]'
+        );
       } else {
         // Unexpected token.
         assertAction(false, `; unexpected token [${tok.value || ''}]`);
@@ -1051,11 +1129,10 @@ export function dereferenceArgsVariables(args, event, opt_args) {
     // dereferencing strings like `foo` iff there is a corresponding key in
     // `data`. Otherwise, `foo` is treated as a string "foo".
     if (typeof value == 'object' && value.expression) {
-      const expr =
-        /** @type {ActionInfoArgExpressionDef} */ (value).expression;
+      const expr = /** @type {ActionInfoArgExpressionDef} */ (value).expression;
       const exprValue = getValueForExpr(data, expr);
       // If expr can't be found in data, use null instead of undefined.
-      value = (exprValue === undefined) ? null : exprValue;
+      value = exprValue === undefined ? null : exprValue;
     }
     if (data[value]) {
       applied[key] = data[value];
@@ -1076,8 +1153,13 @@ export function dereferenceArgsVariables(args, event, opt_args) {
  * @private
  */
 function assertActionForParser(s, context, condition, opt_message) {
-  return userAssert(condition, 'Invalid action definition in %s: [%s] %s',
-      context, s, opt_message || '');
+  return userAssert(
+    condition,
+    'Invalid action definition in %s: [%s] %s',
+    context,
+    s,
+    opt_message || ''
+  );
 }
 
 /**
@@ -1091,9 +1173,12 @@ function assertActionForParser(s, context, condition, opt_message) {
  */
 function assertTokenForParser(s, context, tok, types, opt_value) {
   if (opt_value !== undefined) {
-    assertActionForParser(s, context,
-        types.includes(tok.type) && tok.value == opt_value,
-        `; expected [${opt_value}]`);
+    assertActionForParser(
+      s,
+      context,
+      types.includes(tok.type) && tok.value == opt_value,
+      `; expected [${opt_value}]`
+    );
   } else {
     assertActionForParser(s, context, types.includes(tok.type));
   }
@@ -1130,8 +1215,7 @@ const STRING_SET = '"\'';
 const OBJECT_SET = '{}';
 
 /** @private @const {string} */
-const SPECIAL_SET =
-    WHITESPACE_SET + SEPARATOR_SET + STRING_SET + OBJECT_SET;
+const SPECIAL_SET = WHITESPACE_SET + SEPARATOR_SET + STRING_SET + OBJECT_SET;
 
 /** @private */
 class ParserTokenizer {
@@ -1193,9 +1277,13 @@ class ParserTokenizer {
     }
 
     // A numeric. Notice that it steals the `.` from separators.
-    if (convertValues && (isNum(c) ||
-            (c == '.' && newIndex + 1 < this.str_.length &&
-            isNum(this.str_[newIndex + 1])))) {
+    if (
+      convertValues &&
+      (isNum(c) ||
+        (c == '.' &&
+          newIndex + 1 < this.str_.length &&
+          isNum(this.str_[newIndex + 1])))
+    ) {
       let hasFraction = c == '.';
       let end = newIndex + 1;
       for (; end < this.str_.length; end++) {
@@ -1272,7 +1360,7 @@ class ParserTokenizer {
 
     // Boolean literal.
     if (convertValues && (s == 'true' || s == 'false')) {
-      const value = (s == 'true');
+      const value = s == 'true';
       return {type: TokenType.LITERAL, value, index: newIndex};
     }
 
@@ -1286,7 +1374,6 @@ class ParserTokenizer {
   }
 }
 
-
 /**
  * Tests whether a chacter is a number.
  * @param {string} c
@@ -1296,14 +1383,14 @@ function isNum(c) {
   return c >= '0' && c <= '9';
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  */
 export function installActionServiceForDoc(ampdoc) {
   registerServiceBuilderForDoc(
-      ampdoc,
-      'action',
-      ActionService,
-      /* opt_instantiate */ true);
+    ampdoc,
+    'action',
+    ActionService,
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/ampdoc-impl.js b/src/service/ampdoc-impl.js
index d3a79defb723..4457eb243d1b 100644
--- a/src/service/ampdoc-impl.js
+++ b/src/service/ampdoc-impl.js
@@ -17,10 +17,7 @@
 import {Deferred} from '../utils/promise';
 import {Signals} from '../utils/signals';
 import {dev, devAssert} from '../log';
-import {
-  getParentWindowFrameElement,
-  registerServiceBuilder,
-} from '../service';
+import {getParentWindowFrameElement, registerServiceBuilder} from '../service';
 import {getShadowRootNode} from '../shadow-embed';
 import {isDocumentReady, whenDocumentReady} from '../document-ready';
 import {isExperimentOn} from '../experiments';
@@ -29,7 +26,6 @@ import {waitForBodyPromise} from '../dom';
 /** @const {string} */
 const AMPDOC_PROP = '__AMPDOC';
 
-
 /**
  * This service helps locate an ampdoc (`AmpDoc` instance) for any node,
  * either in the single-doc or shadow-doc environments.
@@ -104,8 +100,10 @@ export class AmpDocService {
     }
 
     // Multiple documents and AmpDocShell requested
-    if (isExperimentOn(this.win, 'ampdoc-shell') &&
-        opt_node === this.win.document) {
+    if (
+      isExperimentOn(this.win, 'ampdoc-shell') &&
+      opt_node === this.win.document
+    ) {
       if (this.shellShadowDoc_) {
         return this.shellShadowDoc_;
       } else {
@@ -183,9 +181,10 @@ export class AmpDocService {
     // See https://www.chromestatus.com/feature/5676110549352448.
     if (opt_node) {
       devAssert(
-          opt_node['isConnected'] === undefined ||
+        opt_node['isConnected'] === undefined ||
           opt_node['isConnected'] === true,
-          'The node must be attached to request ampdoc.');
+        'The node must be attached to request ampdoc.'
+      );
     }
 
     const ampdoc = this.getAmpDocIfAvailable(opt_node, opt_options);
@@ -204,8 +203,10 @@ export class AmpDocService {
    * @restricted
    */
   installShadowDoc(url, shadowRoot) {
-    devAssert(!shadowRoot[AMPDOC_PROP],
-        'The shadow root already contains ampdoc');
+    devAssert(
+      !shadowRoot[AMPDOC_PROP],
+      'The shadow root already contains ampdoc'
+    );
     const ampdoc = new AmpDocShadow(this.win, url, shadowRoot);
     shadowRoot[AMPDOC_PROP] = ampdoc;
     return ampdoc;
@@ -223,8 +224,10 @@ export class AmpDocService {
    * @restricted
    */
   installShellShadowDoc() {
-    devAssert(this.singleDoc_ === null,
-        'AmpDocShell cannot be installed in single-doc mode');
+    devAssert(
+      this.singleDoc_ === null,
+      'AmpDocShell cannot be installed in single-doc mode'
+    );
     this.shellShadowDoc_ = new AmpDocShell(this.win);
     this.win.document[AMPDOC_PROP] = this.shellShadowDoc_;
 
@@ -237,7 +240,6 @@ export class AmpDocService {
   }
 }
 
-
 /**
  * This class represents a single ampdoc. `AmpDocService` can contain only one
  * global ampdoc or multiple, depending on the runtime mode: single-doc or
@@ -400,7 +402,6 @@ export class AmpDoc {
   }
 }
 
-
 /**
  * The version of `AmpDoc` in the single-doc mode that corresponds to the
  * global `window.document`.
@@ -414,9 +415,9 @@ export class AmpDocSingle extends AmpDoc {
     super(win);
 
     /** @private @const {!Promise<!Element>} */
-    this.bodyPromise_ = this.win.document.body ?
-      Promise.resolve(this.win.document.body) :
-      waitForBodyPromise(this.win.document).then(() => this.getBody());
+    this.bodyPromise_ = this.win.document.body
+      ? Promise.resolve(this.win.document.body)
+      : waitForBodyPromise(this.win.document).then(() => this.getBody());
 
     /** @private @const {!Promise} */
     this.readyPromise_ = whenDocumentReady(this.win.document);
@@ -468,7 +469,6 @@ export class AmpDocSingle extends AmpDoc {
   }
 }
 
-
 /**
  * The version of `AmpDoc` in the shadow-doc mode that is allocated for each
  * ampdoc hosted within a shadow root.
@@ -579,7 +579,6 @@ export class AmpDocShadow extends AmpDoc {
   }
 }
 
-
 /**
  * AmpDocShadow for the shell
  * @package @visibleForTesting
@@ -606,10 +605,7 @@ export class AmpDocShell extends AmpDocShadow {
  * @param {boolean} isSingleDoc
  */
 export function installDocService(win, isSingleDoc) {
-  registerServiceBuilder(
-      win,
-      'ampdoc',
-      function() {
-        return new AmpDocService(win, isSingleDoc);
-      });
+  registerServiceBuilder(win, 'ampdoc', function() {
+    return new AmpDocService(win, isSingleDoc);
+  });
 }
diff --git a/src/service/batched-xhr-impl.js b/src/service/batched-xhr-impl.js
index d4c1e9e3ce14..6ab1a864b885 100644
--- a/src/service/batched-xhr-impl.js
+++ b/src/service/batched-xhr-impl.js
@@ -19,7 +19,6 @@ import {getService, registerServiceBuilder} from '../service';
 import {map} from '../utils/object';
 import {removeFragment} from '../url';
 
-
 /**
  * A wrapper around the Xhr service which batches the result of GET requests
  *
@@ -27,7 +26,6 @@ import {removeFragment} from '../url';
  * @visibleForTesting
  */
 export class BatchedXhr extends Xhr {
-
   /**
    * @param {!Window} win
    */
@@ -48,9 +46,9 @@ export class BatchedXhr extends Xhr {
    */
   fetch(input, opt_init) {
     const accept =
-        (opt_init && opt_init.headers && opt_init.headers['Accept']) || '';
+      (opt_init && opt_init.headers && opt_init.headers['Accept']) || '';
     const isBatchable =
-        (!opt_init || !opt_init.method || opt_init.method === 'GET');
+      !opt_init || !opt_init.method || opt_init.method === 'GET';
     const key = this.getMapKey_(input, accept);
     const isBatched = !!this.fetchPromises_[key];
 
@@ -61,13 +59,16 @@ export class BatchedXhr extends Xhr {
     const fetchPromise = super.fetch(input, opt_init);
 
     if (isBatchable) {
-      this.fetchPromises_[key] = fetchPromise.then(response => {
-        delete this.fetchPromises_[key];
-        return response.clone();
-      }, err => {
-        delete this.fetchPromises_[key];
-        throw err;
-      });
+      this.fetchPromises_[key] = fetchPromise.then(
+        response => {
+          delete this.fetchPromises_[key];
+          return response.clone();
+        },
+        err => {
+          delete this.fetchPromises_[key];
+          throw err;
+        }
+      );
     }
 
     return fetchPromise;
@@ -86,7 +87,6 @@ export class BatchedXhr extends Xhr {
   }
 }
 
-
 /**
  * @param {!Window} window
  * @return {!BatchedXhr}
@@ -96,7 +96,6 @@ export function batchedXhrServiceForTesting(window) {
   return getService(window, 'batched-xhr');
 }
 
-
 /**
  * @param {!Window} window
  */
diff --git a/src/service/cache-cid-api.js b/src/service/cache-cid-api.js
index 034d47bedec5..610e50d95235 100644
--- a/src/service/cache-cid-api.js
+++ b/src/service/cache-cid-api.js
@@ -47,10 +47,8 @@ const TIMEOUT_ = 30000;
  * Exposes CID API for cache-served pages without a viewer.
  */
 export class CacheCidApi {
-
   /** @param {!./ampdoc-impl.AmpDoc} ampdoc */
   constructor(ampdoc) {
-
     /** @private {!./ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
@@ -104,7 +102,8 @@ export class CacheCidApi {
     });
 
     // Make the XHR request to the cache endpoint.
-    return this.timer_.timeoutPromise(
+    return this.timer_
+      .timeoutPromise(
         TIMEOUT_,
         Services.xhrFor(this.ampdoc_.win).fetchJson(url, {
           method: 'POST',
@@ -112,30 +111,33 @@ export class CacheCidApi {
           credentials: 'include',
           mode: 'cors',
           body: payload,
-        })).then(res => {
-      return res.json().then(response => {
-        if (response['optOut']) {
-	            return null;
-	          }
-	          const cid = response['publisherClientId'];
-        if (!cid && useAlternate && response['alternateUrl']) {
-          // If an alternate url is provided, try again with the alternate url
-          // The client is still responsible for appending API keys to the URL.
-          const alt = `${response['alternateUrl']}?key=${SERVICE_KEY_}`;
-          return this.fetchCid_(dev().assertString(alt), false);
-	          }
-        return cid;
-	        });
-    }).catch(e => {
-      if (e && e.response) {
-        e.response.json().then(res => {
-          dev().error(TAG_, JSON.stringify(res));
+        })
+      )
+      .then(res => {
+        return res.json().then(response => {
+          if (response['optOut']) {
+            return null;
+          }
+          const cid = response['publisherClientId'];
+          if (!cid && useAlternate && response['alternateUrl']) {
+            // If an alternate url is provided, try again with the alternate url
+            // The client is still responsible for appending API keys to the URL.
+            const alt = `${response['alternateUrl']}?key=${SERVICE_KEY_}`;
+            return this.fetchCid_(dev().assertString(alt), false);
+          }
+          return cid;
         });
-      } else {
-        dev().error(TAG_, e);
-      }
-      return null;
-    });
+      })
+      .catch(e => {
+        if (e && e.response) {
+          e.response.json().then(res => {
+            dev().error(TAG_, JSON.stringify(res));
+          });
+        } else {
+          dev().error(TAG_, e);
+        }
+        return null;
+      });
   }
 
   /**
@@ -146,8 +148,10 @@ export class CacheCidApi {
    */
   scopeCid_(publisherCid, scope) {
     const text = publisherCid + ';' + scope;
-    return Services.cryptoFor(this.ampdoc_.win).sha384Base64(text).then(enc => {
-      return 'amp-' + enc;
-    });
+    return Services.cryptoFor(this.ampdoc_.win)
+      .sha384Base64(text)
+      .then(enc => {
+        return 'amp-' + enc;
+      });
   }
 }
diff --git a/src/service/cid-api.js b/src/service/cid-api.js
index 27afbf75b3d9..d679098aa8db 100644
--- a/src/service/cid-api.js
+++ b/src/service/cid-api.js
@@ -21,7 +21,8 @@ import {dict} from '../utils/object';
 import {getCookie, setCookie} from '../cookies';
 import {isProxyOrigin, parseUrlDeprecated} from '../url';
 
-const GOOGLE_API_URL = 'https://ampcid.google.com/v1/publisher:getClientId?key=';
+const GOOGLE_API_URL =
+  'https://ampcid.google.com/v1/publisher:getClientId?key=';
 
 const TAG = 'GoogleCidApi';
 const AMP_TOKEN = 'AMP_TOKEN';
@@ -43,7 +44,6 @@ const YEAR = 365 * DAY;
  * Client impl for Google CID API
  */
 export class GoogleCidApi {
-
   /** @param {!./ampdoc-impl.AmpDoc} ampdoc */
   constructor(ampdoc) {
     /**
@@ -80,29 +80,31 @@ export class GoogleCidApi {
     let token;
     // Block the request if a previous request is on flight
     // Poll every 200ms. Longer interval means longer latency for the 2nd CID.
-    return this.cidPromise_[scope] = this.timer_.poll(200, () => {
-      token = getCookie(this.win_, AMP_TOKEN);
-      return token !== TokenStatus.RETRIEVING;
-    }).then(() => {
-      if (token === TokenStatus.OPT_OUT) {
-        return TokenStatus.OPT_OUT;
-      }
-      // If the page referrer is proxy origin, we force to use API even the
-      // token indicates a previous fetch returned nothing
-      const forceFetch =
+    return (this.cidPromise_[scope] = this.timer_
+      .poll(200, () => {
+        token = getCookie(this.win_, AMP_TOKEN);
+        return token !== TokenStatus.RETRIEVING;
+      })
+      .then(() => {
+        if (token === TokenStatus.OPT_OUT) {
+          return TokenStatus.OPT_OUT;
+        }
+        // If the page referrer is proxy origin, we force to use API even the
+        // token indicates a previous fetch returned nothing
+        const forceFetch =
           token === TokenStatus.NOT_FOUND && this.isReferrerProxyOrigin_();
 
-      // Token is in a special state, fallback to existing cookie
-      if (!forceFetch && this.isStatusToken_(token)) {
-        return null;
-      }
+        // Token is in a special state, fallback to existing cookie
+        if (!forceFetch && this.isStatusToken_(token)) {
+          return null;
+        }
 
-      if (!token || this.isStatusToken_(token)) {
-        this.persistToken_(TokenStatus.RETRIEVING, TIMEOUT);
-      }
+        if (!token || this.isStatusToken_(token)) {
+          this.persistToken_(TokenStatus.RETRIEVING, TIMEOUT);
+        }
 
-      const url = GOOGLE_API_URL + apiKey;
-      return this.fetchCid_(dev().assertString(url), scope, token)
+        const url = GOOGLE_API_URL + apiKey;
+        return this.fetchCid_(dev().assertString(url), scope, token)
           .then(response => {
             const cid = this.handleResponse_(response);
             if (!cid && response['alternateUrl']) {
@@ -110,8 +112,11 @@ export class GoogleCidApi {
               // url The client is still responsible for appending API keys to
               // the URL.
               const altUrl = `${response['alternateUrl']}?key=${apiKey}`;
-              return this.fetchCid_(dev().assertString(altUrl), scope, token)
-                  .then(this.handleResponse_.bind(this));
+              return this.fetchCid_(
+                dev().assertString(altUrl),
+                scope,
+                token
+              ).then(this.handleResponse_.bind(this));
             }
             return cid;
           })
@@ -126,7 +131,7 @@ export class GoogleCidApi {
             }
             return null;
           });
-    });
+      }));
   }
 
   /**
@@ -144,14 +149,17 @@ export class GoogleCidApi {
       payload['securityToken'] = token;
     }
     return this.timer_.timeoutPromise(
-        TIMEOUT,
-        Services.xhrFor(this.win_).fetchJson(url, {
+      TIMEOUT,
+      Services.xhrFor(this.win_)
+        .fetchJson(url, {
           method: 'POST',
           ampCors: false,
           credentials: 'include',
           mode: 'cors',
           body: payload,
-        }).then(res => res.json()));
+        })
+        .then(res => res.json())
+    );
   }
 
   /**
@@ -206,6 +214,6 @@ export class GoogleCidApi {
    * @return {boolean}
    */
   isStatusToken_(token) {
-    return /** @type boolean */ (token && token[0] === '$');
+    return /** @type {boolean} */ (token && token[0] === '$');
   }
 }
diff --git a/src/service/cid-impl.js b/src/service/cid-impl.js
index bc21e3e6cdac..720853cb01a9 100644
--- a/src/service/cid-impl.js
+++ b/src/service/cid-impl.js
@@ -31,15 +31,8 @@ import {dev, rethrowAsync, user, userAssert} from '../log';
 import {dict} from '../utils/object';
 import {getCookie, setCookie} from '../cookies';
 import {getCryptoRandomBytesArray} from '../utils/bytes';
-import {
-  getServiceForDoc,
-  registerServiceBuilderForDoc,
-} from '../service';
-import {
-  getSourceOrigin,
-  isProxyOrigin,
-  parseUrlDeprecated,
-} from '../url';
+import {getServiceForDoc, registerServiceBuilderForDoc} from '../service';
+import {getSourceOrigin, isProxyOrigin, parseUrlDeprecated} from '../url';
 import {isIframed} from '../dom';
 import {parseJson, tryParseJson} from '../json';
 import {tryResolve} from '../utils/promise';
@@ -103,7 +96,6 @@ let BaseCidInfoDef;
  */
 let GetCidDef;
 
-
 export class Cid {
   /** @param {!./ampdoc-impl.AmpDoc} ampdoc */
   constructor(ampdoc) {
@@ -166,31 +158,40 @@ export class Cid {
    */
   get(getCidStruct, consent, opt_persistenceConsent) {
     userAssert(
-        SCOPE_NAME_VALIDATOR.test(getCidStruct.scope)
-            && SCOPE_NAME_VALIDATOR.test(getCidStruct.cookieName),
-        'The CID scope and cookie name must only use the characters ' +
+      SCOPE_NAME_VALIDATOR.test(getCidStruct.scope) &&
+        SCOPE_NAME_VALIDATOR.test(getCidStruct.cookieName),
+      'The CID scope and cookie name must only use the characters ' +
         '[a-zA-Z0-9-_.]+\nInstead found: %s',
-        getCidStruct.scope);
-    return consent.then(() => {
-      return Services.viewerForDoc(this.ampdoc).whenFirstVisible();
-    }).then(() => {
-      // Check if user has globally opted out of CID, we do this after
-      // consent check since user can optout during consent process.
-      return isOptedOutOfCid(this.ampdoc);
-    }).then(optedOut => {
-      if (optedOut) {
-        return '';
-      }
-      const cidPromise = this.getExternalCid_(
-          getCidStruct, opt_persistenceConsent || consent);
-      // Getting the CID might involve an HTTP request. We timeout after 10s.
-      return Services.timerFor(this.ampdoc.win)
-          .timeoutPromise(10000, cidPromise,
-              `Getting cid for "${getCidStruct.scope}" timed out`)
+      getCidStruct.scope
+    );
+    return consent
+      .then(() => {
+        return Services.viewerForDoc(this.ampdoc).whenFirstVisible();
+      })
+      .then(() => {
+        // Check if user has globally opted out of CID, we do this after
+        // consent check since user can optout during consent process.
+        return isOptedOutOfCid(this.ampdoc);
+      })
+      .then(optedOut => {
+        if (optedOut) {
+          return '';
+        }
+        const cidPromise = this.getExternalCid_(
+          getCidStruct,
+          opt_persistenceConsent || consent
+        );
+        // Getting the CID might involve an HTTP request. We timeout after 10s.
+        return Services.timerFor(this.ampdoc.win)
+          .timeoutPromise(
+            10000,
+            cidPromise,
+            `Getting cid for "${getCidStruct.scope}" timed out`
+          )
           .catch(error => {
             rethrowAsync(error);
           });
-    });
+      });
   }
 
   /**
@@ -259,11 +260,11 @@ export class Cid {
    * @return {*}
    */
   scopeBaseCid_(persistenceConsent, scope, url) {
-    return getBaseCid(this, persistenceConsent)
-        .then(baseCid => {
-          return Services.cryptoFor(this.ampdoc.win).sha384Base64(
-              baseCid + getProxySourceOrigin(url) + scope);
-        });
+    return getBaseCid(this, persistenceConsent).then(baseCid => {
+      return Services.cryptoFor(this.ampdoc.win).sha384Base64(
+        baseCid + getProxySourceOrigin(url) + scope
+      );
+    });
   }
 
   /**
@@ -287,8 +288,9 @@ export class Cid {
    */
   getOptedInScopes_() {
     const apiKeyMap = {};
-    const optInMeta = this.ampdoc.win.document.head./*OK*/querySelector(
-        `meta[name=${GOOGLE_CID_API_META_NAME}]`);
+    const optInMeta = this.ampdoc.win.document.head./*OK*/ querySelector(
+      `meta[name=${GOOGLE_CID_API_META_NAME}]`
+    );
     if (optInMeta && optInMeta.hasAttribute('content')) {
       const list = optInMeta.getAttribute('content').split(',');
       list.forEach(item => {
@@ -303,8 +305,10 @@ export class Cid {
           if (scope) {
             apiKeyMap[scope] = API_KEYS[clientName];
           } else {
-            user().error(TAG_,
-                `Unsupported client for Google CID API: ${clientName}`);
+            user().error(
+              TAG_,
+              `Unsupported client for Google CID API: ${clientName}`
+            );
           }
         }
       });
@@ -322,10 +326,11 @@ export class Cid {
  * @visibleForTesting
  */
 export function optOutOfCid(ampdoc) {
-
   // Tell the viewer that user has opted out.
-  Services.viewerForDoc(ampdoc)./*OK*/sendMessage(
-      CID_OPTOUT_VIEWER_MESSAGE, dict());
+  Services.viewerForDoc(ampdoc)./*OK*/ sendMessage(
+    CID_OPTOUT_VIEWER_MESSAGE,
+    dict()
+  );
 
   // Store the optout bit in storage
   return Services.storageForDoc(ampdoc).then(storage => {
@@ -341,12 +346,14 @@ export function optOutOfCid(ampdoc) {
  * @visibleForTesting
  */
 export function isOptedOutOfCid(ampdoc) {
-  return Services.storageForDoc(ampdoc).then(storage => {
-    return storage.get(CID_OPTOUT_STORAGE_KEY).then(val => !!val);
-  }).catch(() => {
-    // If we fail to read the flag, assume not opted out.
-    return false;
-  });
+  return Services.storageForDoc(ampdoc)
+    .then(storage => {
+      return storage.get(CID_OPTOUT_STORAGE_KEY).then(val => !!val);
+    })
+    .catch(() => {
+      // If we fail to read the flag, assume not opted out.
+      return false;
+    });
 }
 
 /**
@@ -390,27 +397,25 @@ function getOrCreateCookie(cid, getCidStruct, persistenceConsent) {
     if (/^amp-/.test(existingCookie)) {
       setCidCookie(win, cookieName, existingCookie);
     }
-    return /** @type {!Promise<?string>} */ (
-      Promise.resolve(existingCookie));
+    return /** @type {!Promise<?string>} */ (Promise.resolve(existingCookie));
   }
 
   const newCookiePromise = getNewCidForCookie(win)
-      // Create new cookie, always prefixed with "amp-", so that we can see from
-      // the value whether we created it.
-      .then(randomStr => 'amp-' + randomStr);
+    // Create new cookie, always prefixed with "amp-", so that we can see from
+    // the value whether we created it.
+    .then(randomStr => 'amp-' + randomStr);
 
   // Store it as a cookie based on the persistence consent.
-  Promise.all([newCookiePromise, persistenceConsent])
-      .then(results => {
-        // The initial CID generation is inherently racy. First one that gets
-        // consent wins.
-        const newCookie = results[0];
-        const relookup = getCookie(win, cookieName);
-        if (!relookup) {
-          setCidCookie(win, cookieName, newCookie);
-        }
-      });
-  return cid.externalCidCache_[scope] = newCookiePromise;
+  Promise.all([newCookiePromise, persistenceConsent]).then(results => {
+    // The initial CID generation is inherently racy. First one that gets
+    // consent wins.
+    const newCookie = results[0];
+    const relookup = getCookie(win, cookieName);
+    if (!relookup) {
+      setCidCookie(win, cookieName, newCookie);
+    }
+  });
+  return (cid.externalCidCache_[scope] = newCookiePromise);
 }
 
 /**
@@ -442,7 +447,7 @@ function getBaseCid(cid, persistenceConsent) {
   }
   const {win} = cid.ampdoc;
 
-  return cid.baseCid_ = read(cid.ampdoc).then(stored => {
+  return (cid.baseCid_ = read(cid.ampdoc).then(stored => {
     let needsToStore = false;
     let baseCid;
 
@@ -466,7 +471,7 @@ function getBaseCid(cid, persistenceConsent) {
     }
 
     return baseCid;
-  });
+  }));
 }
 
 /**
@@ -510,19 +515,20 @@ export function viewerBaseCid(ampdoc, opt_data) {
     }
     // TODO(lannka, #11060): clean up when all Viewers get migrated
     dev().expectedError('CID', 'Viewer does not provide cap=cid');
-    return viewer.sendMessageAwaitResponse('cid', opt_data)
-        .then(data => {
-          // For backward compatibility: #4029
-          if (data && !tryParseJson(data)) {
-            // TODO(lannka, #11060): clean up when all Viewers get migrated
-            dev().expectedError('CID', 'invalid cid format');
-            return JSON.stringify(dict({
-              'time': Date.now(), // CID returned from old API is always fresh
-              'cid': data,
-            }));
-          }
-          return data;
-        });
+    return viewer.sendMessageAwaitResponse('cid', opt_data).then(data => {
+      // For backward compatibility: #4029
+      if (data && !tryParseJson(data)) {
+        // TODO(lannka, #11060): clean up when all Viewers get migrated
+        dev().expectedError('CID', 'invalid cid format');
+        return JSON.stringify(
+          dict({
+            'time': Date.now(), // CID returned from old API is always fresh
+            'cid': data,
+          })
+        );
+      }
+      return data;
+    });
   });
 }
 
@@ -533,10 +539,12 @@ export function viewerBaseCid(ampdoc, opt_data) {
  * @return {string}
  */
 function createCidData(cidString) {
-  return JSON.stringify(dict({
-    'time': Date.now(),
-    'cid': cidString,
-  }));
+  return JSON.stringify(
+    dict({
+      'time': Date.now(),
+      'cid': cidString,
+    })
+  );
 }
 
 /**
@@ -611,8 +619,13 @@ function getEntropy(win) {
   }
 
   // Support for legacy browsers.
-  return String(win.location.href + Date.now() +
-      win.Math.random() + win.screen.width + win.screen.height);
+  return String(
+    win.location.href +
+      Date.now() +
+      win.Math.random() +
+      win.screen.width +
+      win.screen.height
+  );
 }
 
 /**
@@ -627,10 +640,12 @@ function getNewCidForCookie(win) {
   } else {
     // If our entropy is a pure random number, we can just directly turn it
     // into base 64
-    const cast = /** @type {!Uint8Array} */(entropy);
-    return tryResolve(() => base64UrlEncodeFromBytes(cast)
+    const cast = /** @type {!Uint8Array} */ (entropy);
+    return tryResolve(() =>
+      base64UrlEncodeFromBytes(cast)
         // Remove trailing padding
-        .replace(/\.+$/, ''));
+        .replace(/\.+$/, '')
+    );
   }
 }
 
diff --git a/src/service/crypto-impl.js b/src/service/crypto-impl.js
index 798b01de410b..ddb9d5dbc030 100644
--- a/src/service/crypto-impl.js
+++ b/src/service/crypto-impl.js
@@ -79,23 +79,29 @@ export class Crypto {
 
     if (!this.subtle || this.polyfillPromise_) {
       // means native Crypto API is not available or failed before.
-      return (this.polyfillPromise_ || this.loadPolyfill_())
-          .then(polyfillSha384 => polyfillSha384(input));
+      return (this.polyfillPromise_ || this.loadPolyfill_()).then(
+        polyfillSha384 => polyfillSha384(input)
+      );
     }
 
     try {
-      return this.subtle.digest({name: 'SHA-384'}, input)
+      return (
+        this.subtle
+          .digest({name: 'SHA-384'}, input)
           /** @param {?} buffer */
-          .then(buffer => new Uint8Array(buffer),
-              e => {
-                // Chrome doesn't allow the usage of Crypto API under
-                // non-secure origin: https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features
-                if (e.message && e.message.indexOf('secure origin') < 0) {
-                  // Log unexpected fallback.
-                  user().error(TAG, FALLBACK_MSG, e);
-                }
-                return this.loadPolyfill_().then(() => this.sha384(input));
-              });
+          .then(
+            buffer => new Uint8Array(buffer),
+            e => {
+              // Chrome doesn't allow the usage of Crypto API under
+              // non-secure origin: https://www.chromium.org/Home/chromium-security/prefer-secure-origins-for-powerful-new-features
+              if (e.message && e.message.indexOf('secure origin') < 0) {
+                // Log unexpected fallback.
+                user().error(TAG, FALLBACK_MSG, e);
+              }
+              return this.loadPolyfill_().then(() => this.sha384(input));
+            }
+          )
+      );
     } catch (e) {
       dev().error(TAG, FALLBACK_MSG, e);
       return this.loadPolyfill_().then(() => this.sha384(input));
@@ -126,7 +132,8 @@ export class Crypto {
       // Consider the Uint8 array as a base256 fraction number,
       // then convert it to the decimal form.
       let result = 0;
-      for (let i = 2; i >= 0; i--) { // 3 base256 digits give enough precision
+      for (let i = 2; i >= 0; i--) {
+        // 3 base256 digits give enough precision
         result = (result + buffer[i]) / 256;
       }
       return result;
@@ -142,9 +149,9 @@ export class Crypto {
     if (this.polyfillPromise_) {
       return this.polyfillPromise_;
     }
-    return this.polyfillPromise_ = Services.extensionsFor(this.win_)
-        .preloadExtension('amp-crypto-polyfill')
-        .then(() => getService(this.win_, 'crypto-polyfill'));
+    return (this.polyfillPromise_ = Services.extensionsFor(this.win_)
+      .preloadExtension('amp-crypto-polyfill')
+      .then(() => getService(this.win_, 'crypto-polyfill')));
   }
 
   /**
@@ -175,9 +182,13 @@ export class Crypto {
     const keyData = this.isLegacyWebkit_
       ? utf8Encode(JSON.stringify(/** @type {!JsonObject} */ (jwk)))
       : /** @type {!webCrypto.JsonWebKey} */ (jwk);
-    return /** @type {!Promise<!webCrypto.CryptoKey>} */ (
-      this.subtle.importKey('jwk', keyData, this.pkcsAlgo, true, ['verify'])
-    );
+    return /** @type {!Promise<!webCrypto.CryptoKey>} */ (this.subtle.importKey(
+      'jwk',
+      keyData,
+      this.pkcsAlgo,
+      true,
+      ['verify']
+    ));
   }
 
   /**
@@ -192,9 +203,12 @@ export class Crypto {
    */
   verifyPkcs(key, signature, data) {
     devAssert(this.isPkcsAvailable());
-    return /** @type {!Promise<boolean>} */ (
-      this.subtle.verify(this.pkcsAlgo, key, signature, data)
-    );
+    return /** @type {!Promise<boolean>} */ (this.subtle.verify(
+      this.pkcsAlgo,
+      key,
+      signature,
+      data
+    ));
   }
 }
 
diff --git a/src/service/custom-element-registry.js b/src/service/custom-element-registry.js
index 280c69e4b63e..d94dd3356d5c 100644
--- a/src/service/custom-element-registry.js
+++ b/src/service/custom-element-registry.js
@@ -20,7 +20,6 @@ import {extensionScriptsInNode} from '../element-service';
 import {reportError} from '../error';
 import {userAssert} from '../log';
 
-
 /**
  * @param {!Window} win
  * @return {!Object<string, function(new:../base-element.BaseElement, !Element)>}
@@ -32,7 +31,6 @@ function getExtendedElements(win) {
   return win.ampExtendedElements;
 }
 
-
 /**
  * Registers an element. Upgrades it if has previously been stubbed.
  * @param {!Window} win
@@ -49,9 +47,13 @@ export function upgradeOrRegisterElement(win, name, toClass) {
     // Already registered this instance.
     return;
   }
-  userAssert(knownElements[name] == ElementStub,
-      '%s is already registered. The script tag for ' +
-      '%s is likely included twice in the page.', name, name);
+  userAssert(
+    knownElements[name] == ElementStub,
+    '%s is already registered. The script tag for ' +
+      '%s is likely included twice in the page.',
+    name,
+    name
+  );
   knownElements[name] = toClass;
   for (let i = 0; i < stubbedElements.length; i++) {
     const stub = stubbedElements[i];
@@ -64,8 +66,10 @@ export function upgradeOrRegisterElement(win, name, toClass) {
     // 3. A stub was attached. We upgrade which means we replay the
     //    implementation.
     const {element} = stub;
-    if (element.tagName.toLowerCase() == name &&
-            element.ownerDocument.defaultView == win) {
+    if (
+      element.tagName.toLowerCase() == name &&
+      element.ownerDocument.defaultView == win
+    ) {
       tryUpgradeElementNoInline(element, toClass);
       // Remove element from array.
       stubbedElements.splice(i--, 1);
@@ -73,7 +77,6 @@ export function upgradeOrRegisterElement(win, name, toClass) {
   }
 }
 
-
 /**
  * This method should not be inlined to prevent TryCatch deoptimization.
  * NoInline keyword at the end of function name also prevents Closure compiler
@@ -90,7 +93,6 @@ function tryUpgradeElementNoInline(element, toClass) {
   }
 }
 
-
 /**
  * Stub extended elements missing an implementation. It can be called multiple
  * times and on partial document in order to start stubbing as early as
@@ -105,7 +107,6 @@ export function stubElementsForDoc(ampdoc) {
   });
 }
 
-
 /**
  * Stub element if not yet known.
  * @param {!Window} win
@@ -118,7 +119,6 @@ export function stubElementIfNotKnown(win, name) {
   }
 }
 
-
 /**
  * Copies the specified element to child window (friendly iframe). This way
  * all implementations of the AMP elements are shared between all friendly
@@ -132,7 +132,6 @@ export function copyElementToChildWindow(parentWin, childWin, name) {
   registerElement(childWin, name, toClass || ElementStub);
 }
 
-
 /**
  * Registers a new custom element with its implementation class.
  * @param {!Window} win The window in which to register the elements.
@@ -154,7 +153,6 @@ export function registerElement(win, name, implementationClass) {
   }
 }
 
-
 /**
  * In order to provide better error messages we only allow to retrieve
  * services from other elements if those elements are loaded in the page.
@@ -170,7 +168,6 @@ export function markElementScheduledForTesting(win, elementName) {
   }
 }
 
-
 /**
  * Resets our scheduled elements.
  * @param {!Window} win
@@ -183,7 +180,6 @@ export function resetScheduledElementForTesting(win, elementName) {
   }
 }
 
-
 /**
  * Returns a currently registered element class.
  * @param {!Window} win
diff --git a/src/service/document-info-impl.js b/src/service/document-info-impl.js
index 1a46d01675d9..c829146c0268 100644
--- a/src/service/document-info-impl.js
+++ b/src/service/document-info-impl.js
@@ -52,7 +52,6 @@ const filteredLinkRels = ['prefetch', 'preload', 'preconnect', 'dns-prefetch'];
  */
 export let DocumentInfoDef;
 
-
 /**
  * @param {!Node|!./ampdoc-impl.AmpDoc} nodeOrDoc
  */
@@ -60,7 +59,6 @@ export function installDocumentInfoServiceForDoc(nodeOrDoc) {
   return registerServiceBuilderForDoc(nodeOrDoc, 'documentInfo', DocInfo);
 }
 
-
 export class DocInfo {
   /**
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
@@ -81,8 +79,7 @@ export class DocInfo {
     const url = ampdoc.getUrl();
     const sourceUrl = getSourceUrl(url);
     const rootNode = ampdoc.getRootNode();
-    let canonicalUrl = rootNode && rootNode.AMP
-        && rootNode.AMP.canonicalUrl;
+    let canonicalUrl = rootNode && rootNode.AMP && rootNode.AMP.canonicalUrl;
     if (!canonicalUrl) {
       const canonicalTag = rootNode.querySelector('link[rel=canonical]');
       canonicalUrl = canonicalTag
@@ -94,7 +91,7 @@ export class DocInfo {
     const metaTags = getMetaTags(ampdoc.win.document);
     const replaceParams = getReplaceParams(ampdoc);
 
-    return this.info_ = {
+    return (this.info_ = {
       /** @return {string} */
       get sourceUrl() {
         return getSourceUrl(ampdoc.getUrl());
@@ -104,11 +101,10 @@ export class DocInfo {
       linkRels,
       metaTags,
       replaceParams,
-    };
+    });
   }
 }
 
-
 /**
  * Returns a relatively low entropy random string.
  * This should be called once per window and then cached for subsequent
@@ -200,8 +196,10 @@ function getMetaTags(doc) {
  */
 function getReplaceParams(ampdoc) {
   // The "amp_r" parameter is only supported for ads.
-  if (!ampdoc.isSingleDoc() ||
-      getProxyServingType(ampdoc.win.location.href) != 'a') {
+  if (
+    !ampdoc.isSingleDoc() ||
+    getProxyServingType(ampdoc.win.location.href) != 'a'
+  ) {
     return null;
   }
   const url = parseUrlDeprecated(ampdoc.win.location.href);
diff --git a/src/service/document-state.js b/src/service/document-state.js
index a7074028cbc7..8993b76cdd6d 100644
--- a/src/service/document-state.js
+++ b/src/service/document-state.js
@@ -39,8 +39,11 @@ export class DocumentState {
     }
 
     /** @private {string|null} */
-    this.visibilityStateProp_ = getVendorJsPropertyName(this.document_,
-        'visibilityState', true);
+    this.visibilityStateProp_ = getVendorJsPropertyName(
+      this.document_,
+      'visibilityState',
+      true
+    );
     if (this.document_[this.visibilityStateProp_] === undefined) {
       this.visibilityStateProp_ = null;
     }
@@ -55,15 +58,17 @@ export class DocumentState {
       const vendorStop = this.hiddenProp_.indexOf('Hidden');
       if (vendorStop != -1) {
         this.visibilityChangeEvent_ =
-            this.hiddenProp_.substring(0, vendorStop) + 'Visibilitychange';
+          this.hiddenProp_.substring(0, vendorStop) + 'Visibilitychange';
       }
     }
 
     /** @private @const {!Function} */
     this.boundOnVisibilityChanged_ = this.onVisibilityChanged_.bind(this);
     if (this.visibilityChangeEvent_) {
-      this.document_.addEventListener(this.visibilityChangeEvent_,
-          this.boundOnVisibilityChanged_);
+      this.document_.addEventListener(
+        this.visibilityChangeEvent_,
+        this.boundOnVisibilityChanged_
+      );
     }
 
     /** @private {?Observable} */
@@ -122,8 +127,11 @@ export class DocumentState {
     }
     if (!this.bodyAvailableObservable_) {
       this.bodyAvailableObservable_ = new Observable();
-      waitForChild(doc.documentElement, () => !!doc.body,
-          this.onBodyAvailable_.bind(this));
+      waitForChild(
+        doc.documentElement,
+        () => !!doc.body,
+        this.onBodyAvailable_.bind(this)
+      );
     }
     return this.bodyAvailableObservable_.add(handler);
   }
@@ -136,7 +144,6 @@ export class DocumentState {
   }
 }
 
-
 /**
  * @param {!Window} window
  */
diff --git a/src/service/extension-location.js b/src/service/extension-location.js
index 16c7693a10fb..1489b032054e 100644
--- a/src/service/extension-location.js
+++ b/src/service/extension-location.js
@@ -62,8 +62,12 @@ function getSinglePassExperimentPath() {
  * @param {boolean=} opt_isLocalDev
  * @return {string}
  */
-export function calculateExtensionScriptUrl(location, extensionId,
-  opt_extensionVersion, opt_isLocalDev) {
+export function calculateExtensionScriptUrl(
+  location,
+  extensionId,
+  opt_extensionVersion,
+  opt_isLocalDev
+) {
   const base = calculateScriptBaseUrl(location, opt_isLocalDev);
   const rtv = getMode().rtvVersion;
   if (opt_extensionVersion == null) {
@@ -86,7 +90,11 @@ export function calculateExtensionScriptUrl(location, extensionId,
  * @return {string}
  */
 export function calculateEntryPointScriptUrl(
-  location, entryPoint, isLocalDev, opt_rtv) {
+  location,
+  entryPoint,
+  isLocalDev,
+  opt_rtv
+) {
   const base = calculateScriptBaseUrl(location, isLocalDev);
   if (opt_rtv) {
     const spPath = getSinglePassExperimentPath();
diff --git a/src/service/extensions-impl.js b/src/service/extensions-impl.js
index 5db8d486a55d..4b47aa368d07 100644
--- a/src/service/extensions-impl.js
+++ b/src/service/extensions-impl.js
@@ -36,15 +36,12 @@ import {
 } from '../service';
 import {getMode} from '../mode';
 import {install as installCustomElements} from '../polyfills/custom-elements';
-import {
-  install as installDOMTokenListToggle,
-} from '../polyfills/domtokenlist-toggle';
+import {install as installDOMTokenListToggle} from '../polyfills/domtokenlist-toggle';
 import {install as installDocContains} from '../polyfills/document-contains';
 import {installImg} from '../../builtins/amp-img';
 import {installLayout} from '../../builtins/amp-layout';
 import {installPixel} from '../../builtins/amp-pixel';
-import {installCustomElements as installRegisterElement} from
-  'document-register-element/build/document-register-element.patched';
+import {installCustomElements as installRegisterElement} from 'document-register-element/build/document-register-element.patched';
 import {installStylesForDoc, installStylesLegacy} from '../style-installer';
 import {isExperimentOn} from '../experiments';
 import {map} from '../utils/object';
@@ -75,7 +72,6 @@ const LOAD_TIMEOUT = 8000;
  */
 let ExtensionElementDef;
 
-
 /**
  * Contains data for the declaration of an extension service.
  *
@@ -83,7 +79,6 @@ let ExtensionElementDef;
  */
 let ExtensionServiceDef;
 
-
 /**
  * The structure that contains the resources declared by an extension.
  *
@@ -94,7 +89,6 @@ let ExtensionServiceDef;
  */
 let ExtensionDef;
 
-
 /**
  * Internal structure that maintains the state of an extension through loading.
  *
@@ -138,13 +132,11 @@ export function installExtensionsService(window) {
   registerServiceBuilder(window, 'extensions', Extensions);
 }
 
-
 /**
  * The services that manages extensions in the runtime.
  * @visibleForTesting
  */
 export class Extensions {
-
   /**
    * @param {!Window} win
    */
@@ -208,11 +200,13 @@ export class Extensions {
    * @return {!Promise<?ExtensionDef>}
    */
   waitForExtension(win, extensionId, opt_timeout) {
-    return /** @type {!Promise<?ExtensionDef>} */ (
-      Services.timerFor(win).timeoutPromise(opt_timeout || LOAD_TIMEOUT,
-          this.waitFor_(
-              this.getExtensionHolder_(extensionId, /* auto */ false)),
-          `Render timeout waiting for extension ${extensionId} to be load.`));
+    return /** @type {!Promise<?ExtensionDef>} */ (Services.timerFor(
+      win
+    ).timeoutPromise(
+      opt_timeout || LOAD_TIMEOUT,
+      this.waitFor_(this.getExtensionHolder_(extensionId, /* auto */ false)),
+      `Render timeout waiting for extension ${extensionId} to be load.`
+    ));
   }
 
   /**
@@ -227,8 +221,11 @@ export class Extensions {
       extensionId = 'amp-ad';
     }
     const holder = this.getExtensionHolder_(extensionId, /* auto */ false);
-    this.insertExtensionScriptIfNeeded_(extensionId, holder,
-        opt_extensionVersion);
+    this.insertExtensionScriptIfNeeded_(
+      extensionId,
+      holder,
+      opt_extensionVersion
+    );
     return this.waitFor_(holder);
   }
 
@@ -250,9 +247,10 @@ export class Extensions {
       return extLoaders[extensionId];
     }
     stubElementIfNotKnown(ampdoc.win, extensionId);
-    return extLoaders[extensionId] = this.preloadExtension(
-        extensionId, opt_extensionVersion)
-        .then(() => this.installExtensionInDoc_(ampdoc, extensionId));
+    return (extLoaders[extensionId] = this.preloadExtension(
+      extensionId,
+      opt_extensionVersion
+    ).then(() => this.installExtensionInDoc_(ampdoc, extensionId)));
   }
 
   /**
@@ -283,8 +281,11 @@ export class Extensions {
    */
   loadElementClass(elementName) {
     return this.preloadExtension(elementName).then(extension => {
-      const element = devAssert(extension.elements[elementName],
-          'Element not found: %s', elementName);
+      const element = devAssert(
+        extension.elements[elementName],
+        'Element not found: %s',
+        elementName
+      );
       return element.implementationClass;
     });
   }
@@ -316,9 +317,15 @@ export class Extensions {
    */
   installElement_(ampdoc, name, implementationClass, css) {
     if (css) {
-      installStylesForDoc(ampdoc, css, () => {
-        this.registerElementInWindow_(ampdoc.win, name, implementationClass);
-      }, /* isRuntimeCss */ false, name);
+      installStylesForDoc(
+        ampdoc,
+        css,
+        () => {
+          this.registerElementInWindow_(ampdoc.win, name, implementationClass);
+        },
+        /* isRuntimeCss */ false,
+        name
+      );
     } else {
       this.registerElementInWindow_(ampdoc.win, name, implementationClass);
     }
@@ -346,16 +353,19 @@ export class Extensions {
    */
   addService(name, implementationClass) {
     const holder = this.getCurrentExtensionHolder_();
-    holder.extension.services.push(/** @type {!ExtensionServiceDef} */ ({
-      serviceName: name,
-      serviceClass: implementationClass,
-    }));
+    holder.extension.services.push(
+      /** @type {!ExtensionServiceDef} */ ({
+        serviceName: name,
+        serviceClass: implementationClass,
+      })
+    );
     this.addDocFactory(ampdoc => {
       registerServiceBuilderForDoc(
-          ampdoc,
-          name,
-          implementationClass,
-          /* instantiate */ true);
+        ampdoc,
+        name,
+        implementationClass,
+        /* instantiate */ true
+      );
     });
   }
 
@@ -373,8 +383,11 @@ export class Extensions {
 
     // If a single-doc mode, or is shadow-doc mode and has AmpDocShell,
     // run factory right away if it's included by the doc.
-    if (this.currentExtensionId_ && (this.ampdocService_.isSingleDoc() ||
-        this.ampdocService_.hasAmpDocShell())) {
+    if (
+      this.currentExtensionId_ &&
+      (this.ampdocService_.isSingleDoc() ||
+        this.ampdocService_.hasAmpDocShell())
+    ) {
       const ampdoc = this.ampdocService_.getAmpDoc(this.win.document);
       const extensionId = dev().assertString(this.currentExtensionId_);
       // Note that this won't trigger for FIE extensions that are not present
@@ -432,8 +445,11 @@ export class Extensions {
    * @return {!Promise}
    * @restricted
    */
-  installExtensionsInChildWindow(childWin, extensionIds,
-    opt_preinstallCallback) {
+  installExtensionsInChildWindow(
+    childWin,
+    extensionIds,
+    opt_preinstallCallback
+  ) {
     const topWin = this.win;
     const parentWin = toWin(childWin.frameElement.ownerDocument.defaultView);
     setParentWindow(childWin, parentWin);
@@ -442,8 +458,13 @@ export class Extensions {
     installPolyfillsInChildWindow(parentWin, childWin);
 
     // Install runtime styles.
-    installStylesLegacy(childWin.document, cssText, /* callback */ null,
-        /* opt_isRuntimeCss */ true, /* opt_ext */ 'amp-runtime');
+    installStylesLegacy(
+      childWin.document,
+      cssText,
+      /* callback */ null,
+      /* opt_isRuntimeCss */ true,
+      /* opt_ext */ 'amp-runtime'
+    );
 
     // Run pre-install callback.
     if (opt_preinstallCallback) {
@@ -479,19 +500,21 @@ export class Extensions {
           const elementPromise = new Promise(resolve => {
             if (elementDef.css) {
               installStylesLegacy(
-                  childWin.document,
-                  elementDef.css,
-                  /* completeCallback */ resolve,
-                  /* isRuntime */ false,
-                  extensionId);
+                childWin.document,
+                elementDef.css,
+                /* completeCallback */ resolve,
+                /* isRuntime */ false,
+                extensionId
+              );
             } else {
               resolve();
             }
           }).then(() => {
             upgradeOrRegisterElement(
-                childWin,
-                elementName,
-                elementDef.implementationClass);
+              childWin,
+              elementName,
+              elementDef.implementationClass
+            );
           });
           if (elementPromises) {
             elementPromises.push(elementPromise);
@@ -550,8 +573,9 @@ export class Extensions {
       dev().error(TAG, 'unknown extension for ', opt_forName);
     }
     return this.getExtensionHolder_(
-        this.currentExtensionId_ || UNKNOWN_EXTENSION,
-        /* auto */ true);
+      this.currentExtensionId_ || UNKNOWN_EXTENSION,
+      /* auto */ true
+    );
   }
 
   /**
@@ -586,8 +610,10 @@ export class Extensions {
    */
   insertExtensionScriptIfNeeded_(extensionId, holder, opt_extensionVersion) {
     if (this.isExtensionScriptRequired_(extensionId, holder)) {
-      const scriptElement =
-          this.createExtensionScript_(extensionId, opt_extensionVersion);
+      const scriptElement = this.createExtensionScript_(
+        extensionId,
+        opt_extensionVersion
+      );
       this.win.document.head.appendChild(scriptElement);
       holder.scriptPresent = true;
     }
@@ -605,8 +631,9 @@ export class Extensions {
       return false;
     }
     if (holder.scriptPresent === undefined) {
-      const scriptInHead = this.win.document.head./*OK*/querySelector(
-          `[custom-element="${extensionId}"]`);
+      const scriptInHead = this.win.document.head./*OK*/ querySelector(
+        `[custom-element="${extensionId}"]`
+      );
       holder.scriptPresent = !!scriptInHead;
     }
     return !holder.scriptPresent;
@@ -626,10 +653,9 @@ export class Extensions {
       opt_extensionVersion = '';
     } else {
       scriptElement.setAttribute(
-          isTemplateExtension(extensionId)
-            ? 'custom-template'
-            : 'custom-element',
-          extensionId);
+        isTemplateExtension(extensionId) ? 'custom-template' : 'custom-element',
+        extensionId
+      );
     }
     scriptElement.setAttribute('data-script', extensionId);
     scriptElement.setAttribute('i-amphtml-inserted', '');
@@ -637,8 +663,12 @@ export class Extensions {
     if (getMode().test && this.win.testLocation) {
       loc = this.win.testLocation;
     }
-    const scriptSrc = calculateExtensionScriptUrl(loc, extensionId,
-        opt_extensionVersion, getMode().localDev);
+    const scriptSrc = calculateExtensionScriptUrl(
+      loc,
+      extensionId,
+      opt_extensionVersion,
+      getMode().localDev
+    );
     scriptElement.src = scriptSrc;
     return scriptElement;
   }
@@ -655,7 +685,6 @@ export function installBuiltinElements(win) {
   installLayout(win);
 }
 
-
 /**
  * Copy builtins to a child window.
  * @param {!Window} parentWin
@@ -666,7 +695,6 @@ function copyBuiltinElementsToChildWindow(parentWin, childWin) {
   copyElementToChildWindow(parentWin, childWin, 'amp-pixel');
 }
 
-
 /**
  * @param {!Window} win
  */
@@ -676,7 +704,6 @@ export function stubLegacyElements(win) {
   });
 }
 
-
 /**
  * Install polyfills in the child window (friendly iframe).
  * @param {!Window} parentWin
@@ -689,15 +716,16 @@ function installPolyfillsInChildWindow(parentWin, childWin) {
   // TODO(jridgewell): Ship custom-elements-v1. For now, we use this hack so it
   // is DCE'd from production builds. Note: When the hack is removed, remove the
   // @suppress {suspiciousCode} annotation at the top of this function.
-  if ((false && isExperimentOn(parentWin, 'custom-elements-v1')) ||
-      getMode().test) {
+  if (
+    (false && isExperimentOn(parentWin, 'custom-elements-v1')) ||
+    getMode().test
+  ) {
     installCustomElements(childWin);
   } else {
     installRegisterElement(childWin, 'auto');
   }
 }
 
-
 /**
  * Adopt predefined core services for the child window (friendly iframe).
  * @param {!Window} childWin
@@ -705,8 +733,10 @@ function installPolyfillsInChildWindow(parentWin, childWin) {
  * @visibleForTesting
  */
 export function installStandardServicesInEmbed(childWin, parentWin) {
-  const frameElement = dev().assertElement(childWin.frameElement,
-      'frameElement not found for embed');
+  const frameElement = dev().assertElement(
+    childWin.frameElement,
+    'frameElement not found for embed'
+  );
   const standardServices = [
     // The order of service adoptations is important.
     Services.urlForDoc(frameElement),
@@ -722,7 +752,6 @@ export function installStandardServicesInEmbed(childWin, parentWin) {
   });
 }
 
-
 /**
  * @return {!Object}
  */
diff --git a/src/service/fixed-layer.js b/src/service/fixed-layer.js
index d617734fb91b..3e5f15ced318 100644
--- a/src/service/fixed-layer.js
+++ b/src/service/fixed-layer.js
@@ -27,11 +27,7 @@ import {
   setStyles,
   toggle,
 } from '../style';
-import {
-  closest,
-  domOrderComparator,
-  matches,
-} from '../dom';
+import {closest, domOrderComparator, matches} from '../dom';
 import {dev, user} from '../log';
 import {endsWith} from '../string';
 import {isExperimentOn} from '../experiments';
@@ -134,11 +130,16 @@ export class FixedLayer {
       transferLayer.setLightboxMode(true);
     }
 
-    if (isExperimentOn(this.ampdoc.win, 'fixed-elements-in-lightbox')
-        && opt_lightbox && opt_onComplete) {
+    if (
+      isExperimentOn(this.ampdoc.win, 'fixed-elements-in-lightbox') &&
+      opt_lightbox &&
+      opt_onComplete
+    ) {
       opt_onComplete.then(() => {
-        this.scanNode_(dev().assertElement(opt_lightbox),
-            /* lightboxMode */ true);
+        this.scanNode_(
+          dev().assertElement(opt_lightbox),
+          /* lightboxMode */ true
+        );
       });
     }
   }
@@ -182,12 +183,14 @@ export class FixedLayer {
         return;
       }
       const {disabled, ownerNode} = stylesheet;
-      if (disabled ||
-          !ownerNode ||
-          ownerNode.tagName != 'STYLE' ||
-          ownerNode.hasAttribute('amp-boilerplate') ||
-          ownerNode.hasAttribute('amp-runtime') ||
-          ownerNode.hasAttribute('amp-extension')) {
+      if (
+        disabled ||
+        !ownerNode ||
+        ownerNode.tagName != 'STYLE' ||
+        ownerNode.hasAttribute('amp-boilerplate') ||
+        ownerNode.hasAttribute('amp-runtime') ||
+        ownerNode.hasAttribute('amp-extension')
+      ) {
         continue;
       }
       // Don't dereference cssRules early to avoid "Cannot access rules"
@@ -203,9 +206,12 @@ export class FixedLayer {
 
     const platform = Services.platformFor(this.ampdoc.win);
     if (this.elements_.length > 0 && !this.transfer_ && platform.isIos()) {
-      user().warn(TAG, 'Please test this page inside of an AMP Viewer such' +
-          ' as Google\'s because the fixed or sticky positioning might have' +
-          ' slightly different layout.');
+      user().warn(
+        TAG,
+        'Please test this page inside of an AMP Viewer such' +
+          " as Google's because the fixed or sticky positioning might have" +
+          ' slightly different layout.'
+      );
     }
   }
 
@@ -329,10 +335,11 @@ export class FixedLayer {
    */
   addElement(element, opt_forceTransfer) {
     this.setupElement_(
-        element,
-        /* selector */ '*',
-        /* position */ 'fixed',
-        opt_forceTransfer);
+      element,
+      /* selector */ '*',
+      /* position */ 'fixed',
+      opt_forceTransfer
+    );
     this.sortInDomOrder_();
 
     // If this is the first element, we need to start the mutation observer.
@@ -400,7 +407,8 @@ export class FixedLayer {
     // Some of the elements may no longer be in DOM.
     /** @type {!Array<!ElementDef>} */
     const toRemove = this.elements_.filter(
-        fe => !this.ampdoc.contains(fe.element));
+      fe => !this.ampdoc.contains(fe.element)
+    );
     toRemove.forEach(fe => this.tearDownElement_(fe.element));
 
     if (this.elements_.length == 0) {
@@ -414,145 +422,147 @@ export class FixedLayer {
     // potentially fixed/sticky element turns out to be actually fixed/sticky,
     // it will be decorated and possibly moved to a separate layer.
     let hasTransferables = false;
-    return this.vsync_.runPromise({
-      measure: state => {
-        const elements = this.elements_;
-        const autoTops = [];
-        const {win} = this.ampdoc;
-
-        // Notice that this code intentionally breaks vsync contract.
-        // Unfortunately, there's no way to reliably test whether or not
-        // `top` has been set to a non-auto value on all platforms. To work
-        // this around, this code compares `style.top` values with a new
-        // `style.bottom` value.
-        // 1. Unset top from previous mutates and set bottom to an extremely
-        // large value (to catch cases where sticky-tops are in a long way
-        // down inside a scroller).
-        for (let i = 0; i < elements.length; i++) {
-          setImportantStyles(elements[i].element, {
-            top: '',
-            bottom: '-9999vh',
-            transition: 'none',
-          });
-        }
-        // 2. Capture the `style.top` with this new `style.bottom` value. If
-        // this element has a non-auto top, this value will remain constant
-        // regardless of bottom.
-        for (let i = 0; i < elements.length; i++) {
-          autoTops.push(computedStyle(win, elements[i].element).top);
-        }
-        // 3. Cleanup the `style.bottom`.
-        for (let i = 0; i < elements.length; i++) {
-          setStyle(elements[i].element, 'bottom', '');
-        }
-
-        for (let i = 0; i < elements.length; i++) {
-          const fe = elements[i];
-          const {element, forceTransfer} = fe;
-          const style = computedStyle(win, element);
-
-          const {offsetWidth, offsetHeight, offsetTop} = element;
-          const {
-            position = '',
-            display = '',
-            bottom,
-            zIndex,
-          } = style;
-          const opacity = parseFloat(style.opacity);
-          const transform = style[getVendorJsPropertyName(style, 'transform')];
-          let {top} = style;
-
-          const isFixed = position === 'fixed' &&
-            (forceTransfer || (offsetWidth > 0 && offsetHeight > 0));
-          const isSticky = endsWith(position, 'sticky');
-          const isDisplayed = (display !== 'none');
-
-          if (!isDisplayed || !(isFixed || isSticky)) {
-            state[fe.id] = {
-              fixed: false,
-              sticky: false,
-              transferrable: false,
-              top: '',
-              zIndex: '',
-            };
-            continue;
-          }
-
-          if (top === 'auto' || autoTops[i] !== top) {
-            if (isFixed &&
-                offsetTop === this.committedPaddingTop_ + this.borderTop_) {
-              top = '0px';
-            } else {
-              top = '';
+    return this.vsync_
+      .runPromise(
+        {
+          measure: state => {
+            const elements = this.elements_;
+            const autoTops = [];
+            const {win} = this.ampdoc;
+
+            // Notice that this code intentionally breaks vsync contract.
+            // Unfortunately, there's no way to reliably test whether or not
+            // `top` has been set to a non-auto value on all platforms. To work
+            // this around, this code compares `style.top` values with a new
+            // `style.bottom` value.
+            // 1. Unset top from previous mutates and set bottom to an extremely
+            // large value (to catch cases where sticky-tops are in a long way
+            // down inside a scroller).
+            for (let i = 0; i < elements.length; i++) {
+              setImportantStyles(elements[i].element, {
+                top: '',
+                bottom: '-9999vh',
+                transition: 'none',
+              });
+            }
+            // 2. Capture the `style.top` with this new `style.bottom` value. If
+            // this element has a non-auto top, this value will remain constant
+            // regardless of bottom.
+            for (let i = 0; i < elements.length; i++) {
+              autoTops.push(computedStyle(win, elements[i].element).top);
+            }
+            // 3. Cleanup the `style.bottom`.
+            for (let i = 0; i < elements.length; i++) {
+              setStyle(elements[i].element, 'bottom', '');
             }
-          }
 
-          // Transferability requires an element to be:
-          // 1. Greater than 0% opacity. That's a lot of work for no benefit.
-          //    Additionally, transparent elements used for "service" needs and
-          //    thus best kept in the original tree. The visibility, however,
-          //    is not considered because `visibility` CSS is inherited.
-          // 2. Height < 300. This avoids transferring large sections of UI,
-          //    e.g. publisher-customized amp-consent UI (#17995).
-          // 3. Has `top` or `bottom` CSS set. This ensures we only transfer
-          //    fixed elements that are _not_ auto-positioned to avoid jumping
-          //    position after transferring to the fixed layer (due to loss of
-          //    parent positioning context). We could calculate this offset, but
-          //    we don't (yet).
-          let isTransferrable = false;
-          if (isFixed) {
-            if (forceTransfer === true) {
-              isTransferrable = true;
-            } else if (forceTransfer === false) {
-              isTransferrable = false;
-            } else {
-              isTransferrable = (
-                opacity > 0 &&
-                offsetHeight < 300 &&
-                !!(top || bottom));
+            for (let i = 0; i < elements.length; i++) {
+              const fe = elements[i];
+              const {element, forceTransfer} = fe;
+              const style = computedStyle(win, element);
+
+              const {offsetWidth, offsetHeight, offsetTop} = element;
+              const {position = '', display = '', bottom, zIndex} = style;
+              const opacity = parseFloat(style.opacity);
+              const transform =
+                style[getVendorJsPropertyName(style, 'transform')];
+              let {top} = style;
+
+              const isFixed =
+                position === 'fixed' &&
+                (forceTransfer || (offsetWidth > 0 && offsetHeight > 0));
+              const isSticky = endsWith(position, 'sticky');
+              const isDisplayed = display !== 'none';
+
+              if (!isDisplayed || !(isFixed || isSticky)) {
+                state[fe.id] = {
+                  fixed: false,
+                  sticky: false,
+                  transferrable: false,
+                  top: '',
+                  zIndex: '',
+                };
+                continue;
+              }
+
+              if (top === 'auto' || autoTops[i] !== top) {
+                if (
+                  isFixed &&
+                  offsetTop === this.committedPaddingTop_ + this.borderTop_
+                ) {
+                  top = '0px';
+                } else {
+                  top = '';
+                }
+              }
+
+              // Transferability requires an element to be:
+              // 1. Greater than 0% opacity. That's a lot of work for no benefit.
+              //    Additionally, transparent elements used for "service" needs and
+              //    thus best kept in the original tree. The visibility, however,
+              //    is not considered because `visibility` CSS is inherited.
+              // 2. Height < 300. This avoids transferring large sections of UI,
+              //    e.g. publisher-customized amp-consent UI (#17995).
+              // 3. Has `top` or `bottom` CSS set. This ensures we only transfer
+              //    fixed elements that are _not_ auto-positioned to avoid jumping
+              //    position after transferring to the fixed layer (due to loss of
+              //    parent positioning context). We could calculate this offset, but
+              //    we don't (yet).
+              let isTransferrable = false;
+              if (isFixed) {
+                if (forceTransfer === true) {
+                  isTransferrable = true;
+                } else if (forceTransfer === false) {
+                  isTransferrable = false;
+                } else {
+                  isTransferrable =
+                    opacity > 0 && offsetHeight < 300 && !!(top || bottom);
+                }
+              }
+              if (isTransferrable) {
+                hasTransferables = true;
+              }
+              state[fe.id] = {
+                fixed: isFixed,
+                sticky: isSticky,
+                transferrable: isTransferrable,
+                top,
+                zIndex,
+                transform,
+              };
             }
-          }
-          if (isTransferrable) {
-            hasTransferables = true;
-          }
-          state[fe.id] = {
-            fixed: isFixed,
-            sticky: isSticky,
-            transferrable: isTransferrable,
-            top,
-            zIndex,
-            transform,
-          };
-        }
-      },
-      mutate: state => {
-        if (hasTransferables && this.transfer_) {
-          this.getTransferLayer_().update();
-        }
-        const elements = this.elements_;
-        for (let i = 0; i < elements.length; i++) {
-          const fe = elements[i];
-          const feState = state[fe.id];
-
-          // Fix a bug with Safari. For some reason, you cannot unset
-          // transition when it's important. You can, however, set it to a valid
-          // non-important value, then unset it.
-          setStyle(fe.element, 'transition', 'none');
-          // Note: This MUST be done after measurements are taken.
-          // Transitions will mess up everything and, depending on when paints
-          // happen, mutates of transition and bottom at the same time may be
-          // make the transition active.
-          setStyle(fe.element, 'transition', '');
-
-          if (feState) {
-            this.mutateElement_(fe, i, feState);
-          }
-        }
-      },
-    }, {}).catch(error => {
-      // Fail silently.
-      dev().error(TAG, 'Failed to mutate fixed elements:', error);
-    });
+          },
+          mutate: state => {
+            if (hasTransferables && this.transfer_) {
+              this.getTransferLayer_().update();
+            }
+            const elements = this.elements_;
+            for (let i = 0; i < elements.length; i++) {
+              const fe = elements[i];
+              const feState = state[fe.id];
+
+              // Fix a bug with Safari. For some reason, you cannot unset
+              // transition when it's important. You can, however, set it to a valid
+              // non-important value, then unset it.
+              setStyle(fe.element, 'transition', 'none');
+              // Note: This MUST be done after measurements are taken.
+              // Transitions will mess up everything and, depending on when paints
+              // happen, mutates of transition and bottom at the same time may be
+              // make the transition active.
+              setStyle(fe.element, 'transition', '');
+
+              if (feState) {
+                this.mutateElement_(fe, i, feState);
+              }
+            }
+          },
+        },
+        {}
+      )
+      .catch(error => {
+        // Fail silently.
+        dev().error(TAG, 'Failed to mutate fixed elements:', error);
+      });
   }
 
   /**
@@ -565,8 +575,7 @@ export class FixedLayer {
    * @param {boolean=} opt_lightboxMode
    * @private
    */
-  trySetupSelectorsNoInline(root, opt_lightboxMode
-  ) {
+  trySetupSelectorsNoInline(root, opt_lightboxMode) {
     try {
       this.setupSelectors_(root, opt_lightboxMode);
     } catch (e) {
@@ -591,16 +600,26 @@ export class FixedLayer {
           // We shouldn't have too many of `fixed` elements.
           break;
         }
-        this.setupElement_(elements[j], fixedSelector, 'fixed',
-            /* opt_forceTransfer */ undefined, opt_lightboxMode);
+        this.setupElement_(
+          elements[j],
+          fixedSelector,
+          'fixed',
+          /* opt_forceTransfer */ undefined,
+          opt_lightboxMode
+        );
       }
     }
     for (let i = 0; i < this.stickySelectors_.length; i++) {
       const stickySelector = this.stickySelectors_[i];
       const elements = root.querySelectorAll(stickySelector);
       for (let j = 0; j < elements.length; j++) {
-        this.setupElement_(elements[j], stickySelector, 'sticky',
-            /* opt_forceTransfer */ undefined, opt_lightboxMode);
+        this.setupElement_(
+          elements[j],
+          stickySelector,
+          'sticky',
+          /* opt_forceTransfer */ undefined,
+          opt_lightboxMode
+        );
       }
     }
   }
@@ -613,11 +632,17 @@ export class FixedLayer {
    * @private
    */
   warnAboutInlineStylesIfNecessary_(element) {
-    if (element.hasAttribute('style')
-        && (getStyle(element, 'top') || getStyle(element, 'bottom'))) {
-      user().error(TAG, 'Inline styles with `top`, `bottom` and other ' +
+    if (
+      element.hasAttribute('style') &&
+      (getStyle(element, 'top') || getStyle(element, 'bottom'))
+    ) {
+      user().error(
+        TAG,
+        'Inline styles with `top`, `bottom` and other ' +
           'CSS rules are not supported yet for fixed or sticky elements ' +
-          '(#14186). Unexpected behavior may occur.', element);
+          '(#14186). Unexpected behavior may occur.',
+        element
+      );
     }
   }
 
@@ -636,7 +661,11 @@ export class FixedLayer {
    * @private
    */
   setupElement_(
-    element, selector, position, opt_forceTransfer, opt_lightboxMode
+    element,
+    selector,
+    position,
+    opt_forceTransfer,
+    opt_lightboxMode
   ) {
     // Warn that pub-authored inline styles may be overriden by FixedLayer.
     this.warnAboutInlineStylesIfNecessary_(element);
@@ -667,7 +696,7 @@ export class FixedLayer {
       }
     } else {
       // A new entry.
-      const id = 'F' + (this.counter_++);
+      const id = 'F' + this.counter_++;
       element.setAttribute('i-amphtml-fixedid', id);
       if (isFixed) {
         element[DECLARED_FIXED_PROP] = true;
@@ -742,12 +771,15 @@ export class FixedLayer {
 
     fe.fixedNow = state.fixed;
     fe.stickyNow = state.sticky;
-    fe.top = (state.fixed || state.sticky) ? state.top : '';
+    fe.top = state.fixed || state.sticky ? state.top : '';
     fe.transform = state.transform;
 
     // Move back to the BODY layer and reset transfer z-index.
-    if (oldFixed && (!state.fixed || !state.transferrable) &&
-        this.transferLayer_) {
+    if (
+      oldFixed &&
+      (!state.fixed || !state.transferrable) &&
+      this.transferLayer_
+    ) {
       this.transferLayer_.returnFrom(fe);
     }
 
@@ -766,8 +798,11 @@ export class FixedLayer {
           setStyle(element, 'top', state.top);
         } else {
           // When the header is not shown, we need to subtract the padding top.
-          setStyle(element, 'top',
-              `calc(${state.top} - ${this.committedPaddingTop_}px)`);
+          setStyle(
+            element,
+            'top',
+            `calc(${state.top} - ${this.committedPaddingTop_}px)`
+          );
         }
       }
     }
@@ -787,10 +822,9 @@ export class FixedLayer {
       return this.transferLayer_;
     }
     const doc = this.ampdoc.win.document;
-    this.transferLayer_ =
-        doc.body.shadowRoot ?
-          new TransferLayerShadow(doc, this.vsync_) :
-          new TransferLayerBody(doc, this.vsync_);
+    this.transferLayer_ = doc.body.shadowRoot
+      ? new TransferLayerShadow(doc, this.vsync_)
+      : new TransferLayerBody(doc, this.vsync_);
     return this.transferLayer_;
   }
 
@@ -802,8 +836,10 @@ export class FixedLayer {
   discoverSelectors_(rules) {
     for (let i = 0; i < rules.length; i++) {
       const rule = rules[i];
-      if (rule.type == /* CSSMediaRule */ 4 ||
-          rule.type == /* CSSSupportsRule */ 12) {
+      if (
+        rule.type == /* CSSMediaRule */ 4 ||
+        rule.type == /* CSSSupportsRule */ 12
+      ) {
         this.discoverSelectors_(rule.cssRules);
         continue;
       }
@@ -824,7 +860,6 @@ export class FixedLayer {
   }
 }
 
-
 /**
  * @typedef {{
  *   id: string,
@@ -842,7 +877,6 @@ export class FixedLayer {
  */
 let ElementDef;
 
-
 /**
  * @typedef {{
  *   fixed: boolean,
@@ -854,13 +888,11 @@ let ElementDef;
  */
 let ElementStateDef;
 
-
 /**
  * The contract for transfer layer.
  * @interface
  */
 class TransferLayerDef {
-
   /**
    * @return {!Element}
    */
@@ -892,7 +924,6 @@ class TransferLayerDef {
   returnFrom(unusedFe) {}
 }
 
-
 /**
  * The parallel `<body>` element is created and fixed elements are moved into
  * this element.
@@ -911,8 +942,10 @@ class TransferLayerBody {
     this.vsync_ = vsync;
 
     /** @private @const {boolean} */
-    this.isLightboxExperimentOn_ =
-        isExperimentOn(toWin(doc.defaultView), 'fixed-elements-in-lightbox');
+    this.isLightboxExperimentOn_ = isExperimentOn(
+      toWin(doc.defaultView),
+      'fixed-elements-in-lightbox'
+    );
 
     /** @private @const {!Element} */
     this.layer_ = doc.body.cloneNode(/* deep */ false);
@@ -996,8 +1029,11 @@ class TransferLayerBody {
     }
     for (let i = 0; i < layerAttrs.length; i++) {
       const {name} = layerAttrs[i];
-      if (name === 'style' || name === LIGHTBOX_MODE_ATTR
-          || body.hasAttribute(name)) {
+      if (
+        name === 'style' ||
+        name === LIGHTBOX_MODE_ATTR ||
+        body.hasAttribute(name)
+      ) {
         continue;
       }
       layer.removeAttribute(name);
@@ -1013,21 +1049,29 @@ class TransferLayerBody {
     }
 
     dev().fine(TAG, 'transfer to fixed:', fe.id, fe.element);
-    user().warn(TAG, 'In order to improve scrolling performance in Safari,' +
-        ' we now move the element to a fixed positioning layer:', fe.element);
+    user().warn(
+      TAG,
+      'In order to improve scrolling performance in Safari,' +
+        ' we now move the element to a fixed positioning layer:',
+      fe.element
+    );
 
     if (!fe.placeholder) {
       // Never been transfered before: ensure that it's properly configured.
       setStyle(element, 'pointer-events', 'initial');
-      const placeholder = fe.placeholder = this.doc_.createElement(
-          'i-amphtml-fpa');
+      const placeholder = (fe.placeholder = this.doc_.createElement(
+        'i-amphtml-fpa'
+      ));
       toggle(placeholder, false);
       placeholder.setAttribute('i-amphtml-fixedid', fe.id);
     }
 
     // Calculate z-index based on the declared z-index and DOM position.
-    setStyle(element, 'zIndex',
-        `calc(${10000 + index} + ${state.zIndex || 0})`);
+    setStyle(
+      element,
+      'zIndex',
+      `calc(${10000 + index} + ${state.zIndex || 0})`
+    );
 
     // Identify lightboxed elements so they can be visible when the transfer
     // layer is "hidden", and hidden with the transfer layer is "visible".
@@ -1040,13 +1084,16 @@ class TransferLayerBody {
 
     // Test if the element still matches one of the `fixed` selectors. If not
     // return it back to BODY.
-    const matches = fe.selectors.some(
-        selector => this.matches_(element, selector));
+    const matches = fe.selectors.some(selector =>
+      this.matches_(element, selector)
+    );
     if (!matches) {
-      user().warn(TAG,
-          'Failed to move the element to the fixed position layer.' +
+      user().warn(
+        TAG,
+        'Failed to move the element to the fixed position layer.' +
           ' This is most likely due to the compound CSS selector:',
-          fe.element);
+        fe.element
+      );
       this.returnFrom(fe);
     }
   }
@@ -1088,10 +1135,8 @@ class TransferLayerBody {
   }
 }
 
-
 const FIXED_LAYER_SLOT = 'i-amphtml-fixed';
 
-
 /**
  * The fixed layer is created inside the shadow root of the `<body>` element
  * and fixed elements are distributed into this element via slots.
@@ -1148,8 +1193,12 @@ class TransferLayerShadow {
     const {element} = fe;
 
     dev().fine(TAG, 'transfer to fixed:', fe.id, fe.element);
-    user().warn(TAG, 'In order to improve scrolling performance in Safari,' +
-        ' we now move the element to a fixed positioning layer:', fe.element);
+    user().warn(
+      TAG,
+      'In order to improve scrolling performance in Safari,' +
+        ' we now move the element to a fixed positioning layer:',
+      fe.element
+    );
 
     // Distribute to the slot.
     element.setAttribute('slot', FIXED_LAYER_SLOT);
diff --git a/src/service/hidden-observer-impl.js b/src/service/hidden-observer-impl.js
index a6a28ae7bd13..f63f925c4c45 100644
--- a/src/service/hidden-observer-impl.js
+++ b/src/service/hidden-observer-impl.js
@@ -49,7 +49,7 @@ export class HiddenObserver {
     const doc = this.root_.ownerDocument || this.root_;
 
     /** @const {!Window} */
-    this.win_ = /** @type {!Window} */(devAssert(doc.defaultView));
+    this.win_ = /** @type {!Window} */ (devAssert(doc.defaultView));
 
     /** @private {?MutationObserver} */
     this.mutationObserver_ = null;
@@ -60,8 +60,11 @@ export class HiddenObserver {
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(embedWin, 'hidden-observer',
-        new HiddenObserver(ampdoc, embedWin.document));
+    installServiceInEmbedScope(
+      embedWin,
+      'hidden-observer',
+      new HiddenObserver(ampdoc, embedWin.document)
+    );
   }
 
   /**
diff --git a/src/service/history-impl.js b/src/service/history-impl.js
index 78286e1acfa6..b2f201018ec6 100644
--- a/src/service/history-impl.js
+++ b/src/service/history-impl.js
@@ -49,7 +49,6 @@ let HistoryStateUpdateDef;
  * Wraps the browser's History API for viewer support and necessary polyfills.
  */
 export class History {
-
   /**
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
    * @param {!HistoryBindingInterface} binding
@@ -131,8 +130,7 @@ export class History {
    * @return {!Promise}
    */
   replace(opt_stateUpdate) {
-    return this.enque_(() => this.binding_.replace(opt_stateUpdate),
-        'replace');
+    return this.enque_(() => this.binding_.replace(opt_stateUpdate), 'replace');
   }
 
   /**
@@ -275,31 +273,34 @@ export class History {
       promise = Promise.reject(e);
     }
 
-    promise.then(result => {
-      task.resolve(result);
-    }, reason => {
-      dev().error(TAG_, 'failed to execute a task:', reason);
-      // TODO(dvoytenko, #8785): cleanup after tracing.
-      if (task.trace) {
-        task.trace.message += reason;
-        dev().error(TAG_, task.trace);
-      }
-      task.reject(reason);
-    }).then(() => {
-      this.queue_.splice(0, 1);
-      this.deque_();
-    });
+    promise
+      .then(
+        result => {
+          task.resolve(result);
+        },
+        reason => {
+          dev().error(TAG_, 'failed to execute a task:', reason);
+          // TODO(dvoytenko, #8785): cleanup after tracing.
+          if (task.trace) {
+            task.trace.message += reason;
+            dev().error(TAG_, task.trace);
+          }
+          task.reject(reason);
+        }
+      )
+      .then(() => {
+        this.queue_.splice(0, 1);
+        this.deque_();
+      });
   }
 }
 
-
 /**
  * HistoryBindingInterface is an interface that defines an underlying technology
  * behind the {@link History}.
  * @interface
  */
 class HistoryBindingInterface {
-
   /** @protected */
   cleanup() {}
 
@@ -365,7 +366,6 @@ class HistoryBindingInterface {
   updateFragment(unusedFragment) {}
 }
 
-
 /**
  * Implementation of HistoryBindingInterface based on the native window. It uses
  * window.history properties and events.
@@ -375,7 +375,6 @@ class HistoryBindingInterface {
  * @implements {HistoryBindingInterface}
  */
 export class HistoryBindingNatural_ {
-
   /**
    * @param {!Window} win
    */
@@ -392,8 +391,7 @@ export class HistoryBindingNatural_ {
     this.startIndex_ = history.length - 1;
     const state = getState(history);
     if (state && state[HISTORY_PROP_] !== undefined) {
-      this.startIndex_ = Math.min(state[HISTORY_PROP_],
-          this.startIndex_);
+      this.startIndex_ = Math.min(state[HISTORY_PROP_], this.startIndex_);
     }
 
     /** @private {number} */
@@ -420,17 +418,20 @@ export class HistoryBindingNatural_ {
     let pushState, replaceState;
     if (history.pushState && history.replaceState) {
       /** @private @const {function(*, string=, string=)|undefined} */
-      this.origPushState_ = history.originalPushState ||
-          history.pushState.bind(history);
+      this.origPushState_ =
+        history.originalPushState || history.pushState.bind(history);
       /** @private @const {function(*, string=, string=)|undefined} */
-      this.origReplaceState_ = history.originalReplaceState ||
-          history.replaceState.bind(history);
+      this.origReplaceState_ =
+        history.originalReplaceState || history.replaceState.bind(history);
       pushState = (state, opt_title, opt_url) => {
         this.unsupportedState_ = state;
-        this.origPushState_(state, opt_title,
-            // A bug in edge causes paths to become undefined if URL is
-            // undefined, filed here: https://goo.gl/KlImZu
-            opt_url || null);
+        this.origPushState_(
+          state,
+          opt_title,
+          // A bug in edge causes paths to become undefined if URL is
+          // undefined, filed here: https://goo.gl/KlImZu
+          opt_url || null
+        );
       };
       replaceState = (state, opt_title, opt_url) => {
         this.unsupportedState_ = state;
@@ -464,8 +465,9 @@ export class HistoryBindingNatural_ {
     this.replaceState_ = replaceState;
 
     try {
-      this.replaceState_(this.historyState_(this.stackIndex_,
-          /* replace */ true));
+      this.replaceState_(
+        this.historyState_(this.stackIndex_, /* replace */ true)
+      );
     } catch (e) {
       dev().error(TAG_, 'Initial replaceState failed: ' + e.message);
     }
@@ -474,10 +476,15 @@ export class HistoryBindingNatural_ {
     history.replaceState = this.historyReplaceState_.bind(this);
 
     this.popstateHandler_ = e => {
-      const state = /** @type {!JsonObject} */(
-        /** @type {!PopStateEvent} */(e).state);
-      dev().fine(TAG_, 'popstate event: ' + this.win.history.length + ', ' +
-        JSON.stringify(state));
+      const event = /** @type {!PopStateEvent} */ (e);
+      const state = /** @type {!JsonObject} */ (event.state);
+      dev().fine(
+        TAG_,
+        'popstate event: ' +
+          this.win.history.length +
+          ', ' +
+          JSON.stringify(state)
+      );
       this.onHistoryEvent_();
     };
     this.win.addEventListener('popstate', this.popstateHandler_);
@@ -515,9 +522,14 @@ export class HistoryBindingNatural_ {
   push(opt_stateUpdate) {
     return this.whenReady_(() => {
       const newState = this.mergeStateUpdate_(
-          this.getState_(), opt_stateUpdate || {});
-      this.historyPushState_(newState, /* title */ undefined,
-          newState.fragment ? ('#' + newState.fragment) : undefined);
+        this.getState_(),
+        opt_stateUpdate || {}
+      );
+      this.historyPushState_(
+        newState,
+        /* title */ undefined,
+        newState.fragment ? '#' + newState.fragment : undefined
+      );
       return tryResolve(() =>
         this.mergeStateUpdate_(newState, {stackIndex: this.stackIndex_})
       );
@@ -541,11 +553,16 @@ export class HistoryBindingNatural_ {
   replace(opt_stateUpdate = {}) {
     return this.whenReady_(() => {
       const newState = this.mergeStateUpdate_(
-          this.getState_(), opt_stateUpdate || {});
+        this.getState_(),
+        opt_stateUpdate || {}
+      );
       const url = (newState.url || '').replace(/#.*/, '');
       const fragment = newState.fragment ? '#' + newState.fragment : '';
-      this.historyReplaceState_(newState, newState.title,
-          (url || fragment) ? url + fragment : undefined);
+      this.historyReplaceState_(
+        newState,
+        newState.title,
+        url || fragment ? url + fragment : undefined
+      );
       return tryResolve(() =>
         this.mergeStateUpdate_(newState, {stackIndex: this.stackIndex_})
       );
@@ -554,9 +571,11 @@ export class HistoryBindingNatural_ {
 
   /** @override */
   get() {
-    return tryResolve(() => this.mergeStateUpdate_(this.getState_(), {
-      stackIndex: this.stackIndex_,
-    }));
+    return tryResolve(() =>
+      this.mergeStateUpdate_(this.getState_(), {
+        stackIndex: this.stackIndex_,
+      })
+    );
   }
 
   /**
@@ -574,8 +593,10 @@ export class HistoryBindingNatural_ {
   /** @private */
   onHistoryEvent_() {
     let state = this.getState_();
-    dev().fine(TAG_, 'history event: ' + this.win.history.length + ', ' +
-        JSON.stringify(state));
+    dev().fine(
+      TAG_,
+      'history event: ' + this.win.history.length + ', ' + JSON.stringify(state)
+    );
     const stackIndex = state ? state[HISTORY_PROP_] : undefined;
     let newStackIndex = this.stackIndex_;
     const waitingState = this.waitingState_;
@@ -585,8 +606,9 @@ export class HistoryBindingNatural_ {
       // Make sure stack has enough space. Whether we are going forward or
       // backward, the stack should have at least one extra cell.
       newStackIndex = this.win.history.length - 2;
-      this.updateHistoryState_(this.mergeStateUpdate_(state,
-          {stackIndex: newStackIndex}));
+      this.updateHistoryState_(
+        this.mergeStateUpdate_(state, {stackIndex: newStackIndex})
+      );
     }
 
     if (stackIndex == undefined) {
@@ -609,8 +631,9 @@ export class HistoryBindingNatural_ {
 
     // Update the stack, pop squeezed states.
     if (newStackIndex != this.stackIndex_) {
-      this.updateHistoryState_(this.mergeStateUpdate_(state,
-          {stackIndex: newStackIndex}));
+      this.updateHistoryState_(
+        this.mergeStateUpdate_(state, {stackIndex: newStackIndex})
+      );
     }
 
     // User navigation is allowed to move past the starting point of
@@ -634,8 +657,10 @@ export class HistoryBindingNatural_ {
 
   /** @private */
   assertReady_() {
-    devAssert(!this.waitingState_,
-        'The history must not be in the waiting state');
+    devAssert(
+      !this.waitingState_,
+      'The history must not be in the waiting state'
+    );
   }
 
   /**
@@ -701,7 +726,9 @@ export class HistoryBindingNatural_ {
       this.replaceState_(state);
     }
     const newState = this.mergeStateUpdate_(
-        /** @type {!HistoryStateDef} */ (state), {stackIndex});
+      /** @type {!HistoryStateDef} */ (state),
+      {stackIndex}
+    );
     this.updateHistoryState_(newState);
   }
 
@@ -752,7 +779,9 @@ export class HistoryBindingNatural_ {
     state[HISTORY_PROP_] = stackIndex;
     this.replaceState_(state, title, url);
     const newState = this.mergeStateUpdate_(
-        /** @type {!HistoryStateDef} */ (state), {stackIndex});
+      /** @type {!HistoryStateDef} */ (state),
+      {stackIndex}
+    );
     this.updateHistoryState_(newState);
   }
 
@@ -762,11 +791,18 @@ export class HistoryBindingNatural_ {
    */
   updateHistoryState_(historyState) {
     this.assertReady_();
-    historyState.stackIndex = Math.min(historyState.stackIndex,
-        this.win.history.length - 1);
+    historyState.stackIndex = Math.min(
+      historyState.stackIndex,
+      this.win.history.length - 1
+    );
     if (this.stackIndex_ != historyState.stackIndex) {
-      dev().fine(TAG_, 'stack index changed: ' + this.stackIndex_ + ' -> ' +
-          historyState.stackIndex);
+      dev().fine(
+        TAG_,
+        'stack index changed: ' +
+          this.stackIndex_ +
+          ' -> ' +
+          historyState.stackIndex
+      );
       this.stackIndex_ = historyState.stackIndex;
       if (this.onStateUpdated_) {
         this.onStateUpdated_(historyState);
@@ -793,12 +829,17 @@ export class HistoryBindingNatural_ {
    * @return {!HistoryStateDef}
    */
   mergeStateUpdate_(state, update) {
-    const mergedData = /** @type {!JsonObject} */ (
-      Object.assign({}, (state && state.data) || {}, update.data || {})
-    );
-    return /** @type {!HistoryStateDef} */ (
-      Object.assign({}, state || {}, update, {data: mergedData})
-    );
+    const mergedData = /** @type {!JsonObject} */ (Object.assign(
+      {},
+      (state && state.data) || {},
+      update.data || {}
+    ));
+    return /** @type {!HistoryStateDef} */ (Object.assign(
+      {},
+      state || {},
+      update,
+      {data: mergedData}
+    ));
   }
 }
 
@@ -812,7 +853,6 @@ export class HistoryBindingNatural_ {
  * @implements {HistoryBindingInterface}
  */
 export class HistoryBindingVirtual_ {
-
   /**
    * @param {!Window} win
    * @param {!./viewer-impl.Viewer} viewer
@@ -831,8 +871,10 @@ export class HistoryBindingVirtual_ {
     this.onStateUpdated_ = null;
 
     /** @private {!UnlistenDef} */
-    this.unlistenOnHistoryPopped_ = this.viewer_.onMessage('historyPopped',
-        data => this.onHistoryPopped_(data));
+    this.unlistenOnHistoryPopped_ = this.viewer_.onMessage(
+      'historyPopped',
+      data => this.onHistoryPopped_(data)
+    );
   }
 
   /** @override */
@@ -860,18 +902,18 @@ export class HistoryBindingVirtual_ {
    * @override
    */
   push(opt_stateUpdate) {
-    const message = /** @type {!JsonObject} */ (
-      Object.assign({'stackIndex': this.stackIndex_ + 1}, opt_stateUpdate || {})
-    );
-    return this.viewer_.sendMessageAwaitResponse('pushHistory', message)
-        .then(response => {
-          // Return the message if response is undefined.
-          const newState = /** @type {!HistoryStateDef} */ (
-            response || message
-          );
-          this.updateHistoryState_(newState);
-          return newState;
-        });
+    const message = /** @type {!JsonObject} */ (Object.assign(
+      {'stackIndex': this.stackIndex_ + 1},
+      opt_stateUpdate || {}
+    ));
+    return this.viewer_
+      .sendMessageAwaitResponse('pushHistory', message)
+      .then(response => {
+        // Return the message if response is undefined.
+        const newState = /** @type {!HistoryStateDef} */ (response || message);
+        this.updateHistoryState_(newState);
+        return newState;
+      });
   }
 
   /**
@@ -887,15 +929,16 @@ export class HistoryBindingVirtual_ {
       return this.get();
     }
     const message = dict({'stackIndex': this.stackIndex_});
-    return this.viewer_.sendMessageAwaitResponse('popHistory', message)
-        .then(response => {
-          // Return the new stack index if response is undefined.
-          const newState = /** @type {!HistoryStateDef} */ (
-            response || dict({'stackIndex': this.stackIndex_ - 1})
-          );
-          this.updateHistoryState_(newState);
-          return newState;
-        });
+    return this.viewer_
+      .sendMessageAwaitResponse('popHistory', message)
+      .then(response => {
+        // Return the new stack index if response is undefined.
+        const newState =
+          /** @type {!HistoryStateDef} */ (response ||
+          dict({'stackIndex': this.stackIndex_ - 1}));
+        this.updateHistoryState_(newState);
+        return newState;
+      });
   }
 
   /**
@@ -911,8 +954,9 @@ export class HistoryBindingVirtual_ {
       if (!this.viewer_.hasCapability('fullReplaceHistory')) {
         // Full URL replacement requested, but not supported by the viewer.
         // Don't update, and return the current state.
-        const curState = /** @type {!HistoryStateDef} */ (dict(
-            {'stackIndex': this.stackIndex_}));
+        const curState = /** @type {!HistoryStateDef} */ (dict({
+          'stackIndex': this.stackIndex_,
+        }));
         return Promise.resolve(curState);
       }
 
@@ -921,15 +965,21 @@ export class HistoryBindingVirtual_ {
       opt_stateUpdate.url = url;
     }
 
-    const message = /** @type {!JsonObject} */ (
-      Object.assign({'stackIndex': this.stackIndex_}, opt_stateUpdate || {})
-    );
-    return this.viewer_.sendMessageAwaitResponse('replaceHistory', message,
-        /* cancelUnsent */ true).then(response => {
-      const newState = /** @type {!HistoryStateDef} */ (response || message);
-      this.updateHistoryState_(newState);
-      return newState;
-    });
+    const message = /** @type {!JsonObject} */ (Object.assign(
+      {'stackIndex': this.stackIndex_},
+      opt_stateUpdate || {}
+    ));
+    return this.viewer_
+      .sendMessageAwaitResponse(
+        'replaceHistory',
+        message,
+        /* cancelUnsent */ true
+      )
+      .then(response => {
+        const newState = /** @type {!HistoryStateDef} */ (response || message);
+        this.updateHistoryState_(newState);
+        return newState;
+      });
   }
 
   /**
@@ -938,12 +988,14 @@ export class HistoryBindingVirtual_ {
    */
   get() {
     // Not sure why this type coercion is necessary, but CC complains otherwise.
-    return Promise.resolve(/** @type {!HistoryStateDef} */ ({
-      data: undefined,
-      fragment: '',
-      stackIndex: this.stackIndex_,
-      title: '',
-    }));
+    return Promise.resolve(
+      /** @type {!HistoryStateDef} */ ({
+        data: undefined,
+        fragment: '',
+        stackIndex: this.stackIndex_,
+        title: '',
+      })
+    );
   }
 
   /**
@@ -989,19 +1041,23 @@ export class HistoryBindingVirtual_ {
     if (!this.viewer_.hasCapability('fragment')) {
       return Promise.resolve('');
     }
-    return this.viewer_.sendMessageAwaitResponse('getFragment', undefined,
-        /* cancelUnsent */true).then(
-        data => {
-          if (!data) {
-            return '';
-          }
-          let hash = dev().assertString(data);
-          /* Strip leading '#'*/
-          if (hash[0] == '#') {
-            hash = hash.substr(1);
-          }
-          return hash;
-        });
+    return this.viewer_
+      .sendMessageAwaitResponse(
+        'getFragment',
+        undefined,
+        /* cancelUnsent */ true
+      )
+      .then(data => {
+        if (!data) {
+          return '';
+        }
+        let hash = dev().assertString(data);
+        /* Strip leading '#'*/
+        if (hash[0] == '#') {
+          hash = hash.substr(1);
+        }
+        return hash;
+      });
   }
 
   /**
@@ -1017,12 +1073,13 @@ export class HistoryBindingVirtual_ {
       return Promise.resolve();
     }
     return /** @type {!Promise} */ (this.viewer_.sendMessageAwaitResponse(
-        'replaceHistory', dict({'fragment': fragment}),
-        /* cancelUnsent */ true));
+      'replaceHistory',
+      dict({'fragment': fragment}),
+      /* cancelUnsent */ true
+    ));
   }
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  * @return {!History}
@@ -1031,16 +1088,20 @@ export class HistoryBindingVirtual_ {
 function createHistory(ampdoc) {
   const viewer = Services.viewerForDoc(ampdoc);
   let binding;
-  if (viewer.isOvertakeHistory() || getMode(ampdoc.win).test ||
-          ampdoc.win.AMP_TEST_IFRAME) {
+  if (
+    viewer.isOvertakeHistory() ||
+    getMode(ampdoc.win).test ||
+    ampdoc.win.AMP_TEST_IFRAME
+  ) {
     binding = new HistoryBindingVirtual_(ampdoc.win, viewer);
   } else {
     // Only one global "natural" binding is allowed since it works with the
     // global history stack.
     registerServiceBuilder(
-        ampdoc.win,
-        'global-history-binding',
-        HistoryBindingNatural_);
+      ampdoc.win,
+      'global-history-binding',
+      HistoryBindingNatural_
+    );
     binding = getService(ampdoc.win, 'global-history-binding');
   }
   return new History(ampdoc, binding);
diff --git a/src/service/ie-media-bug.js b/src/service/ie-media-bug.js
index 65e3ad69ed0e..8417e3e732c8 100644
--- a/src/service/ie-media-bug.js
+++ b/src/service/ie-media-bug.js
@@ -17,10 +17,8 @@
 import {Services} from '../services';
 import {dev} from '../log';
 
-
 const TAG = 'ie-media-bug';
 
-
 /**
  * An ugly fix for IE's problem with `matchMedia` API, where media queries
  * are evaluated incorrectly. See #2577 for more details. Returns the promise
@@ -65,8 +63,9 @@ function matchMediaIeQuite(win) {
   // In IE `min-width: X` actually compares string `<`, thus we add -1 to
   // `min-width` and add +1 to `max-width`. Given the expression above, it's
   // a non-essential correction by 1px.
-  const q = `(min-width: ${win./*OK*/innerWidth - 1}px)` +
-      ` AND (max-width: ${win./*OK*/innerWidth + 1}px)`;
+  const q =
+    `(min-width: ${win./*OK*/ innerWidth - 1}px)` +
+    ` AND (max-width: ${win./*OK*/ innerWidth + 1}px)`;
   try {
     return win.matchMedia(q).matches;
   } catch (e) {
diff --git a/src/service/jank-meter.js b/src/service/jank-meter.js
index 1ba356a24d44..d711ab6eec05 100644
--- a/src/service/jank-meter.js
+++ b/src/service/jank-meter.js
@@ -23,7 +23,6 @@ import {isExperimentOn} from '../experiments';
 const NTH_FRAME = 200;
 
 export class JankMeter {
-
   /**
    * @param {!Window} win
    */
@@ -98,9 +97,13 @@ export class JankMeter {
         this.longTaskObserver_ = null;
       }
       let batteryDrop = 0;
-      if (this.batteryManager_ && (this.batteryLevelStart_ != null)) {
-        batteryDrop = this.win_.Math.max(0, this.win_.Math.floor(
-            this.batteryManager_.level * 100 - this.batteryLevelStart_));
+      if (this.batteryManager_ && this.batteryLevelStart_ != null) {
+        batteryDrop = this.win_.Math.max(
+          0,
+          this.win_.Math.floor(
+            this.batteryManager_.level * 100 - this.batteryLevelStart_
+          )
+        );
         // bd: Battery Drop
         this.perf_.tickDelta('bd', batteryDrop);
       }
@@ -117,10 +120,12 @@ export class JankMeter {
    * @return {?boolean}
    */
   isEnabled_() {
-    return isJankMeterEnabled(this.win_)
-        || (this.perf_
-            && this.perf_.isPerformanceTrackingOn()
-            && this.totalFrameCnt_ < NTH_FRAME);
+    return (
+      isJankMeterEnabled(this.win_) ||
+      (this.perf_ &&
+        this.perf_.isPerformanceTrackingOn() &&
+        this.totalFrameCnt_ < NTH_FRAME)
+    );
   }
 
   /**
@@ -132,8 +137,8 @@ export class JankMeter {
     const display = htmlFor(doc)`
       <div class="i-amphtml-jank-meter"></div>`;
     display.textContent =
-        `bf:${this.badFrameCnt_}, lts: ${this.longTaskSelf_}, ` +
-        `ltc:${this.longTaskChild_}, bd:${batteryDrop}`;
+      `bf:${this.badFrameCnt_}, lts: ${this.longTaskSelf_}, ` +
+      `ltc:${this.longTaskChild_}, bd:${batteryDrop}`;
     doc.body.appendChild(display);
   }
 
@@ -144,7 +149,8 @@ export class JankMeter {
    */
   calculateGfp_() {
     return this.win_.Math.floor(
-        (this.totalFrameCnt_ - this.badFrameCnt_) / this.totalFrameCnt_ * 100);
+      ((this.totalFrameCnt_ - this.badFrameCnt_) / this.totalFrameCnt_) * 100
+    );
   }
 
   /**
@@ -164,7 +170,9 @@ export class JankMeter {
           if (entries[i].name == 'cross-origin-descendant') {
             this.longTaskChild_ += span;
             user().info(
-                'LONGTASK', `from child frame ${entries[i].duration}ms`);
+              'LONGTASK',
+              `from child frame ${entries[i].duration}ms`
+            );
           } else {
             this.longTaskSelf_ += span;
             dev().info('LONGTASK', `from self frame ${entries[i].duration}ms`);
@@ -201,9 +209,11 @@ function isJankMeterEnabled(win) {
  * @return {boolean}
  */
 export function isLongTaskApiSupported(win) {
-  return !!win.PerformanceObserver
-      && !!win['TaskAttributionTiming']
-      && ('containerName' in win['TaskAttributionTiming'].prototype);
+  return (
+    !!win.PerformanceObserver &&
+    !!win['TaskAttributionTiming'] &&
+    'containerName' in win['TaskAttributionTiming'].prototype
+  );
 }
 
 /**
diff --git a/src/service/layers-impl.js b/src/service/layers-impl.js
index d6a0b3645542..c49a49577a2c 100644
--- a/src/service/layers-impl.js
+++ b/src/service/layers-impl.js
@@ -142,14 +142,19 @@ export class LayoutLayers {
 
     // Destroys the layer tree on document resize, since entirely new CSS may
     // apply to the document now.
-    this.unlisteners_.push(listen(win, 'resize', () => this.onResize_(), {
-      capture: true,
-      passive: true,
-    }));
+    this.unlisteners_.push(
+      listen(win, 'resize', () => this.onResize_(), {
+        capture: true,
+        passive: true,
+      })
+    );
 
     // Declare scrollingElement as the one true scrolling layer.
-    const root = this.declareLayer_(scrollingElement, true,
-        scrollingElementScrollsLikeViewport);
+    const root = this.declareLayer_(
+      scrollingElement,
+      true,
+      scrollingElementScrollsLikeViewport
+    );
 
     /**
      * Stores the most recently scrolled layer.
@@ -315,8 +320,9 @@ export class LayoutLayers {
   dirty(node) {
     // Find a parent layer, or fall back to the root scrolling layer in cases
     // where the node is the scrolling layer (which doesn't have a parent).
-    const layer = LayoutElement.getParentLayer(node) ||
-        LayoutElement.for(this.scrollingElement_);
+    const layer =
+      LayoutElement.getParentLayer(node) ||
+      LayoutElement.for(this.scrollingElement_);
     layer.dirtyMeasurements();
   }
 
@@ -356,9 +362,16 @@ export class LayoutLayers {
    * @private
    */
   listenForScroll_(root) {
-    this.unlisteners_.push(listen(root, 'scroll', event => {
-      this.scrolled_(event);
-    }, {capture: true, passive: true}));
+    this.unlisteners_.push(
+      listen(
+        root,
+        'scroll',
+        event => {
+          this.scrolled_(event);
+        },
+        {capture: true, passive: true}
+      )
+    );
   }
 
   /**
@@ -381,9 +394,10 @@ export class LayoutLayers {
     // root scroller (`document.scrollingElement`) did the scrolling. But, we
     // can't assign a layer to a Document (only Elements), so just pretend it
     // was the scrolling element that scrolled.
-    const scrolled = target.nodeType == Node.ELEMENT_NODE
-      ? dev().assertElement(target)
-      : this.scrollingElement_;
+    const scrolled =
+      target.nodeType == Node.ELEMENT_NODE
+        ? dev().assertElement(target)
+        : this.scrollingElement_;
     let layer = LayoutElement.forOptional(scrolled);
     if (layer && layer.isLayer()) {
       layer.dirtyScrollMeasurements();
@@ -566,7 +580,8 @@ export class LayoutElement {
    */
   static for(element) {
     return /** @type {!LayoutElement} */ (devAssert(
-        LayoutElement.forOptional(element)));
+      LayoutElement.forOptional(element)
+    ));
   }
 
   /**
@@ -602,7 +617,8 @@ export class LayoutElement {
     }
 
     let win = /** @type {!Window } */ (devAssert(
-        node.ownerDocument.defaultView));
+      node.ownerDocument.defaultView
+    ));
     let el = node;
     let op = node;
     let last = node;
@@ -643,7 +659,7 @@ export class LayoutElement {
           // Else, the original node defines its own layer.
           return null;
         }
-        op = op./*OK*/offsetParent;
+        op = op./*OK*/ offsetParent;
       }
 
       last = el;
@@ -664,13 +680,13 @@ export class LayoutElement {
         // Update our window reference if we crossed a FIE boundary.
         if (el) {
           win = /** @type {!Window } */ (devAssert(
-              el.ownerDocument.defaultView));
+            el.ownerDocument.defaultView
+          ));
         }
       }
     }
 
-    devAssert(last.nodeType === Node.DOCUMENT_NODE,
-        'node not in the DOM tree');
+    devAssert(last.nodeType === Node.DOCUMENT_NODE, 'node not in the DOM tree');
     return null;
   }
 
@@ -711,7 +727,7 @@ export class LayoutElement {
 
     // Layers in a parent document may contain children of an FIE.
     if (!sameDocument(element, other)) {
-      const frame = frameParent(/** @type {!Node} */(other.ownerDocument));
+      const frame = frameParent(/** @type {!Node} */ (other.ownerDocument));
       return !!frame && this.contains_(element, frame);
     }
 
@@ -767,8 +783,10 @@ export class LayoutElement {
    * @param {boolean} scrollsLikeViewport
    */
   declareLayer(isRootLayer, scrollsLikeViewport) {
-    devAssert(!scrollsLikeViewport || isRootLayer, 'Only root layers may' +
-      ' scroll like a viewport.');
+    devAssert(
+      !scrollsLikeViewport || isRootLayer,
+      'Only root layers may scroll like a viewport.'
+    );
 
     if (this.isLayer_) {
       return;
@@ -777,7 +795,6 @@ export class LayoutElement {
     this.isRootLayer_ = isRootLayer;
     this.scrollsLikeViewport_ = scrollsLikeViewport;
 
-
     // Ensure the coordinate system is remeasured
     this.needsRemeasure_ = true;
     this.needsScrollRemeasure_ = true;
@@ -805,7 +822,8 @@ export class LayoutElement {
     }
 
     const win = /** @type {!Window } */ (devAssert(
-        element.ownerDocument.defaultView));
+      element.ownerDocument.defaultView
+    ));
     // If it remains fixed, it will still be a layer.
     if (computedStyle(win, element).position === 'fixed') {
       return;
@@ -814,8 +832,8 @@ export class LayoutElement {
     this.isLayer_ = false;
     // Handle if this was a fixed position layer (and therefore had null parent
     // layer).
-    const parent = this.getParentLayer() ||
-        LayoutElement.getParentLayer(element, true);
+    const parent =
+      this.getParentLayer() || LayoutElement.getParentLayer(element, true);
     this.transfer_(/** @type {!LayoutElement} */ (devAssert(parent)));
   }
 
@@ -1153,8 +1171,8 @@ export class LayoutElement {
 
     // Gather, and update whether the layers are descendants of the active
     // layer.
-    let isActive = activeLayer === this ||
-        (!!activeLayer && activeLayer.contains(this));
+    let isActive =
+      activeLayer === this || (!!activeLayer && activeLayer.contains(this));
     devAssert(ANCESTRY_CACHE.length === 0, 'ancestry cache must be empty');
 
     let layer = this;
@@ -1198,9 +1216,12 @@ export class LayoutElement {
       ? parent.relativeScrolledPositionForChildren_(this)
       : positionLt(0, 0);
 
-    this.size_ = sizeWh(element./*OK*/clientWidth, element./*OK*/clientHeight);
+    this.size_ = sizeWh(
+      element./*OK*/ clientWidth,
+      element./*OK*/ clientHeight
+    );
 
-    let {left, top} = element./*OK*/getBoundingClientRect();
+    let {left, top} = element./*OK*/ getBoundingClientRect();
     // Viewport scroller layers are really screwed up. Their positions will
     // **double** count their scroll position (left === -scrollLeft, top ===
     // -scrollTop), which breaks with every other scroll box on the page.
@@ -1208,10 +1229,7 @@ export class LayoutElement {
       left += this.getScrollLeft();
       top += this.getScrollTop();
     }
-    this.position_ = positionLt(
-        left - relative.left,
-        top - relative.top
-    );
+    this.position_ = positionLt(left - relative.left, top - relative.top);
 
     // In dev mode, we freeze the structs to prevent consumer from mutating it.
     // Stateless FTW.
@@ -1239,8 +1257,8 @@ export class LayoutElement {
   updateScrollPosition_() {
     if (this.isLayer_ && this.needsScrollRemeasure_) {
       this.needsScrollRemeasure_ = false;
-      this.scrollLeft_ = this.element_./*OK*/scrollLeft;
-      this.scrollTop_ = this.element_./*OK*/scrollTop;
+      this.scrollLeft_ = this.element_./*OK*/ scrollLeft;
+      this.scrollTop_ = this.element_./*OK*/ scrollTop;
     }
   }
 
@@ -1264,8 +1282,8 @@ export class LayoutElement {
     const {ownerDocument} = this.element_;
     const position = this.getScrolledPosition(ownerDocument.documentElement);
     return positionLt(
-        position.left - this.getScrollLeft(),
-        position.top - this.getScrollTop()
+      position.left - this.getScrollLeft(),
+      position.top - this.getScrollTop()
     );
   }
 }
@@ -1295,7 +1313,7 @@ function frameParent(doc) {
     return defaultView && isInFie(doc.documentElement)
       ? defaultView.frameElement
       : null;
-  } catch (e) { }
+  } catch (e) {}
   return null;
 }
 
@@ -1319,10 +1337,21 @@ function isDestroyed(node) {
  * @param {!Element} scrollingElement
  * @param {boolean} scrollingElementScrollsLikeViewport
  */
-export function installLayersServiceForDoc(ampdoc, scrollingElement,
-  scrollingElementScrollsLikeViewport) {
-  registerServiceBuilderForDoc(ampdoc, 'layers', function(ampdoc) {
-    return new LayoutLayers(ampdoc, scrollingElement,
-        scrollingElementScrollsLikeViewport);
-  }, /* opt_instantiate */ true);
+export function installLayersServiceForDoc(
+  ampdoc,
+  scrollingElement,
+  scrollingElementScrollsLikeViewport
+) {
+  registerServiceBuilderForDoc(
+    ampdoc,
+    'layers',
+    function(ampdoc) {
+      return new LayoutLayers(
+        ampdoc,
+        scrollingElement,
+        scrollingElementScrollsLikeViewport
+      );
+    },
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/localization.js b/src/service/localization.js
index 12adda0603ec..88c2068dc83d 100644
--- a/src/service/localization.js
+++ b/src/service/localization.js
@@ -20,20 +20,17 @@
 import {LocalizedStringId} from '../localized-strings';
 import {closest} from '../dom';
 
-
 /**
  * Language code used if there is no language code specified by the document.
  * @const {string}
  */
 const FALLBACK_LANGUAGE_CODE = 'default';
 
-
 /**
  * @const {!RegExp}
  */
 const LANGUAGE_CODE_CHUNK_REGEX = /\w+/gi;
 
-
 /**
  * Gets the string matching the specified localized string ID in the language
  * specified.
@@ -41,15 +38,19 @@ const LANGUAGE_CODE_CHUNK_REGEX = /\w+/gi;
  * @param {!Array<string>} languageCodes
  * @param {!LocalizedStringId} localizedStringId
  */
-function findLocalizedString(localizedStringBundles, languageCodes,
-  localizedStringId) {
+function findLocalizedString(
+  localizedStringBundles,
+  languageCodes,
+  localizedStringId
+) {
   let localizedString = null;
 
   languageCodes.some(languageCode => {
     const localizedStringBundle = localizedStringBundles[languageCode];
     if (localizedStringBundle && localizedStringBundle[localizedStringId]) {
-      localizedString = localizedStringBundle[localizedStringId].string ||
-          localizedStringBundle[localizedStringId].fallback;
+      localizedString =
+        localizedStringBundle[localizedStringId].string ||
+        localizedStringBundle[localizedStringId].fallback;
       return !!localizedString;
     }
 
@@ -59,7 +60,6 @@ function findLocalizedString(localizedStringBundles, languageCodes,
   return localizedString;
 }
 
-
 /**
  * @param {string} languageCode
  * @return {!Array<string>} A list of language codes.
@@ -70,16 +70,19 @@ export function getLanguageCodesFromString(languageCode) {
     return ['en', FALLBACK_LANGUAGE_CODE];
   }
   const matches = languageCode.match(LANGUAGE_CODE_CHUNK_REGEX) || [];
-  return matches.reduce((fallbackLanguageCodeList, chunk, index) => {
-    const fallbackLanguageCode = matches.slice(0, index + 1)
+  return matches.reduce(
+    (fallbackLanguageCodeList, chunk, index) => {
+      const fallbackLanguageCode = matches
+        .slice(0, index + 1)
         .join('-')
         .toLowerCase();
-    fallbackLanguageCodeList.unshift(fallbackLanguageCode);
-    return fallbackLanguageCodeList;
-  }, [FALLBACK_LANGUAGE_CODE]);
+      fallbackLanguageCodeList.unshift(fallbackLanguageCode);
+      return fallbackLanguageCodeList;
+    },
+    [FALLBACK_LANGUAGE_CODE]
+  );
 }
 
-
 /**
  * Localization service.
  */
@@ -102,7 +105,6 @@ export class LocalizationService {
     this.localizedStringBundles_ = {};
   }
 
-
   /**
    * @param {!Element} element
    * @return {!Array<string>}
@@ -114,7 +116,6 @@ export class LocalizationService {
     return getLanguageCodesFromString(languageCode || '');
   }
 
-
   /**
    * @param {string} languageCode The language code to associate with the
    *     specified localized string bundle.
@@ -127,12 +128,13 @@ export class LocalizationService {
       this.localizedStringBundles_[languageCode] = {};
     }
 
-    Object.assign(this.localizedStringBundles_[languageCode],
-        localizedStringBundle);
+    Object.assign(
+      this.localizedStringBundles_[languageCode],
+      localizedStringBundle
+    );
     return this;
   }
 
-
   /**
    * @param {!LocalizedStringId} localizedStringId
    * @param {!Element=} elementToUse The element where the string will be
@@ -141,11 +143,14 @@ export class LocalizationService {
    *     one exists, or the default otherwise.
    */
   getLocalizedString(localizedStringId, elementToUse = undefined) {
-    const languageCodes = elementToUse ?
-      this.getLanguageCodesForElement_(elementToUse) :
-      this.rootLanguageCodes_;
-
-    return findLocalizedString(this.localizedStringBundles_, languageCodes,
-        localizedStringId);
+    const languageCodes = elementToUse
+      ? this.getLanguageCodesForElement_(elementToUse)
+      : this.rootLanguageCodes_;
+
+    return findLocalizedString(
+      this.localizedStringBundles_,
+      languageCodes,
+      localizedStringId
+    );
   }
 }
diff --git a/src/service/navigation.js b/src/service/navigation.js
index d5dc1b020bf6..f07eb684bc7d 100644
--- a/src/service/navigation.js
+++ b/src/service/navigation.js
@@ -24,10 +24,7 @@ import {
 import {dev, user, userAssert} from '../log';
 import {dict} from '../utils/object';
 import {escapeCssSelectorIdent} from '../css';
-import {
-  getExtraParamsUrl,
-  shouldAppendExtraParams,
-} from '../impression';
+import {getExtraParamsUrl, shouldAppendExtraParams} from '../impression';
 import {getMode} from '../mode';
 import {
   installServiceInEmbedScope,
@@ -65,10 +62,11 @@ export const Priority = {
  */
 export function installGlobalNavigationHandlerForDoc(ampdoc) {
   registerServiceBuilderForDoc(
-      ampdoc,
-      TAG,
-      Navigation,
-      /* opt_instantiate */ true);
+    ampdoc,
+    TAG,
+    Navigation,
+    /* opt_instantiate */ true
+  );
 }
 
 /**
@@ -115,7 +113,7 @@ export class Navigation {
 
     /** @private @const {boolean} */
     this.isIframed_ =
-        isIframed(this.ampdoc.win) && this.viewer_.isOvertakeHistory();
+      isIframed(this.ampdoc.win) && this.viewer_.isOvertakeHistory();
 
     /** @private @const {boolean} */
     this.isEmbed_ = this.rootNode_ != this.ampdoc.getRootNode();
@@ -127,11 +125,11 @@ export class Navigation {
      * Must use URL parsing scoped to `rootNode_` for correct FIE behavior.
      * @private @const {!Element|!ShadowRoot}
      */
-    this.serviceContext_ = /** @type {!Element|!ShadowRoot} */ (
-      (this.rootNode_.nodeType == Node.DOCUMENT_NODE)
+    this.serviceContext_ =
+      /** @type {!Element|!ShadowRoot} */ (this.rootNode_.nodeType ==
+      Node.DOCUMENT_NODE
         ? this.rootNode_.documentElement
-        : this.rootNode_
-    );
+        : this.rootNode_);
 
     /** @private @const {!function(!Event)|undefined} */
     this.boundHandle_ = this.handle_.bind(this);
@@ -164,14 +162,20 @@ export class Navigation {
    * @param {!Window} win
    */
   static installAnchorClickInterceptor(ampdoc, win) {
-    win.document.documentElement.addEventListener('click',
-        maybeExpandUrlParams.bind(null, ampdoc), /* capture */ true);
+    win.document.documentElement.addEventListener(
+      'click',
+      maybeExpandUrlParams.bind(null, ampdoc),
+      /* capture */ true
+    );
   }
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(embedWin, TAG,
-        new Navigation(ampdoc, embedWin.document));
+    installServiceInEmbedScope(
+      embedWin,
+      TAG,
+      new Navigation(ampdoc, embedWin.document)
+    );
   }
 
   /**
@@ -181,7 +185,9 @@ export class Navigation {
     if (this.boundHandle_) {
       this.rootNode_.removeEventListener(EVENT_TYPE_CLICK, this.boundHandle_);
       this.rootNode_.removeEventListener(
-          EVENT_TYPE_CONTEXT_MENU, this.boundHandle_);
+        EVENT_TYPE_CONTEXT_MENU,
+        this.boundHandle_
+      );
     }
   }
 
@@ -227,7 +233,11 @@ export class Navigation {
    * }=} opt_options
    */
   navigateTo(
-    win, url, opt_requestedBy, {target = '_top', opener = false} = {}) {
+    win,
+    url,
+    opt_requestedBy,
+    {target = '_top', opener = false} = {}
+  ) {
     const urlService = Services.urlForDoc(this.serviceContext_);
     if (!urlService.isProtocolValid(url)) {
       user().error(TAG, 'Cannot navigate to invalid protocol: ' + url);
@@ -235,7 +245,9 @@ export class Navigation {
     }
 
     userAssert(
-        VALID_TARGETS.includes(target), `Target '${target}' not supported.`);
+      VALID_TARGETS.includes(target),
+      `Target '${target}' not supported.`
+    );
 
     // If we have a target of "_blank", we will want to open a new window. A
     // target of "_top" should behave like it would on an anchor tag and
@@ -274,10 +286,13 @@ export class Navigation {
    */
   navigateToAmpUrl(url, requestedBy) {
     if (this.viewer_.hasCapability('a2a')) {
-      this.viewer_.sendMessage('a2aNavigate', dict({
-        'url': url,
-        'requestedBy': requestedBy,
-      }));
+      this.viewer_.sendMessage(
+        'a2aNavigate',
+        dict({
+          'url': url,
+          'requestedBy': requestedBy,
+        })
+      );
       return true;
     }
     return false;
@@ -289,9 +304,13 @@ export class Navigation {
    */
   queryA2AFeatures_() {
     const meta = this.rootNode_.querySelector(
-        'meta[name="amp-to-amp-navigation"]');
+      'meta[name="amp-to-amp-navigation"]'
+    );
     if (meta && meta.hasAttribute('content')) {
-      return meta.getAttribute('content').split(',').map(s => s.trim());
+      return meta
+        .getAttribute('content')
+        .split(',')
+        .map(s => s.trim());
     }
     return [];
   }
@@ -451,7 +470,10 @@ export class Navigation {
     if (!target.hasAttribute('rel')) {
       return false;
     }
-    const relations = target.getAttribute('rel').split(' ').map(s => s.trim());
+    const relations = target
+      .getAttribute('rel')
+      .split(' ')
+      .map(s => s.trim());
     if (!relations.includes('amphtml')) {
       return false;
     }
@@ -463,7 +485,6 @@ export class Navigation {
     return false;
   }
 
-
   /**
    * Handles clicking on a link with hash navigation.
    * @param {!Event} e
@@ -474,9 +495,8 @@ export class Navigation {
   handleNavClick_(e, target, tgtLoc) {
     // In test mode, we're not able to properly fix the anchor tag's base URL.
     // So, we have to use the (mocked) window's location instead.
-    const baseHref = getMode().test && !this.isEmbed_
-      ? this.ampdoc.win.location.href
-      : '';
+    const baseHref =
+      getMode().test && !this.isEmbed_ ? this.ampdoc.win.location.href : '';
     const curLoc = this.parseUrl_(baseHref);
     const tgtHref = `${tgtLoc.origin}${tgtLoc.pathname}${tgtLoc.search}`;
     const curHref = `${curLoc.origin}${curLoc.pathname}${curLoc.search}`;
@@ -505,7 +525,9 @@ export class Navigation {
         const internalTargetElmId = tgtLoc.hash.substring(1);
         const internalElm = this.ampdoc.getElementById(internalTargetElmId);
         if (internalElm) {
-          if (!(/^(?:a|select|input|button|textarea)$/i.test(internalElm.tagName))) {
+          if (
+            !/^(?:a|select|input|button|textarea)$/i.test(internalElm.tagName)
+          ) {
             internalElm.tabIndex = -1;
           }
           tryFocus(internalElm);
@@ -530,10 +552,11 @@ export class Navigation {
     let elem = null;
     if (hash) {
       const escapedHash = escapeCssSelectorIdent(hash);
-      elem = (this.rootNode_.getElementById(hash) ||
-          // Fallback to anchor[name] if element with id is not found.
-          // Linking to an anchor element with name is obsolete in html5.
-          this.rootNode_./*OK*/querySelector(`a[name="${escapedHash}"]`));
+      elem =
+        this.rootNode_.getElementById(hash) ||
+        // Fallback to anchor[name] if element with id is not found.
+        // Linking to an anchor element with name is obsolete in html5.
+        this.rootNode_./*OK*/ querySelector(`a[name="${escapedHash}"]`);
     }
 
     // If possible do update the URL with the hash. As explained above
@@ -573,12 +596,16 @@ export class Navigation {
       // failing to calculate the new jumped offset. Without the first call
       // there will be a visual jump due to browser scroll. See
       // https://github.com/ampproject/amphtml/issues/5334 for more details.
-      this.viewport_./*OK*/scrollIntoView(elem);
-      Services.timerFor(this.ampdoc.win).delay(() =>
-        this.viewport_./*OK*/scrollIntoView(dev().assertElement(elem)), 1);
+      this.viewport_./*OK*/ scrollIntoView(elem);
+      Services.timerFor(this.ampdoc.win).delay(
+        () => this.viewport_./*OK*/ scrollIntoView(dev().assertElement(elem)),
+        1
+      );
     } else {
-      dev().warn(TAG,
-          `failed to find element with id=${hash} or a[name=${hash}]`);
+      dev().warn(
+        TAG,
+        `failed to find element with id=${hash} or a[name=${hash}]`
+      );
     }
   }
 
@@ -600,14 +627,16 @@ export class Navigation {
  * @param {!Event} e
  */
 function maybeExpandUrlParams(ampdoc, e) {
-  const target =
-    closestAncestorElementBySelector(dev().assertElement(e.target), 'A');
+  const target = closestAncestorElementBySelector(
+    dev().assertElement(e.target),
+    'A'
+  );
   if (!target || !target.href) {
     // Not a click on a link.
     return;
   }
   const hrefToExpand =
-      target.getAttribute(ORIG_HREF_ATTRIBUTE) || target.getAttribute('href');
+    target.getAttribute(ORIG_HREF_ATTRIBUTE) || target.getAttribute('href');
   if (!hrefToExpand) {
     return;
   }
@@ -620,13 +649,17 @@ function maybeExpandUrlParams(ampdoc, e) {
     },
   };
   const newHref = Services.urlReplacementsForDoc(target).expandUrlSync(
-      hrefToExpand, vars, undefined, /* opt_whitelist */ {
-        // For now we only allow to replace the click location vars
-        // and nothing else.
-        // NOTE: Addition to this whitelist requires additional review.
-        'CLICK_X': true,
-        'CLICK_Y': true,
-      });
+    hrefToExpand,
+    vars,
+    undefined,
+    /* opt_whitelist */ {
+      // For now we only allow to replace the click location vars
+      // and nothing else.
+      // NOTE: Addition to this whitelist requires additional review.
+      'CLICK_X': true,
+      'CLICK_Y': true,
+    }
+  );
   if (newHref != hrefToExpand) {
     // Store original value so that later clicks can be processed with
     // freshest values.
diff --git a/src/service/origin-experiments-impl.js b/src/service/origin-experiments-impl.js
index e067aa9cb3b0..e1c49841110b 100644
--- a/src/service/origin-experiments-impl.js
+++ b/src/service/origin-experiments-impl.js
@@ -31,7 +31,8 @@ const PUBLIC_JWK = /** @type {!webCrypto.JsonWebKey} */ ({
   'ext': true,
   'key_ops': ['verify'],
   'kty': 'RSA',
-  'n': 'uAGSMYKze8Fit508UaGHz1eZowfX4YsA0lmyi-65xQfjF7nMo61c4Iz4erdqgRp-ov662yVPquhPmTxgB-nzNcTPrj15Jo05Js78Q9hS2hrPIjKMlzcKSYQN_08QieWKOSmVbLSv_-4n9Ms5ta8nRs4pwc_2nX5n7m5B5GH4VerGbqIWIn9FRNYMShBRQ9TCHpb6BIUTwUn6iwmJLenq0A1xhGrQ9rswGC1QJhjotkeReKXZDLLWaFr0uRw-IyvRa5RiiEGntgOvcbvamM5TnbKavc2rxvg2TWTCNQnb7lWSAzldJA_yAOYet_MjnHMyj2srUdbQSDCk8kPWWuafiQ', // eslint-disable-line max-len
+  'n':
+    'uAGSMYKze8Fit508UaGHz1eZowfX4YsA0lmyi-65xQfjF7nMo61c4Iz4erdqgRp-ov662yVPquhPmTxgB-nzNcTPrj15Jo05Js78Q9hS2hrPIjKMlzcKSYQN_08QieWKOSmVbLSv_-4n9Ms5ta8nRs4pwc_2nX5n7m5B5GH4VerGbqIWIn9FRNYMShBRQ9TCHpb6BIUTwUn6iwmJLenq0A1xhGrQ9rswGC1QJhjotkeReKXZDLLWaFr0uRw-IyvRa5RiiEGntgOvcbvamM5TnbKavc2rxvg2TWTCNQnb7lWSAzldJA_yAOYet_MjnHMyj2srUdbQSDCk8kPWWuafiQ', // eslint-disable-line max-len
 });
 
 /**
@@ -96,10 +97,11 @@ export class OriginExperiments {
         const meta = metas[i];
         const token = meta.getAttribute('content');
         if (token) {
-          const p = this.tokenMaster_.verifyToken(
-              token, win.location, publicKey).catch(error => {
-            user().error(TAG, 'Failed to verify experiment token:', error);
-          });
+          const p = this.tokenMaster_
+            .verifyToken(token, win.location, publicKey)
+            .catch(error => {
+              user().error(TAG, 'Failed to verify experiment token:', error);
+            });
           promises.push(p);
         } else {
           user().error(TAG, 'Missing content for experiment token: ', meta);
@@ -133,14 +135,18 @@ export class TokenMaster {
    * @protected
    */
   generateKeys() {
-    const generationAlgo = Object.assign({
-      modulusLength: 2048,
-      publicExponent: Uint8Array.of(1, 0, 1),
-    }, this.crypto_.pkcsAlgo);
+    const generationAlgo = Object.assign(
+      {
+        modulusLength: 2048,
+        publicExponent: Uint8Array.of(1, 0, 1),
+      },
+      this.crypto_.pkcsAlgo
+    );
     return this.crypto_.subtle.generateKey(
-        /** @type {{name: string}} */ (generationAlgo),
-        /* extractable */ true,
-        /* keyUsages */ ['sign', 'verify']);
+      /** @type {{name: string}} */ (generationAlgo),
+      /* extractable */ true,
+      /* keyUsages */ ['sign', 'verify']
+    );
   }
 
   /**
@@ -195,31 +201,35 @@ export class TokenMaster {
       const data = bytes.subarray(0, i);
       const signature = bytes.subarray(i);
 
-      resolve(this.verify_(signature, data, publicKey).then(verified => {
-        if (!verified) {
-          throw new Error('Failed to verify token signature.');
-        }
-        // Convert config from bytes to JS object.
-        const configStr = bytesToString(configBytes);
-        const config = parseJson(configStr);
+      resolve(
+        this.verify_(signature, data, publicKey).then(verified => {
+          if (!verified) {
+            throw new Error('Failed to verify token signature.');
+          }
+          // Convert config from bytes to JS object.
+          const configStr = bytesToString(configBytes);
+          const config = parseJson(configStr);
 
-        // Check token experiment origin against `location`.
-        const approvedOrigin = this.url_.parse(config['origin']).origin;
-        const sourceOrigin = getSourceOrigin(location);
-        if (approvedOrigin !== sourceOrigin) {
-          throw new Error(`Config origin (${approvedOrigin}) does not match ` +
-              `window (${sourceOrigin}).`);
-        }
+          // Check token experiment origin against `location`.
+          const approvedOrigin = this.url_.parse(config['origin']).origin;
+          const sourceOrigin = getSourceOrigin(location);
+          if (approvedOrigin !== sourceOrigin) {
+            throw new Error(
+              `Config origin (${approvedOrigin}) does not match ` +
+                `window (${sourceOrigin}).`
+            );
+          }
 
-        // Check token expiration date.
-        const experimentId = config['experiment'];
-        const expiration = config['expiration'];
-        if (expiration >= Date.now()) {
-          return experimentId;
-        } else {
-          throw new Error(`Experiment "${experimentId}" has expired.`);
-        }
-      }));
+          // Check token expiration date.
+          const experimentId = config['experiment'];
+          const expiration = config['expiration'];
+          if (expiration >= Date.now()) {
+            return experimentId;
+          } else {
+            throw new Error(`Experiment "${experimentId}" has expired.`);
+          }
+        })
+      );
     });
   }
 
@@ -289,6 +299,8 @@ export function installOriginExperimentsForDoc(ampdoc) {
  * @return {!OriginExperiments}
  */
 export function originExperimentsForDoc(element) {
-  return /** @type {!OriginExperiments} */ (
-    getServiceForDoc(element, 'origin-experiments'));
+  return /** @type {!OriginExperiments} */ (getServiceForDoc(
+    element,
+    'origin-experiments'
+  ));
 }
diff --git a/src/service/performance-impl.js b/src/service/performance-impl.js
index 4ff8d85a9149..df5a1534558d 100644
--- a/src/service/performance-impl.js
+++ b/src/service/performance-impl.js
@@ -48,7 +48,6 @@ const BEFORE_UNLOAD_EVENT = 'beforeunload';
  */
 let TickEventDef;
 
-
 /**
  * Increments the value, else defaults to 0 for the given object key.
  * @param {!Object<string, (string|number|boolean|Array|Object|null)>} obj
@@ -72,7 +71,6 @@ function incOrDef(obj, name) {
  * of tick events to forward to the external `tick` function when it is set.
  */
 export class Performance {
-
   /**
    * @param {!Window} win
    */
@@ -149,8 +147,8 @@ export class Performance {
     this.viewer_ = Services.viewerForDoc(documentElement);
     this.resources_ = Services.resourcesForDoc(documentElement);
 
-    this.isPerformanceTrackingOn_ = this.viewer_.isEmbedded() &&
-        this.viewer_.getParam('csi') === '1';
+    this.isPerformanceTrackingOn_ =
+      this.viewer_.isEmbedded() && this.viewer_.getParam('csi') === '1';
 
     // This is for redundancy. Call flush on any visibility change.
     this.viewer_.onVisibilityChanged(this.flush.bind(this));
@@ -171,16 +169,21 @@ export class Performance {
     if (this.win.PerformanceLayoutJank) {
       // Register a handler to record the layout jank metric when the page
       // enters the hidden lifecycle state.
-      this.win.addEventListener(VISIBILITY_CHANGE_EVENT,
-          this.boundOnVisibilityChange_, {capture: true});
+      this.win.addEventListener(
+        VISIBILITY_CHANGE_EVENT,
+        this.boundOnVisibilityChange_,
+        {capture: true}
+      );
 
       // Safari does not reliably fire the `pagehide` or `visibilitychange`
       // events when closing a tab, so we have to use `beforeunload`.
       // See https://bugs.webkit.org/show_bug.cgi?id=151234
       const platform = Services.platformFor(this.win);
       if (platform.isSafari()) {
-        this.win.addEventListener(BEFORE_UNLOAD_EVENT,
-            this.boundTickLayoutJankScore_);
+        this.win.addEventListener(
+          BEFORE_UNLOAD_EVENT,
+          this.boundTickLayoutJankScore_
+        );
       }
     }
 
@@ -234,17 +237,16 @@ export class Performance {
       if (entry.name == 'first-paint' && !recordedFirstPaint) {
         this.tickDelta('fp', entry.startTime + entry.duration);
         recordedFirstPaint = true;
-      }
-      else if (entry.name == 'first-contentful-paint'
-          && !recordedFirstContentfulPaint) {
+      } else if (
+        entry.name == 'first-contentful-paint' &&
+        !recordedFirstContentfulPaint
+      ) {
         this.tickDelta('fcp', entry.startTime + entry.duration);
         recordedFirstContentfulPaint = true;
-      }
-      else if (entry.entryType === 'firstInput' && !recordedFirstInputDelay) {
+      } else if (entry.entryType === 'firstInput' && !recordedFirstInputDelay) {
         this.tickDelta('fid', entry.processingStart - entry.startTime);
         recordedFirstInputDelay = true;
-      }
-      else if (entry.entryType === 'layoutJank') {
+      } else if (entry.entryType === 'layoutJank') {
         this.aggregateJankScore_ += entry.fraction;
       }
     };
@@ -289,7 +291,8 @@ export class Performance {
     try {
       observer.observe({entryTypes: entryTypesToObserve});
     } catch (err) {
-      dev()/*OK*/.warn(err);
+      dev() /*OK*/
+        .warn(err);
     }
   }
 
@@ -340,10 +343,15 @@ export class Performance {
       this.jankScoresTicked_ = 2;
 
       // No more work to do, so clean up event listeners.
-      this.win.removeEventListener(VISIBILITY_CHANGE_EVENT,
-          this.boundOnVisibilityChange_, {capture: true});
-      this.win.removeEventListener(BEFORE_UNLOAD_EVENT,
-          this.boundTickLayoutJankScore_);
+      this.win.removeEventListener(
+        VISIBILITY_CHANGE_EVENT,
+        this.boundOnVisibilityChange_,
+        {capture: true}
+      );
+      this.win.removeEventListener(
+        BEFORE_UNLOAD_EVENT,
+        this.boundTickLayoutJankScore_
+      );
     }
   }
 
@@ -357,11 +365,14 @@ export class Performance {
     // Detect deprecated first pain time API
     // https://bugs.chromium.org/p/chromium/issues/detail?id=621512
     // We'll use this until something better is available.
-    if (!this.win.PerformancePaintTiming
-        && this.win.chrome
-        && typeof this.win.chrome.loadTimes == 'function') {
-      const fpTime = (this.win.chrome.loadTimes()['firstPaintTime'] * 1000)
-          - this.win.performance.timing.navigationStart;
+    if (
+      !this.win.PerformancePaintTiming &&
+      this.win.chrome &&
+      typeof this.win.chrome.loadTimes == 'function'
+    ) {
+      const fpTime =
+        this.win.chrome.loadTimes()['firstPaintTime'] * 1000 -
+        this.win.performance.timing.navigationStart;
       if (fpTime <= 1) {
         // Throw away bad data generated from an apparent Chrome bug
         // that is fixed in later Chrome versions.
@@ -390,10 +401,11 @@ export class Performance {
 
     this.whenViewportLayoutComplete_().then(() => {
       if (didStartInPrerender) {
-        const userPerceivedVisualCompletenesssTime = docVisibleTime > -1
-          ? (this.win.Date.now() - docVisibleTime)
-          //  Prerender was complete before visibility.
-          : 0;
+        const userPerceivedVisualCompletenesssTime =
+          docVisibleTime > -1
+            ? this.win.Date.now() - docVisibleTime
+            : //  Prerender was complete before visibility.
+              0;
         this.viewer_.whenFirstVisible().then(() => {
           // We only tick this if the page eventually becomes visible,
           // since otherwise we heavily skew the metric towards the
@@ -427,9 +439,9 @@ export class Performance {
     const {documentElement} = this.win.document;
     const size = Services.viewportForDoc(documentElement).getSize();
     const rect = layoutRectLtwh(0, 0, size.width, size.height);
-    return this.resources_.getResourcesInRect(
-        this.win, rect, /* isInPrerender */ true)
-        .then(resources => Promise.all(resources.map(r => r.loadedOnce())));
+    return this.resources_
+      .getResourcesInRect(this.win, rect, /* isInPrerender */ true)
+      .then(resources => Promise.all(resources.map(r => r.loadedOnce())));
   }
 
   /**
@@ -442,7 +454,7 @@ export class Performance {
    *     this directly.
    */
   tick(label, opt_delta) {
-    const value = (opt_delta == undefined) ? this.win.Date.now() : undefined;
+    const value = opt_delta == undefined ? this.win.Date.now() : undefined;
 
     const data = dict({
       'label': label,
@@ -463,8 +475,9 @@ export class Performance {
 
     // Store certain page visibility metrics to be exposed as analytics
     // variables.
-    const storedVal = Math.round(opt_delta != null ? Math.max(opt_delta, 0)
-				 : value - this.initTime_);
+    const storedVal = Math.round(
+      opt_delta != null ? Math.max(opt_delta, 0) : value - this.initTime_
+    );
     switch (label) {
       case 'fcp':
         this.firstContentfulPaint_ = storedVal;
@@ -485,9 +498,11 @@ export class Performance {
    * @param {string} label
    */
   mark(label) {
-    if (this.win.performance
-        && this.win.performance.mark
-        && arguments.length == 1) {
+    if (
+      this.win.performance &&
+      this.win.performance.mark &&
+      arguments.length == 1
+    ) {
       this.win.performance.mark(label);
     }
   }
@@ -513,15 +528,18 @@ export class Performance {
     this.tickDelta(label, v);
   }
 
-
   /**
    * Ask the viewer to flush the ticks
    */
   flush() {
     if (this.isMessagingReady_ && this.isPerformanceTrackingOn_) {
-      this.viewer_.sendMessage('sendCsi', dict({
-        'ampexp': this.ampexp_,
-      }), /* cancelUnsent */true);
+      this.viewer_.sendMessage(
+        'sendCsi',
+        dict({
+          'ampexp': this.ampexp_,
+        }),
+        /* cancelUnsent */ true
+      );
     }
   }
 
@@ -587,8 +605,11 @@ export class Performance {
    */
   prerenderComplete_(value) {
     if (this.viewer_) {
-      this.viewer_.sendMessage('prerenderComplete', dict({'value': value}),
-          /* cancelUnsent */true);
+      this.viewer_.sendMessage(
+        'prerenderComplete',
+        dict({'value': value}),
+        /* cancelUnsent */ true
+      );
     }
   }
 
@@ -624,7 +645,6 @@ export class Performance {
   }
 }
 
-
 /**
  * @param {!Window} window
  */
diff --git a/src/service/platform-impl.js b/src/service/platform-impl.js
index fe436b7e5dc6..c7221112a83b 100644
--- a/src/service/platform-impl.js
+++ b/src/service/platform-impl.js
@@ -16,13 +16,11 @@
 
 import {registerServiceBuilder} from '../service';
 
-
 /**
  * A helper class that provides information about device/OS/browser currently
  * running.
  */
 export class Platform {
-
   /**
    * @param {!Window} win
    */
@@ -52,9 +50,14 @@ export class Platform {
    * @return {boolean}
    */
   isSafari() {
-    return /Safari/i.test(this.navigator_.userAgent) &&
-        !this.isChrome() && !this.isIe() && !this.isEdge() && !this.isFirefox()
-        && !this.isOpera();
+    return (
+      /Safari/i.test(this.navigator_.userAgent) &&
+      !this.isChrome() &&
+      !this.isIe() &&
+      !this.isEdge() &&
+      !this.isFirefox() &&
+      !this.isOpera()
+    );
   }
 
   /**
@@ -63,8 +66,11 @@ export class Platform {
    */
   isChrome() {
     // Also true for MS Edge :)
-    return /Chrome|CriOS/i.test(this.navigator_.userAgent) && !this.isEdge()
-        && !this.isOpera();
+    return (
+      /Chrome|CriOS/i.test(this.navigator_.userAgent) &&
+      !this.isEdge() &&
+      !this.isOpera()
+    );
   }
 
   /**
@@ -140,8 +146,9 @@ export class Platform {
    */
   getMajorVersion() {
     if (this.isSafari()) {
-      return this.isIos() ? (this.getIosMajorVersion() || 0) :
-        this.evalMajorVersion_(/\sVersion\/(\d+)/, 1);
+      return this.isIos()
+        ? this.getIosMajorVersion() || 0
+        : this.evalMajorVersion_(/\sVersion\/(\d+)/, 1);
     }
     if (this.isChrome()) {
       return this.evalMajorVersion_(/(Chrome|CriOS)\/(\d+)/, 2);
@@ -191,8 +198,9 @@ export class Platform {
     if (!this.isIos()) {
       return '';
     }
-    let version = this.navigator_.userAgent
-        .match(/OS ([0-9]+[_.][0-9]+([_.][0-9]+)?)\b/);
+    let version = this.navigator_.userAgent.match(
+      /OS ([0-9]+[_.][0-9]+([_.][0-9]+)?)\b/
+    );
     if (!version) {
       return '';
     }
@@ -213,7 +221,6 @@ export class Platform {
   }
 }
 
-
 /**
  * @param {!Window} window
  */
diff --git a/src/service/position-observer/position-observer-impl.js b/src/service/position-observer/position-observer-impl.js
index 6e3151d5b9b2..0d7c7e650687 100644
--- a/src/service/position-observer/position-observer-impl.js
+++ b/src/service/position-observer/position-observer-impl.js
@@ -29,7 +29,6 @@ const TAG = 'POSITION_OBSERVER';
 /** @const @private */
 const SCROLL_TIMEOUT = 500;
 
-
 export class PositionObserver {
   /**
    * @param {!../ampdoc-impl.AmpDoc} ampdoc
@@ -63,9 +62,13 @@ export class PositionObserver {
     this.callbackStarted_ = false;
 
     /** @private {function()} */
-    this.boundStopScroll_ = debounce(this.win_, () => {
-      this.inScroll_ = false;
-    }, SCROLL_TIMEOUT);
+    this.boundStopScroll_ = debounce(
+      this.win_,
+      () => {
+        this.inScroll_ = false;
+      },
+      SCROLL_TIMEOUT
+    );
   }
 
   /**
@@ -75,8 +78,12 @@ export class PositionObserver {
    * @return {!UnlistenDef}
    */
   observe(element, fidelity, handler) {
-    const worker =
-        new PositionObserverWorker(this.ampdoc_, element, fidelity, handler);
+    const worker = new PositionObserverWorker(
+      this.ampdoc_,
+      element,
+      fidelity,
+      handler
+    );
 
     this.workers_.push(worker);
 
@@ -127,12 +134,16 @@ export class PositionObserver {
   startCallback_() {
     this.callbackStarted_ = true;
     // listen to viewport scroll event to help pass determine if need to
-    this.unlisteners_.push(this.viewport_.onScroll(() => {
-      this.onScrollHandler_();
-    }));
-    this.unlisteners_.push(this.viewport_.onResize(() => {
-      this.onResizeHandler_();
-    }));
+    this.unlisteners_.push(
+      this.viewport_.onScroll(() => {
+        this.onScrollHandler_();
+      })
+    );
+    this.unlisteners_.push(
+      this.viewport_.onResize(() => {
+        this.onResizeHandler_();
+      })
+    );
   }
 
   /**
@@ -151,7 +162,7 @@ export class PositionObserver {
    * This should always be called in vsync.
    * @param {boolean=} opt_force
    * @visibleForTesting
-  */
+   */
   updateAllEntries(opt_force) {
     for (let i = 0; i < this.workers_.length; i++) {
       const worker = this.workers_[i];
diff --git a/src/service/position-observer/position-observer-worker.js b/src/service/position-observer/position-observer-worker.js
index 1baa9380345a..11befa0ecae3 100644
--- a/src/service/position-observer/position-observer-worker.js
+++ b/src/service/position-observer/position-observer-worker.js
@@ -63,8 +63,10 @@ export class PositionObserverWorker {
     this.fidelity = fidelity;
 
     /** @type {number} */
-    this.turn = (fidelity == PositionObserverFidelity.LOW) ?
-      Math.floor(Math.random() * LOW_FIDELITY_FRAME_COUNT) : 0;
+    this.turn =
+      (fidelity == PositionObserverFidelity.LOW)
+        ? Math.floor(Math.random() * LOW_FIDELITY_FRAME_COUNT)
+        : 0;
 
     /** @type {?PositionInViewportEntryDef} */
     this.prevPosition_ = null;
@@ -80,20 +82,26 @@ export class PositionObserverWorker {
    */
   trigger_(position) {
     const prevPos = this.prevPosition_;
-    if (prevPos
-        && layoutRectEquals(prevPos.positionRect, position.positionRect)
-        && layoutRectEquals(prevPos.viewportRect, position.viewportRect)) {
+    if (
+      prevPos &&
+      layoutRectEquals(prevPos.positionRect, position.positionRect) &&
+      layoutRectEquals(prevPos.viewportRect, position.viewportRect)
+    ) {
       // position didn't change, do nothing.
       return;
     }
 
-    devAssert(position.positionRect,
-        'PositionObserver should always trigger entry with clientRect');
+    devAssert(
+      position.positionRect,
+      'PositionObserver should always trigger entry with clientRect'
+    );
     const positionRect =
-    /** @type {!../../layout-rect.LayoutRectDef} */ (position.positionRect);
+      /** @type {!../../layout-rect.LayoutRectDef} */ (position.positionRect);
     // Add the relative position of the element to its viewport
-    position.relativePos = layoutRectsRelativePos(positionRect,
-        position.viewportRect);
+    position.relativePos = layoutRectsRelativePos(
+      positionRect,
+      position.viewportRect
+    );
 
     if (layoutRectsOverlap(positionRect, position.viewportRect)) {
       // Update position
@@ -127,15 +135,20 @@ export class PositionObserverWorker {
     }
 
     const viewportSize = this.viewport_.getSize();
-    const viewportBox =
-        layoutRectLtwh(0, 0, viewportSize.width, viewportSize.height);
+    const viewportBox = layoutRectLtwh(
+      0,
+      0,
+      viewportSize.width,
+      viewportSize.height
+    );
     this.viewport_.getClientRectAsync(this.element).then(elementBox => {
       this.trigger_(
-      /** @type {./position-observer-worker.PositionInViewportEntryDef}*/ ({
-            positionRect: elementBox,
-            viewportRect: viewportBox,
-            relativePos: '',
-          }));
+        /** @type {./position-observer-worker.PositionInViewportEntryDef}*/ ({
+          positionRect: elementBox,
+          viewportRect: viewportBox,
+          relativePos: '',
+        })
+      );
     });
   }
 }
diff --git a/src/service/resource.js b/src/service/resource.js
index 8271cad725e7..5eaab0d12f6e 100644
--- a/src/service/resource.js
+++ b/src/service/resource.js
@@ -35,7 +35,6 @@ const TAG = 'Resource';
 const RESOURCE_PROP_ = '__AMP__RESOURCE';
 const OWNER_PROP_ = '__AMP__OWNER';
 
-
 /**
  * Resource state.
  *
@@ -75,7 +74,6 @@ export const ResourceState = {
   LAYOUT_FAILED: 5,
 };
 
-
 /** @typedef {{
   distance: (boolean|number),
     viewportHeight: (number|undefined),
@@ -88,15 +86,16 @@ let ViewportRatioDef;
  * @package
  */
 export class Resource {
-
   /**
    * @param {!Element} element
    * @return {!Resource}
    */
   static forElement(element) {
-    return /** @type {!Resource} */ (
-      devAssert(Resource.forElementOptional(element),
-          'Missing resource prop on %s', element));
+    return /** @type {!Resource} */ (devAssert(
+      Resource.forElementOptional(element),
+      'Missing resource prop on %s',
+      element
+    ));
   }
 
   /**
@@ -163,8 +162,9 @@ export class Resource {
     this.owner_ = undefined;
 
     /** @private {!ResourceState} */
-    this.state_ = element.isBuilt() ? ResourceState.NOT_LAID_OUT :
-      ResourceState.NOT_BUILT;
+    this.state_ = element.isBuilt()
+      ? ResourceState.NOT_LAID_OUT
+      : ResourceState.NOT_BUILT;
 
     /** @private {number} */
     this.priorityOverride_ = -1;
@@ -198,9 +198,9 @@ export class Resource {
     this.layoutPromise_ = null;
 
     /**
-    * Pending change size that was requested but could not be satisfied.
-    * @private {!./resources-impl.SizeDef|undefined}
-    */
+     * Pending change size that was requested but could not be satisfied.
+     * @private {!./resources-impl.SizeDef|undefined}
+     */
     this.pendingChangeSize_ = undefined;
 
     /** @private {boolean} */
@@ -218,8 +218,10 @@ export class Resource {
     this.useLayers_ = isExperimentOn(this.hostWin, 'layers');
 
     /** @private @const {boolean} */
-    this.useLayersPrioritization_ = isExperimentOn(this.hostWin,
-        'layers-prioritization');
+    this.useLayersPrioritization_ = isExperimentOn(
+      this.hostWin,
+      'layers-prioritization'
+    );
   }
 
   /**
@@ -323,31 +325,36 @@ export class Resource {
    * @return {?Promise}
    */
   build() {
-    if (this.isBuilding_ ||
-        !this.element.isUpgraded() ||
-        !this.resources_.grantBuildPermission()) {
+    if (
+      this.isBuilding_ ||
+      !this.element.isUpgraded() ||
+      !this.resources_.grantBuildPermission()
+    ) {
       return null;
     }
     this.isBuilding_ = true;
-    return this.element.build().then(() => {
-      this.isBuilding_ = false;
-      if (this.hasBeenMeasured()) {
-        this.state_ = ResourceState.READY_FOR_LAYOUT;
-        this.element.updateLayoutBox(this.getLayoutBox(), true);
-      } else {
-        this.state_ = ResourceState.NOT_LAID_OUT;
+    return this.element.build().then(
+      () => {
+        this.isBuilding_ = false;
+        if (this.hasBeenMeasured()) {
+          this.state_ = ResourceState.READY_FOR_LAYOUT;
+          this.element.updateLayoutBox(this.getLayoutBox(), true);
+        } else {
+          this.state_ = ResourceState.NOT_LAID_OUT;
+        }
+        // TODO(dvoytenko): merge with the standard BUILT signal.
+        this.element.signals().signal('res-built');
+        // TODO(dvoytenko, #7389): cleanup once amp-sticky-ad signals are
+        // in PROD.
+        this.element.dispatchCustomEvent(AmpEvents.BUILT);
+      },
+      reason => {
+        this.maybeReportErrorOnBuildFailure(reason);
+        this.isBuilding_ = false;
+        this.element.signals().rejectSignal('res-built', reason);
+        throw reason;
       }
-      // TODO(dvoytenko): merge with the standard BUILT signal.
-      this.element.signals().signal('res-built');
-      // TODO(dvoytenko, #7389): cleanup once amp-sticky-ad signals are
-      // in PROD.
-      this.element.dispatchCustomEvent(AmpEvents.BUILT);
-    }, reason => {
-      this.maybeReportErrorOnBuildFailure(reason);
-      this.isBuilding_ = false;
-      this.element.signals().rejectSignal('res-built', reason);
-      throw reason;
-    });
+    );
   }
 
   /**
@@ -375,7 +382,7 @@ export class Resource {
    * @param {!../layout-rect.LayoutMarginsChangeDef=} opt_newMargins
    */
   changeSize(newHeight, newWidth, opt_newMargins) {
-    this.element./*OK*/changeSize(newHeight, newWidth, opt_newMargins);
+    this.element./*OK*/ changeSize(newHeight, newWidth, opt_newMargins);
 
     // Schedule for re-measure and possible re-layout.
     this.requestMeasure();
@@ -388,8 +395,12 @@ export class Resource {
    * @param {number|undefined} requestedWidth
    * @param {!../layout-rect.LayoutMarginsChangeDef|undefined} requestedMargins
    */
-  overflowCallback(overflown, requestedHeight, requestedWidth,
-    requestedMargins) {
+  overflowCallback(
+    overflown,
+    requestedHeight,
+    requestedWidth,
+    requestedMargins
+  ) {
     if (overflown) {
       this.pendingChangeSize_ = {
         height: requestedHeight,
@@ -397,8 +408,12 @@ export class Resource {
         margins: requestedMargins,
       };
     }
-    this.element.overflowCallback(overflown, requestedHeight, requestedWidth,
-        requestedMargins);
+    this.element.overflowCallback(
+      overflown,
+      requestedHeight,
+      requestedWidth,
+      requestedMargins
+    );
   }
 
   /** reset pending change sizes */
@@ -433,12 +448,14 @@ export class Resource {
     // that placeholders need to at least wait until the parent element
     // has been stubbed. We can tell whether the parent has been stubbed
     // by whether a resource has been attached to it.
-    if (this.isPlaceholder_ &&
-        this.element.parentElement &&
-        // Use prefix to recognize AMP element. This is necessary because stub
-        // may not be attached yet.
-        startsWith(this.element.parentElement.tagName, 'AMP-') &&
-        !(RESOURCE_PROP_ in this.element.parentElement)) {
+    if (
+      this.isPlaceholder_ &&
+      this.element.parentElement &&
+      // Use prefix to recognize AMP element. This is necessary because stub
+      // may not be attached yet.
+      startsWith(this.element.parentElement.tagName, 'AMP-') &&
+      !(RESOURCE_PROP_ in this.element.parentElement)
+    ) {
       return;
     }
 
@@ -454,12 +471,17 @@ export class Resource {
 
     // Note that "left" doesn't affect readiness for the layout.
     const sizeChanges = !layoutRectSizeEquals(oldBox, box);
-    if (this.state_ == ResourceState.NOT_LAID_OUT ||
-          oldBox.top != box.top || sizeChanges) {
-      if (this.element.isUpgraded() &&
-              this.state_ != ResourceState.NOT_BUILT &&
-              (this.state_ == ResourceState.NOT_LAID_OUT ||
-                  this.element.isRelayoutNeeded())) {
+    if (
+      this.state_ == ResourceState.NOT_LAID_OUT ||
+      oldBox.top != box.top ||
+      sizeChanges
+    ) {
+      if (
+        this.element.isUpgraded() &&
+        this.state_ != ResourceState.NOT_BUILT &&
+        (this.state_ == ResourceState.NOT_LAID_OUT ||
+          this.element.isRelayoutNeeded())
+      ) {
         this.state_ = ResourceState.READY_FOR_LAYOUT;
       }
     }
@@ -482,13 +504,15 @@ export class Resource {
     if (viewport.supportsPositionFixed() && this.isDisplayed()) {
       const {win} = this.resources_;
       const {body} = win.document;
-      for (let n = this.element; n && n != body; n = n./*OK*/offsetParent) {
+      for (let n = this.element; n && n != body; n = n./*OK*/ offsetParent) {
         if (n.isAlwaysFixed && n.isAlwaysFixed()) {
           isFixed = true;
           break;
         }
-        if (viewport.isDeclaredFixed(n)
-            && computedStyle(win, n).position == 'fixed') {
+        if (
+          viewport.isDeclaredFixed(n) &&
+          computedStyle(win, n).position == 'fixed'
+        ) {
           isFixed = true;
           break;
         }
@@ -500,8 +524,11 @@ export class Resource {
       // For fixed position elements, we need the relative position to the
       // viewport. When accessing the layoutBox through #getLayoutBox, we'll
       // return the new absolute position.
-      this.layoutBox_ = moveLayoutRect(box, -viewport.getScrollLeft(),
-          -viewport.getScrollTop());
+      this.layoutBox_ = moveLayoutRect(
+        box,
+        -viewport.getScrollLeft(),
+        -viewport.getScrollTop()
+      );
     }
   }
 
@@ -534,9 +561,11 @@ export class Resource {
       this.layoutBox_ = layoutRectLtwh(0, 0, 0, 0);
     } else {
       this.layoutBox_ = layoutRectLtwh(
-          this.layoutBox_.left,
-          this.layoutBox_.top,
-          0, 0);
+        this.layoutBox_.left,
+        this.layoutBox_.top,
+        0,
+        0
+      );
     }
     this.isFixed_ = false;
     this.element.updateLayoutBox(this.getLayoutBox());
@@ -598,8 +627,11 @@ export class Resource {
       return this.layoutBox_;
     }
     const viewport = this.resources_.getViewport();
-    return moveLayoutRect(this.layoutBox_, viewport.getScrollLeft(),
-        viewport.getScrollTop());
+    return moveLayoutRect(
+      this.layoutBox_,
+      viewport.getScrollLeft(),
+      viewport.getScrollTop()
+    );
   }
 
   /**
@@ -639,9 +671,11 @@ export class Resource {
     // TODO(jridgewell): #getSize
     const box = this.getLayoutBox();
     const hasNonZeroSize = box.height > 0 && box.width > 0;
-    return (isFluid || hasNonZeroSize) &&
-        !!this.element.ownerDocument &&
-        !!this.element.ownerDocument.defaultView;
+    return (
+      (isFluid || hasNonZeroSize) &&
+      !!this.element.ownerDocument &&
+      !!this.element.ownerDocument.defaultView
+    );
   }
 
   /**
@@ -683,8 +717,7 @@ export class Resource {
     // See if pre-existing promise.
     const viewportNum = dev().assertNumber(viewport);
     const key = String(viewportNum);
-    if (this.withViewportDeferreds_ &&
-        this.withViewportDeferreds_[key]) {
+    if (this.withViewportDeferreds_ && this.withViewportDeferreds_[key]) {
       return this.withViewportDeferreds_[key].promise;
     }
     // See if already within viewport multiplier.
@@ -716,8 +749,9 @@ export class Resource {
     if (this.useLayers_ && this.useLayersPrioritization_) {
       const {element} = this;
       return {
-        distance: element.getLayers().iterateAncestry(element,
-            this.layersDistanceRatio_),
+        distance: element
+          .getLayers()
+          .iterateAncestry(element, this.layersDistanceRatio_),
       };
     }
 
@@ -729,8 +763,10 @@ export class Resource {
     let scrollPenalty = 1;
     let distance = 0;
 
-    if (viewportBox.right < layoutBox.left ||
-        viewportBox.left > layoutBox.right) {
+    if (
+      viewportBox.right < layoutBox.left ||
+      viewportBox.left > layoutBox.right
+    ) {
       // If outside of viewport's x-axis, element is not in viewport so return
       // false.
       return {distance: false};
@@ -777,7 +813,7 @@ export class Resource {
     if (typeof distance == 'boolean') {
       return distance;
     }
-    return distance < viewportHeight * multiplier / scrollPenalty;
+    return distance < (viewportHeight * multiplier) / scrollPenalty;
   }
 
   /**
@@ -792,11 +828,12 @@ export class Resource {
    */
   layersDistanceRatio_(currentScore, layout, depth) {
     currentScore = currentScore || 0;
-    const depthPenalty = 1 + (depth / 10);
+    const depthPenalty = 1 + depth / 10;
     const nonActivePenalty = layout.isActiveUnsafe() ? 1 : 2;
-    const distance = layout.getHorizontalViewportsFromParent() +
-        layout.getVerticalViewportsFromParent();
-    return currentScore + (nonActivePenalty * depthPenalty * distance);
+    const distance =
+      layout.getHorizontalViewportsFromParent() +
+      layout.getVerticalViewportsFromParent();
+    return currentScore + nonActivePenalty * depthPenalty * distance;
   }
 
   /**
@@ -811,8 +848,10 @@ export class Resource {
     // outside of viewport. For now, blindly trust that owner knows what it's
     // doing.
     this.resolveDeferredsWhenWithinViewports_();
-    return this.hasOwner() || this.isWithinViewportRatio(
-        this.element.renderOutsideViewport());
+    return (
+      this.hasOwner() ||
+      this.isWithinViewportRatio(this.element.renderOutsideViewport())
+    );
   }
 
   /**
@@ -821,8 +860,7 @@ export class Resource {
    * @return {boolean}
    */
   idleRenderOutsideViewport() {
-    return this.isWithinViewportRatio(
-        this.element.idleRenderOutsideViewport());
+    return this.isWithinViewportRatio(this.element.idleRenderOutsideViewport());
   }
 
   /**
@@ -838,10 +876,9 @@ export class Resource {
    * Undoes `layoutScheduled`.
    */
   layoutCanceled() {
-    this.state_ =
-        this.hasBeenMeasured() ?
-          ResourceState.READY_FOR_LAYOUT :
-          ResourceState.NOT_LAID_OUT;
+    this.state_ = this.hasBeenMeasured()
+      ? ResourceState.READY_FOR_LAYOUT
+      : ResourceState.NOT_LAID_OUT;
   }
 
   /**
@@ -862,15 +899,22 @@ export class Resource {
       return Promise.reject(this.lastLayoutError_);
     }
 
-    devAssert(this.state_ != ResourceState.NOT_BUILT,
-        'Not ready to start layout: %s (%s)', this.debugid, this.state_);
-    devAssert(this.isDisplayed(),
-        'Not displayed for layout: %s', this.debugid);
+    devAssert(
+      this.state_ != ResourceState.NOT_BUILT,
+      'Not ready to start layout: %s (%s)',
+      this.debugid,
+      this.state_
+    );
+    devAssert(this.isDisplayed(), 'Not displayed for layout: %s', this.debugid);
 
     // Unwanted re-layouts are ignored.
     if (this.layoutCount_ > 0 && !this.element.isRelayoutNeeded()) {
-      dev().fine(TAG, 'layout canceled since it wasn\'t requested:',
-          this.debugid, this.state_);
+      dev().fine(
+        TAG,
+        "layout canceled since it wasn't requested:",
+        this.debugid,
+        this.state_
+      );
       this.state_ = ResourceState.LAYOUT_COMPLETE;
       return Promise.resolve();
     }
@@ -889,8 +933,10 @@ export class Resource {
       });
     });
 
-    this.layoutPromise_ = promise.then(() => this.layoutComplete_(true),
-        reason => this.layoutComplete_(false, reason));
+    this.layoutPromise_ = promise.then(
+      () => this.layoutComplete_(true),
+      reason => this.layoutComplete_(false, reason)
+    );
     return this.layoutPromise_;
   }
 
@@ -906,8 +952,9 @@ export class Resource {
     }
     this.layoutPromise_ = null;
     this.loadedOnce_ = true;
-    this.state_ = success ? ResourceState.LAYOUT_COMPLETE :
-      ResourceState.LAYOUT_FAILED;
+    this.state_ = success
+      ? ResourceState.LAYOUT_COMPLETE
+      : ResourceState.LAYOUT_FAILED;
     this.lastLayoutError_ = opt_reason;
     if (success) {
       dev().fine(TAG, 'layout complete:', this.debugid);
@@ -922,8 +969,10 @@ export class Resource {
    * @return {boolean}
    * */
   isLayoutPending() {
-    return this.state_ != ResourceState.LAYOUT_COMPLETE &&
-        this.state_ != ResourceState.LAYOUT_FAILED;
+    return (
+      this.state_ != ResourceState.LAYOUT_COMPLETE &&
+      this.state_ != ResourceState.LAYOUT_FAILED
+    );
   }
 
   /**
@@ -969,8 +1018,10 @@ export class Resource {
    * relayout in case document becomes active again.
    */
   unlayout() {
-    if (this.state_ == ResourceState.NOT_BUILT ||
-        this.state_ == ResourceState.NOT_LAID_OUT) {
+    if (
+      this.state_ == ResourceState.NOT_BUILT ||
+      this.state_ == ResourceState.NOT_LAID_OUT
+    ) {
       return;
     }
     this.setInViewport(false);
diff --git a/src/service/resources-impl.js b/src/service/resources-impl.js
index 1abc305460a0..f2fc63b4f683 100644
--- a/src/service/resources-impl.js
+++ b/src/service/resources-impl.js
@@ -50,7 +50,6 @@ const MUTATE_DEFER_DELAY_ = 500;
 const FOCUS_HISTORY_TIMEOUT_ = 1000 * 60; // 1min
 const FOUR_FRAME_DELAY_ = 70;
 
-
 /**
  * The internal structure of a ChangeHeightRequest.
  * @typedef {{
@@ -174,8 +173,10 @@ export class Resources {
     this.useLayers_ = isExperimentOn(this.win, 'layers');
 
     /** @private @const {boolean} */
-    this.useLayersPrioritization_ = isExperimentOn(this.win,
-        'layers-prioritization');
+    this.useLayersPrioritization_ = isExperimentOn(
+      this.win,
+      'layers-prioritization'
+    );
 
     let boundScorer;
     if (this.useLayers_ && this.useLayersPrioritization_) {
@@ -187,8 +188,8 @@ export class Resources {
     this.boundTaskScorer_ = boundScorer;
 
     /**
-    * @private {!Array<!ChangeSizeRequestDef>}
-    */
+     * @private {!Array<!ChangeSizeRequestDef>}
+     */
     this.requestsChangeSize_ = [];
 
     /** @private {?Array<!Resource>} */
@@ -201,7 +202,7 @@ export class Resources {
     this.viewport_ = Services.viewportForDoc(this.ampdoc);
 
     /** @private @const {!./vsync-impl.Vsync} */
-    this.vsync_ = Services./*OK*/vsyncFor(this.win);
+    this.vsync_ = Services./*OK*/ vsyncFor(this.win);
 
     /** @private @const {!FocusHistory} */
     this.activeHistory_ = new FocusHistory(this.win, FOCUS_HISTORY_TIMEOUT_);
@@ -220,7 +221,7 @@ export class Resources {
 
     /** @private @const {!FiniteStateMachine<!VisibilityState>} */
     this.visibilityStateMachine_ = new FiniteStateMachine(
-        this.viewer_.getVisibilityState()
+      this.viewer_.getVisibilityState()
     );
     this.setupVisibilityStateMachine_(this.visibilityStateMachine_);
 
@@ -303,8 +304,10 @@ export class Resources {
       ]).then(remeasure);
 
       // Remeasure the document when all fonts loaded.
-      if (this.win.document.fonts &&
-          this.win.document.fonts.status != 'loaded') {
+      if (
+        this.win.document.fonts &&
+        this.win.document.fonts.status != 'loaded'
+      ) {
         this.win.document.fonts.ready.then(remeasure);
       }
     });
@@ -335,7 +338,6 @@ export class Resources {
     this.ampdoc.signals().signal(CommonSignals.RENDER_START);
   }
 
-
   /**
    * Returns a subset of resources which are (1) belong to the specified host
    * window, and (2) meet the filterFn given.
@@ -349,19 +351,29 @@ export class Resources {
     // the initially parsed elements.
     // TODO(jridgewell): this path should be switched to use a future
     // "layer has been measured" signal.
-    return this.ampdoc.signals().whenSignal(READY_SCAN_SIGNAL_).then(() => {
-      // Second, wait for any left-over elements to complete measuring.
-      const measurePromiseArray = [];
-      this.resources_.forEach(r => {
-        if (!r.hasBeenMeasured() && r.hostWin == hostWin && !r.hasOwner()) {
-          measurePromiseArray.push(this.ensuredMeasured_(r));
-        }
-      });
-      return Promise.all(measurePromiseArray);
-    }).then(() => this.resources_.filter(r => {
-      return r.hostWin == hostWin && !r.hasOwner() && r.hasBeenMeasured() &&
-        filterFn(r);
-    }));
+    return this.ampdoc
+      .signals()
+      .whenSignal(READY_SCAN_SIGNAL_)
+      .then(() => {
+        // Second, wait for any left-over elements to complete measuring.
+        const measurePromiseArray = [];
+        this.resources_.forEach(r => {
+          if (!r.hasBeenMeasured() && r.hostWin == hostWin && !r.hasOwner()) {
+            measurePromiseArray.push(this.ensuredMeasured_(r));
+          }
+        });
+        return Promise.all(measurePromiseArray);
+      })
+      .then(() =>
+        this.resources_.filter(r => {
+          return (
+            r.hostWin == hostWin &&
+            !r.hasOwner() &&
+            r.hasBeenMeasured() &&
+            filterFn(r)
+          );
+        })
+      );
   }
 
   /**
@@ -376,8 +388,11 @@ export class Resources {
     return this.getMeasuredResources(hostWin, r => {
       // TODO(jridgewell): Remove isFixed check here once the position
       // is calculted correctly in a separate layer for embeds.
-      if (!r.isDisplayed() || (!r.overlaps(rect) && !r.isFixed()) ||
-          (opt_isInPrerender && !r.prerenderAllowed())) {
+      if (
+        !r.isDisplayed() ||
+        (!r.overlaps(rect) && !r.isFixed()) ||
+        (opt_isInPrerender && !r.prerenderAllowed())
+      ) {
         return false;
       }
       return true;
@@ -514,14 +529,16 @@ export class Resources {
     // First check if the resource is being reparented and if it requires
     // reconstruction. Only already built elements are eligible.
     let resource = Resource.forElementOptional(element);
-    if (resource &&
-        resource.getState() != ResourceState.NOT_BUILT &&
-        !element.reconstructWhenReparented()) {
+    if (
+      resource &&
+      resource.getState() != ResourceState.NOT_BUILT &&
+      !element.reconstructWhenReparented()
+    ) {
       resource.requestMeasure();
       dev().fine(TAG_, 'resource reused:', resource.debugid);
     } else {
       // Create and add a new resource.
-      resource = new Resource((++this.resourceIdCounter_), element, this);
+      resource = new Resource(++this.resourceIdCounter_, element, this);
       dev().fine(TAG_, 'resource added:', resource.debugid);
     }
     this.resources_.push(resource);
@@ -553,16 +570,19 @@ export class Resources {
    * @param {boolean=} scheduleWhenBuilt
    * @private
    */
-  buildOrScheduleBuildForResource_(resource, checkForDupes = false,
-    scheduleWhenBuilt = true) {
-    const buildingEnabled = (this.isRuntimeOn_ || this.isBuildOn_);
+  buildOrScheduleBuildForResource_(
+    resource,
+    checkForDupes = false,
+    scheduleWhenBuilt = true
+  ) {
+    const buildingEnabled = this.isRuntimeOn_ || this.isBuildOn_;
 
     // During prerender mode, don't build elements that aren't allowed to be
     // prerendered. This avoids wasting our prerender build quota.
     // See grantBuildPermission() for more details.
     const shouldBuildResource =
-        this.viewer_.getVisibilityState() != VisibilityState.PRERENDER
-        || resource.prerenderAllowed();
+      this.viewer_.getVisibilityState() != VisibilityState.PRERENDER ||
+      resource.prerenderAllowed();
 
     if (buildingEnabled && shouldBuildResource) {
       if (this.documentReady_) {
@@ -607,9 +627,10 @@ export class Resources {
     // elements get a chance to be built.
     for (let i = 0; i < this.pendingBuildResources_.length; i++) {
       const resource = this.pendingBuildResources_[i];
-      if (this.documentReady_ ||
-          hasNextNodeInDocumentOrder(
-              resource.element, this.ampdoc.getRootNode())) {
+      if (
+        this.documentReady_ ||
+        hasNextNodeInDocumentOrder(resource.element, this.ampdoc.getRootNode())
+      ) {
         // Remove resource before build to remove it from the pending list
         // in either case the build succeed or throws an error.
         this.pendingBuildResources_.splice(i--, 1);
@@ -629,14 +650,17 @@ export class Resources {
     if (!promise || !schedulePass) {
       return promise;
     }
-    return promise.then(() => this.schedulePass(), error => {
-      // Build failed: remove the resource. No other state changes are
-      // needed.
-      this.removeResource_(resource);
-      if (!isBlockedByConsent(error)) {
-        throw error;
+    return promise.then(
+      () => this.schedulePass(),
+      error => {
+        // Build failed: remove the resource. No other state changes are
+        // needed.
+        this.removeResource_(resource);
+        if (!isBlockedByConsent(error)) {
+          throw error;
+        }
       }
-    });
+    );
   }
 
   /**
@@ -718,18 +742,21 @@ export class Resources {
         return;
       }
       if (resource.getState() != ResourceState.LAYOUT_SCHEDULED) {
-        promises.push(resource.whenBuilt().then(() => {
-          resource.measure();
-          if (!resource.isDisplayed()) {
-            return;
-          }
-          this.scheduleLayoutOrPreload_(
+        promises.push(
+          resource.whenBuilt().then(() => {
+            resource.measure();
+            if (!resource.isDisplayed()) {
+              return;
+            }
+            this.scheduleLayoutOrPreload_(
               resource,
               /* layout */ true,
               opt_parentPriority,
-              /* forceOutsideViewport */ true);
-          return resource.loadedOnce();
-        }));
+              /* forceOutsideViewport */ true
+            );
+            return resource.loadedOnce();
+          })
+        );
       } else if (resource.isDisplayed()) {
         promises.push(resource.loadedOnce());
       }
@@ -748,9 +775,10 @@ export class Resources {
    */
   scheduleLayout(parentElement, subElements) {
     this.scheduleLayoutOrPreloadForSubresources_(
-        Resource.forElement(parentElement),
-        /* layout */ true,
-        elements_(subElements));
+      Resource.forElement(parentElement),
+      /* layout */ true,
+      elements_(subElements)
+    );
   }
 
   /**
@@ -812,9 +840,10 @@ export class Resources {
    */
   schedulePreload(parentElement, subElements) {
     this.scheduleLayoutOrPreloadForSubresources_(
-        Resource.forElement(parentElement),
-        /* layout */ false,
-        elements_(subElements));
+      Resource.forElement(parentElement),
+      /* layout */ false,
+      elements_(subElements)
+    );
   }
 
   /**
@@ -850,9 +879,10 @@ export class Resources {
    */
   updateInViewport(parentElement, subElements, inLocalViewport) {
     this.updateInViewportForSubresources_(
-        Resource.forElement(parentElement),
-        elements_(subElements),
-        inLocalViewport);
+      Resource.forElement(parentElement),
+      elements_(subElements),
+      inLocalViewport
+    );
   }
 
   /**
@@ -865,8 +895,14 @@ export class Resources {
    * @param {!../layout-rect.LayoutMarginsChangeDef=} opt_newMargins
    */
   changeSize(element, newHeight, newWidth, opt_callback, opt_newMargins) {
-    this.scheduleChangeSize_(Resource.forElement(element), newHeight,
-        newWidth, opt_newMargins, /* force */ true, opt_callback);
+    this.scheduleChangeSize_(
+      Resource.forElement(element),
+      newHeight,
+      newWidth,
+      opt_newMargins,
+      /* force */ true,
+      opt_callback
+    );
   }
 
   /**
@@ -889,14 +925,20 @@ export class Resources {
    */
   attemptChangeSize(element, newHeight, newWidth, opt_newMargins) {
     return new Promise((resolve, reject) => {
-      this.scheduleChangeSize_(Resource.forElement(element), newHeight,
-          newWidth, opt_newMargins, /* force */ false, success => {
-            if (success) {
-              resolve();
-            } else {
-              reject(new Error('changeSize attempt denied'));
-            }
-          });
+      this.scheduleChangeSize_(
+        Resource.forElement(element),
+        newHeight,
+        newWidth,
+        opt_newMargins,
+        /* force */ false,
+        success => {
+          if (success) {
+            resolve();
+          } else {
+            reject(new Error('changeSize attempt denied'));
+          }
+        }
+      );
     });
   }
 
@@ -1070,7 +1112,6 @@ export class Resources {
     this.schedulePass(FOUR_FRAME_DELAY_, relayoutAll);
   }
 
-
   /**
    * Return a promise that requests runtime to collapse this element.
    * The runtime will schedule this request and first attempt to resize
@@ -1081,16 +1122,22 @@ export class Resources {
    */
   attemptCollapse(element) {
     return new Promise((resolve, reject) => {
-      this.scheduleChangeSize_(Resource.forElement(element), 0, 0, undefined,
-          /* force */ false, success => {
-            if (success) {
-              const resource = Resource.forElement(element);
-              resource.completeCollapse();
-              resolve();
-            } else {
-              reject(new Error('collapse attempt denied'));
-            }
-          });
+      this.scheduleChangeSize_(
+        Resource.forElement(element),
+        0,
+        0,
+        undefined,
+        /* force */ false,
+        success => {
+          if (success) {
+            const resource = Resource.forElement(element);
+            resource.completeCollapse();
+            resolve();
+          } else {
+            reject(new Error('collapse attempt denied'));
+          }
+        }
+      );
     });
   }
 
@@ -1103,8 +1150,10 @@ export class Resources {
     const box = this.viewport_.getLayoutRect(element);
     const resource = Resource.forElement(element);
     if (box.width != 0 && box.height != 0) {
-      if (isExperimentOn(this.win, 'dirty-collapse-element') ||
-          this.useLayers_) {
+      if (
+        isExperimentOn(this.win, 'dirty-collapse-element') ||
+        this.useLayers_
+      ) {
         this.dirtyElement(element);
       } else {
         this.setRelayoutTop_(box.top);
@@ -1184,38 +1233,56 @@ export class Resources {
     this.prerenderSize_ = this.viewer_.getPrerenderSize();
 
     const firstPassAfterDocumentReady =
-        (this.documentReady_ && this.firstPassAfterDocumentReady_);
+      this.documentReady_ && this.firstPassAfterDocumentReady_;
     if (firstPassAfterDocumentReady) {
       this.firstPassAfterDocumentReady_ = false;
       const doc = this.win.document;
       const documentInfo = Services.documentInfoForDoc(this.ampdoc);
-      this.viewer_.sendMessage('documentLoaded', dict({
-        'title': doc.title,
-        'sourceUrl': getSourceUrl(this.ampdoc.getUrl()),
-        'serverLayout': doc.documentElement.hasAttribute('i-amphtml-element'),
-        'linkRels': documentInfo.linkRels,
-        'metaTags': documentInfo.metaTags,
-      }), /* cancelUnsent */true);
+      this.viewer_.sendMessage(
+        'documentLoaded',
+        dict({
+          'title': doc.title,
+          'sourceUrl': getSourceUrl(this.ampdoc.getUrl()),
+          'serverLayout': doc.documentElement.hasAttribute('i-amphtml-element'),
+          'linkRels': documentInfo.linkRels,
+          'metaTags': documentInfo.metaTags,
+        }),
+        /* cancelUnsent */ true
+      );
 
       this.contentHeight_ = this.viewport_.getContentHeight();
-      this.viewer_.sendMessage('documentHeight',
-          dict({'height': this.contentHeight_}), /* cancelUnsent */true);
+      this.viewer_.sendMessage(
+        'documentHeight',
+        dict({'height': this.contentHeight_}),
+        /* cancelUnsent */ true
+      );
       dev().fine(TAG_, 'document height on load: %s', this.contentHeight_);
     }
 
     const viewportSize = this.viewport_.getSize();
-    dev().fine(TAG_,
-        'PASS: visible=', this.visible_,
-        ', relayoutAll=', this.relayoutAll_,
-        ', relayoutTop=', this.relayoutTop_,
-        ', viewportSize=', viewportSize.width, viewportSize.height,
-        ', prerenderSize=', this.prerenderSize_);
+    dev().fine(
+      TAG_,
+      'PASS: visible=',
+      this.visible_,
+      ', relayoutAll=',
+      this.relayoutAll_,
+      ', relayoutTop=',
+      this.relayoutTop_,
+      ', viewportSize=',
+      viewportSize.width,
+      viewportSize.height,
+      ', prerenderSize=',
+      this.prerenderSize_
+    );
     this.pass_.cancel();
     this.vsyncScheduled_ = false;
 
     this.visibilityStateMachine_.setState(this.viewer_.getVisibilityState());
-    if (this.documentReady_ && this.ampInitialized_
-        && !this.ampdoc.signals().get(READY_SCAN_SIGNAL_)) {
+    if (
+      this.documentReady_ &&
+      this.ampInitialized_ &&
+      !this.ampdoc.signals().get(READY_SCAN_SIGNAL_)
+    ) {
       // This signal mainly signifies that most of elements have been measured
       // by now. This is mostly used to avoid measuring too many elements
       // individually. This will be superceeded by layers API, e.g.
@@ -1229,8 +1296,11 @@ export class Resources {
       this.vsync_.measure(() => {
         const measuredContentHeight = this.viewport_.getContentHeight();
         if (measuredContentHeight != this.contentHeight_) {
-          this.viewer_.sendMessage('documentHeight',
-              dict({'height': measuredContentHeight}), /* cancelUnsent */true);
+          this.viewer_.sendMessage(
+            'documentHeight',
+            dict({'height': measuredContentHeight}),
+            /* cancelUnsent */ true
+          );
           this.contentHeight_ = measuredContentHeight;
           dev().fine(TAG_, 'document height changed: %s', this.contentHeight_);
           this.viewport_.contentHeightChanged();
@@ -1251,7 +1321,7 @@ export class Resources {
    * @private
    */
   hasMutateWork_() {
-    return (this.requestsChangeSize_.length > 0);
+    return this.requestsChangeSize_.length > 0;
   }
 
   /**
@@ -1284,14 +1354,18 @@ export class Resources {
     const viewportRect = this.viewport_.getRect();
     const topOffset = viewportRect.height / 10;
     const bottomOffset = viewportRect.height / 10;
-    const isScrollingStopped = ((Math.abs(this.lastVelocity_) < 1e-2 &&
+    const isScrollingStopped =
+      (Math.abs(this.lastVelocity_) < 1e-2 &&
         now - this.lastScrollTime_ > MUTATE_DEFER_DELAY_) ||
-        now - this.lastScrollTime_ > MUTATE_DEFER_DELAY_ * 2);
+      now - this.lastScrollTime_ > MUTATE_DEFER_DELAY_ * 2;
 
     // TODO(jridgewell, #12780): Update resize rules to account for layers.
     if (this.requestsChangeSize_.length > 0) {
-      dev().fine(TAG_, 'change size requests:',
-          this.requestsChangeSize_.length);
+      dev().fine(
+        TAG_,
+        'change size requests:',
+        this.requestsChangeSize_.length
+      );
       const requestsChangeSize = this.requestsChangeSize_;
       this.requestsChangeSize_ = [];
 
@@ -1343,8 +1417,14 @@ export class Resources {
         // Check resize rules. It will either resize element immediately, or
         // wait until scrolling stops or will call the overflow callback.
         let resize = false;
-        if (heightDiff == 0 && topMarginDiff == 0 && bottomMarginDiff == 0 &&
-            widthDiff == 0 && leftMarginDiff == 0 && rightMarginDiff == 0) {
+        if (
+          heightDiff == 0 &&
+          topMarginDiff == 0 &&
+          bottomMarginDiff == 0 &&
+          widthDiff == 0 &&
+          leftMarginDiff == 0 &&
+          rightMarginDiff == 0
+        ) {
           // 1. Nothing to resize.
         } else if (request.force || !this.visible_) {
           // 2. An immediate execution requested or the document is hidden.
@@ -1353,22 +1433,29 @@ export class Resources {
           // 3. Active elements are immediately resized. The assumption is that
           // the resize is triggered by the user action or soon after.
           resize = true;
-        } else if (topUnchangedBoundary >= viewportRect.bottom - bottomOffset ||
-            (topMarginDiff == 0 && box.bottom + Math.min(heightDiff, 0) >=
-             viewportRect.bottom - bottomOffset)) {
+        } else if (
+          topUnchangedBoundary >= viewportRect.bottom - bottomOffset ||
+          (topMarginDiff == 0 &&
+            box.bottom + Math.min(heightDiff, 0) >=
+              viewportRect.bottom - bottomOffset)
+        ) {
           // 4. Elements under viewport are resized immediately, but only if
           // an element's boundary is not changed above the viewport after
           // resize.
           resize = true;
-        } else if (viewportRect.top > 1 &&
-            bottomDisplacedBoundary <= viewportRect.top + topOffset) {
+        } else if (
+          viewportRect.top > 1 &&
+          bottomDisplacedBoundary <= viewportRect.top + topOffset
+        ) {
           // 5. Elements above the viewport can only be resized if we are able
           // to compensate the height change by setting scrollTop and only if
           // the page has already been scrolled by some amount (1px due to iOS).
           // Otherwise the scrolling might move important things like the menu
           // bar out of the viewport at initial page load.
-          if (heightDiff < 0 &&
-              viewportRect.top + aboveVpHeightChange < -heightDiff) {
+          if (
+            heightDiff < 0 &&
+            viewportRect.top + aboveVpHeightChange < -heightDiff
+          ) {
             // Do nothing if height abobe viewport height can't compensate
             // height decrease
             continue;
@@ -1389,15 +1476,22 @@ export class Resources {
           // 6. Elements close to the bottom of the document (not viewport)
           // are resized immediately.
           resize = true;
-        } else if (heightDiff < 0 || topMarginDiff < 0 ||
-              bottomMarginDiff < 0) {
+        } else if (
+          heightDiff < 0 ||
+          topMarginDiff < 0 ||
+          bottomMarginDiff < 0
+        ) {
           // 7. The new height (or one of the margins) is smaller than the
           // current one.
         } else {
           // 8. Element is in viewport don't resize and try overflow callback
           // instead.
-          request.resource.overflowCallback(/* overflown */ true,
-              request.newHeight, request.newWidth, newMargins);
+          request.resource.overflowCallback(
+            /* overflown */ true,
+            request.newHeight,
+            request.newWidth,
+            newMargins
+          );
         }
 
         if (resize) {
@@ -1407,15 +1501,22 @@ export class Resources {
           if (this.useLayers_) {
             dirtySet.push(request.resource.element);
           }
-          request.resource./*OK*/changeSize(
-              request.newHeight, request.newWidth, newMargins);
-          request.resource.overflowCallback(/* overflown */ false,
-              request.newHeight, request.newWidth, newMargins);
+          request.resource./*OK*/ changeSize(
+            request.newHeight,
+            request.newWidth,
+            newMargins
+          );
+          request.resource.overflowCallback(
+            /* overflown */ false,
+            request.newHeight,
+            request.newWidth,
+            newMargins
+          );
           this.maybeChangeHeight_ = true;
         }
 
         if (request.callback) {
-          request.callback(/* hasSizeChanged */resize);
+          request.callback(/* hasSizeChanged */ resize);
         }
       }
 
@@ -1429,39 +1530,48 @@ export class Resources {
 
       // Execute scroll-adjusting resize requests, if any.
       if (scrollAdjSet.length > 0) {
-        this.vsync_.run({
-          measure: state => {
-            state./*OK*/scrollHeight = this.viewport_./*OK*/getScrollHeight();
-            state./*OK*/scrollTop = this.viewport_./*OK*/getScrollTop();
-          },
-          mutate: state => {
-            let minTop = -1;
-            scrollAdjSet.forEach(request => {
-              const box = request.resource.getLayoutBox();
-              minTop = minTop == -1 ? box.top : Math.min(minTop, box.top);
-              request.resource./*OK*/changeSize(
-                  request.newHeight, request.newWidth, request.marginChange ?
-                    request.marginChange.newMargins : undefined);
-              if (request.callback) {
-                request.callback(/* hasSizeChanged */true);
-              }
-            });
-            if (this.useLayers_) {
+        this.vsync_.run(
+          {
+            measure: state => {
+              state./*OK*/ scrollHeight = this.viewport_./*OK*/ getScrollHeight();
+              state./*OK*/ scrollTop = this.viewport_./*OK*/ getScrollTop();
+            },
+            mutate: state => {
+              let minTop = -1;
               scrollAdjSet.forEach(request => {
-                this.dirtyElement(request.resource.element);
+                const box = request.resource.getLayoutBox();
+                minTop = minTop == -1 ? box.top : Math.min(minTop, box.top);
+                request.resource./*OK*/ changeSize(
+                  request.newHeight,
+                  request.newWidth,
+                  request.marginChange
+                    ? request.marginChange.newMargins
+                    : undefined
+                );
+                if (request.callback) {
+                  request.callback(/* hasSizeChanged */ true);
+                }
               });
-            } else if (minTop != -1) {
-              this.setRelayoutTop_(minTop);
-            }
-            // Sync is necessary here to avoid UI jump in the next frame.
-            const newScrollHeight = this.viewport_./*OK*/getScrollHeight();
-            if (newScrollHeight != state./*OK*/scrollHeight) {
-              this.viewport_.setScrollTop(state./*OK*/scrollTop +
-                  (newScrollHeight - state./*OK*/scrollHeight));
-            }
-            this.maybeChangeHeight_ = true;
+              if (this.useLayers_) {
+                scrollAdjSet.forEach(request => {
+                  this.dirtyElement(request.resource.element);
+                });
+              } else if (minTop != -1) {
+                this.setRelayoutTop_(minTop);
+              }
+              // Sync is necessary here to avoid UI jump in the next frame.
+              const newScrollHeight = this.viewport_./*OK*/ getScrollHeight();
+              if (newScrollHeight != state./*OK*/ scrollHeight) {
+                this.viewport_.setScrollTop(
+                  state./*OK*/ scrollTop +
+                    (newScrollHeight - state./*OK*/ scrollHeight)
+                );
+              }
+              this.maybeChangeHeight_ = true;
+            },
           },
-        }, {});
+          {}
+        );
       }
     }
   }
@@ -1513,17 +1623,23 @@ export class Resources {
    * @private
    */
   checkPendingChangeSize_(element) {
-    const resourceElement = closest(element,
-        el => !!Resource.forElementOptional(el));
+    const resourceElement = closest(
+      element,
+      el => !!Resource.forElementOptional(el)
+    );
     if (!resourceElement) {
       return;
     }
     const resource = Resource.forElement(resourceElement);
     const pendingChangeSize = resource.getPendingChangeSize();
     if (pendingChangeSize !== undefined) {
-      this.scheduleChangeSize_(resource, pendingChangeSize.height,
-          pendingChangeSize.width, pendingChangeSize.margins,
-          /* force */ true);
+      this.scheduleChangeSize_(
+        resource,
+        pendingChangeSize.height,
+        pendingChangeSize.width,
+        pendingChangeSize.margins,
+        /* force */ true
+      );
     }
   }
 
@@ -1559,9 +1675,11 @@ export class Resources {
       if (r.getState() == ResourceState.NOT_BUILT && !r.isBuilding()) {
         this.buildOrScheduleBuildForResource_(r, /* checkForDupes */ true);
       }
-      if (relayoutAll ||
-              !r.hasBeenMeasured() ||
-              r.getState() == ResourceState.NOT_LAID_OUT) {
+      if (
+        relayoutAll ||
+        !r.hasBeenMeasured() ||
+        r.getState() == ResourceState.NOT_LAID_OUT
+      ) {
         r.applySizesAndMediaQuery();
         relayoutCount++;
       }
@@ -1573,19 +1691,24 @@ export class Resources {
     // Phase 2: Remeasure if there were any relayouts. Unfortunately, currently
     // there's no way to optimize this. All reads happen here.
     let toUnload;
-    if (relayoutCount > 0 || remeasureCount > 0 ||
-            relayoutAll || relayoutTop != -1) {
+    if (
+      relayoutCount > 0 ||
+      remeasureCount > 0 ||
+      relayoutAll ||
+      relayoutTop != -1
+    ) {
       for (let i = 0; i < this.resources_.length; i++) {
         const r = this.resources_[i];
         if (r.hasOwner() && !r.isMeasureRequested()) {
           // If element has owner, and measure is not requested, do nothing.
           continue;
         }
-        if (relayoutAll ||
-                r.getState() == ResourceState.NOT_LAID_OUT ||
-                !r.hasBeenMeasured() ||
-                r.isMeasureRequested() ||
-                (relayoutTop != -1 && r.getLayoutBox().bottom >= relayoutTop)
+        if (
+          relayoutAll ||
+          r.getState() == ResourceState.NOT_LAID_OUT ||
+          !r.hasBeenMeasured() ||
+          r.isMeasureRequested() ||
+          (relayoutTop != -1 && r.getLayoutBox().bottom >= relayoutTop)
         ) {
           const wasDisplayed = r.isDisplayed();
           r.measure();
@@ -1622,10 +1745,10 @@ export class Resources {
     }
 
     const visibleRect = this.visible_
-      // When the doc is visible, consider the viewport to be 25% larger,
-      // to minimize effect from small scrolling and notify things that
-      // they are in viewport just before they are actually visible.
-      ? expandLayoutRect(viewportRect, 0.25, 0.25)
+      ? // When the doc is visible, consider the viewport to be 25% larger,
+        // to minimize effect from small scrolling and notify things that
+        // they are in viewport just before they are actually visible.
+        expandLayoutRect(viewportRect, 0.25, 0.25)
       : viewportRect;
 
     // Phase 3: Trigger "viewport enter/exit" events.
@@ -1639,8 +1762,8 @@ export class Resources {
       // TODO(dvoytenko, #3434): Reimplement the use of `isFixed` with
       // layers. This is currently a short-term fix to the problem that
       // the fixed elements get incorrect top coord.
-      const shouldBeInViewport = (this.visible_ && r.isDisplayed() &&
-          r.overlaps(visibleRect));
+      const shouldBeInViewport =
+        this.visible_ && r.isDisplayed() && r.overlaps(visibleRect);
       r.setInViewport(shouldBeInViewport);
     }
 
@@ -1661,18 +1784,27 @@ export class Resources {
       }
     }
 
-    if (this.visible_ &&
-          this.exec_.getSize() == 0 &&
-          this.queue_.getSize() == 0 &&
-          now > this.exec_.getLastDequeueTime() + 5000) {
+    if (
+      this.visible_ &&
+      this.exec_.getSize() == 0 &&
+      this.queue_.getSize() == 0 &&
+      now > this.exec_.getLastDequeueTime() + 5000
+    ) {
       // Phase 5: Idle Render Outside Viewport layout: layout up to 4 items
       // with idleRenderOutsideViewport true
       let idleScheduledCount = 0;
-      for (let i = 0; i < this.resources_.length && idleScheduledCount < 4;
-        i++) {
+      for (
+        let i = 0;
+        i < this.resources_.length && idleScheduledCount < 4;
+        i++
+      ) {
         const r = this.resources_[i];
-        if (r.getState() == ResourceState.READY_FOR_LAYOUT &&
-            !r.hasOwner() && r.isDisplayed() && r.idleRenderOutsideViewport()) {
+        if (
+          r.getState() == ResourceState.READY_FOR_LAYOUT &&
+          !r.hasOwner() &&
+          r.isDisplayed() &&
+          r.idleRenderOutsideViewport()
+        ) {
           dev().fine(TAG_, 'idleRenderOutsideViewport layout:', r.debugid);
           this.scheduleLayoutOrPreload_(r, /* layout */ false);
           idleScheduledCount++;
@@ -1680,11 +1812,17 @@ export class Resources {
       }
       // Phase 6: Idle layout: layout more if we are otherwise not doing much.
       // TODO(dvoytenko): document/estimate IDLE timeouts and other constants
-      for (let i = 0; i < this.resources_.length && idleScheduledCount < 4;
-        i++) {
+      for (
+        let i = 0;
+        i < this.resources_.length && idleScheduledCount < 4;
+        i++
+      ) {
         const r = this.resources_[i];
-        if (r.getState() == ResourceState.READY_FOR_LAYOUT &&
-            !r.hasOwner() && r.isDisplayed()) {
+        if (
+          r.getState() == ResourceState.READY_FOR_LAYOUT &&
+          !r.hasOwner() &&
+          r.isDisplayed()
+        ) {
           dev().fine(TAG_, 'idle layout:', r.debugid);
           this.scheduleLayoutOrPreload_(r, /* layout */ false);
           idleScheduledCount++;
@@ -1713,10 +1851,17 @@ export class Resources {
     let task = this.queue_.peek(this.boundTaskScorer_, state);
     while (task) {
       timeout = this.calcTaskTimeout_(task);
-      dev().fine(TAG_, 'peek from queue:', task.id,
-          'sched at', task.scheduleTime,
-          'score', this.boundTaskScorer_(task, state),
-          'timeout', timeout);
+      dev().fine(
+        TAG_,
+        'peek from queue:',
+        task.id,
+        'sched at',
+        task.scheduleTime,
+        'score',
+        this.boundTaskScorer_(task, state),
+        'timeout',
+        timeout
+      );
       if (timeout > 16) {
         break;
       }
@@ -1732,15 +1877,17 @@ export class Resources {
         executing.promise.then(reschedule, reschedule);
       } else {
         task.resource.measure();
-        if (this.isLayoutAllowed_(
-            task.resource, task.forceOutsideViewport)) {
+        if (this.isLayoutAllowed_(task.resource, task.forceOutsideViewport)) {
           task.promise = task.callback();
           task.startTime = now;
           dev().fine(TAG_, 'exec:', task.id, 'at', task.startTime);
           this.exec_.enqueue(task);
-          task.promise.then(this.taskComplete_.bind(this, task, true),
-              this.taskComplete_.bind(this, task, false))
-              .catch(/** @type {function (*)} */ (reportError));
+          task.promise
+            .then(
+              this.taskComplete_.bind(this, task, true),
+              this.taskComplete_.bind(this, task, false)
+            )
+            .catch(/** @type {function (*)} */ (reportError));
         } else {
           dev().fine(TAG_, 'cancelled', task.id);
           task.resource.layoutCanceled();
@@ -1803,7 +1950,7 @@ export class Resources {
       posPriority *= 2;
     }
     posPriority = Math.abs(posPriority);
-    return (task.priority * PRIORITY_BASE_) + posPriority;
+    return task.priority * PRIORITY_BASE_ + posPriority;
   }
 
   /**
@@ -1822,9 +1969,12 @@ export class Resources {
    * @private
    */
   calcTaskScoreLayers_(task, cache) {
-    const layerScore = this.layers_.iterateAncestry(task.resource.element,
-        this.boundCalcLayoutScore_, cache);
-    return (task.priority * PRIORITY_BASE_) + layerScore;
+    const layerScore = this.layers_.iterateAncestry(
+      task.resource.element,
+      this.boundCalcLayoutScore_,
+      cache
+    );
+    return task.priority * PRIORITY_BASE_ + layerScore;
   }
 
   /**
@@ -1844,11 +1994,12 @@ export class Resources {
     }
 
     const score = currentScore || 0;
-    const depthPenalty = 1 + (depth / 10);
+    const depthPenalty = 1 + depth / 10;
     const nonActivePenalty = layout.isActiveUnsafe() ? 1 : 2;
-    const distance = layout.getHorizontalDistanceFromParent() +
-        layout.getVerticalDistanceFromParent();
-    return cache[id] = score + (nonActivePenalty * depthPenalty * distance);
+    const distance =
+      layout.getHorizontalDistanceFromParent() +
+      layout.getVerticalDistanceFromParent();
+    return (cache[id] = score + nonActivePenalty * depthPenalty * distance);
   }
 
   /**
@@ -1886,8 +2037,10 @@ export class Resources {
     this.exec_.forEach(other => {
       // Higher priority tasks get the head start. Currently 500ms per a drop
       // in priority (note that priority is 10-based).
-      const penalty = Math.max((task.priority - other.priority) *
-          PRIORITY_PENALTY_TIME_, 0);
+      const penalty = Math.max(
+        (task.priority - other.priority) * PRIORITY_PENALTY_TIME_,
+        0
+      );
       // TODO(dvoytenko): Consider running total and not maximum.
       timeout = Math.max(timeout, penalty - (now - other.startTime));
     });
@@ -1916,8 +2069,13 @@ export class Resources {
     this.exec_.dequeue(task);
     this.schedulePass(POST_TASK_PASS_DELAY_);
     if (!success) {
-      dev().info(TAG_, 'task failed:',
-          task.id, task.resource.debugid, opt_reason);
+      dev().info(
+        TAG_,
+        'task failed:',
+        task.id,
+        task.resource.debugid,
+        opt_reason
+      );
       return Promise.reject(opt_reason);
     }
   }
@@ -1932,11 +2090,23 @@ export class Resources {
    * @param {function(boolean)=} opt_callback A callback function
    * @private
    */
-  scheduleChangeSize_(resource, newHeight, newWidth, newMargins, force,
-    opt_callback) {
+  scheduleChangeSize_(
+    resource,
+    newHeight,
+    newWidth,
+    newMargins,
+    force,
+    opt_callback
+  ) {
     if (resource.hasBeenMeasured() && !newMargins) {
-      this.completeScheduleChangeSize_(resource, newHeight, newWidth,
-          undefined, force, opt_callback);
+      this.completeScheduleChangeSize_(
+        resource,
+        newHeight,
+        newWidth,
+        undefined,
+        force,
+        opt_callback
+      );
     } else {
       // This is a rare case since most of times the element itself schedules
       // resize requests. However, this case is possible when another element
@@ -1947,12 +2117,20 @@ export class Resources {
         if (!resource.hasBeenMeasured()) {
           resource.measure();
         }
-        const marginChange = newMargins ? {
-          newMargins,
-          currentMargins: this.getLayoutMargins_(resource),
-        } : undefined;
-        this.completeScheduleChangeSize_(resource, newHeight, newWidth,
-            marginChange, force, opt_callback);
+        const marginChange = newMargins
+          ? {
+              newMargins,
+              currentMargins: this.getLayoutMargins_(resource),
+            }
+          : undefined;
+        this.completeScheduleChangeSize_(
+          resource,
+          newHeight,
+          newWidth,
+          marginChange,
+          force,
+          opt_callback
+        );
       });
     }
   }
@@ -1982,19 +2160,35 @@ export class Resources {
    * @param {function(boolean)=} opt_callback A callback function
    * @private
    */
-  completeScheduleChangeSize_(resource, newHeight, newWidth, marginChange,
-    force, opt_callback) {
+  completeScheduleChangeSize_(
+    resource,
+    newHeight,
+    newWidth,
+    marginChange,
+    force,
+    opt_callback
+  ) {
     resource.resetPendingChangeSize();
     const layoutBox = resource.getPageLayoutBox();
-    if ((newHeight === undefined || newHeight == layoutBox.height) &&
-        (newWidth === undefined || newWidth == layoutBox.width) &&
-        (marginChange === undefined || !areMarginsChanged(
-            marginChange.currentMargins, marginChange.newMargins))) {
-      if (newHeight === undefined && newWidth === undefined &&
-          marginChange === undefined) {
+    if (
+      (newHeight === undefined || newHeight == layoutBox.height) &&
+      (newWidth === undefined || newWidth == layoutBox.width) &&
+      (marginChange === undefined ||
+        !areMarginsChanged(
+          marginChange.currentMargins,
+          marginChange.newMargins
+        ))
+    ) {
+      if (
+        newHeight === undefined &&
+        newWidth === undefined &&
+        marginChange === undefined
+      ) {
         dev().error(
-            TAG_, 'attempting to change size with undefined dimensions',
-            resource.debugid);
+          TAG_,
+          'attempting to change size with undefined dimensions',
+          resource.debugid
+        );
       }
       // Nothing to do.
       if (opt_callback) {
@@ -2018,14 +2212,16 @@ export class Resources {
       request.force = force || request.force;
       request.callback = opt_callback;
     } else {
-      this.requestsChangeSize_.push(/** {!ChangeSizeRequestDef} */{
-        resource,
-        newHeight,
-        newWidth,
-        marginChange,
-        force,
-        callback: opt_callback,
-      });
+      this.requestsChangeSize_.push(
+        /** {!ChangeSizeRequestDef} */ {
+          resource,
+          newHeight,
+          newWidth,
+          marginChange,
+          force,
+          callback: opt_callback,
+        }
+      );
     }
     this.schedulePassVsync();
   }
@@ -2040,25 +2236,31 @@ export class Resources {
    */
   isLayoutAllowed_(resource, forceOutsideViewport) {
     // Only built and displayed elements can be loaded.
-    if (resource.getState() == ResourceState.NOT_BUILT ||
-        !resource.isDisplayed()) {
+    if (
+      resource.getState() == ResourceState.NOT_BUILT ||
+      !resource.isDisplayed()
+    ) {
       return false;
     }
 
     // Don't schedule elements when we're not visible, or in prerender mode
     // (and they can't prerender).
     if (!this.visible_) {
-      if (this.viewer_.getVisibilityState() != VisibilityState.PRERENDER ||
-          !resource.prerenderAllowed()) {
+      if (
+        this.viewer_.getVisibilityState() != VisibilityState.PRERENDER ||
+        !resource.prerenderAllowed()
+      ) {
         return false;
       }
     }
 
     // The element has to be in its rendering corridor.
-    if (!forceOutsideViewport &&
-        !resource.isInViewport() &&
-        !resource.renderOutsideViewport() &&
-        !resource.idleRenderOutsideViewport()) {
+    if (
+      !forceOutsideViewport &&
+      !resource.isInViewport() &&
+      !resource.renderOutsideViewport() &&
+      !resource.idleRenderOutsideViewport()
+    ) {
       return false;
     }
 
@@ -2073,29 +2275,41 @@ export class Resources {
    * @param {boolean=} opt_forceOutsideViewport
    * @private
    */
-  scheduleLayoutOrPreload_(resource, layout, opt_parentPriority,
-    opt_forceOutsideViewport) {
-    devAssert(resource.getState() != ResourceState.NOT_BUILT &&
-        resource.isDisplayed(),
-    'Not ready for layout: %s (%s)',
-    resource.debugid, resource.getState());
+  scheduleLayoutOrPreload_(
+    resource,
+    layout,
+    opt_parentPriority,
+    opt_forceOutsideViewport
+  ) {
+    devAssert(
+      resource.getState() != ResourceState.NOT_BUILT && resource.isDisplayed(),
+      'Not ready for layout: %s (%s)',
+      resource.debugid,
+      resource.getState()
+    );
     const forceOutsideViewport = opt_forceOutsideViewport || false;
     if (!this.isLayoutAllowed_(resource, forceOutsideViewport)) {
       return;
     }
 
     if (layout) {
-      this.schedule_(resource,
-          LAYOUT_TASK_ID_, LAYOUT_TASK_OFFSET_,
-          opt_parentPriority || 0,
-          forceOutsideViewport,
-          resource.startLayout.bind(resource));
+      this.schedule_(
+        resource,
+        LAYOUT_TASK_ID_,
+        LAYOUT_TASK_OFFSET_,
+        opt_parentPriority || 0,
+        forceOutsideViewport,
+        resource.startLayout.bind(resource)
+      );
     } else {
-      this.schedule_(resource,
-          PRELOAD_TASK_ID_, PRELOAD_TASK_OFFSET_,
-          opt_parentPriority || 0,
-          forceOutsideViewport,
-          resource.startLayout.bind(resource));
+      this.schedule_(
+        resource,
+        PRELOAD_TASK_ID_,
+        PRELOAD_TASK_OFFSET_,
+        opt_parentPriority || 0,
+        forceOutsideViewport,
+        resource.startLayout.bind(resource)
+      );
     }
   }
 
@@ -2111,12 +2325,18 @@ export class Resources {
     this.discoverResourcesForArray_(parentResource, subElements, resource => {
       if (resource.getState() == ResourceState.NOT_BUILT) {
         resource.whenBuilt().then(() => {
-          this.measureAndScheduleIfAllowed_(resource, layout,
-              parentResource.getLayoutPriority());
+          this.measureAndScheduleIfAllowed_(
+            resource,
+            layout,
+            parentResource.getLayoutPriority()
+          );
         });
       } else {
-        this.measureAndScheduleIfAllowed_(resource, layout,
-            parentResource.getLayoutPriority());
+        this.measureAndScheduleIfAllowed_(
+          resource,
+          layout,
+          parentResource.getLayoutPriority()
+        );
       }
     });
   }
@@ -2129,8 +2349,10 @@ export class Resources {
    */
   measureAndScheduleIfAllowed_(resource, layout, parentPriority) {
     resource.measure();
-    if (resource.getState() == ResourceState.READY_FOR_LAYOUT &&
-        resource.isDisplayed()) {
+    if (
+      resource.getState() == ResourceState.READY_FOR_LAYOUT &&
+      resource.isDisplayed()
+    ) {
       this.scheduleLayoutOrPreload_(resource, layout, parentPriority);
     }
   }
@@ -2151,14 +2373,15 @@ export class Resources {
     priorityOffset,
     parentPriority,
     forceOutsideViewport,
-    callback) {
+    callback
+  ) {
     const taskId = resource.getTaskId(localId);
 
     const task = {
       id: taskId,
       resource,
-      priority: Math.max(resource.getLayoutPriority(), parentPriority) +
-          priorityOffset,
+      priority:
+        Math.max(resource.getLayoutPriority(), parentPriority) + priorityOffset,
       forceOutsideViewport,
       callback,
       scheduleTime: Date.now(),
@@ -2187,8 +2410,11 @@ export class Resources {
    * @param {boolean} inLocalViewport
    * @private
    */
-  updateInViewportForSubresources_(parentResource, subElements,
-    inLocalViewport) {
+  updateInViewportForSubresources_(
+    parentResource,
+    subElements,
+    inLocalViewport
+  ) {
     const inViewport = parentResource.isInViewport() && inLocalViewport;
     this.discoverResourcesForArray_(parentResource, subElements, resource => {
       resource.setInViewport(inViewport);
@@ -2356,8 +2582,11 @@ export class Resources {
       });
     }
 
-    if (resource.getState() == ResourceState.NOT_BUILT && opt_removePending &&
-        this.pendingBuildResources_) {
+    if (
+      resource.getState() == ResourceState.NOT_BUILT &&
+      opt_removePending &&
+      this.pendingBuildResources_
+    ) {
       const pendingIndex = this.pendingBuildResources_.indexOf(resource);
       if (pendingIndex != -1) {
         this.pendingBuildResources_.splice(pendingIndex, 1);
@@ -2366,18 +2595,16 @@ export class Resources {
   }
 }
 
-
 /**
  * @param {!Element|!Array<!Element>} elements
  * @return {!Array<!Element>}
  */
 function elements_(elements) {
-  return /** @type {!Array<!Element>} */ (
-    isArray(elements) ? elements : [elements]);
+  return /** @type {!Array<!Element>} */ (isArray(elements)
+    ? elements
+    : [elements]);
 }
 
-
-
 /**
  * The internal structure of a ChangeHeightRequest.
  * @typedef {{
diff --git a/src/service/standard-actions-impl.js b/src/service/standard-actions-impl.js
index e7ccbf3f04b2..9291b899291e 100644
--- a/src/service/standard-actions-impl.js
+++ b/src/service/standard-actions-impl.js
@@ -20,7 +20,9 @@ import {Services} from '../services';
 import {computedStyle, toggle} from '../style';
 import {dev, user, userAssert} from '../log';
 import {
-  getAmpdoc, installServiceInEmbedScope, registerServiceBuilderForDoc,
+  getAmpdoc,
+  installServiceInEmbedScope,
+  registerServiceBuilderForDoc,
 } from '../service';
 import {isFiniteNumber, toWin} from '../types';
 import {startsWith} from '../string';
@@ -49,7 +51,6 @@ export function getAutofocusElementForShowAction(element) {
 /** @const {string} */
 const TAG = 'STANDARD-ACTIONS';
 
-
 /**
  * This service contains implementations of some of the most typical actions,
  * such as hiding DOM elements.
@@ -65,7 +66,7 @@ export class StandardActions {
     /** @const {!./ampdoc-impl.AmpDoc} */
     this.ampdoc = ampdoc;
 
-    const context = (opt_win)
+    const context = opt_win
       ? opt_win.document.documentElement
       : ampdoc.getHeadNode();
 
@@ -82,8 +83,11 @@ export class StandardActions {
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(embedWin, 'standard-actions',
-        new StandardActions(ampdoc, embedWin));
+    installServiceInEmbedScope(
+      embedWin,
+      'standard-actions',
+      new StandardActions(ampdoc, embedWin)
+    );
   }
 
   /**
@@ -96,23 +100,26 @@ export class StandardActions {
     // All standard actions require high trust by default via
     // addGlobalMethodHandler.
 
-    actionService.addGlobalMethodHandler(
-        'hide', this.handleHide_.bind(this));
+    actionService.addGlobalMethodHandler('hide', this.handleHide_.bind(this));
 
-    actionService.addGlobalMethodHandler(
-        'show', this.handleShow_.bind(this));
+    actionService.addGlobalMethodHandler('show', this.handleShow_.bind(this));
 
     actionService.addGlobalMethodHandler(
-        'toggleVisibility', this.handleToggle_.bind(this));
+      'toggleVisibility',
+      this.handleToggle_.bind(this)
+    );
 
     actionService.addGlobalMethodHandler(
-        'scrollTo', this.handleScrollTo_.bind(this));
+      'scrollTo',
+      this.handleScrollTo_.bind(this)
+    );
 
-    actionService.addGlobalMethodHandler(
-        'focus', this.handleFocus_.bind(this));
+    actionService.addGlobalMethodHandler('focus', this.handleFocus_.bind(this));
 
     actionService.addGlobalMethodHandler(
-        'toggleClass', this.handleToggleClass_.bind(this));
+      'toggleClass',
+      this.handleToggleClass_.bind(this)
+    );
   }
 
   /**
@@ -133,8 +140,8 @@ export class StandardActions {
     switch (method) {
       case 'pushState':
       case 'setState':
-        const element = (node.nodeType === Node.DOCUMENT_NODE)
-          ? node.documentElement : node;
+        const element =
+          node.nodeType === Node.DOCUMENT_NODE ? node.documentElement : node;
         return Services.bindForDocOrNull(element).then(bind => {
           userAssert(bind, 'AMP-BIND is not installed.');
           return bind.invoke(invocation);
@@ -147,11 +154,10 @@ export class StandardActions {
         return this.handleCloseOrNavigateTo_(invocation);
 
       case 'scrollTo':
-        userAssert(args['id'],
-            'AMP.scrollTo must provide element ID');
+        userAssert(args['id'], 'AMP.scrollTo must provide element ID');
         invocation.node = dev().assertElement(
-            getAmpdoc(node).getElementById(args['id']),
-            'scrollTo element ID must exist on page'
+          getAmpdoc(node).getElementById(args['id']),
+          'scrollTo element ID must exist on page'
         );
         return this.handleScrollTo_(invocation);
 
@@ -165,10 +171,10 @@ export class StandardActions {
 
       case 'optoutOfCid':
         return Services.cidForDoc(this.ampdoc)
-            .then(cid => cid.optOut())
-            .catch(reason => {
-              dev().error(TAG, 'Failed to opt out of CID', reason);
-            });
+          .then(cid => cid.optOut())
+          .catch(reason => {
+            dev().error(TAG, 'Failed to opt out of CID', reason);
+          });
     }
     throw user().createError('Unknown AMP action ', method);
   }
@@ -191,13 +197,19 @@ export class StandardActions {
         }
       });
     }
-    return permission.then(() => {
-      Services.navigationForDoc(this.ampdoc).navigateTo(
-          win, args['url'], `AMP.${method}`,
-          {target: args['target'], opener: args['opener']});
-    }, /* onrejected */ e => {
-      user().error(TAG, e.message);
-    });
+    return permission.then(
+      () => {
+        Services.navigationForDoc(this.ampdoc).navigateTo(
+          win,
+          args['url'],
+          `AMP.${method}`,
+          {target: args['target'], opener: args['opener']}
+        );
+      },
+      /* onrejected */ e => {
+        user().error(TAG, e.message);
+      }
+    );
   }
 
   /**
@@ -264,7 +276,10 @@ export class StandardActions {
     // Animate the scroll
     // Should return a promise instead of null
     return this.viewport_.animateScrollIntoView(
-        node, posOrUndef, durationOrUndef);
+      node,
+      posOrUndef,
+      durationOrUndef
+    );
   }
 
   /**
@@ -294,7 +309,7 @@ export class StandardActions {
 
     this.resources_.mutateElement(target, () => {
       if (target.classList.contains('i-amphtml-element')) {
-        target./*OK*/collapse();
+        target./*OK*/ collapse();
       } else {
         toggle(target, false);
       }
@@ -316,21 +331,24 @@ export class StandardActions {
 
     if (target.classList.contains(getLayoutClass(Layout.NODISPLAY))) {
       user().warn(
-          TAG,
-          'Elements with layout=nodisplay cannot be dynamically shown.',
-          target);
+        TAG,
+        'Elements with layout=nodisplay cannot be dynamically shown.',
+        target
+      );
       return null;
     }
 
     this.resources_.measureElement(() => {
-      if (computedStyle(ownerWindow, target).display == 'none' &&
-          !isShowable(target)) {
-
+      if (
+        computedStyle(ownerWindow, target).display == 'none' &&
+        !isShowable(target)
+      ) {
         user().warn(
-            TAG,
-            'Elements can only be dynamically shown when they have the ' +
+          TAG,
+          'Elements can only be dynamically shown when they have the ' +
             '"hidden" attribute set or when they were dynamically hidden.',
-            target);
+          target
+        );
       }
     });
 
@@ -355,7 +373,7 @@ export class StandardActions {
    */
   handleShowSync_(target, autofocusElOrNull) {
     if (target.classList.contains('i-amphtml-element')) {
-      target./*OK*/expand();
+      target./*OK*/ expand();
     } else {
       toggle(target, true);
     }
@@ -386,14 +404,18 @@ export class StandardActions {
   handleToggleClass_(invocation) {
     const target = dev().assertElement(invocation.node);
     const {args} = invocation;
-    const className = user().assertString(args['class'],
-        "Argument 'class' must be a string.");
+    const className = user().assertString(
+      args['class'],
+      "Argument 'class' must be a string."
+    );
 
     this.resources_.mutateElement(target, () => {
       if (args['force'] !== undefined) {
         // must be boolean, won't do type conversion
-        const shouldForce = user().assertBoolean(args['force'],
-            "Optional argument 'force' must be a boolean.");
+        const shouldForce = user().assertBoolean(
+          args['force'],
+          "Optional argument 'force' must be a boolean."
+        );
         target.classList.toggle(className, shouldForce);
       } else {
         target.classList.toggle(className);
@@ -404,14 +426,14 @@ export class StandardActions {
   }
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  */
 export function installStandardActionsForDoc(ampdoc) {
   registerServiceBuilderForDoc(
-      ampdoc,
-      'standard-actions',
-      StandardActions,
-      /* opt_instantiate */ true);
+    ampdoc,
+    'standard-actions',
+    StandardActions,
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/storage-impl.js b/src/service/storage-impl.js
index 26ad517af4e1..256a00b4cc85 100644
--- a/src/service/storage-impl.js
+++ b/src/service/storage-impl.js
@@ -27,7 +27,6 @@ const TAG = 'Storage';
 /** @const */
 const MAX_VALUES_PER_ORIGIN = 8;
 
-
 /**
  * The storage API. This is an API equivalent to the Web LocalStorage API but
  * extended to all AMP embedding scenarios.
@@ -39,7 +38,6 @@ const MAX_VALUES_PER_ORIGIN = 8;
  * @private Visible for testing only.
  */
 export class Storage {
-
   /**
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
    * @param {!../service/viewer-impl.Viewer} viewer
@@ -123,13 +121,14 @@ export class Storage {
    */
   getStore_() {
     if (!this.storePromise_) {
-      this.storePromise_ = this.binding_.loadBlob(this.origin_)
-          .then(blob => blob ? parseJson(atob(blob)) : {})
-          .catch(reason => {
-            dev().expectedError(TAG, 'Failed to load store: ', reason);
-            return {};
-          })
-          .then(obj => new Store(obj));
+      this.storePromise_ = this.binding_
+        .loadBlob(this.origin_)
+        .then(blob => (blob ? parseJson(atob(blob)) : {}))
+        .catch(reason => {
+          dev().expectedError(TAG, 'Failed to load store: ', reason);
+          return {};
+        })
+        .then(obj => new Store(obj));
     }
     return this.storePromise_;
   }
@@ -141,22 +140,24 @@ export class Storage {
    */
   saveStore_(mutator) {
     return this.getStore_()
-        .then(store => {
-          mutator(store);
-          // Need to encode stored object to avoid plain text,
-          // but doesn't need to be base64encode. Can convert to some other
-          // encoding method for further improvement.
-          const blob = btoa(JSON.stringify(store.obj));
-          return this.binding_.saveBlob(this.origin_, blob);
-        })
-        .then(this.broadcastReset_.bind(this));
+      .then(store => {
+        mutator(store);
+        // Need to encode stored object to avoid plain text,
+        // but doesn't need to be base64encode. Can convert to some other
+        // encoding method for further improvement.
+        const blob = btoa(JSON.stringify(store.obj));
+        return this.binding_.saveBlob(this.origin_, blob);
+      })
+      .then(this.broadcastReset_.bind(this));
   }
 
   /** @private */
   listenToBroadcasts_() {
     this.viewer_.onBroadcast(message => {
-      if (message['type'] == 'amp-storage-reset' &&
-              message['origin'] == this.origin_) {
+      if (
+        message['type'] == 'amp-storage-reset' &&
+        message['origin'] == this.origin_
+      ) {
         dev().fine(TAG, 'Received reset message');
         this.storePromise_ = null;
       }
@@ -166,14 +167,15 @@ export class Storage {
   /** @private */
   broadcastReset_() {
     dev().fine(TAG, 'Broadcasted reset message');
-    this.viewer_.broadcast(/** @type {!JsonObject} */ ({
-      'type': 'amp-storage-reset',
-      'origin': this.origin_,
-    }));
+    this.viewer_.broadcast(
+      /** @type {!JsonObject} */ ({
+        'type': 'amp-storage-reset',
+        'origin': this.origin_,
+      })
+    );
   }
 }
 
-
 /**
  * The implementation of store logic for get, set and remove.
  *
@@ -227,8 +229,11 @@ export class Store {
    * @param {boolean=} opt_isUpdate
    */
   set(name, value, opt_isUpdate) {
-    devAssert(name != '__proto__' && name != 'prototype',
-        'Name is not allowed: %s', name);
+    devAssert(
+      name != '__proto__' && name != 'prototype',
+      'Name is not allowed: %s',
+      name
+    );
     // The structure is {key: {v: *, t: time}}
     if (this.values_[name] !== undefined) {
       const item = this.values_[name];
@@ -273,13 +278,11 @@ export class Store {
   }
 }
 
-
 /**
  * A binding provides the specific implementation of storage technology.
  * @interface
  */
 class StorageBindingDef {
-
   /**
    * Returns the promise that yields the store blob for the specified origin.
    * @param {string} unusedOrigin
@@ -297,14 +300,12 @@ class StorageBindingDef {
   saveBlob(unusedOrigin, unusedBlob) {}
 }
 
-
 /**
  * Storage implementation using Web LocalStorage API.
  * @implements {StorageBindingDef}
  * @private Visible for testing only.
  */
 export class LocalStorageBinding {
-
   /**
    * @param {!Window} win
    */
@@ -376,14 +377,12 @@ export class LocalStorageBinding {
   }
 }
 
-
 /**
  * Storage implementation delegated to the Viewer.
  * @implements {StorageBindingDef}
  * @private Visible for testing only.
  */
 export class ViewerStorageBinding {
-
   /**
    * @param {!../service/viewer-impl.Viewer} viewer
    */
@@ -394,32 +393,35 @@ export class ViewerStorageBinding {
 
   /** @override */
   loadBlob(origin) {
-    return this.viewer_.sendMessageAwaitResponse('loadStore',
-        dict({'origin': origin})).then(response => response['blob']);
+    return this.viewer_
+      .sendMessageAwaitResponse('loadStore', dict({'origin': origin}))
+      .then(response => response['blob']);
   }
 
   /** @override */
   saveBlob(origin, blob) {
     return /** @type {!Promise} */ (this.viewer_.sendMessageAwaitResponse(
-        'saveStore', dict({'origin': origin, 'blob': blob})));
+      'saveStore',
+      dict({'origin': origin, 'blob': blob})
+    ));
   }
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  */
 export function installStorageServiceForDoc(ampdoc) {
   registerServiceBuilderForDoc(
-      ampdoc,
-      'storage',
-      function() {
-        const viewer = Services.viewerForDoc(ampdoc);
-        const overrideStorage = parseInt(viewer.getParam('storage'), 10);
-        const binding = overrideStorage ?
-          new ViewerStorageBinding(viewer) :
-          new LocalStorageBinding(ampdoc.win);
-        return new Storage(ampdoc, viewer, binding).start_();
-      },
-      /* opt_instantiate */ true);
+    ampdoc,
+    'storage',
+    function() {
+      const viewer = Services.viewerForDoc(ampdoc);
+      const overrideStorage = parseInt(viewer.getParam('storage'), 10);
+      const binding = overrideStorage
+        ? new ViewerStorageBinding(viewer)
+        : new LocalStorageBinding(ampdoc.win);
+      return new Storage(ampdoc, viewer, binding).start_();
+    },
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/task-queue.js b/src/service/task-queue.js
index 10365290288a..9da21ec42517 100644
--- a/src/service/task-queue.js
+++ b/src/service/task-queue.js
@@ -16,7 +16,6 @@
 
 import {devAssert} from '../log';
 
-
 /**
  * The internal structure for the task.
  * @typedef {{
@@ -37,15 +36,12 @@ export let TaskDef;
  */
 let PeekStateDef;
 
-
-
 /**
  * A scheduling queue for Resources.
  *
  * @package
  */
 export class TaskQueue {
-
   /**
    * Creates an instance of TaskQueue.
    */
@@ -102,8 +98,7 @@ export class TaskQueue {
    * @param {!TaskDef} task
    */
   enqueue(task) {
-    devAssert(
-        !this.taskIdMap_[task.id], 'Task already enqueued: %s', task.id);
+    devAssert(!this.taskIdMap_[task.id], 'Task already enqueued: %s', task.id);
     this.tasks_.push(task);
     this.taskIdMap_[task.id] = task;
     this.lastEnqueueTime_ = Date.now();
diff --git a/src/service/template-impl.js b/src/service/template-impl.js
index bcc4a2243a6a..3cb42228fda4 100644
--- a/src/service/template-impl.js
+++ b/src/service/template-impl.js
@@ -26,7 +26,6 @@ import {rootNodeFor, scopedQuerySelector} from '../dom';
  * {@link https://docs.google.com/document/d/1q-5MPQHnOHLF_uL7lQsGZdzuBgrPTkCy2PdRP-YCbOw/edit#}
  */
 
-
 /**
  * @typedef {function(new:BaseTemplate, !Element, !Window)}
  */
@@ -38,12 +37,10 @@ const PROP_ = '__AMP_IMPL_';
 /** @private @const {string} */
 const PROP_PROMISE_ = '__AMP_WAIT_';
 
-
 /**
  * The interface that is implemented by all templates.
  */
 export class BaseTemplate {
-
   /**
    * @param {!Element} element
    * @param {!Window} win
@@ -131,7 +128,6 @@ export class BaseTemplate {
   }
 }
 
-
 /**
  */
 export class Templates {
@@ -208,8 +204,9 @@ export class Templates {
    */
   findAndRenderTemplate(parent, data, opt_querySelector) {
     return this.renderTemplate(
-        this.findTemplate(parent, opt_querySelector),
-        data);
+      this.findTemplate(parent, opt_querySelector),
+      data
+    );
   }
 
   /**
@@ -224,7 +221,9 @@ export class Templates {
    */
   findAndSetHtmlForTemplate(parent, html, opt_querySelector) {
     return this.setHtmlForTemplate(
-        this.findTemplate(parent, opt_querySelector), html);
+      this.findTemplate(parent, opt_querySelector),
+      html
+    );
   }
 
   /**
@@ -240,8 +239,9 @@ export class Templates {
    */
   findAndRenderTemplateArray(parent, array, opt_querySelector) {
     return this.renderTemplateArray(
-        this.findTemplate(parent, opt_querySelector),
-        array);
+      this.findTemplate(parent, opt_querySelector),
+      array
+    );
   }
 
   /**
@@ -266,10 +266,12 @@ export class Templates {
     userAssert(templateElement, 'Template not found for %s', parent);
     const templateTagName = templateElement.tagName;
     userAssert(
-        (templateTagName == 'TEMPLATE' || (templateTagName == 'SCRIPT'
-            && templateElement.getAttribute('type') === 'text/plain')),
-        'Template must be defined in a <template> or '
-        + '<script type="text/plain"> tag');
+      templateTagName == 'TEMPLATE' ||
+        (templateTagName == 'SCRIPT' &&
+          templateElement.getAttribute('type') === 'text/plain'),
+      'Template must be defined in a <template> or ' +
+        '<script type="text/plain"> tag'
+    );
     return templateElement;
   }
 
@@ -323,7 +325,7 @@ export class Templates {
     }
 
     promise = this.waitForTemplateClass_(element, type).then(templateClass => {
-      const impl = element[PROP_] = new templateClass(element, this.win_);
+      const impl = (element[PROP_] = new templateClass(element, this.win_));
       delete element[PROP_PROMISE_];
       return impl;
     });
diff --git a/src/service/timer-impl.js b/src/service/timer-impl.js
index 94114ae0d76e..3f35bda2ddbc 100644
--- a/src/service/timer-impl.js
+++ b/src/service/timer-impl.js
@@ -26,10 +26,9 @@ const TAG = 'timer';
 /**
  * Helper with all things Timer.
  *
-* @implements {../service.EmbeddableService}
+ * @implements {../service.EmbeddableService}
  */
 export class Timer {
-
   /**
    * @param {!Window} win
    */
@@ -49,9 +48,9 @@ export class Timer {
   }
 
   /**
-  * Returns time since start in milliseconds.
-  * @return {number}
-  */
+   * Returns time since start in milliseconds.
+   * @return {number}
+   */
   timeSinceStart() {
     return Date.now() - this.startTime_;
   }
@@ -71,13 +70,15 @@ export class Timer {
       // For a delay of zero,  schedule a promise based micro task since
       // they are predictably fast.
       const id = 'p' + this.taskCount_++;
-      this.resolved_.then(() => {
-        if (this.canceled_[id]) {
-          delete this.canceled_[id];
-          return;
-        }
-        callback();
-      }).catch(reportError);
+      this.resolved_
+        .then(() => {
+          if (this.canceled_[id]) {
+            delete this.canceled_[id];
+            return;
+          }
+          callback();
+        })
+        .catch(reportError);
       return id;
     }
     const wrapped = () => {
diff --git a/src/service/url-expander/expander.js b/src/service/url-expander/expander.js
index 5febf2528eb1..f36852f41ea5 100644
--- a/src/service/url-expander/expander.js
+++ b/src/service/url-expander/expander.js
@@ -30,7 +30,6 @@ export const NOENCODE_WHITELIST = {'ANCESTOR_ORIGIN': true};
 
 /** Rudamentary parser to handle nested Url replacement. */
 export class Expander {
-
   /**
    * Link this instance of parser to the calling UrlReplacment
    * @param {?../variable-source.VariableSource} variableSource the keywords to replace
@@ -42,9 +41,14 @@ export class Expander {
    *   that can be substituted.
    * @param {boolean=} opt_noEncode Should not urlEncode macro resolution.
    */
-  constructor(variableSource, opt_bindings, opt_collectVars, opt_sync,
-    opt_whiteList, opt_noEncode) {
-
+  constructor(
+    variableSource,
+    opt_bindings,
+    opt_collectVars,
+    opt_sync,
+    opt_whiteList,
+    opt_noEncode
+  ) {
     /** @const {?../variable-source.VariableSource} */
     this.variableSource_ = variableSource;
 
@@ -65,7 +69,6 @@ export class Expander {
     this.encode_ = !opt_noEncode;
   }
 
-
   /**
    * take the template url and return a promise of its evaluated value
    * @param {string} url url to be substituted
@@ -122,7 +125,6 @@ export class Expander {
     return matches;
   }
 
-
   /**
    * @param {string} url
    * @param {!Array<Object<string, string|number>>} matches Array of objects
@@ -157,8 +159,10 @@ export class Expander {
             };
           } else {
             // or the global source
-            binding = Object.assign({}, this.variableSource_.get(match.name),
-                {name: match.name, encode});
+            binding = Object.assign({}, this.variableSource_.get(match.name), {
+              name: match.name,
+              encode,
+            });
           }
 
           urlIndex = match.stop + 1;
@@ -182,23 +186,25 @@ export class Expander {
           }
 
           builder = '';
-        }
-
-        else if (url[urlIndex] === PARSER_IGNORE_FLAG) {
+        } else if (url[urlIndex] === PARSER_IGNORE_FLAG) {
           if (!ignoringChars) {
             ignoringChars = true;
             nextArgShouldBeRaw = true;
-            userAssert(builder.trim() === '',
-                `The substring "${builder}" was lost during url-replacement. ` +
-                'Please ensure the url syntax is correct');
+            userAssert(
+              builder.trim() === '',
+              `The substring "${builder}" was lost during url-replacement. ` +
+                'Please ensure the url syntax is correct'
+            );
             builder = '';
           } else {
             ignoringChars = false;
           }
           urlIndex++;
-        }
-
-        else if (numOfPendingCalls && url[urlIndex] === ',' && !ignoringChars) {
+        } else if (
+          numOfPendingCalls &&
+          url[urlIndex] === ',' &&
+          !ignoringChars
+        ) {
           if (builder.length) {
             const nextArg = nextArgShouldBeRaw ? builder : builder.trim();
             results.push(nextArg);
@@ -225,9 +231,7 @@ export class Expander {
           nextArgShouldBeRaw = false;
           const value = this.evaluateBinding_(binding, /* opt_args */ results);
           return value;
-        }
-
-        else {
+        } else {
           builder += url[urlIndex];
           urlIndex++;
         }
@@ -243,17 +247,16 @@ export class Expander {
       }
 
       return Promise.all(results)
-          .then(promiseArray => promiseArray.join(''))
-          .catch(e => {
-            rethrowAsync(e);
-            return '';
-          });
+        .then(promiseArray => promiseArray.join(''))
+        .catch(e => {
+          rethrowAsync(e);
+          return '';
+        });
     };
 
     return evaluateNextLevel(this.encode_);
   }
 
-
   /**
    * Called when a binding is ready to be resolved. Determines which version of
    * binding to use and if syncronous or asyncronous version should be called.
@@ -283,15 +286,15 @@ export class Expander {
     // We should only ever encode the top level resolution, or not at all.
     const shouldEncode = encode && !NOENCODE_WHITELIST[name];
     if (this.sync_) {
-      const result = this.evaluateBindingSync_(binding, name,opt_args);
+      const result = this.evaluateBindingSync_(binding, name, opt_args);
       return shouldEncode ? encodeURIComponent(result) : result;
     } else {
-      return this.evaluateBindingAsync_(binding, name, opt_args)
-          .then(result => shouldEncode ? encodeURIComponent(result) : result);
+      return this.evaluateBindingAsync_(binding, name, opt_args).then(result =>
+        shouldEncode ? encodeURIComponent(result) : result
+      );
     }
   }
 
-
   /**
    * Resolves binding to value to be substituted asyncronously.
    * @param {*} binding Container for sync/async resolutions.
@@ -304,31 +307,31 @@ export class Expander {
     try {
       if (typeof binding === 'function') {
         if (opt_args) {
-          value = Promise.all(opt_args)
-              .then(args => binding.apply(null, args));
+          value = Promise.all(opt_args).then(args => binding.apply(null, args));
         } else {
           value = tryResolve(binding);
         }
       } else {
         value = Promise.resolve(binding);
       }
-      return value.then(val => {
-        this.maybeCollectVars_(name, val, opt_args);
+      return value
+        .then(val => {
+          this.maybeCollectVars_(name, val, opt_args);
 
-        let result;
-
-        if (val == null) {
-          result = '';
-        } else {
-          result = val;
-        }
-        return result;
-      }).catch(e => {
-        rethrowAsync(e);
-        this.maybeCollectVars_(name, '', opt_args);
-        return Promise.resolve('');
-      });
+          let result;
 
+          if (val == null) {
+            result = '';
+          } else {
+            result = val;
+          }
+          return result;
+        })
+        .catch(e => {
+          rethrowAsync(e);
+          this.maybeCollectVars_(name, '', opt_args);
+          return Promise.resolve('');
+        });
     } catch (e) {
       // Report error, but do not disrupt URL replacement. This will
       // interpolate as the empty string.
@@ -338,7 +341,6 @@ export class Expander {
     }
   }
 
-
   /**
    * Resolves binding to value to be substituted asyncronously.
    * @param {*} binding Container for sync/async resolutions.
@@ -348,8 +350,8 @@ export class Expander {
    */
   evaluateBindingSync_(binding, name, opt_args) {
     try {
-      const value = typeof binding === 'function' ?
-        binding.apply(null, opt_args) : binding;
+      const value =
+        typeof binding === 'function' ? binding.apply(null, opt_args) : binding;
 
       let result;
 
@@ -359,8 +361,11 @@ export class Expander {
         // even if collectVars exists.
         user().error(TAG, 'ignoring async macro resolution');
         result = '';
-      } else if (typeof value === 'string' || typeof value === 'number' ||
-          typeof value === 'boolean') {
+      } else if (
+        typeof value === 'string' ||
+        typeof value === 'number' ||
+        typeof value === 'boolean'
+      ) {
         // Normal case.
         this.maybeCollectVars_(name, value, opt_args);
         result = value.toString();
@@ -370,7 +375,6 @@ export class Expander {
         result = '';
       }
 
-
       return result;
     } catch (e) {
       // Report error, but do not disrupt URL replacement. This will
diff --git a/src/service/url-impl.js b/src/service/url-impl.js
index fdb5291b40de..c0befa274d19 100644
--- a/src/service/url-impl.js
+++ b/src/service/url-impl.js
@@ -45,7 +45,7 @@ export class Url {
     const doc = root.ownerDocument || root;
 
     /** @private @const {!HTMLAnchorElement} */
-    this.anchor_ = /** @type {!HTMLAnchorElement} */(doc.createElement('a'));
+    this.anchor_ = /** @type {!HTMLAnchorElement} */ (doc.createElement('a'));
 
     /** @private @const {!LruCache} */
     this.cache_ = new LruCache(100);
@@ -53,8 +53,11 @@ export class Url {
 
   /** @override @nocollapse */
   static installInEmbedWindow(embedWin, ampdoc) {
-    installServiceInEmbedScope(embedWin, SERVICE,
-        new Url(ampdoc, embedWin.document));
+    installServiceInEmbedScope(
+      embedWin,
+      SERVICE,
+      new Url(ampdoc, embedWin.document)
+    );
   }
 
   /**
@@ -151,22 +154,20 @@ export class Url {
       return resourceUrl;
     }
 
-    const {
-      host,
-      hash,
-      pathname,
-      search,
-    } = this.parse(resourceUrl);
+    const {host, hash, pathname, search} = this.parse(resourceUrl);
     const encodedHost = encodeURIComponent(host);
     return `${urls.cdn}/c/${encodedHost}${pathname}${search}${hash}`;
   }
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  */
 export function installUrlForDoc(ampdoc) {
-  registerServiceBuilderForDoc(ampdoc, SERVICE, Url,
-      /* opt_instantiate */ true);
+  registerServiceBuilderForDoc(
+    ampdoc,
+    SERVICE,
+    Url,
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/url-replacements-impl.js b/src/service/url-replacements-impl.js
index cd11d0358649..3ca50955ce0f 100644
--- a/src/service/url-replacements-impl.js
+++ b/src/service/url-replacements-impl.js
@@ -102,11 +102,15 @@ export class GlobalVariableSource extends VariableSource {
    * @private
    */
   setTimingResolver_(varName, startEvent, endEvent) {
-    return this.setBoth(varName, () => {
-      return getTimingDataSync(this.ampdoc.win, startEvent, endEvent);
-    }, () => {
-      return getTimingDataAsync(this.ampdoc.win, startEvent, endEvent);
-    });
+    return this.setBoth(
+      varName,
+      () => {
+        return getTimingDataSync(this.ampdoc.win, startEvent, endEvent);
+      },
+      () => {
+        return getTimingDataAsync(this.ampdoc.win, startEvent, endEvent);
+      }
+    );
   }
 
   /** @override */
@@ -123,44 +127,56 @@ export class GlobalVariableSource extends VariableSource {
     // Provides a counter starting at 1 per given scope.
     const counterStore = Object.create(null);
     this.set('COUNTER', scope => {
-      return counterStore[scope] = (counterStore[scope] | 0) + 1;
+      return (counterStore[scope] = (counterStore[scope] | 0) + 1);
     });
 
     // Returns the canonical URL for this AMP document.
     this.set('CANONICAL_URL', () => this.getDocInfo_().canonicalUrl);
 
     // Returns the host of the canonical URL for this AMP document.
-    this.set('CANONICAL_HOST', () =>
-      parseUrlDeprecated(this.getDocInfo_().canonicalUrl).host);
+    this.set(
+      'CANONICAL_HOST',
+      () => parseUrlDeprecated(this.getDocInfo_().canonicalUrl).host
+    );
 
     // Returns the hostname of the canonical URL for this AMP document.
-    this.set('CANONICAL_HOSTNAME', () =>
-      parseUrlDeprecated(this.getDocInfo_().canonicalUrl).hostname);
+    this.set(
+      'CANONICAL_HOSTNAME',
+      () => parseUrlDeprecated(this.getDocInfo_().canonicalUrl).hostname
+    );
 
     // Returns the path of the canonical URL for this AMP document.
-    this.set('CANONICAL_PATH', () =>
-      parseUrlDeprecated(this.getDocInfo_().canonicalUrl).pathname);
+    this.set(
+      'CANONICAL_PATH',
+      () => parseUrlDeprecated(this.getDocInfo_().canonicalUrl).pathname
+    );
 
     // Returns the referrer URL.
-    this.setAsync('DOCUMENT_REFERRER', /** @type {AsyncResolverDef} */(() => {
-      return Services.viewerForDoc(this.ampdoc).getReferrerUrl();
-    }));
+    this.setAsync(
+      'DOCUMENT_REFERRER',
+      /** @type {AsyncResolverDef} */ (() => {
+        return Services.viewerForDoc(this.ampdoc).getReferrerUrl();
+      })
+    );
 
     // Like DOCUMENT_REFERRER, but returns null if the referrer is of
     // same domain or the corresponding CDN proxy.
-    this.setAsync('EXTERNAL_REFERRER', /** @type {AsyncResolverDef} */(() => {
-      return Services.viewerForDoc(this.ampdoc).getReferrerUrl()
+    this.setAsync(
+      'EXTERNAL_REFERRER',
+      /** @type {AsyncResolverDef} */ (() => {
+        return Services.viewerForDoc(this.ampdoc)
+          .getReferrerUrl()
           .then(referrer => {
             if (!referrer) {
               return null;
             }
             const referrerHostname = parseUrlDeprecated(getSourceUrl(referrer))
-                .hostname;
-            const currentHostname =
-                WindowInterface.getHostname(win);
+              .hostname;
+            const currentHostname = WindowInterface.getHostname(win);
             return referrerHostname === currentHostname ? null : referrer;
           });
-    }));
+      })
+    );
 
     // Returns the title of this AMP document.
     this.set('TITLE', () => {
@@ -172,8 +188,7 @@ export class GlobalVariableSource extends VariableSource {
 
     // Returns the URL for this AMP document.
     this.set('AMPDOC_URL', () => {
-      return removeFragment(
-          this.addReplaceParamsIfMissing_(win.location.href));
+      return removeFragment(this.addReplaceParamsIfMissing_(win.location.href));
     });
 
     // Returns the host of the URL for this AMP document.
@@ -193,45 +208,61 @@ export class GlobalVariableSource extends VariableSource {
       const docInfo = this.getDocInfo_();
       return removeFragment(this.addReplaceParamsIfMissing_(docInfo.sourceUrl));
     };
-    this.setBoth('SOURCE_URL',
-        () => expandSourceUrl(),
-        () => getTrackImpressionPromise().then(() => expandSourceUrl()));
+    this.setBoth(
+      'SOURCE_URL',
+      () => expandSourceUrl(),
+      () => getTrackImpressionPromise().then(() => expandSourceUrl())
+    );
 
     // Returns the host of the Source URL for this AMP document.
-    this.set('SOURCE_HOST', () =>
-      parseUrlDeprecated(this.getDocInfo_().sourceUrl).host);
+    this.set(
+      'SOURCE_HOST',
+      () => parseUrlDeprecated(this.getDocInfo_().sourceUrl).host
+    );
 
     // Returns the hostname of the Source URL for this AMP document.
-    this.set('SOURCE_HOSTNAME', () =>
-      parseUrlDeprecated(this.getDocInfo_().sourceUrl).hostname);
+    this.set(
+      'SOURCE_HOSTNAME',
+      () => parseUrlDeprecated(this.getDocInfo_().sourceUrl).hostname
+    );
 
     // Returns the path of the Source URL for this AMP document.
-    this.set('SOURCE_PATH', () =>
-      parseUrlDeprecated(this.getDocInfo_().sourceUrl).pathname);
+    this.set(
+      'SOURCE_PATH',
+      () => parseUrlDeprecated(this.getDocInfo_().sourceUrl).pathname
+    );
 
     // Returns a random string that will be the constant for the duration of
     // single page view. It should have sufficient entropy to be unique for
     // all the page views a single user is making at a time.
     this.set('PAGE_VIEW_ID', () => this.getDocInfo_().pageViewId);
 
-    this.setBoth('QUERY_PARAM', (param, defaultValue = '') => {
-      return this.getQueryParamData_(param, defaultValue);
-    }, (param, defaultValue = '') => {
-      return getTrackImpressionPromise().then(() => {
+    this.setBoth(
+      'QUERY_PARAM',
+      (param, defaultValue = '') => {
         return this.getQueryParamData_(param, defaultValue);
-      });
-    });
+      },
+      (param, defaultValue = '') => {
+        return getTrackImpressionPromise().then(() => {
+          return this.getQueryParamData_(param, defaultValue);
+        });
+      }
+    );
 
     // Returns the value of the given field name in the fragment query string.
     // Second parameter is an optional default value.
     // For example, if location is 'pub.com/amp.html?x=1#y=2' then
     // FRAGMENT_PARAM(y) returns '2' and FRAGMENT_PARAM(z, 3) returns 3.
-    this.setAsync('FRAGMENT_PARAM',
-        this.getViewerIntegrationValue_('fragmentParam', 'FRAGMENT_PARAM'));
+    this.setAsync(
+      'FRAGMENT_PARAM',
+      this.getViewerIntegrationValue_('fragmentParam', 'FRAGMENT_PARAM')
+    );
 
     // Returns the first item in the ancestorOrigins array, if available.
-    this.setAsync('ANCESTOR_ORIGIN',
-        this.getViewerIntegrationValue_('ancestorOrigin', 'ANCESTOR_ORIGIN'));
+    this.setAsync(
+      'ANCESTOR_ORIGIN',
+      this.getViewerIntegrationValue_('ancestorOrigin', 'ANCESTOR_ORIGIN')
+    );
 
     /**
      * Stores client ids that were generated during this page view
@@ -241,112 +272,149 @@ export class GlobalVariableSource extends VariableSource {
     let clientIds = null;
     // Synchronous alternative. Only works for scopes that were previously
     // requested using the async method.
-    this.setBoth('CLIENT_ID', scope => {
-      if (!clientIds) {
-        return null;
-      }
-      return clientIds[dev().assertString(scope)];
-    }, (scope, opt_userNotificationId, opt_cookieName) => {
-      user().assertString(scope,
+    this.setBoth(
+      'CLIENT_ID',
+      scope => {
+        if (!clientIds) {
+          return null;
+        }
+        return clientIds[dev().assertString(scope)];
+      },
+      (scope, opt_userNotificationId, opt_cookieName) => {
+        user().assertString(
+          scope,
           'The first argument to CLIENT_ID, the fallback' +
-          /*OK*/' Cookie name, is required');
+            /*OK*/ ' Cookie name, is required'
+        );
 
-      if (getMode().runtime == 'inabox') {
-        return /** @type {!Promise<ResolverReturnDef>} */(
-          Promise.resolve(null));
-      }
+        if (getMode().runtime == 'inabox') {
+          return /** @type {!Promise<ResolverReturnDef>} */ (Promise.resolve(
+            null
+          ));
+        }
 
-      let consent = Promise.resolve();
+        let consent = Promise.resolve();
 
-      // If no `opt_userNotificationId` argument is provided then
-      // assume consent is given by default.
-      if (opt_userNotificationId) {
-        consent = Services.userNotificationManagerForDoc(element)
-            .then(service => {
+        // If no `opt_userNotificationId` argument is provided then
+        // assume consent is given by default.
+        if (opt_userNotificationId) {
+          consent = Services.userNotificationManagerForDoc(element).then(
+            service => {
               return service.get(opt_userNotificationId);
-            });
-      }
-      return Services.cidForDoc(this.ampdoc).then(cid => {
-        return cid.get({
-          scope: dev().assertString(scope),
-          createCookieIfNotPresent: true,
-          cookieName: opt_cookieName,
-        }, consent);
-      }).then(cid => {
-        if (!clientIds) {
-          clientIds = Object.create(null);
+            }
+          );
         }
+        return Services.cidForDoc(this.ampdoc)
+          .then(cid => {
+            return cid.get(
+              {
+                scope: dev().assertString(scope),
+                createCookieIfNotPresent: true,
+                cookieName: opt_cookieName,
+              },
+              consent
+            );
+          })
+          .then(cid => {
+            if (!clientIds) {
+              clientIds = Object.create(null);
+            }
 
-        // A temporary work around to extract Client ID from _ga cookie. #5761
-        // TODO: replace with "filter" when it's in place. #2198
-        const cookieName = opt_cookieName || scope;
-        if (cid && cookieName == '_ga') {
-          if (typeof cid === 'string') {
-            cid = extractClientIdFromGaCookie(cid);
-          } else {
-            // TODO(@jridgewell, #11120): remove once #11120 is figured out.
-            // Do not log the CID directly, that's PII.
-            dev().error(TAG, 'non-string cid, what is it?', Object.keys(cid));
-          }
-        }
+            // A temporary work around to extract Client ID from _ga cookie. #5761
+            // TODO: replace with "filter" when it's in place. #2198
+            const cookieName = opt_cookieName || scope;
+            if (cid && cookieName == '_ga') {
+              if (typeof cid === 'string') {
+                cid = extractClientIdFromGaCookie(cid);
+              } else {
+                // TODO(@jridgewell, #11120): remove once #11120 is figured out.
+                // Do not log the CID directly, that's PII.
+                dev().error(
+                  TAG,
+                  'non-string cid, what is it?',
+                  Object.keys(cid)
+                );
+              }
+            }
 
-        clientIds[scope] = cid;
-        return cid;
-      });
-    });
+            clientIds[scope] = cid;
+            return cid;
+          });
+      }
+    );
 
     // Returns assigned variant name for the given experiment.
-    this.setAsync('VARIANT', /** @type {AsyncResolverDef} */(experiment => {
-      return this.getVariantsValue_(variants => {
-        const variant = variants[/** @type {string} */(experiment)];
-        userAssert(variant !== undefined,
+    this.setAsync(
+      'VARIANT',
+      /** @type {AsyncResolverDef} */ (experiment => {
+        return this.getVariantsValue_(variants => {
+          const variant = variants[/** @type {string} */ (experiment)];
+          userAssert(
+            variant !== undefined,
             'The value passed to VARIANT() is not a valid experiment name:' +
-                experiment);
-        // When no variant assigned, use reserved keyword 'none'.
-        return variant === null ? 'none' : /** @type {string} */(variant);
-      }, 'VARIANT');
-    }));
+              experiment
+          );
+          // When no variant assigned, use reserved keyword 'none'.
+          return variant === null ? 'none' : /** @type {string} */ (variant);
+        }, 'VARIANT');
+      })
+    );
 
     // Returns all assigned experiment variants in a serialized form.
-    this.setAsync('VARIANTS', /** @type {AsyncResolverDef} */(() => {
-      return this.getVariantsValue_(variants => {
-        const experiments = [];
-        for (const experiment in variants) {
-          const variant = variants[experiment];
-          experiments.push(
-              experiment + VARIANT_DELIMITER + (variant || 'none'));
-        }
-        return experiments.join(EXPERIMENT_DELIMITER);
-      }, 'VARIANTS');
-    }));
+    this.setAsync(
+      'VARIANTS',
+      /** @type {AsyncResolverDef} */ (() => {
+        return this.getVariantsValue_(variants => {
+          const experiments = [];
+          for (const experiment in variants) {
+            const variant = variants[experiment];
+            experiments.push(
+              experiment + VARIANT_DELIMITER + (variant || 'none')
+            );
+          }
+          return experiments.join(EXPERIMENT_DELIMITER);
+        }, 'VARIANTS');
+      })
+    );
 
     // Returns assigned geo value for geoType or all groups.
-    this.setAsync('AMP_GEO', /** @type {AsyncResolverDef} */(geoType => {
-      return this.getGeo_(geos => {
-        if (geoType) {
-          userAssert(geoType === 'ISOCountry',
-              'The value passed to AMP_GEO() is not valid name:' + geoType);
-          return /** @type {string} */ (geos[geoType] || 'unknown');
-        }
-        return /** @type {string} */ (geos.matchedISOCountryGroups.join(GEO_DELIM));
-      }, 'AMP_GEO');
-    }));
+    this.setAsync(
+      'AMP_GEO',
+      /** @type {AsyncResolverDef} */ (geoType => {
+        return this.getGeo_(geos => {
+          if (geoType) {
+            userAssert(
+              geoType === 'ISOCountry',
+              'The value passed to AMP_GEO() is not valid name:' + geoType
+            );
+            return /** @type {string} */ (geos[geoType] || 'unknown');
+          }
+          return /** @type {string} */ (geos.matchedISOCountryGroups.join(
+            GEO_DELIM
+          ));
+        }, 'AMP_GEO');
+      })
+    );
 
     // Returns incoming share tracking fragment.
-    this.setAsync('SHARE_TRACKING_INCOMING', /** @type {AsyncResolverDef} */(
-      () => {
+    this.setAsync(
+      'SHARE_TRACKING_INCOMING',
+      /** @type {AsyncResolverDef} */ (() => {
         return this.getShareTrackingValue_(fragments => {
           return fragments.incomingFragment;
         }, 'SHARE_TRACKING_INCOMING');
-      }));
+      })
+    );
 
     // Returns outgoing share tracking fragment.
-    this.setAsync('SHARE_TRACKING_OUTGOING', /** @type {AsyncResolverDef} */(
-      () => {
+    this.setAsync(
+      'SHARE_TRACKING_OUTGOING',
+      /** @type {AsyncResolverDef} */ (() => {
         return this.getShareTrackingValue_(fragments => {
           return fragments.outgoingFragment;
         }, 'SHARE_TRACKING_OUTGOING');
-      }));
+      })
+    );
 
     // Returns the number of milliseconds since 1 Jan 1970 00:00:00 UTC.
     this.set('TIMESTAMP', dateMethod('getTime'));
@@ -412,8 +480,12 @@ export class GlobalVariableSource extends VariableSource {
     // Returns the browser language.
     this.set('BROWSER_LANGUAGE', () => {
       const nav = win.navigator;
-      return (nav.language || nav.userLanguage || nav.browserLanguage || '')
-          .toLowerCase();
+      return (
+        nav.language ||
+        nav.userLanguage ||
+        nav.browserLanguage ||
+        ''
+      ).toLowerCase();
     });
 
     // Returns the user agent.
@@ -424,59 +496,84 @@ export class GlobalVariableSource extends VariableSource {
     // Returns the time it took to load the whole page. (excludes amp-* elements
     // that are not rendered by the system yet.)
     this.setTimingResolver_(
-        'PAGE_LOAD_TIME', 'navigationStart', 'loadEventStart');
+      'PAGE_LOAD_TIME',
+      'navigationStart',
+      'loadEventStart'
+    );
 
     // Returns the time it took to perform DNS lookup for the domain.
     this.setTimingResolver_(
-        'DOMAIN_LOOKUP_TIME', 'domainLookupStart', 'domainLookupEnd');
+      'DOMAIN_LOOKUP_TIME',
+      'domainLookupStart',
+      'domainLookupEnd'
+    );
 
     // Returns the time it took to connect to the server.
-    this.setTimingResolver_(
-        'TCP_CONNECT_TIME', 'connectStart', 'connectEnd');
+    this.setTimingResolver_('TCP_CONNECT_TIME', 'connectStart', 'connectEnd');
 
     // Returns the time it took for server to start sending a response to the
     // request.
     this.setTimingResolver_(
-        'SERVER_RESPONSE_TIME', 'requestStart', 'responseStart');
+      'SERVER_RESPONSE_TIME',
+      'requestStart',
+      'responseStart'
+    );
 
     // Returns the time it took to download the page.
     this.setTimingResolver_(
-        'PAGE_DOWNLOAD_TIME', 'responseStart', 'responseEnd');
+      'PAGE_DOWNLOAD_TIME',
+      'responseStart',
+      'responseEnd'
+    );
 
     // Returns the time it took for redirects to complete.
-    this.setTimingResolver_(
-        'REDIRECT_TIME', 'navigationStart', 'fetchStart');
+    this.setTimingResolver_('REDIRECT_TIME', 'navigationStart', 'fetchStart');
 
     // Returns the time it took for DOM to become interactive.
     this.setTimingResolver_(
-        'DOM_INTERACTIVE_TIME', 'navigationStart', 'domInteractive');
+      'DOM_INTERACTIVE_TIME',
+      'navigationStart',
+      'domInteractive'
+    );
 
     // Returns the time it took for content to load.
     this.setTimingResolver_(
-        'CONTENT_LOAD_TIME', 'navigationStart', 'domContentLoadedEventStart');
+      'CONTENT_LOAD_TIME',
+      'navigationStart',
+      'domContentLoadedEventStart'
+    );
 
     // Access: Reader ID.
-    this.setAsync('ACCESS_READER_ID', /** @type {AsyncResolverDef} */(() => {
-      return this.getAccessValue_(accessService => {
-        return accessService.getAccessReaderId();
-      }, 'ACCESS_READER_ID');
-    }));
+    this.setAsync(
+      'ACCESS_READER_ID',
+      /** @type {AsyncResolverDef} */ (() => {
+        return this.getAccessValue_(accessService => {
+          return accessService.getAccessReaderId();
+        }, 'ACCESS_READER_ID');
+      })
+    );
 
     // Access: data from the authorization response.
-    this.setAsync('AUTHDATA', /** @type {AsyncResolverDef} */(field => {
-      userAssert(field,
-          'The first argument to AUTHDATA, the field, is required');
-      return this.getAccessValue_(accessService => {
-        return accessService.getAuthdataField(field);
-      }, 'AUTHDATA');
-    }));
+    this.setAsync(
+      'AUTHDATA',
+      /** @type {AsyncResolverDef} */ (field => {
+        userAssert(
+          field,
+          'The first argument to AUTHDATA, the field, is required'
+        );
+        return this.getAccessValue_(accessService => {
+          return accessService.getAuthdataField(field);
+        }, 'AUTHDATA');
+      })
+    );
 
     // Returns an identifier for the viewer.
     this.setAsync('VIEWER', () => {
       return Services.viewerForDoc(this.ampdoc)
-          .getViewerOrigin().then(viewer => {
-            return viewer == undefined ? '' : viewer;
-          });
+        .getViewerOrigin()
+        .then(viewer => {
+          return viewer == undefined ? '' : viewer;
+        });
     });
 
     // Returns the total engaged time since the content became viewable.
@@ -490,26 +587,36 @@ export class GlobalVariableSource extends VariableSource {
     // same name.
     this.setAsync('INCREMENTAL_ENGAGED_TIME', (name, reset) => {
       return Services.activityForDoc(element).then(activity => {
-        return activity.getIncrementalEngagedTime(/** @type {string} */ (name),
-            reset !== 'false');
+        return activity.getIncrementalEngagedTime(
+          /** @type {string} */ (name),
+          reset !== 'false'
+        );
       });
     });
 
     this.set('NAV_TIMING', (startAttribute, endAttribute) => {
-      userAssert(startAttribute, 'The first argument to NAV_TIMING, the ' +
-          'start attribute name, is required');
+      userAssert(
+        startAttribute,
+        'The first argument to NAV_TIMING, the ' +
+          'start attribute name, is required'
+      );
       return getTimingDataSync(
-          win,
-          /**@type {string}*/(startAttribute),
-          /**@type {string}*/(endAttribute));
+        win,
+        /**@type {string}*/ (startAttribute),
+        /**@type {string}*/ (endAttribute)
+      );
     });
     this.setAsync('NAV_TIMING', (startAttribute, endAttribute) => {
-      userAssert(startAttribute, 'The first argument to NAV_TIMING, the ' +
-          'start attribute name, is required');
+      userAssert(
+        startAttribute,
+        'The first argument to NAV_TIMING, the ' +
+          'start attribute name, is required'
+      );
       return getTimingDataAsync(
-          win,
-          /**@type {string}*/(startAttribute),
-          /**@type {string}*/(endAttribute));
+        win,
+        /**@type {string}*/ (startAttribute),
+        /**@type {string}*/ (endAttribute)
+      );
     });
 
     this.set('NAV_TYPE', () => {
@@ -530,38 +637,47 @@ export class GlobalVariableSource extends VariableSource {
     this.setAsync('VIDEO_STATE', (id, property) => {
       const root = this.ampdoc.getRootNode();
       const video = user().assertElement(
-          root.getElementById(/** @type {string} */ (id)),
-          `Could not find an element with id="${id}" for VIDEO_STATE`);
+        root.getElementById(/** @type {string} */ (id)),
+        `Could not find an element with id="${id}" for VIDEO_STATE`
+      );
       return Services.videoManagerForDoc(this.ampdoc)
-          .getAnalyticsDetails(video)
-          .then(details => details ? details[property] : '');
+        .getAnalyticsDetails(video)
+        .then(details => (details ? details[property] : ''));
     });
 
-    this.setAsync('STORY_PAGE_INDEX', this.getStoryValue_('pageIndex',
-        'STORY_PAGE_INDEX'));
+    this.setAsync(
+      'STORY_PAGE_INDEX',
+      this.getStoryValue_('pageIndex', 'STORY_PAGE_INDEX')
+    );
 
-    this.setAsync('STORY_PAGE_ID', this.getStoryValue_('pageId',
-        'STORY_PAGE_ID'));
+    this.setAsync(
+      'STORY_PAGE_ID',
+      this.getStoryValue_('pageId', 'STORY_PAGE_ID')
+    );
 
     this.setAsync('FIRST_CONTENTFUL_PAINT', () => {
       return tryResolve(() =>
-        Services.performanceFor(win).getFirstContentfulPaint());
+        Services.performanceFor(win).getFirstContentfulPaint()
+      );
     });
 
     this.setAsync('FIRST_VIEWPORT_READY', () => {
       return tryResolve(() =>
-        Services.performanceFor(win).getFirstViewportReady());
+        Services.performanceFor(win).getFirstViewportReady()
+      );
     });
 
     this.setAsync('MAKE_BODY_VISIBLE', () => {
       return tryResolve(() =>
-        Services.performanceFor(win).getMakeBodyVisible());
+        Services.performanceFor(win).getMakeBodyVisible()
+      );
     });
 
     this.setAsync('AMP_STATE', key => {
       // This is safe since AMP_STATE is not an A4A whitelisted variable.
       const root = this.ampdoc.getRootNode();
-      const element = /** @type {!Element|!ShadowRoot} */(root.documentElement || root);
+      const element =
+        /** @type {!Element|!ShadowRoot} */ (root.documentElement || root);
       return Services.bindForDocOrNull(element).then(bind => {
         if (!bind) {
           return '';
@@ -579,8 +695,7 @@ export class GlobalVariableSource extends VariableSource {
    * @private
    */
   addReplaceParamsIfMissing_(orig) {
-    const {replaceParams} =
-    /** @type {!Object} */ (this.getDocInfo_());
+    const {replaceParams} = /** @type {!Object} */ (this.getDocInfo_());
     if (!replaceParams) {
       return orig;
     }
@@ -610,14 +725,16 @@ export class GlobalVariableSource extends VariableSource {
       Services.accessServiceForDocOrNull(element),
       Services.subscriptionsServiceForDocOrNull(element),
     ]).then(services => {
-      const service = /** @type {?../../extensions/amp-access/0.1/access-vars.AccessVars} */ (
-        services[0] || services[1]);
+      const service =
+        /** @type {?../../extensions/amp-access/0.1/access-vars.AccessVars} */ (services[0] ||
+        services[1]);
       if (!service) {
         // Access/subscriptions service is not installed.
         user().error(
-            TAG,
-            'Access or subsciptions service is not installed to access: ',
-            expr);
+          TAG,
+          'Access or subsciptions service is not installed to access: ',
+          expr
+        );
         return null;
       }
       return getter(service);
@@ -632,11 +749,14 @@ export class GlobalVariableSource extends VariableSource {
    * @private
    */
   getQueryParamData_(param, defaultValue) {
-    userAssert(param,
-        'The first argument to QUERY_PARAM, the query string ' +
-        'param is required');
+    userAssert(
+      param,
+      'The first argument to QUERY_PARAM, the query string ' +
+        'param is required'
+    );
     const url = parseUrlDeprecated(
-        removeAmpJsParamsFromUrl(this.ampdoc.win.location.href));
+      removeAmpJsParamsFromUrl(this.ampdoc.win.location.href)
+    );
     const params = parseQueryString(url.search);
     const key = user().assertString(param);
     const {replaceParams} = this.getDocInfo_();
@@ -644,7 +764,7 @@ export class GlobalVariableSource extends VariableSource {
       return params[key];
     }
     if (replaceParams && typeof replaceParams[key] !== 'undefined') {
-      return /** @type {string} */(replaceParams[key]);
+      return /** @type {string} */ (replaceParams[key]);
     }
     return defaultValue;
   }
@@ -659,12 +779,15 @@ export class GlobalVariableSource extends VariableSource {
    */
   getVariantsValue_(getter, expr) {
     return Services.variantsForDocOrNull(this.ampdoc.getHeadNode())
-        .then(variants => {
-          userAssert(variants,
-              'To use variable %s, amp-experiment should be configured',
-              expr);
-          return variants.getVariants();
-        }).then(variantsMap => getter(variantsMap));
+      .then(variants => {
+        userAssert(
+          variants,
+          'To use variable %s, amp-experiment should be configured',
+          expr
+        );
+        return variants.getVariants();
+      })
+      .then(variantsMap => getter(variantsMap));
   }
 
   /**
@@ -677,13 +800,10 @@ export class GlobalVariableSource extends VariableSource {
    */
   getGeo_(getter, expr) {
     const element = this.ampdoc.getHeadNode();
-    return Services.geoForDocOrNull(element)
-        .then(geo => {
-          userAssert(geo,
-              'To use variable %s, amp-geo should be configured',
-              expr);
-          return getter(geo);
-        });
+    return Services.geoForDocOrNull(element).then(geo => {
+      userAssert(geo, 'To use variable %s, amp-geo should be configured', expr);
+      return getter(geo);
+    });
   }
 
   /**
@@ -696,13 +816,16 @@ export class GlobalVariableSource extends VariableSource {
    */
   getShareTrackingValue_(getter, expr) {
     if (!this.shareTrackingFragments_) {
-      this.shareTrackingFragments_ =
-          Services.shareTrackingForOrNull(this.ampdoc.win);
+      this.shareTrackingFragments_ = Services.shareTrackingForOrNull(
+        this.ampdoc.win
+      );
     }
     return this.shareTrackingFragments_.then(fragments => {
-      userAssert(fragments, 'To use variable %s, ' +
-          'amp-share-tracking should be configured',
-      expr);
+      userAssert(
+        fragments,
+        'To use variable %s, amp-share-tracking should be configured',
+        expr
+      );
       return getter(/** @type {!ShareTrackingFragmentsDef} */ (fragments));
     });
   }
@@ -718,8 +841,11 @@ export class GlobalVariableSource extends VariableSource {
     return () => {
       const service = Services.storyVariableServiceForOrNull(this.ampdoc.win);
       return service.then(storyVariables => {
-        userAssert(storyVariables,
-            'To use variable %s amp-story should be configured', name);
+        userAssert(
+          storyVariables,
+          'To use variable %s amp-story should be configured',
+          name
+        );
         return storyVariables[property];
       });
     };
@@ -733,16 +859,19 @@ export class GlobalVariableSource extends VariableSource {
    * @private
    */
   getViewerIntegrationValue_(property, name) {
-    return /** @type {!AsyncResolverDef} */ (
-      (param, defaultValue = '') => {
-        const service =
-            Services.viewerIntegrationVariableServiceForOrNull(this.ampdoc.win);
-        return service.then(viewerIntegrationVariables => {
-          userAssert(viewerIntegrationVariables, 'To use variable %s ' +
-              'amp-viewer-integration must be installed', name);
-          return viewerIntegrationVariables[property](param, defaultValue);
-        });
+    return /** @type {!AsyncResolverDef} */ ((param, defaultValue = '') => {
+      const service = Services.viewerIntegrationVariableServiceForOrNull(
+        this.ampdoc.win
+      );
+      return service.then(viewerIntegrationVariables => {
+        userAssert(
+          viewerIntegrationVariables,
+          'To use variable %s amp-viewer-integration must be installed',
+          name
+        );
+        return viewerIntegrationVariables[property](param, defaultValue);
       });
+    });
   }
 }
 
@@ -764,7 +893,6 @@ export class UrlReplacements {
     this.variableSource_ = variableSource;
   }
 
-
   /**
    * Synchronously expands the provided source by replacing all known variables
    * with their resolved values. Optional `opt_bindings` can be used to add new
@@ -777,14 +905,14 @@ export class UrlReplacements {
    * @return {string}
    */
   expandStringSync(source, opt_bindings, opt_collectVars, opt_whiteList) {
-    return /** @type {string} */ (
-      new Expander(
-          this.variableSource_,
-          opt_bindings,
-          opt_collectVars,
-          /* opt_sync */ true,
-          opt_whiteList,
-          /* opt_noEncode */ true)./*OK*/expand(source));
+    return /** @type {string} */ (new Expander(
+      this.variableSource_,
+      opt_bindings,
+      opt_collectVars,
+      /* opt_sync */ true,
+      opt_whiteList,
+      /* opt_noEncode */ true
+    )./*OK*/ expand(source));
   }
 
   /**
@@ -797,13 +925,14 @@ export class UrlReplacements {
    * @return {!Promise<string>}
    */
   expandStringAsync(source, opt_bindings, opt_whiteList) {
-    return /** @type {!Promise<string>} */ (
-      new Expander(this.variableSource_,
-          opt_bindings,
-          /* opt_collectVars */ undefined,
-          /* opt_sync */ undefined,
-          opt_whiteList,
-          /* opt_noEncode */ true)./*OK*/expand(source));
+    return /** @type {!Promise<string>} */ (new Expander(
+      this.variableSource_,
+      opt_bindings,
+      /* opt_collectVars */ undefined,
+      /* opt_sync */ undefined,
+      opt_whiteList,
+      /* opt_noEncode */ true
+    )./*OK*/ expand(source));
   }
 
   /**
@@ -818,12 +947,16 @@ export class UrlReplacements {
    * @return {string}
    */
   expandUrlSync(url, opt_bindings, opt_collectVars, opt_whiteList) {
-    return this.ensureProtocolMatches_(url, /** @type {string} */ (
-      new Expander(this.variableSource_,
-          opt_bindings,
-          opt_collectVars,
-          /* opt_sync */ true,
-          opt_whiteList)./*OK*/expand(url)));
+    return this.ensureProtocolMatches_(
+      url,
+      /** @type {string} */ (new Expander(
+        this.variableSource_,
+        opt_bindings,
+        opt_collectVars,
+        /* opt_sync */ true,
+        opt_whiteList
+      )./*OK*/ expand(url))
+    );
   }
 
   /**
@@ -837,13 +970,15 @@ export class UrlReplacements {
    * @return {!Promise<string>}
    */
   expandUrlAsync(url, opt_bindings, opt_whiteList) {
-    return /** @type {!Promise<string>} */ (
-      new Expander(this.variableSource_,
-          opt_bindings,
-          /* opt_collectVars */ undefined,
-          /* opt_sync */ undefined,
-          opt_whiteList)./*OK*/expand(url)
-          .then(replacement => this.ensureProtocolMatches_(url, replacement)));
+    return /** @type {!Promise<string>} */ (new Expander(
+      this.variableSource_,
+      opt_bindings,
+      /* opt_collectVars */ undefined,
+      /* opt_sync */ undefined,
+      opt_whiteList
+    )
+      ./*OK*/ expand(url)
+      .then(replacement => this.ensureProtocolMatches_(url, replacement)));
   }
 
   /**
@@ -852,8 +987,10 @@ export class UrlReplacements {
    * @return {!Promise<string>}
    */
   expandInputValueAsync(element) {
-    return /** @type {!Promise<string>} */ (
-      this.expandInputValue_(element, /*opt_sync*/ false));
+    return /** @type {!Promise<string>} */ (this.expandInputValue_(
+      element,
+      /*opt_sync*/ false
+    ));
   }
 
   /**
@@ -862,8 +999,10 @@ export class UrlReplacements {
    * @return {string} Replaced string for testing
    */
   expandInputValueSync(element) {
-    return /** @type {string} */ (
-      this.expandInputValue_(element, /*opt_sync*/ true));
+    return /** @type {string} */ (this.expandInputValue_(
+      element,
+      /*opt_sync*/ true
+    ));
   }
 
   /**
@@ -873,9 +1012,12 @@ export class UrlReplacements {
    * @return {string|!Promise<string>}
    */
   expandInputValue_(element, opt_sync) {
-    devAssert(element.tagName == 'INPUT' &&
+    devAssert(
+      element.tagName == 'INPUT' &&
         (element.getAttribute('type') || '').toLowerCase() == 'hidden',
-    'Input value expansion only works on hidden input fields: %s', element);
+      'Input value expansion only works on hidden input fields: %s',
+      element
+    );
 
     const whitelist = this.getWhitelistForElement_(element);
     if (!whitelist) {
@@ -884,15 +1026,16 @@ export class UrlReplacements {
     if (element[ORIGINAL_VALUE_PROPERTY] === undefined) {
       element[ORIGINAL_VALUE_PROPERTY] = element.value;
     }
-    const result = new Expander(this.variableSource_,
-        /* opt_bindings */ undefined,
-        /* opt_collectVars */ undefined,
-        /* opt_sync */ opt_sync,
-        /* opt_whitelist */ whitelist)
-        ./*OK*/expand(element[ORIGINAL_VALUE_PROPERTY] || element.value);
+    const result = new Expander(
+      this.variableSource_,
+      /* opt_bindings */ undefined,
+      /* opt_collectVars */ undefined,
+      /* opt_sync */ opt_sync,
+      /* opt_whitelist */ whitelist
+    )./*OK*/ expand(element[ORIGINAL_VALUE_PROPERTY] || element.value);
 
     if (opt_sync) {
-      return element.value = result;
+      return (element.value = result);
     }
     return result.then(newValue => {
       element.value = newValue;
@@ -913,34 +1056,45 @@ export class UrlReplacements {
       return;
     }
     const requestedReplacements = {};
-    whitelist.trim().split(/\s+/).forEach(replacement => {
-      if (!opt_supportedReplacement ||
-          hasOwn(opt_supportedReplacement, replacement)) {
-        requestedReplacements[replacement] = true;
-      } else {
-        user().warn('URL', 'Ignoring unsupported replacement', replacement);
-      }
-    });
+    whitelist
+      .trim()
+      .split(/\s+/)
+      .forEach(replacement => {
+        if (
+          !opt_supportedReplacement ||
+          hasOwn(opt_supportedReplacement, replacement)
+        ) {
+          requestedReplacements[replacement] = true;
+        } else {
+          user().warn('URL', 'Ignoring unsupported replacement', replacement);
+        }
+      });
     return requestedReplacements;
   }
 
   /**
-    * Returns whether variable substitution is allowed for given url.
-    * @param {!Location} url
-    * @return {boolean}
-    */
+   * Returns whether variable substitution is allowed for given url.
+   * @param {!Location} url
+   * @return {boolean}
+   */
   isAllowedOrigin_(url) {
     const docInfo = Services.documentInfoForDoc(this.ampdoc);
-    if (url.origin == parseUrlDeprecated(docInfo.canonicalUrl).origin ||
-        url.origin == parseUrlDeprecated(docInfo.sourceUrl).origin) {
+    if (
+      url.origin == parseUrlDeprecated(docInfo.canonicalUrl).origin ||
+      url.origin == parseUrlDeprecated(docInfo.sourceUrl).origin
+    ) {
       return true;
     }
 
-    const meta = this.ampdoc.getRootNode().querySelector(
-        'meta[name=amp-link-variable-allowed-origin]');
+    const meta = this.ampdoc
+      .getRootNode()
+      .querySelector('meta[name=amp-link-variable-allowed-origin]');
 
     if (meta && meta.hasAttribute('content')) {
-      const whitelist = meta.getAttribute('content').trim().split(/\s+/);
+      const whitelist = meta
+        .getAttribute('content')
+        .trim()
+        .split(/\s+/);
       for (let i = 0; i < whitelist.length; i++) {
         if (url.origin == parseUrlDeprecated(whitelist[i]).origin) {
           return true;
@@ -968,9 +1122,11 @@ export class UrlReplacements {
       'NAV_TIMING': true,
     };
     const additionalUrlParameters =
-        element.getAttribute('data-amp-addparams') || '';
+      element.getAttribute('data-amp-addparams') || '';
     const whitelist = this.getWhitelistForElement_(
-        element, supportedReplacements);
+      element,
+      supportedReplacements
+    );
 
     if (!whitelist && !additionalUrlParameters && !defaultUrlParams) {
       return;
@@ -979,25 +1135,28 @@ export class UrlReplacements {
     // We set this to the original value before doing any work and use it
     // on subsequent replacements, so that each run gets a fresh value.
     let href = dev().assertString(
-        element[ORIGINAL_HREF_PROPERTY] || element.getAttribute('href'));
+      element[ORIGINAL_HREF_PROPERTY] || element.getAttribute('href')
+    );
     const url = parseUrlDeprecated(href);
     if (element[ORIGINAL_HREF_PROPERTY] == null) {
       element[ORIGINAL_HREF_PROPERTY] = href;
     }
     if (additionalUrlParameters) {
-      href = addParamsToUrl(
-          href,
-          parseQueryString(additionalUrlParameters));
+      href = addParamsToUrl(href, parseQueryString(additionalUrlParameters));
     }
 
     const isAllowedOrigin = this.isAllowedOrigin_(url);
     if (!isAllowedOrigin) {
       if (whitelist) {
-        user().warn('URL', 'Ignoring link replacement', href,
-            ' because the link does not go to the document\'s' +
-            ' source, canonical, or whitelisted origin.');
+        user().warn(
+          'URL',
+          'Ignoring link replacement',
+          href,
+          " because the link does not go to the document's" +
+            ' source, canonical, or whitelisted origin.'
+        );
       }
-      return element.href = href;
+      return (element.href = href);
     }
 
     // Note that defaultUrlParams is treated differently than
@@ -1012,27 +1171,27 @@ export class UrlReplacements {
         // override whitelist and expand defaultUrlParams;
         const overrideWhitelist = {'QUERY_PARAM': true};
         defaultUrlParams = this.expandUrlSync(
-            defaultUrlParams,
-            /* opt_bindings */ undefined,
-            /* opt_collectVars */ undefined,
-            /* opt_whitelist */ overrideWhitelist);
+          defaultUrlParams,
+          /* opt_bindings */ undefined,
+          /* opt_collectVars */ undefined,
+          /* opt_whitelist */ overrideWhitelist
+        );
       }
       href = addParamsToUrl(href, parseQueryString(defaultUrlParams));
     }
 
     if (whitelist) {
       href = this.expandUrlSync(
-          href,
-          /* opt_bindings */ undefined,
-          /* opt_collectVars */ undefined,
-          /* opt_whitelist */ whitelist);
+        href,
+        /* opt_bindings */ undefined,
+        /* opt_collectVars */ undefined,
+        /* opt_whitelist */ whitelist
+      );
     }
 
-    return element.href = href;
+    return (element.href = href);
   }
 
-
-
   /**
    * Collects all substitutions in the provided URL and expands them to the
    * values for known variables. Optional `opt_bindings` can be used to add
@@ -1044,8 +1203,8 @@ export class UrlReplacements {
   collectVars(url, opt_bindings) {
     const vars = Object.create(null);
     return new Expander(this.variableSource_, opt_bindings, vars)
-        ./*OK*/expand(url)
-        .then(() => vars);
+      ./*OK*/ expand(url)
+      .then(() => vars);
   }
 
   /**
@@ -1076,15 +1235,18 @@ export class UrlReplacements {
    */
   ensureProtocolMatches_(url, replacement) {
     const newProtocol = parseUrlDeprecated(replacement, /* opt_nocache */ true)
-        .protocol;
+      .protocol;
     const oldProtocol = parseUrlDeprecated(url, /* opt_nocache */ true)
-        .protocol;
+      .protocol;
     if (newProtocol != oldProtocol) {
       user().error(TAG, 'Illegal replacement of the protocol: ', url);
       return url;
     }
-    userAssert(isProtocolValid(replacement),
-        'The replacement url has invalid protocol: %s', replacement);
+    userAssert(
+      isProtocolValid(replacement),
+      'The replacement url has invalid protocol: %s',
+      replacement
+    );
 
     return replacement;
   }
@@ -1111,23 +1273,22 @@ export function extractClientIdFromGaCookie(gaCookie) {
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  */
 export function installUrlReplacementsServiceForDoc(ampdoc) {
-  registerServiceBuilderForDoc(
-      ampdoc,
-      'url-replace',
-      function(doc) {
-        return new UrlReplacements(doc, new GlobalVariableSource(doc));
-      });
+  registerServiceBuilderForDoc(ampdoc, 'url-replace', function(doc) {
+    return new UrlReplacements(doc, new GlobalVariableSource(doc));
+  });
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  * @param {!Window} embedWin
  * @param {!VariableSource} varSource
  */
 export function installUrlReplacementsForEmbed(ampdoc, embedWin, varSource) {
-  installServiceInEmbedScope(embedWin, 'url-replace',
-      new UrlReplacements(ampdoc, varSource));
+  installServiceInEmbedScope(
+    embedWin,
+    'url-replace',
+    new UrlReplacements(ampdoc, varSource)
+  );
 }
 
 /**
diff --git a/src/service/variable-source.js b/src/service/variable-source.js
index 0cffb5171696..788c0baa4575 100644
--- a/src/service/variable-source.js
+++ b/src/service/variable-source.js
@@ -29,7 +29,6 @@ export let AsyncResolverDef;
 /** @typedef {{sync: SyncResolverDef, async: AsyncResolverDef}} */
 let ReplacementDef;
 
-
 /**
  * Returns navigation timing information based on the start and end events.
  * The data for the timing events is retrieved from performance.timing API.
@@ -66,9 +65,10 @@ export function getTimingDataSync(win, startEvent, endEvent) {
     return;
   }
 
-  const metric = (endEvent === undefined)
-    ? timingInfo[startEvent]
-    : timingInfo[endEvent] - timingInfo[startEvent];
+  const metric =
+    endEvent === undefined
+      ? timingInfo[startEvent]
+      : timingInfo[endEvent] - timingInfo[startEvent];
 
   if (!isFiniteNumber(metric) || metric < 0) {
     // The metric is not supported.
@@ -86,8 +86,7 @@ export function getTimingDataSync(win, startEvent, endEvent) {
  * @private
  */
 export function getNavigationData(win, attribute) {
-  const navigationInfo = win['performance'] &&
-    win['performance']['navigation'];
+  const navigationInfo = win['performance'] && win['performance']['navigation'];
   if (!navigationInfo || navigationInfo[attribute] === undefined) {
     // PerformanceNavigation interface is not supported or attribute is not
     // implemented.
@@ -96,7 +95,6 @@ export function getNavigationData(win, attribute) {
   return navigationInfo[attribute];
 }
 
-
 /**
  * A class to provide variable substitution related features. Extend this class
  * and override initialize() to add more supported variables.
@@ -159,8 +157,10 @@ export class VariableSource {
    */
   set(varName, syncResolver) {
     devAssert(varName.indexOf('RETURN') == -1);
-    this.replacements_[varName] =
-        this.replacements_[varName] || {sync: undefined, async: undefined};
+    this.replacements_[varName] = this.replacements_[varName] || {
+      sync: undefined,
+      async: undefined,
+    };
     this.replacements_[varName].sync = syncResolver;
     return this;
   }
@@ -177,8 +177,10 @@ export class VariableSource {
    */
   setAsync(varName, asyncResolver) {
     devAssert(varName.indexOf('RETURN') == -1);
-    this.replacements_[varName] =
-        this.replacements_[varName] || {sync: undefined, async: undefined};
+    this.replacements_[varName] = this.replacements_[varName] || {
+      sync: undefined,
+      async: undefined,
+    };
     this.replacements_[varName].async = asyncResolver;
     return this;
   }
@@ -273,8 +275,7 @@ export class VariableSource {
 
     // A meta[name="amp-allowed-url-macros"] tag, if present,
     // contains, in its content attribute, a whitelist of variable substitution.
-    const meta =
-      head.querySelector('meta[name="amp-allowed-url-macros"]');
+    const meta = head.querySelector('meta[name="amp-allowed-url-macros"]');
     if (!meta) {
       return null;
     }
@@ -283,8 +284,10 @@ export class VariableSource {
      * The whitelist of variables allowed for variable substitution.
      * @private {?Array<string>}
      */
-    this.variableWhitelist_ = meta.getAttribute('content').split(',')
-        .map(variable => variable.trim());
+    this.variableWhitelist_ = meta
+      .getAttribute('content')
+      .split(',')
+      .map(variable => variable.trim());
     return this.variableWhitelist_;
   }
 }
diff --git a/src/service/video-manager-impl.js b/src/service/video-manager-impl.js
index 924a34241d4b..8b591ef66d9c 100644
--- a/src/service/video-manager-impl.js
+++ b/src/service/video-manager-impl.js
@@ -54,18 +54,15 @@ import {renderIcon, renderInteractionOverlay} from './video/autoplay';
 import {startsWith} from '../string';
 import {toggle} from '../style';
 
-
 /** @private @const {string} */
 const TAG = 'video-manager';
 
-
 /**
  * @private {number} The minimum number of milliseconds to wait between each
  * video-seconds-played analytics event.
  */
 const SECONDS_PLAYED_MIN_DELAY = 1000;
 
-
 /**
  * VideoManager keeps track of all AMP video players that implement
  * the common Video API {@see ../video-interface.VideoInterface}.
@@ -85,7 +82,8 @@ export class VideoManager {
 
     /** @const */
     this.installAutoplayStyles = once(() =>
-      installAutoplayStylesForDoc(this.ampdoc));
+      installAutoplayStylesForDoc(this.ampdoc)
+    );
 
     /** @private {!../service/viewport/viewport-impl.Viewport} */
     this.viewport_ = Services.viewportForDoc(this.ampdoc);
@@ -106,8 +104,9 @@ export class VideoManager {
     this.boundSecondsPlaying_ = () => this.secondsPlaying_();
 
     /** @private @const {function():!AutoFullscreenManager} */
-    this.getAutoFullscreenManager_ =
-        once(() => new AutoFullscreenManager(this.ampdoc, this));
+    this.getAutoFullscreenManager_ = once(
+      () => new AutoFullscreenManager(this.ampdoc, this)
+    );
 
     // TODO(cvializ, #10599): It would be nice to only create the timer
     // if video analytics are present, since the timer is not needed if
@@ -153,12 +152,17 @@ export class VideoManager {
     const name = 'timeUpdate';
     const currentTime = entry.video.getCurrentTime();
     const duration = entry.video.getDuration();
-    if (isFiniteNumber(currentTime) &&
-        isFiniteNumber(duration) &&
-        duration > 0) {
+    if (
+      isFiniteNumber(currentTime) &&
+      isFiniteNumber(duration) &&
+      duration > 0
+    ) {
       const perc = currentTime / duration;
-      const event = createCustomEvent(this.ampdoc.win, `${TAG}.${name}`,
-          dict({'time': currentTime, 'percent': perc}));
+      const event = createCustomEvent(
+        this.ampdoc.win,
+        `${TAG}.${name}`,
+        dict({'time': currentTime, 'percent': perc})
+      );
       this.actions_.trigger(entry.video.element, name, event, ActionTrust.LOW);
     }
   }
@@ -186,8 +190,7 @@ export class VideoManager {
     // Unlike events, signals are permanent. We can wait for `REGISTERED` at any
     // moment in the element's lifecycle and the promise will resolve
     // appropriately each time.
-    const signals =
-        (/** @type {!../base-element.BaseElement} */ (video)).signals();
+    const signals = /** @type {!../base-element.BaseElement} */ (video).signals();
 
     signals.signal(VideoEvents.REGISTERED);
 
@@ -219,10 +222,14 @@ export class VideoManager {
      * @param {function()} fn
      */
     function registerAction(action, fn) {
-      video.registerAction(action, () => {
-        userInteractedWith(video);
-        fn();
-      }, trust);
+      video.registerAction(
+        action,
+        () => {
+          userInteractedWith(video);
+          fn();
+        },
+        trust
+      );
     }
   }
 
@@ -354,7 +361,6 @@ export class VideoManager {
   }
 }
 
-
 /**
  * VideoEntry represents an entry in the VideoManager's list.
  */
@@ -388,14 +394,16 @@ class VideoEntry {
     /** @private @const */
     this.actionSessionManager_ = new VideoSessionManager();
 
-    this.actionSessionManager_.onSessionEnd(
-        () => analyticsEvent(this, VideoAnalyticsEvents.SESSION));
+    this.actionSessionManager_.onSessionEnd(() =>
+      analyticsEvent(this, VideoAnalyticsEvents.SESSION)
+    );
 
     /** @private @const */
     this.visibilitySessionManager_ = new VideoSessionManager();
 
-    this.visibilitySessionManager_.onSessionEnd(
-        () => analyticsEvent(this, VideoAnalyticsEvents.SESSION_VISIBLE));
+    this.visibilitySessionManager_.onSessionEnd(() =>
+      analyticsEvent(this, VideoAnalyticsEvents.SESSION_VISIBLE)
+    );
 
     /** @private @const {function(): !Promise<boolean>} */
     this.supportsAutoplay_ = () => {
@@ -404,8 +412,9 @@ class VideoEntry {
     };
 
     /** @private @const {function(): !AnalyticsPercentageTracker} */
-    this.getAnalyticsPercentageTracker_ = once(() =>
-      new AnalyticsPercentageTracker(this.ampdoc_.win, this));
+    this.getAnalyticsPercentageTracker_ = once(
+      () => new AnalyticsPercentageTracker(this.ampdoc_.win, this)
+    );
 
     // Autoplay Variables
 
@@ -442,12 +451,13 @@ class VideoEntry {
       this.video.pause();
     };
 
-    listenOncePromise(video.element, VideoEvents.LOAD)
-        .then(() => this.videoLoaded());
+    listenOncePromise(video.element, VideoEvents.LOAD).then(() =>
+      this.videoLoaded()
+    );
     listen(video.element, VideoEvents.PAUSE, () => this.videoPaused_());
     listen(video.element, VideoEvents.PLAYING, () => this.videoPlayed_());
-    listen(video.element, VideoEvents.MUTED, () => this.muted_ = true);
-    listen(video.element, VideoEvents.UNMUTED, () => this.muted_ = false);
+    listen(video.element, VideoEvents.MUTED, () => (this.muted_ = true));
+    listen(video.element, VideoEvents.UNMUTED, () => (this.muted_ = false));
     listen(video.element, VideoEvents.ENDED, () => this.videoEnded_());
 
     listen(video.element, VideoAnalyticsEvents.CUSTOM, e => {
@@ -455,12 +465,15 @@ class VideoEntry {
       const eventType = data['eventType'];
       const vars = data['vars'];
       this.logCustomAnalytics_(
-          dev().assertString(eventType, '`eventType` missing'),
-          vars);
+        dev().assertString(eventType, '`eventType` missing'),
+        vars
+      );
     });
 
-    video.signals().whenSignal(VideoEvents.REGISTERED)
-        .then(() => this.onRegister_());
+    video
+      .signals()
+      .whenSignal(VideoEvents.REGISTERED)
+      .then(() => this.onRegister_());
 
     /**
      * Trigger event for first manual play.
@@ -469,8 +482,11 @@ class VideoEntry {
     this.firstPlayEventOrNoop_ = once(() => {
       const firstPlay = 'firstPlay';
       const trust = ActionTrust.LOW;
-      const event = createCustomEvent(this.ampdoc_.win, firstPlay,
-          /* detail */ dict({}));
+      const event = createCustomEvent(
+        this.ampdoc_.win,
+        firstPlay,
+        /* detail */ dict({})
+      );
       const {element} = this.video;
       const actions = Services.actionServiceForDoc(element);
       actions.trigger(element, firstPlay, event, trust);
@@ -533,14 +549,18 @@ class VideoEntry {
    */
   requiresAutoFullscreen_() {
     const {element} = this.video;
-    if (this.video.preimplementsAutoFullscreen() ||
-        !element.hasAttribute(VideoAttributes.ROTATE_TO_FULLSCREEN)) {
+    if (
+      this.video.preimplementsAutoFullscreen() ||
+      !element.hasAttribute(VideoAttributes.ROTATE_TO_FULLSCREEN)
+    ) {
       return false;
     }
-    return userAssert(this.video.isInteractive(),
-        'Only interactive videos are allowed to enter fullscreen on rotate. ' +
+    return userAssert(
+      this.video.isInteractive(),
+      'Only interactive videos are allowed to enter fullscreen on rotate. ' +
         'Set the `controls` attribute on %s to enable.',
-        element);
+      element
+    );
   }
 
   /**
@@ -557,15 +577,17 @@ class VideoEntry {
     const {video} = this;
     const {element} = video;
 
-    if (!video.preimplementsMediaSessionAPI() &&
-        !element.classList.contains('i-amphtml-disable-mediasession')) {
-
+    if (
+      !video.preimplementsMediaSessionAPI() &&
+      !element.classList.contains('i-amphtml-disable-mediasession')
+    ) {
       setMediaSession(
-          element,
-          this.ampdoc_.win,
-          this.metadata_,
-          this.boundMediasessionPlay_,
-          this.boundMediasessionPause_);
+        element,
+        this.ampdoc_.win,
+        this.metadata_,
+        this.boundMediasessionPlay_,
+        this.boundMediasessionPause_
+      );
     }
 
     this.actionSessionManager_.beginSession();
@@ -631,31 +653,33 @@ class VideoEntry {
 
     if (this.video.getMetadata()) {
       this.metadata_ = map(
-          /** @type {!../mediasession-helper.MetadataDef} */
-          (this.video.getMetadata())
+        /** @type {!../mediasession-helper.MetadataDef} */
+        (this.video.getMetadata())
       );
     }
 
     const doc = this.ampdoc_.win.document;
 
     if (!this.metadata_.artwork || this.metadata_.artwork.length == 0) {
-      const posterUrl = parseSchemaImage(doc)
-                        || parseOgImage(doc)
-                        || parseFavicon(doc);
+      const posterUrl =
+        parseSchemaImage(doc) || parseOgImage(doc) || parseFavicon(doc);
 
       if (posterUrl) {
-        this.metadata_.artwork = [{
-          'src': posterUrl,
-        }];
+        this.metadata_.artwork = [
+          {
+            'src': posterUrl,
+          },
+        ];
       }
     }
 
     if (!this.metadata_.title) {
-      const title = this.video.element.getAttribute('title')
-                    || this.video.element.getAttribute('aria-label')
-                    || this.internalElement_.getAttribute('title')
-                    || this.internalElement_.getAttribute('aria-label')
-                    || doc.title;
+      const title =
+        this.video.element.getAttribute('title') ||
+        this.video.element.getAttribute('aria-label') ||
+        this.internalElement_.getAttribute('title') ||
+        this.internalElement_.getAttribute('aria-label') ||
+        doc.title;
       if (title) {
         this.metadata_.title = title;
       }
@@ -681,8 +705,7 @@ class VideoEntry {
       return;
     }
     this.supportsAutoplay_().then(supportsAutoplay => {
-      const canAutoplay = this.hasAutoplay &&
-          !this.userInteracted();
+      const canAutoplay = this.hasAutoplay && !this.userInteracted();
 
       if (canAutoplay && supportsAutoplay) {
         this.autoplayLoadedVideoVisibilityChanged_();
@@ -699,7 +722,6 @@ class VideoEntry {
    * @private
    */
   autoplayVideoBuilt_() {
-
     // Hide controls until we know if autoplay is supported, otherwise hiding
     // and showing the controls quickly becomes a bad user experience for the
     // common case where autoplay is supported.
@@ -732,8 +754,10 @@ class VideoEntry {
     const {video} = this;
     const {element, win} = this.video;
 
-    if (element.hasAttribute(VideoAttributes.NO_AUDIO) ||
-        element.signals().get(VideoServiceSignals.USER_INTERACTED)) {
+    if (
+      element.hasAttribute(VideoAttributes.NO_AUDIO) ||
+      element.signals().get(VideoServiceSignals.USER_INTERACTED)
+    ) {
       return;
     }
 
@@ -755,26 +779,29 @@ class VideoEntry {
       listen(element, VideoEvents.PLAYING, () => toggleAnimation(true)),
     ];
 
-    video.signals().whenSignal(VideoServiceSignals.USER_INTERACTED).then(() => {
-      const {video} = this;
-      const {element} = video;
-      this.firstPlayEventOrNoop_();
-      if (video.isInteractive()) {
-        video.showControls();
-      }
-      video.unmute();
-      unlisteners.forEach(unlistener => {
-        unlistener();
+    video
+      .signals()
+      .whenSignal(VideoServiceSignals.USER_INTERACTED)
+      .then(() => {
+        const {video} = this;
+        const {element} = video;
+        this.firstPlayEventOrNoop_();
+        if (video.isInteractive()) {
+          video.showControls();
+        }
+        video.unmute();
+        unlisteners.forEach(unlistener => {
+          unlistener();
+        });
+        const animation = element.querySelector('.amp-video-eq');
+        const mask = element.querySelector('i-amphtml-video-mask');
+        if (animation) {
+          removeElement(animation);
+        }
+        if (mask) {
+          removeElement(mask);
+        }
       });
-      const animation = element.querySelector('.amp-video-eq');
-      const mask = element.querySelector('i-amphtml-video-mask');
-      if (animation) {
-        removeElement(animation);
-      }
-      if (mask) {
-        removeElement(mask);
-      }
-    });
 
     if (!video.isInteractive()) {
       return;
@@ -850,8 +877,8 @@ class VideoEntry {
       const {element} = this.video;
       const ratio = element.getIntersectionChangeEntry().intersectionRatio;
       this.isVisible_ =
-          (!isFiniteNumber(ratio) ? 0 : ratio) >=
-            MIN_VISIBILITY_RATIO_FOR_AUTOPLAY;
+        (!isFiniteNumber(ratio) ? 0 : ratio) >=
+        MIN_VISIBILITY_RATIO_FOR_AUTOPLAY;
     }
 
     if (this.isVisible_ != wasVisible) {
@@ -869,9 +896,11 @@ class VideoEntry {
       return PlayingStates.PAUSED;
     }
 
-    if (this.isPlaying_
-       && this.playCalledByAutoplay_
-       && !this.userInteracted()) {
+    if (
+      this.isPlaying_ &&
+      this.playCalledByAutoplay_ &&
+      !this.userInteracted()
+    ) {
       return PlayingStates.PLAYING_AUTO;
     }
 
@@ -884,7 +913,8 @@ class VideoEntry {
    */
   userInteracted() {
     return (
-      this.video.signals().get(VideoServiceSignals.USER_INTERACTED) != null);
+      this.video.signals().get(VideoServiceSignals.USER_INTERACTED) != null
+    );
   }
 
   /**
@@ -898,7 +928,9 @@ class VideoEntry {
       const autoplay = this.hasAutoplay && supportsAutoplay;
       const playedRanges = video.getPlayedRanges();
       const playedTotal = playedRanges.reduce(
-          (acc, range) => acc + range[1] - range[0], 0);
+        (acc, range) => acc + range[1] - range[0],
+        0
+      );
 
       return {
         'autoplay': autoplay,
@@ -917,7 +949,6 @@ class VideoEntry {
   }
 }
 
-
 /**
  * @param {!AmpElement} video
  * @return {boolean}
@@ -925,22 +956,19 @@ class VideoEntry {
  */
 function supportsFullscreenViaApi(video) {
   // TODO(alanorozco): Determine this via a flag in the component itself.
-  return !!({
+  return !!{
     'amp-dailymotion': true,
     'amp-ima-video': true,
-  }[video.tagName.toLowerCase()]);
+  }[video.tagName.toLowerCase()];
 }
 
-
 /** Manages rotate-to-fullscreen video. */
 export class AutoFullscreenManager {
-
   /**
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
    * @param {!VideoManager} manager
    */
   constructor(ampdoc, manager) {
-
     /** @private @const {!VideoManager} */
     this.manager_ = manager;
 
@@ -992,8 +1020,10 @@ export class AutoFullscreenManager {
     listen(element, VideoEvents.PLAYING, this.boundSelectBestCentered_);
     listen(element, VideoEvents.ENDED, this.boundSelectBestCentered_);
 
-    video.signals().whenSignal(VideoServiceSignals.USER_INTERACTED)
-        .then(this.boundSelectBestCentered_);
+    video
+      .signals()
+      .whenSignal(VideoServiceSignals.USER_INTERACTED)
+      .then(this.boundSelectBestCentered_);
 
     // Set always
     this.selectBestCenteredInPortrait_();
@@ -1090,8 +1120,7 @@ export class AutoFullscreenManager {
       return;
     }
 
-    this.scrollIntoIfNotVisible_(video)
-        .then(() => video.fullscreenEnter());
+    this.scrollIntoIfNotVisible_(video).then(() => video.fullscreenEnter());
   }
 
   /**
@@ -1101,8 +1130,9 @@ export class AutoFullscreenManager {
   exit_(video) {
     this.currentlyInFullscreen_ = null;
 
-    this.scrollIntoIfNotVisible_(video, 'center')
-        .then(() => video.fullscreenExit());
+    this.scrollIntoIfNotVisible_(video, 'center').then(() =>
+      video.fullscreenExit()
+    );
   }
 
   /**
@@ -1123,8 +1153,11 @@ export class AutoFullscreenManager {
       if (fullyVisible) {
         return Promise.resolve();
       }
-      const pos = optPos ? dev().assertString(optPos) :
-        bottom > vh ? 'bottom' : 'top';
+      const pos = optPos
+        ? dev().assertString(optPos)
+        : bottom > vh
+        ? 'bottom'
+        : 'top';
       return viewport.animateScrollIntoView(element, pos);
     });
   }
@@ -1149,8 +1182,8 @@ export class AutoFullscreenManager {
     this.currentlyCentered_ = null;
 
     const selected = this.entries_
-        .filter(this.boundIncludeOnlyPlaying_)
-        .sort(this.boundCompareEntries_)[0];
+      .filter(this.boundIncludeOnlyPlaying_)
+      .sort(this.boundCompareEntries_)[0];
 
     if (selected) {
       const {intersectionRatio} = selected.element.getIntersectionChangeEntry();
@@ -1189,8 +1222,7 @@ export class AutoFullscreenManager {
     const viewport = Services.viewportForDoc(this.ampdoc_);
     const centerA = centerDist(viewport, rectA);
     const centerB = centerDist(viewport, rectB);
-    if (centerA < centerB ||
-        centerA > centerB) {
+    if (centerA < centerB || centerA > centerB) {
       return centerA - centerB;
     }
 
@@ -1205,23 +1237,22 @@ export class AutoFullscreenManager {
    */
   getPlayingState_(video) {
     return this.manager_.getPlayingState(
-        /** @type {!../video-interface.VideoInterface} */ (video));
+      /** @type {!../video-interface.VideoInterface} */ (video)
+    );
   }
 }
 
-
 /**
  * @param {!./viewport/viewport-impl.Viewport} viewport
  * @param {{top: number, height: number}} rect
  * @return {number}
  */
 function centerDist(viewport, rect) {
-  const centerY = rect.top + (rect.height / 2);
+  const centerY = rect.top + rect.height / 2;
   const centerViewport = viewport.getSize().height / 2;
   return Math.abs(centerY - centerViewport);
 }
 
-
 /**
  * @param {!Window} win
  * @return {boolean}
@@ -1233,7 +1264,6 @@ function isLandscape(win) {
   return Math.abs(win.orientation) == 90;
 }
 
-
 /** @visibleForTesting */
 export const PERCENTAGE_INTERVAL = 5;
 
@@ -1246,7 +1276,6 @@ const PERCENTAGE_FREQUENCY_MIN_MS = 250;
 /** @private */
 const PERCENTAGE_FREQUENCY_MAX_MS = 4000;
 
-
 /**
  * Calculates the "ideal" analytics check frequency from playback start, e.g.
  * the amount of ms after each PERCENTAGE_INTERVAL.
@@ -1257,7 +1286,6 @@ function calculateIdealPercentageFrequencyMs(durationSeconds) {
   return durationSeconds * 10 * PERCENTAGE_INTERVAL;
 }
 
-
 /**
  * Calculates the "actual" analytics check frequency by calculating the ideal
  * frequency and clamping it between MIN and MAX.
@@ -1266,12 +1294,12 @@ function calculateIdealPercentageFrequencyMs(durationSeconds) {
  */
 function calculateActualPercentageFrequencyMs(durationSeconds) {
   return clamp(
-      calculateIdealPercentageFrequencyMs(durationSeconds),
-      PERCENTAGE_FREQUENCY_MIN_MS,
-      PERCENTAGE_FREQUENCY_MAX_MS);
+    calculateIdealPercentageFrequencyMs(durationSeconds),
+    PERCENTAGE_FREQUENCY_MIN_MS,
+    PERCENTAGE_FREQUENCY_MAX_MS
+  );
 }
 
-
 /** @visibleForTesting */
 export class AnalyticsPercentageTracker {
   /**
@@ -1279,7 +1307,6 @@ export class AnalyticsPercentageTracker {
    * @param {!VideoEntry} entry
    */
   constructor(win, entry) {
-
     // This is destructured in `calculate_()`, but the linter thinks it's unused
     /** @private @const {!./timer-impl.Timer} */
     this.timer_ = Services.timerFor(win); // eslint-disable-line
@@ -1311,17 +1338,18 @@ export class AnalyticsPercentageTracker {
     this.unlisteners_ = this.unlisteners_ || [];
 
     this.unlisteners_.push(
-        listenOnce(element, VideoEvents.LOADEDMETADATA, () => {
-          if (this.hasDuration_()) {
-            this.calculate_(this.triggerId_);
-          }
-        }),
-
-        listen(element, VideoEvents.ENDED, () => {
-          if (this.hasDuration_()) {
-            this.maybeTrigger_(/* normalizedPercentage */ 100);
-          }
-        }));
+      listenOnce(element, VideoEvents.LOADEDMETADATA, () => {
+        if (this.hasDuration_()) {
+          this.calculate_(this.triggerId_);
+        }
+      }),
+
+      listen(element, VideoEvents.ENDED, () => {
+        if (this.hasDuration_()) {
+          this.maybeTrigger_(/* normalizedPercentage */ 100);
+        }
+      })
+    );
   }
 
   /** @public */
@@ -1344,24 +1372,25 @@ export class AnalyticsPercentageTracker {
     const duration = video.getDuration();
 
     // Livestreams or videos with no duration information available.
-    if (!duration ||
-      isNaN(duration) ||
-      duration <= 0) {
+    if (!duration || isNaN(duration) || duration <= 0) {
       return false;
     }
 
-    if (calculateIdealPercentageFrequencyMs(duration) <
-        PERCENTAGE_FREQUENCY_MIN_MS) {
-
+    if (
+      calculateIdealPercentageFrequencyMs(duration) <
+      PERCENTAGE_FREQUENCY_MIN_MS
+    ) {
       const bestResultLength = Math.ceil(
-          PERCENTAGE_FREQUENCY_MIN_MS * (100 / PERCENTAGE_INTERVAL) / 1000);
+        (PERCENTAGE_FREQUENCY_MIN_MS * (100 / PERCENTAGE_INTERVAL)) / 1000
+      );
 
       this.warnForTesting_(
-          'This video is too short for `video-percentage-played`. ' +
+        'This video is too short for `video-percentage-played`. ' +
           'Reports may be innacurate. For best results, use videos over',
-          bestResultLength,
-          'seconds long.',
-          video.element);
+        bestResultLength,
+        'seconds long.',
+        video.element
+      );
     }
 
     return true;
@@ -1384,10 +1413,7 @@ export class AnalyticsPercentageTracker {
       return;
     }
 
-    const {
-      entry_: entry,
-      timer_: timer,
-    } = this;
+    const {entry_: entry, timer_: timer} = this;
     const {video} = entry;
 
     const calculateAgain = () => this.calculate_(triggerId);
@@ -1441,7 +1467,6 @@ export class AnalyticsPercentageTracker {
   }
 }
 
-
 /**
  * @param {!VideoEntry} entry
  * @param {!VideoAnalyticsEvents|string} eventType
@@ -1459,7 +1484,6 @@ function analyticsEvent(entry, eventType, opt_vars) {
   });
 }
 
-
 /** @param {!Node|!./ampdoc-impl.AmpDoc} nodeOrDoc */
 export function installVideoManagerForDoc(nodeOrDoc) {
   registerServiceBuilderForDoc(nodeOrDoc, 'video-manager', VideoManager);
diff --git a/src/service/video-session-manager.js b/src/service/video-session-manager.js
index 895c4d9ef085..a86bf25e8a18 100644
--- a/src/service/video-session-manager.js
+++ b/src/service/video-session-manager.js
@@ -16,7 +16,6 @@
 
 import {Observable} from '../observable';
 
-
 export class VideoSessionManager {
   /**
    * Creates an instance of VideoSessionManager.
diff --git a/src/service/video/autoplay.js b/src/service/video/autoplay.js
index cc3cff75d3ab..34fd47b72000 100644
--- a/src/service/video/autoplay.js
+++ b/src/service/video/autoplay.js
@@ -19,7 +19,6 @@ import {dev} from '../../log';
 import {htmlFor} from '../../static-template';
 import {removeElement} from '../../dom';
 
-
 /**
  * @param {!Element} node
  * @return {!Element}
@@ -28,18 +27,18 @@ function cloneDeep(node) {
   return dev().assertElement(node.cloneNode(/* deep */ true));
 }
 
-
 /**
  * @param {!Element|!Document} elOrDoc
  * @return {!Element}
  */
 export function renderInteractionOverlay(elOrDoc) {
   const html = htmlFor(elOrDoc);
-  return html`<i-amphtml-video-mask class="i-amphtml-fill-content" role=button>
-    </i-amphtml-video-mask>`;
+  return html`
+    <i-amphtml-video-mask class="i-amphtml-fill-content" role="button">
+    </i-amphtml-video-mask>
+  `;
 }
 
-
 /**
  * @param {!Window} win
  * @param {!Element|!Document} elOrDoc
@@ -47,12 +46,14 @@ export function renderInteractionOverlay(elOrDoc) {
  */
 export function renderIcon(win, elOrDoc) {
   const html = htmlFor(elOrDoc);
-  const icon = html`<i-amphtml-video-icon class="amp-video-eq">
-    <div class="amp-video-eq-col">
-      <div class="amp-video-eq-filler"></div>
-      <div class="amp-video-eq-filler"></div>
-    </div>
-  </i-amphtml-video-icon>`;
+  const icon = html`
+    <i-amphtml-video-icon class="amp-video-eq">
+      <div class="amp-video-eq-col">
+        <div class="amp-video-eq-filler"></div>
+        <div class="amp-video-eq-filler"></div>
+      </div>
+    </i-amphtml-video-icon>
+  `;
 
   // Copy equalizer column 4x and annotate filler positions for animation.
   const firstCol = dev().assertElement(icon.firstElementChild);
@@ -76,4 +77,3 @@ export function renderIcon(win, elOrDoc) {
 
   return icon;
 }
-
diff --git a/src/service/video/install-autoplay-styles.js b/src/service/video/install-autoplay-styles.js
index 0164359388d0..e1ce25e581db 100644
--- a/src/service/video/install-autoplay-styles.js
+++ b/src/service/video/install-autoplay-styles.js
@@ -18,15 +18,15 @@ import {installStylesForDoc} from '../../style-installer';
 // Source for this constant is css/video-autoplay.css
 import {cssText} from '../../../build/video-autoplay.css.js';
 
-
 /**
  * @param  {!../ampdoc-impl.AmpDoc} ampdoc
  */
 export function installAutoplayStylesForDoc(ampdoc) {
   installStylesForDoc(
-      ampdoc,
-      cssText,
-      /* callback */ null,
-      /* opt_isRuntimeCss */ false,
-      /* opt_ext */ 'amp-video-autoplay');
+    ampdoc,
+    cssText,
+    /* callback */ null,
+    /* opt_isRuntimeCss */ false,
+    /* opt_ext */ 'amp-video-autoplay'
+  );
 }
diff --git a/src/service/viewer-cid-api.js b/src/service/viewer-cid-api.js
index 9dd021d9befa..1bfb4bc35b48 100644
--- a/src/service/viewer-cid-api.js
+++ b/src/service/viewer-cid-api.js
@@ -22,13 +22,11 @@ import {parseUrlDeprecated} from '../url';
  * Exposes CID API if provided by the Viewer.
  */
 export class ViewerCidApi {
-
   /**
    * Creates an instance of ViewerCidApi.
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
    */
   constructor(ampdoc) {
-
     /** @private {!./ampdoc-impl.AmpDoc} */
     this.ampdoc_ = ampdoc;
 
diff --git a/src/service/viewer-impl.js b/src/service/viewer-impl.js
index 16b3158b1329..3d926278354c 100644
--- a/src/service/viewer-impl.js
+++ b/src/service/viewer-impl.js
@@ -55,8 +55,7 @@ const VIEWER_ORIGIN_TIMEOUT_ = 1000;
  * @const
  * @private {!RegExp}
  */
-const TRIM_ORIGIN_PATTERN_ =
-  /^(https?:\/\/)((www[0-9]*|web|ftp|wap|home|mobile|amp|m)\.)+/i;
+const TRIM_ORIGIN_PATTERN_ = /^(https?:\/\/)((www[0-9]*|web|ftp|wap|home|mobile|amp|m)\.)+/i;
 
 /**
  * These domains are trusted with more sensitive viewer operations such as
@@ -91,7 +90,6 @@ const TRUSTED_VIEWER_HOSTS = [
  */
 let RequestResponderDef;
 
-
 /**
  * An AMP representation of the Viewer. This class doesn't do any work itself
  * but instead delegates everything to the actual viewer. This class and the
@@ -100,7 +98,6 @@ let RequestResponderDef;
  * @package Visible for type.
  */
 export class Viewer {
-
   /**
    * @param {!./ampdoc-impl.AmpDoc} ampdoc
    * @param {!Object<string, string>=} opt_initParams
@@ -221,15 +218,16 @@ export class Viewer {
     this.isRuntimeOn_ = !parseInt(this.params_['off'], 10);
     dev().fine(TAG_, '- runtimeOn:', this.isRuntimeOn_);
 
-    this.overtakeHistory_ = !!(parseInt(this.params_['history'], 10) ||
-        this.overtakeHistory_);
+    this.overtakeHistory_ = !!(
+      parseInt(this.params_['history'], 10) || this.overtakeHistory_
+    );
     dev().fine(TAG_, '- history:', this.overtakeHistory_);
 
     this.setVisibilityState_(this.params_['visibilityState']);
     dev().fine(TAG_, '- visibilityState:', this.getVisibilityState());
 
-    this.prerenderSize_ = parseInt(this.params_['prerenderSize'], 10) ||
-        this.prerenderSize_;
+    this.prerenderSize_ =
+      parseInt(this.params_['prerenderSize'], 10) || this.prerenderSize_;
     dev().fine(TAG_, '- prerenderSize:', this.prerenderSize_);
 
     /**
@@ -242,8 +240,9 @@ export class Viewer {
      * Whether the AMP document was served by a proxy.
      * @private @const {boolean}
      */
-    this.isProxyOrigin_ =
-        isProxyOrigin(parseUrlDeprecated(this.ampdoc.win.location.href));
+    this.isProxyOrigin_ = isProxyOrigin(
+      parseUrlDeprecated(this.ampdoc.win.location.href)
+    );
 
     /** @private {boolean} */
     this.hasBeenVisible_ = this.isVisible();
@@ -255,8 +254,9 @@ export class Viewer {
     /** @const @private {!Function} */
     this.messagingReadyResolver_ = messagingDeferred.resolve;
     /** @const @private {?Promise} */
-    this.messagingReadyPromise_ =
-        this.initMessagingChannel_(messagingDeferred.promise);
+    this.messagingReadyPromise_ = this.initMessagingChannel_(
+      messagingDeferred.promise
+    );
 
     /** @private {?Promise<boolean>} */
     this.isTrustedViewer_ = null;
@@ -266,10 +266,11 @@ export class Viewer {
 
     /** @private {string} */
     this.unconfirmedReferrerUrl_ =
-        (this.isEmbedded() && 'referrer' in this.params_ &&
-            this.isTrustedAncestorOrigins_() !== false)
-          ? this.params_['referrer']
-          : this.win.document.referrer;
+      this.isEmbedded() &&
+      'referrer' in this.params_ &&
+      this.isTrustedAncestorOrigins_() !== false
+        ? this.params_['referrer']
+        : this.win.document.referrer;
 
     /** @const @private {!Promise<string>} */
     this.referrerUrl_ = new Promise(resolve => {
@@ -282,9 +283,13 @@ export class Viewer {
           } else {
             resolve(this.win.document.referrer);
             if (this.unconfirmedReferrerUrl_ != this.win.document.referrer) {
-              dev().expectedError(TAG_, 'Untrusted viewer referrer override: ' +
-                  this.unconfirmedReferrerUrl_ + ' at ' +
-                  this.messagingOrigin_);
+              dev().expectedError(
+                TAG_,
+                'Untrusted viewer referrer override: ' +
+                  this.unconfirmedReferrerUrl_ +
+                  ' at ' +
+                  this.messagingOrigin_
+              );
               this.unconfirmedReferrerUrl_ = this.win.document.referrer;
             }
           }
@@ -308,8 +313,13 @@ export class Viewer {
           if (isTrusted) {
             this.resolvedViewerUrl_ = viewerUrlOverride;
           } else {
-            dev().expectedError(TAG_, 'Untrusted viewer url override: ' +
-                viewerUrlOverride + ' at ' + this.messagingOrigin_);
+            dev().expectedError(
+              TAG_,
+              'Untrusted viewer url override: ' +
+                viewerUrlOverride +
+                ' at ' +
+                this.messagingOrigin_
+            );
           }
           resolve(this.resolvedViewerUrl_);
         });
@@ -359,7 +369,8 @@ export class Viewer {
    */
   initMessagingChannel_(messagingPromise) {
     const isEmbedded = !!(
-      (this.isIframed_ && !this.win.AMP_TEST_IFRAME
+      (this.isIframed_ &&
+        !this.win.AMP_TEST_IFRAME &&
         // Checking param "origin", as we expect all viewers to provide it.
         // See https://github.com/ampproject/amphtml/issues/4183
         // There appears to be a bug under investigation where the
@@ -368,25 +379,27 @@ export class Viewer {
         // for visibilityState.
         // After https://github.com/ampproject/amphtml/issues/6070
         // is fixed we should probably only keep the amp_js_v check here.
-        && (this.params_['origin']
-          || this.params_['visibilityState']
+        (this.params_['origin'] ||
+          this.params_['visibilityState'] ||
           // Parent asked for viewer JS. We must be embedded.
-          || (this.win.location.search.indexOf('amp_js_v') != -1)))
-      || this.isWebviewEmbedded()
-      || this.isCctEmbedded()
-      || !this.ampdoc.isSingleDoc());
+          this.win.location.search.indexOf('amp_js_v') != -1)) ||
+      this.isWebviewEmbedded() ||
+      this.isCctEmbedded() ||
+      !this.ampdoc.isSingleDoc()
+    );
 
     if (!isEmbedded) {
       return null;
     }
     return Services.timerFor(this.win)
-        .timeoutPromise(20000, messagingPromise)
-        .catch(reason => {
-          const error = getChannelError(
-              /** @type {!Error|string|undefined} */ (reason));
-          reportError(error);
-          throw error;
-        });
+      .timeoutPromise(20000, messagingPromise)
+      .catch(reason => {
+        const error = getChannelError(
+          /** @type {!Error|string|undefined} */ (reason)
+        );
+        reportError(error);
+        throw error;
+      });
   }
 
   /**
@@ -460,8 +473,9 @@ export class Viewer {
     this.isCctEmbedded_ = false;
     if (!this.isIframed_) {
       const queryParams = parseQueryString(this.win.location.search);
-      this.isCctEmbedded_ = queryParams['amp_gsa'] === '1' &&
-          startsWith(queryParams['amp_js_v'] || '', 'a');
+      this.isCctEmbedded_ =
+        queryParams['amp_gsa'] === '1' &&
+        startsWith(queryParams['amp_js_v'] || '', 'a');
     }
     return this.isCctEmbedded_;
   }
@@ -491,9 +505,12 @@ export class Viewer {
     const canonicalSourceOrigin = getSourceOrigin(canonicalUrl);
     if (this.hasRoughlySameOrigin_(sourceOrigin, canonicalSourceOrigin)) {
       this.hashParams_['ampshare'] = canonicalUrl;
-      this.win.history.replaceState({}, '',
-          '#' + serializeQueryString(
-              /** @type {!JsonObject} */ (this.hashParams_)));
+      this.win.history.replaceState(
+        {},
+        '',
+        '#' +
+          serializeQueryString(/** @type {!JsonObject} */ (this.hashParams_))
+      );
     }
   }
 
@@ -580,16 +597,17 @@ export class Viewer {
     // viewer). Unfortunately, the viewer sends HIDDEN instead of PRERENDER or
     // INACTIVE, though we know better.
     if (state === VisibilityState.HIDDEN) {
-      state = this.hasBeenVisible_ ?
-        VisibilityState.INACTIVE :
-        VisibilityState.PRERENDER;
+      state = this.hasBeenVisible_
+        ? VisibilityState.INACTIVE
+        : VisibilityState.PRERENDER;
     }
 
     this.viewerVisibilityState_ = state;
 
-    if (this.docState_.isHidden() &&
-        (state === VisibilityState.VISIBLE ||
-         state === VisibilityState.PAUSED)) {
+    if (
+      this.docState_.isHidden() &&
+      (state === VisibilityState.VISIBLE || state === VisibilityState.PAUSED)
+    ) {
       state = VisibilityState.HIDDEN;
     }
 
@@ -648,7 +666,7 @@ export class Viewer {
 
     const deferred = new Deferred();
     this.nextVisibleResolve_ = deferred.resolve;
-    return this.nextVisiblePromise_ = deferred.promise;
+    return (this.nextVisiblePromise_ = deferred.promise);
   }
 
   /**
@@ -747,13 +765,14 @@ export class Viewer {
   isTrustedViewer() {
     if (!this.isTrustedViewer_) {
       const isTrustedAncestorOrigins = this.isTrustedAncestorOrigins_();
-      this.isTrustedViewer_ = isTrustedAncestorOrigins !== undefined
-        ? Promise.resolve(isTrustedAncestorOrigins)
-        : this.messagingReadyPromise_.then(origin => {
-          return origin ? this.isTrustedViewerOrigin_(origin) : false;
-        });
+      this.isTrustedViewer_ =
+        isTrustedAncestorOrigins !== undefined
+          ? Promise.resolve(isTrustedAncestorOrigins)
+          : this.messagingReadyPromise_.then(origin => {
+              return origin ? this.isTrustedViewerOrigin_(origin) : false;
+            });
     }
-    return /** @type {!Promise<boolean>} */(this.isTrustedViewer_);
+    return /** @type {!Promise<boolean>} */ (this.isTrustedViewer_);
   }
 
   /**
@@ -765,13 +784,18 @@ export class Viewer {
     if (!this.isEmbedded()) {
       // Not embedded in IFrame - can't trust the viewer.
       return false;
-    } else if (this.win.location.ancestorOrigins && !this.isWebviewEmbedded() &&
-        !this.isCctEmbedded()) {
+    } else if (
+      this.win.location.ancestorOrigins &&
+      !this.isWebviewEmbedded() &&
+      !this.isCctEmbedded()
+    ) {
       // Ancestors when available take precedence. This is the main API used
       // for this determination. Fallback is only done when this API is not
       // supported by the browser.
-      return this.win.location.ancestorOrigins.length > 0 &&
-          this.isTrustedViewerOrigin_(this.win.location.ancestorOrigins[0]);
+      return (
+        this.win.location.ancestorOrigins.length > 0 &&
+        this.isTrustedViewerOrigin_(this.win.location.ancestorOrigins[0])
+      );
     }
   }
 
@@ -787,17 +811,23 @@ export class Viewer {
       if (!this.isEmbedded()) {
         // Viewer is only determined for iframed documents at this time.
         origin = '';
-      } else if (this.win.location.ancestorOrigins &&
-          this.win.location.ancestorOrigins.length > 0) {
+      } else if (
+        this.win.location.ancestorOrigins &&
+        this.win.location.ancestorOrigins.length > 0
+      ) {
         origin = this.win.location.ancestorOrigins[0];
       }
-      this.viewerOrigin_ = origin !== undefined
-        ? Promise.resolve(origin)
-        : Services.timerFor(this.win)
-            .timeoutPromise(VIEWER_ORIGIN_TIMEOUT_, this.messagingReadyPromise_)
-            .catch(() => '');
+      this.viewerOrigin_ =
+        origin !== undefined
+          ? Promise.resolve(origin)
+          : Services.timerFor(this.win)
+              .timeoutPromise(
+                VIEWER_ORIGIN_TIMEOUT_,
+                this.messagingReadyPromise_
+              )
+              .catch(() => '');
     }
-    return /** @type {!Promise<string>} */(this.viewerOrigin_);
+    return /** @type {!Promise<string>} */ (this.viewerOrigin_);
   }
 
   /**
@@ -880,7 +910,8 @@ export class Viewer {
     }
     if (eventType == 'broadcast') {
       this.broadcastObservable_.fire(
-          /** @type {!JsonObject|undefined} */ (data));
+        /** @type {!JsonObject|undefined} */ (data)
+      );
       return Promise.resolve();
     }
     const observable = this.messageObservables_[eventType];
@@ -922,9 +953,10 @@ export class Viewer {
       this.messageQueue_ = [];
       queue.forEach(message => {
         const responsePromise = this.messageDeliverer_(
-            message.eventType,
-            message.data,
-            message.awaitResponse);
+          message.eventType,
+          message.data,
+          message.awaitResponse
+        );
 
         if (message.awaitResponse) {
           message.responseResolver(responsePromise);
@@ -978,11 +1010,14 @@ export class Viewer {
       // Certain message deliverers return fake "Promise" instances called
       // "Thenables". Convert from these values into trusted Promise instances,
       // assimilating with the resolved (or rejected) internal value.
-      return /** @type {!Promise<?JsonObject|string|undefined>} */ (
-        tryResolve(() => this.messageDeliverer_(
+      return /** @type {!Promise<?JsonObject|string|undefined>} */ (tryResolve(
+        () =>
+          this.messageDeliverer_(
             eventType,
             /** @type {?JsonObject|string|undefined} */ (data),
-            awaitResponse)));
+            awaitResponse
+          )
+      ));
     }
 
     if (!this.messagingReadyPromise_) {
@@ -999,8 +1034,7 @@ export class Viewer {
       });
     }
 
-    const found = findIndex(this.messageQueue_,
-        m => m.eventType == eventType);
+    const found = findIndex(this.messageQueue_, m => m.eventType == eventType);
 
     let message;
     if (found != -1) {
@@ -1037,8 +1071,10 @@ export class Viewer {
       return Promise.resolve(false);
     }
 
-    return this.sendMessageInternal_('broadcast', message, false, false)
-        .then(() => true, () => false);
+    return this.sendMessageInternal_('broadcast', message, false, false).then(
+      () => true,
+      () => false
+    );
   }
 
   /**
@@ -1066,9 +1102,11 @@ export class Viewer {
    * @param {?string} newUrl
    */
   replaceUrl(newUrl) {
-    if (!newUrl ||
-        !this.ampdoc.isSingleDoc() ||
-        !this.win.history.replaceState) {
+    if (
+      !newUrl ||
+      !this.ampdoc.isSingleDoc() ||
+      !this.win.history.replaceState
+    ) {
       return;
     }
 
@@ -1076,9 +1114,12 @@ export class Viewer {
       // The origin and source origin must match.
       const url = parseUrlDeprecated(this.win.location.href);
       const replaceUrl = parseUrlDeprecated(
-          removeFragment(newUrl) + this.win.location.hash);
-      if (url.origin == replaceUrl.origin &&
-          getSourceOrigin(url) == getSourceOrigin(replaceUrl)) {
+        removeFragment(newUrl) + this.win.location.hash
+      );
+      if (
+        url.origin == replaceUrl.origin &&
+        getSourceOrigin(url) == getSourceOrigin(replaceUrl)
+      ) {
         this.win.history.replaceState({}, '', replaceUrl.href);
         this.win.location.originalHref = url.href;
         dev().fine(TAG_, 'replace url:' + replaceUrl.href);
@@ -1105,7 +1146,6 @@ function parseParams_(str, allParams) {
   }
 }
 
-
 /**
  * Creates an error for the case where a channel cannot be established.
  * @param {*=} opt_reason
@@ -1120,7 +1160,6 @@ function getChannelError(opt_reason) {
   return new Error('No messaging channel: ' + opt_reason);
 }
 
-
 /**
  * Sets the viewer visibility state. This calls is restricted to runtime only.
  * @param {!Viewer} viewer
@@ -1131,16 +1170,17 @@ export function setViewerVisibilityState(viewer, state) {
   viewer.setVisibilityState_(state);
 }
 
-
 /**
  * @param {!./ampdoc-impl.AmpDoc} ampdoc
  * @param {!Object<string, string>=} opt_initParams
  */
 export function installViewerServiceForDoc(ampdoc, opt_initParams) {
-  registerServiceBuilderForDoc(ampdoc,
-      'viewer',
-      function() {
-        return new Viewer(ampdoc, opt_initParams);
-      },
-      /* opt_instantiate */ true);
+  registerServiceBuilderForDoc(
+    ampdoc,
+    'viewer',
+    function() {
+      return new Viewer(ampdoc, opt_initParams);
+    },
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/viewport/viewport-binding-def.js b/src/service/viewport/viewport-binding-def.js
index 742a714d1636..c7e72b6bf92f 100644
--- a/src/service/viewport/viewport-binding-def.js
+++ b/src/service/viewport/viewport-binding-def.js
@@ -20,7 +20,6 @@
  * @interface
  */
 export class ViewportBindingDef {
-
   /**
    * Called before a first AMP element is added to resources. The final
    * preparations must be completed here. Called in the mutate context.
diff --git a/src/service/viewport/viewport-binding-ios-embed-sd.js b/src/service/viewport/viewport-binding-ios-embed-sd.js
index 157ae808530e..d1890a02d911 100644
--- a/src/service/viewport/viewport-binding-ios-embed-sd.js
+++ b/src/service/viewport/viewport-binding-ios-embed-sd.js
@@ -85,7 +85,6 @@ const INHERIT_STYLES = [
   'table-layout',
 ];
 
-
 /**
  * Implementation of ViewportBindingDef based for iframed iOS case where iframes
  * are not scrollable. Scrolling accomplished here by attaching shadow root,
@@ -95,7 +94,6 @@ const INHERIT_STYLES = [
  * @visibleForTesting
  */
 export class ViewportBindingIosEmbedShadowRoot_ {
-
   /**
    * @param {!Window} win
    */
@@ -229,7 +227,8 @@ export class ViewportBindingIosEmbedShadowRoot_ {
     this.updateBodyStyles_();
     if (this.win.MutationObserver) {
       const bodyObserver = new this.win.MutationObserver(
-          this.updateBodyStyles_.bind(this));
+        this.updateBodyStyles_.bind(this)
+      );
       bodyObserver.observe(body, {attributes: true});
     }
 
@@ -261,8 +260,10 @@ export class ViewportBindingIosEmbedShadowRoot_ {
       },
       mutate: () => {
         this.bodySyncScheduled_ = false;
-        setImportantStyles(this.wrapper_, assertDoesNotContainDisplay(
-            inheritStyles));
+        setImportantStyles(
+          this.wrapper_,
+          assertDoesNotContainDisplay(inheritStyles)
+        );
       },
     });
   }
@@ -282,8 +283,10 @@ export class ViewportBindingIosEmbedShadowRoot_ {
   /** @override */
   disconnect() {
     this.win.removeEventListener('resize', this.boundResizeEventListener_);
-    this.scroller_.removeEventListener('scroll',
-        this.boundScrollEventListener_);
+    this.scroller_.removeEventListener(
+      'scroll',
+      this.boundScrollEventListener_
+    );
   }
 
   /** @override */
@@ -365,14 +368,14 @@ export class ViewportBindingIosEmbedShadowRoot_ {
   /** @override */
   getSize() {
     return {
-      width: this.win./*OK*/innerWidth,
-      height: this.win./*OK*/innerHeight,
+      width: this.win./*OK*/ innerWidth,
+      height: this.win./*OK*/ innerHeight,
     };
   }
 
   /** @override */
   getScrollTop() {
-    return this.scroller_./*OK*/scrollTop;
+    return this.scroller_./*OK*/ scrollTop;
   }
 
   /** @override */
@@ -384,12 +387,12 @@ export class ViewportBindingIosEmbedShadowRoot_ {
 
   /** @override */
   getScrollWidth() {
-    return this.scroller_./*OK*/scrollWidth;
+    return this.scroller_./*OK*/ scrollWidth;
   }
 
   /** @override */
   getScrollHeight() {
-    return this.scroller_./*OK*/scrollHeight;
+    return this.scroller_./*OK*/ scrollHeight;
   }
 
   /** @override */
@@ -398,7 +401,7 @@ export class ViewportBindingIosEmbedShadowRoot_ {
     // document_height)` (we only want the latter), and it doesn't account
     // for margins.
     const bodyWrapper = this.wrapper_;
-    const rect = bodyWrapper./*OK*/getBoundingClientRect();
+    const rect = bodyWrapper./*OK*/ getBoundingClientRect();
     const style = computedStyle(this.win, bodyWrapper);
     // The Y-position of any element can be offset by the vertical margin
     // of its first child, and this is _not_ accounted for in `rect.height`.
@@ -407,33 +410,34 @@ export class ViewportBindingIosEmbedShadowRoot_ {
     // on ancestor elements and the scroller's border-top. The "bottom gap"
     // remains unaddressed.
     const topGapPlusPaddingAndBorder = rect.top + this.getScrollTop();
-    return rect.height
-        + topGapPlusPaddingAndBorder
-        + parseInt(style.marginTop, 10)
-        + parseInt(style.marginBottom, 10);
+    return (
+      rect.height +
+      topGapPlusPaddingAndBorder +
+      parseInt(style.marginTop, 10) +
+      parseInt(style.marginBottom, 10)
+    );
   }
 
   /** @override */
-  contentHeightChanged() {
-  }
+  contentHeightChanged() {}
 
   /** @override */
   getLayoutRect(el, opt_scrollLeft, opt_scrollTop) {
-    const b = el./*OK*/getBoundingClientRect();
+    const b = el./*OK*/ getBoundingClientRect();
     if (this.useLayers_) {
       return layoutRectLtwh(b.left, b.top, b.width, b.height);
     }
 
-    const scrollTop = opt_scrollTop != undefined
-      ? opt_scrollTop
-      : this.getScrollTop();
-    const scrollLeft = opt_scrollLeft != undefined
-      ? opt_scrollLeft
-      : this.getScrollLeft();
-    return layoutRectLtwh(Math.round(b.left + scrollLeft),
-        Math.round(b.top + scrollTop),
-        Math.round(b.width),
-        Math.round(b.height));
+    const scrollTop =
+      opt_scrollTop != undefined ? opt_scrollTop : this.getScrollTop();
+    const scrollLeft =
+      opt_scrollLeft != undefined ? opt_scrollLeft : this.getScrollLeft();
+    return layoutRectLtwh(
+      Math.round(b.left + scrollLeft),
+      Math.round(b.top + scrollTop),
+      Math.round(b.width),
+      Math.round(b.height)
+    );
   }
 
   /** @override */
@@ -445,7 +449,7 @@ export class ViewportBindingIosEmbedShadowRoot_ {
   setScrollTop(scrollTop) {
     // If scroll top is 0, it's set to 1 to avoid scroll-freeze issue. See
     // `onScrolled_` for more details.
-    this.scroller_./*OK*/scrollTop = scrollTop || 1;
+    this.scroller_./*OK*/ scrollTop = scrollTop || 1;
   }
 
   /**
@@ -458,8 +462,8 @@ export class ViewportBindingIosEmbedShadowRoot_ {
     // This is very sad but very necessary. See #330 for more details.
     // Unfortunately, the same is very expensive to do on the bottom, due to
     // costly scrollHeight.
-    if (this.scroller_./*OK*/scrollTop == 0) {
-      this.scroller_./*OK*/scrollTop = 1;
+    if (this.scroller_./*OK*/ scrollTop == 0) {
+      this.scroller_./*OK*/ scrollTop = 1;
       if (opt_event) {
         opt_event.preventDefault();
       }
diff --git a/src/service/viewport/viewport-binding-ios-embed-wrapper.js b/src/service/viewport/viewport-binding-ios-embed-wrapper.js
index 858312183701..ec0aaa16cb89 100644
--- a/src/service/viewport/viewport-binding-ios-embed-wrapper.js
+++ b/src/service/viewport/viewport-binding-ios-embed-wrapper.js
@@ -36,7 +36,6 @@ const TAG_ = 'Viewport';
  * @visibleForTesting
  */
 export class ViewportBindingIosEmbedWrapper_ {
-
   /**
    * @param {!Window} win
    */
@@ -149,8 +148,9 @@ export class ViewportBindingIosEmbedWrapper_ {
       return true;
     }
     // The jumping fixed elements have been fixed in iOS 12.2.
-    const iosVersion = parseFloat(Services.platformFor(this.win)
-        .getIosVersionString());
+    const iosVersion = parseFloat(
+      Services.platformFor(this.win).getIosVersionString()
+    );
     return iosVersion < 12.2;
   }
 
@@ -217,14 +217,14 @@ export class ViewportBindingIosEmbedWrapper_ {
   /** @override */
   getSize() {
     return {
-      width: this.win./*OK*/innerWidth,
-      height: this.win./*OK*/innerHeight,
+      width: this.win./*OK*/ innerWidth,
+      height: this.win./*OK*/ innerHeight,
     };
   }
 
   /** @override */
   getScrollTop() {
-    return this.wrapper_./*OK*/scrollTop;
+    return this.wrapper_./*OK*/ scrollTop;
   }
 
   /** @override */
@@ -236,12 +236,12 @@ export class ViewportBindingIosEmbedWrapper_ {
 
   /** @override */
   getScrollWidth() {
-    return this.wrapper_./*OK*/scrollWidth;
+    return this.wrapper_./*OK*/ scrollWidth;
   }
 
   /** @override */
   getScrollHeight() {
-    return this.wrapper_./*OK*/scrollHeight;
+    return this.wrapper_./*OK*/ scrollHeight;
   }
 
   /** @override */
@@ -250,38 +250,39 @@ export class ViewportBindingIosEmbedWrapper_ {
     // document_height)` (we only want the latter), and it doesn't account
     // for margins.
     const scrollingElement = this.win.document.body;
-    const rect = scrollingElement./*OK*/getBoundingClientRect();
+    const rect = scrollingElement./*OK*/ getBoundingClientRect();
     const style = computedStyle(this.win, scrollingElement);
     // Note: unlike viewport-binding-natural.js, there's no need to calculate
     // the "top gap" since the wrapped body _does_ account for child margins.
     // However, the parent's paddingTop still needs to be added.
-    return rect.height
-        + this.paddingTop_
-        + parseInt(style.marginTop, 10)
-        + parseInt(style.marginBottom, 10);
+    return (
+      rect.height +
+      this.paddingTop_ +
+      parseInt(style.marginTop, 10) +
+      parseInt(style.marginBottom, 10)
+    );
   }
 
   /** @override */
-  contentHeightChanged() {
-  }
+  contentHeightChanged() {}
 
   /** @override */
   getLayoutRect(el, opt_scrollLeft, opt_scrollTop) {
-    const b = el./*OK*/getBoundingClientRect();
+    const b = el./*OK*/ getBoundingClientRect();
     if (this.useLayers_) {
       return layoutRectLtwh(b.left, b.top, b.width, b.height);
     }
 
-    const scrollTop = opt_scrollTop != undefined
-      ? opt_scrollTop
-      : this.getScrollTop();
-    const scrollLeft = opt_scrollLeft != undefined
-      ? opt_scrollLeft
-      : this.getScrollLeft();
-    return layoutRectLtwh(Math.round(b.left + scrollLeft),
-        Math.round(b.top + scrollTop),
-        Math.round(b.width),
-        Math.round(b.height));
+    const scrollTop =
+      opt_scrollTop != undefined ? opt_scrollTop : this.getScrollTop();
+    const scrollLeft =
+      opt_scrollLeft != undefined ? opt_scrollLeft : this.getScrollLeft();
+    return layoutRectLtwh(
+      Math.round(b.left + scrollLeft),
+      Math.round(b.top + scrollTop),
+      Math.round(b.width),
+      Math.round(b.height)
+    );
   }
 
   /** @override */
@@ -293,7 +294,7 @@ export class ViewportBindingIosEmbedWrapper_ {
   setScrollTop(scrollTop) {
     // If scroll top is 0, it's set to 1 to avoid scroll-freeze issue. See
     // `onScrolled_` for more details.
-    this.wrapper_./*OK*/scrollTop = scrollTop || 1;
+    this.wrapper_./*OK*/ scrollTop = scrollTop || 1;
   }
 
   /**
@@ -306,8 +307,8 @@ export class ViewportBindingIosEmbedWrapper_ {
     // This is very sad but very necessary. See #330 for more details.
     // Unfortunately, the same is very expensive to do on the bottom, due to
     // costly scrollHeight.
-    if (this.wrapper_./*OK*/scrollTop == 0) {
-      this.wrapper_./*OK*/scrollTop = 1;
+    if (this.wrapper_./*OK*/ scrollTop == 0) {
+      this.wrapper_./*OK*/ scrollTop = 1;
       if (opt_event) {
         opt_event.preventDefault();
       }
diff --git a/src/service/viewport/viewport-binding-natural.js b/src/service/viewport/viewport-binding-natural.js
index ae3a8b87aa52..a630ef6cfdbd 100644
--- a/src/service/viewport/viewport-binding-natural.js
+++ b/src/service/viewport/viewport-binding-natural.js
@@ -22,7 +22,6 @@ import {dev} from '../../log';
 import {isExperimentOn} from '../../experiments';
 import {layoutRectLtwh} from '../../layout-rect';
 
-
 const TAG_ = 'Viewport';
 
 /**
@@ -36,7 +35,6 @@ const TAG_ = 'Viewport';
  * @implements {ViewportBindingDef}
  */
 export class ViewportBindingNatural_ {
-
   /**
    * @param {!../ampdoc-impl.AmpDoc} ampdoc
    */
@@ -142,14 +140,16 @@ export class ViewportBindingNatural_ {
   disableScroll() {
     // TODO(jridgewell): Recursively disable scroll
     this.win.document.documentElement.classList.add(
-        'i-amphtml-scroll-disabled');
+      'i-amphtml-scroll-disabled'
+    );
   }
 
   /** @override */
   resetScroll() {
     // TODO(jridgewell): Recursively disable scroll
     this.win.document.documentElement.classList.remove(
-        'i-amphtml-scroll-disabled');
+      'i-amphtml-scroll-disabled'
+    );
   }
 
   /** @override */
@@ -164,21 +164,22 @@ export class ViewportBindingNatural_ {
     // documentElement clientWidth/clientHeight.
     // documentElement./*OK*/clientHeight is buggy on iOS Safari
     // and thus cannot be used.
-    const winWidth = this.win./*OK*/innerWidth;
-    const winHeight = this.win./*OK*/innerHeight;
+    const winWidth = this.win./*OK*/ innerWidth;
+    const winHeight = this.win./*OK*/ innerHeight;
     if (winWidth && winHeight) {
       return {width: winWidth, height: winHeight};
     }
     const el = this.win.document.documentElement;
-    return {width: el./*OK*/clientWidth, height: el./*OK*/clientHeight};
+    return {width: el./*OK*/ clientWidth, height: el./*OK*/ clientHeight};
   }
 
   /** @override */
   getScrollTop() {
-    const pageScrollTop = this.getScrollingElement()./*OK*/scrollTop ||
-        this.win./*OK*/pageYOffset;
+    const pageScrollTop =
+      this.getScrollingElement()./*OK*/ scrollTop ||
+      this.win./*OK*/ pageYOffset;
     const {host} = this.ampdoc.getRootNode();
-    return (host ? pageScrollTop - host./*OK*/offsetTop : pageScrollTop);
+    return host ? pageScrollTop - host./*OK*/ offsetTop : pageScrollTop;
   }
 
   /** @override */
@@ -190,12 +191,12 @@ export class ViewportBindingNatural_ {
 
   /** @override */
   getScrollWidth() {
-    return this.getScrollingElement()./*OK*/scrollWidth;
+    return this.getScrollingElement()./*OK*/ scrollWidth;
   }
 
   /** @override */
   getScrollHeight() {
-    return this.getScrollingElement()./*OK*/scrollHeight;
+    return this.getScrollingElement()./*OK*/ scrollHeight;
   }
 
   /** @override */
@@ -205,7 +206,7 @@ export class ViewportBindingNatural_ {
     // for margins. Also, don't use documentElement's rect height because
     // there's no workable analog for either ios-embed-* modes.
     const scrollingElement = this.getScrollingElement();
-    const rect = scrollingElement./*OK*/getBoundingClientRect();
+    const rect = scrollingElement./*OK*/ getBoundingClientRect();
     const style = computedStyle(this.win, scrollingElement);
     // The Y-position of any element can be offset by the vertical margin
     // of its first child, and this is _not_ accounted for in `rect.height`.
@@ -213,10 +214,12 @@ export class ViewportBindingNatural_ {
     // and add it manually. Note that the "top gap" includes any padding-top
     // on ancestor elements, and the "bottom gap" remains unaddressed.
     const topGapPlusPadding = rect.top + this.getScrollTop();
-    return rect.height
-        + topGapPlusPadding
-        + parseInt(style.marginTop, 10)
-        + parseInt(style.marginBottom, 10);
+    return (
+      rect.height +
+      topGapPlusPadding +
+      parseInt(style.marginTop, 10) +
+      parseInt(style.marginBottom, 10)
+    );
   }
 
   /** @override */
@@ -226,21 +229,21 @@ export class ViewportBindingNatural_ {
 
   /** @override */
   getLayoutRect(el, opt_scrollLeft, opt_scrollTop) {
-    const b = el./*OK*/getBoundingClientRect();
+    const b = el./*OK*/ getBoundingClientRect();
     if (this.useLayers_) {
       return layoutRectLtwh(b.left, b.top, b.width, b.height);
     }
 
-    const scrollTop = opt_scrollTop != undefined
-      ? opt_scrollTop
-      : this.getScrollTop();
-    const scrollLeft = opt_scrollLeft != undefined
-      ? opt_scrollLeft
-      : this.getScrollLeft();
-    return layoutRectLtwh(Math.round(b.left + scrollLeft),
-        Math.round(b.top + scrollTop),
-        Math.round(b.width),
-        Math.round(b.height));
+    const scrollTop =
+      opt_scrollTop != undefined ? opt_scrollTop : this.getScrollTop();
+    const scrollLeft =
+      opt_scrollLeft != undefined ? opt_scrollLeft : this.getScrollLeft();
+    return layoutRectLtwh(
+      Math.round(b.left + scrollLeft),
+      Math.round(b.top + scrollTop),
+      Math.round(b.width),
+      Math.round(b.height)
+    );
   }
 
   /** @override */
@@ -250,22 +253,24 @@ export class ViewportBindingNatural_ {
 
   /** @override */
   setScrollTop(scrollTop) {
-    this.getScrollingElement()./*OK*/scrollTop = scrollTop;
+    this.getScrollingElement()./*OK*/ scrollTop = scrollTop;
   }
 
   /** @override */
   getScrollingElement() {
     const doc = this.win.document;
-    if (doc./*OK*/scrollingElement) {
-      return doc./*OK*/scrollingElement;
+    if (doc./*OK*/ scrollingElement) {
+      return doc./*OK*/ scrollingElement;
     }
-    if (doc.body
-        // Due to https://bugs.webkit.org/show_bug.cgi?id=106133, WebKit
-        // browsers have to use `body` and NOT `documentElement` for
-        // scrolling purposes. This has mostly being resolved via
-        // `scrollingElement` property, but this branch is still necessary
-        // for backward compatibility purposes.
-        && this.platform_.isWebKit()) {
+    if (
+      doc.body &&
+      // Due to https://bugs.webkit.org/show_bug.cgi?id=106133, WebKit
+      // browsers have to use `body` and NOT `documentElement` for
+      // scrolling purposes. This has mostly being resolved via
+      // `scrollingElement` property, but this branch is still necessary
+      // for backward compatibility purposes.
+      this.platform_.isWebKit()
+    ) {
       return doc.body;
     }
     return doc.documentElement;
diff --git a/src/service/viewport/viewport-impl.js b/src/service/viewport/viewport-impl.js
index 44955c7d6fc7..f27ec93abe0b 100644
--- a/src/service/viewport/viewport-impl.js
+++ b/src/service/viewport/viewport-impl.js
@@ -19,12 +19,8 @@ import {FixedLayer} from './../fixed-layer';
 import {Observable} from '../../observable';
 import {Services} from '../../services';
 import {ViewportBindingDef} from './viewport-binding-def';
-import {
-  ViewportBindingIosEmbedShadowRoot_,
-} from './viewport-binding-ios-embed-sd';
-import {
-  ViewportBindingIosEmbedWrapper_,
-} from './viewport-binding-ios-embed-wrapper';
+import {ViewportBindingIosEmbedShadowRoot_} from './viewport-binding-ios-embed-sd';
+import {ViewportBindingIosEmbedWrapper_} from './viewport-binding-ios-embed-wrapper';
 import {ViewportBindingNatural_} from './viewport-binding-natural';
 import {VisibilityState} from '../../visibility-state';
 import {clamp} from '../../utils/math';
@@ -48,10 +44,8 @@ import {
 import {numeric} from '../../transition';
 import {tryResolve} from '../../utils/promise';
 
-
 const TAG_ = 'Viewport';
 
-
 /**
  * @typedef {{
  *   relayoutAll: boolean,
@@ -80,7 +74,6 @@ export let ViewportResizedEventDef;
  * @implements {../../service.Disposable}
  */
 export class Viewport {
-
   /**
    * @param {!../ampdoc-impl.AmpDoc} ampdoc
    * @param {!ViewportBindingDef} binding
@@ -119,13 +112,13 @@ export class Viewport {
     this.size_ = null;
 
     /** @private {?number} */
-    this./*OK*/scrollTop_ = null;
+    this./*OK*/ scrollTop_ = null;
 
     /** @private {boolean} */
     this.scrollAnimationFrameThrottled_ = false;
 
     /** @private {?number} */
-    this./*OK*/scrollLeft_ = null;
+    this./*OK*/ scrollLeft_ = null;
 
     /** @private {number} */
     this.paddingTop_ = Number(viewer.getParam('paddingTop') || 0);
@@ -163,24 +156,29 @@ export class Viewport {
     /** @private @const {boolean} */
     this.useLayers_ = isExperimentOn(win, 'layers');
     if (this.useLayers_) {
-      installLayersServiceForDoc(ampdoc,
-          this.binding_.getScrollingElement(),
-          this.binding_.getScrollingElementScrollsLikeViewport());
+      installLayersServiceForDoc(
+        ampdoc,
+        this.binding_.getScrollingElement(),
+        this.binding_.getScrollingElementScrollsLikeViewport()
+      );
     }
 
     /** @private @const {!FixedLayer} */
     this.fixedLayer_ = new FixedLayer(
-        ampdoc,
-        this.vsync_,
-        this.binding_.getBorderTop(),
-        this.paddingTop_,
-        this.binding_.requiresFixedLayerTransfer());
+      ampdoc,
+      this.vsync_,
+      this.binding_.getBorderTop(),
+      this.paddingTop_,
+      this.binding_.requiresFixedLayerTransfer()
+    );
     ampdoc.whenReady().then(() => this.fixedLayer_.setup());
 
     this.viewer_.onMessage('viewport', this.updateOnViewportEvent_.bind(this));
     this.viewer_.onMessage('scroll', this.viewerSetScrollTop_.bind(this));
     this.viewer_.onMessage(
-        'disableScroll', this.disableScrollEventHandler_.bind(this));
+      'disableScroll',
+      this.disableScrollEventHandler_.bind(this)
+    );
     this.binding_.updatePaddingTop(this.paddingTop_);
 
     this.binding_.onScroll(this.scroll_.bind(this));
@@ -218,7 +216,7 @@ export class Viewport {
     }
 
     // To avoid browser restore scroll position when traverse history
-    if (isIframed(win) && ('scrollRestoration' in win.history)) {
+    if (isIframed(win) && 'scrollRestoration' in win.history) {
       win.history.scrollRestoration = 'manual';
     }
 
@@ -288,10 +286,10 @@ export class Viewport {
    * @return {number}
    */
   getScrollTop() {
-    if (this./*OK*/scrollTop_ == null) {
-      this./*OK*/scrollTop_ = this.binding_.getScrollTop();
+    if (this./*OK*/ scrollTop_ == null) {
+      this./*OK*/ scrollTop_ = this.binding_.getScrollTop();
     }
-    return this./*OK*/scrollTop_;
+    return this./*OK*/ scrollTop_;
   }
 
   /**
@@ -299,10 +297,10 @@ export class Viewport {
    * @return {number}
    */
   getScrollLeft() {
-    if (this./*OK*/scrollLeft_ == null) {
-      this./*OK*/scrollLeft_ = this.binding_.getScrollLeft();
+    if (this./*OK*/ scrollLeft_ == null) {
+      this./*OK*/ scrollLeft_ = this.binding_.getScrollLeft();
     }
-    return this./*OK*/scrollLeft_;
+    return this./*OK*/ scrollLeft_;
   }
 
   /**
@@ -310,7 +308,7 @@ export class Viewport {
    * @param {number} scrollPos
    */
   setScrollTop(scrollPos) {
-    this./*OK*/scrollTop_ = null;
+    this./*OK*/ scrollTop_ = null;
     this.binding_.setScrollTop(scrollPos);
   }
 
@@ -320,8 +318,8 @@ export class Viewport {
   getVerticalScrollbarWidth() {
     const {win} = this.ampdoc;
     const {documentElement} = win.document;
-    const windowWidth = win./*OK*/innerWidth ;
-    const documentWidth = documentElement./*OK*/clientWidth;
+    const windowWidth = win./*OK*/ innerWidth;
+    const documentWidth = documentElement./*OK*/ clientWidth;
 
     return windowWidth - documentWidth;
   }
@@ -348,8 +346,10 @@ export class Viewport {
     if (this.size_.width == 0 || this.size_.height == 0) {
       // Only report when the visibility is "visible" or "prerender".
       const visibilityState = this.viewer_.getVisibilityState();
-      if (visibilityState == VisibilityState.PRERENDER ||
-          visibilityState == VisibilityState.VISIBLE) {
+      if (
+        visibilityState == VisibilityState.PRERENDER ||
+        visibilityState == VisibilityState.VISIBLE
+      ) {
         if (Math.random() < 0.01) {
           dev().error(TAG_, 'viewport has zero dimensions');
         }
@@ -432,8 +432,12 @@ export class Viewport {
         scrollLeft = this.getScrollLeft();
       }
       const size = this.getSize();
-      this.rect_ =
-          layoutRectLtwh(scrollLeft, scrollTop, size.width, size.height);
+      this.rect_ = layoutRectLtwh(
+        scrollLeft,
+        scrollTop,
+        size.width,
+        size.height
+      );
     }
     return this.rect_;
   }
@@ -454,11 +458,16 @@ export class Viewport {
     if (frameElement) {
       const b = this.binding_.getLayoutRect(el, 0, 0);
       const c = this.binding_.getLayoutRect(
-          frameElement, scrollLeft, scrollTop);
-      return layoutRectLtwh(Math.round(b.left + c.left),
-          Math.round(b.top + c.top),
-          Math.round(b.width),
-          Math.round(b.height));
+        frameElement,
+        scrollLeft,
+        scrollTop
+      );
+      return layoutRectLtwh(
+        Math.round(b.left + c.left),
+        Math.round(b.top + c.top),
+        Math.round(b.width),
+        Math.round(b.height)
+      );
     }
 
     return this.binding_.getLayoutRect(el, scrollLeft, scrollTop);
@@ -479,14 +488,14 @@ export class Viewport {
     }
 
     const local = this.vsync_.measurePromise(() => {
-      return el./*OK*/getBoundingClientRect();
+      return el./*OK*/ getBoundingClientRect();
     });
 
     let root = this.binding_.getRootClientRectAsync();
     const frameElement = getParentWindowFrameElement(el, this.ampdoc.win);
     if (frameElement) {
       root = this.vsync_.measurePromise(() => {
-        return frameElement./*OK*/getBoundingClientRect();
+        return frameElement./*OK*/ getBoundingClientRect();
       });
     }
 
@@ -526,7 +535,8 @@ export class Viewport {
    */
   scrollIntoView(element) {
     return this.getScrollingContainerFor_(element).then(parent =>
-      this.scrollIntoViewInternal_(element, parent));
+      this.scrollIntoViewInternal_(element, parent)
+    );
   }
 
   /**
@@ -536,13 +546,15 @@ export class Viewport {
   scrollIntoViewInternal_(element, parent) {
     const elementTop = this.binding_.getLayoutRect(element).top;
 
-    const newScrollTopPromise = this.useLayers_ ?
-      this.getElementScrollTop_(parent)
-          .then(scrollTop => elementTop + scrollTop) :
-      tryResolve(() => Math.max(0, elementTop - this.paddingTop_));
+    const newScrollTopPromise = this.useLayers_
+      ? this.getElementScrollTop_(parent).then(
+          scrollTop => elementTop + scrollTop
+        )
+      : tryResolve(() => Math.max(0, elementTop - this.paddingTop_));
 
     newScrollTopPromise.then(newScrollTop =>
-      this.setElementScrollTop_(parent, newScrollTop));
+      this.setElementScrollTop_(parent, newScrollTop)
+    );
   }
 
   /**
@@ -557,16 +569,20 @@ export class Viewport {
    * @return {!Promise}
    */
   animateScrollIntoView(element, pos = 'top', opt_duration, opt_curve) {
-    devAssert(!opt_curve || opt_duration !== undefined,
-        'Curve without duration doesn\'t make sense.');
+    devAssert(
+      !opt_curve || opt_duration !== undefined,
+      "Curve without duration doesn't make sense."
+    );
 
     return this.getScrollingContainerFor_(element).then(parent =>
       this.animateScrollWithinParent(
-          element,
-          parent,
-          dev().assertString(pos),
-          opt_duration,
-          opt_curve));
+        element,
+        parent,
+        dev().assertString(pos),
+        opt_duration,
+        opt_curve
+      )
+    );
   }
 
   /**
@@ -578,14 +594,16 @@ export class Viewport {
    * @return {!Promise}
    */
   animateScrollWithinParent(element, parent, pos, opt_duration, opt_curve) {
-    devAssert(!opt_curve || opt_duration !== undefined,
-        'Curve without duration doesn\'t make sense.');
+    devAssert(
+      !opt_curve || opt_duration !== undefined,
+      "Curve without duration doesn't make sense."
+    );
 
     const elementRect = this.binding_.getLayoutRect(element);
 
-    const {height: parentHeight} = this.isScrollingElement_(parent) ?
-      this.getSize() :
-      this.getLayoutRect(parent);
+    const {height: parentHeight} = this.isScrollingElement_(parent)
+      ? this.getSize()
+      : this.getLayoutRect(parent);
 
     let offset;
     switch (pos) {
@@ -593,7 +611,7 @@ export class Viewport {
         offset = -parentHeight + elementRect.height;
         break;
       case 'center':
-        offset = (-parentHeight / 2) + (elementRect.height / 2);
+        offset = -parentHeight / 2 + elementRect.height / 2;
         break;
       default:
         offset = 0;
@@ -612,7 +630,12 @@ export class Viewport {
         return;
       }
       return this.interpolateScrollIntoView_(
-          parent, curScrollTop, newScrollTop, opt_duration, opt_curve);
+        parent,
+        curScrollTop,
+        newScrollTop,
+        opt_duration,
+        opt_curve
+      );
     });
   }
 
@@ -625,17 +648,27 @@ export class Viewport {
    * @private
    */
   interpolateScrollIntoView_(
-    parent, curScrollTop, newScrollTop, opt_duration, curve = 'ease-in') {
-
-    const duration = opt_duration !== undefined ?
-      dev().assertNumber(opt_duration) :
-      getDefaultScrollAnimationDuration(curScrollTop, newScrollTop);
+    parent,
+    curScrollTop,
+    newScrollTop,
+    opt_duration,
+    curve = 'ease-in'
+  ) {
+    const duration =
+      opt_duration !== undefined
+        ? dev().assertNumber(opt_duration)
+        : getDefaultScrollAnimationDuration(curScrollTop, newScrollTop);
 
     /** @const {!TransitionDef<number>} */
     const interpolate = numeric(curScrollTop, newScrollTop);
-    return Animation.animate(parent, position => {
-      this.setElementScrollTop_(parent, interpolate(position));
-    }, duration, curve).thenAlways(() => {
+    return Animation.animate(
+      parent,
+      position => {
+        this.setElementScrollTop_(parent, interpolate(position));
+      },
+      duration,
+      curve
+    ).thenAlways(() => {
       this.setElementScrollTop_(parent, newScrollTop);
     });
   }
@@ -645,9 +678,11 @@ export class Viewport {
    * @return {!Promise<!Element>}
    */
   getScrollingContainerFor_(element) {
-    return this.vsync_.measurePromise(() =>
-      closestAncestorElementBySelector(element, '.i-amphtml-scrollable') ||
-        this.binding_.getScrollingElement());
+    return this.vsync_.measurePromise(
+      () =>
+        closestAncestorElementBySelector(element, '.i-amphtml-scrollable') ||
+        this.binding_.getScrollingElement()
+    );
   }
 
   /**
@@ -660,7 +695,7 @@ export class Viewport {
       return;
     }
     this.vsync_.mutate(() => {
-      element./*OK*/scrollTop = scrollTop;
+      element./*OK*/ scrollTop = scrollTop;
     });
   }
 
@@ -672,7 +707,7 @@ export class Viewport {
     if (this.isScrollingElement_(element)) {
       return tryResolve(() => this.getScrollTop());
     }
-    return this.vsync_.measurePromise(() => element./*OK*/scrollTop);
+    return this.vsync_.measurePromise(() => element./*OK*/ scrollTop);
   }
 
   /**
@@ -690,7 +725,6 @@ export class Viewport {
     return this.binding_.getScrollingElement();
   }
 
-
   /**
    * Registers the handler for ViewportChangedEventDef events.
    * @param {function(!ViewportChangedEventDef)} handler
@@ -738,14 +772,18 @@ export class Viewport {
    */
   enterLightboxMode(opt_requestingElement, opt_onComplete) {
     this.viewer_.sendMessage(
-        'requestFullOverlay', dict(), /* cancelUnsent */ true);
+      'requestFullOverlay',
+      dict(),
+      /* cancelUnsent */ true
+    );
 
     this.enterOverlayMode();
     this.fixedLayer_.enterLightbox(opt_requestingElement, opt_onComplete);
 
     if (opt_requestingElement) {
       this.maybeEnterFieLightboxMode(
-          dev().assertElement(opt_requestingElement));
+        dev().assertElement(opt_requestingElement)
+      );
     }
 
     return this.binding_.updateLightboxMode(true);
@@ -759,14 +797,18 @@ export class Viewport {
    */
   leaveLightboxMode(opt_requestingElement) {
     this.viewer_.sendMessage(
-        'cancelFullOverlay', dict(), /* cancelUnsent */ true);
+      'cancelFullOverlay',
+      dict(),
+      /* cancelUnsent */ true
+    );
 
     this.fixedLayer_.leaveLightbox();
     this.leaveOverlayMode();
 
     if (opt_requestingElement) {
       this.maybeLeaveFieLightboxMode(
-          dev().assertElement(opt_requestingElement));
+        dev().assertElement(opt_requestingElement)
+      );
     }
 
     return this.binding_.updateLightboxMode(false);
@@ -789,9 +831,11 @@ export class Viewport {
     const fieOptional = this.getFriendlyIframeEmbed_(requestingElement);
 
     if (fieOptional) {
-      devAssert(this.isLightboxExperimentOn(),
-          'Lightbox mode for A4A is only available when ' +
-          "'amp-lightbox-a4a-proto' experiment is on");
+      devAssert(
+        this.isLightboxExperimentOn(),
+        'Lightbox mode for A4A is only available when ' +
+          "'amp-lightbox-a4a-proto' experiment is on"
+      );
 
       fieOptional.enterFullOverlayMode();
     }
@@ -817,12 +861,18 @@ export class Viewport {
    * @private
    */
   getFriendlyIframeEmbed_(element) {
-    const iframeOptional =
-        getParentWindowFrameElement(element, this.ampdoc.win);
-
-    return iframeOptional && getFriendlyIframeEmbedOptional(
+    const iframeOptional = getParentWindowFrameElement(
+      element,
+      this.ampdoc.win
+    );
+
+    return (
+      iframeOptional &&
+      getFriendlyIframeEmbedOptional(
         /** @type {!HTMLIFrameElement} */
-        (dev().assertElement(iframeOptional)));
+        (dev().assertElement(iframeOptional))
+      )
+    );
   }
 
   /**
@@ -883,8 +933,8 @@ export class Viewport {
    * Resets touch zoom to initial scale of 1.
    */
   resetTouchZoom() {
-    const windowHeight = this.ampdoc.win./*OK*/innerHeight;
-    const documentHeight = this.globalDoc_.documentElement./*OK*/clientHeight;
+    const windowHeight = this.ampdoc.win./*OK*/ innerHeight;
+    const documentHeight = this.globalDoc_.documentElement./*OK*/ clientHeight;
     if (windowHeight && documentHeight && windowHeight === documentHeight) {
       // This code only works when scrollbar overlay content and take no space,
       // which is fine on mobile. For non-mobile devices this code is
@@ -990,8 +1040,9 @@ export class Viewport {
       return null;
     }
     if (this.viewportMeta_ === undefined) {
-      this.viewportMeta_ = /** @type {?HTMLMetaElement} */ (
-        this.globalDoc_.querySelector('meta[name=viewport]'));
+      this.viewportMeta_ = /** @type {?HTMLMetaElement} */ (this.globalDoc_.querySelector(
+        'meta[name=viewport]'
+      ));
       if (this.viewportMeta_) {
         this.originalViewportMetaString_ = this.viewportMeta_.content;
       }
@@ -1062,10 +1113,15 @@ export class Viewport {
     }
     // Add transit effect on position fixed element
     const tr = numeric(this.lastPaddingTop_ - this.paddingTop_, 0);
-    return Animation.animate(this.ampdoc.getRootNode(), time => {
-      const p = tr(time);
-      this.fixedLayer_.transformMutate(`translateY(${p}px)`);
-    }, duration, curve).thenAlways(() => {
+    return Animation.animate(
+      this.ampdoc.getRootNode(),
+      time => {
+        const p = tr(time);
+        this.fixedLayer_.transformMutate(`translateY(${p}px)`);
+      },
+      duration,
+      curve
+    ).thenAlways(() => {
       this.fixedLayer_.transformMutate(null);
     });
   }
@@ -1079,12 +1135,20 @@ export class Viewport {
     const size = this.getSize();
     const scrollTop = this.getScrollTop();
     const scrollLeft = this.getScrollLeft();
-    dev().fine(TAG_, 'changed event:',
-        'relayoutAll=', relayoutAll,
-        'top=', scrollTop,
-        'left=', scrollLeft,
-        'bottom=', (scrollTop + size.height),
-        'velocity=', velocity);
+    dev().fine(
+      TAG_,
+      'changed event:',
+      'relayoutAll=',
+      relayoutAll,
+      'top=',
+      scrollTop,
+      'left=',
+      scrollLeft,
+      'bottom=',
+      scrollTop + size.height,
+      'velocity=',
+      velocity
+    );
     this.changeObservable_.fire({
       relayoutAll,
       top: scrollTop,
@@ -1136,18 +1200,23 @@ export class Viewport {
     const now = Date.now();
     let velocity = 0;
     if (now != referenceTime) {
-      velocity = (newScrollTop - referenceTop) /
-          (now - referenceTime);
+      velocity = (newScrollTop - referenceTop) / (now - referenceTime);
     }
-    dev().fine(TAG_, 'scroll: ' +
-        'scrollTop=' + newScrollTop + '; ' +
-        'velocity=' + velocity);
+    dev().fine(
+      TAG_,
+      'scroll: scrollTop=' + newScrollTop + '; velocity=' + velocity
+    );
     if (Math.abs(velocity) < 0.03) {
       this.changed_(/* relayoutAll */ false, velocity);
       this.scrollTracking_ = false;
     } else {
-      this.timer_.delay(() => this.vsync_.measure(
-          this.throttledScroll_.bind(this, now, newScrollTop)), 20);
+      this.timer_.delay(
+        () =>
+          this.vsync_.measure(
+            this.throttledScroll_.bind(this, now, newScrollTop)
+          ),
+        20
+      );
     }
   }
 
@@ -1160,9 +1229,11 @@ export class Viewport {
       this.scrollAnimationFrameThrottled_ = true;
       this.vsync_.measure(() => {
         this.scrollAnimationFrameThrottled_ = false;
-        this.viewer_.sendMessage('scroll',
-            dict({'scrollTop': this.getScrollTop()}),
-            /* cancelUnsent */true);
+        this.viewer_.sendMessage(
+          'scroll',
+          dict({'scrollTop': this.getScrollTop()}),
+          /* cancelUnsent */ true
+        );
       });
     }
   }
@@ -1175,7 +1246,7 @@ export class Viewport {
     const newSize = this.getSize();
     this.fixedLayer_.update().then(() => {
       const widthChanged = !oldSize || oldSize.width != newSize.width;
-      this.changed_(/*relayoutAll*/widthChanged, 0);
+      this.changed_(/*relayoutAll*/ widthChanged, 0);
       const sizeChanged = widthChanged || oldSize.height != newSize.height;
       if (sizeChanged) {
         this.resizeObservable_.fire({
@@ -1217,7 +1288,6 @@ export function parseViewportMeta(content) {
   return params;
 }
 
-
 /**
  * Stringifies viewport meta value based on the provided map. It usually looks
  * like:
@@ -1244,7 +1314,6 @@ export function stringifyViewportMeta(params) {
   return content;
 }
 
-
 /**
  * This method makes a minimal effort to keep the original viewport string
  * unchanged if in fact none of the values have been updated. Returns the
@@ -1295,12 +1364,16 @@ function createViewport(ampdoc) {
   const viewer = Services.viewerForDoc(ampdoc);
   const {win} = ampdoc;
   let binding;
-  if (ampdoc.isSingleDoc() &&
-      getViewportType(win, viewer) == ViewportType.NATURAL_IOS_EMBED) {
-    if (isExperimentOn(win, 'ios-embed-sd') &&
-        win.Element.prototype.attachShadow &&
-        // We need the native Shadow DOM support and jumping-fixed-element fix.
-        parseFloat(Services.platformFor(win).getIosVersionString()) >= 12.2) {
+  if (
+    ampdoc.isSingleDoc() &&
+    getViewportType(win, viewer) == ViewportType.NATURAL_IOS_EMBED
+  ) {
+    if (
+      isExperimentOn(win, 'ios-embed-sd') &&
+      win.Element.prototype.attachShadow &&
+      // We need the native Shadow DOM support and jumping-fixed-element fix.
+      parseFloat(Services.platformFor(win).getIosVersionString()) >= 12.2
+    ) {
       binding = new ViewportBindingIosEmbedShadowRoot_(win);
     } else {
       binding = new ViewportBindingIosEmbedWrapper_(win);
@@ -1316,7 +1389,6 @@ function createViewport(ampdoc) {
  * @enum {string}
  */
 const ViewportType = {
-
   /**
    * Viewer leaves sizing and scrolling up to the AMP document's window.
    */
@@ -1339,8 +1411,10 @@ const ViewportType = {
  */
 function getViewportType(win, viewer) {
   const viewportType = viewer.getParam('viewportType') || ViewportType.NATURAL;
-  if (!Services.platformFor(win).isIos() ||
-      viewportType != ViewportType.NATURAL) {
+  if (
+    !Services.platformFor(win).isIos() ||
+    viewportType != ViewportType.NATURAL
+  ) {
     return viewportType;
   }
   // Enable iOS Embedded mode so that it's easy to test against a more
@@ -1365,8 +1439,10 @@ function getViewportType(win, viewer) {
  * @param {!../ampdoc-impl.AmpDoc} ampdoc
  */
 export function installViewportServiceForDoc(ampdoc) {
-  registerServiceBuilderForDoc(ampdoc,
-      'viewport',
-      createViewport,
-      /* opt_instantiate */ true);
+  registerServiceBuilderForDoc(
+    ampdoc,
+    'viewport',
+    createViewport,
+    /* opt_instantiate */ true
+  );
 }
diff --git a/src/service/vsync-impl.js b/src/service/vsync-impl.js
index 17626d21b43f..f3d753855de2 100644
--- a/src/service/vsync-impl.js
+++ b/src/service/vsync-impl.js
@@ -39,7 +39,6 @@ let VsyncStateDef;
  */
 let VsyncTaskSpecDef;
 
-
 /**
  * Abstraction over requestAnimationFrame (rAF) that batches DOM read (measure)
  * and write (mutate) tasks in a single frame, to eliminate layout thrashing.
@@ -50,7 +49,6 @@ let VsyncTaskSpecDef;
  * @package Visible for type.
  */
 export class Vsync {
-
   /**
    * @param {!Window} win
    */
@@ -113,8 +111,11 @@ export class Vsync {
      * animations doesn't make sense when not visible.
      * @const {!Pass}
      */
-    this.invisiblePass_ = new Pass(this.win, this.boundRunScheduledTasks_,
-        FRAME_TIME);
+    this.invisiblePass_ = new Pass(
+      this.win,
+      this.boundRunScheduledTasks_,
+      FRAME_TIME
+    );
 
     /**
      * Similar to this.invisiblePass_, but backing up a real rAF call. If we
@@ -123,10 +124,13 @@ export class Vsync {
      * we continue to get work done.
      * @const {!Pass}
      */
-    this.backupPass_ = new Pass(this.win, this.boundRunScheduledTasks_,
-        // We cancel this when rAF fires and really only want it to fire
-        // if rAF doesn't work at all.
-        FRAME_TIME * 2.5);
+    this.backupPass_ = new Pass(
+      this.win,
+      this.boundRunScheduledTasks_,
+      // We cancel this when rAF fires and really only want it to fire
+      // if rAF doesn't work at all.
+      FRAME_TIME * 2.5
+    );
 
     /** @private {?./viewer-impl.Viewer} */
     this.singleDocViewer_ = null;
@@ -137,11 +141,12 @@ export class Vsync {
     if (this.ampdocService_.isSingleDoc()) {
       // In a single-doc mode, the visibility of the doc == global visibility.
       // Thus, it's more efficient to only listen to it once.
-      Services.viewerPromiseForDoc(this.ampdocService_.getAmpDoc())
-          .then(viewer => {
-            this.singleDocViewer_ = viewer;
-            viewer.onVisibilityChanged(boundOnVisibilityChanged);
-          });
+      Services.viewerPromiseForDoc(this.ampdocService_.getAmpDoc()).then(
+        viewer => {
+          this.singleDocViewer_ = viewer;
+          viewer.onVisibilityChanged(boundOnVisibilityChanged);
+        }
+      );
     } else {
       // In multi-doc mode, we track separately the global visibility and
       // per-doc visibility when necessary.
@@ -192,7 +197,7 @@ export class Vsync {
     }
     const deferred = new Deferred();
     this.nextFrameResolver_ = deferred.resolve;
-    return this.nextFramePromise_ = deferred.promise;
+    return (this.nextFramePromise_ = deferred.promise);
   }
 
   /**
@@ -299,8 +304,10 @@ export class Vsync {
   runAnim(contextNode, task, opt_state) {
     // Do not request animation frames when the document is not visible.
     if (!this.canAnimate_(contextNode)) {
-      dev().warn('VSYNC', 'Did not schedule a vsync request, because' +
-          ' document was invisible');
+      dev().warn(
+        'VSYNC',
+        'Did not schedule a vsync request, because document was invisible'
+      );
       return false;
     }
     this.run(task, opt_state);
@@ -315,10 +322,9 @@ export class Vsync {
    * @return {function(!VsyncStateDef=):boolean}
    */
   createAnimTask(contextNode, task) {
-    return /** @type {function(!VsyncStateDef=):boolean} */ (
-      opt_state => {
-        return this.runAnim(contextNode, task, opt_state);
-      });
+    return /** @type {function(!VsyncStateDef=):boolean} */ (opt_state => {
+      return this.runAnim(contextNode, task, opt_state);
+    });
   }
 
   /**
@@ -392,11 +398,7 @@ export class Vsync {
     this.scheduled_ = false;
     this.jankMeter_.onRun();
 
-    const {
-      tasks_: tasks,
-      states_: states,
-      nextFrameResolver_: resolver,
-    } = this;
+    const {tasks_: tasks, states_: states, nextFrameResolver_: resolver} = this;
     this.nextFrameResolver_ = null;
     this.nextFramePromise_ = null;
     // Double buffering
@@ -429,8 +431,8 @@ export class Vsync {
    * @return {function(function())} requestAnimationFrame or polyfill.
    */
   getRaf_() {
-    const raf = this.win.requestAnimationFrame
-        || this.win.webkitRequestAnimationFrame;
+    const raf =
+      this.win.requestAnimationFrame || this.win.webkitRequestAnimationFrame;
     if (raf) {
       return raf.bind(this.win);
     }
@@ -446,7 +448,6 @@ export class Vsync {
   }
 }
 
-
 /**
  * For optimization reasons to stop try/catch from blocking optimization.
  * @param {function(!VsyncStateDef):undefined|undefined} callback
@@ -457,8 +458,11 @@ function callTaskNoInline(callback, state) {
   try {
     const ret = callback(state);
     if (ret !== undefined) {
-      dev().error('VSYNC', 'callback returned a value but vsync cannot ' +
-        'propogate it: %s', callback.toString());
+      dev().error(
+        'VSYNC',
+        'callback returned a value but vsync cannot propogate it: %s',
+        callback.toString()
+      );
     }
   } catch (e) {
     rethrowAsync(e);
diff --git a/src/service/xhr-impl.js b/src/service/xhr-impl.js
index 77553277d714..0580dfad9184 100644
--- a/src/service/xhr-impl.js
+++ b/src/service/xhr-impl.js
@@ -24,10 +24,7 @@ import {
   setupJsonFetchInit,
   verifyAmpCORSHeaders,
 } from '../utils/xhr-utils';
-import {
-  getCorsUrl,
-  parseUrlDeprecated,
-} from '../url';
+import {getCorsUrl, parseUrlDeprecated} from '../url';
 import {getService, registerServiceBuilder} from '../service';
 import {isFormDataWrapper} from '../form-data-wrapper';
 import {user} from '../log';
@@ -39,7 +36,6 @@ import {user} from '../log';
  * @visibleForTesting
  */
 export class Xhr {
-
   /**
    * @param {!Window} win
    */
@@ -56,8 +52,9 @@ export class Xhr {
     // getAmpDoc.
     // TODO(alabiaga): This should be investigated and fixed
     /** @private {?./ampdoc-impl.AmpDoc} */
-    this.ampdocSingle_ =
-        ampdocService.isSingleDoc() ? ampdocService.getAmpDoc() : null;
+    this.ampdocSingle_ = ampdocService.isSingleDoc()
+      ? ampdocService.getAmpDoc()
+      : null;
   }
 
   /**
@@ -70,21 +67,25 @@ export class Xhr {
    * @private
    */
   fetch_(input, init) {
-    return getViewerInterceptResponse(this.win, this.ampdocSingle_, input, init)
-        .then(interceptorResponse => {
-          if (interceptorResponse) {
-            return interceptorResponse;
-          }
-          // After this point, both the native `fetch` and the `fetch` polyfill
-          // will expect a native `FormData` object in the `body` property, so
-          // the native `FormData` object needs to be unwrapped.
-          if (isFormDataWrapper(init.body)) {
-            const formDataWrapper =
-              /** @type {!FormDataWrapperInterface} */ (init.body);
-            init.body = formDataWrapper.getFormData();
-          }
-          return (this.win.fetch).apply(null, arguments);
-        });
+    return getViewerInterceptResponse(
+      this.win,
+      this.ampdocSingle_,
+      input,
+      init
+    ).then(interceptorResponse => {
+      if (interceptorResponse) {
+        return interceptorResponse;
+      }
+      // After this point, both the native `fetch` and the `fetch` polyfill
+      // will expect a native `FormData` object in the `body` property, so
+      // the native `FormData` object needs to be unwrapped.
+      if (isFormDataWrapper(init.body)) {
+        const formDataWrapper =
+          /** @type {!FormDataWrapperInterface} */ (init.body);
+        init.body = formDataWrapper.getFormData();
+      }
+      return this.win.fetch.apply(null, arguments);
+    });
   }
 
   /**
@@ -106,13 +107,19 @@ export class Xhr {
   fetchAmpCors_(input, init = {}) {
     input = setupInput(this.win, input, init);
     init = setupAMPCors(this.win, input, init);
-    return this.fetch_(input, init).then(response => {
-      return verifyAmpCORSHeaders(this.win, response, init);
-    }, reason => {
-      const targetOrigin = parseUrlDeprecated(input).origin;
-      throw user().createExpectedError('XHR', 'Failed fetching' +
-          ` (${targetOrigin}/...):`, reason && reason.message);
-    });
+    return this.fetch_(input, init).then(
+      response => {
+        return verifyAmpCORSHeaders(this.win, response, init);
+      },
+      reason => {
+        const targetOrigin = parseUrlDeprecated(input).origin;
+        throw user().createExpectedError(
+          'XHR',
+          `Failed fetching (${targetOrigin}/...):`,
+          reason && reason.message
+        );
+      }
+    );
   }
 
   /**
@@ -156,7 +163,8 @@ export class Xhr {
   fetch(input, opt_init) {
     const init = setupInit(opt_init);
     return this.fetchAmpCors_(input, init).then(response =>
-      assertSuccess(response));
+      assertSuccess(response)
+    );
   }
 
   /**
@@ -171,8 +179,9 @@ export class Xhr {
    * @return {!Promise}
    */
   sendSignal(input, opt_init) {
-    return this.fetchAmpCors_(input, opt_init)
-        .then(response => assertSuccess(response));
+    return this.fetchAmpCors_(input, opt_init).then(response =>
+      assertSuccess(response)
+    );
   }
 
   /**
diff --git a/src/services.js b/src/services.js
index 9fc83eb3630d..b645818d55ec 100644
--- a/src/services.js
+++ b/src/services.js
@@ -44,8 +44,11 @@ export class Services {
    * @return {!Promise<!../extensions/amp-access/0.1/amp-access.AccessService>}
    */
   static accessServiceForDoc(element) {
-    return (/** @type {!Promise<!../extensions/amp-access/0.1/amp-access.AccessService>} */ (
-      getElementServiceForDoc(element, 'access', 'amp-access')));
+    return /** @type {!Promise<!../extensions/amp-access/0.1/amp-access.AccessService>} */ (getElementServiceForDoc(
+      element,
+      'access',
+      'amp-access'
+    ));
   }
 
   /**
@@ -55,9 +58,11 @@ export class Services {
    * @return {!Promise<?../extensions/amp-access/0.1/amp-access.AccessService>}
    */
   static accessServiceForDocOrNull(element) {
-    return (/** @type {!Promise<?../extensions/amp-access/0.1/amp-access.AccessService>} */ (
-      getElementServiceIfAvailableForDoc(element, 'access',
-          'amp-access')));
+    return /** @type {!Promise<?../extensions/amp-access/0.1/amp-access.AccessService>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'access',
+      'amp-access'
+    ));
   }
 
   /**
@@ -66,9 +71,11 @@ export class Services {
    * @return {!Promise<!SubscriptionService>}
    */
   static subscriptionsServiceForDoc(element) {
-    return (/** @type {!Promise<!SubscriptionService>} */ (
-      getElementServiceForDoc(element, 'subscriptions',
-          'amp-subscriptions')));
+    return /** @type {!Promise<!SubscriptionService>} */ (getElementServiceForDoc(
+      element,
+      'subscriptions',
+      'amp-subscriptions'
+    ));
   }
 
   /**
@@ -77,9 +84,11 @@ export class Services {
    * @return {!Promise<?SubscriptionService>}
    */
   static subscriptionsServiceForDocOrNull(element) {
-    return (/** @type {!Promise<?SubscriptionService>} */ (
-      getElementServiceIfAvailableForDoc(element, 'subscriptions',
-          'amp-subscriptions')));
+    return /** @type {!Promise<?SubscriptionService>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'subscriptions',
+      'amp-subscriptions'
+    ));
   }
 
   /**
@@ -87,8 +96,10 @@ export class Services {
    * @return {!./service/action-impl.ActionService}
    */
   static actionServiceForDoc(element) {
-    return /** @type {!./service/action-impl.ActionService} */ (
-      getExistingServiceForDocInEmbedScope(element, 'action'));
+    return /** @type {!./service/action-impl.ActionService} */ (getExistingServiceForDocInEmbedScope(
+      element,
+      'action'
+    ));
   }
 
   /**
@@ -96,8 +107,10 @@ export class Services {
    * @return {!./service/standard-actions-impl.StandardActions}
    */
   static standardActionsForDoc(element) {
-    return /** @type {!./service/standard-actions-impl.StandardActions} */ (
-      getExistingServiceForDocInEmbedScope(element, 'standard-actions'));
+    return /** @type {!./service/standard-actions-impl.StandardActions} */ (getExistingServiceForDocInEmbedScope(
+      element,
+      'standard-actions'
+    ));
   }
 
   /**
@@ -105,8 +118,11 @@ export class Services {
    * @return {!Promise<!../extensions/amp-analytics/0.1/activity-impl.Activity>}
    */
   static activityForDoc(element) {
-    return /** @type {!Promise<!../extensions/amp-analytics/0.1/activity-impl.Activity>} */ (
-      getElementServiceForDoc(element, 'activity', 'amp-analytics'));
+    return /** @type {!Promise<!../extensions/amp-analytics/0.1/activity-impl.Activity>} */ (getElementServiceForDoc(
+      element,
+      'activity',
+      'amp-analytics'
+    ));
   }
 
   /**
@@ -117,8 +133,10 @@ export class Services {
    * @return {!./service/ampdoc-impl.AmpDocService}
    */
   static ampdocServiceFor(window) {
-    return /** @type {!./service/ampdoc-impl.AmpDocService} */ (
-      getService(window, 'ampdoc'));
+    return /** @type {!./service/ampdoc-impl.AmpDocService} */ (getService(
+      window,
+      'ampdoc'
+    ));
   }
 
   /**
@@ -139,12 +157,16 @@ export class Services {
     if (loadAnalytics) {
       // Get Extensions service and force load analytics extension.
       const ampdoc = getAmpdoc(element);
-      Services.extensionsFor(ampdoc.win)./*OK*/installExtensionForDoc(
-          ampdoc, 'amp-analytics');
+      Services.extensionsFor(ampdoc.win)./*OK*/ installExtensionForDoc(
+        ampdoc,
+        'amp-analytics'
+      );
     }
-    return /** @type {!Promise<!../extensions/amp-analytics/0.1/instrumentation.InstrumentationService>} */ (
-      getElementServiceForDoc(element, 'amp-analytics-instrumentation',
-          'amp-analytics'));
+    return /** @type {!Promise<!../extensions/amp-analytics/0.1/instrumentation.InstrumentationService>} */ (getElementServiceForDoc(
+      element,
+      'amp-analytics-instrumentation',
+      'amp-analytics'
+    ));
   }
 
   /**
@@ -152,9 +174,11 @@ export class Services {
    * @return {!Promise<?../extensions/amp-analytics/0.1/instrumentation.InstrumentationService>}
    */
   static analyticsForDocOrNull(element) {
-    return /** @type {!Promise<?../extensions/amp-analytics/0.1/instrumentation.InstrumentationService>} */ (
-      getElementServiceIfAvailableForDoc(element,
-          'amp-analytics-instrumentation', 'amp-analytics'));
+    return /** @type {!Promise<?../extensions/amp-analytics/0.1/instrumentation.InstrumentationService>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'amp-analytics-instrumentation',
+      'amp-analytics'
+    ));
   }
 
   /**
@@ -162,8 +186,10 @@ export class Services {
    * @return {!./service/batched-xhr-impl.BatchedXhr}
    */
   static batchedXhrFor(window) {
-    return /** @type {!./service/batched-xhr-impl.BatchedXhr} */ (
-      getService(window, 'batched-xhr'));
+    return /** @type {!./service/batched-xhr-impl.BatchedXhr} */ (getService(
+      window,
+      'batched-xhr'
+    ));
   }
 
   /**
@@ -171,9 +197,11 @@ export class Services {
    * @return {!Promise<?../extensions/amp-bind/0.1/bind-impl.Bind>}
    */
   static bindForDocOrNull(element) {
-    return /** @type {!Promise<?../extensions/amp-bind/0.1/bind-impl.Bind>} */ (
-      getElementServiceIfAvailableForDocInEmbedScope(
-          element, 'bind', 'amp-bind'));
+    return /** @type {!Promise<?../extensions/amp-bind/0.1/bind-impl.Bind>} */ (getElementServiceIfAvailableForDocInEmbedScope(
+      element,
+      'bind',
+      'amp-bind'
+    ));
   }
 
   /**
@@ -181,8 +209,10 @@ export class Services {
    * @return {!Promise<!./service/cid-impl.Cid>}
    */
   static cidForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!./service/cid-impl.Cid>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, 'cid'));
+    return /** @type {!Promise<!./service/cid-impl.Cid>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      'cid'
+    ));
   }
 
   /**
@@ -190,8 +220,10 @@ export class Services {
    * @return {!./service/navigation.Navigation}
    */
   static navigationForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/navigation.Navigation} */ (
-      getServiceForDoc(elementOrAmpDoc, 'navigation'));
+    return /** @type {!./service/navigation.Navigation} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'navigation'
+    ));
   }
 
   /**
@@ -199,8 +231,10 @@ export class Services {
    * @return {!./service/crypto-impl.Crypto}
    */
   static cryptoFor(window) {
-    return (/** @type {!./service/crypto-impl.Crypto} */ (
-      getService(window, 'crypto')));
+    return /** @type {!./service/crypto-impl.Crypto} */ (getService(
+      window,
+      'crypto'
+    ));
   }
 
   /**
@@ -208,8 +242,10 @@ export class Services {
    * @return {!./service/document-info-impl.DocumentInfoDef} Info about the doc
    */
   static documentInfoForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/document-info-impl.DocInfo} */ (
-      getServiceForDoc(elementOrAmpDoc, 'documentInfo')).get();
+    return /** @type {!./service/document-info-impl.DocInfo} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'documentInfo'
+    )).get();
   }
 
   /**
@@ -225,8 +261,10 @@ export class Services {
    * @return {!./service/extensions-impl.Extensions}
    */
   static extensionsFor(window) {
-    return /** @type {!./service/extensions-impl.Extensions} */ (
-      getService(window, 'extensions'));
+    return /** @type {!./service/extensions-impl.Extensions} */ (getService(
+      window,
+      'extensions'
+    ));
   }
 
   /**
@@ -237,8 +275,10 @@ export class Services {
    * @return {../extensions/amp-form/0.1/form-submit-service.FormSubmitService}
    */
   static formSubmitForDoc(elementOrAmpDoc) {
-    return /** @type {!../extensions/amp-form/0.1/form-submit-service.FormSubmitService} */ (
-      getServiceForDoc(elementOrAmpDoc, 'form-submit-service'));
+    return /** @type {!../extensions/amp-form/0.1/form-submit-service.FormSubmitService} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'form-submit-service'
+    ));
   }
 
   /**
@@ -248,8 +288,10 @@ export class Services {
    * @return {!Promise<../extensions/amp-form/0.1/form-submit-service.FormSubmitService>}
    */
   static formSubmitPromiseForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<../extensions/amp-form/0.1/form-submit-service.FormSubmitService>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, 'form-submit-service'));
+    return /** @type {!Promise<../extensions/amp-form/0.1/form-submit-service.FormSubmitService>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      'form-submit-service'
+    ));
   }
 
   /**
@@ -258,8 +300,10 @@ export class Services {
    * @return {!./service/hidden-observer-impl.HiddenObserver}
    */
   static hiddenObserverForDoc(element) {
-    return /** @type {!./service/hidden-observer-impl.HiddenObserver} */ (
-      getExistingServiceForDocInEmbedScope(element, 'hidden-observer'));
+    return /** @type {!./service/hidden-observer-impl.HiddenObserver} */ (getExistingServiceForDocInEmbedScope(
+      element,
+      'hidden-observer'
+    ));
   }
 
   /**
@@ -268,8 +312,10 @@ export class Services {
    * @return {!./service/history-impl.History}
    */
   static historyForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/history-impl.History} */ (
-      getServiceForDoc(elementOrAmpDoc, 'history'));
+    return /** @type {!./service/history-impl.History} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'history'
+    ));
   }
 
   /**
@@ -286,9 +332,11 @@ export class Services {
    * @return {!Promise<?../extensions/amp-inputmask/0.1/amp-inputmask.AmpInputmaskService>}
    */
   static inputmaskServiceForDocOrNull(element) {
-    return (/** @type {!Promise<?../extensions/amp-inputmask/0.1/amp-inputmask.AmpInputmaskService>} */ (
-      getElementServiceIfAvailableForDoc(
-          element, 'inputmask', 'amp-inputmask')));
+    return /** @type {!Promise<?../extensions/amp-inputmask/0.1/amp-inputmask.AmpInputmaskService>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'inputmask',
+      'amp-inputmask'
+    ));
   }
 
   /**
@@ -296,8 +344,10 @@ export class Services {
    * @return {!./service/layers-impl.LayoutLayers}
    */
   static layersForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/layers-impl.LayoutLayers} */ (
-      getServiceForDoc(elementOrAmpDoc, 'layers'));
+    return /** @type {!./service/layers-impl.LayoutLayers} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'layers'
+    ));
   }
 
   /**
@@ -305,8 +355,10 @@ export class Services {
    * @return {!./service/performance-impl.Performance}
    */
   static performanceFor(window) {
-    return /** @type {!./service/performance-impl.Performance}*/ (
-      getService(window, 'performance'));
+    return /** @type {!./service/performance-impl.Performance}*/ (getService(
+      window,
+      'performance'
+    ));
   }
 
   /**
@@ -314,8 +366,10 @@ export class Services {
    * @return {!./service/performance-impl.Performance}
    */
   static performanceForOrNull(window) {
-    return /** @type {!./service/performance-impl.Performance}*/ (
-      getExistingServiceOrNull(window, 'performance'));
+    return /** @type {!./service/performance-impl.Performance}*/ (getExistingServiceOrNull(
+      window,
+      'performance'
+    ));
   }
 
   /**
@@ -323,8 +377,10 @@ export class Services {
    * @return {!./service/platform-impl.Platform}
    */
   static platformFor(window) {
-    return /** @type {!./service/platform-impl.Platform} */ (
-      getService(window, 'platform'));
+    return /** @type {!./service/platform-impl.Platform} */ (getService(
+      window,
+      'platform'
+    ));
   }
 
   /**
@@ -332,8 +388,10 @@ export class Services {
    * @return {!./service/resources-impl.Resources}
    */
   static resourcesForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/resources-impl.Resources} */ (
-      getServiceForDoc(elementOrAmpDoc, 'resources'));
+    return /** @type {!./service/resources-impl.Resources} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'resources'
+    ));
   }
 
   /**
@@ -341,8 +399,10 @@ export class Services {
    * @return {!Promise<!./service/resources-impl.Resources>}
    */
   static resourcesPromiseForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!./service/resources-impl.Resources>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, 'resources'));
+    return /** @type {!Promise<!./service/resources-impl.Resources>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      'resources'
+    ));
   }
 
   /**
@@ -350,9 +410,12 @@ export class Services {
    * @return {?Promise<?{incomingFragment: string, outgoingFragment: string}>}
    */
   static shareTrackingForOrNull(win) {
-    return (/** @type {!Promise<?{incomingFragment: string, outgoingFragment: string}>} */ (
-      getElementServiceIfAvailable(win, 'share-tracking',
-          'amp-share-tracking', true)));
+    return /** @type {!Promise<?{incomingFragment: string, outgoingFragment: string}>} */ (getElementServiceIfAvailable(
+      win,
+      'share-tracking',
+      'amp-share-tracking',
+      true
+    ));
   }
 
   /**
@@ -361,9 +424,9 @@ export class Services {
    */
   static storyVariableServiceForOrNull(win) {
     return (
-    /** @type {!Promise<?../extensions/amp-story/1.0/variable-service.StoryVariableDef>} */
-      (getElementServiceIfAvailable(win, 'story-variable', 'amp-story',
-          true)));
+      /** @type {!Promise<?../extensions/amp-story/1.0/variable-service.StoryVariableDef>} */
+      (getElementServiceIfAvailable(win, 'story-variable', 'amp-story', true))
+    );
   }
 
   /**
@@ -374,8 +437,9 @@ export class Services {
    */
   static storyStoreServiceForOrNull(win) {
     return (
-    /** @type {!Promise<?../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService|?../extensions/amp-story/0.1/amp-story-store-service.AmpStoryStoreService>} */
-      (getElementServiceIfAvailable(win, 'story-store', 'amp-story')));
+      /** @type {!Promise<?../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService|?../extensions/amp-story/0.1/amp-story-store-service.AmpStoryStoreService>} */
+      (getElementServiceIfAvailable(win, 'story-store', 'amp-story'))
+    );
   }
 
   /**
@@ -383,8 +447,10 @@ export class Services {
    * @return {?../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService}
    */
   static storyStoreService(win) {
-    return (/** @type {?../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
-      (getExistingServiceOrNull(win, 'story-store')));
+    return (
+      /** @type {?../extensions/amp-story/1.0/amp-story-store-service.AmpStoryStoreService} */
+      (getExistingServiceOrNull(win, 'story-store'))
+    );
   }
 
   /**
@@ -392,8 +458,10 @@ export class Services {
    * @return {?../extensions/amp-story/1.0/amp-story-media-query-service.AmpStoryMediaQueryService}
    */
   static storyMediaQueryService(win) {
-    return (/** @type {?../extensions/amp-story/1.0/amp-story-media-query-service.AmpStoryMediaQueryService} */
-      (getExistingServiceOrNull(win, 'story-media-query')));
+    return (
+      /** @type {?../extensions/amp-story/1.0/amp-story-media-query-service.AmpStoryMediaQueryService} */
+      (getExistingServiceOrNull(win, 'story-media-query'))
+    );
   }
 
   /**
@@ -401,8 +469,10 @@ export class Services {
    * @return {?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService}
    */
   static storyRequestService(win) {
-    return (/** @type {?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService} */
-      (getExistingServiceOrNull(win, 'story-request')));
+    return (
+      /** @type {?../extensions/amp-story/1.0/amp-story-request-service.AmpStoryRequestService} */
+      (getExistingServiceOrNull(win, 'story-request'))
+    );
   }
 
   /**
@@ -411,8 +481,9 @@ export class Services {
    */
   static localizationServiceForOrNull(win) {
     return (
-    /** @type {!Promise<?./service/localization.LocalizationService>} */
-      (getElementServiceIfAvailable(win, 'localization', 'amp-story', true)));
+      /** @type {!Promise<?./service/localization.LocalizationService>} */
+      (getElementServiceIfAvailable(win, 'localization', 'amp-story', true))
+    );
   }
 
   /**
@@ -429,9 +500,9 @@ export class Services {
    */
   static storyAnalyticsServiceForOrNull(win) {
     return (
-    /** @type {!Promise<?../extensions/amp-story/1.0/story-analytics.StoryAnalyticsService>} */
-      (getElementServiceIfAvailable(win, 'story-analytics', 'amp-story',
-          true)));
+      /** @type {!Promise<?../extensions/amp-story/1.0/story-analytics.StoryAnalyticsService>} */
+      (getElementServiceIfAvailable(win, 'story-analytics', 'amp-story', true))
+    );
   }
 
   /**
@@ -439,8 +510,10 @@ export class Services {
    * @return {?../extensions/amp-story/1.0/story-analytics.StoryAnalyticsService}
    */
   static storyAnalyticsService(win) {
-    return (/** @type {?../extensions/amp-story/1.0/story-analytics.StoryAnalyticsService} */
-      (getExistingServiceOrNull(win, 'story-analytics')));
+    return (
+      /** @type {?../extensions/amp-story/1.0/story-analytics.StoryAnalyticsService} */
+      (getExistingServiceOrNull(win, 'story-analytics'))
+    );
   }
 
   /**
@@ -468,9 +541,9 @@ export class Services {
    */
   static localizationServiceForOrNullV01(win) {
     return (
-    /** @type {!Promise<?./service/localization.LocalizationService>} */
-      (getElementServiceIfAvailable(win, 'localization-v01', 'amp-story',
-          true)));
+      /** @type {!Promise<?./service/localization.LocalizationService>} */
+      (getElementServiceIfAvailable(win, 'localization-v01', 'amp-story', true))
+    );
   }
 
   /**
@@ -488,9 +561,14 @@ export class Services {
    */
   static viewerIntegrationVariableServiceForOrNull(win) {
     return (
-    /** @type {!Promise<?../extensions/amp-viewer-integration/0.1/variable-service.ViewerIntegrationVariableDef>} */
-      (getElementServiceIfAvailable(win, 'viewer-integration-variable',
-          'amp-viewer-integration', true)));
+      /** @type {!Promise<?../extensions/amp-viewer-integration/0.1/variable-service.ViewerIntegrationVariableDef>} */
+      (getElementServiceIfAvailable(
+        win,
+        'viewer-integration-variable',
+        'amp-viewer-integration',
+        true
+      ))
+    );
   }
 
   /**
@@ -498,9 +576,10 @@ export class Services {
    * @return {!Promise<!../extensions/amp-animation/0.1/web-animation-service.WebAnimationService>}
    */
   static webAnimationServiceFor(element) {
-    return (/** @type {!Promise<!../extensions/amp-animation/0.1/web-animation-service.WebAnimationService>} */
-      (getElementServiceForDoc(
-          element, 'web-animation', 'amp-animation')));
+    return (
+      /** @type {!Promise<!../extensions/amp-animation/0.1/web-animation-service.WebAnimationService>} */
+      (getElementServiceForDoc(element, 'web-animation', 'amp-animation'))
+    );
   }
 
   /**
@@ -508,8 +587,10 @@ export class Services {
    * @return {!Promise<!./service/storage-impl.Storage>}
    */
   static storageForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!./service/storage-impl.Storage>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, 'storage'));
+    return /** @type {!Promise<!./service/storage-impl.Storage>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      'storage'
+    ));
   }
 
   /**
@@ -517,8 +598,10 @@ export class Services {
    * @return {!./service/template-impl.Templates}
    */
   static templatesFor(window) {
-    return /** @type {!./service/template-impl.Templates} */ (
-      getService(window, 'templates'));
+    return /** @type {!./service/template-impl.Templates} */ (getService(
+      window,
+      'templates'
+    ));
   }
 
   /**
@@ -527,8 +610,10 @@ export class Services {
    */
   static timerFor(window) {
     // TODO(alabiaga): This will always return the top window's Timer service.
-    return /** @type {!./service/timer-impl.Timer} */ (
-      getService(window, 'timer'));
+    return /** @type {!./service/timer-impl.Timer} */ (getService(
+      window,
+      'timer'
+    ));
   }
 
   /**
@@ -536,8 +621,10 @@ export class Services {
    * @return {!./service/url-replacements-impl.UrlReplacements}
    */
   static urlReplacementsForDoc(element) {
-    return /** @type {!./service/url-replacements-impl.UrlReplacements} */ (
-      getExistingServiceForDocInEmbedScope(element, 'url-replace'));
+    return /** @type {!./service/url-replacements-impl.UrlReplacements} */ (getExistingServiceForDocInEmbedScope(
+      element,
+      'url-replace'
+    ));
   }
 
   /**
@@ -545,9 +632,14 @@ export class Services {
    * @return {!Promise<!../extensions/amp-user-notification/0.1/amp-user-notification.UserNotificationManager>}
    */
   static userNotificationManagerForDoc(element) {
-    return (/** @type {!Promise<!../extensions/amp-user-notification/0.1/amp-user-notification.UserNotificationManager>} */
-      (getElementServiceForDoc(element, 'userNotificationManager',
-          'amp-user-notification')));
+    return (
+      /** @type {!Promise<!../extensions/amp-user-notification/0.1/amp-user-notification.UserNotificationManager>} */
+      (getElementServiceForDoc(
+        element,
+        'userNotificationManager',
+        'amp-user-notification'
+      ))
+    );
   }
 
   /**
@@ -557,9 +649,14 @@ export class Services {
    * @return {!Promise<?../extensions/amp-consent/0.1/consent-policy-manager.ConsentPolicyManager>}
    */
   static consentPolicyServiceForDocOrNull(element) {
-    return (/** @type {!Promise<?../extensions/amp-consent/0.1/consent-policy-manager.ConsentPolicyManager>} */
-      (getElementServiceIfAvailableForDoc(element,
-          'consentPolicyManager', 'amp-consent')));
+    return (
+      /** @type {!Promise<?../extensions/amp-consent/0.1/consent-policy-manager.ConsentPolicyManager>} */
+      (getElementServiceIfAvailableForDoc(
+        element,
+        'consentPolicyManager',
+        'amp-consent'
+      ))
+    );
   }
 
   /**
@@ -569,9 +666,12 @@ export class Services {
    * @return {!Promise<?../extensions/amp-geo/0.1/amp-geo.GeoDef>}
    */
   static geoForDocOrNull(element) {
-    return /** @type {!Promise<?../extensions/amp-geo/0.1/amp-geo.GeoDef>} */ (
-      getElementServiceIfAvailableForDoc(
-          element, 'geo', 'amp-geo', true));
+    return /** @type {!Promise<?../extensions/amp-geo/0.1/amp-geo.GeoDef>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'geo',
+      'amp-geo',
+      true
+    ));
   }
 
   /**
@@ -581,8 +681,10 @@ export class Services {
    * @return {!./service/url-impl.Url}
    */
   static urlForDoc(element) {
-    return /** @type {!./service/url-impl.Url} */ (
-      getExistingServiceForDocInEmbedScope(element, 'url'));
+    return /** @type {!./service/url-impl.Url} */ (getExistingServiceForDocInEmbedScope(
+      element,
+      'url'
+    ));
   }
 
   /**
@@ -592,9 +694,12 @@ export class Services {
    * @return {!Promise<?../extensions/amp-experiment/0.1/variant.Variants>}
    */
   static variantsForDocOrNull(element) {
-    return (/** @type {!Promise<?../extensions/amp-experiment/0.1/variant.Variants>} */ (
-      getElementServiceIfAvailableForDoc(element, 'variant',
-          'amp-experiment', true)));
+    return /** @type {!Promise<?../extensions/amp-experiment/0.1/variant.Variants>} */ (getElementServiceIfAvailableForDoc(
+      element,
+      'variant',
+      'amp-experiment',
+      true
+    ));
   }
 
   /**
@@ -602,8 +707,10 @@ export class Services {
    * @return {!./service/video-manager-impl.VideoManager}
    */
   static videoManagerForDoc(elementOrAmpDoc) {
-    return (/** @type {!./service/video-manager-impl.VideoManager} */ (
-      getServiceForDoc(elementOrAmpDoc, 'video-manager')));
+    return /** @type {!./service/video-manager-impl.VideoManager} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'video-manager'
+    ));
   }
 
   /**
@@ -612,9 +719,13 @@ export class Services {
    */
   static viewerAssistanceForDocOrNull(element) {
     return (
-    /** @type {!Promise<?../extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.AmpViewerAssistance>} */
-      (getElementServiceIfAvailableForDoc(element, 'amp-viewer-assistance',
-          'amp-viewer-assistance')));
+      /** @type {!Promise<?../extensions/amp-viewer-assistance/0.1/amp-viewer-assistance.AmpViewerAssistance>} */
+      (getElementServiceIfAvailableForDoc(
+        element,
+        'amp-viewer-assistance',
+        'amp-viewer-assistance'
+      ))
+    );
   }
 
   /**
@@ -622,8 +733,10 @@ export class Services {
    * @return {!./service/viewer-impl.Viewer}
    */
   static viewerForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/viewer-impl.Viewer} */ (
-      getServiceForDoc(elementOrAmpDoc, 'viewer'));
+    return /** @type {!./service/viewer-impl.Viewer} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'viewer'
+    ));
   }
 
   /**
@@ -634,8 +747,10 @@ export class Services {
    * @return {!Promise<!./service/viewer-impl.Viewer>}
    */
   static viewerPromiseForDoc(elementOrAmpDoc) {
-    return /** @type {!Promise<!./service/viewer-impl.Viewer>} */ (
-      getServicePromiseForDoc(elementOrAmpDoc, 'viewer'));
+    return /** @type {!Promise<!./service/viewer-impl.Viewer>} */ (getServicePromiseForDoc(
+      elementOrAmpDoc,
+      'viewer'
+    ));
   }
 
   /**
@@ -643,8 +758,10 @@ export class Services {
    * @return {!./service/vsync-impl.Vsync}
    */
   static vsyncFor(window) {
-    return /** @type {!./service/vsync-impl.Vsync} */ (
-      getService(window, 'vsync'));
+    return /** @type {!./service/vsync-impl.Vsync} */ (getService(
+      window,
+      'vsync'
+    ));
   }
 
   /**
@@ -652,8 +769,10 @@ export class Services {
    * @return {!./service/viewport/viewport-impl.Viewport}
    */
   static viewportForDoc(elementOrAmpDoc) {
-    return /** @type {!./service/viewport/viewport-impl.Viewport} */ (
-      getServiceForDoc(elementOrAmpDoc, 'viewport'));
+    return /** @type {!./service/viewport/viewport-impl.Viewport} */ (getServiceForDoc(
+      elementOrAmpDoc,
+      'viewport'
+    ));
   }
 
   /**
diff --git a/src/shadow-embed.js b/src/shadow-embed.js
index 5b393a9d551a..423388a215c9 100644
--- a/src/shadow-embed.js
+++ b/src/shadow-embed.js
@@ -51,7 +51,6 @@ const CSS_SELECTOR_END_REGEX = /[^\-\_0-9a-zA-Z]/;
  */
 let shadowDomStreamingSupported;
 
-
 /**
  * Creates a shadow root for the specified host and returns it. Polyfills
  * shadow root creation if necessary.
@@ -63,7 +62,7 @@ export function createShadowRoot(hostElement) {
 
   const existingRoot = hostElement.shadowRoot || hostElement.__AMP_SHADOW_ROOT;
   if (existingRoot) {
-    existingRoot./*OK*/innerHTML = '';
+    existingRoot./*OK*/ innerHTML = '';
     return existingRoot;
   }
 
@@ -104,7 +103,6 @@ export function createShadowRoot(hostElement) {
   return shadowRoot;
 }
 
-
 /**
  * Shadow root polyfill.
  * @param {!Element} hostElement
@@ -117,15 +115,15 @@ function createShadowRootPolyfill(hostElement) {
   hostElement.classList.add('i-amphtml-shadow-host-polyfill');
   const hostStyle = doc.createElement('style');
   hostStyle.textContent =
-      '.i-amphtml-shadow-host-polyfill>:not(i-amphtml-shadow-root)'
-      + '{display:none!important}';
+    '.i-amphtml-shadow-host-polyfill>:not(i-amphtml-shadow-root)' +
+    '{display:none!important}';
   hostElement.appendChild(hostStyle);
 
   // Shadow root.
-  const shadowRoot = /** @type {!ShadowRoot} */ (
+  const shadowRoot /** @type {!ShadowRoot} */ =
     // Cast to ShadowRoot even though it is an Element
     // TODO(@dvoytenko) Consider to switch to a type union instead.
-    /** @type {?}  */ (doc.createElement('i-amphtml-shadow-root')));
+    /** @type {?}  */ (doc.createElement('i-amphtml-shadow-root'));
   hostElement.appendChild(shadowRoot);
   hostElement.__AMP_SHADOW_ROOT = shadowRoot;
   Object.defineProperty(hostElement, 'shadowRoot', {
@@ -141,8 +139,9 @@ function createShadowRootPolyfill(hostElement) {
   // `getElementById` is resolved via `querySelector('#id')`.
   shadowRoot.getElementById = function(id) {
     const escapedId = escapeCssSelectorIdent(id);
-    return /** @type {HTMLElement|null} */ (
-      shadowRoot./*OK*/querySelector(`#${escapedId}`));
+    return /** @type {HTMLElement|null} */ (shadowRoot./*OK*/ querySelector(
+      `#${escapedId}`
+    ));
   };
 
   // The styleSheets property should have a list of local styles.
@@ -151,15 +150,15 @@ function createShadowRootPolyfill(hostElement) {
       if (!doc.styleSheets) {
         return [];
       }
-      return toArray(doc.styleSheets).filter(
-          styleSheet => shadowRoot.contains(styleSheet.ownerNode));
+      return toArray(doc.styleSheets).filter(styleSheet =>
+        shadowRoot.contains(styleSheet.ownerNode)
+      );
     },
   });
 
   return shadowRoot;
 }
 
-
 /**
  * Determines if value is actually a `ShadowRoot` node.
  * @param {*} value
@@ -174,11 +173,12 @@ export function isShadowRoot(value) {
   if (value.tagName == 'I-AMPHTML-SHADOW-ROOT') {
     return true;
   }
-  return (value.nodeType == /* DOCUMENT_FRAGMENT */ 11 &&
-      Object.prototype.toString.call(value) === '[object ShadowRoot]');
+  return (
+    value.nodeType == /* DOCUMENT_FRAGMENT */ 11 &&
+    Object.prototype.toString.call(value) === '[object ShadowRoot]'
+  );
 }
 
-
 /**
  * Return shadow root for the specified node.
  * @param {!Node} node
@@ -192,7 +192,6 @@ export function getShadowRootNode(node) {
   return /** @type {?ShadowRoot} */ (closestNode(node, n => isShadowRoot(n)));
 }
 
-
 /**
  * Imports a body into a shadow root with the workaround for a polyfill case.
  * @param {!ShadowRoot} shadowRoot
@@ -210,7 +209,9 @@ export function importShadowBody(shadowRoot, body, deep) {
     setInitialDisplay(resultBody, 'block');
     for (let i = 0; i < body.attributes.length; i++) {
       resultBody.setAttribute(
-          body.attributes[0].name, body.attributes[0].value);
+        body.attributes[0].name,
+        body.attributes[0].value
+      );
     }
     if (deep) {
       for (let n = body.firstChild; !!n; n = n.nextSibling) {
@@ -224,7 +225,6 @@ export function importShadowBody(shadowRoot, body, deep) {
   return resultBody;
 }
 
-
 /**
  * If necessary, transforms CSS to isolate AMP CSS within the shaodw root and
  * reduce the possibility of high-level conflicts.
@@ -236,7 +236,6 @@ export function transformShadowCss(shadowRoot, css) {
   return scopeShadowCss(shadowRoot, css);
 }
 
-
 /**
  * Transforms CSS to isolate AMP CSS within the shadow root and reduce the
  * possibility of high-level conflicts. There are two types of transformations:
@@ -279,7 +278,6 @@ export function scopeShadowCss(shadowRoot, css) {
   return scopeRules.call(ShadowCSS, rules, `.${id}`, transformRootSelectors);
 }
 
-
 /**
  * Replaces top-level selectors such as `html` and `body` with their polyfill
  * counterparts: `amp-html` and `amp-body`.
@@ -290,7 +288,6 @@ function transformRootSelectors(selector) {
   return selector.replace(/(html|body)/g, rootSelectorPrefixer);
 }
 
-
 /**
  * See `transformRootSelectors`.
  * @param {string} match
@@ -303,14 +300,15 @@ function transformRootSelectors(selector) {
 function rootSelectorPrefixer(match, name, pos, selector) {
   const prev = selector.charAt(pos - 1);
   const next = selector.charAt(pos + match.length);
-  if ((!prev || CSS_SELECTOR_BEG_REGEX.test(prev)) &&
-      (!next || CSS_SELECTOR_END_REGEX.test(next))) {
+  if (
+    (!prev || CSS_SELECTOR_BEG_REGEX.test(prev)) &&
+    (!next || CSS_SELECTOR_END_REGEX.test(next))
+  ) {
     return 'amp-' + match;
   }
   return match;
 }
 
-
 /**
  * @param {!Document} doc
  * @param {string} css
@@ -318,7 +316,7 @@ function rootSelectorPrefixer(match, name, pos, selector) {
  */
 function getStylesheetRules(doc, css) {
   const style = doc.createElement('style');
-  style./*OK*/textContent = css;
+  style./*OK*/ textContent = css;
   try {
     (doc.head || doc.documentElement).appendChild(style);
     if (style.sheet) {
@@ -332,7 +330,6 @@ function getStylesheetRules(doc, css) {
   }
 }
 
-
 /**
  * @param {boolean|undefined} val
  * @visibleForTesting
@@ -341,7 +338,6 @@ export function setShadowDomStreamingSupportedForTesting(val) {
   shadowDomStreamingSupported = val;
 }
 
-
 /**
  * Returns `true` if the Shadow DOM streaming is supported.
  * @param {!Window} win
@@ -354,15 +350,16 @@ export function isShadowDomStreamingSupported(win) {
   return shadowDomStreamingSupported;
 }
 
-
 /**
  * @param {!Window} win
  * @return {boolean}
  */
 function calcShadowDomStreamingSupported(win) {
   // API must be supported.
-  if (!win.document.implementation ||
-      typeof win.document.implementation.createHTMLDocument != 'function') {
+  if (
+    !win.document.implementation ||
+    typeof win.document.implementation.createHTMLDocument != 'function'
+  ) {
     return false;
   }
   // Firefox does not support DOM streaming.
@@ -374,7 +371,6 @@ function calcShadowDomStreamingSupported(win) {
   return true;
 }
 
-
 /**
  * Creates the Shadow DOM writer available on this platform.
  * @param {!Window} win
@@ -387,7 +383,6 @@ export function createShadowDomWriter(win) {
   return new ShadowDomWriterBulk(win);
 }
 
-
 /**
  * Takes as an input a text stream, parses it and incrementally reconstructs
  * it in the shadow root.
@@ -400,7 +395,6 @@ export function createShadowDomWriter(win) {
  * @visibleForTesting
  */
 export class ShadowDomWriter {
-
   /**
    * Sets the callback that will be called when body has been parsed.
    *
@@ -429,7 +423,6 @@ export class ShadowDomWriter {
   onEnd(unusedCallback) {}
 }
 
-
 /**
  * Takes as an input a text stream, parses it and incrementally reconstructs
  * it in the shadow root.
@@ -557,7 +550,7 @@ export class ShadowDomWriterStreamer {
 
     // Merge body children.
     if (this.targetBody_) {
-      const inputBody = /** @type !Element */(devAssert(this.parser_.body));
+      const inputBody = dev().assertElement(this.parser_.body);
       const targetBody = devAssert(this.targetBody_);
       let transferCount = 0;
       removeNoScriptElements(inputBody);
@@ -577,7 +570,6 @@ export class ShadowDomWriterStreamer {
   }
 }
 
-
 /**
  * Takes as an input a text stream, aggregates it and parses it in one bulk.
  * This is a workaround against the browsers that do not support streaming DOM
diff --git a/src/size-list.js b/src/size-list.js
index 520cfdd8e274..fea71151e375 100644
--- a/src/size-list.js
+++ b/src/size-list.js
@@ -17,7 +17,6 @@
 import {assertLength, assertLengthOrPercent} from './layout';
 import {userAssert} from './log';
 
-
 /**
  * A single option within a SizeList.
  * @typedef {{
@@ -27,7 +26,6 @@ import {userAssert} from './log';
  */
 let SizeListOptionDef;
 
-
 /**
  * Parses the text representation of "sizes" into SizeList object.
  *
@@ -84,10 +82,16 @@ export function parseSizeList(s, opt_allowPercentAsLength) {
         div--;
         for (; div >= 0; div--) {
           const c = sSize.charAt(div);
-          if (!(c == '%' || c == '-' || c == '_' ||
-                (c >= 'a' && c <= 'z') ||
-                (c >= 'A' && c <= 'Z') ||
-                (c >= '0' && c <= '9'))) {
+          if (
+            !(
+              c == '%' ||
+              c == '-' ||
+              c == '_' ||
+              (c >= 'a' && c <= 'z') ||
+              (c >= 'A' && c <= 'Z') ||
+              (c >= '0' && c <= '9')
+            )
+          ) {
             break;
           }
         }
@@ -100,10 +104,15 @@ export function parseSizeList(s, opt_allowPercentAsLength) {
       div = sSize.length - 2;
       for (; div >= 0; div--) {
         const c = sSize.charAt(div);
-        if (!(c == '%' || c == '.' ||
-              (c >= 'a' && c <= 'z') ||
-              (c >= 'A' && c <= 'Z') ||
-              (c >= '0' && c <= '9'))) {
+        if (
+          !(
+            c == '%' ||
+            c == '.' ||
+            (c >= 'a' && c <= 'z') ||
+            (c >= 'A' && c <= 'Z') ||
+            (c >= '0' && c <= '9')
+          )
+        ) {
           break;
         }
       }
@@ -115,16 +124,18 @@ export function parseSizeList(s, opt_allowPercentAsLength) {
       sizeStr = sSize;
       mediaStr = undefined;
     }
-    sizes.push({mediaQuery: mediaStr,
-      size: func ? sizeStr :
-        opt_allowPercentAsLength ?
-          assertLengthOrPercent(sizeStr) :
-          assertLength(sizeStr)});
+    sizes.push({
+      mediaQuery: mediaStr,
+      size: func
+        ? sizeStr
+        : opt_allowPercentAsLength
+        ? assertLengthOrPercent(sizeStr)
+        : assertLength(sizeStr),
+    });
   });
   return new SizeList(sizes);
 }
 
-
 /**
  * A SizeList object contains one or more sizes as typically seen in "sizes"
  * attribute.
@@ -148,11 +159,15 @@ export class SizeList {
     for (let i = 0; i < sizes.length; i++) {
       const option = sizes[i];
       if (i < sizes.length - 1) {
-        userAssert(option.mediaQuery,
-            'All options except for the last must have a media condition');
+        userAssert(
+          option.mediaQuery,
+          'All options except for the last must have a media condition'
+        );
       } else {
-        userAssert(!option.mediaQuery,
-            'The last option must not have a media condition');
+        userAssert(
+          !option.mediaQuery,
+          'The last option must not have a media condition'
+        );
       }
     }
   }
@@ -174,7 +189,7 @@ export class SizeList {
       const option = sizes[i];
       // Only the last item (which we don't iterate) has an undefined
       // mediaQuery.
-      const query = /** @type {string} */(option.mediaQuery);
+      const query = /** @type {string} */ (option.mediaQuery);
       if (win.matchMedia(query).matches) {
         return option.size;
       }
diff --git a/src/srcset.js b/src/srcset.js
index f9791b477eb8..ed19a1ae68ac 100644
--- a/src/srcset.js
+++ b/src/srcset.js
@@ -16,7 +16,6 @@
 
 import {devAssert, userAssert} from './log';
 
-
 /**
  * A single source within a srcset. Only one: width or DPR can be specified at
  * a time.
@@ -34,8 +33,7 @@ let SrcsetSourceDef;
  * Example 2: "image1.png 2x, image2.png"
  * Example 3: "image1,100w.png 100w, image2.png 50w"
  */
-const srcsetRegex =
-    /(\S+)(?:\s+(?:(-?\d+(?:\.\d+)?)([a-zA-Z]*)))?\s*(?:,|$)/g;
+const srcsetRegex = /(\S+)(?:\s+(?:(-?\d+(?:\.\d+)?)([a-zA-Z]*)))?\s*(?:,|$)/g;
 
 /**
  * Extracts `srcset` and fallbacks to `src` if not available.
@@ -50,9 +48,11 @@ export function srcsetFromElement(element) {
   // We can't push `src` via `parseSrcset` because URLs in `src` are not always
   // RFC compliant and can't be easily parsed as an `srcset`. For instance,
   // they sometimes contain space characters.
-  const srcAttr = userAssert(element.getAttribute('src'),
-      'Either non-empty "srcset" or "src" attribute must be specified: %s',
-      element);
+  const srcAttr = userAssert(
+    element.getAttribute('src'),
+    'Either non-empty "srcset" or "src" attribute must be specified: %s',
+    element
+  );
   return srcsetFromSrc(srcAttr);
 }
 
@@ -96,7 +96,6 @@ export function parseSrcset(s) {
   return new Srcset(sources);
 }
 
-
 /**
  * A srcset object contains one or more sources.
  *
@@ -109,7 +108,6 @@ export function parseSrcset(s) {
  * See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/img#Attributes
  */
 export class Srcset {
-
   /**
    * @param {!Array<!SrcsetSourceDef>} sources
    */
@@ -126,8 +124,10 @@ export class Srcset {
       hasWidth = hasWidth || !!source.width;
       hasDpr = hasDpr || !!source.dpr;
     }
-    userAssert(!!(hasWidth ^ hasDpr),
-        'Srcset must have width or dpr sources, but not both');
+    userAssert(
+      !!(hasWidth ^ hasDpr),
+      'Srcset must have width or dpr sources, but not both'
+    );
 
     // Source and assert duplicates.
     sources.sort(hasWidth ? sortByWidth : sortByDpr);
diff --git a/src/ssr-template-helper.js b/src/ssr-template-helper.js
index d783e3e93ca7..098b59e5d920 100644
--- a/src/ssr-template-helper.js
+++ b/src/ssr-template-helper.js
@@ -35,14 +35,12 @@ export let SsrTemplateDef;
  * Helper, that manages the proxying of template rendering to the viewer.
  */
 export class SsrTemplateHelper {
-
   /**
    * @param {string} sourceComponent
    * @param {!./service/viewer-impl.Viewer} viewer
    * @param {!./service/template-impl.Templates} templates
    */
   constructor(sourceComponent, viewer, templates) {
-
     /** @private @const */
     this.viewer_ = viewer;
 
@@ -81,19 +79,24 @@ export class SsrTemplateHelper {
    * return {!Promise<{data:{?JsonObject|string|undefined}}>}
    */
   fetchAndRenderTemplate(
-    element, request, opt_templates = null, opt_attributes = {}) {
+    element,
+    request,
+    opt_templates = null,
+    opt_attributes = {}
+  ) {
     let mustacheTemplate;
     if (!opt_templates) {
       mustacheTemplate = this.templates_.maybeFindTemplate(element);
     }
     return this.viewer_.sendMessageAwaitResponse(
-        'viewerRenderTemplate',
-        this.buildPayload_(
-            request,
-            mustacheTemplate,
-            opt_templates,
-            opt_attributes
-        ));
+      'viewerRenderTemplate',
+      this.buildPayload_(
+        request,
+        mustacheTemplate,
+        opt_templates,
+        opt_attributes
+      )
+    );
   }
 
   /**
@@ -104,16 +107,24 @@ export class SsrTemplateHelper {
   renderTemplate(element, data) {
     let renderTemplatePromise;
     if (this.isSupported()) {
-      userAssert(typeof data['html'] === 'string',
-          'Server side html response must be defined');
+      userAssert(
+        typeof data['html'] === 'string',
+        'Server side html response must be defined'
+      );
       renderTemplatePromise = this.templates_.findAndSetHtmlForTemplate(
-          element, /** @type {string} */ (data['html']));
+        element,
+        /** @type {string} */ (data['html'])
+      );
     } else if (isArray(data)) {
-      renderTemplatePromise = this.templates_
-          .findAndRenderTemplateArray(element, /** @type {!Array} */ (data));
+      renderTemplatePromise = this.templates_.findAndRenderTemplateArray(
+        element,
+        /** @type {!Array} */ (data)
+      );
     } else {
-      renderTemplatePromise =
-          this.templates_.findAndRenderTemplate(element, /** @type {!JsonObject} */ (data));
+      renderTemplatePromise = this.templates_.findAndRenderTemplate(
+        element,
+        /** @type {!JsonObject} */ (data)
+      );
     }
 
     return renderTemplatePromise;
@@ -127,29 +138,30 @@ export class SsrTemplateHelper {
    * @return {!JsonObject}
    * @private
    */
-  buildPayload_(
-    request, mustacheTemplate, opt_templates, opt_attributes = {}) {
+  buildPayload_(request, mustacheTemplate, opt_templates, opt_attributes = {}) {
     const ampComponent = dict({'type': this.sourceComponent_});
 
     const successTemplateKey = 'successTemplate';
     const successTemplate =
-      (opt_templates && opt_templates[successTemplateKey])
-        ? opt_templates[successTemplateKey] : mustacheTemplate;
+      opt_templates && opt_templates[successTemplateKey]
+        ? opt_templates[successTemplateKey]
+        : mustacheTemplate;
     if (successTemplate) {
       ampComponent[successTemplateKey] = {
         'type': 'amp-mustache',
-        'payload': successTemplate./*REVIEW*/innerHTML,
+        'payload': successTemplate./*REVIEW*/ innerHTML,
       };
     }
 
     const errorTemplateKey = 'errorTemplate';
     const errorTemplate =
-      (opt_templates && opt_templates[errorTemplateKey])
-        ? opt_templates[errorTemplateKey] : null;
+      opt_templates && opt_templates[errorTemplateKey]
+        ? opt_templates[errorTemplateKey]
+        : null;
     if (errorTemplate) {
       ampComponent[errorTemplateKey] = {
         'type': 'amp-mustache',
-        'payload': errorTemplate./*REVIEW*/innerHTML,
+        'payload': errorTemplate./*REVIEW*/ innerHTML,
       };
     }
 
@@ -158,8 +170,10 @@ export class SsrTemplateHelper {
     }
 
     const data = dict({
-      'originalRequest':
-        toStructuredCloneable(request.xhrUrl, request.fetchOpt),
+      'originalRequest': toStructuredCloneable(
+        request.xhrUrl,
+        request.fetchOpt
+      ),
       'ampComponent': ampComponent,
     });
 
@@ -174,10 +188,9 @@ export class SsrTemplateHelper {
    */
   verifySsrResponse(win, response, request) {
     verifyAmpCORSHeaders(
-        win,
-        fromStructuredCloneable(
-            response,
-            request.fetchOpt.responseType),
-        request.fetchOpt);
+      win,
+      fromStructuredCloneable(response, request.fetchOpt.responseType),
+      request.fetchOpt
+    );
   }
 }
diff --git a/src/static-template.js b/src/static-template.js
index fe0317fe9d39..4ba1dba4e051 100644
--- a/src/static-template.js
+++ b/src/static-template.js
@@ -50,7 +50,7 @@ export function htmlFor(nodeOrDoc) {
  */
 function html(strings) {
   devAssert(strings.length === 1, 'Improper html template tag usage.');
-  container./*OK*/innerHTML = strings[0];
+  container./*OK*/ innerHTML = strings[0];
 
   const el = container.firstElementChild;
   devAssert(el, 'No elements in template');
diff --git a/src/string.js b/src/string.js
index a8b66d0ee0d7..a3a17436e82c 100644
--- a/src/string.js
+++ b/src/string.js
@@ -139,7 +139,7 @@ export function stringHash32(str) {
   const {length} = str;
   let hash = 5381;
   for (let i = 0; i < length; i++) {
-    hash = hash * 33 ^ str.charCodeAt(i);
+    hash = (hash * 33) ^ str.charCodeAt(i);
   }
   // Convert from 32-bit signed to unsigned.
   return String(hash >>> 0);
diff --git a/src/style-installer.js b/src/style-installer.js
index 0a54d1ee45b0..8f29404b5d92 100644
--- a/src/style-installer.js
+++ b/src/style-installer.js
@@ -43,13 +43,19 @@ const STYLE_MAP_PROP = '__AMP_CSS_SM';
  * @return {!Element}
  */
 export function installStylesForDoc(
-  ampdoc, cssText, cb, opt_isRuntimeCss, opt_ext) {
+  ampdoc,
+  cssText,
+  cb,
+  opt_isRuntimeCss,
+  opt_ext
+) {
   const cssRoot = ampdoc.getHeadNode();
   const style = insertStyleElement(
-      cssRoot,
-      maybeTransform(cssRoot, cssText),
-      opt_isRuntimeCss || false,
-      opt_ext || null);
+    cssRoot,
+    maybeTransform(cssRoot, cssText),
+    opt_isRuntimeCss || false,
+    opt_ext || null
+  );
 
   if (cb) {
     const rootNode = ampdoc.getRootNode();
@@ -73,7 +79,6 @@ export function installStylesForDoc(
   return style;
 }
 
-
 /**
  * Adds the given css text to the given document.
  * TODO(dvoytenko, #10705): Remove this method once FIE/ampdoc migration is
@@ -91,12 +96,18 @@ export function installStylesForDoc(
  * @return {!Element}
  */
 export function installStylesLegacy(
-  doc, cssText, cb, opt_isRuntimeCss, opt_ext) {
+  doc,
+  cssText,
+  cb,
+  opt_isRuntimeCss,
+  opt_ext
+) {
   const style = insertStyleElement(
-      dev().assertElement(doc.head),
-      cssText,
-      opt_isRuntimeCss || false,
-      opt_ext || null);
+    dev().assertElement(doc.head),
+    cssText,
+    opt_isRuntimeCss || false,
+    opt_ext || null
+  );
 
   if (cb) {
     // Styles aren't always available synchronously. E.g. if there is a
@@ -119,7 +130,6 @@ export function installStylesLegacy(
   return style;
 }
 
-
 /**
  * Creates the properly configured style element.
  * @param {!Element|!ShadowRoot} cssRoot
@@ -134,11 +144,13 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
     styleMap = cssRoot[STYLE_MAP_PROP] = map();
   }
 
-  const isExtCss = !isRuntimeCss &&
-      (ext && ext != 'amp-custom' && ext != 'amp-keyframes');
-  const key =
-      isRuntimeCss ? 'amp-runtime' :
-        isExtCss ? `amp-extension=${ext}` : null;
+  const isExtCss =
+    !isRuntimeCss && (ext && ext != 'amp-custom' && ext != 'amp-keyframes');
+  const key = isRuntimeCss
+    ? 'amp-runtime'
+    : isExtCss
+    ? `amp-extension=${ext}`
+    : null;
 
   // Check if it has already been created or discovered.
   if (key) {
@@ -152,9 +164,9 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
   }
 
   // Create the new style element and append to cssRoot.
-  const doc = (cssRoot.ownerDocument || cssRoot);
+  const doc = cssRoot.ownerDocument || cssRoot;
   const style = doc.createElement('style');
-  style./*OK*/textContent = cssText;
+  style./*OK*/ textContent = cssText;
   let afterElement = null;
   // Make sure that we place style tags after the main runtime CSS. Otherwise
   // the order is random.
@@ -162,8 +174,9 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
     style.setAttribute('amp-runtime', '');
   } else if (isExtCss) {
     style.setAttribute('amp-extension', ext || '');
-    afterElement = dev().assertElement(getExistingStyleElement(
-        cssRoot, styleMap, 'amp-runtime'));
+    afterElement = dev().assertElement(
+      getExistingStyleElement(cssRoot, styleMap, 'amp-runtime')
+    );
   } else {
     if (ext) {
       style.setAttribute(ext, '');
@@ -177,7 +190,6 @@ function insertStyleElement(cssRoot, cssText, isRuntimeCss, ext) {
   return style;
 }
 
-
 /**
  * @param {!Element|!ShadowRoot} cssRoot
  * @param {!Object<string, !Element>} styleMap
@@ -190,7 +202,7 @@ function getExistingStyleElement(cssRoot, styleMap, key) {
     return styleMap[key];
   }
   // Check if the style has already been added by the server layout.
-  const existing = cssRoot./*OK*/querySelector(`style[${key}]`);
+  const existing = cssRoot./*OK*/ querySelector(`style[${key}]`);
   if (existing) {
     styleMap[key] = existing;
     return existing;
@@ -199,7 +211,6 @@ function getExistingStyleElement(cssRoot, styleMap, key) {
   return null;
 }
 
-
 /**
  * Applies a transformer to the CSS text if it has been registered.
  * @param {!Element|!ShadowRoot} cssRoot
@@ -209,7 +220,6 @@ export function installCssTransformer(cssRoot, transformer) {
   cssRoot[TRANSFORMER_PROP] = transformer;
 }
 
-
 /**
  * Applies a transformer to the CSS text if it has been registered.
  * @param {!Element|!ShadowRoot} cssRoot
@@ -221,7 +231,6 @@ function maybeTransform(cssRoot, cssText) {
   return transformer ? transformer(cssText) : cssText;
 }
 
-
 /** @private {boolean} */
 let bodyMadeVisible = false;
 
@@ -233,7 +242,6 @@ export function setBodyMadeVisibleForTesting(value) {
   bodyMadeVisible = value;
 }
 
-
 /**
  * Sets the document's body opacity to 1.
  * If the body is not yet available (because our script was loaded
@@ -250,26 +258,27 @@ export function makeBodyVisible(doc) {
   };
 
   waitForBodyPromise(doc)
-      .then(() => {
-        return waitForServices(win);
-      }).catch(reason => {
-        rethrowAsync(reason);
-        return [];
-      }).then(services => {
-        set();
-        if (services.length > 0) {
-          const resources = Services.resourcesForDoc(doc.documentElement);
-          resources./*OK*/schedulePass(1, /* relayoutAll */ true);
-        }
-        try {
-          const perf = Services.performanceFor(win);
-          perf.tick('mbv');
-          perf.flush();
-        } catch (e) {}
-      });
+    .then(() => {
+      return waitForServices(win);
+    })
+    .catch(reason => {
+      rethrowAsync(reason);
+      return [];
+    })
+    .then(services => {
+      set();
+      if (services.length > 0) {
+        const resources = Services.resourcesForDoc(doc.documentElement);
+        resources./*OK*/ schedulePass(1, /* relayoutAll */ true);
+      }
+      try {
+        const perf = Services.performanceFor(win);
+        perf.tick('mbv');
+        perf.flush();
+      } catch (e) {}
+    });
 }
 
-
 /**
  * Set the document's body opacity to 1. Called in error cases.
  * @param {!Document} doc The document who's body we should make visible.
@@ -283,7 +292,6 @@ export function makeBodyVisibleRecovery(doc) {
   setBodyVisibleStyles(doc);
 }
 
-
 /**
  * Make sure that body exists, and make it visible.
  * @param {!Document} doc
@@ -296,7 +304,6 @@ function setBodyVisibleStyles(doc) {
   });
 }
 
-
 /**
  * @param {!Document} doc
  */
@@ -310,7 +317,6 @@ function renderStartedNoInline(doc) {
   }
 }
 
-
 /**
  * Indicates that the body is always visible. For instance, in case of PWA.
  * This check is on a module level variable, and could be problematic if you are
@@ -321,7 +327,6 @@ export function bodyAlwaysVisible(unusedWin) {
   bodyMadeVisible = true;
 }
 
-
 /**
  * Checks whether a style element was registered in the DOM.
  * @param {!Document|!ShadowRoot} doc
diff --git a/src/style.js b/src/style.js
index a0c99461036d..e89bd74b42b2 100644
--- a/src/style.js
+++ b/src/style.js
@@ -19,14 +19,12 @@ import {dev, devAssert} from './log';
 import {map} from './utils/object.js';
 import {startsWith} from './string';
 
-
 /** @type {Object<string, string>} */
 let propertyNameCache;
 
 /** @const {!Array<string>} */
 const vendorPrefixes = ['Webkit', 'webkit', 'Moz', 'moz', 'ms', 'O', 'o'];
 
-
 /**
  * @export
  * @param {string} camelCase camel cased string
@@ -91,7 +89,6 @@ export function getVendorJsPropertyName(style, camelCase, opt_bypassCache) {
   return propertyName;
 }
 
-
 /**
  * Sets the CSS styles of the specified element with !important. The styles
  * are specified as a map from CSS property names to their values.
@@ -102,11 +99,13 @@ export function setImportantStyles(element, styles) {
   const {style} = element;
   for (const k in styles) {
     style.setProperty(
-        getVendorJsPropertyName(style, k), styles[k].toString(), 'important');
+      getVendorJsPropertyName(style, k),
+      styles[k].toString(),
+      'important'
+    );
   }
 }
 
-
 /**
  * Sets the CSS style of the specified element with optional units, e.g. "px".
  * @param {?Element} element
@@ -116,15 +115,18 @@ export function setImportantStyles(element, styles) {
  * @param {boolean=} opt_bypassCache
  */
 export function setStyle(element, property, value, opt_units, opt_bypassCache) {
-  const propertyName = getVendorJsPropertyName(element.style, property,
-      opt_bypassCache);
+  const propertyName = getVendorJsPropertyName(
+    element.style,
+    property,
+    opt_bypassCache
+  );
   if (propertyName) {
-    element.style[propertyName] =
-      /** @type {string} */ (opt_units ? value + opt_units : value);
+    element.style[propertyName] = /** @type {string} */ (opt_units
+      ? value + opt_units
+      : value);
   }
 }
 
-
 /**
  * Returns the value of the CSS style of the specified element.
  * @param {!Element} element
@@ -133,15 +135,17 @@ export function setStyle(element, property, value, opt_units, opt_bypassCache) {
  * @return {*}
  */
 export function getStyle(element, property, opt_bypassCache) {
-  const propertyName = getVendorJsPropertyName(element.style, property,
-      opt_bypassCache);
+  const propertyName = getVendorJsPropertyName(
+    element.style,
+    property,
+    opt_bypassCache
+  );
   if (!propertyName) {
     return undefined;
   }
   return element.style[propertyName];
 }
 
-
 /**
  * Sets the CSS styles of the specified element. The styles
  * a specified as a map from CSS property names to their values.
@@ -154,7 +158,6 @@ export function setStyles(element, styles) {
   }
 }
 
-
 /**
  * Asserts that the style is not the `display` style.
  * This is the only possible way to pass a dynamic style to setStyle.
@@ -167,8 +170,10 @@ export function setStyles(element, styles) {
  */
 export function assertNotDisplay(style) {
   if (style === 'display') {
-    dev().error('STYLE', '`display` style detected. You must use toggle ' +
-      'instead.');
+    dev().error(
+      'STYLE',
+      '`display` style detected. You must use toggle instead.'
+    );
   }
   return style;
 }
@@ -186,8 +191,10 @@ export function assertNotDisplay(style) {
  */
 export function assertDoesNotContainDisplay(styles) {
   if ('display' in styles) {
-    dev().error('STYLE', '`display` style detected in styles. You must use ' +
-      'toggle instead.');
+    dev().error(
+      'STYLE',
+      '`display` style detected in styles. You must use toggle instead.'
+    );
   }
   return styles;
 }
@@ -202,15 +209,19 @@ export function assertDoesNotContainDisplay(styles) {
  */
 export function setInitialDisplay(el, value) {
   const {style} = el;
-  devAssert(value !== '' && value !== 'none', 'Initial display value must ' +
-    'not be "none". Use toggle instead.');
-  devAssert(!style['display'], 'setInitialDisplay MUST NOT be used for ' +
-    'resetting the display style. If you are looking for display:none ' +
-    'toggling, use toggle instead.');
+  devAssert(
+    value !== '' && value !== 'none',
+    'Initial display value must not be "none". Use toggle instead.'
+  );
+  devAssert(
+    !style['display'],
+    'setInitialDisplay MUST NOT be used for ' +
+      'resetting the display style. If you are looking for display:none ' +
+      'toggling, use toggle instead.'
+  );
   style['display'] = value;
 }
 
-
 /**
  * Shows or hides the specified element.
  * @param {!Element} element
@@ -257,7 +268,6 @@ export function translateX(value) {
   return `translateX(${px(value)})`;
 }
 
-
 /**
  * Returns a "translateX" for CSS "transform" property.
  * @param {number|string} x
@@ -277,7 +287,6 @@ export function translate(x, opt_y) {
   return `translate(${x}, ${opt_y})`;
 }
 
-
 /**
  * Returns a "scale" for CSS "transform" property.
  * @param {number|string} value
@@ -308,7 +317,9 @@ export function rotate(value) {
  */
 export function removeAlphaFromColor(rgbaColor) {
   return rgbaColor.replace(
-      /\(([^,]+),([^,]+),([^,)]+),[^)]+\)/g, '($1,$2,$3, 1)');
+    /\(([^,]+),([^,]+),([^,)]+),[^)]+\)/g,
+    '($1,$2,$3, 1)'
+  );
 }
 
 /**
@@ -320,11 +331,10 @@ export function removeAlphaFromColor(rgbaColor) {
  * @return {!Object<string, string>}
  */
 export function computedStyle(win, el) {
-  const style = /** @type {?CSSStyleDeclaration} */(win.getComputedStyle(el));
-  return /** @type {!Object<string, string>} */(style) || map();
+  const style = /** @type {?CSSStyleDeclaration} */ (win.getComputedStyle(el));
+  return /** @type {!Object<string, string>} */ (style) || map();
 }
 
-
 /**
  * Resets styles that were set dynamically (i.e. inline)
  * @param {!Element} element
diff --git a/src/time.js b/src/time.js
index 633ce134ab75..00938bb56e4f 100644
--- a/src/time.js
+++ b/src/time.js
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-
 /**
  * Absolute time in milliseconds.
  * @typedef {number}
  */
 export let timeDef;
 
-
 /**
  * Number between 0 and 1 that designates normalized time, as in "from start to
  * end".
diff --git a/src/transition.js b/src/transition.js
index 87c4bae629d8..d6e0fb0094b7 100644
--- a/src/transition.js
+++ b/src/transition.js
@@ -18,10 +18,9 @@ import * as st from './style';
 import {assertNotDisplay, setStyle} from './style';
 import {getCurve} from './curve';
 
-
-
-export const NOOP = function(unusedTime) {return null;};
-
+export const NOOP = function(unusedTime) {
+  return null;
+};
 
 /**
  * Returns a transition that combines a number of other transitions and
@@ -38,7 +37,6 @@ export function all(transitions) {
   };
 }
 
-
 /**
  * Returns a transition that combines the string result of other string-based
  * transitions such as transform and scale using the given opt_delimiter.
@@ -60,7 +58,6 @@ export function concat(transitions, opt_delimiter = ' ') {
   };
 }
 
-
 /**
  * Returns the specified transition with the time curved via specified curve
  * function.
@@ -77,7 +74,6 @@ export function withCurve(transition, curve) {
   };
 }
 
-
 /**
  * A transition that sets the CSS style of the specified element. The styles
  * a specified as a map from CSS property names to transition functions for
@@ -94,7 +90,6 @@ export function setStyles(element, styles) {
   };
 }
 
-
 /**
  * A basic numeric interpolation.
  * @param {number} start
@@ -107,7 +102,6 @@ export function numeric(start, end) {
   };
 }
 
-
 /**
  * Spring numeric interpolation.
  * @param {number} start
@@ -126,12 +120,10 @@ export function spring(start, end, extended, threshold) {
     if (time < threshold) {
       return start + (extended - start) * (time / threshold);
     }
-    return extended + (end - extended) * ((time - threshold) /
-        (1 - threshold));
+    return extended + (end - extended) * ((time - threshold) / (1 - threshold));
   };
 }
 
-
 /**
  * Adds "px" units.
  * @param {!TransitionDef<number>} transition
@@ -143,7 +135,6 @@ export function px(transition) {
   };
 }
 
-
 /**
  * A transition for "translateX" of CSS "transform" property.
  * @param {!TransitionDef<number|string>} transition
@@ -174,7 +165,6 @@ export function translateY(transition) {
   };
 }
 
-
 /**
  * A transition for "translate(x, y)" of CSS "transform" property.
  * @param {!TransitionDef<number|string>} transitionX
@@ -199,7 +189,6 @@ export function translate(transitionX, opt_transitionY) {
   };
 }
 
-
 /**
  * A transition for "scale" of CSS "transform" property.
  * @param {!TransitionDef<number|string>} transition
diff --git a/src/types.js b/src/types.js
index 1f3bfca03ae8..06e9f58ccad0 100644
--- a/src/types.js
+++ b/src/types.js
@@ -62,7 +62,7 @@ export function isObject(value) {
  * @return {boolean}
  */
 export function isFiniteNumber(value) {
-  return (typeof value === 'number' && isFinite(value));
+  return typeof value === 'number' && isFinite(value);
 }
 
 /**
@@ -95,4 +95,3 @@ export function isEnumValue(enumObj, s) {
 export function toWin(winOrNull) {
   return /** @type {!Window} */ (winOrNull);
 }
-
diff --git a/src/url-rewrite.js b/src/url-rewrite.js
index bdadcc1c837c..6f207513df59 100644
--- a/src/url-rewrite.js
+++ b/src/url-rewrite.js
@@ -42,8 +42,12 @@ const ORIGINAL_TARGET_VALUE = '__AMP_ORIGINAL_TARGET_VALUE_';
  * @return {string}
  */
 export function rewriteAttributesForElement(
-  element, attrName, attrValue, opt_location, opt_updateProperty)
-{
+  element,
+  attrName,
+  attrValue,
+  opt_location,
+  opt_updateProperty
+) {
   const tag = element.tagName.toLowerCase();
   const attr = attrName.toLowerCase();
   const rewrittenValue = rewriteAttributeValue(tag, attr, attrValue);
@@ -99,7 +103,7 @@ export function rewriteAttributeValue(tagName, attrName, attrValue) {
  * @return {boolean}
  */
 export function isUrlAttribute(attrName) {
-  return (attrName == 'src' || attrName == 'href' || attrName == 'srcset');
+  return attrName == 'src' || attrName == 'href' || attrName == 'srcset';
 }
 
 /**
@@ -143,8 +147,9 @@ export function resolveUrlAttr(tagName, attrName, attrValue, windowLocation) {
       user().error(TAG, 'Failed to parse srcset: ', e);
       return attrValue;
     }
-    return srcset.stringify(url => resolveImageUrlAttr(url, baseUrl,
-        isProxyHost));
+    return srcset.stringify(url =>
+      resolveImageUrlAttr(url, baseUrl, isProxyHost)
+    );
   }
 
   return attrValue;
@@ -167,8 +172,12 @@ function resolveImageUrlAttr(attrValue, baseUrl, isProxyHost) {
   }
 
   // Rewrite as a proxy URL.
-  return `${urls.cdn}/i/` +
-      (src.protocol == 'https:' ? 's/' : '') +
-      encodeURIComponent(src.host) +
-      src.pathname + (src.search || '') + (src.hash || '');
+  return (
+    `${urls.cdn}/i/` +
+    (src.protocol == 'https:' ? 's/' : '') +
+    encodeURIComponent(src.host) +
+    src.pathname +
+    (src.search || '') +
+    (src.hash || '')
+  );
 }
diff --git a/src/url.js b/src/url.js
index 9efbc266c0d6..336a3d569c3c 100644
--- a/src/url.js
+++ b/src/url.js
@@ -129,7 +129,7 @@ export function parseUrlWithA(a, url, opt_cache) {
     a.href = a.href;
   }
 
-  const info = /** @type {!Location} */({
+  const info = /** @type {!Location} */ ({
     href: a.href,
     protocol: a.protocol,
     host: a.host,
@@ -149,8 +149,10 @@ export function parseUrlWithA(a, url, opt_cache) {
 
   // 2) For URLs with implicit ports, IE11 parses to default ports while
   // other browsers leave the port field empty.
-  if ((info.protocol == 'http:' && info.port == 80)
-      || (info.protocol == 'https:' && info.port == 443)) {
+  if (
+    (info.protocol == 'http:' && info.port == 80) ||
+    (info.protocol == 'https:' && info.port == 443)
+  ) {
     info.port = '';
     info.host = info.hostname;
   }
@@ -166,7 +168,7 @@ export function parseUrlWithA(a, url, opt_cache) {
   }
 
   // Freeze during testing to avoid accidental mutation.
-  const frozen = (getMode().test && Object.freeze) ? Object.freeze(info) : info;
+  const frozen = getMode().test && Object.freeze ? Object.freeze(info) : info;
 
   if (opt_cache) {
     opt_cache.put(url, frozen);
@@ -183,19 +185,23 @@ export function parseUrlWithA(a, url, opt_cache) {
  * @param {boolean=} opt_addToFront
  * @return {string}
  */
-export function appendEncodedParamStringToUrl(url, paramString,
-  opt_addToFront) {
+export function appendEncodedParamStringToUrl(
+  url,
+  paramString,
+  opt_addToFront
+) {
   if (!paramString) {
     return url;
   }
   const mainAndFragment = url.split('#', 2);
   const mainAndQuery = mainAndFragment[0].split('?', 2);
 
-  let newUrl = mainAndQuery[0] + (
-    mainAndQuery[1]
-      ? (opt_addToFront
+  let newUrl =
+    mainAndQuery[0] +
+    (mainAndQuery[1]
+      ? opt_addToFront
         ? `?${paramString}&${mainAndQuery[1]}`
-        : `?${mainAndQuery[1]}&${paramString}`)
+        : `?${mainAndQuery[1]}&${paramString}`
       : `?${paramString}`);
   newUrl += mainAndFragment[1] ? `#${mainAndFragment[1]}` : '';
   return newUrl;
@@ -278,10 +284,12 @@ export function isSecureUrlDeprecated(url) {
   if (typeof url == 'string') {
     url = parseUrlDeprecated(url);
   }
-  return (url.protocol == 'https:' ||
-      url.hostname == 'localhost' ||
-      url.hostname == '127.0.0.1' ||
-      endsWith(url.hostname, '.localhost'));
+  return (
+    url.protocol == 'https:' ||
+    url.hostname == 'localhost' ||
+    url.hostname == '127.0.0.1' ||
+    endsWith(url.hostname, '.localhost')
+  );
 }
 
 /**
@@ -296,16 +304,27 @@ export function isSecureUrlDeprecated(url) {
  * @return {string}
  */
 export function assertHttpsUrl(
-  urlString, elementContext, sourceName = 'source') {
-  userAssert(urlString != null, '%s %s must be available',
-      elementContext, sourceName);
+  urlString,
+  elementContext,
+  sourceName = 'source'
+) {
+  userAssert(
+    urlString != null,
+    '%s %s must be available',
+    elementContext,
+    sourceName
+  );
   // (erwinm, #4560): type cast necessary until #4560 is fixed.
   const theUrlString = /** @type {string} */ (urlString);
-  userAssert(isSecureUrlDeprecated(theUrlString) || /^(\/\/)/.test(theUrlString),
-      '%s %s must start with ' +
+  userAssert(
+    isSecureUrlDeprecated(theUrlString) || /^(\/\/)/.test(theUrlString),
+    '%s %s must start with ' +
       '"https://" or "//" or be relative and served from ' +
       'either https or from localhost. Invalid value: %s',
-      elementContext, sourceName, theUrlString);
+    elementContext,
+    sourceName,
+    theUrlString
+  );
   return theUrlString;
 }
 
@@ -315,13 +334,14 @@ export function assertHttpsUrl(
  * @return {string}
  */
 export function assertAbsoluteHttpOrHttpsUrl(urlString) {
-  userAssert(/^https?\:/i.test(urlString),
-      'URL must start with "http://" or "https://". Invalid value: %s',
-      urlString);
+  userAssert(
+    /^https?\:/i.test(urlString),
+    'URL must start with "http://" or "https://". Invalid value: %s',
+    urlString
+  );
   return parseUrlDeprecated(urlString).href;
 }
 
-
 /**
  * Parses the query string of an URL. This method returns a simple key/value
  * map. If there are duplicate keys the latest value is returned.
@@ -458,12 +478,12 @@ function removeAmpJsParamsFromSearch(urlSearch) {
     return '';
   }
   const search = urlSearch
-      .replace(AMP_JS_PARAMS_REGEX, '')
-      .replace(AMP_GSA_PARAMS_REGEX, '')
-      .replace(AMP_R_PARAMS_REGEX, '')
-      .replace(AMP_KIT_PARAMS_REGEX, '')
-      .replace(GOOGLE_EXPERIMENT_PARAMS_REGEX, '')
-      .replace(/^[?&]/, ''); // Removes first ? or &.
+    .replace(AMP_JS_PARAMS_REGEX, '')
+    .replace(AMP_GSA_PARAMS_REGEX, '')
+    .replace(AMP_R_PARAMS_REGEX, '')
+    .replace(AMP_KIT_PARAMS_REGEX, '')
+    .replace(GOOGLE_EXPERIMENT_PARAMS_REGEX, '')
+    .replace(/^[?&]/, ''); // Removes first ? or &.
   return search ? '?' + search : '';
 }
 
@@ -480,9 +500,7 @@ export function removeParamsFromSearch(urlSearch, paramName) {
     return '';
   }
   const paramRegex = new RegExp(`[?&]${paramName}=[^&]*`, 'g');
-  const search = urlSearch
-      .replace(paramRegex, '')
-      .replace(/^[?&]/, '');
+  const search = urlSearch.replace(paramRegex, '').replace(/^[?&]/, '');
   return search ? '?' + search : '';
 }
 
@@ -508,17 +526,25 @@ export function getSourceUrl(url) {
   // The /s/ is optional and signals a secure origin.
   const path = url.pathname.split('/');
   const prefix = path[1];
-  userAssert(SERVING_TYPE_PREFIX[prefix],
-      'Unknown path prefix in url %s', url.href);
+  userAssert(
+    SERVING_TYPE_PREFIX[prefix],
+    'Unknown path prefix in url %s',
+    url.href
+  );
   const domainOrHttpsSignal = path[2];
-  const origin = domainOrHttpsSignal == 's'
-    ? 'https://' + decodeURIComponent(path[3])
-    : 'http://' + decodeURIComponent(domainOrHttpsSignal);
+  const origin =
+    domainOrHttpsSignal == 's'
+      ? 'https://' + decodeURIComponent(path[3])
+      : 'http://' + decodeURIComponent(domainOrHttpsSignal);
   // Sanity test that what we found looks like a domain.
   userAssert(origin.indexOf('.') > 0, 'Expected a . in origin %s', origin);
   path.splice(1, domainOrHttpsSignal == 's' ? 3 : 2);
-  return origin + path.join('/') +
-      removeAmpJsParamsFromSearch(url.search) + (url.hash || '');
+  return (
+    origin +
+    path.join('/') +
+    removeAmpJsParamsFromSearch(url.search) +
+    (url.hash || '')
+  );
 }
 
 /**
@@ -577,11 +603,13 @@ export function resolveRelativeUrlFallback_(relativeUrlString, baseUrl) {
   }
 
   // Relative path.
-  return baseUrl.origin + baseUrl.pathname.replace(/\/[^/]*$/, '/')
-      + relativeUrlString;
+  return (
+    baseUrl.origin +
+    baseUrl.pathname.replace(/\/[^/]*$/, '/') +
+    relativeUrlString
+  );
 }
 
-
 /**
  * Add "__amp_source_origin" query parameter to the URL.
  * @param {!Window} win
@@ -594,7 +622,6 @@ export function getCorsUrl(win, url) {
   return addParamToUrl(url, SOURCE_ORIGIN_PARAM, sourceOrigin);
 }
 
-
 /**
  * Checks if the url has __amp_source_origin and throws if it does.
  * @param {string} url
@@ -602,8 +629,11 @@ export function getCorsUrl(win, url) {
 export function checkCorsUrl(url) {
   const parsedUrl = parseUrlDeprecated(url);
   const query = parseQueryString(parsedUrl.search);
-  userAssert(!(SOURCE_ORIGIN_PARAM in query),
-      'Source origin is not allowed in %s', url);
+  userAssert(
+    !(SOURCE_ORIGIN_PARAM in query),
+    'Source origin is not allowed in %s',
+    url
+  );
 }
 
 /**
diff --git a/src/utils/array.js b/src/utils/array.js
index ec671f9ab508..9403b803f53a 100644
--- a/src/utils/array.js
+++ b/src/utils/array.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Compares if two arrays contains exactly same elements of same number
  * of same order. Note that it does NOT handle NaN case as expected.
diff --git a/src/utils/base64.js b/src/utils/base64.js
index fc17857801b0..f5d9f7f0cf4f 100644
--- a/src/utils/base64.js
+++ b/src/utils/base64.js
@@ -14,12 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  bytesToString,
-  stringToBytes,
-  utf8Decode,
-  utf8Encode,
-} from './bytes';
+import {bytesToString, stringToBytes, utf8Decode, utf8Encode} from './bytes';
 
 /**
  * Character mapping from base64url to base64.
diff --git a/src/utils/bytes.js b/src/utils/bytes.js
index 6c82b3bc9a19..ab1f231bbdf1 100644
--- a/src/utils/bytes.js
+++ b/src/utils/bytes.js
@@ -83,10 +83,11 @@ export function bytesToUInt32(bytes) {
   if (bytes.length != 4) {
     throw new Error('Received byte array with length != 4');
   }
-  const val = (bytes[0] & 0xFF) << 24 |
-     (bytes[1] & 0xFF) << 16 |
-     (bytes[2] & 0xFF) << 8 |
-     (bytes[3] & 0xFF);
+  const val =
+    ((bytes[0] & 0xff) << 24) |
+    ((bytes[1] & 0xff) << 16) |
+    ((bytes[2] & 0xff) << 8) |
+    (bytes[3] & 0xff);
   // Convert to unsigned.
   return val >>> 0;
 }
diff --git a/src/utils/dom-fingerprint.js b/src/utils/dom-fingerprint.js
index 2732acb90d1e..03eeab0fd56c 100644
--- a/src/utils/dom-fingerprint.js
+++ b/src/utils/dom-fingerprint.js
@@ -16,7 +16,6 @@
 
 import {stringHash32} from '../string';
 
-
 /**
  * Gets a string of concatenated element names and relative positions
  * of the DOM element and its parentElement's (up to 25).  Relative position
@@ -63,7 +62,6 @@ export function domFingerprintPlain(element) {
   return ids.join();
 }
 
-
 export class DomFingerprint {
   /**
    * Calculates ad slot DOM fingerprint.  This key is intended to
@@ -80,7 +78,6 @@ export class DomFingerprint {
   }
 }
 
-
 /**
  * Gets a string showing the index of an element within
  * the children of its parent, counting only nodes with the same tag.
diff --git a/src/utils/math.js b/src/utils/math.js
index 502affbd6b5d..5eb2054086c3 100644
--- a/src/utils/math.js
+++ b/src/utils/math.js
@@ -36,7 +36,6 @@
  * @return {number} the equivalent value in the target range
  */
 export function mapRange(val, min1, max1, min2, max2) {
-
   let max1Bound = max1;
   let min1Bound = min1;
   if (min1 > max1) {
@@ -50,7 +49,7 @@ export function mapRange(val, min1, max1, min2, max2) {
     val = max1Bound;
   }
 
-  return (val - min1) * (max2 - min2) / (max1 - min1) + min2;
+  return ((val - min1) * (max2 - min2)) / (max1 - min1) + min2;
 }
 
 /**
diff --git a/src/utils/pem.js b/src/utils/pem.js
index 5203e7fd6952..44fa4b5f7fa7 100644
--- a/src/utils/pem.js
+++ b/src/utils/pem.js
@@ -16,7 +16,6 @@
 
 import {base64DecodeToBytes} from './base64';
 
-
 /**
  * Converts a text in PEM format into a binary array buffer.
  * @param {string} pem
diff --git a/src/utils/promise.js b/src/utils/promise.js
index d9f4947b3632..917305cd7031 100644
--- a/src/utils/promise.js
+++ b/src/utils/promise.js
@@ -45,7 +45,7 @@ export class Deferred {
     /**
      * @const {!Promise<T>}
      */
-    this.promise = new /*OK*/Promise((res, rej) => {
+    this.promise = new /*OK*/ Promise((res, rej) => {
       resolve = res;
       reject = rej;
     });
@@ -159,17 +159,20 @@ export class LastAddedResolver {
    */
   add(promise) {
     const countAtAdd = ++this.count_;
-    Promise.resolve(promise).then(result => {
-      if (this.count_ === countAtAdd) {
-        this.resolve_(result);
+    Promise.resolve(promise).then(
+      result => {
+        if (this.count_ === countAtAdd) {
+          this.resolve_(result);
+        }
+      },
+      error => {
+        // Don't follow behavior of Promise.all and Promise.race error so that
+        // this will only reject when most recently added promise fails.
+        if (this.count_ === countAtAdd) {
+          this.reject_(error);
+        }
       }
-    }, error => {
-      // Don't follow behavior of Promise.all and Promise.race error so that
-      // this will only reject when most recently added promise fails.
-      if (this.count_ === countAtAdd) {
-        this.reject_(error);
-      }
-    });
+    );
     return this.promise_;
   }
 
diff --git a/src/utils/signals.js b/src/utils/signals.js
index 971255e1d20a..43e87387e5b1 100644
--- a/src/utils/signals.js
+++ b/src/utils/signals.js
@@ -17,13 +17,11 @@
 import {Deferred} from './promise';
 import {map} from './object';
 
-
 /**
  * This object tracts signals and allows blocking until a signal has been
  * received.
  */
 export class Signals {
-
   /**
    * Creates an instance of Signals.
    */
@@ -69,9 +67,10 @@ export class Signals {
       const result = this.map_[name];
       if (result != null) {
         // Immediately resolve signal.
-        const promise = typeof result == 'number' ?
-          Promise.resolve(result) :
-          Promise.reject(result);
+        const promise =
+          typeof result == 'number'
+            ? Promise.resolve(result)
+            : Promise.reject(result);
         promiseStruct = {promise};
       } else {
         // Allocate the promise/resolver for when the signal arrives in the
diff --git a/src/utils/story.js b/src/utils/story.js
index 173b8d5acb5d..63d212258ca1 100644
--- a/src/utils/story.js
+++ b/src/utils/story.js
@@ -1,22 +1,21 @@
 /**
-  * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
-  *
-  * Licensed under the Apache License, Version 2.0 (the "License");
-  * you may not use this file except in compliance with the License.
-  * You may obtain a copy of the License at
-  *
-  *      http://www.apache.org/licenses/LICENSE-2.0
-  *
-  * Unless required by applicable law or agreed to in writing, software
-  * distributed under the License is distributed on an "AS-IS" BASIS,
-  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  * See the License for the specific language governing permissions and
-  * limitations under the License.
-  */
+ * Copyright 2018 The AMP HTML Authors. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS-IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
 import {closestAncestorElementBySelector, waitForChild} from '../dom';
 
-
 /**
  * Checks if an element descends from `amp-story` in order to configure
  * story-specific behavior.
@@ -38,9 +37,13 @@ export function isStoryDocument(ampdoc) {
   return new Promise(resolve => {
     ampdoc.whenBodyAvailable().then(() => {
       const body = ampdoc.getBody();
-      waitForChild(body, () => !!body.firstElementChild, () => {
-        resolve(body.firstElementChild.tagName === 'AMP-STORY');
-      });
+      waitForChild(
+        body,
+        () => !!body.firstElementChild,
+        () => {
+          resolve(body.firstElementChild.tagName === 'AMP-STORY');
+        }
+      );
     });
   });
 }
diff --git a/src/utils/video.js b/src/utils/video.js
index 44bd06cc2faa..acb7d92a8fc0 100644
--- a/src/utils/video.js
+++ b/src/utils/video.js
@@ -17,7 +17,6 @@ import {dev} from '../log';
 import {once} from './function';
 import {setStyles} from '../style';
 
-
 /**
  * @param {!Window} win
  * @param {boolean} isLiteViewer
@@ -64,7 +63,6 @@ function isAutoplaySupportedImpl(win, isLiteViewer) {
   return Promise.resolve(!detectionElement.paused);
 }
 
-
 /** @private {?(function(Window, boolean):!Promise<boolean>)} */
 let isAutoplaySupported = null;
 
@@ -72,12 +70,11 @@ let isAutoplaySupported = null;
  * Sets if autoplay is supported.
  */
 function setIsAutoplaySupported() {
-  isAutoplaySupported =
-    /** @type {function(Window, boolean):!Promise<boolean>} */ (
-      once(isAutoplaySupportedImpl));
+  isAutoplaySupported = /** @type {function(Window, boolean):!Promise<boolean>} */ (once(
+    isAutoplaySupportedImpl
+  ));
 }
 
-
 /**
  * Wrapper around static utilities for testability.
  */
diff --git a/src/utils/xhr-utils.js b/src/utils/xhr-utils.js
index e238c11c1ecd..d0e3fb98cd8a 100644
--- a/src/utils/xhr-utils.js
+++ b/src/utils/xhr-utils.js
@@ -18,7 +18,8 @@ import {Services} from '../services';
 import {dev, devAssert, user, userAssert} from '../log';
 import {dict, map} from './object';
 import {fromIterator} from './array';
-import {getCorsUrl,
+import {
+  getCorsUrl,
   getSourceOrigin,
   getWinOrigin,
   isProxyOrigin,
@@ -34,7 +35,7 @@ const allowedMethods_ = ['GET', 'POST'];
 
 /** @private @const {string} */
 export const ALLOW_SOURCE_ORIGIN_HEADER =
-    'AMP-Access-Control-Allow-Source-Origin';
+  'AMP-Access-Control-Allow-Source-Origin';
 
 /** @private @const {!Array<function(*):boolean>} */
 const allowedJsonBodyTypes_ = [isArray, isObject];
@@ -85,7 +86,7 @@ const allowedJsonBodyTypes_ = [isArray, isObject];
 export function toStructuredCloneable(input, init) {
   const newInit = Object.assign({}, init);
   if (isFormDataWrapper(init.body)) {
-    const wrapper = /** @type {!FormDataWrapperInterface} **/ (init.body);
+    const wrapper = /** @type {!FormDataWrapperInterface} */ (init.body);
     newInit.headers['Content-Type'] = 'multipart/form-data;charset=utf-8';
     newInit.body = fromIterator(wrapper.entries());
   }
@@ -161,8 +162,9 @@ export function fromStructuredCloneable(response, responseType) {
       init.headers.forEach(entry => {
         const headerName = entry[0];
         const headerValue = entry[1];
-        lowercasedHeaders[String(headerName).toLowerCase()] =
-            String(headerValue);
+        lowercasedHeaders[String(headerName).toLowerCase()] = String(
+          headerValue
+        );
       });
     }
     if (init.status) {
@@ -211,20 +213,22 @@ export function getViewerInterceptResponse(win, ampdocSingle, input, init) {
   if (!docOptedIn) {
     return whenFirstVisible;
   }
-  return whenFirstVisible.then(() => {
-    return viewer.isTrustedViewer();
-  }).then(viewerTrusted => {
-    const isDevMode = getMode(win).development;
-    if (!viewerTrusted && !isDevMode) {
-      return;
-    }
-    const messagePayload = dict({
-      'originalRequest': toStructuredCloneable(input, init),
+  return whenFirstVisible
+    .then(() => {
+      return viewer.isTrustedViewer();
+    })
+    .then(viewerTrusted => {
+      const isDevMode = getMode(win).development;
+      if (!viewerTrusted && !isDevMode) {
+        return;
+      }
+      const messagePayload = dict({
+        'originalRequest': toStructuredCloneable(input, init),
+      });
+      return viewer
+        .sendMessageAwaitResponse('xhr', messagePayload)
+        .then(response => fromStructuredCloneable(response, init.responseType));
     });
-    return viewer.sendMessageAwaitResponse('xhr', messagePayload)
-        .then(response =>
-          fromStructuredCloneable(response, init.responseType));
-  });
 }
 
 /**
@@ -256,8 +260,10 @@ export function setupInit(opt_init, opt_accept) {
   // `credentials`.
   const creds = init.credentials;
   devAssert(
-      creds === undefined || creds == 'include' || creds == 'omit',
-      'Only credentials=include|omit support: %s', creds);
+    creds === undefined || creds == 'include' || creds == 'omit',
+    'Only credentials=include|omit support: %s',
+    creds
+  );
 
   init.method = normalizeMethod_(init.method);
   init.headers = init.headers || dict({});
@@ -285,8 +291,10 @@ export function setupAMPCors(win, input, init) {
     init.requireAmpResponseSourceOrigin = false;
   }
   if (init.requireAmpResponseSourceOrigin === true) {
-    dev().error('XHR',
-        'requireAmpResponseSourceOrigin is deprecated, use ampCors instead');
+    dev().error(
+      'XHR',
+      'requireAmpResponseSourceOrigin is deprecated, use ampCors instead'
+    );
   }
   if (init.requireAmpResponseSourceOrigin === undefined) {
     init.requireAmpResponseSourceOrigin = true;
@@ -313,21 +321,24 @@ export function setupJsonFetchInit(init) {
     // Assume JSON strict mode where only objects or arrays are allowed
     // as body.
     devAssert(
-        allowedJsonBodyTypes_.some(test => test(fetchInit.body)),
-        'body must be of type object or array. %s',
-        fetchInit.body
+      allowedJsonBodyTypes_.some(test => test(fetchInit.body)),
+      'body must be of type object or array. %s',
+      fetchInit.body
     );
 
     // Content should be 'text/plain' to avoid CORS preflight.
-    fetchInit.headers['Content-Type'] = fetchInit.headers['Content-Type'] ||
-        'text/plain;charset=utf-8';
+    fetchInit.headers['Content-Type'] =
+      fetchInit.headers['Content-Type'] || 'text/plain;charset=utf-8';
     const headerContentType = fetchInit.headers['Content-Type'];
     // Cast is valid, because we checked that it is not form data above.
     if (headerContentType === 'application/x-www-form-urlencoded') {
-      fetchInit.body =
-        serializeQueryString(/** @type {!JsonObject} */ (fetchInit.body));
+      fetchInit.body = serializeQueryString(
+        /** @type {!JsonObject} */ (fetchInit.body)
+      );
     } else {
-      fetchInit.body = JSON.stringify(/** @type {!JsonObject} */ (fetchInit.body));
+      fetchInit.body = JSON.stringify(
+        /** @type {!JsonObject} */ (fetchInit.body)
+      );
     }
   }
   return fetchInit;
@@ -345,10 +356,10 @@ function normalizeMethod_(method) {
   }
   method = method.toUpperCase();
   devAssert(
-      allowedMethods_.includes(method),
-      'Only one of %s is currently allowed. Got %s',
-      allowedMethods_.join(', '),
-      method
+    allowedMethods_.includes(method),
+    'Only one of %s is currently allowed. Got %s',
+    allowedMethods_.join(', '),
+    method
   );
   return method;
 }
@@ -362,20 +373,25 @@ function normalizeMethod_(method) {
  */
 export function verifyAmpCORSHeaders(win, response, init) {
   const allowSourceOriginHeader = response.headers.get(
-      ALLOW_SOURCE_ORIGIN_HEADER);
+    ALLOW_SOURCE_ORIGIN_HEADER
+  );
   if (allowSourceOriginHeader) {
     const sourceOrigin = getSourceOrigin(win.location.href);
     // If the `AMP-Access-Control-Allow-Source-Origin` header is returned,
     // ensure that it's equal to the current source origin.
-    userAssert(allowSourceOriginHeader == sourceOrigin,
-        `Returned ${ALLOW_SOURCE_ORIGIN_HEADER} is not` +
-          ` equal to the current: ${allowSourceOriginHeader}` +
-          ` vs ${sourceOrigin}`);
+    userAssert(
+      allowSourceOriginHeader == sourceOrigin,
+      `Returned ${ALLOW_SOURCE_ORIGIN_HEADER} is not` +
+        ` equal to the current: ${allowSourceOriginHeader}` +
+        ` vs ${sourceOrigin}`
+    );
   } else if (init.requireAmpResponseSourceOrigin) {
     // If the `AMP-Access-Control-Allow-Source-Origin` header is not
     // returned but required, return error.
-    userAssert(false, 'Response must contain the' +
-        ` ${ALLOW_SOURCE_ORIGIN_HEADER} header`);
+    userAssert(
+      false,
+      `Response must contain the ${ALLOW_SOURCE_ORIGIN_HEADER} header`
+    );
   }
   return response;
 }
@@ -419,17 +435,24 @@ export function assertSuccess(response) {
  */
 export function getViewerAuthTokenIfAvailable(element) {
   const crossOriginAttr = element.getAttribute('crossorigin');
-  if (crossOriginAttr
-      && crossOriginAttr.trim() === 'amp-viewer-auth-token-via-post') {
-    return Services.viewerAssistanceForDocOrNull(element)
+  if (
+    crossOriginAttr &&
+    crossOriginAttr.trim() === 'amp-viewer-auth-token-via-post'
+  ) {
+    return (
+      Services.viewerAssistanceForDocOrNull(element)
         .then(va => {
-          userAssert(va, 'crossorigin="amp-viewer-auth-token-post" '
-              + 'requires amp-viewer-assistance extension.');
+          userAssert(
+            va,
+            'crossorigin="amp-viewer-auth-token-post" ' +
+              'requires amp-viewer-assistance extension.'
+          );
           return va.getIdTokenPromise();
         })
         // If crossorigin attr is present, resolve with token or empty string.
         .then(token => token || '')
-        .catch(() => '');
+        .catch(() => '')
+    );
   }
   // If crossorigin attribute is missing, always resolve with undefined.
   return Promise.resolve(undefined);
diff --git a/src/validator-integration.js b/src/validator-integration.js
index eaada7f8a9f0..fecfe28a2e18 100644
--- a/src/validator-integration.js
+++ b/src/validator-integration.js
@@ -29,21 +29,22 @@ import {urls} from './config';
  */
 export function maybeValidate(win) {
   const filename = win.location.href;
-  if (startsWith(filename, 'about:')) { // Should only happen in tests.
+  if (startsWith(filename, 'about:')) {
+    // Should only happen in tests.
     return;
   }
   let validator = false;
   if (getMode().development) {
-    const hash =
-        parseQueryString(win.location.originalHash || win.location.hash);
+    const hash = parseQueryString(
+      win.location.originalHash || win.location.hash
+    );
     validator = hash['validate'] !== '0';
   }
 
   if (validator) {
     loadScript(win.document, `${urls.cdn}/v0/validator.js`).then(() => {
       /* global amp: false */
-      amp.validator.validateUrlAndLog(
-          filename, win.document, getMode().filter);
+      amp.validator.validateUrlAndLog(filename, win.document, getMode().filter);
     });
   } else if (getMode().examiner) {
     loadScript(win.document, `${urls.cdn}/examiner.js`);
@@ -60,9 +61,12 @@ export function maybeValidate(win) {
 function loadScript(doc, url) {
   const script = doc.createElement('script');
   script.src = url;
-  const promise = loadPromise(script).then(() => {
-    doc.head.removeChild(script);
-  }, () => {});
+  const promise = loadPromise(script).then(
+    () => {
+      doc.head.removeChild(script);
+    },
+    () => {}
+  );
   doc.head.appendChild(script);
   return promise;
 }
diff --git a/src/video-iframe-integration.js b/src/video-iframe-integration.js
index ec55c642eab7..151f055e05e4 100644
--- a/src/video-iframe-integration.js
+++ b/src/video-iframe-integration.js
@@ -89,17 +89,15 @@ const validEvents = [
  */
 export function getVideoJs(win, opt_initializer) {
   return userAssert(
-      opt_initializer || /** @type (function()) */ (win.videojs),
-      'Video.JS not imported or initializer undefined.');
+    opt_initializer || /** @type {function()} */ (win.videojs),
+    'Video.JS not imported or initializer undefined.'
+  );
 }
 
-
 /** @visibleForTesting */
 export class AmpVideoIntegration {
-
   /** @param {!Window} win */
   constructor(win) {
-
     /**
      * Used for checking callback return type.
      * @visibleForTesting
@@ -152,9 +150,9 @@ export class AmpVideoIntegration {
     userAssert(validMethods.indexOf(name) > -1, `Invalid method ${name}.`);
 
     const wrappedCallback =
-        (name == 'play' || name == 'pause') ?
-          this.safePlayOrPause_(callback) :
-          callback;
+      name == 'play' || name == 'pause'
+        ? this.safePlayOrPause_(callback)
+        : callback;
 
     this.methods_[name] = wrappedCallback;
     this.listenToOnce_();
@@ -206,24 +204,30 @@ export class AmpVideoIntegration {
    *    will be taken from the `window` object.
    */
   listenTo(type, obj, opt_initializer) {
-    userAssert(!this.usedListenToHelper_,
-        '%s `listenTo` is meant to be used once per page.',
-        TAG);
+    userAssert(
+      !this.usedListenToHelper_,
+      '%s `listenTo` is meant to be used once per page.',
+      TAG
+    );
     const types = {
       'jwplayer': () => {
-        userAssert(!opt_initializer,
-            '%s jwplayer integration does not take an initializer',
-            TAG);
+        userAssert(
+          !opt_initializer,
+          '%s jwplayer integration does not take an initializer',
+          TAG
+        );
         this.listenToJwPlayer_(obj);
       },
       'videojs': () => {
         this.listenToVideoJs_(obj, opt_initializer);
       },
     };
-    userAssert(types[type.toLowerCase()],
-        `%s Invalid listener type [${type}]. ` +
+    userAssert(
+      types[type.toLowerCase()],
+      `%s Invalid listener type [${type}]. ` +
         `Valid types are [${Object.keys(types).join(', ')}]`,
-        TAG)(); // notice the call here ;)
+      TAG
+    )(); // notice the call here ;)
     this.usedListenToHelper_ = true;
   }
 
@@ -291,7 +295,8 @@ export class AmpVideoIntegration {
       }
 
       listen(element, 'volumechange', () =>
-        this.onVolumeChange_(player.volume()));
+        this.onVolumeChange_(player.volume())
+      );
 
       this.method('play', () => player.play());
       this.method('pause', () => player.pause());
@@ -339,8 +344,11 @@ export class AmpVideoIntegration {
    * @param {string} event
    */
   postEvent(event) {
-    userAssert(validEvents.indexOf(event) > -1,
-        `%s Invalid event [${event}]`, TAG);
+    userAssert(
+      validEvents.indexOf(event) > -1,
+      `%s Invalid event [${event}]`,
+      TAG
+    );
     this.postToParent_(dict({'event': event}));
   }
 
@@ -350,13 +358,15 @@ export class AmpVideoIntegration {
    * @param {!Object<string, string>=} opt_vars
    */
   postAnalyticsEvent(eventType, opt_vars) {
-    this.postToParent_(dict({
-      'event': 'analytics',
-      'analytics': {
-        'eventType': eventType,
-        'vars': opt_vars,
-      },
-    }));
+    this.postToParent_(
+      dict({
+        'event': 'analytics',
+        'analytics': {
+          'eventType': eventType,
+          'vars': opt_vars,
+        },
+      })
+    );
   }
 
   /**
@@ -369,7 +379,7 @@ export class AmpVideoIntegration {
     const completeData = Object.assign({id}, data);
 
     if (!getMode(this.win_).test && this.win_.parent) {
-      this.win_.parent./*OK*/postMessage(completeData, '*');
+      this.win_.parent./*OK*/ postMessage(completeData, '*');
     }
 
     if (opt_callback) {
@@ -420,8 +430,10 @@ function listenTo(win, onMessage) {
  * @visibleForTesting
  */
 export function adopt(global) {
-  userAssert(!global[__AMP__],
-      '%s video-iframe-integration-v0.js should only be included once.');
+  userAssert(
+    !global[__AMP__],
+    '%s video-iframe-integration-v0.js should only be included once.'
+  );
 
   global[__AMP__] = true;
 
diff --git a/src/video-interface.js b/src/video-interface.js
index ca1ca04c263f..7f228cca8b17 100644
--- a/src/video-interface.js
+++ b/src/video-interface.js
@@ -31,7 +31,6 @@ export const MIN_VISIBILITY_RATIO_FOR_AUTOPLAY = 0.5;
  * @interface
  */
 export class VideoInterface {
-
   /**
    * Whether the component supports video playback in the current platform.
    * If false, component will be not treated as a video component.
@@ -165,7 +164,6 @@ export class VideoInterface {
   seekTo(unusedTimeSeconds) {}
 }
 
-
 /**
  * Attributes
  *
@@ -224,7 +222,6 @@ export const VideoAttributes = {
   NO_AUDIO: 'noaudio',
 };
 
-
 /**
  * Events
  *
@@ -396,7 +393,6 @@ export const PlayingStates = {
   PAUSED: 'paused',
 };
 
-
 /** @enum {string} */
 export const VideoAnalyticsEvents = {
   /**
@@ -473,7 +469,6 @@ export const VideoAnalyticsEvents = {
   PERCENTAGE_PLAYED: 'video-percentage-played',
 };
 
-
 /**
  * Helper union type to be used internally, so that the compiler treats
  * `VideoInterface` objects as `BaseElement`s, which they should be anyway.
@@ -485,7 +480,6 @@ export const VideoAnalyticsEvents = {
  */
 export let VideoOrBaseElementDef;
 
-
 /**
  * @param {!Element} element
  * @return {boolean}
@@ -494,20 +488,17 @@ export function isDockable(element) {
   return element.hasAttribute(VideoAttributes.DOCK);
 }
 
-
 /** @enum {string} */
 export const VideoServiceSignals = {
   USER_INTERACTED: 'user-interacted',
   AUTOPLAY_DELEGATED: 'autoplay-delegated',
 };
 
-
 /** @param {!AmpElement|!VideoOrBaseElementDef} video */
 export function delegateAutoplay(video) {
   video.signals().signal(VideoServiceSignals.AUTOPLAY_DELEGATED);
 }
 
-
 /** @param {!AmpElement|!VideoOrBaseElementDef} video */
 export function userInteractedWith(video) {
   video.signals().signal(VideoServiceSignals.USER_INTERACTED);
diff --git a/src/visibility-state.js b/src/visibility-state.js
index fd0b297f3cbb..31e33b4d927a 100644
--- a/src/visibility-state.js
+++ b/src/visibility-state.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 /**
  * Visibility state of the AMP document.
  * @enum {string}
@@ -47,4 +46,3 @@ export const VisibilityState = {
    */
   INACTIVE: 'inactive',
 };
-
diff --git a/src/web-components.js b/src/web-components.js
index c58617f84ac2..b2ee041ad612 100644
--- a/src/web-components.js
+++ b/src/web-components.js
@@ -67,10 +67,10 @@ export function isShadowDomSupported() {
  */
 export function isShadowCssSupported() {
   if (shadowCssSupported === undefined) {
-    shadowCssSupported = isShadowDomSupported() && (
-      isNative(Element.prototype.attachShadow) ||
-      isNative(Element.prototype.createShadowRoot)
-    );
+    shadowCssSupported =
+      isShadowDomSupported() &&
+      (isNative(Element.prototype.attachShadow) ||
+        isNative(Element.prototype.createShadowRoot));
   }
   return shadowCssSupported;
 }
@@ -93,8 +93,9 @@ function isNative(func) {
  */
 export function getShadowDomSupportedVersion(opt_elementClass) {
   if (shadowDomSupportedVersion === undefined) {
-    shadowDomSupportedVersion =
-        getShadowDomVersion(opt_elementClass || Element);
+    shadowDomSupportedVersion = getShadowDomVersion(
+      opt_elementClass || Element
+    );
   }
   return shadowDomSupportedVersion;
 }
diff --git a/src/web-worker/amp-worker.js b/src/web-worker/amp-worker.js
index 313af09724d4..e14de507a787 100644
--- a/src/web-worker/amp-worker.js
+++ b/src/web-worker/amp-worker.js
@@ -85,24 +85,31 @@ class AmpWorker {
     const useLocal = getMode().localDev || getMode().test;
     const useRtvVersion = !useLocal;
     const url = calculateEntryPointScriptUrl(
-        loc, 'ww', useLocal, useRtvVersion);
+      loc,
+      'ww',
+      useLocal,
+      useRtvVersion
+    );
     dev().fine(TAG, 'Fetching web worker from', url);
 
     /** @private {Worker} */
     this.worker_ = null;
 
     /** @const @private {!Promise} */
-    this.fetchPromise_ = this.xhr_.fetchText(url, {
-      ampCors: false,
-    }).then(res => res.text()).then(text => {
-      // Workaround since Worker constructor only accepts same origin URLs.
-      const blob = new win.Blob([
-        text + '\n//# sourceurl=' + url,
-      ], {type: 'text/javascript'});
-      const blobUrl = win.URL.createObjectURL(blob);
-      this.worker_ = new win.Worker(blobUrl);
-      this.worker_.onmessage = this.receiveMessage_.bind(this);
-    });
+    this.fetchPromise_ = this.xhr_
+      .fetchText(url, {
+        ampCors: false,
+      })
+      .then(res => res.text())
+      .then(text => {
+        // Workaround since Worker constructor only accepts same origin URLs.
+        const blob = new win.Blob([text + '\n//# sourceurl=' + url], {
+          type: 'text/javascript',
+        });
+        const blobUrl = win.URL.createObjectURL(blob);
+        this.worker_ = new win.Worker(blobUrl);
+        this.worker_.onmessage = this.receiveMessage_.bind(this);
+      });
 
     /**
      * Array of in-flight messages pending response from worker.
@@ -142,9 +149,13 @@ class AmpWorker {
 
         const scope = this.idForWindow_(opt_localWin || this.win_);
 
-        const message =
-          /** @type {ToWorkerMessageDef} */ ({method, args, scope, id});
-        this.worker_./*OK*/postMessage(message);
+        const message = /** @type {ToWorkerMessageDef} */ ({
+          method,
+          args,
+          scope,
+          id,
+        });
+        this.worker_./*OK*/ postMessage(message);
       });
     });
   }
@@ -156,17 +167,25 @@ class AmpWorker {
    * @private
    */
   receiveMessage_(event) {
-    const {method, returnValue, id} =
-      /** @type {FromWorkerMessageDef} */ (event.data);
+    const {
+      method,
+      returnValue,
+      id,
+    } = /** @type {FromWorkerMessageDef} */ (event.data);
 
     const message = this.messages_[id];
     if (!message) {
-      dev().error(TAG, `Received unexpected message (${method}, ${id}) ` +
-          'from worker.');
+      dev().error(
+        TAG,
+        `Received unexpected message (${method}, ${id}) from worker.`
+      );
       return;
     }
-    devAssert(method == message.method, 'Received mismatched method ' +
-        `(${method}, ${id}), expected ${message.method}.`);
+    devAssert(
+      method == message.method,
+      'Received mismatched method ' +
+        `(${method}, ${id}), expected ${message.method}.`
+    );
 
     message.resolve(returnValue);
 
diff --git a/src/web-worker/web-worker.js b/src/web-worker/web-worker.js
index 63eba39232b2..c5a8fbdce472 100644
--- a/src/web-worker/web-worker.js
+++ b/src/web-worker/web-worker.js
@@ -60,8 +60,12 @@ self.addEventListener('unhandledrejection', errorHandler_);
 self.addEventListener('error', errorHandler_);
 
 self.addEventListener('message', function(event) {
-  const {method, args, id, scope} =
-    /** @type {ToWorkerMessageDef} */ (event.data);
+  const {
+    method,
+    args,
+    id,
+    scope,
+  } = /** @type {ToWorkerMessageDef} */ (event.data);
   let returnValue;
 
   // TODO(choumx): Remove this fallback when we confirm there are no errors.
@@ -100,12 +104,15 @@ self.addEventListener('message', function(event) {
       dev().error(TAG, 'Unrecognized method: %s', method);
   }
 
-  const message =
-    /** @type {FromWorkerMessageDef} */ ({method, returnValue, id});
+  const message = /** @type {FromWorkerMessageDef} */ ({
+    method,
+    returnValue,
+    id,
+  });
   // `message` may only contain values or objects handled by the
   // structured clone algorithm.
   // https://developer.mozilla.org/en-US/docs/Web/API/Web_Workers_API/Structured_clone_algorithm
-  self./*OK*/postMessage(message);
+  self./*OK*/ postMessage(message);
 });
 
 /**
@@ -121,16 +128,25 @@ function report_(e) {
     e = new Error(e);
   }
   const config = self.AMP_CONFIG || {};
-  const url = urls.errorReporting + '?' +
-      'ww=1' + // Tags request as coming from a worker.
-      '&v=' + encodeURIComponent(config.v) +
-      '&m=' + encodeURIComponent(e.message) +
-      '&ca=' + (config.canary ? 1 : 0) +
-      '&s=' + encodeURIComponent(e.stack || '');
-  fetch(url, /** @type {!RequestInit} */ ({
-    // We don't care about the response.
-    mode: 'no-cors',
-  })).catch(reason => {
-    console./*OK*/error(reason);
+  const url =
+    urls.errorReporting +
+    '?' +
+    'ww=1' + // Tags request as coming from a worker.
+    '&v=' +
+    encodeURIComponent(config.v) +
+    '&m=' +
+    encodeURIComponent(e.message) +
+    '&ca=' +
+    (config.canary ? 1 : 0) +
+    '&s=' +
+    encodeURIComponent(e.stack || '');
+  fetch(
+    url,
+    /** @type {!RequestInit} */ ({
+      // We don't care about the response.
+      mode: 'no-cors',
+    })
+  ).catch(reason => {
+    console./*OK*/ error(reason);
   });
 }
diff --git a/src/window-interface.js b/src/window-interface.js
index fb137ee2f73d..7dfa439c6037 100644
--- a/src/window-interface.js
+++ b/src/window-interface.js
@@ -20,7 +20,6 @@
  * See test-helper.js#mockWindowInterface
  */
 export class WindowInterface {
-
   /**
    * @static
    * @param {!Window} win
diff --git a/test/_init_tests.js b/test/_init_tests.js
index 564030819135..290b9e7668cf 100644
--- a/test/_init_tests.js
+++ b/test/_init_tests.js
@@ -32,9 +32,7 @@ import {
   reportError,
   resetAccumulatedErrorMessagesForTesting,
 } from '../src/error';
-import {
-  resetEvtListenerOptsSupportForTesting,
-} from '../src/event-helper-listen';
+import {resetEvtListenerOptsSupportForTesting} from '../src/event-helper-listen';
 import {resetExperimentTogglesForTesting} from '../src/experiments';
 import {setDefaultBootstrapBaseUrlForTesting} from '../src/3p-frame';
 import {setReportError} from '../src/log';
@@ -46,7 +44,7 @@ let consoleErrorSandbox;
 let testName;
 let expectedAsyncErrors;
 let rethrowAsyncSandbox;
-const originalConsoleError = console/*OK*/.error;
+const originalConsoleError = console /*OK*/.error;
 
 // Used to clean up global state between tests.
 let initialGlobalState;
@@ -74,7 +72,6 @@ global.AMP.extension = function(name, version, installer) {
   describes.bufferExtension(`${name}:${version}`, installer);
 };
 
-
 // Make amp section in karma config readable by tests.
 window.ampTestRuntimeConfig = parent.karma ? parent.karma.config.amp : {};
 
@@ -86,9 +83,8 @@ window.ampTestRuntimeConfig = parent.karma ? parent.karma.config.amp : {};
  * Example usages:
  * describe.configure().skipFirefox().skipSafari().run('Bla bla ...', ... );
  * it.configure().skipEdge().run('Should ...', ...);
-*/
+ */
 class TestConfig {
-
   constructor(runner) {
     this.runner = runner;
     /**
@@ -287,19 +283,22 @@ function printWarning(...messages) {
   }
 
   const errorMessage = message.split('\n', 1)[0]; // First line.
-  const helpMessage = '    The test "' + testName + '"' +
-      ' resulted in a call to console.error. (See above line.)\n' +
-      '    ⤷ If the error is not expected, fix the code that generated ' +
-          'the error.\n' +
-      '    ⤷ If the error is expected (and synchronous), use the following ' +
-          'pattern to wrap the test code that generated the error:\n' +
-      '        \'allowConsoleError(() => { <code that generated the ' +
-          'error> });\'\n' +
-      '    ⤷ If the error is expected (and asynchronous), use the ' +
-          'following pattern at the top of the test:\n' +
-      '        \'expectAsyncConsoleError(<string or regex>[, <number of' +
-      ' times the error message repeats>]);';
-  originalConsoleError(errorMessage + '\'\n' + helpMessage);
+  const helpMessage =
+    '    The test "' +
+    testName +
+    '"' +
+    ' resulted in a call to console.error. (See above line.)\n' +
+    '    ⤷ If the error is not expected, fix the code that generated ' +
+    'the error.\n' +
+    '    ⤷ If the error is expected (and synchronous), use the following ' +
+    'pattern to wrap the test code that generated the error:\n' +
+    "        'allowConsoleError(() => { <code that generated the " +
+    "error> });'\n" +
+    '    ⤷ If the error is expected (and asynchronous), use the ' +
+    'following pattern at the top of the test:\n' +
+    "        'expectAsyncConsoleError(<string or regex>[, <number of" +
+    ' times the error message repeats>]);';
+  originalConsoleError(errorMessage + "'\n" + helpMessage);
 }
 
 /**
@@ -308,12 +307,15 @@ function printWarning(...messages) {
 function warnForConsoleError() {
   expectedAsyncErrors = [];
   consoleErrorSandbox = sinon.createSandbox();
-  const consoleErrorStub =
-      consoleErrorSandbox.stub(console, 'error').callsFake(printWarning);
+  const consoleErrorStub = consoleErrorSandbox
+    .stub(console, 'error')
+    .callsFake(printWarning);
 
   self.expectAsyncConsoleError = function(message, repeat = 1) {
     expectedAsyncErrors.push.apply(
-        expectedAsyncErrors, Array(repeat).fill(message));
+      expectedAsyncErrors,
+      Array(repeat).fill(message)
+    );
   };
   self.allowConsoleError = function(func) {
     consoleErrorStub.reset();
@@ -323,8 +325,10 @@ function warnForConsoleError() {
       expect(consoleErrorStub).to.have.been.called;
     } catch (e) {
       const helpMessage =
-          'The test "' + testName + '" contains an "allowConsoleError" block ' +
-          'that didn\'t result in a call to console.error.';
+        'The test "' +
+        testName +
+        '" contains an "allowConsoleError" block ' +
+        "that didn't result in a call to console.error.";
       originalConsoleError(helpMessage);
     } finally {
       consoleErrorStub.callsFake(printWarning);
@@ -340,9 +344,13 @@ function restoreConsoleError() {
   consoleErrorSandbox.restore();
   if (expectedAsyncErrors.length > 0) {
     const helpMessage =
-        'The test "' + testName + '" called "expectAsyncConsoleError", ' +
-        'but there were no call(s) to console.error with these message(s): ' +
-        '"' + expectedAsyncErrors.join('", "') + '"';
+      'The test "' +
+      testName +
+      '" called "expectAsyncConsoleError", ' +
+      'but there were no call(s) to console.error with these message(s): ' +
+      '"' +
+      expectedAsyncErrors.join('", "') +
+      '"';
     that.test.error(new Error(helpMessage));
   }
   expectedAsyncErrors = [];
@@ -440,7 +448,7 @@ afterEach(function() {
       removeElement(element);
     } catch (e) {
       // This sometimes fails for unknown reasons.
-      console./*OK*/log(e);
+      console./*OK*/ log(e);
     }
   }
   window.localStorage.clear();
@@ -465,8 +473,10 @@ afterEach(function() {
     }
   }
   if (!/native/.test(window.setTimeout)) {
-    throw new Error('You likely forgot to restore sinon timers ' +
-        '(installed via sandbox.useFakeTimers).');
+    throw new Error(
+      'You likely forgot to restore sinon timers ' +
+        '(installed via sandbox.useFakeTimers).'
+    );
   }
   setDefaultBootstrapBaseUrlForTesting(null);
   resetAccumulatedErrorMessagesForTesting();
@@ -478,11 +488,11 @@ chai.Assertion.addMethod('attribute', function(attr) {
   const obj = this._obj;
   const tagName = obj.tagName.toLowerCase();
   this.assert(
-      obj.hasAttribute(attr),
-      'expected element \'' + tagName + '\' to have attribute #{exp}',
-      'expected element \'' + tagName + '\' to not have attribute #{act}',
-      attr,
-      attr
+    obj.hasAttribute(attr),
+    "expected element '" + tagName + "' to have attribute #{exp}",
+    "expected element '" + tagName + "' to not have attribute #{act}",
+    attr,
+    attr
   );
 });
 
@@ -490,11 +500,11 @@ chai.Assertion.addMethod('class', function(className) {
   const obj = this._obj;
   const tagName = obj.tagName.toLowerCase();
   this.assert(
-      obj.classList.contains(className),
-      'expected element \'' + tagName + '\' to have class #{exp}',
-      'expected element \'' + tagName + '\' to not have class #{act}',
-      className,
-      className
+    obj.classList.contains(className),
+    "expected element '" + tagName + "' to have class #{exp}",
+    "expected element '" + tagName + "' to not have class #{act}",
+    className,
+    className
   );
 });
 
@@ -506,14 +516,17 @@ chai.Assertion.addProperty('visible', function() {
   const isOpaque = parseInt(opacity, 10) > 0;
   const tagName = obj.tagName.toLowerCase();
   this.assert(
-      visibility === 'visible' && isOpaque,
-      'expected element \'' +
-      tagName + '\' to be #{exp}, got #{act}. with classes: ' + obj.className,
-      'expected element \'' +
-      tagName + '\' not to be #{exp}, got #{act}. with classes: ' +
+    visibility === 'visible' && isOpaque,
+    "expected element '" +
+      tagName +
+      "' to be #{exp}, got #{act}. with classes: " +
       obj.className,
-      'visible and opaque',
-      `visibility = ${visibility} and opacity = ${opacity}`
+    "expected element '" +
+      tagName +
+      "' not to be #{exp}, got #{act}. with classes: " +
+      obj.className,
+    'visible and opaque',
+    `visibility = ${visibility} and opacity = ${opacity}`
   );
 });
 
@@ -524,13 +537,17 @@ chai.Assertion.addProperty('hidden', function() {
   const opacity = computedStyle.getPropertyValue('opacity');
   const tagName = obj.tagName.toLowerCase();
   this.assert(
-      visibility === 'hidden' || parseInt(opacity, 10) == 0,
-      'expected element \'' +
-        tagName + '\' to be #{exp}, got #{act}. with classes: ' + obj.className,
-      'expected element \'' +
-        tagName + '\' not to be #{act}. with classes: ' + obj.className,
-      'hidden',
-      visibility
+    visibility === 'hidden' || parseInt(opacity, 10) == 0,
+    "expected element '" +
+      tagName +
+      "' to be #{exp}, got #{act}. with classes: " +
+      obj.className,
+    "expected element '" +
+      tagName +
+      "' not to be #{act}. with classes: " +
+      obj.className,
+    'hidden',
+    visibility
   );
 });
 
@@ -539,11 +556,11 @@ chai.Assertion.addMethod('display', function(display) {
   const value = window.getComputedStyle(obj).getPropertyValue('display');
   const tagName = obj.tagName.toLowerCase();
   this.assert(
-      value === display,
-      'expected element \'' + tagName + '\' to be display #{exp}, got #{act}.',
-      'expected element \'' + tagName + '\' not to be display #{act}.',
-      display,
-      value
+    value === display,
+    "expected element '" + tagName + "' to be display #{exp}, got #{act}.",
+    "expected element '" + tagName + "' not to be display #{act}.",
+    display,
+    value
   );
 });
 
@@ -552,10 +569,10 @@ chai.Assertion.addMethod('jsonEqual', function(compare) {
   const a = stringify(compare);
   const b = stringify(obj);
   this.assert(
-      a == b,
-      'expected JSON to be equal.\nExp: #{exp}\nAct: #{act}',
-      'expected JSON to not be equal.\nExp: #{exp}\nAct: #{act}',
-      a,
-      b
+    a == b,
+    'expected JSON to be equal.\nExp: #{exp}\nAct: #{act}',
+    'expected JSON to not be equal.\nExp: #{exp}\nAct: #{act}',
+    a,
+    b
   );
 });
diff --git a/test/e2e/test-amp-bind-brightcove.js b/test/e2e/test-amp-bind-brightcove.js
index ba4891fb0460..5f3233792620 100644
--- a/test/e2e/test-amp-bind-brightcove.js
+++ b/test/e2e/test-amp-bind-brightcove.js
@@ -14,27 +14,34 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
       'bind-brightcove.html',
-}, async env => {
-  let controller;
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  describe('with <amp-brightcove>', () => {
-    it('should support binding to data-account', async() => {
-      const button = await controller.findElement('#brightcoveButton');
-      const iframe = await controller.findElement('#brightcove iframe');
+    describe('with <amp-brightcove>', () => {
+      it('should support binding to data-account', async () => {
+        const button = await controller.findElement('#brightcoveButton');
+        const iframe = await controller.findElement('#brightcove iframe');
 
-      await expect(controller.getElementProperty(iframe, 'src'))
-          .to.not.contain('bound');
+        await expect(
+          controller.getElementProperty(iframe, 'src')
+        ).to.not.contain('bound');
 
-      await controller.click(button);
-      await expect(controller.getElementProperty(iframe, 'src'))
-          .to.contain('bound');
+        await controller.click(button);
+        await expect(controller.getElementProperty(iframe, 'src')).to.contain(
+          'bound'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-email.js b/test/e2e/test-amp-bind-email.js
index e676e502659b..8686f9060442 100644
--- a/test/e2e/test-amp-bind-email.js
+++ b/test/e2e/test-amp-bind-email.js
@@ -14,40 +14,49 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
       'bind-amp4email.html',
-}, async env => {
-  let controller;
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  // The only difference in amp4email is that URL attributes cannot be bound.
-  describe('amp4email', () => {
-    it('should NOT allow mutation of a[href]', async() => {
-      const button = await controller.findElement('#changeHrefButton');
-      const a = await controller.findElement('#anchorElement');
-
-      await expect(controller.getElementAttribute(a, 'href'))
-          .to.equal('https://foo.com');
-
-      await controller.click(button);
-      await expect(controller.getElementAttribute(a, 'href'))
-          .to.equal('https://foo.com');
+    beforeEach(async () => {
+      controller = env.controller;
     });
 
-    it('should NOT allow mutation of img[src]', async() => {
-      const button = await controller.findElement('#changeImgSrcButton');
-      const image = await controller.findElement('#image');
-
-      await expect(controller.getElementAttribute(image, 'src'))
-          .to.equal('https://foo.com/foo.jpg');
-
-      await controller.click(button);
-      await expect(controller.getElementAttribute(image, 'src'))
-          .to.equal('https://foo.com/foo.jpg');
+    // The only difference in amp4email is that URL attributes cannot be bound.
+    describe('amp4email', () => {
+      it('should NOT allow mutation of a[href]', async () => {
+        const button = await controller.findElement('#changeHrefButton');
+        const a = await controller.findElement('#anchorElement');
+
+        await expect(controller.getElementAttribute(a, 'href')).to.equal(
+          'https://foo.com'
+        );
+
+        await controller.click(button);
+        await expect(controller.getElementAttribute(a, 'href')).to.equal(
+          'https://foo.com'
+        );
+      });
+
+      it('should NOT allow mutation of img[src]', async () => {
+        const button = await controller.findElement('#changeImgSrcButton');
+        const image = await controller.findElement('#image');
+
+        await expect(controller.getElementAttribute(image, 'src')).to.equal(
+          'https://foo.com/foo.jpg'
+        );
+
+        await controller.click(button);
+        await expect(controller.getElementAttribute(image, 'src')).to.equal(
+          'https://foo.com/foo.jpg'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-form.js b/test/e2e/test-amp-bind-form.js
index df81c5e019b6..14e9db80edce 100644
--- a/test/e2e/test-amp-bind-form.js
+++ b/test/e2e/test-amp-bind-form.js
@@ -14,49 +14,58 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-form.html',
-}, async env => {
-  let controller;
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-form.html',
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  describe('with <amp-form>', () => {
-    it('should NOT allow invalid bindings or values', async function() {
-      const xhrText = await controller.findElement('#xhrText');
-      const templatedText = await controller.findElement('#templatedText');
-      const illegalHref = await controller.findElement('#illegalHref');
-      const submitButton = await controller.findElement('#submitButton');
+    describe('with <amp-form>', () => {
+      it('should NOT allow invalid bindings or values', async function() {
+        const xhrText = await controller.findElement('#xhrText');
+        const templatedText = await controller.findElement('#templatedText');
+        const illegalHref = await controller.findElement('#illegalHref');
+        const submitButton = await controller.findElement('#submitButton');
 
-      await expect(controller.getElementText(xhrText)).to.equal('');
-      await expect(controller.getElementAttribute(
-          illegalHref, 'href')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'onclick')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'onmouseover')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'style')).to.be.null;
-      await expect(controller.getElementText(templatedText)).to.equal('');
+        await expect(controller.getElementText(xhrText)).to.equal('');
+        await expect(controller.getElementAttribute(illegalHref, 'href')).to.be
+          .null;
+        await expect(controller.getElementAttribute(templatedText, 'onclick'))
+          .to.be.null;
+        await expect(
+          controller.getElementAttribute(templatedText, 'onmouseover')
+        ).to.be.null;
+        await expect(controller.getElementAttribute(templatedText, 'style')).to
+          .be.null;
+        await expect(controller.getElementText(templatedText)).to.equal('');
 
-      await controller.click(submitButton);
+        await controller.click(submitButton);
 
-      // The <amp-form> has on="submit-success:AMP.setState(...)".
+        // The <amp-form> has on="submit-success:AMP.setState(...)".
 
-      // References to XHR JSON data should work on submit-success.
-      await expect(controller.getElementText(xhrText)).to.equal('John Miller');
-      await expect(controller.getElementAttribute(
-          illegalHref, 'href')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'onclick')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'onmouseover')).to.be.null;
-      await expect(controller.getElementAttribute(
-          templatedText, 'style')).to.be.null;
-      await expect(controller.getElementText(
-          templatedText)).to.equal('textIsLegal');
+        // References to XHR JSON data should work on submit-success.
+        await expect(controller.getElementText(xhrText)).to.equal(
+          'John Miller'
+        );
+        await expect(controller.getElementAttribute(illegalHref, 'href')).to.be
+          .null;
+        await expect(controller.getElementAttribute(templatedText, 'onclick'))
+          .to.be.null;
+        await expect(
+          controller.getElementAttribute(templatedText, 'onmouseover')
+        ).to.be.null;
+        await expect(controller.getElementAttribute(templatedText, 'style')).to
+          .be.null;
+        await expect(controller.getElementText(templatedText)).to.equal(
+          'textIsLegal'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-iframe.js b/test/e2e/test-amp-bind-iframe.js
index 4db9f8244593..4807deefda91 100644
--- a/test/e2e/test-amp-bind-iframe.js
+++ b/test/e2e/test-amp-bind-iframe.js
@@ -14,33 +14,41 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
-      'bind-iframe.html',
-}, async env => {
-  let controller;
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-iframe.html',
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  describe('with <amp-iframe>', () => {
-    it('should support binding to src', async() => {
-      const button = await controller.findElement('#iframeButton');
-      const ampIframe = await controller.findElement('#ampIframe');
-      const iframe = await controller.findElement('#ampIframe iframe');
+    describe('with <amp-iframe>', () => {
+      it('should support binding to src', async () => {
+        const button = await controller.findElement('#iframeButton');
+        const ampIframe = await controller.findElement('#ampIframe');
+        const iframe = await controller.findElement('#ampIframe iframe');
 
-      const newSrc = 'https://giphy.com/embed/DKG1OhBUmxL4Q';
-      await expect(controller.getElementAttribute(ampIframe, 'src'))
-          .to.not.contain(newSrc);
-      await expect(controller.getElementProperty(iframe, 'src'))
-          .to.not.contain(newSrc);
+        const newSrc = 'https://giphy.com/embed/DKG1OhBUmxL4Q';
+        await expect(
+          controller.getElementAttribute(ampIframe, 'src')
+        ).to.not.contain(newSrc);
+        await expect(
+          controller.getElementProperty(iframe, 'src')
+        ).to.not.contain(newSrc);
 
-      await controller.click(button);
-      await expect(controller.getElementAttribute(ampIframe, 'src'))
-          .to.contain(newSrc);
-      await expect(controller.getElementProperty(iframe, 'src'))
-          .to.contain(newSrc);
+        await controller.click(button);
+        await expect(
+          controller.getElementAttribute(ampIframe, 'src')
+        ).to.contain(newSrc);
+        await expect(controller.getElementProperty(iframe, 'src')).to.contain(
+          newSrc
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-live-list.js b/test/e2e/test-amp-bind-live-list.js
index 57e2dec35eb9..ea630c552b0d 100644
--- a/test/e2e/test-amp-bind-live-list.js
+++ b/test/e2e/test-amp-bind-live-list.js
@@ -14,70 +14,89 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
       'bind-live-list.html',
-}, async env => {
-  let controller;
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  describe('with <amp-live-list>', () => {
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-    it('should detect bindings in initial live-list elements', async() => {
-      const liveListChildren = await controller.findElements(
-          '#liveListItems > *');
-      await expect(liveListChildren.length).to.equal(1);
+    describe('with <amp-live-list>', () => {
+      it('should detect bindings in initial live-list elements', async () => {
+        const liveListChildren = await controller.findElements(
+          '#liveListItems > *'
+        );
+        await expect(liveListChildren.length).to.equal(1);
 
-      const existingItem = await controller.findElement('#liveListItem1');
-      await expect(controller.getElementText(existingItem)).to.equal('unbound');
+        const existingItem = await controller.findElement('#liveListItem1');
+        await expect(controller.getElementText(existingItem)).to.equal(
+          'unbound'
+        );
 
-      const button = await controller.findElement('#changeLiveListTextButton');
-      await controller.click(button);
+        const button = await controller.findElement(
+          '#changeLiveListTextButton'
+        );
+        await controller.click(button);
 
-      const firstChild = await controller.findElement(
-          '#liveListItem1 > :first-child');
-      await expect(controller.getElementText(firstChild)).to.equal(
-          'hello world');
-    });
+        const firstChild = await controller.findElement(
+          '#liveListItem1 > :first-child'
+        );
+        await expect(controller.getElementText(firstChild)).to.equal(
+          'hello world'
+        );
+      });
 
-    // TODO(cvializ,choumx): Configure the server to send different data on the
-    // second request. A queryparam should be able to implement this.
-    it.skip('should apply scope to bindings in new list items', async() => {
-      const liveListChildren = await controller.findElements(
-          '#liveListItems > *');
-      await expect(liveListChildren.length).to.equal(1);
+      // TODO(cvializ,choumx): Configure the server to send different data on the
+      // second request. A queryparam should be able to implement this.
+      it.skip('should apply scope to bindings in new list items', async () => {
+        const liveListChildren = await controller.findElements(
+          '#liveListItems > *'
+        );
+        await expect(liveListChildren.length).to.equal(1);
 
-      const existingItem = await controller.findElement('#liveListItem1');
-      await expect(controller.getElementText(existingItem)).to.equal('unbound');
+        const existingItem = await controller.findElement('#liveListItem1');
+        await expect(controller.getElementText(existingItem)).to.equal(
+          'unbound'
+        );
 
-      // The test server should handle this
-      // const impl = liveList.implementation_;
-      // const update = document.createElement('div');
-      // update.innerHTML =
-      //     '<div items>' +
-      //     ` <div id="newItem" data-sort-time=${Date.now()}>` +
-      //     '    <p [text]="liveListText">unbound</p>' +
-      //     ' </div>' +
-      //     '</div>';
-      // impl.update(update);
+        // The test server should handle this
+        // const impl = liveList.implementation_;
+        // const update = document.createElement('div');
+        // update.innerHTML =
+        //     '<div items>' +
+        //     ` <div id="newItem" data-sort-time=${Date.now()}>` +
+        //     '    <p [text]="liveListText">unbound</p>' +
+        //     ' </div>' +
+        //     '</div>';
+        // impl.update(update);
 
-      const updateButton = await controller.findElement(
-          '#liveListUpdateButton');
-      await controller.click(updateButton);
+        const updateButton = await controller.findElement(
+          '#liveListUpdateButton'
+        );
+        await controller.click(updateButton);
 
-      await controller.findElement('#liveListItems > :nth-child(2)');
-      const newItem = controller.findElement('#newItem');
+        await controller.findElement('#liveListItems > :nth-child(2)');
+        const newItem = controller.findElement('#newItem');
 
-      const button = await controller.findElement('#changeLiveListTextButton');
-      await controller.click(button);
+        const button = await controller.findElement(
+          '#changeLiveListTextButton'
+        );
+        await controller.click(button);
 
-      await expect(controller.getElementText(existingItem))
-          .to.equal('hello world');
-      await expect(controller.getElementText(newItem))
-          .to.equal('hello world');
+        await expect(controller.getElementText(existingItem)).to.equal(
+          'hello world'
+        );
+        await expect(controller.getElementText(newItem)).to.equal(
+          'hello world'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-state.js b/test/e2e/test-amp-bind-state.js
index 770a01760a6f..310ddc0c1e6c 100644
--- a/test/e2e/test-amp-bind-state.js
+++ b/test/e2e/test-amp-bind-state.js
@@ -1,4 +1,3 @@
-
 /**
  * Copyright 2019 The AMP HTML Authors. All Rights Reserved.
  *
@@ -15,59 +14,66 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/' +
-      'bind-basic.html',
-}, async env => {
-  let controller;
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-basic.html',
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  describe('+ amp-state', () => {
-    // TODO(cvializ, choumx): Update server to have an endpoint that
-    // would test the infinite-loop blocking behavior
-    it.skip('should not loop infinitely if updates change its ' +
-        'src binding', async() => {
-      const changeAmpStateSrcButton = await controller.findElement(
-          '#changeAmpStateSrc');
-      const setState = await controller.findElement('#setState');
-      const ampState = await controller.findElement('#ampState');
+    describe('+ amp-state', () => {
+      // TODO(cvializ, choumx): Update server to have an endpoint that
+      // would test the infinite-loop blocking behavior
+      it.skip('should not loop infinitely if updates change its src binding', async () => {
+        const changeAmpStateSrcButton = await controller.findElement(
+          '#changeAmpStateSrc'
+        );
+        const setState = await controller.findElement('#setState');
+        const ampState = await controller.findElement('#ampState');
 
-      // TODO(cvializ, choumx): Replace this with a test server endpoint
-      // // Stub XHR for endpoint such that it returns state that would
-      // // point the amp-state element back to its original source.
-      // sandbox.stub(batchedXhr, 'fetchJson')
-      //     .withArgs(
-      //         'https://www.google.com/bind/second/source', sinon.match.any)
-      //     .returns(Promise.resolve({
-      //       json() {
-      //         return Promise.resolve({
-      //           stateSrc: 'https://www.google.com/bind/first/source',
-      //         });
-      //       },
-      //     }));
-      // // Changes amp-state's src from
-      // // .../first/source to .../second/source.
+        // TODO(cvializ, choumx): Replace this with a test server endpoint
+        // // Stub XHR for endpoint such that it returns state that would
+        // // point the amp-state element back to its original source.
+        // sandbox.stub(batchedXhr, 'fetchJson')
+        //     .withArgs(
+        //         'https://www.google.com/bind/second/source', sinon.match.any)
+        //     .returns(Promise.resolve({
+        //       json() {
+        //         return Promise.resolve({
+        //           stateSrc: 'https://www.google.com/bind/first/source',
+        //         });
+        //       },
+        //     }));
+        // // Changes amp-state's src from
+        // // .../first/source to .../second/source.
 
-      await expect(controller.getElementAttribute(ampState, 'src'))
-          .to.equal('https://www.google.com/bind/first/source');
+        await expect(controller.getElementAttribute(ampState, 'src')).to.equal(
+          'https://www.google.com/bind/first/source'
+        );
 
-      await controller.click(changeAmpStateSrcButton);
-      // bind applications caused by an amp-state mutation SHOULD NOT
-      // update src attributes on amp-state elements.
-      await expect(controller.getElementAttribute(ampState, 'src'))
-          .to.not.equal('https://www.google.com/bind/first/source');
-      await expect(controller.getElementAttribute(ampState, 'src'))
-          .to.equal('https://www.google.com/bind/second/source');
+        await controller.click(changeAmpStateSrcButton);
+        // bind applications caused by an amp-state mutation SHOULD NOT
+        // update src attributes on amp-state elements.
+        await expect(
+          controller.getElementAttribute(ampState, 'src')
+        ).to.not.equal('https://www.google.com/bind/first/source');
+        await expect(controller.getElementAttribute(ampState, 'src')).to.equal(
+          'https://www.google.com/bind/second/source'
+        );
 
-      await controller.click(setState);
-      // Now that a non-amp-state mutation has ocurred, the
-      // amp-state's src attribute can be updated with the new
-      // src from the XHR.
-      await expect(controller.getElementAttribute(ampState, 'src'))
-          .to.equal('https://www.google.com/bind/first/source');
+        await controller.click(setState);
+        // Now that a non-amp-state mutation has ocurred, the
+        // amp-state's src attribute can be updated with the new
+        // src from the XHR.
+        await expect(controller.getElementAttribute(ampState, 'src')).to.equal(
+          'https://www.google.com/bind/first/source'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-video.js b/test/e2e/test-amp-bind-video.js
index 9952ccdc198e..241d6fdd6625 100644
--- a/test/e2e/test-amp-bind-video.js
+++ b/test/e2e/test-amp-bind-video.js
@@ -14,82 +14,95 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-video.html',
-}, async env => {
-  let controller;
-
-  beforeEach(async() => {
-    controller = env.controller;
-  });
-
-  describe('with <amp-video>', () => {
-    it('should support binding to src', async() => {
-      const button = await controller.findElement('#changeVidSrcButton');
-      const video = await controller.findElement('#video');
-
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/unbound.webm');
-
-      await controller.click(button);
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/bound.webm');
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-video.html',
+  },
+  async env => {
+    let controller;
+
+    beforeEach(async () => {
+      controller = env.controller;
     });
 
-    it('should NOT change src when new value is a blocked URL', async() => {
-      const button = await controller.findElement('#disallowedVidUrlButton');
-      const video = await controller.findElement('#video');
-
-
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/unbound.webm');
-
-      await controller.click(button);
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/unbound.webm');
-    });
-
-    it('should NOT change src when new value uses an ' +
-        'invalid protocol', async() => {
-      const button = await controller.findElement('#httpVidSrcButton');
-      const video = await controller.findElement('#video');
-
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/unbound.webm');
-
-      await controller.click(button);
-      // Only HTTPS is allowed
-      await expect(controller.getElementAttribute(video, 'src')).to.equal(
-          'https://www.google.com/unbound.webm');
-    });
-
-    it('should change alt when the alt attribute binding changes', async() => {
-      const button = await controller.findElement('#changeVidAltButton');
-      const video = await controller.findElement('#video');
-
-      await expect(controller.getElementAttribute(video, 'alt')).to.equal(
-          'unbound');
-
-      await controller.click(button);
-      await expect(controller.getElementAttribute(video, 'alt')).to.equal(
-          'hello world');
-    });
-
-    it('should show/hide vid controls when the control ' +
-        'binding changes', async() => {
-      const showButton = await controller.findElement('#showVidControlsButton');
-      const hideButton = await controller.findElement('#hideVidControlsButton');
-      const video = await controller.findElement('#video');
-      await expect(controller.getElementAttribute(video, 'controls'))
-          .to.be.null;
-
-      await controller.click(showButton);
-      await expect(controller.getElementAttribute(video, 'controls'))
-          .to.not.be.null;
-
-      await controller.click(hideButton);
-      await expect(controller.getElementAttribute(video, 'controls'))
-          .to.be.null;
+    describe('with <amp-video>', () => {
+      it('should support binding to src', async () => {
+        const button = await controller.findElement('#changeVidSrcButton');
+        const video = await controller.findElement('#video');
+
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/unbound.webm'
+        );
+
+        await controller.click(button);
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/bound.webm'
+        );
+      });
+
+      it('should NOT change src when new value is a blocked URL', async () => {
+        const button = await controller.findElement('#disallowedVidUrlButton');
+        const video = await controller.findElement('#video');
+
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/unbound.webm'
+        );
+
+        await controller.click(button);
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/unbound.webm'
+        );
+      });
+
+      it('should NOT change src when new value uses an invalid protocol', async () => {
+        const button = await controller.findElement('#httpVidSrcButton');
+        const video = await controller.findElement('#video');
+
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/unbound.webm'
+        );
+
+        await controller.click(button);
+        // Only HTTPS is allowed
+        await expect(controller.getElementAttribute(video, 'src')).to.equal(
+          'https://www.google.com/unbound.webm'
+        );
+      });
+
+      it('should change alt when the alt attribute binding changes', async () => {
+        const button = await controller.findElement('#changeVidAltButton');
+        const video = await controller.findElement('#video');
+
+        await expect(controller.getElementAttribute(video, 'alt')).to.equal(
+          'unbound'
+        );
+
+        await controller.click(button);
+        await expect(controller.getElementAttribute(video, 'alt')).to.equal(
+          'hello world'
+        );
+      });
+
+      it('should show/hide vid controls when the control binding changes', async () => {
+        const showButton = await controller.findElement(
+          '#showVidControlsButton'
+        );
+        const hideButton = await controller.findElement(
+          '#hideVidControlsButton'
+        );
+        const video = await controller.findElement('#video');
+        await expect(controller.getElementAttribute(video, 'controls')).to.be
+          .null;
+
+        await controller.click(showButton);
+        await expect(controller.getElementAttribute(video, 'controls')).to.not
+          .be.null;
+
+        await controller.click(hideButton);
+        await expect(controller.getElementAttribute(video, 'controls')).to.be
+          .null;
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/e2e/test-amp-bind-youtube.js b/test/e2e/test-amp-bind-youtube.js
index 20543cf04856..5c82b0b8cfc2 100644
--- a/test/e2e/test-amp-bind-youtube.js
+++ b/test/e2e/test-amp-bind-youtube.js
@@ -14,25 +14,32 @@
  * limitations under the License.
  */
 
-describes.endtoend('amp-bind', {
-  testUrl: 'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-youtube.html',
-}, async env => {
-  let controller;
+describes.endtoend(
+  'amp-bind',
+  {
+    testUrl:
+      'http://localhost:8000/test/fixtures/e2e/amp-bind/bind-youtube.html',
+  },
+  async env => {
+    let controller;
 
-  beforeEach(async() => {
-    controller = env.controller;
-  });
+    beforeEach(async () => {
+      controller = env.controller;
+    });
 
-  describe('with <amp-youtube>', () => {
-    it('should support binding to data-video-id', async() => {
-      const button = await controller.findElement('#youtubeButton');
-      const yt = await controller.findElement('#youtube');
-      await expect(controller.getElementAttribute(yt, 'data-videoid'))
-          .to.equal('unbound');
+    describe('with <amp-youtube>', () => {
+      it('should support binding to data-video-id', async () => {
+        const button = await controller.findElement('#youtubeButton');
+        const yt = await controller.findElement('#youtube');
+        await expect(
+          controller.getElementAttribute(yt, 'data-videoid')
+        ).to.equal('unbound');
 
-      await controller.click(button);
-      await expect(controller.getElementAttribute(yt, 'data-videoid'))
-          .to.equal('bound');
+        await controller.click(button);
+        await expect(
+          controller.getElementAttribute(yt, 'data-videoid')
+        ).to.equal('bound');
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/integration/test-3p-frame.js b/test/integration/test-3p-frame.js
index a1aef3a97cf2..8fe941b393fe 100644
--- a/test/integration/test-3p-frame.js
+++ b/test/integration/test-3p-frame.js
@@ -36,165 +36,178 @@ import {loadPromise} from '../../src/event-helper';
 import {preconnectForElement} from '../../src/preconnect';
 import {toggleExperiment} from '../../src/experiments';
 
-describe.configure().ifChrome().run('3p-frame', () => {
-
-  let clock;
-  let sandbox;
-  let container;
-  let preconnect;
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
-    clock = sandbox.useFakeTimers();
-    container = document.createElement('div');
-    document.body.appendChild(container);
-    preconnect = preconnectForElement(container);
-  });
+describe
+  .configure()
+  .ifChrome()
+  .run('3p-frame', () => {
+    let clock;
+    let sandbox;
+    let container;
+    let preconnect;
+
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
+      clock = sandbox.useFakeTimers();
+      container = document.createElement('div');
+      document.body.appendChild(container);
+      preconnect = preconnectForElement(container);
+    });
+
+    afterEach(() => {
+      resetBootstrapBaseUrlForTesting(window);
+      sandbox.restore();
+      resetCountForTesting();
+      const m = document.querySelector('[name="amp-3p-iframe-src"]');
+      if (m) {
+        m.parentElement.removeChild(m);
+      }
+      document.body.removeChild(container);
+    });
 
-  afterEach(() => {
-    resetBootstrapBaseUrlForTesting(window);
-    sandbox.restore();
-    resetCountForTesting();
-    const m = document.querySelector(
-        '[name="amp-3p-iframe-src"]');
-    if (m) {
-      m.parentElement.removeChild(m);
+    function addCustomBootstrap(url) {
+      const meta = document.createElement('meta');
+      meta.setAttribute('name', 'amp-3p-iframe-src');
+      meta.setAttribute('content', url);
+      document.head.appendChild(meta);
     }
-    document.body.removeChild(container);
-  });
 
-  function addCustomBootstrap(url) {
-    const meta = document.createElement('meta');
-    meta.setAttribute('name', 'amp-3p-iframe-src');
-    meta.setAttribute('content', url);
-    document.head.appendChild(meta);
-  }
-
-  function setupElementFunctions(div) {
-    const {innerWidth: width, innerHeight: height} = window;
-    div.getIntersectionChangeEntry = function() {
-      return {
-        time: 1234567888,
-        rootBounds: {
+    function setupElementFunctions(div) {
+      const {innerWidth: width, innerHeight: height} = window;
+      div.getIntersectionChangeEntry = function() {
+        return {
+          time: 1234567888,
+          rootBounds: {
+            left: 0,
+            top: 0,
+            width,
+            height,
+            bottom: height,
+            right: width,
+            x: 0,
+            y: 0,
+          },
+          boundingClientRect: {
+            width: 100,
+            height: 200,
+          },
+          intersectionRect: {
+            left: 0,
+            top: 0,
+            width: 0,
+            height: 0,
+            bottom: 0,
+            right: 0,
+            x: 0,
+            y: 0,
+          },
+        };
+      };
+      div.getPageLayoutBox = function() {
+        return {
           left: 0,
           top: 0,
-          width,
-          height,
-          bottom: height,
-          right: width,
-          x: 0,
-          y: 0,
-        },
-        boundingClientRect: {
           width: 100,
           height: 200,
-        },
-        intersectionRect: {
-          left: 0,
-          top: 0,
-          width: 0,
-          height: 0,
-          bottom: 0,
-          right: 0,
-          x: 0,
-          y: 0,
-        },
+        };
       };
-    };
-    div.getPageLayoutBox = function() {
-      return {
-        left: 0,
-        top: 0,
-        width: 100,
-        height: 200,
-      };
-    };
-  }
-
-  it('add attributes', () => {
-    const div = document.createElement('div');
-    div.setAttribute('data-foo-bar', 'foobar');
-    div.setAttribute('data-hello', 'world');
-    div.setAttribute('foo-bar', 'nope');
-    div.setAttribute('data-vars-hello', 'nope');
-    let obj = {};
-    addDataAndJsonAttributes_(div, obj);
-    expect(obj).to.deep.equal({
-      'fooBar': 'foobar',
-      'hello': 'world',
-    });
-
-    div.setAttribute('json', '{"abc": [1,2,3]}');
-
-    obj = {};
-    addDataAndJsonAttributes_(div, obj);
-    expect(obj).to.deep.equal({
-      'fooBar': 'foobar',
-      'hello': 'world',
-      'abc': [1, 2, 3],
+    }
+
+    it('add attributes', () => {
+      const div = document.createElement('div');
+      div.setAttribute('data-foo-bar', 'foobar');
+      div.setAttribute('data-hello', 'world');
+      div.setAttribute('foo-bar', 'nope');
+      div.setAttribute('data-vars-hello', 'nope');
+      let obj = {};
+      addDataAndJsonAttributes_(div, obj);
+      expect(obj).to.deep.equal({
+        'fooBar': 'foobar',
+        'hello': 'world',
+      });
+
+      div.setAttribute('json', '{"abc": [1,2,3]}');
+
+      obj = {};
+      addDataAndJsonAttributes_(div, obj);
+      expect(obj).to.deep.equal({
+        'fooBar': 'foobar',
+        'hello': 'world',
+        'abc': [1, 2, 3],
+      });
     });
-  });
 
-  // TODO(bradfrizzell) break this out into a test-iframe-attributes
-  it.skip('should create an iframe', () => {
-    window.AMP_MODE = {
-      localDev: true,
-      development: false,
-      minified: false,
-      test: false,
-      version: '$internalRuntimeVersion$',
-    };
-    toggleExperiment(window, 'exp-a', true);
-    toggleExperiment(window, 'exp-b', true);
-    clock.tick(1234567888);
-    const link = document.createElement('link');
-    link.setAttribute('rel', 'canonical');
-    link.setAttribute('href', 'https://foo.bar/baz');
-    document.head.appendChild(link);
-
-    const div = document.createElement('my-element');
-    div.setAttribute('data-test-attr', 'value');
-    div.setAttribute('data-ping', 'pong');
-    div.setAttribute('width', '50');
-    div.setAttribute('height', '100');
-
-    const {innerWidth: width, innerHeight: height} = window;
-    setupElementFunctions(div);
-
-    const viewer = Services.viewerForDoc(window.document);
-    const viewerMock = sandbox.mock(viewer);
-    viewerMock.expects('getUnconfirmedReferrerUrl')
+    // TODO(bradfrizzell) break this out into a test-iframe-attributes
+    it.skip('should create an iframe', () => {
+      window.AMP_MODE = {
+        localDev: true,
+        development: false,
+        minified: false,
+        test: false,
+        version: '$internalRuntimeVersion$',
+      };
+      toggleExperiment(window, 'exp-a', true);
+      toggleExperiment(window, 'exp-b', true);
+      clock.tick(1234567888);
+      const link = document.createElement('link');
+      link.setAttribute('rel', 'canonical');
+      link.setAttribute('href', 'https://foo.bar/baz');
+      document.head.appendChild(link);
+
+      const div = document.createElement('my-element');
+      div.setAttribute('data-test-attr', 'value');
+      div.setAttribute('data-ping', 'pong');
+      div.setAttribute('width', '50');
+      div.setAttribute('height', '100');
+
+      const {innerWidth: width, innerHeight: height} = window;
+      setupElementFunctions(div);
+
+      const viewer = Services.viewerForDoc(window.document);
+      const viewerMock = sandbox.mock(viewer);
+      viewerMock
+        .expects('getUnconfirmedReferrerUrl')
         .returns('http://acme.org/')
         .once();
 
-    container.appendChild(div);
-
-    sandbox.stub(DomFingerprint, 'generate').callsFake(
-        () => 'MY-MOCK-FINGERPRINT');
-
-    const iframe = getIframe(window, div, '_ping_', {clientId: 'cidValue'});
-    const {src} = iframe;
-    const locationHref = location.href;
-    expect(locationHref).to.not.be.empty;
-    const docInfo = Services.documentInfoForDoc(window.document);
-    expect(docInfo.pageViewId).to.not.be.empty;
-    const name = JSON.parse(decodeURIComponent(iframe.name));
-    const sentinel = name.attributes._context['sentinel'];
-    const fragment =
+      container.appendChild(div);
+
+      sandbox
+        .stub(DomFingerprint, 'generate')
+        .callsFake(() => 'MY-MOCK-FINGERPRINT');
+
+      const iframe = getIframe(window, div, '_ping_', {clientId: 'cidValue'});
+      const {src} = iframe;
+      const locationHref = location.href;
+      expect(locationHref).to.not.be.empty;
+      const docInfo = Services.documentInfoForDoc(window.document);
+      expect(docInfo.pageViewId).to.not.be.empty;
+      const name = JSON.parse(decodeURIComponent(iframe.name));
+      const sentinel = name.attributes._context['sentinel'];
+      const fragment =
         '{"testAttr":"value","ping":"pong","width":50,"height":100,' +
         '"type":"_ping_",' +
         '"_context":{"referrer":"http://acme.org/",' +
         '"ampcontextVersion": "$internalRuntimeVersion$",' +
         '"ampcontextFilepath": "https://3p.ampproject.net/' +
         '$internalRuntimeVersion$/ampcontext-v0.js",' +
-        '"canonicalUrl":"' + docInfo.canonicalUrl + '",' +
-        '"sourceUrl":"' + locationHref + '",' +
-        '"pageViewId":"' + docInfo.pageViewId + '","clientId":"cidValue",' +
+        '"canonicalUrl":"' +
+        docInfo.canonicalUrl +
+        '",' +
+        '"sourceUrl":"' +
+        locationHref +
+        '",' +
+        '"pageViewId":"' +
+        docInfo.pageViewId +
+        '","clientId":"cidValue",' +
         '"initialLayoutRect": ' +
-        JSON.stringify(div.getPageLayoutBox()) + ',' +
+        JSON.stringify(div.getPageLayoutBox()) +
+        ',' +
         '"initialIntersection": ' +
-        JSON.stringify(div.getIntersectionChangeEntry()) + ',' +
-        '"location":{"href":"' + locationHref + '"},"tagName":"MY-ELEMENT",' +
+        JSON.stringify(div.getIntersectionChangeEntry()) +
+        ',' +
+        '"location":{"href":"' +
+        locationHref +
+        '"},"tagName":"MY-ELEMENT",' +
         '"mode":{"localDev":true,"development":false,"minified":false,' +
         '"test":false,"version":"$internalRuntimeVersion$"}' +
         ',"canary":true' +
@@ -204,412 +217,455 @@ describe.configure().ifChrome().run('3p-frame', () => {
         ',"domFingerprint":"1725030182"' +
         ',"startTime":1234567888' +
         ',"experimentToggles":{"exp-a":true,"exp-b":true}' +
-        ',"sentinel":"' + sentinel + '"' +
+        ',"sentinel":"' +
+        sentinel +
+        '"' +
         ',"initialIntersection":{"time":1234567888,' +
-        '"rootBounds":{"left":0,"top":0,"width":' + width + ',"height":' +
-        height + ',"bottom":' + height + ',"right":' + width +
+        '"rootBounds":{"left":0,"top":0,"width":' +
+        width +
+        ',"height":' +
+        height +
+        ',"bottom":' +
+        height +
+        ',"right":' +
+        width +
         ',"x":0,"y":0},"boundingClientRect":' +
         '{"width":100,"height":200},"intersectionRect":{' +
         '"left":0,"top":0,"width":0,"height":0,"bottom":0,' +
         '"right":0,"x":0,"y":0}}}}';
-    expect(src).to.equal(
-        'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-    const parsedFragment = JSON.parse(fragment);
-    // Since DOM fingerprint changes between browsers and documents, to have
-    // stable tests, we can only verify its existence.
-    expect(name.attributes._context.domFingerprint).to.exist;
-    delete name.attributes._context.domFingerprint;
-    delete parsedFragment._context.domFingerprint;
-    // Value changes between tests.
-    // TODO: Switch test to isolated window.
-    expect(name.attributes._context.experimentToggles).to.exist;
-    delete name.attributes._context.experimentToggles;
-    delete parsedFragment._context.experimentToggles;
-    expect(name.attributes).to.deep.jsonEqual(parsedFragment);
-
-    // Switch to same origin for inner tests.
-    iframe.src = '/dist.3p/current/frame.max.html';
-    document.body.appendChild(iframe);
-    return loadPromise(iframe).then(() => {
-      const win = iframe.contentWindow;
-      expect(win.context.canonicalUrl).to.equal(docInfo.canonicalUrl);
-      expect(win.context.domFingerprint).to.equal('MY-MOCK-FINGERPRINT');
-      expect(win.context.sourceUrl).to.equal(locationHref);
-      expect(win.context.location.href).to.equal(locationHref);
-      expect(win.context.location.origin).to.equal('http://localhost:9876');
-      expect(win.context.pageViewId).to.equal(docInfo.pageViewId);
-      expect(win.context.referrer).to.equal('http://acme.org/');
-      expect(win.context.data.testAttr).to.equal('value');
-      expect(win.context.noContentAvailable).to.be.a('function');
-      expect(win.context.observeIntersection).to.be.a('function');
-      expect(win.context.reportRenderedEntityIdentifier).to.be.a('function');
-      const c = win.document.getElementById('c');
-      expect(c).to.not.be.null;
-      expect(c.textContent).to.contain('pong');
-      expect(win.context.data).to.have.property('ping', 'pong');
-      expect(win.context.data).to.have.property('testAttr', 'value');
-      document.head.removeChild(link);
+      expect(src).to.equal(
+        'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+      );
+      const parsedFragment = JSON.parse(fragment);
+      // Since DOM fingerprint changes between browsers and documents, to have
+      // stable tests, we can only verify its existence.
+      expect(name.attributes._context.domFingerprint).to.exist;
+      delete name.attributes._context.domFingerprint;
+      delete parsedFragment._context.domFingerprint;
+      // Value changes between tests.
+      // TODO: Switch test to isolated window.
+      expect(name.attributes._context.experimentToggles).to.exist;
+      delete name.attributes._context.experimentToggles;
+      delete parsedFragment._context.experimentToggles;
+      expect(name.attributes).to.deep.jsonEqual(parsedFragment);
+
+      // Switch to same origin for inner tests.
+      iframe.src = '/dist.3p/current/frame.max.html';
+      document.body.appendChild(iframe);
+      return loadPromise(iframe).then(() => {
+        const win = iframe.contentWindow;
+        expect(win.context.canonicalUrl).to.equal(docInfo.canonicalUrl);
+        expect(win.context.domFingerprint).to.equal('MY-MOCK-FINGERPRINT');
+        expect(win.context.sourceUrl).to.equal(locationHref);
+        expect(win.context.location.href).to.equal(locationHref);
+        expect(win.context.location.origin).to.equal('http://localhost:9876');
+        expect(win.context.pageViewId).to.equal(docInfo.pageViewId);
+        expect(win.context.referrer).to.equal('http://acme.org/');
+        expect(win.context.data.testAttr).to.equal('value');
+        expect(win.context.noContentAvailable).to.be.a('function');
+        expect(win.context.observeIntersection).to.be.a('function');
+        expect(win.context.reportRenderedEntityIdentifier).to.be.a('function');
+        const c = win.document.getElementById('c');
+        expect(c).to.not.be.null;
+        expect(c.textContent).to.contain('pong');
+        expect(win.context.data).to.have.property('ping', 'pong');
+        expect(win.context.data).to.have.property('testAttr', 'value');
+        document.head.removeChild(link);
+      });
     });
-  });
 
-  it('should copy attributes to iframe', () => {
-    const div = document.createElement('my-element');
-    div.setAttribute('width', '50');
-    div.setAttribute('height', '100');
-    div.setAttribute('title', 'a_title');
-    div.setAttribute('not_whitelisted', 'shouldnt_be_in_iframe');
-    setupElementFunctions(div);
+    it('should copy attributes to iframe', () => {
+      const div = document.createElement('my-element');
+      div.setAttribute('width', '50');
+      div.setAttribute('height', '100');
+      div.setAttribute('title', 'a_title');
+      div.setAttribute('not_whitelisted', 'shouldnt_be_in_iframe');
+      setupElementFunctions(div);
 
-    container.appendChild(div);
+      container.appendChild(div);
 
-    const iframe = getIframe(window, div, 'none');
+      const iframe = getIframe(window, div, 'none');
 
-    expect(iframe.width).to.equal('50');
-    expect(iframe.height).to.equal('100');
-    expect(iframe.title).to.equal('a_title');
-    expect(iframe.not_whitelisted).to.equal(undefined);
-  });
+      expect(iframe.width).to.equal('50');
+      expect(iframe.height).to.equal('100');
+      expect(iframe.title).to.equal('a_title');
+      expect(iframe.not_whitelisted).to.equal(undefined);
+    });
 
-  it('should not set feature policy for sync-xhr with exp off', () => {
-    const div = document.createElement('my-element');
-    setupElementFunctions(div);
-    container.appendChild(div);
-    const iframe = getIframe(window, div, 'none');
-    expect(iframe.getAttribute('allow')).to.equal(null);
-  });
+    it('should not set feature policy for sync-xhr with exp off', () => {
+      const div = document.createElement('my-element');
+      setupElementFunctions(div);
+      container.appendChild(div);
+      const iframe = getIframe(window, div, 'none');
+      expect(iframe.getAttribute('allow')).to.equal(null);
+    });
 
-  it('should set feature policy for sync-xhr with exp on', () => {
-    toggleExperiment(window, 'no-sync-xhr-in-ads', true);
-    const div = document.createElement('my-element');
-    setupElementFunctions(div);
-    container.appendChild(div);
-    const iframe = getIframe(window, div, 'none');
-    expect(iframe.getAttribute('allow')).to.equal('sync-xhr \'none\';');
-  });
+    it('should set feature policy for sync-xhr with exp on', () => {
+      toggleExperiment(window, 'no-sync-xhr-in-ads', true);
+      const div = document.createElement('my-element');
+      setupElementFunctions(div);
+      container.appendChild(div);
+      const iframe = getIframe(window, div, 'none');
+      expect(iframe.getAttribute('allow')).to.equal("sync-xhr 'none';");
+    });
 
-  it('should not set sandbox with sandbox-ads off', () => {
-    const div = document.createElement('my-element');
-    setupElementFunctions(div);
-    container.appendChild(div);
-    const iframe = getIframe(window, div, 'none');
-    expect(iframe.getAttribute('sandbox')).to.equal(null);
-  });
+    it('should not set sandbox with sandbox-ads off', () => {
+      const div = document.createElement('my-element');
+      setupElementFunctions(div);
+      container.appendChild(div);
+      const iframe = getIframe(window, div, 'none');
+      expect(iframe.getAttribute('sandbox')).to.equal(null);
+    });
 
-  it('should set sandbox with sandbox-ads on', () => {
-    toggleExperiment(window, 'sandbox-ads', true);
-    const div = document.createElement('my-element');
-    setupElementFunctions(div);
-    container.appendChild(div);
-    const iframe = getIframe(window, div, 'none');
-    expect(iframe.getAttribute('sandbox')).to.equal(
+    it('should set sandbox with sandbox-ads on', () => {
+      toggleExperiment(window, 'sandbox-ads', true);
+      const div = document.createElement('my-element');
+      setupElementFunctions(div);
+      container.appendChild(div);
+      const iframe = getIframe(window, div, 'none');
+      expect(iframe.getAttribute('sandbox')).to.equal(
         'allow-top-navigation-by-user-activation ' +
-        'allow-popups-to-escape-sandbox allow-forms ' +
-        'allow-modals allow-pointer-lock allow-popups allow-same-origin ' +
-        'allow-scripts');
-  });
+          'allow-popups-to-escape-sandbox allow-forms ' +
+          'allow-modals allow-pointer-lock allow-popups allow-same-origin ' +
+          'allow-scripts'
+      );
+    });
 
-  it('should set sandbox (direct call)', () => {
-    const iframe = document.createElement('iframe');
-    applySandbox(iframe);
-    expect(iframe.getAttribute('sandbox')).to.equal(
+    it('should set sandbox (direct call)', () => {
+      const iframe = document.createElement('iframe');
+      applySandbox(iframe);
+      expect(iframe.getAttribute('sandbox')).to.equal(
         'allow-top-navigation-by-user-activation ' +
-        'allow-popups-to-escape-sandbox allow-forms ' +
-        'allow-modals allow-pointer-lock allow-popups allow-same-origin ' +
-        'allow-scripts');
-  });
+          'allow-popups-to-escape-sandbox allow-forms ' +
+          'allow-modals allow-pointer-lock allow-popups allow-same-origin ' +
+          'allow-scripts'
+      );
+    });
 
-  it('should not set sandbox without feature detection', () => {
-    const iframe = document.createElement('iframe');
-    iframe.sandbox.supports = null;
-    applySandbox(iframe);
-    expect(iframe.getAttribute('sandbox')).to.equal(null);
-  });
+    it('should not set sandbox without feature detection', () => {
+      const iframe = document.createElement('iframe');
+      iframe.sandbox.supports = null;
+      applySandbox(iframe);
+      expect(iframe.getAttribute('sandbox')).to.equal(null);
+    });
 
-  it('should not set sandbox with failing feature detection', () => {
-    const iframe = document.createElement('iframe');
-    iframe.sandbox.supports = function(flag) {
-      return flag != 'allow-top-navigation-by-user-activation';
-    };
-    applySandbox(iframe);
-    expect(iframe.getAttribute('sandbox')).to.equal(null);
-  });
+    it('should not set sandbox with failing feature detection', () => {
+      const iframe = document.createElement('iframe');
+      iframe.sandbox.supports = function(flag) {
+        return flag != 'allow-top-navigation-by-user-activation';
+      };
+      applySandbox(iframe);
+      expect(iframe.getAttribute('sandbox')).to.equal(null);
+    });
 
-  it('should pick the right bootstrap url for local-dev mode', () => {
-    window.AMP_MODE = {localDev: true};
-    expect(getBootstrapBaseUrl(window)).to.equal(
-        'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-  });
+    it('should pick the right bootstrap url for local-dev mode', () => {
+      window.AMP_MODE = {localDev: true};
+      expect(getBootstrapBaseUrl(window)).to.equal(
+        'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+      );
+    });
 
-  it('should pick the right bootstrap url for testing mode', () => {
-    window.AMP_MODE = {test: true};
-    expect(getBootstrapBaseUrl(window)).to.equal(
-        'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-  });
+    it('should pick the right bootstrap url for testing mode', () => {
+      window.AMP_MODE = {test: true};
+      expect(getBootstrapBaseUrl(window)).to.equal(
+        'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+      );
+    });
 
-  it('should pick the right bootstrap unique url (prod)', () => {
-    window.AMP_MODE = {};
-    expect(getBootstrapBaseUrl(window)).to.match(
-        /^https:\/\/d-\d+\.ampproject\.net\/\$\internal\w+\$\/frame\.html$/);
-  });
+    it('should pick the right bootstrap unique url (prod)', () => {
+      window.AMP_MODE = {};
+      expect(getBootstrapBaseUrl(window)).to.match(
+        /^https:\/\/d-\d+\.ampproject\.net\/\$\internal\w+\$\/frame\.html$/
+      );
+    });
 
-  it('should return a stable URL in getBootstrapBaseUrl', () => {
-    window.AMP_MODE = {};
-    expect(getBootstrapBaseUrl(window)).to.equal(getBootstrapBaseUrl(window));
-  });
+    it('should return a stable URL in getBootstrapBaseUrl', () => {
+      window.AMP_MODE = {};
+      expect(getBootstrapBaseUrl(window)).to.equal(getBootstrapBaseUrl(window));
+    });
 
-  it('should return a stable URL in getDefaultBootstrapBaseUrl', () => {
-    window.AMP_MODE = {};
-    expect(getDefaultBootstrapBaseUrl(window)).to.equal(
-        getDefaultBootstrapBaseUrl(window));
-  });
+    it('should return a stable URL in getDefaultBootstrapBaseUrl', () => {
+      window.AMP_MODE = {};
+      expect(getDefaultBootstrapBaseUrl(window)).to.equal(
+        getDefaultBootstrapBaseUrl(window)
+      );
+    });
 
-  it('should pick the right bootstrap url (custom)', () => {
-    addCustomBootstrap('https://example.com/boot/remote.html');
-    expect(getBootstrapBaseUrl(window)).to.equal(
-        'https://example.com/boot/remote.html?$internalRuntimeVersion$');
-  });
+    it('should pick the right bootstrap url (custom)', () => {
+      addCustomBootstrap('https://example.com/boot/remote.html');
+      expect(getBootstrapBaseUrl(window)).to.equal(
+        'https://example.com/boot/remote.html?$internalRuntimeVersion$'
+      );
+    });
 
-  it('should return different values for different file names', () => {
-    window.AMP_MODE = {};
-    let match =
-        /^https:\/\/(d-\d+\.ampproject\.net)\/\$\internal\w+\$\/frame\.html$/
-            .exec(getDefaultBootstrapBaseUrl(window));
-    const domain = match && match[1];
-    expect(domain).to.be.ok;
-    match =
-        /^https:\/\/(d-\d+\.ampproject\.net)\/\$\internal\w+\$\/frame2\.html$/
-            .exec(getDefaultBootstrapBaseUrl(window, 'frame2'));
-    expect(match && match[1]).to.equal(domain);
-  });
+    it('should return different values for different file names', () => {
+      window.AMP_MODE = {};
+      let match = /^https:\/\/(d-\d+\.ampproject\.net)\/\$\internal\w+\$\/frame\.html$/.exec(
+        getDefaultBootstrapBaseUrl(window)
+      );
+      const domain = match && match[1];
+      expect(domain).to.be.ok;
+      match = /^https:\/\/(d-\d+\.ampproject\.net)\/\$\internal\w+\$\/frame2\.html$/.exec(
+        getDefaultBootstrapBaseUrl(window, 'frame2')
+      );
+      expect(match && match[1]).to.equal(domain);
+    });
 
-  it('should pick the right bootstrap url (custom)', () => {
-    addCustomBootstrap('http://example.com/boot/remote.html');
-    allowConsoleError(() => { expect(() => {
-      getBootstrapBaseUrl(window);
-    }).to.throw(/meta source must start with "https/); });
-  });
+    it('should pick the right bootstrap url (custom)', () => {
+      addCustomBootstrap('http://example.com/boot/remote.html');
+      allowConsoleError(() => {
+        expect(() => {
+          getBootstrapBaseUrl(window);
+        }).to.throw(/meta source must start with "https/);
+      });
+    });
 
-  it('should pick the right bootstrap url (custom)', () => {
-    addCustomBootstrap('http://localhost:9876/boot/remote.html');
-    allowConsoleError(() => { expect(() => {
-      getBootstrapBaseUrl(window, true);
-    }).to.throw(/must not be on the same origin as the/); });
-  });
+    it('should pick the right bootstrap url (custom)', () => {
+      addCustomBootstrap('http://localhost:9876/boot/remote.html');
+      allowConsoleError(() => {
+        expect(() => {
+          getBootstrapBaseUrl(window, true);
+        }).to.throw(/must not be on the same origin as the/);
+      });
+    });
 
-  it('should pick default url if custom disabled', () => {
-    addCustomBootstrap('http://localhost:9876/boot/remote.html');
-    expect(getBootstrapBaseUrl(window, true, true)).to.equal(
-        'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-  });
+    it('should pick default url if custom disabled', () => {
+      addCustomBootstrap('http://localhost:9876/boot/remote.html');
+      expect(getBootstrapBaseUrl(window, true, true)).to.equal(
+        'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+      );
+    });
 
-  it('should create frame with default url if custom disabled', () => {
-    setupElementFunctions(container);
-    const iframe =
-        getIframe(window, container, '_ping_', {clientId: 'cidValue'});
-    expect(iframe.src).to.equal(
-        'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-  });
+    it('should create frame with default url if custom disabled', () => {
+      setupElementFunctions(container);
+      const iframe = getIframe(window, container, '_ping_', {
+        clientId: 'cidValue',
+      });
+      expect(iframe.src).to.equal(
+        'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+      );
+    });
 
-  it('should prefetch bootstrap frame and JS', () => {
-    window.AMP_MODE = {localDev: true};
-    preloadBootstrap(window, preconnect);
-    // Wait for visible promise
-    return Promise.resolve().then(() => {
-      const fetches = document.querySelectorAll('link[rel=preload]');
-      expect(fetches).to.have.length(2);
-      expect(fetches[0]).to.have.property('href',
-          'http://ads.localhost:9876/dist.3p/current/frame.max.html');
-      expect(fetches[1]).to.have.property('href',
-          'http://ads.localhost:9876/dist.3p/current/integration.js');
+    it('should prefetch bootstrap frame and JS', () => {
+      window.AMP_MODE = {localDev: true};
+      preloadBootstrap(window, preconnect);
+      // Wait for visible promise
+      return Promise.resolve().then(() => {
+        const fetches = document.querySelectorAll('link[rel=preload]');
+        expect(fetches).to.have.length(2);
+        expect(fetches[0]).to.have.property(
+          'href',
+          'http://ads.localhost:9876/dist.3p/current/frame.max.html'
+        );
+        expect(fetches[1]).to.have.property(
+          'href',
+          'http://ads.localhost:9876/dist.3p/current/integration.js'
+        );
+      });
     });
-  });
 
-  it('should prefetch default bootstrap frame if custom disabled', () => {
-    window.AMP_MODE = {localDev: true};
-    addCustomBootstrap('http://localhost:9876/boot/remote.html');
-    preloadBootstrap(window, preconnect, true);
-    // Wait for visible promise
-    return Promise.resolve().then(() => {
-      expect(document.querySelectorAll('link[rel=preload]' +
-          '[href="http://ads.localhost:9876/dist.3p/current/frame.max.html"]'))
-          .to.be.ok;
+    it('should prefetch default bootstrap frame if custom disabled', () => {
+      window.AMP_MODE = {localDev: true};
+      addCustomBootstrap('http://localhost:9876/boot/remote.html');
+      preloadBootstrap(window, preconnect, true);
+      // Wait for visible promise
+      return Promise.resolve().then(() => {
+        expect(
+          document.querySelectorAll(
+            'link[rel=preload]' +
+              '[href="http://ads.localhost:9876/dist.3p/current/frame.max.html"]'
+          )
+        ).to.be.ok;
+      });
     });
-  });
 
-  it('should make sub domains (unique)', () => {
-    expect(getSubDomain(window)).to.match(/^d-\d+$/);
-    expect(getSubDomain(window)).to.not.equal('d-00');
-  });
+    it('should make sub domains (unique)', () => {
+      expect(getSubDomain(window)).to.match(/^d-\d+$/);
+      expect(getSubDomain(window)).to.not.equal('d-00');
+    });
 
-  it('should make sub domains (Math)', () => {
-    const fakeWin = {document, Math};
-    expect(getSubDomain(fakeWin)).to.match(/^d-\d+$/);
-  });
+    it('should make sub domains (Math)', () => {
+      const fakeWin = {document, Math};
+      expect(getSubDomain(fakeWin)).to.match(/^d-\d+$/);
+    });
 
-  it('should make sub domains (crypto)', () => {
-    const fakeWin = {
-      document,
-      crypto: {
-        getRandomValues(arg) {
-          arg[0] = 123;
-          arg[1] = 987;
+    it('should make sub domains (crypto)', () => {
+      const fakeWin = {
+        document,
+        crypto: {
+          getRandomValues(arg) {
+            arg[0] = 123;
+            arg[1] = 987;
+          },
         },
-      },
-    };
-    expect(getSubDomain(fakeWin)).to.equal('d-123987');
-  });
+      };
+      expect(getSubDomain(fakeWin)).to.equal('d-123987');
+    });
 
-  it('should make sub domains (fallback)', () => {
-    const fakeWin = {
-      document,
-      Math: {
-        random() {
-          return 0.567;
+    it('should make sub domains (fallback)', () => {
+      const fakeWin = {
+        document,
+        Math: {
+          random() {
+            return 0.567;
+          },
         },
-      },
-    };
-    expect(getSubDomain(fakeWin)).to.equal('d-5670');
-  });
+      };
+      expect(getSubDomain(fakeWin)).to.equal('d-5670');
+    });
 
-  it('uses a unique name based on domain', () => {
-    const viewerMock = sandbox.mock(Services.viewerForDoc(window.document));
-    viewerMock.expects('getUnconfirmedReferrerUrl')
-        .returns('http://acme.org/').twice();
-
-    window.AMP_MODE = {};
-    const link = document.createElement('link');
-    link.setAttribute('rel', 'canonical');
-    link.setAttribute('href', 'https://foo.bar/baz');
-    document.head.appendChild(link);
-
-    const div = document.createElement('div');
-    div.setAttribute('type', '_ping_');
-    div.setAttribute('width', 100);
-    div.setAttribute('height', 200);
-    div.getIntersectionChangeEntry = function() {
-      return {
-        left: 0,
-        top: 0,
-        width: 0,
-        height: 0,
-        bottom: 0,
-        right: 0,
-        x: 0,
-        y: 0,
+    it('uses a unique name based on domain', () => {
+      const viewerMock = sandbox.mock(Services.viewerForDoc(window.document));
+      viewerMock
+        .expects('getUnconfirmedReferrerUrl')
+        .returns('http://acme.org/')
+        .twice();
+
+      window.AMP_MODE = {};
+      const link = document.createElement('link');
+      link.setAttribute('rel', 'canonical');
+      link.setAttribute('href', 'https://foo.bar/baz');
+      document.head.appendChild(link);
+
+      const div = document.createElement('div');
+      div.setAttribute('type', '_ping_');
+      div.setAttribute('width', 100);
+      div.setAttribute('height', 200);
+      div.getIntersectionChangeEntry = function() {
+        return {
+          left: 0,
+          top: 0,
+          width: 0,
+          height: 0,
+          bottom: 0,
+          right: 0,
+          x: 0,
+          y: 0,
+        };
       };
-    };
-    div.getPageLayoutBox = function() {
-      return {
-        left: 0,
-        top: 0,
-        width: 100,
-        height: 200,
+      div.getPageLayoutBox = function() {
+        return {
+          left: 0,
+          top: 0,
+          width: 100,
+          height: 200,
+        };
       };
-    };
-
-    container.appendChild(div);
-    const name = JSON.parse(getIframe(window, div).name);
-    resetBootstrapBaseUrlForTesting(window);
-    resetCountForTesting();
-    const newName = JSON.parse(getIframe(window, div).name);
-    expect(name.host).to.match(/d-\d+.ampproject.net/);
-    expect(name.type).to.match(/ping/);
-    expect(name.count).to.match(/1/);
-    expect(newName.host).to.match(/d-\d+.ampproject.net/);
-    expect(newName.type).to.match(/ping/);
-    expect(newName.count).to.match(/1/);
-    expect(newName).not.to.equal(name);
-  });
 
-  describe('serializeMessage', () => {
-    it('should work without payload', () => {
-      const message = serializeMessage('msgtype', 'msgsentinel');
-      expect(message.indexOf('amp-')).to.equal(0);
-      expect(deserializeMessage(message)).to.deep.equal({
-        type: 'msgtype',
-        sentinel: 'msgsentinel',
-      });
+      container.appendChild(div);
+      const name = JSON.parse(getIframe(window, div).name);
+      resetBootstrapBaseUrlForTesting(window);
+      resetCountForTesting();
+      const newName = JSON.parse(getIframe(window, div).name);
+      expect(name.host).to.match(/d-\d+.ampproject.net/);
+      expect(name.type).to.match(/ping/);
+      expect(name.count).to.match(/1/);
+      expect(newName.host).to.match(/d-\d+.ampproject.net/);
+      expect(newName.type).to.match(/ping/);
+      expect(newName.count).to.match(/1/);
+      expect(newName).not.to.equal(name);
     });
 
-    it('should work with payload', () => {
-      const message = serializeMessage('msgtype', 'msgsentinel', {
-        type: 'type_override', // override should be ignored
-        sentinel: 'sentinel_override', // override should be ignored
-        x: 1,
-        y: 'abc',
+    describe('serializeMessage', () => {
+      it('should work without payload', () => {
+        const message = serializeMessage('msgtype', 'msgsentinel');
+        expect(message.indexOf('amp-')).to.equal(0);
+        expect(deserializeMessage(message)).to.deep.equal({
+          type: 'msgtype',
+          sentinel: 'msgsentinel',
+        });
       });
-      expect(deserializeMessage(message)).to.deep.equal({
-        type: 'msgtype',
-        sentinel: 'msgsentinel',
-        x: 1,
-        y: 'abc',
+
+      it('should work with payload', () => {
+        const message = serializeMessage('msgtype', 'msgsentinel', {
+          type: 'type_override', // override should be ignored
+          sentinel: 'sentinel_override', // override should be ignored
+          x: 1,
+          y: 'abc',
+        });
+        expect(deserializeMessage(message)).to.deep.equal({
+          type: 'msgtype',
+          sentinel: 'msgsentinel',
+          x: 1,
+          y: 'abc',
+        });
       });
-    });
 
-    it('should work with rtvVersion', () => {
-      const message = serializeMessage('msgtype', 'msgsentinel', {
-        type: 'type_override', // override should be ignored
-        sentinel: 'sentinel_override', // override should be ignored
-        x: 1,
-        y: 'abc',
-      }, 'rtv123');
-      expect(deserializeMessage(message)).to.deep.equal({
-        type: 'msgtype',
-        sentinel: 'msgsentinel',
-        x: 1,
-        y: 'abc',
+      it('should work with rtvVersion', () => {
+        const message = serializeMessage(
+          'msgtype',
+          'msgsentinel',
+          {
+            type: 'type_override', // override should be ignored
+            sentinel: 'sentinel_override', // override should be ignored
+            x: 1,
+            y: 'abc',
+          },
+          'rtv123'
+        );
+        expect(deserializeMessage(message)).to.deep.equal({
+          type: 'msgtype',
+          sentinel: 'msgsentinel',
+          x: 1,
+          y: 'abc',
+        });
       });
     });
-  });
 
-  describe('deserializeMessage', () => {
-    it('should deserialize valid message', () => {
-      const message = deserializeMessage(
-          'amp-{"type":"msgtype","sentinel":"msgsentinel","x":1,"y":"abc"}');
-      expect(message).to.deep.equal({
-        type: 'msgtype',
-        sentinel: 'msgsentinel',
-        x: 1,
-        y: 'abc',
+    describe('deserializeMessage', () => {
+      it('should deserialize valid message', () => {
+        const message = deserializeMessage(
+          'amp-{"type":"msgtype","sentinel":"msgsentinel","x":1,"y":"abc"}'
+        );
+        expect(message).to.deep.equal({
+          type: 'msgtype',
+          sentinel: 'msgsentinel',
+          x: 1,
+          y: 'abc',
+        });
       });
-    });
 
-    it('should deserialize valid message with rtv version', () => {
-      const message = deserializeMessage(
+      it('should deserialize valid message with rtv version', () => {
+        const message = deserializeMessage(
           'amp-rtv123{"type":"msgtype","sentinel":"msgsentinel",' +
-          '"x":1,"y":"abc"}');
-      expect(message).to.deep.equal({
-        type: 'msgtype',
-        sentinel: 'msgsentinel',
-        x: 1,
-        y: 'abc',
+            '"x":1,"y":"abc"}'
+        );
+        expect(message).to.deep.equal({
+          type: 'msgtype',
+          sentinel: 'msgsentinel',
+          x: 1,
+          y: 'abc',
+        });
       });
-    });
 
-    it('should return null if the input not a string', () => {
-      expect(deserializeMessage({x: 1, y: 'abc'})).to.be.null;
-    });
+      it('should return null if the input not a string', () => {
+        expect(deserializeMessage({x: 1, y: 'abc'})).to.be.null;
+      });
 
-    it('should return null if the input does not start with amp-', () => {
-      expect(deserializeMessage(
-          'noamp-{"type":"msgtype","sentinel":"msgsentinel"}')).to.be.null;
-    });
+      it('should return null if the input does not start with amp-', () => {
+        expect(
+          deserializeMessage(
+            'noamp-{"type":"msgtype","sentinel":"msgsentinel"}'
+          )
+        ).to.be.null;
+      });
 
-    it('should return null if the input is not a json', () => {
-      const errorStub = sandbox.stub(dev(), 'error');
-      expect(deserializeMessage('amp-other')).to.be.null;
-      expect(errorStub).to.not.be.called;
-    });
+      it('should return null if the input is not a json', () => {
+        const errorStub = sandbox.stub(dev(), 'error');
+        expect(deserializeMessage('amp-other')).to.be.null;
+        expect(errorStub).to.not.be.called;
+      });
 
-    it('should return null if failed to parse the input', () => {
-      const errorStub = sandbox.stub(dev(), 'error');
-      expect(deserializeMessage(
-          'amp-{"type","sentinel":"msgsentinel"}')).to.be.null;
-      expect(errorStub).to.be.calledOnce;
+      it('should return null if failed to parse the input', () => {
+        const errorStub = sandbox.stub(dev(), 'error');
+        expect(deserializeMessage('amp-{"type","sentinel":"msgsentinel"}')).to
+          .be.null;
+        expect(errorStub).to.be.calledOnce;
 
-      expect(deserializeMessage(
-          'amp-{"type":"msgtype"|"sentinel":"msgsentinel"}')).to.be.null;
-      expect(errorStub).to.be.calledTwice;
+        expect(
+          deserializeMessage('amp-{"type":"msgtype"|"sentinel":"msgsentinel"}')
+        ).to.be.null;
+        expect(errorStub).to.be.calledTwice;
+      });
     });
   });
-});
diff --git a/test/integration/test-actions.js b/test/integration/test-actions.js
index 7af228e12da4..c20091aa260a 100644
--- a/test/integration/test-actions.js
+++ b/test/integration/test-actions.js
@@ -15,56 +15,61 @@
  */
 
 import {AmpEvents} from '../../src/amp-events';
-import {
-  createFixtureIframe,
-  poll,
-} from '../../testing/iframe.js';
+import {createFixtureIframe, poll} from '../../testing/iframe.js';
 
-describe.configure().retryOnSaucelabs().run('on="..."', () => {
-  let fixture;
-  let sandbox;
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('on="..."', () => {
+    let fixture;
+    let sandbox;
 
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
 
-    return createFixtureIframe('test/fixtures/actions.html', 500).then(f => {
-      fixture = f;
+      return createFixtureIframe('test/fixtures/actions.html', 500).then(f => {
+        fixture = f;
 
-      // Wait for one <amp-img> element to load.
-      return fixture.awaitEvent(AmpEvents.LOAD_END, 1);
+        // Wait for one <amp-img> element to load.
+        return fixture.awaitEvent(AmpEvents.LOAD_END, 1);
+      });
     });
-  });
 
-  function waitForDisplay(element, display) {
-    return () => fixture.win.getComputedStyle(element)['display'] === display;
-  }
+    function waitForDisplay(element, display) {
+      return () => fixture.win.getComputedStyle(element)['display'] === display;
+    }
 
-  afterEach(() => {
-    sandbox.restore();
-  });
+    afterEach(() => {
+      sandbox.restore();
+    });
 
-  describe('"tap" event', () => {
-    it('<non-AMP element>.toggleVisibility', function*() {
-      const span = fixture.doc.getElementById('spanToHide');
-      const button = fixture.doc.getElementById('hideBtn');
+    describe('"tap" event', () => {
+      it('<non-AMP element>.toggleVisibility', function*() {
+        const span = fixture.doc.getElementById('spanToHide');
+        const button = fixture.doc.getElementById('hideBtn');
 
-      button.click();
-      yield poll('#spanToHide hidden', waitForDisplay(span, 'none'));
-    });
+        button.click();
+        yield poll('#spanToHide hidden', waitForDisplay(span, 'none'));
+      });
 
-    it('<AMP element>.toggleVisibility', function*() {
-      const img = fixture.doc.getElementById('imgToToggle');
-      const button = fixture.doc.getElementById('toggleBtn');
+      it('<AMP element>.toggleVisibility', function*() {
+        const img = fixture.doc.getElementById('imgToToggle');
+        const button = fixture.doc.getElementById('toggleBtn');
 
-      button.click();
-      yield poll('#imgToToggle hidden', waitForDisplay(img, 'none'));
+        button.click();
+        yield poll('#imgToToggle hidden', waitForDisplay(img, 'none'));
 
-      button.click();
-      yield poll('#imgToToggle displayed', waitForDisplay(img, 'inline-block'));
-    });
+        button.click();
+        yield poll(
+          '#imgToToggle displayed',
+          waitForDisplay(img, 'inline-block')
+        );
+      });
 
-    describe.configure().skipIfPropertiesObfuscated().run('navigate',
-        function() {
+      describe
+        .configure()
+        .skipIfPropertiesObfuscated()
+        .run('navigate', function() {
           it('AMP.navigateTo(url=)', function*() {
             const button = fixture.doc.getElementById('navigateBtn');
 
@@ -80,15 +85,15 @@ describe.configure().retryOnSaucelabs().run('on="..."', () => {
           });
         });
 
-    it('AMP.print()', function*() {
-      const button = fixture.doc.getElementById('printBtn');
+      it('AMP.print()', function*() {
+        const button = fixture.doc.getElementById('printBtn');
 
-      const print = sandbox.stub(fixture.win, 'print');
+        const print = sandbox.stub(fixture.win, 'print');
 
-      button.click();
-      yield poll('print() called once', () => {
-        return print.calledOnce;
+        button.click();
+        yield poll('print() called once', () => {
+          return print.calledOnce;
+        });
       });
     });
   });
-});
diff --git a/test/integration/test-amp-ad-3p.js b/test/integration/test-amp-ad-3p.js
index 04084001a937..d3969b65e03c 100644
--- a/test/integration/test-amp-ad-3p.js
+++ b/test/integration/test-amp-ad-3p.js
@@ -15,10 +15,7 @@
  */
 
 import {Services} from '../../src/services';
-import {
-  createFixtureIframe,
-  poll,
-} from '../../testing/iframe';
+import {createFixtureIframe, poll} from '../../testing/iframe';
 import {installPlatformService} from '../../src/service/platform-impl';
 import {layoutRectLtwh} from '../../src/layout-rect';
 
@@ -41,144 +38,173 @@ describe.configure().run('amp-ad 3P', () => {
     let iframe;
     let lastIO = null;
     const platform = Services.platformFor(fixture.win);
-    return poll('frame to be in DOM', () => {
-      return fixture.doc.querySelector('amp-ad > iframe');
-    }, undefined, 5000).then(iframeElement => {
-      iframe = iframeElement;
-      return new Promise(resolve => {
-        if (iframe.contentWindow.context) {
-          resolve(iframe.contentWindow.context);
-        }
-        iframe.onload = () => {
-          expect(iframe.contentWindow.document.getElementById('c'))
-              .to.exist;
-          resolve(iframe.contentWindow.context);
-        };
-      });
-    }).then(context => {
-      expect(context.canary).to.be.a('boolean');
-      expect(context.canonicalUrl).to.equal(
-          'https://www.example.com/doubleclick.html');
-      expect(context.clientId).to.match(/amp-[a-zA-Z0-9\-_.]{22,24}/);
-      expect(context.container).to.equal('AMP-LIGHTBOX');
-      expect(context.data).to.deep.equal({
-        width: 300,
-        height: 250,
-        type: '_ping_',
-        ampSlotIndex: '0',
-        id: '0',
-        url: 'https://example.com/a?b=c&d=e',
-        valid: 'true',
-        customValue: '123',
-        'other_value': 'foo',
-        htmlAccessAllowed: '',
-      });
+    return poll(
+      'frame to be in DOM',
+      () => {
+        return fixture.doc.querySelector('amp-ad > iframe');
+      },
+      undefined,
+      5000
+    )
+      .then(iframeElement => {
+        iframe = iframeElement;
+        return new Promise(resolve => {
+          if (iframe.contentWindow.context) {
+            resolve(iframe.contentWindow.context);
+          }
+          iframe.onload = () => {
+            expect(iframe.contentWindow.document.getElementById('c')).to.exist;
+            resolve(iframe.contentWindow.context);
+          };
+        });
+      })
+      .then(context => {
+        expect(context.canary).to.be.a('boolean');
+        expect(context.canonicalUrl).to.equal(
+          'https://www.example.com/doubleclick.html'
+        );
+        expect(context.clientId).to.match(/amp-[a-zA-Z0-9\-_.]{22,24}/);
+        expect(context.container).to.equal('AMP-LIGHTBOX');
+        expect(context.data).to.deep.equal({
+          width: 300,
+          height: 250,
+          type: '_ping_',
+          ampSlotIndex: '0',
+          id: '0',
+          url: 'https://example.com/a?b=c&d=e',
+          valid: 'true',
+          customValue: '123',
+          'other_value': 'foo',
+          htmlAccessAllowed: '',
+        });
 
-      // make sure the context.data is the same instance as the data param
-      // passed into the vendor function. see #10628
-      expect(context.data).to.equal(
-          iframe.contentWindow.networkIntegrationDataParamForTesting);
+        // make sure the context.data is the same instance as the data param
+        // passed into the vendor function. see #10628
+        expect(context.data).to.equal(
+          iframe.contentWindow.networkIntegrationDataParamForTesting
+        );
 
-      expect(context.domFingerprint).to.be.ok;
-      expect(context.hidden).to.be.false;
-      expect(context.initialLayoutRect).to.deep.equal({
-        height: 250,
-        left: 0,
-        top: platform.isIos() ? 1001 : 1000, // the iOS 1px trick
-        width: 300,
-      });
-      const {initialIntersection} = context;
-      expect(initialIntersection.rootBounds).to.deep
-          .equal(layoutRectLtwh(0, 0, 500, 3000));
-      expect(initialIntersection.boundingClientRect).to.deep
-          .equal(layoutRectLtwh(0, platform.isIos() ? 1001 : 1000, 300, 250));
-      expect(initialIntersection.intersectionRect).to.deep
-          .equal(layoutRectLtwh(0, platform.isIos() ? 1001 : 1000, 300, 250));
-      expect(initialIntersection.intersectionRatio).to.equal(1);
-      expect(initialIntersection.time).to.be.a('number');
-      expect(context.isMaster).to.exist;
-      expect(context.computeInMasterFrame).to.exist;
-      expect(context.location).to.deep.equal({
-        hash: '',
-        host: 'localhost:9876',
-        hostname: 'localhost',
-        href: 'http://localhost:9876/context.html',
-        origin: 'http://localhost:9876',
-        pathname: '/context.html',
-        port: '9876',
-        protocol: 'http:',
-        search: '',
-      });
-      expect(parseInt(context.pageViewId, 10)).to.be.greaterThan(0);
-      // In some browsers the referrer is empty. But in Chrome it works, so
-      // we always check there.
-      if (context.referrer !== '' || platform.isChrome()) {
-        expect(context.referrer).to.contain(
-            'http://localhost:' + location.port);
-      }
-      expect(context.startTime).to.be.a('number');
-      // Edge has different opinion about window.location in srcdoc iframe.
-      // Nevertheless this only happens in test. In real world AMP will not
-      // in srcdoc iframe.
-      expect(context.sourceUrl).to.equal(platform.isEdge()
-        ? 'http://localhost:9876/context.html' : 'about:srcdoc');
+        expect(context.domFingerprint).to.be.ok;
+        expect(context.hidden).to.be.false;
+        expect(context.initialLayoutRect).to.deep.equal({
+          height: 250,
+          left: 0,
+          top: platform.isIos() ? 1001 : 1000, // the iOS 1px trick
+          width: 300,
+        });
+        const {initialIntersection} = context;
+        expect(initialIntersection.rootBounds).to.deep.equal(
+          layoutRectLtwh(0, 0, 500, 3000)
+        );
+        expect(initialIntersection.boundingClientRect).to.deep.equal(
+          layoutRectLtwh(0, platform.isIos() ? 1001 : 1000, 300, 250)
+        );
+        expect(initialIntersection.intersectionRect).to.deep.equal(
+          layoutRectLtwh(0, platform.isIos() ? 1001 : 1000, 300, 250)
+        );
+        expect(initialIntersection.intersectionRatio).to.equal(1);
+        expect(initialIntersection.time).to.be.a('number');
+        expect(context.isMaster).to.exist;
+        expect(context.computeInMasterFrame).to.exist;
+        expect(context.location).to.deep.equal({
+          hash: '',
+          host: 'localhost:9876',
+          hostname: 'localhost',
+          href: 'http://localhost:9876/context.html',
+          origin: 'http://localhost:9876',
+          pathname: '/context.html',
+          port: '9876',
+          protocol: 'http:',
+          search: '',
+        });
+        expect(parseInt(context.pageViewId, 10)).to.be.greaterThan(0);
+        // In some browsers the referrer is empty. But in Chrome it works, so
+        // we always check there.
+        if (context.referrer !== '' || platform.isChrome()) {
+          expect(context.referrer).to.contain(
+            'http://localhost:' + location.port
+          );
+        }
+        expect(context.startTime).to.be.a('number');
+        // Edge has different opinion about window.location in srcdoc iframe.
+        // Nevertheless this only happens in test. In real world AMP will not
+        // in srcdoc iframe.
+        expect(context.sourceUrl).to.equal(
+          platform.isEdge()
+            ? 'http://localhost:9876/context.html'
+            : 'about:srcdoc'
+        );
 
-      expect(context.tagName).to.equal('AMP-AD');
+        expect(context.tagName).to.equal('AMP-AD');
 
-      expect(context.addContextToIframe).to.be.a('function');
-      expect(context.getHtml).to.be.a('function');
-      expect(context.noContentAvailable).to.be.a('function');
-      expect(context.onResizeDenied).to.be.a('function');
-      expect(context.onResizeSuccess).to.be.a('function');
-      expect(context.renderStart).to.be.a('function');
-      expect(context.reportRenderedEntityIdentifier).to.be.a('function');
-      expect(context.requestResize).to.be.a('function');
-      expect(context.report3pError).to.be.a('function');
-      expect(context.computeInMasterFrame).to.be.a('function');
-    }).then(() => {
-      // test iframe will send out render-start to amp-ad
-      return poll('render-start message received', () => {
-        return fixture.messages.filter(message => {
-          return message.type == 'render-start';
-        }).length;
-      });
-    }).then(() => {
-      // test amp-ad will respond to render-start
-      return poll('wait for visibility style to change', () => {
-        return iframe.style.visibility == '';
-      });
-    }).then(() => {
-      expect(iframe.offsetHeight).to.equal(250);
-      expect(iframe.offsetWidth).to.equal(300);
-      expect(iframe.contentWindow.ping.resizeSuccess).to.be.undefined;
-      iframe.contentWindow.context.requestResize(200, 50);
-      return poll('wait for embed-size to be received', () => {
-        return fixture.messages.filter(message => {
-          return message.type == 'embed-size';
-        }).length;
-      });
-    }).then(() => {
-      return poll('wait for attemptChangeSize', () => {
-        return iframe.contentWindow.ping.resizeSuccess != undefined;
-      }, null, 5000);
-    }).then(() => {
-      lastIO = null;
-      iframe.contentWindow.context.observeIntersection(changes => {
-        lastIO = changes[changes.length - 1];
-      });
-      fixture.win.scrollTo(0, 1000);
-      fixture.win.document.body.dispatchEvent(new Event('scroll'));
-      return poll('wait for new IO entry', () => {
-        return lastIO != null;
-      });
-    }).then(() => new Promise((resolve, reject) => {
-      iframe.contentWindow.context.getHtml('a', ['href'], content => {
-        if (content == '<a href="http://test.com/test">Test link</a>') {
-          resolve();
-        } else {
-          reject(new Error('Invalid getHtml result: ' + content));
-        }
-      });
-    }));
+        expect(context.addContextToIframe).to.be.a('function');
+        expect(context.getHtml).to.be.a('function');
+        expect(context.noContentAvailable).to.be.a('function');
+        expect(context.onResizeDenied).to.be.a('function');
+        expect(context.onResizeSuccess).to.be.a('function');
+        expect(context.renderStart).to.be.a('function');
+        expect(context.reportRenderedEntityIdentifier).to.be.a('function');
+        expect(context.requestResize).to.be.a('function');
+        expect(context.report3pError).to.be.a('function');
+        expect(context.computeInMasterFrame).to.be.a('function');
+      })
+      .then(() => {
+        // test iframe will send out render-start to amp-ad
+        return poll('render-start message received', () => {
+          return fixture.messages.filter(message => {
+            return message.type == 'render-start';
+          }).length;
+        });
+      })
+      .then(() => {
+        // test amp-ad will respond to render-start
+        return poll('wait for visibility style to change', () => {
+          return iframe.style.visibility == '';
+        });
+      })
+      .then(() => {
+        expect(iframe.offsetHeight).to.equal(250);
+        expect(iframe.offsetWidth).to.equal(300);
+        expect(iframe.contentWindow.ping.resizeSuccess).to.be.undefined;
+        iframe.contentWindow.context.requestResize(200, 50);
+        return poll('wait for embed-size to be received', () => {
+          return fixture.messages.filter(message => {
+            return message.type == 'embed-size';
+          }).length;
+        });
+      })
+      .then(() => {
+        return poll(
+          'wait for attemptChangeSize',
+          () => {
+            return iframe.contentWindow.ping.resizeSuccess != undefined;
+          },
+          null,
+          5000
+        );
+      })
+      .then(() => {
+        lastIO = null;
+        iframe.contentWindow.context.observeIntersection(changes => {
+          lastIO = changes[changes.length - 1];
+        });
+        fixture.win.scrollTo(0, 1000);
+        fixture.win.document.body.dispatchEvent(new Event('scroll'));
+        return poll('wait for new IO entry', () => {
+          return lastIO != null;
+        });
+      })
+      .then(
+        () =>
+          new Promise((resolve, reject) => {
+            iframe.contentWindow.context.getHtml('a', ['href'], content => {
+              if (content == '<a href="http://test.com/test">Test link</a>') {
+                resolve();
+              } else {
+                reject(new Error('Invalid getHtml result: ' + content));
+              }
+            });
+          })
+      );
   });
 });
diff --git a/test/integration/test-amp-ad-custom.js b/test/integration/test-amp-ad-custom.js
index 46944a12d91a..60c6ca6ed540 100644
--- a/test/integration/test-amp-ad-custom.js
+++ b/test/integration/test-amp-ad-custom.js
@@ -15,46 +15,47 @@
  */
 
 import {AmpEvents} from '../../src/amp-events';
-import {
-  createFixtureIframe,
-} from '../../testing/iframe.js';
+import {createFixtureIframe} from '../../testing/iframe.js';
 
-describe.configure().retryOnSaucelabs().run('amp custom ad', () => {
-  let fixture;
-  beforeEach(() => {
-    return createFixtureIframe('test/fixtures/amp-ad-custom.html', 500)
-        .then(f => {
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('amp custom ad', () => {
+    let fixture;
+    beforeEach(() => {
+      return createFixtureIframe('test/fixtures/amp-ad-custom.html', 500).then(
+        f => {
           fixture = f;
-        });
-  });
+        }
+      );
+    });
 
-  /** TODO(#15329): unskip */
-  it.skip('should render template', () => {
-    return fixture.awaitEvent(AmpEvents.LOAD_END, 6).then(function() {
-      expect(fixture.doc.querySelectorAll('amp-img')).to
-          .have.length(3);
+    /** TODO(#15329): unskip */
+    it.skip('should render template', () => {
+      return fixture.awaitEvent(AmpEvents.LOAD_END, 6).then(function() {
+        expect(fixture.doc.querySelectorAll('amp-img')).to.have.length(3);
 
-      // ad1
-      const ad1 = fixture.doc.getElementById('ad1');
-      expect(ad1.getAttribute('template')).to.be.null;
-      expect(ad1.getAttribute('data-vars-var1')).to.be.null;
-      expect(ad1.getAttribute('data-vars-var2')).to.be.null;
-      const img1 = ad1.querySelector('amp-img');
-      expect(img1.getAttribute('data-info')).to.equal('Info');
+        // ad1
+        const ad1 = fixture.doc.getElementById('ad1');
+        expect(ad1.getAttribute('template')).to.be.null;
+        expect(ad1.getAttribute('data-vars-var1')).to.be.null;
+        expect(ad1.getAttribute('data-vars-var2')).to.be.null;
+        const img1 = ad1.querySelector('amp-img');
+        expect(img1.getAttribute('data-info')).to.equal('Info');
 
-      // ad2
-      const ad2 = fixture.doc.getElementById('ad2');
-      expect(ad2.getAttribute('template')).to.equal('amp-template-id2');
-      const img2 = ad2.querySelector('amp-img');
-      expect(img2.getAttribute('data-info')).to.equal('Info2');
-      expect(ad2.getAttribute('data-vars-var1')).to.equal('123');
-      expect(ad2.getAttribute('data-vars-var2')).to.equal('456');
+        // ad2
+        const ad2 = fixture.doc.getElementById('ad2');
+        expect(ad2.getAttribute('template')).to.equal('amp-template-id2');
+        const img2 = ad2.querySelector('amp-img');
+        expect(img2.getAttribute('data-info')).to.equal('Info2');
+        expect(ad2.getAttribute('data-vars-var1')).to.equal('123');
+        expect(ad2.getAttribute('data-vars-var2')).to.equal('456');
 
-      // ad3
-      const ad3 = fixture.doc.getElementById('ad3');
-      expect(ad3.getAttribute('template')).to.be.null;
-      const img3 = ad3.querySelector('amp-img');
-      expect(img3.getAttribute('data-info')).to.equal('Info3');
+        // ad3
+        const ad3 = fixture.doc.getElementById('ad3');
+        expect(ad3.getAttribute('template')).to.be.null;
+        const img3 = ad3.querySelector('amp-img');
+        expect(img3.getAttribute('data-info')).to.equal('Info3');
+      });
     });
   });
-});
diff --git a/test/integration/test-amp-ad-doubleclick.js b/test/integration/test-amp-ad-doubleclick.js
index 2f2f6d624f28..9b6b72db66ff 100644
--- a/test/integration/test-amp-ad-doubleclick.js
+++ b/test/integration/test-amp-ad-doubleclick.js
@@ -14,141 +14,186 @@
  * limitations under the License.
  */
 
-import {
-  createFixtureIframe,
-  poll,
-  pollForLayout,
-} from '../../testing/iframe';
+import {createFixtureIframe, poll, pollForLayout} from '../../testing/iframe';
 
-describe.configure().enableIe().retryOnSaucelabs().run('Rendering of' +
-    ' one ad', () => {
-  let fixture;
-  let beforeHref;
+describe
+  .configure()
+  .enableIe()
+  .retryOnSaucelabs()
+  .run('Rendering of one ad', () => {
+    let fixture;
+    let beforeHref;
 
-  function replaceUrl(win) {
-    const path = '/test/fixtures/doubleclick.html?google_glade=0';
-    // We pass down the parent URL. So we change that, which we
-    // can. We just need to change it back after the test.
-    beforeHref = win.parent.location.href;
-    win.parent.history.replaceState(null, null, path);
-  }
-
-  beforeEach(() => {
-    return createFixtureIframe('test/fixtures/doubleclick.html', 3000, win => {
-      replaceUrl(win);
-    }).then(f => {
-      fixture = f;
-    });
-  });
-
-  afterEach(() => {
-    if (beforeHref) {
-      fixture.win.parent.history.replaceState(null, null, beforeHref);
+    function replaceUrl(win) {
+      const path = '/test/fixtures/doubleclick.html?google_glade=0';
+      // We pass down the parent URL. So we change that, which we
+      // can. We just need to change it back after the test.
+      beforeHref = win.parent.location.href;
+      win.parent.history.replaceState(null, null, path);
     }
-  });
 
-  // TODO(lannka, #3561): unmute the test.
-  // it.configure().skipEdge().run(
-  // 'should create an iframe loaded', function() {
-  it.skip('should create an iframe loaded', function() {
-    this.timeout(20000);
-    let iframe;
-    let ampAd;
-    const isEdge = navigator.userAgent.match(/Edge/);
-    return pollForLayout(fixture.win, 1, 5500).then(() => {
-      return poll('frame to be in DOM', () => {
-        return fixture.doc.querySelector('iframe');
-      });
-    }).then(iframeElement => {
-      iframe = iframeElement;
-      expect(fixture.doc.querySelectorAll('iframe')).to.have.length(1);
-      ampAd = iframe.parentElement;
-      expect(iframe.src).to.contain('categoryExclusions');
-      expect(iframe.src).to.contain('health');
-      expect(iframe.src).to.contain('tagForChildDirectedTreatment');
-      expect(iframe.src).to.match(/http\:\/\/localhost:9876\/base\/dist\.3p\//);
-    }).then(() => {
-      return poll('frame to load', () => {
-        return iframe.contentWindow && iframe.contentWindow.document &&
-            iframe.contentWindow.document.getElementById('c');
+    beforeEach(() => {
+      return createFixtureIframe(
+        'test/fixtures/doubleclick.html',
+        3000,
+        win => {
+          replaceUrl(win);
+        }
+      ).then(f => {
+        fixture = f;
       });
-    }).then(unusedCanvas => {
-      return poll('3p JS to load.', () => iframe.contentWindow.context);
-    }).then(context => {
-      expect(context.hidden).to.be.false;
-      // In some browsers the referrer is empty. But in Chrome it works, so
-      // we always check there.
-      if (context.referrer !== '' ||
-          (navigator.userAgent.match(/Chrome/) && !isEdge)) {
-        expect(context.referrer).to.contain('http://localhost:' + location.port);
+    });
+
+    afterEach(() => {
+      if (beforeHref) {
+        fixture.win.parent.history.replaceState(null, null, beforeHref);
       }
-      expect(context.pageViewId).to.be.greaterThan(0);
-      expect(context.initialLayoutRect).to.exist;
-      expect(context.initialLayoutRect.top).to.exist;
-      expect(context.initialIntersection).to.exist;
-      expect(context.initialIntersection.rootBounds).to.exist;
-      expect(context.data.tagForChildDirectedTreatment).to.equal(0);
-      expect(context.data.categoryExclusions).to.be.jsonEqual(['health']);
-      expect(context.data.targeting).to.be.jsonEqual(
-          {'amptest': 'true'});
-      return poll('main ad JS is injected', () => {
-        return iframe.contentWindow.document.querySelector(
-            'script[src="https://www.googletagservices.com/tag/js/gpt.js"]');
-      }, undefined, /* timeout */ 5000);
-    }).then(() => {
-      return poll('render-start message received', () => {
-        return fixture.messages.filter(message => {
-          return message.type == 'render-start';
-        }).length;
-      });
-    }).then(() => {
-      expect(iframe.style.visibility).to.equal('');
-      const win = iframe.contentWindow;
-      return poll('GPT loaded', () => {
-        return win.googletag && win.googletag.pubads && win.googletag.pubads();
-      });
-    }).then(pubads => {
-      const canvas = iframe.contentWindow.document.querySelector('#c');
-      expect(pubads.get('page_url')).to.equal(
-          'https://www.example.com/doubleclick.html');
-      const {slot} = canvas;
-      expect(slot).to.not.be.null;
-      expect(slot.getCategoryExclusions()).to.jsonEqual(['health']);
-      expect(slot.getTargeting('amptest')).to.jsonEqual(['true']);
-      return poll(
-          'ad iframe to be initialized. Means that an actual ad was loaded.',
-          () => {
-            return canvas.querySelector(
-                '[id="google_ads_iframe_/35096353/amptesting/kv_0"]');
-          }, null, 5000);
-    }).then(() => {
-      expect(iframe.contentWindow.context.hidden).to.be.false;
-      return new Promise(resolve => {
-        // Listening to the "amp:visibilitychange" string literal because it's
-        // part of the public API.
-        // https://github.com/ampproject/amphtml/blob/master/ads/README.md#page-visibility
-        iframe.contentWindow.addEventListener('amp:visibilitychange', resolve);
-        fixture.win.AMP.viewer.receiveMessage('visibilitychange', {
-          state: 'hidden',
-        });
-        fixture.win.AMP.viewer.receiveMessage('visibilitychange', {
-          state: 'visible',
+    });
+
+    // TODO(lannka, #3561): unmute the test.
+    // it.configure().skipEdge().run(
+    // 'should create an iframe loaded', function() {
+    it.skip('should create an iframe loaded', function() {
+      this.timeout(20000);
+      let iframe;
+      let ampAd;
+      const isEdge = navigator.userAgent.match(/Edge/);
+      return pollForLayout(fixture.win, 1, 5500)
+        .then(() => {
+          return poll('frame to be in DOM', () => {
+            return fixture.doc.querySelector('iframe');
+          });
+        })
+        .then(iframeElement => {
+          iframe = iframeElement;
+          expect(fixture.doc.querySelectorAll('iframe')).to.have.length(1);
+          ampAd = iframe.parentElement;
+          expect(iframe.src).to.contain('categoryExclusions');
+          expect(iframe.src).to.contain('health');
+          expect(iframe.src).to.contain('tagForChildDirectedTreatment');
+          expect(iframe.src).to.match(
+            /http\:\/\/localhost:9876\/base\/dist\.3p\//
+          );
+        })
+        .then(() => {
+          return poll('frame to load', () => {
+            return (
+              iframe.contentWindow &&
+              iframe.contentWindow.document &&
+              iframe.contentWindow.document.getElementById('c')
+            );
+          });
+        })
+        .then(unusedCanvas => {
+          return poll('3p JS to load.', () => iframe.contentWindow.context);
+        })
+        .then(context => {
+          expect(context.hidden).to.be.false;
+          // In some browsers the referrer is empty. But in Chrome it works, so
+          // we always check there.
+          if (
+            context.referrer !== '' ||
+            (navigator.userAgent.match(/Chrome/) && !isEdge)
+          ) {
+            expect(context.referrer).to.contain(
+              'http://localhost:' + location.port
+            );
+          }
+          expect(context.pageViewId).to.be.greaterThan(0);
+          expect(context.initialLayoutRect).to.exist;
+          expect(context.initialLayoutRect.top).to.exist;
+          expect(context.initialIntersection).to.exist;
+          expect(context.initialIntersection.rootBounds).to.exist;
+          expect(context.data.tagForChildDirectedTreatment).to.equal(0);
+          expect(context.data.categoryExclusions).to.be.jsonEqual(['health']);
+          expect(context.data.targeting).to.be.jsonEqual({'amptest': 'true'});
+          return poll(
+            'main ad JS is injected',
+            () => {
+              return iframe.contentWindow.document.querySelector(
+                'script[src="https://www.googletagservices.com/tag/js/gpt.js"]'
+              );
+            },
+            undefined,
+            /* timeout */ 5000
+          );
+        })
+        .then(() => {
+          return poll('render-start message received', () => {
+            return fixture.messages.filter(message => {
+              return message.type == 'render-start';
+            }).length;
+          });
+        })
+        .then(() => {
+          expect(iframe.style.visibility).to.equal('');
+          const win = iframe.contentWindow;
+          return poll('GPT loaded', () => {
+            return (
+              win.googletag && win.googletag.pubads && win.googletag.pubads()
+            );
+          });
+        })
+        .then(pubads => {
+          const canvas = iframe.contentWindow.document.querySelector('#c');
+          expect(pubads.get('page_url')).to.equal(
+            'https://www.example.com/doubleclick.html'
+          );
+          const {slot} = canvas;
+          expect(slot).to.not.be.null;
+          expect(slot.getCategoryExclusions()).to.jsonEqual(['health']);
+          expect(slot.getTargeting('amptest')).to.jsonEqual(['true']);
+          return poll(
+            'ad iframe to be initialized. Means that an actual ad was loaded.',
+            () => {
+              return canvas.querySelector(
+                '[id="google_ads_iframe_/35096353/amptesting/kv_0"]'
+              );
+            },
+            null,
+            5000
+          );
+        })
+        .then(() => {
+          expect(iframe.contentWindow.context.hidden).to.be.false;
+          return new Promise(resolve => {
+            // Listening to the "amp:visibilitychange" string literal because it's
+            // part of the public API.
+            // https://github.com/ampproject/amphtml/blob/master/ads/README.md#page-visibility
+            iframe.contentWindow.addEventListener(
+              'amp:visibilitychange',
+              resolve
+            );
+            fixture.win.AMP.viewer.receiveMessage('visibilitychange', {
+              state: 'hidden',
+            });
+            fixture.win.AMP.viewer.receiveMessage('visibilitychange', {
+              state: 'visible',
+            });
+          });
+        })
+        .then(() => {
+          expect(iframe.getAttribute('width')).to.equal('300');
+          expect(iframe.getAttribute('height')).to.equal('250');
+          if (isEdge) {
+            // TODO(cramforce): Get this to pass in Edge
+            return;
+          }
+          return poll(
+            'Creative id transmitted. Ad fully rendered.',
+            () => {
+              return ampAd.creativeId;
+            },
+            null,
+            15000
+          );
+        })
+        .then(creativeId => {
+          if (isEdge) {
+            // TODO(cramforce): Get this to pass in Edge
+            return;
+          }
+          expect(creativeId).to.match(/^dfp-/);
         });
-      });
-    }).then(() => {
-      expect(iframe.getAttribute('width')).to.equal('300');
-      expect(iframe.getAttribute('height')).to.equal('250');
-      if (isEdge) { // TODO(cramforce): Get this to pass in Edge
-        return;
-      }
-      return poll('Creative id transmitted. Ad fully rendered.', () => {
-        return ampAd.creativeId;
-      }, null, 15000);
-    }).then(creativeId => {
-      if (isEdge) { // TODO(cramforce): Get this to pass in Edge
-        return;
-      }
-      expect(creativeId).to.match(/^dfp-/);
     });
   });
-});
diff --git a/test/integration/test-amp-ad-fake.js b/test/integration/test-amp-ad-fake.js
index ac9ff4d62b19..e5b1d4119de2 100644
--- a/test/integration/test-amp-ad-fake.js
+++ b/test/integration/test-amp-ad-fake.js
@@ -19,9 +19,10 @@ import {addParamsToUrl, parseQueryString} from '../../src/url';
 import {poll} from '../../testing/iframe';
 
 describe('A4A', function() {
-
-  describes.integration('AMPHTML ads rendered on AMP page', {
-    body: `
+  describes.integration(
+    'AMPHTML ads rendered on AMP page',
+    {
+      body: `
       <amp-ad width="300" height="400"
           id="i-amphtml-demo-id"
           type="fake"
@@ -30,11 +31,13 @@ describe('A4A', function() {
         <div fallback>Could not display the fake ad :(</div>
       </amp-ad>
       `,
-    extensions: ['amp-ad'],
-  }, () => {
-    // TODO(#21545): Unskip flaky test
-    it.configure().skipFirefox().run(
-        'should layout amp-img, amp-pixel, amp-analytics', () => {
+      extensions: ['amp-ad'],
+    },
+    () => {
+      // TODO(#21545): Unskip flaky test
+      it.configure()
+        .skipFirefox()
+        .run('should layout amp-img, amp-pixel, amp-analytics', () => {
           // See amp4test.js for creative content
           return Promise.all([
             RequestBank.withdraw('image'),
@@ -47,8 +50,9 @@ describe('A4A', function() {
             expect(imageReq.url).to.equal('/');
             expect(pixelReq.url).to.equal('/foo?cid=');
             expect(analyticsReq.url).to.match(/^\/bar\?/);
-            const queries =
-            parseQueryString(analyticsReq.url.substr('/bar'.length));
+            const queries = parseQueryString(
+              analyticsReq.url.substr('/bar'.length)
+            );
             expect(queries).to.include({
               title: 'AMP TEST', // ${title},
               cid: '', // ${clientId(a)}
@@ -56,12 +60,15 @@ describe('A4A', function() {
               navType: '0', // ${navType}
               navRedirectCount: '0', // ${navRedirectCount}
             });
-            expect(queries['ampdocUrl']).to.contain('http://localhost:9876/amp4test/compose-doc?');
+            expect(queries['ampdocUrl']).to.contain(
+              'http://localhost:9876/amp4test/compose-doc?'
+            );
             expect(queries['canonicalUrl']).to.equal('http://nonblocking.io/');
             expect(queries['img']).to.contain('/deposit/image'); // ${htmlAttr(amp-img,src)}
           });
         });
-  });
+    }
+  );
 
   const src = addParamsToUrl('/amp4test/compose-doc', {
     body: `
@@ -71,8 +78,10 @@ describe('A4A', function() {
     extensions: 'amp-bind',
     spec: 'amp4ads',
   });
-  describes.integration('amp-bind in A4A', {
-    body: `
+  describes.integration(
+    'amp-bind in A4A',
+    {
+      body: `
       <amp-ad width="300" height="400"
           id="i-amphtml-demo-id"
           type="fake"
@@ -81,26 +90,35 @@ describe('A4A', function() {
         <div fallback>Could not display the fake ad :(</div>
       </amp-ad>
       `,
-  }, env => {
-    it('p[text]', function*() {
-      // Wait for the amp-ad to construct its child iframe.
-      const ad = env.win.document.getElementById('i-amphtml-demo-id');
-      yield poll('amp-ad > iframe', () => ad.querySelector('iframe'));
+    },
+    env => {
+      it('p[text]', function*() {
+        // Wait for the amp-ad to construct its child iframe.
+        const ad = env.win.document.getElementById('i-amphtml-demo-id');
+        yield poll('amp-ad > iframe', () => ad.querySelector('iframe'));
 
-      // Wait for the iframe contents to load.
-      const fie = ad.querySelector('iframe').contentWindow;
-      yield poll('iframe > button', () => fie.document.querySelector('button'));
+        // Wait for the iframe contents to load.
+        const fie = ad.querySelector('iframe').contentWindow;
+        yield poll('iframe > button', () =>
+          fie.document.querySelector('button')
+        );
 
-      const text = fie.document.querySelector('p');
-      expect(text.textContent).to.equal('123');
+        const text = fie.document.querySelector('p');
+        expect(text.textContent).to.equal('123');
 
-      const button = fie.document.querySelector('button');
-      return poll('[text]', () => {
-        // We click this too many times but there's no good way to tell whether
-        // amp-bind is initialized yet.
-        button.click();
-        return text.textContent === '456';
-      }, /* onError */ undefined, 5000);
-    });
-  });
+        const button = fie.document.querySelector('button');
+        return poll(
+          '[text]',
+          () => {
+            // We click this too many times but there's no good way to tell whether
+            // amp-bind is initialized yet.
+            button.click();
+            return text.textContent === '456';
+          },
+          /* onError */ undefined,
+          5000
+        );
+      });
+    }
+  );
 });
diff --git a/test/integration/test-amp-analytics.js b/test/integration/test-amp-analytics.js
index 450a81f2bdd7..853182fbbbc3 100644
--- a/test/integration/test-amp-analytics.js
+++ b/test/integration/test-amp-analytics.js
@@ -18,8 +18,10 @@ import {BrowserController, RequestBank} from '../../testing/test-helper';
 import {parseQueryString} from '../../src/url';
 
 describe('amp-analytics', function() {
-  describes.integration('basic pageview', {
-    body: `
+  describes.integration(
+    'basic pageview',
+    {
+      body: `
       <script>
         // initialize _cid cookie with a CLIENT_ID
         document.cookie='_cid=amp-12345';
@@ -49,24 +51,30 @@ describe('amp-analytics', function() {
         }
         </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, () => {
-    afterEach(() => {
-      // clean up written _cid cookie
-      document.cookie = '_cid=;expires=' + new Date(0).toUTCString();
-    });
+      extensions: ['amp-analytics'],
+    },
+    () => {
+      afterEach(() => {
+        // clean up written _cid cookie
+        document.cookie = '_cid=;expires=' + new Date(0).toUTCString();
+      });
 
-    it('should send request', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/?a=2&b=AMP%20TEST&cid=amp-12345');
-        expect(req.headers.referer,
-            'should keep referrer if no referrerpolicy specified').to.be.ok;
+      it('should send request', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/?a=2&b=AMP%20TEST&cid=amp-12345');
+          expect(
+            req.headers.referer,
+            'should keep referrer if no referrerpolicy specified'
+          ).to.be.ok;
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('click trigger', {
-    body: `
+  describes.integration(
+    'click trigger',
+    {
+      body: `
       <a href="javascript:;"
           data-vars-foo-bar="hello world"
           data-vars-bar-foo="2">
@@ -96,26 +104,30 @@ describe('amp-analytics', function() {
         </script>
       </amp-analytics>
       `,
-    extensions: ['amp-analytics'],
-  }, env => {
-    let browser;
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      let browser;
 
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should send request', () => {
-      const reqPromise = RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/?f=hello%20world&b=2');
+      it('should send request', () => {
+        const reqPromise = RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/?f=hello%20world&b=2');
+        });
+        browser.click('a');
+        return reqPromise;
       });
-      browser.click('a');
-      return reqPromise;
-    });
-  });
+    }
+  );
 
-  describes.integration('scroll trigger', {
-    body: `
+  describes.integration(
+    'scroll trigger',
+    {
+      body: `
       <amp-analytics>
         <script type="application/json">
         {
@@ -145,29 +157,33 @@ describe('amp-analytics', function() {
         2nd viewport
       </div>
       `,
-    extensions: ['amp-analytics'],
-  }, env => {
-    let browser;
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      let browser;
 
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should trigger on scroll', () => {
-      const reqPromise = RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/?scrollTop=75&scrollHeight=300');
+      it('should trigger on scroll', () => {
+        const reqPromise = RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/?scrollTop=75&scrollHeight=300');
+        });
+        // verticalBoundaries is set to 70%
+        // (windowHeight + scrollTop) / scrollHeight = (150 + 75) / 300 = 75%
+        // so scrolling 75px guarantees a triggering
+        browser.scrollTo(75);
+        return reqPromise;
       });
-      // verticalBoundaries is set to 70%
-      // (windowHeight + scrollTop) / scrollHeight = (150 + 75) / 300 = 75%
-      // so scrolling 75px guarantees a triggering
-      browser.scrollTo(75);
-      return reqPromise;
-    });
-  });
+    }
+  );
 
-  describes.integration('element visible trigger', {
-    body: `
+  describes.integration(
+    'element visible trigger',
+    {
+      body: `
       <amp-analytics>
         <script type="application/json">
         {
@@ -201,27 +217,31 @@ describe('amp-analytics', function() {
       <amp-img layout="fixed" width="300" height="150"
           src="/examples/img/bigbuckbunny.jpg"></amp-img>
       `,
-    extensions: ['amp-analytics'],
-  }, env => {
-    let browser;
-
-    beforeEach(() => {
-      browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      let browser;
 
-    it('should trigger when image being 50% visible for 0.5s', () => {
-      let scrollTime = Infinity;
-      const reqPromise = RequestBank.withdraw().then(req => {
-        const q = parseQueryString(req.url.substr(1));
-        expect(Date.now()).to.be.not.below(scrollTime + 500);
-        expect(parseInt(q['timestamp'], 10)).to.be.not.below(scrollTime + 500);
-        expect(q['loadTimeVisibility']).to.equal('0');
-        expect(parseFloat(q['maxVisiblePercentage'])).to.be.above(50);
-        expect(parseFloat(q['totalVisibleTime'])).to.be.not.below(500);
+      beforeEach(() => {
+        browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
       });
 
-      browser.wait(1000) // wait for amp-analytics to start so loadTimeVisibility=0
+      it('should trigger when image being 50% visible for 0.5s', () => {
+        let scrollTime = Infinity;
+        const reqPromise = RequestBank.withdraw().then(req => {
+          const q = parseQueryString(req.url.substr(1));
+          expect(Date.now()).to.be.not.below(scrollTime + 500);
+          expect(parseInt(q['timestamp'], 10)).to.be.not.below(
+            scrollTime + 500
+          );
+          expect(q['loadTimeVisibility']).to.equal('0');
+          expect(parseFloat(q['maxVisiblePercentage'])).to.be.above(50);
+          expect(parseFloat(q['totalVisibleTime'])).to.be.not.below(500);
+        });
+
+        browser
+          .wait(1000) // wait for amp-analytics to start so loadTimeVisibility=0
           .then(() => browser.scrollTo(50)) // image 50/150 visible
           .then(() => browser.wait(1000)) // wait for a 1s to make sure no trigger
           .then(() => {
@@ -229,12 +249,15 @@ describe('amp-analytics', function() {
             browser.scrollTo(80); // image 80/150 visible
             // keep visible for 0.5s to fire a ping
           });
-      return reqPromise;
-    });
-  });
+        return reqPromise;
+      });
+    }
+  );
 
-  describes.integration('timer trigger', {
-    body: `
+  describes.integration(
+    'timer trigger',
+    {
+      body: `
       <amp-analytics>
         <script type="application/json">
         {
@@ -261,29 +284,37 @@ describe('amp-analytics', function() {
         </script>
       </amp-analytics>
       `,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should trigger 1s after amp-analytics starts', () => {
-      const startTime = Date.now();
-      return RequestBank.withdraw().then(req => {
-        const q = parseQueryString(req.url.substr(1));
-        const timerStart = parseFloat(q['timerStart']);
-        expect(timerStart + 1000).to.be.at.most(Date.now());
-        expect(timerStart + 1000).to.be.at.most(parseInt(q['timestamp'], 10));
-        // Verify that timerStart is about current time
-        expect(timerStart - startTime).to.be.above(-1000).and.below(1000);
-        expect(parseFloat(q['timerDuration'])).to.be.at.least(950).below(1100);
+      it('should trigger 1s after amp-analytics starts', () => {
+        const startTime = Date.now();
+        return RequestBank.withdraw().then(req => {
+          const q = parseQueryString(req.url.substr(1));
+          const timerStart = parseFloat(q['timerStart']);
+          expect(timerStart + 1000).to.be.at.most(Date.now());
+          expect(timerStart + 1000).to.be.at.most(parseInt(q['timestamp'], 10));
+          // Verify that timerStart is about current time
+          expect(timerStart - startTime)
+            .to.be.above(-1000)
+            .and.below(1000);
+          expect(parseFloat(q['timerDuration']))
+            .to.be.at.least(950)
+            .below(1100);
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('CLIENT_ID new user', {
-    body: `
+  describes.integration(
+    'CLIENT_ID new user',
+    {
+      body: `
       <script>
         // expires existing _cid cookie if any
         document.cookie='_cid=;expires=' + new Date(0).toUTCString();
@@ -319,39 +350,42 @@ describe('amp-analytics', function() {
         </script>
       </amp-analytics>
       `,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    afterEach(() => {
-      // clean up written _cid cookie
-      document.cookie = '_cid=;expires=' + new Date(0).toUTCString();
-    });
+      afterEach(() => {
+        // clean up written _cid cookie
+        document.cookie = '_cid=;expires=' + new Date(0).toUTCString();
+      });
 
-    it('should assign new cid', () => {
-      return Promise.all([
-        RequestBank.withdraw(1),
-        RequestBank.withdraw(2),
-      ]).then(reqs => {
-        const req1 = reqs[0];
-        const req2 = reqs[1];
-        expect(req1.url).to.match(/^\/\?cid=/);
-        expect(req2.url).to.match(/^\/\?cid=/);
-        const cid1 = req1.url.substr('/?cid='.length);
-        const cid2 = req2.url.substr('/?cid='.length);
-        expect(cid1).to.match(/^amp-/);
-        expect(cid2).to.equal(cid1);
-        expect(document.cookie).to.contain('_cid=' + cid1);
+      it('should assign new cid', () => {
+        return Promise.all([
+          RequestBank.withdraw(1),
+          RequestBank.withdraw(2),
+        ]).then(reqs => {
+          const req1 = reqs[0];
+          const req2 = reqs[1];
+          expect(req1.url).to.match(/^\/\?cid=/);
+          expect(req2.url).to.match(/^\/\?cid=/);
+          const cid1 = req1.url.substr('/?cid='.length);
+          const cid2 = req2.url.substr('/?cid='.length);
+          expect(cid1).to.match(/^amp-/);
+          expect(cid2).to.equal(cid1);
+          expect(document.cookie).to.contain('_cid=' + cid1);
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('batch', {
-    body:
-      `<amp-analytics>
+  describes.integration(
+    'batch',
+    {
+      body: `<amp-analytics>
         <script type="application/json">
         {
           "requests": {
@@ -385,23 +419,26 @@ describe('amp-analytics', function() {
         }
         </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should send request in batch', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/?a=1&b=AMP%20TEST&a=1&b=AMP%20TEST');
+      it('should send request in batch', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/?a=1&b=AMP%20TEST&a=1&b=AMP%20TEST');
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('useBody', {
-    body:
-      `<amp-analytics>
+  describes.integration(
+    'useBody',
+    {
+      body: `<amp-analytics>
         <script type="application/json">
         {
           "requests": {
@@ -445,41 +482,44 @@ describe('amp-analytics', function() {
         }
         </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should send request use POST body payload', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/');
-        expect(JSON.parse(req.body)).to.deep.equal({
-          a: 2,
-          b: 'AMP TEST',
-          c: {
-            d: 'AMP TEST',
-            e: {
-              f: ['AMP TEST', 'AMP TEST'],
+      it('should send request use POST body payload', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/');
+          expect(JSON.parse(req.body)).to.deep.equal({
+            a: 2,
+            b: 'AMP TEST',
+            c: {
+              d: 'AMP TEST',
+              e: {
+                f: ['AMP TEST', 'AMP TEST'],
+              },
             },
-          },
-          g: ['AMP TEST', 'AMP TEST'],
-          '_c_a': 1,
-          '_c_b': {
-            'context.c': 'AMP TEST',
-            'context.d': {
-              'context.e': ['AMP TEST', 'AMP TEST'],
+            g: ['AMP TEST', 'AMP TEST'],
+            '_c_a': 1,
+            '_c_b': {
+              'context.c': 'AMP TEST',
+              'context.d': {
+                'context.e': ['AMP TEST', 'AMP TEST'],
+              },
             },
-          },
+          });
         });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('batch useBody', {
-    body:
-      `<amp-analytics>
+  describes.integration(
+    'batch useBody',
+    {
+      body: `<amp-analytics>
         <script type="application/json">
         {
           "requests": {
@@ -514,28 +554,36 @@ describe('amp-analytics', function() {
         }
         </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should send batch request use POST body payload', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/');
-        expect(JSON.parse(req.body)).to.deep.equal([{
-          a: 1, b: 'AMP TEST',
-        }, {
-          a: 1, b: 'AMP TEST',
-        }]);
+      it('should send batch request use POST body payload', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/');
+          expect(JSON.parse(req.body)).to.deep.equal([
+            {
+              a: 1,
+              b: 'AMP TEST',
+            },
+            {
+              a: 1,
+              b: 'AMP TEST',
+            },
+          ]);
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('referrerPolicy', {
-    body:
-      `<amp-analytics>
+  describes.integration(
+    'referrerPolicy',
+    {
+      body: `<amp-analytics>
           <script type="application/json">
           {
             "requests": {
@@ -553,24 +601,27 @@ describe('amp-analytics', function() {
           }
           </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should remove referrer if referrerpolicy=no-referrer', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/');
-        expect(req.headers.referer).to.not.be.ok;
+      it('should remove referrer if referrerpolicy=no-referrer', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/');
+          expect(req.headers.referer).to.not.be.ok;
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('configRewriter', {
-    body:
-      `<amp-analytics type="_fake_">
+  describes.integration(
+    'configRewriter',
+    {
+      body: `<amp-analytics type="_fake_">
           <script type="application/json">
           {
             "vars": {
@@ -586,33 +637,36 @@ describe('amp-analytics', function() {
           }
           </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should use config from server', () => {
-      return RequestBank.withdraw().then(req => {
-        // The config here should have been rewritten by the /analytics/rewriter
-        // endpoint. This logic is located in the file
-        // /build-system/routes/analytics.js
-        const body = JSON.parse(req.body);
-        expect(body.reqBody.configRewriter.vars).to.deep.equal({
-          name: 'cats',
-          title: 'AMP TEST',
-          title2: 'AMP TEST',
+      it('should use config from server', () => {
+        return RequestBank.withdraw().then(req => {
+          // The config here should have been rewritten by the /analytics/rewriter
+          // endpoint. This logic is located in the file
+          // /build-system/routes/analytics.js
+          const body = JSON.parse(req.body);
+          expect(body.reqBody.configRewriter.vars).to.deep.equal({
+            name: 'cats',
+            title: 'AMP TEST',
+            title2: 'AMP TEST',
+          });
+          expect(body.rewritten).to.be.true;
+          expect(body.testId).to.equal(12358);
         });
-        expect(body.rewritten).to.be.true;
-        expect(body.testId).to.equal(12358);
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('configRewriter without publisher config', {
-    body:
-      `<amp-analytics type="_fake_">
+  describes.integration(
+    'configRewriter without publisher config',
+    {
+      body: `<amp-analytics type="_fake_">
           <script type="application/json">
           {
             "vars": {
@@ -621,30 +675,34 @@ describe('amp-analytics', function() {
           }
           </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should use config from server', () => {
-      return RequestBank.withdraw().then(req => {
-        // The config here should have been rewritten by the /analytics/rewriter
-        // endpoint. This logic is located in the file
-        // /build-system/routes/analytics.js
-        const body = JSON.parse(req.body);
-        expect(body.reqBody.configRewriter.vars).to.deep.equal({
-          title2: 'AMP TEST',
+      it('should use config from server', () => {
+        return RequestBank.withdraw().then(req => {
+          // The config here should have been rewritten by the /analytics/rewriter
+          // endpoint. This logic is located in the file
+          // /build-system/routes/analytics.js
+          const body = JSON.parse(req.body);
+          expect(body.reqBody.configRewriter.vars).to.deep.equal({
+            title2: 'AMP TEST',
+          });
+          expect(body.rewritten).to.be.true;
+          expect(body.testId).to.equal(12358);
         });
-        expect(body.rewritten).to.be.true;
-        expect(body.testId).to.equal(12358);
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('type=googleanalytics', {
-    body: `
+  describes.integration(
+    'type=googleanalytics',
+    {
+      body: `
       <script>
         // initialize with a valid _ga cookie
         document.cookie='_ga=GA1.2.1427830804.1524174812';
@@ -673,56 +731,63 @@ describe('amp-analytics', function() {
         }
         </script>
       </amp-analytics>`,
-    extensions: ['amp-analytics'],
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+      extensions: ['amp-analytics'],
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    afterEach(() => {
-      // clean up written _ga cookie
-      document.cookie = '_ga=;expires=' + new Date(0).toUTCString();
-    });
+      afterEach(() => {
+        // clean up written _ga cookie
+        document.cookie = '_ga=;expires=' + new Date(0).toUTCString();
+      });
 
-    it('should send request', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.match(/^\/r\/collect\?/);
-        const queries = parseQueryString(req.url.substr('/r/collect'.length));
-        // see vendors/googleanalytics.js "pageview" request for config
-        expect(queries).to.include({
-          _v: 'a1',
-          _r: '1',
-          v: '1',
-          cid: '1427830804.1524174812',
-          dr: '',
-          ds: 'AMP',
-          dt: 'AMP TEST',
-          tid: 'UA-67833617-1',
-          t: 'pageview',
+      it('should send request', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.match(/^\/r\/collect\?/);
+          const queries = parseQueryString(req.url.substr('/r/collect'.length));
+          // see vendors/googleanalytics.js "pageview" request for config
+          expect(queries).to.include({
+            _v: 'a1',
+            _r: '1',
+            v: '1',
+            cid: '1427830804.1524174812',
+            dr: '',
+            ds: 'AMP',
+            dt: 'AMP TEST',
+            tid: 'UA-67833617-1',
+            t: 'pageview',
+          });
+          const isNumber = /^\d+$/;
+          const isRandomNumber = /^0\.\d+$/;
+          expect(queries['dl']).to.contain('/amp4test/compose-doc?'); // ${documentLocation}
+          expect(queries['_s']).to.match(isNumber); // ${requestCount}
+          expect(queries['_utmht']).to.match(isNumber); // ${timestamp}
+          expect(queries['sr']).to.match(/^\d+x\d+$/); // ${screenWidth}x${screenHeight}
+          expect(queries['sd']).to.match(isNumber); // ${screenColorDepth}
+          expect(queries['ul']).to.be.ok; // ${browserLanguage}
+          expect(queries['de']).to.be.ok; // ${documentCharset}
+          expect(queries['jid']).to.match(isRandomNumber); // ${random}
+          expect(queries['a']).to.match(isNumber); // ${pageViewId}
+          expect(queries['z']).to.match(isRandomNumber); // ${random}
         });
-        const isNumber = /^\d+$/;
-        const isRandomNumber = /^0\.\d+$/;
-        expect(queries['dl']).to.contain('/amp4test/compose-doc?'); // ${documentLocation}
-        expect(queries['_s']).to.match(isNumber); // ${requestCount}
-        expect(queries['_utmht']).to.match(isNumber); // ${timestamp}
-        expect(queries['sr']).to.match(/^\d+x\d+$/); // ${screenWidth}x${screenHeight}
-        expect(queries['sd']).to.match(isNumber); // ${screenColorDepth}
-        expect(queries['ul']).to.be.ok; // ${browserLanguage}
-        expect(queries['de']).to.be.ok; // ${documentCharset}
-        expect(queries['jid']).to.match(isRandomNumber); // ${random}
-        expect(queries['a']).to.match(isNumber); // ${pageViewId}
-        expect(queries['z']).to.match(isRandomNumber); // ${random}
       });
-    });
-  });
+    }
+  );
 
   // TODO: Find source of test failure on edge.
-  describe.configure().skipEdge().run('amp-analytics:shadow mode', function() {
-    describes.integration('basic pageview', {
-      // TODO(ccordry): Figure out how to write cookie in shadow case, so that
-      // we can verify CLIENT_ID() is reading the right value.
-      body: `
+  describe
+    .configure()
+    .skipEdge()
+    .run('amp-analytics:shadow mode', function() {
+      describes.integration(
+        'basic pageview',
+        {
+          // TODO(ccordry): Figure out how to write cookie in shadow case, so that
+          // we can verify CLIENT_ID() is reading the right value.
+          body: `
         <!-- put amp-analytics > 3 viewports away from viewport -->
         <div style="height: 400vh"></div>
         <amp-analytics>
@@ -748,17 +813,20 @@ describe('amp-analytics', function() {
           }
           </script>
         </amp-analytics>`,
-      extensions: ['amp-analytics'],
-      ampdoc: 'shadow',
-    }, () => {
-
-      it('should send request', () => {
-        return RequestBank.withdraw().then(req => {
-          expect(req.url).to.match(/\/?a=2&b=Shadow%20Viewer&cid=amp-.*/);
-          expect(req.headers.referer,
-              'should keep referrer if no referrerpolicy specified').to.be.ok;
-        });
-      });
+          extensions: ['amp-analytics'],
+          ampdoc: 'shadow',
+        },
+        () => {
+          it('should send request', () => {
+            return RequestBank.withdraw().then(req => {
+              expect(req.url).to.match(/\/?a=2&b=Shadow%20Viewer&cid=amp-.*/);
+              expect(
+                req.headers.referer,
+                'should keep referrer if no referrerpolicy specified'
+              ).to.be.ok;
+            });
+          });
+        }
+      );
     });
-  });
 });
diff --git a/test/integration/test-amp-bind.js b/test/integration/test-amp-bind.js
index 0512d2cc5c4e..523e52aa81a1 100644
--- a/test/integration/test-amp-bind.js
+++ b/test/integration/test-amp-bind.js
@@ -20,51 +20,60 @@ const TIMEOUT = 15000;
 
 // Skip Edge, which throws "Permission denied" errors when inspecting
 // element properties in the testing iframe (Edge 17, Windows 10).
-describe.configure().skipEdge().run('amp-bind', function() {
-  this.timeout(TIMEOUT);
-
-  // Helper that sets the poll timeout.
-  function poll(desc, condition, onError) {
-    return classicPoll(desc, condition, onError, TIMEOUT);
-  }
-
-  describes.integration('basic', {
-    /* eslint-disable max-len */
-    body: `
+describe
+  .configure()
+  .skipEdge()
+  .run('amp-bind', function() {
+    this.timeout(TIMEOUT);
+
+    // Helper that sets the poll timeout.
+    function poll(desc, condition, onError) {
+      return classicPoll(desc, condition, onError, TIMEOUT);
+    }
+
+    describes.integration(
+      'basic',
+      {
+        /* eslint-disable max-len */
+        body: `
       <button on="tap:AMP.setState({t: 'after_text'})" id="changeText"></button>
       <button on="tap:AMP.setState({c: 'after_class'})" id="changeClass"></button>
       <p class="before_class" [class]="c" [text]="t">before_text</p>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-bind'],
-  }, env => {
-    let browser;
-    let doc;
-    let text;
-
-    beforeEach(() => {
-      doc = env.win.document;
-      text = doc.querySelector('p');
-      browser = new BrowserController(env.win);
-    });
-
-    it('[text]', function*() {
-      expect(text.textContent).to.equal('before_text');
-      yield browser.wait(200);
-      browser.click('#changeText');
-      yield poll('[text]', () => text.textContent === 'after_text');
-    });
-
-    it('[class]', function*() {
-      expect(text.className).to.equal('before_class');
-      yield browser.wait(200);
-      browser.click('#changeClass');
-      yield poll('[class]', () => text.className === 'after_class');
-    });
-  });
-
-  describes.integration('+ amp-img', {
-    body: `
+        /* eslint-enable max-len */
+        extensions: ['amp-bind'],
+      },
+      env => {
+        let browser;
+        let doc;
+        let text;
+
+        beforeEach(() => {
+          doc = env.win.document;
+          text = doc.querySelector('p');
+          browser = new BrowserController(env.win);
+        });
+
+        it('[text]', function*() {
+          expect(text.textContent).to.equal('before_text');
+          yield browser.wait(200);
+          browser.click('#changeText');
+          yield poll('[text]', () => text.textContent === 'after_text');
+        });
+
+        it('[class]', function*() {
+          expect(text.className).to.equal('before_class');
+          yield browser.wait(200);
+          browser.click('#changeClass');
+          yield poll('[class]', () => text.className === 'after_class');
+        });
+      }
+    );
+
+    describes.integration(
+      '+ amp-img',
+      {
+        body: `
       <amp-img id="image" layout="responsive"
         src="http://example.com/before.jpg" [src]="src"
         alt="before_alt" [alt]="alt"
@@ -75,45 +84,53 @@ describe.configure().skipEdge().run('amp-bind', function() {
       <button on="tap:AMP.setState({alt: 'after_alt'})" id="changeAlt"></button>
       <button on="tap:AMP.setState({w: 2, h: 2})" id="changeSize"></button>
     `,
-    extensions: ['amp-bind'],
-  }, env => {
-    let doc, img;
-
-    beforeEach(() => {
-      doc = env.win.document;
-      img = doc.querySelector('amp-img');
-    });
-
-    it('[src] with valid URL', () => {
-      const button = doc.getElementById('changeSrc');
-      expect(img.getAttribute('src')).to.equal('http://example.com/before.jpg');
-      button.click();
-      return poll('[src]',
-          () => img.getAttribute('src') === 'http://example.com/after.jpg');
-    });
-
-    it('[alt]', () => {
-      const button = doc.getElementById('changeAlt');
-      expect(img.getAttribute('alt')).to.equal('before_alt');
-      button.click();
-      return poll('[src]', () => img.getAttribute('alt') === 'after_alt');
-    });
-
-    it('[width] and [height]', () => {
-      const button = doc.getElementById('changeSize');
-      expect(img.getAttribute('width')).to.equal('1');
-      expect(img.getAttribute('height')).to.equal('1');
-      button.click();
-      return Promise.all([
-        poll('[width]', () => img.getAttribute('width') === '2'),
-        poll('[height]', () => img.getAttribute('height') === '2'),
-      ]);
-    });
-  });
-
-  describes.integration('+ forms', {
-    /* eslint-disable max-len */
-    body: `
+        extensions: ['amp-bind'],
+      },
+      env => {
+        let doc, img;
+
+        beforeEach(() => {
+          doc = env.win.document;
+          img = doc.querySelector('amp-img');
+        });
+
+        it('[src] with valid URL', () => {
+          const button = doc.getElementById('changeSrc');
+          expect(img.getAttribute('src')).to.equal(
+            'http://example.com/before.jpg'
+          );
+          button.click();
+          return poll(
+            '[src]',
+            () => img.getAttribute('src') === 'http://example.com/after.jpg'
+          );
+        });
+
+        it('[alt]', () => {
+          const button = doc.getElementById('changeAlt');
+          expect(img.getAttribute('alt')).to.equal('before_alt');
+          button.click();
+          return poll('[src]', () => img.getAttribute('alt') === 'after_alt');
+        });
+
+        it('[width] and [height]', () => {
+          const button = doc.getElementById('changeSize');
+          expect(img.getAttribute('width')).to.equal('1');
+          expect(img.getAttribute('height')).to.equal('1');
+          button.click();
+          return Promise.all([
+            poll('[width]', () => img.getAttribute('width') === '2'),
+            poll('[height]', () => img.getAttribute('height') === '2'),
+          ]);
+        });
+      }
+    );
+
+    describes.integration(
+      '+ forms',
+      {
+        /* eslint-disable max-len */
+        body: `
       <input type="range" min=0 max=100 value=0 on="change:AMP.setState({rangeChange: event})">
       <p id="range" [text]="rangeChange.min + ' <= ' + rangeChange.value + ' <= ' + rangeChange.max">before_range</p>
 
@@ -124,65 +141,69 @@ describe.configure().skipEdge().run('amp-bind', function() {
       <input type="radio" on="change:AMP.setState({radioChange: event})">
       <p id="radio" [text]="'checked: ' + radioChange.checked" id="radioText">before_radio</p>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-bind'],
-  }, env => {
-    let doc;
-
-    beforeEach(() => {
-      doc = env.win.document;
-    });
-
-    it('input[type=range] on:change', () => {
-      const rangeText = doc.getElementById('range');
-      const range = doc.querySelector('input[type="range"]');
-      expect(rangeText.textContent).to.equal('before_range');
-      // Calling #click() on the range element will not generate a change event,
-      // so it must be generated manually.
-      range.value = 47;
-      range.dispatchEvent(new Event('change', {bubbles: true}));
-      poll('[text]', () => rangeText.textContent === '0 <= 47 <= 100');
-    });
-
-    it('input[type=checkbox] on:change', () => {
-      const checkboxText = doc.getElementById('checkbox');
-      const checkbox = doc.querySelector('input[type="checkbox"]');
-      expect(checkboxText.textContent).to.equal('before_check');
-      checkbox.click();
-      poll('[text]', () => checkboxText.textContent === 'checked: true');
-    });
-
-    it('[checked]', function*() {
-      const checkbox = doc.querySelector('input[type="checkbox"]');
-      const button = doc.querySelector('button');
-
-      checkbox.click();
-      // Note that attributes are initial values, properties are current values.
-      expect(checkbox.hasAttribute('checked')).to.be.false;
-      expect(checkbox.checked).to.be.true;
-
-      button.click();
-      yield poll('[checked]', () => !checkbox.checked);
-      expect(checkbox.hasAttribute('checked')).to.be.false;
-
-      button.click();
-      yield poll('[checked]', () => checkbox.checked);
-      // amp-bind sets both the attribute and property.
-      expect(checkbox.hasAttribute('checked')).to.be.true;
-    });
-
-    it('input[type=radio] on:change', () => {
-      const radioText = doc.getElementById('radio');
-      const radio = doc.querySelector('input[type="radio"]');
-      expect(radioText.textContent).to.equal('before_radio');
-      radio.click();
-      poll('[text]', () => radioText.textContent === 'checked: true');
-    });
-  });
-
-  describes.integration('+ amp-carousel', {
-    /* eslint-disable max-len */
-    body: `
+        /* eslint-enable max-len */
+        extensions: ['amp-bind'],
+      },
+      env => {
+        let doc;
+
+        beforeEach(() => {
+          doc = env.win.document;
+        });
+
+        it('input[type=range] on:change', () => {
+          const rangeText = doc.getElementById('range');
+          const range = doc.querySelector('input[type="range"]');
+          expect(rangeText.textContent).to.equal('before_range');
+          // Calling #click() on the range element will not generate a change event,
+          // so it must be generated manually.
+          range.value = 47;
+          range.dispatchEvent(new Event('change', {bubbles: true}));
+          poll('[text]', () => rangeText.textContent === '0 <= 47 <= 100');
+        });
+
+        it('input[type=checkbox] on:change', () => {
+          const checkboxText = doc.getElementById('checkbox');
+          const checkbox = doc.querySelector('input[type="checkbox"]');
+          expect(checkboxText.textContent).to.equal('before_check');
+          checkbox.click();
+          poll('[text]', () => checkboxText.textContent === 'checked: true');
+        });
+
+        it('[checked]', function*() {
+          const checkbox = doc.querySelector('input[type="checkbox"]');
+          const button = doc.querySelector('button');
+
+          checkbox.click();
+          // Note that attributes are initial values, properties are current values.
+          expect(checkbox.hasAttribute('checked')).to.be.false;
+          expect(checkbox.checked).to.be.true;
+
+          button.click();
+          yield poll('[checked]', () => !checkbox.checked);
+          expect(checkbox.hasAttribute('checked')).to.be.false;
+
+          button.click();
+          yield poll('[checked]', () => checkbox.checked);
+          // amp-bind sets both the attribute and property.
+          expect(checkbox.hasAttribute('checked')).to.be.true;
+        });
+
+        it('input[type=radio] on:change', () => {
+          const radioText = doc.getElementById('radio');
+          const radio = doc.querySelector('input[type="radio"]');
+          expect(radioText.textContent).to.equal('before_radio');
+          radio.click();
+          poll('[text]', () => radioText.textContent === 'checked: true');
+        });
+      }
+    );
+
+    describes.integration(
+      '+ amp-carousel',
+      {
+        /* eslint-disable max-len */
+        body: `
       <button on="tap:AMP.setState({slide: 1})" id="goToSlideOne"></button>
       <p [text]="slide">0</p>
       <amp-carousel type="slides" width=10 height=10
@@ -191,49 +212,58 @@ describe.configure().skipEdge().run('amp-bind', function() {
         <amp-img src="http://example.com/bar.jpg" width=10 height=10></amp-img>
       </amp-carousel>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-bind', 'amp-carousel'],
-  }, env => {
-    let doc, carousel, slideText;
-
-    beforeEach(() => {
-      doc = env.win.document;
-      carousel = doc.querySelector('amp-carousel');
-      slideText = doc.querySelector('p');
-
-      const browserController = new BrowserController(env.win);
-      return browserController.waitForElementLayout('amp-carousel');
-    });
-
-    it('on:slideChange', () => {
-      expect(slideText.textContent).to.equal('0');
-
-      const nextSlide = carousel.querySelector('div.amp-carousel-button-next');
-      nextSlide.click();
-      return poll('[slide]', () => slideText.textContent === '1');
-    });
-
-    it('[slide]', function*() {
-      const slides = carousel.querySelectorAll(
-          '.i-amphtml-slide-item > amp-img');
-      const first = slides[0];
-      const second = slides[1];
-
-      expect(first.getAttribute('aria-hidden')).to.equal('false');
-      expect(second.getAttribute('aria-hidden')).to.be.equal('true');
-
-      const button = doc.getElementById('goToSlideOne');
-      button.click();
-
-      yield poll('[slide]', () =>
-        first.getAttribute('aria-hidden') === 'true');
-      yield poll('[slide]', () =>
-        second.getAttribute('aria-hidden') === 'false');
-    });
-  });
+        /* eslint-enable max-len */
+        extensions: ['amp-bind', 'amp-carousel'],
+      },
+      env => {
+        let doc, carousel, slideText;
+
+        beforeEach(() => {
+          doc = env.win.document;
+          carousel = doc.querySelector('amp-carousel');
+          slideText = doc.querySelector('p');
+
+          const browserController = new BrowserController(env.win);
+          return browserController.waitForElementLayout('amp-carousel');
+        });
+
+        it('on:slideChange', () => {
+          expect(slideText.textContent).to.equal('0');
+
+          const nextSlide = carousel.querySelector(
+            'div.amp-carousel-button-next'
+          );
+          nextSlide.click();
+          return poll('[slide]', () => slideText.textContent === '1');
+        });
+
+        it('[slide]', function*() {
+          const slides = carousel.querySelectorAll(
+            '.i-amphtml-slide-item > amp-img'
+          );
+          const first = slides[0];
+          const second = slides[1];
+
+          expect(first.getAttribute('aria-hidden')).to.equal('false');
+          expect(second.getAttribute('aria-hidden')).to.be.equal('true');
+
+          const button = doc.getElementById('goToSlideOne');
+          button.click();
+
+          yield poll(
+            '[slide]',
+            () => first.getAttribute('aria-hidden') === 'true'
+          );
+          yield poll(
+            '[slide]',
+            () => second.getAttribute('aria-hidden') === 'false'
+          );
+        });
+      }
+    );
 
-  /* eslint-disable max-len */
-  const list = `
+    /* eslint-disable max-len */
+    const list = `
     <amp-state id="foo">
       <script type="application/json">
         {"bar": "123"}
@@ -246,50 +276,60 @@ describe.configure().skipEdge().run('amp-bind', function() {
       <p [text]="foo.bar"></p>
     </template>
   `;
-  /* eslint-enable max-len */
-
-  const listTests = env => {
-    let doc;
-    let list;
-    let browser;
-
-    beforeEach(() => {
-      doc = env.win.document;
-      list = doc.querySelector('amp-list');
-      browser = new BrowserController(env.win);
-    });
-
-    it('[src]', () => {
-      expect(list.getAttribute('src')).to.equal('/list/fruit-data/get?cors=0');
-      browser.click('button');
-      poll('[src]', () =>
-        list.getAttribute('src') === 'https://example.com/data');
-    });
-
-    it('evaluate bindings in children', function*() {
-      yield browser.waitForElementLayout('amp-list');
-      const children = list.querySelectorAll('p');
-      expect(children.length).to.equal(3);
-      children.forEach(span => {
-        expect(span.textContent).to.equal('123');
-      });
-    });
-  };
+    /* eslint-enable max-len */
 
-  // TODO(choumx): amp-mustache-0.1 is broken on --single_pass.
-  // describes.integration('+ amp-list, amp-mustache:0.1', {
-  //   body: list,
-  //   extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.1'],
-  // }, listTests);
+    const listTests = env => {
+      let doc;
+      let list;
+      let browser;
 
-  describes.integration('+ amp-list, amp-mustache:0.2', {
-    body: list,
-    extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.2'],
-  }, listTests);
+      beforeEach(() => {
+        doc = env.win.document;
+        list = doc.querySelector('amp-list');
+        browser = new BrowserController(env.win);
+      });
 
-  describes.integration('+ amp-selector', {
-    /* eslint-disable max-len */
-    body: `
+      it('[src]', () => {
+        expect(list.getAttribute('src')).to.equal(
+          '/list/fruit-data/get?cors=0'
+        );
+        browser.click('button');
+        poll(
+          '[src]',
+          () => list.getAttribute('src') === 'https://example.com/data'
+        );
+      });
+
+      it('evaluate bindings in children', function*() {
+        yield browser.waitForElementLayout('amp-list');
+        const children = list.querySelectorAll('p');
+        expect(children.length).to.equal(3);
+        children.forEach(span => {
+          expect(span.textContent).to.equal('123');
+        });
+      });
+    };
+
+    // TODO(choumx): amp-mustache-0.1 is broken on --single_pass.
+    // describes.integration('+ amp-list, amp-mustache:0.1', {
+    //   body: list,
+    //   extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.1'],
+    // }, listTests);
+
+    describes.integration(
+      '+ amp-list, amp-mustache:0.2',
+      {
+        body: list,
+        extensions: ['amp-bind', 'amp-list', 'amp-mustache:0.2'],
+      },
+      listTests
+    );
+
+    describes.integration(
+      '+ amp-selector',
+      {
+        /* eslint-disable max-len */
+        body: `
       <button on="tap:AMP.setState({selected: 2})"></button>
       <p [text]="selected"></p>
       <amp-selector layout="container" [selected]="selected" on="select:AMP.setState({selected: event.targetOption})">
@@ -298,43 +338,45 @@ describe.configure().skipEdge().run('amp-bind', function() {
         <amp-img src="/2.jpg" width=10 height=10 option=2></amp-img>
       </amp-selector>
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-bind', 'amp-selector'],
-  }, env => {
-    let doc, images, selectedText;
-
-    beforeEach(() => {
-      doc = env.win.document;
-      images = doc.getElementsByTagName('amp-img');
-      selectedText = doc.querySelector('p');
-
-      const browserController = new BrowserController(env.win);
-      return browserController.waitForElementLayout('amp-selector');
-    });
-
-    it('on:select', function*() {
-      expect(images[0].hasAttribute('selected')).to.be.false;
-      expect(images[1].hasAttribute('selected')).to.be.false;
-      expect(images[2].hasAttribute('selected')).to.be.false;
-      expect(selectedText.textContent).to.equal('');
-      images[1].click();
-      yield poll('[text]', () => selectedText.textContent === '1');
-      expect(images[0].hasAttribute('selected')).to.be.false;
-      expect(images[1].hasAttribute('selected')).to.be.true;
-      expect(images[2].hasAttribute('selected')).to.be.false;
-    });
-
-    it('[selected]', function*() {
-      const button = doc.querySelector('button');
-      expect(images[0].hasAttribute('selected')).to.be.false;
-      expect(images[1].hasAttribute('selected')).to.be.false;
-      expect(images[2].hasAttribute('selected')).to.be.false;
-      expect(selectedText.textContent).to.equal('');
-      button.click();
-      yield poll('[text]', () => selectedText.textContent === '2');
-      expect(images[0].hasAttribute('selected')).to.be.false;
-      expect(images[1].hasAttribute('selected')).to.be.false;
-      expect(images[2].hasAttribute('selected')).to.be.true;
-    });
+        /* eslint-enable max-len */
+        extensions: ['amp-bind', 'amp-selector'],
+      },
+      env => {
+        let doc, images, selectedText;
+
+        beforeEach(() => {
+          doc = env.win.document;
+          images = doc.getElementsByTagName('amp-img');
+          selectedText = doc.querySelector('p');
+
+          const browserController = new BrowserController(env.win);
+          return browserController.waitForElementLayout('amp-selector');
+        });
+
+        it('on:select', function*() {
+          expect(images[0].hasAttribute('selected')).to.be.false;
+          expect(images[1].hasAttribute('selected')).to.be.false;
+          expect(images[2].hasAttribute('selected')).to.be.false;
+          expect(selectedText.textContent).to.equal('');
+          images[1].click();
+          yield poll('[text]', () => selectedText.textContent === '1');
+          expect(images[0].hasAttribute('selected')).to.be.false;
+          expect(images[1].hasAttribute('selected')).to.be.true;
+          expect(images[2].hasAttribute('selected')).to.be.false;
+        });
+
+        it('[selected]', function*() {
+          const button = doc.querySelector('button');
+          expect(images[0].hasAttribute('selected')).to.be.false;
+          expect(images[1].hasAttribute('selected')).to.be.false;
+          expect(images[2].hasAttribute('selected')).to.be.false;
+          expect(selectedText.textContent).to.equal('');
+          button.click();
+          yield poll('[text]', () => selectedText.textContent === '2');
+          expect(images[0].hasAttribute('selected')).to.be.false;
+          expect(images[1].hasAttribute('selected')).to.be.false;
+          expect(images[2].hasAttribute('selected')).to.be.true;
+        });
+      }
+    );
   });
-});
diff --git a/test/integration/test-amp-carousel.js b/test/integration/test-amp-carousel.js
index 3ec081e3527b..0b797aec750a 100644
--- a/test/integration/test-amp-carousel.js
+++ b/test/integration/test-amp-carousel.js
@@ -16,10 +16,11 @@
 
 import {whenUpgradedToCustomElement} from '../../src/dom';
 
-const t = describe.configure()
-    .ifChrome()
-    .skipSinglePass()
-    .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+const t = describe
+  .configure()
+  .ifChrome()
+  .skipSinglePass()
+  .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
 
 t.run('amp-carousel', function() {
   this.timeout(10000);
@@ -40,45 +41,56 @@ t.run('amp-carousel', function() {
     });
   }
 
-  describes.integration('type=carousel with single image', {
-    body: carouselSingleImage,
-    extensions,
-  }, env => {
-
-    beforeEach(() => {
-      document = env.win.document;
-      return waitForCarouselLayout();
-    });
-
-    it('should be present', () => {
-      expect(document.querySelectorAll('amp-carousel')).to.have.length.above(0);
-    });
-
-    it('should not have the buttons visible ' +
-        'when amp-mode-mouse class is not on body', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-
-    it('should not have any buttons visible when theres only a single ' +
-       'item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-  });
+  describes.integration(
+    'type=carousel with single image',
+    {
+      body: carouselSingleImage,
+      extensions,
+    },
+    env => {
+      beforeEach(() => {
+        document = env.win.document;
+        return waitForCarouselLayout();
+      });
+
+      it('should be present', () => {
+        expect(document.querySelectorAll('amp-carousel')).to.have.length.above(
+          0
+        );
+      });
+
+      it(
+        'should not have the buttons visible ' +
+          'when amp-mode-mouse class is not on body',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+
+      it(
+        'should not have any buttons visible when theres only a single ' +
+          'item',
+        () => {
+          document.body.classList.add('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+    }
+  );
 
   const carouselMultipleImages = `
   <amp-carousel width=400 height=300 id="carousel-1">
@@ -88,94 +100,104 @@ t.run('amp-carousel', function() {
   </amp-carousel>
   `;
 
-  describes.integration('type=carousel with multiple images', {
-    body: carouselMultipleImages,
-    extensions,
-  }, env => {
-    beforeEach(() => {
-      document = env.win.document;
-      return waitForCarouselLayout();
-    });
-
-    it('should be present', () => {
-      expect(document.querySelectorAll('amp-carousel')).to.have.length.above(0);
-    });
-
-    it('should not have the buttons visible ' +
-        'when amp-mode-mouse class is not on body', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-
-    it.skip('should have the next button visible when amp-mode-mouse ' +
-        'class is not on body & `controls` specified', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      amp.setAttribute('controls', '');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.visible;
-    });
-
-    it.skip('should only have the next button enabled ' +
-       'when on first item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.visible;
-    });
-
-    it.skip('should not be able to go past the first or last item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const impl = amp.implementation_;
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.have.class('amp-disabled');
-      impl.goCallback(-1, false);
-      expect(prevBtn).to.have.class('amp-disabled');
-      impl.goCallback(1, false);
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      impl.goCallback(1, false);
-      impl.goCallback(1, false);
-      expect(nextBtn).to.have.class('amp-disabled');
-      impl.goCallback(-1, false);
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      impl.goCallback(-1, false);
-      expect(prevBtn).to.have.class('amp-disabled');
-    });
-
-    it.skip('should only have the prev button enabled ' +
-       'when on last item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const impl = amp.implementation_;
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      impl.goCallback(1, false);
-      impl.goCallback(1, false);
-      impl.goCallback(1, false);
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.have.class('amp-disabled');
-    });
-  });
+  describes.integration(
+    'type=carousel with multiple images',
+    {
+      body: carouselMultipleImages,
+      extensions,
+    },
+    env => {
+      beforeEach(() => {
+        document = env.win.document;
+        return waitForCarouselLayout();
+      });
+
+      it('should be present', () => {
+        expect(document.querySelectorAll('amp-carousel')).to.have.length.above(
+          0
+        );
+      });
+
+      it(
+        'should not have the buttons visible ' +
+          'when amp-mode-mouse class is not on body',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+
+      it.skip(
+        'should have the next button visible when amp-mode-mouse ' +
+          'class is not on body & `controls` specified',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          amp.setAttribute('controls', '');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.visible;
+        }
+      );
+
+      it.skip('should only have the next button enabled when on first item', () => {
+        document.body.classList.add('amp-mode-mouse');
+        const amp = document.querySelector('#carousel-1');
+        const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+        const nextBtn = amp.querySelector('.amp-carousel-button-next');
+        expect(prevBtn).to.not.be.null;
+        expect(nextBtn).to.not.be.null;
+        expect(prevBtn).to.be.hidden;
+        expect(nextBtn).to.be.visible;
+      });
+
+      it.skip('should not be able to go past the first or last item', () => {
+        document.body.classList.add('amp-mode-mouse');
+        const amp = document.querySelector('#carousel-1');
+        const impl = amp.implementation_;
+        const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+        const nextBtn = amp.querySelector('.amp-carousel-button-next');
+        expect(prevBtn).to.have.class('amp-disabled');
+        impl.goCallback(-1, false);
+        expect(prevBtn).to.have.class('amp-disabled');
+        impl.goCallback(1, false);
+        expect(prevBtn).to.not.have.class('amp-disabled');
+        impl.goCallback(1, false);
+        impl.goCallback(1, false);
+        expect(nextBtn).to.have.class('amp-disabled');
+        impl.goCallback(-1, false);
+        expect(prevBtn).to.not.have.class('amp-disabled');
+        impl.goCallback(-1, false);
+        expect(prevBtn).to.have.class('amp-disabled');
+      });
+
+      it.skip('should only have the prev button enabled when on last item', () => {
+        document.body.classList.add('amp-mode-mouse');
+        const amp = document.querySelector('#carousel-1');
+        const impl = amp.implementation_;
+        const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+        const nextBtn = amp.querySelector('.amp-carousel-button-next');
+        expect(prevBtn).to.have.class('amp-disabled');
+        expect(nextBtn).to.not.have.class('amp-disabled');
+        impl.goCallback(1, false);
+        impl.goCallback(1, false);
+        impl.goCallback(1, false);
+        expect(prevBtn).to.not.have.class('amp-disabled');
+        expect(nextBtn).to.have.class('amp-disabled');
+      });
+    }
+  );
 
   const slidesSingleImage = `
   <amp-carousel width=400 height=300 type=slides id="carousel-1">
@@ -183,44 +205,56 @@ t.run('amp-carousel', function() {
   </amp-carousel>
   `;
 
-  describes.integration('type=slides with single image', {
-    body: slidesSingleImage,
-    extensions,
-  }, env => {
-    beforeEach(() => {
-      document = env.win.document;
-      return waitForCarouselLayout();
-    });
-
-    it('should be present', () => {
-      expect(document.querySelectorAll('amp-carousel')).to.have.length.above(0);
-    });
-
-    it('should not have the buttons visible ' +
-        'when amp-mode-mouse class is not on body', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-
-    it('(type=slides) should not have any buttons enabled when theres ' +
-       'only a single item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-  });
+  describes.integration(
+    'type=slides with single image',
+    {
+      body: slidesSingleImage,
+      extensions,
+    },
+    env => {
+      beforeEach(() => {
+        document = env.win.document;
+        return waitForCarouselLayout();
+      });
+
+      it('should be present', () => {
+        expect(document.querySelectorAll('amp-carousel')).to.have.length.above(
+          0
+        );
+      });
+
+      it(
+        'should not have the buttons visible ' +
+          'when amp-mode-mouse class is not on body',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+
+      it(
+        '(type=slides) should not have any buttons enabled when theres ' +
+          'only a single item',
+        () => {
+          document.body.classList.add('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+    }
+  );
 
   const slidesMultipleImages = `
   <amp-carousel width=400 height=300 type=slides id="carousel-1">
@@ -230,73 +264,83 @@ t.run('amp-carousel', function() {
   </amp-carousel>
   `;
 
-  describes.integration('type=slides with multiple images', {
-    body: slidesMultipleImages,
-    extensions,
-  }, env => {
-    beforeEach(() => {
-      document = env.win.document;
-      return waitForCarouselLayout();
-    });
-
-    it('should be present', () => {
-      expect(document.querySelectorAll('amp-carousel')).to.have.length.above(0);
-    });
-
-    it('should not have the buttons visible ' +
-        'when amp-mode-mouse class is not on body', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.hidden;
-    });
-
-    it('should have the buttons visible when amp-mode-mouse ' +
-        'class is not on body & `controls` specified', () => {
-      document.body.classList.remove('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      amp.setAttribute('controls', '');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(document.body).to.not.have.class('amp-mode-mouse');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.visible;
-    });
-
-    it('should only have the next button enabled ' +
-       'when on first item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.hidden;
-      expect(nextBtn).to.be.visible;
-    });
-
-    it.skip('should only have the prev button enabled ' +
-       'when on last item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const impl = amp.implementation_;
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(prevBtn).to.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      impl.goCallback(1, false);
-      impl.goCallback(1, false);
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.have.class('amp-disabled');
-    });
-  });
+  describes.integration(
+    'type=slides with multiple images',
+    {
+      body: slidesMultipleImages,
+      extensions,
+    },
+    env => {
+      beforeEach(() => {
+        document = env.win.document;
+        return waitForCarouselLayout();
+      });
+
+      it('should be present', () => {
+        expect(document.querySelectorAll('amp-carousel')).to.have.length.above(
+          0
+        );
+      });
+
+      it(
+        'should not have the buttons visible ' +
+          'when amp-mode-mouse class is not on body',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.hidden;
+        }
+      );
+
+      it(
+        'should have the buttons visible when amp-mode-mouse ' +
+          'class is not on body & `controls` specified',
+        () => {
+          document.body.classList.remove('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          amp.setAttribute('controls', '');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(document.body).to.not.have.class('amp-mode-mouse');
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.hidden;
+          expect(nextBtn).to.be.visible;
+        }
+      );
+
+      it('should only have the next button enabled when on first item', () => {
+        document.body.classList.add('amp-mode-mouse');
+        const amp = document.querySelector('#carousel-1');
+        const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+        const nextBtn = amp.querySelector('.amp-carousel-button-next');
+        expect(prevBtn).to.not.be.null;
+        expect(nextBtn).to.not.be.null;
+        expect(prevBtn).to.be.hidden;
+        expect(nextBtn).to.be.visible;
+      });
+
+      it.skip('should only have the prev button enabled when on last item', () => {
+        document.body.classList.add('amp-mode-mouse');
+        const amp = document.querySelector('#carousel-1');
+        const impl = amp.implementation_;
+        const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+        const nextBtn = amp.querySelector('.amp-carousel-button-next');
+        expect(prevBtn).to.have.class('amp-disabled');
+        expect(nextBtn).to.not.have.class('amp-disabled');
+        impl.goCallback(1, false);
+        impl.goCallback(1, false);
+        expect(prevBtn).to.not.have.class('amp-disabled');
+        expect(nextBtn).to.have.class('amp-disabled');
+      });
+    }
+  );
 
   const slidesMultipleImagesControlsLoop = `
   <amp-carousel width=400 height=300 type=slides id="carousel-1" controls loop>
@@ -306,48 +350,57 @@ t.run('amp-carousel', function() {
   </amp-carousel>
   `;
 
-  describes.integration('type=slides with multiple images', {
-    body: slidesMultipleImagesControlsLoop,
-    extensions,
-  }, env => {
-    beforeEach(() => {
-      document = env.win.document;
-      return waitForCarouselLayout();
-    });
-
-    it('should be present', () => {
-      expect(document.querySelectorAll('amp-carousel')).to.have.length.above(0);
-    });
-
-    it('(type=slides loop) should always have a prev and next button be ' +
-    'able to get past the first and last item', () => {
-      document.body.classList.add('amp-mode-mouse');
-      const amp = document.querySelector('#carousel-1');
-      const prevBtn = amp.querySelector('.amp-carousel-button-prev');
-      const nextBtn = amp.querySelector('.amp-carousel-button-next');
-      expect(amp.hasAttribute('loop')).to.be.true;
-      expect(amp.hasAttribute('controls')).to.be.true;
-      expect(prevBtn).to.not.be.null;
-      expect(nextBtn).to.not.be.null;
-      expect(prevBtn).to.be.visible;
-      expect(nextBtn).to.be.visible;
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      nextBtn.click();
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      nextBtn.click();
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      nextBtn.click();
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      nextBtn.click();
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-      nextBtn.click();
-      expect(prevBtn).to.not.have.class('amp-disabled');
-      expect(nextBtn).to.not.have.class('amp-disabled');
-    });
-  });
+  describes.integration(
+    'type=slides with multiple images',
+    {
+      body: slidesMultipleImagesControlsLoop,
+      extensions,
+    },
+    env => {
+      beforeEach(() => {
+        document = env.win.document;
+        return waitForCarouselLayout();
+      });
+
+      it('should be present', () => {
+        expect(document.querySelectorAll('amp-carousel')).to.have.length.above(
+          0
+        );
+      });
+
+      it(
+        '(type=slides loop) should always have a prev and next button be ' +
+          'able to get past the first and last item',
+        () => {
+          document.body.classList.add('amp-mode-mouse');
+          const amp = document.querySelector('#carousel-1');
+          const prevBtn = amp.querySelector('.amp-carousel-button-prev');
+          const nextBtn = amp.querySelector('.amp-carousel-button-next');
+          expect(amp.hasAttribute('loop')).to.be.true;
+          expect(amp.hasAttribute('controls')).to.be.true;
+          expect(prevBtn).to.not.be.null;
+          expect(nextBtn).to.not.be.null;
+          expect(prevBtn).to.be.visible;
+          expect(nextBtn).to.be.visible;
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+          nextBtn.click();
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+          nextBtn.click();
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+          nextBtn.click();
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+          nextBtn.click();
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+          nextBtn.click();
+          expect(prevBtn).to.not.have.class('amp-disabled');
+          expect(nextBtn).to.not.have.class('amp-disabled');
+        }
+      );
+    }
+  );
 });
diff --git a/test/integration/test-amp-img.js b/test/integration/test-amp-img.js
index bf93caa6f8ef..6731f554125d 100644
--- a/test/integration/test-amp-img.js
+++ b/test/integration/test-amp-img.js
@@ -20,103 +20,122 @@ import {
   expectBodyToBecomeVisible,
 } from '../../testing/iframe.js';
 
-describe.configure().retryOnSaucelabs().run('Rendering of amp-img', () => {
-  const timeout = window.ampTestRuntimeConfig.mochaTimeout;
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('Rendering of amp-img', () => {
+    const timeout = window.ampTestRuntimeConfig.mochaTimeout;
 
-  let fixture;
-  beforeEach(() => {
-    return createFixtureIframe('test/fixtures/images.html', 500).then(f => {
-      fixture = f;
+    let fixture;
+    beforeEach(() => {
+      return createFixtureIframe('test/fixtures/images.html', 500).then(f => {
+        fixture = f;
+      });
     });
-  });
 
-  it('should show the body in image test', () => {
-    return expectBodyToBecomeVisible(fixture.win, timeout);
-  });
-
-  it('should be present', () => {
-    expect(fixture.doc.querySelectorAll('amp-img')).to.have.length(16);
-    // 5 image visible in 500 pixel height. Note that there will be no load
-    // event for the inabox image.
-    return fixture.awaitEvent(AmpEvents.LOAD_START, 3).then(function() {
-      expect(fixture.doc.querySelectorAll('amp-img img[src]')).to
-          .have.length(4);
+    it('should show the body in image test', () => {
+      return expectBodyToBecomeVisible(fixture.win, timeout);
     });
-  });
 
-  it('should resize and load more elements', () => {
-    // Note that there will be no load event for the inabox image.
-    const p = fixture.awaitEvent(AmpEvents.LOAD_START, 11).then(function() {
-      expect(fixture.doc.querySelectorAll('amp-img img[src]'))
-          .to.have.length(12);
-      fixture.iframe.height = 2000;
-      fixture.win.dispatchEvent(new fixture.win.Event('resize'));
-      return fixture.awaitEvent(AmpEvents.LOAD_START, 13).then(function() {
-        expect(fixture.doc.querySelectorAll('amp-img img[src]'))
-            .to.have.length(14);
+    it('should be present', () => {
+      expect(fixture.doc.querySelectorAll('amp-img')).to.have.length(16);
+      // 5 image visible in 500 pixel height. Note that there will be no load
+      // event for the inabox image.
+      return fixture.awaitEvent(AmpEvents.LOAD_START, 3).then(function() {
+        expect(fixture.doc.querySelectorAll('amp-img img[src]')).to.have.length(
+          4
+        );
       });
     });
-    fixture.iframe.height = 1500;
-    fixture.win.dispatchEvent(new fixture.win.Event('resize'));
-    return p;
-  });
 
-  it('should respect media queries', () => {
-    return fixture.awaitEvent(AmpEvents.LOAD_START, 3).then(() => {
-      return new Promise(res => setTimeout(res, 1));
-    }).then(function() {
-      const smallScreen = fixture.doc.getElementById('img3');
-      const largeScreen = fixture.doc.getElementById('img3_1');
-      expect(smallScreen.className)
-          .to.not.match(/i-amphtml-hidden-by-media-query/);
-      expect(largeScreen.className).to.match(/i-amphtml-hidden-by-media-query/);
-      expect(smallScreen.offsetHeight).to.not.equal(0);
-      expect(largeScreen.offsetHeight).to.equal(0);
-      fixture.iframe.width = 600;
-      fixture.win.dispatchEvent(new fixture.win.Event('resize'));
-      return fixture.awaitEvent(AmpEvents.LOAD_START, 4).then(function() {
-        expect(smallScreen.className)
-            .to.match(/i-amphtml-hidden-by-media-query/);
-        expect(largeScreen.className)
-            .to.not.match(/i-amphtml-hidden-by-media-query/);
-        expect(smallScreen.offsetHeight).to.equal(0);
-        expect(largeScreen.offsetHeight).to.not.equal(0);
+    it('should resize and load more elements', () => {
+      // Note that there will be no load event for the inabox image.
+      const p = fixture.awaitEvent(AmpEvents.LOAD_START, 11).then(function() {
+        expect(fixture.doc.querySelectorAll('amp-img img[src]')).to.have.length(
+          12
+        );
+        fixture.iframe.height = 2000;
+        fixture.win.dispatchEvent(new fixture.win.Event('resize'));
+        return fixture.awaitEvent(AmpEvents.LOAD_START, 13).then(function() {
+          expect(
+            fixture.doc.querySelectorAll('amp-img img[src]')
+          ).to.have.length(14);
+        });
       });
+      fixture.iframe.height = 1500;
+      fixture.win.dispatchEvent(new fixture.win.Event('resize'));
+      return p;
     });
-  });
 
-  it('should not load image if already present (inabox)', () => {
-    return fixture.awaitEvent(AmpEvents.LOAD_START, 3).then(function() {
-      const ampImage = fixture.doc.getElementById('img8');
-      expect(ampImage).is.ok;
-      expect(ampImage.querySelectorAll('img').length).to.equal(1);
+    it('should respect media queries', () => {
+      return fixture
+        .awaitEvent(AmpEvents.LOAD_START, 3)
+        .then(() => {
+          return new Promise(res => setTimeout(res, 1));
+        })
+        .then(function() {
+          const smallScreen = fixture.doc.getElementById('img3');
+          const largeScreen = fixture.doc.getElementById('img3_1');
+          expect(smallScreen.className).to.not.match(
+            /i-amphtml-hidden-by-media-query/
+          );
+          expect(largeScreen.className).to.match(
+            /i-amphtml-hidden-by-media-query/
+          );
+          expect(smallScreen.offsetHeight).to.not.equal(0);
+          expect(largeScreen.offsetHeight).to.equal(0);
+          fixture.iframe.width = 600;
+          fixture.win.dispatchEvent(new fixture.win.Event('resize'));
+          return fixture.awaitEvent(AmpEvents.LOAD_START, 4).then(function() {
+            expect(smallScreen.className).to.match(
+              /i-amphtml-hidden-by-media-query/
+            );
+            expect(largeScreen.className).to.not.match(
+              /i-amphtml-hidden-by-media-query/
+            );
+            expect(smallScreen.offsetHeight).to.equal(0);
+            expect(largeScreen.offsetHeight).to.not.equal(0);
+          });
+        });
+    });
+
+    it('should not load image if already present (inabox)', () => {
+      return fixture.awaitEvent(AmpEvents.LOAD_START, 3).then(function() {
+        const ampImage = fixture.doc.getElementById('img8');
+        expect(ampImage).is.ok;
+        expect(ampImage.querySelectorAll('img').length).to.equal(1);
+      });
     });
-  });
 
-  const body = `
+    const body = `
   <amp-img id="img0" srcset="/examples/img/hero@1x.jpg 641w,
                    /examples/img/hero@2x.jpg 1282w"
     width=641 height=480 layout=responsive></amp-img>
   `;
 
-  describes.integration('Internet Explorer edge cases', {
-    body,
-  }, env => {
-
-    let win;
-    beforeEach(() => {
-      win = env.win;
-    });
-
-    // IE doesn't support the srcset attribute, so if the developer
-    // provides a srcset but no src to amp-img, it should set the src
-    // attribute to the first entry in srcset.
-    it.configure().ifIe()
-        .run('should guarantee src if srcset is not supported', () => {
-          const ampImg = win.document.getElementById('img0');
-          const img = ampImg.querySelector('img');
-          expect(img.getAttribute('src')).to.equal('/examples/img/hero@1x.jpg');
+    describes.integration(
+      'Internet Explorer edge cases',
+      {
+        body,
+      },
+      env => {
+        let win;
+        beforeEach(() => {
+          win = env.win;
         });
-  });
-});
 
+        // IE doesn't support the srcset attribute, so if the developer
+        // provides a srcset but no src to amp-img, it should set the src
+        // attribute to the first entry in srcset.
+        it.configure()
+          .ifIe()
+          .run('should guarantee src if srcset is not supported', () => {
+            const ampImg = win.document.getElementById('img0');
+            const img = ampImg.querySelector('img');
+            expect(img.getAttribute('src')).to.equal(
+              '/examples/img/hero@1x.jpg'
+            );
+          });
+      }
+    );
+  });
diff --git a/test/integration/test-amp-inabox.js b/test/integration/test-amp-inabox.js
index 35726bc9bc77..66f3fb534691 100644
--- a/test/integration/test-amp-inabox.js
+++ b/test/integration/test-amp-inabox.js
@@ -27,11 +27,13 @@ import {xhrServiceForTesting} from '../../src/service/xhr-impl';
  */
 function fetchAdContent() {
   const url = '//localhost:9876/amp4test/a4a/' + RequestBank.getBrowserId();
-  return xhrServiceForTesting(window).fetchText(url, {
-    method: 'GET',
-    ampCors: false,
-    credentials: 'omit',
-  }).then(res => res.text());
+  return xhrServiceForTesting(window)
+    .fetchText(url, {
+      method: 'GET',
+      ampCors: false,
+      credentials: 'omit',
+    })
+    .then(res => res.text());
 }
 
 /**
@@ -50,7 +52,7 @@ function writeFriendlyFrame(doc, iframe, adContent) {
 function writeSafeFrame(doc, iframe, adContent) {
   iframe.name = `1-0-31;${adContent.length};${adContent}{"uid": "test"}`;
   iframe.src =
-      '//iframe.localhost:9876/test/fixtures/served/iframe-safeframe.html';
+    '//iframe.localhost:9876/test/fixtures/served/iframe-safeframe.html';
   doc.body.appendChild(iframe);
 }
 
@@ -72,61 +74,63 @@ function unregisterIframe(frame) {
 // - Unskip on Windows once these tests work there.
 // - The BTF test fails on Safari and flakes on other platforms (#21311).
 // Should be ported to being E2E tests.
-describe.configure().skipWindows().run('inabox', function() {
-
-  function testAmpComponents() {
-    const imgPromise = RequestBank.withdraw('image').then(req => {
-      expect(req.url).to.equal('/');
-    });
-    const pixelPromise = RequestBank.withdraw('pixel').then(req => {
-      expect(req.url).to.equal('/foo?cid=');
-    });
-    const analyticsPromise = RequestBank.withdraw('analytics').then(req => {
-      expect(req.url).to.match(/^\/bar\?/);
-      const queries =
-            parseQueryString(req.url.substr('/bar'.length));
-      expect(queries['cid']).to.equal('');
-    });
-    return Promise.all([imgPromise, pixelPromise, analyticsPromise]);
-  }
-
-  function testAmpComponentsBTF(win) {
-    // The iframe starts BTF. "visible" trigger should be after scroll.
-    // We will record scrolling time for comparison.
-    let scrollTime = Infinity;
-    const imgPromise = RequestBank.withdraw('image').then(req => {
-      expect(Date.now()).to.be.below(scrollTime);
-      expect(req.url).to.equal('/');
-    });
-    const pixelPromise = RequestBank.withdraw('pixel').then(req => {
-      expect(Date.now()).to.be.below(scrollTime);
-      expect(req.url).to.equal('/foo?cid=');
-    });
-    const analyticsPromise = RequestBank.withdraw('analytics').then(req => {
-      expect(req.url).to.match(/^\/bar\?/);
-      const queries =
-          parseQueryString(req.url.substr('/bar'.length));
-      expect(queries['cid']).to.equal('');
-      expect(Date.now()).to.be.above(scrollTime);
-      expect(parseInt(queries['timestamp'], 10)).to.be.above(scrollTime);
-    });
-    setTimeout(() => {
-      scrollTime = Date.now();
-      win.scrollTo(0, 1000);
-      // Scroll the top frame by 1 pixel manually because the host script lives
-      // there so it will only fire the position changed event if the top window
-      // itself is scrolled.
-      window.top.scrollTo(window.top.scrollX, window.top.scrollY - 1);
-    }, 2000);
-    return Promise.all([imgPromise, pixelPromise, analyticsPromise]);
-  }
+describe
+  .configure()
+  .skipWindows()
+  .run('inabox', function() {
+    function testAmpComponents() {
+      const imgPromise = RequestBank.withdraw('image').then(req => {
+        expect(req.url).to.equal('/');
+      });
+      const pixelPromise = RequestBank.withdraw('pixel').then(req => {
+        expect(req.url).to.equal('/foo?cid=');
+      });
+      const analyticsPromise = RequestBank.withdraw('analytics').then(req => {
+        expect(req.url).to.match(/^\/bar\?/);
+        const queries = parseQueryString(req.url.substr('/bar'.length));
+        expect(queries['cid']).to.equal('');
+      });
+      return Promise.all([imgPromise, pixelPromise, analyticsPromise]);
+    }
+
+    function testAmpComponentsBTF(win) {
+      // The iframe starts BTF. "visible" trigger should be after scroll.
+      // We will record scrolling time for comparison.
+      let scrollTime = Infinity;
+      const imgPromise = RequestBank.withdraw('image').then(req => {
+        expect(Date.now()).to.be.below(scrollTime);
+        expect(req.url).to.equal('/');
+      });
+      const pixelPromise = RequestBank.withdraw('pixel').then(req => {
+        expect(Date.now()).to.be.below(scrollTime);
+        expect(req.url).to.equal('/foo?cid=');
+      });
+      const analyticsPromise = RequestBank.withdraw('analytics').then(req => {
+        expect(req.url).to.match(/^\/bar\?/);
+        const queries = parseQueryString(req.url.substr('/bar'.length));
+        expect(queries['cid']).to.equal('');
+        expect(Date.now()).to.be.above(scrollTime);
+        expect(parseInt(queries['timestamp'], 10)).to.be.above(scrollTime);
+      });
+      setTimeout(() => {
+        scrollTime = Date.now();
+        win.scrollTo(0, 1000);
+        // Scroll the top frame by 1 pixel manually because the host script lives
+        // there so it will only fire the position changed event if the top window
+        // itself is scrolled.
+        window.top.scrollTo(window.top.scrollX, window.top.scrollY - 1);
+      }, 2000);
+      return Promise.all([imgPromise, pixelPromise, analyticsPromise]);
+    }
 
-  const describeWebkit = describe.configure().skipFirefox();
+    const describeWebkit = describe.configure().skipFirefox();
 
-  describeWebkit.run('AMPHTML ads', () => {
-    describes.integration('rendered on non-AMP page ATF', {
-      amp: false,
-      body: `
+    describeWebkit.run('AMPHTML ads', () => {
+      describes.integration(
+        'rendered on non-AMP page ATF',
+        {
+          amp: false,
+          body: `
         <iframe
         src="//ads.localhost:9876/amp4test/a4a/${RequestBank.getBrowserId()}"
             scrolling="no" id="inabox"
@@ -134,20 +138,24 @@ describe.configure().skipWindows().run('inabox', function() {
         </iframe>
         <script src="/examples/inabox-tag-integration.js"></script>
         `,
-    }, env => {
-      it('should layout amp-img, amp-pixel, amp-analytics', () => {
-        // See amp4test.js for creative content
-        return testAmpComponents();
-      });
-
-      afterEach(() => {
-        unregisterIframe(env.win.document.getElementById('inabox'));
-      });
-    });
-
-    describes.integration('AMPHTML ads rendered on non-AMP page BTF', {
-      amp: false,
-      body: `
+        },
+        env => {
+          it('should layout amp-img, amp-pixel, amp-analytics', () => {
+            // See amp4test.js for creative content
+            return testAmpComponents();
+          });
+
+          afterEach(() => {
+            unregisterIframe(env.win.document.getElementById('inabox'));
+          });
+        }
+      );
+
+      describes.integration(
+        'AMPHTML ads rendered on non-AMP page BTF',
+        {
+          amp: false,
+          body: `
         <div style="height: 100vh"></div>
         <iframe
         src="//ads.localhost:9876/amp4test/a4a/${RequestBank.getBrowserId()}"
@@ -156,236 +164,282 @@ describe.configure().skipWindows().run('inabox', function() {
         </iframe>
         <script src="/examples/inabox-tag-integration.js"></script>
         `,
-    }, env => {
-      beforeEach(() => {
-        // TODO: This happens after the test page is fully rendered, so there's
-        // a split second where the test iframe is not yet resized; that's
-        // enough to trigger viewability on Safari. Fix this to unskip
-        env.iframe.style.height = '100vh';
-      });
-
-      it.skip('should layout amp-img, amp-pixel, amp-analytics', () => {
-        // See amp4test.js for creative content
-        return testAmpComponentsBTF(env.win);
-      });
-
-      afterEach(() => {
-        unregisterIframe(env.win.document.getElementById('inabox'));
-      });
+        },
+        env => {
+          beforeEach(() => {
+            // TODO: This happens after the test page is fully rendered, so there's
+            // a split second where the test iframe is not yet resized; that's
+            // enough to trigger viewability on Safari. Fix this to unskip
+            env.iframe.style.height = '100vh';
+          });
+
+          it.skip('should layout amp-img, amp-pixel, amp-analytics', () => {
+            // See amp4test.js for creative content
+            return testAmpComponentsBTF(env.win);
+          });
+
+          afterEach(() => {
+            unregisterIframe(env.win.document.getElementById('inabox'));
+          });
+        }
+      );
     });
-  });
-
 
-  describes.integration('rendered on non-AMP page ATF within ' +
-      'friendly frame and safe frame', {
-    amp: false,
-    body: `
+    describes.integration(
+      'rendered on non-AMP page ATF within friendly frame and safe frame',
+      {
+        amp: false,
+        body: `
       <script src="/examples/inabox-tag-integration.js"></script>
       `,
-  }, env => {
-    let adContent;
-    let iframe;
-    before(() => {
-      // Gets the same ad as the other tests.
-      return fetchAdContent().then(text => { adContent = text; });
-    });
-
-    beforeEach(() => {
-      iframe = document.createElement('iframe');
-      Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
-    });
-
-    afterEach(() => {
-      unregisterIframe(iframe);
-      env.win.document.body.removeChild(iframe);
-    });
+      },
+      env => {
+        let adContent;
+        let iframe;
+        before(() => {
+          // Gets the same ad as the other tests.
+          return fetchAdContent().then(text => {
+            adContent = text;
+          });
+        });
 
-    it('should layout amp-img, amp-pixel, ' +
-        'amp-analytics within friendly frame', () => {
-      writeFriendlyFrame(env.win.document, iframe, adContent);
-      return testAmpComponents();
-    });
+        beforeEach(() => {
+          iframe = document.createElement('iframe');
+          Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
+        });
 
-    it.configure().skipFirefox().run('should layout amp-img, amp-pixel, ' +
-        'amp-analytics within safe frame', () => {
-      writeSafeFrame(env.win.document, iframe, adContent);
-      return testAmpComponents();
-    });
-  });
+        afterEach(() => {
+          unregisterIframe(iframe);
+          env.win.document.body.removeChild(iframe);
+        });
 
-  describes.integration('AMPHTML ads rendered on non-AMP page BTF within ' +
-      'friendly frame and safe frame', {
-    amp: false,
-    body: `
+        it(
+          'should layout amp-img, amp-pixel, ' +
+            'amp-analytics within friendly frame',
+          () => {
+            writeFriendlyFrame(env.win.document, iframe, adContent);
+            return testAmpComponents();
+          }
+        );
+
+        it.configure()
+          .skipFirefox()
+          .run(
+            'should layout amp-img, amp-pixel, ' +
+              'amp-analytics within safe frame',
+            () => {
+              writeSafeFrame(env.win.document, iframe, adContent);
+              return testAmpComponents();
+            }
+          );
+      }
+    );
+
+    describes.integration(
+      'AMPHTML ads rendered on non-AMP page BTF within ' +
+        'friendly frame and safe frame',
+      {
+        amp: false,
+        body: `
       <div style="height: 100vh"></div>
       <script src="/examples/inabox-tag-integration.js"></script>
       `,
-  }, env => {
-    let adContent;
-    let iframe;
-    before(() => {
-      return fetchAdContent().then(text => { adContent = text; });
-    });
-
-    beforeEach(() => {
-      env.iframe.style.height = '100vh';
-      iframe = document.createElement('iframe');
-      Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
-    });
+      },
+      env => {
+        let adContent;
+        let iframe;
+        before(() => {
+          return fetchAdContent().then(text => {
+            adContent = text;
+          });
+        });
 
-    afterEach(() => {
-      unregisterIframe(iframe);
-      env.win.document.body.removeChild(iframe);
-    });
+        beforeEach(() => {
+          env.iframe.style.height = '100vh';
+          iframe = document.createElement('iframe');
+          Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
+        });
 
-    it.skip('should layout amp-img, amp-pixel, ' +
-        'amp-analytics within friendly frame', () => {
-      writeFriendlyFrame(env.win.document, iframe, adContent);
-      return testAmpComponentsBTF(env.win);
-    });
+        afterEach(() => {
+          unregisterIframe(iframe);
+          env.win.document.body.removeChild(iframe);
+        });
 
-    it.skip('should layout amp-img, amp-pixel, ' +
-        'amp-analytics within safe frame', () => {
-      writeSafeFrame(env.win.document, iframe, adContent);
-      return testAmpComponentsBTF(env.win);
-    });
+        it.skip(
+          'should layout amp-img, amp-pixel, ' +
+            'amp-analytics within friendly frame',
+          () => {
+            writeFriendlyFrame(env.win.document, iframe, adContent);
+            return testAmpComponentsBTF(env.win);
+          }
+        );
+
+        it.skip(
+          'should layout amp-img, amp-pixel, ' +
+            'amp-analytics within safe frame',
+          () => {
+            writeSafeFrame(env.win.document, iframe, adContent);
+            return testAmpComponentsBTF(env.win);
+          }
+        );
+      }
+    );
   });
-});
-
-describe.configure().skipWindows().run('inabox with a complex ' +
-    'image ad', function() {
-  const {testServerPort} = window.ampTestRuntimeConfig;
 
-  // The image ad as seen in examples/inabox.gpt.html,
-  // with visibility pings being placeholders that's substituted with calls to
-  // the request bank.
-  const adBody = maybeSwitchToCompiledJs(
-      __html__['test/fixtures/amp-cupcake-ad.html']) // eslint-disable-line no-undef
+describe
+  .configure()
+  .skipWindows()
+  .run('inabox with a complex image ad', function() {
+    const {testServerPort} = window.ampTestRuntimeConfig;
+
+    // The image ad as seen in examples/inabox.gpt.html,
+    // with visibility pings being placeholders that's substituted with calls to
+    // the request bank.
+    const adBody = maybeSwitchToCompiledJs(
+      // eslint-disable-next-line no-undef
+      __html__['test/fixtures/amp-cupcake-ad.html']
+    )
       .replace(/__TEST_SERVER_PORT__/g, testServerPort)
       .replace(/__VIEW_URL__/g, RequestBank.getUrl('view')) // get all instances
       .replace('__VISIBLE_URL__', RequestBank.getUrl('visible'))
       .replace('__ACTIVE_VIEW_URL__', RequestBank.getUrl('activeview'));
 
-  function testVisibilityPings(visibleDelay, activeViewDelay) {
-    let viewTime = 0;
-    let visibleTime = 0;
-    let activeViewTime = 0;
-    const viewPromise = RequestBank.withdraw('view')
-        .then(() => viewTime = Date.now());
-    const visiblePromise = RequestBank.withdraw('visible')
-        .then(() => visibleTime = Date.now());
-    const activeViewPromise = RequestBank.withdraw('activeview')
-        .then(() => activeViewTime = Date.now());
-    return Promise.all([viewPromise, visiblePromise, activeViewPromise])
-        .then(() => {
+    function testVisibilityPings(visibleDelay, activeViewDelay) {
+      let viewTime = 0;
+      let visibleTime = 0;
+      let activeViewTime = 0;
+      const viewPromise = RequestBank.withdraw('view').then(
+        () => (viewTime = Date.now())
+      );
+      const visiblePromise = RequestBank.withdraw('visible').then(
+        () => (visibleTime = Date.now())
+      );
+      const activeViewPromise = RequestBank.withdraw('activeview').then(
+        () => (activeViewTime = Date.now())
+      );
+      return Promise.all([viewPromise, visiblePromise, activeViewPromise]).then(
+        () => {
           // Add a 200ms "buffer" to account for possible browser jankiness
           expect(visibleTime - viewTime).to.be.above(visibleDelay - 200);
           expect(activeViewTime - viewTime).to.be.above(activeViewDelay - 200);
-        });
-  }
-
-  describes.integration('AMP Inabox Rendering', {
-    amp: false,
-    body: `
+        }
+      );
+    }
+
+    describes.integration(
+      'AMP Inabox Rendering',
+      {
+        amp: false,
+        body: `
         <script src="/examples/inabox-tag-integration.js"></script>
         `,
-  }, env => {
-    let iframe;
-    let doc;
-    beforeEach(() => {
-      doc = env.win.document;
-      iframe = document.createElement('iframe');
-      // we add the iframe here because it's dynamically created, so the
-      // bootstrap script would have missed it.
-      Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
-    });
+      },
+      env => {
+        let iframe;
+        let doc;
+        beforeEach(() => {
+          doc = env.win.document;
+          iframe = document.createElement('iframe');
+          // we add the iframe here because it's dynamically created, so the
+          // bootstrap script would have missed it.
+          Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
+        });
 
-    it('should properly render ad in a friendly iframe with viewability pings',
-        () => {
+        it('should properly render ad in a friendly iframe with viewability pings', () => {
           writeFriendlyFrame(doc, iframe, adBody);
           return testVisibilityPings(0, 1000);
         });
 
-    it.configure().skipFirefox().run(
-        'should properly render ad in a safe frame with viewability pings',
-        () => {
-          writeSafeFrame(doc, iframe, adBody);
-          return testVisibilityPings(0, 1000);
+        it.configure()
+          .skipFirefox()
+          .run(
+            'should properly render ad in a safe frame with viewability pings',
+            () => {
+              writeSafeFrame(doc, iframe, adBody);
+              return testVisibilityPings(0, 1000);
+            }
+          );
+
+        afterEach(() => {
+          unregisterIframe(iframe);
+          doc.body.removeChild(iframe);
+        });
+      }
+    );
+
+    // Testing that analytics components use IntersectionObserver properly.
+    describes.realWin(
+      'AMP Inabox Rendering - No Host Script',
+      {
+        amp: false,
+      },
+      env => {
+        let iframe;
+        let doc;
+        beforeEach(() => {
+          doc = env.win.document;
+          iframe = document.createElement('iframe');
         });
 
-    afterEach(() => {
-      unregisterIframe(iframe);
-      doc.body.removeChild(iframe);
-    });
-  });
-
-  // Testing that analytics components use IntersectionObserver properly.
-  describes.realWin('AMP Inabox Rendering - No Host Script', {
-    amp: false,
-  }, env => {
-    let iframe;
-    let doc;
-    beforeEach(() => {
-      doc = env.win.document;
-      iframe = document.createElement('iframe');
-    });
-
-    it('should properly render ad in a friendly iframe with viewability pings',
-        () => {
+        it('should properly render ad in a friendly iframe with viewability pings', () => {
           toggleExperiment(env.win, 'inabox-viewport-friendly', true);
           writeFriendlyFrame(doc, iframe, adBody);
           return testVisibilityPings(0, 1000);
         });
 
-    it.configure().ifChrome().run(
-        'should properly render ad in a safe frame with viewability pings',
-        () => {
-          writeSafeFrame(doc, iframe, adBody);
-          return testVisibilityPings(0, 1000);
+        it.configure()
+          .ifChrome()
+          .run(
+            'should properly render ad in a safe frame with viewability pings',
+            () => {
+              writeSafeFrame(doc, iframe, adBody);
+              return testVisibilityPings(0, 1000);
+            }
+          );
+
+        afterEach(() => {
+          doc.body.removeChild(iframe);
         });
-
-    afterEach(() => {
-      doc.body.removeChild(iframe);
-    });
-  });
-
-  describes.integration('AMP Inabox Rendering BTF', {
-    amp: false,
-    body: `
+      }
+    );
+
+    describes.integration(
+      'AMP Inabox Rendering BTF',
+      {
+        amp: false,
+        body: `
         <div style="height: 100vh"></div>
         <script src="/examples/inabox-tag-integration.js"></script>
         `,
-  }, env => {
-    let iframe;
-    let doc;
-    beforeEach(() => {
-      env.iframe.style.height = '100vh';
-      doc = env.win.document;
-      iframe = document.createElement('iframe');
-      Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
-      setTimeout(() => {
-        env.win.scrollTo(0, 1000);
-        window.top.scrollTo(window.top.scrollX, window.top.scrollY - 1);
-      }, 2000);
-    });
+      },
+      env => {
+        let iframe;
+        let doc;
+        beforeEach(() => {
+          env.iframe.style.height = '100vh';
+          doc = env.win.document;
+          iframe = document.createElement('iframe');
+          Array.prototype.push.apply(env.win.top.ampInaboxIframes, [iframe]);
+          setTimeout(() => {
+            env.win.scrollTo(0, 1000);
+            window.top.scrollTo(window.top.scrollX, window.top.scrollY - 1);
+          }, 2000);
+        });
 
-    it.skip(
-        'should properly render ad in a friendly iframe with viewability pings',
-        () => {
+        it.skip('should properly render ad in a friendly iframe with viewability pings', () => {
           writeFriendlyFrame(doc, iframe, adBody);
           return testVisibilityPings(2000, 3000);
         });
 
-    it.skip(
-        'should properly render ad in a safe frame with viewability pings',
-        () => {
+        it.skip('should properly render ad in a safe frame with viewability pings', () => {
           writeSafeFrame(doc, iframe, adBody);
           return testVisibilityPings(2000, 3000);
         });
 
-    afterEach(() => {
-      unregisterIframe(iframe);
-      doc.body.removeChild(iframe);
-    });
+        afterEach(() => {
+          unregisterIframe(iframe);
+          doc.body.removeChild(iframe);
+        });
+      }
+    );
   });
-});
diff --git a/test/integration/test-amp-pixel.js b/test/integration/test-amp-pixel.js
index 604a8ece8f47..346743d18b10 100644
--- a/test/integration/test-amp-pixel.js
+++ b/test/integration/test-amp-pixel.js
@@ -20,69 +20,83 @@ import {Services} from '../../src/services';
 import {createElementWithAttributes} from '../../src/dom';
 
 describe.configure().run('amp-pixel', function() {
-  describes.integration('amp-pixel macro integration test', {
-    body: `<amp-pixel
+  describes.integration(
+    'amp-pixel macro integration test',
+    {
+      body: `<amp-pixel
     src="${RequestBank.getUrl()}hello-world?title=TITLE&qp=QUERY_PARAM(a)">`,
-    params: {
-      a: 123,
+      params: {
+        a: 123,
+      },
     },
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementBuild('amp-pixel');
-    });
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementBuild('amp-pixel');
+      });
 
-    it('should expand the TITLE macro', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url)
-            .to.equal('/hello-world?title=AMP%20TEST&qp=123');
-        expect(req.headers.host).to.be.ok;
+      it('should expand the TITLE macro', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/hello-world?title=AMP%20TEST&qp=123');
+          expect(req.headers.host).to.be.ok;
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('amp-pixel referrer integration test', {
-    body: `<amp-pixel src="${RequestBank.getUrl()}">`,
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementBuild('amp-pixel');
-    });
+  describes.integration(
+    'amp-pixel referrer integration test',
+    {
+      body: `<amp-pixel src="${RequestBank.getUrl()}">`,
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementBuild('amp-pixel');
+      });
 
-    it('should keep referrer if no referrerpolicy specified', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/');
-        expect(req.headers.referer).to.be.ok;
+      it('should keep referrer if no referrerpolicy specified', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/');
+          expect(req.headers.referer).to.be.ok;
+        });
       });
-    });
-  });
+    }
+  );
 
-  describes.integration('amp-pixel no-referrer integration test', {
-    body: `<amp-pixel src="${RequestBank.getUrl()}"
+  describes.integration(
+    'amp-pixel no-referrer integration test',
+    {
+      body: `<amp-pixel src="${RequestBank.getUrl()}"
              referrerpolicy="no-referrer">`,
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementBuild('amp-pixel');
-    });
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementBuild('amp-pixel');
+      });
 
-    it('should remove referrer if referrerpolicy=no-referrer', () => {
-      return RequestBank.withdraw().then(req => {
-        expect(req.url).to.equal('/');
-        expect(req.headers.referer).to.not.be.ok;
+      it('should remove referrer if referrerpolicy=no-referrer', () => {
+        return RequestBank.withdraw().then(req => {
+          expect(req.url).to.equal('/');
+          expect(req.headers.referer).to.not.be.ok;
+        });
       });
-    });
-  });
+    }
+  );
 });
 
 describes.fakeWin('amp-pixel with img (inabox)', {amp: true}, env => {
   it('should not write image', () => {
     const src = 'https://foo.com/tracker/foo';
-    const pixelElem =
-        createElementWithAttributes(env.win.document, 'amp-pixel',
-            {src, 'i-amphtml-ssr': ''});
+    const pixelElem = createElementWithAttributes(
+      env.win.document,
+      'amp-pixel',
+      {src, 'i-amphtml-ssr': ''}
+    );
     pixelElem.appendChild(
-        createElementWithAttributes(env.win.document, 'img', {src}));
+      createElementWithAttributes(env.win.document, 'img', {src})
+    );
     env.win.document.body.appendChild(pixelElem);
     const viewer = Services.viewerForDoc(env.win.document);
     env.sandbox.stub(viewer, 'whenFirstVisible').callsFake(() => {
diff --git a/test/integration/test-amp-recaptcha-input.js b/test/integration/test-amp-recaptcha-input.js
index 0b236ca8f4aa..3993d71673b6 100644
--- a/test/integration/test-amp-recaptcha-input.js
+++ b/test/integration/test-amp-recaptcha-input.js
@@ -19,12 +19,16 @@ import {Deferred} from '../../src/utils/promise';
 import {poll} from '../../testing/iframe';
 
 // TODO(torch2424, #20541): These tests fail on firefox and Edge.
-describe.configure().skipFirefox().skipEdge().run('amp-recaptcha-' +
-    'input', function() {
-
-  describes.integration('with form and amp-mustache', {
-  /* eslint-disable max-len */
-    body: `
+describe
+  .configure()
+  .skipFirefox()
+  .skipEdge()
+  .run('amp-recaptcha-input', function() {
+    describes.integration(
+      'with form and amp-mustache',
+      {
+        /* eslint-disable max-len */
+        body: `
     <form
       method="POST"
       action-xhr="/recaptcha/submit"
@@ -68,7 +72,7 @@ describe.configure().skipFirefox().skipEdge().run('amp-recaptcha-' +
 
     </form>
     `,
-    css: `
+        css: `
       form.amp-form-submit-success [submit-success] {
         color: green;
       }
@@ -108,63 +112,78 @@ describe.configure().skipFirefox().skipEdge().run('amp-recaptcha-' +
         display: block;
       }
     `,
-    /* eslint-enable max-len */
-    extensions: ['amp-recaptcha-input', 'amp-form', 'amp-mustache:0.2'],
-    experiments: ['amp-recaptcha-input'],
-  }, env => {
-    let doc;
-
-    beforeEach(() => {
-      doc = env.win.document;
-
-      const browserController = new BrowserController(env.win);
-      return browserController.waitForElementLayout('amp-recaptcha-input');
-    });
-
-    it('should be able to create the bootstrap frame', function() {
-      return waitForBootstrapFrameToBeCreated(doc).then(frame => {
-        expect(frame.src.includes('recaptcha')).to.be.true;
-        expect(frame.getAttribute('data-amp-3p-sentinel'))
-            .to.be.equal('amp-recaptcha');
-        expect(frame.getAttribute('name')).to.be.equal(JSON.stringify({
-          'sitekey': '6LebBGoUAAAAAHbj1oeZMBU_rze_CutlbyzpH8VE',
-          'sentinel': 'amp-recaptcha',
-        }));
-      });
-    });
-
-    it('should load the 3p recaptcha frame', function() {
-      return waitForBootstrapFrameOnLoad(doc).then(frame => {
-        expect(frame).to.be.ok;
-      });
-    });
+        /* eslint-enable max-len */
+        extensions: ['amp-recaptcha-input', 'amp-form', 'amp-mustache:0.2'],
+        experiments: ['amp-recaptcha-input'],
+      },
+      env => {
+        let doc;
+
+        beforeEach(() => {
+          doc = env.win.document;
+
+          const browserController = new BrowserController(env.win);
+          return browserController.waitForElementLayout('amp-recaptcha-input');
+        });
 
-    it('should create a hidden input, ' +
-    'with the value resolved from the recaptcha mock, ' +
-    ' on submit', function() {
-      return submitForm(doc).then(hiddenInput => {
-        expect(hiddenInput).to.be.ok;
-        expect(hiddenInput.name).to.be.equal('recaptcha-token');
-        expect(hiddenInput.value).to.be.equal('recaptcha-mock');
-      });
-    });
+        it('should be able to create the bootstrap frame', function() {
+          return waitForBootstrapFrameToBeCreated(doc).then(frame => {
+            expect(frame.src.includes('recaptcha')).to.be.true;
+            expect(frame.getAttribute('data-amp-3p-sentinel')).to.be.equal(
+              'amp-recaptcha'
+            );
+            expect(frame.getAttribute('name')).to.be.equal(
+              JSON.stringify({
+                'sitekey': '6LebBGoUAAAAAHbj1oeZMBU_rze_CutlbyzpH8VE',
+                'sentinel': 'amp-recaptcha',
+              })
+            );
+          });
+        });
 
-    it('should show submit-success on successful submit/response', function() {
-      return submitForm(doc).then(() => {
-        return poll('submit-success', () => {
-          return doc.querySelector('div[id="submit-success"]');
-        }, undefined, 5000);
-      });
-    });
-  });
+        it('should load the 3p recaptcha frame', function() {
+          return waitForBootstrapFrameOnLoad(doc).then(frame => {
+            expect(frame).to.be.ok;
+          });
+        });
 
-  const recaptchaRequestId = {
-    GET: 'request bank GET',
-    POST: 'request bank POST',
-  };
-  describes.integration(recaptchaRequestId.GET, {
-  /* eslint-disable max-len */
-    body: `
+        it(
+          'should create a hidden input, ' +
+            'with the value resolved from the recaptcha mock, ' +
+            ' on submit',
+          function() {
+            return submitForm(doc).then(hiddenInput => {
+              expect(hiddenInput).to.be.ok;
+              expect(hiddenInput.name).to.be.equal('recaptcha-token');
+              expect(hiddenInput.value).to.be.equal('recaptcha-mock');
+            });
+          }
+        );
+
+        it('should show submit-success on successful submit/response', function() {
+          return submitForm(doc).then(() => {
+            return poll(
+              'submit-success',
+              () => {
+                return doc.querySelector('div[id="submit-success"]');
+              },
+              undefined,
+              5000
+            );
+          });
+        });
+      }
+    );
+
+    const recaptchaRequestId = {
+      GET: 'request bank GET',
+      POST: 'request bank POST',
+    };
+    describes.integration(
+      recaptchaRequestId.GET,
+      {
+        /* eslint-disable max-len */
+        body: `
     <form
       method="GET"
       action-xhr="${RequestBank.getUrl(recaptchaRequestId.GET)}"
@@ -185,35 +204,37 @@ describe.configure().skipFirefox().skipEdge().run('amp-recaptcha-' +
       </fieldset>
     </form>
   `,
-    /* eslint-enable max-len */
-    extensions: ['amp-recaptcha-input', 'amp-form'],
-    experiments: ['amp-recaptcha-input'],
-  }, env => {
-    let doc;
-
-    beforeEach(() => {
-      doc = env.win.document;
-
-      const browserController = new BrowserController(env.win);
-      return browserController.waitForElementLayout('amp-recaptcha-input');
-    });
+        /* eslint-enable max-len */
+        extensions: ['amp-recaptcha-input', 'amp-form'],
+        experiments: ['amp-recaptcha-input'],
+      },
+      env => {
+        let doc;
+
+        beforeEach(() => {
+          doc = env.win.document;
+
+          const browserController = new BrowserController(env.win);
+          return browserController.waitForElementLayout('amp-recaptcha-input');
+        });
 
-    it('should make a request with correct parameters', function() {
-      return submitForm(doc).then(() => {
-        return RequestBank.withdraw(recaptchaRequestId.GET).then(req => {
-          expect(req.url)
-              .to.include('term=recaptcha-search');
-          expect(req.url)
-              .to.include('recaptcha-token=recaptcha-mock');
-          expect(req.headers.host).to.be.ok;
+        it('should make a request with correct parameters', function() {
+          return submitForm(doc).then(() => {
+            return RequestBank.withdraw(recaptchaRequestId.GET).then(req => {
+              expect(req.url).to.include('term=recaptcha-search');
+              expect(req.url).to.include('recaptcha-token=recaptcha-mock');
+              expect(req.headers.host).to.be.ok;
+            });
+          });
         });
-      });
-    });
-  });
+      }
+    );
 
-  describes.integration(recaptchaRequestId.POST, {
-  /* eslint-disable max-len */
-    body: `
+    describes.integration(
+      recaptchaRequestId.POST,
+      {
+        /* eslint-disable max-len */
+        body: `
     <form
       method="POST"
       action-xhr="${RequestBank.getUrl(recaptchaRequestId.POST)}"
@@ -234,76 +255,84 @@ describe.configure().skipFirefox().skipEdge().run('amp-recaptcha-' +
       </fieldset>
     </form>
   `,
-    /* eslint-enable max-len */
-    extensions: ['amp-recaptcha-input', 'amp-form'],
-    experiments: ['amp-recaptcha-input'],
-  }, env => {
-    let doc;
-
-    beforeEach(() => {
-      doc = env.win.document;
-
-      const browserController = new BrowserController(env.win);
-      return browserController.waitForElementLayout('amp-recaptcha-input');
-    });
+        /* eslint-enable max-len */
+        extensions: ['amp-recaptcha-input', 'amp-form'],
+        experiments: ['amp-recaptcha-input'],
+      },
+      env => {
+        let doc;
+
+        beforeEach(() => {
+          doc = env.win.document;
+
+          const browserController = new BrowserController(env.win);
+          return browserController.waitForElementLayout('amp-recaptcha-input');
+        });
 
-    it('should make a request with correct parameters', function() {
-      return submitForm(doc).then(() => {
-        return RequestBank.withdraw(recaptchaRequestId.POST).then(req => {
-          expect(req.body).to.be.ok;
-          expect(req.body.term)
-              .to.be.equal('recaptcha-search');
-          expect(req.body['recaptcha-token'])
-              .to.be.equal('recaptcha-mock');
-          expect(req.headers.host).to.be.ok;
+        it('should make a request with correct parameters', function() {
+          return submitForm(doc).then(() => {
+            return RequestBank.withdraw(recaptchaRequestId.POST).then(req => {
+              expect(req.body).to.be.ok;
+              expect(req.body.term).to.be.equal('recaptcha-search');
+              expect(req.body['recaptcha-token']).to.be.equal('recaptcha-mock');
+              expect(req.headers.host).to.be.ok;
+            });
+          });
         });
-      });
-    });
+      }
+    );
   });
 
-});
-
 function waitForBootstrapFrameToBeCreated(doc) {
-  return poll('create bootstrap frame', () => {
-    return doc.querySelector('iframe.i-amphtml-recaptcha-iframe');
-  }, undefined, 5000);
+  return poll(
+    'create bootstrap frame',
+    () => {
+      return doc.querySelector('iframe.i-amphtml-recaptcha-iframe');
+    },
+    undefined,
+    5000
+  );
 }
 
 function waitForBootstrapFrameOnLoad(doc) {
   let bootstrapFrame = undefined;
-  return waitForBootstrapFrameToBeCreated(doc).then(frame => {
-    bootstrapFrame = frame;
+  return waitForBootstrapFrameToBeCreated(doc)
+    .then(frame => {
+      bootstrapFrame = frame;
 
-    // Create a promise for when the iframe is loaded
-    const onLoadDeferred = new Deferred();
-    frame.onload = onLoadDeferred.resolve;
+      // Create a promise for when the iframe is loaded
+      const onLoadDeferred = new Deferred();
+      frame.onload = onLoadDeferred.resolve;
 
-    // Reset the frame src to ensure we get the load event
-    frame.src = frame.src + '?reload=true';
+      // Reset the frame src to ensure we get the load event
+      frame.src = frame.src + '?reload=true';
 
-    return onLoadDeferred.promise;
-  }).then(() => {
-    return bootstrapFrame;
-  });
+      return onLoadDeferred.promise;
+    })
+    .then(() => {
+      return bootstrapFrame;
+    });
 }
 
 function submitForm(doc) {
-  return waitForBootstrapFrameOnLoad(doc).then(() => {
-    const searchInputElement =
-      doc.querySelector('input[type="search"]');
-    const submitElement =
-      doc.querySelector('input[type="submit"]');
-
-    searchInputElement.value = 'recaptcha-search';
-    submitElement.click();
-
-    return poll('Polling for hidden input', () => {
+  return waitForBootstrapFrameOnLoad(doc)
+    .then(() => {
+      const searchInputElement = doc.querySelector('input[type="search"]');
+      const submitElement = doc.querySelector('input[type="submit"]');
+
+      searchInputElement.value = 'recaptcha-search';
+      submitElement.click();
+
+      return poll(
+        'Polling for hidden input',
+        () => {
+          return doc.querySelector('input[hidden]');
+        },
+        undefined,
+        5000
+      );
+    })
+    .then(() => {
       return doc.querySelector('input[hidden]');
-    }, undefined, 5000);
-  }).then(() => {
-    return doc.querySelector('input[hidden]');
-  });
+    });
 }
-
-
-
diff --git a/test/integration/test-amp-skimlinks.js b/test/integration/test-amp-skimlinks.js
index e4574609cc93..892541995238 100644
--- a/test/integration/test-amp-skimlinks.js
+++ b/test/integration/test-amp-skimlinks.js
@@ -21,12 +21,12 @@ import {parseQueryString} from '../../src/url';
 // Create fake test urls to replace skimlinks API urls.
 // RequestBank allow us to check if an API request has been made
 // or not by calling RequestBank.withdraw later.
-const pageTrackingUrl = RequestBank.getUrl('pageTrackingUrl') +
-  '/track.php?data=${data}';
-const linksTrackingUrl = RequestBank.getUrl('linksTrackingUrl') +
-  '/link?data=${data}';
-const nonAffiliateTrackingUrl = RequestBank.getUrl('nonAffiliateTrackingUrl') +
-  '?call=track&data=${data}';
+const pageTrackingUrl =
+  RequestBank.getUrl('pageTrackingUrl') + '/track.php?data=${data}';
+const linksTrackingUrl =
+  RequestBank.getUrl('linksTrackingUrl') + '/link?data=${data}';
+const nonAffiliateTrackingUrl =
+  RequestBank.getUrl('nonAffiliateTrackingUrl') + '?call=track&data=${data}';
 const waypointUrl = `${RequestBank.getUrl('waypointUrl')}/`;
 
 // Simulated click event created by browser.click() does not trigger
@@ -116,7 +116,10 @@ describe.skip('amp-skimlinks', function() {
 
     // TODO(alanorozco): Unskip on firefox
     const itSkipFirefox = (desc, cb) =>
-      it.configure().skipFirefox().run(desc, cb);
+      it
+        .configure()
+        .skipFirefox()
+        .run(desc, cb);
 
     // TODO(alanorozco): Unskip on firefox
     itSkipFirefox('should send NA-tracking on non-merchant link click ', () => {
@@ -158,7 +161,6 @@ describe.skip('amp-skimlinks', function() {
     });
   });
 
-
   const setupNoConfig = {
     extensions: ['amp-skimlinks'],
     body: `
@@ -207,7 +209,6 @@ describe.skip('amp-skimlinks', function() {
     });
   });
 
-
   const setupUnknownLinks = {
     extensions: ['amp-skimlinks'],
     body: `
@@ -259,5 +260,3 @@ describe.skip('amp-skimlinks', function() {
     });
   });
 });
-
-
diff --git a/test/integration/test-boilerplates.js b/test/integration/test-boilerplates.js
index 23fc0726e687..218392aaab8f 100644
--- a/test/integration/test-boilerplates.js
+++ b/test/integration/test-boilerplates.js
@@ -21,40 +21,45 @@ import {
 import {getStyle} from '../../src/style';
 import {isAnimationNone} from '../../testing/test-helper';
 
-
 const timeout = window.ampTestRuntimeConfig.mochaTimeout;
 
-describe.configure().retryOnSaucelabs().run('Old Opacity Boilerplate', () => {
-  let fixture;
-  beforeEach(() => {
-    return createFixtureIframe(
-        'test/fixtures/boilerplate-old-opacity.html', 1000).then(f => {
-      fixture = f;
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('Old Opacity Boilerplate', () => {
+    let fixture;
+    beforeEach(() => {
+      return createFixtureIframe(
+        'test/fixtures/boilerplate-old-opacity.html',
+        1000
+      ).then(f => {
+        fixture = f;
+      });
     });
-  });
 
-  it('should show the body when opacity boilerplate is used', () => {
-    return expectBodyToBecomeVisible(fixture.win, timeout).then(() => {
-      expect(getStyle(fixture.win.document.body, 'opacity')).to.equal('1');
+    it('should show the body when opacity boilerplate is used', () => {
+      return expectBodyToBecomeVisible(fixture.win, timeout).then(() => {
+        expect(getStyle(fixture.win.document.body, 'opacity')).to.equal('1');
+      });
     });
   });
-});
-
 
 describe.configure().run('New Visibility Boilerplate', () => {
-
   let fixture;
   beforeEach(() => {
     return createFixtureIframe(
-        'test/fixtures/boilerplate-new-visibility.html', 10000).then(f => {
+      'test/fixtures/boilerplate-new-visibility.html',
+      10000
+    ).then(f => {
       fixture = f;
     });
   });
 
   it('should show the body in boilerplate test', () => {
     return expectBodyToBecomeVisible(fixture.win, timeout).then(() => {
-      expect(getStyle(
-          fixture.win.document.body, 'visibility')).to.equal('visible');
+      expect(getStyle(fixture.win.document.body, 'visibility')).to.equal(
+        'visible'
+      );
       expect(isAnimationNone(fixture.win.document.body)).to.be.true;
     });
   });
diff --git a/test/integration/test-configuration.js b/test/integration/test-configuration.js
index 8ed1e2e228ba..252d9c32be13 100644
--- a/test/integration/test-configuration.js
+++ b/test/integration/test-configuration.js
@@ -20,16 +20,17 @@ import {createFixtureIframe} from '../../testing/iframe.js';
 describe.configure().run('Configuration', function() {
   let fixture;
   beforeEach(() => {
-    return createFixtureIframe('test/fixtures/configuration.html', 500)
-        .then(f => {
-          fixture = f;
-        });
+    return createFixtureIframe('test/fixtures/configuration.html', 500).then(
+      f => {
+        fixture = f;
+      }
+    );
   });
 
   it('urls should be configurable', () => {
     expect(fixture.win.AMP_CONFIG).to.equal(undefined);
 
-    const config = fixture.win.AMP_CONFIG = {};
+    const config = (fixture.win.AMP_CONFIG = {});
     config.cdnUrl = 'http://foo.bar.com';
     config.thirdPartyUrl = 'http://bar.baz.com';
     config.thirdPartyFrameRegex = /a-website\.com/;
@@ -37,12 +38,15 @@ describe.configure().run('Configuration', function() {
 
     return fixture.awaitEvent(AmpEvents.LOAD_START, 1).then(() => {
       expect(fixture.win.AMP.config.urls.cdn).to.equal(config.cdnUrl);
-      expect(fixture.win.AMP.config.urls.thirdParty)
-          .to.equal(config.thirdPartyUrl);
-      expect(fixture.win.AMP.config.urls.thirdPartyFrameRegex)
-          .to.equal(config.thirdPartyFrameRegex);
-      expect(fixture.win.AMP.config.urls.errorReporting)
-          .to.equal(config.errorReportingUrl);
+      expect(fixture.win.AMP.config.urls.thirdParty).to.equal(
+        config.thirdPartyUrl
+      );
+      expect(fixture.win.AMP.config.urls.thirdPartyFrameRegex).to.equal(
+        config.thirdPartyFrameRegex
+      );
+      expect(fixture.win.AMP.config.urls.errorReporting).to.equal(
+        config.errorReportingUrl
+      );
     });
   });
 });
diff --git a/test/integration/test-errors.js b/test/integration/test-errors.js
index fd9ab0e50332..d65661a694a2 100644
--- a/test/integration/test-errors.js
+++ b/test/integration/test-errors.js
@@ -23,11 +23,12 @@ import {
 /** @const {number} */
 const TIMEOUT = window.ampTestRuntimeConfig.mochaTimeout;
 
-const t = describe.configure()
-    .retryOnSaucelabs()
-    // TODO(@cramforce): Find out why it does not work with obfuscated props.
-    .skipIfPropertiesObfuscated()
-    .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+const t = describe
+  .configure()
+  .retryOnSaucelabs()
+  // TODO(@cramforce): Find out why it does not work with obfuscated props.
+  .skipIfPropertiesObfuscated()
+  .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
 
 t.run('error page', function() {
   this.timeout(TIMEOUT);
@@ -44,30 +45,43 @@ t.run('error page', function() {
       }
     }).then(f => {
       fixture = f;
-      return poll('errors to happen', () => {
-        return fixture.doc.querySelectorAll('[error-message]').length >= 2;
-      }, () => {
-        return new Error('Failed to find errors. HTML\n' +
-            fixture.doc.documentElement./*TEST*/innerHTML);
-      }, TIMEOUT - 1000);
+      return poll(
+        'errors to happen',
+        () => {
+          return fixture.doc.querySelectorAll('[error-message]').length >= 2;
+        },
+        () => {
+          return new Error(
+            'Failed to find errors. HTML\n' +
+              fixture.doc.documentElement./*TEST*/ innerHTML
+          );
+        },
+        TIMEOUT - 1000
+      );
     });
   });
 
-  it.configure().skipFirefox().skipEdge()
-      .run('should show the body in error test', () => {
-        return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
-      });
+  it.configure()
+    .skipFirefox()
+    .skipEdge()
+    .run('should show the body in error test', () => {
+      return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
+    });
 
   function shouldFail(id) {
     // Skip for issue #110
-    it.configure().ifChrome().run('should fail to load #' + id, () => {
-      const e = fixture.doc.getElementById(id);
-      expect(fixture.errors.join('\n')).to.contain(
-          e.getAttribute('data-expectederror'));
-      expect(e.getAttribute('error-message')).to.contain(
-          e.getAttribute('data-expectederror'));
-      expect(e.className).to.contain('i-amphtml-element-error');
-    });
+    it.configure()
+      .ifChrome()
+      .run('should fail to load #' + id, () => {
+        const e = fixture.doc.getElementById(id);
+        expect(fixture.errors.join('\n')).to.contain(
+          e.getAttribute('data-expectederror')
+        );
+        expect(e.getAttribute('error-message')).to.contain(
+          e.getAttribute('data-expectederror')
+        );
+        expect(e.className).to.contain('i-amphtml-element-error');
+      });
   }
 
   // Add cases to fixtures/errors.html and add them here.
diff --git a/test/integration/test-extensions-loading.js b/test/integration/test-extensions-loading.js
index 2ef2a7583ce5..0707d2490826 100644
--- a/test/integration/test-extensions-loading.js
+++ b/test/integration/test-extensions-loading.js
@@ -35,23 +35,25 @@ function checkElementUpgrade(element) {
  */
 function testLoadOrderFixture(fixtureName, testElements) {
   let fixture;
-  return createFixtureIframe(fixtureName).then(f => {
-    fixture = f;
-    for (let i = 0; i < testElements.length; i++) {
-      expect(fixture.doc.querySelectorAll(testElements[i]))
-          .to.have.length(1);
-    }
-    return fixture.awaitEvent(AmpEvents.LOAD_START, testElements.length);
-  }).then(() => {
-    for (let i = 0; i < testElements.length; i++) {
-      const testElement = fixture.doc.querySelectorAll(testElements[i])[0];
-      checkElementUpgrade(testElement);
-      if (testElement.tagName == 'AMP-FIT-TEXT') {
-        expect(fixture.doc.getElementsByClassName('i-amphtml-fit-text-content'))
-            .to.have.length(1);
+  return createFixtureIframe(fixtureName)
+    .then(f => {
+      fixture = f;
+      for (let i = 0; i < testElements.length; i++) {
+        expect(fixture.doc.querySelectorAll(testElements[i])).to.have.length(1);
       }
-    }
-  });
+      return fixture.awaitEvent(AmpEvents.LOAD_START, testElements.length);
+    })
+    .then(() => {
+      for (let i = 0; i < testElements.length; i++) {
+        const testElement = fixture.doc.querySelectorAll(testElements[i])[0];
+        checkElementUpgrade(testElement);
+        if (testElement.tagName == 'AMP-FIT-TEXT') {
+          expect(
+            fixture.doc.getElementsByClassName('i-amphtml-fit-text-content')
+          ).to.have.length(1);
+        }
+      }
+    });
 }
 
 const t = describe.configure().retryOnSaucelabs();
@@ -60,38 +62,45 @@ t.run('test extensions loading in multiple orders', function() {
 
   it('one extension, extension loads first, all scripts in header', () => {
     return testLoadOrderFixture(
-        'test/fixtures/script-load-extension-head-v0-head.html',
-        ['amp-fit-text']);
+      'test/fixtures/script-load-extension-head-v0-head.html',
+      ['amp-fit-text']
+    );
   });
 
   it('one extension, v0 loads first, all scripts in header', () => {
     return testLoadOrderFixture(
-        'test/fixtures/script-load-v0-head-extension-head.html',
-        ['amp-fit-text']);
+      'test/fixtures/script-load-v0-head-extension-head.html',
+      ['amp-fit-text']
+    );
   });
 
   it('one extension, extension loads first, all scripts in footer', () => {
     return testLoadOrderFixture(
-        'test/fixtures/script-load-extension-footer-v0-footer.html',
-        ['amp-fit-text']);
+      'test/fixtures/script-load-extension-footer-v0-footer.html',
+      ['amp-fit-text']
+    );
   });
 
   it('one extension, v0 loads first, all scripts in footer', () => {
     return testLoadOrderFixture(
-        'test/fixtures/script-load-v0-footer-extension-footer.html',
-        ['amp-fit-text']);
+      'test/fixtures/script-load-v0-footer-extension-footer.html',
+      ['amp-fit-text']
+    );
   });
 
   it('one extension, v0 in header, extension script in footer', () => {
     return testLoadOrderFixture(
-        'test/fixtures/script-load-v0-head-extension-footer.html',
-        ['amp-fit-text']);
+      'test/fixtures/script-load-v0-head-extension-footer.html',
+      ['amp-fit-text']
+    );
   });
 
   // TODO(choumx); This test times out when run with the prod AMP config.
   // See #11588.
   it.skip('two extensions, one of extension scripts and v0 in header', () => {
-    return testLoadOrderFixture('test/fixtures/script-load-extensions.html',
-        ['amp-fit-text', 'amp-iframe']);
+    return testLoadOrderFixture('test/fixtures/script-load-extensions.html', [
+      'amp-fit-text',
+      'amp-iframe',
+    ]);
   });
 });
diff --git a/test/integration/test-position-observer.js b/test/integration/test-position-observer.js
index b7e1e71ea9c0..a89fd7a73bcc 100644
--- a/test/integration/test-position-observer.js
+++ b/test/integration/test-position-observer.js
@@ -70,36 +70,41 @@ config.run('amp-position-observer', function() {
     `;
 
   /*
-  * scrollbound amp-animation will make the target will go
-  * from opacity 0 to 1 with scroll.
-  **/
-  describes.integration('scrollbound animation', {
-    body: scrollboundBody,
-    css,
-    extensions,
-    experiments,
-  }, env => {
-    it('runs animation with scroll', () => {
-      // Not visible yet, opacity = 0;
-      expect(getOpacity(env.win)).to.equal(0);
-
-      // Scroll bring to middle of viewport, height of target is 10
-      env.win.scrollTo(0, getViewportHeight(env.win) / 2 + 5);
-      // Half way: opacity = 0.5
-      return waitForOpacity(env.win, 'equals', 0.5).then(() => {
-        // Scroll to the end
-        env.win.scrollTo(0, getViewportHeight(env.win) * 2);
-        // All the way: opacity = 1;
-        return waitForOpacity(env.win, 'equals', 1);
-      }).then(() => {
-        // Scroll back to the top
-        env.win.scrollTo(0, 0);
-        // Back to starting position: opacity: 0
-        return waitForOpacity(env.win, 'equals', 0);
+   * scrollbound amp-animation will make the target will go
+   * from opacity 0 to 1 with scroll.
+   **/
+  describes.integration(
+    'scrollbound animation',
+    {
+      body: scrollboundBody,
+      css,
+      extensions,
+      experiments,
+    },
+    env => {
+      it('runs animation with scroll', () => {
+        // Not visible yet, opacity = 0;
+        expect(getOpacity(env.win)).to.equal(0);
+
+        // Scroll bring to middle of viewport, height of target is 10
+        env.win.scrollTo(0, getViewportHeight(env.win) / 2 + 5);
+        // Half way: opacity = 0.5
+        return waitForOpacity(env.win, 'equals', 0.5)
+          .then(() => {
+            // Scroll to the end
+            env.win.scrollTo(0, getViewportHeight(env.win) * 2);
+            // All the way: opacity = 1;
+            return waitForOpacity(env.win, 'equals', 1);
+          })
+          .then(() => {
+            // Scroll back to the top
+            env.win.scrollTo(0, 0);
+            // Back to starting position: opacity: 0
+            return waitForOpacity(env.win, 'equals', 0);
+          });
       });
-    });
-  });
-
+    }
+  );
 
   const animationSceneBody = `
     <amp-animation id="anim" layout="nodisplay">
@@ -134,44 +139,48 @@ config.run('amp-position-observer', function() {
     `;
 
   /*
-  * Animation scene will start when 50% visible above the 10vh margin
-  * and paused when 50% invisible below the 10vh margin.
-  * There is no scrollbound behavior, purely time-based animation.
-  **/
-  describes.integration('animation scene', {
-    body: animationSceneBody,
-    css,
-    extensions,
-    experiments,
-  }, env => {
-
-    // TODO(#18657, aghassemi): Fails due to timeout.
-    it.skip('plays/pauses animation scene based on visibility', () => {
-      // Not visible yet, opacity = 0;
-      expect(getOpacity(env.win)).to.equal(0);
-      // Scroll to edge of visibility
-      // ratio is 0.5 and height of element is 10
-      // exclusion margin is 10% of viewport
-      // so we need to scroll = 10% * vh + 5px;
-      const scrollBy = getViewportHeight(env.win) * 0.1 + 5;
-      env.win.scrollTo(0, scrollBy);
-      return waitForOpacity(env.win, 'greater-than', 0).then(() => {
-        // Scroll to the end
-        env.win.scrollTo(0, getViewportHeight(env.win) * 2);
-
-        // Now we need to ensure opacity is not changing anymore to prove
-        // animation is paused.
-        return ensureOpacityIsNoChangingAnymore(env.win);
-      }).then(() => {
-        // Ok, animation is paused and given the long duration, opacity must be
-        // stuck somewhere between 0 and 1
-        const opacity = getOpacity(env.win);
-        expect(opacity).to.be.above(0);
-        expect(opacity).to.be.below(1);
+   * Animation scene will start when 50% visible above the 10vh margin
+   * and paused when 50% invisible below the 10vh margin.
+   * There is no scrollbound behavior, purely time-based animation.
+   **/
+  describes.integration(
+    'animation scene',
+    {
+      body: animationSceneBody,
+      css,
+      extensions,
+      experiments,
+    },
+    env => {
+      // TODO(#18657, aghassemi): Fails due to timeout.
+      it.skip('plays/pauses animation scene based on visibility', () => {
+        // Not visible yet, opacity = 0;
+        expect(getOpacity(env.win)).to.equal(0);
+        // Scroll to edge of visibility
+        // ratio is 0.5 and height of element is 10
+        // exclusion margin is 10% of viewport
+        // so we need to scroll = 10% * vh + 5px;
+        const scrollBy = getViewportHeight(env.win) * 0.1 + 5;
+        env.win.scrollTo(0, scrollBy);
+        return waitForOpacity(env.win, 'greater-than', 0)
+          .then(() => {
+            // Scroll to the end
+            env.win.scrollTo(0, getViewportHeight(env.win) * 2);
+
+            // Now we need to ensure opacity is not changing anymore to prove
+            // animation is paused.
+            return ensureOpacityIsNoChangingAnymore(env.win);
+          })
+          .then(() => {
+            // Ok, animation is paused and given the long duration, opacity must be
+            // stuck somewhere between 0 and 1
+            const opacity = getOpacity(env.win);
+            expect(opacity).to.be.above(0);
+            expect(opacity).to.be.below(1);
+          });
       });
-
-    });
-  });
+    }
+  );
 });
 
 function getOpacity(win) {
diff --git a/test/integration/test-released.js b/test/integration/test-released.js
index 668869de8a45..04baac99a48f 100644
--- a/test/integration/test-released.js
+++ b/test/integration/test-released.js
@@ -20,15 +20,19 @@ import {
   pollForLayout,
 } from '../../testing/iframe.js';
 
-describe.configure().retryOnSaucelabs().run('released components: ',
-    function() {
-      runTest.call(this, false);
-    });
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('released components: ', function() {
+    runTest.call(this, false);
+  });
 
-describe.configure().retryOnSaucelabs().run(
-    'released components with polyfills: ', function() {
-      runTest.call(this, true);
-    });
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('released components with polyfills: ', function() {
+    runTest.call(this, true);
+  });
 
 function runTest(shouldKillPolyfillableApis) {
   describe.configure().run('Rendering of released components', function() {
@@ -50,21 +54,28 @@ function runTest(shouldKillPolyfillableApis) {
     // It never renders the ad, even though it appears to work when looking
     // at the rendering. The test passes when running locally in FF.
     // TODO(lannka, #3561): unmute the test.
-    it.configure().skipFirefox().skipChrome()
-        .run('all components should get loaded', function() {
-          this.timeout(15000);
-          return pollForLayout(fixture.win, 13, 10000).then(() => {
-            expect(fixture.doc.querySelectorAll('.i-amphtml-element'))
-                .to.have.length(17);
-            expect(fixture.doc.querySelectorAll('.i-amphtml-layout'))
-                .to.have.length(13);
-            expect(fixture.doc.querySelectorAll('.i-amphtml-error'))
-                .to.have.length(0);
+    it.configure()
+      .skipFirefox()
+      .skipChrome()
+      .run('all components should get loaded', function() {
+        this.timeout(15000);
+        return pollForLayout(fixture.win, 13, 10000)
+          .then(() => {
+            expect(
+              fixture.doc.querySelectorAll('.i-amphtml-element')
+            ).to.have.length(17);
+            expect(
+              fixture.doc.querySelectorAll('.i-amphtml-layout')
+            ).to.have.length(13);
+            expect(
+              fixture.doc.querySelectorAll('.i-amphtml-error')
+            ).to.have.length(0);
             checkGlobalScope(fixture.win);
-          }).then(() => {
+          })
+          .then(() => {
             return expectBodyToBecomeVisible(fixture.win);
           });
-        });
+      });
 
     it('sanity for Firefox while we skip above', function() {
       this.timeout(15000);
@@ -83,9 +94,25 @@ function checkGlobalScope(win) {
   // Checks that we don't leak certain symbols to the global scope.
   // This could happen if we do not wrap all our code in a closure.
   const commonSymbols = [
-    '$', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'x', 'z', '_', 'log'];
+    '$',
+    'a',
+    'b',
+    'c',
+    'd',
+    'e',
+    'f',
+    'g',
+    'h',
+    'i',
+    'x',
+    'z',
+    '_',
+    'log',
+  ];
   expect(win).to.not.include.keys(commonSymbols);
-  expect(win).to.not.include.keys(commonSymbols.map(symbol => {
-    return symbol.toUpperCase();
-  }));
+  expect(win).to.not.include.keys(
+    commonSymbols.map(symbol => {
+      return symbol.toUpperCase();
+    })
+  );
 }
diff --git a/test/integration/test-toggle-display.js b/test/integration/test-toggle-display.js
index d2e0ab15410a..7762438f1d66 100644
--- a/test/integration/test-toggle-display.js
+++ b/test/integration/test-toggle-display.js
@@ -15,54 +15,58 @@
  */
 
 import {AmpEvents} from '../../src/amp-events';
-import {
-  createFixtureIframe,
-} from '../../testing/iframe.js';
-import {
-  setInitialDisplay,
-  toggle,
-} from '../../src/style';
+import {createFixtureIframe} from '../../testing/iframe.js';
+import {setInitialDisplay, toggle} from '../../src/style';
 
-describe.configure().retryOnSaucelabs().run('toggle display helper', () => {
-  let fixture;
-  let sandbox;
-  let img;
+describe
+  .configure()
+  .retryOnSaucelabs()
+  .run('toggle display helper', () => {
+    let fixture;
+    let sandbox;
+    let img;
 
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
 
-    return createFixtureIframe('test/fixtures/images.html', 500).then(f => {
-      fixture = f;
+      return createFixtureIframe('test/fixtures/images.html', 500)
+        .then(f => {
+          fixture = f;
 
-      // Wait for one <amp-img> element to load.
-      return fixture.awaitEvent(AmpEvents.LOAD_END, 1);
-    }).then(() => {
-      img = fixture.doc.querySelector('amp-img');
+          // Wait for one <amp-img> element to load.
+          return fixture.awaitEvent(AmpEvents.LOAD_END, 1);
+        })
+        .then(() => {
+          img = fixture.doc.querySelector('amp-img');
+        });
     });
-  });
 
-  afterEach(() => {
-    sandbox.restore();
-  });
+    afterEach(() => {
+      sandbox.restore();
+    });
 
-  describes.repeated('toggle', {
-    'regular': () => {},
-    'inline display style': el => {
-      setInitialDisplay(el, 'inline-block');
-    },
-    'stylesheet display style': () => {
-      const s = fixture.doc.createElement('style');
-      s.innerText = 'amp-img { display: inline-block !important; }';
-      fixture.doc.head.appendChild(s);
-    },
-  }, (name, setup) => {
-    it('toggle display', () => {
-      setup(img);
+    describes.repeated(
+      'toggle',
+      {
+        'regular': () => {},
+        'inline display style': el => {
+          setInitialDisplay(el, 'inline-block');
+        },
+        'stylesheet display style': () => {
+          const s = fixture.doc.createElement('style');
+          s.innerText = 'amp-img { display: inline-block !important; }';
+          fixture.doc.head.appendChild(s);
+        },
+      },
+      (name, setup) => {
+        it('toggle display', () => {
+          setup(img);
 
-      toggle(img, false);
-      expect(img).to.have.display('none');
-      toggle(img, true);
-      expect(img).to.not.have.display('none');
-    });
+          toggle(img, false);
+          expect(img).to.have.display('none');
+          toggle(img, true);
+          expect(img).to.not.have.display('none');
+        });
+      }
+    );
   });
-});
diff --git a/test/integration/test-user-error-reporting.js b/test/integration/test-user-error-reporting.js
index 4aefc1121800..2940a1433150 100644
--- a/test/integration/test-user-error-reporting.js
+++ b/test/integration/test-user-error-reporting.js
@@ -16,17 +16,20 @@
 
 import {BrowserController, RequestBank} from '../../testing/test-helper';
 
-const t = describe.configure()
-    .skipSafari() // TODO(zhouyx, #11459): Unskip the test on safari.
-    .skipEdge()
-    .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+const t = describe
+  .configure()
+  .skipSafari() // TODO(zhouyx, #11459): Unskip the test on safari.
+  .skipEdge()
+  .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
 
 t.run('user-error', function() {
-  describes.integration('user-error integration test', {
-    extensions: ['amp-analytics'],
-    hash: 'log=0',
-    experiments: ['user-error-reporting'],
-    body: `
+  describes.integration(
+    'user-error integration test',
+    {
+      extensions: ['amp-analytics'],
+      hash: 'log=0',
+      experiments: ['user-error-reporting'],
+      body: `
     <amp-analytics>
       <script type="application/json">
         {
@@ -46,23 +49,27 @@ t.run('user-error', function() {
     <amp-pixel src="https://foo.com/tracker/foo"
             referrerpolicy="fail-referrer">
             `,
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics');
-    });
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics');
+      });
 
-    it('should ping correct host with amp-pixel user().assert err', () => {
-      return RequestBank.withdraw();
-    });
-  });
+      it('should ping correct host with amp-pixel user().assert err', () => {
+        return RequestBank.withdraw();
+      });
+    }
+  );
 
-  describes.integration('user-error integration test', {
-    extensions: ['amp-analytics'],
-    hash: 'log=0',
-    experiments: ['user-error-reporting'],
+  describes.integration(
+    'user-error integration test',
+    {
+      extensions: ['amp-analytics'],
+      hash: 'log=0',
+      experiments: ['user-error-reporting'],
 
-    body: `
+      body: `
     <amp-img
       src="../../examples/img/sea@1x.jpg"
       width="360" height="216" layout="responsive"
@@ -84,23 +91,27 @@ t.run('user-error', function() {
         }
       </script>
     </amp-analytics>`,
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics, amp-img');
-    });
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics, amp-img');
+      });
 
-    it('should ping correct host with amp-img user().error err', () => {
-      return RequestBank.withdraw();
-    });
-  });
+      it('should ping correct host with amp-img user().error err', () => {
+        return RequestBank.withdraw();
+      });
+    }
+  );
 
-  describes.integration('3p user-error integration test', {
-    extensions: ['amp-analytics', 'amp-ad'],
-    hash: 'log=0',
-    experiments: ['user-error-reporting'],
+  describes.integration(
+    '3p user-error integration test',
+    {
+      extensions: ['amp-analytics', 'amp-ad'],
+      hash: 'log=0',
+      experiments: ['user-error-reporting'],
 
-    body: `
+      body: `
     <amp-ad width=300 height=250
         type="_ping_"
         data-url='not-exist'
@@ -123,14 +134,16 @@ t.run('user-error', function() {
         }
       </script>
     </amp-analytics>`,
-  }, env => {
-    beforeEach(() => {
-      const browser = new BrowserController(env.win);
-      return browser.waitForElementLayout('amp-analytics, amp-ad');
-    });
+    },
+    env => {
+      beforeEach(() => {
+        const browser = new BrowserController(env.win);
+        return browser.waitForElementLayout('amp-analytics, amp-ad');
+      });
 
-    it('should ping correct host with 3p error message', () => {
-      return RequestBank.withdraw();
-    });
-  });
+      it('should ping correct host with 3p error message', () => {
+        return RequestBank.withdraw();
+      });
+    }
+  );
 });
diff --git a/test/integration/test-video-manager.js b/test/integration/test-video-manager.js
index aa252beeb9af..41572e9fcfc3 100644
--- a/test/integration/test-video-manager.js
+++ b/test/integration/test-video-manager.js
@@ -17,20 +17,15 @@
 import {PlayingStates, VideoEvents} from '../../src/video-interface';
 import {Services} from '../../src/services';
 import {VideoUtils} from '../../src/utils/video';
-import {
-  installVideoManagerForDoc,
-} from '../../src/service/video-manager-impl';
+import {installVideoManagerForDoc} from '../../src/service/video-manager-impl';
 import {isLayoutSizeDefined} from '../../src/layout';
 import {listenOncePromise} from '../../src/event-helper';
-import {
-  runVideoPlayerIntegrationTests,
-} from './test-video-players-helper';
+import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
 import {toArray} from '../../src/types';
 
 // TODO(dvoytenko): These tests time out when run with the prod AMP config.
 // See #11588.
-describe.configure().skip('Fake Video Player' +
-    'Integration Tests', () => {
+describe.configure().skip('Fake Video PlayerIntegration Tests', () => {
   // We run the video player integration tests on a fake video player as part
   // of functional testing. Same tests run on real video players such as
   // `amp-video` and `amp-youtube` as part of integration testing.
@@ -38,364 +33,375 @@ describe.configure().skip('Fake Video Player' +
     fixture.win.AMP.push({
       n: 'amp-test-fake-videoplayer',
       f: function(AMP) {
-        AMP.registerElement('amp-test-fake-videoplayer',
-            createFakeVideoPlayerClass(fixture.win));
+        AMP.registerElement(
+          'amp-test-fake-videoplayer',
+          createFakeVideoPlayerClass(fixture.win)
+        );
       },
     });
     return fixture.doc.createElement('amp-test-fake-videoplayer');
   });
 });
 
-describe.configure().ifChrome().run('VideoManager', function() {
-  describes.fakeWin('VideoManager', {
-    amp: {
-      ampdoc: 'single',
-    },
-  }, env => {
-    let sandbox;
-    let videoManager;
-    let klass;
-    let video;
-    let impl;
-
-    it('should receive i-amphtml-video-interface class when registered', () => {
-      const expectedClass = 'i-amphtml-video-interface';
-      expect(toArray(video.classList)).to.not.contain(expectedClass);
-      videoManager.register(impl);
-      expect(toArray(video.classList)).to.contain(expectedClass);
-    });
-
-    it('should register common actions', () => {
-      const spy = sandbox.spy(impl, 'registerAction');
-      videoManager.register(impl);
-
-      expect(spy).to.have.been.calledWith('play');
-      expect(spy).to.have.been.calledWith('pause');
-      expect(spy).to.have.been.calledWith('mute');
-      expect(spy).to.have.been.calledWith('unmute');
-    });
-
-    it('should be paused if autoplay is not set', () => {
-
-      videoManager.register(impl);
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = false;
-
-      const curState = videoManager.getPlayingState(impl);
-      expect(curState).to.equal(PlayingStates.PAUSED);
-    });
-
-
-    it('autoplay - should be PLAYING_MANUAL if user interacted', () => {
-
-      video.setAttribute('autoplay', '');
-
-      videoManager.register(impl);
-
-      const entry = videoManager.getEntryForVideo_(impl);
-      sandbox.stub(entry, 'userInteracted').returns(true);
-      entry.isVisible_ = true;
-      entry.loaded_ = true;
-
-      impl.play();
-      return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
-        const curState = videoManager.getPlayingState(impl);
-        expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
-      });
-    });
-
-
-    it('autoplay - should be PLAYING_AUTO if user did not interact', () => {
-
-      video.setAttribute('autoplay', '');
-      videoManager.register(impl);
-
-      const visibilityStub = sandbox.stub(
-          Services.viewerForDoc(env.ampdoc), 'isVisible');
-      visibilityStub.onFirstCall().returns(true);
-
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = true;
-      entry.loaded_ = true;
-      entry.videoVisibilityChanged_();
-
-      return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
-        const curState = videoManager.getPlayingState(impl);
-        expect(curState).to.equal(PlayingStates.PLAYING_AUTO);
-
-      });
-
-    });
-
-    // TODO(aghassemi): Investigate failure. #10974.
-    it.skip('autoplay - autoplay not supported should behave' +
-        'like manual play', () => {
-
-      video.setAttribute('autoplay', '');
-      videoManager.register(impl);
-
-      const visibilityStub = sandbox.stub(
-          Services.viewerForDoc(env.ampdoc), 'isVisible');
-      visibilityStub.onFirstCall().returns(true);
-
-      const entry = videoManager.getEntryForVideo_(impl);
-
-      const supportsAutoplayStub = sandbox.stub(entry, 'supportsAutoplay_');
+describe
+  .configure()
+  .ifChrome()
+  .run('VideoManager', function() {
+    describes.fakeWin(
+      'VideoManager',
+      {
+        amp: {
+          ampdoc: 'single',
+        },
+      },
+      env => {
+        let sandbox;
+        let videoManager;
+        let klass;
+        let video;
+        let impl;
+
+        it('should receive i-amphtml-video-interface class when registered', () => {
+          const expectedClass = 'i-amphtml-video-interface';
+          expect(toArray(video.classList)).to.not.contain(expectedClass);
+          videoManager.register(impl);
+          expect(toArray(video.classList)).to.contain(expectedClass);
+        });
 
-      supportsAutoplayStub.returns(Promise.reject());
+        it('should register common actions', () => {
+          const spy = sandbox.spy(impl, 'registerAction');
+          videoManager.register(impl);
 
-      entry.isVisible_ = true;
-      entry.loaded_ = true;
+          expect(spy).to.have.been.calledWith('play');
+          expect(spy).to.have.been.calledWith('pause');
+          expect(spy).to.have.been.calledWith('mute');
+          expect(spy).to.have.been.calledWith('unmute');
+        });
 
-      entry.videoVisibilityChanged_();
+        it('should be paused if autoplay is not set', () => {
+          videoManager.register(impl);
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = false;
 
-      return new Promise(function(resolve, reject) {
-        listenOncePromise(video, VideoEvents.PLAYING).then(() => {
-          reject();
-        });
-        setTimeout(function() {
           const curState = videoManager.getPlayingState(impl);
           expect(curState).to.equal(PlayingStates.PAUSED);
-          resolve('Video did not autoplay as expected');
-        }, 1000);
-      });
-    });
-
-    it('autoplay - should be PAUSED if pause after playing', () => {
-
-      video.setAttribute('autoplay', '');
-
-      videoManager.register(impl);
-
-      impl.play();
-
-      const entry = videoManager.getEntryForVideo_(impl);
-      sandbox.stub(entry, 'userInteracted').returns(true);
-      entry.isVisible_ = false;
+        });
 
-      impl.pause();
-      return listenOncePromise(video, VideoEvents.PAUSE).then(() => {
-        const curState = videoManager.getPlayingState(impl);
-        expect(curState).to.equal(PlayingStates.PAUSED);
-      });
-    });
+        it('autoplay - should be PLAYING_MANUAL if user interacted', () => {
+          video.setAttribute('autoplay', '');
 
-    it('autoplay - initially there should be no user interaction', () => {
+          videoManager.register(impl);
 
-      video.setAttribute('autoplay', '');
+          const entry = videoManager.getEntryForVideo_(impl);
+          sandbox.stub(entry, 'userInteracted').returns(true);
+          entry.isVisible_ = true;
+          entry.loaded_ = true;
 
-      videoManager.register(impl);
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = false;
+          impl.play();
+          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+            const curState = videoManager.getPlayingState(impl);
+            expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
+          });
+        });
 
-      expect(videoManager.userInteracted(impl)).to.be.false;
-    });
+        it('autoplay - should be PLAYING_AUTO if user did not interact', () => {
+          video.setAttribute('autoplay', '');
+          videoManager.register(impl);
+
+          const visibilityStub = sandbox.stub(
+            Services.viewerForDoc(env.ampdoc),
+            'isVisible'
+          );
+          visibilityStub.onFirstCall().returns(true);
+
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = true;
+          entry.loaded_ = true;
+          entry.videoVisibilityChanged_();
+
+          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+            const curState = videoManager.getPlayingState(impl);
+            expect(curState).to.equal(PlayingStates.PLAYING_AUTO);
+          });
+        });
 
+        // TODO(aghassemi): Investigate failure. #10974.
+        it.skip(
+          'autoplay - autoplay not supported should behave' +
+            'like manual play',
+          () => {
+            video.setAttribute('autoplay', '');
+            videoManager.register(impl);
+
+            const visibilityStub = sandbox.stub(
+              Services.viewerForDoc(env.ampdoc),
+              'isVisible'
+            );
+            visibilityStub.onFirstCall().returns(true);
+
+            const entry = videoManager.getEntryForVideo_(impl);
+
+            const supportsAutoplayStub = sandbox.stub(
+              entry,
+              'supportsAutoplay_'
+            );
+
+            supportsAutoplayStub.returns(Promise.reject());
+
+            entry.isVisible_ = true;
+            entry.loaded_ = true;
+
+            entry.videoVisibilityChanged_();
+
+            return new Promise(function(resolve, reject) {
+              listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+                reject();
+              });
+              setTimeout(function() {
+                const curState = videoManager.getPlayingState(impl);
+                expect(curState).to.equal(PlayingStates.PAUSED);
+                resolve('Video did not autoplay as expected');
+              }, 1000);
+            });
+          }
+        );
+
+        it('autoplay - should be PAUSED if pause after playing', () => {
+          video.setAttribute('autoplay', '');
+
+          videoManager.register(impl);
+
+          impl.play();
+
+          const entry = videoManager.getEntryForVideo_(impl);
+          sandbox.stub(entry, 'userInteracted').returns(true);
+          entry.isVisible_ = false;
+
+          impl.pause();
+          return listenOncePromise(video, VideoEvents.PAUSE).then(() => {
+            const curState = videoManager.getPlayingState(impl);
+            expect(curState).to.equal(PlayingStates.PAUSED);
+          });
+        });
 
-    it('autoplay - PAUSED if autoplaying and video is outside of view', () => {
+        it('autoplay - initially there should be no user interaction', () => {
+          video.setAttribute('autoplay', '');
 
-      video.setAttribute('autoplay', '');
+          videoManager.register(impl);
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = false;
 
-      videoManager.register(impl);
+          expect(videoManager.userInteracted(impl)).to.be.false;
+        });
 
-      const visibilityStub = sandbox.stub(
-          Services.viewerForDoc(env.ampdoc), 'isVisible');
-      visibilityStub.onFirstCall().returns(true);
+        it('autoplay - PAUSED if autoplaying and video is outside of view', () => {
+          video.setAttribute('autoplay', '');
 
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = true;
-      entry.loaded_ = true;
-      entry.videoVisibilityChanged_();
+          videoManager.register(impl);
 
-      entry.isVisible_ = false;
-      entry.videoVisibilityChanged_();
-      const curState = videoManager.getPlayingState(impl);
-      expect(curState).to.equal(PlayingStates.PAUSED);
-    });
+          const visibilityStub = sandbox.stub(
+            Services.viewerForDoc(env.ampdoc),
+            'isVisible'
+          );
+          visibilityStub.onFirstCall().returns(true);
 
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = true;
+          entry.loaded_ = true;
+          entry.videoVisibilityChanged_();
 
-    it('no autoplay - should pause if user presses pause after playing', () => {
-      videoManager.register(impl);
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = false;
-
-      impl.play();
-      return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
-        impl.pause();
-        listenOncePromise(video, VideoEvents.PAUSE).then(() => {
+          entry.isVisible_ = false;
+          entry.videoVisibilityChanged_();
           const curState = videoManager.getPlayingState(impl);
           expect(curState).to.equal(PlayingStates.PAUSED);
         });
-      });
-    });
 
-    it('no autoplay - should be playing manual whenever playing', () => {
-      videoManager.register(impl);
-      const entry = videoManager.getEntryForVideo_(impl);
-      entry.isVisible_ = false;
+        it('no autoplay - should pause if user presses pause after playing', () => {
+          videoManager.register(impl);
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = false;
+
+          impl.play();
+          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+            impl.pause();
+            listenOncePromise(video, VideoEvents.PAUSE).then(() => {
+              const curState = videoManager.getPlayingState(impl);
+              expect(curState).to.equal(PlayingStates.PAUSED);
+            });
+          });
+        });
 
-      impl.play();
-      return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
-        const curState = videoManager.getPlayingState(impl);
-        expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
-      });
-    });
+        it('no autoplay - should be playing manual whenever playing', () => {
+          videoManager.register(impl);
+          const entry = videoManager.getEntryForVideo_(impl);
+          entry.isVisible_ = false;
 
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-      klass = createFakeVideoPlayerClass(env.win);
-      video = env.createAmpElement('amp-test-fake-videoplayer', klass);
-      env.win.document.body.appendChild(video);
-      impl = video.implementation_;
-      installVideoManagerForDoc(env.ampdoc);
-      videoManager = Services.videoManagerForDoc(env.ampdoc);
-    });
+          impl.play();
+          return listenOncePromise(video, VideoEvents.PLAYING).then(() => {
+            const curState = videoManager.getPlayingState(impl);
+            expect(curState).to.equal(PlayingStates.PLAYING_MANUAL);
+          });
+        });
 
-    afterEach(() => {
-      sandbox.restore();
-    });
+        beforeEach(() => {
+          sandbox = sinon.sandbox;
+          klass = createFakeVideoPlayerClass(env.win);
+          video = env.createAmpElement('amp-test-fake-videoplayer', klass);
+          env.win.document.body.appendChild(video);
+          impl = video.implementation_;
+          installVideoManagerForDoc(env.ampdoc);
+          videoManager = Services.videoManagerForDoc(env.ampdoc);
+        });
 
+        afterEach(() => {
+          sandbox.restore();
+        });
+      }
+    );
   });
-});
-
-
-describe.configure().ifChrome().run('Autoplay support', () => {
-  const supportsAutoplay = VideoUtils.isAutoplaySupported; // for line length
-
-  let sandbox;
-
-  let win;
-  let video;
-
-  let isLite;
 
-  let createElementSpy;
-  let setAttributeSpy;
-  let playStub;
+describe
+  .configure()
+  .ifChrome()
+  .run('Autoplay support', () => {
+    const supportsAutoplay = VideoUtils.isAutoplaySupported; // for line length
 
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
+    let sandbox;
 
-    video = {
-      setAttribute() {},
-      style: {
-        position: null,
-        top: null,
-        width: null,
-        height: null,
-        opacity: null,
-      },
-      muted: null,
-      playsinline: null,
-      webkitPlaysinline: null,
-      paused: false,
-      play() {},
-    };
-
-    const doc = {
-      createElement() {
-        return video;
-      },
-    };
+    let win;
+    let video;
 
-    win = {
-      document: doc,
-    };
+    let isLite;
 
-    isLite = false;
+    let createElementSpy;
+    let setAttributeSpy;
+    let playStub;
 
-    createElementSpy = sandbox.spy(doc, 'createElement');
-    setAttributeSpy = sandbox.spy(video, 'setAttribute');
-    playStub = sandbox.stub(video, 'play');
+    beforeEach(() => {
+      sandbox = sinon.sandbox;
 
-    VideoUtils.resetIsAutoplaySupported();
-  });
+      video = {
+        setAttribute() {},
+        style: {
+          position: null,
+          top: null,
+          width: null,
+          height: null,
+          opacity: null,
+        },
+        muted: null,
+        playsinline: null,
+        webkitPlaysinline: null,
+        paused: false,
+        play() {},
+      };
+
+      const doc = {
+        createElement() {
+          return video;
+        },
+      };
+
+      win = {
+        document: doc,
+      };
+
+      isLite = false;
+
+      createElementSpy = sandbox.spy(doc, 'createElement');
+      setAttributeSpy = sandbox.spy(video, 'setAttribute');
+      playStub = sandbox.stub(video, 'play');
+
+      VideoUtils.resetIsAutoplaySupported();
+    });
 
-  afterEach(() => {
-    VideoUtils.resetIsAutoplaySupported();
+    afterEach(() => {
+      VideoUtils.resetIsAutoplaySupported();
 
-    sandbox.restore();
-  });
+      sandbox.restore();
+    });
 
-  it('should create an invisible test video element', () => {
-    return supportsAutoplay(win, isLite).then(() => {
-      expect(video.style.position).to.equal('fixed');
-      expect(video.style.top).to.equal('0');
-      expect(video.style.width).to.equal('0');
-      expect(video.style.height).to.equal('0');
-      expect(video.style.opacity).to.equal('0');
-
-      expect(setAttributeSpy).to.have.been.calledWith('muted', '');
-      expect(setAttributeSpy).to.have.been.calledWith('playsinline', '');
-      expect(setAttributeSpy).to.have.been.calledWith('webkit-playsinline', '');
-      expect(setAttributeSpy).to.have.been.calledWith('height', '0');
-      expect(setAttributeSpy).to.have.been.calledWith('width', '0');
-
-      expect(video.muted).to.be.true;
-      expect(video.playsinline).to.be.true;
-      expect(video.webkitPlaysinline).to.be.true;
-
-      expect(createElementSpy.called).to.be.true;
+    it('should create an invisible test video element', () => {
+      return supportsAutoplay(win, isLite).then(() => {
+        expect(video.style.position).to.equal('fixed');
+        expect(video.style.top).to.equal('0');
+        expect(video.style.width).to.equal('0');
+        expect(video.style.height).to.equal('0');
+        expect(video.style.opacity).to.equal('0');
+
+        expect(setAttributeSpy).to.have.been.calledWith('muted', '');
+        expect(setAttributeSpy).to.have.been.calledWith('playsinline', '');
+        expect(setAttributeSpy).to.have.been.calledWith(
+          'webkit-playsinline',
+          ''
+        );
+        expect(setAttributeSpy).to.have.been.calledWith('height', '0');
+        expect(setAttributeSpy).to.have.been.calledWith('width', '0');
+
+        expect(video.muted).to.be.true;
+        expect(video.playsinline).to.be.true;
+        expect(video.webkitPlaysinline).to.be.true;
+
+        expect(createElementSpy.called).to.be.true;
+      });
     });
-  });
 
-  it('should return false if `paused` is true after `play()` call', () => {
-    video.paused = true;
-    return supportsAutoplay(win, isLite).then(supportsAutoplay => {
-      expect(supportsAutoplay).to.be.false;
-      expect(playStub.called).to.be.true;
-      expect(createElementSpy.called).to.be.true;
+    it('should return false if `paused` is true after `play()` call', () => {
+      video.paused = true;
+      return supportsAutoplay(win, isLite).then(supportsAutoplay => {
+        expect(supportsAutoplay).to.be.false;
+        expect(playStub.called).to.be.true;
+        expect(createElementSpy.called).to.be.true;
+      });
     });
-  });
 
-  it('should return true if `paused` is false after `play()` call', () => {
-    video.paused = false;
-    return supportsAutoplay(win, isLite).then(supportsAutoplay => {
-      expect(supportsAutoplay).to.be.true;
-      expect(playStub.called).to.be.true;
-      expect(createElementSpy.called).to.be.true;
+    it('should return true if `paused` is false after `play()` call', () => {
+      video.paused = false;
+      return supportsAutoplay(win, isLite).then(supportsAutoplay => {
+        expect(supportsAutoplay).to.be.true;
+        expect(playStub.called).to.be.true;
+        expect(createElementSpy.called).to.be.true;
+      });
     });
-  });
 
-  it('should suppress errors if detection play call throws', () => {
-    playStub.throws();
-    video.paused = true;
-    expect(supportsAutoplay(win, isLite)).not.to.throw;
-    return supportsAutoplay(win, isLite).then(supportsAutoplay => {
-      expect(supportsAutoplay).to.be.false;
-      expect(playStub.called).to.be.true;
-      expect(createElementSpy.called).to.be.true;
+    it('should suppress errors if detection play call throws', () => {
+      playStub.throws();
+      video.paused = true;
+      expect(supportsAutoplay(win, isLite)).not.to.throw;
+      return supportsAutoplay(win, isLite).then(supportsAutoplay => {
+        expect(supportsAutoplay).to.be.false;
+        expect(playStub.called).to.be.true;
+        expect(createElementSpy.called).to.be.true;
+      });
     });
-  });
 
-  it('should suppress errors if detection play call rejects a promise', () => {
-    const p = Promise.reject('play() can only be initiated by a user gesture.');
-    playStub.returns(p);
-    video.paused = true;
-    expect(supportsAutoplay(win, isLite)).not.to.throw;
-    return supportsAutoplay(win, isLite).then(supportsAutoplay => {
-      expect(supportsAutoplay).to.be.false;
-      expect(playStub.called).to.be.true;
-      expect(createElementSpy.called).to.be.true;
+    it('should suppress errors if detection play call rejects a promise', () => {
+      const p = Promise.reject(
+        'play() can only be initiated by a user gesture.'
+      );
+      playStub.returns(p);
+      video.paused = true;
+      expect(supportsAutoplay(win, isLite)).not.to.throw;
+      return supportsAutoplay(win, isLite).then(supportsAutoplay => {
+        expect(supportsAutoplay).to.be.false;
+        expect(playStub.called).to.be.true;
+        expect(createElementSpy.called).to.be.true;
+      });
     });
-  });
 
-  it('should be false when in amp-lite mode', () => {
-    isLite = true;
-    return supportsAutoplay(win, isLite).then(supportsAutoplay => {
-      expect(supportsAutoplay).to.be.false;
+    it('should be false when in amp-lite mode', () => {
+      isLite = true;
+      return supportsAutoplay(win, isLite).then(supportsAutoplay => {
+        expect(supportsAutoplay).to.be.false;
+      });
     });
   });
 
-});
-
-
 function createFakeVideoPlayerClass(win) {
   /**
    * @implements {../../src/video-interface.VideoInterface}
    */
   return class FakeVideoPlayer extends win.AMP.BaseElement {
-
     /** @param {!AmpElement} element */
     constructor(element) {
       super(element);
@@ -503,32 +509,27 @@ function createFakeVideoPlayerClass(win) {
     /**
      * @override
      */
-    showControls() {
-    }
+    showControls() {}
 
     /**
      * @override
      */
-    hideControls() {
-    }
+    hideControls() {}
 
     /**
      * @override
      */
-    fullscreenEnter() {
-    }
+    fullscreenEnter() {}
 
     /**
      * @override
      */
-    fullscreenExit() {
-    }
+    fullscreenExit() {}
 
     /**
      * @override
      */
-    isFullscreen() {
-    }
+    isFullscreen() {}
 
     /** @override */
     getCurrentTime() {
diff --git a/test/integration/test-video-players-helper.js b/test/integration/test-video-players-helper.js
index 491b25baefa4..df32bb7cbc5e 100644
--- a/test/integration/test-video-players-helper.js
+++ b/test/integration/test-video-players-helper.js
@@ -30,7 +30,6 @@ import {getData, listenOncePromise} from '../../src/event-helper';
 import {removeElement} from '../../src/dom';
 import {toggleExperiment} from '../../src/experiments';
 
-
 function skipIfAutoplayUnsupported(win) {
   VideoUtils.resetIsAutoplaySupported();
 
@@ -42,10 +41,10 @@ function skipIfAutoplayUnsupported(win) {
   });
 }
 
-
 export function runVideoPlayerIntegrationTests(
-  createVideoElementFunc, opt_experiment) {
-
+  createVideoElementFunc,
+  opt_experiment
+) {
   /**
    * @const {number} Height of the fixture iframe
    */
@@ -63,42 +62,48 @@ export function runVideoPlayerIntegrationTests(
     return button;
   }
 
-  describe.configure().skipIfPropertiesObfuscated()
-      .ifChrome().run('Video Interface', function() {
-        this.timeout(TIMEOUT);
+  describe
+    .configure()
+    .skipIfPropertiesObfuscated()
+    .ifChrome()
+    .run('Video Interface', function() {
+      this.timeout(TIMEOUT);
 
-        it('should override the video interface methods', function() {
-          this.timeout(TIMEOUT);
-          return getVideoPlayer({outsideView: false, autoplay: true})
-              .then(r => {
-                const impl = r.video.implementation_;
-                const methods = Object.getOwnPropertyNames(
-                    Object.getPrototypeOf(new VideoInterface()));
-
-                expect(methods.length).to.be.above(1);
-                for (let i = 0; i < methods.length; i++) {
-                  const methodName = methods[i];
-                  expect(impl[methodName]).to.exist;
-                }
-              });
+      it('should override the video interface methods', function() {
+        this.timeout(TIMEOUT);
+        return getVideoPlayer({outsideView: false, autoplay: true}).then(r => {
+          const impl = r.video.implementation_;
+          const methods = Object.getOwnPropertyNames(
+            Object.getPrototypeOf(new VideoInterface())
+          );
+
+          expect(methods.length).to.be.above(1);
+          for (let i = 0; i < methods.length; i++) {
+            const methodName = methods[i];
+            expect(impl[methodName]).to.exist;
+          }
         });
-
-        afterEach(cleanUp);
       });
 
-  describe.configure().ifChrome().run('Actions', function() {
-    this.timeout(TIMEOUT);
+      afterEach(cleanUp);
+    });
 
-    // TODO(cvializ, #14827): Fails on Chrome 66.
-    it.skip('should support mute, play, pause, unmute actions', function() {
-      return getVideoPlayer({outsideView: false, autoplay: false}).then(r => {
-        // Create a action buttons
-        const playButton = createButton(r, 'play');
-        const pauseButton = createButton(r, 'pause');
-        const muteButton = createButton(r, 'mute');
-        const unmuteButton = createButton(r, 'unmute');
+  describe
+    .configure()
+    .ifChrome()
+    .run('Actions', function() {
+      this.timeout(TIMEOUT);
+
+      // TODO(cvializ, #14827): Fails on Chrome 66.
+      it.skip('should support mute, play, pause, unmute actions', function() {
+        return getVideoPlayer({outsideView: false, autoplay: false}).then(r => {
+          // Create a action buttons
+          const playButton = createButton(r, 'play');
+          const pauseButton = createButton(r, 'pause');
+          const muteButton = createButton(r, 'mute');
+          const unmuteButton = createButton(r, 'unmute');
 
-        return listenOncePromise(r.video, VideoEvents.LOAD)
+          return listenOncePromise(r.video, VideoEvents.LOAD)
             .then(() => {
               const promise = listenOncePromise(r.video, VideoEvents.PLAYING);
               playButton.click();
@@ -119,169 +124,175 @@ export function runVideoPlayerIntegrationTests(
               unmuteButton.click();
               return promise;
             });
+        });
       });
-    });
 
-    // Although these tests are not about autoplay, we can ony run them in
-    // browsers that do support autoplay, this is because a synthetic click
-    // event will not be considered a user-action and mobile browsers that
-    // don't support muted autoplay will block it. In real life, the click
-    // would be considered a user-initiated action, but no way to do that in a
-    // scripted test environment.
-    before(function() {
-      this.timeout(TIMEOUT);
-      return skipIfAutoplayUnsupported.call(this, window);
-    });
+      // Although these tests are not about autoplay, we can ony run them in
+      // browsers that do support autoplay, this is because a synthetic click
+      // event will not be considered a user-action and mobile browsers that
+      // don't support muted autoplay will block it. In real life, the click
+      // would be considered a user-initiated action, but no way to do that in a
+      // scripted test environment.
+      before(function() {
+        this.timeout(TIMEOUT);
+        return skipIfAutoplayUnsupported.call(this, window);
+      });
 
-    afterEach(cleanUp);
-  });
+      afterEach(cleanUp);
+    });
 
-  describe.configure()
-      .skipIfPropertiesObfuscated()
-      .ifChrome()
-      .skipWindows() // TODO(#19647): Flaky on Chrome 71 on Windows 10.
-      .run('Analytics Triggers', function() {
-        this.timeout(TIMEOUT);
-        let video;
+  describe
+    .configure()
+    .skipIfPropertiesObfuscated()
+    .ifChrome()
+    .skipWindows() // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+    .run('Analytics Triggers', function() {
+      this.timeout(TIMEOUT);
+      let video;
 
-        // TODO(cvializ, #14827): Fails on Chrome 66.
-        it.skip('should trigger play analytics on play', function() {
-          let playButton;
+      // TODO(cvializ, #14827): Fails on Chrome 66.
+      it.skip('should trigger play analytics on play', function() {
+        let playButton;
 
-          return getVideoPlayer(
-              {
-                outsideView: true,
-                autoplay: false,
-              }
-          ).then(r => {
+        return getVideoPlayer({
+          outsideView: true,
+          autoplay: false,
+        })
+          .then(r => {
             video = r.video;
             playButton = createButton(r, 'play');
             const viewport = video.implementation_.getViewport();
             const promise = listenOncePromise(video, VideoEvents.LOAD);
             viewport.scrollIntoView(video);
             return promise;
-          }).then(() => {
-            const promise = listenOncePromise(video,
-                VideoAnalyticsEvents.PLAY);
+          })
+          .then(() => {
+            const promise = listenOncePromise(video, VideoAnalyticsEvents.PLAY);
             playButton.click();
             return promise;
           });
-        });
+      });
 
-        it('should trigger pause analytics when the video pauses', function() {
-          let pauseButton;
+      it('should trigger pause analytics when the video pauses', function() {
+        let pauseButton;
 
-          return getVideoPlayer(
-              {
-                outsideView: false,
-                autoplay: true,
-              }
-          ).then(r => {
+        return getVideoPlayer({
+          outsideView: false,
+          autoplay: true,
+        })
+          .then(r => {
             video = r.video;
             pauseButton = createButton(r, 'pause');
             return listenOncePromise(video, VideoEvents.PLAYING);
-          }).then(() => {
-            const promise = listenOncePromise(video,
-                VideoAnalyticsEvents.PAUSE);
+          })
+          .then(() => {
+            const promise = listenOncePromise(
+              video,
+              VideoAnalyticsEvents.PAUSE
+            );
             pauseButton.click();
             return promise;
           });
-        });
+      });
 
-        it('should trigger session analytics when a session ends', function() {
-          let pauseButton;
+      it('should trigger session analytics when a session ends', function() {
+        let pauseButton;
 
-          return getVideoPlayer(
-              {
-                outsideView: false,
-                autoplay: true,
-              }
-          ).then(r => {
+        return getVideoPlayer({
+          outsideView: false,
+          autoplay: true,
+        })
+          .then(r => {
             video = r.video;
             const promise = listenOncePromise(video, VideoEvents.PLAYING);
             pauseButton = createButton(r, 'pause');
             return promise;
-          }).then(() => {
-            const promise = listenOncePromise(video,
-                VideoAnalyticsEvents.PAUSE);
+          })
+          .then(() => {
+            const promise = listenOncePromise(
+              video,
+              VideoAnalyticsEvents.PAUSE
+            );
             pauseButton.click();
             return promise;
           });
-        });
+      });
 
-        // TODO (#16154): this test times out on master
-        it.skip('should trigger session analytics when ' +
-        'a visible session ends', function() {
-          let viewport;
-          return getVideoPlayer(
-              {
-                outsideView: true,
-                autoplay: true,
-              }
-          ).then(r => {
+      // TODO (#16154): this test times out on master
+      it.skip('should trigger session analytics when a visible session ends', function() {
+        let viewport;
+        return getVideoPlayer({
+          outsideView: true,
+          autoplay: true,
+        })
+          .then(r => {
             video = r.video;
             viewport = video.implementation_.getViewport();
             // scroll to the bottom, make video fully visible
             viewport.scrollIntoView(video);
             return listenOncePromise(video, VideoEvents.PLAYING);
-          }).then(() => {
+          })
+          .then(() => {
             // scroll to the bottom, make video fully visible
             viewport.setScrollTop(0);
-            return listenOncePromise(video,
-                VideoAnalyticsEvents.SESSION_VISIBLE);
+            return listenOncePromise(
+              video,
+              VideoAnalyticsEvents.SESSION_VISIBLE
+            );
           });
-        });
-
+      });
 
-        describe('should trigger ended analytics', () => {
-          let player;
-          before(function() {
-            return getVideoPlayer(
-                {
-                  outsideView: false,
-                  autoplay: true,
-                }
-            ).then(r => {
-              // TODO(cvializ): Better way to detect which classes implement
-              // methods needed for tracking?
-              const {tagName} = r.video;
-              if (tagName !== 'AMP-VIDEO' &&
-              tagName !== 'AMP-TEST-FAKE-VIDEOPLAYER') {
-                this.skipTest();
-                return;
-              }
-              player = r;
-            });
-          });
-          it('when the video ends', function() {
-            video = player.video;
-            return listenOncePromise(video, VideoAnalyticsEvents.ENDED);
+      describe('should trigger ended analytics', () => {
+        let player;
+        before(function() {
+          return getVideoPlayer({
+            outsideView: false,
+            autoplay: true,
+          }).then(r => {
+            // TODO(cvializ): Better way to detect which classes implement
+            // methods needed for tracking?
+            const {tagName} = r.video;
+            if (
+              tagName !== 'AMP-VIDEO' &&
+              tagName !== 'AMP-TEST-FAKE-VIDEOPLAYER'
+            ) {
+              this.skipTest();
+              return;
+            }
+            player = r;
           });
         });
+        it('when the video ends', function() {
+          video = player.video;
+          return listenOncePromise(video, VideoAnalyticsEvents.ENDED);
+        });
+      });
 
-        // TODO(cvializ, #14827): Fails on Chrome 66.
-        it.skip('should include current time, play state, etc.', function() {
-          let playButton;
-          let pauseButton;
-
-          return getVideoPlayer(
-              {
-                outsideView: false,
-                autoplay: false,
-              }
-          ).then(r => {
+      // TODO(cvializ, #14827): Fails on Chrome 66.
+      it.skip('should include current time, play state, etc.', function() {
+        let playButton;
+        let pauseButton;
+
+        return getVideoPlayer({
+          outsideView: false,
+          autoplay: false,
+        })
+          .then(r => {
             video = r.video;
             playButton = createButton(r, 'play');
             pauseButton = createButton(r, 'pause');
             return listenOncePromise(video, VideoEvents.LOAD);
-          }).then(() => {
+          })
+          .then(() => {
             const promise = listenOncePromise(video, VideoEvents.PLAYING);
             playButton.click();
             return promise;
-          }).then(() => {
+          })
+          .then(() => {
             pauseButton.click();
             return listenOncePromise(video, VideoAnalyticsEvents.PAUSE);
-          }).then(event => {
+          })
+          .then(event => {
             const details = getData(event);
             const playedRanges = JSON.parse(details.playedRangesJson);
             expect(details.autoplay).to.be.a('boolean');
@@ -294,59 +305,71 @@ export function runVideoPlayerIntegrationTests(
             expect(details.state).to.be.a('string');
             expect(details.width).to.be.a('number');
           });
-        });
+      });
+
+      it.skip('should trigger video-seconds-played when visibleand playing', () => {
+        let video;
+        let timer;
+        let pauseButton;
+        let playButton;
 
-        it.skip('should trigger video-seconds-played when visible' +
-        'and playing', () => {
-          let video;
-          let timer;
-          let pauseButton;
-          let playButton;
-
-          return getVideoPlayer(
-              {
-                outsideView: true,
-                autoplay: true,
-              }
-          ).then(r => {
+        return getVideoPlayer({
+          outsideView: true,
+          autoplay: true,
+        })
+          .then(r => {
             timer = Services.timerFor(r.video.implementation_.win);
             video = r.video;
             pauseButton = createButton(r, 'pause');
             playButton = createButton(r, 'play');
             return Promise.race([
-              listenOncePromise(video,
-                  VideoAnalyticsEvents.SECONDS_PLAYED).then(
-                  () => Promise.reject('Triggered video-seconds-played')),
+              listenOncePromise(
+                video,
+                VideoAnalyticsEvents.SECONDS_PLAYED
+              ).then(() => Promise.reject('Triggered video-seconds-played')),
               timer.promise(2000),
             ]);
-          }).then(() => {
+          })
+          .then(() => {
             const viewport = video.implementation_.getViewport();
             viewport.scrollIntoView(video);
-            return listenOncePromise(video,
-                VideoAnalyticsEvents.SECONDS_PLAYED);
-          }).then(() => {
+            return listenOncePromise(
+              video,
+              VideoAnalyticsEvents.SECONDS_PLAYED
+            );
+          })
+          .then(() => {
             pauseButton.click();
             return listenOncePromise(video, VideoEvents.PAUSE);
-          }).then(() => {
+          })
+          .then(() => {
             return Promise.race([
-              listenOncePromise(video,
-                  VideoAnalyticsEvents.SECONDS_PLAYED).then(
-                  () => Promise.reject('Triggered video-seconds-played')),
+              listenOncePromise(
+                video,
+                VideoAnalyticsEvents.SECONDS_PLAYED
+              ).then(() => Promise.reject('Triggered video-seconds-played')),
               timer.promise(2000),
             ]);
-          }).then(() => {
+          })
+          .then(() => {
             playButton.click();
             return listenOncePromise(video, VideoEvents.PLAYING);
-          }).then(() => {
-            return listenOncePromise(video,
-                VideoAnalyticsEvents.SECONDS_PLAYED);
+          })
+          .then(() => {
+            return listenOncePromise(
+              video,
+              VideoAnalyticsEvents.SECONDS_PLAYED
+            );
           });
-        });
-
-        afterEach(cleanUp);
       });
 
-  const t = describe.configure().ifChrome().skipIfPropertiesObfuscated();
+      afterEach(cleanUp);
+    });
+
+  const t = describe
+    .configure()
+    .ifChrome()
+    .skipIfPropertiesObfuscated();
   t.run('Autoplay', function() {
     this.timeout(TIMEOUT);
 
@@ -373,20 +396,22 @@ export function runVideoPlayerIntegrationTests(
       it.skip('should play/pause when video enters/exits viewport', function() {
         let video;
         let viewport;
-        return getVideoPlayer({outsideView: true, autoplay: true}).then(r => {
-          video = r.video;
-          viewport = video.implementation_.getViewport();
-
-          // scroll to the bottom, make video fully visible
-          const p = listenOncePromise(video, VideoEvents.PLAYING);
-          viewport.scrollIntoView(video);
-          return p;
-        }).then(() => {
-          // scroll back to top, make video not visible
-          const p = listenOncePromise(video, VideoEvents.PAUSE);
-          viewport.setScrollTop(0);
-          return p;
-        });
+        return getVideoPlayer({outsideView: true, autoplay: true})
+          .then(r => {
+            video = r.video;
+            viewport = video.implementation_.getViewport();
+
+            // scroll to the bottom, make video fully visible
+            const p = listenOncePromise(video, VideoEvents.PLAYING);
+            viewport.scrollIntoView(video);
+            return p;
+          })
+          .then(() => {
+            // scroll back to top, make video not visible
+            const p = listenOncePromise(video, VideoEvents.PAUSE);
+            viewport.setScrollTop(0);
+            return p;
+          });
       });
     });
 
@@ -396,42 +421,49 @@ export function runVideoPlayerIntegrationTests(
         let video;
         let viewport;
         let icon;
-        return getVideoPlayer({outsideView: true, autoplay: true}).then(r => {
-          video = r.video;
-          return poll('animation icon', () => {
-            return !!video.querySelector('i-amphtml-video-eq');
-          });
-        }).then(() => {
-          icon = video.querySelector('i-amphtml-video-eq');
-          expect(icon).to.exist;
-          // animation should be paused since video is not played yet
-          expect(isAnimationPaused(icon)).to.be.true;
-
-          viewport = video.implementation_.getViewport();
-          // scroll to the bottom, make video fully visible so it autoplays
-          viewport.scrollIntoView(video);
-
-          return waitForAnimationPlay(icon).then(() => {
-            expect(isAnimationPaused(icon)).to.be.false;
+        return getVideoPlayer({outsideView: true, autoplay: true})
+          .then(r => {
+            video = r.video;
+            return poll('animation icon', () => {
+              return !!video.querySelector('i-amphtml-video-eq');
+            });
+          })
+          .then(() => {
+            icon = video.querySelector('i-amphtml-video-eq');
+            expect(icon).to.exist;
+            // animation should be paused since video is not played yet
+            expect(isAnimationPaused(icon)).to.be.true;
+
+            viewport = video.implementation_.getViewport();
+            // scroll to the bottom, make video fully visible so it autoplays
+            viewport.scrollIntoView(video);
+
+            return waitForAnimationPlay(icon).then(() => {
+              expect(isAnimationPaused(icon)).to.be.false;
+            });
           });
-        });
 
         function isAnimationPaused(iconElement) {
           const animElement = iconElement.querySelector('.amp-video-eq-1-1');
           const win = iconElement.ownerDocument.defaultView;
           const cs = win.getComputedStyle(animElement);
           const isPaused =
-              cs.getPropertyValue('animation-play-state') == 'paused' ||
-              cs.getPropertyValue('-webkit-animation-play-state') == 'paused' ||
-              cs.getPropertyValue('animation-name') == 'none' ||
-              cs.getPropertyValue('-webkit-animation-name') == 'none';
+            cs.getPropertyValue('animation-play-state') == 'paused' ||
+            cs.getPropertyValue('-webkit-animation-play-state') == 'paused' ||
+            cs.getPropertyValue('animation-name') == 'none' ||
+            cs.getPropertyValue('-webkit-animation-name') == 'none';
           return isPaused;
         }
 
         function waitForAnimationPlay(iconElement) {
-          return poll('animation play', () => {
-            return iconElement.classList.contains('amp-video-eq-play');
-          }, undefined, TIMEOUT);
+          return poll(
+            'animation play',
+            () => {
+              return iconElement.classList.contains('amp-video-eq-play');
+            },
+            undefined,
+            TIMEOUT
+          );
         }
       });
     });
@@ -445,125 +477,130 @@ export function runVideoPlayerIntegrationTests(
     afterEach(cleanUp);
   });
 
-  describe.configure().ifChrome().run('Rotate-to-fullscreen', function() {
-    this.timeout(TIMEOUT);
-
-    let video;
-    let sandbox;
-    let playButton;
-    let autoFullscreen;
-    let isInLandscapeStub;
-
-    // TODO(alanorozco): Fails on Chrome 66.
-    it.skip('should enter fullscreen on rotation', function() {
+  describe
+    .configure()
+    .ifChrome()
+    .run('Rotate-to-fullscreen', function() {
+      this.timeout(TIMEOUT);
 
-      function mockLandscape(isLandscape) {
-        if (!autoFullscreen) {
-          const manager = Services.videoManagerForDoc(video.getAmpDoc());
-          autoFullscreen = manager.getAutoFullscreenManagerForTesting_();
-        }
-        if (!isInLandscapeStub) {
-          isInLandscapeStub = sandbox.stub(autoFullscreen, 'isInLandscape');
+      let video;
+      let sandbox;
+      let playButton;
+      let autoFullscreen;
+      let isInLandscapeStub;
+
+      // TODO(alanorozco): Fails on Chrome 66.
+      it.skip('should enter fullscreen on rotation', function() {
+        function mockLandscape(isLandscape) {
+          if (!autoFullscreen) {
+            const manager = Services.videoManagerForDoc(video.getAmpDoc());
+            autoFullscreen = manager.getAutoFullscreenManagerForTesting_();
+          }
+          if (!isInLandscapeStub) {
+            isInLandscapeStub = sandbox.stub(autoFullscreen, 'isInLandscape');
+          }
+          isInLandscapeStub.returns(isLandscape);
         }
-        isInLandscapeStub.returns(isLandscape);
-      }
 
-      return getVideoPlayer({
-        autoplay: false,
-        outsideView: true,
-        'rotate-to-fullscreen': true,
-      }).then(r => {
-        video = r.video;
-        playButton = createButton(r, 'play');
-        mockLandscape(false);
-        const whenLoaded = listenOncePromise(video, VideoEvents.LOAD);
-        const viewport = video.implementation_.getViewport();
-        viewport.scrollIntoView(video);
-        return whenLoaded;
-      }).then(() => {
-        const whenPlaying = listenOncePromise(video, VideoEvents.PLAYING);
-        playButton.click();
-        return whenPlaying;
-      }).then(() => {
-        const enter = sandbox.stub(video.implementation_, 'fullscreenEnter');
-        mockLandscape(true);
-        autoFullscreen.onRotation_();
-        return poll('fullscreen enter', () => enter.called);
+        return getVideoPlayer({
+          autoplay: false,
+          outsideView: true,
+          'rotate-to-fullscreen': true,
+        })
+          .then(r => {
+            video = r.video;
+            playButton = createButton(r, 'play');
+            mockLandscape(false);
+            const whenLoaded = listenOncePromise(video, VideoEvents.LOAD);
+            const viewport = video.implementation_.getViewport();
+            viewport.scrollIntoView(video);
+            return whenLoaded;
+          })
+          .then(() => {
+            const whenPlaying = listenOncePromise(video, VideoEvents.PLAYING);
+            playButton.click();
+            return whenPlaying;
+          })
+          .then(() => {
+            const enter = sandbox.stub(
+              video.implementation_,
+              'fullscreenEnter'
+            );
+            mockLandscape(true);
+            autoFullscreen.onRotation_();
+            return poll('fullscreen enter', () => enter.called);
+          });
       });
-    });
 
-    // Although these tests are not about autoplay, we can ony run them in
-    // browsers that do support autoplay, this is because a synthetic click
-    // event will not be considered a user-action and mobile browsers that
-    // don't support muted autoplay will block it. In real life, the click
-    // would be considered a user-initiated action, but no way to do that in a
-    // scripted test environment.
-    before(function() {
-      this.timeout(TIMEOUT);
-      // Skip autoplay tests if browser does not support autoplay.
-      return skipIfAutoplayUnsupported.call(this, window);
-    });
+      // Although these tests are not about autoplay, we can ony run them in
+      // browsers that do support autoplay, this is because a synthetic click
+      // event will not be considered a user-action and mobile browsers that
+      // don't support muted autoplay will block it. In real life, the click
+      // would be considered a user-initiated action, but no way to do that in a
+      // scripted test environment.
+      before(function() {
+        this.timeout(TIMEOUT);
+        // Skip autoplay tests if browser does not support autoplay.
+        return skipIfAutoplayUnsupported.call(this, window);
+      });
 
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-    });
+      beforeEach(() => {
+        sandbox = sinon.sandbox;
+      });
 
-    afterEach(() => {
-      sandbox.restore();
+      afterEach(() => {
+        sandbox.restore();
+      });
     });
-  });
 
   function getVideoPlayer(options) {
     options = options || {};
     const top = options.outsideView ? '100vh' : '0';
     let fixture;
     return createFixtureIframe('test/fixtures/video-players.html', FRAME_HEIGHT)
-        .then(f => {
-          fixture = f;
-          if (opt_experiment) {
-            toggleExperiment(fixture.win, opt_experiment, true);
+      .then(f => {
+        fixture = f;
+        if (opt_experiment) {
+          toggleExperiment(fixture.win, opt_experiment, true);
+        }
+        return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
+      })
+      .then(() => {
+        const video = createVideoElementFunc(fixture);
+        const sizer = fixture.doc.createElement('div');
+
+        const whenVideoRegistered = video
+          .signals()
+          .whenSignal(VideoEvents.REGISTERED)
+          .then(() => ({video, fixture}));
+
+        ['autoplay', 'dock', 'rotate-to-fullscreen'].forEach(option => {
+          if (options[option]) {
+            video.setAttribute(option, '');
           }
-          return expectBodyToBecomeVisible(fixture.win, TIMEOUT);
-        })
-        .then(() => {
-          const video = createVideoElementFunc(fixture);
-          const sizer = fixture.doc.createElement('div');
-
-          const whenVideoRegistered =
-              video.signals().whenSignal(VideoEvents.REGISTERED)
-                  .then(() => ({video, fixture}));
-
-          [
-            'autoplay',
-            'dock',
-            'rotate-to-fullscreen',
-          ].forEach(option => {
-            if (options[option]) {
-              video.setAttribute(option, '');
-            }
-          });
+        });
 
-          video.setAttribute('id', 'myVideo');
-          video.setAttribute('controls', '');
-          video.setAttribute('layout', 'fixed');
-          video.setAttribute('width', '300px');
-          video.setAttribute('height', '50vh');
-          video.setAttribute('i-amphtml-integration-test', '');
+        video.setAttribute('id', 'myVideo');
+        video.setAttribute('controls', '');
+        video.setAttribute('layout', 'fixed');
+        video.setAttribute('width', '300px');
+        video.setAttribute('height', '50vh');
+        video.setAttribute('i-amphtml-integration-test', '');
 
-          video.style.position = 'absolute';
-          video.style.top = top;
+        video.style.position = 'absolute';
+        video.style.top = top;
 
-          sizer.position = 'relative';
-          sizer.style.height = '200vh';
+        sizer.position = 'relative';
+        sizer.style.height = '200vh';
 
-          fixtureGlobal = fixture;
-          videoGlobal = video;
+        fixtureGlobal = fixture;
+        videoGlobal = video;
 
-          fixture.doc.body.appendChild(sizer);
-          fixture.doc.body.appendChild(video);
+        fixture.doc.body.appendChild(sizer);
+        fixture.doc.body.appendChild(video);
 
-          return whenVideoRegistered;
-        });
+        return whenVideoRegistered;
+      });
   }
 
   function cleanUp() {
diff --git a/test/integration/test-video-players.js b/test/integration/test-video-players.js
index de1b17a63cb1..7d6e5bf4d241 100644
--- a/test/integration/test-video-players.js
+++ b/test/integration/test-video-players.js
@@ -28,18 +28,19 @@
 
 import {runVideoPlayerIntegrationTests} from './test-video-players-helper';
 
-
 //TODO(aghassemi,#7822): We have to skip iOS for video tests since videos
 // can't play SauceLab's iOS simulator. We need real devices instead.
 
-
-describe.configure().skipIos().run('amp-video', () => {
-  runVideoPlayerIntegrationTests(fixture => {
-    const video = fixture.doc.createElement('amp-video');
-    video.setAttribute('src', '/examples/av/ForBiggerJoyrides.mp4');
-    return video;
+describe
+  .configure()
+  .skipIos()
+  .run('amp-video', () => {
+    runVideoPlayerIntegrationTests(fixture => {
+      const video = fixture.doc.createElement('amp-video');
+      video.setAttribute('src', '/examples/av/ForBiggerJoyrides.mp4');
+      return video;
+    });
   });
-});
 
 // TODO(alanorozco): unskip
 describe.skip('amp-video-iframe', () => {
@@ -96,7 +97,10 @@ describe.skip('amp-ima-video', () => {
     video.setAttribute('data-width', '640');
     video.setAttribute('data-height', '360');
     video.setAttribute('data-src', '/examples/av/ForBiggerJoyrides.mp4');
-    video.setAttribute('data-tag', 'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator=');
+    video.setAttribute(
+      'data-tag',
+      'https://pubads.g.doubleclick.net/gampad/ads?sz=640x480&iu=/124319096/external/ad_rule_samples&ciu_szs=300x250&ad_rule=1&impl=s&gdfp_req=1&env=vp&output=vmap&unviewed_position_start=1&cust_params=deployment%3Ddevsite%26sample_ar%3Dpremidpost&cmsid=496&vid=short_onecue&correlator='
+    );
     video.setAttribute('data-poster', '/examples/img/ima-poster.png');
     return video;
   }, 'amp-ima-video');
diff --git a/test/integration/test-visibility-states.js b/test/integration/test-visibility-states.js
index 4f5fe565beec..e87059a919f0 100644
--- a/test/integration/test-visibility-states.js
+++ b/test/integration/test-visibility-states.js
@@ -20,167 +20,344 @@ import {createCustomEvent} from '../../src/event-helper';
 import {getVendorJsPropertyName} from '../../src/style';
 import {whenUpgradedToCustomElement} from '../../src/dom';
 
-const t = describe.configure()
-    .skipIfPropertiesObfuscated()
-    .ifChrome()
-    .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
+const t = describe
+  .configure()
+  .skipIfPropertiesObfuscated()
+  .ifChrome()
+  .skipWindows(); // TODO(#19647): Flaky on Chrome 71 on Windows 10.
 
 t.run('Viewer Visibility State', () => {
   function noop() {}
 
-  describes.integration('Element Transitions', {
-    body: '',
-    hash: 'visibilityState=prerender',
-  }, env => {
-    let win;
-    let sandbox;
-
-    let resources;
-    let viewer;
-    let layoutCallback;
-    let unlayoutCallback;
-    let pauseCallback;
-    let resumeCallback;
-    let docHidden;
-    let unselect;
-    let prerenderAllowed;
-
-    function visChangeEventName() {
-      const hiddenName = getVendorJsPropertyName(win.document, 'hidden',
-          true);
-      const index = hiddenName.indexOf('Hidden');
-      if (index == -1) {
-        return 'visibilitychange';
+  describes.integration(
+    'Element Transitions',
+    {
+      body: '',
+      hash: 'visibilityState=prerender',
+    },
+    env => {
+      let win;
+      let sandbox;
+
+      let resources;
+      let viewer;
+      let layoutCallback;
+      let unlayoutCallback;
+      let pauseCallback;
+      let resumeCallback;
+      let docHidden;
+      let unselect;
+      let prerenderAllowed;
+
+      function visChangeEventName() {
+        const hiddenName = getVendorJsPropertyName(
+          win.document,
+          'hidden',
+          true
+        );
+        const index = hiddenName.indexOf('Hidden');
+        if (index == -1) {
+          return 'visibilitychange';
+        }
+        return hiddenName.substr(0, index) + 'Visibilitychange';
+      }
+      function changeVisibility(vis) {
+        docHidden.returns(vis === 'hidden');
+        win.document.dispatchEvent(
+          createCustomEvent(win, visChangeEventName(), /* detail */ null)
+        );
       }
-      return hiddenName.substr(0, index) + 'Visibilitychange';
-    }
-    function changeVisibility(vis) {
-      docHidden.returns(vis === 'hidden');
-      win.document.dispatchEvent(createCustomEvent(win,
-          visChangeEventName(),
-          /* detail */ null));
-    }
 
-    let shouldPass = false;
-    let doPass_;
-    let notifyPass = noop;
+      let shouldPass = false;
+      let doPass_;
+      let notifyPass = noop;
 
-    function doPass() {
-      if (shouldPass) {
-        doPass_.call(this);
-        shouldPass = false;
-        notifyPass();
+      function doPass() {
+        if (shouldPass) {
+          doPass_.call(this);
+          shouldPass = false;
+          notifyPass();
+        }
       }
-    }
 
-    function waitForNextPass() {
-      return new Promise(resolve => {
-        shouldPass = true;
-        notifyPass = resolve;
-        resources.schedulePass();
-      });
-    }
+      function waitForNextPass() {
+        return new Promise(resolve => {
+          shouldPass = true;
+          notifyPass = resolve;
+          resources.schedulePass();
+        });
+      }
 
-    function setupSpys() {
-      layoutCallback.reset();
-      unlayoutCallback.reset();
-      pauseCallback.reset();
-      resumeCallback.reset();
-      unselect.reset();
-    }
+      function setupSpys() {
+        layoutCallback.reset();
+        unlayoutCallback.reset();
+        pauseCallback.reset();
+        resumeCallback.reset();
+        unselect.reset();
+      }
 
-    beforeEach(() => {
-      win = env.win;
-      sandbox = env.sandbox;
-      notifyPass = noop;
-      shouldPass = false;
+      beforeEach(() => {
+        win = env.win;
+        sandbox = env.sandbox;
+        notifyPass = noop;
+        shouldPass = false;
 
-      const vsync = Services.vsyncFor(win);
-      sandbox.stub(vsync, 'mutate').callsFake(mutator => {
-        mutator();
+        const vsync = Services.vsyncFor(win);
+        sandbox.stub(vsync, 'mutate').callsFake(mutator => {
+          mutator();
+        });
+
+        return Services.viewerPromiseForDoc(win.document)
+          .then(v => {
+            viewer = v;
+            const docState = Services.documentStateFor(win);
+            docHidden = sandbox.stub(docState, 'isHidden').returns(false);
+
+            resources = Services.resourcesForDoc(win.document);
+            doPass_ = resources.doPass;
+            sandbox.stub(resources, 'doPass').callsFake(doPass);
+            unselect = sandbox.stub(resources, 'unselectText');
+
+            const img = win.document.createElement('amp-img');
+            img.setAttribute('width', 100);
+            img.setAttribute('height', 100);
+            img.setAttribute('layout', 'fixed');
+            win.document.body.appendChild(img);
+
+            return whenUpgradedToCustomElement(img);
+          })
+          .then(img => {
+            layoutCallback = sandbox.stub(
+              img.implementation_,
+              'layoutCallback'
+            );
+            unlayoutCallback = sandbox.stub(
+              img.implementation_,
+              'unlayoutCallback'
+            );
+            pauseCallback = sandbox.stub(img.implementation_, 'pauseCallback');
+            resumeCallback = sandbox.stub(
+              img.implementation_,
+              'resumeCallback'
+            );
+            prerenderAllowed = sandbox.stub(
+              img.implementation_,
+              'prerenderAllowed'
+            );
+            sandbox
+              .stub(img.implementation_, 'isRelayoutNeeded')
+              .callsFake(() => true);
+            sandbox
+              .stub(img.implementation_, 'isLayoutSupported')
+              .callsFake(() => true);
+
+            layoutCallback.returns(Promise.resolve());
+            unlayoutCallback.returns(true);
+            prerenderAllowed.returns(false);
+          });
       });
 
-      return Services.viewerPromiseForDoc(win.document).then(v => {
-        viewer = v;
-        const docState = Services.documentStateFor(win);
-        docHidden = sandbox.stub(docState, 'isHidden').returns(false);
-
-        resources = Services.resourcesForDoc(win.document);
-        doPass_ = resources.doPass;
-        sandbox.stub(resources, 'doPass').callsFake(doPass);
-        unselect = sandbox.stub(resources, 'unselectText');
-
-        const img = win.document.createElement('amp-img');
-        img.setAttribute('width', 100);
-        img.setAttribute('height', 100);
-        img.setAttribute('layout', 'fixed');
-        win.document.body.appendChild(img);
-
-        return whenUpgradedToCustomElement(img);
-      }).then(img => {
-        layoutCallback = sandbox.stub(img.implementation_,
-            'layoutCallback');
-        unlayoutCallback = sandbox.stub(img.implementation_,
-            'unlayoutCallback');
-        pauseCallback = sandbox.stub(img.implementation_, 'pauseCallback');
-        resumeCallback = sandbox.stub(img.implementation_,
-            'resumeCallback');
-        prerenderAllowed = sandbox.stub(img.implementation_,
-            'prerenderAllowed');
-        sandbox.stub(img.implementation_, 'isRelayoutNeeded').callsFake(
-            () => true);
-        sandbox.stub(img.implementation_, 'isLayoutSupported').callsFake(
-            () => true);
-
-        layoutCallback.returns(Promise.resolve());
-        unlayoutCallback.returns(true);
-        prerenderAllowed.returns(false);
+      describe('from in the PRERENDER state', () => {
+        describe('for prerenderable element', () => {
+          beforeEach(() => {
+            prerenderAllowed.returns(true);
+            setupSpys();
+          });
+
+          it('does layout when going to PRERENDER', () => {
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('calls layout when going to VISIBLE', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.VISIBLE,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('does not call callbacks when going to HIDDEN', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.VISIBLE,
+            });
+            changeVisibility('hidden');
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          // TODO(aghassemi): Investigate failure. #10974.
+          it.skip('does not call callbacks when going to INACTIVE', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.INACTIVE,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('does not call callbacks when going to PAUSED', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.PAUSED,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+        });
+
+        describe('for non-prerenderable element', () => {
+          beforeEach(() => {
+            setupSpys();
+          });
+
+          it('does not call callbacks when going to PRERENDER', () => {
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('calls layout when going to VISIBLE', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.VISIBLE,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('does not call callbacks when going to HIDDEN', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.VISIBLE,
+            });
+            changeVisibility('hidden');
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          // TODO(aghassemi): Investigate failure. #10974.
+          it.skip('does not call callbacks when going to INACTIVE', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.INACTIVE,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+
+          it('does not call callbacks when going to PAUSED', () => {
+            viewer.receiveMessage('visibilitychange', {
+              state: VisibilityState.PAUSED,
+            });
+            return waitForNextPass().then(() => {
+              expect(layoutCallback).not.to.have.been.called;
+              expect(unlayoutCallback).not.to.have.been.called;
+              expect(pauseCallback).not.to.have.been.called;
+              expect(resumeCallback).not.to.have.been.called;
+            });
+          });
+        });
       });
-    });
 
-    describe('from in the PRERENDER state', () => {
-      describe('for prerenderable element', () => {
+      describe('from in the VISIBLE state', () => {
         beforeEach(() => {
-          prerenderAllowed.returns(true);
-          setupSpys();
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
+          return waitForNextPass().then(setupSpys);
         });
 
-        it('does layout when going to PRERENDER', () => {
+        it('does not call callbacks when going to VISIBLE', () => {
           return waitForNextPass().then(() => {
-            expect(layoutCallback).to.have.been.called;
+            expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
         });
 
-        it('calls layout when going to VISIBLE', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.VISIBLE});
+        it('does not call callbacks when going to HIDDEN', () => {
+          changeVisibility('hidden');
           return waitForNextPass().then(() => {
-            expect(layoutCallback).to.have.been.called;
+            expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
         });
 
-        it('does not call callbacks when going to HIDDEN', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.VISIBLE});
-          changeVisibility('hidden');
+        it('calls unload when going to INACTIVE', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.INACTIVE,
+          });
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).to.have.been.called;
+            expect(pauseCallback).to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+            expect(unselect).to.have.been.called;
+          });
+        });
+
+        it('calls pause when going to PAUSED', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.PAUSED,
+          });
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
+            expect(pauseCallback).to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
         });
+      });
 
-        // TODO(aghassemi): Investigate failure. #10974.
-        it.skip('does not call callbacks when going to INACTIVE', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.INACTIVE});
+      describe('from in the HIDDEN state', () => {
+        beforeEach(() => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
+          return waitForNextPass()
+            .then(() => {
+              changeVisibility('hidden');
+              return waitForNextPass();
+            })
+            .then(setupSpys);
+        });
+
+        it('does not call callbacks going to VISIBLE', () => {
+          changeVisibility('visible');
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
@@ -189,9 +366,7 @@ t.run('Viewer Visibility State', () => {
           });
         });
 
-        it('does not call callbacks when going to PAUSED', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.PAUSED});
+        it('does not call callbacks when going to HIDDEN', () => {
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
@@ -199,49 +374,76 @@ t.run('Viewer Visibility State', () => {
             expect(resumeCallback).not.to.have.been.called;
           });
         });
-      });
 
-      describe('for non-prerenderable element', () => {
-        beforeEach(() => {
-          setupSpys();
+        it('calls unload when going to INACTIVE', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.INACTIVE,
+          });
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).to.have.been.called;
+            expect(pauseCallback).to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+            expect(unselect).to.have.been.called;
+          });
         });
 
-        it('does not call callbacks when going to PRERENDER', () => {
+        it('calls pause when going to PAUSED', () => {
+          changeVisibility('visible');
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.PAUSED,
+          });
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
-            expect(pauseCallback).not.to.have.been.called;
+            expect(pauseCallback).to.have.been.called;
             expect(resumeCallback).not.to.have.been.called;
           });
         });
+      });
+
+      describe('from in the INACTIVE state', () => {
+        beforeEach(() => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
+          return waitForNextPass()
+            .then(() => {
+              viewer.receiveMessage('visibilitychange', {
+                state: VisibilityState.INACTIVE,
+              });
+              return waitForNextPass();
+            })
+            .then(setupSpys);
+        });
 
-        it('calls layout when going to VISIBLE', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.VISIBLE});
+        it('calls layout and resume when going to VISIBLE', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
           return waitForNextPass().then(() => {
             expect(layoutCallback).to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
+            expect(resumeCallback).to.have.been.called;
           });
         });
 
-        it('does not call callbacks when going to HIDDEN', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.VISIBLE});
+        it('calls resume when going to HIDDEN', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
           changeVisibility('hidden');
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
             expect(pauseCallback).not.to.have.been.called;
-            expect(resumeCallback).not.to.have.been.called;
+            expect(resumeCallback).to.have.been.called;
           });
         });
 
         // TODO(aghassemi): Investigate failure. #10974.
         it.skip('does not call callbacks when going to INACTIVE', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.INACTIVE});
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
@@ -251,8 +453,9 @@ t.run('Viewer Visibility State', () => {
         });
 
         it('does not call callbacks when going to PAUSED', () => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.PAUSED});
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.PAUSED,
+          });
           return waitForNextPass().then(() => {
             expect(layoutCallback).not.to.have.been.called;
             expect(unlayoutCallback).not.to.have.been.called;
@@ -261,220 +464,66 @@ t.run('Viewer Visibility State', () => {
           });
         });
       });
-    });
-
-    describe('from in the VISIBLE state', () => {
-      beforeEach(() => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(setupSpys);
-      });
-
-      it('does not call callbacks when going to VISIBLE', () => {
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
 
-      it('does not call callbacks when going to HIDDEN', () => {
-        changeVisibility('hidden');
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-
-      it('calls unload when going to INACTIVE', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.INACTIVE});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).to.have.been.called;
-          expect(pauseCallback).to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-          expect(unselect).to.have.been.called;
+      describe('from in the PAUSED state', () => {
+        beforeEach(() => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
+          return waitForNextPass()
+            .then(() => {
+              viewer.receiveMessage('visibilitychange', {
+                state: VisibilityState.PAUSED,
+              });
+              return waitForNextPass();
+            })
+            .then(setupSpys);
         });
-      });
 
-      it('calls pause when going to PAUSED', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.PAUSED});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
+        it('calls resume when going to VISIBLE', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.VISIBLE,
+          });
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).to.have.been.called;
+          });
         });
-      });
-    });
 
-    describe('from in the HIDDEN state', () => {
-      beforeEach(() => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(() => {
+        it('calls unlayout when going to HIDDEN', () => {
           changeVisibility('hidden');
-          return waitForNextPass();
-        }).then(setupSpys);
-      });
-
-      it('does not call callbacks going to VISIBLE', () => {
-        changeVisibility('visible');
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-
-      it('does not call callbacks when going to HIDDEN', () => {
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-
-      it('calls unload when going to INACTIVE', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.INACTIVE});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).to.have.been.called;
-          expect(pauseCallback).to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-          expect(unselect).to.have.been.called;
-        });
-      });
-
-      it('calls pause when going to PAUSED', () => {
-        changeVisibility('visible');
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.PAUSED});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-    });
-
-    describe('from in the INACTIVE state', () => {
-      beforeEach(() => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(() => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.INACTIVE});
-          return waitForNextPass();
-        }).then(setupSpys);
-      });
-
-      it('calls layout and resume when going to VISIBLE', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).to.have.been.called;
-        });
-      });
-
-      it('calls resume when going to HIDDEN', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        changeVisibility('hidden');
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).to.have.been.called;
-        });
-      });
-
-      // TODO(aghassemi): Investigate failure. #10974.
-      it.skip('does not call callbacks when going to INACTIVE', () => {
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-
-      it('does not call callbacks when going to PAUSED', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.PAUSED});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-        });
-      });
-    });
-
-    describe('from in the PAUSED state', () => {
-      beforeEach(() => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(() => {
-          viewer.receiveMessage('visibilitychange',
-              {state: VisibilityState.PAUSED});
-          return waitForNextPass();
-        }).then(setupSpys);
-      });
-
-      it('calls resume when going to VISIBLE', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.VISIBLE});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).to.have.been.called;
-        });
-      });
-
-      it('calls unlayout when going to HIDDEN', () => {
-        changeVisibility('hidden');
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+          });
         });
-      });
 
-      it('calls unlayout when going to INACTIVE', () => {
-        viewer.receiveMessage('visibilitychange',
-            {state: VisibilityState.INACTIVE});
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
-          expect(unselect).to.have.been.called;
+        it('calls unlayout when going to INACTIVE', () => {
+          viewer.receiveMessage('visibilitychange', {
+            state: VisibilityState.INACTIVE,
+          });
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+            expect(unselect).to.have.been.called;
+          });
         });
-      });
 
-      it('does not call callbacks when going to PAUSED', () => {
-        return waitForNextPass().then(() => {
-          expect(layoutCallback).not.to.have.been.called;
-          expect(unlayoutCallback).not.to.have.been.called;
-          expect(pauseCallback).not.to.have.been.called;
-          expect(resumeCallback).not.to.have.been.called;
+        it('does not call callbacks when going to PAUSED', () => {
+          return waitForNextPass().then(() => {
+            expect(layoutCallback).not.to.have.been.called;
+            expect(unlayoutCallback).not.to.have.been.called;
+            expect(pauseCallback).not.to.have.been.called;
+            expect(resumeCallback).not.to.have.been.called;
+          });
         });
       });
-    });
-  });
+    }
+  );
 });
diff --git a/test/manual/amp-script/test1.js b/test/manual/amp-script/test1.js
index 5271fccc920f..00ac32513397 100644
--- a/test/manual/amp-script/test1.js
+++ b/test/manual/amp-script/test1.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 document.getElementById('simple').addEventListener('click', () => {
   const el = document.createElement('h1');
   el.textContent = 'Hello World!';
diff --git a/test/manual/test-sw.js b/test/manual/test-sw.js
index 1f44c8068ac1..1aef0423c2ca 100644
--- a/test/manual/test-sw.js
+++ b/test/manual/test-sw.js
@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-console./*OK*/info('ServiceWorker loaded.');
+console./*OK*/ info('ServiceWorker loaded.');
diff --git a/test/unit/3p/test-3p-messaging.js b/test/unit/3p/test-3p-messaging.js
index 8e4920adc8d4..3db9938f941a 100644
--- a/test/unit/3p/test-3p-messaging.js
+++ b/test/unit/3p/test-3p-messaging.js
@@ -20,7 +20,6 @@ import {listenParent} from '../../../3p/messaging';
 import {postMessage} from '../../../src/iframe-helper';
 
 describe('3p messaging', () => {
-
   let testWin;
   let iframe;
   const timer = Services.timerFor(window);
@@ -127,9 +126,12 @@ describe('3p messaging', () => {
     });
     postMessage(iframe, 'test', {s: 'a'}, '*', true);
     postMessage(iframe, 'test', {s: 'd'}, '*', true);
-    return timer.promise(10).catch(() => {}).then(() => {
-      window.onError = origOnError;
-      expect(progress).to.equal('ad');
-    });
+    return timer
+      .promise(10)
+      .catch(() => {})
+      .then(() => {
+        window.onError = origOnError;
+        expect(progress).to.equal('ad');
+      });
   });
 });
diff --git a/test/unit/3p/test-iframe-messaging-client.js b/test/unit/3p/test-iframe-messaging-client.js
index 86ba3f4c8589..7897b34c0b52 100644
--- a/test/unit/3p/test-iframe-messaging-client.js
+++ b/test/unit/3p/test-iframe-messaging-client.js
@@ -18,7 +18,6 @@ import {IframeMessagingClient} from '../../../3p/iframe-messaging-client';
 import {serializeMessage} from '../../../src/3p-frame-messaging';
 
 describes.realWin('iframe-messaging-client', {}, env => {
-
   let win;
   let client;
   let postMessageStub;
@@ -38,87 +37,126 @@ describes.realWin('iframe-messaging-client', {}, env => {
     it('should get data', () => {
       const callbackSpy = sandbox.spy();
       client.getData('type-a', {a: 1}, callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'type-a', 'sentinel-123', {
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'type-a',
+          'sentinel-123',
+          {
             'payload': {
               a: 1,
             },
             'messageId': 1,
-          }, '$internalRuntimeVersion$'));
-
-      postAmpMessage({
-        type: 'type-a-result',
-        sentinel: 'sentinel-123',
-        'messageId': 1,
-        'content': 'result-a',
-      }, hostWindow);
+          },
+          '$internalRuntimeVersion$'
+        )
+      );
+
+      postAmpMessage(
+        {
+          type: 'type-a-result',
+          sentinel: 'sentinel-123',
+          'messageId': 1,
+          'content': 'result-a',
+        },
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledWith('result-a');
     });
 
     it('should not get data with wrong messageId', () => {
       const callbackSpy = sandbox.spy();
       client.getData('type-a', {a: 1}, callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'type-a', 'sentinel-123', {
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'type-a',
+          'sentinel-123',
+          {
             'payload': {
               a: 1,
             },
             'messageId': 1,
-          }, '$internalRuntimeVersion$'));
-
-      postAmpMessage({
-        type: 'type-a-result',
-        sentinel: 'sentinel-123',
-        'messageId': 2, // wrong messageId
-        'content': 'result-a',
-      }, hostWindow);
+          },
+          '$internalRuntimeVersion$'
+        )
+      );
+
+      postAmpMessage(
+        {
+          type: 'type-a-result',
+          sentinel: 'sentinel-123',
+          'messageId': 2, // wrong messageId
+          'content': 'result-a',
+        },
+        hostWindow
+      );
       expect(callbackSpy).to.not.be.called;
     });
 
     it('should not get data with wrong response type', () => {
       const callbackSpy = sandbox.spy();
       client.getData('type-a', {a: 1}, callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'type-a', 'sentinel-123', {
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'type-a',
+          'sentinel-123',
+          {
             'payload': {
               a: 1,
             },
             'messageId': 1,
-          }, '$internalRuntimeVersion$'));
-
-      postAmpMessage({
-        type: 'type-b-result', // wrong response type
-        sentinel: 'sentinel-123',
-        'messageId': 1,
-        'content': 'result-a',
-      }, hostWindow);
+          },
+          '$internalRuntimeVersion$'
+        )
+      );
+
+      postAmpMessage(
+        {
+          type: 'type-b-result', // wrong response type
+          sentinel: 'sentinel-123',
+          'messageId': 1,
+          'content': 'result-a',
+        },
+        hostWindow
+      );
       expect(callbackSpy).to.not.be.called;
     });
 
     it('should have callback called once', () => {
       const callbackSpy = sandbox.spy();
       client.getData('type-a', {a: 1}, callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'type-a', 'sentinel-123', {
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'type-a',
+          'sentinel-123',
+          {
             'payload': {
               a: 1,
             },
             'messageId': 1,
-          }, '$internalRuntimeVersion$'));
-
-      postAmpMessage({
-        type: 'type-a-result',
-        sentinel: 'sentinel-123',
-        'messageId': 1,
-        'content': 'result-a',
-      }, hostWindow);
-
-      postAmpMessage({
-        type: 'type-a-result',
-        sentinel: 'sentinel-123',
-        'messageId': 1,
-        'content': 'result-b',
-      }, hostWindow);
+          },
+          '$internalRuntimeVersion$'
+        )
+      );
+
+      postAmpMessage(
+        {
+          type: 'type-a-result',
+          sentinel: 'sentinel-123',
+          'messageId': 1,
+          'content': 'result-a',
+        },
+        hostWindow
+      );
+
+      postAmpMessage(
+        {
+          type: 'type-a-result',
+          sentinel: 'sentinel-123',
+          'messageId': 1,
+          'content': 'result-b',
+        },
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledOnce;
       expect(callbackSpy).to.be.calledWith('result-a');
     });
@@ -128,14 +166,24 @@ describes.realWin('iframe-messaging-client', {}, env => {
     it('should send the request via postMessage', () => {
       const callbackSpy = sandbox.spy();
       client.makeRequest('request-type', 'response-type', callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'request-type', 'sentinel-123', {}, '$internalRuntimeVersion$'));
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'request-type',
+          'sentinel-123',
+          {},
+          '$internalRuntimeVersion$'
+        )
+      );
 
       postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123'}, hostWindow);
+        {type: 'response-type', sentinel: 'sentinel-123'},
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledOnce;
       postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123'}, hostWindow);
+        {type: 'response-type', sentinel: 'sentinel-123'},
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledTwice;
     });
   });
@@ -144,78 +192,105 @@ describes.realWin('iframe-messaging-client', {}, env => {
     it('should unlisten after message received', () => {
       const callbackSpy = sandbox.spy();
       client.requestOnce('request-type', 'response-type', callbackSpy);
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
-          'request-type', 'sentinel-123', {}, '$internalRuntimeVersion$'));
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
+          'request-type',
+          'sentinel-123',
+          {},
+          '$internalRuntimeVersion$'
+        )
+      );
 
       postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123'}, hostWindow);
+        {type: 'response-type', sentinel: 'sentinel-123'},
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledOnce;
       postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123'}, hostWindow);
+        {type: 'response-type', sentinel: 'sentinel-123'},
+        hostWindow
+      );
       expect(callbackSpy).to.be.calledOnce;
     });
   });
 
   describe('registerCallback', () => {
-    it('should invoke callback on receiving a message of' +
-        ' expected response type', () => {
-      const callbackSpy = sandbox.spy();
-      client.registerCallback('response-type', callbackSpy);
-
-      postAmpMessage({
-        type: 'response-type',
-        sentinel: 'sentinel-123',
-        x: 1,
-        y: 'abc',
-      }, hostWindow);
-      expect(callbackSpy).to.be.calledWith({
-        type: 'response-type',
-        sentinel: 'sentinel-123',
-        origin: 'http://www.example.com',
-        x: 1,
-        y: 'abc',
-      });
-    });
-
-    it('should invoke multiple callbacks on receiving a message of' +
-        ' expected response type', () => {
-      const callbackSpy1 = sandbox.spy();
-      const callbackSpy2 = sandbox.spy();
-      const irrelevantCallbackSpy = sandbox.spy();
-
-      const expectedResponseObject = {
-        type: 'response-type',
-        sentinel: 'sentinel-123',
-        origin: 'http://www.example.com',
-        x: 1,
-        y: 'abc',
-      };
-
-      client.registerCallback('response-type', callbackSpy1);
-      client.registerCallback('response-type', callbackSpy2);
-      client.registerCallback('irrelevant-response', irrelevantCallbackSpy);
-
-      postAmpMessage({
-        type: 'response-type',
-        sentinel: 'sentinel-123',
-        x: 1,
-        y: 'abc',
-      }, hostWindow);
-
-      expect(callbackSpy1).to.be.calledWith(expectedResponseObject);
-      expect(callbackSpy2).to.be.calledWith(expectedResponseObject);
-      expect(irrelevantCallbackSpy).to.not.be.called;
-    });
-
-    it('should not invoke callback on receiving a message of' +
-        ' irrelevant response type', () => {
-      const callbackSpy = sandbox.spy();
-      client.registerCallback('response-type', callbackSpy);
-
-      postAmpMessage(
-          {type: 'response-type-2', sentinel: 'sentinel-123'}, hostWindow);
-      expect(callbackSpy).to.not.be.called;
-    });
+    it(
+      'should invoke callback on receiving a message of' +
+        ' expected response type',
+      () => {
+        const callbackSpy = sandbox.spy();
+        client.registerCallback('response-type', callbackSpy);
+
+        postAmpMessage(
+          {
+            type: 'response-type',
+            sentinel: 'sentinel-123',
+            x: 1,
+            y: 'abc',
+          },
+          hostWindow
+        );
+        expect(callbackSpy).to.be.calledWith({
+          type: 'response-type',
+          sentinel: 'sentinel-123',
+          origin: 'http://www.example.com',
+          x: 1,
+          y: 'abc',
+        });
+      }
+    );
+
+    it(
+      'should invoke multiple callbacks on receiving a message of' +
+        ' expected response type',
+      () => {
+        const callbackSpy1 = sandbox.spy();
+        const callbackSpy2 = sandbox.spy();
+        const irrelevantCallbackSpy = sandbox.spy();
+
+        const expectedResponseObject = {
+          type: 'response-type',
+          sentinel: 'sentinel-123',
+          origin: 'http://www.example.com',
+          x: 1,
+          y: 'abc',
+        };
+
+        client.registerCallback('response-type', callbackSpy1);
+        client.registerCallback('response-type', callbackSpy2);
+        client.registerCallback('irrelevant-response', irrelevantCallbackSpy);
+
+        postAmpMessage(
+          {
+            type: 'response-type',
+            sentinel: 'sentinel-123',
+            x: 1,
+            y: 'abc',
+          },
+          hostWindow
+        );
+
+        expect(callbackSpy1).to.be.calledWith(expectedResponseObject);
+        expect(callbackSpy2).to.be.calledWith(expectedResponseObject);
+        expect(irrelevantCallbackSpy).to.not.be.called;
+      }
+    );
+
+    it(
+      'should not invoke callback on receiving a message of' +
+        ' irrelevant response type',
+      () => {
+        const callbackSpy = sandbox.spy();
+        client.registerCallback('response-type', callbackSpy);
+
+        postAmpMessage(
+          {type: 'response-type-2', sentinel: 'sentinel-123'},
+          hostWindow
+        );
+        expect(callbackSpy).to.not.be.called;
+      }
+    );
 
     it('should not invoke callback on receiving a non-AMP message', () => {
       const callbackSpy = sandbox.spy();
@@ -225,53 +300,71 @@ describes.realWin('iframe-messaging-client', {}, env => {
         type: 'message',
         source: hostWindow,
         origin: 'http://www.example.com',
-        data: 'nonamp-' + JSON.stringify({
-          type: 'response-type',
-          sentinel: 'sentinel-123',
-        }),
+        data:
+          'nonamp-' +
+          JSON.stringify({
+            type: 'response-type',
+            sentinel: 'sentinel-123',
+          }),
       });
       expect(callbackSpy).to.not.be.called;
     });
 
-    it('should not invoke callback on receiving a message ' +
-        'not from host window', () => {
-      const callbackSpy = sandbox.spy();
-      client.registerCallback('response-type', callbackSpy);
-      const randomWindow = {};
-
-      postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123'}, randomWindow);
-      expect(callbackSpy).to.not.be.called;
-    });
-
-    it('should not invoke callback on receiving a message ' +
-        'containing no sentinel', () => {
-      const callbackSpy = sandbox.spy();
-      client.registerCallback('response-type', callbackSpy);
-
-      postAmpMessage({type: 'response-type'}, hostWindow);
-      expect(callbackSpy).to.not.be.called;
-    });
-
-    it('should not invoke callback on receiving a message ' +
-        'containing wrong sentinel', () => {
-      const callbackSpy = sandbox.spy();
-      client.registerCallback('response-type', callbackSpy);
-
-      postAmpMessage(
-          {type: 'response-type', sentinel: 'sentinel-123-1'}, hostWindow);
-      expect(callbackSpy).to.not.be.called;
-    });
+    it(
+      'should not invoke callback on receiving a message ' +
+        'not from host window',
+      () => {
+        const callbackSpy = sandbox.spy();
+        client.registerCallback('response-type', callbackSpy);
+        const randomWindow = {};
+
+        postAmpMessage(
+          {type: 'response-type', sentinel: 'sentinel-123'},
+          randomWindow
+        );
+        expect(callbackSpy).to.not.be.called;
+      }
+    );
+
+    it(
+      'should not invoke callback on receiving a message ' +
+        'containing no sentinel',
+      () => {
+        const callbackSpy = sandbox.spy();
+        client.registerCallback('response-type', callbackSpy);
+
+        postAmpMessage({type: 'response-type'}, hostWindow);
+        expect(callbackSpy).to.not.be.called;
+      }
+    );
+
+    it(
+      'should not invoke callback on receiving a message ' +
+        'containing wrong sentinel',
+      () => {
+        const callbackSpy = sandbox.spy();
+        client.registerCallback('response-type', callbackSpy);
+
+        postAmpMessage(
+          {type: 'response-type', sentinel: 'sentinel-123-1'},
+          hostWindow
+        );
+        expect(callbackSpy).to.not.be.called;
+      }
+    );
   });
 
   describe('sendMessage', () => {
     it('should send postMessage to host window', () => {
       client.sendMessage('request-type', {x: 1, y: 'abc'});
-      expect(postMessageStub).to.be.calledWith(serializeMessage(
+      expect(postMessageStub).to.be.calledWith(
+        serializeMessage(
           'request-type',
           'sentinel-123',
           {x: 1, y: 'abc'},
-          '$internalRuntimeVersion$'));
+          '$internalRuntimeVersion$'
+        )
+      );
     });
   });
 
diff --git a/test/unit/3p/test-recaptcha.js b/test/unit/3p/test-recaptcha.js
index edbd8fec6b95..da02af403c5e 100644
--- a/test/unit/3p/test-recaptcha.js
+++ b/test/unit/3p/test-recaptcha.js
@@ -18,13 +18,10 @@ import {
   doesOriginDomainMatchIframeSrc,
   initRecaptcha,
 } from '../../../3p/recaptcha';
-import {
-  parseUrlDeprecated,
-} from '../../../src/url';
+import {parseUrlDeprecated} from '../../../src/url';
 import {urls} from '../../../src/config';
 
 describe('3p recaptcha.js', () => {
-
   it('should require a window.name', () => {
     allowConsoleError(() => {
       window.name = undefined;
@@ -41,7 +38,6 @@ describe('3p recaptcha.js', () => {
   });
 
   describe('doesOriginDomainMatchIframeSrc()', () => {
-
     const getMockIframeWindowWithLocation = url => {
       // NOTE: The thirdPartyUrl returned by the config
       // Will return localhost for testing.
@@ -59,8 +55,10 @@ describe('3p recaptcha.js', () => {
 
     it('should allow cache domains', () => {
       return doesOriginDomainMatchIframeSrc(
-          getMockIframeWindowWithLocation('https://example-com.recaptcha.' + urls.thirdPartyFrameHost),
-          {origin: 'https://example-com.cdn.ampproject.org'}
+        getMockIframeWindowWithLocation(
+          'https://example-com.recaptcha.' + urls.thirdPartyFrameHost
+        ),
+        {origin: 'https://example-com.cdn.ampproject.org'}
       ).then(() => {
         expect(true).to.be.ok;
       });
@@ -68,8 +66,10 @@ describe('3p recaptcha.js', () => {
 
     it('should allow canonical domains', () => {
       return doesOriginDomainMatchIframeSrc(
-          getMockIframeWindowWithLocation('https://example-com.recaptcha.' + urls.thirdPartyFrameHost),
-          {origin: 'https://example.com'}
+        getMockIframeWindowWithLocation(
+          'https://example-com.recaptcha.' + urls.thirdPartyFrameHost
+        ),
+        {origin: 'https://example.com'}
       ).then(() => {
         expect(true).to.be.ok;
       });
@@ -77,8 +77,10 @@ describe('3p recaptcha.js', () => {
 
     it('should allow punycode curls encoded domains', () => {
       return doesOriginDomainMatchIframeSrc(
-          getMockIframeWindowWithLocation('https://xn--bcher-ch-65a.recaptcha.' + urls.thirdPartyFrameHost),
-          {origin: 'https://xn--bcher-kva.ch'}
+        getMockIframeWindowWithLocation(
+          'https://xn--bcher-ch-65a.recaptcha.' + urls.thirdPartyFrameHost
+        ),
+        {origin: 'https://xn--bcher-kva.ch'}
       ).then(() => {
         expect(true).to.be.ok;
       });
@@ -86,12 +88,17 @@ describe('3p recaptcha.js', () => {
 
     it('should allow sha256 curls encoded domains', () => {
       return doesOriginDomainMatchIframeSrc(
-          getMockIframeWindowWithLocation('https://a6h5moukddengbsjm77rvbosevwuduec2blkjva4223o4bgafgla.recaptcha.' + urls.thirdPartyFrameHost),
-          {origin: 'https://hello.xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c'}
+        getMockIframeWindowWithLocation(
+          'https://a6h5moukddengbsjm77rvbosevwuduec2blkjva4223o4bgafgla.recaptcha.' +
+            urls.thirdPartyFrameHost
+        ),
+        {
+          origin:
+            'https://hello.xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c',
+        }
       ).then(() => {
         expect(true).to.be.ok;
       });
     });
   });
 });
-
diff --git a/test/unit/ads/test-adplugg.js b/test/unit/ads/test-adplugg.js
index 6449b5c8f34b..5c4f6a34478e 100644
--- a/test/unit/ads/test-adplugg.js
+++ b/test/unit/ads/test-adplugg.js
@@ -14,9 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  adplugg,
-} from '../../../ads/adplugg';
+import {adplugg} from '../../../ads/adplugg';
 import {createIframePromise} from '../../../testing/iframe';
 
 describes.fakeWin('amp-ad-adplugg-impl', {}, () => {
@@ -28,7 +26,6 @@ describes.fakeWin('amp-ad-adplugg-impl', {}, () => {
    * Set up our test environment.
    */
   beforeEach(() => {
-
     // Set up our test sandbox.
     sandbox = sinon.sandbox;
     return createIframePromise(true).then(iframe => {
@@ -71,9 +68,7 @@ describes.fakeWin('amp-ad-adplugg-impl', {}, () => {
   });
 
   describe('adplugg', () => {
-
     it('should create an AdPlugg ad tag', () => {
-
       // Call the function.
       adplugg(win, testData);
 
@@ -158,8 +153,8 @@ describes.fakeWin('amp-ad-adplugg-impl', {}, () => {
     it('implement the noContentAvailable API', () => {
       // Set up mocks, spys, etc.
       const noContentAvailableSpy = sandbox.stub(
-          win.context,
-          'noContentAvailable'
+        win.context,
+        'noContentAvailable'
       );
       win.AdPlugg = {
         push: function() {},
@@ -199,7 +194,5 @@ describes.fakeWin('amp-ad-adplugg-impl', {}, () => {
       // Assert that noContentAvailable API was called as expected
       expect(noContentAvailableSpy).to.be.calledOnce;
     });
-
   });
-
 });
diff --git a/test/unit/ads/test-csa.js b/test/unit/ads/test-csa.js
index 966f3a7d5872..4b827c416e18 100644
--- a/test/unit/ads/test-csa.js
+++ b/test/unit/ads/test-csa.js
@@ -26,7 +26,6 @@ import {
 } from '../../../ads/google/csa';
 import {createIframePromise} from '../../../testing/iframe';
 
-
 function getAds(type) {
   const generic = {ampSlotIndex: '0', height: 300, type: 'csa'};
   const afsObj = {
@@ -117,7 +116,6 @@ describes.fakeWin('amp-ad-csa-impl', {}, () => {
   });
 
   describe('callback', () => {
-
     beforeEach(() => {
       // Create container and iframe
       const div = win.document.createElement('div');
@@ -296,6 +294,5 @@ describes.fakeWin('amp-ad-csa-impl', {}, () => {
       // Should make a new request for ads
       expect(_googCsaSpy.args[0][0]).to.equal('ads');
     });
-
   });
 });
diff --git a/test/unit/ads/test-unruly.js b/test/unit/ads/test-unruly.js
index 89f0e8e5a626..e31343bc257c 100644
--- a/test/unit/ads/test-unruly.js
+++ b/test/unit/ads/test-unruly.js
@@ -14,12 +14,9 @@
  * limitations under the License.
  */
 
-import {
-  unruly,
-} from '../../../ads/unruly';
+import {unruly} from '../../../ads/unruly';
 
 describe('unruly', () => {
-
   it('should set unruly publisher config on global', () => {
     const mockGlobal = {};
     const mockData = {
@@ -51,7 +48,9 @@ describe('unruly', () => {
     };
     unruly(mockGlobal, mockData, scriptLoader);
     expect(expectedGlobal).to.equal(mockGlobal);
-    expect(expectedUrl).to.equal('https://video.unrulymedia.com/native/native-loader.js');
+    expect(expectedUrl).to.equal(
+      'https://video.unrulymedia.com/native/native-loader.js'
+    );
   });
 
   it('should throw if siteId is not provided', () => {
@@ -60,13 +59,8 @@ describe('unruly', () => {
 
     const scriptLoader = () => {};
 
-    allowConsoleError(
-        () => {
-          expect(
-              () => unruly(mockGlobal, mockData, scriptLoader)
-          ).to.throw();
-        }
-    );
+    allowConsoleError(() => {
+      expect(() => unruly(mockGlobal, mockData, scriptLoader)).to.throw();
+    });
   });
-
 });
diff --git a/test/unit/inabox/test-inabox-frame-overlay-manager.js b/test/unit/inabox/test-inabox-frame-overlay-manager.js
index 6e567408776e..519599aefe43 100644
--- a/test/unit/inabox/test-inabox-frame-overlay-manager.js
+++ b/test/unit/inabox/test-inabox-frame-overlay-manager.js
@@ -20,12 +20,9 @@ import {
   stubExpandFrameForTesting,
 } from '../../../ads/inabox/frame-overlay-helper';
 
-
 const NOOP = () => {};
 
-
 describes.fakeWin('inabox-host:FrameOverlayManager', {}, env => {
-
   let win;
   let addEventListenerSpy;
 
@@ -44,8 +41,10 @@ describes.fakeWin('inabox-host:FrameOverlayManager', {}, env => {
   });
 
   it('should listen to window resize event', () => {
-    expect(addEventListenerSpy)
-        .to.have.been.calledWith('resize', sinon.match.any);
+    expect(addEventListenerSpy).to.have.been.calledWith(
+      'resize',
+      sinon.match.any
+    );
   });
 
   it('should expand frame and execute callback', () => {
@@ -85,8 +84,12 @@ describes.fakeWin('inabox-host:FrameOverlayManager', {}, env => {
     manager.collapseFrame(iframe, callback);
 
     expect(callback).to.have.been.calledWith(remeasuredCollapsedRect);
-    expect(collapseFrame)
-        .to.have.been.calledWith(win, iframe, sinon.match.any, sinon.match.any);
+    expect(collapseFrame).to.have.been.calledWith(
+      win,
+      iframe,
+      sinon.match.any,
+      sinon.match.any
+    );
   });
 
   it('should collapse frame and execute callback with known box rect', () => {
@@ -103,13 +106,18 @@ describes.fakeWin('inabox-host:FrameOverlayManager', {}, env => {
 
     stubCollapseFrameForTesting(collapseFrame);
     stubExpandFrameForTesting((win, iframe, onFinish) =>
-      onFinish(knownBoxRect, {}));
+      onFinish(knownBoxRect, {})
+    );
 
     manager.expandFrame(iframe, NOOP);
     manager.collapseFrame(iframe, callback);
 
     expect(callback).to.have.been.calledWith(knownBoxRect);
-    expect(collapseFrame)
-        .to.have.been.calledWith(win, iframe, sinon.match.any, sinon.match.any);
+    expect(collapseFrame).to.have.been.calledWith(
+      win,
+      iframe,
+      sinon.match.any,
+      sinon.match.any
+    );
   });
 });
diff --git a/test/unit/inabox/test-inabox-host.js b/test/unit/inabox/test-inabox-host.js
index 2bfe69fb4b90..360d675964fa 100644
--- a/test/unit/inabox/test-inabox-host.js
+++ b/test/unit/inabox/test-inabox-host.js
@@ -18,11 +18,12 @@ import {InaboxHost} from '../../../ads/inabox/inabox-host';
 import {InaboxMessagingHost} from '../../../ads/inabox/inabox-messaging-host';
 
 describes.fakeWin('inabox-host', {}, env => {
-
   let processMessageSpy;
   beforeEach(() => {
     processMessageSpy = env.sandbox.spy(
-        InaboxMessagingHost.prototype, 'processMessage');
+      InaboxMessagingHost.prototype,
+      'processMessage'
+    );
   });
 
   it('should process queue', () => {
@@ -31,16 +32,14 @@ describes.fakeWin('inabox-host', {}, env => {
       {source: {postMessage: () => {}}},
       {source: {postMessage: () => {}}},
     ];
-    const invalidMessages = [
-      {},
-      {source: {}},
-    ];
+    const invalidMessages = [{}, {source: {}}];
     env.win['ampInaboxPendingMessages'] = invalidMessages.concat(messages);
     new InaboxHost(env.win);
     expect(processMessageSpy.callCount).to.equal(3);
     messages.forEach(e => expect(processMessageSpy.withArgs(e)).to.be.called);
     invalidMessages.forEach(
-        e => expect(processMessageSpy.withArgs(e)).to.not.be.called);
+      e => expect(processMessageSpy.withArgs(e)).to.not.be.called
+    );
     // Calling push should have no effect
     expect(env.win['ampInaboxPendingMessages'].length).to.equal(0);
     env.win['ampInaboxPendingMessages'].push({});
@@ -67,5 +66,4 @@ describes.fakeWin('inabox-host', {}, env => {
     env.win['ampInaboxPendingMessages'].push({});
     expect(env.win['ampInaboxPendingMessages'].length).to.equal(0);
   });
-
 });
diff --git a/test/unit/inabox/test-inabox-messaging-host.js b/test/unit/inabox/test-inabox-messaging-host.js
index 76ff3c415153..c560dffeea22 100644
--- a/test/unit/inabox/test-inabox-messaging-host.js
+++ b/test/unit/inabox/test-inabox-messaging-host.js
@@ -19,7 +19,6 @@ import {deserializeMessage} from '../../../src/3p-frame-messaging';
 import {layoutRectLtwh} from '../../../src/layout-rect';
 
 describes.realWin('inabox-host:messaging', {}, env => {
-
   let win;
   let host;
   let iframe1;
@@ -42,131 +41,169 @@ describes.realWin('inabox-host:messaging', {}, env => {
     iframe3.contentWindow.postMessage = () => {};
     iframeUntrusted.contentWindow.postMessage = () => {};
     iframe1.dataset.ampAllowed =
-        'send-positions,full-overlay-frame,cancel-full-overlay-frame';
-    iframe2.dataset.ampAllowed =
-        'send-positions';
+      'send-positions,full-overlay-frame,cancel-full-overlay-frame';
+    iframe2.dataset.ampAllowed = 'send-positions';
     iframeUntrusted.dataset.ampAllowed =
-        'send-positions,full-overlay-frame,cancel-full-overlay-frame';
+      'send-positions,full-overlay-frame,cancel-full-overlay-frame';
     host = new InaboxMessagingHost(win, [iframe1, iframe2, iframe3]);
   });
 
   describe('processMessage', () => {
-
     it('should process valid message', () => {
-      expect(host.processMessage({
-        source: iframe1.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
-      })).to.be.true;
+      expect(
+        host.processMessage({
+          source: iframe1.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-123',
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.true;
     });
 
     it('should process valid message 2', () => {
-      expect(host.processMessage({
-        source: iframe1.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'full-overlay-frame',
-        }),
-      })).to.be.true;
+      expect(
+        host.processMessage({
+          source: iframe1.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-123',
+              type: 'full-overlay-frame',
+            }),
+        })
+      ).to.be.true;
     });
 
     it('should ignore non-string message', () => {
-      expect(host.processMessage({
-        source: iframe1.contentWindow,
-        origin: 'www.example.com',
-        data: {x: 1},
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframe1.contentWindow,
+          origin: 'www.example.com',
+          data: {x: 1},
+        })
+      ).to.be.false;
     });
 
     it('should ignore message without sentinel', () => {
-      expect(host.processMessage({
-        source: iframe1.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          type: 'send-positions',
-        }),
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframe1.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.false;
     });
 
     it('should ignore message does not start with amp-', () => {
-      expect(host.processMessage({
-        source: iframe1.contentWindow,
-        origin: 'www.example.com',
-        data: 'map-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframe1.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'map-' +
+            JSON.stringify({
+              sentinel: '0-123',
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.false;
     });
 
     it('should ignore message from untrusted iframe', () => {
-      expect(host.processMessage({
-        source: iframeUntrusted.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframeUntrusted.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-123',
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.false;
     });
 
     it('should tolerate message with null source', () => {
       host.processMessage({
         source: null,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'send-positions',
+          }),
       });
     });
 
     it('should process messages with allowed actions', () => {
-      expect(host.processMessage({
-        source: iframe2.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-124',
-          type: 'send-positions',
-        }),
-      })).to.be.true;
+      expect(
+        host.processMessage({
+          source: iframe2.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-124',
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.true;
     });
 
     it('should ignore messages with disallowed actions', () => {
-      expect(host.processMessage({
-        source: iframe2.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-124',
-          type: 'full-overlay-frame',
-        }),
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframe2.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-124',
+              type: 'full-overlay-frame',
+            }),
+        })
+      ).to.be.false;
     });
 
     it('should allow read-only messages from frames with no whitelist', () => {
-      expect(host.processMessage({
-        source: iframe3.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-125',
-          type: 'send-positions',
-        }),
-      })).to.be.true;
+      expect(
+        host.processMessage({
+          source: iframe3.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-125',
+              type: 'send-positions',
+            }),
+        })
+      ).to.be.true;
     });
 
     it('should ignore write messages from frames with no whitelist', () => {
-      expect(host.processMessage({
-        source: iframe3.contentWindow,
-        origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-125',
-          type: 'full-overlay-frame',
-        }),
-      })).to.be.false;
+      expect(
+        host.processMessage({
+          source: iframe3.contentWindow,
+          origin: 'www.example.com',
+          data:
+            'amp-' +
+            JSON.stringify({
+              sentinel: '0-125',
+              type: 'full-overlay-frame',
+            }),
+        })
+      ).to.be.false;
     });
   });
 
@@ -182,18 +219,21 @@ describes.realWin('inabox-host:messaging', {}, env => {
         return layoutRectLtwh(10, 10, 100, 100);
       });
       sandbox.stub(host.positionObserver_, 'observe').callsFake(() => {});
-      iframe1.getBoundingClientRect =
-          () => {return layoutRectLtwh(5, 5, 20, 20);};
+      iframe1.getBoundingClientRect = () => {
+        return layoutRectLtwh(5, 5, 20, 20);
+      };
       sandbox.stub(host.positionObserver_, 'getTargetRect').callsFake(() => {
         return iframe1.getBoundingClientRect();
       });
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'send-positions',
+          }),
       });
       const message = postMessageSpy.getCall(0).args[0];
       const targetOrigin = postMessageSpy.getCall(0).args[1];
@@ -208,7 +248,6 @@ describes.realWin('inabox-host:messaging', {}, env => {
   });
 
   describe('send-positions position observer callback', () => {
-
     let callback;
     let target;
     let postMessageSpy;
@@ -230,10 +269,12 @@ describes.realWin('inabox-host:messaging', {}, env => {
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'send-positions',
+          }),
       });
 
       expect(target).to.equal(iframe1);
@@ -253,19 +294,23 @@ describes.realWin('inabox-host:messaging', {}, env => {
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'send-positions',
+          }),
       });
 
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'send-positions',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'send-positions',
+          }),
       });
 
       postMessageSpy.resetHistory();
@@ -275,34 +320,35 @@ describes.realWin('inabox-host:messaging', {}, env => {
   });
 
   describe('full-overlay-frame', () => {
-
     let iframePostMessageSpy;
 
     beforeEach(() => {
       iframe1.contentWindow.postMessage = iframePostMessageSpy = sandbox.stub();
     });
 
-
     it('should accept request and expand', () => {
       const boxRect = {a: 1, b: 2}; // we don't care
 
-      const expandFrame = sandbox./*OK*/stub(
-          host.frameOverlayManager_, 'expandFrame').callsFake(
-          (iframe, callback) => {
-            callback(boxRect);
-          });
+      const expandFrame = sandbox
+        ./*OK*/ stub(host.frameOverlayManager_, 'expandFrame')
+        .callsFake((iframe, callback) => {
+          callback(boxRect);
+        });
 
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'full-overlay-frame',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'full-overlay-frame',
+          }),
       });
 
       const message = deserializeMessage(
-          iframePostMessageSpy.getCall(0).args[0]);
+        iframePostMessageSpy.getCall(0).args[0]
+      );
 
       expect(expandFrame).calledWith(iframe1, sinon.match.any);
       expect(message.type).to.equal('full-overlay-frame-response');
@@ -313,30 +359,32 @@ describes.realWin('inabox-host:messaging', {}, env => {
     it('should accept reset request and collapse', () => {
       const boxRect = {c: 1, d: 2}; // we don't care
 
-      const collapseFrame = sandbox./*OK*/stub(
-          host.frameOverlayManager_, 'collapseFrame').callsFake(
-          (iframe, callback) => {
-            callback(boxRect);
-          });
+      const collapseFrame = sandbox
+        ./*OK*/ stub(host.frameOverlayManager_, 'collapseFrame')
+        .callsFake((iframe, callback) => {
+          callback(boxRect);
+        });
 
       host.processMessage({
         source: iframe1.contentWindow,
         origin: 'www.example.com',
-        data: 'amp-' + JSON.stringify({
-          sentinel: '0-123',
-          type: 'cancel-full-overlay-frame',
-        }),
+        data:
+          'amp-' +
+          JSON.stringify({
+            sentinel: '0-123',
+            type: 'cancel-full-overlay-frame',
+          }),
       });
 
       const message = deserializeMessage(
-          iframePostMessageSpy.getCall(0).args[0]);
+        iframePostMessageSpy.getCall(0).args[0]
+      );
 
       expect(collapseFrame).calledWith(iframe1, sinon.match.any);
       expect(message.type).to.equal('cancel-full-overlay-frame-response');
       expect(message.success).to.be.true;
       expect(message.boxRect).to.deep.equal(boxRect);
     });
-
   });
 
   function createNestedIframeMocks(depth, numXDomain) {
@@ -374,19 +422,22 @@ describes.realWin('inabox-host:messaging', {}, env => {
 
   function breakCanInspectWindowForWindow(win) {
     Object.defineProperty(win['location'], 'href', {
-      get: () => {throw new Error('Error!!');},
+      get: () => {
+        throw new Error('Error!!');
+      },
     });
     Object.defineProperty(win, 'test', {
-      get: () => {throw new Error('Error!!');},
+      get: () => {
+        throw new Error('Error!!');
+      },
     });
   }
 
   describe('getMeasureableFrame', () => {
     it('should return correct frame when many iframes at same level', () => {
-      const {source} = createNestedIframeMocks(6,3);
+      const {source} = createNestedIframeMocks(6, 3);
       const expectedMeasureableWin = source.parent.parent;
-      const correctFrame =
-            expectedMeasureableWin.parent.document.querySelectorAll()[0];
+      const correctFrame = expectedMeasureableWin.parent.document.querySelectorAll()[0];
       expectedMeasureableWin.parent.document.querySelectorAll = () => {
         const f1 = {};
         const f2 = {};
@@ -394,26 +445,30 @@ describes.realWin('inabox-host:messaging', {}, env => {
         return [f1, f2, correctFrame, f3];
       };
       expect(host.getMeasureableFrame(source).contentWindow).to.deep.equal(
-          expectedMeasureableWin);
+        expectedMeasureableWin
+      );
     });
 
     it('should return correct frame multiple level of xdomain', () => {
-      const {source} = createNestedIframeMocks(6,3);
+      const {source} = createNestedIframeMocks(6, 3);
       const expectedMeasurableWin = source.parent.parent;
       expect(host.getMeasureableFrame(source).contentWindow).to.deep.equal(
-          expectedMeasurableWin);
+        expectedMeasurableWin
+      );
     });
 
     it('should return correct frame for single xdomain frame', () => {
-      const {source} = createNestedIframeMocks(10,1);
+      const {source} = createNestedIframeMocks(10, 1);
       expect(host.getMeasureableFrame(source).contentWindow).to.deep.equal(
-          source);
+        source
+      );
     });
 
     it('should return correct frame for no xdomain frames', () => {
       const {source} = createNestedIframeMocks(5);
       expect(host.getMeasureableFrame(source).contentWindow).to.deep.equal(
-          source);
+        source
+      );
     });
   });
 
@@ -421,7 +476,7 @@ describes.realWin('inabox-host:messaging', {}, env => {
     const sentinel = '123456789101112';
 
     it('should return correct frame when intermediate xdomain frames', () => {
-      const iframeObj = createNestedIframeMocks(6,3);
+      const iframeObj = createNestedIframeMocks(6, 3);
       const {source: sourceMock, topWin: topWinMock} = iframeObj;
       const frameMock = topWinMock.document.querySelectorAll()[0];
       const expectedWin = sourceMock.parent.parent;
@@ -447,8 +502,11 @@ describes.realWin('inabox-host:messaging', {}, env => {
       const frameMockWrong2 = {};
       const frameMock = topWinMock.document.querySelectorAll()[0];
       const expectedWin = sourceMock;
-      host = new InaboxMessagingHost(
-          win, [frameMockWrong1, frameMockWrong2, frameMock]);
+      host = new InaboxMessagingHost(win, [
+        frameMockWrong1,
+        frameMockWrong2,
+        frameMock,
+      ]);
       const {measurableFrame} = host.getFrameElement_(sourceMock, sentinel);
       expect(measurableFrame.contentWindow).to.deep.equal(expectedWin);
     });
@@ -460,20 +518,24 @@ describes.realWin('inabox-host:messaging', {}, env => {
       const creativeWinMock = {};
       const creativeIframeMock = {};
       host.iframeMap_[sentinel] = {
-        'iframe': creativeIframeMock, 'measurableFrame': creativeIframeMock};
-      const {measurableFrame} =
-          host.getFrameElement_(creativeWinMock, sentinel);
+        'iframe': creativeIframeMock,
+        'measurableFrame': creativeIframeMock,
+      };
+      const {measurableFrame} = host.getFrameElement_(
+        creativeWinMock,
+        sentinel
+      );
       expect(measurableFrame).to.equal(creativeIframeMock);
     });
 
     it('should return null if frame is not registered', () => {
-      const iframeObj = createNestedIframeMocks(6,3);
+      const iframeObj = createNestedIframeMocks(6, 3);
       const sourceMock = iframeObj.source;
       expect(host.getFrameElement_(sourceMock, sentinel)).to.be.null;
     });
 
     it('should return null if frame is more than 10 levels deep', () => {
-      const iframeObj = createNestedIframeMocks(12,1);
+      const iframeObj = createNestedIframeMocks(12, 1);
       const {source: sourceMock, topWin: topWinMock} = iframeObj;
       const frameMock = topWinMock.document.querySelectorAll()[0];
       host = new InaboxMessagingHost(win, [frameMock]);
@@ -484,11 +546,11 @@ describes.realWin('inabox-host:messaging', {}, env => {
   describe('unregisterIframe', () => {
     it('unregisters frames', () => {
       // Setup 3 frames with mock sentinel values.
-      const iframeObjA = createNestedIframeMocks(6,3);
+      const iframeObjA = createNestedIframeMocks(6, 3);
       const frameMockA = iframeObjA.topWin.document.querySelectorAll()[0];
-      const iframeObjB = createNestedIframeMocks(6,6);
+      const iframeObjB = createNestedIframeMocks(6, 6);
       const frameMockB = iframeObjB.topWin.document.querySelectorAll()[0];
-      const iframeObjC = createNestedIframeMocks(6,0);
+      const iframeObjC = createNestedIframeMocks(6, 0);
       const frameMockC = iframeObjC.topWin.document.querySelectorAll()[0];
       const observeUnregisterMock = sandbox.spy();
       host = new InaboxMessagingHost(win, [frameMockA, frameMockB, frameMockC]);
@@ -520,11 +582,11 @@ describes.realWin('inabox-host:messaging', {}, env => {
     });
 
     it('no errors or effects if called with a non-registered iframe', () => {
-      const iframeObj = createNestedIframeMocks(6,3);
+      const iframeObj = createNestedIframeMocks(6, 3);
       const frameMock = iframeObj.topWin.document.querySelectorAll()[0];
       host = new InaboxMessagingHost(win, [frameMock]);
       host.getFrameElement_(iframeObj.source, 'sentinelA');
-      host.unregisterIframe(createNestedIframeMocks(1,1));
+      host.unregisterIframe(createNestedIframeMocks(1, 1));
       expect(host.iframes_.length).to.equal(1);
       expect('sentinelA' in host.iframeMap_).to.be.true;
     });
diff --git a/test/unit/inabox/test-inabox-viewport.js b/test/unit/inabox/test-inabox-viewport.js
index b8f784197d00..224a63d180b0 100644
--- a/test/unit/inabox/test-inabox-viewport.js
+++ b/test/unit/inabox/test-inabox-viewport.js
@@ -23,18 +23,14 @@ import {
   prepareBodyForOverlay,
   resetBodyForOverlay,
 } from '../../../src/inabox/inabox-viewport';
-import {
-  installIframeMessagingClient,
-} from '../../../src/inabox/inabox-iframe-messaging-client';
+import {installIframeMessagingClient} from '../../../src/inabox/inabox-iframe-messaging-client';
 import {installPlatformService} from '../../../src/service/platform-impl';
 import {layoutRectLtwh} from '../../../src/layout-rect';
 import {toggleExperiment} from '../../../src/experiments';
 
-
 const NOOP = () => {};
 
 describes.fakeWin('inabox-viewport', {amp: {}}, env => {
-
   let win;
   let binding;
   let element;
@@ -45,22 +41,28 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
   let measureSpy;
 
   function stubIframeClientMakeRequest(
-    requestType, responseType, callback, opt_sync, opt_once) {
+    requestType,
+    responseType,
+    callback,
+    opt_sync,
+    opt_once
+  ) {
     const methodName = opt_once ? 'requestOnce' : 'makeRequest';
 
-    return sandbox./*OK*/stub(
-        binding.iframeClient_, methodName).callsFake((req, res, cb) => {
-      expect(req).to.equal(requestType);
-      expect(res).to.equal(responseType);
+    return sandbox
+      ./*OK*/ stub(binding.iframeClient_, methodName)
+      .callsFake((req, res, cb) => {
+        expect(req).to.equal(requestType);
+        expect(res).to.equal(responseType);
 
-      if (opt_sync) {
-        callback(req, res, cb);
-      } else {
-        setTimeout(() => callback(req, res, cb), 10);
-      }
+        if (opt_sync) {
+          callback(req, res, cb);
+        } else {
+          setTimeout(() => callback(req, res, cb), 10);
+        }
 
-      return NOOP;
-    });
+        return NOOP;
+      });
   }
 
   beforeEach(() => {
@@ -98,10 +100,14 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       },
       measure: measureSpy,
     };
-    sandbox.stub(
-        Services.resourcesForDoc(win.document), 'get').returns([element]);
+    sandbox
+      .stub(Services.resourcesForDoc(win.document), 'get')
+      .returns([element]);
     sandbox.stub(Services, 'resourcesPromiseForDoc').returns(
-        new Promise(resolve => { resolve(); }));
+      new Promise(resolve => {
+        resolve();
+      })
+    );
   });
 
   afterEach(() => {
@@ -109,29 +115,32 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
   });
 
   describe('should work for size, layoutRect and position observer', () => {
-
     let viewportRect;
     let targetRect;
 
     it('cross domain', () => {
-      sandbox./*OK*/stub(iframeHelper, 'canInspectWindow').returns(false);
+      sandbox./*OK*/ stub(iframeHelper, 'canInspectWindow').returns(false);
       stubIframeClientMakeRequest(
-          'send-positions',
-          'position',
-          (req, res, cb) => { positionCallback = cb; },
-          /* opt_sync */ true);
+        'send-positions',
+        'position',
+        (req, res, cb) => {
+          positionCallback = cb;
+        },
+        /* opt_sync */ true
+      );
       return binding.connect().then(() => {
         testPositionCallback();
       });
     });
 
     it('same domain', () => {
-      sandbox./*OK*/stub(iframeHelper, 'canInspectWindow').returns(true);
+      sandbox./*OK*/ stub(iframeHelper, 'canInspectWindow').returns(true);
       toggleExperiment(win, 'inabox-viewport-friendly', true);
-      sandbox.stub(PositionObserver.prototype, 'observe')
-          .callsFake((e, callback) => {
-            topWindowObservable.add(() => callback({viewportRect, targetRect}));
-          });
+      sandbox
+        .stub(PositionObserver.prototype, 'observe')
+        .callsFake((e, callback) => {
+          topWindowObservable.add(() => callback({viewportRect, targetRect}));
+        });
 
       positionCallback = data => {
         viewportRect = data.viewportRect;
@@ -152,8 +161,9 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
 
       // Initial state
       expect(binding.getSize()).to.deep.equal({width: 200, height: 150});
-      expect(binding.getLayoutRect(element))
-          .to.deep.equal(layoutRectLtwh(0, 151, 100, 100));
+      expect(binding.getLayoutRect(element)).to.deep.equal(
+        layoutRectLtwh(0, 151, 100, 100)
+      );
 
       // Initial position received
       positionCallback({
@@ -164,8 +174,9 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       expect(onScrollCallback).to.not.be.called;
       expect(onResizeCallback).to.be.calledOnce;
       expect(measureSpy).to.be.calledOnce;
-      expect(binding.getLayoutRect(element))
-          .to.deep.equal(layoutRectLtwh(10, 20, 100, 100));
+      expect(binding.getLayoutRect(element)).to.deep.equal(
+        layoutRectLtwh(10, 20, 100, 100)
+      );
       sandbox.reset();
 
       // Scroll, viewport position changed
@@ -177,8 +188,9 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       expect(onScrollCallback).to.be.calledOnce;
       expect(onResizeCallback).to.not.be.called;
       expect(measureSpy).to.not.be.called;
-      expect(binding.getLayoutRect(element))
-          .to.deep.equal(layoutRectLtwh(10, 20, 100, 100));
+      expect(binding.getLayoutRect(element)).to.deep.equal(
+        layoutRectLtwh(10, 20, 100, 100)
+      );
       sandbox.reset();
 
       // Resize, viewport size changed
@@ -190,14 +202,16 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       expect(onScrollCallback).to.not.be.called;
       expect(onResizeCallback).to.be.calledOnce;
       expect(measureSpy).to.not.be.called;
-      expect(binding.getLayoutRect(element))
-          .to.deep.equal(layoutRectLtwh(10, 20, 100, 100));
+      expect(binding.getLayoutRect(element)).to.deep.equal(
+        layoutRectLtwh(10, 20, 100, 100)
+      );
       sandbox.reset();
 
       // DOM change, target position changed
       sandbox.restore();
-      sandbox.stub(
-          Services.resourcesForDoc(win.document), 'get').returns([element]);
+      sandbox
+        .stub(Services.resourcesForDoc(win.document), 'get')
+        .returns([element]);
       positionCallback({
         viewportRect: layoutRectLtwh(0, 10, 200, 100),
         targetRect: layoutRectLtwh(20, 10, 50, 50),
@@ -206,27 +220,32 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       expect(onScrollCallback).to.not.be.called;
       expect(onResizeCallback).to.not.be.called;
       expect(measureSpy).to.be.calledOnce;
-      expect(binding.getLayoutRect(element))
-          .to.deep.equal(layoutRectLtwh(20, 20, 100, 100));
+      expect(binding.getLayoutRect(element)).to.deep.equal(
+        layoutRectLtwh(20, 20, 100, 100)
+      );
     }
   });
 
   it('should center content, resize and remeasure on overlay mode', () => {
-    const allResourcesMock = Array(5).fill(undefined).map(() => ({
-      measure: sandbox.spy(),
-    }));
+    const allResourcesMock = Array(5)
+      .fill(undefined)
+      .map(() => ({
+        measure: sandbox.spy(),
+      }));
 
-    sandbox.stub(binding, 'getChildResources').callsFake(
-        () => allResourcesMock);
+    sandbox
+      .stub(binding, 'getChildResources')
+      .callsFake(() => allResourcesMock);
 
-    const prepareContainer =
-        sandbox.stub(binding, 'prepareBodyForOverlay_')
-            .returns(Promise.resolve());
+    const prepareContainer = sandbox
+      .stub(binding, 'prepareBodyForOverlay_')
+      .returns(Promise.resolve());
 
     const makeRequest = stubIframeClientMakeRequest(
-        'full-overlay-frame',
-        'full-overlay-frame-response',
-        (req, res, cb) => cb({
+      'full-overlay-frame',
+      'full-overlay-frame-response',
+      (req, res, cb) =>
+        cb({
           success: true,
           boxRect: {
             left: 0,
@@ -236,7 +255,8 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
             width: 1000,
             height: 2000,
           },
-        }));
+        })
+    );
 
     return binding.updateLightboxMode(true).then(() => {
       expect(prepareContainer).to.be.calledOnce;
@@ -249,14 +269,15 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
   });
 
   it('should reset content and request resize on leave overlay mode', () => {
-    const resetContainer =
-        sandbox.stub(binding, 'resetBodyForOverlay_')
-            .returns(Promise.resolve());
+    const resetContainer = sandbox
+      .stub(binding, 'resetBodyForOverlay_')
+      .returns(Promise.resolve());
 
     const makeRequest = stubIframeClientMakeRequest(
-        'cancel-full-overlay-frame',
-        'cancel-full-overlay-frame-response',
-        (req, res, cb) => cb({success: true}));
+      'cancel-full-overlay-frame',
+      'cancel-full-overlay-frame-response',
+      (req, res, cb) => cb({success: true})
+    );
 
     return binding.updateLightboxMode(false).then(() => {
       expect(resetContainer).to.be.calledOnce;
@@ -274,13 +295,15 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       height: 300,
     };
 
-    const updateBoxRectStub = sandbox.stub(binding, 'updateBoxRect_').callsFake(
-        NOOP);
+    const updateBoxRectStub = sandbox
+      .stub(binding, 'updateBoxRect_')
+      .callsFake(NOOP);
 
     stubIframeClientMakeRequest(
-        'full-overlay-frame',
-        'full-overlay-frame-response',
-        (req, res, cb) => cb({success: true, boxRect}));
+      'full-overlay-frame',
+      'full-overlay-frame-response',
+      (req, res, cb) => cb({success: true, boxRect})
+    );
 
     sandbox.stub(binding, 'prepareBodyForOverlay_').returns(Promise.resolve());
 
@@ -299,13 +322,15 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
       height: 300,
     };
 
-    const updateBoxRectStub = sandbox.stub(binding, 'updateBoxRect_').callsFake(
-        NOOP);
+    const updateBoxRectStub = sandbox
+      .stub(binding, 'updateBoxRect_')
+      .callsFake(NOOP);
 
     stubIframeClientMakeRequest(
-        'cancel-full-overlay-frame',
-        'cancel-full-overlay-frame-response',
-        (req, res, cb) => cb({success: true, boxRect}));
+      'cancel-full-overlay-frame',
+      'cancel-full-overlay-frame-response',
+      (req, res, cb) => cb({success: true, boxRect})
+    );
 
     sandbox.stub(binding, 'resetBodyForOverlay_').returns(Promise.resolve());
 
@@ -315,7 +340,7 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
   });
 
   // TODO(zhouyx, #12476): Make this test work with sinon 4.0.
-  it.skip('should center the fixed container properly', function* () {
+  it.skip('should center the fixed container properly', function*() {
     const w = 120;
     const h = 90;
 
@@ -337,7 +362,7 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
     expect(el.style['margin-top']).to.equal(`-${h / 2}px`);
   });
 
-  it('should undo styling when the fixed container is reset', function* () {
+  it('should undo styling when the fixed container is reset', function*() {
     const el = document.createElement('div');
 
     yield resetBodyForOverlay(win, el);
@@ -354,14 +379,18 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
   });
 
   it('should request the position async from host', () => {
-    sandbox./*OK*/stub(iframeHelper, 'canInspectWindow').returns(false);
+    sandbox./*OK*/ stub(iframeHelper, 'canInspectWindow').returns(false);
     const requestSpy = stubIframeClientMakeRequest(
-        'send-positions',
-        'position',
-        (req, res, cb) => cb({
+      'send-positions',
+      'position',
+      (req, res, cb) =>
+        cb({
           targetRect: layoutRectLtwh(10, 20, 100, 100),
           viewportRect: layoutRectLtwh(1, 1, 1, 1),
-        }), undefined, true);
+        }),
+      undefined,
+      true
+    );
     return binding.getRootClientRectAsync().then(rect => {
       expect(rect).to.jsonEqual(layoutRectLtwh(10, 20, 100, 100));
       expect(requestSpy).to.be.calledOnce;
@@ -370,10 +399,11 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
 
   it('should request the position directly from host if friendly', () => {
     // this is implicit but we make it explicit anyway for clarity
-    sandbox./*OK*/stub(iframeHelper, 'canInspectWindow').returns(true);
+    sandbox./*OK*/ stub(iframeHelper, 'canInspectWindow').returns(true);
     toggleExperiment(win, 'inabox-viewport-friendly', true);
-    sandbox.stub(PositionObserver.prototype, 'getTargetRect')
-        .returns(layoutRectLtwh(10, 20, 100, 100));
+    sandbox
+      .stub(PositionObserver.prototype, 'getTargetRect')
+      .returns(layoutRectLtwh(10, 20, 100, 100));
     return binding.getRootClientRectAsync().then(rect => {
       expect(rect).to.jsonEqual(layoutRectLtwh(10, 20, 100, 100));
     });
@@ -384,15 +414,18 @@ describes.fakeWin('inabox-viewport', {amp: {}}, env => {
     const observeFunction = sandbox.stub(PositionObserver.prototype, 'observe');
     observeFunction.returns(unobserveFunction);
     toggleExperiment(win, 'inabox-viewport-friendly', true);
-    sandbox./*OK*/stub(iframeHelper, 'canInspectWindow').returns(true);
-    return binding.connect().then(() => {
-      expect(observeFunction).to.be.calledOnce;
-      expect(unobserveFunction).to.not.be.called;
-      binding.disconnect();
-      expect(unobserveFunction).to.be.called;
-      return binding.connect();
-    }).then(() => {
-      expect(observeFunction).to.be.calledTwice;
-    });
+    sandbox./*OK*/ stub(iframeHelper, 'canInspectWindow').returns(true);
+    return binding
+      .connect()
+      .then(() => {
+        expect(observeFunction).to.be.calledOnce;
+        expect(unobserveFunction).to.not.be.called;
+        binding.disconnect();
+        expect(unobserveFunction).to.be.called;
+        return binding.connect();
+      })
+      .then(() => {
+        expect(observeFunction).to.be.calledTwice;
+      });
   });
 });
diff --git a/test/unit/inabox/test-position-observer.js b/test/unit/inabox/test-position-observer.js
index fc85bef87eca..2fb40776e5c9 100644
--- a/test/unit/inabox/test-position-observer.js
+++ b/test/unit/inabox/test-position-observer.js
@@ -18,7 +18,6 @@ import {PositionObserver} from '../../../ads/inabox/position-observer';
 import {layoutRectLtwh} from '../../../src/layout-rect';
 
 describes.realWin('inabox-host:position-observer', {}, env => {
-
   let win;
   let observer;
   let target1;
@@ -103,7 +102,8 @@ describes.realWin('inabox-host:position-observer', {}, env => {
     iframe1.getBoundingClientRect = () => layoutRectLtwh(1, 2, 70, 80);
     iframe2.getBoundingClientRect = () => layoutRectLtwh(5, 6, 30, 40);
     iframe3.getBoundingClientRect = () => layoutRectLtwh(7, 8, 10, 20);
-    expect(observer.getTargetRect(element))
-        .to.deep.equal(layoutRectLtwh(14, 18, 30, 40));
+    expect(observer.getTargetRect(element)).to.deep.equal(
+      layoutRectLtwh(14, 18, 30, 40)
+    );
   });
 });
diff --git a/test/unit/inabox/test-utils.js b/test/unit/inabox/test-utils.js
index 86015e101c77..2ded12be0c5f 100644
--- a/test/unit/inabox/test-utils.js
+++ b/test/unit/inabox/test-utils.js
@@ -28,24 +28,24 @@ describes.realWin('inabox-utils', {}, env => {
   let a4aIdMetaElement;
 
   function addA4AMetaTagToDocument() {
-    a4aIdMetaElement = createElementWithAttributes(
-        env.win.document,
-        'meta',
-        {
-          name: 'amp4ads-id',
-          content: 'vendor=doubleclick,type=impression-id,value=12345',
-        }
-    );
+    a4aIdMetaElement = createElementWithAttributes(env.win.document, 'meta', {
+      name: 'amp4ads-id',
+      content: 'vendor=doubleclick,type=impression-id,value=12345',
+    });
     env.win.document.head.appendChild(a4aIdMetaElement);
   }
 
   beforeEach(() => {
     ampdoc = {win: env.win, getRootNode: () => ({})};
     getResourcesInRectStub = sandbox.stub();
-    sandbox.stub(Services, 'resourcesForDoc').withArgs(ampdoc).returns(
-        {getResourcesInRect: getResourcesInRectStub});
-    sandbox.stub(Services, 'viewportForDoc').withArgs(ampdoc).returns(
-        {getLayoutRect: () => ({})});
+    sandbox
+      .stub(Services, 'resourcesForDoc')
+      .withArgs(ampdoc)
+      .returns({getResourcesInRect: getResourcesInRectStub});
+    sandbox
+      .stub(Services, 'viewportForDoc')
+      .withArgs(ampdoc)
+      .returns({getLayoutRect: () => ({})});
     parentPostMessageStub = sandbox.stub();
     dispatchEventStub = sandbox.stub();
     initCustomEventStub = sandbox.stub();
@@ -53,8 +53,9 @@ describes.realWin('inabox-utils', {}, env => {
     env.win.CustomEvent = (type, eventInit) => {
       initCustomEventStub(type, eventInit);
     };
-    env.win.document.createEvent =
-       () => ({initCustomEvent: initCustomEventStub});
+    env.win.document.createEvent = () => ({
+      initCustomEvent: initCustomEventStub,
+    });
     env.win.dispatchEvent = dispatchEventStub;
   });
 
@@ -69,10 +70,8 @@ describes.realWin('inabox-utils', {}, env => {
     setTimeout(() => timeDeferred.resolve(), 10);
     return timeDeferred.promise.then(() => {
       expect(dispatchEventStub).to.be.calledOnce;
-      expect(initCustomEventStub)
-          .to.be.calledWith('amp-ini-load');
-      expect(parentPostMessageStub)
-          .to.be.calledWith('amp-ini-load', '*');
+      expect(initCustomEventStub).to.be.calledWith('amp-ini-load');
+      expect(parentPostMessageStub).to.be.calledWith('amp-ini-load', '*');
     });
   });
 
@@ -80,7 +79,6 @@ describes.realWin('inabox-utils', {}, env => {
     expect(getA4AId(env.win)).to.be.not.ok;
   });
 
-
   it('Should be able to get the a4aId if on the document', () => {
     addA4AMetaTagToDocument();
     expect(getA4AId(env.win)).to.be.ok;
diff --git a/test/unit/test-3p-environment.js b/test/unit/test-3p-environment.js
index 24673f36bfc8..4be182d7d7fd 100644
--- a/test/unit/test-3p-environment.js
+++ b/test/unit/test-3p-environment.js
@@ -18,13 +18,9 @@ import * as lolex from 'lolex';
 import {Services} from '../../src/services';
 import {createIframePromise} from '../../testing/iframe';
 import {loadPromise} from '../../src/event-helper';
-import {
-  manageWin,
-  setInViewportForTesting,
-} from '../../3p/environment';
+import {manageWin, setInViewportForTesting} from '../../3p/environment';
 
 describe('3p environment', () => {
-
   let testWin;
   let iframeCount;
   const timer = Services.timerFor(window);
@@ -167,12 +163,14 @@ describe('3p environment', () => {
       setInViewportForTesting(true);
       clock.tick(20);
       expect(progress).to.equal(
-          'aaaaaaaaabaaaaaaaaaacbaabcaaaaaaaaaaaaaaaaaaba');
+        'aaaaaaaaabaaaaaaaaaacbaabcaaaaaaaaaaaaaaaaaaba'
+      );
       testWin.clearInterval(ia);
       testWin.clearInterval(ic);
       clock.tick(20);
       expect(progress).to.equal(
-          'aaaaaaaaabaaaaaaaaaacbaabcaaaaaaaaaaaaaaaaaababb');
+        'aaaaaaaaabaaaaaaaaaacbaabcaaaaaaaaaaaaaaaaaababb'
+      );
       testWin.ran = false;
       testWin.setInterval('ran=true', 1);
       clock.tick(1);
@@ -220,8 +218,11 @@ describe('3p environment', () => {
   }
 
   function waitForMutationObserver(iframe) {
-    if (iframe.contentWindow && iframe.contentWindow.document &&
-        iframe.contentWindow.document.body.childNodes.length) {
+    if (
+      iframe.contentWindow &&
+      iframe.contentWindow.document &&
+      iframe.contentWindow.document.body.childNodes.length
+    ) {
       return timer.promise(10);
     }
     return loadPromise(iframe).then(() => {
@@ -232,7 +233,7 @@ describe('3p environment', () => {
   function makeChildIframeSrcdoc(win) {
     const doc = win.document;
     const iframe = doc.createElement('iframe');
-    iframe.name = 'testChild' + (iframeCount++);
+    iframe.name = 'testChild' + iframeCount++;
     iframe.setAttribute('srcdoc', 'hello: ' + iframe.name);
     doc.body.appendChild(iframe);
     doc.body.appendChild(doc.createElement('hr'));
@@ -242,7 +243,7 @@ describe('3p environment', () => {
   function makeChildIframeDocWrite(win) {
     const doc = win.document;
     const iframe = doc.createElement('iframe');
-    iframe.name = 'testChild' + (iframeCount++);
+    iframe.name = 'testChild' + iframeCount++;
     iframe.src = 'about:blank';
     doc.body.appendChild(iframe);
     iframe.contentWindow.document.open();
diff --git a/test/unit/test-3p.js b/test/unit/test-3p.js
index 36261696d5cf..f36f140d7cbf 100644
--- a/test/unit/test-3p.js
+++ b/test/unit/test-3p.js
@@ -24,7 +24,6 @@ import {
 } from '../../3p/3p';
 
 describe('3p', () => {
-
   let sandbox;
   let clock;
 
@@ -39,7 +38,6 @@ describe('3p', () => {
   });
 
   describe('validateSrcPrefix()', () => {
-
     it('should throw when a string prefix does not match', () => {
       expect(() => {
         validateSrcPrefix('https:', 'http://example.org');
@@ -73,93 +71,129 @@ describe('3p', () => {
   });
 
   describe('validateData', () => {
-
     it('should check mandatory fields', () => {
-      validateData({
-        width: '',
-        height: false,
-        type: 'taboola',
-        referrer: true,
-        canonicalUrl: true,
-        pageViewId: true,
-        location: true,
-        mode: true,
-      }, []);
-      clock.tick(1);
-
-      validateData({
-        width: '',
-        type: 'taboola',
-        foo: true,
-        bar: true,
-      }, ['foo', 'bar']);
+      validateData(
+        {
+          width: '',
+          height: false,
+          type: 'taboola',
+          referrer: true,
+          canonicalUrl: true,
+          pageViewId: true,
+          location: true,
+          mode: true,
+        },
+        []
+      );
       clock.tick(1);
 
-      allowConsoleError(() => { expect(() => {
-        validateData({
+      validateData(
+        {
           width: '',
-          type: 'xxxxxx',
+          type: 'taboola',
           foo: true,
           bar: true,
-        }, ['foo', 'bar', 'persika']);
-      }).to.throw(/Missing attribute for xxxxxx: persika./); });
+        },
+        ['foo', 'bar']
+      );
+      clock.tick(1);
 
-      allowConsoleError(() => { expect(() => {
-        validateData({
-          width: '',
-          type: 'xxxxxx',
-          foo: true,
-          bar: true,
-        }, [['red', 'green', 'blue']]);
-      }).to.throw(
-          /xxxxxx must contain exactly one of attributes: red, green, blue./);
+      allowConsoleError(() => {
+        expect(() => {
+          validateData(
+            {
+              width: '',
+              type: 'xxxxxx',
+              foo: true,
+              bar: true,
+            },
+            ['foo', 'bar', 'persika']
+          );
+        }).to.throw(/Missing attribute for xxxxxx: persika./);
+      });
+
+      allowConsoleError(() => {
+        expect(() => {
+          validateData(
+            {
+              width: '',
+              type: 'xxxxxx',
+              foo: true,
+              bar: true,
+            },
+            [['red', 'green', 'blue']]
+          );
+        }).to.throw(
+          /xxxxxx must contain exactly one of attributes: red, green, blue./
+        );
       });
     });
 
     it('should check mandatory fields with alternative options', () => {
-      validateData({
-        width: '',
-        type: 'taboola',
-        foo: true,
-        bar: true,
-      }, [['foo', 'day', 'night']]);
+      validateData(
+        {
+          width: '',
+          type: 'taboola',
+          foo: true,
+          bar: true,
+        },
+        [['foo', 'day', 'night']]
+      );
       clock.tick(1);
     });
 
     it('should check optional fields', () => {
-      validateData({
-        width: '',
-        height: false,
-        type: true,
-        referrer: true,
-        canonicalUrl: true,
-        pageViewId: true,
-        location: true,
-        mode: true,
-      }, /* mandatory */[], /* optional */[]);
-
-      validateData({
-        width: '',
-        foo: true,
-        bar: true,
-      }, /* mandatory */[], ['foo', 'bar']);
+      validateData(
+        {
+          width: '',
+          height: false,
+          type: true,
+          referrer: true,
+          canonicalUrl: true,
+          pageViewId: true,
+          location: true,
+          mode: true,
+        },
+        /* mandatory */ [],
+        /* optional */ []
+      );
 
-      allowConsoleError(() => { expect(() => {
-        validateData({
-          type: 'TEST',
+      validateData(
+        {
+          width: '',
           foo: true,
-          'not-whitelisted': true,
-        }, [], ['foo']);
-      }).to.throw(/Unknown attribute for TEST: not-whitelisted./); });
+          bar: true,
+        },
+        /* mandatory */ [],
+        ['foo', 'bar']
+      );
+
+      allowConsoleError(() => {
+        expect(() => {
+          validateData(
+            {
+              type: 'TEST',
+              foo: true,
+              'not-whitelisted': true,
+            },
+            [],
+            ['foo']
+          );
+        }).to.throw(/Unknown attribute for TEST: not-whitelisted./);
+      });
     });
 
     it('should check mandatory and optional fields', () => {
-      validateData({
-        width: '',
-        foo: true,
-        bar: true,
-        halo: 'world',
-      }, [['foo', 'fo'], 'bar'], ['halo']);
+      validateData(
+        {
+          width: '',
+          foo: true,
+          bar: true,
+          halo: 'world',
+        },
+        [['foo', 'fo'], 'bar'],
+        ['halo']
+      );
     });
   });
 
@@ -175,13 +209,16 @@ describe('3p', () => {
 
   it('should run in next tick (setTimeout)', () => {
     let called = 0;
-    nextTick({
-      setTimeout: fn => {
-        fn();
+    nextTick(
+      {
+        setTimeout: fn => {
+          fn();
+        },
       },
-    }, () => {
-      called++;
-    });
+      () => {
+        called++;
+      }
+    );
     expect(called).to.equal(1);
   });
 
@@ -237,7 +274,6 @@ describe('3p', () => {
   });
 
   describe('loadScript', () => {
-
     it('should add <script /> with url to the body', () => {
       const url = 'http://test.com/example.js';
       let s = window.document.body.querySelector(`script[src="${url}"]`);
@@ -248,20 +284,29 @@ describe('3p', () => {
     });
 
     it('should handle onSuccess callback', done => {
-      loadScript(window, 'http://localhost:9876/test/unit/test-3p.js', () => {
-        done();
-      }, () => {
-        done('onError should not be called!');
-      });
+      loadScript(
+        window,
+        'http://localhost:9876/test/unit/test-3p.js',
+        () => {
+          done();
+        },
+        () => {
+          done('onError should not be called!');
+        }
+      );
     });
 
     it('should handle onFailure callback', done => {
-      loadScript(window, 'http://localhost:9876/404', () => {
-        done('onSuccess should not be called');
-      }, () => {
-        done();
-      });
+      loadScript(
+        window,
+        'http://localhost:9876/404',
+        () => {
+          done('onSuccess should not be called');
+        },
+        () => {
+          done();
+        }
+      );
     });
   });
-
 });
diff --git a/test/unit/test-action.js b/test/unit/test-action.js
index 66a9f532c9e7..38fdddba018e 100644
--- a/test/unit/test-action.js
+++ b/test/unit/test-action.js
@@ -34,7 +34,6 @@ import {htmlFor} from '../../src/static-template';
 import {setParentWindow} from '../../src/service';
 import {whenCalled} from '../../testing/test-helper.js';
 
-
 /**
  * @return {!ActionService}
  */
@@ -48,7 +47,6 @@ function actionService() {
   return new ActionService(new AmpDocSingle(win), document);
 }
 
-
 function createExecElement(id, enqueAction, defaultActionAlias) {
   const execElement = document.createElement('amp-element');
   execElement.setAttribute('id', id);
@@ -57,10 +55,16 @@ function createExecElement(id, enqueAction, defaultActionAlias) {
   return execElement;
 }
 
-
-function assertInvocation(inv, node, method, source, caller, opt_event,
-  child, opt_args) {
-
+function assertInvocation(
+  inv,
+  node,
+  method,
+  source,
+  caller,
+  opt_event,
+  child,
+  opt_args
+) {
   expect(inv.node).to.equal(node);
   expect(inv.method).to.equal(method);
   expect(inv.caller).to.equal(caller);
@@ -74,7 +78,6 @@ function assertInvocation(inv, node, method, source, caller, opt_event,
   }
 }
 
-
 describe('ActionService parseAction', () => {
   function parseMultipleActions(s) {
     const actionMap = parseActionMap(s);
@@ -163,7 +166,8 @@ describe('ActionService parseAction', () => {
 
   it('should parse args in more than one action', () => {
     const a = parseMultipleActions(
-        'event1:target1.methodA(key1=value1),target2.methodB(keyA=valueA)');
+      'event1:target1.methodA(key1=value1),target2.methodB(keyA=valueA)'
+    );
     expect(a[0].event).to.equal('event1');
     expect(a[0].target).to.equal('target1');
     expect(a[0].method).to.equal('methodA');
@@ -176,8 +180,9 @@ describe('ActionService parseAction', () => {
 
   it('should parse multiple event types with multiple actions', () => {
     const a = parseActionMap(
-        'event1:foo, baz.firstMethod, corge.secondMethod(keyA=valueA);' +
-        'event2:bar, qux.thirdMethod, grault.fourthMethod(keyB=valueB)');
+      'event1:foo, baz.firstMethod, corge.secondMethod(keyA=valueA);' +
+        'event2:bar, qux.thirdMethod, grault.fourthMethod(keyB=valueB)'
+    );
 
     expect(Object.keys(a)).to.have.length(2);
 
@@ -228,7 +233,8 @@ describe('ActionService parseAction', () => {
 
   it('should parse with multiple args with whitespace', () => {
     const a = parseAction(
-        'event1:target1.method1  (  key1 =  value1  ,  key2 = value2  ) ');
+      'event1:target1.method1  (  key1 =  value1  ,  key2 = value2  ) '
+    );
     expect(a.event).to.equal('event1');
     expect(a.target).to.equal('target1');
     expect(a.method).to.equal('method1');
@@ -254,17 +260,19 @@ describe('ActionService parseAction', () => {
 
   it('should parse with double-quoted args', () => {
     const a = parseAction(
-        'event1:target1.method1(key1=value1, key2 = "value (2)\'")');
+      'event1:target1.method1(key1=value1, key2 = "value (2)\'")'
+    );
     expect(a.event).to.equal('event1');
     expect(a.target).to.equal('target1');
     expect(a.method).to.equal('method1');
     expect(a.args['key1']).to.equal('value1');
-    expect(a.args['key2']).to.equal('value (2)\'');
+    expect(a.args['key2']).to.equal("value (2)'");
   });
 
   it('should parse with single-quoted args', () => {
     const a = parseAction(
-        'event1:target1.method1(key1=value1, key2 = \'value (2)"\')');
+      "event1:target1.method1(key1=value1, key2 = 'value (2)\"')"
+    );
     expect(a.event).to.equal('event1');
     expect(a.target).to.equal('target1');
     expect(a.method).to.equal('method1');
@@ -273,8 +281,7 @@ describe('ActionService parseAction', () => {
   });
 
   it('should parse with args with trailing comma', () => {
-    const a = parseAction(
-        'event1:target1.method1(key1=value1, )');
+    const a = parseAction('event1:target1.method1(key1=value1, )');
     expect(a.event).to.equal('event1');
     expect(a.target).to.equal('target1');
     expect(a.method).to.equal('method1');
@@ -290,7 +297,7 @@ describe('ActionService parseAction', () => {
   it('should parse with numeric args', () => {
     expect(parseAction('e:t.m(k=123)').args['k']).to.equal(123);
     expect(parseAction('e:t.m(k=1.23)').args['k']).to.equal(1.23);
-    expect(parseAction('e:t.m(k=.123)').args['k']).to.equal(.123);
+    expect(parseAction('e:t.m(k=.123)').args['k']).to.equal(0.123);
   });
 
   it('should parse with term semicolon', () => {
@@ -311,8 +318,7 @@ describe('ActionService parseAction', () => {
 
   it('should parse with object literal args', () => {
     const a = parseAction('e:t.m({"foo": {"bar": "qux"}})');
-    expect(a.args[RAW_OBJECT_ARGS_KEY])
-        .to.equal('{"foo": {"bar": "qux"}}');
+    expect(a.args[RAW_OBJECT_ARGS_KEY]).to.equal('{"foo": {"bar": "qux"}}');
   });
 
   it('should parse with expression args', () => {
@@ -324,27 +330,34 @@ describe('ActionService parseAction', () => {
     const a = parseAction('e:t.m(key1=foo.bar)');
     expect(dereferenceArgsVariables(a.args, null)).to.deep.equal({key1: null});
     expect(dereferenceArgsVariables(a.args, {})).to.deep.equal({key1: null});
-    expect(dereferenceArgsVariables(a.args, {foo: null}))
-        .to.deep.equal({key1: null});
+    expect(dereferenceArgsVariables(a.args, {foo: null})).to.deep.equal({
+      key1: null,
+    });
   });
 
   it('should return null for non-primitives in dereferenced args', () => {
     const a = parseAction('e:t.m(key1=foo.bar)');
-    expect(dereferenceArgsVariables(a.args, {foo: {bar: undefined}}))
-        .to.deep.equal({key1: null});
-    expect(dereferenceArgsVariables(a.args, {foo: {bar: {}}}))
-        .to.deep.equal({key1: null});
-    expect(dereferenceArgsVariables(a.args, {foo: {bar: []}}))
-        .to.deep.equal({key1: null});
-    expect(dereferenceArgsVariables(a.args, {foo: {bar: () => {}}}))
-        .to.deep.equal({key1: null});
+    expect(
+      dereferenceArgsVariables(a.args, {foo: {bar: undefined}})
+    ).to.deep.equal({key1: null});
+    expect(dereferenceArgsVariables(a.args, {foo: {bar: {}}})).to.deep.equal({
+      key1: null,
+    });
+    expect(dereferenceArgsVariables(a.args, {foo: {bar: []}})).to.deep.equal({
+      key1: null,
+    });
+    expect(
+      dereferenceArgsVariables(a.args, {foo: {bar: () => {}}})
+    ).to.deep.equal({key1: null});
   });
 
   it('should support event data and opt_args', () => {
     const a = parseAction('e:t.m(key1=foo,key2=x)');
     const event = createCustomEvent(window, 'MyEvent');
-    expect(dereferenceArgsVariables(a.args, event, {x: 'bar'}))
-        .to.deep.equal({key1: 'foo', key2: 'bar'});
+    expect(dereferenceArgsVariables(a.args, event, {x: 'bar'})).to.deep.equal({
+      key1: 'foo',
+      key2: 'bar',
+    });
   });
 
   it('evaluated args should be proto-less objects', () => {
@@ -355,22 +368,23 @@ describe('ActionService parseAction', () => {
 
   it('should dereference arg expressions', () => {
     const a = parseAction('e:t.m(key1=foo)');
-    expect(dereferenceArgsVariables(a.args, null))
-        .to.deep.equal({key1: 'foo'});
+    expect(dereferenceArgsVariables(a.args, null)).to.deep.equal({key1: 'foo'});
   });
 
   it('should dereference arg expressions with an event without data', () => {
     const a = parseAction('e:t.m(key1=foo)');
     const event = createCustomEvent(window, 'MyEvent');
-    expect(dereferenceArgsVariables(a.args, {event}))
-        .to.deep.equal({key1: 'foo'});
+    expect(dereferenceArgsVariables(a.args, {event})).to.deep.equal({
+      key1: 'foo',
+    });
   });
 
   it('should dereference arg expressions with an event with data', () => {
     const a = parseAction('e:t.m(key1=event.foo)');
     const event = createCustomEvent(window, 'MyEvent', {foo: 'bar'});
-    expect(dereferenceArgsVariables(a.args, event))
-        .to.deep.equal({key1: 'bar'});
+    expect(dereferenceArgsVariables(a.args, event)).to.deep.equal({
+      key1: 'bar',
+    });
   });
 
   it('should parse empty to null', () => {
@@ -379,9 +393,11 @@ describe('ActionService parseAction', () => {
   });
 
   it('should fail parse without event', () => {
-    allowConsoleError(() => { expect(() => {
-      parseAction('target1.method1');
-    }).to.throw(/expected \[\:\]/); });
+    allowConsoleError(() => {
+      expect(() => {
+        parseAction('target1.method1');
+      }).to.throw(/expected \[\:\]/);
+    });
   });
 
   it('should fail parse without target', () => {
@@ -471,7 +487,6 @@ describe('ActionService setActions', () => {
 });
 
 describe('Action parseActionMap', () => {
-
   it('should parse with a single action', () => {
     const m = parseActionMap('event1:action1');
     expect(m['event1'][0].target).to.equal('action1');
@@ -497,7 +512,6 @@ describe('Action parseActionMap', () => {
   });
 });
 
-
 describes.sandboxed('Action adoptEmbedWindow', {}, () => {
   let action;
   let embedWin;
@@ -513,15 +527,14 @@ describes.sandboxed('Action adoptEmbedWindow', {}, () => {
 
   it('should create embedded action service', () => {
     ActionService.installInEmbedWindow(embedWin, action.ampdoc);
-    const embedService = embedWin.services.action
-        && embedWin.services.action.obj;
+    const embedService =
+      embedWin.services.action && embedWin.services.action.obj;
     expect(embedService).to.exist;
     expect(embedService.ampdoc).to.equal(action.ampdoc);
     expect(embedService.root_).to.equal(embedWin.document);
   });
 });
 
-
 describe('Action findAction', () => {
   let sandbox;
   let action;
@@ -551,7 +564,6 @@ describe('Action findAction', () => {
     expect(m1).to.equal(m2);
   });
 
-
   it('should find action on the same element', () => {
     const element = document.createElement('div');
     element.setAttribute('on', 'event1:action1');
@@ -645,13 +657,11 @@ describe('Action hasAction', () => {
     expect(action.hasAction(element, 'event2', parent)).to.equal(false);
   });
 
-  it('returns false if the target element does not have the target action',
-      () => {
-        const element = document.createElement('div');
-        element.setAttribute('on', 'event1:action1');
-        expect(action.hasAction(element, 'event2')).to.equal(false);
-      });
-
+  it('returns false if the target element does not have the target action', () => {
+    const element = document.createElement('div');
+    element.setAttribute('on', 'event1:action1');
+    expect(action.hasAction(element, 'event2')).to.equal(false);
+  });
 });
 
 describes.fakeWin('Action hasResolvableAction', {amp: true}, env => {
@@ -663,47 +673,60 @@ describes.fakeWin('Action hasResolvableAction', {amp: true}, env => {
     action = new ActionService(env.ampdoc, env.win.document);
 
     // Insert element for valid actions to be resolved.
-    env.win.document.body.appendChild(html`<div id="valid-target"></div>`);
+    env.win.document.body.appendChild(
+      html`
+        <div id="valid-target"></div>
+      `
+    );
   });
 
   it('returns true if the target element exists (single)', () => {
-    const element = html`<div on="event1: valid-target"></div>`;
+    const element = html`
+      <div on="event1: valid-target"></div>
+    `;
     expect(action.hasResolvableAction(element, 'event1')).to.equal(true);
   });
 
   it('returns true if the target element exists (action up the tree)', () => {
-    const wrapper = html`<div on="event1: valid-target"></div>`;
-    const child = html`<div></div>`;
+    const wrapper = html`
+      <div on="event1: valid-target"></div>
+    `;
+    const child = html`
+      <div></div>
+    `;
     wrapper.appendChild(child);
     expect(action.hasResolvableAction(child, 'event1')).to.equal(true);
   });
 
   it('returns true if the target element exists (one amongst many)', () => {
-    const element =
-      html`<div on="event1: i-dont-exist, valid-target, i-dont-exist-either">
-      </div>`;
+    const element = html`
+      <div on="event1: i-dont-exist, valid-target, i-dont-exist-either"></div>
+    `;
     expect(action.hasResolvableAction(element, 'event1')).to.equal(true);
   });
 
   it('returns false if the target element does not exist (one)', () => {
-    const element = html`<div on="event1: i-do-not-exist"></div>`;
+    const element = html`
+      <div on="event1: i-do-not-exist"></div>
+    `;
     expect(action.hasResolvableAction(element, 'event1')).to.equal(false);
   });
 
   it('returns false if the target element does not exist (multiple)', () => {
-    const element =
-      html`<div on="event1: i-do-not-exist, i-dont-exist-either"></div>`;
+    const element = html`
+      <div on="event1: i-do-not-exist, i-dont-exist-either"></div>
+    `;
     expect(action.hasResolvableAction(element, 'event1')).to.equal(false);
   });
 
   it('returns false if target element does not have the target action', () => {
-    const element = html`<div on="event1: valid-target"></div>`;
+    const element = html`
+      <div on="event1: valid-target"></div>
+    `;
     expect(action.hasResolvableAction(element, 'event2')).to.equal(false);
   });
-
 });
 
-
 describe('Action method', () => {
   let sandbox;
   let action;
@@ -736,8 +759,16 @@ describe('Action method', () => {
   });
 
   it('should invoke on the AMP element', () => {
-    action.invoke_(new ActionInvocation(execElement, 'method1', /* args */ null,
-        'source1', 'caller1', 'event1'));
+    action.invoke_(
+      new ActionInvocation(
+        execElement,
+        'method1',
+        /* args */ null,
+        'source1',
+        'caller1',
+        'event1'
+      )
+    );
     expect(onEnqueue).to.be.calledOnce;
     const inv = onEnqueue.getCall(0).args[0];
     expect(inv.node).to.equal(execElement);
@@ -749,8 +780,16 @@ describe('Action method', () => {
   });
 
   it('should invoke on the AMP element with args', () => {
-    action.invoke_(new ActionInvocation(execElement, 'method1', {'key1': 11},
-        'source1', 'caller1', 'event1'));
+    action.invoke_(
+      new ActionInvocation(
+        execElement,
+        'method1',
+        {'key1': 11},
+        'source1',
+        'caller1',
+        'event1'
+      )
+    );
     expect(onEnqueue).to.be.calledOnce;
     const inv = onEnqueue.getCall(0).args[0];
     expect(inv.node).to.equal(execElement);
@@ -762,18 +801,36 @@ describe('Action method', () => {
   });
 
   it('should not allow invoke on non-AMP and non-whitelisted element', () => {
-    allowConsoleError(() => { expect(() => {
-      action.invoke_(new ActionInvocation(document.createElement('img'),
-          'method1', /* args */ null, 'source1', 'event1'));
-    }).to.throw(/doesn't support "method1" action/); });
+    allowConsoleError(() => {
+      expect(() => {
+        action.invoke_(
+          new ActionInvocation(
+            document.createElement('img'),
+            'method1',
+            /* args */ null,
+            'source1',
+            'event1'
+          )
+        );
+      }).to.throw(/doesn't support "method1" action/);
+    });
     expect(onEnqueue).to.have.not.been.called;
   });
 
   it('should not allow invoke on unresolved AMP element', () => {
-    allowConsoleError(() => { expect(() => {
-      action.invoke_(new ActionInvocation(document.createElement('amp-foo'),
-          'method1', /* args */ null, 'source1', 'event1'));
-    }).to.throw(/Unrecognized AMP element/); });
+    allowConsoleError(() => {
+      expect(() => {
+        action.invoke_(
+          new ActionInvocation(
+            document.createElement('amp-foo'),
+            'method1',
+            /* args */ null,
+            'source1',
+            'event1'
+          )
+        );
+      }).to.throw(/Unrecognized AMP element/);
+    });
     expect(onEnqueue).to.have.not.been.called;
   });
 
@@ -806,7 +863,9 @@ describe('Action method', () => {
       ampActionMacro = document.createElement('amp-action-macro');
       ampActionMacro.setAttribute('id', id);
       ampActionMacro.setAttribute(
-          'execute', 'action-macro-id.method(realArgName=arg1)');
+        'execute',
+        'action-macro-id.method(realArgName=arg1)'
+      );
       ampActionMacro.setAttribute('arguments', 'arg1');
       document.body.appendChild(ampActionMacro);
     });
@@ -814,16 +873,32 @@ describe('Action method', () => {
     it('should invoke proper action', () => {
       // Given that an amp action macro is triggered.
       const invoke_ = sandbox.stub(action, 'invoke_');
-      sandbox.stub(action.root_, 'getElementById')
-          .withArgs('action-macro-id').returns(ampActionMacro);
-      action.trigger(ampActionMacro, 'tap', null, ActionTrust.HIGH,
-          /* opt_args */ {arg1: 'realArgValue'});
+      sandbox
+        .stub(action.root_, 'getElementById')
+        .withArgs('action-macro-id')
+        .returns(ampActionMacro);
+      action.trigger(
+        ampActionMacro,
+        'tap',
+        null,
+        ActionTrust.HIGH,
+        /* opt_args */ {arg1: 'realArgValue'}
+      );
 
       return whenCalled(invoke_).then(() => {
         expect(action.invoke_).to.have.been.calledOnce;
         const invocation = action.invoke_.getCall(0).args[0];
-        const {actionEventType, args, method, node, source, caller, event,
-          tagOrTarget, trust} = invocation;
+        const {
+          actionEventType,
+          args,
+          method,
+          node,
+          source,
+          caller,
+          event,
+          tagOrTarget,
+          trust,
+        } = invocation;
         expect(node).to.equal(ampActionMacro);
         expect(caller).to.equal(ampActionMacro);
         expect(event).to.be.null;
@@ -856,8 +931,17 @@ describe('installActionHandler', () => {
     const handlerSpy = sandbox.spy();
     const target = document.createElement('form');
     action.installActionHandler(target, handlerSpy);
-    action.invoke_(new ActionInvocation(target, 'submit', /* args */ null,
-        'button', 'button', 'tap', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'submit',
+        /* args */ null,
+        'button',
+        'button',
+        'tap',
+        ActionTrust.HIGH
+      )
+    );
     expect(handlerSpy).to.be.calledOnce;
     const callArgs = handlerSpy.getCall(0).args[0];
     expect(callArgs.node).to.be.equal(target);
@@ -874,8 +958,15 @@ describe('installActionHandler', () => {
     const target = document.createElement('form');
     action.installActionHandler(target, handlerSpy);
 
-    const invocation = new ActionInvocation(target, 'submit', /* args */ null,
-        'button', 'button', 'tapEvent', ActionTrust.HIGH);
+    const invocation = new ActionInvocation(
+      target,
+      'submit',
+      /* args */ null,
+      'button',
+      'button',
+      'tapEvent',
+      ActionTrust.HIGH
+    );
     action.invoke_(invocation);
     expect(handlerSpy).to.be.calledOnce;
 
@@ -921,26 +1012,42 @@ describe('Multiple handlers action method', () => {
   it('should trigger event', () => {
     action.trigger(child, 'tap', null);
     expect(onEnqueue1).to.be.calledOnce;
-    assertInvocation(onEnqueue1.getCall(0).args[0], execElement1, 'method1',
-        child, targetElement);
-    assertInvocation(onEnqueue2.getCall(0).args[0], execElement2, 'method2',
-        child, targetElement);
+    assertInvocation(
+      onEnqueue1.getCall(0).args[0],
+      execElement1,
+      'method1',
+      child,
+      targetElement
+    );
+    assertInvocation(
+      onEnqueue2.getCall(0).args[0],
+      execElement2,
+      'method2',
+      child,
+      targetElement
+    );
   });
 
   it('should chain asynchronous actions', () => {
     let resolveAbc;
-    const promiseAbc = new Promise(resolve => { resolveAbc = resolve; });
+    const promiseAbc = new Promise(resolve => {
+      resolveAbc = resolve;
+    });
     const abc = sandbox.stub().returns(promiseAbc);
     action.addGlobalTarget('ABC', abc);
 
     let resolveXyz;
-    const promiseXyz = new Promise(resolve => { resolveXyz = resolve; });
+    const promiseXyz = new Promise(resolve => {
+      resolveXyz = resolve;
+    });
     const xyz = sandbox.stub().returns(promiseXyz);
     action.addGlobalTarget('XYZ', xyz);
 
     const element = document.createElement('target');
-    element.setAttribute('on',
-        'tap:ABC.abc, foo.method1, XYZ.xyz, bar.method2');
+    element.setAttribute(
+      'on',
+      'tap:ABC.abc, foo.method1, XYZ.xyz, bar.method2'
+    );
     parent.appendChild(element);
 
     action.trigger(element, 'tap', null);
@@ -955,24 +1062,25 @@ describe('Multiple handlers action method', () => {
     const macroTask = () => new Promise(resolve => setTimeout(resolve, 0));
 
     resolveAbc();
-    return macroTask().then(() => {
-      expect(abc).calledOnce;
-      expect(onEnqueue1).calledOnce;
-      expect(xyz).calledOnce;
-      expect(onEnqueue2).to.not.have.been.called;
-
-      resolveXyz();
-      return macroTask();
-    }).then(() => {
-      expect(abc).calledOnce;
-      expect(onEnqueue1).calledOnce;
-      expect(xyz).calledOnce;
-      expect(onEnqueue2).calledOnce;
-    });
+    return macroTask()
+      .then(() => {
+        expect(abc).calledOnce;
+        expect(onEnqueue1).calledOnce;
+        expect(xyz).calledOnce;
+        expect(onEnqueue2).to.not.have.been.called;
+
+        resolveXyz();
+        return macroTask();
+      })
+      .then(() => {
+        expect(abc).calledOnce;
+        expect(onEnqueue1).calledOnce;
+        expect(xyz).calledOnce;
+        expect(onEnqueue2).calledOnce;
+      });
   });
 });
 
-
 describe('Action interceptor', () => {
   let sandbox;
   let clock;
@@ -999,16 +1107,31 @@ describe('Action interceptor', () => {
     return target['__AMP_ACTION_HANDLER__'];
   }
 
-
   it('should not initialize until called', () => {
     expect(getQueue()).to.be.undefined;
   });
 
   it('should queue actions', () => {
-    action.invoke_(new ActionInvocation(target, 'method1', /* args */ null,
-        'source1', 'caller1', 'event1'));
-    action.invoke_(new ActionInvocation(target, 'method2', /* args */ null,
-        'source2', 'caller2', 'event2'));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'method1',
+        /* args */ null,
+        'source1',
+        'caller1',
+        'event1'
+      )
+    );
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'method2',
+        /* args */ null,
+        'source2',
+        'caller2',
+        'event2'
+      )
+    );
 
     const queue = getQueue();
     expect(Array.isArray(queue)).to.be.true;
@@ -1030,10 +1153,28 @@ describe('Action interceptor', () => {
   });
 
   it('should dequeue actions after handler set', () => {
-    action.invoke_(new ActionInvocation(target, 'method1', /* args */ null,
-        'source1', 'caller1', 'event1', ActionTrust.HIGH));
-    action.invoke_(new ActionInvocation(target, 'method2', /* args */ null,
-        'source2', 'caller2', 'event2', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'method1',
+        /* args */ null,
+        'source1',
+        'caller1',
+        'event1',
+        ActionTrust.HIGH
+      )
+    );
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'method2',
+        /* args */ null,
+        'source2',
+        'caller2',
+        'event2',
+        ActionTrust.HIGH
+      )
+    );
 
     expect(Array.isArray(getQueue())).to.be.true;
     expect(getActionHandler()).to.be.undefined;
@@ -1061,8 +1202,17 @@ describe('Action interceptor', () => {
     expect(inv1.caller).to.equal('caller2');
     expect(inv1.event).to.equal('event2');
 
-    action.invoke_(new ActionInvocation(target, 'method3', /* args */ null,
-        'source3', 'caller3', 'event3', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'method3',
+        /* args */ null,
+        'source3',
+        'caller3',
+        'event3',
+        ActionTrust.HIGH
+      )
+    );
     expect(handler).to.have.callCount(3);
     const inv2 = handler.getCall(2).args[0];
     expect(inv2.node).to.equal(target);
@@ -1073,7 +1223,6 @@ describe('Action interceptor', () => {
   });
 });
 
-
 describe('Action common handler', () => {
   let sandbox;
   let action;
@@ -1098,13 +1247,31 @@ describe('Action common handler', () => {
     action.addGlobalMethodHandler('action1', action1);
     action.addGlobalMethodHandler('action2', action2);
 
-    action.invoke_(new ActionInvocation(target, 'action1', /* args */ null,
-        'source1', 'caller1', 'event1', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'action1',
+        /* args */ null,
+        'source1',
+        'caller1',
+        'event1',
+        ActionTrust.HIGH
+      )
+    );
     expect(action1).to.be.calledOnce;
     expect(action2).to.have.not.been.called;
 
-    action.invoke_(new ActionInvocation(target, 'action2', /* args */ null,
-        'source2', 'caller2', 'event2', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'action2',
+        /* args */ null,
+        'source2',
+        'caller2',
+        'event2',
+        ActionTrust.HIGH
+      )
+    );
     expect(action2).to.be.calledOnce;
     expect(action1).to.be.calledOnce;
 
@@ -1115,19 +1282,36 @@ describe('Action common handler', () => {
     const handler = sandbox.spy();
     action.addGlobalMethodHandler('foo', handler, ActionTrust.HIGH);
 
-    action.invoke_(new ActionInvocation(target, 'foo', /* args */ null,
-        'source1', 'caller1', 'event1', ActionTrust.HIGH));
+    action.invoke_(
+      new ActionInvocation(
+        target,
+        'foo',
+        /* args */ null,
+        'source1',
+        'caller1',
+        'event1',
+        ActionTrust.HIGH
+      )
+    );
     expect(handler).to.be.calledOnce;
 
     return allowConsoleError(() => {
-      action.invoke_(new ActionInvocation(target, 'foo', /* args */ null,
-          'source1', 'caller1', 'event1', ActionTrust.LOW));
+      action.invoke_(
+        new ActionInvocation(
+          target,
+          'foo',
+          /* args */ null,
+          'source1',
+          'caller1',
+          'event1',
+          ActionTrust.LOW
+        )
+      );
       expect(handler).to.be.calledOnce;
     });
   });
 });
 
-
 describes.sandboxed('Action global target', {}, () => {
   let action;
 
@@ -1147,8 +1331,15 @@ describes.sandboxed('Action global target', {}, () => {
     action.trigger(element, 'tap', event);
     expect(target2).to.not.be.called;
     expect(target1).to.be.calledOnce;
-    assertInvocation(target1.args[0][0], document, 'action1', element, element,
-        event, {a: 'b'});
+    assertInvocation(
+      target1.args[0][0],
+      document,
+      'action1',
+      element,
+      element,
+      event,
+      {a: 'b'}
+    );
 
     const element2 = document.createElement('div');
     element2.setAttribute('on', 'tap:target2.action1');
@@ -1167,12 +1358,18 @@ describes.sandboxed('Action global target', {}, () => {
     action.trigger(element4, 'tap', event);
     expect(target2).to.be.calledThrice;
     expect(target1).to.be.calledThrice;
-    assertInvocation(target2.args[2][0], document, 'action2', element4,
-        element4, event, {x: 'y'});
+    assertInvocation(
+      target2.args[2][0],
+      document,
+      'action2',
+      element4,
+      element4,
+      event,
+      {x: 'y'}
+    );
   });
 });
 
-
 describes.fakeWin('Core events', {amp: true}, env => {
   let sandbox;
   let window;
@@ -1211,77 +1408,102 @@ describes.fakeWin('Core events', {amp: true}, env => {
     expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
   });
 
-  it('should trigger tap event on key press if focused element has ' +
-     'role=button', () => {
-    action.trigger.returns(false);
-    expect(window.document.addEventListener).to.have.been.calledWith(
-        'keydown');
-    const handler = window.document.addEventListener.getCall(1).args[1];
-    const element = document.createElement('div');
-    element.setAttribute('role', 'button');
-    const event = {
-      target: element,
-      key: Keys.ENTER,
-      preventDefault: sandbox.stub()};
-    handler(event);
-    expect(event.preventDefault).to.not.have.been.called;
-    expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
-  });
-
-  it('should trigger tap event and prevent default on key press if focused ' +
-     'element has role=button and has an action invoked', () => {
-    expect(window.document.addEventListener).to.have.been.calledWith(
-        'keydown');
-    const handler = window.document.addEventListener.getCall(1).args[1];
-    const element = document.createElement('div');
-    element.setAttribute('role', 'button');
-    const event = {
-      target: element,
-      key: Keys.ENTER,
-      preventDefault: sandbox.stub()};
-    handler(event);
-    // Expect prevent default to have been called.
-    expect(event.preventDefault).to.have.been.called;
-    expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
-  });
-
-  it('should trigger tap event on key press if focused element has ' +
-     'role=option', () => {
-    action.trigger.returns(false);
-    expect(window.document.addEventListener).to.have.been.calledWith(
-        'keydown');
-    const handler = window.document.addEventListener.getCall(1).args[1];
-    const element = document.createElement('div');
-    element.setAttribute('role', 'option');
-    const event = {
-      target: element,
-      key: Keys.ENTER,
-      preventDefault: sandbox.stub()};
-    handler(event);
-    expect(event.preventDefault).to.not.have.been.called;
-    expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
-  });
-
-  it('should NOT trigger tap event on key press if focused element DOES NOT ' +
-     'have role=button', () => {
-    expect(window.document.addEventListener).to.have.been.calledWith('keydown');
-    const handler = window.document.addEventListener.getCall(1).args[1];
-    const element = document.createElement('div');
-    element.setAttribute('role', 'not-a-button');
-    const event = {target: element, key: Keys.ENTER};
-    handler(event);
-    expect(action.trigger).to.not.have.been.called;
-  });
-
-  it('should NOT trigger tap event on key press if focused element DOES NOT ' +
-     'have any role', () => {
-    expect(window.document.addEventListener).to.have.been.calledWith('keydown');
-    const handler = window.document.addEventListener.getCall(1).args[1];
-    const element = document.createElement('input');
-    const event = {target: element, key: Keys.ENTER};
-    handler(event);
-    expect(action.trigger).to.not.have.been.called;
-  });
+  it(
+    'should trigger tap event on key press if focused element has ' +
+      'role=button',
+    () => {
+      action.trigger.returns(false);
+      expect(window.document.addEventListener).to.have.been.calledWith(
+        'keydown'
+      );
+      const handler = window.document.addEventListener.getCall(1).args[1];
+      const element = document.createElement('div');
+      element.setAttribute('role', 'button');
+      const event = {
+        target: element,
+        key: Keys.ENTER,
+        preventDefault: sandbox.stub(),
+      };
+      handler(event);
+      expect(event.preventDefault).to.not.have.been.called;
+      expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
+    }
+  );
+
+  it(
+    'should trigger tap event and prevent default on key press if focused ' +
+      'element has role=button and has an action invoked',
+    () => {
+      expect(window.document.addEventListener).to.have.been.calledWith(
+        'keydown'
+      );
+      const handler = window.document.addEventListener.getCall(1).args[1];
+      const element = document.createElement('div');
+      element.setAttribute('role', 'button');
+      const event = {
+        target: element,
+        key: Keys.ENTER,
+        preventDefault: sandbox.stub(),
+      };
+      handler(event);
+      // Expect prevent default to have been called.
+      expect(event.preventDefault).to.have.been.called;
+      expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
+    }
+  );
+
+  it(
+    'should trigger tap event on key press if focused element has ' +
+      'role=option',
+    () => {
+      action.trigger.returns(false);
+      expect(window.document.addEventListener).to.have.been.calledWith(
+        'keydown'
+      );
+      const handler = window.document.addEventListener.getCall(1).args[1];
+      const element = document.createElement('div');
+      element.setAttribute('role', 'option');
+      const event = {
+        target: element,
+        key: Keys.ENTER,
+        preventDefault: sandbox.stub(),
+      };
+      handler(event);
+      expect(event.preventDefault).to.not.have.been.called;
+      expect(action.trigger).to.have.been.calledWith(element, 'tap', event);
+    }
+  );
+
+  it(
+    'should NOT trigger tap event on key press if focused element DOES NOT ' +
+      'have role=button',
+    () => {
+      expect(window.document.addEventListener).to.have.been.calledWith(
+        'keydown'
+      );
+      const handler = window.document.addEventListener.getCall(1).args[1];
+      const element = document.createElement('div');
+      element.setAttribute('role', 'not-a-button');
+      const event = {target: element, key: Keys.ENTER};
+      handler(event);
+      expect(action.trigger).to.not.have.been.called;
+    }
+  );
+
+  it(
+    'should NOT trigger tap event on key press if focused element DOES NOT ' +
+      'have any role',
+    () => {
+      expect(window.document.addEventListener).to.have.been.calledWith(
+        'keydown'
+      );
+      const handler = window.document.addEventListener.getCall(1).args[1];
+      const element = document.createElement('input');
+      const event = {target: element, key: Keys.ENTER};
+      handler(event);
+      expect(action.trigger).to.not.have.been.called;
+    }
+  );
 
   it('should trigger submit event', () => {
     expect(window.document.addEventListener).to.have.been.calledWith('submit');
@@ -1310,10 +1532,12 @@ describes.fakeWin('Core events', {amp: true}, env => {
     const event = {target: element};
     handler(event);
     expect(action.trigger).to.have.been.calledWith(
-        element,
-        'change',
-        sinon.match(object =>
-          object.detail.checked && object.detail.value == 'foo'));
+      element,
+      'change',
+      sinon.match(
+        object => object.detail.checked && object.detail.value == 'foo'
+      )
+    );
   });
 
   it('should trigger change event for <input type="range"> elements', () => {
@@ -1326,13 +1550,15 @@ describes.fakeWin('Core events', {amp: true}, env => {
     const event = {target: element};
     handler(event);
     expect(action.trigger).to.have.been.calledWith(
-        element,
-        'change',
-        sinon.match(e => {
-          const {min, max, value, valueAsNumber} = e.detail;
-          return min === '0' && max === '10' && value === '5'
-              && valueAsNumber === 5;
-        }));
+      element,
+      'change',
+      sinon.match(e => {
+        const {min, max, value, valueAsNumber} = e.detail;
+        return (
+          min === '0' && max === '10' && value === '5' && valueAsNumber === 5
+        );
+      })
+    );
   });
 
   it('should trigger change event for <input type="search"> elements', () => {
@@ -1343,16 +1569,16 @@ describes.fakeWin('Core events', {amp: true}, env => {
     const event = {target: element};
     handler(event);
     expect(action.trigger).to.have.been.calledWith(
-        element,
-        'change',
-        sinon.match(e => e.detail.value == 'foo'));
+      element,
+      'change',
+      sinon.match(e => e.detail.value == 'foo')
+    );
   });
 
   it('should trigger change event with details for <select> elements', () => {
     const handler = window.document.addEventListener.getCall(3).args[1];
     const element = document.createElement('select');
-    element.innerHTML =
-        `<option value="foo"></option>
+    element.innerHTML = `<option value="foo"></option>
         <option value="bar"></option>
         <option value="qux"></option>`;
     element.selectedIndex = 2;
@@ -1360,12 +1586,13 @@ describes.fakeWin('Core events', {amp: true}, env => {
     handler(event);
 
     expect(action.trigger).to.have.been.calledWith(
-        element,
-        'change',
-        sinon.match(object => {
-          const {detail} = object;
-          return detail.value == 'qux';
-        }));
+      element,
+      'change',
+      sinon.match(object => {
+        const {detail} = object;
+        return detail.value == 'qux';
+      })
+    );
   });
 
   it('should trigger change event with details for <textarea> elements', () => {
@@ -1376,12 +1603,13 @@ describes.fakeWin('Core events', {amp: true}, env => {
     handler(event);
 
     expect(action.trigger).to.have.been.calledWith(
-        element,
-        'change',
-        sinon.match(object => {
-          const {detail} = object;
-          return detail.value == 'foo';
-        }));
+      element,
+      'change',
+      sinon.match(object => {
+        const {detail} = object;
+        return detail.value == 'foo';
+      })
+    );
   });
 
   it('should trigger input-debounced event on input', () => {
@@ -1397,12 +1625,13 @@ describes.fakeWin('Core events', {amp: true}, env => {
 
     return triggerPromise.then(() => {
       expect(action.trigger).to.have.been.calledWith(
-          element,
-          'input-debounced',
-          sinon.match(event => {
-            const {value} = event.target;
-            return value == 'foo bar baz';
-          }));
+        element,
+        'input-debounced',
+        sinon.match(event => {
+          const {value} = event.target;
+          return value == 'foo bar baz';
+        })
+      );
     });
   });
 
@@ -1419,12 +1648,13 @@ describes.fakeWin('Core events', {amp: true}, env => {
 
     return triggerPromise.then(() => {
       expect(action.trigger).to.have.been.calledWith(
-          element,
-          'input-throttled',
-          sinon.match(event => {
-            const {value} = event.target;
-            return value == 'foo bar baz';
-          }));
+        element,
+        'input-throttled',
+        sinon.match(event => {
+          const {value} = event.target;
+          return value == 'foo bar baz';
+        })
+      );
     });
   });
 
@@ -1466,112 +1696,190 @@ describes.fakeWin('Core events', {amp: true}, env => {
   });
 });
 
-describes.realWin('Action whitelisting', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'Action whitelisting',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let action;
-  let target;
-  let spy;
-  let getDefaultActionAlias;
-  beforeEach(() => {
-    spy = env.sandbox.spy();
-    getDefaultActionAlias = env.sandbox.stub();
-    target = createExecElement('foo', spy, getDefaultActionAlias);
-  });
-  describe('with non-empty whitelist', () => {
+  env => {
+    let action;
+    let target;
+    let spy;
+    let getDefaultActionAlias;
     beforeEach(() => {
-      const meta = createElementWithAttributes(env.win.document, 'meta', {
-        name: 'amp-action-whitelist',
-        content: 'AMP.pushState, AMP.setState, *.show, '
-            + 'amp-element.defaultAction',
-      });
-      env.win.document.head.appendChild(meta);
-      action = new ActionService(env.ampdoc, env.win.document);
+      spy = env.sandbox.spy();
+      getDefaultActionAlias = env.sandbox.stub();
+      target = createExecElement('foo', spy, getDefaultActionAlias);
     });
+    describe('with non-empty whitelist', () => {
+      beforeEach(() => {
+        const meta = createElementWithAttributes(env.win.document, 'meta', {
+          name: 'amp-action-whitelist',
+          content:
+            'AMP.pushState, AMP.setState, *.show, ' +
+            'amp-element.defaultAction',
+        });
+        env.win.document.head.appendChild(meta);
+        action = new ActionService(env.ampdoc, env.win.document);
+      });
 
-    it('should allow whitelisted actions', () => {
-      const i = new ActionInvocation(target, 'setState', /* args */ null,
-          'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'AMP');
-      action.invoke_(i);
-      expect(spy).to.be.calledWithExactly(i);
-    });
+      it('should allow whitelisted actions', () => {
+        const i = new ActionInvocation(
+          target,
+          'setState',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'tap',
+          'AMP'
+        );
+        action.invoke_(i);
+        expect(spy).to.be.calledWithExactly(i);
+      });
 
-    it('should allow whitelisted actions case insensitive', () => {
-      const i = new ActionInvocation(target, 'setState', /* args */ null,
-          'source', 'caller', 'event', ActionTrust.HIGH, 'TAP', 'amp');
-      action.invoke_(i);
-      expect(spy).to.be.calledWithExactly(i);
-    });
+      it('should allow whitelisted actions case insensitive', () => {
+        const i = new ActionInvocation(
+          target,
+          'setState',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'TAP',
+          'amp'
+        );
+        action.invoke_(i);
+        expect(spy).to.be.calledWithExactly(i);
+      });
 
-    it('should whitelist default actions if alias is registered default',
-        () => {
-          // Given that 'defaultAction' is a registered default action.
-          getDefaultActionAlias.returns('defaultAction');
-          // Expect the 'activate' call to invoke it.
-          const i = new ActionInvocation(target, 'activate', /* args */ null,
-              'source', 'caller', 'event', ActionTrust.HIGH, 'tap', null);
-          action.invoke_(i);
-          expect(spy).to.be.calledWithExactly(i);
-        });
+      it('should whitelist default actions if alias is registered default', () => {
+        // Given that 'defaultAction' is a registered default action.
+        getDefaultActionAlias.returns('defaultAction');
+        // Expect the 'activate' call to invoke it.
+        const i = new ActionInvocation(
+          target,
+          'activate',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'tap',
+          null
+        );
+        action.invoke_(i);
+        expect(spy).to.be.calledWithExactly(i);
+      });
 
-    it('should allow whitelisted actions with wildcard target', () => {
-      const i = new ActionInvocation(target, 'show', /* args */ null,
-          'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'DIV');
-      action.invoke_(i);
-      expect(spy).to.be.calledWithExactly(i);
+      it('should allow whitelisted actions with wildcard target', () => {
+        const i = new ActionInvocation(
+          target,
+          'show',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'tap',
+          'DIV'
+        );
+        action.invoke_(i);
+        expect(spy).to.be.calledWithExactly(i);
+      });
+
+      it('should not allow non-whitelisted actions', () => {
+        const i = new ActionInvocation(
+          target,
+          'print',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'tap',
+          'AMP'
+        );
+        sandbox.stub(action, 'error_');
+        expect(action.invoke_(i)).to.be.null;
+        expect(action.error_).to.be.calledWith(
+          '"AMP.print" is not whitelisted ' +
+            '[{"tagOrTarget":"AMP","method":"pushState"},' +
+            '{"tagOrTarget":"AMP","method":"setState"},' +
+            '{"tagOrTarget":"*","method":"show"},' +
+            '{"tagOrTarget":"amp-element","method":"defaultAction"}].'
+        );
+      });
+
+      it('should allow adding actions to the whitelist', () => {
+        const i = new ActionInvocation(
+          target,
+          'print',
+          /* args */ null,
+          'source',
+          'caller',
+          'event',
+          ActionTrust.HIGH,
+          'tap',
+          'AMP'
+        );
+        action.addToWhitelist('AMP', 'print');
+        action.invoke_(i);
+        expect(spy).to.be.calledWithExactly(i);
+      });
     });
 
-    it('should not allow non-whitelisted actions', () => {
-      const i = new ActionInvocation(target, 'print', /* args */ null,
-          'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'AMP');
+    it('should not allow any action with empty string whitelist', () => {
+      const meta = createElementWithAttributes(env.win.document, 'meta', {
+        name: 'amp-action-whitelist',
+        content: '',
+      });
+      env.win.document.head.appendChild(meta);
+      action = new ActionService(env.ampdoc, env.win.document);
+      const i = new ActionInvocation(
+        target,
+        'print',
+        /* args */ null,
+        'source',
+        'caller',
+        'event',
+        ActionTrust.HIGH,
+        'tap',
+        'AMP'
+      );
       sandbox.stub(action, 'error_');
       expect(action.invoke_(i)).to.be.null;
-      expect(action.error_).to.be.calledWith('"AMP.print" is not whitelisted ' +
-          '[{"tagOrTarget":"AMP","method":"pushState"},' +
-          '{"tagOrTarget":"AMP","method":"setState"},' +
-          '{"tagOrTarget":"*","method":"show"},' +
-          '{"tagOrTarget":"amp-element","method":"defaultAction"}].');
+      expect(action.error_).to.be.calledWith(
+        '"AMP.print" is not whitelisted [].'
+      );
     });
 
-    it('should allow adding actions to the whitelist', () => {
-      const i = new ActionInvocation(target, 'print', /* args */ null,
-          'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'AMP');
-      action.addToWhitelist('AMP', 'print');
+    it('should ignore unparseable whitelist entries', () => {
+      const meta = createElementWithAttributes(env.win.document, 'meta', {
+        name: 'amp-action-whitelist',
+        content: 'AMP.pushState, invalidEntry, AMP.setState, *.show',
+      });
+      env.win.document.head.appendChild(meta);
+      allowConsoleError(() => {
+        action = new ActionService(env.ampdoc, env.win.document);
+      });
+      const i = new ActionInvocation(
+        target,
+        'setState',
+        /* args */ null,
+        'source',
+        'caller',
+        'event',
+        ActionTrust.HIGH,
+        'tap',
+        'AMP'
+      );
       action.invoke_(i);
       expect(spy).to.be.calledWithExactly(i);
     });
-  });
-
-  it('should not allow any action with empty string whitelist', () => {
-    const meta = createElementWithAttributes(env.win.document, 'meta', {
-      name: 'amp-action-whitelist',
-      content: '',
-    });
-    env.win.document.head.appendChild(meta);
-    action = new ActionService(env.ampdoc, env.win.document);
-    const i = new ActionInvocation(target, 'print', /* args */ null,
-        'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'AMP');
-    sandbox.stub(action, 'error_');
-    expect(action.invoke_(i)).to.be.null;
-    expect(action.error_).to.be.calledWith(
-        '"AMP.print" is not whitelisted [].');
-  });
-
-  it('should ignore unparseable whitelist entries', () => {
-    const meta = createElementWithAttributes(env.win.document, 'meta', {
-      name: 'amp-action-whitelist',
-      content: 'AMP.pushState, invalidEntry, AMP.setState, *.show',
-    });
-    env.win.document.head.appendChild(meta);
-    allowConsoleError(() => {
-      action = new ActionService(env.ampdoc, env.win.document);
-    });
-    const i = new ActionInvocation(target, 'setState', /* args */ null,
-        'source', 'caller', 'event', ActionTrust.HIGH, 'tap', 'AMP');
-    action.invoke_(i);
-    expect(spy).to.be.calledWithExactly(i);
-  });
-
-});
+  }
+);
diff --git a/test/unit/test-activity.js b/test/unit/test-activity.js
index 377e8772c54e..4adb232a6688 100644
--- a/test/unit/test-activity.js
+++ b/test/unit/test-activity.js
@@ -17,23 +17,16 @@
 import {AmpDocSingle} from '../../src/service/ampdoc-impl';
 import {Observable} from '../../src/observable';
 import {Services} from '../../src/services';
-import {
-  installActivityServiceForTesting,
-} from '../../extensions/amp-analytics/0.1/activity-impl';
+import {installActivityServiceForTesting} from '../../extensions/amp-analytics/0.1/activity-impl';
 import {installDocumentStateService} from '../../src/service/document-state';
 import {installPlatformService} from '../../src/service/platform-impl';
 import {installTimerService} from '../../src/service/timer-impl';
 import {installViewerServiceForDoc} from '../../src/service/viewer-impl';
-import {
-  installViewportServiceForDoc,
-} from '../../src/service/viewport/viewport-impl';
+import {installViewportServiceForDoc} from '../../src/service/viewport/viewport-impl';
 import {installVsyncService} from '../../src/service/vsync-impl';
-import {
-  markElementScheduledForTesting,
-} from '../../src/service/custom-element-registry';
+import {markElementScheduledForTesting} from '../../src/service/custom-element-registry';
 
 describe('Activity getTotalEngagedTime', () => {
-
   let sandbox;
   let clock;
   let fakeDoc;
@@ -102,10 +95,12 @@ describe('Activity getTotalEngagedTime', () => {
     fakeDoc.head.defaultView = fakeWin;
 
     ampdoc = new AmpDocSingle(fakeWin);
-    fakeWin.services['ampdoc'] = {obj: {
-      getAmpDoc: () => ampdoc,
-      isSingleDoc: () => true,
-    }};
+    fakeWin.services['ampdoc'] = {
+      obj: {
+        getAmpDoc: () => ampdoc,
+        isSingleDoc: () => true,
+      },
+    };
 
     installDocumentStateService(fakeWin);
     installTimerService(fakeWin);
@@ -149,8 +144,7 @@ describe('Activity getTotalEngagedTime', () => {
     return expect(activity.getTotalEngagedTime()).to.equal(0);
   });
 
-  it('should have 5 seconds of engaged time after viewer becomes' +
-     ' visible', () => {
+  it('should have 5 seconds of engaged time after viewer becomes visible', () => {
     whenFirstVisibleResolve();
     return viewer.whenFirstVisible().then(() => {
       clock.tick(10000);
@@ -216,32 +210,44 @@ describe('Activity getTotalEngagedTime', () => {
     });
   });
 
-  it('should set event listeners on the document for' +
-     ' "mousedown", "mouseup", "mousemove", "keyup", "keydown"', () => {
-    const addEventListenerSpy = sandbox.spy(fakeDoc, 'addEventListener');
-    expect(addEventListenerSpy).to.not.have.been.calledWith('mousedown',
-        activity.boundHandleActivity_);
-    expect(addEventListenerSpy).to.not.have.been.calledWith('mouseup',
-        activity.boundHandleActivity_);
-    expect(addEventListenerSpy).to.not.have.been.calledWith('mousemove',
-        activity.boundHandleActivity_);
-    expect(addEventListenerSpy).to.not.have.been.calledWith('keydown',
-        activity.boundHandleActivity_);
-    expect(addEventListenerSpy).to.not.have.been.calledWith('keyup',
-        activity.boundHandleActivity_);
-    whenFirstVisibleResolve();
-    return viewer.whenFirstVisible().then(() => {
-      expect(addEventListenerSpy.getCall(0).args[0]).to.equal('mousedown');
-      expect(addEventListenerSpy.getCall(1).args[0]).to.equal('mouseup');
-      expect(addEventListenerSpy.getCall(2).args[0]).to.equal('mousemove');
-      expect(addEventListenerSpy.getCall(3).args[0]).to.equal('keydown');
-      expect(addEventListenerSpy.getCall(4).args[0]).to.equal('keyup');
-    });
-  });
+  it(
+    'should set event listeners on the document for' +
+      ' "mousedown", "mouseup", "mousemove", "keyup", "keydown"',
+    () => {
+      const addEventListenerSpy = sandbox.spy(fakeDoc, 'addEventListener');
+      expect(addEventListenerSpy).to.not.have.been.calledWith(
+        'mousedown',
+        activity.boundHandleActivity_
+      );
+      expect(addEventListenerSpy).to.not.have.been.calledWith(
+        'mouseup',
+        activity.boundHandleActivity_
+      );
+      expect(addEventListenerSpy).to.not.have.been.calledWith(
+        'mousemove',
+        activity.boundHandleActivity_
+      );
+      expect(addEventListenerSpy).to.not.have.been.calledWith(
+        'keydown',
+        activity.boundHandleActivity_
+      );
+      expect(addEventListenerSpy).to.not.have.been.calledWith(
+        'keyup',
+        activity.boundHandleActivity_
+      );
+      whenFirstVisibleResolve();
+      return viewer.whenFirstVisible().then(() => {
+        expect(addEventListenerSpy.getCall(0).args[0]).to.equal('mousedown');
+        expect(addEventListenerSpy.getCall(1).args[0]).to.equal('mouseup');
+        expect(addEventListenerSpy.getCall(2).args[0]).to.equal('mousemove');
+        expect(addEventListenerSpy.getCall(3).args[0]).to.equal('keydown');
+        expect(addEventListenerSpy.getCall(4).args[0]).to.equal('keyup');
+      });
+    }
+  );
 });
 
 describe('Activity getIncrementalEngagedTime', () => {
-
   let sandbox;
   let clock;
   let fakeDoc;
@@ -310,10 +316,12 @@ describe('Activity getIncrementalEngagedTime', () => {
     fakeDoc.head.defaultView = fakeWin;
 
     ampdoc = new AmpDocSingle(fakeWin);
-    fakeWin.services['ampdoc'] = {obj: {
-      getAmpDoc: () => ampdoc,
-      isSingleDoc: () => true,
-    }};
+    fakeWin.services['ampdoc'] = {
+      obj: {
+        getAmpDoc: () => ampdoc,
+        isSingleDoc: () => true,
+      },
+    };
 
     installDocumentStateService(fakeWin);
     installTimerService(fakeWin);
@@ -349,22 +357,23 @@ describe('Activity getIncrementalEngagedTime', () => {
     sandbox.restore();
   });
 
-  it('should have 0 seconds of incremental engaged ' +
-  'time with no activity', () => {
+  it('should have 0 seconds of incremental engaged time with no activity', () => {
     return expect(activity.getIncrementalEngagedTime('tests')).to.equal(0);
   });
 
-  it('should have 5 seconds of incremental engaged time after viewer ' +
-    'becomes visible', () => {
-    whenFirstVisibleResolve();
-    return viewer.whenFirstVisible().then(() => {
-      clock.tick(10000);
-      return expect(activity.getIncrementalEngagedTime('tests')).to.equal(5);
-    });
-  });
-
-  it('should have 4 seconds of incremental engaged time after 4' +
-  ' seconds', () => {
+  it(
+    'should have 5 seconds of incremental engaged time after viewer ' +
+      'becomes visible',
+    () => {
+      whenFirstVisibleResolve();
+      return viewer.whenFirstVisible().then(() => {
+        clock.tick(10000);
+        return expect(activity.getIncrementalEngagedTime('tests')).to.equal(5);
+      });
+    }
+  );
+
+  it('should have 4 seconds of incremental engaged time after 4 seconds', () => {
     whenFirstVisibleResolve();
     return viewer.whenFirstVisible().then(() => {
       clock.tick(4000);
diff --git a/test/unit/test-ad-cid.js b/test/unit/test-ad-cid.js
index e2e28d58987a..fb97719c7b21 100644
--- a/test/unit/test-ad-cid.js
+++ b/test/unit/test-ad-cid.js
@@ -17,9 +17,7 @@
 import * as lolex from 'lolex';
 import {Services} from '../../src/services';
 import {adConfig} from '../../ads/_config';
-import {
-  cidServiceForDocForTesting,
-} from '../../src/service/cid-impl';
+import {cidServiceForDocForTesting} from '../../src/service/cid-impl';
 import {getAdCid} from '../../src/ad-cid';
 
 describes.realWin('ad-cid', {amp: true}, env => {
@@ -37,7 +35,9 @@ describes.realWin('ad-cid', {amp: true}, env => {
     win = env.win;
     sandbox = env.sandbox;
     clock = lolex.install({
-      target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+      target: win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
     element = env.win.document.createElement('amp-ad');
     element.setAttribute('type', '_ping_');
     const {ampdoc} = env;
diff --git a/test/unit/test-ad-helper.js b/test/unit/test-ad-helper.js
index c60053bd1761..2105f106abb6 100644
--- a/test/unit/test-ad-helper.js
+++ b/test/unit/test-ad-helper.js
@@ -42,46 +42,56 @@ describe('ad-helper', () => {
       });
     });
 
-    it('should not allow position fixed element that is non-whitelisted ' +
-        'element', () => {
-      return createIframePromise().then(iframe => {
-        const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
-        nonWhitelistedElement.style.position = 'fixed';
-        iframe.doc.body.appendChild(nonWhitelistedElement);
-        expect(isAdPositionAllowed(nonWhitelistedElement, iframe.win))
-            .to.be.false;
-      });
-    });
+    it(
+      'should not allow position fixed element that is non-whitelisted ' +
+        'element',
+      () => {
+        return createIframePromise().then(iframe => {
+          const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
+          nonWhitelistedElement.style.position = 'fixed';
+          iframe.doc.body.appendChild(nonWhitelistedElement);
+          expect(isAdPositionAllowed(nonWhitelistedElement, iframe.win)).to.be
+            .false;
+        });
+      }
+    );
 
-    it('should not allow position sticky-fixed element that is ' +
-        'non-whitelisted element', () => {
-      return createIframePromise().then(iframe => {
-        const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
-        nonWhitelistedElement.style.position = 'sticky';
-        // Check if browser support position:sticky
-        const styles = computedStyle(iframe.win, nonWhitelistedElement);
-        if (styles.position != 'sticky') {
-          return;
-        }
-        iframe.doc.body.appendChild(nonWhitelistedElement);
-        expect(isAdPositionAllowed(nonWhitelistedElement, iframe.win))
-            .to.be.false;
-      });
-    });
+    it(
+      'should not allow position sticky-fixed element that is ' +
+        'non-whitelisted element',
+      () => {
+        return createIframePromise().then(iframe => {
+          const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
+          nonWhitelistedElement.style.position = 'sticky';
+          // Check if browser support position:sticky
+          const styles = computedStyle(iframe.win, nonWhitelistedElement);
+          if (styles.position != 'sticky') {
+            return;
+          }
+          iframe.doc.body.appendChild(nonWhitelistedElement);
+          expect(isAdPositionAllowed(nonWhitelistedElement, iframe.win)).to.be
+            .false;
+        });
+      }
+    );
 
-    it('should not allow position fixed element inside non-whitelisted ' +
-        'element', () => {
-      return createIframePromise().then(iframe => {
-        const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
-        nonWhitelistedElement.style.position = 'fixed';
-        const childElement = iframe.doc.createElement('div');
-        const childChildElement = iframe.doc.createElement('div');
-        childElement.appendChild(childChildElement);
-        nonWhitelistedElement.appendChild(childElement);
-        iframe.doc.body.appendChild(nonWhitelistedElement);
-        expect(isAdPositionAllowed(childChildElement, iframe.win)).to.be.false;
-      });
-    });
+    it(
+      'should not allow position fixed element inside non-whitelisted ' +
+        'element',
+      () => {
+        return createIframePromise().then(iframe => {
+          const nonWhitelistedElement = iframe.doc.createElement('foo-bar');
+          nonWhitelistedElement.style.position = 'fixed';
+          const childElement = iframe.doc.createElement('div');
+          const childChildElement = iframe.doc.createElement('div');
+          childElement.appendChild(childChildElement);
+          nonWhitelistedElement.appendChild(childElement);
+          iframe.doc.body.appendChild(nonWhitelistedElement);
+          expect(isAdPositionAllowed(childChildElement, iframe.win)).to.be
+            .false;
+        });
+      }
+    );
   });
 
   describe('getAdContainer function', () => {
@@ -104,7 +114,8 @@ describe('ad-helper', () => {
         parentElement.appendChild(childElement);
         childElement.appendChild(childChildElement);
         expect(getAdContainer(childChildElement)).to.equal(
-            childElement.tagName);
+          childElement.tagName
+        );
       });
     });
 
diff --git a/test/unit/test-ads-config.js b/test/unit/test-ads-config.js
index ffd006cde2a4..4aef0da523c5 100644
--- a/test/unit/test-ads-config.js
+++ b/test/unit/test-ads-config.js
@@ -18,7 +18,6 @@ import {adConfig} from '../../ads/_config';
 import {hasOwn} from '../../src/utils/object';
 
 describe('test-ads-config', () => {
-
   it('should have all ad networks configured', () => {
     window.ampTestRuntimeConfig.adTypes.forEach(adType => {
       expect(adConfig, `Missing config for [${adType}]`).to.contain.key(adType);
@@ -30,8 +29,10 @@ describe('test-ads-config', () => {
     delete adConfig.fakead3p;
     const keys = Object.keys(adConfig);
     for (let i = 0; i < keys.length - 1; i++) {
-      assert(keys[i] <= keys[i + 1], 'Keys not sorted: ' + keys[i] +
-             ' should sort before ' + keys[i + 1]);
+      assert(
+        keys[i] <= keys[i + 1],
+        'Keys not sorted: ' + keys[i] + ' should sort before ' + keys[i + 1]
+      );
     }
   });
 
@@ -64,8 +65,9 @@ describe('test-ads-config', () => {
         urls = urls.concat(config.prefetch);
       }
       for (let i = 0; i < urls.length; i++) {
-        expect(urls[i].substr(0, 8), `${urls[i]} is not HTTPS`)
-            .to.equal('https://');
+        expect(urls[i].substr(0, 8), `${urls[i]} is not HTTPS`).to.equal(
+          'https://'
+        );
       }
     }
   });
@@ -80,8 +82,7 @@ function checkDuplicates(preconnects, prefetches, adNetwork) {
     prefetches = [prefetches];
   }
 
-  const errorMsg =
-      `[${adNetwork}] no need to preconnect if the URL is in prefetch`;
+  const errorMsg = `[${adNetwork}] no need to preconnect if the URL is in prefetch`;
   for (let i = 0; i < preconnects.length; i++) {
     for (let j = 0; j < prefetches.length; j++) {
       expect(prefetches[j], errorMsg).to.not.contain(preconnects[i]);
diff --git a/test/unit/test-alp-handler.js b/test/unit/test-alp-handler.js
index 4c7d271d83f5..beb1b476f888 100644
--- a/test/unit/test-alp-handler.js
+++ b/test/unit/test-alp-handler.js
@@ -18,7 +18,6 @@ import {handleClick, warmupDynamic, warmupStatic} from '../../ads/alp/handler';
 import {parseUrlDeprecated} from '../../src/url';
 
 describe('alp-handler', () => {
-
   let sandbox;
   let event;
   let anchor;
@@ -67,9 +66,11 @@ describe('alp-handler', () => {
     anchor = {
       nodeType: 1,
       tagName: 'A',
-      href: 'https://test.com?adurl=' +
+      href:
+        'https://test.com?adurl=' +
         encodeURIComponent(
-            'https://cdn.ampproject.org/c/www.example.com/amp.html'),
+          'https://cdn.ampproject.org/c/www.example.com/amp.html'
+        ),
       ownerDocument: doc,
       getAttribute: sandbox.stub(),
       get search() {
@@ -94,8 +95,8 @@ describe('alp-handler', () => {
     expect(open).to.be.calledOnce;
     expect(open.lastCall.args).to.jsonEqual([
       'https://cdn.ampproject.org/c/www.example.com/amp.html#click=' +
-          'https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%252F' +
-          'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html',
+        'https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%252F' +
+        'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html',
       '_top',
       undefined,
     ]);
@@ -107,11 +108,13 @@ describe('alp-handler', () => {
     expect(event.preventDefault).to.be.calledOnce;
     expect(ampParent.postMessage).to.be.calledOnce;
     expect(ampParent.postMessage.lastCall.args[0]).to.equal(
-        'a2a;{"url":"https://cdn.ampproject.org/c/www.example.com/amp.html' +
+      'a2a;{"url":"https://cdn.ampproject.org/c/www.example.com/amp.html' +
         '#click=https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%' +
-        '252Fcdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html"}');
+        '252Fcdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html"}'
+    );
     expect(ampParent.postMessage.lastCall.args[1]).to.equal(
-        'https://cdn.ampproject.org');
+      'https://cdn.ampproject.org'
+    );
     expect(open).to.have.not.been.called;
   }
 
@@ -197,9 +200,10 @@ describe('alp-handler', () => {
     const opt_navigate = val => {
       navigateSpy();
       expect(val).to.equal(
-          'https://cdn.ampproject.org/c/www.example.com/amp.html#click=' +
+        'https://cdn.ampproject.org/c/www.example.com/amp.html#click=' +
           'https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%252F' +
-          'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html');
+          'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html'
+      );
     };
     handleClick(event, opt_navigate);
     expect(event.preventDefault).to.be.calledOnce;
@@ -219,29 +223,33 @@ describe('alp-handler', () => {
 
   it('should support custom arg name', () => {
     anchor.getAttribute.withArgs('data-url-param-name').returns('TEST');
-    anchor.href = 'https://test.com?TEST=' +
-        encodeURIComponent(
-            'https://cdn.ampproject.org/c/www.example.com/amp.html');
+    anchor.href =
+      'https://test.com?TEST=' +
+      encodeURIComponent(
+        'https://cdn.ampproject.org/c/www.example.com/amp.html'
+      );
     handleClick(event);
     expect(open.lastCall.args).to.jsonEqual([
       'https://cdn.ampproject.org/c/www.example.com/amp.html#click=' +
-          'https%3A%2F%2Ftest.com%3Famp%3D1%26TEST%3Dhttps%253A%252F%252F' +
-          'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html',
+        'https%3A%2F%2Ftest.com%3Famp%3D1%26TEST%3Dhttps%253A%252F%252F' +
+        'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html',
       '_top',
       undefined,
     ]);
   });
 
   it('should support existing fragments', () => {
-    anchor.href = 'https://test.com?adurl=' +
-        encodeURIComponent(
-            'https://cdn.ampproject.org/c/www.example.com/amp.html#test=1');
+    anchor.href =
+      'https://test.com?adurl=' +
+      encodeURIComponent(
+        'https://cdn.ampproject.org/c/www.example.com/amp.html#test=1'
+      );
     handleClick(event);
     expect(open.lastCall.args).to.jsonEqual([
       'https://cdn.ampproject.org/c/www.example.com/amp.html#test=1&click=' +
-          'https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%252F' +
-          'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html' +
-          '%2523test%253D1',
+        'https%3A%2F%2Ftest.com%3Famp%3D1%26adurl%3Dhttps%253A%252F%252F' +
+        'cdn.ampproject.org%252Fc%252Fwww.example.com%252Famp.html' +
+        '%2523test%253D1',
       '_top',
       undefined,
     ]);
@@ -283,9 +291,9 @@ describe('alp-handler', () => {
   });
 
   it('should only navigate to AMP', () => {
-    anchor.href = 'https://test.com?adurl=' +
-        encodeURIComponent(
-            'https://notamp.com/c/www.example.com/amp.html');
+    anchor.href =
+      'https://test.com?adurl=' +
+      encodeURIComponent('https://notamp.com/c/www.example.com/amp.html');
     noNavigation();
   });
 
@@ -310,12 +318,14 @@ describe('alp-handler', () => {
     const link0 = win.document.head.appendChild.firstCall.args[0];
     expect(link0.rel).to.equal('preload');
     expect(link0.href).to.equal(
-        'https://cdn.ampproject.org/c/www.example.com/amp.html');
+      'https://cdn.ampproject.org/c/www.example.com/amp.html'
+    );
     const link1 = win.document.head.appendChild.secondCall.args[0];
     expect(link1.rel).to.equal('preload');
     expect(link1.as).to.equal('fetch');
     expect(link1.href).to.equal(
-        'https://cdn.ampproject.org/c/www.example.com/amp.html');
+      'https://cdn.ampproject.org/c/www.example.com/amp.html'
+    );
   });
 
   it('should ignore irrelevant events for warmup (bad target)', () => {
diff --git a/test/unit/test-amp-context.js b/test/unit/test-amp-context.js
index 56a98a70d191..de88e88077ba 100644
--- a/test/unit/test-amp-context.js
+++ b/test/unit/test-amp-context.js
@@ -13,9 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  AmpContext,
-} from '../../3p/ampcontext';
+import {AmpContext} from '../../3p/ampcontext';
 import {MessageType, serializeMessage} from '../../src/3p-frame-messaging';
 import {Platform} from '../../src/service/platform-impl';
 
@@ -69,12 +67,14 @@ describe('3p ampcontext.js', () => {
     windowPostMessageSpy.resetHistory();
     context.report3pError(new Error('test'));
     expect(windowPostMessageSpy).to.be.called;
-    expect(windowPostMessageSpy).to.be.calledWith(serializeMessage(
+    expect(windowPostMessageSpy).to.be.calledWith(
+      serializeMessage(
         'user-error-in-iframe',
         '1-291921',
         {'message': 'test'},
         '$internalRuntimeVersion$'
-    ));
+      )
+    );
   });
 
   it('should add metadata to window.context using name as per 3P.', () => {
@@ -157,8 +157,11 @@ describe('3p ampcontext.js', () => {
   it('should throw error if metadata missing', () => {
     win.name = generateIncorrectAttributes();
     const platform = new Platform(window);
-    expect(() => new AmpContext(win)).to.throw(platform.isSafari() ?
-      /undefined is not an object/ : /Cannot read property/);
+    expect(() => new AmpContext(win)).to.throw(
+      platform.isSafari()
+        ? /undefined is not an object/
+        : /Cannot read property/
+    );
   });
 
   it('should be able to send an intersection observer request', () => {
@@ -175,9 +178,10 @@ describe('3p ampcontext.js', () => {
     // observer
     expect(windowPostMessageSpy).to.be.calledOnce;
     expect(windowPostMessageSpy).to.be.calledWith(
-        'amp-$internalRuntimeVersion$' +
+      'amp-$internalRuntimeVersion$' +
         '{"type":"send-intersections","sentinel":"1-291921"}',
-        '*');
+      '*'
+    );
 
     // send an intersection message down
     const messagePayload = {
@@ -222,8 +226,10 @@ describe('3p ampcontext.js', () => {
     // observer
     expect(windowPostMessageSpy).to.be.calledOnce;
     expect(windowPostMessageSpy).to.be.calledWith(
-        'amp-$internalRuntimeVersion$' +
-        '{"type":"send-embed-state","sentinel":"1-291921"}', '*');
+      'amp-$internalRuntimeVersion$' +
+        '{"type":"send-embed-state","sentinel":"1-291921"}',
+      '*'
+    );
 
     // send a page visibility message down
     const messagePayload = {
@@ -273,9 +279,10 @@ describe('3p ampcontext.js', () => {
     // window.context should have sent postMessage requesting resize
     expect(windowPostMessageSpy).to.be.calledOnce;
     expect(windowPostMessageSpy).to.be.calledWith(
-        'amp-$internalRuntimeVersion$' +
+      'amp-$internalRuntimeVersion$' +
         '{"width":100,"height":200,"type":"embed-size","sentinel":"1-291921"}',
-        '*');
+      '*'
+    );
 
     // send a resize success message down
     const messagePayload = {
@@ -319,9 +326,10 @@ describe('3p ampcontext.js', () => {
     // window.context should have sent resize request postMessage
     expect(windowPostMessageSpy).to.be.calledOnce;
     expect(windowPostMessageSpy).to.be.calledWith(
-        'amp-$internalRuntimeVersion$' +
+      'amp-$internalRuntimeVersion$' +
         '{"width":100,"height":200,"type":"embed-size","sentinel":"1-291921"}',
-        '*');
+      '*'
+    );
 
     // send a resize denied message down
     const messagePayload = {
@@ -388,7 +396,6 @@ function generateAttributesA4A(opt_sentinel) {
   return attributes;
 }
 
-
 function generateIncorrectAttributes() {
   const name = {};
   name.attributes = {};
diff --git a/test/unit/test-amp-img.js b/test/unit/test-amp-img.js
index de1c04157764..85ab01f21638 100644
--- a/test/unit/test-amp-img.js
+++ b/test/unit/test-amp-img.js
@@ -35,8 +35,7 @@ describe('amp-img', () => {
     sandbox = sinon.sandbox;
     screenWidth = 320;
     windowWidth = 320;
-    sandbox.stub(BaseElement.prototype, 'isInViewport')
-        .returns(true);
+    sandbox.stub(BaseElement.prototype, 'isInViewport').returns(true);
     sandbox.stub(BaseElement.prototype, 'getViewport').callsFake(() => {
       return {
         getWidth: () => windowWidth,
@@ -84,7 +83,8 @@ describe('amp-img', () => {
       expect(img.tagName).to.equal('IMG');
       expect(img.getAttribute('src')).to.equal('/examples/img/sample.jpg');
       expect(ampImg.implementation_.getLayoutPriority()).to.equal(
-          LayoutPriority.CONTENT);
+        LayoutPriority.CONTENT
+      );
       expect(img.getAttribute('alt')).to.equal('An image');
       expect(img.getAttribute('title')).to.equal('Image title');
       expect(img.getAttribute('referrerpolicy')).to.equal('origin');
@@ -102,7 +102,8 @@ describe('amp-img', () => {
       expect(img.tagName).to.equal('IMG');
       expect(img.getAttribute('src')).to.equal('/examples/img/sample.jpg');
       expect(ampImg.implementation_.getLayoutPriority()).to.equal(
-          LayoutPriority.CONTENT);
+        LayoutPriority.CONTENT
+      );
     });
   });
 
@@ -147,7 +148,7 @@ describe('amp-img', () => {
       impl.preconnectCallback(true);
       expect(impl.preconnect.url.called).to.be.true;
       expect(impl.preconnect.url).to.have.been.calledWith(
-          '/examples/img/hero@1x.jpg'
+        '/examples/img/hero@1x.jpg'
       );
     });
   });
@@ -188,8 +189,9 @@ describe('amp-img', () => {
     }).then(ampImg => {
       const img = ampImg.querySelector('img');
       expect(img.getAttribute('srcset')).to.equal(SRCSET_STRING);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 640px, 100vw');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 640px, 100vw'
+      );
     });
   });
 
@@ -492,7 +494,6 @@ describe('amp-img', () => {
   });
 
   describe('auto-generate sizes', () => {
-
     function getStubbedImg(attributes, layoutWidth) {
       const el = document.createElement('amp-img');
       for (const key in attributes) {
@@ -529,14 +530,16 @@ describe('amp-img', () => {
         sizes: '50vw',
         width: 300,
         height: 200,
-      }).then(ampImg => {
-        impl = ampImg.implementation_;
-        impl.buildCallback();
-        return impl.layoutCallback();
-      }).then(() => {
-        const img = impl.img_;
-        expect(img.getAttribute('sizes')).to.equal('50vw');
-      });
+      })
+        .then(ampImg => {
+          impl = ampImg.implementation_;
+          impl.buildCallback();
+          return impl.layoutCallback();
+        })
+        .then(() => {
+          const img = impl.img_;
+          expect(img.getAttribute('sizes')).to.equal('50vw');
+        });
     });
 
     it('should not generate sizes for amp-imgs without srcset', () => {
@@ -546,14 +549,16 @@ describe('amp-img', () => {
         src: '/examples/img/sample.jpg',
         width: 300,
         height: 200,
-      }).then(ampImg => {
-        impl = ampImg.implementation_;
-        impl.buildCallback();
-        return impl.layoutCallback();
-      }).then(() => {
-        const img = impl.img_;
-        expect(img.getAttribute('sizes')).to.be.null;
-      });
+      })
+        .then(ampImg => {
+          impl = ampImg.implementation_;
+          impl.buildCallback();
+          return impl.layoutCallback();
+        })
+        .then(() => {
+          const img = impl.img_;
+          expect(img.getAttribute('sizes')).to.be.null;
+        });
     });
 
     it('should not generate sizes for amp-imgs with x descriptors', () => {
@@ -563,100 +568,121 @@ describe('amp-img', () => {
         srcset: '/examples/img/hero@1x.jpg, /examples/img/hero@2x.jpg 2x',
         width: 300,
         height: 200,
-      }).then(ampImg => {
-        impl = ampImg.implementation_;
-        impl.buildCallback();
-        return impl.layoutCallback();
-      }).then(() => {
-        const img = impl.img_;
-        expect(img.getAttribute('sizes')).to.be.null;
-      });
+      })
+        .then(ampImg => {
+          impl = ampImg.implementation_;
+          impl.buildCallback();
+          return impl.layoutCallback();
+        })
+        .then(() => {
+          const img = impl.img_;
+          expect(img.getAttribute('sizes')).to.be.null;
+        });
     });
 
     it('should generate correct sizes for layout fixed', () => {
       expect(isExperimentOn(window, 'amp-img-auto-sizes')).to.be.true;
-      const impl = getStubbedImg({
-        layout: Layout.FIXED,
-        src: 'test.jpg',
-        srcset: 'large.jpg 2000w, small.jpg 1000w',
-        width: 300,
-        height: 200,
-      }, 300);
+      const impl = getStubbedImg(
+        {
+          layout: Layout.FIXED,
+          src: 'test.jpg',
+          srcset: 'large.jpg 2000w, small.jpg 1000w',
+          width: 300,
+          height: 200,
+        },
+        300
+      );
       impl.buildCallback();
       impl.initialize_();
       const img = impl.img_;
       expect(impl.getViewport().getWidth()).to.equal(320);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 300px, 300px');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 300px, 300px'
+      );
     });
 
     it('should generate correct sizes for layout responsive', () => {
       expect(isExperimentOn(window, 'amp-img-auto-sizes')).to.be.true;
-      const impl = getStubbedImg({
-        layout: Layout.RESPONSIVE,
-        src: 'test.jpg',
-        srcset: 'large.jpg 2000w, small.jpg 1000w',
-        width: 300,
-        height: 200,
-      }, 160);
+      const impl = getStubbedImg(
+        {
+          layout: Layout.RESPONSIVE,
+          src: 'test.jpg',
+          srcset: 'large.jpg 2000w, small.jpg 1000w',
+          width: 300,
+          height: 200,
+        },
+        160
+      );
       impl.buildCallback();
       impl.initialize_();
       const img = impl.img_;
       expect(impl.getViewport().getWidth()).to.equal(320);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 160px, 100vw');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 160px, 100vw'
+      );
     });
 
     it('should generate correct sizes for layout fixed-height', () => {
       expect(isExperimentOn(window, 'amp-img-auto-sizes')).to.be.true;
-      const impl = getStubbedImg({
-        layout: Layout.FIXED_HEIGHT,
-        src: 'test.jpg',
-        srcset: 'large.jpg 2000w, small.jpg 1000w',
-        width: 300,
-        height: 200,
-      }, 160);
+      const impl = getStubbedImg(
+        {
+          layout: Layout.FIXED_HEIGHT,
+          src: 'test.jpg',
+          srcset: 'large.jpg 2000w, small.jpg 1000w',
+          width: 300,
+          height: 200,
+        },
+        160
+      );
       impl.buildCallback();
       impl.initialize_();
       const img = impl.img_;
       expect(impl.getViewport().getWidth()).to.equal(320);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 160px, 100vw');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 160px, 100vw'
+      );
     });
 
     it('should generate correct sizes for layout fill', () => {
       expect(isExperimentOn(window, 'amp-img-auto-sizes')).to.be.true;
-      const impl = getStubbedImg({
-        layout: Layout.FILL,
-        src: 'test.jpg',
-        srcset: 'large.jpg 2000w, small.jpg 1000w',
-        width: 300,
-        height: 200,
-      }, 160);
+      const impl = getStubbedImg(
+        {
+          layout: Layout.FILL,
+          src: 'test.jpg',
+          srcset: 'large.jpg 2000w, small.jpg 1000w',
+          width: 300,
+          height: 200,
+        },
+        160
+      );
       impl.buildCallback();
       impl.initialize_();
       const img = impl.img_;
       expect(impl.getViewport().getWidth()).to.equal(320);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 160px, 100vw');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 160px, 100vw'
+      );
     });
 
     it('should generate correct sizes for layout flex-item', () => {
       expect(isExperimentOn(window, 'amp-img-auto-sizes')).to.be.true;
-      const impl = getStubbedImg({
-        layout: Layout.FLEX_ITEM,
-        src: 'test.jpg',
-        srcset: 'large.jpg 2000w, small.jpg 1000w',
-        width: 300,
-        height: 200,
-      }, 160);
+      const impl = getStubbedImg(
+        {
+          layout: Layout.FLEX_ITEM,
+          src: 'test.jpg',
+          srcset: 'large.jpg 2000w, small.jpg 1000w',
+          width: 300,
+          height: 200,
+        },
+        160
+      );
       impl.buildCallback();
       impl.initialize_();
       const img = impl.img_;
       expect(impl.getViewport().getWidth()).to.equal(320);
-      expect(img.getAttribute('sizes')).to
-          .equal('(max-width: 320px) 160px, 100vw');
+      expect(img.getAttribute('sizes')).to.equal(
+        '(max-width: 320px) 160px, 100vw'
+      );
     });
-
   });
 });
diff --git a/test/unit/test-amp-pixel.js b/test/unit/test-amp-pixel.js
index 90a9b7d92237..bc3f4aa7f1c3 100644
--- a/test/unit/test-amp-pixel.js
+++ b/test/unit/test-amp-pixel.js
@@ -15,9 +15,7 @@
  */
 
 import {VariableSource} from '../../src/service/variable-source';
-import {
-  installUrlReplacementsForEmbed,
-} from '../../src/service/url-replacements-impl';
+import {installUrlReplacementsForEmbed} from '../../src/service/url-replacements-impl';
 
 describes.realWin('amp-pixel', {amp: true}, env => {
   let win;
@@ -31,8 +29,9 @@ describes.realWin('amp-pixel', {amp: true}, env => {
     whenFirstVisiblePromise = new Promise(resolve => {
       whenFirstVisibleResolver = resolve;
     });
-    sandbox.stub(viewer, 'whenFirstVisible').callsFake(
-        () => whenFirstVisiblePromise);
+    sandbox
+      .stub(viewer, 'whenFirstVisible')
+      .callsFake(() => whenFirstVisiblePromise);
     createPixel('https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?');
   });
 
@@ -85,7 +84,8 @@ describes.realWin('amp-pixel', {amp: true}, env => {
     return trigger().then(img => {
       expect(implementation.triggerPromise_).to.be.ok;
       expect(img.src).to.equal(
-          'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?');
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?'
+      );
     });
   });
 
@@ -94,26 +94,30 @@ describes.realWin('amp-pixel', {amp: true}, env => {
     return trigger(url).then(img => {
       // Protocol is resolved to `http:` relative to test server.
       expect(img.src).to.equal(
-          'http://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2');
+        'http://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2'
+      );
     });
   });
 
   it('should disallow http URLs', () => {
     const url = 'http://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=2';
     return expect(trigger(url)).to.eventually.be.rejectedWith(
-        /src attribute must start with/);
+      /src attribute must start with/
+    );
   });
 
   it('should disallow relative URLs', () => {
     const url = '/activity;dc_iu=1/abc;ord=2';
     return expect(trigger(url)).to.eventually.be.rejectedWith(
-        /src attribute must start with/);
+      /src attribute must start with/
+    );
   });
 
   it('should disallow fake-protocol URLs', () => {
     const url = 'https/activity;dc_iu=1/abc;ord=2';
     return expect(trigger(url)).to.eventually.be.rejectedWith(
-        /src attribute must start with/);
+      /src attribute must start with/
+    );
   });
 
   it('should replace URL parameters', () => {
@@ -121,87 +125,96 @@ describes.realWin('amp-pixel', {amp: true}, env => {
     const url = 'https://pubads.g.doubleclick.net/activity;r=RANDOM';
     return trigger(url).then(img => {
       expect(img.src).to.equal(
-          'https://pubads.g.doubleclick.net/activity;r=111');
+        'https://pubads.g.doubleclick.net/activity;r=111'
+      );
     });
   });
 
-  it('should throw for referrerpolicy with value other than ' +
-      'no-referrer', () => {
+  it('should throw for referrerpolicy with value other than no-referrer', () => {
     return allowConsoleError(() => {
       return createPixel(
-          'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?',
-          'origin')
-          .then(() => {
-            throw new Error('must have failed.');
-          }, reason => {
-            expect(reason.message).to.match(/referrerpolicy/);
-          });
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?',
+        'origin'
+      ).then(
+        () => {
+          throw new Error('must have failed.');
+        },
+        reason => {
+          expect(reason.message).to.match(/referrerpolicy/);
+        }
+      );
     });
   });
 });
 
-
-describes.realWin('amp-pixel in embed', {
-  amp: {
-    ampdoc: 'fie',
+describes.realWin(
+  'amp-pixel in embed',
+  {
+    amp: {
+      ampdoc: 'fie',
+    },
   },
-}, env => {
-
-  class TestVariableSource extends VariableSource {
-    constructor() {
-      super(env.ampdoc);
-    }
-    initialize() {
-      this.set('TEST', () => 'value1');
+  env => {
+    class TestVariableSource extends VariableSource {
+      constructor() {
+        super(env.ampdoc);
+      }
+      initialize() {
+        this.set('TEST', () => 'value1');
+      }
     }
-  }
-
-  let win, parentWin;
-  let whenFirstVisiblePromise, whenFirstVisibleResolver;
-  let pixel;
-  let implementation;
-
-  beforeEach(() => {
-    win = env.win;
-    parentWin = env.parentWin;
 
-    const viewer = parentWin.services.viewer.obj;
-    whenFirstVisiblePromise = new Promise(resolve => {
-      whenFirstVisibleResolver = resolve;
+    let win, parentWin;
+    let whenFirstVisiblePromise, whenFirstVisibleResolver;
+    let pixel;
+    let implementation;
+
+    beforeEach(() => {
+      win = env.win;
+      parentWin = env.parentWin;
+
+      const viewer = parentWin.services.viewer.obj;
+      whenFirstVisiblePromise = new Promise(resolve => {
+        whenFirstVisibleResolver = resolve;
+      });
+      sandbox
+        .stub(viewer, 'whenFirstVisible')
+        .callsFake(() => whenFirstVisiblePromise);
+
+      installUrlReplacementsForEmbed(env.ampdoc, win, new TestVariableSource());
+
+      pixel = win.document.createElement('amp-pixel');
+      pixel.setAttribute(
+        'src',
+        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?'
+      );
+      win.document.body.appendChild(pixel);
+      pixel.build();
+      implementation = pixel.implementation_;
     });
-    sandbox.stub(viewer, 'whenFirstVisible').callsFake(
-        () => whenFirstVisiblePromise);
-
-    installUrlReplacementsForEmbed(env.ampdoc, win, new TestVariableSource());
-
-    pixel = win.document.createElement('amp-pixel');
-    pixel.setAttribute('src',
-        'https://pubads.g.doubleclick.net/activity;dc_iu=1/abc;ord=1?');
-    win.document.body.appendChild(pixel);
-    pixel.build();
-    implementation = pixel.implementation_;
-  });
 
-  /**
-   * @param {string=} opt_src
-   * @return {!Promise<?Image>}
-   */
-  function trigger(opt_src) {
-    if (opt_src) {
-      pixel.setAttribute('src', opt_src);
+    /**
+     * @param {string=} opt_src
+     * @return {!Promise<?Image>}
+     */
+    function trigger(opt_src) {
+      if (opt_src) {
+        pixel.setAttribute('src', opt_src);
+      }
+      whenFirstVisibleResolver();
+      return whenFirstVisiblePromise.then(() => {
+        expect(implementation.triggerPromise_).to.be.not.null;
+        return implementation.triggerPromise_;
+      });
     }
-    whenFirstVisibleResolver();
-    return whenFirstVisiblePromise.then(() => {
-      expect(implementation.triggerPromise_).to.be.not.null;
-      return implementation.triggerPromise_;
-    });
-  }
 
-  it('should use embed\'s URL replacer', () => {
-    const url = 'https://pubads.g.doubleclick.net/activity;t=TEST';
-    return trigger(url).then(img => {
-      expect(img.src).to.equal(
-          'https://pubads.g.doubleclick.net/activity;t=value1');
+    it("should use embed's URL replacer", () => {
+      const url = 'https://pubads.g.doubleclick.net/activity;t=TEST';
+      return trigger(url).then(img => {
+        expect(img.src).to.equal(
+          'https://pubads.g.doubleclick.net/activity;t=value1'
+        );
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-ampdoc.js b/test/unit/test-ampdoc.js
index 53ec58cc030e..77ffe271ca58 100644
--- a/test/unit/test-ampdoc.js
+++ b/test/unit/test-ampdoc.js
@@ -31,9 +31,7 @@ import {
 import {createShadowRoot} from '../../src/shadow-embed';
 import {toggleExperiment} from '../../src/experiments';
 
-
 describe('AmpDocService', () => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -45,7 +43,6 @@ describe('AmpDocService', () => {
   });
 
   describe('single-doc mode', () => {
-
     let service;
 
     beforeEach(() => {
@@ -119,7 +116,10 @@ describe('AmpDocService', () => {
           return;
         }
 
-        const newAmpDoc = service.installShadowDoc('https://a.org/', shadowRoot);
+        const newAmpDoc = service.installShadowDoc(
+          'https://a.org/',
+          shadowRoot
+        );
         const ampDoc = service.getAmpDoc(content, {closestAmpDoc: true});
         expect(ampDoc).to.equal(newAmpDoc);
       });
@@ -131,7 +131,10 @@ describe('AmpDocService', () => {
 
         toggleExperiment(window, 'ampdoc-closest', true);
         service = new AmpDocService(window, /* isSingleDoc */ true);
-        const newAmpDoc = service.installShadowDoc('https://a.org/', shadowRoot);
+        const newAmpDoc = service.installShadowDoc(
+          'https://a.org/',
+          shadowRoot
+        );
         const ampDoc = service.getAmpDoc(content);
         expect(ampDoc).to.equal(newAmpDoc);
       });
@@ -139,7 +142,6 @@ describe('AmpDocService', () => {
   });
 
   describe('shadow-doc mode', () => {
-
     let service;
     let host, shadowRoot, content;
 
@@ -235,35 +237,42 @@ describe('AmpDocService', () => {
         return;
       }
       service.installShadowDoc('https://a.org/', shadowRoot);
-      allowConsoleError(() => { expect(() => {
-        service.installShadowDoc('https://a.org/', shadowRoot);
-      }).to.throw(/The shadow root already contains ampdoc/); });
+      allowConsoleError(() => {
+        expect(() => {
+          service.installShadowDoc('https://a.org/', shadowRoot);
+        }).to.throw(/The shadow root already contains ampdoc/);
+      });
     });
 
     // TODO(dvoytenko, #11827): Make this test work on Safari.
-    it.configure().skipSafari().run('should navigate via host', () => {
-      if (!shadowRoot) {
-        return;
-      }
-
-      const newAmpDoc = service.installShadowDoc('https://a.org/', shadowRoot);
-      const ampDoc = service.getAmpDoc(content);
-      expect(ampDoc).to.equal(newAmpDoc);
+    it.configure()
+      .skipSafari()
+      .run('should navigate via host', () => {
+        if (!shadowRoot) {
+          return;
+        }
 
-      const content2 = document.createElement('span');
-      const host2 = document.createElement('div');
-      const shadowRoot2 = host2.createShadowRoot();
-      shadowRoot2.appendChild(content2);
-      shadowRoot.appendChild(host2);
-      expect(content2.parentNode).to.equal(shadowRoot2);
-      expect(shadowRoot2.host).to.equal(host2);
-      expect(host2.shadowRoot).to.equal(shadowRoot2);
-      expect(host2.parentNode).to.equal(shadowRoot);
+        const newAmpDoc = service.installShadowDoc(
+          'https://a.org/',
+          shadowRoot
+        );
+        const ampDoc = service.getAmpDoc(content);
+        expect(ampDoc).to.equal(newAmpDoc);
 
-      expect(service.getAmpDoc(host2)).to.equal(ampDoc);
-      expect(service.getAmpDoc(content2)).to.equal(ampDoc);
-      expect(service.getAmpDoc(shadowRoot2)).to.equal(ampDoc);
-    });
+        const content2 = document.createElement('span');
+        const host2 = document.createElement('div');
+        const shadowRoot2 = host2.createShadowRoot();
+        shadowRoot2.appendChild(content2);
+        shadowRoot.appendChild(host2);
+        expect(content2.parentNode).to.equal(shadowRoot2);
+        expect(shadowRoot2.host).to.equal(host2);
+        expect(host2.shadowRoot).to.equal(shadowRoot2);
+        expect(host2.parentNode).to.equal(shadowRoot);
+
+        expect(service.getAmpDoc(host2)).to.equal(ampDoc);
+        expect(service.getAmpDoc(content2)).to.equal(ampDoc);
+        expect(service.getAmpDoc(shadowRoot2)).to.equal(ampDoc);
+      });
   });
 
   describe('install AmpDocShell', () => {
@@ -285,9 +294,11 @@ describe('AmpDocService', () => {
 
     it('should fail when installing AmpDocShell in single-doc mode', () => {
       const ampdocService = new AmpDocService(window, /* isSingleDoc */ true);
-      allowConsoleError(() => { expect(() => {
-        ampdocService.installShellShadowDoc();
-      }).to.throw(/AmpDocShell cannot be installed in single-doc mode/); });
+      allowConsoleError(() => {
+        expect(() => {
+          ampdocService.installShellShadowDoc();
+        }).to.throw(/AmpDocShell cannot be installed in single-doc mode/);
+      });
     });
 
     it('should install AmpDocShell in shadow-doc mode', () => {
@@ -313,14 +324,17 @@ describe('AmpDocService', () => {
       expect(ampdocService.getAmpDoc(content)).to.equal(ampdocShell);
     });
 
-    it('should yield AmpDocShell for custom-element when Shadow Dom is ' +
-        'not supported', () => {
-      setShadowDomSupportedVersionForTesting(ShadowDomVersion.NONE);
-      const ampdocShell = ampdocService.installShellShadowDoc();
-      window.document.body.appendChild(content);
+    it(
+      'should yield AmpDocShell for custom-element when Shadow Dom is ' +
+        'not supported',
+      () => {
+        setShadowDomSupportedVersionForTesting(ShadowDomVersion.NONE);
+        const ampdocShell = ampdocService.installShellShadowDoc();
+        window.document.body.appendChild(content);
 
-      expect(ampdocService.getAmpDoc(content)).to.equal(ampdocShell);
-    });
+        expect(ampdocService.getAmpDoc(content)).to.equal(ampdocShell);
+      }
+    );
 
     it('should yield custom-element shadow-doc', () => {
       const shadowRoot = createShadowRoot(host);
@@ -331,16 +345,19 @@ describe('AmpDocService', () => {
       expect(ampdocService.getAmpDoc(content)).to.equal(ampDoc);
     });
 
-    it('should yield custom-element shadow-doc when Shadow Dom is ' +
-        'not supported', () => {
-      setShadowDomSupportedVersionForTesting(ShadowDomVersion.NONE);
-      const shadowRoot = createShadowRoot(host);
-      shadowRoot.appendChild(content);
-      const ampDoc = {};
-      shadowRoot['__AMPDOC'] = ampDoc;
+    it(
+      'should yield custom-element shadow-doc when Shadow Dom is ' +
+        'not supported',
+      () => {
+        setShadowDomSupportedVersionForTesting(ShadowDomVersion.NONE);
+        const shadowRoot = createShadowRoot(host);
+        shadowRoot.appendChild(content);
+        const ampDoc = {};
+        shadowRoot['__AMPDOC'] = ampDoc;
 
-      expect(ampdocService.getAmpDoc(content)).to.equal(ampDoc);
-    });
+        expect(ampdocService.getAmpDoc(content)).to.equal(ampDoc);
+      }
+    );
 
     it('waits for document ready to set body', () => {
       const mockDoc = {body: {nodeType: 1}};
@@ -369,9 +386,7 @@ describe('AmpDocService', () => {
   });
 });
 
-
 describe('AmpDocSingle', () => {
-
   let sandbox;
   let ampdoc;
 
@@ -407,13 +422,14 @@ describe('AmpDocSingle', () => {
     expect(ampdoc.getBody()).to.equal(window.document.body);
     expect(ampdoc.isBodyAvailable()).to.be.true;
     expect(ampdoc.isReady()).to.be.true;
-    return Promise.all([ampdoc.whenBodyAvailable(), ampdoc.whenReady()])
-        .then(results => {
-          expect(results[0]).to.equal(window.document.body);
-          expect(ampdoc.getBody()).to.equal(window.document.body);
-          expect(ampdoc.isBodyAvailable()).to.be.true;
-          expect(ampdoc.isReady()).to.be.true;
-        });
+    return Promise.all([ampdoc.whenBodyAvailable(), ampdoc.whenReady()]).then(
+      results => {
+        expect(results[0]).to.equal(window.document.body);
+        expect(ampdoc.getBody()).to.equal(window.document.body);
+        expect(ampdoc.isBodyAvailable()).to.be.true;
+        expect(ampdoc.isReady()).to.be.true;
+      }
+    );
   });
 
   it('should wait for body and ready state', () => {
@@ -486,9 +502,7 @@ describe('AmpDocSingle', () => {
   });
 });
 
-
 describe('AmpDocShadow', () => {
-
   const URL = 'https://example.org/document';
 
   let sandbox;
@@ -561,9 +575,11 @@ describe('AmpDocShadow', () => {
   it('should only allow one body update', () => {
     const body = {nodeType: 1};
     ampdoc.setBody(body);
-    allowConsoleError(() => { expect(() => {
-      ampdoc.setBody(body);
-    }).to.throw(/Duplicate body/); });
+    allowConsoleError(() => {
+      expect(() => {
+        ampdoc.setBody(body);
+      }).to.throw(/Duplicate body/);
+    });
   });
 
   it('should update when doc is ready', () => {
@@ -584,9 +600,11 @@ describe('AmpDocShadow', () => {
 
   it('should only allow one ready update', () => {
     ampdoc.setReady();
-    allowConsoleError(() => { expect(() => {
-      ampdoc.setReady();
-    }).to.throw(/Duplicate ready state/); });
+    allowConsoleError(() => {
+      expect(() => {
+        ampdoc.setReady();
+      }).to.throw(/Duplicate ready state/);
+    });
   });
 });
 
diff --git a/test/unit/test-analytics.js b/test/unit/test-analytics.js
index 7cdc0d37e079..42e9c5a5acdb 100644
--- a/test/unit/test-analytics.js
+++ b/test/unit/test-analytics.js
@@ -20,57 +20,63 @@ import {
   registerServiceBuilderForDoc,
   resetServiceForTesting,
 } from '../../src/service';
-import {
-  triggerAnalyticsEvent,
-} from '../../src/analytics';
-
+import {triggerAnalyticsEvent} from '../../src/analytics';
 
-describes.realWin('analytics', {
-  amp: true,
-}, env => {
-  let sandbox;
-  let timer;
-  let ampdoc;
+describes.realWin(
+  'analytics',
+  {
+    amp: true,
+  },
+  env => {
+    let sandbox;
+    let timer;
+    let ampdoc;
 
-  describe('triggerAnalyticsEvent', () => {
-    let triggerEventSpy;
+    describe('triggerAnalyticsEvent', () => {
+      let triggerEventSpy;
 
-    class MockInstrumentation {
-      triggerEventForTarget(nodeOrDoc, eventType, opt_vars) {
-        triggerEventSpy(nodeOrDoc, eventType, opt_vars);
+      class MockInstrumentation {
+        triggerEventForTarget(nodeOrDoc, eventType, opt_vars) {
+          triggerEventSpy(nodeOrDoc, eventType, opt_vars);
+        }
       }
-    }
 
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-      timer = Services.timerFor(env.win);
-      ampdoc = env.ampdoc;
-      triggerEventSpy = sandbox.spy();
-      resetServiceForTesting(window, 'amp-analytics-instrumentation');
-    });
+      beforeEach(() => {
+        sandbox = sinon.sandbox;
+        timer = Services.timerFor(env.win);
+        ampdoc = env.ampdoc;
+        triggerEventSpy = sandbox.spy();
+        resetServiceForTesting(window, 'amp-analytics-instrumentation');
+      });
 
-    afterEach(() => {
-      sandbox.restore();
-    });
+      afterEach(() => {
+        sandbox.restore();
+      });
 
-    it('should not do anything if analytics is not installed', () => {
-      triggerAnalyticsEvent(ampdoc.win.document, 'hello');
-      return timer.promise(50).then(() => {
-        expect(triggerEventSpy).to.have.not.been.called;
+      it('should not do anything if analytics is not installed', () => {
+        triggerAnalyticsEvent(ampdoc.win.document, 'hello');
+        return timer.promise(50).then(() => {
+          expect(triggerEventSpy).to.have.not.been.called;
+        });
       });
-    });
 
-    it('should trigger analytics event if analytics is installed', () => {
-      registerServiceBuilderForDoc(
-          ampdoc, 'amp-analytics-instrumentation', MockInstrumentation);
-      // Force instantiation
-      getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
-      triggerAnalyticsEvent(ampdoc.win.document, 'hello');
-      return timer.promise(50).then(() => {
-        expect(triggerEventSpy).to.have.been.called;
-        expect(triggerEventSpy).to.have.been.calledWith(
-            ampdoc.win.document, 'hello');
+      it('should trigger analytics event if analytics is installed', () => {
+        registerServiceBuilderForDoc(
+          ampdoc,
+          'amp-analytics-instrumentation',
+          MockInstrumentation
+        );
+        // Force instantiation
+        getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
+        triggerAnalyticsEvent(ampdoc.win.document, 'hello');
+        return timer.promise(50).then(() => {
+          expect(triggerEventSpy).to.have.been.called;
+          expect(triggerEventSpy).to.have.been.calledWith(
+            ampdoc.win.document,
+            'hello'
+          );
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-animation.js b/test/unit/test-animation.js
index 311658567f4b..682cd843bd8c 100644
--- a/test/unit/test-animation.js
+++ b/test/unit/test-animation.js
@@ -17,7 +17,6 @@
 import {Animation} from '../../src/animation';
 
 describe('Animation', () => {
-
   let sandbox;
   let vsync;
   let vsyncTasks;
@@ -61,8 +60,20 @@ describe('Animation', () => {
   it('animation', () => {
     let tr1 = -1;
     let tr2 = -1;
-    anim.add(0, time => {tr1 = time;}, 0.8);
-    anim.add(0.2, time => {tr2 = time;}, 0.8);
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      0.8
+    );
+    anim.add(
+      0.2,
+      time => {
+        tr2 = time;
+      },
+      0.8
+    );
 
     const ap = anim.start(1000);
     let resolveCalled = false;
@@ -132,12 +143,20 @@ describe('Animation', () => {
     expect(tr2).to.equal(-1);
   });
 
-
   it('should animate out-of-bounds time', () => {
     let tr1 = -1;
     // Linear curve between -0.5 and 1.5
-    const curve = time => {return time * 2 - 0.5;};
-    anim.add(0, time => {tr1 = time;}, 1, curve);
+    const curve = time => {
+      return time * 2 - 0.5;
+    };
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      1,
+      curve
+    );
 
     anim.start(1000);
 
@@ -163,8 +182,20 @@ describe('Animation', () => {
   it('halt freeze', () => {
     let tr1 = -1;
     let tr2 = -1;
-    anim.add(0, time => {tr1 = time;}, 0.8);
-    anim.add(0.2, time => {tr2 = time;}, 0.8);
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      0.8
+    );
+    anim.add(
+      0.2,
+      time => {
+        tr2 = time;
+      },
+      0.8
+    );
 
     const ap = anim.start(1000);
     let rejectCalled = false;
@@ -189,8 +220,20 @@ describe('Animation', () => {
   it('halt reset', () => {
     let tr1 = -1;
     let tr2 = -1;
-    anim.add(0, time => {tr1 = time;}, 0.8);
-    anim.add(0.2, time => {tr2 = time;}, 0.8);
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      0.8
+    );
+    anim.add(
+      0.2,
+      time => {
+        tr2 = time;
+      },
+      0.8
+    );
 
     const ap = anim.start(1000);
     let rejectCalled = false;
@@ -215,8 +258,20 @@ describe('Animation', () => {
   it('halt forward', () => {
     let tr1 = -1;
     let tr2 = -1;
-    anim.add(0, time => {tr1 = time;}, 0.8);
-    anim.add(0.2, time => {tr2 = time;}, 0.8);
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      0.8
+    );
+    anim.add(
+      0.2,
+      time => {
+        tr2 = time;
+      },
+      0.8
+    );
 
     const ap = anim.start(1000);
     let rejectCalled = false;
@@ -241,22 +296,39 @@ describe('Animation', () => {
   it('should NOT start animation when cannot animate', () => {
     let tr1 = -1;
     let tr2 = -1;
-    anim.add(0, time => {tr1 = time;}, 0.8);
-    anim.add(0.2, time => {tr2 = time;}, 0.8);
+    anim.add(
+      0,
+      time => {
+        tr1 = time;
+      },
+      0.8
+    );
+    anim.add(
+      0.2,
+      time => {
+        tr2 = time;
+      },
+      0.8
+    );
     vsync.canAnimate = () => false;
 
     const ap = anim.start(1000);
     expect(vsyncTasks).to.have.length(0);
     expect(ap.running_).to.be.false;
-    return ap.then(() => {
-      return 'SUCCESS';
-    }, () => {
-      return 'ERROR';
-    }).then(response => {
-      expect(tr1).to.equal(-1);
-      expect(tr2).to.equal(-1);
-      expect(response).to.equal('ERROR');
-    });
+    return ap
+      .then(
+        () => {
+          return 'SUCCESS';
+        },
+        () => {
+          return 'ERROR';
+        }
+      )
+      .then(response => {
+        expect(tr1).to.equal(-1);
+        expect(tr2).to.equal(-1);
+        expect(response).to.equal('ERROR');
+      });
   });
 
   it('should halt-freeze animation when cannot animate', () => {
diff --git a/test/unit/test-base-element.js b/test/unit/test-base-element.js
index a8eb60b558be..3e54db464b11 100644
--- a/test/unit/test-base-element.js
+++ b/test/unit/test-base-element.js
@@ -23,7 +23,6 @@ import {createAmpElementForTesting} from '../../src/custom-element';
 import {layoutRectLtwh} from '../../src/layout-rect';
 import {listenOncePromise} from '../../src/event-helper';
 
-
 describes.realWin('BaseElement', {amp: true}, env => {
   let win, doc;
   let customElement;
@@ -32,8 +31,10 @@ describes.realWin('BaseElement', {amp: true}, env => {
   beforeEach(() => {
     win = env.win;
     doc = win.document;
-    win.customElements.define('amp-test-element',
-        createAmpElementForTesting(win, 'amp-test-element', BaseElement));
+    win.customElements.define(
+      'amp-test-element',
+      createAmpElementForTesting(win, 'amp-test-element', BaseElement)
+    );
     customElement = doc.createElement('amp-test-element');
     element = new BaseElement(customElement);
   });
@@ -42,7 +43,9 @@ describes.realWin('BaseElement', {amp: true}, env => {
     const resources = win.services.resources.obj;
     customElement.getResources = () => resources;
     const updateLayoutPriorityStub = sandbox.stub(
-        resources, 'updateLayoutPriority');
+      resources,
+      'updateLayoutPriority'
+    );
     element.updateLayoutPriority(LayoutPriority.METADATA);
     expect(updateLayoutPriorityStub).to.be.calledOnce;
   });
@@ -85,9 +88,11 @@ describes.realWin('BaseElement', {amp: true}, env => {
   });
 
   it('should fail execution of unregistered action', () => {
-    allowConsoleError(() => { expect(() => {
-      element.executeAction({method: 'method1'}, false);
-    }).to.throw(/Method not found/); });
+    allowConsoleError(() => {
+      expect(() => {
+        element.executeAction({method: 'method1'}, false);
+      }).to.throw(/Method not found/);
+    });
   });
 
   it('`this` context of handler should not be the holder', () => {
@@ -120,9 +125,11 @@ describes.realWin('BaseElement', {amp: true}, env => {
     const handler = sandbox.spy();
     const anotherHandler = sandbox.spy();
     element.registerDefaultAction(handler);
-    return allowConsoleError(() => { expect(() => {
-      element.registerDefaultAction(anotherHandler);
-    }).to.throw(/Default action "activate" already registered./);});
+    return allowConsoleError(() => {
+      expect(() => {
+        element.registerDefaultAction(anotherHandler);
+      }).to.throw(/Default action "activate" already registered./);
+    });
   });
 
   it('should check trust before invocation', () => {
@@ -132,22 +139,34 @@ describes.realWin('BaseElement', {amp: true}, env => {
     element.registerDefaultAction(handler, 'foo', minTrust);
 
     // Registered action.
-    element.executeAction({
-      method: 'foo',
-      satisfiesTrust: () => false,
-    }, null, false);
+    element.executeAction(
+      {
+        method: 'foo',
+        satisfiesTrust: () => false,
+      },
+      null,
+      false
+    );
     expect(handler).to.not.be.called;
-    element.executeAction({
-      method: 'foo',
-      satisfiesTrust: t => (t == minTrust),
-    }, null, false);
+    element.executeAction(
+      {
+        method: 'foo',
+        satisfiesTrust: t => t == minTrust,
+      },
+      null,
+      false
+    );
     expect(handler).to.be.called;
 
     // Action 'foo' is invoked by default 'activate' method.
-    element.executeAction({
-      method: 'activate',
-      satisfiesTrust: () => true,
-    }, null, false);
+    element.executeAction(
+      {
+        method: 'activate',
+        satisfiesTrust: () => true,
+      },
+      null,
+      false
+    );
     expect(handler).to.be.called;
   });
 
@@ -155,9 +174,10 @@ describes.realWin('BaseElement', {amp: true}, env => {
     const resources = win.services.resources.obj;
     customElement.getResources = () => resources;
     const resource = new Resource(1, customElement, resources);
-    sandbox.stub(resources, 'getResourceForElement')
-        .withArgs(customElement)
-        .returns(resource);
+    sandbox
+      .stub(resources, 'getResourceForElement')
+      .withArgs(customElement)
+      .returns(resource);
     const layoutBox = layoutRectLtwh(0, 50, 100, 200);
     const pageLayoutBox = layoutRectLtwh(0, 0, 100, 200);
     sandbox.stub(resource, 'getLayoutBox').callsFake(() => layoutBox);
@@ -216,11 +236,7 @@ describes.realWin('BaseElement', {amp: true}, env => {
       target.dispatchEvent(event1);
       target.dispatchEvent(event2);
 
-      return Promise.all([
-        event1Promise,
-        event2Promise,
-      ]);
+      return Promise.all([event1Promise, event2Promise]);
     });
   });
-
 });
diff --git a/test/unit/test-batched-json.js b/test/unit/test-batched-json.js
index 4b077bf1b2f2..3feb415b955d 100644
--- a/test/unit/test-batched-json.js
+++ b/test/unit/test-batched-json.js
@@ -50,9 +50,11 @@ describe('batchFetchJsonFor', () => {
     };
     sandbox.stub(Services, 'urlReplacementsForDoc').returns(urlReplacements);
 
-    fetchJson = sandbox.stub().returns(Promise.resolve({
-      json: () => Promise.resolve(data),
-    }));
+    fetchJson = sandbox.stub().returns(
+      Promise.resolve({
+        json: () => Promise.resolve(data),
+      })
+    );
     batchedXhr = {fetchJson};
     sandbox.stub(Services, 'batchedXhrFor').returns(batchedXhr);
   });
@@ -72,30 +74,36 @@ describe('batchFetchJsonFor', () => {
       });
     });
 
-    it('should throw user error if expanding non-whitelisted vars with ' +
-      'opt_urlReplacement == OPT_IN', () => {
-      const el = element('https://data.com?x=FOO&y=BAR');
+    it(
+      'should throw user error if expanding non-whitelisted vars with ' +
+        'opt_urlReplacement == OPT_IN',
+      () => {
+        const el = element('https://data.com?x=FOO&y=BAR');
 
-      urlReplacements.expandUrlAsync
+        urlReplacements.expandUrlAsync
           .withArgs('https://data.com?x=FOO&y=BAR')
           .returns(Promise.resolve('https://data.com?x=abc&y=BAR'));
-      urlReplacements.collectUnwhitelistedVarsSync
+        urlReplacements.collectUnwhitelistedVarsSync
           .withArgs(el)
           .returns(['BAR']);
 
-      const optIn = UrlReplacementPolicy.OPT_IN;
-      const rejectError =
-          /Please add data-amp-replace="BAR" to the <AMP-LIST> element./;
-      return batchFetchJsonFor(ampdoc, el, null, optIn)
-          .should.eventually.be.rejectedWith(rejectError);
-    });
+        const optIn = UrlReplacementPolicy.OPT_IN;
+        const rejectError = /Please add data-amp-replace="BAR" to the <AMP-LIST> element./;
+        return batchFetchJsonFor(
+          ampdoc,
+          el,
+          null,
+          optIn
+        ).should.eventually.be.rejectedWith(rejectError);
+      }
+    );
 
     it('should replace all URL vars if opt_urlReplacement == ALL', () => {
       const el = element('https://data.com?x=FOO&y=BAR');
 
       urlReplacements.expandUrlAsync
-          .withArgs('https://data.com?x=FOO&y=BAR')
-          .returns(Promise.resolve('https://data.com?x=abc&y=BAR'));
+        .withArgs('https://data.com?x=FOO&y=BAR')
+        .returns(Promise.resolve('https://data.com?x=abc&y=BAR'));
 
       const userError = sandbox.stub(user(), 'error');
       const all = UrlReplacementPolicy.ALL;
@@ -113,8 +121,8 @@ describe('batchFetchJsonFor', () => {
       const all = UrlReplacementPolicy.ALL;
 
       urlReplacements.expandUrlAsync
-          .withArgs('https://data.com')
-          .returns(Promise.resolve('https://data.com'));
+        .withArgs('https://data.com')
+        .returns(Promise.resolve('https://data.com'));
 
       const expectedRequest = {
         'body': {'ampViewerAuthToken': 'idtoken'},
@@ -125,11 +133,14 @@ describe('batchFetchJsonFor', () => {
         'requireAmpResponseSourceOrigin': false,
       };
 
-      return batchFetchJsonFor(ampdoc, el, null, all, false, 'idtoken')
-          .then(() => {
-            expect(fetchJson).to.be.calledWithExactly(
-                'https://data.com', expectedRequest);
-          });
+      return batchFetchJsonFor(ampdoc, el, null, all, false, 'idtoken').then(
+        () => {
+          expect(fetchJson).to.be.calledWithExactly(
+            'https://data.com',
+            expectedRequest
+          );
+        }
+      );
     });
 
     it('should send POST request with empty, defined identity token', () => {
@@ -137,16 +148,15 @@ describe('batchFetchJsonFor', () => {
       const all = UrlReplacementPolicy.ALL;
 
       urlReplacements.expandUrlAsync
-          .withArgs('https://data.com')
-          .returns(Promise.resolve('https://data.com'));
+        .withArgs('https://data.com')
+        .returns(Promise.resolve('https://data.com'));
 
       const token = '';
-      return batchFetchJsonFor(ampdoc, el, null, all, false, token)
-          .then(() => {
-            const fetchOpt = fetchJson.firstCall.args[1];
-            expect(fetchOpt.body.ampViewerAuthToken).to.equal('');
-            expect(fetchOpt.method).to.equal('POST');
-          });
+      return batchFetchJsonFor(ampdoc, el, null, all, false, token).then(() => {
+        const fetchOpt = fetchJson.firstCall.args[1];
+        expect(fetchOpt.body.ampViewerAuthToken).to.equal('');
+        expect(fetchOpt.method).to.equal('POST');
+      });
     });
 
     it('should not transform the request with an undefined token', () => {
@@ -154,18 +164,19 @@ describe('batchFetchJsonFor', () => {
       const all = UrlReplacementPolicy.ALL;
 
       urlReplacements.expandUrlAsync
-          .withArgs('https://data.com')
-          .returns(Promise.resolve('https://data.com'));
+        .withArgs('https://data.com')
+        .returns(Promise.resolve('https://data.com'));
 
       const expectedRequest = {
         'requireAmpResponseSourceOrigin': false,
       };
 
-      return batchFetchJsonFor(ampdoc, el, null, all, false)
-          .then(() => {
-            expect(fetchJson).to.be.calledWithExactly(
-                'https://data.com', expectedRequest);
-          });
+      return batchFetchJsonFor(ampdoc, el, null, all, false).then(() => {
+        expect(fetchJson).to.be.calledWithExactly(
+          'https://data.com',
+          expectedRequest
+        );
+      });
     });
   });
   // TODO(choumx): Add tests for normal fetch functionality.
diff --git a/test/unit/test-batched-xhr.js b/test/unit/test-batched-xhr.js
index 4bc8a635de95..37406c49f814 100644
--- a/test/unit/test-batched-xhr.js
+++ b/test/unit/test-batched-xhr.js
@@ -34,8 +34,9 @@ describes.sandboxed('BatchedXhr', {}, env => {
 
     beforeEach(() => {
       xhr = batchedXhrServiceForTesting(env.win);
-      fetchStub = env.sandbox.stub(xhr, 'fetchAmpCors_').callsFake(
-          () => Promise.resolve(new Response(TEST_RESPONSE)));
+      fetchStub = env.sandbox
+        .stub(xhr, 'fetchAmpCors_')
+        .callsFake(() => Promise.resolve(new Response(TEST_RESPONSE)));
     });
 
     it('should fetch a generic request once for identical URLs', () => {
@@ -51,21 +52,24 @@ describes.sandboxed('BatchedXhr', {}, env => {
       });
     });
 
-    it('should separately cache generic fetches with identical URLs' +
-        'but different "Accept" headers', () => {
-      return Promise.all([
-        xhr.fetch('/get?k=v1', textInit).then(response => response.text()),
-        xhr.fetch('/get?k=v1', textInit).then(response => response.text()),
-        xhr.fetch('/get?k=v1', jsonInit).then(response => response.json()),
-        xhr.fetch('/get?k=v1', jsonInit).then(response => response.json()),
-      ]).then(results => {
-        expect(fetchStub).to.be.calledTwice;
-        expect(results[0]).to.equal(TEST_RESPONSE);
-        expect(results[1]).to.equal(TEST_RESPONSE);
-        expect(results[2]).to.jsonEqual(TEST_OBJECT);
-        expect(results[3]).to.jsonEqual(TEST_OBJECT);
-      });
-    });
+    it(
+      'should separately cache generic fetches with identical URLs' +
+        'but different "Accept" headers',
+      () => {
+        return Promise.all([
+          xhr.fetch('/get?k=v1', textInit).then(response => response.text()),
+          xhr.fetch('/get?k=v1', textInit).then(response => response.text()),
+          xhr.fetch('/get?k=v1', jsonInit).then(response => response.json()),
+          xhr.fetch('/get?k=v1', jsonInit).then(response => response.json()),
+        ]).then(results => {
+          expect(fetchStub).to.be.calledTwice;
+          expect(results[0]).to.equal(TEST_RESPONSE);
+          expect(results[1]).to.equal(TEST_RESPONSE);
+          expect(results[2]).to.jsonEqual(TEST_OBJECT);
+          expect(results[3]).to.jsonEqual(TEST_OBJECT);
+        });
+      }
+    );
 
     it('should cache the same as the convenience methods', () => {
       return Promise.all([
@@ -93,8 +97,9 @@ describes.sandboxed('BatchedXhr', {}, env => {
 
     beforeEach(() => {
       xhr = batchedXhrServiceForTesting(env.win);
-      fetchStub = env.sandbox.stub(xhr, 'fetchAmpCors_').callsFake(
-          () => Promise.resolve(new Response(TEST_RESPONSE, init)));
+      fetchStub = env.sandbox
+        .stub(xhr, 'fetchAmpCors_')
+        .callsFake(() => Promise.resolve(new Response(TEST_RESPONSE, init)));
     });
 
     it('should fetch JSON GET requests once for identical URLs', () => {
@@ -136,8 +141,9 @@ describes.sandboxed('BatchedXhr', {}, env => {
 
     beforeEach(() => {
       xhr = batchedXhrServiceForTesting(env.win);
-      fetchStub = env.sandbox.stub(xhr, 'fetchAmpCors_').callsFake(
-          () => Promise.resolve(new Response(TEST_RESPONSE)));
+      fetchStub = env.sandbox
+        .stub(xhr, 'fetchAmpCors_')
+        .callsFake(() => Promise.resolve(new Response(TEST_RESPONSE)));
     });
 
     it('should fetch text GET requests once for identical URLs', () => {
diff --git a/test/unit/test-cache-cid-api.js b/test/unit/test-cache-cid-api.js
index b2e81bf1ce1c..30276d53f2bb 100644
--- a/test/unit/test-cache-cid-api.js
+++ b/test/unit/test-cache-cid-api.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import * as lolex from 'lolex';
 import {CacheCidApi} from '../../src/service/cache-cid-api';
 import {installTimerService} from '../../src/service/timer-impl';
@@ -39,7 +38,9 @@ describes.realWin('cacheCidApi', {amp: true}, env => {
     ]);
 
     clock = lolex.install({
-      target: env.win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+      target: env.win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
     installTimerService(env.win);
     api = new CacheCidApi(env.ampdoc);
   });
@@ -74,73 +75,89 @@ describes.realWin('cacheCidApi', {amp: true}, env => {
     });
 
     it('should use client ID API from api if everything great', () => {
-      fetchJsonStub.returns(Promise.resolve({
-        json: () => { return Promise.resolve({
-          publisherClientId: 'publisher-client-id-from-cache',
-        });
-        },
-      }));
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              publisherClientId: 'publisher-client-id-from-cache',
+            });
+          },
+        })
+      );
       return api.getScopedCid('AMP_ECID_GOOGLE').then(cid => {
-        expect(cid).to.equal('amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
-        'rvvfkCif_N9oYLdZEB976uJDhYgL');
-        expect(fetchJsonStub)
-            .to.be.calledWith('https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
-                {
-                  method: 'POST',
-                  ampCors: false,
-                  credentials: 'include',
-                  mode: 'cors',
-                  body: {
-                    publisherOrigin: 'about:srcdoc',
-                  },
-                });
+        expect(cid).to.equal(
+          'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
+            'rvvfkCif_N9oYLdZEB976uJDhYgL'
+        );
+        expect(fetchJsonStub).to.be.calledWith(
+          'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              publisherOrigin: 'about:srcdoc',
+            },
+          }
+        );
       });
     });
 
     it('should return null if opted out', () => {
-      fetchJsonStub.returns(Promise.resolve({
-        json: () => {
-	  return Promise.resolve({
-            optOut: true,
-	  });
-        },
-      }));
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              optOut: true,
+            });
+          },
+        })
+      );
       return api.getScopedCid('AMP_ECID_GOOGLE').then(cid => {
         expect(cid).to.equal(null);
-        expect(fetchJsonStub)
-            .to.be.calledWith('https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
-                {
-                  method: 'POST',
-                  ampCors: false,
-                  credentials: 'include',
-                  mode: 'cors',
-                  body: {
-                    publisherOrigin: 'about:srcdoc',
-                  },
-                });
+        expect(fetchJsonStub).to.be.calledWith(
+          'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              publisherOrigin: 'about:srcdoc',
+            },
+          }
+        );
       });
     });
 
     it('should try alternative url if API provides', () => {
-      fetchJsonStub.onCall(0).returns(Promise.resolve({
-        json: () => {
-          return Promise.resolve({
-            alternateUrl: 'https://ampcid.google.co.uk/v1/cache:getClientId',
-          });
-        },
-      }));
-      fetchJsonStub.onCall(1).returns(Promise.resolve({
-        json: () => {
-          return Promise.resolve({
-            publisherClientId: 'publisher-client-id-from-cache',
-          });
-        },
-      }));
+      fetchJsonStub.onCall(0).returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              alternateUrl: 'https://ampcid.google.co.uk/v1/cache:getClientId',
+            });
+          },
+        })
+      );
+      fetchJsonStub.onCall(1).returns(
+        Promise.resolve({
+          json: () => {
+            return Promise.resolve({
+              publisherClientId: 'publisher-client-id-from-cache',
+            });
+          },
+        })
+      );
       return api.getScopedCid('AMP_ECID_GOOGLE').then(cid => {
-        expect(cid).to.equal('amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
-        'rvvfkCif_N9oYLdZEB976uJDhYgL');
+        expect(cid).to.equal(
+          'amp-mJW1ZjoviqBJydzRI8KnitWEpqyhQqDegGCl' +
+            'rvvfkCif_N9oYLdZEB976uJDhYgL'
+        );
         expect(fetchJsonStub.getCall(1).args[0]).to.equal(
-            'https://ampcid.google.co.uk/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc');
+          'https://ampcid.google.co.uk/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc'
+        );
       });
     });
 
@@ -154,26 +171,28 @@ describes.realWin('cacheCidApi', {amp: true}, env => {
               });
             },
           });
-        }
-        );
+        });
       });
-      const response = api.getScopedCid('AMP_ECID_GOOGLE').then(cid => {
-        expect(cid).to.equal(null);
-        expect(fetchJsonStub)
-            .to.be.calledWith('https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
-                {
-                  method: 'POST',
-                  ampCors: false,
-                  credentials: 'include',
-                  mode: 'cors',
-                  body: {
-                    publisherOrigin: 'about:srcdoc',
-                  },
-                });
-      }).catch(() => {});
+      const response = api
+        .getScopedCid('AMP_ECID_GOOGLE')
+        .then(cid => {
+          expect(cid).to.equal(null);
+          expect(fetchJsonStub).to.be.calledWith(
+            'https://ampcid.google.com/v1/cache:getClientId?key=AIzaSyDKtqGxnoeIqVM33Uf7hRSa3GJxuzR7mLc',
+            {
+              method: 'POST',
+              ampCors: false,
+              credentials: 'include',
+              mode: 'cors',
+              body: {
+                publisherOrigin: 'about:srcdoc',
+              },
+            }
+          );
+        })
+        .catch(() => {});
       clock.tick(30000);
       return response;
     });
-
   });
 });
diff --git a/test/unit/test-chunk.js b/test/unit/test-chunk.js
index 04dbab2f07b1..bf89ac16753c 100644
--- a/test/unit/test-chunk.js
+++ b/test/unit/test-chunk.js
@@ -24,9 +24,7 @@ import {
 } from '../../src/chunk';
 import {installDocService} from '../../src/service/ampdoc-impl';
 
-
 describe('chunk', () => {
-
   beforeEach(() => {
     activateChunkingForTesting();
   });
@@ -87,65 +85,75 @@ describe('chunk', () => {
     });
   }
 
-  describes.fakeWin('visible no amp', {
-    amp: false,
-  }, env => {
-
-    beforeEach(() => {
-      installDocService(env.win, /* isSingleDoc */ true);
-      expect(env.win.services.viewer).to.be.undefined;
-      env.win.document.hidden = false;
-    });
-
-    basicTests(env);
-  });
-
-  describes.fakeWin('invisible no amp', {
-    amp: false,
-  }, env => {
-
-    beforeEach(() => {
-      installDocService(env.win, /* isSingleDoc */ true);
-      expect(env.win.services.viewer).to.be.undefined;
-      env.win.document.hidden = true;
-      env.win.requestIdleCallback = function() {
-        throw new Error('Should not be called');
-      };
-      env.win.postMessage = function(data, targetOrigin) {
-        expect(targetOrigin).to.equal('*');
-        Promise.resolve().then(() => {
-          const event = {
-            data,
-            type: 'message',
-          };
-          env.win.eventListeners.fire(event);
-        });
-      };
-    });
-
-    basicTests(env);
-  });
-
-  describes.fakeWin('with viewer', {
-    amp: true,
-  }, env => {
+  describes.fakeWin(
+    'visible no amp',
+    {
+      amp: false,
+    },
+    env => {
+      beforeEach(() => {
+        installDocService(env.win, /* isSingleDoc */ true);
+        expect(env.win.services.viewer).to.be.undefined;
+        env.win.document.hidden = false;
+      });
 
-    beforeEach(() => {
-      expect(env.win.services.viewer).to.exist;
-      env.win.document.hidden = false;
-    });
+      basicTests(env);
+    }
+  );
+
+  describes.fakeWin(
+    'invisible no amp',
+    {
+      amp: false,
+    },
+    env => {
+      beforeEach(() => {
+        installDocService(env.win, /* isSingleDoc */ true);
+        expect(env.win.services.viewer).to.be.undefined;
+        env.win.document.hidden = true;
+        env.win.requestIdleCallback = function() {
+          throw new Error('Should not be called');
+        };
+        env.win.postMessage = function(data, targetOrigin) {
+          expect(targetOrigin).to.equal('*');
+          Promise.resolve().then(() => {
+            const event = {
+              data,
+              type: 'message',
+            };
+            env.win.eventListeners.fire(event);
+          });
+        };
+      });
 
-    describe('visible', () => {
+      basicTests(env);
+    }
+  );
+
+  describes.fakeWin(
+    'with viewer',
+    {
+      amp: true,
+    },
+    env => {
       beforeEach(() => {
-        const viewer = Services.viewerForDoc(env.win.document);
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return true;
+        expect(env.win.services.viewer).to.exist;
+        env.win.document.hidden = false;
+      });
+
+      describe('visible', () => {
+        beforeEach(() => {
+          const viewer = Services.viewerForDoc(env.win.document);
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return true;
+          });
         });
+        basicTests(env);
       });
-      basicTests(env);
-    });
 
-    describe.configure().skip(() => !('onunhandledrejection' in window))
+      describe
+        .configure()
+        .skip(() => !('onunhandledrejection' in window))
         .run('error handling', () => {
           let fakeWin;
           let done;
@@ -178,142 +186,153 @@ describe('chunk', () => {
           });
         });
 
-    describe('invisible', () => {
-      beforeEach(() => {
-        const viewer = Services.viewerForDoc(env.win.document);
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return false;
-        });
-        env.win.requestIdleCallback =
-            resolvingIdleCallbackWithTimeRemaining(15);
-        const chunks = chunkInstanceForTesting(env.win.document);
-        env.sandbox.stub(chunks, 'executeAsap_').callsFake(() => {
-          throw new Error('No calls expected: executeAsap_');
+      describe('invisible', () => {
+        beforeEach(() => {
+          const viewer = Services.viewerForDoc(env.win.document);
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return false;
+          });
+          env.win.requestIdleCallback = resolvingIdleCallbackWithTimeRemaining(
+            15
+          );
+          const chunks = chunkInstanceForTesting(env.win.document);
+          env.sandbox.stub(chunks, 'executeAsap_').callsFake(() => {
+            throw new Error('No calls expected: executeAsap_');
+          });
+          env.win.location.resetHref('test#visibilityState=hidden');
         });
-        env.win.location.resetHref('test#visibilityState=hidden');
-      });
 
-      basicTests(env);
-    });
+        basicTests(env);
+      });
 
-    describe('invisible but deactivated', () => {
-      beforeEach(() => {
-        deactivateChunking();
-        const viewer = Services.viewerForDoc(env.win.document);
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return false;
+      describe('invisible but deactivated', () => {
+        beforeEach(() => {
+          deactivateChunking();
+          const viewer = Services.viewerForDoc(env.win.document);
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return false;
+          });
+          env.win.requestIdleCallback = () => {
+            throw new Error('No calls expected');
+          };
+          env.win.location.resetHref('test#visibilityState=hidden');
         });
-        env.win.requestIdleCallback = () => {
-          throw new Error('No calls expected');
-        };
-        env.win.location.resetHref('test#visibilityState=hidden');
-      });
 
-      basicTests(env);
-    });
+        basicTests(env);
+      });
 
-    describe('invisible via document.hidden', () => {
-      beforeEach(() => {
-        const viewer = Services.viewerForDoc(env.win.document);
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return false;
-        });
-        env.win.requestIdleCallback =
-            resolvingIdleCallbackWithTimeRemaining(15);
-        const chunks = chunkInstanceForTesting(env.win.document);
-        env.sandbox.stub(chunks, 'executeAsap_').callsFake(() => {
-          throw new Error('No calls expected: executeAsap_');
+      describe('invisible via document.hidden', () => {
+        beforeEach(() => {
+          const viewer = Services.viewerForDoc(env.win.document);
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return false;
+          });
+          env.win.requestIdleCallback = resolvingIdleCallbackWithTimeRemaining(
+            15
+          );
+          const chunks = chunkInstanceForTesting(env.win.document);
+          env.sandbox.stub(chunks, 'executeAsap_').callsFake(() => {
+            throw new Error('No calls expected: executeAsap_');
+          });
+          env.win.document.hidden = true;
         });
-        env.win.document.hidden = true;
+
+        basicTests(env);
       });
 
-      basicTests(env);
-    });
+      describe('invisible to visible', () => {
+        beforeEach(() => {
+          env.win.location.resetHref('test#visibilityState=hidden');
+          const viewer = Services.viewerForDoc(env.win.document);
+          let visible = false;
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return visible;
+          });
+          env.win.requestIdleCallback = () => {
+            // Don't call the callback, but transition to visible
+            visible = true;
+            viewer.onVisibilityChange_();
+          };
+        });
 
-    describe('invisible to visible', () => {
-      beforeEach(() => {
-        env.win.location.resetHref('test#visibilityState=hidden');
-        const viewer = Services.viewerForDoc(env.win.document);
-        let visible = false;
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return visible;
+        basicTests(env);
+      });
+
+      describe('invisible to visible', () => {
+        beforeEach(() => {
+          env.win.location.resetHref('test#visibilityState=prerender');
+          const viewer = Services.viewerForDoc(env.win.document);
+          let visible = false;
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return visible;
+          });
+          env.win.requestIdleCallback = () => {
+            // Don't call the callback, but transition to visible
+            visible = true;
+            viewer.onVisibilityChange_();
+          };
         });
-        env.win.requestIdleCallback = () => {
-          // Don't call the callback, but transition to visible
-          visible = true;
-          viewer.onVisibilityChange_();
-        };
+
+        basicTests(env);
       });
 
-      basicTests(env);
-    });
+      describe('invisible to visible after a while', () => {
+        beforeEach(() => {
+          env.win.location.resetHref('test#visibilityState=hidden');
+          const viewer = Services.viewerForDoc(env.win.document);
+          let visible = false;
+          env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
+            return visible;
+          });
+          env.win.requestIdleCallback = () => {
+            // Don't call the callback, but transition to visible
+            setTimeout(() => {
+              visible = true;
+              viewer.onVisibilityChange_();
+            }, 10);
+          };
+        });
 
-    describe('invisible to visible', () => {
+        basicTests(env);
+      });
+    }
+  );
+
+  describes.realWin(
+    'realWin',
+    {
+      amp: true,
+    },
+    env => {
       beforeEach(() => {
-        env.win.location.resetHref('test#visibilityState=prerender');
-        const viewer = Services.viewerForDoc(env.win.document);
-        let visible = false;
-        env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return visible;
+        Object.defineProperty(env.win.document, 'hidden', {
+          get: () => false,
         });
-        env.win.requestIdleCallback = () => {
-          // Don't call the callback, but transition to visible
-          visible = true;
-          viewer.onVisibilityChange_();
-        };
       });
-
       basicTests(env);
-    });
-
-    describe('invisible to visible after a while', () => {
+    }
+  );
+
+  describes.realWin(
+    'realWin noIdleCallback',
+    {
+      amp: true,
+    },
+    env => {
       beforeEach(() => {
-        env.win.location.resetHref('test#visibilityState=hidden');
+        env.win.requestIdleCallback = null;
+        expect(env.win.requestIdleCallback).to.be.null;
         const viewer = Services.viewerForDoc(env.win.document);
-        let visible = false;
         env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-          return visible;
+          return false;
+        });
+        Object.defineProperty(env.win.document, 'hidden', {
+          get: () => false,
         });
-        env.win.requestIdleCallback = () => {
-          // Don't call the callback, but transition to visible
-          setTimeout(() => {
-            visible = true;
-            viewer.onVisibilityChange_();
-          }, 10);
-        };
       });
-
       basicTests(env);
-    });
-  });
-
-  describes.realWin('realWin', {
-    amp: true,
-  }, env => {
-    beforeEach(() => {
-      Object.defineProperty(env.win.document, 'hidden', {
-        get: () => false,
-      });
-    });
-    basicTests(env);
-  });
-
-  describes.realWin('realWin noIdleCallback', {
-    amp: true,
-  }, env => {
-    beforeEach(() => {
-      env.win.requestIdleCallback = null;
-      expect(env.win.requestIdleCallback).to.be.null;
-      const viewer = Services.viewerForDoc(env.win.document);
-      env.sandbox.stub(viewer, 'isVisible').callsFake(() => {
-        return false;
-      });
-      Object.defineProperty(env.win.document, 'hidden', {
-        get: () => false,
-      });
-    });
-    basicTests(env);
-  });
+    }
+  );
 });
 
 describe('onIdle', () => {
diff --git a/test/unit/test-cid-api.js b/test/unit/test-cid-api.js
index bf3cf0d40965..041e2464623f 100644
--- a/test/unit/test-cid-api.js
+++ b/test/unit/test-cid-api.js
@@ -19,7 +19,6 @@ import {getCookie, setCookie} from '../../src/cookies';
 import {mockWindowInterface, stubService} from '../../testing/test-helper';
 
 describes.realWin('test-cid-api', {amp: true}, env => {
-
   let win;
   let api;
   let fetchJsonStub;
@@ -47,69 +46,77 @@ describes.realWin('test-cid-api', {amp: true}, env => {
 
   describe('getScopedCid', () => {
     it('should get CID when no AMP_TOKEN exists', () => {
-      fetchJsonStub.returns(Promise.resolve({
-        json: () => {
-          return {
-            clientId: 'amp-12345',
-            securityToken: 'amp-token-123',
-          };
-        },
-      }));
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return {
+              clientId: 'amp-12345',
+              securityToken: 'amp-token-123',
+            };
+          },
+        })
+      );
       return api.getScopedCid('api-key', 'scope-a').then(cid => {
         expect(cid).to.equal('amp-12345');
         expect(getCookie(win, 'AMP_TOKEN')).to.equal('amp-token-123');
         expect(fetchJsonStub).to.be.calledWith(
-            'https://ampcid.google.com/v1/publisher:getClientId?key=api-key',
-            {
-              method: 'POST',
-              ampCors: false,
-              credentials: 'include',
-              mode: 'cors',
-              body: {
-                originScope: 'scope-a',
-                canonicalOrigin: 'http://localhost:9876',
-              },
-            });
+          'https://ampcid.google.com/v1/publisher:getClientId?key=api-key',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              originScope: 'scope-a',
+              canonicalOrigin: 'http://localhost:9876',
+            },
+          }
+        );
       });
     });
 
     it('should get CID when AMP_TOKEN exists', () => {
       persistCookie('AMP_TOKEN', 'amp-token-123');
-      fetchJsonStub.returns(Promise.resolve({
-        json: () => {
-          return {
-            clientId: 'amp-12345',
-          };
-        },
-      }));
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return {
+              clientId: 'amp-12345',
+            };
+          },
+        })
+      );
       return api.getScopedCid('api-key', 'scope-a').then(cid => {
         expect(cid).to.equal('amp-12345');
         expect(getCookie(win, 'AMP_TOKEN')).to.equal('amp-token-123');
         expect(fetchJsonStub).to.be.calledWith(
-            'https://ampcid.google.com/v1/publisher:getClientId?key=api-key',
-            {
-              method: 'POST',
-              ampCors: false,
-              credentials: 'include',
-              mode: 'cors',
-              body: {
-                originScope: 'scope-a',
-                securityToken: 'amp-token-123',
-                canonicalOrigin: 'http://localhost:9876',
-              },
-            });
+          'https://ampcid.google.com/v1/publisher:getClientId?key=api-key',
+          {
+            method: 'POST',
+            ampCors: false,
+            credentials: 'include',
+            mode: 'cors',
+            body: {
+              originScope: 'scope-a',
+              securityToken: 'amp-token-123',
+              canonicalOrigin: 'http://localhost:9876',
+            },
+          }
+        );
       });
     });
   });
 
   it('should return $OPT_OUT if API returns optOut', () => {
-    fetchJsonStub.returns(Promise.resolve({
-      json: () => {
-        return {
-          optOut: true,
-        };
-      },
-    }));
+    fetchJsonStub.returns(
+      Promise.resolve({
+        json: () => {
+          return {
+            optOut: true,
+          };
+        },
+      })
+    );
     return api.getScopedCid('api-key', 'scope-a').then(cid => {
       expect(cid).to.equal('$OPT_OUT');
       expect(getCookie(win, 'AMP_TOKEN')).to.equal('$OPT_OUT');
@@ -117,9 +124,13 @@ describes.realWin('test-cid-api', {amp: true}, env => {
   });
 
   it('should return null if API returns no CID', () => {
-    fetchJsonStub.returns(Promise.resolve({
-      json: () => {return {};},
-    }));
+    fetchJsonStub.returns(
+      Promise.resolve({
+        json: () => {
+          return {};
+        },
+      })
+    );
     return api.getScopedCid('api-key', 'scope-a').then(cid => {
       expect(cid).to.be.null;
       expect(getCookie(win, 'AMP_TOKEN')).to.equal('$NOT_FOUND');
@@ -127,33 +138,42 @@ describes.realWin('test-cid-api', {amp: true}, env => {
   });
 
   it('should try alternative url if API provides', () => {
-    fetchJsonStub.onCall(0).returns(Promise.resolve({
-      json: () => {
-        return {
-          alternateUrl: 'https://ampcid.google.co.uk/v1/publisher:getClientId',
-        };
-      },
-    }));
-    fetchJsonStub.onCall(1).returns(Promise.resolve({
-      json: () => {
-        return {
-          clientId: 'amp-alt-12345',
-        };
-      },
-    }));
+    fetchJsonStub.onCall(0).returns(
+      Promise.resolve({
+        json: () => {
+          return {
+            alternateUrl:
+              'https://ampcid.google.co.uk/v1/publisher:getClientId',
+          };
+        },
+      })
+    );
+    fetchJsonStub.onCall(1).returns(
+      Promise.resolve({
+        json: () => {
+          return {
+            clientId: 'amp-alt-12345',
+          };
+        },
+      })
+    );
     return api.getScopedCid('api-key', 'scope-a').then(cid => {
       expect(cid).to.equal('amp-alt-12345');
       expect(fetchJsonStub.getCall(1).args[0]).to.equal(
-          'https://ampcid.google.co.uk/v1/publisher:getClientId?key=api-key');
+        'https://ampcid.google.co.uk/v1/publisher:getClientId?key=api-key'
+      );
     });
   });
 
   it('should return null if API rejects', () => {
     fetchJsonStub.returns(Promise.reject());
-    return api.getScopedCid('api-key', 'scope-a').then(cid => {
-      expect(cid).to.be.null;
-      expect(getCookie(win, 'AMP_TOKEN')).to.equal('$ERROR');
-    }).catch(() => {}); // Prevent the rejection from being thrown.
+    return api
+      .getScopedCid('api-key', 'scope-a')
+      .then(cid => {
+        expect(cid).to.be.null;
+        expect(getCookie(win, 'AMP_TOKEN')).to.equal('$ERROR');
+      })
+      .catch(() => {}); // Prevent the rejection from being thrown.
   });
 
   it('should return null if AMP_TOKEN=$ERROR', () => {
@@ -174,24 +194,31 @@ describes.realWin('test-cid-api', {amp: true}, env => {
     });
   });
 
-  it('should fetch CID from API if AMP_TOKEN=$NOT_FOUND ' +
-      'and document referrer is proxy origin', () => {
-    fetchJsonStub.returns(Promise.resolve({
-      json: () => {
-        return {
-          clientId: 'amp-12345',
-          securityToken: 'amp-token-123',
-        };
-      },
-    }));
-    const windowInterface = mockWindowInterface(env.sandbox);
-    windowInterface.getDocumentReferrer.returns('https://cdn.ampproject.org/');
-    persistCookie('AMP_TOKEN', '$NOT_FOUND');
-    return api.getScopedCid('api-key', 'scope-a').then(cid => {
-      expect(cid).to.equal('amp-12345');
-      expect(getCookie(win, 'AMP_TOKEN')).to.equal('amp-token-123');
-    });
-  });
+  it(
+    'should fetch CID from API if AMP_TOKEN=$NOT_FOUND ' +
+      'and document referrer is proxy origin',
+    () => {
+      fetchJsonStub.returns(
+        Promise.resolve({
+          json: () => {
+            return {
+              clientId: 'amp-12345',
+              securityToken: 'amp-token-123',
+            };
+          },
+        })
+      );
+      const windowInterface = mockWindowInterface(env.sandbox);
+      windowInterface.getDocumentReferrer.returns(
+        'https://cdn.ampproject.org/'
+      );
+      persistCookie('AMP_TOKEN', '$NOT_FOUND');
+      return api.getScopedCid('api-key', 'scope-a').then(cid => {
+        expect(cid).to.equal('amp-12345');
+        expect(getCookie(win, 'AMP_TOKEN')).to.equal('amp-token-123');
+      });
+    }
+  );
 
   it('should return $OPT_OUT if AMP_TOKEN=$OPT_OUT ', () => {
     persistCookie('AMP_TOKEN', '$OPT_OUT');
@@ -203,7 +230,11 @@ describes.realWin('test-cid-api', {amp: true}, env => {
 
   it('should not send another request if one is already out', () => {
     let responseResolver;
-    fetchJsonStub.returns(new Promise(res => {responseResolver = res;}));
+    fetchJsonStub.returns(
+      new Promise(res => {
+        responseResolver = res;
+      })
+    );
 
     const promise1 = api.getScopedCid('api-key', 'scope-a');
     const promise2 = api.getScopedCid('api-key', 'scope-a');
@@ -226,10 +257,16 @@ describes.realWin('test-cid-api', {amp: true}, env => {
     let responseResolverA;
     let responseResolverB;
 
-    fetchJsonStub.onCall(0)
-        .returns(new Promise(res => {responseResolverA = res;}));
-    fetchJsonStub.onCall(1)
-        .returns(new Promise(res => {responseResolverB = res;}));
+    fetchJsonStub.onCall(0).returns(
+      new Promise(res => {
+        responseResolverA = res;
+      })
+    );
+    fetchJsonStub.onCall(1).returns(
+      new Promise(res => {
+        responseResolverB = res;
+      })
+    );
     const promiseA = api.getScopedCid('api-key', 'scope-a');
     const promiseB = api.getScopedCid('api-key', 'scope-b');
 
diff --git a/test/unit/test-cid.js b/test/unit/test-cid.js
index 591e715b4366..1ba5769c27b9 100644
--- a/test/unit/test-cid.js
+++ b/test/unit/test-cid.js
@@ -25,17 +25,11 @@ import {
   optOutOfCid,
 } from '../../src/service/cid-impl';
 import {getCookie, setCookie} from '../../src/cookies';
-import {
-  installCryptoPolyfill,
-} from '../../extensions/amp-crypto-polyfill/0.1/amp-crypto-polyfill';
+import {installCryptoPolyfill} from '../../extensions/amp-crypto-polyfill/0.1/amp-crypto-polyfill';
 import {installDocService} from '../../src/service/ampdoc-impl';
-import {
-  installDocumentInfoServiceForDoc,
-} from '../../src/service/document-info-impl';
+import {installDocumentInfoServiceForDoc} from '../../src/service/document-info-impl';
 import {installDocumentStateService} from '../../src/service/document-state';
-import {
-  installExtensionsService,
-} from '../../src/service/extensions-impl';
+import {installExtensionsService} from '../../src/service/extensions-impl';
 import {installPlatformService} from '../../src/service/platform-impl';
 import {installTimerService} from '../../src/service/timer-impl';
 import {installViewerServiceForDoc} from '../../src/service/viewer-impl';
@@ -46,7 +40,6 @@ import {stubServiceForDoc} from '../../testing/test-helper';
 const DAY = 24 * 3600 * 1000;
 
 describe('cid', () => {
-
   let sandbox;
   let clock;
   let fakeWin;
@@ -132,22 +125,23 @@ describe('cid', () => {
     sandbox.stub(viewer, 'whenFirstVisible').callsFake(function() {
       return whenFirstVisible;
     });
-    sandbox.stub(viewer, 'isTrustedViewer').callsFake(
-        () => Promise.resolve(trustedViewer));
-    viewerSendMessageStub = sandbox.stub(
-        viewer, 'sendMessageAwaitResponse').callsFake(
-        (eventType, opt_data) => {
-          if (eventType != 'cid') {
-            return Promise.reject();
-          }
-          if (shouldSendMessageTimeout) {
-            return timer.promise(15000);
-          }
-          if (opt_data) {
-            viewerStorage = opt_data;
-          }
-          return Promise.resolve(viewerStorage || undefined);
-        });
+    sandbox
+      .stub(viewer, 'isTrustedViewer')
+      .callsFake(() => Promise.resolve(trustedViewer));
+    viewerSendMessageStub = sandbox
+      .stub(viewer, 'sendMessageAwaitResponse')
+      .callsFake((eventType, opt_data) => {
+        if (eventType != 'cid') {
+          return Promise.reject();
+        }
+        if (shouldSendMessageTimeout) {
+          return timer.promise(15000);
+        }
+        if (opt_data) {
+          viewerStorage = opt_data;
+        }
+        return Promise.resolve(viewerStorage || undefined);
+      });
 
     cid = cidServiceForDocForTesting(ampdoc);
     sandbox.stub(cid, 'isScopeOptedIn_').callsFake(() => null);
@@ -166,18 +160,20 @@ describe('cid', () => {
       // domain name: 'http://www.origin.com'
       // scope: 'custom-cid-scope'
       return compare(
-          'custom-cid-scope',
-          'tSSEaSFEU2-vkEO0Mb9HZejJui-npGRhXf3fD3H3iWeYQrjkQOTaRYdPyFTogNXA');
+        'custom-cid-scope',
+        'tSSEaSFEU2-vkEO0Mb9HZejJui-npGRhXf3fD3H3iWeYQrjkQOTaRYdPyFTogNXA'
+      );
     });
 
     it('should hash domain name and scope', () => {
       fakeWin.location.href =
-          'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
       // domain name: 'http://www.different.com'
       // scope: 'another-custom-cid-scope'
       return compare(
-          'another-custom-cid-scope',
-          '25lYHB6Luck8Z5ddpiB-FBbj2pa9zx3WdnJlZVgFneJRcFsDT3kIoPoi6k6-oxrB');
+        'another-custom-cid-scope',
+        '25lYHB6Luck8Z5ddpiB-FBbj2pa9zx3WdnJlZVgFneJRcFsDT3kIoPoi6k6-oxrB'
+      );
     });
   });
 
@@ -197,83 +193,99 @@ describe('cid', () => {
     it('should depend on external id e1', () => {
       clock.tick(123);
       return compare(
-          'e1',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)').then(() => {
+        'e1',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
+      ).then(() => {
         expect(storage['amp-cid']).to.be.string;
         const stored = JSON.parse(storage['amp-cid']);
         expect(stored.cid).to.equal(
-            'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])');
+          'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
+        );
         expect(stored.time).to.equal(123);
       });
     });
 
     it('should depend on external id e2', () => {
       return compare(
-          'e2',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)');
+        'e2',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+      );
     });
 
     it('should depend on domain', () => {
       fakeWin.location.href =
-          'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://cdn.ampproject.org/v/www.DIFFERENT.com/foo/?f=0';
       return compare(
-          'e2',
-          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.different.come2)');
+        'e2',
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.different.come2)'
+      );
     });
 
     it('should fallback to cookie value on custom domain.', () => {
-      fakeWin.location.href =
-          'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
-      return cid.get({
-        scope: 'scope_name',
-      }, hasConsent).then(c => {
-        expect(c).to.equal('54321');
-      });
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+          },
+          hasConsent
+        )
+        .then(c => {
+          expect(c).to.equal('54321');
+        });
     });
 
     it('should fallback to cookie of given name on custom domain.', () => {
-      fakeWin.location.href =
-          'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.document.cookie = 'cookie_name=12345;scope_name=54321;';
-      return cid.get({
-        scope: 'scope_name',
-        cookieName: 'cookie_name',
-      }, hasConsent).then(c => {
-        expect(c).to.equal('12345');
-      });
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+            cookieName: 'cookie_name',
+          },
+          hasConsent
+        )
+        .then(c => {
+          expect(c).to.equal('12345');
+        });
     });
 
-    it('should depend fall back to cookies on custom ' +
-        'domain and not create a cookie', () => {
-      fakeWin.location.href =
+    it(
+      'should depend fall back to cookies on custom ' +
+        'domain and not create a cookie',
+      () => {
+        fakeWin.location.href =
           'https://some.domain/v/www.DIFFERENT.com/foo/?f=0';
-      fakeWin.document.cookie = 'cookie_name=12345;';
-      return compare(
-          'other_cookie',
-          null);
-    });
+        fakeWin.document.cookie = 'cookie_name=12345;';
+        return compare('other_cookie', null);
+      }
+    );
 
     it('should produce golden value', () => {
       crypto.sha384Base64 = new Crypto(fakeWin).sha384Base64;
       return compare(
-          'e2',
-          'q0pPfZTWGruPrtURDJHexzs-MgOkt9SJAsAZodzr8tx8hKv8BS62AVpbttaFX8fK');
+        'e2',
+        'q0pPfZTWGruPrtURDJHexzs-MgOkt9SJAsAZodzr8tx8hKv8BS62AVpbttaFX8fK'
+      );
     });
 
     it('should be stable with respect to a saved seed', () => {
-      const expected = 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
       return compare('e2', expected).then(() => {
         return compare('e2', expected).then(() => {
           storage['amp-cid'] = undefined;
           removeMemoryCacheOfCid();
           return compare(
-              'e2',
-              'sha384(sha384([' +
+            'e2',
+            'sha384(sha384([' +
               // 2 because we increment the first value on each random
               // call.
               '2' +
-              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)');
+              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+          );
         });
       });
     });
@@ -283,9 +295,7 @@ describe('cid', () => {
         cid: 'YYY',
         time: Date.now(),
       });
-      return compare(
-          'e2',
-          'sha384(YYYhttp://www.origin.come2)');
+      return compare('e2', 'sha384(YYYhttp://www.origin.come2)');
     });
 
     it('should return empty if opted out', () => {
@@ -295,9 +305,7 @@ describe('cid', () => {
         cid: 'YYY',
         time: Date.now(),
       });
-      return compare(
-          'e2',
-          '');
+      return compare('e2', '');
     });
 
     it('should read from viewer storage if embedded', () => {
@@ -311,35 +319,42 @@ describe('cid', () => {
       return Promise.all([
         compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
         compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
-      ]).then(() => {
-        expect(viewerSendMessageStub).to.be.calledOnce;
-        expect(viewerSendMessageStub).to.be.calledWith('cid');
+      ])
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          expect(viewerSendMessageStub).to.be.calledWith('cid');
 
-        // Ensure it's called only once since we cache it in memory.
-        return compare(
-            'e3', `sha384(${expectedBaseCid}http://www.origin.come3)`);
-      }).then(() => {
-        expect(viewerSendMessageStub).to.be.calledOnce;
-        return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
-      });
+          // Ensure it's called only once since we cache it in memory.
+          return compare(
+            'e3',
+            `sha384(${expectedBaseCid}http://www.origin.come3)`
+          );
+        })
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
+        });
     });
 
-    it('should read from viewer storage if embedded and convert cid to ' +
-        'new format', () => {
-      expectAsyncConsoleError(doesNotProvideError);
-      expectAsyncConsoleError(invalidFormatError);
-      fakeWin.parent = {};
-      const expectedBaseCid = 'from-viewer';
-      // baseCid returned by legacy API
-      viewerStorage = expectedBaseCid;
-      return Promise.all([
-        compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
-        compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
-      ]).then(() => {
-        expect(viewerSendMessageStub).to.be.calledOnce;
-        expect(viewerSendMessageStub).to.be.calledWith('cid');
-      });
-    });
+    it(
+      'should read from viewer storage if embedded and convert cid to ' +
+        'new format',
+      () => {
+        expectAsyncConsoleError(doesNotProvideError);
+        expectAsyncConsoleError(invalidFormatError);
+        fakeWin.parent = {};
+        const expectedBaseCid = 'from-viewer';
+        // baseCid returned by legacy API
+        viewerStorage = expectedBaseCid;
+        return Promise.all([
+          compare('e1', `sha384(${expectedBaseCid}http://www.origin.come1)`),
+          compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`),
+        ]).then(() => {
+          expect(viewerSendMessageStub).to.be.calledOnce;
+          expect(viewerSendMessageStub).to.be.calledWith('cid');
+        });
+      }
+    );
 
     it('should not read from untrusted viewer', () => {
       fakeWin.parent = {};
@@ -350,8 +365,14 @@ describe('cid', () => {
         cid: viewerBaseCid,
       });
       return Promise.all([
-        compare('e1', 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'),
-        compare('e2', 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'),
+        compare(
+          'e1',
+          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come1)'
+        ),
+        compare(
+          'e2',
+          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+        ),
       ]).then(() => {
         expect(viewerSendMessageStub).to.not.be.called;
       });
@@ -362,20 +383,25 @@ describe('cid', () => {
       fakeWin.parent = {};
       const expectedBaseCid = 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])';
       return compare('e2', `sha384(${expectedBaseCid}http://www.origin.come2)`)
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledWith(
-                'cid', JSON.stringify({
-                  time: 0,
-                  cid: expectedBaseCid,
-                }));
-
-            // Ensure it's called only once since we cache it in memory.
-            return compare('e3', `sha384(${expectedBaseCid}http://www.origin.come3)`);
-          })
-          .then(() => {
-            expect(viewerSendMessageStub).to.be.calledWith(sinon.match.string);
-            return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
-          });
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledWith(
+            'cid',
+            JSON.stringify({
+              time: 0,
+              cid: expectedBaseCid,
+            })
+          );
+
+          // Ensure it's called only once since we cache it in memory.
+          return compare(
+            'e3',
+            `sha384(${expectedBaseCid}http://www.origin.come3)`
+          );
+        })
+        .then(() => {
+          expect(viewerSendMessageStub).to.be.calledWith(sinon.match.string);
+          return expect(cid.baseCid_).to.eventually.equal(expectedBaseCid);
+        });
     });
 
     it('should prefer value in storage if present', () => {
@@ -384,25 +410,25 @@ describe('cid', () => {
         cid: 'in-storage',
         time: Date.now(),
       });
-      return compare(
-          'e2',
-          'sha384(in-storagehttp://www.origin.come2)');
+      return compare('e2', 'sha384(in-storagehttp://www.origin.come2)');
     });
 
     it('should expire on read after 365 days', () => {
-      const expected = 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
       return compare('e2', expected).then(() => {
         clock.tick(364 * DAY);
         return compare('e2', expected).then(() => {
-          clock.tick((365 * DAY) + 1);
+          clock.tick(365 * DAY + 1);
           removeMemoryCacheOfCid();
           return compare(
-              'e2',
-              'sha384(sha384([' +
+            'e2',
+            'sha384(sha384([' +
               // 2 because we increment the first value on each random
               // call.
               '2' +
-              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)');
+              ',2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+          );
         });
       });
     });
@@ -417,11 +443,12 @@ describe('cid', () => {
       });
 
       const expectedIdFromViewer = 'sha384(from-viewerhttp://www.origin.come2)';
-      const expectedNewId = 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expectedNewId =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
       return compare('e2', expectedIdFromViewer).then(() => {
         clock.tick(364 * DAY);
         return compare('e2', expectedIdFromViewer).then(() => {
-          clock.tick((365 * DAY) + 1);
+          clock.tick(365 * DAY + 1);
           removeMemoryCacheOfCid();
           return compare('e2', expectedNewId);
         });
@@ -429,7 +456,8 @@ describe('cid', () => {
     });
 
     it('should set last access time once a day', () => {
-      const expected = 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
       function getStoredTime() {
         return JSON.parse(storage['amp-cid']).time;
       }
@@ -452,7 +480,8 @@ describe('cid', () => {
     it('should set last access time once a day when embedded', () => {
       expectAsyncConsoleError(doesNotProvideError, 5);
       fakeWin.parent = {};
-      const expected = 'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
+      const expected =
+        'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)';
       function getStoredTime() {
         return JSON.parse(viewerStorage).time;
       }
@@ -501,9 +530,11 @@ describe('cid', () => {
     });
 
     it('should fail on invalid scope', () => {
-      allowConsoleError(() => { expect(() => {
-        cid.get({scope: '$$$'}, Promise.resolve());
-      }).to.throw(/\$\$\$/); });
+      allowConsoleError(() => {
+        expect(() => {
+          cid.get({scope: '$$$'}, Promise.resolve());
+        }).to.throw(/\$\$\$/);
+      });
     });
 
     it('should not store until persistence promise resolves', () => {
@@ -518,11 +549,13 @@ describe('cid', () => {
           val = '[' + Array.apply([], val).join(',') + ']';
         }
 
-        return sha384Promise = Promise.resolve('sha384(' + val + ')');
+        return (sha384Promise = Promise.resolve('sha384(' + val + ')'));
       };
 
       return cid.get({scope: 'e2'}, hasConsent, persistencePromise).then(c => {
-        expect(c).to.equal('sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)');
+        expect(c).to.equal(
+          'sha384(sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])http://www.origin.come2)'
+        );
         expect(storage['amp-cid']).to.be.undefined;
         clock.tick(777);
         resolve();
@@ -530,7 +563,8 @@ describe('cid', () => {
           expect(storage['amp-cid']).to.be.string;
           const stored = JSON.parse(storage['amp-cid']);
           expect(stored.cid).to.equal(
-              'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])');
+            'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])'
+          );
           expect(stored.time).to.equal(777);
         });
       });
@@ -539,12 +573,16 @@ describe('cid', () => {
     it('should not wait persistence consent for viewer storage', () => {
       expectAsyncConsoleError(doesNotProvideError, 2);
       fakeWin.parent = {};
-      const persistencePromise = new Promise(() => {/* never resolves */});
+      const persistencePromise = new Promise(() => {
+        /* never resolves */
+      });
       return cid.get({scope: 'e2'}, hasConsent, persistencePromise).then(() => {
-        expect(viewerStorage).to.equal(JSON.stringify({
-          time: 0,
-          cid: 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])',
-        }));
+        expect(viewerStorage).to.equal(
+          JSON.stringify({
+            time: 0,
+            cid: 'sha384([1,2,3,0,0,0,0,0,0,0,0,0,0,0,0,15])',
+          })
+        );
       });
     });
 
@@ -561,14 +599,14 @@ describe('cid', () => {
       };
       clock.tick(7777);
       return compare(
-          'e2',
-          'sha384(sha384(https://cdn.ampproject.org/v' +
-          '/www.origin.com/foo/?f=07777999111222)http://www.origin.come2)');
+        'e2',
+        'sha384(sha384(https://cdn.ampproject.org/v' +
+          '/www.origin.com/foo/?f=07777999111222)http://www.origin.come2)'
+      );
     });
 
     it('should NOT create fallback cookie by default with string scope', () => {
-      fakeWin.location.href =
-          'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
       return cid.get({scope: 'cookie_name'}, hasConsent).then(c => {
         expect(c).to.not.exist;
         expect(fakeWin.document.cookie).to.not.exist;
@@ -576,8 +614,7 @@ describe('cid', () => {
     });
 
     it('should NOT create fallback cookie by default with struct scope', () => {
-      fakeWin.location.href =
-          'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
+      fakeWin.location.href = 'https://abc.org/v/www.DIFFERENT.com/foo/?f=0';
       return cid.get({scope: 'cookie_name'}, hasConsent).then(c => {
         expect(c).to.not.exist;
         expect(fakeWin.document.cookie).to.not.exist;
@@ -586,7 +623,7 @@ describe('cid', () => {
 
     it('should create fallback cookie when asked', () => {
       fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.location.hostname = 'foo.abc.org';
       fakeWin.crypto.getRandomValues = array => {
         array[0] = 0;
@@ -606,58 +643,69 @@ describe('cid', () => {
         array[14] = 200;
         array[15] = 39;
       };
-      return cid.get({scope: 'scope_name', createCookieIfNotPresent: true},
-          hasConsent).then(c => {
-        expect(c).to.exist;
-        // Since various parties depend on the cookie values, please be careful
-        // about changing the format.
-        expect(c).to.equal('amp-AAIECBAgQID_BwsWIULIJw');
-        expect(fakeWin.document.cookie).to.equal(
-            'scope_name=' + encodeURIComponent(c) +
-                '; path=/' +
-                '; domain=abc.org' +
-                '; expires=Fri, 01 Jan 1971 00:00:00 GMT'); // 1 year from 0.
-      });
+      return cid
+        .get({scope: 'scope_name', createCookieIfNotPresent: true}, hasConsent)
+        .then(c => {
+          expect(c).to.exist;
+          // Since various parties depend on the cookie values, please be careful
+          // about changing the format.
+          expect(c).to.equal('amp-AAIECBAgQID_BwsWIULIJw');
+          expect(fakeWin.document.cookie).to.equal(
+            'scope_name=' +
+              encodeURIComponent(c) +
+              '; path=/' +
+              '; domain=abc.org' +
+              '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
+          ); // 1 year from 0.
+        });
     });
 
     it('should create fallback cookie with provided name', () => {
       fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.location.hostname = 'foo.abc.org';
-      return cid.get({
-        scope: 'scope_name',
-        createCookieIfNotPresent: true,
-        cookieName: 'cookie_name',
-      }, hasConsent).then(c => {
-        expect(c).to.exist;
-        expect(c).to.equal('amp-AQIDAAAAAAAAAAAAAAAADw');
-        expect(fakeWin.document.cookie).to.equal(
-            'cookie_name=' + encodeURIComponent(c) +
-            '; path=/' +
-            '; domain=abc.org' +
-            '; expires=Fri, 01 Jan 1971 00:00:00 GMT'); // 1 year from 0.
-      });
+      return cid
+        .get(
+          {
+            scope: 'scope_name',
+            createCookieIfNotPresent: true,
+            cookieName: 'cookie_name',
+          },
+          hasConsent
+        )
+        .then(c => {
+          expect(c).to.exist;
+          expect(c).to.equal('amp-AQIDAAAAAAAAAAAAAAAADw');
+          expect(fakeWin.document.cookie).to.equal(
+            'cookie_name=' +
+              encodeURIComponent(c) +
+              '; path=/' +
+              '; domain=abc.org' +
+              '; expires=Fri, 01 Jan 1971 00:00:00 GMT'
+          ); // 1 year from 0.
+        });
     });
 
     it('should update fallback cookie expiration when present', () => {
       fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.location.hostname = 'foo.abc.org';
       fakeWin.document.cookie = 'cookie_name=amp-12345';
 
       return cid.get({scope: 'cookie_name'}, hasConsent).then(c => {
         expect(fakeWin.document.cookie).to.equal(
-            'cookie_name=' + encodeURIComponent(c) +
-          '; path=/' +
-          '; domain=abc.org' +
-          '; expires=Fri, 01 Jan 1971 00:00:00 GMT' // 1 year from 0.
+          'cookie_name=' +
+            encodeURIComponent(c) +
+            '; path=/' +
+            '; domain=abc.org' +
+            '; expires=Fri, 01 Jan 1971 00:00:00 GMT' // 1 year from 0.
         );
       });
     });
 
     it('should not update expiration when created externally', () => {
       fakeWin.location.href =
-          'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
+        'https://foo.abc.org/v/www.DIFFERENT.com/foo/?f=0';
       fakeWin.location.hostname = 'foo.abc.org';
       fakeWin.document.cookie = 'cookie_name=12345';
 
@@ -666,14 +714,17 @@ describe('cid', () => {
       });
     });
 
-    it('should return same value for multiple calls on non-proxied ' +
-        'urls', () => {
+    it('should return same value for multiple calls on non-proxied urls', () => {
       fakeWin.location.href = 'https://abc.org/foo/?f=0';
       fakeWin.location.hostname = 'foo.abc.org';
-      const cid1 = cid.get({scope: 'cookie', createCookieIfNotPresent: true},
-          hasConsent);
-      const cid2 = cid.get({scope: 'cookie', createCookieIfNotPresent: true},
-          hasConsent);
+      const cid1 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
+      const cid2 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
       return cid1.then(c1 => {
         return cid2.then(c2 => {
           expect(c1).to.equal(c2);
@@ -684,11 +735,15 @@ describe('cid', () => {
     it('should return same value for multiple calls on proxied urls', () => {
       fakeWin.location.href = 'https://cdn.ampproject.org/v/abc.org/foo/?f=0';
       fakeWin.location.hostname = 'cdn.ampproject.org';
-      const cid1 = cid.get({scope: 'cookie', createCookieIfNotPresent: true},
-          hasConsent);
+      const cid1 = cid.get(
+        {scope: 'cookie', createCookieIfNotPresent: true},
+        hasConsent
+      );
       return cid1.then(c1 => {
-        const cid2 = cid.get({scope: 'cookie', createCookieIfNotPresent: true},
-            hasConsent);
+        const cid2 = cid.get(
+          {scope: 'cookie', createCookieIfNotPresent: true},
+          hasConsent
+        );
         return cid2.then(c2 => {
           expect(c1).to.equal(c2);
         });
@@ -696,12 +751,9 @@ describe('cid', () => {
     });
 
     it('should retreive cookie value with . in name', () => {
-      fakeWin.location.href =
-          'https://abc.org/';
+      fakeWin.location.href = 'https://abc.org/';
       fakeWin.document.cookie = '_sp_id.44=4567;';
-      return compare(
-          '_sp_id.44',
-          '4567');
+      return compare('_sp_id.44', '4567');
     });
   });
 
@@ -718,9 +770,11 @@ describe('cid', () => {
 
 describe('getProxySourceOrigin', () => {
   it('should fail on non-proxy origin', () => {
-    allowConsoleError(() => { expect(() => {
-      getProxySourceOrigin(parseUrlDeprecated('https://abc.org/v/foo.com/'));
-    }).to.throw(/Expected proxy origin/); });
+    allowConsoleError(() => {
+      expect(() => {
+        getProxySourceOrigin(parseUrlDeprecated('https://abc.org/v/foo.com/'));
+      }).to.throw(/Expected proxy origin/);
+    });
   });
 });
 
@@ -737,7 +791,9 @@ describes.realWin('cid', {amp: true}, env => {
     ampdoc = env.ampdoc;
     sandbox = env.sandbox;
     clock = lolex.install({
-      target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+      target: win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
     cid = cidServiceForDocForTesting(ampdoc);
     sandbox.stub(cid.cacheCidApi_, 'isSupported').returns(false);
   });
@@ -746,55 +802,75 @@ describes.realWin('cid', {amp: true}, env => {
     clock.uninstall();
   });
 
-  it('should store CID in cookie when not in Viewer', function *() {
-    sandbox.stub(cid.viewerCidApi_, 'isSupported')
-        .returns(Promise.resolve(false));
+  it('should store CID in cookie when not in Viewer', function*() {
+    sandbox
+      .stub(cid.viewerCidApi_, 'isSupported')
+      .returns(Promise.resolve(false));
     setCookie(win, 'foo', '', 0);
-    const fooCid = yield cid.get({
-      scope: 'foo',
-      createCookieIfNotPresent: true,
-    }, hasConsent);
+    const fooCid = yield cid.get(
+      {
+        scope: 'foo',
+        createCookieIfNotPresent: true,
+      },
+      hasConsent
+    );
     expect(fooCid).to.have.string('amp-');
-    const fooCid2 = yield cid.get({
-      scope: 'foo',
-      createCookieIfNotPresent: true,
-    }, hasConsent);
+    const fooCid2 = yield cid.get(
+      {
+        scope: 'foo',
+        createCookieIfNotPresent: true,
+      },
+      hasConsent
+    );
     expect(fooCid).to.equal(fooCid2);
   });
 
   it('get method should return CID when in Viewer ', () => {
-    sandbox.stub(cid.viewerCidApi_, 'isSupported')
-        .returns(Promise.resolve(true));
+    sandbox
+      .stub(cid.viewerCidApi_, 'isSupported')
+      .returns(Promise.resolve(true));
     win.parent = {};
-    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'sendMessageAwaitResponse')
-        .returns(Promise.resolve('cid-from-viewer'));
-    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'isTrustedViewer')
-        .returns(Promise.resolve(true));
+    stubServiceForDoc(
+      sandbox,
+      ampdoc,
+      'viewer',
+      'sendMessageAwaitResponse'
+    ).returns(Promise.resolve('cid-from-viewer'));
+    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'isTrustedViewer').returns(
+      Promise.resolve(true)
+    );
     stubServiceForDoc(sandbox, ampdoc, 'viewer', 'hasCapability')
-        .withArgs('cid').returns(true);
+      .withArgs('cid')
+      .returns(true);
     sandbox.stub(url, 'isProxyOrigin').returns(true);
-    return expect(cid.get({scope: 'foo'}, hasConsent))
-        .to.eventually.equal('cid-from-viewer');
+    return expect(cid.get({scope: 'foo'}, hasConsent)).to.eventually.equal(
+      'cid-from-viewer'
+    );
   });
 
-  it('get method should time out when in Viewer', function *() {
-    sandbox.stub(cid.viewerCidApi_, 'isSupported')
-        .returns(Promise.resolve(true));
+  it('get method should time out when in Viewer', function*() {
+    sandbox
+      .stub(cid.viewerCidApi_, 'isSupported')
+      .returns(Promise.resolve(true));
     win.parent = {};
-    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'sendMessageAwaitResponse')
-        .returns(new Promise(() => {}));
-    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'isTrustedViewer')
-        .returns(Promise.resolve(true));
+    stubServiceForDoc(
+      sandbox,
+      ampdoc,
+      'viewer',
+      'sendMessageAwaitResponse'
+    ).returns(new Promise(() => {}));
+    stubServiceForDoc(sandbox, ampdoc, 'viewer', 'isTrustedViewer').returns(
+      Promise.resolve(true)
+    );
     const storageGetStub = stubServiceForDoc(sandbox, ampdoc, 'storage', 'get');
     storageGetStub.withArgs('amp-cid-optout').returns(Promise.resolve(false));
     sandbox.stub(url, 'isProxyOrigin').returns(true);
     let scopedCid = undefined;
     let resolved = false;
-    cid.get({scope: 'foo'}, hasConsent)
-        .then(result => {
-          scopedCid = result;
-          resolved = true;
-        });
+    cid.get({scope: 'foo'}, hasConsent).then(result => {
+      scopedCid = result;
+      resolved = true;
+    });
     yield macroTask();
     clock.tick(9999);
     yield macroTask();
@@ -804,11 +880,10 @@ describes.realWin('cid', {amp: true}, env => {
   });
 
   describe('pub origin, CID API opt in', () => {
-
     beforeEach(() => {
       sandbox.stub(url, 'isProxyOrigin').returns(false);
       ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" content="googleanalytics">';
+        '<meta name="amp-google-client-id-api" content="googleanalytics">';
       setCookie(win, '_ga', '', 0);
     });
 
@@ -820,54 +895,73 @@ describes.realWin('cid', {amp: true}, env => {
       cid.apiKeyMap_ = {'AMP_ECID_GOOGLE': 'cid-api-key'};
       const getScopedCidStub = sandbox.stub(cid.cidApi_, 'getScopedCid');
       getScopedCidStub.returns(Promise.resolve('cid-from-api'));
-      return cid.get({
-        scope: 'AMP_ECID_GOOGLE',
-        cookieName: '_ga',
-        createCookieIfNotPresent: true,
-      }, hasConsent).then(scopedCid => {
-        expect(getScopedCidStub)
-            .to.be.calledWith('cid-api-key', 'AMP_ECID_GOOGLE');
-        expect(scopedCid).to.equal('cid-from-api');
-        expect(getCookie(win, '_ga')).to.equal('cid-from-api');
-      });
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then(scopedCid => {
+          expect(getScopedCidStub).to.be.calledWith(
+            'cid-api-key',
+            'AMP_ECID_GOOGLE'
+          );
+          expect(scopedCid).to.equal('cid-from-api');
+          expect(getCookie(win, '_ga')).to.equal('cid-from-api');
+        });
     });
 
     it('should fallback to cookie if cid api returns nothing', () => {
       sandbox.stub(cid.cidApi_, 'getScopedCid').returns(Promise.resolve());
-      return cid.get({
-        scope: 'AMP_ECID_GOOGLE',
-        cookieName: '_ga',
-        createCookieIfNotPresent: true,
-      }, hasConsent).then(scopedCid => {
-        expect(scopedCid).to.contain('amp-');
-        expect(getCookie(win, '_ga')).to.equal(scopedCid);
-      });
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then(scopedCid => {
+          expect(scopedCid).to.contain('amp-');
+          expect(getCookie(win, '_ga')).to.equal(scopedCid);
+        });
     });
 
     it('should respect CID API opt out', () => {
-      sandbox.stub(cid.cidApi_, 'getScopedCid')
-          .returns(Promise.resolve('$OPT_OUT'));
-      return cid.get({
-        scope: 'AMP_ECID_GOOGLE',
-        cookieName: '_ga',
-        createCookieIfNotPresent: true,
-      }, hasConsent).then(scopedCid => {
-        expect(scopedCid).to.be.null;
-        expect(getCookie(win, '_ga')).to.be.null;
-      });
+      sandbox
+        .stub(cid.cidApi_, 'getScopedCid')
+        .returns(Promise.resolve('$OPT_OUT'));
+      return cid
+        .get(
+          {
+            scope: 'AMP_ECID_GOOGLE',
+            cookieName: '_ga',
+            createCookieIfNotPresent: true,
+          },
+          hasConsent
+        )
+        .then(scopedCid => {
+          expect(scopedCid).to.be.null;
+          expect(getCookie(win, '_ga')).to.be.null;
+        });
     });
   });
 
   describe('isScopeOptedIn', () => {
     it('should read predefined clients and custom API keys correctly', () => {
       ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" ' +
-          'content="googleanalytics, ' +
-          'foo = foo-api-key,' +
-          'bar=bar-api-key ,' +
-          'hello=hello-api-key">';
-      expect(cid.isScopeOptedIn_('AMP_ECID_GOOGLE'))
-          .to.equal('AIzaSyA65lEHUEizIsNtlbNo-l2K18dT680nsaM');
+        '<meta name="amp-google-client-id-api" ' +
+        'content="googleanalytics, ' +
+        'foo = foo-api-key,' +
+        'bar=bar-api-key ,' +
+        'hello=hello-api-key">';
+      expect(cid.isScopeOptedIn_('AMP_ECID_GOOGLE')).to.equal(
+        'AIzaSyA65lEHUEizIsNtlbNo-l2K18dT680nsaM'
+      );
       expect(cid.isScopeOptedIn_('foo')).to.equal('foo-api-key');
       expect(cid.isScopeOptedIn_('bar')).to.equal('bar-api-key');
       expect(cid.isScopeOptedIn_('hello')).to.equal('hello-api-key');
@@ -876,24 +970,25 @@ describes.realWin('cid', {amp: true}, env => {
 
     it('should work if meta only contains predefined clients', () => {
       ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" content="googleanalytics">';
-      expect(cid.isScopeOptedIn_('AMP_ECID_GOOGLE'))
-          .to.equal('AIzaSyA65lEHUEizIsNtlbNo-l2K18dT680nsaM');
+        '<meta name="amp-google-client-id-api" content="googleanalytics">';
+      expect(cid.isScopeOptedIn_('AMP_ECID_GOOGLE')).to.equal(
+        'AIzaSyA65lEHUEizIsNtlbNo-l2K18dT680nsaM'
+      );
     });
 
     it('should work if meta only contains custom scopes', () => {
       ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" ' +
-          'content="' +
-          'foo=foo-api-key,' +
-          'bar=bar-api-key">';
+        '<meta name="amp-google-client-id-api" ' +
+        'content="' +
+        'foo=foo-api-key,' +
+        'bar=bar-api-key">';
       expect(cid.isScopeOptedIn_('foo')).to.equal('foo-api-key');
       expect(cid.isScopeOptedIn_('bar')).to.equal('bar-api-key');
     });
 
     it('should not work if vendor not whitelisted', () => {
       ampdoc.win.document.head.innerHTML +=
-          '<meta name="amp-google-client-id-api" content="abodeanalytics">';
+        '<meta name="amp-google-client-id-api" content="abodeanalytics">';
       allowConsoleError(() => {
         expect(cid.isScopeOptedIn_('AMP_ECID_GOOGLE')).to.equal(undefined);
       });
@@ -911,8 +1006,12 @@ describes.fakeWin('cid optout:', {amp: true}, env => {
     ampdoc = env.ampdoc;
     storageSetStub = stubServiceForDoc(sandbox, ampdoc, 'storage', 'set');
     storageGetStub = stubServiceForDoc(sandbox, ampdoc, 'storage', 'get');
-    viewerSendMessageStub = stubServiceForDoc(sandbox, ampdoc,
-        'viewer', 'sendMessage');
+    viewerSendMessageStub = stubServiceForDoc(
+      sandbox,
+      ampdoc,
+      'viewer',
+      'sendMessage'
+    );
   });
 
   describe('optOutOfCid()', () => {
@@ -956,5 +1055,4 @@ describes.fakeWin('cid optout:', {amp: true}, env => {
       });
     });
   });
-
 });
diff --git a/test/unit/test-consent.js b/test/unit/test-consent.js
index ef381f8d5d67..157daadadeff 100644
--- a/test/unit/test-consent.js
+++ b/test/unit/test-consent.js
@@ -32,7 +32,9 @@ describes.fakeWin('consent', {amp: true}, env => {
     it('block by tagName', () => {
       doc.head.appendChild(meta);
       const element = doc.createElement('amp-test');
-      element.getAmpDoc = () => {return env.ampdoc;};
+      element.getAmpDoc = () => {
+        return env.ampdoc;
+      };
       doc.body.appendChild(element);
       expect(shouldBlockOnConsentByMeta(element)).to.be.true;
     });
@@ -40,7 +42,9 @@ describes.fakeWin('consent', {amp: true}, env => {
     it('block by lowercase tagName', () => {
       head.appendChild(meta);
       const element = doc.createElement('amp-ad');
-      element.getAmpDoc = () => {return env.ampdoc;};
+      element.getAmpDoc = () => {
+        return env.ampdoc;
+      };
       doc.body.appendChild(element);
       expect(shouldBlockOnConsentByMeta(element)).to.be.true;
     });
@@ -48,7 +52,9 @@ describes.fakeWin('consent', {amp: true}, env => {
     it('not block unspecified element', () => {
       head.appendChild(meta);
       const element = doc.createElement('amp-not-exist');
-      element.getAmpDoc = () => {return env.ampdoc;};
+      element.getAmpDoc = () => {
+        return env.ampdoc;
+      };
       doc.body.appendChild(element);
       expect(shouldBlockOnConsentByMeta(element)).to.be.false;
     });
@@ -59,7 +65,9 @@ describes.fakeWin('consent', {amp: true}, env => {
       meta.setAttribute('content', ' amp-this,    amp-that  ');
       head.appendChild(meta);
       const element = doc.createElement('amp-that');
-      element.getAmpDoc = () => {return env.ampdoc;};
+      element.getAmpDoc = () => {
+        return env.ampdoc;
+      };
       doc.body.appendChild(element);
       expect(shouldBlockOnConsentByMeta(element)).to.be.true;
     });
@@ -70,7 +78,9 @@ describes.fakeWin('consent', {amp: true}, env => {
       meta.setAttribute('content', 'amp-this:name,amp-this[name]');
       head.appendChild(meta);
       const element = doc.createElement('amp-this');
-      element.getAmpDoc = () => {return env.ampdoc;};
+      element.getAmpDoc = () => {
+        return env.ampdoc;
+      };
       doc.body.appendChild(element);
       expect(shouldBlockOnConsentByMeta(element)).to.be.false;
     });
diff --git a/test/unit/test-cookies.js b/test/unit/test-cookies.js
index b4106d453eee..f7774ab95d03 100644
--- a/test/unit/test-cookies.js
+++ b/test/unit/test-cookies.js
@@ -16,15 +16,18 @@
 
 import {getCookie, setCookie} from '../../src/cookies';
 
-
 describe('cookies', () => {
-
   function expectCookie(cookiesString, cookieName, opt_locationHref) {
-    return expect(getCookie({
-      document: {
-        cookie: cookiesString,
-      },
-    }, cookieName));
+    return expect(
+      getCookie(
+        {
+          document: {
+            cookie: cookiesString,
+          },
+        },
+        cookieName
+      )
+    );
   }
 
   it('should return null for no cookie, malformed, or not found', () => {
@@ -52,14 +55,20 @@ describe('cookies', () => {
 
   it('should write the cookie', () => {
     const doc = {};
-    setCookie({
-      document: doc,
-      location: {
-        href: 'https://www.example.com/test',
+    setCookie(
+      {
+        document: doc,
+        location: {
+          href: 'https://www.example.com/test',
+        },
       },
-    }, 'c&1', 'v&1', 1447383159853);
+      'c&1',
+      'v&1',
+      1447383159853
+    );
     expect(doc.cookie).to.equal(
-        'c%261=v%261; path=/; expires=Fri, 13 Nov 2015 02:52:39 GMT');
+      'c%261=v%261; path=/; expires=Fri, 13 Nov 2015 02:52:39 GMT'
+    );
   });
 
   it('should write the cookie to the right domain', () => {
@@ -68,8 +77,12 @@ describe('cookies', () => {
       const doc = {
         set cookie(val) {
           // Delete cookies on ampproject.org
-          if (val.indexOf('domain=ampproject.org; ' +
-              'expires=Thu, 01 Jan 1970 00:00:00 GMT') != -1) {
+          if (
+            val.indexOf(
+              'domain=ampproject.org; ' +
+                'expires=Thu, 01 Jan 1970 00:00:00 GMT'
+            ) != -1
+          ) {
             cookie = undefined;
             return;
           }
@@ -81,22 +94,30 @@ describe('cookies', () => {
           return cookie;
         },
       };
-      setCookie({
-        document: doc,
-        location: {
-          hostname,
-          href: 'https://' + hostname + '/test.html',
-        }},
-      'c&1', 'v&1', 1447383159853, {
-        highestAvailableDomain: true,
-        allowOnProxyOrigin: !!opt_allowOnProxyOrigin,
-      });
+      setCookie(
+        {
+          document: doc,
+          location: {
+            hostname,
+            href: 'https://' + hostname + '/test.html',
+          },
+        },
+        'c&1',
+        'v&1',
+        1447383159853,
+        {
+          highestAvailableDomain: true,
+          allowOnProxyOrigin: !!opt_allowOnProxyOrigin,
+        }
+      );
       if (opt_noset) {
         expect(cookie).to.be.undefined;
       } else {
         expect(cookie).to.equal(
-            'c%261=v%261; path=/; domain=' + targetDomain +
-            '; expires=Fri, 13 Nov 2015 02:52:39 GMT');
+          'c%261=v%261; path=/; domain=' +
+            targetDomain +
+            '; expires=Fri, 13 Nov 2015 02:52:39 GMT'
+        );
       }
     }
     test('www.example.com', 'example.com');
diff --git a/test/unit/test-crypto.js b/test/unit/test-crypto.js
index d2c5a24e73d5..e4ae4aa4a35c 100644
--- a/test/unit/test-crypto.js
+++ b/test/unit/test-crypto.js
@@ -17,14 +17,9 @@
 import {Crypto} from '../../src/service/crypto-impl';
 import {Platform} from '../../src/service/platform-impl';
 import {Services} from '../../src/services';
-import {
-  installCryptoPolyfill,
-} from '../../extensions/amp-crypto-polyfill/0.1/amp-crypto-polyfill';
+import {installCryptoPolyfill} from '../../extensions/amp-crypto-polyfill/0.1/amp-crypto-polyfill';
 import {installDocService} from '../../src/service/ampdoc-impl';
-import {
-  installExtensionsService,
-} from '../../src/service/extensions-impl';
-
+import {installExtensionsService} from '../../src/service/extensions-impl';
 
 describes.realWin('crypto-impl', {}, env => {
   let win;
@@ -77,7 +72,8 @@ describes.realWin('crypto-impl', {}, env => {
           expectAsyncConsoleError(expectedError);
         }
         return expect(crypto.sha384Base64('abc')).to.eventually.equal(
-            'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn');
+          'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn'
+        );
       });
 
       it('should hash "foobar" in sha384Base64', () => {
@@ -85,17 +81,20 @@ describes.realWin('crypto-impl', {}, env => {
           expectAsyncConsoleError(expectedError);
         }
         return expect(crypto.sha384Base64('foobar')).to.eventually.equal(
-            'PJww2fZl501RXIQpYNSkUcg6ASX9Pec5LXs3IxrxDHLqWK7fzfiaV2W_kCr5Ps8G');
+          'PJww2fZl501RXIQpYNSkUcg6ASX9Pec5LXs3IxrxDHLqWK7fzfiaV2W_kCr5Ps8G'
+        );
       });
 
       it('should hash [1,2,3] in sha384', () => {
         if (expectedError) {
           expectAsyncConsoleError(expectedError);
         }
-        return expect(crypto.sha384Base64(uint8Array([1, 2, 3])))
-            .to.eventually.equal(
-                'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3H' +
-                'e57T8sjh2sTcMlhn053f8dJim3o5PUf2');
+        return expect(
+          crypto.sha384Base64(uint8Array([1, 2, 3]))
+        ).to.eventually.equal(
+          'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3H' +
+            'e57T8sjh2sTcMlhn053f8dJim3o5PUf2'
+        );
       });
 
       it('should throw when input contains chars out of range [0,255]', () => {
@@ -147,39 +146,56 @@ describes.realWin('crypto-impl', {}, env => {
       },
     },
   });
-  testSuite('with native crypto API throws', {
-    crypto: {
-      subtle: {
-        digest: () => {throw new Error();},
+  testSuite(
+    'with native crypto API throws',
+    {
+      crypto: {
+        subtle: {
+          digest: () => {
+            throw new Error();
+          },
+        },
       },
     },
-  }, '[Crypto] SubtleCrypto failed, fallback to closure lib. Error');
+    '[Crypto] SubtleCrypto failed, fallback to closure lib. Error'
+  );
 
   it('native API result should exactly equal to crypto lib result', () => {
-    return Promise
-        .all([createCrypto(win).sha384('abc'), createCrypto({}).sha384('abc')])
-        .then(results => {
-          expect(results[0]).to.jsonEqual(results[1]);
-        });
+    return Promise.all([
+      createCrypto(win).sha384('abc'),
+      createCrypto({}).sha384('abc'),
+    ]).then(results => {
+      expect(results[0]).to.jsonEqual(results[1]);
+    });
   });
 
   // Run tests below only on browsers that we're confident about the existence
   // of native Crypto API.
   if (isModernChrome()) {
-    it('should not load closure lib when native API is available ' +
-        '(string input)', () => {
-      return new Crypto(win).sha384Base64('abc').then(hash => {
-        expect(hash).to.equal(
-            'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn');
-      });
-    });
-
-    it('should not load closure lib when native API is available ' +
-        '(Uint8Array input)', () => {
-      return new Crypto(win).sha384Base64(uint8Array([1,2,3])).then(hash => {
-        expect(hash).to.equal(
-            'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3He57T8sjh2sTcMlhn053f8dJim3o5PUf2');
-      });
-    });
+    it(
+      'should not load closure lib when native API is available ' +
+        '(string input)',
+      () => {
+        return new Crypto(win).sha384Base64('abc').then(hash => {
+          expect(hash).to.equal(
+            'ywB1P0WjXou1oD1pmsZQBycsMqsO3tFjGotgWkP_W-2AhgcroefMI1i67KE0yCWn'
+          );
+        });
+      }
+    );
+
+    it(
+      'should not load closure lib when native API is available ' +
+        '(Uint8Array input)',
+      () => {
+        return new Crypto(win)
+          .sha384Base64(uint8Array([1, 2, 3]))
+          .then(hash => {
+            expect(hash).to.equal(
+              'hiKdxtL_vqxzgHRBVKpwApHAZDUqDb3He57T8sjh2sTcMlhn053f8dJim3o5PUf2'
+            );
+          });
+      }
+    );
   }
 });
diff --git a/test/unit/test-css.js b/test/unit/test-css.js
index f4d58d88eb49..9e84994b5010 100644
--- a/test/unit/test-css.js
+++ b/test/unit/test-css.js
@@ -17,30 +17,29 @@
 import {escapeCssSelectorIdent, prependSelectorsWith} from '../../src/css';
 
 describe('CSS', () => {
-
   describe('escapeCssSelectorIdent', () => {
-
     it('should escape', () => {
       expect(escapeCssSelectorIdent('a b')).to.equal('a\\ b');
     });
   });
 
   describe('scopeSelector', () => {
-
     it('concats simple', () => {
-      expect(prependSelectorsWith('div', '.i-amphtml-scoped'))
-          .to.equal('.i-amphtml-scoped div');
+      expect(prependSelectorsWith('div', '.i-amphtml-scoped')).to.equal(
+        '.i-amphtml-scoped div'
+      );
     });
 
     it('concats multiple selectors (2)', () => {
-      expect(prependSelectorsWith('div,ul', ':scope'))
-          .to.equal(':scope div,:scope ul');
+      expect(prependSelectorsWith('div,ul', ':scope')).to.equal(
+        ':scope div,:scope ul'
+      );
     });
 
     it('concats multiple selectors (4)', () => {
-      expect(prependSelectorsWith('div,ul,ol,section', 'div >'))
-          .to.equal('div > div,div > ul,div > ol,div > section');
+      expect(prependSelectorsWith('div,ul,ol,section', 'div >')).to.equal(
+        'div > div,div > ul,div > ol,div > section'
+      );
     });
-
   });
 });
diff --git a/test/unit/test-curve.js b/test/unit/test-curve.js
index f2c103d6e200..2bfbb1f22997 100644
--- a/test/unit/test-curve.js
+++ b/test/unit/test-curve.js
@@ -17,7 +17,6 @@
 import {Curves, bezierCurve, getCurve} from '../../src/curve';
 
 describe('Curve', () => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -69,5 +68,4 @@ describe('Curve', () => {
     expect(curveExpected(0.6)).to.be.closeTo(curveGet(0.6), 1e-6);
     expect(curveExpected(0.9)).to.be.closeTo(curveGet(0.9), 1e-6);
   });
-
 });
diff --git a/test/unit/test-custom-element-registry.js b/test/unit/test-custom-element-registry.js
index abd7b8af9a4b..def46cd411c1 100644
--- a/test/unit/test-custom-element-registry.js
+++ b/test/unit/test-custom-element-registry.js
@@ -29,9 +29,7 @@ import {
 import {createElementWithAttributes} from '../../src/dom';
 import {installDocumentStateService} from '../../src/service/document-state';
 
-
 describes.realWin('CustomElement register', {amp: true}, env => {
-
   class ConcreteElement extends BaseElement {}
 
   let win, doc, ampdoc, extensions;
@@ -58,8 +56,9 @@ describes.realWin('CustomElement register', {amp: true}, env => {
 
   it('should go through stub/upgrade cycle', () => {
     registerElement(win, 'amp-element1', ElementStub);
-    expect(getElementClassForTesting(win, 'amp-element1'))
-        .to.equal(ElementStub);
+    expect(getElementClassForTesting(win, 'amp-element1')).to.equal(
+      ElementStub
+    );
 
     // Pre-download elements are created as ElementStub.
     const element1 = doc.createElement('amp-element1');
@@ -69,8 +68,9 @@ describes.realWin('CustomElement register', {amp: true}, env => {
 
     // Post-download, elements are upgraded.
     upgradeOrRegisterElement(win, 'amp-element1', ConcreteElement);
-    expect(getElementClassForTesting(win, 'amp-element1'))
-        .to.equal(ConcreteElement);
+    expect(getElementClassForTesting(win, 'amp-element1')).to.equal(
+      ConcreteElement
+    );
     expect(element1.implementation_).to.be.instanceOf(ConcreteElement);
 
     // Elements created post-download and immediately upgraded.
@@ -136,26 +136,29 @@ describes.realWin('CustomElement register', {amp: true}, env => {
 
   it('insert script for amp-ad when script is not included', () => {
     insertElement('amp-ad');
-    expect(doc.head.querySelectorAll('[custom-element="amp-ad"]'))
-        .to.have.length(1);
+    expect(
+      doc.head.querySelectorAll('[custom-element="amp-ad"]')
+    ).to.have.length(1);
   });
 
   it('insert script for amp-embed when script is not included', () => {
     insertElement('amp-embed');
-    expect(doc.head.querySelectorAll('[custom-element="amp-embed"]'))
-        .to.have.length(0);
-    expect(doc.head.querySelectorAll('[custom-element="amp-ad"]'))
-        .to.have.length(1);
+    expect(
+      doc.head.querySelectorAll('[custom-element="amp-embed"]')
+    ).to.have.length(0);
+    expect(
+      doc.head.querySelectorAll('[custom-element="amp-ad"]')
+    ).to.have.length(1);
   });
 
   it('insert script for amp-video when script is not included', () => {
     insertElement('amp-video');
-    expect(doc.head.querySelectorAll('[custom-element="amp-video"]'))
-        .to.have.length(1);
+    expect(
+      doc.head.querySelectorAll('[custom-element="amp-video"]')
+    ).to.have.length(1);
   });
 
   describe('no body', () => {
-
     let elements;
     let doc;
     let win;
@@ -277,14 +280,16 @@ describes.realWin('CustomElement register', {amp: true}, env => {
       expect(childWin.ampExtendedElements['amp-test1']).to.equal(ElementStub);
       const firstCallCount = registerElement.callCount;
       expect(firstCallCount).to.equal(1);
-      expect(registerElement.getCall(firstCallCount - 1).args[0])
-          .to.equal('amp-test1');
+      expect(registerElement.getCall(firstCallCount - 1).args[0]).to.equal(
+        'amp-test1'
+      );
 
       copyElementToChildWindow(win, childWin, 'amp-test2');
       expect(childWin.ampExtendedElements['amp-test1']).to.equal(ElementStub);
       expect(registerElement.callCount).to.be.above(firstCallCount);
-      expect(registerElement.getCall(registerElement.callCount - 1).args[0])
-          .to.equal('amp-test2');
+      expect(
+        registerElement.getCall(registerElement.callCount - 1).args[0]
+      ).to.equal('amp-test2');
     });
   });
 });
diff --git a/test/unit/test-custom-element.js b/test/unit/test-custom-element.js
index 061629cf8361..fd9306e97e4f 100644
--- a/test/unit/test-custom-element.js
+++ b/test/unit/test-custom-element.js
@@ -26,547 +26,599 @@ import {createAmpElementForTesting} from '../../src/custom-element';
 
 describes.realWin('CustomElement', {amp: true}, env => {
   // TODO(dvoytenko, #11827): Make this test work on Safari.
-  describe.configure().skipSafari().run('CustomElement', () => {
-    let win, doc, ampdoc;
-    let resources;
-    let resourcesMock;
-    let clock;
-    let testElementGetInsersectionElementLayoutBox;
-    let container;
-    let ElementClass, StubElementClass;
-
-    let testElementCreatedCallback;
-    let testElementPreconnectCallback;
-    let testElementFirstAttachedCallback;
-    let testElementBuildCallback;
-    let testElementCreatePlaceholderCallback;
-    let testElementLayoutCallback;
-    let testElementFirstLayoutCompleted;
-    let testElementViewportCallback;
-    let testElementUnlayoutCallback;
-    let testElementPauseCallback;
-    let testElementResumeCallback;
-
-    class TestElement extends BaseElement {
-      isLayoutSupported(unusedLayout) {
-        return true;
-      }
-      createdCallback() {
-        testElementCreatedCallback();
-      }
-      preconnectCallback(onLayout) {
-        testElementPreconnectCallback(onLayout);
-      }
-      firstAttachedCallback() {
-        testElementFirstAttachedCallback();
-      }
-      buildCallback() {
-        testElementBuildCallback();
-      }
-      createPlaceholderCallback() {
-        testElementCreatePlaceholderCallback();
-      }
-      layoutCallback() {
-        testElementLayoutCallback();
-        return Promise.resolve();
-      }
-      firstLayoutCompleted() {
-        testElementFirstLayoutCompleted();
-      }
-      viewportCallback(inViewport) {
-        testElementViewportCallback(inViewport);
-      }
-      getIntersectionElementLayoutBox() {
-        testElementGetInsersectionElementLayoutBox();
-        return {top: 10, left: 10, width: 11, height: 1};
-      }
-      unlayoutCallback() {
-        testElementUnlayoutCallback();
-        return true;
-      }
-      pauseCallback() {
-        testElementPauseCallback();
-      }
-      resumeCallback() {
-        testElementResumeCallback();
+  describe
+    .configure()
+    .skipSafari()
+    .run('CustomElement', () => {
+      let win, doc, ampdoc;
+      let resources;
+      let resourcesMock;
+      let clock;
+      let testElementGetInsersectionElementLayoutBox;
+      let container;
+      let ElementClass, StubElementClass;
+
+      let testElementCreatedCallback;
+      let testElementPreconnectCallback;
+      let testElementFirstAttachedCallback;
+      let testElementBuildCallback;
+      let testElementCreatePlaceholderCallback;
+      let testElementLayoutCallback;
+      let testElementFirstLayoutCompleted;
+      let testElementViewportCallback;
+      let testElementUnlayoutCallback;
+      let testElementPauseCallback;
+      let testElementResumeCallback;
+
+      class TestElement extends BaseElement {
+        isLayoutSupported(unusedLayout) {
+          return true;
+        }
+        createdCallback() {
+          testElementCreatedCallback();
+        }
+        preconnectCallback(onLayout) {
+          testElementPreconnectCallback(onLayout);
+        }
+        firstAttachedCallback() {
+          testElementFirstAttachedCallback();
+        }
+        buildCallback() {
+          testElementBuildCallback();
+        }
+        createPlaceholderCallback() {
+          testElementCreatePlaceholderCallback();
+        }
+        layoutCallback() {
+          testElementLayoutCallback();
+          return Promise.resolve();
+        }
+        firstLayoutCompleted() {
+          testElementFirstLayoutCompleted();
+        }
+        viewportCallback(inViewport) {
+          testElementViewportCallback(inViewport);
+        }
+        getIntersectionElementLayoutBox() {
+          testElementGetInsersectionElementLayoutBox();
+          return {top: 10, left: 10, width: 11, height: 1};
+        }
+        unlayoutCallback() {
+          testElementUnlayoutCallback();
+          return true;
+        }
+        pauseCallback() {
+          testElementPauseCallback();
+        }
+        resumeCallback() {
+          testElementResumeCallback();
+        }
       }
-    }
 
-    class TestElementWithReUpgrade extends BaseElement {
-      isLayoutSupported(unusedLayout) {
-        return true;
-      }
-      upgradeCallback() {
-        return new TestElement(this.element);
+      class TestElementWithReUpgrade extends BaseElement {
+        isLayoutSupported(unusedLayout) {
+          return true;
+        }
+        upgradeCallback() {
+          return new TestElement(this.element);
+        }
       }
-    }
 
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      ampdoc = env.ampdoc;
-      clock = lolex.install({target: win});
-      resources = Services.resourcesForDoc(doc);
-      resources.isBuildOn_ = true;
-      resourcesMock = sandbox.mock(resources);
-      container = doc.createElement('div');
-      doc.body.appendChild(container);
-
-      ElementClass = createAmpElementForTesting(win, 'amp-test', TestElement);
-      StubElementClass = createAmpElementForTesting(win, 'amp-stub',
-          ElementStub);
-
-      win.customElements.define('amp-test', ElementClass);
-      win.customElements.define('amp-stub', StubElementClass);
-
-      win.ampExtendedElements['amp-test'] = TestElement;
-      win.ampExtendedElements['amp-stub'] = ElementStub;
-      ampdoc.declareExtension('amp-stub');
-
-      testElementCreatedCallback = sandbox.spy();
-      testElementPreconnectCallback = sandbox.spy();
-      testElementFirstAttachedCallback = sandbox.spy();
-      testElementBuildCallback = sandbox.spy();
-      testElementCreatePlaceholderCallback = sandbox.spy();
-      testElementLayoutCallback = sandbox.spy();
-      testElementFirstLayoutCompleted = sandbox.spy();
-      testElementViewportCallback = sandbox.spy();
-      testElementGetInsersectionElementLayoutBox = sandbox.spy();
-      testElementUnlayoutCallback = sandbox.spy();
-      testElementPauseCallback = sandbox.spy();
-      testElementResumeCallback = sandbox.spy();
-    });
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        ampdoc = env.ampdoc;
+        clock = lolex.install({target: win});
+        resources = Services.resourcesForDoc(doc);
+        resources.isBuildOn_ = true;
+        resourcesMock = sandbox.mock(resources);
+        container = doc.createElement('div');
+        doc.body.appendChild(container);
+
+        ElementClass = createAmpElementForTesting(win, 'amp-test', TestElement);
+        StubElementClass = createAmpElementForTesting(
+          win,
+          'amp-stub',
+          ElementStub
+        );
 
-    afterEach(() => {
-      clock.uninstall();
-      resourcesMock.verify();
-    });
+        win.customElements.define('amp-test', ElementClass);
+        win.customElements.define('amp-stub', StubElementClass);
+
+        win.ampExtendedElements['amp-test'] = TestElement;
+        win.ampExtendedElements['amp-stub'] = ElementStub;
+        ampdoc.declareExtension('amp-stub');
+
+        testElementCreatedCallback = sandbox.spy();
+        testElementPreconnectCallback = sandbox.spy();
+        testElementFirstAttachedCallback = sandbox.spy();
+        testElementBuildCallback = sandbox.spy();
+        testElementCreatePlaceholderCallback = sandbox.spy();
+        testElementLayoutCallback = sandbox.spy();
+        testElementFirstLayoutCompleted = sandbox.spy();
+        testElementViewportCallback = sandbox.spy();
+        testElementGetInsersectionElementLayoutBox = sandbox.spy();
+        testElementUnlayoutCallback = sandbox.spy();
+        testElementPauseCallback = sandbox.spy();
+        testElementResumeCallback = sandbox.spy();
+      });
 
-    it('should initialize ampdoc and resources on attach only', () => {
-      const element = new ElementClass();
-      expect(element.ampdoc_).to.be.null;
-      allowConsoleError(() => {
-        expect(() => element.getAmpDoc()).to.throw(/no ampdoc yet/);
+      afterEach(() => {
+        clock.uninstall();
+        resourcesMock.verify();
       });
-      expect(element.resources_).to.be.null;
-      allowConsoleError(() => {
-        expect(() => element.getResources()).to.throw(/no resources yet/);
+
+      it('should initialize ampdoc and resources on attach only', () => {
+        const element = new ElementClass();
+        expect(element.ampdoc_).to.be.null;
+        allowConsoleError(() => {
+          expect(() => element.getAmpDoc()).to.throw(/no ampdoc yet/);
+        });
+        expect(element.resources_).to.be.null;
+        allowConsoleError(() => {
+          expect(() => element.getResources()).to.throw(/no resources yet/);
+        });
+
+        // Resources available after attachment.
+        container.appendChild(element);
+        expect(element.ampdoc_).to.be.ok;
+        expect(element.getAmpDoc()).to.be.ok;
+        expect(element.resources_).to.be.ok;
+        expect(element.getResources()).to.be.ok;
       });
 
-      // Resources available after attachment.
-      container.appendChild(element);
-      expect(element.ampdoc_).to.be.ok;
-      expect(element.getAmpDoc()).to.be.ok;
-      expect(element.resources_).to.be.ok;
-      expect(element.getResources()).to.be.ok;
-    });
+      it('Element - createdCallback', () => {
+        const element = new ElementClass();
+        const build = sandbox.stub(element, 'build');
 
-    it('Element - createdCallback', () => {
-      const element = new ElementClass();
-      const build = sandbox.stub(element, 'build');
-
-      expect(element.isBuilt()).to.equal(false);
-      expect(element.hasAttributes()).to.equal(false);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* NOT_UPGRADED */ 1);
-      expect(element.readyState).to.equal('loading');
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-
-      container.appendChild(element);
-      expect(element).to.have.class('i-amphtml-element');
-      expect(element).to.have.class('i-amphtml-notbuilt');
-      expect(element).to.have.class('amp-notbuilt');
-      expect(element.everAttached).to.equal(true);
-      expect(testElementCreatedCallback).to.be.calledOnce;
-      expect(element.isUpgraded()).to.equal(true);
-      expect(build.calledOnce).to.equal(true);
-
-      expect(element.getResourceId())
-          .to.equal(resources.getResourceForElement(element).getId());
-    });
+        expect(element.isBuilt()).to.equal(false);
+        expect(element.hasAttributes()).to.equal(false);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.upgradeState_).to.equal(/* NOT_UPGRADED */ 1);
+        expect(element.readyState).to.equal('loading');
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+        expect(testElementCreatedCallback).to.have.not.been.called;
 
-    it('StubElement - createdCallback', () => {
-      const element = new StubElementClass();
-      sandbox.stub(element, 'build');
-
-      expect(element.isBuilt()).to.equal(false);
-      expect(element.hasAttributes()).to.equal(false);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.readyState).to.equal('loading');
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-
-      container.appendChild(element);
-      expect(element).to.have.class('i-amphtml-element');
-      expect(element).to.have.class('i-amphtml-notbuilt');
-      expect(element).to.have.class('amp-notbuilt');
-      expect(element.everAttached).to.equal(true);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-      expect(element.isUpgraded()).to.equal(false);
-      // TODO(jeffkaufman, #13422): this test was silently failing.  `build` was
-      // the return value from `sandbox.stub(element, 'build')`.
-      //
-      // expect(build.calledOnce).to.equal(true);
-    });
+        container.appendChild(element);
+        expect(element).to.have.class('i-amphtml-element');
+        expect(element).to.have.class('i-amphtml-notbuilt');
+        expect(element).to.have.class('amp-notbuilt');
+        expect(element.everAttached).to.equal(true);
+        expect(testElementCreatedCallback).to.be.calledOnce;
+        expect(element.isUpgraded()).to.equal(true);
+        expect(build.calledOnce).to.equal(true);
 
-    it('Element - should only add classes on first attachedCallback', () => {
-      const element = new ElementClass();
-      const buildPromise = Promise.resolve();
-      const buildStub = sandbox.stub(element, 'build').callsFake(
-          () => buildPromise);
+        expect(element.getResourceId()).to.equal(
+          resources.getResourceForElement(element).getId()
+        );
+      });
 
-      expect(element).to.not.have.class('i-amphtml-element');
-      expect(element).to.not.have.class('i-amphtml-notbuilt');
-      expect(element).to.not.have.class('amp-notbuilt');
+      it('StubElement - createdCallback', () => {
+        const element = new StubElementClass();
+        sandbox.stub(element, 'build');
 
-      container.appendChild(element);
+        expect(element.isBuilt()).to.equal(false);
+        expect(element.hasAttributes()).to.equal(false);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.readyState).to.equal('loading');
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+        expect(testElementCreatedCallback).to.have.not.been.called;
+
+        container.appendChild(element);
+        expect(element).to.have.class('i-amphtml-element');
+        expect(element).to.have.class('i-amphtml-notbuilt');
+        expect(element).to.have.class('amp-notbuilt');
+        expect(element.everAttached).to.equal(true);
+        expect(testElementCreatedCallback).to.have.not.been.called;
+        expect(element.isUpgraded()).to.equal(false);
+        // TODO(jeffkaufman, #13422): this test was silently failing.  `build` was
+        // the return value from `sandbox.stub(element, 'build')`.
+        //
+        // expect(build.calledOnce).to.equal(true);
+      });
 
-      expect(element).to.have.class('i-amphtml-element');
-      expect(element).to.have.class('i-amphtml-notbuilt');
-      expect(element).to.have.class('amp-notbuilt');
-      element.classList.remove('i-amphtml-element');
-      element.classList.remove('i-amphtml-notbuilt');
-      element.classList.remove('amp-notbuilt');
+      it('Element - should only add classes on first attachedCallback', () => {
+        const element = new ElementClass();
+        const buildPromise = Promise.resolve();
+        const buildStub = sandbox
+          .stub(element, 'build')
+          .callsFake(() => buildPromise);
 
-      container.appendChild(element);
-      return buildPromise.then(() => {
-        expect(buildStub).to.be.called;
         expect(element).to.not.have.class('i-amphtml-element');
         expect(element).to.not.have.class('i-amphtml-notbuilt');
         expect(element).to.not.have.class('amp-notbuilt');
-      });
-    });
 
-    it('Element - handles async connectedCallback when disconnected', () => {
-      const element = new ElementClass();
-      Object.defineProperty(element, 'isConnected', {
-        value: false,
-      });
+        container.appendChild(element);
 
-      expect(element).to.not.have.class('i-amphtml-element');
-      expect(element).to.not.have.class('i-amphtml-notbuilt');
-      expect(element).to.not.have.class('amp-notbuilt');
+        expect(element).to.have.class('i-amphtml-element');
+        expect(element).to.have.class('i-amphtml-notbuilt');
+        expect(element).to.have.class('amp-notbuilt');
+        element.classList.remove('i-amphtml-element');
+        element.classList.remove('i-amphtml-notbuilt');
+        element.classList.remove('amp-notbuilt');
 
-      container.appendChild(element);
+        container.appendChild(element);
+        return buildPromise.then(() => {
+          expect(buildStub).to.be.called;
+          expect(element).to.not.have.class('i-amphtml-element');
+          expect(element).to.not.have.class('i-amphtml-notbuilt');
+          expect(element).to.not.have.class('amp-notbuilt');
+        });
+      });
 
-      expect(element).to.not.have.class('i-amphtml-element');
-      expect(element).to.not.have.class('i-amphtml-notbuilt');
-      expect(element).to.not.have.class('amp-notbuilt');
-    });
+      it('Element - handles async connectedCallback when disconnected', () => {
+        const element = new ElementClass();
+        Object.defineProperty(element, 'isConnected', {
+          value: false,
+        });
 
-    it('Element - should reset on 2nd attachedCallback when requested', () => {
-      clock.tick(1);
-      const element = new ElementClass();
-      const buildPromise = Promise.resolve();
-      const buildStub = sandbox.stub(element, 'build').callsFake(
-          () => buildPromise);
-      container.appendChild(element);
-      container.removeChild(element);
-
-      sandbox.stub(element, 'reconstructWhenReparented').callsFake(() => true);
-      element.layoutCount_ = 10;
-      element.isFirstLayoutCompleted_ = true;
-      element.signals().signal(CommonSignals.RENDER_START);
-      element.signals().signal(CommonSignals.LOAD_END);
-      container.appendChild(element);
-      return buildPromise.then(() => {
-        expect(buildStub).to.be.called;
-        expect(element.layoutCount_).to.equal(0);
-        expect(element.isFirstLayoutCompleted_).to.be.false;
-        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.null;
-        expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-      });
-    });
+        expect(element).to.not.have.class('i-amphtml-element');
+        expect(element).to.not.have.class('i-amphtml-notbuilt');
+        expect(element).to.not.have.class('amp-notbuilt');
 
-    it('Element - should NOT reset on 2nd attachedCallback w/o request', () => {
-      clock.tick(1);
-      const element = new ElementClass();
-      sandbox.stub(element, 'build');
-      container.appendChild(element);
-      container.removeChild(element);
-
-      sandbox.stub(element, 'reconstructWhenReparented').callsFake(() => false);
-      element.layoutCount_ = 10;
-      element.isFirstLayoutCompleted_ = true;
-      element.signals().signal(CommonSignals.RENDER_START);
-      expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-      element.signals().signal(CommonSignals.LOAD_END);
-      container.appendChild(element);
-      expect(element.layoutCount_).to.equal(10);
-      expect(element.isFirstLayoutCompleted_).to.be.true;
-      expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-      expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
-    });
+        container.appendChild(element);
 
-    it('Element - getIntersectionChangeEntry', () => {
-      const element = new ElementClass();
-      container.appendChild(element);
-      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-      element.getIntersectionChangeEntry();
-      expect(testElementGetInsersectionElementLayoutBox).to.be.calledOnce;
-    });
+        expect(element).to.not.have.class('i-amphtml-element');
+        expect(element).to.not.have.class('i-amphtml-notbuilt');
+        expect(element).to.not.have.class('amp-notbuilt');
+      });
 
-    it('Element - updateLayoutBox', () => {
-      const element = new ElementClass();
-      container.appendChild(element);
-      expect(element.layoutWidth_).to.equal(-1);
-      expect(element.implementation_.layoutWidth_).to.equal(-1);
+      it('Element - should reset on 2nd attachedCallback when requested', () => {
+        clock.tick(1);
+        const element = new ElementClass();
+        const buildPromise = Promise.resolve();
+        const buildStub = sandbox
+          .stub(element, 'build')
+          .callsFake(() => buildPromise);
+        container.appendChild(element);
+        container.removeChild(element);
 
-      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-      expect(element.layoutWidth_).to.equal(111);
-      expect(element.implementation_.layoutWidth_).to.equal(111);
-    });
+        sandbox
+          .stub(element, 'reconstructWhenReparented')
+          .callsFake(() => true);
+        element.layoutCount_ = 10;
+        element.isFirstLayoutCompleted_ = true;
+        element.signals().signal(CommonSignals.RENDER_START);
+        element.signals().signal(CommonSignals.LOAD_END);
+        container.appendChild(element);
+        return buildPromise.then(() => {
+          expect(buildStub).to.be.called;
+          expect(element.layoutCount_).to.equal(0);
+          expect(element.isFirstLayoutCompleted_).to.be.false;
+          expect(element.signals().get(CommonSignals.RENDER_START)).to.be.null;
+          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
+        });
+      });
 
-    it('should tolerate errors in onLayoutMeasure', () => {
-      const element = new ElementClass();
-      sandbox.stub(element.implementation_, 'onLayoutMeasure').callsFake(() => {
-        throw new Error('intentional');
+      it('Element - should NOT reset on 2nd attachedCallback w/o request', () => {
+        clock.tick(1);
+        const element = new ElementClass();
+        sandbox.stub(element, 'build');
+        container.appendChild(element);
+        container.removeChild(element);
+
+        sandbox
+          .stub(element, 'reconstructWhenReparented')
+          .callsFake(() => false);
+        element.layoutCount_ = 10;
+        element.isFirstLayoutCompleted_ = true;
+        element.signals().signal(CommonSignals.RENDER_START);
+        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
+        element.signals().signal(CommonSignals.LOAD_END);
+        container.appendChild(element);
+        expect(element.layoutCount_).to.equal(10);
+        expect(element.isFirstLayoutCompleted_).to.be.true;
+        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
+        expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
       });
-      const errorStub = sandbox.stub(element, 'dispatchCustomEventForTesting');
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        allowConsoleError(() => {
-          element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-          expect(element.layoutWidth_).to.equal(111);
-          expect(element.implementation_.layoutWidth_).to.equal(111);
-          expect(errorStub).to.be.calledWith(AmpEvents.ERROR, 'intentional');
-        });
+
+      it('Element - getIntersectionChangeEntry', () => {
+        const element = new ElementClass();
+        container.appendChild(element);
+        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+        element.getIntersectionChangeEntry();
+        expect(testElementGetInsersectionElementLayoutBox).to.be.calledOnce;
       });
-    });
 
-    it('should not call onMeasureChanged callback when element dimensions '
-        + 'have not changed', () => {
-      const element = new ElementClass();
-      const onMeasureChangeStub =
-          sandbox.stub(element.implementation_, 'onMeasureChanged');
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        element.updateLayoutBox(
-            {top: 0, left: 0, width: 111, height: 51},
-            /* opt_hasMeasurementsChanged */ false
-        );
+      it('Element - updateLayoutBox', () => {
+        const element = new ElementClass();
+        container.appendChild(element);
+        expect(element.layoutWidth_).to.equal(-1);
+        expect(element.implementation_.layoutWidth_).to.equal(-1);
+
+        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
         expect(element.layoutWidth_).to.equal(111);
         expect(element.implementation_.layoutWidth_).to.equal(111);
-        expect(onMeasureChangeStub).to.have.not.been.called;
       });
-    });
 
-    it('should call onMeasureChanged callback when element dimensions '
-        + 'have changed', () => {
-      const element = new ElementClass();
-      const onMeasureChangeStub =
-          sandbox.stub(element.implementation_, 'onMeasureChanged');
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        element.updateLayoutBox(
-            {top: 0, left: 0, width: 111, height: 51},
-            /* opt_hasMeasurementsChanged */ true
+      it('should tolerate errors in onLayoutMeasure', () => {
+        const element = new ElementClass();
+        sandbox
+          .stub(element.implementation_, 'onLayoutMeasure')
+          .callsFake(() => {
+            throw new Error('intentional');
+          });
+        const errorStub = sandbox.stub(
+          element,
+          'dispatchCustomEventForTesting'
         );
-        expect(element.layoutWidth_).to.equal(111);
-        expect(element.implementation_.layoutWidth_).to.equal(111);
-        expect(onMeasureChangeStub).to.have.been.called;
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          allowConsoleError(() => {
+            element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+            expect(element.layoutWidth_).to.equal(111);
+            expect(element.implementation_.layoutWidth_).to.equal(111);
+            expect(errorStub).to.be.calledWith(AmpEvents.ERROR, 'intentional');
+          });
+        });
       });
-    });
 
-    it('StubElement - upgrade after attached', () => {
-      const element = new StubElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-
-      element.setAttribute('layout', 'fill');
-      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-      container.appendChild(element);
-      resourcesMock.expects('upgraded').withExactArgs(element).once();
-
-      element.upgrade(TestElement);
-
-      expect(element.isUpgraded()).to.equal(true);
-      expect(element.implementation_).to.be.instanceOf(TestElement);
-      expect(element.implementation_.layout_).to.equal(Layout.FILL);
-      expect(element.implementation_.layoutWidth_).to.equal(111);
-      expect(testElementCreatedCallback).to.be.calledOnce;
-      expect(testElementFirstAttachedCallback).to.be.calledOnce;
-      expect(element.isBuilt()).to.equal(false);
-    });
+      it(
+        'should not call onMeasureChanged callback when element dimensions ' +
+          'have not changed',
+        () => {
+          const element = new ElementClass();
+          const onMeasureChangeStub = sandbox.stub(
+            element.implementation_,
+            'onMeasureChanged'
+          );
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.updateLayoutBox(
+              {top: 0, left: 0, width: 111, height: 51},
+              /* opt_hasMeasurementsChanged */ false
+            );
+            expect(element.layoutWidth_).to.equal(111);
+            expect(element.implementation_.layoutWidth_).to.equal(111);
+            expect(onMeasureChangeStub).to.have.not.been.called;
+          });
+        }
+      );
 
-    it('StubElement - upgrade before attached', () => {
-      const element = new StubElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      expect(testElementCreatedCallback).to.have.not.been.called;
+      it(
+        'should call onMeasureChanged callback when element dimensions ' +
+          'have changed',
+        () => {
+          const element = new ElementClass();
+          const onMeasureChangeStub = sandbox.stub(
+            element.implementation_,
+            'onMeasureChanged'
+          );
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.updateLayoutBox(
+              {top: 0, left: 0, width: 111, height: 51},
+              /* opt_hasMeasurementsChanged */ true
+            );
+            expect(element.layoutWidth_).to.equal(111);
+            expect(element.implementation_.layoutWidth_).to.equal(111);
+            expect(onMeasureChangeStub).to.have.been.called;
+          });
+        }
+      );
+
+      it('StubElement - upgrade after attached', () => {
+        const element = new StubElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        expect(testElementCreatedCallback).to.have.not.been.called;
 
-      element.setAttribute('layout', 'fill');
-      element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
-      resourcesMock.expects('upgraded').withExactArgs(element).never();
+        element.setAttribute('layout', 'fill');
+        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+        container.appendChild(element);
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .once();
 
-      element.upgrade(TestElement);
+        element.upgrade(TestElement);
 
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.implementation_).to.be.instanceOf(TestElement);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element.isBuilt()).to.equal(false);
-    });
+        expect(element.isUpgraded()).to.equal(true);
+        expect(element.implementation_).to.be.instanceOf(TestElement);
+        expect(element.implementation_.layout_).to.equal(Layout.FILL);
+        expect(element.implementation_.layoutWidth_).to.equal(111);
+        expect(testElementCreatedCallback).to.be.calledOnce;
+        expect(testElementFirstAttachedCallback).to.be.calledOnce;
+        expect(element.isBuilt()).to.equal(false);
+      });
 
-    it('StubElement - should NOT allow upgrade for a template element', () => {
-      const element = new StubElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      element.isInTemplate_ = true;
+      it('StubElement - upgrade before attached', () => {
+        const element = new StubElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        expect(testElementCreatedCallback).to.have.not.been.called;
 
-      resourcesMock.expects('upgraded').withExactArgs(element).never();
+        element.setAttribute('layout', 'fill');
+        element.updateLayoutBox({top: 0, left: 0, width: 111, height: 51});
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .never();
 
-      element.upgrade(TestElement);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.isBuilt()).to.equal(false);
-    });
+        element.upgrade(TestElement);
 
-    it('Element - re-upgrade to new direct instance', () => {
-      const element = new ElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      const newImpl = new TestElement(element);
-      element.implementation_.upgradeCallback = () => newImpl;
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.implementation_).to.be.instanceOf(TestElement);
+        expect(testElementCreatedCallback).to.have.not.been.called;
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element.isBuilt()).to.equal(false);
+      });
 
-      container.appendChild(element);
-      expect(element.isUpgraded()).to.equal(true);
-      expect(element.implementation_).to.equal(newImpl);
-      expect(element.upgradeDelayMs_).to.equal(0);
-    });
+      it('StubElement - should NOT allow upgrade for a template element', () => {
+        const element = new StubElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        element.isInTemplate_ = true;
 
-    it('Element - re-upgrade to new promised instance', () => {
-      const element = new ElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      const oldImpl = element.implementation_;
-      const newImpl = new TestElement(element);
-      const promise = Services.timerFor(win).promise(10).then(() => newImpl);
-      oldImpl.upgradeCallback = () => promise;
-
-      container.appendChild(element);
-      expect(element.implementation_).to.equal(oldImpl);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-      clock.tick(10);
-      return promise.then(() => {
-        // Skip a microtask.
-      }).then(() => {
-        expect(element.implementation_).to.equal(newImpl);
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .never();
+
+        element.upgrade(TestElement);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.isBuilt()).to.equal(false);
+      });
+
+      it('Element - re-upgrade to new direct instance', () => {
+        const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        const newImpl = new TestElement(element);
+        element.implementation_.upgradeCallback = () => newImpl;
+
+        container.appendChild(element);
         expect(element.isUpgraded()).to.equal(true);
-        expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
-        expect(element.upgradeDelayMs_).to.be.equal(10);
+        expect(element.implementation_).to.equal(newImpl);
+        expect(element.upgradeDelayMs_).to.equal(0);
       });
-    });
 
-    it('Element - re-upgrade to new promised null', () => {
-      const element = new ElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      const oldImpl = element.implementation_;
-      const promise = Promise.resolve(null);
-      oldImpl.upgradeCallback = () => promise;
-
-      container.appendChild(element);
-      expect(element.implementation_).to.equal(oldImpl);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-      return promise.then(() => {
-        // Skip a microtask.
-      }).then(() => {
+      it('Element - re-upgrade to new promised instance', () => {
+        const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        const oldImpl = element.implementation_;
+        const newImpl = new TestElement(element);
+        const promise = Services.timerFor(win)
+          .promise(10)
+          .then(() => newImpl);
+        oldImpl.upgradeCallback = () => promise;
+
+        container.appendChild(element);
         expect(element.implementation_).to.equal(oldImpl);
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+        clock.tick(10);
+        return promise
+          .then(() => {
+            // Skip a microtask.
+          })
+          .then(() => {
+            expect(element.implementation_).to.equal(newImpl);
+            expect(element.isUpgraded()).to.equal(true);
+            expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+            expect(element.upgradeDelayMs_).to.be.equal(10);
+          });
       });
-    });
 
-    it('Element - re-upgrade with a failed promised', () => {
-      const element = new ElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      const oldImpl = element.implementation_;
-      const promise = Promise.reject();
-      oldImpl.upgradeCallback = () => promise;
-
-      container.appendChild(element);
-      expect(element.implementation_).to.equal(oldImpl);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-      return promise.catch(() => {
-        // Ignore error.
-      }).then(() => {
+      it('Element - re-upgrade to new promised null', () => {
+        const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        const oldImpl = element.implementation_;
+        const promise = Promise.resolve(null);
+        oldImpl.upgradeCallback = () => promise;
+
+        container.appendChild(element);
         expect(element.implementation_).to.equal(oldImpl);
         expect(element.isUpgraded()).to.equal(false);
-        expect(element.upgradeState_).to.equal(/* UPGRADE_FAILED */ 3);
+        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+        return promise
+          .then(() => {
+            // Skip a microtask.
+          })
+          .then(() => {
+            expect(element.implementation_).to.equal(oldImpl);
+            expect(element.isUpgraded()).to.equal(true);
+            expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+          });
       });
-    });
 
-    it('Element - can only re-upgrade once', () => {
-      const element = new ElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      const oldImpl = element.implementation_;
-      const newImpl = new TestElement(element);
-      const newImpl2 = new TestElement(element);
-      const promise = Promise.resolve(newImpl);
-      oldImpl.upgradeCallback = () => promise;
-
-      container.appendChild(element);
-      expect(element.implementation_).to.equal(oldImpl);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-
-      oldImpl.upgradeCallback = () => newImpl2;
-      container.appendChild(element);
-      expect(element.implementation_).to.equal(oldImpl);
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
-      return promise.then(() => {
-        // Skip a microtask.
-      }).then(() => {
-        expect(element.implementation_).to.equal(newImpl);
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+      it('Element - re-upgrade with a failed promised', () => {
+        const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        const oldImpl = element.implementation_;
+        const promise = Promise.reject();
+        oldImpl.upgradeCallback = () => promise;
+
+        container.appendChild(element);
+        expect(element.implementation_).to.equal(oldImpl);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+        return promise
+          .catch(() => {
+            // Ignore error.
+          })
+          .then(() => {
+            expect(element.implementation_).to.equal(oldImpl);
+            expect(element.isUpgraded()).to.equal(false);
+            expect(element.upgradeState_).to.equal(/* UPGRADE_FAILED */ 3);
+          });
       });
-    });
 
-    it('StubElement - re-upgrade', () => {
-      const element = new StubElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-      resourcesMock.expects('upgraded').withExactArgs(element).never();
+      it('Element - can only re-upgrade once', () => {
+        const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        const oldImpl = element.implementation_;
+        const newImpl = new TestElement(element);
+        const newImpl2 = new TestElement(element);
+        const promise = Promise.resolve(newImpl);
+        oldImpl.upgradeCallback = () => promise;
 
-      element.upgrade(TestElementWithReUpgrade);
+        container.appendChild(element);
+        expect(element.implementation_).to.equal(oldImpl);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
 
-      expect(element.isUpgraded()).to.equal(false);
-      expect(testElementCreatedCallback).to.have.not.been.called;
-    });
+        oldImpl.upgradeCallback = () => newImpl2;
+        container.appendChild(element);
+        expect(element.implementation_).to.equal(oldImpl);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.upgradeState_).to.equal(/* UPGRADE_IN_PROGRESS */ 4);
+        return promise
+          .then(() => {
+            // Skip a microtask.
+          })
+          .then(() => {
+            expect(element.implementation_).to.equal(newImpl);
+            expect(element.isUpgraded()).to.equal(true);
+            expect(element.upgradeState_).to.equal(/* UPGRADED */ 2);
+          });
+      });
 
+      it('StubElement - re-upgrade', () => {
+        const element = new StubElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        expect(testElementCreatedCallback).to.have.not.been.called;
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .never();
 
-    it('Element - build NOT allowed before attachment', () => {
-      const element = new ElementClass();
-      allowConsoleError(() => { expect(() => {
-        element.build();
-      }).to.throw(/upgrade/); });
-    });
+        element.upgrade(TestElementWithReUpgrade);
 
-    it('Element - build allowed', () => {
-      const element = new ElementClass();
+        expect(element.isUpgraded()).to.equal(false);
+        expect(testElementCreatedCallback).to.have.not.been.called;
+      });
 
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
-      expect(element.signals().get(CommonSignals.BUILT)).to.not.be.ok;
+      it('Element - build NOT allowed before attachment', () => {
+        const element = new ElementClass();
+        allowConsoleError(() => {
+          expect(() => {
+            element.build();
+          }).to.throw(/upgrade/);
+        });
+      });
 
-      clock.tick(1);
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        expect(element.isBuilt()).to.equal(true);
-        expect(element).to.not.have.class('i-amphtml-notbuilt');
-        expect(element).to.not.have.class('amp-notbuilt');
-        expect(testElementBuildCallback).to.be.calledOnce;
-        expect(element.signals().get(CommonSignals.BUILT)).to.be.ok;
-        return element.whenBuilt(); // Should eventually resolve.
+      it('Element - build allowed', () => {
+        const element = new ElementClass();
+
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
+        expect(element.signals().get(CommonSignals.BUILT)).to.not.be.ok;
+
+        clock.tick(1);
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(element).to.not.have.class('i-amphtml-notbuilt');
+          expect(element).to.not.have.class('amp-notbuilt');
+          expect(testElementBuildCallback).to.be.calledOnce;
+          expect(element.signals().get(CommonSignals.BUILT)).to.be.ok;
+          return element.whenBuilt(); // Should eventually resolve.
+        });
       });
-    });
 
-    it('should build on consent sufficient', () => {
-      const element = new ElementClass();
-      sandbox.stub(Services, 'consentPolicyServiceForDocOrNull')
+      it('should build on consent sufficient', () => {
+        const element = new ElementClass();
+        sandbox
+          .stub(Services, 'consentPolicyServiceForDocOrNull')
           .callsFake(() => {
             return Promise.resolve({
               whenPolicyUnblock: () => {
@@ -574,19 +626,19 @@ describes.realWin('CustomElement', {amp: true}, env => {
               },
             });
           });
-      sandbox.stub(element, 'getConsentPolicy_')
-          .callsFake(() => {
-            return 'default';
-          });
+        sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
+          return 'default';
+        });
 
-      clock.tick(1);
-      container.appendChild(element);
-      return element.whenBuilt();
-    });
+        clock.tick(1);
+        container.appendChild(element);
+        return element.whenBuilt();
+      });
 
-    it('should not build on consent insufficient', () => {
-      const element = new ElementClass();
-      sandbox.stub(Services, 'consentPolicyServiceForDocOrNull')
+      it('should not build on consent insufficient', () => {
+        const element = new ElementClass();
+        sandbox
+          .stub(Services, 'consentPolicyServiceForDocOrNull')
           .callsFake(() => {
             return Promise.resolve({
               whenPolicyUnblock: () => {
@@ -594,307 +646,356 @@ describes.realWin('CustomElement', {amp: true}, env => {
               },
             });
           });
-      sandbox.stub(element, 'getConsentPolicy_')
-          .callsFake(() => {
-            return 'default';
-          });
-
-      clock.tick(1);
-      container.appendChild(element);
-      return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
-          /BLOCK_BY_CONSENT/);
-    });
+        sandbox.stub(element, 'getConsentPolicy_').callsFake(() => {
+          return 'default';
+        });
 
-    it('should respect user specified consent policy', () => {
-      const element = new ElementClass();
-      element.getAmpDoc = () => {return env.ampdoc;};
-      expect(element.getConsentPolicy_()).to.equal(null);
-      element.setAttribute('data-block-on-consent', '');
-      expect(element.getConsentPolicy_()).to.equal('default');
-      element.setAttribute('data-block-on-consent', '_none');
-      expect(element.getConsentPolicy_()).to.equal('_none');
-    });
+        clock.tick(1);
+        container.appendChild(element);
+        return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
+          /BLOCK_BY_CONSENT/
+        );
+      });
 
-    it('should repsect metaTag specified consent', () => {
-      const meta = doc.createElement('meta');
-      meta.setAttribute('name', 'amp-consent-blocking');
-      meta.setAttribute('content', 'amp-test');
-      doc.head.appendChild(meta);
-      const element = new ElementClass();
-      element.getAmpDoc = () => {return env.ampdoc;};
-      expect(element.getConsentPolicy_()).to.equal('default');
-      expect(element.getAttribute('data-block-on-consent')).to.equal('default');
-    });
+      it('should respect user specified consent policy', () => {
+        const element = new ElementClass();
+        element.getAmpDoc = () => {
+          return env.ampdoc;
+        };
+        expect(element.getConsentPolicy_()).to.equal(null);
+        element.setAttribute('data-block-on-consent', '');
+        expect(element.getConsentPolicy_()).to.equal('default');
+        element.setAttribute('data-block-on-consent', '_none');
+        expect(element.getConsentPolicy_()).to.equal('_none');
+      });
 
+      it('should repsect metaTag specified consent', () => {
+        const meta = doc.createElement('meta');
+        meta.setAttribute('name', 'amp-consent-blocking');
+        meta.setAttribute('content', 'amp-test');
+        doc.head.appendChild(meta);
+        const element = new ElementClass();
+        element.getAmpDoc = () => {
+          return env.ampdoc;
+        };
+        expect(element.getConsentPolicy_()).to.equal('default');
+        expect(element.getAttribute('data-block-on-consent')).to.equal(
+          'default'
+        );
+      });
 
-    it('should anticipate build errors', () => {
-      const element = new ElementClass();
-      sandbox.stub(element.implementation_, 'buildCallback').callsFake(() => {
-        throw new Error('intentional');
+      it('should anticipate build errors', () => {
+        const element = new ElementClass();
+        sandbox.stub(element.implementation_, 'buildCallback').callsFake(() => {
+          throw new Error('intentional');
+        });
+        container.appendChild(element);
+        expect(element.isBuilt()).to.be.false;
+        expect(element).to.have.class('i-amphtml-notbuilt');
+        expect(element).to.have.class('amp-notbuilt');
+        return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
+          /intentional/
+        );
       });
-      container.appendChild(element);
-      expect(element.isBuilt()).to.be.false;
-      expect(element).to.have.class('i-amphtml-notbuilt');
-      expect(element).to.have.class('amp-notbuilt');
-      return expect(element.whenBuilt()).to.eventually.be.rejectedWith(
-          /intentional/);
-    });
 
-    it('Element - build creates a placeholder if one does not exist' , () => {
-      const element = new ElementClass();
-      expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+      it('Element - build creates a placeholder if one does not exist', () => {
+        const element = new ElementClass();
+        expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
 
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        expect(element.isBuilt()).to.equal(true);
-        expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
+        });
       });
-    });
 
-    it('Element - build does not create a placeholder when one exists' , () => {
-      const element = new ElementClass();
-      const placeholder = doc.createElement('div');
-      placeholder.setAttribute('placeholder', '');
-      element.appendChild(placeholder);
-      expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
-
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        expect(element.isBuilt()).to.equal(true);
+      it('Element - build does not create a placeholder when one exists', () => {
+        const element = new ElementClass();
+        const placeholder = doc.createElement('div');
+        placeholder.setAttribute('placeholder', '');
+        element.appendChild(placeholder);
         expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
-      });
-    });
 
-    it('Element - buildCallback cannot be called twice', () => {
-      const element = new ElementClass();
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(testElementCreatePlaceholderCallback).to.have.not.been.called;
+        });
+      });
 
-      container.appendChild(element);
+      it('Element - buildCallback cannot be called twice', () => {
+        const element = new ElementClass();
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
 
-      return element.buildingPromise_.then(() => {
-        expect(element.isBuilt()).to.equal(true);
-        expect(testElementBuildCallback).to.be.calledOnce;
-        expect(testElementPreconnectCallback).to.have.not.been.called;
+        container.appendChild(element);
 
-        // Call again.
-        return element.build().then(() => {
+        return element.buildingPromise_.then(() => {
           expect(element.isBuilt()).to.equal(true);
           expect(testElementBuildCallback).to.be.calledOnce;
           expect(testElementPreconnectCallback).to.have.not.been.called;
-          clock.tick(1);
-          expect(testElementPreconnectCallback).to.be.calledOnce;
+
+          // Call again.
+          return element.build().then(() => {
+            expect(element.isBuilt()).to.equal(true);
+            expect(testElementBuildCallback).to.be.calledOnce;
+            expect(testElementPreconnectCallback).to.have.not.been.called;
+            clock.tick(1);
+            expect(testElementPreconnectCallback).to.be.calledOnce;
+          });
         });
       });
-    });
-
-    it('Element - build is repeatable', () => {
-      const element = new ElementClass();
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
 
-      container.appendChild(element);
-      const buildingPromise = element.buildingPromise_;
-      expect(element.build()).to.equal(buildingPromise);
-      expect(testElementBuildCallback).to.be.calledOnce;
-    });
+      it('Element - build is repeatable', () => {
+        const element = new ElementClass();
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
 
-    it('Element - build NOT allowed when in template', () => {
-      const element = new ElementClass();
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
+        container.appendChild(element);
+        const buildingPromise = element.buildingPromise_;
+        expect(element.build()).to.equal(buildingPromise);
+        expect(testElementBuildCallback).to.be.calledOnce;
+      });
 
-      element.isInTemplate_ = true;
-      allowConsoleError(() => { expect(() => {
-        element.build();
-      }).to.throw(/Must never be called in template/); });
+      it('Element - build NOT allowed when in template', () => {
+        const element = new ElementClass();
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
 
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
-    });
+        element.isInTemplate_ = true;
+        allowConsoleError(() => {
+          expect(() => {
+            element.build();
+          }).to.throw(/Must never be called in template/);
+        });
 
-    it('StubElement - build never allowed', () => {
-      const element = new StubElementClass();
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
+      });
 
-      allowConsoleError(() => { expect(() => {
-        element.build();
-      }).to.throw(/Cannot build unupgraded element/); });
+      it('StubElement - build never allowed', () => {
+        const element = new StubElementClass();
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
 
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementBuildCallback).to.have.not.been.called;
-    });
+        allowConsoleError(() => {
+          expect(() => {
+            element.build();
+          }).to.throw(/Cannot build unupgraded element/);
+        });
 
-    it('Element - createPlaceholder', () => {
-      const element = new ElementClass();
-      element.createPlaceholder();
-      expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
-    });
+        expect(element.isBuilt()).to.equal(false);
+        expect(testElementBuildCallback).to.have.not.been.called;
+      });
 
-    it('Element - attachedCallback', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
-
-      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-      container.appendChild(element);
-
-      expect(element.everAttached).to.equal(true);
-      expect(element.layout_).to.equal(Layout.FILL);
-      expect(element.implementation_.layout_).to.equal(Layout.FILL);
-      expect(testElementFirstAttachedCallback).to.be.calledOnce;
-    });
+      it('Element - createPlaceholder', () => {
+        const element = new ElementClass();
+        element.createPlaceholder();
+        expect(testElementCreatePlaceholderCallback).to.be.calledOnce;
+      });
 
-    it('StubElement - attachedCallback', () => {
-      const element = new StubElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
-
-      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-      container.appendChild(element);
-
-      expect(element.everAttached).to.equal(true);
-      expect(element.layout_).to.equal(Layout.FILL);
-      // Not upgraded yet!
-      expect(testElementCreatedCallback).to.have.not.been.called;
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element).to.have.class('amp-unresolved');
-      expect(element).to.have.class('i-amphtml-unresolved');
-
-      // Upgrade
-      resourcesMock.expects('upgraded').withExactArgs(element).once();
-      element.upgrade(TestElement);
-
-      expect(element.layout_).to.equal(Layout.FILL);
-      expect(element.implementation_.layout_).to.equal(Layout.FILL);
-      // Now it's called.
-      expect(testElementCreatedCallback).to.be.calledOnce;
-      expect(testElementFirstAttachedCallback).to.be.calledOnce;
-      expect(element).to.not.have.class('amp-unresolved');
-      expect(element).to.not.have.class('i-amphtml-unresolved');
-    });
+      it('Element - attachedCallback', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+
+        resourcesMock
+          .expects('add')
+          .withExactArgs(element)
+          .atLeast(1);
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .atLeast(1);
+        container.appendChild(element);
 
-    it('Element - detachedCallback', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
+        expect(element.everAttached).to.equal(true);
+        expect(element.layout_).to.equal(Layout.FILL);
+        expect(element.implementation_.layout_).to.equal(Layout.FILL);
+        expect(testElementFirstAttachedCallback).to.be.calledOnce;
+      });
 
-      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-      container.appendChild(element);
+      it('StubElement - attachedCallback', () => {
+        const element = new StubElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+
+        resourcesMock
+          .expects('add')
+          .withExactArgs(element)
+          .atLeast(1);
+        container.appendChild(element);
 
-      resourcesMock.expects('remove').withExactArgs(element).once();
-      container.removeChild(element);
+        expect(element.everAttached).to.equal(true);
+        expect(element.layout_).to.equal(Layout.FILL);
+        // Not upgraded yet!
+        expect(testElementCreatedCallback).to.have.not.been.called;
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element).to.have.class('amp-unresolved');
+        expect(element).to.have.class('i-amphtml-unresolved');
+
+        // Upgrade
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .once();
+        element.upgrade(TestElement);
 
-      expect(element.everAttached).to.equal(true);
-      expect(element.layout_).to.equal(Layout.FILL);
-      expect(element.implementation_.layout_).to.equal(Layout.FILL);
-      expect(testElementFirstAttachedCallback).to.be.calledOnce;
-    });
+        expect(element.layout_).to.equal(Layout.FILL);
+        expect(element.implementation_.layout_).to.equal(Layout.FILL);
+        // Now it's called.
+        expect(testElementCreatedCallback).to.be.calledOnce;
+        expect(testElementFirstAttachedCallback).to.be.calledOnce;
+        expect(element).to.not.have.class('amp-unresolved');
+        expect(element).to.not.have.class('i-amphtml-unresolved');
+      });
 
-    it('Element - handles async detachedCallback when connected', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementFirstAttachedCallback).to.have.not.been.called;
-      expect(element.everAttached).to.equal(false);
-      expect(element.layout_).to.equal(Layout.NODISPLAY);
+      it('Element - detachedCallback', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+
+        resourcesMock
+          .expects('add')
+          .withExactArgs(element)
+          .atLeast(1);
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .atLeast(1);
+        container.appendChild(element);
 
-      resourcesMock.expects('add').withExactArgs(element).atLeast(1);
-      resourcesMock.expects('upgraded').withExactArgs(element).atLeast(1);
-      container.appendChild(element);
+        resourcesMock
+          .expects('remove')
+          .withExactArgs(element)
+          .once();
+        container.removeChild(element);
 
-      resourcesMock.expects('remove').withExactArgs(element).never();
-      Object.defineProperty(element, 'isConnected', {
-        value: true,
+        expect(element.everAttached).to.equal(true);
+        expect(element.layout_).to.equal(Layout.FILL);
+        expect(element.implementation_.layout_).to.equal(Layout.FILL);
+        expect(testElementFirstAttachedCallback).to.be.calledOnce;
       });
-      container.removeChild(element);
 
-      expect(element.everAttached).to.equal(true);
-      expect(element.layout_).to.equal(Layout.FILL);
-      expect(element.implementation_.layout_).to.equal(Layout.FILL);
-      expect(testElementFirstAttachedCallback).to.be.calledOnce;
-    });
+      it('Element - handles async detachedCallback when connected', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementFirstAttachedCallback).to.have.not.been.called;
+        expect(element.everAttached).to.equal(false);
+        expect(element.layout_).to.equal(Layout.NODISPLAY);
+
+        resourcesMock
+          .expects('add')
+          .withExactArgs(element)
+          .atLeast(1);
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .atLeast(1);
+        container.appendChild(element);
 
+        resourcesMock
+          .expects('remove')
+          .withExactArgs(element)
+          .never();
+        Object.defineProperty(element, 'isConnected', {
+          value: true,
+        });
+        container.removeChild(element);
 
-    it('Element - layoutCallback before build', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementLayoutCallback).to.have.not.been.called;
-      expect(element.isBuilt()).to.equal(false);
+        expect(element.everAttached).to.equal(true);
+        expect(element.layout_).to.equal(Layout.FILL);
+        expect(element.implementation_.layout_).to.equal(Layout.FILL);
+        expect(testElementFirstAttachedCallback).to.be.calledOnce;
+      });
 
-      allowConsoleError(() => { expect(() => {
-        element.layoutCallback();
-      }).to.throw(/Must be built to receive viewport events/); });
+      it('Element - layoutCallback before build', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementLayoutCallback).to.have.not.been.called;
+        expect(element.isBuilt()).to.equal(false);
 
-      expect(testElementLayoutCallback).to.have.not.been.called;
-    });
+        allowConsoleError(() => {
+          expect(() => {
+            element.layoutCallback();
+          }).to.throw(/Must be built to receive viewport events/);
+        });
 
-    it('StubElement - layoutCallback before build or upgrade', () => {
-      const element = new StubElementClass();
-      element.setAttribute('layout', 'fill');
-      expect(testElementLayoutCallback).to.have.not.been.called;
+        expect(testElementLayoutCallback).to.have.not.been.called;
+      });
 
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.isBuilt()).to.equal(false);
-      allowConsoleError(() => { expect(() => {
-        element.layoutCallback();
-      }).to.throw(/Must be built to receive viewport events/); });
+      it('StubElement - layoutCallback before build or upgrade', () => {
+        const element = new StubElementClass();
+        element.setAttribute('layout', 'fill');
+        expect(testElementLayoutCallback).to.have.not.been.called;
 
-      resourcesMock.expects('upgraded').withExactArgs(element).never();
-      element.upgrade(TestElement);
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.isBuilt()).to.equal(false);
+        allowConsoleError(() => {
+          expect(() => {
+            element.layoutCallback();
+          }).to.throw(/Must be built to receive viewport events/);
+        });
 
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.isBuilt()).to.equal(false);
-      allowConsoleError(() => { expect(() => {
-        element.layoutCallback();
-      }).to.throw(/Must be built to receive viewport events/); });
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .never();
+        element.upgrade(TestElement);
 
-      expect(testElementLayoutCallback).to.have.not.been.called;
-    });
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.isBuilt()).to.equal(false);
+        allowConsoleError(() => {
+          expect(() => {
+            element.layoutCallback();
+          }).to.throw(/Must be built to receive viewport events/);
+        });
 
-    it('Element - layoutCallback', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      container.appendChild(element);
-      return element.build().then(() => {
-        expect(element.isBuilt()).to.equal(true);
         expect(testElementLayoutCallback).to.have.not.been.called;
-        clock.tick(1);
-        expect(testElementPreconnectCallback).to.be.calledOnce;
-        expect(testElementPreconnectCallback.getCall(0).args[0]).to.be.false;
-
-        const p = element.layoutCallback();
-        expect(testElementLayoutCallback).to.be.calledOnce;
-        expect(testElementPreconnectCallback).to.have.callCount(2);
-        expect(testElementPreconnectCallback.getCall(1).args[0]).to.be.true;
-        expect(element.signals().get(CommonSignals.LOAD_START)).to.be.ok;
-        expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
-        return p.then(() => {
-          expect(element.readyState).to.equal('complete');
-          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
+      });
+
+      it('Element - layoutCallback', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        container.appendChild(element);
+        return element.build().then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(testElementLayoutCallback).to.have.not.been.called;
+          clock.tick(1);
+          expect(testElementPreconnectCallback).to.be.calledOnce;
+          expect(testElementPreconnectCallback.getCall(0).args[0]).to.be.false;
+
+          const p = element.layoutCallback();
+          expect(testElementLayoutCallback).to.be.calledOnce;
+          expect(testElementPreconnectCallback).to.have.callCount(2);
+          expect(testElementPreconnectCallback.getCall(1).args[0]).to.be.true;
+          expect(element.signals().get(CommonSignals.LOAD_START)).to.be.ok;
+          expect(element.signals().get(CommonSignals.LOAD_END)).to.be.null;
+          return p.then(() => {
+            expect(element.readyState).to.equal('complete');
+            expect(element.signals().get(CommonSignals.LOAD_END)).to.be.ok;
+          });
         });
       });
-    });
 
-    it('Element - layoutCallback should call firstLayoutCompleted only once',
-        () => {
-          const element = new ElementClass();
-          element.setAttribute('layout', 'fill');
-          container.appendChild(element);
-          return element.buildingPromise_.then(() => {
+      it('Element - layoutCallback should call firstLayoutCompleted only once', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
             const p = element.layoutCallback();
             expect(testElementLayoutCallback).to.be.calledOnce;
             expect(testElementFirstLayoutCompleted).to.have.not.been.called;
             return p;
-          }).then(() => {
+          })
+          .then(() => {
             expect(testElementFirstLayoutCompleted).to.be.calledOnce;
 
             // But not second time.
@@ -902,593 +1003,626 @@ describes.realWin('CustomElement', {amp: true}, env => {
             expect(testElementLayoutCallback).to.have.callCount(2);
             expect(testElementFirstLayoutCompleted).to.be.calledOnce;
             return p2;
-          }).then(() => {
+          })
+          .then(() => {
             expect(testElementFirstLayoutCompleted).to.be.calledOnce;
           });
-        });
+      });
 
-    it('Element - layoutCallback is NOT allowed in template', () => {
-      const element = new ElementClass();
-      element.setAttribute('layout', 'fill');
-      container.appendChild(element);
-      return element.build().then(() => {
-        expect(element.isBuilt()).to.equal(true);
-        expect(testElementLayoutCallback).to.have.not.been.called;
+      it('Element - layoutCallback is NOT allowed in template', () => {
+        const element = new ElementClass();
+        element.setAttribute('layout', 'fill');
+        container.appendChild(element);
+        return element.build().then(() => {
+          expect(element.isBuilt()).to.equal(true);
+          expect(testElementLayoutCallback).to.have.not.been.called;
 
-        element.isInTemplate_ = true;
-        allowConsoleError(() => { expect(() => {
-          element.layoutCallback();
-        }).to.throw(/Must never be called in template/); });
+          element.isInTemplate_ = true;
+          allowConsoleError(() => {
+            expect(() => {
+              element.layoutCallback();
+            }).to.throw(/Must never be called in template/);
+          });
+        });
       });
-    });
-
-    it('StubElement - layoutCallback should fail before attach', () => {
-      const element = new StubElementClass();
-      element.setAttribute('layout', 'fill');
-      resourcesMock.expects('upgraded').withExactArgs(element).never();
-      element.upgrade(TestElement);
-      allowConsoleError(() => {
-        expect(() => element.build()).to.throw(
-            /Cannot build unupgraded element/);
-      });
-      expect(element.isUpgraded()).to.equal(false);
-      expect(element.isBuilt()).to.equal(false);
-      expect(testElementLayoutCallback).to.have.not.been.called;
-    });
 
-    it('StubElement - layoutCallback after attached', () => {
-      const element = new StubElementClass();
-      element.setAttribute('layout', 'fill');
-      element.everAttached = true;
-      element.ampdoc_ = env.ampdoc;
-      element.resources_ = resources;
-      resourcesMock.expects('upgraded').withExactArgs(element).once();
-      element.upgrade(TestElement);
-      return element.build().then(() => {
-        expect(element.isUpgraded()).to.equal(true);
-        expect(element.isBuilt()).to.equal(true);
+      it('StubElement - layoutCallback should fail before attach', () => {
+        const element = new StubElementClass();
+        element.setAttribute('layout', 'fill');
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .never();
+        element.upgrade(TestElement);
+        allowConsoleError(() => {
+          expect(() => element.build()).to.throw(
+            /Cannot build unupgraded element/
+          );
+        });
+        expect(element.isUpgraded()).to.equal(false);
+        expect(element.isBuilt()).to.equal(false);
         expect(testElementLayoutCallback).to.have.not.been.called;
-
-        const p = element.layoutCallback();
-        expect(testElementLayoutCallback).to.be.calledOnce;
-        return p;
-      }).then(() => {
-        expect(element.readyState).to.equal('complete');
       });
-    });
 
+      it('StubElement - layoutCallback after attached', () => {
+        const element = new StubElementClass();
+        element.setAttribute('layout', 'fill');
+        element.everAttached = true;
+        element.ampdoc_ = env.ampdoc;
+        element.resources_ = resources;
+        resourcesMock
+          .expects('upgraded')
+          .withExactArgs(element)
+          .once();
+        element.upgrade(TestElement);
+        return element
+          .build()
+          .then(() => {
+            expect(element.isUpgraded()).to.equal(true);
+            expect(element.isBuilt()).to.equal(true);
+            expect(testElementLayoutCallback).to.have.not.been.called;
 
-    it('should enqueue actions until built', () => {
-      const element = new ElementClass();
-      const handler = sandbox.spy();
-      element.implementation_.executeAction = handler;
-      expect(element.actionQueue_).to.not.equal(null);
+            const p = element.layoutCallback();
+            expect(testElementLayoutCallback).to.be.calledOnce;
+            return p;
+          })
+          .then(() => {
+            expect(element.readyState).to.equal('complete');
+          });
+      });
 
-      const inv = {};
-      element.enqueAction(inv);
-      expect(element.actionQueue_.length).to.equal(1);
-      expect(element.actionQueue_[0]).to.equal(inv);
-      expect(handler).to.have.not.been.called;
-    });
+      it('should enqueue actions until built', () => {
+        const element = new ElementClass();
+        const handler = sandbox.spy();
+        element.implementation_.executeAction = handler;
+        expect(element.actionQueue_).to.not.equal(null);
 
-    it('should execute action immediately after built', () => {
-      const element = new ElementClass();
-      const handler = sandbox.spy();
-      element.implementation_.executeAction = handler;
-      container.appendChild(element);
-      return element.build().then(() => {
         const inv = {};
         element.enqueAction(inv);
-        expect(handler).to.be.calledOnce;
-        expect(handler.getCall(0).args[0]).to.equal(inv);
-        expect(handler.getCall(0).args[1]).to.equal(false);
+        expect(element.actionQueue_.length).to.equal(1);
+        expect(element.actionQueue_[0]).to.equal(inv);
+        expect(handler).to.have.not.been.called;
       });
-    });
 
-    it('should dequeue all actions after build', () => {
-      const element = new ElementClass();
-      const handler = sandbox.spy();
-      element.implementation_.executeAction = handler;
-
-      const inv1 = {};
-      const inv2 = {};
-      element.enqueAction(inv1);
-      element.enqueAction(inv2);
-      expect(element.actionQueue_.length).to.equal(2);
-      expect(element.actionQueue_[0]).to.equal(inv1);
-      expect(element.actionQueue_[1]).to.equal(inv2);
-      expect(handler).to.have.not.been.called;
-
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        clock.tick(10);
-        expect(handler).to.have.callCount(2);
-        expect(handler.getCall(0).args[0]).to.equal(inv1);
-        expect(handler.getCall(0).args[1]).to.equal(true);
-        expect(handler.getCall(1).args[0]).to.equal(inv2);
-        expect(handler.getCall(1).args[1]).to.equal(true);
-        expect(element.actionQueue_).to.equal(null);
+      it('should execute action immediately after built', () => {
+        const element = new ElementClass();
+        const handler = sandbox.spy();
+        element.implementation_.executeAction = handler;
+        container.appendChild(element);
+        return element.build().then(() => {
+          const inv = {};
+          element.enqueAction(inv);
+          expect(handler).to.be.calledOnce;
+          expect(handler.getCall(0).args[0]).to.equal(inv);
+          expect(handler.getCall(0).args[1]).to.equal(false);
+        });
       });
-    });
-
-    it('should NOT enqueue actions when in template', () => {
-      const element = new ElementClass();
-      const handler = sandbox.spy();
-      element.implementation_.executeAction = handler;
-      expect(element.actionQueue_).to.not.equal(null);
-
-      const inv = {};
-      element.isInTemplate_ = true;
-      allowConsoleError(() => { expect(() => {
-        element.enqueAction(inv);
-      }).to.throw(/Must never be called in template/); });
-    });
 
-    describe('apply sizes and media query', () => {
-      let element1;
-      let element2;
-      let matchMedia;
-
-      beforeEach(() => {
-        element1 = new ElementClass();
-
-        // Fixes #19752. The window.matchMedia call in the code
-        // path of element.applySizesAndMediaQuery is not behaving consistently
-        // in headless mode, thus we mock the calls here. This is fine as we are
-        // not testing window behavior.
-        matchMedia =
-            sandbox.stub(element1.ownerDocument.defaultView, 'matchMedia');
-        matchMedia.withArgs('(min-width: 1px)').returns({matches: true});
-        matchMedia.withArgs('(min-width: 1111111px)').returns(
-            {matches: false});
-        element2 = new ElementClass();
-        element2.ampdoc_ = env.ampdoc;
-      });
-
-      it('should apply media condition', () => {
-        element1.setAttribute('media', '(min-width: 1px)');
-        element1.applySizesAndMediaQuery();
-        expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
+      it('should dequeue all actions after build', () => {
+        const element = new ElementClass();
+        const handler = sandbox.spy();
+        element.implementation_.executeAction = handler;
+
+        const inv1 = {};
+        const inv2 = {};
+        element.enqueAction(inv1);
+        element.enqueAction(inv2);
+        expect(element.actionQueue_.length).to.equal(2);
+        expect(element.actionQueue_[0]).to.equal(inv1);
+        expect(element.actionQueue_[1]).to.equal(inv2);
+        expect(handler).to.have.not.been.called;
 
-        element2.setAttribute('media', '(min-width: 1111111px)');
-        element2.applySizesAndMediaQuery();
-        expect(element2).to.have.class('i-amphtml-hidden-by-media-query');
+        container.appendChild(element);
+        return element.buildingPromise_.then(() => {
+          clock.tick(10);
+          expect(handler).to.have.callCount(2);
+          expect(handler.getCall(0).args[0]).to.equal(inv1);
+          expect(handler.getCall(0).args[1]).to.equal(true);
+          expect(handler.getCall(1).args[0]).to.equal(inv2);
+          expect(handler.getCall(1).args[1]).to.equal(true);
+          expect(element.actionQueue_).to.equal(null);
+        });
       });
 
-      it('should apply sizes condition', () => {
-        element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
-        element1.applySizesAndMediaQuery();
-        expect(element1.style.width).to.equal('200px');
+      it('should NOT enqueue actions when in template', () => {
+        const element = new ElementClass();
+        const handler = sandbox.spy();
+        element.implementation_.executeAction = handler;
+        expect(element.actionQueue_).to.not.equal(null);
 
-        element2.setAttribute('sizes', '(min-width: 1111111px) 200px, 50vw');
-        element2.applySizesAndMediaQuery();
-        expect(element2.style.width).to.equal('50vw');
+        const inv = {};
+        element.isInTemplate_ = true;
+        allowConsoleError(() => {
+          expect(() => {
+            element.enqueAction(inv);
+          }).to.throw(/Must never be called in template/);
+        });
       });
 
-      it('should apply heights condition', () => {
-        element1.sizerElement = doc.createElement('div');
-        element1.setAttribute('layout', 'responsive');
-        element1.setAttribute('width', '200px');
-        element1.setAttribute('height', '200px');
-        element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
-        container.appendChild(element1);
-        element1.applySizesAndMediaQuery();
-        expect(element1.sizerElement.style.paddingTop).to.equal('99%');
-
-        element2.sizerElement = doc.createElement('div');
-        element2.setAttribute('layout', 'responsive');
-        element2.setAttribute('width', '200px');
-        element2.setAttribute('height', '200px');
-        element2.setAttribute('heights', '(min-width: 1111111px) 99%, 1%');
-        container.appendChild(element2);
-        element2.applySizesAndMediaQuery();
-        expect(element2.sizerElement.style.paddingTop).to.equal('1%');
-      });
-
-      it('should rediscover sizer to apply heights in SSR', () => {
-        element1.setAttribute('i-amphtml-layout', 'responsive');
-        element1.setAttribute('layout', 'responsive');
-        element1.setAttribute('width', '200px');
-        element1.setAttribute('height', '200px');
-        element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
-        container.appendChild(element1);
+      describe('apply sizes and media query', () => {
+        let element1;
+        let element2;
+        let matchMedia;
+
+        beforeEach(() => {
+          element1 = new ElementClass();
+
+          // Fixes #19752. The window.matchMedia call in the code
+          // path of element.applySizesAndMediaQuery is not behaving consistently
+          // in headless mode, thus we mock the calls here. This is fine as we are
+          // not testing window behavior.
+          matchMedia = sandbox.stub(
+            element1.ownerDocument.defaultView,
+            'matchMedia'
+          );
+          matchMedia.withArgs('(min-width: 1px)').returns({matches: true});
+          matchMedia
+            .withArgs('(min-width: 1111111px)')
+            .returns({matches: false});
+          element2 = new ElementClass();
+          element2.ampdoc_ = env.ampdoc;
+        });
 
-        const sizer = doc.createElement('i-amphtml-sizer');
-        expect(element1.sizerElement).to.be.undefined;
-        element1.appendChild(sizer);
-        element1.applySizesAndMediaQuery();
-        expect(element1.sizerElement).to.equal(sizer);
-        expect(sizer.style.paddingTop).to.equal('99%');
-      });
+        it('should apply media condition', () => {
+          element1.setAttribute('media', '(min-width: 1px)');
+          element1.applySizesAndMediaQuery();
+          expect(element1).to.not.have.class('i-amphtml-hidden-by-media-query');
 
-      it('should NOT rediscover sizer after reset in SSR', () => {
-        element1.setAttribute('i-amphtml-layout', 'responsive');
-        element1.setAttribute('layout', 'responsive');
-        element1.setAttribute('width', '200px');
-        element1.setAttribute('height', '200px');
-        element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
-        container.appendChild(element1);
+          element2.setAttribute('media', '(min-width: 1111111px)');
+          element2.applySizesAndMediaQuery();
+          expect(element2).to.have.class('i-amphtml-hidden-by-media-query');
+        });
 
-        const sizer = doc.createElement('i-amphtml-sizer');
-        element1.appendChild(sizer);
-        element1.sizerElement = null;
-        element1.applySizesAndMediaQuery();
-        expect(element1.sizerElement).to.be.null;
-        expect(sizer.style.paddingTop).to.equal('');
-      });
-    });
+        it('should apply sizes condition', () => {
+          element1.setAttribute('sizes', '(min-width: 1px) 200px, 50vw');
+          element1.applySizesAndMediaQuery();
+          expect(element1.style.width).to.equal('200px');
 
-    it('should reapply layout=nodisplay in SSR', () => {
-      const element1 = new ElementClass();
-      element1.setAttribute('i-amphtml-layout', 'nodisplay');
-      element1.setAttribute('layout', 'nodisplay');
-      container.appendChild(element1);
-      expect(element1).to.have.display('none');
-    });
+          element2.setAttribute('sizes', '(min-width: 1111111px) 200px, 50vw');
+          element2.applySizesAndMediaQuery();
+          expect(element2.style.width).to.equal('50vw');
+        });
 
-    it('should change size without sizer', () => {
-      const element = new ElementClass();
-      element.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-      expect(element.style.height).to.equal('111px');
-      expect(element.style.width).to.equal('222px');
-      expect(element.style.marginTop).to.equal('1px');
-      expect(element.style.marginRight).to.equal('2px');
-      expect(element.style.marginBottom).to.equal('3px');
-      expect(element.style.marginLeft).to.equal('4px');
-    });
+        it('should apply heights condition', () => {
+          element1.sizerElement = doc.createElement('div');
+          element1.setAttribute('layout', 'responsive');
+          element1.setAttribute('width', '200px');
+          element1.setAttribute('height', '200px');
+          element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
+          container.appendChild(element1);
+          element1.applySizesAndMediaQuery();
+          expect(element1.sizerElement.style.paddingTop).to.equal('99%');
+
+          element2.sizerElement = doc.createElement('div');
+          element2.setAttribute('layout', 'responsive');
+          element2.setAttribute('width', '200px');
+          element2.setAttribute('height', '200px');
+          element2.setAttribute('heights', '(min-width: 1111111px) 99%, 1%');
+          container.appendChild(element2);
+          element2.applySizesAndMediaQuery();
+          expect(element2.sizerElement.style.paddingTop).to.equal('1%');
+        });
 
-    it('should change size - height only without sizer', () => {
-      const element = new ElementClass();
-      element.changeSize(111);
-      expect(element.style.height).to.equal('111px');
-    });
+        it('should rediscover sizer to apply heights in SSR', () => {
+          element1.setAttribute('i-amphtml-layout', 'responsive');
+          element1.setAttribute('layout', 'responsive');
+          element1.setAttribute('width', '200px');
+          element1.setAttribute('height', '200px');
+          element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
+          container.appendChild(element1);
+
+          const sizer = doc.createElement('i-amphtml-sizer');
+          expect(element1.sizerElement).to.be.undefined;
+          element1.appendChild(sizer);
+          element1.applySizesAndMediaQuery();
+          expect(element1.sizerElement).to.equal(sizer);
+          expect(sizer.style.paddingTop).to.equal('99%');
+        });
 
-    it('should change size - width only without sizer', () => {
-      const element = new ElementClass();
-      element.changeSize(undefined, 111);
-      expect(element.style.width).to.equal('111px');
-    });
+        it('should NOT rediscover sizer after reset in SSR', () => {
+          element1.setAttribute('i-amphtml-layout', 'responsive');
+          element1.setAttribute('layout', 'responsive');
+          element1.setAttribute('width', '200px');
+          element1.setAttribute('height', '200px');
+          element1.setAttribute('heights', '(min-width: 1px) 99%, 1%');
+          container.appendChild(element1);
+
+          const sizer = doc.createElement('i-amphtml-sizer');
+          element1.appendChild(sizer);
+          element1.sizerElement = null;
+          element1.applySizesAndMediaQuery();
+          expect(element1.sizerElement).to.be.null;
+          expect(sizer.style.paddingTop).to.equal('');
+        });
+      });
 
-    it('should change size - margins only without sizer', () => {
-      const element = new ElementClass();
-      element.changeSize(undefined, undefined,
-          {top: 1, right: 2, bottom: 3, left: 4});
-      expect(element.style.marginTop).to.equal('1px');
-      expect(element.style.marginRight).to.equal('2px');
-      expect(element.style.marginBottom).to.equal('3px');
-      expect(element.style.marginLeft).to.equal('4px');
-    });
+      it('should reapply layout=nodisplay in SSR', () => {
+        const element1 = new ElementClass();
+        element1.setAttribute('i-amphtml-layout', 'nodisplay');
+        element1.setAttribute('layout', 'nodisplay');
+        container.appendChild(element1);
+        expect(element1).to.have.display('none');
+      });
 
-    it('should change size - some margins only without sizer', () => {
-      const element = new ElementClass();
-      element.style.margin = '1px 2px 3px 4px';
-      element.changeSize(undefined, undefined, {top: 5, left: 6});
-      expect(element.style.marginTop).to.equal('5px');
-      expect(element.style.marginRight).to.equal('2px');
-      expect(element.style.marginBottom).to.equal('3px');
-      expect(element.style.marginLeft).to.equal('6px');
-    });
+      it('should change size without sizer', () => {
+        const element = new ElementClass();
+        element.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
+        expect(element.style.height).to.equal('111px');
+        expect(element.style.width).to.equal('222px');
+        expect(element.style.marginTop).to.equal('1px');
+        expect(element.style.marginRight).to.equal('2px');
+        expect(element.style.marginBottom).to.equal('3px');
+        expect(element.style.marginLeft).to.equal('4px');
+      });
 
-    it('should change size - some margins only without sizer', () => {
-      const element = new ElementClass();
-      element.style.margin = '1px 2px 3px 4px';
-      element.changeSize(undefined, undefined, {top: 5, left: 6});
-      expect(element.style.marginTop).to.equal('5px');
-      expect(element.style.marginRight).to.equal('2px');
-      expect(element.style.marginBottom).to.equal('3px');
-      expect(element.style.marginLeft).to.equal('6px');
-    });
+      it('should change size - height only without sizer', () => {
+        const element = new ElementClass();
+        element.changeSize(111);
+        expect(element.style.height).to.equal('111px');
+      });
 
-    it('should change size with sizer', () => {
-      const element = new ElementClass();
-      const sizer = doc.createElement('div');
-      element.sizerElement = sizer;
-      element.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
-      expect(parseInt(sizer.style.paddingTop, 10)).to.equal(0);
-      expect(element.sizerElement).to.be.null;
-      expect(element.style.height).to.equal('111px');
-      expect(element.style.width).to.equal('222px');
-      expect(element.style.marginTop).to.equal('1px');
-      expect(element.style.marginRight).to.equal('2px');
-      expect(element.style.marginBottom).to.equal('3px');
-      expect(element.style.marginLeft).to.equal('4px');
-    });
+      it('should change size - width only without sizer', () => {
+        const element = new ElementClass();
+        element.changeSize(undefined, 111);
+        expect(element.style.width).to.equal('111px');
+      });
 
-    it('should NOT apply media condition in template', () => {
-      const element1 = new ElementClass();
-      element1.setAttribute('media', '(min-width: 1px)');
-      element1.isInTemplate_ = true;
-      allowConsoleError(() => { expect(() => {
-        element1.applySizesAndMediaQuery();
-      }).to.throw(/Must never be called in template/); });
-    });
+      it('should change size - margins only without sizer', () => {
+        const element = new ElementClass();
+        element.changeSize(undefined, undefined, {
+          top: 1,
+          right: 2,
+          bottom: 3,
+          left: 4,
+        });
+        expect(element.style.marginTop).to.equal('1px');
+        expect(element.style.marginRight).to.equal('2px');
+        expect(element.style.marginBottom).to.equal('3px');
+        expect(element.style.marginLeft).to.equal('4px');
+      });
 
-    it('should change size to zero', () => {
-      const element = new ElementClass();
-      element.changeSize(0, 0);
-      expect(element.style.height).to.equal('0px');
-      expect(element.style.width).to.equal('0px');
-    });
+      it('should change size - some margins only without sizer', () => {
+        const element = new ElementClass();
+        element.style.margin = '1px 2px 3px 4px';
+        element.changeSize(undefined, undefined, {top: 5, left: 6});
+        expect(element.style.marginTop).to.equal('5px');
+        expect(element.style.marginRight).to.equal('2px');
+        expect(element.style.marginBottom).to.equal('3px');
+        expect(element.style.marginLeft).to.equal('6px');
+      });
 
-    it('should change width to zero', () => {
-      const element = new ElementClass();
-      element.changeSize(undefined, 0);
-      expect(element.style.width).to.equal('0px');
-    });
+      it('should change size - some margins only without sizer', () => {
+        const element = new ElementClass();
+        element.style.margin = '1px 2px 3px 4px';
+        element.changeSize(undefined, undefined, {top: 5, left: 6});
+        expect(element.style.marginTop).to.equal('5px');
+        expect(element.style.marginRight).to.equal('2px');
+        expect(element.style.marginBottom).to.equal('3px');
+        expect(element.style.marginLeft).to.equal('6px');
+      });
 
-    it('should remove i-amphtml-layout-awaiting-size class when ' +
-        'size changed', () => {
-      const element = new StubElementClass();
-      expect(element.isUpgraded()).to.equal(false);
-      element.classList.add('i-amphtml-layout-awaiting-size');
+      it('should change size with sizer', () => {
+        const element = new ElementClass();
+        const sizer = doc.createElement('div');
+        element.sizerElement = sizer;
+        element.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
+        expect(parseInt(sizer.style.paddingTop, 10)).to.equal(0);
+        expect(element.sizerElement).to.be.null;
+        expect(element.style.height).to.equal('111px');
+        expect(element.style.width).to.equal('222px');
+        expect(element.style.marginTop).to.equal('1px');
+        expect(element.style.marginRight).to.equal('2px');
+        expect(element.style.marginBottom).to.equal('3px');
+        expect(element.style.marginLeft).to.equal('4px');
+      });
 
-      expect(element).to.have.class('i-amphtml-layout-awaiting-size');
-      element.changeSize(100, 100);
-      expect(element).not.to.have.class('i-amphtml-layout-awaiting-size');
-    });
+      it('should NOT apply media condition in template', () => {
+        const element1 = new ElementClass();
+        element1.setAttribute('media', '(min-width: 1px)');
+        element1.isInTemplate_ = true;
+        allowConsoleError(() => {
+          expect(() => {
+            element1.applySizesAndMediaQuery();
+          }).to.throw(/Must never be called in template/);
+        });
+      });
 
-    it('should dispatch custom event size-changed when size changed', () => {
-      const element = new ElementClass();
-      const spyDispatchEvent = sandbox.spy(element, 'dispatchCustomEvent');
+      it('should change size to zero', () => {
+        const element = new ElementClass();
+        element.changeSize(0, 0);
+        expect(element.style.height).to.equal('0px');
+        expect(element.style.width).to.equal('0px');
+      });
 
-      element.changeSize();
+      it('should change width to zero', () => {
+        const element = new ElementClass();
+        element.changeSize(undefined, 0);
+        expect(element.style.width).to.equal('0px');
+      });
 
-      expect(spyDispatchEvent).to.be.calledWith(AmpEvents.SIZE_CHANGED);
-    });
+      it(
+        'should remove i-amphtml-layout-awaiting-size class when ' +
+          'size changed',
+        () => {
+          const element = new StubElementClass();
+          expect(element.isUpgraded()).to.equal(false);
+          element.classList.add('i-amphtml-layout-awaiting-size');
 
-    describe('unlayoutCallback', () => {
+          expect(element).to.have.class('i-amphtml-layout-awaiting-size');
+          element.changeSize(100, 100);
+          expect(element).not.to.have.class('i-amphtml-layout-awaiting-size');
+        }
+      );
 
-      it('should unlayout built element and reset layoutCount', () => {
+      it('should dispatch custom event size-changed when size changed', () => {
         const element = new ElementClass();
-        // Non-built element doesn't receive unlayoutCallback.
-        element.unlayoutCallback();
-        expect(testElementUnlayoutCallback).to.have.not.been.called;
+        const spyDispatchEvent = sandbox.spy(element, 'dispatchCustomEvent');
 
-        element.implementation_.layoutCallback = () => {
-          testElementLayoutCallback();
-          element.layoutCount_++;
-          return Promise.resolve();
-        };
+        element.changeSize();
 
-        element.implementation_.unlayoutCallback = () => {
-          testElementUnlayoutCallback();
-          return true;
-        };
+        expect(spyDispatchEvent).to.be.calledWith(AmpEvents.SIZE_CHANGED);
+      });
 
-        // Built element receives unlayoutCallback.
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
+      describe('unlayoutCallback', () => {
+        it('should unlayout built element and reset layoutCount', () => {
+          const element = new ElementClass();
+          // Non-built element doesn't receive unlayoutCallback.
           element.unlayoutCallback();
-          expect(testElementUnlayoutCallback).to.be.calledOnce;
-          expect(element.layoutCount_).to.equal(0);
+          expect(testElementUnlayoutCallback).to.have.not.been.called;
+
+          element.implementation_.layoutCallback = () => {
+            testElementLayoutCallback();
+            element.layoutCount_++;
+            return Promise.resolve();
+          };
+
+          element.implementation_.unlayoutCallback = () => {
+            testElementUnlayoutCallback();
+            return true;
+          };
+
+          // Built element receives unlayoutCallback.
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.unlayoutCallback();
+            expect(testElementUnlayoutCallback).to.be.calledOnce;
+            expect(element.layoutCount_).to.equal(0);
+          });
         });
-      });
 
-      it('should not reset layoutCount if relayout not requested', () => {
-        const element = new ElementClass();
-        element.implementation_.layoutCallback = () => {
-          testElementLayoutCallback();
-          element.layoutCount_++;
-          return Promise.resolve();
-        };
-        element.implementation_.unlayoutCallback = () => {
-          testElementUnlayoutCallback();
-          return false;
-        };
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          element.layoutCallback();
-          element.unlayoutCallback();
-          expect(testElementUnlayoutCallback).to.be.calledOnce;
-          expect(element.layoutCount_).to.equal(1);
+        it('should not reset layoutCount if relayout not requested', () => {
+          const element = new ElementClass();
+          element.implementation_.layoutCallback = () => {
+            testElementLayoutCallback();
+            element.layoutCount_++;
+            return Promise.resolve();
+          };
+          element.implementation_.unlayoutCallback = () => {
+            testElementUnlayoutCallback();
+            return false;
+          };
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.layoutCallback();
+            element.unlayoutCallback();
+            expect(testElementUnlayoutCallback).to.be.calledOnce;
+            expect(element.layoutCount_).to.equal(1);
+          });
         });
-      });
 
-      it('StubElement', () => {
-        const element = new StubElementClass();
+        it('StubElement', () => {
+          const element = new StubElementClass();
 
-        // Unupgraded document doesn't receive unlayoutCallback.
-        element.unlayoutCallback();
-        expect(testElementUnlayoutCallback).to.have.not.been.called;
+          // Unupgraded document doesn't receive unlayoutCallback.
+          element.unlayoutCallback();
+          expect(testElementUnlayoutCallback).to.have.not.been.called;
+        });
       });
-    });
-
-    describe('pauseCallback', () => {
-      it('should not pause unbuilt element', () => {
-        const element = new ElementClass();
-        expect(element.isPaused()).to.be.false;
 
-        // Non-built element doesn't receive pauseCallback.
-        element.pauseCallback();
-        expect(element.isPaused()).to.be.true;
-        expect(testElementPauseCallback).to.not.be.called;
-      });
+      describe('pauseCallback', () => {
+        it('should not pause unbuilt element', () => {
+          const element = new ElementClass();
+          expect(element.isPaused()).to.be.false;
 
-      it('should pause upgraded element', () => {
-        const element = new ElementClass();
-        element.viewportCallback(true);
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(testElementViewportCallback).to.be.calledOnce;
-          expect(testElementViewportCallback).to.be.calledWith(true);
+          // Non-built element doesn't receive pauseCallback.
           element.pauseCallback();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(testElementViewportCallback).to.be.calledTwice;
-          expect(testElementViewportCallback).to.be.calledWith(false);
           expect(element.isPaused()).to.be.true;
-          expect(element.isInViewport()).to.be.false;
+          expect(testElementPauseCallback).to.not.be.called;
+        });
+
+        it('should pause upgraded element', () => {
+          const element = new ElementClass();
+          element.viewportCallback(true);
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            expect(testElementViewportCallback).to.be.calledOnce;
+            expect(testElementViewportCallback).to.be.calledWith(true);
+            element.pauseCallback();
+            expect(testElementPauseCallback).to.be.calledOnce;
+            expect(testElementViewportCallback).to.be.calledTwice;
+            expect(testElementViewportCallback).to.be.calledWith(false);
+            expect(element.isPaused()).to.be.true;
+            expect(element.isInViewport()).to.be.false;
+          });
+        });
+
+        it('should only pause once', () => {
+          const element = new ElementClass();
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.pauseCallback();
+            expect(testElementPauseCallback).to.be.calledOnce;
+            element.pauseCallback();
+            expect(testElementPauseCallback).to.be.calledOnce;
+            expect(element.isPaused()).to.be.true;
+          });
         });
-      });
 
-      it('should only pause once', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          element.pauseCallback();
-          expect(testElementPauseCallback).to.be.calledOnce;
+        it('should pause stub element', () => {
+          const element = new StubElementClass();
+
+          // Unupgraded document doesn't receive pauseCallback.
           element.pauseCallback();
-          expect(testElementPauseCallback).to.be.calledOnce;
-          expect(element.isPaused()).to.be.true;
+          expect(testElementPauseCallback).to.have.not.been.called;
         });
       });
 
-      it('should pause stub element', () => {
-        const element = new StubElementClass();
-
-        // Unupgraded document doesn't receive pauseCallback.
-        element.pauseCallback();
-        expect(testElementPauseCallback).to.have.not.been.called;
-      });
-    });
+      describe('resumeCallback', () => {
+        it('should resume upgraded element', () => {
+          const element = new ElementClass();
+          element.pauseCallback();
 
-    describe('resumeCallback', () => {
-      it('should resume upgraded element', () => {
-        const element = new ElementClass();
-        element.pauseCallback();
+          // Non-built element doesn't receive resumeCallback.
+          element.resumeCallback();
+          expect(testElementResumeCallback).to.have.not.been.called;
 
-        // Non-built element doesn't receive resumeCallback.
-        element.resumeCallback();
-        expect(testElementResumeCallback).to.have.not.been.called;
+          // Built element receives resumeCallback.
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.pauseCallback();
+            element.resumeCallback();
+            expect(testElementResumeCallback).to.be.calledOnce;
+          });
+        });
 
-        // Built element receives resumeCallback.
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          element.pauseCallback();
-          element.resumeCallback();
-          expect(testElementResumeCallback).to.be.calledOnce;
+        it('should resume upgraded element only once', () => {
+          const element = new ElementClass();
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            element.pauseCallback();
+            element.resumeCallback();
+            expect(testElementResumeCallback).to.be.calledOnce;
+            element.resumeCallback();
+            expect(testElementResumeCallback).to.be.calledOnce;
+            expect(element.isPaused()).to.be.false;
+          });
         });
-      });
 
-      it('should resume upgraded element only once', () => {
-        const element = new ElementClass();
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
+        it('should resume stub element', () => {
+          const element = new StubElementClass();
+
+          // Unupgraded document doesn't receive resumeCallback.
           element.pauseCallback();
           element.resumeCallback();
-          expect(testElementResumeCallback).to.be.calledOnce;
-          element.resumeCallback();
-          expect(testElementResumeCallback).to.be.calledOnce;
-          expect(element.isPaused()).to.be.false;
+          expect(testElementResumeCallback).to.have.not.been.called;
         });
       });
 
-      it('should resume stub element', () => {
-        const element = new StubElementClass();
-
-        // Unupgraded document doesn't receive resumeCallback.
-        element.pauseCallback();
-        element.resumeCallback();
-        expect(testElementResumeCallback).to.have.not.been.called;
-      });
-    });
-
-    describe('viewportCallback', () => {
-      it('Element should allow, but not delegate before build', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(testElementViewportCallback).to.have.not.been.called;
-
-        expect(element.isBuilt()).to.equal(false);
-        element.viewportCallback(true);
-        expect(element.isInViewport()).to.equal(true);
-        expect(testElementViewportCallback).to.have.not.been.called;
-      });
+      describe('viewportCallback', () => {
+        it('Element should allow, but not delegate before build', () => {
+          const element = new ElementClass();
+          element.setAttribute('layout', 'fill');
+          expect(testElementViewportCallback).to.have.not.been.called;
 
-      it('StubElement - should not delegate before build or upgrade', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        expect(testElementViewportCallback).to.have.not.been.called;
+          expect(element.isBuilt()).to.equal(false);
+          element.viewportCallback(true);
+          expect(element.isInViewport()).to.equal(true);
+          expect(testElementViewportCallback).to.have.not.been.called;
+        });
 
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.isBuilt()).to.equal(false);
-        element.viewportCallback(true);
-        expect(element.isInViewport()).to.equal(true);
-        expect(testElementViewportCallback).to.have.not.been.called;
+        it('StubElement - should not delegate before build or upgrade', () => {
+          const element = new StubElementClass();
+          element.setAttribute('layout', 'fill');
+          expect(testElementViewportCallback).to.have.not.been.called;
 
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
-        element.upgrade(TestElement);
+          expect(element.isUpgraded()).to.equal(false);
+          expect(element.isBuilt()).to.equal(false);
+          element.viewportCallback(true);
+          expect(element.isInViewport()).to.equal(true);
+          expect(testElementViewportCallback).to.have.not.been.called;
 
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.isBuilt()).to.equal(false);
-        element.viewportCallback(false);
-        expect(element.isInViewport_).to.equal(false);
-        expect(testElementViewportCallback).to.have.not.been.called;
-      });
+          resourcesMock
+            .expects('upgraded')
+            .withExactArgs(element)
+            .never();
+          element.upgrade(TestElement);
 
-      it('Element - should be called once built', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(element.isBuilt()).to.equal(true);
+          expect(element.isUpgraded()).to.equal(false);
+          expect(element.isBuilt()).to.equal(false);
+          element.viewportCallback(false);
+          expect(element.isInViewport_).to.equal(false);
           expect(testElementViewportCallback).to.have.not.been.called;
-
-          element.viewportCallback(true);
-          expect(element.implementation_.inViewport_).to.equal(true);
-          expect(testElementViewportCallback).to.be.calledOnce;
         });
-      });
-
-      it('StubElement - should be called once upgraded', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        expect(element.isUpgraded()).to.be.false;
-        expect(element.isBuilt()).to.be.false;
 
-        element.viewportCallback(true);
-        expect(element.implementation_.inViewport_).to.be.false;
-        expect(testElementViewportCallback).to.not.have.been.called;
+        it('Element - should be called once built', () => {
+          const element = new ElementClass();
+          element.setAttribute('layout', 'fill');
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            expect(element.isBuilt()).to.equal(true);
+            expect(testElementViewportCallback).to.have.not.been.called;
 
-        element.upgrade(TestElement);
-        expect(element.implementation_.inViewport_).to.be.false;
-        return element.buildingPromise_.then(() => {
-          expect(element.implementation_.inViewport_).to.be.true;
-          expect(testElementViewportCallback).to.be.calledOnce;
+            element.viewportCallback(true);
+            expect(element.implementation_.inViewport_).to.equal(true);
+            expect(testElementViewportCallback).to.be.calledOnce;
+          });
         });
-      });
 
-      it('StubElement - should not upgrade before attach', () => {
-        const element = new StubElementClass();
-        element.setAttribute('layout', 'fill');
-        resourcesMock.expects('upgraded').withExactArgs(element).never();
-        element.upgrade(TestElement);
-        expect(element.isUpgraded()).to.equal(false);
-        expect(element.isBuilt()).to.equal(false);
-        expect(element.implementation_).to.be.instanceOf(TestElement);
-        expect(testElementViewportCallback).to.have.not.been.called;
-      });
+        it('StubElement - should be called once upgraded', () => {
+          const element = new StubElementClass();
+          element.setAttribute('layout', 'fill');
+          container.appendChild(element);
+          expect(element.isUpgraded()).to.be.false;
+          expect(element.isBuilt()).to.be.false;
 
-      it('Element - should be called on built if in viewport', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        element.viewportCallback(true);
-        expect(element.isInViewport_).to.equal(true);
-        expect(testElementViewportCallback).to.have.not.been.called;
+          element.viewportCallback(true);
+          expect(element.implementation_.inViewport_).to.be.false;
+          expect(testElementViewportCallback).to.not.have.been.called;
 
-        container.appendChild(element);
-        return element.buildingPromise_.then(() => {
-          expect(element.isInViewport_).to.equal(true);
-          expect(testElementViewportCallback).to.be.calledOnce;
+          element.upgrade(TestElement);
+          expect(element.implementation_.inViewport_).to.be.false;
+          return element.buildingPromise_.then(() => {
+            expect(element.implementation_.inViewport_).to.be.true;
+            expect(testElementViewportCallback).to.be.calledOnce;
+          });
         });
-      });
 
-      it('Element - should NOT be called in template', () => {
-        const element = new ElementClass();
-        element.setAttribute('layout', 'fill');
-        container.appendChild(element);
-        return element.build().then(() => {
-          expect(element.isBuilt()).to.equal(true);
+        it('StubElement - should not upgrade before attach', () => {
+          const element = new StubElementClass();
+          element.setAttribute('layout', 'fill');
+          resourcesMock
+            .expects('upgraded')
+            .withExactArgs(element)
+            .never();
+          element.upgrade(TestElement);
+          expect(element.isUpgraded()).to.equal(false);
+          expect(element.isBuilt()).to.equal(false);
+          expect(element.implementation_).to.be.instanceOf(TestElement);
           expect(testElementViewportCallback).to.have.not.been.called;
+        });
 
-          element.isInTemplate_ = true;
-          allowConsoleError(() => { expect(() => {
-            element.viewportCallback(true);
-          }).to.throw(/Must never be called in template/); });
+        it('Element - should be called on built if in viewport', () => {
+          const element = new ElementClass();
+          element.setAttribute('layout', 'fill');
+          element.viewportCallback(true);
+          expect(element.isInViewport_).to.equal(true);
+          expect(testElementViewportCallback).to.have.not.been.called;
+
+          container.appendChild(element);
+          return element.buildingPromise_.then(() => {
+            expect(element.isInViewport_).to.equal(true);
+            expect(testElementViewportCallback).to.be.calledOnce;
+          });
+        });
+
+        it('Element - should NOT be called in template', () => {
+          const element = new ElementClass();
+          element.setAttribute('layout', 'fill');
+          container.appendChild(element);
+          return element.build().then(() => {
+            expect(element.isBuilt()).to.equal(true);
+            expect(testElementViewportCallback).to.have.not.been.called;
+
+            element.isInTemplate_ = true;
+            allowConsoleError(() => {
+              expect(() => {
+                element.viewportCallback(true);
+              }).to.throw(/Must never be called in template/);
+            });
+          });
         });
       });
     });
-  });
 });
 
 describes.realWin('CustomElement Service Elements', {amp: true}, env => {
@@ -1499,8 +1633,11 @@ describes.realWin('CustomElement Service Elements', {amp: true}, env => {
   beforeEach(() => {
     win = env.win;
     doc = win.document;
-    StubElementClass = createAmpElementForTesting(win, 'amp-stub2',
-        ElementStub);
+    StubElementClass = createAmpElementForTesting(
+      win,
+      'amp-stub2',
+      ElementStub
+    );
     win.customElements.define('amp-stub2', StubElementClass);
     env.ampdoc.declareExtension('amp-stub2');
     element = new StubElementClass();
@@ -1573,7 +1710,9 @@ describes.realWin('CustomElement Service Elements', {amp: true}, env => {
 
   it('toggleFallback should toggle unsupported class', () => {
     element.resource = {
-      getState: () => {return ResourceState.LAYOUT_COMPLETE;},
+      getState: () => {
+        return ResourceState.LAYOUT_COMPLETE;
+      },
     };
     element.resources_ = {
       scheduleLayout(el, fb) {
@@ -1598,7 +1737,9 @@ describes.realWin('CustomElement Service Elements', {amp: true}, env => {
   it('toggleFallback should not display fallback before element layout', () => {
     let resourceState = ResourceState.NOT_LAID_OUT;
     element.resource = {
-      getState: () => {return resourceState;},
+      getState: () => {
+        return resourceState;
+      },
     };
     element.resources_ = {
       scheduleLayout: () => {},
@@ -1619,345 +1760,369 @@ describes.realWin('CustomElement Service Elements', {amp: true}, env => {
 
   it('togglePlaceholder should NOT call in template', () => {
     element.isInTemplate_ = true;
-    allowConsoleError(() => { expect(() => {
-      element.togglePlaceholder(false);
-    }).to.throw(/Must never be called in template/); });
+    allowConsoleError(() => {
+      expect(() => {
+        element.togglePlaceholder(false);
+      }).to.throw(/Must never be called in template/);
+    });
   });
 });
 
-
 describes.realWin('CustomElement', {amp: true}, env => {
   // TODO(dvoytenko, #11827): Make this test work on Safari.
-  describe.configure().skipSafari().run('Loading Indicator', () => {
-    let win, doc;
-    let ElementClass;
-    let clock;
-    let resources;
-    let element;
-    let vsync;
-    let resourcesMock;
-    let container;
-
-    class TestElement extends BaseElement {
-      isLayoutSupported(unusedLayout) {
-        return true;
+  describe
+    .configure()
+    .skipSafari()
+    .run('Loading Indicator', () => {
+      let win, doc;
+      let ElementClass;
+      let clock;
+      let resources;
+      let element;
+      let vsync;
+      let resourcesMock;
+      let container;
+
+      class TestElement extends BaseElement {
+        isLayoutSupported(unusedLayout) {
+          return true;
+        }
       }
-    }
 
-    function stubInA4A(isInA4A) {
-      sandbox.stub(element, 'isInA4A_').callsFake(() => isInA4A);
-    }
+      function stubInA4A(isInA4A) {
+        sandbox.stub(element, 'isInA4A_').callsFake(() => isInA4A);
+      }
 
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      clock = lolex.install({target: win});
-      ElementClass = createAmpElementForTesting(win, 'amp-test-loader',
-          TestElement);
-      win.customElements.define('amp-test-loader', ElementClass);
-      win.ampExtendedElements['amp-test-loader'] = TestElement;
-      LOADING_ELEMENTS_['amp-test-loader'.toUpperCase()] = true;
-      resources = Services.resourcesForDoc(doc);
-      resources.isBuildOn_ = true;
-      resourcesMock = sandbox.mock(resources);
-      element = new ElementClass();
-      element.layoutWidth_ = 300;
-      element.layout_ = Layout.FIXED;
-      element.setAttribute('layout', 'fixed');
-      element.resources_ = resources;
-      vsync = Services.vsyncFor(win);
-      sandbox.stub(vsync, 'run').callsFake(task => {
-        if (task.measure) {
-          task.measure();
-        }
-        if (task.mutate) {
-          task.mutate();
-        }
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        clock = lolex.install({target: win});
+        ElementClass = createAmpElementForTesting(
+          win,
+          'amp-test-loader',
+          TestElement
+        );
+        win.customElements.define('amp-test-loader', ElementClass);
+        win.ampExtendedElements['amp-test-loader'] = TestElement;
+        LOADING_ELEMENTS_['amp-test-loader'.toUpperCase()] = true;
+        resources = Services.resourcesForDoc(doc);
+        resources.isBuildOn_ = true;
+        resourcesMock = sandbox.mock(resources);
+        element = new ElementClass();
+        element.layoutWidth_ = 300;
+        element.layout_ = Layout.FIXED;
+        element.setAttribute('layout', 'fixed');
+        element.resources_ = resources;
+        vsync = Services.vsyncFor(win);
+        sandbox.stub(vsync, 'run').callsFake(task => {
+          if (task.measure) {
+            task.measure();
+          }
+          if (task.mutate) {
+            task.mutate();
+          }
+        });
+        container = doc.createElement('div');
+        doc.body.appendChild(container);
       });
-      container = doc.createElement('div');
-      doc.body.appendChild(container);
-    });
-
-    afterEach(() => {
-      clock.uninstall();
-      resourcesMock.verify();
-    });
 
+      afterEach(() => {
+        clock.uninstall();
+        resourcesMock.verify();
+      });
 
-    it('should be enabled by default', () => {
-      stubInA4A(false);
-      expect(element.isLoadingEnabled_()).to.be.true;
-    });
+      it('should be enabled by default', () => {
+        stubInA4A(false);
+        expect(element.isLoadingEnabled_()).to.be.true;
+      });
 
-    it('should be disabled in A4A', () => {
-      stubInA4A(true);
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+      it('should be disabled in A4A', () => {
+        stubInA4A(true);
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when explicitly disabled by the attribute', () => {
-      stubInA4A(false);
-      element.setAttribute('noloading', '');
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+      it('should disable when explicitly disabled by the attribute', () => {
+        stubInA4A(false);
+        element.setAttribute('noloading', '');
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when element is not whitelisted', () => {
-      stubInA4A(false);
-      LOADING_ELEMENTS_['amp-test-loader'.toUpperCase()] = false;
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+      it('should disable when element is not whitelisted', () => {
+        stubInA4A(false);
+        LOADING_ELEMENTS_['amp-test-loader'.toUpperCase()] = false;
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when not measured or too small', () => {
-      stubInA4A(false);
-      element.layoutWidth_ = 0;
-      expect(element.isLoadingEnabled_()).to.be.false;
+      it('should disable when not measured or too small', () => {
+        stubInA4A(false);
+        element.layoutWidth_ = 0;
+        expect(element.isLoadingEnabled_()).to.be.false;
 
-      element.layoutWidth_ = 10;
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+        element.layoutWidth_ = 10;
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when element has already been laid out', () => {
-      stubInA4A(false);
-      element.layoutCount_ = 1;
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+      it('should disable when element has already been laid out', () => {
+        stubInA4A(false);
+        element.layoutCount_ = 1;
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when element is a placeholder itself', () => {
-      stubInA4A(false);
-      element.setAttribute('placeholder', '');
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+      it('should disable when element is a placeholder itself', () => {
+        stubInA4A(false);
+        element.setAttribute('placeholder', '');
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
-    it('should disable when element is not sized', () => {
-      stubInA4A(false);
-      element.layout_ = Layout.CONTAINER;
-      expect(element.isLoadingEnabled_()).to.be.false;
+      it('should disable when element is not sized', () => {
+        stubInA4A(false);
+        element.layout_ = Layout.CONTAINER;
+        expect(element.isLoadingEnabled_()).to.be.false;
 
-      element.layout_ = Layout.NODISPLAY;
-      expect(element.isLoadingEnabled_()).to.be.false;
-    });
+        element.layout_ = Layout.NODISPLAY;
+        expect(element.isLoadingEnabled_()).to.be.false;
+      });
 
+      it('should ignore loading-off if never created', () => {
+        stubInA4A(false);
+        element.toggleLoading(false);
+        expect(element.loadingElement_).to.be.null;
+      });
 
-    it('should ignore loading-off if never created', () => {
-      stubInA4A(false);
-      element.toggleLoading(false);
-      expect(element.loadingElement_).to.be.null;
-    });
+      it('should ignore loading-on if not allowed', () => {
+        stubInA4A(false);
+        element.setAttribute('noloading', '');
+        element.toggleLoading(true);
+        expect(element.loadingElement_).to.be.null;
+      });
 
-    it('should ignore loading-on if not allowed', () => {
-      stubInA4A(false);
-      element.setAttribute('noloading', '');
-      element.toggleLoading(true);
-      expect(element.loadingElement_).to.be.null;
-    });
+      it('should ignore loading-on if already rendered', () => {
+        stubInA4A(false);
+        clock.tick(1);
+        element.signals().signal(CommonSignals.RENDER_START);
+        element.toggleLoading(true);
+        expect(element.loadingElement_).to.be.null;
+      });
 
-    it('should ignore loading-on if already rendered', () => {
-      stubInA4A(false);
-      clock.tick(1);
-      element.signals().signal(CommonSignals.RENDER_START);
-      element.toggleLoading(true);
-      expect(element.loadingElement_).to.be.null;
-    });
+      it('should ignore loading-on if already loaded', () => {
+        stubInA4A(false);
+        element.layoutCount_ = 1;
+        element.toggleLoading(true);
+        expect(element.loadingElement_).to.be.null;
+      });
 
-    it('should ignore loading-on if already loaded', () => {
-      stubInA4A(false);
-      element.layoutCount_ = 1;
-      element.toggleLoading(true);
-      expect(element.loadingElement_).to.be.null;
-    });
+      it('should cancel loading on render-start', () => {
+        stubInA4A(false);
+        clock.tick(1);
+        const stub = sandbox.stub(element, 'toggleLoading');
+        element.renderStarted();
+        expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
+        expect(stub).to.be.calledOnce;
+        expect(stub.args[0][0]).to.be.false;
+      });
 
-    it('should cancel loading on render-start', () => {
-      stubInA4A(false);
-      clock.tick(1);
-      const stub = sandbox.stub(element, 'toggleLoading');
-      element.renderStarted();
-      expect(element.signals().get(CommonSignals.RENDER_START)).to.be.ok;
-      expect(stub).to.be.calledOnce;
-      expect(stub.args[0][0]).to.be.false;
-    });
+      it('should create and turn on', () => {
+        stubInA4A(false);
+        element.toggleLoading(true);
 
-    it('should create and turn on', () => {
-      stubInA4A(false);
-      element.toggleLoading(true);
+        expect(element.loadingContainer_).to.not.be.null;
+        expect(element.loadingContainer_).to.not.have.class('amp-hidden');
+        expect(element.loadingElement_).to.not.be.null;
+        expect(element.loadingElement_).to.have.class('amp-active');
+      });
 
-      expect(element.loadingContainer_).to.not.be.null;
-      expect(element.loadingContainer_).to.not.have.class('amp-hidden');
-      expect(element.loadingElement_).to.not.be.null;
-      expect(element.loadingElement_).to.have.class('amp-active');
-    });
+      it('should turn on already created', () => {
+        stubInA4A(false);
+        element.prepareLoading_();
+        const {
+          loadingContainer_: container,
+          loadingElement_: indicator,
+        } = element;
+        element.toggleLoading(true);
 
-    it('should turn on already created', () => {
-      stubInA4A(false);
-      element.prepareLoading_();
-      const {
-        loadingContainer_: container,
-        loadingElement_: indicator,
-      } = element;
-      element.toggleLoading(true);
-
-      expect(element.loadingContainer_).to.equal(container);
-      expect(element.loadingContainer_).to.not.have.class('amp-hidden');
-      expect(element.loadingElement_).to.equal(indicator);
-      expect(element.loadingElement_).to.have.class('amp-active');
-    });
+        expect(element.loadingContainer_).to.equal(container);
+        expect(element.loadingContainer_).to.not.have.class('amp-hidden');
+        expect(element.loadingElement_).to.equal(indicator);
+        expect(element.loadingElement_).to.have.class('amp-active');
+      });
 
-    it('should turn off', () => {
-      stubInA4A(false);
-      element.prepareLoading_();
-      element.toggleLoading(false);
+      it('should turn off', () => {
+        stubInA4A(false);
+        element.prepareLoading_();
+        element.toggleLoading(false);
 
-      expect(element.loadingContainer_).to.not.be.null;
-      expect(element.loadingContainer_).to.have.class('amp-hidden');
-      expect(element.loadingElement_).to.not.be.null;
-      expect(element.loadingElement_).to.not.have.class('amp-active');
-    });
+        expect(element.loadingContainer_).to.not.be.null;
+        expect(element.loadingContainer_).to.have.class('amp-hidden');
+        expect(element.loadingElement_).to.not.be.null;
+        expect(element.loadingElement_).to.not.have.class('amp-active');
+      });
 
-    it('should turn off and cleanup', () => {
-      stubInA4A(false);
-      element.prepareLoading_();
-      element.toggleLoading(false, {cleanup: true});
+      it('should turn off and cleanup', () => {
+        stubInA4A(false);
+        element.prepareLoading_();
+        element.toggleLoading(false, {cleanup: true});
 
-      expect(element.loadingContainer_).to.be.null;
-      expect(element.loadingElement_).to.be.null;
-    });
+        expect(element.loadingContainer_).to.be.null;
+        expect(element.loadingElement_).to.be.null;
+      });
 
-    it('should NOT cleanup if re-used', () => {
-      stubInA4A(false);
-      element.prepareLoading_();
-      sandbox.stub(element.implementation_, 'isLoadingReused')
+      it('should NOT cleanup if re-used', () => {
+        stubInA4A(false);
+        element.prepareLoading_();
+        sandbox
+          .stub(element.implementation_, 'isLoadingReused')
           .callsFake(() => true);
-      element.toggleLoading(false, {cleanup: true});
-
-      expect(element.loadingContainer_).to.not.be.null;
-      expect(element.loadingElement_).to.not.be.null;
-    });
+        element.toggleLoading(false, {cleanup: true});
 
-    it('should ignore loading-off if never created', () => {
-      stubInA4A(false);
-      element.isInTemplate_ = true;
-      allowConsoleError(() => { expect(() => {
-        element.toggleLoading(false);
-      }).to.throw(/Must never be called in template/); });
-    });
-
-    it('should turn off when exits viewport', () => {
-      stubInA4A(false);
-      element.isInViewport_ = true;
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.viewportCallback(false);
-      expect(toggle).to.be.calledOnce;
-      expect(toggle.firstCall.args[0]).to.equal(false);
-      expect(toggle.firstCall.args[1]).to.be.undefined;
-    });
+        expect(element.loadingContainer_).to.not.be.null;
+        expect(element.loadingElement_).to.not.be.null;
+      });
 
-    it('should NOT turn off when exits viewport but already laid out', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.layoutCount_ = 1;
-      element.viewportCallback(false);
-      expect(toggle).to.have.not.been.called;
-    });
+      it('should ignore loading-off if never created', () => {
+        stubInA4A(false);
+        element.isInTemplate_ = true;
+        allowConsoleError(() => {
+          expect(() => {
+            element.toggleLoading(false);
+          }).to.throw(/Must never be called in template/);
+        });
+      });
 
-    it('should turn on when enters viewport', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.viewportCallback(true);
-      clock.tick(1000);
-      expect(toggle).to.be.calledOnce;
-      expect(toggle.firstCall.args[0]).to.equal(true);
-    });
+      it('should turn off when exits viewport', () => {
+        stubInA4A(false);
+        element.isInViewport_ = true;
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.viewportCallback(false);
+        expect(toggle).to.be.calledOnce;
+        expect(toggle.firstCall.args[0]).to.equal(false);
+        expect(toggle.firstCall.args[1]).to.be.undefined;
+      });
 
-    it('should NOT turn on when enters viewport but already laid out', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.layoutCount_ = 1;
-      element.viewportCallback(true);
-      clock.tick(1000);
-      expect(toggle).to.have.not.been.called;
-    });
+      it('should NOT turn off when exits viewport but already laid out', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.layoutCount_ = 1;
+        element.viewportCallback(false);
+        expect(toggle).to.have.not.been.called;
+      });
 
+      it('should turn on when enters viewport', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.viewportCallback(true);
+        clock.tick(1000);
+        expect(toggle).to.be.calledOnce;
+        expect(toggle.firstCall.args[0]).to.equal(true);
+      });
 
-    it('should start loading when measured if already in viewport', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.isInViewport_ = true;
-      element.updateLayoutBox({top: 0, width: 300});
-      expect(toggle).to.be.calledOnce;
-      expect(toggle.firstCall.args[0]).to.equal(true);
-    });
+      it('should NOT turn on when enters viewport but already laid out', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.layoutCount_ = 1;
+        element.viewportCallback(true);
+        clock.tick(1000);
+        expect(toggle).to.have.not.been.called;
+      });
 
-    it('should create loading when measured if in the top window', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      element.updateLayoutBox({top: 0, width: 300});
-      expect(toggle).to.have.not.been.called;
-      expect(element.loadingContainer_).to.not.be.null;
-      expect(element.loadingContainer_).to.have.class('amp-hidden');
-    });
+      it('should start loading when measured if already in viewport', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.isInViewport_ = true;
+        element.updateLayoutBox({top: 0, width: 300});
+        expect(toggle).to.be.calledOnce;
+        expect(toggle.firstCall.args[0]).to.equal(true);
+      });
 
+      it('should create loading when measured if in the top window', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        element.updateLayoutBox({top: 0, width: 300});
+        expect(toggle).to.have.not.been.called;
+        expect(element.loadingContainer_).to.not.be.null;
+        expect(element.loadingContainer_).to.have.class('amp-hidden');
+      });
 
-    it('should toggle loading off after layout complete', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        return element.layoutCallback();
-      }).then(() => {
-        expect(toggle).to.be.calledOnce;
-        expect(toggle.firstCall.args[0]).to.equal(false);
-        expect(toggle.firstCall.args[1].cleanup).to.equal(true);
+      it('should toggle loading off after layout complete', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            return element.layoutCallback();
+          })
+          .then(() => {
+            expect(toggle).to.be.calledOnce;
+            expect(toggle.firstCall.args[0]).to.equal(false);
+            expect(toggle.firstCall.args[1].cleanup).to.equal(true);
+          });
       });
-    });
 
-    it('should toggle loading off after layout failed', () => {
-      stubInA4A(false);
-      const toggle = sandbox.spy(element, 'toggleLoading');
-      sandbox.stub(element.implementation_, 'layoutCallback').callsFake(() => {
-        return Promise.reject();
-      });
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        return element.layoutCallback();
-      }).then(() => {
-        throw new Error('Must have failed.');
-      }, () => {
-        expect(toggle).to.be.calledOnce;
-        expect(toggle.firstCall.args[0]).to.equal(false);
-        expect(toggle.firstCall.args[1].cleanup).to.equal(true);
+      it('should toggle loading off after layout failed', () => {
+        stubInA4A(false);
+        const toggle = sandbox.spy(element, 'toggleLoading');
+        sandbox
+          .stub(element.implementation_, 'layoutCallback')
+          .callsFake(() => {
+            return Promise.reject();
+          });
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            return element.layoutCallback();
+          })
+          .then(
+            () => {
+              throw new Error('Must have failed.');
+            },
+            () => {
+              expect(toggle).to.be.calledOnce;
+              expect(toggle.firstCall.args[0]).to.equal(false);
+              expect(toggle.firstCall.args[1].cleanup).to.equal(true);
+            }
+          );
       });
-    });
 
-    it('should disable toggle loading on after layout failed', () => {
-      stubInA4A(false);
-      const prepareLoading = sandbox.spy(element, 'prepareLoading_');
-      sandbox.stub(element.implementation_, 'layoutCallback').callsFake(() => {
-        return Promise.reject();
-      });
-      container.appendChild(element);
-      return element.buildingPromise_.then(() => {
-        expect(element.layoutCount_).to.equal(0);
-        expect(element.isLoadingEnabled_()).to.equal(true);
-        return element.layoutCallback();
-      }).then(() => {
-        throw new Error('Must have failed.');
-      }, () => {
-        expect(element.layoutCount_).to.equal(1);
-        expect(element.isLoadingEnabled_()).to.equal(false);
-        element.toggleLoading(true);
-        expect(prepareLoading).to.not.have.been.called;
+      it('should disable toggle loading on after layout failed', () => {
+        stubInA4A(false);
+        const prepareLoading = sandbox.spy(element, 'prepareLoading_');
+        sandbox
+          .stub(element.implementation_, 'layoutCallback')
+          .callsFake(() => {
+            return Promise.reject();
+          });
+        container.appendChild(element);
+        return element.buildingPromise_
+          .then(() => {
+            expect(element.layoutCount_).to.equal(0);
+            expect(element.isLoadingEnabled_()).to.equal(true);
+            return element.layoutCallback();
+          })
+          .then(
+            () => {
+              throw new Error('Must have failed.');
+            },
+            () => {
+              expect(element.layoutCount_).to.equal(1);
+              expect(element.isLoadingEnabled_()).to.equal(false);
+              element.toggleLoading(true);
+              expect(prepareLoading).to.not.have.been.called;
+            }
+          );
       });
-    });
 
-    // TODO(jridgewell): fix this test
-    it.skip('should ignore loading "on" if layout completed before vsync',
-        () => {
-          stubInA4A(false);
-          resourcesMock.expects('mutateElement').once();
-          container.appendChild(element);
-          element.prepareLoading_();
-          element.toggleLoading(true);
-          return element.build().then(() => {
+      // TODO(jridgewell): fix this test
+      it.skip('should ignore loading "on" if layout completed before vsync', () => {
+        stubInA4A(false);
+        resourcesMock.expects('mutateElement').once();
+        container.appendChild(element);
+        element.prepareLoading_();
+        element.toggleLoading(true);
+        return element
+          .build()
+          .then(() => {
             return element.layoutCallback();
-          }).then(() => {
+          })
+          .then(() => {
             // The first mutate started by toggleLoading(true), but it must
             // immediately proceed to switch it to off.
             // vsyncTasks.shift()();
@@ -1968,8 +2133,8 @@ describes.realWin('CustomElement', {amp: true}, env => {
             // vsyncTasks.shift()();
             expect(element.loadingContainer_).to.be.null;
           });
-        });
-  });
+      });
+    });
 });
 
 describes.realWin('CustomElement Overflow Element', {amp: true}, env => {
@@ -1990,8 +2155,11 @@ describes.realWin('CustomElement Overflow Element', {amp: true}, env => {
   beforeEach(() => {
     win = env.win;
     doc = win.document;
-    ElementClass = createAmpElementForTesting(win, 'amp-test-overflow',
-        TestElement);
+    ElementClass = createAmpElementForTesting(
+      win,
+      'amp-test-overflow',
+      TestElement
+    );
     win.customElements.define('amp-test-overflow', ElementClass);
     resources = Services.resourcesForDoc(doc);
     resourcesMock = sandbox.mock(resources);
@@ -2070,7 +2238,10 @@ describes.realWin('CustomElement Overflow Element', {amp: true}, env => {
   it('should force change size when clicked', () => {
     element.overflowCallback(true, 117, 113);
     expect(overflowElement).to.have.class('amp-visible');
-    resourcesMock.expects('changeSize').withExactArgs(element, 117, 113).once();
+    resourcesMock
+      .expects('changeSize')
+      .withExactArgs(element, 117, 113)
+      .once();
 
     expect(overflowElement.onclick).to.exist;
     expect(overflowElement).to.have.class('amp-visible');
diff --git a/test/unit/test-describes.js b/test/unit/test-describes.js
index eab56e9b9f16..ce0c29423e88 100644
--- a/test/unit/test-describes.js
+++ b/test/unit/test-describes.js
@@ -21,24 +21,35 @@ describe('fetch-mock', () => {
     it('should mock fetches', () => {
       const mock = env.expectFetch('fake.com', {payload: 'foo'});
 
-      return env.win.fetch('fake.com').then(response => {
-        return response.json();
-      }).then(data => {
-        expect(data.payload).to.equal('foo');
-        expect(mock.called('fake.com')).to.be.true;
-      });
+      return env.win
+        .fetch('fake.com')
+        .then(response => {
+          return response.json();
+        })
+        .then(data => {
+          expect(data.payload).to.equal('foo');
+          expect(mock.called('fake.com')).to.be.true;
+        });
     });
   }
 
-  describes.realWin('on realWin', {
-    mockFetch: true,
-  }, env => {
-    runTests(env);
-  });
+  describes.realWin(
+    'on realWin',
+    {
+      mockFetch: true,
+    },
+    env => {
+      runTests(env);
+    }
+  );
 
-  describes.fakeWin('on fakeWin', {
-    mockFetch: true,
-  }, env => {
-    runTests(env);
-  });
+  describes.fakeWin(
+    'on fakeWin',
+    {
+      mockFetch: true,
+    },
+    env => {
+      runTests(env);
+    }
+  );
 });
diff --git a/test/unit/test-document-info.js b/test/unit/test-document-info.js
index 548fe0f57ed6..df86a18524e1 100644
--- a/test/unit/test-document-info.js
+++ b/test/unit/test-document-info.js
@@ -17,8 +17,7 @@
 import {Services} from '../../src/services';
 import {createIframePromise} from '../../testing/iframe';
 import {installDocService} from '../../src/service/ampdoc-impl';
-import {installDocumentInfoServiceForDoc} from
-  '../../src/service/document-info-impl';
+import {installDocumentInfoServiceForDoc} from '../../src/service/document-info-impl';
 
 describe('document-info', () => {
   let sandbox;
@@ -66,7 +65,8 @@ describe('document-info', () => {
   it('should provide the canonicalUrl', () => {
     return getWin({'canonical': ['https://twitter.com/']}).then(win => {
       expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
-          'https://twitter.com/');
+        'https://twitter.com/'
+      );
     });
   });
 
@@ -74,9 +74,15 @@ describe('document-info', () => {
     const win = {
       document: {
         nodeType: /* document */ 9,
-        querySelector() { return 'http://www.origin.com/foo/?f=0'; },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
+        },
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
       },
-      Math: {random() { return 0.123456789; }},
       location: {
         href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
       },
@@ -85,16 +91,23 @@ describe('document-info', () => {
     installDocService(win, /* isSingleDoc */ true);
     installDocumentInfoServiceForDoc(win.document);
     expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=0');
+      'http://www.origin.com/foo/?f=0'
+    );
   });
 
   it('should provide the updated sourceUrl', () => {
     const win = {
       document: {
         nodeType: /* document */ 9,
-        querySelector() { return 'http://www.origin.com/foo/?f=0'; },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
+        },
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
       },
-      Math: {random() { return 0.123456789; }},
       location: {
         href: 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0',
       },
@@ -103,25 +116,30 @@ describe('document-info', () => {
     installDocService(win, /* isSingleDoc */ true);
     installDocumentInfoServiceForDoc(win.document);
     expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=0');
+      'http://www.origin.com/foo/?f=0'
+    );
     win.location.href = 'https://cdn.ampproject.org/v/www.origin.com/foo/?f=1';
     expect(Services.documentInfoForDoc(win.document).sourceUrl).to.equal(
-        'http://www.origin.com/foo/?f=1');
+      'http://www.origin.com/foo/?f=1'
+    );
   });
 
   it('should provide the pageViewId', () => {
     return getWin({'canonical': ['https://twitter.com/']}).then(win => {
-      expect(Services.documentInfoForDoc(win.document).pageViewId)
-          .to.equal('1234');
-      expect(Services.documentInfoForDoc(win.document).pageViewId)
-          .to.equal('1234');
+      expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
+        '1234'
+      );
+      expect(Services.documentInfoForDoc(win.document).pageViewId).to.equal(
+        '1234'
+      );
     });
   });
 
   it('should provide the relative canonicalUrl as absolute', () => {
     return getWin({'canonical': ['./foo.html']}).then(win => {
       expect(Services.documentInfoForDoc(win.document).canonicalUrl).to.equal(
-          'http://localhost:' + location.port + '/foo.html');
+        'http://localhost:' + location.port + '/foo.html'
+      );
     });
   });
 
@@ -130,10 +148,12 @@ describe('document-info', () => {
       'canonical': ['https://twitter.com/'],
       'icon': ['https://foo.html/bar.gif'],
     }).then(win => {
-      expect(Services.documentInfoForDoc(win.document).linkRels['canonical'])
-          .to.equal('https://twitter.com/');
-      expect(Services.documentInfoForDoc(win.document).linkRels['icon'])
-          .to.equal('https://foo.html/bar.gif');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['canonical']
+      ).to.equal('https://twitter.com/');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['icon']
+      ).to.equal('https://foo.html/bar.gif');
     });
   });
 
@@ -148,80 +168,103 @@ describe('document-info', () => {
       'canonical': ['./foo.html'],
       'icon': ['./bar.gif'],
     }).then(win => {
-      expect(Services.documentInfoForDoc(win.document).linkRels['canonical'])
-          .to.equal('http://localhost:' + location.port + '/foo.html');
-      expect(Services.documentInfoForDoc(win.document).linkRels['icon'])
-          .to.equal('http://localhost:' + location.port + '/bar.gif');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['canonical']
+      ).to.equal('http://localhost:' + location.port + '/foo.html');
+      expect(
+        Services.documentInfoForDoc(win.document).linkRels['icon']
+      ).to.equal('http://localhost:' + location.port + '/bar.gif');
     });
   });
 
-  it('should provide the linkRels containing link tag rels with ' +
-      'space in rel', () => {
-    return getWin({
-      'sharelink canonical': ['https://twitter.com/'],
-      'icon': ['https://foo.html/bar.gif'],
-    }).then(win => {
-      expect(Services.documentInfoForDoc(win.document).linkRels['sharelink'])
-          .to.equal('https://twitter.com/');
-      expect(Services.documentInfoForDoc(win.document).linkRels['canonical'])
-          .to.equal('https://twitter.com/');
-      expect(Services.documentInfoForDoc(win.document).linkRels['icon'])
-          .to.equal('https://foo.html/bar.gif');
-    });
-  });
+  it(
+    'should provide the linkRels containing link tag rels with ' +
+      'space in rel',
+    () => {
+      return getWin({
+        'sharelink canonical': ['https://twitter.com/'],
+        'icon': ['https://foo.html/bar.gif'],
+      }).then(win => {
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['sharelink']
+        ).to.equal('https://twitter.com/');
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['canonical']
+        ).to.equal('https://twitter.com/');
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['icon']
+        ).to.equal('https://foo.html/bar.gif');
+      });
+    }
+  );
 
-  it('should provide the linkRels containing link tag rels with multiple ' +
-      'hrefs', () => {
-    return getWin({
-      'canonical': ['https://twitter.com/'],
-      'icon': ['https://foo.html/bar.gif'],
-      'stylesheet': [
-        'https://foo.html/style1.css',
-        'https://foo.html/style2.css',
-      ],
-    }).then(win => {
-      const documentInfo = Services.documentInfoForDoc(win.document);
-      expect(documentInfo.linkRels['canonical'])
-          .to.equal('https://twitter.com/');
-      expect(documentInfo.linkRels['icon'])
-          .to.equal('https://foo.html/bar.gif');
-      expect(documentInfo.linkRels['stylesheet'].length)
-          .to.equal(2);
-      expect(documentInfo.linkRels['stylesheet'][0])
-          .to.equal('https://foo.html/style1.css');
-      expect(documentInfo.linkRels['stylesheet'][1])
-          .to.equal('https://foo.html/style2.css');
-    });
-  });
+  it(
+    'should provide the linkRels containing link tag rels with multiple ' +
+      'hrefs',
+    () => {
+      return getWin({
+        'canonical': ['https://twitter.com/'],
+        'icon': ['https://foo.html/bar.gif'],
+        'stylesheet': [
+          'https://foo.html/style1.css',
+          'https://foo.html/style2.css',
+        ],
+      }).then(win => {
+        const documentInfo = Services.documentInfoForDoc(win.document);
+        expect(documentInfo.linkRels['canonical']).to.equal(
+          'https://twitter.com/'
+        );
+        expect(documentInfo.linkRels['icon']).to.equal(
+          'https://foo.html/bar.gif'
+        );
+        expect(documentInfo.linkRels['stylesheet'].length).to.equal(2);
+        expect(documentInfo.linkRels['stylesheet'][0]).to.equal(
+          'https://foo.html/style1.css'
+        );
+        expect(documentInfo.linkRels['stylesheet'][1]).to.equal(
+          'https://foo.html/style2.css'
+        );
+      });
+    }
+  );
 
-  it('should provide the linkRels containing link tag rels but drop ' +
-      'prefetch/preload/preconnect rels', () => {
-    return getWin({
-      'canonical': ['https://twitter.com/'],
-      'icon': ['https://foo.html/bar.gif'],
-      'prefetch': ['https://foo1.com'],
-      'preload': ['https://foo2.com'],
-      'preconnect': ['https://foo3.com'],
-    }).then(win => {
-      expect(Services.documentInfoForDoc(win.document).linkRels['canonical'])
-          .to.equal('https://twitter.com/');
-      expect(Services.documentInfoForDoc(win.document).linkRels['icon'])
-          .to.equal('https://foo.html/bar.gif');
-      expect(Services.documentInfoForDoc(win.document).linkRels['prefetch'])
-          .to.be.undefined;
-      expect(Services.documentInfoForDoc(win.document).linkRels['preload'])
+  it(
+    'should provide the linkRels containing link tag rels but drop ' +
+      'prefetch/preload/preconnect rels',
+    () => {
+      return getWin({
+        'canonical': ['https://twitter.com/'],
+        'icon': ['https://foo.html/bar.gif'],
+        'prefetch': ['https://foo1.com'],
+        'preload': ['https://foo2.com'],
+        'preconnect': ['https://foo3.com'],
+      }).then(win => {
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['canonical']
+        ).to.equal('https://twitter.com/');
+        expect(
+          Services.documentInfoForDoc(win.document).linkRels['icon']
+        ).to.equal('https://foo.html/bar.gif');
+        expect(Services.documentInfoForDoc(win.document).linkRels['prefetch'])
           .to.be.undefined;
-      expect(Services.documentInfoForDoc(win.document).linkRels['preconnect'])
+        expect(Services.documentInfoForDoc(win.document).linkRels['preload']).to
+          .be.undefined;
+        expect(Services.documentInfoForDoc(win.document).linkRels['preconnect'])
           .to.be.undefined;
-    });
-  });
+      });
+    }
+  );
 
   it('should provide the metaTags', () => {
-    return getWin({}, {
-      'theme-color': ['#123456'],
-    }).then(win => {
-      expect(Services.documentInfoForDoc(win.document).metaTags['theme-color'])
-          .to.equal('#123456');
+    return getWin(
+      {},
+      {
+        'theme-color': ['#123456'],
+      }
+    ).then(win => {
+      expect(
+        Services.documentInfoForDoc(win.document).metaTags['theme-color']
+      ).to.equal('#123456');
     });
   });
 
@@ -236,9 +279,15 @@ describe('document-info', () => {
     const win = {
       document: {
         nodeType: /* document */ 9,
-        querySelector() { return 'http://www.origin.com/foo/?f=0'; },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
+        },
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
       },
-      Math: {random() { return 0.123456789; }},
       location: {
         href: base + '?f=0&amp_r=test%3Dhello%20world',
       },
@@ -246,8 +295,9 @@ describe('document-info', () => {
     win.document.defaultView = win;
     installDocService(win, /* isSingleDoc */ true);
     installDocumentInfoServiceForDoc(win.document);
-    expect(Services.documentInfoForDoc(win.document).replaceParams)
-        .to.deep.equal({'test': 'hello world'});
+    expect(
+      Services.documentInfoForDoc(win.document).replaceParams
+    ).to.deep.equal({'test': 'hello world'});
   });
 
   it('should not have replaceParams for non-AMP landing page', () => {
@@ -255,9 +305,15 @@ describe('document-info', () => {
     const win = {
       document: {
         nodeType: /* document */ 9,
-        querySelector() { return 'http://www.origin.com/foo/?f=0'; },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
+        },
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
       },
-      Math: {random() { return 0.123456789; }},
       location: {
         href: base + '?f=0&amp_r=test%3Dhello%20world',
       },
@@ -265,8 +321,7 @@ describe('document-info', () => {
     win.document.defaultView = win;
     installDocService(win, /* isSingleDoc */ true);
     installDocumentInfoServiceForDoc(win.document);
-    expect(Services.documentInfoForDoc(win.document).replaceParams)
-        .to.be.null;
+    expect(Services.documentInfoForDoc(win.document).replaceParams).to.be.null;
   });
 
   it('should not provide the replaceParams if invalid', () => {
@@ -274,9 +329,15 @@ describe('document-info', () => {
     const win = {
       document: {
         nodeType: /* document */ 9,
-        querySelector() { return 'http://www.origin.com/foo/?f=0'; },
+        querySelector() {
+          return 'http://www.origin.com/foo/?f=0';
+        },
+      },
+      Math: {
+        random() {
+          return 0.123456789;
+        },
       },
-      Math: {random() { return 0.123456789; }},
       location: {
         href: base + '?f=0&amp_r=%3Dinvalid',
       },
@@ -284,7 +345,8 @@ describe('document-info', () => {
     win.document.defaultView = win;
     installDocService(win, /* isSingleDoc */ true);
     installDocumentInfoServiceForDoc(win.document);
-    expect(Services.documentInfoForDoc(win.document).replaceParams)
-        .to.deep.equal({});
+    expect(
+      Services.documentInfoForDoc(win.document).replaceParams
+    ).to.deep.equal({});
   });
 });
diff --git a/test/unit/test-document-ready.js b/test/unit/test-document-ready.js
index 59e4cea4573c..d1e93ad2cb03 100644
--- a/test/unit/test-document-ready.js
+++ b/test/unit/test-document-ready.js
@@ -15,15 +15,14 @@
  */
 
 import {Services} from '../../src/services';
-import {isDocumentReady,
+import {
+  isDocumentReady,
   onDocumentReady,
   whenDocumentComplete,
   whenDocumentReady,
 } from '../../src/document-ready';
 
-
 describe('documentReady', () => {
-
   let sandbox;
   let testDoc;
   let eventListeners;
@@ -106,14 +105,15 @@ describe('documentReady', () => {
   });
 
   describe('whenDocumentReady', () => {
-
     it('should call callback immediately when ready', () => {
       testDoc.readyState = 'complete';
       const spy = sandbox.spy();
       const spy2 = sandbox.spy();
       const spy3 = sandbox.spy();
 
-      whenDocumentReady(testDoc).then(spy).then(spy2);
+      whenDocumentReady(testDoc)
+        .then(spy)
+        .then(spy2);
 
       whenDocumentReady(testDoc).then(spy3);
 
@@ -161,14 +161,15 @@ describe('documentReady', () => {
   });
 
   describe('whenDocumentComplete', () => {
-
     it('should call callback immediately when complete', () => {
       testDoc.readyState = 'complete';
       const spy = sandbox.spy();
       const spy2 = sandbox.spy();
       const spy3 = sandbox.spy();
 
-      whenDocumentComplete(testDoc).then(spy).then(spy2);
+      whenDocumentComplete(testDoc)
+        .then(spy)
+        .then(spy2);
 
       whenDocumentComplete(testDoc).then(spy3);
 
diff --git a/test/unit/test-document-state.js b/test/unit/test-document-state.js
index 9cd7fbccdc6d..064857f44edf 100644
--- a/test/unit/test-document-state.js
+++ b/test/unit/test-document-state.js
@@ -17,9 +17,7 @@
 import * as dom from '../../src/dom';
 import {DocumentState} from '../../src/service/document-state';
 
-
 describe('DocumentState', () => {
-
   let sandbox;
   let eventListeners;
   let testDoc;
diff --git a/test/unit/test-document-submit.js b/test/unit/test-document-submit.js
index 349085ba768f..a00a0fcfa6d2 100644
--- a/test/unit/test-document-submit.js
+++ b/test/unit/test-document-submit.js
@@ -68,50 +68,53 @@ describe('test-document-submit onDocumentFormSubmit_', () => {
      */
     const createScript = extension => {
       const script = document.createElement('script');
-      script.setAttribute('src',
-          'https://cdn.ampproject.org/v0/' + extension + '-0.1.js');
+      script.setAttribute(
+        'src',
+        'https://cdn.ampproject.org/v0/' + extension + '-0.1.js'
+      );
       script.setAttribute('custom-element', extension);
       return script;
     };
 
-    it('should not register submit listener if amp-form is not registered.',
-        () => {
-          ampdoc.getHeadNode().appendChild(createScript('amp-list'));
-          sandbox.spy(rootNode, 'addEventListener');
-          return installGlobalSubmitListenerForDoc(ampdoc).then(() => {
-            expect(rootNode.addEventListener).not.to.have.been.called;
-          });
-        });
-
-    it('should register submit listener if amp-form extension is registered.',
-        () => {
-          ampdoc.getHeadNode().appendChild(createScript('amp-form'));
-          sandbox.spy(rootNode, 'addEventListener');
-          return installGlobalSubmitListenerForDoc(ampdoc).then(() => {
-            expect(rootNode.addEventListener).called;
-          });
-        });
+    it('should not register submit listener if amp-form is not registered.', () => {
+      ampdoc.getHeadNode().appendChild(createScript('amp-list'));
+      sandbox.spy(rootNode, 'addEventListener');
+      return installGlobalSubmitListenerForDoc(ampdoc).then(() => {
+        expect(rootNode.addEventListener).not.to.have.been.called;
+      });
+    });
+
+    it('should register submit listener if amp-form extension is registered.', () => {
+      ampdoc.getHeadNode().appendChild(createScript('amp-form'));
+      sandbox.spy(rootNode, 'addEventListener');
+      return installGlobalSubmitListenerForDoc(ampdoc).then(() => {
+        expect(rootNode.addEventListener).called;
+      });
+    });
   });
 
   it('should check target and action attributes', () => {
     tgt.removeAttribute('action');
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /form action-xhr or action attribute is required for method=GET/);
+        /form action-xhr or action attribute is required for method=GET/
+      );
     });
 
     tgt.setAttribute('action', 'http://example.com');
     tgt.__AMP_INIT_ACTION__ = undefined;
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /form action must start with "https:/);
+        /form action must start with "https:/
+      );
     });
 
     tgt.setAttribute('action', 'https://cdn.ampproject.org');
     tgt.__AMP_INIT_ACTION__ = undefined;
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /form action should not be on AMP CDN/);
+        /form action should not be on AMP CDN/
+      );
     });
 
     tgt.setAttribute('action', 'https://valid.example.com');
@@ -124,7 +127,8 @@ describe('test-document-submit onDocumentFormSubmit_', () => {
     tgt.setAttribute('target', '_self');
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /form target=_self is invalid/);
+        /form target=_self is invalid/
+      );
     });
 
     tgt.setAttribute('action', 'https://valid.example.com');
@@ -141,16 +145,20 @@ describe('test-document-submit onDocumentFormSubmit_', () => {
     tgt.appendChild(illegalInput);
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /Illegal input name, __amp_source_origin found/);
+        /Illegal input name, __amp_source_origin found/
+      );
     });
   });
 
   it('should assert __amp_source_origin is not set in action', () => {
-    evt.target.setAttribute('action',
-        'https://example.com/?__amp_source_origin=12');
+    evt.target.setAttribute(
+      'action',
+      'https://example.com/?__amp_source_origin=12'
+    );
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /Source origin is not allowed in/);
+        /Source origin is not allowed in/
+      );
     });
   });
 
@@ -159,7 +167,8 @@ describe('test-document-submit onDocumentFormSubmit_', () => {
     evt.target.setAttribute('method', 'post');
     allowConsoleError(() => {
       expect(() => onDocumentFormSubmit_(evt)).to.throw(
-          /Only XHR based \(via action-xhr attribute\) submissions/);
+        /Only XHR based \(via action-xhr attribute\) submissions/
+      );
     });
     expect(preventDefaultSpy).to.have.been.called;
     const {callCount} = preventDefaultSpy;
@@ -229,7 +238,13 @@ describe('test-document-submit onDocumentFormSubmit_', () => {
     onDocumentFormSubmit_(evt);
     expect(actionService.execute).to.have.been.calledOnce;
     expect(actionService.execute).to.have.been.calledWith(
-        tgt, 'submit', null, tgt, tgt, evt);
+      tgt,
+      'submit',
+      null,
+      tgt,
+      tgt,
+      evt
+    );
     expect(preventDefaultSpy).to.have.been.calledOnce;
     expect(stopImmediatePropagationSpy).to.have.been.calledOnce;
   });
diff --git a/test/unit/test-dom.js b/test/unit/test-dom.js
index 1afde6a9dd4f..d307f049680a 100644
--- a/test/unit/test-dom.js
+++ b/test/unit/test-dom.js
@@ -21,9 +21,7 @@ import {loadPromise} from '../../src/event-helper';
 import {setScopeSelectorSupportedForTesting} from '../../src/css';
 import {toArray} from '../../src/types';
 
-
 describes.sandboxed('DOM', {}, env => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -93,8 +91,7 @@ describes.sandboxed('DOM', {}, env => {
       return;
     }
 
-    const desc = Object.getOwnPropertyDescriptor(Node.prototype,
-        'isConnected');
+    const desc = Object.getOwnPropertyDescriptor(Node.prototype, 'isConnected');
     try {
       delete Node.prototype.isConnected;
 
@@ -139,8 +136,7 @@ describes.sandboxed('DOM', {}, env => {
       return;
     }
 
-    const desc = Object.getOwnPropertyDescriptor(Node.prototype,
-        'getRootNode');
+    const desc = Object.getOwnPropertyDescriptor(Node.prototype, 'getRootNode');
     try {
       delete Node.prototype.getRootNode;
 
@@ -188,10 +184,8 @@ describes.sandboxed('DOM', {}, env => {
 
     expect(dom.closest(grandchild, cb, child)).to.be.null;
     expect(cbSpy).to.have.callCount(4);
-
   });
 
-
   it('closest should find first match', () => {
     const parent = document.createElement('parent');
 
@@ -204,18 +198,22 @@ describes.sandboxed('DOM', {}, env => {
     expect(dom.closest(child, e => e.tagName == 'CHILD')).to.equal(child);
     expect(dom.closestNode(child, e => e.tagName == 'CHILD')).to.equal(child);
     expect(dom.closestAncestorElementBySelector(child, 'child')).to.equal(
-        child);
+      child
+    );
 
     expect(dom.closest(child, e => e.tagName == 'ELEMENT')).to.equal(element);
-    expect(dom.closestNode(child, e => e.tagName == 'ELEMENT'))
-        .to.equal(element);
+    expect(dom.closestNode(child, e => e.tagName == 'ELEMENT')).to.equal(
+      element
+    );
     expect(dom.closestAncestorElementBySelector(child, 'element')).to.equal(
-        element);
+      element
+    );
 
     expect(dom.closest(child, e => e.tagName == 'PARENT')).to.equal(parent);
     expect(dom.closestNode(child, e => e.tagName == 'PARENT')).to.equal(parent);
     expect(dom.closestAncestorElementBySelector(child, 'parent')).to.equal(
-        parent);
+      parent
+    );
   });
 
   it('closestNode should find nodes as well as elements', () => {
@@ -247,26 +245,35 @@ describes.sandboxed('DOM', {}, env => {
     child.className = 'child';
     element.appendChild(child);
 
-    expect(dom.closestAncestorElementBySelector(child, 'child'))
-        .to.equal(child);
-    expect(dom.closestAncestorElementBySelector(child, '.child'))
-        .to.equal(child);
-    expect(dom.closestAncestorElementBySelector(child, '#child'))
-        .to.equal(child);
-
-    expect(dom.closestAncestorElementBySelector(child, 'element'))
-        .to.equal(element);
-    expect(dom.closestAncestorElementBySelector(child, '.element'))
-        .to.equal(element);
-    expect(dom.closestAncestorElementBySelector(child, '#element'))
-        .to.equal(element);
-
-    expect(dom.closestAncestorElementBySelector(child, 'parent'))
-        .to.equal(parent);
-    expect(dom.closestAncestorElementBySelector(child, '.parent'))
-        .to.equal(parent);
-    expect(dom.closestAncestorElementBySelector(child, '#parent'))
-        .to.equal(parent);
+    expect(dom.closestAncestorElementBySelector(child, 'child')).to.equal(
+      child
+    );
+    expect(dom.closestAncestorElementBySelector(child, '.child')).to.equal(
+      child
+    );
+    expect(dom.closestAncestorElementBySelector(child, '#child')).to.equal(
+      child
+    );
+
+    expect(dom.closestAncestorElementBySelector(child, 'element')).to.equal(
+      element
+    );
+    expect(dom.closestAncestorElementBySelector(child, '.element')).to.equal(
+      element
+    );
+    expect(dom.closestAncestorElementBySelector(child, '#element')).to.equal(
+      element
+    );
+
+    expect(dom.closestAncestorElementBySelector(child, 'parent')).to.equal(
+      parent
+    );
+    expect(dom.closestAncestorElementBySelector(child, '.parent')).to.equal(
+      parent
+    );
+    expect(dom.closestAncestorElementBySelector(child, '#parent')).to.equal(
+      parent
+    );
   });
 
   it('elementByTag should find first match', () => {
@@ -282,7 +289,6 @@ describes.sandboxed('DOM', {}, env => {
     expect(dom.elementByTag(parent, 'ELEMENT')).to.equal(element1);
   });
 
-
   it('childElement should find first match', () => {
     const parent = document.createElement('parent');
 
@@ -293,12 +299,13 @@ describes.sandboxed('DOM', {}, env => {
     parent.appendChild(element2);
 
     expect(dom.childElement(parent, () => true)).to.equal(element1);
-    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT1'))
-        .to.equal(element1);
-    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT2'))
-        .to.equal(element2);
-    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT3'))
-        .to.be.null;
+    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT1')).to.equal(
+      element1
+    );
+    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT2')).to.equal(
+      element2
+    );
+    expect(dom.childElement(parent, e => e.tagName == 'ELEMENT3')).to.be.null;
   });
 
   it('childElements should find all matches', () => {
@@ -311,12 +318,15 @@ describes.sandboxed('DOM', {}, env => {
     parent.appendChild(element2);
 
     expect(dom.childElements(parent, () => true).length).to.equal(2);
-    expect(dom.childElements(parent, e => e.tagName == 'ELEMENT1').length)
-        .to.equal(1);
-    expect(dom.childElements(parent, e => e.tagName == 'ELEMENT2').length)
-        .to.equal(1);
-    expect(dom.childElements(parent, e => e.tagName == 'ELEMENT3').length)
-        .to.be.equal(0);
+    expect(
+      dom.childElements(parent, e => e.tagName == 'ELEMENT1').length
+    ).to.equal(1);
+    expect(
+      dom.childElements(parent, e => e.tagName == 'ELEMENT2').length
+    ).to.equal(1);
+    expect(
+      dom.childElements(parent, e => e.tagName == 'ELEMENT3').length
+    ).to.be.equal(0);
   });
 
   it('childNodes should find all matches', () => {
@@ -325,16 +335,21 @@ describes.sandboxed('DOM', {}, env => {
     parent.appendChild(document.createTextNode('text2'));
     parent.appendChild(document.createElement('element'));
     expect(dom.childNodes(parent, () => true).length).to.equal(3);
-    expect(dom.childNodes(parent, node => node.textContent == 'text1').length)
-        .to.equal(1);
-    expect(dom.childNodes(parent, node => node.textContent == 'text2').length)
-        .to.equal(1);
-    expect(dom.childNodes(parent, node => node.textContent == 'text3').length)
-        .to.equal(0);
-    expect(dom.childNodes(parent, node => node.tagName == 'ELEMENT').length)
-        .to.equal(1);
-    expect(dom.childNodes(parent, node => node.tagName == 'ELEMENT2').length)
-        .to.equal(0);
+    expect(
+      dom.childNodes(parent, node => node.textContent == 'text1').length
+    ).to.equal(1);
+    expect(
+      dom.childNodes(parent, node => node.textContent == 'text2').length
+    ).to.equal(1);
+    expect(
+      dom.childNodes(parent, node => node.textContent == 'text3').length
+    ).to.equal(0);
+    expect(
+      dom.childNodes(parent, node => node.tagName == 'ELEMENT').length
+    ).to.equal(1);
+    expect(
+      dom.childNodes(parent, node => node.tagName == 'ELEMENT2').length
+    ).to.equal(0);
   });
 
   function testChildElementByTag() {
@@ -374,12 +389,16 @@ describes.sandboxed('DOM', {}, env => {
     const element3 = document.createElement('element23');
     parent.appendChild(element3);
 
-    expect(toArray(dom.childElementsByTag(parent, 'element1')))
-        .to.deep.equal([element1]);
-    expect(toArray(dom.childElementsByTag(parent, 'element23')))
-        .to.deep.equal([element2, element3]);
-    expect(toArray(dom.childElementsByTag(parent, 'element3')))
-        .to.deep.equal([]);
+    expect(toArray(dom.childElementsByTag(parent, 'element1'))).to.deep.equal([
+      element1,
+    ]);
+    expect(toArray(dom.childElementsByTag(parent, 'element23'))).to.deep.equal([
+      element2,
+      element3,
+    ]);
+    expect(toArray(dom.childElementsByTag(parent, 'element3'))).to.deep.equal(
+      []
+    );
   }
 
   it('childElementsByTag should find first match', testChildElementsByTag);
@@ -482,12 +501,15 @@ describes.sandboxed('DOM', {}, env => {
     const element2 = document.createElement('element2');
     element1.appendChild(element2);
     expect(dom.ancestorElements(element2, () => true).length).to.equal(2);
-    expect(dom.ancestorElements(element2, e => e.tagName == 'ELEMENT1').length)
-        .to.equal(1);
-    expect(dom.ancestorElements(element1, e => e.tagName == 'PARENT').length)
-        .to.equal(1);
-    expect(dom.ancestorElements(parent, e => e.tagName == 'ELEMENT3').length)
-        .to.be.equal(0);
+    expect(
+      dom.ancestorElements(element2, e => e.tagName == 'ELEMENT1').length
+    ).to.equal(1);
+    expect(
+      dom.ancestorElements(element1, e => e.tagName == 'PARENT').length
+    ).to.equal(1);
+    expect(
+      dom.ancestorElements(parent, e => e.tagName == 'ELEMENT3').length
+    ).to.be.equal(0);
   });
 
   it('ancestorElementsByTag should find all matches', () => {
@@ -496,12 +518,11 @@ describes.sandboxed('DOM', {}, env => {
     parent.appendChild(element1);
     const element2 = document.createElement('element2');
     element1.appendChild(element2);
-    expect(dom.ancestorElementsByTag(element2, 'ELEMENT1').length)
-        .to.equal(1);
-    expect(dom.ancestorElementsByTag(element1, 'PARENT').length)
-        .to.equal(1);
-    expect(dom.ancestorElementsByTag(element2, 'ELEMENT3').length)
-        .to.be.equal(0);
+    expect(dom.ancestorElementsByTag(element2, 'ELEMENT1').length).to.equal(1);
+    expect(dom.ancestorElementsByTag(element1, 'PARENT').length).to.equal(1);
+    expect(dom.ancestorElementsByTag(element2, 'ELEMENT3').length).to.be.equal(
+      0
+    );
   });
 
   it('iterateCursor should loop through every element in a NodeList', () => {
@@ -557,15 +578,19 @@ describes.sandboxed('DOM', {}, env => {
     const element2 = document.createElement('div');
     parent.appendChild(element2);
 
-
-    expect(toArray(dom.scopedQuerySelectorAll(parent, 'div')))
-        .to.deep.equal([element1, element2]);
-    expect(toArray(dom.scopedQuerySelectorAll(grandparent, 'div div')))
-        .to.deep.equal([element1, element2]);
+    expect(toArray(dom.scopedQuerySelectorAll(parent, 'div'))).to.deep.equal([
+      element1,
+      element2,
+    ]);
+    expect(
+      toArray(dom.scopedQuerySelectorAll(grandparent, 'div div'))
+    ).to.deep.equal([element1, element2]);
   }
 
-  it('scopedQuerySelectorAll should find all matches',
-      testScopedQuerySelectorAll);
+  it(
+    'scopedQuerySelectorAll should find all matches',
+    testScopedQuerySelectorAll
+  );
 
   it('scopedQuerySelectorAll should find all matches (polyfill)', () => {
     setScopeSelectorSupportedForTesting(false);
@@ -634,8 +659,9 @@ describes.sandboxed('DOM', {}, env => {
       expect(spy).to.have.not.been.called;
       expect(mutationObserver.observe).to.be.calledOnce;
       expect(mutationObserver.observe.firstCall.args[0]).to.equal(parent);
-      expect(mutationObserver.observe.firstCall.args[1])
-          .to.deep.equal({childList: true});
+      expect(mutationObserver.observe.firstCall.args[1]).to.deep.equal({
+        childList: true,
+      });
       expect(mutationCallback).to.exist;
 
       // False callback.
@@ -738,8 +764,11 @@ describes.sandboxed('DOM', {}, env => {
     it('should return key-value for custom data attributes', () => {
       const element = document.createElement('element');
       element.setAttribute('data-vars-event-name', 'click');
-      const params = dom.getDataParamsFromAttributes(element, null,
-          /^vars(.+)/);
+      const params = dom.getDataParamsFromAttributes(
+        element,
+        null,
+        /^vars(.+)/
+      );
       expect(params.eventName).to.be.equal('click');
     });
   });
@@ -787,7 +816,9 @@ describes.sandboxed('DOM', {}, env => {
 
     beforeEach(() => {
       windowApi = {
-        open: () => {throw new Error('not mocked');},
+        open: () => {
+          throw new Error('not mocked');
+        },
       };
       windowMock = sandbox.mock(windowApi);
     });
@@ -798,96 +829,138 @@ describes.sandboxed('DOM', {}, env => {
 
     it('should return on first success', () => {
       const dialog = {};
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .returns(dialog)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_blank', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .returns(dialog)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_blank',
+        'width=1'
+      );
       expect(res).to.equal(dialog);
     });
 
     it('should retry on first null', () => {
       const dialog = {};
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .returns(null)
-          .once();
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top')
-          .returns(dialog)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_blank', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .returns(null)
+        .once();
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top')
+        .returns(dialog)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_blank',
+        'width=1'
+      );
       expect(res).to.equal(dialog);
     });
 
     it('should retry on first undefined', () => {
       const dialog = {};
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .returns(undefined)
-          .once();
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top')
-          .returns(dialog)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_blank', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .returns(undefined)
+        .once();
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top')
+        .returns(dialog)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_blank',
+        'width=1'
+      );
       expect(res).to.equal(dialog);
     });
 
     it('should retry on first exception', () => {
       const dialog = {};
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .throws(new Error('intentional'))
-          .once();
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top')
-          .returns(dialog)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_blank', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .throws(new Error('intentional'))
+        .once();
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top')
+        .returns(dialog)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_blank',
+        'width=1'
+      );
       expect(res).to.equal(dialog);
     });
 
     it('should return the final result', () => {
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .returns(undefined)
-          .once();
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top')
-          .returns(null)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_blank', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .returns(undefined)
+        .once();
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top')
+        .returns(null)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_blank',
+        'width=1'
+      );
       expect(res).to.be.null;
     });
 
     it('should return the final exception', () => {
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_blank', 'width=1')
-          .throws(new Error('intentional1'))
-          .once();
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top')
-          .throws(new Error('intentional2'))
-          .once();
-      allowConsoleError(() => { expect(() => {
-        dom.openWindowDialog(windowApi, 'https://example.com/',
-            '_blank', 'width=1');
-      }).to.throw(/intentional2/); });
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_blank', 'width=1')
+        .throws(new Error('intentional1'))
+        .once();
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top')
+        .throws(new Error('intentional2'))
+        .once();
+      allowConsoleError(() => {
+        expect(() => {
+          dom.openWindowDialog(
+            windowApi,
+            'https://example.com/',
+            '_blank',
+            'width=1'
+          );
+        }).to.throw(/intentional2/);
+      });
     });
 
     it('should retry only non-top target', () => {
-      windowMock.expects('open')
-          .withExactArgs('https://example.com/', '_top', 'width=1')
-          .returns(null)
-          .once();
-      const res = dom.openWindowDialog(windowApi, 'https://example.com/',
-          '_top', 'width=1');
+      windowMock
+        .expects('open')
+        .withExactArgs('https://example.com/', '_top', 'width=1')
+        .returns(null)
+        .once();
+      const res = dom.openWindowDialog(
+        windowApi,
+        'https://example.com/',
+        '_top',
+        'width=1'
+      );
       expect(res).to.be.null;
     });
   });
@@ -928,8 +1001,9 @@ describes.sandboxed('DOM', {}, env => {
     });
 
     it('should subsctitute escapes', () => {
-      expect(dom.escapeHtml('a<b>&c"d\'e\`f')).to.equal(
-          'a&lt;b&gt;&amp;c&quot;d&#x27;e&#x60;f');
+      expect(dom.escapeHtml('a<b>&c"d\'e`f')).to.equal(
+        'a&lt;b&gt;&amp;c&quot;d&#x27;e&#x60;f'
+      );
     });
   });
 
@@ -974,7 +1048,6 @@ describes.sandboxed('DOM', {}, env => {
       const loaded = loadPromise(iframe);
       ampEl.appendChild(iframe);
       return loaded;
-
     });
 
     afterEach(() => {
@@ -1022,29 +1095,35 @@ describes.sandboxed('DOM', {}, env => {
     expect(dom.isEnabled(a)).to.be.true;
   });
 
-  it('templateContentClone on a <template> element (browser supports' +
-      ' HTMLTemplateElement)', () => {
-    const template = document.createElement('template');
-    template.innerHTML = '<span>123</span><span>456<em>789</em></span>';
-    const content = dom.templateContentClone(template);
-
-    const spans = content.querySelectorAll('span');
-    expect(spans.length).to.equal(2);
-    expect(spans[0].innerHTML).to.equal('123');
-    expect(spans[1].innerHTML).to.equal('456<em>789</em>');
-  });
-
-  it('templateContentClone on a <template> element (simulate a browser' +
-      ' that does not support HTMLTemplateElement)', () => {
-    const template = document.createElement('div');
-    template.innerHTML = '<span>123</span><span>456<em>789</em></span>';
-    const content = dom.templateContentClone(template);
-
-    const spans = content.querySelectorAll('span');
-    expect(spans.length).to.equal(2);
-    expect(spans[0].innerHTML).to.equal('123');
-    expect(spans[1].innerHTML).to.equal('456<em>789</em>');
-  });
+  it(
+    'templateContentClone on a <template> element (browser supports' +
+      ' HTMLTemplateElement)',
+    () => {
+      const template = document.createElement('template');
+      template.innerHTML = '<span>123</span><span>456<em>789</em></span>';
+      const content = dom.templateContentClone(template);
+
+      const spans = content.querySelectorAll('span');
+      expect(spans.length).to.equal(2);
+      expect(spans[0].innerHTML).to.equal('123');
+      expect(spans[1].innerHTML).to.equal('456<em>789</em>');
+    }
+  );
+
+  it(
+    'templateContentClone on a <template> element (simulate a browser' +
+      ' that does not support HTMLTemplateElement)',
+    () => {
+      const template = document.createElement('div');
+      template.innerHTML = '<span>123</span><span>456<em>789</em></span>';
+      const content = dom.templateContentClone(template);
+
+      const spans = content.querySelectorAll('span');
+      expect(spans.length).to.equal(2);
+      expect(spans[0].innerHTML).to.equal('123');
+      expect(spans[1].innerHTML).to.equal('456<em>789</em>');
+    }
+  );
 
   describe('domOrderComparator', () => {
     it('should sort elements by dom order', () => {
@@ -1086,91 +1165,99 @@ describes.sandboxed('DOM', {}, env => {
   });
 });
 
-describes.realWin('DOM', {
-  amp: { /* amp spec */
-    ampdoc: 'single',
+describes.realWin(
+  'DOM',
+  {
+    amp: {
+      /* amp spec */
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let doc;
-  class TestElement extends BaseElement {}
-  describe('whenUpgradeToCustomElement function', () => {
-    beforeEach(() => {
-      doc = env.win.document;
-    });
+  env => {
+    let doc;
+    class TestElement extends BaseElement {}
+    describe('whenUpgradeToCustomElement function', () => {
+      beforeEach(() => {
+        doc = env.win.document;
+      });
 
-    it('should not continue if element is not AMP element', () => {
-      const element = doc.createElement('div');
-      allowConsoleError(() => {
-        expect(() => dom.whenUpgradedToCustomElement(element)).to.throw(
-            'element is not AmpElement');
+      it('should not continue if element is not AMP element', () => {
+        const element = doc.createElement('div');
+        allowConsoleError(() => {
+          expect(() => dom.whenUpgradedToCustomElement(element)).to.throw(
+            'element is not AmpElement'
+          );
+        });
       });
-    });
 
-    it('should resolve if element has already upgrade', () => {
-      const element = doc.createElement('amp-img');
-      doc.body.appendChild(element);
-      return dom.whenUpgradedToCustomElement(element).then(element => {
-        expect(element.whenBuilt).to.exist;
+      it('should resolve if element has already upgrade', () => {
+        const element = doc.createElement('amp-img');
+        doc.body.appendChild(element);
+        return dom.whenUpgradedToCustomElement(element).then(element => {
+          expect(element.whenBuilt).to.exist;
+        });
       });
-    });
 
-    it('should resolve when element upgrade', () => {
-      const element = doc.createElement('amp-test');
-      doc.body.appendChild(element);
-      env.win.setTimeout(() => {
-        env.win.customElements.define('amp-test', createAmpElementForTesting(
-            env.win, 'amp-test', TestElement));
-      }, 100);
-      return dom.whenUpgradedToCustomElement(element).then(element => {
-        expect(element.whenBuilt).to.exist;
+      it('should resolve when element upgrade', () => {
+        const element = doc.createElement('amp-test');
+        doc.body.appendChild(element);
+        env.win.setTimeout(() => {
+          env.win.customElements.define(
+            'amp-test',
+            createAmpElementForTesting(env.win, 'amp-test', TestElement)
+          );
+        }, 100);
+        return dom.whenUpgradedToCustomElement(element).then(element => {
+          expect(element.whenBuilt).to.exist;
+        });
       });
     });
-  });
 
-  describe('toggleAttribute', () => {
-    let el;
+    describe('toggleAttribute', () => {
+      let el;
 
-    beforeEach(() => {
-      el = document.createElement('div');
-    });
+      beforeEach(() => {
+        el = document.createElement('div');
+      });
 
-    it('should toggle to remove the attribute with an empty value', () => {
-      el.setAttribute('foo', '');
-      dom.toggleAttribute(el, 'foo');
-      expect(el.getAttribute('foo')).to.be.null;
-    });
+      it('should toggle to remove the attribute with an empty value', () => {
+        el.setAttribute('foo', '');
+        dom.toggleAttribute(el, 'foo');
+        expect(el.getAttribute('foo')).to.be.null;
+      });
 
-    it('should toggle to remove the attribute with a non-empty value', () => {
-      el.setAttribute('foo', 'asdf');
-      dom.toggleAttribute(el, 'foo');
-      expect(el.getAttribute('foo')).to.be.null;
-    });
+      it('should toggle to remove the attribute with a non-empty value', () => {
+        el.setAttribute('foo', 'asdf');
+        dom.toggleAttribute(el, 'foo');
+        expect(el.getAttribute('foo')).to.be.null;
+      });
 
-    it('should toggle to add the attribute', () => {
-      dom.toggleAttribute(el, 'foo');
-      expect(el.getAttribute('foo')).to.equal('');
-    });
+      it('should toggle to add the attribute', () => {
+        dom.toggleAttribute(el, 'foo');
+        expect(el.getAttribute('foo')).to.equal('');
+      });
 
-    it('should remove the attribute when forced', () => {
-      el.setAttribute('foo', '');
-      dom.toggleAttribute(el, 'foo', false);
-      expect(el.getAttribute('foo')).to.be.null;
-    });
+      it('should remove the attribute when forced', () => {
+        el.setAttribute('foo', '');
+        dom.toggleAttribute(el, 'foo', false);
+        expect(el.getAttribute('foo')).to.be.null;
+      });
 
-    it('should not add the attribute when forced off', () => {
-      dom.toggleAttribute(el, 'foo', false);
-      expect(el.getAttribute('foo')).to.be.null;
-    });
+      it('should not add the attribute when forced off', () => {
+        dom.toggleAttribute(el, 'foo', false);
+        expect(el.getAttribute('foo')).to.be.null;
+      });
 
-    it('should add the attribute when forced and it does not exist', () => {
-      dom.toggleAttribute(el, 'foo', true);
-      expect(el.getAttribute('foo')).to.equal('');
-    });
+      it('should add the attribute when forced and it does not exist', () => {
+        dom.toggleAttribute(el, 'foo', true);
+        expect(el.getAttribute('foo')).to.equal('');
+      });
 
-    it('should leave the attribute when forced and it exists', () => {
-      el.setAttribute('foo', 'asdf');
-      dom.toggleAttribute(el, 'foo', true);
-      expect(el.getAttribute('foo')).to.equal('asdf');
+      it('should leave the attribute when forced and it exists', () => {
+        el.setAttribute('foo', 'asdf');
+        dom.toggleAttribute(el, 'foo', true);
+        expect(el.getAttribute('foo')).to.equal('asdf');
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-element-service.js b/test/unit/test-element-service.js
index 50e24ad2eea9..33dc82dee03a 100644
--- a/test/unit/test-element-service.js
+++ b/test/unit/test-element-service.js
@@ -69,7 +69,6 @@ describe('getElementServiceIfAvailable()', () => {
     doc.getHeadNode = () => doc.head;
     doc.head.querySelectorAll = () => [];
 
-
     win = {
       document: doc,
     };
@@ -81,280 +80,337 @@ describe('getElementServiceIfAvailable()', () => {
 
   it('should wait for doc ready when not available', () => {
     let resolvedService;
-    const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1')
-        .then(service => {
-          resolvedService = service;
-          return service;
-        });
-    return Promise.resolve().then(() => {
-      expect(readyStateListeners).to.not.be.empty;
-      expect(resolvedService).to.be.undefined;
-
-      // Resolve body.
-      doc.readyState = 'complete';
-      return p1;
-    }).then(service => {
-      expect(resolvedService).to.be.null;
-      expect(service).to.be.null;
-    });
+    const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1').then(
+      service => {
+        resolvedService = service;
+        return service;
+      }
+    );
+    return Promise.resolve()
+      .then(() => {
+        expect(readyStateListeners).to.not.be.empty;
+        expect(resolvedService).to.be.undefined;
+
+        // Resolve body.
+        doc.readyState = 'complete';
+        return p1;
+      })
+      .then(service => {
+        expect(resolvedService).to.be.null;
+        expect(service).to.be.null;
+      });
   });
 
   it('should resolve when ready when service not available', () => {
     doc.readyState = 'complete';
     const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1');
-    return Promise.resolve().then(() => {
-      expect(readyStateListeners).to.be.empty;
-      return p1;
-    }).then(service => {
-      expect(service).to.be.null;
-    });
+    return Promise.resolve()
+      .then(() => {
+        expect(readyStateListeners).to.be.empty;
+        return p1;
+      })
+      .then(service => {
+        expect(service).to.be.null;
+      });
   });
 
   it('should wait for document ready when service available', () => {
     let resolvedService;
-    const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1')
-        .then(service => {
-          resolvedService = service;
-          return service;
+    const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1').then(
+      service => {
+        resolvedService = service;
+        return service;
+      }
+    );
+    return Promise.resolve()
+      .then(() => {
+        expect(readyStateListeners).to.not.be.empty;
+        expect(resolvedService).to.be.undefined;
+
+        // Resolve body.
+        markElementScheduledForTesting(win, 'element-1');
+        registerServiceBuilder(win, 'e1', function() {
+          return {str: 'fake1'};
         });
-    return Promise.resolve().then(() => {
-      expect(readyStateListeners).to.not.be.empty;
-      expect(resolvedService).to.be.undefined;
-
-      // Resolve body.
-      markElementScheduledForTesting(win, 'element-1');
-      registerServiceBuilder(win, 'e1', function() {
-        return {str: 'fake1'};
+        doc.readyState = 'complete';
+        return p1;
+      })
+      .then(service => {
+        expect(resolvedService).to.deep.equal({str: 'fake1'});
+        expect(service).to.deep.equal({str: 'fake1'});
       });
-      doc.readyState = 'complete';
-      return p1;
-    }).then(service => {
-      expect(resolvedService).to.deep.equal({str: 'fake1'});
-      expect(service).to.deep.equal({str: 'fake1'});
-    });
   });
 
   it('should resolve when ready when service available', () => {
     doc.readyState = 'complete';
     markElementScheduledForTesting(win, 'element-1');
     const p1 = getElementServiceIfAvailable(win, 'e1', 'element-1');
-    return Promise.resolve().then(() => {
-      expect(readyStateListeners).to.be.empty;
-      registerServiceBuilder(win, 'e1', function() {
-        return {str: 'fake1'};
+    return Promise.resolve()
+      .then(() => {
+        expect(readyStateListeners).to.be.empty;
+        registerServiceBuilder(win, 'e1', function() {
+          return {str: 'fake1'};
+        });
+        return p1;
+      })
+      .then(service => {
+        expect(service).to.deep.equal({str: 'fake1'});
       });
-      return p1;
-    }).then(service => {
-      expect(service).to.deep.equal({str: 'fake1'});
-    });
   });
 });
 
-
-describes.realWin('in single ampdoc', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'in single ampdoc',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let ampdoc;
+  env => {
+    let ampdoc;
 
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
 
-    resetServiceForTesting(env.win, 'e1');
-    resetScheduledElementForTesting(env.win, 'element-1');
-    resetScheduledElementForTesting(env.win, 'element-foo');
-  });
+      resetServiceForTesting(env.win, 'e1');
+      resetScheduledElementForTesting(env.win, 'element-1');
+      resetScheduledElementForTesting(env.win, 'element-foo');
+    });
 
-  describe('getElementService()', () => {
-    it('should be provided by element', () => {
-      markElementScheduledForTesting(env.win, 'element-1');
-      const p1 = getElementService(env.win, 'e1', 'element-1');
-      const p2 = getElementService(env.win, 'e1', 'element-1');
+    describe('getElementService()', () => {
+      it('should be provided by element', () => {
+        markElementScheduledForTesting(env.win, 'element-1');
+        const p1 = getElementService(env.win, 'e1', 'element-1');
+        const p2 = getElementService(env.win, 'e1', 'element-1');
 
-      registerServiceBuilder(env.win, 'e1', function() {
-        return {str: 'from e1'};
-      });
+        registerServiceBuilder(env.win, 'e1', function() {
+          return {str: 'from e1'};
+        });
 
-      return p1.then(s1 => {
-        expect(s1).to.deep.equal({str: 'from e1'});
-        return p2.then(s2 => {
-          expect(s1).to.equal(s2);
+        return p1.then(s1 => {
+          expect(s1).to.deep.equal({str: 'from e1'});
+          return p2.then(s2 => {
+            expect(s1).to.equal(s2);
+          });
         });
       });
-    });
 
-    it('should fail if element is not in page.', () => {
-      expectAsyncConsoleError(
-          /e1 was requested to be provided through element-bar/);
-      markElementScheduledForTesting(env.win, 'element-foo');
-
-      return getElementService(env.win, 'e1', 'element-bar').then(() => {
-        return 'SUCCESS';
-      }, error => {
-        return 'ERROR ' + error;
-      }).then(result => {
-        expect(result).to.match(
-            /Service e1 was requested to be provided through element-bar/);
+      it('should fail if element is not in page.', () => {
+        expectAsyncConsoleError(
+          /e1 was requested to be provided through element-bar/
+        );
+        markElementScheduledForTesting(env.win, 'element-foo');
+
+        return getElementService(env.win, 'e1', 'element-bar')
+          .then(
+            () => {
+              return 'SUCCESS';
+            },
+            error => {
+              return 'ERROR ' + error;
+            }
+          )
+          .then(result => {
+            expect(result).to.match(
+              /Service e1 was requested to be provided through element-bar/
+            );
+          });
       });
     });
-  });
 
-  describe('getElementServiceIfAvailable()', () => {
-    it('should be provided by element if available', () => {
-      markElementScheduledForTesting(env.win, 'element-1');
-      const p1 = getElementServiceIfAvailable(env.win, 'e1', 'element-1');
-      const p2 = getElementServiceIfAvailable(env.win, 'e2', 'not-available');
-      registerServiceBuilder(env.win, 'e1', function() {
-        return {str: 'from e1'};
-      });
-      return p1.then(s1 => {
-        expect(s1).to.deep.equal({str: 'from e1'});
-        return p2.then(s2 => {
-          expect(s2).to.be.null;
+    describe('getElementServiceIfAvailable()', () => {
+      it('should be provided by element if available', () => {
+        markElementScheduledForTesting(env.win, 'element-1');
+        const p1 = getElementServiceIfAvailable(env.win, 'e1', 'element-1');
+        const p2 = getElementServiceIfAvailable(env.win, 'e2', 'not-available');
+        registerServiceBuilder(env.win, 'e1', function() {
+          return {str: 'from e1'};
+        });
+        return p1.then(s1 => {
+          expect(s1).to.deep.equal({str: 'from e1'});
+          return p2.then(s2 => {
+            expect(s2).to.be.null;
+          });
         });
       });
     });
-  });
 
-  describe('getElementServiceForDoc()', () => {
-    it('should be provided by element', () => {
-      markElementScheduledForTesting(env.win, 'element-1');
-      const p1 = getElementServiceForDoc(ampdoc, 'e1', 'element-1');
-      const p2 = getElementServiceForDoc(ampdoc, 'e1', 'element-1');
+    describe('getElementServiceForDoc()', () => {
+      it('should be provided by element', () => {
+        markElementScheduledForTesting(env.win, 'element-1');
+        const p1 = getElementServiceForDoc(ampdoc, 'e1', 'element-1');
+        const p2 = getElementServiceForDoc(ampdoc, 'e1', 'element-1');
 
-      registerServiceBuilder(env.win, 'e1', function() {
-        return {str: 'from e1'};
-      });
+        registerServiceBuilder(env.win, 'e1', function() {
+          return {str: 'from e1'};
+        });
 
-      return p1.then(s1 => {
-        expect(s1).to.deep.equal({str: 'from e1'});
-        return p2.then(s2 => {
-          expect(s1).to.equal(s2);
+        return p1.then(s1 => {
+          expect(s1).to.deep.equal({str: 'from e1'});
+          return p2.then(s2 => {
+            expect(s1).to.equal(s2);
+          });
         });
       });
-    });
 
-    it('should fail if element is not in page.', () => {
-      expectAsyncConsoleError(
-          /e1 was requested to be provided through element-bar/);
-      markElementScheduledForTesting(env.win, 'element-foo');
-
-      return getElementServiceForDoc(ampdoc, 'e1', 'element-bar').then(() => {
-        return 'SUCCESS';
-      }, error => {
-        return 'ERROR ' + error;
-      }).then(result => {
-        expect(result).to.match(
-            /Service e1 was requested to be provided through element-bar/);
+      it('should fail if element is not in page.', () => {
+        expectAsyncConsoleError(
+          /e1 was requested to be provided through element-bar/
+        );
+        markElementScheduledForTesting(env.win, 'element-foo');
+
+        return getElementServiceForDoc(ampdoc, 'e1', 'element-bar')
+          .then(
+            () => {
+              return 'SUCCESS';
+            },
+            error => {
+              return 'ERROR ' + error;
+            }
+          )
+          .then(result => {
+            expect(result).to.match(
+              /Service e1 was requested to be provided through element-bar/
+            );
+          });
       });
     });
-  });
 
-  describe('getElementServiceIfAvailableForDoc()', () => {
-    it('should be provided by element if available', () => {
-      markElementScheduledForTesting(env.win, 'element-1');
-      const p1 = getElementServiceIfAvailableForDoc(
-          ampdoc, 'e1', 'element-1');
-      const p2 = getElementServiceIfAvailableForDoc(
-          ampdoc, 'e2', 'not-available');
-      registerServiceBuilder(env.win, 'e1', function() {
-        return {str: 'from e1'};
-      });
-      return p1.then(s1 => {
-        expect(s1).to.deep.equal({str: 'from e1'});
-        return p2.then(s2 => {
-          expect(s2).to.be.null;
+    describe('getElementServiceIfAvailableForDoc()', () => {
+      it('should be provided by element if available', () => {
+        markElementScheduledForTesting(env.win, 'element-1');
+        const p1 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e1',
+          'element-1'
+        );
+        const p2 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e2',
+          'not-available'
+        );
+        registerServiceBuilder(env.win, 'e1', function() {
+          return {str: 'from e1'};
+        });
+        return p1.then(s1 => {
+          expect(s1).to.deep.equal({str: 'from e1'});
+          return p2.then(s2 => {
+            expect(s2).to.be.null;
+          });
         });
       });
-    });
 
-    it('should wait for body when not available', () => {
-      let bodyResolver;
-      ampdoc.bodyPromise_ = new Promise(resolve => {
-        bodyResolver = resolve;
-      });
-      let resolvedService;
-      const p1 = getElementServiceIfAvailableForDoc(ampdoc, 'e1', 'element-1')
+      it('should wait for body when not available', () => {
+        let bodyResolver;
+        ampdoc.bodyPromise_ = new Promise(resolve => {
+          bodyResolver = resolve;
+        });
+        let resolvedService;
+        const p1 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e1',
+          'element-1'
+        ).then(service => {
+          resolvedService = service;
+          return service;
+        });
+        return Promise.resolve()
+          .then(() => {
+            expect(resolvedService).to.be.undefined;
+
+            // Resolve body.
+            bodyResolver();
+            return p1;
+          })
           .then(service => {
-            resolvedService = service;
-            return service;
+            expect(resolvedService).to.be.null;
+            expect(service).to.be.null;
           });
-      return Promise.resolve().then(() => {
-        expect(resolvedService).to.be.undefined;
-
-        // Resolve body.
-        bodyResolver();
-        return p1;
-      }).then(service => {
-        expect(resolvedService).to.be.null;
-        expect(service).to.be.null;
       });
-    });
 
-    it('resolve w/ body when not available', () => {
-      const p1 = getElementServiceIfAvailableForDoc(
-          ampdoc, 'e1', 'element-1');
-      return Promise.resolve().then(() => {
-        return p1;
-      }).then(service => {
-        expect(service).to.be.null;
-      });
-    });
-
-    it('should wait for body when available', () => {
-      let bodyResolver;
-      ampdoc.bodyPromise_ = new Promise(resolve => {
-        bodyResolver = resolve;
-      });
-      let resolvedService;
-      const p1 = getElementServiceIfAvailableForDoc(ampdoc, 'e1', 'element-1')
+      it('resolve w/ body when not available', () => {
+        const p1 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e1',
+          'element-1'
+        );
+        return Promise.resolve()
+          .then(() => {
+            return p1;
+          })
           .then(service => {
-            resolvedService = service;
-            return service;
+            expect(service).to.be.null;
           });
-      return Promise.resolve().then(() => {
-        expect(resolvedService).to.be.undefined;
+      });
 
-        // Resolve body.
-        markElementScheduledForTesting(env.win, 'element-1');
-        registerServiceBuilder(env.win, 'e1', function() {
-          return {str: 'fake1'};
+      it('should wait for body when available', () => {
+        let bodyResolver;
+        ampdoc.bodyPromise_ = new Promise(resolve => {
+          bodyResolver = resolve;
         });
-        bodyResolver();
-        return p1;
-      }).then(service => {
-        expect(resolvedService).to.deep.equal({str: 'fake1'});
-        expect(service).to.deep.equal({str: 'fake1'});
+        let resolvedService;
+        const p1 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e1',
+          'element-1'
+        ).then(service => {
+          resolvedService = service;
+          return service;
+        });
+        return Promise.resolve()
+          .then(() => {
+            expect(resolvedService).to.be.undefined;
+
+            // Resolve body.
+            markElementScheduledForTesting(env.win, 'element-1');
+            registerServiceBuilder(env.win, 'e1', function() {
+              return {str: 'fake1'};
+            });
+            bodyResolver();
+            return p1;
+          })
+          .then(service => {
+            expect(resolvedService).to.deep.equal({str: 'fake1'});
+            expect(service).to.deep.equal({str: 'fake1'});
+          });
       });
-    });
 
-    it('should resolve with body when available', () => {
-      markElementScheduledForTesting(env.win, 'element-1');
-      const p1 = getElementServiceIfAvailableForDoc(
-          ampdoc, 'e1', 'element-1');
-      return Promise.resolve().then(() => {
-        registerServiceBuilder(env.win, 'e1', function() {
-          return {str: 'fake1'};
-        });
-        return p1;
-      }).then(service => {
-        expect(service).to.deep.equal({str: 'fake1'});
+      it('should resolve with body when available', () => {
+        markElementScheduledForTesting(env.win, 'element-1');
+        const p1 = getElementServiceIfAvailableForDoc(
+          ampdoc,
+          'e1',
+          'element-1'
+        );
+        return Promise.resolve()
+          .then(() => {
+            registerServiceBuilder(env.win, 'e1', function() {
+              return {str: 'fake1'};
+            });
+            return p1;
+          })
+          .then(service => {
+            expect(service).to.deep.equal({str: 'fake1'});
+          });
       });
-    });
 
-    it('isExtensionScriptInNode', () => {
-      const extension = document.createElement('script');
-      extension.setAttribute('custom-element', 'amp-form');
-      extension.setAttribute('src', 'https://cdn.ampproject.org/v0/amp-form-0.1.js');
-      ampdoc.getHeadNode().appendChild(extension);
-      return isExtensionScriptInNode(ampdoc, 'amp-form')
-          .then(ampFormInstalled => {
+      it('isExtensionScriptInNode', () => {
+        const extension = document.createElement('script');
+        extension.setAttribute('custom-element', 'amp-form');
+        extension.setAttribute(
+          'src',
+          'https://cdn.ampproject.org/v0/amp-form-0.1.js'
+        );
+        ampdoc.getHeadNode().appendChild(extension);
+        return isExtensionScriptInNode(ampdoc, 'amp-form').then(
+          ampFormInstalled => {
             expect(ampFormInstalled).to.equal(true);
-          });
+          }
+        );
+      });
     });
-  });
-});
+  }
+);
 
 describes.fakeWin('in embed scope', {amp: true}, env => {
   let win;
@@ -388,7 +444,10 @@ describes.fakeWin('in embed scope', {amp: true}, env => {
   it('should return existing service', () => {
     installServiceInEmbedScope(embedWin, 'foo', service);
     return getElementServiceIfAvailableForDocInEmbedScope(
-        nodeInEmbedWin, 'foo', 'amp-foo').then(returned => {
+      nodeInEmbedWin,
+      'foo',
+      'amp-foo'
+    ).then(returned => {
       expect(returned).to.equal(service);
     });
   });
@@ -396,7 +455,10 @@ describes.fakeWin('in embed scope', {amp: true}, env => {
   it('should return service for scheduled element', () => {
     markElementScheduledForTesting(embedWin, 'amp-foo');
     const promise = getElementServiceIfAvailableForDocInEmbedScope(
-        nodeInEmbedWin, 'foo', 'amp-foo');
+      nodeInEmbedWin,
+      'foo',
+      'amp-foo'
+    );
     installServiceInEmbedScope(embedWin, 'foo', service);
     return promise.then(returned => {
       expect(returned).to.equal(service);
@@ -405,20 +467,34 @@ describes.fakeWin('in embed scope', {amp: true}, env => {
 
   it('should return ampdoc-scope service if node in top window', () => {
     markElementScheduledForTesting(win, 'amp-foo');
-    registerServiceBuilderForDoc(nodeInTopWin, 'foo', () => service,
-        /* opt_instantiate */ true);
+    registerServiceBuilderForDoc(
+      nodeInTopWin,
+      'foo',
+      () => service,
+      /* opt_instantiate */ true
+    );
     return getElementServiceIfAvailableForDocInEmbedScope(
-        nodeInTopWin, 'foo', 'amp-foo').then(returned => {
+      nodeInTopWin,
+      'foo',
+      'amp-foo'
+    ).then(returned => {
       expect(returned).to.equal(service);
     });
   });
 
   it('should NOT return ampdoc-scope service if node in embed window', () => {
     markElementScheduledForTesting(win, 'amp-foo');
-    registerServiceBuilderForDoc(nodeInTopWin, 'foo', () => service,
-        /* opt_instantiate */ true);
+    registerServiceBuilderForDoc(
+      nodeInTopWin,
+      'foo',
+      () => service,
+      /* opt_instantiate */ true
+    );
     return getElementServiceIfAvailableForDocInEmbedScope(
-        nodeInEmbedWin, 'foo', 'amp-foo').then(returned => {
+      nodeInEmbedWin,
+      'foo',
+      'amp-foo'
+    ).then(returned => {
       expect(returned).to.be.null;
     });
   });
diff --git a/test/unit/test-error.js b/test/unit/test-error.js
index 860360aa419b..e90b4935510b 100644
--- a/test/unit/test-error.js
+++ b/test/unit/test-error.js
@@ -29,10 +29,7 @@ import {
   reportErrorToAnalytics,
   reportErrorToServerOrViewer,
 } from '../../src/error';
-import {
-  getMode,
-  getRtvVersionForTesting,
-} from '../../src/mode';
+import {getMode, getRtvVersionForTesting} from '../../src/mode';
 import {
   resetExperimentTogglesForTesting,
   toggleExperiment,
@@ -93,8 +90,7 @@ describes.fakeWin('installErrorReporting', {}, env => {
   });
 
   it('should ignore blockByConsent', () => {
-    rejectedPromiseEvent.reason = rejectedPromiseError =
-        blockedByConsentError();
+    rejectedPromiseEvent.reason = rejectedPromiseError = blockedByConsentError();
     win.eventListeners.fire(rejectedPromiseEvent);
     expect(rejectedPromiseError.reported).to.be.not.be.ok;
     expect(rejectedPromiseEventCancelledSpy).to.be.calledOnce;
@@ -109,8 +105,13 @@ describe('reportErrorToServerOrViewer', () => {
   let sendMessageStub;
   let createXhr;
 
-  const data = getErrorReportData(undefined, undefined, undefined, undefined,
-      new Error('XYZ', false));
+  const data = getErrorReportData(
+    undefined,
+    undefined,
+    undefined,
+    undefined,
+    new Error('XYZ', false)
+  );
 
   beforeEach(() => {
     sandbox = sinon.sandbox;
@@ -142,61 +143,62 @@ describe('reportErrorToServerOrViewer', () => {
 
   it('should report to server if AMP doc is not single', () => {
     ampdocServiceForStub.returns({isSingleDoc: () => false});
-    return reportErrorToServerOrViewer(win, data)
-        .then(() => {
-          expect(createXhr).to.be.calledOnce;
-          expect(sendMessageStub).to.not.have.been.called;
-        });
+    return reportErrorToServerOrViewer(win, data).then(() => {
+      expect(createXhr).to.be.calledOnce;
+      expect(sendMessageStub).to.not.have.been.called;
+    });
   });
 
   it('should report to server if AMP doc is not opted in', () => {
-    const nonOptedInDoc =
-      window.document.implementation.createHTMLDocument('');
+    const nonOptedInDoc = window.document.implementation.createHTMLDocument('');
     ampdocServiceForStub.returns({
       isSingleDoc: () => true,
       getAmpDoc: () => ({getRootNode: () => nonOptedInDoc}),
     });
-    return reportErrorToServerOrViewer(win, data)
-        .then(() => {
-          expect(createXhr).to.be.calledOnce;
-          expect(sendMessageStub).to.not.have.been.called;
-        });
+    return reportErrorToServerOrViewer(win, data).then(() => {
+      expect(createXhr).to.be.calledOnce;
+      expect(sendMessageStub).to.not.have.been.called;
+    });
   });
 
   it('should report to server if viewer is not capable', () => {
-    sandbox.stub(viewer, 'hasCapability').withArgs('errorReporting')
-        .returns(false);
-    return reportErrorToServerOrViewer(win, data)
-        .then(() => {
-          expect(createXhr).to.be.calledOnce;
-          expect(sendMessageStub).to.not.have.been.called;
-        });
+    sandbox
+      .stub(viewer, 'hasCapability')
+      .withArgs('errorReporting')
+      .returns(false);
+    return reportErrorToServerOrViewer(win, data).then(() => {
+      expect(createXhr).to.be.calledOnce;
+      expect(sendMessageStub).to.not.have.been.called;
+    });
   });
 
   it('should report to server if viewer is not trusted', () => {
     sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(false));
-    return reportErrorToServerOrViewer(win, data)
-        .then(() => {
-          expect(createXhr).to.be.calledOnce;
-          expect(sendMessageStub).to.not.have.been.called;
-        });
+    return reportErrorToServerOrViewer(win, data).then(() => {
+      expect(createXhr).to.be.calledOnce;
+      expect(sendMessageStub).to.not.have.been.called;
+    });
   });
 
-  it('should report to viewer with message named `error` with stripped down '
-    + 'error data set', () => {
-    return reportErrorToServerOrViewer(win, data)
-        .then(() => {
-          expect(createXhr).to.not.have.been.called;
-          expect(sendMessageStub).to.have.been
-              .calledWith('error', errorReportingDataForViewer(data));
-          expect(data['m']).to.not.be.undefined;
-          expect(data['a']).to.not.be.undefined;
-          expect(data['s']).to.not.be.undefined;
-          expect(data['el']).to.not.be.undefined;
-          expect(data['v']).to.not.be.undefined;
-          expect(data['jse']).to.not.be.undefined;
-        });
-  });
+  it(
+    'should report to viewer with message named `error` with stripped down ' +
+      'error data set',
+    () => {
+      return reportErrorToServerOrViewer(win, data).then(() => {
+        expect(createXhr).to.not.have.been.called;
+        expect(sendMessageStub).to.have.been.calledWith(
+          'error',
+          errorReportingDataForViewer(data)
+        );
+        expect(data['m']).to.not.be.undefined;
+        expect(data['a']).to.not.be.undefined;
+        expect(data['s']).to.not.be.undefined;
+        expect(data['el']).to.not.be.undefined;
+        expect(data['v']).to.not.be.undefined;
+        expect(data['jse']).to.not.be.undefined;
+      });
+    }
+  );
 });
 
 describe('getErrorReportData', () => {
@@ -224,8 +226,14 @@ describe('getErrorReportData', () => {
     if (!e.stack || e.stack.indexOf('SHOULD_BE_IN_STACK') == -1) {
       e.stack = 'SHOULD_BE_IN_STACK';
     }
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      true
+    );
     expect(data.m).to.equal('XYZ');
     expect(data.el).to.equal('u');
     expect(data.a).to.equal('0');
@@ -245,8 +253,14 @@ describe('getErrorReportData', () => {
   it('reportError with error and ignore stack', () => {
     const e = new Error('XYZ');
     e.ignoreStack = true;
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      true
+    );
     expect(data.m).to.equal('XYZ');
     expect(data.el).to.equal('u');
     expect(data.a).to.equal('0');
@@ -257,22 +271,38 @@ describe('getErrorReportData', () => {
   it('reportError with error object w/args', () => {
     const e = new Error('XYZ');
     e.args = {x: 1};
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      true
+    );
     expect(data.args).to.equal(JSON.stringify({x: 1}));
   });
 
   it('reportError with a string instead of error', () => {
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        'string error',
-        true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      'string error',
+      true
+    );
     expect(data.m).to.equal('string error');
   });
 
   it('reportError with no error', () => {
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        undefined,
-        true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      true
+    );
     expect(data.m).to.equal('Unknown error');
   });
 
@@ -280,13 +310,20 @@ describe('getErrorReportData', () => {
     const e = new Error('XYZ');
     const el = document.createElement('foo-bar');
     e.associatedElement = el;
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, false);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      false
+    );
     expect(data.m).to.equal('XYZ');
     expect(data.el).to.equal('FOO-BAR');
     expect(data.a).to.equal('0');
     expect(data.v).to.equal(
-        getRtvVersionForTesting(window, getMode().localDev));
+      getRtvVersionForTesting(window, getMode().localDev)
+    );
     expect(data.noAmp).to.equal('0');
   });
 
@@ -297,12 +334,18 @@ describe('getErrorReportData', () => {
     } catch (error) {
       e = error;
     }
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data.m).to.equal('XYZ');
     expect(data.a).to.equal('1');
     expect(data.v).to.equal(
-        getRtvVersionForTesting(window, getMode().localDev));
+      getRtvVersionForTesting(window, getMode().localDev)
+    );
   });
 
   it('reportError mark asserts without error object', () => {
@@ -316,7 +359,8 @@ describe('getErrorReportData', () => {
     expect(data.m).to.equal('XYZ');
     expect(data.a).to.equal('1');
     expect(data.v).to.equal(
-        getRtvVersionForTesting(window, getMode().localDev));
+      getRtvVersionForTesting(window, getMode().localDev)
+    );
   });
 
   it('reportError marks 3p', () => {
@@ -325,8 +369,13 @@ describe('getErrorReportData', () => {
     };
     const e = new Error('XYZ');
     e.fromAssert = true;
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data.m).to.equal('XYZ');
     expect(data['3p']).to.equal('1');
   });
@@ -338,8 +387,13 @@ describe('getErrorReportData', () => {
     };
     const e = new Error('XYZ');
     e.fromAssert = true;
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data.m).to.equal('XYZ');
     expect(data['ca']).to.equal('1');
     expect(data['vs']).to.equal('some-state');
@@ -352,8 +406,13 @@ describe('getErrorReportData', () => {
       };
       const e = new Error('XYZ');
       e.fromAssert = true;
-      const data = getErrorReportData(undefined, undefined, undefined,
-          undefined, e);
+      const data = getErrorReportData(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        e
+      );
       expect(data['spt']).to.equal('sp');
     });
 
@@ -363,8 +422,13 @@ describe('getErrorReportData', () => {
       };
       const e = new Error('XYZ');
       e.fromAssert = true;
-      const data = getErrorReportData(undefined, undefined, undefined,
-          undefined, e);
+      const data = getErrorReportData(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        e
+      );
       expect(data['spt']).to.equal('mp');
     });
 
@@ -374,8 +438,13 @@ describe('getErrorReportData', () => {
       };
       const e = new Error('XYZ');
       e.fromAssert = true;
-      const data = getErrorReportData(undefined, undefined, undefined,
-          undefined, e);
+      const data = getErrorReportData(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        e
+      );
       expect(data['spt']).to.equal('esm');
     });
 
@@ -383,8 +452,13 @@ describe('getErrorReportData', () => {
       window.AMP_CONFIG = {};
       const e = new Error('XYZ');
       e.fromAssert = true;
-      const data = getErrorReportData(undefined, undefined, undefined,
-          undefined, e);
+      const data = getErrorReportData(
+        undefined,
+        undefined,
+        undefined,
+        undefined,
+        e
+      );
       expect(data['spt']).to.be.undefined;
     });
   });
@@ -394,8 +468,13 @@ describe('getErrorReportData', () => {
       type: 'canary',
     };
     const e = new Error('XYZ');
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data.m).to.equal('XYZ');
     expect(data['bt']).to.equal('canary');
 
@@ -403,15 +482,25 @@ describe('getErrorReportData', () => {
       type: 'control',
     };
     const e1 = new Error('XYZ');
-    const data1 = getErrorReportData(undefined, undefined, undefined, undefined,
-        e1);
+    const data1 = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e1
+    );
     expect(data1.m).to.equal('XYZ');
     expect(data1['bt']).to.equal('control');
 
     window.AMP_CONFIG = {};
     const e2 = new Error('ABC');
-    const data2 = getErrorReportData(undefined, undefined, undefined, undefined,
-        e2);
+    const data2 = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e2
+    );
     expect(data2.m).to.equal('ABC');
     expect(data2['bt']).to.equal('unknown');
   });
@@ -425,20 +514,43 @@ describe('getErrorReportData', () => {
   });
 
   it('should accumulate errors', () => {
-    getErrorReportData(undefined, undefined, undefined, undefined,
-        new Error('1'),true);
-    getErrorReportData(undefined, undefined, undefined, undefined,
-        new Error('2'),true);
-    const data = getErrorReportData(undefined, undefined, undefined,
-        undefined, new Error('3'),true);
+    getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      new Error('1'),
+      true
+    );
+    getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      new Error('2'),
+      true
+    );
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      new Error('3'),
+      true
+    );
     expect(data.m).to.equal('3');
     expect(data.ae).to.equal('1,2');
   });
 
   it('should not double report', () => {
     const e = new Error('something _reported_');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.undefined;
   });
 
@@ -465,8 +577,13 @@ describe('getErrorReportData', () => {
 
   it('reportError with error object', () => {
     const e = cancellation();
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.undefined;
   });
 
@@ -478,24 +595,39 @@ describe('getErrorReportData', () => {
     } catch (error) {
       e = error;
     }
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.undefined;
   });
 
   it('should not report load errors', () => {
     nextRandomNumber = 1e-3 + 1e-4;
     const e = new Error('Failed to load:');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.undefined;
   });
 
   it('should report throttled load errors at threshold', () => {
     nextRandomNumber = 1e-3;
     const e = new Error('Failed to load:');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.ok;
     expect(data.ex).to.equal('1');
   });
@@ -503,34 +635,54 @@ describe('getErrorReportData', () => {
   it('should not report Script errors', () => {
     nextRandomNumber = 1e-3 + 1e-4;
     const e = new Error('Script error.');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.undefined;
   });
 
   it('should report throttled Script errors at threshold', () => {
     nextRandomNumber = 1e-3;
     const e = new Error('Script error.');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.ok;
     expect(data.ex).to.contain('1');
   });
 
-
   it('should report throttled load errors under threshold', () => {
     nextRandomNumber = 1e-3 - 1e-4;
     const e = new Error('Failed to load:');
-    const data =
-        getErrorReportData(undefined, undefined, undefined, undefined, e);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e
+    );
     expect(data).to.be.ok;
     expect(data.ex).to.contain('1');
   });
 
   it('should omit the error stack for user errors', () => {
     const e = user().createError('123');
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      true
+    );
     expect(data.s).to.be.undefined;
   });
 
@@ -542,8 +694,14 @@ describe('getErrorReportData', () => {
     toggleExperiment(window, 'disabled-exp', true);
     toggleExperiment(window, 'disabled-exp', false);
     const e = user().createError('123');
-    const data = getErrorReportData(undefined, undefined, undefined, undefined,
-        e, true);
+    const data = getErrorReportData(
+      undefined,
+      undefined,
+      undefined,
+      undefined,
+      e,
+      true
+    );
     expect(data.exps).to.equal('test-exp=1,disabled-exp=0');
   });
 
@@ -567,7 +725,7 @@ describe('getErrorReportData', () => {
       }
     });
 
-    it('should let AMP\'s JS pass', () => {
+    it("should let AMP's JS pass", () => {
       expect(detectNonAmpJs(win)).to.be.false;
     });
 
@@ -598,7 +756,6 @@ describe('getErrorReportData', () => {
   });
 });
 
-
 describes.sandboxed('reportError', {}, () => {
   let clock;
 
@@ -656,44 +813,63 @@ describe.configure().run('detectJsEngineFromStack', () => {
   // Note that these are not true of every case. You can emulate iOS Safari
   // on Desktop Chrome and break this. These tests are explicitly for
   // SauceLabs, which runs does not masquerade with UserAgent.
-  describe.configure().ifIos().run('on iOS', () => {
-    it.configure().ifSafari().run('detects safari as safari', () => {
-      expect(detectJsEngineFromStack()).to.equal('Safari');
-    });
+  describe
+    .configure()
+    .ifIos()
+    .run('on iOS', () => {
+      it.configure()
+        .ifSafari()
+        .run('detects safari as safari', () => {
+          expect(detectJsEngineFromStack()).to.equal('Safari');
+        });
 
-    it.configure().ifChrome().run('detects chrome as safari', () => {
-      expect(detectJsEngineFromStack()).to.equal('Safari');
-    });
+      it.configure()
+        .ifChrome()
+        .run('detects chrome as safari', () => {
+          expect(detectJsEngineFromStack()).to.equal('Safari');
+        });
 
-    it.configure().ifFirefox().run('detects firefox as safari', () => {
-      expect(detectJsEngineFromStack()).to.equal('Safari');
+      it.configure()
+        .ifFirefox()
+        .run('detects firefox as safari', () => {
+          expect(detectJsEngineFromStack()).to.equal('Safari');
+        });
     });
-  });
 
-  describe.configure().skipIos().run('on other OSs', () => {
-    it.configure().ifSafari().run('detects safari as safari', () => {
-      expect(detectJsEngineFromStack()).to.equal('Safari');
-    });
+  describe
+    .configure()
+    .skipIos()
+    .run('on other OSs', () => {
+      it.configure()
+        .ifSafari()
+        .run('detects safari as safari', () => {
+          expect(detectJsEngineFromStack()).to.equal('Safari');
+        });
 
-    it.configure().ifChrome().run('detects chrome as chrome', () => {
-      expect(detectJsEngineFromStack()).to.equal('Chrome');
-    });
+      it.configure()
+        .ifChrome()
+        .run('detects chrome as chrome', () => {
+          expect(detectJsEngineFromStack()).to.equal('Chrome');
+        });
 
-    it.configure().ifFirefox().run('detects firefox as firefox', () => {
-      expect(detectJsEngineFromStack()).to.equal('Firefox');
-    });
+      it.configure()
+        .ifFirefox()
+        .run('detects firefox as firefox', () => {
+          expect(detectJsEngineFromStack()).to.equal('Firefox');
+        });
 
-    it.configure().ifEdge().run('detects edge as IE', () => {
-      expect(detectJsEngineFromStack()).to.equal('IE');
+      it.configure()
+        .ifEdge()
+        .run('detects edge as IE', () => {
+          expect(detectJsEngineFromStack()).to.equal('IE');
+        });
     });
-  });
 });
 
-
 describes.fakeWin('user error reporting', {amp: true}, env => {
   let win;
   let sandbox;
-  const error = new Error('ERROR','user error');
+  const error = new Error('ERROR', 'user error');
   let analyticsEventSpy;
 
   beforeEach(() => {
@@ -707,8 +883,9 @@ describes.fakeWin('user error reporting', {amp: true}, env => {
     reportErrorToAnalytics(error, win);
     expect(analyticsEventSpy).to.have.been.called;
     expect(analyticsEventSpy).to.have.been.calledWith(
-        sinon.match.any,
-        'user-error',
-        {errorName: error.name, errorMessage: error.message});
+      sinon.match.any,
+      'user-error',
+      {errorName: error.name, errorMessage: error.message}
+    );
   });
 });
diff --git a/test/unit/test-event-helper.js b/test/unit/test-event-helper.js
index 797893321e58..ff7ac8b1abba 100644
--- a/test/unit/test-event-helper.js
+++ b/test/unit/test-event-helper.js
@@ -29,7 +29,6 @@ import {
 } from '../../src/event-helper-listen';
 
 describe('EventHelper', () => {
-
   function getEvent(name, target) {
     const event = document.createEvent('Event');
     event.initEvent(name, true, true);
@@ -203,27 +202,40 @@ describe('EventHelper', () => {
   });
 
   it('loadPromise - error event', () => {
-    const promise = loadPromise(element).then(result => {
-      assert.fail('must never be here: ' + result);
-    }).then(() => {
-      throw new Error('Should not be reached.');
-    }, reason => {
-      expect(reason.message).to.include('Failed to load');
-    });
+    const promise = loadPromise(element)
+      .then(result => {
+        assert.fail('must never be here: ' + result);
+      })
+      .then(
+        () => {
+          throw new Error('Should not be reached.');
+        },
+        reason => {
+          expect(reason.message).to.include('Failed to load');
+        }
+      );
     errorObservable.fire(getEvent('error', element));
     return promise;
   });
 
   it('should polyfill CustomEvent constructor', () => {
-    const native = createCustomEvent(window, 'foo', {bar: 123},
-        {bubbles: true, cancelable: true});
+    const native = createCustomEvent(
+      window,
+      'foo',
+      {bar: 123},
+      {bubbles: true, cancelable: true}
+    );
     expect(native.type).to.equal('foo');
     expect(native.detail).to.deep.equal({bar: 123});
     expect(native.bubbles).to.be.true;
     expect(native.cancelable).to.be.true;
 
-    const polyfilled = createCustomEvent({document}, 'foo', {bar: 123},
-        {bubbles: true, cancelable: true});
+    const polyfilled = createCustomEvent(
+      {document},
+      'foo',
+      {bar: 123},
+      {bubbles: true, cancelable: true}
+    );
     expect(polyfilled.type).to.equal('foo');
     expect(polyfilled.detail).to.deep.equal({bar: 123});
     expect(polyfilled.bubbles).to.be.true;
@@ -258,12 +270,13 @@ describe('EventHelper', () => {
       }
     };
     // Simulate an addEventListener that accepts options
-    addEventListenerStub = sandbox.stub(self, 'addEventListener').callsFake(
-        eventListenerStubAcceptOpts);
+    addEventListenerStub = sandbox
+      .stub(self, 'addEventListener')
+      .callsFake(eventListenerStubAcceptOpts);
     // Simulate a removeEventListener that accepts options
-    removeEventListenerStub =
-        sandbox.stub(self, 'removeEventListener').callsFake(
-            eventListenerStubAcceptOpts);
+    removeEventListenerStub = sandbox
+      .stub(self, 'removeEventListener')
+      .callsFake(eventListenerStubAcceptOpts);
     resetEvtListenerOptsSupportForTesting();
     expect(detectEvtListenerOptsSupport()).to.be.true;
     expect(addEventListenerStub.called).to.be.true;
@@ -289,12 +302,13 @@ describe('EventHelper', () => {
       }
     };
     // Simulate an addEventListener that does not accept options
-    addEventListenerStub = sandbox.stub(self, 'addEventListener').callsFake(
-        eventListenerStubRejectOpts);
+    addEventListenerStub = sandbox
+      .stub(self, 'addEventListener')
+      .callsFake(eventListenerStubRejectOpts);
     // Simulate a removeEventListener that does not accept options
-    removeEventListenerStub =
-        sandbox.stub(self, 'removeEventListener').callsFake(
-            eventListenerStubRejectOpts);
+    removeEventListenerStub = sandbox
+      .stub(self, 'removeEventListener')
+      .callsFake(eventListenerStubRejectOpts);
     resetEvtListenerOptsSupportForTesting();
     expect(detectEvtListenerOptsSupport()).to.be.false;
     expect(addEventListenerStub.called).to.be.true;
@@ -302,5 +316,4 @@ describe('EventHelper', () => {
     expect(detectEvtListenerOptsSupport()).to.be.false;
     expect(removeEventListenerStub.calledOnce).to.be.true;
   });
-
 });
diff --git a/test/unit/test-experiments.js b/test/unit/test-experiments.js
index 070e9ff69b56..52f2c422dc91 100644
--- a/test/unit/test-experiments.js
+++ b/test/unit/test-experiments.js
@@ -121,11 +121,10 @@ describe('isExperimentOn', () => {
   function expectExperiment(cookieString, experimentId) {
     resetExperimentTogglesForTesting(win);
     win.document.cookie = cookieString;
-    return expect(isExperimentOn(win, /*OK*/experimentId));
+    return expect(isExperimentOn(win, /*OK*/ experimentId));
   }
 
   describe('with only cookie flag', () => {
-
     it('should return "off" with no cookies, malformed or empty', () => {
       expectExperiment(null, 'e1').to.be.false;
       expectExperiment(undefined, 'e1').to.be.false;
@@ -154,7 +153,6 @@ describe('isExperimentOn', () => {
   });
 
   describe('with global flag', () => {
-
     it('should prioritize cookie flag', () => {
       win.AMP_CONFIG['e1'] = true;
       expectExperiment('AMP_EXP=e1', 'e1').to.be.true;
@@ -214,7 +212,6 @@ describe('isExperimentOn', () => {
 });
 
 describe('toggleExperiment', () => {
-
   let sandbox;
   let clock;
   let expTime;
@@ -236,13 +233,17 @@ describe('toggleExperiment', () => {
       cookie: cookiesString,
     };
     resetExperimentTogglesForTesting(window);
-    const on = toggleExperiment({
-      document: doc,
-      location: {
-        hostname: 'test.test',
-        href: 'https://test.test/test.html',
+    const on = toggleExperiment(
+      {
+        document: doc,
+        location: {
+          hostname: 'test.test',
+          href: 'https://test.test/test.html',
+        },
       },
-    }, experimentId, opt_on);
+      experimentId,
+      opt_on
+    );
     const parts = doc.cookie.split(/\s*;\s*/g);
     if (parts.length > 1) {
       expect(parts[1]).to.equal('path=/');
@@ -276,8 +277,9 @@ describe('toggleExperiment', () => {
   });
 
   it('should set "off" when requested', () => {
-    expectToggle(
-        'AMP_EXP=e2,e1', 'e1', false).to.equal('false; AMP_EXP=e2,-e1');
+    expectToggle('AMP_EXP=e2,e1', 'e1', false).to.equal(
+      'false; AMP_EXP=e2,-e1'
+    );
     expectToggle('AMP_EXP=e1', 'e1', false).to.equal('false; AMP_EXP=-e1');
   });
 
@@ -325,16 +327,25 @@ describe('toggleExperiment', () => {
     toggleExperiment(win, 'e3', true, undefined);
     toggleExperiment(win, 'e4', undefined, false);
 
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.not.have.property('transient');
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e1', true);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e2', true);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e3', true);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e4', true);
+    expect(getExperimentToglesFromCookieForTesting(win)).to.not.have.property(
+      'transient'
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e1',
+      true
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e2',
+      true
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e3',
+      true
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e4',
+      true
+    );
 
     // All of those experiment states should be durable in the window
     // environment.
@@ -350,16 +361,25 @@ describe('toggleExperiment', () => {
     toggleExperiment(win, 'e3', false, undefined);
     toggleExperiment(win, 'e4', undefined, false);
 
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.not.have.property('transient');
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e1', false);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e2', false);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e3', false);
-    expect(getExperimentToglesFromCookieForTesting(win))
-        .to.have.property('e4', false);
+    expect(getExperimentToglesFromCookieForTesting(win)).to.not.have.property(
+      'transient'
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e1',
+      false
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e2',
+      false
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e3',
+      false
+    );
+    expect(getExperimentToglesFromCookieForTesting(win)).to.have.property(
+      'e4',
+      false
+    );
 
     expect(isExperimentOn(win, 'transient'), 'transient is on').to.be.false;
     expect(isExperimentOn(win, 'e1'), 'e1 is on').to.be.false;
@@ -464,7 +484,6 @@ describe('toggleExperiment', () => {
 });
 
 describes.realWin('meta override', {}, env => {
-
   let win;
 
   beforeEach(() => {
@@ -479,10 +498,11 @@ describes.realWin('meta override', {}, env => {
     };
 
     win.document.head.appendChild(
-        createElementWithAttributes(win.document, 'meta', {
-          name: 'amp-experiments-opt-in',
-          content: 'e1,e2,e3',
-        }));
+      createElementWithAttributes(win.document, 'meta', {
+        name: 'amp-experiments-opt-in',
+        content: 'e1,e2,e3',
+      })
+    );
 
     resetExperimentTogglesForTesting(window);
 
@@ -500,7 +520,6 @@ describes.realWin('meta override', {}, env => {
 });
 
 describes.fakeWin('url override', {}, env => {
-
   let win;
 
   beforeEach(() => {
@@ -516,8 +535,8 @@ describes.fakeWin('url override', {}, env => {
       e5: 1,
     };
     delete win.location.originalHash;
-    win.location.href = '#e-e1=1&e-e2=1&e-e3=1&e-e4=0&e-e5=0&e-e6=0&e-e7=1' +
-        '&e-e8=0';
+    win.location.href =
+      '#e-e1=1&e-e2=1&e-e3=1&e-e4=0&e-e5=0&e-e6=0&e-e7=1&e-e8=0';
     win.document.cookie = 'AMP_EXP=-e7,e8';
 
     resetExperimentTogglesForTesting(window);
@@ -551,7 +570,6 @@ describes.fakeWin('url override', {}, env => {
 });
 
 describe('isCanary', () => {
-
   it('should return value based on binary version', () => {
     const win = {
       AMP_CONFIG: {
@@ -587,7 +605,6 @@ describe('getBinaryType', () => {
 });
 
 describe('experiment branch tests', () => {
-
   describe('#randomlySelectUnsetExperiments', () => {
     let sandbox;
     let accurateRandomStub;
@@ -629,8 +646,10 @@ describe('experiment branch tests', () => {
       // Opt out of experiment.
       toggleExperiment(sandbox.win, 'testExperimentId', false, true);
       randomlySelectUnsetExperiments(sandbox.win, {});
-      expect(isExperimentOn(sandbox.win, 'testExperimentId'),
-          'experiment is on').to.be.false;
+      expect(
+        isExperimentOn(sandbox.win, 'testExperimentId'),
+        'experiment is on'
+      ).to.be.false;
       expect(sandbox.win.experimentBranches).to.be.empty;
     });
 
@@ -638,10 +657,11 @@ describe('experiment branch tests', () => {
       // Opt out of experiment.
       toggleExperiment(sandbox.win, 'testExperimentId', false, true);
       randomlySelectUnsetExperiments(sandbox.win, testExperimentSet);
-      expect(isExperimentOn(sandbox.win, 'testExperimentId'),
-          'experiment is on').to.be.false;
-      expect(getExperimentBranch(sandbox.win,
-          'testExperimentId')).to.not.be.ok;
+      expect(
+        isExperimentOn(sandbox.win, 'testExperimentId'),
+        'experiment is on'
+      ).to.be.false;
+      expect(getExperimentBranch(sandbox.win, 'testExperimentId')).to.not.be.ok;
     });
 
     it('handles experiment diverted path 1', () => {
@@ -651,10 +671,13 @@ describe('experiment branch tests', () => {
       // return a value < 0.5.
       RANDOM_NUMBER_GENERATORS.accuratePrng.onFirstCall().returns(0.3);
       randomlySelectUnsetExperiments(sandbox.win, testExperimentSet);
-      expect(isExperimentOn(sandbox.win, 'testExperimentId'),
-          'experiment is on').to.be.true;
+      expect(
+        isExperimentOn(sandbox.win, 'testExperimentId'),
+        'experiment is on'
+      ).to.be.true;
       expect(getExperimentBranch(sandbox.win, 'testExperimentId')).to.equal(
-          'branch1_id');
+        'branch1_id'
+      );
     });
 
     it('handles experiment diverted path 2', () => {
@@ -664,10 +687,13 @@ describe('experiment branch tests', () => {
       // return a value > 0.5.
       RANDOM_NUMBER_GENERATORS.accuratePrng.onFirstCall().returns(0.6);
       randomlySelectUnsetExperiments(sandbox.win, testExperimentSet);
-      expect(isExperimentOn(sandbox.win, 'testExperimentId'),
-          'experiment is on').to.be.true;
+      expect(
+        isExperimentOn(sandbox.win, 'testExperimentId'),
+        'experiment is on'
+      ).to.be.true;
       expect(getExperimentBranch(sandbox.win, 'testExperimentId')).to.equal(
-          'branch2_id');
+        'branch2_id'
+      );
     });
 
     it('picks a branch if traffic eligible', () => {
@@ -675,7 +701,9 @@ describe('experiment branch tests', () => {
       sandbox.win.trafficEligible = true;
       const experimentInfo = {
         'expt_0': {
-          isTrafficEligible: win => { return win.trafficEligible; },
+          isTrafficEligible: win => {
+            return win.trafficEligible;
+          },
           branches: ['0_0', '0_1'],
         },
       };
@@ -685,12 +713,14 @@ describe('experiment branch tests', () => {
       expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal('0_0');
     });
 
-    it('doesn\'t pick a branch if traffic ineligible', () => {
+    it("doesn't pick a branch if traffic ineligible", () => {
       toggleExperiment(sandbox.win, 'expt_0', true, true);
       sandbox.win.trafficEligible = false;
       const experimentInfo = {
         'expt_0': {
-          isTrafficEligible: win => { return win.trafficEligible; },
+          isTrafficEligible: win => {
+            return win.trafficEligible;
+          },
           branches: ['0_0', '0_1'],
         },
       };
@@ -700,7 +730,7 @@ describe('experiment branch tests', () => {
       expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
     });
 
-    it('doesn\'t pick a branch if no traffic eligibility function', () => {
+    it("doesn't pick a branch if no traffic eligibility function", () => {
       toggleExperiment(sandbox.win, 'expt_0', true, true);
       const experimentInfo = {
         'expt_0': {
@@ -714,28 +744,33 @@ describe('experiment branch tests', () => {
       expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
     });
 
-    it('doesn\'t pick a branch if traffic becomes eligible after first ' +
-        'diversion', () => {
-      toggleExperiment(sandbox.win, 'expt_0', true, true);
-      sandbox.win.trafficEligible = false;
-      const experimentInfo = {
-        'expt_0': {
-          isTrafficEligible: win => { return win.trafficEligible; },
-          branches: ['0_0', '0_1'],
-        },
-      };
-      RANDOM_NUMBER_GENERATORS.accuratePrng.returns(0.3);
-
-      randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
-      expect(isExperimentOn(sandbox.win, 'expt_0')).to.be.true;
-      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
-
-      sandbox.win.trafficEligible = true;
-
-      randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
-      expect(isExperimentOn(sandbox.win, 'expt_0')).to.be.true;
-      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
-    });
+    it(
+      "doesn't pick a branch if traffic becomes eligible after first " +
+        'diversion',
+      () => {
+        toggleExperiment(sandbox.win, 'expt_0', true, true);
+        sandbox.win.trafficEligible = false;
+        const experimentInfo = {
+          'expt_0': {
+            isTrafficEligible: win => {
+              return win.trafficEligible;
+            },
+            branches: ['0_0', '0_1'],
+          },
+        };
+        RANDOM_NUMBER_GENERATORS.accuratePrng.returns(0.3);
+
+        randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
+        expect(isExperimentOn(sandbox.win, 'expt_0')).to.be.true;
+        expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
+
+        sandbox.win.trafficEligible = true;
+
+        randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
+        expect(isExperimentOn(sandbox.win, 'expt_0')).to.be.true;
+        expect(getExperimentBranch(sandbox.win, 'expt_0')).to.be.null;
+      }
+    );
 
     it('handles multiple experiments', () => {
       toggleExperiment(sandbox.win, 'expt_0', true, true);
@@ -760,20 +795,15 @@ describe('experiment branch tests', () => {
       };
       RANDOM_NUMBER_GENERATORS.accuratePrng.returns(0.6);
       randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
-      expect(isExperimentOn(sandbox.win, 'expt_0'),
-          'expt_0 is on').to.be.true;
-      expect(isExperimentOn(sandbox.win, 'expt_1'),
-          'expt_1 is on').to.be.false;
-      expect(isExperimentOn(sandbox.win, 'expt_2'),
-          'expt_2 is on').to.be.true;
+      expect(isExperimentOn(sandbox.win, 'expt_0'), 'expt_0 is on').to.be.true;
+      expect(isExperimentOn(sandbox.win, 'expt_1'), 'expt_1 is on').to.be.false;
+      expect(isExperimentOn(sandbox.win, 'expt_2'), 'expt_2 is on').to.be.true;
       // Note: calling isExperimentOn('expt_3') would actually evaluate the
       // frequency for expt_3, possibly enabling it.  Since we wanted it to be
       // omitted altogether, we'll evaluate it only via its branch.
-      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal(
-          '0_e');
+      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal('0_e');
       expect(getExperimentBranch(sandbox.win, 'expt_1')).to.not.be.ok;
-      expect(getExperimentBranch(sandbox.win, 'expt_2')).to.equal(
-          '2_e');
+      expect(getExperimentBranch(sandbox.win, 'expt_2')).to.equal('2_e');
       expect(getExperimentBranch(sandbox.win, 'expt_3')).to.not.be.ok;
     });
 
@@ -787,10 +817,8 @@ describe('experiment branch tests', () => {
       };
       RANDOM_NUMBER_GENERATORS.accuratePrng.returns(0.7);
       randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
-      expect(isExperimentOn(sandbox.win, 'expt_0'),
-          'expt_0 is on').to.be.true;
-      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal(
-          '0_3');
+      expect(isExperimentOn(sandbox.win, 'expt_0'), 'expt_0 is on').to.be.true;
+      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal('0_3');
     });
 
     it('handles multiple experiments with multi-way branches', () => {
@@ -816,20 +844,15 @@ describe('experiment branch tests', () => {
       RANDOM_NUMBER_GENERATORS.accuratePrng.onFirstCall().returns(0.7);
       RANDOM_NUMBER_GENERATORS.accuratePrng.onSecondCall().returns(0.3);
       randomlySelectUnsetExperiments(sandbox.win, experimentInfo);
-      expect(isExperimentOn(sandbox.win, 'expt_0'),
-          'expt_0 is on').to.be.true;
-      expect(isExperimentOn(sandbox.win, 'expt_1'),
-          'expt_1 is on').to.be.false;
-      expect(isExperimentOn(sandbox.win, 'expt_2'),
-          'expt_2 is on').to.be.true;
+      expect(isExperimentOn(sandbox.win, 'expt_0'), 'expt_0 is on').to.be.true;
+      expect(isExperimentOn(sandbox.win, 'expt_1'), 'expt_1 is on').to.be.false;
+      expect(isExperimentOn(sandbox.win, 'expt_2'), 'expt_2 is on').to.be.true;
       // Note: calling isExperimentOn('expt_3') would actually evaluate the
       // frequency for expt_3, possibly enabling it.  Since we wanted it to be
       // omitted altogether, we'll evaluate it only via its branch.
-      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal(
-          '0_3');
+      expect(getExperimentBranch(sandbox.win, 'expt_0')).to.equal('0_3');
       expect(getExperimentBranch(sandbox.win, 'expt_1')).to.not.be.ok;
-      expect(getExperimentBranch(sandbox.win, 'expt_2')).to.equal(
-          '2_1');
+      expect(getExperimentBranch(sandbox.win, 'expt_2')).to.equal('2_1');
       expect(getExperimentBranch(sandbox.win, 'expt_3')).to.not.be.ok;
     });
 
@@ -870,8 +893,10 @@ describe('experiment branch tests', () => {
       // force the control branch to be chosen by making the accurate PRNG
       // return a value < 0.5.
       RANDOM_NUMBER_GENERATORS.accuratePrng.onFirstCall().returns(0.3);
-      const exps =
-          randomlySelectUnsetExperiments(sandbox.win, testExperimentSet);
+      const exps = randomlySelectUnsetExperiments(
+        sandbox.win,
+        testExperimentSet
+      );
       expect(exps).to.deep.equal({'testExperimentId': 'branch1_id'});
     });
 
diff --git a/test/unit/test-exponential-backoff.js b/test/unit/test-exponential-backoff.js
index 719d6e3c4c72..d719d2b135be 100644
--- a/test/unit/test-exponential-backoff.js
+++ b/test/unit/test-exponential-backoff.js
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-import {exponentialBackoff, exponentialBackoffClock}
-  from '../../src/exponential-backoff';
-
+import {
+  exponentialBackoff,
+  exponentialBackoffClock,
+} from '../../src/exponential-backoff';
 
 describe('exponentialBackoff', () => {
-
   let sandbox;
   let clock;
 
diff --git a/test/unit/test-extension-analytics.js b/test/unit/test-extension-analytics.js
index 5122e0ea8049..1ccda6a7c6a5 100644
--- a/test/unit/test-extension-analytics.js
+++ b/test/unit/test-extension-analytics.js
@@ -29,481 +29,527 @@ import {
 import {macroTask} from '../../testing/yield';
 import {registerElement} from '../../src/service/custom-element-registry';
 
+describes.realWin(
+  'extension-analytics',
+  {
+    amp: true,
+  },
+  env => {
+    let timer;
+    let ampdoc;
+    let win;
 
-describes.realWin('extension-analytics', {
-  amp: true,
-}, env => {
-  let timer;
-  let ampdoc;
-  let win;
-
-  describe('insertAnalyticsElement', () => {
-    let sandbox;
-    class MockInstrumentation {
-    }
-
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-      timer = Services.timerFor(env.win);
-      ampdoc = env.ampdoc;
-      win = env.win;
-    });
+    describe('insertAnalyticsElement', () => {
+      let sandbox;
+      class MockInstrumentation {}
+
+      beforeEach(() => {
+        sandbox = sinon.sandbox;
+        timer = Services.timerFor(env.win);
+        ampdoc = env.ampdoc;
+        win = env.win;
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
 
-    afterEach(() => {
-      sandbox.restore();
+      [true, false].forEach(disableImmediate => {
+        it(
+          'should create analytics element if analytics is installed, ' +
+            `disableImmediate ${disableImmediate}`,
+          () => {
+            const config = {
+              'requests': {
+                'pageview': 'https://example.com/analytics',
+              },
+              'triggers': {
+                'trackPageview': {
+                  'on': 'visible',
+                  'request': 'pageview',
+                },
+              },
+            };
+            const ele = win.document.createElement('div');
+            win.document.body.appendChild(ele);
+            const baseEle = new BaseElement(ele);
+            registerServiceBuilderForDoc(
+              ampdoc,
+              'amp-analytics-instrumentation',
+              MockInstrumentation
+            );
+            // Force instantiation
+            getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
+            expect(baseEle.element.querySelector('amp-analytics')).to.be.null;
+            expect(
+              insertAnalyticsElement(
+                baseEle.element,
+                config,
+                true,
+                disableImmediate
+              )
+            ).to.be.ok;
+            return timer.promise(50).then(() => {
+              const analyticsEle = baseEle.element.querySelector(
+                'amp-analytics'
+              );
+              expect(analyticsEle).to.not.be.null;
+              expect(analyticsEle.getAttribute('sandbox')).to.equal('true');
+              expect(analyticsEle.getAttribute('trigger')).to.equal(
+                disableImmediate ? '' : 'immediate'
+              );
+              const script = analyticsEle.querySelector('script');
+              expect(script.textContent).to.jsonEqual(JSON.stringify(config));
+              expect(analyticsEle.CONFIG).to.jsonEqual(config);
+              expect(analyticsEle.getAttribute('sandbox')).to.equal('true');
+            });
+          }
+        );
+      });
     });
 
-    [true, false].forEach(disableImmediate => {
-      it('should create analytics element if analytics is installed, ' +
-          `disableImmediate ${disableImmediate}`, () => {
-        const config = {
+    describe('CustomEventReporterBuilder', () => {
+      let builder;
+      let parent;
+      let sandbox;
+
+      beforeEach(() => {
+        sandbox = sinon.sandbox;
+        parent = document.createElement('div');
+        builder = new CustomEventReporterBuilder(parent);
+      });
+
+      afterEach(() => {
+        sandbox.restore();
+      });
+
+      it('track event with one request', () => {
+        builder.track('test', 'fake.com');
+        expect(builder.config_).to.jsonEqual({
           'requests': {
-            'pageview': 'https://example.com/analytics',
+            'test-request-0': 'fake.com',
           },
           'triggers': {
-            'trackPageview': {
-              'on': 'visible',
-              'request': 'pageview',
+            'test': {
+              'on': 'test',
+              'request': ['test-request-0'],
             },
           },
-        };
-        const ele = win.document.createElement('div');
-        win.document.body.appendChild(ele);
-        const baseEle = new BaseElement(ele);
-        registerServiceBuilderForDoc(
-            ampdoc, 'amp-analytics-instrumentation', MockInstrumentation);
-        // Force instantiation
-        getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
-        expect(baseEle.element.querySelector('amp-analytics')).to.be.null;
-        expect(insertAnalyticsElement(
-            baseEle.element, config, true, disableImmediate)).to.be.ok;
-        return timer.promise(50).then(() => {
-          const analyticsEle = baseEle.element.querySelector('amp-analytics');
-          expect(analyticsEle).to.not.be.null;
-          expect(analyticsEle.getAttribute('sandbox')).to.equal('true');
-          expect(analyticsEle.getAttribute('trigger')).to.equal(
-              disableImmediate ? '' : 'immediate');
-          const script = (analyticsEle).querySelector('script');
-          expect(script.textContent).to.jsonEqual(JSON.stringify(config));
-          expect(analyticsEle.CONFIG).to.jsonEqual(config);
-          expect(analyticsEle.getAttribute('sandbox')).to.equal('true');
         });
       });
-    });
-  });
-
-  describe('CustomEventReporterBuilder', () => {
-    let builder;
-    let parent;
-    let sandbox;
 
-    beforeEach(() => {
-      sandbox = sinon.sandbox;
-      parent = document.createElement('div');
-      builder = new CustomEventReporterBuilder(parent);
-    });
-
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('track event with one request', () => {
-      builder.track('test', 'fake.com');
-      expect(builder.config_).to.jsonEqual({
-        'requests': {
-          'test-request-0': 'fake.com',
-        },
-        'triggers': {
-          'test': {
-            'on': 'test',
-            'request': ['test-request-0'],
+      it('track event with multiple request', () => {
+        builder.track('test', ['fake.com', 'fake1.com']);
+        expect(builder.config_).to.jsonEqual({
+          'requests': {
+            'test-request-0': 'fake.com',
+            'test-request-1': 'fake1.com',
           },
-        },
-      });
-    });
-
-    it('track event with multiple request', () => {
-      builder.track('test', ['fake.com', 'fake1.com']);
-      expect(builder.config_).to.jsonEqual({
-        'requests': {
-          'test-request-0': 'fake.com',
-          'test-request-1': 'fake1.com',
-        },
-        'triggers': {
-          'test': {
-            'on': 'test',
-            'request': ['test-request-0', 'test-request-1'],
+          'triggers': {
+            'test': {
+              'on': 'test',
+              'request': ['test-request-0', 'test-request-1'],
+            },
           },
-        },
+        });
       });
-    });
 
-    it('track multi event', () => {
-      builder.track('test', 'fake.com').track('test1', 'fake1.com');
-      expect(builder.config_).to.jsonEqual({
-        'requests': {
-          'test-request-0': 'fake.com',
-          'test1-request-0': 'fake1.com',
-        },
-        'triggers': {
-          'test': {
-            'on': 'test',
-            'request': ['test-request-0'],
+      it('track multi event', () => {
+        builder.track('test', 'fake.com').track('test1', 'fake1.com');
+        expect(builder.config_).to.jsonEqual({
+          'requests': {
+            'test-request-0': 'fake.com',
+            'test1-request-0': 'fake1.com',
           },
-          'test1': {
-            'on': 'test1',
-            'request': ['test1-request-0'],
+          'triggers': {
+            'test': {
+              'on': 'test',
+              'request': ['test-request-0'],
+            },
+            'test1': {
+              'on': 'test1',
+              'request': ['test1-request-0'],
+            },
           },
-        },
+        });
       });
-    });
-
-    it('should not add already tracked event', () => {
-      try {
-        builder.track('test', 'fake.com').track('test', 'example.com');
-      } catch (e) {
-        expect(e.message).to.equal(
-            'customEventReporterBuilder should not track same eventType twice');
-      }
-    });
-
-    it('should return a customEventReporter instance', () => {
-      parent.getResourceId = () => {return 1;};
-      parent.signals = () => {return {
-        whenSignal: () => {return Promise.resolve();},
-      };};
-      const reporter = builder.track('test', 'fake.com').build();
-      expect(reporter.trigger).to.exist;
-    });
 
-    it('Should allow to specify transport config', () => {
-      parent.getResourceId = () => { return 1; };
-      parent.signals = () => {
-        return {
-          whenSignal: () => { return Promise.resolve(); },
-        };
-      };
-      builder.setTransportConfig({
-        'beacon': true,
-        'image': true,
-        'xhrpost': false,
+      it('should not add already tracked event', () => {
+        try {
+          builder.track('test', 'fake.com').track('test', 'example.com');
+        } catch (e) {
+          expect(e.message).to.equal(
+            'customEventReporterBuilder should not track same eventType twice'
+          );
+        }
       });
 
-      const reporter = builder.build();
-      expect(reporter.config_.transport).to.jsonEqual({
-        'beacon': true,
-        'image': true,
-        'xhrpost': false,
+      it('should return a customEventReporter instance', () => {
+        parent.getResourceId = () => {
+          return 1;
+        };
+        parent.signals = () => {
+          return {
+            whenSignal: () => {
+              return Promise.resolve();
+            },
+          };
+        };
+        const reporter = builder.track('test', 'fake.com').build();
+        expect(reporter.trigger).to.exist;
       });
-    });
 
-    it('Should allow to specify extraUrlParams config', () => {
-      parent.getResourceId = () => { return 1; };
-      parent.signals = () => {
-        return {
-          whenSignal: () => { return Promise.resolve(); },
+      it('Should allow to specify transport config', () => {
+        parent.getResourceId = () => {
+          return 1;
         };
-      };
-      builder.setExtraUrlParams({
-        'a': 'b',
-      });
+        parent.signals = () => {
+          return {
+            whenSignal: () => {
+              return Promise.resolve();
+            },
+          };
+        };
+        builder.setTransportConfig({
+          'beacon': true,
+          'image': true,
+          'xhrpost': false,
+        });
 
-      const reporter = builder.build();
-      expect(reporter.config_.extraUrlParams).to.jsonEqual({
-        'a': 'b',
+        const reporter = builder.build();
+        expect(reporter.config_.transport).to.jsonEqual({
+          'beacon': true,
+          'image': true,
+          'xhrpost': false,
+        });
       });
-    });
-  });
-
-  describe('CustomEventReporter test', () => {
-    let builder;
-    let parentEle;
-    let reporter;
-    let sandbox;
-    let ampdoc;
-    let triggerEventSpy;
-
-    class MockInstrumentation {
-      triggerEventForTarget(nodeOrDoc, eventType, opt_vars) {
-        triggerEventSpy(nodeOrDoc, eventType, opt_vars);
-      }
-    }
-
-    beforeEach(() => {
-      ampdoc = env.ampdoc;
-      sandbox = sinon.sandbox;
-      triggerEventSpy = sandbox.spy();
-      resetServiceForTesting(env.win, 'amp-analytics-instrumentation');
-      registerServiceBuilderForDoc(
-          ampdoc, 'amp-analytics-instrumentation', MockInstrumentation);
-      // Force instantiation
-      getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
-
-      registerElement(env.win, 'amp-test', BaseElement);
-      parentEle = env.win.document.createElement('amp-test');
-      parentEle.setAttribute('layout', 'nodisplay');
-      env.win.document.body.appendChild(parentEle);
-      const buildPromise = parentEle.build();
-      builder = new CustomEventReporterBuilder(parentEle);
-      reporter = builder.track('test', 'fake.com').build();
-      return buildPromise;
-    });
 
-    afterEach(() => {
-      sandbox.restore();
-    });
-
-    it('replace eventType with new name', function* () {
-      parentEle.layoutCallback();
-      yield macroTask();
-      const element = parentEle.querySelector('amp-analytics');
-      expect(element).to.not.be.null;
-      const script = element.querySelector('script');
-      const id = parentEle.getResourceId();
-      expect(script.textContent).to.jsonEqual(JSON.stringify({
-        'requests': {
-          'test-request-0': 'fake.com',
-        },
-        'triggers': {
-          'test': {
-            'on': `sandbox-${id}-test`,
-            'request': ['test-request-0'],
-          },
-        },
-      }));
-    });
+      it('Should allow to specify extraUrlParams config', () => {
+        parent.getResourceId = () => {
+          return 1;
+        };
+        parent.signals = () => {
+          return {
+            whenSignal: () => {
+              return Promise.resolve();
+            },
+          };
+        };
+        builder.setExtraUrlParams({
+          'a': 'b',
+        });
 
-    it('trigger event with new name', function* () {
-      const id = parentEle.getResourceId();
-      reporter.trigger('test');
-      yield macroTask();
-      expect(triggerEventSpy).to.be.calledWith(parentEle, `sandbox-${id}-test`);
+        const reporter = builder.build();
+        expect(reporter.config_.extraUrlParams).to.jsonEqual({
+          'a': 'b',
+        });
+      });
     });
 
-    it('should not trigger not added event', function* () {
-      try {
-        reporter.trigger('fake');
-      } catch (e) {
-        expect(e.message).to.equal('Cannot trigger non initiated eventType');
+    describe('CustomEventReporter test', () => {
+      let builder;
+      let parentEle;
+      let reporter;
+      let sandbox;
+      let ampdoc;
+      let triggerEventSpy;
+
+      class MockInstrumentation {
+        triggerEventForTarget(nodeOrDoc, eventType, opt_vars) {
+          triggerEventSpy(nodeOrDoc, eventType, opt_vars);
+        }
       }
-    });
-  });
-
-  describe('useAnalyticsInSandbox', () => {
-    let parentEle;
-    let resolver;
-    const config = {
-      'requests': {
-        'pageview': 'https://example.com/analytics',
-      },
-      'triggers': {
-        'trackPageview': {
-          'on': 'visible',
-          'request': 'pageview',
-        },
-      },
-    };
-    const config2 = {
-      'requests': {
-        'pageview': 'https://example.com/analytics2',
-      },
-      'triggers': {
-        'trackPageview': {
-          'on': 'visible',
-          'request': 'pageview',
-        },
-      },
-    };
 
-    describe('parent does NOT relayout, call in buildCallback', () => {
       beforeEach(() => {
-        const promise = new Promise(resolve => {resolver = resolve;});
-        class TestElement extends BaseElement {
-          buildCallback() {
-            useAnalyticsInSandbox(this.element, promise);
-          }
-        }
-        registerElement(env.win, 'amp-test', TestElement);
+        ampdoc = env.ampdoc;
+        sandbox = sinon.sandbox;
+        triggerEventSpy = sandbox.spy();
+        resetServiceForTesting(env.win, 'amp-analytics-instrumentation');
+        registerServiceBuilderForDoc(
+          ampdoc,
+          'amp-analytics-instrumentation',
+          MockInstrumentation
+        );
+        // Force instantiation
+        getServiceForDoc(ampdoc, 'amp-analytics-instrumentation');
+
+        registerElement(env.win, 'amp-test', BaseElement);
         parentEle = env.win.document.createElement('amp-test');
         parentEle.setAttribute('layout', 'nodisplay');
         env.win.document.body.appendChild(parentEle);
-        return parentEle.build();
+        const buildPromise = parentEle.build();
+        builder = new CustomEventReporterBuilder(parentEle);
+        reporter = builder.track('test', 'fake.com').build();
+        return buildPromise;
       });
 
-      it('should insert analytics after LOAD_START', function* () {
-        resolver(config);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        parentEle.layoutCallback();
-        //parentEle.signals().signal(CommonSignals.LOAD_START);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+      afterEach(() => {
+        sandbox.restore();
       });
 
-      it('should insert analytics when config arrives late', function* () {
+      it('replace eventType with new name', function*() {
         parentEle.layoutCallback();
         yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        resolver(config);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+        const element = parentEle.querySelector('amp-analytics');
+        expect(element).to.not.be.null;
+        const script = element.querySelector('script');
+        const id = parentEle.getResourceId();
+        expect(script.textContent).to.jsonEqual(
+          JSON.stringify({
+            'requests': {
+              'test-request-0': 'fake.com',
+            },
+            'triggers': {
+              'test': {
+                'on': `sandbox-${id}-test`,
+                'request': ['test-request-0'],
+              },
+            },
+          })
+        );
       });
 
-      it('should remove analytics after UNLOAD', function* () {
-        resolver(config);
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
-        parentEle.unlayoutCallback();
+      it('trigger event with new name', function*() {
+        const id = parentEle.getResourceId();
+        reporter.trigger('test');
         yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        expect(triggerEventSpy).to.be.calledWith(
+          parentEle,
+          `sandbox-${id}-test`
+        );
       });
 
-      it('should NOT insert analytics after UNLOAD', function* () {
-        parentEle.layoutCallback();
-        yield macroTask();
-        parentEle.unlayoutCallback();
-        yield macroTask();
-        resolver(config);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
+      it('should not trigger not added event', function*() {
+        try {
+          reporter.trigger('fake');
+        } catch (e) {
+          expect(e.message).to.equal('Cannot trigger non initiated eventType');
+        }
       });
     });
 
-    describe('parent does NOT relayout, call in layoutCallback', () => {
-      beforeEach(() => {
-        const promise = new Promise(resolve => {resolver = resolve;});
-        class TestElement extends BaseElement {
-          layoutCallback() {
-            useAnalyticsInSandbox(this.element, promise);
-            return super.layoutCallback();
+    describe('useAnalyticsInSandbox', () => {
+      let parentEle;
+      let resolver;
+      const config = {
+        'requests': {
+          'pageview': 'https://example.com/analytics',
+        },
+        'triggers': {
+          'trackPageview': {
+            'on': 'visible',
+            'request': 'pageview',
+          },
+        },
+      };
+      const config2 = {
+        'requests': {
+          'pageview': 'https://example.com/analytics2',
+        },
+        'triggers': {
+          'trackPageview': {
+            'on': 'visible',
+            'request': 'pageview',
+          },
+        },
+      };
+
+      describe('parent does NOT relayout, call in buildCallback', () => {
+        beforeEach(() => {
+          const promise = new Promise(resolve => {
+            resolver = resolve;
+          });
+          class TestElement extends BaseElement {
+            buildCallback() {
+              useAnalyticsInSandbox(this.element, promise);
+            }
           }
-        }
-        registerElement(env.win, 'amp-test', TestElement);
-        parentEle = env.win.document.createElement('amp-test');
-        parentEle.setAttribute('layout', 'nodisplay');
-        env.win.document.body.appendChild(parentEle);
-        return parentEle.build();
-      });
+          registerElement(env.win, 'amp-test', TestElement);
+          parentEle = env.win.document.createElement('amp-test');
+          parentEle.setAttribute('layout', 'nodisplay');
+          env.win.document.body.appendChild(parentEle);
+          return parentEle.build();
+        });
 
-      it('should insert and remove analytics', function* () {
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        resolver(config);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
-        parentEle.unlayoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        it('should insert analytics after LOAD_START', function*() {
+          resolver(config);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          parentEle.layoutCallback();
+          //parentEle.signals().signal(CommonSignals.LOAD_START);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+        });
+
+        it('should insert analytics when config arrives late', function*() {
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          resolver(config);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+        });
+
+        it('should remove analytics after UNLOAD', function*() {
+          resolver(config);
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        });
+
+        it('should NOT insert analytics after UNLOAD', function*() {
+          parentEle.layoutCallback();
+          yield macroTask();
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          resolver(config);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        });
       });
-    });
 
-    describe('parent relayout, call in buildCallback', () => {
-      beforeEach(() => {
-        const promise = new Promise(resolve => {resolver = resolve;});
-        class TestElement extends BaseElement {
-          buildCallback() {
-            useAnalyticsInSandbox(this.element, promise);
+      describe('parent does NOT relayout, call in layoutCallback', () => {
+        beforeEach(() => {
+          const promise = new Promise(resolve => {
+            resolver = resolve;
+          });
+          class TestElement extends BaseElement {
+            layoutCallback() {
+              useAnalyticsInSandbox(this.element, promise);
+              return super.layoutCallback();
+            }
           }
-          unlayoutCallback() {
-            return true;
-          }
-        }
-        registerElement(env.win, 'amp-test', TestElement);
-        parentEle = env.win.document.createElement('amp-test');
-        parentEle.setAttribute('layout', 'nodisplay');
-        env.win.document.body.appendChild(parentEle);
-        return parentEle.build();
-      });
+          registerElement(env.win, 'amp-test', TestElement);
+          parentEle = env.win.document.createElement('amp-test');
+          parentEle.setAttribute('layout', 'nodisplay');
+          env.win.document.body.appendChild(parentEle);
+          return parentEle.build();
+        });
 
-      it('should NOT insert analytics when relayout', function* () {
-        resolver(config);
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
-        parentEle.unlayoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        it('should insert and remove analytics', function*() {
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          resolver(config);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        });
       });
 
-      it('should NOT insert when config arrives at relayout', function* () {
-        parentEle.layoutCallback();
-        parentEle.unlayoutCallback();
-        yield macroTask();
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        resolver(config);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
+      describe('parent relayout, call in buildCallback', () => {
+        beforeEach(() => {
+          const promise = new Promise(resolve => {
+            resolver = resolve;
+          });
+          class TestElement extends BaseElement {
+            buildCallback() {
+              useAnalyticsInSandbox(this.element, promise);
+            }
+            unlayoutCallback() {
+              return true;
+            }
+          }
+          registerElement(env.win, 'amp-test', TestElement);
+          parentEle = env.win.document.createElement('amp-test');
+          parentEle.setAttribute('layout', 'nodisplay');
+          env.win.document.body.appendChild(parentEle);
+          return parentEle.build();
+        });
+
+        it('should NOT insert analytics when relayout', function*() {
+          resolver(config);
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        });
+
+        it('should NOT insert when config arrives at relayout', function*() {
+          parentEle.layoutCallback();
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          resolver(config);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+        });
       });
-    });
 
-    describe('parent relayout, call in layoutCallback', () => {
-      beforeEach(() => {
-        class TestElement extends BaseElement {
-          layoutCallback() {
-            const promise = new Promise(resolve => {
-              resolver = resolve;
-            });
-            useAnalyticsInSandbox(this.element, promise);
-            return super.layoutCallback();
-          }
-          unlayoutCallback() {
-            return true;
+      describe('parent relayout, call in layoutCallback', () => {
+        beforeEach(() => {
+          class TestElement extends BaseElement {
+            layoutCallback() {
+              const promise = new Promise(resolve => {
+                resolver = resolve;
+              });
+              useAnalyticsInSandbox(this.element, promise);
+              return super.layoutCallback();
+            }
+            unlayoutCallback() {
+              return true;
+            }
           }
-        }
-        registerElement(env.win, 'amp-test', TestElement);
-        parentEle = env.win.document.createElement('amp-test');
-        parentEle.setAttribute('layout', 'nodisplay');
-        env.win.document.body.appendChild(parentEle);
-        return parentEle.build();
-      });
+          registerElement(env.win, 'amp-test', TestElement);
+          parentEle = env.win.document.createElement('amp-test');
+          parentEle.setAttribute('layout', 'nodisplay');
+          env.win.document.body.appendChild(parentEle);
+          return parentEle.build();
+        });
 
-      it('should insert analytics when relayout', function* () {
-        parentEle.layoutCallback();
-        resolver(config);
-        yield macroTask();
-        let element = parentEle.querySelector('amp-analytics');
-        expect(element).to.not.be.null;
-        let script = element.querySelector('script');
-        expect(script.textContent).to.jsonEqual(JSON.stringify(config));
-        parentEle.unlayoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        parentEle.layoutCallback();
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.be.null;
-        resolver(config2);
-        yield macroTask();
-        expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
-        element = parentEle.querySelector('amp-analytics');
-        expect(element).to.not.be.null;
-        script = element.querySelector('script');
-        expect(script.textContent).to.jsonEqual(JSON.stringify(config2));
-      });
+        it('should insert analytics when relayout', function*() {
+          parentEle.layoutCallback();
+          resolver(config);
+          yield macroTask();
+          let element = parentEle.querySelector('amp-analytics');
+          expect(element).to.not.be.null;
+          let script = element.querySelector('script');
+          expect(script.textContent).to.jsonEqual(JSON.stringify(config));
+          parentEle.unlayoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          parentEle.layoutCallback();
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.be.null;
+          resolver(config2);
+          yield macroTask();
+          expect(parentEle.querySelector('amp-analytics')).to.not.be.null;
+          element = parentEle.querySelector('amp-analytics');
+          expect(element).to.not.be.null;
+          script = element.querySelector('script');
+          expect(script.textContent).to.jsonEqual(JSON.stringify(config2));
+        });
 
-      it('should only insert with latest config', function* () {
-        parentEle.layoutCallback();
-        yield macroTask();
-        const resolver1 = resolver;
-        parentEle.unlayoutCallback();
-        parentEle.layoutCallback();
-        yield macroTask();
-        const resolver2 = resolver;
-        resolver1(config);
-        resolver2(config2);
-        yield macroTask();
-        const element = parentEle.querySelector('amp-analytics');
-        expect(element).to.not.be.null;
-        const script = element.querySelector('script');
-        expect(script.textContent).to.jsonEqual(JSON.stringify(config2));
+        it('should only insert with latest config', function*() {
+          parentEle.layoutCallback();
+          yield macroTask();
+          const resolver1 = resolver;
+          parentEle.unlayoutCallback();
+          parentEle.layoutCallback();
+          yield macroTask();
+          const resolver2 = resolver;
+          resolver1(config);
+          resolver2(config2);
+          yield macroTask();
+          const element = parentEle.querySelector('amp-analytics');
+          expect(element).to.not.be.null;
+          const script = element.querySelector('script');
+          expect(script.textContent).to.jsonEqual(JSON.stringify(config2));
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-extension-location.js b/test/unit/test-extension-location.js
index a3e9456d6d64..e4c4b9afd286 100644
--- a/test/unit/test-extension-location.js
+++ b/test/unit/test-extension-location.js
@@ -19,10 +19,7 @@ import {
   calculateExtensionScriptUrl,
   parseExtensionUrl,
 } from '../../src/service/extension-location';
-import {
-  initLogConstructor,
-  resetLogConstructorForTesting,
-} from '../../src/log';
+import {initLogConstructor, resetLogConstructorForTesting} from '../../src/log';
 
 describes.sandboxed('Extension Location', {}, () => {
   describe('get correct script source', () => {
@@ -37,46 +34,70 @@ describes.sandboxed('Extension Location', {}, () => {
 
     it('with local mode', () => {
       window.AMP_MODE = {rtvVersion: '123'};
-      const script = calculateExtensionScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'amp-ad', /*opt_extensionVersion*/ undefined, true);
+      const script = calculateExtensionScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'amp-ad',
+        /*opt_extensionVersion*/ undefined,
+        true
+      );
       expect(script).to.equal(
-          'http://localhost:8000/dist/rtv/123/v0/amp-ad-0.1.js');
+        'http://localhost:8000/dist/rtv/123/v0/amp-ad-0.1.js'
+      );
     });
 
     it('with remote mode', () => {
       window.AMP_MODE = {rtvVersion: '123'};
-      const script = calculateExtensionScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'amp-ad', /*opt_extensionVersion*/ undefined, false);
+      const script = calculateExtensionScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'amp-ad',
+        /*opt_extensionVersion*/ undefined,
+        false
+      );
       expect(script).to.equal(
-          'https://cdn.ampproject.org/rtv/123/v0/amp-ad-0.1.js');
+        'https://cdn.ampproject.org/rtv/123/v0/amp-ad-0.1.js'
+      );
     });
 
     it('should allow no versions', () => {
       window.AMP_MODE = {rtvVersion: '123'};
-      const script = calculateExtensionScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'no-version', /* version is empty but defined */ '', true);
+      const script = calculateExtensionScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'no-version',
+        /* version is empty but defined */ '',
+        true
+      );
       expect(script).to.equal(
-          'http://localhost:8000/dist/rtv/123/v0/no-version.js');
+        'http://localhost:8000/dist/rtv/123/v0/no-version.js'
+      );
     });
 
     it('should handles single pass experiment', () => {
       window.AMP_MODE = {rtvVersion: '123', singlePassType: 'sp'};
-      const script = calculateExtensionScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'no-version', /* version is empty but defined */ '', true);
+      const script = calculateExtensionScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'no-version',
+        /* version is empty but defined */ '',
+        true
+      );
       expect(script).to.equal(
-          'http://localhost:8000/dist/rtv/123/sp/v0/no-version.js');
+        'http://localhost:8000/dist/rtv/123/sp/v0/no-version.js'
+      );
     });
   });
 
@@ -91,59 +112,76 @@ describes.sandboxed('Extension Location', {}, () => {
     });
 
     it('with local mode', () => {
-      const script = calculateEntryPointScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'sw', true);
+      const script = calculateEntryPointScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'sw',
+        true
+      );
       expect(script).to.equal('http://localhost:8000/dist/sw.js');
     });
 
     it('with remote mode', () => {
       window.AMP_MODE = {rtvVersion: '123'};
-      const script = calculateEntryPointScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'sw', /* isLocalDev */ false);
-      expect(script).to.equal(
-          'https://cdn.ampproject.org/sw.js');
+      const script = calculateEntryPointScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'sw',
+        /* isLocalDev */ false
+      );
+      expect(script).to.equal('https://cdn.ampproject.org/sw.js');
     });
 
     it('with remote mode & rtv', () => {
       window.AMP_MODE = {rtvVersion: '123'};
-      const script = calculateEntryPointScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'ww', /* isLocalDev */ false, /* opt_rtv */ true);
-      expect(script).to.equal(
-          'https://cdn.ampproject.org/rtv/123/ww.js');
+      const script = calculateEntryPointScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'ww',
+        /* isLocalDev */ false,
+        /* opt_rtv */ true
+      );
+      expect(script).to.equal('https://cdn.ampproject.org/rtv/123/ww.js');
     });
 
     it('should handle single pass experiment', () => {
       window.AMP_MODE = {rtvVersion: '123', singlePassType: 'sp'};
-      const script = calculateEntryPointScriptUrl({
-        pathname: 'examples/ads.amp.html',
-        host: 'localhost:8000',
-        protocol: 'http:',
-      }, 'ww', /* isLocalDev */ false, /* opt_rtv */ true);
-      expect(script).to.equal(
-          'https://cdn.ampproject.org/rtv/123/sp/ww.js');
+      const script = calculateEntryPointScriptUrl(
+        {
+          pathname: 'examples/ads.amp.html',
+          host: 'localhost:8000',
+          protocol: 'http:',
+        },
+        'ww',
+        /* isLocalDev */ false,
+        /* opt_rtv */ true
+      );
+      expect(script).to.equal('https://cdn.ampproject.org/rtv/123/sp/ww.js');
     });
   });
 
   describe('get correct URL parts', () => {
     it('unversioned urls', () => {
-      const urlParts =
-          parseExtensionUrl('https://cdn.ampproject.org/v0/amp-ad-1.0.js');
+      const urlParts = parseExtensionUrl(
+        'https://cdn.ampproject.org/v0/amp-ad-1.0.js'
+      );
       expect(urlParts.extensionId).to.equal('amp-ad');
       expect(urlParts.extensionVersion).to.equal('1.0');
     });
 
     it('versioned urls', () => {
-      const urlParts = parseExtensionUrl('https://cdn.ampproject.org/rtv/123' +
-          '/v0/amp-ad-0.1.js');
+      const urlParts = parseExtensionUrl(
+        'https://cdn.ampproject.org/rtv/123/v0/amp-ad-0.1.js'
+      );
       expect(urlParts.extensionId).to.equal('amp-ad');
       expect(urlParts.extensionVersion).to.equal('0.1');
     });
diff --git a/test/unit/test-extensions.js b/test/unit/test-extensions.js
index 2d564c19dbd6..2f8cbc2cd5f9 100644
--- a/test/unit/test-extensions.js
+++ b/test/unit/test-extensions.js
@@ -30,15 +30,11 @@ import {Services} from '../../src/services';
 import {getServiceForDoc, registerServiceBuilder} from '../../src/service';
 import {installTimerService} from '../../src/service/timer-impl';
 import {loadPromise} from '../../src/event-helper';
-import {
-  resetScheduledElementForTesting,
-} from '../../src/service/custom-element-registry';
-
+import {resetScheduledElementForTesting} from '../../src/service/custom-element-registry';
 
 class AmpTest extends BaseElement {}
 class AmpTestSub extends BaseElement {}
 
-
 describes.sandboxed('Extensions', {}, () => {
   describes.fakeWin('registerExtension', {}, env => {
     let win;
@@ -69,13 +65,17 @@ describes.sandboxed('Extensions', {}, () => {
       const amp = {};
       let factoryExecuted = false;
       let currentHolder;
-      extensions.registerExtension('amp-ext', arg => {
-        expect(factoryExecuted).to.be.false;
-        expect(arg).to.equal(amp);
-        expect(extensions.currentExtensionId_).to.equal('amp-ext');
-        currentHolder = extensions.getCurrentExtensionHolder_();
-        factoryExecuted = true;
-      }, amp);
+      extensions.registerExtension(
+        'amp-ext',
+        arg => {
+          expect(factoryExecuted).to.be.false;
+          expect(arg).to.equal(amp);
+          expect(extensions.currentExtensionId_).to.equal('amp-ext');
+          currentHolder = extensions.getCurrentExtensionHolder_();
+          factoryExecuted = true;
+        },
+        amp
+      );
       expect(factoryExecuted).to.be.true;
       expect(extensions.currentExtensionId_).to.be.null;
 
@@ -116,9 +116,13 @@ describes.sandboxed('Extensions', {}, () => {
 
     it('should fail registration without promise', () => {
       expect(() => {
-        extensions.registerExtension('amp-ext', () => {
-          throw new Error('intentional');
-        }, {});
+        extensions.registerExtension(
+          'amp-ext',
+          () => {
+            throw new Error('intentional');
+          },
+          {}
+        );
       }).to.throw(/intentional/);
       expect(extensions.currentExtensionId_).to.be.null;
 
@@ -132,19 +136,26 @@ describes.sandboxed('Extensions', {}, () => {
       expect(holder.promise).to.be.undefined;
 
       // However, the promise is created lazily.
-      return extensions.waitForExtension(win, 'amp-ext').then(() => {
-        throw new Error('must have been rejected');
-      }, reason => {
-        expect(reason.message).to.equal('intentional');
-      });
+      return extensions.waitForExtension(win, 'amp-ext').then(
+        () => {
+          throw new Error('must have been rejected');
+        },
+        reason => {
+          expect(reason.message).to.equal('intentional');
+        }
+      );
     });
 
     it('should fail registration with promise', () => {
-      const promise = extensions.waitForExtension(win , 'amp-ext');
+      const promise = extensions.waitForExtension(win, 'amp-ext');
       expect(() => {
-        extensions.registerExtension('amp-ext', () => {
-          throw new Error('intentional');
-        }, {});
+        extensions.registerExtension(
+          'amp-ext',
+          () => {
+            throw new Error('intentional');
+          },
+          {}
+        );
       }).to.throw(/intentional/);
       expect(extensions.currentExtensionId_).to.be.null;
 
@@ -157,31 +168,41 @@ describes.sandboxed('Extensions', {}, () => {
       expect(holder.promise).to.exist;
       expect(promise).to.eventually.equal(holder.promise);
 
-      return extensions.waitForExtension(win, 'amp-ext').then(() => {
-        throw new Error('must have been rejected');
-      }, reason => {
-        expect(reason.message).to.equal('intentional');
-      });
+      return extensions.waitForExtension(win, 'amp-ext').then(
+        () => {
+          throw new Error('must have been rejected');
+        },
+        reason => {
+          expect(reason.message).to.equal('intentional');
+        }
+      );
     });
 
     it('should fail on timeout', () => {
       timeoutCallback = null;
-      const promise = extensions.waitForExtension(win , 'amp-ext');
+      const promise = extensions.waitForExtension(win, 'amp-ext');
       expect(timeoutCallback).to.be.a('function');
       timeoutCallback();
 
-      return promise.then(() => {
-        throw new Error('must have been rejected');
-      }, reason => {
-        expect(reason.message).to.match(/^Render timeout/);
-      });
+      return promise.then(
+        () => {
+          throw new Error('must have been rejected');
+        },
+        reason => {
+          expect(reason.message).to.match(/^Render timeout/);
+        }
+      );
     });
 
     it('should add element in registration', () => {
       const ctor = function() {};
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addElement('e1', ctor);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addElement('e1', ctor);
+        },
+        {}
+      );
       return extensions.waitForExtension(win, 'amp-ext').then(extension => {
         expect(extension.elements['e1']).to.exist;
         expect(extension.elements['e1'].implementationClass).to.equal(ctor);
@@ -194,23 +215,28 @@ describes.sandboxed('Extensions', {}, () => {
       expect(Object.keys(extensions.extensions_)).to.deep.equal(['_UNKNOWN_']);
       const unknown = extensions.extensions_['_UNKNOWN_'];
       expect(unknown.extension.elements['e1']).to.exist;
-      expect(unknown.extension.elements['e1'].implementationClass)
-          .to.equal(ctor);
+      expect(unknown.extension.elements['e1'].implementationClass).to.equal(
+        ctor
+      );
     });
 
     it('should install auto undeclared elements for single-doc', () => {
       const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addElement('amp-test', AmpTest);
+          extensions.addElement('amp-test-sub', AmpTestSub);
+        },
+        {}
+      );
       expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
       expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
       expect(win.customElements.elements['amp-test']).to.exist;
@@ -219,24 +245,28 @@ describes.sandboxed('Extensions', {}, () => {
 
     it('should skip non-auto undeclared elements for single-doc', () => {
       const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
 
       // Manually preload extension, which would make it non-auto.
       extensions.preloadExtension('amp-test');
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addElement('amp-test', AmpTest);
+          extensions.addElement('amp-test-sub', AmpTestSub);
+        },
+        {}
+      );
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
       expect(ampdoc.declaresExtension('amp-test')).to.be.false;
     });
@@ -244,18 +274,22 @@ describes.sandboxed('Extensions', {}, () => {
     it('should install declared elements for single-doc', () => {
       const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
       ampdoc.declareExtension('amp-test');
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
       expect(win.services['amp-test']).to.not.exist;
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addElement('amp-test', AmpTest);
+          extensions.addElement('amp-test-sub', AmpTestSub);
+        },
+        {}
+      );
       expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
       expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
       expect(win.customElements.elements['amp-test']).to.exist;
@@ -265,20 +299,24 @@ describes.sandboxed('Extensions', {}, () => {
     it('should install non-auto declared elements for single-doc', () => {
       const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
       ampdoc.declareExtension('amp-test');
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
 
       // Manually preload extension, which would make it non-auto.
       extensions.preloadExtension('amp-test');
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addElement('amp-test', AmpTest);
+          extensions.addElement('amp-test-sub', AmpTestSub);
+        },
+        {}
+      );
       expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
       expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
       expect(win.customElements.elements['amp-test']).to.exist;
@@ -286,23 +324,28 @@ describes.sandboxed('Extensions', {}, () => {
     });
 
     it('should install elements in shadow doc', () => {
-      sandbox.stub(Services.ampdocServiceFor(win), 'isSingleDoc').callsFake(
-          () => false);
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      sandbox
+        .stub(Services.ampdocServiceFor(win), 'isSingleDoc')
+        .callsFake(() => false);
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-          win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addElement('amp-test', AmpTest);
+          extensions.addElement('amp-test-sub', AmpTestSub);
+        },
+        {}
+      );
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test']).to
+        .be.undefined;
+      expect(win.ampExtendedElements && win.ampExtendedElements['amp-test-sub'])
+        .to.be.undefined;
       expect(win.customElements.elements['amp-test']).to.not.exist;
 
       // Install into shadow doc.
@@ -320,47 +363,65 @@ describes.sandboxed('Extensions', {}, () => {
     });
 
     // TODO(dvoytenko, #11827): Make this test work on Safari.
-    it.configure().skipSafari().run('should install declared elements for ' +
-        'AmpDocShell in shadow-doc', () => {
-      const ampdocShell = new AmpDocShell(win);
-      const ampdocServiceMock = sandbox.mock(Services.ampdocServiceFor(win));
-
-      ampdocServiceMock.expects('isSingleDoc')
-          .returns(false)
-          .twice();
-      ampdocServiceMock.expects('hasAmpDocShell')
-          .returns(true)
-          .twice();
-      ampdocServiceMock.expects('getAmpDoc')
-          .withExactArgs(win.document)
-          .returns(ampdocShell)
-          .twice();
-
-      ampdocShell.declareExtension('amp-test');
-      expect(win.ampExtendedElements &&
-        win.ampExtendedElements['amp-test']).to.be.undefined;
-      expect(win.ampExtendedElements &&
-        win.ampExtendedElements['amp-test-sub']).to.be.undefined;
-      expect(win.customElements.elements['amp-test']).to.not.exist;
-      expect(win.services['amp-test']).to.not.exist;
-
-      // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addElement('amp-test', AmpTest);
-        extensions.addElement('amp-test-sub', AmpTestSub);
-      }, {});
-      expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
-      expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
-      expect(win.customElements.elements['amp-test']).to.exist;
-      expect(win.services['amp-test']).to.exist;
-      ampdocServiceMock.verify();
-    });
+    it.configure()
+      .skipSafari()
+      .run(
+        'should install declared elements for AmpDocShell in shadow-doc',
+        () => {
+          const ampdocShell = new AmpDocShell(win);
+          const ampdocServiceMock = sandbox.mock(
+            Services.ampdocServiceFor(win)
+          );
+
+          ampdocServiceMock
+            .expects('isSingleDoc')
+            .returns(false)
+            .twice();
+          ampdocServiceMock
+            .expects('hasAmpDocShell')
+            .returns(true)
+            .twice();
+          ampdocServiceMock
+            .expects('getAmpDoc')
+            .withExactArgs(win.document)
+            .returns(ampdocShell)
+            .twice();
+
+          ampdocShell.declareExtension('amp-test');
+          expect(win.ampExtendedElements && win.ampExtendedElements['amp-test'])
+            .to.be.undefined;
+          expect(
+            win.ampExtendedElements && win.ampExtendedElements['amp-test-sub']
+          ).to.be.undefined;
+          expect(win.customElements.elements['amp-test']).to.not.exist;
+          expect(win.services['amp-test']).to.not.exist;
+
+          // Resolve the promise.
+          extensions.registerExtension(
+            'amp-test',
+            () => {
+              extensions.addElement('amp-test', AmpTest);
+              extensions.addElement('amp-test-sub', AmpTestSub);
+            },
+            {}
+          );
+          expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
+          expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
+          expect(win.customElements.elements['amp-test']).to.exist;
+          expect(win.services['amp-test']).to.exist;
+          ampdocServiceMock.verify();
+        }
+      );
 
     it('should add doc factory in registration', () => {
       const factory = function() {};
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addDocFactory(factory);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addDocFactory(factory);
+        },
+        {}
+      );
 
       const holder = extensions.getExtensionHolder_('amp-ext');
       expect(holder.docFactories).to.exist;
@@ -380,18 +441,23 @@ describes.sandboxed('Extensions', {}, () => {
 
     // TODO(#16916): Make this test work with synchronous throws.
     it.skip('should install all doc factories to shadow doc', () => {
-      sandbox.stub(Services.ampdocServiceFor(win), 'isSingleDoc').callsFake(
-          () => false);
+      sandbox
+        .stub(Services.ampdocServiceFor(win), 'isSingleDoc')
+        .callsFake(() => false);
       const factory1 = sandbox.spy();
       const factory2 = function() {
         throw new Error('intentional');
       };
       const factory3 = sandbox.spy();
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addDocFactory(factory1);
-        extensions.addDocFactory(factory2);
-        extensions.addDocFactory(factory3);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addDocFactory(factory1);
+          extensions.addDocFactory(factory2);
+          extensions.addDocFactory(factory3);
+        },
+        {}
+      );
 
       const shadowRoot = document.createDocumentFragment();
       const ampdoc = new AmpDocShadow(win, 'https://a.org/', shadowRoot);
@@ -407,9 +473,13 @@ describes.sandboxed('Extensions', {}, () => {
 
     it('should add service factory in registration', () => {
       const factory = function() {};
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addService('service1', factory);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addService('service1', factory);
+        },
+        {}
+      );
 
       const holder = extensions.getExtensionHolder_('amp-ext');
       expect(holder.extension.services).to.exist;
@@ -447,10 +517,14 @@ describes.sandboxed('Extensions', {}, () => {
       };
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addService('service1', factory1);
-        extensions.addService('service2', factory2);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addService('service1', factory1);
+          extensions.addService('service2', factory2);
+        },
+        {}
+      );
       expect(ampdoc.declaresExtension('amp-test')).to.be.false;
       expect(factory1Spy).to.be.calledOnce;
       expect(factory2Spy).to.be.calledOnce;
@@ -467,18 +541,24 @@ describes.sandboxed('Extensions', {}, () => {
       extensions.preloadExtension('amp-test');
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addService('service1', factory1);
-        extensions.addService('service2', factory2);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addService('service1', factory1);
+          extensions.addService('service2', factory2);
+        },
+        {}
+      );
       expect(ampdoc.declaresExtension('amp-test')).to.be.false;
       expect(factory1).to.be.not.called;
       expect(factory2).to.be.not.called;
       allowConsoleError(() => {
         expect(() => getServiceForDoc(ampdoc, 'service1')).to.throw(
-            /to be registered/);
+          /to be registered/
+        );
         expect(() => getServiceForDoc(ampdoc, 'service2')).to.throw(
-            /to be registered/);
+          /to be registered/
+        );
       });
     });
 
@@ -498,10 +578,14 @@ describes.sandboxed('Extensions', {}, () => {
       };
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addService('service1', factory1);
-        extensions.addService('service2', factory2);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addService('service1', factory1);
+          extensions.addService('service2', factory2);
+        },
+        {}
+      );
       expect(factory1Spy).to.be.calledOnce;
       expect(factory2Spy).to.be.calledOnce;
       expect(getServiceForDoc(ampdoc, 'service1').a).to.equal(1);
@@ -510,8 +594,9 @@ describes.sandboxed('Extensions', {}, () => {
 
     // TODO(#16916): Make this test work with synchronous throws.
     it.skip('should install all services to doc', () => {
-      sandbox.stub(Services.ampdocServiceFor(win), 'isSingleDoc').callsFake(
-          () => false);
+      sandbox
+        .stub(Services.ampdocServiceFor(win), 'isSingleDoc')
+        .callsFake(() => false);
       const factory1 = sandbox.spy();
       const factory2Spy = sandbox.spy();
       const factory2 = function() {
@@ -519,11 +604,15 @@ describes.sandboxed('Extensions', {}, () => {
         throw new Error('intentional');
       };
       const factory3 = sandbox.spy();
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addService('service1', factory1);
-        extensions.addService('service2', factory2);
-        extensions.addService('service3', factory3);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addService('service1', factory1);
+          extensions.addService('service2', factory2);
+          extensions.addService('service3', factory3);
+        },
+        {}
+      );
 
       // Install into shadow doc.
       const shadowRoot = document.createDocumentFragment();
@@ -543,16 +632,19 @@ describes.sandboxed('Extensions', {}, () => {
       const ampdocShell = new AmpDocShell(win);
       const ampdocServiceMock = sandbox.mock(Services.ampdocServiceFor(win));
 
-      ampdocServiceMock.expects('isSingleDoc')
-          .returns(false)
-          .twice();
-      ampdocServiceMock.expects('hasAmpDocShell')
-          .returns(true)
-          .twice();
-      ampdocServiceMock.expects('getAmpDoc')
-          .withExactArgs(win.document)
-          .returns(ampdocShell)
-          .twice();
+      ampdocServiceMock
+        .expects('isSingleDoc')
+        .returns(false)
+        .twice();
+      ampdocServiceMock
+        .expects('hasAmpDocShell')
+        .returns(true)
+        .twice();
+      ampdocServiceMock
+        .expects('getAmpDoc')
+        .withExactArgs(win.document)
+        .returns(ampdocShell)
+        .twice();
 
       ampdocShell.declareExtension('amp-test');
 
@@ -568,10 +660,14 @@ describes.sandboxed('Extensions', {}, () => {
       };
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', () => {
-        extensions.addService('service1', factory1);
-        extensions.addService('service2', factory2);
-      }, {});
+      extensions.registerExtension(
+        'amp-test',
+        () => {
+          extensions.addService('service1', factory1);
+          extensions.addService('service2', factory2);
+        },
+        {}
+      );
       expect(factory1Spy).to.be.calledOnce;
       expect(factory2Spy).to.be.calledOnce;
       expect(getServiceForDoc(ampdocShell, 'service1').a).to.equal(1);
@@ -580,295 +676,344 @@ describes.sandboxed('Extensions', {}, () => {
 
     it('should load extension class via load extension', () => {
       const ctor = function() {};
-      extensions.registerExtension('amp-ext', () => {
-        extensions.addElement('amp-ext', ctor);
-      }, {});
+      extensions.registerExtension(
+        'amp-ext',
+        () => {
+          extensions.addElement('amp-ext', ctor);
+        },
+        {}
+      );
       return extensions.loadElementClass('amp-ext').then(elementClass => {
         expect(elementClass).to.equal(ctor);
       });
     });
   });
 
-  describes.realWin('preloadExtension', {
-    amp: true,
-    fakeRegisterElement: true,
-  }, env => {
-    let win, doc, extensions;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      extensions = env.extensions;
-    });
-
-    it('should insert extension script correctly', () => {
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-      extensions.preloadExtension('amp-test');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-      expect(win.customElements.elements['amp-test']).to.be.undefined;
-    });
-
-    it('should insert template extension script correctly', () => {
-      expect(doc.head.querySelectorAll(
-          '[custom-template="amp-mustache"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-mustache']).to.be.undefined;
-      extensions.preloadExtension('amp-mustache');
-      expect(doc.head.querySelectorAll(
-          '[custom-template="amp-mustache"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-mustache'].scriptPresent).to.be.true;
-      expect(win.customElements.elements['amp-mustache']).to.be.undefined;
-    });
-
-    it('should insert extension version correctly', () => {
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-      extensions.preloadExtension('amp-test', '1.0');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"][src*="0.1"]')).to.have.length(0);
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"][src*="1.0"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-      expect(win.customElements.elements['amp-test']).to.be.undefined;
-    });
-
-    it('should not insert version for _bundle', () => {
-      expect(doc.head.querySelectorAll(
-          '[custom-element="_bundle"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-      extensions.preloadExtension('_bundle');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="_bundle"]')).to.have.length(0);
-      expect(doc.head.querySelectorAll(
-          'script[src*="_bundle"]')).to.have.length(1);
-    });
-
-    it('should only insert script once', () => {
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-
-      extensions.preloadExtension('amp-test');
-      expect(doc.head.querySelectorAll('[custom-element="amp-test"]'))
-          .to.have.length(1);
-      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-
-      extensions.preloadExtension('amp-test');
-      expect(doc.head.querySelectorAll('[custom-element="amp-test"]'))
-          .to.have.length(1);
-    });
-
-    it('should not insert when script exists in head', () => {
-      const ampTestScript = doc.createElement('script');
-      ampTestScript.setAttribute('custom-element', 'amp-test');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(0);
-      doc.head.appendChild(ampTestScript);
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-
-      extensions.preloadExtension('amp-test');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-      expect(win.customElements.elements['amp-test']).to.not.exist;
-      expect(win.ampExtendedElements['amp-test']).to.be.undefined;
-    });
-
-    it('should give script correct attributes', () => {
-      expect(doc.head.querySelectorAll('[custom-element="amp-test"]'))
-          .to.have.length(0);
-      extensions.preloadExtension('amp-test');
-      expect(doc.head.querySelectorAll('[custom-element="amp-test"]'))
-          .to.have.length(1);
-
-      const script = doc.head.querySelector(
-          '[custom-element="amp-test"]');
-      expect(script.getAttribute('data-script')).to.equal('amp-test');
-      expect(script.getAttribute('async')).to.equal('');
-    });
-
-    it('should insert special-case for amp-embed script', () => {
-      expect(doc.head.querySelectorAll('[custom-element="amp-embed"]'))
-          .to.have.length(0);
-
-      extensions.preloadExtension('amp-embed');
-      expect(doc.head.querySelectorAll('[custom-element="amp-ad"]'))
-          .to.have.length(1);
-      expect(extensions.extensions_['amp-ad'].scriptPresent).to.be.true;
-
-      // The amp-embed module has never been created.
-      expect(doc.head.querySelectorAll('[custom-element="amp-embed"]'))
-          .to.have.length(0);
-      expect(extensions.extensions_['amp-embed']).to.be.undefined;
-    });
+  describes.realWin(
+    'preloadExtension',
+    {
+      amp: true,
+      fakeRegisterElement: true,
+    },
+    env => {
+      let win, doc, extensions;
+
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        extensions = env.extensions;
+      });
 
+      it('should insert extension script correctly', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+        extensions.preloadExtension('amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+        expect(win.customElements.elements['amp-test']).to.be.undefined;
+      });
 
-  });
+      it('should insert template extension script correctly', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-template="amp-mustache"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-mustache']).to.be.undefined;
+        extensions.preloadExtension('amp-mustache');
+        expect(
+          doc.head.querySelectorAll('[custom-template="amp-mustache"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-mustache'].scriptPresent).to.be.true;
+        expect(win.customElements.elements['amp-mustache']).to.be.undefined;
+      });
 
-  describes.realWin('installExtensionForDoc', {
-    amp: true,
-    fakeRegisterElement: true,
-  }, env => {
-    let win, doc, ampdoc, extensions;
+      it('should insert extension version correctly', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+        extensions.preloadExtension('amp-test', '1.0');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"][src*="0.1"]')
+        ).to.have.length(0);
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"][src*="1.0"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+        expect(win.customElements.elements['amp-test']).to.be.undefined;
+      });
 
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      ampdoc = env.ampdoc;
-      extensions = env.extensions;
-    });
+      it('should not insert version for _bundle', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="_bundle"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+        extensions.preloadExtension('_bundle');
+        expect(
+          doc.head.querySelectorAll('[custom-element="_bundle"]')
+        ).to.have.length(0);
+        expect(
+          doc.head.querySelectorAll('script[src*="_bundle"]')
+        ).to.have.length(1);
+      });
 
-    it('should insert extension script correctly', () => {
-      const loadSpy = sandbox.spy(extensions, 'preloadExtension');
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(0);
-      expect(extensions.extensions_['amp-test']).to.be.undefined;
-      extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      expect(loadSpy).to.be.calledOnce;
-      expect(loadSpy).to.be.calledWithExactly('amp-test', undefined);
-      expect(doc.head.querySelectorAll(
-          '[custom-element="amp-test"]')).to.have.length(1);
-      expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
-      expect(win.ampExtendedElements['amp-test']).to.equal(ElementStub);
-    });
+      it('should only insert script once', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+
+        extensions.preloadExtension('amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+
+        extensions.preloadExtension('amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+      });
 
-    it('should stub main extension immediately', () => {
-      const extHolder = extensions.getExtensionHolder_('amp-test');
-      extHolder.scriptPresent = true;
-      expect(ampdoc.declaresExtension('amp-test')).to.be.false;
-      const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+      it('should not insert when script exists in head', () => {
+        const ampTestScript = doc.createElement('script');
+        ampTestScript.setAttribute('custom-element', 'amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        doc.head.appendChild(ampTestScript);
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+
+        extensions.preloadExtension('amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+        expect(win.customElements.elements['amp-test']).to.not.exist;
+        expect(win.ampExtendedElements['amp-test']).to.be.undefined;
+      });
 
-      // Stubbed immediately.
-      expect(win.ampExtendedElements['amp-test']).to.equal(ElementStub);
-      expect(win.ampExtendedElements['amp-test-sub']).to.be.undefined;
-      expect(win.customElements.elements['amp-test']).to.exist;
+      it('should give script correct attributes', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        extensions.preloadExtension('amp-test');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+
+        const script = doc.head.querySelector('[custom-element="amp-test"]');
+        expect(script.getAttribute('data-script')).to.equal('amp-test');
+        expect(script.getAttribute('async')).to.equal('');
+      });
 
-      // Resolve the promise.
-      extensions.registerExtension('amp-test', AMP => {
-        // Main extension with CSS.
-        AMP.registerElement('amp-test', AmpTest, 'a{}');
-        // Secondary extension w/o CSS.
-        AMP.registerElement('amp-test-sub', AmpTestSub);
-      }, win.AMP);
-      return promise.then(() => {
-        // Resolved later.
-        expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
-        expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
-        // Extension is now declared.
-        expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+      it('should insert special-case for amp-embed script', () => {
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-embed"]')
+        ).to.have.length(0);
+
+        extensions.preloadExtension('amp-embed');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-ad"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-ad'].scriptPresent).to.be.true;
+
+        // The amp-embed module has never been created.
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-embed"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-embed']).to.be.undefined;
+      });
+    }
+  );
+
+  describes.realWin(
+    'installExtensionForDoc',
+    {
+      amp: true,
+      fakeRegisterElement: true,
+    },
+    env => {
+      let win, doc, ampdoc, extensions;
+
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        ampdoc = env.ampdoc;
+        extensions = env.extensions;
       });
-    });
 
-    it('should reuse the load if already started', () => {
-      const loadSpy = sandbox.spy(extensions, 'preloadExtension');
-      const extHolder = extensions.getExtensionHolder_('amp-test');
-      extHolder.scriptPresent = true;
-      const promise1 = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      const promise2 = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      expect(promise2).to.equal(promise1);
-      expect(loadSpy).to.be.calledOnce;
-
-      // Resolve.
-      extensions.registerExtension('amp-test', () => {}, {});
-      return promise1.then(() => {
-        const promise3 = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-        expect(promise3).to.equal(promise1);
+      it('should insert extension script correctly', () => {
+        const loadSpy = sandbox.spy(extensions, 'preloadExtension');
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(0);
+        expect(extensions.extensions_['amp-test']).to.be.undefined;
+        extensions.installExtensionForDoc(ampdoc, 'amp-test');
         expect(loadSpy).to.be.calledOnce;
-        return promise3;
+        expect(loadSpy).to.be.calledWithExactly('amp-test', undefined);
+        expect(
+          doc.head.querySelectorAll('[custom-element="amp-test"]')
+        ).to.have.length(1);
+        expect(extensions.extensions_['amp-test'].scriptPresent).to.be.true;
+        expect(win.ampExtendedElements['amp-test']).to.equal(ElementStub);
       });
-    });
 
-    it('should install doc services', () => {
-      const factory1Spy = sandbox.spy();
-      const factory2Spy = sandbox.spy();
-      const factory1 = function() {
-        factory1Spy();
-        return {a: 1};
-      };
-      const factory2 = function() {
-        factory2Spy();
-        return {a: 2};
-      };
+      it('should stub main extension immediately', () => {
+        const extHolder = extensions.getExtensionHolder_('amp-test');
+        extHolder.scriptPresent = true;
+        expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+        const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
+        expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+
+        // Stubbed immediately.
+        expect(win.ampExtendedElements['amp-test']).to.equal(ElementStub);
+        expect(win.ampExtendedElements['amp-test-sub']).to.be.undefined;
+        expect(win.customElements.elements['amp-test']).to.exist;
+
+        // Resolve the promise.
+        extensions.registerExtension(
+          'amp-test',
+          AMP => {
+            // Main extension with CSS.
+            AMP.registerElement('amp-test', AmpTest, 'a{}');
+            // Secondary extension w/o CSS.
+            AMP.registerElement('amp-test-sub', AmpTestSub);
+          },
+          win.AMP
+        );
+        return promise.then(() => {
+          // Resolved later.
+          expect(win.ampExtendedElements['amp-test']).to.equal(AmpTest);
+          expect(win.ampExtendedElements['amp-test-sub']).to.equal(AmpTestSub);
+          // Extension is now declared.
+          expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+        });
+      });
 
-      const extHolder = extensions.getExtensionHolder_('amp-test');
-      extHolder.scriptPresent = true;
-      expect(ampdoc.declaresExtension('amp-test')).to.be.false;
-      const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+      it('should reuse the load if already started', () => {
+        const loadSpy = sandbox.spy(extensions, 'preloadExtension');
+        const extHolder = extensions.getExtensionHolder_('amp-test');
+        extHolder.scriptPresent = true;
+        const promise1 = extensions.installExtensionForDoc(ampdoc, 'amp-test');
+        const promise2 = extensions.installExtensionForDoc(ampdoc, 'amp-test');
+        expect(promise2).to.equal(promise1);
+        expect(loadSpy).to.be.calledOnce;
 
-      // Services do not exist yet.
-      allowConsoleError(() => {
-        expect(() => getServiceForDoc(ampdoc, 'service1')).to.throw(
-            /to be registered/);
-        expect(() => getServiceForDoc(ampdoc, 'service2')).to.throw(
-            /to be registered/);
+        // Resolve.
+        extensions.registerExtension('amp-test', () => {}, {});
+        return promise1.then(() => {
+          const promise3 = extensions.installExtensionForDoc(
+            ampdoc,
+            'amp-test'
+          );
+          expect(promise3).to.equal(promise1);
+          expect(loadSpy).to.be.calledOnce;
+          return promise3;
+        });
       });
-      expect(factory1Spy).to.not.be.called;
-      expect(factory2Spy).to.not.be.called;
 
-      // Resolve the promise.
-      extensions.registerExtension('amp-test', AMP => {
-        AMP.registerServiceForDoc('service1', factory1);
-        AMP.registerServiceForDoc('service2', factory2);
-      }, win.AMP);
-      return promise.then(() => {
-        // Services registered.
-        expect(getServiceForDoc(ampdoc, 'service1').a).to.equal(1);
-        expect(getServiceForDoc(ampdoc, 'service2').a).to.equal(2);
-        expect(factory1Spy).to.be.calledOnce;
-        expect(factory2Spy).to.be.calledOnce;
-        // Extension is marked as declared.
-        expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+      it('should install doc services', () => {
+        const factory1Spy = sandbox.spy();
+        const factory2Spy = sandbox.spy();
+        const factory1 = function() {
+          factory1Spy();
+          return {a: 1};
+        };
+        const factory2 = function() {
+          factory2Spy();
+          return {a: 2};
+        };
+
+        const extHolder = extensions.getExtensionHolder_('amp-test');
+        extHolder.scriptPresent = true;
+        expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+        const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
+        expect(ampdoc.declaresExtension('amp-test')).to.be.false;
+
+        // Services do not exist yet.
+        allowConsoleError(() => {
+          expect(() => getServiceForDoc(ampdoc, 'service1')).to.throw(
+            /to be registered/
+          );
+          expect(() => getServiceForDoc(ampdoc, 'service2')).to.throw(
+            /to be registered/
+          );
+        });
+        expect(factory1Spy).to.not.be.called;
+        expect(factory2Spy).to.not.be.called;
+
+        // Resolve the promise.
+        extensions.registerExtension(
+          'amp-test',
+          AMP => {
+            AMP.registerServiceForDoc('service1', factory1);
+            AMP.registerServiceForDoc('service2', factory2);
+          },
+          win.AMP
+        );
+        return promise.then(() => {
+          // Services registered.
+          expect(getServiceForDoc(ampdoc, 'service1').a).to.equal(1);
+          expect(getServiceForDoc(ampdoc, 'service2').a).to.equal(2);
+          expect(factory1Spy).to.be.calledOnce;
+          expect(factory2Spy).to.be.calledOnce;
+          // Extension is marked as declared.
+          expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+        });
       });
-    });
 
-    // TODO(#16916): Make this test work with synchronous throws.
-    it.skip('should survive factory failures', () => {
-      const factory1Spy = sandbox.spy();
-      const factory2Spy = sandbox.spy();
-      const factory3Spy = sandbox.spy();
-      const factory1 = function() {
-        factory1Spy();
-        return {a: 1};
-      };
-      const factory2 = function() {
-        factory2Spy();
-        throw new Error('intentional');
-      };
-      const factory3 = function() {
-        factory3Spy();
-        return {a: 3};
-      };
-
-      const extHolder = extensions.getExtensionHolder_('amp-test');
-      extHolder.scriptPresent = true;
-      const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
-      extensions.registerExtension('amp-test', AMP => {
-        AMP.registerServiceForDoc('service1', factory1);
-        AMP.registerServiceForDoc('service2', factory2);
-        AMP.registerServiceForDoc('service3', factory3);
-      }, win.AMP);
-      return promise.then(() => {
-        // Services registered.
-        expect(factory1Spy).to.be.calledOnce;
-        expect(factory2Spy).to.be.calledOnce;
-        expect(getServiceForDoc(ampdoc, 'service1').a).to.equal(1);
-        expect(getServiceForDoc(ampdoc, 'service3').a).to.equal(3);
-        // Erroneous
-        expect(factory3Spy).to.be.calledOnce;
-        expect(() => getServiceForDoc(ampdoc, 'service2')).to.throw();
-        // Extension is marked as declared.
-        expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+      // TODO(#16916): Make this test work with synchronous throws.
+      it.skip('should survive factory failures', () => {
+        const factory1Spy = sandbox.spy();
+        const factory2Spy = sandbox.spy();
+        const factory3Spy = sandbox.spy();
+        const factory1 = function() {
+          factory1Spy();
+          return {a: 1};
+        };
+        const factory2 = function() {
+          factory2Spy();
+          throw new Error('intentional');
+        };
+        const factory3 = function() {
+          factory3Spy();
+          return {a: 3};
+        };
+
+        const extHolder = extensions.getExtensionHolder_('amp-test');
+        extHolder.scriptPresent = true;
+        const promise = extensions.installExtensionForDoc(ampdoc, 'amp-test');
+        extensions.registerExtension(
+          'amp-test',
+          AMP => {
+            AMP.registerServiceForDoc('service1', factory1);
+            AMP.registerServiceForDoc('service2', factory2);
+            AMP.registerServiceForDoc('service3', factory3);
+          },
+          win.AMP
+        );
+        return promise.then(() => {
+          // Services registered.
+          expect(factory1Spy).to.be.calledOnce;
+          expect(factory2Spy).to.be.calledOnce;
+          expect(getServiceForDoc(ampdoc, 'service1').a).to.equal(1);
+          expect(getServiceForDoc(ampdoc, 'service3').a).to.equal(3);
+          // Erroneous
+          expect(factory3Spy).to.be.calledOnce;
+          expect(() => getServiceForDoc(ampdoc, 'service2')).to.throw();
+          // Extension is marked as declared.
+          expect(ampdoc.declaresExtension('amp-test')).to.be.true;
+        });
       });
-    });
-  });
+    }
+  );
 
   describes.realWin('installExtensionsInChildWindow', {amp: true}, env => {
     let parentWin;
@@ -931,19 +1076,20 @@ describes.sandboxed('Extensions', {}, () => {
 
     it('should install runtime styles', () => {
       extensions.installExtensionsInChildWindow(iframeWin, []);
-      expect(iframeWin.document.querySelector('style[amp-runtime]'))
-          .to.exist;
+      expect(iframeWin.document.querySelector('style[amp-runtime]')).to.exist;
     });
 
     it('should install built-ins', () => {
       extensions.installExtensionsInChildWindow(iframeWin, []);
       expect(iframeWin.ampExtendedElements).to.exist;
       expect(iframeWin.ampExtendedElements['amp-img']).to.exist;
-      expect(iframeWin.ampExtendedElements['amp-img'])
-          .to.not.equal(ElementStub);
+      expect(iframeWin.ampExtendedElements['amp-img']).to.not.equal(
+        ElementStub
+      );
       expect(iframeWin.ampExtendedElements['amp-pixel']).to.exist;
-      expect(iframeWin.ampExtendedElements['amp-pixel'])
-          .to.not.equal(ElementStub);
+      expect(iframeWin.ampExtendedElements['amp-pixel']).to.not.equal(
+        ElementStub
+      );
       // Legacy elements are installed as well.
       expect(iframeWin.ampExtendedElements['amp-ad']).to.equal(ElementStub);
       expect(iframeWin.ampExtendedElements['amp-embed']).to.equal(ElementStub);
@@ -970,39 +1116,50 @@ describes.sandboxed('Extensions', {}, () => {
     it('should install extensions in child window', () => {
       const extHolder = extensions.getExtensionHolder_('amp-test');
       extHolder.scriptPresent = true;
-      const promise = extensions.installExtensionsInChildWindow(
-          iframeWin, ['amp-test']);
+      const promise = extensions.installExtensionsInChildWindow(iframeWin, [
+        'amp-test',
+      ]);
       // Must be stubbed already.
       expect(iframeWin.ampExtendedElements['amp-test']).to.equal(ElementStub);
-      expect(iframeWin.document.createElement('amp-test').implementation_)
-          .to.be.instanceOf(ElementStub);
+      expect(
+        iframeWin.document.createElement('amp-test').implementation_
+      ).to.be.instanceOf(ElementStub);
       expect(iframeWin.ampExtendedElements['amp-test-sub']).to.be.undefined;
       // Resolve the promise.
-      extensions.registerExtension('amp-test', AMP => {
-        // Main extension with CSS.
-        AMP.registerElement('amp-test', AmpTest, 'a{}');
-        // Secondary extension w/o CSS.
-        AMP.registerElement('amp-test-sub', AmpTestSub);
-      }, parentWin.AMP);
+      extensions.registerExtension(
+        'amp-test',
+        AMP => {
+          // Main extension with CSS.
+          AMP.registerElement('amp-test', AmpTest, 'a{}');
+          // Secondary extension w/o CSS.
+          AMP.registerElement('amp-test-sub', AmpTestSub);
+        },
+        parentWin.AMP
+      );
       return promise.then(() => {
         // Main extension.
         expect(parentWin.ampExtendedElements['amp-test']).to.be.undefined;
         expect(iframeWin.ampExtendedElements['amp-test']).to.equal(AmpTest);
-        expect(iframeWin.document
-            .querySelector('style[amp-extension=amp-test]')).to.exist;
+        expect(
+          iframeWin.document.querySelector('style[amp-extension=amp-test]')
+        ).to.exist;
         // Must be upgraded already.
-        expect(iframeWin.document.createElement('amp-test').implementation_)
-            .to.be.instanceOf(AmpTest);
+        expect(
+          iframeWin.document.createElement('amp-test').implementation_
+        ).to.be.instanceOf(AmpTest);
 
         // Secondary extension.
         expect(parentWin.ampExtendedElements['amp-test-sub']).to.be.undefined;
-        expect(iframeWin.ampExtendedElements['amp-test-sub'])
-            .to.equal(AmpTestSub);
-        expect(iframeWin.document
-            .querySelector('style[amp-extension=amp-test-sub]')).to.not.exist;
+        expect(iframeWin.ampExtendedElements['amp-test-sub']).to.equal(
+          AmpTestSub
+        );
+        expect(
+          iframeWin.document.querySelector('style[amp-extension=amp-test-sub]')
+        ).to.not.exist;
         // Must be upgraded already.
-        expect(iframeWin.document.createElement('amp-test-sub').implementation_)
-            .to.be.instanceOf(AmpTestSub);
+        expect(
+          iframeWin.document.createElement('amp-test-sub').implementation_
+        ).to.be.instanceOf(AmpTestSub);
       });
     });
 
@@ -1011,25 +1168,38 @@ describes.sandboxed('Extensions', {}, () => {
         static installInEmbedWindow() {}
       }
       sandbox.stub(FooService, 'installInEmbedWindow');
-      registerServiceBuilder(parentWin, 'fake-service-foo',
-          FooService, /* opt_instantiate */ true);
+      registerServiceBuilder(
+        parentWin,
+        'fake-service-foo',
+        FooService,
+        /* opt_instantiate */ true
+      );
 
       class BarService {
         static installInEmbedWindow() {}
       }
       sandbox.stub(BarService, 'installInEmbedWindow');
-      registerServiceBuilder(parentWin, 'fake-service-bar',
-          BarService, /* opt_instantiate */ true);
+      registerServiceBuilder(
+        parentWin,
+        'fake-service-bar',
+        BarService,
+        /* opt_instantiate */ true
+      );
 
       const extHolder = extensions.getExtensionHolder_('amp-test');
       extHolder.scriptPresent = true;
-      const install = extensions.installExtensionsInChildWindow(
-          iframeWin, ['amp-test']);
+      const install = extensions.installExtensionsInChildWindow(iframeWin, [
+        'amp-test',
+      ]);
 
       // Resolve the promise `install`.
-      extensions.registerExtension('amp-test', AMP => {
-        AMP.registerServiceForDoc('fake-service-foo', FooService);
-      }, parentWin.AMP);
+      extensions.registerExtension(
+        'amp-test',
+        AMP => {
+          AMP.registerServiceForDoc('fake-service-foo', FooService);
+        },
+        parentWin.AMP
+      );
 
       return install.then(() => {
         expect(FooService.installInEmbedWindow).calledOnce;
@@ -1043,30 +1213,38 @@ describes.sandboxed('Extensions', {}, () => {
       const extHolder = extensions.getExtensionHolder_('amp-test');
       extHolder.scriptPresent = true;
       const promise = extensions.installExtensionsInChildWindow(
-          iframeWin,
-          ['amp-test'],
-          function() {
-            // Built-ins not installed yet.
-            expect(
-                iframeWin.ampExtendedElements &&
-                iframeWin.ampExtendedElements['amp-img']).to.not.exist;
-            // Extension is not loaded yet.
-            expect(
-                iframeWin.ampExtendedElements &&
-                iframeWin.ampExtendedElements['amp-test']).to.not.exist;
-            preinstallCount++;
-          });
+        iframeWin,
+        ['amp-test'],
+        function() {
+          // Built-ins not installed yet.
+          expect(
+            iframeWin.ampExtendedElements &&
+              iframeWin.ampExtendedElements['amp-img']
+          ).to.not.exist;
+          // Extension is not loaded yet.
+          expect(
+            iframeWin.ampExtendedElements &&
+              iframeWin.ampExtendedElements['amp-test']
+          ).to.not.exist;
+          preinstallCount++;
+        }
+      );
       expect(preinstallCount).to.equal(1);
       expect(iframeWin.ampExtendedElements).to.exist;
       expect(iframeWin.ampExtendedElements['amp-img']).to.exist;
-      expect(iframeWin.ampExtendedElements['amp-img'])
-          .to.not.equal(ElementStub);
+      expect(iframeWin.ampExtendedElements['amp-img']).to.not.equal(
+        ElementStub
+      );
       expect(iframeWin.ampExtendedElements['amp-test']).to.equal(ElementStub);
 
       // Resolve the promise.
-      extensions.registerExtension('amp-test', AMP => {
-        AMP.registerElement('amp-test', AmpTest);
-      }, parentWin.AMP);
+      extensions.registerExtension(
+        'amp-test',
+        AMP => {
+          AMP.registerElement('amp-test', AmpTest);
+        },
+        parentWin.AMP
+      );
       return promise.then(() => {
         // Extension elements are stubbed immediately, but registered only
         // after extension is loaded.
diff --git a/test/unit/test-finite-state-machine.js b/test/unit/test-finite-state-machine.js
index a91e69e69872..31fcbd13d33d 100644
--- a/test/unit/test-finite-state-machine.js
+++ b/test/unit/test-finite-state-machine.js
@@ -17,7 +17,6 @@
 import {FiniteStateMachine} from '../../src/finite-state-machine';
 
 describe('Finite State Machine', () => {
-
   describe('simple machines', () => {
     let sandbox;
     let fsm;
diff --git a/test/unit/test-fixed-layer.js b/test/unit/test-fixed-layer.js
index b1bcd467e07e..bfb04c05682a 100644
--- a/test/unit/test-fixed-layer.js
+++ b/test/unit/test-fixed-layer.js
@@ -14,17 +14,12 @@
  * limitations under the License.
  */
 
-import {
-  AmpDocSingle,
-  installDocService,
-} from '../../src/service/ampdoc-impl';
+import {AmpDocSingle, installDocService} from '../../src/service/ampdoc-impl';
 import {FakeMutationObserver, FakeWindow} from '../../testing/fake-dom';
 import {FixedLayer} from '../../src/service/fixed-layer';
 import {Services} from '../../src/services';
 import {endsWith} from '../../src/string';
-import {
-  installHiddenObserverForDoc,
-} from '../../src/service/hidden-observer-impl';
+import {installHiddenObserverForDoc} from '../../src/service/hidden-observer-impl';
 import {installPlatformService} from '../../src/service/platform-impl';
 import {installTimerService} from '../../src/service/timer-impl';
 import {toggle} from '../../src/style';
@@ -66,8 +61,10 @@ describes.sandboxed('FixedLayer', {}, () => {
     docBody.appendChild(element5);
     docBody.appendChild(element6);
 
-    const invalidRule = createValidRule('#invalid', 'fixed',
-        [element1, element3]);
+    const invalidRule = createValidRule('#invalid', 'fixed', [
+      element1,
+      element3,
+    ]);
     documentApi = {
       styleSheets: [
         // Will be ignored due to being a link.
@@ -101,12 +98,15 @@ describes.sandboxed('FixedLayer', {}, () => {
           ownerNode: createStyleNode('amp-custom'),
           cssRules: [
             createValidRule('#amp-custom-rule1', 'fixed', [element1]),
-            createValidRule('#doc-body-id #amp-custom-rule1', 'fixed',
-                [element1]),
+            createValidRule('#doc-body-id #amp-custom-rule1', 'fixed', [
+              element1,
+            ]),
             createValidRule('#amp-custom-rule2', 'fixed', [element1, element2]),
             createUnrelatedRule('#amp-custom-rule3', [element3]),
-            createValidRule('#amp-custom-rule4', 'sticky',
-                [element2, element4]),
+            createValidRule('#amp-custom-rule4', 'sticky', [
+              element2,
+              element4,
+            ]),
             createValidRule('#amp-custom-rule5', '-webkit-sticky', [element5]),
             {
               type: 4,
@@ -117,8 +117,9 @@ describes.sandboxed('FixedLayer', {}, () => {
             {
               type: 12,
               cssRules: [
-                createValidRule('#amp-custom-supports-rule1', 'fixed',
-                    [element2]),
+                createValidRule('#amp-custom-supports-rule1', 'fixed', [
+                  element2,
+                ]),
               ],
             },
             // Uknown rule.
@@ -144,7 +145,7 @@ describes.sandboxed('FixedLayer', {}, () => {
         return allRules[selector].elements;
       },
       contains: elem => {
-        return (!!elem.parentElement);
+        return !!elem.parentElement;
       },
       defaultView: {
         setTimeout: window.setTimeout,
@@ -270,10 +271,15 @@ describes.sandboxed('FixedLayer', {}, () => {
           // Override if important
           if (priority === 'important') {
             elem.style[privProp] = `${value} !${priority}`;
-          } else if (elem.style[privProp] ||
-              !endsWith(elem.computedStyle[prop], '!important')) {
-            if (prop === 'transition' && !value &&
-                endsWith(elem.style[privProp] || '', '!important')) {
+          } else if (
+            elem.style[privProp] ||
+            !endsWith(elem.computedStyle[prop], '!important')
+          ) {
+            if (
+              prop === 'transition' &&
+              !value &&
+              endsWith(elem.style[privProp] || '', '!important')
+            ) {
               // Emulate a stupid Safari bug.
               // noop.
             } else {
@@ -289,9 +295,11 @@ describes.sandboxed('FixedLayer', {}, () => {
         visibility: 'visible',
         _top: '',
         get top() {
-          if (elem.computedStyle.transition &&
-              elem.style.transition !== '' &&
-              elem.style.transition !== 'none !important') {
+          if (
+            elem.computedStyle.transition &&
+            elem.style.transition !== '' &&
+            elem.style.transition !== 'none !important'
+          ) {
             return this._oldTop;
           }
           if (elem.style.bottom) {
@@ -385,7 +393,8 @@ describes.sandboxed('FixedLayer', {}, () => {
         }
         // Updating the placeholder means we have to update the tests.
         expect(html.trim()).to.equal(
-            '<i-amphtml-fpa style="display: none"></i-amphtml-fpa>');
+          '<i-amphtml-fpa style="display: none"></i-amphtml-fpa>'
+        );
         this.firstElementChild = createElement('i-amphtml-fpa');
         toggle(this.firstElementChild, false);
       },
@@ -430,751 +439,768 @@ describes.sandboxed('FixedLayer', {}, () => {
   }
 
   // TODO(jridgewell, #11827): Make this test work on Safari.
-  describe.configure().skipSafari().run('no-transfer', () => {
-    let fixedLayer;
-
-    beforeEach(() => {
-      fixedLayer = new FixedLayer(ampdoc, vsyncApi,
-          /* borderTop */ 0, /* paddingTop */ 11, /* transfer */ false);
-      fixedLayer.setup();
-    });
-
-    it('should initialize fixed layer to null', () => {
-      expect(fixedLayer.transferLayer_).to.be.null;
-    });
+  describe
+    .configure()
+    .skipSafari()
+    .run('no-transfer', () => {
+      let fixedLayer;
 
-    it('should discover all potentials', () => {
-      function expectFe(actual, expected) {
-        expect(actual.id).to.equal(expected.id, `${expected.id} wrong`);
-        expect(actual.element).to.equal(expected.element,
-            `${expected.id}: wrong element`);
-        expect(actual.position).to.equal(expected.position,
-            `${expected.id}: wrong position`);
-        expect(JSON.stringify(actual.selectors))
-            .to.equal(JSON.stringify(expected.selectors),
-                `${expected.id}: wrong selectors`);
-      }
-
-      expect(fixedLayer.elements_).to.have.length(5);
-      expectFe(fixedLayer.elements_[0], {
-        id: 'F0',
-        element: element1,
-        position: 'fixed',
-        selectors: [
-          '#amp-custom-rule1',
-          '#doc-body-id #amp-custom-rule1',
-          '#amp-custom-rule2',
-          '#amp-custom-media-rule1',
-          '#other-rule1',
-        ],
-      });
-      expectFe(fixedLayer.elements_[1], {
-        id: 'F1',
-        element: element2,
-        position: 'fixed',
-        selectors: [
-          '#amp-custom-rule2',
-          '#amp-custom-supports-rule1',
-          '#other-rule2',
-        ],
-      });
-      expectFe(fixedLayer.elements_[2], {
-        id: 'F2',
-        element: element2,
-        position: 'sticky',
-        selectors: [
-          '#amp-custom-rule4',
-        ],
-      });
-      expectFe(fixedLayer.elements_[3], {
-        id: 'F3',
-        element: element4,
-        position: 'sticky',
-        selectors: [
-          '#amp-custom-rule4',
-        ],
-      });
-      expectFe(fixedLayer.elements_[4], {
-        id: 'F4',
-        element: element5,
-        position: 'sticky',
-        selectors: [
-          '#amp-custom-rule5',
-        ],
+      beforeEach(() => {
+        fixedLayer = new FixedLayer(
+          ampdoc,
+          vsyncApi,
+          /* borderTop */ 0,
+          /* paddingTop */ 11,
+          /* transfer */ false
+        );
+        fixedLayer.setup();
       });
-      expect(fixedLayer.isDeclaredFixed(element1)).to.be.true;
-      expect(fixedLayer.isDeclaredSticky(element1)).to.be.false;
-      expect(fixedLayer.isDeclaredFixed(element2)).to.be.true;
-      expect(fixedLayer.isDeclaredSticky(element2)).to.be.true;
-      expect(fixedLayer.isDeclaredFixed(element3)).to.be.false;
-      expect(fixedLayer.isDeclaredSticky(element3)).to.be.false;
-      expect(fixedLayer.isDeclaredSticky(element4)).to.be.true;
-      expect(fixedLayer.isDeclaredSticky(element5)).to.be.true;
-    });
 
-    it('should add and remove element directly', () => {
-      const updateStub = sandbox.stub(fixedLayer, 'update');
-      expect(fixedLayer.elements_).to.have.length(5);
-
-      // Add.
-      fixedLayer.addElement(element6);
-      expect(updateStub).to.be.calledOnce;
-      expect(fixedLayer.elements_).to.have.length(6);
-      const fe = fixedLayer.elements_[5];
-      expect(fe.id).to.equal('F5');
-      expect(fe.element).to.equal(element6);
-      expect(fe.selectors).to.deep.equal(['*']);
-      expect(fe.forceTransfer).to.be.undefined;
-
-      // Remove.
-      fixedLayer.removeElement(element6);
-      expect(fixedLayer.elements_).to.have.length(5);
-
-      // Add with forceTransfer=true.
-      fixedLayer.addElement(element6, true);
-      expect(updateStub).to.have.callCount(2);
-      expect(fixedLayer.elements_).to.have.length(6);
-      const fe1 = fixedLayer.elements_[5];
-      expect(fe1.id).to.equal('F6');
-      expect(fe1.element).to.equal(element6);
-      expect(fe1.selectors).to.deep.equal(['*']);
-      expect(fe1.forceTransfer).to.be.true;
-
-      // Remove.
-      fixedLayer.removeElement(element6);
-      expect(fixedLayer.elements_).to.have.length(5);
-
-      // Add with forceTransfer=false.
-      fixedLayer.addElement(element6, false);
-      expect(updateStub).to.have.callCount(3);
-      expect(fixedLayer.elements_).to.have.length(6);
-      const fe2 = fixedLayer.elements_[5];
-      expect(fe2.id).to.equal('F7');
-      expect(fe2.element).to.equal(element6);
-      expect(fe2.selectors).to.deep.equal(['*']);
-      expect(fe2.forceTransfer).to.be.false;
-
-      // Remove.
-      fixedLayer.removeElement(element6);
-      expect(fixedLayer.elements_).to.have.length(5);
-    });
-
-    it('should remove node when disappeared from DOM', () => {
-      docBody.removeChild(element1);
-      expect(fixedLayer.elements_).to.have.length(5);
-      fixedLayer.update();
-      expect(fixedLayer.elements_).to.have.length(4);
-    });
-
-    it('should remove all candidates', () => {
-      // element2 is both fixed and sticky.
-      docBody.removeChild(element2);
-      expect(fixedLayer.elements_).to.have.length(5);
-      fixedLayer.update();
-      expect(fixedLayer.elements_).to.have.length(3);
-    });
-
-    it('should collect updates', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
+      it('should initialize fixed layer to null', () => {
+        expect(fixedLayer.transferLayer_).to.be.null;
+      });
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+      it('should discover all potentials', () => {
+        function expectFe(actual, expected) {
+          expect(actual.id).to.equal(expected.id, `${expected.id} wrong`);
+          expect(actual.element).to.equal(
+            expected.element,
+            `${expected.id}: wrong element`
+          );
+          expect(actual.position).to.equal(
+            expected.position,
+            `${expected.id}: wrong position`
+          );
+          expect(JSON.stringify(actual.selectors)).to.equal(
+            JSON.stringify(expected.selectors),
+            `${expected.id}: wrong selectors`
+          );
+        }
 
-      // F0: element1
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].sticky).to.be.false;
-      expect(state['F0'].top).to.equal('');
-      expect(state['F0'].zIndex).to.equal('');
+        expect(fixedLayer.elements_).to.have.length(5);
+        expectFe(fixedLayer.elements_[0], {
+          id: 'F0',
+          element: element1,
+          position: 'fixed',
+          selectors: [
+            '#amp-custom-rule1',
+            '#doc-body-id #amp-custom-rule1',
+            '#amp-custom-rule2',
+            '#amp-custom-media-rule1',
+            '#other-rule1',
+          ],
+        });
+        expectFe(fixedLayer.elements_[1], {
+          id: 'F1',
+          element: element2,
+          position: 'fixed',
+          selectors: [
+            '#amp-custom-rule2',
+            '#amp-custom-supports-rule1',
+            '#other-rule2',
+          ],
+        });
+        expectFe(fixedLayer.elements_[2], {
+          id: 'F2',
+          element: element2,
+          position: 'sticky',
+          selectors: ['#amp-custom-rule4'],
+        });
+        expectFe(fixedLayer.elements_[3], {
+          id: 'F3',
+          element: element4,
+          position: 'sticky',
+          selectors: ['#amp-custom-rule4'],
+        });
+        expectFe(fixedLayer.elements_[4], {
+          id: 'F4',
+          element: element5,
+          position: 'sticky',
+          selectors: ['#amp-custom-rule5'],
+        });
+        expect(fixedLayer.isDeclaredFixed(element1)).to.be.true;
+        expect(fixedLayer.isDeclaredSticky(element1)).to.be.false;
+        expect(fixedLayer.isDeclaredFixed(element2)).to.be.true;
+        expect(fixedLayer.isDeclaredSticky(element2)).to.be.true;
+        expect(fixedLayer.isDeclaredFixed(element3)).to.be.false;
+        expect(fixedLayer.isDeclaredSticky(element3)).to.be.false;
+        expect(fixedLayer.isDeclaredSticky(element4)).to.be.true;
+        expect(fixedLayer.isDeclaredSticky(element5)).to.be.true;
+      });
 
-      // F1: element2
-      expect(state['F1'].fixed).to.equal(false);
-      expect(state['F1'].sticky).to.equal(false);
+      it('should add and remove element directly', () => {
+        const updateStub = sandbox.stub(fixedLayer, 'update');
+        expect(fixedLayer.elements_).to.have.length(5);
+
+        // Add.
+        fixedLayer.addElement(element6);
+        expect(updateStub).to.be.calledOnce;
+        expect(fixedLayer.elements_).to.have.length(6);
+        const fe = fixedLayer.elements_[5];
+        expect(fe.id).to.equal('F5');
+        expect(fe.element).to.equal(element6);
+        expect(fe.selectors).to.deep.equal(['*']);
+        expect(fe.forceTransfer).to.be.undefined;
+
+        // Remove.
+        fixedLayer.removeElement(element6);
+        expect(fixedLayer.elements_).to.have.length(5);
+
+        // Add with forceTransfer=true.
+        fixedLayer.addElement(element6, true);
+        expect(updateStub).to.have.callCount(2);
+        expect(fixedLayer.elements_).to.have.length(6);
+        const fe1 = fixedLayer.elements_[5];
+        expect(fe1.id).to.equal('F6');
+        expect(fe1.element).to.equal(element6);
+        expect(fe1.selectors).to.deep.equal(['*']);
+        expect(fe1.forceTransfer).to.be.true;
+
+        // Remove.
+        fixedLayer.removeElement(element6);
+        expect(fixedLayer.elements_).to.have.length(5);
+
+        // Add with forceTransfer=false.
+        fixedLayer.addElement(element6, false);
+        expect(updateStub).to.have.callCount(3);
+        expect(fixedLayer.elements_).to.have.length(6);
+        const fe2 = fixedLayer.elements_[5];
+        expect(fe2.id).to.equal('F7');
+        expect(fe2.element).to.equal(element6);
+        expect(fe2.selectors).to.deep.equal(['*']);
+        expect(fe2.forceTransfer).to.be.false;
+
+        // Remove.
+        fixedLayer.removeElement(element6);
+        expect(fixedLayer.elements_).to.have.length(5);
+      });
 
-      // F2: element3
-      expect(state['F2'].fixed).to.equal(false);
-      expect(state['F2'].sticky).to.equal(false);
+      it('should remove node when disappeared from DOM', () => {
+        docBody.removeChild(element1);
+        expect(fixedLayer.elements_).to.have.length(5);
+        fixedLayer.update();
+        expect(fixedLayer.elements_).to.have.length(4);
+      });
 
-      // F3: element4
-      expect(state['F3'].fixed).to.be.false;
-      expect(state['F3'].sticky).to.be.false;
-      expect(state['F3'].top).to.equal('');
-      expect(state['F3'].zIndex).to.equal('');
+      it('should remove all candidates', () => {
+        // element2 is both fixed and sticky.
+        docBody.removeChild(element2);
+        expect(fixedLayer.elements_).to.have.length(5);
+        fixedLayer.update();
+        expect(fixedLayer.elements_).to.have.length(3);
+      });
 
-      // F4: element5
-      expect(state['F4'].fixed).to.be.false;
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('');
-      expect(state['F4'].zIndex).to.equal('');
-    });
+      it('should collect updates', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
 
-    it('should support vendor-based sticky', () => {
-      element5.computedStyle['position'] = '-webkit-sticky';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        // F0: element1
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].sticky).to.be.false;
+        expect(state['F0'].top).to.equal('');
+        expect(state['F0'].zIndex).to.equal('');
+
+        // F1: element2
+        expect(state['F1'].fixed).to.equal(false);
+        expect(state['F1'].sticky).to.equal(false);
+
+        // F2: element3
+        expect(state['F2'].fixed).to.equal(false);
+        expect(state['F2'].sticky).to.equal(false);
+
+        // F3: element4
+        expect(state['F3'].fixed).to.be.false;
+        expect(state['F3'].sticky).to.be.false;
+        expect(state['F3'].top).to.equal('');
+        expect(state['F3'].zIndex).to.equal('');
+
+        // F4: element5
+        expect(state['F4'].fixed).to.be.false;
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('');
+        expect(state['F4'].zIndex).to.equal('');
+      });
 
-      expect(state['F4'].sticky).to.be.true;
-    });
+      it('should support vendor-based sticky', () => {
+        element5.computedStyle['position'] = '-webkit-sticky';
 
-    it('should disregard non-fixed position', () => {
-      element1.computedStyle['position'] = 'static';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'static';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+      });
 
-      expect(state['F0'].fixed).to.be.false;
-      expect(state['F1'].fixed).to.be.false;
-      expect(state['F4'].fixed).to.be.false;
-    });
+      it('should disregard non-fixed position', () => {
+        element1.computedStyle['position'] = 'static';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'static';
 
-    it('should disregard invisible element, but for fixed only', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.offsetWidth = 0;
-      element1.offsetHeight = 0;
-      element5.computedStyle['position'] = 'sticky';
-      element5.offsetWidth = 0;
-      element5.offsetHeight = 0;
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F0'].fixed).to.be.false;
+        expect(state['F1'].fixed).to.be.false;
+        expect(state['F4'].fixed).to.be.false;
+      });
 
-      expect(state['F0'].fixed).to.be.false;
-      expect(state['F1'].fixed).to.be.false;
-      expect(state['F4'].sticky).to.be.true;
-    });
+      it('should disregard invisible element, but for fixed only', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.offsetWidth = 0;
+        element1.offsetHeight = 0;
+        element5.computedStyle['position'] = 'sticky';
+        element5.offsetWidth = 0;
+        element5.offsetHeight = 0;
 
-    it('should disregard display:none element', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element1.computedStyle['display'] = 'none';
-      element5.computedStyle['position'] = 'sticky';
-      element5.offsetWidth = 10;
-      element5.offsetHeight = 10;
-      element5.computedStyle['display'] = 'none';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F0'].fixed).to.be.false;
+        expect(state['F1'].fixed).to.be.false;
+        expect(state['F4'].sticky).to.be.true;
+      });
 
-      expect(state['F0'].fixed).to.be.false;
-      expect(state['F1'].fixed).to.be.false;
-      expect(state['F4'].sticky).to.be.false;
-    });
+      it('should disregard display:none element', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element1.computedStyle['display'] = 'none';
+        element5.computedStyle['position'] = 'sticky';
+        element5.offsetWidth = 10;
+        element5.offsetHeight = 10;
+        element5.computedStyle['display'] = 'none';
 
-    it('should tolerate getComputedStyle = null', () => {
-      // See #3096 and https://bugzilla.mozilla.org/show_bug.cgi?id=548397
-      documentApi.defaultView.getComputedStyle = () => null;
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      element1.computedStyle['position'] = 'fixed';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
+        expect(state['F0'].fixed).to.be.false;
+        expect(state['F1'].fixed).to.be.false;
+        expect(state['F4'].sticky).to.be.false;
+      });
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+      it('should tolerate getComputedStyle = null', () => {
+        // See #3096 and https://bugzilla.mozilla.org/show_bug.cgi?id=548397
+        documentApi.defaultView.getComputedStyle = () => null;
 
-      expect(state['F0'].fixed).to.be.false;
-      expect(state['F0'].sticky).to.be.false;
-      expect(state['F0'].transferrable).to.be.false;
-      expect(state['F0'].top).to.equal('');
-      expect(state['F0'].zIndex).to.equal('');
+        element1.computedStyle['position'] = 'fixed';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
 
-      expect(state['F1'].fixed).to.be.false;
-      expect(state['F1'].sticky).to.be.false;
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should collect for top != auto', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '11px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '11px';
+        expect(state['F0'].fixed).to.be.false;
+        expect(state['F0'].sticky).to.be.false;
+        expect(state['F0'].transferrable).to.be.false;
+        expect(state['F0'].top).to.equal('');
+        expect(state['F0'].zIndex).to.equal('');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F1'].fixed).to.be.false;
+        expect(state['F1'].sticky).to.be.false;
+      });
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].sticky).to.be.false;
-      expect(state['F0'].top).to.equal('11px');
+      it('should collect for top != auto', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '11px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '11px';
 
-      expect(state['F4'].fixed).to.be.false;
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('11px');
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should collect for top = auto, but not update top', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = 'auto';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = 'auto';
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].sticky).to.be.false;
+        expect(state['F0'].top).to.equal('11px');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].fixed).to.be.false;
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('11px');
+      });
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].sticky).to.be.false;
-      expect(state['F0'].top).to.equal('');
+      it('should collect for top = auto, but not update top', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = 'auto';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = 'auto';
 
-      expect(state['F4'].fixed).to.be.false;
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('');
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should work around top=0 for sticky', () => {
-      // See http://crbug.com/703816.
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '0px';
-      element5.autoTop = '12px';
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].sticky).to.be.false;
+        expect(state['F0'].top).to.equal('');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].fixed).to.be.false;
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('');
+      });
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('');
-    });
+      it('should work around top=0 for sticky', () => {
+        // See http://crbug.com/703816.
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '0px';
+        element5.autoTop = '12px';
 
-    it('should work around top=0 for sticky when offset = 0', () => {
-      // See http://crbug.com/703816.
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '0px';
-      element5.autoTop = '0px';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('');
+      });
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('0px');
-    });
+      it('should work around top=0 for sticky when offset = 0', () => {
+        // See http://crbug.com/703816.
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '0px';
+        element5.autoTop = '0px';
 
-    it('should NOT work around top=0 for sticky for non-implicit top', () => {
-      // See http://crbug.com/703816.
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '0px';
-      element5.autoTop = '12px';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('0px');
+      });
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('');
-    });
+      it('should NOT work around top=0 for sticky for non-implicit top', () => {
+        // See http://crbug.com/703816.
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '0px';
+        element5.autoTop = '12px';
 
-    it('should collect for implicit top = auto, but not update top', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '0px';
-      element1.autoTop = '12px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.autoTop = '12px';
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('');
+      });
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('');
+      it('should collect for implicit top = auto, but not update top', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '0px';
+        element1.autoTop = '12px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.autoTop = '12px';
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('');
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should override implicit top = auto to 0 when equals padding', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '11px';
-      element1.autoTop = '0px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '11px';
-      element5.autoTop = '11px';
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('');
+      });
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('0px');
+      it('should override implicit top = auto to 0 when equals padding', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '11px';
+        element1.autoTop = '0px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '11px';
+        element5.autoTop = '11px';
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('11px');
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should override implicit top = auto to 0 and padding + border', () => {
-      fixedLayer.borderTop_ = 1;
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '12px';
-      element1.autoTop = '0px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '12px';
-      element5.autoTop = '12px';
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('0px');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('11px');
+      });
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('0px');
+      it('should override implicit top = auto to 0 and padding + border', () => {
+        fixedLayer.borderTop_ = 1;
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '12px';
+        element1.autoTop = '0px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '12px';
+        element5.autoTop = '12px';
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('12px');
-    });
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-    it('should override implicit top = auto to 0 w/transient padding', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '11px';
-      element1.autoTop = '0px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '11px';
-      element5.autoTop = '11px';
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('0px');
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('12px');
+      });
 
-      expect(state['F0'].fixed).to.equal(true);
-      expect(state['F0'].top).to.equal('0px');
+      it('should override implicit top = auto to 0 w/transient padding', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '11px';
+        element1.autoTop = '0px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '11px';
+        element5.autoTop = '11px';
 
-      // Update to transient padding.
-      sandbox.stub(fixedLayer, 'update').callsFake(() => {});
-      fixedLayer.updatePaddingTop(22, /* transient */ true);
-      vsyncTasks[0].measure(state);
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('0px');
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('11px');
-      expect(fixedLayer.paddingTop_).to.equal(22);
-      expect(fixedLayer.committedPaddingTop_).to.equal(11);
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      // Update to non-transient padding.
-      fixedLayer.updatePaddingTop(22, /* transient */ false);
-      vsyncTasks[0].measure(state);
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal(''); // Reset completely.
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('11px');
-      expect(fixedLayer.paddingTop_).to.equal(22);
-      expect(fixedLayer.committedPaddingTop_).to.equal(22);
-    });
+        expect(state['F0'].fixed).to.equal(true);
+        expect(state['F0'].top).to.equal('0px');
 
-    it('should always collect and update top = 0', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['top'] = '0px';
-      element1.autoTop = '0px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['top'] = '0px';
-      element5.autoTop = '0px';
+        // Update to transient padding.
+        sandbox.stub(fixedLayer, 'update').callsFake(() => {});
+        fixedLayer.updatePaddingTop(22, /* transient */ true);
+        vsyncTasks[0].measure(state);
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('0px');
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('11px');
+        expect(fixedLayer.paddingTop_).to.equal(22);
+        expect(fixedLayer.committedPaddingTop_).to.equal(11);
+
+        // Update to non-transient padding.
+        fixedLayer.updatePaddingTop(22, /* transient */ false);
+        vsyncTasks[0].measure(state);
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal(''); // Reset completely.
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('11px');
+        expect(fixedLayer.paddingTop_).to.equal(22);
+        expect(fixedLayer.committedPaddingTop_).to.equal(22);
+      });
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+      it('should always collect and update top = 0', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['top'] = '0px';
+        element1.autoTop = '0px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['top'] = '0px';
+        element5.autoTop = '0px';
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('0px');
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('0px');
-    });
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('0px');
 
-    it('should handle transitions', () => {
-      element1.computedStyle['position'] = 'fixed';
-      element1.computedStyle['transition'] = 'all .4s ease';
-      element1.computedStyle['top'] = '0px';
-      element1.autoTop = '0px';
-      element1.offsetWidth = 10;
-      element1.offsetHeight = 10;
-      element5.computedStyle['position'] = 'sticky';
-      element5.computedStyle['transition'] = 'all .4s ease';
-      element5.computedStyle['top'] = '0px';
-      element5.autoTop = '0px';
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('0px');
+      });
 
-      expect(vsyncTasks).to.have.length(1);
-      const state = {};
-      vsyncTasks[0].measure(state);
+      it('should handle transitions', () => {
+        element1.computedStyle['position'] = 'fixed';
+        element1.computedStyle['transition'] = 'all .4s ease';
+        element1.computedStyle['top'] = '0px';
+        element1.autoTop = '0px';
+        element1.offsetWidth = 10;
+        element1.offsetHeight = 10;
+        element5.computedStyle['position'] = 'sticky';
+        element5.computedStyle['transition'] = 'all .4s ease';
+        element5.computedStyle['top'] = '0px';
+        element5.autoTop = '0px';
 
-      expect(state['F0'].fixed).to.be.true;
-      expect(state['F0'].top).to.equal('0px');
-      expect(element1.style.transition).to.equal('none !important');
+        expect(vsyncTasks).to.have.length(1);
+        const state = {};
+        vsyncTasks[0].measure(state);
 
-      expect(state['F4'].sticky).to.be.true;
-      expect(state['F4'].top).to.equal('0px');
-      expect(element5.style.transition).to.equal('none !important');
+        expect(state['F0'].fixed).to.be.true;
+        expect(state['F0'].top).to.equal('0px');
+        expect(element1.style.transition).to.equal('none !important');
 
-      vsyncTasks[0].mutate({});
-      expect(element1.style.transition).to.equal('');
-      expect(element5.style.transition).to.equal('');
-    });
+        expect(state['F4'].sticky).to.be.true;
+        expect(state['F4'].top).to.equal('0px');
+        expect(element5.style.transition).to.equal('none !important');
 
-    it('should mutate element to fixed without top', () => {
-      const fe = fixedLayer.elements_[0];
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        sticky: false,
-        top: '',
+        vsyncTasks[0].mutate({});
+        expect(element1.style.transition).to.equal('');
+        expect(element5.style.transition).to.equal('');
       });
 
-      expect(fe.fixedNow).to.be.true;
-      expect(fe.stickyNow).to.be.false;
-      expect(fe.element.style.top).to.equal('15px');
-      expect(fixedLayer.transferLayer_).to.be.null;
-    });
+      it('should mutate element to fixed without top', () => {
+        const fe = fixedLayer.elements_[0];
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          sticky: false,
+          top: '',
+        });
 
-    it('should mutate element to sticky without top', () => {
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: false,
-        sticky: true,
-        top: '',
+        expect(fe.fixedNow).to.be.true;
+        expect(fe.stickyNow).to.be.false;
+        expect(fe.element.style.top).to.equal('15px');
+        expect(fixedLayer.transferLayer_).to.be.null;
       });
 
-      expect(fe.fixedNow).to.be.false;
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('15px');
-      expect(fixedLayer.transferLayer_).to.be.null;
-    });
+      it('should mutate element to sticky without top', () => {
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: false,
+          sticky: true,
+          top: '',
+        });
 
-    it('should mutate element to fixed with top', () => {
-      const fe = fixedLayer.elements_[0];
-      element1.style.top = '';
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        top: '17px',
+        expect(fe.fixedNow).to.be.false;
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('15px');
+        expect(fixedLayer.transferLayer_).to.be.null;
       });
 
-      expect(fe.fixedNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
-    });
+      it('should mutate element to fixed with top', () => {
+        const fe = fixedLayer.elements_[0];
+        element1.style.top = '';
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          top: '17px',
+        });
 
-    it('should add needed padding to sticky top if transferring', () => {
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.transfer_ = true;
-      fe.element.style.top = '';
-      fixedLayer.mutateElement_(fe, 1, {
-        sticky: true,
-        top: '17px',
+        expect(fe.fixedNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
       });
 
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('17px');
-    });
+      it('should add needed padding to sticky top if transferring', () => {
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.transfer_ = true;
+        fe.element.style.top = '';
+        fixedLayer.mutateElement_(fe, 1, {
+          sticky: true,
+          top: '17px',
+        });
 
-    it('should not add unneeded padding to sticky top if transferring', () => {
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.transfer_ = true;
-      fixedLayer.paddingTop_ = 0;
-      fe.element.style.top = '';
-      fixedLayer.mutateElement_(fe, 1, {
-        sticky: true,
-        top: '17px',
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('17px');
       });
 
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px - 11px)');
-    });
+      it('should not add unneeded padding to sticky top if transferring', () => {
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.transfer_ = true;
+        fixedLayer.paddingTop_ = 0;
+        fe.element.style.top = '';
+        fixedLayer.mutateElement_(fe, 1, {
+          sticky: true,
+          top: '17px',
+        });
 
-    it('should mutate element to sticky with top', () => {
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.mutateElement_(fe, 1, {
-        sticky: true,
-        top: '17px',
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px - 11px)');
       });
 
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
-    });
-
-    it('should reset top upon being removed from fixedlayer', () => {
-      expect(fixedLayer.elements_).to.have.length(5);
+      it('should mutate element to sticky with top', () => {
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.mutateElement_(fe, 1, {
+          sticky: true,
+          top: '17px',
+        });
 
-      // Add.
-      fixedLayer.addElement(element6, '*');
-      expect(fixedLayer.elements_).to.have.length(6);
-      const fe = fixedLayer.elements_[5];
-      expect(fe.id).to.equal('F5');
-      expect(fe.element).to.equal(element6);
-      expect(fe.selectors).to.deep.equal(['*']);
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        top: '17px',
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
       });
 
-      expect(fe.fixedNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
-      // Remove.
-      fixedLayer.vsync_ = {
-        mutate(callback) {
-          callback();
-        },
-      };
-      fixedLayer.removeElement(element6);
-      expect(fixedLayer.elements_).to.have.length(5);
-      expect(element6.style.top).to.equal('');
-    });
-
-    it('should reset sticky top upon being removed from fixedlayer', () => {
-      expect(fixedLayer.elements_).to.have.length(5);
+      it('should reset top upon being removed from fixedlayer', () => {
+        expect(fixedLayer.elements_).to.have.length(5);
+
+        // Add.
+        fixedLayer.addElement(element6, '*');
+        expect(fixedLayer.elements_).to.have.length(6);
+        const fe = fixedLayer.elements_[5];
+        expect(fe.id).to.equal('F5');
+        expect(fe.element).to.equal(element6);
+        expect(fe.selectors).to.deep.equal(['*']);
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          top: '17px',
+        });
 
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.mutateElement_(fe, 1, {
-        sticky: true,
-        top: '17px',
+        expect(fe.fixedNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+        // Remove.
+        fixedLayer.vsync_ = {
+          mutate(callback) {
+            callback();
+          },
+        };
+        fixedLayer.removeElement(element6);
+        expect(fixedLayer.elements_).to.have.length(5);
+        expect(element6.style.top).to.equal('');
       });
 
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+      it('should reset sticky top upon being removed from fixedlayer', () => {
+        expect(fixedLayer.elements_).to.have.length(5);
 
-      // Remove.
-      fixedLayer.vsync_ = {
-        mutate(callback) {
-          callback();
-        },
-      };
-      fixedLayer.removeElement(element5);
-      expect(fixedLayer.elements_).to.have.length(4);
-      expect(element5.style.top).to.equal('');
-    });
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.mutateElement_(fe, 1, {
+          sticky: true,
+          top: '17px',
+        });
 
-    it('should transform fixed elements with anchored top', () => {
-      const fe = fixedLayer.elements_[0];
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        top: '17px',
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
+
+        // Remove.
+        fixedLayer.vsync_ = {
+          mutate(callback) {
+            callback();
+          },
+        };
+        fixedLayer.removeElement(element5);
+        expect(fixedLayer.elements_).to.have.length(4);
+        expect(element5.style.top).to.equal('');
       });
-      expect(fe.fixedNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      fixedLayer.transformMutate('translateY(-10px)');
-      expect(fe.element.style.transform).to.equal('translateY(-10px)');
-      expect(fe.element.style.transition).to.equal('none');
+      it('should transform fixed elements with anchored top', () => {
+        const fe = fixedLayer.elements_[0];
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          top: '17px',
+        });
+        expect(fe.fixedNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      // Reset back.
-      fixedLayer.transformMutate(null);
-      expect(fe.element.style.transform).to.equal('');
-      expect(fe.element.style.transition).to.equal('');
-    });
+        fixedLayer.transformMutate('translateY(-10px)');
+        expect(fe.element.style.transform).to.equal('translateY(-10px)');
+        expect(fe.element.style.transition).to.equal('none');
 
-    it('should NOT transform sticky elements with anchored top', () => {
-      const fe = fixedLayer.elements_[4];
-      fixedLayer.mutateElement_(fe, 1, {
-        sticky: true,
-        top: '17px',
+        // Reset back.
+        fixedLayer.transformMutate(null);
+        expect(fe.element.style.transform).to.equal('');
+        expect(fe.element.style.transition).to.equal('');
       });
-      expect(fe.stickyNow).to.be.true;
-      expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      fixedLayer.transformMutate('translateY(-10px)');
-      expect(fe.element.style.transform).to.be.undefined;
-      expect(fe.element.style.transition).to.equal('');
+      it('should NOT transform sticky elements with anchored top', () => {
+        const fe = fixedLayer.elements_[4];
+        fixedLayer.mutateElement_(fe, 1, {
+          sticky: true,
+          top: '17px',
+        });
+        expect(fe.stickyNow).to.be.true;
+        expect(fe.element.style.top).to.equal('calc(17px + 11px)');
 
-      // Reset back.
-      fixedLayer.transformMutate(null);
-      expect(fe.element.style.transform).to.be.undefined;
-      expect(fe.element.style.transition).to.equal('');
-    });
+        fixedLayer.transformMutate('translateY(-10px)');
+        expect(fe.element.style.transform).to.be.undefined;
+        expect(fe.element.style.transition).to.equal('');
 
-    it('should compound transform with anchored top', () => {
-      const fe = fixedLayer.elements_[0];
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        top: '17px',
-        transform: 'scale(2)',
+        // Reset back.
+        fixedLayer.transformMutate(null);
+        expect(fe.element.style.transform).to.be.undefined;
+        expect(fe.element.style.transition).to.equal('');
       });
 
-      fixedLayer.transformMutate('translateY(-10px)');
-      expect(fe.element.style.transform).to.equal('scale(2) translateY(-10px)');
-    });
+      it('should compound transform with anchored top', () => {
+        const fe = fixedLayer.elements_[0];
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          top: '17px',
+          transform: 'scale(2)',
+        });
 
-    it('should NOT transform fixed elements w/o anchored top', () => {
-      const fe = fixedLayer.elements_[0];
-      fe.element.style.transform = '';
-      fixedLayer.mutateElement_(fe, 1, {
-        fixed: true,
-        top: '',
+        fixedLayer.transformMutate('translateY(-10px)');
+        expect(fe.element.style.transform).to.equal(
+          'scale(2) translateY(-10px)'
+        );
       });
-      expect(fe.fixedNow).to.be.true;
-
-      fixedLayer.transformMutate('translateY(-10px)');
-      expect(fe.element.style.transform).to.equal('');
-    });
-
-    it('should user error when inline styles may be overriden', () => {
-      // Set both attribute and property since element1 is a fake element.
-      element1.setAttribute('style', 'bottom: 10px');
-      element1.style.bottom = '10px';
 
-      const userError = sandbox.stub(user(), 'error');
-      fixedLayer.setup();
-      // Expect error regarding inline styles.
-      expect(userError).calledWithMatch('FixedLayer',
-          /not supported yet for fixed or sticky elements/);
-    });
+      it('should NOT transform fixed elements w/o anchored top', () => {
+        const fe = fixedLayer.elements_[0];
+        fe.element.style.transform = '';
+        fixedLayer.mutateElement_(fe, 1, {
+          fixed: true,
+          top: '',
+        });
+        expect(fe.fixedNow).to.be.true;
 
-    describe('hidden toggle', () => {
-      let mutationObserver;
-      beforeEach(() => {
-        toggleExperiment(documentApi.defaultView, 'hidden-mutation-observer',
-            true);
-        fixedLayer.observeHiddenMutations();
-        mutationObserver = Services.hiddenObserverForDoc(
-            documentApi.documentElement).mutationObserver_;
+        fixedLayer.transformMutate('translateY(-10px)');
+        expect(fe.element.style.transform).to.equal('');
       });
 
-      it('should trigger an update', () => {
-        element1.computedStyle['position'] = 'fixed';
-        element1.offsetWidth = 10;
-        element1.offsetHeight = 10;
-        element1.computedStyle['display'] = 'none';
-
-        expect(vsyncTasks).to.have.length(1);
-        const state = {};
-        vsyncTasks[0].measure(state);
+      it('should user error when inline styles may be overriden', () => {
+        // Set both attribute and property since element1 is a fake element.
+        element1.setAttribute('style', 'bottom: 10px');
+        element1.style.bottom = '10px';
+
+        const userError = sandbox.stub(user(), 'error');
+        fixedLayer.setup();
+        // Expect error regarding inline styles.
+        expect(userError).calledWithMatch(
+          'FixedLayer',
+          /not supported yet for fixed or sticky elements/
+        );
+      });
 
-        expect(state['F0'].fixed).to.be.false;
+      describe('hidden toggle', () => {
+        let mutationObserver;
+        beforeEach(() => {
+          toggleExperiment(
+            documentApi.defaultView,
+            'hidden-mutation-observer',
+            true
+          );
+          fixedLayer.observeHiddenMutations();
+          mutationObserver = Services.hiddenObserverForDoc(
+            documentApi.documentElement
+          ).mutationObserver_;
+        });
 
-        element1.computedStyle['display'] = '';
+        it('should trigger an update', () => {
+          element1.computedStyle['position'] = 'fixed';
+          element1.offsetWidth = 10;
+          element1.offsetHeight = 10;
+          element1.computedStyle['display'] = 'none';
 
-        sandbox.stub(timer, 'delay').callsFake(callback => {
-          callback();
-        });
-        return mutationObserver.__mutate({
-          attributeName: 'hidden',
-        }).then(() => {
-          expect(vsyncTasks).to.have.length(2);
+          expect(vsyncTasks).to.have.length(1);
           const state = {};
           vsyncTasks[0].measure(state);
 
-          expect(state['F0'].fixed).to.be.true;
-          expect(state['F0'].top).to.equal('');
-          expect(state['F0'].zIndex).to.equal('');
+          expect(state['F0'].fixed).to.be.false;
+
+          element1.computedStyle['display'] = '';
+
+          sandbox.stub(timer, 'delay').callsFake(callback => {
+            callback();
+          });
+          return mutationObserver
+            .__mutate({
+              attributeName: 'hidden',
+            })
+            .then(() => {
+              expect(vsyncTasks).to.have.length(2);
+              const state = {};
+              vsyncTasks[0].measure(state);
+
+              expect(state['F0'].fixed).to.be.true;
+              expect(state['F0'].top).to.equal('');
+              expect(state['F0'].zIndex).to.equal('');
+            });
         });
       });
     });
-  });
 
   describe('with-transfer', () => {
     let fixedLayer;
@@ -1184,8 +1210,13 @@ describes.sandboxed('FixedLayer', {}, () => {
     const transfer = true;
 
     beforeEach(() => {
-      fixedLayer = new FixedLayer(ampdoc, vsyncApi, borderTop, paddingTop,
-          transfer);
+      fixedLayer = new FixedLayer(
+        ampdoc,
+        vsyncApi,
+        borderTop,
+        paddingTop,
+        transfer
+      );
       fixedLayer.setup();
     });
 
@@ -1196,7 +1227,12 @@ describes.sandboxed('FixedLayer', {}, () => {
       installTimerService(win);
 
       const fixedLayer = new FixedLayer(
-          ampdoc, vsyncApi, borderTop, paddingTop, transfer);
+        ampdoc,
+        vsyncApi,
+        borderTop,
+        paddingTop,
+        transfer
+      );
       fixedLayer.setup();
       expect(fixedLayer.transferLayer_).to.be.null;
     });
@@ -1414,8 +1450,9 @@ describes.sandboxed('FixedLayer', {}, () => {
       expect(fe.fixedNow).to.be.true;
       expect(fe.placeholder).to.exist;
       expect(fixedLayer.transferLayer_).to.exist;
-      expect(fe.element.parentElement)
-          .to.not.equal(fixedLayer.transferLayer_.layer_);
+      expect(fe.element.parentElement).to.not.equal(
+        fixedLayer.transferLayer_.layer_
+      );
       expect(fe.placeholder.parentElement).to.be.null;
       expect(fe.element.style.zIndex).to.equal('');
     });
@@ -1431,8 +1468,9 @@ describes.sandboxed('FixedLayer', {}, () => {
       });
       expect(fe.fixedNow).to.be.true;
       expect(fe.placeholder).to.exist;
-      expect(fe.element.parentElement)
-          .to.equal(fixedLayer.transferLayer_.layer_);
+      expect(fe.element.parentElement).to.equal(
+        fixedLayer.transferLayer_.layer_
+      );
       expect(fixedLayer.transferLayer_).to.exist;
       expect(fixedLayer.transferLayer_.layer_.id).to.equal('doc-body-id');
 
@@ -1484,18 +1522,24 @@ describes.sandboxed('FixedLayer', {}, () => {
       const userError = sandbox.stub(user(), 'error');
       fixedLayer.setup();
       // Expect error regarding inline styles.
-      expect(userError).calledWithMatch('FixedLayer',
-          /not supported yet for fixed or sticky elements/);
+      expect(userError).calledWithMatch(
+        'FixedLayer',
+        /not supported yet for fixed or sticky elements/
+      );
     });
 
     describe('hidden toggle', () => {
       let mutationObserver;
       beforeEach(() => {
-        toggleExperiment(documentApi.defaultView, 'hidden-mutation-observer',
-            true);
+        toggleExperiment(
+          documentApi.defaultView,
+          'hidden-mutation-observer',
+          true
+        );
         fixedLayer.observeHiddenMutations();
         mutationObserver = Services.hiddenObserverForDoc(
-            documentApi.documentElement).mutationObserver_;
+          documentApi.documentElement
+        ).mutationObserver_;
       });
 
       it('should trigger an update', () => {
@@ -1515,17 +1559,19 @@ describes.sandboxed('FixedLayer', {}, () => {
         sandbox.stub(timer, 'delay').callsFake(callback => {
           callback();
         });
-        return mutationObserver.__mutate({
-          attributeName: 'hidden',
-        }).then(() => {
-          expect(vsyncTasks).to.have.length(2);
-          const state = {};
-          vsyncTasks[0].measure(state);
-
-          expect(state['F0'].fixed).to.be.true;
-          expect(state['F0'].top).to.equal('');
-          expect(state['F0'].zIndex).to.equal('');
-        });
+        return mutationObserver
+          .__mutate({
+            attributeName: 'hidden',
+          })
+          .then(() => {
+            expect(vsyncTasks).to.have.length(2);
+            const state = {};
+            vsyncTasks[0].measure(state);
+
+            expect(state['F0'].fixed).to.be.true;
+            expect(state['F0'].top).to.equal('');
+            expect(state['F0'].zIndex).to.equal('');
+          });
       });
     });
 
@@ -1594,12 +1640,12 @@ describes.sandboxed('FixedLayer', {}, () => {
       expect(div.getAttribute('[class]')).to.equal('amp-bind');
       expect(body.getAttribute('[class]')).to.equal('amp-bind');
       expect(body.attributes.getNamedItem('[class]')).to.not.equal(
-          div.attributes.getNamedItem('[class]'));
+        div.attributes.getNamedItem('[class]')
+      );
     });
   });
 });
 
-
 describes.realWin('FixedLayer', {}, env => {
   let win, doc;
   let ampdoc;
@@ -1621,74 +1667,81 @@ describes.realWin('FixedLayer', {}, env => {
   };
 
   // Can only test when Shadow DOM is available.
-  describe.configure().if(() => Element.prototype.attachShadow).run('shadow ' +
-      'transfer', function() {
-    beforeEach(function() {
-      win = env.win;
-      doc = win.document;
-
-      installPlatformService(win);
-      installTimerService(win);
-      ampdoc = new AmpDocSingle(win);
-      shadowRoot = win.document.body.attachShadow({mode: 'open'});
-      fixedLayer = new FixedLayer(ampdoc, vsyncApi,
-          /* borderTop */ 0, /* paddingTop */ 11, /* transfer */ true);
-      fixedLayer.setup();
-      transferLayer = fixedLayer.getTransferLayer_();
-      root = transferLayer.getRoot();
-      container = doc.createElement('div');
-      doc.body.appendChild(container);
-    });
+  describe
+    .configure()
+    .if(() => Element.prototype.attachShadow)
+    .run('shadow transfer', function() {
+      beforeEach(function() {
+        win = env.win;
+        doc = win.document;
+
+        installPlatformService(win);
+        installTimerService(win);
+        ampdoc = new AmpDocSingle(win);
+        shadowRoot = win.document.body.attachShadow({mode: 'open'});
+        fixedLayer = new FixedLayer(
+          ampdoc,
+          vsyncApi,
+          /* borderTop */ 0,
+          /* paddingTop */ 11,
+          /* transfer */ true
+        );
+        fixedLayer.setup();
+        transferLayer = fixedLayer.getTransferLayer_();
+        root = transferLayer.getRoot();
+        container = doc.createElement('div');
+        doc.body.appendChild(container);
+      });
 
-    it('should create layer correctly', () => {
-      expect(root.parentNode).to.equal(shadowRoot);
-      expect(root.id).to.equal('i-amphtml-fixed-layer');
-      expect(root.style.position).to.equal('absolute');
-      expect(root.style.top).to.equal('0px');
-      expect(root.style.left).to.equal('0px');
-      expect(root.style.width).to.equal('0px');
-      expect(root.style.height).to.equal('0px');
-      expect(root.style.overflow).to.equal('hidden');
-      expect(root.style.visibility).to.equal('');
-      expect(root.children).to.have.length(1);
-      expect(root.children[0].tagName).to.equal('SLOT');
-      expect(root.children[0].name).to.equal('i-amphtml-fixed');
-    });
+      it('should create layer correctly', () => {
+        expect(root.parentNode).to.equal(shadowRoot);
+        expect(root.id).to.equal('i-amphtml-fixed-layer');
+        expect(root.style.position).to.equal('absolute');
+        expect(root.style.top).to.equal('0px');
+        expect(root.style.left).to.equal('0px');
+        expect(root.style.width).to.equal('0px');
+        expect(root.style.height).to.equal('0px');
+        expect(root.style.overflow).to.equal('hidden');
+        expect(root.style.visibility).to.equal('');
+        expect(root.children).to.have.length(1);
+        expect(root.children[0].tagName).to.equal('SLOT');
+        expect(root.children[0].name).to.equal('i-amphtml-fixed');
+      });
 
-    it('should transfer element', () => {
-      const element = doc.createElement('div');
-      container.appendChild(element);
-      const fe = {element, id: 'F0'};
-      transferLayer.transferTo(fe);
-
-      // Element stays where it was.
-      expect(element.parentElement).to.equal(container);
-      expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
-      expect(root.children).to.have.length(1);
-
-      // Ensure that repeat slotting doesn't change anything.
-      transferLayer.transferTo(fe);
-      expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
-      expect(root.children).to.have.length(1);
-    });
+      it('should transfer element', () => {
+        const element = doc.createElement('div');
+        container.appendChild(element);
+        const fe = {element, id: 'F0'};
+        transferLayer.transferTo(fe);
+
+        // Element stays where it was.
+        expect(element.parentElement).to.equal(container);
+        expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
+        expect(root.children).to.have.length(1);
+
+        // Ensure that repeat slotting doesn't change anything.
+        transferLayer.transferTo(fe);
+        expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
+        expect(root.children).to.have.length(1);
+      });
 
-    it('should return element', () => {
-      const element = doc.createElement('div');
-      container.appendChild(element);
-      const fe = {element, id: 'F0'};
-      transferLayer.transferTo(fe);
-      expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
-      expect(root.children).to.have.length(1);
-
-      // The slot distribution is canceled, but the slot itself is kept.
-      transferLayer.returnFrom(fe);
-      expect(element.getAttribute('slot')).to.be.null;
-      expect(root.children).to.have.length(1);
-
-      // Ensure that repeat slotting doesn't change anything.
-      transferLayer.transferTo(fe);
-      expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
-      expect(root.children).to.have.length(1);
+      it('should return element', () => {
+        const element = doc.createElement('div');
+        container.appendChild(element);
+        const fe = {element, id: 'F0'};
+        transferLayer.transferTo(fe);
+        expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
+        expect(root.children).to.have.length(1);
+
+        // The slot distribution is canceled, but the slot itself is kept.
+        transferLayer.returnFrom(fe);
+        expect(element.getAttribute('slot')).to.be.null;
+        expect(root.children).to.have.length(1);
+
+        // Ensure that repeat slotting doesn't change anything.
+        transferLayer.transferTo(fe);
+        expect(element.getAttribute('slot')).to.equal('i-amphtml-fixed');
+        expect(root.children).to.have.length(1);
+      });
     });
-  });
 });
diff --git a/test/unit/test-focus-history.js b/test/unit/test-focus-history.js
index 7641c86d347c..52a0d821471c 100644
--- a/test/unit/test-focus-history.js
+++ b/test/unit/test-focus-history.js
@@ -17,9 +17,7 @@
 import {FocusHistory} from '../../src/focus-history';
 import {installTimerService} from '../../src/service/timer-impl';
 
-
 describe('FocusHistory', () => {
-
   let sandbox;
   let clock;
   let testDoc;
@@ -155,8 +153,8 @@ describe('FocusHistory', () => {
 
     testDoc.activeElement = el0;
     expect(focusHistory.hasDescendantsOf(el0)).to.be.true;
-    expect(focusHistory.hasDescendantsOf(document.createElement('div'))).to
-        .be.false;
+    expect(focusHistory.hasDescendantsOf(document.createElement('div'))).to.be
+      .false;
 
     testDoc.activeElement = el01;
     expect(focusHistory.hasDescendantsOf(el0)).to.be.true;
@@ -169,7 +167,7 @@ describe('FocusHistory', () => {
     eventListeners['focus']({target: el01});
     expect(focusHistory.hasDescendantsOf(el0)).to.be.true;
     expect(focusHistory.hasDescendantsOf(el01)).to.be.true;
-    expect(focusHistory.hasDescendantsOf(document.createElement('div'))).to
-        .be.false;
+    expect(focusHistory.hasDescendantsOf(document.createElement('div'))).to.be
+      .false;
   });
 });
diff --git a/test/unit/test-font-stylesheet-timeout.js b/test/unit/test-font-stylesheet-timeout.js
index e5d45664b50c..83589a8a35d8 100644
--- a/test/unit/test-font-stylesheet-timeout.js
+++ b/test/unit/test-font-stylesheet-timeout.js
@@ -14,188 +14,226 @@
  * limitations under the License.
  */
 
-import {
-  fontStylesheetTimeout,
-} from '../../src/font-stylesheet-timeout';
+import {fontStylesheetTimeout} from '../../src/font-stylesheet-timeout';
 import {toggleExperiment} from '../../src/experiments';
 
-describes.realWin('font-stylesheet-timeout', {
-  amp: true,
-}, env => {
-  let clock;
-  let win;
-  let readyState;
-  let responseStart;
+describes.realWin(
+  'font-stylesheet-timeout',
+  {
+    amp: true,
+  },
+  env => {
+    let clock;
+    let win;
+    let readyState;
+    let responseStart;
 
-  beforeEach(() => {
-    clock = env.sandbox.useFakeTimers();
-    win = env.win;
-    win.setTimeout = self.setTimeout;
-    readyState = 'interactive';
-    responseStart = 0;
-    Object.defineProperty(win.document, 'readyState', {
-      get() {
-        return readyState;
-      },
-    });
-    Object.defineProperty(win.performance.timing, 'responseStart', {
-      get() {
-        return responseStart;
-      },
-    });
-  });
-
-  function addLink(opt_content, opt_href) {
-    const link = document.createElement('link');
-    link.href = opt_href || immediatelyLoadingHref(opt_content);
-    link.setAttribute('rel', 'stylesHEet');
-    win.document.head.appendChild(link);
-    return link;
-  }
-
-  function immediatelyLoadingHref(opt_content) {
-    return 'data:text/css;charset=utf-8,' + (opt_content || '');
-  }
-
-  // TODO(cramforce, #11827): Make this test work on Safari.
-  it.configure().skipSafari().run('should not time out for immediately ' +
-      'loading style sheets', () => {
-    const link = addLink();
-    fontStylesheetTimeout(win);
-    clock.tick(10000);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"]')).to.have.length(1);
-    expect(win.document.querySelector(
-        'link[rel="stylesheet"]')).to.equal(link);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(0);
-  });
-
-  it('should time out if style sheets do not load', () => {
-    const link = addLink(undefined, '/does-not-exist.css');
-    fontStylesheetTimeout(win);
-    clock.tick(249);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(0);
-    clock.tick(1);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(1);
-    const after = win.document.querySelector(
-        'link[rel="stylesheet"]');
-    expect(after).to.equal(link);
-    expect(after.href).to.equal(link.href);
-    expect(after.media).to.equal('not-matching');
-    after.href = immediatelyLoadingHref('/* make-it-load */');
-    return new Promise(resolve => {
-      after.addEventListener('load', () => {
-        resolve();
+    beforeEach(() => {
+      clock = env.sandbox.useFakeTimers();
+      win = env.win;
+      win.setTimeout = self.setTimeout;
+      readyState = 'interactive';
+      responseStart = 0;
+      Object.defineProperty(win.document, 'readyState', {
+        get() {
+          return readyState;
+        },
+      });
+      Object.defineProperty(win.performance.timing, 'responseStart', {
+        get() {
+          return responseStart;
+        },
       });
-    }).then(() => {
-      expect(after.media).to.equal('all');
     });
-  });
 
-  it('should time out from response start', () => {
-    responseStart = 200;
-    clock.tick(250);
-    const link = addLink(undefined, '/does-not-exist.css');
-    fontStylesheetTimeout(win);
-    clock.tick(199);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(0);
-    clock.tick(1);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(1);
-    expect(win.document.querySelector(
-        'link[rel="stylesheet"]')).to.equal(link);
-    expect(win.document.querySelector(
-        'link[rel="stylesheet"]').href).to.equal(link.href);
-  });
+    function addLink(opt_content, opt_href) {
+      const link = document.createElement('link');
+      link.href = opt_href || immediatelyLoadingHref(opt_content);
+      link.setAttribute('rel', 'stylesHEet');
+      win.document.head.appendChild(link);
+      return link;
+    }
 
-  it('should time out multiple style sheets and ignore CDN URLs', () => {
-    responseStart = 500;
-    clock.tick(10000);
-    const link0 = addLink(undefined, '/does-not-exist.css');
-    const link1 = addLink(undefined, '/does-not-exist.css');
-    const cdnLink = addLink(undefined,
-        'https://cdn.ampproject.org/does-not-exist.css');
-    fontStylesheetTimeout(win);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(0);
-    clock.tick(1);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')).to.have.length(2);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')[0]).to.equal(link0);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"][i-amphtml-timeout]')[1]).to.equal(link1);
-    expect(win.document.querySelectorAll(
-        'link[rel="stylesheet"]')[2]).to.equal(cdnLink);
-  });
+    function immediatelyLoadingHref(opt_content) {
+      return 'data:text/css;charset=utf-8,' + (opt_content || '');
+    }
 
-  describe('font-display: swap', () => {
-    let fonts;
-    beforeEach(() => {
-      fonts = [
-        {
-          status: 'loaded',
-          display: 'auto',
-        },
-        {
-          status: 'loading',
-          display: 'auto',
-        },
-        {
-          status: 'loading',
-          display: 'auto',
-        },
-        {
-          status: 'loading',
-          display: 'optional',
-        },
-        null,
-      ];
-      let index = 0;
-      Object.defineProperty(win.document, 'fonts', {
-        get: () => {
-          return {
-            values: () => {
-              return {next: () => {
-                return {value: fonts[index++]};
-              }};
-            },
-          };
-        },
+    // TODO(cramforce, #11827): Make this test work on Safari.
+    it.configure()
+      .skipSafari()
+      .run('should not time out for immediately loading style sheets', () => {
+        const link = addLink();
+        fontStylesheetTimeout(win);
+        clock.tick(10000);
+        expect(
+          win.document.querySelectorAll('link[rel="stylesheet"]')
+        ).to.have.length(1);
+        expect(win.document.querySelector('link[rel="stylesheet"]')).to.equal(
+          link
+        );
+        expect(
+          win.document.querySelectorAll(
+            'link[rel="stylesheet"][i-amphtml-timeout]'
+          )
+        ).to.have.length(0);
       });
-      toggleExperiment(win, 'font-display-swap', true);
-    });
 
-    it('should not do anything with experiment off', () => {
-      toggleExperiment(win, 'font-display-swap', false);
+    it('should time out if style sheets do not load', () => {
+      const link = addLink(undefined, '/does-not-exist.css');
       fontStylesheetTimeout(win);
-      clock.tick(250);
-      expect(fonts[1].display).to.equal('auto');
+      clock.tick(249);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(0);
+      clock.tick(1);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(1);
+      const after = win.document.querySelector('link[rel="stylesheet"]');
+      expect(after).to.equal(link);
+      expect(after.href).to.equal(link.href);
+      expect(after.media).to.equal('not-matching');
+      after.href = immediatelyLoadingHref('/* make-it-load */');
+      return new Promise(resolve => {
+        after.addEventListener('load', () => {
+          resolve();
+        });
+      }).then(() => {
+        expect(after.media).to.equal('all');
+      });
     });
 
-    it('should not change loaded fonts', () => {
-      fontStylesheetTimeout(win);
+    it('should time out from response start', () => {
+      responseStart = 200;
       clock.tick(250);
-      expect(fonts[0].display).to.equal('auto');
+      const link = addLink(undefined, '/does-not-exist.css');
+      fontStylesheetTimeout(win);
+      clock.tick(199);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(0);
+      clock.tick(1);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(1);
+      expect(win.document.querySelector('link[rel="stylesheet"]')).to.equal(
+        link
+      );
+      expect(
+        win.document.querySelector('link[rel="stylesheet"]').href
+      ).to.equal(link.href);
     });
 
-    it('should change loading fonts to swap', () => {
+    it('should time out multiple style sheets and ignore CDN URLs', () => {
+      responseStart = 500;
+      clock.tick(10000);
+      const link0 = addLink(undefined, '/does-not-exist.css');
+      const link1 = addLink(undefined, '/does-not-exist.css');
+      const cdnLink = addLink(
+        undefined,
+        'https://cdn.ampproject.org/does-not-exist.css'
+      );
       fontStylesheetTimeout(win);
-      expect(fonts[1].display).to.equal('auto');
-      expect(fonts[2].display).to.equal('auto');
-      clock.tick(250);
-      expect(fonts[1].display).to.equal('swap');
-      expect(fonts[2].display).to.equal('swap');
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(0);
+      clock.tick(1);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )
+      ).to.have.length(2);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )[0]
+      ).to.equal(link0);
+      expect(
+        win.document.querySelectorAll(
+          'link[rel="stylesheet"][i-amphtml-timeout]'
+        )[1]
+      ).to.equal(link1);
+      expect(
+        win.document.querySelectorAll('link[rel="stylesheet"]')[2]
+      ).to.equal(cdnLink);
     });
 
-    it('should not override non-default values', () => {
-      fontStylesheetTimeout(win);
-      clock.tick(250);
-      expect(fonts[3].display).to.equal('optional');
+    describe('font-display: swap', () => {
+      let fonts;
+      beforeEach(() => {
+        fonts = [
+          {
+            status: 'loaded',
+            display: 'auto',
+          },
+          {
+            status: 'loading',
+            display: 'auto',
+          },
+          {
+            status: 'loading',
+            display: 'auto',
+          },
+          {
+            status: 'loading',
+            display: 'optional',
+          },
+          null,
+        ];
+        let index = 0;
+        Object.defineProperty(win.document, 'fonts', {
+          get: () => {
+            return {
+              values: () => {
+                return {
+                  next: () => {
+                    return {value: fonts[index++]};
+                  },
+                };
+              },
+            };
+          },
+        });
+        toggleExperiment(win, 'font-display-swap', true);
+      });
+
+      it('should not do anything with experiment off', () => {
+        toggleExperiment(win, 'font-display-swap', false);
+        fontStylesheetTimeout(win);
+        clock.tick(250);
+        expect(fonts[1].display).to.equal('auto');
+      });
+
+      it('should not change loaded fonts', () => {
+        fontStylesheetTimeout(win);
+        clock.tick(250);
+        expect(fonts[0].display).to.equal('auto');
+      });
+
+      it('should change loading fonts to swap', () => {
+        fontStylesheetTimeout(win);
+        expect(fonts[1].display).to.equal('auto');
+        expect(fonts[2].display).to.equal('auto');
+        clock.tick(250);
+        expect(fonts[1].display).to.equal('swap');
+        expect(fonts[2].display).to.equal('swap');
+      });
+
+      it('should not override non-default values', () => {
+        fontStylesheetTimeout(win);
+        clock.tick(250);
+        expect(fonts[3].display).to.equal('optional');
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-form-data-wrapper.js b/test/unit/test-form-data-wrapper.js
index 95f3c69e5fd6..5fe78bd8fb68 100644
--- a/test/unit/test-form-data-wrapper.js
+++ b/test/unit/test-form-data-wrapper.js
@@ -25,24 +25,26 @@ describes.realWin('FormDataWrapper', {}, env => {
   describe('entries', () => {
     let nativeEntries;
     let nativeDelete;
-    const scenarios = [{
-      description: 'when native `entries` is not available',
-
-      beforeEach() {
-        nativeEntries = FormData.prototype.entries;
-        nativeDelete = FormData.prototype.delete;
-        // Remove native entries from the prototype in case the browser running
-        // the tests already have it to force the "no native `entries`"
-        // scenario.
-        FormData.prototype.entries = undefined;
-        FormData.prototype.delete = undefined;
-      },
+    const scenarios = [
+      {
+        description: 'when native `entries` is not available',
+
+        beforeEach() {
+          nativeEntries = FormData.prototype.entries;
+          nativeDelete = FormData.prototype.delete;
+          // Remove native entries from the prototype in case the browser running
+          // the tests already have it to force the "no native `entries`"
+          // scenario.
+          FormData.prototype.entries = undefined;
+          FormData.prototype.delete = undefined;
+        },
 
-      afterEach() {
-        FormData.prototype.entries = nativeEntries;
-        FormData.prototype.delete = nativeDelete;
+        afterEach() {
+          FormData.prototype.entries = nativeEntries;
+          FormData.prototype.delete = nativeDelete;
+        },
       },
-    }];
+    ];
 
     // Intentionally use the non-env global to detect the browser capability
     if (FormData.prototype.entries) {
@@ -67,20 +69,22 @@ describes.realWin('FormDataWrapper', {}, env => {
 
         beforeEach(() => {
           sandbox.stub(Services, 'platformFor').returns({
-            isIos() { return false; },
+            isIos() {
+              return false;
+            },
           });
         });
 
         it('returns empty if no form passed and no entries appended', () => {
           const formData = createFormDataWrapper(env.win);
-          expect(fromIterator(formData.entries()))
-              .to.be.an('array').that.is.empty;
+          expect(fromIterator(formData.entries())).to.be.an('array').that.is
+            .empty;
         });
 
         describe('when entries appended', () => {
           let formData;
 
-          beforeEach(() => formData = createFormDataWrapper(env.win));
+          beforeEach(() => (formData = createFormDataWrapper(env.win)));
 
           it('returns appended string entries', () => {
             formData.append('a', '1');
@@ -136,8 +140,8 @@ describes.realWin('FormDataWrapper', {}, env => {
 
           it('returns empty if no entries in form', () => {
             const formData = createFormDataWrapper(env.win, form);
-            expect(fromIterator(formData.entries()))
-                .to.be.an('array').that.is.empty;
+            expect(fromIterator(formData.entries())).to.be.an('array').that.is
+              .empty;
           });
 
           it('returns text input entries in form', () => {
@@ -351,37 +355,44 @@ describes.realWin('FormDataWrapper', {}, env => {
           ]);
         });
 
-        it('includes the first submit button at submit-time if' +
-            ' none is focused', () => {
-          const form = env.win.document.createElement('form');
+        it(
+          'includes the first submit button at submit-time if' +
+            ' none is focused',
+          () => {
+            const form = env.win.document.createElement('form');
 
-          const input = env.win.document.createElement('input');
-          input.type = 'text';
-          input.name = 'foo1';
-          input.value = 'bar';
+            const input = env.win.document.createElement('input');
+            input.type = 'text';
+            input.name = 'foo1';
+            input.value = 'bar';
 
-          const submit = env.win.document.createElement('button');
-          submit.name = 'foo2';
-          submit.innerText = 'baz';
+            const submit = env.win.document.createElement('button');
+            submit.name = 'foo2';
+            submit.innerText = 'baz';
 
-          form.appendChild(input);
-          form.appendChild(submit);
-          env.win.document.body.appendChild(form);
+            form.appendChild(input);
+            form.appendChild(submit);
+            env.win.document.body.appendChild(form);
 
-          const formData = createFormDataWrapper(env.win, form);
-          expect(fromIterator(formData.entries())).to.have.deep.members([
-            ['foo1', 'bar'],
-            ['foo2', ''],
-          ]);
-        });
+            const formData = createFormDataWrapper(env.win, form);
+            expect(fromIterator(formData.entries())).to.have.deep.members([
+              ['foo1', 'bar'],
+              ['foo2', ''],
+            ]);
+          }
+        );
       });
     });
 
     describe('Ios11NativeFormDataWrapper', () => {
       beforeEach(() => {
         sandbox.stub(Services, 'platformFor').returns({
-          isIos() { return true; },
-          getMajorVersion() { return 11; },
+          isIos() {
+            return true;
+          },
+          getMajorVersion() {
+            return 11;
+          },
         });
       });
 
@@ -414,7 +425,6 @@ describes.realWin('FormDataWrapper', {}, env => {
 
     describe('PolyfillFormDataWrapper', () => {
       it('getFormData matches native behavior', () => {
-
         const form = env.win.document.createElement('form');
 
         const input = env.win.document.createElement('input');
@@ -435,13 +445,13 @@ describes.realWin('FormDataWrapper', {}, env => {
         if (FormData.prototype.entries) {
           const polyfillFormData = polyfillFormDataWrapper.getFormData();
           expect(fromIterator(polyfillFormData.entries())).to.deep.equal(
-              fromIterator(new FormData(form).entries()));
+            fromIterator(new FormData(form).entries())
+          );
         } else {
           // For testing in non-supporting browsers like IE.
           // We can't query the state of FormData, but we can check that
           // the polyfill appended to the real FormData enough.
-          const appendSpy =
-              env.sandbox.spy(FormData.prototype, 'append');
+          const appendSpy = env.sandbox.spy(FormData.prototype, 'append');
           polyfillFormDataWrapper.getFormData();
           expect(appendSpy).to.have.been.calledTwice;
         }
diff --git a/test/unit/test-form.js b/test/unit/test-form.js
index 63b4ee9c9e42..7fe44209249e 100644
--- a/test/unit/test-form.js
+++ b/test/unit/test-form.js
@@ -196,7 +196,6 @@ describes.realWin('getFormAsObject', {}, env => {
     expect(getFormAsObject(form)).to.deep.equal({'foo': ['bar']});
   });
 
-
   it('returns multiple selected entries in multi-select', () => {
     const select = env.win.document.createElement('select');
     select.name = 'foo';
@@ -230,9 +229,11 @@ describes.realWin('getFormAsObject', {}, env => {
     input2.value = 'quux';
     form.appendChild(input2);
 
-    Object.defineProperty(form, 'ownerDocument', {get() {
-      return {activeElement: input};
-    }});
+    Object.defineProperty(form, 'ownerDocument', {
+      get() {
+        return {activeElement: input};
+      },
+    });
     expect(getFormAsObject(form)).to.deep.equal({'foo': ['bar']});
   });
 
@@ -251,9 +252,11 @@ describes.realWin('getFormAsObject', {}, env => {
 
     expect(getFormAsObject(form)).to.deep.equal({'foo': ['bar']});
 
-    Object.defineProperty(form, 'ownerDocument', {get() {
-      return {activeElement: input2};
-    }});
+    Object.defineProperty(form, 'ownerDocument', {
+      get() {
+        return {activeElement: input2};
+      },
+    });
     expect(getFormAsObject(form)).to.deep.equal({'baz': ['quux']});
   });
 
@@ -268,9 +271,11 @@ describes.realWin('getFormAsObject', {}, env => {
     input2.value = 'quux';
     form.appendChild(input2);
 
-    Object.defineProperty(form, 'ownerDocument', {get() {
-      return {activeElement: env.win.document.body};
-    }});
+    Object.defineProperty(form, 'ownerDocument', {
+      get() {
+        return {activeElement: env.win.document.body};
+      },
+    });
     expect(getFormAsObject(form)).to.deep.equal({'foo': ['bar']});
   });
 
@@ -287,9 +292,11 @@ describes.realWin('getFormAsObject', {}, env => {
 
     expect(getFormAsObject(form)).to.deep.equal({'foo': ['bar']});
 
-    Object.defineProperty(form, 'ownerDocument', {get() {
-      return {activeElement: input2};
-    }});
+    Object.defineProperty(form, 'ownerDocument', {
+      get() {
+        return {activeElement: input2};
+      },
+    });
     expect(getFormAsObject(form)).to.deep.equal({'baz': ['quux']});
   });
 
@@ -328,13 +335,17 @@ describes.realWin('getFormAsObject', {}, env => {
 
     const formDataObject = getFormAsObject(form);
 
-    expect(formDataObject).to.be.an('object')
-        .that.has.all.keys('foo', 'foo1', 'foo2');
-    expect(formDataObject).to.have.property('foo')
-        .that.has.deep.members(['bar', 'baz']);
-    expect(formDataObject).to.have.property('foo1')
-        .that.has.deep.members(['bar']);
-    expect(formDataObject).to.have.property('foo2')
-        .that.has.deep.members(['bar']);
+    expect(formDataObject)
+      .to.be.an('object')
+      .that.has.all.keys('foo', 'foo1', 'foo2');
+    expect(formDataObject)
+      .to.have.property('foo')
+      .that.has.deep.members(['bar', 'baz']);
+    expect(formDataObject)
+      .to.have.property('foo1')
+      .that.has.deep.members(['bar']);
+    expect(formDataObject)
+      .to.have.property('foo2')
+      .that.has.deep.members(['bar']);
   });
 });
diff --git a/test/unit/test-friendly-iframe-embed.js b/test/unit/test-friendly-iframe-embed.js
index 21b455e27cdd..2a4399d4268f 100644
--- a/test/unit/test-friendly-iframe-embed.js
+++ b/test/unit/test-friendly-iframe-embed.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {
   FriendlyIframeEmbed,
   getFriendlyIframeEmbedOptional,
@@ -32,7 +31,6 @@ import {layoutRectLtwh} from '../../src/layout-rect';
 import {loadPromise} from '../../src/event-helper';
 
 describe('friendly-iframe-embed', () => {
-
   let sandbox;
   let iframe;
   let extensionsMock;
@@ -67,7 +65,6 @@ describe('friendly-iframe-embed', () => {
 
   // TODO: fix tests. #19650
   it.skip('should follow main install steps', () => {
-
     // Resources are not involved.
     extensionsMock.expects('preloadExtension').never();
     resourcesMock.expects('add').never();
@@ -84,35 +81,40 @@ describe('friendly-iframe-embed', () => {
     // Iframe has been appended to DOM.
     expect(iframe.parentElement).to.equal(document.body);
 
-    return embedPromise.then(embed => {
-      expect(embed.win).to.be.ok;
-      expect(embed.win).to.equal(iframe.contentWindow);
-      expect(embed.iframe).to.equal(iframe);
-      expect(embed.spec.url).to.equal('https://acme.org/url1');
-      expect(embed.host).to.be.null;
-      expect(embed.signals()).to.be.ok;
-      expect(getFriendlyIframeEmbedOptional(embed.iframe)).to.equal(embed);
-
-      // Iframe is rendered.
-      expect(embed.signals().get('render-start')).to.be.ok;
-      expect(iframe.style.visibility).to.equal('');
-      expect(embed.win.document.body.style.visibility).to.equal('visible');
-      expect(String(embed.win.document.body.style.opacity)).to.equal('1');
-      expect(isAnimationNone(embed.win.document.body)).to.be.true;
-      expect(embed.win.document.documentElement.classList.contains(
-          'i-amphtml-fie')).to.be.true;
-
-      // BASE element has been inserted.
-      expect(embed.win.document.querySelector('base').href)
-          .to.equal('https://acme.org/url1');
-      expect(embed.win.document.querySelector('a').href)
-          .to.equal('https://acme.org/url2');
-
-      return loadPromise(iframe);
-    }).then(() => {
-      // Iframe is marked as complete.
-      expect(iframe.readyState).to.equal('complete');
-    });
+    return embedPromise
+      .then(embed => {
+        expect(embed.win).to.be.ok;
+        expect(embed.win).to.equal(iframe.contentWindow);
+        expect(embed.iframe).to.equal(iframe);
+        expect(embed.spec.url).to.equal('https://acme.org/url1');
+        expect(embed.host).to.be.null;
+        expect(embed.signals()).to.be.ok;
+        expect(getFriendlyIframeEmbedOptional(embed.iframe)).to.equal(embed);
+
+        // Iframe is rendered.
+        expect(embed.signals().get('render-start')).to.be.ok;
+        expect(iframe.style.visibility).to.equal('');
+        expect(embed.win.document.body.style.visibility).to.equal('visible');
+        expect(String(embed.win.document.body.style.opacity)).to.equal('1');
+        expect(isAnimationNone(embed.win.document.body)).to.be.true;
+        expect(
+          embed.win.document.documentElement.classList.contains('i-amphtml-fie')
+        ).to.be.true;
+
+        // BASE element has been inserted.
+        expect(embed.win.document.querySelector('base').href).to.equal(
+          'https://acme.org/url1'
+        );
+        expect(embed.win.document.querySelector('a').href).to.equal(
+          'https://acme.org/url2'
+        );
+
+        return loadPromise(iframe);
+      })
+      .then(() => {
+        // Iframe is marked as complete.
+        expect(iframe.readyState).to.equal('complete');
+      });
   });
 
   it.skip('should write doc if srcdoc is not available', () => {
@@ -137,21 +139,26 @@ describe('friendly-iframe-embed', () => {
   });
 
   it('should install extensions', () => {
-
     // Extensions preloading have been requested.
-    extensionsMock.expects('preloadExtension')
-        .withExactArgs('amp-test')
-        .returns(Promise.resolve())
-        .once();
+    extensionsMock
+      .expects('preloadExtension')
+      .withExactArgs('amp-test')
+      .returns(Promise.resolve())
+      .once();
 
     // Extensions are installed.
     let installExtWin;
-    extensionsMock.expects('installExtensionsInChildWindow')
-        .withExactArgs(sinon.match(arg => {
+    extensionsMock
+      .expects('installExtensionsInChildWindow')
+      .withExactArgs(
+        sinon.match(arg => {
           installExtWin = arg;
           return true;
-        }), ['amp-test'], /* preinstallCallback */ undefined)
-        .once();
+        }),
+        ['amp-test'],
+        /* preinstallCallback */ undefined
+      )
+      .once();
 
     const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
       url: 'https://acme.org/url1',
@@ -164,18 +171,23 @@ describe('friendly-iframe-embed', () => {
   });
 
   it('should pass pre-install callback', () => {
-
     const preinstallCallback = function() {};
 
     // Extensions are installed.
-    extensionsMock.expects('installExtensionsInChildWindow')
-        .withExactArgs(sinon.match(() => true), [], preinstallCallback)
-        .once();
-
-    const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
-      url: 'https://acme.org/url1',
-      html: '<amp-test></amp-test>',
-    }, preinstallCallback);
+    extensionsMock
+      .expects('installExtensionsInChildWindow')
+      .withExactArgs(sinon.match(() => true), [], preinstallCallback)
+      .once();
+
+    const embedPromise = installFriendlyIframeEmbed(
+      iframe,
+      document.body,
+      {
+        url: 'https://acme.org/url1',
+        html: '<amp-test></amp-test>',
+      },
+      preinstallCallback
+    );
     return embedPromise;
   });
 
@@ -188,9 +200,10 @@ describe('friendly-iframe-embed', () => {
       extensionIds: ['amp-test'],
     });
     return embedPromise.then(embed => {
-      resourcesMock.expects('removeForChildWindow')
-          .withExactArgs(embed.win)
-          .once();
+      resourcesMock
+        .expects('removeForChildWindow')
+        .withExactArgs(embed.win)
+        .once();
       embed.destroy();
     });
   });
@@ -200,12 +213,17 @@ describe('friendly-iframe-embed', () => {
     const embedService = {
       dispose: disposeSpy,
     };
-    const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
-      url: 'https://acme.org/url1',
-      html: '<amp-test></amp-test>',
-    }, embedWin => {
-      installServiceInEmbedScope(embedWin, 'c', embedService);
-    });
+    const embedPromise = installFriendlyIframeEmbed(
+      iframe,
+      document.body,
+      {
+        url: 'https://acme.org/url1',
+        html: '<amp-test></amp-test>',
+      },
+      embedWin => {
+        installServiceInEmbedScope(embedWin, 'c', embedService);
+      }
+    );
     return embedPromise.then(embed => {
       expect(embed.win.services['c'].obj).to.equal(embedService);
       expect(disposeSpy).to.not.be.called;
@@ -257,28 +275,33 @@ describe('friendly-iframe-embed', () => {
 
   it.skip('should await initial load', () => {
     resourcesMock
-        .expects('getResourcesInRect')
-        .withExactArgs(
-            sinon.match(arg => arg == iframe.contentWindow),
-            sinon.match(arg =>
-              arg.left == 0 &&
-                arg.top == 0 &&
-                arg.width == iframe.contentWindow.innerWidth &&
-                arg.height == iframe.contentWindow.innerHeight))
-        .returns(Promise.resolve([]))
-        .once();
+      .expects('getResourcesInRect')
+      .withExactArgs(
+        sinon.match(arg => arg == iframe.contentWindow),
+        sinon.match(
+          arg =>
+            arg.left == 0 &&
+            arg.top == 0 &&
+            arg.width == iframe.contentWindow.innerWidth &&
+            arg.height == iframe.contentWindow.innerHeight
+        )
+      )
+      .returns(Promise.resolve([]))
+      .once();
     const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
       url: 'https://acme.org/url1',
       html: '<amp-test></amp-test>',
     });
     let embed;
-    return embedPromise.then(em => {
-      embed = em;
-      return embed.whenIniLoaded();
-    }).then(() => {
-      expect(embed.signals().get('ini-load')).to.be.ok;
-      return embed.whenReady(); // `whenReady` should also be complete.
-    });
+    return embedPromise
+      .then(em => {
+        embed = em;
+        return embed.whenIniLoaded();
+      })
+      .then(() => {
+        expect(embed.signals().get('ini-load')).to.be.ok;
+        return embed.whenReady(); // `whenReady` should also be complete.
+      });
   });
 
   it.skip('should await initial with host', () => {
@@ -291,29 +314,34 @@ describe('friendly-iframe-embed', () => {
     };
     host.getLayoutBox = () => rect;
     resourcesMock
-        .expects('getResourcesInRect')
-        .withExactArgs(
-            sinon.match(arg => arg == iframe.contentWindow),
-            sinon.match(arg =>
-              arg.left == 10 &&
-                arg.top == 10 &&
-                arg.width == 100 &&
-                arg.height == 200))
-        .returns(Promise.resolve([]))
-        .once();
+      .expects('getResourcesInRect')
+      .withExactArgs(
+        sinon.match(arg => arg == iframe.contentWindow),
+        sinon.match(
+          arg =>
+            arg.left == 10 &&
+            arg.top == 10 &&
+            arg.width == 100 &&
+            arg.height == 200
+        )
+      )
+      .returns(Promise.resolve([]))
+      .once();
     const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
       url: 'https://acme.org/url1',
       html: '<amp-test></amp-test>',
       host,
     });
     let embed;
-    return embedPromise.then(em => {
-      embed = em;
-      return embed.whenIniLoaded();
-    }).then(() => {
-      expect(embed.signals().get('ini-load')).to.be.ok;
-      return embed.whenReady(); // `whenReady` should also be complete.
-    });
+    return embedPromise
+      .then(em => {
+        embed = em;
+        return embed.whenIniLoaded();
+      })
+      .then(() => {
+        expect(embed.signals().get('ini-load')).to.be.ok;
+        return embed.whenReady(); // `whenReady` should also be complete.
+      });
   });
 
   it('should find and await all content elements', () => {
@@ -324,9 +352,10 @@ describe('friendly-iframe-embed', () => {
         },
         loadedComplete: false,
       };
-      res.loadedOnce = () => Promise.resolve().then(() => {
-        res.loadedComplete = true;
-      });
+      res.loadedOnce = () =>
+        Promise.resolve().then(() => {
+          res.loadedComplete = true;
+        });
       return res;
     }
 
@@ -340,17 +369,19 @@ describe('friendly-iframe-embed', () => {
     const context = document.createElement('div');
     document.body.appendChild(context);
     resourcesMock
-        .expects('getResourcesInRect')
-        .withArgs(sinon.match(arg => arg == window))
-        .returns(Promise.resolve([
-          content1 = resource('amp-img', 0),
-          content2 = resource('amp-video', 0),
-          blacklistedAd = resource('amp-ad', 0),
-          blacklistedAnalytics = resource('amp-analytics', 0),
-          blacklistedPixel = resource('amp-pixel', 0),
-          blacklistedAmpAdExit = resource('amp-ad-exit', 0),
-        ]))
-        .once();
+      .expects('getResourcesInRect')
+      .withArgs(sinon.match(arg => arg == window))
+      .returns(
+        Promise.resolve([
+          (content1 = resource('amp-img', 0)),
+          (content2 = resource('amp-video', 0)),
+          (blacklistedAd = resource('amp-ad', 0)),
+          (blacklistedAnalytics = resource('amp-analytics', 0)),
+          (blacklistedPixel = resource('amp-pixel', 0)),
+          (blacklistedAmpAdExit = resource('amp-ad-exit', 0)),
+        ])
+      )
+      .once();
 
     return whenContentIniLoad(context, window).then(() => {
       expect(content1.loadedComplete).to.be.true;
@@ -391,87 +422,103 @@ describe('friendly-iframe-embed', () => {
       spec.url = 'https://acme.org/embed<1';
       spec.fonts = ['https://acme.org/font<1'];
       const html = mergeHtmlForTesting(spec);
-      expect(html.indexOf('<base href="https://acme.org/embed&lt;1">'))
-          .to.greaterThan(-1);
-      expect(html.indexOf('<link href="https://acme.org/font&lt;1"'))
-          .to.greaterThan(-1);
+      expect(
+        html.indexOf('<base href="https://acme.org/embed&lt;1">')
+      ).to.greaterThan(-1);
+      expect(
+        html.indexOf('<link href="https://acme.org/font&lt;1"')
+      ).to.greaterThan(-1);
     });
 
     it('should pre-pend to html', () => {
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content='
-          + '"script-src \'none\';object-src \'none\';child-src \'none\'">'
-          + '<a></a>');
+      expect(html).to.equal(
+        '<base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content=' +
+          "\"script-src 'none';object-src 'none';child-src 'none'\">" +
+          '<a></a>'
+      );
     });
 
     it('should insert into head', () => {
       spec.html = '<html><head>head        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body';
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<html><head><base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content='
-          + '"script-src \'none\';object-src \'none\';'
-          + 'child-src \'none\'">head        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body');
+      expect(html).to.equal(
+        '<html><head><base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content=' +
+          "\"script-src 'none';object-src 'none';" +
+          "child-src 'none'\">head        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body"
+      );
     });
 
     it('should insert into head w/o html', () => {
       spec.html = '<head>head        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body';
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<head><base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content="'
-          + 'script-src \'none\';object-src \'none\';child-src \'none\'">head'
-          + '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body');
+      expect(html).to.equal(
+        '<head><base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content="' +
+          "script-src 'none';object-src 'none';child-src 'none'\">head" +
+          '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body>body'
+      );
     });
 
     it('should insert before body', () => {
       spec.html = '<html><body>body';
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<html><base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content="script-src '
-          + '\'none\';object-src \'none\';child-src \'none\'"><body>body');
+      expect(html).to.equal(
+        '<html><base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content="script-src ' +
+          "'none';object-src 'none';child-src 'none'\"><body>body"
+      );
     });
 
     it('should insert before body w/o html', () => {
       spec.html = '<body>body';
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content="script-src '
-          + '\'none\';object-src \'none\';child-src \'none\'"><body>body');
+      expect(html).to.equal(
+        '<base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content="script-src ' +
+          "'none';object-src 'none';child-src 'none'\"><body>body"
+      );
     });
 
     it('should insert after html', () => {
       spec.html = '<html>content';
       const html = mergeHtmlForTesting(spec);
-      expect(html).to.equal('<html><base href="https://acme.org/embed1">'
-          + '<meta http-equiv=Content-Security-Policy content="script-src '
-          + '\'none\';object-src \'none\';child-src \'none\'">content');
+      expect(html).to.equal(
+        '<html><base href="https://acme.org/embed1">' +
+          '<meta http-equiv=Content-Security-Policy content="script-src ' +
+          "'none';object-src 'none';child-src 'none'\">content"
+      );
     });
 
     it('should insert CSP', () => {
       spec.html = '<html><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>';
       expect(mergeHtmlForTesting(spec)).to.equal(
-          '<html><head><base href="https://acme.org/embed1">' +
+        '<html><head><base href="https://acme.org/embed1">' +
           '<meta http-equiv=Content-Security-Policy ' +
-          'content="script-src \'none\';object-src \'none\';' +
-          'child-src \'none\'">' +
-          '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>');
+          "content=\"script-src 'none';object-src 'none';" +
+          "child-src 'none'\">" +
+          '        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>'
+      );
       spec.html = '<html>foo';
       expect(mergeHtmlForTesting(spec)).to.equal(
-          '<html><base href="https://acme.org/embed1">' +
+        '<html><base href="https://acme.org/embed1">' +
           '<meta http-equiv=Content-Security-Policy ' +
-          'content="script-src \'none\';object-src \'none\';' +
-          'child-src \'none\'">foo');
+          "content=\"script-src 'none';object-src 'none';" +
+          "child-src 'none'\">foo"
+      );
       spec.html = '<body>foo';
       expect(mergeHtmlForTesting(spec)).to.equal(
-          '<base href="https://acme.org/embed1">' +
+        '<base href="https://acme.org/embed1">' +
           '<meta http-equiv=Content-Security-Policy ' +
-          'content="script-src \'none\';object-src \'none\';' +
-          'child-src \'none\'"><body>foo');
+          "content=\"script-src 'none';object-src 'none';" +
+          "child-src 'none'\"><body>foo"
+      );
     });
   });
 
   describe.skip('child document ready and loaded states', () => {
-
     it('should wait until ready', () => {
       const embedPromise = installFriendlyIframeEmbed(iframe, document.body, {
         url: 'https://acme.org/url1',
@@ -519,8 +566,10 @@ describe('friendly-iframe-embed', () => {
       const container = {
         appendChild: child => {
           document.body.appendChild(child);
-          eventListenerSpy =
-              sandbox.spy(child.contentWindow, 'addEventListener');
+          eventListenerSpy = sandbox.spy(
+            child.contentWindow,
+            'addEventListener'
+          );
         },
       };
       const embedPromise = installFriendlyIframeEmbed(iframe, container, {
@@ -553,10 +602,12 @@ describe('friendly-iframe-embed', () => {
       polls = [];
       win = {
         services: {
-          'extensions': {obj: {
-            installExtensionsInChildWindow: () => {},
-            preloadExtension: () => {},
-          }},
+          'extensions': {
+            obj: {
+              installExtensionsInChildWindow: () => {},
+              preloadExtension: () => {},
+            },
+          },
         },
         setInterval() {
           const interval = window.setInterval.apply(window, arguments);
@@ -597,7 +648,9 @@ describe('friendly-iframe-embed', () => {
         appendChild: () => {},
       };
       renderStartStub = sandbox.stub(
-          FriendlyIframeEmbed.prototype, 'startRender_');
+        FriendlyIframeEmbed.prototype,
+        'startRender_'
+      );
     });
 
     afterEach(() => {
@@ -634,42 +687,47 @@ describe('friendly-iframe-embed', () => {
         ready = true;
       });
       expect(polls).to.have.length(1);
-      return Promise.race([Promise.resolve(), embedPromise]).then(() => {
-        expect(ready).to.be.false;
-        expect(polls).to.have.length(1);
-
-        // Window is now available.
-        iframe.contentWindow = contentWindow;
-        clock.tick(5);
-        return Promise.race([Promise.resolve(), embedPromise]);
-      }).then(() => {
-        expect(ready).to.be.false;
-        expect(polls).to.have.length(1);
-
-        // Document is now available.
-        contentWindow.document = contentDocument;
-        clock.tick(5);
-        return Promise.race([Promise.resolve(), embedPromise]);
-      }).then(() => {
-        expect(ready).to.be.false;
-        expect(polls).to.have.length(1);
-
-        // Body is now available.
-        contentDocument.body = contentBody;
-        clock.tick(5);
-        return Promise.race([Promise.resolve(), embedPromise]);
-      }).then(() => {
-        expect(ready).to.be.false;
-        expect(polls).to.have.length(1);
-
-        // Body is now not empty.
-        contentBody.firstChild = {};
-        clock.tick(5);
-        return Promise.race([Promise.resolve(), embedPromise]);
-      }).then(() => {
-        expect(ready).to.equal(true, 'Finally ready');
-        expect(polls).to.have.length(0);
-      });
+      return Promise.race([Promise.resolve(), embedPromise])
+        .then(() => {
+          expect(ready).to.be.false;
+          expect(polls).to.have.length(1);
+
+          // Window is now available.
+          iframe.contentWindow = contentWindow;
+          clock.tick(5);
+          return Promise.race([Promise.resolve(), embedPromise]);
+        })
+        .then(() => {
+          expect(ready).to.be.false;
+          expect(polls).to.have.length(1);
+
+          // Document is now available.
+          contentWindow.document = contentDocument;
+          clock.tick(5);
+          return Promise.race([Promise.resolve(), embedPromise]);
+        })
+        .then(() => {
+          expect(ready).to.be.false;
+          expect(polls).to.have.length(1);
+
+          // Body is now available.
+          contentDocument.body = contentBody;
+          clock.tick(5);
+          return Promise.race([Promise.resolve(), embedPromise]);
+        })
+        .then(() => {
+          expect(ready).to.be.false;
+          expect(polls).to.have.length(1);
+
+          // Body is now not empty.
+          contentBody.firstChild = {};
+          clock.tick(5);
+          return Promise.race([Promise.resolve(), embedPromise]);
+        })
+        .then(() => {
+          expect(ready).to.equal(true, 'Finally ready');
+          expect(polls).to.have.length(0);
+        });
     });
 
     it('should stop polling when loaded', () => {
@@ -701,7 +759,6 @@ describe('friendly-iframe-embed', () => {
         expect(polls).to.have.length(0);
       });
     });
-
   });
 
   describe('full overlay mode', () => {
@@ -733,13 +790,18 @@ describe('friendly-iframe-embed', () => {
 
       parent.appendChild(iframe);
 
-      sandbox./*OK*/stub(iframe, 'getBoundingClientRect')
-          .returns(layoutRectLtwh(x, y, w, h));
+      sandbox
+        ./*OK*/ stub(iframe, 'getBoundingClientRect')
+        .returns(layoutRectLtwh(x, y, w, h));
 
-      const fie = new FriendlyIframeEmbed(iframe, {
-        url: 'https://acme.org/url1',
-        html: '<body></body>',
-      }, Promise.resolve());
+      const fie = new FriendlyIframeEmbed(
+        iframe,
+        {
+          url: 'https://acme.org/url1',
+          html: '<body></body>',
+        },
+        Promise.resolve()
+      );
 
       sandbox.stub(fie, 'getResources_').returns(resourcesMock);
       sandbox.stub(fie, 'getBodyElement').returns(bodyElementMock);
@@ -749,7 +811,6 @@ describe('friendly-iframe-embed', () => {
       return fie;
     }
 
-
     beforeEach(() => {
       win = {
         innerWidth: winW,
@@ -775,12 +836,13 @@ describe('friendly-iframe-embed', () => {
       stubViewportScrollTop(scrollTop);
 
       allowConsoleError(() => {
-        expect(() => fie.enterFullOverlayMode())
-            .to.throw(/Only .?amp-ad.? is allowed/);
+        expect(() => fie.enterFullOverlayMode()).to.throw(
+          /Only .?amp-ad.? is allowed/
+        );
       });
     });
 
-    it('resizes body and fixed container when entering', function* () {
+    it('resizes body and fixed container when entering', function*() {
       const bodyElementMock = document.createElement('div');
       const fie = createFie(bodyElementMock);
 
@@ -809,7 +871,7 @@ describe('friendly-iframe-embed', () => {
       expect(iframe.style.height).to.equal('100vh');
     });
 
-    it('should reset body and fixed container when leaving', function* () {
+    it('should reset body and fixed container when leaving', function*() {
       const bodyElementMock = document.createElement('div');
       const fie = createFie(bodyElementMock);
 
diff --git a/test/unit/test-gesture-recognizers.js b/test/unit/test-gesture-recognizers.js
index 4d786079b93d..76eb2d7063c9 100644
--- a/test/unit/test-gesture-recognizers.js
+++ b/test/unit/test-gesture-recognizers.js
@@ -14,13 +14,16 @@
  * limitations under the License.
  */
 
-import {DoubletapRecognizer, PinchRecognizer, SwipeXYRecognizer, TapRecognizer,
-  TapzoomRecognizer} from '../../src/gesture-recognizers';
+import {
+  DoubletapRecognizer,
+  PinchRecognizer,
+  SwipeXYRecognizer,
+  TapRecognizer,
+  TapzoomRecognizer,
+} from '../../src/gesture-recognizers';
 import {Gestures} from '../../src/gesture';
 
-
 describe('TapRecognizer', () => {
-
   let sandbox;
   let element;
   let recognizer;
@@ -48,52 +51,55 @@ describe('TapRecognizer', () => {
     sandbox.restore();
   });
 
-
   it('should allow single-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
   });
 
   it('should deny two-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}, {}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}, {}],
+    });
     expect(res).to.equal(false);
     expect(recognizer.startX_).to.equal(0);
     expect(recognizer.startY_).to.equal(0);
   });
 
-
   it('should allow small drift', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 102, clientY: 202}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 102, clientY: 202}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(102);
     expect(recognizer.lastY_).to.equal(202);
   });
 
   it('should deny large drift', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 111, clientY: 211}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 111, clientY: 211}]});
     expect(res).to.equal(false);
   });
 
   it('should signal ready on touchend', () => {
-    gesturesMock.expects('signalReady_').withExactArgs(recognizer, 0).once();
+    gesturesMock
+      .expects('signalReady_')
+      .withExactArgs(recognizer, 0)
+      .once();
     recognizer.onTouchEnd({});
   });
 
@@ -102,19 +108,27 @@ describe('TapRecognizer', () => {
     recognizer.lastY_ = 201;
     const target = element;
     recognizer.target_ = target;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return data.clientX == 101 && data.clientY == 201
-            && data.target === target;
-        }), null).once();
-    gesturesMock.expects('signalEnd_').withExactArgs(recognizer).once();
+          return (
+            data.clientX == 101 && data.clientY == 201 && data.target === target
+          );
+        }),
+        null
+      )
+      .once();
+    gesturesMock
+      .expects('signalEnd_')
+      .withExactArgs(recognizer)
+      .once();
     recognizer.acceptStart();
   });
 });
 
-
 describe('DoubletapRecognizer', () => {
-
   let sandbox;
   let element;
   let recognizer;
@@ -142,54 +156,55 @@ describe('DoubletapRecognizer', () => {
     sandbox.restore();
   });
 
-
   it('should allow single-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
   });
 
   it('should deny two-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}, {}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}, {}],
+    });
     expect(res).to.equal(false);
     expect(recognizer.startX_).to.equal(0);
     expect(recognizer.startY_).to.equal(0);
   });
 
-
   it('should allow small drift', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 102, clientY: 202}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 102, clientY: 202}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(102);
     expect(recognizer.lastY_).to.equal(202);
   });
 
   it('should deny large drift', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 111, clientY: 211}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 111, clientY: 211}]});
     expect(res).to.equal(false);
   });
 
-
   it('should ask pending for first touchend', () => {
-    gesturesMock.expects('signalPending_').withExactArgs(
-        recognizer, 200).once();
+    gesturesMock
+      .expects('signalPending_')
+      .withExactArgs(recognizer, 200)
+      .once();
     gesturesMock.expects('signalReady_').never();
     recognizer.onTouchEnd({});
     expect(recognizer.tapCount_).to.equal(1);
@@ -199,28 +214,37 @@ describe('DoubletapRecognizer', () => {
     gesturesMock.expects('signalPending_').once();
     recognizer.onTouchEnd({});
 
-    gesturesMock.expects('signalReady_').withExactArgs(recognizer, 0).once();
+    gesturesMock
+      .expects('signalReady_')
+      .withExactArgs(recognizer, 0)
+      .once();
     recognizer.onTouchEnd({});
     expect(recognizer.tapCount_).to.equal(2);
   });
 
-
   it('should emit and end on start', () => {
     recognizer.lastX_ = 101;
     recognizer.lastY_ = 201;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
           return data.clientX == 101 && data.clientY == 201;
-        }), null).once();
-    gesturesMock.expects('signalEnd_').withExactArgs(recognizer).once();
+        }),
+        null
+      )
+      .once();
+    gesturesMock
+      .expects('signalEnd_')
+      .withExactArgs(recognizer)
+      .once();
     recognizer.acceptStart();
     expect(recognizer.tapCount_).to.equal(0);
   });
 });
 
-
 describe('SwipeXYRecognizer', () => {
-
   let sandbox;
   let element;
   let clock;
@@ -254,69 +278,80 @@ describe('SwipeXYRecognizer', () => {
     return Math.abs(value - compare) <= error;
   }
 
-
   it('should allow single-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
   });
 
   it('should deny two-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}, {}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}, {}],
+    });
     expect(res).to.equal(false);
     expect(recognizer.startX_).to.equal(0);
     expect(recognizer.startY_).to.equal(0);
   });
 
-
   it('should allow small drift before requesting ready', () => {
     gesturesMock.expects('signalReady_').never();
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 102, clientY: 202}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 102, clientY: 202}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(102);
     expect(recognizer.lastY_).to.equal(202);
   });
 
   it('should send ready after significant move', () => {
-    gesturesMock.expects('signalReady_').withExactArgs(recognizer, -10).once();
-
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    gesturesMock
+      .expects('signalReady_')
+      .withExactArgs(recognizer, -10)
+      .once();
+
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 112, clientY: 212}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 112, clientY: 212}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(112);
     expect(recognizer.lastY_).to.equal(212);
   });
 
-
   it('should emit on start', () => {
     recognizer.startTime_ = 1;
     recognizer.startX_ = recognizer.prevX_ = 101;
     recognizer.startY_ = recognizer.prevY_ = 201;
     recognizer.lastX_ = 111;
     recognizer.lastY_ = 211;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === true && data.last === false &&
-              data.deltaX == 0 &&
-              data.deltaY == 0 &&
-              data.time == 10 &&
-              diff(data.velocityX, 0.86, 1e-2) &&
-              diff(data.velocityY, 0.86, 1e-2));
-        }), null).once();
+          return (
+            data.first === true &&
+            data.last === false &&
+            data.deltaX == 0 &&
+            data.deltaY == 0 &&
+            data.time == 10 &&
+            diff(data.velocityX, 0.86, 1e-2) &&
+            diff(data.velocityY, 0.86, 1e-2)
+          );
+        }),
+        null
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -337,14 +372,23 @@ describe('SwipeXYRecognizer', () => {
     recognizer.startX_ = recognizer.prevX_ = 101;
     recognizer.startY_ = recognizer.prevY_ = 201;
     recognizer.eventing_ = true;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === false &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              data.velocityX > 0 &&
-              data.velocityY > 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === false &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX > 0 &&
+            data.velocityY > 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -354,7 +398,7 @@ describe('SwipeXYRecognizer', () => {
     expect(recognizer.lastY_).to.equal(211);
   });
 
-  it('should stop on touchend; velocity doesn\'t change', () => {
+  it("should stop on touchend; velocity doesn't change", () => {
     const event = {touches: []};
 
     recognizer.startX_ = recognizer.prevX_ = 101;
@@ -364,14 +408,23 @@ describe('SwipeXYRecognizer', () => {
     recognizer.velocityX_ = 0.5;
     recognizer.velocityY_ = 0.5;
     recognizer.eventing_ = true;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === true &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              data.velocityX == 0.5 &&
-              data.velocityY == 0.5);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === true &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX == 0.5 &&
+            data.velocityY == 0.5
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').once();
 
     clock.tick(10);
@@ -389,14 +442,23 @@ describe('SwipeXYRecognizer', () => {
     recognizer.velocityX_ = 0.5;
     recognizer.velocityY_ = 0.5;
     recognizer.eventing_ = true;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === true &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              data.velocityX == 0 &&
-              data.velocityY == 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === true &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX == 0 &&
+            data.velocityY == 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').once();
 
     clock.tick(50);
@@ -418,18 +480,16 @@ describe('SwipeXYRecognizer', () => {
     expect(recognizer.lastX_).to.equal(111);
     expect(recognizer.lastY_).to.equal(211);
 
-    res = recognizer.onTouchStart({touches: [
-      {clientX: 111, clientY: 211},
-      {clientX: 122, clientY: 254},
-    ]});
+    res = recognizer.onTouchStart({
+      touches: [{clientX: 111, clientY: 211}, {clientX: 122, clientY: 254}],
+    });
 
     // Additional touch start should not have any effect
     expect(res).to.equal(true);
 
-    res = recognizer.onTouchMove({touches: [
-      {clientX: 111, clientY: 211},
-      {clientX: 122, clientY: 234},
-    ]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 111, clientY: 211}, {clientX: 122, clientY: 234}],
+    });
 
     // Additional touch move should not have any effect
     expect(res).to.equal(true);
@@ -441,12 +501,9 @@ describe('SwipeXYRecognizer', () => {
     expect(recognizer.eventing_).to.equal(true);
     gesturesMock.expects('signalEnd_').never();
   });
-
 });
 
-
 describe('TapzoomRecognizer', () => {
-
   let sandbox;
   let element;
   let clock;
@@ -476,52 +533,55 @@ describe('TapzoomRecognizer', () => {
     sandbox.restore();
   });
 
-
   it('should allow single-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
   });
 
   it('should deny two-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}, {}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}, {}],
+    });
     expect(res).to.equal(false);
     expect(recognizer.startX_).to.equal(0);
     expect(recognizer.startY_).to.equal(0);
   });
 
   it('should allow small drift for tap', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 102, clientY: 202}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 102, clientY: 202}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(102);
     expect(recognizer.lastY_).to.equal(202);
   });
 
   it('should deny large drift for tap', () => {
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 111, clientY: 211}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 111, clientY: 211}]});
     expect(res).to.equal(false);
   });
 
   it('should ask pending for first touchend', () => {
-    gesturesMock.expects('signalPending_').withExactArgs(
-        recognizer, 400).once();
+    gesturesMock
+      .expects('signalPending_')
+      .withExactArgs(recognizer, 400)
+      .once();
     gesturesMock.expects('signalReady_').never();
     recognizer.onTouchEnd({});
     expect(recognizer.tapCount_).to.equal(1);
@@ -530,14 +590,14 @@ describe('TapzoomRecognizer', () => {
   it('should ignore small drift after first tap', () => {
     recognizer.tapCount_ = 1;
     gesturesMock.expects('signalReady_').never();
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX_).to.equal(101);
     expect(recognizer.startY_).to.equal(201);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 102, clientY: 202}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 102, clientY: 202}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(102);
     expect(recognizer.lastY_).to.equal(202);
@@ -545,32 +605,46 @@ describe('TapzoomRecognizer', () => {
 
   it('should send ready after significant move', () => {
     recognizer.tapCount_ = 1;
-    gesturesMock.expects('signalReady_').withExactArgs(recognizer, 0).once();
-
-    let res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    gesturesMock
+      .expects('signalReady_')
+      .withExactArgs(recognizer, 0)
+      .once();
+
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
 
-    res = recognizer.onTouchMove({touches:
-        [{clientX: 112, clientY: 212}]});
+    res = recognizer.onTouchMove({touches: [{clientX: 112, clientY: 212}]});
     expect(res).to.equal(true);
     expect(recognizer.lastX_).to.equal(112);
     expect(recognizer.lastY_).to.equal(212);
   });
 
-
   it('should emit on start', () => {
     recognizer.startX_ = recognizer.prevX_ = 101;
     recognizer.startY_ = recognizer.prevY_ = 201;
     recognizer.lastX_ = 111;
     recognizer.lastY_ = 211;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === true && data.last === false &&
-              data.centerClientX == 101 && data.centerClientY == 201 &&
-              data.deltaX == 10 && data.deltaY == 10 &&
-              data.velocityX == 0 && data.velocityY == 0);
-        }), null).once();
+          return (
+            data.first === true &&
+            data.last === false &&
+            data.centerClientX == 101 &&
+            data.centerClientY == 201 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX == 0 &&
+            data.velocityY == 0
+          );
+        }),
+        null
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -585,13 +659,25 @@ describe('TapzoomRecognizer', () => {
     recognizer.startX_ = recognizer.prevX_ = 101;
     recognizer.startY_ = recognizer.prevY_ = 201;
     recognizer.eventing_ = true;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === false &&
-              data.centerClientX == 101 && data.centerClientY == 201 &&
-              data.deltaX == 10 && data.deltaY == 10 &&
-              data.velocityX > 0 && data.velocityY > 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === false &&
+            data.centerClientX == 101 &&
+            data.centerClientY == 201 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX > 0 &&
+            data.velocityY > 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -609,13 +695,25 @@ describe('TapzoomRecognizer', () => {
     recognizer.lastX_ = 111;
     recognizer.lastY_ = 211;
     recognizer.eventing_ = true;
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === true &&
-              data.centerClientX == 101 && data.centerClientY == 201 &&
-              data.deltaX == 10 && data.deltaY == 10 &&
-              data.velocityX > 0 && data.velocityY > 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === true &&
+            data.centerClientX == 101 &&
+            data.centerClientY == 201 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX > 0 &&
+            data.velocityY > 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').once();
 
     clock.tick(10);
@@ -625,9 +723,7 @@ describe('TapzoomRecognizer', () => {
   });
 });
 
-
 describe('PinchRecognizer', () => {
-
   let sandbox;
   let element;
   let clock;
@@ -661,11 +757,11 @@ describe('PinchRecognizer', () => {
     return Math.abs(value - compare) <= error;
   }
 
-
   it('should wait and listen on single-point touchstart', () => {
     gesturesMock.expects('signalReady_').never();
-    const res = recognizer.onTouchStart({touches:
-        [{clientX: 101, clientY: 201}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 101, clientY: 201}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX1_).to.equal(0);
     expect(recognizer.startY1_).to.equal(0);
@@ -674,9 +770,9 @@ describe('PinchRecognizer', () => {
   });
 
   it('should allow two-point touchstart', () => {
-    const res = recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
+    const res = recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX1_).to.equal(90);
     expect(recognizer.startY1_).to.equal(80);
@@ -684,21 +780,20 @@ describe('PinchRecognizer', () => {
     expect(recognizer.startY2_).to.equal(120);
   });
 
-
   it('should allow small drift before requesting ready', () => {
     gesturesMock.expects('signalReady_').never();
-    let res = recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.startX1_).to.equal(90);
     expect(recognizer.startY1_).to.equal(80);
     expect(recognizer.startX2_).to.equal(110);
     expect(recognizer.startY2_).to.equal(120);
 
-    res = recognizer.onTouchMove({touches:
-    [{clientX: 89, clientY: 79},
-      {clientX: 112, clientY: 122}]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 89, clientY: 79}, {clientX: 112, clientY: 122}],
+    });
     expect(res).to.equal(true);
     expect(recognizer.lastX1_).to.equal(89);
     expect(recognizer.lastY1_).to.equal(79);
@@ -707,60 +802,71 @@ describe('PinchRecognizer', () => {
   });
 
   it('should send ready after significant move', () => {
-    gesturesMock.expects('signalReady_').withExactArgs(recognizer, 0).once();
-
-    let res = recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
+    gesturesMock
+      .expects('signalReady_')
+      .withExactArgs(recognizer, 0)
+      .once();
+
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
     expect(res).to.equal(true);
 
-    res = recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
     expect(res).to.equal(true);
   });
 
   it('should allow small drift before cancelling and then cancel', () => {
     gesturesMock.expects('signalReady_').never();
-    let res = recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
     expect(res).to.equal(true);
 
     // Move in the same direction by 2px.
-    res = recognizer.onTouchMove({touches:
-    [{clientX: 88, clientY: 78},
-      {clientX: 108, clientY: 118}]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 88, clientY: 78}, {clientX: 108, clientY: 118}],
+    });
     expect(res).to.equal(true);
 
     // Move in the same direction by 10px.
-    res = recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 100, clientY: 110}]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 100, clientY: 110}],
+    });
     expect(res).to.equal(false);
   });
 
-
   it('should emit on start', () => {
     clock.tick(1);
-    recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
-    recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
+    recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === true && data.last === false &&
-              data.centerClientX == 100 &&
-              data.centerClientY == 100 &&
-              data.dir == 1 &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              data.time == 11 &&
-              diff(data.velocityX, 0.79, 1e-2) &&
-              diff(data.velocityY, 0.79, 1e-2));
-        }), null).once();
+          return (
+            data.first === true &&
+            data.last === false &&
+            data.centerClientX == 100 &&
+            data.centerClientY == 100 &&
+            data.dir == 1 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.time == 11 &&
+            diff(data.velocityX, 0.79, 1e-2) &&
+            diff(data.velocityY, 0.79, 1e-2)
+          );
+        }),
+        null
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -783,31 +889,42 @@ describe('PinchRecognizer', () => {
 
   it('should emit on touchmove after start', () => {
     clock.tick(1);
-    recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
-    recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
-        sinon.match(unusedData => true), null).once();
+    recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
+    recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(recognizer, sinon.match(unusedData => true), null)
+      .once();
     clock.tick(10);
     recognizer.acceptStart();
 
-    const event = {touches:
-    [{clientX: 70, clientY: 60},
-      {clientX: 130, clientY: 140}]};
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    const event = {
+      touches: [{clientX: 70, clientY: 60}, {clientX: 130, clientY: 140}],
+    };
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === false &&
-              data.centerClientX == 100 &&
-              data.centerClientY == 100 &&
-              data.dir == 1 &&
-              data.deltaX == 20 &&
-              data.deltaY == 20 &&
-              data.velocityX > 0 &&
-              data.velocityY > 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === false &&
+            data.centerClientX == 100 &&
+            data.centerClientY == 100 &&
+            data.dir == 1 &&
+            data.deltaX == 20 &&
+            data.deltaY == 20 &&
+            data.velocityX > 0 &&
+            data.velocityY > 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').never();
 
     clock.tick(10);
@@ -815,29 +932,40 @@ describe('PinchRecognizer', () => {
     expect(res).to.equal(true);
   });
 
-  it('should stop on touchend; velocity doesn\'t change', () => {
+  it("should stop on touchend; velocity doesn't change", () => {
     clock.tick(1);
-    recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
-    recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
-        sinon.match(unusedData => true), null).once();
+    recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
+    recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(recognizer, sinon.match(unusedData => true), null)
+      .once();
     clock.tick(10);
     recognizer.acceptStart();
 
     const event = {touches: []};
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === true &&
-              data.dir == 1 &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              diff(data.velocityX, 0.79, 1e-2) &&
-              diff(data.velocityY, 0.79, 1e-2));
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === true &&
+            data.dir == 1 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            diff(data.velocityX, 0.79, 1e-2) &&
+            diff(data.velocityY, 0.79, 1e-2)
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').once();
 
     clock.tick(10);
@@ -847,27 +975,38 @@ describe('PinchRecognizer', () => {
 
   it('should stop on touchend; velocity changes', () => {
     clock.tick(1);
-    recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
-    recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
-        sinon.match(unusedData => true), null).once();
+    recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
+    recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(recognizer, sinon.match(unusedData => true), null)
+      .once();
     clock.tick(10);
     recognizer.acceptStart();
 
     const event = {touches: []};
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return (data.first === false && data.last === true &&
-              data.dir == 1 &&
-              data.deltaX == 10 &&
-              data.deltaY == 10 &&
-              data.velocityX == 0 &&
-              data.velocityY == 0);
-        }), event).once();
+          return (
+            data.first === false &&
+            data.last === true &&
+            data.dir == 1 &&
+            data.deltaX == 10 &&
+            data.deltaY == 10 &&
+            data.velocityX == 0 &&
+            data.velocityY == 0
+          );
+        }),
+        event
+      )
+      .once();
     gesturesMock.expects('signalEnd_').once();
 
     clock.tick(50);
@@ -875,47 +1014,64 @@ describe('PinchRecognizer', () => {
     expect(recognizer.eventing_).to.equal(false);
   });
 
-
   it('should ignore additional touches if eventing', () => {
     clock.tick(1);
-    let res = recognizer.onTouchStart({touches:
-    [{clientX: 90, clientY: 80},
-      {clientX: 110, clientY: 120}]});
+    let res = recognizer.onTouchStart({
+      touches: [{clientX: 90, clientY: 80}, {clientX: 110, clientY: 120}],
+    });
     expect(res).to.equal(true);
 
-    res = recognizer.onTouchMove({touches:
-    [{clientX: 80, clientY: 70},
-      {clientX: 120, clientY: 130}]});
+    res = recognizer.onTouchMove({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
     expect(res).to.equal(true);
 
     // On acceptStart, we get a null event
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return data.centerClientX == 100 &&
+          return (
+            data.centerClientX == 100 &&
             data.centerClientY == 100 &&
             data.deltaX == 10 &&
             data.deltaY == 10 &&
             data.dir == 1 &&
             data.first == true &&
             data.last == false &&
-            data.time == 1;
-        }), null).once();
+            data.time == 1
+          );
+        }),
+        null
+      )
+      .once();
 
     // On onTouchMove, we didn't actually move the original touches
-    gesturesMock.expects('signalEmit_').withExactArgs(recognizer,
+    gesturesMock
+      .expects('signalEmit_')
+      .withExactArgs(
+        recognizer,
         sinon.match(data => {
-          return data.centerClientX == 100 &&
+          return (
+            data.centerClientX == 100 &&
             data.centerClientY == 100 &&
             data.deltaX == 10 &&
             data.deltaY == 10 &&
             data.dir == 1 &&
             data.first == false &&
-            data.last == false;
-        }), {touches: [
-          {clientX: 80, clientY: 70},
-          {clientX: 120, clientY: 130},
-          {clientX: 160, clientY: 160},
-        ]}).once();
+            data.last == false
+          );
+        }),
+        {
+          touches: [
+            {clientX: 80, clientY: 70},
+            {clientX: 120, clientY: 130},
+            {clientX: 160, clientY: 160},
+          ],
+        }
+      )
+      .once();
 
     recognizer.acceptStart();
 
@@ -923,28 +1079,33 @@ describe('PinchRecognizer', () => {
 
     // Trigger additional touch start; nothing should happen
     // for the additional touch
-    res = recognizer.onTouchStart({touches:
-      [{clientX: 80, clientY: 70},
+    res = recognizer.onTouchStart({
+      touches: [
+        {clientX: 80, clientY: 70},
         {clientX: 120, clientY: 130},
-        {clientX: 160, clientY: 160}]});
+        {clientX: 160, clientY: 160},
+      ],
+    });
     expect(res).to.equal(true);
 
     // Trigger additional touch move; nothing should happen since the
     // existing touches did not move.
-    res = recognizer.onTouchMove({touches:
-      [{clientX: 80, clientY: 70},
+    res = recognizer.onTouchMove({
+      touches: [
+        {clientX: 80, clientY: 70},
         {clientX: 120, clientY: 130},
-        {clientX: 160, clientY: 160}]});
+        {clientX: 160, clientY: 160},
+      ],
+    });
     expect(res).to.equal(true);
 
     // Trigger touch end; should not end since two touches are remaining
-    res = recognizer.onTouchEnd({touches:
-      [{clientX: 80, clientY: 70},
-        {clientX: 120, clientY: 130}]});
+    res = recognizer.onTouchEnd({
+      touches: [{clientX: 80, clientY: 70}, {clientX: 120, clientY: 130}],
+    });
 
     clock.tick(50);
     // Additional touch start and touch move should not trigger a signal
     gesturesMock.expects('signalEnd_').never();
   });
-
 });
diff --git a/test/unit/test-gesture.js b/test/unit/test-gesture.js
index cc658ede1037..4b1fbdf15273 100644
--- a/test/unit/test-gesture.js
+++ b/test/unit/test-gesture.js
@@ -16,9 +16,7 @@
 
 import {GestureRecognizer, Gestures} from '../../src/gesture';
 
-
 describe('Gestures', () => {
-
   class TestRecognizer extends GestureRecognizer {
     constructor(manager) {
       super('test', manager);
@@ -77,7 +75,6 @@ describe('Gestures', () => {
     eventListeners[event.type](event);
   }
 
-
   it('onPointerDown should be called', () => {
     const handler = sandbox.spy();
     gestures.onPointerDown(handler);
@@ -85,10 +82,15 @@ describe('Gestures', () => {
     expect(handler).to.be.calledOnce;
   });
 
-
   it('should proceed with series if touchstart returns true', () => {
-    recognizerMock.expects('onTouchStart').returns(true).once();
-    recognizerMock.expects('onTouchMove').returns(true).once();
+    recognizerMock
+      .expects('onTouchStart')
+      .returns(true)
+      .once();
+    recognizerMock
+      .expects('onTouchMove')
+      .returns(true)
+      .once();
     recognizerMock.expects('onTouchEnd').once();
     sendEvent({type: 'touchstart'});
     sendEvent({type: 'touchmove'});
@@ -96,7 +98,10 @@ describe('Gestures', () => {
   });
 
   it('should cancel series if touchstart returns false', () => {
-    recognizerMock.expects('onTouchStart').returns(false).once();
+    recognizerMock
+      .expects('onTouchStart')
+      .returns(false)
+      .once();
     recognizerMock.expects('onTouchMove').never();
     recognizerMock.expects('onTouchEnd').never();
     sendEvent({type: 'touchstart'});
@@ -105,8 +110,14 @@ describe('Gestures', () => {
   });
 
   it('should cancel series if touchmove returns false', () => {
-    recognizerMock.expects('onTouchStart').returns(true).once();
-    recognizerMock.expects('onTouchMove').returns(false).once();
+    recognizerMock
+      .expects('onTouchStart')
+      .returns(true)
+      .once();
+    recognizerMock
+      .expects('onTouchMove')
+      .returns(false)
+      .once();
     recognizerMock.expects('onTouchEnd').never();
     sendEvent({type: 'touchstart'});
     sendEvent({type: 'touchmove'});
@@ -114,21 +125,30 @@ describe('Gestures', () => {
   });
 
   it('should enter tracking mode on touchstart true', () => {
-    recognizerMock.expects('onTouchStart').returns(true).once();
+    recognizerMock
+      .expects('onTouchStart')
+      .returns(true)
+      .once();
     sendEvent({type: 'touchstart'});
     expect(gestures.tracking_[0]).to.equal(true);
   });
 
   it('should stay in tracking mode on touchmove true', () => {
     gestures.tracking_[0] = true;
-    recognizerMock.expects('onTouchMove').returns(true).once();
+    recognizerMock
+      .expects('onTouchMove')
+      .returns(true)
+      .once();
     sendEvent({type: 'touchmove'});
     expect(gestures.tracking_[0]).to.equal(true);
   });
 
   it('should exit tracking mode on touchmove false', () => {
     gestures.tracking_[0] = true;
-    recognizerMock.expects('onTouchMove').returns(false).once();
+    recognizerMock
+      .expects('onTouchMove')
+      .returns(false)
+      .once();
     sendEvent({type: 'touchmove'});
     expect(gestures.tracking_[0]).to.equal(false);
   });
@@ -173,7 +193,6 @@ describe('Gestures', () => {
     expect(gestures.tracking_[0]).to.equal(false);
   });
 
-
   it('should deny ready state if already eventing', () => {
     gestures.eventing_ = {};
     recognizerMock.expects('acceptCancel').once();
@@ -190,7 +209,6 @@ describe('Gestures', () => {
     expect(gestures.passAfterEvent_).to.equal(true);
   });
 
-
   it('should deny pending state if already eventing', () => {
     gestures.eventing_ = {};
     gestures.pending_[0] = 0;
@@ -206,19 +224,19 @@ describe('Gestures', () => {
     expect(gestures.pending_[0]).to.equal(11);
   });
 
-
   it('should stop eventing', () => {
     gestures.eventing_ = recognizer;
     gestures.signalEnd_(recognizer);
     expect(gestures.eventing_).to.equal(null);
   });
 
-
   it('should deny emit if another eventing', () => {
     gestures.eventing_ = {};
-    allowConsoleError(() => { expect(() => {
-      gestures.signalEmit_(recognizer, {}, null);
-    }).to.throw(/Recognizer is not currently allowed/); });
+    allowConsoleError(() => {
+      expect(() => {
+        gestures.signalEmit_(recognizer, {}, null);
+      }).to.throw(/Recognizer is not currently allowed/);
+    });
     expect(onGesture).to.have.not.been.called;
   });
 
@@ -236,7 +254,6 @@ describe('Gestures', () => {
     expect(gesture.time).to.equal(1);
   });
 
-
   it('should ignore pass - nothing to do', () => {
     recognizerMock.expects('acceptStart').never();
     gestures.doPass_();
@@ -279,7 +296,6 @@ describe('Gestures', () => {
     expect(gestures.eventing_).to.equal(recognizer);
   });
 
-
   it('should allow event to propagate when nothing happening', () => {
     const event = {
       type: 'touchend',
@@ -405,7 +421,7 @@ describe('Gestures', () => {
 
       onGesture = sandbox.spy();
 
-      gestures = Gestures.get(element, /* shouldNotPreventDefault */true);
+      gestures = Gestures.get(element, /* shouldNotPreventDefault */ true);
       gestures.onGesture(TestRecognizer, onGesture);
       expect(gestures.recognizers_.length).to.equal(1);
       recognizer = gestures.recognizers_[0];
@@ -479,7 +495,5 @@ describe('Gestures', () => {
       expect(event.preventDefault).to.have.not.been.called;
       expect(event.stopPropagation).to.have.not.been.called;
     });
-
   });
-
 });
diff --git a/test/unit/test-get-html.js b/test/unit/test-get-html.js
index 5be0d5986abc..9a2e02221b11 100644
--- a/test/unit/test-get-html.js
+++ b/test/unit/test-get-html.js
@@ -49,8 +49,9 @@ describe('getHtml', () => {
 
   it('should correctly works with attributes array', () => {
     const result = getHtml(window, '#wrapper', ['class', 'id']);
-    const expected = '<div id="wrapper"> ' +
-        '<div class="tmp">Lorem ipsum</div> dolor sit amet </div>';
+    const expected =
+      '<div id="wrapper"> ' +
+      '<div class="tmp">Lorem ipsum</div> dolor sit amet </div>';
     expect(result).to.equal(expected);
   });
 
diff --git a/test/unit/test-hidden-observer.js b/test/unit/test-hidden-observer.js
index 1377946d4ee6..546aa37737c4 100644
--- a/test/unit/test-hidden-observer.js
+++ b/test/unit/test-hidden-observer.js
@@ -17,82 +17,87 @@
 import {FakeMutationObserver} from '../../testing/fake-dom';
 import {Services} from '../../src/services';
 
-describes.fakeWin('HiddenObserver', {
-  amp: true,
-}, env => {
-  let hiddenObserver;
-  let sandbox;
-  let MutationObserver;
-
-  function setupSingletonMutationObserver(opt_cb = () => {}) {
-    const mo = new FakeMutationObserver(opt_cb);
-    MutationObserver = sandbox.stub().callsFake(function() {
+describes.fakeWin(
+  'HiddenObserver',
+  {
+    amp: true,
+  },
+  env => {
+    let hiddenObserver;
+    let sandbox;
+    let MutationObserver;
+
+    function setupSingletonMutationObserver(opt_cb = () => {}) {
+      const mo = new FakeMutationObserver(opt_cb);
+      MutationObserver = sandbox.stub().callsFake(function() {
+        return mo;
+      });
+      env.win.MutationObserver = MutationObserver;
       return mo;
-    });
-    env.win.MutationObserver = MutationObserver;
-    return mo;
-  }
+    }
 
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    hiddenObserver =
-      Services.hiddenObserverForDoc(env.win.document.documentElement);
-  });
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      hiddenObserver = Services.hiddenObserverForDoc(
+        env.win.document.documentElement
+      );
+    });
 
-  it('initializes mutation observer on first listen', () => {
-    const mo = setupSingletonMutationObserver();
-    const observe = sandbox.spy(mo, 'observe');
+    it('initializes mutation observer on first listen', () => {
+      const mo = setupSingletonMutationObserver();
+      const observe = sandbox.spy(mo, 'observe');
 
-    hiddenObserver.add(() => {});
+      hiddenObserver.add(() => {});
 
-    expect(MutationObserver).to.have.been.calledOnce;
-    expect(observe).to.have.been.calledOnceWith(env.win.document);
-  });
+      expect(MutationObserver).to.have.been.calledOnce;
+      expect(observe).to.have.been.calledOnceWith(env.win.document);
+    });
 
-  it('keeps mutation observer on second listen', () => {
-    const mo = setupSingletonMutationObserver();
-    const observe = sandbox.spy(mo, 'observe');
+    it('keeps mutation observer on second listen', () => {
+      const mo = setupSingletonMutationObserver();
+      const observe = sandbox.spy(mo, 'observe');
 
-    hiddenObserver.add(() => {});
-    hiddenObserver.add(() => {});
+      hiddenObserver.add(() => {});
+      hiddenObserver.add(() => {});
 
-    expect(MutationObserver).to.have.been.calledOnce;
-    expect(observe).to.have.been.calledOnce;
-  });
+      expect(MutationObserver).to.have.been.calledOnce;
+      expect(observe).to.have.been.calledOnce;
+    });
 
-  it('frees mutation observer after last unlisten', () => {
-    const mo = setupSingletonMutationObserver();
-    const disconnect = sandbox.spy(mo, 'disconnect');
+    it('frees mutation observer after last unlisten', () => {
+      const mo = setupSingletonMutationObserver();
+      const disconnect = sandbox.spy(mo, 'disconnect');
 
-    const unlisten = hiddenObserver.add(() => {});
-    unlisten();
+      const unlisten = hiddenObserver.add(() => {});
+      unlisten();
 
-    expect(disconnect).to.have.been.calledOnce;
-  });
+      expect(disconnect).to.have.been.calledOnce;
+    });
 
-  it('keeps mutation observer after second-to-last unlisten', () => {
-    const mo = setupSingletonMutationObserver();
-    const disconnect = sandbox.spy(mo, 'disconnect');
+    it('keeps mutation observer after second-to-last unlisten', () => {
+      const mo = setupSingletonMutationObserver();
+      const disconnect = sandbox.spy(mo, 'disconnect');
 
-    const unlisten = hiddenObserver.add(() => {});
-    const unlisten2 = hiddenObserver.add(() => {});
+      const unlisten = hiddenObserver.add(() => {});
+      const unlisten2 = hiddenObserver.add(() => {});
 
-    unlisten();
-    expect(disconnect).not.to.have.been.called;
+      unlisten();
+      expect(disconnect).not.to.have.been.called;
 
-    unlisten2();
-    expect(disconnect).to.have.been.calledOnce;
-  });
+      unlisten2();
+      expect(disconnect).to.have.been.calledOnce;
+    });
 
-  it('passes MutationRecords to handler', function*() {
-    const stub = sandbox.stub();
-    const mo = setupSingletonMutationObserver(stub);
+    it('passes MutationRecords to handler', function*() {
+      const stub = sandbox.stub();
+      const mo = setupSingletonMutationObserver(stub);
 
-    const mutation = {};
-    const mutation2 = {};
-    mo.__mutate(mutation);
-    yield mo.__mutate(mutation2);
+      const mutation = {};
+      const mutation2 = {};
+      mo.__mutate(mutation);
+      yield mo.__mutate(mutation2);
 
-    expect(stub).to.have.been.calledOnceWith([mutation, mutation2]);
-  });
-});
+      expect(stub).to.have.been.calledOnceWith([mutation, mutation2]);
+    });
+  }
+);
diff --git a/test/unit/test-history.js b/test/unit/test-history.js
index 86545b000803..b38a375b81c5 100644
--- a/test/unit/test-history.js
+++ b/test/unit/test-history.js
@@ -26,232 +26,274 @@ import {installTimerService} from '../../src/service/timer-impl';
 import {listenOncePromise} from '../../src/event-helper';
 import {parseUrlDeprecated} from '../../src/url';
 
-
-describes.fakeWin('History', {
-  win: {
-    location: '#first',
+describes.fakeWin(
+  'History',
+  {
+    win: {
+      location: '#first',
+    },
   },
-}, env => {
-  let sandbox;
-  let clock;
-  let bindingMock;
-  let onStateUpdated;
-  let history;
-
-  beforeEach(() => {
-    installTimerService(env.win);
-    sandbox = env.sandbox;
-    clock = sandbox.useFakeTimers();
-
-    const binding = {
-      cleanup: () => {},
-      setOnStateUpdated: callback => {
-        onStateUpdated = callback;
-      },
-      push: () => {},
-      pop(unusedStackIndex) {},
-      replace(opt_fragment, opt_state) {},
-      get() {},
-      replaceStateForTarget: () => {},
-      getFragment: () => {},
-      updateFragment: () => {},
-    };
-    bindingMock = sandbox.mock(binding);
-
-    history = new History(new AmpDocSingle(env.win), binding);
-  });
+  env => {
+    let sandbox;
+    let clock;
+    let bindingMock;
+    let onStateUpdated;
+    let history;
+
+    beforeEach(() => {
+      installTimerService(env.win);
+      sandbox = env.sandbox;
+      clock = sandbox.useFakeTimers();
+
+      const binding = {
+        cleanup: () => {},
+        setOnStateUpdated: callback => {
+          onStateUpdated = callback;
+        },
+        push: () => {},
+        pop(unusedStackIndex) {},
+        replace(opt_fragment, opt_state) {},
+        get() {},
+        replaceStateForTarget: () => {},
+        getFragment: () => {},
+        updateFragment: () => {},
+      };
+      bindingMock = sandbox.mock(binding);
+
+      history = new History(new AmpDocSingle(env.win), binding);
+    });
 
-  afterEach(() => {
-    bindingMock.verify();
-  });
+    afterEach(() => {
+      bindingMock.verify();
+    });
 
-  it('should initialize correctly', () => {
-    expect(history.stackIndex_).to.equal(0);
-    expect(history.stackOnPop_.length).to.equal(0);
-    expect(onStateUpdated).to.not.equal(null);
-  });
+    it('should initialize correctly', () => {
+      expect(history.stackIndex_).to.equal(0);
+      expect(history.stackOnPop_.length).to.equal(0);
+      expect(onStateUpdated).to.not.equal(null);
+    });
 
-  it('should push new state', () => {
-    const onPop = sandbox.spy();
-    bindingMock.expects('push')
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    return history.push(onPop).then(unusedHistoryId => {
-      expect(history.stackIndex_).to.equal(11);
-      expect(history.stackOnPop_.length).to.equal(12);
-      expect(history.stackOnPop_[11]).to.equal(onPop);
-      expect(onPop).to.have.not.been.called;
+    it('should push new state', () => {
+      const onPop = sandbox.spy();
+      bindingMock
+        .expects('push')
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      return history.push(onPop).then(unusedHistoryId => {
+        expect(history.stackIndex_).to.equal(11);
+        expect(history.stackOnPop_.length).to.equal(12);
+        expect(history.stackOnPop_[11]).to.equal(onPop);
+        expect(onPop).to.have.not.been.called;
+      });
     });
-  });
 
-  it('should pop previously pushed state', () => {
-    const onPop = sandbox.spy();
-    bindingMock.expects('push')
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('pop').withExactArgs(11)
-        .returns(Promise.resolve({stackIndex: 10})).once();
-    return history.push(onPop).then(historyId => {
-      expect(historyId).to.equal(11);
-      expect(history.stackOnPop_.length).to.equal(12);
-      expect(history.stackOnPop_[11]).to.equal(onPop);
-      expect(onPop).to.have.not.been.called;
-      return history.pop(historyId).then(() => {
-        expect(history.stackIndex_).to.equal(10);
-        expect(history.stackOnPop_.length).to.equal(11);
-        clock.tick(1);
-        expect(onPop).to.be.calledOnce;
+    it('should pop previously pushed state', () => {
+      const onPop = sandbox.spy();
+      bindingMock
+        .expects('push')
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('pop')
+        .withExactArgs(11)
+        .returns(Promise.resolve({stackIndex: 10}))
+        .once();
+      return history.push(onPop).then(historyId => {
+        expect(historyId).to.equal(11);
+        expect(history.stackOnPop_.length).to.equal(12);
+        expect(history.stackOnPop_[11]).to.equal(onPop);
+        expect(onPop).to.have.not.been.called;
+        return history.pop(historyId).then(() => {
+          expect(history.stackIndex_).to.equal(10);
+          expect(history.stackOnPop_.length).to.equal(11);
+          clock.tick(1);
+          expect(onPop).to.be.calledOnce;
+        });
       });
     });
-  });
 
-  it('should return and call callback when history popped', () => {
-    const onPop = sandbox.spy();
-    bindingMock.expects('push').withExactArgs(undefined)
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('pop').withExactArgs(11)
-        .returns(Promise.resolve({stackIndex: 10})).once();
-    return history.push(onPop).then(stackIndex => {
-      expect(onPop).to.have.not.been.called;
-      return history.pop(stackIndex).then(() => {
-        expect(history.stackIndex_).to.equal(10);
-        expect(history.stackOnPop_.length).to.equal(11);
-        clock.tick(1);
-        expect(onPop).to.be.calledOnce;
-        expect(onPop.getCall(0).args[0]).to.deep.equal({stackIndex: 10});
+    it('should return and call callback when history popped', () => {
+      const onPop = sandbox.spy();
+      bindingMock
+        .expects('push')
+        .withExactArgs(undefined)
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('pop')
+        .withExactArgs(11)
+        .returns(Promise.resolve({stackIndex: 10}))
+        .once();
+      return history.push(onPop).then(stackIndex => {
+        expect(onPop).to.have.not.been.called;
+        return history.pop(stackIndex).then(() => {
+          expect(history.stackIndex_).to.equal(10);
+          expect(history.stackOnPop_.length).to.equal(11);
+          clock.tick(1);
+          expect(onPop).to.be.calledOnce;
+          expect(onPop.getCall(0).args[0]).to.deep.equal({stackIndex: 10});
+        });
       });
     });
-  });
 
-  it('should return and call callback with state when history popped', () => {
-    const onPop = sandbox.spy();
-    const title = 'TITLE';
-    bindingMock.expects('push').withExactArgs(undefined)
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('pop').withExactArgs(11)
+    it('should return and call callback with state when history popped', () => {
+      const onPop = sandbox.spy();
+      const title = 'TITLE';
+      bindingMock
+        .expects('push')
+        .withExactArgs(undefined)
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('pop')
+        .withExactArgs(11)
         .returns(Promise.resolve({stackIndex: 10, title}))
         .once();
-    return history.push(onPop).then(stackIndex => {
-      expect(onPop).to.have.not.been.called;
-      return history.pop(stackIndex).then(() => {
-        expect(history.stackIndex_).to.equal(10);
-        expect(history.stackOnPop_.length).to.equal(11);
-        clock.tick(1);
-        expect(onPop).to.be.calledOnce;
-        expect(onPop.getCall(0).args[0]).to.deep
-            .equal({stackIndex: 10, title});
+      return history.push(onPop).then(stackIndex => {
+        expect(onPop).to.have.not.been.called;
+        return history.pop(stackIndex).then(() => {
+          expect(history.stackIndex_).to.equal(10);
+          expect(history.stackOnPop_.length).to.equal(11);
+          clock.tick(1);
+          expect(onPop).to.be.calledOnce;
+          expect(onPop.getCall(0).args[0]).to.deep.equal({
+            stackIndex: 10,
+            title,
+          });
+        });
       });
     });
-  });
 
-  it('should replace previously pushed state', () => {
-    const onPop = sandbox.spy();
-    const pushState = {title: 'pushState'};
-    const replaceState = {title: 'replaceState'};
-    bindingMock.expects('push')
+    it('should replace previously pushed state', () => {
+      const onPop = sandbox.spy();
+      const pushState = {title: 'pushState'};
+      const replaceState = {title: 'replaceState'};
+      bindingMock
+        .expects('push')
         .withExactArgs(pushState)
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('replace')
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('replace')
         .withExactArgs(replaceState)
-        .returns(Promise.resolve()).once();
-    return history.push(onPop, pushState).then(historyId => {
-      expect(historyId).to.equal(11);
-      expect(history.stackOnPop_.length).to.equal(12);
-      expect(history.stackOnPop_[11]).to.equal(onPop);
-      expect(onPop).to.not.be.called;
-      return history.replace(replaceState).then(() => {
-        // Replacing the state should not affect registered pop handlers
-        expect(history.stackIndex_).to.equal(11);
+        .returns(Promise.resolve())
+        .once();
+      return history.push(onPop, pushState).then(historyId => {
+        expect(historyId).to.equal(11);
         expect(history.stackOnPop_.length).to.equal(12);
         expect(history.stackOnPop_[11]).to.equal(onPop);
         expect(onPop).to.not.be.called;
+        return history.replace(replaceState).then(() => {
+          // Replacing the state should not affect registered pop handlers
+          expect(history.stackIndex_).to.equal(11);
+          expect(history.stackOnPop_.length).to.equal(12);
+          expect(history.stackOnPop_[11]).to.equal(onPop);
+          expect(onPop).to.not.be.called;
+        });
       });
     });
-  });
 
-  it('should get previously pushed state', () => {
-    const onPop = sandbox.spy();
-    const state = {title: 'title'};
-    bindingMock.expects('push')
+    it('should get previously pushed state', () => {
+      const onPop = sandbox.spy();
+      const state = {title: 'title'};
+      bindingMock
+        .expects('push')
         .withExactArgs(state)
         .returns(Promise.resolve(Object.assign({}, state, {stackIndex: 11})))
         .once();
-    bindingMock.expects('get')
+      bindingMock
+        .expects('get')
         .returns(Promise.resolve(Object.assign({}, state, {stackIndex: 11})))
         .once();
-    return history.push(onPop, state).then(historyId => {
-      expect(historyId).to.equal(11);
-      expect(history.stackOnPop_.length).to.equal(12);
-      expect(history.stackOnPop_[11]).to.equal(onPop);
-      expect(onPop).to.not.be.called;
-      return history.get().then(() => {
-        // Reading the state should not affect registered pop handlers
-        expect(history.stackIndex_).to.equal(11);
+      return history.push(onPop, state).then(historyId => {
+        expect(historyId).to.equal(11);
         expect(history.stackOnPop_.length).to.equal(12);
+        expect(history.stackOnPop_[11]).to.equal(onPop);
         expect(onPop).to.not.be.called;
+        return history.get().then(() => {
+          // Reading the state should not affect registered pop handlers
+          expect(history.stackIndex_).to.equal(11);
+          expect(history.stackOnPop_.length).to.equal(12);
+          expect(onPop).to.not.be.called;
+        });
       });
     });
-  });
 
-  it('should push a new state and replace it for target', () => {
-    bindingMock.expects('push')
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('pop')
-        .returns(Promise.resolve({stackIndex: 10})).once();
-    bindingMock.expects('replaceStateForTarget').withExactArgs('#hello');
-    return history.replaceStateForTarget('#hello').then(() => {
-      return history.pop(history.stackIndex_).then(() => {
-        clock.tick(1);
-        expect(env.win.location.hash).to.equal('#first');
+    it('should push a new state and replace it for target', () => {
+      bindingMock
+        .expects('push')
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('pop')
+        .returns(Promise.resolve({stackIndex: 10}))
+        .once();
+      bindingMock.expects('replaceStateForTarget').withExactArgs('#hello');
+      return history.replaceStateForTarget('#hello').then(() => {
+        return history.pop(history.stackIndex_).then(() => {
+          clock.tick(1);
+          expect(env.win.location.hash).to.equal('#first');
+        });
       });
     });
-  });
 
-  it('should pop previously pushed state via goBack', () => {
-    const onPop = sandbox.spy();
-    const popState = {title: 'title'};
-    bindingMock.expects('push')
-        .returns(Promise.resolve({stackIndex: 11})).once();
-    bindingMock.expects('pop')
+    it('should pop previously pushed state via goBack', () => {
+      const onPop = sandbox.spy();
+      const popState = {title: 'title'};
+      bindingMock
+        .expects('push')
+        .returns(Promise.resolve({stackIndex: 11}))
+        .once();
+      bindingMock
+        .expects('pop')
         .withExactArgs(11)
         .returns(Promise.resolve(Object.assign({}, popState, {stackIndex: 10})))
         .once();
-    return history.push(onPop).then(historyId => {
-      expect(historyId).to.equal(11);
-      expect(history.stackOnPop_.length).to.equal(12);
-      expect(history.stackOnPop_[11]).to.equal(onPop);
-      expect(onPop).to.not.be.called;
-      return history.goBack().then(() => {
-        expect(history.stackIndex_).to.equal(10);
-        expect(history.stackOnPop_.length).to.equal(11);
-        clock.tick(1);
-        expect(onPop).to.be.calledOnce;
-        expect(onPop).to.be
-            .calledWith(Object.assign({}, popState, {stackIndex: 10}));
+      return history.push(onPop).then(historyId => {
+        expect(historyId).to.equal(11);
+        expect(history.stackOnPop_.length).to.equal(12);
+        expect(history.stackOnPop_[11]).to.equal(onPop);
+        expect(onPop).to.not.be.called;
+        return history.goBack().then(() => {
+          expect(history.stackIndex_).to.equal(10);
+          expect(history.stackOnPop_.length).to.equal(11);
+          clock.tick(1);
+          expect(onPop).to.be.calledOnce;
+          expect(onPop).to.be.calledWith(
+            Object.assign({}, popState, {stackIndex: 10})
+          );
+        });
       });
     });
-  });
 
-  it('should NOT pop first state via goBack', () => {
-    bindingMock.expects('pop').never();
-    return history.goBack().then(() => {
-      expect(history.stackIndex_).to.equal(0);
+    it('should NOT pop first state via goBack', () => {
+      bindingMock.expects('pop').never();
+      return history.goBack().then(() => {
+        expect(history.stackIndex_).to.equal(0);
+      });
     });
-  });
 
-  it('should get fragment', () => {
-    bindingMock.expects('getFragment').withExactArgs()
-        .returns(Promise.resolve('fragment')).once();
-    return history.getFragment().then(fragment => {
-      expect(fragment).to.be.equal('fragment');
+    it('should get fragment', () => {
+      bindingMock
+        .expects('getFragment')
+        .withExactArgs()
+        .returns(Promise.resolve('fragment'))
+        .once();
+      return history.getFragment().then(fragment => {
+        expect(fragment).to.be.equal('fragment');
+      });
     });
-  });
-
-  it('should update fragment', () => {
-    bindingMock.expects('updateFragment').withExactArgs('fragment')
-        .returns(Promise.resolve()).once();
-    return history.updateFragment('fragment').then(() => {});
-  });
-});
 
+    it('should update fragment', () => {
+      bindingMock
+        .expects('updateFragment')
+        .withExactArgs('fragment')
+        .returns(Promise.resolve())
+        .once();
+      return history.updateFragment('fragment').then(() => {});
+    });
+  }
+);
 
 describes.sandboxed('History install', {}, () => {
   let win;
@@ -277,7 +319,9 @@ describes.sandboxed('History install', {}, () => {
         body: {},
         querySelector: () => null,
       },
-      location: parseUrlDeprecated('https://cdn.ampproject.org/c/s/www.example.com/path'),
+      location: parseUrlDeprecated(
+        'https://cdn.ampproject.org/c/s/www.example.com/path'
+      ),
       addEventListener: () => null,
     };
     ampdoc = new AmpDocSingle(win);
@@ -289,8 +333,9 @@ describes.sandboxed('History install', {}, () => {
     expect(history.binding_).to.be.instanceOf(HistoryBindingNatural_);
     expect(win.services.history.obj).to.equal(history);
     // Ensure that binding is installed as a singleton.
-    expect(win.services['global-history-binding'].obj)
-        .to.equal(history.binding_);
+    expect(win.services['global-history-binding'].obj).to.equal(
+      history.binding_
+    );
   });
 
   it('should create virtual binding', () => {
@@ -303,7 +348,6 @@ describes.sandboxed('History install', {}, () => {
   });
 });
 
-
 describes.sandboxed('HistoryBindingNatural', {}, () => {
   let clock;
   let onStateUpdated;
@@ -324,22 +368,28 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
     expect(history.stackIndex_).to.equal(window.history.length - 1);
     expect(history.startIndex_).to.equal(window.history.length - 1);
     expect(history.unsupportedState_['AMP.History']).to.equal(
-        window.history.length - 1);
+      window.history.length - 1
+    );
     expect(onStateUpdated).to.have.not.been.called;
   });
 
   it('should initialize correctly with preexisting state', () => {
     history.origPushState_({'AMP.History': window.history.length}, undefined);
-    history.origReplaceState_({'AMP.History': window.history.length - 2},
-        undefined);
+    history.origReplaceState_(
+      {'AMP.History': window.history.length - 2},
+      undefined
+    );
     const history2 = new HistoryBindingNatural_(window);
     expect(history2.stackIndex_).to.equal(window.history.length - 2);
     expect(history2.startIndex_).to.equal(window.history.length - 2);
     expect(history.unsupportedState_['AMP.History']).to.equal(
-        window.history.length - 2);
+      window.history.length - 2
+    );
     history2.cleanup();
-    history.origReplaceState_({'AMP.History': window.history.length - 1},
-        undefined);
+    history.origReplaceState_(
+      {'AMP.History': window.history.length - 1},
+      undefined
+    );
     expect(onStateUpdated).to.have.not.been.called;
   });
 
@@ -355,41 +405,47 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
     window.history.pushState({a: 111});
     expect(history.unsupportedState_.a).to.equal(111);
     expect(history.unsupportedState_['AMP.History']).to.equal(
-        window.history.length - 1);
+      window.history.length - 1
+    );
     expect(onStateUpdated).to.be.calledOnce;
     expect(onStateUpdated.getCall(0).args[0].stackIndex).to.equal(
-        window.history.length - 1);
+      window.history.length - 1
+    );
   });
 
   it('should override history.replaceState and set its properties', () => {
     window.history.replaceState({a: 112});
     expect(history.unsupportedState_.a).to.equal(112);
     expect(history.unsupportedState_['AMP.History']).to.equal(
-        window.history.length - 1);
+      window.history.length - 1
+    );
     expect(onStateUpdated).to.have.not.been.called;
   });
 
   // This prevents IE11/Edge from coercing undefined to become the new url
-  it('should not pass in `url` argument to original replace state if ' +
-    'parameter is undefined', () => {
-    const replaceStateSpy = sandbox.spy();
-    const windowStub = {
-      history: {
-        replaceState: replaceStateSpy,
-        pushState: () => {},
-        state: {},
-        length: 11,
-      },
-      addEventListener: () => {},
-      setTimeout: window.setTimeout,
-      clearTimeout: window.clearTimeout,
-      Promise: window.Promise,
-    };
-    installTimerService(windowStub);
-    new HistoryBindingNatural_(windowStub);
-    expect(replaceStateSpy.callCount).to.be.greaterThan(0);
-    expect(replaceStateSpy.lastCall.args.length).to.equal(2);
-  });
+  it(
+    'should not pass in `url` argument to original replace state if ' +
+      'parameter is undefined',
+    () => {
+      const replaceStateSpy = sandbox.spy();
+      const windowStub = {
+        history: {
+          replaceState: replaceStateSpy,
+          pushState: () => {},
+          state: {},
+          length: 11,
+        },
+        addEventListener: () => {},
+        setTimeout: window.setTimeout,
+        clearTimeout: window.clearTimeout,
+        Promise: window.Promise,
+      };
+      installTimerService(windowStub);
+      new HistoryBindingNatural_(windowStub);
+      expect(replaceStateSpy.callCount).to.be.greaterThan(0);
+      expect(replaceStateSpy.lastCall.args.length).to.equal(2);
+    }
+  );
 
   it('should push new state in the window.history and notify', () => {
     const title = 'title';
@@ -397,11 +453,14 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
       expect(history.stackIndex_).to.equal(historyState.stackIndex);
       expect(history.stackIndex_).to.equal(window.history.length - 1);
       expect(history.unsupportedState_['AMP.History']).to.equal(
-          window.history.length - 1);
+        window.history.length - 1
+      );
       expect(history.unsupportedState_.title).to.deep.equal(title);
       expect(onStateUpdated).to.be.calledOnce;
-      expect(onStateUpdated).to.be.calledWithMatch(
-          {stackIndex: window.history.length - 1, title});
+      expect(onStateUpdated).to.be.calledWithMatch({
+        stackIndex: window.history.length - 1,
+        title,
+      });
     });
   });
 
@@ -409,11 +468,14 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
     const title = 'title';
     return history.push({title}).then(historyState => {
       expect(onStateUpdated).to.be.calledOnce;
-      expect(onStateUpdated).to.be.calledWithMatch(
-          {stackIndex: window.history.length - 1, title});
+      expect(onStateUpdated).to.be.calledWithMatch({
+        stackIndex: window.history.length - 1,
+        title,
+      });
 
-      const histPromise = listenOncePromise(window, 'popstate')
-          .then(() => clock.tick(100));
+      const histPromise = listenOncePromise(window, 'popstate').then(() =>
+        clock.tick(100)
+      );
       const popPromise = history.pop(historyState.stackIndex);
 
       return histPromise.then(unusedHist => {
@@ -421,10 +483,12 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
           expect(pop.stackIndex).to.equal(window.history.length - 2);
           expect(history.stackIndex_).to.equal(window.history.length - 2);
           expect(history.unsupportedState_['AMP.History']).to.equal(
-              window.history.length - 2);
+            window.history.length - 2
+          );
           expect(onStateUpdated).to.have.callCount(2);
           expect(onStateUpdated.getCall(1).args[0].stackIndex).to.equal(
-              window.history.length - 2);
+            window.history.length - 2
+          );
         });
       });
     });
@@ -435,8 +499,9 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
       return history.push({title: 'bar'}).then(second => {
         expect(onStateUpdated).to.have.callCount(2);
 
-        const histPromise = listenOncePromise(window, 'popstate')
-            .then(() => clock.tick(100));
+        const histPromise = listenOncePromise(window, 'popstate').then(() =>
+          clock.tick(100)
+        );
         const popPromise = history.pop(second.stackIndex);
 
         return histPromise.then(unusedHist => {
@@ -444,11 +509,14 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
             expect(pop.stackIndex).to.equal(first.stackIndex);
             expect(history.stackIndex_).to.equal(first.stackIndex);
             expect(history.unsupportedState_['AMP.History']).to.equal(
-                first.stackIndex);
+              first.stackIndex
+            );
 
             expect(onStateUpdated).to.have.callCount(3);
-            expect(onStateUpdated.lastCall).to.be.calledWithMatch(
-                {stackIndex: first.stackIndex, title: 'foo'});
+            expect(onStateUpdated.lastCall).to.be.calledWithMatch({
+              stackIndex: first.stackIndex,
+              title: 'foo',
+            });
           });
         });
       });
@@ -458,12 +526,16 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
   it('should get current state', () => {
     const title = 'title';
     return history.push({title}).then(historyState => {
-      expect(history.unsupportedState_).to.deep.include(
-          {'AMP.History': historyState.stackIndex, title});
+      expect(history.unsupportedState_).to.deep.include({
+        'AMP.History': historyState.stackIndex,
+        title,
+      });
 
       return history.get().then(current => {
-        expect(current).to.deep.include(
-            {'AMP.History': historyState.stackIndex, title});
+        expect(current).to.deep.include({
+          'AMP.History': historyState.stackIndex,
+          title,
+        });
       });
     });
   });
@@ -490,43 +562,46 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
 
   it('should update its state and notify on history.back', () => {
     // Push twice.
-    return Promise.all([history.push(), history.push()]).then(() => {
-      const h = window.history.length;
+    return Promise.all([history.push(), history.push()])
+      .then(() => {
+        const h = window.history.length;
 
-      expect(onStateUpdated).to.be.calledTwice;
-      expect(onStateUpdated.getCall(0).args[0].stackIndex).to.equal(h - 2);
-      expect(onStateUpdated.getCall(1).args[0].stackIndex).to.equal(h - 1);
+        expect(onStateUpdated).to.be.calledTwice;
+        expect(onStateUpdated.getCall(0).args[0].stackIndex).to.equal(h - 2);
+        expect(onStateUpdated.getCall(1).args[0].stackIndex).to.equal(h - 1);
 
-      // Pop once.
-      const popstate = listenOncePromise(window, 'popstate').then(() => {
-        clock.tick(100);
-      });
-      window.history.go(-1);
-      return popstate;
-    }).then(() => {
-      const h = window.history.length - 2;
+        // Pop once.
+        const popstate = listenOncePromise(window, 'popstate').then(() => {
+          clock.tick(100);
+        });
+        window.history.go(-1);
+        return popstate;
+      })
+      .then(() => {
+        const h = window.history.length - 2;
 
-      clock.tick(100);
-      expect(history.stackIndex_).to.equal(h);
-      expect(history.unsupportedState_['AMP.History']).to.equal(h);
-      expect(onStateUpdated).to.be.calledThrice;
-      expect(onStateUpdated.getCall(2).args[0].stackIndex).to.equal(h);
+        clock.tick(100);
+        expect(history.stackIndex_).to.equal(h);
+        expect(history.unsupportedState_['AMP.History']).to.equal(h);
+        expect(onStateUpdated).to.be.calledThrice;
+        expect(onStateUpdated.getCall(2).args[0].stackIndex).to.equal(h);
+
+        // Pop again.
+        const popstate = listenOncePromise(window, 'popstate').then(() => {
+          clock.tick(100);
+        });
+        window.history.go(-1);
+        return popstate;
+      })
+      .then(() => {
+        const h = window.history.length - 3;
 
-      // Pop again.
-      const popstate = listenOncePromise(window, 'popstate').then(() => {
         clock.tick(100);
+        expect(history.stackIndex_).to.equal(h);
+        expect(history.unsupportedState_['AMP.History']).to.equal(h);
+        expect(onStateUpdated).to.have.callCount(4);
+        expect(onStateUpdated.getCall(3).args[0].stackIndex).to.equal(h);
       });
-      window.history.go(-1);
-      return popstate;
-    }).then(() => {
-      const h = window.history.length - 3;
-
-      clock.tick(100);
-      expect(history.stackIndex_).to.equal(h);
-      expect(history.unsupportedState_['AMP.History']).to.equal(h);
-      expect(onStateUpdated).to.have.callCount(4);
-      expect(onStateUpdated.getCall(3).args[0].stackIndex).to.equal(h);
-    });
   });
 
   it('should update path from URL parameter', () => {
@@ -558,7 +633,6 @@ describes.sandboxed('HistoryBindingNatural', {}, () => {
   });
 });
 
-
 describes.sandboxed('HistoryBindingVirtual', {}, env => {
   let sandbox;
 
@@ -601,8 +675,10 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
     it('viewer does not support responses', () => {
       return history.push().then(state => {
         expect(viewer.sendMessageAwaitResponse).to.be.calledOnce;
-        expect(viewer.sendMessageAwaitResponse)
-            .to.be.calledWithMatch('pushHistory', {stackIndex: 1});
+        expect(viewer.sendMessageAwaitResponse).to.be.calledWithMatch(
+          'pushHistory',
+          {stackIndex: 1}
+        );
 
         expect(state.stackIndex).to.equal(1);
         expect(history.stackIndex_).to.equal(1);
@@ -615,13 +691,15 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
     it('viewer supports responses', () => {
       const title = 'title';
       viewer.sendMessageAwaitResponse
-          .withArgs('pushHistory', {stackIndex: 1, title})
-          .returns(Promise.resolve({stackIndex: 1, title}));
+        .withArgs('pushHistory', {stackIndex: 1, title})
+        .returns(Promise.resolve({stackIndex: 1, title}));
 
       return history.push({title}).then(state => {
         expect(viewer.sendMessageAwaitResponse).to.be.calledOnce;
         expect(viewer.sendMessageAwaitResponse).to.be.calledWithMatch(
-            'pushHistory', {stackIndex: 1, title});
+          'pushHistory',
+          {stackIndex: 1, title}
+        );
 
         expect(state.stackIndex).to.equal(1);
         expect(history.stackIndex_).to.equal(1);
@@ -645,24 +723,28 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
 
     it('viewer supports responses', () => {
       viewer.sendMessageAwaitResponse
-          .withArgs('popHistory', sinon.match({stackIndex: 0}))
-          .returns(Promise.resolve({stackIndex: -123, title: 'title'}));
+        .withArgs('popHistory', sinon.match({stackIndex: 0}))
+        .returns(Promise.resolve({stackIndex: -123, title: 'title'}));
 
       return history.pop(0).then(state => {
         expect(state).to.deep.equal({stackIndex: -123, title: 'title'});
         expect(history.stackIndex_).to.equal(-123);
 
         expect(onStateUpdated).to.be.calledOnce;
-        expect(onStateUpdated)
-            .to.be.calledWithMatch({stackIndex: -123, title: 'title'});
+        expect(onStateUpdated).to.be.calledWithMatch({
+          stackIndex: -123,
+          title: 'title',
+        });
       });
     });
   });
 
   describe('`replaceHistory` API', () => {
     it('viewer does not support responses', () => {
-      viewer.sendMessageAwaitResponse
-          .withArgs('replaceHistory', {stackIndex: 123, title: 'title'});
+      viewer.sendMessageAwaitResponse.withArgs('replaceHistory', {
+        stackIndex: 123,
+        title: 'title',
+      });
 
       return history.replace({title: 'title'}).then(state => {
         expect(history.stackIndex_).to.equal(0);
@@ -674,52 +756,75 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
 
     it('viewer supports responses', () => {
       viewer.sendMessageAwaitResponse
-          .withArgs('replaceHistory', {stackIndex: 123, title: 'title'})
-          .returns(Promise.resolve({stackIndex: 123, title: 'different'}));
+        .withArgs('replaceHistory', {stackIndex: 123, title: 'title'})
+        .returns(Promise.resolve({stackIndex: 123, title: 'different'}));
 
       return history.replace({stackIndex: 123, title: 'title'}).then(state => {
         expect(history.stackIndex_).to.equal(123);
         expect(state).to.deep.equal({stackIndex: 123, title: 'different'});
 
         expect(onStateUpdated).to.be.calledOnce;
-        expect(onStateUpdated)
-            .to.be.calledWithMatch({stackIndex: 123, title: 'different'});
+        expect(onStateUpdated).to.be.calledWithMatch({
+          stackIndex: 123,
+          title: 'different',
+        });
       });
     });
 
     it('supports full URL replacement', () => {
       capabilityStub.withArgs('fullReplaceHistory').returns(true);
       viewer.sendMessageAwaitResponse
-          .withArgs('replaceHistory',
-              {stackIndex: 123, title: 'title', url: '/page', fragment: 'fr2'})
-          .returns(Promise.resolve(
-              {stackIndex: 123, title: 'different',
-                url: '/otherpage', fragment: 'fr2'}));
-
-      return history.replace(
-          {stackIndex: 123, title: 'title', url: '/page#fr1', fragment: 'fr2'})
-          .then(state => {
-            expect(state).to.deep.equal(
-                {fragment: 'fr2', stackIndex: 123, title: 'different',
-                  url: '/otherpage'});
-
-            expect(onStateUpdated).to.be.calledOnce;
-            expect(onStateUpdated).to.be.calledWithMatch(
-                {fragment: 'fr2', stackIndex: 123, title: 'different',
-                  url: '/otherpage'});
+        .withArgs('replaceHistory', {
+          stackIndex: 123,
+          title: 'title',
+          url: '/page',
+          fragment: 'fr2',
+        })
+        .returns(
+          Promise.resolve({
+            stackIndex: 123,
+            title: 'different',
+            url: '/otherpage',
+            fragment: 'fr2',
+          })
+        );
+
+      return history
+        .replace({
+          stackIndex: 123,
+          title: 'title',
+          url: '/page#fr1',
+          fragment: 'fr2',
+        })
+        .then(state => {
+          expect(state).to.deep.equal({
+            fragment: 'fr2',
+            stackIndex: 123,
+            title: 'different',
+            url: '/otherpage',
+          });
+
+          expect(onStateUpdated).to.be.calledOnce;
+          expect(onStateUpdated).to.be.calledWithMatch({
+            fragment: 'fr2',
+            stackIndex: 123,
+            title: 'different',
+            url: '/otherpage',
           });
+        });
     });
 
     it('does not support full URL replacement', () => {
       capabilityStub.withArgs('fullReplaceHistory').returns(false);
 
-      return history.replace(
-          {stackIndex: 123, title: 'title', url: '/page'}).then(state => {
-        expect(state).to.deep.equal({stackIndex: 0});
+      return history
+        .replace({stackIndex: 123, title: 'title', url: '/page'})
+        .then(state => {
+          expect(state).to.deep.equal({stackIndex: 0});
 
-        expect(viewer.sendMessageAwaitResponse).to.not.be.called;
-        expect(onStateUpdated).to.not.be.called;
-      });
+          expect(viewer.sendMessageAwaitResponse).to.not.be.called;
+          expect(onStateUpdated).to.not.be.called;
+        });
     });
   });
 
@@ -727,13 +832,15 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
     it('pushes and pops', () => {
       const title = 'title';
       viewer.sendMessageAwaitResponse
-          .withArgs('pushHistory', {stackIndex: 1, title})
-          .returns(Promise.resolve({stackIndex: 1, title}));
+        .withArgs('pushHistory', {stackIndex: 1, title})
+        .returns(Promise.resolve({stackIndex: 1, title}));
 
       return history.push({title}).then(state => {
         expect(viewer.sendMessageAwaitResponse).to.be.calledOnce;
-        expect(viewer.sendMessageAwaitResponse)
-            .to.be.calledWithMatch('pushHistory', {stackIndex: 1, title});
+        expect(viewer.sendMessageAwaitResponse).to.be.calledWithMatch(
+          'pushHistory',
+          {stackIndex: 1, title}
+        );
 
         expect(state).to.deep.equal({stackIndex: 1, title});
         expect(onStateUpdated).to.be.calledOnce;
@@ -743,8 +850,10 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
 
         expect(history.stackIndex_).to.equal(0);
         expect(onStateUpdated).to.be.calledTwice;
-        expect(onStateUpdated.lastCall)
-            .to.be.calledWithMatch({stackIndex: 0, title});
+        expect(onStateUpdated.lastCall).to.be.calledWithMatch({
+          stackIndex: 0,
+          title,
+        });
       });
     });
 
@@ -765,80 +874,89 @@ describes.sandboxed('HistoryBindingVirtual', {}, env => {
   });
 });
 
-describes.fakeWin('Local Hash Navigation', {
-  win: {
-    location: '#first',
+describes.fakeWin(
+  'Local Hash Navigation',
+  {
+    win: {
+      location: '#first',
+    },
   },
-}, env => {
-
-  let sandbox;
-  let clock;
-  let history;
-
-  beforeEach(() => {
-    installTimerService(env.win);
-    sandbox = env.sandbox;
-    clock = sandbox.useFakeTimers();
-  });
+  env => {
+    let sandbox;
+    let clock;
+    let history;
+
+    beforeEach(() => {
+      installTimerService(env.win);
+      sandbox = env.sandbox;
+      clock = sandbox.useFakeTimers();
+    });
 
-  afterEach(() => {
-    if (history) {
-      history.cleanup();
-    }
-  });
+    afterEach(() => {
+      if (history) {
+        history.cleanup();
+      }
+    });
 
-  // TODO(alabiaga, #18574): Fails because FakeDom freezes history state.
-  it.skip('should push a new state and replace it for ' +
-      'target on Natural', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingNatural_(env.win));
-    const startIndex = env.win.history.index;
-    return history.replaceStateForTarget('#hello').then(() => {
-      clock.tick(1);
-      expect(env.win.location.hash).to.equal('#hello');
-      expect(env.win.history.index).to.equal(startIndex + 1);
-      const historyPopPromise = history.pop(history.stackIndex_);
+    // TODO(alabiaga, #18574): Fails because FakeDom freezes history state.
+    it.skip('should push a new state and replace it for target on Natural', () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingNatural_(env.win)
+      );
+      const startIndex = env.win.history.index;
+      return history.replaceStateForTarget('#hello').then(() => {
+        clock.tick(1);
+        expect(env.win.location.hash).to.equal('#hello');
+        expect(env.win.history.index).to.equal(startIndex + 1);
+        const historyPopPromise = history.pop(history.stackIndex_);
 
-      clock.tick(1);
-      return historyPopPromise.then(() => {
-        expect(env.win.location.hash).to.equal('#first');
-        expect(env.win.history.index).to.equal(startIndex);
+        clock.tick(1);
+        return historyPopPromise.then(() => {
+          expect(env.win.location.hash).to.equal('#first');
+          expect(env.win.history.index).to.equal(startIndex);
+        });
       });
     });
-  });
-
-  it('should push a new state and replace it for target on Virtual', () => {
-    const viewer = {
-      onMessage: () => {
-        return () => {};
-      },
-      sendMessageAwaitResponse: () => Promise.resolve(),
-    };
-    const viewerMock = sandbox.mock(viewer);
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    const startIndex = history.stackIndex_;
 
-    viewerMock.expects('sendMessageAwaitResponse')
+    it('should push a new state and replace it for target on Virtual', () => {
+      const viewer = {
+        onMessage: () => {
+          return () => {};
+        },
+        sendMessageAwaitResponse: () => Promise.resolve(),
+      };
+      const viewerMock = sandbox.mock(viewer);
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      const startIndex = history.stackIndex_;
+
+      viewerMock
+        .expects('sendMessageAwaitResponse')
         .withExactArgs('pushHistory', {stackIndex: startIndex + 1})
-        .once().returns(Promise.resolve({stackIndex: startIndex + 1}));
-    viewerMock.expects('sendMessageAwaitResponse')
+        .once()
+        .returns(Promise.resolve({stackIndex: startIndex + 1}));
+      viewerMock
+        .expects('sendMessageAwaitResponse')
         .withArgs('popHistory', {stackIndex: startIndex + 1})
-        .once().returns(Promise.resolve({stackIndex: startIndex}));
-    return history.replaceStateForTarget('#hello').then(() => {
-      clock.tick(1);
-      expect(env.win.location.hash).to.equal('#hello');
-      expect(history.stackIndex_).to.equal(startIndex + 1);
-      return history.pop(history.stackIndex_).then(() => {
+        .once()
+        .returns(Promise.resolve({stackIndex: startIndex}));
+      return history.replaceStateForTarget('#hello').then(() => {
         clock.tick(1);
-        expect(env.win.location.hash).to.equal('#first');
-        expect(history.stackIndex_).to.equal(startIndex);
+        expect(env.win.location.hash).to.equal('#hello');
+        expect(history.stackIndex_).to.equal(startIndex + 1);
+        return history.pop(history.stackIndex_).then(() => {
+          clock.tick(1);
+          expect(env.win.location.hash).to.equal('#first');
+          expect(history.stackIndex_).to.equal(startIndex);
+        });
       });
     });
-  });
-});
+  }
+);
 describes.fakeWin('Get and update fragment', {}, env => {
-
   let sandbox;
   let history;
   let viewer;
@@ -866,8 +984,10 @@ describes.fakeWin('Get and update fragment', {}, env => {
 
   it('should get fragment on Natural', () => {
     env.win.location.href = 'http://www.example.com#foo';
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingNatural_(env.win));
+    history = new History(
+      new AmpDocSingle(env.win),
+      new HistoryBindingNatural_(env.win)
+    );
     return history.getFragment().then(fragment => {
       expect(fragment).to.be.equal('foo');
     });
@@ -877,94 +997,153 @@ describes.fakeWin('Get and update fragment', {}, env => {
     env.win.location.href = 'http://www.example.com#foo';
     const replaceStateSpy = sandbox.spy();
     env.win.history.replaceState = replaceStateSpy;
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingNatural_(env.win));
+    history = new History(
+      new AmpDocSingle(env.win),
+      new HistoryBindingNatural_(env.win)
+    );
     return history.updateFragment('bar').then(() => {
       expect(replaceStateSpy).to.be.calledTwice;
-      expect(replaceStateSpy.lastCall.args).to
-          .jsonEqual([{'AMP.History': 1, fragment: 'bar', data: {}}
-            , null, '#bar']);
+      expect(replaceStateSpy.lastCall.args).to.jsonEqual([
+        {'AMP.History': 1, fragment: 'bar', data: {}},
+        null,
+        '#bar',
+      ]);
     });
   });
 
-  it('should update fragment on Natural ' +
-      'if the url does not contain fragment previously', () => {
-    env.win.location.href = 'http://www.example.com';
-    const replaceStateSpy = sandbox.spy();
-    env.win.history.replaceState = replaceStateSpy;
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingNatural_(env.win));
-    return history.updateFragment('bar').then(() => {
-      expect(replaceStateSpy).to.be.calledTwice;
-      expect(replaceStateSpy.lastCall.args).to
-          .jsonEqual([{'AMP.History': 1, fragment: 'bar', data: {}}
-            , null, '#bar']);
-    });
-  });
-
-  it('should get fragment from the viewer on Virtual ' +
-      'if the viewer has capability of getting fragment', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    viewerMock.expects('hasCapability').withExactArgs('fragment').once()
+  it(
+    'should update fragment on Natural ' +
+      'if the url does not contain fragment previously',
+    () => {
+      env.win.location.href = 'http://www.example.com';
+      const replaceStateSpy = sandbox.spy();
+      env.win.history.replaceState = replaceStateSpy;
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingNatural_(env.win)
+      );
+      return history.updateFragment('bar').then(() => {
+        expect(replaceStateSpy).to.be.calledTwice;
+        expect(replaceStateSpy.lastCall.args).to.jsonEqual([
+          {'AMP.History': 1, fragment: 'bar', data: {}},
+          null,
+          '#bar',
+        ]);
+      });
+    }
+  );
+
+  it(
+    'should get fragment from the viewer on Virtual ' +
+      'if the viewer has capability of getting fragment',
+    () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      viewerMock
+        .expects('hasCapability')
+        .withExactArgs('fragment')
+        .once()
         .returns(true);
-    viewerMock.expects('sendMessageAwaitResponse').withExactArgs('getFragment',
-        undefined, true).once().returns(Promise.resolve('from-viewer'));
-    return history.getFragment().then(fragment => {
-      expect(fragment).to.equal('from-viewer');
-    });
-  });
-
-  it('should NOT get fragment from the viewer on Virtual ' +
-      'if the viewer does NOT have capability of getting fragment', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    viewerMock.expects('hasCapability').withExactArgs('fragment').once()
+      viewerMock
+        .expects('sendMessageAwaitResponse')
+        .withExactArgs('getFragment', undefined, true)
+        .once()
+        .returns(Promise.resolve('from-viewer'));
+      return history.getFragment().then(fragment => {
+        expect(fragment).to.equal('from-viewer');
+      });
+    }
+  );
+
+  it(
+    'should NOT get fragment from the viewer on Virtual ' +
+      'if the viewer does NOT have capability of getting fragment',
+    () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      viewerMock
+        .expects('hasCapability')
+        .withExactArgs('fragment')
+        .once()
         .returns(false);
-    return history.getFragment().then(fragment => {
-      expect(fragment).to.equal('');
-    });
-  });
-
-  it('should NOT get fragment from the viewer on Virtual ' +
-      'if the viewer does NOT return a fragment', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    viewerMock.expects('hasCapability').withExactArgs('fragment').once()
+      return history.getFragment().then(fragment => {
+        expect(fragment).to.equal('');
+      });
+    }
+  );
+
+  it(
+    'should NOT get fragment from the viewer on Virtual ' +
+      'if the viewer does NOT return a fragment',
+    () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      viewerMock
+        .expects('hasCapability')
+        .withExactArgs('fragment')
+        .once()
         .returns(true);
-    viewerMock.expects('sendMessageAwaitResponse').withExactArgs('getFragment',
-        undefined, true).once().returns(Promise.resolve());
-    return history.getFragment().then(fragment => {
-      expect(fragment).to.equal('');
-    });
-  });
-
-  it('should update fragment of the viewer on Virtual ' +
-      'if the viewer has capability of updating fragment', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    viewerMock.expects('hasCapability').withExactArgs('fragment').once()
+      viewerMock
+        .expects('sendMessageAwaitResponse')
+        .withExactArgs('getFragment', undefined, true)
+        .once()
+        .returns(Promise.resolve());
+      return history.getFragment().then(fragment => {
+        expect(fragment).to.equal('');
+      });
+    }
+  );
+
+  it(
+    'should update fragment of the viewer on Virtual ' +
+      'if the viewer has capability of updating fragment',
+    () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      viewerMock
+        .expects('hasCapability')
+        .withExactArgs('fragment')
+        .once()
         .returns(true);
-    let called = false;
-    viewer.sendMessageAwaitResponse = function(action, data) {
-      expect(action).to.equal('replaceHistory');
-      expect(data.fragment).to.equal('fragment');
-      called = true;
-      return Promise.resolve();
-    };
-    return history.updateFragment('fragment').then(() => {
-      expect(called).to.be.ok;
-    });
-  });
-
-  it('should NOT update fragment of the viewer on Virtual ' +
-      'if the viewer does NOT have capability of updating fragment', () => {
-    history = new History(new AmpDocSingle(env.win),
-        new HistoryBindingVirtual_(env.win, viewer));
-    viewerMock.expects('hasCapability').withExactArgs('fragment').once()
+      let called = false;
+      viewer.sendMessageAwaitResponse = function(action, data) {
+        expect(action).to.equal('replaceHistory');
+        expect(data.fragment).to.equal('fragment');
+        called = true;
+        return Promise.resolve();
+      };
+      return history.updateFragment('fragment').then(() => {
+        expect(called).to.be.ok;
+      });
+    }
+  );
+
+  it(
+    'should NOT update fragment of the viewer on Virtual ' +
+      'if the viewer does NOT have capability of updating fragment',
+    () => {
+      history = new History(
+        new AmpDocSingle(env.win),
+        new HistoryBindingVirtual_(env.win, viewer)
+      );
+      viewerMock
+        .expects('hasCapability')
+        .withExactArgs('fragment')
+        .once()
         .returns(false);
-    viewerMock.expects('sendMessageAwaitResponse').withExactArgs(
-        'replaceHistory', {fragment: 'fragment'}, true).never();
-    return history.updateFragment('fragment').then(() => {});
-  });
+      viewerMock
+        .expects('sendMessageAwaitResponse')
+        .withExactArgs('replaceHistory', {fragment: 'fragment'}, true)
+        .never();
+      return history.updateFragment('fragment').then(() => {});
+    }
+  );
 });
diff --git a/test/unit/test-ie-media-bug.js b/test/unit/test-ie-media-bug.js
index a0de5bcc2c3e..5d1b42023b57 100644
--- a/test/unit/test-ie-media-bug.js
+++ b/test/unit/test-ie-media-bug.js
@@ -17,7 +17,6 @@
 import {checkAndFix} from '../../src/service/ie-media-bug';
 import {dev} from '../../src/log';
 
-
 describe('ie-media-bug', () => {
   let sandbox;
   let clock;
@@ -61,10 +60,11 @@ describe('ie-media-bug', () => {
 
   it('should bypass polling when matchMedia is not broken', () => {
     platformMock.expects('isIe').returns(true);
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .returns({matches: true})
-        .once();
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .returns({matches: true})
+      .once();
     windowMock.expects('setInterval').never();
     const promise = checkAndFix(windowApi, platform);
     expect(promise).to.be.null;
@@ -75,54 +75,61 @@ describe('ie-media-bug', () => {
     platformMock.expects('isIe').returns(true);
 
     // Scheduling pass.
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .returns({matches: false})
-        .once();
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .returns({matches: false})
+      .once();
     const intervalId = 111;
     let intervalCallback;
-    windowMock.expects('setInterval')
-        .withExactArgs(
-            sinon.match(arg => {
-              intervalCallback = arg;
-              return true;
-            }),
-            10
-        )
-        .returns(intervalId)
-        .once();
+    windowMock
+      .expects('setInterval')
+      .withExactArgs(
+        sinon.match(arg => {
+          intervalCallback = arg;
+          return true;
+        }),
+        10
+      )
+      .returns(intervalId)
+      .once();
 
     const promise = checkAndFix(windowApi, platform);
     expect(promise).to.be.not.null;
     expect(devErrorStub).to.have.not.been.called;
     expect(intervalCallback).to.exist;
     windowMock.verify();
-    windowMock./*OK*/restore();
+    windowMock./*OK*/ restore();
 
     // Second pass.
     clock.tick(10);
     windowMock = sandbox.mock(windowApi);
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .returns({matches: false})
-        .once();
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .returns({matches: false})
+      .once();
     windowMock.expects('clearInterval').never();
     intervalCallback();
     expect(devErrorStub).to.have.not.been.called;
     windowMock.verify();
-    windowMock./*OK*/restore();
+    windowMock./*OK*/ restore();
 
     // Third pass - succeed.
     clock.tick(10);
     windowMock = sandbox.mock(windowApi);
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .returns({matches: true})
-        .once();
-    windowMock.expects('clearInterval').withExactArgs(intervalId).once();
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .returns({matches: true})
+      .once();
+    windowMock
+      .expects('clearInterval')
+      .withExactArgs(intervalId)
+      .once();
     intervalCallback();
     windowMock.verify();
-    windowMock./*OK*/restore();
+    windowMock./*OK*/ restore();
 
     return promise.then(() => {
       expect(devErrorStub).to.have.not.been.called;
@@ -133,23 +140,28 @@ describe('ie-media-bug', () => {
     platformMock.expects('isIe').returns(true);
 
     // Scheduling pass.
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .returns({matches: false})
-        .atLeast(2);
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .returns({matches: false})
+      .atLeast(2);
     const intervalId = 111;
     let intervalCallback;
-    windowMock.expects('setInterval')
-        .withExactArgs(
-            sinon.match(arg => {
-              intervalCallback = arg;
-              return true;
-            }),
-            10
-        )
-        .returns(intervalId)
-        .once();
-    windowMock.expects('clearInterval').withExactArgs(intervalId).once();
+    windowMock
+      .expects('setInterval')
+      .withExactArgs(
+        sinon.match(arg => {
+          intervalCallback = arg;
+          return true;
+        }),
+        10
+      )
+      .returns(intervalId)
+      .once();
+    windowMock
+      .expects('clearInterval')
+      .withExactArgs(intervalId)
+      .once();
 
     const promise = checkAndFix(windowApi, platform);
     expect(promise).to.be.not.null;
@@ -174,10 +186,11 @@ describe('ie-media-bug', () => {
   it('should tolerate matchMedia exceptions', () => {
     platformMock.expects('isIe').returns(true);
 
-    windowMock.expects('matchMedia')
-        .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
-        .throws(new Error('intentional'))
-        .once();
+    windowMock
+      .expects('matchMedia')
+      .withExactArgs('(min-width: 319px) AND (max-width: 321px)')
+      .throws(new Error('intentional'))
+      .once();
     windowMock.expects('setInterval').never();
 
     const promise = checkAndFix(windowApi, platform);
diff --git a/test/unit/test-iframe-helper.js b/test/unit/test-iframe-helper.js
index 51c4162e2cdb..92c1aa74fafc 100644
--- a/test/unit/test-iframe-helper.js
+++ b/test/unit/test-iframe-helper.js
@@ -18,10 +18,14 @@ import {createIframePromise} from '../../testing/iframe';
 import {generateSentinel} from '../../src/3p-frame.js';
 
 describe('iframe-helper', function() {
-  const iframeSrc = 'http://iframe.localhost:' + location.port +
-      '/test/fixtures/served/iframe-intersection.html';
-  const nestedIframeSrc = 'http://iframe.localhost:' + location.port +
-      '/test/fixtures/served/iframe-intersection-outer.html';
+  const iframeSrc =
+    'http://iframe.localhost:' +
+    location.port +
+    '/test/fixtures/served/iframe-intersection.html';
+  const nestedIframeSrc =
+    'http://iframe.localhost:' +
+    location.port +
+    '/test/fixtures/served/iframe-intersection-outer.html';
 
   let testIframe;
   let sandbox;
@@ -48,29 +52,36 @@ describe('iframe-helper', function() {
   it('should assert src in iframe', () => {
     const iframe = container.doc.createElement('iframe');
     iframe.srcdoc = '<html>';
-    allowConsoleError(() => { expect(() => {
-      IframeHelper.listenFor(iframe, 'test', () => {});
-    }).to.throw('only iframes with src supported'); });
+    allowConsoleError(() => {
+      expect(() => {
+        IframeHelper.listenFor(iframe, 'test', () => {});
+      }).to.throw('only iframes with src supported');
+    });
   });
 
   it('should assert iframe is detached', () => {
     const iframe = container.doc.createElement('iframe');
     iframe.src = iframeSrc;
     insert(iframe);
-    allowConsoleError(() => { expect(() => {
-      IframeHelper.listenFor(iframe, 'test', () => {});
-    }).to.throw('cannot register events on an attached iframe'); });
+    allowConsoleError(() => {
+      expect(() => {
+        IframeHelper.listenFor(iframe, 'test', () => {});
+      }).to.throw('cannot register events on an attached iframe');
+    });
   });
 
   it('should listen to iframe messages from non-3P frame', () => {
     let unlisten;
     let calls = 0;
     return new Promise(resolve => {
-      unlisten = IframeHelper.listenFor(testIframe, 'send-intersections',
-          () => {
-            calls++;
-            resolve();
-          });
+      unlisten = IframeHelper.listenFor(
+        testIframe,
+        'send-intersections',
+        () => {
+          calls++;
+          resolve();
+        }
+      );
       insert(testIframe);
     }).then(() => {
       const total = calls;
@@ -90,11 +101,15 @@ describe('iframe-helper', function() {
       const sentinel = generateSentinel(testIframe.ownerDocument.defaultView);
       testIframe.src = iframeSrc + '#amp-3p-sentinel=' + sentinel;
       testIframe.setAttribute('data-amp-3p-sentinel', sentinel);
-      unlisten = IframeHelper.listenFor(testIframe, 'send-intersections',
-          () => {
-            calls++;
-            resolve();
-          }, true /* opt_is3P */);
+      unlisten = IframeHelper.listenFor(
+        testIframe,
+        'send-intersections',
+        () => {
+          calls++;
+          resolve();
+        },
+        true /* opt_is3P */
+      );
       insert(testIframe);
     }).then(() => {
       const total = calls;
@@ -116,11 +131,16 @@ describe('iframe-helper', function() {
       // usual iframe-intersection.html within a nested iframe.
       testIframe.src = nestedIframeSrc + '#amp-3p-sentinel=' + sentinel;
       testIframe.setAttribute('data-amp-3p-sentinel', sentinel);
-      unlisten = IframeHelper.listenFor(testIframe, 'send-intersections',
-          () => {
-            calls++;
-            resolve();
-          }, true /* opt_is3P */, true /* opt_includingNestedWindows */);
+      unlisten = IframeHelper.listenFor(
+        testIframe,
+        'send-intersections',
+        () => {
+          calls++;
+          resolve();
+        },
+        true /* opt_is3P */,
+        true /* opt_includingNestedWindows */
+      );
       insert(testIframe);
     }).then(() => {
       const total = calls;
@@ -137,13 +157,14 @@ describe('iframe-helper', function() {
   it.skip('should un-listen and resolve promise after first hit', () => {
     let calls = 0;
     return new Promise(resolve => {
-      IframeHelper.listenForOncePromise(testIframe,
-          ['no-msg', 'send-intersections'])
-          .then(obj => {
-            expect(obj.message).to.equal('send-intersections');
-            calls++;
-            resolve();
-          });
+      IframeHelper.listenForOncePromise(testIframe, [
+        'no-msg',
+        'send-intersections',
+      ]).then(obj => {
+        expect(obj.message).to.equal('send-intersections');
+        calls++;
+        resolve();
+      });
       insert(testIframe);
     }).then(() => {
       const total = calls;
@@ -190,14 +211,19 @@ describe('iframe-helper', function() {
 
   it('should set sentinel on postMessage data', () => {
     insert(testIframe);
-    const postMessageSpy = sinon/*OK*/.spy(testIframe.contentWindow,
-        'postMessage');
+    const postMessageSpy = sinon /*OK*/
+      .spy(testIframe.contentWindow, 'postMessage');
     IframeHelper.postMessage(
-        testIframe, 'testMessage', {}, 'http://google.com');
+      testIframe,
+      'testMessage',
+      {},
+      'http://google.com'
+    );
     expect(postMessageSpy.getCall(0).args[0].sentinel).to.equal('amp');
     expect(postMessageSpy.getCall(0).args[0].type).to.equal('testMessage');
     // Very important to do this outside of the sandbox, or else hell
     // breaks loose.
-    postMessageSpy/*OK*/.restore();
+    postMessageSpy /*OK*/
+      .restore();
   });
 });
diff --git a/test/unit/test-iframe-stub.js b/test/unit/test-iframe-stub.js
index 4900da35f82f..e8db7f30527c 100644
--- a/test/unit/test-iframe-stub.js
+++ b/test/unit/test-iframe-stub.js
@@ -20,7 +20,6 @@ import {
 } from '../../testing/iframe';
 
 describe('test-iframe-createIframeWithMessageStub', () => {
-
   const data1 = {
     foo: 'bar',
     test: true,
@@ -44,50 +43,60 @@ describe('test-iframe-createIframeWithMessageStub', () => {
   it('should get message from fragment and post back to parent window', () => {
     iframe.postMessageToParent(data1);
     return expectPostMessage(iframe.contentWindow, window, data1)
-        .then(receivedMessage => {
-          expect(receivedMessage).to.jsonEqual(data1);
-        })
-        .then(() => {
-          iframe.postMessageToParent(data2);
-          return expectPostMessage(iframe.contentWindow, window, data2);
-        })
-        .then(receivedMessage => {
-          expect(receivedMessage).to.jsonEqual(data2);
-        });
+      .then(receivedMessage => {
+        expect(receivedMessage).to.jsonEqual(data1);
+      })
+      .then(() => {
+        iframe.postMessageToParent(data2);
+        return expectPostMessage(iframe.contentWindow, window, data2);
+      })
+      .then(receivedMessage => {
+        expect(receivedMessage).to.jsonEqual(data2);
+      });
   });
 
   it('should echo back message to parent window', () => {
     iframe.contentWindow.postMessage(data1, '*');
-    return iframe.expectMessageFromParent('test').then(() => {
-      iframe.contentWindow.postMessage(data2, '*');
-      return iframe.expectMessageFromParent((data, msg) => {
-        expect(data).to.jsonEqual(data2);
-        expect(msg).to.jsonEqual(data2);
-        return true;
-      });
-    }).then(() => {
-      iframe.contentWindow.postMessage('test-' + JSON.stringify(data2), '*');
-      return iframe.expectMessageFromParent((data, msg) => {
-        expect(data).to.equal(null);
-        expect(msg).to.equal('test-' + JSON.stringify(data2));
-        return true;
-      });
-    }).then(() => {
-      iframe.contentWindow.postMessage('amp-' + JSON.stringify(data2), '*');
-      return iframe.expectMessageFromParent((data, msg) => {
-        expect(data).to.jsonEqual(data2);
-        expect(msg).to.equal('amp-' + JSON.stringify(data2));
-        return true;
-      });
-    }).then(() => {
-      iframe.contentWindow.postMessage(data2, '*');
-      return iframe.expectMessageFromParent(() => {
-        throw new Error('test');
-      }).then(() => {
-        throw new Error('should not get here');
-      }, () => {
-        expect(true).to.equal(true);
+    return iframe
+      .expectMessageFromParent('test')
+      .then(() => {
+        iframe.contentWindow.postMessage(data2, '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.jsonEqual(data2);
+          expect(msg).to.jsonEqual(data2);
+          return true;
+        });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage('test-' + JSON.stringify(data2), '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.equal(null);
+          expect(msg).to.equal('test-' + JSON.stringify(data2));
+          return true;
+        });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage('amp-' + JSON.stringify(data2), '*');
+        return iframe.expectMessageFromParent((data, msg) => {
+          expect(data).to.jsonEqual(data2);
+          expect(msg).to.equal('amp-' + JSON.stringify(data2));
+          return true;
+        });
+      })
+      .then(() => {
+        iframe.contentWindow.postMessage(data2, '*');
+        return iframe
+          .expectMessageFromParent(() => {
+            throw new Error('test');
+          })
+          .then(
+            () => {
+              throw new Error('should not get here');
+            },
+            () => {
+              expect(true).to.equal(true);
+            }
+          );
       });
-    });
   });
 });
diff --git a/test/unit/test-impression.js b/test/unit/test-impression.js
index 460ad1a47664..0e220d550fac 100644
--- a/test/unit/test-impression.js
+++ b/test/unit/test-impression.js
@@ -28,7 +28,6 @@ import {toggleExperiment} from '../../src/experiments';
 import {user} from '../../src/log';
 
 describe('impression', () => {
-
   let sandbox;
   let viewer;
   let xhr;
@@ -45,11 +44,13 @@ describe('impression', () => {
     expect(xhr.fetchJson).to.exist;
     const stub = sandbox.stub(xhr, 'fetchJson');
     warnStub = sandbox.stub(user(), 'warn');
-    stub.returns(Promise.resolve({
-      json() {
-        return Promise.resolve(null);
-      },
-    }));
+    stub.returns(
+      Promise.resolve({
+        json() {
+          return Promise.resolve(null);
+        },
+      })
+    );
     sandbox.stub(viewer, 'whenFirstVisible').returns(Promise.resolve());
     isTrustedViewer = false;
     sandbox.stub(viewer, 'isTrustedViewer').callsFake(() => {
@@ -101,13 +102,15 @@ describe('impression', () => {
         return Promise.resolve({'replaceUrl': undefined});
       }
     });
-    xhr.fetchJson.returns(Promise.resolve({
-      json() {
-        return Promise.resolve({
-          'location': '',
-        });
-      },
-    }));
+    xhr.fetchJson.returns(
+      Promise.resolve({
+        json() {
+          return Promise.resolve({
+            'location': '',
+          });
+        },
+      })
+    );
     maybeTrackImpression(window);
     return getTrackImpressionPromise();
   });
@@ -129,7 +132,7 @@ describe('impression', () => {
       return getTrackImpressionPromise().should.be.fulfilled;
     });
 
-    it('should invoke click URL with experiment on', function* () {
+    it('should invoke click URL with experiment on', function*() {
       sandbox.spy(viewer, 'sendMessageAwaitResponse');
       toggleExperiment(window, 'alp', true);
       isTrustedViewer = false;
@@ -147,7 +150,7 @@ describe('impression', () => {
       });
     });
 
-    it('should invoke click URL in trusted viewer', function* () {
+    it('should invoke click URL in trusted viewer', function*() {
       toggleExperiment(window, 'alp', false);
       isTrustedViewer = true;
       viewer.getParam.withArgs('click').returns('https://www.example.com');
@@ -164,7 +167,7 @@ describe('impression', () => {
       });
     });
 
-    it('should invoke click URL for trusted referrer', function* () {
+    it('should invoke click URL for trusted referrer', function*() {
       toggleExperiment(window, 'alp', false);
       isTrustedViewer = false;
       referrer = 'https://t.co/docref';
@@ -185,9 +188,11 @@ describe('impression', () => {
     it('should do nothing if response is not received', () => {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
-      xhr.fetchJson.returns(new Promise(() => {
-        // never resolves
-      }));
+      xhr.fetchJson.returns(
+        new Promise(() => {
+          // never resolves
+        })
+      );
       const {href} = window.location;
       const clock = sandbox.useFakeTimers();
       maybeTrackImpression(window);
@@ -197,7 +202,7 @@ describe('impression', () => {
       });
     });
 
-    it('should do nothing if get empty response', function* () {
+    it('should do nothing if get empty response', function*() {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
       const prevHref = window.location.href;
@@ -206,25 +211,29 @@ describe('impression', () => {
       expect(window.location.href).to.equal(prevHref);
     });
 
-    it('should resolve if get no content response', function* () {
+    it('should resolve if get no content response', function*() {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
-      xhr.fetchJson.returns(Promise.resolve({
-        // No-content response
-        status: 204,
-      }));
+      xhr.fetchJson.returns(
+        Promise.resolve({
+          // No-content response
+          status: 204,
+        })
+      );
       maybeTrackImpression(window);
       return getTrackImpressionPromise().then(() => {
         expect(warnStub).to.not.be.called;
       });
     });
 
-    it('should still resolve on request error', function* () {
+    it('should still resolve on request error', function*() {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
-      xhr.fetchJson.returns(Promise.resolve({
-        status: 404,
-      }));
+      xhr.fetchJson.returns(
+        Promise.resolve({
+          status: 404,
+        })
+      );
       maybeTrackImpression(window);
       return getTrackImpressionPromise().then(() => {
         expect(warnStub).to.be.calledOnce;
@@ -235,13 +244,15 @@ describe('impression', () => {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
       viewer.hasCapability.withArgs('replaceUrl').returns(false);
-      xhr.fetchJson.returns(Promise.resolve({
-        json() {
-          return Promise.resolve({
-            'location': '',
-          });
-        },
-      }));
+      xhr.fetchJson.returns(
+        Promise.resolve({
+          json() {
+            return Promise.resolve({
+              'location': '',
+            });
+          },
+        })
+      );
       maybeTrackImpression(window);
       return getTrackImpressionPromise();
     });
@@ -250,27 +261,30 @@ describe('impression', () => {
       toggleExperiment(window, 'alp', true);
       viewer.getParam.withArgs('click').returns('https://www.example.com');
 
-      xhr.fetchJson.returns(Promise.resolve({
-        json() {
-          return Promise.resolve({
-            'location': 'test_location?gclid=123456&foo=bar&example=123',
-          });
-        },
-      }));
+      xhr.fetchJson.returns(
+        Promise.resolve({
+          json() {
+            return Promise.resolve({
+              'location': 'test_location?gclid=123456&foo=bar&example=123',
+            });
+          },
+        })
+      );
       const prevHref = window.location.href;
       window.history.replaceState(null, '', prevHref + '?bar=foo&test=4321');
       maybeTrackImpression(window);
       return getTrackImpressionPromise().then(() => {
         expect(window.location.href).to.equal(
-            'http://localhost:9876/context.html' +
-            '?bar=foo&test=4321&gclid=123456&foo=bar&example=123');
+          'http://localhost:9876/context.html' +
+            '?bar=foo&test=4321&gclid=123456&foo=bar&example=123'
+        );
         window.history.replaceState(null, '', prevHref);
       });
     });
   });
 
   describe('replaceUrl', () => {
-    it('do nothing if no init replaceUrl param', function * () {
+    it('do nothing if no init replaceUrl param', function*() {
       toggleExperiment(window, 'alp', true);
       sandbox.spy(viewer, 'replaceUrl');
       viewer.hasCapability.withArgs('replaceUrl').returns(true);
@@ -283,19 +297,20 @@ describe('impression', () => {
     it('should use init replaceUrl parm if viewer has no capability', () => {
       toggleExperiment(window, 'alp', true);
       viewer.hasCapability.withArgs('replaceUrl').returns(false);
-      viewer.getParam.withArgs('replaceUrl').returns(
-          'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1&init');
+      viewer.getParam
+        .withArgs('replaceUrl')
+        .returns('http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1&init');
       const prevHref = window.location.href;
       maybeTrackImpression(window);
       return getTrackImpressionPromise().then(() => {
         expect(window.location.href).to.equal(
-            'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1&init');
+          'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1&init'
+        );
         window.history.replaceState(null, '', prevHref);
       });
     });
 
-
-    it('should request replaceUrl if viewer signals', function* () {
+    it('should request replaceUrl if viewer signals', function*() {
       toggleExperiment(window, 'alp', true);
       sandbox.spy(viewer, 'sendMessageAwaitResponse');
       viewer.getParam.withArgs('replaceUrl').returns('http://www.example.com');
@@ -327,17 +342,21 @@ describe('impression', () => {
         if (message == 'getReplaceUrl') {
           return Promise.resolve({
             'replaceUrl':
-                'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1',
+              'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1',
           });
         }
       });
       const prevHref = window.location.href;
       window.history.replaceState(
-          null, '', prevHref + '?bar=foo&test=4321#hash');
+        null,
+        '',
+        prevHref + '?bar=foo&test=4321#hash'
+      );
       maybeTrackImpression(window);
       return getTrackImpressionPromise().then(() => {
         expect(window.location.href).to.equal(
-            'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1#hash');
+          'http://localhost:9876/v/s/f.com/?gclid=1234&amp_js_v=1#hash'
+        );
         window.history.replaceState(null, '', prevHref);
       });
     });
@@ -347,8 +366,12 @@ describe('impression', () => {
     const div = window.document.createElement('amp-analytics');
     div.setAttribute('type', 'fake');
     const ampdocApi = {
-      whenReady: () => {return Promise.resolve();},
-      getBody: () => {return window.document.body;},
+      whenReady: () => {
+        return Promise.resolve();
+      },
+      getBody: () => {
+        return window.document.body;
+      },
     };
     window.document.body.appendChild(div);
     return shouldAppendExtraParams(ampdocApi).then(res => {
@@ -371,15 +394,15 @@ describe('impression', () => {
       windowApi.location = {};
     });
 
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     it('should append gclid and gclsrc from window href', () => {
       const target = window.document.createElement('a');
       target.href = 'https://www.test.com?a=1&b=2&c=QUERY_PARAM(c)';
       windowApi.location.href = 'www.current.com?gclid=123&gclsrc=abc';
       expect(getExtraParamsUrl(windowApi, target)).to.equal(
-          'gclid=QUERY_PARAM(gclid)&gclsrc=QUERY_PARAM(gclsrc)');
+        'gclid=QUERY_PARAM(gclid)&gclsrc=QUERY_PARAM(gclsrc)'
+      );
     });
 
     it('should respect window location href', () => {
@@ -389,10 +412,12 @@ describe('impression', () => {
       expect(getExtraParamsUrl(windowApi, target)).to.equal('');
       windowApi.location.href = 'www.current.com?gclid=123';
       expect(getExtraParamsUrl(windowApi, target)).to.equal(
-          'gclid=QUERY_PARAM(gclid)');
+        'gclid=QUERY_PARAM(gclid)'
+      );
       windowApi.location.href = 'www.current.com?gclid=123&gclsrc=abc';
       expect(getExtraParamsUrl(windowApi, target)).to.equal(
-          'gclid=QUERY_PARAM(gclid)&gclsrc=QUERY_PARAM(gclsrc)');
+        'gclid=QUERY_PARAM(gclid)&gclsrc=QUERY_PARAM(gclsrc)'
+      );
     });
 
     it('should respect param in url', () => {
@@ -400,17 +425,18 @@ describe('impression', () => {
       target.href = 'https://www.test.com?a=1&b=2&gclid=123';
       windowApi.location.href = 'www.current.com?gclid=123&gclsrc=abc';
       expect(getExtraParamsUrl(windowApi, target)).to.equal(
-          'gclsrc=QUERY_PARAM(gclsrc)');
+        'gclsrc=QUERY_PARAM(gclsrc)'
+      );
     });
 
-
     it('should respect param in data-amp-addparams', () => {
       const target = window.document.createElement('a');
       target.href = 'https://www.test.com?a=1&b=2&gclid=123';
       target.setAttribute('data-amp-addparams', 'gclid=QUERY_PARAM(gclid)');
       windowApi.location.href = 'www.current.com?gclid=123&gclsrc=abc';
       expect(getExtraParamsUrl(windowApi, target)).to.equal(
-          'gclsrc=QUERY_PARAM(gclsrc)');
+        'gclsrc=QUERY_PARAM(gclsrc)'
+      );
     });
   });
 
@@ -440,5 +466,4 @@ describe('impression', () => {
       test('https://t.cn/asdf', false);
     });
   });
-
 });
diff --git a/test/unit/test-input.js b/test/unit/test-input.js
index c0b0efa831b3..6ac6e7c1bf55 100644
--- a/test/unit/test-input.js
+++ b/test/unit/test-input.js
@@ -17,9 +17,7 @@
 import {Input} from '../../src/input';
 import {installTimerService} from '../../src/service/timer-impl.js';
 
-
 describe('Input', () => {
-
   let sandbox;
   let clock;
   let input;
@@ -145,8 +143,9 @@ describe('Input', () => {
     });
     expect(mouseDetected).to.equal(undefined);
 
-    const p = input.onMouseMove_(
-        {sourceCapabilities: {firesTouchEvents: true}});
+    const p = input.onMouseMove_({
+      sourceCapabilities: {firesTouchEvents: true},
+    });
     expect(p).to.be.undefined;
 
     expect(input.mouseConfirmAttemptCount_).to.equal(1);
diff --git a/test/unit/test-integration.js b/test/unit/test-integration.js
index a29ea55b209f..0cc15e2da7d4 100644
--- a/test/unit/test-integration.js
+++ b/test/unit/test-integration.js
@@ -35,82 +35,99 @@ describe('3p integration.js', () => {
 
   it('should register integrations', () => {
     window.ampTestRuntimeConfig.adTypes.forEach(adType => {
-      expect(registrations, `Missing registration for [${adType}]`)
-          .to.contain.key(adType);
+      expect(
+        registrations,
+        `Missing registration for [${adType}]`
+      ).to.contain.key(adType);
     });
   });
 
   it('should not throw validateParentOrigin without ancestorOrigins', () => {
     let parent = {};
-    validateParentOrigin({
-      location: {},
-    }, parent);
+    validateParentOrigin(
+      {
+        location: {},
+      },
+      parent
+    );
 
     parent = {};
-    validateParentOrigin({
-      location: {
-        ancestorOrigins: [],
+    validateParentOrigin(
+      {
+        location: {
+          ancestorOrigins: [],
+        },
       },
-    }, parent);
+      parent
+    );
   });
 
   it('should validateParentOrigin with correct ancestorOrigins', () => {
     const parent = {
       origin: 'abc',
     };
-    validateParentOrigin({
-      location: {
-        ancestorOrigins: ['abc', 'xyz'],
+    validateParentOrigin(
+      {
+        location: {
+          ancestorOrigins: ['abc', 'xyz'],
+        },
       },
-    }, parent);
+      parent
+    );
   });
 
-  it('should throw in validateParentOrigin with incorrect ancestorOrigins',
-      () => {
-        const parent = {
-          origin: 'abc',
-        };
+  it('should throw in validateParentOrigin with incorrect ancestorOrigins', () => {
+    const parent = {
+      origin: 'abc',
+    };
 
-        allowConsoleError(() => {
-          expect(() => {
-            validateParentOrigin({
-              location: {
-                ancestorOrigins: ['xyz'],
-              },
-            }, parent);
-          }).to.throw(/Parent origin mismatch/);
-        });
-      });
+    allowConsoleError(() => {
+      expect(() => {
+        validateParentOrigin(
+          {
+            location: {
+              ancestorOrigins: ['xyz'],
+            },
+          },
+          parent
+        );
+      }).to.throw(/Parent origin mismatch/);
+    });
+  });
 
   it('should parse JSON from fragment unencoded (most browsers)', () => {
-    const unencoded = '#{"tweetid":"638793490521001985","width":390,' +
-        '"height":50,' +
-        '"type":"twitter","_context":{"referrer":"http://localhost:8000/' +
-        'examples/","canonicalUrl":"http://localhost:8000/' +
-        'examples/amps.html","location":{"href":"http://' +
-        'localhost:8000/examples/twitter.amp.html"},' +
-        '"mode":{"localDev":true,"development":false,"minified":false}}}';
+    const unencoded =
+      '#{"tweetid":"638793490521001985","width":390,' +
+      '"height":50,' +
+      '"type":"twitter","_context":{"referrer":"http://localhost:8000/' +
+      'examples/","canonicalUrl":"http://localhost:8000/' +
+      'examples/amps.html","location":{"href":"http://' +
+      'localhost:8000/examples/twitter.amp.html"},' +
+      '"mode":{"localDev":true,"development":false,"minified":false}}}';
     const data = parseFragment(unencoded);
     expect(data).to.be.an('object');
     expect(data.tweetid).to.equal('638793490521001985');
     expect(data._context.location.href).to.equal(
-        'http://localhost:8000/examples/twitter.amp.html');
+      'http://localhost:8000/examples/twitter.amp.html'
+    );
   });
 
   it('should parse JSON from fragment encoded (Firefox)', () => {
-    const encoded = '#{%22tweetid%22:%22638793490521001985%22,%22width' +
-        '%22:390,%22height%22:50,%22initialWindowWidth%22:1290,%22initial' +
-        'WindowHeight%22:165,%22type%22:%22twitter%22,%22_context%22:{%22' +
-        'referrer%22:%22http://localhost:8000/examples/%22,%22canoni' +
-        'calUrl%22:%22http://localhost:8000/examples/amps.html%22,%22' +
-        'location%22:{%22href%22:%22http://localhost:8000/examples/t' +
-        'witter.amp.html%22},%22mode%22:{%22localDev%22:true,%22develop' +
-        'ment%22:false,%22minified%22:false}}}';
+    const encoded =
+      '#{%22tweetid%22:%22638793490521001985%22,%22width' +
+      '%22:390,%22height%22:50,%22initialWindowWidth%22:1290,%22initial' +
+      'WindowHeight%22:165,%22type%22:%22twitter%22,%22_context%22:{%22' +
+      'referrer%22:%22http://localhost:8000/examples/%22,%22canoni' +
+      'calUrl%22:%22http://localhost:8000/examples/amps.html%22,%22' +
+      'location%22:{%22href%22:%22http://localhost:8000/examples/t' +
+      'witter.amp.html%22},%22mode%22:{%22localDev%22:true,%22develop' +
+      'ment%22:false,%22minified%22:false}}}';
     const data = parseFragment(encoded);
     expect(data).to.be.an('object');
     expect(data.tweetid).to.equal('638793490521001985');
     expect(data._context.location.href).to.equal(
-        'http://localhost:8000/examples/twitter.amp.html');
+      'http://localhost:8000/examples/twitter.amp.html'
+    );
   });
 
   it('should be ok with empty fragment', () => {
@@ -318,8 +335,7 @@ describe('3p integration.js', () => {
 
   it('should validateAllowedEmbeddingOrigins: referrer non-cache', () => {
     const win = {
-      location: {
-      },
+      location: {},
       document: {
         referrer: 'https://www.foo.com/test',
       },
@@ -336,8 +352,7 @@ describe('3p integration.js', () => {
 
   it('should validateAllowedEmbeddingOrigins: referrer cache', () => {
     const win = {
-      location: {
-      },
+      location: {},
       document: {
         referrer: 'https://cdn.ampproject.org/c/www.foo.com/test',
       },
diff --git a/test/unit/test-intersection-observer-polyfill.js b/test/unit/test-intersection-observer-polyfill.js
index a35bc52a4c88..95c28859b353 100644
--- a/test/unit/test-intersection-observer-polyfill.js
+++ b/test/unit/test-intersection-observer-polyfill.js
@@ -23,15 +23,17 @@ import {
   intersectionRatio,
 } from '../../src/intersection-observer-polyfill';
 import {Services} from '../../src/services';
-import {
-  installHiddenObserverForDoc,
-} from '../../src/service/hidden-observer-impl';
+import {installHiddenObserverForDoc} from '../../src/service/hidden-observer-impl';
 import {layoutRectLtwh} from '../../src/layout-rect';
 
 const fakeAmpDoc = {
-  getRootNode: () => {return window.document;},
+  getRootNode: () => {
+    return window.document;
+  },
   win: window,
-  isSingleDoc: () => {return true;},
+  isSingleDoc: () => {
+    return true;
+  },
 };
 installHiddenObserverForDoc(fakeAmpDoc);
 
@@ -58,8 +60,10 @@ describe('IntersectionObserverApi', () => {
     },
   };
 
-  const iframeSrc = 'http://iframe.localhost:' + location.port +
-      '/test/fixtures/served/iframe-intersection.html';
+  const iframeSrc =
+    'http://iframe.localhost:' +
+    location.port +
+    '/test/fixtures/served/iframe-intersection.html';
   let testIframe;
 
   function getIframe(src) {
@@ -82,9 +86,15 @@ describe('IntersectionObserverApi', () => {
     });
     sandbox.stub(Services, 'ampdoc').callsFake(() => fakeAmpDoc);
     testEle = {
-      isBuilt: () => {return true;},
-      getOwner: () => {return null;},
-      getLayoutBox: () => {return layoutRectLtwh(50, 100, 150, 200);},
+      isBuilt: () => {
+        return true;
+      },
+      getOwner: () => {
+        return null;
+      },
+      getLayoutBox: () => {
+        return layoutRectLtwh(50, 100, 150, 200);
+      },
       win: window,
       ownerDocument: {defaultView: window},
       nodeType: 1,
@@ -102,7 +112,9 @@ describe('IntersectionObserverApi', () => {
       getViewport: () => {
         return mockViewport;
       },
-      isInViewport: () => {return false;},
+      isInViewport: () => {
+        return false;
+      },
     };
     ioApi = new IntersectionObserverApi(baseElement, testIframe);
     insert(testIframe);
@@ -125,7 +137,9 @@ describe('IntersectionObserverApi', () => {
     expect(onScrollSpy).to.be.calledOnce;
     testIframe.parentNode.removeChild(testIframe);
     ioApi.destroy();
-    baseElement.isInViewport = () => {return true;};
+    baseElement.isInViewport = () => {
+      return true;
+    };
     ioApi = new IntersectionObserverApi(baseElement, testIframe);
     insert(testIframe);
     const inViewportTickSpy = sandbox.spy(ioApi.intersectionObserver_, 'tick');
@@ -152,10 +166,14 @@ describe('IntersectionObserverApi', () => {
   });
 
   it('should destroy correctly', () => {
-    const subscriptionApiDestroySpy =
-      sandbox.spy(ioApi.subscriptionApi_, 'destroy');
-    const polyfillDisconnectSpy =
-      sandbox.spy(ioApi.intersectionObserver_, 'disconnect');
+    const subscriptionApiDestroySpy = sandbox.spy(
+      ioApi.subscriptionApi_,
+      'destroy'
+    );
+    const polyfillDisconnectSpy = sandbox.spy(
+      ioApi.intersectionObserver_,
+      'disconnect'
+    );
     ioApi.destroy();
     expect(subscriptionApiDestroySpy).to.be.called;
     expect(polyfillDisconnectSpy).to.be.called;
@@ -177,20 +195,26 @@ describe('getIntersectionChangeEntry', () => {
     sandbox.restore();
   });
   it('without owner', () => {
-    expect(getIntersectionChangeEntry(
+    expect(
+      getIntersectionChangeEntry(
         layoutRectLtwh(0, 100, 50, 50),
         null,
-        layoutRectLtwh(0, 100, 100, 100))).to.jsonEqual({
+        layoutRectLtwh(0, 100, 100, 100)
+      )
+    ).to.jsonEqual({
       time: 100,
       rootBounds: layoutRectLtwh(0, 0, 100, 100),
       boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
       intersectionRect: layoutRectLtwh(0, 0, 50, 50),
       intersectionRatio: 1,
     });
-    expect(getIntersectionChangeEntry(
+    expect(
+      getIntersectionChangeEntry(
         layoutRectLtwh(50, 200, 150, 200),
         null,
-        layoutRectLtwh(0, 100, 100, 100))).to.jsonEqual({
+        layoutRectLtwh(0, 100, 100, 100)
+      )
+    ).to.jsonEqual({
       time: 100,
       rootBounds: layoutRectLtwh(0, 0, 100, 100),
       boundingClientRect: layoutRectLtwh(50, 100, 150, 200),
@@ -199,10 +223,13 @@ describe('getIntersectionChangeEntry', () => {
     });
   });
   it('with owner', () => {
-    expect(getIntersectionChangeEntry(
+    expect(
+      getIntersectionChangeEntry(
         layoutRectLtwh(50, 50, 150, 200),
         layoutRectLtwh(0, 50, 100, 100),
-        layoutRectLtwh(0, 100, 100, 100))).to.jsonEqual({
+        layoutRectLtwh(0, 100, 100, 100)
+      )
+    ).to.jsonEqual({
       time: 100,
       rootBounds: layoutRectLtwh(0, 0, 100, 100),
       boundingClientRect: layoutRectLtwh(50, -50, 150, 200),
@@ -248,10 +275,18 @@ describe('IntersectionObserverPolyfill', () => {
           threshold: Infinity,
         });
       };
-      allowConsoleError(() => { expect(io1).to.throw('Threshold should be a ' +
-          'finite number or an array of finite numbers'); });
-      allowConsoleError(() => { expect(io2).to.throw('Threshold should be a ' +
-          'finite number or an array of finite numbers'); });
+      allowConsoleError(() => {
+        expect(io1).to.throw(
+          'Threshold should be a ' +
+            'finite number or an array of finite numbers'
+        );
+      });
+      allowConsoleError(() => {
+        expect(io2).to.throw(
+          'Threshold should be a ' +
+            'finite number or an array of finite numbers'
+        );
+      });
     });
 
     it('will be sorted', () => {
@@ -296,7 +331,6 @@ describe('IntersectionObserverPolyfill', () => {
       threshold = [0.5];
       expect(getThresholdSlot(threshold, 1)).to.equal(1);
     });
-
   });
 
   describe('tick function', () => {
@@ -323,10 +357,13 @@ describe('IntersectionObserverPolyfill', () => {
         };
       });
 
-
       element = {
-        isBuilt: () => {return true;},
-        getOwner: () => {return null;},
+        isBuilt: () => {
+          return true;
+        },
+        getOwner: () => {
+          return null;
+        },
         ownerDocument: {defaultView: window},
         nodeType: 1,
       };
@@ -393,8 +430,7 @@ describe('IntersectionObserverPolyfill', () => {
     });
 
     describe('mutation observer', () => {
-      it('should create a mutation observer,' +
-        ' on initial observer', () => {
+      it('should create a mutation observer, on initial observer', () => {
         io = new IntersectionObserverPolyfill(callbackSpy, {
           threshold: [0, 1],
         });
@@ -405,8 +441,7 @@ describe('IntersectionObserverPolyfill', () => {
         expect(io.hiddenObserverUnlistener_).to.be.ok;
       });
 
-      it('should remove mutation observer,' +
-        ' on disconnect', () => {
+      it('should remove mutation observer, on disconnect', () => {
         io = new IntersectionObserverPolyfill(callbackSpy, {
           threshold: [0, 1],
         });
@@ -429,14 +464,16 @@ describe('IntersectionObserverPolyfill', () => {
         const rootBounds = layoutRectLtwh(0, 100, 100, 100);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRatio: 1,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRatio: 1,
+            target: element,
+          },
+        ]);
       });
 
       it('intersects on the edge', () => {
@@ -449,14 +486,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.tick(layoutRectLtwh(50, 200, 100, 100));
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(50, 100, 150, 200),
-          intersectionRect: layoutRectLtwh(50, 100, 50, 0),
-          intersectionRatio: 0,
-          target: element,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(50, 100, 150, 200),
+            intersectionRect: layoutRectLtwh(50, 100, 50, 0),
+            intersectionRatio: 0,
+            target: element,
+          },
+        ]);
       });
 
       it('intersects the viewport (bottom right)', () => {
@@ -467,14 +506,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(50, 99, 150, 200),
-          intersectionRect: layoutRectLtwh(50, 99, 50, 1),
-          intersectionRatio: 1 / 600,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(50, 99, 150, 200),
+            intersectionRect: layoutRectLtwh(50, 99, 50, 1),
+            intersectionRatio: 1 / 600,
+            target: element,
+          },
+        ]);
       });
 
       it('intersects the viewport (top left)', () => {
@@ -485,14 +526,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(-148, -199, 150, 200),
-          intersectionRect: layoutRectLtwh(0, 0, 2, 1),
-          intersectionRatio: 2 / 30000,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(-148, -199, 150, 200),
+            intersectionRect: layoutRectLtwh(0, 0, 2, 1),
+            intersectionRatio: 2 / 30000,
+            target: element,
+          },
+        ]);
       });
 
       it('NOT intersects when element outside (top left) viewport', () => {
@@ -505,14 +548,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.tick(layoutRectLtwh(50, 100, 100, 100));
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(-152, -199, 150, 200),
-          intersectionRect: layoutRectLtwh(0, 0, 0, 0),
-          intersectionRatio: 0,
-          target: element,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(-152, -199, 150, 200),
+            intersectionRect: layoutRectLtwh(0, 0, 0, 0),
+            intersectionRatio: 0,
+            target: element,
+          },
+        ]);
       });
 
       it('NOT intersects with element outside (bottom) viewport', () => {
@@ -525,14 +570,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.tick(layoutRectLtwh(50, 225, 100, 100));
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(50, 125, 100, 100),
-          intersectionRect: layoutRectLtwh(0, 0, 0, 0),
-          intersectionRatio: 0,
-          target: element,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(50, 125, 100, 100),
+            intersectionRect: layoutRectLtwh(0, 0, 0, 0),
+            intersectionRatio: 0,
+            target: element,
+          },
+        ]);
       });
 
       it('element has owner', () => {
@@ -550,14 +597,16 @@ describe('IntersectionObserverPolyfill', () => {
         const rootBounds = layoutRectLtwh(0, 100, 100, 100);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(50, -50, 150, 200),
-          intersectionRect: layoutRectLtwh(50, 0, 50, 50),
-          intersectionRatio: 1 / 12,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(50, -50, 150, 200),
+            intersectionRect: layoutRectLtwh(50, 0, 50, 50),
+            intersectionRatio: 1 / 12,
+            target: element,
+          },
+        ]);
       });
     });
 
@@ -571,14 +620,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element);
         io.tick(rootBounds, containerBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: null,
-          boundingClientRect: layoutRectLtwh(10, 10, 10, 10),
-          intersectionRect: layoutRectLtwh(10, 10, 10, 10),
-          intersectionRatio: 1,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: null,
+            boundingClientRect: layoutRectLtwh(10, 10, 10, 10),
+            intersectionRect: layoutRectLtwh(10, 10, 10, 10),
+            intersectionRatio: 1,
+            target: element,
+          },
+        ]);
       });
 
       it('nested element in container, container intersect viewport', () => {
@@ -590,14 +641,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element);
         io.tick(rootBounds, containerBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: null,
-          boundingClientRect: layoutRectLtwh(75, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(75, 0, 25, 50),
-          intersectionRatio: 0.5,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: null,
+            boundingClientRect: layoutRectLtwh(75, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(75, 0, 25, 50),
+            intersectionRatio: 0.5,
+            target: element,
+          },
+        ]);
       });
 
       it('nested element in container, container not in viewport', () => {
@@ -611,14 +664,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.tick(rootBounds, layoutRectLtwh(0, 200, 200, 200));
         io.tick(rootBounds, containerBounds);
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: null,
-          boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 50, 0),
-          intersectionRatio: 0,
-          target: element,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: null,
+            boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 50, 0),
+            intersectionRatio: 0,
+            target: element,
+          },
+        ]);
       });
 
       it('nested element outside container but in viewport', () => {
@@ -635,14 +690,16 @@ describe('IntersectionObserverPolyfill', () => {
         };
         io.tick(rootBounds, containerBounds);
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: null,
-          boundingClientRect: layoutRectLtwh(0, -101, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 0, 0),
-          intersectionRatio: 0,
-          target: element,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: null,
+            boundingClientRect: layoutRectLtwh(0, -101, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 0, 0),
+            intersectionRatio: 0,
+            target: element,
+          },
+        ]);
       });
 
       it('element has an owner', () => {
@@ -661,14 +718,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element);
         io.tick(rootBounds, containerBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: null,
-          boundingClientRect: layoutRectLtwh(75, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(75, 25, 25, 25),
-          intersectionRatio: 0.25,
-          target: element,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: null,
+            boundingClientRect: layoutRectLtwh(75, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(75, 25, 25, 25),
+            intersectionRatio: 0.25,
+            target: element,
+          },
+        ]);
       });
     });
 
@@ -676,9 +735,15 @@ describe('IntersectionObserverPolyfill', () => {
       let element2;
       beforeEach(() => {
         element2 = {
-          isBuilt: () => {return true;},
-          getOwner: () => {return null;},
-          getLayoutBox: () => {return layoutRectLtwh(0, 100, 50, 50);},
+          isBuilt: () => {
+            return true;
+          },
+          getOwner: () => {
+            return null;
+          },
+          getLayoutBox: () => {
+            return layoutRectLtwh(0, 100, 50, 50);
+          },
         };
       });
 
@@ -695,21 +760,24 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element2);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(0, 0, 25, 25),
-          intersectionRect: layoutRectLtwh(0, 0, 25, 25),
-          intersectionRatio: 1,
-          target: element,
-        }, {
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRatio: 1,
-          target: element2,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(0, 0, 25, 25),
+            intersectionRect: layoutRectLtwh(0, 0, 25, 25),
+            intersectionRatio: 1,
+            target: element,
+          },
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRatio: 1,
+            target: element2,
+          },
+        ]);
       });
 
       it('should only fire for elements that crossed threshold', () => {
@@ -721,14 +789,16 @@ describe('IntersectionObserverPolyfill', () => {
         io.observe(element2);
         io.tick(rootBounds);
         expect(callbackSpy).to.be.calledOnce;
-        expect(callbackSpy).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 100, 100),
-          boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 50, 50),
-          intersectionRatio: 1,
-          target: element2,
-        }]);
+        expect(callbackSpy).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 100, 100),
+            boundingClientRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 50, 50),
+            intersectionRatio: 1,
+            target: element2,
+          },
+        ]);
       });
 
       it('should stop observing after unobserve', () => {
@@ -742,21 +812,22 @@ describe('IntersectionObserverPolyfill', () => {
         io.unobserve(element);
         io.tick(layoutRectLtwh(0, 0, 10, 10));
         expect(callbackSpy).to.be.calledTwice;
-        expect(callbackSpy.secondCall).to.be.calledWith([{
-          time: 100,
-          rootBounds: layoutRectLtwh(0, 0, 10, 10),
-          boundingClientRect: layoutRectLtwh(0, 100, 50, 50),
-          intersectionRect: layoutRectLtwh(0, 0, 0, 0),
-          intersectionRatio: 0,
-          target: element2,
-        }]);
+        expect(callbackSpy.secondCall).to.be.calledWith([
+          {
+            time: 100,
+            rootBounds: layoutRectLtwh(0, 0, 10, 10),
+            boundingClientRect: layoutRectLtwh(0, 100, 50, 50),
+            intersectionRect: layoutRectLtwh(0, 0, 0, 0),
+            intersectionRatio: 0,
+            target: element2,
+          },
+        ]);
       });
     });
   });
 });
 
 describe('intersectionRatio', () => {
-
   let smallRectMock;
   let largeRectMock;
   beforeEach(() => {
diff --git a/test/unit/test-intersection-observer.js b/test/unit/test-intersection-observer.js
index a88d7f8842ce..7ef1c252c93d 100644
--- a/test/unit/test-intersection-observer.js
+++ b/test/unit/test-intersection-observer.js
@@ -22,7 +22,6 @@ import {
 import {createAmpElementForTesting} from '../../src/custom-element';
 import {layoutRectLtwh} from '../../src/layout-rect';
 
-
 describe('getIntersectionChangeEntry', () => {
   let sandbox;
   beforeEach(() => {
@@ -72,7 +71,7 @@ describe('getIntersectionChangeEntry', () => {
       'x': 50,
       'y': 0,
     });
-    expect(change.intersectionRatio).to.be.closeTo(0.1666666, .0001);
+    expect(change.intersectionRatio).to.be.closeTo(0.1666666, 0.0001);
   });
 
   it('intersects on the edge', () => {
@@ -155,8 +154,11 @@ describe('getIntersectionChangeEntry', () => {
     const rootBounds = layoutRectLtwh(0, 100, 100, 100);
     const ownerBounds = layoutRectLtwh(40, 110, 20, 20);
     const layoutBox = layoutRectLtwh(50, 50, 150, 200);
-    const change = getIntersectionChangeEntry(layoutBox, ownerBounds,
-        rootBounds);
+    const change = getIntersectionChangeEntry(
+      layoutBox,
+      ownerBounds,
+      rootBounds
+    );
 
     expect(change).to.be.an('object');
     expect(change.time).to.equal(Date.now());
@@ -191,15 +193,18 @@ describe('getIntersectionChangeEntry', () => {
       'x': 50,
       'y': 10,
     });
-    expect(change.intersectionRatio).to.be.closeTo(0.0066666, .0001);
+    expect(change.intersectionRatio).to.be.closeTo(0.0066666, 0.0001);
   });
 
   it('does not intersect with an elements out of viewport', () => {
     const rootBounds = layoutRectLtwh(0, 100, 100, 100);
     const ownerBounds = layoutRectLtwh(0, 200, 100, 100);
     const layoutBox = layoutRectLtwh(50, 225, 100, 100);
-    const change = getIntersectionChangeEntry(layoutBox, ownerBounds,
-        rootBounds);
+    const change = getIntersectionChangeEntry(
+      layoutBox,
+      ownerBounds,
+      rootBounds
+    );
 
     expect(change).to.be.an('object');
     expect(change.time).to.equal(Date.now());
@@ -241,8 +246,11 @@ describe('getIntersectionChangeEntry', () => {
     const rootBounds = layoutRectLtwh(0, 100, 100, 100);
     const ownerBounds = layoutRectLtwh(0, 100, 100, 100);
     const layoutBox = layoutRectLtwh(50, 225, 100, 100);
-    const change = getIntersectionChangeEntry(layoutBox, ownerBounds,
-        rootBounds);
+    const change = getIntersectionChangeEntry(
+      layoutBox,
+      ownerBounds,
+      rootBounds
+    );
 
     expect(change).to.be.an('object');
     expect(change.time).to.equal(Date.now());
@@ -281,7 +289,6 @@ describe('getIntersectionChangeEntry', () => {
   });
 });
 
-
 describe('IntersectionObserver', () => {
   let testElementCreatedCallback;
   let testElementPreconnectCallback;
@@ -323,12 +330,17 @@ describe('IntersectionObserver', () => {
     }
   }
 
-  const ElementClass = createAmpElementForTesting(window, 'amp-int',
-      TestElement);
+  const ElementClass = createAmpElementForTesting(
+    window,
+    'amp-int',
+    TestElement
+  );
   customElements.define('amp-int', ElementClass);
 
-  const iframeSrc = 'http://iframe.localhost:' + location.port +
-      '/test/fixtures/served/iframe-intersection.html';
+  const iframeSrc =
+    'http://iframe.localhost:' +
+    location.port +
+    '/test/fixtures/served/iframe-intersection.html';
 
   let sandbox;
   let testIframe;
@@ -404,8 +416,8 @@ describe('IntersectionObserver', () => {
   it('should not send intersection', () => {
     const ioInstance = new IntersectionObserver(element, testIframe);
     insert(testIframe);
-    const postMessageSpy = sinon/*OK*/.spy(testIframe.contentWindow,
-        'postMessage');
+    const postMessageSpy = sinon /*OK*/
+      .spy(testIframe.contentWindow, 'postMessage');
     ioInstance.sendElementIntersection_();
     expect(postMessageSpy).to.have.not.been.called;
     expect(ioInstance.pendingChanges_).to.have.length(0);
@@ -420,8 +432,9 @@ describe('IntersectionObserver', () => {
       messages.push(JSON.parse(JSON.stringify(message)));
     };
     clock.tick(33);
-    ioInstance.postMessageApi_.clientWindows_ =
-        [{win: testIframe.contentWindow, origin: '*'}];
+    ioInstance.postMessageApi_.clientWindows_ = [
+      {win: testIframe.contentWindow, origin: '*'},
+    ];
     ioInstance.startSendingIntersectionChanges_();
     expect(getIntersectionChangeEntrySpy).to.be.calledOnce;
     expect(messages).to.have.length(1);
@@ -438,8 +451,9 @@ describe('IntersectionObserver', () => {
       // Copy because arg is modified in place.
       messages.push(JSON.parse(JSON.stringify(message)));
     };
-    ioInstance.postMessageApi_.clientWindows_ =
-        [{win: testIframe.contentWindow, origin: '*'}];
+    ioInstance.postMessageApi_.clientWindows_ = [
+      {win: testIframe.contentWindow, origin: '*'},
+    ];
     ioInstance.startSendingIntersectionChanges_();
     expect(getIntersectionChangeEntrySpy).to.be.calledOnce;
     expect(messages).to.have.length(1);
@@ -516,8 +530,9 @@ describe('IntersectionObserver', () => {
       // Copy because arg is modified in place.
       messages.push(JSON.parse(JSON.stringify(message)));
     };
-    ioInstance.postMessageApi_.clientWindows_ =
-        [{win: testIframe.contentWindow, origin: '*'}];
+    ioInstance.postMessageApi_.clientWindows_ = [
+      {win: testIframe.contentWindow, origin: '*'},
+    ];
     ioInstance.startSendingIntersectionChanges_();
     expect(messages).to.have.length(1);
     ioInstance.fire();
diff --git a/test/unit/test-jank-meter.js b/test/unit/test-jank-meter.js
index 15bfda94e9c3..de8146dc1bc4 100644
--- a/test/unit/test-jank-meter.js
+++ b/test/unit/test-jank-meter.js
@@ -17,9 +17,7 @@
 import * as lolex from 'lolex';
 import {JankMeter} from '../../src/service/jank-meter';
 
-
 describes.realWin('jank-meter', {}, env => {
-
   let win;
   let clock;
   let meter;
@@ -27,7 +25,9 @@ describes.realWin('jank-meter', {}, env => {
   beforeEach(() => {
     win = env.win;
     clock = lolex.install({
-      target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+      target: win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
 
     meter = new JankMeter(win);
     meter.perf_ = {
@@ -41,8 +41,7 @@ describes.realWin('jank-meter', {}, env => {
     clock.uninstall();
   });
 
-  it('should use first schedule time when scheduled ' +
-      'multiple times ', () => {
+  it('should use first schedule time when scheduled multiple times ', () => {
     meter.onScheduled();
     clock.tick(5);
     meter.onScheduled();
diff --git a/test/unit/test-json.js b/test/unit/test-json.js
index a134731c0c13..ea0f02a4a5b8 100644
--- a/test/unit/test-json.js
+++ b/test/unit/test-json.js
@@ -189,19 +189,22 @@ describe('json', () => {
 
     it('throw if not one script', () => {
       expect(() => getChildJsonConfig(element)).to.throw(
-          'Found 0 <script> children. Expected 1');
+        'Found 0 <script> children. Expected 1'
+      );
       element.appendChild(script);
       const script2 = document.createElement('script');
       element.appendChild(script2);
       expect(() => getChildJsonConfig(element)).to.throw(
-          'Found 2 <script> children. Expected 1');
+        'Found 2 <script> children. Expected 1'
+      );
     });
 
     it('throw if type is not application/json', () => {
       script.setAttribute('type', '');
       element.appendChild(script);
       expect(() => getChildJsonConfig(element)).to.throw(
-          '<script> child must have type="application/json"');
+        '<script> child must have type="application/json"'
+      );
     });
 
     it('throw if cannot parse json', () => {
@@ -209,11 +212,11 @@ describe('json', () => {
       script.textContent = invalidText;
       element.appendChild(script);
       expect(() => getChildJsonConfig(element)).to.throw(
-          'Failed to parse <script> contents. Is it valid JSON?');
+        'Failed to parse <script> contents. Is it valid JSON?'
+      );
     });
   });
 
-
   describe('deepEquals', () => {
     it('should throw on non-finite depth arg', () => {
       expect(() => {
diff --git a/test/unit/test-layers.js b/test/unit/test-layers.js
index ce786bf9d5b4..b53a9134d1f1 100644
--- a/test/unit/test-layers.js
+++ b/test/unit/test-layers.js
@@ -23,510 +23,524 @@ import {installDocService} from '../../src/service/ampdoc-impl';
 import {installFriendlyIframeEmbed} from '../../src/friendly-iframe-embed';
 
 describes.realWin('Layers', {amp: true}, env => {
-  describes.repeated('Layers', {
-    'Real document scroller': 'native',
-    'Overflow scroller': 'overflow',
-    'Shadow DOM scroller': 'shadow',
-  }, (name, impl) => {
-    let win;
-    let root;
-    let scrollingElement;
-
-    function createElement(tag = 'div') {
-      return win.document.createElement(tag);
-    }
-
-    function friendlyIframe() {
-      const iframe = createElement('iframe');
-      iframe.setAttribute('frameborder', '0');
-      iframe.setAttribute('allowfullscreen', '');
-      iframe.setAttribute('scrolling', 'no');
-
-      const container = createElement('div');
-      container.appendChild(iframe);
-      root.appendChild(container);
-
-      return installFriendlyIframeEmbed(iframe, container, {
-        url: `${location.origin}/fie`,
-        html: '<!doctype html><html ⚡><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
-      }).then(() => {
-        return {
-          iframe,
-          body: iframe.contentDocument.body,
-        };
-      });
-    }
-
-    before(function() {
-      if (impl === 'shadow' && !Element.prototype.attachShadow) {
-        this.skipTest();
-      }
-    });
-
-    beforeEach(() => {
-      win = env.win;
-      switch (impl) {
-        case 'native':
-          root = scrollingElement = win.document.scrollingElement;
-          break;
-
-        case 'overflow':
-          root = scrollingElement = createElement();
-          win.document.body.appendChild(root);
-          break;
-
-        case 'shadow': {
-          root = win.document.body;
-          scrollingElement = createElement('div');
-          const sd = root.attachShadow({mode: 'open'});
-          const slot = createElement('slot');
-          scrollingElement.appendChild(slot);
-          sd.appendChild(scrollingElement);
-        }
+  describes.repeated(
+    'Layers',
+    {
+      'Real document scroller': 'native',
+      'Overflow scroller': 'overflow',
+      'Shadow DOM scroller': 'shadow',
+    },
+    (name, impl) => {
+      let win;
+      let root;
+      let scrollingElement;
+
+      function createElement(tag = 'div') {
+        return win.document.createElement(tag);
       }
 
-      installDocService(win, true);
-      const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
-      installLayersServiceForDoc(ampdoc, scrollingElement, impl === 'native');
-    });
-
-    function scroll(element, top, left) {
-      element.scrollTop = top;
-      element.scrollLeft = left;
-      const layout = LayoutElement.for(element);
-      layout.dirtyScrollMeasurements();
-    }
-
-    describe('LayoutElement', () => {
-
-      describe('.getParentLayer', () => {
-        it('returns null for scrolling layer', () => {
-          expect(LayoutElement.getParentLayer(scrollingElement)).to.be.null;
+      function friendlyIframe() {
+        const iframe = createElement('iframe');
+        iframe.setAttribute('frameborder', '0');
+        iframe.setAttribute('allowfullscreen', '');
+        iframe.setAttribute('scrolling', 'no');
+
+        const container = createElement('div');
+        container.appendChild(iframe);
+        root.appendChild(container);
+
+        return installFriendlyIframeEmbed(iframe, container, {
+          url: `${location.origin}/fie`,
+          html: '<!doctype html><html ⚡><head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head><body></body></html>',
+        }).then(() => {
+          return {
+            iframe,
+            body: iframe.contentDocument.body,
+          };
         });
+      }
 
-        it('returns parent layer', () => {
-          const div = createElement();
-          root.appendChild(div);
-
-          expect(LayoutElement.getParentLayer(div)).to.equal(
-              LayoutElement.for(scrollingElement));
-        });
-
-        it('returns null if element is fixed', () => {
-          const div = createElement();
-          root.appendChild(div);
-
-          div.style.position = 'fixed';
-          expect(LayoutElement.getParentLayer(div)).to.be.null;
-        });
-
-        it('returns parent if parent element is fixed', () => {
-          const parent = createElement();
-          const div = createElement();
-          parent.appendChild(div);
-          root.appendChild(parent);
-
-          parent.style.position = 'fixed';
-          const layer = LayoutElement.getParentLayer(div);
-          expect(layer).to.equal(LayoutElement.for(parent));
-        });
-
-        it('does not cause double references in layer tree', () => {
-          const layers = Services.layersForDoc(root);
-          const div = createElement();
-          root.appendChild(div);
-          layers.add(div);
-
-          const layout = LayoutElement.for(div);
-          const rootLayout = LayoutElement.for(scrollingElement);
-          expect(layout.getParentLayer()).to.equal(rootLayout);
-
-          layout.forgetParentLayer();
-          expect(layout.getParentLayer()).to.equal(rootLayout);
+      before(function() {
+        if (impl === 'shadow' && !Element.prototype.attachShadow) {
+          this.skipTest();
+        }
+      });
 
-          const spy = sinon.sandbox.spy(div, 'getBoundingClientRect');
-          rootLayout.dirtyMeasurements();
-          rootLayout.remeasure();
+      beforeEach(() => {
+        win = env.win;
+        switch (impl) {
+          case 'native':
+            root = scrollingElement = win.document.scrollingElement;
+            break;
+
+          case 'overflow':
+            root = scrollingElement = createElement();
+            win.document.body.appendChild(root);
+            break;
+
+          case 'shadow': {
+            root = win.document.body;
+            scrollingElement = createElement('div');
+            const sd = root.attachShadow({mode: 'open'});
+            const slot = createElement('slot');
+            scrollingElement.appendChild(slot);
+            sd.appendChild(scrollingElement);
+          }
+        }
 
-          expect(spy).to.have.callCount(1);
-        });
+        installDocService(win, true);
+        const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
+        installLayersServiceForDoc(ampdoc, scrollingElement, impl === 'native');
+      });
 
-        describe('inside FIE', () => {
-          let iframe;
-          let iframeBody;
+      function scroll(element, top, left) {
+        element.scrollTop = top;
+        element.scrollLeft = left;
+        const layout = LayoutElement.for(element);
+        layout.dirtyScrollMeasurements();
+      }
 
-          beforeEach(() => {
-            return friendlyIframe().then(struct => {
-              iframe = struct.iframe;
-              iframeBody = struct.body;
-            });
+      describe('LayoutElement', () => {
+        describe('.getParentLayer', () => {
+          it('returns null for scrolling layer', () => {
+            expect(LayoutElement.getParentLayer(scrollingElement)).to.be.null;
           });
 
           it('returns parent layer', () => {
             const div = createElement();
-            iframeBody.appendChild(div);
+            root.appendChild(div);
 
             expect(LayoutElement.getParentLayer(div)).to.equal(
-                LayoutElement.for(scrollingElement));
+              LayoutElement.for(scrollingElement)
+            );
           });
 
-          it('returns frameElement if element is fixed', () => {
+          it('returns null if element is fixed', () => {
             const div = createElement();
-            iframeBody.appendChild(div);
+            root.appendChild(div);
 
             div.style.position = 'fixed';
-            expect(LayoutElement.getParentLayer(div)).to.equal(
-                LayoutElement.for(iframe));
+            expect(LayoutElement.getParentLayer(div)).to.be.null;
           });
 
           it('returns parent if parent element is fixed', () => {
             const parent = createElement();
             const div = createElement();
             parent.appendChild(div);
-            iframeBody.appendChild(parent);
+            root.appendChild(parent);
 
             parent.style.position = 'fixed';
             const layer = LayoutElement.getParentLayer(div);
             expect(layer).to.equal(LayoutElement.for(parent));
           });
-        });
-      });
 
-      describes.repeated('Parent layer', {
-        'regular element': 'div',
-        'FIE embed': 'fie',
-      }, (name, impl) => {
-        describe('#getScrolledPosition', () => {
-          let parent;
-          let div;
-          let layout;
-          let parentLayout;
-          let rootLayout;
-
-          beforeEach(() => {
-            return new Promise(res => {
-              if (impl === 'fie') {
-                res(friendlyIframe().then(struct => {
-                  const {iframe, body} = struct;
-                  // ensure the scrolling element has enough content to scroll
-                  iframe.style.width = '200vw';
-                  iframe.style.height = '200vh';
-                  return body;
-                }));
-              } else {
-                res(root);
-              }
-            }).then(container => {
-              parent = createElement();
-              div = createElement();
-              container.appendChild(parent);
-              parent.appendChild(div);
+          it('does not cause double references in layer tree', () => {
+            const layers = Services.layersForDoc(root);
+            const div = createElement();
+            root.appendChild(div);
+            layers.add(div);
 
-              scrollingElement.style.width = '100vw';
-              scrollingElement.style.height = '100vh';
-              scrollingElement.style.position = 'absolute';
-              scrollingElement.style.overflow = 'scroll';
-              parent.style.width = '200vw';
-              parent.style.height = '200vh';
-              parent.style.position = 'absolute';
-              parent.style.overflow = 'scroll';
-              div.style.width = '250vw';
-              div.style.height = '250vh';
-              div.style.position = 'absolute';
-              div.style.overflow = 'scroll';
-
-              const layers = Services.layersForDoc(parent);
-              layers.declareLayer(parent);
-              layers.add(div);
-              layout = LayoutElement.for(div);
-              parentLayout = LayoutElement.for(parent);
-              rootLayout = LayoutElement.for(scrollingElement);
-            });
-          });
+            const layout = LayoutElement.for(div);
+            const rootLayout = LayoutElement.for(scrollingElement);
+            expect(layout.getParentLayer()).to.equal(rootLayout);
 
-          it('calculates layout offsets without scrolls', () => {
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
+            layout.forgetParentLayer();
+            expect(layout.getParentLayer()).to.equal(rootLayout);
 
-            div.style.top = '10px';
+            const spy = sinon.sandbox.spy(div, 'getBoundingClientRect');
             rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 10,
-            });
+            rootLayout.remeasure();
 
-            div.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
+            expect(spy).to.have.callCount(1);
           });
 
-          it('calculates parent offsets without scrolls', () => {
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
+          describe('inside FIE', () => {
+            let iframe;
+            let iframeBody;
 
-            parent.style.top = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 10,
+            beforeEach(() => {
+              return friendlyIframe().then(struct => {
+                iframe = struct.iframe;
+                iframeBody = struct.body;
+              });
             });
 
-            parent.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
-          });
+            it('returns parent layer', () => {
+              const div = createElement();
+              iframeBody.appendChild(div);
 
-          it('calculates parent and offsets without scrolls', () => {
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
+              expect(LayoutElement.getParentLayer(div)).to.equal(
+                LayoutElement.for(scrollingElement)
+              );
             });
 
-            parent.style.top = '10px';
-            div.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
-
-            parent.style.left = '10px';
-            div.style.top = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: 20,
-              top: 20,
-            });
-          });
+            it('returns frameElement if element is fixed', () => {
+              const div = createElement();
+              iframeBody.appendChild(div);
 
-          it('does not change when layout itself scrolls', function*() {
-            scroll(parent, 10, 0);
-            expect(parentLayout.getScrollTop()).to.equal(10);
-            expect(parentLayout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(parentLayout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
+              div.style.position = 'fixed';
+              expect(LayoutElement.getParentLayer(div)).to.equal(
+                LayoutElement.for(iframe)
+              );
             });
 
-            scroll(scrollingElement, 10, 0);
-            expect(rootLayout.getScrollTop()).to.equal(10);
-            expect(rootLayout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(rootLayout.getScrolledPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-          });
-
-          it('updates as parent layers scroll', () => {
-            scroll(parent, 10, 5);
-            expect(parentLayout.getScrollTop()).to.equal(10);
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: -5,
-              top: -10,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: -5,
-              top: -10,
-            });
-
-            scroll(scrollingElement, 10, 5);
-            expect(rootLayout.getScrollTop()).to.equal(10);
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: -10,
-              top: -20,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(layout.getScrolledPosition()).to.deep.equal({
-              left: -10,
-              top: -20,
-            });
-          });
-        });
-
-        describe('#getOffsetPosition', () => {
-          let parent;
-          let div;
-          let layout;
-          let parentLayout;
-          let rootLayout;
-          beforeEach(() => {
-            return new Promise(res => {
-              if (impl === 'fie') {
-                res(friendlyIframe().then(struct => {
-                  const {iframe, body} = struct;
-                  // ensure the scrolling element has enough content to scroll
-                  iframe.style.width = '200vw';
-                  iframe.style.height = '200vh';
-                  return body;
-                }));
-              } else {
-                res(root);
-              }
-            }).then(container => {
-              parent = createElement();
-              div = createElement();
+            it('returns parent if parent element is fixed', () => {
+              const parent = createElement();
+              const div = createElement();
               parent.appendChild(div);
-              container.appendChild(parent);
-
-              scrollingElement.style.width = '100vw';
-              scrollingElement.style.height = '100vh';
-              scrollingElement.style.position = 'absolute';
-              scrollingElement.style.overflow = 'scroll';
-              parent.style.width = '110vw';
-              parent.style.height = '110vh';
-              parent.style.position = 'absolute';
-              parent.style.overflow = 'scroll';
-              div.style.width = '120vw';
-              div.style.height = '120vh';
-              div.style.position = 'absolute';
-              div.style.overflow = 'scroll';
-
-              const layers = Services.layersForDoc(parent);
-              layers.declareLayer(parent);
-              layers.add(div);
-              layout = LayoutElement.for(div);
-              parentLayout = LayoutElement.for(parent);
-              rootLayout = LayoutElement.for(scrollingElement);
-            });
-          });
+              iframeBody.appendChild(parent);
 
-          it('calculates layout offsets without scrolls', () => {
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-
-            div.style.top = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 10,
-            });
-
-            div.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
-          });
-
-          it('calculates parent offsets without scrolls', () => {
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-
-            parent.style.top = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 10,
-            });
-
-            parent.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
-          });
-
-          it('calculates parent and offsets without scrolls', () => {
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-
-            parent.style.top = '10px';
-            div.style.left = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 10,
-              top: 10,
-            });
-
-            parent.style.left = '10px';
-            div.style.top = '10px';
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 20,
-              top: 20,
-            });
-          });
-
-          it('does not change when layout itself scrolls', function*() {
-            scroll(parent, 10, 0);
-            expect(parentLayout.getScrollTop()).to.equal(10);
-            expect(parentLayout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(parentLayout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-
-            scroll(scrollingElement, 10, 0);
-            expect(rootLayout.getScrollTop()).to.equal(10);
-            expect(rootLayout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(rootLayout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-          });
-
-          it('doe snot change when parent layers scroll', () => {
-            scroll(parent, 10, 5);
-            expect(parentLayout.getScrollTop()).to.equal(10);
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-
-            scroll(scrollingElement, 10, 5);
-            expect(rootLayout.getScrollTop()).to.equal(10);
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
-            });
-            rootLayout.dirtyMeasurements();
-            expect(layout.getOffsetPosition()).to.deep.equal({
-              left: 0,
-              top: 0,
+              parent.style.position = 'fixed';
+              const layer = LayoutElement.getParentLayer(div);
+              expect(layer).to.equal(LayoutElement.for(parent));
             });
           });
         });
+
+        describes.repeated(
+          'Parent layer',
+          {
+            'regular element': 'div',
+            'FIE embed': 'fie',
+          },
+          (name, impl) => {
+            describe('#getScrolledPosition', () => {
+              let parent;
+              let div;
+              let layout;
+              let parentLayout;
+              let rootLayout;
+
+              beforeEach(() => {
+                return new Promise(res => {
+                  if (impl === 'fie') {
+                    res(
+                      friendlyIframe().then(struct => {
+                        const {iframe, body} = struct;
+                        // ensure the scrolling element has enough content to scroll
+                        iframe.style.width = '200vw';
+                        iframe.style.height = '200vh';
+                        return body;
+                      })
+                    );
+                  } else {
+                    res(root);
+                  }
+                }).then(container => {
+                  parent = createElement();
+                  div = createElement();
+                  container.appendChild(parent);
+                  parent.appendChild(div);
+
+                  scrollingElement.style.width = '100vw';
+                  scrollingElement.style.height = '100vh';
+                  scrollingElement.style.position = 'absolute';
+                  scrollingElement.style.overflow = 'scroll';
+                  parent.style.width = '200vw';
+                  parent.style.height = '200vh';
+                  parent.style.position = 'absolute';
+                  parent.style.overflow = 'scroll';
+                  div.style.width = '250vw';
+                  div.style.height = '250vh';
+                  div.style.position = 'absolute';
+                  div.style.overflow = 'scroll';
+
+                  const layers = Services.layersForDoc(parent);
+                  layers.declareLayer(parent);
+                  layers.add(div);
+                  layout = LayoutElement.for(div);
+                  parentLayout = LayoutElement.for(parent);
+                  rootLayout = LayoutElement.for(scrollingElement);
+                });
+              });
+
+              it('calculates layout offsets without scrolls', () => {
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                div.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 10,
+                });
+
+                div.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+              });
+
+              it('calculates parent offsets without scrolls', () => {
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                parent.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 10,
+                });
+
+                parent.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+              });
+
+              it('calculates parent and offsets without scrolls', () => {
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                parent.style.top = '10px';
+                div.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+
+                parent.style.left = '10px';
+                div.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: 20,
+                  top: 20,
+                });
+              });
+
+              it('does not change when layout itself scrolls', function*() {
+                scroll(parent, 10, 0);
+                expect(parentLayout.getScrollTop()).to.equal(10);
+                expect(parentLayout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(parentLayout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                scroll(scrollingElement, 10, 0);
+                expect(rootLayout.getScrollTop()).to.equal(10);
+                expect(rootLayout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(rootLayout.getScrolledPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+              });
+
+              it('updates as parent layers scroll', () => {
+                scroll(parent, 10, 5);
+                expect(parentLayout.getScrollTop()).to.equal(10);
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: -5,
+                  top: -10,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: -5,
+                  top: -10,
+                });
+
+                scroll(scrollingElement, 10, 5);
+                expect(rootLayout.getScrollTop()).to.equal(10);
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: -10,
+                  top: -20,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(layout.getScrolledPosition()).to.deep.equal({
+                  left: -10,
+                  top: -20,
+                });
+              });
+            });
+
+            describe('#getOffsetPosition', () => {
+              let parent;
+              let div;
+              let layout;
+              let parentLayout;
+              let rootLayout;
+              beforeEach(() => {
+                return new Promise(res => {
+                  if (impl === 'fie') {
+                    res(
+                      friendlyIframe().then(struct => {
+                        const {iframe, body} = struct;
+                        // ensure the scrolling element has enough content to scroll
+                        iframe.style.width = '200vw';
+                        iframe.style.height = '200vh';
+                        return body;
+                      })
+                    );
+                  } else {
+                    res(root);
+                  }
+                }).then(container => {
+                  parent = createElement();
+                  div = createElement();
+                  parent.appendChild(div);
+                  container.appendChild(parent);
+
+                  scrollingElement.style.width = '100vw';
+                  scrollingElement.style.height = '100vh';
+                  scrollingElement.style.position = 'absolute';
+                  scrollingElement.style.overflow = 'scroll';
+                  parent.style.width = '110vw';
+                  parent.style.height = '110vh';
+                  parent.style.position = 'absolute';
+                  parent.style.overflow = 'scroll';
+                  div.style.width = '120vw';
+                  div.style.height = '120vh';
+                  div.style.position = 'absolute';
+                  div.style.overflow = 'scroll';
+
+                  const layers = Services.layersForDoc(parent);
+                  layers.declareLayer(parent);
+                  layers.add(div);
+                  layout = LayoutElement.for(div);
+                  parentLayout = LayoutElement.for(parent);
+                  rootLayout = LayoutElement.for(scrollingElement);
+                });
+              });
+
+              it('calculates layout offsets without scrolls', () => {
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                div.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 10,
+                });
+
+                div.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+              });
+
+              it('calculates parent offsets without scrolls', () => {
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                parent.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 10,
+                });
+
+                parent.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+              });
+
+              it('calculates parent and offsets without scrolls', () => {
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                parent.style.top = '10px';
+                div.style.left = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 10,
+                  top: 10,
+                });
+
+                parent.style.left = '10px';
+                div.style.top = '10px';
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 20,
+                  top: 20,
+                });
+              });
+
+              it('does not change when layout itself scrolls', function*() {
+                scroll(parent, 10, 0);
+                expect(parentLayout.getScrollTop()).to.equal(10);
+                expect(parentLayout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(parentLayout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                scroll(scrollingElement, 10, 0);
+                expect(rootLayout.getScrollTop()).to.equal(10);
+                expect(rootLayout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(rootLayout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+              });
+
+              it('doe snot change when parent layers scroll', () => {
+                scroll(parent, 10, 5);
+                expect(parentLayout.getScrollTop()).to.equal(10);
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+
+                scroll(scrollingElement, 10, 5);
+                expect(rootLayout.getScrollTop()).to.equal(10);
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+                rootLayout.dirtyMeasurements();
+                expect(layout.getOffsetPosition()).to.deep.equal({
+                  left: 0,
+                  top: 0,
+                });
+              });
+            });
+          }
+        );
       });
-    });
-  });
+    }
+  );
 });
diff --git a/test/unit/test-layout-delay-meter.js b/test/unit/test-layout-delay-meter.js
index 53b897289739..da2ac84e7025 100644
--- a/test/unit/test-layout-delay-meter.js
+++ b/test/unit/test-layout-delay-meter.js
@@ -19,76 +19,81 @@ import {LayoutDelayMeter} from '../../src/layout-delay-meter';
 import {Services} from '../../src/services';
 import {installPerformanceService} from '../../src/service/performance-impl';
 
-describes.realWin('layout-delay-meter', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'layout-delay-meter',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
+  env => {
+    let win;
+    let sandbox;
+    let meter;
+    let tickSpy;
+    let clock;
 
-  let win;
-  let sandbox;
-  let meter;
-  let tickSpy;
-  let clock;
+    beforeEach(() => {
+      sandbox = env.sandbox;
+      win = env.win;
+      installPerformanceService(win);
+      const perf = Services.performanceFor(win);
+      sandbox.stub(perf, 'isPerformanceTrackingOn').callsFake(() => true);
+      clock = lolex.install({
+        target: win,
+        toFake: ['Date', 'setTimeout', 'clearTimeout'],
+      });
+      tickSpy = sandbox.spy(perf, 'tickDelta');
 
-  beforeEach(() => {
-    sandbox = env.sandbox;
-    win = env.win;
-    installPerformanceService(win);
-    const perf = Services.performanceFor(win);
-    sandbox.stub(perf, 'isPerformanceTrackingOn').callsFake(() => true);
-    clock = lolex.install({
-      target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
-    tickSpy = sandbox.spy(perf, 'tickDelta');
+      meter = new LayoutDelayMeter(win, 2);
+    });
 
-    meter = new LayoutDelayMeter(win, 2);
-  });
+    afterEach(() => {
+      clock.uninstall();
+    });
 
-  afterEach(() => {
-    clock.uninstall();
-  });
+    it('should tick when there is a delay', () => {
+      clock.tick(100);
+      meter.enterViewport(); // first time in viewport
+      clock.tick(100);
+      meter.enterViewport(); // second time in viewport
+      clock.tick(200);
+      meter.startLayout();
+      expect(tickSpy).to.be.calledWith('adld', 300);
 
-  it('should tick when there is a delay', () => {
-    clock.tick(100);
-    meter.enterViewport(); // first time in viewport
-    clock.tick(100);
-    meter.enterViewport(); // second time in viewport
-    clock.tick(200);
-    meter.startLayout();
-    expect(tickSpy).to.be.calledWith('adld', 300);
+      // should only tick once.
+      tickSpy.resetHistory();
+      clock.tick(200);
+      meter.startLayout();
+      expect(tickSpy).to.not.be.called;
+    });
 
-    // should only tick once.
-    tickSpy.resetHistory();
-    clock.tick(200);
-    meter.startLayout();
-    expect(tickSpy).to.not.be.called;
-  });
+    it('should tick when there is no delay', () => {
+      clock.tick(100);
+      meter.startLayout();
+      clock.tick(200);
+      meter.enterViewport();
+      expect(tickSpy).to.be.calledWith('adld', 0);
 
-  it('should tick when there is no delay', () => {
-    clock.tick(100);
-    meter.startLayout();
-    clock.tick(200);
-    meter.enterViewport();
-    expect(tickSpy).to.be.calledWith('adld', 0);
+      // should only tick once.
+      tickSpy.resetHistory();
+      clock.tick(200);
+      meter.enterViewport();
+      expect(tickSpy).to.not.be.called;
+    });
 
-    // should only tick once.
-    tickSpy.resetHistory();
-    clock.tick(200);
-    meter.enterViewport();
-    expect(tickSpy).to.not.be.called;
-  });
+    it('should not tick if it never enterViewport', () => {
+      clock.tick(100);
+      meter.startLayout();
+      clock.tick(200);
+      expect(tickSpy).not.to.be.called;
+    });
 
-  it('should not tick if it never enterViewport', () => {
-    clock.tick(100);
-    meter.startLayout();
-    clock.tick(200);
-    expect(tickSpy).not.to.be.called;
-  });
-
-  it('should not tick if it never startLayout', () => {
-    clock.tick(100);
-    meter.enterViewport();
-    clock.tick(200);
-    expect(tickSpy).not.to.be.called;
-  });
-});
+    it('should not tick if it never startLayout', () => {
+      clock.tick(100);
+      meter.enterViewport();
+      clock.tick(200);
+      expect(tickSpy).not.to.be.called;
+    });
+  }
+);
diff --git a/test/unit/test-layout-rect.js b/test/unit/test-layout-rect.js
index 6b8834efe949..0f46eb235f4d 100644
--- a/test/unit/test-layout-rect.js
+++ b/test/unit/test-layout-rect.js
@@ -17,7 +17,6 @@
 import * as lr from '../../src/layout-rect';
 
 describe('LayoutRect', () => {
-
   it('layoutRectLtwh', () => {
     const rect = lr.layoutRectLtwh(1, 2, 3, 4);
     expect(rect.left).to.equal(1);
@@ -60,8 +59,12 @@ describe('LayoutRect', () => {
   });
 
   it('layoutRectFromDomRect', () => {
-    const rect = lr.layoutRectFromDomRect({top: 11, left: 12, width: 111,
-      height: 222});
+    const rect = lr.layoutRectFromDomRect({
+      top: 11,
+      left: 12,
+      width: 111,
+      height: 222,
+    });
     expect(rect.top).to.equal(11);
     expect(rect.left).to.equal(12);
     expect(rect.width).to.equal(111);
diff --git a/test/unit/test-layout.js b/test/unit/test-layout.js
index 704024f7b0dd..0529490f9520 100644
--- a/test/unit/test-layout.js
+++ b/test/unit/test-layout.js
@@ -14,10 +14,17 @@
  * limitations under the License.
  */
 
-import {Layout, applyStaticLayout,
-  assertLength, assertLengthOrPercent, getLengthNumeral, getLengthUnits,
-  isLoadingAllowed, parseLayout, parseLength} from '../../src/layout';
-
+import {
+  Layout,
+  applyStaticLayout,
+  assertLength,
+  assertLengthOrPercent,
+  getLengthNumeral,
+  getLengthUnits,
+  isLoadingAllowed,
+  parseLayout,
+  parseLength,
+} from '../../src/layout';
 
 describe('Layout', () => {
   let div;
@@ -89,7 +96,6 @@ describe('Layout', () => {
       el.tagName = tag;
       expect(isLoadingAllowed(el)).to.be.false;
     });
-
   });
 
   it('parseLayout - failure', () => {
@@ -161,27 +167,38 @@ describe('Layout', () => {
     expect(assertLength('10.1em')).to.equal('10.1em');
     expect(assertLength('10.1vmin')).to.equal('10.1vmin');
 
-    allowConsoleError(() => { expect(function() {
-      assertLength('10%');
-    }).to.throw(/Invalid length value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLength(10);
-    }).to.throw(/Invalid length value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLength('10');
-    }).to.throw(/Invalid length value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLength(undefined);
-    }).to.throw(/Invalid length value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLength(null);
-    }).to.throw(/Invalid length value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLength('');
-    }).to.throw(/Invalid length value/); });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength('10%');
+      }).to.throw(/Invalid length value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength(10);
+      }).to.throw(/Invalid length value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength('10');
+      }).to.throw(/Invalid length value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength(undefined);
+      }).to.throw(/Invalid length value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength(null);
+      }).to.throw(/Invalid length value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLength('');
+      }).to.throw(/Invalid length value/);
+    });
   });
 
-
   it('assertLengthOrPercent', () => {
     expect(assertLengthOrPercent('10px')).to.equal('10px');
     expect(assertLengthOrPercent('10em')).to.equal('10em');
@@ -192,24 +209,33 @@ describe('Layout', () => {
     expect(assertLengthOrPercent('10.1vmin')).to.equal('10.1vmin');
     expect(assertLengthOrPercent('10.1%')).to.equal('10.1%');
 
-    allowConsoleError(() => { expect(function() {
-      assertLengthOrPercent(10);
-    }).to.throw(/Invalid length or percent value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLengthOrPercent('10');
-    }).to.throw(/Invalid length or percent value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLengthOrPercent(undefined);
-    }).to.throw(/Invalid length or percent value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLengthOrPercent(null);
-    }).to.throw(/Invalid length or percent value/); });
-    allowConsoleError(() => { expect(function() {
-      assertLengthOrPercent('');
-    }).to.throw(/Invalid length or percent value/); });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLengthOrPercent(10);
+      }).to.throw(/Invalid length or percent value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLengthOrPercent('10');
+      }).to.throw(/Invalid length or percent value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLengthOrPercent(undefined);
+      }).to.throw(/Invalid length or percent value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLengthOrPercent(null);
+      }).to.throw(/Invalid length or percent value/);
+    });
+    allowConsoleError(() => {
+      expect(function() {
+        assertLengthOrPercent('');
+      }).to.throw(/Invalid length or percent value/);
+    });
   });
 
-
   it('layout=nodisplay', () => {
     div.setAttribute('layout', 'nodisplay');
     expect(applyStaticLayout(div)).to.equal(Layout.NODISPLAY);
@@ -258,11 +284,11 @@ describe('Layout', () => {
     div.setAttribute('layout', 'fixed');
     allowConsoleError(() => {
       expect(() => applyStaticLayout(div)).to.throw(
-          /Expected height to be available/);
+        /Expected height to be available/
+      );
     });
   });
 
-
   it('layout=fixed-height', () => {
     div.setAttribute('layout', 'fixed-height');
     div.setAttribute('height', 200);
@@ -290,9 +316,11 @@ describe('Layout', () => {
     div.setAttribute('layout', 'fixed-height');
     div.setAttribute('height', 200);
     div.setAttribute('width', 300);
-    allowConsoleError(() => { expect(function() {
-      applyStaticLayout(div);
-    }).to.throw(/Expected width to be either absent or equal "auto"/); });
+    allowConsoleError(() => {
+      expect(function() {
+        applyStaticLayout(div);
+      }).to.throw(/Expected width to be either absent or equal "auto"/);
+    });
   });
 
   it('layout=fixed-height - default with height', () => {
@@ -314,11 +342,11 @@ describe('Layout', () => {
     div.setAttribute('layout', 'fixed-height');
     allowConsoleError(() => {
       expect(() => applyStaticLayout(div)).to.throw(
-          /Expected height to be available/);
+        /Expected height to be available/
+      );
     });
   });
 
-
   it('layout=responsive', () => {
     div.setAttribute('layout', 'responsive');
     div.setAttribute('width', 100);
@@ -347,7 +375,6 @@ describe('Layout', () => {
     expect(div.children[0].style.paddingTop).to.equal('200%');
   });
 
-
   it('layout=intrinsic', () => {
     div.setAttribute('layout', 'intrinsic');
     div.setAttribute('width', 100);
@@ -361,7 +388,9 @@ describe('Layout', () => {
     expect(div.children[0].tagName.toLowerCase()).to.equal('i-amphtml-sizer');
     expect(div.children[0].children.length).to.equal(1);
     expect(div.children[0].children[0].tagName.toLowerCase()).to.equal('img');
-    expect(div.children[0].children[0].src).to.equal('data:image/svg+xml;charset=utf-8,<svg height="200px" width="100px" xmlns="http://www.w3.org/2000/svg" version="1.1"/>');
+    expect(div.children[0].children[0].src).to.equal(
+      'data:image/svg+xml;charset=utf-8,<svg height="200px" width="100px" xmlns="http://www.w3.org/2000/svg" version="1.1"/>'
+    );
   });
 
   it('layout=intrinsic - default with sizes', () => {
@@ -378,7 +407,9 @@ describe('Layout', () => {
     expect(div.children[0].tagName.toLowerCase()).to.equal('i-amphtml-sizer');
     expect(div.children[0].children.length).to.equal(1);
     expect(div.children[0].children[0].tagName.toLowerCase()).to.equal('img');
-    expect(div.children[0].children[0].src).to.equal('data:image/svg+xml;charset=utf-8,<svg height="200px" width="100px" xmlns="http://www.w3.org/2000/svg" version="1.1"/>');
+    expect(div.children[0].children[0].src).to.equal(
+      'data:image/svg+xml;charset=utf-8,<svg height="200px" width="100px" xmlns="http://www.w3.org/2000/svg" version="1.1"/>'
+    );
   });
 
   it('layout=fill', () => {
@@ -433,12 +464,13 @@ describe('Layout', () => {
 
   it('layout=unknown', () => {
     div.setAttribute('layout', 'foo');
-    allowConsoleError(() => { expect(function() {
-      applyStaticLayout(div);
-    }).to.throw(/Unknown layout: foo/); });
+    allowConsoleError(() => {
+      expect(function() {
+        applyStaticLayout(div);
+      }).to.throw(/Unknown layout: foo/);
+    });
   });
 
-
   it('should configure natural dimensions; default layout', () => {
     const pixel = document.createElement('amp-pixel');
     expect(applyStaticLayout(pixel)).to.equal(Layout.FIXED);
@@ -501,9 +533,11 @@ describe('Layout', () => {
     // Width=X is invalid.
     pixel.setAttribute('width', 'X');
     pixel.setAttribute('height', '1px');
-    allowConsoleError(() => { expect(() => {
-      applyStaticLayout(pixel);
-    }).to.throw(/Invalid width value/); });
+    allowConsoleError(() => {
+      expect(() => {
+        applyStaticLayout(pixel);
+      }).to.throw(/Invalid width value/);
+    });
   });
 
   it('should fail invalid height', () => {
@@ -511,9 +545,11 @@ describe('Layout', () => {
     // Height=X is invalid.
     pixel.setAttribute('width', '1px');
     pixel.setAttribute('height', 'X');
-    allowConsoleError(() => { expect(() => {
-      applyStaticLayout(pixel);
-    }).to.throw(/Invalid height value/); });
+    allowConsoleError(() => {
+      expect(() => {
+        applyStaticLayout(pixel);
+      }).to.throw(/Invalid height value/);
+    });
   });
 
   it('should trust server layout', () => {
diff --git a/test/unit/test-localization.js b/test/unit/test-localization.js
index ca5d1b02dd4e..3f7fcc235952 100644
--- a/test/unit/test-localization.js
+++ b/test/unit/test-localization.js
@@ -29,28 +29,32 @@ describes.fakeWin('localization', {}, env => {
       // Transform string IDs from a map of keys to values to a multimap of
       // values to a list of keys that have that value.
       const localizedStringIdKeys = Object.keys(LocalizedStringId);
-      const valuesToKeys = localizedStringIdKeys
-          .reduce((freq, LocalizedStringIdKey) => {
-            const LocalizedStringIdValue =
-                LocalizedStringId[LocalizedStringIdKey];
-            if (!freq[LocalizedStringIdValue]) {
-              freq[LocalizedStringIdValue] = [];
-            }
-
-            freq[LocalizedStringIdValue].push(LocalizedStringIdKey);
-            return freq;
-          }, {});
+      const valuesToKeys = localizedStringIdKeys.reduce(
+        (freq, LocalizedStringIdKey) => {
+          const LocalizedStringIdValue =
+            LocalizedStringId[LocalizedStringIdKey];
+          if (!freq[LocalizedStringIdValue]) {
+            freq[LocalizedStringIdValue] = [];
+          }
+
+          freq[LocalizedStringIdValue].push(LocalizedStringIdKey);
+          return freq;
+        },
+        {}
+      );
 
       // Assert that each of the lists of keys from the created multimap has
       // exactly one value.
       const localizedStringIdValues = Object.keys(valuesToKeys);
       localizedStringIdValues.forEach(value => {
         const keys = valuesToKeys[value];
-        expect(keys, `${value} is never used in a localized string ID`)
-            .to.not.be.empty;
-        expect(keys).to.have
-            .lengthOf(1, `${value} is used as a value for more than one ` +
-                `localized string ID: ${keys}`);
+        expect(keys, `${value} is never used in a localized string ID`).to.not
+          .be.empty;
+        expect(keys).to.have.lengthOf(
+          1,
+          `${value} is used as a value for more than one ` +
+            `localized string ID: ${keys}`
+        );
       });
     });
   });
@@ -64,8 +68,9 @@ describes.fakeWin('localization', {}, env => {
         },
       });
 
-      expect(localizationService.getLocalizedString('test_string_id'))
-          .to.equal('test string content');
+      expect(localizationService.getLocalizedString('test_string_id')).to.equal(
+        'test string content'
+      );
     });
 
     it('should utilize fallback if string is missing', () => {
@@ -76,8 +81,9 @@ describes.fakeWin('localization', {}, env => {
         },
       });
 
-      expect(localizationService.getLocalizedString('test_string_id'))
-          .to.equal('test fallback content');
+      expect(localizationService.getLocalizedString('test_string_id')).to.equal(
+        'test fallback content'
+      );
     });
 
     it('should not utilize fallback if string is present', () => {
@@ -89,13 +95,18 @@ describes.fakeWin('localization', {}, env => {
         },
       });
 
-      expect(localizationService.getLocalizedString('test_string_id'))
-          .to.equal('test string content');
+      expect(localizationService.getLocalizedString('test_string_id')).to.equal(
+        'test string content'
+      );
     });
 
     it('should have language fallbacks', () => {
-      expect(getLanguageCodesFromString('de-hi-1')).to
-          .deep.equal(['de-hi-1', 'de-hi', 'de', 'default']);
+      expect(getLanguageCodesFromString('de-hi-1')).to.deep.equal([
+        'de-hi-1',
+        'de-hi',
+        'de',
+        'default',
+      ]);
     });
 
     it('should default to English', () => {
@@ -108,8 +119,10 @@ describes.fakeWin('localization', {}, env => {
       const originalStringBundle = {
         'test_string_id': {string: 'foo'},
       };
-      const pseudoLocaleBundle = createPseudoLocale(originalStringBundle,
-          s => `${s} ${s}`);
+      const pseudoLocaleBundle = createPseudoLocale(
+        originalStringBundle,
+        s => `${s} ${s}`
+      );
 
       expect(pseudoLocaleBundle['test_string_id'].string).to.equal('foo foo');
     });
@@ -122,11 +135,14 @@ describes.fakeWin('localization', {}, env => {
         'msg_id_4': {string: 'msg4'},
         'msg_id_5': {string: 'msg5'},
       };
-      const pseudoLocaleBundle = createPseudoLocale(originalStringBundle,
-          s => `${s} ${s}`);
-
-      expect(Object.keys(originalStringBundle)).to
-          .deep.equal(Object.keys(pseudoLocaleBundle));
+      const pseudoLocaleBundle = createPseudoLocale(
+        originalStringBundle,
+        s => `${s} ${s}`
+      );
+
+      expect(Object.keys(originalStringBundle)).to.deep.equal(
+        Object.keys(pseudoLocaleBundle)
+      );
     });
   });
 });
diff --git a/test/unit/test-log.js b/test/unit/test-log.js
index 7384c256a9c6..78ecdb20e3de 100644
--- a/test/unit/test-log.js
+++ b/test/unit/test-log.js
@@ -30,7 +30,6 @@ import {
 } from '../../src/log';
 
 describe('Logging', () => {
-
   const RETURNS_FINE = () => LogLevel.FINE;
   const RETURNS_INFO = () => LogLevel.INFO;
   const RETURNS_WARN = () => LogLevel.WARN;
@@ -68,7 +67,6 @@ describe('Logging', () => {
   });
 
   describe('Level', () => {
-
     it('should be enabled when directly allowed', () => {
       expect(new Log(win, RETURNS_FINE).level_).to.equal(LogLevel.FINE);
     });
@@ -228,7 +226,6 @@ describe('Logging', () => {
   });
 
   describe('UserLog', () => {
-
     it('should be WARN by default', () => {
       expect(user().levelFunc_(mode)).to.equal(LogLevel.WARN);
     });
@@ -260,7 +257,6 @@ describe('Logging', () => {
   });
 
   describe('DevLog', () => {
-
     it('should be disabled by default', () => {
       expect(dev().levelFunc_(mode)).to.equal(LogLevel.OFF);
     });
@@ -291,7 +287,6 @@ describe('Logging', () => {
   });
 
   describe('asserts', () => {
-
     let log;
 
     beforeEach(() => {
@@ -536,7 +531,6 @@ describe('Logging', () => {
   });
 
   describe('assertEnumValue', () => {
-
     let log;
 
     beforeEach(() => {
@@ -552,15 +546,18 @@ describe('Logging', () => {
     it('should fail with unknown enum value', () => {
       const enum1 = {a: 'value1', b: 'value2'};
       expect(() => log.assertEnumValue(enum1, 'value3')).to.throw(
-          'Unknown enum value: "value3"');
+        'Unknown enum value: "value3"'
+      );
       expect(() => log.assertEnumValue(enum1, 'value3', 'MyEnum')).to.throw(
-          'Unknown MyEnum value: "value3"');
+        'Unknown MyEnum value: "value3"'
+      );
     });
 
     it('should fail with values of different case', () => {
       const enum1 = {a: 'value1', b: 'value2'};
       expect(() => log.assertEnumValue(enum1, 'VALUE1')).to.throw(
-          'Unknown enum value: "VALUE1"');
+        'Unknown enum value: "VALUE1"'
+      );
     });
   });
 
@@ -581,10 +578,8 @@ describe('Logging', () => {
     });
 
     it('should fail with non-array values', () => {
-      expect(() => log.assertArray('a')).to.throw(
-          'Array expected: a');
-      expect(() => log.assertArray(1)).to.throw(
-          'Array expected: 1');
+      expect(() => log.assertArray('a')).to.throw('Array expected: a');
+      expect(() => log.assertArray(1)).to.throw('Array expected: 1');
     });
   });
 
@@ -778,4 +773,3 @@ describe('Logging', () => {
     });
   });
 });
-
diff --git a/test/unit/test-mediasession-helper.js b/test/unit/test-mediasession-helper.js
index f1105a5e03af..8f7d1b1c55f9 100644
--- a/test/unit/test-mediasession-helper.js
+++ b/test/unit/test-mediasession-helper.js
@@ -55,7 +55,6 @@ const schemaTemplate = `
 }
 `;
 
-
 describes.sandboxed('MediaSessionAPI Helper Functions', {}, () => {
   let element;
   let ampdoc;
@@ -66,8 +65,10 @@ describes.sandboxed('MediaSessionAPI Helper Functions', {}, () => {
 
   beforeEach(() => {
     element = {};
-    sandbox.stub(Services, 'urlForDoc')
-        .withArgs(element).returns({isProtocolValid});
+    sandbox
+      .stub(Services, 'urlForDoc')
+      .withArgs(element)
+      .returns({isProtocolValid});
 
     head = document.querySelector('head');
     // Favicon
@@ -96,8 +97,7 @@ describes.sandboxed('MediaSessionAPI Helper Functions', {}, () => {
               'artwork': [],
               'title': '',
             },
-            'setActionHandler': () => {
-            },
+            'setActionHandler': () => {},
           },
         },
         'MediaMetadata': Object,
@@ -112,15 +112,21 @@ describes.sandboxed('MediaSessionAPI Helper Functions', {}, () => {
   });
 
   it('should parse the schema and find the image', () => {
-    expect(parseSchemaImage(ampdoc.win.document)).to.equal('http://example.com/image.png');
+    expect(parseSchemaImage(ampdoc.win.document)).to.equal(
+      'http://example.com/image.png'
+    );
   });
 
   it('should parse the og-image', () => {
-    expect(parseOgImage(ampdoc.win.document)).to.equal('http://example.com/og-image.png');
+    expect(parseOgImage(ampdoc.win.document)).to.equal(
+      'http://example.com/og-image.png'
+    );
   });
 
   it('should parse the favicon', () => {
-    expect(parseFavicon(ampdoc.win.document)).to.equal('http://example.com/favicon.ico');
+    expect(parseFavicon(ampdoc.win.document)).to.equal(
+      'http://example.com/favicon.ico'
+    );
   });
 
   it('should set the media session', () => {
@@ -133,9 +139,7 @@ describes.sandboxed('MediaSessionAPI Helper Functions', {}, () => {
     const fakeMetaData = {
       'artist': 'Some artist',
       'album': 'Some album',
-      'artwork': [
-        'http://example.com/image.png',
-      ],
+      'artwork': ['http://example.com/image.png'],
       'title': 'Some title',
     };
     setMediaSession(element, ampdoc.win, fakeMetaData);
diff --git a/test/unit/test-mode.js b/test/unit/test-mode.js
index cecb9041581f..db60eae60801 100644
--- a/test/unit/test-mode.js
+++ b/test/unit/test-mode.js
@@ -30,13 +30,15 @@ describe('getMode', () => {
   }
 
   it('CDN - lite mode on', () => {
-    const url = 'https://cdn.ampproject.org/v/www.example.com/amp.html?amp_js_v=5&amp_lite#origin=https://www.google.com';
+    const url =
+      'https://cdn.ampproject.org/v/www.example.com/amp.html?amp_js_v=5&amp_lite#origin=https://www.google.com';
     const mode = getMode(getWin(url));
     expect(mode.lite).to.be.true;
   });
 
   it('CDN - lite mode off', () => {
-    const url = 'https://cdn.ampproject.org/v/www.example.com/amp.html?amp_js_v=5#origin=https://www.google.com';
+    const url =
+      'https://cdn.ampproject.org/v/www.example.com/amp.html?amp_js_v=5#origin=https://www.google.com';
     const mode = getMode(getWin(url));
     expect(mode.lite).to.be.false;
   });
@@ -66,10 +68,12 @@ describe('getRtvVersion', () => {
 
   it('should default to version', () => {
     // $internalRuntimeVersion$ doesn't get replaced during test
-    expect(getRtvVersionForTesting(window, true))
-        .to.equal('$internalRuntimeVersion$');
-    expect(getRtvVersionForTesting(window, false))
-        .to.equal('01$internalRuntimeVersion$');
+    expect(getRtvVersionForTesting(window, true)).to.equal(
+      '$internalRuntimeVersion$'
+    );
+    expect(getRtvVersionForTesting(window, false)).to.equal(
+      '01$internalRuntimeVersion$'
+    );
   });
 
   it('should use window.AMP_CONFIG.v if not in dev mode', () => {
@@ -79,16 +83,18 @@ describe('getRtvVersion', () => {
       },
       location: parseUrlDeprecated('https://acme.org/doc1'),
     };
-    expect(getRtvVersionForTesting(win, true))
-        .to.equal('$internalRuntimeVersion$');
+    expect(getRtvVersionForTesting(win, true)).to.equal(
+      '$internalRuntimeVersion$'
+    );
     expect(getRtvVersionForTesting(win, false)).to.equal('12345');
     expect(getFreshMode(win).version).to.equal('$internalRuntimeVersion$');
     resetRtvVersionForTesting();
     expect(getFreshMode(win).rtvVersion).to.equal('12345');
 
     delete win.AMP_CONFIG;
-    expect(getRtvVersionForTesting(win, false))
-        .to.equal('01$internalRuntimeVersion$');
+    expect(getRtvVersionForTesting(win, false)).to.equal(
+      '01$internalRuntimeVersion$'
+    );
     expect(getFreshMode(win).version).to.equal('$internalRuntimeVersion$');
     resetRtvVersionForTesting();
     expect(getFreshMode(win).rtvVersion).to.equal('01$internalRuntimeVersion$');
diff --git a/test/unit/test-motion.js b/test/unit/test-motion.js
index 8fc745c5d296..25cbcfc86e7f 100644
--- a/test/unit/test-motion.js
+++ b/test/unit/test-motion.js
@@ -16,9 +16,7 @@
 
 import {calcVelocity, continueMotion} from '../../src/motion';
 
-
 describe('Motion calcVelocity', () => {
-
   it('should dampen velocity when prevVelocity is 0', () => {
     expect(calcVelocity(200, 10, 0)).to.be.closeTo(15.999, 1e-3);
   });
@@ -52,7 +50,6 @@ describe('Motion calcVelocity', () => {
   });
 });
 
-
 describe('Motion continueMotion', () => {
   let sandbox;
   let clock;
@@ -80,14 +77,19 @@ describe('Motion continueMotion', () => {
   function testContinuation(maxVelocity, haltAfterTime) {
     let resultX = null;
     let resultY = null;
-    const motion = continueMotion(contextNode,
-        141, 104, maxVelocity, maxVelocity,
-        (x, y) => {
-          resultX = x;
-          resultY = y;
-          return true;
-        },
-        vsync);
+    const motion = continueMotion(
+      contextNode,
+      141,
+      104,
+      maxVelocity,
+      maxVelocity,
+      (x, y) => {
+        resultX = x;
+        resultY = y;
+        return true;
+      },
+      vsync
+    );
 
     expect(vsyncTasks.length).to.equal(1);
     const mutator = vsyncTasks[0];
diff --git a/test/unit/test-mustache.js b/test/unit/test-mustache.js
index f4b6b72c80e8..42a7f60207d8 100644
--- a/test/unit/test-mustache.js
+++ b/test/unit/test-mustache.js
@@ -16,9 +16,7 @@
 
 import mustache from '../../third_party/mustache/mustache';
 
-
 describe('Mustache', () => {
-
   let savedSanitizer;
 
   beforeEach(() => {
@@ -34,12 +32,14 @@ describe('Mustache', () => {
 
   it('should escape html', () => {
     expect(mustache.render('{{value}}', {value: '<b>abc</b>'})).to.equal(
-        '&lt;b&gt;abc&lt;&#x2F;b&gt;');
+      '&lt;b&gt;abc&lt;&#x2F;b&gt;'
+    );
   });
 
   it('should transform unescaped html', () => {
     expect(mustache.render('{{{value}}}', {value: '<b>abc</b>'})).to.equal(
-        '<B>ABC</B>');
+      '<B>ABC</B>'
+    );
   });
 
   it('should only expand own properties', () => {
@@ -64,17 +64,19 @@ describe('Mustache', () => {
         'x': [],
       },
     };
-    expect(mustache.render(
-        '{{#t}}{{x.pop}}X{{x.pop}}{{/t}}' +
-        '{{#t}}{{0}}Y{{1}}{{/t}}',
-        obj)).to.equal('X0Y1');
+    expect(
+      mustache.render(
+        '{{#t}}{{x.pop}}X{{x.pop}}{{/t}}{{#t}}{{0}}Y{{1}}{{/t}}',
+        obj
+      )
+    ).to.equal('X0Y1');
   });
 
   it('should NOT allow delimiter substituion', () => {
-    expect(mustache.render(
-        '{{value}}' +
-        '{{=<% %>=}}' +
-        '<% value %>',
-        {value: 'abc'})).to.equal('abc<% value %>');
+    expect(
+      mustache.render('{{value}}{{=<% %>=}}<% value %>', {
+        value: 'abc',
+      })
+    ).to.equal('abc<% value %>');
   });
 });
diff --git a/test/unit/test-navigation.js b/test/unit/test-navigation.js
index d02d6dc6a4af..c15561ebcfec 100644
--- a/test/unit/test-navigation.js
+++ b/test/unit/test-navigation.js
@@ -18,9 +18,7 @@ import * as Impression from '../../src/impression';
 import {Services} from '../../src/services';
 import {addParamToUrl} from '../../src/url';
 import {createElementWithAttributes} from '../../src/dom';
-import {
-  installUrlReplacementsServiceForDoc,
-} from '../../src/service/url-replacements-impl';
+import {installUrlReplacementsServiceForDoc} from '../../src/service/url-replacements-impl';
 import {macroTask} from '../../testing/yield';
 import {maybeExpandUrlParamsForTesting} from '../../src/service/navigation';
 
@@ -38,711 +36,758 @@ describes.sandboxed('Navigation', {}, () => {
     };
   });
 
-  describes.fakeWin('non-embed', {
-    win: {
-      location: 'https://www.google.com/some-path?hello=world#link',
+  describes.fakeWin(
+    'non-embed',
+    {
+      win: {
+        location: 'https://www.google.com/some-path?hello=world#link',
+      },
+      amp: true,
     },
-    amp: true,
-  }, env => {
-    let win, doc;
-    let handler;
-    let decorationSpy;
-    let handleNavSpy;
-    let handleCustomProtocolSpy;
-    let winOpenStub;
-    let scrollIntoViewStub;
-    let replaceStateForTargetStub;
-    let replaceStateForTargetPromise;
-    let anchor;
-    let elementWithId;
-    let anchorWithName;
-
-    beforeEach(() => {
-      win = env.win;
-      doc = win.document;
-      const {documentElement} = doc;
-
-      handler = Services.navigationForDoc(doc);
-      handler.isIframed_ = true;
-
-      decorationSpy = sandbox.spy(Impression, 'getExtraParamsUrl');
-
-      handleNavSpy = sandbox.spy(handler, 'handleNavClick_');
-
-      handleCustomProtocolSpy = sandbox.spy(handler,
-          'handleCustomProtocolClick_');
-
-      win.open = function() {};
-      winOpenStub = sandbox.stub(win, 'open').callsFake(() => {
-        return {};
-      });
+    env => {
+      let win, doc;
+      let handler;
+      let decorationSpy;
+      let handleNavSpy;
+      let handleCustomProtocolSpy;
+      let winOpenStub;
+      let scrollIntoViewStub;
+      let replaceStateForTargetStub;
+      let replaceStateForTargetPromise;
+      let anchor;
+      let elementWithId;
+      let anchorWithName;
 
-      const viewport = Services.viewportForDoc(doc);
-      scrollIntoViewStub = sandbox.stub(viewport, 'scrollIntoView');
+      beforeEach(() => {
+        win = env.win;
+        doc = win.document;
+        const {documentElement} = doc;
 
-      const history = Services.historyForDoc(doc);
-      replaceStateForTargetPromise = Promise.resolve();
-      replaceStateForTargetStub = sandbox.stub(
-          history, 'replaceStateForTarget').callsFake(
-          () => replaceStateForTargetPromise);
+        handler = Services.navigationForDoc(doc);
+        handler.isIframed_ = true;
 
-      anchor = doc.createElement('a');
-      anchor.href = 'https://www.google.com/other';
-      doc.body.appendChild(anchor);
-      event.target = anchor;
+        decorationSpy = sandbox.spy(Impression, 'getExtraParamsUrl');
 
-      const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      sandbox.stub(Services, 'urlReplacementsForDoc')
-          .withArgs(anchor).returns(urlReplacements);
+        handleNavSpy = sandbox.spy(handler, 'handleNavClick_');
 
-      elementWithId = doc.createElement('div');
-      elementWithId.id = 'test';
-      doc.body.appendChild(elementWithId);
+        handleCustomProtocolSpy = sandbox.spy(
+          handler,
+          'handleCustomProtocolClick_'
+        );
 
-      anchorWithName = doc.createElement('a');
-      anchorWithName.setAttribute('name', 'test2');
-      doc.body.appendChild(anchorWithName);
-    });
+        win.open = function() {};
+        winOpenStub = sandbox.stub(win, 'open').callsFake(() => {
+          return {};
+        });
 
-    describe('discovery', () => {
-      it('should select a direct link', () => {
-        handler.handle_(event);
-        expect(handleNavSpy).to.be.calledOnce;
-        expect(handleNavSpy).to.be.calledWith(event, anchor);
-        expect(handleCustomProtocolSpy).to.be.calledOnce;
-        expect(handleCustomProtocolSpy).to.be.calledWith(event, anchor);
-      });
+        const viewport = Services.viewportForDoc(doc);
+        scrollIntoViewStub = sandbox.stub(viewport, 'scrollIntoView');
 
-      it('should NOT handle custom protocol when not iframed', () => {
-        handler.isIframed_ = false;
-        handler.handle_(event);
-        expect(handleCustomProtocolSpy).to.be.calledOnce;
-        expect(handleCustomProtocolSpy).to.have.returned(false);
-      });
+        const history = Services.historyForDoc(doc);
+        replaceStateForTargetPromise = Promise.resolve();
+        replaceStateForTargetStub = sandbox
+          .stub(history, 'replaceStateForTarget')
+          .callsFake(() => replaceStateForTargetPromise);
 
-      it('should discover a link from a nested target', () => {
-        const target = doc.createElement('span');
-        anchor.appendChild(target);
-        event.target = target;
-        handler.handle_(event);
-        expect(handleNavSpy).to.be.calledOnce;
-        expect(handleNavSpy).to.be.calledWith(event, anchor);
-        expect(handleCustomProtocolSpy).to.be.calledOnce;
-        expect(handleCustomProtocolSpy).to.be.calledWith(event, anchor);
-      });
+        anchor = doc.createElement('a');
+        anchor.href = 'https://www.google.com/other';
+        doc.body.appendChild(anchor);
+        event.target = anchor;
 
-      it('should NOT proceed if event is cancelled', () => {
-        event.preventDefault();
-        handler.handle_(event);
-        expect(handleNavSpy).to.not.be.called;
-        expect(handleCustomProtocolSpy).to.not.be.called;
-      });
+        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
+        sandbox
+          .stub(Services, 'urlReplacementsForDoc')
+          .withArgs(anchor)
+          .returns(urlReplacements);
 
-      it('should ignore a target without link', () => {
-        const target = doc.createElement('span');
-        doc.body.appendChild(target);
-        event.target = target;
-        handler.handle_(event);
-        expect(handleNavSpy).to.not.be.called;
-        expect(handleCustomProtocolSpy).to.not.be.called;
-      });
+        elementWithId = doc.createElement('div');
+        elementWithId.id = 'test';
+        doc.body.appendChild(elementWithId);
 
-      it('should ignore a link without href', () => {
-        anchor.removeAttribute('href');
-        handler.handle_(event);
-        expect(handleNavSpy).to.not.be.called;
-        expect(handleCustomProtocolSpy).to.not.be.called;
+        anchorWithName = doc.createElement('a');
+        anchorWithName.setAttribute('name', 'test2');
+        doc.body.appendChild(anchorWithName);
       });
-    });
 
-    describe('anchor mutators', () => {
-      it('should throw error if priority is already in use', () => {
-        const priority = 10;
-        handler.registerAnchorMutator(element => {
-          element.href += '?am=1';
-        }, priority);
-        allowConsoleError(() => {
-          expect(() => handler.registerAnchorMutator(element => {
-            element.href += '?am=2';
-          }, priority)).to.not.throw();
+      describe('discovery', () => {
+        it('should select a direct link', () => {
+          handler.handle_(event);
+          expect(handleNavSpy).to.be.calledOnce;
+          expect(handleNavSpy).to.be.calledWith(event, anchor);
+          expect(handleCustomProtocolSpy).to.be.calledOnce;
+          expect(handleCustomProtocolSpy).to.be.calledWith(event, anchor);
         });
-      });
 
-      it('should execute in order', () => {
-        anchor.href = 'https://www.testing-1-2-3.org';
-        let transformedHref;
-        handler.registerAnchorMutator(element => {
-          element.href += '&second=2';
-          transformedHref = element.href;
-        }, 2);
-        handler.registerAnchorMutator(element => {
-          element.href += '&first=1';
-          transformedHref = element.href;
-        }, 1);
-        handler.registerAnchorMutator(element => {
-          element.href += '?third=3';
-          transformedHref = element.href;
-        }, 3);
-        // If using a same priority, the order of registration is respected.
-        handler.registerAnchorMutator(element => {
-          element.href += '&third=3-1';
-          transformedHref = element.href;
-        }, 3);
-        handler.handle_(event);
-        expect(transformedHref).to.equal(
-            'https://www.testing-1-2-3.org/?third=3&third=3-1&second=2'
-            + '&first=1');
-      });
+        it('should NOT handle custom protocol when not iframed', () => {
+          handler.isIframed_ = false;
+          handler.handle_(event);
+          expect(handleCustomProtocolSpy).to.be.calledOnce;
+          expect(handleCustomProtocolSpy).to.have.returned(false);
+        });
 
-      it('verify order of operations', () => {
-        const expandVars = sandbox.spy(handler, 'expandVarsForAnchor_');
-        const parseUrl = sandbox.spy(handler, 'parseUrl_');
-        const obj = {
-          callback: () => {
-          },
-        };
-        const linkRuleSpy = sandbox.spy(obj, 'callback');
-        handler.registerAnchorMutator(linkRuleSpy, 1);
-        handler.handle_(event);
-        // Verify that the expansion of variables occurs first
-        // followed by the anchor transformation and then the parsing
-        // of the possibly mutated anchor href into the location object
-        // for navigation.handleNavClick.
-        sinon.assert.callOrder(expandVars, linkRuleSpy, parseUrl);
-        expect(expandVars).to.be.calledOnce;
-        // Verify that parseUrl is called once when the variables are
-        // expanded, then after the anchor mutators and then once more
-        // in handleNavClick
-        expect(parseUrl).to.be.calledThrice;
-      });
-    });
+        it('should discover a link from a nested target', () => {
+          const target = doc.createElement('span');
+          anchor.appendChild(target);
+          event.target = target;
+          handler.handle_(event);
+          expect(handleNavSpy).to.be.calledOnce;
+          expect(handleNavSpy).to.be.calledWith(event, anchor);
+          expect(handleCustomProtocolSpy).to.be.calledOnce;
+          expect(handleCustomProtocolSpy).to.be.calledWith(event, anchor);
+        });
 
-    describe('link expansion', () => {
-      it('should expand a link', () => {
-        anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
-        anchor.setAttribute('data-amp-replace', 'QUERY_PARAM');
-        handler.handle_(event);
-        expect(anchor.href).to.equal('https://www.google.com/link?out=world');
-        expect(handleNavSpy).to.be.calledOnce;
-      });
+        it('should NOT proceed if event is cancelled', () => {
+          event.preventDefault();
+          handler.handle_(event);
+          expect(handleNavSpy).to.not.be.called;
+          expect(handleCustomProtocolSpy).to.not.be.called;
+        });
 
-      it('should only expand with whitelist', () => {
-        anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/link?out=QUERY_PARAM(hello)');
-        expect(handleNavSpy).to.be.calledOnce;
-      });
+        it('should ignore a target without link', () => {
+          const target = doc.createElement('span');
+          doc.body.appendChild(target);
+          event.target = target;
+          handler.handle_(event);
+          expect(handleNavSpy).to.not.be.called;
+          expect(handleCustomProtocolSpy).to.not.be.called;
+        });
 
-      it('should expand link if event type is right click', () => {
-        anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
-        anchor.setAttribute('data-amp-replace', 'QUERY_PARAM');
-        event.type = 'contextmenu';
-        handler.handle_(event);
-        expect(anchor.href).to.equal('https://www.google.com/link?out=world');
+        it('should ignore a link without href', () => {
+          anchor.removeAttribute('href');
+          handler.handle_(event);
+          expect(handleNavSpy).to.not.be.called;
+          expect(handleCustomProtocolSpy).to.not.be.called;
+        });
       });
-    });
 
-    describe('link decoration', () => {
-      let originLocation;
-      let test1Url;
-      let test2Url;
-      beforeEach(() => {
-        // set canonical url;
-        handler.isEmbed_ = false;
-        handler.appendExtraParams_ = true;
-        originLocation = win.location.href;
-        test1Url = addParamToUrl(originLocation, 'gclid', '123');
-        test2Url = addParamToUrl(test1Url, 'gclsrc', 'abcd');
-        const ga = win.document.createElement('amp-analytics');
-        ga.setAttribute('type', 'googleanalytics');
-        win.document.body.appendChild(ga);
-      });
+      describe('anchor mutators', () => {
+        it('should throw error if priority is already in use', () => {
+          const priority = 10;
+          handler.registerAnchorMutator(element => {
+            element.href += '?am=1';
+          }, priority);
+          allowConsoleError(() => {
+            expect(() =>
+              handler.registerAnchorMutator(element => {
+                element.href += '?am=2';
+              }, priority)
+            ).to.not.throw();
+          });
+        });
 
-      afterEach(() => {
-        win.location.href = originLocation;
-      });
+        it('should execute in order', () => {
+          anchor.href = 'https://www.testing-1-2-3.org';
+          let transformedHref;
+          handler.registerAnchorMutator(element => {
+            element.href += '&second=2';
+            transformedHref = element.href;
+          }, 2);
+          handler.registerAnchorMutator(element => {
+            element.href += '&first=1';
+            transformedHref = element.href;
+          }, 1);
+          handler.registerAnchorMutator(element => {
+            element.href += '?third=3';
+            transformedHref = element.href;
+          }, 3);
+          // If using a same priority, the order of registration is respected.
+          handler.registerAnchorMutator(element => {
+            element.href += '&third=3-1';
+            transformedHref = element.href;
+          }, 3);
+          handler.handle_(event);
+          expect(transformedHref).to.equal(
+            'https://www.testing-1-2-3.org/?third=3&third=3-1&second=2' +
+              '&first=1'
+          );
+        });
 
-      it('should decorate for page w/ ga tag', function* () {
-        handler.isEmbed_ = false;
-        yield macroTask();
-        handler.handle_(event);
-        expect(decorationSpy).to.be.calledOnce;
+        it('verify order of operations', () => {
+          const expandVars = sandbox.spy(handler, 'expandVarsForAnchor_');
+          const parseUrl = sandbox.spy(handler, 'parseUrl_');
+          const obj = {
+            callback: () => {},
+          };
+          const linkRuleSpy = sandbox.spy(obj, 'callback');
+          handler.registerAnchorMutator(linkRuleSpy, 1);
+          handler.handle_(event);
+          // Verify that the expansion of variables occurs first
+          // followed by the anchor transformation and then the parsing
+          // of the possibly mutated anchor href into the location object
+          // for navigation.handleNavClick.
+          sinon.assert.callOrder(expandVars, linkRuleSpy, parseUrl);
+          expect(expandVars).to.be.calledOnce;
+          // Verify that parseUrl is called once when the variables are
+          // expanded, then after the anchor mutators and then once more
+          // in handleNavClick
+          expect(parseUrl).to.be.calledThrice;
+        });
       });
 
-      it('should not decorate for page w/o ga tag', function* () {
-        handler.isEmbed_ = false;
-        const ga = win.document.getElementsByTagName('amp-analytics');
-        ga[0].parentNode.removeChild(ga[0]);
-        yield macroTask();
-        handler.handle_(event);
-        expect(decorationSpy).to.not.be.called;
-      });
+      describe('link expansion', () => {
+        it('should expand a link', () => {
+          anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
+          anchor.setAttribute('data-amp-replace', 'QUERY_PARAM');
+          handler.handle_(event);
+          expect(anchor.href).to.equal('https://www.google.com/link?out=world');
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-      it('should not decorate for embed', () => {
-        handler.isEmbed_ = true;
-        handler.handle_(event);
-        expect(decorationSpy).to.not.be.called;
-      });
+        it('should only expand with whitelist', () => {
+          anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
+          handler.handle_(event);
+          expect(anchor.href).to.equal(
+            'https://www.google.com/link?out=QUERY_PARAM(hello)'
+          );
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-      it('should only decorate w/ params exists in sourceUrl', () => {
-        win.location.href = test1Url;
-        handler.handle_(event);
-        expect(decorationSpy).to.be.called;
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other?gclid=123');
-        expect(handleNavSpy).to.be.calledOnce;
+        it('should expand link if event type is right click', () => {
+          anchor.href = 'https://www.google.com/link?out=QUERY_PARAM(hello)';
+          anchor.setAttribute('data-amp-replace', 'QUERY_PARAM');
+          event.type = 'contextmenu';
+          handler.handle_(event);
+          expect(anchor.href).to.equal('https://www.google.com/link?out=world');
+        });
       });
 
-      it('should append gclid and gclsrc to outgoing link', () => {
-        win.location.href = test2Url;
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other?gclid=123&gclsrc=abcd');
-        expect(handleNavSpy).to.be.calledOnce;
-      });
+      describe('link decoration', () => {
+        let originLocation;
+        let test1Url;
+        let test2Url;
+        beforeEach(() => {
+          // set canonical url;
+          handler.isEmbed_ = false;
+          handler.appendExtraParams_ = true;
+          originLocation = win.location.href;
+          test1Url = addParamToUrl(originLocation, 'gclid', '123');
+          test2Url = addParamToUrl(test1Url, 'gclsrc', 'abcd');
+          const ga = win.document.createElement('amp-analytics');
+          ga.setAttribute('type', 'googleanalytics');
+          win.document.body.appendChild(ga);
+        });
 
-      it('should respect params in outgoing link', () => {
-        anchor.href = 'https://www.google.com/other?gclid=456';
-        win.location.href = test2Url;
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other?gclid=456&gclsrc=abcd');
-        expect(handleNavSpy).to.be.calledOnce;
-      });
+        afterEach(() => {
+          win.location.href = originLocation;
+        });
 
-      it('should repsect data-amp-addparams', () => {
-        anchor.setAttribute('data-amp-addparams', 'gclsrc=test');
-        win.location.href = test2Url;
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other?gclsrc=test&gclid=123');
-        expect(handleNavSpy).to.be.calledOnce;
-      });
+        it('should decorate for page w/ ga tag', function*() {
+          handler.isEmbed_ = false;
+          yield macroTask();
+          handler.handle_(event);
+          expect(decorationSpy).to.be.calledOnce;
+        });
 
-      it('should respect async gclid and gclsrc assignment', () => {
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other');
-        expect(handleNavSpy).to.be.calledOnce;
-        win.location.href = test2Url;
-        handler.handle_(event);
-        expect(anchor.href).to.equal(
-            'https://www.google.com/other?gclid=123&gclsrc=abcd');
-        expect(handleNavSpy).to.be.calledTwice;
-      });
-    });
+        it('should not decorate for page w/o ga tag', function*() {
+          handler.isEmbed_ = false;
+          const ga = win.document.getElementsByTagName('amp-analytics');
+          ga[0].parentNode.removeChild(ga[0]);
+          yield macroTask();
+          handler.handle_(event);
+          expect(decorationSpy).to.not.be.called;
+        });
 
-    describe('when linking to ftp: protocol', () => {
-      beforeEach(() => {
-        anchor.href = 'ftp://example.com/a';
-      });
+        it('should not decorate for embed', () => {
+          handler.isEmbed_ = true;
+          handler.handle_(event);
+          expect(decorationSpy).to.not.be.called;
+        });
 
-      it('should always open in _blank when embedded', () => {
-        handler.handle_(event);
-        expect(winOpenStub).to.be.calledOnce;
-        expect(winOpenStub).to.be.calledWith('ftp://example.com/a', '_blank');
-        expect(event.defaultPrevented).to.be.true;
-      });
+        it('should only decorate w/ params exists in sourceUrl', () => {
+          win.location.href = test1Url;
+          handler.handle_(event);
+          expect(decorationSpy).to.be.called;
+          expect(anchor.href).to.equal(
+            'https://www.google.com/other?gclid=123'
+          );
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-      it('should not do anything not embedded', () => {
-        handler.isIframed_ = false;
-        handler.handle_(event);
-        expect(winOpenStub).to.not.be.called;
-        expect(winOpenStub).to.not.be.calledWith('ftp://example.com/a', '_blank');
-        expect(event.defaultPrevented).to.be.false;
-      });
-    });
+        it('should append gclid and gclsrc to outgoing link', () => {
+          win.location.href = test2Url;
+          handler.handle_(event);
+          expect(anchor.href).to.equal(
+            'https://www.google.com/other?gclid=123&gclsrc=abcd'
+          );
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-    describe('when linking to custom protocols e.g. whatsapp:', () => {
-      beforeEach(() => {
-        handler.isIosSafari_ = true;
-        anchor.href = 'whatsapp://send?text=hello';
-      });
+        it('should respect params in outgoing link', () => {
+          anchor.href = 'https://www.google.com/other?gclid=456';
+          win.location.href = test2Url;
+          handler.handle_(event);
+          expect(anchor.href).to.equal(
+            'https://www.google.com/other?gclid=456&gclsrc=abcd'
+          );
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-      it('should open link in _top on Safari iOS when embedded', () => {
-        handler.handle_(event);
-        expect(winOpenStub).to.be.calledOnce;
-        expect(winOpenStub.calledWith(
-            'whatsapp://send?text=hello', '_top')).to.be.true;
-        expect(event.defaultPrevented).to.be.true;
-      });
+        it('should repsect data-amp-addparams', () => {
+          anchor.setAttribute('data-amp-addparams', 'gclsrc=test');
+          win.location.href = test2Url;
+          handler.handle_(event);
+          expect(anchor.href).to.equal(
+            'https://www.google.com/other?gclsrc=test&gclid=123'
+          );
+          expect(handleNavSpy).to.be.calledOnce;
+        });
 
-      it('should not do anything on when not embedded', () => {
-        handler.isIframed_ = false;
-        handler.handle_(event);
-        expect(winOpenStub).to.not.be.called;
-        expect(winOpenStub).to.not.be.calledWith(
-            'whatsapp://send?text=hello', '_top');
-        expect(event.defaultPrevented).to.be.false;
+        it('should respect async gclid and gclsrc assignment', () => {
+          handler.handle_(event);
+          expect(anchor.href).to.equal('https://www.google.com/other');
+          expect(handleNavSpy).to.be.calledOnce;
+          win.location.href = test2Url;
+          handler.handle_(event);
+          expect(anchor.href).to.equal(
+            'https://www.google.com/other?gclid=123&gclsrc=abcd'
+          );
+          expect(handleNavSpy).to.be.calledTwice;
+        });
       });
 
-      it('should not do anything for mailto: protocol', () => {
-        anchor.href = 'mailto:hello@example.com';
-        handler.handle_(event);
-        expect(winOpenStub).to.not.be.called;
-        expect(event.defaultPrevented).to.be.false;
-      });
+      describe('when linking to ftp: protocol', () => {
+        beforeEach(() => {
+          anchor.href = 'ftp://example.com/a';
+        });
 
-      it('should not do anything on other non-safari iOS', () => {
-        handler.isIosSafari_ = false;
-        handler.handle_(event);
-        expect(winOpenStub).to.not.be.called;
-        expect(event.defaultPrevented).to.be.false;
-      });
+        it('should always open in _blank when embedded', () => {
+          handler.handle_(event);
+          expect(winOpenStub).to.be.calledOnce;
+          expect(winOpenStub).to.be.calledWith('ftp://example.com/a', '_blank');
+          expect(event.defaultPrevented).to.be.true;
+        });
 
-      it('should not do anything on other platforms', () => {
-        handler.isIosSafari_ = false;
-        handler.handle_(event);
-        expect(winOpenStub).to.not.be.called;
-        expect(event.defaultPrevented).to.be.false;
+        it('should not do anything not embedded', () => {
+          handler.isIframed_ = false;
+          handler.handle_(event);
+          expect(winOpenStub).to.not.be.called;
+          expect(winOpenStub).to.not.be.calledWith(
+            'ftp://example.com/a',
+            '_blank'
+          );
+          expect(event.defaultPrevented).to.be.false;
+        });
       });
-    });
 
-    describe('when linking to a different origin or path', () => {
-      it('should not do anything on path change', () => {
-        anchor.href = 'https://www.google.com/some-other-path';
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.false;
-        expect(winOpenStub).to.not.be.called;
-        expect(scrollIntoViewStub).to.not.be.called;
-        expect(anchor.getAttribute('target')).to.be.null;
-      });
+      describe('when linking to custom protocols e.g. whatsapp:', () => {
+        beforeEach(() => {
+          handler.isIosSafari_ = true;
+          anchor.href = 'whatsapp://send?text=hello';
+        });
 
-      it('should not do anything on origin change', () => {
-        anchor.href = 'https://maps.google.com/some-path#link';
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.false;
-        expect(winOpenStub).to.not.be.called;
-        expect(scrollIntoViewStub).to.not.be.called;
-        expect(anchor.getAttribute('target')).to.be.null;
-      });
+        it('should open link in _top on Safari iOS when embedded', () => {
+          handler.handle_(event);
+          expect(winOpenStub).to.be.calledOnce;
+          expect(winOpenStub.calledWith('whatsapp://send?text=hello', '_top'))
+            .to.be.true;
+          expect(event.defaultPrevented).to.be.true;
+        });
 
-      it('should not do anything when there is no hash', () => {
-        anchor.href = 'https://www.google.com/some-path';
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.false;
-        expect(winOpenStub).to.not.be.called;
-        expect(scrollIntoViewStub).to.not.be.called;
-        expect(anchor.getAttribute('target')).to.be.null;
-      });
+        it('should not do anything on when not embedded', () => {
+          handler.isIframed_ = false;
+          handler.handle_(event);
+          expect(winOpenStub).to.not.be.called;
+          expect(winOpenStub).to.not.be.calledWith(
+            'whatsapp://send?text=hello',
+            '_top'
+          );
+          expect(event.defaultPrevented).to.be.false;
+        });
 
-      it('should not do anything on a query change', () => {
-        anchor.href = 'https://www.google.com/some-path?hello=foo#link';
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.false;
-        expect(winOpenStub).to.not.be.called;
-        expect(scrollIntoViewStub).to.not.be.called;
-        expect(anchor.getAttribute('target')).to.be.null;
-      });
-    });
+        it('should not do anything for mailto: protocol', () => {
+          anchor.href = 'mailto:hello@example.com';
+          handler.handle_(event);
+          expect(winOpenStub).to.not.be.called;
+          expect(event.defaultPrevented).to.be.false;
+        });
 
-    describe('when linking to identifier', () => {
-      beforeEach(() => {
-        anchor.href = 'https://www.google.com/some-path?hello=world#test';
-      });
+        it('should not do anything on other non-safari iOS', () => {
+          handler.isIosSafari_ = false;
+          handler.handle_(event);
+          expect(winOpenStub).to.not.be.called;
+          expect(event.defaultPrevented).to.be.false;
+        });
 
-      it('should find element by id', () => {
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.true;
-        expect(replaceStateForTargetStub).to.be.calledOnce;
-        expect(replaceStateForTargetStub).to.be.calledWith('#test');
-        expect(scrollIntoViewStub).to.not.be.called;
-        return replaceStateForTargetPromise.then(() => {
-          expect(scrollIntoViewStub).to.be.called;
-          expect(scrollIntoViewStub).to.be.calledWith(elementWithId);
+        it('should not do anything on other platforms', () => {
+          handler.isIosSafari_ = false;
+          handler.handle_(event);
+          expect(winOpenStub).to.not.be.called;
+          expect(event.defaultPrevented).to.be.false;
         });
       });
 
-      it('should always call preventDefault', () => {
-        elementWithId.id = 'something-else';
-        handler.handle_(event);
-        expect(event.defaultPrevented).to.be.true;
-        expect(replaceStateForTargetStub).to.be.calledOnce;
-        expect(replaceStateForTargetStub).to.be.calledWith('#test');
-        return replaceStateForTargetPromise.then(() => {
+      describe('when linking to a different origin or path', () => {
+        it('should not do anything on path change', () => {
+          anchor.href = 'https://www.google.com/some-other-path';
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.false;
+          expect(winOpenStub).to.not.be.called;
+          expect(scrollIntoViewStub).to.not.be.called;
+          expect(anchor.getAttribute('target')).to.be.null;
+        });
+
+        it('should not do anything on origin change', () => {
+          anchor.href = 'https://maps.google.com/some-path#link';
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.false;
+          expect(winOpenStub).to.not.be.called;
           expect(scrollIntoViewStub).to.not.be.called;
+          expect(anchor.getAttribute('target')).to.be.null;
         });
-      });
 
-      it('should call querySelector on document if element with id is not ' +
-         'found', () => {
-        anchor.href = 'https://www.google.com/some-path?hello=world#test2';
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.be.calledOnce;
-        expect(replaceStateForTargetStub).to.be.calledWith('#test2');
-        expect(scrollIntoViewStub).to.not.be.called;
-        return replaceStateForTargetPromise.then(() => {
-          expect(scrollIntoViewStub).to.be.called;
-          expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+        it('should not do anything when there is no hash', () => {
+          anchor.href = 'https://www.google.com/some-path';
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.false;
+          expect(winOpenStub).to.not.be.called;
+          expect(scrollIntoViewStub).to.not.be.called;
+          expect(anchor.getAttribute('target')).to.be.null;
+        });
+
+        it('should not do anything on a query change', () => {
+          anchor.href = 'https://www.google.com/some-path?hello=foo#link';
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.false;
+          expect(winOpenStub).to.not.be.called;
+          expect(scrollIntoViewStub).to.not.be.called;
+          expect(anchor.getAttribute('target')).to.be.null;
         });
       });
 
-      it('should call scrollIntoView twice if element with id is found', () => {
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.be.calledOnce;
-        expect(replaceStateForTargetStub).to.be.calledWith('#test');
-        return replaceStateForTargetPromise.then(() => {
-          expect(scrollIntoViewStub).to.have.callCount(1);
-          return new Promise(resolve => {
-            setTimeout(resolve, 2);
+      describe('when linking to identifier', () => {
+        beforeEach(() => {
+          anchor.href = 'https://www.google.com/some-path?hello=world#test';
+        });
+
+        it('should find element by id', () => {
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.true;
+          expect(replaceStateForTargetStub).to.be.calledOnce;
+          expect(replaceStateForTargetStub).to.be.calledWith('#test');
+          expect(scrollIntoViewStub).to.not.be.called;
+          return replaceStateForTargetPromise.then(() => {
+            expect(scrollIntoViewStub).to.be.called;
+            expect(scrollIntoViewStub).to.be.calledWith(elementWithId);
           });
-        }).then(() => {
-          expect(scrollIntoViewStub).to.have.callCount(2);
         });
-      });
 
-      it('should use escaped css selectors with spaces', () => {
-        anchor.href =
+        it('should always call preventDefault', () => {
+          elementWithId.id = 'something-else';
+          handler.handle_(event);
+          expect(event.defaultPrevented).to.be.true;
+          expect(replaceStateForTargetStub).to.be.calledOnce;
+          expect(replaceStateForTargetStub).to.be.calledWith('#test');
+          return replaceStateForTargetPromise.then(() => {
+            expect(scrollIntoViewStub).to.not.be.called;
+          });
+        });
+
+        it(
+          'should call querySelector on document if element with id is not ' +
+            'found',
+          () => {
+            anchor.href = 'https://www.google.com/some-path?hello=world#test2';
+            handler.handle_(event);
+            expect(replaceStateForTargetStub).to.be.calledOnce;
+            expect(replaceStateForTargetStub).to.be.calledWith('#test2');
+            expect(scrollIntoViewStub).to.not.be.called;
+            return replaceStateForTargetPromise.then(() => {
+              expect(scrollIntoViewStub).to.be.called;
+              expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+            });
+          }
+        );
+
+        it('should call scrollIntoView twice if element with id is found', () => {
+          handler.handle_(event);
+          expect(replaceStateForTargetStub).to.be.calledOnce;
+          expect(replaceStateForTargetStub).to.be.calledWith('#test');
+          return replaceStateForTargetPromise
+            .then(() => {
+              expect(scrollIntoViewStub).to.have.callCount(1);
+              return new Promise(resolve => {
+                setTimeout(resolve, 2);
+              });
+            })
+            .then(() => {
+              expect(scrollIntoViewStub).to.have.callCount(2);
+            });
+        });
+
+        it('should use escaped css selectors with spaces', () => {
+          anchor.href =
             'https://www.google.com/some-path?hello=world#test%20hello';
-        anchorWithName.setAttribute('name', 'test%20hello');
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.be.calledWith('#test%20hello');
-        return replaceStateForTargetPromise.then(() => {
-          expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+          anchorWithName.setAttribute('name', 'test%20hello');
+          handler.handle_(event);
+          expect(replaceStateForTargetStub).to.be.calledWith('#test%20hello');
+          return replaceStateForTargetPromise.then(() => {
+            expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+          });
         });
-      });
 
-      it('should use escaped css selectors with quotes', () => {
-        anchor.href =
+        it('should use escaped css selectors with quotes', () => {
+          anchor.href =
             'https://www.google.com/some-path?hello=world#test%22hello';
-        anchorWithName.setAttribute('name', 'test%22hello');
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.be.calledWith('#test%22hello');
-        return replaceStateForTargetPromise.then(() => {
-          expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+          anchorWithName.setAttribute('name', 'test%22hello');
+          handler.handle_(event);
+          expect(replaceStateForTargetStub).to.be.calledWith('#test%22hello');
+          return replaceStateForTargetPromise.then(() => {
+            expect(scrollIntoViewStub).to.be.calledWith(anchorWithName);
+          });
         });
-      });
 
-      it('should push and pop history state with pre-existing hash', () => {
-        win.location.href =
+        it('should push and pop history state with pre-existing hash', () => {
+          win.location.href =
             'https://www.google.com/some-path?hello=world#first';
-        handler.isIosSafari_ = true;
-        handler.isIframed_ = false;
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.be.calledOnce;
-        expect(replaceStateForTargetStub).to.be.calledWith('#test');
-      });
+          handler.isIosSafari_ = true;
+          handler.isIframed_ = false;
+          handler.handle_(event);
+          expect(replaceStateForTargetStub).to.be.calledOnce;
+          expect(replaceStateForTargetStub).to.be.calledWith('#test');
+        });
 
-      it('should only scroll same hash, no history changes', () => {
-        win.location.href =
+        it('should only scroll same hash, no history changes', () => {
+          win.location.href =
             'https://www.google.com/some-path?hello=world#test';
-        handler.handle_(event);
-        expect(replaceStateForTargetStub).to.not.be.called;
-        expect(scrollIntoViewStub).to.be.calledOnce;
-        expect(scrollIntoViewStub).to.be.calledWith(elementWithId);
-      });
-    });
-
-    describe('when linking to rel=amphtml', () => {
-      beforeEach(() => {
-        anchor.href = 'https://amp.pub.com/amp_page';
-        anchor.setAttribute('rel', 'unused amphtml unused');
-      });
-
-      it('should delegate navigation if viewer supports A2A', () => {
-        const stub =
-            sandbox.stub(handler, 'navigateToAmpUrl').returns(true);
-
-        handler.handle_(event);
-
-        expect(stub).to.be.calledOnce;
-        expect(stub).calledWithExactly(
-            'https://amp.pub.com/amp_page', '<a rel=amphtml>');
-
-        // If viewer handles it, we should prevent default and not handle nav
-        // ourselves.
-        expect(event.defaultPrevented).to.be.true;
-        expect(handleNavSpy).to.not.be.called;
-      });
-
-      it('should behave normally if viewer does not support A2A', () => {
-        const stub =
-            sandbox.stub(handler, 'navigateToAmpUrl').returns(false);
-
-        handler.handle_(event);
-
-        expect(stub).to.be.calledOnce;
-        expect(stub).calledWithExactly(
-            'https://amp.pub.com/amp_page', '<a rel=amphtml>');
-
-        // If viewer doesn't handles it, we should not prevent default and
-        // handle nav ourselves.
-        expect(event.defaultPrevented).to.be.false;
-        expect(handleNavSpy).to.be.calledOnce;
-      });
-    });
-
-    describe('navigateTo', () => {
-      let ampdoc;
-
-      beforeEach(() => {
-        ampdoc = Services.ampdoc(doc);
-        win.location.href = 'https://www.pub.com/';
+          handler.handle_(event);
+          expect(replaceStateForTargetStub).to.not.be.called;
+          expect(scrollIntoViewStub).to.be.calledOnce;
+          expect(scrollIntoViewStub).to.be.calledWith(elementWithId);
+        });
       });
 
-      it('should reject invalid protocols', () => {
-        const newUrl = /*eslint no-script-url: 0*/ 'javascript:alert(1)';
-
-        expect(win.location.href).to.equal('https://www.pub.com/');
-        allowConsoleError(() => {
-          handler.navigateTo(win, newUrl);
+      describe('when linking to rel=amphtml', () => {
+        beforeEach(() => {
+          anchor.href = 'https://amp.pub.com/amp_page';
+          anchor.setAttribute('rel', 'unused amphtml unused');
         });
-        // No navigation so window location should be unchanged.
-        expect(win.location.href).to.equal('https://www.pub.com/');
-      });
 
-      it('should delegate navigation to viewer if necessary', () => {
-        const meta = doc.createElement('meta');
-        meta.setAttribute('name', 'amp-to-amp-navigation');
-        meta.setAttribute('content', 'feature-foo, action-bar');
-        ampdoc.getRootNode().head.appendChild(meta);
-
-        const send = sandbox.stub(handler.viewer_, 'sendMessage');
-        const hasCapability = sandbox.stub(handler.viewer_, 'hasCapability');
-        hasCapability.returns(true);
-        expect(win.location.href).to.equal('https://www.pub.com/');
-
-        // Delegate to viewer if opt_requestedBy matches the <meta> tag content
-        // and the viewer supports A2A.
-        handler.navigateTo(win, 'https://amp.pub.com/amp_page', 'feature-foo');
-        expect(hasCapability).to.be.calledWithExactly('a2a');
-        expect(send).to.be.calledOnce;
-        expect(send).to.be.calledWithExactly('a2aNavigate',
-            {requestedBy: 'feature-foo', url: 'https://amp.pub.com/amp_page'});
-        expect(win.location.href).to.equal('https://www.pub.com/');
-
-        // If opt_requestedBy doesn't match, navigate top normally.
-        handler.navigateTo(win, 'https://amp.pub.com/amp_page', 'no-match');
-        expect(send).to.be.calledOnce;
-        expect(win.location.href).to.equal('https://amp.pub.com/amp_page');
-
-        // If opt_requestedBy matches but viewer doesn't support A2A, navigate
-        // top normally.
-        send.reset();
-        hasCapability.returns(false);
-        handler.navigateTo(win, 'https://amp.pub.com/different', 'action-bar');
-        expect(send).to.not.be.called;
-        expect(win.location.href).to.equal('https://amp.pub.com/different');
-      });
-    });
-  });
+        it('should delegate navigation if viewer supports A2A', () => {
+          const stub = sandbox.stub(handler, 'navigateToAmpUrl').returns(true);
 
-  describes.realWin('fie embed', {
-    amp: {
-      ampdoc: 'fie',
-    },
-  }, env => {
-    // TODO(dvoytenko, #11827): Make this test work on Safari.
-    describe.configure().skipSafari().run('fie embed', () => {
-      let win, doc;
-      let parentWin;
-      let ampdoc;
-      let embed;
-      let handler;
-      let winOpenStub;
-      let scrollIntoViewStub;
-      let replaceStateForTargetStub;
-      let replaceStateForTargetPromise;
-      let anchor;
-      let elementWithId;
-      let anchorWithName;
+          handler.handle_(event);
 
-      beforeEach(() => {
-        win = env.win;
-        doc = win.document;
-        ampdoc = env.ampdoc;
-        parentWin = env.parentWin;
-        embed = env.embed;
+          expect(stub).to.be.calledOnce;
+          expect(stub).calledWithExactly(
+            'https://amp.pub.com/amp_page',
+            '<a rel=amphtml>'
+          );
 
-        handler = win.services.navigation.obj;
-        winOpenStub = sandbox.stub(win, 'open').callsFake(() => {
-          return {};
+          // If viewer handles it, we should prevent default and not handle nav
+          // ourselves.
+          expect(event.defaultPrevented).to.be.true;
+          expect(handleNavSpy).to.not.be.called;
         });
-        const viewport = parentWin.services.viewport.obj;
-        scrollIntoViewStub = sandbox.stub(viewport, 'scrollIntoView');
-        const history = parentWin.services.history.obj;
-        replaceStateForTargetPromise = Promise.resolve();
-        replaceStateForTargetStub = sandbox.stub(
-            history, 'replaceStateForTarget').callsFake(
-            () => replaceStateForTargetPromise);
 
-        anchor = doc.createElement('a');
-        anchor.href = 'http://ads.localhost:8000/example';
-        doc.body.appendChild(anchor);
-        event.target = anchor;
+        it('should behave normally if viewer does not support A2A', () => {
+          const stub = sandbox.stub(handler, 'navigateToAmpUrl').returns(false);
 
-        // Navigation uses the UrlReplacements service scoped to the event
-        // target, but for testing stub in the top-level service for simplicity.
-        const {documentElement} = parentWin.document;
-        const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-        sandbox.stub(Services, 'urlReplacementsForDoc')
-            .withArgs(anchor).returns(urlReplacements);
+          handler.handle_(event);
 
-        elementWithId = doc.createElement('div');
-        elementWithId.id = 'test';
-        doc.body.appendChild(elementWithId);
+          expect(stub).to.be.calledOnce;
+          expect(stub).calledWithExactly(
+            'https://amp.pub.com/amp_page',
+            '<a rel=amphtml>'
+          );
 
-        anchorWithName = doc.createElement('a');
-        anchorWithName.setAttribute('name', 'test2');
-        doc.body.appendChild(anchorWithName);
+          // If viewer doesn't handles it, we should not prevent default and
+          // handle nav ourselves.
+          expect(event.defaultPrevented).to.be.false;
+          expect(handleNavSpy).to.be.calledOnce;
+        });
       });
 
-      it('should adopt correctly to embed', () => {
-        expect(handler.ampdoc).to.equal(ampdoc);
-        expect(handler.rootNode_).to.equal(embed.win.document);
-        expect(handler.isEmbed_).to.be.true;
-      });
+      describe('navigateTo', () => {
+        let ampdoc;
 
-      describe('when linking to a different origin or path', () => {
-        it('should update target to _blank', () => {
-          anchor.href = 'https://www.google.com/some-other-path';
-          handler.handle_(event);
-          expect(event.defaultPrevented).to.be.false;
-          expect(winOpenStub).to.not.be.called;
-          expect(scrollIntoViewStub).to.not.be.called;
-          expect(anchor.getAttribute('target')).to.equal('_blank');
+        beforeEach(() => {
+          ampdoc = Services.ampdoc(doc);
+          win.location.href = 'https://www.pub.com/';
         });
 
-        it('should keep the target when specified', () => {
-          anchor.href = 'https://www.google.com/some-other-path';
-          anchor.setAttribute('target', '_top');
-          handler.handle_(event);
-          expect(event.defaultPrevented).to.be.false;
-          expect(winOpenStub).to.not.be.called;
-          expect(scrollIntoViewStub).to.not.be.called;
-          expect(anchor.getAttribute('target')).to.equal('_top');
+        it('should reject invalid protocols', () => {
+          const newUrl = /*eslint no-script-url: 0*/ 'javascript:alert(1)';
+
+          expect(win.location.href).to.equal('https://www.pub.com/');
+          allowConsoleError(() => {
+            handler.navigateTo(win, newUrl);
+          });
+          // No navigation so window location should be unchanged.
+          expect(win.location.href).to.equal('https://www.pub.com/');
         });
 
-        it('should reset the target when illegal specified', () => {
-          anchor.href = 'https://www.google.com/some-other-path';
-          anchor.setAttribute('target', '_self');
-          handler.handle_(event);
-          expect(event.defaultPrevented).to.be.false;
-          expect(winOpenStub).to.not.be.called;
-          expect(scrollIntoViewStub).to.not.be.called;
-          expect(anchor.getAttribute('target')).to.equal('_blank');
+        it('should delegate navigation to viewer if necessary', () => {
+          const meta = doc.createElement('meta');
+          meta.setAttribute('name', 'amp-to-amp-navigation');
+          meta.setAttribute('content', 'feature-foo, action-bar');
+          ampdoc.getRootNode().head.appendChild(meta);
+
+          const send = sandbox.stub(handler.viewer_, 'sendMessage');
+          const hasCapability = sandbox.stub(handler.viewer_, 'hasCapability');
+          hasCapability.returns(true);
+          expect(win.location.href).to.equal('https://www.pub.com/');
+
+          // Delegate to viewer if opt_requestedBy matches the <meta> tag content
+          // and the viewer supports A2A.
+          handler.navigateTo(
+            win,
+            'https://amp.pub.com/amp_page',
+            'feature-foo'
+          );
+          expect(hasCapability).to.be.calledWithExactly('a2a');
+          expect(send).to.be.calledOnce;
+          expect(send).to.be.calledWithExactly('a2aNavigate', {
+            requestedBy: 'feature-foo',
+            url: 'https://amp.pub.com/amp_page',
+          });
+          expect(win.location.href).to.equal('https://www.pub.com/');
+
+          // If opt_requestedBy doesn't match, navigate top normally.
+          handler.navigateTo(win, 'https://amp.pub.com/amp_page', 'no-match');
+          expect(send).to.be.calledOnce;
+          expect(win.location.href).to.equal('https://amp.pub.com/amp_page');
+
+          // If opt_requestedBy matches but viewer doesn't support A2A, navigate
+          // top normally.
+          send.reset();
+          hasCapability.returns(false);
+          handler.navigateTo(
+            win,
+            'https://amp.pub.com/different',
+            'action-bar'
+          );
+          expect(send).to.not.be.called;
+          expect(win.location.href).to.equal('https://amp.pub.com/different');
         });
       });
+    }
+  );
 
-      describe('when linking to identifier', () => {
-        beforeEach(() => {
-          anchor.href = 'http://ads.localhost:8000/example#test';
-        });
+  describes.realWin(
+    'fie embed',
+    {
+      amp: {
+        ampdoc: 'fie',
+      },
+    },
+    env => {
+      // TODO(dvoytenko, #11827): Make this test work on Safari.
+      describe
+        .configure()
+        .skipSafari()
+        .run('fie embed', () => {
+          let win, doc;
+          let parentWin;
+          let ampdoc;
+          let embed;
+          let handler;
+          let winOpenStub;
+          let scrollIntoViewStub;
+          let replaceStateForTargetStub;
+          let replaceStateForTargetPromise;
+          let anchor;
+          let elementWithId;
+          let anchorWithName;
+
+          beforeEach(() => {
+            win = env.win;
+            doc = win.document;
+            ampdoc = env.ampdoc;
+            parentWin = env.parentWin;
+            embed = env.embed;
+
+            handler = win.services.navigation.obj;
+            winOpenStub = sandbox.stub(win, 'open').callsFake(() => {
+              return {};
+            });
+            const viewport = parentWin.services.viewport.obj;
+            scrollIntoViewStub = sandbox.stub(viewport, 'scrollIntoView');
+            const history = parentWin.services.history.obj;
+            replaceStateForTargetPromise = Promise.resolve();
+            replaceStateForTargetStub = sandbox
+              .stub(history, 'replaceStateForTarget')
+              .callsFake(() => replaceStateForTargetPromise);
+
+            anchor = doc.createElement('a');
+            anchor.href = 'http://ads.localhost:8000/example';
+            doc.body.appendChild(anchor);
+            event.target = anchor;
+
+            // Navigation uses the UrlReplacements service scoped to the event
+            // target, but for testing stub in the top-level service for simplicity.
+            const {documentElement} = parentWin.document;
+            const urlReplacements = Services.urlReplacementsForDoc(
+              documentElement
+            );
+            sandbox
+              .stub(Services, 'urlReplacementsForDoc')
+              .withArgs(anchor)
+              .returns(urlReplacements);
+
+            elementWithId = doc.createElement('div');
+            elementWithId.id = 'test';
+            doc.body.appendChild(elementWithId);
+
+            anchorWithName = doc.createElement('a');
+            anchorWithName.setAttribute('name', 'test2');
+            doc.body.appendChild(anchorWithName);
+          });
 
-        it('should NOT do anything, but cancel the event', () => {
-          handler.handle_(event);
-          expect(event.defaultPrevented).to.be.true;
-          expect(replaceStateForTargetStub).to.not.be.called;
-          expect(scrollIntoViewStub).to.not.be.called;
+          it('should adopt correctly to embed', () => {
+            expect(handler.ampdoc).to.equal(ampdoc);
+            expect(handler.rootNode_).to.equal(embed.win.document);
+            expect(handler.isEmbed_).to.be.true;
+          });
+
+          describe('when linking to a different origin or path', () => {
+            it('should update target to _blank', () => {
+              anchor.href = 'https://www.google.com/some-other-path';
+              handler.handle_(event);
+              expect(event.defaultPrevented).to.be.false;
+              expect(winOpenStub).to.not.be.called;
+              expect(scrollIntoViewStub).to.not.be.called;
+              expect(anchor.getAttribute('target')).to.equal('_blank');
+            });
+
+            it('should keep the target when specified', () => {
+              anchor.href = 'https://www.google.com/some-other-path';
+              anchor.setAttribute('target', '_top');
+              handler.handle_(event);
+              expect(event.defaultPrevented).to.be.false;
+              expect(winOpenStub).to.not.be.called;
+              expect(scrollIntoViewStub).to.not.be.called;
+              expect(anchor.getAttribute('target')).to.equal('_top');
+            });
+
+            it('should reset the target when illegal specified', () => {
+              anchor.href = 'https://www.google.com/some-other-path';
+              anchor.setAttribute('target', '_self');
+              handler.handle_(event);
+              expect(event.defaultPrevented).to.be.false;
+              expect(winOpenStub).to.not.be.called;
+              expect(scrollIntoViewStub).to.not.be.called;
+              expect(anchor.getAttribute('target')).to.equal('_blank');
+            });
+          });
+
+          describe('when linking to identifier', () => {
+            beforeEach(() => {
+              anchor.href = 'http://ads.localhost:8000/example#test';
+            });
+
+            it('should NOT do anything, but cancel the event', () => {
+              handler.handle_(event);
+              expect(event.defaultPrevented).to.be.true;
+              expect(replaceStateForTargetStub).to.not.be.called;
+              expect(scrollIntoViewStub).to.not.be.called;
+            });
+          });
         });
-      });
-    });
-  });
+    }
+  );
 });
 
 describes.realWin('anchor-click-interceptor', {amp: true}, env => {
-
   let doc;
   let ampdoc;
 
diff --git a/test/unit/test-notification-ui-manager.js b/test/unit/test-notification-ui-manager.js
index 9d63fc5d9304..e39c1f50af3e 100644
--- a/test/unit/test-notification-ui-manager.js
+++ b/test/unit/test-notification-ui-manager.js
@@ -13,12 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  NotificationUiManager,
-} from '../../src/service/notification-ui-manager';
+import {NotificationUiManager} from '../../src/service/notification-ui-manager';
 import {macroTask} from '../../testing/yield';
 
-
 describes.realWin('NotificationUiManager', {amp: 1}, () => {
   describe('Notification UI Manager', () => {
     let manager;
@@ -56,10 +53,9 @@ describes.realWin('NotificationUiManager', {amp: 1}, () => {
         showSpy3();
         return p3;
       };
-
     });
 
-    it('show UI in sequence', function* () {
+    it('show UI in sequence', function*() {
       manager.registerUI(show1);
       manager.registerUI(show2);
       manager.registerUI(show3);
@@ -84,7 +80,7 @@ describes.realWin('NotificationUiManager', {amp: 1}, () => {
       expect(showSpy3).to.be.calledOnce;
     });
 
-    it('queue empty handler', function* () {
+    it('queue empty handler', function*() {
       const handler = sandbox.spy();
       manager.registerUI(show1);
       manager.registerUI(show2);
@@ -96,7 +92,7 @@ describes.realWin('NotificationUiManager', {amp: 1}, () => {
       expect(handler).to.be.calledOnce;
     });
 
-    it('queue not empty handler', function* () {
+    it('queue not empty handler', function*() {
       const handler = sandbox.spy();
       manager.onQueueNotEmpty(handler);
       manager.registerUI(show1);
diff --git a/test/unit/test-object.js b/test/unit/test-object.js
index 6122e7a773d4..47a750acd8f1 100644
--- a/test/unit/test-object.js
+++ b/test/unit/test-object.js
@@ -83,9 +83,9 @@ describe('Object', () => {
 
     it('should NOT deep merge arrays', () => {
       const destObject = {
-        a: [1,2,3,4,5],
+        a: [1, 2, 3, 4, 5],
         b: {
-          c: [9,8,7,6,5],
+          c: [9, 8, 7, 6, 5],
         },
       };
       const fromObject = {
@@ -94,7 +94,7 @@ describe('Object', () => {
         },
       };
       expect(object.deepMerge(destObject, fromObject)).to.deep.equal({
-        a: [1,2,3,4,5],
+        a: [1, 2, 3, 4, 5],
         b: {
           c: ['h', 'i'],
         },
@@ -150,7 +150,8 @@ describe('Object', () => {
       const fromObject = {};
       fromObject.a = fromObject;
       expect(() => object.deepMerge(destObject, fromObject)).to.throw(
-          /Source object has a circular reference./);
+        /Source object has a circular reference./
+      );
     });
 
     it('should merge null and undefined correctly', () => {
diff --git a/test/unit/test-observable.js b/test/unit/test-observable.js
index cda6b107ceb6..e013d64bf8d5 100644
--- a/test/unit/test-observable.js
+++ b/test/unit/test-observable.js
@@ -17,7 +17,6 @@
 import {Observable} from '../../src/observable';
 
 describe('Observable', () => {
-
   let sandbox;
   let observable;
 
@@ -67,5 +66,4 @@ describe('Observable', () => {
     expect(observer1Called).to.equal(1);
     expect(observer2Called).to.equal(2);
   });
-
 });
diff --git a/test/unit/test-origin-experiments.js b/test/unit/test-origin-experiments.js
index c1d89fded88e..d4250be6310b 100644
--- a/test/unit/test-origin-experiments.js
+++ b/test/unit/test-origin-experiments.js
@@ -25,7 +25,8 @@ import {user} from '../../src/log';
 describes.fakeWin('OriginExperiments', {amp: true}, env => {
   const TAG = 'OriginExperiments';
   // Token enables experiment "foo" for origin "https://origin.com".
-  const token = 'AAAAAFd7Im9yaWdpbiI6Imh0dHBzOi8vb3JpZ2luLmNvbSIsImV4cGVyaW1lbnQiOiJmb28iLCJleHBpcmF0aW9uIjoxLjc5NzY5MzEzNDg2MjMxNTdlKzMwOH0+0WnsFJFtFJzkrzqxid2h3jnFI2C7FTK+8iRYcU1r+9PZtnMPJCVCkNkxWGpXFZ6z2FwIa/hY4XDM//GJHr+2pdChx67wm6RIY1NDwcYqFbUrugEqWiT/2RviS9PPhtP6PKgUDI+0opQUt2ibXhsc1KynroAcGTaaxofmpnuMdj7vjGlWTF+6WCFYfAzqcLJB5a4+Drop9ZTEYRbRROMVROC8EGHwugeMfoNf3roCqaJydADQ/tSTY/fPZOlcwOtGW8GE4s/KlNyFaonjEYOROuLctJxYAqwIStQ4TdS7xfy70hsgVLCKnLeXIRJKN0eaJCkLy6BFbIrCH5FhjhbY'; // eslint-disable-line max-len
+  const token =
+    'AAAAAFd7Im9yaWdpbiI6Imh0dHBzOi8vb3JpZ2luLmNvbSIsImV4cGVyaW1lbnQiOiJmb28iLCJleHBpcmF0aW9uIjoxLjc5NzY5MzEzNDg2MjMxNTdlKzMwOH0+0WnsFJFtFJzkrzqxid2h3jnFI2C7FTK+8iRYcU1r+9PZtnMPJCVCkNkxWGpXFZ6z2FwIa/hY4XDM//GJHr+2pdChx67wm6RIY1NDwcYqFbUrugEqWiT/2RviS9PPhtP6PKgUDI+0opQUt2ibXhsc1KynroAcGTaaxofmpnuMdj7vjGlWTF+6WCFYfAzqcLJB5a4+Drop9ZTEYRbRROMVROC8EGHwugeMfoNf3roCqaJydADQ/tSTY/fPZOlcwOtGW8GE4s/KlNyFaonjEYOROuLctJxYAqwIStQ4TdS7xfy70hsgVLCKnLeXIRJKN0eaJCkLy6BFbIrCH5FhjhbY'; // eslint-disable-line max-len
 
   let ampdoc;
   let isPkcsAvailable;
@@ -107,7 +108,6 @@ describes.fakeWin('OriginExperiments', {amp: true}, env => {
   });
 });
 
-
 describes.fakeWin('TokenMaster', {amp: true}, env => {
   let tokenMaster;
 
@@ -162,48 +162,74 @@ describes.fakeWin('TokenMaster', {amp: true}, env => {
 
   it('should throw for an unknown token version number', () => {
     const verify = tokenMaster.verifyToken(
-        tokenWithBadVersion, 'https://origin.com', publicKey);
+      tokenWithBadVersion,
+      'https://origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.rejectedWith(
-        'Unrecognized token version: 42');
+      'Unrecognized token version: 42'
+    );
   });
 
   it('should throw if config length exceeds byte length', () => {
     const verify = tokenMaster.verifyToken(
-        tokenWithBadConfigLength, 'https://origin.com', publicKey);
+      tokenWithBadConfigLength,
+      'https://origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.rejectedWith(
-        'Unexpected config length: 999');
+      'Unexpected config length: 999'
+    );
   });
 
   it('should throw if signature cannot be verified', () => {
     const verify = tokenMaster.verifyToken(
-        tokenWithBadSignature, 'https://origin.com', publicKey);
+      tokenWithBadSignature,
+      'https://origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.rejectedWith(
-        'Failed to verify token signature.');
+      'Failed to verify token signature.'
+    );
   });
 
   it('should throw if approved origin is not current origin', () => {
     const verify = tokenMaster.verifyToken(
-        token, 'https://not-origin.com', publicKey);
+      token,
+      'https://not-origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.rejectedWith(
-        /does not match window/);
+      /does not match window/
+    );
   });
 
   it('should return false if trial has expired', () => {
     const verify = tokenMaster.verifyToken(
-        tokenWithExpiredExperiment, 'https://origin.com', publicKey);
+      tokenWithExpiredExperiment,
+      'https://origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.rejectedWith(
-        'Experiment "expired" has expired.');
+      'Experiment "expired" has expired.'
+    );
   });
 
   it('should return true for a well-formed, unexpired token', () => {
     const verify = tokenMaster.verifyToken(
-        token, 'https://origin.com', publicKey);
+      token,
+      'https://origin.com',
+      publicKey
+    );
     return expect(verify).to.eventually.be.fulfilled;
   });
 
   it('should ignore trailing slash on location', () => {
     const verify = tokenMaster.verifyToken(
-        token, 'https://origin.com/', publicKey);
+      token,
+      'https://origin.com/',
+      publicKey
+    );
     return expect(verify).to.eventually.be.fulfilled;
   });
 });
diff --git a/test/unit/test-pass.js b/test/unit/test-pass.js
index 27ca0f5665e2..3b363698a47f 100644
--- a/test/unit/test-pass.js
+++ b/test/unit/test-pass.js
@@ -18,7 +18,6 @@ import {Pass} from '../../src/pass';
 import {Services} from '../../src/services';
 
 describe('Pass', () => {
-
   let sandbox;
   let pass;
   let timerMock;
@@ -41,10 +40,17 @@ describe('Pass', () => {
 
   it('handler called', () => {
     let delayedFunc = null;
-    timerMock.expects('delay').withExactArgs(sinon.match(value => {
-      delayedFunc = value;
-      return true;
-    }), 0).returns(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(
+        sinon.match(value => {
+          delayedFunc = value;
+          return true;
+        }),
+        0
+      )
+      .returns(1)
+      .once();
     pass.schedule();
     expect(pass.isPending()).to.equal(true);
 
@@ -57,22 +63,31 @@ describe('Pass', () => {
   });
 
   it('schedule no delay', () => {
-    timerMock.expects('delay').withExactArgs(sinon.match.func, 0)
-        .returns(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(sinon.match.func, 0)
+      .returns(1)
+      .once();
     timerMock.expects('cancel').never();
     pass.schedule();
   });
 
   it('schedule with delay', () => {
-    timerMock.expects('delay').withExactArgs(sinon.match.func, 111)
-        .returns(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(sinon.match.func, 111)
+      .returns(1)
+      .once();
     timerMock.expects('cancel').never();
     pass.schedule(111);
   });
 
   it('schedule later', () => {
-    timerMock.expects('delay').withExactArgs(sinon.match.func, 111)
-        .returns(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(sinon.match.func, 111)
+      .returns(1)
+      .once();
     timerMock.expects('cancel').never();
     pass.schedule(111);
     // Will never schedule b/c there's an earlier pass still pending.
@@ -81,11 +96,20 @@ describe('Pass', () => {
   });
 
   it('schedule earlier', () => {
-    timerMock.expects('delay').withExactArgs(sinon.match.func, 222)
-        .returns(1).once();
-    timerMock.expects('delay').withExactArgs(sinon.match.func, 111)
-        .returns(2).once();
-    timerMock.expects('cancel').withExactArgs(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(sinon.match.func, 222)
+      .returns(1)
+      .once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(sinon.match.func, 111)
+      .returns(2)
+      .once();
+    timerMock
+      .expects('cancel')
+      .withExactArgs(1)
+      .once();
     pass.schedule(222);
     // Will re-schedule b/c the existing pass is later.
     const isScheduled = pass.schedule(111);
@@ -101,14 +125,28 @@ describe('Pass', () => {
     });
     let delayedFunc0 = null;
     let delayedFunc1 = null;
-    timerMock.expects('delay').withExactArgs(sinon.match(value => {
-      delayedFunc0 = value;
-      return true;
-    }), 0).returns(1).once();
-    timerMock.expects('delay').withExactArgs(sinon.match(value => {
-      delayedFunc1 = value;
-      return true;
-    }), 10).returns(1).once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(
+        sinon.match(value => {
+          delayedFunc0 = value;
+          return true;
+        }),
+        0
+      )
+      .returns(1)
+      .once();
+    timerMock
+      .expects('delay')
+      .withExactArgs(
+        sinon.match(value => {
+          delayedFunc1 = value;
+          return true;
+        }),
+        10
+      )
+      .returns(1)
+      .once();
     pass.schedule();
     expect(pass.isPending()).to.equal(true);
 
diff --git a/test/unit/test-performance.js b/test/unit/test-performance.js
index 74f0efd773b9..777e4e5fb32c 100644
--- a/test/unit/test-performance.js
+++ b/test/unit/test-performance.js
@@ -32,7 +32,9 @@ describes.realWin('performance', {amp: true}, env => {
     sandbox = env.sandbox;
     ampdoc = env.ampdoc;
     clock = lolex.install({
-      target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+      target: win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
     installPerformanceService(env.win);
     perf = Services.performanceFor(env.win);
   });
@@ -57,11 +59,10 @@ describes.realWin('performance', {amp: true}, env => {
 
       perf.tickDelta('test', 99);
       expect(perf.events_.length).to.equal(1);
-      expect(perf.events_[0])
-          .to.be.jsonEqual({
-            label: 'test',
-            delta: 99,
-          });
+      expect(perf.events_[0]).to.be.jsonEqual({
+        label: 'test',
+        delta: 99,
+      });
     });
 
     it('should map tickDelta to non-zero tick', () => {
@@ -70,29 +71,26 @@ describes.realWin('performance', {amp: true}, env => {
 
       perf.tickDelta('test1', 0);
       expect(perf.events_.length).to.equal(c + 1);
-      expect(perf.events_[c])
-          .to.be.jsonEqual({
-            label: 'test1',
-            delta: 0,
-          });
+      expect(perf.events_[c]).to.be.jsonEqual({
+        label: 'test1',
+        delta: 0,
+      });
 
       c++;
       perf.tickDelta('test2', -1);
       expect(perf.events_.length).to.equal(c + 1);
-      expect(perf.events_[c])
-          .to.be.jsonEqual({
-            label: 'test2',
-            delta: 0,
-          });
+      expect(perf.events_[c]).to.be.jsonEqual({
+        label: 'test2',
+        delta: 0,
+      });
 
       c++;
       perf.tickDelta('test3', 2);
       expect(perf.events_.length).to.equal(c + 1);
-      expect(perf.events_[c])
-          .to.be.jsonEqual({
-            label: 'test3',
-            delta: 2,
-          });
+      expect(perf.events_[c]).to.be.jsonEqual({
+        label: 'test3',
+        delta: 2,
+      });
     });
 
     it('should have max 50 queued events', () => {
@@ -105,16 +103,19 @@ describes.realWin('performance', {amp: true}, env => {
       expect(perf.events_.length).to.equal(50);
     });
 
-    it('should add default optional relative start time on the ' +
-       'queued tick event', () => {
-      clock.tick(150);
-      perf.tick('start0');
+    it(
+      'should add default optional relative start time on the ' +
+        'queued tick event',
+      () => {
+        clock.tick(150);
+        perf.tick('start0');
 
-      expect(perf.events_[0]).to.be.jsonEqual({
-        label: 'start0',
-        value: 150,
-      });
-    });
+        expect(perf.events_[0]).to.be.jsonEqual({
+          label: 'start0',
+          value: 150,
+        });
+      }
+    );
 
     it('should drop events in the head of the queue', () => {
       const tickTime = 100;
@@ -155,37 +156,57 @@ describes.realWin('performance', {amp: true}, env => {
       viewerSendMessageStub = sandbox.stub(viewer, 'sendMessage');
     });
 
-
     describe('config', () => {
-      it('should configure correctly when viewer is embedded and supports ' +
-          'csi', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
-        sandbox.stub(viewer, 'isEmbedded').returns(true);
-        perf.coreServicesAvailable().then(() => {
-          expect(perf.isPerformanceTrackingOn()).to.be.true;
-        });
-      });
-
-      it('should configure correctly when viewer is embedded and does ' +
-          'NOT support csi', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns('0');
-        sandbox.stub(viewer, 'isEmbedded').returns(true);
-        perf.coreServicesAvailable().then(() => {
-          expect(perf.isPerformanceTrackingOn()).to.be.false;
-        });
-      });
-
-      it('should configure correctly when viewer is embedded and does ' +
-          'NOT support csi', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-        sandbox.stub(viewer, 'isEmbedded').returns(true);
-        perf.coreServicesAvailable().then(() => {
-          expect(perf.isPerformanceTrackingOn()).to.be.false;
-        });
-      });
+      it(
+        'should configure correctly when viewer is embedded and supports ' +
+          'csi',
+        () => {
+          sandbox
+            .stub(viewer, 'getParam')
+            .withArgs('csi')
+            .returns('1');
+          sandbox.stub(viewer, 'isEmbedded').returns(true);
+          perf.coreServicesAvailable().then(() => {
+            expect(perf.isPerformanceTrackingOn()).to.be.true;
+          });
+        }
+      );
+
+      it(
+        'should configure correctly when viewer is embedded and does ' +
+          'NOT support csi',
+        () => {
+          sandbox
+            .stub(viewer, 'getParam')
+            .withArgs('csi')
+            .returns('0');
+          sandbox.stub(viewer, 'isEmbedded').returns(true);
+          perf.coreServicesAvailable().then(() => {
+            expect(perf.isPerformanceTrackingOn()).to.be.false;
+          });
+        }
+      );
+
+      it(
+        'should configure correctly when viewer is embedded and does ' +
+          'NOT support csi',
+        () => {
+          sandbox
+            .stub(viewer, 'getParam')
+            .withArgs('csi')
+            .returns(null);
+          sandbox.stub(viewer, 'isEmbedded').returns(true);
+          perf.coreServicesAvailable().then(() => {
+            expect(perf.isPerformanceTrackingOn()).to.be.false;
+          });
+        }
+      );
 
       it('should configure correctly when viewer is not embedded', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns(null);
         sandbox.stub(viewer, 'isEmbedded').returns(false);
         perf.coreServicesAvailable().then(() => {
           expect(perf.isPerformanceTrackingOn()).to.be.false;
@@ -194,11 +215,12 @@ describes.realWin('performance', {amp: true}, env => {
     });
 
     describe('channel established', () => {
-
       it('should flush events when channel is ready', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
-        sandbox.stub(viewer, 'whenMessagingReady')
-            .returns(Promise.resolve());
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns(null);
+        sandbox.stub(viewer, 'whenMessagingReady').returns(Promise.resolve());
         expect(perf.isMessagingReady_).to.be.false;
         const promise = perf.coreServicesAvailable();
         expect(perf.events_.length).to.equal(0);
@@ -221,8 +243,9 @@ describes.realWin('performance', {amp: true}, env => {
         return promise.then(() => {
           expect(perf.isMessagingReady_).to.be.true;
           const msrCalls = viewerSendMessageStub.withArgs(
-              'tick',
-              sinon.match(arg => arg.label == 'msr'));
+            'tick',
+            sinon.match(arg => arg.label == 'msr')
+          );
           expect(msrCalls).to.be.calledOnce;
           expect(msrCalls.args[0][1]).to.be.jsonEqual({
             label: 'msr',
@@ -235,7 +258,6 @@ describes.realWin('performance', {amp: true}, env => {
     });
 
     describe('channel not established', () => {
-
       it('should not flush anything', () => {
         sandbox.stub(viewer, 'whenMessagingReady').returns(null);
         expect(perf.isMessagingReady_).to.be.false;
@@ -265,15 +287,15 @@ describes.realWin('performance', {amp: true}, env => {
     });
 
     describe('tickSinceVisible', () => {
-
       let tickDeltaStub;
       let firstVisibleTime;
 
       beforeEach(() => {
         tickDeltaStub = sandbox.stub(perf, 'tickDelta');
         firstVisibleTime = null;
-        sandbox.stub(viewer, 'getFirstVisibleTime').callsFake(
-            () => firstVisibleTime);
+        sandbox
+          .stub(viewer, 'getFirstVisibleTime')
+          .callsFake(() => firstVisibleTime);
       });
 
       it('should always be zero before viewer is set', () => {
@@ -319,9 +341,11 @@ describes.realWin('performance', {amp: true}, env => {
     });
 
     describe('and performanceTracking is off', () => {
-
       beforeEach(() => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns(null);
         sandbox.stub(viewer, 'isEmbedded').returns(false);
       });
 
@@ -338,8 +362,13 @@ describes.realWin('performance', {amp: true}, env => {
           expect(perf.events_.length).to.equal(0);
 
           expect(viewerSendMessageStub.withArgs('tick')).to.not.be.called;
-          expect(viewerSendMessageStub.withArgs('sendCsi', undefined,
-              /* cancelUnsent */true)).to.not.be.called;
+          expect(
+            viewerSendMessageStub.withArgs(
+              'sendCsi',
+              undefined,
+              /* cancelUnsent */ true
+            )
+          ).to.not.be.called;
         });
       });
 
@@ -354,19 +383,25 @@ describes.realWin('performance', {amp: true}, env => {
         perf.tick('start0');
         perf.flush();
         return perf.coreServicesAvailable().then(() => {
-          expect(viewerSendMessageStub.withArgs('sendCsi', undefined,
-              /* cancelUnsent */true)).to.not.be.called;
+          expect(
+            viewerSendMessageStub.withArgs(
+              'sendCsi',
+              undefined,
+              /* cancelUnsent */ true
+            )
+          ).to.not.be.called;
         });
       });
     });
 
     describe('and performanceTracking is on', () => {
-
       beforeEach(() => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns('1');
         sandbox.stub(viewer, 'isEmbedded').returns(true);
-        sandbox.stub(viewer, 'whenMessagingReady')
-            .returns(Promise.resolve());
+        sandbox.stub(viewer, 'whenMessagingReady').returns(Promise.resolve());
       });
 
       it('should forward all queued tick events', () => {
@@ -377,21 +412,24 @@ describes.realWin('performance', {amp: true}, env => {
         expect(perf.events_.length).to.equal(2);
 
         return perf.coreServicesAvailable().then(() => {
-          expect(viewerSendMessageStub.withArgs('tick').getCall(0).args[1])
-              .to.be.jsonEqual({
-                label: 'msr',
-                delta: 1,
-              });
-          expect(viewerSendMessageStub.withArgs('tick').getCall(1).args[1])
-              .to.be.jsonEqual({
-                label: 'start0',
-                value: 0,
-              });
-          expect(viewerSendMessageStub.withArgs('tick').getCall(2).args[1])
-              .to.be.jsonEqual({
-                label: 'start1',
-                value: 1,
-              });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(0).args[1]
+          ).to.be.jsonEqual({
+            label: 'msr',
+            delta: 1,
+          });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(1).args[1]
+          ).to.be.jsonEqual({
+            label: 'start0',
+            value: 0,
+          });
+          expect(
+            viewerSendMessageStub.withArgs('tick').getCall(2).args[1]
+          ).to.be.jsonEqual({
+            label: 'start1',
+            value: 1,
+          });
         });
       });
 
@@ -412,18 +450,24 @@ describes.realWin('performance', {amp: true}, env => {
           perf.tick('start0');
           perf.tick('start1', 300);
 
-          expect(viewerSendMessageStub.withArgs(
-              'tick', sinon.match(arg => arg.label == 'start0')).args[0][1])
-              .to.be.jsonEqual({
-                label: 'start0',
-                value: 100,
-              });
-          expect(viewerSendMessageStub.withArgs(
-              'tick', sinon.match(arg => arg.label == 'start1')).args[0][1])
-              .to.be.jsonEqual({
-                label: 'start1',
-                delta: 300,
-              });
+          expect(
+            viewerSendMessageStub.withArgs(
+              'tick',
+              sinon.match(arg => arg.label == 'start0')
+            ).args[0][1]
+          ).to.be.jsonEqual({
+            label: 'start0',
+            value: 100,
+          });
+          expect(
+            viewerSendMessageStub.withArgs(
+              'tick',
+              sinon.match(arg => arg.label == 'start1')
+            ).args[0][1]
+          ).to.be.jsonEqual({
+            label: 'start1',
+            delta: 300,
+          });
         });
       });
 
@@ -431,14 +475,17 @@ describes.realWin('performance', {amp: true}, env => {
         expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(0);
         // coreServicesAvailable calls flush once.
         return perf.coreServicesAvailable().then(() => {
-          expect(viewerSendMessageStub.withArgs('sendCsi'))
-              .to.have.callCount(1);
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            1
+          );
           perf.flush();
-          expect(viewerSendMessageStub.withArgs('sendCsi'))
-              .to.have.callCount(2);
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            2
+          );
           perf.flush();
-          expect(viewerSendMessageStub.withArgs('sendCsi'))
-              .to.have.callCount(3);
+          expect(viewerSendMessageStub.withArgs('sendCsi')).to.have.callCount(
+            3
+          );
         });
       });
     });
@@ -449,9 +496,10 @@ describes.realWin('performance', {amp: true}, env => {
       const res = {
         loadedComplete: false,
       };
-      res.loadedOnce = () => Promise.resolve().then(() => {
-        res.loadedComplete = true;
-      });
+      res.loadedOnce = () =>
+        Promise.resolve().then(() => {
+          res.loadedComplete = true;
+        });
       return res;
     }
 
@@ -463,17 +511,20 @@ describes.realWin('performance', {amp: true}, env => {
     const res2 = resource();
 
     resourcesMock
-        .expects('getResourcesInRect')
-        .withExactArgs(
-            perf.win,
-            sinon.match(arg =>
-              arg.left == 0 &&
-                arg.top == 0 &&
-                arg.width == perf.win.innerWidth &&
-                arg.height == perf.win.innerHeight),
-            /* inPrerender */ true)
-        .returns(Promise.resolve([res1, res2]))
-        .once();
+      .expects('getResourcesInRect')
+      .withExactArgs(
+        perf.win,
+        sinon.match(
+          arg =>
+            arg.left == 0 &&
+            arg.top == 0 &&
+            arg.width == perf.win.innerWidth &&
+            arg.height == perf.win.innerHeight
+        ),
+        /* inPrerender */ true
+      )
+      .returns(Promise.resolve([res1, res2]))
+      .once();
 
     return perf.whenViewportLayoutComplete_().then(() => {
       expect(res1.loadedComplete).to.be.true;
@@ -491,8 +542,7 @@ describes.realWin('performance', {amp: true}, env => {
     let whenViewportLayoutCompleteResolve;
 
     function stubHasBeenVisible(visibility) {
-      sandbox.stub(viewer, 'hasBeenVisible')
-          .returns(visibility);
+      sandbox.stub(viewer, 'hasBeenVisible').returns(visibility);
     }
 
     function getPerformanceMarks() {
@@ -501,10 +551,8 @@ describes.realWin('performance', {amp: true}, env => {
 
     beforeEach(() => {
       viewer = Services.viewerForDoc(ampdoc);
-      sandbox.stub(viewer, 'whenMessagingReady')
-          .returns(Promise.resolve());
-      viewerSendMessageStub = sandbox.stub(viewer,
-          'sendMessage');
+      sandbox.stub(viewer, 'whenMessagingReady').returns(Promise.resolve());
+      viewerSendMessageStub = sandbox.stub(viewer, 'sendMessage');
 
       tickSpy = sandbox.spy(perf, 'tick');
 
@@ -516,15 +564,14 @@ describes.realWin('performance', {amp: true}, env => {
         whenViewportLayoutCompleteResolve = resolve;
       });
 
-      sandbox.stub(viewer, 'whenFirstVisible')
-          .returns(whenFirstVisiblePromise);
-      sandbox.stub(perf, 'whenViewportLayoutComplete_')
-          .returns(whenViewportLayoutCompletePromise);
+      sandbox.stub(viewer, 'whenFirstVisible').returns(whenFirstVisiblePromise);
+      sandbox
+        .stub(perf, 'whenViewportLayoutComplete_')
+        .returns(whenViewportLayoutCompletePromise);
       return viewer.whenMessagingReady();
     });
 
     describe('document started in prerender', () => {
-
       beforeEach(() => {
         clock.tick(100);
         stubHasBeenVisible(false);
@@ -534,111 +581,140 @@ describes.realWin('performance', {amp: true}, env => {
       it('should call prerenderComplete on viewer', () => {
         clock.tick(100);
         whenFirstVisibleResolve();
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns('1');
         sandbox.stub(viewer, 'isEmbedded').returns(true);
         return viewer.whenFirstVisible().then(() => {
           clock.tick(400);
           whenViewportLayoutCompleteResolve();
           return perf.whenViewportLayoutComplete_().then(() => {
-            expect(viewerSendMessageStub.withArgs(
-                'prerenderComplete').firstCall.args[1].value).to.equal(400);
-
-            expect(getPerformanceMarks()).to.have.members(
-                ['ol', 'visible', 'ofv', 'pc']);
+            expect(
+              viewerSendMessageStub.withArgs('prerenderComplete').firstCall
+                .args[1].value
+            ).to.equal(400);
+
+            expect(getPerformanceMarks()).to.have.members([
+              'ol',
+              'visible',
+              'ofv',
+              'pc',
+            ]);
           });
         });
       });
 
-      it('should call prerenderComplete on viewer even if csi is ' +
-        'off', () => {
+      it('should call prerenderComplete on viewer even if csi is off', () => {
         clock.tick(100);
         whenFirstVisibleResolve();
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns(null);
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns(null);
         return viewer.whenFirstVisible().then(() => {
           clock.tick(400);
           whenViewportLayoutCompleteResolve();
           return perf.whenViewportLayoutComplete_().then(() => {
-            expect(viewerSendMessageStub.withArgs(
-                'prerenderComplete').firstCall.args[1].value).to.equal(400);
+            expect(
+              viewerSendMessageStub.withArgs('prerenderComplete').firstCall
+                .args[1].value
+            ).to.equal(400);
           });
         });
       });
 
-      it('should tick `pc` with delta=400 when user request document ' +
-         'to be visible before before first viewport completion', () => {
-        clock.tick(100);
-        whenFirstVisibleResolve();
-        expect(tickSpy).to.have.callCount(2);
-        return viewer.whenFirstVisible().then(() => {
-          clock.tick(400);
-          expect(tickSpy).to.have.callCount(3);
+      it(
+        'should tick `pc` with delta=400 when user request document ' +
+          'to be visible before before first viewport completion',
+        () => {
+          clock.tick(100);
+          whenFirstVisibleResolve();
+          expect(tickSpy).to.have.callCount(2);
+          return viewer.whenFirstVisible().then(() => {
+            clock.tick(400);
+            expect(tickSpy).to.have.callCount(3);
+            whenViewportLayoutCompleteResolve();
+            return perf.whenViewportLayoutComplete_().then(() => {
+              expect(tickSpy).to.have.callCount(3);
+              expect(tickSpy.withArgs('ofv')).to.be.calledOnce;
+              return whenFirstVisiblePromise.then(() => {
+                expect(tickSpy).to.have.callCount(4);
+                expect(tickSpy.withArgs('pc')).to.be.calledOnce;
+                expect(Number(tickSpy.withArgs('pc').args[0][1])).to.equal(400);
+              });
+            });
+          });
+        }
+      );
+
+      it(
+        'should tick `pc` with `delta=0` when viewport is complete ' +
+          'before user request document to be visible',
+        () => {
+          clock.tick(300);
           whenViewportLayoutCompleteResolve();
           return perf.whenViewportLayoutComplete_().then(() => {
-            expect(tickSpy).to.have.callCount(3);
-            expect(tickSpy.withArgs('ofv')).to.be.calledOnce;
+            expect(tickSpy.withArgs('ol')).to.be.calledOnce;
+            expect(tickSpy.withArgs('pc')).to.have.callCount(0);
+            whenFirstVisibleResolve();
             return whenFirstVisiblePromise.then(() => {
-              expect(tickSpy).to.have.callCount(4);
               expect(tickSpy.withArgs('pc')).to.be.calledOnce;
-              expect(Number(tickSpy.withArgs('pc').args[0][1])).to.equal(400);
+              expect(Number(tickSpy.withArgs('pc').args[0][1])).to.equal(0);
+              expect(getPerformanceMarks()).to.have.members([
+                'ol',
+                'pc',
+                'visible',
+                'ofv',
+              ]);
             });
           });
-        });
-      });
-
-      it('should tick `pc` with `delta=0` when viewport is complete ' +
-         'before user request document to be visible', () => {
-        clock.tick(300);
-        whenViewportLayoutCompleteResolve();
-        return perf.whenViewportLayoutComplete_().then(() => {
-          expect(tickSpy.withArgs('ol')).to.be.calledOnce;
-          expect(tickSpy.withArgs('pc')).to.have.callCount(0);
-          whenFirstVisibleResolve();
-          return whenFirstVisiblePromise.then(() => {
-            expect(tickSpy.withArgs('pc')).to.be.calledOnce;
-            expect(Number(tickSpy.withArgs('pc').args[0][1])).to.equal(0);
-            expect(getPerformanceMarks()).to.have.members(
-                ['ol', 'pc', 'visible', 'ofv']);
-          });
-        });
-      });
+        }
+      );
     });
 
     describe('document did not start in prerender', () => {
-
       beforeEach(() => {
         stubHasBeenVisible(true);
         perf.coreServicesAvailable();
       });
 
       it('should call prerenderComplete on viewer', () => {
-        sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+        sandbox
+          .stub(viewer, 'getParam')
+          .withArgs('csi')
+          .returns('1');
         sandbox.stub(viewer, 'isEmbedded').returns(true);
         clock.tick(300);
         whenViewportLayoutCompleteResolve();
         return perf.whenViewportLayoutComplete_().then(() => {
-          expect(viewerSendMessageStub.withArgs(
-              'prerenderComplete').firstCall.args[1].value).to.equal(300);
+          expect(
+            viewerSendMessageStub.withArgs('prerenderComplete').firstCall
+              .args[1].value
+          ).to.equal(300);
           expect(getPerformanceMarks()).to.deep.equal(['ol', 'pc']);
         });
       });
 
-      it('should tick `pc` with `opt_value=undefined` when user requests ' +
-         'document to be visible', () => {
-        clock.tick(300);
-        whenViewportLayoutCompleteResolve();
-        return perf.whenViewportLayoutComplete_().then(() => {
-          expect(tickSpy.withArgs('ol')).to.be.calledOnce;
-          expect(tickSpy.withArgs('pc')).to.be.calledOnce;
-          expect(tickSpy.withArgs('pc').args[0][2]).to.be.undefined;
-          expect(getPerformanceMarks()).to.deep.equal(['ol', 'pc']);
-        });
-      });
+      it(
+        'should tick `pc` with `opt_value=undefined` when user requests ' +
+          'document to be visible',
+        () => {
+          clock.tick(300);
+          whenViewportLayoutCompleteResolve();
+          return perf.whenViewportLayoutComplete_().then(() => {
+            expect(tickSpy.withArgs('ol')).to.be.calledOnce;
+            expect(tickSpy.withArgs('pc')).to.be.calledOnce;
+            expect(tickSpy.withArgs('pc').args[0][2]).to.be.undefined;
+            expect(getPerformanceMarks()).to.deep.equal(['ol', 'pc']);
+          });
+        }
+      );
     });
   });
 });
 
 describes.realWin('performance with experiment', {amp: true}, env => {
-
   let win;
   let perf;
   let viewerSendMessageStub;
@@ -650,7 +726,10 @@ describes.realWin('performance with experiment', {amp: true}, env => {
     const viewer = Services.viewerForDoc(env.ampdoc);
     viewerSendMessageStub = sandbox.stub(viewer, 'sendMessage');
     sandbox.stub(viewer, 'whenMessagingReady').returns(Promise.resolve());
-    sandbox.stub(viewer, 'getParam').withArgs('csi').returns('1');
+    sandbox
+      .stub(viewer, 'getParam')
+      .withArgs('csi')
+      .returns('1');
     sandbox.stub(viewer, 'isEmbedded').returns(true);
     installPerformanceService(win);
     perf = Services.performanceFor(win);
@@ -662,7 +741,8 @@ describes.realWin('performance with experiment', {amp: true}, env => {
       perf.flush();
       expect(viewerSendMessageStub.lastCall.args[0]).to.equal('sendCsi');
       expect(viewerSendMessageStub.lastCall.args[1].ampexp).to.equal(
-          'rtv-' + getMode(win).rtvVersion);
+        'rtv-' + getMode(win).rtvVersion
+      );
     });
   });
 
@@ -673,17 +753,19 @@ describes.realWin('performance with experiment', {amp: true}, env => {
       perf.addEnabledExperiment('experiment-a'); // duplicated entry
       viewerSendMessageStub.reset();
       perf.flush();
-      expect(viewerSendMessageStub).to.be.calledWith('sendCsi',
-          sandbox.match(payload => {
-            const experiments = payload.ampexp.split(',');
-            expect(experiments).to.have.length(3);
-            expect(experiments).to.have.members([
-              'rtv-' + getMode(win).rtvVersion,
-              'experiment-a',
-              'experiment-b',
-            ]);
-            return true;
-          }));
+      expect(viewerSendMessageStub).to.be.calledWith(
+        'sendCsi',
+        sandbox.match(payload => {
+          const experiments = payload.ampexp.split(',');
+          expect(experiments).to.have.length(3);
+          expect(experiments).to.have.members([
+            'rtv-' + getMode(win).rtvVersion,
+            'experiment-a',
+            'experiment-b',
+          ]);
+          return true;
+        })
+      );
     });
   });
 });
@@ -695,13 +777,11 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       this.options = {};
       this.callback_ = callback;
       this.isObserving = false;
-
     }
 
     observe(options) {
       this.options = options;
       this.isObserving = true;
-
     }
 
     disconnect() {
@@ -710,8 +790,8 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
 
     /**
      * Trigger the Observer's callback.
-      * @param {!Array} entries
-      */
+     * @param {!Array} entries
+     */
     triggerCallback(entries) {
       this.callback_(entries, this);
     }
@@ -722,38 +802,42 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       // Pretend that the PaintTiming API exists.
       env.win.PerformancePaintTiming = true;
 
-      const entries = [{
-        duration: 1,
-        entryType: 'paint',
-        name: 'first-paint',
-        startTime: 10,
-      },
-      {
-        duration: 5,
-        entryType: 'paint',
-        name: 'first-contentful-paint',
-        startTime: 10,
-      }];
+      const entries = [
+        {
+          duration: 1,
+          entryType: 'paint',
+          name: 'first-paint',
+          startTime: 10,
+        },
+        {
+          duration: 5,
+          entryType: 'paint',
+          name: 'first-contentful-paint',
+          startTime: 10,
+        },
+      ];
       const getEntriesByType = env.sandbox.stub();
       getEntriesByType.withArgs('paint').returns(entries);
       getEntriesByType.returns([]);
-      env.sandbox.stub(env.win.performance, 'getEntriesByType')
-          .callsFake(getEntriesByType);
+      env.sandbox
+        .stub(env.win.performance, 'getEntriesByType')
+        .callsFake(getEntriesByType);
 
       installPerformanceService(env.win);
 
       const perf = Services.performanceFor(env.win);
 
       expect(perf.events_.length).to.equal(2);
-      expect(perf.events_[0])
-          .to.be.jsonEqual({
-            label: 'fp',
-            delta: 11,
-          },
-          {
-            label: 'fcp',
-            delta: 15,
-          });
+      expect(perf.events_[0]).to.be.jsonEqual(
+        {
+          label: 'fp',
+          delta: 11,
+        },
+        {
+          label: 'fcp',
+          delta: 15,
+        }
+      );
 
       delete env.win.PerformancePaintTiming;
     });
@@ -770,25 +854,28 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
         performanceObserver = new PerformanceObserverImpl(callback);
         return performanceObserver;
       });
-      env.sandbox.stub(env.win, 'PerformanceObserver')
-          .callsFake(PerformanceObserverStub);
+      env.sandbox
+        .stub(env.win, 'PerformanceObserver')
+        .callsFake(PerformanceObserverStub);
 
       installPerformanceService(env.win);
 
       const perf = Services.performanceFor(env.win);
 
-      const entries = [{
-        duration: 1,
-        entryType: 'paint',
-        name: 'first-paint',
-        startTime: 10,
-      },
-      {
-        duration: 5,
-        entryType: 'paint',
-        name: 'first-contentful-paint',
-        startTime: 10,
-      }];
+      const entries = [
+        {
+          duration: 1,
+          entryType: 'paint',
+          name: 'first-paint',
+          startTime: 10,
+        },
+        {
+          duration: 5,
+          entryType: 'paint',
+          name: 'first-contentful-paint',
+          startTime: 10,
+        },
+      ];
       const list = {
         getEntries() {
           return entries;
@@ -797,15 +884,16 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       // Fake a triggering of the firstInput event.
       performanceObserver.triggerCallback(list);
       expect(perf.events_.length).to.equal(2);
-      expect(perf.events_[0])
-          .to.be.jsonEqual({
-            label: 'fp',
-            delta: 11,
-          },
-          {
-            label: 'fcp',
-            delta: 15,
-          });
+      expect(perf.events_[0]).to.be.jsonEqual(
+        {
+          label: 'fp',
+          delta: 11,
+        },
+        {
+          label: 'fcp',
+          delta: 15,
+        }
+      );
       delete env.win.PerformanceEventTiming;
     });
   });
@@ -815,31 +903,33 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       // Pretend that the EventTiming API exists.
       env.win.PerformanceEventTiming = true;
 
-      const entries = [{
-        cancelable: true,
-        duration: 8,
-        entryType: 'firstInput',
-        name: 'mousedown',
-        processingEnd: 105,
-        processingStart: 103,
-        startTime: 100,
-      }];
+      const entries = [
+        {
+          cancelable: true,
+          duration: 8,
+          entryType: 'firstInput',
+          name: 'mousedown',
+          processingEnd: 105,
+          processingStart: 103,
+          startTime: 100,
+        },
+      ];
       const getEntriesByType = env.sandbox.stub();
       getEntriesByType.withArgs('firstInput').returns(entries);
       getEntriesByType.returns([]);
-      env.sandbox.stub(env.win.performance, 'getEntriesByType')
-          .callsFake(getEntriesByType);
+      env.sandbox
+        .stub(env.win.performance, 'getEntriesByType')
+        .callsFake(getEntriesByType);
 
       installPerformanceService(env.win);
 
       const perf = Services.performanceFor(env.win);
 
       expect(perf.events_.length).to.equal(1);
-      expect(perf.events_[0])
-          .to.be.jsonEqual({
-            label: 'fid',
-            delta: 3,
-          });
+      expect(perf.events_[0]).to.be.jsonEqual({
+        label: 'fid',
+        delta: 3,
+      });
 
       delete env.win.PerformanceEventTiming;
     });
@@ -856,22 +946,25 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
         performanceObserver = new PerformanceObserverImpl(callback);
         return performanceObserver;
       });
-      env.sandbox.stub(env.win, 'PerformanceObserver')
-          .callsFake(PerformanceObserverStub);
+      env.sandbox
+        .stub(env.win, 'PerformanceObserver')
+        .callsFake(PerformanceObserverStub);
 
       installPerformanceService(env.win);
 
       const perf = Services.performanceFor(env.win);
 
-      const entries = [{
-        cancelable: true,
-        duration: 8,
-        entryType: 'firstInput',
-        name: 'mousedown',
-        processingEnd: 105,
-        processingStart: 103,
-        startTime: 100,
-      }];
+      const entries = [
+        {
+          cancelable: true,
+          duration: 8,
+          entryType: 'firstInput',
+          name: 'mousedown',
+          processingEnd: 105,
+          processingStart: 103,
+          startTime: 100,
+        },
+      ];
       const list = {
         getEntries() {
           return entries;
@@ -880,11 +973,10 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       // Fake a triggering of the firstInput event.
       performanceObserver.triggerCallback(list);
       expect(perf.events_.length).to.equal(1);
-      expect(perf.events_[0])
-          .to.be.jsonEqual({
-            label: 'fid',
-            delta: 3,
-          });
+      expect(perf.events_[0]).to.be.jsonEqual({
+        label: 'fid',
+        delta: 3,
+      });
       delete env.win.PerformanceEventTiming;
     });
   });
@@ -910,11 +1002,10 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
     });
 
     expect(perf.events_.length).to.equal(1);
-    expect(perf.events_[0])
-        .to.be.jsonEqual({
-          label: 'fid-polyfill',
-          delta: 30,
-        });
+    expect(perf.events_[0]).to.be.jsonEqual({
+      label: 'fid-polyfill',
+      delta: 30,
+    });
 
     // Restore previous window value.
     if (typeof previousPerfMetrics === 'undefined') {
@@ -1014,10 +1105,12 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       expect(fakeWin.document.visibilityState).to.equal('visible');
 
       // Fake layoutJank that occured before the Performance service is started.
-      fakeWin.performance.getEntriesByType.withArgs('layoutJank').returns([
-        {entryType: 'layoutJank', fraction: 0.25},
-        {entryType: 'layoutJank', fraction: 0.3},
-      ]);
+      fakeWin.performance.getEntriesByType
+        .withArgs('layoutJank')
+        .returns([
+          {entryType: 'layoutJank', fraction: 0.25},
+          {entryType: 'layoutJank', fraction: 0.3},
+        ]);
 
       const perf = getPerformance();
       // visibilitychange/beforeunload listeners are now added.
@@ -1058,7 +1151,7 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       expect(perf.events_.length).to.equal(2);
     });
 
-    it('for browsers that don\'t support the visibilitychange event', () => {
+    it("for browsers that don't support the visibilitychange event", () => {
       // Specify an iPhone Safari user agent, which does not support
       // the visibilitychange event.
       sandbox.stub(Services.platformFor(fakeWin), 'isSafari').returns(true);
@@ -1067,10 +1160,12 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       expect(fakeWin.document.visibilityState).to.equal('visible');
 
       // Fake layoutJank that occured before the Performance service is started.
-      fakeWin.performance.getEntriesByType.withArgs('layoutJank').returns([
-        {entryType: 'layoutJank', fraction: 0.25},
-        {entryType: 'layoutJank', fraction: 0.3},
-      ]);
+      fakeWin.performance.getEntriesByType
+        .withArgs('layoutJank')
+        .returns([
+          {entryType: 'layoutJank', fraction: 0.25},
+          {entryType: 'layoutJank', fraction: 0.3},
+        ]);
 
       const perf = getPerformance();
       // visibilitychange/beforeunload listeners are now added.
@@ -1088,5 +1183,4 @@ describes.realWin('PeformanceObserver metrics', {amp: true}, env => {
       });
     });
   });
-
 });
diff --git a/test/unit/test-platform.js b/test/unit/test-platform.js
index a87968dda74e..3300c7a2d5d5 100644
--- a/test/unit/test-platform.js
+++ b/test/unit/test-platform.js
@@ -17,7 +17,6 @@
 import {Platform} from '../../src/service/platform-impl';
 
 describe('Platform', () => {
-
   let isIos;
   let isAndroid;
   let isChrome;
@@ -93,9 +92,10 @@ describe('Platform', () => {
     iosVersion = '8.0';
     iosMajorVersion = 8;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X)' +
-        ' AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0' +
-        ' Mobile/12A4345d Safari/600.1.4';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 8_0 like Mac OS X)' +
+      ' AppleWebKit/600.1.3 (KHTML, like Gecko) Version/8.0' +
+      ' Mobile/12A4345d Safari/600.1.4';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -108,9 +108,10 @@ describe('Platform', () => {
     iosVersion = '9.3';
     iosMajorVersion = 9;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3 like Mac OS X)' +
-        ' AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0' +
-        ' Mobile/13E230 Safari/601.1';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3 like Mac OS X)' +
+      ' AppleWebKit/601.1.46 (KHTML, like Gecko) Version/9.0' +
+      ' Mobile/13E230 Safari/601.1';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -123,9 +124,10 @@ describe('Platform', () => {
     iosVersion = '9.3';
     iosMajorVersion = 9;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3 like Mac OS X)' +
-        ' AppleWebKit/601.1.46 (KHTML, like Gecko)' +
-        ' Mobile/13E230 Safari/601.1';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 9_3 like Mac OS X)' +
+      ' AppleWebKit/601.1.46 (KHTML, like Gecko)' +
+      ' Mobile/13E230 Safari/601.1';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -138,9 +140,10 @@ describe('Platform', () => {
     iosVersion = '10.2.1';
     iosMajorVersion = 10;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_2_1 like Mac OS X)' +
-        ' AppleWebKit/602.4.6 (KHTML, like Gecko) Version/10.0' +
-        ' Mobile/14D27 Safari/602.1';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 10_2_1 like Mac OS X)' +
+      ' AppleWebKit/602.4.6 (KHTML, like Gecko) Version/10.0' +
+      ' Mobile/14D27 Safari/602.1';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -153,9 +156,10 @@ describe('Platform', () => {
     iosVersion = '7.0';
     iosMajorVersion = 7;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X)' +
-        ' AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0' +
-        ' Mobile/11A465 Safari/9537.53';
+    userAgent =
+      'Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X)' +
+      ' AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0' +
+      ' Mobile/11A465 Safari/9537.53';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -168,9 +172,10 @@ describe('Platform', () => {
     iosVersion = '10.2';
     iosMajorVersion = 10;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_2 like Mac OS X)' +
-        ' AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.73' +
-        ' Mobile/16D32 Safari/602.1';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 10_2 like Mac OS X)' +
+      ' AppleWebKit/602.1.50 (KHTML, like Gecko) CriOS/56.0.2924.73' +
+      ' Mobile/16D32 Safari/602.1';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -179,9 +184,10 @@ describe('Platform', () => {
     isSafari = true;
     isWebKit = true;
     majorVersion = 7;
-    userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) ' +
-        'AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 ' +
-        'Safari/7046A194A';
+    userAgent =
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) ' +
+      'AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 ' +
+      'Safari/7046A194A';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -190,9 +196,10 @@ describe('Platform', () => {
     isSafari = true;
     isWebKit = true;
     majorVersion = 12;
-    userAgent = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) ' +
-        'AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 ' +
-        'Safari/605.1.15';
+    userAgent =
+      'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) ' +
+      'AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 ' +
+      'Safari/605.1.15';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -202,9 +209,10 @@ describe('Platform', () => {
     isChrome = true;
     isWebKit = true;
     majorVersion = 44;
-    userAgent = 'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E)' +
-        ' AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20' +
-        ' Mobile Safari/537.36';
+    userAgent =
+      'Mozilla/5.0 (Linux; Android 5.1.1; Nexus 6 Build/LYZ28E)' +
+      ' AppleWebKit/537.36 (KHTML, like Gecko) Chrome/44.0.2403.20' +
+      ' Mobile Safari/537.36';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -214,9 +222,10 @@ describe('Platform', () => {
     isChrome = true;
     isWebKit = true;
     majorVersion = 61;
-    userAgent = 'Mozilla/5.0 (Linux; Android 8.0.0; Pixel XL Build/OPR6.' +
-        '170623.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163' +
-        '.98 Mobile Safari/537.36';
+    userAgent =
+      'Mozilla/5.0 (Linux; Android 8.0.0; Pixel XL Build/OPR6.' +
+      '170623.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163' +
+      '.98 Mobile Safari/537.36';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -224,8 +233,9 @@ describe('Platform', () => {
   it('Firefox', () => {
     isFirefox = true;
     majorVersion = 40;
-    userAgent = 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) ' +
-        'Gecko/20100101 Firefox/40.1';
+    userAgent =
+      'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) ' +
+      'Gecko/20100101 Firefox/40.1';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -238,9 +248,10 @@ describe('Platform', () => {
     iosVersion = '10.3.1';
     iosMajorVersion = 10;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X)' +
-        ' AppleWebKit/603.1.30 (KHTML, like Gecko) FxiOS/7.5b3349' +
-        ' Mobile/14E304 Safari/603.1.30';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_1 like Mac OS X)' +
+      ' AppleWebKit/603.1.30 (KHTML, like Gecko) FxiOS/7.5b3349' +
+      ' Mobile/14E304 Safari/603.1.30';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -250,9 +261,10 @@ describe('Platform', () => {
     majorVersion = 42;
     isAndroid = true;
     isWebKit = true;
-    userAgent = 'Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MTC19T)' +
-        ' AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile' +
-        ' Safari/537.36 OPR/42.7.2246.114996';
+    userAgent =
+      'Mozilla/5.0 (Linux; Android 6.0.1; Nexus 5X Build/MTC19T)' +
+      ' AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile' +
+      ' Safari/537.36 OPR/42.7.2246.114996';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -265,9 +277,10 @@ describe('Platform', () => {
     iosVersion = '10.3.2';
     iosMajorVersion = 10;
     isStandalone = true;
-    userAgent = 'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X)' +
-        ' AppleWebKit/603.2.4 (KHTML, like Gecko) OPiOS/14.0.0.104835' +
-        ' Mobile/14F89 Safari/9537.53';
+    userAgent =
+      'Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_2 like Mac OS X)' +
+      ' AppleWebKit/603.2.4 (KHTML, like Gecko) OPiOS/14.0.0.104835' +
+      ' Mobile/14F89 Safari/9537.53';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -275,8 +288,9 @@ describe('Platform', () => {
   it('IE', () => {
     isIe = true;
     majorVersion = 10;
-    userAgent = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 7.0;' +
-        ' InfoPath.3; .NET CLR 3.1.40767; Trident/6.0; en-IN)';
+    userAgent =
+      'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 7.0;' +
+      ' InfoPath.3; .NET CLR 3.1.40767; Trident/6.0; en-IN)';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -284,8 +298,9 @@ describe('Platform', () => {
   it('IEMobile', () => {
     isIe = true;
     majorVersion = 10;
-    userAgent = 'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0;' +
-        ' Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)';
+    userAgent =
+      'Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0;' +
+      ' Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520)';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
@@ -293,9 +308,10 @@ describe('Platform', () => {
   it('Edge', () => {
     isEdge = true;
     majorVersion = 12;
-    userAgent = 'Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36' +
-        ' (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36' +
-        ' Edge/12.10136';
+    userAgent =
+      'Mozilla/5.0 (Windows NT 10.0) AppleWebKit/537.36' +
+      ' (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36' +
+      ' Edge/12.10136';
     testUserAgent(userAgent);
     testStandalone(userAgent, isStandalone);
   });
diff --git a/test/unit/test-polyfill-array-includes.js b/test/unit/test-polyfill-array-includes.js
index ada4adf5159d..2e9523185a94 100644
--- a/test/unit/test-polyfill-array-includes.js
+++ b/test/unit/test-polyfill-array-includes.js
@@ -17,7 +17,6 @@
 import {install} from '../../src/polyfills/array-includes';
 
 describes.fakeWin('Array.includes', {}, env => {
-
   beforeEach(() => {
     env.win.Array = Array;
     install(env.win);
diff --git a/test/unit/test-polyfill-document-contains.js b/test/unit/test-polyfill-document-contains.js
index c5f2f157429e..c30ffd1acf4b 100644
--- a/test/unit/test-polyfill-document-contains.js
+++ b/test/unit/test-polyfill-document-contains.js
@@ -16,9 +16,7 @@
 
 import {install} from '../../src/polyfills/document-contains';
 
-
 describe('HTMLDocument.contains', () => {
-
   let sandbox;
   let fakeWinWithContains;
   let fakeWinWithoutContains;
@@ -41,8 +39,7 @@ describe('HTMLDocument.contains', () => {
     nativeContains = fakeWinWithContains.HTMLDocument.prototype.contains;
 
     fakeWinWithoutContains = {
-      HTMLDocument: class {
-      },
+      HTMLDocument: class {},
       Object: window.Object,
     };
     install(fakeWinWithoutContains);
@@ -67,8 +64,9 @@ describe('HTMLDocument.contains', () => {
 
   it('should NOT override an existing method', () => {
     install(fakeWinWithContains);
-    expect(fakeWinWithContains.HTMLDocument.prototype.contains)
-        .to.equal(nativeContains);
+    expect(fakeWinWithContains.HTMLDocument.prototype.contains).to.equal(
+      nativeContains
+    );
   });
 
   it('should override a existing method', () => {
@@ -90,8 +88,8 @@ describe('HTMLDocument.contains', () => {
 
   it('should be inclusionary for documentElement', () => {
     expect(document.contains(document.documentElement)).to.be.true;
-    expect(polyfillContains.call(document, document.documentElement))
-        .to.be.true;
+    expect(polyfillContains.call(document, document.documentElement)).to.be
+      .true;
   });
 
   it('should be inclusionary for document itself', () => {
diff --git a/test/unit/test-polyfill-domtokenlist-toggle.js b/test/unit/test-polyfill-domtokenlist-toggle.js
index bc01a99cb601..485194dc6661 100644
--- a/test/unit/test-polyfill-domtokenlist-toggle.js
+++ b/test/unit/test-polyfill-domtokenlist-toggle.js
@@ -17,96 +17,103 @@
 import {install} from '../../src/polyfills/domtokenlist-toggle';
 import {toArray} from '../../src/types';
 
-
-describes.fakeWin('DOMTokenList.toggle on non-IE', {
-  win: {
-    navigator: {
-      userAgent: 'Chrome',
+describes.fakeWin(
+  'DOMTokenList.toggle on non-IE',
+  {
+    win: {
+      navigator: {
+        userAgent: 'Chrome',
+      },
     },
   },
-}, env => {
-
-  let sandbox;
-  let originalToggle;
-  let element;
-
-  beforeEach(() => {
-    originalToggle = env.win.DOMTokenList.prototype.toggle;
-    sandbox = sinon.sandbox;
-
-    element = env.win.document.createElement('div');
-    env.win.document.body.appendChild(element);
-  });
-
-  afterEach(() => {
-    env.win.DOMTokenList.prototype.toggle = originalToggle;
-    if (element.parentNode) {
-      element.parentNode.removeChild(element);
-    }
-    sandbox.restore();
-  });
-
-  it('should NOT override in non-IE browsers', () => {
-    env.win.DOMTokenList = window.DOMTokenList;
-    install(env.win);
-    const newToggle = env.win.DOMTokenList.prototype.toggle;
-    expect(newToggle).to.equal(originalToggle);
-  });
-
-});
-
-describes.fakeWin('DOMTokenList.toggle On IE', {
-  win: {
-    navigator: {
-      userAgent: 'MSIE',
+  env => {
+    let sandbox;
+    let originalToggle;
+    let element;
+
+    beforeEach(() => {
+      originalToggle = env.win.DOMTokenList.prototype.toggle;
+      sandbox = sinon.sandbox;
+
+      element = env.win.document.createElement('div');
+      env.win.document.body.appendChild(element);
+    });
+
+    afterEach(() => {
+      env.win.DOMTokenList.prototype.toggle = originalToggle;
+      if (element.parentNode) {
+        element.parentNode.removeChild(element);
+      }
+      sandbox.restore();
+    });
+
+    it('should NOT override in non-IE browsers', () => {
+      env.win.DOMTokenList = window.DOMTokenList;
+      install(env.win);
+      const newToggle = env.win.DOMTokenList.prototype.toggle;
+      expect(newToggle).to.equal(originalToggle);
+    });
+  }
+);
+
+describes.fakeWin(
+  'DOMTokenList.toggle On IE',
+  {
+    win: {
+      navigator: {
+        userAgent: 'MSIE',
+      },
     },
   },
-}, env => {
-
-  let sandbox;
-  let originalToggle;
-  let element;
-
-  beforeEach(() => {
-    originalToggle = env.win.DOMTokenList.prototype.toggle;
-    sandbox = sinon.sandbox;
-
-    element = env.win.document.createElement('div');
-    env.win.document.body.appendChild(element);
-  });
-
-  afterEach(() => {
-    env.win.DOMTokenList.prototype.toggle = originalToggle;
-    if (element.parentNode) {
-      element.parentNode.removeChild(element);
-    }
-    sandbox.restore();
-  });
-
-  it('should polyfill DOMTokenList.toggle API', () => {
-    env.win.DOMTokenList = window.DOMTokenList;
-    install(env.win);
-    const polyfillToggle = env.win.DOMTokenList.prototype.toggle;
-
-    expect(polyfillToggle).to.be.ok;
-    expect(polyfillToggle).to.not.equal(originalToggle);
-
-    expect(toArray(element.classList)).to.not.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first')).to.be.true;
-    expect(toArray(element.classList)).to.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first')).to.be.false;
-    expect(toArray(element.classList)).to.not.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first')).to.be.true;
-    expect(toArray(element.classList)).to.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first', true)).to.be.true;
-    expect(toArray(element.classList)).to.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first', true)).to.be.true;
-    expect(toArray(element.classList)).to.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first', false)).to.be.false;
-    expect(toArray(element.classList)).to.not.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first', false)).to.be.false;
-    expect(toArray(element.classList)).to.not.contain('first');
-    expect(polyfillToggle.call(element.classList, 'first', false)).to.be.false;
-    expect(toArray(element.classList)).to.not.contain('first');
-  });
-});
+  env => {
+    let sandbox;
+    let originalToggle;
+    let element;
+
+    beforeEach(() => {
+      originalToggle = env.win.DOMTokenList.prototype.toggle;
+      sandbox = sinon.sandbox;
+
+      element = env.win.document.createElement('div');
+      env.win.document.body.appendChild(element);
+    });
+
+    afterEach(() => {
+      env.win.DOMTokenList.prototype.toggle = originalToggle;
+      if (element.parentNode) {
+        element.parentNode.removeChild(element);
+      }
+      sandbox.restore();
+    });
+
+    it('should polyfill DOMTokenList.toggle API', () => {
+      env.win.DOMTokenList = window.DOMTokenList;
+      install(env.win);
+      const polyfillToggle = env.win.DOMTokenList.prototype.toggle;
+
+      expect(polyfillToggle).to.be.ok;
+      expect(polyfillToggle).to.not.equal(originalToggle);
+
+      expect(toArray(element.classList)).to.not.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first')).to.be.true;
+      expect(toArray(element.classList)).to.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first')).to.be.false;
+      expect(toArray(element.classList)).to.not.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first')).to.be.true;
+      expect(toArray(element.classList)).to.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first', true)).to.be.true;
+      expect(toArray(element.classList)).to.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first', true)).to.be.true;
+      expect(toArray(element.classList)).to.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first', false)).to.be
+        .false;
+      expect(toArray(element.classList)).to.not.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first', false)).to.be
+        .false;
+      expect(toArray(element.classList)).to.not.contain('first');
+      expect(polyfillToggle.call(element.classList, 'first', false)).to.be
+        .false;
+      expect(toArray(element.classList)).to.not.contain('first');
+    });
+  }
+);
diff --git a/test/unit/test-polyfill-object-assign.js b/test/unit/test-polyfill-object-assign.js
index 80c9eedcb3a4..e300eecaa805 100644
--- a/test/unit/test-polyfill-object-assign.js
+++ b/test/unit/test-polyfill-object-assign.js
@@ -19,9 +19,11 @@ import {assign} from '../../src/polyfills/object-assign';
 describe('Object.assign', () => {
   it('should throw an error if target is null or undefined', () => {
     expect(() => assign(null, {a: 1})).to.throw(
-        /Cannot convert undefined or null to object/);
+      /Cannot convert undefined or null to object/
+    );
     expect(() => assign(undefined, {a: 1})).to.throw(
-        /Cannot convert undefined or null to object/);
+      /Cannot convert undefined or null to object/
+    );
   });
 
   it('should ignore null or undefined sources', () => {
diff --git a/test/unit/test-position-observer.js b/test/unit/test-position-observer.js
index 8c498f49ace9..172ae3e4954e 100644
--- a/test/unit/test-position-observer.js
+++ b/test/unit/test-position-observer.js
@@ -15,12 +15,8 @@
  */
 
 import * as lolex from 'lolex';
-import {
-  PositionObserver,
-} from '../../src/service/position-observer/position-observer-impl';
-import {
-  PositionObserverFidelity,
-} from '../../src/service/position-observer/position-observer-worker';
+import {PositionObserver} from '../../src/service/position-observer/position-observer-impl';
+import {PositionObserverFidelity} from '../../src/service/position-observer/position-observer-worker';
 import {Services} from '../../src/services';
 import {layoutRectLtwh} from '../../src/layout-rect';
 import {macroTask} from '../../testing/yield';
@@ -96,7 +92,7 @@ describes.realWin('PositionObserver', {amp: 1}, env => {
           return Promise.resolve(layoutRectLtwh(0, top, 0, 0));
         });
       });
-      it('should update new position with scroll event', function* () {
+      it('should update new position with scroll event', function*() {
         const spy = sandbox.spy();
         posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
         clock.tick(2);
@@ -122,7 +118,7 @@ describes.realWin('PositionObserver', {amp: 1}, env => {
         expect(spy).to.not.be.called;
       });
 
-      it('should not update if element position does not change', function* () {
+      it('should not update if element position does not change', function*() {
         const spy = sandbox.spy();
         posOb.observe(elem, PositionObserverFidelity.HIGH, spy);
         yield macroTask();
@@ -142,7 +138,7 @@ describes.realWin('PositionObserver', {amp: 1}, env => {
         });
       });
 
-      it('overlap with viewport', function* () {
+      it('overlap with viewport', function*() {
         const viewport = Services.viewportForDoc(ampdoc);
         const sizes = viewport.getSize();
         const spy = sandbox.spy();
@@ -174,7 +170,7 @@ describes.realWin('PositionObserver', {amp: 1}, env => {
         });
       });
 
-      it('out of viewport', function* () {
+      it('out of viewport', function*() {
         setStyles(elem, {
           'position': 'absolute',
           'top': '1px',
diff --git a/test/unit/test-preconnect.js b/test/unit/test-preconnect.js
index 7b8037f9a877..d14135b2f7e0 100644
--- a/test/unit/test-preconnect.js
+++ b/test/unit/test-preconnect.js
@@ -16,11 +16,12 @@
 
 import * as lolex from 'lolex';
 import {createIframePromise} from '../../testing/iframe';
-import {preconnectForElement, setPreconnectFeaturesForTesting} from
-  '../../src/preconnect';
+import {
+  preconnectForElement,
+  setPreconnectFeaturesForTesting,
+} from '../../src/preconnect';
 
 describe('preconnect', () => {
-
   let sandbox;
   let iframeClock;
   let clock;
@@ -88,22 +89,30 @@ describe('preconnect', () => {
       preconnect.url('https://a.preconnect.com/foo/bar');
       preconnect.url('https://a.preconnect.com/other');
       preconnect.url(javascriptUrlPrefix + ':alert()');
-      expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-          .to.have.length(0);
+      expect(
+        iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+      ).to.have.length(0);
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=dns-prefetch]').href)
-            .to.equal('https://a.preconnect.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=preconnect]').href)
-            .to.equal('https://a.preconnect.com/');
         expect(
-            iframe.doc.querySelector('link[rel=preconnect]')
-                .getAttribute('referrerpolicy')).to.equal('origin');
-        expect(iframe.doc.querySelectorAll('link[rel=preload]'))
-            .to.have.length(0);
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(1);
+        expect(
+          iframe.doc.querySelector('link[rel=dns-prefetch]').href
+        ).to.equal('https://a.preconnect.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
+        expect(iframe.doc.querySelector('link[rel=preconnect]').href).to.equal(
+          'https://a.preconnect.com/'
+        );
+        expect(
+          iframe.doc
+            .querySelector('link[rel=preconnect]')
+            .getAttribute('referrerpolicy')
+        ).to.equal('origin');
+        expect(iframe.doc.querySelectorAll('link[rel=preload]')).to.have.length(
+          0
+        );
         expect(open).to.have.not.been.called;
       });
     });
@@ -117,20 +126,27 @@ describe('preconnect', () => {
       preconnect.url('https://a.preconnect.com/foo/bar');
       preconnect.url('https://a.preconnect.com/other');
       preconnect.url(javascriptUrlPrefix + ':alert()');
-      expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-          .to.have.length(0);
+      expect(
+        iframe.doc.querySelectorAll('link[rel=preconnect]')
+      ).to.have.length(0);
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(0);
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=preconnect]').href)
-            .to.equal('https://a.preconnect.com/');
         expect(
-            iframe.doc.querySelector('link[rel=preconnect]')
-                .getAttribute('referrerpolicy')).to.equal('origin');
-        expect(iframe.doc.querySelectorAll('link[rel=preload]'))
-            .to.have.length(0);
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(0);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
+        expect(iframe.doc.querySelector('link[rel=preconnect]').href).to.equal(
+          'https://a.preconnect.com/'
+        );
+        expect(
+          iframe.doc
+            .querySelector('link[rel=preconnect]')
+            .getAttribute('referrerpolicy')
+        ).to.equal('origin');
+        expect(iframe.doc.querySelectorAll('link[rel=preload]')).to.have.length(
+          0
+        );
         expect(open).to.have.not.been.called;
       });
     });
@@ -145,25 +161,32 @@ describe('preconnect', () => {
       preconnect.url('https://s.preconnect.com/foo/bar');
       preconnect.url('https://s.preconnect.com/other');
       preconnect.url(javascriptUrlPrefix + ':alert()');
-      expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-          .to.have.length(0);
+      expect(
+        iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+      ).to.have.length(0);
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=dns-prefetch]').href)
-            .to.equal('https://s.preconnect.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=preconnect]').href)
-            .to.equal('https://s.preconnect.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=preload]'))
-            .to.have.length(0);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(1);
+        expect(
+          iframe.doc.querySelector('link[rel=dns-prefetch]').href
+        ).to.equal('https://s.preconnect.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
+        expect(iframe.doc.querySelector('link[rel=preconnect]').href).to.equal(
+          'https://s.preconnect.com/'
+        );
+        expect(iframe.doc.querySelectorAll('link[rel=preload]')).to.have.length(
+          0
+        );
         expect(open).to.be.calledOnce;
         expect(send).to.be.calledOnce;
         expect(open.args[0][1]).to.equal(
-            'https://s.preconnect.com/robots.txt?_AMP_safari_' +
+          'https://s.preconnect.com/robots.txt?_AMP_safari_' +
             'preconnect_polyfill_cachebust=' +
-            '1485531180000');
+            '1485531180000'
+        );
       });
     });
   });
@@ -172,20 +195,26 @@ describe('preconnect', () => {
     return getPreconnectIframe().then(iframe => {
       preconnect.url('https://c.preconnect.com/foo/bar');
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
         iframeClock.tick(9000);
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
         iframeClock.tick(1000);
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(0);
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(0);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(0);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(0);
       });
     });
   });
@@ -196,14 +225,18 @@ describe('preconnect', () => {
       // Different origin
       preconnect.url('https://e.preconnect.com/other');
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(2);
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]')[0].href)
-            .to.equal('https://d.preconnect.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]')[1].href)
-            .to.equal('https://e.preconnect.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(2);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(2);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')[0].href
+        ).to.equal('https://d.preconnect.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')[1].href
+        ).to.equal('https://e.preconnect.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(2);
       });
     });
   });
@@ -212,22 +245,26 @@ describe('preconnect', () => {
     return getPreconnectIframe().then(iframe => {
       preconnect.url('https://x.preconnect.com/foo/bar');
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
         iframeClock.tick(9000);
         preconnect.url('https://x.preconnect.com/foo/bar');
         return visible.then(() => {
-          expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-              .to.have.length(1);
+          expect(
+            iframe.doc.querySelectorAll('link[rel=preconnect]')
+          ).to.have.length(1);
           iframeClock.tick(1000);
-          expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-              .to.have.length(0);
+          expect(
+            iframe.doc.querySelectorAll('link[rel=preconnect]')
+          ).to.have.length(0);
           // After timeout preconnect creates a new tag.
           clock.tick(10000);
           preconnect.url('https://x.preconnect.com/foo/bar');
           return visible.then(() => {
-            expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-                .to.have.length(1);
+            expect(
+              iframe.doc.querySelectorAll('link[rel=preconnect]')
+            ).to.have.length(1);
           });
         });
       });
@@ -236,24 +273,30 @@ describe('preconnect', () => {
 
   it('should timeout preconnects longer with active connect', () => {
     return getPreconnectIframe().then(iframe => {
-      preconnect.url('https://y.preconnect.com/foo/bar',
-          /* opt_alsoConnecting */ true);
+      preconnect.url(
+        'https://y.preconnect.com/foo/bar',
+        /* opt_alsoConnecting */ true
+      );
       return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
         iframeClock.tick(10000);
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(0);
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(0);
         clock.tick(10000);
         return visible.then(() => {
           preconnect.url('https://y.preconnect.com/foo/bar');
-          expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-              .to.have.length(0);
+          expect(
+            iframe.doc.querySelectorAll('link[rel=preconnect]')
+          ).to.have.length(0);
           clock.tick(180 * 1000);
           return visible.then(() => {
             preconnect.url('https://y.preconnect.com/foo/bar');
-            expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-                .to.have.length(1);
+            expect(
+              iframe.doc.querySelectorAll('link[rel=preconnect]')
+            ).to.have.length(1);
           });
         });
       });
@@ -261,32 +304,33 @@ describe('preconnect', () => {
   });
 
   // TODO(cramforce, #11827): Make this test work on Safari.
-  it.configure().skipSafari().run('should add links if feature ' +
-      'if detected', () => {
-    // Don't stub preload support allow the test to run through the browser
-    // default regardless of support or not.
-    return getPreconnectIframe(/* detectFeatures */ true).then(iframe => {
-      preconnect.preload('https://a.prefetch.com/foo/bar', 'script');
-      preconnect.preload('https://a.prefetch.com/foo/bar');
-      preconnect.preload('https://a.prefetch.com/other', 'style');
-      preconnect.preload(javascriptUrlPrefix + ':alert()');
-      const fetches = iframe.doc.querySelectorAll(
-          'link[rel=preload]');
-      expect(fetches).to.have.length(0);
-      return visible.then(() => {
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=preconnect]').href)
-            .to.equal('https://a.prefetch.com/');
-        const fetches = iframe.doc.querySelectorAll(
-            'link[rel=preload]');
-        expect(fetches).to.have.length(2);
-        expect(fetches[0].href).to.equal('https://a.prefetch.com/foo/bar');
-        expect(fetches[1].href).to.equal('https://a.prefetch.com/other');
-        expect(fetches[0].getAttribute('referrerpolicy')).to.equal('origin');
+  it.configure()
+    .skipSafari()
+    .run('should add links if feature if detected', () => {
+      // Don't stub preload support allow the test to run through the browser
+      // default regardless of support or not.
+      return getPreconnectIframe(/* detectFeatures */ true).then(iframe => {
+        preconnect.preload('https://a.prefetch.com/foo/bar', 'script');
+        preconnect.preload('https://a.prefetch.com/foo/bar');
+        preconnect.preload('https://a.prefetch.com/other', 'style');
+        preconnect.preload(javascriptUrlPrefix + ':alert()');
+        const fetches = iframe.doc.querySelectorAll('link[rel=preload]');
+        expect(fetches).to.have.length(0);
+        return visible.then(() => {
+          expect(
+            iframe.doc.querySelectorAll('link[rel=preconnect]')
+          ).to.have.length(1);
+          expect(
+            iframe.doc.querySelector('link[rel=preconnect]').href
+          ).to.equal('https://a.prefetch.com/');
+          const fetches = iframe.doc.querySelectorAll('link[rel=preload]');
+          expect(fetches).to.have.length(2);
+          expect(fetches[0].href).to.equal('https://a.prefetch.com/foo/bar');
+          expect(fetches[1].href).to.equal('https://a.prefetch.com/other');
+          expect(fetches[0].getAttribute('referrerpolicy')).to.equal('origin');
+        });
       });
     });
-  });
 
   it('should preload', () => {
     preloadSupported = true;
@@ -297,17 +341,20 @@ describe('preconnect', () => {
       preconnect.preload(javascriptUrlPrefix + ':alert()');
       return visible.then(() => {
         // Also preconnects.
-        expect(iframe.doc.querySelectorAll('link[rel=dns-prefetch]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=dns-prefetch]').href)
-            .to.equal('https://a.prefetch.com/');
-        expect(iframe.doc.querySelectorAll('link[rel=preconnect]'))
-            .to.have.length(1);
-        expect(iframe.doc.querySelector('link[rel=preconnect]').href)
-            .to.equal('https://a.prefetch.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=dns-prefetch]')
+        ).to.have.length(1);
+        expect(
+          iframe.doc.querySelector('link[rel=dns-prefetch]').href
+        ).to.equal('https://a.prefetch.com/');
+        expect(
+          iframe.doc.querySelectorAll('link[rel=preconnect]')
+        ).to.have.length(1);
+        expect(iframe.doc.querySelector('link[rel=preconnect]').href).to.equal(
+          'https://a.prefetch.com/'
+        );
         // Actual preload
-        const preloads = iframe.doc.querySelectorAll(
-            'link[rel=preload]');
+        const preloads = iframe.doc.querySelectorAll('link[rel=preload]');
         expect(preloads).to.have.length(2);
         expect(preloads[0].href).to.equal('https://a.prefetch.com/foo/bar');
         expect(preloads[1].href).to.equal('https://a.prefetch.com/other');
diff --git a/test/unit/test-pull-to-refresh.js b/test/unit/test-pull-to-refresh.js
index dca8bd448c49..0baab09f55b2 100644
--- a/test/unit/test-pull-to-refresh.js
+++ b/test/unit/test-pull-to-refresh.js
@@ -16,9 +16,7 @@
 
 import {PullToRefreshBlocker} from '../../src/pull-to-refresh';
 
-
 describe('PullToRefreshBlocker', () => {
-
   let sandbox;
   let eventListeners;
   let viewportMock;
@@ -66,7 +64,6 @@ describe('PullToRefreshBlocker', () => {
     expect(eventListeners['touchcancel']).to.equal(undefined);
   });
 
-
   it('should start tracking on touch start', () => {
     sendEvent({type: 'touchstart', touches: [{clientY: 111}]});
 
@@ -92,12 +89,14 @@ describe('PullToRefreshBlocker', () => {
   });
 
   it('should NOT start tracking when scrolled', () => {
-    viewportMock.expects('getScrollTop').returns(11).once();
+    viewportMock
+      .expects('getScrollTop')
+      .returns(11)
+      .once();
     sendEvent({type: 'touchstart', touches: [{clientY: 111}]});
     expect(blocker.tracking_).to.equal(false);
   });
 
-
   it('should stop tracking on touch end', () => {
     sendEvent({type: 'touchstart', touches: [{clientY: 111}]});
     expect(blocker.tracking_).to.equal(true);
@@ -124,14 +123,12 @@ describe('PullToRefreshBlocker', () => {
     expect(eventListeners['touchcancel']).to.equal(undefined);
   });
 
-
   it('should cancel pull down on touch move', () => {
     sendEvent({type: 'touchstart', touches: [{clientY: 111}]});
     expect(blocker.tracking_).to.equal(true);
 
     const preventDefault = sandbox.spy();
-    sendEvent({type: 'touchmove', touches: [{clientY: 112}]},
-        preventDefault);
+    sendEvent({type: 'touchmove', touches: [{clientY: 112}]}, preventDefault);
     expect(blocker.tracking_).to.equal(false);
     expect(preventDefault).to.be.calledOnce;
 
@@ -146,8 +143,7 @@ describe('PullToRefreshBlocker', () => {
     expect(blocker.tracking_).to.equal(true);
 
     const preventDefault = sandbox.spy();
-    sendEvent({type: 'touchmove', touches: [{clientY: 100}]},
-        preventDefault);
+    sendEvent({type: 'touchmove', touches: [{clientY: 100}]}, preventDefault);
     expect(blocker.tracking_).to.equal(false);
     expect(preventDefault).to.have.not.been.called;
 
@@ -162,8 +158,7 @@ describe('PullToRefreshBlocker', () => {
     expect(blocker.tracking_).to.equal(true);
 
     const preventDefault = sandbox.spy();
-    sendEvent({type: 'touchmove', touches: [{clientY: 111}]},
-        preventDefault);
+    sendEvent({type: 'touchmove', touches: [{clientY: 111}]}, preventDefault);
     expect(blocker.tracking_).to.equal(true);
     expect(preventDefault).to.have.not.been.called;
 
diff --git a/test/unit/test-purifier.js b/test/unit/test-purifier.js
index a86b3490f8aa..d8c97b2c0522 100644
--- a/test/unit/test-purifier.js
+++ b/test/unit/test-purifier.js
@@ -25,7 +25,6 @@ let purify;
 let html;
 
 describe('DOMPurify-based', () => {
-
   beforeEach(() => {
     html = document.createElement('html');
     const documentEl = {documentElement: html};
@@ -50,8 +49,9 @@ describe('DOMPurify-based', () => {
     });
 
     it('should not allow script[type="text/javascript"]', () => {
-      expect(purify('<script type="text/javascript">alert(1)</script>'))
-          .to.equal('');
+      expect(
+        purify('<script type="text/javascript">alert(1)</script>')
+      ).to.equal('');
     });
 
     it('should not allow script[type="application/javascript"]', () => {
@@ -76,76 +76,97 @@ describe('DOMPurify-based', () => {
       // Should not allow an insecure tag preceding a secure one.
       expect(purify('<script>alert(1)</script>' + html)).to.equal(html);
       // Should not allow an insecure tag containing a secure one.
-      expect(purify('<script>alert(1)' +
-          '<script type="application/json">{}</script></script>')).to.equal('');
+      expect(
+        purify(
+          '<script>alert(1)' +
+            '<script type="application/json">{}</script></script>'
+        )
+      ).to.equal('');
     });
   });
 
   describe('for <amp-bind>', () => {
     it('should rewrite [text] and [class] attributes', () => {
-      expect(purify('<p [text]="foo"></p>')).to.be
-          .equal('<p data-amp-bind-text="foo" i-amphtml-binding=""></p>');
-      expect(purify('<p [class]="bar"></p>')).to.be
-          .equal('<p data-amp-bind-class="bar" i-amphtml-binding=""></p>');
+      expect(purify('<p [text]="foo"></p>')).to.be.equal(
+        '<p data-amp-bind-text="foo" i-amphtml-binding=""></p>'
+      );
+      expect(purify('<p [class]="bar"></p>')).to.be.equal(
+        '<p data-amp-bind-class="bar" i-amphtml-binding=""></p>'
+      );
     });
 
     it('should add "i-amphtml-binding" for data-amp-bind-*', () => {
-      expect(purify('<p data-amp-bind-text="foo"></p>')).to.be
-          .equal('<p i-amphtml-binding="" data-amp-bind-text="foo"></p>');
+      expect(purify('<p data-amp-bind-text="foo"></p>')).to.be.equal(
+        '<p i-amphtml-binding="" data-amp-bind-text="foo"></p>'
+      );
     });
 
     it('should NOT rewrite values of binding attributes', () => {
       // Should not change "foo.bar".
       expect(purify('<a [href]="foo.bar">link</a>')).to.equal(
-          '<a data-amp-bind-href="foo.bar" i-amphtml-binding="">link</a>');
+        '<a data-amp-bind-href="foo.bar" i-amphtml-binding="">link</a>'
+      );
     });
   });
 
   // Select SVG XSS tests from https://html5sec.org/#svg.
   describe('SVG', () => {
     it('should prevent XSS via <G> tag and onload attribute', () => {
-      const svg = '<svg xmlns="http://www.w3.org/2000/svg">'
-          + '<g onload="javascript:alert(1)"></g></svg>';
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<g onload="javascript:alert(1)"></g></svg>';
       expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg"><g></g></svg>');
+        '<svg xmlns="http://www.w3.org/2000/svg"><g></g></svg>'
+      );
     });
 
     it('should prevent XSS via <SCRIPT> tag', () => {
-      const svg = '<svg xmlns="http://www.w3.org/2000/svg">'
-          + '<script>alert(1)</script></svg>';
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<script>alert(1)</script></svg>';
       expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg"></svg>');
+        '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
+      );
     });
 
-    it('should prevent automatic execution of onload attribute without other '
-        + 'SVG elements', () => {
-      const svg = '<svg onload="javascript:alert(1)" '
-          + 'xmlns="http://www.w3.org/2000/svg"></svg>';
-      expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg"></svg>');
-    });
+    it(
+      'should prevent automatic execution of onload attribute without other ' +
+        'SVG elements',
+      () => {
+        const svg =
+          '<svg onload="javascript:alert(1)" ' +
+          'xmlns="http://www.w3.org/2000/svg"></svg>';
+        expect(purify(svg)).to.equal(
+          '<svg xmlns="http://www.w3.org/2000/svg"></svg>'
+        );
+      }
+    );
 
     it('should prevent simple passive XSS via XLink', () => {
-      const svg = '<svg xmlns="http://www.w3.org/2000/svg">'
-          + '<a xmlns:xlink="http://www.w3.org/1999/xlink" '
-          + 'xlink:href="javascript:alert(1)">'
-          + '<rect width="1000" height="1000" fill="white"/></a></svg>';
+      const svg =
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+        '<a xmlns:xlink="http://www.w3.org/1999/xlink" ' +
+        'xlink:href="javascript:alert(1)">' +
+        '<rect width="1000" height="1000" fill="white"/></a></svg>';
       expect(purify(svg)).to.equal(
-          '<svg xmlns="http://www.w3.org/2000/svg">'
-          + '<a xmlns:xlink="http://www.w3.org/1999/xlink">' +
-          '<rect fill="white" height="1000" width="1000"></rect></a></svg>');
+        '<svg xmlns="http://www.w3.org/2000/svg">' +
+          '<a xmlns:xlink="http://www.w3.org/1999/xlink">' +
+          '<rect fill="white" height="1000" width="1000"></rect></a></svg>'
+      );
     });
 
     it('should prevent XSS via "from" attribute in SVG and inline-SVG', () => {
-      const svg = '<svg>'
-          + '<a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?">'
-          + '<circle r="400"></circle>'
-          + '<animate attributeName="xlink:href" begin="0" '
-          + 'from="javascript:alert(1)" to="&" />'
-          + '</a></svg>';
+      const svg =
+        '<svg>' +
+        '<a xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="?">' +
+        '<circle r="400"></circle>' +
+        '<animate attributeName="xlink:href" begin="0" ' +
+        'from="javascript:alert(1)" to="&" />' +
+        '</a></svg>';
       expect(purify(svg)).to.equal(
-          '<svg><a xlink:href="?" xmlns:xlink="http://www.w3.org/1999/xlink">'
-          + '<circle r="400"></circle></a></svg>');
+        '<svg><a xlink:href="?" xmlns:xlink="http://www.w3.org/1999/xlink">' +
+          '<circle r="400"></circle></a></svg>'
+      );
     });
   });
 });
@@ -179,16 +200,19 @@ function runSanitizerTests() {
 
     it('should output valid markup', () => {
       expect(purify('<h1>abc</h1>')).to.be.equal('<h1>abc</h1>');
-      expect(purify('<h1>a<i>b</i>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i>c</h1>');
+      expect(purify('<h1>a<i>b</i>c</h1>')).to.be.equal('<h1>a<i>b</i>c</h1>');
       expect(purify('<h1>a<i>b</i><br>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i><br>c</h1>');
-      expect(purify(
+        '<h1>a<i>b</i><br>c</h1>'
+      );
+      expect(
+        purify(
           '<h1>a<i>b</i>c' +
-          '<amp-img src="http://example.com/1.png"></amp-img></h1>'))
-          .to.be.equal(
-              '<h1>a<i>b</i>c' +
-              '<amp-img src="http://example.com/1.png"></amp-img></h1>');
+            '<amp-img src="http://example.com/1.png"></amp-img></h1>'
+        )
+      ).to.be.equal(
+        '<h1>a<i>b</i>c' +
+          '<amp-img src="http://example.com/1.png"></amp-img></h1>'
+      );
     });
 
     it('should NOT output security-sensitive markup', () => {
@@ -205,12 +229,9 @@ function runSanitizerTests() {
     });
 
     it('should NOT output security-sensitive markup when nested', () => {
-      expect(purify('a<script><style>b</style></script>c'))
-          .to.be.equal('ac');
-      expect(purify('a<style><iframe>b</iframe></style>c'))
-          .to.be.equal('ac');
-      expect(purify('a<script><img></script>c'))
-          .to.be.equal('ac');
+      expect(purify('a<script><style>b</style></script>c')).to.be.equal('ac');
+      expect(purify('a<style><iframe>b</iframe></style>c')).to.be.equal('ac');
+      expect(purify('a<script><img></script>c')).to.be.equal('ac');
     });
 
     it('should NOT output security-sensitive markup when broken', () => {
@@ -220,41 +241,44 @@ function runSanitizerTests() {
 
     it('should output "on" attribute', () => {
       expect(purify('a<a on="tap:AMP.print">b</a>')).to.be.equal(
-          'a<a on="tap:AMP.print">b</a>');
+        'a<a on="tap:AMP.print">b</a>'
+      );
     });
 
     it('should output "data-, aria-, and role" attributes', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          purify('<a aria-label="bar" data-foo="bar" role="button">b</a>')
+        purify('<a aria-label="bar" data-foo="bar" role="button">b</a>')
       );
       const expected = serialize(
-          '<a aria-label="bar" data-foo="bar" role="button">b</a>');
+        '<a aria-label="bar" data-foo="bar" role="button">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should output "href" attribute', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
-      const actual = serialize(
-          purify('a<a href="http://acme.com/">b</a>')
-      );
+      const actual = serialize(purify('a<a href="http://acme.com/">b</a>'));
       const expected = serialize(
-          'a<a target="_top" href="http://acme.com/">b</a>');
+        'a<a target="_top" href="http://acme.com/">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should allow arbitrary protocols', () => {
       expect(purify('<a href="foo://bar">link</a>')).to.be.equal(
-          '<a target="_top" href="foo://bar">link</a>');
+        '<a target="_top" href="foo://bar">link</a>'
+      );
     });
 
     it('should output "rel" attribute', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          purify('a<a href="http://acme.com/" rel="amphtml">b</a>')
+        purify('a<a href="http://acme.com/" rel="amphtml">b</a>')
       );
       const expected = serialize(
-          'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>');
+        'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
@@ -281,167 +305,202 @@ function runSanitizerTests() {
     it('should default target to _top with href', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          purify('<a href="">a</a><a href="" target="">c</a>')
+        purify('<a href="">a</a><a href="" target="">c</a>')
       );
       const expected = serialize(
-          '<a href="" target="_top">a</a><a href="" target="_top">c</a>');
+        '<a href="" target="_top">a</a><a href="" target="_top">c</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should NOT default target to _top w/o href', () => {
-      expect(purify(
-          '<a>b</a>'
-          + '<a target="">d</a>'
-      )).to.equal(
-          '<a>b</a>'
-          + '<a target="_top">d</a>');
+      expect(purify('<a>b</a><a target="">d</a>')).to.equal(
+        '<a>b</a><a target="_top">d</a>'
+      );
     });
 
     it('should output a valid target', () => {
-      expect(purify('<a target="_top">a</a><a target="_blank">b</a>'))
-          .to.equal('<a target="_top">a</a><a target="_blank">b</a>');
+      expect(purify('<a target="_top">a</a><a target="_blank">b</a>')).to.equal(
+        '<a target="_top">a</a><a target="_blank">b</a>'
+      );
     });
 
     it('should output a valid target in different case', () => {
-      expect(purify('<a target="_TOP">a</a><a target="_BLANK">b</a>'))
-          .to.equal('<a target="_top">a</a><a target="_blank">b</a>');
+      expect(purify('<a target="_TOP">a</a><a target="_BLANK">b</a>')).to.equal(
+        '<a target="_top">a</a><a target="_blank">b</a>'
+      );
     });
 
     it('should override a unallowed target', () => {
-      expect(purify(
-          '<a target="_self">_self</a>'
-          + '<a target="_parent">_parent</a>'
-          + '<a target="_other">_other</a>'
-          + '<a target="_OTHER">_OTHER</a>'
-          + '<a target="other">other</a>'
-      )).to.equal(
-          '<a target="_top">_self</a>'
-          + '<a target="_top">_parent</a>'
-          + '<a target="_top">_other</a>'
-          + '<a target="_top">_OTHER</a>'
-          + '<a target="_top">other</a>');
+      expect(
+        purify(
+          '<a target="_self">_self</a>' +
+            '<a target="_parent">_parent</a>' +
+            '<a target="_other">_other</a>' +
+            '<a target="_OTHER">_OTHER</a>' +
+            '<a target="other">other</a>'
+        )
+      ).to.equal(
+        '<a target="_top">_self</a>' +
+          '<a target="_top">_parent</a>' +
+          '<a target="_top">_other</a>' +
+          '<a target="_top">_OTHER</a>' +
+          '<a target="_top">other</a>'
+      );
     });
 
     it('should NOT output security-sensitive attributes', () => {
-      expect(purify('a<a onclick="alert">b</a>')).to.be.equal(
-          'a<a>b</a>');
+      expect(purify('a<a onclick="alert">b</a>')).to.be.equal('a<a>b</a>');
       expect(purify('a<a href="javascript:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="JAVASCRIPT:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="vbscript:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="VBSCRIPT:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="data:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="DATA:alert">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
       expect(purify('a<a href="?__amp_source_origin=foo">b</a>')).to.be.equal(
-          'a<a target="_top">b</a>');
+        'a<a target="_top">b</a>'
+      );
     });
 
     it('should NOT output blacklisted values for class attributes', () => {
       allowConsoleError(() => {
-        expect(purify('<p class="i-amphtml-">hello</p>')).to.be
-            .equal('<p>hello</p>');
-        expect(purify('<p class="i-amphtml-class">hello</p>')).to.be
-            .equal('<p>hello</p>');
-        expect(purify('<p class="foo-i-amphtml-bar">hello</p>')).to.be
-            .equal('<p>hello</p>');
+        expect(purify('<p class="i-amphtml-">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
+        expect(purify('<p class="i-amphtml-class">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
+        expect(purify('<p class="foo-i-amphtml-bar">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
       });
     });
 
     it('should allow amp-subscriptions attributes', () => {
-      expect(purify('<div subscriptions-action="login">link</div>'))
-          .to.equal('<div subscriptions-action="login">link</div>');
-      expect(purify('<div subscriptions-section="actions">link</div>'))
-          .to.equal('<div subscriptions-section="actions">link</div>');
-      expect(purify('<div subscriptions-actions="">link</div>'))
-          .to.equal('<div subscriptions-actions="">link</div>');
-      expect(purify('<div subscriptions-display="">link</div>'))
-          .to.equal('<div subscriptions-display="">link</div>');
-      expect(purify('<div subscriptions-dialog="">link</div>'))
-          .to.equal('<div subscriptions-dialog="">link</div>');
+      expect(purify('<div subscriptions-action="login">link</div>')).to.equal(
+        '<div subscriptions-action="login">link</div>'
+      );
+      expect(
+        purify('<div subscriptions-section="actions">link</div>')
+      ).to.equal('<div subscriptions-section="actions">link</div>');
+      expect(purify('<div subscriptions-actions="">link</div>')).to.equal(
+        '<div subscriptions-actions="">link</div>'
+      );
+      expect(purify('<div subscriptions-display="">link</div>')).to.equal(
+        '<div subscriptions-display="">link</div>'
+      );
+      expect(purify('<div subscriptions-dialog="">link</div>')).to.equal(
+        '<div subscriptions-dialog="">link</div>'
+      );
     });
 
     it('should allow source::src with valid protocol', () => {
-      expect(purify('<source src="https://www.foo.com/">'))
-          .to.equal('<source src="https://www.foo.com/">');
+      expect(purify('<source src="https://www.foo.com/">')).to.equal(
+        '<source src="https://www.foo.com/">'
+      );
     });
 
     // TODO(choumx): HTTPS-only URI attributes are not enforced consistently
     // in the sanitizer yet. E.g. amp-video requires HTTPS, amp-img does not.
     // Unskip when this is fixed.
     it.skip('should not allow source::src with invalid protocol', () => {
-      expect(purify('<source src="http://www.foo.com">'))
-          .to.equal('<source src="">');
-      expect(purify('<source src="<script>bad()</script>">'))
-          .to.equal('<source src="">');
+      expect(purify('<source src="http://www.foo.com">')).to.equal(
+        '<source src="">'
+      );
+      expect(purify('<source src="<script>bad()</script>">')).to.equal(
+        '<source src="">'
+      );
     });
 
     it('should allow div::template', () => {
-      expect(purify('<div template="my-template-id"></div>'))
-          .to.equal('<div template="my-template-id"></div>');
+      expect(purify('<div template="my-template-id"></div>')).to.equal(
+        '<div template="my-template-id"></div>'
+      );
     });
 
     it('should allow form::action-xhr', () => {
-      expect(purify('<form action-xhr="https://foo.com"></form>'))
-          .to.equal('<form action-xhr="https://foo.com"></form>');
+      expect(purify('<form action-xhr="https://foo.com"></form>')).to.equal(
+        '<form action-xhr="https://foo.com"></form>'
+      );
     });
 
     it('should allow input::mask-output', () => {
-      expect(purify('<input mask-output="alphanumeric">'))
-          .to.equal('<input mask-output="alphanumeric">');
+      expect(purify('<input mask-output="alphanumeric">')).to.equal(
+        '<input mask-output="alphanumeric">'
+      );
     });
 
     // Need to test this since DOMPurify doesn't offer a API for tag-specific
     // attribute whitelists. Instead, we hack around it with custom hooks.
     it('should not allow unsupported attributes after a valid one', () => {
-      const html = '<form action-xhr="https://foo.com"></form>' +
-            '<p action-xhr="https://foo.com"></p>';
-      expect(purify(html))
-          .to.equal('<form action-xhr="https://foo.com"></form><p></p>');
+      const html =
+        '<form action-xhr="https://foo.com"></form>' +
+        '<p action-xhr="https://foo.com"></p>';
+      expect(purify(html)).to.equal(
+        '<form action-xhr="https://foo.com"></form><p></p>'
+      );
     });
 
     it('should allow <amp-form>-related attributes', () => {
-      expect(purify('<div submitting></div>'))
-          .to.equal('<div submitting=""></div>');
-      expect(purify('<div submit-success></div>'))
-          .to.equal('<div submit-success=""></div>');
-      expect(purify('<div submit-error></div>'))
-          .to.equal('<div submit-error=""></div>');
-      expect(purify('<div verify-error></div>'))
-          .to.equal('<div verify-error=""></div>');
-      expect(purify('<span visible-when-invalid="valueMissing"></span>'))
-          .to.equal('<span visible-when-invalid="valueMissing"></span>');
-      expect(purify('<span validation-for="form1"></span>'))
-          .to.equal('<span validation-for="form1"></span>');
+      expect(purify('<div submitting></div>')).to.equal(
+        '<div submitting=""></div>'
+      );
+      expect(purify('<div submit-success></div>')).to.equal(
+        '<div submit-success=""></div>'
+      );
+      expect(purify('<div submit-error></div>')).to.equal(
+        '<div submit-error=""></div>'
+      );
+      expect(purify('<div verify-error></div>')).to.equal(
+        '<div verify-error=""></div>'
+      );
+      expect(
+        purify('<span visible-when-invalid="valueMissing"></span>')
+      ).to.equal('<span visible-when-invalid="valueMissing"></span>');
+      expect(purify('<span validation-for="form1"></span>')).to.equal(
+        '<span validation-for="form1"></span>'
+      );
     });
 
     it('should avoid disallowing default-supported attributes', () => {
       // We whitelist all attributes of AMP elements, but make sure we don't
       // remove default-supported attributes from the whitelist afterwards.
       const html =
-          '<amp-img style="color: red"></amp-img><p style="color: blue"></p>';
+        '<amp-img style="color: red"></amp-img><p style="color: blue"></p>';
       expect(purify(html)).to.equal(html);
     });
 
     it('should allow <amp-lightbox> attributes', () => {
-      expect(purify('<amp-lightbox scrollable></amp-lightbox>'))
-          .to.equal('<amp-lightbox scrollable=""></amp-lightbox>');
+      expect(purify('<amp-lightbox scrollable></amp-lightbox>')).to.equal(
+        '<amp-lightbox scrollable=""></amp-lightbox>'
+      );
     });
 
     it('should output "i-amphtml-key" attribute if diffing is enabled', () => {
       // Elements with bindings should have i-amphtml-key="<number>".
       expect(purify('<p [x]="y"></p>', true)).to.match(
-          /<p data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/);
+        /<p data-amp-bind-x="y" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
+      );
       // AMP elements should have i-amphtml-key="<number>".
       expect(purify('<amp-img></amp-img>', true)).to.match(
-          /<amp-img i-amphtml-key="(\d+)"><\/amp-img>/);
+        /<amp-img i-amphtml-key="(\d+)"><\/amp-img>/
+      );
       // AMP elements with bindings should have i-amphtml-key="<number>".
       expect(purify('<amp-img [x]="y"></amp-img>', true)).to.match(
-          /<amp-img i-amphtml-key="(\d+)" data-amp-bind-x="y" i-amphtml-binding=""><\/amp-img>/);
+        /<amp-img i-amphtml-key="(\d+)" data-amp-bind-x="y" i-amphtml-binding=""><\/amp-img>/
+      );
       // Other elements should NOT have i-amphtml-key-set.
       expect(purify('<p></p>', true)).to.equal('<p></p>');
     });
@@ -449,21 +508,19 @@ function runSanitizerTests() {
     it('should resolve URLs', () => {
       expect(purify('<a href="/path"></a>')).to.match(/http/);
       expect(purify('<amp-img src="/path"></amp-img>')).to.match(/http/);
-      expect(purify('<amp-img srcset="/path"></amp-img>'))
-          .to.match(/http/);
+      expect(purify('<amp-img srcset="/path"></amp-img>')).to.match(/http/);
     });
   });
 
   describe('purify based on AMP format type', () => {
-    it('should blacklist input[type="image"] and input[type="button"] in AMP',
-        () => {
-          // Given the AMP format type.
-          html.setAttribute('amp', '');
-          allowConsoleError(() => {
-            expect(purify('<input type="image">')).to.equal('<input>');
-            expect(purify('<input type="button">')).to.equal('<input>');
-          });
-        });
+    it('should blacklist input[type="image"] and input[type="button"] in AMP', () => {
+      // Given the AMP format type.
+      html.setAttribute('amp', '');
+      allowConsoleError(() => {
+        expect(purify('<input type="image">')).to.equal('<input>');
+        expect(purify('<input type="button">')).to.equal('<input>');
+      });
+    });
 
     it('should allow input[type="file"] and input[type="password"]', () => {
       // Given that the AMP format does not blacklist input types file and
@@ -471,8 +528,9 @@ function runSanitizerTests() {
       html.setAttribute('amp', '');
       allowConsoleError(() => {
         expect(purify('<input type="file">')).to.equal('<input type="file">');
-        expect(purify('<input type="password">'))
-            .to.equal('<input type="password">');
+        expect(purify('<input type="password">')).to.equal(
+          '<input type="password">'
+        );
       });
     });
 
@@ -481,10 +539,12 @@ function runSanitizerTests() {
       allowConsoleError(() => {
         expect(purify('<input type="password">')).to.equal('<input>');
         expect(purify('<input type="file">')).to.equal('<input>');
-        expect(purify('<form name="form-name"></form>'))
-            .to.equal('<form></form>');
-        expect(purify('<amp-anim controls></amp-anim>'))
-            .to.equal('<amp-anim></amp-anim>');
+        expect(purify('<form name="form-name"></form>')).to.equal(
+          '<form></form>'
+        );
+        expect(purify('<amp-anim controls></amp-anim>')).to.equal(
+          '<amp-anim></amp-anim>'
+        );
       });
     });
   });
@@ -498,39 +558,47 @@ function runSanitizerTests() {
       const entity = '&lt;tag&gt;';
       expect(purifyTagsForTripleMustache(entity)).to.be.equal(entity);
       // DOMPurify short-circuits when there are no '<' characters.
-      expect(purifyTagsForTripleMustache(`<p>${entity}</p>`))
-          .to.be.equal(`<p>${entity}</p>`);
+      expect(purifyTagsForTripleMustache(`<p>${entity}</p>`)).to.be.equal(
+        `<p>${entity}</p>`
+      );
     });
 
     it('should output valid markup', () => {
-      expect(purifyTagsForTripleMustache('<b>abc</b>'))
-          .to.be.equal('<b>abc</b>');
+      expect(purifyTagsForTripleMustache('<b>abc</b>')).to.be.equal(
+        '<b>abc</b>'
+      );
       expect(purifyTagsForTripleMustache('<b>ab<br>c</b>')).to.be.equal(
-          '<b>ab<br>c</b>');
+        '<b>ab<br>c</b>'
+      );
       expect(purifyTagsForTripleMustache('<b>a<i>b</i>c</b>')).to.be.equal(
-          '<b>a<i>b</i>c</b>');
+        '<b>a<i>b</i>c</b>'
+      );
       const markupWithClassAttribute = '<p class="some-class">heading</p>';
-      expect(purifyTagsForTripleMustache(markupWithClassAttribute))
-          .to.be.equal(markupWithClassAttribute);
+      expect(purifyTagsForTripleMustache(markupWithClassAttribute)).to.be.equal(
+        markupWithClassAttribute
+      );
       const markupWithClassesAttribute =
-          '<div class="some-class another"><span>heading</span></div>';
-      expect(purifyTagsForTripleMustache(markupWithClassesAttribute))
-          .to.be.equal(markupWithClassesAttribute);
+        '<div class="some-class another"><span>heading</span></div>';
+      expect(
+        purifyTagsForTripleMustache(markupWithClassesAttribute)
+      ).to.be.equal(markupWithClassesAttribute);
       const markupParagraph = '<p class="valid-class">paragraph</p>';
-      expect(purifyTagsForTripleMustache(markupParagraph))
-          .to.be.equal(markupParagraph);
+      expect(purifyTagsForTripleMustache(markupParagraph)).to.be.equal(
+        markupParagraph
+      );
     });
 
     it('should NOT output non-whitelisted markup', () => {
-      expect(purifyTagsForTripleMustache('a<style>b</style>c'))
-          .to.be.equal('ac');
-      expect(purifyTagsForTripleMustache('a<img>c'))
-          .to.be.equal('ac');
+      expect(purifyTagsForTripleMustache('a<style>b</style>c')).to.be.equal(
+        'ac'
+      );
+      expect(purifyTagsForTripleMustache('a<img>c')).to.be.equal('ac');
     });
 
     it('should compensate for broken markup', () => {
       expect(purifyTagsForTripleMustache('<b>a<i>b')).to.be.equal(
-          '<b>a<i>b</i></b>');
+        '<b>a<i>b</i></b>'
+      );
     });
 
     it('should support list tags', () => {
@@ -540,62 +608,70 @@ function runSanitizerTests() {
 
     it('should whitelist formatting related elements', () => {
       const nonWhiteListedTag = '<img>';
-      const whiteListedFormattingTags = '<b>abc</b><div>def</div>'
-          + '<br><code></code><del></del><em></em>'
-          + '<i></i><ins></ins><mark></mark><s></s>'
-          + '<small></small><strong></strong><sub></sub>'
-          + '<sup></sup><time></time><u></u><hr>';
+      const whiteListedFormattingTags =
+        '<b>abc</b><div>def</div>' +
+        '<br><code></code><del></del><em></em>' +
+        '<i></i><ins></ins><mark></mark><s></s>' +
+        '<small></small><strong></strong><sub></sub>' +
+        '<sup></sup><time></time><u></u><hr>';
       const html = `${whiteListedFormattingTags}${nonWhiteListedTag}`;
       // Expect the purifier to unescape the whitelisted tags and to sanitize
       // and remove the img tag.
-      expect(purifyTagsForTripleMustache(html))
-          .to.be.equal(whiteListedFormattingTags);
+      expect(purifyTagsForTripleMustache(html)).to.be.equal(
+        whiteListedFormattingTags
+      );
     });
 
     it('should whitelist table related elements and anchor tags', () => {
-      const html = '<table class="valid-class">'
-          + '<caption>caption</caption>'
-          + '<thead><tr><th colspan="2">header</th></tr></thead>'
-          + '<tbody><tr><td>'
-          + '<a href="http://www.google.com">google</a>'
-          + '</td></tr></tbody>'
-          + '<tfoot><tr>'
-          + '<td colspan="2"><span>footer</span></td>'
-          + '</tr></tfoot>'
-          + '</table>';
+      const html =
+        '<table class="valid-class">' +
+        '<caption>caption</caption>' +
+        '<thead><tr><th colspan="2">header</th></tr></thead>' +
+        '<tbody><tr><td>' +
+        '<a href="http://www.google.com">google</a>' +
+        '</td></tr></tbody>' +
+        '<tfoot><tr>' +
+        '<td colspan="2"><span>footer</span></td>' +
+        '</tr></tfoot>' +
+        '</table>';
       expect(purifyTagsForTripleMustache(html)).to.be.equal(html);
     });
 
     it('should sanitize tags, removing unsafe attributes', () => {
-      const html = '<a href="javascript:alert(\'XSS\')">test</a>'
-          + '<img src="x" onerror="alert(\'XSS\')" />';
+      const html =
+        '<a href="javascript:alert(\'XSS\')">test</a>' +
+        '<img src="x" onerror="alert(\'XSS\')" />';
       expect(purifyTagsForTripleMustache(html)).to.be.equal('<a>test</a>');
     });
 
     describe('should sanitize `style` attribute', () => {
-      it('should allow valid styles',() => {
-        expect(purify('<div style="color:blue">Test</div>'))
-            .to.equal('<div style="color:blue">Test</div>');
+      it('should allow valid styles', () => {
+        expect(purify('<div style="color:blue">Test</div>')).to.equal(
+          '<div style="color:blue">Test</div>'
+        );
       });
 
-      it('should ignore styles containing `!important`',() => {
+      it('should ignore styles containing `!important`', () => {
         allowConsoleError(() => {
-          expect(purify('<div style="color:blue!important">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(
+            purify('<div style="color:blue!important">Test</div>')
+          ).to.equal('<div>Test</div>');
         });
       });
 
       it('should ignore styles containing `position:fixed`', () => {
         allowConsoleError(() => {
-          expect(purify('<div style="position:fixed">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(purify('<div style="position:fixed">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
         });
       });
 
       it('should ignore styles containing `position:sticky`', () => {
         allowConsoleError(() => {
-          expect(purify('<div style="position:sticky">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(purify('<div style="position:sticky">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
         });
       });
     });
@@ -613,7 +689,11 @@ describe('validateAttributeChange', () => {
 
     vac = (type, attr, value) =>
       validateAttributeChange(
-          purifier, document.createElement(type), attr, value);
+        purifier,
+        document.createElement(type),
+        attr,
+        value
+      );
   });
 
   it('should validate script[type]', () => {
diff --git a/test/unit/test-render-delaying-services.js b/test/unit/test-render-delaying-services.js
index de58a9caf8fd..afc58a2ac9ee 100644
--- a/test/unit/test-render-delaying-services.js
+++ b/test/unit/test-render-delaying-services.js
@@ -24,7 +24,6 @@ import {
 import {macroTask} from '../../testing/yield';
 
 describe('waitForServices', () => {
-
   let win;
   let sandbox;
   let clock;
@@ -46,10 +45,9 @@ describe('waitForServices', () => {
       },
     };
     variantResolve = waitForService(getService, 'variant', variantService);
-    variantStub = sandbox.stub(
-        variantService,
-        'whenReady'
-    ).returns(Promise.resolve());
+    variantStub = sandbox
+      .stub(variantService, 'whenReady')
+      .returns(Promise.resolve());
 
     return createIframePromise().then(iframe => {
       win = iframe.win;
@@ -69,7 +67,7 @@ describe('waitForServices', () => {
     return expect(waitForServices(win)).to.eventually.have.lengthOf(0);
   });
 
-  it('should timeout if some blocking services are missing', function* () {
+  it('should timeout if some blocking services are missing', function*() {
     addExtensionScript(win, 'amp-dynamic-css-classes');
     win.document.body.appendChild(win.document.createElement('amp-experiment'));
     expect(hasRenderDelayingServices(win)).to.be.true;
@@ -130,9 +128,11 @@ describe('waitForServices', () => {
 
 function waitForService(getService, serviceId, service) {
   let resolve = null;
-  getService.withArgs(sinon.match.any, serviceId).returns(new Promise(r => {
-    resolve = r.bind(this, service);
-  }));
+  getService.withArgs(sinon.match.any, serviceId).returns(
+    new Promise(r => {
+      resolve = r.bind(this, service);
+    })
+  );
   return resolve;
 }
 
diff --git a/test/unit/test-resource.js b/test/unit/test-resource.js
index 84e0395a725e..25d494046a67 100644
--- a/test/unit/test-resource.js
+++ b/test/unit/test-resource.js
@@ -21,7 +21,6 @@ import {Resources} from '../../src/service/resources-impl';
 import {Services} from '../../src/services';
 import {layoutRectLtwh} from '../../src/layout-rect';
 
-
 describes.realWin('Resource', {amp: true}, env => {
   let win, doc;
   let element;
@@ -35,14 +34,16 @@ describes.realWin('Resource', {amp: true}, env => {
     doc = win.document;
 
     element = env.createAmpElement('amp-ad');
-    sandbox.stub(element, 'getLayoutPriority').callsFake(
-        () => LayoutPriority.ADS);
+    sandbox
+      .stub(element, 'getLayoutPriority')
+      .callsFake(() => LayoutPriority.ADS);
     elementMock = sandbox.mock(element);
 
     const viewer = Services.viewerForDoc(document);
     sandbox.stub(viewer, 'isRuntimeOn').callsFake(() => false);
-    sandbox.stub(Resources.prototype, 'rebuildDomWhenReady')
-        .callsFake(() => {});
+    sandbox
+      .stub(Resources.prototype, 'rebuildDomWhenReady')
+      .callsFake(() => {});
     resources = new Resources(new AmpDocSingle(window));
     resource = new Resource(1, element, resources);
     viewportMock = sandbox.mock(resources.viewport_);
@@ -55,8 +56,9 @@ describes.realWin('Resource', {amp: true}, env => {
     resources.win = {
       document,
       getComputedStyle: el => {
-        return el.fakeComputedStyle ?
-          el.fakeComputedStyle : window.getComputedStyle(el);
+        return el.fakeComputedStyle
+          ? el.fakeComputedStyle
+          : window.getComputedStyle(el);
       },
     };
   });
@@ -77,13 +79,20 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should initialize correctly when already built', () => {
-    elementMock.expects('isBuilt').returns(true).once();
+    elementMock
+      .expects('isBuilt')
+      .returns(true)
+      .once();
     expect(new Resource(1, element).getState()).to.equal(
-        ResourceState.NOT_LAID_OUT);
+      ResourceState.NOT_LAID_OUT
+    );
   });
 
   it('should not build before upgraded', () => {
-    elementMock.expects('isUpgraded').returns(false).atLeast(1);
+    elementMock
+      .expects('isUpgraded')
+      .returns(false)
+      .atLeast(1);
     elementMock.expects('build').never();
     elementMock.expects('updateLayoutBox').never();
 
@@ -91,11 +100,16 @@ describes.realWin('Resource', {amp: true}, env => {
     expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
   });
 
-
   it('should build after upgraded', () => {
     const buildPromise = Promise.resolve();
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(buildPromise).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(buildPromise)
+      .once();
     elementMock.expects('updateLayoutBox').never();
     return resource.build().then(() => {
       expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
@@ -104,43 +118,65 @@ describes.realWin('Resource', {amp: true}, env => {
 
   it('should not build if permission is not granted', () => {
     let permission = false;
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
     sandbox.stub(resources, 'grantBuildPermission').callsFake(() => permission);
     elementMock.expects('updateLayoutBox').never();
     expect(resource.build()).to.be.null;
     expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
 
     permission = true;
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     return resource.build().then(() => {
       expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
     });
   });
 
   it('should blacklist on build failure', () => {
-    sandbox.stub(resource, 'maybeReportErrorOnBuildFailure')
-        .callsFake(() => {});
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build')
-        .returns(Promise.reject(new Error('intentional'))).once();
+    sandbox
+      .stub(resource, 'maybeReportErrorOnBuildFailure')
+      .callsFake(() => {});
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.reject(new Error('intentional')))
+      .once();
     elementMock.expects('updateLayoutBox').never();
     const buildPromise = resource.build();
     expect(resource.isBuilding()).to.be.true;
-    return buildPromise.then(() => {
-      throw new Error('must have failed');
-    }, () => {
-      expect(resource.isBuilding()).to.be.false;
-      expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
-    });
+    return buildPromise.then(
+      () => {
+        throw new Error('must have failed');
+      },
+      () => {
+        expect(resource.isBuilding()).to.be.false;
+        expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
+      }
+    );
   });
 
   it('should mark as ready for layout if already measured', () => {
     const box = layoutRectLtwh(0, 0, 100, 200);
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
-    elementMock.expects('updateLayoutBox')
-        .withExactArgs(box, true)
-        .once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
+    elementMock
+      .expects('updateLayoutBox')
+      .withExactArgs(box, true)
+      .once();
     const stub = sandbox.stub(resource, 'hasBeenMeasured').returns(true);
     resource.layoutBox_ = box;
     return resource.build().then(() => {
@@ -150,8 +186,14 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should mark as not laid out if not yet measured', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     const stub = sandbox.stub(resource, 'hasBeenMeasured').returns(false);
     return resource.build().then(() => {
       expect(stub.calledOnce).to.be.true;
@@ -160,40 +202,65 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should track size changes on measure', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     return resource.build().then(() => {
-      elementMock.expects('getBoundingClientRect')
-          .returns({left: 11, top: 12, width: 111, height: 222})
-          .once();
-      elementMock.expects('updateLayoutBox')
-          .withExactArgs(sinon.match(data => {
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns({left: 11, top: 12, width: 111, height: 222})
+        .once();
+      elementMock
+        .expects('updateLayoutBox')
+        .withExactArgs(
+          sinon.match(data => {
             return data.width == 111 && data.height == 222;
-          }), true)
-          .once();
+          }),
+          true
+        )
+        .once();
       resource.measure();
     });
   });
 
   it('should track no size changes on measure', () => {
     layoutRectLtwh(0, 0, 0, 0);
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     return resource.build().then(() => {
-      elementMock.expects('getBoundingClientRect')
-          .returns({left: 0, top: 0, width: 0, height: 0})
-          .once();
-      elementMock.expects('updateLayoutBox')
-          .withExactArgs(sinon.match(data => {
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns({left: 0, top: 0, width: 0, height: 0})
+        .once();
+      elementMock
+        .expects('updateLayoutBox')
+        .withExactArgs(
+          sinon.match(data => {
             return data.width == 0 && data.height == 0;
-          }), false)
-          .once();
+          }),
+          false
+        )
+        .once();
       resource.measure();
     });
   });
 
   it('should allow to measure when not upgraded', () => {
-    elementMock.expects('isUpgraded').returns(false).atLeast(1);
+    elementMock
+      .expects('isUpgraded')
+      .returns(false)
+      .atLeast(1);
     const viewport = {
       getLayoutRect() {
         return layoutRectLtwh(0, 100, 300, 100);
@@ -212,30 +279,47 @@ describes.realWin('Resource', {amp: true}, env => {
     expect(resource.getLayoutBox()).to.eql(layoutRectLtwh(0, 100, 300, 100));
     // pageLayoutBox == layoutBox
     expect(resource.getPageLayoutBox()).to.eql(
-        layoutRectLtwh(0, 100, 300, 100));
+      layoutRectLtwh(0, 100, 300, 100)
+    );
   });
 
   it('should allow measure even when not built', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('getBoundingClientRect').returns(
-        layoutRectLtwh(0, 0, 0, 0)).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns(layoutRectLtwh(0, 0, 0, 0))
+      .once();
     resource.measure();
     expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
     expect(resource.isFixed()).to.be.false;
   });
 
   it('should measure and update state', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     return resource.build().then(() => {
-      elementMock.expects('getBoundingClientRect')
-          .returns({left: 11, top: 12, width: 111, height: 222})
-          .once();
-      elementMock.expects('updateLayoutBox')
-          .withExactArgs(sinon.match(data => {
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns({left: 11, top: 12, width: 111, height: 222})
+        .once();
+      elementMock
+        .expects('updateLayoutBox')
+        .withExactArgs(
+          sinon.match(data => {
             return data.width == 111 && data.height == 222;
-          }), true)
-          .once();
+          }),
+          true
+        )
+        .once();
       resource.measure();
       expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
       expect(resource.getLayoutBox().left).to.equal(11);
@@ -247,17 +331,31 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should update initial box only on first measure', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('build').returns(Promise.resolve()).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('build')
+      .returns(Promise.resolve())
+      .once();
     return resource.build().then(() => {
-      element.getBoundingClientRect = () =>
-        ({left: 11, top: 12, width: 111, height: 222});
+      element.getBoundingClientRect = () => ({
+        left: 11,
+        top: 12,
+        width: 111,
+        height: 222,
+      });
       resource.measure();
       expect(resource.getLayoutBox().top).to.equal(12);
       expect(resource.getInitialLayoutBox().top).to.equal(12);
 
-      element.getBoundingClientRect = () =>
-        ({left: 11, top: 22, width: 111, height: 222});
+      element.getBoundingClientRect = () => ({
+        left: 11,
+        top: 22,
+        width: 111,
+        height: 222,
+      });
       resource.measure();
       expect(resource.getLayoutBox().top).to.equal(22);
       expect(resource.getInitialLayoutBox().top).to.equal(12);
@@ -280,12 +378,17 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should always layout if has not been laid out before', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
     resource.state_ = ResourceState.NOT_LAID_OUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
-    elementMock.expects('getBoundingClientRect')
-        .returns(resource.layoutBox_).once();
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns(resource.layoutBox_)
+      .once();
     resource.measure();
     expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
   });
@@ -295,55 +398,86 @@ describes.realWin('Resource', {amp: true}, env => {
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Left is not part of validation.
-    elementMock.expects('getBoundingClientRect')
-        .returns({left: 11 + 10, top: 12, width: 111, height: 222}).once();
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns({left: 11 + 10, top: 12, width: 111, height: 222})
+      .once();
     resource.measure();
     expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
     expect(resource.getLayoutBox().left).to.equal(11 + 10);
   });
 
-  it('should not relayout if box changed but element didn\'t opt in', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
+  it("should not relayout if box changed but element didn't opt in", () => {
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
     resource.state_ = ResourceState.LAYOUT_COMPLETE;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Width changed.
-    elementMock.expects('getBoundingClientRect')
-        .returns({left: 11, top: 12, width: 111 + 10, height: 222}).once();
-    elementMock.expects('isRelayoutNeeded').returns(false).atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns({left: 11, top: 12, width: 111 + 10, height: 222})
+      .once();
+    elementMock
+      .expects('isRelayoutNeeded')
+      .returns(false)
+      .atLeast(1);
     resource.measure();
     expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
     expect(resource.getLayoutBox().width).to.equal(111 + 10);
   });
 
   it('should relayout if box changed when element opted in', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
     resource.state_ = ResourceState.LAYOUT_COMPLETE;
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
 
     // Width changed.
-    elementMock.expects('getBoundingClientRect')
-        .returns({left: 11, top: 12, width: 111 + 10, height: 222}).once();
-    elementMock.expects('isRelayoutNeeded').returns(true).atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns({left: 11, top: 12, width: 111 + 10, height: 222})
+      .once();
+    elementMock
+      .expects('isRelayoutNeeded')
+      .returns(true)
+      .atLeast(1);
     resource.measure();
     expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
     expect(resource.getLayoutBox().width).to.equal(111 + 10);
   });
 
   it('should calculate NOT fixed for non-displayed elements', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('getBoundingClientRect').returns(
-        layoutRectLtwh(0, 0, 0, 0)).once();
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns(layoutRectLtwh(0, 0, 0, 0))
+      .once();
     element.isAlwaysFixed = () => true;
     resource.measure();
     expect(resource.isFixed()).to.be.false;
   });
 
   it('should calculate fixed for always-fixed parent', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('getBoundingClientRect').returns(
-        layoutRectLtwh(0, 0, 10, 10)).once();
-    viewportMock.expects('getScrollTop').returns(11).atLeast(0);
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns(layoutRectLtwh(0, 0, 10, 10))
+      .once();
+    viewportMock
+      .expects('getScrollTop')
+      .returns(11)
+      .atLeast(0);
     Object.defineProperty(element, 'offsetParent', {
       value: {
         isAlwaysFixed: () => true,
@@ -357,22 +491,32 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should calculate fixed for fixed-style parent', () => {
-    elementMock.expects('isUpgraded').returns(true).atLeast(1);
-    elementMock.expects('getBoundingClientRect').returns(
-        layoutRectLtwh(0, 0, 10, 10)).once();
-    viewportMock.expects('getScrollTop').returns(11).atLeast(0);
+    elementMock
+      .expects('isUpgraded')
+      .returns(true)
+      .atLeast(1);
+    elementMock
+      .expects('getBoundingClientRect')
+      .returns(layoutRectLtwh(0, 0, 10, 10))
+      .once();
+    viewportMock
+      .expects('getScrollTop')
+      .returns(11)
+      .atLeast(0);
     const fixedParent = doc.createElement('div');
     fixedParent.style.position = 'fixed';
     doc.body.appendChild(fixedParent);
     fixedParent.appendChild(element);
-    viewportMock.expects('isDeclaredFixed')
-        .withExactArgs(element)
-        .returns(false)
-        .once();
-    viewportMock.expects('isDeclaredFixed')
-        .withExactArgs(fixedParent)
-        .returns(true)
-        .once();
+    viewportMock
+      .expects('isDeclaredFixed')
+      .withExactArgs(element)
+      .returns(false)
+      .once();
+    viewportMock
+      .expects('isDeclaredFixed')
+      .withExactArgs(fixedParent)
+      .returns(true)
+      .once();
     resource.measure();
     expect(resource.isFixed()).to.be.true;
     // layoutBox != pageLayoutBox
@@ -391,15 +535,24 @@ describes.realWin('Resource', {amp: true}, env => {
         writable: true,
       });
       element.parentElement.__AMP__RESOURCE = {};
-      elementMock.expects('isUpgraded').returns(true).atLeast(1);
-      elementMock.expects('build').returns(Promise.resolve()).once();
+      elementMock
+        .expects('isUpgraded')
+        .returns(true)
+        .atLeast(1);
+      elementMock
+        .expects('build')
+        .returns(Promise.resolve())
+        .once();
       rect = {left: 11, top: 12, width: 111, height: 222};
       resource = new Resource(1, element, resources);
       return resource.build();
     });
 
     it('should measure placeholder with stubbed parent', () => {
-      elementMock.expects('getBoundingClientRect').returns(rect).once();
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns(rect)
+        .once();
       resource.measure();
 
       expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
@@ -420,7 +573,10 @@ describes.realWin('Resource', {amp: true}, env => {
     it('should support abnormal case with no parent', () => {
       delete element.parentElement;
 
-      elementMock.expects('getBoundingClientRect').returns(rect).once();
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns(rect)
+        .once();
       resource.measure();
 
       expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
@@ -430,7 +586,10 @@ describes.realWin('Resource', {amp: true}, env => {
     it('should support abnormal case with non-AMP parent', () => {
       element.parentElement = document.createElement('div');
 
-      elementMock.expects('getBoundingClientRect').returns(rect).once();
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns(rect)
+        .once();
       resource.measure();
 
       expect(resource.getState()).to.equal(ResourceState.READY_FOR_LAYOUT);
@@ -441,11 +600,14 @@ describes.realWin('Resource', {amp: true}, env => {
   it('should hide and update layout box on collapse', () => {
     resource.layoutBox_ = {left: 11, top: 12, width: 111, height: 222};
     resource.isFixed_ = true;
-    elementMock.expects('updateLayoutBox')
-        .withExactArgs(sinon.match(data => {
+    elementMock
+      .expects('updateLayoutBox')
+      .withExactArgs(
+        sinon.match(data => {
           return data.width == 0 && data.height == 0;
-        }))
-        .once();
+        })
+      )
+      .once();
     const owner = {
       collapsedCallback: sandbox.spy(),
     };
@@ -471,41 +633,47 @@ describes.realWin('Resource', {amp: true}, env => {
     expect(resource.requestMeasure).to.be.calledOnce;
   });
 
-  it('should ignore startLayout if already completed or failed or going',
-      () => {
-        elementMock.expects('layoutCallback').never();
+  it('should ignore startLayout if already completed or failed or going', () => {
+    elementMock.expects('layoutCallback').never();
 
-        resource.state_ = ResourceState.LAYOUT_COMPLETE;
-        resource.startLayout();
+    resource.state_ = ResourceState.LAYOUT_COMPLETE;
+    resource.startLayout();
 
-        resource.state_ = ResourceState.LAYOUT_FAILED;
-        resource.startLayout();
+    resource.state_ = ResourceState.LAYOUT_FAILED;
+    resource.startLayout();
 
-        resource.state_ = ResourceState.READY_FOR_LAYOUT;
-        resource.layoutPromise_ = {};
-        resource.startLayout();
-      });
+    resource.state_ = ResourceState.READY_FOR_LAYOUT;
+    resource.layoutPromise_ = {};
+    resource.startLayout();
+  });
 
   it('should fail startLayout if not built', () => {
     elementMock.expects('layoutCallback').never();
 
     resource.state_ = ResourceState.NOT_BUILT;
-    allowConsoleError(() => { expect(() => {
-      resource.startLayout();
-    }).to.throw(/Not ready to start layout/); });
+    allowConsoleError(() => {
+      expect(() => {
+        resource.startLayout();
+      }).to.throw(/Not ready to start layout/);
+    });
   });
 
   it('should ignore startLayout if not visible', () => {
     elementMock.expects('layoutCallback').never();
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 0, height: 0};
-    allowConsoleError(() => { expect(() => {
-      resource.startLayout();
-    }).to.throw(/Not displayed/); });
+    allowConsoleError(() => {
+      expect(() => {
+        resource.startLayout();
+      }).to.throw(/Not displayed/);
+    });
   });
 
   it('should force startLayout for first layout', () => {
-    elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
+    elementMock
+      .expects('layoutCallback')
+      .returns(Promise.resolve())
+      .once();
 
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
@@ -519,24 +687,36 @@ describes.realWin('Resource', {amp: true}, env => {
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     resource.layoutCount_ = 1;
-    elementMock.expects('isRelayoutNeeded').returns(false).atLeast(1);
+    elementMock
+      .expects('isRelayoutNeeded')
+      .returns(false)
+      .atLeast(1);
     resource.startLayout();
     expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
   });
 
   it('should force startLayout for re-layout when opt-in', () => {
-    elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
+    elementMock
+      .expects('layoutCallback')
+      .returns(Promise.resolve())
+      .once();
 
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
     resource.layoutCount_ = 1;
-    elementMock.expects('isRelayoutNeeded').returns(true).atLeast(1);
+    elementMock
+      .expects('isRelayoutNeeded')
+      .returns(true)
+      .atLeast(1);
     resource.startLayout();
     expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
   });
 
   it('should complete startLayout', () => {
-    elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
+    elementMock
+      .expects('layoutCallback')
+      .returns(Promise.resolve())
+      .once();
 
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
@@ -553,8 +733,14 @@ describes.realWin('Resource', {amp: true}, env => {
   });
 
   it('should complete startLayout with height == 0', () => {
-    elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
-    elementMock.expects('getLayout').returns('fluid').once();
+    elementMock
+      .expects('layoutCallback')
+      .returns(Promise.resolve())
+      .once();
+    elementMock
+      .expects('getLayout')
+      .returns('fluid')
+      .once();
 
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 0};
@@ -572,8 +758,10 @@ describes.realWin('Resource', {amp: true}, env => {
 
   it('should fail startLayout', () => {
     const error = new Error('intentional');
-    elementMock.expects('layoutCallback')
-        .returns(Promise.reject(error)).once();
+    elementMock
+      .expects('layoutCallback')
+      .returns(Promise.reject(error))
+      .once();
 
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = {left: 11, top: 12, width: 10, height: 10};
@@ -581,22 +769,30 @@ describes.realWin('Resource', {amp: true}, env => {
     expect(resource.layoutPromise_).to.not.equal(null);
     expect(resource.getState()).to.equal(ResourceState.LAYOUT_SCHEDULED);
 
-    return promise.then(() => {
-      /* global fail: false */
-      fail('should not be here');
-    }, () => {
-      expect(resource.getState()).to.equal(ResourceState.LAYOUT_FAILED);
-      expect(resource.layoutPromise_).to.equal(null);
-      expect(resource.lastLayoutError_).to.equal(error);
-
-      // Should fail with the same error again.
-      return resource.startLayout();
-    }).then(() => {
-      /* global fail: false */
-      fail('should not be here');
-    }, reason => {
-      expect(reason).to.equal(error);
-    });
+    return promise
+      .then(
+        () => {
+          /* global fail: false */
+          fail('should not be here');
+        },
+        () => {
+          expect(resource.getState()).to.equal(ResourceState.LAYOUT_FAILED);
+          expect(resource.layoutPromise_).to.equal(null);
+          expect(resource.lastLayoutError_).to.equal(error);
+
+          // Should fail with the same error again.
+          return resource.startLayout();
+        }
+      )
+      .then(
+        () => {
+          /* global fail: false */
+          fail('should not be here');
+        },
+        reason => {
+          expect(reason).to.equal(error);
+        }
+      );
   });
 
   it('should record layout schedule time', () => {
@@ -622,16 +818,20 @@ describes.realWin('Resource', {amp: true}, env => {
   it('should change size and update state', () => {
     expect(resource.isMeasureRequested()).to.be.false;
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
-    elementMock.expects('changeSize').withExactArgs(111, 222,
-        {top: 1, right: 2, bottom: 3, left: 4}).once();
+    elementMock
+      .expects('changeSize')
+      .withExactArgs(111, 222, {top: 1, right: 2, bottom: 3, left: 4})
+      .once();
     resource.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
     expect(resource.isMeasureRequested()).to.be.true;
   });
 
   it('should change size but not state', () => {
     resource.state_ = ResourceState.NOT_BUILT;
-    elementMock.expects('changeSize').withExactArgs(111, 222,
-        {top: 1, right: 2, bottom: 3, left: 4}).once();
+    elementMock
+      .expects('changeSize')
+      .withExactArgs(111, 222, {top: 1, right: 2, bottom: 3, left: 4})
+      .once();
     resource.changeSize(111, 222, {top: 1, right: 2, bottom: 3, left: 4});
     expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
   });
@@ -652,11 +852,15 @@ describes.realWin('Resource', {amp: true}, env => {
     expect(resource.getLayoutPriority()).to.equal(LayoutPriority.CONTENT);
   });
 
-
   describe('setInViewport', () => {
     let resolveWithinViewportSpy;
-    beforeEach(() => resolveWithinViewportSpy =
-      sandbox.spy(resource, 'resolveDeferredsWhenWithinViewports_'));
+    beforeEach(
+      () =>
+        (resolveWithinViewportSpy = sandbox.spy(
+          resource,
+          'resolveDeferredsWhenWithinViewports_'
+        ))
+    );
 
     it('should call viewportCallback when not built', () => {
       resource.state_ = ResourceState.NOT_BUILT;
@@ -700,11 +904,17 @@ describes.realWin('Resource', {amp: true}, env => {
         hasAttribute: () => false,
         isBuilt: () => false,
         contains: () => true,
-        getElementsByClassName: () => {return [];},
+        getElementsByClassName: () => {
+          return [];
+        },
         parentElement: child,
       };
-      parent.getElementsByClassName = () => {return [child, grandChild];};
-      child.getElementsByClassName = () => {return [grandChild];};
+      parent.getElementsByClassName = () => {
+        return [child, grandChild];
+      };
+      child.getElementsByClassName = () => {
+        return [grandChild];
+      };
       resources = new Resources(new AmpDocSingle(window));
       parentResource = new Resource(1, parent, resources);
     });
@@ -751,55 +961,91 @@ describes.realWin('Resource', {amp: true}, env => {
       expect(resource.getState()).to.equal(ResourceState.NOT_BUILT);
     });
 
-    it('should call unlayoutCallback on built element and update state',
-        () => {
-          resource.state_ = ResourceState.LAYOUT_COMPLETE;
-          elementMock.expects('unlayoutCallback').returns(true).once();
-          elementMock.expects('togglePlaceholder').withArgs(true).once();
-          resource.unlayout();
-          expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
-        });
+    it('should call unlayoutCallback on built element and update state', () => {
+      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      elementMock
+        .expects('unlayoutCallback')
+        .returns(true)
+        .once();
+      elementMock
+        .expects('togglePlaceholder')
+        .withArgs(true)
+        .once();
+      resource.unlayout();
+      expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
+    });
 
     it('updated state should bypass isRelayoutNeeded', () => {
       resource.state_ = ResourceState.LAYOUT_COMPLETE;
-      elementMock.expects('unlayoutCallback').returns(true).once();
-      elementMock.expects('togglePlaceholder').withArgs(true).once();
-      elementMock.expects('isUpgraded').returns(true).atLeast(1);
-      elementMock.expects('getBoundingClientRect')
-          .returns({left: 1, top: 1, width: 1, height: 1}).once();
+      elementMock
+        .expects('unlayoutCallback')
+        .returns(true)
+        .once();
+      elementMock
+        .expects('togglePlaceholder')
+        .withArgs(true)
+        .once();
+      elementMock
+        .expects('isUpgraded')
+        .returns(true)
+        .atLeast(1);
+      elementMock
+        .expects('getBoundingClientRect')
+        .returns({left: 1, top: 1, width: 1, height: 1})
+        .once();
 
       resource.unlayout();
 
-      elementMock.expects('layoutCallback').returns(Promise.resolve()).once();
+      elementMock
+        .expects('layoutCallback')
+        .returns(Promise.resolve())
+        .once();
       resource.measure();
       resource.startLayout();
     });
 
-    it('should call unlayoutCallback on built element' +
-        ' but NOT update state', () => {
+    it('should call unlayoutCallback on built element but NOT update state', () => {
       resource.state_ = ResourceState.LAYOUT_COMPLETE;
-      elementMock.expects('unlayoutCallback').returns(false).once();
-      elementMock.expects('togglePlaceholder').withArgs(true).never();
+      elementMock
+        .expects('unlayoutCallback')
+        .returns(false)
+        .once();
+      elementMock
+        .expects('togglePlaceholder')
+        .withArgs(true)
+        .never();
       resource.unlayout();
       expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
     });
 
     it('should call viewportCallback when resource not in viewport', () => {
       resource.state_ = ResourceState.LAYOUT_COMPLETE;
-      elementMock.expects('viewportCallback').withExactArgs(false).once();
+      elementMock
+        .expects('viewportCallback')
+        .withExactArgs(false)
+        .once();
       resource.unlayout();
     });
 
     it('should call viewportCallback when resource in viewport', () => {
       resource.state_ = ResourceState.LAYOUT_COMPLETE;
-      elementMock.expects('viewportCallback').withExactArgs(false).once();
+      elementMock
+        .expects('viewportCallback')
+        .withExactArgs(false)
+        .once();
       resource.unlayout();
     });
 
     it('should delegate unload to unlayoutCallback', () => {
       resource.state_ = ResourceState.LAYOUT_COMPLETE;
-      elementMock.expects('unlayoutCallback').returns(false).once();
-      elementMock.expects('togglePlaceholder').withArgs(true).never();
+      elementMock
+        .expects('unlayoutCallback')
+        .returns(false)
+        .once();
+      elementMock
+        .expects('togglePlaceholder')
+        .withArgs(true)
+        .never();
       resource.unload();
       expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
     });
@@ -827,13 +1073,19 @@ describes.realWin('Resource', {amp: true}, env => {
 
     describe('when unlayoutOnPause', () => {
       beforeEach(() => {
-        elementMock.expects('unlayoutOnPause').returns(true).once();
+        elementMock
+          .expects('unlayoutOnPause')
+          .returns(true)
+          .once();
       });
 
       it('should call unlayoutCallback and update state', () => {
         resource.state_ = ResourceState.LAYOUT_COMPLETE;
         elementMock.expects('pauseCallback').once();
-        elementMock.expects('unlayoutCallback').returns(true).once();
+        elementMock
+          .expects('unlayoutCallback')
+          .returns(true)
+          .once();
         resource.pause();
         expect(resource.getState()).to.equal(ResourceState.NOT_LAID_OUT);
       });
@@ -841,7 +1093,10 @@ describes.realWin('Resource', {amp: true}, env => {
       it('should call unlayoutCallback but NOT update state', () => {
         resource.state_ = ResourceState.LAYOUT_COMPLETE;
         elementMock.expects('pauseCallback').once();
-        elementMock.expects('unlayoutCallback').returns(false).once();
+        elementMock
+          .expects('unlayoutCallback')
+          .returns(false)
+          .once();
         resource.pause();
         expect(resource.getState()).to.equal(ResourceState.LAYOUT_COMPLETE);
       });
@@ -938,8 +1193,7 @@ describe('Resource idleRenderOutsideViewport', () => {
     };
     resources = new Resources(new AmpDocSingle(window));
     resource = new Resource(1, element, resources);
-    isWithinViewportRatio =
-        sandbox.stub(resource, 'isWithinViewportRatio');
+    isWithinViewportRatio = sandbox.stub(resource, 'isWithinViewportRatio');
   });
 
   afterEach(() => {
@@ -998,15 +1252,16 @@ describe('Resource renderOutsideViewport', () => {
     viewport = resources.viewport_;
     renderOutsideViewport = sandbox.stub(element, 'renderOutsideViewport');
     sandbox.stub(viewport, 'getRect').returns(layoutRectLtwh(0, 0, 100, 100));
-    resolveWithinViewportSpy =
-      sandbox.spy(resource, 'resolveDeferredsWhenWithinViewports_');
+    resolveWithinViewportSpy = sandbox.spy(
+      resource,
+      'resolveDeferredsWhenWithinViewports_'
+    );
   });
 
   afterEach(() => {
     sandbox.restore();
   });
 
-
   describe('boolean API', () => {
     describe('when element returns true', () => {
       beforeEach(() => {
@@ -2017,13 +2272,19 @@ describe('Resource renderOutsideViewport', () => {
 
   describe('whenWithinViewport', () => {
     it('should resolve correctly', () => {
-      sandbox.stub(resource, 'isWithinViewportRatio').withArgs(3)
-          .onCall(0).returns(false)
-          .onCall(1).returns(false)
-          .onCall(2).returns(true)
-          .onCall(3).callsFake(() => {
-            throw new Error('should not call!');
-          });
+      sandbox
+        .stub(resource, 'isWithinViewportRatio')
+        .withArgs(3)
+        .onCall(0)
+        .returns(false)
+        .onCall(1)
+        .returns(false)
+        .onCall(2)
+        .returns(true)
+        .onCall(3)
+        .callsFake(() => {
+          throw new Error('should not call!');
+        });
       const promise = resource.whenWithinViewport(3);
       // Multiple calls should return the same promise.
       expect(resource.whenWithinViewport(3)).to.equal(promise);
@@ -2040,8 +2301,10 @@ describe('Resource renderOutsideViewport', () => {
     });
 
     it('should resolve correctly with float', () => {
-      const isWithinViewportRatioStub =
-        sandbox.stub(resource, 'isWithinViewportRatio');
+      const isWithinViewportRatioStub = sandbox.stub(
+        resource,
+        'isWithinViewportRatio'
+      );
       const ratio = {};
       sandbox.stub(resource, 'getDistanceViewportRatio').returns(ratio);
       isWithinViewportRatioStub.withArgs(1.25).returns(false);
diff --git a/test/unit/test-resources.js b/test/unit/test-resources.js
index 029df6b0e3a5..9217c0f1575f 100644
--- a/test/unit/test-resources.js
+++ b/test/unit/test-resources.js
@@ -26,7 +26,6 @@ import {loadPromise} from '../../src/event-helper';
 
 /*eslint "google-camelcase/google-camelcase": 0*/
 describe('Resources', () => {
-
   let sandbox;
   let clock;
   let resources;
@@ -278,28 +277,30 @@ describe('Resources', () => {
     expect(resources.calcTaskTimeout_(task_p1)).to.equal(1000);
   });
 
-  it('should not schedule non-prerenderable resource when' +
-        ' document is in prerender', () => {
-    const resource = {
-      getState: () => ResourceState.READY_FOR_LAYOUT,
-      isDisplayed: () => true,
-      isFixed: () => false,
-      isInViewport: () => true,
-      prerenderAllowed: () => false,
-      renderOutsideViewport: () => false,
-      startLayout: () => {},
-      applySizesAndMediaQuery: () => {},
-    };
-    resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.PRERENDER
-    );
-    resources.scheduleLayoutOrPreload_(resource, true);
-    expect(resources.queue_.getSize()).to.equal(0);
-  });
+  it(
+    'should not schedule non-prerenderable resource when' +
+      ' document is in prerender',
+    () => {
+      const resource = {
+        getState: () => ResourceState.READY_FOR_LAYOUT,
+        isDisplayed: () => true,
+        isFixed: () => false,
+        isInViewport: () => true,
+        prerenderAllowed: () => false,
+        renderOutsideViewport: () => false,
+        startLayout: () => {},
+        applySizesAndMediaQuery: () => {},
+      };
+      resources.visible_ = false;
+      sandbox
+        .stub(resources.viewer_, 'getVisibilityState')
+        .returns(VisibilityState.PRERENDER);
+      resources.scheduleLayoutOrPreload_(resource, true);
+      expect(resources.queue_.getSize()).to.equal(0);
+    }
+  );
 
-  it('should schedule prerenderable resource when' +
-        ' document is in prerender', () => {
+  it('should schedule prerenderable resource when document is in prerender', () => {
     const resource = {
       getState: () => ResourceState.READY_FOR_LAYOUT,
       isDisplayed: () => true,
@@ -314,16 +315,15 @@ describe('Resources', () => {
       applySizesAndMediaQuery: () => {},
     };
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.PRERENDER
-    );
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.PRERENDER);
     resources.scheduleLayoutOrPreload_(resource, true);
     expect(resources.queue_.getSize()).to.equal(1);
     expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
   });
 
-  it('should not schedule prerenderable resource when' +
-        ' document is hidden', () => {
+  it('should not schedule prerenderable resource when document is hidden', () => {
     const resource = {
       getState: () => ResourceState.READY_FOR_LAYOUT,
       isDisplayed: () => true,
@@ -338,102 +338,115 @@ describe('Resources', () => {
       applySizesAndMediaQuery: () => {},
     };
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.HIDDEN
-    );
-    resources.scheduleLayoutOrPreload_(resource, true);
-    expect(resources.queue_.getSize()).to.equal(0);
-  });
-
-  it('should not schedule non-renderOutsideViewport resource when' +
-        ' resource is not visible', () => {
-    const resource = {
-      getState: () => ResourceState.READY_FOR_LAYOUT,
-      isDisplayed: () => true,
-      isFixed: () => false,
-      isInViewport: () => false,
-      prerenderAllowed: () => true,
-      renderOutsideViewport: () => false,
-      idleRenderOutsideViewport: () => false,
-      startLayout: () => {},
-      applySizesAndMediaQuery: () => {},
-    };
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.HIDDEN);
     resources.scheduleLayoutOrPreload_(resource, true);
     expect(resources.queue_.getSize()).to.equal(0);
   });
 
-  it('should force schedule non-renderOutsideViewport resource when' +
-        ' resource is not visible', () => {
-    const resource = {
-      getState: () => ResourceState.READY_FOR_LAYOUT,
-      isDisplayed: () => true,
-      isFixed: () => false,
-      isInViewport: () => false,
-      prerenderAllowed: () => true,
-      renderOutsideViewport: () => false,
-      idleRenderOutsideViewport: () => false,
-      getLayoutPriority: () => LayoutPriority.METADATA,
-      startLayout: () => {},
-      layoutScheduled: () => {},
-      getTaskId: () => 'resource#L',
-      applySizesAndMediaQuery: () => {},
-    };
-    resources.scheduleLayoutOrPreload_(resource, true, 0, /* force */ true);
-    expect(resources.queue_.getSize()).to.equal(1);
-    expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.true;
-  });
-
-  it('should schedule renderOutsideViewport resource when' +
-        ' resource is not visible', () => {
-    const resource = {
-      getState: () => ResourceState.READY_FOR_LAYOUT,
-      isDisplayed: () => true,
-      isFixed: () => false,
-      isInViewport: () => false,
-      prerenderAllowed: () => true,
-      renderOutsideViewport: () => true,
-      idleRenderOutsideViewport: () => false,
-      getLayoutPriority: () => LayoutPriority.METADATA,
-      startLayout: () => {},
-      layoutScheduled: () => {},
-      getTaskId: () => 'resource#L',
-      applySizesAndMediaQuery: () => {},
-    };
-    resources.scheduleLayoutOrPreload_(resource, true);
-    expect(resources.queue_.getSize()).to.equal(1);
-    expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
-  });
-
-  it('should schedule idleRenderOutsideViewport resource when' +
-        ' resource is not visible', () => {
-    const resource = {
-      getState: () => ResourceState.READY_FOR_LAYOUT,
-      isDisplayed: () => true,
-      isFixed: () => false,
-      isInViewport: () => false,
-      prerenderAllowed: () => true,
-      renderOutsideViewport: () => false,
-      idleRenderOutsideViewport: () => true,
-      getLayoutPriority: () => LayoutPriority.METADATA,
-      startLayout: () => {},
-      layoutScheduled: () => {},
-      getTaskId: () => 'resource#L',
-      applySizesAndMediaQuery: () => {},
-    };
-    resources.scheduleLayoutOrPreload_(resource, true);
-    expect(resources.queue_.getSize()).to.equal(1);
-    expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
-  });
+  it(
+    'should not schedule non-renderOutsideViewport resource when' +
+      ' resource is not visible',
+    () => {
+      const resource = {
+        getState: () => ResourceState.READY_FOR_LAYOUT,
+        isDisplayed: () => true,
+        isFixed: () => false,
+        isInViewport: () => false,
+        prerenderAllowed: () => true,
+        renderOutsideViewport: () => false,
+        idleRenderOutsideViewport: () => false,
+        startLayout: () => {},
+        applySizesAndMediaQuery: () => {},
+      };
+      resources.scheduleLayoutOrPreload_(resource, true);
+      expect(resources.queue_.getSize()).to.equal(0);
+    }
+  );
+
+  it(
+    'should force schedule non-renderOutsideViewport resource when' +
+      ' resource is not visible',
+    () => {
+      const resource = {
+        getState: () => ResourceState.READY_FOR_LAYOUT,
+        isDisplayed: () => true,
+        isFixed: () => false,
+        isInViewport: () => false,
+        prerenderAllowed: () => true,
+        renderOutsideViewport: () => false,
+        idleRenderOutsideViewport: () => false,
+        getLayoutPriority: () => LayoutPriority.METADATA,
+        startLayout: () => {},
+        layoutScheduled: () => {},
+        getTaskId: () => 'resource#L',
+        applySizesAndMediaQuery: () => {},
+      };
+      resources.scheduleLayoutOrPreload_(resource, true, 0, /* force */ true);
+      expect(resources.queue_.getSize()).to.equal(1);
+      expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.true;
+    }
+  );
+
+  it(
+    'should schedule renderOutsideViewport resource when' +
+      ' resource is not visible',
+    () => {
+      const resource = {
+        getState: () => ResourceState.READY_FOR_LAYOUT,
+        isDisplayed: () => true,
+        isFixed: () => false,
+        isInViewport: () => false,
+        prerenderAllowed: () => true,
+        renderOutsideViewport: () => true,
+        idleRenderOutsideViewport: () => false,
+        getLayoutPriority: () => LayoutPriority.METADATA,
+        startLayout: () => {},
+        layoutScheduled: () => {},
+        getTaskId: () => 'resource#L',
+        applySizesAndMediaQuery: () => {},
+      };
+      resources.scheduleLayoutOrPreload_(resource, true);
+      expect(resources.queue_.getSize()).to.equal(1);
+      expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
+    }
+  );
+
+  it(
+    'should schedule idleRenderOutsideViewport resource when' +
+      ' resource is not visible',
+    () => {
+      const resource = {
+        getState: () => ResourceState.READY_FOR_LAYOUT,
+        isDisplayed: () => true,
+        isFixed: () => false,
+        isInViewport: () => false,
+        prerenderAllowed: () => true,
+        renderOutsideViewport: () => false,
+        idleRenderOutsideViewport: () => true,
+        getLayoutPriority: () => LayoutPriority.METADATA,
+        startLayout: () => {},
+        layoutScheduled: () => {},
+        getTaskId: () => 'resource#L',
+        applySizesAndMediaQuery: () => {},
+      };
+      resources.scheduleLayoutOrPreload_(resource, true);
+      expect(resources.queue_.getSize()).to.equal(1);
+      expect(resources.queue_.tasks_[0].forceOutsideViewport).to.be.false;
+    }
+  );
 
   it('should require layout for non-scheduled element', () => {
     const element = createAmpElement();
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 100, 100));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 100, 100));
     const resource = new Resource(1, element, resources);
     const measureSpy = sandbox.spy(resource, 'measure');
-    const scheduleStub = sandbox.stub(
-        resources, 'scheduleLayoutOrPreload_').callsFake(
-        () => resource.loadPromiseResolve_());
+    const scheduleStub = sandbox
+      .stub(resources, 'scheduleLayoutOrPreload_')
+      .callsFake(() => resource.loadPromiseResolve_());
     const promise = resources.requireLayout(resource.element);
     resource.build();
     return Promise.all([promise, resource.whenBuilt()]).then(() => {
@@ -444,8 +457,9 @@ describe('Resources', () => {
 
   it('should require layout for scheduled element', () => {
     const element = createAmpElement();
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 100, 100));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 100, 100));
     const resource = new Resource(1, element, resources);
     resource.layoutScheduled();
     const measureSpy = sandbox.spy(resource, 'measure');
@@ -461,8 +475,9 @@ describe('Resources', () => {
 
   it('should not require layout for undisplayed element', () => {
     const element = createAmpElement();
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 0, 0));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 0, 0));
     const resource = new Resource(1, element, resources);
     const measureSpy = sandbox.spy(resource, 'measure');
     const scheduleStub = sandbox.stub(resources, 'scheduleLayoutOrPreload_');
@@ -476,8 +491,9 @@ describe('Resources', () => {
 
   it('should not require layout for already completed element', () => {
     const element = createAmpElement();
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 0, 0));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 0, 0));
     const resource = new Resource(1, element, resources);
     resource.layoutComplete_(true);
     const measureSpy = sandbox.spy(resource, 'measure');
@@ -494,15 +510,17 @@ describe('Resources', () => {
     const parentElement = createAmpElement();
     const element = createAmpElement();
     parentElement.appendChild(element);
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 10, 10));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 10, 10));
     sandbox.stub(element, 'isBuilt').callsFake(() => true);
     const parentResource = new Resource(1, parentElement, resources);
     const resource = new Resource(2, element, resources);
     const measureSpy = sandbox.spy(resource, 'measure');
     const scheduleStub = sandbox.stub(resources, 'scheduleLayoutOrPreload_');
-    resources.scheduleLayoutOrPreloadForSubresources_(
-        parentResource, true, [element]);
+    resources.scheduleLayoutOrPreloadForSubresources_(parentResource, true, [
+      element,
+    ]);
     expect(measureSpy).to.be.calledOnce;
     expect(scheduleStub).to.be.calledOnce;
   });
@@ -511,23 +529,28 @@ describe('Resources', () => {
     const parentElement = createAmpElement();
     const element = createAmpElement();
     parentElement.appendChild(element);
-    sandbox.stub(element, 'getBoundingClientRect').callsFake(
-        () => layoutRectLtwh(0, 0, 10, 10));
+    sandbox
+      .stub(element, 'getBoundingClientRect')
+      .callsFake(() => layoutRectLtwh(0, 0, 10, 10));
     sandbox.stub(element, 'isBuilt').callsFake(() => false);
     const parentResource = new Resource(1, parentElement, resources);
     const resource = new Resource(2, element, resources);
     const measureSpy = sandbox.spy(resource, 'measure');
     const scheduleStub = sandbox.stub(resources, 'scheduleLayoutOrPreload_');
-    resources.scheduleLayoutOrPreloadForSubresources_(
-        parentResource, true, [element]);
+    resources.scheduleLayoutOrPreloadForSubresources_(parentResource, true, [
+      element,
+    ]);
     expect(measureSpy).to.not.be.called;
     expect(scheduleStub).to.not.be.called;
-    return resource.build().then(() => {
-      return element.whenBuilt();
-    }).then(() => {
-      expect(measureSpy).to.be.calledOnce;
-      expect(scheduleStub).to.be.calledOnce;
-    });
+    return resource
+      .build()
+      .then(() => {
+        return element.whenBuilt();
+      })
+      .then(() => {
+        expect(measureSpy).to.be.calledOnce;
+        expect(scheduleStub).to.be.calledOnce;
+      });
   });
 
   it('should update priority and schedule pass', () => {
@@ -573,116 +596,137 @@ describe('Resources', () => {
   });
 });
 
-
-describes.fakeWin('Resources startup', {
-  win: {
-    readyState: 'loading',
+describes.fakeWin(
+  'Resources startup',
+  {
+    win: {
+      readyState: 'loading',
+    },
+    amp: true,
   },
-  amp: true,
-}, env => {
-  let win;
-  let clock;
-  let sandbox;
-  let resources;
-  let schedulePassStub;
-
-  beforeEach(() => {
-    win = env.win;
-    sandbox = sinon.sandbox;
-    clock = sandbox.useFakeTimers();
-    resources = Services.resourcesForDoc(win.document.body);
-    resources.relayoutAll_ = false;
-    schedulePassStub = sandbox.stub(resources, 'schedulePass');
-  });
+  env => {
+    let win;
+    let clock;
+    let sandbox;
+    let resources;
+    let schedulePassStub;
 
-  afterEach(() => {
-    sandbox.restore();
-  });
+    beforeEach(() => {
+      win = env.win;
+      sandbox = sinon.sandbox;
+      clock = sandbox.useFakeTimers();
+      resources = Services.resourcesForDoc(win.document.body);
+      resources.relayoutAll_ = false;
+      schedulePassStub = sandbox.stub(resources, 'schedulePass');
+    });
 
-  it('should run a full reload pass on window.onload', () => {
-    expect(resources.relayoutAll_).to.be.false;
-    expect(schedulePassStub).to.not.be.called;
-    win.readyState = 'complete';
-    win.eventListeners.fire({type: 'load'});
-    win.document.eventListeners.fire({type: 'readystatechange'});
-    return resources.ampdoc.whenReady().then(() => {
-      return loadPromise(win);
-    }).then(() => {
-      expect(resources.relayoutAll_).to.be.true;
-      expect(schedulePassStub).to.have.been.called;
+    afterEach(() => {
+      sandbox.restore();
     });
-  });
 
-  it('should run a full reload pass on fonts timeout', () => {
-    win.readyState = 'complete';
-    win.document.eventListeners.fire({type: 'readystatechange'});
-    return resources.ampdoc.whenReady().then(() => {
+    it('should run a full reload pass on window.onload', () => {
       expect(resources.relayoutAll_).to.be.false;
       expect(schedulePassStub).to.not.be.called;
-      clock.tick(3100);
-    }).then(() => {
-      expect(resources.relayoutAll_).to.be.true;
-      expect(schedulePassStub).to.have.been.called;
+      win.readyState = 'complete';
+      win.eventListeners.fire({type: 'load'});
+      win.document.eventListeners.fire({type: 'readystatechange'});
+      return resources.ampdoc
+        .whenReady()
+        .then(() => {
+          return loadPromise(win);
+        })
+        .then(() => {
+          expect(resources.relayoutAll_).to.be.true;
+          expect(schedulePassStub).to.have.been.called;
+        });
     });
-  });
 
-  it('should run a full reload pass on document.fonts.ready', () => {
-    win.readyState = 'interactive';
-    win.document.eventListeners.fire({type: 'readystatechange'});
-    win.document.fonts.status = 'loading';
-    return resources.ampdoc.whenReady().then(() => {
+    it('should run a full reload pass on fonts timeout', () => {
+      win.readyState = 'complete';
+      win.document.eventListeners.fire({type: 'readystatechange'});
+      return resources.ampdoc
+        .whenReady()
+        .then(() => {
+          expect(resources.relayoutAll_).to.be.false;
+          expect(schedulePassStub).to.not.be.called;
+          clock.tick(3100);
+        })
+        .then(() => {
+          expect(resources.relayoutAll_).to.be.true;
+          expect(schedulePassStub).to.have.been.called;
+        });
+    });
 
-    }).then(() => {
-      // This is the regular remeasure on doc-ready.
-      expect(resources.relayoutAll_).to.be.true;
-      resources.relayoutAll_ = false;
-      return win.document.fonts.ready;
-    }).then(() => {
-      // Wait one micro task.
-      return Promise.resolve();
-    }).then(() => {
-      expect(resources.relayoutAll_).to.be.true;
-      // Remeasure on doc-ready and fonts-ready.
-      expect(schedulePassStub).to.have.been.calledTwice;
+    it('should run a full reload pass on document.fonts.ready', () => {
+      win.readyState = 'interactive';
+      win.document.eventListeners.fire({type: 'readystatechange'});
+      win.document.fonts.status = 'loading';
+      return resources.ampdoc
+        .whenReady()
+        .then(() => {})
+        .then(() => {
+          // This is the regular remeasure on doc-ready.
+          expect(resources.relayoutAll_).to.be.true;
+          resources.relayoutAll_ = false;
+          return win.document.fonts.ready;
+        })
+        .then(() => {
+          // Wait one micro task.
+          return Promise.resolve();
+        })
+        .then(() => {
+          expect(resources.relayoutAll_).to.be.true;
+          // Remeasure on doc-ready and fonts-ready.
+          expect(schedulePassStub).to.have.been.calledTwice;
+        });
     });
-  });
 
-  it('should not remeasure if fonts load before doc-ready', () => {
-    win.readyState = 'interactive';
-    win.document.eventListeners.fire({type: 'readystatechange'});
-    win.document.fonts.status = 'loaded';
-    return resources.ampdoc.whenReady().then(() => {
+    it('should not remeasure if fonts load before doc-ready', () => {
+      win.readyState = 'interactive';
+      win.document.eventListeners.fire({type: 'readystatechange'});
+      win.document.fonts.status = 'loaded';
+      return resources.ampdoc
+        .whenReady()
+        .then(() => {})
+        .then(() => {
+          // This is the regular remeasure on doc-ready.
+          expect(resources.relayoutAll_).to.be.true;
+          resources.relayoutAll_ = false;
+          return win.document.fonts.ready;
+        })
+        .then(() => {
+          // Wait one micro task.
+          return Promise.resolve();
+        })
+        .then(() => {
+          expect(resources.relayoutAll_).to.be.false;
+          // Only remeasure on doc-ready.
+          expect(schedulePassStub).to.have.been.calledOnce;
+        });
+    });
 
-    }).then(() => {
-      // This is the regular remeasure on doc-ready.
-      expect(resources.relayoutAll_).to.be.true;
-      resources.relayoutAll_ = false;
-      return win.document.fonts.ready;
-    }).then(() => {
-      // Wait one micro task.
-      return Promise.resolve();
-    }).then(() => {
+    it('should run a full reload when a new element is connected', () => {
+      expect(resources.relayoutAll_).to.be.false;
+      expect(schedulePassStub).to.not.be.called;
+      const el = win.document.createElement('amp-img');
+      el.isBuilt = () => {
+        return true;
+      };
+      el.isUpgraded = () => {
+        return true;
+      };
+      el.isRelayoutNeeded = () => {
+        return true;
+      };
+      el.updateLayoutBox = () => {};
+      win.document.body.appendChild(el);
+      resources.add(el);
       expect(resources.relayoutAll_).to.be.false;
-      // Only remeasure on doc-ready.
-      expect(schedulePassStub).to.have.been.calledOnce;
+      clock.tick(1000);
+      expect(resources.relayoutAll_).to.be.true;
     });
-  });
-
-  it('should run a full reload when a new element is connected', () => {
-    expect(resources.relayoutAll_).to.be.false;
-    expect(schedulePassStub).to.not.be.called;
-    const el = win.document.createElement('amp-img');
-    el.isBuilt = () => { return true; };
-    el.isUpgraded = () => { return true; };
-    el.isRelayoutNeeded = () => { return true; };
-    el.updateLayoutBox = () => {};
-    win.document.body.appendChild(el);
-    resources.add(el);
-    expect(resources.relayoutAll_).to.be.false;
-    clock.tick(1000);
-    expect(resources.relayoutAll_).to.be.true;
-  });
-});
+  }
+);
 
 describes.realWin('getElementLayoutBox', {}, env => {
   let win;
@@ -691,9 +735,15 @@ describes.realWin('getElementLayoutBox', {}, env => {
   let vsyncSpy;
 
   function addResourceForElement(id, element) {
-    element.isBuilt = () => { return true; };
-    element.isUpgraded = () => { return true; };
-    element.isRelayoutNeeded = () => { return true; };
+    element.isBuilt = () => {
+      return true;
+    };
+    element.isUpgraded = () => {
+      return true;
+    };
+    element.isRelayoutNeeded = () => {
+      return true;
+    };
     element.updateLayoutBox = () => {};
     const resource = new Resource(id, element, resources);
     resource.state_ = ResourceState.LAYOUT_COMPLETE;
@@ -782,157 +832,159 @@ describes.realWin('getElementLayoutBox', {}, env => {
   });
 });
 
+describes.realWin(
+  'Resources pause/resume/unlayout scheduling',
+  {
+    amp: true,
+  },
+  env => {
+    let win, doc;
+    let resources;
+    let parent;
+    let children;
+    let child0;
+    let child1;
+    let child2;
 
-describes.realWin('Resources pause/resume/unlayout scheduling', {
-  amp: true,
-}, env => {
-  let win, doc;
-  let resources;
-  let parent;
-  let children;
-  let child0;
-  let child1;
-  let child2;
-
-  beforeEach(() => {
-    win = env.win;
-    doc = win.document;
-    resources = new Resources(env.ampdoc);
-    resources.isRuntimeOn_ = false;
-    const parentTuple = createElementWithResource(1);
-    parent = parentTuple[0];
-    child0 = doc.createElement('div');
-    child1 = createElementWithResource(2)[0];
-    child2 = createElementWithResource(3)[0];
-    children = [child0, child1, child2];
-    children.forEach(child => {
-      parent.appendChild(child);
+    beforeEach(() => {
+      win = env.win;
+      doc = win.document;
+      resources = new Resources(env.ampdoc);
+      resources.isRuntimeOn_ = false;
+      const parentTuple = createElementWithResource(1);
+      parent = parentTuple[0];
+      child0 = doc.createElement('div');
+      child1 = createElementWithResource(2)[0];
+      child2 = createElementWithResource(3)[0];
+      children = [child0, child1, child2];
+      children.forEach(child => {
+        parent.appendChild(child);
+      });
     });
-  });
 
-  function createElement() {
-    const element = env.createAmpElement('amp-test');
-    sandbox.stub(element, 'isBuilt').callsFake(() => true);
-    return element;
-  }
+    function createElement() {
+      const element = env.createAmpElement('amp-test');
+      sandbox.stub(element, 'isBuilt').callsFake(() => true);
+      return element;
+    }
 
-  function createElementWithResource(id) {
-    const element = createElement();
-    const resource = new Resource(id, element, resources);
-    resource.state_ = ResourceState.LAYOUT_COMPLETE;
-    resource.element['__AMP__RESOURCE'] = resource;
-    return [element, resource];
-  }
+    function createElementWithResource(id) {
+      const element = createElement();
+      const resource = new Resource(id, element, resources);
+      resource.state_ = ResourceState.LAYOUT_COMPLETE;
+      resource.element['__AMP__RESOURCE'] = resource;
+      return [element, resource];
+    }
 
-  describe('schedulePause', () => {
-    it('should not throw with a single element', () => {
-      expect(() => {
-        resources.schedulePause(parent, child1);
-      }).to.not.throw();
-    });
+    describe('schedulePause', () => {
+      it('should not throw with a single element', () => {
+        expect(() => {
+          resources.schedulePause(parent, child1);
+        }).to.not.throw();
+      });
 
-    it('should not throw with an array of elements', () => {
-      expect(() => {
-        resources.schedulePause(parent, [child1, child2]);
-      }).to.not.throw();
-    });
+      it('should not throw with an array of elements', () => {
+        expect(() => {
+          resources.schedulePause(parent, [child1, child2]);
+        }).to.not.throw();
+      });
+
+      it('should be ok with non amp children', () => {
+        expect(() => {
+          resources.schedulePause(parent, children);
+          resources.schedulePause(parent, child0);
+        }).to.not.throw();
+      });
+
+      it('should call pauseCallback on custom element', () => {
+        const stub1 = sandbox.stub(child1, 'pauseCallback');
+        const stub2 = sandbox.stub(child2, 'pauseCallback');
 
-    it('should be ok with non amp children', () => {
-      expect(() => {
         resources.schedulePause(parent, children);
-        resources.schedulePause(parent, child0);
-      }).to.not.throw();
-    });
+        expect(stub1.calledOnce).to.be.true;
+        expect(stub2.calledOnce).to.be.true;
+      });
 
-    it('should call pauseCallback on custom element', () => {
-      const stub1 = sandbox.stub(child1, 'pauseCallback');
-      const stub2 = sandbox.stub(child2, 'pauseCallback');
+      it('should call unlayoutCallback when unlayoutOnPause', () => {
+        const stub1 = sandbox.stub(child1, 'unlayoutCallback');
+        const stub2 = sandbox.stub(child2, 'unlayoutCallback');
+        sandbox.stub(child1, 'unlayoutOnPause').returns(true);
 
-      resources.schedulePause(parent, children);
-      expect(stub1.calledOnce).to.be.true;
-      expect(stub2.calledOnce).to.be.true;
+        resources.schedulePause(parent, children);
+        expect(stub1.calledOnce).to.be.true;
+        expect(stub2.calledOnce).to.be.false;
+      });
     });
 
-    it('should call unlayoutCallback when unlayoutOnPause', () => {
-      const stub1 = sandbox.stub(child1, 'unlayoutCallback');
-      const stub2 = sandbox.stub(child2, 'unlayoutCallback');
-      sandbox.stub(child1, 'unlayoutOnPause').returns(true);
+    describe('scheduleResume', () => {
+      beforeEach(() => {
+        // Pause one child.
+        resources.schedulePause(parent, child1);
+      });
 
-      resources.schedulePause(parent, children);
-      expect(stub1.calledOnce).to.be.true;
-      expect(stub2.calledOnce).to.be.false;
-    });
-  });
+      it('should not throw with a single element', () => {
+        expect(() => {
+          resources.scheduleResume(parent, child1);
+        }).to.not.throw();
+      });
 
-  describe('scheduleResume', () => {
-    beforeEach(() => {
-      // Pause one child.
-      resources.schedulePause(parent, child1);
-    });
+      it('should not throw with an array of elements', () => {
+        expect(() => {
+          resources.scheduleResume(parent, [child1, child2]);
+        }).to.not.throw();
+      });
 
-    it('should not throw with a single element', () => {
-      expect(() => {
-        resources.scheduleResume(parent, child1);
-      }).to.not.throw();
-    });
+      it('should be ok with non amp children', () => {
+        expect(() => {
+          resources.scheduleResume(parent, children);
+          resources.scheduleResume(parent, child0);
+        }).to.not.throw();
+      });
 
-    it('should not throw with an array of elements', () => {
-      expect(() => {
-        resources.scheduleResume(parent, [child1, child2]);
-      }).to.not.throw();
-    });
+      it('should call resumeCallback on paused custom elements', () => {
+        const stub1 = sandbox.stub(child1, 'resumeCallback');
 
-    it('should be ok with non amp children', () => {
-      expect(() => {
         resources.scheduleResume(parent, children);
-        resources.scheduleResume(parent, child0);
-      }).to.not.throw();
-    });
+        expect(stub1.calledOnce).to.be.true;
+      });
 
-    it('should call resumeCallback on paused custom elements', () => {
-      const stub1 = sandbox.stub(child1, 'resumeCallback');
+      it('should call resumeCallback on non-paused custom elements', () => {
+        const stub2 = sandbox.stub(child2, 'resumeCallback');
 
-      resources.scheduleResume(parent, children);
-      expect(stub1.calledOnce).to.be.true;
+        resources.scheduleResume(parent, children);
+        expect(stub2.calledOnce).to.be.true;
+      });
     });
 
-    it('should call resumeCallback on non-paused custom elements', () => {
-      const stub2 = sandbox.stub(child2, 'resumeCallback');
-
-      resources.scheduleResume(parent, children);
-      expect(stub2.calledOnce).to.be.true;
-    });
-  });
+    describe('scheduleUnlayout', () => {
+      it('should not throw with a single element', () => {
+        expect(() => {
+          resources.scheduleUnlayout(parent, child1);
+        }).to.not.throw();
+      });
 
-  describe('scheduleUnlayout', () => {
-    it('should not throw with a single element', () => {
-      expect(() => {
-        resources.scheduleUnlayout(parent, child1);
-      }).to.not.throw();
-    });
+      it('should not throw with an array of elements', () => {
+        expect(() => {
+          resources.scheduleUnlayout(parent, [child1, child2]);
+        }).to.not.throw();
+      });
 
-    it('should not throw with an array of elements', () => {
-      expect(() => {
-        resources.scheduleUnlayout(parent, [child1, child2]);
-      }).to.not.throw();
-    });
+      it('should be ok with non amp children', () => {
+        expect(() => {
+          resources.scheduleUnlayout(parent, children);
+        }).to.not.throw();
+      });
 
-    it('should be ok with non amp children', () => {
-      expect(() => {
+      it('should schedule on custom element with multiple children', () => {
+        const stub1 = sandbox.stub(child1, 'unlayoutCallback');
+        const stub2 = sandbox.stub(child2, 'unlayoutCallback');
         resources.scheduleUnlayout(parent, children);
-      }).to.not.throw();
-    });
-
-    it('should schedule on custom element with multiple children', () => {
-      const stub1 = sandbox.stub(child1, 'unlayoutCallback');
-      const stub2 = sandbox.stub(child2, 'unlayoutCallback');
-      resources.scheduleUnlayout(parent, children);
-      expect(stub1.called).to.be.true;
-      expect(stub2.called).to.be.true;
+        expect(stub1.called).to.be.true;
+        expect(stub2.called).to.be.true;
+      });
     });
-  });
-});
-
+  }
+);
 
 describes.realWin('Resources schedulePreload', {amp: true}, env => {
   let win, doc;
@@ -1030,9 +1082,7 @@ describes.realWin('Resources schedulePreload', {amp: true}, env => {
   });
 });
 
-
 describe('Resources discoverWork', () => {
-
   function createElement(rect) {
     const signals = new Signals();
     return {
@@ -1097,8 +1147,9 @@ describe('Resources discoverWork', () => {
     resources.win = {
       document,
       getComputedStyle: el => {
-        return el.fakeComputedStyle ?
-          el.fakeComputedStyle : window.getComputedStyle(el);
+        return el.fakeComputedStyle
+          ? el.fakeComputedStyle
+          : window.getComputedStyle(el);
       },
     };
 
@@ -1131,11 +1182,10 @@ describe('Resources discoverWork', () => {
 
   it('should measure unbuilt elements', () => {
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
     resource1.isBuilt = () => false;
     const mediaSpy = sandbox.stub(resource1.element, 'applySizesAndMediaQuery');
     expect(resource1.hasBeenMeasured()).to.be.false;
@@ -1149,11 +1199,10 @@ describe('Resources discoverWork', () => {
 
   it('should render two screens when visible', () => {
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
 
@@ -1166,11 +1215,10 @@ describe('Resources discoverWork', () => {
     resource1.state_ = ResourceState.LAYOUT_COMPLETE;
     resource2.state_ = ResourceState.LAYOUT_COMPLETE;
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
 
@@ -1182,18 +1230,17 @@ describe('Resources discoverWork', () => {
     resource2.state_ = ResourceState.LAYOUT_COMPLETE;
     resource1.hasBeenMeasured = () => true;
     resource2.hasBeenMeasured = () => true;
-    resource1.element.getBoundingClientRect =
-        () => layoutRectLtwh(10, 10, 100, 101);
-    resource2.element.getBoundingClientRect =
-        () => layoutRectLtwh(10, 1010, 100, 101);
+    resource1.element.getBoundingClientRect = () =>
+      layoutRectLtwh(10, 10, 100, 101);
+    resource2.element.getBoundingClientRect = () =>
+      layoutRectLtwh(10, 1010, 100, 101);
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
     resources.relayoutAll_ = false;
     resources.relayoutTop_ = 1000;
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
 
@@ -1206,12 +1253,11 @@ describe('Resources discoverWork', () => {
 
   it('should prerender only one screen with prerenderSize = 1', () => {
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.PRERENDER
-    );
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.PRERENDER);
     resources.prerenderSize_ = 1;
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 1009));
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 1009));
 
     resources.discoverWork_();
 
@@ -1221,12 +1267,11 @@ describe('Resources discoverWork', () => {
 
   it('should NOT prerender anything with prerenderSize = 0', () => {
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.PRERENDER
-    );
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.PRERENDER);
     resources.prerenderSize_ = 0;
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
 
     resources.discoverWork_();
 
@@ -1238,17 +1283,18 @@ describe('Resources discoverWork', () => {
     resource1.state_ = ResourceState.LAYOUT_COMPLETE;
     resource2.state_ = ResourceState.LAYOUT_COMPLETE;
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
-
-    const resource1MeasureStub = sandbox.stub(resource1, 'measure').callsFake(
-        resource1.measure.bind(resource1));
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
+
+    const resource1MeasureStub = sandbox
+      .stub(resource1, 'measure')
+      .callsFake(resource1.measure.bind(resource1));
     const resource1UnloadStub = sandbox.stub(resource1, 'unload');
-    const resource2MeasureStub = sandbox.stub(resource2, 'measure').callsFake(
-        resource2.measure.bind(resource2));
+    const resource2MeasureStub = sandbox
+      .stub(resource2, 'measure')
+      .callsFake(resource2.measure.bind(resource2));
     const resource2UnloadStub = sandbox.stub(resource2, 'unload');
 
     // 1st pass: measure for the first time.
@@ -1270,8 +1316,7 @@ describe('Resources discoverWork', () => {
     resource2.requestMeasure();
     expect(resource1.isMeasureRequested()).to.be.true;
     expect(resource2.isMeasureRequested()).to.be.true;
-    resource2.element.getBoundingClientRect =
-        () => layoutRectLtwh(0, 0, 0, 0); // Equiv to display:none.
+    resource2.element.getBoundingClientRect = () => layoutRectLtwh(0, 0, 0, 0); // Equiv to display:none.
     resources.discoverWork_();
     expect(resource1MeasureStub).to.have.callCount(2);
     expect(resource1UnloadStub).to.have.not.been.called;
@@ -1293,11 +1338,13 @@ describe('Resources discoverWork', () => {
     resource1.layoutCallback = new Promise(unusedResolve => {});
     resource1.unlayoutCallback = () => true;
 
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400)).atLeast(1);
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock
+      .expects('getRect')
+      .returns(layoutRectLtwh(0, 0, 300, 400))
+      .atLeast(1);
 
     resources.discoverWork_();
     expect(resources.queue_.getSize()).to.equal(2);
@@ -1391,8 +1438,9 @@ describe('Resources discoverWork', () => {
     expect(resources.queue_.tasks_[0].resource).to.equal(resource1);
 
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').callsFake(
-        () => 'prerender');
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .callsFake(() => 'prerender');
     sandbox.stub(resource1, 'isInViewport').callsFake(() => true);
     sandbox.stub(resource1, 'prerenderAllowed').callsFake(() => true);
 
@@ -1411,8 +1459,9 @@ describe('Resources discoverWork', () => {
     expect(resources.queue_.tasks_[0].resource).to.equal(resource1);
 
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').callsFake(
-        () => 'prerender');
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .callsFake(() => 'prerender');
     sandbox.stub(resource1, 'isInViewport').callsFake(() => true);
     sandbox.stub(resource1, 'prerenderAllowed').callsFake(() => false);
 
@@ -1431,8 +1480,9 @@ describe('Resources discoverWork', () => {
     expect(resources.queue_.tasks_[0].resource).to.equal(resource1);
 
     resources.visible_ = false;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').callsFake(
-        () => 'hidden');
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .callsFake(() => 'hidden');
     sandbox.stub(resource1, 'isInViewport').callsFake(() => true);
     sandbox.stub(resource1, 'prerenderAllowed').callsFake(() => true);
 
@@ -1449,11 +1499,10 @@ describe('Resources discoverWork', () => {
   // it.configure().skipSafari().run(
   it.skip('should update inViewport before scheduling layouts', () => {
     resources.visible_ = true;
-    sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-        VisibilityState.VISIBLE
-    );
-    viewportMock.expects('getRect').returns(
-        layoutRectLtwh(0, 0, 300, 400));
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.VISIBLE);
+    viewportMock.expects('getRect').returns(layoutRectLtwh(0, 0, 300, 400));
     const setInViewport = sandbox.spy(resource1, 'setInViewport');
     const schedule = sandbox.spy(resources, 'scheduleLayoutOrPreload_');
 
@@ -1465,8 +1514,9 @@ describe('Resources discoverWork', () => {
 
   it('should not grant permission to build when threshold reached', () => {
     let hasBeenVisible = false;
-    sandbox.stub(resources.viewer_, 'hasBeenVisible').callsFake(
-        () => hasBeenVisible);
+    sandbox
+      .stub(resources.viewer_, 'hasBeenVisible')
+      .callsFake(() => hasBeenVisible);
 
     for (let i = 0; i < 20; i++) {
       expect(resources.grantBuildPermission()).to.be.true;
@@ -1489,7 +1539,9 @@ describe('Resources discoverWork', () => {
 
     expect(resource1.build).to.be.calledOnce;
     expect(buildResourceSpy).calledWithExactly(
-        resource1, /* schedulePass */ true);
+      resource1,
+      /* schedulePass */ true
+    );
   });
 
   it('should build resource when not built and before doc ready', () => {
@@ -1506,12 +1558,15 @@ describe('Resources discoverWork', () => {
 
     expect(resource1.build).to.be.calledOnce;
     expect(buildResourceSpy).calledWithExactly(
-        resource1, /* schedulePass */ true);
+      resource1,
+      /* schedulePass */ true
+    );
   });
 
   it('should NOT build non-prerenderable resources in prerender', () => {
-    sandbox.stub(resources.viewer_, 'getVisibilityState')
-        .returns(VisibilityState.PRERENDER);
+    sandbox
+      .stub(resources.viewer_, 'getVisibilityState')
+      .returns(VisibilityState.PRERENDER);
     sandbox.stub(resources, 'schedule_');
     resources.documentReady_ = true;
 
@@ -1543,7 +1598,6 @@ describe('Resources discoverWork', () => {
   });
 
   describe('getResourcesInRect', () => {
-
     beforeEach(() => {
       resources.isRuntimeOn_ = false;
       resources.ampdoc.signals().signal('ready-scan');
@@ -1600,8 +1654,8 @@ describe('Resources discoverWork', () => {
 
     it('should ignore invisible elements', () => {
       const rect = layoutRectLtwh(0, 0, 100, 1500);
-      resource2.element.getBoundingClientRect =
-          () => layoutRectLtwh(0, 0, 0, 0);
+      resource2.element.getBoundingClientRect = () =>
+        layoutRectLtwh(0, 0, 0, 0);
       return resources.getResourcesInRect(window, rect).then(res => {
         expect(res).to.have.length(1);
         expect(res[0]).to.equal(resource1);
@@ -1637,7 +1691,6 @@ describe('Resources discoverWork', () => {
   });
 
   describe('onNextPass', () => {
-
     it('should only run callbacks once.', () => {
       resources.isRuntimeOn_ = true;
       resources.documentReady_ = true;
@@ -1655,82 +1708,86 @@ describe('Resources discoverWork', () => {
   });
 });
 
-describes.realWin('Resources contentHeight', {
-  amp: {
-    runtimeOn: true,
+describes.realWin(
+  'Resources contentHeight',
+  {
+    amp: {
+      runtimeOn: true,
+    },
   },
-}, env => {
-  let win;
-  let resources;
-  let viewerSendMessageStub, viewportContentHeightChangedStub;
+  env => {
+    let win;
+    let resources;
+    let viewerSendMessageStub, viewportContentHeightChangedStub;
 
-  beforeEach(() => {
-    win = env.win;
-    resources = win.services.resources.obj;
-    viewerSendMessageStub = sandbox.stub(resources.viewer_, 'sendMessage');
-    viewportContentHeightChangedStub =
-        sandbox.stub(resources.viewport_, 'contentHeightChanged');
-    sandbox.stub(resources.vsync_, 'run').callsFake(task => {
-      task.measure({});
+    beforeEach(() => {
+      win = env.win;
+      resources = win.services.resources.obj;
+      viewerSendMessageStub = sandbox.stub(resources.viewer_, 'sendMessage');
+      viewportContentHeightChangedStub = sandbox.stub(
+        resources.viewport_,
+        'contentHeightChanged'
+      );
+      sandbox.stub(resources.vsync_, 'run').callsFake(task => {
+        task.measure({});
+      });
     });
-  });
-
-  it('should measure initial contentHeight', () => {
-    const contentHeight = resources.viewport_.getContentHeight();
-    expect(resources.maybeChangeHeight_).to.equal(false);
-    expect(resources.documentReady_).to.equal(true);
-    expect(resources.contentHeight_).to.equal(contentHeight);
-  });
 
-  it('should send contentHeight to viewer if height was changed', () => {
-    sandbox.stub(resources.viewport_, 'getContentHeight').callsFake(() => {
-      return 200;
+    it('should measure initial contentHeight', () => {
+      const contentHeight = resources.viewport_.getContentHeight();
+      expect(resources.maybeChangeHeight_).to.equal(false);
+      expect(resources.documentReady_).to.equal(true);
+      expect(resources.contentHeight_).to.equal(contentHeight);
     });
-    resources.maybeChangeHeight_ = true;
 
-    resources.doPass();
+    it('should send contentHeight to viewer if height was changed', () => {
+      sandbox.stub(resources.viewport_, 'getContentHeight').callsFake(() => {
+        return 200;
+      });
+      resources.maybeChangeHeight_ = true;
 
-    expect(resources.maybeChangeHeight_).to.equal(false);
-    expect(resources.contentHeight_).to.equal(200);
-    expect(viewerSendMessageStub).to.be.calledOnce;
-    expect(viewerSendMessageStub.lastCall.args[0]).to.equal('documentHeight');
-    expect(viewerSendMessageStub.lastCall.args[1].height).to.equal(200);
-    expect(viewerSendMessageStub.lastCall.args[2]).to.equal(true);
-    expect(viewportContentHeightChangedStub).to.be.calledOnce;
-  });
+      resources.doPass();
 
-  it('should not send contentHeight to viewer if height is not changed', () => {
-    const contentHeight = resources.viewport_.getContentHeight();
-    resources.maybeChangeHeight_ = true;
+      expect(resources.maybeChangeHeight_).to.equal(false);
+      expect(resources.contentHeight_).to.equal(200);
+      expect(viewerSendMessageStub).to.be.calledOnce;
+      expect(viewerSendMessageStub.lastCall.args[0]).to.equal('documentHeight');
+      expect(viewerSendMessageStub.lastCall.args[1].height).to.equal(200);
+      expect(viewerSendMessageStub.lastCall.args[2]).to.equal(true);
+      expect(viewportContentHeightChangedStub).to.be.calledOnce;
+    });
 
-    resources.doPass();
+    it('should not send contentHeight to viewer if height is not changed', () => {
+      const contentHeight = resources.viewport_.getContentHeight();
+      resources.maybeChangeHeight_ = true;
 
-    expect(resources.maybeChangeHeight_).to.equal(false);
-    expect(resources.contentHeight_).to.equal(contentHeight);
-    expect(viewerSendMessageStub).to.not.be.called;
-    expect(viewportContentHeightChangedStub).to.not.be.called;
-  });
+      resources.doPass();
 
-  it('should send contentHeight to viewer if viewport resizes', () => {
-    sandbox.stub(resources.viewport_, 'getContentHeight').callsFake(() => {
-      return 200;
+      expect(resources.maybeChangeHeight_).to.equal(false);
+      expect(resources.contentHeight_).to.equal(contentHeight);
+      expect(viewerSendMessageStub).to.not.be.called;
+      expect(viewportContentHeightChangedStub).to.not.be.called;
     });
-    resources.viewport_.changed_(/* relayoutAll */ true, /* velocity */ 0);
-    resources.doPass();
 
-    expect(resources.maybeChangeHeight_).to.equal(false);
-    expect(resources.contentHeight_).to.equal(200);
-    expect(viewerSendMessageStub).to.be.calledOnce;
-    expect(viewerSendMessageStub.lastCall.args[0]).to.equal('documentHeight');
-    expect(viewerSendMessageStub.lastCall.args[1].height).to.equal(200);
-    expect(viewerSendMessageStub.lastCall.args[2]).to.equal(true);
-    expect(viewportContentHeightChangedStub).to.be.calledOnce;
-  });
+    it('should send contentHeight to viewer if viewport resizes', () => {
+      sandbox.stub(resources.viewport_, 'getContentHeight').callsFake(() => {
+        return 200;
+      });
+      resources.viewport_.changed_(/* relayoutAll */ true, /* velocity */ 0);
+      resources.doPass();
 
-});
+      expect(resources.maybeChangeHeight_).to.equal(false);
+      expect(resources.contentHeight_).to.equal(200);
+      expect(viewerSendMessageStub).to.be.calledOnce;
+      expect(viewerSendMessageStub.lastCall.args[0]).to.equal('documentHeight');
+      expect(viewerSendMessageStub.lastCall.args[1].height).to.equal(200);
+      expect(viewerSendMessageStub.lastCall.args[2]).to.equal(true);
+      expect(viewportContentHeightChangedStub).to.be.calledOnce;
+    });
+  }
+);
 
 describe('Resources changeSize', () => {
-
   function createElement(rect) {
     const signals = new Signals();
     return {
@@ -1759,9 +1816,11 @@ describe('Resources changeSize', () => {
       contains: unused_otherElement => false,
       updateLayoutBox: () => {},
       togglePlaceholder: () => sandbox.spy(),
-      overflowCallback:
-          (unused_overflown, unused_requestedHeight, unused_requestedWidth) => {
-          },
+      overflowCallback: (
+        unused_overflown,
+        unused_requestedHeight,
+        unused_requestedWidth
+      ) => {},
       getLayoutPriority: () => LayoutPriority.CONTENT,
       signals: () => signals,
       fakeComputedStyle: {
@@ -1795,8 +1854,9 @@ describe('Resources changeSize', () => {
     resources.isRuntimeOn_ = false;
     resources.win = {
       getComputedStyle: el => {
-        return el.fakeComputedStyle ?
-          el.fakeComputedStyle : window.getComputedStyle(el);
+        return el.fakeComputedStyle
+          ? el.fakeComputedStyle
+          : window.getComputedStyle(el);
       },
     };
     viewportMock = sandbox.mock(resources.viewport_);
@@ -1858,8 +1918,13 @@ describe('Resources changeSize', () => {
   });
 
   it('should schedule margin only size change', () => {
-    resources.scheduleChangeSize_(resource1, undefined, undefined,
-        {top: 1, right: 2, bottom: 3, left: 4}, false);
+    resources.scheduleChangeSize_(
+      resource1,
+      undefined,
+      undefined,
+      {top: 1, right: 2, bottom: 3, left: 4},
+      false
+    );
     resources.vsync_.runScheduledTasks_();
     expect(resources.requestsChangeSize_.length).to.equal(1);
     expect(resources.requestsChangeSize_[0].resource).to.equal(resource1);
@@ -1883,7 +1948,7 @@ describe('Resources changeSize', () => {
     expect(resources.requestsChangeSize_[0].force).to.equal(true);
   });
 
-  it('should NOT change size if it didn\'t change', () => {
+  it("should NOT change size if it didn't change", () => {
     resources.scheduleChangeSize_(resource1, 100, 100, undefined, true);
     resources.mutateWork_();
     expect(resources.relayoutTop_).to.equal(-1);
@@ -1957,19 +2022,38 @@ describe('Resources changeSize', () => {
       resource1.element.overflowCallback = overflowCallbackSpy;
 
       viewportRect = {top: 2, left: 0, right: 100, bottom: 200, height: 200};
-      viewportMock.expects('getRect').returns(viewportRect).atLeast(1);
-      resource1.layoutBox_ = {top: 10, left: 0, right: 100, bottom: 50,
-        height: 50};
+      viewportMock
+        .expects('getRect')
+        .returns(viewportRect)
+        .atLeast(1);
+      resource1.layoutBox_ = {
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 50,
+        height: 50,
+      };
       vsyncSpy = sandbox.stub(resources.vsync_, 'run');
       resources.visible_ = true;
     });
 
     it('should NOT change size when height is unchanged', () => {
       const callback = sandbox.spy();
-      resource1.layoutBox_ = {top: 10, left: 0, right: 100, bottom: 210,
-        height: 50};
-      resources.scheduleChangeSize_(resource1, 50, /* width */ undefined,
-          undefined, false, callback);
+      resource1.layoutBox_ = {
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 210,
+        height: 50,
+      };
+      resources.scheduleChangeSize_(
+        resource1,
+        50,
+        /* width */ undefined,
+        undefined,
+        false,
+        callback
+      );
       resources.mutateWork_();
       expect(resource1.changeSize).to.not.been.called;
       expect(overflowCallbackSpy).to.not.been.called;
@@ -1979,16 +2063,27 @@ describe('Resources changeSize', () => {
 
     it('should NOT change size when height and margins are unchanged', () => {
       const callback = sandbox.spy();
-      resource1.layoutBox_ = {top: 10, left: 0, right: 100, bottom: 210,
-        height: 50};
+      resource1.layoutBox_ = {
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 210,
+        height: 50,
+      };
       resource1.element.fakeComputedStyle = {
         marginTop: '1px',
         marginRight: '2px',
         marginBottom: '3px',
         marginLeft: '4px',
       };
-      resources.scheduleChangeSize_(resource1, 50, /* width */ undefined,
-          {top: 1, right: 2, bottom: 3, left: 4}, false, callback);
+      resources.scheduleChangeSize_(
+        resource1,
+        50,
+        /* width */ undefined,
+        {top: 1, right: 2, bottom: 3, left: 4},
+        false,
+        callback
+      );
 
       expect(vsyncSpy).to.be.calledOnce;
       const task = vsyncSpy.lastCall.args[0];
@@ -2003,16 +2098,27 @@ describe('Resources changeSize', () => {
 
     it('should change size when margins but not height changed', () => {
       const callback = sandbox.spy();
-      resource1.layoutBox_ = {top: 10, left: 0, right: 100, bottom: 210,
-        height: 50};
+      resource1.layoutBox_ = {
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 210,
+        height: 50,
+      };
       resource1.element.fakeComputedStyle = {
         marginTop: '1px',
         marginRight: '2px',
         marginBottom: '3px',
         marginLeft: '4px',
       };
-      resources.scheduleChangeSize_(resource1, 50, /* width */ undefined,
-          {top: 1, right: 2, bottom: 4, left: 4}, false, callback);
+      resources.scheduleChangeSize_(
+        resource1,
+        50,
+        /* width */ undefined,
+        {top: 1, right: 2, bottom: 4, left: 4},
+        false,
+        callback
+      );
 
       expect(vsyncSpy).to.be.calledOnce;
       const task = vsyncSpy.lastCall.args[0];
@@ -2032,19 +2138,20 @@ describe('Resources changeSize', () => {
     });
 
     // TODO (#16156): duplicate stub for getVisibilityState on Safari
-    it.configure().skipSafari()
-        .run('should change size when document is invisible', () => {
-          resources.visible_ = false;
-          sandbox.stub(resources.viewer_, 'getVisibilityState').returns(
-              VisibilityState.PRERENDER
-          );
-          resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
-          resources.mutateWork_();
-          expect(resources.requestsChangeSize_).to.be.empty;
-          expect(resource1.changeSize).to.be.calledOnce;
-          expect(overflowCallbackSpy).to.be.calledOnce;
-          expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
-        });
+    it.configure()
+      .skipSafari()
+      .run('should change size when document is invisible', () => {
+        resources.visible_ = false;
+        sandbox
+          .stub(resources.viewer_, 'getVisibilityState')
+          .returns(VisibilityState.PRERENDER);
+        resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_).to.be.empty;
+        expect(resource1.changeSize).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+      });
 
     it('should change size when active', () => {
       resource1.element.contains = () => true;
@@ -2057,8 +2164,13 @@ describe('Resources changeSize', () => {
     });
 
     it('should change size when below the viewport', () => {
-      resource1.layoutBox_ = {top: 10, left: 0, right: 100, bottom: 1050,
-        height: 50};
+      resource1.layoutBox_ = {
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 1050,
+        height: 50,
+      };
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
       resources.mutateWork_();
       expect(resources.requestsChangeSize_).to.be.empty;
@@ -2067,34 +2179,15 @@ describe('Resources changeSize', () => {
       expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
     });
 
-    it('should change size when below the viewport and top margin also changed',
-        () => {
-          resource1.layoutBox_ = {top: 200, left: 0, right: 100, bottom: 300,
-            height: 100};
-          resources.scheduleChangeSize_(resource1, 111, 222, {top: 20}, false);
-
-          expect(vsyncSpy).to.be.calledOnce;
-          const marginsTask = vsyncSpy.lastCall.args[0];
-          marginsTask.measure({});
-
-          resources.mutateWork_();
-          expect(resources.requestsChangeSize_).to.be.empty;
-          expect(resource1.changeSize).to.be.calledOnce;
-          expect(overflowCallbackSpy).to.be.calledOnce;
-          expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
-        });
-
-    it('should change size when box top below the viewport but top margin ' +
-        'boundary is above viewport but top margin in unchanged', () => {
-      resource1.layoutBox_ = {top: 200, left: 0, right: 100, bottom: 300,
-        height: 100};
-      resource1.element.fakeComputedStyle = {
-        marginTop: '100px',
-        marginRight: '0px',
-        marginBottom: '0px',
-        marginLeft: '0px',
+    it('should change size when below the viewport and top margin also changed', () => {
+      resource1.layoutBox_ = {
+        top: 200,
+        left: 0,
+        right: 100,
+        bottom: 300,
+        height: 100,
       };
-      resources.scheduleChangeSize_(resource1, 111, 222, {top: 100}, false);
+      resources.scheduleChangeSize_(resource1, 111, 222, {top: 20}, false);
 
       expect(vsyncSpy).to.be.calledOnce;
       const marginsTask = vsyncSpy.lastCall.args[0];
@@ -2107,30 +2200,83 @@ describe('Resources changeSize', () => {
       expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
     });
 
-    it('should NOT change size when top margin boundary within viewport ' +
-        'and top margin changed', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
-
-      const callback = sandbox.spy();
-      resource1.layoutBox_ = {top: 100, left: 0, right: 100, bottom: 300,
-        height: 200};
-      resources.scheduleChangeSize_(
-          resource1, 111, 222, {top: 20}, false, callback);
-
-      expect(vsyncSpy).to.be.calledOnce;
-      const task = vsyncSpy.lastCall.args[0];
-      task.measure({});
+    it(
+      'should change size when box top below the viewport but top margin ' +
+        'boundary is above viewport but top margin in unchanged',
+      () => {
+        resource1.layoutBox_ = {
+          top: 200,
+          left: 0,
+          right: 100,
+          bottom: 300,
+          height: 100,
+        };
+        resource1.element.fakeComputedStyle = {
+          marginTop: '100px',
+          marginRight: '0px',
+          marginBottom: '0px',
+          marginLeft: '0px',
+        };
+        resources.scheduleChangeSize_(resource1, 111, 222, {top: 100}, false);
+
+        expect(vsyncSpy).to.be.calledOnce;
+        const marginsTask = vsyncSpy.lastCall.args[0];
+        marginsTask.measure({});
+
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_).to.be.empty;
+        expect(resource1.changeSize).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+      }
+    );
 
-      resources.mutateWork_();
-      expect(resource1.changeSize).to.not.been.called;
-      expect(overflowCallbackSpy).to.not.been.called;
-      expect(callback).to.be.calledOnce;
-      expect(callback.args[0][0]).to.be.false;
-    });
+    it(
+      'should NOT change size when top margin boundary within viewport ' +
+        'and top margin changed',
+      () => {
+        viewportMock
+          .expects('getContentHeight')
+          .returns(10000)
+          .atLeast(1);
+
+        const callback = sandbox.spy();
+        resource1.layoutBox_ = {
+          top: 100,
+          left: 0,
+          right: 100,
+          bottom: 300,
+          height: 200,
+        };
+        resources.scheduleChangeSize_(
+          resource1,
+          111,
+          222,
+          {top: 20},
+          false,
+          callback
+        );
+
+        expect(vsyncSpy).to.be.calledOnce;
+        const task = vsyncSpy.lastCall.args[0];
+        task.measure({});
+
+        resources.mutateWork_();
+        expect(resource1.changeSize).to.not.been.called;
+        expect(overflowCallbackSpy).to.not.been.called;
+        expect(callback).to.be.calledOnce;
+        expect(callback.args[0][0]).to.be.false;
+      }
+    );
 
     it('should defer when above the viewport and scrolling on', () => {
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1050,
-        height: 50};
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1050,
+        height: 50,
+      };
       resources.lastVelocity_ = 10;
       resources.lastScrollTime_ = Date.now();
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
@@ -2140,41 +2286,71 @@ describe('Resources changeSize', () => {
       expect(overflowCallbackSpy).to.not.been.called;
     });
 
-    it('should defer change size if just inside viewport and viewport ' +
-        'scrolled by user.', () => {
-      viewportRect.top = 2;
-      resource1.layoutBox_ = {top: -50, left: 0, right: 100, bottom: 1,
-        height: 51};
-      resources.lastVelocity_ = 10;
-      resources.lastScrollTime_ = Date.now();
-      resources.scheduleChangeSize_(resource1, 111, 222, false);
-      resources.mutateWork_();
-      expect(resources.requestsChangeSize_.length).to.equal(1);
-      expect(resource1.changeSize).to.not.been.called;
-      expect(overflowCallbackSpy).to.not.been.called;
-    });
+    it(
+      'should defer change size if just inside viewport and viewport ' +
+        'scrolled by user.',
+      () => {
+        viewportRect.top = 2;
+        resource1.layoutBox_ = {
+          top: -50,
+          left: 0,
+          right: 100,
+          bottom: 1,
+          height: 51,
+        };
+        resources.lastVelocity_ = 10;
+        resources.lastScrollTime_ = Date.now();
+        resources.scheduleChangeSize_(resource1, 111, 222, false);
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_.length).to.equal(1);
+        expect(resource1.changeSize).to.not.been.called;
+        expect(overflowCallbackSpy).to.not.been.called;
+      }
+    );
 
-    it('should NOT change size and call overflow callback if viewport not ' +
-        'scrolled by user.', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
-      viewportRect.top = 1;
-      resource1.layoutBox_ = {top: -50, left: 0, right: 100, bottom: 0,
-        height: 51};
-      resources.lastVelocity_ = 10;
-      resources.lastScrollTime_ = Date.now();
-      resources.scheduleChangeSize_(resource1, 111, 222, false);
-      resources.mutateWork_();
-      expect(resources.requestsChangeSize_.length).to.equal(0);
-      expect(resource1.changeSize).to.not.been.called;
-      expect(overflowCallbackSpy).to.be.calledOnce;
-      expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222);
-    });
+    it(
+      'should NOT change size and call overflow callback if viewport not ' +
+        'scrolled by user.',
+      () => {
+        viewportMock
+          .expects('getContentHeight')
+          .returns(10000)
+          .atLeast(1);
+        viewportRect.top = 1;
+        resource1.layoutBox_ = {
+          top: -50,
+          left: 0,
+          right: 100,
+          bottom: 0,
+          height: 51,
+        };
+        resources.lastVelocity_ = 10;
+        resources.lastScrollTime_ = Date.now();
+        resources.scheduleChangeSize_(resource1, 111, 222, false);
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_.length).to.equal(0);
+        expect(resource1.changeSize).to.not.been.called;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222);
+      }
+    );
 
     it('should change size when above the vp and adjust scrolling', () => {
-      viewportMock.expects('getScrollHeight').returns(2999).once();
-      viewportMock.expects('getScrollTop').returns(1777).once();
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1050,
-        height: 50};
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2999)
+        .once();
+      viewportMock
+        .expects('getScrollTop')
+        .returns(1777)
+        .once();
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1050,
+        height: 50,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
@@ -2189,8 +2365,14 @@ describe('Resources changeSize', () => {
       expect(state.scrollTop).to.equal(1777);
       expect(state.scrollHeight).to.equal(2999);
 
-      viewportMock.expects('getScrollHeight').returns(3999).once();
-      viewportMock.expects('setScrollTop').withExactArgs(2777).once();
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(3999)
+        .once();
+      viewportMock
+        .expects('setScrollTop')
+        .withExactArgs(2777)
+        .once();
       task.mutate(state);
       expect(resource1.changeSize).to.be.calledOnce;
       expect(resource1.changeSize).to.be.calledWith(111, 222);
@@ -2198,8 +2380,13 @@ describe('Resources changeSize', () => {
     });
 
     it('should NOT resize when above vp but cannot adjust scrolling', () => {
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1100,
-        height: 100};
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1100,
+        height: 100,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource1, 0, 222, undefined, false);
@@ -2213,10 +2400,20 @@ describe('Resources changeSize', () => {
     });
 
     it('should resize if multi request above vp can adjust scroll', () => {
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1100,
-        height: 100};
-      resource2.layoutBox_ = {top: -1300, left: 0, right: 100, bottom: -1200,
-        height: 100};
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1100,
+        height: 100,
+      };
+      resource2.layoutBox_ = {
+        top: -1300,
+        left: 0,
+        right: 100,
+        bottom: -1200,
+        height: 100,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource2, 200, 222, undefined, false);
@@ -2236,12 +2433,26 @@ describe('Resources changeSize', () => {
       resources.viewport_.getRect();
 
       viewportMock.expects('getRect').returns({
-        top: 10, left: 0, right: 100, bottom: 210, height: 200,
+        top: 10,
+        left: 0,
+        right: 100,
+        bottom: 210,
+        height: 200,
       });
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1100,
-        height: 100};
-      resource2.layoutBox_ = {top: -1300, left: 0, right: 100, bottom: -1200,
-        height: 100};
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1100,
+        height: 100,
+      };
+      resource2.layoutBox_ = {
+        top: -1300,
+        left: 0,
+        right: 100,
+        bottom: -1200,
+        height: 100,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource1, 92, 222, undefined, false);
@@ -2255,10 +2466,21 @@ describe('Resources changeSize', () => {
     });
 
     it('should NOT adjust scrolling if height not change above vp', () => {
-      viewportMock.expects('getScrollHeight').returns(2999).once();
-      viewportMock.expects('getScrollTop').returns(1777).once();
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1050,
-        height: 50};
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2999)
+        .once();
+      viewportMock
+        .expects('getScrollTop')
+        .returns(1777)
+        .once();
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1050,
+        height: 50,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
@@ -2273,7 +2495,10 @@ describe('Resources changeSize', () => {
       expect(state.scrollTop).to.equal(1777);
       expect(state.scrollHeight).to.equal(2999);
 
-      viewportMock.expects('getScrollHeight').returns(2999).once();
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2999)
+        .once();
       viewportMock.expects('setScrollTop').never();
       task.mutate(state);
       expect(resource1.changeSize).to.be.calledOnce;
@@ -2282,10 +2507,21 @@ describe('Resources changeSize', () => {
     });
 
     it('should adjust scrolling if height change above vp', () => {
-      viewportMock.expects('getScrollHeight').returns(2999).once();
-      viewportMock.expects('getScrollTop').returns(1000).once();
-      resource1.layoutBox_ = {top: -1200, left: 0, right: 100, bottom: -1050,
-        height: 50};
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2999)
+        .once();
+      viewportMock
+        .expects('getScrollTop')
+        .returns(1000)
+        .once();
+      resource1.layoutBox_ = {
+        top: -1200,
+        left: 0,
+        right: 100,
+        bottom: -1050,
+        height: 50,
+      };
       resources.lastVelocity_ = 0;
       clock.tick(5000);
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
@@ -2293,13 +2529,22 @@ describe('Resources changeSize', () => {
       const task = vsyncSpy.lastCall.args[0];
       const state = {};
       task.measure(state);
-      viewportMock.expects('getScrollHeight').returns(2000).once();
-      viewportMock.expects('setScrollTop').withExactArgs(1).once();
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2000)
+        .once();
+      viewportMock
+        .expects('setScrollTop')
+        .withExactArgs(1)
+        .once();
       task.mutate(state);
     });
 
     it('in vp should NOT call overflowCallback if new height smaller', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
+      viewportMock
+        .expects('getContentHeight')
+        .returns(10000)
+        .atLeast(1);
       resources.scheduleChangeSize_(resource1, 10, 11, undefined, false);
       resources.mutateWork_();
       expect(resources.requestsChangeSize_).to.be.empty;
@@ -2307,79 +2552,93 @@ describe('Resources changeSize', () => {
       expect(overflowCallbackSpy).to.not.been.called;
     });
 
-    it('in viewport should change size if in the last 15% and ' +
-        'in the last 1000px', () => {
-      viewportRect.top = 9600;
-      viewportRect.bottom = 9800;
-      resource1.layoutBox_ = {top: 9650, left: 0, right: 100, bottom: 9700,
-        height: 50};
-      resources.scheduleChangeSize_(resource1, 111, 222,
-          {top: 1, right: 2, bottom: 3, left: 4}, false);
-
-      expect(vsyncSpy).to.be.calledOnce;
-      const marginsTask = vsyncSpy.lastCall.args[0];
-      marginsTask.measure({});
-
-      resources.mutateWork_();
-      expect(resources.requestsChangeSize_).to.be.empty;
-      expect(resource1.changeSize).to.be.calledOnce;
-      expect(overflowCallbackSpy).to.be.calledOnce;
-      expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
-    });
-
-    it('in viewport should NOT change size if in the last 15% but NOT ' +
-        'in the last 1000px', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
-      viewportRect.top = 8600;
-      viewportRect.bottom = 8800;
-      resource1.layoutBox_ = {top: 8650, left: 0, right: 100, bottom: 8700,
-        height: 50};
-      resources.scheduleChangeSize_(resource1, 111, 222,
-          {top: 1, right: 2, bottom: 3, left: 4}, false);
-
-      expect(vsyncSpy).to.be.calledOnce;
-      const marginsTask = vsyncSpy.lastCall.args[0];
-      marginsTask.measure({});
+    it(
+      'in viewport should change size if in the last 15% and ' +
+        'in the last 1000px',
+      () => {
+        viewportRect.top = 9600;
+        viewportRect.bottom = 9800;
+        resource1.layoutBox_ = {
+          top: 9650,
+          left: 0,
+          right: 100,
+          bottom: 9700,
+          height: 50,
+        };
+        resources.scheduleChangeSize_(
+          resource1,
+          111,
+          222,
+          {top: 1, right: 2, bottom: 3, left: 4},
+          false
+        );
+
+        expect(vsyncSpy).to.be.calledOnce;
+        const marginsTask = vsyncSpy.lastCall.args[0];
+        marginsTask.measure({});
+
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_).to.be.empty;
+        expect(resource1.changeSize).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy.firstCall.args[0]).to.equal(false);
+      }
+    );
 
-      resources.mutateWork_();
-      expect(resources.requestsChangeSize_).to.be.empty;
-      expect(resource1.changeSize).to.not.been.called;
-      expect(overflowCallbackSpy).to.be.calledOnce;
-      expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222,
-          {top: 1, right: 2, bottom: 3, left: 4});
-    });
+    it(
+      'in viewport should NOT change size if in the last 15% but NOT ' +
+        'in the last 1000px',
+      () => {
+        viewportMock
+          .expects('getContentHeight')
+          .returns(10000)
+          .atLeast(1);
+        viewportRect.top = 8600;
+        viewportRect.bottom = 8800;
+        resource1.layoutBox_ = {
+          top: 8650,
+          left: 0,
+          right: 100,
+          bottom: 8700,
+          height: 50,
+        };
+        resources.scheduleChangeSize_(
+          resource1,
+          111,
+          222,
+          {top: 1, right: 2, bottom: 3, left: 4},
+          false
+        );
+
+        expect(vsyncSpy).to.be.calledOnce;
+        const marginsTask = vsyncSpy.lastCall.args[0];
+        marginsTask.measure({});
+
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_).to.be.empty;
+        expect(resource1.changeSize).to.not.been.called;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222, {
+          top: 1,
+          right: 2,
+          bottom: 3,
+          left: 4,
+        });
+      }
+    );
 
     it('in viewport should NOT change size and calls overflowCallback', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
-      resources.scheduleChangeSize_(resource1, 111, 222,
-          {top: 1, right: 2, bottom: 3, left: 4}, false);
-
-      expect(vsyncSpy).to.be.calledOnce;
-      const task = vsyncSpy.lastCall.args[0];
-      task.measure({});
-
-      resources.mutateWork_();
-      expect(resources.requestsChangeSize_.length).to.equal(0);
-      expect(resource1.changeSize).to.not.been.called;
-      expect(overflowCallbackSpy).to.be.calledOnce;
-      expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222,
-          {top: 1, right: 2, bottom: 3, left: 4});
-      expect(resource1.getPendingChangeSize()).to.jsonEqual(
-          {height: 111, width: 222,
-            margins: {top: 1, right: 2, bottom: 3, left: 4}});
-    });
-
-    it('should NOT change size when resized margin in viewport and should ' +
-        'call overflowCallback', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
-      resource1.layoutBox_ = {top: -48, left: 0, right: 100, bottom: 2,
-        height: 50};
-      resource1.element.fakeComputedStyle = {
-        marginBottom: '21px',
-      };
-
-      resources.scheduleChangeSize_(resource1, undefined, undefined,
-          {bottom: 22}, false);
+      viewportMock
+        .expects('getContentHeight')
+        .returns(10000)
+        .atLeast(1);
+      resources.scheduleChangeSize_(
+        resource1,
+        111,
+        222,
+        {top: 1, right: 2, bottom: 3, left: 4},
+        false
+      );
 
       expect(vsyncSpy).to.be.calledOnce;
       const task = vsyncSpy.lastCall.args[0];
@@ -2389,25 +2648,97 @@ describe('Resources changeSize', () => {
       expect(resources.requestsChangeSize_.length).to.equal(0);
       expect(resource1.changeSize).to.not.been.called;
       expect(overflowCallbackSpy).to.be.calledOnce;
-      expect(overflowCallbackSpy).to.be.calledWith(true, undefined,
-          undefined, {bottom: 22});
-      expect(resource1.getPendingChangeSize()).to.jsonEqual(
-          {height: undefined, width: undefined, margins: {bottom: 22}});
+      expect(overflowCallbackSpy).to.be.calledWith(true, 111, 222, {
+        top: 1,
+        right: 2,
+        bottom: 3,
+        left: 4,
+      });
+      expect(resource1.getPendingChangeSize()).to.jsonEqual({
+        height: 111,
+        width: 222,
+        margins: {top: 1, right: 2, bottom: 3, left: 4},
+      });
     });
 
+    it(
+      'should NOT change size when resized margin in viewport and should ' +
+        'call overflowCallback',
+      () => {
+        viewportMock
+          .expects('getContentHeight')
+          .returns(10000)
+          .atLeast(1);
+        resource1.layoutBox_ = {
+          top: -48,
+          left: 0,
+          right: 100,
+          bottom: 2,
+          height: 50,
+        };
+        resource1.element.fakeComputedStyle = {
+          marginBottom: '21px',
+        };
+
+        resources.scheduleChangeSize_(
+          resource1,
+          undefined,
+          undefined,
+          {bottom: 22},
+          false
+        );
+
+        expect(vsyncSpy).to.be.calledOnce;
+        const task = vsyncSpy.lastCall.args[0];
+        task.measure({});
+
+        resources.mutateWork_();
+        expect(resources.requestsChangeSize_.length).to.equal(0);
+        expect(resource1.changeSize).to.not.been.called;
+        expect(overflowCallbackSpy).to.be.calledOnce;
+        expect(overflowCallbackSpy).to.be.calledWith(
+          true,
+          undefined,
+          undefined,
+          {bottom: 22}
+        );
+        expect(resource1.getPendingChangeSize()).to.jsonEqual({
+          height: undefined,
+          width: undefined,
+          margins: {bottom: 22},
+        });
+      }
+    );
+
     it('should change size when resized margin above viewport', () => {
-      resource1.layoutBox_ = {top: -49, left: 0, right: 100, bottom: 1,
-        height: 50};
+      resource1.layoutBox_ = {
+        top: -49,
+        left: 0,
+        right: 100,
+        bottom: 1,
+        height: 50,
+      };
       resource1.element.fakeComputedStyle = {
         marginBottom: '21px',
       };
-      viewportMock.expects('getScrollHeight').returns(2999).once();
-      viewportMock.expects('getScrollTop').returns(1777).once();
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(2999)
+        .once();
+      viewportMock
+        .expects('getScrollTop')
+        .returns(1777)
+        .once();
 
       resources.lastVelocity_ = 0;
       clock.tick(5000);
-      resources.scheduleChangeSize_(resource1, undefined, undefined,
-          {top: 1}, false);
+      resources.scheduleChangeSize_(
+        resource1,
+        undefined,
+        undefined,
+        {top: 1},
+        false
+      );
 
       expect(vsyncSpy).to.be.calledOnce;
       const marginsTask = vsyncSpy.lastCall.args[0];
@@ -2424,17 +2755,27 @@ describe('Resources changeSize', () => {
       expect(state.scrollTop).to.equal(1777);
       expect(state.scrollHeight).to.equal(2999);
 
-      viewportMock.expects('getScrollHeight').returns(3999).once();
-      viewportMock.expects('setScrollTop').withExactArgs(2777).once();
+      viewportMock
+        .expects('getScrollHeight')
+        .returns(3999)
+        .once();
+      viewportMock
+        .expects('setScrollTop')
+        .withExactArgs(2777)
+        .once();
       scrollAdjustTask.mutate(state);
       expect(resource1.changeSize).to.be.calledOnce;
-      expect(resource1.changeSize).to.be.calledWith(undefined, undefined,
-          {top: 1});
+      expect(resource1.changeSize).to.be.calledWith(undefined, undefined, {
+        top: 1,
+      });
       expect(resources.relayoutTop_).to.equal(resource1.layoutBox_.top);
     });
 
     it('should reset pending change size when rescheduling', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
+      viewportMock
+        .expects('getContentHeight')
+        .returns(10000)
+        .atLeast(1);
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
       resources.mutateWork_();
       expect(resource1.getPendingChangeSize().height).to.equal(111);
@@ -2445,11 +2786,16 @@ describe('Resources changeSize', () => {
     });
 
     it('should force resize after focus', () => {
-      viewportMock.expects('getContentHeight').returns(10000).atLeast(1);
+      viewportMock
+        .expects('getContentHeight')
+        .returns(10000)
+        .atLeast(1);
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
       resources.mutateWork_();
-      expect(resource1.getPendingChangeSize()).to.jsonEqual(
-          {height: 111, width: 222});
+      expect(resource1.getPendingChangeSize()).to.jsonEqual({
+        height: 111,
+        width: 222,
+      });
       expect(resources.requestsChangeSize_).to.be.empty;
 
       resources.checkPendingChangeSize_(resource1.element);
@@ -2466,23 +2812,33 @@ describe('Resources changeSize', () => {
   });
 
   describe('attemptChangeSize rules for element wrt document', () => {
-
     beforeEach(() => {
-      viewportMock.expects('getRect').returns(
-          {top: 0, left: 0, right: 100, bottom: 10000, height: 200});
-      resource1.layoutBox_ = resource1.initialLayoutBox_ =
-          layoutRectLtwh(0, 10, 100, 100);
+      viewportMock
+        .expects('getRect')
+        .returns({top: 0, left: 0, right: 100, bottom: 10000, height: 200});
+      resource1.layoutBox_ = resource1.initialLayoutBox_ = layoutRectLtwh(
+        0,
+        10,
+        100,
+        100
+      );
     });
 
     it('should NOT change size when far the bottom of the document', () => {
-      viewportMock.expects('getContentHeight').returns(10000).once();
+      viewportMock
+        .expects('getContentHeight')
+        .returns(10000)
+        .once();
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
       resources.mutateWork_();
       expect(resource1.changeSize).to.not.been.called;
     });
 
     it('should change size when close to the bottom of the document', () => {
-      viewportMock.expects('getContentHeight').returns(110).once();
+      viewportMock
+        .expects('getContentHeight')
+        .returns(110)
+        .once();
       resources.scheduleChangeSize_(resource1, 111, 222, undefined, false);
       resources.mutateWork_();
       expect(resource1.changeSize).to.be.calledOnce;
@@ -2490,9 +2846,7 @@ describe('Resources changeSize', () => {
   });
 });
 
-
 describe('Resources mutateElement and collapse', () => {
-
   function createElement(rect, isAmp) {
     const signals = new Signals();
     return {
@@ -2533,9 +2887,10 @@ describe('Resources mutateElement and collapse', () => {
 
   function createResource(id, rect) {
     const resource = new Resource(
-        id,
-        createElement(rect, /* isAmp */ true),
-        resources);
+      id,
+      createElement(rect, /* isAmp */ true),
+      resources
+    );
     resource.element['__AMP__RESOURCE'] = resource;
     resource.state_ = ResourceState.READY_FOR_LAYOUT;
     resource.layoutBox_ = rect;
@@ -2590,10 +2945,14 @@ describe('Resources mutateElement and collapse', () => {
     resource1RequestMeasureStub = sandbox.stub(resource1, 'requestMeasure');
     resource2RequestMeasureStub = sandbox.stub(resource2, 'requestMeasure');
 
-    parent1 = createElement(layoutRectLtwh(10, 10, 100, 100),
-        /* isAmp */ false);
-    parent2 = createElement(layoutRectLtwh(10, 1010, 100, 100),
-        /* isAmp */ false);
+    parent1 = createElement(
+      layoutRectLtwh(10, 10, 100, 100),
+      /* isAmp */ false
+    );
+    parent2 = createElement(
+      layoutRectLtwh(10, 1010, 100, 100),
+      /* isAmp */ false
+    );
 
     parent1.getElementsByClassName = className => {
       if (className == 'i-amphtml-element') {
@@ -2630,8 +2989,8 @@ describe('Resources mutateElement and collapse', () => {
   it('should mutate from visible to invisible on itself', () => {
     const mutateSpy = sandbox.spy();
     const promise = resources.mutateElement(resource1.element, () => {
-      resource1.element.getBoundingClientRect =
-          () => layoutRectLtwh(0, 0, 0, 0);
+      resource1.element.getBoundingClientRect = () =>
+        layoutRectLtwh(0, 0, 0, 0);
       mutateSpy();
     });
     return promise.then(() => {
@@ -2711,8 +3070,13 @@ describe('Resources mutateElement and collapse', () => {
       index++;
     });
 
-    resource1.layoutBox_ = {top: 1000, left: 0, right: 100, bottom: 1050,
-      height: 50};
+    resource1.layoutBox_ = {
+      top: 1000,
+      left: 0,
+      right: 100,
+      bottom: 1050,
+      height: 50,
+    };
     resources.lastVelocity_ = 0;
     resources.attemptCollapse(resource1.element);
     resources.mutateWork_();
@@ -2720,19 +3084,25 @@ describe('Resources mutateElement and collapse', () => {
   });
 
   it('attemptCollapse should complete collapse if resize succeed', () => {
-    sandbox.stub(resources, 'scheduleChangeSize_').callsFake(
+    sandbox
+      .stub(resources, 'scheduleChangeSize_')
+      .callsFake(
         (resource, newHeight, newWidth, newMargins, force, callback) => {
           callback(true);
-        });
+        }
+      );
     resources.attemptCollapse(resource1.element);
     expect(resource1.completeCollapse).to.be.calledOnce;
   });
 
   it('attemptCollapse should NOT complete collapse if resize fail', () => {
-    sandbox.stub(resources, 'scheduleChangeSize_').callsFake(
+    sandbox
+      .stub(resources, 'scheduleChangeSize_')
+      .callsFake(
         (resource, newHeight, newWidth, newMargins, force, callback) => {
           callback(false);
-        });
+        }
+      );
     resources.attemptCollapse(resource1.element);
     expect(resource1.completeCollapse).to.not.been.called;
   });
@@ -2754,7 +3124,6 @@ describe('Resources mutateElement and collapse', () => {
   });
 });
 
-
 describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
   let resources;
   let parent;
@@ -2828,12 +3197,13 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
     resource2 = child2['__AMP__RESOURCE'];
   });
 
-  afterEach(() => {
-  });
+  afterEach(() => {});
 
   it('should enforce that viewport is ready for first add', () => {
-    const ensureViewportReady = sandbox.stub(resources.viewport_,
-        'ensureReadyForElements');
+    const ensureViewportReady = sandbox.stub(
+      resources.viewport_,
+      'ensureReadyForElements'
+    );
     resources.add(child1);
     expect(ensureViewportReady).to.be.calledOnce;
 
@@ -2862,53 +3232,60 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
   });
 
   // TODO(jridgewell, #15748): Fails on Safari 11.1.0.
-  it.configure().skipSafari('should not schedule pass when immediate ' +
-      'build fails', () => {
-    const schedulePassStub = sandbox.stub(resources, 'schedulePass');
-    child1.isBuilt = () => false;
-    const child1BuildSpy = sandbox.spy();
-    child1.build = () => {
-      // Emulate an error happening during an element build.
-      child1BuildSpy();
-      return Promise.reject(new Error('child1-build-error'));
-    };
-    resources.documentReady_ = true;
-    resources.add(child1);
-    const resource1 = stubBuild(Resource.forElementOptional(child1));
-    resources.upgraded(child1);
-    expect(resources.get()).to.contain(resource1);
-    return resource1.buildPromise.then(() => {
-      throw new Error('must have failed');
-    }, () => {
-      expect(child1BuildSpy).to.be.calledOnce;
-      expect(schedulePassStub).to.not.be.called;
-      expect(resources.get()).to.not.contain(resource1);
-    });
-  });
+  it.configure().skipSafari(
+    'should not schedule pass when immediate build fails',
+    () => {
+      const schedulePassStub = sandbox.stub(resources, 'schedulePass');
+      child1.isBuilt = () => false;
+      const child1BuildSpy = sandbox.spy();
+      child1.build = () => {
+        // Emulate an error happening during an element build.
+        child1BuildSpy();
+        return Promise.reject(new Error('child1-build-error'));
+      };
+      resources.documentReady_ = true;
+      resources.add(child1);
+      const resource1 = stubBuild(Resource.forElementOptional(child1));
+      resources.upgraded(child1);
+      expect(resources.get()).to.contain(resource1);
+      return resource1.buildPromise.then(
+        () => {
+          throw new Error('must have failed');
+        },
+        () => {
+          expect(child1BuildSpy).to.be.calledOnce;
+          expect(schedulePassStub).to.not.be.called;
+          expect(resources.get()).to.not.contain(resource1);
+        }
+      );
+    }
+  );
 
   // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-  it.configure().skipSafari('should add element to pending build when ' +
-      'document is not ready', () => {
-    child1.isBuilt = () => false;
-    child2.isBuilt = () => false;
-    resources.buildReadyResources_ = sandbox.spy();
-    resources.documentReady_ = false;
-    resources.add(child1);
-    resources.upgraded(child1);
-    expect(child1.build.called).to.be.false;
-    expect(resources.pendingBuildResources_.length).to.be.equal(1);
-    resources.add(child2);
-    resources.upgraded(child2);
-    expect(child2.build.called).to.be.false;
-    expect(resources.pendingBuildResources_.length).to.be.equal(2);
-    expect(resources.buildReadyResources_.calledTwice).to.be.true;
-    const resource1 = Resource.forElementOptional(child1);
-    const resource2 = Resource.forElementOptional(child2);
-    expect(resources.get()).to.contain(resource1);
-    expect(resources.get()).to.contain(resource2);
-    expect(resource1.isBuilding()).to.be.false;
-    expect(resource2.isBuilding()).to.be.false;
-  });
+  it.configure().skipSafari(
+    'should add element to pending build when document is not ready',
+    () => {
+      child1.isBuilt = () => false;
+      child2.isBuilt = () => false;
+      resources.buildReadyResources_ = sandbox.spy();
+      resources.documentReady_ = false;
+      resources.add(child1);
+      resources.upgraded(child1);
+      expect(child1.build.called).to.be.false;
+      expect(resources.pendingBuildResources_.length).to.be.equal(1);
+      resources.add(child2);
+      resources.upgraded(child2);
+      expect(child2.build.called).to.be.false;
+      expect(resources.pendingBuildResources_.length).to.be.equal(2);
+      expect(resources.buildReadyResources_.calledTwice).to.be.true;
+      const resource1 = Resource.forElementOptional(child1);
+      const resource2 = Resource.forElementOptional(child2);
+      expect(resources.get()).to.contain(resource1);
+      expect(resources.get()).to.contain(resource2);
+      expect(resource1.isBuilding()).to.be.false;
+      expect(resource2.isBuilding()).to.be.false;
+    }
+  );
 
   describe('buildReadyResources_', () => {
     let schedulePassStub;
@@ -2924,42 +3301,46 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
     });
 
     // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should build ready resources and remove ' +
-        'them from pending', () => {
-      resources.pendingBuildResources_ = [resource1, resource2];
-      resources.buildReadyResources_();
-      expect(child1.build.called).to.be.false;
-      expect(child2.build.called).to.be.false;
-      expect(resources.pendingBuildResources_.length).to.be.equal(2);
-      expect(resources.schedulePass.called).to.be.false;
-
-      child1.nextSibling = child2;
-      resources.buildReadyResources_();
-      expect(child1.build.called).to.be.true;
-      expect(child2.build.called).to.be.false;
-      expect(resources.pendingBuildResources_.length).to.be.equal(1);
-      expect(resources.pendingBuildResources_[0]).to.be.equal(resource2);
-      expect(resource1.isBuilding()).to.be.true;
-      expect(resource2.isBuilding()).to.be.false;
-      return resource1.buildPromise.then(() => {
-        expect(resources.schedulePass.calledOnce).to.be.true;
+    it.configure().skipSafari(
+      'should build ready resources and remove them from pending',
+      () => {
+        resources.pendingBuildResources_ = [resource1, resource2];
+        resources.buildReadyResources_();
+        expect(child1.build.called).to.be.false;
+        expect(child2.build.called).to.be.false;
+        expect(resources.pendingBuildResources_.length).to.be.equal(2);
+        expect(resources.schedulePass.called).to.be.false;
 
-        child2.parentNode = parent;
-        parent.nextSibling = true;
+        child1.nextSibling = child2;
         resources.buildReadyResources_();
-        expect(child1.build).to.be.calledOnce;
-        expect(child2.build.called).to.be.true;
-        expect(resources.pendingBuildResources_.length).to.be.equal(0);
-        expect(resource2.isBuilding()).to.be.true;
-        return resource2.buildPromise;
-      }).then(() => {
-        expect(resources.get()).to.contain(resource1);
-        expect(resources.get()).to.contain(resource2);
-        expect(resource1.isBuilding()).to.be.false;
+        expect(child1.build.called).to.be.true;
+        expect(child2.build.called).to.be.false;
+        expect(resources.pendingBuildResources_.length).to.be.equal(1);
+        expect(resources.pendingBuildResources_[0]).to.be.equal(resource2);
+        expect(resource1.isBuilding()).to.be.true;
         expect(resource2.isBuilding()).to.be.false;
-        expect(resources.schedulePass.calledTwice).to.be.true;
-      });
-    });
+        return resource1.buildPromise
+          .then(() => {
+            expect(resources.schedulePass.calledOnce).to.be.true;
+
+            child2.parentNode = parent;
+            parent.nextSibling = true;
+            resources.buildReadyResources_();
+            expect(child1.build).to.be.calledOnce;
+            expect(child2.build.called).to.be.true;
+            expect(resources.pendingBuildResources_.length).to.be.equal(0);
+            expect(resource2.isBuilding()).to.be.true;
+            return resource2.buildPromise;
+          })
+          .then(() => {
+            expect(resources.get()).to.contain(resource1);
+            expect(resources.get()).to.contain(resource2);
+            expect(resource1.isBuilding()).to.be.false;
+            expect(resource2.isBuilding()).to.be.false;
+            expect(resources.schedulePass.calledTwice).to.be.true;
+          });
+      }
+    );
 
     it('should NOT build past the root node when pending', () => {
       resources.pendingBuildResources_ = [resource1];
@@ -3015,62 +3396,76 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
     });
 
     // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should build everything pending when ' +
-        'document is ready', () => {
-      resources.documentReady_ = true;
-      resources.pendingBuildResources_ = [parentResource, resource1, resource2];
-      const child1BuildSpy = sandbox.spy();
-      child1.build = () => {
-        // Emulate an error happening during an element build.
-        child1BuildSpy();
-        return Promise.reject(new Error('child1-build-error'));
-      };
-      resources.buildReadyResources_();
-      expect(child1BuildSpy.called).to.be.true;
-      expect(child2.build.called).to.be.true;
-      expect(parent.build.called).to.be.true;
-      expect(resources.pendingBuildResources_.length).to.be.equal(0);
-      return Promise.all([
-        parentResource.buildPromise,
-        resource2.buildPromise,
-        resource1.buildPromise.then(() => {
-          throw new Error('must have failed');
-        }, () => {
-          // Ignore error.
-        }),
-      ]).then(() => {
-        expect(schedulePassStub).to.be.calledTwice;
-        // Failed build.
-        expect(resources.get()).to.not.contain(resource1);
-        expect(resource1.isBuilding()).to.be.false;
-        // Successful build.
-        expect(resources.get()).to.contain(resource2);
-        expect(resource2.isBuilding()).to.be.false;
-      });
-    });
+    it.configure().skipSafari(
+      'should build everything pending when document is ready',
+      () => {
+        resources.documentReady_ = true;
+        resources.pendingBuildResources_ = [
+          parentResource,
+          resource1,
+          resource2,
+        ];
+        const child1BuildSpy = sandbox.spy();
+        child1.build = () => {
+          // Emulate an error happening during an element build.
+          child1BuildSpy();
+          return Promise.reject(new Error('child1-build-error'));
+        };
+        resources.buildReadyResources_();
+        expect(child1BuildSpy.called).to.be.true;
+        expect(child2.build.called).to.be.true;
+        expect(parent.build.called).to.be.true;
+        expect(resources.pendingBuildResources_.length).to.be.equal(0);
+        return Promise.all([
+          parentResource.buildPromise,
+          resource2.buildPromise,
+          resource1.buildPromise.then(
+            () => {
+              throw new Error('must have failed');
+            },
+            () => {
+              // Ignore error.
+            }
+          ),
+        ]).then(() => {
+          expect(schedulePassStub).to.be.calledTwice;
+          // Failed build.
+          expect(resources.get()).to.not.contain(resource1);
+          expect(resource1.isBuilding()).to.be.false;
+          // Successful build.
+          expect(resources.get()).to.contain(resource2);
+          expect(resource2.isBuilding()).to.be.false;
+        });
+      }
+    );
 
     // TODO(amphtml, #15748): Fails on Safari 11.1.0.
-    it.configure().skipSafari('should not schedule pass if all ' +
-        'builds failed', () => {
-      resources.documentReady_ = true;
-      resources.pendingBuildResources_ = [resource1];
-      const child1BuildSpy = sandbox.spy();
-      child1.build = () => {
-        // Emulate an error happening during an element build.
-        child1BuildSpy();
-        return Promise.reject(new Error('child1-build-error'));
-      };
-      resources.buildReadyResources_();
-      expect(child1BuildSpy.called).to.be.true;
-      expect(resources.pendingBuildResources_.length).to.be.equal(0);
-      return resource1.buildPromise.then(() => {
-        throw new Error('must have failed');
-      }, () => {
-        expect(schedulePassStub).to.not.be.called;
-        expect(resources.get()).to.not.contain(resource1);
-        expect(resource1.isBuilding()).to.be.false;
-      });
-    });
+    it.configure().skipSafari(
+      'should not schedule pass if all builds failed',
+      () => {
+        resources.documentReady_ = true;
+        resources.pendingBuildResources_ = [resource1];
+        const child1BuildSpy = sandbox.spy();
+        child1.build = () => {
+          // Emulate an error happening during an element build.
+          child1BuildSpy();
+          return Promise.reject(new Error('child1-build-error'));
+        };
+        resources.buildReadyResources_();
+        expect(child1BuildSpy.called).to.be.true;
+        expect(resources.pendingBuildResources_.length).to.be.equal(0);
+        return resource1.buildPromise.then(
+          () => {
+            throw new Error('must have failed');
+          },
+          () => {
+            expect(schedulePassStub).to.not.be.called;
+            expect(resources.get()).to.not.contain(resource1);
+            expect(resource1.isBuilding()).to.be.false;
+          }
+        );
+      }
+    );
   });
 
   describe('remove', () => {
@@ -3108,7 +3503,9 @@ describes.fakeWin('Resources.add/upgrade/remove', {amp: true}, env => {
 
     beforeEach(() => {
       scheduleBuildStub = sandbox.stub(
-          resources, 'buildOrScheduleBuildForResource_');
+        resources,
+        'buildOrScheduleBuildForResource_'
+      );
       child1.isBuilt = () => true;
       resources.add(child1);
       resources.upgraded(child1);
diff --git a/test/unit/test-runtime.js b/test/unit/test-runtime.js
index 0c846619683b..feb2a3e0399e 100644
--- a/test/unit/test-runtime.js
+++ b/test/unit/test-runtime.js
@@ -20,11 +20,7 @@ import * as styles from '../../src/style-installer';
 import {AmpDocShadow, AmpDocSingle} from '../../src/service/ampdoc-impl';
 import {ElementStub} from '../../src/element-stub';
 import {Services} from '../../src/services';
-import {
-  adopt,
-  adoptShadowMode,
-  installAmpdocServices,
-} from '../../src/runtime';
+import {adopt, adoptShadowMode, installAmpdocServices} from '../../src/runtime';
 import {createShadowRoot} from '../../src/shadow-embed';
 import {deactivateChunking, runChunksForTesting} from '../../src/chunk';
 import {
@@ -38,1697 +34,1860 @@ import {installTimerService} from '../../src/service/timer-impl';
 import {toggleExperiment} from '../../src/experiments';
 import {vsyncForTesting} from '../../src/service/vsync-impl';
 
+describes.fakeWin(
+  'runtime',
+  {
+    location: 'https://cdn.ampproject.org/c/s/www.example.com/path',
+  },
+  env => {
+    let win;
+    let clock;
+    let ampdocService;
+    let ampdocServiceMock;
+    let extensionElementIndex;
 
-describes.fakeWin('runtime', {
-  location: 'https://cdn.ampproject.org/c/s/www.example.com/path',
-}, env => {
-  let win;
-  let clock;
-  let ampdocService;
-  let ampdocServiceMock;
-  let extensionElementIndex;
-
-  beforeEach(() => {
-    win = env.win;
-    clock = env.sandbox.useFakeTimers();
-    extensionElementIndex = 0;
-    ampdocService = {
-      isSingleDoc: () => true,
-      getAmpDoc: () => null,
-      installShadowDoc_: () => null,
-    };
-    ampdocServiceMock = sandbox.mock(ampdocService);
-    win.AMP = [];
-    win.services = {
-      ampdoc: {obj: ampdocService},
-    };
-    const ampdoc = new AmpDocSingle(win);
-    ampdocService.getAmpDoc = () => ampdoc;
-    installDocumentStateService(win);
-    installPlatformService(win);
-    installTimerService(win);
-    vsyncForTesting(win);
-    installAmpdocServices(ampdoc);
-  });
-
-
-  function regularExtension(fn, opt_version) {
-    return {
-      n: 'amp-test-element' + extensionElementIndex++,
-      f: fn,
-      // Default version of uncompiled sources.
-      v: opt_version || '$internalRuntimeVersion$',
-    };
-  }
+    beforeEach(() => {
+      win = env.win;
+      clock = env.sandbox.useFakeTimers();
+      extensionElementIndex = 0;
+      ampdocService = {
+        isSingleDoc: () => true,
+        getAmpDoc: () => null,
+        installShadowDoc_: () => null,
+      };
+      ampdocServiceMock = sandbox.mock(ampdocService);
+      win.AMP = [];
+      win.services = {
+        ampdoc: {obj: ampdocService},
+      };
+      const ampdoc = new AmpDocSingle(win);
+      ampdocService.getAmpDoc = () => ampdoc;
+      installDocumentStateService(win);
+      installPlatformService(win);
+      installTimerService(win);
+      vsyncForTesting(win);
+      installAmpdocServices(ampdoc);
+    });
+
+    function regularExtension(fn, opt_version) {
+      return {
+        n: 'amp-test-element' + extensionElementIndex++,
+        f: fn,
+        // Default version of uncompiled sources.
+        v: opt_version || '$internalRuntimeVersion$',
+      };
+    }
 
-  afterEach(() => {
-    ampdocServiceMock.verify();
-  });
-
-  it('should convert AMP from array to AMP object in single-doc', () => {
-    expect(win.AMP.push).to.equal([].push);
-    adopt(win);
-    expect(win.AMP.push).to.not.equal([].push);
-    expect(win.AMP_TAG).to.be.true;
-  });
-
-  it('should convert AMP from array to AMP object in shadow-doc', () => {
-    expect(win.AMP.push).to.equal([].push);
-    adoptShadowMode(win);
-    expect(win.AMP.push).to.not.equal([].push);
-    expect(win.AMP_TAG).to.be.true;
-  });
-
-  it('should install legacy stubs in single-doc', () => {
-    const initial = win.ampExtendedElements || {};
-    expect(initial['amp-ad']).to.be.undefined;
-    expect(initial['amp-embed']).to.be.undefined;
-    expect(initial['amp-video']).to.be.undefined;
-    adopt(win);
-    expect(win.ampExtendedElements['amp-ad']).to.equal(ElementStub);
-    expect(win.ampExtendedElements['amp-embed']).to.equal(ElementStub);
-    expect(win.ampExtendedElements['amp-video']).to.equal(ElementStub);
-  });
-
-  it('should install legacy stubs in shadow-doc', () => {
-    const initial = win.ampExtendedElements || {};
-    expect(initial['amp-ad']).to.be.undefined;
-    expect(initial['amp-embed']).to.be.undefined;
-    expect(initial['amp-video']).to.be.undefined;
-    adoptShadowMode(win);
-    expect(win.ampExtendedElements['amp-ad']).to.equal(ElementStub);
-    expect(win.ampExtendedElements['amp-embed']).to.equal(ElementStub);
-    expect(win.ampExtendedElements['amp-video']).to.equal(ElementStub);
-  });
-
-  it('should NOT set cursor:pointer on document element on non-IOS', () => {
-    const platform = Services.platformFor(win);
-    sandbox.stub(platform, 'isIos').returns(false);
-    adopt(win);
-    expect(win.document.documentElement.style.cursor).to.not.be.ok;
-  });
-
-  it('should set cursor:pointer on document element on IOS', () => {
-    const platform = Services.platformFor(win);
-    sandbox.stub(platform, 'isIos').returns(true);
-    adopt(win);
-    expect(win.document.documentElement.style.cursor).to.equal('pointer');
-  });
-
-  it('should set cursor:pointer on IOS in shadow-doc', () => {
-    const platform = Services.platformFor(win);
-    sandbox.stub(platform, 'isIos').returns(true);
-    adoptShadowMode(win);
-    expect(win.document.documentElement.style.cursor).to.equal('pointer');
-  });
-
-  function extensionRegistrationTest() {
-    let progress = '';
-    const queueExtensions = win.AMP;
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '1';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '2';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '3';
-    }));
-    expect(queueExtensions).to.have.length(3);
-    const promise = adopt(win);
-    runChunksForTesting(win.document);
-    return promise.then(() => {
-      expect(queueExtensions).to.have.length(0);
-      expect(progress).to.equal('123');
-      win.AMP.push(regularExtension(amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += '4';
-      }));
-      runChunksForTesting(win.document);
-      return promise;
-    }).then(() => {
-      expect(progress).to.equal('1234');
-      win.AMP.push(regularExtension(amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += '5';
-      }));
-      runChunksForTesting(win.document);
-      return promise;
-    }).then(() => {
-      expect(progress).to.equal('12345');
-      expect(queueExtensions).to.have.length(0);
+    afterEach(() => {
+      ampdocServiceMock.verify();
     });
-  }
 
-  it('should execute scheduled extensions & execute new extensions',
-      extensionRegistrationTest);
-
-  it('should not maybePumpEarlyFrame when body not yet present', () => {
-    toggleExperiment(win, 'pump-early-frame', true);
-    // Make document.body be null on first invocation to simulate
-    // JS executing before the rest of the doc has been parsed.
-    const {body} = win.document;
-    let accessedOnce = false;
-    Object.defineProperty(win.document, 'body', {
-      get: () => {
-        if (accessedOnce) {
-          return body;
-        }
-        accessedOnce = true;
-        return null;
-      },
+    it('should convert AMP from array to AMP object in single-doc', () => {
+      expect(win.AMP.push).to.equal([].push);
+      adopt(win);
+      expect(win.AMP.push).to.not.equal([].push);
+      expect(win.AMP_TAG).to.be.true;
     });
-    extensionRegistrationTest();
-  });
-
-  it('should not maybePumpEarlyFrame ' +
-      'when a renderDelayingExtension is present', () => {
-    toggleExperiment(win, 'pump-early-frame', true);
-    win.document.body.appendChild(
-        document.createElement('amp-experiment'));
-    extensionRegistrationTest();
-  });
-
-  it('should maybePumpEarlyFrame and delay extension execution', () => {
-    toggleExperiment(win, 'pump-early-frame', true);
-    let progress = '';
-    const queueExtensions = win.AMP;
-    const highPriority = regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += 'high';
-    });
-    highPriority.p = 'high';
-    win.AMP.push(highPriority);
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '1';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '2';
-    }));
-    win.AMP.push(() => {
-      progress += 'function';
-    });
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '3';
-    }));
-    expect(queueExtensions).to.have.length(5);
-    const promise = adopt(win);
-    runChunksForTesting(win.document);
-    return promise.then(() => {
-      // Skip a microtask.
-      return Promise.resolve();
-    }).then(() => {
-      expect(progress).to.equal('highfunction');
-      expect(queueExtensions).to.have.length(3);
-      clock.tick();
-      expect(queueExtensions).to.have.length(3);
-      expect(progress).to.equal('highfunction');
-      // New extension arrives before inital ran.
-      win.AMP.push(regularExtension(amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += '4';
-      }));
-      expect(queueExtensions).to.have.length(4);
-      clock.tick(1);
-      expect(queueExtensions).to.have.length(0);
-      runChunksForTesting(win.document);
-      return promise;
-    }).then(() => {
-      expect(progress).to.equal('highfunction1234');
-      win.AMP.push(regularExtension(amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += '5';
-      }));
-      runChunksForTesting(win.document);
-      return promise;
-    }).then(() => {
-      expect(progress).to.equal('highfunction12345');
-      expect(queueExtensions).to.have.length(0);
-    });
-  });
-
-  it('support struct AMP.push raw functions and high priority', () => {
-    // New format: {n:string, f:function()}.
-    let progress = '';
-    const queueExtensions = win.AMP;
 
-    // Queue mode.
-    win.AMP.push(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '1';
-    });
-    win.AMP.push({
-      n: 'ext2',
-      p: 'high',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'HIGH';
-      },
-    });
-    expect(queueExtensions).to.have.length(2);
-    expect(progress).to.equal('');
-    const promise = adopt(win);
-    return promise.then(() => {
-      // Notice the queue is down to 0 but there is a micro task to execute
-      // raw and high prio functions. Also notice that no `runChunksForTesting`
-      // was called to process the queue.
-      expect(queueExtensions).to.have.length(0);
-      expect(progress).to.equal('');
-      // Even though raw functions and high priority don't go through chunking
-      // there is a micro task for its queue.
-      return Promise.resolve();
-    }).then(() => {
-      expect(queueExtensions).to.have.length(0);
-      expect(progress).to.equal('1HIGH');
-      win.AMP.push({
-        n: 'ext1',
-        f: amp => {
-          expect(amp).to.equal(win.AMP);
-          progress += 'A';
-        },
-      });
-      runChunksForTesting(win.document);
-      return promise.then(() => {
-        expect(progress).to.equal('1HIGHA');
-      });
+    it('should convert AMP from array to AMP object in shadow-doc', () => {
+      expect(win.AMP.push).to.equal([].push);
+      adoptShadowMode(win);
+      expect(win.AMP.push).to.not.equal([].push);
+      expect(win.AMP_TAG).to.be.true;
     });
-  });
-
-  it('loads and waits for a single intermediate bundles', () => {
-    // New format: {n:string, f:function(), i: <string|Array<string>}.
-    let progress = '';
-    const queueExtensions = win.AMP;
 
-    win.AMP.push({
-      n: 'ext2',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'C';
-      },
-      i: 'ext1',
-    });
-    win.AMP.push({
-      n: 'ext1',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'A';
-      },
-      i: '_base_ext',
+    it('should install legacy stubs in single-doc', () => {
+      const initial = win.ampExtendedElements || {};
+      expect(initial['amp-ad']).to.be.undefined;
+      expect(initial['amp-embed']).to.be.undefined;
+      expect(initial['amp-video']).to.be.undefined;
+      adopt(win);
+      expect(win.ampExtendedElements['amp-ad']).to.equal(ElementStub);
+      expect(win.ampExtendedElements['amp-embed']).to.equal(ElementStub);
+      expect(win.ampExtendedElements['amp-video']).to.equal(ElementStub);
     });
 
-    win.AMP.push({
-      n: '_base_ext',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'B';
-      },
+    it('should install legacy stubs in shadow-doc', () => {
+      const initial = win.ampExtendedElements || {};
+      expect(initial['amp-ad']).to.be.undefined;
+      expect(initial['amp-embed']).to.be.undefined;
+      expect(initial['amp-video']).to.be.undefined;
+      adoptShadowMode(win);
+      expect(win.ampExtendedElements['amp-ad']).to.equal(ElementStub);
+      expect(win.ampExtendedElements['amp-embed']).to.equal(ElementStub);
+      expect(win.ampExtendedElements['amp-video']).to.equal(ElementStub);
     });
 
-    let script = win.document.querySelector('[data-script=_base_ext]');
-    expect(script).to.be.null;
-    const promise = adopt(win);
-    const e = Services.extensionsFor(win);
-
-    expect(queueExtensions).to.have.length(0);
-    expect(progress).to.equal('');
-    runChunksForTesting(win.document);
-    script = win.document.querySelector('[data-script=_base_ext]');
-    expect(script).to.be.not.null;
-    return promise.then(() => {
-      // ext1 should not be executed yet and needs to wait on _base_ext
-      expect(progress).to.equal('B');
-      return e.waitForExtension(win, '_base_ext').then(() => {
-        return e.waitForExtension(win, 'ext1').then(() => {
-          expect(progress).to.equal('BA');
-          return e.waitForExtension(win, 'ext2').then(() => {
-            expect(progress).to.equal('BAC');
-          });
-        });
-      });
-    });
-  });
-
-  it('loads and waits for a multiple intermediate bundles', () => {
-    // New format: {n:string, f:function(), i: <string|Array<string>}.
-    let progress = '';
-    const queueExtensions = win.AMP;
-    win.AMP.push({
-      n: 'ext1',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'A';
-      },
-      i: ['_base_ext1', '_base_ext2'],
+    it('should NOT set cursor:pointer on document element on non-IOS', () => {
+      const platform = Services.platformFor(win);
+      sandbox.stub(platform, 'isIos').returns(false);
+      adopt(win);
+      expect(win.document.documentElement.style.cursor).to.not.be.ok;
     });
 
-    win.AMP.push({
-      n: '_base_ext2',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'B';
-      },
-      i: ['_base_ext1'],
+    it('should set cursor:pointer on document element on IOS', () => {
+      const platform = Services.platformFor(win);
+      sandbox.stub(platform, 'isIos').returns(true);
+      adopt(win);
+      expect(win.document.documentElement.style.cursor).to.equal('pointer');
     });
 
-    win.AMP.push({
-      n: '_base_ext1',
-      f: amp => {
-        expect(amp).to.equal(win.AMP);
-        progress += 'C';
-      },
+    it('should set cursor:pointer on IOS in shadow-doc', () => {
+      const platform = Services.platformFor(win);
+      sandbox.stub(platform, 'isIos').returns(true);
+      adoptShadowMode(win);
+      expect(win.document.documentElement.style.cursor).to.equal('pointer');
     });
 
-    let script1 = win.document.querySelector('[data-script=_base_ext1]');
-    let script2 = win.document.querySelector('[data-script=_base_ext2]');
-    expect(script1).to.be.null;
-    expect(script2).to.be.null;
-    const promise = adopt(win);
-    const e = Services.extensionsFor(win);
-
-    expect(queueExtensions).to.have.length(0);
-    expect(progress).to.equal('');
-    runChunksForTesting(win.document);
-    script1 = win.document.querySelector('[data-script=_base_ext1]');
-    script2 = win.document.querySelector('[data-script=_base_ext2]');
-    expect(script1).to.not.be.null;
-    expect(script2).to.not.be.null;
-
-    return promise.then(() => {
-      // ext1 should not be executed yet and needs to wait on _base_ext
-      // Notice that ext0 executes before A
-      expect(progress).to.equal('C');
+    function extensionRegistrationTest() {
+      let progress = '';
+      const queueExtensions = win.AMP;
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '1';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '2';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '3';
+        })
+      );
+      expect(queueExtensions).to.have.length(3);
+      const promise = adopt(win);
       runChunksForTesting(win.document);
-      return e.waitForExtension(win, '_base_ext2').then(() => {
-        expect(progress).to.equal('CB');
-      }).then(() => {
-        return e.waitForExtension(win, 'ext1').then(() => {
-          expect(progress).to.equal('CBA');
+      return promise
+        .then(() => {
+          expect(queueExtensions).to.have.length(0);
+          expect(progress).to.equal('123');
+          win.AMP.push(
+            regularExtension(amp => {
+              expect(amp).to.equal(win.AMP);
+              progress += '4';
+            })
+          );
+          runChunksForTesting(win.document);
+          return promise;
+        })
+        .then(() => {
+          expect(progress).to.equal('1234');
+          win.AMP.push(
+            regularExtension(amp => {
+              expect(amp).to.equal(win.AMP);
+              progress += '5';
+            })
+          );
+          runChunksForTesting(win.document);
+          return promise;
+        })
+        .then(() => {
+          expect(progress).to.equal('12345');
+          expect(queueExtensions).to.have.length(0);
         });
-      });
-    });
-  });
-
-  it('should wait for body before processing extensions', function* () {
-    let bodyResolver;
-    const bodyPromise = new Promise(resolve => {
-      bodyResolver = resolve;
-    });
-    sandbox.stub(dom, 'waitForBodyPromise').callsFake(() => bodyPromise);
-
-    function skipMicro() {
-      return Promise.resolve().then(() => Promise.resolve());
-    }
-    function waitNext(promise) {
-      return Promise.race([promise, skipMicro()]);
-    }
-
-    let progress = '';
-    const queueExtensions = win.AMP;
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '1';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '2';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '3';
-    }));
-    const promise = adopt(win);
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    // Extensions are still unprocessed
-    expect(progress).to.equal('');
-
-    // Add one more
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '4';
-    }));
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    expect(progress).to.equal('');
-
-    // Body is available now.
-    bodyResolver();
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    expect(progress).to.equal('1234');
-    expect(queueExtensions).to.have.length(0);
-  });
-
-  it('should load correct extension version', function* () {
-    self.AMP_MODE = {
-      rtvVersion: 'test-version',
-    };
-    toggleExperiment(win, 'version-locking', true);
-    function addExisting(index) {
-      const s = document.createElement('script');
-      s.setAttribute('custom-element', 'amp-test-element' + index);
-      win.document.head.appendChild(s);
-      return s;
     }
-    const s1 = addExisting(1);
-    const s2 = addExisting(4);
-    const s3 = addExisting(5);
 
-    let bodyResolver;
-    const bodyPromise = new Promise(resolve => {
-      bodyResolver = resolve;
+    it(
+      'should execute scheduled extensions & execute new extensions',
+      extensionRegistrationTest
+    );
+
+    it('should not maybePumpEarlyFrame when body not yet present', () => {
+      toggleExperiment(win, 'pump-early-frame', true);
+      // Make document.body be null on first invocation to simulate
+      // JS executing before the rest of the doc has been parsed.
+      const {body} = win.document;
+      let accessedOnce = false;
+      Object.defineProperty(win.document, 'body', {
+        get: () => {
+          if (accessedOnce) {
+            return body;
+          }
+          accessedOnce = true;
+          return null;
+        },
+      });
+      extensionRegistrationTest();
     });
-    sandbox.stub(dom, 'waitForBodyPromise').callsFake(() => bodyPromise);
-
-    function skipMicro() {
-      return Promise.resolve().then(() => Promise.resolve());
-    }
-    function waitNext(promise) {
-      return Promise.race([promise, skipMicro()]);
-    }
 
-    let progress = '';
-    const queueExtensions = win.AMP;
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '1';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += 'not expected 1';
-    }, 'version123'));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '3';
-    }));
-    const promise = adopt(win);
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    // Extensions are still unprocessed
-    expect(progress).to.equal('');
-
-    // Add one more
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '4';
-    }));
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += 'not expected 2';
-    }, 'version123'));
-    // Add legacy element (5) and eagarly ask for its load as ElementStub does.
-    Services.extensionsFor(win).preloadExtension('amp-test-element5', false);
-    win.AMP.push(regularExtension(amp => {
-      expect(amp).to.equal(win.AMP);
-      progress += '5';
-    }, 'version123'));
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    expect(progress).to.equal('');
-
-    // Body is available now.
-    bodyResolver();
-    runChunksForTesting(win.document);
-
-    yield waitNext(promise);
-    expect(progress).to.equal('134');
-    expect(queueExtensions).to.have.length(0);
-    expect(s1.getAttribute('custom-element')).to.be.null;
-    expect(s2.getAttribute('custom-element')).to.be.null;
-    expect(s3.getAttribute('custom-element')).to.be.null;
-    expect(s1.getAttribute('i-amphtml-loaded-new-version'))
-        .to.equal('amp-test-element1');
-    expect(s2.getAttribute('i-amphtml-loaded-new-version'))
-        .to.equal('amp-test-element4');
-    expect(s3.getAttribute('i-amphtml-loaded-new-version'))
-        .to.equal('amp-test-element5');
-    const inserted = win.document.head.querySelectorAll(
-        '[i-amphtml-inserted]');
-    expect(inserted).to.have.length(3);
-    expect(inserted[0].getAttribute('src')).to.equal(
-        'https://cdn.ampproject.org/rtv/test-version' +
-            '/v0/amp-test-element1-0.1.js');
-    expect(inserted[1].getAttribute('src')).to.equal(
-        'https://cdn.ampproject.org/rtv/test-version' +
-            '/v0/amp-test-element4-0.1.js');
-    expect(inserted[2].getAttribute('src')).to.equal(
-        'https://cdn.ampproject.org/rtv/test-version' +
-            '/v0/amp-test-element5-0.1.js');
-  });
-
-  it('should be robust against errors in early extensions', function* () {
-    let progress = '';
-    win.AMP.push(regularExtension(() => {
-      progress += '1';
-    }));
-    win.AMP.push(regularExtension(() => {
-      throw new Error('extension error');
-    }));
-    win.AMP.push(regularExtension(() => {
-      progress += '3';
-    }));
-    const promise = adopt(win);
-    runChunksForTesting(win.document);
-    yield promise;
-    expect(progress).to.equal('13');
-  });
-
-  describe('single-mode', () => {
-    let extensions;
+    it(
+      'should not maybePumpEarlyFrame ' +
+        'when a renderDelayingExtension is present',
+      () => {
+        toggleExperiment(win, 'pump-early-frame', true);
+        win.document.body.appendChild(document.createElement('amp-experiment'));
+        extensionRegistrationTest();
+      }
+    );
 
-    beforeEach(() => {
+    it('should maybePumpEarlyFrame and delay extension execution', () => {
+      toggleExperiment(win, 'pump-early-frame', true);
+      let progress = '';
+      const queueExtensions = win.AMP;
+      const highPriority = regularExtension(amp => {
+        expect(amp).to.equal(win.AMP);
+        progress += 'high';
+      });
+      highPriority.p = 'high';
+      win.AMP.push(highPriority);
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '1';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '2';
+        })
+      );
+      win.AMP.push(() => {
+        progress += 'function';
+      });
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '3';
+        })
+      );
+      expect(queueExtensions).to.have.length(5);
       const promise = adopt(win);
-      ext.installExtensionsService(win);
-      extensions = Services.extensionsFor(win);
-      return promise;
-    });
-
-    it('should export properties to global AMP object', () => {
-      expect(win.AMP.BaseElement).to.be.a('function');
-      expect(win.AMP.BaseTemplate).to.be.a('function');
-      expect(win.AMP.registerElement).to.be.a('function');
-      expect(win.AMP.registerTemplate).to.be.a('function');
-      expect(win.AMP.setTickFunction).to.be.a('function');
-      expect(win.AMP.win).to.equal(win);
-
-      expect(win.AMP.viewer).to.be.a('object');
-      expect(win.AMP.viewport).to.be.a('object');
-      // Single-doc mode does not create `attachShadowDoc`.
-      expect(win.AMP.attachShadowDoc).to.not.exist;
-      expect(win.AMP.attachShadowDocAsStream).to.not.exist;
+      runChunksForTesting(win.document);
+      return promise
+        .then(() => {
+          // Skip a microtask.
+          return Promise.resolve();
+        })
+        .then(() => {
+          expect(progress).to.equal('highfunction');
+          expect(queueExtensions).to.have.length(3);
+          clock.tick();
+          expect(queueExtensions).to.have.length(3);
+          expect(progress).to.equal('highfunction');
+          // New extension arrives before inital ran.
+          win.AMP.push(
+            regularExtension(amp => {
+              expect(amp).to.equal(win.AMP);
+              progress += '4';
+            })
+          );
+          expect(queueExtensions).to.have.length(4);
+          clock.tick(1);
+          expect(queueExtensions).to.have.length(0);
+          runChunksForTesting(win.document);
+          return promise;
+        })
+        .then(() => {
+          expect(progress).to.equal('highfunction1234');
+          win.AMP.push(
+            regularExtension(amp => {
+              expect(amp).to.equal(win.AMP);
+              progress += '5';
+            })
+          );
+          runChunksForTesting(win.document);
+          return promise;
+        })
+        .then(() => {
+          expect(progress).to.equal('highfunction12345');
+          expect(queueExtensions).to.have.length(0);
+        });
     });
 
-    it('should register element without CSS', function* () {
-      const ampdoc = ampdocService.getAmpDoc();
-      const servicePromise = getServicePromise(win, 'amp-ext');
-      const installStylesStub = sandbox.stub(styles, 'installStylesForDoc');
+    it('support struct AMP.push raw functions and high priority', () => {
+      // New format: {n:string, f:function()}.
+      let progress = '';
+      const queueExtensions = win.AMP;
 
-      ampdoc.declareExtension('amp-ext');
+      // Queue mode.
+      win.AMP.push(amp => {
+        expect(amp).to.equal(win.AMP);
+        progress += '1';
+      });
       win.AMP.push({
-        n: 'amp-ext',
+        n: 'ext2',
+        p: 'high',
         f: amp => {
-          amp.registerElement('amp-ext', win.AMP.BaseElement);
+          expect(amp).to.equal(win.AMP);
+          progress += 'HIGH';
         },
       });
-      runChunksForTesting(win.document);
-      yield extensions.waitForExtension(win, 'amp-ext');
-
-      // Extension is added immediately. Can't find for micro-tasks here.
-      const ext = extensions.extensions_['amp-ext'].extension;
-      expect(ext.elements['amp-ext']).exist;
-      expect(ext.elements['amp-ext'].implementationClass)
-          .to.equal(win.AMP.BaseElement);
-
-      // No installStyles calls.
-      expect(installStylesStub).to.have.not.been.called;
-
-      // Register is called immediately as well.
-      expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
-
-      // Service and extensions are resolved.
-      yield Promise.all([
-        extensions.waitForExtension(win, 'amp-ext'),
-        servicePromise]);
+      expect(queueExtensions).to.have.length(2);
+      expect(progress).to.equal('');
+      const promise = adopt(win);
+      return promise
+        .then(() => {
+          // Notice the queue is down to 0 but there is a micro task to execute
+          // raw and high prio functions. Also notice that no `runChunksForTesting`
+          // was called to process the queue.
+          expect(queueExtensions).to.have.length(0);
+          expect(progress).to.equal('');
+          // Even though raw functions and high priority don't go through chunking
+          // there is a micro task for its queue.
+          return Promise.resolve();
+        })
+        .then(() => {
+          expect(queueExtensions).to.have.length(0);
+          expect(progress).to.equal('1HIGH');
+          win.AMP.push({
+            n: 'ext1',
+            f: amp => {
+              expect(amp).to.equal(win.AMP);
+              progress += 'A';
+            },
+          });
+          runChunksForTesting(win.document);
+          return promise.then(() => {
+            expect(progress).to.equal('1HIGHA');
+          });
+        });
     });
 
-    it('should register element with CSS', function* () {
-      const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
-      const servicePromise = getServicePromise(win, 'amp-ext');
-      let installStylesCallback;
-      const installStylesStub =
-          sandbox.stub(styles, 'installStylesForDoc').callsFake(
-              (doc, cssText, cb) => {
-                installStylesCallback = cb;
-              });
-
-      ampdoc.declareExtension('amp-ext');
+    it('loads and waits for a single intermediate bundles', () => {
+      // New format: {n:string, f:function(), i: <string|Array<string>}.
+      let progress = '';
+      const queueExtensions = win.AMP;
+
       win.AMP.push({
-        n: 'amp-ext',
+        n: 'ext2',
         f: amp => {
-          amp.registerElement('amp-ext', win.AMP.BaseElement, 'a{}');
+          expect(amp).to.equal(win.AMP);
+          progress += 'C';
         },
+        i: 'ext1',
       });
-      runChunksForTesting(win.document);
-
-      // Extension is added immediately. Can't find for micro-tasks here.
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const ext = extensions.extensions_['amp-ext'].extension;
-      expect(ext.elements['amp-ext']).exist;
-      expect(ext.elements['amp-ext'].implementationClass)
-          .to.equal(win.AMP.BaseElement);
-      expect(ext.elements['amp-ext'].css).to.equal('a{}');
-
-      expect(installStylesStub).to.be.calledOnce;
-      expect(installStylesStub).to.be.calledWithExactly(
-          ampdoc,
-          'a{}',
-          installStylesCallback,
-          /* isRuntimeCss */ false,
-          /* ext */ 'amp-ext');
-
-      // Element resistration is not done until callback.
-      expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
-      installStylesCallback();
-      expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
-
-      // Service and extensions are resolved.
-      yield Promise.all([
-        extensions.waitForExtension(win, 'amp-ext'),
-        servicePromise]);
-    });
-
-    it('should register doc-service as ctor and install imm', function* () {
-      class Service1 {}
-      const ampdoc = new AmpDocSingle(win);
-      ampdoc.declareExtension('amp-ext');
-      ampdocServiceMock.expects('getAmpDoc')
-          .returns(ampdoc)
-          .atLeast(1);
       win.AMP.push({
-        n: 'amp-ext',
+        n: 'ext1',
         f: amp => {
-          amp.registerServiceForDoc('service1', Service1);
+          expect(amp).to.equal(win.AMP);
+          progress += 'A';
         },
+        i: '_base_ext',
       });
-      runChunksForTesting(win.document);
-
-      // No factories
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const extHolder = extensions.extensions_['amp-ext'];
-      expect(extHolder.docFactories).to.have.length(1);
-
-      // Already installed.
-      expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(Service1);
-
-      // The main top-level service is also pinged to unblock render.
-      yield getServicePromise(win, 'service1');
-    });
 
-    it('should register doc-service factory and install', function* () {
-      let count = 0;
-      function factory() {
-        count++;
-        return {str: 'A'};
-      }
-      const ampdoc = new AmpDocSingle(win);
-      ampdoc.declareExtension('amp-ext');
-      ampdocServiceMock.expects('getAmpDoc')
-          .returns(ampdoc)
-          .atLeast(1);
       win.AMP.push({
-        n: 'amp-ext',
+        n: '_base_ext',
         f: amp => {
-          amp.registerServiceForDoc('service1', factory);
+          expect(amp).to.equal(win.AMP);
+          progress += 'B';
         },
       });
-      runChunksForTesting(win.document);
-
-      // No factories
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const extHolder = extensions.extensions_['amp-ext'];
-      expect(extHolder.docFactories).to.have.length(1);
 
-      // Already installed.
-      expect(count).to.equal(1);
-      expect(getServiceForDoc(ampdoc, 'service1')).to.deep.equal({str: 'A'});
-    });
-  });
-
-  describe('shadow-mode', () => {
-    let extensions;
-
-    beforeEach(() => {
-      const promise = adoptShadowMode(win);
-      ext.installExtensionsService(win);
-      extensions = Services.extensionsFor(win);
-      return promise;
-    });
-
-    it('should export properties to global AMP object', () => {
-      expect(win.AMP.BaseElement).to.be.a('function');
-      expect(win.AMP.BaseTemplate).to.be.a('function');
-      expect(win.AMP.registerElement).to.be.a('function');
-      expect(win.AMP.registerTemplate).to.be.a('function');
-      expect(win.AMP.setTickFunction).to.be.a('function');
-      expect(win.AMP.win).to.equal(win);
-
-      expect(win.AMP.attachShadowDoc).to.be.a('function');
-      expect(win.AMP.attachShadowDocAsStream).to.be.a('function');
+      let script = win.document.querySelector('[data-script=_base_ext]');
+      expect(script).to.be.null;
+      const promise = adopt(win);
+      const e = Services.extensionsFor(win);
 
-      expect(win.AMP.viewer).to.not.exist;
-      expect(win.AMP.viewport).to.not.exist;
+      expect(queueExtensions).to.have.length(0);
+      expect(progress).to.equal('');
+      runChunksForTesting(win.document);
+      script = win.document.querySelector('[data-script=_base_ext]');
+      expect(script).to.be.not.null;
+      return promise.then(() => {
+        // ext1 should not be executed yet and needs to wait on _base_ext
+        expect(progress).to.equal('B');
+        return e.waitForExtension(win, '_base_ext').then(() => {
+          return e.waitForExtension(win, 'ext1').then(() => {
+            expect(progress).to.equal('BA');
+            return e.waitForExtension(win, 'ext2').then(() => {
+              expect(progress).to.equal('BAC');
+            });
+          });
+        });
+      });
     });
 
-    it('should register element without CSS', function* () {
-      const servicePromise = getServicePromise(win, 'amp-ext');
-      const installStylesStub = sandbox.stub(styles, 'installStylesForDoc');
-
+    it('loads and waits for a multiple intermediate bundles', () => {
+      // New format: {n:string, f:function(), i: <string|Array<string>}.
+      let progress = '';
+      const queueExtensions = win.AMP;
       win.AMP.push({
-        n: 'amp-ext',
+        n: 'ext1',
         f: amp => {
-          amp.registerElement('amp-ext', win.AMP.BaseElement);
+          expect(amp).to.equal(win.AMP);
+          progress += 'A';
         },
+        i: ['_base_ext1', '_base_ext2'],
       });
-      runChunksForTesting(win.document);
-
-      // Extension is added immediately. Can't find for micro-tasks here.
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const extHolder = extensions.extensions_['amp-ext'];
-      const ext = extHolder.extension;
-      expect(ext.elements['amp-ext']).exist;
-      expect(ext.elements['amp-ext'].implementationClass)
-          .to.equal(win.AMP.BaseElement);
-
-      // No installStyles calls and no factories.
-      expect(installStylesStub).to.not.be.called;
-      expect(extHolder.docFactories).to.have.length(1);
-      expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
-
-      // Execute factory to install style.
-      const shadowRoot = document.createDocumentFragment();
-      const ampdoc = new AmpDocShadow(win, 'https://acme.org/', shadowRoot);
-      extHolder.docFactories[0](ampdoc);
-      expect(installStylesStub).to.not.be.called;
-      expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
-
-      // Service and extensions are resolved.
-      yield Promise.all([
-        extensions.waitForExtension(win, 'amp-ext'),
-        servicePromise]);
-    });
-
-    it('should register element with CSS', function* () {
-      const servicePromise = getServicePromise(win, 'amp-ext');
-      let installStylesCallback;
-      const installStylesStub =
-          sandbox.stub(styles, 'installStylesForDoc').callsFake(
-              (doc, cssText, cb) => {
-                installStylesCallback = cb;
-              });
 
       win.AMP.push({
-        n: 'amp-ext',
+        n: '_base_ext2',
         f: amp => {
-          amp.registerElement('amp-ext', win.AMP.BaseElement, 'a{}');
+          expect(amp).to.equal(win.AMP);
+          progress += 'B';
         },
+        i: ['_base_ext1'],
       });
-      runChunksForTesting(win.document);
-
-      // Extension is added immediately. Can't find for micro-tasks here.
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const extHolder = extensions.extensions_['amp-ext'];
-      const ext = extHolder.extension;
-      expect(ext.elements['amp-ext']).exist;
-      expect(ext.elements['amp-ext'].implementationClass)
-          .to.equal(win.AMP.BaseElement);
-      expect(ext.elements['amp-ext'].css).to.equal('a{}');
-      // No installations yet, but there's a factory.
-      expect(extHolder.docFactories).to.have.length(1);
-      expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
-      expect(installStylesStub).to.have.not.been.called;
-
-      // Execute factory to install style.
-      const shadowRoot = document.createDocumentFragment();
-      const ampdoc = new AmpDocShadow(win, 'https://acme.org/', shadowRoot);
-      extHolder.docFactories[0](ampdoc);
-      expect(installStylesStub).to.be.calledOnce;
-      expect(installStylesStub).to.be.calledWithExactly(
-          ampdoc,
-          'a{}',
-          installStylesCallback,
-          /* isRuntimeCss */ false,
-          /* ext */ 'amp-ext');
-
-      // Run install.
-      installStylesCallback();
-      expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
 
-      // Service and extensions are resolved.
-      yield Promise.all([
-        extensions.waitForExtension(win, 'amp-ext'),
-        servicePromise]);
-    });
-
-    it('should register doc-service as ctor and defer install', function* () {
-      class Service1 {}
       win.AMP.push({
-        n: 'amp-ext',
+        n: '_base_ext1',
         f: amp => {
-          amp.registerServiceForDoc('service1', Service1);
+          expect(amp).to.equal(win.AMP);
+          progress += 'C';
         },
       });
-      runChunksForTesting(win.document);
 
-      // Factory recorded.
-      yield extensions.waitForExtension(win, 'amp-ext');
-      const extHolder = extensions.extensions_['amp-ext'];
-      expect(extHolder.docFactories).to.have.length(1);
-
-      const shadowRoot = document.createDocumentFragment();
-      const ampdoc = new AmpDocShadow(win, 'https://a.org/', shadowRoot);
+      let script1 = win.document.querySelector('[data-script=_base_ext1]');
+      let script2 = win.document.querySelector('[data-script=_base_ext2]');
+      expect(script1).to.be.null;
+      expect(script2).to.be.null;
+      const promise = adopt(win);
+      const e = Services.extensionsFor(win);
 
-      // Not installed.
-      expect(getServicePromiseOrNullForDoc(ampdoc, 'service1')).to.be.null;
+      expect(queueExtensions).to.have.length(0);
+      expect(progress).to.equal('');
+      runChunksForTesting(win.document);
+      script1 = win.document.querySelector('[data-script=_base_ext1]');
+      script2 = win.document.querySelector('[data-script=_base_ext2]');
+      expect(script1).to.not.be.null;
+      expect(script2).to.not.be.null;
 
-      // Install.
-      extHolder.docFactories[0](ampdoc);
-      expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(Service1);
+      return promise.then(() => {
+        // ext1 should not be executed yet and needs to wait on _base_ext
+        // Notice that ext0 executes before A
+        expect(progress).to.equal('C');
+        runChunksForTesting(win.document);
+        return e
+          .waitForExtension(win, '_base_ext2')
+          .then(() => {
+            expect(progress).to.equal('CB');
+          })
+          .then(() => {
+            return e.waitForExtension(win, 'ext1').then(() => {
+              expect(progress).to.equal('CBA');
+            });
+          });
+      });
     });
-  });
-});
 
+    it('should wait for body before processing extensions', function*() {
+      let bodyResolver;
+      const bodyPromise = new Promise(resolve => {
+        bodyResolver = resolve;
+      });
+      sandbox.stub(dom, 'waitForBodyPromise').callsFake(() => bodyPromise);
+
+      function skipMicro() {
+        return Promise.resolve().then(() => Promise.resolve());
+      }
+      function waitNext(promise) {
+        return Promise.race([promise, skipMicro()]);
+      }
 
-describes.realWin('runtime multidoc', {
-  amp: {ampdoc: 'multi'},
-}, env => {
-  let win;
-  let extensions;
-  let extensionsMock;
-  let ampdocServiceMock;
+      let progress = '';
+      const queueExtensions = win.AMP;
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '1';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '2';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '3';
+        })
+      );
+      const promise = adopt(win);
+      runChunksForTesting(win.document);
 
-  beforeEach(() => {
-    win = env.win;
-    extensions = env.extensions;
-    extensionsMock = sandbox.mock(extensions);
-    ampdocServiceMock = sandbox.mock(env.ampdocService);
-  });
+      yield waitNext(promise);
+      // Extensions are still unprocessed
+      expect(progress).to.equal('');
 
-  afterEach(() => {
-    extensionsMock.verify();
-    ampdocServiceMock.verify();
-  });
+      // Add one more
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '4';
+        })
+      );
+      runChunksForTesting(win.document);
 
-  describe('attachShadowDoc', () => {
-    const docUrl = 'https://example.org/doc1';
+      yield waitNext(promise);
+      expect(progress).to.equal('');
 
-    let clock;
-    let importDoc;
-    let hostElement;
-    let ampdoc;
+      // Body is available now.
+      bodyResolver();
+      runChunksForTesting(win.document);
 
-    beforeEach(() => {
-      deactivateChunking();
-      clock = sandbox.useFakeTimers();
-      hostElement = win.document.createElement('div');
-      importDoc = win.document.implementation.createHTMLDocument('');
-      importDoc.body.appendChild(win.document.createElement('child'));
-      const shadowRoot = createShadowRoot(hostElement);
-      ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
-
-      ampdocServiceMock.expects('installShadowDoc')
-          .withExactArgs(
-              docUrl,
-              sinon.match(arg => arg == getShadowRoot(hostElement)))
-          .returns(ampdoc)
-          .atLeast(0);
-      ampdocServiceMock.expects('getAmpDoc')
-          .withExactArgs(sinon.match(arg => arg == getShadowRoot(hostElement)))
-          .returns(ampdoc)
-          .atLeast(0);
+      yield waitNext(promise);
+      expect(progress).to.equal('1234');
+      expect(queueExtensions).to.have.length(0);
     });
 
-    it('should install services and styles', () => {
-      const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(ret).to.exist;
-
-      const shadowRoot = getShadowRoot(hostElement);
+    it('should load correct extension version', function*() {
+      self.AMP_MODE = {
+        rtvVersion: 'test-version',
+      };
+      toggleExperiment(win, 'version-locking', true);
+      function addExisting(index) {
+        const s = document.createElement('script');
+        s.setAttribute('custom-element', 'amp-test-element' + index);
+        win.document.head.appendChild(s);
+        return s;
+      }
+      const s1 = addExisting(1);
+      const s2 = addExisting(4);
+      const s3 = addExisting(5);
 
-      // URL is set.
-      expect(shadowRoot.AMP.url).to.equal(docUrl);
+      let bodyResolver;
+      const bodyPromise = new Promise(resolve => {
+        bodyResolver = resolve;
+      });
+      sandbox.stub(dom, 'waitForBodyPromise').callsFake(() => bodyPromise);
 
-      // Stylesheet has been installed.
-      expect(shadowRoot.querySelector('style[amp-runtime]')).to.exist;
+      function skipMicro() {
+        return Promise.resolve().then(() => Promise.resolve());
+      }
+      function waitNext(promise) {
+        return Promise.race([promise, skipMicro()]);
+      }
 
-      // Doc services have been installed.
-      expect(ampdoc.services.action).to.exist;
-      expect(ampdoc.services.action.obj).to.exist;
-      expect(ampdoc.services.viewer).to.exist;
-      expect(ampdoc.services.viewer.obj).to.exist;
+      let progress = '';
+      const queueExtensions = win.AMP;
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '1';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += 'not expected 1';
+        }, 'version123')
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '3';
+        })
+      );
+      const promise = adopt(win);
+      runChunksForTesting(win.document);
 
-      // Single-doc bidings have been installed.
-      expect(ret.ampdoc).to.equal(ampdoc);
-      expect(ret.viewer).to.not.exist;
-    });
+      yield waitNext(promise);
+      // Extensions are still unprocessed
+      expect(progress).to.equal('');
 
-    it('should install doc services', () => {
-      class Service1 {}
-      win.AMP.push({
-        n: 'amp-ext',
-        f: amp => {
-          amp.registerServiceForDoc('service1', Service1);
-        },
-      });
+      // Add one more
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '4';
+        })
+      );
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += 'not expected 2';
+        }, 'version123')
+      );
+      // Add legacy element (5) and eagarly ask for its load as ElementStub does.
+      Services.extensionsFor(win).preloadExtension('amp-test-element5', false);
+      win.AMP.push(
+        regularExtension(amp => {
+          expect(amp).to.equal(win.AMP);
+          progress += '5';
+        }, 'version123')
+      );
+      runChunksForTesting(win.document);
 
-      const script = win.document.createElement('script');
-      script.setAttribute('custom-element', 'amp-ext');
-      script.setAttribute('src', '');
-      importDoc.head.appendChild(script);
+      yield waitNext(promise);
+      expect(progress).to.equal('');
 
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+      // Body is available now.
+      bodyResolver();
+      runChunksForTesting(win.document);
 
-      return extensions.waitForExtension(win, 'amp-ext').then(() => {
-        // Factories have been applied.
-        expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(Service1);
-      });
+      yield waitNext(promise);
+      expect(progress).to.equal('134');
+      expect(queueExtensions).to.have.length(0);
+      expect(s1.getAttribute('custom-element')).to.be.null;
+      expect(s2.getAttribute('custom-element')).to.be.null;
+      expect(s3.getAttribute('custom-element')).to.be.null;
+      expect(s1.getAttribute('i-amphtml-loaded-new-version')).to.equal(
+        'amp-test-element1'
+      );
+      expect(s2.getAttribute('i-amphtml-loaded-new-version')).to.equal(
+        'amp-test-element4'
+      );
+      expect(s3.getAttribute('i-amphtml-loaded-new-version')).to.equal(
+        'amp-test-element5'
+      );
+      const inserted = win.document.head.querySelectorAll(
+        '[i-amphtml-inserted]'
+      );
+      expect(inserted).to.have.length(3);
+      expect(inserted[0].getAttribute('src')).to.equal(
+        'https://cdn.ampproject.org/rtv/test-version' +
+          '/v0/amp-test-element1-0.1.js'
+      );
+      expect(inserted[1].getAttribute('src')).to.equal(
+        'https://cdn.ampproject.org/rtv/test-version' +
+          '/v0/amp-test-element4-0.1.js'
+      );
+      expect(inserted[2].getAttribute('src')).to.equal(
+        'https://cdn.ampproject.org/rtv/test-version' +
+          '/v0/amp-test-element5-0.1.js'
+      );
+    });
+
+    it('should be robust against errors in early extensions', function*() {
+      let progress = '';
+      win.AMP.push(
+        regularExtension(() => {
+          progress += '1';
+        })
+      );
+      win.AMP.push(
+        regularExtension(() => {
+          throw new Error('extension error');
+        })
+      );
+      win.AMP.push(
+        regularExtension(() => {
+          progress += '3';
+        })
+      );
+      const promise = adopt(win);
+      runChunksForTesting(win.document);
+      yield promise;
+      expect(progress).to.equal('13');
     });
 
-    it('should pass init parameters to viewer', () => {
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl, {
-        'test1': '12',
-      });
+    describe('single-mode', () => {
+      let extensions;
 
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(viewer.getParam('test1')).to.equal('12');
-    });
+      beforeEach(() => {
+        const promise = adopt(win);
+        ext.installExtensionsService(win);
+        extensions = Services.extensionsFor(win);
+        return promise;
+      });
 
-    it('should update host visibility', () => {
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+      it('should export properties to global AMP object', () => {
+        expect(win.AMP.BaseElement).to.be.a('function');
+        expect(win.AMP.BaseTemplate).to.be.a('function');
+        expect(win.AMP.registerElement).to.be.a('function');
+        expect(win.AMP.registerTemplate).to.be.a('function');
+        expect(win.AMP.setTickFunction).to.be.a('function');
+        expect(win.AMP.win).to.equal(win);
+
+        expect(win.AMP.viewer).to.be.a('object');
+        expect(win.AMP.viewport).to.be.a('object');
+        // Single-doc mode does not create `attachShadowDoc`.
+        expect(win.AMP.attachShadowDoc).to.not.exist;
+        expect(win.AMP.attachShadowDocAsStream).to.not.exist;
+      });
 
-      // Document is invisible at first.
-      expect(hostElement.style.visibility).to.equal('hidden');
+      it('should register element without CSS', function*() {
+        const ampdoc = ampdocService.getAmpDoc();
+        const servicePromise = getServicePromise(win, 'amp-ext');
+        const installStylesStub = sandbox.stub(styles, 'installStylesForDoc');
+
+        ampdoc.declareExtension('amp-ext');
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerElement('amp-ext', win.AMP.BaseElement);
+          },
+        });
+        runChunksForTesting(win.document);
+        yield extensions.waitForExtension(win, 'amp-ext');
+
+        // Extension is added immediately. Can't find for micro-tasks here.
+        const ext = extensions.extensions_['amp-ext'].extension;
+        expect(ext.elements['amp-ext']).exist;
+        expect(ext.elements['amp-ext'].implementationClass).to.equal(
+          win.AMP.BaseElement
+        );
+
+        // No installStyles calls.
+        expect(installStylesStub).to.have.not.been.called;
+
+        // Register is called immediately as well.
+        expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
+
+        // Service and extensions are resolved.
+        yield Promise.all([
+          extensions.waitForExtension(win, 'amp-ext'),
+          servicePromise,
+        ]);
+      });
 
-      // After timeout the doc rendered is started.
-      clock.tick(3000);
-      expect(hostElement.style.visibility).to.equal('visible');
-      expect(ampdoc.signals().get('render-start')).to.be.ok;
+      it('should register element with CSS', function*() {
+        const ampdoc = Services.ampdocServiceFor(win).getAmpDoc();
+        const servicePromise = getServicePromise(win, 'amp-ext');
+        let installStylesCallback;
+        const installStylesStub = sandbox
+          .stub(styles, 'installStylesForDoc')
+          .callsFake((doc, cssText, cb) => {
+            installStylesCallback = cb;
+          });
 
-      return ampdoc.whenReady().then(() => {
-        expect(ampdoc.isReady()).to.be.true;
+        ampdoc.declareExtension('amp-ext');
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerElement('amp-ext', win.AMP.BaseElement, 'a{}');
+          },
+        });
+        runChunksForTesting(win.document);
+
+        // Extension is added immediately. Can't find for micro-tasks here.
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const ext = extensions.extensions_['amp-ext'].extension;
+        expect(ext.elements['amp-ext']).exist;
+        expect(ext.elements['amp-ext'].implementationClass).to.equal(
+          win.AMP.BaseElement
+        );
+        expect(ext.elements['amp-ext'].css).to.equal('a{}');
+
+        expect(installStylesStub).to.be.calledOnce;
+        expect(installStylesStub).to.be.calledWithExactly(
+          ampdoc,
+          'a{}',
+          installStylesCallback,
+          /* isRuntimeCss */ false,
+          /* ext */ 'amp-ext'
+        );
+
+        // Element resistration is not done until callback.
+        expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
+        installStylesCallback();
+        expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
+
+        // Service and extensions are resolved.
+        yield Promise.all([
+          extensions.waitForExtension(win, 'amp-ext'),
+          servicePromise,
+        ]);
       });
-    });
 
-    it('should import body', () => {
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const shadowRoot = getShadowRoot(hostElement);
-      const body = shadowRoot.querySelector('body') ||
-          shadowRoot.querySelector('amp-body');
-      expect(body).to.exist;
-      expect(body).to.have.class('amp-shadow');
-      expect(body.style.position).to.equal('relative');
-      expect(body.querySelector('child')).to.exist;
-      expect(ampdoc.getBody()).to.exist;
-    });
+      it('should register doc-service as ctor and install imm', function*() {
+        class Service1 {}
+        const ampdoc = new AmpDocSingle(win);
+        ampdoc.declareExtension('amp-ext');
+        ampdocServiceMock
+          .expects('getAmpDoc')
+          .returns(ampdoc)
+          .atLeast(1);
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerServiceForDoc('service1', Service1);
+          },
+        });
+        runChunksForTesting(win.document);
 
-    it('should read title element', () => {
-      const titleEl = win.document.createElement('title');
-      titleEl.textContent = 'test title';
-      importDoc.head.appendChild(titleEl);
-      const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(ret.title).to.equal('test title');
-      expect(getShadowRoot(hostElement).AMP.title).to.equal('test title');
-    });
+        // No factories
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const extHolder = extensions.extensions_['amp-ext'];
+        expect(extHolder.docFactories).to.have.length(1);
 
-    it('should read canonical element', () => {
-      const canonicalEl = win.document.createElement('link');
-      canonicalEl.setAttribute('rel', 'canonical');
-      canonicalEl.setAttribute('href', 'http://example.org/canonical');
-      importDoc.head.appendChild(canonicalEl);
-      const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(ret.canonicalUrl).to.equal('http://example.org/canonical');
-    });
+        // Already installed.
+        expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(Service1);
 
-    it('should import fonts', () => {
-      const fontEl1 = win.document.createElement('link');
-      fontEl1.setAttribute('rel', 'stylesheet');
-      fontEl1.setAttribute('href', 'http://example.org/font1');
-      importDoc.head.appendChild(fontEl1);
-      const fontEl2 = win.document.createElement('link');
-      fontEl2.setAttribute('rel', 'stylesheet');
-      fontEl2.setAttribute('href', 'http://example.org/font2');
-      importDoc.head.appendChild(fontEl2);
-      win.document.head.appendChild(fontEl2.cloneNode(true));
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(win.document.querySelector(
-          'link[href="http://example.org/font1"]')).to.exist;
-      // Duplicates are ignored.
-      expect(win.document.querySelectorAll(
-          'link[href="http://example.org/font2"]')).to.have.length(1);
-
-      const fontEl = win.document.querySelector(
-          'link[href="http://example.org/font1"]');
-      expect(fontEl.getAttribute('type')).to.equal('text/css');
-      expect(fontEl.getAttribute('rel')).to.equal('stylesheet');
-      fontEl.parentElement.removeChild(fontEl);
-    });
+        // The main top-level service is also pinged to unblock render.
+        yield getServicePromise(win, 'service1');
+      });
 
-    it('should ignore boilerplate style', () => {
-      const styleEl = win.document.createElement('style');
-      styleEl.setAttribute('amp-boilerplate', '');
-      importDoc.head.appendChild(styleEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const shadowRoot = getShadowRoot(hostElement);
-      expect(shadowRoot.querySelector('style[amp-boilerplate]')).to.not.exist;
-    });
+      it('should register doc-service factory and install', function*() {
+        let count = 0;
+        function factory() {
+          count++;
+          return {str: 'A'};
+        }
+        const ampdoc = new AmpDocSingle(win);
+        ampdoc.declareExtension('amp-ext');
+        ampdocServiceMock
+          .expects('getAmpDoc')
+          .returns(ampdoc)
+          .atLeast(1);
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerServiceForDoc('service1', factory);
+          },
+        });
+        runChunksForTesting(win.document);
 
-    it('should import custom style', () => {
-      const styleEl = win.document.createElement('style');
-      styleEl.setAttribute('amp-custom', '');
-      styleEl.textContent = '.custom{}';
-      importDoc.head.appendChild(styleEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const shadowRoot = getShadowRoot(hostElement);
-      expect(shadowRoot.querySelector('style[amp-custom]')).to.exist;
-      expect(shadowRoot.querySelector('style[amp-custom]').textContent)
-          .to.contain('.custom');
-    });
+        // No factories
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const extHolder = extensions.extensions_['amp-ext'];
+        expect(extHolder.docFactories).to.have.length(1);
 
-    it('should import keyframes style', () => {
-      const styleEl = win.document.createElement('style');
-      styleEl.setAttribute('amp-keyframes', '');
-      styleEl.textContent = '.keyframes{}';
-      importDoc.head.appendChild(styleEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const shadowRoot = getShadowRoot(hostElement);
-      expect(shadowRoot.querySelector('style[amp-custom]')).to.not.exist;
-      expect(shadowRoot.querySelector('style[amp-keyframes]')).to.exist;
-      expect(shadowRoot.querySelector('style[amp-keyframes]').textContent)
-          .to.contain('.keyframes');
+        // Already installed.
+        expect(count).to.equal(1);
+        expect(getServiceForDoc(ampdoc, 'service1')).to.deep.equal({str: 'A'});
+      });
     });
 
-    it('should ignore runtime extension', () => {
-      extensionsMock.expects('preloadExtension').never();
+    describe('shadow-mode', () => {
+      let extensions;
 
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('src', 'https://cdn.ampproject.org/v0.js');
-      importDoc.head.appendChild(scriptEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-    });
+      beforeEach(() => {
+        const promise = adoptShadowMode(win);
+        ext.installExtensionsService(win);
+        extensions = Services.extensionsFor(win);
+        return promise;
+      });
 
-    it('should ignore unknown script', () => {
-      extensionsMock.expects('preloadExtension').never();
+      it('should export properties to global AMP object', () => {
+        expect(win.AMP.BaseElement).to.be.a('function');
+        expect(win.AMP.BaseTemplate).to.be.a('function');
+        expect(win.AMP.registerElement).to.be.a('function');
+        expect(win.AMP.registerTemplate).to.be.a('function');
+        expect(win.AMP.setTickFunction).to.be.a('function');
+        expect(win.AMP.win).to.equal(win);
 
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('data-id', 'unknown1');
-      scriptEl.setAttribute('src', 'https://cdn.ampproject.org/other.js');
-      importDoc.head.appendChild(scriptEl);
-      allowConsoleError(() => {
-        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      });
-      expect(getShadowRoot(hostElement)
-          .querySelector('script[data-id="unknown1"]')).to.not.exist;
-      expect(win.document.querySelector('script[data-id="unknown1"]'))
-          .to.not.exist;
-    });
+        expect(win.AMP.attachShadowDoc).to.be.a('function');
+        expect(win.AMP.attachShadowDocAsStream).to.be.a('function');
 
-    it('should import extension element', () => {
-      extensionsMock.expects('preloadExtension')
-          .withExactArgs('amp-ext1', '0.1')
-          .returns(Promise.resolve({
-            elements: {
-              'amp-ext1': function() {},
-            },
-          }))
-          .once();
+        expect(win.AMP.viewer).to.not.exist;
+        expect(win.AMP.viewport).to.not.exist;
+      });
 
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('custom-element', 'amp-ext1');
-      scriptEl.setAttribute('src', '');
-      importDoc.head.appendChild(scriptEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(win.document.querySelector('script[custom-element="amp-ext1"]'))
-          .to.not.exist;
-    });
+      it('should register element without CSS', function*() {
+        const servicePromise = getServicePromise(win, 'amp-ext');
+        const installStylesStub = sandbox.stub(styles, 'installStylesForDoc');
 
-    it('should import extension element with version ≠ 0.1', () => {
-      extensionsMock.expects('preloadExtension')
-          .withExactArgs('amp-ext1', '1.0')
-          .returns(Promise.resolve({
-            elements: {
-              'amp-ext1': function() { },
-            },
-          }))
-          .once();
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerElement('amp-ext', win.AMP.BaseElement);
+          },
+        });
+        runChunksForTesting(win.document);
+
+        // Extension is added immediately. Can't find for micro-tasks here.
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const extHolder = extensions.extensions_['amp-ext'];
+        const ext = extHolder.extension;
+        expect(ext.elements['amp-ext']).exist;
+        expect(ext.elements['amp-ext'].implementationClass).to.equal(
+          win.AMP.BaseElement
+        );
+
+        // No installStyles calls and no factories.
+        expect(installStylesStub).to.not.be.called;
+        expect(extHolder.docFactories).to.have.length(1);
+        expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
+
+        // Execute factory to install style.
+        const shadowRoot = document.createDocumentFragment();
+        const ampdoc = new AmpDocShadow(win, 'https://acme.org/', shadowRoot);
+        extHolder.docFactories[0](ampdoc);
+        expect(installStylesStub).to.not.be.called;
+        expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
+
+        // Service and extensions are resolved.
+        yield Promise.all([
+          extensions.waitForExtension(win, 'amp-ext'),
+          servicePromise,
+        ]);
+      });
 
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('custom-element', 'amp-ext1');
-      scriptEl.setAttribute('src', 'https://cdn.ampproject.org/v0/amp-ext1-1.0.js');
-      importDoc.head.appendChild(scriptEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(win.document.querySelector('script[custom-element="amp-ext1"]'))
-          .to.not.exist;
-    });
+      it('should register element with CSS', function*() {
+        const servicePromise = getServicePromise(win, 'amp-ext');
+        let installStylesCallback;
+        const installStylesStub = sandbox
+          .stub(styles, 'installStylesForDoc')
+          .callsFake((doc, cssText, cb) => {
+            installStylesCallback = cb;
+          });
 
-    it('should import extension template', () => {
-      extensionsMock.expects('preloadExtension')
-          .withExactArgs('amp-ext1', '0.1')
-          .returns(Promise.resolve({elements: {}}))
-          .once();
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerElement('amp-ext', win.AMP.BaseElement, 'a{}');
+          },
+        });
+        runChunksForTesting(win.document);
+
+        // Extension is added immediately. Can't find for micro-tasks here.
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const extHolder = extensions.extensions_['amp-ext'];
+        const ext = extHolder.extension;
+        expect(ext.elements['amp-ext']).exist;
+        expect(ext.elements['amp-ext'].implementationClass).to.equal(
+          win.AMP.BaseElement
+        );
+        expect(ext.elements['amp-ext'].css).to.equal('a{}');
+        // No installations yet, but there's a factory.
+        expect(extHolder.docFactories).to.have.length(1);
+        expect(win.ampExtendedElements['amp-ext']).to.be.undefined;
+        expect(installStylesStub).to.have.not.been.called;
+
+        // Execute factory to install style.
+        const shadowRoot = document.createDocumentFragment();
+        const ampdoc = new AmpDocShadow(win, 'https://acme.org/', shadowRoot);
+        extHolder.docFactories[0](ampdoc);
+        expect(installStylesStub).to.be.calledOnce;
+        expect(installStylesStub).to.be.calledWithExactly(
+          ampdoc,
+          'a{}',
+          installStylesCallback,
+          /* isRuntimeCss */ false,
+          /* ext */ 'amp-ext'
+        );
+
+        // Run install.
+        installStylesCallback();
+        expect(win.ampExtendedElements['amp-ext']).to.equal(AMP.BaseElement);
+
+        // Service and extensions are resolved.
+        yield Promise.all([
+          extensions.waitForExtension(win, 'amp-ext'),
+          servicePromise,
+        ]);
+      });
 
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('custom-template', 'amp-ext1');
-      scriptEl.setAttribute('src', '');
-      importDoc.head.appendChild(scriptEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(win.document.querySelector('script[custom-template="amp-ext1"]'))
-          .to.not.exist;
-    });
+      it('should register doc-service as ctor and defer install', function*() {
+        class Service1 {}
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerServiceForDoc('service1', Service1);
+          },
+        });
+        runChunksForTesting(win.document);
 
-    it('should import inline script', () => {
-      const scriptEl = win.document.createElement('script');
-      scriptEl.setAttribute('type', 'application/json');
-      scriptEl.setAttribute('data-id', 'test1');
-      scriptEl.textContent = '{}';
-      importDoc.head.appendChild(scriptEl);
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      expect(getShadowRoot(hostElement)
-          .querySelector('script[data-id="test1"]')).to.exist;
-      expect(getShadowRoot(hostElement).querySelector(
-          'script[data-id="test1"]').textContent).to.equal('{}');
-    });
+        // Factory recorded.
+        yield extensions.waitForExtension(win, 'amp-ext');
+        const extHolder = extensions.extensions_['amp-ext'];
+        expect(extHolder.docFactories).to.have.length(1);
 
-    it('should ignore inline script if javascript', () => {
-      const scriptEl1 = win.document.createElement('script');
-      scriptEl1.setAttribute('type', 'application/javascript');
-      scriptEl1.setAttribute('data-id', 'test1');
-      importDoc.head.appendChild(scriptEl1);
-      const scriptEl2 = win.document.createElement('script');
-      scriptEl2.setAttribute('data-id', 'test1');
-      importDoc.head.appendChild(scriptEl2);
-      allowConsoleError(() => {
-        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      });
-      expect(getShadowRoot(hostElement)
-          .querySelector('script[data-id="test1"]')).to.not.exist;
-    });
+        const shadowRoot = document.createDocumentFragment();
+        const ampdoc = new AmpDocShadow(win, 'https://a.org/', shadowRoot);
 
-    it('should start as visible by default', () => {
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(viewer.getVisibilityState()).to.equal('visible');
-    });
+        // Not installed.
+        expect(getServicePromiseOrNullForDoc(ampdoc, 'service1')).to.be.null;
 
-    it('should start as prerender when requested', () => {
-      win.AMP.attachShadowDoc(hostElement, importDoc, docUrl, {
-        'visibilityState': 'prerender',
+        // Install.
+        extHolder.docFactories[0](ampdoc);
+        expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(Service1);
       });
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(viewer.getVisibilityState()).to.equal('prerender');
     });
+  }
+);
+
+describes.realWin(
+  'runtime multidoc',
+  {
+    amp: {ampdoc: 'multi'},
+  },
+  env => {
+    let win;
+    let extensions;
+    let extensionsMock;
+    let ampdocServiceMock;
 
-    it('should expose visibility method', () => {
-      const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(amp.setVisibilityState).to.be.a('function');
-      expect(viewer.getVisibilityState()).to.equal('visible');
-
-      amp.setVisibilityState('inactive');
-      expect(viewer.getVisibilityState()).to.equal('inactive');
+    beforeEach(() => {
+      win = env.win;
+      extensions = env.extensions;
+      extensionsMock = sandbox.mock(extensions);
+      ampdocServiceMock = sandbox.mock(env.ampdocService);
     });
 
-    it('should expose close method and dispose services', () => {
-      const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(amp.close).to.be.a('function');
-      expect(viewer.getVisibilityState()).to.equal('visible');
-
-      viewer.dispose = sandbox.spy();
-      amp.close();
-      expect(viewer.getVisibilityState()).to.equal('inactive');
-      expect(viewer.dispose).to.be.calledOnce;
+    afterEach(() => {
+      extensionsMock.verify();
+      ampdocServiceMock.verify();
     });
-  });
 
+    describe('attachShadowDoc', () => {
+      const docUrl = 'https://example.org/doc1';
 
-  describe('attachShadowDocAsStream', () => {
-    const docUrl = 'https://example.org/doc1';
+      let clock;
+      let importDoc;
+      let hostElement;
+      let ampdoc;
 
-    let hostElement;
-    let ampdoc;
-    let shadowDoc;
-    let writer;
+      beforeEach(() => {
+        deactivateChunking();
+        clock = sandbox.useFakeTimers();
+        hostElement = win.document.createElement('div');
+        importDoc = win.document.implementation.createHTMLDocument('');
+        importDoc.body.appendChild(win.document.createElement('child'));
+        const shadowRoot = createShadowRoot(hostElement);
+        ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
 
-    beforeEach(() => {
-      deactivateChunking();
-      hostElement = win.document.createElement('div');
-      const shadowRoot = createShadowRoot(hostElement);
-      ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
-
-      ampdocServiceMock.expects('installShadowDoc')
+        ampdocServiceMock
+          .expects('installShadowDoc')
           .withExactArgs(
-              docUrl,
-              sinon.match(arg => arg == getShadowRoot(hostElement)))
+            docUrl,
+            sinon.match(arg => arg == getShadowRoot(hostElement))
+          )
           .returns(ampdoc)
           .atLeast(0);
-      ampdocServiceMock.expects('getAmpDoc')
+        ampdocServiceMock
+          .expects('getAmpDoc')
           .withExactArgs(sinon.match(arg => arg == getShadowRoot(hostElement)))
           .returns(ampdoc)
           .atLeast(0);
-    });
+      });
 
-    it('should install services and styles', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
+      it('should install services and styles', () => {
+        const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(ret).to.exist;
 
-      const shadowRoot = getShadowRoot(hostElement);
+        const shadowRoot = getShadowRoot(hostElement);
 
-      // URL is set.
-      expect(shadowRoot.AMP.url).to.equal(docUrl);
+        // URL is set.
+        expect(shadowRoot.AMP.url).to.equal(docUrl);
 
-      // Stylesheet has been installed.
-      expect(shadowRoot.querySelector('style[amp-runtime]')).to.exist;
+        // Stylesheet has been installed.
+        expect(shadowRoot.querySelector('style[amp-runtime]')).to.exist;
 
-      // Doc services have been installed.
-      expect(ampdoc.services.action).to.exist;
-      expect(ampdoc.services.action.obj).to.exist;
-      expect(ampdoc.services.viewer).to.exist;
-      expect(ampdoc.services.viewer.obj).to.exist;
+        // Doc services have been installed.
+        expect(ampdoc.services.action).to.exist;
+        expect(ampdoc.services.action.obj).to.exist;
+        expect(ampdoc.services.viewer).to.exist;
+        expect(ampdoc.services.viewer.obj).to.exist;
 
-      // Single-doc bidings have been installed.
-      expect(shadowDoc.ampdoc).to.equal(ampdoc);
-      expect(shadowDoc.viewer).to.not.exist;
-    });
+        // Single-doc bidings have been installed.
+        expect(ret.ampdoc).to.equal(ampdoc);
+        expect(ret.viewer).to.not.exist;
+      });
 
-    it('should install doc services', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
+      it('should install doc services', () => {
+        class Service1 {}
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerServiceForDoc('service1', Service1);
+          },
+        });
 
-      class Service1 {}
-      win.AMP.push({
-        n: 'amp-ext',
-        f: amp => {
-          amp.registerServiceForDoc('service1', Service1);
-        },
-      });
+        const script = win.document.createElement('script');
+        script.setAttribute('custom-element', 'amp-ext');
+        script.setAttribute('src', '');
+        importDoc.head.appendChild(script);
 
-      writer.write('<script custom-element="amp-ext" src=""></script>');
-      writer.write('<body>');
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
 
-      return ampdoc.whenBodyAvailable().then(() => {
         return extensions.waitForExtension(win, 'amp-ext').then(() => {
           // Factories have been applied.
-          expect(getServiceForDoc(ampdoc, 'service1'))
-              .to.be.instanceOf(Service1);
+          expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(
+            Service1
+          );
         });
       });
-    });
 
-    it('should pass init parameters to viewer', () => {
-      win.AMP.attachShadowDocAsStream(hostElement, docUrl, {
-        'test1': '12',
-      });
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      expect(viewer.getParam('test1')).to.equal('12');
-    });
+      it('should pass init parameters to viewer', () => {
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl, {
+          'test1': '12',
+        });
 
-    it('should update host visibility', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
+        const viewer = getServiceForDoc(ampdoc, 'viewer');
+        expect(viewer.getParam('test1')).to.equal('12');
+      });
 
-      writer.write('<body><div>');
+      it('should update host visibility', () => {
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
 
-      // Document is invisible at first.
-      expect(hostElement.style.visibility).to.equal('hidden');
+        // Document is invisible at first.
+        expect(hostElement.style.visibility).to.equal('hidden');
 
-      return ampdoc.whenBodyAvailable().then(() => {
         // After timeout the doc rendered is started.
-        expect(hostElement.style.visibility).to.equal('hidden');
-        return ampdoc.signals().whenSignal('render-start');
-      }).then(() => {
+        clock.tick(3000);
         expect(hostElement.style.visibility).to.equal('visible');
+        expect(ampdoc.signals().get('render-start')).to.be.ok;
+
+        return ampdoc.whenReady().then(() => {
+          expect(ampdoc.isReady()).to.be.true;
+        });
       });
-    });
 
-    it('should import body', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<body><child>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should import body', () => {
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const shadowRoot = getShadowRoot(hostElement);
-        const body = shadowRoot.querySelector('body') ||
-            shadowRoot.querySelector('amp-body');
+        const body =
+          shadowRoot.querySelector('body') ||
+          shadowRoot.querySelector('amp-body');
         expect(body).to.exist;
         expect(body).to.have.class('amp-shadow');
         expect(body.style.position).to.equal('relative');
-        env.flushVsync();
         expect(body.querySelector('child')).to.exist;
         expect(ampdoc.getBody()).to.exist;
       });
-    });
-
-    it('should mark doc as ready', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<body><child>');
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(ampdoc.isReady()).to.be.false;
-        writer.write('</child></body>');
-        writer.write('</html>');
-        writer.close();
-        return ampdoc.whenReady().then(() => {
-          expect(ampdoc.isReady()).to.be.true;
-        });
-      });
-    });
 
-    it('should read title element', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<title>test title</title><body>');
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(shadowDoc.title).to.equal('test title');
+      it('should read title element', () => {
+        const titleEl = win.document.createElement('title');
+        titleEl.textContent = 'test title';
+        importDoc.head.appendChild(titleEl);
+        const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(ret.title).to.equal('test title');
         expect(getShadowRoot(hostElement).AMP.title).to.equal('test title');
       });
-    });
 
-    it('should read canonical element', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write(
-          '<link rel="canonical" href="http://example.org/canonical"><body>');
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(shadowDoc.canonicalUrl).to.equal('http://example.org/canonical');
+      it('should read canonical element', () => {
+        const canonicalEl = win.document.createElement('link');
+        canonicalEl.setAttribute('rel', 'canonical');
+        canonicalEl.setAttribute('href', 'http://example.org/canonical');
+        importDoc.head.appendChild(canonicalEl);
+        const ret = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(ret.canonicalUrl).to.equal('http://example.org/canonical');
       });
-    });
 
-    it('should import fonts', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-
-      writer.write(
-          '<link rel="stylesheet" href="http://example.org/font1"><body>');
-      writer.write(
-          '<link rel="stylesheet" href="http://example.org/font2"><body>');
-      const fontEl2 = win.document.createElement('link');
-      fontEl2.setAttribute('rel', 'stylesheet');
-      fontEl2.setAttribute('href', 'http://example.org/font2');
-      win.document.head.appendChild(fontEl2);
-
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(win.document.querySelector(
-            'link[href="http://example.org/font1"]')).to.exist;
+      it('should import fonts', () => {
+        const fontEl1 = win.document.createElement('link');
+        fontEl1.setAttribute('rel', 'stylesheet');
+        fontEl1.setAttribute('href', 'http://example.org/font1');
+        importDoc.head.appendChild(fontEl1);
+        const fontEl2 = win.document.createElement('link');
+        fontEl2.setAttribute('rel', 'stylesheet');
+        fontEl2.setAttribute('href', 'http://example.org/font2');
+        importDoc.head.appendChild(fontEl2);
+        win.document.head.appendChild(fontEl2.cloneNode(true));
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(
+          win.document.querySelector('link[href="http://example.org/font1"]')
+        ).to.exist;
         // Duplicates are ignored.
-        expect(win.document.querySelectorAll(
-            'link[href="http://example.org/font2"]')).to.have.length(1);
+        expect(
+          win.document.querySelectorAll('link[href="http://example.org/font2"]')
+        ).to.have.length(1);
 
         const fontEl = win.document.querySelector(
-            'link[href="http://example.org/font1"]');
+          'link[href="http://example.org/font1"]'
+        );
         expect(fontEl.getAttribute('type')).to.equal('text/css');
         expect(fontEl.getAttribute('rel')).to.equal('stylesheet');
         fontEl.parentElement.removeChild(fontEl);
       });
-    });
 
-    it('should ignore boilerplate style', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<style amp-boilerplate></style><body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should ignore boilerplate style', () => {
+        const styleEl = win.document.createElement('style');
+        styleEl.setAttribute('amp-boilerplate', '');
+        importDoc.head.appendChild(styleEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const shadowRoot = getShadowRoot(hostElement);
         expect(shadowRoot.querySelector('style[amp-boilerplate]')).to.not.exist;
       });
-    });
 
-    it('should import custom style', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<style amp-custom>.custom{}</style><body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should import custom style', () => {
+        const styleEl = win.document.createElement('style');
+        styleEl.setAttribute('amp-custom', '');
+        styleEl.textContent = '.custom{}';
+        importDoc.head.appendChild(styleEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const shadowRoot = getShadowRoot(hostElement);
         expect(shadowRoot.querySelector('style[amp-custom]')).to.exist;
-        expect(shadowRoot.querySelector('style[amp-custom]').textContent)
-            .to.contain('.custom');
+        expect(
+          shadowRoot.querySelector('style[amp-custom]').textContent
+        ).to.contain('.custom');
       });
-    });
 
-    it('should ignore runtime extension', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      extensionsMock.expects('preloadExtension').never();
-      writer.write(
-          '<script src="https://cdn.ampproject.org/v0.js"></script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable();
-    });
+      it('should import keyframes style', () => {
+        const styleEl = win.document.createElement('style');
+        styleEl.setAttribute('amp-keyframes', '');
+        styleEl.textContent = '.keyframes{}';
+        importDoc.head.appendChild(styleEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        const shadowRoot = getShadowRoot(hostElement);
+        expect(shadowRoot.querySelector('style[amp-custom]')).to.not.exist;
+        expect(shadowRoot.querySelector('style[amp-keyframes]')).to.exist;
+        expect(
+          shadowRoot.querySelector('style[amp-keyframes]').textContent
+        ).to.contain('.keyframes');
+      });
 
-    it('should ignore unknown script', () => {
-      expectAsyncConsoleError(
-          '[runtime] - unknown script:  [object HTMLScriptElement] ' +
-          'https://cdn.ampproject.org/other.js');
+      it('should ignore runtime extension', () => {
+        extensionsMock.expects('preloadExtension').never();
 
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      extensionsMock.expects('preloadExtension').never();
-      writer.write(
-          '<script data-id="unknown1"' +
-          ' src="https://cdn.ampproject.org/other.js"></script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(getShadowRoot(hostElement)
-            .querySelector('script[data-id="unknown1"]')).to.not.exist;
-        expect(win.document.querySelector('script[data-id="unknown1"]'))
-            .to.not.exist;
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('src', 'https://cdn.ampproject.org/v0.js');
+        importDoc.head.appendChild(scriptEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+      });
+
+      it('should ignore unknown script', () => {
+        extensionsMock.expects('preloadExtension').never();
+
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('data-id', 'unknown1');
+        scriptEl.setAttribute('src', 'https://cdn.ampproject.org/other.js');
+        importDoc.head.appendChild(scriptEl);
+        allowConsoleError(() => {
+          win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        });
+        expect(
+          getShadowRoot(hostElement).querySelector('script[data-id="unknown1"]')
+        ).to.not.exist;
+        expect(win.document.querySelector('script[data-id="unknown1"]')).to.not
+          .exist;
       });
-    });
 
-    it('should import extension element', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      extensionsMock.expects('preloadExtension')
+      it('should import extension element', () => {
+        extensionsMock
+          .expects('preloadExtension')
           .withExactArgs('amp-ext1', '0.1')
-          .returns(Promise.resolve({
-            elements: {
-              'amp-ext1': function() {},
-            },
-          }))
+          .returns(
+            Promise.resolve({
+              elements: {
+                'amp-ext1': function() {},
+              },
+            })
+          )
           .once();
-      writer.write(
-          '<script custom-element="amp-ext1" src=""></script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('custom-element', 'amp-ext1');
+        scriptEl.setAttribute('src', '');
+        importDoc.head.appendChild(scriptEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         expect(win.document.querySelector('script[custom-element="amp-ext1"]'))
-            .to.not.exist;
+          .to.not.exist;
+      });
+
+      it('should import extension element with version ≠ 0.1', () => {
+        extensionsMock
+          .expects('preloadExtension')
+          .withExactArgs('amp-ext1', '1.0')
+          .returns(
+            Promise.resolve({
+              elements: {
+                'amp-ext1': function() {},
+              },
+            })
+          )
+          .once();
+
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('custom-element', 'amp-ext1');
+        scriptEl.setAttribute(
+          'src',
+          'https://cdn.ampproject.org/v0/amp-ext1-1.0.js'
+        );
+        importDoc.head.appendChild(scriptEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(win.document.querySelector('script[custom-element="amp-ext1"]'))
+          .to.not.exist;
       });
-    });
 
-    it('should import extension template', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      extensionsMock.expects('preloadExtension')
+      it('should import extension template', () => {
+        extensionsMock
+          .expects('preloadExtension')
           .withExactArgs('amp-ext1', '0.1')
           .returns(Promise.resolve({elements: {}}))
           .once();
-      writer.write(
-          '<script custom-template="amp-ext1" src=""></script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('custom-template', 'amp-ext1');
+        scriptEl.setAttribute('src', '');
+        importDoc.head.appendChild(scriptEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         expect(win.document.querySelector('script[custom-template="amp-ext1"]'))
-            .to.not.exist;
+          .to.not.exist;
       });
-    });
 
-    it('should import inline script', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write(
-          '<script type="application/json" data-id="test1">{}</script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
-        expect(getShadowRoot(hostElement)
-            .querySelector('script[data-id="test1"]')).to.exist;
-        expect(getShadowRoot(hostElement).querySelector(
-            'script[data-id="test1"]').textContent).to.equal('{}');
+      it('should import inline script', () => {
+        const scriptEl = win.document.createElement('script');
+        scriptEl.setAttribute('type', 'application/json');
+        scriptEl.setAttribute('data-id', 'test1');
+        scriptEl.textContent = '{}';
+        importDoc.head.appendChild(scriptEl);
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        expect(
+          getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+        ).to.exist;
+        expect(
+          getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+            .textContent
+        ).to.equal('{}');
       });
-    });
 
-    it('should ignore inline script if javascript', () => {
-      expectAsyncConsoleError(
-          '[runtime] - unallowed inline javascript:  ' +
-          '[object HTMLScriptElement]', 2);
-
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write(
-          '<script type="application/javascript" data-id="test1"></script>');
-      writer.write(
-          '<script data-id="test1"></script>');
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable(() => {
-        expect(getShadowRoot(hostElement)
-            .querySelector('script[data-id="test1"]')).to.not.exist;
+      it('should ignore inline script if javascript', () => {
+        const scriptEl1 = win.document.createElement('script');
+        scriptEl1.setAttribute('type', 'application/javascript');
+        scriptEl1.setAttribute('data-id', 'test1');
+        importDoc.head.appendChild(scriptEl1);
+        const scriptEl2 = win.document.createElement('script');
+        scriptEl2.setAttribute('data-id', 'test1');
+        importDoc.head.appendChild(scriptEl2);
+        allowConsoleError(() => {
+          win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+        });
+        expect(
+          getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+        ).to.not.exist;
       });
-    });
 
-    it('should start as visible by default', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should start as visible by default', () => {
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const viewer = getServiceForDoc(ampdoc, 'viewer');
         expect(viewer.getVisibilityState()).to.equal('visible');
       });
-    });
 
-    it('should start as prerender when requested', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl, {
-        'visibilityState': 'prerender',
-      });
-      writer = shadowDoc.writer;
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should start as prerender when requested', () => {
+        win.AMP.attachShadowDoc(hostElement, importDoc, docUrl, {
+          'visibilityState': 'prerender',
+        });
         const viewer = getServiceForDoc(ampdoc, 'viewer');
         expect(viewer.getVisibilityState()).to.equal('prerender');
       });
-    });
 
-    it('should expose visibility method', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should expose visibility method', () => {
+        const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const viewer = getServiceForDoc(ampdoc, 'viewer');
-        expect(shadowDoc.setVisibilityState).to.be.a('function');
+        expect(amp.setVisibilityState).to.be.a('function');
         expect(viewer.getVisibilityState()).to.equal('visible');
 
-        shadowDoc.setVisibilityState('inactive');
+        amp.setVisibilityState('inactive');
         expect(viewer.getVisibilityState()).to.equal('inactive');
       });
-    });
 
-    it('should expose close method and dispose services', () => {
-      shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
-      writer = shadowDoc.writer;
-      writer.write('<body>');
-      return ampdoc.whenBodyAvailable().then(() => {
+      it('should expose close method and dispose services', () => {
+        const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
         const viewer = getServiceForDoc(ampdoc, 'viewer');
-        expect(shadowDoc.close).to.be.a('function');
+        expect(amp.close).to.be.a('function');
         expect(viewer.getVisibilityState()).to.equal('visible');
 
         viewer.dispose = sandbox.spy();
-        shadowDoc.close();
+        amp.close();
         expect(viewer.getVisibilityState()).to.equal('inactive');
         expect(viewer.dispose).to.be.calledOnce;
       });
     });
-  });
-
-
-  describes.repeated('messaging', {
-    'document.contains is the browser implementation': false,
-    'document.contains is a stubbed implementation': true,
-  }, (name, isStubbedDocumentContains) => {
-    let doc1, doc2, doc3;
 
-    beforeEach(() => {
-      if (isStubbedDocumentContains) {
-        // Some browsers implement document.contains wrong, and it returns
-        // `false` even when this is incorrect. Repeat these tests with the
-        // faulty implementation.
-        sandbox.stub(win.document, 'contains').returns(false);
-      }
+    describe('attachShadowDocAsStream', () => {
+      const docUrl = 'https://example.org/doc1';
 
-      doc1 = attach('https://example.org/doc1');
-      doc2 = attach('https://example.org/doc2');
-      doc3 = attach('https://example.org/doc3');
-    });
+      let hostElement;
+      let ampdoc;
+      let shadowDoc;
+      let writer;
 
-    function attach(docUrl) {
-      const hostElement = win.document.createElement('div');
-      win.document.body.appendChild(hostElement);
-      const importDoc = win.document.implementation.createHTMLDocument('');
-      const shadowRoot = createShadowRoot(hostElement);
-      const ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
+      beforeEach(() => {
+        deactivateChunking();
+        hostElement = win.document.createElement('div');
+        const shadowRoot = createShadowRoot(hostElement);
+        ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
 
-      ampdocServiceMock.expects('installShadowDoc')
+        ampdocServiceMock
+          .expects('installShadowDoc')
           .withExactArgs(
-              docUrl,
-              sinon.match(arg => arg == getShadowRoot(hostElement)))
+            docUrl,
+            sinon.match(arg => arg == getShadowRoot(hostElement))
+          )
           .returns(ampdoc)
           .atLeast(0);
-      ampdocServiceMock.expects('getAmpDoc')
+        ampdocServiceMock
+          .expects('getAmpDoc')
           .withExactArgs(sinon.match(arg => arg == getShadowRoot(hostElement)))
           .returns(ampdoc)
           .atLeast(0);
+      });
 
-      const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
-      const viewer = getServiceForDoc(ampdoc, 'viewer');
-      const broadcastReceived = sandbox.spy();
-      viewer.onBroadcast(broadcastReceived);
-      const onMessage = sandbox.stub();
-      amp.onMessage(function(eventType, data) {
-        if (eventType == 'ignore') {
-          return Promise.resolve();
-        }
-        return onMessage(eventType, data);
+      it('should install services and styles', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+
+        const shadowRoot = getShadowRoot(hostElement);
+
+        // URL is set.
+        expect(shadowRoot.AMP.url).to.equal(docUrl);
+
+        // Stylesheet has been installed.
+        expect(shadowRoot.querySelector('style[amp-runtime]')).to.exist;
+
+        // Doc services have been installed.
+        expect(ampdoc.services.action).to.exist;
+        expect(ampdoc.services.action.obj).to.exist;
+        expect(ampdoc.services.viewer).to.exist;
+        expect(ampdoc.services.viewer.obj).to.exist;
+
+        // Single-doc bidings have been installed.
+        expect(shadowDoc.ampdoc).to.equal(ampdoc);
+        expect(shadowDoc.viewer).to.not.exist;
       });
-      return {hostElement, amp, ampdoc, viewer, broadcastReceived, onMessage};
-    }
 
-    it('should broadcast to all but sender', () => {
-      doc1.viewer.broadcast({test: 1});
-      return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
-        // Sender is not called.
-        expect(doc1.broadcastReceived).to.not.be.called;
+      it('should install doc services', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+
+        class Service1 {}
+        win.AMP.push({
+          n: 'amp-ext',
+          f: amp => {
+            amp.registerServiceForDoc('service1', Service1);
+          },
+        });
 
-        // All others are called.
-        expect(doc2.broadcastReceived).to.be.calledOnce;
-        expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
-        expect(doc3.broadcastReceived).to.be.calledOnce;
-        expect(doc3.broadcastReceived.args[0][0]).deep.equal({test: 1});
+        writer.write('<script custom-element="amp-ext" src=""></script>');
+        writer.write('<body>');
 
-        // None of the onMessage are called.
-        expect(doc1.onMessage).to.not.be.called;
-        expect(doc2.onMessage).to.not.be.called;
-        expect(doc3.onMessage).to.not.be.called;
+        return ampdoc.whenBodyAvailable().then(() => {
+          return extensions.waitForExtension(win, 'amp-ext').then(() => {
+            // Factories have been applied.
+            expect(getServiceForDoc(ampdoc, 'service1')).to.be.instanceOf(
+              Service1
+            );
+          });
+        });
       });
-    });
 
-    it('should stop broadcasting after close', () => {
-      doc3.amp.close();
-      doc1.viewer.broadcast({test: 1});
-      return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
-        // Sender is not called, closed is not called.
-        expect(doc1.broadcastReceived).to.not.be.called;
-        expect(doc3.broadcastReceived).to.not.be.called;
+      it('should pass init parameters to viewer', () => {
+        win.AMP.attachShadowDocAsStream(hostElement, docUrl, {
+          'test1': '12',
+        });
+        const viewer = getServiceForDoc(ampdoc, 'viewer');
+        expect(viewer.getParam('test1')).to.equal('12');
+      });
+
+      it('should update host visibility', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+
+        writer.write('<body><div>');
 
-        // All others are called.
-        expect(doc2.broadcastReceived).to.be.calledOnce;
-        expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+        // Document is invisible at first.
+        expect(hostElement.style.visibility).to.equal('hidden');
+
+        return ampdoc
+          .whenBodyAvailable()
+          .then(() => {
+            // After timeout the doc rendered is started.
+            expect(hostElement.style.visibility).to.equal('hidden');
+            return ampdoc.signals().whenSignal('render-start');
+          })
+          .then(() => {
+            expect(hostElement.style.visibility).to.equal('visible');
+          });
+      });
+
+      it('should import body', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<body><child>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const shadowRoot = getShadowRoot(hostElement);
+          const body =
+            shadowRoot.querySelector('body') ||
+            shadowRoot.querySelector('amp-body');
+          expect(body).to.exist;
+          expect(body).to.have.class('amp-shadow');
+          expect(body.style.position).to.equal('relative');
+          env.flushVsync();
+          expect(body.querySelector('child')).to.exist;
+          expect(ampdoc.getBody()).to.exist;
+        });
+      });
+
+      it('should mark doc as ready', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<body><child>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(ampdoc.isReady()).to.be.false;
+          writer.write('</child></body>');
+          writer.write('</html>');
+          writer.close();
+          return ampdoc.whenReady().then(() => {
+            expect(ampdoc.isReady()).to.be.true;
+          });
+        });
+      });
+
+      it('should read title element', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<title>test title</title><body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(shadowDoc.title).to.equal('test title');
+          expect(getShadowRoot(hostElement).AMP.title).to.equal('test title');
+        });
+      });
+
+      it('should read canonical element', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write(
+          '<link rel="canonical" href="http://example.org/canonical"><body>'
+        );
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(shadowDoc.canonicalUrl).to.equal(
+            'http://example.org/canonical'
+          );
+        });
+      });
+
+      it('should import fonts', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+
+        writer.write(
+          '<link rel="stylesheet" href="http://example.org/font1"><body>'
+        );
+        writer.write(
+          '<link rel="stylesheet" href="http://example.org/font2"><body>'
+        );
+        const fontEl2 = win.document.createElement('link');
+        fontEl2.setAttribute('rel', 'stylesheet');
+        fontEl2.setAttribute('href', 'http://example.org/font2');
+        win.document.head.appendChild(fontEl2);
+
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(
+            win.document.querySelector('link[href="http://example.org/font1"]')
+          ).to.exist;
+          // Duplicates are ignored.
+          expect(
+            win.document.querySelectorAll(
+              'link[href="http://example.org/font2"]'
+            )
+          ).to.have.length(1);
+
+          const fontEl = win.document.querySelector(
+            'link[href="http://example.org/font1"]'
+          );
+          expect(fontEl.getAttribute('type')).to.equal('text/css');
+          expect(fontEl.getAttribute('rel')).to.equal('stylesheet');
+          fontEl.parentElement.removeChild(fontEl);
+        });
+      });
+
+      it('should ignore boilerplate style', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<style amp-boilerplate></style><body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const shadowRoot = getShadowRoot(hostElement);
+          expect(shadowRoot.querySelector('style[amp-boilerplate]')).to.not
+            .exist;
+        });
+      });
+
+      it('should import custom style', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<style amp-custom>.custom{}</style><body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const shadowRoot = getShadowRoot(hostElement);
+          expect(shadowRoot.querySelector('style[amp-custom]')).to.exist;
+          expect(
+            shadowRoot.querySelector('style[amp-custom]').textContent
+          ).to.contain('.custom');
+        });
+      });
+
+      it('should ignore runtime extension', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        extensionsMock.expects('preloadExtension').never();
+        writer.write(
+          '<script src="https://cdn.ampproject.org/v0.js"></script>'
+        );
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable();
+      });
+
+      it('should ignore unknown script', () => {
+        expectAsyncConsoleError(
+          '[runtime] - unknown script:  [object HTMLScriptElement] ' +
+            'https://cdn.ampproject.org/other.js'
+        );
+
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        extensionsMock.expects('preloadExtension').never();
+        writer.write(
+          '<script data-id="unknown1"' +
+            ' src="https://cdn.ampproject.org/other.js"></script>'
+        );
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(
+            getShadowRoot(hostElement).querySelector(
+              'script[data-id="unknown1"]'
+            )
+          ).to.not.exist;
+          expect(win.document.querySelector('script[data-id="unknown1"]')).to
+            .not.exist;
+        });
+      });
+
+      it('should import extension element', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        extensionsMock
+          .expects('preloadExtension')
+          .withExactArgs('amp-ext1', '0.1')
+          .returns(
+            Promise.resolve({
+              elements: {
+                'amp-ext1': function() {},
+              },
+            })
+          )
+          .once();
+        writer.write('<script custom-element="amp-ext1" src=""></script>');
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(
+            win.document.querySelector('script[custom-element="amp-ext1"]')
+          ).to.not.exist;
+        });
+      });
+
+      it('should import extension template', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        extensionsMock
+          .expects('preloadExtension')
+          .withExactArgs('amp-ext1', '0.1')
+          .returns(Promise.resolve({elements: {}}))
+          .once();
+        writer.write('<script custom-template="amp-ext1" src=""></script>');
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(
+            win.document.querySelector('script[custom-template="amp-ext1"]')
+          ).to.not.exist;
+        });
+      });
+
+      it('should import inline script', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write(
+          '<script type="application/json" data-id="test1">{}</script>'
+        );
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          expect(
+            getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+          ).to.exist;
+          expect(
+            getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+              .textContent
+          ).to.equal('{}');
+        });
+      });
+
+      it('should ignore inline script if javascript', () => {
+        expectAsyncConsoleError(
+          '[runtime] - unallowed inline javascript:  ' +
+            '[object HTMLScriptElement]',
+          2
+        );
+
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write(
+          '<script type="application/javascript" data-id="test1"></script>'
+        );
+        writer.write('<script data-id="test1"></script>');
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable(() => {
+          expect(
+            getShadowRoot(hostElement).querySelector('script[data-id="test1"]')
+          ).to.not.exist;
+        });
+      });
+
+      it('should start as visible by default', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const viewer = getServiceForDoc(ampdoc, 'viewer');
+          expect(viewer.getVisibilityState()).to.equal('visible');
+        });
+      });
+
+      it('should start as prerender when requested', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl, {
+          'visibilityState': 'prerender',
+        });
+        writer = shadowDoc.writer;
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const viewer = getServiceForDoc(ampdoc, 'viewer');
+          expect(viewer.getVisibilityState()).to.equal('prerender');
+        });
       });
-    });
 
-    it('should stop broadcasting after force-close', () => {
-      doc3.hostElement.parentNode.removeChild(doc3.hostElement);
-      doc1.viewer.broadcast({test: 1});
-      return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
-        // Sender is not called, closed is not called.
-        expect(doc1.broadcastReceived).to.not.be.called;
-        expect(doc3.broadcastReceived).to.not.be.called;
+      it('should expose visibility method', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const viewer = getServiceForDoc(ampdoc, 'viewer');
+          expect(shadowDoc.setVisibilityState).to.be.a('function');
+          expect(viewer.getVisibilityState()).to.equal('visible');
+
+          shadowDoc.setVisibilityState('inactive');
+          expect(viewer.getVisibilityState()).to.equal('inactive');
+        });
+      });
 
-        // All others are called.
-        expect(doc2.broadcastReceived).to.be.calledOnce;
-        expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+      it('should expose close method and dispose services', () => {
+        shadowDoc = win.AMP.attachShadowDocAsStream(hostElement, docUrl);
+        writer = shadowDoc.writer;
+        writer.write('<body>');
+        return ampdoc.whenBodyAvailable().then(() => {
+          const viewer = getServiceForDoc(ampdoc, 'viewer');
+          expect(shadowDoc.close).to.be.a('function');
+          expect(viewer.getVisibilityState()).to.equal('visible');
+
+          viewer.dispose = sandbox.spy();
+          shadowDoc.close();
+          expect(viewer.getVisibilityState()).to.equal('inactive');
+          expect(viewer.dispose).to.be.calledOnce;
+        });
       });
     });
 
+    describes.repeated(
+      'messaging',
+      {
+        'document.contains is the browser implementation': false,
+        'document.contains is a stubbed implementation': true,
+      },
+      (name, isStubbedDocumentContains) => {
+        let doc1, doc2, doc3;
+
+        beforeEach(() => {
+          if (isStubbedDocumentContains) {
+            // Some browsers implement document.contains wrong, and it returns
+            // `false` even when this is incorrect. Repeat these tests with the
+            // faulty implementation.
+            sandbox.stub(win.document, 'contains').returns(false);
+          }
+
+          doc1 = attach('https://example.org/doc1');
+          doc2 = attach('https://example.org/doc2');
+          doc3 = attach('https://example.org/doc3');
+        });
+
+        function attach(docUrl) {
+          const hostElement = win.document.createElement('div');
+          win.document.body.appendChild(hostElement);
+          const importDoc = win.document.implementation.createHTMLDocument('');
+          const shadowRoot = createShadowRoot(hostElement);
+          const ampdoc = new AmpDocShadow(win, docUrl, shadowRoot);
 
-    it('should send message', () => {
-      doc1.onMessage.returns(Promise.resolve());
-      return doc1.viewer.sendMessageAwaitResponse('test3', {test: 3}).then(
-          () => {
-            expect(doc1.onMessage).to.be.calledOnce;
-            expect(doc1.onMessage.args[0][0]).to.equal('test3');
-            expect(doc1.onMessage.args[0][1]).to.deep.equal({test: 3});
+          ampdocServiceMock
+            .expects('installShadowDoc')
+            .withExactArgs(
+              docUrl,
+              sinon.match(arg => arg == getShadowRoot(hostElement))
+            )
+            .returns(ampdoc)
+            .atLeast(0);
+          ampdocServiceMock
+            .expects('getAmpDoc')
+            .withExactArgs(
+              sinon.match(arg => arg == getShadowRoot(hostElement))
+            )
+            .returns(ampdoc)
+            .atLeast(0);
+
+          const amp = win.AMP.attachShadowDoc(hostElement, importDoc, docUrl);
+          const viewer = getServiceForDoc(ampdoc, 'viewer');
+          const broadcastReceived = sandbox.spy();
+          viewer.onBroadcast(broadcastReceived);
+          const onMessage = sandbox.stub();
+          amp.onMessage(function(eventType, data) {
+            if (eventType == 'ignore') {
+              return Promise.resolve();
+            }
+            return onMessage(eventType, data);
           });
-    });
+          return {
+            hostElement,
+            amp,
+            ampdoc,
+            viewer,
+            broadcastReceived,
+            onMessage,
+          };
+        }
 
-    it('should receive message', () => {
-      doc1.amp.postMessage('broadcast', {test: 4}, true);
-      expect(doc1.broadcastReceived).to.be.calledOnce;
-      expect(doc1.broadcastReceived.args[0][0]).to.deep.equal({test: 4});
-    });
-  });
-});
+        it('should broadcast to all but sender', () => {
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+            expect(doc3.broadcastReceived).to.be.calledOnce;
+            expect(doc3.broadcastReceived.args[0][0]).deep.equal({test: 1});
+
+            // None of the onMessage are called.
+            expect(doc1.onMessage).to.not.be.called;
+            expect(doc2.onMessage).to.not.be.called;
+            expect(doc3.onMessage).to.not.be.called;
+          });
+        });
+
+        it('should stop broadcasting after close', () => {
+          doc3.amp.close();
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called, closed is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+            expect(doc3.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+          });
+        });
+
+        it('should stop broadcasting after force-close', () => {
+          doc3.hostElement.parentNode.removeChild(doc3.hostElement);
+          doc1.viewer.broadcast({test: 1});
+          return doc1.viewer.sendMessageAwaitResponse('ignore', {}).then(() => {
+            // Sender is not called, closed is not called.
+            expect(doc1.broadcastReceived).to.not.be.called;
+            expect(doc3.broadcastReceived).to.not.be.called;
+
+            // All others are called.
+            expect(doc2.broadcastReceived).to.be.calledOnce;
+            expect(doc2.broadcastReceived.args[0][0]).deep.equal({test: 1});
+          });
+        });
+
+        it('should send message', () => {
+          doc1.onMessage.returns(Promise.resolve());
+          return doc1.viewer
+            .sendMessageAwaitResponse('test3', {test: 3})
+            .then(() => {
+              expect(doc1.onMessage).to.be.calledOnce;
+              expect(doc1.onMessage.args[0][0]).to.equal('test3');
+              expect(doc1.onMessage.args[0][1]).to.deep.equal({test: 3});
+            });
+        });
+
+        it('should receive message', () => {
+          doc1.amp.postMessage('broadcast', {test: 4}, true);
+          expect(doc1.broadcastReceived).to.be.calledOnce;
+          expect(doc1.broadcastReceived.args[0][0]).to.deep.equal({test: 4});
+        });
+      }
+    );
+  }
+);
 
 function getShadowRoot(hostElement) {
   return hostElement.shadowRoot || hostElement.__AMP_SHADOW_ROOT;
diff --git a/test/unit/test-sanitizer.js b/test/unit/test-sanitizer.js
index e091d6ab55ee..c64ec835e37d 100644
--- a/test/unit/test-sanitizer.js
+++ b/test/unit/test-sanitizer.js
@@ -14,11 +14,7 @@
  * limitations under the License.
  */
 
-import {
-  sanitizeHtml,
-  sanitizeTagsForTripleMustache,
-} from '../../src/sanitizer';
-
+import {sanitizeHtml, sanitizeTagsForTripleMustache} from '../../src/sanitizer';
 
 let sanitize;
 let html;
@@ -39,15 +35,17 @@ describe('Caja-based', () => {
     it('should apply html4/caja restrictions', () => {
       expect(sanitize('a<dialog>b</dialog>c')).to.be.equal('ac');
       expect(sanitize('a<dialog>b<img>d</dialog>c')).to.be.equal('ac');
-      expect(sanitize('<div class="c" src="d">b</div>')).to.be
-          .equal('<div class="c" src="">b</div>');
+      expect(sanitize('<div class="c" src="d">b</div>')).to.be.equal(
+        '<div class="c" src="">b</div>'
+      );
     });
 
     // DOMPurify doesn't do special whitespace handling in attribute values.
     it('should catch attribute value whitespace variations', () => {
       allowConsoleError(() => {
-        expect(sanitize('a<a href=" j\na\tv\ra s&#00;cript:alert">b</a>'))
-            .to.be.equal('a<a target="_top">b</a>');
+        expect(
+          sanitize('a<a href=" j\na\tv\ra s&#00;cript:alert">b</a>')
+        ).to.be.equal('a<a target="_top">b</a>');
       });
     });
 
@@ -55,31 +53,37 @@ describe('Caja-based', () => {
     it('should ignore invalid characters in attributes', () => {
       allowConsoleError(() => {
         expect(sanitize('a<a href="<script">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="</script">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a [onclick]="alert">b</a>')).to.be.equal(
-            'a<a>b</a>');
+          'a<a>b</a>'
+        );
       });
     });
   });
 
   describe('for <amp-bind>', () => {
     it('should output [text] and [class] attributes', () => {
-      expect(sanitize('<p [text]="foo" [class]="bar"></p>')).to.be
-          .equal('<p [text]="foo" [class]="bar" i-amphtml-binding=""></p>');
+      expect(sanitize('<p [text]="foo" [class]="bar"></p>')).to.be.equal(
+        '<p [text]="foo" [class]="bar" i-amphtml-binding=""></p>'
+      );
     });
 
     it('should add "i-amphtml-binding" for data-amp-bind-*', () => {
-      expect(sanitize('<p data-amp-bind-text="foo"></p>')).to.be
-          .equal('<p data-amp-bind-text="foo" i-amphtml-binding=""></p>');
+      expect(sanitize('<p data-amp-bind-text="foo"></p>')).to.be.equal(
+        '<p data-amp-bind-text="foo" i-amphtml-binding=""></p>'
+      );
     });
 
     it('should NOT rewrite values of binding attributes', () => {
       // Should not change "foo.bar". Adding `target` attribute is not necessary
       // (but harmless) since <amp-bind> will use rewriteAttributesForElement().
       expect(sanitize('<a [href]="foo.bar">link</a>')).to.equal(
-          '<a [href]="foo.bar" target="_top" i-amphtml-binding="">link</a>');
+        '<a [href]="foo.bar" target="_top" i-amphtml-binding="">link</a>'
+      );
     });
   });
 });
@@ -114,15 +118,20 @@ function runSanitizerTests() {
     it('should output valid markup', () => {
       expect(sanitize('<h1>abc</h1>')).to.be.equal('<h1>abc</h1>');
       expect(sanitize('<h1>a<i>b</i>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i>c</h1>');
+        '<h1>a<i>b</i>c</h1>'
+      );
       expect(sanitize('<h1>a<i>b</i><br>c</h1>')).to.be.equal(
-          '<h1>a<i>b</i><br>c</h1>');
-      expect(sanitize(
+        '<h1>a<i>b</i><br>c</h1>'
+      );
+      expect(
+        sanitize(
           '<h1>a<i>b</i>c' +
-          '<amp-img src="http://example.com/1.png"></amp-img></h1>'))
-          .to.be.equal(
-              '<h1>a<i>b</i>c' +
-              '<amp-img src="http://example.com/1.png"></amp-img></h1>');
+            '<amp-img src="http://example.com/1.png"></amp-img></h1>'
+        )
+      ).to.be.equal(
+        '<h1>a<i>b</i>c' +
+          '<amp-img src="http://example.com/1.png"></amp-img></h1>'
+      );
     });
 
     it('should NOT output security-sensitive markup', () => {
@@ -139,12 +148,9 @@ function runSanitizerTests() {
     });
 
     it('should NOT output security-sensitive markup when nested', () => {
-      expect(sanitize('a<script><style>b</style></script>c'))
-          .to.be.equal('ac');
-      expect(sanitize('a<style><iframe>b</iframe></style>c'))
-          .to.be.equal('ac');
-      expect(sanitize('a<script><img></script>c'))
-          .to.be.equal('ac');
+      expect(sanitize('a<script><style>b</style></script>c')).to.be.equal('ac');
+      expect(sanitize('a<style><iframe>b</iframe></style>c')).to.be.equal('ac');
+      expect(sanitize('a<script><img></script>c')).to.be.equal('ac');
     });
 
     it('should NOT output security-sensitive markup when broken', () => {
@@ -154,36 +160,38 @@ function runSanitizerTests() {
 
     it('should output "on" attribute', () => {
       expect(sanitize('a<a on="tap:AMP.print">b</a>')).to.be.equal(
-          'a<a on="tap:AMP.print">b</a>');
+        'a<a on="tap:AMP.print">b</a>'
+      );
     });
 
     it('should output "data-, aria-, and role" attributes', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          sanitize('<a aria-label="bar" data-foo="bar" role="button">b</a>')
+        sanitize('<a aria-label="bar" data-foo="bar" role="button">b</a>')
       );
       const expected = serialize(
-          '<a aria-label="bar" data-foo="bar" role="button">b</a>');
+        '<a aria-label="bar" data-foo="bar" role="button">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should output "href" attribute', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
-      const actual = serialize(
-          sanitize('a<a href="http://acme.com/">b</a>')
-      );
+      const actual = serialize(sanitize('a<a href="http://acme.com/">b</a>'));
       const expected = serialize(
-          'a<a target="_top" href="http://acme.com/">b</a>');
+        'a<a target="_top" href="http://acme.com/">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should output "rel" attribute', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          sanitize('a<a href="http://acme.com/" rel="amphtml">b</a>')
+        sanitize('a<a href="http://acme.com/" rel="amphtml">b</a>')
       );
       const expected = serialize(
-          'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>');
+        'a<a href="http://acme.com/" rel="amphtml" target="_top">b</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
@@ -210,145 +218,176 @@ function runSanitizerTests() {
     it('should default target to _top with href', () => {
       // Can't use string equality since DOMPurify will reorder attributes.
       const actual = serialize(
-          sanitize('<a href="">a</a><a href="" target="">c</a>')
+        sanitize('<a href="">a</a><a href="" target="">c</a>')
       );
       const expected = serialize(
-          '<a href="" target="_top">a</a><a href="" target="_top">c</a>');
+        '<a href="" target="_top">a</a><a href="" target="_top">c</a>'
+      );
       expectEqualNodeLists(actual, expected);
     });
 
     it('should NOT default target to _top w/o href', () => {
-      expect(sanitize(
-          '<a>b</a>'
-          + '<a target="">d</a>'
-      )).to.equal(
-          '<a>b</a>'
-          + '<a target="_top">d</a>');
+      expect(sanitize('<a>b</a><a target="">d</a>')).to.equal(
+        '<a>b</a><a target="_top">d</a>'
+      );
     });
 
     it('should output a valid target', () => {
-      expect(sanitize('<a target="_top">a</a><a target="_blank">b</a>'))
-          .to.equal('<a target="_top">a</a><a target="_blank">b</a>');
+      expect(
+        sanitize('<a target="_top">a</a><a target="_blank">b</a>')
+      ).to.equal('<a target="_top">a</a><a target="_blank">b</a>');
     });
 
     it('should output a valid target in different case', () => {
-      expect(sanitize('<a target="_TOP">a</a><a target="_BLANK">b</a>'))
-          .to.equal('<a target="_top">a</a><a target="_blank">b</a>');
+      expect(
+        sanitize('<a target="_TOP">a</a><a target="_BLANK">b</a>')
+      ).to.equal('<a target="_top">a</a><a target="_blank">b</a>');
     });
 
     it('should override a unallowed target', () => {
-      expect(sanitize(
-          '<a target="_self">_self</a>'
-          + '<a target="_parent">_parent</a>'
-          + '<a target="_other">_other</a>'
-          + '<a target="_OTHER">_OTHER</a>'
-          + '<a target="other">other</a>'
-      )).to.equal(
-          '<a target="_top">_self</a>'
-          + '<a target="_top">_parent</a>'
-          + '<a target="_top">_other</a>'
-          + '<a target="_top">_OTHER</a>'
-          + '<a target="_top">other</a>');
+      expect(
+        sanitize(
+          '<a target="_self">_self</a>' +
+            '<a target="_parent">_parent</a>' +
+            '<a target="_other">_other</a>' +
+            '<a target="_OTHER">_OTHER</a>' +
+            '<a target="other">other</a>'
+        )
+      ).to.equal(
+        '<a target="_top">_self</a>' +
+          '<a target="_top">_parent</a>' +
+          '<a target="_top">_other</a>' +
+          '<a target="_top">_OTHER</a>' +
+          '<a target="_top">other</a>'
+      );
     });
 
     it('should NOT output security-sensitive attributes', () => {
       allowConsoleError(() => {
-        expect(sanitize('a<a onclick="alert">b</a>')).to.be.equal(
-            'a<a>b</a>');
+        expect(sanitize('a<a onclick="alert">b</a>')).to.be.equal('a<a>b</a>');
         expect(sanitize('a<a href="javascript:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="JAVASCRIPT:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="vbscript:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="VBSCRIPT:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="data:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
         expect(sanitize('a<a href="DATA:alert">b</a>')).to.be.equal(
-            'a<a target="_top">b</a>');
+          'a<a target="_top">b</a>'
+        );
       });
     });
 
     it('should NOT output blacklisted values for class attributes', () => {
       allowConsoleError(() => {
-        expect(sanitize('<p class="i-amphtml-">hello</p>')).to.be
-            .equal('<p>hello</p>');
-        expect(sanitize('<p class="i-amphtml-class">hello</p>')).to.be
-            .equal('<p>hello</p>');
-        expect(sanitize('<p class="foo-i-amphtml-bar">hello</p>')).to.be
-            .equal('<p>hello</p>');
+        expect(sanitize('<p class="i-amphtml-">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
+        expect(sanitize('<p class="i-amphtml-class">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
+        expect(sanitize('<p class="foo-i-amphtml-bar">hello</p>')).to.be.equal(
+          '<p>hello</p>'
+        );
       });
     });
 
     it('should allow amp-subscriptions attributes', () => {
-      expect(sanitize('<div subscriptions-action="login">link</div>'))
-          .to.equal('<div subscriptions-action="login">link</div>');
-      expect(sanitize('<div subscriptions-section="actions">link</div>'))
-          .to.equal('<div subscriptions-section="actions">link</div>');
-      expect(sanitize('<div subscriptions-actions="">link</div>'))
-          .to.equal('<div subscriptions-actions="">link</div>');
-      expect(sanitize('<div subscriptions-display="">link</div>'))
-          .to.equal('<div subscriptions-display="">link</div>');
-      expect(sanitize('<div subscriptions-dialog="">link</div>'))
-          .to.equal('<div subscriptions-dialog="">link</div>');
+      expect(sanitize('<div subscriptions-action="login">link</div>')).to.equal(
+        '<div subscriptions-action="login">link</div>'
+      );
+      expect(
+        sanitize('<div subscriptions-section="actions">link</div>')
+      ).to.equal('<div subscriptions-section="actions">link</div>');
+      expect(sanitize('<div subscriptions-actions="">link</div>')).to.equal(
+        '<div subscriptions-actions="">link</div>'
+      );
+      expect(sanitize('<div subscriptions-display="">link</div>')).to.equal(
+        '<div subscriptions-display="">link</div>'
+      );
+      expect(sanitize('<div subscriptions-dialog="">link</div>')).to.equal(
+        '<div subscriptions-dialog="">link</div>'
+      );
     });
 
     it('should allow source::src with valid protocol', () => {
-      expect(sanitize('<source src="https://www.foo.com/">'))
-          .to.equal('<source src="https://www.foo.com/">');
+      expect(sanitize('<source src="https://www.foo.com/">')).to.equal(
+        '<source src="https://www.foo.com/">'
+      );
     });
 
     // TODO(choumx): HTTPS-only URI attributes are not enforced consistently
     // in the sanitizer yet. E.g. amp-video requires HTTPS, amp-img does not.
     // Unskip when this is fixed.
     it.skip('should not allow source::src with invalid protocol', () => {
-      expect(sanitize('<source src="http://www.foo.com">'))
-          .to.equal('<source src="">');
-      expect(sanitize('<source src="<script>bad()</script>">'))
-          .to.equal('<source src="">');
+      expect(sanitize('<source src="http://www.foo.com">')).to.equal(
+        '<source src="">'
+      );
+      expect(sanitize('<source src="<script>bad()</script>">')).to.equal(
+        '<source src="">'
+      );
     });
 
     it('should allow div::template', () => {
-      expect(sanitize('<div template="my-template-id"></div>'))
-          .to.equal('<div template="my-template-id"></div>');
+      expect(sanitize('<div template="my-template-id"></div>')).to.equal(
+        '<div template="my-template-id"></div>'
+      );
     });
 
     it('should allow form::action-xhr', () => {
-      expect(sanitize('<form action-xhr="https://foo.com/bar"></form>'))
-          .to.equal('<form action-xhr="https://foo.com/bar"></form>');
+      expect(
+        sanitize('<form action-xhr="https://foo.com/bar"></form>')
+      ).to.equal('<form action-xhr="https://foo.com/bar"></form>');
     });
 
     it('should allow <amp-form>-related attributes', () => {
-      expect(sanitize('<div submitting></div>'))
-          .to.equal('<div submitting=""></div>');
-      expect(sanitize('<div submit-success></div>'))
-          .to.equal('<div submit-success=""></div>');
-      expect(sanitize('<div submit-error></div>'))
-          .to.equal('<div submit-error=""></div>');
-      expect(sanitize('<div verify-error></div>'))
-          .to.equal('<div verify-error=""></div>');
-      expect(sanitize('<span visible-when-invalid="valueMissing"></span>'))
-          .to.equal('<span visible-when-invalid="valueMissing"></span>');
-      expect(sanitize('<span validation-for="form1"></span>'))
-          .to.equal('<span validation-for="form1"></span>');
+      expect(sanitize('<div submitting></div>')).to.equal(
+        '<div submitting=""></div>'
+      );
+      expect(sanitize('<div submit-success></div>')).to.equal(
+        '<div submit-success=""></div>'
+      );
+      expect(sanitize('<div submit-error></div>')).to.equal(
+        '<div submit-error=""></div>'
+      );
+      expect(sanitize('<div verify-error></div>')).to.equal(
+        '<div verify-error=""></div>'
+      );
+      expect(
+        sanitize('<span visible-when-invalid="valueMissing"></span>')
+      ).to.equal('<span visible-when-invalid="valueMissing"></span>');
+      expect(sanitize('<span validation-for="form1"></span>')).to.equal(
+        '<span validation-for="form1"></span>'
+      );
     });
 
     it('should allow <amp-lightbox> attributes', () => {
-      expect(sanitize('<amp-lightbox scrollable></amp-lightbox>'))
-          .to.equal('<amp-lightbox scrollable=""></amp-lightbox>');
+      expect(sanitize('<amp-lightbox scrollable></amp-lightbox>')).to.equal(
+        '<amp-lightbox scrollable=""></amp-lightbox>'
+      );
     });
 
     it('should output "i-amphtml-key" attribute if diffing is enabled', () => {
       // Elements with bindings should have i-amphtml-key="<number>".
       expect(sanitize('<p [text]="foo"></p>', true)).to.match(
-          /<p \[text\]="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/);
+        /<p \[text\]="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/p>/
+      );
       // AMP elements should have i-amphtml-key="<number>".
       expect(sanitize('<amp-img></amp-img>', true)).to.match(
-          /<amp-img i-amphtml-key="(\d+)"><\/amp-img>/);
+        /<amp-img i-amphtml-key="(\d+)"><\/amp-img>/
+      );
       // AMP elements with bindings should have i-amphtml-key="<number>".
       expect(sanitize('<amp-img [text]="foo"></amp-img>', true)).to.match(
-          /<amp-img \[text\]="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/amp-img>/);
+        /<amp-img \[text\]="foo" i-amphtml-binding="" i-amphtml-key="(\d+)"><\/amp-img>/
+      );
       // Other elements should NOT have i-amphtml-key-set.
       expect(sanitize('<p></p>', true)).to.equal('<p></p>');
     });
@@ -369,10 +408,10 @@ function runSanitizerTests() {
     it('should allow for input type file and password', () => {
       // Given that the doc is not provided.
       allowConsoleError(() => {
-        expect(sanitize('<input type="file">'))
-            .to.equal('<input type="file">');
-        expect(sanitize('<input type="password">'))
-            .to.equal('<input type="password">');
+        expect(sanitize('<input type="file">')).to.equal('<input type="file">');
+        expect(sanitize('<input type="password">')).to.equal(
+          '<input type="password">'
+        );
       });
     });
 
@@ -381,10 +420,12 @@ function runSanitizerTests() {
       allowConsoleError(() => {
         expect(sanitize('<input type="password">')).to.equal('<input>');
         expect(sanitize('<input type="file">')).to.equal('<input>');
-        expect(sanitize('<form name="form-name"></form>'))
-            .to.equal('<form></form>');
-        expect(sanitize('<amp-anim controls></amp-anim>'))
-            .to.equal('<amp-anim></amp-anim>');
+        expect(sanitize('<form name="form-name"></form>')).to.equal(
+          '<form></form>'
+        );
+        expect(sanitize('<amp-anim controls></amp-anim>')).to.equal(
+          '<amp-anim></amp-anim>'
+        );
       });
     });
   });
@@ -395,60 +436,71 @@ function runSanitizerTests() {
     });
 
     it('should output valid markup', () => {
-      expect(sanitizeTagsForTripleMustache('<b>abc</b>'))
-          .to.be.equal('<b>abc</b>');
+      expect(sanitizeTagsForTripleMustache('<b>abc</b>')).to.be.equal(
+        '<b>abc</b>'
+      );
       expect(sanitizeTagsForTripleMustache('<b>ab<br>c</b>')).to.be.equal(
-          '<b>ab<br>c</b>');
+        '<b>ab<br>c</b>'
+      );
       expect(sanitizeTagsForTripleMustache('<b>a<i>b</i>c</b>')).to.be.equal(
-          '<b>a<i>b</i>c</b>');
+        '<b>a<i>b</i>c</b>'
+      );
       const markupWithClassAttribute = '<p class="some-class">heading</p>';
-      expect(sanitizeTagsForTripleMustache(markupWithClassAttribute))
-          .to.be.equal(markupWithClassAttribute);
+      expect(
+        sanitizeTagsForTripleMustache(markupWithClassAttribute)
+      ).to.be.equal(markupWithClassAttribute);
       const markupWithClassesAttribute =
-          '<div class="some-class another"><span>heading</span></div>';
-      expect(sanitizeTagsForTripleMustache(markupWithClassesAttribute))
-          .to.be.equal(markupWithClassesAttribute);
+        '<div class="some-class another"><span>heading</span></div>';
+      expect(
+        sanitizeTagsForTripleMustache(markupWithClassesAttribute)
+      ).to.be.equal(markupWithClassesAttribute);
       const markupParagraph = '<p class="valid-class">paragraph</p>';
-      expect(sanitizeTagsForTripleMustache(markupParagraph))
-          .to.be.equal(markupParagraph);
+      expect(sanitizeTagsForTripleMustache(markupParagraph)).to.be.equal(
+        markupParagraph
+      );
     });
 
     it('should NOT output non-whitelisted markup', () => {
-      expect(sanitizeTagsForTripleMustache('a<style>b</style>c'))
-          .to.be.equal('ac');
-      expect(sanitizeTagsForTripleMustache('a<img>c'))
-          .to.be.equal('ac');
+      expect(sanitizeTagsForTripleMustache('a<style>b</style>c')).to.be.equal(
+        'ac'
+      );
+      expect(sanitizeTagsForTripleMustache('a<img>c')).to.be.equal('ac');
     });
 
     it('should compensate for broken markup', () => {
       expect(sanitizeTagsForTripleMustache('<b>a<i>b')).to.be.equal(
-          '<b>a<i>b</i></b>');
+        '<b>a<i>b</i></b>'
+      );
     });
 
     describe('should sanitize `style` attribute', () => {
-      it('should allow valid styles',() => {
-        expect(sanitize('<div style="color:blue">Test</div>'))
-            .to.equal('<div style="color:blue">Test</div>');
+      it('should allow valid styles', () => {
+        expect(sanitize('<div style="color:blue">Test</div>')).to.equal(
+          '<div style="color:blue">Test</div>'
+        );
       });
 
-      it('should ignore styles containing `!important`',() => {
+      it('should ignore styles containing `!important`', () => {
         allowConsoleError(() => {
-          expect(sanitize('<div style="color:blue!important">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(
+            sanitize('<div style="color:blue!important">Test</div>')
+          ).to.equal('<div>Test</div>');
         });
       });
 
       it('should ignore styles containing `position:fixed`', () => {
         allowConsoleError(() => {
-          expect(sanitize('<div style="position:fixed">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(sanitize('<div style="position:fixed">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
         });
       });
 
       it('should ignore styles containing `position:sticky`', () => {
         allowConsoleError(() => {
-          expect(sanitize('<div style="position:sticky">Test</div>'))
-              .to.equal('<div>Test</div>');
+          expect(sanitize('<div style="position:sticky">Test</div>')).to.equal(
+            '<div>Test</div>'
+          );
         });
       });
     });
diff --git a/test/unit/test-service.js b/test/unit/test-service.js
index 756aae5bdf55..db1ef5f2fdcd 100644
--- a/test/unit/test-service.js
+++ b/test/unit/test-service.js
@@ -37,9 +37,7 @@ import {
 } from '../../src/service';
 import {loadPromise} from '../../src/event-helper';
 
-
 describe('service', () => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -51,7 +49,6 @@ describe('service', () => {
   });
 
   describe('disposable interface', () => {
-
     let disposable;
     let nonDisposable;
 
@@ -69,13 +66,13 @@ describe('service', () => {
       expect(assertDisposable(disposable)).to.equal(disposable);
       allowConsoleError(() => {
         expect(() => assertDisposable(nonDisposable)).to.throw(
-            /required to implement Disposable/);
+          /required to implement Disposable/
+        );
       });
     });
   });
 
   describe('window singletons', () => {
-
     let Class;
     let count;
     let factory;
@@ -139,15 +136,19 @@ describe('service', () => {
     });
 
     it('should throw before creation if factory is not provided', () => {
-      allowConsoleError(() => { expect(() => {
-        getService(window, 'c');
-      }).to.throw(); });
+      allowConsoleError(() => {
+        expect(() => {
+          getService(window, 'c');
+        }).to.throw();
+      });
     });
 
     it('should fail without factory on initial setup', () => {
-      allowConsoleError(() => { expect(() => {
-        getService(window, 'not-present');
-      }).to.throw(/Expected service not-present to be registered/); });
+      allowConsoleError(() => {
+        expect(() => {
+          getService(window, 'not-present');
+        }).to.throw(/Expected service not-present to be registered/);
+      });
     });
 
     it('should provide a promise that resolves when instantiated', () => {
@@ -226,7 +227,6 @@ describe('service', () => {
   });
 
   describe('ampdoc singletons', () => {
-
     let windowApi;
     let ampdoc;
     let ampdocMock;
@@ -264,7 +264,10 @@ describe('service', () => {
     });
 
     it('should make per ampdoc singletons and store them in window', () => {
-      ampdocMock.expects('isSingleDoc').returns(true).atLeast(1);
+      ampdocMock
+        .expects('isSingleDoc')
+        .returns(true)
+        .atLeast(1);
       registerServiceBuilderForDoc(node, 'a', factory);
       const a1 = getServiceForDoc(node, 'a');
       registerServiceBuilderForDoc(node, 'a', factory);
@@ -288,7 +291,10 @@ describe('service', () => {
     });
 
     it('should make per ampdoc singletons via ampdoc', () => {
-      ampdocMock.expects('isSingleDoc').returns(true).atLeast(1);
+      ampdocMock
+        .expects('isSingleDoc')
+        .returns(true)
+        .atLeast(1);
       registerServiceBuilderForDoc(ampdoc, 'a', factory);
       const a1 = getServiceForDoc(ampdoc, 'a');
       registerServiceBuilderForDoc(ampdoc, 'a', factory);
@@ -302,7 +308,10 @@ describe('service', () => {
     });
 
     it('should make per ampdoc singletons and store them in ampdoc', () => {
-      ampdocMock.expects('isSingleDoc').returns(false).atLeast(1);
+      ampdocMock
+        .expects('isSingleDoc')
+        .returns(false)
+        .atLeast(1);
       registerServiceBuilderForDoc(node, 'a', factory);
       const a1 = getServiceForDoc(node, 'a');
       registerServiceBuilderForDoc(node, 'a', factory);
@@ -345,9 +354,11 @@ describe('service', () => {
     });
 
     it('should fail without factory on initial setup', () => {
-      allowConsoleError(() => { expect(() => {
-        getServiceForDoc(node, 'not-present');
-      }).to.throw(/Expected service not-present to be registered/); });
+      allowConsoleError(() => {
+        expect(() => {
+          getServiceForDoc(node, 'not-present');
+        }).to.throw(/Expected service not-present to be registered/);
+      });
     });
 
     it('should provide a promise that resolves when instantiated', () => {
@@ -405,21 +416,28 @@ describe('service', () => {
     });
 
     it('should resolve service for a child window', () => {
-      ampdocMock.expects('isSingleDoc').returns(true).atLeast(1);
+      ampdocMock
+        .expects('isSingleDoc')
+        .returns(true)
+        .atLeast(1);
       registerServiceBuilderForDoc(node, 'c', factory);
       const c = getServiceForDoc(node, 'c');
 
       // A child.
       const childWin = {};
-      const childWinNode =
-          {nodeType: 1, ownerDocument: {defaultView: childWin}};
+      const childWinNode = {
+        nodeType: 1,
+        ownerDocument: {defaultView: childWin},
+      };
       setParentWindow(childWin, windowApi);
       expect(getServiceForDoc(childWinNode, 'c')).to.equal(c);
 
       // A grandchild.
       const grandchildWin = {};
-      const grandChildWinNode =
-          {nodeType: 1, ownerDocument: {defaultView: grandchildWin}};
+      const grandChildWinNode = {
+        nodeType: 1,
+        ownerDocument: {defaultView: grandchildWin},
+      };
       setParentWindow(grandchildWin, childWin);
       expect(getServiceForDoc(grandChildWinNode, 'c')).to.equal(c);
     });
@@ -481,14 +499,15 @@ describe('service', () => {
       beforeEach(() => {
         // A child.
         childWin = {};
-        childWinNode =
-          {nodeType: 1, ownerDocument: {defaultView: childWin}};
+        childWinNode = {nodeType: 1, ownerDocument: {defaultView: childWin}};
         setParentWindow(childWin, windowApi);
 
         // A grandchild.
         grandchildWin = {};
-        grandChildWinNode =
-            {nodeType: 1, ownerDocument: {defaultView: grandchildWin}};
+        grandChildWinNode = {
+          nodeType: 1,
+          ownerDocument: {defaultView: grandchildWin},
+        };
         setParentWindow(grandchildWin, childWin);
 
         registerServiceBuilderForDoc(ampdoc, 'c', factory);
@@ -501,12 +520,16 @@ describe('service', () => {
       });
 
       it('should not fallback when opt_fallbackToTopWin is false', () => {
-        const fromChildNode =
-            getExistingServiceForDocInEmbedScope(childWinNode, 'c');
+        const fromChildNode = getExistingServiceForDocInEmbedScope(
+          childWinNode,
+          'c'
+        );
         expect(fromChildNode).to.be.null;
 
-        const fromGrandchildNode =
-            getExistingServiceForDocInEmbedScope(grandChildWinNode, 'c');
+        const fromGrandchildNode = getExistingServiceForDocInEmbedScope(
+          grandChildWinNode,
+          'c'
+        );
         expect(fromGrandchildNode).to.be.null;
       });
 
@@ -514,37 +537,55 @@ describe('service', () => {
         const fallbackToTopWin = true;
 
         const fromNode = getExistingServiceForDocInEmbedScope(
-            node, 'c', fallbackToTopWin);
+          node,
+          'c',
+          fallbackToTopWin
+        );
         expect(fromNode).to.equal(topService);
 
         const fromChildNode = getExistingServiceForDocInEmbedScope(
-            childWinNode, 'c', fallbackToTopWin);
+          childWinNode,
+          'c',
+          fallbackToTopWin
+        );
         expect(fromChildNode).to.equal(topService);
 
         const fromGrandchildNode = getExistingServiceForDocInEmbedScope(
-            grandChildWinNode, 'c', fallbackToTopWin);
+          grandChildWinNode,
+          'c',
+          fallbackToTopWin
+        );
         expect(fromGrandchildNode).to.equal(topService);
       });
 
       it('should return overriden service', () => {
         const overridenService = {};
         installServiceInEmbedScope(childWin, 'c', overridenService);
-        expect(getExistingServiceForDocInEmbedScope(childWinNode, 'c'))
-            .to.equal(overridenService);
+        expect(
+          getExistingServiceForDocInEmbedScope(childWinNode, 'c')
+        ).to.equal(overridenService);
 
         // Top-level service doesn't change.
-        expect(getExistingServiceForDocInEmbedScope(
-            node, 'c', /* opt_fallbackToTopWin */ true))
-            .to.equal(topService);
+        expect(
+          getExistingServiceForDocInEmbedScope(
+            node,
+            'c',
+            /* opt_fallbackToTopWin */ true
+          )
+        ).to.equal(topService);
 
         // Notice that only direct overrides are allowed for now. This is
         // arbitrary can change in the future to allow hierarchical lookup
         // up the window chain.
-        expect(getExistingServiceForDocInEmbedScope(grandChildWinNode, 'c'))
-            .to.be.null;
-        expect(getExistingServiceForDocInEmbedScope(
-            grandChildWinNode, 'c', /* opt_fallbackToTopWin */ true))
-            .to.equal(topService);
+        expect(getExistingServiceForDocInEmbedScope(grandChildWinNode, 'c')).to
+          .be.null;
+        expect(
+          getExistingServiceForDocInEmbedScope(
+            grandChildWinNode,
+            'c',
+            /* opt_fallbackToTopWin */ true
+          )
+        ).to.equal(topService);
       });
     });
 
@@ -586,7 +627,6 @@ describe('service', () => {
     });
   });
 
-
   describe('getParentWindowFrameElement', () => {
     let iframe;
 
@@ -631,7 +671,9 @@ describe('service', () => {
       const childWin = {};
       Object.defineProperties(childWin, {
         frameElement: {
-          get: () => {throw new Error('intentional');},
+          get: () => {
+            throw new Error('intentional');
+          },
         },
       });
       setParentWindow(childWin, window);
diff --git a/test/unit/test-shadow-embed.js b/test/unit/test-shadow-embed.js
index 62419b37116e..f8230976a2d9 100644
--- a/test/unit/test-shadow-embed.js
+++ b/test/unit/test-shadow-embed.js
@@ -39,207 +39,219 @@ describes.sandboxed('shadow-embed', {}, () => {
     setShadowDomSupportedVersionForTesting(undefined);
   });
 
-  [ShadowDomVersion.NONE, ShadowDomVersion.V0, ShadowDomVersion.V1]
-      .forEach(scenario => {
-        describe('shadow APIs', () => {
-          let hostElement;
-
-          beforeEach(function() {
-            hostElement = document.createElement('div');
-            setShadowDomSupportedVersionForTesting(scenario);
-            setShadowCssSupportedForTesting(undefined);
+  [ShadowDomVersion.NONE, ShadowDomVersion.V0, ShadowDomVersion.V1].forEach(
+    scenario => {
+      describe('shadow APIs', () => {
+        let hostElement;
+
+        beforeEach(function() {
+          hostElement = document.createElement('div');
+          setShadowDomSupportedVersionForTesting(scenario);
+          setShadowCssSupportedForTesting(undefined);
+        });
+
+        describe(scenario, function() {
+          before(function() {
+            if (
+              scenario == ShadowDomVersion.V0 &&
+              !Element.prototype.createShadowRoot
+            ) {
+              this.skipTest();
+            }
+
+            if (
+              scenario == ShadowDomVersion.V1 &&
+              !Element.prototype.attachShadow
+            ) {
+              this.skipTest();
+            }
           });
 
-          describe(scenario, function() {
-            before(function() {
-              if (scenario == ShadowDomVersion.V0 &&
-                  !Element.prototype.createShadowRoot) {
-                this.skipTest();
-              }
+          it('should transform CSS installStylesForDoc for shadow root', () => {
+            const shadowRoot = createShadowRoot(hostElement);
+            const ampdoc = new AmpDocShadow(
+              window,
+              'https://a.org/',
+              shadowRoot
+            );
+            const style = installStylesForDoc(ampdoc, 'body {}', null, true);
+            expect(shadowRoot.contains(style)).to.be.true;
+            const css = style.textContent.replace(/\s/g, '');
+            if (scenario == ShadowDomVersion.NONE) {
+              expect(css).to.match(/amp-body/);
+            } else {
+              expect(css).to.equal('body{}');
+            }
+          });
 
-              if (scenario == ShadowDomVersion.V1 &&
-                  !Element.prototype.attachShadow) {
-                this.skipTest();
-              }
+          describe('createShadowRoot', () => {
+            it('should clear duplicate root', () => {
+              const shadowRoot1 = createShadowRoot(hostElement);
+              const span = document.createElement('span');
+              shadowRoot1.appendChild(span);
+              expect(shadowRoot1.contains(span)).to.be.true;
+
+              const shadowRoot2 = createShadowRoot(hostElement);
+              expect(shadowRoot2).to.equal(shadowRoot1);
+              expect(shadowRoot2.contains(span)).to.be.false;
             });
 
-            it('should transform CSS installStylesForDoc ' +
-                'for shadow root', () => {
+            it('should have host', () => {
               const shadowRoot = createShadowRoot(hostElement);
-              const ampdoc = new AmpDocShadow(
-                  window, 'https://a.org/', shadowRoot);
-              const style = installStylesForDoc(ampdoc, 'body {}', null, true);
-              expect(shadowRoot.contains(style)).to.be.true;
-              const css = style.textContent.replace(/\s/g, '');
-              if (scenario == ShadowDomVersion.NONE) {
-                expect(css).to.match(/amp-body/);
-              } else {
-                expect(css).to.equal('body{}');
-              }
+              expect(shadowRoot.host).to.equal(hostElement);
             });
 
-            describe('createShadowRoot', () => {
-              it('should clear duplicate root', () => {
-                const shadowRoot1 = createShadowRoot(hostElement);
-                const span = document.createElement('span');
-                shadowRoot1.appendChild(span);
-                expect(shadowRoot1.contains(span)).to.be.true;
+            it('should have getElementById', () => {
+              const shadowRoot = createShadowRoot(hostElement);
+              expect(shadowRoot.getElementById).to.be.ok;
 
-                const shadowRoot2 = createShadowRoot(hostElement);
-                expect(shadowRoot2).to.equal(shadowRoot1);
-                expect(shadowRoot2.contains(span)).to.be.false;
-              });
+              const spanId = 'test' + Math.floor(Math.random() * 10000);
+              const span = document.createElement('span');
+              span.id = spanId;
+              shadowRoot.appendChild(span);
+              expect(shadowRoot.getElementById(spanId)).to.equal(span);
+            });
 
-              it('should have host', () => {
+            if (scenario == ShadowDomVersion.NONE) {
+              it('should add id for polyfill', () => {
                 const shadowRoot = createShadowRoot(hostElement);
-                expect(shadowRoot.host).to.equal(hostElement);
+                expect(shadowRoot.tagName).to.equal('I-AMPHTML-SHADOW-ROOT');
+                expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
               });
 
-              it('should have getElementById', () => {
+              it('should add host style for polyfill', () => {
+                const doc = hostElement.ownerDocument;
+                doc.body.appendChild(hostElement);
+                const slot = doc.createElement('div');
+                hostElement.appendChild(slot);
+                expect(slot).to.have.display('block');
                 const shadowRoot = createShadowRoot(hostElement);
-                expect(shadowRoot.getElementById).to.be.ok;
-
-                const spanId = 'test' + Math.floor(Math.random() * 10000);
-                const span = document.createElement('span');
-                span.id = spanId;
-                shadowRoot.appendChild(span);
-                expect(shadowRoot.getElementById(spanId)).to.equal(span);
+                expect(hostElement).to.have.class(
+                  'i-amphtml-shadow-host-polyfill'
+                );
+                expect(slot).to.have.display('none');
+                expect(shadowRoot).to.not.have.display('none');
+                doc.body.removeChild(hostElement);
               });
+            }
 
-              if (scenario == ShadowDomVersion.NONE) {
-                it('should add id for polyfill', () => {
-                  const shadowRoot = createShadowRoot(hostElement);
-                  expect(shadowRoot.tagName).to.equal('I-AMPHTML-SHADOW-ROOT');
-                  expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
-                });
-
-                it('should add host style for polyfill', () => {
-                  const doc = hostElement.ownerDocument;
-                  doc.body.appendChild(hostElement);
-                  const slot = doc.createElement('div');
-                  hostElement.appendChild(slot);
-                  expect(slot).to.have.display('block');
-                  const shadowRoot = createShadowRoot(hostElement);
-                  expect(hostElement).to.have.class(
-                      'i-amphtml-shadow-host-polyfill');
-                  expect(slot).to.have.display('none');
-                  expect(shadowRoot).to.not.have.display('none');
-                  doc.body.removeChild(hostElement);
-                });
-              }
-
-              // Test scenarios where Shadow Css is not supported
-              it('Should add an id and class for CSS \
+            // Test scenarios where Shadow Css is not supported
+            it('Should add an id and class for CSS \
                 encapsulation to the shadow root', () => {
-                setShadowCssSupportedForTesting(false);
-                const shadowRoot = createShadowRoot(hostElement);
-                expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
-                // Browserify does not support arrow functions with params.
-                // Using Old School for
-                const shadowRootClassListArray =
-                  toArray(shadowRoot.host.classList);
-                let foundShadowCssClass = false;
-                for (let i = 0; i < shadowRootClassListArray.length; i++) {
-                  if (shadowRootClassListArray[i].match(/i-amphtml-sd-\d+/)) {
-                    foundShadowCssClass = true;
-                    break;
-                  }
+              setShadowCssSupportedForTesting(false);
+              const shadowRoot = createShadowRoot(hostElement);
+              expect(shadowRoot.id).to.match(/i-amphtml-sd-\d+/);
+              // Browserify does not support arrow functions with params.
+              // Using Old School for
+              const shadowRootClassListArray = toArray(
+                shadowRoot.host.classList
+              );
+              let foundShadowCssClass = false;
+              for (let i = 0; i < shadowRootClassListArray.length; i++) {
+                if (shadowRootClassListArray[i].match(/i-amphtml-sd-\d+/)) {
+                  foundShadowCssClass = true;
+                  break;
                 }
-                expect(foundShadowCssClass).to.be.ok;
-              });
+              }
+              expect(foundShadowCssClass).to.be.ok;
+            });
 
-              it('Should transform CSS for the shadow root', () => {
-                setShadowCssSupportedForTesting(false);
-                const shadowRoot = createShadowRoot(hostElement);
-                const ampdoc = new AmpDocShadow(
-                    window, 'https://a.org/', shadowRoot);
-                const style =
-                    installStylesForDoc(ampdoc, 'body {}', null, true);
-                expect(shadowRoot.contains(style)).to.be.true;
-                const css = style.textContent.replace(/\s/g, '');
-                expect(css).to.match(/amp-body/);
-              });
+            it('Should transform CSS for the shadow root', () => {
+              setShadowCssSupportedForTesting(false);
+              const shadowRoot = createShadowRoot(hostElement);
+              const ampdoc = new AmpDocShadow(
+                window,
+                'https://a.org/',
+                shadowRoot
+              );
+              const style = installStylesForDoc(ampdoc, 'body {}', null, true);
+              expect(shadowRoot.contains(style)).to.be.true;
+              const css = style.textContent.replace(/\s/g, '');
+              expect(css).to.match(/amp-body/);
             });
+          });
 
-            describe('stylesheets', () => {
-              let parentStylesheet;
+          describe('stylesheets', () => {
+            let parentStylesheet;
 
-              beforeEach(() => {
-                parentStylesheet = document.createElement('style');
-                parentStylesheet.textContent = '.x {background: red}';
-                document.body.appendChild(parentStylesheet);
-                document.body.appendChild(hostElement);
-              });
+            beforeEach(() => {
+              parentStylesheet = document.createElement('style');
+              parentStylesheet.textContent = '.x {background: red}';
+              document.body.appendChild(parentStylesheet);
+              document.body.appendChild(hostElement);
+            });
 
-              afterEach(() => {
-                document.body.removeChild(parentStylesheet);
-                document.body.removeChild(hostElement);
-              });
+            afterEach(() => {
+              document.body.removeChild(parentStylesheet);
+              document.body.removeChild(hostElement);
+            });
 
-              it('should have shadow stylesheets and not global', () => {
-                const shadowRoot = createShadowRoot(hostElement);
-                const shadowStyle = document.createElement('style');
-                shadowStyle.textContent = '.x {background: green}';
-                shadowRoot.appendChild(shadowStyle);
-
-                const {styleSheets} = shadowRoot;
-                expect(styleSheets).to.exist;
-                expect(styleSheets).to.have.length(1);
-                expect(styleSheets[0].ownerNode).to.equal(shadowStyle);
-              });
+            it('should have shadow stylesheets and not global', () => {
+              const shadowRoot = createShadowRoot(hostElement);
+              const shadowStyle = document.createElement('style');
+              shadowStyle.textContent = '.x {background: green}';
+              shadowRoot.appendChild(shadowStyle);
+
+              const {styleSheets} = shadowRoot;
+              expect(styleSheets).to.exist;
+              expect(styleSheets).to.have.length(1);
+              expect(styleSheets[0].ownerNode).to.equal(shadowStyle);
             });
+          });
 
-            // TODO(aghassemi, #12499): Make this work with latest mocha / karma
-            describe.skip('importShadowBody', () => {
-              let shadowRoot, source, child1, child2;
-
-              beforeEach(() => {
-                shadowRoot = createShadowRoot(hostElement);
-                source = document.createElement('body');
-                child1 = document.createElement('div');
-                child1.id = 'child1';
-                child2 = document.createElement('div');
-                child2.id = 'child2';
-                source.appendChild(child1);
-                source.appendChild(child2);
-              });
+          // TODO(aghassemi, #12499): Make this work with latest mocha / karma
+          describe.skip('importShadowBody', () => {
+            let shadowRoot, source, child1, child2;
+
+            beforeEach(() => {
+              shadowRoot = createShadowRoot(hostElement);
+              source = document.createElement('body');
+              child1 = document.createElement('div');
+              child1.id = 'child1';
+              child2 = document.createElement('div');
+              child2.id = 'child2';
+              source.appendChild(child1);
+              source.appendChild(child2);
+            });
 
-              it('should import body with all children', () => {
-                expect(shadowRoot.body).to.be.undefined;
-                const body = importShadowBody(shadowRoot, source, true);
-                expect(shadowRoot.body).to.equal(body);
-                expect(body.tagName).to.equal(
-                    scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY');
-                expect(body.style.position).to.equal('relative');
-                if (scenario == ShadowDomVersion.NONE) {
-                  expect(body.style.display).to.equal('block');
-                }
-                expect(shadowRoot.contains(body)).to.be.true;
-                expect(body.children).to.have.length(2);
-                expect(body.children[0].id).to.equal('child1');
-                expect(body.children[1].id).to.equal('child2');
-              });
+            it('should import body with all children', () => {
+              expect(shadowRoot.body).to.be.undefined;
+              const body = importShadowBody(shadowRoot, source, true);
+              expect(shadowRoot.body).to.equal(body);
+              expect(body.tagName).to.equal(
+                scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY'
+              );
+              expect(body.style.position).to.equal('relative');
+              if (scenario == ShadowDomVersion.NONE) {
+                expect(body.style.display).to.equal('block');
+              }
+              expect(shadowRoot.contains(body)).to.be.true;
+              expect(body.children).to.have.length(2);
+              expect(body.children[0].id).to.equal('child1');
+              expect(body.children[1].id).to.equal('child2');
+            });
 
-              it('should import shallow body', () => {
-                expect(shadowRoot.body).to.be.undefined;
-                const body = importShadowBody(shadowRoot, source, false);
-                expect(shadowRoot.body).to.equal(body);
-                expect(body.tagName).to.equal(
-                    scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY');
-                expect(body.style.position).to.equal('relative');
-                if (scenario == ShadowDomVersion.NONE) {
-                  expect(body.style.display).to.equal('block');
-                }
-                expect(shadowRoot.contains(body)).to.be.true;
-                expect(body.children).to.have.length(0);
-              });
+            it('should import shallow body', () => {
+              expect(shadowRoot.body).to.be.undefined;
+              const body = importShadowBody(shadowRoot, source, false);
+              expect(shadowRoot.body).to.equal(body);
+              expect(body.tagName).to.equal(
+                scenario == ShadowDomVersion.NONE ? 'AMP-BODY' : 'BODY'
+              );
+              expect(body.style.position).to.equal('relative');
+              if (scenario == ShadowDomVersion.NONE) {
+                expect(body.style.display).to.equal('block');
+              }
+              expect(shadowRoot.contains(body)).to.be.true;
+              expect(body.children).to.have.length(0);
             });
           });
         });
       });
+    }
+  );
 
   describe('isShadowRoot', () => {
-
     it('should yield false for non-nodes', () => {
       expect(isShadowRoot(null)).to.be.false;
       expect(isShadowRoot(undefined)).to.be.false;
@@ -274,8 +286,8 @@ describes.sandboxed('shadow-embed', {}, () => {
     });
 
     it('should yield true for polyfill', () => {
-      expect(isShadowRoot(document.createElement(
-          'i-amphtml-shadow-root'))).to.be.true;
+      expect(isShadowRoot(document.createElement('i-amphtml-shadow-root'))).to
+        .be.true;
     });
   });
 
@@ -318,8 +330,7 @@ describes.sandboxed('shadow-embed', {}, () => {
     it('should replace root selectors', () => {
       expect(scope('html {}')).to.equal('.h amp-html {}');
       expect(scope('body {}')).to.equal('.h amp-body {}');
-      expect(scope('html {} body {}')).to.equal(
-          '.h amp-html {}.h amp-body {}');
+      expect(scope('html {} body {}')).to.equal('.h amp-html {}.h amp-body {}');
       expect(scope('html, body {}')).to.equal('.h amp-html, .h amp-body {}');
       expect(scope('body.x {}')).to.equal('.h amp-body.x {}');
       expect(scope('body::after {}')).to.equal('.h amp-body::after {}');
@@ -369,26 +380,24 @@ describes.sandboxed('shadow-embed', {}, () => {
     });
 
     it('should resolve to streamer', () => {
-      expect(createShadowDomWriter(win))
-          .to.be.instanceOf(ShadowDomWriterStreamer);
+      expect(createShadowDomWriter(win)).to.be.instanceOf(
+        ShadowDomWriterStreamer
+      );
       expect(createHTMLDocumentSpy).to.be.calledOnce;
       expect(createHTMLDocumentSpy).to.be.calledWith('');
     });
 
     it('should resolve to bulk without API', () => {
       delete win.document.implementation.createHTMLDocument;
-      expect(createShadowDomWriter(win))
-          .to.be.instanceOf(ShadowDomWriterBulk);
+      expect(createShadowDomWriter(win)).to.be.instanceOf(ShadowDomWriterBulk);
       delete win.document.implementation;
-      expect(createShadowDomWriter(win))
-          .to.be.instanceOf(ShadowDomWriterBulk);
+      expect(createShadowDomWriter(win)).to.be.instanceOf(ShadowDomWriterBulk);
       expect(createHTMLDocumentSpy).to.not.be.called;
     });
 
     it('should resolve to bulk on firefox', () => {
       isFirefox = true;
-      expect(createShadowDomWriter(win))
-          .to.be.instanceOf(ShadowDomWriterBulk);
+      expect(createShadowDomWriter(win)).to.be.instanceOf(ShadowDomWriterBulk);
       expect(createHTMLDocumentSpy).to.not.be.called;
     });
   });
@@ -485,8 +494,9 @@ describes.sandboxed('shadow-embed', {}, () => {
     });
 
     it('should not parse noscript as markup', () => {
-      writer.write('<body><child1></child1><noscript><child2></child2>' +
-          '</noscript>');
+      writer.write(
+        '<body><child1></child1><noscript><child2></child2></noscript>'
+      );
       return waitForNextBodyChunk().then(() => {
         expect(win.document.body.querySelector('child1')).to.exist;
         expect(win.document.body.querySelector('child2')).not.to.exist;
diff --git a/test/unit/test-size-list.js b/test/unit/test-size-list.js
index 7c6ea36eecf5..cd0dbce6f839 100644
--- a/test/unit/test-size-list.js
+++ b/test/unit/test-size-list.js
@@ -16,9 +16,7 @@
 
 import {SizeList, parseSizeList} from '../../src/size-list';
 
-
 describe('SizeList parseSizeList', () => {
-
   it('should accept single option', () => {
     const res = parseSizeList(' \n 111px \n ');
     expect(res.sizes_.length).to.equal(1);
@@ -48,12 +46,14 @@ describe('SizeList parseSizeList', () => {
 
   it('should accept complicated media conditions', () => {
     const res = parseSizeList(
-        ' \n screen and (min-width: 1000px) \t ' +
+      ' \n screen and (min-width: 1000px) \t ' +
         ' and    (max-width: 2000px) 222px \n,' +
-        ' 111px \n');
+        ' 111px \n'
+    );
     expect(res.sizes_.length).to.equal(2);
     expect(res.sizes_[0].mediaQuery).to.equal(
-        'screen and (min-width: 1000px) and (max-width: 2000px)');
+      'screen and (min-width: 1000px) and (max-width: 2000px)'
+    );
     expect(res.sizes_[0].size).to.equal('222px');
     expect(res.sizes_[1].mediaQuery).to.equal(undefined);
     expect(res.sizes_[1].size).to.equal('111px');
@@ -74,8 +74,9 @@ describe('SizeList parseSizeList', () => {
   });
 
   it('should accept CSS functions', () => {
-    const res = parseSizeList('screen calc(111vw + 10px) \n' +
-        ', ca_1-C((50vw+20px) / 2) ');
+    const res = parseSizeList(
+      'screen calc(111vw + 10px) \n, ca_1-C((50vw+20px) / 2) '
+    );
     expect(res.sizes_.length).to.equal(2);
     expect(res.sizes_[0].mediaQuery).to.equal('screen');
     expect(res.sizes_[0].size).to.equal('calc(111vw + 10px)');
@@ -84,8 +85,9 @@ describe('SizeList parseSizeList', () => {
   });
 
   it('should tolerate right paren', () => {
-    const res = parseSizeList('(min-width:2000px)calc(11px)' +
-        ',(min-width:1000px)11px,12px');
+    const res = parseSizeList(
+      '(min-width:2000px)calc(11px),(min-width:1000px)11px,12px'
+    );
     expect(res.sizes_.length).to.equal(3);
     expect(res.sizes_[0].mediaQuery).to.equal('(min-width:2000px)');
     expect(res.sizes_[0].size).to.equal('calc(11px)');
@@ -97,47 +99,59 @@ describe('SizeList parseSizeList', () => {
 
   it('should fail on invalid CSS functions', () => {
     // Spaces are not allowed between function name and `(`.
-    allowConsoleError(() => { expect(() => {
-      parseSizeList('screen calc (111vw + 10px) \n, 10px ');
-    }).to.throw(/Invalid CSS function/); });
+    allowConsoleError(() => {
+      expect(() => {
+        parseSizeList('screen calc (111vw + 10px) \n, 10px ');
+      }).to.throw(/Invalid CSS function/);
+    });
 
     // Parens don't match.
-    allowConsoleError(() => { expect(() => {
-      parseSizeList('screen calc(111vw + 10px)) \n, 10px ');
-    }).to.throw(/Invalid CSS function/); });
-    allowConsoleError(() => { expect(() => {
-      parseSizeList('screen calc((111vw + 10px) \n, 10px ');
-    }).to.throw(/Invalid CSS function/); });
+    allowConsoleError(() => {
+      expect(() => {
+        parseSizeList('screen calc(111vw + 10px)) \n, 10px ');
+      }).to.throw(/Invalid CSS function/);
+    });
+    allowConsoleError(() => {
+      expect(() => {
+        parseSizeList('screen calc((111vw + 10px) \n, 10px ');
+      }).to.throw(/Invalid CSS function/);
+    });
   });
 
   it('should accept percent when allowed', () => {
-    const res = parseSizeList(' \n 111% \n ',
-        /* opt_allowPercentAsLength */ true);
+    const res = parseSizeList(
+      ' \n 111% \n ',
+      /* opt_allowPercentAsLength */ true
+    );
     expect(res.sizes_.length).to.equal(1);
     expect(res.sizes_[0].mediaQuery).to.equal(undefined);
     expect(res.sizes_[0].size).to.equal('111%');
   });
 
   it('should not accept percent', () => {
-    allowConsoleError(() => { expect(() => {
-      parseSizeList(' \n 111% \n ', /* opt_allowPercentAsLength */ false);
-    }).to.throw(/Invalid length value/); });
+    allowConsoleError(() => {
+      expect(() => {
+        parseSizeList(' \n 111% \n ', /* opt_allowPercentAsLength */ false);
+      }).to.throw(/Invalid length value/);
+    });
   });
 
   it('should fail bad length', () => {
-    allowConsoleError(() => { expect(() => {
-      parseSizeList(' \n 111 \n ');
-    }).to.throw(/Invalid length value/); });
+    allowConsoleError(() => {
+      expect(() => {
+        parseSizeList(' \n 111 \n ');
+      }).to.throw(/Invalid length value/);
+    });
   });
 });
 
-
 describe('SizeList construct', () => {
-
   it('should have at least one option', () => {
-    allowConsoleError(() => { expect(() => {
-      new SizeList([]);
-    }).to.throw(/SizeList must have at least one option/); });
+    allowConsoleError(() => {
+      expect(() => {
+        new SizeList([]);
+      }).to.throw(/SizeList must have at least one option/);
+    });
   });
 
   it('the last option must not have a query', () => {
@@ -146,22 +160,25 @@ describe('SizeList construct', () => {
         new SizeList([{mediaQuery: 'screen', size: '111px'}]);
       }).to.throw(/The last option must not have a media condition/);
       expect(() => {
-        new SizeList([{mediaQuery: 'print', size: '222px'},
-          {mediaQuery: 'screen', size: '111px'}]);
+        new SizeList([
+          {mediaQuery: 'print', size: '222px'},
+          {mediaQuery: 'screen', size: '111px'},
+        ]);
       }).to.throw(/The last option must not have a media condition/);
     });
   });
 
   it('non-last options must have media query', () => {
-    allowConsoleError(() => { expect(() => {
-      new SizeList([{size: '222px'}, {size: '111px'}]);
-    }).to.throw(
-        /All options except for the last must have a media condition/);
+    allowConsoleError(() => {
+      expect(() => {
+        new SizeList([{size: '222px'}, {size: '111px'}]);
+      }).to.throw(
+        /All options except for the last must have a media condition/
+      );
     });
   });
 });
 
-
 describe('SizeList select', () => {
   it('should select default last option', () => {
     const sizeList = new SizeList([
@@ -170,11 +187,13 @@ describe('SizeList select', () => {
       {mediaQuery: 'media3', size: '222px'},
       {size: '111px'},
     ]);
-    expect(sizeList.select({
-      matchMedia: () => {
-        return {};
-      },
-    })).to.equal('111px');
+    expect(
+      sizeList.select({
+        matchMedia: () => {
+          return {};
+        },
+      })
+    ).to.equal('111px');
   });
 
   it('should select a matching option', () => {
@@ -184,14 +203,16 @@ describe('SizeList select', () => {
       {mediaQuery: 'media3', size: '222px'},
       {size: '111px'},
     ]);
-    expect(sizeList.select({
-      matchMedia: mq => {
-        if (mq == 'media2') {
-          return {matches: true};
-        }
-        return {};
-      },
-    })).to.equal('333px');
+    expect(
+      sizeList.select({
+        matchMedia: mq => {
+          if (mq == 'media2') {
+            return {matches: true};
+          }
+          return {};
+        },
+      })
+    ).to.equal('333px');
   });
 
   it('should select first matching option', () => {
@@ -201,13 +222,15 @@ describe('SizeList select', () => {
       {mediaQuery: 'media3', size: '222px'},
       {size: '111px'},
     ]);
-    expect(sizeList.select({
-      matchMedia: mq => {
-        if (mq == 'media1' || mq == 'media2') {
-          return {matches: true};
-        }
-        return {};
-      },
-    })).to.equal('444px');
+    expect(
+      sizeList.select({
+        matchMedia: mq => {
+          if (mq == 'media1' || mq == 'media2') {
+            return {matches: true};
+          }
+          return {};
+        },
+      })
+    ).to.equal('444px');
   });
 });
diff --git a/test/unit/test-srcset.js b/test/unit/test-srcset.js
index 7194f4b96d2c..51fac6db4f8d 100644
--- a/test/unit/test-srcset.js
+++ b/test/unit/test-srcset.js
@@ -21,10 +21,8 @@ import {
   srcsetFromSrc,
 } from '../../src/srcset';
 
-
 describe('Srcset', () => {
   describe('parseSrcset', () => {
-
     function test(s, expected) {
       const res = parseSrcset(s);
       expect(res.sources_.length).to.equal(expected.length);
@@ -38,18 +36,12 @@ describe('Srcset', () => {
     }
 
     it('should accept single source, default to 1px', () => {
-      test(' \n image \n ', [
-        {url: 'image', dpr: 1},
-      ]);
+      test(' \n image \n ', [{url: 'image', dpr: 1}]);
     });
 
     it('should ignore empty source', () => {
-      test(' \n image \n, ', [
-        {url: 'image', dpr: 1},
-      ]);
-      test(' , \n image \n, ', [
-        {url: 'image', dpr: 1},
-      ]);
+      test(' \n image \n, ', [{url: 'image', dpr: 1}]);
+      test(' , \n image \n, ', [{url: 'image', dpr: 1}]);
     });
 
     it('should accept multiple sources, default to 1x', () => {
@@ -124,12 +116,8 @@ describe('Srcset', () => {
         {url: 'image,1x', dpr: 1},
         {url: 'image,2x', dpr: 2},
       ]);
-      test(' \n image,1 \n ', [
-        {url: 'image,1', dpr: 1},
-      ]);
-      test(' \n image,1x \n ', [
-        {url: 'image,1x', dpr: 1},
-      ]);
+      test(' \n image,1 \n ', [{url: 'image,1', dpr: 1}]);
+      test(' \n image,1x \n ', [{url: 'image,1x', dpr: 1}]);
     });
 
     it('should accept no-whitestpace', () => {
@@ -145,12 +133,8 @@ describe('Srcset', () => {
         {url: 'image,2', dpr: 1},
         {url: 'image,1', dpr: 2},
       ]);
-      test('image,2 2x', [
-        {url: 'image,2', dpr: 2},
-      ]);
-      test('image,1', [
-        {url: 'image,1', dpr: 1},
-      ]);
+      test('image,2 2x', [{url: 'image,2', dpr: 2}]);
+      test('image,1', [{url: 'image,1', dpr: 1}]);
     });
 
     it('should accept other special chars in URLs', () => {
@@ -169,35 +153,32 @@ describe('Srcset', () => {
         {url: 'image,2x', dpr: 1},
         {url: 'image,1x', dpr: 2},
       ]);
-      test(' \n image,1x \n ', [
-        {url: 'image,1x', dpr: 1},
-      ]);
-      test(' \n image,1w \n ', [
-        {url: 'image,1w', dpr: 1},
-      ]);
+      test(' \n image,1x \n ', [{url: 'image,1x', dpr: 1}]);
+      test(' \n image,1w \n ', [{url: 'image,1w', dpr: 1}]);
     });
 
     it('should not accept mixed sources', () => {
-      allowConsoleError(() => { expect(() => {
-        parseSrcset(' \n image1 100w\n , \n image2 1.5x\n , image3 ');
-      }).to.throw(/Srcset must have width or dpr sources, but not both/); });
+      allowConsoleError(() => {
+        expect(() => {
+          parseSrcset(' \n image1 100w\n , \n image2 1.5x\n , image3 ');
+        }).to.throw(/Srcset must have width or dpr sources, but not both/);
+      });
     });
 
     it('should parse misc examples', () => {
-      test('image-1x.png 1x, image-2x.png 2x, image-3x.png 3x, image-4x.png 4x',
-          [
-            {url: 'image-1x.png', dpr: 1},
-            {url: 'image-2x.png', dpr: 2},
-            {url: 'image-3x.png', dpr: 3},
-            {url: 'image-4x.png', dpr: 4},
-          ]);
-      test('image,one.png', [
-        {url: 'image,one.png', dpr: 1},
-      ]);
+      test(
+        'image-1x.png 1x, image-2x.png 2x, image-3x.png 3x, image-4x.png 4x',
+        [
+          {url: 'image-1x.png', dpr: 1},
+          {url: 'image-2x.png', dpr: 2},
+          {url: 'image-3x.png', dpr: 3},
+          {url: 'image-4x.png', dpr: 4},
+        ]
+      );
+      test('image,one.png', [{url: 'image,one.png', dpr: 1}]);
     });
   });
 
-
   describe('srcsetFromElement', () => {
     function test(srcset, src, expected) {
       const element = document.createElement('div');
@@ -233,15 +214,11 @@ describe('Srcset', () => {
     });
 
     it('should select src when only src available', () => {
-      test(undefined, 'image-0.png', [
-        {url: 'image-0.png', dpr: 1},
-      ]);
+      test(undefined, 'image-0.png', [{url: 'image-0.png', dpr: 1}]);
     });
 
     it('should select src when only srcset is empty', () => {
-      test('', 'image-0.png', [
-        {url: 'image-0.png', dpr: 1},
-      ]);
+      test('', 'image-0.png', [{url: 'image-0.png', dpr: 1}]);
     });
 
     it('should prefer srcset to src', () => {
@@ -252,21 +229,20 @@ describe('Srcset', () => {
     });
 
     it('should allow non-compliant src with space', () => {
-      test(undefined, 'image 0.png', [
-        {url: 'image 0.png', dpr: 1},
-      ]);
+      test(undefined, 'image 0.png', [{url: 'image 0.png', dpr: 1}]);
     });
 
     it('should require srcset or src to be available', () => {
-      allowConsoleError(() => { expect(() => {
-        srcsetFromElement(document.createElement('div'));
-      }).to.throw(
-          /Either non-empty "srcset" or "src" attribute must be specified/);
+      allowConsoleError(() => {
+        expect(() => {
+          srcsetFromElement(document.createElement('div'));
+        }).to.throw(
+          /Either non-empty "srcset" or "src" attribute must be specified/
+        );
       });
     });
   });
 
-
   describe('srcsetFromSrc', () => {
     it('should construct with undefined width and 1 dpr', () => {
       const srcset = srcsetFromSrc('image-0.png');
@@ -279,49 +255,61 @@ describe('Srcset', () => {
     });
   });
 
-
   describe('construct', () => {
     it('should enforce only one type of descriptor per source', () => {
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image-1000', width: 100, dpr: 2}]);
-      }).to.throw(/Srcset must have width or dpr sources, but not both/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([{url: 'image-1000', width: 100, dpr: 2}]);
+        }).to.throw(/Srcset must have width or dpr sources, but not both/);
+      });
     });
 
     it('should not allow 0-width descriptor', () => {
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image-1000', width: 0}]);
-      }).to.throw(/Srcset must have width or dpr sources, but not both/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([{url: 'image-1000', width: 0}]);
+        }).to.throw(/Srcset must have width or dpr sources, but not both/);
+      });
     });
 
     it('should not allow 0-dpr descriptor', () => {
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image-1000', dpr: 0}]);
-      }).to.throw(/Srcset must have width or dpr sources, but not both/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([{url: 'image-1000', dpr: 0}]);
+        }).to.throw(/Srcset must have width or dpr sources, but not both/);
+      });
     });
 
     it('should enforce only one type of descriptor total', () => {
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image-1000', width: 100},
-          {url: 'image-2x', dpr: 2}]);
-      }).to.throw(/Srcset must have width or dpr sources, but not both/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([
+            {url: 'image-1000', width: 100},
+            {url: 'image-2x', dpr: 2},
+          ]);
+        }).to.throw(/Srcset must have width or dpr sources, but not both/);
+      });
     });
 
     it('should not allow duplicate sources', () => {
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image', width: 100},
-          {url: 'image', width: 100}]);
-      }).to.throw(/Duplicate width/); });
-      allowConsoleError(() => { expect(() => {
-        new Srcset([{url: 'image', dpr: 2}, {url: 'image', dpr: 2}]);
-      }).to.throw(/Duplicate dpr/); });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([{url: 'image', width: 100}, {url: 'image', width: 100}]);
+        }).to.throw(/Duplicate width/);
+      });
+      allowConsoleError(() => {
+        expect(() => {
+          new Srcset([{url: 'image', dpr: 2}, {url: 'image', dpr: 2}]);
+        }).to.throw(/Duplicate dpr/);
+      });
     });
   });
 
-
   describe('select', () => {
     it('select by width', () => {
       const srcset = parseSrcset(
-          'image-1000 1000w, image-500 500w, image-250 250w, image 50w');
+        'image-1000 1000w, image-500 500w, image-250 250w, image 50w'
+      );
 
       // DPR = 1
       expect(srcset.select(2000, 1)).to.equal('image-1000');
@@ -359,7 +347,8 @@ describe('Srcset', () => {
 
     it('select by width with preference toward higher width', () => {
       const srcset = parseSrcset(
-          'image-1000 1000w, image-500 500w, image-250 250w, image 50w');
+        'image-1000 1000w, image-500 500w, image-250 250w, image 50w'
+      );
 
       // For DPR=1 and 2.
       // Bull's eye.
diff --git a/test/unit/test-ssr-template-helper.js b/test/unit/test-ssr-template-helper.js
index 77a472fa1e58..ae3246bec0ac 100644
--- a/test/unit/test-ssr-template-helper.js
+++ b/test/unit/test-ssr-template-helper.js
@@ -17,153 +17,189 @@
 import {Services} from '../../src/services';
 import {SsrTemplateHelper} from '../../src/ssr-template-helper';
 
-describes.fakeWin('ssr-template-helper', {
-  amp: true,
-}, env => {
-  let ampdoc;
-  let hasCapabilityStub;
-  let sandbox;
-  let ssrTemplateHelper;
-  const sourceComponent = 'amp-list';
-  let maybeFindTemplateStub;
-  let templates;
-  let viewer;
-  let win;
+describes.fakeWin(
+  'ssr-template-helper',
+  {
+    amp: true,
+  },
+  env => {
+    let ampdoc;
+    let hasCapabilityStub;
+    let sandbox;
+    let ssrTemplateHelper;
+    const sourceComponent = 'amp-list';
+    let maybeFindTemplateStub;
+    let templates;
+    let viewer;
+    let win;
 
-  beforeEach(() => {
-    ampdoc = env.ampdoc;
-    sandbox = sinon.sandbox;
-    win = env.win;
-    templates = Services.templatesFor(win);
-    viewer = Services.viewerForDoc(ampdoc);
-    hasCapabilityStub = sandbox.stub(viewer, 'hasCapability');
-    maybeFindTemplateStub = sandbox.stub(templates, 'maybeFindTemplate');
-    ssrTemplateHelper =
-        new SsrTemplateHelper(sourceComponent, viewer, templates);
-  });
-
-  afterEach(() => {
-    win.document.documentElement.removeAttribute(
-        'allow-viewer-render-template');
-    sandbox.restore();
-  });
-
-  describe('isSupported', () => {
-    it('should return true if doc level opt-in', () => {
-      win.document.documentElement.setAttribute(
-          'allow-viewer-render-template', true);
-      hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
-      expect(ssrTemplateHelper.isSupported()).to.be.true;
+    beforeEach(() => {
+      ampdoc = env.ampdoc;
+      sandbox = sinon.sandbox;
+      win = env.win;
+      templates = Services.templatesFor(win);
+      viewer = Services.viewerForDoc(ampdoc);
+      hasCapabilityStub = sandbox.stub(viewer, 'hasCapability');
+      maybeFindTemplateStub = sandbox.stub(templates, 'maybeFindTemplate');
+      ssrTemplateHelper = new SsrTemplateHelper(
+        sourceComponent,
+        viewer,
+        templates
+      );
     });
 
-    it('should return false if not doc level opt-in', () => {
-      hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
-      expect(ssrTemplateHelper.isSupported()).to.be.false;
+    afterEach(() => {
+      win.document.documentElement.removeAttribute(
+        'allow-viewer-render-template'
+      );
+      sandbox.restore();
     });
 
-    it('should return false if doc level opt-in but viewer does not have '
-      + 'capability', () => {
-      win.document.documentElement.setAttribute(
-          'allow-viewer-render-template', true);
-      hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
-      expect(ssrTemplateHelper.isSupported()).to.be.false;
+    describe('isSupported', () => {
+      it('should return true if doc level opt-in', () => {
+        win.document.documentElement.setAttribute(
+          'allow-viewer-render-template',
+          true
+        );
+        hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
+        expect(ssrTemplateHelper.isSupported()).to.be.true;
+      });
+
+      it('should return false if not doc level opt-in', () => {
+        hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
+        expect(ssrTemplateHelper.isSupported()).to.be.false;
+      });
+
+      it(
+        'should return false if doc level opt-in but viewer does not have ' +
+          'capability',
+        () => {
+          win.document.documentElement.setAttribute(
+            'allow-viewer-render-template',
+            true
+          );
+          hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
+          expect(ssrTemplateHelper.isSupported()).to.be.false;
+        }
+      );
     });
-  });
 
-  describe('fetchAndRenderTemplate', () => {
-    it('should build payload', () => {
-      const request = {
-        'xhrUrl': 'https://www.abracadabra.org/some-json',
-        'fetchOpt': {
-          'body': {},
-          'credentials': undefined,
-          'headers': undefined,
-          'method': 'GET',
-          'requireAmpResponseSourceOrigin': false,
-          'ampCors': true,
-        },
-      };
-      const sendMessage = sandbox.spy(viewer, 'sendMessageAwaitResponse');
-      maybeFindTemplateStub.returns(null);
-      const templates = {
-        successTemplate: {'innerHTML': '<div>much success</div>'},
-        errorTemplate: {'innerHTML': '<div>try again</div>'},
-      };
-      ssrTemplateHelper.fetchAndRenderTemplate(
-          {}, request, templates, {attr: 'test'});
-      expect(sendMessage).calledWith('viewerRenderTemplate', {
-        'ampComponent': {
-          'type': 'amp-list',
-          'successTemplate': {
-            'type': 'amp-mustache',
-            'payload': '<div>much success</div>',
-          },
-          'errorTemplate': {
-            'type': 'amp-mustache',
-            'payload': '<div>try again</div>',
-          },
-          'attr': 'test',
-        },
-        'originalRequest': {
-          'init': {
-            'ampCors': true,
+    describe('fetchAndRenderTemplate', () => {
+      it('should build payload', () => {
+        const request = {
+          'xhrUrl': 'https://www.abracadabra.org/some-json',
+          'fetchOpt': {
             'body': {},
             'credentials': undefined,
             'headers': undefined,
             'method': 'GET',
             'requireAmpResponseSourceOrigin': false,
+            'ampCors': true,
+          },
+        };
+        const sendMessage = sandbox.spy(viewer, 'sendMessageAwaitResponse');
+        maybeFindTemplateStub.returns(null);
+        const templates = {
+          successTemplate: {'innerHTML': '<div>much success</div>'},
+          errorTemplate: {'innerHTML': '<div>try again</div>'},
+        };
+        ssrTemplateHelper.fetchAndRenderTemplate({}, request, templates, {
+          attr: 'test',
+        });
+        expect(sendMessage).calledWith('viewerRenderTemplate', {
+          'ampComponent': {
+            'type': 'amp-list',
+            'successTemplate': {
+              'type': 'amp-mustache',
+              'payload': '<div>much success</div>',
+            },
+            'errorTemplate': {
+              'type': 'amp-mustache',
+              'payload': '<div>try again</div>',
+            },
+            'attr': 'test',
+          },
+          'originalRequest': {
+            'init': {
+              'ampCors': true,
+              'body': {},
+              'credentials': undefined,
+              'headers': undefined,
+              'method': 'GET',
+              'requireAmpResponseSourceOrigin': false,
+            },
+            'input': 'https://www.abracadabra.org/some-json',
           },
-          'input': 'https://www.abracadabra.org/some-json',
-        },
+        });
       });
     });
-  });
 
-  describe('rendering templates', () => {
-    let findAndSetHtmlForTemplate;
-    let findAndRenderTemplate;
-    let findAndRenderTemplateArray;
-    beforeEach(() => {
-      win.document.documentElement.setAttribute(
-          'allow-viewer-render-template', true);
-      hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
-      findAndSetHtmlForTemplate =
-        sandbox.stub(templates, 'findAndSetHtmlForTemplate');
-      findAndRenderTemplate =
-          sandbox.stub(templates, 'findAndRenderTemplate');
-      findAndRenderTemplateArray =
-          sandbox.stub(templates, 'findAndRenderTemplateArray');
-    });
-
-    describe('renderTemplate', () => {
-      it('should set html template', () => {
-        ssrTemplateHelper.renderTemplate(
-            {}, {html: '<div>some template</div>'});
-        expect(findAndSetHtmlForTemplate)
-            .to.have.been.calledWith({}, '<div>some template</div>');
+    describe('rendering templates', () => {
+      let findAndSetHtmlForTemplate;
+      let findAndRenderTemplate;
+      let findAndRenderTemplateArray;
+      beforeEach(() => {
+        win.document.documentElement.setAttribute(
+          'allow-viewer-render-template',
+          true
+        );
+        hasCapabilityStub.withArgs('viewerRenderTemplate').returns(true);
+        findAndSetHtmlForTemplate = sandbox.stub(
+          templates,
+          'findAndSetHtmlForTemplate'
+        );
+        findAndRenderTemplate = sandbox.stub(
+          templates,
+          'findAndRenderTemplate'
+        );
+        findAndRenderTemplateArray = sandbox.stub(
+          templates,
+          'findAndRenderTemplateArray'
+        );
       });
 
-      it('should throw error if html template is not defined', () => {
-        allowConsoleError(() => { expect(() => {
-          ssrTemplateHelper.renderTemplate({}, {html: null});
-        }).to.throw(/Server side html response must be defined/); });
-      });
+      describe('renderTemplate', () => {
+        it('should set html template', () => {
+          ssrTemplateHelper.renderTemplate(
+            {},
+            {html: '<div>some template</div>'}
+          );
+          expect(findAndSetHtmlForTemplate).to.have.been.calledWith(
+            {},
+            '<div>some template</div>'
+          );
+        });
 
-      it('should render template ', () => {
-        hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
-        ssrTemplateHelper.renderTemplate(
-            {}, {data: '<div>some template</div>'});
-        expect(findAndRenderTemplate)
-            .to.have.been.calledWith({}, {data: '<div>some template</div>'});
-      });
+        it('should throw error if html template is not defined', () => {
+          allowConsoleError(() => {
+            expect(() => {
+              ssrTemplateHelper.renderTemplate({}, {html: null});
+            }).to.throw(/Server side html response must be defined/);
+          });
+        });
+
+        it('should render template ', () => {
+          hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
+          ssrTemplateHelper.renderTemplate(
+            {},
+            {data: '<div>some template</div>'}
+          );
+          expect(findAndRenderTemplate).to.have.been.calledWith(
+            {},
+            {data: '<div>some template</div>'}
+          );
+        });
 
-      it('should set template array ', () => {
-        hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
-        ssrTemplateHelper.renderTemplate(
-            {}, [{data: '<div>some template</div>'}]);
-        expect(findAndRenderTemplateArray)
-            .to.have.been.calledWith({}, [{data: '<div>some template</div>'}]);
+        it('should set template array ', () => {
+          hasCapabilityStub.withArgs('viewerRenderTemplate').returns(false);
+          ssrTemplateHelper.renderTemplate({}, [
+            {data: '<div>some template</div>'},
+          ]);
+          expect(findAndRenderTemplateArray).to.have.been.calledWith({}, [
+            {data: '<div>some template</div>'},
+          ]);
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-standard-actions.js b/test/unit/test-standard-actions.js
index a51af83a6dd5..48daba4e9123 100644
--- a/test/unit/test-standard-actions.js
+++ b/test/unit/test-standard-actions.js
@@ -48,13 +48,14 @@ describes.sandboxed('StandardActions', {}, () => {
   }
 
   function stubMutate(methodName) {
-    return sandbox.stub(standardActions.resources_, methodName).callsFake(
-        (unusedElement, mutator) => mutator());
+    return sandbox
+      .stub(standardActions.resources_, methodName)
+      .callsFake((unusedElement, mutator) => mutator());
   }
 
   function expectElementMutatedAsync(element) {
-    expect(mutateElementStub.withArgs(element, sinon.match.any))
-        .to.be.calledOnce;
+    expect(mutateElementStub.withArgs(element, sinon.match.any)).to.be
+      .calledOnce;
   }
 
   function expectElementToHaveBeenHidden(element) {
@@ -114,35 +115,43 @@ describes.sandboxed('StandardActions', {}, () => {
     standardActions = new StandardActions(ampdoc);
     mutateElementStub = stubMutate('mutateElement');
     scrollStub = sandbox.stub(
-        standardActions.viewport_,
-        'animateScrollIntoView');
-
+      standardActions.viewport_,
+      'animateScrollIntoView'
+    );
   });
 
   describe('getAutofocusElementForShowAction', () => {
-
     let html;
     beforeEach(() => {
       html = htmlFor(document);
     });
 
     it('returns element (direct)', () => {
-      const el = html`<input autofocus>`;
+      const el = html`
+        <input autofocus />
+      `;
       expect(getAutofocusElementForShowAction(el)).to.equal(el);
     });
 
     it('returns element (wrapped)', () => {
-      const el = html`<input autofocus>`;
-      const wrapper = html`<div><div></div></div>`;
+      const el = html`
+        <input autofocus />
+      `;
+      const wrapper = html`
+        <div><div></div></div>
+      `;
       wrapper.firstElementChild.appendChild(el);
       expect(getAutofocusElementForShowAction(wrapper)).to.equal(el);
     });
 
     it('returns null', () => {
-      const el = html`<div><div><input></div></div>`;
+      const el = html`
+        <div>
+          <div><input /></div>
+        </div>
+      `;
       expect(getAutofocusElementForShowAction(el)).to.be.null;
     });
-
   });
 
   describe('"hide" action', () => {
@@ -195,7 +204,6 @@ describes.sandboxed('StandardActions', {}, () => {
     });
 
     describe('iOS force sync', () => {
-
       let html;
       beforeEach(() => {
         html = htmlFor(document);
@@ -203,46 +211,57 @@ describes.sandboxed('StandardActions', {}, () => {
       });
 
       it('executes asynchronously when no autofocus (wrapped)', () => {
-        const node = html`<div><div><input></div></div>`;
+        const node = html`
+          <div>
+            <div><input /></div>
+          </div>
+        `;
         standardActions.handleShow_(trustedInvocation({node}));
         expectElementToHaveBeenShown(node, /* sync */ false);
       });
 
       it('executes asynchronously when no autofocus (direct)', () => {
-        const node = html`<input>`;
+        const node = html`
+          <input />
+        `;
         standardActions.handleShow_(trustedInvocation({node}));
         expectElementToHaveBeenShown(node, /* sync */ false);
       });
 
       it('executes synchronously when autofocus (wrapped)', () => {
-        const node = html`<div><div><input autofocus></div></div>`;
+        const node = html`
+          <div>
+            <div><input autofocus /></div>
+          </div>
+        `;
         standardActions.handleShow_(trustedInvocation({node}));
         expectElementToHaveBeenShown(node, /* sync */ true);
       });
 
       it('executes synchronously when autofocus (direct)', () => {
-        const node = html`<input autofocus>`;
+        const node = html`
+          <input autofocus />
+        `;
         standardActions.handleShow_(trustedInvocation({node}));
         expectElementToHaveBeenShown(node, /* sync */ true);
       });
-
     });
 
     describe('autofocus', () => {
-
       let html;
       beforeEach(() => {
         html = htmlFor(document);
       });
 
       describe('iOS force sync', () => {
-
         beforeEach(() => {
           stubPlatformIsIos();
         });
 
         it('focuses [autofocus] element synchronously (direct)', () => {
-          const node = html`<input autofocus>`;
+          const node = html`
+            <input autofocus />
+          `;
           node.focus = sandbox.spy();
 
           standardActions.handleShow_(trustedInvocation({node}));
@@ -252,8 +271,12 @@ describes.sandboxed('StandardActions', {}, () => {
         });
 
         it('focuses [autofocus] element synchronously (wrapped)', () => {
-          const wrapper = html`<div><div></div></div>`;
-          const node = html`<input autofocus>`;
+          const wrapper = html`
+            <div><div></div></div>
+          `;
+          const node = html`
+            <input autofocus />
+          `;
           node.focus = sandbox.spy();
 
           wrapper.firstElementChild.appendChild(node);
@@ -264,7 +287,9 @@ describes.sandboxed('StandardActions', {}, () => {
         });
 
         it('does not focus element', () => {
-          const node = html`<input>`;
+          const node = html`
+            <input />
+          `;
           node.focus = sandbox.spy();
 
           standardActions.handleShow_(trustedInvocation({node}));
@@ -272,13 +297,14 @@ describes.sandboxed('StandardActions', {}, () => {
           expectElementMutatedAsync(node);
           expect(node.focus).to.not.have.been.called;
         });
-
       });
 
       it('focuses [autofocus] element asynchronously (direct)', () => {
         stubPlatformIsIos(false);
 
-        const node = html`<input autofocus>`;
+        const node = html`
+          <input autofocus />
+        `;
         node.focus = sandbox.spy();
 
         standardActions.handleShow_(trustedInvocation({node}));
@@ -290,8 +316,12 @@ describes.sandboxed('StandardActions', {}, () => {
       it('focuses [autofocus] element asynchronously (wrapped)', () => {
         stubPlatformIsIos(false);
 
-        const wrapper = html`<div><div></div></div>`;
-        const node = html`<input autofocus>`;
+        const wrapper = html`
+          <div><div></div></div>
+        `;
+        const node = html`
+          <input autofocus />
+        `;
         node.focus = sandbox.spy();
 
         wrapper.firstElementChild.appendChild(node);
@@ -302,7 +332,9 @@ describes.sandboxed('StandardActions', {}, () => {
       });
 
       it('does not focus element', () => {
-        const node = html`<input>`;
+        const node = html`
+          <input />
+        `;
         node.focus = sandbox.spy();
 
         standardActions.handleShow_(trustedInvocation({node}));
@@ -310,9 +342,7 @@ describes.sandboxed('StandardActions', {}, () => {
         expectElementMutatedAsync(node);
         expect(node.focus).to.not.have.been.called;
       });
-
     });
-
   });
 
   describe('"toggle" action', () => {
@@ -373,7 +403,8 @@ describes.sandboxed('StandardActions', {}, () => {
         satisfiesTrust: () => true,
         args: {
           'class': dummyClass,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToHaveClass(element, dummyClass);
     });
@@ -386,7 +417,8 @@ describes.sandboxed('StandardActions', {}, () => {
         satisfiesTrust: () => true,
         args: {
           'class': dummyClass,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToDropClass(element, dummyClass);
     });
@@ -399,7 +431,8 @@ describes.sandboxed('StandardActions', {}, () => {
         args: {
           'class': dummyClass,
           'force': true,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToHaveClass(element, dummyClass);
     });
@@ -413,7 +446,8 @@ describes.sandboxed('StandardActions', {}, () => {
         args: {
           'class': dummyClass,
           'force': true,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToHaveClass(element, dummyClass);
     });
@@ -426,7 +460,8 @@ describes.sandboxed('StandardActions', {}, () => {
         args: {
           'class': dummyClass,
           'force': false,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToDropClass(element, dummyClass);
     });
@@ -440,7 +475,8 @@ describes.sandboxed('StandardActions', {}, () => {
         args: {
           'class': dummyClass,
           'force': false,
-        }};
+        },
+      };
       standardActions.handleToggleClass_(invocation);
       expectElementToDropClass(element, dummyClass);
     });
@@ -524,7 +560,11 @@ describes.sandboxed('StandardActions', {}, () => {
         return standardActions.handleAmpTarget_(invocation).then(() => {
           expect(navigator.navigateTo).to.be.calledOnce;
           expect(navigator.navigateTo).to.be.calledWithExactly(
-              win, 'http://bar.com', 'AMP.navigateTo', {target: undefined, opener: undefined});
+            win,
+            'http://bar.com',
+            'AMP.navigateTo',
+            {target: undefined, opener: undefined}
+          );
         });
       });
 
@@ -535,23 +575,34 @@ describes.sandboxed('StandardActions', {}, () => {
         return standardActions.handleAmpTarget_(invocation).then(() => {
           expect(navigator.navigateTo).to.be.calledOnce;
           expect(navigator.navigateTo).to.be.calledWithExactly(
-              win, 'http://bar.com', 'AMP.navigateTo', {target: undefined, opener: undefined});
+            win,
+            'http://bar.com',
+            'AMP.navigateTo',
+            {target: undefined, opener: undefined}
+          );
         });
       });
 
-      it('should pass if node does not have throwIfCannotNavigate(), ' +
-        'given target', () => {
-        invocation.caller.tagName = 'AMP-FOO';
-        invocation.caller.getImpl = () => Promise.resolve({});
-        invocation.args['target'] = '_blank';
-        invocation.args['opener'] = true;
-
-        return standardActions.handleAmpTarget_(invocation).then(() => {
-          expect(navigator.navigateTo).to.be.calledOnce;
-          expect(navigator.navigateTo).to.be.calledWithExactly(
-              win, 'http://bar.com', 'AMP.navigateTo', {target: '_blank', opener: true});
-        });
-      });
+      it(
+        'should pass if node does not have throwIfCannotNavigate(), ' +
+          'given target',
+        () => {
+          invocation.caller.tagName = 'AMP-FOO';
+          invocation.caller.getImpl = () => Promise.resolve({});
+          invocation.args['target'] = '_blank';
+          invocation.args['opener'] = true;
+
+          return standardActions.handleAmpTarget_(invocation).then(() => {
+            expect(navigator.navigateTo).to.be.calledOnce;
+            expect(navigator.navigateTo).to.be.calledWithExactly(
+              win,
+              'http://bar.com',
+              'AMP.navigateTo',
+              {target: '_blank', opener: true}
+            );
+          });
+        }
+      );
 
       it('should check throwIfCannotNavigate() for AMP elements', function*() {
         const userError = sandbox.stub(user(), 'error');
@@ -563,25 +614,36 @@ describes.sandboxed('StandardActions', {}, () => {
         yield standardActions.handleAmpTarget_(invocation);
         expect(navigator.navigateTo).to.be.calledOnce;
         expect(navigator.navigateTo).to.be.calledWithExactly(
-            win, 'http://bar.com', 'AMP.navigateTo', {target: undefined, opener: undefined});
+          win,
+          'http://bar.com',
+          'AMP.navigateTo',
+          {target: undefined, opener: undefined}
+        );
 
         // Should succeed if throwIfCannotNavigate() returns null.
-        invocation.caller.getImpl = () => Promise.resolve({
-          throwIfCannotNavigate: () => null,
-        });
+        invocation.caller.getImpl = () =>
+          Promise.resolve({
+            throwIfCannotNavigate: () => null,
+          });
         yield standardActions.handleAmpTarget_(invocation);
         expect(navigator.navigateTo).to.be.calledTwice;
         expect(navigator.navigateTo.getCall(1)).to.be.calledWithExactly(
-            win, 'http://bar.com', 'AMP.navigateTo', {target: undefined, opener: undefined});
+          win,
+          'http://bar.com',
+          'AMP.navigateTo',
+          {target: undefined, opener: undefined}
+        );
 
         // Should fail if throwIfCannotNavigate() throws an error.
-        invocation.caller.getImpl = () => Promise.resolve({
-          throwIfCannotNavigate: () => { throw new Error('Fake error.'); },
-        });
+        invocation.caller.getImpl = () =>
+          Promise.resolve({
+            throwIfCannotNavigate: () => {
+              throw new Error('Fake error.');
+            },
+          });
         yield standardActions.handleAmpTarget_(invocation);
         expect(navigator.navigateTo).to.be.calledTwice;
-        expect(userError).to.be.calledWith('STANDARD-ACTIONS',
-            'Fake error.');
+        expect(userError).to.be.calledWith('STANDARD-ACTIONS', 'Fake error.');
       });
     });
 
@@ -591,11 +653,14 @@ describes.sandboxed('StandardActions', {}, () => {
       let winCloseStub;
 
       beforeEach(() => {
-        navigateToStub = sandbox.stub(standardActions, 'handleNavigateTo_')
-            .returns(Promise.resolve());
+        navigateToStub = sandbox
+          .stub(standardActions, 'handleNavigateTo_')
+          .returns(Promise.resolve());
 
-        closeOrNavigateToSpy = sandbox.spy(standardActions,
-            'handleCloseOrNavigateTo_');
+        closeOrNavigateToSpy = sandbox.spy(
+          standardActions,
+          'handleCloseOrNavigateTo_'
+        );
 
         winCloseStub = sandbox.stub(win, 'close');
         winCloseStub.callsFake(() => {
@@ -609,45 +674,43 @@ describes.sandboxed('StandardActions', {}, () => {
         invocation.caller = {tagName: 'DIV'};
       });
 
-      it('should be implemented', async() => {
+      it('should be implemented', async () => {
         await standardActions.handleAmpTarget_(invocation);
         expect(closeOrNavigateToSpy).to.be.calledOnce;
         expect(closeOrNavigateToSpy).to.be.calledWithExactly(invocation);
       });
 
-      it('should close window if allowed', async() => {
+      it('should close window if allowed', async () => {
         win.opener = {};
         win.parent = win;
         await standardActions.handleAmpTarget_(invocation);
         expect(winCloseStub).to.be.calledOnce;
         expect(navigateToStub).to.be.not.called;
-
       });
 
-      it('should NOT close if no opener', async() => {
+      it('should NOT close if no opener', async () => {
         win.opener = null;
         win.parent = win;
         await standardActions.handleAmpTarget_(invocation);
         expect(winCloseStub).to.be.not.called;
       });
 
-      it('should NOT close if has a parent', async() => {
+      it('should NOT close if has a parent', async () => {
         win.opener = {};
         win.parent = {};
         await standardActions.handleAmpTarget_(invocation);
         expect(winCloseStub).to.be.not.called;
       });
 
-      it('should NOT close if in multi-doc', async() => {
+      it('should NOT close if in multi-doc', async () => {
         win.opener = {};
         win.parent = win;
         sandbox.stub(ampdoc, 'isSingleDoc').returns(false);
         await standardActions.handleAmpTarget_(invocation);
         expect(winCloseStub).to.be.not.called;
-
       });
 
-      it('should navigate if not allowed to close', async() => {
+      it('should navigate if not allowed to close', async () => {
         win.opener = null;
         win.parent = win;
         sandbox.stub(ampdoc, 'isSingleDoc').returns(false);
@@ -656,7 +719,7 @@ describes.sandboxed('StandardActions', {}, () => {
         expect(navigateToStub).to.be.called;
       });
 
-      it('should navigate if win.close rejects', async() => {
+      it('should navigate if win.close rejects', async () => {
         win.opener = {};
         win.parent = win;
         winCloseStub.callsFake(() => {
@@ -676,7 +739,6 @@ describes.sandboxed('StandardActions', {}, () => {
       expect(goBackStub).to.be.calledOnce;
     });
 
-
     it('should implement optoutOfCid', function*() {
       const cid = cidServiceForDocForTesting(ampdoc);
       const optoutStub = sandbox.stub(cid, 'optOut');
@@ -693,8 +755,10 @@ describes.sandboxed('StandardActions', {}, () => {
       // Bind.invoke() doesn't actually resolve with a value,
       // but add one here to check that the promise is chained.
       bind.invoke.returns(Promise.resolve('set-state-complete'));
-      sandbox.stub(Services, 'bindForDocOrNull')
-          .withArgs(element).returns(Promise.resolve(bind));
+      sandbox
+        .stub(Services, 'bindForDocOrNull')
+        .withArgs(element)
+        .returns(Promise.resolve(bind));
 
       invocation.method = 'setState';
       invocation.args = {
@@ -716,8 +780,10 @@ describes.sandboxed('StandardActions', {}, () => {
       // Bind.invoke() doesn't actually resolve with a value,
       // but add one here to check that the promise is chained.
       bind.invoke.returns(Promise.resolve('push-state-complete'));
-      sandbox.stub(Services, 'bindForDocOrNull')
-          .withArgs(element).returns(Promise.resolve(bind));
+      sandbox
+        .stub(Services, 'bindForDocOrNull')
+        .withArgs(element)
+        .returns(Promise.resolve(bind));
 
       invocation.method = 'pushState';
       invocation.args = {
@@ -755,10 +821,10 @@ describes.sandboxed('StandardActions', {}, () => {
       };
       invocation.node = ampdoc;
       const element = createElement();
-      const elStub = sandbox.stub(ampdoc, 'getElementById')
-          .returns(element);
-      const scrollStub = sandbox.stub(standardActions, 'handleScrollTo_')
-          .returns('scrollToResponsePromise');
+      const elStub = sandbox.stub(ampdoc, 'getElementById').returns(element);
+      const scrollStub = sandbox
+        .stub(standardActions, 'handleScrollTo_')
+        .returns('scrollToResponsePromise');
       const result = standardActions.handleAmpTarget_(invocation);
       expect(elStub).to.be.calledWith('testIdElement');
       invocation.node = element;
@@ -780,8 +846,10 @@ describes.sandboxed('StandardActions', {}, () => {
         addGlobalMethodHandler: sandbox.spy(),
       };
       const embedElement = embedWin.document.documentElement;
-      sandbox.stub(Services, 'actionServiceForDoc')
-          .withArgs(embedElement).returns(embedActions);
+      sandbox
+        .stub(Services, 'actionServiceForDoc')
+        .withArgs(embedElement)
+        .returns(embedActions);
     });
 
     it('should configured the embedded actions service', () => {
diff --git a/test/unit/test-static-template.js b/test/unit/test-static-template.js
index 3d742c49adf8..ae89ca5da098 100644
--- a/test/unit/test-static-template.js
+++ b/test/unit/test-static-template.js
@@ -34,7 +34,9 @@ describe('Static Template', () => {
 
     it('works as a variable', () => {
       const html = htmlFor(document);
-      const div = html`<div attr="test"><p class="er"></p></div>`;
+      const div = html`
+        <div attr="test"><p class="er"></p></div>
+      `;
 
       expect(div.tagName).to.equal('DIV');
       expect(div.getAttribute('attr')).to.equal('test');
@@ -54,13 +56,17 @@ describe('Static Template', () => {
       const iDoc = iframe.contentDocument;
 
       const html = htmlFor(document);
-      let div = html`<div></div>`;
+      let div = html`
+        <div></div>
+      `;
       expect(div.ownerDocument).to.equal(document);
 
       div = htmlFor(iDoc)`<div></div>`;
       expect(div.ownerDocument).to.equal(iDoc);
 
-      div = html`<div></div>`;
+      div = html`
+        <div></div>
+      `;
       expect(div.ownerDocument).to.equal(iDoc);
 
       // Cleanup
@@ -106,8 +112,8 @@ describe('Static Template', () => {
     it('finds all elements with ref attribute', () => {
       // Prove it doesn't need html helper
       const el = document.createElement('div');
-      el./*TEST*/innerHTML = '<div ref="test"><span ref="s"></span></div>' +
-          '<div ref="d"></div>';
+      el./*TEST*/ innerHTML =
+        '<div ref="test"><span ref="s"></span></div><div ref="d"></div>';
 
       const refs = htmlRefs(el);
       expect(refs).to.deep.equal({
diff --git a/test/unit/test-storage.js b/test/unit/test-storage.js
index 8826af7decf9..ba1ef7e71063 100644
--- a/test/unit/test-storage.js
+++ b/test/unit/test-storage.js
@@ -23,7 +23,6 @@ import {
 } from '../../src/service/storage-impl';
 import {dev} from '../../src/log';
 
-
 describe('Storage', () => {
   let sandbox;
   let storage;
@@ -70,10 +69,12 @@ describe('Storage', () => {
   function expectStorage(keyValues) {
     const list = [];
     for (const k in keyValues) {
-      list.push(storage.get(k).then(value => {
-        const expectedValue = keyValues[k];
-        expect(value).to.equal(expectedValue, `For "${k}"`);
-      }));
+      list.push(
+        storage.get(k).then(value => {
+          const expectedValue = keyValues[k];
+          expect(value).to.equal(expectedValue, `For "${k}"`);
+        })
+      );
     }
     return Promise.all(list);
   }
@@ -82,54 +83,67 @@ describe('Storage', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
     store1.set('key2', 'value2');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .once();
-    return storage.get('key1').then(() => {
-      return storage.storePromise_;
-    }).then(store => {
-      expect(store.maxValues_).to.equal(8);
-    });
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .once();
+    return storage
+      .get('key1')
+      .then(() => {
+        return storage.storePromise_;
+      })
+      .then(store => {
+        expect(store.maxValues_).to.equal(8);
+      });
   });
 
   it('should initialize empty store with prototype-less objects', () => {
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(null))
-        .once();
-    return storage.get('key1').then(() => {
-      return storage.storePromise_;
-    }).then(store => {
-      expect(store.obj.__proto__).to.be.undefined;
-      expect(store.values_.__proto__).to.be.undefined;
-    });
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(null))
+      .once();
+    return storage
+      .get('key1')
+      .then(() => {
+        return storage.storePromise_;
+      })
+      .then(store => {
+        expect(store.obj.__proto__).to.be.undefined;
+        expect(store.values_.__proto__).to.be.undefined;
+      });
   });
 
   it('should restore store with prototype-less objects', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
     store1.set('key2', 'value2');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .once();
-    return storage.get('key1').then(() => {
-      return storage.storePromise_;
-    }).then(store => {
-      expect(store.obj.__proto__).to.be.undefined;
-      expect(store.values_.__proto__).to.be.undefined;
-    });
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .once();
+    return storage
+      .get('key1')
+      .then(() => {
+        return storage.storePromise_;
+      })
+      .then(store => {
+        expect(store.obj.__proto__).to.be.undefined;
+        expect(store.values_.__proto__).to.be.undefined;
+      });
   });
 
   it('should get the value first time and reuse store', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
     store1.set('key2', 'value2');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .once();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .once();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.get('key1');
     return promise.then(value => {
@@ -146,10 +160,11 @@ describe('Storage', () => {
   });
 
   it('should get the value from first ever request and reuse store', () => {
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(null))
-        .once();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(null))
+      .once();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.get('key1');
     return promise.then(value => {
@@ -166,10 +181,11 @@ describe('Storage', () => {
   });
 
   it('should recover from binding failure', () => {
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.reject('intentional'))
-        .once();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.reject('intentional'))
+      .once();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.get('key1');
     return promise.then(value => {
@@ -179,10 +195,11 @@ describe('Storage', () => {
   });
 
   it('should recover from binding error', () => {
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve('UNKNOWN FORMAT'))
-        .once();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve('UNKNOWN FORMAT'))
+      .once();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.get('key1');
     return promise.then(value => {
@@ -195,88 +212,114 @@ describe('Storage', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
     store1.set('key2', 'value2');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .once();
-    bindingMock.expects('saveBlob')
-        .withExactArgs('https://acme.com', sinon.match(arg => {
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .once();
+    bindingMock
+      .expects('saveBlob')
+      .withExactArgs(
+        'https://acme.com',
+        sinon.match(arg => {
           const store2 = new Store(JSON.parse(atob(arg)));
-          return (store2.get('key1') !== undefined &&
-              store2.get('key2') !== undefined);
-        }))
-        .returns(Promise.resolve())
-        .twice();
-    viewerMock.expects('broadcast')
-        .withExactArgs(sinon.match(arg => {
-          return (arg['type'] == 'amp-storage-reset' &&
-              arg['origin'] == 'https://acme.com');
-        }))
-        .twice();
+          return (
+            store2.get('key1') !== undefined && store2.get('key2') !== undefined
+          );
+        })
+      )
+      .returns(Promise.resolve())
+      .twice();
+    viewerMock
+      .expects('broadcast')
+      .withExactArgs(
+        sinon.match(arg => {
+          return (
+            arg['type'] == 'amp-storage-reset' &&
+            arg['origin'] == 'https://acme.com'
+          );
+        })
+      )
+      .twice();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.set('key1', true);
-    return promise.then(() => {
-      const store1Promise = storage.storePromise_;
-      expect(store1Promise).to.exist;
-
-      // Repeat.
-      return storage.set('key2', true).then(() => {
-        expect(storage.storePromise_).to.equal(store1Promise);
-      });
-    }).then(() => {
-      return expectStorage({
-        'key1': true,
-        'key2': true,
+    return promise
+      .then(() => {
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Repeat.
+        return storage.set('key2', true).then(() => {
+          expect(storage.storePromise_).to.equal(store1Promise);
+        });
+      })
+      .then(() => {
+        return expectStorage({
+          'key1': true,
+          'key2': true,
+        });
       });
-    });
   });
 
   it('should remove the key first time and reuse store', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
     store1.set('key2', 'value2');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .once();
-    bindingMock.expects('saveBlob')
-        .withExactArgs('https://acme.com', sinon.match(arg => {
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .once();
+    bindingMock
+      .expects('saveBlob')
+      .withExactArgs(
+        'https://acme.com',
+        sinon.match(arg => {
           const store2 = new Store(JSON.parse(atob(arg)));
-          return (store2.get('key1') === undefined);
-        }))
-        .returns(Promise.resolve())
-        .twice();
-    viewerMock.expects('broadcast')
-        .withExactArgs(sinon.match(arg => {
-          return (arg['type'] == 'amp-storage-reset' &&
-              arg['origin'] == 'https://acme.com');
-        }))
-        .twice();
+          return store2.get('key1') === undefined;
+        })
+      )
+      .returns(Promise.resolve())
+      .twice();
+    viewerMock
+      .expects('broadcast')
+      .withExactArgs(
+        sinon.match(arg => {
+          return (
+            arg['type'] == 'amp-storage-reset' &&
+            arg['origin'] == 'https://acme.com'
+          );
+        })
+      )
+      .twice();
     expect(storage.storePromise_).to.not.exist;
     const promise = storage.remove('key1');
-    return promise.then(() => {
-      const store1Promise = storage.storePromise_;
-      expect(store1Promise).to.exist;
-
-      // Repeat.
-      return storage.remove('key2').then(() => {
-        expect(storage.storePromise_).to.equal(store1Promise);
-      });
-    }).then(() => {
-      return expectStorage({
-        'key1': undefined,
-        'key2': undefined,
+    return promise
+      .then(() => {
+        const store1Promise = storage.storePromise_;
+        expect(store1Promise).to.exist;
+
+        // Repeat.
+        return storage.remove('key2').then(() => {
+          expect(storage.storePromise_).to.equal(store1Promise);
+        });
+      })
+      .then(() => {
+        return expectStorage({
+          'key1': undefined,
+          'key2': undefined,
+        });
       });
-    });
   });
 
   it('should react to reset messages', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .twice();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .twice();
     return storage.get('key1').then(value => {
       expect(value).to.equal('value1');
       const store1Promise = storage.storePromise_;
@@ -298,10 +341,11 @@ describe('Storage', () => {
   it('should ignore unrelated reset messages', () => {
     const store1 = new Store({});
     store1.set('key1', 'value1');
-    bindingMock.expects('loadBlob')
-        .withExactArgs('https://acme.com')
-        .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
-        .twice();
+    bindingMock
+      .expects('loadBlob')
+      .withExactArgs('https://acme.com')
+      .returns(Promise.resolve(btoa(JSON.stringify(store1.obj))))
+      .twice();
     return storage.get('key1').then(value => {
       expect(value).to.equal('value1');
       const store1Promise = storage.storePromise_;
@@ -317,7 +361,6 @@ describe('Storage', () => {
   });
 });
 
-
 describe('Store', () => {
   let sandbox;
   let clock;
@@ -438,7 +481,6 @@ describe('Store', () => {
   });
 });
 
-
 describe('LocalStorageBinding', () => {
   let sandbox;
   let windowApi;
@@ -475,20 +517,22 @@ describe('LocalStorageBinding', () => {
   });
 
   it('should load store when available', () => {
-    localStorageMock.expects('getItem')
-        .withExactArgs('amp-store:https://acme.com')
-        .returns('BLOB1')
-        .once();
+    localStorageMock
+      .expects('getItem')
+      .withExactArgs('amp-store:https://acme.com')
+      .returns('BLOB1')
+      .once();
     return binding.loadBlob('https://acme.com').then(blob => {
       expect(blob).to.equal('BLOB1');
     });
   });
 
   it('should load default store when not yet available', () => {
-    localStorageMock.expects('getItem')
-        .withExactArgs('amp-store:https://acme.com')
-        .returns(undefined)
-        .once();
+    localStorageMock
+      .expects('getItem')
+      .withExactArgs('amp-store:https://acme.com')
+      .returns(undefined)
+      .once();
     return binding.loadBlob('https://acme.com').then(blob => {
       expect(blob).to.not.exist;
     });
@@ -496,89 +540,107 @@ describe('LocalStorageBinding', () => {
 
   it('should reject on local storage failure w/ localStorage support', () => {
     binding.isLocalStorageSupported_ = true;
-    localStorageMock.expects('getItem')
-        .withExactArgs('amp-store:https://acme.com')
-        .throws(new Error('unknown'))
-        .once();
-    return binding.loadBlob('https://acme.com')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('ERROR');
-        });
+    localStorageMock
+      .expects('getItem')
+      .withExactArgs('amp-store:https://acme.com')
+      .throws(new Error('unknown'))
+      .once();
+    return binding
+      .loadBlob('https://acme.com')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('ERROR');
+      });
   });
 
   it('should succeed loadBlob w/o localStorage support', () => {
     binding.isLocalStorageSupported_ = false;
-    localStorageMock.expects('getItem')
-        .withExactArgs('amp-store:https://acme.com')
-        .throws(new Error('unknown'))
-        .once();
-    return binding.loadBlob('https://acme.com')
-        .then(res => `SUCCESS ${res}`, () => 'ERROR').then(res => {
-          // Resolves with null
-          expect(res).to.equal('SUCCESS null');
-        });
+    localStorageMock
+      .expects('getItem')
+      .withExactArgs('amp-store:https://acme.com')
+      .throws(new Error('unknown'))
+      .once();
+    return binding
+      .loadBlob('https://acme.com')
+      .then(res => `SUCCESS ${res}`, () => 'ERROR')
+      .then(res => {
+        // Resolves with null
+        expect(res).to.equal('SUCCESS null');
+      });
   });
 
   it('should bypass loading from localStorage if getItem throws', () => {
-    localStorageMock.expects('getItem')
-        .throws(new Error('unknown'))
-        .once();
+    localStorageMock
+      .expects('getItem')
+      .throws(new Error('unknown'))
+      .once();
     binding = new LocalStorageBinding(windowApi);
     localStorageMock.expects('getItem').never();
-    return binding.loadBlob('https://acme.com')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('SUCCESS');
-        });
+    return binding
+      .loadBlob('https://acme.com')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('SUCCESS');
+      });
   });
 
   it('should save store', () => {
-    localStorageMock.expects('setItem')
-        .withExactArgs('amp-store:https://acme.com', 'BLOB1')
-        .once();
+    localStorageMock
+      .expects('setItem')
+      .withExactArgs('amp-store:https://acme.com', 'BLOB1')
+      .once();
     return binding.saveBlob('https://acme.com', 'BLOB1');
   });
 
   it('should reject on save store failure', () => {
-    localStorageMock.expects('setItem')
-        .withExactArgs('amp-store:https://acme.com', 'BLOB1')
-        .throws(new Error('unknown'))
-        .once();
-    return binding.saveBlob('https://acme.com', 'BLOB1')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('ERROR');
-        });
+    localStorageMock
+      .expects('setItem')
+      .withExactArgs('amp-store:https://acme.com', 'BLOB1')
+      .throws(new Error('unknown'))
+      .once();
+    return binding
+      .saveBlob('https://acme.com', 'BLOB1')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('ERROR');
+      });
   });
 
   it('should succeed saveBlob w/o localStorage support', () => {
     binding.isLocalStorageSupported_ = false;
-    localStorageMock.expects('setItem')
-        .withExactArgs('amp-store:https://acme.com', 'BLOB1')
-        .throws(new Error('unknown'))
-        .once();
+    localStorageMock
+      .expects('setItem')
+      .withExactArgs('amp-store:https://acme.com', 'BLOB1')
+      .throws(new Error('unknown'))
+      .once();
     // Never reaches setItem
-    return binding.saveBlob('https://acme.com', 'BLOB1')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('SUCCESS');
-        });
+    return binding
+      .saveBlob('https://acme.com', 'BLOB1')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('SUCCESS');
+      });
   });
 
   it('should bypass saving to localStorage if getItem throws', () => {
     const setItemSpy = sandbox.spy(windowApi.localStorage, 'setItem');
 
-    localStorageMock.expects('getItem')
-        .throws(new Error('unknown'))
-        .once();
+    localStorageMock
+      .expects('getItem')
+      .throws(new Error('unknown'))
+      .once();
     binding = new LocalStorageBinding(windowApi);
     // Never reaches setItem
-    return binding.saveBlob('https://acme.com', 'BLOB1')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(setItemSpy).to.have.not.been.called;
-          expect(res).to.equal('SUCCESS');
-        });
+    return binding
+      .saveBlob('https://acme.com', 'BLOB1')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(setItemSpy).to.have.not.been.called;
+        expect(res).to.equal('SUCCESS');
+      });
   });
 });
 
-
 describe('ViewerStorageBinding', () => {
   let sandbox;
   let viewer;
@@ -599,61 +661,81 @@ describe('ViewerStorageBinding', () => {
   });
 
   it('should load store from viewer', () => {
-    viewerMock.expects('sendMessageAwaitResponse')
-        .withExactArgs('loadStore', sinon.match(arg => {
-          return (arg['origin'] == 'https://acme.com');
-        }))
-        .returns(Promise.resolve({'blob': 'BLOB1'}))
-        .once();
+    viewerMock
+      .expects('sendMessageAwaitResponse')
+      .withExactArgs(
+        'loadStore',
+        sinon.match(arg => {
+          return arg['origin'] == 'https://acme.com';
+        })
+      )
+      .returns(Promise.resolve({'blob': 'BLOB1'}))
+      .once();
     return binding.loadBlob('https://acme.com').then(blob => {
       expect(blob).to.equal('BLOB1');
     });
   });
 
   it('should load default store when not yet available', () => {
-    viewerMock.expects('sendMessageAwaitResponse')
-        .withExactArgs('loadStore', sinon.match(arg => {
-          return (arg['origin'] == 'https://acme.com');
-        }))
-        .returns(Promise.resolve({}))
-        .once();
+    viewerMock
+      .expects('sendMessageAwaitResponse')
+      .withExactArgs(
+        'loadStore',
+        sinon.match(arg => {
+          return arg['origin'] == 'https://acme.com';
+        })
+      )
+      .returns(Promise.resolve({}))
+      .once();
     return binding.loadBlob('https://acme.com').then(blob => {
       expect(blob).to.not.exist;
     });
   });
 
   it('should reject on viewer failure', () => {
-    viewerMock.expects('sendMessageAwaitResponse')
-        .withExactArgs('loadStore', sinon.match(arg => {
-          return (arg['origin'] == 'https://acme.com');
-        }))
-        .returns(Promise.reject('unknown'))
-        .once();
-    return binding.loadBlob('https://acme.com')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('ERROR');
-        });
+    viewerMock
+      .expects('sendMessageAwaitResponse')
+      .withExactArgs(
+        'loadStore',
+        sinon.match(arg => {
+          return arg['origin'] == 'https://acme.com';
+        })
+      )
+      .returns(Promise.reject('unknown'))
+      .once();
+    return binding
+      .loadBlob('https://acme.com')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('ERROR');
+      });
   });
 
   it('should save store', () => {
-    viewerMock.expects('sendMessageAwaitResponse')
-        .withExactArgs('saveStore', sinon.match(arg => {
-          return (arg['origin'] == 'https://acme.com' &&
-              arg['blob'] == 'BLOB1');
-        }))
-        .returns(Promise.resolve())
-        .once();
+    viewerMock
+      .expects('sendMessageAwaitResponse')
+      .withExactArgs(
+        'saveStore',
+        sinon.match(arg => {
+          return arg['origin'] == 'https://acme.com' && arg['blob'] == 'BLOB1';
+        })
+      )
+      .returns(Promise.resolve())
+      .once();
     return binding.saveBlob('https://acme.com', 'BLOB1');
   });
 
   it('should reject on save store failure', () => {
-    viewerMock.expects('sendMessageAwaitResponse')
-        .withExactArgs('saveStore', sinon.match(() => true))
-        .returns(Promise.reject('unknown'))
-        .once();
-    return binding.saveBlob('https://acme.com', 'BLOB1')
-        .then(() => 'SUCCESS', () => 'ERROR').then(res => {
-          expect(res).to.equal('ERROR');
-        });
+    viewerMock
+      .expects('sendMessageAwaitResponse')
+      .withExactArgs('saveStore', sinon.match(() => true))
+      .returns(Promise.reject('unknown'))
+      .once();
+    return binding
+      .saveBlob('https://acme.com', 'BLOB1')
+      .then(() => 'SUCCESS', () => 'ERROR')
+      .then(res => {
+        expect(res).to.equal('ERROR');
+      });
   });
 });
diff --git a/test/unit/test-string.js b/test/unit/test-string.js
index ab4ca3186d03..3a60b25714df 100644
--- a/test/unit/test-string.js
+++ b/test/unit/test-string.js
@@ -66,7 +66,6 @@ describe('includes', () => {
 });
 
 describe('expandTemplate', () => {
-
   const data = {
     'x': 'Test 1',
     'y': 'Test 2',
@@ -112,12 +111,11 @@ describe('expandTemplate', () => {
   it('should handle multiple iterations when asked to.', () => {
     expect(expandTemplate('${tox}', testGetter, 2)).to.equal('Test 1');
     expect(expandTemplate('${toxy}', testGetter, 2)).to.equal('Test 1Test 2');
-    expect(expandTemplate('${totoxy}', testGetter, 2)).to.equal(
-        '${x}${y}');
-    expect(expandTemplate('${totoxy}', testGetter, 3)).to.equal(
-        'Test 1Test 2');
+    expect(expandTemplate('${totoxy}', testGetter, 2)).to.equal('${x}${y}');
+    expect(expandTemplate('${totoxy}', testGetter, 3)).to.equal('Test 1Test 2');
     expect(expandTemplate('${totoxy}', testGetter, 10)).to.equal(
-        'Test 1Test 2');
+      'Test 1Test 2'
+    );
   });
 
   it('should handle circular expansions without hanging', () => {
diff --git a/test/unit/test-style-installer.js b/test/unit/test-style-installer.js
index 7a5a0ea4b027..8baa75b8b252 100644
--- a/test/unit/test-style-installer.js
+++ b/test/unit/test-style-installer.js
@@ -24,9 +24,7 @@ import {installPerformanceService} from '../../src/service/performance-impl';
 import {isAnimationNone} from '../../testing/test-helper';
 import {setShadowDomSupportedVersionForTesting} from '../../src/web-components';
 
-
 describe('Styles', () => {
-
   describes.realWin('makeBodyVisible', {amp: true}, env => {
     let win, doc, ampdoc;
     let resources;
@@ -75,8 +73,9 @@ describe('Styles', () => {
       expect(getStyle(doc.body, 'animation')).to.equal('');
       expect(ampdoc.signals().get('render-start')).to.be.null;
 
-      waitForServicesStub.withArgs(win)
-          .returns(Promise.resolve(['service1', 'service2']));
+      waitForServicesStub
+        .withArgs(win)
+        .returns(Promise.resolve(['service1', 'service2']));
       styles.makeBodyVisible(doc);
       return new Promise(resolve => {
         setTimeout(resolve, 0);
@@ -103,239 +102,276 @@ describe('Styles', () => {
     });
   });
 
-  describes.repeated('installStylesForDoc', {
-    'single': {},
-    'shadow native': {},
-    'shadow polyfill': {},
-  }, variantName => {
-    const url = 'https://acme.org/doc1';
-
-    describes.realWin(' ', {}, env => {
-      let win, doc, ampdoc;
-      let head;
-
-      beforeEach(() => {
-        win = env.win;
-        doc = win.document;
-
-        // Don't install AMP runtime itself, because test fixtures automatically
-        // setup stylesheets as well.
-        if (variantName == 'single') {
-          ampdoc = new AmpDocSingle(win);
-        } else {
-          const hostElement = doc.createElement('div');
-          doc.body.appendChild(hostElement);
-          setShadowDomSupportedVersionForTesting(undefined);
-          if (variantName == 'shadow polyfill') {
-            setShadowDomSupportedVersionForTesting('none');
+  describes.repeated(
+    'installStylesForDoc',
+    {
+      'single': {},
+      'shadow native': {},
+      'shadow polyfill': {},
+    },
+    variantName => {
+      const url = 'https://acme.org/doc1';
+
+      describes.realWin(' ', {}, env => {
+        let win, doc, ampdoc;
+        let head;
+
+        beforeEach(() => {
+          win = env.win;
+          doc = win.document;
+
+          // Don't install AMP runtime itself, because test fixtures automatically
+          // setup stylesheets as well.
+          if (variantName == 'single') {
+            ampdoc = new AmpDocSingle(win);
+          } else {
+            const hostElement = doc.createElement('div');
+            doc.body.appendChild(hostElement);
+            setShadowDomSupportedVersionForTesting(undefined);
+            if (variantName == 'shadow polyfill') {
+              setShadowDomSupportedVersionForTesting('none');
+            }
+            const shadowRoot = createShadowRoot(hostElement);
+            ampdoc = new AmpDocShadow(win, url, shadowRoot);
           }
-          const shadowRoot = createShadowRoot(hostElement);
-          ampdoc = new AmpDocShadow(win, url, shadowRoot);
-        }
-        head = ampdoc.getHeadNode();
-      });
-
-      afterEach(() => {
-        setShadowDomSupportedVersionForTesting(undefined);
-      });
-
-      /**
-       * @param {!Document} doc
-       * @param {string} cssText
-       * @param {boolean} isRuntimeCss
-       * @param {string=} opt_ext
-       * @return {!Promise<!Element>}
-       */
-      function installStylesAsPromise(cssText, isRuntimeCss, opt_ext) {
-        return new Promise(resolve => {
-          styles.installStylesForDoc(ampdoc, cssText, resolve,
-              isRuntimeCss, opt_ext);
-        });
-      }
-
-      it('should install runtime styles', () => {
-        const cssText = 'amp-element{}';
-        return installStylesAsPromise(cssText, true).then(styleEl => {
-          expect(styleEl.parentNode).to.equal(head);
-          expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(styleEl);
-          expect(styleEl.hasAttribute('amp-runtime')).to.be.true;
-          expect(styleEl.textContent).to.match(/amp-element\s*\{/);
+          head = ampdoc.getHeadNode();
         });
-      });
 
-      it('should install extension styles after runtime', () => {
-        const runtimeCssText = 'amp-runtime{}';
-        const extCssText = 'amp-ext1{}';
-        return installStylesAsPromise(runtimeCssText, true).then(() => {
-          const otherEl = doc.createElement('link');
-          head.appendChild(otherEl);
-          // Install extension styles.
-          return installStylesAsPromise(extCssText, false, 'amp-ext1');
-        }).then(styleEl => {
-          expect(styleEl.parentNode).to.equal(head);
-          expect(styleEl.previousElementSibling)
-              .to.equal(head.__AMP_CSS_SM['amp-runtime']);
-          expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
-          expect(styleEl.textContent).to.match(/amp-ext1\s*\{/);
+        afterEach(() => {
+          setShadowDomSupportedVersionForTesting(undefined);
         });
-      });
 
+        /**
+         * @param {!Document} doc
+         * @param {string} cssText
+         * @param {boolean} isRuntimeCss
+         * @param {string=} opt_ext
+         * @return {!Promise<!Element>}
+         */
+        function installStylesAsPromise(cssText, isRuntimeCss, opt_ext) {
+          return new Promise(resolve => {
+            styles.installStylesForDoc(
+              ampdoc,
+              cssText,
+              resolve,
+              isRuntimeCss,
+              opt_ext
+            );
+          });
+        }
 
+        it('should install runtime styles', () => {
+          const cssText = 'amp-element{}';
+          return installStylesAsPromise(cssText, true).then(styleEl => {
+            expect(styleEl.parentNode).to.equal(head);
+            expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(styleEl);
+            expect(styleEl.hasAttribute('amp-runtime')).to.be.true;
+            expect(styleEl.textContent).to.match(/amp-element\s*\{/);
+          });
+        });
 
-      it('should install user styles after everything else', () => {
-        const runtimeCssText = 'amp-runtime{}';
-        const userCssText = 'user{}';
-        const otherEl = doc.createElement('link');
-        return installStylesAsPromise(runtimeCssText, true).then(() => {
-          head.appendChild(otherEl);
-          return installStylesAsPromise(userCssText, false, 'amp-custom');
-        }).then(styleEl => {
-          expect(styleEl.parentNode).to.equal(head);
-          expect(styleEl.previousElementSibling).to.equal(otherEl);
-          expect(styleEl.hasAttribute('amp-custom')).to.be.true;
-          expect(styleEl.hasAttribute('amp-extension')).to.be.false;
-          expect(styleEl.textContent).to.match(/user\s*\{/);
+        it('should install extension styles after runtime', () => {
+          const runtimeCssText = 'amp-runtime{}';
+          const extCssText = 'amp-ext1{}';
+          return installStylesAsPromise(runtimeCssText, true)
+            .then(() => {
+              const otherEl = doc.createElement('link');
+              head.appendChild(otherEl);
+              // Install extension styles.
+              return installStylesAsPromise(extCssText, false, 'amp-ext1');
+            })
+            .then(styleEl => {
+              expect(styleEl.parentNode).to.equal(head);
+              expect(styleEl.previousElementSibling).to.equal(
+                head.__AMP_CSS_SM['amp-runtime']
+              );
+              expect(styleEl.getAttribute('amp-extension')).to.equal(
+                'amp-ext1'
+              );
+              expect(styleEl.textContent).to.match(/amp-ext1\s*\{/);
+            });
         });
-      });
 
-      it('should not create duplicate runtime style', () => {
-        let firstStyleEl;
-        return installStylesAsPromise('', true).then(styleEl => {
-          firstStyleEl = styleEl;
-          // Duplicate call.
-          return installStylesAsPromise('other{}', true);
-        }).then(styleEl => {
-          expect(styleEl).to.equal(firstStyleEl);
-          expect(styleEl.textContent).to.equal('other{}');
-          expect(head.querySelectorAll('style[amp-runtime]'))
-              .to.have.length(1);
+        it('should install user styles after everything else', () => {
+          const runtimeCssText = 'amp-runtime{}';
+          const userCssText = 'user{}';
+          const otherEl = doc.createElement('link');
+          return installStylesAsPromise(runtimeCssText, true)
+            .then(() => {
+              head.appendChild(otherEl);
+              return installStylesAsPromise(userCssText, false, 'amp-custom');
+            })
+            .then(styleEl => {
+              expect(styleEl.parentNode).to.equal(head);
+              expect(styleEl.previousElementSibling).to.equal(otherEl);
+              expect(styleEl.hasAttribute('amp-custom')).to.be.true;
+              expect(styleEl.hasAttribute('amp-extension')).to.be.false;
+              expect(styleEl.textContent).to.match(/user\s*\{/);
+            });
         });
-      });
 
-      it('should discover existing runtime style', () => {
-        const serverEl = doc.createElement('style');
-        serverEl.setAttribute('amp-runtime', '');
-        head.appendChild(serverEl);
-        return installStylesAsPromise('other{}', true).then(styleEl => {
-          expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(serverEl);
-          expect(styleEl).to.equal(serverEl);
-          expect(styleEl.textContent).to.equal('other{}');
-          expect(head.querySelectorAll('style[amp-runtime]'))
-              .to.have.length(1);
+        it('should not create duplicate runtime style', () => {
+          let firstStyleEl;
+          return installStylesAsPromise('', true)
+            .then(styleEl => {
+              firstStyleEl = styleEl;
+              // Duplicate call.
+              return installStylesAsPromise('other{}', true);
+            })
+            .then(styleEl => {
+              expect(styleEl).to.equal(firstStyleEl);
+              expect(styleEl.textContent).to.equal('other{}');
+              expect(
+                head.querySelectorAll('style[amp-runtime]')
+              ).to.have.length(1);
+            });
         });
-      });
 
-      it('should re-create runtime style if absent', () => {
-        return installStylesAsPromise('other{}', true).then(styleEl => {
-          expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(styleEl);
-          expect(styleEl.textContent).to.match(/other\s*\{/);
-          expect(head.querySelectorAll('style[amp-runtime]'))
-              .to.have.length(1);
+        it('should discover existing runtime style', () => {
+          const serverEl = doc.createElement('style');
+          serverEl.setAttribute('amp-runtime', '');
+          head.appendChild(serverEl);
+          return installStylesAsPromise('other{}', true).then(styleEl => {
+            expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(serverEl);
+            expect(styleEl).to.equal(serverEl);
+            expect(styleEl.textContent).to.equal('other{}');
+            expect(head.querySelectorAll('style[amp-runtime]')).to.have.length(
+              1
+            );
+          });
         });
-      });
 
-      it('should discover existing extension style', () => {
-        const serverEl = doc.createElement('style');
-        serverEl.setAttribute('amp-extension', 'amp-ext1');
-        head.appendChild(serverEl);
-        const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
-        return promise.then(styleEl => {
-          expect(head.__AMP_CSS_SM['amp-runtime']).to.not.exist;
-          expect(styleEl).to.equal(serverEl);
-          expect(styleEl.textContent).to.equal('other{}');
-          expect(head.querySelectorAll('style[amp-extension=amp-ext1]'))
-              .to.have.length(1);
+        it('should re-create runtime style if absent', () => {
+          return installStylesAsPromise('other{}', true).then(styleEl => {
+            expect(head.__AMP_CSS_SM['amp-runtime']).to.equal(styleEl);
+            expect(styleEl.textContent).to.match(/other\s*\{/);
+            expect(head.querySelectorAll('style[amp-runtime]')).to.have.length(
+              1
+            );
+          });
         });
-      });
 
-      it('should re-create extension style', () => {
-        installStylesAsPromise('runtime{}', true);
-        const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
-        return promise.then(styleEl => {
-          expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
-          expect(styleEl.textContent).to.match(/other\s*\{/);
-          expect(head.querySelectorAll('style[amp-extension=amp-ext1]'))
-              .to.have.length(1);
+        it('should discover existing extension style', () => {
+          const serverEl = doc.createElement('style');
+          serverEl.setAttribute('amp-extension', 'amp-ext1');
+          head.appendChild(serverEl);
+          const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
+          return promise.then(styleEl => {
+            expect(head.__AMP_CSS_SM['amp-runtime']).to.not.exist;
+            expect(styleEl).to.equal(serverEl);
+            expect(styleEl.textContent).to.equal('other{}');
+            expect(
+              head.querySelectorAll('style[amp-extension=amp-ext1]')
+            ).to.have.length(1);
+          });
         });
-      });
 
-      it('should re-create extension style w/o cache', () => {
-        const runtimeStyle = doc.createElement('style');
-        runtimeStyle.setAttribute('amp-runtime', '');
-        head.appendChild(runtimeStyle);
-        // Additional element to test the correct insertion order.
-        head.appendChild(doc.createElement('link'));
-        const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
-        return promise.then(styleEl => {
-          expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
-          expect(styleEl.textContent).to.match(/other\s*\{/);
-          expect(head.querySelectorAll('style[amp-extension=amp-ext1]'))
-              .to.have.length(1);
-          expect(styleEl.previousElementSibling).to.equal(runtimeStyle);
+        it('should re-create extension style', () => {
+          installStylesAsPromise('runtime{}', true);
+          const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
+          return promise.then(styleEl => {
+            expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
+            expect(styleEl.textContent).to.match(/other\s*\{/);
+            expect(
+              head.querySelectorAll('style[amp-extension=amp-ext1]')
+            ).to.have.length(1);
+          });
         });
-      });
 
-      it('should use the cached extension style', () => {
-        const cachedExtStyle = doc.createElement('style');
-        cachedExtStyle.textContent = 'ext1{}';
-        head.appendChild(cachedExtStyle);
-        head.__AMP_CSS_SM = {
-          'amp-extension=amp-ext1': cachedExtStyle,
-        };
-        const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
-        return promise.then(styleEl => {
-          expect(styleEl).to.equal(cachedExtStyle);
-          expect(head.__AMP_CSS_SM['amp-extension=amp-ext1'])
-              .to.equal(cachedExtStyle);
-          // Ensure the style is not re-inserted.
-          expect(head.querySelectorAll('style[amp-extension=amp-ext1]'))
-              .to.have.length(0);
+        it('should re-create extension style w/o cache', () => {
+          const runtimeStyle = doc.createElement('style');
+          runtimeStyle.setAttribute('amp-runtime', '');
+          head.appendChild(runtimeStyle);
+          // Additional element to test the correct insertion order.
+          head.appendChild(doc.createElement('link'));
+          const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
+          return promise.then(styleEl => {
+            expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
+            expect(styleEl.textContent).to.match(/other\s*\{/);
+            expect(
+              head.querySelectorAll('style[amp-extension=amp-ext1]')
+            ).to.have.length(1);
+            expect(styleEl.previousElementSibling).to.equal(runtimeStyle);
+          });
         });
-      });
 
-      it('should create a amp-custom style', () => {
-        const promise = installStylesAsPromise(
-            'other{}', false, 'amp-custom');
-        return promise.then(styleEl => {
-          expect(styleEl.getAttribute('amp-custom')).to.equal('');
-          expect(head.lastElementChild).to.equal(styleEl);
-          expect(styleEl.textContent).to.match(/other\s*\{/);
-          expect(head.querySelectorAll('style[amp-custom]'))
-              .to.have.length(1);
+        it('should use the cached extension style', () => {
+          const cachedExtStyle = doc.createElement('style');
+          cachedExtStyle.textContent = 'ext1{}';
+          head.appendChild(cachedExtStyle);
+          head.__AMP_CSS_SM = {
+            'amp-extension=amp-ext1': cachedExtStyle,
+          };
+          const promise = installStylesAsPromise('other{}', false, 'amp-ext1');
+          return promise.then(styleEl => {
+            expect(styleEl).to.equal(cachedExtStyle);
+            expect(head.__AMP_CSS_SM['amp-extension=amp-ext1']).to.equal(
+              cachedExtStyle
+            );
+            // Ensure the style is not re-inserted.
+            expect(
+              head.querySelectorAll('style[amp-extension=amp-ext1]')
+            ).to.have.length(0);
+          });
         });
-      });
 
-      it('should create a amp-keyframes style', () => {
-        const promise = installStylesAsPromise(
-            'other{}', false, 'amp-keyframes');
-        return promise.then(styleEl => {
-          expect(styleEl.getAttribute('amp-keyframes')).to.equal('');
-          expect(head.lastElementChild).to.equal(styleEl);
-          expect(styleEl.textContent).to.match(/other\s*\{/);
-          expect(head.querySelectorAll('style[amp-keyframes]'))
-              .to.have.length(1);
+        it('should create a amp-custom style', () => {
+          const promise = installStylesAsPromise(
+            'other{}',
+            false,
+            'amp-custom'
+          );
+          return promise.then(styleEl => {
+            expect(styleEl.getAttribute('amp-custom')).to.equal('');
+            expect(head.lastElementChild).to.equal(styleEl);
+            expect(styleEl.textContent).to.match(/other\s*\{/);
+            expect(head.querySelectorAll('style[amp-custom]')).to.have.length(
+              1
+            );
+          });
         });
-      });
 
-      it('should use a transform', () => {
-        styles.installCssTransformer(head, function(css) {
-          return css.toUpperCase();
+        it('should create a amp-keyframes style', () => {
+          const promise = installStylesAsPromise(
+            'other{}',
+            false,
+            'amp-keyframes'
+          );
+          return promise.then(styleEl => {
+            expect(styleEl.getAttribute('amp-keyframes')).to.equal('');
+            expect(head.lastElementChild).to.equal(styleEl);
+            expect(styleEl.textContent).to.match(/other\s*\{/);
+            expect(
+              head.querySelectorAll('style[amp-keyframes]')
+            ).to.have.length(1);
+          });
         });
-        const promise1 = installStylesAsPromise('style1{}', true);
-        const promise2 = installStylesAsPromise(
-            'style2{}', false, 'amp-ext1');
-        const promise3 = installStylesAsPromise(
-            'style3{}', false, 'amp-custom');
-        return Promise.all([promise1, promise2, promise3]).then(styleEls => {
-          expect(styleEls).to.have.length(3);
-          expect(styleEls[0].textContent).to.contain('STYLE1');
-          expect(styleEls[1].textContent).to.contain('STYLE2');
-          expect(styleEls[2].textContent).to.contain('STYLE3');
+
+        it('should use a transform', () => {
+          styles.installCssTransformer(head, function(css) {
+            return css.toUpperCase();
+          });
+          const promise1 = installStylesAsPromise('style1{}', true);
+          const promise2 = installStylesAsPromise(
+            'style2{}',
+            false,
+            'amp-ext1'
+          );
+          const promise3 = installStylesAsPromise(
+            'style3{}',
+            false,
+            'amp-custom'
+          );
+          return Promise.all([promise1, promise2, promise3]).then(styleEls => {
+            expect(styleEls).to.have.length(3);
+            expect(styleEls[0].textContent).to.contain('STYLE1');
+            expect(styleEls[1].textContent).to.contain('STYLE2');
+            expect(styleEls[2].textContent).to.contain('STYLE3');
+          });
         });
       });
-    });
-  });
-
+    }
+  );
 
   describes.realWin('installStylesLegacy', {}, env => {
     let win, doc;
@@ -354,8 +390,13 @@ describe('Styles', () => {
      */
     function installStylesAsPromise(cssText, isRuntimeCss, opt_ext) {
       return new Promise(resolve => {
-        styles.installStylesLegacy(doc, cssText, resolve,
-            isRuntimeCss, opt_ext);
+        styles.installStylesLegacy(
+          doc,
+          cssText,
+          resolve,
+          isRuntimeCss,
+          opt_ext
+        );
       });
     }
 
@@ -372,18 +413,21 @@ describe('Styles', () => {
     it('should install extension styles after runtime', () => {
       const runtimeCssText = '/*amp-runtime*/';
       const extCssText = '/*amp-ext1*/';
-      return installStylesAsPromise(runtimeCssText, true).then(() => {
-        const otherEl = doc.createElement('link');
-        doc.head.appendChild(otherEl);
-        // Install extension styles.
-        return installStylesAsPromise(extCssText, false, 'amp-ext1');
-      }).then(styleEl => {
-        expect(styleEl.parentElement).to.equal(doc.head);
-        expect(styleEl.previousElementSibling)
-            .to.equal(doc.head.__AMP_CSS_SM['amp-runtime']);
-        expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
-        expect(styleEl.textContent).to.equal(extCssText);
-      });
+      return installStylesAsPromise(runtimeCssText, true)
+        .then(() => {
+          const otherEl = doc.createElement('link');
+          doc.head.appendChild(otherEl);
+          // Install extension styles.
+          return installStylesAsPromise(extCssText, false, 'amp-ext1');
+        })
+        .then(styleEl => {
+          expect(styleEl.parentElement).to.equal(doc.head);
+          expect(styleEl.previousElementSibling).to.equal(
+            doc.head.__AMP_CSS_SM['amp-runtime']
+          );
+          expect(styleEl.getAttribute('amp-extension')).to.equal('amp-ext1');
+          expect(styleEl.textContent).to.equal(extCssText);
+        });
     });
 
     it('should create a amp-custom style', () => {
@@ -392,8 +436,9 @@ describe('Styles', () => {
         expect(styleEl.getAttribute('amp-custom')).to.equal('');
         expect(doc.head.lastElementChild).to.equal(styleEl);
         expect(styleEl.textContent).to.equal('/*other*/');
-        expect(doc.head.querySelectorAll('style[amp-custom]'))
-            .to.have.length(1);
+        expect(doc.head.querySelectorAll('style[amp-custom]')).to.have.length(
+          1
+        );
       });
     });
   });
diff --git a/test/unit/test-style.js b/test/unit/test-style.js
index 5e2c716754da..59c18acf6883 100644
--- a/test/unit/test-style.js
+++ b/test/unit/test-style.js
@@ -17,7 +17,6 @@
 import * as st from '../../src/style';
 
 describe('Style', () => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -72,21 +71,25 @@ describe('Style', () => {
       width: st.px(101),
     });
     expect(element.style.width).to.equal('101px');
-    expect(element.style.getPropertyPriority('width'))
-        .to.equal('important');
+    expect(element.style.getPropertyPriority('width')).to.equal('important');
   });
 
   it('setImportantStyles with vendor prefix', () => {
     const spy = sandbox.spy();
-    const element = {style: {
-      WebkitTransitionDurationImportant: '',
-      setProperty: spy,
-    }};
+    const element = {
+      style: {
+        WebkitTransitionDurationImportant: '',
+        setProperty: spy,
+      },
+    };
     st.setImportantStyles(element, {
       transitionDurationImportant: '1s',
     });
-    expect(spy).to.have.been.calledWith('WebkitTransitionDurationImportant',
-        '1s', 'important');
+    expect(spy).to.have.been.calledWith(
+      'WebkitTransitionDurationImportant',
+      '1s',
+      'important'
+    );
   });
 
   it('px', () => {
@@ -113,59 +116,75 @@ describe('Style', () => {
 
   it('removeAlphaFromColor', () => {
     expect(st.removeAlphaFromColor('rgba(1, 1, 1, 0)')).to.equal(
-        'rgba(1, 1, 1, 1)');
-    expect(st.removeAlphaFromColor('rgb(1, 1, 1)')).to.equal(
-        'rgb(1, 1, 1)');
+      'rgba(1, 1, 1, 1)'
+    );
+    expect(st.removeAlphaFromColor('rgb(1, 1, 1)')).to.equal('rgb(1, 1, 1)');
     expect(st.removeAlphaFromColor('rgba(0, 0, 0,-0.5)')).to.equal(
-        'rgba(0, 0, 0, 1)');
+      'rgba(0, 0, 0, 1)'
+    );
   });
 
   describe('getVendorJsPropertyName', () => {
-
     it('no prefix', () => {
       const element = {style: {transitionDuration: ''}};
-      const prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration', true);
+      const prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration',
+        true
+      );
       expect(prop).to.equal('transitionDuration');
     });
 
     it('should use cached previous result', () => {
       let element = {style: {transitionDuration: ''}};
-      let prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration');
+      let prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration'
+      );
       expect(prop).to.equal('transitionDuration');
 
       element = {style: {WebkitTransitionDuration: ''}};
-      prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration');
+      prop = st.getVendorJsPropertyName(element.style, 'transitionDuration');
       expect(prop).to.equal('transitionDuration');
     });
 
     it('Webkit', () => {
       const element = {style: {WebkitTransitionDuration: ''}};
-      const prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration', true);
+      const prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration',
+        true
+      );
       expect(prop).to.equal('WebkitTransitionDuration');
     });
 
     it('Moz', () => {
       const element = {style: {MozTransitionDuration: ''}};
-      const prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration', true);
+      const prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration',
+        true
+      );
       expect(prop).to.equal('MozTransitionDuration');
     });
 
     it('ms', () => {
       const element = {style: {msTransitionDuration: ''}};
-      const prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration', true);
+      const prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration',
+        true
+      );
       expect(prop).to.equal('msTransitionDuration');
     });
 
     it('O opera', () => {
       const element = {style: {OTransitionDuration: ''}};
-      const prop = st
-          .getVendorJsPropertyName(element.style, 'transitionDuration', true);
+      const prop = st.getVendorJsPropertyName(
+        element.style,
+        'transitionDuration',
+        true
+      );
       expect(prop).to.equal('OTransitionDuration');
     });
   });
diff --git a/test/unit/test-task-queue.js b/test/unit/test-task-queue.js
index f12877c6867b..c89de301c155 100644
--- a/test/unit/test-task-queue.js
+++ b/test/unit/test-task-queue.js
@@ -16,9 +16,7 @@
 
 import {TaskQueue} from '../../src/service/task-queue';
 
-
 describe('TaskQueue', () => {
-
   let sandbox;
   let clock;
   let queue;
@@ -45,9 +43,11 @@ describe('TaskQueue', () => {
     expect(queue.getLastEnqueueTime()).to.equal(1000);
     expect(queue.getLastDequeueTime()).to.equal(0);
 
-    allowConsoleError(() => { expect(() => {
-      queue.enqueue({id: '1'});
-    }).to.throw(/Task already enqueued/); });
+    allowConsoleError(() => {
+      expect(() => {
+        queue.enqueue({id: '1'});
+      }).to.throw(/Task already enqueued/);
+    });
 
     queue.dequeue({id: '1'});
     expect(queue.getTaskById('1')).to.equal(null);
diff --git a/test/unit/test-template.js b/test/unit/test-template.js
index 432d6f06ce44..e51c3c76695a 100644
--- a/test/unit/test-template.js
+++ b/test/unit/test-template.js
@@ -73,8 +73,11 @@ describes.fakeWin('Template', {amp: true}, env => {
 
   it('should render immediately', () => {
     const templateElement = createTemplateElement();
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImpl);
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImpl
+    );
     return templates.renderTemplate(templateElement, {value: 1}).then(res => {
       expect(res.textContent).to.equal('abc1');
     });
@@ -84,45 +87,65 @@ describes.fakeWin('Template', {amp: true}, env => {
     const templateElement = createTemplateElement();
     // Use TemplateImplCheckingViewer to make sure viewerCanRenderTemplates
     // works correctly when the template is later detached.
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImplCheckingViewer);
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImplCheckingViewer
+    );
     const viewerService = getServiceForDoc(templateElement, 'viewer');
     env.sandbox.stub(viewerService, 'hasCapability').returns(true);
-    return templates.renderTemplate(templateElement, {value: 1}).then(() => {
-      templateElement.parentElement.removeChild(templateElement);
-      return templates.renderTemplate(templateElement, {value: 2});
-    }).then(res => {
-      expect(res.textContent).to.equal('abc2');
-    });
+    return templates
+      .renderTemplate(templateElement, {value: 1})
+      .then(() => {
+        templateElement.parentElement.removeChild(templateElement);
+        return templates.renderTemplate(templateElement, {value: 2});
+      })
+      .then(res => {
+        expect(res.textContent).to.equal('abc2');
+      });
   });
 
   it('should render array', () => {
     const templateElement = createTemplateElement();
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImpl);
-    return templates.renderTemplateArray(templateElement,
-        [{value: 1}, {value: 2}]).then(res => {
-      expect(res).to.have.length.of(2);
-      expect(res[0].textContent).to.equal('abc1');
-      expect(res[1].textContent).to.equal('abc2');
-    });
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImpl
+    );
+    return templates
+      .renderTemplateArray(templateElement, [{value: 1}, {value: 2}])
+      .then(res => {
+        expect(res).to.have.length.of(2);
+        expect(res[0].textContent).to.equal('abc1');
+        expect(res[1].textContent).to.equal('abc2');
+      });
   });
 
   it('should NOT allow registering template class twice', () => {
     const templateElement = createTemplateElement();
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImpl);
-    allowConsoleError(() => { expect(() => {
-      registerExtendedTemplate(win, templateElement.getAttribute('type'),
-          TemplateImpl);
-    }).to.throw(/Duplicate template type/); });
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImpl
+    );
+    allowConsoleError(() => {
+      expect(() => {
+        registerExtendedTemplate(
+          win,
+          templateElement.getAttribute('type'),
+          TemplateImpl
+        );
+      }).to.throw(/Duplicate template type/);
+    });
   });
 
   it('should block render until template registered', () => {
     const templateElement = createTemplateElement();
     const scriptElement = doc.createElement('script');
-    scriptElement.setAttribute('custom-template',
-        templateElement.getAttribute('type'));
+    scriptElement.setAttribute(
+      'custom-template',
+      templateElement.getAttribute('type')
+    );
     doc.body.appendChild(scriptElement);
     let result = undefined;
     templates.renderTemplate(templateElement, {value: 0}).then(res => {
@@ -138,12 +161,17 @@ describes.fakeWin('Template', {amp: true}, env => {
   it('should unblock render when template registered', () => {
     const templateElement = createTemplateElement();
     const scriptElement = doc.createElement('script');
-    scriptElement.setAttribute('custom-template',
-        templateElement.getAttribute('type'));
+    scriptElement.setAttribute(
+      'custom-template',
+      templateElement.getAttribute('type')
+    );
     doc.body.appendChild(scriptElement);
     const p = templates.renderTemplate(templateElement, {value: 1});
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImpl);
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImpl
+    );
     return p.then(res => {
       expect(res.textContent).to.equal('abc1');
     });
@@ -152,22 +180,29 @@ describes.fakeWin('Template', {amp: true}, env => {
   it('should unblock render for parallel templates', () => {
     const templateElement = createTemplateElement();
     const scriptElement = doc.createElement('script');
-    scriptElement.setAttribute('custom-template',
-        templateElement.getAttribute('type'));
+    scriptElement.setAttribute(
+      'custom-template',
+      templateElement.getAttribute('type')
+    );
     doc.body.appendChild(scriptElement);
     const p1 = templates.renderTemplate(templateElement, {value: 1});
     const p2 = templates.renderTemplate(templateElement, {value: 2});
-    registerExtendedTemplate(win, templateElement.getAttribute('type'),
-        TemplateImpl);
+    registerExtendedTemplate(
+      win,
+      templateElement.getAttribute('type'),
+      TemplateImpl
+    );
     // This is just a complicated way to say Promise -> all.
-    return p1.then(res1 => {
-      return p2.then(res2 => {
-        return [res1, res2];
+    return p1
+      .then(res1 => {
+        return p2.then(res2 => {
+          return [res1, res2];
+        });
+      })
+      .then(res => {
+        expect(res[0].textContent).to.equal('abc1');
+        expect(res[1].textContent).to.equal('abc2');
       });
-    }).then(res => {
-      expect(res[0].textContent).to.equal('abc1');
-      expect(res[1].textContent).to.equal('abc2');
-    });
   });
 
   it('should discover template via ID', () => {
@@ -181,10 +216,11 @@ describes.fakeWin('Template', {amp: true}, env => {
     const parentElement = doc.createElement('div');
     parentElement.setAttribute('template', id);
     doc.body.appendChild(parentElement);
-    return templates.findAndRenderTemplate(parentElement, {value: 1}).then(
-        res => {
-          expect(res.textContent).to.equal('abc1');
-        });
+    return templates
+      .findAndRenderTemplate(parentElement, {value: 1})
+      .then(res => {
+        expect(res.textContent).to.equal('abc1');
+      });
   });
 
   it('should require discovered template via ID to be "template"', () => {
@@ -197,11 +233,14 @@ describes.fakeWin('Template', {amp: true}, env => {
     parentElement.setAttribute('template', id);
     doc.body.appendChild(parentElement);
     const regexError = new RegExp(
-        'Template must be defined in a <template> or '
-            + '<script type="text/plain"> tag');
-    allowConsoleError(() => { expect(() => {
-      templates.findAndRenderTemplate(parentElement, {value: 0});
-    }).to.throw(regexError);});
+      'Template must be defined in a <template> or ' +
+        '<script type="text/plain"> tag'
+    );
+    allowConsoleError(() => {
+      expect(() => {
+        templates.findAndRenderTemplate(parentElement, {value: 0});
+      }).to.throw(regexError);
+    });
   });
 
   it('should require discovered "script" with type defined', () => {
@@ -215,11 +254,14 @@ describes.fakeWin('Template', {amp: true}, env => {
     parentElement.setAttribute('template', id);
     doc.body.appendChild(parentElement);
     const regexError = new RegExp(
-        'Template must be defined in a <template> or '
-            + '<script type="text/plain"> tag');
-    allowConsoleError(() => { expect(() => {
-      templates.findAndRenderTemplate(parentElement, {value: 0});
-    }).to.throw(regexError);});
+      'Template must be defined in a <template> or ' +
+        '<script type="text/plain"> tag'
+    );
+    allowConsoleError(() => {
+      expect(() => {
+        templates.findAndRenderTemplate(parentElement, {value: 0});
+      }).to.throw(regexError);
+    });
   });
 
   it('should discover template via children', () => {
@@ -230,23 +272,28 @@ describes.fakeWin('Template', {amp: true}, env => {
     const parentElement = doc.createElement('div');
     parentElement.appendChild(templateElement);
     container.appendChild(parentElement);
-    return templates.findAndRenderTemplate(parentElement, {value: 1}).then(
-        res => {
-          expect(res.textContent).to.equal('abc1');
-        });
+    return templates
+      .findAndRenderTemplate(parentElement, {value: 1})
+      .then(res => {
+        expect(res.textContent).to.equal('abc1');
+      });
   });
 
   it('should fail when template not found', () => {
     const parentElement = doc.createElement('div');
     doc.body.appendChild(parentElement);
-    allowConsoleError(() => { expect(() => {
-      templates.findAndRenderTemplate(parentElement, {value: 0});
-    }).to.throw(/Template not found/); });
+    allowConsoleError(() => {
+      expect(() => {
+        templates.findAndRenderTemplate(parentElement, {value: 0});
+      }).to.throw(/Template not found/);
+    });
 
     parentElement.setAttribute('template', 'notemplate' + Math.random());
-    allowConsoleError(() => { expect(() => {
-      templates.findAndRenderTemplate(parentElement, {value: 0});
-    }).to.throw(/Template not found/); });
+    allowConsoleError(() => {
+      expect(() => {
+        templates.findAndRenderTemplate(parentElement, {value: 0});
+      }).to.throw(/Template not found/);
+    });
   });
 
   it('should detect if a template is present in a container', () => {
@@ -281,18 +328,17 @@ describes.fakeWin('Template', {amp: true}, env => {
     const parentElement = doc.createElement('div');
     parentElement.setAttribute('template', id);
     doc.body.appendChild(parentElement);
-    return templates.findAndRenderTemplateArray(parentElement,
-        [{value: 1}, {value: 2}]).then(res => {
-      expect(res).to.have.length.of(2);
-      expect(res[0].textContent).to.equal('abc1');
-      expect(res[1].textContent).to.equal('abc2');
-    });
+    return templates
+      .findAndRenderTemplateArray(parentElement, [{value: 1}, {value: 2}])
+      .then(res => {
+        expect(res).to.have.length.of(2);
+        expect(res[0].textContent).to.equal('abc1');
+        expect(res[1].textContent).to.equal('abc2');
+      });
   });
 });
 
-
 describes.fakeWin('BaseTemplate', {}, env => {
-
   let win;
   let doc;
   let templateElement;
diff --git a/test/unit/test-timer.js b/test/unit/test-timer.js
index 9bc19b813589..3e835385b961 100644
--- a/test/unit/test-timer.js
+++ b/test/unit/test-timer.js
@@ -17,7 +17,6 @@
 import {Timer} from '../../src/service/timer-impl';
 
 describes.fakeWin('Timer', {}, env => {
-
   let sandbox;
   let windowMock;
   let timer;
@@ -42,7 +41,10 @@ describes.fakeWin('Timer', {}, env => {
 
   it('delay', () => {
     const handler = () => {};
-    windowMock.expects('setTimeout').returns(1).once();
+    windowMock
+      .expects('setTimeout')
+      .returns(1)
+      .once();
     windowMock.expects('clearTimeout').never();
     timer.delay(handler, 111);
   });
@@ -64,7 +66,10 @@ describes.fakeWin('Timer', {}, env => {
   });
 
   it('cancel', () => {
-    windowMock.expects('clearTimeout').withExactArgs(1).once();
+    windowMock
+      .expects('clearTimeout')
+      .withExactArgs(1)
+      .once();
     timer.cancel(1);
   });
 
@@ -82,10 +87,17 @@ describes.fakeWin('Timer', {}, env => {
   });
 
   it('promise', () => {
-    windowMock.expects('setTimeout').withExactArgs(sinon.match(value => {
-      value();
-      return true;
-    }), 111).returns(1).once();
+    windowMock
+      .expects('setTimeout')
+      .withExactArgs(
+        sinon.match(value => {
+          value();
+          return true;
+        }),
+        111
+      )
+      .returns(1)
+      .once();
 
     let c = 0;
     return timer.promise(111).then(result => {
@@ -96,27 +108,44 @@ describes.fakeWin('Timer', {}, env => {
   });
 
   it('timeoutPromise - no race', () => {
-    windowMock.expects('setTimeout').withExactArgs(sinon.match(value => {
-      value();
-      return true;
-    }), 111).returns(1).once();
+    windowMock
+      .expects('setTimeout')
+      .withExactArgs(
+        sinon.match(value => {
+          value();
+          return true;
+        }),
+        111
+      )
+      .returns(1)
+      .once();
 
     let c = 0;
-    return timer.timeoutPromise(111).then(result => {
-      c++;
-      assert.fail('must never be here: ' + result);
-    }).catch(reason => {
-      c++;
-      expect(c).to.equal(1);
-      expect(reason.message).to.contain('timeout');
-    });
+    return timer
+      .timeoutPromise(111)
+      .then(result => {
+        c++;
+        assert.fail('must never be here: ' + result);
+      })
+      .catch(reason => {
+        c++;
+        expect(c).to.equal(1);
+        expect(reason.message).to.contain('timeout');
+      });
   });
 
   it('timeoutPromise - race no timeout', () => {
-    windowMock.expects('setTimeout').withExactArgs(sinon.match(unusedValue => {
-      // No timeout
-      return true;
-    }), 111).returns(1).once();
+    windowMock
+      .expects('setTimeout')
+      .withExactArgs(
+        sinon.match(unusedValue => {
+          // No timeout
+          return true;
+        }),
+        111
+      )
+      .returns(1)
+      .once();
 
     let c = 0;
     return timer.timeoutPromise(111, Promise.resolve('A')).then(result => {
@@ -127,21 +156,31 @@ describes.fakeWin('Timer', {}, env => {
   });
 
   it('timeoutPromise - race with timeout', () => {
-    windowMock.expects('setTimeout').withExactArgs(sinon.match(value => {
-      // Immediate timeout
-      value();
-      return true;
-    }), 111).returns(1).once();
+    windowMock
+      .expects('setTimeout')
+      .withExactArgs(
+        sinon.match(value => {
+          // Immediate timeout
+          value();
+          return true;
+        }),
+        111
+      )
+      .returns(1)
+      .once();
 
     let c = 0;
-    return timer.timeoutPromise(111, new Promise(() => {})).then(result => {
-      c++;
-      assert.fail('must never be here: ' + result);
-    }).catch(reason => {
-      c++;
-      expect(c).to.equal(1);
-      expect(reason.message).to.contain('timeout');
-    });
+    return timer
+      .timeoutPromise(111, new Promise(() => {}))
+      .then(result => {
+        c++;
+        assert.fail('must never be here: ' + result);
+      })
+      .catch(reason => {
+        c++;
+        expect(c).to.equal(1);
+        expect(reason.message).to.contain('timeout');
+      });
   });
 
   it('poll - resolves only when condition is true', () => {
@@ -150,22 +189,25 @@ describes.fakeWin('Timer', {}, env => {
     setTimeout(() => {
       predicate = true;
     }, 15);
-    return realTimer.poll(10, () => {
-      return predicate;
-    }).then(() => {
-      expect(predicate).to.be.true;
-    });
+    return realTimer
+      .poll(10, () => {
+        return predicate;
+      })
+      .then(() => {
+        expect(predicate).to.be.true;
+      });
   });
 
   it('poll - clears out interval when complete', () => {
     const realTimer = new Timer(env.win);
     const clearIntervalStub = sandbox.stub();
     env.win.clearInterval = clearIntervalStub;
-    return realTimer.poll(111, () => {
-      return true;
-    }).then(() => {
-      expect(clearIntervalStub).to.have.been.calledOnce;
-    });
+    return realTimer
+      .poll(111, () => {
+        return true;
+      })
+      .then(() => {
+        expect(clearIntervalStub).to.have.been.calledOnce;
+      });
   });
-
 });
diff --git a/test/unit/test-transition.js b/test/unit/test-transition.js
index bd545058ebcc..876acf1ab454 100644
--- a/test/unit/test-transition.js
+++ b/test/unit/test-transition.js
@@ -17,7 +17,6 @@
 import * as tr from '../../src/transition';
 
 describe('Transition', () => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -118,8 +117,12 @@ describe('Transition', () => {
   it('setStyles', () => {
     const element = document.createElement('div');
     const func = tr.setStyles(element, {
-      width: tr.px(function(n) {return n * 100 + 1;}),
-      height: tr.px(function(n) {return n * 100 + 2;}),
+      width: tr.px(function(n) {
+        return n * 100 + 1;
+      }),
+      height: tr.px(function(n) {
+        return n * 100 + 2;
+      }),
     });
 
     func(0);
@@ -190,7 +193,9 @@ describe('Transition', () => {
     expect(func(0.9)).to.equal('translateX(9px)');
     expect(func(1)).to.equal('translateX(10px)');
 
-    func = tr.translateX(() => {return '101vw';});
+    func = tr.translateX(() => {
+      return '101vw';
+    });
     expect(func(0)).to.equal('translateX(101vw)');
   });
 
@@ -202,7 +207,14 @@ describe('Transition', () => {
     expect(func(0.9)).to.equal('translate(9px,29px)');
     expect(func(1)).to.equal('translate(10px,30px)');
 
-    func = tr.translate(() => {return '101vw';}, () => {return '201em';});
+    func = tr.translate(
+      () => {
+        return '101vw';
+      },
+      () => {
+        return '201em';
+      }
+    );
     expect(func(0)).to.equal('translate(101vw,201em)');
   });
 
@@ -214,7 +226,9 @@ describe('Transition', () => {
     expect(func(0.9)).to.equal('translate(9px)');
     expect(func(1)).to.equal('translate(10px)');
 
-    func = tr.translate(() => {return '101vw';});
+    func = tr.translate(() => {
+      return '101vw';
+    });
     expect(func(0)).to.equal('translate(101vw)');
   });
 });
diff --git a/test/unit/test-types.js b/test/unit/test-types.js
index 49feb094c81b..6290a17ccfec 100644
--- a/test/unit/test-types.js
+++ b/test/unit/test-types.js
@@ -18,7 +18,6 @@ import * as types from '../../src/types';
 
 describe('Types', () => {
   describe('toArray', () => {
-
     it('should return empty array if null is passed', () => {
       expect(types.toArray(null).length).to.equal(0);
       expect(types.toArray(undefined).length).to.equal(0);
@@ -61,7 +60,6 @@ describe('Types', () => {
   });
 
   describe('isFiniteNumber', () => {
-
     it('should yield false for non-numbers', () => {
       expect(types.isFiniteNumber(null)).to.be.false;
       expect(types.isFiniteNumber(undefined)).to.be.false;
@@ -92,17 +90,28 @@ describe('Types', () => {
 
     it('should return true for valid enum values', () => {
       ['x', 'y', 'z'].forEach(value => {
-        expect(types.isEnumValue(enumObj, value),
-            'enum value = ' + value).to.be.true;
+        expect(types.isEnumValue(enumObj, value), 'enum value = ' + value).to.be
+          .true;
       });
     });
 
     it('should return false for non-enum values', () => {
-      ['a', 'X', 'Z', {'x': 'x'}, ['y'], null, undefined, [], /x/, /y/, 42]
-          .forEach(value => {
-            expect(types.isEnumValue(enumObj, value),
-                'enum value = ' + value).to.be.false;
-          });
+      [
+        'a',
+        'X',
+        'Z',
+        {'x': 'x'},
+        ['y'],
+        null,
+        undefined,
+        [],
+        /x/,
+        /y/,
+        42,
+      ].forEach(value => {
+        expect(types.isEnumValue(enumObj, value), 'enum value = ' + value).to.be
+          .false;
+      });
     });
   });
 });
diff --git a/test/unit/test-url-replacements.js b/test/unit/test-url-replacements.js
index 315f834b6972..4c818d77b545 100644
--- a/test/unit/test-url-replacements.js
+++ b/test/unit/test-url-replacements.js
@@ -17,21 +17,17 @@
 import * as trackPromise from '../../src/impression';
 import {Observable} from '../../src/observable';
 import {Services} from '../../src/services';
-import {cidServiceForDocForTesting} from
-  '../../src/service/cid-impl';
+import {cidServiceForDocForTesting} from '../../src/service/cid-impl';
 import {createIframePromise} from '../../testing/iframe';
 import {
   extractClientIdFromGaCookie,
   installUrlReplacementsServiceForDoc,
 } from '../../src/service/url-replacements-impl';
 import {getMode} from '../../src/mode';
-import {
-  installActivityServiceForTesting,
-} from '../../extensions/amp-analytics/0.1/activity-impl';
+import {installActivityServiceForTesting} from '../../extensions/amp-analytics/0.1/activity-impl';
 import {installCryptoService} from '../../src/service/crypto-impl';
 import {installDocService} from '../../src/service/ampdoc-impl';
-import {installDocumentInfoServiceForDoc} from
-  '../../src/service/document-info-impl';
+import {installDocumentInfoServiceForDoc} from '../../src/service/document-info-impl';
 import {
   markElementScheduledForTesting,
   resetScheduledElementForTesting,
@@ -45,9 +41,7 @@ import {registerServiceBuilder} from '../../src/service';
 import {setCookie} from '../../src/cookies';
 import {user} from '../../src/log';
 
-
 describes.sandboxed('UrlReplacements', {}, () => {
-
   let canonical;
   let loadObservable;
   let replacements;
@@ -86,10 +80,11 @@ describes.sandboxed('UrlReplacements', {}, () => {
           markElementScheduledForTesting(iframe.win, 'amp-experiment');
           registerServiceBuilder(iframe.win, 'variant', function() {
             return {
-              getVariants: () => Promise.resolve({
-                'x1': 'v1',
-                'x2': null,
-              }),
+              getVariants: () =>
+                Promise.resolve({
+                  'x1': 'v1',
+                  'x2': null,
+                }),
             };
           });
         }
@@ -113,11 +108,15 @@ describes.sandboxed('UrlReplacements', {}, () => {
         }
         if (opt_options.withViewerIntegrationVariableService) {
           markElementScheduledForTesting(iframe.win, 'amp-viewer-integration');
-          registerServiceBuilder(iframe.win, 'viewer-integration-variable',
-              function() {
-                return Promise.resolve(
-                    opt_options.withViewerIntegrationVariableService);
-              });
+          registerServiceBuilder(
+            iframe.win,
+            'viewer-integration-variable',
+            function() {
+              return Promise.resolve(
+                opt_options.withViewerIntegrationVariableService
+              );
+            }
+          );
         }
         if (opt_options.withOriginalTitle) {
           iframe.doc.originalTitle = 'Original Pixel Test';
@@ -130,8 +129,8 @@ describes.sandboxed('UrlReplacements', {}, () => {
   }
 
   function expandUrlAsync(url, opt_bindings, opt_options) {
-    return getReplacements(opt_options).then(
-        replacements => replacements.expandUrlAsync(url, opt_bindings)
+    return getReplacements(opt_options).then(replacements =>
+      replacements.expandUrlAsync(url, opt_bindings)
     );
   }
 
@@ -156,8 +155,12 @@ describes.sandboxed('UrlReplacements', {}, () => {
         querySelector: selector => {
           if (selector.startsWith('meta')) {
             return {
-              getAttribute: () => {return 'https://whitelisted.com https://greylisted.com http://example.com';},
-              hasAttribute: () => {return true;},
+              getAttribute: () => {
+                return 'https://whitelisted.com https://greylisted.com http://example.com';
+              },
+              hasAttribute: () => {
+                return true;
+              },
             };
           } else {
             return {href: canonical};
@@ -200,8 +203,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
   it('limit replacement params size', () => {
     return getReplacements().then(replacements => {
       replacements.getVariableSource().initialize();
-      const variables =
-          Object.keys(replacements.getVariableSource().replacements_);
+      const variables = Object.keys(
+        replacements.getVariableSource().replacements_
+      );
       // Restrict the number of replacement params to globalVaraibleSource
       // Please consider adding the logic to amp-analytics instead.
       // Please contact @lannka or @zhouyx if the test fail.
@@ -217,10 +221,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should replace COUNTER', () => {
     return expandUrlAsync(
-        'COUNTER(foo),COUNTER(bar),COUNTER(foo),COUNTER(bar),COUNTER(bar)')
-        .then(res => {
-          expect(res).to.equal('1,1,2,2,3');
-        });
+      'COUNTER(foo),COUNTER(bar),COUNTER(foo),COUNTER(bar),COUNTER(bar)'
+    ).then(res => {
+      expect(res).to.equal('1,1,2,2,3');
+    });
   });
 
   it('should replace CANONICAL_URL', () => {
@@ -256,55 +260,91 @@ describes.sandboxed('UrlReplacements', {}, () => {
   it('should replace EXTERNAL_REFERRER', () => {
     const windowInterface = mockWindowInterface(sandbox);
     windowInterface.getHostname.returns('different.org');
-    return getReplacements().then(replacements => {
-      stubServiceForDoc(sandbox, ampdoc, 'viewer', 'getReferrerUrl')
-          .returns(Promise.resolve('http://example.org/page.html'));
-      return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-    }).then(res => {
-      expect(res).to.equal('?ref=http%3A%2F%2Fexample.org%2Fpage.html');
-    });
-  });
-
-  it('should replace EXTERNAL_REFERRER to empty string ' +
-      'if referrer is of same domain', () => {
-    const windowInterface = mockWindowInterface(sandbox);
-    windowInterface.getHostname.returns('example.org');
-    return getReplacements().then(replacements => {
-      stubServiceForDoc(sandbox, ampdoc, 'viewer', 'getReferrerUrl')
-          .returns(Promise.resolve('http://example.org/page.html'));
-      return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-    }).then(res => {
-      expect(res).to.equal('?ref=');
-    });
-  });
-
-  it('should replace EXTERNAL_REFERRER to empty string ' +
-      'if referrer is CDN proxy of same domain', () => {
-    const windowInterface = mockWindowInterface(sandbox);
-    windowInterface.getHostname.returns('example.org');
-    return getReplacements().then(replacements => {
-      stubServiceForDoc(sandbox, ampdoc, 'viewer', 'getReferrerUrl')
-          .returns(Promise.resolve(
-              'https://example-org.cdn.ampproject.org/v/example.org/page.html'));
-      return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-    }).then(res => {
-      expect(res).to.equal('?ref=');
-    });
+    return getReplacements()
+      .then(replacements => {
+        stubServiceForDoc(sandbox, ampdoc, 'viewer', 'getReferrerUrl').returns(
+          Promise.resolve('http://example.org/page.html')
+        );
+        return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+      })
+      .then(res => {
+        expect(res).to.equal('?ref=http%3A%2F%2Fexample.org%2Fpage.html');
+      });
   });
 
-  it('should replace EXTERNAL_REFERRER to empty string ' +
-      'if referrer is CDN proxy of same domain (before CURLS)', () => {
-    const windowInterface = mockWindowInterface(sandbox);
-    windowInterface.getHostname.returns('example.org');
-    return getReplacements().then(replacements => {
-      stubServiceForDoc(sandbox, ampdoc, 'viewer', 'getReferrerUrl')
-          .returns(Promise.resolve(
-              'https://cdn.ampproject.org/v/example.org/page.html'));
-      return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
-    }).then(res => {
-      expect(res).to.equal('?ref=');
-    });
-  });
+  it(
+    'should replace EXTERNAL_REFERRER to empty string ' +
+      'if referrer is of same domain',
+    () => {
+      const windowInterface = mockWindowInterface(sandbox);
+      windowInterface.getHostname.returns('example.org');
+      return getReplacements()
+        .then(replacements => {
+          stubServiceForDoc(
+            sandbox,
+            ampdoc,
+            'viewer',
+            'getReferrerUrl'
+          ).returns(Promise.resolve('http://example.org/page.html'));
+          return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+        })
+        .then(res => {
+          expect(res).to.equal('?ref=');
+        });
+    }
+  );
+
+  it(
+    'should replace EXTERNAL_REFERRER to empty string ' +
+      'if referrer is CDN proxy of same domain',
+    () => {
+      const windowInterface = mockWindowInterface(sandbox);
+      windowInterface.getHostname.returns('example.org');
+      return getReplacements()
+        .then(replacements => {
+          stubServiceForDoc(
+            sandbox,
+            ampdoc,
+            'viewer',
+            'getReferrerUrl'
+          ).returns(
+            Promise.resolve(
+              'https://example-org.cdn.ampproject.org/v/example.org/page.html'
+            )
+          );
+          return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+        })
+        .then(res => {
+          expect(res).to.equal('?ref=');
+        });
+    }
+  );
+
+  it(
+    'should replace EXTERNAL_REFERRER to empty string ' +
+      'if referrer is CDN proxy of same domain (before CURLS)',
+    () => {
+      const windowInterface = mockWindowInterface(sandbox);
+      windowInterface.getHostname.returns('example.org');
+      return getReplacements()
+        .then(replacements => {
+          stubServiceForDoc(
+            sandbox,
+            ampdoc,
+            'viewer',
+            'getReferrerUrl'
+          ).returns(
+            Promise.resolve(
+              'https://cdn.ampproject.org/v/example.org/page.html'
+            )
+          );
+          return replacements.expandUrlAsync('?ref=EXTERNAL_REFERRER');
+        })
+        .then(res => {
+          expect(res).to.equal('?ref=');
+        });
+    }
+  );
 
   it('should replace TITLE', () => {
     return expandUrlAsync('?title=TITLE').then(res => {
@@ -313,8 +353,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
   });
 
   it('should prefer original title for TITLE', () => {
-    return expandUrlAsync('?title=TITLE',
-        /*opt_bindings*/undefined, {withOriginalTitle: true}).then(res => {
+    return expandUrlAsync('?title=TITLE', /*opt_bindings*/ undefined, {
+      withOriginalTitle: true,
+    }).then(res => {
       expect(res).to.equal('?title=Original%20Pixel%20Test');
     });
   });
@@ -329,67 +370,81 @@ describes.sandboxed('UrlReplacements', {}, () => {
     it('should add extra params to AMPDOC_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?amp_r=hello%3Dworld');
+        'https://cdn.ampproject.org/a/o.com/foo/?amp_r=hello%3Dworld'
+      );
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=AMPDOC_URL')
-          .then(res => {
-            expect(res).to.contain(
-                encodeURIComponent(
-                    'https://cdn.ampproject.org/a/o.com/foo/?hello=world'));
-          });
+        .expandUrlAsync('?url=AMPDOC_URL')
+        .then(res => {
+          expect(res).to.contain(
+            encodeURIComponent(
+              'https://cdn.ampproject.org/a/o.com/foo/?hello=world'
+            )
+          );
+        });
     });
 
-
     it('should merge extra params in AMPDOC_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=hello%3Dworld');
+        'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=hello%3Dworld'
+      );
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=AMPDOC_URL')
-          .then(res => {
-            expect(res).to.contain(
-                encodeURIComponent(
-                    'https://cdn.ampproject.org/a/o.com/foo/?test=case&hello=world'));
-          });
+        .expandUrlAsync('?url=AMPDOC_URL')
+        .then(res => {
+          expect(res).to.contain(
+            encodeURIComponent(
+              'https://cdn.ampproject.org/a/o.com/foo/?test=case&hello=world'
+            )
+          );
+        });
     });
 
     it('should allow an embedded amp_r parameter', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?amp_r=amp_r%3Dweird');
+        'https://cdn.ampproject.org/a/o.com/foo/?amp_r=amp_r%3Dweird'
+      );
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=AMPDOC_URL')
-          .then(res => {
-            expect(res).to.contain(
-                encodeURIComponent(
-                    'https://cdn.ampproject.org/a/o.com/foo/?amp_r=weird'));
-          });
+        .expandUrlAsync('?url=AMPDOC_URL')
+        .then(res => {
+          expect(res).to.contain(
+            encodeURIComponent(
+              'https://cdn.ampproject.org/a/o.com/foo/?amp_r=weird'
+            )
+          );
+        });
     });
 
     it('should prefer original params in AMPDOC_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=test%3Devil');
+        'https://cdn.ampproject.org/a/o.com/foo/?test=case&amp_r=test%3Devil'
+      );
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=AMPDOC_URL')
-          .then(res => {
-            expect(res).to.contain(
-                encodeURIComponent(
-                    'https://cdn.ampproject.org/a/o.com/foo/?test=case'));
-          });
+        .expandUrlAsync('?url=AMPDOC_URL')
+        .then(res => {
+          expect(res).to.contain(
+            encodeURIComponent(
+              'https://cdn.ampproject.org/a/o.com/foo/?test=case'
+            )
+          );
+        });
     });
 
     it('should merge multiple extra params safely in AMPDOC_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&amp_r=hello%3Dworld%26goodnight%3Dmoon');
+        'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&amp_r=hello%3Dworld%26goodnight%3Dmoon'
+      );
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=AMPDOC_URL')
-          .then(res => {
-            expect(res).to.contain(
-                encodeURIComponent(
-                    'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&goodnight=moon'));
-          });
+        .expandUrlAsync('?url=AMPDOC_URL')
+        .then(res => {
+          expect(res).to.contain(
+            encodeURIComponent(
+              'https://cdn.ampproject.org/a/o.com/foo/?test=case&a&hello=you&goodnight=moon'
+            )
+          );
+        });
     });
   });
 
@@ -416,11 +471,12 @@ describes.sandboxed('UrlReplacements', {}, () => {
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL&host=SOURCE_HOST')
-          .then(res => {
-            expect(res).to.equal(
-                '?url=https%3A%2F%2Fexample.com%2Ftest&host=example.com');
-          });
+        .expandUrlAsync('?url=SOURCE_URL&host=SOURCE_HOST')
+        .then(res => {
+          expect(res).to.equal(
+            '?url=https%3A%2F%2Fexample.com%2Ftest&host=example.com'
+          );
+        });
     });
 
     it('should replace SOURCE_URL and SOURCE_HOSTNAME', () => {
@@ -433,11 +489,12 @@ describes.sandboxed('UrlReplacements', {}, () => {
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL&hostname=SOURCE_HOSTNAME')
-          .then(res => {
-            expect(res).to.equal(
-                '?url=https%3A%2F%2Fexample.com%2Ftest&hostname=example.com');
-          });
+        .expandUrlAsync('?url=SOURCE_URL&hostname=SOURCE_HOSTNAME')
+        .then(res => {
+          expect(res).to.equal(
+            '?url=https%3A%2F%2Fexample.com%2Ftest&hostname=example.com'
+          );
+        });
     });
 
     it('should update SOURCE_URL after track impression', () => {
@@ -450,55 +507,62 @@ describes.sandboxed('UrlReplacements', {}, () => {
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL')
-          .then(res => {
-            expect(res).to.contain('example.com');
-          });
+        .expandUrlAsync('?url=SOURCE_URL')
+        .then(res => {
+          expect(res).to.contain('example.com');
+        });
     });
 
     it('should add extra params to SOURCE_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?a&amp_r=hello%3Dworld');
+        'https://cdn.ampproject.org/a/o.com/foo/?a&amp_r=hello%3Dworld'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return Promise.resolve();
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL')
-          .then(res => {
-            expect(res).to.equal(
-                '?url=' + encodeURIComponent('http://o.com/foo/?a&hello=world'));
-          });
+        .expandUrlAsync('?url=SOURCE_URL')
+        .then(res => {
+          expect(res).to.equal(
+            '?url=' + encodeURIComponent('http://o.com/foo/?a&hello=world')
+          );
+        });
     });
 
     it('should ignore extra params that already exists in SOURCE_URL', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?a=1&safe=1&amp_r=hello%3Dworld%26safe=evil');
+        'https://cdn.ampproject.org/a/o.com/foo/?a=1&safe=1&amp_r=hello%3Dworld%26safe=evil'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return Promise.resolve();
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL')
-          .then(res => {
-            expect(res).to.equal(
-                '?url=' + encodeURIComponent('http://o.com/foo/?a=1&safe=1&hello=world'));
-          });
+        .expandUrlAsync('?url=SOURCE_URL')
+        .then(res => {
+          expect(res).to.equal(
+            '?url=' +
+              encodeURIComponent('http://o.com/foo/?a=1&safe=1&hello=world')
+          );
+        });
     });
 
     it('should not change SOURCE_URL if is not ad landing page', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/v/o.com/foo/?a&amp_r=hello%3Dworld');
+        'https://cdn.ampproject.org/v/o.com/foo/?a&amp_r=hello%3Dworld'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return Promise.resolve();
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?url=SOURCE_URL')
-          .then(res => {
-            expect(res).to.equal(
-                '?url=' + encodeURIComponent('http://o.com/foo/?a'));
-          });
+        .expandUrlAsync('?url=SOURCE_URL')
+        .then(res => {
+          expect(res).to.equal(
+            '?url=' + encodeURIComponent('http://o.com/foo/?a')
+          );
+        });
     });
   });
 
@@ -518,20 +582,26 @@ describes.sandboxed('UrlReplacements', {}, () => {
     setCookie(window, 'url-abc', 'cid-for-abc');
     // Make sure cookie does not exist
     setCookie(window, 'url-xyz', '');
-    return expandUrlAsync('?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
-        /*opt_bindings*/undefined, {withCid: true}).then(res => {
+    return expandUrlAsync(
+      '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
+      /*opt_bindings*/ undefined,
+      {withCid: true}
+    ).then(res => {
       expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]+){10,}/);
     });
   });
 
   it('should allow empty CLIENT_ID', () => {
-    return getReplacements().then(replacements => {
-      stubServiceForDoc(sandbox, ampdoc, 'cid', 'get')
-          .returns(Promise.resolve());
-      return replacements.expandUrlAsync('?a=CLIENT_ID(_ga)');
-    }).then(res => {
-      expect(res).to.equal('?a=');
-    });
+    return getReplacements()
+      .then(replacements => {
+        stubServiceForDoc(sandbox, ampdoc, 'cid', 'get').returns(
+          Promise.resolve()
+        );
+        return replacements.expandUrlAsync('?a=CLIENT_ID(_ga)');
+      })
+      .then(res => {
+        expect(res).to.equal('?a=');
+      });
   });
 
   it('should replace CLIENT_ID with opt_cookieName', () => {
@@ -539,8 +609,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
     // Make sure cookie does not exist
     setCookie(window, 'url-xyz', '');
     return expandUrlAsync(
-        '?a=CLIENT_ID(abc,,url-abc)&b=CLIENT_ID(xyz,,url-xyz)',
-        /*opt_bindings*/undefined, {withCid: true}).then(res => {
+      '?a=CLIENT_ID(abc,,url-abc)&b=CLIENT_ID(xyz,,url-xyz)',
+      /*opt_bindings*/ undefined,
+      {withCid: true}
+    ).then(res => {
       expect(res).to.match(/^\?a=cid-for-abc\&b=amp-([a-zA-Z0-9_-]+){10,}/);
     });
   });
@@ -549,8 +621,11 @@ describes.sandboxed('UrlReplacements', {}, () => {
     setCookie(window, '_ga', 'GA1.2.12345.54321');
     const origMode = getMode().runtime;
     getMode().runtime = 'inabox';
-    return expandUrlAsync('?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
-        /*opt_bindings*/undefined, {withCid: true}).then(res => {
+    return expandUrlAsync(
+      '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)',
+      /*opt_bindings*/ undefined,
+      {withCid: true}
+    ).then(res => {
       getMode().runtime = origMode;
       expect(res).to.equal('?a=&b=');
     });
@@ -559,106 +634,136 @@ describes.sandboxed('UrlReplacements', {}, () => {
   it('should parse _ga cookie correctly', () => {
     setCookie(window, '_ga', 'GA1.2.12345.54321');
     return expandUrlAsync(
-        '?a=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&b=CLIENT_ID(_ga)',
-        /*opt_bindings*/undefined, {withCid: true}).then(res => {
+      '?a=CLIENT_ID(AMP_ECID_GOOGLE,,_ga)&b=CLIENT_ID(_ga)',
+      /*opt_bindings*/ undefined,
+      {withCid: true}
+    ).then(res => {
       expect(res).to.match(/^\?a=12345.54321&b=12345.54321/);
     });
   });
 
-
   // TODO(alanorozco, #11827): Make this test work on Safari.
-  it.configure().skipSafari().run('should replace CLIENT_ID synchronously ' +
-      'when available', () => {
-    return getReplacements({withCid: true}).then(urlReplacements => {
-      setCookie(window, 'url-abc', 'cid-for-abc');
-      setCookie(window, 'url-xyz', 'cid-for-xyz');
-      // Only requests cid-for-xyz in async path
-      return urlReplacements.expandUrlAsync('b=CLIENT_ID(url-xyz)')
+  it.configure()
+    .skipSafari()
+    .run('should replace CLIENT_ID synchronously when available', () => {
+      return getReplacements({withCid: true}).then(urlReplacements => {
+        setCookie(window, 'url-abc', 'cid-for-abc');
+        setCookie(window, 'url-xyz', 'cid-for-xyz');
+        // Only requests cid-for-xyz in async path
+        return urlReplacements
+          .expandUrlAsync('b=CLIENT_ID(url-xyz)')
           .then(res => {
             expect(res).to.equal('b=cid-for-xyz');
-          }).then(() => {
+          })
+          .then(() => {
             const result = urlReplacements.expandUrlSync(
-                '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)' +
-                '&c=CLIENT_ID(other)');
+              '?a=CLIENT_ID(url-abc)&b=CLIENT_ID(url-xyz)' +
+                '&c=CLIENT_ID(other)'
+            );
             expect(result).to.equal('?a=&b=cid-for-xyz&c=');
           });
+      });
     });
-  });
 
   it('should replace AMP_STATE(key)', () => {
     const win = getFakeWindow();
-    sandbox.stub(Services, 'bindForDocOrNull').returns(Promise.resolve({
-      getStateValue(key) {
-        expect(key).to.equal('foo.bar');
-        return Promise.resolve('baz');
-      },
-    }));
+    sandbox.stub(Services, 'bindForDocOrNull').returns(
+      Promise.resolve({
+        getStateValue(key) {
+          expect(key).to.equal('foo.bar');
+          return Promise.resolve('baz');
+        },
+      })
+    );
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('?state=AMP_STATE(foo.bar)')
-        .then(res => {
-          expect(res).to.equal('?state=baz');
-        });
+      .expandUrlAsync('?state=AMP_STATE(foo.bar)')
+      .then(res => {
+        expect(res).to.equal('?state=baz');
+      });
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
   it.skip('should replace VARIANT', () => {
-    return expect(expandUrlAsync(
+    return expect(
+      expandUrlAsync(
         '?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)',
-        /*opt_bindings*/undefined, {withVariant: true}))
-        .to.eventually.equal('?x1=v1&x2=none&x3=');
+        /*opt_bindings*/ undefined,
+        {withVariant: true}
+      )
+    ).to.eventually.equal('?x1=v1&x2=none&x3=');
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should replace VARIANT with empty string if ' +
-      'amp-experiment is not configured ', () => {
-    return expect(expandUrlAsync(
-        '?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)'))
-        .to.eventually.equal('?x1=&x2=&x3=');
-  });
+  it.skip(
+    'should replace VARIANT with empty string if ' +
+      'amp-experiment is not configured ',
+    () => {
+      return expect(
+        expandUrlAsync('?x1=VARIANT(x1)&x2=VARIANT(x2)&x3=VARIANT(x3)')
+      ).to.eventually.equal('?x1=&x2=&x3=');
+    }
+  );
 
   it('should replace VARIANTS', () => {
-    return expect(expandUrlAsync('?VARIANTS', /*opt_bindings*/undefined,
-        {withVariant: true})).to.eventually.equal('?x1.v1!x2.none');
+    return expect(
+      expandUrlAsync('?VARIANTS', /*opt_bindings*/ undefined, {
+        withVariant: true,
+      })
+    ).to.eventually.equal('?x1.v1!x2.none');
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should replace VARIANTS with empty string if ' +
-      'amp-experiment is not configured ', () => {
-    return expect(expandUrlAsync('?VARIANTS')).to.eventually.equal('?');
-  });
+  it.skip(
+    'should replace VARIANTS with empty string if ' +
+      'amp-experiment is not configured ',
+    () => {
+      return expect(expandUrlAsync('?VARIANTS')).to.eventually.equal('?');
+    }
+  );
 
-  it('should replace SHARE_TRACKING_INCOMING and' +
-      ' SHARE_TRACKING_OUTGOING', () => {
+  it('should replace SHARE_TRACKING_INCOMING and SHARE_TRACKING_OUTGOING', () => {
     return expect(
-        expandUrlAsync(
-            '?in=SHARE_TRACKING_INCOMING&out=SHARE_TRACKING_OUTGOING',
-            /*opt_bindings*/undefined, {withShareTracking: true}))
-        .to.eventually.equal('?in=12345&out=54321');
+      expandUrlAsync(
+        '?in=SHARE_TRACKING_INCOMING&out=SHARE_TRACKING_OUTGOING',
+        /*opt_bindings*/ undefined,
+        {withShareTracking: true}
+      )
+    ).to.eventually.equal('?in=12345&out=54321');
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should replace SHARE_TRACKING_INCOMING and SHARE_TRACKING_OUTGOING' +
-      ' with empty string if amp-share-tracking is not configured', () => {
-    return expect(
+  it.skip(
+    'should replace SHARE_TRACKING_INCOMING and SHARE_TRACKING_OUTGOING' +
+      ' with empty string if amp-share-tracking is not configured',
+    () => {
+      return expect(
         expandUrlAsync(
-            '?in=SHARE_TRACKING_INCOMING&out=SHARE_TRACKING_OUTGOING'))
-        .to.eventually.equal('?in=&out=');
-  });
+          '?in=SHARE_TRACKING_INCOMING&out=SHARE_TRACKING_OUTGOING'
+        )
+      ).to.eventually.equal('?in=&out=');
+    }
+  );
 
   it('should replace STORY_PAGE_INDEX and STORY_PAGE_ID', () => {
     return expect(
-        expandUrlAsync('?index=STORY_PAGE_INDEX&id=STORY_PAGE_ID',
-            /*opt_bindings*/ undefined, {withStoryVariableService: true}))
-        .to.eventually.equal('?index=546&id=id-123');
+      expandUrlAsync(
+        '?index=STORY_PAGE_INDEX&id=STORY_PAGE_ID',
+        /*opt_bindings*/ undefined,
+        {withStoryVariableService: true}
+      )
+    ).to.eventually.equal('?index=546&id=id-123');
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should replace STORY_PAGE_INDEX and STORY_PAGE_ID' +
-      ' with empty string if amp-story is not configured', () => {
-    return expect(
-        expandUrlAsync('?index=STORY_PAGE_INDEX&id=STORY_PAGE_ID'))
-        .to.eventually.equal('?index=&id=');
-  });
+  it.skip(
+    'should replace STORY_PAGE_INDEX and STORY_PAGE_ID' +
+      ' with empty string if amp-story is not configured',
+    () => {
+      return expect(
+        expandUrlAsync('?index=STORY_PAGE_INDEX&id=STORY_PAGE_ID')
+      ).to.eventually.equal('?index=&id=');
+    }
+  );
 
   it('should replace TIMESTAMP', () => {
     return expandUrlAsync('?ts=TIMESTAMP').then(res => {
@@ -675,8 +780,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
   it('should return correct ISO timestamp', () => {
     const fakeTime = 1499979336612;
     sandbox.useFakeTimers(fakeTime);
-    return expect(expandUrlAsync('?tsf=TIMESTAMP_ISO'))
-        .to.eventually.equal('?tsf=2017-07-13T20%3A55%3A36.612Z');
+    return expect(expandUrlAsync('?tsf=TIMESTAMP_ISO')).to.eventually.equal(
+      '?tsf=2017-07-13T20%3A55%3A36.612Z'
+    );
   });
 
   it('should replace TIMEZONE', () => {
@@ -741,56 +847,57 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should replace FIRST_CONTENTFUL_PAINT', () => {
     const win = getFakeWindow();
-    sandbox.stub(Services, 'performanceFor')
-        .returns({
-          getFirstContentfulPaint() {
-            return 1;
-          },
-        });
+    sandbox.stub(Services, 'performanceFor').returns({
+      getFirstContentfulPaint() {
+        return 1;
+      },
+    });
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('FIRST_CONTENTFUL_PAINT').then(res => {
-          expect(res).to.match(/^\d+$/);
-        });
+      .expandUrlAsync('FIRST_CONTENTFUL_PAINT')
+      .then(res => {
+        expect(res).to.match(/^\d+$/);
+      });
   });
 
   it('should replace FIRST_VIEWPORT_READY', () => {
     const win = getFakeWindow();
-    sandbox.stub(Services, 'performanceFor')
-        .returns({
-          getFirstViewportReady() {
-            return 1;
-          },
-        });
+    sandbox.stub(Services, 'performanceFor').returns({
+      getFirstViewportReady() {
+        return 1;
+      },
+    });
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('FIRST_VIEWPORT_READY').then(res => {
-          expect(res).to.match(/^\d+$/);
-        });
+      .expandUrlAsync('FIRST_VIEWPORT_READY')
+      .then(res => {
+        expect(res).to.match(/^\d+$/);
+      });
   });
 
   it('should replace MAKE_BODY_VISIBLE', () => {
     const win = getFakeWindow();
-    sandbox.stub(Services, 'performanceFor')
-        .returns({
-          getMakeBodyVisible() {
-            return 1;
-          },
-        });
+    sandbox.stub(Services, 'performanceFor').returns({
+      getMakeBodyVisible() {
+        return 1;
+      },
+    });
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('MAKE_BODY_VISIBLE').then(res => {
-          expect(res).to.match(/^\d+$/);
-        });
+      .expandUrlAsync('MAKE_BODY_VISIBLE')
+      .then(res => {
+        expect(res).to.match(/^\d+$/);
+      });
   });
 
   it('should reject protocol changes', () => {
     const win = getFakeWindow();
     const {documentElement} = win.document;
     const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-    return urlReplacements.expandUrlAsync(
-        'PROTOCOL://example.com/?r=RANDOM', {
-          'PROTOCOL': Promise.resolve('abc'),
-        }).then(expanded => {
-      expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
-    });
+    return urlReplacements
+      .expandUrlAsync('PROTOCOL://example.com/?r=RANDOM', {
+        'PROTOCOL': Promise.resolve('abc'),
+      })
+      .then(expanded => {
+        expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
+      });
   });
 
   it('Should replace BACKGROUND_STATE with 0', () => {
@@ -799,10 +906,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
       obj: {isVisible: () => true},
     };
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('?sh=BACKGROUND_STATE')
-        .then(res => {
-          expect(res).to.equal('?sh=0');
-        });
+      .expandUrlAsync('?sh=BACKGROUND_STATE')
+      .then(res => {
+        expect(res).to.equal('?sh=0');
+      });
   });
 
   it('Should replace BACKGROUND_STATE with 1', () => {
@@ -811,10 +918,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
       obj: {isVisible: () => false},
     };
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('?sh=BACKGROUND_STATE')
-        .then(res => {
-          expect(res).to.equal('?sh=1');
-        });
+      .expandUrlAsync('?sh=BACKGROUND_STATE')
+      .then(res => {
+        expect(res).to.equal('?sh=1');
+      });
   });
 
   it('Should replace VIDEO_STATE(video,parameter) with video data', () => {
@@ -824,15 +931,16 @@ describes.sandboxed('UrlReplacements', {}, () => {
         return Promise.resolve({currentTime: 1.5});
       },
     });
-    sandbox.stub(win.document, 'getElementById')
-        .withArgs('video')
-        .returns(document.createElement('video'));
+    sandbox
+      .stub(win.document, 'getElementById')
+      .withArgs('video')
+      .returns(document.createElement('video'));
 
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .expandUrlAsync('?sh=VIDEO_STATE(video,currentTime)')
-        .then(res => {
-          expect(res).to.equal('?sh=1.5');
-        });
+      .expandUrlAsync('?sh=VIDEO_STATE(video,currentTime)')
+      .then(res => {
+        expect(res).to.equal('?sh=1.5');
+      });
   });
 
   describe('PAGE_LOAD_TIME', () => {
@@ -855,17 +963,18 @@ describes.sandboxed('UrlReplacements', {}, () => {
     it('is replaced if timing info is not available', () => {
       win.document.readyState = 'complete';
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=PAGE_LOAD_TIME&s')
-          .then(res => {
-            expect(res).to.match(/sh=&s/);
-          });
+        .expandUrlAsync('?sh=PAGE_LOAD_TIME&s')
+        .then(res => {
+          expect(res).to.match(/sh=&s/);
+        });
     });
 
     it('is replaced if PAGE_LOAD_TIME is available within a delay', () => {
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      const validMetric =
-          urlReplacements.expandUrlAsync('?sh=PAGE_LOAD_TIME&s');
+      const validMetric = urlReplacements.expandUrlAsync(
+        '?sh=PAGE_LOAD_TIME&s'
+      );
       urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
       win.document.readyState = 'complete';
       loadObservable.fire({type: 'load'});
@@ -883,17 +992,21 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   // TODO(cvializ, #12336): unskip
   it.skip('should replace NAV_TIMING', () => {
-    return expandUrlAsync('?a=NAV_TIMING(navigationStart)' +
-        '&b=NAV_TIMING(navigationStart,responseStart)').then(res => {
+    return expandUrlAsync(
+      '?a=NAV_TIMING(navigationStart)' +
+        '&b=NAV_TIMING(navigationStart,responseStart)'
+    ).then(res => {
       expect(res).to.match(/a=\d+&b=\d+/);
     });
   });
 
   it('should replace NAV_TIMING when attribute names are invalid', () => {
-    return expandUrlAsync('?a=NAV_TIMING(invalid)' +
+    return expandUrlAsync(
+      '?a=NAV_TIMING(invalid)' +
         '&b=NAV_TIMING(invalid,invalid)' +
         '&c=NAV_TIMING(navigationStart,invalid)' +
-        '&d=NAV_TIMING(invalid,responseStart)').then(res => {
+        '&d=NAV_TIMING(invalid,responseStart)'
+    ).then(res => {
       expect(res).to.match(/a=&b=&c=&d=/);
     });
   });
@@ -979,8 +1092,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should replace VIEWER with origin', () => {
     return getReplacements().then(replacements => {
-      sandbox.stub(viewerService, 'getViewerOrigin').returns(
-          Promise.resolve('https://www.google.com'));
+      sandbox
+        .stub(viewerService, 'getViewerOrigin')
+        .returns(Promise.resolve('https://www.google.com'));
       return replacements.expandUrlAsync('?sh=VIEWER').then(res => {
         expect(res).to.equal('?sh=https%3A%2F%2Fwww.google.com');
       });
@@ -989,8 +1103,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should replace VIEWER with empty string', () => {
     return getReplacements().then(replacements => {
-      sandbox.stub(viewerService, 'getViewerOrigin').returns(
-          Promise.resolve(''));
+      sandbox
+        .stub(viewerService, 'getViewerOrigin')
+        .returns(Promise.resolve(''));
       return replacements.expandUrlAsync('?sh=VIEWER').then(res => {
         expect(res).to.equal('?sh=');
       });
@@ -998,16 +1113,21 @@ describes.sandboxed('UrlReplacements', {}, () => {
   });
 
   it('should replace TOTAL_ENGAGED_TIME', () => {
-    return expandUrlAsync('?sh=TOTAL_ENGAGED_TIME', /*opt_bindings*/undefined,
-        {withActivity: true}).then(res => {
+    return expandUrlAsync(
+      '?sh=TOTAL_ENGAGED_TIME',
+      /*opt_bindings*/ undefined,
+      {withActivity: true}
+    ).then(res => {
       expect(res).to.match(/sh=\d+/);
     });
   });
 
   it('should replace INCREMENTAL_ENGAGED_TIME', () => {
-    return expandUrlAsync('?sh=' +
-      'INCREMENTAL_ENGAGED_TIME', /*opt_bindings*/undefined,
-    {withActivity: true}).then(res => {
+    return expandUrlAsync(
+      '?sh=INCREMENTAL_ENGAGED_TIME',
+      /*opt_bindings*/ undefined,
+      {withActivity: true}
+    ).then(res => {
       expect(res).to.match(/sh=\d+/);
     });
   });
@@ -1020,26 +1140,36 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should replace ANCESTOR_ORIGIN', () => {
     return expect(
-        expandUrlAsync('ANCESTOR_ORIGIN/recipes',
-            /*opt_bindings*/ undefined, {withViewerIntegrationVariableService: {
-              ancestorOrigin: () => { return 'http://margarine-paradise.com'; },
-              fragmentParam: (param, defaultValue) => {
-                return param == 'ice_cream' ? '2' : defaultValue;
-              },
-            }}))
-        .to.eventually.equal('http://margarine-paradise.com/recipes');
+      expandUrlAsync('ANCESTOR_ORIGIN/recipes', /*opt_bindings*/ undefined, {
+        withViewerIntegrationVariableService: {
+          ancestorOrigin: () => {
+            return 'http://margarine-paradise.com';
+          },
+          fragmentParam: (param, defaultValue) => {
+            return param == 'ice_cream' ? '2' : defaultValue;
+          },
+        },
+      })
+    ).to.eventually.equal('http://margarine-paradise.com/recipes');
   });
 
   it('should replace FRAGMENT_PARAM with 2', () => {
     return expect(
-        expandUrlAsync('?sh=FRAGMENT_PARAM(ice_cream)&s',
-            /*opt_bindings*/ undefined, {withViewerIntegrationVariableService: {
-              ancestorOrigin: () => { return 'http://margarine-paradise.com'; },
-              fragmentParam: (param, defaultValue) => {
-                return param == 'ice_cream' ? '2' : defaultValue;
-              },
-            }}))
-        .to.eventually.equal('?sh=2&s');
+      expandUrlAsync(
+        '?sh=FRAGMENT_PARAM(ice_cream)&s',
+        /*opt_bindings*/ undefined,
+        {
+          withViewerIntegrationVariableService: {
+            ancestorOrigin: () => {
+              return 'http://margarine-paradise.com';
+            },
+            fragmentParam: (param, defaultValue) => {
+              return param == 'ice_cream' ? '2' : defaultValue;
+            },
+          },
+        }
+      )
+    ).to.eventually.equal('?sh=2&s');
   });
 
   it('should accept $expressions', () => {
@@ -1055,12 +1185,15 @@ describes.sandboxed('UrlReplacements', {}, () => {
   });
 
   it('should replace several substitutions', () => {
-    return expandUrlAsync('?a=UNKNOWN&href=CANONICAL_URL&title=TITLE')
-        .then(res => {
-          expect(res).to.equal('?a=UNKNOWN' +
-              '&href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1' +
-              '&title=Pixel%20Test');
-        });
+    return expandUrlAsync('?a=UNKNOWN&href=CANONICAL_URL&title=TITLE').then(
+      res => {
+        expect(res).to.equal(
+          '?a=UNKNOWN' +
+            '&href=https%3A%2F%2Fpinterest.com%3A8080%2Fpin1' +
+            '&title=Pixel%20Test'
+        );
+      }
+    );
   });
 
   it('should replace new substitutions', () => {
@@ -1070,30 +1203,32 @@ describes.sandboxed('UrlReplacements', {}, () => {
     expect(replacements.expandUrlAsync('?a=ONE')).to.eventually.equal('?a=a');
     replacements.getVariableSource().set('ONE', () => 'b');
     replacements.getVariableSource().set('TWO', () => 'b');
-    return expect(replacements.expandUrlAsync('?a=ONE&b=TWO'))
-        .to.eventually.equal('?a=b&b=b');
+    return expect(
+      replacements.expandUrlAsync('?a=ONE&b=TWO')
+    ).to.eventually.equal('?a=b&b=b');
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should report errors & replace them with empty ' +
-      'string (sync)', () => {
+  it.skip('should report errors & replace them with empty string (sync)', () => {
     const clock = sandbox.useFakeTimers();
     const {documentElement} = window.document;
     const replacements = Services.urlReplacementsForDoc(documentElement);
     replacements.getVariableSource().set('ONE', () => {
       throw new Error('boom');
     });
-    const p = expect(replacements.expandUrlAsync('?a=ONE')).to.eventually
-        .equal('?a=');
-    allowConsoleError(() => { expect(() => {
-      clock.tick(1);
-    }).to.throw(/boom/); });
+    const p = expect(replacements.expandUrlAsync('?a=ONE')).to.eventually.equal(
+      '?a='
+    );
+    allowConsoleError(() => {
+      expect(() => {
+        clock.tick(1);
+      }).to.throw(/boom/);
+    });
     return p;
   });
 
   // TODO(#16916): Make this test work with synchronous throws.
-  it.skip('should report errors & replace them with empty ' +
-      'string (promise)', () => {
+  it.skip('should report errors & replace them with empty string (promise)', () => {
     const clock = sandbox.useFakeTimers();
     const {documentElement} = window.document;
     const replacements = Services.urlReplacementsForDoc(documentElement);
@@ -1101,20 +1236,23 @@ describes.sandboxed('UrlReplacements', {}, () => {
       return Promise.reject(new Error('boom'));
     });
     return expect(replacements.expandUrlAsync('?a=ONE'))
-        .to.eventually.equal('?a=')
-        .then(() => {
-          allowConsoleError(() => { expect(() => {
+      .to.eventually.equal('?a=')
+      .then(() => {
+        allowConsoleError(() => {
+          expect(() => {
             clock.tick(1);
-          }).to.throw(/boom/); });
+          }).to.throw(/boom/);
         });
+      });
   });
 
   it('should support positional arguments', () => {
     const {documentElement} = window.document;
     const replacements = Services.urlReplacementsForDoc(documentElement);
     replacements.getVariableSource().set('FN', one => one);
-    return expect(replacements.expandUrlAsync('?a=FN(xyz1)')).to
-        .eventually.equal('?a=xyz1');
+    return expect(
+      replacements.expandUrlAsync('?a=FN(xyz1)')
+    ).to.eventually.equal('?a=xyz1');
   });
 
   it('should support multiple positional arguments', () => {
@@ -1123,8 +1261,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
     replacements.getVariableSource().set('FN', (one, two) => {
       return one + '-' + two;
     });
-    return expect(replacements.expandUrlAsync('?a=FN(xyz,abc)')).to
-        .eventually.equal('?a=xyz-abc');
+    return expect(
+      replacements.expandUrlAsync('?a=FN(xyz,abc)')
+    ).to.eventually.equal('?a=xyz-abc');
   });
 
   it('should support multiple positional arguments with dots', () => {
@@ -1133,8 +1272,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
     replacements.getVariableSource().set('FN', (one, two) => {
       return one + '-' + two;
     });
-    return expect(replacements.expandUrlAsync('?a=FN(xy.z,ab.c)')).to
-        .eventually.equal('?a=xy.z-ab.c');
+    return expect(
+      replacements.expandUrlAsync('?a=FN(xy.z,ab.c)')
+    ).to.eventually.equal('?a=xy.z-ab.c');
   });
 
   it('should support promises as replacements', () => {
@@ -1144,8 +1284,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
     replacements.getVariableSource().set('P2', () => Promise.resolve('xyz'));
     replacements.getVariableSource().set('P3', () => Promise.resolve('123'));
     replacements.getVariableSource().set('OTHER', () => 'foo');
-    return expect(replacements.expandUrlAsync('?a=P1&b=P2&c=P3&d=OTHER'))
-        .to.eventually.equal('?a=abc%20&b=xyz&c=123&d=foo');
+    return expect(
+      replacements.expandUrlAsync('?a=P1&b=P2&c=P3&d=OTHER')
+    ).to.eventually.equal('?a=abc%20&b=xyz&c=123&d=foo');
   });
 
   it('should override an existing binding', () => {
@@ -1155,28 +1296,30 @@ describes.sandboxed('UrlReplacements', {}, () => {
   });
 
   it('should add an additional binding', () => {
-    return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'})
-        .then(res => {
-          expect(res).to.match(/rid=abc\?$/);
-        });
+    return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
+      res => {
+        expect(res).to.match(/rid=abc\?$/);
+      }
+    );
   });
 
   it('should NOT overwrite the cached expression with new bindings', () => {
-    return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'})
-        .then(res => {
-          expect(res).to.match(/rid=abc\?$/);
-          return expandUrlAsync('rid=NONSTANDARD?').then(res => {
-            expect(res).to.match(/rid=NONSTANDARD\?$/);
-          });
+    return expandUrlAsync('rid=NONSTANDARD?', {'NONSTANDARD': 'abc'}).then(
+      res => {
+        expect(res).to.match(/rid=abc\?$/);
+        return expandUrlAsync('rid=NONSTANDARD?').then(res => {
+          expect(res).to.match(/rid=NONSTANDARD\?$/);
         });
+      }
+    );
   });
 
   it('should expand bindings as functions', () => {
-    return expandUrlAsync('rid=FUNC(abc)?', {'FUNC': value => 'func_' + value})
-        .then(
-            res => {
-              expect(res).to.match(/rid=func_abc\?$/);
-            });
+    return expandUrlAsync('rid=FUNC(abc)?', {
+      'FUNC': value => 'func_' + value,
+    }).then(res => {
+      expect(res).to.match(/rid=func_abc\?$/);
+    });
   });
 
   it('should expand bindings as functions with promise', () => {
@@ -1219,11 +1362,11 @@ describes.sandboxed('UrlReplacements', {}, () => {
 
   it('should resolve sub-included bindings', () => {
     // RANDOM is a standard property and we add RANDOM_OTHER.
-    return expandUrlAsync('r=RANDOM&ro=RANDOM_OTHER?', {'RANDOM_OTHER': 'ABC'})
-        .then(
-            res => {
-              expect(res).to.match(/r=(\d+(\.\d+)?)&ro=ABC\?$/);
-            });
+    return expandUrlAsync('r=RANDOM&ro=RANDOM_OTHER?', {
+      'RANDOM_OTHER': 'ABC',
+    }).then(res => {
+      expect(res).to.match(/r=(\d+(\.\d+)?)&ro=ABC\?$/);
+    });
   });
 
   it('should expand multiple vars', () => {
@@ -1238,19 +1381,22 @@ describes.sandboxed('UrlReplacements', {}, () => {
   describe('QUERY_PARAM', () => {
     it('should replace QUERY_PARAM with foo', () => {
       const win = getFakeWindow();
-      win.location = parseUrlDeprecated('https://example.com?query_string_param1=wrong');
+      win.location = parseUrlDeprecated(
+        'https://example.com?query_string_param1=wrong'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return new Promise(resolve => {
-          win.location =
-              parseUrlDeprecated('https://example.com?query_string_param1=foo');
+          win.location = parseUrlDeprecated(
+            'https://example.com?query_string_param1=foo'
+          );
           resolve();
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
-          .then(res => {
-            expect(res).to.match(/sh=foo&s/);
-          });
+        .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
+        .then(res => {
+          expect(res).to.match(/sh=foo&s/);
+        });
     });
 
     it('should replace QUERY_PARAM with ""', () => {
@@ -1260,10 +1406,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
         return Promise.resolve();
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
-          .then(res => {
-            expect(res).to.match(/sh=&s/);
-          });
+        .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1)&s')
+        .then(res => {
+          expect(res).to.match(/sh=&s/);
+        });
     });
 
     it('should replace QUERY_PARAM with default_value', () => {
@@ -1273,47 +1419,50 @@ describes.sandboxed('UrlReplacements', {}, () => {
         return Promise.resolve();
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync(
-              '?sh=QUERY_PARAM(query_string_param1,default_value)&s')
-          .then(res => {
-            expect(res).to.match(/sh=default_value&s/);
-          });
+        .expandUrlAsync('?sh=QUERY_PARAM(query_string_param1,default_value)&s')
+        .then(res => {
+          expect(res).to.match(/sh=default_value&s/);
+        });
     });
 
     it('should replace QUERY_PARAM with extra param', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?x=wrong');
+        'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return new Promise(resolve => {
           win.location = parseUrlDeprecated(
-              'https://cdn.ampproject.org/a/o.com/foo/?amp_r=x%3Dfoo');
+            'https://cdn.ampproject.org/a/o.com/foo/?amp_r=x%3Dfoo'
+          );
           resolve();
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
-          .then(res => {
-            expect(res).to.match(/sh=foo&s/);
-          });
+        .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
+        .then(res => {
+          expect(res).to.match(/sh=foo&s/);
+        });
     });
 
     it('should replace QUERY_PARAM, preferring original over extra', () => {
       const win = getFakeWindow();
       win.location = parseUrlDeprecated(
-          'https://cdn.ampproject.org/a/o.com/foo/?x=wrong');
+        'https://cdn.ampproject.org/a/o.com/foo/?x=wrong'
+      );
       sandbox.stub(trackPromise, 'getTrackImpressionPromise').callsFake(() => {
         return new Promise(resolve => {
           win.location = parseUrlDeprecated(
-              'https://cdn.ampproject.org/a/o.com/foo/?x=foo&amp_r=x%3Devil');
+            'https://cdn.ampproject.org/a/o.com/foo/?x=foo&amp_r=x%3Devil'
+          );
           resolve();
         });
       });
       return Services.urlReplacementsForDoc(win.document.documentElement)
-          .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
-          .then(res => {
-            expect(res).to.match(/sh=foo&s/);
-          });
+        .expandUrlAsync('?sh=QUERY_PARAM(x)&s')
+        .then(res => {
+          expect(res).to.match(/sh=foo&s/);
+        });
     });
   });
 
@@ -1324,26 +1473,27 @@ describes.sandboxed('UrlReplacements', {}, () => {
       return Promise.resolve();
     });
     return Services.urlReplacementsForDoc(win.document.documentElement)
-        .collectVars('?SOURCE_HOST&QUERY_PARAM(p1)&SIMPLE&FUNC&PROMISE', {
+      .collectVars('?SOURCE_HOST&QUERY_PARAM(p1)&SIMPLE&FUNC&PROMISE', {
+        'SIMPLE': 21,
+        'FUNC': () => 22,
+        'PROMISE': () => Promise.resolve(23),
+      })
+      .then(res => {
+        expect(res).to.deep.equal({
+          'SOURCE_HOST': 'example.com',
+          'QUERY_PARAM(p1)': 'foo',
           'SIMPLE': 21,
-          'FUNC': () => 22,
-          'PROMISE': () => Promise.resolve(23),
-        })
-        .then(res => {
-          expect(res).to.deep.equal({
-            'SOURCE_HOST': 'example.com',
-            'QUERY_PARAM(p1)': 'foo',
-            'SIMPLE': 21,
-            'FUNC': 22,
-            'PROMISE': 23,
-          });
+          'FUNC': 22,
+          'PROMISE': 23,
         });
+      });
   });
 
   it('should collect unwhitelisted vars', () => {
     const win = getFakeWindow();
-    win.location =
-      parseUrlDeprecated('https://example.com/base?foo=bar&bar=abc&gclid=123');
+    win.location = parseUrlDeprecated(
+      'https://example.com/base?foo=bar&bar=abc&gclid=123'
+    );
     const element = document.createElement('amp-foo');
     element.setAttribute('src', '?SOURCE_HOST&QUERY_PARAM(p1)&COUNTER');
     element.setAttribute('data-amp-replace', 'QUERY_PARAM');
@@ -1358,13 +1508,16 @@ describes.sandboxed('UrlReplacements', {}, () => {
     const {documentElement} = win.document;
     const urlReplacements = Services.urlReplacementsForDoc(documentElement);
     /*eslint no-script-url: 0*/
-    return urlReplacements.expandUrlAsync('javascript://example.com/?r=RANDOM')
-        .then(
-            () => { throw new Error('never here'); },
-            err => {
-              expect(err.message).to.match(/invalid protocol/);
-            }
-        );
+    return urlReplacements
+      .expandUrlAsync('javascript://example.com/?r=RANDOM')
+      .then(
+        () => {
+          throw new Error('never here');
+        },
+        err => {
+          expect(err.message).to.match(/invalid protocol/);
+        }
+      );
   });
 
   describe('sync expansion', () => {
@@ -1375,13 +1528,19 @@ describes.sandboxed('UrlReplacements', {}, () => {
       urlReplacements.ampdoc.win.performance.timing.loadEventStart = 109;
       const collectVars = {};
       const expanded = urlReplacements.expandUrlSync(
-          'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
-          {
-            'CONST': 'ABC',
-            'FUNCT': function(a, b) { return a + b; },
-            // Will ignore promise based result and instead insert empty string.
-            'PROM': function() { return Promise.resolve('boo'); },
-          }, collectVars);
+        'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
+        {
+          'CONST': 'ABC',
+          'FUNCT': function(a, b) {
+            return a + b;
+          },
+          // Will ignore promise based result and instead insert empty string.
+          'PROM': function() {
+            return Promise.resolve('boo');
+          },
+        },
+        collectVars
+      );
       expect(expanded).to.match(/^r=\d(\.\d+)?&c=ABC&f=helloworld&a=b&d=&e=9$/);
       expect(collectVars).to.deep.equal({
         'RANDOM': parseFloat(/^r=(\d+(\.\d+)?)/.exec(expanded)[1]),
@@ -1396,14 +1555,20 @@ describes.sandboxed('UrlReplacements', {}, () => {
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
       let expanded = urlReplacements.expandUrlSync(
-          'PROTOCOL://example.com/?r=RANDOM', {
-            'PROTOCOL': 'abc',
-          });
+        'PROTOCOL://example.com/?r=RANDOM',
+        {
+          'PROTOCOL': 'abc',
+        }
+      );
       expect(expanded).to.equal('PROTOCOL://example.com/?r=RANDOM');
       expanded = urlReplacements.expandUrlSync(
-          'FUNCT://example.com/?r=RANDOM', {
-            'FUNCT': function() { return 'abc'; },
-          });
+        'FUNCT://example.com/?r=RANDOM',
+        {
+          'FUNCT': function() {
+            return 'abc';
+          },
+        }
+      );
       expect(expanded).to.equal('FUNCT://example.com/?r=RANDOM');
     });
 
@@ -1411,10 +1576,12 @@ describes.sandboxed('UrlReplacements', {}, () => {
       const win = getFakeWindow();
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      allowConsoleError(() => { expect(() => {
-        /*eslint no-script-url: 0*/
-        urlReplacements.expandUrlSync('javascript://example.com/?r=RANDOM');
-      }).to.throw('invalid protocol'); });
+      allowConsoleError(() => {
+        expect(() => {
+          /*eslint no-script-url: 0*/
+          urlReplacements.expandUrlSync('javascript://example.com/?r=RANDOM');
+        }).to.throw('invalid protocol');
+      });
     });
   });
 
@@ -1423,17 +1590,21 @@ describes.sandboxed('UrlReplacements', {}, () => {
     const {documentElement} = win.document;
     const urlReplacements = Services.urlReplacementsForDoc(documentElement);
     const expanded = urlReplacements.expandUrlSync(
-        'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
-        {
-          'CONST': 'ABC',
-          'FUNCT': () => {
-            throw Error('Should not be called');
-          },
-        }, undefined, {
-          'CONST': true,
-        });
-    expect(expanded).to.equal('r=RANDOM&c=ABC&f=FUNCT(hello,world)' +
-        '&a=b&d=PROM&e=PAGE_LOAD_TIME');
+      'r=RANDOM&c=CONST&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME',
+      {
+        'CONST': 'ABC',
+        'FUNCT': () => {
+          throw Error('Should not be called');
+        },
+      },
+      undefined,
+      {
+        'CONST': true,
+      }
+    );
+    expect(expanded).to.equal(
+      'r=RANDOM&c=ABC&f=FUNCT(hello,world)&a=b&d=PROM&e=PAGE_LOAD_TIME'
+    );
   });
 
   describe('access values via amp-access', () => {
@@ -1446,10 +1617,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
         getAuthdataField: () => {},
       };
       accessServiceMock = sandbox.mock(accessService);
-      sandbox.stub(Services, 'accessServiceForDocOrNull')
-          .callsFake(() => {
-            return Promise.resolve(accessService);
-          });
+      sandbox.stub(Services, 'accessServiceForDocOrNull').callsFake(() => {
+        return Promise.resolve(accessService);
+      });
     });
 
     afterEach(() => {
@@ -1473,20 +1643,22 @@ describes.sandboxed('UrlReplacements', {}, () => {
     }
 
     it('should replace ACCESS_READER_ID', () => {
-      accessServiceMock.expects('getAccessReaderId')
-          .returns(Promise.resolve('reader1'))
-          .once();
-      return expandUrlAsync('?a=ACCESS_READER_ID') .then(res => {
+      accessServiceMock
+        .expects('getAccessReaderId')
+        .returns(Promise.resolve('reader1'))
+        .once();
+      return expandUrlAsync('?a=ACCESS_READER_ID').then(res => {
         expect(res).to.match(/a=reader1/);
         expect(userErrorStub).to.have.not.been.called;
       });
     });
 
     it('should replace AUTHDATA', () => {
-      accessServiceMock.expects('getAuthdataField')
-          .withExactArgs('field1')
-          .returns(Promise.resolve('value1'))
-          .once();
+      accessServiceMock
+        .expects('getAuthdataField')
+        .withExactArgs('field1')
+        .returns(Promise.resolve('value1'))
+        .once();
       return expandUrlAsync('?a=AUTHDATA(field1)').then(res => {
         expect(res).to.match(/a=value1/);
         expect(userErrorStub).to.have.not.been.called;
@@ -1494,18 +1666,17 @@ describes.sandboxed('UrlReplacements', {}, () => {
     });
 
     it('should report error if not available', () => {
-      accessServiceMock.expects('getAccessReaderId')
-          .never();
-      return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true)
-          .then(res => {
-            expect(res).to.match(/a=;/);
-            expect(userErrorStub).to.be.calledOnce;
-          });
+      accessServiceMock.expects('getAccessReaderId').never();
+      return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true).then(
+        res => {
+          expect(res).to.match(/a=;/);
+          expect(userErrorStub).to.be.calledOnce;
+        }
+      );
     });
   });
 
   describe('access values via amp-subscriptions', () => {
-
     let accessService;
     let accessServiceMock;
 
@@ -1515,10 +1686,11 @@ describes.sandboxed('UrlReplacements', {}, () => {
         getAuthdataField: () => {},
       };
       accessServiceMock = sandbox.mock(accessService);
-      sandbox.stub(Services, 'subscriptionsServiceForDocOrNull')
-          .callsFake(() => {
-            return Promise.resolve(accessService);
-          });
+      sandbox
+        .stub(Services, 'subscriptionsServiceForDocOrNull')
+        .callsFake(() => {
+          return Promise.resolve(accessService);
+        });
     });
 
     afterEach(() => {
@@ -1542,20 +1714,22 @@ describes.sandboxed('UrlReplacements', {}, () => {
     }
 
     it('should replace ACCESS_READER_ID', () => {
-      accessServiceMock.expects('getAccessReaderId')
-          .returns(Promise.resolve('reader1'))
-          .once();
-      return expandUrlAsync('?a=ACCESS_READER_ID') .then(res => {
+      accessServiceMock
+        .expects('getAccessReaderId')
+        .returns(Promise.resolve('reader1'))
+        .once();
+      return expandUrlAsync('?a=ACCESS_READER_ID').then(res => {
         expect(res).to.match(/a=reader1/);
         expect(userErrorStub).to.have.not.been.called;
       });
     });
 
     it('should replace AUTHDATA', () => {
-      accessServiceMock.expects('getAuthdataField')
-          .withExactArgs('field1')
-          .returns(Promise.resolve('value1'))
-          .once();
+      accessServiceMock
+        .expects('getAuthdataField')
+        .withExactArgs('field1')
+        .returns(Promise.resolve('value1'))
+        .once();
       return expandUrlAsync('?a=AUTHDATA(field1)').then(res => {
         expect(res).to.match(/a=value1/);
         expect(userErrorStub).to.have.not.been.called;
@@ -1563,13 +1737,13 @@ describes.sandboxed('UrlReplacements', {}, () => {
     });
 
     it('should report error if not available', () => {
-      accessServiceMock.expects('getAccessReaderId')
-          .never();
-      return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true)
-          .then(res => {
-            expect(res).to.match(/a=;/);
-            expect(userErrorStub).to.be.calledOnce;
-          });
+      accessServiceMock.expects('getAccessReaderId').never();
+      return expandUrlAsync('?a=ACCESS_READER_ID;', /* disabled */ true).then(
+        res => {
+          expect(res).to.match(/a=;/);
+          expect(userErrorStub).to.be.calledOnce;
+        }
+      );
     });
   });
 
@@ -1581,8 +1755,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
     beforeEach(() => {
       a = document.createElement('a');
       win = getFakeWindow();
-      win.location =
-          parseUrlDeprecated('https://example.com/base?foo=bar&bar=abc&gclid=123');
+      win.location = parseUrlDeprecated(
+        'https://example.com/base?foo=bar&bar=abc&gclid=123'
+      );
       const {documentElement} = win.document;
       urlReplacements = Services.urlReplacementsForDoc(documentElement);
     });
@@ -1611,8 +1786,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
     });
 
     it('should replace href 2', () => {
-      a.href = 'https://example.com/link?out=QUERY_PARAM(foo)&' +
-          'out2=QUERY_PARAM(bar)';
+      a.href =
+        'https://example.com/link?out=QUERY_PARAM(foo)&' +
+        'out2=QUERY_PARAM(bar)';
       a.setAttribute('data-amp-replace', 'QUERY_PARAM');
       urlReplacements.maybeExpandLink(a, null);
       expect(a.href).to.equal('https://example.com/link?out=bar&out2=abc');
@@ -1642,7 +1818,8 @@ describes.sandboxed('UrlReplacements', {}, () => {
       a.href = 'https://example.com/link?out=QUERY_PARAM(foo)';
       urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
       expect(a.href).to.equal(
-          'https://example.com/link?out=QUERY_PARAM(foo)&gclid=123');
+        'https://example.com/link?out=QUERY_PARAM(foo)&gclid=123'
+      );
     });
 
     it('should not replace unwhitelisted fields', () => {
@@ -1678,33 +1855,34 @@ describes.sandboxed('UrlReplacements', {}, () => {
       a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
       a.setAttribute('data-amp-replace', 'QUERY_PARAM');
       urlReplacements.maybeExpandLink(a, null);
-      expect(a.href).to.equal(
-          'https://example2.com/link?out=QUERY_PARAM(foo)');
+      expect(a.href).to.equal('https://example2.com/link?out=QUERY_PARAM(foo)');
     });
 
     it('should not append default param to different origin', () => {
       a.href = 'https://example2.com/link?out=QUERY_PARAM(foo)';
       a.setAttribute('data-amp-replace', 'QUERY_PARAM');
       urlReplacements.maybeExpandLink(a, 'gclid=QUERY_PARAM(gclid)');
-      expect(a.href).to.equal(
-          'https://example2.com/link?out=QUERY_PARAM(foo)');
+      expect(a.href).to.equal('https://example2.com/link?out=QUERY_PARAM(foo)');
     });
 
     it('should replace whitelisted fields', () => {
-      a.href = 'https://canonical.com/link?' +
-          'out=QUERY_PARAM(foo)' +
-          '&c=PAGE_VIEW_IDCLIENT_ID(abc)NAV_TIMING(navigationStart)';
+      a.href =
+        'https://canonical.com/link?' +
+        'out=QUERY_PARAM(foo)' +
+        '&c=PAGE_VIEW_IDCLIENT_ID(abc)NAV_TIMING(navigationStart)';
       a.setAttribute(
-          'data-amp-replace', 'QUERY_PARAM CLIENT_ID PAGE_VIEW_ID NAV_TIMING');
+        'data-amp-replace',
+        'QUERY_PARAM CLIENT_ID PAGE_VIEW_ID NAV_TIMING'
+      );
       // No replacement without previous async replacement
       urlReplacements.maybeExpandLink(a, null);
-      expect(a.href).to.equal(
-          'https://canonical.com/link?out=bar&c=1234100');
+      expect(a.href).to.equal('https://canonical.com/link?out=bar&c=1234100');
       // Get a cid, then proceed.
       return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
         urlReplacements.maybeExpandLink(a, null);
         expect(a.href).to.equal(
-            'https://canonical.com/link?out=bar&c=1234test-cid(abc)100');
+          'https://canonical.com/link?out=bar&c=1234test-cid(abc)100'
+        );
       });
     });
 
@@ -1715,38 +1893,48 @@ describes.sandboxed('UrlReplacements', {}, () => {
       expect(a.href).to.equal('https://example2.com/link?guid=123');
     });
 
-    it('should add URL parameters for http URL\'s(non-secure)', () => {
+    it("should add URL parameters for http URL's(non-secure)", () => {
       a.href = 'http://whitelisted.com/link?out=QUERY_PARAM(foo)';
       a.setAttribute('data-amp-addparams', 'guid=123');
       urlReplacements.maybeExpandLink(a, null);
-      expect(a.href).to.equal('http://whitelisted.com/link?out=QUERY_PARAM(foo)&guid=123');
-    });
-
-    it('should add URL parameters and repalce whitelisted'
-      + ' values for http whitelisted URL\'s(non-secure)', () => {
-      a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
-      a.setAttribute('data-amp-replace', 'CLIENT_ID');
-      a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
-      // Get a cid, then proceed.
-      return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
-        urlReplacements.maybeExpandLink(a, null);
-        expect(a.href).to.equal(
-            'http://example.com/link?out=QUERY_PARAM(foo)&guid=123&c=test-cid(abc)');
-      });
-    });
+      expect(a.href).to.equal(
+        'http://whitelisted.com/link?out=QUERY_PARAM(foo)&guid=123'
+      );
+    });
+
+    it(
+      'should add URL parameters and repalce whitelisted' +
+        " values for http whitelisted URL's(non-secure)",
+      () => {
+        a.href = 'http://example.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'CLIENT_ID');
+        a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
+        // Get a cid, then proceed.
+        return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
+          urlReplacements.maybeExpandLink(a, null);
+          expect(a.href).to.equal(
+            'http://example.com/link?out=QUERY_PARAM(foo)&guid=123&c=test-cid(abc)'
+          );
+        });
+      }
+    );
 
-    it('should add URL parameters and not repalce whitelisted'
-      + ' values for non whitelisted http URL\'s(non-secure)', () => {
-      a.href = 'http://example2.com/link?out=QUERY_PARAM(foo)';
-      a.setAttribute('data-amp-replace', 'CLIENT_ID');
-      a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
-      // Get a cid, then proceed.
-      return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
-        urlReplacements.maybeExpandLink(a, null);
-        expect(a.href).to.equal(
-            'http://example2.com/link?out=QUERY_PARAM(foo)&guid=123&c=CLIENT_ID(abc)');
-      });
-    });
+    it(
+      'should add URL parameters and not repalce whitelisted' +
+        " values for non whitelisted http URL's(non-secure)",
+      () => {
+        a.href = 'http://example2.com/link?out=QUERY_PARAM(foo)';
+        a.setAttribute('data-amp-replace', 'CLIENT_ID');
+        a.setAttribute('data-amp-addparams', 'guid=123&c=CLIENT_ID(abc)');
+        // Get a cid, then proceed.
+        return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
+          urlReplacements.maybeExpandLink(a, null);
+          expect(a.href).to.equal(
+            'http://example2.com/link?out=QUERY_PARAM(foo)&guid=123&c=CLIENT_ID(abc)'
+          );
+        });
+      }
+    );
 
     it('should append query parameters and repalce whitelisted values', () => {
       a.href = 'https://whitelisted.com/link?out=QUERY_PARAM(foo)';
@@ -1756,10 +1944,10 @@ describes.sandboxed('UrlReplacements', {}, () => {
       return urlReplacements.expandUrlAsync('CLIENT_ID(abc)').then(() => {
         urlReplacements.maybeExpandLink(a, null);
         expect(a.href).to.equal(
-            'https://whitelisted.com/link?out=bar&guid=123&c=test-cid(abc)');
+          'https://whitelisted.com/link?out=bar&guid=123&c=test-cid(abc)'
+        );
       });
     });
-
   });
 
   describe('Expanding String', () => {
@@ -1768,14 +1956,20 @@ describes.sandboxed('UrlReplacements', {}, () => {
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
       let expanded = urlReplacements.expandStringSync(
-          'PROTOCOL://example.com/?r=RANDOM', {
-            'PROTOCOL': 'abc',
-          });
+        'PROTOCOL://example.com/?r=RANDOM',
+        {
+          'PROTOCOL': 'abc',
+        }
+      );
       expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
       expanded = urlReplacements.expandStringSync(
-          'FUNCT://example.com/?r=RANDOM', {
-            'FUNCT': function() { return 'abc'; },
-          });
+        'FUNCT://example.com/?r=RANDOM',
+        {
+          'FUNCT': function() {
+            return 'abc';
+          },
+        }
+      );
       expect(expanded).to.match(/abc:\/\/example\.com\/\?r=(\d+(\.\d+)?)$/);
     });
 
@@ -1783,9 +1977,9 @@ describes.sandboxed('UrlReplacements', {}, () => {
       const win = getFakeWindow();
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      const expanded = urlReplacements.expandStringSync(
-          'title=TITLE',
-          {'TITLE': 'test with spaces'});
+      const expanded = urlReplacements.expandStringSync('title=TITLE', {
+        'TITLE': 'test with spaces',
+      });
       expect(expanded).to.equal('title=test with spaces');
     });
 
@@ -1793,24 +1987,26 @@ describes.sandboxed('UrlReplacements', {}, () => {
       const win = getFakeWindow();
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      return urlReplacements.expandStringAsync(
-          'RANDOM:X:Y', {
-            'RANDOM': Promise.resolve('abc'),
-          }).then(expanded => {
-        expect(expanded).to.equal('abc:X:Y');
-      });
+      return urlReplacements
+        .expandStringAsync('RANDOM:X:Y', {
+          'RANDOM': Promise.resolve('abc'),
+        })
+        .then(expanded => {
+          expect(expanded).to.equal('abc:X:Y');
+        });
     });
 
     it('should not encode values returned by expandStringAsync', () => {
       const win = getFakeWindow();
       const {documentElement} = win.document;
       const urlReplacements = Services.urlReplacementsForDoc(documentElement);
-      return urlReplacements.expandStringAsync(
-          'title=TITLE',
-          {'TITLE': Promise.resolve('test with spaces')},
-      ).then(expanded => {
-        expect(expanded).to.equal('title=test with spaces');
-      });
+      return urlReplacements
+        .expandStringAsync('title=TITLE', {
+          'TITLE': Promise.resolve('test with spaces'),
+        })
+        .then(expanded => {
+          expect(expanded).to.equal('title=test with spaces');
+        });
     });
   });
 
@@ -1824,7 +2020,8 @@ describes.sandboxed('UrlReplacements', {}, () => {
       input.setAttribute('data-amp-replace', 'RANDOM');
       allowConsoleError(() => {
         expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
-            /Input value expansion only works on hidden input fields/);
+          /Input value expansion only works on hidden input fields/
+        );
       });
       expect(input.value).to.equal('RANDOM');
     });
@@ -1838,7 +2035,8 @@ describes.sandboxed('UrlReplacements', {}, () => {
       input.setAttribute('data-amp-replace', 'RANDOM');
       allowConsoleError(() => {
         expect(() => urlReplacements.expandInputValueSync(input)).to.throw(
-            /Input value expansion only works on hidden input fields/);
+          /Input value expansion only works on hidden input fields/
+        );
       });
       expect(input.value).to.equal('RANDOM');
     });
@@ -1874,11 +2072,14 @@ describes.sandboxed('UrlReplacements', {}, () => {
       input['amp-original-value'] = 'RANDOM://example.com/RANDOM';
       expandedValue = urlReplacements.expandInputValueSync(input);
       expect(expandedValue).to.match(
-          /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/);
+        /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
+      );
       expect(input.value).to.match(
-          /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/);
+        /(\d+(\.\d+)?):\/\/example\.com\/(\d+(\.\d+)?)$/
+      );
       expect(input['amp-original-value']).to.equal(
-          'RANDOM://example.com/RANDOM');
+        'RANDOM://example.com/RANDOM'
+      );
     });
 
     it('should replace input value with var subs - sync', () => {
@@ -1889,40 +2090,57 @@ describes.sandboxed('UrlReplacements', {}, () => {
       input.value = 'RANDOM';
       input.type = 'hidden';
       input.setAttribute('data-amp-replace', 'RANDOM');
-      return urlReplacements.expandInputValueAsync(input)
-          .then(expandedValue => {
-            expect(input['amp-original-value']).to.equal('RANDOM');
-            expect(input.value).to.match(/(\d+(\.\d+)?)/);
-            expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
-          });
+      return urlReplacements
+        .expandInputValueAsync(input)
+        .then(expandedValue => {
+          expect(input['amp-original-value']).to.equal('RANDOM');
+          expect(input.value).to.match(/(\d+(\.\d+)?)/);
+          expect(expandedValue).to.match(/(\d+(\.\d+)?)/);
+        });
     });
   });
 
   describe('extractClientIdFromGaCookie', () => {
     it('should extract correct Client ID', () => {
-      expect(extractClientIdFromGaCookie('GA1.2.430749005.1489527047'))
-          .to.equal('430749005.1489527047');
-      expect(extractClientIdFromGaCookie('GA1.12.430749005.1489527047'))
-          .to.equal('430749005.1489527047');
-      expect(extractClientIdFromGaCookie('GA1.1-2.430749005.1489527047'))
-          .to.equal('430749005.1489527047');
-      expect(extractClientIdFromGaCookie('1.1.430749005.1489527047'))
-          .to.equal('430749005.1489527047');
-      expect(extractClientIdFromGaCookie(
+      expect(
+        extractClientIdFromGaCookie('GA1.2.430749005.1489527047')
+      ).to.equal('430749005.1489527047');
+      expect(
+        extractClientIdFromGaCookie('GA1.12.430749005.1489527047')
+      ).to.equal('430749005.1489527047');
+      expect(
+        extractClientIdFromGaCookie('GA1.1-2.430749005.1489527047')
+      ).to.equal('430749005.1489527047');
+      expect(extractClientIdFromGaCookie('1.1.430749005.1489527047')).to.equal(
+        '430749005.1489527047'
+      );
+      expect(
+        extractClientIdFromGaCookie(
           'GA1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'))
-          .to.equal('amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL');
-      expect(extractClientIdFromGaCookie(
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        )
+      ).to.equal(
+        'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+      );
+      expect(
+        extractClientIdFromGaCookie(
           '1.3.amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'))
-          .to.equal('amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL');
-      expect(extractClientIdFromGaCookie(
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        )
+      ).to.equal(
+        'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+      );
+      expect(
+        extractClientIdFromGaCookie(
           'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'))
-          .to.equal('amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
-          'NDrFP4BtPQJMyxE4jb9FDlp37OJL');
+            'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+        )
+      ).to.equal(
+        'amp-JTHCVn-4iMhzv5oEIZIspaXUSnEF0PwNVoxs' +
+          'NDrFP4BtPQJMyxE4jb9FDlp37OJL'
+      );
     });
   });
 });
diff --git a/test/unit/test-url-rewrite.js b/test/unit/test-url-rewrite.js
index c8ec21c80738..fe57f8aaa25e 100644
--- a/test/unit/test-url-rewrite.js
+++ b/test/unit/test-url-rewrite.js
@@ -22,85 +22,126 @@ import {
 describe('resolveUrlAttr', () => {
   it('should throw if __amp_source_origin is set', () => {
     allowConsoleError(() => {
-      expect(() => resolveUrlAttr('a', 'href',
+      expect(() =>
+        resolveUrlAttr(
+          'a',
+          'href',
           '/doc2?__amp_source_origin=https://google.com',
-          'http://acme.org/doc1')).to.throw(/Source origin is not allowed/);
+          'http://acme.org/doc1'
+        )
+      ).to.throw(/Source origin is not allowed/);
     });
   });
 
   it('should resolve non-hash href', () => {
-    expect(resolveUrlAttr('a', 'href',
+    expect(
+      resolveUrlAttr('a', 'href', '/doc2', 'http://acme.org/doc1')
+    ).to.equal('http://acme.org/doc2');
+    expect(
+      resolveUrlAttr(
+        'a',
+        'href',
         '/doc2',
-        'http://acme.org/doc1'))
-        .to.equal('http://acme.org/doc2');
-    expect(resolveUrlAttr('a', 'href',
-        '/doc2',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('http://acme.org/doc2');
-    expect(resolveUrlAttr('a', 'href',
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('http://acme.org/doc2');
+    expect(
+      resolveUrlAttr(
+        'a',
+        'href',
         'http://non-acme.org/doc2',
-        'http://acme.org/doc1'))
-        .to.equal('http://non-acme.org/doc2');
+        'http://acme.org/doc1'
+      )
+    ).to.equal('http://non-acme.org/doc2');
   });
 
   it('should ignore hash URLs', () => {
-    expect(resolveUrlAttr('a', 'href',
-        '#hash1',
-        'http://acme.org/doc1'))
-        .to.equal('#hash1');
+    expect(
+      resolveUrlAttr('a', 'href', '#hash1', 'http://acme.org/doc1')
+    ).to.equal('#hash1');
   });
 
   it('should resolve src', () => {
-    expect(resolveUrlAttr('amp-video', 'src',
-        '/video1',
-        'http://acme.org/doc1'))
-        .to.equal('http://acme.org/video1');
-    expect(resolveUrlAttr('amp-video', 'src',
+    expect(
+      resolveUrlAttr('amp-video', 'src', '/video1', 'http://acme.org/doc1')
+    ).to.equal('http://acme.org/video1');
+    expect(
+      resolveUrlAttr(
+        'amp-video',
+        'src',
         '/video1',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('http://acme.org/video1');
-    expect(resolveUrlAttr('amp-video', 'src',
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('http://acme.org/video1');
+    expect(
+      resolveUrlAttr(
+        'amp-video',
+        'src',
         'http://non-acme.org/video1',
-        'http://acme.org/doc1'))
-        .to.equal('http://non-acme.org/video1');
+        'http://acme.org/doc1'
+      )
+    ).to.equal('http://non-acme.org/video1');
   });
 
   it('should rewrite image http(s) src', () => {
-    expect(resolveUrlAttr('amp-img', 'src',
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'src',
         '/image1?a=b#h1',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('https://cdn.ampproject.org/i/acme.org/image1?a=b#h1');
-    expect(resolveUrlAttr('amp-img', 'src',
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('https://cdn.ampproject.org/i/acme.org/image1?a=b#h1');
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'src',
         'https://acme.org/image1?a=b#h1',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('https://cdn.ampproject.org/i/s/acme.org/image1?a=b#h1');
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('https://cdn.ampproject.org/i/s/acme.org/image1?a=b#h1');
   });
 
   it('should rewrite image http(s) srcset', () => {
-    expect(resolveUrlAttr('amp-img', 'srcset',
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'srcset',
         '/image2?a=b#h1 2x, /image1?a=b#h1 1x',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('https://cdn.ampproject.org/i/acme.org/image1?a=b#h1 1x, ' +
-            'https://cdn.ampproject.org/i/acme.org/image2?a=b#h1 2x');
-    expect(resolveUrlAttr('amp-img', 'srcset',
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal(
+      'https://cdn.ampproject.org/i/acme.org/image1?a=b#h1 1x, ' +
+        'https://cdn.ampproject.org/i/acme.org/image2?a=b#h1 2x'
+    );
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'srcset',
         'https://acme.org/image2?a=b#h1 2x, /image1?a=b#h1 1x',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('https://cdn.ampproject.org/i/acme.org/image1?a=b#h1 1x, ' +
-            'https://cdn.ampproject.org/i/s/acme.org/image2?a=b#h1 2x');
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal(
+      'https://cdn.ampproject.org/i/acme.org/image1?a=b#h1 1x, ' +
+        'https://cdn.ampproject.org/i/s/acme.org/image2?a=b#h1 2x'
+    );
   });
 
   it('should NOT rewrite image http(s) src when not on proxy', () => {
-    expect(resolveUrlAttr('amp-img', 'src',
-        '/image1',
-        'http://acme.org/doc1'))
-        .to.equal('http://acme.org/image1');
+    expect(
+      resolveUrlAttr('amp-img', 'src', '/image1', 'http://acme.org/doc1')
+    ).to.equal('http://acme.org/image1');
   });
 
   it('should NOT rewrite image data src', () => {
-    expect(resolveUrlAttr('amp-img', 'src',
+    expect(
+      resolveUrlAttr(
+        'amp-img',
+        'src',
         'data:12345',
-        'https://cdn.ampproject.org/c/acme.org/doc1'))
-        .to.equal('data:12345');
+        'https://cdn.ampproject.org/c/acme.org/doc1'
+      )
+    ).to.equal('data:12345');
   });
 });
 
@@ -110,8 +151,7 @@ describe('rewriteAttributesForElement', () => {
     const element = document.createElement('a');
     element.setAttribute('href', '#hash');
 
-    rewriteAttributesForElement(element, 'href', 'https://not.hash/',
-        location);
+    rewriteAttributesForElement(element, 'href', 'https://not.hash/', location);
 
     expect(element.getAttribute('href')).to.equal('https://not.hash/');
     expect(element.hasAttribute('target')).to.equal(false);
@@ -127,7 +167,11 @@ describe('rewriteAttributesForElement', () => {
       element.setAttribute('href', '#hash');
 
       rewriteAttributesForElement(
-          element, 'href', 'https://not.hash/', location);
+        element,
+        'href',
+        'https://not.hash/',
+        location
+      );
 
       expect(element.getAttribute('href')).to.equal('https://not.hash/');
       expect(element.getAttribute('target')).to.equal('_top');
diff --git a/test/unit/test-url.js b/test/unit/test-url.js
index daf0ab414c69..089196fc6ad6 100644
--- a/test/unit/test-url.js
+++ b/test/unit/test-url.js
@@ -41,57 +41,62 @@ import {
 } from '../../src/url';
 
 describe('getWinOrigin', () => {
-
   it('should return origin if available', () => {
-    expect(getWinOrigin({
-      'origin': 'https://foo.com',
-      'location': {
-        'href': 'https://foo1.com/abc?123#foo',
-      },
-    })).to.equal('https://foo.com');
+    expect(
+      getWinOrigin({
+        'origin': 'https://foo.com',
+        'location': {
+          'href': 'https://foo1.com/abc?123#foo',
+        },
+      })
+    ).to.equal('https://foo.com');
   });
 
-
   it('should return origin from href when win.origin is not available', () => {
-    expect(getWinOrigin({
-      'location': {
-        'href': 'https://foo1.com/abc?123#foo',
-      },
-    })).to.equal('https://foo1.com');
+    expect(
+      getWinOrigin({
+        'location': {
+          'href': 'https://foo1.com/abc?123#foo',
+        },
+      })
+    ).to.equal('https://foo1.com');
   });
 
-
   it('should return origin from href when win.origin is empty', () => {
-    expect(getWinOrigin({
-      'origin': '',
-      'location': {
-        'href': 'https://foo1.com/abc?123#foo',
-      },
-    })).to.equal('https://foo1.com');
+    expect(
+      getWinOrigin({
+        'origin': '',
+        'location': {
+          'href': 'https://foo1.com/abc?123#foo',
+        },
+      })
+    ).to.equal('https://foo1.com');
   });
 
   it('should return origin from href when win.origin is null', () => {
-    expect(getWinOrigin({
-      'origin': null,
-      'location': {
-        'href': 'https://foo1.com/abc?123#foo',
-      },
-    })).to.equal('https://foo1.com');
-  });
-
-  it('should return \"null\" when win.origin is \"null\"', () => {
-    expect(getWinOrigin({
-      'origin': 'null',
-      'location': {
-        'href': 'https://foo1.com/abc?123#foo',
-      },
-    })).to.equal('null');
+    expect(
+      getWinOrigin({
+        'origin': null,
+        'location': {
+          'href': 'https://foo1.com/abc?123#foo',
+        },
+      })
+    ).to.equal('https://foo1.com');
   });
-});
 
+  it('should return "null" when win.origin is "null"', () => {
+    expect(
+      getWinOrigin({
+        'origin': 'null',
+        'location': {
+          'href': 'https://foo1.com/abc?123#foo',
+        },
+      })
+    ).to.equal('null');
+  });
+});
 
 describe('parseUrlDeprecated', () => {
-
   const currentPort = location.port;
 
   function compareParse(url, result) {
@@ -236,17 +241,16 @@ describe('parseUrlDeprecated', () => {
     });
   });
   it('should parse origin https://twitter.com/path#abc', () => {
-    expect(parseUrlDeprecated('https://twitter.com/path#abc').origin)
-        .to.equal('https://twitter.com');
+    expect(parseUrlDeprecated('https://twitter.com/path#abc').origin).to.equal(
+      'https://twitter.com'
+    );
   });
 
   it('should parse origin data:12345', () => {
-    expect(parseUrlDeprecated('data:12345').origin)
-        .to.equal('data:12345');
+    expect(parseUrlDeprecated('data:12345').origin).to.equal('data:12345');
   });
 });
 
-
 describe('parseQueryString', () => {
   it('should return empty params when query string is empty or null', () => {
     expect(parseQueryString(null)).to.deep.equal({});
@@ -299,14 +303,15 @@ describe('parseQueryString', () => {
   });
 });
 
-
 describe('serializeQueryString', () => {
   it('should return empty string for empty params', () => {
     expect(serializeQueryString({})).to.equal('');
-    expect(serializeQueryString({
-      nullValue: null,
-      undefValue: undefined,
-    })).to.equal('');
+    expect(
+      serializeQueryString({
+        nullValue: null,
+        undefValue: undefined,
+      })
+    ).to.equal('');
   });
   it('should serialize a single value', () => {
     expect(serializeQueryString({a: 'A'})).to.equal('a=A');
@@ -321,12 +326,12 @@ describe('serializeQueryString', () => {
     expect(serializeQueryString({'a+b': 'A+B'})).to.equal('a%2Bb=A%2BB');
   });
   it('should serialize multiple valued parameters', () => {
-    expect(serializeQueryString({a: [1,2,3], b: true})).to.equal(
-        'a=1&a=2&a=3&b=true');
+    expect(serializeQueryString({a: [1, 2, 3], b: true})).to.equal(
+      'a=1&a=2&a=3&b=true'
+    );
   });
 });
 
-
 describe('assertHttpsUrl/isSecureUrl', () => {
   const referenceElement = document.createElement('div');
   it('should NOT allow null or undefined, but allow empty string', () => {
@@ -347,8 +352,9 @@ describe('assertHttpsUrl/isSecureUrl', () => {
   it('should allow protocol relative', () => {
     assertHttpsUrl('//twitter.com', referenceElement);
     // `isSecureUrl` always resolves relative URLs.
-    expect(isSecureUrlDeprecated('//twitter.com'))
-        .to.be.equal(window.location.protocol == 'https:');
+    expect(isSecureUrlDeprecated('//twitter.com')).to.be.equal(
+      window.location.protocol == 'https:'
+    );
   });
   it('should allow localhost with http', () => {
     assertHttpsUrl('http://localhost:8000/sfasd', referenceElement);
@@ -356,107 +362,136 @@ describe('assertHttpsUrl/isSecureUrl', () => {
   });
   it('should allow localhost with http suffix', () => {
     assertHttpsUrl('http://iframe.localhost:8000/sfasd', referenceElement);
-    expect(isSecureUrlDeprecated('http://iframe.localhost:8000/sfasd')).to.be.true;
+    expect(isSecureUrlDeprecated('http://iframe.localhost:8000/sfasd')).to.be
+      .true;
   });
 
   it('should fail on http', () => {
-    allowConsoleError(() => { expect(() => {
-      assertHttpsUrl('http://twitter.com', referenceElement);
-    }).to.throw(/source must start with/); });
+    allowConsoleError(() => {
+      expect(() => {
+        assertHttpsUrl('http://twitter.com', referenceElement);
+      }).to.throw(/source must start with/);
+    });
     expect(isSecureUrlDeprecated('http://twitter.com')).to.be.false;
   });
   it('should fail on http with localhost in the name', () => {
-    allowConsoleError(() => { expect(() => {
-      assertHttpsUrl('http://foolocalhost', referenceElement);
-    }).to.throw(/source must start with/); });
+    allowConsoleError(() => {
+      expect(() => {
+        assertHttpsUrl('http://foolocalhost', referenceElement);
+      }).to.throw(/source must start with/);
+    });
     expect(isSecureUrlDeprecated('http://foolocalhost')).to.be.false;
   });
 });
 
 describe('assertAbsoluteHttpOrHttpsUrl', () => {
   it('should allow http', () => {
-    expect(assertAbsoluteHttpOrHttpsUrl('http://twitter.com/'))
-        .to.equal('http://twitter.com/');
-    expect(assertAbsoluteHttpOrHttpsUrl('HTTP://twitter.com/'))
-        .to.equal('http://twitter.com/');
+    expect(assertAbsoluteHttpOrHttpsUrl('http://twitter.com/')).to.equal(
+      'http://twitter.com/'
+    );
+    expect(assertAbsoluteHttpOrHttpsUrl('HTTP://twitter.com/')).to.equal(
+      'http://twitter.com/'
+    );
   });
   it('should allow https', () => {
-    expect(assertAbsoluteHttpOrHttpsUrl('https://twitter.com/'))
-        .to.equal('https://twitter.com/');
-    expect(assertAbsoluteHttpOrHttpsUrl('HTTPS://twitter.com/'))
-        .to.equal('https://twitter.com/');
+    expect(assertAbsoluteHttpOrHttpsUrl('https://twitter.com/')).to.equal(
+      'https://twitter.com/'
+    );
+    expect(assertAbsoluteHttpOrHttpsUrl('HTTPS://twitter.com/')).to.equal(
+      'https://twitter.com/'
+    );
   });
   it('should fail on relative protocol', () => {
-    allowConsoleError(() => { expect(() => {
-      assertAbsoluteHttpOrHttpsUrl('//twitter.com/');
-    }).to.throw(/URL must start with/); });
+    allowConsoleError(() => {
+      expect(() => {
+        assertAbsoluteHttpOrHttpsUrl('//twitter.com/');
+      }).to.throw(/URL must start with/);
+    });
   });
   it('should fail on relative url', () => {
-    allowConsoleError(() => { expect(() => {
-      assertAbsoluteHttpOrHttpsUrl('/path');
-    }).to.throw(/URL must start with/); });
+    allowConsoleError(() => {
+      expect(() => {
+        assertAbsoluteHttpOrHttpsUrl('/path');
+      }).to.throw(/URL must start with/);
+    });
   });
   it('should fail on not allowed protocol', () => {
-    allowConsoleError(() => { expect(() => {
-      assertAbsoluteHttpOrHttpsUrl(
-          /*eslint no-script-url: 0*/ 'javascript:alert');
-    }).to.throw(/URL must start with/); });
+    allowConsoleError(() => {
+      expect(() => {
+        assertAbsoluteHttpOrHttpsUrl(
+          /*eslint no-script-url: 0*/ 'javascript:alert'
+        );
+      }).to.throw(/URL must start with/);
+    });
   });
 });
 
 describe('removeFragment', () => {
   it('should remove fragment', () => {
     expect(removeFragment('https://twitter.com/path#abc')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should remove empty fragment', () => {
     expect(removeFragment('https://twitter.com/path#')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should ignore when no fragment', () => {
     expect(removeFragment('https://twitter.com/path')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
 });
 
 describe('removeSearch', () => {
   it('should remove search', () => {
     expect(removeSearch('https://twitter.com/path?abc')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should remove search with value', () => {
     expect(removeSearch('https://twitter.com/path?abc=123')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should remove multiple params', () => {
     expect(removeSearch('https://twitter.com/path?abc=123&d&e=4')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should remove empty search', () => {
     expect(removeSearch('https://twitter.com/path?')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should ignore when no search', () => {
     expect(removeSearch('https://twitter.com/path')).to.equal(
-        'https://twitter.com/path');
+      'https://twitter.com/path'
+    );
   });
   it('should preserve fragment', () => {
     expect(removeSearch('https://twitter.com/path?abc#f')).to.equal(
-        'https://twitter.com/path#f');
+      'https://twitter.com/path#f'
+    );
   });
   it('should preserve fragment with multiple params', () => {
     expect(removeSearch('https://twitter.com/path?a&d=1&e=5#f=x')).to.equal(
-        'https://twitter.com/path#f=x');
+      'https://twitter.com/path#f=x'
+    );
   });
   it('should preserve fragment when no search', () => {
     expect(removeSearch('https://twitter.com/path#f')).to.equal(
-        'https://twitter.com/path#f');
+      'https://twitter.com/path#f'
+    );
   });
   it('should handle empty fragment', () => {
     expect(removeSearch('https://twitter.com/path#')).to.equal(
-        'https://twitter.com/path#');
+      'https://twitter.com/path#'
+    );
     expect(removeSearch('https://twitter.com/path?#')).to.equal(
-        'https://twitter.com/path#');
+      'https://twitter.com/path#'
+    );
   });
 });
 
@@ -469,34 +504,54 @@ describe('addParamToUrl', () => {
 
   it('should preserve hash value', () => {
     url = addParamToUrl(url, 'elementId', 'n1');
-    expect(url).to.equal('https://www.ampproject.org/get/here?elementId=n1#hash-value');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?elementId=n1#hash-value'
+    );
 
     url = addParamToUrl(url, 'ampUserId', '12345');
-    expect(url).to.equal('https://www.ampproject.org/get/here?elementId=n1&ampUserId=12345#hash-value');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?elementId=n1&ampUserId=12345#hash-value'
+    );
   });
 
   it('should preserve query values', () => {
     url = 'https://www.ampproject.org/get/here?hello=world&foo=bar';
 
     url = addParamToUrl(url, 'elementId', 'n1');
-    expect(url).to.equal('https://www.ampproject.org/get/here?hello=world&foo=bar&elementId=n1');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?hello=world&foo=bar&elementId=n1'
+    );
     url = addParamToUrl(url, 'ampUserId', '12345');
-    expect(url).to.equal('https://www.ampproject.org/get/here?hello=world&foo=bar&elementId=n1&ampUserId=12345');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?hello=world&foo=bar&elementId=n1&ampUserId=12345'
+    );
   });
 
   it('should optionally add params to the front', () => {
-    let url = addParamToUrl('https://www.ampproject.org/get/here?hello=world&foo=bar',
-        'elementId', 'n1', /* addToFront */ true);
-    expect(url).to.equal('https://www.ampproject.org/get/here?elementId=n1&hello=world&foo=bar');
-
-    url = addParamToUrl('https://www.ampproject.org/get/here',
-        'elementId', 'n1', /* addToFront */ true);
+    let url = addParamToUrl(
+      'https://www.ampproject.org/get/here?hello=world&foo=bar',
+      'elementId',
+      'n1',
+      /* addToFront */ true
+    );
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?elementId=n1&hello=world&foo=bar'
+    );
+
+    url = addParamToUrl(
+      'https://www.ampproject.org/get/here',
+      'elementId',
+      'n1',
+      /* addToFront */ true
+    );
     expect(url).to.equal('https://www.ampproject.org/get/here?elementId=n1');
   });
 
   it('should encode uri values', () => {
     url = addParamToUrl(url, 'foo', 'b ar');
-    expect(url).to.equal('https://www.ampproject.org/get/here?foo=b%20ar#hash-value');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?foo=b%20ar#hash-value'
+    );
   });
 
   it('should keep host and path intact', () => {
@@ -519,20 +574,28 @@ describe('addParamsToUrl', () => {
   it('should loop over the keys and values correctly', () => {
     url = addParamsToUrl(url, params);
 
-    expect(url).to.equal('https://www.ampproject.org/get/here?hello=world&foo=bar#hash-value');
+    expect(url).to.equal(
+      'https://www.ampproject.org/get/here?hello=world&foo=bar#hash-value'
+    );
 
-    expect(addParamsToUrl('http://example.com', {
-      firstname: 'Cool',
-      lastname: 'Beans',
-      interests: ['Basketball', 'Food', 'Running'],
-    })).to.equal('http://example.com?firstname=Cool&lastname=Beans&' +
-        'interests=Basketball&interests=Food&interests=Running');
+    expect(
+      addParamsToUrl('http://example.com', {
+        firstname: 'Cool',
+        lastname: 'Beans',
+        interests: ['Basketball', 'Food', 'Running'],
+      })
+    ).to.equal(
+      'http://example.com?firstname=Cool&lastname=Beans&' +
+        'interests=Basketball&interests=Food&interests=Running'
+    );
   });
 
   it('should keep host and path intact', () => {
     url = addParamsToUrl('https://${host}/${path}#hash-value', params);
 
-    expect(url).to.equal('https://${host}/${path}?hello=world&foo=bar#hash-value');
+    expect(url).to.equal(
+      'https://${host}/${path}?hello=world&foo=bar#hash-value'
+    );
   });
 });
 
@@ -550,87 +613,94 @@ describe('addMissingParamsToUrl', () => {
 
   it('should not replace existing params', () => {
     expect(addMissingParamsToUrl(url, params)).to.equal(
-        'https://www.ampproject.org/get/here?replace=1&safe&hello=world&foo=bar#hash-value');
+      'https://www.ampproject.org/get/here?replace=1&safe&hello=world&foo=bar#hash-value'
+    );
   });
 });
 
 describe('isProxyOrigin', () => {
-
   function testProxyOrigin(href, bool) {
-    it('should return that ' + href + (bool ? ' is' : ' is not') +
-        ' a proxy origin', () => {
-      expect(isProxyOrigin(parseUrlDeprecated(href))).to.equal(bool);
-    });
+    it(
+      'should return that ' +
+        href +
+        (bool ? ' is' : ' is not') +
+        ' a proxy origin',
+      () => {
+        expect(isProxyOrigin(parseUrlDeprecated(href))).to.equal(bool);
+      }
+    );
   }
 
   // CDN
-  testProxyOrigin(
-      'https://cdn.ampproject.org/', true);
-  testProxyOrigin(
-      'http://cdn.ampproject.org/', false);
-  testProxyOrigin(
-      'https://cdn.ampproject.org.badguys.com/', false);
-  testProxyOrigin(
-      'https://cdn.ampproject.orgbadguys.com/', false);
-  testProxyOrigin(
-      'https://cdn.ampproject.org:1234', false);
-  testProxyOrigin(
-      'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0', true);
-  testProxyOrigin(
-      'https://cdn.ampproject.org/c/www.origin.com/foo/?f=0', true);
+  testProxyOrigin('https://cdn.ampproject.org/', true);
+  testProxyOrigin('http://cdn.ampproject.org/', false);
+  testProxyOrigin('https://cdn.ampproject.org.badguys.com/', false);
+  testProxyOrigin('https://cdn.ampproject.orgbadguys.com/', false);
+  testProxyOrigin('https://cdn.ampproject.org:1234', false);
+  testProxyOrigin('https://cdn.ampproject.org/v/www.origin.com/foo/?f=0', true);
+  testProxyOrigin('https://cdn.ampproject.org/c/www.origin.com/foo/?f=0', true);
 
   // Prefixed CDN
+  testProxyOrigin('https://xyz.cdn.ampproject.org/', true);
+  testProxyOrigin('http://xyz.cdn.ampproject.org/', false);
+  testProxyOrigin('https://xyz-123.cdn.ampproject.org/', true);
   testProxyOrigin(
-      'https://xyz.cdn.ampproject.org/', true);
-  testProxyOrigin(
-      'http://xyz.cdn.ampproject.org/', false);
-  testProxyOrigin(
-      'https://xyz-123.cdn.ampproject.org/', true);
+    'https://xyz.cdn.ampproject.org/v/www.origin.com/foo/?f=0',
+    true
+  );
   testProxyOrigin(
-      'https://xyz.cdn.ampproject.org/v/www.origin.com/foo/?f=0', true);
-  testProxyOrigin(
-      'https://xyz.cdn.ampproject.org/c/www.origin.com/foo/?f=0', true);
+    'https://xyz.cdn.ampproject.org/c/www.origin.com/foo/?f=0',
+    true
+  );
 
   // Others
+  testProxyOrigin('http://localhost:123', false);
   testProxyOrigin(
-      'http://localhost:123', false);
-  testProxyOrigin(
-      'https://cdn.ampproject.net/v/www.origin.com/foo/?f=0', false);
+    'https://cdn.ampproject.net/v/www.origin.com/foo/?f=0',
+    false
+  );
   testProxyOrigin(
-      'https://medium.com/swlh/nobody-wants-your-app-6af1f7f69cb7', false);
+    'https://medium.com/swlh/nobody-wants-your-app-6af1f7f69cb7',
+    false
+  );
   testProxyOrigin(
-      'http://www.spiegel.de/politik/deutschland/angela-merkel-a-1062761.html',
-      false);
+    'http://www.spiegel.de/politik/deutschland/angela-merkel-a-1062761.html',
+    false
+  );
 });
 
 describe('isLocalhostOrigin', () => {
   function testLocalhostOrigin(href, bool) {
-    it('should return that ' + href + (bool ? ' is' : ' is not') +
-      ' a localhost origin', () => {
-      expect(isLocalhostOrigin(parseUrlDeprecated(href))).to.equal(bool);
-    });
+    it(
+      'should return that ' +
+        href +
+        (bool ? ' is' : ' is not') +
+        ' a localhost origin',
+      () => {
+        expect(isLocalhostOrigin(parseUrlDeprecated(href))).to.equal(bool);
+      }
+    );
   }
 
-  testLocalhostOrigin(
-      'http://localhost', true);
-  testLocalhostOrigin(
-      'https://localhost', true);
-  testLocalhostOrigin(
-      'http://localhost:123/foo.html', true);
-  testLocalhostOrigin(
-      'https://localhost:123/foo.html', true);
-  testLocalhostOrigin(
-      'http://localhost.example.com/foo.html', false);
-  testLocalhostOrigin(
-      'http://www.example.com/foo.html', false);
+  testLocalhostOrigin('http://localhost', true);
+  testLocalhostOrigin('https://localhost', true);
+  testLocalhostOrigin('http://localhost:123/foo.html', true);
+  testLocalhostOrigin('https://localhost:123/foo.html', true);
+  testLocalhostOrigin('http://localhost.example.com/foo.html', false);
+  testLocalhostOrigin('http://www.example.com/foo.html', false);
 });
 
 describe('isProtocolValid', () => {
   function testProtocolValid(href, bool) {
-    it('should return that ' + href + (bool ? ' is' : ' is not') +
-      ' a valid protocol', () => {
-      expect(isProtocolValid(href)).to.equal(bool);
-    });
+    it(
+      'should return that ' +
+        href +
+        (bool ? ' is' : ' is not') +
+        ' a valid protocol',
+      () => {
+        expect(isProtocolValid(href)).to.equal(bool);
+      }
+    );
   }
 
   testProtocolValid('http://foo.com', true);
@@ -649,169 +719,216 @@ describe('isProtocolValid', () => {
 });
 
 describe('getSourceOrigin/Url', () => {
-
   function testOrigin(href, sourceHref) {
     it('should return the source origin/url from ' + href, () => {
       expect(getSourceUrl(href)).to.equal(sourceHref);
       expect(getSourceOrigin(href)).to.equal(
-          parseUrlDeprecated(sourceHref).origin);
+        parseUrlDeprecated(sourceHref).origin
+      );
     });
   }
 
   // CDN.
   testOrigin(
-      'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0#h',
-      'http://www.origin.com/foo/?f=0#h');
+    'https://cdn.ampproject.org/v/www.origin.com/foo/?f=0#h',
+    'http://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/v/s/www.origin.com/foo/?f=0#h',
-      'https://www.origin.com/foo/?f=0#h');
+    'https://cdn.ampproject.org/v/s/www.origin.com/foo/?f=0#h',
+    'https://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/www.origin.com/foo/?f=0',
-      'http://www.origin.com/foo/?f=0');
+    'https://cdn.ampproject.org/c/www.origin.com/foo/?f=0',
+    'http://www.origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/s/www.origin.com/foo/?f=0',
-      'https://www.origin.com/foo/?f=0');
+    'https://cdn.ampproject.org/c/s/www.origin.com/foo/?f=0',
+    'https://www.origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/s/origin.com/foo/?f=0',
-      'https://origin.com/foo/?f=0');
+    'https://cdn.ampproject.org/c/s/origin.com/foo/?f=0',
+    'https://origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/s/origin.com%3A81/foo/?f=0',
-      'https://origin.com:81/foo/?f=0');
+    'https://cdn.ampproject.org/c/s/origin.com%3A81/foo/?f=0',
+    'https://origin.com:81/foo/?f=0'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/a/www.origin.com/foo/?f=0#h',
-      'http://www.origin.com/foo/?f=0#h');
+    'https://cdn.ampproject.org/a/www.origin.com/foo/?f=0#h',
+    'http://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/ad/www.origin.com/foo/?f=0#h',
-      'http://www.origin.com/foo/?f=0#h');
+    'https://cdn.ampproject.org/ad/www.origin.com/foo/?f=0#h',
+    'http://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/action/www.origin.com/foo/?f=0#h',
-      'http://www.origin.com/foo/?f=0#h');
+    'https://cdn.ampproject.org/action/www.origin.com/foo/?f=0#h',
+    'http://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/action/s/www.origin.com/foo/?f=0#h',
-      'https://www.origin.com/foo/?f=0#h');
-
+    'https://cdn.ampproject.org/action/s/www.origin.com/foo/?f=0#h',
+    'https://www.origin.com/foo/?f=0#h'
+  );
 
   // Prefixed CDN
   testOrigin(
-      'https://xyz.cdn.ampproject.org/v/www.origin.com/foo/?f=0#h',
-      'http://www.origin.com/foo/?f=0#h');
+    'https://xyz.cdn.ampproject.org/v/www.origin.com/foo/?f=0#h',
+    'http://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://xyz.cdn.ampproject.org/v/s/www.origin.com/foo/?f=0#h',
-      'https://www.origin.com/foo/?f=0#h');
+    'https://xyz.cdn.ampproject.org/v/s/www.origin.com/foo/?f=0#h',
+    'https://www.origin.com/foo/?f=0#h'
+  );
   testOrigin(
-      'https://xyz.cdn.ampproject.org/c/www.origin.com/foo/?f=0',
-      'http://www.origin.com/foo/?f=0');
+    'https://xyz.cdn.ampproject.org/c/www.origin.com/foo/?f=0',
+    'http://www.origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://xyz.cdn.ampproject.org/c/s/www.origin.com/foo/?f=0',
-      'https://www.origin.com/foo/?f=0');
+    'https://xyz.cdn.ampproject.org/c/s/www.origin.com/foo/?f=0',
+    'https://www.origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://xyz.cdn.ampproject.org/c/s/origin.com/foo/?f=0',
-      'https://origin.com/foo/?f=0');
+    'https://xyz.cdn.ampproject.org/c/s/origin.com/foo/?f=0',
+    'https://origin.com/foo/?f=0'
+  );
   testOrigin(
-      'https://xyz.cdn.ampproject.org/c/s/origin.com%3A81/foo/?f=0',
-      'https://origin.com:81/foo/?f=0');
+    'https://xyz.cdn.ampproject.org/c/s/origin.com%3A81/foo/?f=0',
+    'https://origin.com:81/foo/?f=0'
+  );
 
   // Removes amp-related paramters.
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5',
-      'http://o.com/foo/');
+    'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5',
+    'http://o.com/foo/'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f=0&amp_js_v=5#something',
-      'http://o.com/foo/?f=0#something');
+    'https://cdn.ampproject.org/c/o.com/foo/?f=0&amp_js_v=5#something',
+    'http://o.com/foo/?f=0#something'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?amp_js_v=5&f=0#bar',
-      'http://o.com/foo/?f=0#bar');
+    'https://cdn.ampproject.org/c/o.com/foo/?amp_js_v=5&f=0#bar',
+    'http://o.com/foo/?f=0#bar'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f=0&amp_js_param=5&d=5#baz',
-      'http://o.com/foo/?f=0&d=5#baz');
+    'https://cdn.ampproject.org/c/o.com/foo/?f=0&amp_js_param=5&d=5#baz',
+    'http://o.com/foo/?f=0&d=5#baz'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f_amp_js_param=5&d=5',
-      'http://o.com/foo/?f_amp_js_param=5&d=5');
+    'https://cdn.ampproject.org/c/o.com/foo/?f_amp_js_param=5&d=5',
+    'http://o.com/foo/?f_amp_js_param=5&d=5'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5?d=5',
-      'http://o.com/foo/'); // Treats amp_js_param=5?d=5 as one param.
+    'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5?d=5',
+    'http://o.com/foo/'
+  ); // Treats amp_js_param=5?d=5 as one param.
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/&amp_js_param=5&d=5',
-      'http://o.com/foo/&amp_js_param=5&d=5'); // Treats &... as part of path.
+    'https://cdn.ampproject.org/c/o.com/foo/&amp_js_param=5&d=5',
+    'http://o.com/foo/&amp_js_param=5&d=5'
+  ); // Treats &... as part of path.
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?amp_r=test%3Dhello%20world',
-      'http://o.com/foo/');
+    'https://cdn.ampproject.org/c/o.com/foo/?amp_r=test%3Dhello%20world',
+    'http://o.com/foo/'
+  );
 
   // Removes google experimental queryString parameters.
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE',
-      'http://o.com/foo/');
+    'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE',
+    'http://o.com/foo/'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&amp_js_param=5',
-      'http://o.com/foo/');
+    'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&amp_js_param=5',
+    'http://o.com/foo/'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5&usqp=mq331AQCCAE',
-      'http://o.com/foo/');
+    'https://cdn.ampproject.org/c/o.com/foo/?amp_js_param=5&usqp=mq331AQCCAE',
+    'http://o.com/foo/'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&bar=1&amp_js_param=5',
-      'http://o.com/foo/?bar=1');
+    'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&bar=1&amp_js_param=5',
+    'http://o.com/foo/?bar=1'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f=0&usqp=mq331AQCCAE#something',
-      'http://o.com/foo/?f=0#something');
+    'https://cdn.ampproject.org/c/o.com/foo/?f=0&usqp=mq331AQCCAE#something',
+    'http://o.com/foo/?f=0#something'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&f=0#bar',
-      'http://o.com/foo/?f=0#bar');
+    'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE&f=0#bar',
+    'http://o.com/foo/?f=0#bar'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f=0&usqp=mq331AQCCAE&d=5#baz',
-      'http://o.com/foo/?f=0&d=5#baz');
+    'https://cdn.ampproject.org/c/o.com/foo/?f=0&usqp=mq331AQCCAE&d=5#baz',
+    'http://o.com/foo/?f=0&d=5#baz'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?f_usqp=mq331AQCCAE&d=5',
-      'http://o.com/foo/?f_usqp=mq331AQCCAE&d=5');
+    'https://cdn.ampproject.org/c/o.com/foo/?f_usqp=mq331AQCCAE&d=5',
+    'http://o.com/foo/?f_usqp=mq331AQCCAE&d=5'
+  );
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE?d=5',
-      'http://o.com/foo/'); // Treats amp_js_param=5?d=5 as one param.
+    'https://cdn.ampproject.org/c/o.com/foo/?usqp=mq331AQCCAE?d=5',
+    'http://o.com/foo/'
+  ); // Treats amp_js_param=5?d=5 as one param.
   testOrigin(
-      'https://cdn.ampproject.org/c/o.com/foo/&usqp=mq331AQCCAE&d=5',
-      'http://o.com/foo/&usqp=mq331AQCCAE&d=5'); // Treats &... as part of path.
+    'https://cdn.ampproject.org/c/o.com/foo/&usqp=mq331AQCCAE&d=5',
+    'http://o.com/foo/&usqp=mq331AQCCAE&d=5'
+  ); // Treats &... as part of path.
 
   // Non-CDN.
-  testOrigin(
-      'https://origin.com/foo/?f=0',
-      'https://origin.com/foo/?f=0');
+  testOrigin('https://origin.com/foo/?f=0', 'https://origin.com/foo/?f=0');
 
   it('should fail on invalid source origin', () => {
-    allowConsoleError(() => { expect(() => {
-      getSourceOrigin(parseUrlDeprecated('https://cdn.ampproject.org/v/yyy/'));
-    }).to.throw(/Expected a \. in origin http:\/\/yyy/); });
+    allowConsoleError(() => {
+      expect(() => {
+        getSourceOrigin(
+          parseUrlDeprecated('https://cdn.ampproject.org/v/yyy/')
+        );
+      }).to.throw(/Expected a \. in origin http:\/\/yyy/);
+    });
   });
 });
 
 describe('resolveRelativeUrl', () => {
-
   function testRelUrl(href, baseHref, resolvedHref) {
-    it('should return the resolved rel url from ' + href +
-          ' with base ' + baseHref, () => {
-      expect(resolveRelativeUrl(href, baseHref))
-          .to.equal(resolvedHref, 'native or fallback');
-      expect(resolveRelativeUrlFallback_(href, baseHref))
-          .to.equal(resolvedHref, 'fallback');
-    });
+    it(
+      'should return the resolved rel url from ' +
+        href +
+        ' with base ' +
+        baseHref,
+      () => {
+        expect(resolveRelativeUrl(href, baseHref)).to.equal(
+          resolvedHref,
+          'native or fallback'
+        );
+        expect(resolveRelativeUrlFallback_(href, baseHref)).to.equal(
+          resolvedHref,
+          'fallback'
+        );
+      }
+    );
   }
 
   // Absolute URL.
   testRelUrl(
-      'https://acme.org/path/file?f=0#h',
-      'https://base.org/bpath/bfile?bf=0#bh',
-      'https://acme.org/path/file?f=0#h');
+    'https://acme.org/path/file?f=0#h',
+    'https://base.org/bpath/bfile?bf=0#bh',
+    'https://acme.org/path/file?f=0#h'
+  );
   testRelUrl(
-      'data:12345',
-      'https://base.org/bpath/bfile?bf=0#bh',
-      'data:12345');
+    'data:12345',
+    'https://base.org/bpath/bfile?bf=0#bh',
+    'data:12345'
+  );
 
   // Protocol-relative URL.
   testRelUrl(
-      '//acme.org/path/file?f=0#h',
-      'https://base.org/bpath/bfile?bf=0#bh',
-      'https://acme.org/path/file?f=0#h');
+    '//acme.org/path/file?f=0#h',
+    'https://base.org/bpath/bfile?bf=0#bh',
+    'https://acme.org/path/file?f=0#h'
+  );
   testRelUrl(
-      '//acme.org/path/file?f=0#h',
-      'http://base.org/bpath/bfile?bf=0#bh',
-      'http://acme.org/path/file?f=0#h');
+    '//acme.org/path/file?f=0#h',
+    'http://base.org/bpath/bfile?bf=0#bh',
+    'http://acme.org/path/file?f=0#h'
+  );
 
   // TODO(camelburrito, #11827): This resolves to file:// on Sauce Labs.
   // testRelUrl(
@@ -821,93 +938,122 @@ describe('resolveRelativeUrl', () => {
 
   // Absolute path.
   testRelUrl(
-      '/path/file?f=0#h',
-      'https://base.org/bpath/bfile?bf=0#bh',
-      'https://base.org/path/file?f=0#h');
+    '/path/file?f=0#h',
+    'https://base.org/bpath/bfile?bf=0#bh',
+    'https://base.org/path/file?f=0#h'
+  );
   testRelUrl(
-      '/path/file?f=0#h',
-      'http://base.org/bpath/bfile?bf=0#bh',
-      'http://base.org/path/file?f=0#h');
+    '/path/file?f=0#h',
+    'http://base.org/bpath/bfile?bf=0#bh',
+    'http://base.org/path/file?f=0#h'
+  );
   testRelUrl(
-      '\\path/file?f=0#h',
-      'http://base.org/bpath/bfile?bf=0#bh',
-      'http://base.org/path/file?f=0#h');
+    '\\path/file?f=0#h',
+    'http://base.org/bpath/bfile?bf=0#bh',
+    'http://base.org/path/file?f=0#h'
+  );
 
   // Relative path.
   testRelUrl(
-      'file?f=0#h',
-      'https://base.org/bpath/bfile?bf=0#bh',
-      'https://base.org/bpath/file?f=0#h');
+    'file?f=0#h',
+    'https://base.org/bpath/bfile?bf=0#bh',
+    'https://base.org/bpath/file?f=0#h'
+  );
   testRelUrl(
-      'file?f=0#h',
-      'http://base.org/bpath/bfile?bf=0#bh',
-      'http://base.org/bpath/file?f=0#h');
+    'file?f=0#h',
+    'http://base.org/bpath/bfile?bf=0#bh',
+    'http://base.org/bpath/file?f=0#h'
+  );
 
   testRelUrl(
-      'file?f=0#h',
-      'https://base.org/bfile?bf=0#bh',
-      'https://base.org/file?f=0#h');
+    'file?f=0#h',
+    'https://base.org/bfile?bf=0#bh',
+    'https://base.org/file?f=0#h'
+  );
   testRelUrl(
-      'file?f=0#h',
-      'http://base.org/bfile?bf=0#bh',
-      'http://base.org/file?f=0#h');
+    'file?f=0#h',
+    'http://base.org/bfile?bf=0#bh',
+    'http://base.org/file?f=0#h'
+  );
 
   // Accepts parsed URLs.
   testRelUrl(
-      'file?f=0#h',
-      parseUrlDeprecated('http://base.org/bfile?bf=0#bh'),
-      'http://base.org/file?f=0#h');
+    'file?f=0#h',
+    parseUrlDeprecated('http://base.org/bfile?bf=0#bh'),
+    'http://base.org/file?f=0#h'
+  );
 });
 
-
 describe('getCorsUrl', () => {
   it('should error if __amp_source_origin is set', () => {
-    allowConsoleError(() => { expect(() => getCorsUrl(window, 'http://example.com/?__amp_source_origin')).to.throw(/Source origin is not allowed in/); });
-    expect(() => getCorsUrl(window, 'http://example.com/?name=hello'))
-        .to.not.throw;
+    allowConsoleError(() => {
+      expect(() =>
+        getCorsUrl(window, 'http://example.com/?__amp_source_origin')
+      ).to.throw(/Source origin is not allowed in/);
+    });
+    expect(() => getCorsUrl(window, 'http://example.com/?name=hello')).to.not
+      .throw;
   });
 
   it('should set __amp_source_origin as a url param', () => {
-    expect(getCorsUrl(window, 'http://example.com/?name=hello'))
-        .to.equal('http://example.com/?name=hello&' +
-            '__amp_source_origin=http%3A%2F%2Flocalhost%3A9876');
+    expect(getCorsUrl(window, 'http://example.com/?name=hello')).to.equal(
+      'http://example.com/?name=hello&' +
+        '__amp_source_origin=http%3A%2F%2Flocalhost%3A9876'
+    );
   });
 });
 
-
 describe('removeAmpJsParamsFromUrl', () => {
   it('should handle unaffected URLs', () => {
-    expect(removeAmpJsParamsFromUrl('http://example.com'))
-        .to.equal('http://example.com/');
-    expect(removeAmpJsParamsFromUrl('http://example.com?x=123'))
-        .to.equal('http://example.com/?x=123');
-    expect(removeAmpJsParamsFromUrl('http://example.com#x=123'))
-        .to.equal('http://example.com/#x=123');
-    expect(removeAmpJsParamsFromUrl('http://example.com?y=abc#x=123'))
-        .to.equal('http://example.com/?y=abc#x=123');
+    expect(removeAmpJsParamsFromUrl('http://example.com')).to.equal(
+      'http://example.com/'
+    );
+    expect(removeAmpJsParamsFromUrl('http://example.com?x=123')).to.equal(
+      'http://example.com/?x=123'
+    );
+    expect(removeAmpJsParamsFromUrl('http://example.com#x=123')).to.equal(
+      'http://example.com/#x=123'
+    );
+    expect(removeAmpJsParamsFromUrl('http://example.com?y=abc#x=123')).to.equal(
+      'http://example.com/?y=abc#x=123'
+    );
   });
 
   it('should remove all internal params', () => {
-    expect(removeAmpJsParamsFromUrl('http://example.com?amp_js=1&amp_gsa=2&amp_r=3&amp_kit=4&usqp=4'))
-        .to.equal('http://example.com/');
-    expect(removeAmpJsParamsFromUrl('http://example.com?amp_js&amp_gsa&amp_r&amp_kit&usqp'))
-        .to.equal('http://example.com/');
+    expect(
+      removeAmpJsParamsFromUrl(
+        'http://example.com?amp_js=1&amp_gsa=2&amp_r=3&amp_kit=4&usqp=4'
+      )
+    ).to.equal('http://example.com/');
+    expect(
+      removeAmpJsParamsFromUrl(
+        'http://example.com?amp_js&amp_gsa&amp_r&amp_kit&usqp'
+      )
+    ).to.equal('http://example.com/');
   });
 
   it('should remove all internal params, leaving others intact', () => {
-    expect(removeAmpJsParamsFromUrl('http://example.com?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e'))
-        .to.equal('http://example.com/?a=a&b=b&c=c&d=d&e=e');
+    expect(
+      removeAmpJsParamsFromUrl(
+        'http://example.com?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e'
+      )
+    ).to.equal('http://example.com/?a=a&b=b&c=c&d=d&e=e');
   });
 
   it('should preserve the fragment', () => {
-    expect(removeAmpJsParamsFromUrl('http://example.com?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e#frag=yes'))
-        .to.equal('http://example.com/?a=a&b=b&c=c&d=d&e=e#frag=yes');
+    expect(
+      removeAmpJsParamsFromUrl(
+        'http://example.com?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e#frag=yes'
+      )
+    ).to.equal('http://example.com/?a=a&b=b&c=c&d=d&e=e#frag=yes');
   });
 
   it('should preserve the path', () => {
     expect(
-        removeAmpJsParamsFromUrl('http://example.com/toast?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e#frag=yes'))
-        .to.equal('http://example.com/toast?a=a&b=b&c=c&d=d&e=e#frag=yes');
+      removeAmpJsParamsFromUrl(
+        'http://example.com/toast?a=a&amp_js=1&b=b&amp_gsa=2&c=c&amp_r=3&amp_kit=4&d=d&usqp=4&e=e#frag=yes'
+      )
+    ).to.equal('http://example.com/toast?a=a&b=b&c=c&d=d&e=e#frag=yes');
   });
 });
 
@@ -922,25 +1068,39 @@ describe('removeParamsFromSearch', () => {
 
   it('should remove all param with same name from searchUrl', () => {
     expect(removeParamsFromSearch('?a=1&b=2&a=2&a=3&c&ab=3', 'a')).to.equal(
-        '?b=2&c&ab=3');
+      '?b=2&c&ab=3'
+    );
   });
 });
 
 describe('getProxyServingType', () => {
   it('should ignore non-proxy origins', () => {
     expect(getProxyServingType('http://www.example.com')).to.be.null;
-    expect(getProxyServingType('http://cdn.ampproject.org/c/o.com/foo/')).to.be.null;
+    expect(getProxyServingType('http://cdn.ampproject.org/c/o.com/foo/')).to.be
+      .null;
   });
 
   it('should correctly extract known types', () => {
-    expect(getProxyServingType('https://cdn.ampproject.org/c/o.com/foo/')).to.equal('c');
-    expect(getProxyServingType('https://cdn.ampproject.org/a/o.com/foo/')).to.equal('a');
-    expect(getProxyServingType('https://cdn.ampproject.org/v/o.com/foo/')).to.equal('v');
+    expect(
+      getProxyServingType('https://cdn.ampproject.org/c/o.com/foo/')
+    ).to.equal('c');
+    expect(
+      getProxyServingType('https://cdn.ampproject.org/a/o.com/foo/')
+    ).to.equal('a');
+    expect(
+      getProxyServingType('https://cdn.ampproject.org/v/o.com/foo/')
+    ).to.equal('v');
   });
 
   it('should correctly extract unknown types', () => {
-    expect(getProxyServingType('https://cdn.ampproject.org/test/o.com/foo/')).to.equal('test');
-    expect(getProxyServingType('https://not.cdn.ampproject.org/test/o.com/foo/')).to.equal('test');
-    expect(getProxyServingType('https://not.cdn.ampproject.org/test/blah.com/foo/')).to.equal('test');
+    expect(
+      getProxyServingType('https://cdn.ampproject.org/test/o.com/foo/')
+    ).to.equal('test');
+    expect(
+      getProxyServingType('https://not.cdn.ampproject.org/test/o.com/foo/')
+    ).to.equal('test');
+    expect(
+      getProxyServingType('https://not.cdn.ampproject.org/test/blah.com/foo/')
+    ).to.equal('test');
   });
 });
diff --git a/test/unit/test-variable-source.js b/test/unit/test-variable-source.js
index 07c7b6318421..055b9dc43898 100644
--- a/test/unit/test-variable-source.js
+++ b/test/unit/test-variable-source.js
@@ -21,158 +21,188 @@ import {
 
 import {createElementWithAttributes} from '../../src/dom';
 
-
-describes.fakeWin('VariableSource', {
-  amp: {
-    ampdoc: 'single',
+describes.fakeWin(
+  'VariableSource',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-  let varSource;
-  beforeEach(() => {
-    varSource = new VariableSource(env.ampdoc);
-  });
-
-  it('Works without any variables', () => {
-    expect(varSource.getExpr()).to.be.ok;
-    expect(varSource.get('')).to.be.undefined;
-  });
-
-  it('Works with sync variables', () => {
-    varSource.set('Foo', () => 'bar');
-    expect(varSource.getExpr()).to.be.ok;
-    expect(varSource.get('Foo')['sync']()).to.equal('bar');
-    expect(varSource.get('foo')).to.be.undefined;
-    expect(varSource.get('AFoo')).to.be.undefined;
-  });
-
-  it('Works with async variables', () => {
-    varSource.setAsync('Foo', () => Promise.resolve('bar'));
-    expect(varSource.getExpr()).to.be.ok;
-
-    return varSource.get('Foo')['async']().then(value => {
-      expect(value).to.equal('bar');
+  env => {
+    let varSource;
+    beforeEach(() => {
+      varSource = new VariableSource(env.ampdoc);
     });
-  });
 
-  it('Works with both sync and async variables', () => {
-    varSource.setBoth('Foo', () => 'bar', () => Promise.resolve('bar'));
-    expect(varSource.getExpr()).to.be.ok;
-
-    expect(varSource.get('Foo')['sync']()).to.equal('bar');
-    return varSource.get('Foo')['async']().then(value => {
-      expect(value).to.equal('bar');
+    it('Works without any variables', () => {
+      expect(varSource.getExpr()).to.be.ok;
+      expect(varSource.get('')).to.be.undefined;
     });
-  });
-
-  it('Works with multiple variables', () => {
-    varSource.setBoth('Foo', () => 'bar', () => Promise.resolve('bar'));
-    varSource.set('Baz', () => 'Foo');
-    expect(varSource.getExpr()).to.be.ok;
 
-    expect(varSource.get('Foo')['sync']()).to.equal('bar');
-    expect(varSource.get('Baz')['sync']()).to.equal('Foo');
-    return varSource.get('Foo')['async']().then(value => {
-      expect(value).to.equal('bar');
+    it('Works with sync variables', () => {
+      varSource.set('Foo', () => 'bar');
+      expect(varSource.getExpr()).to.be.ok;
+      expect(varSource.get('Foo')['sync']()).to.equal('bar');
+      expect(varSource.get('foo')).to.be.undefined;
+      expect(varSource.get('AFoo')).to.be.undefined;
     });
-  });
 
-  it('Works with sync variable that is set multiple times', () => {
-    varSource.set('Foo', () => 'bar').set('Foo', () => 'baz');
-    expect(varSource.getExpr()).to.be.ok;
-    expect(varSource.get('Foo')['sync']()).to.equal('baz');
-  });
+    it('Works with async variables', () => {
+      varSource.setAsync('Foo', () => Promise.resolve('bar'));
+      expect(varSource.getExpr()).to.be.ok;
 
-  it('Works with async variable that is set multiple times', () => {
-    varSource.setAsync('Foo', () => Promise.resolve('bar'))
-        .setAsync('Foo', () => Promise.resolve('baz'));
-    return varSource.get('Foo')['async']().then(value => {
-      expect(value).to.equal('baz');
+      return varSource
+        .get('Foo')
+        ['async']()
+        .then(value => {
+          expect(value).to.equal('bar');
+        });
     });
-  });
-
-  it('Does not cache a built Expr', () => {
-    varSource.set('ONE', () => 'foo');
-    const firstExpr = varSource.getExpr();
-    varSource.set('TWO', () => 'bar');
-    expect(firstExpr).not.to.equal(varSource.getExpr());
-  });
 
-  describes.realWin('Whitelist of variable substitutions', {
-    amp: {
-      ampdoc: 'single',
-    },
-  }, env => {
-    let variableSource;
-    beforeEach(() => {
-      env.win.document.head.appendChild(
-          createElementWithAttributes(env.win.document, 'meta', {
-            name: 'amp-allowed-url-macros',
-            content: 'ABC,ABCD,CANONICAL',
-          }));
-      variableSource = new VariableSource(env.ampdoc);
+    it('Works with both sync and async variables', () => {
+      varSource.setBoth('Foo', () => 'bar', () => Promise.resolve('bar'));
+      expect(varSource.getExpr()).to.be.ok;
+
+      expect(varSource.get('Foo')['sync']()).to.equal('bar');
+      return varSource
+        .get('Foo')
+        ['async']()
+        .then(value => {
+          expect(value).to.equal('bar');
+        });
     });
 
-    it('Works with whitelisted variables', () => {
-      variableSource.setAsync('ABCD', () => Promise.resolve('abcd'));
-      expect(variableSource.getExpr()).to.be.ok;
-      expect(variableSource.getExpr().toString()).to.contain('ABCD');
-
-      return variableSource.get('ABCD')['async']().then(value => {
-        expect(value).to.equal('abcd');
-      });
+    it('Works with multiple variables', () => {
+      varSource.setBoth('Foo', () => 'bar', () => Promise.resolve('bar'));
+      varSource.set('Baz', () => 'Foo');
+      expect(varSource.getExpr()).to.be.ok;
+
+      expect(varSource.get('Foo')['sync']()).to.equal('bar');
+      expect(varSource.get('Baz')['sync']()).to.equal('Foo');
+      return varSource
+        .get('Foo')
+        ['async']()
+        .then(value => {
+          expect(value).to.equal('bar');
+        });
     });
 
-    it('Should not work with unwhitelisted variables', () => {
-      variableSource.setAsync('RANDOM', () => Promise.resolve('0.1234'));
-      expect(variableSource.getExpr()).to.be.ok;
-      expect(variableSource.getExpr().toString()).not.to.contain('RANDOM');
+    it('Works with sync variable that is set multiple times', () => {
+      varSource.set('Foo', () => 'bar').set('Foo', () => 'baz');
+      expect(varSource.getExpr()).to.be.ok;
+      expect(varSource.get('Foo')['sync']()).to.equal('baz');
+    });
 
-      return variableSource.get('RANDOM')['async']().then(value => {
-        expect(value).to.equal('0.1234');
-      });
+    it('Works with async variable that is set multiple times', () => {
+      varSource
+        .setAsync('Foo', () => Promise.resolve('bar'))
+        .setAsync('Foo', () => Promise.resolve('baz'));
+      return varSource
+        .get('Foo')
+        ['async']()
+        .then(value => {
+          expect(value).to.equal('baz');
+        });
     });
 
-  });
+    it('Does not cache a built Expr', () => {
+      varSource.set('ONE', () => 'foo');
+      const firstExpr = varSource.getExpr();
+      varSource.set('TWO', () => 'bar');
+      expect(firstExpr).not.to.equal(varSource.getExpr());
+    });
 
-  it('Should not work with empty variable whitelist', () => {
-    env.win.document.head.appendChild(
+    describes.realWin(
+      'Whitelist of variable substitutions',
+      {
+        amp: {
+          ampdoc: 'single',
+        },
+      },
+      env => {
+        let variableSource;
+        beforeEach(() => {
+          env.win.document.head.appendChild(
+            createElementWithAttributes(env.win.document, 'meta', {
+              name: 'amp-allowed-url-macros',
+              content: 'ABC,ABCD,CANONICAL',
+            })
+          );
+          variableSource = new VariableSource(env.ampdoc);
+        });
+
+        it('Works with whitelisted variables', () => {
+          variableSource.setAsync('ABCD', () => Promise.resolve('abcd'));
+          expect(variableSource.getExpr()).to.be.ok;
+          expect(variableSource.getExpr().toString()).to.contain('ABCD');
+
+          return variableSource
+            .get('ABCD')
+            ['async']()
+            .then(value => {
+              expect(value).to.equal('abcd');
+            });
+        });
+
+        it('Should not work with unwhitelisted variables', () => {
+          variableSource.setAsync('RANDOM', () => Promise.resolve('0.1234'));
+          expect(variableSource.getExpr()).to.be.ok;
+          expect(variableSource.getExpr().toString()).not.to.contain('RANDOM');
+
+          return variableSource
+            .get('RANDOM')
+            ['async']()
+            .then(value => {
+              expect(value).to.equal('0.1234');
+            });
+        });
+      }
+    );
+
+    it('Should not work with empty variable whitelist', () => {
+      env.win.document.head.appendChild(
         createElementWithAttributes(env.win.document, 'meta', {
           name: 'amp-allowed-url-macros',
           content: '',
-        }));
-    const variableSource = new VariableSource(env.ampdoc);
+        })
+      );
+      const variableSource = new VariableSource(env.ampdoc);
 
-    variableSource.setAsync('RANDOM', () => Promise.resolve('0.1234'));
-    expect(variableSource.getExpr()).to.be.ok;
-    expect(variableSource.getExpr().toString()).not.to.contain('RANDOM');
+      variableSource.setAsync('RANDOM', () => Promise.resolve('0.1234'));
+      expect(variableSource.getExpr()).to.be.ok;
+      expect(variableSource.getExpr().toString()).not.to.contain('RANDOM');
 
-    return variableSource.get('RANDOM')['async']().then(value => {
-      expect(value).to.equal('0.1234');
+      return variableSource
+        .get('RANDOM')
+        ['async']()
+        .then(value => {
+          expect(value).to.equal('0.1234');
+        });
     });
-  });
-
-  describes.fakeWin('getTimingData', {}, env => {
-    let win;
 
-    beforeEach(() => {
-      win = env.win;
-      win.performance = {
-        timing: {
-          navigationStart: 1,
-          loadEventStart: 0,
-        },
-      };
-    });
+    describes.fakeWin('getTimingData', {}, env => {
+      let win;
+
+      beforeEach(() => {
+        win = env.win;
+        win.performance = {
+          timing: {
+            navigationStart: 1,
+            loadEventStart: 0,
+          },
+        };
+      });
 
-    it('should wait for load event', () => {
-      win.readyState = 'other';
-      const p = getTimingDataAsync(win, 'navigationStart', 'loadEventStart');
-      expect(win.eventListeners.count('load')).to.equal(1);
-      win.performance.timing.loadEventStart = 12;
-      win.eventListeners.fire({type: 'load'});
-      return p.then(value => {
-        expect(value).to.equal(11);
+      it('should wait for load event', () => {
+        win.readyState = 'other';
+        const p = getTimingDataAsync(win, 'navigationStart', 'loadEventStart');
+        expect(win.eventListeners.count('load')).to.equal(1);
+        win.performance.timing.loadEventStart = 12;
+        win.eventListeners.fire({type: 'load'});
+        return p.then(value => {
+          expect(value).to.equal(11);
+        });
       });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-video-analytics-percentage-tracker.js b/test/unit/test-video-analytics-percentage-tracker.js
index 7d19d19387b4..2b336a7bc8e8 100644
--- a/test/unit/test-video-analytics-percentage-tracker.js
+++ b/test/unit/test-video-analytics-percentage-tracker.js
@@ -22,165 +22,134 @@ import {PlayingStates, VideoEvents} from '../../src/video-interface';
 import {Services} from '../../src/services';
 import {createCustomEvent} from '../../src/event-helper';
 
-describes.fakeWin('video-manager-impl#AnalyticsPercentageTracker', {
-  amp: false,
-}, env => {
-
-  const interval = PERCENTAGE_INTERVAL;
-
-  let mockTimer;
-  let mockTimerCallback;
-  let mockEntry;
-
-  let tracker;
-
-  function createFakeVideo() {
-    const element = env.win.document.createElement('div');
-    return {
-      element,
-      getCurrentTime() {
-        return NaN;
-      },
-      getDuration() {
-        return NaN;
-      },
-    };
-  }
-
-
-  function setDuration(video, durationSeconds) {
-    video.getDuration = () => durationSeconds;
-  }
-
-  function setCurrentTime(video, currentTimeSeconds) {
-    video.getCurrentTime = () => currentTimeSeconds;
-  }
-
-  function setPlayingState(entry, playingState) {
-    entry.getPlayingState = () => playingState;
-  }
-
-  function dispatchCustom(element, eventType) {
-    element.dispatchEvent(
-        createCustomEvent(env.win, eventType, /* detail */ null));
-  }
-
-  function dispatchLoadedMetadata(element) {
-    dispatchCustom(element, VideoEvents.LOADEDMETADATA);
-  }
-
-  function mockTrigger(tracker) {
-    return env.sandbox.stub(tracker, 'analyticsEventForTesting_');
-  }
-
-  beforeEach(() => {
-    const {win, sandbox} = env;
-
-    mockTimer = {
-      delay: sandbox.stub().callsFake(fn => {
-        mockTimerCallback = fn;
-      }),
-    };
+describes.fakeWin(
+  'video-manager-impl#AnalyticsPercentageTracker',
+  {
+    amp: false,
+  },
+  env => {
+    const interval = PERCENTAGE_INTERVAL;
+
+    let mockTimer;
+    let mockTimerCallback;
+    let mockEntry;
+
+    let tracker;
+
+    function createFakeVideo() {
+      const element = env.win.document.createElement('div');
+      return {
+        element,
+        getCurrentTime() {
+          return NaN;
+        },
+        getDuration() {
+          return NaN;
+        },
+      };
+    }
 
-    mockEntry = {
-      video: createFakeVideo(),
-      getPlayingState() {
-        return PlayingStates.PAUSED;
-      },
-    };
+    function setDuration(video, durationSeconds) {
+      video.getDuration = () => durationSeconds;
+    }
 
-    sandbox.stub(Services, 'timerFor').returns(mockTimer);
+    function setCurrentTime(video, currentTimeSeconds) {
+      video.getCurrentTime = () => currentTimeSeconds;
+    }
 
-    tracker = new AnalyticsPercentageTracker(win, mockEntry);
-  });
+    function setPlayingState(entry, playingState) {
+      entry.getPlayingState = () => playingState;
+    }
 
-  describe('#start', () => {
+    function dispatchCustom(element, eventType) {
+      element.dispatchEvent(
+        createCustomEvent(env.win, eventType, /* detail */ null)
+      );
+    }
 
-    it('waits for LOADEDMETADATA', () => {
-      const {video} = mockEntry;
-      const {element} = video;
+    function dispatchLoadedMetadata(element) {
+      dispatchCustom(element, VideoEvents.LOADEDMETADATA);
+    }
 
-      tracker.start();
+    function mockTrigger(tracker) {
+      return env.sandbox.stub(tracker, 'analyticsEventForTesting_');
+    }
 
-      expect(mockTimer.delay).to.not.have.been.called;
+    beforeEach(() => {
+      const {win, sandbox} = env;
 
-      const validDurationSeconds = 10;
-      const validCurrentTimeSeconds = 0;
+      mockTimer = {
+        delay: sandbox.stub().callsFake(fn => {
+          mockTimerCallback = fn;
+        }),
+      };
 
-      setDuration(video, validDurationSeconds);
-      setCurrentTime(video, validCurrentTimeSeconds);
+      mockEntry = {
+        video: createFakeVideo(),
+        getPlayingState() {
+          return PlayingStates.PAUSED;
+        },
+      };
 
-      dispatchLoadedMetadata(element);
+      sandbox.stub(Services, 'timerFor').returns(mockTimer);
 
-      expect(mockTimer.delay).to.have.been.calledOnce;
+      tracker = new AnalyticsPercentageTracker(win, mockEntry);
     });
 
-    [0, NaN, -1, undefined, null].forEach(invalidDuration => {
-      it(`aborts if duration is invalid (${invalidDuration})`, () => {
+    describe('#start', () => {
+      it('waits for LOADEDMETADATA', () => {
         const {video} = mockEntry;
         const {element} = video;
 
         tracker.start();
 
-        setDuration(video, invalidDuration);
-        dispatchLoadedMetadata(element);
-
         expect(mockTimer.delay).to.not.have.been.called;
-      });
-    });
-
-    it('does not trigger if the video is paused', () => {
-      const {video} = mockEntry;
-      const {element} = video;
 
-      tracker.start();
+        const validDurationSeconds = 10;
+        const validCurrentTimeSeconds = 0;
 
-      const triggerMock = mockTrigger(tracker);
+        setDuration(video, validDurationSeconds);
+        setCurrentTime(video, validCurrentTimeSeconds);
 
-      const validDurationSeconds = 10;
-      const validCurrentTimeSeconds = 0;
+        dispatchLoadedMetadata(element);
 
-      setDuration(video, validDurationSeconds);
-      setCurrentTime(video, validCurrentTimeSeconds);
+        expect(mockTimer.delay).to.have.been.calledOnce;
+      });
 
-      dispatchLoadedMetadata(element);
+      [0, NaN, -1, undefined, null].forEach(invalidDuration => {
+        it(`aborts if duration is invalid (${invalidDuration})`, () => {
+          const {video} = mockEntry;
+          const {element} = video;
 
-      expect(triggerMock).to.not.have.been.called;
-    });
+          tracker.start();
 
-    it(`does not trigger if percentage < ${interval}%`, () => {
-      const {video} = mockEntry;
-      const {element} = video;
+          setDuration(video, invalidDuration);
+          dispatchLoadedMetadata(element);
 
-      tracker.start();
+          expect(mockTimer.delay).to.not.have.been.called;
+        });
+      });
 
-      const triggerMock = mockTrigger(tracker);
+      it('does not trigger if the video is paused', () => {
+        const {video} = mockEntry;
+        const {element} = video;
 
-      const validDurationSeconds = 10;
-      setDuration(video, validDurationSeconds);
-      setCurrentTime(video, 0);
+        tracker.start();
 
-      dispatchLoadedMetadata(element);
+        const triggerMock = mockTrigger(tracker);
 
-      setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        const validDurationSeconds = 10;
+        const validCurrentTimeSeconds = 0;
 
-      const cutoff = (validDurationSeconds / 100) * interval;
+        setDuration(video, validDurationSeconds);
+        setCurrentTime(video, validCurrentTimeSeconds);
 
-      for (let currentTimeSeconds = 0;
-        currentTimeSeconds < cutoff;
-        currentTimeSeconds += 0.1) {
+        dispatchLoadedMetadata(element);
 
-        setCurrentTime(video, currentTimeSeconds);
         expect(triggerMock).to.not.have.been.called;
-        mockTimerCallback();
-      }
-    });
-
-    for (let startTimeSeconds = 0;
-      startTimeSeconds < 100;
-      startTimeSeconds += 2) {
+      });
 
-      it(`triggers every ${interval}% starting on ${startTimeSeconds}s`, () => {
+      it(`does not trigger if percentage < ${interval}%`, () => {
         const {video} = mockEntry;
         const {element} = video;
 
@@ -188,83 +157,124 @@ describes.fakeWin('video-manager-impl#AnalyticsPercentageTracker', {
 
         const triggerMock = mockTrigger(tracker);
 
-        const validDurationSeconds = 100;
-
+        const validDurationSeconds = 10;
         setDuration(video, validDurationSeconds);
-        setCurrentTime(video, startTimeSeconds);
+        setCurrentTime(video, 0);
 
         dispatchLoadedMetadata(element);
 
         setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
 
-        for (let timeSeconds = startTimeSeconds;
-          timeSeconds < validDurationSeconds;
-          timeSeconds += 1) {
+        const cutoff = (validDurationSeconds / 100) * interval;
 
-          setCurrentTime(video, timeSeconds);
+        for (
+          let currentTimeSeconds = 0;
+          currentTimeSeconds < cutoff;
+          currentTimeSeconds += 0.1
+        ) {
+          setCurrentTime(video, currentTimeSeconds);
+          expect(triggerMock).to.not.have.been.called;
           mockTimerCallback();
         }
-
-        for (let percentage = Math.max(interval,
-            Math.ceil(startTimeSeconds / interval) * interval);
-          percentage < 100;
-          percentage += interval) {
-
-          expect(triggerMock.withArgs(percentage),
-              `triggerMock.withArgs(${percentage}%)`).to.have.been.calledOnce;
-        }
       });
-    }
 
-    it('triggers 100% on ended', () => {
-      const {video} = mockEntry;
-      const {element} = video;
-      const triggerMock = mockTrigger(tracker);
+      for (
+        let startTimeSeconds = 0;
+        startTimeSeconds < 100;
+        startTimeSeconds += 2
+      ) {
+        it(`triggers every ${interval}% starting on ${startTimeSeconds}s`, () => {
+          const {video} = mockEntry;
+          const {element} = video;
+
+          tracker.start();
+
+          const triggerMock = mockTrigger(tracker);
+
+          const validDurationSeconds = 100;
+
+          setDuration(video, validDurationSeconds);
+          setCurrentTime(video, startTimeSeconds);
+
+          dispatchLoadedMetadata(element);
+
+          setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+
+          for (
+            let timeSeconds = startTimeSeconds;
+            timeSeconds < validDurationSeconds;
+            timeSeconds += 1
+          ) {
+            setCurrentTime(video, timeSeconds);
+            mockTimerCallback();
+          }
+
+          for (
+            let percentage = Math.max(
+              interval,
+              Math.ceil(startTimeSeconds / interval) * interval
+            );
+            percentage < 100;
+            percentage += interval
+          ) {
+            expect(
+              triggerMock.withArgs(percentage),
+              `triggerMock.withArgs(${percentage}%)`
+            ).to.have.been.calledOnce;
+          }
+        });
+      }
 
-      const startTimeSeconds = 0;
-      const validDurationSeconds = 100;
+      it('triggers 100% on ended', () => {
+        const {video} = mockEntry;
+        const {element} = video;
+        const triggerMock = mockTrigger(tracker);
+
+        const startTimeSeconds = 0;
+        const validDurationSeconds = 100;
 
-      setDuration(video, validDurationSeconds);
-      setCurrentTime(video, startTimeSeconds);
+        setDuration(video, validDurationSeconds);
+        setCurrentTime(video, startTimeSeconds);
 
-      setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
 
-      tracker.start();
+        tracker.start();
 
-      dispatchLoadedMetadata(element);
+        dispatchLoadedMetadata(element);
 
-      mockTimerCallback();
-      dispatchCustom(element, VideoEvents.ENDED);
+        mockTimerCallback();
+        dispatchCustom(element, VideoEvents.ENDED);
 
-      expect(triggerMock.withArgs(100)).to.have.been.calledOnce;
+        expect(triggerMock.withArgs(100)).to.have.been.calledOnce;
+      });
     });
-  });
 
-  describe('#stop', () => {
-    it('cancels upcoming events', () => {
-      const {video} = mockEntry;
-      const {element} = video;
+    describe('#stop', () => {
+      it('cancels upcoming events', () => {
+        const {video} = mockEntry;
+        const {element} = video;
 
-      const triggerMock = mockTrigger(tracker);
+        const triggerMock = mockTrigger(tracker);
 
-      const startTimeSeconds = 0;
-      const validDurationSeconds = 100;
+        const startTimeSeconds = 0;
+        const validDurationSeconds = 100;
 
-      setDuration(video, validDurationSeconds);
-      setCurrentTime(video, startTimeSeconds);
+        setDuration(video, validDurationSeconds);
+        setCurrentTime(video, startTimeSeconds);
 
-      setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
+        setPlayingState(mockEntry, PlayingStates.PLAYING_MANUAL);
 
-      tracker.start();
+        tracker.start();
 
-      dispatchLoadedMetadata(element);
+        dispatchLoadedMetadata(element);
 
-      tracker.stop();
+        tracker.stop();
 
-      mockTimerCallback();
-      dispatchCustom(element, VideoEvents.ENDED);
+        mockTimerCallback();
+        dispatchCustom(element, VideoEvents.ENDED);
 
-      expect(triggerMock).to.not.have.been.called;
+        expect(triggerMock).to.not.have.been.called;
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/test-video-iframe-integration.js b/test/unit/test-video-iframe-integration.js
index 85887975038a..3f6bdab84d8c 100644
--- a/test/unit/test-video-iframe-integration.js
+++ b/test/unit/test-video-iframe-integration.js
@@ -20,12 +20,9 @@ import {
   getVideoJs,
 } from '../../src/video-iframe-integration';
 
-
 const NOOP = () => {};
 
-
 describes.realWin('video-iframe-integration', {amp: false}, env => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -78,8 +75,8 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
 
         dummySpy(integration.getMetadata());
 
-        expect(dummySpy.withArgs(sinon.match(metadata)))
-            .to.have.been.calledOnce;
+        expect(dummySpy.withArgs(sinon.match(metadata))).to.have.been
+          .calledOnce;
       });
     });
 
@@ -119,8 +116,9 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
 
         invalidMethods.forEach(method => {
           const spy = sandbox.spy();
-          expect(() => integration.method(method, spy))
-              .to.throw(/Invalid method/);
+          expect(() => integration.method(method, spy)).to.throw(
+            /Invalid method/
+          );
         });
 
         expect(listenToOnce).to.not.have.been.called;
@@ -155,8 +153,8 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
         for (let i = 0; i < validEvents.length; i++) {
           const event = validEvents[i];
           integration.postEvent(event);
-          expect(postToParent.withArgs(sinon.match({event})))
-              .to.have.been.calledOnce;
+          expect(postToParent.withArgs(sinon.match({event}))).to.have.been
+            .calledOnce;
         }
       });
     });
@@ -164,15 +162,14 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
     describe('#getIntersection', () => {
       it('should request and receive intersection', () => {
         const integration = new AmpVideoIntegration();
-        const postToParent =
-            sandbox.spy(integration, 'postToParent_');
+        const postToParent = sandbox.spy(integration, 'postToParent_');
 
         const callback = sandbox.spy();
 
         const id = integration.getIntersectionForTesting_(callback);
 
         expect(postToParent.withArgs(sinon.match({method: 'getIntersection'})))
-            .to.have.been.calledOnce;
+          .to.have.been.calledOnce;
 
         const mockedIntersection = {tacos: 'al pastor'};
 
@@ -225,13 +222,13 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
           integration.listenTo('jwplayer', player);
 
           expectedEvents.forEach(event => {
-            expect(player.on.withArgs(event, sinon.match.any))
-                .to.have.been.calledOnce;
+            expect(player.on.withArgs(event, sinon.match.any)).to.have.been
+              .calledOnce;
           });
 
           expectedMethods.forEach(method => {
-            expect(methodSpy.withArgs(method, sinon.match.any))
-                .to.have.been.calledOnce;
+            expect(methodSpy.withArgs(method, sinon.match.any)).to.have.been
+              .calledOnce;
           });
 
           expect(listenToOnce.callCount).to.equal(expectedMethods.length);
@@ -252,7 +249,6 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
 
       describe('video.js', () => {
         it('registers all methods', () => {
-
           const expectedMethods = [
             'play',
             'pause',
@@ -273,13 +269,14 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
           const dummyElement = env.win.document.createElement('video');
 
           integration.listenTo(
-              'videojs',
-              dummyElement,
-              /* initializer */ () => player);
+            'videojs',
+            dummyElement,
+            /* initializer */ () => player
+          );
 
           expectedMethods.forEach(method => {
-            expect(methodSpy.withArgs(method, sinon.match.any))
-                .to.have.been.calledOnce;
+            expect(methodSpy.withArgs(method, sinon.match.any)).to.have.been
+              .calledOnce;
           });
 
           expect(listenToOnce.callCount).to.equal(expectedMethods.length);
@@ -291,15 +288,15 @@ describes.realWin('video-iframe-integration', {amp: false}, env => {
             const win = {
               videojs: initializer,
             };
-            expect(getVideoJs(win).toString())
-                .to.equal(initializer.toString());
+            expect(getVideoJs(win).toString()).to.equal(initializer.toString());
           });
 
           it('returns initializer if provided', () => {
             const win = {};
             const initializer = NOOP;
-            expect(getVideoJs(win, initializer).toString())
-                .to.equal(initializer.toString());
+            expect(getVideoJs(win, initializer).toString()).to.equal(
+              initializer.toString()
+            );
           });
 
           it('fails if no initializer provided or Video.JS not present', () => {
diff --git a/test/unit/test-video-rotate-to-fullscreen.js b/test/unit/test-video-rotate-to-fullscreen.js
index 99ca5a56d979..0c72d1e9f4eb 100644
--- a/test/unit/test-video-rotate-to-fullscreen.js
+++ b/test/unit/test-video-rotate-to-fullscreen.js
@@ -13,13 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {
-  AutoFullscreenManager,
-} from '../../src/service/video-manager-impl';
+import {AutoFullscreenManager} from '../../src/service/video-manager-impl';
 import {PlayingStates} from '../../src/video-interface';
 import {Services} from '../../src/services';
 
-
 describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
   let ampdoc;
   let autoFullscreenManager;
@@ -150,8 +147,10 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
       },
     });
 
-    const getPlayingState =
-      sandbox.stub(autoFullscreenManager, 'getPlayingState_');
+    const getPlayingState = sandbox.stub(
+      autoFullscreenManager,
+      'getPlayingState_'
+    );
 
     getPlayingState.withArgs(video1).returns(PlayingStates.PAUSED);
     getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_AUTO);
@@ -161,8 +160,9 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
     autoFullscreenManager.register({video: video2});
     autoFullscreenManager.register({video: video3});
 
-    expect(autoFullscreenManager.selectBestCenteredInPortrait_())
-        .to.equal(video3);
+    expect(autoFullscreenManager.selectBestCenteredInPortrait_()).to.equal(
+      video3
+    );
   });
 
   it('selects center-most video among those visible and playing', () => {
@@ -206,8 +206,10 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
       },
     });
 
-    const getPlayingState =
-      sandbox.stub(autoFullscreenManager, 'getPlayingState_');
+    const getPlayingState = sandbox.stub(
+      autoFullscreenManager,
+      'getPlayingState_'
+    );
 
     getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
     getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
@@ -217,8 +219,9 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
     autoFullscreenManager.register({video: video2});
     autoFullscreenManager.register({video: video3});
 
-    expect(autoFullscreenManager.selectBestCenteredInPortrait_())
-        .to.equal(video2);
+    expect(autoFullscreenManager.selectBestCenteredInPortrait_()).to.equal(
+      video2
+    );
   });
 
   it('selects top-most video if two videos are equally centered', () => {
@@ -251,8 +254,10 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
       },
     });
 
-    const getPlayingState =
-      sandbox.stub(autoFullscreenManager, 'getPlayingState_');
+    const getPlayingState = sandbox.stub(
+      autoFullscreenManager,
+      'getPlayingState_'
+    );
 
     getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
     getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
@@ -260,8 +265,9 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
 
-    expect(autoFullscreenManager.selectBestCenteredInPortrait_())
-        .to.equal(video1);
+    expect(autoFullscreenManager.selectBestCenteredInPortrait_()).to.equal(
+      video1
+    );
   });
 
   it('selects the highest intersection ratio if two videos are visible', () => {
@@ -293,8 +299,10 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
       },
     });
 
-    const getPlayingState =
-      sandbox.stub(autoFullscreenManager, 'getPlayingState_');
+    const getPlayingState = sandbox.stub(
+      autoFullscreenManager,
+      'getPlayingState_'
+    );
 
     getPlayingState.withArgs(video1).returns(PlayingStates.PLAYING_MANUAL);
     getPlayingState.withArgs(video2).returns(PlayingStates.PLAYING_MANUAL);
@@ -302,7 +310,8 @@ describes.fakeWin('Rotate-to-fullscreen', {amp: true}, env => {
     autoFullscreenManager.register({video: video1});
     autoFullscreenManager.register({video: video2});
 
-    expect(autoFullscreenManager.selectBestCenteredInPortrait_())
-        .to.equal(video2);
+    expect(autoFullscreenManager.selectBestCenteredInPortrait_()).to.equal(
+      video2
+    );
   });
 });
diff --git a/test/unit/test-viewer-cid-api.js b/test/unit/test-viewer-cid-api.js
index 5c65f939324f..97b5c12f645c 100644
--- a/test/unit/test-viewer-cid-api.js
+++ b/test/unit/test-viewer-cid-api.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {ViewerCidApi} from '../../src/service/viewer-cid-api';
 import {dict} from '../../src/utils/object';
 import {mockServiceForDoc} from '../../testing/test-helper';
@@ -59,22 +58,26 @@ describes.realWin('viewerCidApi', {amp: true}, env => {
 
   describe('getScopedCid', () => {
     function verifyClientIdApiInUse(used) {
-      viewerMock.sendMessageAwaitResponse
-          .returns(Promise.resolve('client-id-from-viewer'));
-      return api.getScopedCid(used ? 'api-key' : undefined,
-          'AMP_ECID_GOOGLE').then(cid => {
-        expect(cid).to.equal('client-id-from-viewer');
-        const payload = dict({
-          'scope': 'AMP_ECID_GOOGLE',
-          'clientIdApi': used,
-          'canonicalOrigin': 'http://localhost:9876',
+      viewerMock.sendMessageAwaitResponse.returns(
+        Promise.resolve('client-id-from-viewer')
+      );
+      return api
+        .getScopedCid(used ? 'api-key' : undefined, 'AMP_ECID_GOOGLE')
+        .then(cid => {
+          expect(cid).to.equal('client-id-from-viewer');
+          const payload = dict({
+            'scope': 'AMP_ECID_GOOGLE',
+            'clientIdApi': used,
+            'canonicalOrigin': 'http://localhost:9876',
+          });
+          if (used) {
+            payload['apiKey'] = 'api-key';
+          }
+          expect(viewerMock.sendMessageAwaitResponse).to.be.calledWith(
+            'cid',
+            payload
+          );
         });
-        if (used) {
-          payload['apiKey'] = 'api-key';
-        }
-        expect(viewerMock.sendMessageAwaitResponse)
-            .to.be.calledWith('cid', payload);
-      });
     }
 
     it('should use client ID API from api if everything great', () => {
@@ -86,26 +89,34 @@ describes.realWin('viewerCidApi', {amp: true}, env => {
     });
 
     it('should not use client ID API if scope not whitelisted', () => {
-      viewerMock.sendMessageAwaitResponse.withArgs('cid', dict({
-        'scope': 'NON_WHITELISTED_SCOPE',
-        'clientIdApi': false,
-        'canonicalOrigin': 'http://localhost:9876',
-      })).returns(Promise.resolve('client-id-from-viewer'));
-      return expect(api.getScopedCid(undefined, 'NON_WHITELISTED_SCOPE'))
-          .to.eventually.equal('client-id-from-viewer');
+      viewerMock.sendMessageAwaitResponse
+        .withArgs(
+          'cid',
+          dict({
+            'scope': 'NON_WHITELISTED_SCOPE',
+            'clientIdApi': false,
+            'canonicalOrigin': 'http://localhost:9876',
+          })
+        )
+        .returns(Promise.resolve('client-id-from-viewer'));
+      return expect(
+        api.getScopedCid(undefined, 'NON_WHITELISTED_SCOPE')
+      ).to.eventually.equal('client-id-from-viewer');
     });
 
     it('should return undefined if Viewer returns undefined', () => {
       viewerMock.sendMessageAwaitResponse.returns(Promise.resolve());
-      return expect(api.getScopedCid('api-key', 'AMP_ECID_GOOGLE'))
-          .to.eventually.be.undefined;
+      return expect(api.getScopedCid('api-key', 'AMP_ECID_GOOGLE')).to
+        .eventually.be.undefined;
     });
 
     it('should reject if Viewer rejects', () => {
-      viewerMock.sendMessageAwaitResponse
-          .returns(Promise.reject('Client API error'));
-      return expect(api.getScopedCid('api-key', 'AMP_ECID_GOOGLE'))
-          .to.eventually.be.rejectedWith(/Client API error/);
+      viewerMock.sendMessageAwaitResponse.returns(
+        Promise.reject('Client API error')
+      );
+      return expect(
+        api.getScopedCid('api-key', 'AMP_ECID_GOOGLE')
+      ).to.eventually.be.rejectedWith(/Client API error/);
     });
   });
 });
diff --git a/test/unit/test-viewer.js b/test/unit/test-viewer.js
index d7f8304fdf5e..25bfcd5907b1 100644
--- a/test/unit/test-viewer.js
+++ b/test/unit/test-viewer.js
@@ -18,16 +18,13 @@ import {Services} from '../../src/services';
 import {Viewer} from '../../src/service/viewer-impl';
 import {dev} from '../../src/log';
 import {installDocService} from '../../src/service/ampdoc-impl';
-import {installDocumentInfoServiceForDoc} from
-  '../../src/service/document-info-impl';
+import {installDocumentInfoServiceForDoc} from '../../src/service/document-info-impl';
 import {installDocumentStateService} from '../../src/service/document-state';
 import {installPlatformService} from '../../src/service/platform-impl';
 import {installTimerService} from '../../src/service/timer-impl';
 import {parseUrlDeprecated, removeFragment} from '../../src/url';
 
-
 describe('Viewer', () => {
-
   let sandbox;
   let windowMock;
   let viewer;
@@ -82,16 +79,19 @@ describe('Viewer', () => {
       body: {style: {}},
       documentElement: {style: {}},
       title: 'Awesome doc',
-      querySelector() { return parseUrlDeprecated('http://www.example.com/'); },
+      querySelector() {
+        return parseUrlDeprecated('http://www.example.com/');
+      },
     };
     windowApi.navigator = window.navigator;
     windowApi.history = {
       replaceState: () => {},
     };
-    sandbox.stub(windowApi.history, 'replaceState').callsFake(
-        (state, title, url) => {
-          windowApi.location.href = url;
-        });
+    sandbox
+      .stub(windowApi.history, 'replaceState')
+      .callsFake((state, title, url) => {
+        windowApi.location.href = url;
+      });
     installDocService(windowApi, /* isSingleDoc */ true);
     installDocumentStateService(windowApi);
     ampdoc = Services.ampdocServiceFor(windowApi).getAmpDoc();
@@ -169,8 +169,11 @@ describe('Viewer', () => {
     const viewer = new Viewer(ampdoc);
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#ampshare=http%3A%2F%2Fwww.example.com%2F');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#ampshare=http%3A%2F%2Fwww.example.com%2F'
+    );
   });
 
   it('should merge fragments within custom tab', function*() {
@@ -182,8 +185,11 @@ describe('Viewer', () => {
     expect(viewer.getParam('test')).to.equal('1');
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F'
+    );
   });
 
   it('should not duplicate ampshare when merging', function*() {
@@ -195,26 +201,31 @@ describe('Viewer', () => {
     expect(viewer.getParam('test')).to.equal('1');
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F'
+    );
   });
 
   it('should remove multiple ampshares when merging', function*() {
     windowApi.parent = windowApi;
     windowApi.location.href =
-        'http://www.example.com/#test=1&ampshare=a&ampshare=b&ampshare=c';
-    windowApi.location.hash =
-        '#test=1&ampshare=a&ampshare=b&ampshare=c';
+      'http://www.example.com/#test=1&ampshare=a&ampshare=b&ampshare=c';
+    windowApi.location.hash = '#test=1&ampshare=a&ampshare=b&ampshare=c';
     windowApi.location.search = '?amp_gsa=1&amp_js_v=a0';
     const viewer = new Viewer(ampdoc);
     expect(viewer.getParam('test')).to.equal('1');
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#test=1&ampshare=http%3A%2F%2Fwww.example.com%2F'
+    );
   });
 
-  it('should remove extra ampshare even when it\'s first', function*() {
+  it("should remove extra ampshare even when it's first", function*() {
     windowApi.parent = windowApi;
     windowApi.location.href = 'http://www.example.com/#ampshare=old&test=1';
     windowApi.location.hash = '#ampshare=old&test=1';
@@ -223,24 +234,29 @@ describe('Viewer', () => {
     expect(viewer.getParam('test')).to.equal('1');
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#ampshare=http%3A%2F%2Fwww.example.com%2F&test=1');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#ampshare=http%3A%2F%2Fwww.example.com%2F&test=1'
+    );
   });
 
-  it('should remove extra ampshare even when it\'s sandwiched', function*() {
+  it("should remove extra ampshare even when it's sandwiched", function*() {
     windowApi.parent = windowApi;
     windowApi.location.href =
-        'http://www.example.com/#note=ok&ampshare=old&test=1';
-    windowApi.location.hash =
-        '#note=ok&ampshare=old&test=1';
+      'http://www.example.com/#note=ok&ampshare=old&test=1';
+    windowApi.location.hash = '#note=ok&ampshare=old&test=1';
     windowApi.location.search = '?amp_gsa=1&amp_js_v=a0';
     const viewer = new Viewer(ampdoc);
     expect(viewer.getParam('test')).to.equal('1');
     expect(viewer.getParam('note')).to.equal('ok');
     expect(viewer.isCctEmbedded()).to.be.true;
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#note=ok&ampshare=http%3A%2F%2Fwww.example.com%2F&test=1');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#note=ok&ampshare=http%3A%2F%2Fwww.example.com%2F&test=1'
+    );
   });
 
   it('should clear fragment when click param is present', () => {
@@ -260,12 +276,18 @@ describe('Viewer', () => {
     windowApi.location.hash = '#click=abc';
     windowApi.location.search = '?amp_gsa=1&amp_js_v=a0';
     const viewer = new Viewer(ampdoc);
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        'http://www.example.com');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      'http://www.example.com'
+    );
     expect(viewer.getParam('click')).to.equal('abc');
     yield viewer.whenFirstVisible();
-    expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-        '#ampshare=http%3A%2F%2Fwww.example.com%2F');
+    expect(windowApi.history.replaceState).to.be.calledWith(
+      {},
+      '',
+      '#ampshare=http%3A%2F%2Fwww.example.com%2F'
+    );
   });
 
   it('should configure visibilityState visible by default', () => {
@@ -276,7 +298,7 @@ describe('Viewer', () => {
     expect(viewer.getLastVisibleTime()).to.equal(0);
   });
 
-  it('should return promise that resolve on visible', function* () {
+  it('should return promise that resolve on visible', function*() {
     const viewer = new Viewer(ampdoc);
     expect(viewer.isVisible()).to.be.true;
     let promise = viewer.whenNextVisible();
@@ -368,12 +390,17 @@ describe('Viewer', () => {
       const viewer = new Viewer(ampdoc);
       viewer.replaceUrl(viewer.getParam('replaceUrl'));
       expect(windowApi.history.replaceState).to.be.calledOnce;
-      expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-          'http://www.example.com/two?a=1' + fragment);
-      expect(ampdoc.getUrl())
-          .to.equal('http://www.example.com/two?a=1' + fragment);
-      expect(windowApi.location.originalHref)
-          .to.equal('http://www.example.com/one' + fragment);
+      expect(windowApi.history.replaceState).to.be.calledWith(
+        {},
+        '',
+        'http://www.example.com/two?a=1' + fragment
+      );
+      expect(ampdoc.getUrl()).to.equal(
+        'http://www.example.com/two?a=1' + fragment
+      );
+      expect(windowApi.location.originalHref).to.equal(
+        'http://www.example.com/one' + fragment
+      );
     });
 
     it('should ignore replacement fragment', () => {
@@ -382,10 +409,14 @@ describe('Viewer', () => {
       const viewer = new Viewer(ampdoc);
       viewer.replaceUrl(viewer.getParam('replaceUrl'));
       expect(windowApi.history.replaceState).to.be.calledOnce;
-      expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-          'http://www.example.com/two' + fragment);
-      expect(windowApi.location.originalHref)
-          .to.equal('http://www.example.com/one' + fragment);
+      expect(windowApi.history.replaceState).to.be.calledWith(
+        {},
+        '',
+        'http://www.example.com/two' + fragment
+      );
+      expect(windowApi.location.originalHref).to.equal(
+        'http://www.example.com/one' + fragment
+      );
     });
 
     it('should replace relative URL for the same non-proxy origin', () => {
@@ -394,10 +425,14 @@ describe('Viewer', () => {
       const viewer = new Viewer(ampdoc);
       viewer.replaceUrl(viewer.getParam('replaceUrl'));
       expect(windowApi.history.replaceState).to.be.calledOnce;
-      expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-          window.location.origin + '/two' + fragment);
-      expect(windowApi.location.originalHref)
-          .to.equal(removeFragment(window.location.href) + fragment);
+      expect(windowApi.history.replaceState).to.be.calledWith(
+        {},
+        '',
+        window.location.origin + '/two' + fragment
+      );
+      expect(windowApi.location.originalHref).to.equal(
+        removeFragment(window.location.href) + fragment
+      );
     });
 
     it('should fail to replace URL for a wrong non-proxy origin', () => {
@@ -425,21 +460,24 @@ describe('Viewer', () => {
 
     it('should replace URL for the same source origin on proxy', () => {
       const fragment =
-          '#replaceUrl=https://cdn.ampproject.org/c/www.example.com/two&b=1';
+        '#replaceUrl=https://cdn.ampproject.org/c/www.example.com/two&b=1';
       setUrl('https://cdn.ampproject.org/c/www.example.com/one' + fragment);
       const viewer = new Viewer(ampdoc);
       viewer.replaceUrl(viewer.getParam('replaceUrl'));
       expect(windowApi.history.replaceState).to.be.calledOnce;
-      expect(windowApi.history.replaceState).to.be.calledWith({}, '',
-          'https://cdn.ampproject.org/c/www.example.com/two' + fragment);
-      expect(windowApi.location.originalHref)
-          .to.equal('https://cdn.ampproject.org/c/www.example.com/one' +
-              fragment);
+      expect(windowApi.history.replaceState).to.be.calledWith(
+        {},
+        '',
+        'https://cdn.ampproject.org/c/www.example.com/two' + fragment
+      );
+      expect(windowApi.location.originalHref).to.equal(
+        'https://cdn.ampproject.org/c/www.example.com/one' + fragment
+      );
     });
 
     it('should fail replace URL for wrong source origin on proxy', () => {
       const fragment =
-          '#replaceUrl=https://cdn.ampproject.org/c/other.example.com/two&b=1';
+        '#replaceUrl=https://cdn.ampproject.org/c/other.example.com/two&b=1';
       setUrl('https://cdn.ampproject.org/c/www.example.com/one' + fragment);
       const viewer = new Viewer(ampdoc);
       viewer.replaceUrl(viewer.getParam('replaceUrl'));
@@ -511,11 +549,13 @@ describe('Viewer', () => {
       viewer.receiveMessage('visibilitychange', {
         state: 'paused',
       });
-      allowConsoleError(() => { expect(() => {
-        viewer.receiveMessage('visibilitychange', {
-          state: 'what is this',
-        });
-      }).to.throw('Unknown VisibilityState value'); });
+      allowConsoleError(() => {
+        expect(() => {
+          viewer.receiveMessage('visibilitychange', {
+            state: 'what is this',
+          });
+        }).to.throw('Unknown VisibilityState value');
+      });
       expect(viewer.getVisibilityState()).to.equal('paused');
       expect(viewer.isVisible()).to.equal(false);
     });
@@ -561,15 +601,18 @@ describe('Viewer', () => {
       expect(viewer.isVisible()).to.equal(false);
     });
 
-    it('should be paused when the browser document is visible but viewer is' +
-       'paused', () => {
-      changeVisibility('visible');
-      viewer.receiveMessage('visibilitychange', {
-        state: 'paused',
-      });
-      expect(viewer.getVisibilityState()).to.equal('paused');
-      expect(viewer.isVisible()).to.equal(false);
-    });
+    it(
+      'should be paused when the browser document is visible but viewer is' +
+        'paused',
+      () => {
+        changeVisibility('visible');
+        viewer.receiveMessage('visibilitychange', {
+          state: 'paused',
+        });
+        expect(viewer.getVisibilityState()).to.equal('paused');
+        expect(viewer.isVisible()).to.equal(false);
+      }
+    );
 
     it('should be visible when the browser document is visible', () => {
       changeVisibility('visible');
@@ -642,18 +685,19 @@ describe('Viewer', () => {
   });
 
   describe('Messaging not embedded', () => {
-
     it('should not expect messaging', () => {
       expect(viewer.messagingReadyPromise_).to.be.null;
     });
 
     it('should fail sendMessageAwaitResponse', () => {
-      return viewer.sendMessageAwaitResponse('event', {})
-          .then(() => {
-            throw new Error('should not succeed');
-          }, error => {
-            expect(error.message).to.match(/No messaging channel/);
-          });
+      return viewer.sendMessageAwaitResponse('event', {}).then(
+        () => {
+          throw new Error('should not succeed');
+        },
+        error => {
+          expect(error.message).to.match(/No messaging channel/);
+        }
+      );
     });
 
     it('should do nothing in sendMessage but not fail', () => {
@@ -708,46 +752,51 @@ describe('Viewer', () => {
 
     it('sendMessageAwaitResponse should wait for messaging channel', () => {
       let mResolved = false;
-      const m = viewer.sendMessageAwaitResponse('event', {})
-          .then(() => {
-            mResolved = true;
-          });
-      return Promise.resolve().then(() => {
-        // Not resolved yet.
-        expect(mResolved).to.be.false;
-
-        // Set message deliverer.
-        viewer.setMessageDeliverer(() => {
-          return Promise.resolve();
-        }, 'https://www.example.com');
-        expect(mResolved).to.be.false;
-
-        return m;
-      }).then(() => {
-        // All resolved now.
-        expect(mResolved).to.be.true;
-      });
+      const m = viewer.sendMessageAwaitResponse('event', {}).then(() => {
+        mResolved = true;
+      });
+      return Promise.resolve()
+        .then(() => {
+          // Not resolved yet.
+          expect(mResolved).to.be.false;
+
+          // Set message deliverer.
+          viewer.setMessageDeliverer(() => {
+            return Promise.resolve();
+          }, 'https://www.example.com');
+          expect(mResolved).to.be.false;
+
+          return m;
+        })
+        .then(() => {
+          // All resolved now.
+          expect(mResolved).to.be.true;
+        });
     });
 
     it('should timeout messaging channel', () => {
       let mResolved = false;
-      const m = viewer.sendMessageAwaitResponse('event', {})
-          .then(() => {
-            mResolved = true;
-          });
-      return Promise.resolve().then(() => {
-        // Not resolved yet.
-        expect(mResolved).to.be.false;
-
-        // Timeout.
-        clock.tick(20001);
-        return m;
-      }).then(() => {
-        throw new Error('must never be here');
-      }, () => {
-        // Not resolved ever.
-        expect(mResolved).to.be.false;
-      });
+      const m = viewer.sendMessageAwaitResponse('event', {}).then(() => {
+        mResolved = true;
+      });
+      return Promise.resolve()
+        .then(() => {
+          // Not resolved yet.
+          expect(mResolved).to.be.false;
+
+          // Timeout.
+          clock.tick(20001);
+          return m;
+        })
+        .then(
+          () => {
+            throw new Error('must never be here');
+          },
+          () => {
+            // Not resolved ever.
+            expect(mResolved).to.be.false;
+          }
+        );
     });
 
     describe('sendMessage', () => {
@@ -766,8 +815,8 @@ describe('Viewer', () => {
 
     describe('sendMessage with cancelUnsent', () => {
       it('should queue non-dupe events', () => {
-        viewer.sendMessage('event-a', {value: 1}, /* cancelUnsent*/true);
-        viewer.sendMessage('event-b', {value: 2}, /* cancelUnsent*/true);
+        viewer.sendMessage('event-a', {value: 1}, /* cancelUnsent*/ true);
+        viewer.sendMessage('event-b', {value: 2}, /* cancelUnsent*/ true);
         expect(viewer.messageQueue_.length).to.equal(2);
         expect(viewer.messageQueue_[0].eventType).to.equal('event-a');
         expect(viewer.messageQueue_[0].data.value).to.equal(1);
@@ -776,16 +825,16 @@ describe('Viewer', () => {
       });
 
       it('should queue dupe events', () => {
-        viewer.sendMessage('event', {value: 1}, /* cancelUnsent*/true);
-        viewer.sendMessage('event', {value: 2}, /* cancelUnsent*/true);
+        viewer.sendMessage('event', {value: 1}, /* cancelUnsent*/ true);
+        viewer.sendMessage('event', {value: 2}, /* cancelUnsent*/ true);
         expect(viewer.messageQueue_.length).to.equal(1);
         expect(viewer.messageQueue_[0].eventType).to.equal('event');
         expect(viewer.messageQueue_[0].data.value).to.equal(2);
       });
 
       it('should dequeue events when deliverer is set', () => {
-        viewer.sendMessage('event-a', {value: 1}, /* cancelUnsent*/true);
-        viewer.sendMessage('event-b', {value: 2}, /* cancelUnsent*/true);
+        viewer.sendMessage('event-a', {value: 1}, /* cancelUnsent*/ true);
+        viewer.sendMessage('event-b', {value: 2}, /* cancelUnsent*/ true);
         expect(viewer.messageQueue_.length).to.equal(2);
 
         const delivered = [];
@@ -801,8 +850,11 @@ describe('Viewer', () => {
       });
 
       it('should return undefined', () => {
-        const response = viewer.sendMessage('event', {value: 1},
-            /* cancelUnsent */true);
+        const response = viewer.sendMessage(
+          'event',
+          {value: 1},
+          /* cancelUnsent */ true
+        );
         expect(response).to.be.undefined;
       });
     });
@@ -824,44 +876,69 @@ describe('Viewer', () => {
 
     describe('sendMessageAwaitResponse with cancelUnsent', () => {
       it('should send queued messages', () => {
-        viewer.sendMessageAwaitResponse('event-a', {value: 1},
-            /* cancelUnsent */true);
-        viewer.sendMessageAwaitResponse('event-b', {value: 2},
-            /* cancelUnsent */true);
-        viewer.sendMessageAwaitResponse('event-a', {value: 3},
-            /* cancelUnsent */true);
+        viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 1},
+          /* cancelUnsent */ true
+        );
+        viewer.sendMessageAwaitResponse(
+          'event-b',
+          {value: 2},
+          /* cancelUnsent */ true
+        );
+        viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 3},
+          /* cancelUnsent */ true
+        );
 
         const delivererSpy = sandbox.stub();
         delivererSpy.returns(Promise.resolve());
 
         viewer.setMessageDeliverer(delivererSpy, 'https://www.example.com');
         sinon.assert.callOrder(
-            delivererSpy.withArgs('event-b', {value: 2}, true),
-            delivererSpy.withArgs('event-a', {value: 3}, true));
+          delivererSpy.withArgs('event-b', {value: 2}, true),
+          delivererSpy.withArgs('event-a', {value: 3}, true)
+        );
         expect(delivererSpy).to.not.be.calledWith('event-a', {value: 1}, true);
 
-        viewer.sendMessageAwaitResponse('event-a', {value: 4},
-            /* cancelUnsent */true);
+        viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 4},
+          /* cancelUnsent */ true
+        );
         expect(delivererSpy).to.be.calledWith('event-a', {value: 4}, true);
       });
 
       it('should return promise that resolves on response', () => {
-        const response1 = viewer.sendMessageAwaitResponse('event-a', {value: 1},
-            /* cancelUnsent */true);
-        const response2 = viewer.sendMessageAwaitResponse('event-a', {value: 2},
-            /* cancelUnsent */true);
+        const response1 = viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 1},
+          /* cancelUnsent */ true
+        );
+        const response2 = viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 2},
+          /* cancelUnsent */ true
+        );
 
         const delivererSpy = sandbox.stub();
-        delivererSpy.withArgs('event-a', {value: 2}, true)
-            .returns(Promise.resolve('result-2'));
-        delivererSpy.withArgs('event-a', {value: 3}, true)
-            .returns(Promise.resolve('result-3'));
+        delivererSpy
+          .withArgs('event-a', {value: 2}, true)
+          .returns(Promise.resolve('result-2'));
+        delivererSpy
+          .withArgs('event-a', {value: 3}, true)
+          .returns(Promise.resolve('result-3'));
         viewer.setMessageDeliverer(delivererSpy, 'https://www.example.com');
 
-        const response3 = viewer.sendMessageAwaitResponse('event-a', {value: 3},
-            /* cancelUnsent */true);
-        return expect(Promise.all([response1, response2, response3]))
-            .to.eventually.deep.equal(['result-2', 'result-2', 'result-3']);
+        const response3 = viewer.sendMessageAwaitResponse(
+          'event-a',
+          {value: 3},
+          /* cancelUnsent */ true
+        );
+        return expect(
+          Promise.all([response1, response2, response3])
+        ).to.eventually.deep.equal(['result-2', 'result-2', 'result-3']);
       });
     });
   });
@@ -961,16 +1038,14 @@ describe('Viewer', () => {
       expect(new Viewer(ampdoc).isCctEmbedded()).to.be.false;
     });
 
-    it('should NOT be CCT embedded if iframed regardless of "amp_gsa=1"',
-        () => {
-          windowApi.parent = {};
-          windowApi.location.search = '?amp_gsa=0&amp_js_v=a0';
-          expect(new Viewer(ampdoc).isCctEmbedded()).to.be.false;
-        });
+    it('should NOT be CCT embedded if iframed regardless of "amp_gsa=1"', () => {
+      windowApi.parent = {};
+      windowApi.location.search = '?amp_gsa=0&amp_js_v=a0';
+      expect(new Viewer(ampdoc).isCctEmbedded()).to.be.false;
+    });
   });
 
   describe('isTrustedViewer', () => {
-
     it('should consider non-trusted when not iframed', () => {
       windowApi.parent = windowApi;
       windowApi.location.ancestorOrigins = ['https://google.com'];
@@ -1139,7 +1214,6 @@ describe('Viewer', () => {
           expect(res).to.be.false;
         });
       });
-
     });
 
     describe('when in a fake webview (a bad actor iframe)', () => {
@@ -1245,29 +1319,86 @@ describe('Viewer', () => {
       testHasRoughlySameOrigin('https://google.com', 'https://google.com');
       testHasRoughlySameOrigin('https://www.google.com', 'https://google.com');
       testHasRoughlySameOrigin('https://www.google.net', 'https://google.net');
-      testHasRoughlySameOrigin('https://www.google.co.uk', 'https://google.co.uk');
-      testHasRoughlySameOrigin('https://www.google.co.uk:80', 'https://google.co.uk:80');
-      testHasRoughlySameOrigin('https://www.www.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://www.www.www.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('http://www.www.www.google.com:1337', 'http://google.com:1337');
+      testHasRoughlySameOrigin(
+        'https://www.google.co.uk',
+        'https://google.co.uk'
+      );
+      testHasRoughlySameOrigin(
+        'https://www.google.co.uk:80',
+        'https://google.co.uk:80'
+      );
+      testHasRoughlySameOrigin(
+        'https://www.www.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://www.www.www.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'http://www.www.www.google.com:1337',
+        'http://google.com:1337'
+      );
       testHasRoughlySameOrigin('https://amp.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://www.amp.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://amp.www.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://mobile.google.com', 'https://google.com');
+      testHasRoughlySameOrigin(
+        'https://www.amp.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://amp.www.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://mobile.google.com',
+        'https://google.com'
+      );
       testHasRoughlySameOrigin('https://m.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://amp.m.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://amp.mobile.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://amp.mobile.google.co.uk', 'https://google.co.uk');
-      testHasRoughlySameOrigin('https://www1.www2.www3.google.com', 'https://google.com');
-      testHasRoughlySameOrigin('https://www.xyz.google.com', 'https://xyz.google.com');
-      testHasRoughlySameOrigin('https://xyz.www.xyz.google.com', 'https://xyz.www.xyz.google.com');
+      testHasRoughlySameOrigin(
+        'https://amp.m.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://amp.mobile.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://amp.mobile.google.co.uk',
+        'https://google.co.uk'
+      );
+      testHasRoughlySameOrigin(
+        'https://www1.www2.www3.google.com',
+        'https://google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://www.xyz.google.com',
+        'https://xyz.google.com'
+      );
+      testHasRoughlySameOrigin(
+        'https://xyz.www.xyz.google.com',
+        'https://xyz.www.xyz.google.com'
+      );
       testHasRoughlyDifferentOrigin('http://google.com', 'https://google.com');
       testHasRoughlyDifferentOrigin('https://google.com', 'https://google.net');
-      testHasRoughlyDifferentOrigin('https://www.google.com', 'http://google.com');
-      testHasRoughlyDifferentOrigin('https://google.com:80', 'https://google.com:81');
-      testHasRoughlyDifferentOrigin('https://xyz.google.com', 'https://google.com');
-      testHasRoughlyDifferentOrigin('https://xyz.google.com', 'http://xyz.google.com');
-      testHasRoughlyDifferentOrigin('https://xyz.google.com:80', 'https://xyz.google.com:81');
+      testHasRoughlyDifferentOrigin(
+        'https://www.google.com',
+        'http://google.com'
+      );
+      testHasRoughlyDifferentOrigin(
+        'https://google.com:80',
+        'https://google.com:81'
+      );
+      testHasRoughlyDifferentOrigin(
+        'https://xyz.google.com',
+        'https://google.com'
+      );
+      testHasRoughlyDifferentOrigin(
+        'https://xyz.google.com',
+        'http://xyz.google.com'
+      );
+      testHasRoughlyDifferentOrigin(
+        'https://xyz.google.com:80',
+        'https://xyz.google.com:81'
+      );
     });
 
     /**
@@ -1309,16 +1440,15 @@ describe('Viewer', () => {
       test('http://google.com', false);
     });
 
-    describe('should NOT trust wrong or non-whitelisted domain variations',
-        () => {
-          test('https://google.net', false);
-          test('https://google.other.com', false);
-          test('https://www.google.other.com', false);
-          test('https://withgoogle.com', false);
-          test('https://acme.com', false);
-          test('https://google', false);
-          test('https://www.google', false);
-        });
+    describe('should NOT trust wrong or non-whitelisted domain variations', () => {
+      test('https://google.net', false);
+      test('https://google.other.com', false);
+      test('https://www.google.other.com', false);
+      test('https://withgoogle.com', false);
+      test('https://acme.com', false);
+      test('https://google', false);
+      test('https://www.google', false);
+    });
   });
 
   describe('referrer', () => {
@@ -1327,8 +1457,9 @@ describe('Viewer', () => {
       windowApi.location.hash = '#';
       windowApi.document.referrer = 'https://acme.org/docref';
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/docref');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/docref'
+      );
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/docref');
         expect(errorStub).to.have.not.been.called;
@@ -1337,12 +1468,13 @@ describe('Viewer', () => {
 
     it('should NOT allow override if not iframed', () => {
       windowApi.parent = windowApi;
-      windowApi.location.hash = '#referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#referrer=' + encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/docref');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/docref'
+      );
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/docref');
         expect(errorStub).to.have.not.been.called;
@@ -1351,13 +1483,15 @@ describe('Viewer', () => {
 
     it('should NOT allow override if not trusted', () => {
       windowApi.parent = {};
-      windowApi.location.hash = '#origin=g.com&referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&referrer=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       windowApi.location.ancestorOrigins = ['https://untrusted.com'];
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/docref');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/docref'
+      );
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/docref');
         expect(errorStub).to.have.not.been.called;
@@ -1366,13 +1500,15 @@ describe('Viewer', () => {
 
     it('should NOT allow override if ancestor is empty', () => {
       windowApi.parent = {};
-      windowApi.location.hash = '#origin=g.com&referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&referrer=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       windowApi.location.ancestorOrigins = [];
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/docref');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/docref'
+      );
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/docref');
         expect(errorStub).to.have.not.been.called;
@@ -1381,55 +1517,67 @@ describe('Viewer', () => {
 
     it('should allow partial override if async not trusted', () => {
       windowApi.parent = {};
-      windowApi.location.hash = '#origin=g.com&referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&referrer=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       const viewer = new Viewer(ampdoc);
       // Unconfirmed referrer is overriden, but not confirmed yet.
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/viewer');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/viewer'
+      );
       viewer.setMessageDeliverer(() => {}, 'https://untrusted.com');
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/docref');
         // Unconfirmed referrer is reset. Async error is thrown.
-        expect(viewer.getUnconfirmedReferrerUrl())
-            .to.equal('https://acme.org/docref');
+        expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+          'https://acme.org/docref'
+        );
         expect(expectedErrorStub).to.be.calledOnce;
-        expect(expectedErrorStub.calledWith('Viewer',
+        expect(
+          expectedErrorStub.calledWith(
+            'Viewer',
             sinon.match(arg => {
               return !!arg.match(/Untrusted viewer referrer override/);
-            }))).to.be.true;
+            })
+          )
+        ).to.be.true;
       });
     });
 
     it('should allow full override if async trusted', () => {
       windowApi.parent = {};
-      windowApi.location.hash = '#origin=g.com&referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&referrer=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       const viewer = new Viewer(ampdoc);
       // Unconfirmed referrer is overriden and will be confirmed next.
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/viewer');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/viewer'
+      );
       viewer.setMessageDeliverer(() => {}, 'https://google.com');
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/viewer');
         // Unconfirmed is confirmed and kept.
-        expect(viewer.getUnconfirmedReferrerUrl())
-            .to.equal('https://acme.org/viewer');
+        expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+          'https://acme.org/viewer'
+        );
         expect(errorStub).to.have.not.been.called;
       });
     });
 
     it('should allow override if iframed and trusted', () => {
       windowApi.parent = {};
-      windowApi.location.hash = '#origin=g.com&referrer=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&referrer=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.document.referrer = 'https://acme.org/docref';
       windowApi.location.ancestorOrigins = ['https://google.com'];
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('https://acme.org/viewer');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal(
+        'https://acme.org/viewer'
+      );
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('https://acme.org/viewer');
         expect(errorStub).to.have.not.been.called;
@@ -1442,8 +1590,7 @@ describe('Viewer', () => {
       windowApi.document.referrer = 'https://acme.org/docref';
       windowApi.location.ancestorOrigins = ['https://google.com'];
       const viewer = new Viewer(ampdoc);
-      expect(viewer.getUnconfirmedReferrerUrl())
-          .to.equal('');
+      expect(viewer.getUnconfirmedReferrerUrl()).to.equal('');
       return viewer.getReferrerUrl().then(referrerUrl => {
         expect(referrerUrl).to.equal('');
         expect(errorStub).to.have.not.been.called;
@@ -1452,7 +1599,6 @@ describe('Viewer', () => {
   });
 
   describe('viewerUrl', () => {
-
     it('should initially always return current location', () => {
       windowApi.location.href = 'https://acme.org/doc1#hash';
       const viewer = new Viewer(ampdoc);
@@ -1474,8 +1620,9 @@ describe('Viewer', () => {
     it('should NOT allow override if not iframed', () => {
       windowApi.parent = windowApi;
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
       return viewer.getViewerUrl().then(viewerUrl => {
@@ -1488,8 +1635,9 @@ describe('Viewer', () => {
     it('should NOT allow override if not trusted', () => {
       windowApi.parent = {};
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.location.ancestorOrigins = ['https://untrusted.com'];
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
@@ -1497,18 +1645,23 @@ describe('Viewer', () => {
         expect(viewerUrl).to.equal('https://acme.org/doc1');
         expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
         expect(expectedErrorStub).to.be.calledOnce;
-        expect(expectedErrorStub.calledWith('Viewer',
+        expect(
+          expectedErrorStub.calledWith(
+            'Viewer',
             sinon.match(arg => {
               return !!arg.match(/Untrusted viewer url override/);
-            }))).to.be.true;
+            })
+          )
+        ).to.be.true;
       });
     });
 
     it('should NOT allow override if ancestor is empty', () => {
       windowApi.parent = {};
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.location.ancestorOrigins = [];
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
@@ -1516,18 +1669,23 @@ describe('Viewer', () => {
         expect(viewerUrl).to.equal('https://acme.org/doc1');
         expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
         expect(expectedErrorStub).to.be.calledOnce;
-        expect(expectedErrorStub.calledWith('Viewer',
+        expect(
+          expectedErrorStub.calledWith(
+            'Viewer',
             sinon.match(arg => {
               return !!arg.match(/Untrusted viewer url override/);
-            }))).to.be.true;
+            })
+          )
+        ).to.be.true;
       });
     });
 
     it('should allow partial override if async not trusted', () => {
       windowApi.parent = {};
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
       viewer.setMessageDeliverer(() => {}, 'https://untrusted.com');
@@ -1535,25 +1693,31 @@ describe('Viewer', () => {
         expect(viewerUrl).to.equal('https://acme.org/doc1');
         expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
         expect(expectedErrorStub).to.be.calledOnce;
-        expect(expectedErrorStub.calledWith('Viewer',
+        expect(
+          expectedErrorStub.calledWith(
+            'Viewer',
             sinon.match(arg => {
               return !!arg.match(/Untrusted viewer url override/);
-            }))).to.be.true;
+            })
+          )
+        ).to.be.true;
       });
     });
 
     it('should allow full override if async trusted', () => {
       windowApi.parent = {};
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
       viewer.setMessageDeliverer(() => {}, 'https://google.com');
       return viewer.getViewerUrl().then(viewerUrl => {
         expect(viewerUrl).to.equal('https://acme.org/viewer');
-        expect(viewer.getResolvedViewerUrl())
-            .to.equal('https://acme.org/viewer');
+        expect(viewer.getResolvedViewerUrl()).to.equal(
+          'https://acme.org/viewer'
+        );
         expect(expectedErrorStub).to.have.not.been.called;
       });
     });
@@ -1561,15 +1725,17 @@ describe('Viewer', () => {
     it('should allow override if iframed and trusted', () => {
       windowApi.parent = {};
       windowApi.location.href = 'https://acme.org/doc1';
-      windowApi.location.hash = '#origin=g.com&viewerUrl=' +
-          encodeURIComponent('https://acme.org/viewer');
+      windowApi.location.hash =
+        '#origin=g.com&viewerUrl=' +
+        encodeURIComponent('https://acme.org/viewer');
       windowApi.location.ancestorOrigins = ['https://google.com'];
       const viewer = new Viewer(ampdoc);
       expect(viewer.getResolvedViewerUrl()).to.equal('https://acme.org/doc1');
       return viewer.getViewerUrl().then(viewerUrl => {
         expect(viewerUrl).to.equal('https://acme.org/viewer');
-        expect(viewer.getResolvedViewerUrl())
-            .to.equal('https://acme.org/viewer');
+        expect(viewer.getResolvedViewerUrl()).to.equal(
+          'https://acme.org/viewer'
+        );
         expect(expectedErrorStub).to.have.not.been.called;
       });
     });
@@ -1590,7 +1756,6 @@ describe('Viewer', () => {
   });
 
   describe('viewerOrigin', () => {
-
     it('should return empty string if origin is not known', () => {
       const viewer = new Viewer(ampdoc);
       return viewer.getViewerOrigin().then(viewerOrigin => {
diff --git a/test/unit/test-viewport-binding.js b/test/unit/test-viewport-binding.js
index d0a0ba856719..925f6f1cfa34 100644
--- a/test/unit/test-viewport-binding.js
+++ b/test/unit/test-viewport-binding.js
@@ -15,15 +15,9 @@
  */
 
 import {Services} from '../../src/services';
-import {
-  ViewportBindingIosEmbedShadowRoot_,
-} from '../../src/service/viewport/viewport-binding-ios-embed-sd';
-import {
-  ViewportBindingIosEmbedWrapper_,
-} from '../../src/service/viewport/viewport-binding-ios-embed-wrapper';
-import {
-  ViewportBindingNatural_,
-} from '../../src/service/viewport/viewport-binding-natural';
+import {ViewportBindingIosEmbedShadowRoot_} from '../../src/service/viewport/viewport-binding-ios-embed-sd';
+import {ViewportBindingIosEmbedWrapper_} from '../../src/service/viewport/viewport-binding-ios-embed-wrapper';
+import {ViewportBindingNatural_} from '../../src/service/viewport/viewport-binding-natural';
 import {installDocService} from '../../src/service/ampdoc-impl';
 import {installDocumentStateService} from '../../src/service/document-state';
 import {installPlatformService} from '../../src/service/platform-impl';
@@ -64,8 +58,9 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, env => {
   });
 
   it('should setup overflow:visible on body', () => {
-    expect(win.getComputedStyle(win.document.body).overflow)
-        .to.equal('visible');
+    expect(win.getComputedStyle(win.document.body).overflow).to.equal(
+      'visible'
+    );
   });
 
   it('should configure body as relative', () => {
@@ -113,11 +108,13 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, env => {
   });
 
   // TODO(zhouyx, #11827): Make this test work on Safari.
-  it.configure().skipSafari().run('should calculate size', () => {
-    const size = binding.getSize();
-    expect(size.width).to.equal(100);
-    expect(size.height).to.equal(200);
-  });
+  it.configure()
+    .skipSafari()
+    .run('should calculate size', () => {
+      const size = binding.getSize();
+      expect(size.width).to.equal(100);
+      expect(size.height).to.equal(200);
+    });
 
   it('should calculate scrollTop from scrollElement', () => {
     win.pageYOffset = 11;
@@ -162,7 +159,7 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, env => {
     win.pageYOffset = 11;
     win.document.scrollingElement.scrollTop = 17;
     binding.setScrollTop(21);
-    expect(win.document.scrollingElement./*OK*/scrollTop).to.equal(21);
+    expect(win.document.scrollingElement./*OK*/ scrollTop).to.equal(21);
   });
 
   it('should fallback scrollTop to pageYOffset', () => {
@@ -211,7 +208,8 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, env => {
     binding.disableScroll();
 
     expect(win.document.documentElement).to.have.class(
-        'i-amphtml-scroll-disabled');
+      'i-amphtml-scroll-disabled'
+    );
     htmlCss = win.getComputedStyle(win.document.documentElement);
     expect(htmlCss.overflowX).to.equal('hidden');
     expect(htmlCss.overflowY).to.equal('hidden');
@@ -219,7 +217,8 @@ describes.realWin('ViewportBindingNatural', {ampCss: true}, env => {
     binding.resetScroll();
 
     expect(win.document.documentElement).to.not.have.class(
-        'i-amphtml-scroll-disabled');
+      'i-amphtml-scroll-disabled'
+    );
     htmlCss = win.getComputedStyle(win.document.documentElement);
     expect(htmlCss.overflowX).to.equal('hidden');
     expect(htmlCss.overflowY).to.equal('auto');
@@ -266,18 +265,19 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
   });
 
   // TODO(#22220): Remove when "ios-fixed-no-transfer" experiment is cleaned up.
-  it('should require fixed layer transferring for later iOS w/o experiment',
-      () => {
-        sandbox.stub(Services.platformFor(win), 'getIosVersionString')
-            .callsFake(() => '12.2');
-        expect(binding.requiresFixedLayerTransfer()).to.be.true;
-      });
+  it('should require fixed layer transferring for later iOS w/o experiment', () => {
+    sandbox
+      .stub(Services.platformFor(win), 'getIosVersionString')
+      .callsFake(() => '12.2');
+    expect(binding.requiresFixedLayerTransfer()).to.be.true;
+  });
 
   it('should configure fixed layer transferring based on iOS version', () => {
     toggleExperiment(win, 'ios-fixed-no-transfer');
     let version;
-    sandbox.stub(Services.platformFor(win), 'getIosVersionString')
-        .callsFake(() => version);
+    sandbox
+      .stub(Services.platformFor(win), 'getIosVersionString')
+      .callsFake(() => version);
 
     // 12.1 is still out.
     version = '12.1';
@@ -298,8 +298,9 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
     const root = win.document.documentElement;
     expect(root).to.not.have.class('i-amphtml-ios-overscroll');
     expect(root.style.webkitOverflowScrolling).to.not.equal('touch');
-    expect(binding.wrapper_.style.webkitOverflowScrolling).to.not
-        .equal('touch');
+    expect(binding.wrapper_.style.webkitOverflowScrolling).to.not.equal(
+      'touch'
+    );
     return whenDocumentReady(win.document).then(() => {
       expect(root).to.have.class('i-amphtml-ios-overscroll');
     });
@@ -307,15 +308,13 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
 
   it('should have UI setup', () => {
     expect(binding.setupDone_).to.be.true;
-    expect(win.document.documentElement)
-        .to.have.class('i-amphtml-ios-embed');
+    expect(win.document.documentElement).to.have.class('i-amphtml-ios-embed');
     expect(win.document.body).to.exist;
-    expect(win.document.body.parentNode)
-        .to.not.equal(win.document.documentElement);
-    expect(win.document.body.parentNode)
-        .to.equal(binding.wrapper_);
-    expect(binding.wrapper_.parentNode)
-        .to.equal(win.document.documentElement);
+    expect(win.document.body.parentNode).to.not.equal(
+      win.document.documentElement
+    );
+    expect(win.document.body.parentNode).to.equal(binding.wrapper_);
+    expect(binding.wrapper_.parentNode).to.equal(win.document.documentElement);
     expect(binding.wrapper_.tagName).to.equal('HTML');
     expect(binding.wrapper_.id).to.equal('i-amphtml-wrapper');
     expect(win.document.body.contains(child)).to.be.true;
@@ -363,8 +362,9 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
     // `body` must have a 1px transparent border for two purposes:
     // (1) to cancel out margin collapse in body's children;
     // (2) to offset scroll adjustment to 1 to avoid scroll freeze problem.
-    expect(bodyCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent'))
-        .to.equal('1px solid transparent');
+    expect(
+      bodyCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent')
+    ).to.equal('1px solid transparent');
     expect(bodyCss.margin).to.equal('0px');
   });
 
@@ -377,10 +377,10 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
     // Note that scroll event is on the wrapper, and NOT on root or body.
     expect(win.eventListeners.count('scroll')).to.equal(0);
     expect(win.document.eventListeners.count('scroll')).to.equal(0);
-    expect(win.document.documentElement.eventListeners.count('scroll'))
-        .to.equal(0);
-    expect(win.document.body.eventListeners.count('scroll'))
-        .to.equal(0);
+    expect(
+      win.document.documentElement.eventListeners.count('scroll')
+    ).to.equal(0);
+    expect(win.document.body.eventListeners.count('scroll')).to.equal(0);
   });
 
   it('should disconnect events', () => {
@@ -397,11 +397,13 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
   });
 
   // TODO(zhouyx, #11827): Make this test work on Safari.
-  it.configure().skipSafari().run('should calculate size', () => {
-    const size = binding.getSize();
-    expect(size.width).to.equal(100);
-    expect(size.height).to.equal(100);
-  });
+  it.configure()
+    .skipSafari()
+    .run('should calculate size', () => {
+      const size = binding.getSize();
+      expect(size.width).to.equal(100);
+      expect(size.height).to.equal(100);
+    });
 
   it('should calculate scrollTop from wrapper', () => {
     binding.wrapper_.scrollTop = 17;
@@ -497,8 +499,7 @@ describes.realWin('ViewportBindingIosEmbedWrapper', {ampCss: true}, env => {
 
     binding.resetScroll();
 
-    expect(binding.wrapper_).to.not.have.class(
-        'i-amphtml-scroll-disabled');
+    expect(binding.wrapper_).to.not.have.class('i-amphtml-scroll-disabled');
     wrapperCss = win.getComputedStyle(binding.wrapper_);
     expect(wrapperCss.overflowX).to.equal('hidden');
     expect(wrapperCss.overflowY).to.equal('auto');
@@ -521,315 +522,329 @@ describes.realWin('ViewportBindingIosEmbedShadowRoot_', {ampCss: true}, env => {
   let child;
 
   // Can only test when Shadow DOM is available.
-  describe.configure().if(() => Element.prototype.attachShadow).run('Viewport' +
-      'BindingIosEmbedShadowRoot_', function() {
-    beforeEach(function() {
-      iframe = env.iframe;
-      iframe.style.width = '100px';
-      iframe.style.height = '100px';
-      win = env.win;
-      win.document.documentElement.className = 'top i-amphtml-singledoc';
-      child = win.document.createElement('div');
-      child.style.width = '200px';
-      child.style.height = '300px';
-      child.textContent = 'test';
-      win.document.body.appendChild(child);
-
-      const styleEl = win.document.createElement('style');
-      styleEl.textContent = `
+  describe
+    .configure()
+    .if(() => Element.prototype.attachShadow)
+    .run('ViewportBindingIosEmbedShadowRoot_', function() {
+      beforeEach(function() {
+        iframe = env.iframe;
+        iframe.style.width = '100px';
+        iframe.style.height = '100px';
+        win = env.win;
+        win.document.documentElement.className = 'top i-amphtml-singledoc';
+        child = win.document.createElement('div');
+        child.style.width = '200px';
+        child.style.height = '300px';
+        child.textContent = 'test';
+        win.document.body.appendChild(child);
+
+        const styleEl = win.document.createElement('style');
+        styleEl.textContent = `
           .flexed {display: flex}
           @media (min-width: 150px) {
             body {display: table}
           }
         `;
-      win.document.head.appendChild(styleEl);
-
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentStateService(win);
-      installVsyncService(win);
-      vsync = Services.vsyncFor(win);
-      binding = new ViewportBindingIosEmbedShadowRoot_(win);
-      binding.connect();
-    });
+        win.document.head.appendChild(styleEl);
+
+        installDocService(win, /* isSingleDoc */ true);
+        installDocumentStateService(win);
+        installVsyncService(win);
+        vsync = Services.vsyncFor(win);
+        binding = new ViewportBindingIosEmbedShadowRoot_(win);
+        binding.connect();
+      });
 
-    it('should NOT setup body min-height w/o experiment', () => {
-      const style = win.getComputedStyle(win.document.body);
-      expect(style.minHeight).to.equal('0px');
-    });
+      it('should NOT setup body min-height w/o experiment', () => {
+        const style = win.getComputedStyle(win.document.body);
+        expect(style.minHeight).to.equal('0px');
+      });
 
-    it('should NOT require fixed layer transferring', () => {
-      expect(binding.requiresFixedLayerTransfer()).to.be.false;
-    });
+      it('should NOT require fixed layer transferring', () => {
+        expect(binding.requiresFixedLayerTransfer()).to.be.false;
+      });
 
-    it('should require override of the global scrollTo', () => {
-      expect(binding.overrideGlobalScrollTo()).to.be.true;
-    });
+      it('should require override of the global scrollTo', () => {
+        expect(binding.overrideGlobalScrollTo()).to.be.true;
+      });
 
-    it('should start w/o overscroll and set it on doc ready', () => {
-      const root = binding.getScrollingElement();
-      expect(root).to.not.have.class('i-amphtml-ios-overscroll');
-      return whenDocumentReady(win.document).then(() => {
-        expect(root).to.have.class('i-amphtml-ios-overscroll');
+      it('should start w/o overscroll and set it on doc ready', () => {
+        const root = binding.getScrollingElement();
+        expect(root).to.not.have.class('i-amphtml-ios-overscroll');
+        return whenDocumentReady(win.document).then(() => {
+          expect(root).to.have.class('i-amphtml-ios-overscroll');
+        });
       });
-    });
 
-    it('should have UI setup', () => {
-      expect(binding.setupDone_).to.be.true;
-      expect(win.document.documentElement)
-          .to.have.class('i-amphtml-ios-embed-sd');
-      // Should preserve existing classes.
-      expect(win.document.documentElement).to.have.class('top');
-      expect(win.document.body).to.exist;
-      expect(win.document.body.parentNode)
-          .to.equal(win.document.documentElement);
-      expect(win.document.body.shadowRoot).to.exist;
-      expect(win.document.body.shadowRoot.firstElementChild)
-          .to.equal(binding.scroller_);
-      expect(binding.wrapper_.parentNode)
-          .to.equal(binding.scroller_);
-      expect(binding.wrapper_.firstElementChild.tagName)
-          .to.equal('SLOT');
-      expect(binding.wrapper_.tagName).to.equal('DIV');
-      expect(binding.wrapper_.id).to.equal('i-amphtml-body-wrapper');
-      expect(win.document.body.contains(child)).to.be.true;
-      expect(binding.wrapper_.contains(child)).to.be.false;
-      expect(win.document.contains(child)).to.be.true;
-      expect(child.textContent).to.equal('test');
-    });
+      it('should have UI setup', () => {
+        expect(binding.setupDone_).to.be.true;
+        expect(win.document.documentElement).to.have.class(
+          'i-amphtml-ios-embed-sd'
+        );
+        // Should preserve existing classes.
+        expect(win.document.documentElement).to.have.class('top');
+        expect(win.document.body).to.exist;
+        expect(win.document.body.parentNode).to.equal(
+          win.document.documentElement
+        );
+        expect(win.document.body.shadowRoot).to.exist;
+        expect(win.document.body.shadowRoot.firstElementChild).to.equal(
+          binding.scroller_
+        );
+        expect(binding.wrapper_.parentNode).to.equal(binding.scroller_);
+        expect(binding.wrapper_.firstElementChild.tagName).to.equal('SLOT');
+        expect(binding.wrapper_.tagName).to.equal('DIV');
+        expect(binding.wrapper_.id).to.equal('i-amphtml-body-wrapper');
+        expect(win.document.body.contains(child)).to.be.true;
+        expect(binding.wrapper_.contains(child)).to.be.false;
+        expect(win.document.contains(child)).to.be.true;
+        expect(child.textContent).to.equal('test');
+      });
 
-    it('should have CSS setup', () => {
-      const htmlCss = win.getComputedStyle(win.document.documentElement);
-      const scrollerCss = win.getComputedStyle(binding.scroller_);
-      const wrapperCss = win.getComputedStyle(binding.wrapper_);
-      const bodyCss = win.getComputedStyle(win.document.body);
-
-      // `<html>` must have `position: static` or layout is broken. It must
-      // not be scrollable.
-      expect(htmlCss.position).to.equal('static');
-      expect(htmlCss.overflowY).to.equal('hidden');
-      expect(htmlCss.overflowX).to.equal('hidden');
-
-      // Body takes full viewport and not scrollable.
-      expect(bodyCss.overflowY).to.equal('hidden');
-      expect(bodyCss.overflowX).to.equal('hidden');
-      expect(bodyCss.margin).to.equal('0px');
-      expect(bodyCss.position).to.equal('absolute');
-      expect(bodyCss.top).to.equal('0px');
-      expect(bodyCss.left).to.equal('0px');
-      expect(bodyCss.right).to.equal('0px');
-      expect(bodyCss.bottom).to.equal('0px');
-
-      // Scroller is full-viewport size and scrollable.
-      // Unfortunately, we can't test here `-webkit-overflow-scrolling`.
-      expect(scrollerCss.overflowY).to.equal('auto');
-      expect(scrollerCss.overflowX).to.equal('hidden');
-      expect(wrapperCss.overflowY).to.equal('visible');
-      expect(wrapperCss.overflowX).to.equal('visible');
-
-      // Scroller must be a block and positioned absolute at 0/0/0/0.
-      expect(scrollerCss.display).to.equal('block');
-      expect(scrollerCss.boxSizing).to.equal('border-box');
-      expect(scrollerCss.position).to.equal('absolute');
-      expect(scrollerCss.top).to.equal('0px');
-      expect(scrollerCss.left).to.equal('0px');
-      expect(scrollerCss.right).to.equal('0px');
-      expect(scrollerCss.bottom).to.equal('0px');
-      expect(scrollerCss.margin).to.equal('0px');
-      // Scroler must have a 1px transparent border for two purposes:
-      // (1) to cancel out margin collapse in body's children;
-      // (2) to offset scroll adjustment to 1 to avoid scroll freeze problem.
-      expect(scrollerCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent'))
-          .to.equal('1px solid transparent');
-
-      // Wrapper must additionally have `will-change: transform` to avoid iOS
-      // rendering bug where contents inside the `-webkit-overflow-scrolling`
-      // element would occasionally fail to paint. This bug appears to trigger
-      // more often when Shadow DOM is involved.
-      expect(wrapperCss.willChange).to.equal('transform');
-
-      // Preserve and inherit the customized body styles.
-      win.document.body.style.display = 'flex';
-      win.document.body.style.flexDirection = 'row';
-      win.document.body.style.alignItems = 'center';
-      return vsync.mutatePromise().then(() => {
-        expect(binding.wrapper_.style.display).to.equal('flex');
-        expect(binding.wrapper_.style.flexDirection).to.equal('row');
-        expect(binding.wrapper_.style.alignItems).to.equal('center');
+      it('should have CSS setup', () => {
+        const htmlCss = win.getComputedStyle(win.document.documentElement);
+        const scrollerCss = win.getComputedStyle(binding.scroller_);
+        const wrapperCss = win.getComputedStyle(binding.wrapper_);
+        const bodyCss = win.getComputedStyle(win.document.body);
+
+        // `<html>` must have `position: static` or layout is broken. It must
+        // not be scrollable.
+        expect(htmlCss.position).to.equal('static');
+        expect(htmlCss.overflowY).to.equal('hidden');
+        expect(htmlCss.overflowX).to.equal('hidden');
+
+        // Body takes full viewport and not scrollable.
+        expect(bodyCss.overflowY).to.equal('hidden');
+        expect(bodyCss.overflowX).to.equal('hidden');
+        expect(bodyCss.margin).to.equal('0px');
+        expect(bodyCss.position).to.equal('absolute');
+        expect(bodyCss.top).to.equal('0px');
+        expect(bodyCss.left).to.equal('0px');
+        expect(bodyCss.right).to.equal('0px');
+        expect(bodyCss.bottom).to.equal('0px');
+
+        // Scroller is full-viewport size and scrollable.
+        // Unfortunately, we can't test here `-webkit-overflow-scrolling`.
+        expect(scrollerCss.overflowY).to.equal('auto');
+        expect(scrollerCss.overflowX).to.equal('hidden');
+        expect(wrapperCss.overflowY).to.equal('visible');
+        expect(wrapperCss.overflowX).to.equal('visible');
+
+        // Scroller must be a block and positioned absolute at 0/0/0/0.
+        expect(scrollerCss.display).to.equal('block');
+        expect(scrollerCss.boxSizing).to.equal('border-box');
+        expect(scrollerCss.position).to.equal('absolute');
+        expect(scrollerCss.top).to.equal('0px');
+        expect(scrollerCss.left).to.equal('0px');
+        expect(scrollerCss.right).to.equal('0px');
+        expect(scrollerCss.bottom).to.equal('0px');
+        expect(scrollerCss.margin).to.equal('0px');
+        // Scroler must have a 1px transparent border for two purposes:
+        // (1) to cancel out margin collapse in body's children;
+        // (2) to offset scroll adjustment to 1 to avoid scroll freeze problem.
+        expect(
+          scrollerCss.borderTop.replace('rgba(0, 0, 0, 0)', 'transparent')
+        ).to.equal('1px solid transparent');
+
+        // Wrapper must additionally have `will-change: transform` to avoid iOS
+        // rendering bug where contents inside the `-webkit-overflow-scrolling`
+        // element would occasionally fail to paint. This bug appears to trigger
+        // more often when Shadow DOM is involved.
+        expect(wrapperCss.willChange).to.equal('transform');
+
+        // Preserve and inherit the customized body styles.
+        win.document.body.style.display = 'flex';
+        win.document.body.style.flexDirection = 'row';
+        win.document.body.style.alignItems = 'center';
+        return vsync.mutatePromise().then(() => {
+          expect(binding.wrapper_.style.display).to.equal('flex');
+          expect(binding.wrapper_.style.flexDirection).to.equal('row');
+          expect(binding.wrapper_.style.alignItems).to.equal('center');
+        });
       });
-    });
 
-    it('should update body styles on class changes', () => {
-      // Body styles are moved to the wrapper.
-      return vsync.mutatePromise().then(() => {
-        expect(binding.wrapper_.style.display).to.equal('block');
-        win.document.body.classList.add('flexed');
-        return vsync.mutatePromise();
-      }).then(() => {
-        expect(binding.wrapper_.style.display).to.equal('flex');
+      it('should update body styles on class changes', () => {
+        // Body styles are moved to the wrapper.
+        return vsync
+          .mutatePromise()
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('block');
+            win.document.body.classList.add('flexed');
+            return vsync.mutatePromise();
+          })
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('flex');
+          });
       });
-    });
 
-    it('should update body styles on style changes', () => {
-      // Body styles are moved to the wrapper.
-      return vsync.mutatePromise().then(() => {
-        expect(binding.wrapper_.style.display).to.equal('block');
-        win.document.body.style.display = 'table';
-        return vsync.mutatePromise();
-      }).then(() => {
-        expect(binding.wrapper_.style.display).to.equal('table');
+      it('should update body styles on style changes', () => {
+        // Body styles are moved to the wrapper.
+        return vsync
+          .mutatePromise()
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('block');
+            win.document.body.style.display = 'table';
+            return vsync.mutatePromise();
+          })
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('table');
+          });
       });
-    });
 
-    it('should update body styles on resize', () => {
-      // Body styles are moved to the wrapper.
-      return vsync.mutatePromise().then(() => {
-        expect(binding.wrapper_.style.display).to.equal('block');
-        return new Promise(resolve => {
-          binding.onResize(resolve);
-          iframe.style.width = '200px';
-        });
-      }).then(() => {
-        return vsync.mutatePromise();
-      }).then(() => {
-        expect(binding.wrapper_.style.display).to.equal('table');
+      it('should update body styles on resize', () => {
+        // Body styles are moved to the wrapper.
+        return vsync
+          .mutatePromise()
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('block');
+            return new Promise(resolve => {
+              binding.onResize(resolve);
+              iframe.style.width = '200px';
+            });
+          })
+          .then(() => {
+            return vsync.mutatePromise();
+          })
+          .then(() => {
+            expect(binding.wrapper_.style.display).to.equal('table');
+          });
       });
-    });
 
-    it('should be immediately scrolled to 1 to avoid freeze', () => {
-      expect(binding.scroller_.scrollTop).to.equal(1);
-    });
+      it('should be immediately scrolled to 1 to avoid freeze', () => {
+        expect(binding.scroller_.scrollTop).to.equal(1);
+      });
 
-    it('should connect events: subscribe to scroll and resize events', () => {
-      expect(win.eventListeners.count('resize')).to.equal(1);
-      // Note that scroll event is on the wrapper, and NOT on root or body.
-      expect(win.eventListeners.count('scroll')).to.equal(0);
-      expect(win.document.eventListeners.count('scroll')).to.equal(0);
-      expect(win.document.documentElement.eventListeners.count('scroll'))
-          .to.equal(0);
-      expect(win.document.body.eventListeners.count('scroll'))
-          .to.equal(0);
-    });
+      it('should connect events: subscribe to scroll and resize events', () => {
+        expect(win.eventListeners.count('resize')).to.equal(1);
+        // Note that scroll event is on the wrapper, and NOT on root or body.
+        expect(win.eventListeners.count('scroll')).to.equal(0);
+        expect(win.document.eventListeners.count('scroll')).to.equal(0);
+        expect(
+          win.document.documentElement.eventListeners.count('scroll')
+        ).to.equal(0);
+        expect(win.document.body.eventListeners.count('scroll')).to.equal(0);
+      });
 
-    it('should disconnect events', () => {
-      // After disconnect, there are no more listeners on window.
-      binding.disconnect();
-      expect(win.eventListeners.count('resize')).to.equal(0);
-    });
+      it('should disconnect events', () => {
+        // After disconnect, there are no more listeners on window.
+        binding.disconnect();
+        expect(win.eventListeners.count('resize')).to.equal(0);
+      });
 
-    it('should update padding', () => {
-      binding.updatePaddingTop(31);
-      expect(binding.scroller_.style.paddingTop).to.equal('31px');
-      // Notice, root is not touched.
-      expect(win.document.documentElement.style.paddingTop).to.equal('');
-    });
+      it('should update padding', () => {
+        binding.updatePaddingTop(31);
+        expect(binding.scroller_.style.paddingTop).to.equal('31px');
+        // Notice, root is not touched.
+        expect(win.document.documentElement.style.paddingTop).to.equal('');
+      });
 
-    it('should calculate scrollTop from scroller', () => {
-      binding.scroller_.scrollTop = 17;
-      expect(binding.getScrollTop()).to.equal(17);
-    });
+      it('should calculate scrollTop from scroller', () => {
+        binding.scroller_.scrollTop = 17;
+        expect(binding.getScrollTop()).to.equal(17);
+      });
 
-    it('should calculate scrollWidth from scroller', () => {
-      expect(binding.getScrollWidth()).to.equal(200);
-    });
+      it('should calculate scrollWidth from scroller', () => {
+        expect(binding.getScrollWidth()).to.equal(200);
+      });
 
-    it('should calculate scrollHeight from scroller', () => {
-      expect(binding.getScrollHeight()).to.equal(300);
-    });
+      it('should calculate scrollHeight from scroller', () => {
+        expect(binding.getScrollHeight()).to.equal(300);
+      });
 
-    it('should calculate contentHeight from body height', () => {
-      // Set content to be smaller than viewport.
-      child.style.height = '50px';
-      expect(binding.getContentHeight()).to.equal(51);
-    });
+      it('should calculate contentHeight from body height', () => {
+        // Set content to be smaller than viewport.
+        child.style.height = '50px';
+        expect(binding.getContentHeight()).to.equal(51);
+      });
 
-    it('should include padding top in contentHeight', () => {
-      binding.updatePaddingTop(10);
-      binding.setScrollTop(20); // should have no effect on height
-      expect(binding.getContentHeight()).to.equal(311); // +1px for border-top.
-    });
+      it('should include padding top in contentHeight', () => {
+        binding.updatePaddingTop(10);
+        binding.setScrollTop(20); // should have no effect on height
+        expect(binding.getContentHeight()).to.equal(311); // +1px for border-top.
+      });
 
-    it('should account for child margin-top', () => {
-      child.style.marginTop = '15px';
-      expect(binding.getContentHeight()).to.equal(316); // +1px for border-top.
-    });
+      it('should account for child margin-top', () => {
+        child.style.marginTop = '15px';
+        expect(binding.getContentHeight()).to.equal(316); // +1px for border-top.
+      });
 
-    it('should update scrollTop on scroller', () => {
-      binding.setScrollTop(21);
-      expect(binding.scroller_.scrollTop).to.equal(21);
-    });
+      it('should update scrollTop on scroller', () => {
+        binding.setScrollTop(21);
+        expect(binding.scroller_.scrollTop).to.equal(21);
+      });
 
-    it('should adjust scrollTop to avoid scroll freeze', () => {
-      binding.setScrollTop(21);
-      expect(binding.scroller_.scrollTop).to.equal(21);
+      it('should adjust scrollTop to avoid scroll freeze', () => {
+        binding.setScrollTop(21);
+        expect(binding.scroller_.scrollTop).to.equal(21);
 
-      // `scrollTop=0` is normally not allowed.
-      binding.setScrollTop(0);
-      expect(binding.scroller_.scrollTop).to.equal(1);
-    });
+        // `scrollTop=0` is normally not allowed.
+        binding.setScrollTop(0);
+        expect(binding.scroller_.scrollTop).to.equal(1);
+      });
 
-    it('should offset client rect for layout', () => {
-      binding.scroller_.scrollTop = 200;
-      const el = {
-        getBoundingClientRect: () => {
-          return {left: 11.5, top: 12.5, width: 13.5, height: 14.5};
-        },
-      };
-      const rect = binding.getLayoutRect(el);
-      expect(rect.top).to.equal(213); // round(200 + 12.5)
-      expect(rect.width).to.equal(14); // round(13.5)
-      expect(rect.height).to.equal(15); // round(14.5)
-    });
+      it('should offset client rect for layout', () => {
+        binding.scroller_.scrollTop = 200;
+        const el = {
+          getBoundingClientRect: () => {
+            return {left: 11.5, top: 12.5, width: 13.5, height: 14.5};
+          },
+        };
+        const rect = binding.getLayoutRect(el);
+        expect(rect.top).to.equal(213); // round(200 + 12.5)
+        expect(rect.width).to.equal(14); // round(13.5)
+        expect(rect.height).to.equal(15); // round(14.5)
+      });
 
-    it('should offset client rect for layout and position passed in', () => {
-      binding.scroller_.scrollTop = 10;
-      const el = {
-        getBoundingClientRect: () => {
-          return {left: 11.5, top: 12.5, width: 13.5, height: 14.5};
-        },
-      };
-      const rect = binding.getLayoutRect(el, 100, 200);
-      expect(rect.left).to.equal(112); // round(100 + 11.5)
-      expect(rect.top).to.equal(213); // round(200 + 12.5)
-      expect(rect.width).to.equal(14); // round(13.5)
-      expect(rect.height).to.equal(15); // round(14.5)
-    });
+      it('should offset client rect for layout and position passed in', () => {
+        binding.scroller_.scrollTop = 10;
+        const el = {
+          getBoundingClientRect: () => {
+            return {left: 11.5, top: 12.5, width: 13.5, height: 14.5};
+          },
+        };
+        const rect = binding.getLayoutRect(el, 100, 200);
+        expect(rect.left).to.equal(112); // round(100 + 11.5)
+        expect(rect.top).to.equal(213); // round(200 + 12.5)
+        expect(rect.width).to.equal(14); // round(13.5)
+        expect(rect.height).to.equal(15); // round(14.5)
+      });
 
-    it('should call scroll event', () => {
-      binding.scroller_.scrollTop = 1;
-      return new Promise(resolve => {
-        binding.onScroll(resolve);
-        binding.scroller_.scrollTop = 11;
-      }).then(() => {
-        expect(binding.getScrollTop()).to.equal(11);
+      it('should call scroll event', () => {
+        binding.scroller_.scrollTop = 1;
+        return new Promise(resolve => {
+          binding.onScroll(resolve);
+          binding.scroller_.scrollTop = 11;
+        }).then(() => {
+          expect(binding.getScrollTop()).to.equal(11);
+        });
       });
-    });
 
-    it('should disable scroll temporarily and reset scroll', () => {
-      let scrollerCss = win.getComputedStyle(binding.scroller_);
-      expect(scrollerCss.overflowX).to.equal('hidden');
-      expect(scrollerCss.overflowY).to.equal('auto');
+      it('should disable scroll temporarily and reset scroll', () => {
+        let scrollerCss = win.getComputedStyle(binding.scroller_);
+        expect(scrollerCss.overflowX).to.equal('hidden');
+        expect(scrollerCss.overflowY).to.equal('auto');
 
-      binding.disableScroll();
+        binding.disableScroll();
 
-      scrollerCss = win.getComputedStyle(binding.scroller_);
-      expect(scrollerCss.overflowX).to.equal('hidden');
-      expect(scrollerCss.overflowY).to.equal('hidden');
+        scrollerCss = win.getComputedStyle(binding.scroller_);
+        expect(scrollerCss.overflowX).to.equal('hidden');
+        expect(scrollerCss.overflowY).to.equal('hidden');
 
-      binding.resetScroll();
+        binding.resetScroll();
 
-      scrollerCss = win.getComputedStyle(binding.scroller_);
-      expect(scrollerCss.overflowX).to.equal('hidden');
-      expect(scrollerCss.overflowY).to.equal('auto');
-    });
+        scrollerCss = win.getComputedStyle(binding.scroller_);
+        expect(scrollerCss.overflowX).to.equal('hidden');
+        expect(scrollerCss.overflowY).to.equal('auto');
+      });
 
-    it('should NOT refresh overscroll w/o experiment', () => {
-      const scroller = binding.scroller_;
-      const setStyleStub = sandbox.stub(scroller.style, 'setProperty');
-      binding.contentHeightChanged();
-      return vsync.mutatePromise().then(() => {
-        const {args} = setStyleStub.lastCall;
-        expect(args[1]).to.not.equal('auto');
+      it('should NOT refresh overscroll w/o experiment', () => {
+        const scroller = binding.scroller_;
+        const setStyleStub = sandbox.stub(scroller.style, 'setProperty');
+        binding.contentHeightChanged();
+        return vsync.mutatePromise().then(() => {
+          const {args} = setStyleStub.lastCall;
+          expect(args[1]).to.not.equal('auto');
+        });
       });
     });
-  });
 });
diff --git a/test/unit/test-viewport.js b/test/unit/test-viewport.js
index 128d03a9e96d..684a40f0b1f8 100644
--- a/test/unit/test-viewport.js
+++ b/test/unit/test-viewport.js
@@ -23,19 +23,11 @@ import {
   stringifyViewportMeta,
   updateViewportMetaString,
 } from '../../src/service/viewport/viewport-impl';
-import {
-  ViewportBindingDef,
-} from '../../src/service/viewport/viewport-binding-def';
-import {
-  ViewportBindingIosEmbedShadowRoot_,
-} from '../../src/service/viewport/viewport-binding-ios-embed-sd';
-import {
-  ViewportBindingIosEmbedWrapper_,
-} from '../../src/service/viewport/viewport-binding-ios-embed-wrapper';
+import {ViewportBindingDef} from '../../src/service/viewport/viewport-binding-def';
+import {ViewportBindingIosEmbedShadowRoot_} from '../../src/service/viewport/viewport-binding-ios-embed-sd';
+import {ViewportBindingIosEmbedWrapper_} from '../../src/service/viewport/viewport-binding-ios-embed-wrapper';
 
-import {
-  ViewportBindingNatural_,
-} from '../../src/service/viewport/viewport-binding-natural';
+import {ViewportBindingNatural_} from '../../src/service/viewport/viewport-binding-natural';
 import {dev} from '../../src/log';
 import {getMode} from '../../src/mode';
 import {installDocumentStateService} from '../../src/service/document-state';
@@ -48,10 +40,8 @@ import {loadPromise} from '../../src/event-helper';
 import {setParentWindow} from '../../src/service';
 import {toggleExperiment} from '../../src/experiments';
 
-
 const NOOP = () => {};
 
-
 describes.fakeWin('Viewport', {}, env => {
   let clock;
   let viewport;
@@ -97,7 +87,7 @@ describes.fakeWin('Viewport', {}, env => {
       },
       sendMessage: sandbox.spy(),
       getVisibilityState: () => visibilityState,
-      isVisible: () => (visibilityState == 'visible'),
+      isVisible: () => visibilityState == 'visible',
       onVisibilityChanged: () => {},
     };
     viewerMock = sandbox.mock(viewer);
@@ -119,7 +109,7 @@ describes.fakeWin('Viewport', {}, env => {
     binding.connect = sandbox.spy();
     binding.disconnect = sandbox.spy();
     updatedPaddingTop = undefined;
-    binding.updatePaddingTop = paddingTop => updatedPaddingTop = paddingTop;
+    binding.updatePaddingTop = paddingTop => (updatedPaddingTop = paddingTop);
     viewport = new Viewport(ampdoc, binding, viewer);
     viewport.fixedLayer_ = {
       enterLightbox: () => {},
@@ -135,12 +125,13 @@ describes.fakeWin('Viewport', {}, env => {
     const vsync = Services.vsyncFor(window);
     vsyncTasks = [];
     sandbox.stub(vsync, 'canAnimate').returns(true);
-    sandbox.stub(vsync, 'createAnimTask').callsFake(
-        (unusedContextNode, task) => {
-          return () => {
-            vsyncTasks.push(task);
-          };
-        });
+    sandbox
+      .stub(vsync, 'createAnimTask')
+      .callsFake((unusedContextNode, task) => {
+        return () => {
+          vsyncTasks.push(task);
+        };
+      });
   });
 
   afterEach(() => {
@@ -161,8 +152,9 @@ describes.fakeWin('Viewport', {}, env => {
   }
 
   function stubVsyncMeasure() {
-    sandbox.stub(viewport.vsync_, 'measurePromise').callsFake(cb =>
-      Promise.resolve(cb()));
+    sandbox
+      .stub(viewport.vsync_, 'measurePromise')
+      .callsFake(cb => Promise.resolve(cb()));
   }
 
   describe('top-level classes', () => {
@@ -209,31 +201,34 @@ describes.fakeWin('Viewport', {}, env => {
     });
 
     describe('experiments', () => {
-
       afterEach(() => {
         toggleExperiment(windowApi, 'inabox-remove-height-auto', false);
       });
 
-      it('should set ' +
-        '.i-amphtml-inabox-preserve-height-auto ' +
-        'without an experiment', () => {
-        ampdoc.win.parent = {};
-        new Viewport(ampdoc, binding, viewer);
-        expect(root).to.have.class(
-            'i-amphtml-inabox-preserve-height-auto'
-        );
-      });
-
-      it('should NOT set ' +
-        '.i-amphtml-inabox-preserve-height-auto ' +
-        'with the experiment', () => {
-        toggleExperiment(windowApi, 'inabox-remove-height-auto', true);
-        ampdoc.win.parent = {};
-        new Viewport(ampdoc, binding, viewer);
-        expect(root).to.not.have.class(
+      it(
+        'should set ' +
+          '.i-amphtml-inabox-preserve-height-auto ' +
+          'without an experiment',
+        () => {
+          ampdoc.win.parent = {};
+          new Viewport(ampdoc, binding, viewer);
+          expect(root).to.have.class('i-amphtml-inabox-preserve-height-auto');
+        }
+      );
+
+      it(
+        'should NOT set ' +
+          '.i-amphtml-inabox-preserve-height-auto ' +
+          'with the experiment',
+        () => {
+          toggleExperiment(windowApi, 'inabox-remove-height-auto', true);
+          ampdoc.win.parent = {};
+          new Viewport(ampdoc, binding, viewer);
+          expect(root).to.not.have.class(
             'i-amphtml-inabox-preserve-height-auto'
-        );
-      });
+          );
+        }
+      );
     });
 
     describe('ios-webview', () => {
@@ -297,7 +292,9 @@ describes.fakeWin('Viewport', {}, env => {
       expect(viewport.getSize().height).to.equal(222);
       expect(errorStub).to.be.calledOnce;
       expect(errorStub).to.be.calledWith(
-          'Viewport', 'viewport has zero dimensions');
+        'Viewport',
+        'viewport has zero dimensions'
+      );
     });
 
     it('should report zero height', () => {
@@ -308,7 +305,9 @@ describes.fakeWin('Viewport', {}, env => {
       expect(viewport.getSize().height).to.equal(0);
       expect(errorStub).to.be.calledOnce;
       expect(errorStub).to.be.calledWith(
-          'Viewport', 'viewport has zero dimensions');
+        'Viewport',
+        'viewport has zero dimensions'
+      );
     });
 
     it('should report both zero width and height', () => {
@@ -319,7 +318,9 @@ describes.fakeWin('Viewport', {}, env => {
       expect(viewport.getSize().height).to.equal(0);
       expect(errorStub).to.be.calledOnce;
       expect(errorStub).to.be.calledWith(
-          'Viewport', 'viewport has zero dimensions');
+        'Viewport',
+        'viewport has zero dimensions'
+      );
     });
 
     it('should report only 1% of the time', () => {
@@ -341,7 +342,9 @@ describes.fakeWin('Viewport', {}, env => {
       expect(viewport.getSize().height).to.equal(0);
       expect(errorStub).to.be.calledOnce;
       expect(errorStub).to.be.calledWith(
-          'Viewport', 'viewport has zero dimensions');
+        'Viewport',
+        'viewport has zero dimensions'
+      );
     });
 
     it('should NOT report in hidden state', () => {
@@ -380,7 +383,7 @@ describes.fakeWin('Viewport', {}, env => {
     binding.disconnect = sandbox.spy();
     viewer.isVisible = () => false;
     let onVisibilityHandler;
-    viewer.onVisibilityChanged = handler => onVisibilityHandler = handler;
+    viewer.onVisibilityChanged = handler => (onVisibilityHandler = handler);
     viewport = new Viewport(ampdoc, binding, viewer);
 
     // Hasn't been called at first.
@@ -411,7 +414,7 @@ describes.fakeWin('Viewport', {}, env => {
     binding.disconnect = sandbox.spy();
     viewer.isVisible = () => true;
     let onVisibilityHandler;
-    viewer.onVisibilityChanged = handler => onVisibilityHandler = handler;
+    viewer.onVisibilityChanged = handler => (onVisibilityHandler = handler);
     viewport = new Viewport(ampdoc, binding, viewer);
 
     // Size has not be initialized yet.
@@ -501,7 +504,7 @@ describes.fakeWin('Viewport', {}, env => {
       changeEvent = event;
     });
     let fixedResolver;
-    const fixedPromise = new Promise(resolve => fixedResolver = resolve);
+    const fixedPromise = new Promise(resolve => (fixedResolver = resolve));
     viewport.fixedLayer_ = {update: () => fixedPromise};
     viewportSize.width = 112;
     viewport.resize_();
@@ -561,9 +564,10 @@ describes.fakeWin('Viewport', {}, env => {
   it('should update non-transient padding', () => {
     const bindingMock = sandbox.mock(binding);
     const fixedLayerMock = sandbox.mock(viewport.fixedLayer_);
-    fixedLayerMock.expects('updatePaddingTop')
-        .withExactArgs(/* paddingTop */ 0, /* transient */ undefined)
-        .once();
+    fixedLayerMock
+      .expects('updatePaddingTop')
+      .withExactArgs(/* paddingTop */ 0, /* transient */ undefined)
+      .once();
     viewerViewportHandler({paddingTop: 0});
     bindingMock.verify();
     fixedLayerMock.verify();
@@ -572,25 +576,43 @@ describes.fakeWin('Viewport', {}, env => {
   it('should update padding when viewer wants to hide header', () => {
     const bindingMock = sandbox.mock(binding);
     const fixedLayerMock = sandbox.mock(viewport.fixedLayer_);
-    fixedLayerMock.expects('updatePaddingTop')
-        .withExactArgs(/* paddingTop */ 0, /* transient */ true)
-        .once();
-    bindingMock.expects('hideViewerHeader').withArgs(true, 19).once();
-    viewerViewportHandler({paddingTop: 0, duation: 300, curve: 'ease-in',
-      transient: true});
+    fixedLayerMock
+      .expects('updatePaddingTop')
+      .withExactArgs(/* paddingTop */ 0, /* transient */ true)
+      .once();
+    bindingMock
+      .expects('hideViewerHeader')
+      .withArgs(true, 19)
+      .once();
+    viewerViewportHandler({
+      paddingTop: 0,
+      duation: 300,
+      curve: 'ease-in',
+      transient: true,
+    });
     bindingMock.verify();
     fixedLayerMock.verify();
   });
 
-  it('should update padding for fixed layer when viewer wants to ' +
-      'hide header', () => {
-    viewport.fixedLayer_ = {updatePaddingTop: () => {}};
-    const fixedLayerMock = sandbox.mock(viewport.fixedLayer_);
-    fixedLayerMock.expects('updatePaddingTop').withArgs(0).once();
-    viewerViewportHandler({paddingTop: 0, duation: 300, curve: 'ease-in',
-      transient: 'true'});
-    fixedLayerMock.verify();
-  });
+  it(
+    'should update padding for fixed layer when viewer wants to ' +
+      'hide header',
+    () => {
+      viewport.fixedLayer_ = {updatePaddingTop: () => {}};
+      const fixedLayerMock = sandbox.mock(viewport.fixedLayer_);
+      fixedLayerMock
+        .expects('updatePaddingTop')
+        .withArgs(0)
+        .once();
+      viewerViewportHandler({
+        paddingTop: 0,
+        duation: 300,
+        curve: 'ease-in',
+        transient: 'true',
+      });
+      fixedLayerMock.verify();
+    }
+  );
 
   it('should update viewport when entering lightbox mode', () => {
     const requestingEl = document.createElement('div');
@@ -600,7 +622,10 @@ describes.fakeWin('Viewport', {}, env => {
     sandbox.stub(viewport, 'maybeEnterFieLightboxMode').callsFake(NOOP);
     sandbox.stub(viewport.fixedLayer_, 'enterLightbox');
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('updateLightboxMode').withArgs(true).once();
+    bindingMock
+      .expects('updateLightboxMode')
+      .withArgs(true)
+      .once();
 
     viewport.enterLightboxMode(requestingEl);
 
@@ -610,8 +635,11 @@ describes.fakeWin('Viewport', {}, env => {
     expect(viewport.fixedLayer_.enterLightbox).to.be.calledOnce;
 
     expect(viewer.sendMessage).to.have.been.calledOnce;
-    expect(viewer.sendMessage).to.have.been.calledWith('requestFullOverlay',
-        {}, true);
+    expect(viewer.sendMessage).to.have.been.calledWith(
+      'requestFullOverlay',
+      {},
+      true
+    );
   });
 
   it('should update viewport when leaving lightbox mode', () => {
@@ -622,7 +650,10 @@ describes.fakeWin('Viewport', {}, env => {
     sandbox.stub(viewport, 'maybeLeaveFieLightboxMode').callsFake(NOOP);
     sandbox.stub(viewport.fixedLayer_, 'leaveLightbox');
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('updateLightboxMode').withArgs(false).once();
+    bindingMock
+      .expects('updateLightboxMode')
+      .withArgs(false)
+      .once();
 
     viewport.leaveLightboxMode(requestingEl);
 
@@ -632,8 +663,11 @@ describes.fakeWin('Viewport', {}, env => {
     expect(viewport.fixedLayer_.leaveLightbox).to.be.calledOnce;
 
     expect(viewer.sendMessage).to.have.been.calledOnce;
-    expect(viewer.sendMessage).to.have.been.calledWith('cancelFullOverlay',
-        {}, true);
+    expect(viewer.sendMessage).to.have.been.calledWith(
+      'cancelFullOverlay',
+      {},
+      true
+    );
   });
 
   it('should enter full overlay on FIE when entering lightbox mode', () => {
@@ -681,8 +715,10 @@ describes.fakeWin('Viewport', {}, env => {
   });
 
   it('should update viewport when leaving overlay mode', () => {
-    const restoreOriginalTouchZoomStub = sandbox.stub(viewport,
-        'restoreOriginalTouchZoom');
+    const restoreOriginalTouchZoomStub = sandbox.stub(
+      viewport,
+      'restoreOriginalTouchZoom'
+    );
     const resetScrollStub = sandbox.stub(viewport, 'resetScroll');
 
     viewport.leaveOverlayMode();
@@ -828,12 +864,15 @@ describes.fakeWin('Viewport', {}, env => {
 
   it('should update scroll pos and reset cache', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('setScrollTop').withArgs(117).once();
+    bindingMock
+      .expects('setScrollTop')
+      .withArgs(117)
+      .once();
     viewport.setScrollTop(117);
-    expect(viewport./*OK*/scrollTop_).to.be.null;
+    expect(viewport./*OK*/ scrollTop_).to.be.null;
   });
 
-  it('scrolls with scrollIntoView respecting padding', function* () {
+  it('scrolls with scrollIntoView respecting padding', function*() {
     const element = document.createElement('div');
 
     // scrollIntoView traverses up the DOM tree, so it needs the node to
@@ -842,20 +881,23 @@ describes.fakeWin('Viewport', {}, env => {
 
     const bindingMock = sandbox.mock(binding);
 
-    bindingMock.expects('getScrollingElement')
-        .returns(document.body)
-        .atLeast(1);
+    bindingMock
+      .expects('getScrollingElement')
+      .returns(document.body)
+      .atLeast(1);
 
     const top = 111;
 
-    bindingMock.expects('getLayoutRect')
-        .withArgs(element)
-        .returns({top})
-        .once();
+    bindingMock
+      .expects('getLayoutRect')
+      .withArgs(element)
+      .returns({top})
+      .once();
 
-    bindingMock.expects('setScrollTop')
-        .withArgs(top - /* padding */ 19)
-        .once();
+    bindingMock
+      .expects('setScrollTop')
+      .withArgs(top - /* padding */ 19)
+      .once();
 
     stubVsyncMeasure();
 
@@ -864,7 +906,7 @@ describes.fakeWin('Viewport', {}, env => {
     bindingMock.verify();
   });
 
-  it('scrolls with animateScrollIntoView respecting padding', async() => {
+  it('scrolls with animateScrollIntoView respecting padding', async () => {
     const element = document.createElement('div');
 
     // animateScrollIntoView traverses up the DOM tree, so it needs the node to
@@ -873,19 +915,23 @@ describes.fakeWin('Viewport', {}, env => {
 
     const bindingMock = sandbox.mock(binding);
 
-    bindingMock.expects('getScrollingElement')
-        .returns(document.body)
-        .atLeast(1);
+    bindingMock
+      .expects('getScrollingElement')
+      .returns(document.body)
+      .atLeast(1);
 
     const top = 111;
 
-    bindingMock.expects('getLayoutRect')
-        .withArgs(element)
-        .returns({top})
-        .once();
+    bindingMock
+      .expects('getLayoutRect')
+      .withArgs(element)
+      .returns({top})
+      .once();
 
-    const interpolateScrollIntoView =
-        sandbox.stub(viewport, 'interpolateScrollIntoView_');
+    const interpolateScrollIntoView = sandbox.stub(
+      viewport,
+      'interpolateScrollIntoView_'
+    );
 
     stubVsyncMeasure();
 
@@ -901,22 +947,31 @@ describes.fakeWin('Viewport', {}, env => {
 
     bindingMock.verify();
 
-    expect(interpolateScrollIntoView.withArgs(
+    expect(
+      interpolateScrollIntoView.withArgs(
         /* parent       */ sinon.match.any,
         /* curScrollTop */ sinon.match.any,
-        /* newScrollTop */ (top - /* padding */ 19),
+        /* newScrollTop */ top - /* padding */ 19,
         /* duration     */ sinon.match.any,
-        /* curve        */ sinon.match.any)).to.be.calledOnce;
+        /* curve        */ sinon.match.any
+      )
+    ).to.be.calledOnce;
   });
 
   it('should not change scrollTop for animateScrollIntoView', () => {
     const element = document.createElement('div');
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getLayoutRect').withArgs(element)
-        .returns({top: 111}).once();
+    bindingMock
+      .expects('getLayoutRect')
+      .withArgs(element)
+      .returns({top: 111})
+      .once();
     viewport.paddingTop_ = 0;
     sandbox.stub(viewport, 'getScrollTop').returns(111);
-    bindingMock.expects('setScrollTop').withArgs(111).never();
+    bindingMock
+      .expects('setScrollTop')
+      .withArgs(111)
+      .never();
     const duration = 1000;
     const pos = 'top';
     const promise = viewport.animateScrollIntoView(element, pos, 1000);
@@ -933,15 +988,19 @@ describes.fakeWin('Viewport', {}, env => {
     const bindingMock = sandbox.mock(binding);
     viewport.scrollTop_ = 111;
     viewport.scrollLeft_ = 222;
-    bindingMock.expects('getLayoutRect').withArgs(element, 222, 111)
-        .returns('sentinel').once();
+    bindingMock
+      .expects('getLayoutRect')
+      .withArgs(element, 222, 111)
+      .returns('sentinel')
+      .once();
     expect(viewport.getLayoutRect(element)).to.equal('sentinel');
   });
 
   it('should calculate client rect w/o global client rect', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getRootClientRectAsync')
-        .returns(Promise.resolve(null));
+    bindingMock
+      .expects('getRootClientRectAsync')
+      .returns(Promise.resolve(null));
     const el = document.createElement('div');
     el.getBoundingClientRect = () => layoutRectLtwh(1, 2, 3, 4);
     stubVsyncMeasure();
@@ -952,8 +1011,10 @@ describes.fakeWin('Viewport', {}, env => {
 
   it('should calculate client rect w/ global client rect when ', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getRootClientRectAsync')
-        .returns(Promise.resolve(layoutRectLtwh(5, 5, 5, 5))).twice();
+    bindingMock
+      .expects('getRootClientRectAsync')
+      .returns(Promise.resolve(layoutRectLtwh(5, 5, 5, 5)))
+      .twice();
     const el = document.createElement('div');
     el.getBoundingClientRect = () => layoutRectLtwh(1, 2, 3, 4);
     stubVsyncMeasure();
@@ -964,19 +1025,31 @@ describes.fakeWin('Viewport', {}, env => {
 
   it('should deletegate scrollWidth', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getScrollWidth').withArgs().returns(111).once();
+    bindingMock
+      .expects('getScrollWidth')
+      .withArgs()
+      .returns(111)
+      .once();
     expect(viewport.getScrollWidth()).to.equal(111);
   });
 
   it('should deletegate scrollHeight', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getScrollHeight').withArgs().returns(117).once();
+    bindingMock
+      .expects('getScrollHeight')
+      .withArgs()
+      .returns(117)
+      .once();
     expect(viewport.getScrollHeight()).to.equal(117);
   });
 
   it('should delegate contentHeight', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('getContentHeight').withArgs().returns(117).once();
+    bindingMock
+      .expects('getContentHeight')
+      .withArgs()
+      .returns(117)
+      .once();
     expect(viewport.getContentHeight()).to.equal(117);
     bindingMock.verify();
   });
@@ -990,7 +1063,10 @@ describes.fakeWin('Viewport', {}, env => {
 
   it('should scroll to target position when the viewer sets scrollTop', () => {
     const bindingMock = sandbox.mock(binding);
-    bindingMock.expects('setScrollTop').withArgs(117).once();
+    bindingMock
+      .expects('setScrollTop')
+      .withArgs(117)
+      .once();
     viewerScrollDocHandler({scrollTop: 117});
     bindingMock.verify();
   });
@@ -1007,19 +1083,22 @@ describes.fakeWin('Viewport', {}, env => {
     });
 
     // TODO(zhouyx, #11827): Make this test work on Safari.
-    it.configure().skipSafari().run('should not set pan-y when ' +
-        'not embedded', () => {
-      viewer.isEmbedded = () => false;
-      viewport = new Viewport(ampdoc, binding, viewer);
-      expect(win.getComputedStyle(root)['touch-action']).to.equal('auto');
-    });
+    it.configure()
+      .skipSafari()
+      .run('should not set pan-y when not embedded', () => {
+        viewer.isEmbedded = () => false;
+        viewport = new Viewport(ampdoc, binding, viewer);
+        expect(win.getComputedStyle(root)['touch-action']).to.equal('auto');
+      });
 
     // TODO(zhouyx, #11827): Make this test work on Safari.
-    it.configure().skipSafari().run('should set pan-y with experiment', () => {
-      viewer.isEmbedded = () => true;
-      viewport = new Viewport(ampdoc, binding, viewer);
-      expect(win.getComputedStyle(root)['touch-action']).to.equal('pan-y');
-    });
+    it.configure()
+      .skipSafari()
+      .run('should set pan-y with experiment', () => {
+        viewer.isEmbedded = () => true;
+        viewport = new Viewport(ampdoc, binding, viewer);
+        expect(win.getComputedStyle(root)['touch-action']).to.equal('pan-y');
+      });
   });
 
   describe('for child window', () => {
@@ -1067,12 +1146,16 @@ describes.fakeWin('Viewport', {}, env => {
       viewport.scrollTop_ = 0;
       const element = iframeWin.document.createElement('div');
       iframeWin.document.body.appendChild(element);
-      bindingMock.expects('getLayoutRect')
-          .withExactArgs(element, 0, 0)
-          .returns({left: 20, top: 10}).once();
-      bindingMock.expects('getLayoutRect')
-          .withExactArgs(iframe, 0, 0)
-          .returns({left: 211, top: 111}).once();
+      bindingMock
+        .expects('getLayoutRect')
+        .withExactArgs(element, 0, 0)
+        .returns({left: 20, top: 10})
+        .once();
+      bindingMock
+        .expects('getLayoutRect')
+        .withExactArgs(iframe, 0, 0)
+        .returns({left: 211, top: 111})
+        .once();
 
       const rect = viewport.getLayoutRect(element);
       expect(rect.left).to.equal(211 + 20);
@@ -1084,12 +1167,16 @@ describes.fakeWin('Viewport', {}, env => {
       viewport.scrollTop_ = 100;
       const element = iframeWin.document.createElement('div');
       iframeWin.document.body.appendChild(element);
-      bindingMock.expects('getLayoutRect')
-          .withExactArgs(element, 0, 0)
-          .returns({left: 20, top: 10}).once();
-      bindingMock.expects('getLayoutRect')
-          .withExactArgs(iframe, 200, 100)
-          .returns({left: 211, top: 111}).once();
+      bindingMock
+        .expects('getLayoutRect')
+        .withExactArgs(element, 0, 0)
+        .returns({left: 20, top: 10})
+        .once();
+      bindingMock
+        .expects('getLayoutRect')
+        .withExactArgs(iframe, 200, 100)
+        .returns({left: 211, top: 111})
+        .once();
 
       const rect = viewport.getLayoutRect(element);
       expect(rect.left).to.equal(211 + 20);
@@ -1131,9 +1218,7 @@ describes.fakeWin('Viewport', {}, env => {
   });
 });
 
-
 describe('Viewport META', () => {
-
   describe('parseViewportMeta', () => {
     it('should accept null or empty strings', () => {
       expect(parseViewportMeta(null)).to.be.empty;
@@ -1144,11 +1229,12 @@ describe('Viewport META', () => {
       });
     });
     it('should parse two key-values', () => {
-      expect(parseViewportMeta('width=device-width,minimum-scale=1')).to.deep
-          .equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-          });
+      expect(
+        parseViewportMeta('width=device-width,minimum-scale=1')
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
     it('should parse empty value', () => {
       expect(parseViewportMeta('width=device-width,minimal-ui')).to.deep.equal({
@@ -1166,33 +1252,37 @@ describe('Viewport META', () => {
       });
     });
     it('should ignore extra delims', () => {
-      expect(parseViewportMeta(',,,width=device-width,,,,minimum-scale=1,,,'))
-          .to.deep.equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-          });
+      expect(
+        parseViewportMeta(',,,width=device-width,,,,minimum-scale=1,,,')
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
     it('should support semicolon', () => {
-      expect(parseViewportMeta('width=device-width;minimum-scale=1'))
-          .to.deep.equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-          });
+      expect(
+        parseViewportMeta('width=device-width;minimum-scale=1')
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
     it('should support mix of comma and semicolon', () => {
-      expect(parseViewportMeta('width=device-width,minimum-scale=1;test=3;'))
-          .to.deep.equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-            'test': '3',
-          });
+      expect(
+        parseViewportMeta('width=device-width,minimum-scale=1;test=3;')
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+        'test': '3',
+      });
     });
     it('should ignore extra mix delims', () => {
-      expect(parseViewportMeta(',,;;,width=device-width;;,minimum-scale=1,,;'))
-          .to.deep.equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-          });
+      expect(
+        parseViewportMeta(',,;;,width=device-width;;,minimum-scale=1,,;')
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
   });
 
@@ -1201,72 +1291,92 @@ describe('Viewport META', () => {
       expect(stringifyViewportMeta({})).to.equal('');
     });
     it('should stringify single key-value', () => {
-      expect(stringifyViewportMeta({'width': 'device-width'}))
-          .to.equal('width=device-width');
+      expect(stringifyViewportMeta({'width': 'device-width'})).to.equal(
+        'width=device-width'
+      );
     });
     it('should stringify two key-values', () => {
       const res = stringifyViewportMeta({
         'width': 'device-width',
         'minimum-scale': '1',
       });
-      expect(res == 'width=device-width,minimum-scale=1' ||
-          res == 'minimum-scale=1,width=device-width')
-          .to.be.true;
+      expect(
+        res == 'width=device-width,minimum-scale=1' ||
+          res == 'minimum-scale=1,width=device-width'
+      ).to.be.true;
     });
     it('should stringify empty values', () => {
       const res = stringifyViewportMeta({
         'width': 'device-width',
         'minimal-ui': '',
       });
-      expect(res == 'width=device-width,minimal-ui' ||
-          res == 'minimal-ui,width=device-width')
-          .to.be.true;
+      expect(
+        res == 'width=device-width,minimal-ui' ||
+          res == 'minimal-ui,width=device-width'
+      ).to.be.true;
     });
   });
 
   describe('updateViewportMetaString', () => {
     it('should do nothing with empty values', () => {
-      expect(updateViewportMetaString(
-          '', {})).to.equal('');
-      expect(updateViewportMetaString(
-          'width=device-width', {})).to.equal('width=device-width');
+      expect(updateViewportMetaString('', {})).to.equal('');
+      expect(updateViewportMetaString('width=device-width', {})).to.equal(
+        'width=device-width'
+      );
     });
     it('should add a new value', () => {
-      expect(updateViewportMetaString(
-          '', {'minimum-scale': '1'})).to.equal('minimum-scale=1');
-      expect(parseViewportMeta(updateViewportMetaString(
-          'width=device-width', {'minimum-scale': '1'})))
-          .to.deep.equal({
-            'width': 'device-width',
-            'minimum-scale': '1',
-          });
+      expect(updateViewportMetaString('', {'minimum-scale': '1'})).to.equal(
+        'minimum-scale=1'
+      );
+      expect(
+        parseViewportMeta(
+          updateViewportMetaString('width=device-width', {'minimum-scale': '1'})
+        )
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
     it('should replace the existing value', () => {
-      expect(parseViewportMeta(updateViewportMetaString(
-          'width=device-width,minimum-scale=2', {'minimum-scale': '1'})))
-          .to.deep.equal({
-            'width': 'device-width',
+      expect(
+        parseViewportMeta(
+          updateViewportMetaString('width=device-width,minimum-scale=2', {
             'minimum-scale': '1',
-          });
+          })
+        )
+      ).to.deep.equal({
+        'width': 'device-width',
+        'minimum-scale': '1',
+      });
     });
     it('should delete the existing value', () => {
-      expect(parseViewportMeta(updateViewportMetaString(
-          'width=device-width,minimum-scale=1', {'minimum-scale': undefined})))
-          .to.deep.equal({
-            'width': 'device-width',
-          });
+      expect(
+        parseViewportMeta(
+          updateViewportMetaString('width=device-width,minimum-scale=1', {
+            'minimum-scale': undefined,
+          })
+        )
+      ).to.deep.equal({
+        'width': 'device-width',
+      });
     });
     it('should ignore delete for a non-existing value', () => {
-      expect(parseViewportMeta(updateViewportMetaString(
-          'width=device-width', {'minimum-scale': undefined})))
-          .to.deep.equal({
-            'width': 'device-width',
-          });
+      expect(
+        parseViewportMeta(
+          updateViewportMetaString('width=device-width', {
+            'minimum-scale': undefined,
+          })
+        )
+      ).to.deep.equal({
+        'width': 'device-width',
+      });
     });
     it('should do nothing if values did not change', () => {
-      expect(updateViewportMetaString(
-          'width=device-width,minimum-scale=1', {'minimum-scale': '1'}))
-          .to.equal('width=device-width,minimum-scale=1');
+      expect(
+        updateViewportMetaString('width=device-width,minimum-scale=1', {
+          'minimum-scale': '1',
+        })
+      ).to.equal('width=device-width,minimum-scale=1');
     });
   });
 
@@ -1359,8 +1469,9 @@ describe('Viewport META', () => {
     });
 
     it('should ignore disable TouchZoom if already disabled', () => {
-      viewportMetaString = 'width=device-width,minimum-scale=1,' +
-          'maximum-scale=1,user-scalable=no';
+      viewportMetaString =
+        'width=device-width,minimum-scale=1,' +
+        'maximum-scale=1,user-scalable=no';
       viewport.disableTouchZoom();
       expect(viewportMetaSetter).to.have.not.been.called;
     });
@@ -1415,169 +1526,184 @@ describe('Viewport META', () => {
   });
 });
 
-
 describe('createViewport', () => {
+  describes.fakeWin(
+    'in Android',
+    {
+      win: {navigator: {userAgent: 'Android'}},
+    },
+    env => {
+      let win;
 
-  describes.fakeWin('in Android', {
-    win: {navigator: {userAgent: 'Android'}},
-  }, env => {
-    let win;
+      beforeEach(() => {
+        win = env.win;
+        installPlatformService(win);
+        installTimerService(win);
+        installVsyncService(win);
+      });
 
-    beforeEach(() => {
-      win = env.win;
-      installPlatformService(win);
-      installTimerService(win);
-      installVsyncService(win);
-    });
-
-    it('should bind to "natural" when not iframed', () => {
-      win.parent = win;
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentStateService(win);
-      const ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
-      installViewerServiceForDoc(ampDoc);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
-    });
-
-    it('should bind to "naturual" when iframed', () => {
-      win.parent = {};
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentStateService(win);
-      const ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
-      installViewerServiceForDoc(ampDoc);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
-    });
-  });
+      it('should bind to "natural" when not iframed', () => {
+        win.parent = win;
+        installDocService(win, /* isSingleDoc */ true);
+        installDocumentStateService(win);
+        const ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
+        installViewerServiceForDoc(ampDoc);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
+      });
 
-  describes.fakeWin('in iOS', {
-    win: {navigator: {userAgent: 'iPhone'}},
-  }, env => {
-    let win;
-    let ampDoc;
-    let viewer;
+      it('should bind to "naturual" when iframed', () => {
+        win.parent = {};
+        installDocService(win, /* isSingleDoc */ true);
+        installDocumentStateService(win);
+        const ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
+        installViewerServiceForDoc(ampDoc);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
+      });
+    }
+  );
+
+  describes.fakeWin(
+    'in iOS',
+    {
+      win: {navigator: {userAgent: 'iPhone'}},
+    },
+    env => {
+      let win;
+      let ampDoc;
+      let viewer;
 
-    beforeEach(() => {
-      win = env.win;
-      installPlatformService(win);
-      installTimerService(win);
-      installVsyncService(win);
-      installDocService(win, /* isSingleDoc */ true);
-      installDocumentStateService(win);
-      ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
-      installViewerServiceForDoc(ampDoc);
-      viewer = Services.viewerForDoc(ampDoc);
-      win.getComputedStyle = () => ({});
-    });
-
-    it('should bind to "natural" when not iframed', () => {
-      win.parent = win;
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
-    });
-
-    it('should bind to "iOS embed" when iframed', () => {
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedWrapper_);
-    });
-
-    it('should NOT bind to "iOS embed" when iframed but not embedded', () => {
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingNatural_);
-    });
-
-    it('should bind to "iOS embed" when not iframed but in dev mode', () => {
-      getMode(win).development = true;
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedWrapper_);
-    });
-
-    it('should bind to "iOS embed" when iframed but in test mode', () => {
-      win.parent = {};
-      getMode(win).test = true;
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedWrapper_);
-    });
-
-    it('should NOT bind to "iOS embed" when in dev mode, but iframed', () => {
-      win.parent = {};
-      getMode(win).development = true;
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingNatural_);
-    });
-
-    it('should bind to "iOS embed SD" when the experiment is on', () => {
-      sandbox.stub(Services.platformFor(win), 'getIosVersionString')
+      beforeEach(() => {
+        win = env.win;
+        installPlatformService(win);
+        installTimerService(win);
+        installVsyncService(win);
+        installDocService(win, /* isSingleDoc */ true);
+        installDocumentStateService(win);
+        ampDoc = Services.ampdocServiceFor(win).getAmpDoc();
+        installViewerServiceForDoc(ampDoc);
+        viewer = Services.viewerForDoc(ampDoc);
+        win.getComputedStyle = () => ({});
+      });
+
+      it('should bind to "natural" when not iframed', () => {
+        win.parent = win;
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
+      });
+
+      it('should bind to "iOS embed" when iframed', () => {
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedWrapper_
+        );
+      });
+
+      it('should NOT bind to "iOS embed" when iframed but not embedded', () => {
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
+      });
+
+      it('should bind to "iOS embed" when not iframed but in dev mode', () => {
+        getMode(win).development = true;
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedWrapper_
+        );
+      });
+
+      it('should bind to "iOS embed" when iframed but in test mode', () => {
+        win.parent = {};
+        getMode(win).test = true;
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedWrapper_
+        );
+      });
+
+      it('should NOT bind to "iOS embed" when in dev mode, but iframed', () => {
+        win.parent = {};
+        getMode(win).development = true;
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => false);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(ViewportBindingNatural_);
+      });
+
+      it('should bind to "iOS embed SD" when the experiment is on', () => {
+        sandbox
+          .stub(Services.platformFor(win), 'getIosVersionString')
           .callsFake(() => '12.2');
-      toggleExperiment(win, 'ios-embed-sd', true);
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedShadowRoot_);
-    });
+        toggleExperiment(win, 'ios-embed-sd', true);
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedShadowRoot_
+        );
+      });
 
-    it('should bind to "iOS embed SD" in future Safari', () => {
-      sandbox.stub(Services.platformFor(win), 'getIosVersionString')
+      it('should bind to "iOS embed SD" in future Safari', () => {
+        sandbox
+          .stub(Services.platformFor(win), 'getIosVersionString')
           .callsFake(() => '12.2');
-      toggleExperiment(win, 'ios-embed-sd', true);
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedShadowRoot_);
-    });
+        toggleExperiment(win, 'ios-embed-sd', true);
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedShadowRoot_
+        );
+      });
 
-    it('should NOT bind to "iOS embed SD" in Safari before 12.2', () => {
-      // This is due to some scrolling, position:fixed and SD bugs.
-      sandbox.stub(Services.platformFor(win), 'getMajorVersion')
+      it('should NOT bind to "iOS embed SD" in Safari before 12.2', () => {
+        // This is due to some scrolling, position:fixed and SD bugs.
+        sandbox
+          .stub(Services.platformFor(win), 'getMajorVersion')
           .callsFake(() => '12.1');
-      toggleExperiment(win, 'ios-embed-sd', true);
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedWrapper_);
-    });
-
-    it('should only bind to "iOS embed SD" when SD is supported', () => {
-      // Reset SD support.
-      Object.defineProperty(win.Element.prototype, 'attachShadow', {
-        value: null,
+        toggleExperiment(win, 'ios-embed-sd', true);
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedWrapper_
+        );
       });
-      sandbox.stub(Services.platformFor(win), 'getMajorVersion')
+
+      it('should only bind to "iOS embed SD" when SD is supported', () => {
+        // Reset SD support.
+        Object.defineProperty(win.Element.prototype, 'attachShadow', {
+          value: null,
+        });
+        sandbox
+          .stub(Services.platformFor(win), 'getMajorVersion')
           .callsFake(() => '12.2');
-      toggleExperiment(win, 'ios-embed-sd', true);
-      win.parent = {};
-      sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
-      installViewportServiceForDoc(ampDoc);
-      const viewport = Services.viewportForDoc(ampDoc);
-      expect(viewport.binding_).to
-          .be.instanceof(ViewportBindingIosEmbedWrapper_);
-    });
-  });
+        toggleExperiment(win, 'ios-embed-sd', true);
+        win.parent = {};
+        sandbox.stub(viewer, 'isEmbedded').callsFake(() => true);
+        installViewportServiceForDoc(ampDoc);
+        const viewport = Services.viewportForDoc(ampDoc);
+        expect(viewport.binding_).to.be.instanceof(
+          ViewportBindingIosEmbedWrapper_
+        );
+      });
+    }
+  );
 });
diff --git a/test/unit/test-vsync.js b/test/unit/test-vsync.js
index affeb6d8dcab..f15de692c985 100644
--- a/test/unit/test-vsync.js
+++ b/test/unit/test-vsync.js
@@ -19,7 +19,6 @@ import {Services} from '../../src/services';
 import {Vsync} from '../../src/service/vsync-impl';
 import {installTimerService} from '../../src/service/timer-impl';
 
-
 describe('vsync', () => {
   let sandbox;
   let clock;
@@ -38,8 +37,7 @@ describe('vsync', () => {
         nodeType: /* DOCUMENT */ 9,
         body: {},
       },
-      navigator: {
-      },
+      navigator: {},
       services: {},
       setTimeout: (fn, t) => {
         return window.setTimeout(fn, t);
@@ -57,13 +55,14 @@ describe('vsync', () => {
     viewerVisibilityChangedHandler = undefined;
     viewer = {
       isVisible: () => true,
-      onVisibilityChanged: handler => viewerVisibilityChangedHandler = handler,
+      onVisibilityChanged: handler =>
+        (viewerVisibilityChangedHandler = handler),
     };
 
     docVisibilityHandler = undefined;
     docState = {
       isHidden: () => false,
-      onVisibilityChanged: handler => docVisibilityHandler = handler,
+      onVisibilityChanged: handler => (docVisibilityHandler = handler),
     };
     win.services['documentState'] = {obj: docState};
 
@@ -76,7 +75,6 @@ describe('vsync', () => {
     document.body.removeChild(contextNode);
   });
 
-
   describe('single-doc', () => {
     let ampdoc;
     let vsync;
@@ -89,8 +87,7 @@ describe('vsync', () => {
       return Services.viewerPromiseForDoc(ampdoc);
     });
 
-    afterEach(() => {
-    });
+    afterEach(() => {});
 
     it('should init correctly', () => {
       expect(vsync.canAnimate(contextNode)).to.be.true;
@@ -99,9 +96,11 @@ describe('vsync', () => {
     });
 
     it('should fail canAnimate without node', () => {
-      allowConsoleError(() => { expect(() => {
-        vsync.canAnimate();
-      }).to.throw(/Assertion failed/); });
+      allowConsoleError(() => {
+        expect(() => {
+          vsync.canAnimate();
+        }).to.throw(/Assertion failed/);
+      });
     });
 
     // TODO(choumx, #12476): Make this test work with sinon 4.0.
@@ -240,31 +239,31 @@ describe('vsync', () => {
     });
 
     // TODO(choumx, #12476): Make this test work with sinon 4.0.
-    it.skip('should return a promise from runPromise that ' +
-        'executes "run"', () => {
+    it.skip('should return a promise from runPromise that executes "run"', () => {
       const measureSpy = sandbox.spy();
       const mutateSpy = sandbox.spy();
-      return vsync.runPromise({measure: measureSpy, mutate: mutateSpy})
-          .then(() => {
-            expect(mutateSpy).to.be.calledOnce;
-            expect(measureSpy).to.be.calledOnce;
-          });
+      return vsync
+        .runPromise({measure: measureSpy, mutate: mutateSpy})
+        .then(() => {
+          expect(mutateSpy).to.be.calledOnce;
+          expect(measureSpy).to.be.calledOnce;
+        });
     });
 
     // TODO(choumx, #12476): Make this test work with sinon 4.0.
-    it.skip('should return a promise from measurePromise ' +
-        'that runs measurer', () => {
+    it.skip('should return a promise from measurePromise that runs measurer', () => {
       let measured = false;
-      return vsync.measurePromise(() => {
-        measured = true;
-      }).then(() => {
-        expect(measured).to.be.true;
-      });
+      return vsync
+        .measurePromise(() => {
+          measured = true;
+        })
+        .then(() => {
+          expect(measured).to.be.true;
+        });
     });
 
     // TODO(choumx, #12476): Make this test work with sinon 4.0.
-    it.skip('should return a promise from mutatePromise' +
-        'that runs mutator', () => {
+    it.skip('should return a promise from mutatePromisethat runs mutator', () => {
       const mutator = sandbox.spy();
       return vsync.mutatePromise(mutator).then(() => {
         expect(mutator).to.be.calledOnce;
@@ -273,7 +272,7 @@ describe('vsync', () => {
 
     it('should schedule via animation frames when doc is visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       let result = '';
@@ -299,7 +298,7 @@ describe('vsync', () => {
 
     it('should schedule via timer frames when doc is not visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => false;
 
       let result = '';
@@ -358,7 +357,7 @@ describe('vsync', () => {
 
     it('should re-schedule when doc goes invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       let result = '';
@@ -389,7 +388,7 @@ describe('vsync', () => {
 
     it('should re-schedule when doc goes visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => false;
 
       let result = '';
@@ -419,7 +418,7 @@ describe('vsync', () => {
 
     it('should NOT re-schedule when no tasks pending', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       expect(vsync.tasks_).to.have.length(0);
@@ -438,7 +437,7 @@ describe('vsync', () => {
 
     it('should run anim task when visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       let result = '';
@@ -458,7 +457,7 @@ describe('vsync', () => {
 
     it('should create and run anim task when visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       let result = '';
@@ -479,7 +478,7 @@ describe('vsync', () => {
 
     it('should NOT run anim task when invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => false;
 
       let result = ''; // eslint-disable-line no-unused-vars
@@ -496,7 +495,7 @@ describe('vsync', () => {
 
     it('should create but NOT run anim task when invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => false;
 
       let result = ''; // eslint-disable-line no-unused-vars
@@ -517,14 +516,19 @@ describe('vsync', () => {
       const mutatorSpy = sandbox.spy();
 
       const promise = vsync.runAnimMutateSeries(contextNode, mutatorSpy);
-      return promise.then(() => {
-        return 'SUCCESS';
-      }, error => {
-        return 'ERROR: ' + error;
-      }).then(response => {
-        expect(response).to.match(/^ERROR/);
-        expect(mutatorSpy).to.have.not.been.called;
-      });
+      return promise
+        .then(
+          () => {
+            return 'SUCCESS';
+          },
+          error => {
+            return 'ERROR: ' + error;
+          }
+        )
+        .then(response => {
+          expect(response).to.match(/^ERROR/);
+          expect(mutatorSpy).to.have.not.been.called;
+        });
     });
 
     describe('RAF polyfill', () => {
@@ -558,7 +562,6 @@ describe('vsync', () => {
     });
   });
 
-
   describe('multi-doc', () => {
     let root;
     let ampdoc;
@@ -587,7 +590,7 @@ describe('vsync', () => {
 
     it('should schedule via animation frames when doc is visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       viewer.isVisible = () => true;
 
       let result = '';
@@ -610,7 +613,7 @@ describe('vsync', () => {
 
     it('should schedule via timer frames when doc is not visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => true;
 
       let result = '';
@@ -634,7 +637,7 @@ describe('vsync', () => {
 
     it('should re-schedule when doc goes invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => false;
 
       let result = '';
@@ -665,7 +668,7 @@ describe('vsync', () => {
 
     it('should re-schedule when doc goes visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => true;
 
       let result = '';
@@ -695,7 +698,7 @@ describe('vsync', () => {
 
     it('should NOT re-schedule when no tasks pending', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => false;
 
       expect(vsync.tasks_).to.have.length(0);
@@ -714,7 +717,7 @@ describe('vsync', () => {
 
     it('should run anim task when visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => false;
 
       let result = '';
@@ -734,7 +737,7 @@ describe('vsync', () => {
 
     it('should create and run anim task when visible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => false;
 
       let result = '';
@@ -755,7 +758,7 @@ describe('vsync', () => {
 
     it('should NOT run anim task when invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => true;
 
       let result = ''; // eslint-disable-line no-unused-vars
@@ -772,7 +775,7 @@ describe('vsync', () => {
 
     it('should create but NOT run anim task when invisible', () => {
       let rafHandler;
-      vsync.raf_ = handler => rafHandler = handler;
+      vsync.raf_ = handler => (rafHandler = handler);
       docState.isHidden = () => true;
 
       let result = ''; // eslint-disable-line no-unused-vars
@@ -793,14 +796,19 @@ describe('vsync', () => {
       const mutatorSpy = sandbox.spy();
 
       const promise = vsync.runAnimMutateSeries(contextNode, mutatorSpy);
-      return promise.then(() => {
-        return 'SUCCESS';
-      }, error => {
-        return 'ERROR: ' + error;
-      }).then(response => {
-        expect(response).to.match(/^ERROR/);
-        expect(mutatorSpy).to.have.not.been.called;
-      });
+      return promise
+        .then(
+          () => {
+            return 'SUCCESS';
+          },
+          error => {
+            return 'ERROR: ' + error;
+          }
+        )
+        .then(response => {
+          expect(response).to.match(/^ERROR/);
+          expect(mutatorSpy).to.have.not.been.called;
+        });
     });
   });
 });
diff --git a/test/unit/test-web-components.js b/test/unit/test-web-components.js
index be1bf3da0a64..5ef8ea58fe38 100644
--- a/test/unit/test-web-components.js
+++ b/test/unit/test-web-components.js
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-
 import {
   ShadowDomVersion,
   getShadowDomSupportedVersion,
@@ -22,7 +21,6 @@ import {
   setShadowDomSupportedVersionForTesting,
 } from '../../src/web-components';
 
-
 describe('web components', () => {
   beforeEach(() => {
     setShadowDomSupportedVersionForTesting(undefined);
@@ -48,15 +46,19 @@ describes.realWin('Web Components spec', {}, env => {
       win.Element.prototype.createShadowRoot = undefined;
       win.Element.prototype.attachShadow = undefined;
 
-      expect(getShadowDomSupportedVersion(win.Element))
-          .to.equal(ShadowDomVersion.NONE);
+      expect(getShadowDomSupportedVersion(win.Element)).to.equal(
+        ShadowDomVersion.NONE
+      );
     });
 
     it('gives preference to v1 over v0 when both specs are available', () => {
-      if (!!win.Element.prototype.createShadowRoot &&
-          !!win.Element.prototype.attachShadow) {
-        expect(getShadowDomSupportedVersion(win.Element))
-            .to.equal(ShadowDomVersion.V1);
+      if (
+        !!win.Element.prototype.createShadowRoot &&
+        !!win.Element.prototype.attachShadow
+      ) {
+        expect(getShadowDomSupportedVersion(win.Element)).to.equal(
+          ShadowDomVersion.V1
+        );
       }
     });
 
@@ -64,8 +66,9 @@ describes.realWin('Web Components spec', {}, env => {
       if (!!win.Element.prototype.createShadowRoot) {
         win.Element.prototype.attachShadow = undefined;
 
-        expect(getShadowDomSupportedVersion(win.Element))
-            .to.equal(ShadowDomVersion.V0);
+        expect(getShadowDomSupportedVersion(win.Element)).to.equal(
+          ShadowDomVersion.V0
+        );
       }
     });
   });
diff --git a/test/unit/test-xhr-document-fetcher.js b/test/unit/test-xhr-document-fetcher.js
index 25b2ed8e3a30..0e8992e48f14 100644
--- a/test/unit/test-xhr-document-fetcher.js
+++ b/test/unit/test-xhr-document-fetcher.js
@@ -24,7 +24,7 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
   this.timeout(5000);
   function setupMockXhr() {
     const mockXhr = sandbox.useFakeXMLHttpRequest();
-    xhrCreated = new Promise(resolve => mockXhr.onCreate = resolve);
+    xhrCreated = new Promise(resolve => (mockXhr.onCreate = resolve));
   }
   beforeEach(() => {
     ampdocServiceForStub = sandbox.stub(Services, 'ampdocServiceFor');
@@ -48,33 +48,38 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
     });
 
     it('should be able to fetch a document', () => {
-      const promise = fetchDocument(win,'/index.html').then(doc => {
+      const promise = fetchDocument(win, '/index.html').then(doc => {
         expect(doc.nodeType).to.equal(9);
         expect(doc.firstChild.textContent).to.equals('Foo');
       });
       xhrCreated.then(xhr => {
         expect(xhr.requestHeaders['Accept']).to.equal('text/html');
         xhr.respond(
-            200, {
-              'Content-Type': 'text/xml',
-              'Access-Control-Expose-Headers':
-                  'AMP-Access-Control-Allow-Source-Origin',
-              'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-            },
-            '<html><body>Foo</body></html>');
+          200,
+          {
+            'Content-Type': 'text/xml',
+            'Access-Control-Expose-Headers':
+              'AMP-Access-Control-Allow-Source-Origin',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '<html><body>Foo</body></html>'
+        );
         expect(xhr.responseType).to.equal('document');
       });
       return promise;
     });
     it('should mark 400 as not retriable', () => {
       const promise = fetchDocument(win, '/index.html');
-      xhrCreated.then(
-          xhr => xhr.respond(
-              400, {
-                'Content-Type': 'text/xml',
-                'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-              },
-              '<html></html>'));
+      xhrCreated.then(xhr =>
+        xhr.respond(
+          400,
+          {
+            'Content-Type': 'text/xml',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '<html></html>'
+        )
+      );
       return promise.catch(e => {
         expect(e.retriable).to.be.equal(false);
         expect(e.retriable).to.not.equal(true);
@@ -82,15 +87,18 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
     });
     it('should mark 415 as retriable', () => {
       const promise = fetchDocument(win, '/index.html');
-      xhrCreated.then(
-          xhr => xhr.respond(
-              415, {
-                'Content-Type': 'text/xml',
-                'Access-Control-Expose-Headers':
-                    'AMP-Access-Control-Allow-Source-Origin',
-                'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-              },
-              '<html></html>'));
+      xhrCreated.then(xhr =>
+        xhr.respond(
+          415,
+          {
+            'Content-Type': 'text/xml',
+            'Access-Control-Expose-Headers':
+              'AMP-Access-Control-Allow-Source-Origin',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '<html></html>'
+        )
+      );
       return promise.catch(e => {
         expect(e.retriable).to.exist;
         expect(e.retriable).to.be.true;
@@ -98,15 +106,18 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
     });
     it('should mark 500 as retriable', () => {
       const promise = fetchDocument(win, '/index.html');
-      xhrCreated.then(
-          xhr => xhr.respond(
-              415, {
-                'Content-Type': 'text/xml',
-                'Access-Control-Expose-Headers':
-                    'AMP-Access-Control-Allow-Source-Origin',
-                'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-              },
-              '<html></html>'));
+      xhrCreated.then(xhr =>
+        xhr.respond(
+          415,
+          {
+            'Content-Type': 'text/xml',
+            'Access-Control-Expose-Headers':
+              'AMP-Access-Control-Allow-Source-Origin',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '<html></html>'
+        )
+      );
       return promise.catch(e => {
         expect(e.retriable).to.exist;
         expect(e.retriable).to.be.true;
@@ -114,18 +125,20 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
     });
     it('should error on non truthy responseXML', () => {
       const promise = fetchDocument(win, '/index.html');
-      xhrCreated.then(
-          xhr => xhr.respond(
-              200, {
-                'Content-Type': 'application/json',
-                'Access-Control-Expose-Headers':
-                    'AMP-Access-Control-Allow-Source-Origin',
-                'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-              },
-              '{"hello": "world"}'));
+      xhrCreated.then(xhr =>
+        xhr.respond(
+          200,
+          {
+            'Content-Type': 'application/json',
+            'Access-Control-Expose-Headers':
+              'AMP-Access-Control-Allow-Source-Origin',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '{"hello": "world"}'
+        )
+      );
       return promise.catch(e => {
-        expect(e.message)
-            .to.contain('responseXML should exist');
+        expect(e.message).to.contain('responseXML should exist');
       });
     });
   });
@@ -164,22 +177,25 @@ describes.realWin('DocumentFetcher', {amp: true}, function() {
     }
     function getDefaultResponseOptions() {
       return {
-        headers: [
-          ['AMP-Access-Control-Allow-Source-Origin', origin],
-        ],
+        headers: [['AMP-Access-Control-Allow-Source-Origin', origin]],
       };
     }
     it('should return correct document response', () => {
       sendMessageStub.returns(
-          Promise.resolve({
-            body: '<html><body>Foo</body></html>',
-            init: {
-              headers: [['AMP-Access-Control-Allow-Source-Origin', origin]],
-            },
-          }));
-      return fetchDocument(interceptionEnabledWin, 'https://www.some-url.org/some-resource/').then(doc => {
-        expect(doc).to.have.nested.property('body.textContent')
-            .that.equals('Foo');
+        Promise.resolve({
+          body: '<html><body>Foo</body></html>',
+          init: {
+            headers: [['AMP-Access-Control-Allow-Source-Origin', origin]],
+          },
+        })
+      );
+      return fetchDocument(
+        interceptionEnabledWin,
+        'https://www.some-url.org/some-resource/'
+      ).then(doc => {
+        expect(doc)
+          .to.have.nested.property('body.textContent')
+          .that.equals('Foo');
       });
     });
   });
diff --git a/test/unit/test-xhr-fetch-polyfill.js b/test/unit/test-xhr-fetch-polyfill.js
index e44f18dec581..9669d1385831 100644
--- a/test/unit/test-xhr-fetch-polyfill.js
+++ b/test/unit/test-xhr-fetch-polyfill.js
@@ -14,29 +14,30 @@
  * limitations under the License.
  */
 
-
 import {Response, fetchPolyfill} from '../../src/polyfills/fetch';
 import {Services} from '../../src/services';
 import {createFormDataWrapper} from '../../src/form-data-wrapper';
 
 describes.sandboxed('fetch', {}, () => {
-
   describe('fetch method', () => {
     let xhrCreated;
 
     function setupMockXhr() {
       const mockXhr = sandbox.useFakeXMLHttpRequest();
-      xhrCreated = new Promise(resolve => mockXhr.onCreate = resolve);
+      xhrCreated = new Promise(resolve => (mockXhr.onCreate = resolve));
     }
 
     function mockOkResponse() {
-      xhrCreated.then(
-          xhr => xhr.respond(
-              200, {
-                'Content-Type': 'text/xml',
-                'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
-              },
-              '<html></html>'));
+      xhrCreated.then(xhr =>
+        xhr.respond(
+          200,
+          {
+            'Content-Type': 'text/xml',
+            'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+          },
+          '<html></html>'
+        )
+      );
     }
 
     beforeEach(() => {
@@ -69,38 +70,46 @@ describes.sandboxed('fetch', {}, () => {
 
     it('should not allow PUT method', () => {
       mockOkResponse();
-      return expect(fetchPolyfill('/post', {
-        method: 'PUT',
-        body: {
-          hello: 'world',
-        },
-      })).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
+      return expect(
+        fetchPolyfill('/post', {
+          method: 'PUT',
+          body: {
+            hello: 'world',
+          },
+        })
+      ).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
     });
 
     it('should not allow PATCH method', () => {
       mockOkResponse();
-      return expect(fetchPolyfill('/post', {
-        method: 'PATCH',
-        body: {
-          hello: 'world',
-        },
-      })).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
+      return expect(
+        fetchPolyfill('/post', {
+          method: 'PATCH',
+          body: {
+            hello: 'world',
+          },
+        })
+      ).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
     });
 
     it('should not allow DELETE method', () => {
       mockOkResponse();
-      return expect(fetchPolyfill('/post', {
-        method: 'DELETE',
-        body: {
-          hello: 'world',
-        },
-      })).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
+      return expect(
+        fetchPolyfill('/post', {
+          method: 'DELETE',
+          body: {
+            hello: 'world',
+          },
+        })
+      ).to.be.rejectedWith(/Only one of GET, POST is currently allowed./);
     });
 
     it('should allow FormData as body', () => {
       const fakeWin = null;
       sandbox.stub(Services, 'platformFor').returns({
-        isIos() { return false; },
+        isIos() {
+          return false;
+        },
       });
 
       const formData = createFormDataWrapper(fakeWin);
@@ -175,13 +184,16 @@ describes.sandboxed('fetch', {}, () => {
       expect(response.status).to.be.equals(200);
     });
 
-    it('should default status as 200 OK when an explicit '
-        + 'for undefined status', () => {
-      let response = new Response(TEST_TEXT, {status: undefined});
-      expect(response.status).to.be.equals(200);
-      response = new Response(TEST_TEXT);
-      expect(response.status).to.be.equals(200);
-    });
+    it(
+      'should default status as 200 OK when an explicit ' +
+        'for undefined status',
+      () => {
+        let response = new Response(TEST_TEXT, {status: undefined});
+        expect(response.status).to.be.equals(200);
+        response = new Response(TEST_TEXT);
+        expect(response.status).to.be.equals(200);
+      }
+    );
 
     it('should construct with body and explicit header uses header', () => {
       const response = new Response(TEST_TEXT, {
@@ -191,10 +203,10 @@ describes.sandboxed('fetch', {}, () => {
         },
       });
       expect(response.status).to.be.equals(200);
-      expect(response.headers.get('content-type'))
-          .to.be.equal('application/json');
-      expect(response.headers.get('random'))
-          .to.be.equal('random-value');
+      expect(response.headers.get('content-type')).to.be.equal(
+        'application/json'
+      );
+      expect(response.headers.get('random')).to.be.equal('random-value');
     });
 
     it('should reflect given status', () => {
@@ -223,8 +235,10 @@ describes.sandboxed('fetch', {}, () => {
       const response = new Response(TEST_TEXT);
       return response.text().then(result => {
         expect(result).to.equal(TEST_TEXT);
-        expect(response.text.bind(response), 'should throw').to.throw(Error,
-            /Body already used/);
+        expect(response.text.bind(response), 'should throw').to.throw(
+          Error,
+          /Body already used/
+        );
       });
     });
 
@@ -242,10 +256,7 @@ describes.sandboxed('fetch', {}, () => {
     it('should be cloneable and each instance should provide text', () => {
       const response = new Response(TEST_TEXT);
       const clone = response.clone();
-      return Promise.all([
-        response.text(),
-        clone.text(),
-      ]).then(results => {
+      return Promise.all([response.text(), clone.text()]).then(results => {
         expect(results[0]).to.equal(TEST_TEXT);
         expect(results[1]).to.equal(TEST_TEXT);
       });
@@ -253,13 +264,12 @@ describes.sandboxed('fetch', {}, () => {
 
     it('should not be cloneable if body is already accessed', () => {
       const response = new Response(TEST_TEXT);
-      return response.text()
-          .then(() => {
-            expect(() => response.clone(), 'should throw').to.throw(
-                Error,
-                /Body already used/);
-          });
+      return response.text().then(() => {
+        expect(() => response.clone(), 'should throw').to.throw(
+          Error,
+          /Body already used/
+        );
+      });
     });
   });
-
 });
diff --git a/test/unit/test-xhr.js b/test/unit/test-xhr.js
index a2dac47bf111..468585a48b24 100644
--- a/test/unit/test-xhr.js
+++ b/test/unit/test-xhr.js
@@ -24,760 +24,845 @@ import {utf8FromArrayBuffer} from '../../extensions/amp-a4a/0.1/amp-a4a';
 import {xhrServiceForTesting} from '../../src/service/xhr-impl';
 
 // TODO(jridgewell, #11827): Make this test work on Safari.
-describe.configure().skipSafari().run('XHR', function() {
-  let sandbox;
-  let ampdocServiceForStub;
-  let ampdocViewerStub;
-  let xhrCreated;
-  let viewer;
-
-  const location = {href: 'https://acme.com/path'};
-  const nativeWin = {
-    location,
-    fetch: window.fetch,
-  };
-
-  const polyfillWin = {
-    location,
-    fetch: fetchPolyfill,
-  };
-
-  // Given XHR calls give tests more time.
-  this.timeout(5000);
-
-  const scenarios = [
-    {
-      win: nativeWin,
-      desc: 'Native',
-    }, {
-      win: polyfillWin,
-      desc: 'Polyfill',
-    },
-  ];
-
-  function setupMockXhr() {
-    const mockXhr = sandbox.useFakeXMLHttpRequest();
-    xhrCreated = new Promise(resolve => mockXhr.onCreate = resolve);
-  }
-
-  function noOrigin(url) {
-    let index = url.indexOf('//');
-    if (index == -1) {
-      return url;
+describe
+  .configure()
+  .skipSafari()
+  .run('XHR', function() {
+    let sandbox;
+    let ampdocServiceForStub;
+    let ampdocViewerStub;
+    let xhrCreated;
+    let viewer;
+
+    const location = {href: 'https://acme.com/path'};
+    const nativeWin = {
+      location,
+      fetch: window.fetch,
+    };
+
+    const polyfillWin = {
+      location,
+      fetch: fetchPolyfill,
+    };
+
+    // Given XHR calls give tests more time.
+    this.timeout(5000);
+
+    const scenarios = [
+      {
+        win: nativeWin,
+        desc: 'Native',
+      },
+      {
+        win: polyfillWin,
+        desc: 'Polyfill',
+      },
+    ];
+
+    function setupMockXhr() {
+      const mockXhr = sandbox.useFakeXMLHttpRequest();
+      xhrCreated = new Promise(resolve => (mockXhr.onCreate = resolve));
     }
-    index = url.indexOf('/', index + 2);
-    return url.substring(index);
-  }
-
-  beforeEach(() => {
-    sandbox = sinon.sandbox;
-    ampdocServiceForStub = sandbox.stub(Services, 'ampdocServiceFor');
-    ampdocViewerStub = sandbox.stub(Services, 'viewerForDoc');
-    ampdocViewerStub.returns({
-      whenFirstVisible: () => Promise.resolve(),
-    });
-    ampdocServiceForStub.returns({
-      isSingleDoc: () => false,
-      getAmpDoc: () => ampdocViewerStub,
-    });
-
-    location.href = 'https://acme.com/path';
-  });
 
-  afterEach(() => {
-    sandbox.restore();
-  });
+    function noOrigin(url) {
+      let index = url.indexOf('//');
+      if (index == -1) {
+        return url;
+      }
+      index = url.indexOf('/', index + 2);
+      return url.substring(index);
+    }
 
-  scenarios.forEach(test => {
-    let xhr;
     beforeEach(() => {
-      xhr = xhrServiceForTesting(test.win);
+      sandbox = sinon.sandbox;
+      ampdocServiceForStub = sandbox.stub(Services, 'ampdocServiceFor');
+      ampdocViewerStub = sandbox.stub(Services, 'viewerForDoc');
+      ampdocViewerStub.returns({
+        whenFirstVisible: () => Promise.resolve(),
+      });
+      ampdocServiceForStub.returns({
+        isSingleDoc: () => false,
+        getAmpDoc: () => ampdocViewerStub,
+      });
+
+      location.href = 'https://acme.com/path';
     });
-    // Since it's the Native fetch, it won't use the XHR object so
-    // mocking and testing the request becomes not doable.
-    if (test.desc != 'Native') {
 
-      describe('#XHR', () => {
-        beforeEach(() => {
-          setupMockXhr();
-        });
+    afterEach(() => {
+      sandbox.restore();
+    });
 
-        it('should allow GET and POST methods', () => {
-          const get = xhr.fetchJson.bind(xhr, '/get?k=v1');
-          const post = xhr.fetchJson.bind(xhr, '/post', {
-            method: 'POST',
-            body: {
-              hello: 'world',
-            },
-          });
-          const put = xhr.fetchJson.bind(xhr, '/put', {
-            method: 'PUT',
-            body: {
-              hello: 'world',
-            },
-          });
-          const patch = xhr.fetchJson.bind(xhr, '/patch', {
-            method: 'PATCH',
-            body: {
-              hello: 'world',
-            },
-          });
-          const deleteMethod = xhr.fetchJson.bind(xhr, '/delete', {
-            method: 'DELETE',
-            body: {
-              id: 3,
-            },
+    scenarios.forEach(test => {
+      let xhr;
+      beforeEach(() => {
+        xhr = xhrServiceForTesting(test.win);
+      });
+      // Since it's the Native fetch, it won't use the XHR object so
+      // mocking and testing the request becomes not doable.
+      if (test.desc != 'Native') {
+        describe('#XHR', () => {
+          beforeEach(() => {
+            setupMockXhr();
           });
 
-          expect(get).to.not.throw();
-          expect(post).to.not.throw();
-          allowConsoleError(() => { expect(put).to.throw(); });
-          allowConsoleError(() => { expect(patch).to.throw(); });
-          allowConsoleError(() => { expect(deleteMethod).to.throw(); });
-        });
+          it('should allow GET and POST methods', () => {
+            const get = xhr.fetchJson.bind(xhr, '/get?k=v1');
+            const post = xhr.fetchJson.bind(xhr, '/post', {
+              method: 'POST',
+              body: {
+                hello: 'world',
+              },
+            });
+            const put = xhr.fetchJson.bind(xhr, '/put', {
+              method: 'PUT',
+              body: {
+                hello: 'world',
+              },
+            });
+            const patch = xhr.fetchJson.bind(xhr, '/patch', {
+              method: 'PATCH',
+              body: {
+                hello: 'world',
+              },
+            });
+            const deleteMethod = xhr.fetchJson.bind(xhr, '/delete', {
+              method: 'DELETE',
+              body: {
+                id: 3,
+              },
+            });
 
-        it('should allow FormData as body', () => {
-          const fakeWin = null;
-          sandbox.stub(Services, 'platformFor').returns({
-            isIos() { return false; },
+            expect(get).to.not.throw();
+            expect(post).to.not.throw();
+            allowConsoleError(() => {
+              expect(put).to.throw();
+            });
+            allowConsoleError(() => {
+              expect(patch).to.throw();
+            });
+            allowConsoleError(() => {
+              expect(deleteMethod).to.throw();
+            });
           });
 
-          const formData = createFormDataWrapper(fakeWin);
-          sandbox.stub(JSON, 'stringify');
-          formData.append('name', 'John Miller');
-          formData.append('age', 56);
-          const post = xhr.fetchJson.bind(xhr, '/post', {
-            method: 'POST',
-            body: formData,
-          });
-          expect(post).to.not.throw();
-          expect(JSON.stringify.called).to.be.false;
-        });
+          it('should allow FormData as body', () => {
+            const fakeWin = null;
+            sandbox.stub(Services, 'platformFor').returns({
+              isIos() {
+                return false;
+              },
+            });
 
-        it('should do `GET` as default method', () => {
-          xhr.fetchJson('/get?k=v1');
-          return xhrCreated.then(xhr => expect(xhr.method).to.equal('GET'));
-        });
+            const formData = createFormDataWrapper(fakeWin);
+            sandbox.stub(JSON, 'stringify');
+            formData.append('name', 'John Miller');
+            formData.append('age', 56);
+            const post = xhr.fetchJson.bind(xhr, '/post', {
+              method: 'POST',
+              body: formData,
+            });
+            expect(post).to.not.throw();
+            expect(JSON.stringify.called).to.be.false;
+          });
 
-        it('should normalize GET method name to uppercase', () => {
-          xhr.fetchJson('/abc');
-          return xhrCreated.then(xhr => expect(xhr.method).to.equal('GET'));
-        });
+          it('should do `GET` as default method', () => {
+            xhr.fetchJson('/get?k=v1');
+            return xhrCreated.then(xhr => expect(xhr.method).to.equal('GET'));
+          });
 
-        it('should normalize POST method name to uppercase', () => {
-          xhr.fetchJson('/abc', {
-            method: 'post',
-            body: {
-              hello: 'world',
-            },
+          it('should normalize GET method name to uppercase', () => {
+            xhr.fetchJson('/abc');
+            return xhrCreated.then(xhr => expect(xhr.method).to.equal('GET'));
           });
-          return xhrCreated.then(xhr => expect(xhr.method).to.equal('POST'));
-        });
 
-        it('should inject source origin query parameter', () => {
-          xhr.fetchJson('/get?k=v1#h1');
-          return xhrCreated.then(xhr =>
-            expect(noOrigin(xhr.url)).to.equal(
-                '/get?k=v1&__amp_source_origin=https%3A%2F%2Facme.com#h1'));
-        });
+          it('should normalize POST method name to uppercase', () => {
+            xhr.fetchJson('/abc', {
+              method: 'post',
+              body: {
+                hello: 'world',
+              },
+            });
+            return xhrCreated.then(xhr => expect(xhr.method).to.equal('POST'));
+          });
 
-        it('should inject source origin query parameter w/o query', () => {
-          xhr.fetchJson('/get');
-          return xhrCreated.then(xhr =>
-            expect(noOrigin(xhr.url)).to.equal(
-                '/get?__amp_source_origin=https%3A%2F%2Facme.com'));
-        });
+          it('should inject source origin query parameter', () => {
+            xhr.fetchJson('/get?k=v1#h1');
+            return xhrCreated.then(xhr =>
+              expect(noOrigin(xhr.url)).to.equal(
+                '/get?k=v1&__amp_source_origin=https%3A%2F%2Facme.com#h1'
+              )
+            );
+          });
 
-        it('should defend against invalid source origin query ' +
-           'parameter', () => {
-          allowConsoleError(() => { expect(() => {
-            xhr.fetchJson('/get?k=v1&__amp_source_origin=invalid#h1');
-          }).to.throw(/Source origin is not allowed/); });
-        });
+          it('should inject source origin query parameter w/o query', () => {
+            xhr.fetchJson('/get');
+            return xhrCreated.then(xhr =>
+              expect(noOrigin(xhr.url)).to.equal(
+                '/get?__amp_source_origin=https%3A%2F%2Facme.com'
+              )
+            );
+          });
 
-        it('should defend against empty source origin query parameter', () => {
-          allowConsoleError(() => { expect(() => {
-            xhr.fetchJson('/get?k=v1&__amp_source_origin=#h1');
-          }).to.throw(/Source origin is not allowed/); });
-        });
+          it('should defend against invalid source origin query parameter', () => {
+            allowConsoleError(() => {
+              expect(() => {
+                xhr.fetchJson('/get?k=v1&__amp_source_origin=invalid#h1');
+              }).to.throw(/Source origin is not allowed/);
+            });
+          });
 
-        it('should defend against re-encoded source origin parameter', () => {
-          allowConsoleError(() => { expect(() => {
-            xhr.fetchJson('/get?k=v1&_%5famp_source_origin=#h1');
-          }).to.throw(/Source origin is not allowed/); });
-        });
+          it('should defend against empty source origin query parameter', () => {
+            allowConsoleError(() => {
+              expect(() => {
+                xhr.fetchJson('/get?k=v1&__amp_source_origin=#h1');
+              }).to.throw(/Source origin is not allowed/);
+            });
+          });
 
-        it('should not include __amp_source_origin if ampCors ' +
-            'set to false', () => {
-          xhr.fetchJson('/get', {ampCors: false});
-          return xhrCreated.then(
-              xhr => expect(noOrigin(xhr.url)).to.equal('/get'));
-        });
+          it('should defend against re-encoded source origin parameter', () => {
+            allowConsoleError(() => {
+              expect(() => {
+                xhr.fetchJson('/get?k=v1&_%5famp_source_origin=#h1');
+              }).to.throw(/Source origin is not allowed/);
+            });
+          });
 
-        it('should accept AMP origin when received in response', () => {
-          const promise = xhr.fetchJson('/get');
-          xhrCreated.then(
-              xhr => xhr.respond(
-                  200, {
-                    'Content-Type': 'application/json',
-                    'Access-Control-Expose-Headers':
-                        'AMP-Access-Control-Allow-Source-Origin',
-                    'AMP-Access-Control-Allow-Source-Origin':
-                        'https://acme.com',
-                  },
-                  '{}'));
-          return promise;
-        });
-
-        it('should deny AMP origin for different origin in response', () => {
-          const promise = xhr.fetchJson('/get');
-          xhrCreated.then(
-              xhr => xhr.respond(
-                  200, {
-                    'Content-Type': 'application/json',
-                    'Access-Control-Expose-Headers':
-                        'AMP-Access-Control-Allow-Source-Origin',
-                    'AMP-Access-Control-Allow-Source-Origin':
-                        'https://other.com',
-                  },
-                  '{}'));
-          return promise.then(() => {
-            throw new Error('UNREACHABLE');
-          }, res => {
-            expect(res).to.match(/Returned AMP-Access-.* is not equal/);
+          it(
+            'should not include __amp_source_origin if ampCors ' +
+              'set to false',
+            () => {
+              xhr.fetchJson('/get', {ampCors: false});
+              return xhrCreated.then(xhr =>
+                expect(noOrigin(xhr.url)).to.equal('/get')
+              );
+            }
+          );
+
+          it('should accept AMP origin when received in response', () => {
+            const promise = xhr.fetchJson('/get');
+            xhrCreated.then(xhr =>
+              xhr.respond(
+                200,
+                {
+                  'Content-Type': 'application/json',
+                  'Access-Control-Expose-Headers':
+                    'AMP-Access-Control-Allow-Source-Origin',
+                  'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+                },
+                '{}'
+              )
+            );
+            return promise;
           });
-        });
 
-        it('should require AMP origin in response for when request', () => {
-          const promise = xhr.fetchJson('/get');
-          xhrCreated.then(
-              xhr => xhr.respond(
-                  200, {
-                    'Content-Type': 'application/json',
-                  },
-                  '{}'));
-          return promise.then(() => {
-            throw new Error('UNREACHABLE');
-          }, error => {
-            expect(error.message).to.contain('Response must contain');
+          it('should deny AMP origin for different origin in response', () => {
+            const promise = xhr.fetchJson('/get');
+            xhrCreated.then(xhr =>
+              xhr.respond(
+                200,
+                {
+                  'Content-Type': 'application/json',
+                  'Access-Control-Expose-Headers':
+                    'AMP-Access-Control-Allow-Source-Origin',
+                  'AMP-Access-Control-Allow-Source-Origin': 'https://other.com',
+                },
+                '{}'
+              )
+            );
+            return promise.then(
+              () => {
+                throw new Error('UNREACHABLE');
+              },
+              res => {
+                expect(res).to.match(/Returned AMP-Access-.* is not equal/);
+              }
+            );
           });
-        });
 
-        describe('viewer visibility', () => {
-          afterEach(() => {
-            test.win.fetch.restore();
+          it('should require AMP origin in response for when request', () => {
+            const promise = xhr.fetchJson('/get');
+            xhrCreated.then(xhr =>
+              xhr.respond(
+                200,
+                {
+                  'Content-Type': 'application/json',
+                },
+                '{}'
+              )
+            );
+            return promise.then(
+              () => {
+                throw new Error('UNREACHABLE');
+              },
+              error => {
+                expect(error.message).to.contain('Response must contain');
+              }
+            );
           });
-          it('should not call fetch if view is not visible ', () => {
-            const fetchCall = sandbox.spy(test.win, 'fetch');
-            ampdocViewerStub.returns({
-              whenFirstVisible: () => Promise.reject(),
+
+          describe('viewer visibility', () => {
+            afterEach(() => {
+              test.win.fetch.restore();
             });
-            xhr.fetchJson('/get', {ampCors: false});
-            expect(fetchCall.notCalled).to.be.true;
-          });
-          it('should call fetch if view is visible ', () => {
-            const fetchCall = sandbox.spy(test.win, 'fetch');
-            ampdocViewerStub.returns({
-              whenFirstVisible: () => Promise.resolve(),
+            it('should not call fetch if view is not visible ', () => {
+              const fetchCall = sandbox.spy(test.win, 'fetch');
+              ampdocViewerStub.returns({
+                whenFirstVisible: () => Promise.reject(),
+              });
+              xhr.fetchJson('/get', {ampCors: false});
+              expect(fetchCall.notCalled).to.be.true;
             });
-            const fetch = xhr.fetchJson('/get', {ampCors: false});
-            fetch.then(() => {
-              expect(fetchCall.calledOnce).to.be.true;
+            it('should call fetch if view is visible ', () => {
+              const fetchCall = sandbox.spy(test.win, 'fetch');
+              ampdocViewerStub.returns({
+                whenFirstVisible: () => Promise.resolve(),
+              });
+              const fetch = xhr.fetchJson('/get', {ampCors: false});
+              fetch.then(() => {
+                expect(fetchCall.calledOnce).to.be.true;
+              });
             });
           });
         });
-      });
-    }
-
-    describe('AMP-Same-Origin', () => {
-      beforeEach(() => {
-        xhr = xhrServiceForTesting(test.win);
-      });
+      }
 
-      it('should not be set for cross origin requests', () => {
-        const init = {};
-        xhr.fetchJson('/whatever', init);
-        expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
-      });
+      describe('AMP-Same-Origin', () => {
+        beforeEach(() => {
+          xhr = xhrServiceForTesting(test.win);
+        });
 
-      it('should be set for all same origin GET requests', () => {
-        const init = {};
-        location.href = '/path';
-        xhr.fetchJson('/whatever', init);
-        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
-      });
+        it('should not be set for cross origin requests', () => {
+          const init = {};
+          xhr.fetchJson('/whatever', init);
+          expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
+        });
 
-      it('should be set for all same origin POST requests', () => {
-        const init = {method: 'post', body: {}};
-        location.href = '/path';
-        xhr.fetchJson('/whatever', init);
-        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
-      });
+        it('should be set for all same origin GET requests', () => {
+          const init = {};
+          location.href = '/path';
+          xhr.fetchJson('/whatever', init);
+          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        });
 
-      it('should check origin not source origin', () => {
-        let init = {method: 'post', body: {}};
-        location.href = 'https://cdn.ampproject.org/c/s/example.com/hello/path';
-        xhr.fetchJson('https://example.com/what/ever', init);
-        expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
+        it('should be set for all same origin POST requests', () => {
+          const init = {method: 'post', body: {}};
+          location.href = '/path';
+          xhr.fetchJson('/whatever', init);
+          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        });
 
-        init = {method: 'post', body: {}};
-        location.href = 'https://example.com/hello/path';
-        xhr.fetchJson('https://example.com/what/ever', init);
-        expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        it('should check origin not source origin', () => {
+          let init = {method: 'post', body: {}};
+          location.href =
+            'https://cdn.ampproject.org/c/s/example.com/hello/path';
+          xhr.fetchJson('https://example.com/what/ever', init);
+          expect(init['headers']['AMP-Same-Origin']).to.be.undefined;
+
+          init = {method: 'post', body: {}};
+          location.href = 'https://example.com/hello/path';
+          xhr.fetchJson('https://example.com/what/ever', init);
+          expect(init['headers']['AMP-Same-Origin']).to.equal('true');
+        });
       });
-    });
 
-    describe(test.desc, () => {
-      const {testServerPort} = window.ampTestRuntimeConfig;
-      const baseUrl = `http://localhost:${testServerPort}`;
+      describe(test.desc, () => {
+        const {testServerPort} = window.ampTestRuntimeConfig;
+        const baseUrl = `http://localhost:${testServerPort}`;
 
-      beforeEach(() => {
-        xhr = xhrServiceForTesting(test.win);
-      });
+        beforeEach(() => {
+          xhr = xhrServiceForTesting(test.win);
+        });
 
-      describe('assertSuccess', () => {
-        function createResponseInstance(body, init) {
-          return new Response(body, init);
-        }
-        const mockXhr = {
-          status: 200,
-          headers: {
-            'Content-Type': 'plain/text',
-          },
-          getResponseHeader: () => '',
-        };
+        describe('assertSuccess', () => {
+          function createResponseInstance(body, init) {
+            return new Response(body, init);
+          }
+          const mockXhr = {
+            status: 200,
+            headers: {
+              'Content-Type': 'plain/text',
+            },
+            getResponseHeader: () => '',
+          };
 
-        it('should resolve if success', () => {
-          mockXhr.status = 200;
-          return assertSuccess(createResponseInstance('', mockXhr))
-              .then(response => {
+          it('should resolve if success', () => {
+            mockXhr.status = 200;
+            return assertSuccess(createResponseInstance('', mockXhr)).then(
+              response => {
                 expect(response.status).to.equal(200);
-              }).should.not.be.rejected;
-        });
+              }
+            ).should.not.be.rejected;
+          });
 
-        it('should reject if error', () => {
-          mockXhr.status = 500;
-          return assertSuccess(createResponseInstance('', mockXhr))
-              .should.be.rejected;
-        });
+          it('should reject if error', () => {
+            mockXhr.status = 500;
+            return assertSuccess(createResponseInstance('', mockXhr)).should.be
+              .rejected;
+          });
 
-        it('should include response in error', () => {
-          mockXhr.status = 500;
-          return assertSuccess(createResponseInstance('', mockXhr))
-              .catch(error => {
+          it('should include response in error', () => {
+            mockXhr.status = 500;
+            return assertSuccess(createResponseInstance('', mockXhr)).catch(
+              error => {
                 expect(error.response).to.exist;
                 expect(error.response.status).to.equal(500);
-              });
-        });
+              }
+            );
+          });
 
-        it('should not resolve after rejecting promise', () => {
-          mockXhr.status = 500;
-          mockXhr.responseText = '{"a": "hello"}';
-          mockXhr.headers['Content-Type'] = 'application/json';
-          mockXhr.getResponseHeader = () => 'application/json';
-          return assertSuccess(createResponseInstance('{"a": 2}', mockXhr))
+          it('should not resolve after rejecting promise', () => {
+            mockXhr.status = 500;
+            mockXhr.responseText = '{"a": "hello"}';
+            mockXhr.headers['Content-Type'] = 'application/json';
+            mockXhr.getResponseHeader = () => 'application/json';
+            return assertSuccess(createResponseInstance('{"a": 2}', mockXhr))
               .should.not.be.fulfilled;
+          });
         });
-      });
 
-      it('should do simple JSON fetch', () => {
-        sandbox.stub(user(), 'assert');
-        return xhr.fetchJson(`${baseUrl}/get?k=v1`)
+        it('should do simple JSON fetch', () => {
+          sandbox.stub(user(), 'assert');
+          return xhr
+            .fetchJson(`${baseUrl}/get?k=v1`)
             .then(res => res.json())
             .then(res => {
               expect(res).to.exist;
               expect(res['args']['k']).to.equal('v1');
             });
-      });
+        });
 
-      it('should redirect fetch', () => {
-        const url = `${baseUrl}/redirect-to?url=`
-            + encodeURIComponent(`${baseUrl}/get?k=v2`);
-        return xhr.fetchJson(url, {ampCors: false})
+        it('should redirect fetch', () => {
+          const url =
+            `${baseUrl}/redirect-to?url=` +
+            encodeURIComponent(`${baseUrl}/get?k=v2`);
+          return xhr
+            .fetchJson(url, {ampCors: false})
             .then(res => res.json())
             .then(res => {
               expect(res).to.exist;
               expect(res['args']['k']).to.equal('v2');
             });
-      });
-
-      it('should fail fetch for 400-error', () => {
-        const url = `${baseUrl}/status/404`;
-        return xhr.fetchJson(url).then(() => {
-          throw new Error('UNREACHABLE');
-        }, error => {
-          expect(error.message).to.contain('HTTP error 404');
         });
-      });
 
-      it('should fail fetch for 500-error', () => {
-        const url = `${baseUrl}/status/500?CID=cid`;
-        return xhr.fetchJson(url).then(() => {
-          throw new Error('UNREACHABLE');
-        }, error => {
-          expect(error.message).to.contain('HTTP error 500');
+        it('should fail fetch for 400-error', () => {
+          const url = `${baseUrl}/status/404`;
+          return xhr.fetchJson(url).then(
+            () => {
+              throw new Error('UNREACHABLE');
+            },
+            error => {
+              expect(error.message).to.contain('HTTP error 404');
+            }
+          );
         });
-      });
 
+        it('should fail fetch for 500-error', () => {
+          const url = `${baseUrl}/status/500?CID=cid`;
+          return xhr.fetchJson(url).then(
+            () => {
+              throw new Error('UNREACHABLE');
+            },
+            error => {
+              expect(error.message).to.contain('HTTP error 500');
+            }
+          );
+        });
 
-      it('should NOT succeed CORS setting cookies without credentials', () => {
-        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-        return xhr.fetchJson(url).then(res => {
-          expect(res).to.exist;
-          expect(getCookie(window, cookieName)).to.be.null;
+        it('should NOT succeed CORS setting cookies without credentials', () => {
+          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+          return xhr.fetchJson(url).then(res => {
+            expect(res).to.exist;
+            expect(getCookie(window, cookieName)).to.be.null;
+          });
         });
-      });
 
-      it('should succeed CORS setting cookies with credentials', () => {
-        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-        return xhr.fetchJson(url, {credentials: 'include'}).then(res => {
-          expect(res).to.exist;
-          expect(getCookie(window, cookieName)).to.equal('v1');
+        it('should succeed CORS setting cookies with credentials', () => {
+          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+          return xhr.fetchJson(url, {credentials: 'include'}).then(res => {
+            expect(res).to.exist;
+            expect(getCookie(window, cookieName)).to.equal('v1');
+          });
         });
-      });
 
-      it('should ignore CORS setting cookies w/omit credentials', () => {
-        const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
-        const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
-        return xhr.fetchJson(url, {credentials: 'omit'}).then(res => {
-          expect(res).to.exist;
-          expect(getCookie(window, cookieName)).to.be.null;
+        it('should ignore CORS setting cookies w/omit credentials', () => {
+          const cookieName = 'TEST_CORS_' + Math.round(Math.random() * 10000);
+          const url = `${baseUrl}/cookies/set?${cookieName}=v1`;
+          return xhr.fetchJson(url, {credentials: 'omit'}).then(res => {
+            expect(res).to.exist;
+            expect(getCookie(window, cookieName)).to.be.null;
+          });
         });
-      });
 
-      it('should NOT succeed CORS with invalid credentials', () => {
-        allowConsoleError(() => { expect(() => {
-          xhr.fetchJson('https://acme.org/', {credentials: null});
-        }).to.throw(/Only credentials=include|omit support: null/); });
-      });
+        it('should NOT succeed CORS with invalid credentials', () => {
+          allowConsoleError(() => {
+            expect(() => {
+              xhr.fetchJson('https://acme.org/', {credentials: null});
+            }).to.throw(/Only credentials=include|omit support: null/);
+          });
+        });
 
-      it('should expose HTTP headers', () => {
-        const url = `${baseUrl}/response-headers?AMP-Header=Value1&` +
+        it('should expose HTTP headers', () => {
+          const url =
+            `${baseUrl}/response-headers?AMP-Header=Value1&` +
             'Access-Control-Expose-Headers=AMP-Header';
-        return xhr.fetchAmpCors_(url, {ampCors: false}).then(res => {
-          expect(res.headers.get('AMP-Header')).to.equal('Value1');
+          return xhr.fetchAmpCors_(url, {ampCors: false}).then(res => {
+            expect(res.headers.get('AMP-Header')).to.equal('Value1');
+          });
         });
-      });
 
-      it('should omit request details for privacy', () => {
-        // NOTE THIS IS A BAD PORT ON PURPOSE.
-        return xhr.fetchJson('http://localhost:31863/status/500').then(() => {
-          throw new Error('UNREACHABLE');
-        }, error => {
-          const {message} = error;
-          expect(message).to.contain('http://localhost:31863');
-          expect(message).not.to.contain('status/500');
-          expect(message).not.to.contain('CID');
+        it('should omit request details for privacy', () => {
+          // NOTE THIS IS A BAD PORT ON PURPOSE.
+          return xhr.fetchJson('http://localhost:31863/status/500').then(
+            () => {
+              throw new Error('UNREACHABLE');
+            },
+            error => {
+              const {message} = error;
+              expect(message).to.contain('http://localhost:31863');
+              expect(message).not.to.contain('status/500');
+              expect(message).not.to.contain('CID');
+            }
+          );
         });
       });
-    });
-
-    describe('#fetchText', () => {
-      const TEST_TEXT = 'test text';
-      let fetchStub;
 
-      beforeEach(() => {
-        xhr = xhrServiceForTesting(test.win);
-        fetchStub = sandbox.stub(xhr, 'fetchAmpCors_').callsFake(
-            () => Promise.resolve(new Response(TEST_TEXT)));
-      });
+      describe('#fetchText', () => {
+        const TEST_TEXT = 'test text';
+        let fetchStub;
 
-      it('should be able to fetch a document', () => {
-        const promise = xhr.fetchText('/text.html');
-        expect(fetchStub).to.be.calledWith('/text.html', {
-          method: 'GET',
-          headers: {'Accept': 'text/plain'},
+        beforeEach(() => {
+          xhr = xhrServiceForTesting(test.win);
+          fetchStub = sandbox
+            .stub(xhr, 'fetchAmpCors_')
+            .callsFake(() => Promise.resolve(new Response(TEST_TEXT)));
         });
-        return promise.then(res => {
-          return res.text();
-        }).then(text => {
-          expect(text).to.equal(TEST_TEXT);
+
+        it('should be able to fetch a document', () => {
+          const promise = xhr.fetchText('/text.html');
+          expect(fetchStub).to.be.calledWith('/text.html', {
+            method: 'GET',
+            headers: {'Accept': 'text/plain'},
+          });
+          return promise
+            .then(res => {
+              return res.text();
+            })
+            .then(text => {
+              expect(text).to.equal(TEST_TEXT);
+            });
         });
       });
-    });
-
-    describe('#fetch ' + test.desc, () => {
-      const creative = '<html><body>This is a creative简</body></html>';
-
-      beforeEach(() => xhr = xhrServiceForTesting(test.win));
 
-      // Using the Native fetch, we can't mock the XHR request, so an actual
-      // HTTP request would be sent to the server.  Only execute this test
-      // when we're on the PolyFill case, so that we can mock the XHR and
-      // control the response.
-      if (test.desc != 'Native') {
-        it('should be able to fetch a response', () => {
-          setupMockXhr();
-          const promise = xhr.fetch(
-              '/index.html').then(response => {
-            expect(response.headers.get('X-foo-header')).to
-                .equal('foo data');
-            expect(response.headers.get('X-bar-header')).to
-                .equal('bar data');
-            response.arrayBuffer().then(
-                bytes => utf8FromArrayBuffer(bytes)).then(text => {
-              expect(text).to.equal(creative);
+      describe('#fetch ' + test.desc, () => {
+        const creative = '<html><body>This is a creative简</body></html>';
+
+        beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
+
+        // Using the Native fetch, we can't mock the XHR request, so an actual
+        // HTTP request would be sent to the server.  Only execute this test
+        // when we're on the PolyFill case, so that we can mock the XHR and
+        // control the response.
+        if (test.desc != 'Native') {
+          it('should be able to fetch a response', () => {
+            setupMockXhr();
+            const promise = xhr.fetch('/index.html').then(response => {
+              expect(response.headers.get('X-foo-header')).to.equal('foo data');
+              expect(response.headers.get('X-bar-header')).to.equal('bar data');
+              response
+                .arrayBuffer()
+                .then(bytes => utf8FromArrayBuffer(bytes))
+                .then(text => {
+                  expect(text).to.equal(creative);
+                });
             });
+            xhrCreated.then(xhr =>
+              xhr.respond(
+                200,
+                {
+                  'Content-Type': 'text/xml',
+                  'Access-Control-Expose-Headers':
+                    'AMP-Access-Control-Allow-Source-Origin',
+                  'AMP-Access-Control-Allow-Source-Origin': 'https://acme.com',
+                  'X-foo-header': 'foo data',
+                  'X-bar-header': 'bar data',
+                },
+                creative
+              )
+            );
+            return promise;
           });
-          xhrCreated.then(
-              xhr => xhr.respond(
-                  200, {
-                    'Content-Type': 'text/xml',
-                    'Access-Control-Expose-Headers':
-                        'AMP-Access-Control-Allow-Source-Origin',
-                    'AMP-Access-Control-Allow-Source-Origin':
-                        'https://acme.com',
-                    'X-foo-header': 'foo data',
-                    'X-bar-header': 'bar data',
-                  },
-                  creative));
-          return promise;
-        });
-      }
+        }
+      });
     });
-  });
 
-  scenarios.forEach(test => {
-    const {testServerPort} = window.ampTestRuntimeConfig;
-    const url = `http://localhost:${testServerPort}/post`;
+    scenarios.forEach(test => {
+      const {testServerPort} = window.ampTestRuntimeConfig;
+      const url = `http://localhost:${testServerPort}/post`;
 
-    describe(test.desc + ' POST', () => {
-      let xhr;
+      describe(test.desc + ' POST', () => {
+        let xhr;
 
-      beforeEach(() => xhr = xhrServiceForTesting(test.win));
+        beforeEach(() => (xhr = xhrServiceForTesting(test.win)));
 
-      if (test.desc != 'Native') {
-        it('should have required json POST headers by default', () => {
-          setupMockXhr();
-          xhr.fetchJson(url, {
-            method: 'POST',
-            body: {
-              hello: 'world',
-            },
-            headers: {
-              'Other': 'another',
-            },
-          });
-          return xhrCreated.then(
-              xhr => expect(xhr.requestHeaders).to.deep.equal({
+        if (test.desc != 'Native') {
+          it('should have required json POST headers by default', () => {
+            setupMockXhr();
+            xhr.fetchJson(url, {
+              method: 'POST',
+              body: {
+                hello: 'world',
+              },
+              headers: {
+                'Other': 'another',
+              },
+            });
+            return xhrCreated.then(xhr =>
+              expect(xhr.requestHeaders).to.deep.equal({
                 'Accept': 'application/json',
                 'Content-Type': 'text/plain;charset=utf-8',
                 'Other': 'another', // Not removed when other headers set.
-              }));
+              })
+            );
+          });
+        }
+
+        it("should get an echo'd response back", () => {
+          return xhr
+            .fetchJson(url, {
+              method: 'POST',
+              body: {
+                hello: 'world',
+              },
+              headers: {
+                'Content-Type': 'application/json;charset=utf-8',
+              },
+            })
+            .then(res => res.json())
+            .then(res => {
+              expect(res.json).to.jsonEqual({
+                hello: 'world',
+              });
+            });
         });
-      }
 
-      it('should get an echo\'d response back', () => {
-        return xhr.fetchJson(url, {
-          method: 'POST',
-          body: {
-            hello: 'world',
-          },
-          headers: {
-            'Content-Type': 'application/json;charset=utf-8',
-          },
-        }).then(res => res.json()).then(res => {
-          expect(res.json).to.jsonEqual({
-            hello: 'world',
+        it('should throw when `body` is not an object or array', () => {
+          const objectFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: {
+              hello: 'world',
+            },
+          });
+          const arrayFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: ['hello', 'world'],
+          });
+          const stringFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: 'hello world',
+          });
+          const numberFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: 3,
+          });
+          const booleanFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: true,
+          });
+          const nullFn = xhr.fetchJson.bind(xhr, url, {
+            method: 'POST',
+            body: null,
           });
-        });
-      });
 
-      it('should throw when `body` is not an object or array', () => {
-        const objectFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: {
-            hello: 'world',
-          },
-        });
-        const arrayFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: ['hello', 'world'],
-        });
-        const stringFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: 'hello world',
-        });
-        const numberFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: 3,
-        });
-        const booleanFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: true,
-        });
-        const nullFn = xhr.fetchJson.bind(xhr, url, {
-          method: 'POST',
-          body: null,
+          expect(objectFn).to.not.throw();
+          expect(arrayFn).to.not.throw();
+          allowConsoleError(() => {
+            expect(stringFn).to.throw();
+          });
+          allowConsoleError(() => {
+            expect(numberFn).to.throw();
+          });
+          allowConsoleError(() => {
+            expect(booleanFn).to.throw();
+          });
+          allowConsoleError(() => {
+            expect(nullFn).to.throw();
+          });
         });
-
-        expect(objectFn).to.not.throw();
-        expect(arrayFn).to.not.throw();
-        allowConsoleError(() => { expect(stringFn).to.throw(); });
-        allowConsoleError(() => { expect(numberFn).to.throw(); });
-        allowConsoleError(() => { expect(booleanFn).to.throw(); });
-        allowConsoleError(() => { expect(nullFn).to.throw(); });
       });
-
     });
-  });
 
-  describe('interceptor', () => {
-    const origin = 'https://acme.com';
-
-    let interceptionEnabledWin;
-    let optedInDoc;
-    let sendMessageStub;
-    function getDefaultResponseOptions() {
-      return {
-        headers: [
-          ['AMP-Access-Control-Allow-Source-Origin', origin],
-        ],
-      };
-    }
+    describe('interceptor', () => {
+      const origin = 'https://acme.com';
 
-    function getDefaultResponsePromise() {
-      return Promise.resolve({init: getDefaultResponseOptions()});
-    }
+      let interceptionEnabledWin;
+      let optedInDoc;
+      let sendMessageStub;
+      function getDefaultResponseOptions() {
+        return {
+          headers: [['AMP-Access-Control-Allow-Source-Origin', origin]],
+        };
+      }
 
-    beforeEach(() => {
-      optedInDoc = window.document.implementation.createHTMLDocument('');
-      optedInDoc.documentElement.setAttribute('allow-xhr-interception', '');
+      function getDefaultResponsePromise() {
+        return Promise.resolve({init: getDefaultResponseOptions()});
+      }
 
-      ampdocServiceForStub.returns({
-        isSingleDoc: () => true,
-        getAmpDoc: () => ({getRootNode: () => optedInDoc}),
-      });
-      viewer = {
-        hasCapability: () => true,
-        isTrustedViewer: () => Promise.resolve(true),
-        sendMessageAwaitResponse: getDefaultResponsePromise,
-        whenFirstVisible: () => Promise.resolve(),
-      };
-      sendMessageStub = sandbox.stub(viewer, 'sendMessageAwaitResponse');
-      sendMessageStub.returns(getDefaultResponsePromise());
-      ampdocViewerStub.returns(viewer);
-      interceptionEnabledWin = {
-        location: {
-          href: `${origin}/path`,
-        },
-        fetch: () =>
-          Promise.resolve(new Response('', getDefaultResponseOptions())),
-      };
-    });
+      beforeEach(() => {
+        optedInDoc = window.document.implementation.createHTMLDocument('');
+        optedInDoc.documentElement.setAttribute('allow-xhr-interception', '');
 
-    it('should not intercept if AMP doc is not single', () => {
-      ampdocServiceForStub.returns({
-        isSingleDoc: () => false,
-        getAmpDoc: () => ({getRootNode: () => optedInDoc}),
+        ampdocServiceForStub.returns({
+          isSingleDoc: () => true,
+          getAmpDoc: () => ({getRootNode: () => optedInDoc}),
+        });
+        viewer = {
+          hasCapability: () => true,
+          isTrustedViewer: () => Promise.resolve(true),
+          sendMessageAwaitResponse: getDefaultResponsePromise,
+          whenFirstVisible: () => Promise.resolve(),
+        };
+        sendMessageStub = sandbox.stub(viewer, 'sendMessageAwaitResponse');
+        sendMessageStub.returns(getDefaultResponsePromise());
+        ampdocViewerStub.returns(viewer);
+        interceptionEnabledWin = {
+          location: {
+            href: `${origin}/path`,
+          },
+          fetch: () =>
+            Promise.resolve(new Response('', getDefaultResponseOptions())),
+        };
       });
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://cdn.ampproject.org')
-          .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      it('should not intercept if AMP doc is not single', () => {
+        ampdocServiceForStub.returns({
+          isSingleDoc: () => false,
+          getAmpDoc: () => ({getRootNode: () => optedInDoc}),
+        });
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-    it('should not intercept if AMP doc does not opt in', () => {
-      const nonOptedInDoc =
-          window.document.implementation.createHTMLDocument('');
-      ampdocServiceForStub.returns({
-        isSingleDoc: () => true,
-        getAmpDoc: () => ({getRootNode: () => nonOptedInDoc}),
+        return xhr
+          .fetch('https://cdn.ampproject.org')
+          .then(() => expect(sendMessageStub).to.not.have.been.called);
       });
 
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should not intercept if AMP doc does not opt in', () => {
+        const nonOptedInDoc = window.document.implementation.createHTMLDocument(
+          ''
+        );
+        ampdocServiceForStub.returns({
+          isSingleDoc: () => true,
+          getAmpDoc: () => ({getRootNode: () => nonOptedInDoc}),
+        });
 
-      return xhr.fetch('https://cdn.ampproject.org')
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+
+        return xhr
+          .fetch('https://cdn.ampproject.org')
           .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      });
 
-    it('should not intercept if viewer is not capable', () => {
-      sandbox.stub(viewer, 'hasCapability').withArgs('xhrInterceptor')
+      it('should not intercept if viewer is not capable', () => {
+        sandbox
+          .stub(viewer, 'hasCapability')
+          .withArgs('xhrInterceptor')
           .returns(false);
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://cdn.ampproject.org')
+        return xhr
+          .fetch('https://cdn.ampproject.org')
           .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      });
 
-    it('should not intercept if viewer untrusted and non-dev mode', () => {
-      sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(false));
-      interceptionEnabledWin.AMP_DEV_MODE = false;
+      it('should not intercept if viewer untrusted and non-dev mode', () => {
+        sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(false));
+        interceptionEnabledWin.AMP_DEV_MODE = false;
 
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://cdn.ampproject.org')
+        return xhr
+          .fetch('https://cdn.ampproject.org')
           .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      });
 
-    it('should not intercept a 1p cdn from subdomain', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should not intercept a 1p cdn from subdomain', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://subdomain-model.cdn.ampproject.org/ww.js')
+        return xhr
+          .fetch('https://subdomain-model.cdn.ampproject.org/ww.js')
           .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      });
 
-    it('should not intercept a 1p cdn resource', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should not intercept a 1p cdn resource', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://cdn.ampproject.org/ww.js')
+        return xhr
+          .fetch('https://cdn.ampproject.org/ww.js')
           .then(() => expect(sendMessageStub).to.not.have.been.called);
-    });
+      });
 
-    it('should intercept if viewer untrusted but dev mode', () => {
-      sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(false));
-      interceptionEnabledWin.AMP_DEV_MODE = true;
+      it('should intercept if viewer untrusted but dev mode', () => {
+        sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(false));
+        interceptionEnabledWin.AMP_DEV_MODE = true;
 
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://www.some-url.org/some-resource/')
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/')
           .then(() => expect(sendMessageStub).to.have.been.called);
-    });
+      });
 
-    it('should intercept if non-dev mode but viewer trusted', () => {
-      sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(true));
-      interceptionEnabledWin.AMP_DEV_MODE = false;
+      it('should intercept if non-dev mode but viewer trusted', () => {
+        sandbox.stub(viewer, 'isTrustedViewer').returns(Promise.resolve(true));
+        interceptionEnabledWin.AMP_DEV_MODE = false;
 
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://www.some-url.org/some-resource/')
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/')
           .then(() => expect(sendMessageStub).to.have.been.called);
-    });
+      });
 
-    it('should send viewer message named `xhr`', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should send viewer message named `xhr`', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://www.some-url.org/some-resource/')
+        return xhr
+          .fetch('https://www.some-url.org/some-resource/')
           .then(() =>
             expect(sendMessageStub).to.have.been.calledWithMatch(
-                'xhr', sinon.match.any));
-    });
+              'xhr',
+              sinon.match.any
+            )
+          );
+      });
 
-    it('should post correct structurally-cloneable GET request', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should post correct structurally-cloneable GET request', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr.fetch('https://www.some-url.org/some-resource/')
-          .then(() =>
-            expect(sendMessageStub).to.have.been.calledWithMatch(
-                sinon.match.any, {
-                  originalRequest: {
-                    input: 'https://www.some-url.org/some-resource/' +
-                          '?__amp_source_origin=https%3A%2F%2Facme.com',
-                    init: {
-                      headers: {},
-                      method: 'GET',
-                      requireAmpResponseSourceOrigin: true,
-                    },
-                  },
-                }));
-    });
+        return xhr.fetch('https://www.some-url.org/some-resource/').then(() =>
+          expect(sendMessageStub).to.have.been.calledWithMatch(
+            sinon.match.any,
+            {
+              originalRequest: {
+                input:
+                  'https://www.some-url.org/some-resource/' +
+                  '?__amp_source_origin=https%3A%2F%2Facme.com',
+                init: {
+                  headers: {},
+                  method: 'GET',
+                  requireAmpResponseSourceOrigin: true,
+                },
+              },
+            }
+          )
+        );
+      });
 
-    it('should post correct structurally-cloneable JSON request', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should post correct structurally-cloneable JSON request', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return xhr
+        return xhr
           .fetch('https://www.some-url.org/some-resource/', {
             method: 'POST',
             headers: {'Content-Type': 'application/json;charset=utf-8'},
@@ -785,89 +870,103 @@ describe.configure().skipSafari().run('XHR', function() {
           })
           .then(() =>
             expect(sendMessageStub).to.have.been.calledWithMatch(
-                sinon.match.any, {
-                  originalRequest: {
-                    input: 'https://www.some-url.org/some-resource/' +
-                          '?__amp_source_origin=https%3A%2F%2Facme.com',
-                    init: {
-                      headers: {
-                        'Content-Type':
-                              'application/json;charset=utf-8',
-                      },
-                      body: '{"a":42,"b":[24,true]}',
-                      method: 'POST',
-                      requireAmpResponseSourceOrigin: true,
+              sinon.match.any,
+              {
+                originalRequest: {
+                  input:
+                    'https://www.some-url.org/some-resource/' +
+                    '?__amp_source_origin=https%3A%2F%2Facme.com',
+                  init: {
+                    headers: {
+                      'Content-Type': 'application/json;charset=utf-8',
                     },
+                    body: '{"a":42,"b":[24,true]}',
+                    method: 'POST',
+                    requireAmpResponseSourceOrigin: true,
                   },
-                }));
-    });
+                },
+              }
+            )
+          );
+      });
 
-    it('should post correct structurally-cloneable FormData request', () => {
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should post correct structurally-cloneable FormData request', () => {
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      const fakeWin = null;
-      sandbox.stub(Services, 'platformFor').returns({
-        isIos() { return false; },
-      });
+        const fakeWin = null;
+        sandbox.stub(Services, 'platformFor').returns({
+          isIos() {
+            return false;
+          },
+        });
 
-      const formData = createFormDataWrapper(fakeWin);
-      formData.append('a', 42);
-      formData.append('b', '24');
-      formData.append('b', true);
+        const formData = createFormDataWrapper(fakeWin);
+        formData.append('a', 42);
+        formData.append('b', '24');
+        formData.append('b', true);
 
-      return xhr
+        return xhr
           .fetch('https://www.some-url.org/some-resource/', {
             method: 'POST',
             body: formData,
           })
           .then(() =>
             expect(sendMessageStub).to.have.been.calledWithMatch(
-                sinon.match.any, {
-                  originalRequest: {
-                    input: 'https://www.some-url.org/some-resource/' +
-                          '?__amp_source_origin=https%3A%2F%2Facme.com',
-                    init: {
-                      headers: {
-                        'Content-Type':
-                              'multipart/form-data;charset=utf-8',
-                      },
-                      body: [['a', '42'], ['b', '24'], ['b', 'true']],
-                      method: 'POST',
-                      requireAmpResponseSourceOrigin: true,
+              sinon.match.any,
+              {
+                originalRequest: {
+                  input:
+                    'https://www.some-url.org/some-resource/' +
+                    '?__amp_source_origin=https%3A%2F%2Facme.com',
+                  init: {
+                    headers: {
+                      'Content-Type': 'multipart/form-data;charset=utf-8',
                     },
+                    body: [['a', '42'], ['b', '24'], ['b', 'true']],
+                    method: 'POST',
+                    requireAmpResponseSourceOrigin: true,
                   },
-                }));
-    });
+                },
+              }
+            )
+          );
+      });
 
-    it('should be rejected when response undefined', () => {
-      sendMessageStub.returns(Promise.resolve());
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should be rejected when response undefined', () => {
+        sendMessageStub.returns(Promise.resolve());
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return expect(xhr.fetch('https://www.some-url.org/some-resource/'))
-          .to.eventually.be.rejectedWith(Error, 'Object expected: undefined');
-    });
+        return expect(
+          xhr.fetch('https://www.some-url.org/some-resource/')
+        ).to.eventually.be.rejectedWith(Error, 'Object expected: undefined');
+      });
 
-    it('should be rejected when response null', () => {
-      sendMessageStub.returns(Promise.resolve(null));
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should be rejected when response null', () => {
+        sendMessageStub.returns(Promise.resolve(null));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return expect(xhr.fetch('https://www.some-url.org/some-resource/'))
-          .to.eventually.be.rejectedWith(Error, 'Object expected: null');
-    });
+        return expect(
+          xhr.fetch('https://www.some-url.org/some-resource/')
+        ).to.eventually.be.rejectedWith(Error, 'Object expected: null');
+      });
 
-    it('should be rejected when response is string', () => {
-      sendMessageStub.returns(Promise.resolve('response text'));
-      const xhr = xhrServiceForTesting(interceptionEnabledWin);
+      it('should be rejected when response is string', () => {
+        sendMessageStub.returns(Promise.resolve('response text'));
+        const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-      return expect(xhr.fetch('https://www.some-url.org/some-resource/')).to.eventually
-          .be.rejectedWith(Error, 'Object expected: response text');
-    });
+        return expect(
+          xhr.fetch('https://www.some-url.org/some-resource/')
+        ).to.eventually.be.rejectedWith(
+          Error,
+          'Object expected: response text'
+        );
+      });
 
-    describe('when native Response type is available', () => {
-      beforeEach(() => interceptionEnabledWin.Response = window.Response);
+      describe('when native Response type is available', () => {
+        beforeEach(() => (interceptionEnabledWin.Response = window.Response));
 
-      it('should return correct non-document response', () => {
-        sendMessageStub.returns(
+        it('should return correct non-document response', () => {
+          sendMessageStub.returns(
             Promise.resolve({
               body: '{"content":32}',
               init: {
@@ -879,31 +978,40 @@ describe.configure().skipSafari().run('XHR', function() {
                   ['AMP-Access-Control-Allow-Source-Origin', origin],
                 ],
               },
-            }));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+            })
+          );
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/').then(response => {
-          expect(response.headers.get('a')).to.equal('2');
-          expect(response.headers.get('b')).to.equal('false');
-          expect(response.headers.get('Amp-Access-Control-Allow-source-origin'))
-              .to.equal(origin);
-          expect(response).to.have.property('ok').that.is.true;
-          expect(response).to.have.property('status').that.equals(242);
-          expect(response).to.have.property('statusText')
-              .that.equals('Magic status');
-          return expect(response.text()).to.eventually.equal('{"content":32}');
-          return expect(response.json()).to.eventually.deep.equal({
-            content: 32,
-          });
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/')
+            .then(response => {
+              expect(response.headers.get('a')).to.equal('2');
+              expect(response.headers.get('b')).to.equal('false');
+              expect(
+                response.headers.get('Amp-Access-Control-Allow-source-origin')
+              ).to.equal(origin);
+              expect(response).to.have.property('ok').that.is.true;
+              expect(response)
+                .to.have.property('status')
+                .that.equals(242);
+              expect(response)
+                .to.have.property('statusText')
+                .that.equals('Magic status');
+              return expect(response.text()).to.eventually.equal(
+                '{"content":32}'
+              );
+              return expect(response.json()).to.eventually.deep.equal({
+                content: 32,
+              });
+            });
         });
       });
-    });
 
-    describe('when native Response type is unavailable', () => {
-      beforeEach(() => interceptionEnabledWin.Response = undefined);
+      describe('when native Response type is unavailable', () => {
+        beforeEach(() => (interceptionEnabledWin.Response = undefined));
 
-      it('should return correct non-document response', () => {
-        sendMessageStub.returns(
+        it('should return correct non-document response', () => {
+          sendMessageStub.returns(
             Promise.resolve({
               body: '{"content":32}',
               init: {
@@ -915,88 +1023,105 @@ describe.configure().skipSafari().run('XHR', function() {
                   ['AMP-Access-Control-Allow-Source-Origin', origin],
                 ],
               },
-            }));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+            })
+          );
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/').then(response => {
-          expect(response.headers.get('a')).to.equal('2');
-          expect(response.headers.get('b')).to.equal('false');
-          expect(response.headers.get('Amp-Access-Control-Allow-Source-Origin'))
-              .to.equal(origin);
-          expect(response).to.have.property('ok').that.is.true;
-          expect(response).to.have.property('status').that.equals(242);
-          return expect(response.json()).to.eventually.deep.equal({
-            content: 32,
-          });
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/')
+            .then(response => {
+              expect(response.headers.get('a')).to.equal('2');
+              expect(response.headers.get('b')).to.equal('false');
+              expect(
+                response.headers.get('Amp-Access-Control-Allow-Source-Origin')
+              ).to.equal(origin);
+              expect(response).to.have.property('ok').that.is.true;
+              expect(response)
+                .to.have.property('status')
+                .that.equals(242);
+              return expect(response.json()).to.eventually.deep.equal({
+                content: 32,
+              });
+            });
         });
-      });
 
-      it('should return default response when body/init missing', () => {
-        sendMessageStub.returns(Promise.resolve({}));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        it('should return default response when body/init missing', () => {
+          sendMessageStub.returns(Promise.resolve({}));
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
               expect(response.headers.get('a')).to.be.null;
               expect(response.headers.has('a')).to.be.false;
               expect(response).to.have.property('ok').that.is.true;
-              expect(response).to.have.property('status').that.equals(200);
+              expect(response)
+                .to.have.property('status')
+                .that.equals(200);
               return expect(response.text()).to.eventually.be.empty;
             });
-      });
+        });
 
-      it('should return default response when status/headers missing', () => {
-        sendMessageStub.returns(Promise.resolve({body: '', init: {}}));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        it('should return default response when status/headers missing', () => {
+          sendMessageStub.returns(Promise.resolve({body: '', init: {}}));
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
               expect(response.headers.get('a')).to.be.null;
               expect(response.headers.has('a')).to.be.false;
-              expect(response).to.have.property('status').that.equals(200);
+              expect(response)
+                .to.have.property('status')
+                .that.equals(200);
             });
-      });
+        });
 
-      it('should convert body to string', () => {
-        sendMessageStub.returns(Promise.resolve({body: 32}));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        it('should convert body to string', () => {
+          sendMessageStub.returns(Promise.resolve({body: 32}));
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
               return expect(response.text()).to.eventually.equal('32');
             });
-      });
+        });
 
-      it('should convert status to int', () => {
-        sendMessageStub.returns(Promise.resolve({init: {status: '209.6'}}));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+        it('should convert status to int', () => {
+          sendMessageStub.returns(Promise.resolve({init: {status: '209.6'}}));
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
-              return expect(response).to.have.property('status')
-                  .that.equals(209);
+              return expect(response)
+                .to.have.property('status')
+                .that.equals(209);
             });
-      });
+        });
 
-      it('should convert headers to string', () => {
-        sendMessageStub.returns(
+        it('should convert headers to string', () => {
+          sendMessageStub.returns(
             Promise.resolve({
               init: {
                 headers: [[1, true], [false, NaN], [undefined, null]],
               },
-            }));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+            })
+          );
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
               expect(response.headers.get(1)).to.equal('true');
               expect(response.headers.get('false')).to.equal('NaN');
               expect(response.headers.get('undefined')).to.equal('null');
             });
-      });
+        });
 
-      it('should support case-insensitive header search', () => {
-        sendMessageStub.returns(
+        it('should support case-insensitive header search', () => {
+          sendMessageStub.returns(
             Promise.resolve({
               init: {
                 headers: [
@@ -1005,17 +1130,20 @@ describe.configure().skipSafari().run('XHR', function() {
                   ['x-amp-custom', 'foo'],
                 ],
               },
-            }));
-        const xhr = xhrServiceForTesting(interceptionEnabledWin);
+            })
+          );
+          const xhr = xhrServiceForTesting(interceptionEnabledWin);
 
-        return xhr.fetch('https://www.some-url.org/some-resource/', {ampCors: false})
+          return xhr
+            .fetch('https://www.some-url.org/some-resource/', {ampCors: false})
             .then(response => {
-              expect(response.headers.get('content-type'))
-                  .to.equal('text/plain');
+              expect(response.headers.get('content-type')).to.equal(
+                'text/plain'
+              );
               expect(response.headers.get('Accept')).to.equal('text/plain');
               expect(response.headers.get('X-AMP-CUSTOM')).to.equal('foo');
             });
+        });
       });
     });
   });
-});
diff --git a/test/unit/test-yield.js b/test/unit/test-yield.js
index 957e2698c116..89f1108e4097 100644
--- a/test/unit/test-yield.js
+++ b/test/unit/test-yield.js
@@ -17,21 +17,22 @@ import * as lolex from 'lolex';
 import {macroTask} from '../../testing/yield';
 
 describes.realWin('yield', {}, env => {
-
   let win;
   let clock;
 
   beforeEach(() => {
     win = env.win;
-    clock = lolex.install(
-        {target: win, toFake: ['Date', 'setTimeout', 'clearTimeout']});
+    clock = lolex.install({
+      target: win,
+      toFake: ['Date', 'setTimeout', 'clearTimeout'],
+    });
   });
 
   afterEach(() => {
     clock.uninstall();
   });
 
-  it('should work with nested promises', function* () {
+  it('should work with nested promises', function*() {
     let value = false;
 
     const nestPromise = level => {
@@ -50,12 +51,14 @@ describes.realWin('yield', {}, env => {
     expect(value).to.be.true;
   });
 
-  it('should work with promise chain', function* () {
+  it('should work with promise chain', function*() {
     let value;
 
     const chainPromise = Promise.resolve();
     for (let i = 0; i < 100; i++) {
-      chainPromise.then(() => {value = false;});
+      chainPromise.then(() => {
+        value = false;
+      });
     }
     chainPromise.then(() => {
       value = true;
@@ -65,7 +68,7 @@ describes.realWin('yield', {}, env => {
     expect(value).to.be.true;
   });
 
-  it('should work with promise inside setTimeout', function* () {
+  it('should work with promise inside setTimeout', function*() {
     let value;
     win.setTimeout(() => {
       value = false;
@@ -81,11 +84,12 @@ describes.realWin('yield', {}, env => {
     expect(value).to.be.true;
   });
 
-  it('should work with manually resolved promise inside ' +
-      'setTimeout', function* () {
+  it('should work with manually resolved promise inside setTimeout', function*() {
     let value;
     let resolver;
-    const promise = new Promise(r => {resolver = r;});
+    const promise = new Promise(r => {
+      resolver = r;
+    });
     promise.then(() => {
       value = true;
     });
@@ -99,15 +103,17 @@ describes.realWin('yield', {}, env => {
     expect(value).to.be.true;
   });
 
-  it('should block a promise', function* () {
+  it('should block a promise', function*() {
     let resolver;
-    const promise = new Promise(r => {resolver = r;}).then(() => 'yes');
+    const promise = new Promise(r => {
+      resolver = r;
+    }).then(() => 'yes');
     resolver();
     const result = yield promise;
     expect(result).to.equal('yes');
   });
 
-  it('should be able to expect throwable', function* () {
+  it('should be able to expect throwable', function*() {
     const promiseThatRejects = Promise.reject(new Error('OMG'));
     try {
       yield promiseThatRejects;
diff --git a/test/unit/url-expander/test-expander.js b/test/unit/url-expander/test-expander.js
index e9176d0ec530..3f0c23ffbe0e 100644
--- a/test/unit/url-expander/test-expander.js
+++ b/test/unit/url-expander/test-expander.js
@@ -19,470 +19,549 @@ import {GlobalVariableSource} from '../../../src/service/url-replacements-impl';
 import {createElementWithAttributes} from '../../../src/dom';
 import {macroTask} from '../../../testing/yield';
 
-describes.realWin('Expander', {
-  amp: {
-    ampdoc: 'single',
+describes.realWin(
+  'Expander',
+  {
+    amp: {
+      ampdoc: 'single',
+    },
   },
-}, env => {
-
-  let variableSource;
-
-  beforeEach(() => {
-    variableSource = new GlobalVariableSource(env.ampdoc);
-  });
-
-
-  describe('#eliminateOverlaps', () => {
-    const mockBindings = {
-      RANDOM: () => 0.1234,
-      ABC: () => 'three',
-      ABCD: () => 'four',
-      BCDEF: () => 'five',
-      ABCDEFGHIJ: () => 'ten',
-      JKLMNOPQRS: () => 'ten',
-      DEFGHIJKLMNOP: () => 'thirteen',
-    };
-
-    it('should handle empty', () => {
-      const url = 'http://www.google.com/?test=FAKE(__ga)';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(url);
-    });
+  env => {
+    let variableSource;
 
-    it('should return single item', () => {
-      const url = 'http://www.google.com/?test=RANDOM';
-      const expected = 'http://www.google.com/?test=0.1234';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(expected);
+    beforeEach(() => {
+      variableSource = new GlobalVariableSource(env.ampdoc);
     });
 
+    describe('#eliminateOverlaps', () => {
+      const mockBindings = {
+        RANDOM: () => 0.1234,
+        ABC: () => 'three',
+        ABCD: () => 'four',
+        BCDEF: () => 'five',
+        ABCDEFGHIJ: () => 'ten',
+        JKLMNOPQRS: () => 'ten',
+        DEFGHIJKLMNOP: () => 'thirteen',
+      };
+
+      it('should handle empty', () => {
+        const url = 'http://www.google.com/?test=FAKE(__ga)';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(url);
+      });
 
-    it('should sort basic case', () => {
-      const url = 'http://www.google.com/?test=ABCD&BAR&foo=RANDOM';
-      const expected = 'http://www.google.com/?test=four&BAR&foo=0.1234';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(expected);
-    });
+      it('should return single item', () => {
+        const url = 'http://www.google.com/?test=RANDOM';
+        const expected = 'http://www.google.com/?test=0.1234';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(expected);
+      });
 
-    it('will always prefer the first match in overlap', () => {
-      const url = 'http://www.google.com/?test=ABCDEFGHIJKLMNOPQRS';
-      const expected = 'http://www.google.com/?test=tenKLMNOPQRS';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(expected);
-    });
+      it('should sort basic case', () => {
+        const url = 'http://www.google.com/?test=ABCD&BAR&foo=RANDOM';
+        const expected = 'http://www.google.com/?test=four&BAR&foo=0.1234';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(expected);
+      });
 
-    it('will prefer longer match if same start index', () => {
-      const url = 'http://www.google.com/?test=ABCD';
-      const expected = 'http://www.google.com/?test=four';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(expected);
-    });
+      it('will always prefer the first match in overlap', () => {
+        const url = 'http://www.google.com/?test=ABCDEFGHIJKLMNOPQRS';
+        const expected = 'http://www.google.com/?test=tenKLMNOPQRS';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(expected);
+      });
+
+      it('will prefer longer match if same start index', () => {
+        const url = 'http://www.google.com/?test=ABCD';
+        const expected = 'http://www.google.com/?test=four';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(expected);
+      });
 
-    it('should handle keywords next to each other', () => {
-      const url = 'http://www.google.com/?test=ABCDRANDOM';
-      const expected = 'http://www.google.com/?test=four0.1234';
-      return expect(new Expander(variableSource, mockBindings).expand(url))
-          .to.eventually.equal(expected);
+      it('should handle keywords next to each other', () => {
+        const url = 'http://www.google.com/?test=ABCDRANDOM';
+        const expected = 'http://www.google.com/?test=four0.1234';
+        return expect(
+          new Expander(variableSource, mockBindings).expand(url)
+        ).to.eventually.equal(expected);
+      });
     });
-  });
 
-  describe('Whitelist of variables', () => {
-    const mockBindings = {
-      RANDOM: () => 0.1234,
-      ABC: () => 'three',
-      ABCD: () => 'four',
-    };
+    describe('Whitelist of variables', () => {
+      const mockBindings = {
+        RANDOM: () => 0.1234,
+        ABC: () => 'three',
+        ABCD: () => 'four',
+      };
 
-    function createExpanderWithWhitelist(whitelist, mockBindings) {
-      env.win.document.head.appendChild(
+      function createExpanderWithWhitelist(whitelist, mockBindings) {
+        env.win.document.head.appendChild(
           createElementWithAttributes(env.win.document, 'meta', {
             name: 'amp-allowed-url-macros',
             content: whitelist,
-          }));
+          })
+        );
 
-      variableSource = new GlobalVariableSource(env.ampdoc);
-      return new Expander(variableSource, mockBindings);
-    }
-
-    it('should not replace unwhitelisted RANDOM', () => {
-      const expander = createExpanderWithWhitelist('ABC,ABCD,CANONICAL',
-          mockBindings);
-      const url = 'http://www.google.com/?test=RANDOM';
-      const expected = 'http://www.google.com/?test=RANDOM';
-      return expect(expander.expand(url)).to.eventually.equal(expected);
-    });
+        variableSource = new GlobalVariableSource(env.ampdoc);
+        return new Expander(variableSource, mockBindings);
+      }
 
-    it('should replace whitelisted ABCD', () => {
-      const expander = createExpanderWithWhitelist('ABC,ABCD,CANONICAL',
-          mockBindings);
-      const url = 'http://www.google.com/?test=ABCD';
-      const expected = 'http://www.google.com/?test=four';
-      return expect(expander.expand(url)).to.eventually.equal(expected);
-    });
+      it('should not replace unwhitelisted RANDOM', () => {
+        const expander = createExpanderWithWhitelist(
+          'ABC,ABCD,CANONICAL',
+          mockBindings
+        );
+        const url = 'http://www.google.com/?test=RANDOM';
+        const expected = 'http://www.google.com/?test=RANDOM';
+        return expect(expander.expand(url)).to.eventually.equal(expected);
+      });
 
-    it('should not replace anything with empty whitelist', () => {
-      const expander = createExpanderWithWhitelist('', mockBindings);
-      const url = 'http://www.google.com/?test=ABCD';
-      const expected = 'http://www.google.com/?test=ABCD';
-      return expect(expander.expand(url)).to.eventually.equal(expected);
-    });
+      it('should replace whitelisted ABCD', () => {
+        const expander = createExpanderWithWhitelist(
+          'ABC,ABCD,CANONICAL',
+          mockBindings
+        );
+        const url = 'http://www.google.com/?test=ABCD';
+        const expected = 'http://www.google.com/?test=four';
+        return expect(expander.expand(url)).to.eventually.equal(expected);
+      });
 
-  });
+      it('should not replace anything with empty whitelist', () => {
+        const expander = createExpanderWithWhitelist('', mockBindings);
+        const url = 'http://www.google.com/?test=ABCD';
+        const expected = 'http://www.google.com/?test=ABCD';
+        return expect(expander.expand(url)).to.eventually.equal(expected);
+      });
+    });
 
-  describe('#expand', () => {
-    function mockClientIdFn(str) {
-      if (str === '__ga') {
-        return Promise.resolve('amp-GA12345');
+    describe('#expand', () => {
+      function mockClientIdFn(str) {
+        if (str === '__ga') {
+          return Promise.resolve('amp-GA12345');
+        }
+        return Promise.resolve('amp-987654321');
       }
-      return Promise.resolve('amp-987654321');
-    }
-
-    // making sure to include resolutions of different types
-    const mockBindings = {
-      CLIENT_ID: mockClientIdFn, // fn resolving to promise
-      CANONICAL_URL: 'www.google.com', // string
-      RANDOM: () => 123456, // number
-      TRIM: str => str.trim(), // fn
-      UPPERCASE: str => str.toUpperCase(),
-      LOWERCASE: str => str.toLowerCase(),
-      CONCAT: (a, b) => a + '-' + b,
-      CAT_THREE: (a, b, c) => a + b + c,
-      ASYNC: Promise.resolve('hello'),
-      ASYNCFN: arg => Promise.resolve(arg),
-      BROKEN: () => undefined,
-      ANCESTOR_ORIGIN: () => Promise.resolve('https://www.google.com@foo'),
-      TITLE: 'hello world ',
-    };
-
-    const sharedTestCases = [
-      {
-        description: 'should handle empty urls',
-        input: '',
-        output: '',
-      },
-      {
-        description: 'parses one function, one argument',
-        input: 'TRIM(aaaaa    )',
-        output: 'aaaaa',
-      },
-      {
-        description: 'parses nested function one level',
-        input: 'UPPERCASE(TRIM(aaaaa    ))',
-        output: 'AAAAA',
-      },
-      {
-        description: 'parses nested function two levels',
-        input: 'LOWERCASE(UPPERCASE(TRIM(aAaA    )))',
-        output: 'aaaa',
-      },
-      {
-        description: 'parses one function, two string arguments',
-        input: 'CONCAT(aaa,bbb)',
-        output: 'aaa-bbb',
-      },
-      {
-        description: 'parses one function, two string arguments with space',
-        input: 'CONCAT(aaa , bbb)',
-        output: 'aaa-bbb',
-      },
-      {
-        description: 'parses function with func then string as args',
-        input: 'CONCAT(UPPERCASE(aaa),bbb)',
-        output: 'AAA-bbb',
-      },
-      {
-        description: 'parses function with macro then string as args',
-        input: 'CONCAT(CANONICAL_URL,bbb)',
-        output: 'www.google.com-bbb',
-      },
-      {
-        description: 'parses function with string then func as args',
-        input: 'CONCAT(aaa,UPPERCASE(bbb))',
-        output: 'aaa-BBB',
-      },
-      {
-        description: 'parses function with two funcs as args',
-        input: 'CONCAT(LOWERCASE(AAA),UPPERCASE(bbb))',
-        output: 'aaa-BBB',
-      },
-      {
-        description: 'parses function with three funcs as args',
-        input: 'CAT_THREE(LOWERCASE(AAA),UPPERCASE(bbb),LOWERCASE(CCC))',
-        output: 'aaaBBBccc',
-      },
-      {
-        description: 'should treat unrecognized keywords as normal strings',
-        input: 'TRIM(FAKE(aaaaa))',
-        output: 'FAKE(aaaaa)',
-      },
-      {
-        description: 'ignores commas within backticks',
-        input: 'CONCAT(`he,llo`,UPPERCASE(world))',
-        output: 'he%2Cllo-WORLD',
-      },
-      {
-        description: 'ignores left parentheses within backticks',
-        input: 'CONCAT(hello, `wo((rld`)',
-        output: 'hello-wo((rld',
-      },
-      {
-        description: 'ignores right parentheses within backticks',
-        input: 'CONCAT(`hello)`,UPPERCASE(world))',
-        output: 'hello)-WORLD',
-      },
-      {
-        description: 'trims with the wrong number of parens',
-        input: 'TRIM(FAKE(aaa)',
-        output: 'FAKE(aaa',
-      },
-      {
-        description: 'passes undefined for omitted args',
-        input: 'CONCAT(foo)',
-        output: 'foo-undefined',
-      },
-      {
-        description: 'should not double encode nested macros',
-        input: 'title=TRIM(TITLE)',
-        output: 'title=hello%20world',
-      },
-    ];
-
-    describe('called asyncronously', () => {
-      sharedTestCases.forEach(test => {
-        const {description, input, output} = test;
-        it(description, () =>
-          expect(new Expander(variableSource, mockBindings)
-              .expand(input)).to.eventually.equal(output)
-        );
-      });
 
-      describe('unique cases', () => {
-        it('should handle real urls', () => {
-          const url = 'http://www.amp.google.com/?client=CLIENT_ID(__ga)&canon=CANONICAL_URL&random=RANDOM';
-          const expected = 'http://www.amp.google.com/?client=amp-GA12345&canon=www.google.com&random=123456';
-          return expect(new Expander(variableSource, mockBindings)
-              .expand(url)).to.eventually.equal(expected);
-        });
+      // making sure to include resolutions of different types
+      const mockBindings = {
+        CLIENT_ID: mockClientIdFn, // fn resolving to promise
+        CANONICAL_URL: 'www.google.com', // string
+        RANDOM: () => 123456, // number
+        TRIM: str => str.trim(), // fn
+        UPPERCASE: str => str.toUpperCase(),
+        LOWERCASE: str => str.toLowerCase(),
+        CONCAT: (a, b) => a + '-' + b,
+        CAT_THREE: (a, b, c) => a + b + c,
+        ASYNC: Promise.resolve('hello'),
+        ASYNCFN: arg => Promise.resolve(arg),
+        BROKEN: () => undefined,
+        ANCESTOR_ORIGIN: () => Promise.resolve('https://www.google.com@foo'),
+        TITLE: 'hello world ',
+      };
+
+      const sharedTestCases = [
+        {
+          description: 'should handle empty urls',
+          input: '',
+          output: '',
+        },
+        {
+          description: 'parses one function, one argument',
+          input: 'TRIM(aaaaa    )',
+          output: 'aaaaa',
+        },
+        {
+          description: 'parses nested function one level',
+          input: 'UPPERCASE(TRIM(aaaaa    ))',
+          output: 'AAAAA',
+        },
+        {
+          description: 'parses nested function two levels',
+          input: 'LOWERCASE(UPPERCASE(TRIM(aAaA    )))',
+          output: 'aaaa',
+        },
+        {
+          description: 'parses one function, two string arguments',
+          input: 'CONCAT(aaa,bbb)',
+          output: 'aaa-bbb',
+        },
+        {
+          description: 'parses one function, two string arguments with space',
+          input: 'CONCAT(aaa , bbb)',
+          output: 'aaa-bbb',
+        },
+        {
+          description: 'parses function with func then string as args',
+          input: 'CONCAT(UPPERCASE(aaa),bbb)',
+          output: 'AAA-bbb',
+        },
+        {
+          description: 'parses function with macro then string as args',
+          input: 'CONCAT(CANONICAL_URL,bbb)',
+          output: 'www.google.com-bbb',
+        },
+        {
+          description: 'parses function with string then func as args',
+          input: 'CONCAT(aaa,UPPERCASE(bbb))',
+          output: 'aaa-BBB',
+        },
+        {
+          description: 'parses function with two funcs as args',
+          input: 'CONCAT(LOWERCASE(AAA),UPPERCASE(bbb))',
+          output: 'aaa-BBB',
+        },
+        {
+          description: 'parses function with three funcs as args',
+          input: 'CAT_THREE(LOWERCASE(AAA),UPPERCASE(bbb),LOWERCASE(CCC))',
+          output: 'aaaBBBccc',
+        },
+        {
+          description: 'should treat unrecognized keywords as normal strings',
+          input: 'TRIM(FAKE(aaaaa))',
+          output: 'FAKE(aaaaa)',
+        },
+        {
+          description: 'ignores commas within backticks',
+          input: 'CONCAT(`he,llo`,UPPERCASE(world))',
+          output: 'he%2Cllo-WORLD',
+        },
+        {
+          description: 'ignores left parentheses within backticks',
+          input: 'CONCAT(hello, `wo((rld`)',
+          output: 'hello-wo((rld',
+        },
+        {
+          description: 'ignores right parentheses within backticks',
+          input: 'CONCAT(`hello)`,UPPERCASE(world))',
+          output: 'hello)-WORLD',
+        },
+        {
+          description: 'trims with the wrong number of parens',
+          input: 'TRIM(FAKE(aaa)',
+          output: 'FAKE(aaa',
+        },
+        {
+          description: 'passes undefined for omitted args',
+          input: 'CONCAT(foo)',
+          output: 'foo-undefined',
+        },
+        {
+          description: 'should not double encode nested macros',
+          input: 'title=TRIM(TITLE)',
+          output: 'title=hello%20world',
+        },
+      ];
 
-        it('throws on bad input with back ticks', () => {
-          const url = 'CONCAT(bad`hello`, world)';
-          allowConsoleError(() => { expect(() => {
-            new Expander(variableSource, mockBindings).expand(url);
-          }).to.throw(/bad/); });
+      describe('called asyncronously', () => {
+        sharedTestCases.forEach(test => {
+          const {description, input, output} = test;
+          it(description, () =>
+            expect(
+              new Expander(variableSource, mockBindings).expand(input)
+            ).to.eventually.equal(output)
+          );
         });
 
-        it('should handle tokens with parenthesis next to each other', () => {
-          const url = 'http://www.google.com/?test=RANDOMCLIENT_ID(__ga)UPPERCASE(foo)';
-          const expected = 'http://www.google.com/?test=123456amp-GA12345FOO';
-          return expect(new Expander(variableSource, mockBindings).expand(url))
-              .to.eventually.equal(expected);
-        });
+        describe('unique cases', () => {
+          it('should handle real urls', () => {
+            const url =
+              'http://www.amp.google.com/?client=CLIENT_ID(__ga)&canon=CANONICAL_URL&random=RANDOM';
+            const expected =
+              'http://www.amp.google.com/?client=amp-GA12345&canon=www.google.com&random=123456';
+            return expect(
+              new Expander(variableSource, mockBindings).expand(url)
+            ).to.eventually.equal(expected);
+          });
 
-        it('should not encode NOENCODE_WHITELIST', () => {
-          const url = 'ANCESTOR_ORIGIN';
-          const expected = 'https://www.google.com@foo';
-          return expect(new Expander(variableSource, mockBindings).expand(url))
-              .to.eventually.equal(expected);
-        });
-      });
-    });
+          it('throws on bad input with back ticks', () => {
+            const url = 'CONCAT(bad`hello`, world)';
+            allowConsoleError(() => {
+              expect(() => {
+                new Expander(variableSource, mockBindings).expand(url);
+              }).to.throw(/bad/);
+            });
+          });
 
-    describe('called synchronously', () => {
-      sharedTestCases.forEach(test => {
-        const {description, input, output} = test;
-        it(description, () =>
-          expect(new Expander(variableSource, mockBindings,
-              /* opt_collectVars */ undefined, /* opt_sync */ true)
-              .expand(input)).to.equal(output));
+          it('should handle tokens with parenthesis next to each other', () => {
+            const url =
+              'http://www.google.com/?test=RANDOMCLIENT_ID(__ga)UPPERCASE(foo)';
+            const expected = 'http://www.google.com/?test=123456amp-GA12345FOO';
+            return expect(
+              new Expander(variableSource, mockBindings).expand(url)
+            ).to.eventually.equal(expected);
+          });
+
+          it('should not encode NOENCODE_WHITELIST', () => {
+            const url = 'ANCESTOR_ORIGIN';
+            const expected = 'https://www.google.com@foo';
+            return expect(
+              new Expander(variableSource, mockBindings).expand(url)
+            ).to.eventually.equal(expected);
+          });
+        });
       });
 
-      describe('unique cases', () => {
-        it('throws on bad input with back ticks', () => {
-          const url = 'CONCAT(bad`hello`, world)';
-          allowConsoleError(() => { expect(() => {
-            new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url);
-          }).to.throw(/bad/); });
+      describe('called synchronously', () => {
+        sharedTestCases.forEach(test => {
+          const {description, input, output} = test;
+          it(description, () =>
+            expect(
+              new Expander(
+                variableSource,
+                mockBindings,
+                /* opt_collectVars */ undefined,
+                /* opt_sync */ true
+              ).expand(input)
+            ).to.equal(output)
+          );
         });
 
-        // Console errors allowed for these tests because anytime an async
-        // function is called with the sync flag we user.error()
-        it('should resolve promise to empty string', () => {
-          const url = 'ASYNC';
-          const expected = '';
-          allowConsoleError(() => {
-            expect(new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url)).to.equal(expected);
+        describe('unique cases', () => {
+          it('throws on bad input with back ticks', () => {
+            const url = 'CONCAT(bad`hello`, world)';
+            allowConsoleError(() => {
+              expect(() => {
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url);
+              }).to.throw(/bad/);
+            });
           });
-        });
 
-        it('should resolve asyncronous function to empty string', () => {
-          const url = 'ASYNCFN';
-          const expected = '';
-          allowConsoleError(() => {
-            expect(new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url)).to.equal(expected);
+          // Console errors allowed for these tests because anytime an async
+          // function is called with the sync flag we user.error()
+          it('should resolve promise to empty string', () => {
+            const url = 'ASYNC';
+            const expected = '';
+            allowConsoleError(() => {
+              expect(
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url)
+              ).to.equal(expected);
+            });
           });
-        });
 
-        it('should resolve asyncronous function to empty string', () => {
-          const url = 'ASYNCFN(foo)';
-          const expected = '';
-          allowConsoleError(() => {
-            expect(new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url)).to.equal(expected);
+          it('should resolve asyncronous function to empty string', () => {
+            const url = 'ASYNCFN';
+            const expected = '';
+            allowConsoleError(() => {
+              expect(
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url)
+              ).to.equal(expected);
+            });
           });
-        });
 
-        it('dismiss async in real urls', () => {
-          const url = 'http://www.google.com/?test=RANDOMASYNCFN(foo)UPPERCASE(foo)';
-          const expected = 'http://www.google.com/?test=123456FOO';
-          allowConsoleError(() => {
-            expect(new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url)).to.equal(expected);
+          it('should resolve asyncronous function to empty string', () => {
+            const url = 'ASYNCFN(foo)';
+            const expected = '';
+            allowConsoleError(() => {
+              expect(
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url)
+              ).to.equal(expected);
+            });
+          });
+
+          it('dismiss async in real urls', () => {
+            const url =
+              'http://www.google.com/?test=RANDOMASYNCFN(foo)UPPERCASE(foo)';
+            const expected = 'http://www.google.com/?test=123456FOO';
+            allowConsoleError(() => {
+              expect(
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url)
+              ).to.equal(expected);
+            });
           });
-        });
 
-        it('dismiss async in nested calls', () => {
-          const url = 'CONCAT(foo, ASYNCFN(bar))UPPERCASE(foo)';
-          const expected = 'foo-FOO';
-          allowConsoleError(() => {
-            expect(new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ undefined, /* opt_sync */ true)
-                .expand(url)).to.equal(expected);
+          it('dismiss async in nested calls', () => {
+            const url = 'CONCAT(foo, ASYNCFN(bar))UPPERCASE(foo)';
+            const expected = 'foo-FOO';
+            allowConsoleError(() => {
+              expect(
+                new Expander(
+                  variableSource,
+                  mockBindings,
+                  /* opt_collectVars */ undefined,
+                  /* opt_sync */ true
+                ).expand(url)
+              ).to.equal(expected);
+            });
           });
         });
       });
-    });
 
-    describe('collectVars', () => {
-      const tests = [
-        {
-          description: 'sibling macros',
-          input: 'UPPERCASE(aaaa)LOWERCASE(BBB)',
-          output: {
-            both: {
-              'UPPERCASE(aaaa)': 'AAAA',
-              'LOWERCASE(BBB)': 'bbb',
+      describe('collectVars', () => {
+        const tests = [
+          {
+            description: 'sibling macros',
+            input: 'UPPERCASE(aaaa)LOWERCASE(BBB)',
+            output: {
+              both: {
+                'UPPERCASE(aaaa)': 'AAAA',
+                'LOWERCASE(BBB)': 'bbb',
+              },
             },
           },
-        },
-        {
-          description: 'nested macros',
-          input: 'LOWERCASE(UPPERCASE(TRIM(aAaA    )))',
-          output: {
-            sync: {
-              'TRIM(aAaA)': 'aAaA',
-              'UPPERCASE(aAaA)': 'AAAA',
-              'LOWERCASE(AAAA)': 'aaaa',
-            },
-            async: {
-              'TRIM(aAaA)': 'aAaA',
-              'UPPERCASE([object Promise])': 'AAAA',
-              'LOWERCASE([object Promise])': 'aaaa',
+          {
+            description: 'nested macros',
+            input: 'LOWERCASE(UPPERCASE(TRIM(aAaA    )))',
+            output: {
+              sync: {
+                'TRIM(aAaA)': 'aAaA',
+                'UPPERCASE(aAaA)': 'AAAA',
+                'LOWERCASE(AAAA)': 'aaaa',
+              },
+              async: {
+                'TRIM(aAaA)': 'aAaA',
+                'UPPERCASE([object Promise])': 'AAAA',
+                'LOWERCASE([object Promise])': 'aaaa',
+              },
             },
           },
-        },
-        {
-          description: 'macros that resolve undefined should be empty string',
-          input: 'UPPERCASE(foo)BROKEN',
-          output: {
-            both: {
-              'UPPERCASE(foo)': 'FOO',
-              BROKEN: '',
+          {
+            description: 'macros that resolve undefined should be empty string',
+            input: 'UPPERCASE(foo)BROKEN',
+            output: {
+              both: {
+                'UPPERCASE(foo)': 'FOO',
+                BROKEN: '',
+              },
             },
           },
-        },
-      ];
+        ];
+
+        describe('called asyncronously', () => {
+          tests.forEach(test => {
+            const {description, input, output} = test;
+            it(description, function*() {
+              const vars = {};
+              new Expander(
+                variableSource,
+                mockBindings,
+                /* opt_collectVars */ vars
+              ).expand(input);
+              yield macroTask();
+              const expected = output.both || output.async;
+              expect(vars).to.deep.equal(expected);
+            });
+          });
 
-      describe('called asyncronously', () => {
-        tests.forEach(test => {
-          const {description, input, output} = test;
-          it(description, function*() {
+          it('should handle async functions', function*() {
             const vars = {};
-            new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ vars).expand(input);
+            const input = 'CLIENT_ID(__ga)UPPERCASE(foo)';
+            new Expander(
+              variableSource,
+              mockBindings,
+              /* opt_collectVars */ vars
+            ).expand(input);
             yield macroTask();
-            const expected = output.both || output.async;
-            expect(vars).to.deep.equal(expected);
+            expect(vars).to.deep.equal({
+              'CLIENT_ID(__ga)': 'amp-GA12345',
+              'UPPERCASE(foo)': 'FOO',
+            });
           });
         });
 
-        it('should handle async functions', function*() {
-          const vars = {};
-          const input = 'CLIENT_ID(__ga)UPPERCASE(foo)';
-          new Expander(variableSource, mockBindings, /* opt_collectVars */ vars)
-              .expand(input);
-          yield macroTask();
-          expect(vars).to.deep.equal({
-            'CLIENT_ID(__ga)': 'amp-GA12345',
-            'UPPERCASE(foo)': 'FOO',
+        describe('called syncronously', () => {
+          tests.forEach(test => {
+            const {description, input, output} = test;
+            it(description, () => {
+              const vars = {};
+              new Expander(
+                variableSource,
+                mockBindings,
+                /* opt_collectVars */ vars,
+                /* opt_sync */ true
+              ).expand(input);
+              const expected = output.both || output.sync;
+              expect(vars).to.deep.equal(expected);
+            });
           });
-        });
-      });
 
-      describe('called syncronously', () => {
-        tests.forEach(test => {
-          const {description, input, output} = test;
-          it(description, () => {
+          it('should discard async functions when called synchronously', () => {
             const vars = {};
-            new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ vars, /* opt_sync */ true).expand(input);
-            const expected = output.both || output.sync;
-            expect(vars).to.deep.equal(expected);
+            const input = 'CLIENT_ID(__ga)UPPERCASE(foo)';
+            allowConsoleError(() => {
+              new Expander(
+                variableSource,
+                mockBindings,
+                /* opt_collectVars */ vars,
+                /* opt_sync */ true
+              ).expand(input);
+            });
+            expect(vars).to.deep.equal({
+              'UPPERCASE(foo)': 'FOO',
+            });
           });
         });
+      });
 
-        it('should discard async functions when called synchronously', () => {
-          const vars = {};
-          const input = 'CLIENT_ID(__ga)UPPERCASE(foo)';
-          allowConsoleError(() => {
-            new Expander(variableSource, mockBindings,
-                /* opt_collectVars */ vars, /* opt_sync */ true).expand(input);
-          });
-          expect(vars).to.deep.equal({
-            'UPPERCASE(foo)': 'FOO',
-          });
+      describe('opt_whiteList', () => {
+        it('should only resolve values in the whitelist', () => {
+          const url = 'UPPERCASE(foo)RANDOMLOWERCASE(BAR)';
+          const whitelist = {RANDOM: true};
+          return expect(
+            new Expander(
+              variableSource,
+              mockBindings,
+              /* opt_collectVars */ undefined,
+              /* opt_sync */ false,
+              /* opt_whiteList */ whitelist
+            ).expand(url)
+          ).to.eventually.equal('UPPERCASE(foo)123456LOWERCASE(BAR)');
         });
       });
     });
 
-    describe('opt_whiteList', () => {
-      it('should only resolve values in the whitelist', () => {
-        const url = 'UPPERCASE(foo)RANDOMLOWERCASE(BAR)';
-        const whitelist = {RANDOM: true};
-        return expect(new Expander(variableSource, mockBindings,
-            /* opt_collectVars */ undefined,
-            /* opt_sync */ false,
-            /* opt_whiteList */ whitelist
-        ).expand(url))
-            .to.eventually.equal('UPPERCASE(foo)123456LOWERCASE(BAR)');
+    describe('getMacroNames', () => {
+      it('should handle no names found', () => {
+        const url = 'https://www.example.com/foo/bar?a=1&b=hello';
+        expect(new Expander(variableSource).getMacroNames(url)).to.eql([]);
       });
-    });
-  });
-
-  describe('getMacroNames', () => {
-    it('should handle no names found', () => {
-      const url = 'https://www.example.com/foo/bar?a=1&b=hello';
-      expect(new Expander(variableSource).getMacroNames(url)).to
-          .eql([]);
-    });
 
-    it('should find the correct names', () => {
-      const url = 'https://www.example.com?a=1&t=TITLE&c=CLIENT_ID(foo)';
-      expect(new Expander(variableSource).getMacroNames(url)).to
-          .eql(['TITLE', 'CLIENT_ID']);
-    });
+      it('should find the correct names', () => {
+        const url = 'https://www.example.com?a=1&t=TITLE&c=CLIENT_ID(foo)';
+        expect(new Expander(variableSource).getMacroNames(url)).to.eql([
+          'TITLE',
+          'CLIENT_ID',
+        ]);
+      });
 
-    it('should find the nested names', () => {
-      const url = 'https://www.example.com?a=1&t=TITLE&c=CLIENT_ID(QUERY_PARAM(foo))';
-      expect(new Expander(variableSource).getMacroNames(url)).to
-          .eql(['TITLE', 'CLIENT_ID', 'QUERY_PARAM']);
+      it('should find the nested names', () => {
+        const url =
+          'https://www.example.com?a=1&t=TITLE&c=CLIENT_ID(QUERY_PARAM(foo))';
+        expect(new Expander(variableSource).getMacroNames(url)).to.eql([
+          'TITLE',
+          'CLIENT_ID',
+          'QUERY_PARAM',
+        ]);
+      });
     });
-  });
-});
+  }
+);
diff --git a/test/unit/utils/test-array.js b/test/unit/utils/test-array.js
index a1663e473c5c..4f12507a21ad 100644
--- a/test/unit/utils/test-array.js
+++ b/test/unit/utils/test-array.js
@@ -23,57 +23,50 @@ import {
 } from '../../../src/utils/array';
 
 describe('areEqualOrdered', function() {
-  it('should return true on empty arrays',
-      () => {
-        const result = areEqualOrdered([], []);
-        expect(result).to.be.true;
-      });
-
-  it('should return true on same array with primitive types of same seq',
-      () => {
-        const result = areEqualOrdered(
-            [1, 'string', true, undefined, null],
-            [1, 'string', true, undefined, null]
-        );
-        expect(result).to.be.true;
-      });
-
-  it('should return true on same array with objects of same seq',
-      () => {
-        const o1 = {a: 1};
-        const o2 = () => { return 'arrow func'; };
-        const o3 = new Function('whatever');
-        const o4 = {};
-        const o5 = [];
-        const result = areEqualOrdered(
-            [o1, o2, o3, o4, o5],
-            [o1, o2, o3, o4, o5]
-        );
-        expect(result).to.be.true;
-      });
-
-  it('should return false on same array with primitive types of different seq',
-      () => {
-        const result = areEqualOrdered(
-            [null, true, 'string', undefined, 1],
-            [1, 'string', true, undefined, null]
-        );
-        expect(result).to.be.false;
-      });
-
-  it('should return false on same array with objects of different seq',
-      () => {
-        const o1 = {a: 1};
-        const o2 = () => { return 'arrow func'; };
-        const o3 = new Function('whatever');
-        const o4 = {};
-        const o5 = [];
-        const result = areEqualOrdered(
-            [o4, o5, o3, o2, o1],
-            [o1, o2, o3, o4, o5]
-        );
-        expect(result).to.be.false;
-      });
+  it('should return true on empty arrays', () => {
+    const result = areEqualOrdered([], []);
+    expect(result).to.be.true;
+  });
+
+  it('should return true on same array with primitive types of same seq', () => {
+    const result = areEqualOrdered(
+      [1, 'string', true, undefined, null],
+      [1, 'string', true, undefined, null]
+    );
+    expect(result).to.be.true;
+  });
+
+  it('should return true on same array with objects of same seq', () => {
+    const o1 = {a: 1};
+    const o2 = () => {
+      return 'arrow func';
+    };
+    const o3 = new Function('whatever');
+    const o4 = {};
+    const o5 = [];
+    const result = areEqualOrdered([o1, o2, o3, o4, o5], [o1, o2, o3, o4, o5]);
+    expect(result).to.be.true;
+  });
+
+  it('should return false on same array with primitive types of different seq', () => {
+    const result = areEqualOrdered(
+      [null, true, 'string', undefined, 1],
+      [1, 'string', true, undefined, null]
+    );
+    expect(result).to.be.false;
+  });
+
+  it('should return false on same array with objects of different seq', () => {
+    const o1 = {a: 1};
+    const o2 = () => {
+      return 'arrow func';
+    };
+    const o3 = new Function('whatever');
+    const o4 = {};
+    const o5 = [];
+    const result = areEqualOrdered([o4, o5, o3, o2, o1], [o1, o2, o3, o4, o5]);
+    expect(result).to.be.false;
+  });
 
   it('should return false on array of different length', () => {
     const result = areEqualOrdered([1, 2, 3], [1, 2, 3, 3]);
@@ -146,9 +139,9 @@ describe('fromIterator', function() {
     let index = 0;
     const iterator = {
       next() {
-        return index < 3 ?
-          {value: (index++) * 2, done: false} :
-          {value: undefined, done: true};
+        return index < 3
+          ? {value: index++ * 2, done: false}
+          : {value: undefined, done: true};
       },
     };
 
diff --git a/test/unit/utils/test-base64.js b/test/unit/utils/test-base64.js
index 73657efe470e..f74f96df5c65 100644
--- a/test/unit/utils/test-base64.js
+++ b/test/unit/utils/test-base64.js
@@ -22,11 +22,7 @@ import {
   base64UrlEncodeFromBytes,
   base64UrlEncodeFromString,
 } from '../../../src/utils/base64';
-import {
-  stringToBytes,
-  utf8Decode,
-  utf8Encode,
-} from '../../../src/utils/bytes';
+import {stringToBytes, utf8Decode, utf8Encode} from '../../../src/utils/bytes';
 
 describe('base64 <> utf-8 encode/decode', () => {
   const testCases = [
@@ -38,10 +34,7 @@ describe('base64 <> utf-8 encode/decode', () => {
 
   scenarios.forEach(scenario => {
     describe(scenario, () => {
-      const {
-        TextEncoder: oldTextEncoder,
-        TextDecoder: oldTextDecoder,
-      } = window;
+      const {TextEncoder: oldTextEncoder, TextDecoder: oldTextDecoder} = window;
       beforeEach(() => {
         // Forces use of the TextEncoding polyfill
         if (scenario == 'PolyfillTextEncoding') {
@@ -92,19 +85,21 @@ describe('base64 <> utf-8 encode/decode', () => {
 
 describe('base64UrlDecodeToBytes', () => {
   it('should map a sample string appropriately', () => {
-    expect(base64UrlDecodeToBytes('AQAB'))
-        .to.deep.equal(new Uint8Array([1, 0, 1]));
-    expect(base64UrlDecodeToBytes('_-..'))
-        .to.deep.equal(new Uint8Array([255]));
+    expect(base64UrlDecodeToBytes('AQAB')).to.deep.equal(
+      new Uint8Array([1, 0, 1])
+    );
+    expect(base64UrlDecodeToBytes('_-..')).to.deep.equal(new Uint8Array([255]));
   });
 
   it('should handle padded and unpadded input', () => {
     expect(base64UrlDecodeToBytes('cw')).to.deep.equal(stringToBytes('s'));
-    expect(base64UrlDecodeToBytes('cw'))
-        .to.deep.equal(base64UrlDecodeToBytes('cw..'));
+    expect(base64UrlDecodeToBytes('cw')).to.deep.equal(
+      base64UrlDecodeToBytes('cw..')
+    );
     expect(base64UrlDecodeToBytes('c3U')).to.deep.equal(stringToBytes('su'));
-    expect(base64UrlDecodeToBytes('c3U'))
-        .to.deep.equal(base64UrlDecodeToBytes('c3U.'));
+    expect(base64UrlDecodeToBytes('c3U')).to.deep.equal(
+      base64UrlDecodeToBytes('c3U.')
+    );
     expect(base64UrlDecodeToBytes('c3Vy')).to.deep.equal(stringToBytes('sur'));
   });
 
@@ -119,19 +114,21 @@ describe('base64UrlDecodeToBytes', () => {
 
 describe('base64DecodeToBytes', () => {
   it('should map a sample string appropriately', () => {
-    expect(base64DecodeToBytes('AQAB'))
-        .to.deep.equal(new Uint8Array([1, 0, 1]));
-    expect(base64DecodeToBytes('/+=='))
-        .to.deep.equal(new Uint8Array([255]));
+    expect(base64DecodeToBytes('AQAB')).to.deep.equal(
+      new Uint8Array([1, 0, 1])
+    );
+    expect(base64DecodeToBytes('/+==')).to.deep.equal(new Uint8Array([255]));
   });
 
   it('should handle padded and unpadded input', () => {
     expect(base64DecodeToBytes('cw')).to.deep.equal(stringToBytes('s'));
-    expect(base64DecodeToBytes('cw'))
-        .to.deep.equal(base64DecodeToBytes('cw=='));
+    expect(base64DecodeToBytes('cw')).to.deep.equal(
+      base64DecodeToBytes('cw==')
+    );
     expect(base64DecodeToBytes('c3U')).to.deep.equal(stringToBytes('su'));
-    expect(base64DecodeToBytes('c3U'))
-        .to.deep.equal(base64DecodeToBytes('c3U='));
+    expect(base64DecodeToBytes('c3U')).to.deep.equal(
+      base64DecodeToBytes('c3U=')
+    );
     expect(base64DecodeToBytes('c3Vy')).to.deep.equal(stringToBytes('sur'));
   });
 
@@ -146,29 +143,21 @@ describe('base64DecodeToBytes', () => {
 
 describe('base64EncodeFromBytes', () => {
   it('should encode a bytes array to base64url string correctly', () => {
-    expect(base64UrlEncodeFromBytes(new Uint8Array()))
-        .to.equal('');
-    expect(base64UrlEncodeFromBytes(stringToBytes('s')))
-        .to.equal('cw..');
-    expect(base64UrlEncodeFromBytes(stringToBytes('su')))
-        .to.equal('c3U.');
-    expect(base64UrlEncodeFromBytes(stringToBytes('sur')))
-        .to.equal('c3Vy');
-    expect(base64UrlEncodeFromBytes(new Uint8Array([255, 239])))
-        .to.equal('_-8.');
+    expect(base64UrlEncodeFromBytes(new Uint8Array())).to.equal('');
+    expect(base64UrlEncodeFromBytes(stringToBytes('s'))).to.equal('cw..');
+    expect(base64UrlEncodeFromBytes(stringToBytes('su'))).to.equal('c3U.');
+    expect(base64UrlEncodeFromBytes(stringToBytes('sur'))).to.equal('c3Vy');
+    expect(base64UrlEncodeFromBytes(new Uint8Array([255, 239]))).to.equal(
+      '_-8.'
+    );
   });
 
   it('should encode a bytes array to base64 string correctly', () => {
-    expect(base64EncodeFromBytes(new Uint8Array()))
-        .to.equal('');
-    expect(base64EncodeFromBytes(stringToBytes('s')))
-        .to.equal('cw==');
-    expect(base64EncodeFromBytes(stringToBytes('su')))
-        .to.equal('c3U=');
-    expect(base64EncodeFromBytes(stringToBytes('sur')))
-        .to.equal('c3Vy');
-    expect(base64EncodeFromBytes(new Uint8Array([255, 239])))
-        .to.equal('/+8=');
+    expect(base64EncodeFromBytes(new Uint8Array())).to.equal('');
+    expect(base64EncodeFromBytes(stringToBytes('s'))).to.equal('cw==');
+    expect(base64EncodeFromBytes(stringToBytes('su'))).to.equal('c3U=');
+    expect(base64EncodeFromBytes(stringToBytes('sur'))).to.equal('c3Vy');
+    expect(base64EncodeFromBytes(new Uint8Array([255, 239]))).to.equal('/+8=');
   });
 });
 
@@ -176,32 +165,42 @@ describe('base64(Encode/Decode)FromString', () => {
   it('should handle unicode and non-unicode strings encoding', () => {
     expect(base64UrlEncodeFromString('')).to.equal('');
     expect(base64UrlEncodeFromString('      ')).to.equal('ICAgICAg');
-    expect(base64UrlEncodeFromString('helloworld')).to
-        .equal('aGVsbG93b3JsZA..');
-    expect(base64UrlEncodeFromString('hello world')).to
-        .equal('aGVsbG8gd29ybGQ.');
-    expect(base64UrlEncodeFromString(' hello world ')).to
-        .equal('IGhlbGxvIHdvcmxkIA..');
-    expect(base64UrlEncodeFromString('✓ à la mode')).to
-        .equal('4pyTIMOgIGxhIG1vZGU.');
+    expect(base64UrlEncodeFromString('helloworld')).to.equal(
+      'aGVsbG93b3JsZA..'
+    );
+    expect(base64UrlEncodeFromString('hello world')).to.equal(
+      'aGVsbG8gd29ybGQ.'
+    );
+    expect(base64UrlEncodeFromString(' hello world ')).to.equal(
+      'IGhlbGxvIHdvcmxkIA..'
+    );
+    expect(base64UrlEncodeFromString('✓ à la mode')).to.equal(
+      '4pyTIMOgIGxhIG1vZGU.'
+    );
     expect(base64UrlEncodeFromString('\n')).to.equal('Cg..');
-    expect(base64UrlEncodeFromString('$#!@#$%^&*()')).to
-        .equal('JCMhQCMkJV4mKigp');
+    expect(base64UrlEncodeFromString('$#!@#$%^&*()')).to.equal(
+      'JCMhQCMkJV4mKigp'
+    );
   });
 
   it('should handle unicode and non-unicode strings decoding', () => {
     expect(base64UrlDecodeFromString('')).to.equal('');
     expect(base64UrlDecodeFromString('ICAgICAg')).to.equal('      ');
-    expect(base64UrlDecodeFromString('aGVsbG93b3JsZA..')).to
-        .equal('helloworld');
-    expect(base64UrlDecodeFromString('aGVsbG8gd29ybGQ.')).to
-        .equal('hello world');
-    expect(base64UrlDecodeFromString('IGhlbGxvIHdvcmxkIA..')).to
-        .equal(' hello world ');
-    expect(base64UrlDecodeFromString('4pyTIMOgIGxhIG1vZGU.')).to
-        .equal('✓ à la mode');
+    expect(base64UrlDecodeFromString('aGVsbG93b3JsZA..')).to.equal(
+      'helloworld'
+    );
+    expect(base64UrlDecodeFromString('aGVsbG8gd29ybGQ.')).to.equal(
+      'hello world'
+    );
+    expect(base64UrlDecodeFromString('IGhlbGxvIHdvcmxkIA..')).to.equal(
+      ' hello world '
+    );
+    expect(base64UrlDecodeFromString('4pyTIMOgIGxhIG1vZGU.')).to.equal(
+      '✓ à la mode'
+    );
     expect(base64UrlDecodeFromString('Cg..')).to.equal('\n');
-    expect(base64UrlDecodeFromString('JCMhQCMkJV4mKigp')).to
-        .equal('$#!@#$%^&*()');
+    expect(base64UrlDecodeFromString('JCMhQCMkJV4mKigp')).to.equal(
+      '$#!@#$%^&*()'
+    );
   });
 });
diff --git a/test/unit/utils/test-bytes.js b/test/unit/utils/test-bytes.js
index 3445510fa502..a87e420d09fe 100644
--- a/test/unit/utils/test-bytes.js
+++ b/test/unit/utils/test-bytes.js
@@ -47,9 +47,11 @@ describe('stringToBytes', function() {
   });
 
   it('should signal an error with a character >255', () => {
-    allowConsoleError(() => { expect(() => {
-      return stringToBytes('ab☺');
-    }).to.throw(); });
+    allowConsoleError(() => {
+      expect(() => {
+        return stringToBytes('ab☺');
+      }).to.throw();
+    });
   });
 
   it('should convert bytes array to string', () => {
@@ -58,23 +60,28 @@ describe('stringToBytes', function() {
   });
 
   it('should generate random bytes array when win.crypto is availble', () => {
-    expect(getCryptoRandomBytesArray(fakeWin, 1)).to.deep
-        .equal(new Uint8Array([1]));
-    expect(getCryptoRandomBytesArray(fakeWin, 2)).to.deep
-        .equal(new Uint8Array([1, 2]));
-    expect(getCryptoRandomBytesArray(fakeWin, 3)).to.deep
-        .equal(new Uint8Array([1, 2, 3]));
+    expect(getCryptoRandomBytesArray(fakeWin, 1)).to.deep.equal(
+      new Uint8Array([1])
+    );
+    expect(getCryptoRandomBytesArray(fakeWin, 2)).to.deep.equal(
+      new Uint8Array([1, 2])
+    );
+    expect(getCryptoRandomBytesArray(fakeWin, 3)).to.deep.equal(
+      new Uint8Array([1, 2, 3])
+    );
   });
 
-  it('should return null when trying to generate random bytes array if ' +
-      'win.crypto is not availble', () => {
-    fakeWin.crypto = undefined;
-    expect(getCryptoRandomBytesArray(fakeWin, 1)).to.be.null;
-  });
+  it(
+    'should return null when trying to generate random bytes array if ' +
+      'win.crypto is not availble',
+    () => {
+      fakeWin.crypto = undefined;
+      expect(getCryptoRandomBytesArray(fakeWin, 1)).to.be.null;
+    }
+  );
 });
 
 describe('utf8', function() {
-
   // Examples here courtesy of StackOverflow:
   // http://stackoverflow.com/questions/478201/how-to-test-an-application-for
   // -correct-encoding-e-g-utf-8
@@ -91,31 +98,272 @@ describe('utf8', function() {
   ];
 
   const bytes = [
-    [0xe3, 0x83, 0xa6, 0xe3, 0x83, 0xbc, 0xe3, 0x82, 0xb6, 0xe3, 0x83, 0xbc,
-      0xe5, 0x88, 0xa5, 0xe3, 0x82, 0xb5, 0xe3, 0x82, 0xa4, 0xe3, 0x83, 0x88],
+    [
+      0xe3,
+      0x83,
+      0xa6,
+      0xe3,
+      0x83,
+      0xbc,
+      0xe3,
+      0x82,
+      0xb6,
+      0xe3,
+      0x83,
+      0xbc,
+      0xe5,
+      0x88,
+      0xa5,
+      0xe3,
+      0x82,
+      0xb5,
+      0xe3,
+      0x82,
+      0xa4,
+      0xe3,
+      0x83,
+      0x88,
+    ],
     [0xe7, 0xae, 0x80, 0xe4, 0xbd, 0x93, 0xe4, 0xb8, 0xad, 0xe6, 0x96, 0x87],
-    [0xed, 0x81, 0xac, 0xeb, 0xa1, 0x9c, 0xec, 0x8a, 0xa4, 0xed, 0x94, 0x8c,
-      0xeb, 0x9e, 0xab, 0xed, 0x8f, 0xbc, 0xec, 0x9c, 0xbc, 0xeb, 0xa1, 0x9c],
-    [0xd7, 0x9e, 0xd7, 0x93, 0xd7, 0x95, 0xd7, 0xa8, 0xd7, 0x99, 0xd7, 0x9d,
-      0xd7, 0x9e, 0xd7, 0x91, 0xd7, 0x95, 0xd7, 0xa7, 0xd7, 0xa9, 0xd7, 0x99,
-      0xd7, 0x9d],
-    [0xd8, 0xa3, 0xd9, 0x81, 0xd8, 0xb6, 0xd9, 0x84, 0xd8, 0xa7, 0xd9, 0x84,
-      0xd8, 0xa8, 0xd8, 0xad, 0xd9, 0x88, 0xd8, 0xab],
-    [0xce, 0xa3, 0xe1, 0xbd, 0xb2, 0xce, 0xb3, 0xce, 0xbd, 0xcf, 0x89, 0xcf,
-      0x81, 0xce, 0xaf, 0xce, 0xb6, 0xcf, 0x89, 0xe1, 0xbc, 0x80, 0xcf, 0x80,
-      0xe1, 0xbd, 0xb8],
-    [0xd0, 0x94, 0xd0, 0xb5, 0xd1, 0x81, 0xd1, 0x8f, 0xd1, 0x82, 0xd1, 0x83,
-      0xd1, 0x8e, 0xd0, 0x9c, 0xd0, 0xb5, 0xd0, 0xb6, 0xd0, 0xb4, 0xd1, 0x83,
-      0xd0, 0xbd, 0xd0, 0xb0, 0xd1, 0x80, 0xd0, 0xbe, 0xd0, 0xb4, 0xd0, 0xbd,
-      0xd1, 0x83, 0xd1, 0x8e],
-    [0xe0, 0xb9, 0x81, 0xe0, 0xb8, 0x9c, 0xe0, 0xb9, 0x88, 0xe0, 0xb8, 0x99,
-      0xe0, 0xb8, 0x94, 0xe0, 0xb8, 0xb4, 0xe0, 0xb8, 0x99, 0xe0, 0xb8, 0xae,
-      0xe0, 0xb8, 0xb1, 0xe0, 0xb9, 0x88, 0xe0, 0xb8, 0x99, 0xe0, 0xb9, 0x80,
-      0xe0, 0xb8, 0xaa, 0xe0, 0xb8, 0xb7, 0xe0, 0xb9, 0x88, 0xe0, 0xb8, 0xad,
-      0xe0, 0xb8, 0xa1, 0xe0, 0xb9, 0x82, 0xe0, 0xb8, 0x97, 0xe0, 0xb8, 0xa3,
-      0xe0, 0xb8, 0xa1, 0xe0, 0xb9, 0x81, 0xe0, 0xb8, 0xaa, 0xe0, 0xb8, 0x99,
-      0xe0, 0xb8, 0xaa, 0xe0, 0xb8, 0xb1, 0xe0, 0xb8, 0x87, 0xe0, 0xb9, 0x80,
-      0xe0, 0xb8, 0xa7, 0xe0, 0xb8, 0x8a],
+    [
+      0xed,
+      0x81,
+      0xac,
+      0xeb,
+      0xa1,
+      0x9c,
+      0xec,
+      0x8a,
+      0xa4,
+      0xed,
+      0x94,
+      0x8c,
+      0xeb,
+      0x9e,
+      0xab,
+      0xed,
+      0x8f,
+      0xbc,
+      0xec,
+      0x9c,
+      0xbc,
+      0xeb,
+      0xa1,
+      0x9c,
+    ],
+    [
+      0xd7,
+      0x9e,
+      0xd7,
+      0x93,
+      0xd7,
+      0x95,
+      0xd7,
+      0xa8,
+      0xd7,
+      0x99,
+      0xd7,
+      0x9d,
+      0xd7,
+      0x9e,
+      0xd7,
+      0x91,
+      0xd7,
+      0x95,
+      0xd7,
+      0xa7,
+      0xd7,
+      0xa9,
+      0xd7,
+      0x99,
+      0xd7,
+      0x9d,
+    ],
+    [
+      0xd8,
+      0xa3,
+      0xd9,
+      0x81,
+      0xd8,
+      0xb6,
+      0xd9,
+      0x84,
+      0xd8,
+      0xa7,
+      0xd9,
+      0x84,
+      0xd8,
+      0xa8,
+      0xd8,
+      0xad,
+      0xd9,
+      0x88,
+      0xd8,
+      0xab,
+    ],
+    [
+      0xce,
+      0xa3,
+      0xe1,
+      0xbd,
+      0xb2,
+      0xce,
+      0xb3,
+      0xce,
+      0xbd,
+      0xcf,
+      0x89,
+      0xcf,
+      0x81,
+      0xce,
+      0xaf,
+      0xce,
+      0xb6,
+      0xcf,
+      0x89,
+      0xe1,
+      0xbc,
+      0x80,
+      0xcf,
+      0x80,
+      0xe1,
+      0xbd,
+      0xb8,
+    ],
+    [
+      0xd0,
+      0x94,
+      0xd0,
+      0xb5,
+      0xd1,
+      0x81,
+      0xd1,
+      0x8f,
+      0xd1,
+      0x82,
+      0xd1,
+      0x83,
+      0xd1,
+      0x8e,
+      0xd0,
+      0x9c,
+      0xd0,
+      0xb5,
+      0xd0,
+      0xb6,
+      0xd0,
+      0xb4,
+      0xd1,
+      0x83,
+      0xd0,
+      0xbd,
+      0xd0,
+      0xb0,
+      0xd1,
+      0x80,
+      0xd0,
+      0xbe,
+      0xd0,
+      0xb4,
+      0xd0,
+      0xbd,
+      0xd1,
+      0x83,
+      0xd1,
+      0x8e,
+    ],
+    [
+      0xe0,
+      0xb9,
+      0x81,
+      0xe0,
+      0xb8,
+      0x9c,
+      0xe0,
+      0xb9,
+      0x88,
+      0xe0,
+      0xb8,
+      0x99,
+      0xe0,
+      0xb8,
+      0x94,
+      0xe0,
+      0xb8,
+      0xb4,
+      0xe0,
+      0xb8,
+      0x99,
+      0xe0,
+      0xb8,
+      0xae,
+      0xe0,
+      0xb8,
+      0xb1,
+      0xe0,
+      0xb9,
+      0x88,
+      0xe0,
+      0xb8,
+      0x99,
+      0xe0,
+      0xb9,
+      0x80,
+      0xe0,
+      0xb8,
+      0xaa,
+      0xe0,
+      0xb8,
+      0xb7,
+      0xe0,
+      0xb9,
+      0x88,
+      0xe0,
+      0xb8,
+      0xad,
+      0xe0,
+      0xb8,
+      0xa1,
+      0xe0,
+      0xb9,
+      0x82,
+      0xe0,
+      0xb8,
+      0x97,
+      0xe0,
+      0xb8,
+      0xa3,
+      0xe0,
+      0xb8,
+      0xa1,
+      0xe0,
+      0xb9,
+      0x81,
+      0xe0,
+      0xb8,
+      0xaa,
+      0xe0,
+      0xb8,
+      0x99,
+      0xe0,
+      0xb8,
+      0xaa,
+      0xe0,
+      0xb8,
+      0xb1,
+      0xe0,
+      0xb8,
+      0x87,
+      0xe0,
+      0xb9,
+      0x80,
+      0xe0,
+      0xb8,
+      0xa7,
+      0xe0,
+      0xb8,
+      0x8a,
+    ],
   ];
 
   it('should encode given string into utf-8 byte array', () => {
@@ -133,13 +381,17 @@ describe('utf8', function() {
 
 describe('bytesToUInt32', function() {
   it('should convert Uint8Arrays into unsigned 32-bit integers', () => {
-    expect(bytesToUInt32(new Uint8Array([0xff, 0xff, 0xff, 0xff])))
-        .to.equal(0xffffffff);
-    expect(bytesToUInt32(new Uint8Array([0xde, 0xad, 0xbe, 0xef])))
-        .to.equal(0xdeadbeef);
-    expect(bytesToUInt32(new Uint8Array([0x47, 0x47, 0x47, 0x47])))
-        .to.equal(0x47474747);
-    expect(bytesToUInt32(new Uint8Array([0x00, 0x00, 0x00, 0x00])))
-        .to.equal(0x00000000);
+    expect(bytesToUInt32(new Uint8Array([0xff, 0xff, 0xff, 0xff]))).to.equal(
+      0xffffffff
+    );
+    expect(bytesToUInt32(new Uint8Array([0xde, 0xad, 0xbe, 0xef]))).to.equal(
+      0xdeadbeef
+    );
+    expect(bytesToUInt32(new Uint8Array([0x47, 0x47, 0x47, 0x47]))).to.equal(
+      0x47474747
+    );
+    expect(bytesToUInt32(new Uint8Array([0x00, 0x00, 0x00, 0x00]))).to.equal(
+      0x00000000
+    );
   });
 });
diff --git a/test/unit/utils/test-dom-fingerprint.js b/test/unit/utils/test-dom-fingerprint.js
index eef8ac777cc4..865fcf9f7afb 100644
--- a/test/unit/utils/test-dom-fingerprint.js
+++ b/test/unit/utils/test-dom-fingerprint.js
@@ -19,7 +19,6 @@ import {
   domFingerprintPlain,
 } from '../../../src/utils/dom-fingerprint';
 
-
 describes.realWin('domFingerprint', {}, env => {
   let body;
   let div1;
@@ -32,8 +31,7 @@ describes.realWin('domFingerprint', {}, env => {
     body.textContent = '';
     div1 = doc.createElement('div');
     div1.id = 'id1';
-    div1.innerHTML =
-      `<div id='id2'>
+    div1.innerHTML = `<div id='id2'>
          <table>                <!-- table:0 -->
            <tr>                 <!-- tr:0 -->
              <td></td>          <!-- td:0 -->
@@ -51,7 +49,8 @@ describes.realWin('domFingerprint', {}, env => {
 
   it('should map a sample DOM structure to the right string', () => {
     expect(domFingerprintPlain(ampAd)).to.equal(
-        'amp-ad.0,td.1,tr.0,tbody.0,table.0,div/id2.0,div/id1.0,body.0,html.0');
+      'amp-ad.0,td.1,tr.0,tbody.0,table.0,div/id2.0,div/id1.0,body.0,html.0'
+    );
   });
 
   it('should map a sample DOM structure to the right hashed value', () => {
diff --git a/test/unit/utils/test-math.js b/test/unit/utils/test-math.js
index c1283fcd7851..c7a2744dd812 100644
--- a/test/unit/utils/test-math.js
+++ b/test/unit/utils/test-math.js
@@ -17,7 +17,6 @@
 import {clamp, mapRange, mod} from '../../../src/utils/math';
 
 describes.sandboxed('utils/math', {}, () => {
-
   describe('mapRange', () => {
     it('should map a number to the current value', () => {
       expect(mapRange(5, 0, 10, 40, 80)).to.equal(60);
@@ -117,4 +116,3 @@ describes.sandboxed('utils/math', {}, () => {
     });
   });
 });
-
diff --git a/test/unit/utils/test-pem.js b/test/unit/utils/test-pem.js
index 7900ca347a9c..26e24f68fb32 100644
--- a/test/unit/utils/test-pem.js
+++ b/test/unit/utils/test-pem.js
@@ -14,22 +14,21 @@
  * limitations under the License.
  */
 
-import {
-  pemToBytes,
-} from '../../../src/utils/pem';
+import {pemToBytes} from '../../../src/utils/pem';
 
 describe('pemToBytes', () => {
   const PLAIN_TEXT =
-        'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd'
-        + 'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs'
-        + 'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D'
-        + 'o2kQ+X5xK9cipRgEKwIDAQAB';
-  const PEM = '-----BEGIN PUBLIC KEY-----\n'
-        + 'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n'
-        + 'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n'
-        + 'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n'
-        + 'o2kQ+X5xK9cipRgEKwIDAQAB\n'
-        + '-----END PUBLIC KEY-----';
+    'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd' +
+    'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs' +
+    'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D' +
+    'o2kQ+X5xK9cipRgEKwIDAQAB';
+  const PEM =
+    '-----BEGIN PUBLIC KEY-----\n' +
+    'MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd\n' +
+    'UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs\n' +
+    'HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D\n' +
+    'o2kQ+X5xK9cipRgEKwIDAQAB\n' +
+    '-----END PUBLIC KEY-----';
 
   it('should convert a valid key', () => {
     const binary = pemToBytes(PEM);
@@ -54,8 +53,9 @@ describe('pemToBytes', () => {
   });
 
   it('should convert without line breaks', () => {
-    const binary = pemToBytes('-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT
-                              + '-----END PUBLIC KEY-----');
+    const binary = pemToBytes(
+      '-----BEGIN PUBLIC KEY-----' + PLAIN_TEXT + '-----END PUBLIC KEY-----'
+    );
     const plain = atob(PLAIN_TEXT);
     const len = plain.length;
     expect(binary.byteLength).to.equal(len);
diff --git a/test/unit/utils/test-priority-queue.js b/test/unit/utils/test-priority-queue.js
index ec1bb9c3e67f..1c8b4476d480 100644
--- a/test/unit/utils/test-priority-queue.js
+++ b/test/unit/utils/test-priority-queue.js
@@ -87,7 +87,9 @@ describe('PriorityQueue', function() {
   });
 
   it('should throw error when priority is NaN', () => {
-    expect(() => { pq.enqueue(NaN); }).to.throw(Error);
+    expect(() => {
+      pq.enqueue(NaN);
+    }).to.throw(Error);
   });
 
   it('should iterate through queue', () => {
diff --git a/test/unit/utils/test-promise.js b/test/unit/utils/test-promise.js
index a3c9ebff6318..0d67a9622b14 100644
--- a/test/unit/utils/test-promise.js
+++ b/test/unit/utils/test-promise.js
@@ -17,7 +17,6 @@
 import * as PromiseUtils from '../../../src/utils/promise';
 
 describes.sandboxed('PromiseUtils', {}, () => {
-
   function getPromiseObject() {
     let resolve, reject;
     const promise = new Promise((resolve_, reject_) => {
@@ -76,8 +75,10 @@ describes.sandboxed('PromiseUtils', {}, () => {
     it('should support adding initial promises in the constructor', () => {
       const one = getPromiseObject();
       const two = getPromiseObject();
-      const resolver =
-          new PromiseUtils.LastAddedResolver([one.promise, two.promise]);
+      const resolver = new PromiseUtils.LastAddedResolver([
+        one.promise,
+        two.promise,
+      ]);
 
       setTimeout(() => one.resolve('one'), 0);
       setTimeout(() => two.resolve('two'), 10);
@@ -111,18 +112,24 @@ describes.sandboxed('PromiseUtils', {}, () => {
       setTimeout(() => six.reject('six'), 10);
 
       return Promise.all([
-        firstResolver.then(result => {
-          expect(result).to.equal('three');
-        }, unusedError => {
-          // shouldn't run
-          expect(false).to.be.true;
-        }),
-        secondResolver.then(unusedResult => {
-          // shouldn't run
-          expect(false).to.be.true;
-        }, error => {
-          expect(error).to.equal('six');
-        }),
+        firstResolver.then(
+          result => {
+            expect(result).to.equal('three');
+          },
+          unusedError => {
+            // shouldn't run
+            expect(false).to.be.true;
+          }
+        ),
+        secondResolver.then(
+          unusedResult => {
+            // shouldn't run
+            expect(false).to.be.true;
+          },
+          error => {
+            expect(error).to.equal('six');
+          }
+        ),
       ]);
     });
   });
diff --git a/test/unit/utils/test-signals.js b/test/unit/utils/test-signals.js
index cd8ce33a82ed..90c57887e254 100644
--- a/test/unit/utils/test-signals.js
+++ b/test/unit/utils/test-signals.js
@@ -16,7 +16,6 @@
 
 import {Signals} from '../../../src/utils/signals';
 
-
 describes.sandboxed('Signals', {}, () => {
   let clock;
   let signals;
@@ -94,15 +93,18 @@ describes.sandboxed('Signals', {}, () => {
     expect(signals.promiseMap_['sig'].promise).to.equal(promise);
     const error = new Error();
     signals.rejectSignal('sig', error);
-    return promise.then(() => {
-      throw new Error('should have failed');
-    }, reason => {
-      expect(reason).to.equal(error);
-      expect(signals.promiseMap_['sig'].promise).to.equal(promise);
-      expect(signals.promiseMap_['sig'].resolve).to.be.undefined;
-      expect(signals.promiseMap_['sig'].reject).to.be.undefined;
-      expect(signals.whenSignal('sig')).to.equal(promise); // Reuse promise.
-    });
+    return promise.then(
+      () => {
+        throw new Error('should have failed');
+      },
+      reason => {
+        expect(reason).to.equal(error);
+        expect(signals.promiseMap_['sig'].promise).to.equal(promise);
+        expect(signals.promiseMap_['sig'].resolve).to.be.undefined;
+        expect(signals.promiseMap_['sig'].reject).to.be.undefined;
+        expect(signals.whenSignal('sig')).to.equal(promise); // Reuse promise.
+      }
+    );
   });
 
   it('should reject signal before it was requested', () => {
@@ -110,15 +112,18 @@ describes.sandboxed('Signals', {}, () => {
     signals.rejectSignal('sig', error);
     const promise = signals.whenSignal('sig');
     expect(signals.promiseMap_['sig'].promise).to.equal(promise);
-    return promise.then(() => {
-      throw new Error('should have failed');
-    }, reason => {
-      expect(reason).to.equal(error);
-      expect(signals.promiseMap_['sig'].promise).to.equal(promise);
-      expect(signals.promiseMap_['sig'].resolve).to.be.undefined;
-      expect(signals.promiseMap_['sig'].reject).to.be.undefined;
-      expect(signals.whenSignal('sig')).to.equal(promise); // Reuse promise.
-    });
+    return promise.then(
+      () => {
+        throw new Error('should have failed');
+      },
+      reason => {
+        expect(reason).to.equal(error);
+        expect(signals.promiseMap_['sig'].promise).to.equal(promise);
+        expect(signals.promiseMap_['sig'].resolve).to.be.undefined;
+        expect(signals.promiseMap_['sig'].reject).to.be.undefined;
+        expect(signals.whenSignal('sig')).to.equal(promise); // Reuse promise.
+      }
+    );
   });
 
   it('should reset signal before it was triggered', () => {
diff --git a/test/unit/utils/test-xhr-utils.js b/test/unit/utils/test-xhr-utils.js
index 147d2e381de9..7d0d1a4c2afb 100644
--- a/test/unit/utils/test-xhr-utils.js
+++ b/test/unit/utils/test-xhr-utils.js
@@ -27,7 +27,6 @@ import {Services} from '../../../src/services';
 import {dict} from '../../../src/utils/object';
 
 describes.sandboxed('utils/xhr-utils', {}, env => {
-
   let sandbox;
 
   beforeEach(() => {
@@ -61,10 +60,12 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
         },
       };
       expect(() => {
-        verifyAmpCORSHeaders(win, response, {} /* init */);})
-          .to.throw('Returned AMP-Access-Control-Allow-Source-Origin '
-              + 'is not equal to the current: https://www.original.org vs '
-              + 'https://www.da-original.org');
+        verifyAmpCORSHeaders(win, response, {} /* init */);
+      }).to.throw(
+        'Returned AMP-Access-Control-Allow-Source-Origin ' +
+          'is not equal to the current: https://www.original.org vs ' +
+          'https://www.da-original.org'
+      );
     });
   });
 
@@ -72,13 +73,19 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
     describe('requireAmpResponseSourceOrigin', () => {
       it('should be false if ampCors is false', () => {
         const fetchInitDef = setupAMPCors(
-            {origin: 'http://www.origin.org'}, 'http://www.origin.org', {ampCors: false});
+          {origin: 'http://www.origin.org'},
+          'http://www.origin.org',
+          {ampCors: false}
+        );
         expect(fetchInitDef.requireAmpResponseSourceOrigin).to.equal(false);
       });
 
       it('should be set if not defined', () => {
         const fetchInitDef = setupAMPCors(
-            {origin: 'http://www.origin.org'}, 'http://www.origin.org', {});
+          {origin: 'http://www.origin.org'},
+          'http://www.origin.org',
+          {}
+        );
         expect(fetchInitDef.requireAmpResponseSourceOrigin).to.equal(true);
       });
     });
@@ -86,7 +93,10 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
     it('should set AMP-Same-Origin header', () => {
       // Given a same origin request.
       const fetchInitDef = setupAMPCors(
-          {origin: 'http://www.origin.org'}, 'http://www.origin.org', {});
+        {origin: 'http://www.origin.org'},
+        'http://www.origin.org',
+        {}
+      );
       // Expect proper header to be set.
       expect(fetchInitDef['headers']['AMP-Same-Origin']).to.equal('true');
     });
@@ -94,7 +104,10 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
     it('should not set AMP-Same-Origin header', () => {
       // If not a same origin request.
       const fetchInitDef = setupAMPCors(
-          {origin: 'http://www.originz.org'}, 'http://www.origin.org', {headers: {}});
+        {origin: 'http://www.originz.org'},
+        'http://www.origin.org',
+        {headers: {}}
+      );
       expect(fetchInitDef['headers']['AMP-Same-Origin']).to.be.undefined;
     });
   });
@@ -111,9 +124,11 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
     });
 
     it('should handle null credentials', () => {
-      allowConsoleError(() => { expect(() => {
-        setupInit({credentials: null}, 'text/html');
-      }).to.throw(/Only credentials=include\|omit support: null/); });
+      allowConsoleError(() => {
+        expect(() => {
+          setupInit({credentials: null}, 'text/html');
+        }).to.throw(/Only credentials=include\|omit support: null/);
+      });
     });
   });
 
@@ -164,19 +179,21 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
 
     it('should be no-op if amp doc is absent', () => {
       ampDocSingle = null;
-      return getViewerInterceptResponse(win, ampDocSingle, input, init)
-          .then(() => {
-            expect(viewerForDoc).to.not.have.been.called;
-          });
+      return getViewerInterceptResponse(win, ampDocSingle, input, init).then(
+        () => {
+          expect(viewerForDoc).to.not.have.been.called;
+        }
+      );
     });
 
     it('should be no-op if amp doc does not support xhr interception', () => {
       doc.removeAttribute('allow-xhr-interception');
       input = 'https://www.googz.org';
-      return getViewerInterceptResponse(win, ampDocSingle, input, init)
-          .then(() => {
-            expect(viewer.sendMessageAwaitResponse).to.not.have.been.called;
-          });
+      return getViewerInterceptResponse(win, ampDocSingle, input, init).then(
+        () => {
+          expect(viewer.sendMessageAwaitResponse).to.not.have.been.called;
+        }
+      );
     });
 
     it('should send xhr request to viewer', () => {
@@ -186,93 +203,104 @@ describes.sandboxed('utils/xhr-utils', {}, env => {
       input = 'https://www.googz.org';
       init = {body: {}};
       viewer.sendMessageAwaitResponse.returns(Promise.resolve({}));
-      return getViewerInterceptResponse(win, ampDocSingle, input, init)
-          .then(() => {
-            const msgPayload = dict({
-              'originalRequest': {
-                'input': 'https://www.googz.org',
-                'init': {
-                  'body': {},
-                },
+      return getViewerInterceptResponse(win, ampDocSingle, input, init).then(
+        () => {
+          const msgPayload = dict({
+            'originalRequest': {
+              'input': 'https://www.googz.org',
+              'init': {
+                'body': {},
               },
-            });
-            expect(viewer.sendMessageAwaitResponse).to.have.been.calledOnce;
-            expect(viewer.sendMessageAwaitResponse)
-                .to.have.been.calledWith('xhr', msgPayload);
+            },
           });
+          expect(viewer.sendMessageAwaitResponse).to.have.been.calledOnce;
+          expect(viewer.sendMessageAwaitResponse).to.have.been.calledWith(
+            'xhr',
+            msgPayload
+          );
+        }
+      );
     });
   });
 
   describe('getViewerAuthTokenIfAvailable', () => {
     it('should return undefined if crossorigin attr is not present', () => {
       const el = document.createElement('html');
-      return getViewerAuthTokenIfAvailable(el)
-          .then(token => {
-            expect(token).to.equal(undefined);
-          });
+      return getViewerAuthTokenIfAvailable(el).then(token => {
+        expect(token).to.equal(undefined);
+      });
     });
 
-    it('should return undefined if crossorigin attr does not contain ' +
-       'exactly "amp-viewer-auth-token-post"', () => {
-      const el = document.createElement('html');
-      el.setAttribute('crossorigin', '');
-      return getViewerAuthTokenIfAvailable(el)
-          .then(token => {
-            expect(token).to.be.undefined;
-          });
-    });
+    it(
+      'should return undefined if crossorigin attr does not contain ' +
+        'exactly "amp-viewer-auth-token-post"',
+      () => {
+        const el = document.createElement('html');
+        el.setAttribute('crossorigin', '');
+        return getViewerAuthTokenIfAvailable(el).then(token => {
+          expect(token).to.be.undefined;
+        });
+      }
+    );
 
     it('should return an auth token if one is present', () => {
       sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
-          Promise.resolve({
-            getIdTokenPromise: (() => Promise.resolve('idToken')),
-          }));
+        Promise.resolve({
+          getIdTokenPromise: () => Promise.resolve('idToken'),
+        })
+      );
       const el = document.createElement('html');
       el.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
-      return getViewerAuthTokenIfAvailable(el)
-          .then(token => {
-            expect(token).to.equal('idToken');
-          });
+      return getViewerAuthTokenIfAvailable(el).then(token => {
+        expect(token).to.equal('idToken');
+      });
     });
 
     it('should return an empty auth token if there is not one present', () => {
       sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
-          Promise.resolve({
-            getIdTokenPromise: (() => Promise.resolve(undefined)),
-          }));
+        Promise.resolve({
+          getIdTokenPromise: () => Promise.resolve(undefined),
+        })
+      );
       const el = document.createElement('html');
       el.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
-      return getViewerAuthTokenIfAvailable(el)
-          .then(token => {
-            expect(token).to.equal('');
-          });
+      return getViewerAuthTokenIfAvailable(el).then(token => {
+        expect(token).to.equal('');
+      });
     });
 
-    it('should return an empty auth token if there is an issue retrieving ' +
-        'the identity token', () => {
-      sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
+    it(
+      'should return an empty auth token if there is an issue retrieving ' +
+        'the identity token',
+      () => {
+        sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
           Promise.reject({
-            getIdTokenPromise: (() => Promise.reject()),
-          }));
-      const el = document.createElement('html');
-      el.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
-      return getViewerAuthTokenIfAvailable(el)
-          .then(token => {
-            expect(token).to.equal('');
-          });
-    });
+            getIdTokenPromise: () => Promise.reject(),
+          })
+        );
+        const el = document.createElement('html');
+        el.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
+        return getViewerAuthTokenIfAvailable(el).then(token => {
+          expect(token).to.equal('');
+        });
+      }
+    );
 
     it('should assert that amp-viewer-assistance extension is present', () => {
-      sandbox.stub(Services, 'viewerAssistanceForDocOrNull').returns(
-          Promise.resolve());
+      sandbox
+        .stub(Services, 'viewerAssistanceForDocOrNull')
+        .returns(Promise.resolve());
       const el = document.createElement('html');
       el.setAttribute('crossorigin', 'amp-viewer-auth-token-via-post');
       expectAsyncConsoleError(
-          'crossorigin="amp-viewer-auth-token-post" ' +
-          'requires amp-viewer-assistance extension.', 1);
-      return getViewerAuthTokenIfAvailable(el)
-          .then(undefined,
-              e => expect(e).to.not.be.undefined);
+        'crossorigin="amp-viewer-auth-token-post" ' +
+          'requires amp-viewer-assistance extension.',
+        1
+      );
+      return getViewerAuthTokenIfAvailable(el).then(
+        undefined,
+        e => expect(e).to.not.be.undefined
+      );
     });
   });
 });
diff --git a/test/unit/web-worker/test-amp-worker.js b/test/unit/web-worker/test-amp-worker.js
index cd1a95f78486..44c256006906 100644
--- a/test/unit/web-worker/test-amp-worker.js
+++ b/test/unit/web-worker/test-amp-worker.js
@@ -52,12 +52,13 @@ describe('invokeWebWorker', () => {
 
     // Stub xhr.fetchText() to return a resolved promise.
     installXhrService(fakeWin);
-    sandbox.stub(Services.xhrFor(fakeWin), 'fetchText').callsFake(
-        () => Promise.resolve({
-          text() {
-            return Promise.resolve();
-          },
-        }));
+    sandbox.stub(Services.xhrFor(fakeWin), 'fetchText').callsFake(() =>
+      Promise.resolve({
+        text() {
+          return Promise.resolve();
+        },
+      })
+    );
 
     ampWorker = ampWorkerForTesting(fakeWin);
     workerReadyPromise = ampWorker.fetchPromiseForTesting();
@@ -69,8 +70,9 @@ describe('invokeWebWorker', () => {
 
   it('should check if Worker is supported', () => {
     fakeWin.Worker = undefined;
-    return expect(invokeWebWorker(fakeWin, 'foo'))
-        .to.eventually.be.rejectedWith('not supported');
+    return expect(
+      invokeWebWorker(fakeWin, 'foo')
+    ).to.eventually.be.rejectedWith('not supported');
   });
 
   it('should send and receive a message', () => {
@@ -104,21 +106,27 @@ describe('invokeWebWorker', () => {
     const qux = invokeWebWorker(fakeWin, 'qux', ['qux-arg']);
 
     return workerReadyPromise.then(() => {
-      fakeWorker.onmessage({data: {
-        method: 'bar',
-        returnValue: 'bar-retVal',
-        id: 1,
-      }});
-      fakeWorker.onmessage({data: {
-        method: 'qux',
-        returnValue: 'qux-retVal',
-        id: 2,
-      }});
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: 'foo-retVal',
-        id: 0,
-      }});
+      fakeWorker.onmessage({
+        data: {
+          method: 'bar',
+          returnValue: 'bar-retVal',
+          id: 1,
+        },
+      });
+      fakeWorker.onmessage({
+        data: {
+          method: 'qux',
+          returnValue: 'qux-retVal',
+          id: 2,
+        },
+      });
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: 'foo-retVal',
+          id: 0,
+        },
+      });
 
       return Promise.all([foo, bar, qux]).then(values => {
         expect(values[0]).to.equal('foo-retVal');
@@ -147,21 +155,27 @@ describe('invokeWebWorker', () => {
         id: 2,
       });
 
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: 'three',
-        id: 2,
-      }});
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: 'one',
-        id: 0,
-      }});
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: 'two',
-        id: 1,
-      }});
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: 'three',
+          id: 2,
+        },
+      });
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: 'one',
+          id: 0,
+        },
+      });
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: 'two',
+          id: 1,
+        },
+      });
 
       return Promise.all([one, two, three]).then(values => {
         expect(values[0]).to.equal('one');
@@ -180,22 +194,28 @@ describe('invokeWebWorker', () => {
       expect(errorStub.callCount).to.equal(0);
 
       // Unexpected `id` value.
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: undefined,
-        id: 3,
-      }});
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: undefined,
+          id: 3,
+        },
+      });
       expect(errorStub.callCount).to.equal(1);
       expect(errorStub).to.have.been.calledWith('web-worker');
 
       // Unexpected method at valid `id`.
-      allowConsoleError(() => { expect(() => {
-        fakeWorker.onmessage({data: {
-          method: 'bar',
-          returnValue: undefined,
-          id: 0,
-        }});
-      }).to.throw('mismatched method'); });
+      allowConsoleError(() => {
+        expect(() => {
+          fakeWorker.onmessage({
+            data: {
+              method: 'bar',
+              returnValue: undefined,
+              id: 0,
+            },
+          });
+        }).to.throw('mismatched method');
+      });
     });
   });
 
@@ -205,11 +225,13 @@ describe('invokeWebWorker', () => {
     return workerReadyPromise.then(() => {
       expect(ampWorker.hasPendingMessages()).to.be.true;
 
-      fakeWorker.onmessage({data: {
-        method: 'foo',
-        returnValue: 'abc',
-        id: 0,
-      }});
+      fakeWorker.onmessage({
+        data: {
+          method: 'foo',
+          returnValue: 'abc',
+          id: 0,
+        },
+      });
 
       expect(ampWorker.hasPendingMessages()).to.be.false;
     });
diff --git a/testing/describes.js b/testing/describes.js
index 77a1d258785f..4a0dfba25613 100644
--- a/testing/describes.js
+++ b/testing/describes.js
@@ -104,32 +104,25 @@ import {
   installBuiltinElements,
   installExtensionsService,
 } from '../src/service/extensions-impl';
-import {
-  install as installCustomElements,
-} from '../src/polyfills/custom-elements';
+import {install as installCustomElements} from '../src/polyfills/custom-elements';
 import {installDocService} from '../src/service/ampdoc-impl';
 import {installFriendlyIframeEmbed} from '../src/friendly-iframe-embed';
 import {maybeTrackImpression} from '../src/impression';
-import {
-  resetScheduledElementForTesting,
-} from '../src/service/custom-element-registry';
+import {resetScheduledElementForTesting} from '../src/service/custom-element-registry';
 import {setStyles} from '../src/style';
 import fetchMock from 'fetch-mock';
 
 /** Should have something in the name, otherwise nothing is shown. */
 const SUB = ' ';
 
-
 /** @type {number} */
 let iframeCount = 0;
 
-
 /**
  * @const {!Object<string, function(!Object)>}
  */
 const extensionsBuffer = {};
 
-
 /**
  * @param {string} name
  * @param {function(!Object)} installer
@@ -139,7 +132,6 @@ export function bufferExtension(name, installer) {
   extensionsBuffer[name] = installer;
 }
 
-
 /**
  * @typedef {{
  *   fakeRegisterElement: (boolean|undefined),
@@ -147,7 +139,6 @@ export function bufferExtension(name, installer) {
  */
 export let TestSpec;
 
-
 /**
  * An object specifying the configuration of an AmpFixture.
  *
@@ -163,7 +154,6 @@ export let TestSpec;
  */
 export let AmpTestSpec;
 
-
 /**
  * An object containing artifacts of AmpFixture that's returned to test methods.
  * @typedef {{
@@ -176,7 +166,6 @@ export let AmpTestSpec;
  */
 export let AmpTestEnv;
 
-
 /**
  * A test with a sandbox.
  * @param {string} name
@@ -185,7 +174,6 @@ export let AmpTestEnv;
  */
 export const sandboxed = describeEnv(unusedSpec => []);
 
-
 /**
  * A test with a fake window.
  * @param {string} name
@@ -203,7 +191,6 @@ export const fakeWin = describeEnv(spec => [
   new AmpFixture(spec),
 ]);
 
-
 /**
  * A test with a real (iframed) window.
  * @param {string} name
@@ -222,7 +209,6 @@ export const realWin = describeEnv(spec => [
   new AmpFixture(spec),
 ]);
 
-
 /**
  * A test that loads HTML markup in `spec.body` into an embedded iframe.
  * @param {string} name
@@ -239,10 +225,7 @@ export const realWin = describeEnv(spec => [
  *   iframe: !HTMLIFrameElement,
  * })} fn
  */
-export const integration = describeEnv(spec => [
-  new IntegrationFixture(spec),
-]);
-
+export const integration = describeEnv(spec => [new IntegrationFixture(spec)]);
 
 /**
  * A repeating test.
@@ -282,13 +265,12 @@ export const repeated = (function() {
    * @param {function(string, *)} fn
    */
   mainFunc.only = function(name, variants, fn) {
-    return templateFunc(name, variants, fn, describe./*OK*/only);
+    return templateFunc(name, variants, fn, describe./*OK*/ only);
   };
 
   return mainFunc;
 })();
 
-
 /**
  * Mocks Window.fetch in the given environment and exposes `env.fetchMock`. For
  * convenience, also exposes fetch-mock's mock() function as
@@ -305,7 +287,6 @@ function attachFetchMock(env) {
   env.expectFetch = fetchMock.mock.bind(fetchMock);
 }
 
-
 /**
  * Returns a wrapped version of Mocha's describe(), it() and only() methods
  * that also sets up the provided fixtures and returns the corresponding
@@ -348,9 +329,12 @@ function describeEnv(factory) {
       afterEach(() => {
         // Tear down all fixtures.
         let teardown = Promise.resolve();
-        fixtures.slice(0).reverse().forEach(fixture => {
-          teardown = teardown.then(() => fixture.teardown(env));
-        });
+        fixtures
+          .slice(0)
+          .reverse()
+          .forEach(fixture => {
+            teardown = teardown.then(() => fixture.teardown(env));
+          });
 
         return teardown.then(() => {
           // Delete all other keys.
@@ -388,7 +372,7 @@ function describeEnv(factory) {
    * @param {function(!Object)} fn
    */
   mainFunc.only = function(name, spec, fn) {
-    return templateFunc(name, spec, fn, describe./*OK*/only);
+    return templateFunc(name, spec, fn, describe./*OK*/ only);
   };
 
   mainFunc.skip = function(name, variants, fn) {
@@ -398,10 +382,8 @@ function describeEnv(factory) {
   return mainFunc;
 }
 
-
 /** @interface */
 class FixtureInterface {
-
   /** @return {boolean} */
   isOn() {}
 
@@ -417,10 +399,8 @@ class FixtureInterface {
   teardown(unusedEnv) {}
 }
 
-
 /** @implements {FixtureInterface} */
 class SandboxFixture {
-
   /** @param {!TestSpec} spec */
   constructor(spec) {
     /** @const */
@@ -445,7 +425,6 @@ class SandboxFixture {
 
 /** @implements {FixtureInterface} */
 class IntegrationFixture {
-
   /** @param {!{body: string}} spec */
   constructor(spec) {
     /** @const */
@@ -469,27 +448,33 @@ class IntegrationFixture {
 
   /** @override */
   setup(env) {
-    const body = typeof this.spec.body == 'function' ?
-      this.spec.body() : this.spec.body;
-    const css = typeof this.spec.css == 'function' ?
-      this.spec.css() : this.spec.css;
-    const experiments = this.spec.experiments == undefined ?
-      undefined : this.spec.experiments.join(',');
-    const extensions = this.spec.extensions == undefined ?
-      undefined : this.spec.extensions.join(',');
+    const body =
+      typeof this.spec.body == 'function' ? this.spec.body() : this.spec.body;
+    const css =
+      typeof this.spec.css == 'function' ? this.spec.css() : this.spec.css;
+    const experiments =
+      this.spec.experiments == undefined
+        ? undefined
+        : this.spec.experiments.join(',');
+    const extensions =
+      this.spec.extensions == undefined
+        ? undefined
+        : this.spec.extensions.join(',');
     const ampDocType = this.spec.ampdoc || 'single';
 
-    let url = this.spec.amp === false
-      ? '/amp4test/compose-html'
-      : '/amp4test/compose-doc';
+    let url =
+      this.spec.amp === false
+        ? '/amp4test/compose-html'
+        : '/amp4test/compose-doc';
 
     if (this.spec.params) {
       url = addParamsToUrl(url, this.spec.params);
     }
 
     return new Promise((resolve, reject) => {
-      const docUrl = addParamsToUrl(url, {body, css, experiments, extensions})
-            + `#${this.hash}`;
+      const docUrl =
+        addParamsToUrl(url, {body, css, experiments, extensions}) +
+        `#${this.hash}`;
 
       let src = docUrl;
       // If shadow mode, wrap doc in shadow viewer.
@@ -518,7 +503,6 @@ class IntegrationFixture {
 
 /** @implements {FixtureInterface} */
 class FakeWinFixture {
-
   /** @param {!{win: !FakeWindowSpec}} spec */
   constructor(spec) {
     /** @const */
@@ -546,21 +530,19 @@ class FakeWinFixture {
   /** @override */
   teardown(unusedEnv) {
     if (this.spec.mockFetch !== false) {
-      fetchMock./*OK*/restore();
+      fetchMock./*OK*/ restore();
     }
   }
 }
 
-
 /** @implements {FixtureInterface} */
 class RealWinFixture {
-
   /** @param {!{
-  *   fakeRegisterElement: boolean,
-  *   ampCss: boolean,
-  *   allowExternalResources: boolean,
-  *   ampAdCss: boolean
-  * }} spec */
+   *   fakeRegisterElement: boolean,
+   *   ampCss: boolean,
+   *   allowExternalResources: boolean,
+   *   ampAdCss: boolean
+   * }} spec */
   constructor(spec) {
     /** @const */
     this.spec = spec;
@@ -578,9 +560,10 @@ class RealWinFixture {
       const iframe = document.createElement('iframe');
       env.iframe = iframe;
       iframe.name = 'test_' + iframeCount++;
-      iframe.srcdoc = '<!doctype html><html><head>' +
-          '<style>.i-amphtml-element {display: block;}</style>' +
-          '<body style="margin:0"><div id=parent></div>';
+      iframe.srcdoc =
+        '<!doctype html><html><head>' +
+        '<style>.i-amphtml-element {display: block;}</style>' +
+        '<body style="margin:0"><div id=parent></div>';
       iframe.onload = function() {
         const win = iframe.contentWindow;
         env.win = win;
@@ -641,15 +624,13 @@ class RealWinFixture {
       env.iframe.parentNode.removeChild(env.iframe);
     }
     if (this.spec.mockFetch !== false) {
-      fetchMock./*OK*/restore();
+      fetchMock./*OK*/ restore();
     }
   }
 }
 
-
 /** @implements {FixtureInterface} */
 class AmpFixture {
-
   /**
    * @param {!{amp: (boolean|!AmpTestSpec)}} spec
    */
@@ -745,8 +726,10 @@ class AmpFixture {
       const version = opt_version || '0.1';
       const installer = extensionsBuffer[`${extensionId}:${version}`];
       if (!installer) {
-        throw new Error(`extension not found: ${extensionId}:${version}.` +
-            ' Make sure the module is imported');
+        throw new Error(
+          `extension not found: ${extensionId}:${version}.` +
+            ' Make sure the module is imported'
+        );
       }
       if (env.ampdoc) {
         env.ampdoc.declareExtension(extensionId);
@@ -775,43 +758,53 @@ class AmpFixture {
         height: '150px',
       });
       win.document.body.appendChild(container);
-      const html = '<!doctype html>'
-          + '<html amp4ads>'
-          + '<head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>'
-          + '<body></body>'
-          + '</html>';
+      const html =
+        '<!doctype html>' +
+        '<html amp4ads>' +
+        '<head>        <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>' +
+        '<body></body>' +
+        '</html>';
       const promise = installFriendlyIframeEmbed(
-          embedIframe, container, {
-            url: 'http://ads.localhost:8000/example',
-            html,
-            extensionIds,
-          }, embedWin => {
-            interceptEventListeners(embedWin);
-            interceptEventListeners(embedWin.document);
-            interceptEventListeners(embedWin.document.documentElement);
-            interceptEventListeners(embedWin.document.body);
-          }).then(embed => {
+        embedIframe,
+        container,
+        {
+          url: 'http://ads.localhost:8000/example',
+          html,
+          extensionIds,
+        },
+        embedWin => {
+          interceptEventListeners(embedWin);
+          interceptEventListeners(embedWin.document);
+          interceptEventListeners(embedWin.document.documentElement);
+          interceptEventListeners(embedWin.document.body);
+        }
+      ).then(embed => {
         env.embed = embed;
         env.parentWin = env.win;
         env.win = embed.win;
         configureAmpTestMode(embed.win);
       });
-      completePromise = completePromise ?
-        completePromise.then(() => promise) : promise;
+      completePromise = completePromise
+        ? completePromise.then(() => promise)
+        : promise;
     } else if (ampdocType == 'shadow') {
       const hostElement = win.document.createElement('div');
       win.document.body.appendChild(hostElement);
       const importDoc = win.document.implementation.createHTMLDocument('');
       const ret = win.AMP.attachShadowDoc(
-          hostElement, importDoc, win.location.href);
+        hostElement,
+        importDoc,
+        win.location.href
+      );
       const {ampdoc} = ret;
       env.ampdoc = ampdoc;
       const promise = Promise.all([
         env.extensions.installExtensionsInDoc(ampdoc, extensionIds),
         ampdoc.whenReady(),
       ]);
-      completePromise = completePromise ?
-        completePromise.then(() => promise) : promise;
+      completePromise = completePromise
+        ? completePromise.then(() => promise)
+        : promise;
     }
 
     return completePromise;
@@ -839,7 +832,6 @@ class AmpFixture {
   }
 }
 
-
 /**
  * @param {!Window} win
  */
@@ -847,7 +839,6 @@ function configureAmpTestMode(win) {
   win.AMP_TEST = true;
 }
 
-
 /**
  * @param {!Window} win
  */
@@ -858,7 +849,7 @@ function installRuntimeStylesPromise(win) {
   }
   const style = document.createElement('style');
   style.setAttribute('amp-runtime', '');
-  style./*OK*/textContent = cssText;
+  style./*OK*/ textContent = cssText;
   win.document.head.appendChild(style);
 }
 
@@ -872,12 +863,10 @@ function installAmpAdStylesPromise(win) {
   }
   const style = document.createElement('style');
   style.setAttribute('amp-extension', 'amp-ad');
-  style./*OK*/textContent = CSS;
+  style./*OK*/ textContent = CSS;
   win.document.head.appendChild(style);
 }
 
-
-
 /**
  * Creates a custom element without registration.
  * @param {!Window} win
@@ -900,7 +889,7 @@ function createAmpElement(win, opt_name, opt_implementationClass) {
   // Create the element instance.
   const element = new ctor();
   element.implementationClassForTesting =
-      opt_implementationClass || BaseElement;
+    opt_implementationClass || BaseElement;
   element.createdCallback();
   element.classList.add('i-amphtml-element');
   return element;
diff --git a/testing/fake-dom.js b/testing/fake-dom.js
index a7a113d9433b..87cba33d0a2e 100644
--- a/testing/fake-dom.js
+++ b/testing/fake-dom.js
@@ -16,7 +16,6 @@
 
 import {parseUrlDeprecated, resolveRelativeUrl} from '../src/url';
 
-
 /**
  * @typedef {{
  *   hidden: (boolean|undefined),
@@ -30,15 +29,12 @@ import {parseUrlDeprecated, resolveRelativeUrl} from '../src/url';
  */
 export let FakeWindowSpec;
 
-
 /** @extends {!Window} */
 export class FakeWindow {
-
   /**
    * @param {!FakeWindowSpec=} opt_spec
    */
   constructor(opt_spec) {
-
     const spec = opt_spec || {};
 
     /**
@@ -99,7 +95,7 @@ export class FakeWindow {
     let fontStatus = 'loaded';
     Object.defineProperty(this.document.fonts, 'status', {
       get: () => fontStatus,
-      set: val => fontStatus = val,
+      set: val => (fontStatus = val),
     });
 
     EventListeners.intercept(this.document);
@@ -166,8 +162,10 @@ export class FakeWindow {
     // Location.
     /** @private @const {!FakeLocation} */
     this.location_ = new FakeLocation(
-        spec.location || window.location.href,
-        this, this.history);
+      spec.location || window.location.href,
+      this,
+      this.history
+    );
     Object.defineProperty(this, 'location', {
       get: () => this.location_,
       set: href => this.location_.assign(href),
@@ -176,14 +174,16 @@ export class FakeWindow {
     // Navigator.
     /** @const {!Navigator} */
     this.navigator = {
-      userAgent: (spec.navigator && spec.navigator.userAgent) ||
-          window.navigator.userAgent,
+      userAgent:
+        (spec.navigator && spec.navigator.userAgent) ||
+        window.navigator.userAgent,
     };
 
     // Storage.
     /** @const {!FakeStorage|undefined} */
-    this.localStorage = spec.localStorageOff ?
-      undefined : new FakeStorage(this);
+    this.localStorage = spec.localStorageOff
+      ? undefined
+      : new FakeStorage(this);
 
     // Timers and animation frames.
     /** @const */
@@ -209,8 +209,8 @@ export class FakeWindow {
       return window.clearInterval.apply(window, arguments);
     };
 
-    let raf = window.requestAnimationFrame
-        || window.webkitRequestAnimationFrame;
+    let raf =
+      window.requestAnimationFrame || window.webkitRequestAnimationFrame;
     if (raf) {
       raf = raf.bind(window);
     } else {
@@ -232,7 +232,6 @@ export class FakeWindow {
   removeEventListener() {}
 }
 
-
 /**
  * @typedef {{
  *   type: string,
@@ -243,12 +242,10 @@ export class FakeWindow {
  */
 export let EventListener;
 
-
 /**
  * Helper for testing event listeners.
  */
 class EventListeners {
-
   /**
    * @param {!EventTarget} target
    * @return {!EventListeners}
@@ -289,9 +286,12 @@ class EventListeners {
     return {
       type,
       handler,
-      capture: typeof captureOrOpts == 'boolean' ? captureOrOpts :
-        typeof captureOrOpts == 'object' ? captureOrOpts.capture || false :
-          false,
+      capture:
+        typeof captureOrOpts == 'boolean'
+          ? captureOrOpts
+          : typeof captureOrOpts == 'object'
+          ? captureOrOpts.capture || false
+          : false,
       options: typeof captureOrOpts == 'object' ? captureOrOpts : null,
     };
   }
@@ -315,9 +315,11 @@ class EventListeners {
     const toRemove = this.listener_(type, handler, captureOrOpts);
     for (let i = this.listeners.length - 1; i >= 0; i--) {
       const listener = this.listeners[i];
-      if (listener.type == toRemove.type &&
-          listener.handler == toRemove.handler &&
-          listener.capture == toRemove.capture) {
+      if (
+        listener.type == toRemove.type &&
+        listener.handler == toRemove.handler &&
+        listener.capture == toRemove.capture
+      ) {
         this.listeners.splice(i, 1);
       }
     }
@@ -349,7 +351,6 @@ class EventListeners {
   }
 }
 
-
 /**
  * @param {!EventTarget} target
  */
@@ -357,19 +358,16 @@ export function interceptEventListeners(target) {
   EventListeners.intercept(target);
 }
 
-
 /**
  * @extends {!Location}
  */
 export class FakeLocation {
-
   /**
    * @param {string} href
    * @param {!FakeWindow} win
    * @param {?History} history
    */
   constructor(href, win, history) {
-
     /** @const {!Window} */
     this.win = win;
 
@@ -388,8 +386,16 @@ export class FakeLocation {
       set: href => this.assign(href),
     });
 
-    const properties = ['protocol', 'host', 'hostname', 'port', 'pathname',
-      'search', 'hash', 'origin'];
+    const properties = [
+      'protocol',
+      'host',
+      'hostname',
+      'port',
+      'pathname',
+      'search',
+      'hash',
+      'origin',
+    ];
     properties.forEach(property => {
       Object.defineProperty(this, property, {
         get: () => this.url_[property],
@@ -397,8 +403,12 @@ export class FakeLocation {
     });
 
     if (this.history_) {
-      this.history_.replaceState(null, '', this.url_.href,
-          /* fireEvent */ false);
+      this.history_.replaceState(
+        null,
+        '',
+        this.url_.href,
+        /* fireEvent */ false
+      );
     }
   }
 
@@ -428,8 +438,7 @@ export class FakeLocation {
   assign(href) {
     this.set_(href);
     if (this.history_) {
-      this.history_.pushState(null, '', this.url_.href,
-          /* fireEvent */ true);
+      this.history_.pushState(null, '', this.url_.href, /* fireEvent */ true);
     }
     this.change_({assign: true});
   }
@@ -440,8 +449,12 @@ export class FakeLocation {
   replace(href) {
     this.set_(href);
     if (this.history_) {
-      this.history_.replaceState(null, '', this.url_.href,
-          /* fireEvent */ true);
+      this.history_.replaceState(
+        null,
+        '',
+        this.url_.href,
+        /* fireEvent */ true
+      );
     }
     this.change_({replace: true});
   }
@@ -463,12 +476,10 @@ export class FakeLocation {
   }
 }
 
-
 /**
  * @extends {!History}
  */
 export class FakeHistory {
-
   /** @param {!FakeWindow} win */
   constructor(win) {
     /** @const */
@@ -508,10 +519,10 @@ export class FakeHistory {
       return;
     }
     if (newIndex < 0) {
-      throw new Error('can\'t go back');
+      throw new Error("can't go back");
     }
     if (newIndex >= this.stack.length) {
-      throw new Error('can\'t go forward');
+      throw new Error("can't go forward");
     }
     this.index = newIndex;
     // Make sure to restore the location href before firing popstate to match
@@ -557,12 +568,10 @@ export class FakeHistory {
   }
 }
 
-
 /**
  * @extends {Storage}
  */
 export class FakeStorage {
-
   /** @param {!Window} win */
   constructor(win) {
     /** @const */
@@ -621,12 +630,10 @@ export class FakeStorage {
   }
 }
 
-
 /**
  * @extends {CustomElementRegistry}
  */
 export class FakeCustomElements {
-
   /** @param {!Window} win */
   constructor(win) {
     /** @const */
@@ -707,14 +714,13 @@ export class FakeMutationObserver {
     if (this.scheduled_) {
       return this.scheduled_;
     }
-    return this.scheduled_ = Promise.resolve().then(() => {
+    return (this.scheduled_ = Promise.resolve().then(() => {
       this.scheduled_ = null;
       this.callback_(this.takeRecords_());
-    });
+    }));
   }
 }
 
-
 /**
  * @param {!Object} obj
  * @return {!Object}
diff --git a/testing/iframe.js b/testing/iframe.js
index 6211ba62a942..6e558d76ec95 100644
--- a/testing/iframe.js
+++ b/testing/iframe.js
@@ -21,13 +21,8 @@ import {FormEvents} from '../extensions/amp-form/0.1/form-events';
 import {Services} from '../src/services';
 import {cssText} from '../build/css';
 import {deserializeMessage, isAmpMessage} from '../src/3p-frame-messaging';
-import {
-  installAmpdocServices,
-  installRuntimeServices,
-} from '../src/runtime';
-import {
-  install as installCustomElements,
-} from '../src/polyfills/custom-elements';
+import {installAmpdocServices, installRuntimeServices} from '../src/runtime';
+import {install as installCustomElements} from '../src/polyfills/custom-elements';
 import {installDocService} from '../src/service/ampdoc-impl';
 import {installExtensionsService} from '../src/service/extensions-impl';
 import {installStylesLegacy} from '../src/style-installer';
@@ -35,7 +30,6 @@ import {parseIfNeeded} from '../src/iframe-helper';
 
 let iframeCount = 0;
 
-
 /**
  * Creates an iframe from an HTML fixture for use in tests.
  *
@@ -63,7 +57,10 @@ let iframeCount = 0;
  * }>}
  */
 export function createFixtureIframe(
-  fixture, initialIframeHeight, opt_beforeLoad) {
+  fixture,
+  initialIframeHeight,
+  opt_beforeLoad
+) {
   return new Promise((resolve, reject) => {
     // Counts the supported custom events.
     const events = {
@@ -80,8 +77,10 @@ export function createFixtureIframe(
     };
     const messages = [];
     let html = __html__[fixture] // eslint-disable-line no-undef
-        .replace(/__TEST_SERVER_PORT__/g,
-            window.ampTestRuntimeConfig.testServerPort);
+      .replace(
+        /__TEST_SERVER_PORT__/g,
+        window.ampTestRuntimeConfig.testServerPort
+      );
     if (!html) {
       throw new Error('Cannot find fixture: ' + fixture);
     }
@@ -107,10 +106,12 @@ export function createFixtureIframe(
       win.addEventListener('message', event => {
         const parsedData = parseMessageData(event.data);
 
-        if (parsedData &&
-            // Either non-3P or 3P variant of the sentinel.
-            (/^amp/.test(parsedData.sentinel) ||
-             /^\d+-\d+$/.test(parsedData.sentinel))) {
+        if (
+          parsedData &&
+          // Either non-3P or 3P variant of the sentinel.
+          (/^amp/.test(parsedData.sentinel) ||
+            /^\d+-\d+$/.test(parsedData.sentinel))
+        ) {
           messages.push(parsedData);
         }
       });
@@ -139,9 +140,18 @@ export function createFixtureIframe(
         });
       }
       win.onerror = function(message, file, line, col, error) {
-        reject(new Error('Error in frame: ' + message + '\n' +
-            file + ':' + line + '\n' +
-            (error ? error.stack : 'no stack')));
+        reject(
+          new Error(
+            'Error in frame: ' +
+              message +
+              '\n' +
+              file +
+              ':' +
+              line +
+              '\n' +
+              (error ? error.stack : 'no stack')
+          )
+        );
       };
       const errors = [];
       win.console.error = function() {
@@ -220,13 +230,14 @@ export function createIframePromise(opt_runtimeOff, opt_beforeLayoutCallback) {
   return new Promise(function(resolve, reject) {
     const iframe = document.createElement('iframe');
     iframe.name = 'test_' + iframeCount++;
-    iframe.srcdoc = '<!doctype><html><head>' +
-        '<body><div id=parent></div>';
+    iframe.srcdoc = '<!doctype><html><head><body><div id=parent></div>';
     iframe.onload = function() {
       // Flag as being a test window.
       iframe.contentWindow.AMP_TEST_IFRAME = true;
-      iframe.contentWindow.testLocation = new FakeLocation(window.location.href,
-          iframe.contentWindow);
+      iframe.contentWindow.testLocation = new FakeLocation(
+        window.location.href,
+        iframe.contentWindow
+      );
       if (opt_runtimeOff) {
         iframe.contentWindow.name = '__AMP__off=1';
       }
@@ -235,8 +246,9 @@ export function createIframePromise(opt_runtimeOff, opt_beforeLayoutCallback) {
       // it is an embedabble service. b\17733
       iframe.contentWindow.Promise = window.Promise;
       installDocService(iframe.contentWindow, /* isSingleDoc */ true);
-      const ampdoc =
-          Services.ampdocServiceFor(iframe.contentWindow).getAmpDoc();
+      const ampdoc = Services.ampdocServiceFor(
+        iframe.contentWindow
+      ).getAmpDoc();
       installExtensionsService(iframe.contentWindow);
       installRuntimeServices(iframe.contentWindow);
       installCustomElements(iframe.contentWindow);
@@ -251,27 +263,28 @@ export function createIframePromise(opt_runtimeOff, opt_beforeLayoutCallback) {
           iframe,
           addElement: function(element) {
             const iWin = iframe.contentWindow;
-            const p = onInsert(iWin).then(() => {
-              return element.build();
-            }).then(() => {
-              if (!element.getPlaceholder()) {
-                const placeholder = element.createPlaceholder();
-                if (placeholder) {
-                  element.appendChild(placeholder);
+            const p = onInsert(iWin)
+              .then(() => {
+                return element.build();
+              })
+              .then(() => {
+                if (!element.getPlaceholder()) {
+                  const placeholder = element.createPlaceholder();
+                  if (placeholder) {
+                    element.appendChild(placeholder);
+                  }
                 }
-              }
-              if (element.layoutCount_ == 0) {
-                if (opt_beforeLayoutCallback) {
-                  opt_beforeLayoutCallback(element);
+                if (element.layoutCount_ == 0) {
+                  if (opt_beforeLayoutCallback) {
+                    opt_beforeLayoutCallback(element);
+                  }
+                  return element.layoutCallback().then(() => {
+                    return element;
+                  });
                 }
-                return element.layoutCallback().then(() => {
-                  return element;
-                });
-              }
-              return element;
-            });
-            iWin.document.getElementById('parent')
-                .appendChild(element);
+                return element;
+              });
+            iWin.document.getElementById('parent').appendChild(element);
             return p;
           },
         });
@@ -304,7 +317,7 @@ export function createServedIframe(src) {
 }
 
 const IFRAME_STUB_URL =
-    '//ads.localhost:9876/test/fixtures/served/iframe-stub.html#';
+  '//ads.localhost:9876/test/fixtures/served/iframe-stub.html#';
 
 /**
  * Creates an iframe fixture in the given window that can be used for
@@ -385,8 +398,10 @@ export function createIframeWithMessageStub(win) {
 export function expectPostMessage(sourceWin, targetwin, msg) {
   return new Promise(resolve => {
     const listener = event => {
-      if (event.source == sourceWin
-          && JSON.stringify(msg) == JSON.stringify(event.data)) {
+      if (
+        event.source == sourceWin &&
+        JSON.stringify(msg) == JSON.stringify(event.data)
+      ) {
         targetwin.removeEventListener('message', listener);
         resolve(event.data);
       }
@@ -443,16 +458,25 @@ export function poll(description, condition, opt_onError, opt_timeout) {
  */
 export function pollForLayout(win, count, opt_timeout) {
   const getCount = () => {
-    return win.document.querySelectorAll(
-        '.i-amphtml-layout,.i-amphtml-error').length;
+    return win.document.querySelectorAll('.i-amphtml-layout,.i-amphtml-error')
+      .length;
   };
-  return poll('Waiting for elements to layout: ' + count, () => {
-    return getCount() >= count;
-  }, () => {
-    return new Error('Failed to find elements with layout.' +
-        ' Current count: ' + getCount() + ' HTML:\n' +
-        win.document.documentElement./*TEST*/innerHTML);
-  }, opt_timeout);
+  return poll(
+    'Waiting for elements to layout: ' + count,
+    () => {
+      return getCount() >= count;
+    },
+    () => {
+      return new Error(
+        'Failed to find elements with layout.' +
+          ' Current count: ' +
+          getCount() +
+          ' HTML:\n' +
+          win.document.documentElement./*TEST*/ innerHTML
+      );
+    },
+    opt_timeout
+  );
 }
 
 /**
@@ -461,12 +485,21 @@ export function pollForLayout(win, count, opt_timeout) {
  * @return {!Promise}
  */
 export function expectBodyToBecomeVisible(win, opt_timeout) {
-  return poll('expect body to become visible', () => {
-    return win && win.document && win.document.body && (
-      (win.document.body.style.visibility == 'visible'
-            && win.document.body.style.opacity != '0')
-        || win.document.body.style.opacity == '1');
-  }, undefined, opt_timeout || 5000);
+  return poll(
+    'expect body to become visible',
+    () => {
+      return (
+        win &&
+        win.document &&
+        win.document.body &&
+        ((win.document.body.style.visibility == 'visible' &&
+          win.document.body.style.opacity != '0') ||
+          win.document.body.style.opacity == '1')
+      );
+    },
+    undefined,
+    opt_timeout || 5000
+  );
 }
 
 /**
@@ -547,7 +580,8 @@ function onInsert(win) {
  */
 export function maybeSwitchToCompiledJs(html) {
   if (window.ampTestRuntimeConfig.useCompiledJs) {
-    return html
+    return (
+      html
         // Main JS
         .replace(/\/dist\/amp\.js/g, '/dist/v0.js')
         // Inabox
@@ -557,12 +591,12 @@ export function maybeSwitchToCompiledJs(html) {
         // 3p html binary
         .replace(/\.max\.html/g, '.html')
         // 3p path
-        .replace(/dist\.3p\/current\//g, 'dist.3p/current-min/');
+        .replace(/dist\.3p\/current\//g, 'dist.3p/current-min/')
+    );
   }
   return html;
 }
 
-
 /**
  * @param {*} data
  * @return {?}
diff --git a/testing/test-helper.js b/testing/test-helper.js
index 0fb94ce5e7f1..6e4acdc11b22 100644
--- a/testing/test-helper.js
+++ b/testing/test-helper.js
@@ -63,8 +63,9 @@ export function mockServiceForDoc(sandbox, ampdoc, serviceId, methods) {
 }
 
 export function mockWindowInterface(sandbox) {
-  const methods = Object.getOwnPropertyNames(WindowInterface)
-      .filter(p => typeof WindowInterface[p] === 'function');
+  const methods = Object.getOwnPropertyNames(WindowInterface).filter(
+    p => typeof WindowInterface[p] === 'function'
+  );
   const mock = {};
   methods.forEach(method => {
     mock[method] = sandbox.stub(WindowInterface, method);
@@ -79,8 +80,10 @@ export function mockWindowInterface(sandbox) {
  * @return {!Promise}
  */
 export function whenCalled(spy, opt_callCount = 1) {
-  return poll(`Spy was called ${opt_callCount} times`,
-      () => spy.callCount === opt_callCount);
+  return poll(
+    `Spy was called ${opt_callCount} times`,
+    () => spy.callCount === opt_callCount
+  );
 }
 
 const noneValues = {
@@ -148,7 +151,6 @@ const REQUEST_URL = '//localhost:9876/amp4test/request-bank/' + browserId;
  * browser sent HTTP requests.
  */
 export class RequestBank {
-
   static getBrowserId() {
     return browserId;
   }
@@ -176,11 +178,13 @@ export class RequestBank {
    */
   static withdraw(requestId) {
     const url = `${REQUEST_URL}/withdraw/${requestId}/`;
-    return xhrServiceForTesting(window).fetchJson(url, {
-      method: 'GET',
-      ampCors: false,
-      credentials: 'omit',
-    }).then(res => res.json());
+    return xhrServiceForTesting(window)
+      .fetchJson(url, {
+        method: 'GET',
+        ampCors: false,
+        credentials: 'omit',
+      })
+      .then(res => res.json());
   }
 
   static tearDown() {
@@ -215,14 +219,17 @@ export class BrowserController {
     if (!elements.length) {
       throw new Error(`BrowserController query failed: ${selector}`);
     }
-    return poll(`"${selector}" to build`,
-        () => {
-          const someNotBuilt = [].some.call(elements,
-              e => e.classList.contains('i-amphtml-notbuilt'));
-          return !someNotBuilt;
-        },
-        /* onError */ undefined,
-        timeout);
+    return poll(
+      `"${selector}" to build`,
+      () => {
+        const someNotBuilt = [].some.call(elements, e =>
+          e.classList.contains('i-amphtml-notbuilt')
+        );
+        return !someNotBuilt;
+      },
+      /* onError */ undefined,
+      timeout
+    );
   }
 
   /**
@@ -235,22 +242,26 @@ export class BrowserController {
     if (!elements.length) {
       throw new Error(`BrowserController query failed: ${selector}`);
     }
-    return poll(`"${selector}" to layout`,
-        () => {
-          // AMP elements set `readyState` to complete when their
-          // layoutCallback() promise is resolved.
-          const someNotReady = [].some.call(elements,
-              e => e.readyState !== 'complete');
-          return !someNotReady;
-        },
-        /* onError */ undefined,
-        timeout);
+    return poll(
+      `"${selector}" to layout`,
+      () => {
+        // AMP elements set `readyState` to complete when their
+        // layoutCallback() promise is resolved.
+        const someNotReady = [].some.call(
+          elements,
+          e => e.readyState !== 'complete'
+        );
+        return !someNotReady;
+      },
+      /* onError */ undefined,
+      timeout
+    );
   }
 
   click(selector) {
     const element = this.doc_.querySelector(selector);
     if (element) {
-      element.dispatchEvent(new /*OK*/CustomEvent('click', {bubbles: true}));
+      element.dispatchEvent(new /*OK*/ CustomEvent('click', {bubbles: true}));
     }
   }
 
@@ -260,17 +271,19 @@ export class BrowserController {
 }
 
 export function createPointerEvent(type, x, y) {
-  const event = new /*OK*/CustomEvent(type, {bubbles: true});
+  const event = new /*OK*/ CustomEvent(type, {bubbles: true});
   event.clientX = x;
   event.clientY = y;
   event.pageX = x;
   event.pageY = y;
-  event.touches = [{
-    clientX: x,
-    clientY: y,
-    pageX: x,
-    pageY: y,
-  }];
+  event.touches = [
+    {
+      clientX: x,
+      clientY: y,
+      pageX: x,
+      pageY: y,
+    },
+  ];
   return event;
 }
 
@@ -309,7 +322,9 @@ export class ImagePixelVerifier {
 }
 
 export function measureMutateElementStub(measure, mutate) {
-  return Promise.resolve().then(measure).then(mutate);
+  return Promise.resolve()
+    .then(measure)
+    .then(mutate);
 }
 
 export function measureElementStub(measure) {
diff --git a/testing/yield.js b/testing/yield.js
index 6efc8e8b7d33..6bdecf0fd4bc 100644
--- a/testing/yield.js
+++ b/testing/yield.js
@@ -22,7 +22,7 @@
  */
 export function installYieldIt(realIt) {
   it = enableYield.bind(null, realIt); // eslint-disable-line no-native-reassign, no-undef
-  it./*OK*/only = enableYield.bind(null, realIt.only);
+  it./*OK*/ only = enableYield.bind(null, realIt.only);
   it.skip = realIt.skip;
 }
 
@@ -36,8 +36,11 @@ export function macroTask() {
 }
 
 function enableYield(fn, message, runnable) {
-  if (!runnable || !runnable.constructor
-      || runnable.constructor.name !== 'GeneratorFunction') {
+  if (
+    !runnable ||
+    !runnable.constructor ||
+    runnable.constructor.name !== 'GeneratorFunction'
+  ) {
     return fn(message, runnable);
   }
   return fn(message, done => {
diff --git a/tools/experiments/experiments.js b/tools/experiments/experiments.js
index 533432633dcd..81c21aa8a732 100644
--- a/tools/experiments/experiments.js
+++ b/tools/experiments/experiments.js
@@ -64,15 +64,17 @@ const EXPERIMENTS = [
   {
     id: CANARY_EXPERIMENT_ID,
     name: 'AMP Dev Channel (more info)',
-    spec: 'https://github.com/ampproject/amphtml/blob/master/' +
-        'contributing/release-schedule.md#amp-dev-channel',
+    spec:
+      'https://github.com/ampproject/amphtml/blob/master/' +
+      'contributing/release-schedule.md#amp-dev-channel',
   },
   // Release Candidate (RC Channel)
   {
     id: RC_EXPERIMENT_ID,
     name: 'AMP RC Channel (more info)',
-    spec: 'https://github.com/ampproject/amphtml/blob/master/' +
-        'contributing/release-schedule.md#amp-release-candidate-rc-channel',
+    spec:
+      'https://github.com/ampproject/amphtml/blob/master/' +
+      'contributing/release-schedule.md#amp-release-candidate-rc-channel',
   },
   {
     id: 'alp',
@@ -117,8 +119,9 @@ const EXPERIMENTS = [
   {
     id: 'amp-google-vrview-image',
     name: 'AMP VR Viewer for images via Google VRView',
-    spec: 'https://github.com/ampproject/amphtml/blob/master/extensions/' +
-        'amp-google-vrview-image/amp-google-vrview-image.md',
+    spec:
+      'https://github.com/ampproject/amphtml/blob/master/extensions/' +
+      'amp-google-vrview-image/amp-google-vrview-image.md',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/3996',
   },
   {
@@ -175,15 +178,17 @@ const EXPERIMENTS = [
   },
   {
     id: 'ios-embed-sd',
-    name: 'A new iOS embedded viewport model that wraps the body into' +
+    name:
+      'A new iOS embedded viewport model that wraps the body into' +
       ' shadow root',
-    spec: 'https://medium.com/@dvoytenko/amp-ios-scrolling-redo-2-the' +
+    spec:
+      'https://medium.com/@dvoytenko/amp-ios-scrolling-redo-2-the' +
       '-shadow-wrapper-approach-experimental-3362ed3c2fa2',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/16640',
   },
   {
     id: 'chunked-amp',
-    name: 'Split AMP\'s loading phase into chunks',
+    name: "Split AMP's loading phase into chunks",
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/5535',
   },
   {
@@ -193,14 +198,16 @@ const EXPERIMENTS = [
   },
   {
     id: 'pump-early-frame',
-    name: 'If applicable, let the browser paint the current frame before ' +
-        'executing the callback.',
+    name:
+      'If applicable, let the browser paint the current frame before ' +
+      'executing the callback.',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/8237',
   },
   {
     id: 'version-locking',
-    name: 'Force all extensions to have the same release ' +
-        'as the main JS binary',
+    name:
+      'Force all extensions to have the same release ' +
+      'as the main JS binary',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/8236',
   },
   {
@@ -258,8 +265,9 @@ const EXPERIMENTS = [
   },
   {
     id: 'amp-story-desktop-background',
-    name: 'Removes blurred background images from the amp-story component\'s ' +
-        'three-panel desktop UI.',
+    name:
+      "Removes blurred background images from the amp-story component's " +
+      'three-panel desktop UI.',
     spec: 'https://github.com/ampproject/amphtml/issues/21287',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/21288',
   },
@@ -318,8 +326,9 @@ const EXPERIMENTS = [
   },
   {
     id: 'no-initial-intersection',
-    name: 'Do not invoke context.observeIntersection callback with ' +
-        'initialintersection',
+    name:
+      'Do not invoke context.observeIntersection callback with ' +
+      'initialintersection',
     spec: 'https://github.com/ampproject/amphtml/issues/8562',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/8562',
   },
@@ -402,23 +411,26 @@ const EXPERIMENTS = [
   },
   {
     id: 'amp-autocomplete',
-    name: 'AMP Autocomplete provides a set of suggestions to' +
-        ' complete a user query in an input field.',
+    name:
+      'AMP Autocomplete provides a set of suggestions to' +
+      ' complete a user query in an input field.',
     spec: 'https://github.com/ampproject/amphtml/issues/9785',
     cleanupIssue: 'https://github.com/ampproject/amphtml/issues/21021',
   },
   {
     id: 'inabox-viewport-friendly',
-    name: 'Inabox viewport measures the host window directly if ' +
-        'within friendly iframe',
+    name:
+      'Inabox viewport measures the host window directly if ' +
+      'within friendly iframe',
     spec: 'https://github.com/ampproject/amphtml/issues/19869',
     cleanupIssue: 'TODO',
   },
   {
     id: 'inabox-remove-height-auto',
-    name: 'Experiment to allow slowly removing the height: auto!' +
-    ' for inabox amp4ads. By adding the ' +
-    '.i-amphtml-inabox-preserve-height-auto class on <html>',
+    name:
+      'Experiment to allow slowly removing the height: auto!' +
+      ' for inabox amp4ads. By adding the ' +
+      '.i-amphtml-inabox-preserve-height-auto class on <html>',
     spec: 'https://github.com/ampproject/amphtml/issues/22059',
     cleanupIssue: 'TODO',
   },
@@ -426,12 +438,13 @@ const EXPERIMENTS = [
 
 if (getMode().localDev) {
   EXPERIMENTS.forEach(experiment => {
-    devAssert(experiment.cleanupIssue, `experiment ${experiment.name} must` +
-        ' have a `cleanupIssue` field.');
+    devAssert(
+      experiment.cleanupIssue,
+      `experiment ${experiment.name} must have a \`cleanupIssue\` field.`
+    );
   });
 }
 
-
 /**
  * Builds the expriments tbale.
  */
@@ -442,13 +455,11 @@ function build() {
   });
 }
 
-
 /**
  * Builds one row of the experiments table.
  * @param {!ExperimentDef} experiment
  */
 function buildExperimentRow(experiment) {
-
   const tr = document.createElement('tr');
   tr.id = 'exp-tr-' + experiment.id;
 
@@ -482,13 +493,14 @@ function buildExperimentRow(experiment) {
   buttonOff.textContent = 'Off';
   button.appendChild(buttonOff);
 
-  button.addEventListener('click', toggleExperiment_.bind(null, experiment.id,
-      experiment.name, undefined));
+  button.addEventListener(
+    'click',
+    toggleExperiment_.bind(null, experiment.id, experiment.name, undefined)
+  );
 
   return tr;
 }
 
-
 /**
  * If link is available, builds the anchor. Otherwise, it'd return a basic span.
  * @param {string} text
@@ -508,7 +520,6 @@ function buildLinkMaybe(text, link) {
   return element;
 }
 
-
 /**
  * Updates states of all experiments in the table.
  */
@@ -518,7 +529,6 @@ function update() {
   });
 }
 
-
 /**
  * Updates the state of a single experiment.
  * @param {!ExperimentDef} experiment
@@ -535,7 +545,6 @@ function updateExperimentRow(experiment) {
   tr.setAttribute('data-on', state);
 }
 
-
 /**
  * Returns whether the experiment is on or off.
  * @param {string} id
@@ -547,7 +556,7 @@ function isExperimentOn_(id) {
   } else if (id == RC_EXPERIMENT_ID) {
     return getCookie(window, 'AMP_CANARY') == AMP_CANARY_COOKIE.RC;
   }
-  return isExperimentOn(window, /*OK*/id);
+  return isExperimentOn(window, /*OK*/ id);
 }
 
 /**
@@ -556,8 +565,10 @@ function isExperimentOn_(id) {
  * @param {string} cookieState One of AMP_CANARY_COOKIE.{DISABLED|CANARY|RC}
  */
 function setAmpCanaryCookie_(cookieState) {
-  const validUntil = (cookieState != AMP_CANARY_COOKIE.DISABLED) ?
-    (Date.now() + COOKIE_MAX_AGE_MS) : 0;
+  const validUntil =
+    cookieState != AMP_CANARY_COOKIE.DISABLED
+      ? Date.now() + COOKIE_MAX_AGE_MS
+      : 0;
   const cookieOptions = {
     // Set explicit domain, so the cookie gets sent to sub domains.
     domain: location.hostname,
@@ -578,17 +589,19 @@ function toggleExperiment_(id, name, opt_on) {
   const currentlyOn = isExperimentOn_(id);
   const on = opt_on === undefined ? !currentlyOn : opt_on;
   // Protect against click jacking.
-  const confirmMessage = on ?
-    'Do you really want to activate the AMP experiment' :
-    'Do you really want to deactivate the AMP experiment';
+  const confirmMessage = on
+    ? 'Do you really want to activate the AMP experiment'
+    : 'Do you really want to deactivate the AMP experiment';
 
   showConfirmation_(`${confirmMessage}: "${name}"`, () => {
     if (id == CANARY_EXPERIMENT_ID) {
       setAmpCanaryCookie_(
-          on ? AMP_CANARY_COOKIE.CANARY : AMP_CANARY_COOKIE.DISABLED);
+        on ? AMP_CANARY_COOKIE.CANARY : AMP_CANARY_COOKIE.DISABLED
+      );
     } else if (id == RC_EXPERIMENT_ID) {
       setAmpCanaryCookie_(
-          on ? AMP_CANARY_COOKIE.RC : AMP_CANARY_COOKIE.DISABLED);
+        on ? AMP_CANARY_COOKIE.RC : AMP_CANARY_COOKIE.DISABLED
+      );
     } else {
       toggleExperiment(window, id, on);
     }
@@ -596,7 +609,6 @@ function toggleExperiment_(id, name, opt_on) {
   });
 }
 
-
 /**
  * Shows confirmation and calls callback if it's approved.
  * @param {string} message
@@ -605,10 +617,10 @@ function toggleExperiment_(id, name, opt_on) {
 function showConfirmation_(message, callback) {
   const container = devAssert(document.getElementById('popup-container'));
   const messageElement = devAssert(document.getElementById('popup-message'));
-  const confirmButton = devAssert(
-      document.getElementById('popup-button-ok'));
+  const confirmButton = devAssert(document.getElementById('popup-button-ok'));
   const cancelButton = devAssert(
-      document.getElementById('popup-button-cancel'));
+    document.getElementById('popup-button-cancel')
+  );
   const unlistenSet = [];
   const closePopup = affirmative => {
     container.classList.remove('show');
@@ -619,10 +631,8 @@ function showConfirmation_(message, callback) {
   };
 
   messageElement.textContent = message;
-  unlistenSet.push(listenOnce(confirmButton, 'click',
-      () => closePopup(true)));
-  unlistenSet.push(listenOnce(cancelButton, 'click',
-      () => closePopup(false)));
+  unlistenSet.push(listenOnce(confirmButton, 'click', () => closePopup(true)));
+  unlistenSet.push(listenOnce(cancelButton, 'click', () => closePopup(false)));
   container.classList.add('show');
 }
 
@@ -644,20 +654,21 @@ function getAmpConfig() {
   // Cache bust, so we immediately reflect AMP_CANARY cookie changes.
   xhr.open('GET', '/v0.js?' + Math.random(), true);
   xhr.send(null);
-  return promise.then(text => {
-    const match = text.match(/self\.AMP_CONFIG=([^;]+)/);
-    if (!match) {
-      throw new Error('Can\'t find AMP_CONFIG in: ' + text);
-    }
-    // Setting global var to make standard experiment code just work.
-    return self.AMP_CONFIG = JSON.parse(match[1]);
-  }).catch(error => {
-    console./*OK*/error('Error fetching AMP_CONFIG', error);
-    return {};
-  });
+  return promise
+    .then(text => {
+      const match = text.match(/self\.AMP_CONFIG=([^;]+)/);
+      if (!match) {
+        throw new Error("Can't find AMP_CONFIG in: " + text);
+      }
+      // Setting global var to make standard experiment code just work.
+      return (self.AMP_CONFIG = JSON.parse(match[1]));
+    })
+    .catch(error => {
+      console./*OK*/ error('Error fetching AMP_CONFIG', error);
+      return {};
+    });
 }
 
-
 // Start up.
 getAmpConfig().then(() => {
   onDocumentReady(document, () => {
diff --git a/validator/.eslintrc b/validator/.eslintrc
deleted file mode 100644
index 1e38f79bf994..000000000000
--- a/validator/.eslintrc
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "jasmine": true
-  },
-  "plugins": [
-    "jasmine"
-  ],
-  "extends": [
-    "plugin:jasmine/recommended"
-  ],
-  "globals": {
-    "amp": false,
-    "chrome": false,
-    "goog": false,
-    "json_testutil": false,
-    "parse_css": false,
-    "parse_srcset": false,
-    "parse_url": false,
-    "fs": false
-  },
-  "rules": {
-    "amphtml-internal/no-module-exports": 0,
-    "amphtml-internal/no-for-of-statement": 0,
-    "amphtml-internal/no-has-own-property-method": 0,
-    "chai-expect/missing-assertion": 0,
-    "google-camelcase/google-camelcase": 0,
-    "jasmine/expect-matcher": 0,
-    "jasmine/no-spec-dupes": 0,
-    "jasmine/prefer-jasmine-matcher": 0,
-    "jsdoc/check-param-names": 0,
-    "jsdoc/check-tag-names": 0,
-    "jsdoc/check-types": 0,
-    "jsdoc/require-param": 0,
-    "jsdoc/require-param-name": 0,
-    "jsdoc/require-param-type": 0,
-    "jsdoc/require-returns-type": 0,
-    "max-len": [0, 80, 4, {
-      "ignoreTrailingComments": true,
-      "ignoreRegExpLiterals": true,
-      "ignorePattern": "^import.*';|}\\ from.*;|.*require\\(.*;$|@typedef|@param|@return|@private|@const|@type|@implements",
-      "ignoreUrls": true
-    }],
-    "no-cond-assign": 0,
-    "no-div-regex": 0,
-    "no-multi-spaces": 0,
-    "no-throw-literal": 0,
-    "no-undef": 0,
-    "no-unused-vars": [0, {
-      "argsIgnorePattern": "^var_|opt_|unused",
-      "varsIgnorePattern": "AmpElement|Def|Interface$"
-    }],
-    "no-useless-concat": 0,
-    "no-var": 0,
-    "prefer-const": 0,
-    "require-jsdoc": 0
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index bc1b2d198b3e..3599575b9d42 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -5677,6 +5677,13 @@ escope@^3.6.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-config-prettier@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-4.1.0.tgz#181364895899fff9fd3605fecb5c4f20e7d5f395"
+  integrity sha512-zILwX9/Ocz4SV2vX7ox85AsrAgXV3f2o2gpIicdMIOra48WYqgUnWNH/cR/iHtmD2Vb3dLSC3LiEJnS05Gkw7w==
+  dependencies:
+    get-stdin "^6.0.0"
+
 "eslint-plugin-amphtml-internal@file:build-system/eslint-rules":
   version "0.1.0"
 
@@ -5718,6 +5725,13 @@ eslint-plugin-notice@0.7.8:
     lodash ">=2.4.0"
     metric-lcs "^0.1.2"
 
+eslint-plugin-prettier@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.0.1.tgz#19d521e3981f69dd6d14f64aec8c6a6ac6eb0b0d"
+  integrity sha512-/PMttrarPAY78PLvV3xfWibMOdMDl57hmlQ2XqFeA37wd+CJ7WSxV7txqjVPHi/AAFKd2lX0ZqfsOc/i5yFCSQ==
+  dependencies:
+    prettier-linter-helpers "^1.0.0"
+
 eslint-plugin-sort-imports-es6-autofix@0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/eslint-plugin-sort-imports-es6-autofix/-/eslint-plugin-sort-imports-es6-autofix-0.4.0.tgz#3bcc87f7cc8596dea48ca3eb12b0103dfc21c98c"
@@ -6761,6 +6775,11 @@ get-stdin@^4.0.1:
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
+get-stdin@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-6.0.0.tgz#9e09bf712b360ab9225e812048f71fde9c89657b"
+  integrity sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==
+
 get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -12399,6 +12418,18 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
   integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
 
+prettier-linter-helpers@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz#d23d41fe1375646de2d0104d3454a3008802cf7b"
+  integrity sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==
+  dependencies:
+    fast-diff "^1.1.2"
+
+prettier@1.17.1:
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.17.1.tgz#ed64b4e93e370cb8a25b9ef7fef3e4fd1c0995db"
+  integrity sha512-TzGRNvuUSmPgwivDqkZ9tM/qTGW9hqDKWOE9YHiyQdixlKbv7kvEqsmDPrcHJTKwthU774TQwZXVtaQ/mMsvjg==
+
 pretty-bytes@5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.2.0.tgz#96c92c6e95a0b35059253fb33c03e260d40f5a1f"